diff --git a/Android.bp b/Android.bp
index 8e075b6..5470e70 100644
--- a/Android.bp
+++ b/Android.bp
@@ -72,6 +72,7 @@
 
 android_app {
     name: "Settings",
+    defaults: ["platform_app_defaults"],
     platform_apis: true,
     certificate: "platform",
     system_ext_specific: true,
@@ -81,6 +82,7 @@
         "settings-platform-compat-config",
     ],
     static_libs: ["Settings-core"],
+    uses_libs: ["org.apache.http.legacy"],
     resource_dirs: [],
     optimize: {
         proguard_flags_files: ["proguard.flags"],
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2f53cc1..c946122 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -38,7 +38,6 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CLEAR_APP_USER_DATA" />
-    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
@@ -104,7 +103,9 @@
     <uses-permission android:name="android.permission.INSTALL_DYNAMIC_SYSTEM" />
     <uses-permission android:name="android.permission.BIND_CELL_BROADCAST_SERVICE" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    
+    <uses-permission android:name="android.permission.READ_DREAM_STATE" />
+    <uses-permission android:name="android.permission.READ_DREAM_SUPPRESSION" />
+
     <application android:label="@string/settings_label"
             android:icon="@drawable/ic_launcher_settings"
             android:theme="@style/Theme.Settings"
@@ -125,6 +126,7 @@
                   android:theme="@style/Theme.Settings.Home"
                   android:taskAffinity="com.android.settings.root"
                   android:launchMode="singleTask"
+                  android:exported="true"
                   android:configChanges="keyboard|keyboardHidden">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.SETTINGS" />
@@ -137,6 +139,7 @@
         <activity android:name=".network.telephony.MobileNetworkActivity"
                   android:label="@string/network_settings_title"
                   android:theme="@style/Theme.Settings.Home"
+                  android:exported="true"
                   android:launchMode="singleTask">
             <intent-filter android:priority="1">
                 <!-- Displays the MobileNetworkActivity and opt-in dialog for capability discovery. -->
@@ -153,6 +156,7 @@
                 android:label="@string/settings_label_launcher"
                 android:taskAffinity="com.android.settings.root"
                 android:launchMode="singleTask"
+                android:exported="true"
                 android:targetActivity=".homepage.SettingsHomepageActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -162,7 +166,8 @@
             <meta-data android:name="android.app.shortcuts" android:resource="@xml/shortcuts"/>
         </activity-alias>
 
-        <receiver android:name=".SettingsInitialize">
+        <receiver android:name=".SettingsInitialize"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.USER_INITIALIZE"/>
                 <action android:name="android.intent.action.PRE_BOOT_COMPLETED"/>
@@ -172,6 +177,7 @@
         <activity android:name=".SubSettings"/>
 
         <activity android:name=".Settings$CreateShortcutActivity"
+                  android:exported="true"
                   android:label="@string/settings_shortcut">
             <intent-filter>
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
@@ -186,6 +192,7 @@
         <activity
             android:name=".Settings$NetworkDashboardActivity"
             android:label="@string/network_dashboard_title"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_network">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIRELESS_SETTINGS" />
@@ -205,6 +212,7 @@
         </activity>
 
         <activity android:name=".Settings$MobileNetworkListActivity"
+                  android:exported="true"
                   android:label="@string/network_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MOBILE_NETWORK_LIST" />
@@ -219,6 +227,7 @@
         <activity
             android:name=".Settings$ConnectedDeviceDashboardActivity"
             android:label="@string/connected_devices_dashboard_title"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_connected_device">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.BLUETOOTH_SETTINGS" />
@@ -255,6 +264,7 @@
             android:name="Settings$WifiSettingsActivity"
             android:label="@string/wifi_settings"
             android:icon="@drawable/ic_homepage_network"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIFI_SETTINGS" />
@@ -271,12 +281,13 @@
         </activity>
 
         <activity
-            android:name="Settings$WifiSettings2Activity"
-            android:label="@string/wifi_settings"
+            android:name="Settings$NetworkProviderSettingsActivity"
+            android:label="@string/network_dashboard_title"
             android:icon="@drawable/ic_homepage_network"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
-                <action android:name="android.settings.WIFI_SETTINGS2" />
+                <action android:name="android.settings.NETWORK_PROVIDER_SETTINGS" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter android:priority="1">
@@ -284,13 +295,14 @@
                 <category android:name="com.android.settings.SHORTCUT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.wifi.WifiSettings2" />
+                android:value="com.android.settings.network.NetworkProviderSettings" />
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
-                       android:value="true" />
+                android:value="true" />
         </activity>
 
         <activity
-            android:name=".wifi.WifiPickerActivity">
+            android:name=".wifi.WifiPickerActivity"
+            android:exported="true">
             <intent-filter android:priority="1">
                 <action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -303,6 +315,7 @@
             android:name="Settings$ConfigureWifiSettingsActivity"
             android:label="@string/wifi_configure_settings_preference_title"
             android:icon="@drawable/ic_settings_wireless"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIFI_IP_SETTINGS" />
@@ -323,6 +336,7 @@
             android:name="Settings$SavedAccessPointsSettingsActivity"
             android:label="@string/wifi_saved_access_points_label"
             android:icon="@drawable/ic_settings_wireless"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.WIFI_SAVED_NETWORK_SETTINGS" />
@@ -334,7 +348,8 @@
                 android:value="true" />
         </activity>
 
-        <activity android:name=".Settings$WifiInfoActivity">
+        <activity android:name=".Settings$WifiInfoActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -344,7 +359,8 @@
                        android:value="com.android.settings.wifi.WifiInfo" />
         </activity>
 
-        <activity android:name=".wifi.WifiConfigInfo">
+        <activity android:name=".wifi.WifiConfigInfo"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -352,7 +368,8 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".Settings$WifiAPITestActivity">
+        <activity android:name=".Settings$WifiAPITestActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -362,7 +379,8 @@
                        android:value="com.android.settings.wifi.WifiAPITest" />
         </activity>
 
-        <activity android:name=".wifi.WifiStatusTest">
+        <activity android:name=".wifi.WifiStatusTest"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.DEVELOPMENT_PREFERENCE" />
@@ -375,7 +393,7 @@
                   android:excludeFromRecents="true"
                   android:exported="true"
                   android:permission="android.permission.NETWORK_STACK"
-                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
             <intent-filter>
                 <action android:name="android.net.conn.PROMPT_UNVALIDATED" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -391,6 +409,7 @@
         <activity android:name="Settings$ApnSettingsActivity"
                 android:label="@string/apn_settings"
                 android:launchMode="singleTask"
+                android:exported="true"
                 android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APN_SETTINGS" />
@@ -404,7 +423,7 @@
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                 android:value="true" />
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.network.ApnSettings" />
+                       android:value="com.android.settings.network.apn.ApnSettings" />
         </activity>
 
         <!-- Keep compatibility with old shortcuts. -->
@@ -433,6 +452,7 @@
 
         <activity android:name="Settings$AssistGestureSettingsActivity"
             android:label="@string/assist_gesture_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_gestures">
             <intent-filter>
                 <action android:name="android.settings.ASSIST_GESTURE_SETTINGS" />
@@ -444,6 +464,7 @@
 
         <activity android:name="Settings$FaceSettingsActivity"
             android:label="@string/security_settings_face_preference_title"
+            android:exported="true"
             android:icon="@drawable/ic_face_header">
             <intent-filter>
                 <action android:name="android.settings.FACE_SETTINGS" />
@@ -455,6 +476,7 @@
 
         <activity android:name="Settings$FingerprintSettingsActivity"
                   android:label="@string/security_settings_fingerprint_preference_title"
+                  android:exported="true"
                   android:icon="@drawable/ic_fingerprint_header">
             <intent-filter>
                 <action android:name="android.settings.FINGERPRINT_SETTINGS" />
@@ -467,6 +489,7 @@
         <activity android:name=".bluetooth.DevicePickerActivity"
                 android:label="@string/device_picker"
                 android:configChanges="orientation|keyboardHidden|screenSize"
+                android:exported="true"
                 android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
@@ -489,9 +512,20 @@
             </intent-filter>
         </activity>
 
+        <activity android:name=".network.telephony.ToggleSubscriptionDialogActivity"
+                  android:exported="false"
+                  android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
+                  android:theme="@style/Transparent" />
+
+        <activity android:name=".network.telephony.DeleteEuiccSubscriptionDialogActivity"
+                  android:exported="false"
+                  android:permission="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS"
+                  android:theme="@style/Transparent" />
+
         <activity
             android:name="Settings$TetherSettingsActivity"
             android:label="@string/tether_settings_title_all"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_network">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -506,6 +540,7 @@
         <activity
             android:name="Settings$WifiTetherSettingsActivity"
             android:label="@string/wifi_hotspot_checkbox_text"
+            android:exported="true"
             android:icon="@drawable/ic_wifi_tethering">
             <intent-filter>
                 <action android:name="com.android.settings.WIFI_TETHER_SETTINGS" />
@@ -530,7 +565,8 @@
                 android:value="com.android.settings.TetherSettings" />
         </activity-alias>
 
-        <activity android:name="Settings$WifiP2pSettingsActivity">
+        <activity android:name="Settings$WifiP2pSettingsActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -543,6 +579,7 @@
         <activity
             android:name="Settings$VpnSettingsActivity"
             android:label="@string/vpn_settings_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_wireless">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.VPN_SETTINGS" />
@@ -561,6 +598,7 @@
 
         <activity
             android:name="Settings$DataSaverSummaryActivity"
+            android:exported="true"
             android:label="@string/data_saver_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DATA_SAVER_SETTINGS" />
@@ -573,6 +611,7 @@
         <activity
             android:name="Settings$DateTimeSettingsActivity"
             android:label="@string/date_and_time"
+            android:exported="true"
             android:icon="@drawable/ic_settings_date_time">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DATE_SETTINGS" />
@@ -593,6 +632,7 @@
         <activity
             android:name="Settings$LocalePickerActivity"
             android:label="@string/language_picker_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_language">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LOCALE_SETTINGS" />
@@ -618,6 +658,7 @@
         <activity
             android:name=".Settings$LanguageAndInputSettingsActivity"
             android:label="@string/language_settings"
+            android:exported="true"
             android:icon="@drawable/ic_settings_language">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -631,6 +672,7 @@
         </activity>
 
         <activity android:name="Settings$AvailableVirtualKeyboardActivity"
+            android:exported="true"
             android:label="@string/available_virtual_keyboard_category">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.INPUT_METHOD_SETTINGS" />
@@ -642,6 +684,7 @@
 
         <activity
             android:name="Settings$ManageAssistActivity"
+            android:exported="true"
             android:label="@string/assist_and_voice_input_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.VOICE_INPUT_SETTINGS" />
@@ -661,6 +704,7 @@
 
         <activity android:name="Settings$PhysicalKeyboardActivity"
             android:label="@string/physical_keyboard_title"
+            android:exported="true"
             android:clearTaskOnLaunch="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.HARD_KEYBOARD_SETTINGS" />
@@ -682,6 +726,7 @@
 
         <activity
             android:name="Settings$SpellCheckersSettingsActivity"
+            android:exported="true"
             android:label="@string/spellcheckers_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -694,6 +739,7 @@
 
         <activity android:name=".inputmethod.InputMethodAndSubtypeEnablerActivity"
                 android:label=""
+                android:exported="true"
                 android:clearTaskOnLaunch="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.INPUT_METHOD_SUBTYPE_SETTINGS" />
@@ -708,6 +754,7 @@
 
         <activity
             android:name="Settings$UserDictionarySettingsActivity"
+            android:exported="true"
             android:label="@string/user_dict_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USER_DICTIONARY_SETTINGS" />
@@ -728,6 +775,7 @@
                   android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
                   android:windowSoftInputMode="stateVisible"
                   android:noHistory="true"
+                  android:exported="true"
                   android:excludeFromRecents="true">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.USER_DICTIONARY_INSERT" />
@@ -762,6 +810,7 @@
             android:name=".notification.zen.ZenSuggestionActivity"
             android:label="@string/zen_mode_settings_title"
             android:icon="@drawable/ic_suggestion_dnd"
+            android:exported="true"
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -821,6 +870,7 @@
         <activity android:name=".wallpaper.WallpaperSuggestionActivity"
                   android:label="@string/wallpaper_settings_title"
                   android:icon="@drawable/ic_wallpaper"
+                  android:exported="true"
                   android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -842,6 +892,7 @@
         <activity android:name=".wallpaper.StyleSuggestionActivity"
                   android:label="@string/style_suggestion_title"
                   android:icon="@drawable/ic_theme"
+                  android:exported="true"
                   android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -889,6 +940,7 @@
         <activity
             android:name="Settings$DisplaySettingsActivity"
             android:label="@string/display_settings"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_display">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.DISPLAY_SETTINGS" />
@@ -909,6 +961,7 @@
             android:name="Settings$NightDisplaySettingsActivity"
             android:label="@string/night_display_title"
             android:enabled="@*android:bool/config_nightDisplayAvailable"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_night_display">
             <intent-filter android:priority="32">
                 <action android:name="android.intent.action.MAIN" />
@@ -927,6 +980,7 @@
         <activity
                 android:name="Settings$DarkThemeSettingsActivity"
                 android:label="@string/dark_ui_auto_mode_title"
+                android:exported="true"
                 android:enabled="true">
             <intent-filter android:priority="32">
                 <action android:name="android.intent.action.MAIN" />
@@ -945,6 +999,7 @@
         <activity
             android:name="Settings$NightDisplaySuggestionActivity"
             android:enabled="@*android:bool/config_nightDisplayAvailable"
+            android:exported="true"
             android:icon="@drawable/ic_suggestion_night_display">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -964,6 +1019,7 @@
 
         <activity android:name=".Settings$MyDeviceInfoActivity"
                   android:label="@string/about_settings"
+                  android:exported="true"
                   android:icon="@drawable/ic_homepage_about">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DEVICE_INFO_SETTINGS" />
@@ -983,6 +1039,7 @@
         <activity
             android:name="SettingsLicenseActivity"
             android:label="@string/settings_license_activity_title"
+            android:exported="true"
             android:configChanges="orientation|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LICENSE" />
@@ -993,6 +1050,7 @@
         </activity>
 
         <activity android:name=".Settings$ModuleLicensesActivity"
+                  android:exported="true"
                   android:label="@string/module_license_title">
             <intent-filter>
                 <action android:name="android.settings.MODULE_LICENSES" />
@@ -1006,6 +1064,7 @@
 
         <activity
             android:name="Settings$ManageApplicationsActivity"
+            android:exported="true"
             android:label="@string/applications_settings">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_SETTINGS" />
@@ -1034,6 +1093,7 @@
 
         <activity
             android:name="Settings$ManageDomainUrlsActivity"
+            android:exported="true"
             android:label="@string/domain_urls_title">
             <intent-filter>
                 <action android:name="android.settings.MANAGE_DOMAIN_URLS" />
@@ -1045,6 +1105,7 @@
 
         <activity android:name="Settings$AppMemoryUsageActivity"
                   android:label="@string/app_list_memory_use"
+                  android:exported="true"
                   android:icon="@drawable/ic_settings_memory">
             <intent-filter>
                 <action android:name="android.settings.APP_MEMORY_USAGE" />
@@ -1056,6 +1117,7 @@
 
         <activity
             android:name="Settings$HighPowerApplicationsActivity"
+            android:exported="true"
             android:label="@string/high_power_apps">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS" />
@@ -1069,6 +1131,7 @@
 
         <activity
             android:name=".datausage.AppDataUsageActivity"
+            android:exported="true"
             android:noHistory="true">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS" />
@@ -1080,7 +1143,8 @@
         <activity
             android:name=".fuelgauge.RequestIgnoreBatteryOptimizations"
             android:label="@string/high_power_apps"
-            android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+            android:exported="true"
+            android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -1092,6 +1156,7 @@
             android:name=".slices.SliceDeepLinkSpringBoard"
             android:excludeFromRecents="true"
             android:theme="@android:style/Theme.NoDisplay"
+            android:exported="true"
             android:permission="android.permission.MODIFY_PHONE_STATE">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -1155,6 +1220,7 @@
 
         <!-- Provide direct entry into manage apps showing running services. -->
         <activity android:name="Settings$RunningServicesActivity"
+                android:exported="true"
                 android:label="@string/runningservices_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1171,6 +1237,7 @@
         <!-- Provide direct entry into manage apps showing storage usage of apps. -->
         <activity
             android:name="Settings$StorageUseActivity"
+            android:exported="true"
             android:label="@string/storageuse_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MANAGE_PACKAGE_STORAGE" />
@@ -1190,6 +1257,7 @@
 
         <activity
             android:name="Settings$NotificationStationActivity"
+            android:exported="true"
             android:label="@string/notification_log_title">
             <intent-filter android:priority="22">
                 <action android:name="android.intent.action.MAIN" />
@@ -1201,6 +1269,7 @@
 
         <activity
             android:name=".notification.history.NotificationHistoryActivity"
+            android:exported="true"
             android:label="@string/notification_history_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_HISTORY" />
@@ -1214,6 +1283,7 @@
 
         <activity android:name=".notification.zen.ZenModeVoiceActivity"
                 android:theme="@*android:style/Theme.DeviceDefault.Settings.Dialog.NoActionBar"
+                android:exported="true"
                 android:label="@string/zen_mode_settings_title">
             <intent-filter>
                 <action android:name="android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE" />
@@ -1226,6 +1296,7 @@
             android:name="Settings$LocationSettingsActivity"
             android:label="@string/location_settings_title"
             android:icon="@drawable/ic_homepage_location"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LOCATION_SOURCE_SETTINGS" />
@@ -1244,6 +1315,7 @@
             android:name="Settings$ScanningSettingsActivity"
             android:label="@string/location_scanning_screen_title"
             android:icon="@drawable/ic_homepage_location"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.LOCATION_SCANNING_SETTINGS" />
@@ -1259,6 +1331,7 @@
             android:name=".Settings$SecurityDashboardActivity"
             android:label="@string/security_settings_title"
             android:icon="@drawable/ic_homepage_security"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.SECURITY_SETTINGS" />
@@ -1279,6 +1352,7 @@
         <activity android:name="MonitoringCertInfoActivity"
                 android:label=""
                 android:theme="@style/Transparent"
+                android:exported="true"
                 android:excludeFromRecents="true">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.MONITORING_CERT_INFO" />
@@ -1289,6 +1363,7 @@
         <activity
             android:name="Settings$TrustedCredentialsSettingsActivity"
             android:label="@string/trusted_credentials"
+            android:exported="true"
             android:icon="@drawable/ic_settings_security">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.TRUSTED_CREDENTIALS" />
@@ -1304,6 +1379,7 @@
         <activity android:name="Settings$PrivacySettingsActivity"
                 android:label="@string/privacy_settings_title"
                 android:icon="@drawable/ic_settings_backup"
+                android:exported="true"
                 android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1318,6 +1394,7 @@
 
         <activity android:name="Settings$PrivacyDashboardActivity"
                   android:label="@string/privacy_dashboard_title"
+                  android:exported="true"
                   android:icon="@drawable/ic_settings_privacy">
             <intent-filter>
                 <action android:name="android.settings.PRIVACY_SETTINGS" />
@@ -1340,6 +1417,7 @@
         <activity android:name=".security.CredentialStorage"
                 android:theme="@style/Transparent"
                 android:launchMode="singleTop"
+                android:exported="true"
                 android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="com.android.credentials.INSTALL" />
@@ -1353,8 +1431,18 @@
                   android:exported="false">
         </activity>
 
+        <activity android:name=".security.RequestManageCredentials"
+                  android:theme="@style/Theme.RequestManageCredentials"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.security.MANAGE_CREDENTIALS"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
         <activity
             android:name="Settings$DeviceAdminSettingsActivity"
+            android:exported="true"
             android:label="@string/device_admin_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1376,6 +1464,7 @@
 
         <activity android:name=".applications.specialaccess.deviceadmin.DeviceAdminAdd"
                   android:label="@string/device_admin_add_title"
+                  android:exported="true"
                   android:clearTaskOnLaunch="true">
             <intent-filter>
                 <action android:name="android.app.action.ADD_DEVICE_ADMIN" />
@@ -1386,6 +1475,7 @@
         <activity android:name=".applications.specialaccess.deviceadmin.ProfileOwnerAdd"
                   android:excludeFromRecents="true"
                   android:theme="@style/Transparent"
+                  android:exported="true"
                   android:clearTaskOnLaunch="true">
             <intent-filter android:priority="1000">
                 <action android:name="android.app.action.SET_PROFILE_OWNER" />
@@ -1395,6 +1485,7 @@
 
         <activity
             android:name="Settings$UsageAccessSettingsActivity"
+            android:exported="true"
             android:label="@string/usage_access_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USAGE_ACCESS_SETTINGS" />
@@ -1408,6 +1499,7 @@
 
         <activity
             android:name="Settings$AppUsageAccessSettingsActivity"
+            android:exported="true"
             android:label="@string/usage_access_title">
             <intent-filter>
                 <action android:name="android.settings.USAGE_ACCESS_SETTINGS"/>
@@ -1420,6 +1512,7 @@
         </activity>
 
         <activity android:name="Settings$IccLockSettingsActivity"
+                android:exported="true"
                 android:label="@string/sim_lock_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -1434,6 +1527,7 @@
             android:name="Settings$AccessibilitySettingsActivity"
             android:label="@string/accessibility_settings"
             android:icon="@drawable/ic_homepage_accessibility"
+            android:exported="true"
             android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS" />
@@ -1452,6 +1546,7 @@
         <activity
             android:name="Settings$AccessibilityDetailsSettingsActivity"
             android:label="@string/accessibility_settings"
+            android:exported="true"
             android:permission="android.permission.OPEN_ACCESSIBILITY_DETAILS_SETTINGS">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACCESSIBILITY_DETAILS_SETTINGS" />
@@ -1466,6 +1561,7 @@
         <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
                 android:icon="@drawable/ic_accessibility_suggestion"
                 android:label="@string/vision_settings_title"
+                android:exported="true"
                 android:theme="@style/GlifV3Theme.Light">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
@@ -1495,6 +1591,7 @@
 
         <activity
             android:name="Settings$AccessibilityDaltonizerSettingsActivity"
+            android:exported="true"
             android:label="@string/accessibility_display_daltonizer_preference_title">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.ACCESSIBILITY_COLOR_SPACE_SETTINGS" />
@@ -1511,7 +1608,26 @@
         </activity>
 
         <activity
+            android:name="Settings$ReduceBrightColorsSettingsActivity"
+            android:exported="true"
+            android:label="@string/reduce_bright_colors_preference_title">
+            <intent-filter android:priority="1">
+                <action android:name="android.settings.REDUCE_BRIGHT_COLORS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                       android:value="true" />
+        </activity>
+
+        <activity
             android:name="Settings$CaptioningSettingsActivity"
+            android:exported="true"
             android:label="@string/accessibility_captioning_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.CAPTIONING_SETTINGS" />
@@ -1530,6 +1646,7 @@
 
         <activity
             android:name="Settings$TextToSpeechSettingsActivity"
+            android:exported="true"
             android:label="@string/tts_settings">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.TTS_SETTINGS" />
@@ -1543,6 +1660,7 @@
 
         <activity
             android:name="Settings$EnterprisePrivacySettingsActivity"
+            android:exported="true"
             android:label="@string/enterprise_privacy_settings">
             <intent-filter>
                 <action android:name="android.settings.ENTERPRISE_PRIVACY_SETTINGS" />
@@ -1720,6 +1838,7 @@
 
         <activity android:name=".password.SetupChooseLockGeneric"
             android:theme="@style/GlifTheme.Light"
+            android:exported="true"
             android:label="@string/lock_settings_picker_title">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
@@ -1739,6 +1858,7 @@
 
         <activity android:name=".password.SetNewPasswordActivity"
             android:theme="@android:style/Theme.NoDisplay"
+            android:exported="true"
             android:excludeFromRecents="true" >
             <intent-filter android:priority="1">
                 <action android:name="android.app.action.SET_NEW_PASSWORD" />
@@ -1750,6 +1870,7 @@
         </activity>
 
         <activity android:name=".password.ScreenLockSuggestionActivity"
+            android:exported="true"
             android:icon="@drawable/ic_suggestion_security">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.MAIN" />
@@ -1764,6 +1885,7 @@
         </activity>
 
         <activity android:name=".biometrics.fingerprint.FingerprintEnrollSuggestionActivity"
+            android:exported="true"
             android:icon="@drawable/ic_suggestion_fingerprint">
             <intent-filter android:priority="2">
                 <action android:name="android.intent.action.MAIN" />
@@ -1812,6 +1934,7 @@
         <activity
             android:name=".Settings$StorageDashboardActivity"
             android:label="@string/storage_settings"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_storage">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.INTERNAL_STORAGE_SETTINGS" />
@@ -1837,6 +1960,7 @@
 
         <activity
             android:name="Settings$PublicVolumeSettingsActivity"
+            android:exported="true"
             android:label="@string/storage_settings_title">
             <intent-filter>
                 <action android:name="android.provider.action.DOCUMENT_ROOT_SETTINGS" />
@@ -1897,6 +2021,7 @@
 
         <activity android:name="Settings$ApnEditorActivity"
                 android:configChanges="orientation|keyboardHidden|screenSize"
+                android:exported="true"
                 android:label="@string/apn_edit">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -1911,17 +2036,19 @@
                 <data android:mimeType="vnd.android.cursor.dir/telephony-carrier" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.network.ApnEditor" />
+                       android:value="com.android.settings.network.apn.ApnEditor" />
         </activity>
 
         <activity
             android:name="Settings$DevelopmentSettingsDashboardActivity"
             android:label="@string/development_settings_title"
             android:icon="@drawable/ic_settings_development"
+            android:exported="true"
             android:enabled="false">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
                 <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
@@ -1945,6 +2072,7 @@
             android:icon="@drawable/ic_settings_development"
             android:label="@string/development_settings_title"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:theme="@style/Transparent">
             <intent-filter android:priority="-1">
                 <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />
@@ -1956,6 +2084,7 @@
         <activity
             android:name="Settings$PrintSettingsActivity"
             android:label="@string/print_settings"
+            android:exported="true"
             android:icon="@drawable/ic_settings_print">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
@@ -1971,6 +2100,7 @@
         </activity>
 
         <activity android:name="Settings$PrintJobSettingsActivity"
+                android:exported="true"
                 android:label="@string/print_print_job">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACTION_PRINT_SETTINGS" />
@@ -2017,6 +2147,7 @@
                   android:excludeFromRecents="true"
                   android:windowSoftInputMode="stateVisible|adjustResize"
                   android:theme="@style/Theme.AlertDialog"
+                  android:exported="true"
                   android:taskAffinity=".bluetooth.BluetoothPairingDialog">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
@@ -2027,6 +2158,7 @@
         <activity android:name=".bluetooth.RequestPermissionActivity"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
+                  android:exported="true"
                   android:theme="@style/Theme.BluetoothPermission">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.adapter.action.REQUEST_DISCOVERABLE" />
@@ -2038,6 +2170,7 @@
 
         <activity android:name=".wifi.WifiScanModeActivity"
                   android:excludeFromRecents="true"
+                  android:exported="true"
                   android:theme="@style/Transparent">
             <intent-filter android:priority="1">
                 <action android:name="android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE" />
@@ -2068,18 +2201,20 @@
                   android:label="@string/bluetooth_pairing_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH"
-                  android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert">
+                  android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight">
         </activity>
 
         <service android:name=".bluetooth.BluetoothPairingService" />
 
-        <receiver android:name=".bluetooth.BluetoothPairingRequest">
+        <receiver android:name=".bluetooth.BluetoothPairingRequest"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
             </intent-filter>
         </receiver>
 
         <receiver android:name=".bluetooth.BluetoothPermissionRequest"
+                  android:exported="true"
                   android:permission="android.permission.BLUETOOTH_ADMIN">
             <intent-filter>
                 <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
@@ -2091,6 +2226,7 @@
                   android:label="@string/bluetooth_connection_permission_request"
                   android:excludeFromRecents="true"
                   android:permission="android.permission.BLUETOOTH_ADMIN"
+                  android:exported="true"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
             <intent-filter android:priority="1">
                 <action android:name="android.bluetooth.device.action.CONNECTION_ACCESS_REQUEST" />
@@ -2101,7 +2237,8 @@
 
         <activity android:name="ActivityPicker"
                 android:label="@string/activity_picker_label"
-                android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
+                android:exported="true"
                 android:finishOnCloseSystemDialogs="true">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.PICK_ACTIVITY" />
@@ -2112,6 +2249,7 @@
         <!-- NFC settings -->
         <activity
             android:name="Settings$AndroidBeamSettingsActivity"
+            android:exported="true"
             android:label="@string/android_beam_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFCSHARING_SETTINGS" />
@@ -2126,6 +2264,7 @@
         <activity
             android:name="Settings$WifiDisplaySettingsActivity"
             android:label="@string/wifi_display_settings_title"
+            android:exported="true"
             android:icon="@drawable/ic_cast_24dp">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.CAST_SETTINGS" />
@@ -2140,7 +2279,8 @@
                 android:value="com.android.settings.TestingSettings" />
         </activity>
 
-        <receiver android:name=".TestingSettingsBroadcastReceiver">
+        <receiver android:name=".TestingSettingsBroadcastReceiver"
+            android:exported="true">
             <intent-filter>
                  <action android:name="android.telephony.action.SECRET_CODE" />
                  <data android:scheme="android_secret_code" android:host="4636" />
@@ -2150,7 +2290,8 @@
         <!-- Standard picker for widgets -->
         <activity android:name="AppWidgetPickActivity"
                 android:label="@string/widget_picker_title"
-                android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
+                android:exported="true"
                 android:finishOnCloseSystemDialogs="true">
             <intent-filter android:priority="1">
                 <action android:name="android.appwidget.action.APPWIDGET_PICK" />
@@ -2159,8 +2300,9 @@
         </activity>
 
         <activity android:name="AllowBindAppWidgetActivity"
-                android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"
+                android:theme="@*android:style/Theme.DeviceDefault.Dialog.Alert.DayNight"
                 android:finishOnCloseSystemDialogs="true"
+                android:exported="true"
                 android:excludeFromRecents="true">
             <intent-filter android:priority="1">
                 <action android:name="android.appwidget.action.APPWIDGET_BIND" />
@@ -2169,6 +2311,7 @@
         </activity>
 
         <activity android:name="UsageStatsActivity"
+                  android:exported="true"
                   android:label="@string/usage_stats_label">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2179,6 +2322,7 @@
         <activity
             android:name="Settings$PowerUsageSummaryActivity"
             android:label="@string/power_usage_summary_title"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_battery">
             <intent-filter android:priority="1">
                 <action android:name="android.intent.action.POWER_USAGE_SUMMARY" />
@@ -2195,6 +2339,7 @@
         <activity
             android:name="Settings$BatterySaverSettingsActivity"
             android:label="@string/battery_saver"
+            android:exported="true"
             android:icon="@drawable/ic_settings_battery">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.BATTERY_SAVER_SETTINGS" />
@@ -2219,6 +2364,7 @@
 
         <activity
             android:name="Settings$AccountSyncSettingsActivity"
+            android:exported="true"
             android:label="@string/account_sync_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACCOUNT_SYNC_SETTINGS" />
@@ -2232,6 +2378,7 @@
         <activity
             android:name="Settings$ManagedProfileSettingsActivity"
             android:label="@string/managed_profile_settings_title"
+            android:exported="true"
             android:permission="android.permission.MANAGE_USERS">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGED_PROFILE_SETTINGS" />
@@ -2245,6 +2392,7 @@
             android:name="com.android.settings.accounts.AddAccountSettings"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"
             android:configChanges="orientation|keyboardHidden|screenSize"
+            android:exported="true"
             android:label="@string/header_add_an_account">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ADD_ACCOUNT_SETTINGS" />
@@ -2271,6 +2419,7 @@
                   android:windowSoftInputMode="adjustResize"
                   android:screenOrientation="nosensor"
                   android:taskAffinity="com.android.settings.CryptKeeper"
+                  android:exported="true"
                   android:process=":CryptKeeper">
             <intent-filter android:priority="10">
                 <action android:name="android.intent.action.MAIN" />
@@ -2285,6 +2434,7 @@
                   android:label=""
                   android:screenOrientation="nosensor"
                   android:taskAffinity="com.android.settings.FallbackHome"
+                  android:exported="true"
                   android:theme="@style/FallbackHome">
             <intent-filter android:priority="-1000">
                 <action android:name="android.intent.action.MAIN" />
@@ -2307,6 +2457,7 @@
 
         <!-- Pseudo-activity used to provide an intent-filter entry point to encryption settings -->
         <activity android:name="Settings$CryptKeeperSettingsActivity"
+                android:exported="true"
                 android:label="@string/crypt_keeper_encrypt_title">
             <intent-filter android:priority="1">
                 <action android:name="android.app.action.START_ENCRYPTION" />
@@ -2319,6 +2470,7 @@
         <activity
             android:name="Settings$DataUsageSummaryActivity"
             android:label="@string/data_usage_summary_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_data_usage">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DATA_USAGE_SETTINGS" />
@@ -2333,6 +2485,7 @@
         </activity>
         <activity
             android:name="Settings$MobileDataUsageListActivity"
+            android:exported="true"
             android:label="@string/cellular_data_usage">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MOBILE_DATA_USAGE" />
@@ -2345,6 +2498,7 @@
         <activity
             android:name="Settings$DreamSettingsActivity"
             android:label="@string/screensaver_settings_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_display">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.DREAM_SETTINGS" />
@@ -2359,6 +2513,7 @@
         <activity
             android:name="Settings$UserSettingsActivity"
             android:label="@string/user_settings_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_multiuser">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.USER_SETTINGS" />
@@ -2381,6 +2536,7 @@
         <activity
             android:name="Settings$PaymentSettingsActivity"
             android:label="@string/nfc_payment_settings_title"
+            android:exported="true"
             android:icon="@drawable/ic_settings_nfc_payment">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFC_PAYMENT_SETTINGS" />
@@ -2399,6 +2555,7 @@
         <activity android:name=".nfc.PaymentDefaultDialog"
                   android:label="@string/nfc_payment_set_default_label"
                   android:excludeFromRecents="true"
+                  android:exported="true"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert">
             <intent-filter android:priority="1">
                 <action android:name="android.nfc.cardemulation.action.ACTION_CHANGE_DEFAULT" />
@@ -2415,6 +2572,7 @@
 
         <activity
             android:name="Settings$NotificationAccessSettingsActivity"
+            android:exported="true"
             android:label="@string/manage_notification_access_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS" />
@@ -2426,6 +2584,7 @@
 
         <activity
             android:name="Settings$NotificationAccessDetailsActivity"
+            android:exported="true"
             android:label="@string/manage_notification_access_title" >
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_LISTENER_DETAIL_SETTINGS" />
@@ -2437,6 +2596,7 @@
 
         <activity
             android:name="Settings$NotificationAssistantSettingsActivity"
+            android:exported="true"
             android:label="@string/notification_assistant_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_ASSISTANT_SETTINGS" />
@@ -2448,6 +2608,7 @@
 
         <activity
             android:name="Settings$VrListenersSettingsActivity"
+            android:exported="true"
             android:label="@string/vr_listeners_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.VR_LISTENER_SETTINGS" />
@@ -2459,6 +2620,7 @@
 
         <activity
             android:name="Settings$PictureInPictureSettingsActivity"
+            android:exported="true"
             android:label="@string/picture_in_picture_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.PICTURE_IN_PICTURE_SETTINGS" />
@@ -2474,6 +2636,7 @@
 
         <activity
             android:name="Settings$AppPictureInPictureSettingsActivity"
+            android:exported="true"
             android:label="@string/picture_in_picture_title">
             <intent-filter>
                 <action android:name="android.settings.PICTURE_IN_PICTURE_SETTINGS" />
@@ -2486,6 +2649,7 @@
 
         <activity
             android:name="Settings$InteractAcrossProfilesSettingsActivity"
+            android:exported="true"
             android:label="@string/interact_across_profiles_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_CROSS_PROFILE_ACCESS" />
@@ -2496,6 +2660,7 @@
         </activity>
 
         <activity android:name="Settings$AppInteractAcrossProfilesSettingsActivity"
+                  android:exported="true"
                   android:label="@string/interact_across_profiles_title">
             <intent-filter>
                 <action android:name="android.settings.MANAGE_CROSS_PROFILE_ACCESS" />
@@ -2509,6 +2674,7 @@
         <activity
             android:name="Settings$ZenAccessDetailSettingsActivity"
             android:label="@string/manage_zen_access_title"
+            android:exported="true"
             android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_DETAIL_SETTINGS" />
@@ -2521,6 +2687,7 @@
 
         <activity
             android:name="Settings$ZenAccessSettingsActivity"
+            android:exported="true"
             android:label="@string/manage_zen_access_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NOTIFICATION_POLICY_ACCESS_SETTINGS" />
@@ -2564,6 +2731,7 @@
 
         <activity
             android:name="Settings$AppBubbleNotificationSettingsActivity"
+            android:exported="true"
             android:label="@string/bubbles_app_toggle_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS" />
@@ -2574,6 +2742,19 @@
         </activity>
 
         <activity
+            android:name="Settings$PremiumSmsAccessActivity"
+            android:label="@string/premium_sms_access"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.settings.PREMIUM_SMS_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="package" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess" />
+        </activity>
+
+        <activity
             android:name="Settings$SoundSettingsActivity"
             android:label="@string/sound_settings"
             android:icon="@drawable/ic_homepage_sound"
@@ -2634,6 +2815,7 @@
         <activity
             android:name="ManualDisplayActivity"
             android:label="@string/manual"
+            android:exported="true"
             android:enabled="@bool/config_show_manual">
             <intent-filter>
                 <action android:name="android.settings.SHOW_MANUAL" />
@@ -2647,6 +2829,7 @@
         <activity
             android:name="RegulatoryInfoDisplayActivity"
             android:label="@string/regulatory_labels"
+            android:exported="true"
             android:enabled="@bool/config_show_regulatory_info">
             <intent-filter>
                 <action android:name="android.settings.SHOW_REGULATORY_INFO" />
@@ -2660,20 +2843,23 @@
         <activity android:name=".notification.NotificationAccessConfirmationActivity"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" />
 
-        <receiver android:name="com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver">
+        <receiver android:name="com.android.settingslib.bluetooth.BluetoothDiscoverableTimeoutReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.bluetooth.intent.DISCOVERABLE_TIMEOUT" />
             </intent-filter>
         </receiver>
 
         <!-- Watch for ContactsContract.Profile changes and update the user's photo.  -->
-        <receiver android:name=".users.ProfileUpdateReceiver">
+        <receiver android:name=".users.ProfileUpdateReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.provider.Contacts.PROFILE_CHANGED" />
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".sim.SimSelectNotification">
+        <receiver android:name=".sim.SimSelectNotification"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.telephony.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED"/>
                 <action android:name="android.settings.ENABLE_MMS_DATA_REQUEST"/>
@@ -2700,6 +2886,7 @@
             android:name=".wifi.RequestToggleWiFiActivity"
             android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"
             android:excludeFromRecents="true"
+            android:exported="true"
             android:permission="android.permission.CHANGE_WIFI_STATE">
             <intent-filter>
                 <action android:name="android.net.wifi.action.REQUEST_ENABLE" />
@@ -2746,6 +2933,7 @@
             android:theme="@style/Theme.AlertDialog"
             android:label="@string/sim_settings_title"
             android:launchMode="singleTop"
+            android:exported="true"
             android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2761,6 +2949,7 @@
 
         <activity
             android:name="Settings$WifiCallingSettingsActivity"
+            android:exported="true"
             android:label="@string/wifi_calling_settings_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2776,6 +2965,7 @@
 
         <activity android:name=".wifi.calling.WifiCallingSuggestionActivity"
                   android:label="@string/wifi_calling_settings_title"
+                  android:exported="true"
                   android:icon="@drawable/ic_suggestion_wireless">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2814,6 +3004,7 @@
 
         <activity
             android:name="Settings$OverlaySettingsActivity"
+            android:exported="true"
             android:label="@string/draw_overlay">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_OVERLAY_PERMISSION" />
@@ -2833,6 +3024,7 @@
         <activity
             android:name="Settings$AppDrawOverlaySettingsActivity"
             android:label="@string/draw_overlay"
+            android:exported="true"
             android:permission="android.permission.INTERNAL_SYSTEM_WINDOW">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_APP_OVERLAY_PERMISSION" />
@@ -2845,6 +3037,7 @@
 
         <activity
             android:name="Settings$WriteSettingsActivity"
+            android:exported="true"
             android:label="@string/write_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_WRITE_SETTINGS" />
@@ -2858,6 +3051,7 @@
 
         <activity
             android:name="Settings$AppWriteSettingsActivity"
+            android:exported="true"
             android:label="@string/write_settings_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.action.MANAGE_WRITE_SETTINGS" />
@@ -2870,6 +3064,7 @@
 
         <activity
             android:name="Settings$ManageExternalSourcesActivity"
+            android:exported="true"
             android:label="@string/install_other_apps">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_UNKNOWN_APP_SOURCES" />
@@ -2882,6 +3077,7 @@
         </activity>
 
         <activity android:name="Settings$ManageAppExternalSourcesActivity"
+                  android:exported="true"
                   android:label="@string/install_other_apps">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_UNKNOWN_APP_SOURCES" />
@@ -2896,6 +3092,7 @@
                 android:theme="@style/Transparent"
                 android:taskAffinity="com.android.settings.enterprise"
                 android:excludeFromRecents="true"
+                android:exported="true"
                 android:launchMode="singleTop">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.SHOW_ADMIN_SUPPORT_DETAILS" />
@@ -2905,6 +3102,7 @@
 
         <activity
             android:name="Settings$ManageExternalStorageActivity"
+            android:exported="true"
             android:label="@string/manage_external_storage_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_ALL_FILES_ACCESS_PERMISSION" />
@@ -2918,6 +3116,7 @@
 
         <activity
             android:name="Settings$AppManageExternalStorageActivity"
+            android:exported="true"
             android:label="@string/manage_external_storage_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.MANAGE_APP_ALL_FILES_ACCESS_PERMISSION" />
@@ -2951,6 +3150,7 @@
 
         <activity android:name=".backup.UserBackupSettingsActivity"
                   android:label="@string/privacy_settings_title"
+                  android:exported="true"
                   android:icon="@drawable/ic_settings_backup">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -2986,9 +3186,10 @@
             android:name=".fuelgauge.AdvancedPowerUsageDetailActivity"
             android:excludeFromRecents="true"
             android:launchMode="singleInstance"
+            android:exported="true"
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
-                <action android:name="android.settings.APP_BATTERY_SETTINGS" />
+                <action android:name="android.settings.VIEW_ADVANCED_POWER_USAGE_DETAIL" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <data android:scheme="package" />
             </intent-filter>
@@ -3006,6 +3207,7 @@
         <activity
             android:name=".Settings$AccountDashboardActivity"
             android:label="@string/account_dashboard_title"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_accounts">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.SYNC_SETTINGS" />
@@ -3024,6 +3226,7 @@
         <activity
             android:name=".Settings$SystemDashboardActivity"
             android:label="@string/header_category_system"
+            android:exported="true"
             android:icon="@drawable/ic_homepage_system_dashboard">
             <intent-filter android:priority="70">
                 <action android:name="android.intent.action.MAIN" />
@@ -3037,6 +3240,7 @@
                   android:label="@string/page_tab_title_support"
                   android:icon="@drawable/ic_homepage_support"
                   android:theme="@android:style/Theme.DeviceDefault.Light.Panel"
+                  android:exported="true"
                   android:enabled="@bool/config_support_enabled">
             <intent-filter>
                 <action android:name="com.android.settings.action.SUPPORT_SETTINGS" />
@@ -3055,6 +3259,7 @@
             android:label="@string/debug_layout"
             android:icon="@drawable/tile_icon_show_layout"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3067,6 +3272,7 @@
             android:label="@string/track_frame_time"
             android:icon="@drawable/tile_icon_graphics"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3079,6 +3285,7 @@
             android:label="@string/force_rtl_layout_all_locales"
             android:icon="@drawable/tile_icon_force_rtl"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3091,6 +3298,7 @@
             android:label="@string/window_animation_scale_title"
             android:icon="@drawable/tile_icon_animation_speed"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3104,6 +3312,7 @@
             android:label="@string/winscope_trace_quick_settings_title"
             android:icon="@drawable/tile_icon_winscope_trace"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3117,6 +3326,7 @@
             android:label="@string/sensors_off_quick_settings_title"
             android:icon="@drawable/tile_icon_sensors_off"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3130,6 +3340,21 @@
             android:label="@string/enable_adb_wireless"
             android:icon="@drawable/tile_icon_debugging_wireless"
             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
+            android:enabled="false">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+            <meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                       android:value="true"/>
+        </service>
+
+        <service
+            android:name=".development.qstile.DevelopmentTiles$ShowTaps"
+            android:label="@string/show_touches"
+            android:icon="@drawable/tile_icon_show_taps"
+            android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+            android:exported="true"
             android:enabled="false">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3156,6 +3381,7 @@
                 android:theme="@android:style/Theme.NoDisplay"
                 android:excludeFromRecents="true"
                 android:launchMode="singleInstance"
+                android:exported="true"
                 android:label="@string/autofill_app">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.REQUEST_SET_AUTOFILL_SERVICE" />
@@ -3165,6 +3391,7 @@
         </activity>
 
         <activity android:name="Settings$AdvancedConnectedDeviceActivity"
+                  android:exported="true"
                   android:label="@string/connected_device_connections_title">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.NFC_SETTINGS" />
@@ -3182,6 +3409,7 @@
 
         <activity android:name="Settings$BluetoothDeviceDetailActivity"
                   android:label="@string/device_details_title"
+                  android:exported="true"
                   android:permission="android.permission.BLUETOOTH_ADMIN">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.BLUETOOTH_DEVICE_DETAIL_SETTINGS" />
@@ -3223,6 +3451,7 @@
                   android:theme="@style/Theme.Panel"
                   android:launchMode="singleInstance"
                   android:excludeFromRecents="true"
+                  android:exported="true"
                   android:configChanges="orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.settings.WIFI_ADD_NETWORKS" />
@@ -3230,20 +3459,6 @@
             </intent-filter>
         </activity>
 
-        <activity-alias
-            android:name="MediaOutputSlice"
-            android:label="@string/media_output_panel_title"
-            android:targetActivity=".panel.SettingsPanelActivity">
-                <intent-filter>
-                    <action android:name="com.android.settings.panel.action.MEDIA_OUTPUT" />
-                    <category android:name="android.intent.category.DEFAULT" />
-                </intent-filter>
-                <intent-filter>
-                    <action android:name="com.android.settings.panel.action.MEDIA_OUTPUT_GROUP" />
-                    <category android:name="android.intent.category.DEFAULT" />
-                </intent-filter>
-        </activity-alias>
-
         <provider android:name=".slices.SettingsSliceProvider"
                   android:authorities="com.android.settings.slices;android.settings.slices"
                   android:exported="true"
@@ -3258,12 +3473,18 @@
             android:permission="android.permission.MANAGE_SLICE_PERMISSIONS"
             android:exported="true" />
 
+        <receiver
+            android:name=".slices.VolumeSliceRelayReceiver"
+            android:permission="android.permission.MANAGE_SLICE_PERMISSIONS"
+            android:exported="true" />
+
         <!-- Couldn't be triggered from outside of settings. Statsd can trigger it because we send
              PendingIntent to it-->
         <receiver android:name=".fuelgauge.batterytip.AnomalyDetectionReceiver"
                   android:exported="false" />
 
-        <receiver android:name=".fuelgauge.batterytip.AnomalyConfigReceiver">
+        <receiver android:name=".fuelgauge.batterytip.AnomalyConfigReceiver"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.app.action.STATSD_STARTED"/>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
@@ -3296,7 +3517,8 @@
         </provider>
 
         <activity
-            android:name=".wifi.dpp.WifiDppConfiguratorActivity">
+            android:name=".wifi.dpp.WifiDppConfiguratorActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.settings.WIFI_DPP_CONFIGURATOR_QR_CODE_SCANNER"/>
                 <action android:name="android.settings.WIFI_DPP_CONFIGURATOR_QR_CODE_GENERATOR"/>
@@ -3310,7 +3532,8 @@
         </activity>
 
         <activity
-            android:name=".wifi.dpp.WifiDppEnrolleeActivity">
+            android:name=".wifi.dpp.WifiDppEnrolleeActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.settings.WIFI_DPP_ENROLLEE_QR_CODE_SCANNER"/>
                 <category android:name="android.intent.category.DEFAULT"/>
@@ -3326,6 +3549,7 @@
         <activity
             android:name="Settings$WifiCallingDisclaimerActivity"
             android:label="@string/wifi_calling_settings_title"
+            android:exported="true"
             android:taskAffinity="com.android.settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -3336,6 +3560,7 @@
         </activity>
 
         <activity android:name="Settings$BatterySaverScheduleSettingsActivity"
+            android:exported="true"
             android:label="@string/battery_saver_schedule_settings_title">
             <intent-filter>
                 <action android:name="com.android.settings.BATTERY_SAVER_SCHEDULE_SETTINGS" />
@@ -3346,6 +3571,7 @@
         </activity>
 
         <activity android:name="Settings$GlobalActionsPanelSettingsActivity"
+            android:exported="true"
             android:label="@string/cards_passes_sentence">
             <intent-filter>
                 <action android:name="com.android.settings.GLOBAL_ACTIONS_PANEL_SETTINGS" />
@@ -3356,6 +3582,7 @@
         </activity>
 
         <activity android:name="Settings$PowerMenuSettingsActivity"
+                  android:exported="true"
                   android:label="@string/power_menu_setting_name">
             <intent-filter>
                 <action android:name="android.settings.ACTION_POWER_MENU_SETTINGS" />
@@ -3366,6 +3593,7 @@
         </activity>
 
         <activity android:name="Settings$DeviceControlsSettingsActivity"
+                      android:exported="true"
                       android:label="@string/device_controls_sentence">
             <intent-filter>
                 <action android:name="android.settings.ACTION_DEVICE_CONTROLS_SETTINGS" />
@@ -3378,6 +3606,7 @@
         <activity
             android:name="Settings$GestureNavigationSettingsActivity"
             android:label="@string/gesture_settings_activity_title"
+            android:exported="true"
             android:enabled="true">
             <intent-filter android:priority="32">
                 <action android:name="android.intent.action.MAIN" />
@@ -3404,6 +3633,34 @@
                        android:value="com.android.settings.sound.MediaControlsSettings" />
         </activity>
 
+        <receiver
+            android:name=".media.BluetoothPairingReceiver"
+            android:exported="true"
+            android:permission="android.permission.BLUETOOTH_ADMIN">
+            <intent-filter>
+                <action android:name="com.android.settings.action.LAUNCH_BLUETOOTH_PAIRING"/>
+            </intent-filter>/>
+        </receiver>
+
+        <receiver
+            android:name=".sim.receivers.SimSlotChangeReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.telephony.action.SIM_SLOT_STATUS_CHANGED" />
+            </intent-filter>
+        </receiver>
+
+        <receiver
+            android:name=".sim.receivers.SimCompleteBootReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+            </intent-filter>
+        </receiver>
+
+        <service android:name=".sim.SimNotificationService"
+                 android:permission="android.permission.BIND_JOB_SERVICE" />
+
         <!-- This is the longest AndroidManifest.xml ever. -->
     </application>
 </manifest>
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/OWNERS b/OWNERS
index 47961cd..c008e28 100644
--- a/OWNERS
+++ b/OWNERS
@@ -2,6 +2,7 @@
 android-settings-core-eng+gerrit@google.com
 
 # People who can approve changes for submission
+arcwang@google.com
 chiujason@google.com
 edgarwang@google.com
 emilychuang@google.com
@@ -11,5 +12,8 @@
 tmfang@google.com
 yantingyang@google.com
 
+# Emergency only
+luyota@google.com
+
 # Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)
 per-file *.xml=*
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 883e968..5100c03 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -4,3 +4,5 @@
 strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}
 
 checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
+
+robolectric_hook = ${REPO_ROOT}/packages/apps/Settings/tests/robotests/new_tests_hook.sh ${REPO_PROJECT}
diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index f959f91..b138082 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -41,38 +41,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="        android:color=&quot;@color/notification_importance_button_selected&quot;/>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/button_border_selected.xml"
-            line="23"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="        android:color=&quot;@color/notification_importance_button_selected&quot;/>"
-        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/button_border_selected.xml"
-            line="23"
-            column="9"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="        android:color=&quot;@color/notification_importance_button_unselected&quot;/>"
         errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -297,6 +265,22 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;notification_history_background&quot;>#202124&lt;/color>"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values-night/colors.xml"
+            line="30"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    &lt;color name=&quot;setup_lock_pattern_view_error_color_dark&quot;>#fff44336&lt;/color>"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -1341,7 +1325,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="137"
+            line="138"
             column="5"/>
     </issue>
 
@@ -1357,7 +1341,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="138"
+            line="139"
             column="5"/>
     </issue>
 
@@ -1373,7 +1357,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="139"
+            line="140"
             column="5"/>
     </issue>
 
@@ -1389,7 +1373,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="148"
+            line="149"
             column="5"/>
     </issue>
 
@@ -1405,7 +1389,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="150"
+            line="151"
             column="5"/>
     </issue>
 
@@ -1421,7 +1405,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="154"
+            line="155"
             column="5"/>
     </issue>
 
@@ -1437,7 +1421,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="155"
+            line="156"
             column="5"/>
     </issue>
 
@@ -1453,7 +1437,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="156"
+            line="157"
             column="5"/>
     </issue>
 
@@ -1469,7 +1453,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="157"
+            line="158"
             column="5"/>
     </issue>
 
@@ -1485,7 +1469,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="158"
+            line="159"
             column="5"/>
     </issue>
 
@@ -1501,7 +1485,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="159"
+            line="160"
             column="5"/>
     </issue>
 
@@ -1517,7 +1501,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="160"
+            line="161"
             column="5"/>
     </issue>
 
@@ -1529,11 +1513,11 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;palette_list_color_pink&quot;>#e52592&lt;/color> &lt;!-- Material Pink 600 -->"
+        errorLine1="    &lt;color name=&quot;palette_list_color_gray&quot;>#80868b&lt;/color> &lt;!-- Material Gray 600 -->"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="161"
+            line="162"
             column="5"/>
     </issue>
 
@@ -1549,7 +1533,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="164"
+            line="165"
             column="5"/>
     </issue>
 
@@ -1565,7 +1549,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="165"
+            line="166"
             column="5"/>
     </issue>
 
@@ -1581,7 +1565,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="166"
+            line="167"
             column="5"/>
     </issue>
 
@@ -1597,7 +1581,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="167"
+            line="168"
             column="5"/>
     </issue>
 
@@ -1613,7 +1597,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="168"
+            line="169"
             column="5"/>
     </issue>
 
@@ -1629,7 +1613,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="169"
+            line="170"
             column="5"/>
     </issue>
 
@@ -1645,7 +1629,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="170"
+            line="171"
             column="5"/>
     </issue>
 
@@ -1657,11 +1641,203 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;palette_list_dark_mode_color_pink&quot;>#ff8bcb&lt;/color> &lt;!-- Material Pink 300 -->"
+        errorLine1="    &lt;color name=&quot;palette_list_dark_mode_color_gray&quot;>#dadce0&lt;/color> &lt;!-- Material Gray 300 -->"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/colors.xml"
-            line="171"
+            line="172"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_color_teal&quot;>#ff00796b&lt;/color> &lt;!-- Material Teal 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="175"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_color_blue&quot;>#ff3367d6&lt;/color> &lt;!-- Material Blue 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="176"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_color_indigo&quot;>#ff303f9f&lt;/color> &lt;!-- Material Indigo 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="177"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_color_purple&quot;>#ff7b1fa2&lt;/color> &lt;!-- Material Purple 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="178"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_color_pink&quot;>#ffc2185b&lt;/color> &lt;!-- Material Pink 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="179"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_color_red&quot;>#ffd32f2f&lt;/color> &lt;!-- Material Red 700 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="180"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_teal&quot;>#ff80cbc4&lt;/color> &lt;!-- Material Teal 200 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="183"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_blue&quot;>#ff90caf9&lt;/color> &lt;!-- Material Blue 200 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="184"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_indigo&quot;>#ffc5cae9&lt;/color> &lt;!-- Material Indigo 100 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="185"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_purple&quot;>#ffe1bee7&lt;/color> &lt;!-- Material Purple 100 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="186"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_pink&quot;>#fff48fb1&lt;/color> &lt;!-- Material Pink 200 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="187"
+            column="5"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="    &lt;color name=&quot;SIM_dark_mode_color_red&quot;>#ffef9a9a&lt;/color> &lt;!-- Material Red 200 -->"
+        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/values/colors.xml"
+            line="188"
             column="5"/>
     </issue>
 
@@ -2217,6 +2393,38 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:color=&quot;@color/homepage_generic_icon_background&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_homepage_night_display.xml"
+            line="24"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
+        errorLine1="            android:color=&quot;@color/homepage_generic_icon_background&quot; />"
+        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="res/drawable/ic_homepage_notification.xml"
+            line="24"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="HardCodedColor"
+        severity="Error"
+        message="Avoid using hardcoded color"
+        category="Correctness"
+        priority="4"
+        summary="Using hardcoded color"
+        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="            android:color=&quot;@color/homepage_privacy_background&quot; />"
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -2329,54 +2537,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="            android:color=&quot;@color/homepage_generic_icon_background&quot; />"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/ic_homepage_night_display.xml"
-            line="24"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="            android:color=&quot;@color/homepage_generic_icon_background&quot; />"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/ic_homepage_notification.xml"
-            line="24"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="                android:color=&quot;@color/notification_alert_color&quot; />"
-        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/ic_notification_alert.xml"
-            line="22"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="                    android:color=&quot;@color/notification_block_color&quot;/>"
         errorLine2="                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
@@ -2909,7 +3069,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rAU/strings.xml"
-            line="2689"
+            line="2793"
             column="64"/>
     </issue>
 
@@ -2925,7 +3085,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rCA/strings.xml"
-            line="2689"
+            line="2793"
             column="64"/>
     </issue>
 
@@ -2941,7 +3101,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rGB/strings.xml"
-            line="2689"
+            line="2793"
             column="64"/>
     </issue>
 
@@ -2957,7 +3117,7 @@
         errorLine2="                                                               ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rIN/strings.xml"
-            line="2689"
+            line="2793"
             column="64"/>
     </issue>
 
@@ -2973,7 +3133,7 @@
         errorLine2="                                                                                                                                                                         ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values-en-rXC/strings.xml"
-            line="2689"
+            line="2793"
             column="170"/>
     </issue>
 
@@ -2989,7 +3149,7 @@
         errorLine2="                                   ~~~~~~~~~~~~~~~~~~~">
         <location
             file="res/values/strings.xml"
-            line="6228"
+            line="6463"
             column="36"/>
     </issue>
 
@@ -3005,7 +3165,7 @@
         errorLine2="                                        ^">
         <location
             file="res/values/styles.xml"
-            line="163"
+            line="201"
             column="41"/>
     </issue>
 
@@ -3021,7 +3181,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="378"
+            line="428"
             column="44"/>
     </issue>
 
@@ -3037,7 +3197,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="384"
+            line="434"
             column="44"/>
     </issue>
 
@@ -3053,7 +3213,7 @@
         errorLine2="                                           ^">
         <location
             file="res/values/styles.xml"
-            line="385"
+            line="435"
             column="44"/>
     </issue>
 
@@ -3069,7 +3229,7 @@
         errorLine2="                                 ^">
         <location
             file="res/values/styles.xml"
-            line="421"
+            line="471"
             column="34"/>
     </issue>
 
@@ -3181,7 +3341,7 @@
         errorLine2="                                         ^">
         <location
             file="res/values/themes.xml"
-            line="254"
+            line="258"
             column="42"/>
     </issue>
 
@@ -3337,22 +3497,6 @@
         priority="4"
         summary="Using hardcoded color"
         explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="          android:background=&quot;@color/divider_color&quot; />"
-        errorLine2="          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/layout/user_info_header.xml"
-            line="93"
-            column="11"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
         errorLine1="    android:background=&quot;@color/gestures_setting_background_color&quot;"
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
diff --git a/res/drawable/accessibility_magnification_full_screen.png b/res/drawable/accessibility_magnification_full_screen.png
index 7fcd17d..2e87ab8 100644
--- a/res/drawable/accessibility_magnification_full_screen.png
+++ b/res/drawable/accessibility_magnification_full_screen.png
Binary files differ
diff --git a/res/drawable/accessibility_magnification_window_screen.png b/res/drawable/accessibility_magnification_window_screen.png
index db1f332..a7f2a25 100644
--- a/res/drawable/accessibility_magnification_window_screen.png
+++ b/res/drawable/accessibility_magnification_window_screen.png
Binary files differ
diff --git a/res/drawable/ic_airplane_safe_networks_24dp.xml b/res/drawable/ic_airplane_safe_networks_24dp.xml
new file mode 100644
index 0000000..6c0d9f7
--- /dev/null
+++ b/res/drawable/ic_airplane_safe_networks_24dp.xml
@@ -0,0 +1,35 @@
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16,17.5V16l-5.89,-3.75V8.12C10.11,7.5 9.61,7 9,7S7.89,7.5 7.89,8.12v4.12L2,16v1.5l5.89,-1.88v4.12l-1.47,1.12V22L9,21.25L11.58,22v-1.12l-1.47,-1.12v-4.12L16,17.5z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18.05,9.59C17.69,9.22 17.19,9 16.64,9c-0.55,0 -1.05,0.22 -1.41,0.59L16.64,11L18.05,9.59z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.64,7.5c0.96,0 1.84,0.39 2.47,1.03l1.42,-1.42c-1,-1 -2.37,-1.61 -3.89,-1.61s-2.89,0.62 -3.89,1.61l1.42,1.42C14.8,7.89 15.67,7.5 16.64,7.5z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M16.64,4c1.93,0 3.68,0.79 4.95,2.05L23,4.64C21.37,3.01 19.12,2 16.64,2c-2.49,0 -4.74,1.01 -6.36,2.64l1.42,1.42C12.96,4.79 14.71,4 16.64,4z"/>
+</vector>
diff --git a/res/drawable/ic_arrow_downward.xml b/res/drawable/ic_arrow_downward.xml
new file mode 100644
index 0000000..0def170
--- /dev/null
+++ b/res/drawable/ic_arrow_downward.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorAccent">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_call_grey_24dp.xml b/res/drawable/ic_call_grey_24dp.xml
new file mode 100644
index 0000000..960cc8a
--- /dev/null
+++ b/res/drawable/ic_call_grey_24dp.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:pathData="M16.02,14.46l-2.62,2.62c-2.75,-1.49 -5.01,-3.75 -6.5,-6.5l2.62,-2.62c0.24,-0.24 0.34,-0.58 0.27,-0.9L9.15,3.8c-0.1,-0.46 -0.51,-0.8 -0.98,-0.8H4.02c-0.56,0 -1.03,0.47 -1,1.03 0.17,2.91 1.04,5.63 2.43,8.01 1.57,2.69 3.81,4.93 6.5,6.5 2.38,1.39 5.1,2.26 8.01,2.43 0.56,0.03 1.03,-0.44 1.03,-1v-4.15c0,-0.48 -0.34,-0.89 -0.8,-0.98l-3.26,-0.65c-0.33,-0.07 -0.67,0.04 -0.91,0.27z"
+        android:fillColor="#455A64"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_calls_sms.xml b/res/drawable/ic_calls_sms.xml
new file mode 100644
index 0000000..e1217a0
--- /dev/null
+++ b/res/drawable/ic_calls_sms.xml
@@ -0,0 +1,30 @@
+<!--
+    Copyright (C) 2020 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M15.2,18.21c1.21,0.41 2.48,0.67 3.8,0.76v-1.5c-0.88,-0.07 -1.75,-0.22 -2.6,-0.45l-1.2,1.19zM6.54,5h-1.5c0.09,1.32 0.35,2.59 0.75,3.79l1.2,-1.21c-0.24,-0.83 -0.39,-1.7 -0.45,-2.58zM14,8h5V5h-5z"
+        android:strokeAlpha="0.3"
+        android:fillAlpha="0"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.1,-0.03 -0.21,-0.05 -0.31,-0.05 -0.26,0 -0.51,0.1 -0.71,0.29l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.58l2.2,-2.21c0.28,-0.27 0.36,-0.66 0.25,-1.01C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3c-0.55,0 -1,0.45 -1,1 0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM5.03,5h1.5c0.07,0.88 0.22,1.75 0.46,2.59L5.79,8.8c-0.41,-1.21 -0.67,-2.48 -0.76,-3.8zM19,18.97c-1.32,-0.09 -2.6,-0.35 -3.8,-0.76l1.2,-1.2c0.85,0.24 1.72,0.39 2.6,0.45v1.51zM12,3v10l3,-3h6L21,3h-9zM19,8h-5L14,5h5v3z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_clear.xml b/res/drawable/ic_clear.xml
index 224425f..b2065f4 100644
--- a/res/drawable/ic_clear.xml
+++ b/res/drawable/ic_clear.xml
@@ -18,7 +18,8 @@
     android:viewportWidth="24"
     android:viewportHeight="24"
     android:width="24dp"
-    android:height="24dp">
+    android:height="24dp"
+    android:tint="?android:attr/colorControlNormal">
     <path
         android:pathData="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12Z"
         android:fillColor="#FFFFFF" />
diff --git a/res/drawable/ic_face_24dp.xml b/res/drawable/ic_face_24dp.xml
index 7920c12..d9bf27d 100644
--- a/res/drawable/ic_face_24dp.xml
+++ b/res/drawable/ic_face_24dp.xml
@@ -14,13 +14,12 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="24dp"
         android:height="24dp"
         android:viewportWidth="24"
-        android:viewportHeight="24">
-
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorControlNormal">
     <path
         android:fillColor="#000000"
         android:pathData="M10.25,13c0,0.69-0.56,1.25-1.25,1.25S7.75,13.69,7.75,13S8.31,11.75,9,11.75S10.25,12.31,10.25,13z M15,11.75 c-0.69,0-1.25,0.56-1.25,1.25s0.56,1.25,1.25,1.25s1.25-0.56,1.25-1.25S15.69,11.75,15,11.75z M22,12c0,5.52-4.48,10-10,10 S2,17.52,2,12S6.48,2,12,2S22,6.48,22,12z M20,12c0-0.78-0.12-1.53-0.33-2.24C18.97,9.91,18.25,10,17.5,10 c-3.13,0-5.92-1.44-7.76-3.69c-1.05,2.56-3.14,4.57-5.74,5.55C4.01,11.9,4,11.95,4,12c0,4.41,3.59,8,8,8S20,16.41,20,12z" />
diff --git a/res/drawable/ic_hand_gesture.xml b/res/drawable/ic_hand_gesture.xml
new file mode 100644
index 0000000..34067ea
--- /dev/null
+++ b/res/drawable/ic_hand_gesture.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M5.64,6.64l2.36,-1.14l-2.36,-1.14l-1.14,-2.36l-1.14,2.36l-2.36,1.14l2.36,1.14l1.14,2.36z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M20.3,15.7l-1.3,-2.7l-1.3,2.7l-2.7,1.3l2.7,1.3l1.3,2.7l1.3,-2.7l2.7,-1.3z"
+        android:fillColor="#000000"/>
+    <path
+        android:pathData="M12.33,20.5c-0.73,0 -1.41,-0.31 -1.89,-0.86l-4.39,-5.06l0.35,-0.35c0.09,-0.09 0.36,-0.24 0.63,-0.06c1.95,1.3 1.18,0.79 3.97,2.65c0,-3.92 0,-6.81 0,-10.8c0,-0.28 0.22,-0.5 0.5,-0.5S12,5.72 12,6c0,1.5 0,6 0,6h1.5c0,-2.92 0,-5.06 0,-8c0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,0.08 0,1.13 0,8H16c0,0 0,-0.51 0,-7c0,-0.28 0.22,-0.5 0.5,-0.5S17,4.72 17,5v2c0,1.25 0,5 0,5h1.5c0,0 0,-3.75 0,-5c0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5v3.5H21V7c0,-1.1 -0.9,-2 -2,-2c-0.17,0 -0.34,0.03 -0.5,0.07V5c0,-1.1 -0.9,-2 -2,-2c-0.25,0 -0.48,0.05 -0.7,0.13C15.47,2.47 14.79,2 14,2c-1.1,0 -2,0.9 -2,2v0.07C11.84,4.03 11.67,4 11.5,4c-1.1,0 -2,0.9 -2,2c0,2.92 0,5.02 0,8l-1.64,-1.09c-0.79,-0.53 -1.85,-0.42 -2.52,0.25L4,14.5l5.3,6.12C10.06,21.5 11.17,22 12.33,22h4.17l-0.75,-1.5H12.33z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/ic_hearing.xml b/res/drawable/ic_hearing.xml
new file mode 100644
index 0000000..37d3b95
--- /dev/null
+++ b/res/drawable/ic_hearing.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?android:attr/colorControlNormal">
+    <path
+        android:pathData="M17,20c-0.29,0 -0.56,-0.06 -0.76,-0.15 -0.71,-0.37 -1.21,-0.88 -1.71,-2.38 -0.51,-1.56 -1.47,-2.29 -2.39,-3 -0.79,-0.61 -1.61,-1.24 -2.32,-2.53C9.29,10.98 9,9.93 9,9c0,-2.8 2.2,-5 5,-5s5,2.2 5,5h2c0,-3.93 -3.07,-7 -7,-7S7,5.07 7,9c0,1.26 0.38,2.65 1.07,3.9 0.91,1.65 1.98,2.48 2.85,3.15 0.81,0.62 1.39,1.07 1.71,2.05 0.6,1.82 1.37,2.84 2.73,3.55 0.51,0.23 1.07,0.35 1.64,0.35 2.21,0 4,-1.79 4,-4h-2c0,1.1 -0.9,2 -2,2zM7.64,2.64L6.22,1.22C4.23,3.21 3,5.96 3,9s1.23,5.79 3.22,7.78l1.41,-1.41C6.01,13.74 5,11.49 5,9s1.01,-4.74 2.64,-6.36zM11.5,9c0,1.38 1.12,2.5 2.5,2.5s2.5,-1.12 2.5,-2.5 -1.12,-2.5 -2.5,-2.5 -2.5,1.12 -2.5,2.5z"
+        android:fillColor="#000000"/>
+</vector>
diff --git a/res/drawable/ic_illustration_adaptive_connectivity.xml b/res/drawable/ic_illustration_adaptive_connectivity.xml
new file mode 100644
index 0000000..748dd66
--- /dev/null
+++ b/res/drawable/ic_illustration_adaptive_connectivity.xml
@@ -0,0 +1,99 @@
+<!--
+    Copyright (C) 2020 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="412dp"
+    android:height="300dp"
+    android:viewportWidth="412"
+    android:viewportHeight="300">
+  <path
+      android:pathData="M0,0h412v300h-412z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M206,150m-118,0a118,118 0,1 1,236 0a118,118 0,1 1,-236 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#8ab4f8"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M206,150m-101.17,0a101.17,101.17 0,1 1,202.34 0a101.17,101.17 0,1 1,-202.34 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#8ab4f8"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M206,150m-84.44,0a84.44,84.44 0,1 1,168.88 0a84.44,84.44 0,1 1,-168.88 0"
+      android:strokeAlpha="0.2"
+      android:fillColor="#8ab4f8"
+      android:fillAlpha="0.2"/>
+  <path
+      android:pathData="M141.15,25.48h129.87v250.83h-129.87z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M199.19,237.66h15.2a4.83,4.83 0,0 1,4.83 4.83h0a4.84,4.84 0,0 1,-4.83 4.84h-15.2a4.84,4.84 0,0 1,-4.83 -4.84h0A4.83,4.83 0,0 1,199.19 237.66Z"
+      android:fillColor="#d2e3fc"/>
+  <path
+      android:pathData="M212.32,235.59h0a6.9,6.9 0,0 1,6.9 6.9h0a6.9,6.9 0,0 1,-6.9 6.91h0a6.91,6.91 0,0 1,-6.91 -6.91h0A6.9,6.9 0,0 1,212.32 235.59Z"
+      android:fillColor="#1a73e8"/>
+  <path
+      android:pathData="M262.43,25.48a5,5 0,0 1,5 5V269.54a5,5 0,0 1,-5 5H147.87a5,5 0,0 1,-5 -5V30.46a5,5 0,0 1,5 -5H262.43m0,-6.23H147.87a11.22,11.22 0,0 0,-11.2 11.21V269.54a11.22,11.22 0,0 0,11.2 11.21H262.43a11.22,11.22 0,0 0,11.21 -11.21V30.46a11.22,11.22 0,0 0,-11.21 -11.21Z"
+      android:fillColor="#f1f3f4"/>
+  <path
+      android:pathData="M262.43,282H147.87a12.46,12.46 0,0 1,-12.45 -12.45V30.46A12.46,12.46 0,0 1,147.87 18H262.43a12.46,12.46 0,0 1,12.45 12.45V269.54A12.46,12.46 0,0 1,262.43 282ZM147.87,20.5a10,10 0,0 0,-10 10V269.54a10,10 0,0 0,10 10H262.43a10,10 0,0 0,10 -10V30.46a10,10 0,0 0,-10 -10Z"
+      android:fillColor="#dadce0"/>
+  <path
+      android:pathData="M274.88,82.76h0.69a1.8,1.8 0,0 1,1.8 1.8V95.9a1.8,1.8 0,0 1,-1.8 1.8h-0.69a0,0 0,0 1,0 0V82.76A0,0 0,0 1,274.88 82.76Z"
+      android:fillColor="#dadce0"/>
+  <path
+      android:pathData="M274.88,117.62h0.69a1.8,1.8 0,0 1,1.8 1.8v26.28a1.8,1.8 0,0 1,-1.8 1.8h-0.69a0,0 0,0 1,0 0V117.62a0,0 0,0 1,0 0Z"
+      android:fillColor="#dadce0"/>
+  <path
+      android:pathData="M206.64,182.08m-16.56,0a16.56,16.56 0,1 1,33.12 0a16.56,16.56 0,1 1,-33.12 0"
+      android:fillColor="#f1f3f4"/>
+  <path
+      android:pathData="M190.08,182.08a16.56,16.53 0,1 0,33.12 0a16.56,16.53 0,1 0,-33.12 0z"
+      android:fillColor="#fdd663"/>
+  <path
+      android:pathData="M206.64,174.54l-6.21,4.66l0,9.32l3.88,0l0,-5.44l4.66,0l0,5.44l3.88,0l0,-9.32l-6.21,-4.66z"
+      android:fillColor="#f29900"/>
+  <path
+      android:pathData="M165.84,101.31m-16.53,0a16.53,16.53 0,1 1,33.06 0a16.53,16.53 0,1 1,-33.06 0"
+      android:fillColor="#f6aea9"/>
+  <path
+      android:pathData="M169.77,108.12V96.07a1,1 0,0 0,-1 -1h-1.32V93.46h-3.14V95H163a1,1 0,0 0,-1 1v12a1,1 0,0 0,1 1h5.76A1,1 0,0 0,169.77 108.12ZM168.2,96.6v5.64h-4.71V96.6Z"
+      android:fillColor="#ea4335"/>
+  <path
+      android:pathData="M246.16,152.08m-16.56,0a16.56,16.56 0,1 1,33.12 0a16.56,16.56 0,1 1,-33.12 0"
+      android:fillColor="#f6aea9"/>
+  <path
+      android:pathData="M251.88,146a1.18,1.18 0,0 0,-1.12 -0.79h-8.63A1.19,1.19 0,0 0,241 146l-1.63,4.7L239.37,157a0.78,0.78 0,0 0,0.78 0.79L241,157.79a0.78,0.78 0,0 0,0.78 -0.79v-0.78h9.42L251.2,157a0.79,0.79 0,0 0,0.79 0.79h0.78a0.79,0.79 0,0 0,0.79 -0.79v-6.28ZM242.88,153.84a1.18,1.18 0,1 1,1.18 -1.17A1.17,1.17 0,0 1,242.91 153.88ZM249.95,153.84a1.18,1.18 0,1 1,1.17 -1.17A1.17,1.17 0,0 1,250 153.88ZM241.52,149.22 L242.37,146.78h8.08l0.85,2.44Z"
+      android:fillColor="#ea4335"/>
+  <path
+      android:pathData="M165.84,152.08m-16.56,0a16.56,16.56 0,1 1,33.12 0a16.56,16.56 0,1 1,-33.12 0"
+      android:fillColor="#aecbfa"/>
+  <path
+      android:pathData="M173.24,149.16a4,4 0,0 0,-4 -3.34h-6.11a4.06,4.06 0,0 0,-4 3.34s-1.27,7.34 -1.27,7.45a1.73,1.73 0,0 0,1.73 1.73,1.7 1.7,0 0,0 1.22,-0.49l2.89,-2.85h5l2.88,2.85a1.71,1.71 0,0 0,1.23 0.49,1.73 1.73,0 0,0 1.73,-1.73C174.52,156.5 173.24,149.16 173.24,149.16ZM165.34,150.83h-1.67v1.67h-0.84v-1.67h-1.66L161.17,150h1.66v-1.67h0.84L163.67,150h1.67ZM167.68,151.08a0.67,0.67 0,1 1,0.66 -0.67A0.67,0.67 0,0 1,167.68 151.08ZM169.09,152.5a0.67,0.67 0,1 1,0.66 -0.67A0.67,0.67 0,0 1,169.09 152.5ZM169.09,149.66a0.67,0.67 0,1 1,0.66 -0.67A0.67,0.67 0,0 1,169.09 149.66ZM170.51,151.08a0.67,0.67 0,1 1,0.67 -0.67A0.67,0.67 0,0 1,170.51 151.08Z"
+      android:fillColor="#4285f4"/>
+  <path
+      android:pathData="M246.16,101.31m-16.53,0a16.53,16.53 0,1 1,33.06 0a16.53,16.53 0,1 1,-33.06 0"
+      android:fillColor="#aecbfa"/>
+  <path
+      android:pathData="M242.91,96.47a4.51,4.51 0,0 0,0 6.49l0.83,-0.83a3.47,3.47 0,0 1,-1 -2.42,3.23 3.23,0 0,1 1,-2.41ZM251.06,94.81 L250.23,95.64a5.84,5.84 0,0 1,0 8.14l0.83,0.83a6.77,6.77 0,0 0,2 -4.9A7.08,7.08 0,0 0,251.06 94.81ZM242.06,95.64 L241.24,94.81a7,7 0,0 0,0 9.8l0.82,-0.83a5.84,5.84 0,0 1,0 -8.14ZM249.38,96.47 L248.55,97.3a3.46,3.46 0,0 1,1 2.41,3.25 3.25,0 0,1 -1,2.42l0.83,0.83a4.61,4.61 0,0 0,1.38 -3.25A4.92,4.92 0,0 0,249.4 96.47ZM246.16,98a1.71,1.71 0,0 0,-1.73 1.72,1.76 1.76,0 0,0 1,1.59v6h1.38v-6a1.75,1.75 0,0 0,1 -1.59A1.71,1.71 0,0 0,246.16 98Z"
+      android:fillColor="#1a73e8"/>
+  <path
+      android:pathData="M206.64,71.31m-16.5,0a16.5,16.5 0,1 1,33 0a16.5,16.5 0,1 1,-33 0"
+      android:fillColor="#a8dab5"/>
+  <path
+      android:pathData="M212.14,65.81h-2.06l1.38,2.75h-2.07L208,65.81h-1.38L208,68.56L206,68.56l-1.37,-2.75L203.2,65.81l1.38,2.75h-2.06l-1.38,-2.75a1.37,1.37 0,0 0,-1.37 1.38v8.25a1.37,1.37 0,0 0,1.37 1.37h11a1.38,1.38 0,0 0,1.38 -1.37L213.52,67.19A1.38,1.38 0,0 0,212.14 65.81ZM212.14,75.44h-11v-5.5h11Z"
+      android:fillColor="#34a853"/>
+</vector>
diff --git a/res/drawable/ic_signal_strength_zero_bar_no_internet.xml b/res/drawable/ic_signal_strength_zero_bar_no_internet.xml
new file mode 100644
index 0000000..f38a368
--- /dev/null
+++ b/res/drawable/ic_signal_strength_zero_bar_no_internet.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2020 The Android Open Source Project
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M2,22l16,0l0,-2l-11,0l13,-13l0,1l2,0l0,-6z"
+        android:strokeAlpha="0.3"
+        android:fillAlpha="0.3"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,10h2v8h-2z"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,20h2v2h-2z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_sim_card.xml b/res/drawable/ic_sim_card.xml
new file mode 100644
index 0000000..1fc7249
--- /dev/null
+++ b/res/drawable/ic_sim_card.xml
@@ -0,0 +1,43 @@
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M14.5,2H8L4,6v10.5C4,17.33 4.67,18 5.5,18h9c0.83,0 1.5,-0.67 1.5,-1.5v-13C16,2.67 15.33,2 14.5,2zM14.5,16.5h-9V6.62L8.62,3.5h5.88V16.5z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6.5,9h1.5v3h-1.5z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M6.5,13.5h1.5v1.5h-1.5z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,13.5h1.5v1.5h-1.5z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9.25,9h1.5v1.5h-1.5z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M12,9h1.5v3h-1.5z"/>
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M9.25,12h1.5v3h-1.5z"/>
+</vector>
diff --git a/res/drawable/ic_sms.xml b/res/drawable/ic_sms.xml
new file mode 100644
index 0000000..cb388e3
--- /dev/null
+++ b/res/drawable/ic_sms.xml
@@ -0,0 +1,25 @@
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorControlNormal">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM9,11L7,11L7,9h2v2zM13,11h-2L11,9h2v2zM17,11h-2L15,9h2v2z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_undo_24.xml b/res/drawable/ic_undo_24.xml
new file mode 100644
index 0000000..0a8e149
--- /dev/null
+++ b/res/drawable/ic_undo_24.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2020 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M14.1,8H7.83l2.59,-2.59L9,4 4,9l5,5 1.41,-1.41L7.83,10h6.27c2.15,0 3.9,1.57 3.9,3.5S16.25,17 14.1,17H7v2h7.1c3.25,0 5.9,-2.47 5.9,-5.5S17.35,8 14.1,8z"/>
+</vector>
\ No newline at end of file
diff --git a/res/drawable/tile_icon_show_taps.xml b/res/drawable/tile_icon_show_taps.xml
new file mode 100644
index 0000000..26f4328
--- /dev/null
+++ b/res/drawable/tile_icon_show_taps.xml
@@ -0,0 +1,25 @@
+<!--
+Copyright (C) 2020 The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0"
+    android:tint="?android:attr/colorControlNormal">
+  <path
+    android:fillColor="#FF000000"
+    android:pathData="M9,11.24L9,7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11L13,13.5v-6c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z"/>
+</vector>
diff --git a/res/drawable/wifi_friction.xml b/res/drawable/wifi_friction.xml
index fa8268d..6e9010f 100644
--- a/res/drawable/wifi_friction.xml
+++ b/res/drawable/wifi_friction.xml
@@ -15,7 +15,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
     <item
         settings:state_encrypted="true"
         android:drawable="@drawable/ic_friction_lock_closed"/>
diff --git a/res/drawable/wifi_signal.xml b/res/drawable/wifi_signal.xml
index 7854075..fba7792 100644
--- a/res/drawable/wifi_signal.xml
+++ b/res/drawable/wifi_signal.xml
@@ -15,7 +15,7 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+        xmlns:settings="http://schemas.android.com/apk/res-auto">
     <item settings:state_encrypted="true">
         <layer-list>
             <item>
diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index df40ed4..29c3350 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -37,7 +37,7 @@
             android:layout_width="0dip"
             android:layout_height="match_parent"
             android:layout_weight="1.0"
-            android:layout_marginStart="?attr/sudMarginSides"
+            android:layout_marginStart="?attr/sudMarginStart"
             android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
             android:clipChildren="false"
             android:clipToPadding="false"
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index 7872585..775f9ad 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -33,16 +33,16 @@
             style="@style/SudDescription.Glif"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginSides"
-            android:layout_marginEnd="?attr/sudMarginSides" />
+            android:layout_marginStart="?attr/sudMarginStart"
+            android:layout_marginEnd="?attr/sudMarginEnd" />
 
         <Button
             android:id="@+id/forgotButton"
             style="@style/SudGlifButton.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginSides"
-            android:layout_marginEnd="?attr/sudMarginSides"
+            android:layout_marginStart="?attr/sudMarginStart"
+            android:layout_marginEnd="?attr/sudMarginEnd"
             android:layout_gravity="center"
             android:visibility="gone" />
 
@@ -75,8 +75,8 @@
             style="@style/SudGlifButton.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginSides"
-            android:layout_marginEnd="?attr/sudMarginSides"
+            android:layout_marginStart="?attr/sudMarginStart"
+            android:layout_marginEnd="?attr/sudMarginEnd"
             android:layout_marginBottom="80dp"
             android:layout_gravity="center_horizontal"
             android:text="@string/cancel" />
diff --git a/res/layout-land/confirm_lock_pattern.xml b/res/layout-land/confirm_lock_pattern.xml
index 861c00a..1fd6824 100644
--- a/res/layout-land/confirm_lock_pattern.xml
+++ b/res/layout-land/confirm_lock_pattern.xml
@@ -58,16 +58,16 @@
                     style="@style/SudDescription.Glif"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="?attr/sudMarginSides"
-                    android:layout_marginEnd="?attr/sudMarginSides" />
+                    android:layout_marginStart="?attr/sudMarginStart"
+                    android:layout_marginEnd="?attr/sudMarginEnd" />
 
                 <Button
                     android:id="@+id/cancelButton"
                     style="@style/SetupWizardButton.Negative"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="?attr/sudMarginSides"
-                    android:layout_marginEnd="?attr/sudMarginSides"
+                    android:layout_marginStart="?attr/sudMarginStart"
+                    android:layout_marginEnd="?attr/sudMarginEnd"
                     android:text="@string/cancel" />
 
                 <Button
@@ -75,8 +75,8 @@
                     style="@style/SudGlifButton.Secondary"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="?attr/sudMarginSides"
-                    android:layout_marginEnd="?attr/sudMarginSides"
+                    android:layout_marginStart="?attr/sudMarginStart"
+                    android:layout_marginEnd="?attr/sudMarginEnd"
                     android:layout_gravity="center"
                     android:visibility="gone" />
 
@@ -91,8 +91,8 @@
                     android:id="@+id/errorText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="?attr/sudMarginSides"
-                    android:layout_marginEnd="?attr/sudMarginSides"
+                    android:layout_marginStart="?attr/sudMarginStart"
+                    android:layout_marginEnd="?attr/sudMarginEnd"
                     android:layout_marginBottom="24dp"
                     android:gravity="center_vertical"/>
 
diff --git a/res/layout-land/confirm_lock_pattern_normal.xml b/res/layout-land/confirm_lock_pattern_normal.xml
index ded8d1a..7a59894 100644
--- a/res/layout-land/confirm_lock_pattern_normal.xml
+++ b/res/layout-land/confirm_lock_pattern_normal.xml
@@ -58,16 +58,16 @@
                     android:id="@+id/sud_layout_description"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="?attr/sudMarginSides"
-                    android:layout_marginEnd="?attr/sudMarginSides" />
+                    android:layout_marginStart="?attr/sudMarginStart"
+                    android:layout_marginEnd="?attr/sudMarginEnd" />
 
                 <Button
                     android:id="@+id/cancelButton"
                     style="@style/SetupWizardButton.Negative"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="?attr/sudMarginSides"
-                    android:layout_marginEnd="?attr/sudMarginSides"
+                    android:layout_marginStart="?attr/sudMarginStart"
+                    android:layout_marginEnd="?attr/sudMarginEnd"
                     android:text="@string/cancel" />
 
                 <Space
@@ -81,8 +81,8 @@
                     android:id="@+id/errorText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="?attr/sudMarginSides"
-                    android:layout_marginEnd="?attr/sudMarginSides"
+                    android:layout_marginStart="?attr/sudMarginStart"
+                    android:layout_marginEnd="?attr/sudMarginEnd"
                     android:layout_marginBottom="24dp"
                     android:gravity="center_vertical"/>
             </LinearLayout>
diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml
index c2fe2f7..7c182cb 100644
--- a/res/layout-land/crypt_keeper_progress.xml
+++ b/res/layout-land/crypt_keeper_progress.xml
@@ -77,7 +77,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="32dip"
-            android:text="@string/master_clear_button_text"
+            android:text="@string/main_clear_button_text"
             android:visibility="gone"
         />
     </LinearLayout>
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index 3b77b84..184c9c6 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -42,7 +42,7 @@
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="match_parent"
-                android:layout_marginStart="?attr/sudMarginSides"
+                android:layout_marginStart="?attr/sudMarginStart"
                 android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
                 android:clipChildren="false"
                 android:clipToPadding="false"
diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml
index fe9b3d7..5d3e851 100644
--- a/res/layout-land/fingerprint_enroll_find_sensor.xml
+++ b/res/layout-land/fingerprint_enroll_find_sensor.xml
@@ -34,7 +34,7 @@
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:layout_marginStart="?attr/sudMarginSides"
+            android:layout_marginStart="?attr/sudMarginStart"
             android:layout_marginBottom="@dimen/sud_content_frame_padding_bottom"
             android:clipChildren="false"
             android:clipToPadding="false"
diff --git a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
index 240dbb5..95fef90 100644
--- a/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout-land/wifi_dpp_qrcode_scanner_fragment.xml
@@ -33,8 +33,8 @@
             style="@style/TextAppearance.SudGlifBody"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginSides"
-            android:layout_marginEnd="?attr/sudMarginSides"
+            android:layout_marginStart="?attr/sudMarginStart"
+            android:layout_marginEnd="?attr/sudMarginEnd"
             android:textAlignment="center"/>
 
         <LinearLayout
@@ -63,8 +63,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:layout_marginStart="?attr/sudMarginSides"
-                android:layout_marginEnd="?attr/sudMarginSides"
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd"
                 android:textAlignment="center"
                 android:visibility="invisible"/>
 
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml
index a2e32d7..025d895 100644
--- a/res/layout-sw600dp/crypt_keeper_progress.xml
+++ b/res/layout-sw600dp/crypt_keeper_progress.xml
@@ -100,7 +100,7 @@
             android:layout_alignParentBottom="true"
             android:layout_marginBottom="80dip"
             android:layout_marginEnd="16dip"
-            android:text="@string/master_clear_button_text"
+            android:text="@string/main_clear_button_text"
             android:visibility="gone"
         />
 
diff --git a/res/layout/accessibility_edit_magnification_shortcut.xml b/res/layout/accessibility_edit_magnification_shortcut.xml
new file mode 100644
index 0000000..bed1255
--- /dev/null
+++ b/res/layout/accessibility_edit_magnification_shortcut.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  Copyright (C) 2020 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
+  -->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/container_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:scrollbarStyle="outsideOverlay">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="24dp">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/accessibility_magnification_switch_shortcut_message"
+            android:textAppearance="?android:attr/textAppearanceListItemSecondary"
+            android:textColor="?android:attr/textColorSecondary"
+            android:layout_marginBottom="24dp"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <Button
+                android:id="@+id/switch_shortcut_positive_button"
+                style="@style/AccessibilityDialogButton"
+                android:gravity="center|end"
+                android:text="@string/accessibility_magnification_switch_shortcut_positive_button"/>
+
+            <Button
+                android:id="@+id/switch_shortcut_negative_button"
+                style="@style/AccessibilityDialogButton"
+                android:gravity="center|end"
+                android:text="@string/accessibility_magnification_switch_shortcut_negative_button"/>
+
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/accessibility_edit_shortcut_component.xml b/res/layout/accessibility_edit_shortcut_component.xml
index d257be6..0ccc88d 100644
--- a/res/layout/accessibility_edit_shortcut_component.xml
+++ b/res/layout/accessibility_edit_shortcut_component.xml
@@ -32,6 +32,7 @@
             android:id="@+id/checkbox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:minHeight="48dp"
             android:background="@null"
             android:clickable="false"
             android:focusable="false"
diff --git a/res/layout/adaptive_connectivity_header.xml b/res/layout/adaptive_connectivity_header.xml
new file mode 100644
index 0000000..4c5fb0c
--- /dev/null
+++ b/res/layout/adaptive_connectivity_header.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:contentDescription="@null"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_illustration_adaptive_connectivity"/>
+
+</FrameLayout>
diff --git a/res/layout/adb_qrcode_scanner_fragment.xml b/res/layout/adb_qrcode_scanner_fragment.xml
index f37c9a6..5b83cb2 100644
--- a/res/layout/adb_qrcode_scanner_fragment.xml
+++ b/res/layout/adb_qrcode_scanner_fragment.xml
@@ -19,7 +19,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:theme="@style/GlifV3Theme.Light"
+    android:theme="@style/GlifV3Theme"
     android:icon="@drawable/ic_scan_32dp">
 
     <LinearLayout
@@ -41,8 +41,8 @@
                 style="@style/TextAppearance.SudGlifBody"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="?attr/sudMarginSides"
-                android:layout_marginEnd="?attr/sudMarginSides"
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd"
                 android:textAlignment="center"
                 android:accessibilityLiveRegion="polite"/>
 
@@ -72,8 +72,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
-                    android:layout_marginStart="?attr/sudMarginSides"
-                    android:layout_marginEnd="?attr/sudMarginSides"
+                    android:layout_marginStart="?attr/sudMarginStart"
+                    android:layout_marginEnd="?attr/sudMarginEnd"
                     android:textAlignment="center"
                     android:visibility="invisible"/>
 
diff --git a/res/layout/advanced_bt_entity_sub.xml b/res/layout/advanced_bt_entity_sub.xml
index 0c9374f..3f1b3d3 100644
--- a/res/layout/advanced_bt_entity_sub.xml
+++ b/res/layout/advanced_bt_entity_sub.xml
@@ -64,4 +64,15 @@
             android:layout_marginStart="4dp"/>
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/bt_battery_prediction"
+        style="@style/TextAppearance.EntityHeaderSummary"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="2dp"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:visibility="gone"/>
+
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/app_authentication_item.xml b/res/layout/app_authentication_item.xml
new file mode 100644
index 0000000..423722e
--- /dev/null
+++ b/res/layout/app_authentication_item.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    style="@style/AppAuthenticationPolicyItem"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/app_icon"
+        style="@style/AppAuthenticationPolicyIcon"
+        android:layout_width="24dp"
+        android:layout_height="24dp"/>
+
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_toRightOf="@id/app_icon"
+        android:layout_toLeftOf="@id/expand"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/app_name"
+            style="@style/AppAuthenticationPolicyText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+        <TextView
+            android:id="@+id/number_of_uris"
+            style="@style/AppAuthenticationPolicyNumberOfUrisText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"/>
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/uris"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/expand"
+        style="@style/AppAuthenticationExpander"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
+        android:visibility="gone"/>
+
+</RelativeLayout>
diff --git a/res/layout/app_authentication_uri_item.xml b/res/layout/app_authentication_uri_item.xml
new file mode 100644
index 0000000..202fb54
--- /dev/null
+++ b/res/layout/app_authentication_uri_item.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/uri_name"
+        style="@style/AppUriAuthenticationPolicyText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
diff --git a/res/layout/battery_header.xml b/res/layout/battery_header.xml
index dca0972..574d7d4 100644
--- a/res/layout/battery_header.xml
+++ b/res/layout/battery_header.xml
@@ -25,6 +25,7 @@
     style="@style/EntityHeader">
 
     <LinearLayout
+        android:id="@+id/battery_info_layout"
         android:layout_width="170dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="72dp"
diff --git a/res/layout/biometric_enroll_checkbox.xml b/res/layout/biometric_enroll_checkbox.xml
new file mode 100644
index 0000000..028b511
--- /dev/null
+++ b/res/layout/biometric_enroll_checkbox.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.
+-->
+
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <!-- Icon -->
+    <ImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_alignParentStart="true" />
+
+    <!-- Title -->
+    <com.google.android.setupdesign.view.RichTextView
+        style="@style/SudDescription.Glif"
+        android:id="@+id/title"
+        android:paddingHorizontal="8dp"
+        android:paddingTop="16dp"
+        android:layout_marginBottom="4dp"
+        android:gravity="start"
+        android:layout_toEndOf="@+id/icon"
+        android:layout_toStartOf="@+id/checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <!-- Description -->
+    <TextView
+        android:id="@+id/description"
+        android:paddingHorizontal="8dp"
+        android:paddingBottom="16dp"
+        android:layout_toEndOf="@+id/icon"
+        android:layout_toStartOf="@+id/checkbox"
+        android:layout_below="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+    <!-- Check Box -->
+    <CheckBox
+        android:layout_alignParentEnd="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/checkbox"
+        android:layout_centerVertical="true"
+        android:checked="true"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/biometric_enroll_layout.xml b/res/layout/biometric_enroll_layout.xml
new file mode 100644
index 0000000..2f3b34c
--- /dev/null
+++ b/res/layout/biometric_enroll_layout.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="?attr/face_layout_theme"
+    app:sucHeaderText="@string/multi_biometric_enroll_title"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        style="@style/SudContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.google.android.setupdesign.view.RichTextView
+            android:id="@+id/sud_layout_description"
+            style="@style/SudDescription.Glif"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/multi_biometric_enroll_subtitle"/>
+
+        <com.google.android.setupdesign.view.IllustrationVideoView
+            android:id="@+id/illustration_normal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            style="@style/SudContentIllustration"
+            app:sudVideo="@raw/face_settings"/>
+
+        <TextView
+            style="@style/SudDescription.Glif"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:id="@+id/setup_with"
+            android:text="@string/multi_biometric_enroll_setup_with"
+            android:gravity="start"/>
+
+        <include layout="@layout/horizontal_divider"/>
+
+        <com.android.settings.biometrics.BiometricEnrollCheckbox
+            android:id="@+id/checkbox_face"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:title="@string/multi_biometric_enroll_face_unlock_title"
+            app:description="@string/multi_biometric_enroll_face_unlock_description"
+            app:icon="@drawable/ic_face_24dp"/>
+
+        <include layout="@layout/horizontal_divider"/>
+
+        <com.android.settings.biometrics.BiometricEnrollCheckbox
+            android:id="@+id/checkbox_fingerprint"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:title="@string/multi_biometric_enroll_fingerprint_unlock_title"
+            app:description="@string/multi_biometric_enroll_fingerprint_unlock_description"
+            app:icon="@drawable/ic_fingerprint_24dp"/>
+
+        <include layout="@layout/horizontal_divider"/>
+
+    </LinearLayout>
+
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/bubble_preference.xml b/res/layout/bubble_preference.xml
index 8a64716..08f25b4 100644
--- a/res/layout/bubble_preference.xml
+++ b/res/layout/bubble_preference.xml
@@ -44,7 +44,7 @@
             android:id="@+id/bubble_all_icon"
             android:src="@drawable/ic_bubble_all"
             android:background="@android:color/transparent"
-            android:layout_gravity="center"
+            android:layout_centerVertical="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:clickable="false"
@@ -53,6 +53,7 @@
             android:id="@+id/bubble_all_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:ellipsize="end"
             android:maxLines="2"
             android:clickable="false"
@@ -75,7 +76,7 @@
             android:id="@+id/bubble_selected_icon"
             android:src="@drawable/ic_bubble_selected"
             android:background="@android:color/transparent"
-            android:layout_gravity="center"
+            android:layout_centerVertical="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:clickable="false"
@@ -84,6 +85,7 @@
             android:id="@+id/bubble_selected_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:ellipsize="end"
             android:maxLines="2"
             android:clickable="false"
@@ -106,7 +108,7 @@
             android:id="@+id/bubble_none_icon"
             android:src="@drawable/ic_bubble_none"
             android:background="@android:color/transparent"
-            android:layout_gravity="center"
+            android:layout_centerVertical="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:clickable="false"
@@ -115,6 +117,7 @@
             android:id="@+id/bubble_none_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:ellipsize="end"
             android:maxLines="2"
             android:clickable="false"
@@ -125,4 +128,4 @@
             android:text="@string/bubble_app_setting_none"/>
     </com.android.settings.notification.NotificationButtonRelativeLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/res/layout/choose_lock_generic_biometric_header.xml b/res/layout/choose_lock_generic_biometric_header.xml
new file mode 100644
index 0000000..1db0cc6
--- /dev/null
+++ b/res/layout/choose_lock_generic_biometric_header.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.
+  -->
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/biometric_header_description"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:minHeight="56dp"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:text="@string/lock_settings_picker_biometric_message"
+    style="@style/BiometricHeaderStyle" />
diff --git a/res/layout/choose_lock_generic_face_header.xml b/res/layout/choose_lock_generic_face_header.xml
deleted file mode 100644
index b97b0d6..0000000
--- a/res/layout/choose_lock_generic_face_header.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.
-  -->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/face_header_description"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="56dp"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:text="@string/lock_settings_picker_face_message"
-    style="@style/FaceHeaderStyle" />
diff --git a/res/layout/choose_lock_generic_fingerprint_header.xml b/res/layout/choose_lock_generic_fingerprint_header.xml
deleted file mode 100644
index 6a107bf..0000000
--- a/res/layout/choose_lock_generic_fingerprint_header.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fingerprint_header_description"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="56dp"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
-    android:text="@string/lock_settings_picker_fingerprint_message"
-    style="@style/FingerprintHeaderStyle" />
diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml
index 0a2294f..556bdd0 100644
--- a/res/layout/choose_lock_pattern_common.xml
+++ b/res/layout/choose_lock_pattern_common.xml
@@ -74,7 +74,8 @@
                 style="@style/SudDescription.Glif"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginHorizontal="?attr/sudMarginSides"
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd"
                 android:minLines="2" />
 
             <TextView android:id="@+id/headerText"
@@ -82,7 +83,8 @@
                 android:layout_height="wrap_content"
                 android:minLines="2"
                 android:gravity="center"
-                android:paddingHorizontal="?attr/sudMarginSides"
+                android:paddingStart="?attr/sudMarginStart"
+                android:paddingEnd="?attr/sudMarginEnd"
                 android:textSize="12sp" />
 
             <com.google.android.setupdesign.view.FillContentLayout
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index a0935bf..a1525b7 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -51,16 +51,16 @@
                 style="@style/SudDescription.Glif"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="?attr/sudMarginSides"
-                android:layout_marginEnd="?attr/sudMarginSides" />
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd" />
 
             <Button
                 android:id="@+id/forgotButton"
                 style="@style/SudGlifButton.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="?attr/sudMarginSides"
-                android:layout_marginEnd="?attr/sudMarginSides"
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd"
                 android:layout_gravity="center"
                 android:visibility="gone" />
         </LinearLayout>
@@ -108,8 +108,8 @@
             style="@style/SudGlifButton.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginSides"
-            android:layout_marginEnd="?attr/sudMarginSides"
+            android:layout_marginStart="?attr/sudMarginStart"
+            android:layout_marginEnd="?attr/sudMarginEnd"
             android:layout_marginBottom="80dp"
             android:layout_gravity="center_horizontal"
             android:text="@string/cancel" />
diff --git a/res/layout/confirm_lock_password_normal.xml b/res/layout/confirm_lock_password_normal.xml
index 9021f24..089ecdc 100644
--- a/res/layout/confirm_lock_password_normal.xml
+++ b/res/layout/confirm_lock_password_normal.xml
@@ -32,8 +32,8 @@
             style="@style/SudDescription.Glif"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginSides"
-            android:layout_marginEnd="?attr/sudMarginSides" />
+            android:layout_marginStart="?attr/sudMarginStart"
+            android:layout_marginEnd="?attr/sudMarginEnd" />
 
         <Space
             android:layout_width="match_parent"
@@ -78,8 +78,8 @@
             style="@style/SudGlifButton.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginSides"
-            android:layout_marginEnd="?attr/sudMarginSides"
+            android:layout_marginStart="?attr/sudMarginStart"
+            android:layout_marginEnd="?attr/sudMarginEnd"
             android:layout_marginBottom="80dp"
             android:layout_gravity="center_horizontal"
             android:text="@string/cancel" />
diff --git a/res/layout/confirm_lock_pattern_base.xml b/res/layout/confirm_lock_pattern_base.xml
index 9a37eaa..895bb8a 100644
--- a/res/layout/confirm_lock_pattern_base.xml
+++ b/res/layout/confirm_lock_pattern_base.xml
@@ -52,16 +52,16 @@
                 style="@style/SudDescription.Glif"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="?attr/sudMarginSides"
-                android:layout_marginEnd="?attr/sudMarginSides" />
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd" />
 
             <Button
                 android:id="@+id/cancelButton"
                 style="@style/SudGlifButton.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="?attr/sudMarginSides"
-                android:layout_marginEnd="?attr/sudMarginSides"
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd"
                 android:layout_marginBottom="80dp"
                 android:text="@string/cancel" />
 
@@ -70,8 +70,8 @@
                 style="@style/SudGlifButton.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="?attr/sudMarginSides"
-                android:layout_marginEnd="?attr/sudMarginSides"
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd"
                 android:layout_gravity="center"
                 android:visibility="gone" />
 
@@ -107,7 +107,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginHorizontal="?attr/sudMarginSides"
+                android:paddingStart="?attr/sudMarginStart"
+                android:paddingEnd="?attr/sudMarginEnd"
                 android:layout_marginTop="12dp"
                 android:gravity="center_vertical"/>
 
diff --git a/res/layout/confirm_lock_pattern_normal_base.xml b/res/layout/confirm_lock_pattern_normal_base.xml
index 7e2cf8e..7c1502d 100644
--- a/res/layout/confirm_lock_pattern_normal_base.xml
+++ b/res/layout/confirm_lock_pattern_normal_base.xml
@@ -51,8 +51,8 @@
                 android:id="@+id/sud_layout_description"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="?attr/sudMarginSides"
-                android:layout_marginEnd="?attr/sudMarginSides" />
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd" />
 
         </LinearLayout>
 
@@ -86,7 +86,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginHorizontal="?attr/sudMarginSides"
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd"
                 android:layout_marginTop="12dp"
                 android:gravity="center_vertical"/>
 
@@ -95,8 +96,8 @@
                 style="@style/SudGlifButton.Secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="?attr/sudMarginSides"
-                android:layout_marginEnd="?attr/sudMarginSides"
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd"
                 android:layout_marginBottom="80dp"
                 android:text="@string/cancel" />
 
diff --git a/res/layout/conversations_clear_recents.xml b/res/layout/conversations_clear_recents.xml
new file mode 100644
index 0000000..b790439
--- /dev/null
+++ b/res/layout/conversations_clear_recents.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <Button
+        android:id="@+id/conversation_settings_clear_recents"
+        style="@style/ActionPrimaryButton"
+        android:layout_marginStart="@dimen/screen_margin_sides"
+        android:layout_marginEnd="@dimen/description_margin_sides"
+        android:layout_marginTop="@dimen/zen_mode_settings_button_margin_vertical"
+        android:layout_marginBottom="@dimen/zen_mode_settings_button_margin_vertical"
+        android:text="@string/conversation_settings_clear_recents"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/credential_management_app_policy.xml b/res/layout/credential_management_app_policy.xml
new file mode 100644
index 0000000..15153e9
--- /dev/null
+++ b/res/layout/credential_management_app_policy.xml
@@ -0,0 +1,31 @@
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="5dip"
+    android:orientation="vertical">
+
+    <androidx.recyclerview.widget.RecyclerView
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingTop="8dp"
+        android:scrollbars="vertical"/>
+
+</LinearLayout>
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
index 6b8e65f..16cc7a1 100644
--- a/res/layout/crypt_keeper_progress.xml
+++ b/res/layout/crypt_keeper_progress.xml
@@ -73,7 +73,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="32dip"
         android:layout_gravity="center"
-        android:text="@string/master_clear_button_text"
+        android:text="@string/main_clear_button_text"
         android:visibility="gone"
     />
 
diff --git a/res/layout/daltonizer_preview.xml b/res/layout/daltonizer_preview.xml
index bdf1070..de462f1 100644
--- a/res/layout/daltonizer_preview.xml
+++ b/res/layout/daltonizer_preview.xml
@@ -17,13 +17,13 @@
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/preview_viewport"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.android.settings.accessibility.PaletteListView
-        android:id="@+id/palette_listView"
+    <LinearLayout
+        android:id="@+id/palette_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:importantForAccessibility="noHideDescendants" />
-
+        android:orientation="vertical"
+        android:importantForAccessibility="noHideDescendants"/>
 </FrameLayout>
diff --git a/res/layout/edit_user_info_dialog_content.xml b/res/layout/edit_user_info_dialog_content.xml
deleted file mode 100644
index 2bd464b..0000000
--- a/res/layout/edit_user_info_dialog_content.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:baselineAligned="false"
-    android:padding="16dip">
-
-    <ImageView
-        android:id="@+id/user_photo"
-        android:layout_width="56dip"
-        android:layout_height="56dip"
-        android:layout_gravity="bottom"
-        android:contentDescription="@string/user_image_photo_selector"
-        android:background="@*android:drawable/spinner_background_holo_dark"
-        android:scaleType="fitCenter"/>
-
-    <EditText
-        android:id="@+id/user_name"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_weight="1"
-        android:layout_marginStart="6dp"
-        android:minHeight="@dimen/min_tap_target_size"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textAlignment="viewStart"
-        android:inputType="text|textCapWords"
-        android:selectAllOnFocus="true"
-        android:hint="@string/user_nickname"
-        android:maxLength="100"/>
-
-</LinearLayout>
diff --git a/res/layout/emergency_gesture_number_override_dialog.xml b/res/layout/emergency_gesture_number_override_dialog.xml
new file mode 100644
index 0000000..429cff8
--- /dev/null
+++ b/res/layout/emergency_gesture_number_override_dialog.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingHorizontal="24dp"
+        android:paddingVertical="8dp">
+
+        <EditText
+            android:id="@+id/emergency_gesture_number_override"
+            android:imeOptions="actionDone"
+            android:inputType="numberSigned"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/min_tap_target_size"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:orientation="horizontal">
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingEnd="16dp"
+                android:importantForAccessibility="no"
+                android:src="@drawable/ic_info_outline_24"/>
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/emergency_gesture_number_override_notes"/>
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
+
diff --git a/res/layout/emergency_gesture_switch_bar.xml b/res/layout/emergency_gesture_switch_bar.xml
new file mode 100644
index 0000000..2524601
--- /dev/null
+++ b/res/layout/emergency_gesture_switch_bar.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+
+<!-- For use in a LayoutPreference -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    android:importantForAccessibility="no">
+
+    <com.android.settings.widget.SwitchBar
+        android:id="@+id/switch_bar"
+        android:minHeight="?android:attr/actionBarSize"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:paddingStart="0dp"
+        android:theme="?attr/switchBarTheme"/>
+    <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_marginStart="@dimen/actionbar_subsettings_contentInsetStart"
+        android:layout_marginVertical="16dp"
+        android:text="@string/emergency_gesture_screen_summary"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/face_enroll_education.xml b/res/layout/face_enroll_education.xml
index d7b95b6..d94e7c6 100644
--- a/res/layout/face_enroll_education.xml
+++ b/res/layout/face_enroll_education.xml
@@ -18,7 +18,6 @@
 <com.google.android.setupdesign.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:FaceEnrollAccessibilitySwitch="http://schemas.android.com/apk/res/com.android.settings"
     style="?attr/face_layout_theme"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
@@ -94,7 +93,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:visibility="gone"
-                    FaceEnrollAccessibilitySwitch:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>
+                    app:messageText="@string/security_settings_face_enroll_introduction_accessibility_diversity"/>
 
             </FrameLayout>
 
diff --git a/res/layout/face_enroll_introduction.xml b/res/layout/face_enroll_introduction.xml
index 55ac6f9..826f5fe 100644
--- a/res/layout/face_enroll_introduction.xml
+++ b/res/layout/face_enroll_introduction.xml
@@ -18,7 +18,6 @@
 <com.google.android.setupdesign.GlifLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:FaceEnrollAccessibilitySwitch="http://schemas.android.com/apk/res/com.android.settings"
     style="?attr/face_layout_theme"
     android:id="@+id/setup_wizard_layout"
     android:layout_width="match_parent"
diff --git a/res/layout/main_clear.xml b/res/layout/main_clear.xml
new file mode 100644
index 0000000..1cf1909
--- /dev/null
+++ b/res/layout/main_clear.xml
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:theme="@style/GlifV3Theme.Footer"
+    android:icon="@drawable/ic_delete_accent"
+    app:sucHeaderText="@string/main_clear_title">
+
+    <ScrollView
+        android:id="@+id/main_clear_scrollview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/reset_main_clear_margin_start"
+        android:layout_marginEnd="@dimen/reset_main_clear_margin_end">
+
+        <LinearLayout
+            android:id="@+id/main_clear_container"
+            style="@style/SudContentFrame"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                style="@style/TextAppearance.SudGlifItemSummary"
+                android:id="@+id/sud_layout_description"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/main_clear_desc"/>
+            <TextView
+                android:id="@+id/also_erases_external"
+                style="@style/TextAppearance.SudGlifItemSummary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:text="@string/main_clear_desc_also_erases_external"/>
+            <TextView
+                android:id="@+id/also_erases_esim"
+                style="@style/TextAppearance.SudGlifItemSummary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:text="@string/main_clear_desc_also_erases_esim"/>
+            <TextView
+                android:id="@+id/accounts_label"
+                style="@style/TextAppearance.SudGlifItemSummary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:text="@string/main_clear_accounts"/>
+            <LinearLayout
+                android:id="@+id/accounts"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:visibility="gone">
+                <!-- Do not add any children here as they will be removed in the MainClear.java
+                    code. A list of accounts will be inserted programmatically. -->
+            </LinearLayout>
+            <TextView
+                android:id="@+id/other_users_present"
+                style="@style/TextAppearance.SudGlifItemSummary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:text="@string/main_clear_other_users_present"/>
+            <TextView
+                android:id="@+id/no_cancel_mobile_plan"
+                style="@style/TextAppearance.SudGlifItemSummary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:text="@string/main_clear_desc_no_cancel_mobile_plan"/>
+            <TextView
+                android:id="@+id/erase_external_option_text"
+                style="@style/TextAppearance.SudGlifItemSummary"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/main_clear_desc_erase_external_storage"/>
+            <LinearLayout
+                android:id="@+id/erase_external_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:focusable="true"
+                android:clickable="true">
+                <CheckBox
+                    android:id="@+id/erase_external"
+                    style="@style/SudCheckBox"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:focusable="false"
+                    android:clickable="false"
+                    android:duplicateParentState="true"/>
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:orientation="vertical">
+                    <TextView
+                        style="@style/TextAppearance.SudGlifItemTitle"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/erase_external_storage"/>
+                    <TextView
+                        style="@style/TextAppearance.SudGlifItemSummary"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/erase_external_storage_description"/>
+                </LinearLayout>
+            </LinearLayout>
+
+            <include layout="@layout/reset_esim_checkbox"/>
+
+        </LinearLayout>
+    </ScrollView>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/master_clear_account.xml b/res/layout/main_clear_account.xml
similarity index 100%
rename from res/layout/master_clear_account.xml
rename to res/layout/main_clear_account.xml
diff --git a/res/layout/main_clear_confirm.xml b/res/layout/main_clear_confirm.xml
new file mode 100644
index 0000000..95262a0
--- /dev/null
+++ b/res/layout/main_clear_confirm.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:theme="@style/SudThemeGlifV3.DayNight"
+    android:id="@+id/setup_wizard_layout"
+    android:icon="@drawable/ic_delete_accent"
+    app:sucHeaderText="@string/main_clear_confirm_title">
+
+    <LinearLayout
+        style="@style/SudContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/sud_layout_description"
+            style="@style/SudItemTitle.GlifDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/main_clear_final_desc"/>
+    </LinearLayout>
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/main_clear_disallowed_screen.xml b/res/layout/main_clear_disallowed_screen.xml
new file mode 100644
index 0000000..ea9f2cd
--- /dev/null
+++ b/res/layout/main_clear_disallowed_screen.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:id="@+id/listContainer"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+        <ListView android:id="@android:id/list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:drawSelectorOnTop="false"
+                android:scrollbarStyle="insideOverlay"
+                android:background="@android:color/white"
+                android:cacheColorHint="@android:color/white"
+                android:fadingEdgeLength="16dip" />
+
+        <TextView android:id="@android:id/empty"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="@string/main_clear_not_available"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
deleted file mode 100644
index 04c8f8d..0000000
--- a/res/layout/master_clear.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<com.google.android.setupdesign.GlifLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/setup_wizard_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:theme="@style/GlifV3Theme.Footer"
-    android:icon="@drawable/ic_delete_accent"
-    app:sucHeaderText="@string/master_clear_title">
-
-    <ScrollView
-        android:id="@+id/master_clear_scrollview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="@dimen/reset_master_clear_margin_start"
-        android:layout_marginEnd="@dimen/reset_master_clear_margin_end">
-
-        <LinearLayout
-            android:id="@+id/master_clear_container"
-            style="@style/SudContentFrame"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                style="@style/TextAppearance.SudGlifItemSummary"
-                android:id="@+id/sud_layout_description"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/master_clear_desc"/>
-            <TextView
-                android:id="@+id/also_erases_external"
-                style="@style/TextAppearance.SudGlifItemSummary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:text="@string/master_clear_desc_also_erases_external"/>
-            <TextView
-                android:id="@+id/also_erases_esim"
-                style="@style/TextAppearance.SudGlifItemSummary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:text="@string/master_clear_desc_also_erases_esim"/>
-            <TextView
-                android:id="@+id/accounts_label"
-                style="@style/TextAppearance.SudGlifItemSummary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:text="@string/master_clear_accounts"/>
-            <LinearLayout
-                android:id="@+id/accounts"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:visibility="gone">
-                <!-- Do not add any children here as they will be removed in the MasterClear.java
-                    code. A list of accounts will be inserted programmatically. -->
-            </LinearLayout>
-            <TextView
-                android:id="@+id/other_users_present"
-                style="@style/TextAppearance.SudGlifItemSummary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:text="@string/master_clear_other_users_present"/>
-            <TextView
-                android:id="@+id/no_cancel_mobile_plan"
-                style="@style/TextAppearance.SudGlifItemSummary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                android:text="@string/master_clear_desc_no_cancel_mobile_plan"/>
-            <TextView
-                android:id="@+id/erase_external_option_text"
-                style="@style/TextAppearance.SudGlifItemSummary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/master_clear_desc_erase_external_storage"/>
-            <LinearLayout
-                android:id="@+id/erase_external_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                android:focusable="true"
-                android:clickable="true">
-                <CheckBox
-                    android:id="@+id/erase_external"
-                    style="@style/SudCheckBox"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:focusable="false"
-                    android:clickable="false"
-                    android:duplicateParentState="true"/>
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:orientation="vertical">
-                    <TextView
-                        style="@style/TextAppearance.SudGlifItemTitle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/erase_external_storage"/>
-                    <TextView
-                        style="@style/TextAppearance.SudGlifItemSummary"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/erase_external_storage_description"/>
-                </LinearLayout>
-            </LinearLayout>
-
-            <include layout="@layout/reset_esim_checkbox"/>
-
-        </LinearLayout>
-    </ScrollView>
-</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/master_clear_confirm.xml b/res/layout/master_clear_confirm.xml
deleted file mode 100644
index a236cd3..0000000
--- a/res/layout/master_clear_confirm.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<com.google.android.setupdesign.GlifLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:theme="@style/SudThemeGlifV3.DayNight"
-    android:id="@+id/setup_wizard_layout"
-    android:icon="@drawable/ic_delete_accent"
-    app:sucHeaderText="@string/master_clear_confirm_title">
-
-    <LinearLayout
-        style="@style/SudContentFrame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/sud_layout_description"
-            style="@style/SudItemTitle.GlifDescription"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/master_clear_final_desc"/>
-    </LinearLayout>
-</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/master_clear_disallowed_screen.xml b/res/layout/master_clear_disallowed_screen.xml
deleted file mode 100644
index 80326ca..0000000
--- a/res/layout/master_clear_disallowed_screen.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
--->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:id="@+id/listContainer"
-             android:layout_width="match_parent"
-             android:layout_height="match_parent">
-
-        <ListView android:id="@android:id/list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:drawSelectorOnTop="false"
-                android:scrollbarStyle="insideOverlay"
-                android:background="@android:color/white"
-                android:cacheColorHint="@android:color/white"
-                android:fadingEdgeLength="16dip" />
-
-        <TextView android:id="@android:id/empty"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:text="@string/master_clear_not_available"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/nfc_payment_option.xml b/res/layout/nfc_payment_option.xml
index 18519ee..e523993 100644
--- a/res/layout/nfc_payment_option.xml
+++ b/res/layout/nfc_payment_option.xml
@@ -29,5 +29,8 @@
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
         android:checkMark="?android:attr/listChoiceIndicatorSingle"
+        android:textAlignment="viewStart"
+        android:gravity="center_vertical"
+        android:textDirection="locale"
         />
 </LinearLayout>
diff --git a/res/layout/notif_priority_conversation_preference.xml b/res/layout/notif_priority_conversation_preference.xml
index f68dbde..c93abf2 100644
--- a/res/layout/notif_priority_conversation_preference.xml
+++ b/res/layout/notif_priority_conversation_preference.xml
@@ -31,29 +31,34 @@
         android:padding="@dimen/notification_importance_button_padding"
         android:clickable="true"
         android:focusable="true">
-        <ImageView
-            android:id="@+id/priority_icon"
-            android:src="@drawable/ic_important_outline"
-            android:background="@android:color/transparent"
-            android:layout_gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clickable="false"
-            android:focusable="false"/>
-        <TextView
-            android:id="@+id/priority_label"
+        <LinearLayout
+            android:id="@+id/icon_label_container"
+            android:gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:clickable="false"
-            android:focusable="false"
-            android:layout_toEndOf="@id/priority_icon"
-            android:layout_marginStart="@dimen/notification_importance_drawable_padding"
-            android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
-            android:text="@string/notification_priority_title"/>
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/icon"
+                android:src="@drawable/ic_important_outline"
+                android:background="@android:color/transparent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="false"
+                android:focusable="false"/>
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:clickable="false"
+                android:focusable="false"
+                android:layout_marginStart="@dimen/notification_importance_drawable_padding"
+                android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
+                android:text="@string/notification_priority_title"/>
+        </LinearLayout>
         <TextView
-            android:id="@+id/priority_summary"
+            android:id="@+id/summary"
             android:paddingTop="@dimen/notification_importance_button_padding"
             android:text="@string/notification_channel_summary_priority"
             android:layout_width="match_parent"
@@ -61,8 +66,8 @@
             android:clickable="false"
             android:focusable="false"
             android:ellipsize="end"
-            android:maxLines="3"
-            android:layout_below="@id/priority_icon"
+            android:maxLines="4"
+            android:layout_below="@id/icon_label_container"
             android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
             android:visibility="gone" />
     </com.android.settings.notification.NotificationButtonRelativeLayout>
@@ -75,29 +80,34 @@
         android:layout_marginTop="@dimen/notification_importance_button_separation"
         android:clickable="true"
         android:focusable="true">
-        <ImageView
-            android:id="@+id/alert_icon"
-            android:src="@drawable/ic_notifications_alert"
-            android:background="@android:color/transparent"
-            android:layout_gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clickable="false"
-            android:focusable="false"/>
-        <TextView
-            android:id="@+id/alert_label"
+        <LinearLayout
+            android:id="@+id/icon_label_container"
+            android:gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:clickable="false"
-            android:focusable="false"
-            android:layout_toEndOf="@id/alert_icon"
-            android:layout_marginStart="@dimen/notification_importance_drawable_padding"
-            android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
-            android:text="@string/notification_alert_title"/>
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/icon"
+                android:src="@drawable/ic_notifications_alert"
+                android:background="@android:color/transparent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="false"
+                android:focusable="false"/>
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:clickable="false"
+                android:focusable="false"
+                android:layout_marginStart="@dimen/notification_importance_drawable_padding"
+                android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
+                android:text="@string/notification_alert_title"/>
+        </LinearLayout>
         <TextView
-            android:id="@+id/alert_summary"
+            android:id="@+id/summary"
             android:paddingTop="@dimen/notification_importance_button_padding"
             android:text="@string/notification_channel_summary_default"
             android:layout_width="match_parent"
@@ -106,7 +116,7 @@
             android:focusable="false"
             android:ellipsize="end"
             android:maxLines="2"
-            android:layout_below="@id/alert_icon"
+            android:layout_below="@id/icon_label_container"
             android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
             android:visibility="gone" />
     </com.android.settings.notification.NotificationButtonRelativeLayout>
@@ -119,29 +129,34 @@
         android:layout_marginTop="@dimen/notification_importance_button_separation"
         android:clickable="true"
         android:focusable="true">
-        <ImageView
-            android:id="@+id/silence_icon"
-            android:src="@drawable/ic_notifications_off_24dp"
-            android:background="@android:color/transparent"
-            android:layout_gravity="center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:clickable="false"
-            android:focusable="false"/>
-        <TextView
-            android:id="@+id/silence_label"
+        <LinearLayout
+            android:id="@+id/icon_label_container"
+            android:gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:clickable="false"
-            android:focusable="false"
-            android:layout_toEndOf="@id/silence_icon"
-            android:layout_marginStart="@dimen/notification_importance_drawable_padding"
-            android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
-            android:text="@string/notification_silence_title"/>
+            android:orientation="horizontal">
+            <ImageView
+                android:id="@+id/icon"
+                android:src="@drawable/ic_notifications_off_24dp"
+                android:background="@android:color/transparent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:clickable="false"
+                android:focusable="false"/>
+            <TextView
+                android:id="@+id/label"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:clickable="false"
+                android:focusable="false"
+                android:layout_marginStart="@dimen/notification_importance_drawable_padding"
+                android:textAppearance="@style/TextAppearance.NotificationImportanceButton.Unselected"
+                android:text="@string/notification_silence_title"/>
+        </LinearLayout>
         <TextView
-            android:id="@+id/silence_summary"
+            android:id="@+id/summary"
             android:paddingTop="@dimen/notification_importance_button_padding"
             android:text="@string/notification_conversation_summary_low"
             android:layout_width="match_parent"
@@ -150,7 +165,7 @@
             android:focusable="false"
             android:ellipsize="end"
             android:maxLines="2"
-            android:layout_below="@id/silence_icon"
+            android:layout_below="@id/icon_label_container"
             android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"
             android:visibility="gone" />
     </com.android.settings.notification.NotificationButtonRelativeLayout>
diff --git a/res/layout/notification_history_app_layout.xml b/res/layout/notification_history_app_layout.xml
index a1b3be7..aaca0fd 100644
--- a/res/layout/notification_history_app_layout.xml
+++ b/res/layout/notification_history_app_layout.xml
@@ -24,6 +24,7 @@
         android:id="@+id/app_header"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
+        android:background="@drawable/button_ripple_radius"
         android:paddingTop="12dp"
         android:paddingBottom="12dp"
         android:paddingStart="16dp">
@@ -54,17 +55,19 @@
                 android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
                 android:paddingStart="6dp"
-                android:layout_gravity="center_vertical"
+                android:layout_gravity="start|center_vertical"
+                android:textDirection="locale"
                 android:paddingTop="8dp"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"/>
         </LinearLayout>
-        <ImageButton
+        <ImageView
             android:id="@+id/expand"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:layout_height="48dp"
             android:layout_width="48dp"
-            android:background="@drawable/button_ripple_radius"
+            android:scaleType="center"
+            android:contentDescription="@null"
             android:src="@*android:drawable/ic_expand_more"/>
     </RelativeLayout>
 
diff --git a/res/layout/notification_sbn_log_row.xml b/res/layout/notification_sbn_log_row.xml
index 6156d26..ee143b0 100644
--- a/res/layout/notification_sbn_log_row.xml
+++ b/res/layout/notification_sbn_log_row.xml
@@ -130,6 +130,6 @@
     <View
         android:id="@+id/divider"
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
-        android:background="@color/material_grey_300" />
+        android:layout_height="wrap_content"
+        android:background="?android:attr/listDivider" />
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/panel_layout.xml b/res/layout/panel_layout.xml
index 895d09b..5f33c32 100644
--- a/res/layout/panel_layout.xml
+++ b/res/layout/panel_layout.xml
@@ -36,6 +36,7 @@
             android:visibility="gone">
 
             <LinearLayout
+                android:id="@+id/title_group"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
diff --git a/res/layout/panel_slice_slider_row_large_icon.xml b/res/layout/panel_slice_slider_row_large_icon.xml
deleted file mode 100644
index fa5c4cd..0000000
--- a/res/layout/panel_slice_slider_row_large_icon.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2020 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/slice_slider_layout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <androidx.slice.widget.SliceView
-        android:id="@+id/slice_view"
-        style="@style/Widget.SliceView.Panel.Slider.LargeIcon"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="0dp"
-        android:paddingEnd="0dp"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_balance_slider.xml b/res/layout/preference_balance_slider.xml
index 32010c3..80cb996 100644
--- a/res/layout/preference_balance_slider.xml
+++ b/res/layout/preference_balance_slider.xml
@@ -87,7 +87,7 @@
                 android:orientation="horizontal">
                 <TextView
                     android:id="@+id/left_text"
-                    android:text="@string/accessibility_toggle_master_balance_left_label"
+                    android:text="@string/accessibility_toggle_primary_balance_left_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
@@ -95,7 +95,7 @@
                     android:textAlignment="viewStart" />
                 <TextView
                     android:id="@+id/right_text"
-                    android:text="@string/accessibility_toggle_master_balance_right_label"
+                    android:text="@string/accessibility_toggle_primary_balance_right_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
diff --git a/res/layout/preference_two_target_radio.xml b/res/layout/preference_two_target_radio.xml
index f454c87..c7d0f5e 100644
--- a/res/layout/preference_two_target_radio.xml
+++ b/res/layout/preference_two_target_radio.xml
@@ -54,7 +54,8 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:paddingTop="16dp"
-            android:paddingBottom="16dp">
+            android:paddingBottom="16dp"
+            android:paddingEnd="16dp">
 
             <TextView
                 android:id="@android:id/title"
diff --git a/res/layout/preference_widget_clear.xml b/res/layout/preference_widget_clear.xml
new file mode 100644
index 0000000..9703eba
--- /dev/null
+++ b/res/layout/preference_widget_clear.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 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.
+  -->
+
+<!-- Settings button -->
+<ImageView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/clear_button"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:paddingStart="?android:attr/listPreferredItemPaddingEnd"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="?android:attr/selectableItemBackground"
+    android:scaleType="center"
+    android:src="@drawable/ic_clear"
+    android:contentDescription="@string/clear" />
\ No newline at end of file
diff --git a/res/layout/preference_widget_master_checkbox.xml b/res/layout/preference_widget_primary_checkbox.xml
similarity index 100%
rename from res/layout/preference_widget_master_checkbox.xml
rename to res/layout/preference_widget_primary_checkbox.xml
diff --git a/res/layout/preference_widget_master_switch.xml b/res/layout/preference_widget_primary_switch.xml
similarity index 100%
rename from res/layout/preference_widget_master_switch.xml
rename to res/layout/preference_widget_primary_switch.xml
diff --git a/res/layout/preference_widget_zen_master_icon.xml b/res/layout/preference_widget_zen_master_icon.xml
deleted file mode 100644
index 64c0db8..0000000
--- a/res/layout/preference_widget_zen_master_icon.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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.
--->
-
-<!-- Layout used by CheckBoxPreference for the checkbox style. This is inflated
-     inside android.R.layout.preference. -->
-<RadioButton xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@android:id/checkbox"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:background="@null"
-    android:focusable="false"
-    android:clickable="false" />
diff --git a/res/layout/request_manage_credentials.xml b/res/layout/request_manage_credentials.xml
new file mode 100644
index 0000000..a2350ac
--- /dev/null
+++ b/res/layout/request_manage_credentials.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/apps_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"/>
+
+        <LinearLayout
+            android:id="@+id/button_panel"
+            style="@style/RequestManageCredentialsButtonPanel"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <Button
+                android:id="@+id/dont_allow_button"
+                style="@style/RequestManageCredentialsDontAllowButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/request_manage_credentials_dont_allow"/>
+
+            <Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1"
+                android:visibility="invisible"/>
+
+            <Button
+                android:id="@+id/allow_button"
+                style="@style/RequestManageCredentialsAllowButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/request_manage_credentials_allow"/>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+        android:id="@+id/extended_fab"
+        style="@style/RequestManageCredentialsFab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/request_manage_credentials_more"
+        app:layout_anchor="@id/apps_list"
+        app:layout_anchorGravity="bottom|center"
+        app:elevation="3dp"
+        app:icon="@drawable/ic_arrow_downward"
+        app:iconTint="?android:attr/colorAccent"
+        app:backgroundTint="?android:attr/colorPrimary"/>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/layout/request_manage_credentials_header.xml b/res/layout/request_manage_credentials_header.xml
new file mode 100644
index 0000000..b22c6c9
--- /dev/null
+++ b/res/layout/request_manage_credentials_header.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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/RequestManageCredentialsHeader"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/credential_management_app_icon"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        android:contentDescription="@null"/>
+
+    <TextView
+        android:id="@+id/credential_management_app_title"
+        style="@style/RequestManageCredentialsTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+    <TextView
+        android:id="@+id/credential_management_app_description"
+        style="@style/RequestManageCredentialsDescription"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/request_manage_credentials_description"/>
+
+</LinearLayout>
diff --git a/res/layout/reset_esim_checkbox.xml b/res/layout/reset_esim_checkbox.xml
index 77b90a1..44b9a28 100644
--- a/res/layout/reset_esim_checkbox.xml
+++ b/res/layout/reset_esim_checkbox.xml
@@ -33,7 +33,7 @@
         android:layout_gravity="center_vertical"
         android:focusable="false"
         android:clickable="false"
-        android:checked="true"
+        android:checked="false"
         android:duplicateParentState="true"/>
 
     <LinearLayout
diff --git a/res/layout/reset_importance_button.xml b/res/layout/reset_importance_button.xml
new file mode 100644
index 0000000..6d023b9
--- /dev/null
+++ b/res/layout/reset_importance_button.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/reset_importance_button"
+        style="@style/ActionPrimaryButton"
+        android:layout_marginStart="@dimen/screen_margin_sides"
+        android:text="@string/asst_importance_reset_title"
+        android:layout_gravity="start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/reset_network.xml b/res/layout/reset_network.xml
index 9181ed8..f6135a9 100644
--- a/res/layout/reset_network.xml
+++ b/res/layout/reset_network.xml
@@ -47,7 +47,7 @@
     <Button
         android:id="@+id/initiate_reset_network"
         android:layout_gravity="end"
-        android:layout_marginEnd="@dimen/suc_customization_button_margin_end"
+        android:layout_marginEnd="@dimen/reset_button_margin_end"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="12dp"
         android:layout_width="wrap_content"
diff --git a/res/layout/reset_network_confirm.xml b/res/layout/reset_network_confirm.xml
index 1ec446e..456049e 100644
--- a/res/layout/reset_network_confirm.xml
+++ b/res/layout/reset_network_confirm.xml
@@ -30,7 +30,7 @@
     <Button
         android:id="@+id/execute_reset_network"
         android:layout_gravity="end"
-        android:layout_marginEnd="@dimen/suc_customization_button_margin_end"
+        android:layout_marginEnd="@dimen/reset_button_margin_end"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="12dp"
         android:layout_width="wrap_content"
diff --git a/res/layout/restricted_popup_menu_item.xml b/res/layout/restricted_popup_menu_item.xml
deleted file mode 100644
index 636e3f9..0000000
--- a/res/layout/restricted_popup_menu_item.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** Copyright 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.
-*/
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:gravity="center_vertical"
-    android:paddingStart="16dip"
-    android:paddingEnd="16dip">
-    <TextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorAlertDialogListItem"
-        android:textAppearance="?android:attr/textAppearanceListItemSmall"
-        android:ellipsize="marquee"
-        android:layout_alignParentLeft="true" />
-    <ImageView
-        android:id="@+id/restricted_icon"
-        android:layout_width="@*android:dimen/config_restrictedIconSize"
-        android:layout_height="@*android:dimen/config_restrictedIconSize"
-        android:scaleType="centerInside"
-        android:tint="?android:attr/colorAccent"
-        android:src="@*android:drawable/ic_info"
-        android:layout_alignParentRight="true"
-        android:visibility="gone" />
-</RelativeLayout>
diff --git a/res/layout/restricted_preference_widget_master_switch.xml b/res/layout/restricted_preference_widget_master_switch.xml
deleted file mode 100644
index 60abeb2..0000000
--- a/res/layout/restricted_preference_widget_master_switch.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2019 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.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <include layout="@layout/restricted_icon"/>
-
-    <include layout="@layout/preference_widget_master_switch"/>
-</merge>
\ No newline at end of file
diff --git a/res/layout/restricted_preference_widget_primary_switch.xml b/res/layout/restricted_preference_widget_primary_switch.xml
new file mode 100644
index 0000000..81d7291
--- /dev/null
+++ b/res/layout/restricted_preference_widget_primary_switch.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2019 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.
+  -->
+
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+    <include layout="@layout/restricted_icon"/>
+
+    <include layout="@layout/preference_widget_primary_switch"/>
+</merge>
\ No newline at end of file
diff --git a/res/layout/search_bar.xml b/res/layout/search_bar.xml
index 420c965..d3e98c3 100644
--- a/res/layout/search_bar.xml
+++ b/res/layout/search_bar.xml
@@ -15,36 +15,43 @@
      limitations under the License.
 -->
 
-<com.google.android.material.card.MaterialCardView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/search_bar"
-    style="@style/SearchBarStyle"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_margin="@dimen/search_bar_margin"
     app:layout_scrollFlags="scroll|enterAlways">
-    <Toolbar
-        android:id="@+id/search_action_bar"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/search_bar_height"
-        android:layout_marginStart="-2dp"
-        android:background="@drawable/search_bar_selected_background"
-        android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"
-        android:navigationIcon="@drawable/ic_homepage_search">
-        <TextView
-            android:id="@+id/search_action_bar_title"
-            style="@style/TextAppearance.SearchBar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/search_menu"/>
-    </Toolbar>
-    <ImageView
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/search_bar"
+        style="@style/SearchBarStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+        <Toolbar
+            android:id="@+id/search_action_bar"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/search_bar_height"
+            android:layout_marginStart="-2dp"
+            android:background="@drawable/search_bar_selected_background"
+            android:contentInsetStartWithNavigation="@dimen/search_bar_content_inset"
+            android:navigationIcon="@drawable/ic_homepage_search">
+            <TextView
+                android:id="@+id/search_action_bar_title"
+                style="@style/TextAppearance.SearchBar"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start"
+                android:text="@string/search_menu"/>
+        </Toolbar>
+    </com.google.android.material.card.MaterialCardView>
+
+   <ImageView
         android:id="@+id/account_avatar"
-        android:paddingEnd="@dimen/search_bar_avatar_end_padding"
-        android:paddingTop="@dimen/search_bar_avatar_top_bottom_padding"
-        android:paddingBottom="@dimen/search_bar_avatar_top_bottom_padding"
-        android:layout_width="@dimen/search_bar_avatar_width"
-        android:layout_height="@dimen/search_bar_height"
-        android:layout_gravity="end"
+        android:layout_width="@dimen/avatar_length"
+        android:layout_height="@dimen/avatar_length"
+        android:layout_gravity="center_vertical"
         android:contentDescription="@string/search_bar_account_avatar_content_description"/>
-</com.google.android.material.card.MaterialCardView>
+</LinearLayout>
+
diff --git a/res/layout/settings_base_layout.xml b/res/layout/settings_base_layout.xml
index 0a4437e..9fbc2a2 100644
--- a/res/layout/settings_base_layout.xml
+++ b/res/layout/settings_base_layout.xml
@@ -26,8 +26,7 @@
         style="?android:attr/actionBarStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:theme="?android:attr/actionBarTheme"
-        android:navigationContentDescription="@*android:string/back_button_label" />
+        android:theme="?android:attr/actionBarTheme" />
     <FrameLayout
         android:id="@+id/content_frame"
         android:layout_width="match_parent"
diff --git a/res/layout/settings_homepage_container.xml b/res/layout/settings_homepage_container.xml
index f210c54..fe119c6 100644
--- a/res/layout/settings_homepage_container.xml
+++ b/res/layout/settings_homepage_container.xml
@@ -57,6 +57,41 @@
         android:layout_height="wrap_content"
         android:touchscreenBlocksFocus="false"
         android:keyboardNavigationCluster="false">
-        <include layout="@layout/search_bar"/>
+        <LinearLayout
+            android:id="@+id/app_bar_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            app:layout_scrollFlags="scroll|enterAlways|enterAlwaysCollapsed">
+
+            <LinearLayout
+                android:id="@+id/contextual_suggestion_content"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/suggestion_height"
+                android:paddingHorizontal="@dimen/suggestion_padding_horizontal"
+                android:paddingBottom="@dimen/suggestion_padding_bottom"
+                android:orientation="vertical"
+                android:gravity="bottom"
+                android:visibility="gone">
+
+                <TextView
+                    android:id="@+id/suggestion_title"
+                    android:text="@string/settings_label"
+                    style="@style/ContextualSuggestionText"/>
+
+                <Button
+                    android:id="@+id/suggestion_button"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/suggestion_button_margin_top"
+                    android:paddingHorizontal="@dimen/suggestion_button_padding_horizontal"
+                    android:visibility="gone"
+                    style="@style/ActionPrimaryButton"/>
+
+            </LinearLayout>
+
+            <include layout="@layout/search_bar"/>
+
+        </LinearLayout>
     </com.google.android.material.appbar.AppBarLayout>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/layout/storage_wizard_init.xml b/res/layout/storage_wizard_init.xml
index 8d9870f..e1e78331 100644
--- a/res/layout/storage_wizard_init.xml
+++ b/res/layout/storage_wizard_init.xml
@@ -41,7 +41,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:layout_marginStart="@dimen/sud_glif_margin_sides"
+                android:layout_marginStart="@dimen/sud_glif_margin_start"
                 android:orientation="vertical">
                 <TextView
                     android:layout_width="match_parent"
@@ -108,7 +108,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:layout_marginStart="@dimen/sud_glif_margin_sides"
+                android:layout_marginStart="@dimen/sud_glif_margin_start"
                 android:orientation="vertical">
                 <TextView
                     android:layout_width="match_parent"
diff --git a/res/layout/udfps_enroll_enrolling.xml b/res/layout/udfps_enroll_enrolling.xml
new file mode 100644
index 0000000..03b6528
--- /dev/null
+++ b/res/layout/udfps_enroll_enrolling.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+
+<com.google.android.setupdesign.GlifLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/setup_wizard_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout="@layout/sud_glif_blank_template"
+    style="?attr/fingerprint_layout_theme">
+
+</com.google.android.setupdesign.GlifLayout>
diff --git a/res/layout/udfps_enroll_layout.xml b/res/layout/udfps_enroll_layout.xml
new file mode 100644
index 0000000..51c788b
--- /dev/null
+++ b/res/layout/udfps_enroll_layout.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2015 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<com.android.settings.biometrics.fingerprint.UdfpsEnrollLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/setup_wizard_layout"
+    style="?attr/fingerprint_layout_theme"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+        android:id="@+id/sud_layout_icon"
+        style="@style/SudGlifIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="?attr/sudGlifHeaderGravity"
+        android:layout_marginEnd="0dp"
+        android:layout_marginStart="0dp"
+        android:src="@drawable/ic_fingerprint_header" />
+
+    <TextView
+        android:id="@+id/suc_layout_title"
+        style="@style/SudGlifHeaderTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="0dp"
+        android:layout_marginStart="0dp" />
+
+    <Space
+        android:id="@+id/space_below_title"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <FrameLayout
+        android:id="@+id/description_area"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <TextView
+            android:id="@+id/sud_layout_description"
+            style="@style/SudDescription.Glif"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/security_settings_fingerprint_enroll_start_message" />
+
+        <TextView
+            android:id="@+id/repeat_message"
+            style="@style/SudDescription.Glif"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/security_settings_fingerprint_enroll_repeat_message"
+            android:visibility="invisible" />
+
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/error_text"
+        style="@style/TextAppearance.ErrorText"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|bottom"
+        android:layout_marginBottom="16dp"
+        android:accessibilityLiveRegion="polite"
+        android:gravity="center_horizontal"
+        android:paddingEnd="5dp"
+        android:paddingStart="5dp"
+        android:visibility="invisible" />
+
+    <Space
+        android:id="@+id/space_above_animation"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+
+    <include
+        layout="@layout/fingerprint_enroll_enrolling_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center" />
+
+</com.android.settings.biometrics.fingerprint.UdfpsEnrollLayout>
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 45ecd61..2cc6c8a 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -141,6 +141,24 @@
                             android:prompt="@string/wifi_eap_method" />
                 </LinearLayout>
 
+                <LinearLayout android:id="@+id/l_sim"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"
+                        style="@style/wifi_item" >
+                    <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            style="@style/wifi_item_label"
+                            android:text="@string/sim_card" />
+
+                    <Spinner android:id="@+id/sim"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            style="@style/wifi_item_spinner"
+                            android:prompt="@string/sim_card" />
+                </LinearLayout>
+
                 <LinearLayout android:id="@+id/l_phase2"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -196,18 +214,6 @@
                             android:entries="@array/eap_ocsp_type" />
                 </LinearLayout>
 
-                <LinearLayout android:id="@+id/no_ca_cert_warning"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:visibility="gone"
-                        style="@style/wifi_item" >
-                    <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            style="@style/wifi_item_warning"
-                            android:text="@string/wifi_do_not_validate_eap_server_warning" />
-                </LinearLayout>
-
                 <LinearLayout android:id="@+id/l_domain"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -329,7 +335,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     style="@style/wifi_item" >
-                <!--  Dummy to enable right-justification of checkbox -->
+                <!--  Placeholder to enable right-justification of checkbox -->
                 <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -439,7 +445,7 @@
                     android:layout_height="wrap_content"
                     style="@style/wifi_item"
                     android:visibility="gone">
-                <!--  Dummy to enable right-justification of warning -->
+                <!--  Placeholder to enable right-justification of warning -->
                 <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/res/layout/wifi_dpp_add_device_fragment.xml b/res/layout/wifi_dpp_add_device_fragment.xml
index 8ad6391..3eef1ab 100644
--- a/res/layout/wifi_dpp_add_device_fragment.xml
+++ b/res/layout/wifi_dpp_add_device_fragment.xml
@@ -33,8 +33,8 @@
             style="@style/TextAppearance.SudGlifBody"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginSides"
-            android:layout_marginEnd="?attr/sudMarginSides"
+            android:layout_marginStart="?attr/sudMarginStart"
+            android:layout_marginEnd="?attr/sudMarginEnd"
             android:textAlignment="center"
             android:accessibilityLiveRegion="polite"/>
 
diff --git a/res/layout/wifi_dpp_choose_saved_wifi_network_fragment.xml b/res/layout/wifi_dpp_choose_saved_wifi_network_fragment.xml
index 534f32e..10b4702 100644
--- a/res/layout/wifi_dpp_choose_saved_wifi_network_fragment.xml
+++ b/res/layout/wifi_dpp_choose_saved_wifi_network_fragment.xml
@@ -33,8 +33,8 @@
             style="@style/TextAppearance.SudGlifBody"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginSides"
-            android:layout_marginEnd="?attr/sudMarginSides"
+            android:layout_marginStart="?attr/sudMarginStart"
+            android:layout_marginEnd="?attr/sudMarginEnd"
             android:textAlignment="center"
             android:accessibilityLiveRegion="polite"/>
 
diff --git a/res/layout/wifi_dpp_qrcode_generator_fragment.xml b/res/layout/wifi_dpp_qrcode_generator_fragment.xml
index 1f8b37c..d283bfd 100644
--- a/res/layout/wifi_dpp_qrcode_generator_fragment.xml
+++ b/res/layout/wifi_dpp_qrcode_generator_fragment.xml
@@ -33,8 +33,8 @@
             style="@style/TextAppearance.SudGlifBody"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginSides"
-            android:layout_marginEnd="?attr/sudMarginSides"
+            android:layout_marginStart="?attr/sudMarginStart"
+            android:layout_marginEnd="?attr/sudMarginEnd"
             android:textAlignment="center"
             android:accessibilityLiveRegion="polite"/>
 
@@ -42,6 +42,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center"
+            android:id="@+id/wifi_dpp_layout"
             android:orientation="vertical">
 
             <ImageView
@@ -56,6 +57,9 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
                 android:textAlignment="center"
+                android:textIsSelectable="true"
+                android:focusable="true"
+                android:longClickable="true"
                 android:textAppearance="@android:style/TextAppearance.Material.Body1"
                 android:textColor="?android:attr/textColorSecondary"/>
         </LinearLayout>
diff --git a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
index 3d1e99b..209619c 100644
--- a/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
+++ b/res/layout/wifi_dpp_qrcode_scanner_fragment.xml
@@ -33,8 +33,8 @@
             style="@style/TextAppearance.SudGlifBody"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="?attr/sudMarginSides"
-            android:layout_marginEnd="?attr/sudMarginSides"
+            android:layout_marginStart="?attr/sudMarginStart"
+            android:layout_marginEnd="?attr/sudMarginEnd"
             android:textAlignment="center"
             android:accessibilityLiveRegion="polite"/>
 
@@ -64,8 +64,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:layout_marginStart="?attr/sudMarginSides"
-                android:layout_marginEnd="?attr/sudMarginSides"
+                android:layout_marginStart="?attr/sudMarginStart"
+                android:layout_marginEnd="?attr/sudMarginEnd"
                 android:textAlignment="center"
                 android:visibility="invisible"/>
 
diff --git a/res/raw/bubble_notification_animation.mp4 b/res/raw/bubble_notification_animation.mp4
index 2994548..563e18d 100644
--- a/res/raw/bubble_notification_animation.mp4
+++ b/res/raw/bubble_notification_animation.mp4
Binary files differ
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 5b8ed28..9e4ce2a 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Middelmatig"</item>
     <item msgid="6740026006576843477">"Lank"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kort"</item>
+    <item msgid="7397961711906421599">"Medium"</item>
+    <item msgid="4079132024502041928">"Lank"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Verstek"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globaal"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Net TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globaal"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 78acab1..77afb05 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Datum en tyd"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Stel datum en tyd"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Stel datum, tyd, tydsones en formaat"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Gebruik netwerkverskafte tyd"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Gebruik netwerkverskafte tydsone"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Stel tyd outomaties"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Stel tydsone outomaties"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gebruik verstek vir locale"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-uur-formaat"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gebruik 24-uur-formaat"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Wys profiel-inligting op slotskerm"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Rekeninge"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Ligging"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Gebruik ligging"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Gebruik ligging"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Af"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aan – <xliff:g id="COUNT_1">%1$d</xliff:g> programme het toegang tot ligging</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skermslot, gesigslot"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skermslot, vingerafdruk"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Skermslot"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Ontsluit jou foon veilig met jou gesig en vingerafdruk"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Jy kan ook by programme aanmeld en betalings bevestig"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Stel ontsluit op met:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Gesigslot"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Maak dit maklik om jou foon te ontsluit"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Vingerafdruk"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Bespaar tyd en ontsluit foon in jou sak"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Slaan oor"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Volgende"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Gesig is bygevoeg"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Stel gesigslot op"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Gesigslot"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Gebruik jou gesig om te staaf"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Begin"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"As toeganklikheidgesigslot afgeskakel is, sal sommige opstellingstappe dalk nie behoorlik werk met TalkBack nie."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Gaan terug"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Gaan aan met opstelling"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Gebruik toeganklikheidopstelling"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Vereis bevestigingstap altyd as gesigslot in programme gebruik word"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Vee gesigdata uit"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Stel gesigslot op"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Gebruik gesigslot om jou toestel te ontsluit, by programme aan te meld en betalings te bevestig.\n\nHou in gedagte:\nAs jy na die foon kyk, sal dit dalk ontsluit wanneer jy nie bedoel om dit te doen nie.\n\nIemand anders kan jou foon ontsluit as dit voor jou gesig gehou word.\n\nJou foon kan ontsluit word deur iemand wat baie soos jy lyk, byvoorbeeld \'n identiese broer of suster."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Gebruik gesigslot om jou toestel te ontsluit, by programme aan te meld en betalings te bevestig.\n\nHou in gedagte:\nAs jy na die foon kyk, sal dit dalk ontsluit wanneer jy nie bedoel om dit te doen nie.\n\nIemand anders kan jou foon ontsluit as dit voor jou gesig gehou word, selfs al is jou oë toe.\n\nJou foon kan ontsluit word deur iemand wat baie soos jy lyk, soos \'n identiese broer of suster."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Gebruik gesigslot om jou toestel te ontsluit, by programme aan te meld, en betalings te bevestig."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Hou in gedagte:\nOm na die foon te kyk, kan dit ontsluit wanneer jy nie bedoel om dit te doen nie.\n\nIemand anders kan jou foon ontsluit as dit voor jou gesig gehou word.\n\nIemand wat baie soos jy lyk, soos \'n identiese broer of suster, kan jou foon ontsluit."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Hou in gedagte:\nOm na die foon te kyk, kan dit ontsluit wanneer jy nie bedoel om dit te doen nie.\n\nIemand anders kan jou foon ontsluit as dit voor jou gesig gehou word, selfs as jou oë toe is.\n\nIemand wat baie soos jy lyk, soos \'n identiese broer of suster, kan jou foon ontsluit."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vee gesigdata uit?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Die gesigdata wat deur gesigslot gebruik is, sal permanent en veilig uitgevee word. Nadat dit uitgevee is, sal jy jou PIN, patroon of wagwoord moet hê om jou foon te ontsluit, by programme aan te meld en betalings te bevestig."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Gebruik gesigslot om jou foon te ontsluit"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gebruik jou vingerafdruk om jou foon te ontsluit of aankope goed te keur.\n\nLet wel: Jy kan nie jou vingerafdruk gebruik om hierdie toestel te ontsluit nie. Gebruik jou organisasie se administrateur vir meer inligting."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gebruik jou vingerafdruk om jou foon te ontsluit of aankope goed te keur.\n\nLet wel: Jou vingerafdruk kan dalk minder veilig as \'n sterk patroon of PIN wees."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Kanselleer"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nee, dankie"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Gaan voort"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Slaan oor"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Volgende"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"As jy jou tablet met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigslot op te stel. Tik op Kanselleer om terug te gaan."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"As jy jou toestel met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigslot op te stel. Tik op Kanselleer om terug te gaan."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"As jy jou foon met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om gesigslot op te stel. Tik op Kanselleer om terug te gaan."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"As jy jou tablet met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om biometrie op te stel. Tik op Kanselleer om terug te gaan."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"As jy jou toestel met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om biometrie op te stel. Tik op Kanselleer om terug te gaan."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"As jy jou foon met \'n skermslotopsie beskerm, sal niemand dit kan gebruik as dit verloor of gesteel word nie. Jy moet ook \'n skermslotopsie hê om biometrie op te stel. Tik op Kanselleer om terug te gaan."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Slaan PIN-opstelling oor?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Slaan wagwoordopstelling oor?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Slaan patroonopstelling oor?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Keer ander mense om hierdie tablet sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Keer ander mense om hierdie toestel sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Keer ander mense om hierdie foon sonder jou toestemming te gebruik deur kenmerke vir toestelbeskerming te aktiveer. Kies die skermslot wat jy wil gebruik."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Kies jou rugsteunmetode vir skermsluiting"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Kies jou rugsteunmetode vir skermsluiting"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Kies jou rugsteunmetode vir skermsluiting"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Skermslotopsies"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Skermslotopsies"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Skermslot"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Gesigslot + wagwoord"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Gaan voort sonder gesigslot"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Jy kan jou foon met jou gesig ontsluit. Vir sekuriteit vereis hierdie opsie \'n rugsteunskermslot."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrie + patroon"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrie + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrie + wagwoord"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Gaan voort sonder biometrie"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Jy kan jou biometrie gebruik om jou foon te ontsluit. Om veiligheidsredes vereis hierdie opsie \'n rugsteunskermslot."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Gedeaktiveer deur administrateur, enkripsiebeleid of eiebewysberging"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swiep"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Moet minder as <xliff:g id="NUMBER_0">%d</xliff:g> syfer wees</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Toesteladministrateur laat nie toe dat jy \'n onlangse PIN gebruik nie"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Jou IT-administrateur blokkeer algemene PIN\'e. Probeer \'n ander PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Dit mag nie \'n ongeldige karakter insluit nie"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Moet minstens een letter bevat"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Moet minstens een syfer bevat"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Moet minstens 1 nienumeriese karakter bevat</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Toesteladministrateur laat nie toe dat jy \'n onlangse wagwoord gebruik nie"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Jou IT-administrateur blokkeer algemene wagwoorde. Probeer \'n ander wagwoord."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Stygende, dalende of herhalende volgorde van syfers word nie toegelaat nie"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bevestig"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Kanselleer"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Skakel Wi-Fi aan"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Gebruik Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Gebruik Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi-instellings"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Stel en beheer draadlose toegangspunte"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Sentreer die QR-kode hieronder om aan “<xliff:g id="SSID">%1$s</xliff:g>” te koppel"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Skandeer \'n QR-kode om by W-Fi aan te sluit"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Deel Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skandeer hierdie QR-kode om aan “<xliff:g id="SSID">%1$s</xliff:g>” te koppel en die wagwoord te deel"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skandeer hierdie QR-kode met \'n ander toestel om by “<xliff:g id="SSID">%1$s</xliff:g>” aan te sluit"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skandeer hierdie QR-kode om aan “<xliff:g id="SSID">%1$s</xliff:g>” te koppel"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Probeer weer. Kontak die toestelvervaardiger as die kwessie voortduur"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Iets is fout"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-wagwoord: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Warmkolwagwoord: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Outokoppel"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Laat foon toe om outomaties te koppel naby hierdie netwerk"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Laat tablet toe om outomaties te koppel naby hierdie netwerk"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Laat aansluiting aan hierdie netwerk toe wanneer dit binne bereik is"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Voeg toestel by"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Gebruik \'n QR-kode om \'n toestel by hierdie netwerk te voeg"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-kode is nie \'n geldige formaat nie"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Gebruik stelselsertifikate"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Moenie verskaf nie"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Moenie staaf nie"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Geen sertifikaat is gespesifiseer nie. Jou verbinding sal nie privaat wees nie."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Netwerknaam is te lank."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Moet \'n domein spesifiseer."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikaat word vereis."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Koppel"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi is aangeskakel"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Gekoppel aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Koppel tans aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Koppel tans …"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Netwerkverbinding het misluk"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Netwerk nie binne sendbereik nie"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Toestel se MAC-adres"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Ewekansige MAC-adres"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Ewekansige MAC-adres (laas gebruik)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-adres"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Netwerkbesonderhede"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnetmasker"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-adresse"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Gestoorde netwerke"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Intekeninge"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Ander netwerke"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP-instellings"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Wi‑Fi se gevorderde instellngs is nie vir hierdie gebruiker beskikbaar nie"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Stoor"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Voer \'n geldige deurgangadres in."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Voer \'n geldige DNS-adres in."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Voer \'n netwerkvoorvoegsel in met lengte tussen 0 en 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (tensy deur private DNS geïgnoreer)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (tensy deur private DNS geïgnoreer)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Deurgang"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lengte van netwerkvoorvoegsel"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Program deel tans inhoud. Skakel warmkol af en dan aan om internetverbinding te deel"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Geen wagwoord is gestel nie"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Warmkolnaam"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Skakel tans aan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Skakel tans <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aan …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Ander toestelle kan aan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> koppel"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Warmkolwagwoord"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-band"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Gladde Vertoning"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Verhoog die herlaaikoers vir sommige inhoud outomaties van 60 na 90 Hz. Verhoog batterygebruik."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Gladde vertoonskerm"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Dwing herlaaikoers van 90 Hz af"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Hoogste herlaaikoers vir verbeterde raaksensitiwiteit en animasiegehalte. Verhoog batterygebruik."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Skermaandag"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aan / skerm sal nie afskakel as jy daarna kyk nie"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Wanneer die skerm donker is, sal dit aanskakel vir nuwe kennisgewings"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Wys altyd tyd en inligting"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Verhoogde batterygebruik"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Teks in vetdruk"</string>
     <string name="title_font_size" msgid="570613010306330622">"Lettertipegrootte"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Maak teks groter of kleiner"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM-kaartsluitinstellings"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-weergawe"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-sekuriteitopdatering"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model en hardeware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardewareweergawe"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Toerusting-ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Vee toegangspunt uit"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nuwe toegangspunt"</string>
     <string name="menu_save" msgid="6611465355127483100">"Stoor"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Gooi weg"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Kanselleer"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Die naamveld kan nie leeg wees nie."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Die APN kan nie leeg wees nie."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Programme kan teruggestel word"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Stel terug: Wi-Fi, mobiel en Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Dit sal alle netwerkinstellings terugstel, insluitend:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiele data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Vee uit"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Vee afgelaaide SIM-kaarte uit"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Kontak jou diensverskaffer om plaasvervanger-SIM-kaarte af te laai. Dit sal nie enige mobieletoestel-diensplanne kanselleer nie."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Dit sal geen mobielediensplanne kanselleer nie. Kontak jou diensverskaffer om vervanging-SIM\'s af te laai."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Stel instellings terug"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Stel alle netwerkinstellings terug? Jy kan nie hierdie handeling ontdoen nie."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Stel alle netwerkinstellings terug en vee afgelaaide SIM-kaarte uit? Jy kan nie hierdie handeling ontdoen nie."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Netwerkinstellings is teruggestel"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Kan nie SIM-kaarte uitvee nie"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Afgelaaide SIM-kaarte kan weens \'n fout nie uitgevee word nie.\n\nHerbegin jou toestel en probeer weer."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Vee alle data uit (fabriekterugstelling)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Vee alle data uit (fabriekterugstelling)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Dit sal al die data uit jou tablet se "<b>"interne berging"</b>" uitvee, insluitend: \n\n"<li>"Jou Google-rekening"</li>\n" "<li>"Stelsel- en programdata en -instellings"</li>\n<li>"Afgelaaide programme"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Dit sal alle data uit jou foon se "<b>"interne berging"</b>" uitvee, insluitend:\n\n"<li>"Jou Google-rekening"</li>\n<li>"Stelsel- en programdata en -instellings"</li>\n<li>"Afgelaaide programme"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Jy is tans aangemeld by die volgende rekeninge:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Daar is ander gebruikers op hierdie toestel teenwoordig.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musiek"</li>\n<li>"Foto\'s"</li>\n<li>"Ander gebruikerdata"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"e-SIM\'e"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Dit sal nie jou mobiele diensplan kanselleer nie."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"USB-berging"</b>" uitgevee word."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Om musiek, prente en ander gebruikersdata uit te vee, moet die "<b>"SD-kaart"</b>" uitgevee word."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Vee alle data uit (fabriekterugstelling)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Vee alle data uit (fabriekterugstelling)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Dit sal al die data uit jou tablet se "<b>"interne berging"</b>" uitvee, insluitend:\n\n"<li>"Jou Google-rekening"</li>\n" "<li>"Stelsel- en programdata en -instellings"</li>\n<li>"Afgelaaide programme"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Dit sal alle data uit jou foon se "<b>"interne berging"</b>" uitvee, insluitend:\n\n"<li>"Jou Google-rekening"</li>\n<li>"Stelsel- en programdata en -instellings"</li>\n<li>"Afgelaaide programme"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Jy is tans aangemeld by die volgende rekeninge:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Daar is ander gebruikers op hierdie toestel teenwoordig.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musiek"</li>\n<li>"Foto\'s"</li>\n<li>"Ander gebruikerdata"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"e-SIM-kaarte"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Dit sal nie jou mobiele diensplan kanselleer nie."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Om musiek, prente en ander gebruikerdata uit te vee, moet die "<b>"USB-berging"</b>" uitgevee word."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Om musiek, prente en ander gebruikerdata uit te vee, moet die "<b>"SD-kaart"</b>" uitgevee word."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Vee USB-berging uit"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Vee SD-kaart uit"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Vee alle data op die interne USB-berging uit, soos musiek of foto\'s."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Vee al die data op die SD-kaart uit, soos musiek of foto\'s."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Vee alle data uit"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Vee alle data uit"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Al jou persoonlike inligting en afgelaaide programme sal uitgevee word. Jy kan nie hierdie handeling ontdoen nie."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Al jou persoonlike inligting, insluitend afgelaaide programme en SIM-kaarte, sal uitgevee word. Jy kan nie hierdie handeling ontdoen nie."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Vee alles uit"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Omdat die Stelsel Skoonmaak-diens nie beskikbaar was nie, is geen terugstel gedoen nie."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vee alle data uit?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Fabriekterugstelling is nie vir hierdie gebruiker beskikbaar nie"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Vee tans uit"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Wag asseblief …"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Vee alle data uit"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Vee alle data uit"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Al jou persoonlike inligting en afgelaaide programme sal uitgevee word. Jy kan nie hierdie handeling ontdoen nie."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Al jou persoonlike inligting, insluitend afgelaaide programme en SIM-kaarte, sal uitgevee word. Jy kan nie hierdie handeling ontdoen nie."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vee alle data uit?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Fabriekterugstelling is nie vir hierdie gebruiker beskikbaar nie"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Vee tans uit"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Wag asseblief …"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Oproepinstellings"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Stel stemboodskapdiens, oproepaanstuur, oproep wag, beller-ID op"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-verbinding"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Kan nie aan meer as <xliff:g id="MAXCONNECTION">%1$d</xliff:g> toestelle verbind nie."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sal ontverbind word."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-verbinding"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Deel foon se internetverbinding via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Deel foon se internetverbinding via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Gebruik warmkol en verbinding om deur jou mobiele dataverbinding internet aan ander toestelle te verskaf. Programme kan ook \'n warmkol skep om inhoud met nabygeleë toestelle te deel."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Gebruik warmkol en verbinding om deur jou Wi-Fi- of mobiele dataverbinding internet aan ander toestelle te verskaf. Programme kan ook \'n warmkol skep om inhoud met toestelle in die omtrek te deel."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hulp"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-opsporing"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Laat programme en dienste toe om enige tyd na toestelle in die omtrek te soek, selfs wanneer Bluetooth af is. Dit kan byvoorbeeld gebruik word om ligginggegronde kenmerke en dienste te verbeter."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Liggingdienste vir werk"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Liggingtydsonebespeuring"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Liggingtydsonebespeuring"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Laat toe dat toestel se ligging gebruik word om die huidige tydsone te bespeur. Ander ligginginstellings soos wi‑fi-skandering kan die akkuraatheid van tydsonebespeuring beïnvloed."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aan"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Af"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Outomatiese tydsonebespeuring is gedeaktiveer"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Liggingtydsonebespeuring is gedeaktiveer"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Liggingtydsonebespeuring word nie gesteun nie"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Veranderings aan liggingtydsonebespeuring word nie toegelaat nie"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi- en mobielenetwerk-ligging"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Laat programme Google se liggingsdiens gebruik om jou ligging vinniger te beraam. Anonieme liggingsdata sal ingesamel word en aan Google gestuur word."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Ligging deur Wi-Fi vasgestel"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Stel wagwoord om gesigslot te gebruik"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Stel patroon om gesigslot te gebruik"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Stel PIN om gesigslot te gebruik"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Stel wagwoord om biometrie te gebruik"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Stel patroon om biometrie te gebruik"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Stel PIN om biometrie te gebruik"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Jou wagwoord vergeet?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Jou patroon vergeet?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Jou PIN vergeet?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Onderskrifvoorkeure"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Vergroting"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Vergrotingarea"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Vergroting is geaktiveer"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Kies die vergrotingarea(s) wat jy wil gebruik wanneer jy die skerm vergroot"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Volskerm"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Deel van skerm"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Volskerm en deel van skerm"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Vergroot die hele skerm"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Vergroot deel van skerm"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Skakel oor na toeganklikheidknoppie?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"As jy tripeltik gebruik om \'n deel van die skerm te vergroot, sal dit veroorsaak dat tik- en ander handelinge vertraag word.\n\nWil jy daarna toe oorskakel om die toeganklikheidknoppie vir vergroting te gebruik?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Skakel oor na toeganklikheidknoppie"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Hou tripeltik om te vergroot"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Vergrotinginstellings"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Vergroot met trippeltik"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Vergroot met kortpad"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Kragknoppie beëindig oproep"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Groot muiswyser"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Verwyder animasies"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono-oudio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombineer kanale wanneer oudio gespeel word"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Oudiobalans"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Links"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Regs"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono-oudio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombineer kanale wanneer oudio gespeel word"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Oudiobalans"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Links"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Regs"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Verstek"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekondes"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekondes"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Kennisgewingvibrasie"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Luivibrasie"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Raakterugvoer"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Gebruik <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Maak <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> oop"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Gebruik kleurregstelling"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Wys onderskrifte"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Net vir gesteunde program"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Gebruik <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Maak <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> oop"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Gebruik kleurregstelling"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Wys onderskrifte"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Net vir gesteunde program"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Grootte en styl van onderskrif"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>teksgrootte"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Meer opsies"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grysskaal"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rooi-groen"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rooi-groen"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blou-geel"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Agtergrondbeperking"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Laat die program toe om in die agtergrond te loop"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Program word nie toegelaat om in die agtergrond te loop nie"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Agtergrondgebruik kan nie beperk word nie"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Agtergrondgebruik kan nie beperk word nie"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Beperk agtergrondaktiwiteit?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"As jy agtergrondaktiwiteit vir \'n program beperk, kan dit verkeerd werk"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Hierdie program is nie gestel om batterykrag te optimeer nie en daarom kan jy dit nie beperk nie.\n\nOm die program te beperk, moet jy eers batterykrag-optimering aanskakel."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet is meer as gewoonlik gebruik"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Toestel is meer as gewoonlik gebruik"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Battery kan gouer as gewoonlik afloop"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimeer tans vir batterygesondheid"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Battery word tydelik beperk. Tik om meer te wete te kom."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Jou foon is meer as normaalweg gebruik. Jou battery kan gouer as verwag afloop.\n\nTopprogramme volgens batterygebruik:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Jou tablet is meer as normaalweg gebruik. Jou battery kan gouer as verwag afloop.\n\nTopprogramme volgens batterygebruik:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Jou toestel is meer as normaalweg gebruik. Jou battery kan gouer as verwag afloop.\n\nTopprogramme volgens batterygebruik:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d program word beperk</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Kon nie jou batterymeter te lees nie"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Kon nie jou batterymeter te lees nie. Tik om "<annotation id="url">"meer te wete te kom"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Stop program?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Jou foon kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> jou foon wakker hou.\n\nOm te probeer om hierdie kwessie op te los, kan jy die program stop.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om die batterywerkverrigting te verbeter."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Jou tablet kan nie die battery op normale wyse bestuur nie omdat <xliff:g id="APP">%1$s</xliff:g> jou tablet wakker hou.\n\nOm te probeer om hierdie kwessie op te los, kan jy die program stop.\n\nAs dit aanhou gebeur, sal jy dalk die program moet deïnstalleer om die batterywerkverrigting te verbeter."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Stel \'n skedule"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Verleng batterylewe"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Skakel af wanneer dit gelaai is"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterybespaarder skakel af wanneer jou foon by <xliff:g id="PERCENT">%1$s</xliff:g> is"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterybespaarder skakel af wanneer jou tablet by <xliff:g id="PERCENT">%1$s</xliff:g> is"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterybespaarder skakel af wanneer jou toestel by <xliff:g id="PERCENT">%1$s</xliff:g> is"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Batterybespaarder skakel af wanneer jou foon bo <xliff:g id="PERCENT">%1$s</xliff:g> gelaai is"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Batterybespaarder skakel af wanneer jou tablet bo <xliff:g id="PERCENT">%1$s</xliff:g> gelaai is"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Batterybespaarder skakel af wanneer jou toestel bo <xliff:g id="PERCENT">%1$s</xliff:g> gelaai is"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Skakel aan"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Stel terug"</string>
     <string name="tts_play" msgid="2945513377250757221">"Speel"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Aanpasbare konnektiwiteit"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Verleng die batterylewe en verbeter die toestel se werkverrigting deur jou netwerkverbindings outomaties te bestuur"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Eiebewysberging"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installeer \'n sertifikaat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installeer sertifikate uit berging"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Gebruikereiebewyse"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Bekyk en wysig gebergde eiebewyse"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Gevorderd"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Bergingtipe"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardeware-geondersteun"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Net sagteware"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Eiebewyse is nie vir hierdie gebruiker beskikbaar nie"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Geïnstalleer vir VPN en programme"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Geïnstalleer vir Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Moenie installeer nie"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Installeer tog"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sertifikaat is nie geïnstalleer nie"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Laat <xliff:g id="APP_NAME">%s</xliff:g> toe om sertifikate op hierdie toestel te installeer?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Hierdie sertifikate sal jou aan die programme en URL\'e hieronder identifiseer"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Moenie toelaat nie"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Laat toe"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Wys meer"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Sertifikaatbestuurprogram"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Geen"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Sertifikate wat deur hierdie program geïnstalleer is, sal jou aan die programme en URL\'e hieronder identifiseer"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Verwyder"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Noodoproepsein"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Stel gedrag wanneer \'n noodoproep gemaak word"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Rugsteun"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nie opgestel nie – werkprofiel"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"Jy (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Bynaam"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Jy kan tot <xliff:g id="USER_COUNT">%1$d</xliff:g> gebruikers byvoeg"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Net die eienaar van die tablet kan gebruikers bestuur."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Net die eienaar van die foon kan gebruikers bestuur."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Betaling by \'n terminaal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Stel \'n betalingprogram op. Hou dan bloot die agterkant van jou foon naby enige terminaal met die kontaklose simbool."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Het dit"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Meer …"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Meer …"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Stel verstekbetalingprogram"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Dateer verstekbetalingprogram op"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Betaal by \'n kontaklose terminaal met <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Terug"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Volgende"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Klaar"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Neem \'n foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Kies \'n prent"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Kies foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kaarte"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kaarte"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Gebruik dit altyd vir oproepe"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Kies \'n SIM vir data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Kies \'n SIM vir SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Wissel tans data-SIM, dit kan tot \'n minuut neem …"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Wissel tans data-SIM – dit kan tot \'n minuut neem …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Bel met"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Kies \'n SIM-kaart"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"roetine, skedule, batterybespaarder, kragbespaarder, battery, outomaties, persent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VolTE, gevorderde oproepe, 4G-oproepe"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"voeg taal by, voeg \'n taal by"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"teksgrootte"</string>
     <string name="default_sound" msgid="6604374495015245195">"Verstekgeluid"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Lui- en kennisgewingvolume is op <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibrasie, Moenie Steur Nie"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Aanskakel-klanke"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Kitsopskrif"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Gee outomaties mediaopskrifte"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Geen"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> skedules gestel</item>
-      <item quantity="one">1 skedule gestel</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Geen}=1{1 skedule gestel}other{# skedules gestel}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Moenie Steur Nie"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Word net deur belangrike mense en programme in kennis gestel"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Beperk onderbrekings"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Net prioriteit"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Af / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Af"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aan"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Vra elke keer"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Totdat jy dit afskakel"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> uur</item>
-      <item quantity="one">1 uur</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minute"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> skedules kan outomaties aanskakel</item>
-      <item quantity="one">1 skedule kan outomaties aanskakel</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 uur}other{# uur}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuut}other{# minute}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Af}=1{Af / 1 skedule kan outomaties aanskakel}other{Af / # skedules kan outomaties aanskakel}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Wat Moenie Steur Nie kan onderbreek"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Mense"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Programme"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Stel kennisgewings met laer prioriteit outomaties op Lig"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Aanpasbare kennisgewingrangskikking"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Rangskik kennisgewings outomaties volgens relevantheid"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Aanpasbare kennisgewingterugvoer"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Dui verstellings aan wat aan kennisgewings gemaak is en wys die opsie om terugvoer aan die stelsel te verskaf"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Stel kennisgewingbelangrikheid terug"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Stel belangrikheidinstellings terug wat gebruiker verander het, en laat kennisgewingassistent toe om te prioritiseer"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Voorgestelde handelinge en antwoorde"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Wys voorgestelde handelinge en antwoorde outomaties"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Wys onlangse en gesluimerde kennisgewings"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioriteitgesprekke"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Wys boaan gespreksafdeling en verskyn as swewende borrels"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Boaan gespreksafdeling wys"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Ander gesprekke"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Nie-prioriteitgesprekke"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Gesprekke waaraan jy veranderinge gemaak het"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Onlangse gesprekke"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Vee onlangse uit"</string>
+    <string name="clear" msgid="5092178335409471100">"Vee uit"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Laat prioriteitgesprekke in \'n borrel verskyn"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriteitgesprekke word boaan die kennisgewingskerm gewys. Jy kan ook stel dat dit in borrels verskyn en Moenie Steur Nie onderbreek."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Prioriteit- en gewysigde gesprekke sal hier verskyn"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Toegang tot Moenie Steur Nie"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Laat Moenie Steur Nie toe"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Geen geïnstalleerde programme het toegang tot Moenie Steur Nie versoek nie"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Laai tans programme …"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Laai tans programme …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android keer tans op jou versoek dat hierdie program se kennisgewings op hierdie toestel verskyn"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android keer tans op jou versoek dat hierdie kategorie kennisgewings op hierdie toestel verskyn"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android keer tans op jou versoek dat hierdie groep kennisgewings op hierdie toestel verskyn"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alle gesprekke"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriteitgesprekke"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Geen"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> gesprekke</item>
-      <item quantity="one">1 gesprek</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Geen"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Geen}=1{1 gesprek}other{# gesprekke}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Wie kan onderbreek"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Oproepe"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Oproepe"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Kyk of jou toestel gestel is om te lui om seker te wees dat toegelate oproepe \'n klank maak"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Inkomende oproepe word vir \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" geblokkeer. Jy kan instellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Gesterde kontakte"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ander mense</item>
-      <item quantity="one">1 ander persoon</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Geen"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Geen}=1{{contact_1}}=2{{contact_1} en {contact_2}}=3{{contact_1}, {contact_2} en {contact_3}}other{{contact_1}, {contact_2} en # ander mense}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Geen naam nie)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Boodskappe"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"boodskappe"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Boodskappe"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Inkomende boodskappe word vir \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" geblokkeer. Jy kan instellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Alle boodskappe kan jou bereik"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Alle oproepe kan jou bereik"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Geen"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakte</item>
-      <item quantity="one">1 kontak</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Geen}=1{1 kontak}other{# kontakte}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Enigiemand"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakte"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Gesterde kontakte"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alle kennisgewings"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Sommige kennisgewings"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Geselekteerde mense kan jou steeds bereik, selfs al laat jy nie programme toe om te onderbreek nie"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> kan onderbreek</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> kan onderbreek</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Nog <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Geen programme kan onderbreek nie}=1{{app_1} kan onderbreek}=2{{app_1} en {app_2} kan onderbreek}=3{{app_1}, {app_2} en {app_3} kan onderbreek}other{{app_1}, {app_2} en nog # kan onderbreek}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Programme"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alle kennisgewings"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Sommige kennisgewings"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Kennisgewings wat kan onderbreek"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Laat alle kennisgewings toe"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> kan onderbreek</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> kan onderbreek</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Niks kan onderbreek nie"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Nog <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niks kan onderbreek nie}=1{{sound_category_1} kan onderbreek}=2{{sound_category_1} en {sound_category_2} kan onderbreek}=3{{sound_category_1}, {sound_category_2} en {sound_category_3} kan onderbreek}other{{sound_category_1}, {sound_category_2} en nog # kan onderbreek}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niks kan onderbreek nie"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niemand kan onderbreek nie"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Sekere mense kan onderbreek"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alle mense kan onderbreek"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Aan"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Af"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Programvasspeld"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Met Programvasspeld kan jy die huidige program in sig hou totdat jy dit ontspeld. Hierdie kenmerk kan byvoorbeeld gebruik word om dit vir \'n vertroude vriend moontlik te maak om \'n spesifieke speletjie te speel. \n\nWanneer \'n program vasgespeld is, kan die vasgespelde program ander programme oopmaak en is persoonlike data dalk toeganklik. \n\nOm programvasspeld te gebruik: 	\n1.	Skakel programvasspeld aan 	\n2.	Maak Oorsig oop 	\n3.	Tik op die programikoon boaan die skerm en tik dan op Speld Vas"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Deur programme vas te speld, kan jy die huidige program in sig hou totdat jy dit ontspeld. Hierdie kenmerk kan byvoorbeeld gebruik word om dit vir \'n vertroude vriend moontlik te maak om \'n spesifieke speletjie te speel. \n\nWanneer \'n program vasgespeld is, kan die vasgespelde program ander programme oopmaak en kan daar dalk toegang tot persoonlike data verkry word. \n\nProbeer eerder \'n gasgebruiker gebruik as jy jou toestel veilig met iemand wil deel. \n\nHoe om programvasspeld te gebruik: 	\n1.	Skakel programvasspeld aan 	\n2.	Maak Oorsig oop 	\n3.	Tik op die programikoon boaan die skerm en tik dan op Speld Vas"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Deur programme vas te speld, kan jy die huidige program in sig hou totdat jy dit ontspeld. Hierdie kenmerk kan byvoorbeeld gebruik word om dit vir \'n vertroude vriend moontlik te maak om \'n spesifieke speletjie te speel."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Wanneer \'n program vasgespeld is, kan die vasgespelde program ander programme oopmaak en kan daar dalk toegang tot persoonlike data verkry word. \n\nOm programvasspeld te gebruik: 	\n1.	Skakel programvasspeld aan 	\n2.	Maak Oorsig oop 	\n3.	Tik op die programikoon boaan die skerm en tik dan op Speld Vas"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Wanneer \'n program vasgespeld is, kan die vasgespelde program ander programme oopmaak en kan daar dalk toegang tot persoonlike data verkry word. \n\nProbeer eerder \'n gasgebruiker gebruik as jy jou toestel veilig met iemand wil deel. \n\nOm programvasspeld te gebruik: 	\n1.	Skakel programvasspeld aan 	\n2.	Maak Oorsig oop 	\n3.	Tik op die programikoon boaan die skerm en tik dan op Speld Vas"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Wanneer program vasgespeld is: \n\n•	 Kan daar dalk toegang tot persoonlike data verkry word \n		(soos kontakte en e-posinhoud) \n•	 Vasgespelde program kan ander programme oopmaak \n\nGebruik net programvasspeld met mense wat jy vertrou."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Vra ontsluitpatroon voordat jy ontspeld"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Vra PIN voordat jy ontspeld"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Jy kan naas die gebruik van jou gesig om jou toestel te ontsluit hierdie toestel verder beskerm deur jou PIN te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm. Wil jy die PIN vereis om jou toestel te begin?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Jy kan naas die gebruik van jou gesig om jou toestel te ontsluit hierdie toestel verder beskerm deur jou patroon te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm. Wil jy die patroon vereis om jou toestel te begin?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Jy kan naas die gebruik van jou gesig om jou toestel te ontsluit hierdie toestel verder beskerm deur jou wagwoord te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm. Wil jy die wagwoord vereis om jou toestel te begin?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Jy kan naas die gebruik van jou biometrie om jou toestel te ontsluit, hierdie toestel verder beskerm deur jou PIN te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n PIN om jou toestel te begin?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Jy kan naas die gebruik van jou biometrie om jou toestel te ontsluit, hierdie toestel verder beskerm deur jou patroon te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis patroon om jou toestel te begin?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Jy kan naas die gebruik van jou biometrie om jou toestel te ontsluit, hierdie toestel verder beskerm deur jou wagwoord te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n wagwoord om jou toestel te begin?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nee"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Beperk"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB word beheer deur"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Gekoppelde toestel"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Hierdie toestel"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Skakel tans oor …"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Skakel tans oor …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Kon nie oorskakel nie"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Laai tans hierdie toestel"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Laai tans gekoppelde toestel"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobieledatagebruik"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Programdatagebruik"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi-datagebruik"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Niediensverskafferdatagebruik"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet-datagebruik"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 beperking</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Diensverskaffer se datarekening kan van toestel se rekening verskil"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Sluit data uit wat deur diensverskaffernetwerke gebruik word"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> gebruik"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Stel datawaarskuwing"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datawaarskuwing"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Bekyk besonderhede"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Databespaarder"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Onbeperkte data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Agtergronddata is afgeskakel"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Agtergronddata is afgeskakel"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aan"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Af"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Gebruik Databespaarder"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Verhinder die tik van antwoorde of ander teks in kennisgewings as die toestel gesluit is"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Verstekspeltoetser"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Kies speltoetser"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Gebruik speltoetser"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Gebruik speltoetser"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nie gekies nie"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(geen)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Bergingbestuurder verwyder gerugsteunde foto\'s en video\'s van jou toestel af om te help om berginspasie beskikbaar te maak."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Verwyder foto\'s en video\'s"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Bergingbestuurder"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Gebruik Bergingbestuurder"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Gebruik Bergingbestuurder"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Outomaties"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Handmatig"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Maak nou spasie beskikbaar"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dubbeltik om na foon te kyk"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dubbeltik om na tablet te kyk"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dubbeltik om na toestel te kyk"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swiep vir kennisgewings"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swiep af op die onderste rand van die skerm om jou kennisgewings te wys"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Eenhandmodus"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Gebruik eenhandmodus"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Verlaat wanneer jy tussen programme wissel"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Uitteltyd"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekondes"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekondes"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekondes"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"bereikbaarheid"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Dubbeltik op jou skerm om na die horlosie, kennisgewings en ander inligting te kyk."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Tel foon op om te kyk"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tel op om na tablet te kyk"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tik om na tablet te kyk"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tik om na toestel te kyk"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Tik op jou skerm om na die horlosie, kennisgewings en ander inligting te kyk."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Nood-SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Gebruik nood-SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Bestuur deur <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Begin die handelinge hieronder deur die aan/af-skakelaar 5 keer of meer vinnig te druk"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Speel aftelwekker"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Speel \'n harde klank voordat hulp gekontak word"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Bel vir hulp"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Nommer om te bel vir hulp"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Tik om te verander"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"As jy \'n nommer invoer wat nie \'n noodnommer is nie:\n • Moet jou toestel ontsluit wees om nood-SOS te gebruik\n • Sal jou oproep dalk nie beantwoord word nie"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swiep vingerafdruk vir kennisgewings"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swiep vingerafdruk"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Swiep na onder op die vingerafdruksensor aan die agterkant van jou foon om jou kennisgewings na te gaan."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maksimum aantal sigbare datastelle"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Stel terug na verstekwaardes"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Outovul-ontwikkelaaropsies is teruggestel"</string>
+    <string name="location_category" msgid="3496759112306219062">"Ligging"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Statusbalkligging-aanduier"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Wys vir alle liggings, insluitend netwerk en konnektiwiteit"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Dwing vol GNSS-metings af"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Spoor alle GNSS-konstellasies en -frekwensies na sonder enige dienssiklussering"</string>
     <string name="device_theme" msgid="5027604586494772471">"Toesteltema"</string>
     <string name="default_theme" msgid="4815428567082263639">"Verstek"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Netwerknaam"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Onderbreek kennisgewings om gefokus te bly"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Kenmerk is nie beskikbaar nie"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Hierdie kenmerk is afgeskakel omdat dit jou foon stadiger maak"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Dwing vol GNSS-metings af"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Spoor alle GNSS-konstellasies en -frekwensies na sonder enige dienssiklussering"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Wys altyd omvaldialoog"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Wys dialoog elke keer as \'n program omval"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Kies ANGLE-geaktiveerde program"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktiveer vir alle programme"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Kies grafikadrywer"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Verstek"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Speletjiedrywer"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Speletjiedrywer"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ontwikkelaardrywer"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Stelselgrafikadrywer"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Aan (demp)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Af"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Netwerkbesonderhede"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Programme op jou foon kan jou toestelnaam sien. Ander mense sal dit dalk ook kan sien wanneer jy aan Bluetooth-toestelle koppel of \'n Wi-Fi-warmkol opstel."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Programme op jou foon kan jou toestelnaam sien. Ander mense sal dit dalk ook kan sien wanneer jy aan Bluetooth-toestelle koppel, aan \'n wi-fi-netwerk koppel of \'n wi-fi-warmkol opstel."</string>
     <string name="devices_title" msgid="649715719278562515">"Toestelle"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Alle instellings"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Voorstelle"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Kon nie netwerke kry nie. Probeer weer."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(verbode)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Geen SIM-kaart nie"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Geen SIM nie"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Geen"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Benodig SIM om te koppel"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Benodig <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-SIM om te koppel"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Voorkeurnetwerkmodus: WCDMA verkies"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Voorkeurnetwerkmodus: net GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Voorkeurnetwerkmodus: net WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiele data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Kry toegang tot data deur selnetwerk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Foon sal outomaties na hierdie diensverskaffer oorskakel wanneer dit binne bereik is"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Geen SIM-kaart beskikbaar nie"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Oproepevoorkeur"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-voorkeur"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vra elke keer"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Onbeskikbaar wanneer gekoppel aan <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Sien meer"</string>
     <string name="see_less" msgid="2642392725363552793">"Sien minder"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Skakel <xliff:g id="CARRIER_NAME">%1$s</xliff:g> aan?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Skakel SIM aan?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Skakel oor na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Skakel oor om SIM-kaart te gebruik?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Net een SIM kan op \'n slag aktief wees.\n\nAs jy na <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> toe oorskakel, sal dit nie jou <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-diens kanselleer nie."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Net een afgelaaide SIM kan op \'n slag aktief wees.\n\nAs jy na <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> toe oorskakel, sal dit nie jou <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-diens kanselleer nie."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Net een SIM kan op \'n slag aktief wees.\n\nAs jy oorskakel, sal dit nie jou <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-diens kanselleer nie."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Skakel oor na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Koppel tans aan netwerk …"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Skakel tans oor na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Kan nie na \'n ander diensverskaffer toe oorskakel nie"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Kan weens \'n fout nie na \'n ander diensverskaffer toe oorskakel nie."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Skakel <xliff:g id="CARRIER_NAME">%1$s</xliff:g> af?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Skakel SIM af?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Skakel tans SIM af <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Kan nie diensverskaffer deaktiveer nie"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Iets was fout en jou diensverskaffer kon nie gedeaktiveer word nie."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Gebruik 2 SIM-kaarte?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Hierdie toestel kan 2 SIM-kaarte op dieselfde tyd aktief hê. Tik op \"Nee, dankie\" om aan te hou om 1 SIM op \'n slag te gebruik."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Herbegin toestel?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Herbegin jou toestel om te begin. Dan kan jy nog \'n SIM byvoeg."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Gaan voort"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Herbegin"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nee, dankie"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Skakel oor"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kan nie SIM aktiveer nie"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Verwyder die SIM en voeg dit weer in. Herbegin jou toestel as die probleem voortduur."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probeer weer om die SIM aan te skakel. Herbegin jou toestel as die probleem voortduur."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netwerkaktivering"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is aktief"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tik om SIM-instellings op te dateer"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-kaart"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Vee hierdie afgelaaide SIM uit?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"As jy hierdie SIM uitvee, word <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-diens van hierdie toestel verwyder.\n\nDiens vir <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> sal nie gekanselleer word nie."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Vee uit"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Vee tans SIM uit …"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Kan nie SIM uitvee nie"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Hierdie SIM kan weens \'n fout nie uitgevee word nie.\n\nHerbegin jou toestel en probeer weer."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Koppel aan toestel"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g>-program wil \'n tydelike Wi‑Fi-netwerk gebruik om aan jou toestel te koppel"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Geen toestelle gekry nie. Maak seker dat toestelle aangeskakel is en beskikbaar is om te koppel."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Noodoproepe"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Jou diensverskaffer steun nie noodoproepe oor Wi‑Fi nie.\nDie toestel skakel outomaties na \'n selnetwerk toe oor om \'n noodoproep te maak.\nNoodoproepe is net moontlik in gebiede met sellulêre dekking."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Gebruik Wi-Fi vir oproepe om gehalte te verbeter"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Kruis-SIM-oproepe"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Laat \'n ander SIM se oproepe en SMS\'e via hierdie SIM toe."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"kruis-SIM-oproepe"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Inkomende MMS-boodskap"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Kan nie MMS-boodskap stuur nie"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tik om MMS-boodskappe op <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> toe te laat wanneer mobiele data af is"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Laat skermoorleggers op Instellings toe"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Laat programme wat oor ander programme kan wys toe om Instellings-skerms te oorlê"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Versteek speler wanneer mediasessie geëindig het"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Die speler maak dit vir jou moontlik om \'n sessie vanaf die uitgebreide Kitsinstellings-paneel te hervat."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediaspeler in Kitsinstellings"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Wys mediaspeler vir \'n verlengde tydperk sodat terugspeel maklik kan hervat"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Versteek speler"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Wys speler"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Geen spelers beskikbaar nie"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Toegelate programme"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth sal aanskakel"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Aan"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Af"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM\'s"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Vliegtuigveilige netwerke"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Soek en koppel aan vliegtuigveilige netwerke"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"vliegtuig, vliegtuigveilig"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Oproepe en SMS\'e"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑fi-oproepe"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Maak en ontvang oproepe oor niediensverskaffer-netwerke soos wi-fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Met Wi-fi-oproepe kan jy oproepe oor niediensverskaffer-netwerke soos sommige wi-fi-netwerke maak en ontvang."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Oproepe"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"voorkeur"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"verkies oproepe"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"verkies SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"nie beskikbaar nie"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Geen SIM nie"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Voorkeure"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Koppel aan publieke netwerke"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"netwerkverbinding, internet, draadloos, data, wifi, wi-fi, wi fi, sellulêr, mobiel, selfoondiensverskaffer, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Bekyk netwerke veilig vir vliegtuie"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Skakel vliegtuigmodus af"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nie beskikbaar nie omdat slaaptydmodus aan is"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Terugstelling van kennisgewingbelangrikheid is voltooi."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Programme"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Onvertroude toestel wil toegang tot jou boodskappe hê. Tik vir besonderhede."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Gee toegang tot boodskappe?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"\'n Onvertroude Bluetooth-toestel, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wil toegang tot jou boodskappe hê.\n\nJy het nog nooit aan [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] gekoppel nie."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Onvertroude toestel wil toegang tot jou kontakte en oproeprekord hê. Tik vir besonderhede."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Gee toegang tot kontakte en oproeprekord?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"\'n Onvertroude Bluetooth-toestel, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wil toegang tot jou kontakte en oproeprekord hê. Dit sluit in data oor inkomende en uitgaande oproepe.\n\nJy het nog nooit aan [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] gekoppel nie."</string>
 </resources>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index f44cb48..09ef20a 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"መካከለኛ"</item>
     <item msgid="6740026006576843477">"ረጅም"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"አጭር"</item>
+    <item msgid="7397961711906421599">"መካከለኛ"</item>
+    <item msgid="4079132024502041928">"ረጅም"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ነባሪ"</item>
     <item msgid="4234707448428002595">"ጭረት-አልባ"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ሁለንተናዊ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ብቻ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ሁለገብ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index fb2ba7c..b6a1d67 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"ቀን እና ሰዓት"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"ቀን እና ሰዓት አዘጋጅ"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"ቀን፣ ሰዓት፣ የጊዜ ሰቅ&amp; ቅርፀቶች አዘጋጅ"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"በአውታረ መረብ የቀረበ ሰዓት ተጠቀም"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"በአውታረ መረብ የቀረበ የሰዓት ሰቅን ተጠቀም"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"ጊዜን በራስ-ሰር ያቀናብሩ"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"የሰዓት ሰቅ በራስ-ሰር ያቀናብሩ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"የቋንቋ ነባሪ ይጠቀሙ"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"የ24‑ሰዓት ቅርጸት"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 ሰዓት ቅርፀት ተጠቀም"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"የመገለጫ መረጃ በቁልፍ ማያ ገጽ ላይ አሳይ"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"መለያዎች"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"አካባቢ"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"አካባቢን ተጠቀም"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"አካባቢን ተጠቀም"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ጠፍቷል"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">በርቷል - <xliff:g id="COUNT_1">%1$d</xliff:g> መተግበሪያዎች የአካባቢ መዳረሻ አላቸው</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ማያ ገጽ መቆለፊያ፣ የፊት መክፈቻ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"የማያ ገጽ ቁልፍ፣ የጣት አሻራ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ማሳያ መቆለፊያ"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"በእርስዎ መልክ እና የጣት አሻራ የእርስዎን ስልክ ደህንነቱ ተጠብቆ ይክፈቱት"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"እንዲሁም በመለያ ወደ መተግበሪያዎች መግባት እና ክፍያዎችን ማረጋገጥ ይችላሉ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"መክፈትን በዚህ ያቀናብሩ፦"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"በመልክ መክፈት"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"የእርስዎን ስልክ መክፈት የአፍታ ጉዳይ ያድርጉት"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"የጣት አሻራ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"በእርስዎ ኪስ ውስጥ ስልክዎን በመክፈት ጊዜ ይቆጥቡ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ዝለል"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ቀጣይ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"መልክ ታክሏል"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"በመልክ መክፈቻን ያቀናብሩ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"በመልክ መክፈት"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ለማረጋገጥ መልክዎን ይጠቀሙ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ጀምር"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"የተደራሽነት በመልክ መክፈት ከጠፋ አንዳንድ የቅንብር እርምጃዎች ከTalkBack ጋር በአግባቡ ላይሠሩ ይችላሉ።"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ተመለስ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ማዋቀር ቀጥል"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"የተደራሽነት ቅንብርን ይጠቀሙ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"በመተግበሪያዎች ውስጥ በመልክ መክፈቻን ስትጠቀም ሁልጊዜ የማረጋገጫ እርምጃን ጠይቅ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"የመልክ ውሂብ ይሰረዝ?"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"በመልክ መክፈቻን ያቀናብሩ"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"መሣሪያዎን ለመክፈት፣ በመለያ ወደ መተግበሪያዎች ለመግባት እና ክፍያዎችን ለማረጋገጥ በመልክ መክፈቻን ይጠቀሙ።\n\nእነዚህን ከግምት ውስጥ ያስገቡ፦\nስልኩን ሲመለከቱት ሳያስቡት ሊከፍተው ይችላል።\n\nየሆነ ሰው ስልክዎን ፊትዎ ላይ ቢይዘው ሊከፈት ይችላል።\n\nስልክዎ እንደ ለምሳሌ ልጅዎ ወይም መንታ ወንድም/እህት ያለ በጣም እርስዎን በሚመስል ሰው ሊከፈት ይችላል።"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"መሣሪያዎን ለመክፈት፣ በመለያ ወደ መተግበሪያዎች ለመግባት እና ክፍያዎችን ለማረጋገጥ በመልክ መክፈቻን ይጠቀሙ።\n\nእነዚህን ከግምት ውስጥ ያስገቡ፦\nስልኩን ሲመለከቱት ሳያስቡት ሊከፍተው ይችላል።\n\nአይኖችዎ ዝግ ሆነውም እንኳ የሆነ ሰው ስልክዎ ፊትዎ ላይ ቢይዘው ሊከፈት ይችላል።\n\nስልክዎ እንደ ለምሳሌ ልጅዎ ወይም መንታ ወንድም/እህት ያለ በጣም እርስዎን በሚመስል ሰው ሊከፈት ይችላል።"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"መሣሪያዎን ለማስከፈት፣ ወደ መተግበሪያዎች በመለያ ለመግባት እና ክፍያዎችን ለማረጋገጥ በመልክ መክፈትን ይጠቀሙ።"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"ያስታውሱ፦\nስልኩ ላይ መመልከት እርስዎ ሳያስቡት ሊከፍተው ይችላል።\n\nየሆነ ሰው ስልክዎ ፊትዎ ላይ ቢይዘው ሊከፈት ይችላል።\n\nስልክዎ እንደ ለምሳሌ ልጅዎ ወይም መንታ ወንድም/እህት ያለ በጣም እርስዎን በሚመስል ሰው ሊከፈት ይችላል።"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"ያስታውሱ፦\nስልኩ ላይ መመልከት እርስዎ ሳያስቡት ሊከፍተው ይችላል።\n\nዓይኖችዎ ዝግ ሆነውም እንኳ የሆነ ሰው ስልክዎ ፊትዎ ላይ ቢይዘው ሊከፈት ይችላል።\n\nስልክዎ እንደ ለምሳሌ ልጅዎ ወይም መንታ ወንድም/እህት ያለ በጣም እርስዎን በሚመስል ሰው ሊከፈት ይችላል።"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"የፊት ውሂብ ይሰረዝ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"በፊት መክፈቻ ጥቅም ላይ የዋለው የፊት ውሂብ በቋሚነት እና ደህንነቱ በተጠበቀ መንገድ ይሰረዛል። ከተወገደ በኋላ የእርስዎን ስልክ ለመክፈት በመለያ ወደ መተግበሪያዎ ገብተው ክፍያዎችን ለማረጋገጥ የእርስዎን ፒን፣ ሥርዓተ ጥለት ወይም የይለፍ ቃል መጠቀም ይኖርብዎታል።"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"የእርስዎን ስልክ ለመክፈት የፊት መክፈቻን ይጠቀሙ"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"የእርስዎን ስልክ ለመክፈት ወይም ግዢዎችን ለማጽደቅ የእርስዎን የጣት አሻራ ይጠቀሙ።\n\nማስታወሻ፦ ይህን መሣሪያ ለመክፈት የጣት አሻራን መጠቀም አይችሉም። ለተጨማሪ መረጃ፣ የእርስዎን ድርጅት አስተዳዳሪ ያነጋግሩ።"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"የእርስዎን ስልክ ለመክፈት ወይም ግዢዎችን ለማጽደቅ የእርስዎን የጣት አሻራ ይጠቀሙ።\n\nማስታወሻ፦ የእርስዎ የጣት አሻራ ከጠንካራ ሥርዓተ ጥለት ወይም ፒን ይልቅ ያነሰ ለደህንነት አስተማማኝ ሊሆን ይችላል።"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ይቅር"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"አይ፣ አመሰግናለሁ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ቀጥል"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ዝለል"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ቀጣይ"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"የእርስዎን ጡባዊ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። እንዲሁም በመልክ መክፈቻን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልገዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"የእርስዎን መሣሪያ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። እንዲሁም በመልክ መክፈቻን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልገዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"የእርስዎን ስልክ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። እንዲሁም በመልክ መክፈቻን ለማቀናበር የማያ ገጽ መቆለፊያ አማራጭ ያስፈልገዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"የእርስዎን ጡባዊ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። ባዮሜትሪክስን ለማቀናበር እንዲሁም የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"የእርስዎን መሣሪያ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። ባዮሜትሪክስን ለማቀናበር እንዲሁም የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"የእርስዎን ስልክ በማያ ገጽ መቆለፊያ አማራጭ በመጠበቅዎ ቢጠፋ ወይም ቢሰረቅ ማንም ሰው ሊጠቀምበት አይችልም። ባዮሜትሪክስን ለማቀናበር እንዲሁም የማያ ገጽ መቆለፊያ አማራጭ ያስፈልግዎታል። ለመመለስ ይቅርን መታ ያድርጉ።"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"የፒን ቅንብር ይዘለል?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"የይለፍ ቃል ቅንብር ይዘለል?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"የሥርዓተ ጥለት ቅንብር ይዘለል?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"የመሣሪያ ጥበቃ ባህሪያትን በማግበር ሌሎች ይህን ጡባዊ ያለእርስዎ ፈቃድ እንዳይጠቀሙበት ይከልክሉ። መጠቀም የሚፈልጉትን የማያ ገጽ መቆለፊያ ይምረጡ።"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"የመሣሪያ ጥበቃ ማድረጊያ ባሕሪዎችን በማግበር ያለ እርስዎ ፈቃድ ሌሎች ይህን መሣሪያ እንዳይጠቀሙ ይከላከሉዋቸው። መጠቀም የሚፈልጉትን ማያ ገጽ መቆለፊያ ይምረጡ።"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"የመሣሪያ ጥበቃ ባህሪያትን በማግበር ሌሎች ይህን ስልክ ያለእርስዎ ፈቃድ እንዳይጠቀሙበት ይከልክሉ። መጠቀም የሚፈልጉትን የማያ ገጽ መቆለፊያ ይምረጡ።"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"የምትኬ ቁልፍ ገጽ ስልትዎን ይምረጡ"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"የምትኬ ቁልፍ ገጽ ስልትዎን ይምረጡ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"የምትኬ ማያ ገጽ መቆለፊያ ስልትዎን ይምረጡ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ማያ ገጽ መቆለፊያ አማራጮች"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ማያ ገጽ መቆለፊያ አማራጮች"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ማሳያ መቆለፊያ"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"በመልክ መክፈቻ + የይለፍ ቃል"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ያለመልክ መክፈቻ ይቀጥሉ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"የእርስዎን መልክ ተጠቅመው ስልክዎን መክፈት ይችላሉ። ለደህንነት ሲባል ይህ አማራጭ የመጠባበቂያ ማያ ገጽ መቆለፊያ ያስፈልገዋል።"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ባዮሜትሪክስ + ስርዓተ ጥለት"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ባዮሜትሪክስ + ፒን"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ባዮሜትሪክስ + የይለፍ ቃል"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ያለባዮሜትሪክስ ቀጥል"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"የእርስዎን ባዮሜትሪክስ በመጠቀም ስልክዎን መክፈት ይችላሉ። ለደህንነት ሲባል ይህ አማራጭ የምትኬ የማያ ገጽ መቆለፊያ ያስፈልገዋል።"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"በአስተዳዳሪ፣ የምስጠራ መመሪያ ወይም የምስክርነት ማከማቻ ተሰናክሏል"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ምንም"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ማንሸራተት"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">ከ<xliff:g id="NUMBER_1">%d</xliff:g> አሃዞች ያነሰ መሆን አለበት</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"የመሣሪያ አስተዳዳሪው የቅርብ ጊዜ ፒን መጠቀም አይፈቅድም"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"የተለመዱ ፒኖች በአይቲ አስተዳዳሪዎ የታገዱ ናቸው። የተለየ ፒን ይሞክሩ።"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ይህ ልክ ያልሆነ ቁምፊ ማካተት አይችልም"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ቢያንስ አንድ ፊደል መያዝ አለበት"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ቢያንስ አንድ አሃዝ መያዝ አለበት"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">ቢያንስ <xliff:g id="COUNT">%d</xliff:g> ቁጥር ያልሆኑ ቁምፊዎች ሊኖረው ይገባል</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"የመሣሪያ አስተዳዳሪው የቅርብ ጊዜ የይለፍ ቃልን መጠቀም አይፈቅድም"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"የተለመዱ የይለፍ ቃላት በአይቲ አስተዳዳሪዎ የታገዱ ናቸው። የተለየ የይለፍ ቃል ይሞክሩ።"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ሽቅብ፣ ቁልቁል ወይም ተደጋጋሚ የአኃዞች ተከታታይ አይፈቀድም"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ያረጋግጡ"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ይቅር"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi ያብሩ"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fiን ተጠቀም"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fiን ተጠቀም"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"የWi-Fi ቅንብሮች"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"አዘጋጅ&amp; የገመድ አልባ ድረስ ነጥብ አደራጅ"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"ወደ «<xliff:g id="SSID">%1$s</xliff:g>» መሣሪያ ለማከል የQR ኮዱን ከዚህ በታች መሃል ላይ ያስቀምጡት"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"የQR ኮድን በመቃኘት Wi‑Fi ን ይቀላቀሉ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fiን አጋራ"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"ወደ «<xliff:g id="SSID">%1$s</xliff:g>»ን ለማገናኘት ይህን የQR ኮድ ይቃኙ እና የይለፍ ቃሉን ያጋሩ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"«<xliff:g id="SSID">%1$s</xliff:g>»ን ለመቀላቀል ይህን የQR ኮድ በሌላ መሣሪያ ይቃኙት"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"ወደ «<xliff:g id="SSID">%1$s</xliff:g>» ለማገናኘት ይህን የQR ኮድ ይቃኙት"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"እንደገና ይሞክሩ። ችግሩ ከቀጠለ የመሣሪያ አምራቹን ያነጋግሩ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"የሆነ ችግር ተፈጥሯል"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"የWi-Fi ይለፍ ቃል፦ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"የመገናኛ ነጥብ የይለፍ ቃል፦ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"በራስ-ሰር ተገናኝ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ስልክ ከዚህ አውታረ መረብ አቅራቢያ በራስ-ሰር እንዲገናኝ ይፍቀዱለት"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ጡባዊ ከዚህ አውታረ መረብ አቅራቢያ በራስ-ሰር እንዲገናኝ ይፍቀዱለት"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"በክልል ውስጥ ሲሆን ከዚህ አውታረ መረብ ጋር ግንኙነት ይፍቀዱ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"መሣሪያ ያክሉ"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"አንድ መሣሪያ ወደዚህ አውታረ መረብ ለማከል የQR ኮድ ይጠቀሙ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR ኮድ ልክ ያልኾነ ቅርጸት ነው"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"የሥርዓት የዕውቅና ማረጋገጫዎችን ይጠቀሙ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"አታቅርብ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"አታረጋግጥ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"ምንም የእውቅና ማረጋገጫ አልተጠቀሰም። የእርስዎ ግንኙነት የግል አይሆንም።"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"የአውታረ መረብ ስም ከልክ በላይ ረዥም ነው።"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ጎራ መጠቀስ አለበት።"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"የእውቅና ማረጋገጫ ያስፈልጋል።"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"አያይዝ"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi በርቷል"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"ከ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ጋር ተገናኝቷል"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"ወደ <xliff:g id="NETWORK_NAME">%1$s</xliff:g> በመገናኘት ላይ"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"በመገናኘት ላይ…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ከአውታረ መረቡ ጋር መገናኘት አልተሳካም"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"አውታረ መረብ በክክል ውስጥ አይደለም"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"ኤስኤስአይዲ"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"የመሣሪያ ማክ አድራሻ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"የዘፈቀደ የተደረገ የማክ አድራሻ"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"የዘፈቀደ የተደረገ የMAC አድራሻ (ለመጨረሻ ጊዜ ጥቅም ላይ የዋለው)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP አድራሻ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"የአውታረ መረብ ዝርዝሮች"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"የንዑስ አውታር ጭንብል"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"የIPv6 አድራሻዎች"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"የተቀመጡ አውታረ መረቦች"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"የደንበኝነት ምዝገባዎች"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"ሌሎች አውታረ መረቦች"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP ቅንብሮች"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"የላቁ የWi‑Fi ቅንብሮች ለዚህ ተጠቃሚ አይገኙም"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"አስቀምጥ"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"እባክህ ትክክለኛ ኣግባቢ ፍኖት አድራሻ ተይብ።"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"እባክህ ትክክለኛ dns አድራሻ ተይብ።"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"እባክህ በ0 እና 32 መካከል የአውታረ መረብ ቅድመ ቅጥያ ርዝመት ተይብ።"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"ዲኤንኤስ 1 (በግል ዲኤንኤስ ቅድሚያ ካልተወሰደበት በስተቀር)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"ዲኤንኤስ 2 (በግል ዲኤንኤስ ቅድሚያ ካልተወሰደበት በስተቀር)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"መውጫ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"የአውታረ መረብ ቅድመ ቅጥያ ርዝመት"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"መተግበሪያ ይዘትን እያጋራ ነው። የበይነመረብ ግንኙነትን ለማጋራት መገናኛ ነጥብን ያጥፉና ከዚያ ያብሩት"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"ምንም የይለፍ ቃል አልተቀናበረም"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"የመገናኛ ነጥብ ስም"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ን በማብራት ላይ..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ን በማብራት ላይ…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ሌሎች መሣሪያዎች ወደ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ሊገናኙ ይችላሉ"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"የመገናኛ ነጥብ የይለፍ ቃል"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"የኤፒ ባንድ"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"ለስላሳ ማሳያ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ለአንዳንድ ይዘት የማደሻ ፍጥነቱን በራስ-ሰር ከ60 ወደ 90 ኸርዝ ያሳድገዋል። የባትሪ ፍጆታን ይጨምራል።"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ለስላሳ ማሳያ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"የ90 ኸርዝ እድሳትን አስገድድ"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ለተሻሻለ የንክኪ አጸፋ እና የእነማ ጥራት በጣም ከፍተኛው ዕድሳት ፍጥነት የባትሪ ፍጆታን ይጨምራል።"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"የማያ ገጽ ትኩረት"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"በርቷል / ማያ ገጽ እርስዎ እየተመለከቱት ያሉ ከሆነ አይጠፋም"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ማያ ገጽ ጨለማ ሲሆን ለአዲስ ማሳወቂያዎች ይበራል"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ሁልጊዜ ሰዓትን እና መረጃን አሳይ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"የባትሪ አጠቃቀምን ይጨምራል"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"ደማቅ ጽሑፍ"</string>
     <string name="title_font_size" msgid="570613010306330622">"የቁምፊ መጠን"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ጽሑፍ ያተልቁ ወይም ያሳንሱ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"የSIM ካርድ ቆልፍ ቅንብሮች"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ሥሪት"</string>
     <string name="security_patch" msgid="4071756145347865382">"የAndroid ደህንነት ዝማኔ"</string>
     <string name="model_info" msgid="8997566254717810904">"ሞዴል"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ሞዴል፦ %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ሞዴል እና ሃርድዌር"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"የሃርድዌር ስሪት"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"የመሣሪያ መታወቂያ"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN ሰርዝ"</string>
     <string name="menu_new" msgid="6571230342655509006">"አዲስ APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"አስቀምጥ"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"ጣለው"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"ይቅር"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"የስም መስክ ባዶ ሊሆን አይችልም"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN ባዶ መሆን አይችልም።"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"መተግበሪያዎች ዳግም ሊጀመሩ ይችላሉ"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi፣ ተንቀሳቃሽ ስልክ እና ብሉቱዝን ዳግም አስጀምር"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"የሚከተሉትን ጨምሮ ይህ ሁሉንም የአውታረ መረብ ቅንብሮችን ዳግም ያቀናብራል፦\n\n"<li>"Wi‑Fi"</li>\n<li>"የተንቀሳቃሽ ስልክ ውሂብ"</li>\n<li>"ብሉቱዝ"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"ደምስስ"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"የወረዱ ሲሞችን ይደምስሱ"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"ምትክ ሲሞችን ለማውረድ፣ የእርስዎን አገልግሎት አቅራቢ ያነጋግሩ። ይህ ማናቸውም የተንቀሳቃሽ ስልክ አገልግሎት ዕቅዶችን አይሰርዝም።"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"ይህ ማናቸውም የተንቀሳቃሽ ስልክ አገልግሎት ዕቅዶችን አይሰርዝም። ተተኪ ሲሞችን ለማውረድ፣ የአገልግሎት አቅራቢዎን ያነጋግሩ።"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"ቅንብሮችን ዳግም ያቀናብሩ"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"ሁሉም አውታረ መረብ ቅንብሮች ዳግም ይጀምሩ? ይህን እርምጃ መቀልበስ አይችሉም።"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"ሁሉም የአውታረ መረብ ቅንብሮች ዳግም ይቀናበሩ እና የወረዱ ሲሞች ይደምሰሱ? ይህን ተግባር መቀልበስ አይችሉም።"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"የአውታረ መረብ ቅንብሮች ዳግም ጀምረዋል።"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ሲሞችን መደምሰስ አይቻልም"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"የወረዱ ሲሞች በስህተት ምክንያት ሊሰረዙ አይችሉም።\n\nየእርስዎን መሣሪያ ዳግም ያስጀምሩ እና እንደገና ይሞክሩ።"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ይህ የሚከተሉትንም ጨምሮ ሁሉንም ውሂብ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" ይሰርዛል፦\n\n"<li>"የእርስዎ Google መለያ"</li>\n<li>"የሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ይሄ የሚከተሉትንም ጨምሮ ሁሉንም ውሂብ ከስልክዎ "<b>"ውስጣዊ ማከማቻ"</b>" ይደመስሰዋል፦\n\n"<li>"የእርስዎ Google መለያ"</li>\n<li>"የስርዓት እና መተግበሪያ ውሂብና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n" እርስዎ በአሁን ጊዜ የሚከተለው መለያዎች ውስጥ ገብተዋል፡\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"በዚህ መሣሪያ ላይ ያሉ ሌሎች ተጠቃሚዎች አሉ።\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"ሙዚቃ"</li>\n<li>"ፎቶዎች"</li>\n<li>"ሌላ የተጠቃሚ ውሂብ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMዎች"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ይሄ የተንቀሳቃሽ ስልክ አገልግሎት እቅድዎን አይሰርዘውም።"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ \n\nለማጥራት፣"<b>"USBማከማቻ"</b>" መጥፋት ያስፈልገዋል።"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n" ሙዚቃ፣ ምስሎች፣ እና ሌላ ተጠቃሚ ውሂብ ለማጥራት፣"<b>" የSD ካርድ "</b>"መጥፋት ያስፈልገዋል።"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ሁሉንም ውሂብ ደምስስ (የፋብሪካ ዳግም ማስጀመር)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ይህ የሚከተሉትንም ጨምሮ ሁሉንም ውሂብ ከእርስዎ ጡባዊ "<b>"ውስጣዊ ማከማቻ"</b>" ይሰርዛል፦\n\n"<li>"የእርስዎ Google መለያ"</li>\n<li>"የሥርዓት እና መተግበሪያ ውሂብ እና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ይሄ የሚከተሉትንም ጨምሮ ሁሉንም ውሂብ ከስልክዎ "<b>"ውስጣዊ ማከማቻ"</b>" ይደመስሰዋል፦\n\n"<li>"የእርስዎ Google መለያ"</li>\n<li>"የስርዓት እና መተግበሪያ ውሂብና ቅንብሮች"</li>\n<li>"የወረዱ መተግበሪያዎች"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"እርስዎ በአሁኑ ጊዜ ውደሚከተሉት መለያዎች ገብተዋል፦\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"በዚህ መሣሪያ ላይ ያሉ ሌሎች ተጠቃሚዎች አሉ።\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"ሙዚቃ"</li>\n<li>"ፎቶዎች"</li>\n<li>"ሌላ የተጠቃሚ ውሂብ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMዎች"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ይህ የተንቀሳቃሽ ስልክ አገልግሎት እቅድዎን አይሰርዘውም።"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"ሙዚቃ፣ ምስሎች እና ሌላ ተጠቃሚ ውሂብን \n\nለማጥራት "<b>"የዩኤስቢ ማከማቻ"</b>" መደምሰስ አለበት።"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n" ሙዚቃ፣ ምስሎች እና ሌላ የተጠቃሚ ውሂብን ለማጥፋት"<b>" የኤስዲ ካርድ "</b>" መደምሰስ አለበት።"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB ማከማቻ አጥፋ"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"የSD ካርድ አጥፋ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"እንደ ሙዚቃ እና ፎቶዎች፣ ሁሉንም ውሂብ በውስጥ USB ማከማቻ አጥፋ።"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"እንደ ሙዚቃ እና ፎቶዎች፣ ሁሉንም ውሂብ በSD ካርድ ላይ አጥፋ።"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ሁሉንም ውሂብ ደምስስ"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ሁሉንም ውሂብ ደምስስ"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ሁሉም የግል መረጃዎ እና የወረዱ መተግበሪያዎችዎ ይሰረዛሉ። ይህን ተግባር መቀልበስ አይችሉም።"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"የወረዱ መተግበሪያዎች እና ሲሞችን ጨምሮ ሁሉም የግል መረጃዎ ይሰረዛሉ። ይህን ተግባር መቀልበስ አይችሉም።"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ሁሉንም አጥፋ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"የስርዓቱ አገልግሎት አጽዳ ስላልተገኘ ዳግም ለማስጀመር ምንም አልተከናወነም።"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ሁሉም ውሂብ ይደምሰስ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"የፋብሪካ ዳግም ማስጀመር ለዚህ ተጠቃሚ አይገኝም"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"በማጥፋት ላይ"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"እባክዎ ይጠብቁ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ሁሉንም ውሂብ ደምስስ"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ሁሉንም ውሂብ ደምስስ"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ሁሉም የእርስዎ የግል መረጃ እና የወረዱ መተግበሪያዎች ይሰረዛሉ። ይህን ተግባር መቀልበስ አይችሉም።"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"የወረዱ መተግበሪያዎች እና ሲሞችን ጨምሮ ሁሉም የግል መረጃዎ ይሰረዛሉ። ይህን ተግባር መቀልበስ አይችሉም።"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ሁሉም ውሂብ ይደምሰስ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"የፋብሪካ ዳግም ማስጀመር ለዚህ ተጠቃሚ አይገኝም"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"በመደምሰስ ላይ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"እባክዎ ይጠብቁ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"የጥሪ ቅንብሮች"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"የድምፅመልዕክት፣ የጥሪ ማስተላለፊያ፣መስመር ላይ ቆይ፣ የደዋይ ID አዋቅር"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB መሰካት"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"ከ<xliff:g id="MAXCONNECTION">%1$d</xliff:g> መሣሪያዎች በላይ ማገናኘት አይቻልም።"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> አይያያዝም።"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"የኢተርኔት ማስተሳሰር"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"የስልክ በይነመረብ ግንኙነትን በዩኤስቢ ኢተርኔት በኩል አጋራ"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"የስልክ በይነመረብ ግንኙነትን በዩኤስቢ ኢተርኔት በኩል አጋራ"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"በእርስዎ የተንቀሳቃሽ ስልክ ውሂብ ግንኙነት በኩል በይነመረቡ ለሌሎች መሣሪያዎች ለማቅረብ የመገናኛ ነጥብን እና እንደ ሞደም መሰካትን ይጠቀሙ። መተግበሪያዎች በአቅራቢያ ላሉ መሣሪያዎች ይዘትን ለማጋራት መገናኛ ነጥብን ሊፈጥሩ ይችላሉ።"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"በእርስዎ Wi-Fi ወይም የተንቀሳቃሽ ስልክ ውሂብ ግንኙነት በኩል በይነመረቡ ለሌሎች መሣሪያዎች ለማቅረብ የመገናኛ ነጥብን እና እንደ ሞደም መሰካትን ይጠቀሙ። መተግበሪያዎች እንዲሁም ይዘቶችን በአቅራቢያ ላሉ መሣሪያዎች ለማጋራት መገናኛ ነጥብን መፍጠር ይችላሉ።"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"እገዛ"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"የBluetooth ቅኝት"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ብሉቱዝ ጠፍቶ ቢሆንም እንኳ በማንኛውም ጊዜ መተግበሪያዎች እና አገልግሎቶች በአቅራቢያ ያሉ መሣሪያዎችን እንዲቃኙ ይፍቀዱ። ይህ ለምሳሌ በአካባቢ ላይ የተመሠረቱ ባሕሪያትን እና አገልግሎቶችን ለማሻሻል ጥቅም ላይ ሊውል ይችላል።"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"የአካባቢ አገልግሎቶች ለስራ"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"የአካባቢ የሰዓት ሰቅ ማወቂያ"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"የአካባቢ የሰዓት ሰቅ ማወቂያ"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"የአሁኑን ሰዓት ሰቅ ለማወቅ የመሣሪያውን አከባቢ እንዲጠቀምበት ያስችለዋል። እንደ Wi‑Fi ቅኝት ያሉ ሌሎች የአካባቢ ቅንብሮች የሰዓት ሰቅ ማወቂያ ትክክለኛነት ላይ ተጽዕኖ ሊያሳርፉ ይችላሉ።"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"አብራ"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"አጥፋ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ራስ-ሰር የሰዓት ሰቅ ማግኘት ተሰናክሏል"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"የአካባቢ የሰዓት ሰቅ ማወቂያ ተሰናክሏል"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"የአካባቢ የሰዓት ሰቅ ማወቂያ አይደገፍም"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"የአካባቢ የሰዓት ሰቅ ማወቂያ ለውጦች አይፈቀዱም"</string>
     <string name="location_network_based" msgid="5247042890080021887">"የWi-Fi እና የተንቀሳቃሽ ስልክ አውታረ መረብ አካባቢ"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"መተግበሪያዎች አካባቢዎትን በበለጠ ፍጥነት እንዲገምቱ የGoogle የአካባቢ አገልግሎትን ይጠቀሙ። ስም አልባ የአካባቢ ውሂብ ተሰብስቦ ወደ Google ይላካል።"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"አካባቢ በWi-Fi ይታወቃል"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"በመልክ መክፈቻን ለመጠቀም የይለፍ ቃል ይጠቀሙ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"በመልክ መክፈትን ለመጠቀም ስርዓተ-ጥለትን ያቀናብሩ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"በመልክ መክፈቻን ለመጠቀም ፒን ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ባዮሜትሪክስን ለመጠቀም የይለፍ ቃል ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ባዮሜትሪክስን ለመጠቀም ሥርዓተ ጥለት ያቀናብሩ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ባዮሜትሪክስን ለመጠቀም ፒን ያቀናብሩ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"የእርስዎን የይለፍ ቃል ረሱት?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"የእርስዎን ስርዓተ-ጥለት ረሱት?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"የእርስዎን ፒን ረሱት?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"የመግለጫ ጽሑፍ ምርጫዎች"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ማጉላት"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"የማጉያ አካባቢ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ማጉላትን አንቃ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ማያ ገጹን በሚያጎሉበት ጊዜ መጠቀም የሚፈልጉትን(ዋቸውን) የማጉያ አካባቢ(ዎች) ይምረጡ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ሙሉ ማያ ገጽ"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"የማያ ገጽ ክፍል"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ሙሉ ማያ ገጽ እና የማያ ገጽ ክፍል"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ሙሉውን ማያ ገጽ አጉላ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"የማያ ገጹን ክፍል አጉላ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ወደ የተደራሽነት አዝራር ይቀየር?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"የማያ ገጹን የተወሰነ ክፍል ለማጉላት ሶስት ጊዜ መታ ማድረግ መተየብ እና ሌሎች እርምጃዎች እንዲዘገዩ ያደርጋል።\n\nለማጉላት የተደራሽነት አዝራርን ወደ መጠቀም መቀየር ይፈልጋሉ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ወደ የተደራሽነት አዝራር ይቀይሩ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ለማጉላት ሶስት ጊዜ መታ ማድረግን ያቆዩት"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"የማጉያ ቅንብሮች"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ሶስቴ መታ በማድረግ ያጉሉ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"በአቋራጭ ያጉሉ"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"የኃይል አዘራር ጥሪውን ይዘገዋል"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ትልቅ የመዳፊት ጠቋሚ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"እነማዎችን ያስወግዱ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ሞኖ ኦዲዮ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ኦዲዮ ሲያጫውቱ ሰርጦችን ያጣምሩ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"የኦዲዮ ሚዛን"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ግራ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ቀኝ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ሞኖ ኦዲዮ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ኦዲዮ ሲያጫውቱ ሰርጦችን ያጣምሩ"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"የኦዲዮ ሚዛን"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ግራ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ቀኝ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ነባሪ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ሰከንዶች"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ሰከንዶች"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"የማሳወቂያ ንዝረት"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"የጥሪ ንዝረት"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"የንክኪ ግብረመልስ"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ን ይጠቀሙ"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ን ክፈት"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"የቀለም ማስተካከያን ተጠቀም"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"መግለጫ ጽሑፎችን አሳይ"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ለሚደገፍ መተግበሪያ ብቻ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ን ይጠቀሙ"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ን ክፈት"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"የቀለም ማስተካከያን ተጠቀም"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"መግለጫ ጽሑፎችን አሳይ"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ለሚደገፍ መተግበሪያ ብቻ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"የመግለጫ ጽሑፍ መጠን እና ቅጥ"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> የጽሑፍ መጠን"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ተጨማሪ አማራጮች"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ዲውተራኖማሊ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ፕሮታኖማሊ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ትራይታኖማሊ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ግርጥነት"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ቀይ-አረንጓዴ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ቀይ-አረንጓዴ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ሰማያዊ-ቢጫ"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"የዳራ ገደብ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"መተግበሪያው በበስተጀርባ እንዲሄድ ይፍቀዱለት።"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"መተግበሪያው በጀርባ ውስጥ እንዲያሄድ አይፈቀድለትም"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"የዳራ አጠቃቀም ሊገደብ አይችልም"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"የበስተጀርባ አጠቃቀም ሊገደብ አይችልም"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"የጀርባ እንቅስቃሴ ይገደብ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"የአንድ መተግበሪያ የጀርባ እንቅስቃሴን ከገደቡ ያልተገባ ባህሪ ሊያሳይ ይችላል"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ይህ መተግበሪያ ባትሪን ለማላቅ አልተቀናበረም፣ ሊገድቡት አይችሉም።\n\nመተግበሪያውን ለመገደብ፣ የባትሪ ማላቅን በመጀመሪያ ያብሩ።"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ጡባዊው ከተለመደው በላይ ስራ ላይ ውሏል"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"መሣሪያው ከተለመደው በላይ ስራ ላይ ውሏል"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ባትሪ ከተጠበቀው ጊዜ ቀድሞ ሊያልቅ ይችላል"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ለባትሪ ጤና ማመቻቸት"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ባትሪ ለጊዜው ተገድቧል። የበለጠ ለመረዳት መታ ያድርጉ።"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"የእርስዎ ስልክ ከመደበኛው በላይ ሥራ ላይ ውሏል። የእርስዎ ባትሪ ከተጠበቀው ቀድሞ ሊያልቅ ይችል ይሆናል።\n\nበባትሪ አጠቃቀም ረገድ ከፍተኛ መተግበሪያዎች፦"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"የእርስዎ ጡባዊ ከመደበኛው በላይ ሥራ ላይ ውሏል። የእርስዎ ባትሪ ከተጠበቀው ቀድሞ ሊያልቅ ይችል ይሆናል።\n\nበባትሪ አጠቃቀም ረገድ ከፍተኛ መተግበሪያዎች፦"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"የእርስዎ መሣሪያ ከተለመደው ጊዜ በላይ ጥቅም ላይ ውሏል። የእርስዎ ባትሪ ከተጠበቀው ቀድሞ ሊያልቅ ይችል ይሆናል።\n\nበባትሪ አጠቃቀም ረገድ ከፍተኛ መተግበሪያዎች፦"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">%1$d መተግበሪያዎች ተገድበዋል</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"የባትሪ መለኪያዎን የማንበብ ችግር"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"የባትሪ መለኪያዎን የማንበብ ችግር። "<annotation id="url">"የበለጠ ለመረዳት"</annotation>" መታ ያድርጉ"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"መተግበሪያ ይቁም?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> ስልክዎን እንደነቃ እያቆየው ስለሆነ ስልክዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልቻለም።\n\nይህን ችግር ለመፍታት መተግበሪያውን ማቆም ይችላሉ።\n\nይህ ሁኔታ ከቀጠለ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን ማራገፍ ሊኖርብዎት ይችላል።"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> ጡባዊዎን እንደነቃ እያቆየው ስለሆነ ጡባዊዎ ባትሪውን በጤናማ ሁኔታ ማስተዳደር አልቻለም።\n\nይህን ችግር ለመፍታት መተግበሪያውን ማቆም ይችላሉ።\n\nይህ ሁኔታ ከቀጠለ የባትሪ አፈጻጸም ብቃትን ለማሻሻል ሲባል መተግበሪያውን ማራገፍ ሊኖርብዎት ይችላል።"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"መርሐግብር ያቀናብሩ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"የባትሪ ዕድሜን አራዝም"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ኃይል ሲሞላ አጥፋ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ባትሪ ቆጣቢ የእርስዎ ስልክ በ <xliff:g id="PERCENT">%1$s</xliff:g> ላይ ሲሆን ይጠፋል"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ባትሪ ቆጣቢ የእርስዎ ጡባዊ በ <xliff:g id="PERCENT">%1$s</xliff:g> ላይ ሲሆን ይጠፋል"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ባትሪ ቆጣቢ የእርስዎ መሣሪያ በ <xliff:g id="PERCENT">%1$s</xliff:g> ላይ ሲሆን ይጠፋል"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"የእርስዎ ስልክ ከ<xliff:g id="PERCENT">%1$s</xliff:g> በላይ ሲሞላ ባሪ ቆጣቢ ይጠፋል"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"የእርስዎ ጡባዊ ከ<xliff:g id="PERCENT">%1$s</xliff:g> በላይ ሲሞላ ባሪ ቆጣቢ ይጠፋል"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"የእርስዎ መሣሪያ ከ<xliff:g id="PERCENT">%1$s</xliff:g> በላይ ሲሞላ ባሪ ቆጣቢ ይጠፋል"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"አብራ"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ዳግም አስጀምር"</string>
     <string name="tts_play" msgid="2945513377250757221">"አጫውት"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ተለማማጅ ግንኙነት"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"የአውታረ መረብ ግንኙነቶችዎን በራስ-ሰር በማስተዳደር የባትሪ ዕድሜን ያራዝማል እንዲሁም የመሣሪያ አፈፃፀምን ያሻሽላል"</string>
     <string name="credentials_title" msgid="7535942196886123656">"መረጃ ማከማቻ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"የእውቅና ማረጋገጫ ይጫኑ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ከማከማቻ ምስክሮች ጫን"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"የተጠቃሚ ምስክርነቶች"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"የተከማቹ ምስክርነቶችን ይመልከቱ እና ያሻሽሉ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ከፍተኛ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"የማከማቻ አይነት"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"በሃርድዌር የተደገፈ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ሶፍትዌር ብቻ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ምስክርነቶች ለዚህ ተጠቃሚ አይገኙም"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ለVPN እና መተግበሪያዎች ተጭኗል"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ለWi-Fi ተጭኗል"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"አትጫን"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"የሆነው ሆኖ ጫን"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"የእውቅና ማረጋገጫ አልተጫነም"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"የምስክር ወረቀቶችን በዚህ መሣሪያ ላይ ለመጫን <xliff:g id="APP_NAME">%s</xliff:g> ይፈቀድ?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"እነዚህ የምስክር ወረቀቶች ከዚህ በታች ላሉት መተግበሪያዎች እና ዩ አር ኤልዎች እርስዎን ለይተው ያውቃሉ"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"አትፍቀድ"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"ፍቀድ"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"ተጨማሪ አሳይ"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"የምስክር ወረቀት አስተዳደር መተግበሪያ"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"ምንም"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"በዚህ መተግበሪያ የተጫኑ የምስክር ወረቀቶች ከዚህ በታች ላሉት መተግበሪያዎች እና ዩ.አር.ኤል.ዎች እርስዎን ለይተው ያውቃሉ"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"አስወግድ"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"የድንገተኛ አደጋ መወደያ ሲግናል"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"የአደጋጊዜ ጥሪ ሲደረግ ባህሪ አዘጋጅ"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"ምትኬ"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"አልተዋቀረም - የስራ መገለጫ"</string>
     <string name="user_admin" msgid="4024553191395768119">"አስተዳዳሪ"</string>
     <string name="user_you" msgid="3070562015202859996">"እርስዎ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ቅጽል ስም"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"እስከ <xliff:g id="USER_COUNT">%1$d</xliff:g> ተጠቃሚዎች ማከል ይችላሉ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"የጡባዊው ባለቤት ብቻ ነው ተጠቃሚዎችን ማስተዳደር የሚችለው።"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"የስልኩ ባለቤት ብቻ ነው ተጠቃሚዎችን ማስተዳደር የሚችለው።"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ተርሚናል ላይ መክፈል"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"አንድ የክፍያ መተግበሪያ ያቀናብሩ። ከዚያም የስልክዎን ጀርባ ንክኪ-አልባ ምልክቱ ካለው ማንኛውም ተርሚናል ጋር ያቁሙት።"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ገባኝ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ተጨማሪ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ተጨማሪ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ነባሪ የክፍያ መተግበሪያ ያቀናብሩ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ነባሪ የክፍያ መተግበሪያ ያዘምኑ"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ንክኪ-አልባ ተርሚናሉ ላይ በ<xliff:g id="APP">%1$s</xliff:g> ይክፈሉ"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ተመለስ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ቀጣይ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ተጠናቅቋል"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ፎቶ አንሳ"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ምስል ይምረጡ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ፎቶ ምረጥ"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ሲም ካርዶች"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ሲም ካርዶች"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ለጥሪዎች ሁልጊዜ ይህንን ተጠቀም"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ለውሂብ ሲም ይምረጡ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"ለኤስኤምኤስ ሲም ይምረጡ"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"የውሂብ ሲም በመቀየር ላይ፣ ይሄ እስከ አንድ ደቂቃ ድረስ ሊወስድ ይችላል..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"የውሂብ ሲም በመቀየር ላይ፣ ይህ እስከ አንድ ደቂቃ ድረስ ሊወስድ ይችላል…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ይደውሉ ከዚህ ጋር"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ሲም ካርድ ይምረጡ"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ሲም <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ዕለታዊ ተግባር፣ መርሐግብር፣ ባትሪ ቆጣቢ፣ ኃይል ቆጣቢ፣ ባትሪ፣ ራስ-ሰር፣ በመቶ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"ቮልት፣ የላቀ ጥሪ አደራረግ፣ 4g ጥሪ አደራረግ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ቋንቋ ያክሉ፣ አንድ ቋንቋ ያክሉ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"የጽሁፍ መጠን"</string>
     <string name="default_sound" msgid="6604374495015245195">"ነባሪ ድምፅ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"የጥሪ ድምጽ እና ማሳወቂያ ድምጽ መጠን <xliff:g id="PERCENTAGE">%1$s</xliff:g> ላይ"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ድምፅ፣ ንዝረት፣ አትረብሽ"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ድምፆችን ያብሩ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"የቀጥታ ስርጭት መግለጫ ጽሑፍ"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ራስሰር የሥዕል መግለጫ ጽሑፍን ሚዲያ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ምንም"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> መርሐግብሮች ተቀናብረዋል</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> መርሐግብሮች ተቀናብረዋል</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ምንም}=1{1 መርሐግብር ተቀናብሯል}one{# መርሐግብሮች ተቀናብረዋል}other{# መርሐግብሮች ተቀናብረዋል}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"አይረብሹ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"በአስፈላጊ ሰዎች እና መተግበሪያዎች ብቻ ማሳወቂያን ያግኙ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"መቆራረጦችን ይገድቡ"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ቅድሚያ የሚሰጠው ብቻ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>። <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"በርቷል / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ጠፍቷል / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"አጥፋ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"አብራ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ሁልጊዜ ጠይቅ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"እስኪያጠፉት ድረስ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ሰዓቶች</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ሰዓቶች</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> ደቂቃዎች"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> መርሐ ግብሮች በራስ ሰር ሊበሩ ይችላሉ</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> መርሐ ግብሮች በራስ ሰር ሊበሩ ይችላሉ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ሰዓት}one{# ሰዓቶች}other{# ሰዓቶች}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 ደቂቃ}one{# ደቂቃዎች}other{# ደቂቃዎች}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ጠፍቷል}=1{ጠፍቷል / 1 መርሐግብር በራስ-ሰር ሊበራ ይችላል}one{ጠፍቷል / # መርሐግብሮች በራስ-ሰር ሊበሩ ይችላሉ}other{ጠፍቷል / # መርሐግብሮች በራስ-ሰር ሊበሩ ይችላሉ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"አትረብሽን ምን ሊያቋርጠው ይችላል"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ሰዎች"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"መተግበሪያዎች"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ዝቅተኛ ቅድሚያ ተሰጪ ማሳወቂያዎችን ወደ ተረጋጋ በራስ ሰር አቀናብር"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ተስማሚ ማሳወቂያ ደረጃ አሰጣጥ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"በተዛማጅነት ማሳወቂያዎችን በራስሰር ደረጃ ስጥ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ራስ-አስማሚ የማሳወቂያ ግብረመልስ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"በማስታወቂያዎች ላይ የተደረጉ ማስተካከያዎችን ያመልክቱ እና ለስርዓቱ ግብረመልስ ለመስጠት አማራጩን ያሳዩ"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"የማሳወቂያ አስፈላጊነት ዳግም ያስጀምሩ"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"በተጠቃሚ የተቀየሩትን የአስፈላጊነት ቅንብሮችን ዳግም ያስጀምሩ እና የማሳወቂያ ረዳት ቅድሚያ እንዲሰጥ ይፍቀዱ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"በጥቆማ የቀረቡ እርምጃዎች እና ምላሾች"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"በጥቆማ የቀረቡ እርምጃዎችን እና ምላሾችን በራስሰር አሳይ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"የቅርብ ጊዜ እና ያሸለቡ ማሳወቂያዎችን አሳይ"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"የቅድሚያ ውይይቶች"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"በውይይት ክፍል አናት ላይ አሳይ እና እንደ ተንሳፋፊ አረፋዎች ብቅ ይበሉ"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"በውይይት ክፍል አናት ላይ አሳይ"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"ሌሎች ውይይቶች"</string>
+    <string name="other_conversations" msgid="551178916855139870">"ቅድሚያ የማይሰጣቸው ውይይቶች"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ለውጦች ያደረጉባቸው ውይይቶች"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"የቅርብ ጊዜ ውይይቶች"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"የቅርብ ጊዜዎቹን አጽዳ"</string>
+    <string name="clear" msgid="5092178335409471100">"አጽዳ"</string>
     <string name="important_bubble" msgid="7911698275408390846">"አረፋ ቅድሚያ ተሰጪ ውይይቶች"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ቅድሚያ ተሰጪ ውይይቶች በተሳቢ መጋረጃው አናት ላይ ይታያሉ። እንዲሁም ወደ አረፋ እና አትረብሽን እንዲያቋርጡ ማቀናበር ይችላሉ።"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ቅድሚያ ተሰጪ እና የተሻሻሉ ውይይቶች እዚህ ላይ ብቅ ይላሉ"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"የአትረብሽ መዳረሻ"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"አትረብሽን ፍቀድ"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ምንም የተጫኑ መተግበሪያዎች የተጠየቀው አትረብሽ መዳረሻ የላቸውም"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"መተግበሪያዎችን በመጫን ላይ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"መተግበሪያዎችን በመጫን ላይ…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"በጥያቄዎ መሠረት Android የዚህ መተግበሪያ ማሳወቂያዎች በዚህ መሣሪያ ላይ እንዳይታዩ እያገደ ነው"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"በጥያቄዎ መሠረት Android ይህ የማሳወቂያዎች ምድብ በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"በጥያቄዎ መሠረት Android ይህን የማሳወቂያዎች ስብስብ በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ሁሉም ውይይቶች"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"የቅድሚያ ውይይቶች"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ምንም"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> ውይይቶች</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> ውይይቶች</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ምንም"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ምንም}=1{1 ውይይት}one{# ውይይቶች}other{# ውይይቶች}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ማን አቋርጦ መግባት ይችላል"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ጥሪዎች"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ጥሪዎች"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"የተፈቀደላቸው ጥሪዎች ድምጽ የሚያሰሙ መሆናቸውን ለማረጋገጥ መሣሪያው ወደ መደወል መቀናበሩን ይፈትሹ።"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"ለ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ገቢ ጥሪዎች ታግደዋል። የእርስዎ ጓደኛዎች፣ ቤተሰብ ወይም ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ ቅንብሮችን ማስተካከል ይችላሉ።"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ባለኮከብ ዕውቂያዎች"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ሌሎች</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ሌሎች</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ምንም"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ምንም}=1{{contact_1}}=2{{contact_1} እና {contact_2}}=3{{contact_1}፣ {contact_2} እና {contact_3}}one{{contact_1}፣ {contact_2} እና # ሌሎች}other{{contact_1}፣ {contact_2} እና # ሌሎች}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(ስም የለም)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"መልዕክቶች"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"መልዕክቶች"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"መልዕክቶች"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"ለ«<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» ገቢ መልዕክቶች ይታገዳሉ። የእርስዎ ጓደኛዎች፣ ቤተሰብ ወይም ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ ቅንብሮችን ማስተካከል ይችላሉ።"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"ሁሉም መልዕክቶች እርስዎን መድረስ ይችላሉ"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ሁሉም ጥሪዎች እርስዎን መድረስ ይችላሉ"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ምንም"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> እውቂያዎች</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> እውቂያዎች</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ምንም}=1{1 እውቂያ}one{# እውቂያዎች}other{# እውቂያዎች}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ማንኛውም ሰው"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"እውቂያዎች"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ባለኮከብ ዕውቂያዎች"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ሁሉም ማሳወቂያዎች"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"አንዳንድ ማሳወቂያዎች"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"የተመረጡ ሰዎች አሁንም እርስዎን መድረስ ይችላሉ፣ መተግበሪያዎች እንዲያቋርጡ ባይፈቅዱም እንኳ"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> ማቋረጥ ይችላሉ</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ማቋረጥ ይችላሉ</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> ተጨማሪ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ምንም መተግበሪያዎች ማቋረጥ አይችሉም}=1{{app_1} ማቋረጥ ይችላል}=2{{app_1} እና {app_2} ማቋረጥ ይችላሉ}=3{{app_1}፣ {app_2} እና {app_3} ማቋረጥ ይችላሉ}one{{app_1}፣ {app_2} እና # ተጨማሪ ማቋረጥ ይችላሉ}other{{app_1}፣ {app_2} እና # ተጨማሪ ማቋረጥ ይችላሉ}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"መተግበሪያዎች"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ሁሉም ማሳወቂያዎች"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"አንዳንድ ማሳወቂያዎች"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ማሳወቂያዎች ማቋረጥ ይችላሉ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ሁሉንም ማሳወቂያዎች ፍቀድ"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ማቋረጥ ይችላሉ</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ማቋረጥ ይችላሉ</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ምንም ማቋረጥ አይችልም"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> ተጨማሪ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ምንም ማቋረጥ አይችልም}=1{{sound_category_1} ማቋረጥ ይችላል}=2{{sound_category_1} እና {sound_category_2} ማቋረጥ ይችላሉ}=3{{sound_category_1}፣ {sound_category_2} እና {sound_category_3} ማቋረጥ ይችላሉ}one{{sound_category_1}፣ {sound_category_2} እና # ተጨማሪ ማቋረጥ ይችላሉ}other{{sound_category_1}፣ {sound_category_2} እና # ተጨማሪ ማቋረጥ ይችላሉ}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ምንም ማቋረጥ አይችልም"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ማንም ማቋረጥ አይችልም"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"አንዳንድ ሰዎች ማቋረጥ ይችላሉ"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ሁሉም ሰዎች ማቋረጥ ይችላሉ"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"በርቷል"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"ጠፍቷል"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"መተግበሪያን መሰካት"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"መተግበሪያን መሰካት የአሁኑን መተግብሪያ እስኪነቅሉት ድረስ በእይታ ውስጥ እንዲቆይ እንዲያደርጉት ያስችልዎታል። ይህ ባህሪ ለምሳሌ አንድ የታመነ ጓደኛ አንድ የተወሰነ ጨዋታን እንዲጫወት ያስችላል። \n\nአንድ መተግበሪያ ሲሰካ የተሰካው መተግበሪያ ሌሎች መተግበሪያዎችን ሊከፍት ይችላል፣ እና በዚህም የግል ውሂብ ተደራሽ ሊሆን ይችላል። \n\nመተግበሪያን መሰካትን ለመጠቀም፦ 	\n1.	መተግበሪያ መሰካትን ያብሩ \n2.	አጠቃላይ እይታን ይክፈቱ 	\n3.	በማያ ገጹ አናት ላይ የመተግበሪያ አዶውን መታ ያድርጉ፣ ከዚያ ሰካን መታ ያድርጉ"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"መተግበሪያን መሰካት የአሁኑን መተግብሪያ እስኪነቅሉት ድረስ በዕይታ ውስጥ እንዲቆይ እንዲያደርጉት ያስችልዎታል። ይህ ባህሪ ለምሳሌ አንድ የታመነ ጓደኛ አንድ የተወሰነ ጨዋታን እንዲጫወት ያስችላል። \n\nአንድ መተግበሪያ ሲሰካ የተሰካው መተግበሪያ ሌሎች መተግበሪያዎችን ሊከፍት ይችላል፣ እና በዚህም የግል ውሂብ ተደራሽ ሊሆን ይችላል። \n\nመሣሪያውን ደህንነቱ በተጠበቀ ሁኔታ ለሆነ ሰው ማጋራት ከፈለጉ በምትኩ እንግዳ ተጠቃሚን ለመጠቀም ይሞክሩ። \n\nመተግበሪያን መሰካትን ለመጠቀም፦ \n1.	መተግበሪያ መሰካትን ያብሩ \n2.	አጠቃላይ ዕይታን ይክፈቱ 	\n3.	በማያ ገጹ አናት ላይ የመተግበሪያ አዶውን መታ ያድርጉ፣ ከዚያ ሰካን መታ ያድርጉ"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"መተግበሪያን መሰካት የአሁኑን መተግብሪያ እስኪነቅሉት ድረስ በዕይታ ውስጥ እንዲቆይ እንዲያደርጉት ያስችልዎታል። ይህ ባህሪ ለምሳሌ አንድ የታመነ ጓደኛ አንድ የተወሰነ ጨዋታን እንዲጫወት ያስችላል።"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"አንድ መተግበሪያ ሲሰካ, የተሰካው መተግበሪያ ሌሎች መተግበሪያዎችን ሊከፍት ይችላል እና በዚህም የግል ውሂብ ተደራሽ ሊሆን ይችላል። \n\nመተግበሪያን መሰካትን ለመጠቀም፦ 	\n1።	መተግበሪያ መሰካትን ያብሩ 	\n2።	አጠቃላይ ዕይታን ይክፈቱ 	\n3።	በማያ ገጹ አናት ላይ የመተግበሪያ አዶውን መታ ያድርጉ፣ ከዚያ ሰካን መታ ያድርጉ"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"አንድ መተግበሪያ ሲሰካ, የተሰካው መተግበሪያ ሌሎች መተግበሪያዎችን ሊከፍት ይችላል እና በዚህም የግል ውሂብ ተደራሽ ሊሆን ይችላል። \n\nመሣሪያዎን ደህንነቱ በተጠበቀ ሁኔታ ለሆነ ሰው ማጋራት ከፈለጉ፣ በምትኩ እንግዳ ተጠቃሚን ለመጠቀም ይሞክሩ። \n\nመተግበሪያን መሰካትን ለመጠቀም፦ 	\n1።	መተግበሪያ መሰካትን ያብሩ 	\n2።	አጠቃላይ እይታን ይክፈቱ 	\n3።	በማያ ገጹ አናት ላይ የመተግበሪያ አዶውን መታ ያድርጉ፣ ከዚያ ሰካን መታ ያድርጉ"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"መተግበሪያ ሲሰካ፦ \n\n• የግል ውሂብ ተደራሽ ሊሆን ይችላል \n (እንደ እውቂያዎች እና የኢሜይል ይዘት ያለ) \n•	የተሰካ መተግበሪያ ሌሎች መተግበሪያዎችን ሊከፍት ይችላል \n\nመተግበሪያ መሰካትን ከሚያምኗቸው ሰዎች ጋር ብቻ ይጠቀሙ።"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"ከመንቀል በፊት የማስከፈቻ ስርዓተ-ጥለት ጠይቅ"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"ከመንቀል በፊት ፒን ጠይቅ"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር ፒን ይጠየቅ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ስርዓተ-ጥለት እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር ስርዓተ-ጥለት ይጠየቅ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"መሣሪያዎን ለመክፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ይለፍ ቃል እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ያለ የውሂብ ለመጠበቅ ያግዛል። መሣሪያዎን ለማስጀመር የይለፍ ኮድ ይጠየቅ?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"መሣሪያዎን ለመክፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልዕክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችሉም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ያለ ውሂብን ለመጠበቅ ያግዛል። መሣሪያዎን ለማስጀመር ፒን ይጠየቅ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"መሣሪያዎን ለመክፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ሥርዓተ ጥለት እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልዕክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችሉም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ያለ ውሂብን ለመጠበቅ ያግዛል። መሣሪያዎን ለማስጀመር ሥርዓተ ጥለት ይጠየቅ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"መሣሪያዎን ለመክፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ይለፍ ቃል እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልዕክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችሉም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ያለ ውሂብን ለመጠበቅ ያግዛል። መሣሪያዎን ለማስነሳት የይለፍ ቃል ይጠየቅ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"አዎ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"የለም"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ተገድቧል"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"ዩኤስቢ በሚከተለው ቁጥጥር ይደረግበታል፦"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"የተገናኘ መሣሪያ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ይህ መሣሪያ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"በመቀየር ላይ…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"በመቀየር ላይ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"መቀየር አልተቻለም"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"የዚህን መሣሪያ ኃይል በመሙላት ላይ"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"የተገናኘ መሣሪያ ኃይል በመሙላት ላይ"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"የተንቀሳቃሽ ውሂብ አጠቃቀም"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"የመተግበሪያ ውሂብ አጠቃቀም"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi ውሂብ አጠቃቀም"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"አገልግሎት አቅራቢ ያልሆነ የውሂብ አጠቃቀም"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"የኤተርኔት ውሂብ አጠቃቀም"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"ኤተርኔት"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ገደቦች</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"የአገልግሎት አቅራቢ ውሂብ የሂሳብ አከፋፈል ከመሳሪያ የሂሳብ አከፋፈል የተለየ ሊሆን ይችላል"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"የአገልግሎት አቅራቢ አውታረ መረቦች የሚጠቀሙበትን ውሂብ አያካትትም"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ጥቅም ላይ ውሏል"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"የውሂብ ማስጠንቀቂያ አዘጋጅ"</string>
     <string name="data_warning" msgid="2925054658166062884">"የውሂብ ማስጠንቀቂያ"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ዝርዝሮችን አሳይ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ውሂብ ቆጣቢ"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ያልተገደበ ውሂብ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"የዳራ ውሂብ ጠፍቷል"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"የበስተጀርባ ውሂብ ጠፍቷል"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"በርቷል"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ጠፍቷል"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"የውሂብ ቆጣቢን ይጠቀሙ"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"መሣሪያው ከተቆለፈ በማሳወቂያዎች ውስጥ ምላሾችን ወይም ሌላ ጽሑፍን መተየብ ከልክል"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ነባሪ ፊደል አራሚ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ፊደል አራሚን ይምረጡ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ፊደል አራሚን ይጠቀሙ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ፊደል አራሚን ተጠቀም"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"አልተመረጠም"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ባዶ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"፦ "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"የማከማቻ ባዶ ቦታን ነጻ ለማድረግ እንዲያግዝ የማከማቻ አስተዳዳሪ ከእርስዎ መሣሪያ ላይ በምትኬት የተቀመጡ ፎቶዎችን እና ቪዲዮዎችን አስወግዷል።"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ፎቶዎች እና ቪዲዮዎች አስወግድ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"የማከማቻ አስተዳዳሪ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"የማከማቻ አስተዳዳሪን ተጠቀም"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"የማከማቻ አስተዳዳሪን ተጠቀም"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ራስ-ሰር"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"በራስ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"አሁኑኑ ባዶ ቦታ ያስለቅቁ"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ስልኩን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ጡባዊውን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"መሣሪያውን ለመመልከት ሁለቴ መታ ያድርጉ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"ለማስታወቂያዎች በጣት ይጥረጉ"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ማስታወቂያዎችዎን ለማሳየት በማያው ግርጌ ላይ ወደ ታች ያንሸራትቱ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"የአንድ እጅ ሁነታ"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"የአንድ እጅ ሁነታን ይጠቀሙ"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"መተግበሪያዎችን ሲቀይሩ ይውጡ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ጊዜው አልቋል"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ሰከንዶች"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ሰከንዶች"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ሰከንዶች"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ተደራሽነት"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ጊዜን፣ ማሳወቂያዎችን እና ሌላ መረጃን ለማረጋገጥ የእርስዎን ማያ ገጽ ሁለት ጊዜ መታ ያድርጉት።"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ስልኩን ለማረጋገጥ ያንሱ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ጡባዊውን ለማረጋገጥ ያንሱ"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ጡባዊ ላይ ምልክት ያድርጉ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"መሣሪያ ላይ ምልክት ያድርጉ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ጊዜን፣ ማሳወቂያዎችን እና ሌላ መረጃን ለማረጋገጥ የእርስዎን ማያ ገጽ መታ ያድርጉት።"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"የድንገተኛ አደጋ ኤስኦኤስ"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"የድንገተኛ አድጋ ጊዜ ኤስኦኤስ ይጠቀሙ"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"የሚቀናበረው በ<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"የኃይል ቁልፉን በፍጥነት 5 ጊዜ ወይም ከዚያ በላይ በመጫን ከታች ያሉትን እርምጃዎች ይጀምሩ"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"የወደኋላ ቆጠራ ማንቂያን ያጫውቱ"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"ለእገዛ ከማሳወቅዎ በፊት ጮክ ያለ ድምጽ ያጫውቱ"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"ለእገዛ ይደውሉ"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"ለእርዳታ የሚደውሉበት ቁጥር"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>። ለመለወጥ መታ ያድርጉ"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"ለድንገተኛ አደጋ ያልሆነ ቁጥር ካስገቡ፦\n • የአደጋ ጊዜ ኤስኦኤስን ለመጠቀም መሳሪያዎ መከፈት አለበት\n • ጥሪዎ ላይነሳ ይችላል"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ማሳወቂያዎችን ለማግኘት የጣት አሻራን ያንሸራትቱ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"የጣት አሻራን ያንሸራቱ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"የእርስዎን ማሳወቂያዎች ለመመልከት በስልክዎ ጀርባ ላይ ባለው የጣት አሻራ ዳሳሽ ላይ ወደ ታች ጠረግ ያድርጉት"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"ከፍተኛ የሚታዩ የውሂብ ስብስቦች"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ወደ ነባሪ እሴቶች ዳግም አስጀምር"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"የራስ-ሙላ ገንቢ አማራጮች ዳግም ተጀምረዋል"</string>
+    <string name="location_category" msgid="3496759112306219062">"አካባቢ"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"የሁኔታ አሞሌ አከባቢ አመልካች"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"አውታረመረብ እና ግንኙነትን ጨምሮ ለሁሉም አካባቢዎች አሳይ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"ሙሉ የGNSS መለኪያዎች አስገድድ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ሁሉንም የGNSS ህብረ ፎቶዎችን እና ድግምግሞሾችን ያለምንም የሥራ ብስክሌት ግልቢያ ዱካቸውን ይከታተሉ"</string>
     <string name="device_theme" msgid="5027604586494772471">"የመሣሪያ ገጽታ"</string>
     <string name="default_theme" msgid="4815428567082263639">"ነባሪ"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"የአውታረ መረብ ስም"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"ትኩረት እንደሰጡ ለመቆየት ማሳወቂያዎችን ባሉበት አቁም"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ባህሪ አይገኝም"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"የእርስዎን ስልክ ፍጥነት ስለሚቀንስ ይህ ባህሪ ጠፍቷል"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"ሙሉ የGNSS መለኪያዎች አስገድድ"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ሁሉንም የGNSS ህብረ ፎቶዎችን እና ድግምግሞሾችን ያለምንም የሥራ ብስክሌት ግልቢያ ዱካቸውን ይከታተሉ"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"የስንክል ንግግር ሳጥንን ሁልጊዜ አሳይ"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"መተግበሪያ በሚሰናከልበት እያንዳንዱ ጊዜ የንግግር ሳጥን አሳይ"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"በANGLE የነቃ መተግበሪያ ይምረጡ"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ለሁሉም መተግበሪያዎች አንቃ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"የግራፊክስ ነጂ ይምረጡ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ነባሪ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"የጨዋታ ነጂ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"የጨዋታ ነጂ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"የገንቢ ነጂ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"የሥርዓት ግራፊክስ ነጂ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"በርቷል (ድምጸ ተዘግቷል)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ጠፍቷል"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"የአውታረ መረብ ዝርዝሮች"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"የእርስዎ መሣሪያ በእርስዎ ስልክ ላይ ላሉ መተግበሪያዎች የሚታይ ነው። ወድ ብሉቱዝ መሣሪያዎች ሲያገኙ ወይም የWi-Fi መገናኛ ነጥብን ሲያቀናብሩ በተጨማሪ በሌሎች ሰዎች የሚታይ ይሆናል።"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"የመሣሪያዎ ስም በእርስዎ ስልክ ላይ ላሉ መተግበሪያዎች ይታያል። እንዲሁም ከብሉቱዝ መሣሪያዎች ጋር ሲገናኙ፣ ከWi-Fi አውታረ መረብ ሲገናኙ ወይም የWi-Fi መገናኛ ነጥብን ሲያቀናብሩ በሌሎች ሰዎች የሚታይ ሊሆን ይችላል።"</string>
     <string name="devices_title" msgid="649715719278562515">"መሣሪያዎች"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"ሁሉም ቅንብሮች"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"የአስተያየት ጥቆማዎች"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"አውታረ መረቦችን ማግኘት አልተቻለም። እንደገና ይሞክሩ።"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(የተከለከለ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ምንም ሲም ካርድ የለም"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ሲም"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ምንም SIM የለም"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ምንም"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ለመገናኘት ሲም ያስፈልገዋል"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ለመገናኘት የ<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ሲም ያስፈልገዋል"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ተመራጭ የአውታረ መረብ፦ WCDMA ሁነታ ተመራጭ"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ተመራጭ የአውታረ መረብ፦ GSM ብቻ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ተመራጭ የአውታረ መረብ፦ WCDMA ብቻ"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"የተንቀሳቃሽ ስልክ ውሂብ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"የተንቀሳቃሽ ስልክ አውታረ መረብን በመጠቀም ውሂብን ይድረሱበት"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"በክልል ውስጥ በሚሆንበት ጊዜ ስልክ በራስ ሰር ወደዚህ የአገልግሎት አቅራቢ ይቀይራል"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ምንም ሲም ካርድ አይገኝም"</string>
     <string name="calls_preference" msgid="2166481296066890129">"የጥሪዎች ምርጫ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"የኤስኤምኤስ ምርጫ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ሁልጊዜ ጠይቅ"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ከ<xliff:g id="CARRIER">%1$s</xliff:g> ጋር ሲገናኝ የማይገኝ"</string>
     <string name="see_more" msgid="7499355691042812723">"ተጨማሪ ይመልከቱ"</string>
     <string name="see_less" msgid="2642392725363552793">"ያነሰ ይመልከቱ"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ይብራ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ሲም ይብራ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"ወደ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ይቀየር?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ወደ ሲም ካርድ መጠቀም ይቀይሩ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"በአንድ ጊዜ አንድ ሲም ብቻ ነው ገባሪ ሊሆን የሚችለው።\n\nወደ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> መቀየር የ<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> አገልግሎትዎን አይሰርዘውም።"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"በአንድ ጊዜ አንድ የወረደ ሲም ብቻ ነው ገቢር መሆን የሚችለው።\n\nወደ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> መቀየር የ<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> አገልግሎትዎን አይሰርዘውም።"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"በአንድ ጊዜ አንድ ሲም ብቻ ነው ገቢር ሊሆን የሚችለው።\n\nመቀየር የ<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> አገልግሎትዎን አይሰርዘውም።"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"ወደ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ይቀይሩ"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ከአውታረ መረብ ጋር በመገናኘት ላይ…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"ወደ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> በመቀየር ላይ"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"አገልግሎት አቅራቢን መቀየር አልተቻለም"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"በስህተት ምክንያት አገልግሎት አቅራቢው መቀየር አልተቻለም።"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ይጥፋ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ሲም ይጥፋ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ሲምን በማጥፋት ላይ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"አገልግሎት አቅራቢን ማሰናከል አልተቻለም"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"የሆነ ችግር ተፈጥሯል፣ እና የእርስዎ አገልግሎት አቅራቢ ሊሰናከል አልቻለም።"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 ሲሞች ይጠቀሙ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ይህ መሣሪያ በአንድ ጊዜ 2 ሲሞች ነው ሊኖሩት የሚችሉት። በአንድ ጊዜ 1 ሲም መጠቀሙን ለመቀጠል «አይ፣ አመሰግናለሁ»ን መታ ያድርጉ።"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"መሣሪያ ዳግም ይነሳ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ለመጀመር የእርስዎን መሣሪያ ዳግም ያስነሱት። ከዚያ ሌላ ሲም ማከል ይችላሉ።"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ቀጥል"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ዳግም አስነሳ"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"አይ፣ አመሰግናለሁ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"ማብሪያ/ማጥፊያ"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ሲምን ማግበር አልተቻለም"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ሲሙን ያስወጡትና እንደገና ያስገቡት። ችግሩ ከቀጠለ መሣሪያዎን ዳግም ያስነሱት።"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ሲሙን እንደገና ለማብራት ይሞክሩ። ችግሩ ከቀጠለ መሣሪያዎን ዳግም ያስነሱት።"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"አውታረ መረብን ማግበር"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ገቢር ነው"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"የሲም ቅንብሮችን ለማዘመን መታ ያድርጉ"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"ሲም ካርድ"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"ይህ የወረደ ሲም ይደምሰስ?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ይህን ሲም መደምሰስ የ<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> አገልግሎቱን ከዚህ መሣሪያ ያስወግደዋል።\n\nለ<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> የሆነ አገልግሎት አይሰረዝም።"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"ደምስስ"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"ሲም በመደምሰስ ላይ…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"ሲምን መደምሰስ አልተቻለም"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"ይኼ ሲም በስህተት ምክንያት ሊደመሰስ አይችልም።\n\nየእርስዎን መሣሪያ ዳግም ያስጀምሩ እና እንደገና ይሞክሩ።"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ከመሣሪያ ጋር ያገናኙ"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"የ<xliff:g id="APPNAME">%1$s</xliff:g> መተግበሪያ ከመሣሪያዎ ጋር ለመገናኘት ጊዜያዊ የWi‑Fi አውታረ መረብን መጠቀም ይፈልጋል"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ምንም መሣሪያዎች አልተገኙም መሣሪያዎች እንደበሩ እና ለመገናኘት የሚገኝ መሆኑን ያረጋግጡ።"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"የአደጋ ጥሪዎች"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"በየWi‑Fi ጥሪ ማድረጊያ በኩል የሚደረጉ የድንገተኛ አደጋ የስልክ ጥሪዎች በአገልግሎት አቅራቢው የሚደገፉ አይደሉም።\nየድንገተኛ አደጋ ጥሪን ለማድረግ መሣሪያው በራስሰር ወደ ተንቀሳቃሽ ስልክ አውታረ መረብ ይቀይራል።\nየድንገተኛ አደጋ የስልክ ጥሪዎችን ማድረግ የተንቀሳቃሽ ስልክ ሽፋን ባለባቸው አካባቢዎች ላይ ብቻ የሚቻል ነው።"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"ጥራትን ለማሻሻል Wi‑Fiን ለጥሪዎች ይጠቀሙ"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"የሲም መካከል የሚደረግ ጥሪ"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"በዚህ ሲም ላይ ሌላ ሲም ጥሪዎችን እና ኤስኤምኤስ ይፍቀዱ።"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"የሲም መካከል የሚደረግ ጥሪ"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"ገቢ የኤምኤምኤስ መልዕክት"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"የኤምኤምኤስ መልዕክት መላክ አይቻልም"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"የሞባይል ውሂብ ሲጠፋ በ <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> የኤምኤምኤስ መልዕክቶችን መላላክ ለመፍቀድ መታ ያድርጉ"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"በቅንብሮች ላይ የማያ ገጽ ተደራቢዎችን ይፍቀዱ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"የቅንብሮች ማያ ገጾችን ለመደራረብ በሌሎች መተግበሪያዎች ላይ የሚያሳዩ መተግበሪያዎችን ይፍቀዱ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"ሚዲያ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"የሚዲያ ክፍለ-ጊዜ ሲያልቅ ተጫዋችን ደብቅ"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"አጫዋቹ ከተዘረጋው የፈጣን ቅንብሮች ፓነል አንድ ክፍለ-ጊዜ ከቆመበት እንዲቀጥሉ ይፈቅድልዎታል።"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"በፍጥነት ቅንብሮች ውስጥ Media Player"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"መልሶ ማጫወትን በቀላሉ ከቆመበት መቀጠል Media Playerን ለተጨማሪ ጊዜ ያሳዩ"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ተጫዋች ደብቅ"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ተጫዋች አሳይ"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ምንም ተጫዋቾች አይገኙም"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"የተፈቀደላቸው መተግበሪያዎች"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"ሚዲያ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ብሉቱዝ ይበራል"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"አብራ"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"አጥፋ"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"በይነመረብ"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMዎች"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"የአውሮፕላን ደህንነታቸው የተጠበቀ አውታረመረቦች"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"የአውሮፕላን ደህንነታቸው የተጠበቀ አውታረመረቦችን ያግኙ እና ያገናኙ"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"አውሮፕላን፣ የአውሮፕላን ድህንነቱ የተጠበቀ"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"ጥሪዎች እና ኤስኤምኤስ"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"የWi-Fi ጥሪ ማድረጊያ"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"እንደ Wi‑Fi ባሉ የአገልግሎት አቅራቢ ባልሆኑ አውታረ መረቦች ላይ ጥሪዎችን ያድርጉ እና ይቀበሉ"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"የWi‑Fi ጥሪ እንደ አንዳንድ የWi-Fi አውታረ መረቦች ያሉ የአገልግሎት አቅራቢ ባልሆኑ አውታረ መረቦች ላይ ጥሪዎችን እንዲያደርጉ እና እንዲቀበሉ ያስችልዎታል።"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"ጥሪዎች"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"ኤስኤምኤስ"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"የተመረጡ"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"ጥሪዎች ተመርጠዋል"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"ኤስኤምኤስ ተመርጧል"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"አይገኝም"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM የለም"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ምርጫዎች"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ከይፋዊ አውታረ መረቦች ጋር አገናኝ"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"የአውታረ መረብ ግንኙነት በይነመረብ፣ ገመድ-አልባ፣ ውሂብ፣ wifi፣ wi-fi፣ wi fi፣ ተንቀሳቃሽ ስልክ፣ ሞባይል፣ የተንቀሳቃሽ ስልክ አገልግሎት አቅራቢ፣ 4ጂ፣ 3ጂ፣ 2ጂ፣ lte፣ ኤልቲኢ"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ለአውሮፕላን አደጋ የሌላቸው አውታረ መረቦችን ይመልከቱ"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"የአውሮፕላን ሁነታን አጥፋ"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"የመኝታ ሰዓት ሁነታ ስለበራ የማይገኝ"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"የማሳወቂያ አስፈላጊነት ዳግም አስጀምር ተጠናቅቋል።"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"መተግበሪያዎች"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"እምነት የማይጣልበት መሣሪያ መልዕክቶችዎን መድረስ ይፈልጋል። ዝርዝሮችን ለማግኘት መታ ያድርጉ"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"የመልዕክቶች መዳረሻ ይፈቀድ?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"እምነት የማይጣልበት የብሉቱዝ መሣሪ፣ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]፣ መልዕክቶችዎን መድረስ ይፈልጋል።\n\nከዚህ በፊት ከ[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ጋር አልተገናኙም።"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"እምነት የማይጣልበት መሣሪያ እውቂያዎችዎን እና የጥሪ ምዝግብ ማስታወሻውን መድረስ ይፈልጋል። ዝርዝሮችን ለማግኘት መታ ያድርጉ"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"የእውቂያዎች እና የጥሪ ምዝግብ ማስታወሻ መዳረሻ ይፈቀድ?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"እምነት የማይጣልበት የብሉቱዝ መሣሪያ፣ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]፣ እውቂያዎችዎን እና የጥሪ ምዝግብ ማስታወሻን መድረስ ይፈልጋል። ይህ ስለ ገቢ እና ወጪ ጥሪዎች ውሂብን ያካትታል።\n\n ከዚህ በፊት ከ[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ጋር አልተገናኙም።"</string>
 </resources>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 4218a24..93eb649 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"متوسطة"</item>
     <item msgid="6740026006576843477">"طويلة"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"قصيرة"</item>
+    <item msgid="7397961711906421599">"متوسطة"</item>
+    <item msgid="4079132024502041928">"طويلة"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"تلقائي"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"عام"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"‏TDSCDMA فقط"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"عام"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 9b091d4..4b41b76 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -262,8 +262,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"التاريخ والوقت"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"تعيين التاريخ والوقت"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"تعيين التاريخ والوقت والمنطقة الزمنية والتنسيقات"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"استخدام وقت الشبكة"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"استخدام المنطقة الزمنية للشبكة"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"ضبط الوقت تلقائيًا"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"ضبط المنطقة الزمنية تلقائيًا"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"استخدام التنسيق التلقائي المحلي"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"تنسيق ٢٤ ساعة"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"استخدام تنسيق ٢٤ ساعة"</string>
@@ -304,7 +304,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"إظهار معلومات الملف الشخصي في شاشة القفل"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"الحسابات"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"الموقع الجغرافي"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"استخدام الموقع الجغرافي"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"استخدام الموقع الجغرافي"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"خدمة الموقع الجغرافي غير مفعّلة."</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="zero">خدمة \"الموقع الجغرافي\" مفعَّلة - يمتلك <xliff:g id="COUNT_1">%1$d</xliff:g> تطبيق حق الوصول إلى بيانات الموقع الجغرافي.</item>
@@ -332,6 +332,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"قفل الشاشة، فتح القفل بالوجه"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"قفل الشاشة، بصمة الإصبع"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"قفل الشاشة"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"فتح قفل هاتفك بأمان باستخدام وجهك وبصمة إصبعك"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"يمكنك أيضًا تسجيل الدخول إلى التطبيقات وتأكيد الدفعات"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"إعداد فتح القفل باستخدام:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"فتح القفل بالوجه"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"تسهيل عملية فتح قفل الهاتف"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"بصمة الإصبع"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"توفير الوقت وفتح قفل الهاتف في جيبك"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"التخطي"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"التالي"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"تمت إضافة الوجه"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"إعداد ميزة \"فتح القفل بالوجه\""</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"فتح القفل بالوجه"</string>
@@ -341,6 +350,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"استخدام وجهك للمصادقة"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"بدء"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"‏إذا تم إيقاف ميزة \"فتح القفل بالوجه\" السهلة الاستخدام، قد لا تعمل بعض خطوات الإعداد بشكل سليم باستخدام TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"رجوع"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"مواصلة الإعداد"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"استخدام إعدادات \"سهولة الاستخدام\""</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -385,8 +397,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"عند استخدام ميزة \"فتح القفل بالوجه\" في التطبيقات، اطلُب دائمًا خطوة التأكيد."</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"حذف بيانات الوجه"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"إعداد ميزة \"فتح القفل بالوجه\""</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"يمكنك استخدام ميزة \"فتح القفل بالوجه\" لفتح قفل الهاتف وتسجيل الدخول إلى التطبيقات وتأكيد عمليات الدفع.\n\nملاحظة مهمة:\nقد تفتح الهاتف بدون قصد بمجرّد النظر إليه.\n\nيمكن لشخص آخر فتح قفل هاتفك عند تقريبه من وجهك.\n\nقد يتمكّن شخص يشبهك كثيرًا، مثلاً شقيقك التوأم، من فتح قفل الهاتف."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"يمكنك استخدام \"فتح القفل بالوجه\" لفتح قفل الجهاز وتسجيل الدخول إلى التطبيقات وتأكيد عمليات الدفع.\n\nملاحظة مهمة:\nقد تفتح الهاتف بدون قصد بمجرّد النظر إليه.\n\nويمكن لشخص آخر فتح قفل هاتفك عند تقريبه من وجهك، حتى وأنت مغلق عينيك.\n\nوكذلك، يمكن لشخص يشبهك كثيرًا، مثل شقيقك التوأم، فتح قفل الهاتف."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"يمكنك استخدام ميزة \"فتح القفل بالوجه\" لفتح قفل جهازك وتسجيل الدخول إلى التطبيقات وتأكيد عمليات الدفع."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"ملاحظة:\nقد يتم فتح قفل الهاتف عند النظر إليه حتى إذا لم تكن تقصد فتحه.\n\nويمكن لشخص آخر فتح قفل هاتفك عند تقريبه من وجهك.\n\nيمكن لشخص آخر يشبهك بدرجة كبيرة فتح هاتفك، مثل أخيك الذي يشبهك تمامًا."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"ملاحظة:\nقد يتم فتح قفل الهاتف عند النظر إليه حتى إذا لم تكن تقصد فتحه.\n\nويمكن لشخص آخر فتح قفل هاتفك عند تقريبه من وجهك، حتى وأنت مغلق عينيك.\n\nيمكن لشخص آخر يشبهك بدرجة كبيرة فتح هاتفك، مثل أخيك الذي يشبهك تمامًا."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"هل تريد حذف بيانات الوجه؟"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ستُحذف بيانات الوجه التي تستخدمها ميزة \"فتح القفل بالوجه\" نهائيًا وبشكلٍ آمن. وبعد إزالتها، ستحتاج إلى استخدام رقم التعريف الشخصي أو النقش أو كلمة المرور لفتح قفل الهاتف وتسجيل الدخول إلى التطبيقات وتأكيد عمليات الدفع."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"استخدام \"فتح القفل بالوجه\" لفتح قفل الهاتف"</string>
@@ -410,6 +423,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"استخدم بصمة الإصبع لفتح قفل هاتفك أو الموافقة على عمليات الشراء.\n\nملاحظة: لا يمكنك استخدام بصمة الإصبع لفتح قفل هذا الجهاز. للحصول على المزيد من المعلومات، اتصل بمشرف المؤسسة."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"استخدم بصمة الإصبع لفتح قفل هاتفك أو الموافقة على عمليات الشراء.\n\nملاحظة: قد تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"إلغاء"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"لا، شكرًا"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"متابعة"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"التخطي"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"التالي"</string>
@@ -447,6 +461,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"لن يتمكّن أحد من استخدام جهازك اللوحي في حال فقدانه أو سرقته عند حمايته بتفعيل أحد خيارات قفل الشاشة. وتحتاج أيضًا إلى تفعيل أحد خيارات قفل الشاشة لإعداد ميزة \"فتح القفل بالوجه\". وللرجوع، انتقِل إلى \"إلغاء\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"لن يتمكّن أحد من استخدام جهازك في حال فقدانه أو سرقته عندما تحميه بتفعيل أحد خيارات قفل الشاشة. وتحتاج أيضًا إلى تفعيل أحد خيارات قفل الشاشة لإعداد ميزة \"فتح القفل بالوجه\". وللرجوع، انتقِل إلى \"إلغاء\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"لن يتمكّن أحد من استخدام هاتفك في حال فقدانه أو سرقته عند حمايته بتفعيل أحد خيارات قفل الشاشة. وتحتاج أيضًا إلى تفعيل أحد خيارات قفل الشاشة لإعداد ميزة \"فتح القفل بالوجه\". للرجوع، انقر على \"إلغاء\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"لن يتمكّن أحد من استخدام جهازك اللوحي في حال فقدانه أو سرقته عند حمايته بتفعيل أحد خيارات قفل الشاشة. يجب أيضًا استخدام أحد خيارات قفل الشاشة لإعداد المقاييس الحيوية. وللرجوع، انقر على \"إلغاء\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"لن يتمكّن أحد من استخدام جهازك في حال فقدانه أو سرقته عندما تحميه بتفعيل أحد خيارات قفل الشاشة. يجب أيضًا استخدام أحد خيارات قفل الشاشة لإعداد المقاييس الحيوية. وللرجوع، انقر على \"إلغاء\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"لن يتمكّن أحد من استخدام هاتفك في حال فقدانه أو سرقته عند حمايته بتفعيل أحد خيارات قفل الشاشة. يجب أيضًا استخدام أحد خيارات قفل الشاشة لإعداد المقاييس الحيوية. وللرجوع، انقر على \"إلغاء\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"أتريد تخطي إعداد رقم التعريف الشخصي؟"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"أتريد تخطّي إعداد كلمة المرور؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"هل تريد تخطّي إعداد النقش؟"</string>
@@ -519,8 +536,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"يمكنك منع الآخرين من استخدام هذا الجهاز اللوحي بدون إذنك من خلال تفعيل ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"يمكنك منع الآخرين من استخدام هذا الجهاز بدون إذنك من خلال تفعيل ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"يمكنك منع الآخرين من استخدام هذا الهاتف بدون إذنك من خلال تفعيل ميزات حماية الجهاز. اختر قفل الشاشة الذي تريد استخدامه."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"اختيار الطريقة الاحتياطية لقفل الشاشة"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"اختيار الطريقة الاحتياطية لقفل الشاشة"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"اختيار الطريقة الاحتياطية لقفل الشاشة"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"خيارات قفل الشاشة"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"خيارات قفل الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"قفل الشاشة"</string>
@@ -552,6 +568,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"\"فتح القفل بالوجه\" مع كلمة المرور"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"المتابعة بدون إعداد \"فتح القفل بالوجه\""</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"يمكنك فتح قفل هاتفك باستخدام وجهك. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"المقاييس الحيوية + النقش"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"المقاييس الحيوية + رقم التعريف الشخصي"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"المقاييس الحيوية + كلمة المرور"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"المتابعة بدون استخدام مقاييس حيوية"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"يمكنك فتح قفل هاتفك باستخدام المقاييس الحيوية. ولأغراض أمنية، يتطلب هذا الخيار استخدام قفل شاشة احتياطي."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"تم إيقافه بواسطة المشرف، أو سياسة التشفير، أو وحدة تخزين بيانات الاعتماد"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"بدون قفل"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"التمرير السريع"</string>
@@ -651,7 +672,6 @@
       <item quantity="one">يجب ألا يزيد رقم التعريف الشخصي عن رقم واحد (<xliff:g id="NUMBER_0">%d</xliff:g>).</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"لا يسمح مشرف الجهاز باستخدام رقم تعريف شخصي تم استخدامه مؤخرًا"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"حظرَ مشرف تكنولوجيا المعلومات استخدام أرقام التعريف الشخصية الشائعة. جرِّب استخدام رقم تعريف شخصي مختلف."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"لا يجب أن تتضمن كلمة المرور حرفًا غير صالح."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"يجب أن تحتوي كلمة المرور على حرف واحد على الأقل."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"يجب أن تحتوي كلمة المرور على رقم واحد على الأقل."</string>
@@ -713,7 +733,6 @@
       <item quantity="one">يجب أن تحتوي كلمة المرور على حرف أبجدي واحد على الأقل.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"لا يسمح مشرف الجهاز باستخدام كلمة مرور تم استخدامها مؤخرًا"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"حظرَ مشرف تكنولوجيا المعلومات استخدام كلمات المرور الشائعة. جرِّب استخدام كلمة مرور مختلفة."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"غير مسموح باستخدام الترتيب التصاعدي أو التنازلي أو المكرر للأرقام"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"تأكيد"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"إلغاء"</string>
@@ -863,7 +882,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"‏تفعيل شبكة Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"‏استخدام Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"‏استخدام Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"‏إعدادات Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"إعداد وإدارة نقاط الدخول اللاسلكية"</string>
@@ -971,7 +990,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"توسيط رمز الاستجابة السريعة أدناه للربط بالمعرِّف \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"‏يمكنك الانضمام إلى شبكة Wi‑Fi عن طريق مسح رمز الاستجابة السريعة."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"‏مشاركة اتصال Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"يمكنك مسح رمز الاستجابة السريعة هذا ضوئيًا للاتصال بشبكة \"<xliff:g id="SSID">%1$s</xliff:g>\" ومشاركة كلمة المرور."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"يمكنك مسح رمز الاستجابة السريعة هذا ضوئيًا باستخدام جهاز آخر للانضمام إلى \"<xliff:g id="SSID">%1$s</xliff:g>\"."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"يمكنك مسح رمز الاستجابة السريعة ضوئيًا للاتصال بشبكة \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"يُرجى إعادة المحاولة. وإذا استمرّت المشكلة، عليك الاتصال بالشركة المصنِّعة للجهاز."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"حدث خطأ."</string>
@@ -997,8 +1016,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"‏كلمة مرور Wi-Fi هي:  <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"كلمة مرور نقطة الاتصال: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"اتصال تلقائي"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"السماح للهاتف بالاتصال بالإنترنت تلقائيًا بالقرب من هذه الشبكة"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"السماح للجهاز اللوحي بالاتصال بالإنترنت تلقائيًا بالقرب من هذه الشبكة"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"السماح بالاتصال بهذه الشبكة عندما تكون في نطاقها"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"إضافة جهاز"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"استخدِم رمز استجابة سريعة لإضافة جهاز إلى هذه الشبكة."</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"تنسيق رمز الاستجابة السريعة غير صالح."</string>
@@ -1010,7 +1028,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"استخدام شهادات النظام"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"عدم التوفير"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"عدم التحقق"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"لم يتم تحديد أي شهادات. لن يكون اتصالك خاصًا."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"اسم الشبكة طويل جدًا."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"يجب تحديد نطاق."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"يجب تقديم شهادة."</string>
@@ -1037,6 +1054,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"اتصال"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"‏تم تفعيل Wi‑Fi."</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"متّصل بـ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"جارٍ الربط بـ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"جارٍ الاتصال…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"تعذّر التوصيل بالشبكة"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"الشبكة ليست في النطاق."</string>
@@ -1076,6 +1094,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"‏عنوان MAC للجهاز"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"‏عنوان MAC العشوائي"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"‏عنوان MAC عشوائي (آخر استخدام)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"‏عنوان IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"تفاصيل الشبكة"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"قناع الشبكة الفرعية"</string>
@@ -1083,8 +1102,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"‏عناوين IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"الشبكات المحفوظة"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"الاشتراكات"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"الشبكات الأخرى"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"‏إعدادات IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"‏إعدادات Wi‑Fi المتقدمة ليست متاحة لهذا المستخدم."</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"حفظ"</string>
@@ -1093,8 +1111,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"اكتب عنوان بوابة صالحًا."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"اكتب عنوان نظام أسماء نطاقات صالحًا."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"اكتب بادئة شبكة يترواح طولها بين 0 و32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"نظام أسماء النطاقات 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"نظام أسماء النطاقات 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"نظام أسماء النطاقات 1 (ما لم يتم إلغاؤها باستخدام نظام أسماء النطاقات الخاص)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"نظام أسماء النطاقات 2 (ما لم يتم إلغاؤها باستخدام نظام أسماء النطاقات الخاص)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"البوابة"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"طول بادئة الشبكة"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"‏اتصال Wi-Fi مباشر"</string>
@@ -1120,7 +1138,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"يشارك التطبيق المحتوى. لمشاركة اتصال الإنترنت، يجب إيقاف نقطة الاتصال، ثم تفعيلها."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"لم يتم ضبط كلمة مرور"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"اسم نقطة الاتصال"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"جارٍ تفعيل <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"جارٍ تفعيل <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"يمكن توصيل الأجهزة الأخرى بشبكة <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"كلمة مرور نقطة الاتصال"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"نطاق نقطة الوصول"</string>
@@ -1270,7 +1288,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"العرض السلس"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"تعمل هذه الميزة على رفع معدل إعادة التحميل تلقائيًا من 60 إلى 90 هرتز لبعض أنواع المحتوى، ما يؤدي إلى زيادة استخدام البطارية."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"العرض السلس"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"فرض معدل إعادة تحميل بمقدار 90 هرتز"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"أعلى معدل إعادة تحميل لتحسين استجابة اللمس وجودة الصور المتحركة. يؤدي هذا إلى زيادة استخدام البطارية."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"استعراض الشاشة"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"تفعيل / لن يتم إيقاف الشاشة إذا كنت تنظر إليها."</string>
@@ -1361,6 +1379,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"عندما تكون الشاشة داكنة، ستُضاء لعرض الإشعارات الجديدة."</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"إظهار الوقت والمعلومات دائمًا"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"يزيد استخدام البطارية"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"نص غامق"</string>
     <string name="title_font_size" msgid="570613010306330622">"حجم الخط"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"يمكنك تكبير النص أو تصغيره."</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"‏إعدادات قفل شريحة SIM"</string>
@@ -1413,7 +1432,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"‏إصدار Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"‏تحديث أمان نظام Android"</string>
     <string name="model_info" msgid="8997566254717810904">"الطراز"</string>
-    <string name="model_summary" msgid="2246651782442466213">"‏الطراز: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"الطراز والجهاز"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"إصدار الجهاز"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"معرّف الجهاز"</string>
@@ -1662,7 +1680,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"‏حذف APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"اسم نقطة وصول جديد"</string>
     <string name="menu_save" msgid="6611465355127483100">"حفظ"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"إلغاء"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"إلغاء"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"لا يمكن أن يكون حقل الاسم فارغًا."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"‏لا يمكن أن يكون APN فارغًا."</string>
@@ -1677,8 +1695,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"يمكن إعادة ضبط التطبيقات."</string>
     <string name="reset_network_title" msgid="1395494440355807616">"‏إعادة ضبط شبكة Wi-Fi والجوّال والبلوتوث"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"‏سيؤدي هذا إلى إعادة ضبط كل إعدادات الشبكة، بما فيها:\n\n"<li>"شبكة Wi‑Fi"</li>\n<li>"بيانات الجوّال"</li>\n<li>"البلوتوث"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"محو البيانات"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"‏محو بيانات شرائح SIM التي تم تنزيلها"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"‏لتنزيل شرائح SIM بديلة، يمكنك التواصل مع مشغّل شبكة الجوّال. لن يؤدي ذلك إلى إلغاء أيّ خطة من خطط خدمة الجوّال."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"‏لن يؤدي هذا إلى إلغاء أيّ خطة من خطط خدمة الجوّال. لتنزيل شرائح SIM بديلة، يمكنك التواصل مع مشغّل شبكة الجوّال."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"إعادة ضبط الإعدادات"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"هل تريد إعادة ضبط جميع إعدادات الشبكة؟ لا يمكنك التراجع عن هذا الإجراء."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"‏هل تريد إعادة ضبط كل إعدادات الشبكة ومحو بيانات شريحة SIM التي تم تنزيلها؟ لا يمكنك التراجع عن هذا الإجراء."</string>
@@ -1688,31 +1707,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"تمت إعادة ضبط إعدادات الشبكة"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"‏يتعذّر محو بيانات شرائح SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"يتعذّر محو بيانات شرائح التي تم تنزيلها بسبب خطأ.\n\nيمكنك إعادة تشغيل الجهاز وإعادة المحاولة."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"محو جميع البيانات (إعادة الضبط على الإعدادات الأصلية)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"محو جميع البيانات (إعادة الضبط على الإعدادات الأصلية)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"‏سيؤدي هذا إلى محو جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:\n\n"<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيقات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"‏سيؤدي هذا إلى محو جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لهاتفك، بما في ذلك:\n\n"<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيقات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"الحسابات المسجَّل الدخول إليها حاليًا:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"هناك مستخدمون آخرون موجودون على هذا الجهاز.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727">"‏"<li>"شرائح eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"لن يؤدي هذا إلى إلغاء خطة خدمة الجوّال."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو "<b>"وحدة تخزين USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو "<b>"بطاقة SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"محو جميع البيانات (إعادة الضبط على الإعدادات الأصلية)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"محو جميع البيانات (إعادة الضبط على الإعدادات الأصلية)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"‏سيؤدي هذا إلى محو جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لجهازك اللوحي، بما في ذلك:\n\n"<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيقات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"‏سيؤدي هذا إلى محو جميع البيانات من "<b>"وحدة التخزين الداخلية"</b>" لهاتفك، بما في ذلك:\n\n"<li>"حسابك على Google"</li>\n<li>"بيانات وإعدادات النظام والتطبيقات"</li>\n<li>"التطبيقات التي تم تنزيلها"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"الحسابات المسجَّل الدخول إليها حاليًا:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"هناك مستخدمون آخرون موجودون على هذا الجهاز.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"الموسيقى"</li>\n<li>"الصور"</li>\n<li>"بيانات المستخدم الأخرى"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729">"‏"<li>"شرائح eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"لن يؤدي هذا إلى إلغاء خطة خدمة الجوّال."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو بيانات "<b>"وحدة تخزين USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">"‏\n\nلمحو الموسيقى والصور وبيانات المستخدم الأخرى أيضًا، يجب محو بيانات "<b>"بطاقة SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"‏محو وحدة تخزين USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"‏محو بطاقة SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"‏محو جميع البيانات على وحدة تخزين USB الداخلية، مثل الموسيقى أو الصور"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"‏محو جميع البيانات على بطاقة SD، مثل الموسيقى أو الصور"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"محو جميع البيانات"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"محو جميع البيانات"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"سيتم حذف جميع المعلومات الشخصية والتطبيقات التي تم تنزيلها. لا يمكنك التراجع عن هذا الإجراء."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"‏سيتم حذف جميع المعلومات الشخصية، بما في ذلك التطبيقات وشرائح SIM التي تم تنزيلها. لا يمكنك التراجع عن هذا الإجراء."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"مسح كل شيء"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"‏لم يتم تنفيذ إعادة التعيين نظرًا لعدم توفر خدمة System Clear."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"هل تريد محو جميع البيانات؟"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"لا تتوفر إمكانية إعادة الضبط على الإعدادات الأصلية لهذا المستخدم"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"جارٍ محو البيانات"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"يرجى الانتظار..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"محو جميع البيانات"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"محو جميع البيانات"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"سيتم حذف جميع المعلومات الشخصية والتطبيقات التي تم تنزيلها. لا يمكنك التراجع عن هذا الإجراء."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"‏سيتم حذف جميع المعلومات الشخصية، بما في ذلك التطبيقات وشرائح SIM التي تم تنزيلها. لا يمكنك التراجع عن هذا الإجراء."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"هل تريد محو جميع البيانات؟"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"لا تتوفر إمكانية إعادة الضبط على الإعدادات الأصلية لهذا المستخدم"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"جارٍ محو البيانات"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"يُرجى الانتظار…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"اعدادات المكالمات"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"إعداد البريد الصوتي، إعادة توجيه المكالمة، انتظار المكالمة، معرّف المتصل"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"‏التوصيل عبر USB"</string>
@@ -1760,7 +1777,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"لا يمكن ربط أكثر من <xliff:g id="MAXCONNECTION">%1$d</xliff:g> من الأجهزة."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"سيتم إلغاء ربط <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"التوصيل باستخدام إيثرنت"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"‏مشاركة اتصال الإنترنت الخاص بالهاتف عبر كابل USB يدعم إيثرنت"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"مشاركة اتصال الإنترنت الخاص بالهاتف عبر إيثرنت"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"يمكنك استخدام نقطة الاتصال والتوصيل لتوفير اتصال بالإنترنت للأجهزة الأخرى من خلال اتصال بيانات الجوّال، كما يمكن للتطبيقات إنشاء نقطة اتصال لمشاركة المحتوى مع الأجهزة المجاورة."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‏يمكنك استخدام نقطة الاتصال والتوصيل لتوفير اتصال بالإنترنت للأجهزة الأخرى من خلال شبكة Wi‑Fi أو اتصال بيانات الجوّال، كما يمكن للتطبيقات إنشاء نقطة اتصال لمشاركة المحتوى مع الأجهزة المجاورة."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"مساعدة"</string>
@@ -1806,6 +1823,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"البحث عن بلوتوث"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"يمكنك السماح للتطبيقات والخدمات بالبحث عن الأجهزة المجاورة في أي وقت، حتى في حال إيقاف البلوتوث. ويمكن استخدام هذه البيانات مثلاً لتحسين الميزات والخدمات المستندة إلى الموقع الجغرافي."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"خدمات الموقع الجغرافي للعمل"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"رصد المنطقة الزمنية للموقع الجغرافي"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"رصد المنطقة الزمنية للموقع الجغرافي"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"‏تسمح الميزة باستخدام الموقع الجغرافي للجهاز لرصد المنطقة الزمنية الحالية. يمكن أن تتأثر دقة رصد المنطقة الزمنية بإعدادات الموقع الجغرافي الأخرى، مثلاً \"البحث عن شبكات Wi-Fi\"."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"الميزة مفعّلة"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"الميزة غير مفعّلة"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"تم إيقاف الرصد التلقائي للمنطقة الزمنية"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"تم إيقاف ميزة رصد المنطقة الزمنية للموقع الجغرافي"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ميزة رصد المنطقة الزمنية للموقع الجغرافي غير متاحة."</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"غير مسموح بتغييرات رصد المنطقة الزمنية للموقع الجغرافي."</string>
     <string name="location_network_based" msgid="5247042890080021887">"‏شبكة Wi-Fi وموقع شبكة الجوّال"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"‏دع التطبيقات تستخدم خدمة الموقع من Google لتقييم موقعك بشكل أسرع. سيتم جمع بيانات الموقع غير محددة الهوية وإرسالها إلى Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"‏الموقع الذي تم تحديده بواسطة Wi-Fi"</string>
@@ -1869,6 +1895,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"لاستخدام \"فتح القفل بالوجه\"، يجب تحديد كلمة مرور"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"لاستخدام \"فتح القفل بالوجه\"، يجب تحديد نقش."</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"‏لاستخدام \"فتح القفل بالوجه\"، يجب تحديد رقم PIN."</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ضبط قفل احتياطي لفتح قفل مقاييس حيوية"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ضبط قفل احتياطي لفتح قفل مقاييس حيوية"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ضبط قفل احتياطي لفتح قفل مقاييس حيوية"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"هل نسيت كلمة المرور؟"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"هل نسيت النقش؟"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"هل نسيت رقم التعريف الشخصي؟"</string>
@@ -2213,13 +2242,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"الإعدادات المفضّلة للشرح"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"\"تكبير حجم الشاشة\""</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"منطقة التكبير"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"اختَر مناطق التكبير التي تريد استخدامها عند تكبير الشاشة."</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ملء الشاشة"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"جزء من الشاشة"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ملء الشاشة أو جزء من الشاشة"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"تكبير الشاشة بالكامل"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"تكبير جزء من الشاشة"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"أتريد التبديل إلى استخدام زر أدوات تمكين الوصول؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"سيؤدي استخدام النقر ثلاث مرات من أجل تكبير جزء من الشاشة إلى تأخير الكتابة وإجراءات أخرى.\n\nهل تريد التبديل إلى استخدام زر أدوات تمكين الوصول للتكبير؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"التبديل إلى استخدام زر أدوات تمكين الوصول"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"استمرار استخدام النقر ثلاث مرات للتكبير"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"إعدادات التكبير"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"التكبير بالنقر ثلاث مرّات"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"التكبير باستخدام الاختصار"</string>
@@ -2273,11 +2305,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"إنهاء الاتصال عبر زر التشغيل"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"مؤشر الماوس الكبير"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"إزالة الصور المتحركة"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"صوت أحادي"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"الجمع بين القنوات عند تشغيل الصوت"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"توازن الصوت"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"الأيمن"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"الأيسر"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"صوت أحادي"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"الجمع بين القنوات عند تشغيل الصوت"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"توازن الصوت"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"يسار"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"يمين"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"تلقائي"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ثوانٍ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ثانية"</string>
@@ -2307,11 +2339,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"الاهتزاز عند تلقّي إشعارات"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"الاهتزاز عند الرنين"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"الاهتزاز عند لمس الشاشة"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"استخدام <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"فتح <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"استخدام تصحيح الألوان"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"عرض الشرح"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"للتطبيقات المتوافقة فقط"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"استخدام <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"فتح <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"استخدام ميزة \"تصحيح الألوان\""</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"عرض الشرح"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"للتطبيقات المتوافقة فقط"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"حجم الشرح ونمطه"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"حجم النص: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"خيارات أكثر"</string>
@@ -2345,6 +2377,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"شذوذ إبصار الأخضر والأحمر"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"غطش الأحمر"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"غمش الأزرق"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"تدرّج الرمادي"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"الأحمر والأخضر"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"الأحمر والأخضر"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"الأزرق والأصفر"</string>
@@ -2498,7 +2531,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"حظر العمل في الخلفية"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"السماح بتشغيل التطبيق في الخلفية"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"غير مسموح بتشغيل التطبيق في الخلفية"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"يتعذر تقييد استخدام الخلفية."</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"يتعذّر تقييد استخدام الخلفية."</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"هل تريد وضع حد لنشاط التطبيق في الخلفية؟"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"قد يتأثر أداء أحد التطبيقات سلبًا في حالة وضع حد لنشاطه في الخلفية"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"نظرًا لعدم تعيين هذا التطبيق للعمل على تحسين البطارية، فلا يمكنك تقييده.\n\nلتقييد التطبيق، فعِّل ميزة تحسين البطارية أولاً."</string>
@@ -2547,6 +2580,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"الجهاز اللوحي المستخدَم أكثر من المعتاد"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"الجهاز المستخدَم أكثر من المعتاد"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"قد تنفد البطارية قبل الوقت المعتاد."</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"التحسين لسلامة البطارية"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"تأثير محدود على البطارية مؤقتًا، انقر لمعرفة مزيد من المعلومات."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"تم استخدام هاتفك أكثر من المعتاد. قد ينفذ شحن البطارية قبل الوقت المتوقَّع.\n\nالتطبيقات الأكثر استخدامًا للبطارية:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"تم استخدام جهازك اللوحي أكثر من المعتاد. قد ينفذ شحن البطارية قبل الوقت المتوقَّع.\n\nالتطبيقات الأكثر استخدامًا للبطارية:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"تم استخدام جهازك أكثر من المعتاد. قد ينفذ شحن البطارية قبل الوقت المتوقَّع.\n\nالتطبيقات الأكثر استخدامًا للبطارية:"</string>
@@ -2630,6 +2665,8 @@
       <item quantity="one">‏تم تقييد تطبيق واحد (%1$d)</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"حدثت مشكلة أثناء قراءة مقياس مستوى شحن البطارية."</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"حدثت مشكلة أثناء قراءة مقياس مستوى شحن البطارية. انقر "<annotation id="url">"لمعرفة مزيد من المعلومات"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"هل تريد إيقاف التطبيق؟"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"لا يستطيع هاتفك إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP">%1$s</xliff:g> يبقي هاتفك نشطًا بشكل مستمر.\n\nلمحاولة حل هذه المشكلة، يمكنك إيقاف التطبيق.\n\nإذا استمر حدوث هذا الأمر، يمكنك إلغاء تثبيت التطبيق لتحسين أداء البطارية."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"لا يستطيع جهازك اللوحي إدارة البطارية بشكل طبيعي لأن <xliff:g id="APP">%1$s</xliff:g> يبقي جهازك اللوحي نشطًا بشكل مستمر.\n\nلمحاولة حل هذه المشكلة، يمكنك إيقاف التطبيق.\n\nإذا استمر حدوث هذا الأمر، يمكنك إلغاء تثبيت التطبيق لتحسين أداء البطارية."</string>
@@ -2743,9 +2780,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ضبط جدول زمني"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"إطالة عمر البطارية"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"إيقاف الميزة عندما يكون الجهاز مشحونًا"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"يتم إيقاف ميزة \"توفير شحن البطارية\" عند وصول مستوى بطارية الهاتف إلى <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"يتم إيقاف \"توفير شحن البطارية\" عند وصول مستوى بطارية الجهاز اللوحي إلى <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"يتم إيقاف \"توفير شحن البطارية\" عند وصول مستوى بطارية الجهاز إلى <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"يتم إيقاف ميزة \"توفير شحن البطارية\" عندما تتخطى نسبة شحن بطارية الهاتف <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"يتم إيقاف ميزة \"توفير شحن البطارية\" عندما تتخطى نسبة شحن بطارية الجهاز اللوحي <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"يتم إيقاف ميزة \"توفير شحن البطارية\" عندما تتخطى نسبة شحن بطارية الجهاز <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"تفعيل"</string>
@@ -2810,6 +2847,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"إعادة الضبط"</string>
     <string name="tts_play" msgid="2945513377250757221">"تشغيل"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"الشبكة الافتراضية الخاصة"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"التحكّم التلقائي بإمكانية الاتصال"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"إطالة عمر البطارية وتحسين أداء الجهاز عن طريق الإدارة التلقائية للاتصالات بالشبكات"</string>
     <string name="credentials_title" msgid="7535942196886123656">"تخزين بيانات الاعتماد"</string>
     <string name="credentials_install" msgid="3933218407598415827">"تثبيت شهادة"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"تثبيت الشهادات من وحدة تخزين"</string>
@@ -2821,9 +2860,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"بيانات اعتماد المستخدم"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"عرض بيانات الاعتماد المخزَّنة وتعديلها"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"إعدادات متقدمة"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"نوع وحدة التخزين"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"وحدة تخزين صلبة"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"وحدة تخزين برمجية فقط"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"لا تتوفر بيانات الاعتماد لهذا المستخدم"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏تم التثبيت للاستخدام بواسطة الشبكة الافتراضية الخاصة (VPN) والتطبيقات"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏تم التثبيت للاستخدام بواسطة Wi-Fi"</string>
@@ -2839,6 +2875,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"عدم التثبيت"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"التثبيت على أي حال"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"لم يتم تثبيت الشهادة."</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"هل تريد السماح لتطبيق <xliff:g id="APP_NAME">%s</xliff:g> بتثبيت الشهادات على هذا الجهاز؟"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"‏ستؤدي هذه الشهادات إلى تعرّف التطبيقات وعناوين URL التالية على بيانات اعتمادك."</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"عدم السماح"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"السماح"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"عرض المزيد"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"تطبيق إدارة الشهادات"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"ما مِن تطبيقات لإدارة الشهادات"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"‏تؤدي الشهادات التي يثبتها هذا التطبيق إلى تعرّف التطبيقات وعناوين URL على بيانات اعتمادك."</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"إزالة"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"إشارة اتصال الطوارئ"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"تعيين السلوك عند إجراء اتصال بالطوارئ"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"الاحتفاظ بنسخة احتياطية"</string>
@@ -3182,7 +3227,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"لم يتم الإعداد - الملف الشخصي للعمل"</string>
     <string name="user_admin" msgid="4024553191395768119">"المشرف"</string>
     <string name="user_you" msgid="3070562015202859996">"أنت (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"اللقب"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"يمكنك إضافة ما يصل إلى <xliff:g id="USER_COUNT">%1$d</xliff:g> من المستخدمين"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"يمكن لمالك الجهاز اللوحي فقط إدارة المستخدمين."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"يمكن لمالك الهاتف فقط إدارة المستخدمين."</string>
@@ -3232,7 +3276,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"طريقة الدفع"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"بعد إعداد تطبيق للدفع، ما عليك سوى توجيه الجزء الخلفي من هاتفك إلى أي محطة دفع تتضمّن علامة \"بدون تلامس الأجهزة\"."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"حسنًا"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"المزيد..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"المزيد…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ضبط التطبيق التلقائي للدفع"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"تعديل التطبيق التلقائي للدفع"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"عند إحدى محطات الدفع بدون تلامس الأجهزة، يمكنك الدفع باستخدام <xliff:g id="APP">%1$s</xliff:g>."</string>
@@ -3242,7 +3286,7 @@
     <string name="restriction_settings_title" msgid="4293731103465972557">"القيود"</string>
     <string name="restriction_menu_reset" msgid="92859464456364092">"إزالة القيود"</string>
     <string name="restriction_menu_change_pin" msgid="2505923323199003718">"‏تغيير رمز PIN"</string>
-    <string name="help_label" msgid="2896538416436125883">"المساعدة والتعليقات"</string>
+    <string name="help_label" msgid="2896538416436125883">"المساعدة والملاحظات والآراء"</string>
     <string name="support_summary" msgid="1034146931237148885">"مقالات المساعدة والاتصال الهاتفي والمحادثة والبدء"</string>
     <string name="user_account_title" msgid="6389636876210834864">"حساب المحتوى"</string>
     <string name="user_picture_title" msgid="7176437495107563321">"معرف الصورة"</string>
@@ -3302,9 +3346,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"رجوع"</string>
     <string name="wizard_next" msgid="3884832431439072471">"التالي"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"إنهاء"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"التقاط صورة"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"اختيار صورة"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"اختيار صورة"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"‏بطاقات SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"‏بطاقات SIM"</string>
@@ -3316,7 +3357,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"استخدام هذا للمكالمات دائمًا"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"‏اختيار شريحة SIM للبيانات"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"‏اختيار شريحة SIM للرسائل القصيرة SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"‏جارٍ تبديل شريحة SIM للبيانات؛ قد يستغرق هذا مدة تصل إلى دقيقة..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"‏جارٍ تبديل شريحة SIM للبيانات. قد يستغرق ذلك مدة تصل إلى دقيقة…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"الاتصال باستخدام"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"‏اختيار شريحة SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"‏شريحة SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3463,6 +3504,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"سلسلة إجراءات، جدول زمني، توفير شحن البطارية، توفير الطاقة، بطارية، تلقائي، نسبة مئوية"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"‏خدمة volte، الاتصال المتقدم، اتصال 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"إضافة اللغة، إضافة لغة"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"حجم النص"</string>
     <string name="default_sound" msgid="6604374495015245195">"الصوت التلقائي"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"تم ضبط مستوى صوت الرنين والإشعار على <xliff:g id="PERCENTAGE">%1$s</xliff:g>."</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"مستوى الصوت والاهتزاز ووضع\"عدم الإزعاج\""</string>
@@ -3502,15 +3544,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"أصوات تشغيل الجهاز"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"النسخ النصي التلقائي"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"شرح تلقائي للوسائط"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"بدون أي قواعد"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="zero">تم ضبط <xliff:g id="ON_COUNT">%d</xliff:g> جدول زمني.</item>
-      <item quantity="two">تم ضبط جدولين زمنيين (<xliff:g id="ON_COUNT">%d</xliff:g>).</item>
-      <item quantity="few">تم ضبط <xliff:g id="ON_COUNT">%d</xliff:g> جداول زمنية.</item>
-      <item quantity="many">تم ضبط <xliff:g id="ON_COUNT">%d</xliff:g> جدولاً زمنيًا.</item>
-      <item quantity="other">تم ضبط <xliff:g id="ON_COUNT">%d</xliff:g> جدول زمني.</item>
-      <item quantity="one">تم ضبط جدول زمني واحد.</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ما من جداول زمنية.}=1{تم ضبط جدول زمني واحد.}two{تم ضبط جدولين زمنيين.}few{تم ضبط # جداول زمنية.}many{تم ضبط # جدولاً زمنيًا.}other{تم ضبط # جدول زمني.}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"وضع \"عدم الإزعاج\""</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"عدم الحصول على إشعار إلا من الأشخاص المهمين والتطبيقات المهمة"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"الحد من المقاطعات"</string>
@@ -3578,28 +3612,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"الأولوية فقط"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"قيد التفعيل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"غير مفعّل / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"غير مفعّل"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"قيد التفعيل"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"الطلب في كل مرة"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"إلى أن يتم إيقاف الوضع"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="zero"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة</item>
-      <item quantity="two">ساعتان (<xliff:g id="NUM_HOURS">%d</xliff:g>)</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعات</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعة</item>
-      <item quantity="one">ساعة واحدة</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> دقيقة"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="zero">يمكن تفعيل <xliff:g id="ON_COUNT">%d</xliff:g> جدول زمني تلقائيًا.</item>
-      <item quantity="two">يمكن تفعيل جدولين زمنيين (<xliff:g id="ON_COUNT">%d</xliff:g>) تلقائيًا.</item>
-      <item quantity="few">يمكن تفعيل <xliff:g id="ON_COUNT">%d</xliff:g> جداول زمنية تلقائيًا.</item>
-      <item quantity="many">يمكن تفعيل <xliff:g id="ON_COUNT">%d</xliff:g> جدولاً زمنيًا تلقائيًا.</item>
-      <item quantity="other">يمكن تفعيل <xliff:g id="ON_COUNT">%d</xliff:g> جدول زمني تلقائيًا.</item>
-      <item quantity="one">يمكن تفعيل جدول زمني واحد تلقائيًا.</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{ساعة واحدة}zero{# ساعة}two{ساعتان}few{# ساعات}many{# ساعة}other{# ساعة}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{دقيقة واحدة}zero{# دقيقة}two{دقيقتان}few{# دقائق}many{# دقيقة}other{# دقيقة}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{الميزة غير مفعّلة}=1{الميزة غير مفعّلة / يمكن تفعيل جدول زمني واحد تلقائيًا.}two{الميزة غير مفعّلة / يمكن تفعيل جدولين زمنيين تلقائيًا.}few{الميزة غير مفعّلة / يمكن تفعيل # جداول زمنية تلقائيًا.}many{الميزة غير مفعّلة / يمكن تفعيل # جدولاً زمنيًا تلقائيًا.}other{الميزة غير مفعّلة / يمكن تفعيل # جدول زمني تلقائيًا.}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"ما الذي يمكنه مقاطعة ميزة \"عدم الإزعاج\"؟"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"الأشخاص"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"التطبيقات"</string>
@@ -3645,6 +3663,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ضبط إشعارات الأولوية المنخفضة تلقائيًا على \"التنبيهات الهادئة\""</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ترتيب تكيُّفي للإشعارات"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ترتيب الإشعارات تلقائيًا حسب مدى الصلة بالموضوع"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"تعليقات عن الإشعارات التكيُّفية"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"الإشارة إلى التعديلات التي تم إجراؤها على الإشعارات وإظهار خيار لتقديم تعليقات إلى النظام"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"إعادة ضبط أهمية الإشعارات"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"إعادة ضبط إعدادات الأهمية التي غيّرها المستخدم والسماح لمساعد الإشعارات بمنح الأولوية"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"الإجراءات والردود المقترَحة"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"عرض الإجراءات والردود المقترحة تلقائيًا"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"عرض الإشعارات الحديثة والمؤجلة"</string>
@@ -3746,8 +3768,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"المحادثات ذات الأولوية"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"تظهر في أعلى قسم المحادثات في شكل فقاعات عائمة."</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"تظهر في أعلى قسم المحادثات."</string>
-    <string name="other_conversations" msgid="7218658664423361043">"المحادثات الأخرى"</string>
+    <string name="other_conversations" msgid="551178916855139870">"المحادثات غير ذات الأولوية"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"المحادثات التي أجريت تغييرات عليها"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"المحادثات الأخيرة"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"محو المحادثات الحديثة"</string>
+    <string name="clear" msgid="5092178335409471100">"محو"</string>
     <string name="important_bubble" msgid="7911698275408390846">"تظهر المحادثات ذات الأولوية كفقاعات"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"تظهر المحادثات ذات الأولوية في أعلى مركز الإشعارات المنسدل. يمكنك أيضًا ضبطها لتظهر كفقاعات ولا تتقيّد بميزة \"عدم الإزعاج\"."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ستظهر هنا المحادثات ذات الأولوية والمُعدَّلة."</string>
@@ -3861,7 +3886,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"الوصول إلى إعداد \"عدم الإزعاج\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"السماح بميزة \"عدم الإزعاج\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"لم تطلّب أي تطبيقات مثبّتة حق الوصول إلى إعداد \"عدم الإزعاج\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"جارٍ تحميل التطبيقات..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"جارٍ تحميل التطبيقات…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏بناءً على طلبك، يمنع Android ظهور إشعارات هذا التطبيق على هذا الجهاز."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏بناءً على طلبك، يمنع Android ظهور هذه الفئة من الإشعارات على هذا الجهاز."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‏بناءً على طلبك، يمنع Android ظهور هذه المجموعة من الإشعارات على هذا الجهاز."</string>
@@ -3965,15 +3990,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"كل المحادثات"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"المحادثات ذات الأولوية"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"غير مسموح لأي محادثات"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="zero"><xliff:g id="CONVERSATIONS">%d</xliff:g> محادثة</item>
-      <item quantity="two">محادثتان (<xliff:g id="CONVERSATIONS">%d</xliff:g>)</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> محادثات</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> محادثة</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> محادثة</item>
-      <item quantity="one">محادثة واحدة</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"غير مسموح لأي محادثات"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ما من محادثات}=1{محادثة واحدة}two{محادثتان}few{# محادثات}many{# محادثة}other{# محادثة}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"مَن يمكنه مقاطعة عمل الميزة"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"المكالمات"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"المكالمات"</string>
@@ -3982,15 +3999,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"للتأكّد من أنّ المكالمات المسموح بها تصدر تنبيهًا صوتيًا، تحقَّق من ضبط جهازك على الرنين."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"بالنسبة إلى \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\"، يتمّ حظر المكالمات الواردة. ويمكنك ضبط الإعدادات للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"جهات الاتصال المميّزة بنجمة"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="zero"><xliff:g id="NUM_PEOPLE">%d</xliff:g> شخص آخر</item>
-      <item quantity="two">شخصان (<xliff:g id="NUM_PEOPLE">%d</xliff:g>) آخران</item>
-      <item quantity="few"><xliff:g id="NUM_PEOPLE">%d</xliff:g> أشخاص آخرين</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> شخصًا آخر</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> شخص آخر</item>
-      <item quantity="one">شخص واحد آخر</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"لم يتم اختيار جهات اتصال مميّزة بنجمة"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ما من جهات اتصال مميّزة بنجمة}=1{{contact_1}}=2{{contact_1} و{contact_2}}=3{{contact_1} و{contact_2} و{contact_3}}few{{contact_1} و{contact_2} و# جهات اتصال أخرى مميّزة بنجمة}many{{contact_1} و{contact_2} و# جهة اتصال أخرى مميّزة بنجمة}other{{contact_1} و{contact_2} و# جهة اتصال أخرى مميّزة بنجمة}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(بلا اسم)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"الرسائل"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"الرسائل"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"الرسائل"</string>
@@ -3999,15 +4009,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"وفقًا للجدول الزمني \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\"، يتم حظر الرسائل الواردة. ويمكنك ضبط الإعدادات للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"يمكن أن تصلك كل الرسائل."</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"يمكن أن تصلك كل المكالمات"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"لم يتم اختيار جهات اتصال"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="zero"><xliff:g id="NUM_CONTACTS">%d</xliff:g> جهة اتصال</item>
-      <item quantity="two">جهتا اتصال (<xliff:g id="NUM_CONTACTS">%d</xliff:g>)</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> جهات اتصال</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> جهة اتصال</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> جهة اتصال</item>
-      <item quantity="one">جهة اتصال واحدة</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ما من جهات اتصال}=1{جهة اتصال واحدة}two{جهتا اتصال}few{# جهات اتصال}many{# جهة اتصال}other{# جهة اتصال}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"أي شخص"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"جهات الاتصال"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"جهات الاتصال المميّزة بنجمة"</string>
@@ -4045,30 +4047,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"جميع الإشعارات"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"بعض الإشعارات"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"لا يزال بإمكان الأشخاص المُختارين الوصول إليك حتى إذا لم تسمح للتطبيقات بمقاطعة عمل الميزة"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="zero">السماح لتطبيقات <xliff:g id="APP_NAMES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="two">السماح لتطبيقَي <xliff:g id="APP_NAMES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="few">السماح لتطبيقات <xliff:g id="APP_NAMES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="many">السماح لتطبيقات <xliff:g id="APP_NAMES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="other">السماح لتطبيقات <xliff:g id="APP_NAMES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="one">السماح لتطبيق <xliff:g id="APP_NAME_0">%s</xliff:g> بمقاطعة عمل الميزة</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> تطبيق آخر"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{عدم السماح لأي تطبيقات بمقاطعة عمل الميزة}=1{السماح لتطبيق {app_1} بمقاطعة عمل الميزة}=2{السماح لتطبيقَي {app_1} و{app_2} بمقاطعة عمل الميزة}=3{السماح لتطبيقات {app_1} و{app_2} و{app_3} بمقاطعة عمل الميزة}few{السماح لـ {app_1} و{app_2} و# تطبيقات أخرى بمقاطعة عمل الميزة}many{السماح لـ {app_1} و{app_2} و# تطبيقًا آخر بمقاطعة عمل الميزة}other{السماح لـ {app_1} و{app_2} و# تطبيق آخر بمقاطعة عمل الميزة}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"التطبيقات"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"جميع الإشعارات"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"بعض الإشعارات"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"الإشعارات التي يمكنها مقاطعة عمل الميزة"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"السماح لجميع الإشعارات"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="zero">السماح لأصوات <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="two">السماح لصوتَي <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="few">السماح لأصوات <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="many">السماح لأصوات <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="other">السماح لأصوات <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> بمقاطعة عمل الميزة</item>
-      <item quantity="one">السماح لصوت <xliff:g id="SOUND_CATEGORY">%s</xliff:g> بمقاطعة عمل الميزة</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"عدم السماح لأي عنصر بمقاطعة عمل الميزة"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> صوت آخر"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{عدم السماح لأي فئة صوتية بمقاطعة عمل الميزة}=1{السماح لـ {sound_category_1} بمقاطعة عمل الميزة}=2{السماح لـ {sound_category_1} و{sound_category_2} بمقاطعة عمل الميزة}=3{السماح لـ {sound_category_1} و{sound_category_2} و{sound_category_3} بمقاطعة عمل الميزة}few{السماح لـ {sound_category_1} و{sound_category_2} و# فئات صوتية أخرى بمقاطعة عمل الميزة}many{السماح لـ {sound_category_1} و{sound_category_2} و# فئة صوتية أخرى بمقاطعة عمل الميزة}other{السماح لـ {sound_category_1} و{sound_category_2} و# فئة صوتية أخرى بمقاطعة عمل الميزة}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"عدم السماح لأي عنصر بمقاطعة عمل الميزة"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"عدم السماح لأي مستخدم بمقاطعة عمل الميزة"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"السماح لبعض الأشخاص بمقاطعة عمل الميزة"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"السماح لكل المستخدمين بمقاطعة عمل الميزة"</string>
@@ -4122,8 +4108,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"مفعّل"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"غير مفعّل"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"تثبيت الشاشة على تطبيق معيّن"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"تسمح لك ميزة \"تثبيت الشاشة على تطبيق معيّن\" بالحفاظ على التطبيق الحالي في حيز رؤيتك إلى أن تتم إزالة تثبيته. على سبيل المثال، يمكن استخدام هذه الميزة للسماح لصديق موثوق فيه بلعب لعبة معيّنة. \n\nعندما يتم تثبيت الشاشة على تطبيق معيّن، يمكن للتطبيق المثبت فتح التطبيقات الأخرى والوصول إلى البيانات الشخصية. \n\nلاستخدام ميزة \"تثبيت الشاشة على تطبيق معيّن\"، عليك تنفيذ ما يلي: 	\n١-	تفعيل ميزة \"تثبيت الشاشة على تطبيق معيّن\" 	\n٢-	فتح \"نظرة عامة\" 	\n٣-	النقر على رمز التطبيق في أعلى الشاشة ثم النقر على \"تثبيت\""</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"تسمح لك ميزة تثبيت التطبيق بالحفاظ على التطبيق الحالي في حيز رؤيتك إلى أن تتم إزالة تثبيته. على سبيل المثال، يمكن استخدام هذه الميزة للسماح لصديق موثوق فيه بلعب لعبة معيّنة. \n\nعندما يتم تثبيت تطبيق، يمكن للتطبيق المثبت فتح التطبيقات الأخرى والوصول إلى البيانات الشخصية. \n\nإذا أردت مشاركة جهازك بأمان مع أحد الأشخاص، اجعله يستخدم حساب ضيف بدلاً من استخدام حسابك. \n\nلاستخدام ميزة تثبيت التطبيقات، يجب تنفيذ ما يلي: 	\n1-	تفعيل ميزة تثبيت التطبيقات 	\n2-	فتح \"نظرة عامة\" 	\n3-	النقر على رمز التطبيق في أعلى الشاشة ثم النقر على \"تثبيت\""</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"تسمح لك ميزة \"تثبيت الشاشة على تطبيق معيّن\" بالحفاظ على التطبيق الحالي في حيز رؤيتك إلى أن تتم إزالة تثبيتها. على سبيل المثال، يمكن استخدام هذه الميزة للسماح لصديق موثوق فيه بلعب لعبة معيّنة."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"عندما يتم تثبيت الشاشة على تطبيق معيّن، يمكن لهذا التطبيق فتح التطبيقات الأخرى والوصول إلى البيانات الشخصية. \n\nلاستخدام ميزة \"تثبيت الشاشة على تطبيق معيّن\":، يجب تنفيذ ما يلي: 	\n1-	تفعيل ميزة \"تثبيت الشاشة على تطبيق معيّن\" 	\n2-	فتح \"نظرة عامة\" 	\n3-	النقر على رمز التطبيق في أعلى الشاشة ثم النقر على \"تثبيت\""</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"عندما يتم تثبيت الشاشة على تطبيق معيّن، يمكن لهذا التطبيق فتح التطبيقات الأخرى والوصول إلى البيانات الشخصية. \n\nإذا أردت مشاركة جهازك بأمان مع أحد الأشخاص، اجعله يستخدم حساب ضيف بدلاً من استخدام حسابك. \n\nلاستخدام ميزة \"تثبيت الشاشة على تطبيق معيّن\"، يجب تنفيذ ما يلي: 	\n1-	تفعيل ميزة \"تثبيت الشاشة على تطبيق معيّن\" 	\n2-	فتح \"نظرة عامة\" 	\n3-	النقر على رمز التطبيق في أعلى الشاشة ثم النقر على \"تثبيت\""</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"عندما يتم تثبيت الشاشة على تطبيق معيّن: \n\n•	 يمكن الوصول إلى البيانات الشخصية \n		(مثلاً جهات الاتصال ومحتوى الرسائل الإلكترونية) \n•	 يمكن للتطبيق المثبت فتح التطبيقات الأخرى \n\nلا تستخدِم ميزة \"تثبيت الشاشة على تطبيق معيّن\" إلا مع المستخدمين الموثوق فيهم."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"طلب إدخال النقش الخاص بإلغاء القفل قبل إزالة التثبيت"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"طلب إدخال رقم التعريف الشخصي قبل إزالة التثبيت"</string>
@@ -4145,6 +4132,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"بالإضافة إلى استخدام وجهك لإلغاء قفل جهازك، يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال رقم التعريف الشخصي قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال رقم التعريف الشخصي لبدء تشغيل الجهاز؟"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"بالإضافة إلى استخدام وجهك لإلغاء قفل جهازك، يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال النقش قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال النقش لبدء تشغيل الجهاز؟"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"بالإضافة إلى استخدام وجهك لإلغاء قفل الجهاز، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال كلمة المرور قبل بدء تشغيله. ويتعذر على الجهاز - إلى أن يتم تشغيله - استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال كلمة المرور لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"بالإضافة إلى استخدام المقاييس الحيوية لفتح قفل جهازك، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال رقم تعريف شخصي قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا الإجراء على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال رقم تعريف شخصي لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"بالإضافة إلى استخدام المقاييس الحيوية لفتح قفل جهازك، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال نقش قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا الإجراء على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال نقش لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"بالإضافة إلى استخدام المقاييس الحيوية لفتح قفل الجهاز، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال كلمة المرور قبل بدء تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا الإجراء على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال كلمة مرور لبدء تشغيل الجهاز؟"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"نعم"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"لا"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"محظور"</string>
@@ -4352,7 +4342,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"‏يتم التحكم في USB بواسطة"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"جهاز متّصل"</string>
     <string name="usb_control_device" msgid="527916783743021577">"هذا الجهاز"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"جارٍ التبديل..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"جارٍ التبديل…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"تعذّر التبديل"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"شحن هذا الجهاز"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"شحن الجهاز المتصل"</string>
@@ -4562,6 +4552,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"استخدام بيانات الجوّال"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"استخدام التطبيقات للبيانات"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"‏استخدام بيانات Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"استخدام البيانات من شبكات غير تابعة لمشغّلي شبكات الجوّال"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"استخدام بيانات إيثرنت"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"إيثرنت"</string>
@@ -4584,6 +4575,7 @@
       <item quantity="one">قيد واحد</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"قد تختلف طريقة احتساب بيانات مشغِّل شبكة الجوّال عن طريقة الاحتساب على الجهاز."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"استبعاد البيانات التي تستخدمها شبكات مشغّلي شبكات الجوّال"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> مستخدَمة"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ضبط تحذيرات استخدام البيانات"</string>
     <string name="data_warning" msgid="2925054658166062884">"تحذيرات البيانات"</string>
@@ -4627,7 +4619,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"عرض التفاصيل"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"توفير البيانات"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"استخدام البيانات بدون قيود"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"تم إيقاف بيانات الخلفية."</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"تم إيقاف بيانات الخلفية."</string>
     <string name="data_saver_on" msgid="7848893946018448793">"قيد التفعيل"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"غير مفعّل"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"استخدام أداة توفير البيانات"</string>
@@ -4650,7 +4642,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"أثناء قفل الجهاز، منع كتابة ردود أو نصوص أخرى في الإشعارات"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"التدقيق الإملائي التلقائي"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"اختيار المدقق الإملائي"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"استخدام التدقيق الإملائي"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"استخدام ميزة \"المدقّق الإملائي\""</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"غير محدد"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(بدون)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4756,7 +4748,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"للمساعدة في تفريغ مساحة التخزين، يزيل مدير مساحة التخزين من جهاز الصور والفيديوهات التي تم الاحتفاظ بنسخة احتياطية منها."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"إزالة الصور والفيديوهات"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"مدير مساحة التخزين"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"استخدام مدير مساحة التخزين"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"استخدام \"أداة إدارة مساحة التخزين\""</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"تلقائي"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"يدوي"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"إخلاء بعض المساحة الآن"</string>
@@ -4794,6 +4786,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"النقر مرّتين للاطّلاع على الهاتف"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"انقر مرّتين للاطلاع على الجهاز اللوحي"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"انقر مرّتين للاطلاع على الجهاز"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"التمرير سريعًا للإشعارات"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"مرّر سريعًا للأسفل على الحافة السفلى من الشاشة لإظهار الإشعارات."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"وضع \"التصفح بيد واحدة\""</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"استخدام وضع \"التصفح بيد واحدة\""</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"الخروج عند التبديل بين التطبيقات"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"المهلة"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ثوانٍ"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ثوانٍ"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ثانية"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"قابلية الوصول"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"للاطّلاع على الوقت والإشعارات والمعلومات الأخرى، انقر مرّتين على شاشتك."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"حمل الهاتف للاطّلاع عليه"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"يمكنك حمل الجهاز اللوحي للاطلاع عليه"</string>
@@ -4806,6 +4808,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"النقر لفحص الجهاز اللوحي"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"النقر لفحص الجهاز"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"للاطّلاع على الوقت والإشعارات والمعلومات الأخرى، انقر على شاشتك."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"‏تنبيه SOS في حالة طوارئ"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"‏استخدام تنبيه SOS في حالة الطوارئ"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"تحت إدارة <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"يمكنك بدء الإجراءات أدناه عن طريق الضغط بسرعة على زر التشغيل 5 مرات أو أكثر."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"تشغيل إنذار العد التنازلي"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"تشغيل صوت مرتفع قبل إرسال إشعار لطلب المساعدة"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"الاتصال للحصول على مساعدة"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"رقم هاتف للحصول على مساعدة"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>، انقر لتغيير الرقم."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"‏إذا أدخلت رقمًا غير أرقام الطوارئ:\n • يجب فتح قفل جهازك لاستخدام تنبيه SOS في حالة الطوارئ. \n • قد لا يتم الرد على المكالمة."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"تمرير بصمة الإصبع لعرض الإشعارات"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"تمرير بصمة الإصبع"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"للاطّلاع على الإشعارات، مرِّر إصبعك للأسفل على زر استشعار بصمات الإصبع في الجزء الخلفي لهاتفك."</string>
@@ -4959,6 +4971,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"الحد الأقصى لعدد مجموعات البيانات المرئية"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"إعادة الضبط على القيم التلقائية"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"تمّت إعادة ضبط الملء التلقائي لخيارات مطوّري البرامج"</string>
+    <string name="location_category" msgid="3496759112306219062">"الموقع الجغرافي"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"مؤشر الموقع الجغرافي في شريط الحالة"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"إظهار المؤشر لكل المواقع الجغرافية، وأيضًا من خلال الشبكة وإمكانية الاتصال"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"‏فرض كامل لقياسات GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"‏تتبّع جميع مجموعات وفترات تكرار GNSS التي لا تحتوي على دورات عمل"</string>
     <string name="device_theme" msgid="5027604586494772471">"مظهر الجهاز"</string>
     <string name="default_theme" msgid="4815428567082263639">"تلقائي"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"اسم الشبكة"</string>
@@ -4975,8 +4992,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"إيقاف الإشعارات مؤقتًا للحفاظ على التركيز"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"الميزة غير متوفرة"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"تم إيقاف هذه الميزة لأنها تبطئ هاتفك."</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"‏فرض كامل لقياسات GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"‏تتبّع جميع مجموعات وفترات تكرار GNSS التي لا تحتوي على دورات عمل"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"عرض مربع حوار الأعطال دائمًا"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"عرض مربع الحوار في كل مرة يتعطل فيها تطبيق"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"‏اختيار التطبيق الذي يستخدم ANGLE"</string>
@@ -4988,7 +5003,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"التفعيل على جميع التطبيقات"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"اختيار برنامج تشغيل الرسومات"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"تلقائي"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"برنامج تشغيل رسوم للمطوّرين"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"برنامج تشغيل رسومات النظام"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -5044,7 +5059,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"تفعيل (كتم الصوت)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"غير مفعّل"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"تفاصيل الشبكة"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"‏اسم جهازك مرئي للتطبيقات على هاتفك. ويمكن أيضًا أن يراه أشخاص آخرون عند الاتصال بأجهزة بلوتوث أو إعداد نقطة اتصال Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"‏اسم جهازك مرئي للتطبيقات على هاتفك. ويمكن أيضًا للآخرين الاطّلاع على اسم جهازك عند الاتصال بأجهزة تتضمّن بلوتوث أو الاتصال بشبكة Wi-Fi أو إعداد نقطة اتصال Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"الأجهزة"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"جميع الإعدادات"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"اقتراحات"</string>
@@ -5057,6 +5072,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"تعذّر العثور على شبكات. حاوِل مرة أخرى."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(محظورة)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"‏ليست هناك شريحة SIM."</string>
+    <string name="sim_card" msgid="6381158752066377709">"‏شريحة SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"‏ليس هناك شريحة SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"بدون شريحة"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"‏يجب توفّر شريحة SIM للاتصال بالشبكة"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"‏يجب توفّر شريحة SIM من <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> للاتصال بالشبكة"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"‏وضع الشبكة المُفضَّل: تمّ تفضيل WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"‏وضع الشبكة المُفضَّل: GSM فقط"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"‏وضع الشبكة المُفضَّل: WCDMA فقط"</string>
@@ -5110,6 +5130,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"بيانات الجوّال"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"الوصول إلى البيانات باستخدام شبكة الجوّال"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"سيتم تبديل الهاتف تلقائيًا إلى مشغّل شبكة الجوّال هذا عند وجوده داخل النطاق."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‏لا تتوفّر شريحة SIM."</string>
     <string name="calls_preference" msgid="2166481296066890129">"خيار المكالمات المفضَّل"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‏خيار SMS المفضَّل"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"الطلب في كل مرة"</string>
@@ -5174,6 +5195,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"عدم التوفُّر عند الربط بمشغّل شبكة الجوّال <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"عرض المزيد"</string>
     <string name="see_less" msgid="2642392725363552793">"عرض عناصر أقل"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"هل تريد تفعيل <xliff:g id="CARRIER_NAME">%1$s</xliff:g>؟"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"‏هل تريد تفعيل شريحة SIM؟"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"هل تريد التبديل إلى <xliff:g id="CARRIER_NAME">%1$s</xliff:g>؟"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"‏هل تريد التبديل إلى استخدام شريحة SIM؟"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"‏لا يمكن تفعيل أكثر من شريحة SIM واحدة في آنٍ واحد.\n\nلن يؤدي التبديل إلى <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> إلى إلغاء خدمة <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"‏لا يمكن تفعيل أكثر من شريحة SIM واحدة تم تنزيلها في آنٍ واحد.\n\nلن يؤدي التبديل إلى <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> إلى إلغاء خدمة <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"‏لا يمكن تفعيل أكثر من شريحة SIM واحدة في آنٍ واحد.\n\nلن يؤدي التبديل إلى إلغاء خدمة <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"التبديل إلى <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"جارٍ الاتصال بالشبكة…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"جارٍ التبديل إلى <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"يتعذَّر تبديل مشغِّل شبكة الجوّال"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"يتعذَّر تبديل مشغِّل شبكة الجوّال بسبب حدوث خطأ."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"هل تريد إيقاف <xliff:g id="CARRIER_NAME">%1$s</xliff:g>؟"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"‏هل تريد إيقاف شريحة SIM؟"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"‏جارٍ إيقاف شريحة SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"يتعذّر إيقاف مشغِّل شبكة الجوّال"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"حدث خطأ ما أدى إلى تعذُّر إيقاف مشغِّل شبكة الجوّال."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"‏هل تريد استخدام شريحتَي SIM؟"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"‏يمكن تفعيل شريحتَي SIM على هذا الجهاز في وقتٍ واحد. لمتابعة استخدام شريحة SIM واحدة في كل مرة، انقر على \"لا، شكرًا\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"هل تريد إعادة تشغيل الجهاز؟"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"‏للبدء، أعِد تشغيل جهازك. ويمكنك بعد ذلك إضافة شريحة SIM أخرى."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"متابعة"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"إعادة التشغيل"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"لا، شكرًا"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"تبديل"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"‏يتعذّر تفعيل شريحة SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏يجب إزالة شريحة SIM ثم إدخالها مرة أخرى. إذا استمرت المشكلة، عليك إعادة تشغيل الجهاز."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‏حاوِل تفعيل شريحة SIM مرة أخرى. إذا استمرت المشكلة، عليك إعادة تشغيل الجهاز."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"تفعيل الشبكة"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"مشغّل شبكة الجوّال <xliff:g id="CARRIER_NAME">%1$s</xliff:g> مفعّل"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‏انقر لتعديل إعدادات شريحة SIM."</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"‏شريحة SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"‏هل تريد محو بيانات شريحة SIM هذه التي تم تنزيلها؟"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"‏سيؤدي محو بيانات شريحة SIM هذه إلى إزالة خدمة <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> من هذا الجهاز.\n\nولن يتم إلغاء خدمة <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"محو البيانات"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"‏جارٍ محو بيانات شريحة SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"‏يتعذّر محو بيانات شريحة SIM."</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"‏يتعذّر محو بيانات شريحة SIM هذه بسبب حدوث خطأ.\n\nيمكنك إعادة تشغيل الجهاز والمحاولة مرة أخرى."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"الاتصال بالجهاز"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"‏يريد تطبيق <xliff:g id="APPNAME">%1$s</xliff:g> استخدام شبكة Wi‑Fi مؤقتة للاتصال بجهازك."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"لم يتمّ العثور على أيّ أجهزة. تأكَّد من تشغيل الأجهزة وتوفّرها للاتصال."</string>
@@ -5253,6 +5312,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"مكالمات الطوارئ"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"‏لا يتيح مشغّل شبكة الجوّال مكالمات الطوارئ من خلال ميزة \"الاتصال عبر Wi-Fi\".\nويتم تبديل الجهاز تلقائيًا إلى شبكة جوّال لإجراء مكالمة طوارئ.\nلا يمكن إجراء مكالمات الطوارئ إلا في المناطق التي تتوفّر فيها تغطية شبكة الجوّال."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"‏استخدام شبكة Wi‑Fi لإجراء المكالمات لتحسين الجودة"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"‏الاتصال عبر شرائح SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"‏السماح بتلقّي المكالمات والرسائل القصيرة SMS من شريحة SIM أخرى على هذه الشريحة."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"‏الاتصال عبر شرائح sim"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"رسالة وسائط متعددة واردة"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"يتعذّر إرسال رسالة وسائط متعددة"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"انقر للسماح بالمراسلة باستخدام رسائل الوسائط المتعددة على <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> عند إيقاف بيانات الجوّال."</string>
@@ -5304,10 +5366,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"السماح بالظهور فوق المحتوى على الشاشة في \"الإعدادات\""</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"السماح للتطبيقات التي يمكن عرضها على التطبيقات الأخرى بالظهور فوق المحتوى على شاشات \"الإعدادات\"."</string>
     <string name="media_controls_title" msgid="403271085636252597">"الوسائط"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"إخفاء المشغِّل عندما تنتهي جلسة الوسائط"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"يسمح لك المشغِّل باستئناف جلسة من اللوحة الموسَّعة \"الإعدادات السريعة\"."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"مشغّل الوسائط في \"الإعدادات السريعة\""</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"عرض مشغّل الوسائط لمدة أطول لاستئناف التشغيل بسهولة"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"إخفاء المشغِّل"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"إظهار المشغِّل"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ما مِن مشغِّلات متاحة"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"التطبيقات المسموح بها"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"الوسائط"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"سيتم تفعيل البلوتوث."</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"مفعّلة"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"غير مفعّلة"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"الإنترنت"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"‏شرائح SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"الشبكات الآمنة في وضع الطيران"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"العثور على الشبكات الآمنة في وضع الطيران والاتصال بها"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"وضع الطيران، آمنة في وضع الطيران"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"‏المكالمات والرسائل القصيرة SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"‏الاتصال عبر Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"‏يمكنك إجراء مكالمات وتلقّيها عبر شبكات غير تابعة لمشغّلي شبكات الجوّال، مثلاً عبر شبكة Wi-Fi."</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"‏تسمح لك ميزة \"الاتصال عبر Wi-Fi\" بإجراء مكالمات وتلقّيها عبر شبكات غير تابعة لمشغّلي شبكات الجوّال."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"المكالمات"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"مفضّلة"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"المكالمات مفضّلة"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"الرسائل القصيرة مفضّلة"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"غير متاحة"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏بلا شريحة SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"التفضيلات"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"‏الاتصال بشبكات Wi-Fi عامة"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"‏الاتصال بالشبكة، الإنترنت، لاسلكي، بيانات، wifi، wi-fi، wi fi، خلوي، جهاز جوّال، مشغل شبكة الجوال، جيل رابع، جيل ثالث، جيل ثاني، lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"عرض الشبكات الآمنة في وضع الطيران"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"إيقاف \"وضع الطيران\""</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"الميزة غير متاحة لأن وضع \"وقت النوم\" مفعّل."</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"اكتملت عملية إعادة ضبط درجة الأهمية الخاصة بالإشعارات."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"التطبيقات"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"يريد جهاز غير موثوق الوصول إلى رسائلك. انقر للحصول على التفاصيل."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"هل تريد السماح بالوصول إلى الرسائل؟"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"يريد جهاز غير موثوق يتضمّن بلوتوث، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، الوصول إلى رسائلك.\n\nلم يتم ربطك بالجهاز [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] في السابق."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"يريد جهاز غير موثوق الوصول إلى جهات الاتصال وسجلّ المكالمات. انقر للحصول على التفاصيل."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"هل تريد السماح بالوصول إلى جهات الاتصال وسجلّ المكالمات؟"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"يريد جهاز غير موثوق يتضمّن بلوتوث، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، الوصول إلى جهات الاتصال وسجلّ المكالمات. يتضمن ذلك الوصول إلى بيانات عن المكالمات الواردة والصادرة.\n\nلم يتم ربطك بالجهاز [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] في السابق."</string>
 </resources>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index ac224cb..ea064f4 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"মধ্যমীয়া"</item>
     <item msgid="6740026006576843477">"দীঘল"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"চুটি"</item>
+    <item msgid="7397961711906421599">"মধ্যমীয়া"</item>
+    <item msgid="4079132024502041928">"দীঘলীয়া"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ডিফ\'ল্ট"</item>
     <item msgid="4234707448428002595">"ছানছ-ছেৰিফ"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"গোলকীয়"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"কেৱল TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"সাৰ্বজনীন"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 7e94ab7..2b52ef1 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"তাৰিখ আৰু সময়"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"তাৰিখ আৰু সময় নিৰ্ধাৰণ কৰক"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"তাৰিখ, সময়, সময় মণ্ডল আৰু ফৰমেটসমূহ ছেট কৰক"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"নেটৱৰ্কে দিয়া সময় ব্যৱহাৰ কৰক"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"নেটৱৰ্কে দিয়া সময় মণ্ডল ব্যৱহাৰ কৰক"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"স্বয়ংক্ৰিয়ভাৱে সময় ছেট কৰক"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"স্বয়ংক্ৰিয়ভাৱে সময় মণ্ডল ছেট কৰক"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"স্থানীয় ডিফ’ল্ট ব্যৱহাৰ কৰক"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"২৪ ঘণ্টীয়া সজ্জা"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"২৪ ঘণ্টীয়া সজ্জা ব্যৱহাৰ কৰক"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"লক স্ক্ৰীণত প্ৰ\'ফাইল-বিষয়ক তথ্য দেখুৱাওক"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"একাউণ্টসমূহ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"অৱস্থান"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"অৱস্থান ব্যৱহাৰ কৰক"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"অৱস্থান ব্যৱহাৰ কৰক"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"অফ আছে"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">অন আছে - <xliff:g id="COUNT_1">%1$d</xliff:g>টা এপে অৱস্থান এক্সেছ কৰিব পাৰে</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"স্ক্ৰীণ লক, ফে’চ আনলক"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"স্ক্ৰীণ লক, ফিংগাৰপ্ৰিণ্ট"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"স্ক্ৰীণ লক"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"আপোনাৰ মুখাৱয়ব আৰু ফিংগাৰপ্ৰিণ্টেৰে নিজৰ ফ’ন সুৰক্ষিতভাৱে আনলক কৰক"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"আপুনি এপত ছাইন ইন কৰিও পৰিশোধ নিশ্চিত কৰিব পাৰে"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ইয়াৰ জৰিয়তে আনলক ছেট আপ কৰক:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"মুখাৱয়বৰ দ্বাৰা আনলক"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"আপোনাৰ ফ’নটো আনলক কৰাটো একেবাৰে সহজ কৰক"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ফিংগাৰপ্ৰিণ্ট"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"আপোনাৰ পকেটত ফ’নটো আনলক কৰি সময় ৰাহি কৰক"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"এৰি যাওক"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"পৰৱৰ্তী"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"চেহেৰা যোগ কৰা হ\'ল"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধা ছেটআপ কৰক"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"মুখাৱয়বৰদ্বাৰা আনলক"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"প্ৰমাণীকৰণৰ বাবে নিজৰ চেহেৰা ব্যৱহাৰ কৰক"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"আৰম্ভণি"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"মুখাৱয়বৰদ্বাৰা আনলক কৰা সাধ্য সুবিধাটো অফ কৰা থাকিলে টকবেকত কিছুমান ছেটআপ পদক্ষেপে ভালদৰে কাম নকৰিবও পাৰে।"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"উভতি যাওক"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ছেট আপ কৰাটো অব্যাহত ৰাখক"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"সাধ্য সুবিধা ছেট আপ ব্যৱহাৰ কৰক"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"মুখাৱয়বেৰে আনলক কৰা সুবিধাৰে এপ্‌ খোলোঁতে প্ৰতিবাৰেই নিশ্চিতকৰণৰ প্ৰয়োজন"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"মুখমণ্ডলৰ ডেটা মচক"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধা ছেটআপ কৰক"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"আপোনাৰ ডিভাইচ আনলক কৰিবলৈ, এপত ছাইন ইন কৰিবলৈ আৰু পৰিশোধসমূহ নিশ্চিত কৰিবলৈ মুখাৱয়বৰ দ্বাৰা খোলাৰ সুবিধাটো ব্যৱহাৰ কৰক।\n\nমনত ৰাখিব:\nআপুনি নিবিচাৰিলেও ফ’নটোলৈ চোৱাৰ ফলত সেইটো আনলক হ’ব পাৰে।\n\nঅন্য কোনোবাই আপোনাৰ ফ’নটো আপোনাৰ মুখৰ আগত দাঙি ধৰি আনলক কৰিব পাৰে।\n\nআপোনাৰ ফ’নটো এনে কোনো লোকেও আনলক কৰিব পাৰে যি দেখাত প্ৰায় আপোনাৰ দৰে, যেনে একেই সহোদৰ-সহোদৰা।"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ মুখাৱয়বৰ দ্বাৰা আনলক কৰা সুবিধাটো ব্যৱহাৰ কৰক, এপ্‌সমূহত ছাইন ইন কৰক আৰু পৰিশোধসমূহ নিশ্চিত কৰক।\n\n মনত ৰাখিব:\nআপুনি নিবিচাৰিলেও ফ’নটোলৈ চোৱাৰ ফলত সেইটো আনলক হ’ব পাৰে।\n\nআপোনাৰ দুচকু বন্ধ হৈ থাকিলেও আন কোনোবাই ফ’নটো আপোনাৰ মুখৰ আগত দাঙি ধৰি সেইটো আনলক কৰিব পাৰে।\n\nআপোনাৰ ফ’নটো এনে কোনো লোকেও আনলক কৰিব পাৰে যি দেখাত বহুখিনি আপোনাৰ দৰে, যেনে দেখাত একেই সহোদৰ-সহোদৰা।"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ, এপ্‌সমূহত ছাইন ইন কৰিবলৈ আৰু পৰিশোধ নিশ্চিত কৰিবলৈ আপোনাৰ মুখাৱয়বৰদ্বাৰা আনলক কৰাৰ সুবিধাটো ব্যৱহাৰ কৰক।"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"মনত ৰাখিব:\nআপুনি নিবিচাৰিলেও ফ’নটোলৈ চোৱাৰ ফলত সেইটো আনলক হ’ব পাৰে।\n\nঅন্য কোনোবাই আপোনাৰ ফ’নটো আপোনাৰ মুখৰ আগত দাঙি ধৰি সেইটো আনলক কৰিব পাৰে।\n\nআপোনাৰ ফ’নটো এনে কোনো লোকেও আনলক কৰিব পাৰে যি দেখাত বহুখিনি আপোনাৰ দৰে, যেনে দেখাত একেই সহোদৰ-সহোদৰা।"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"মনত ৰাখিব:\nআপুনি নিবিচাৰিলেও ফ’নটোলৈ চোৱাৰ ফলত সেইটো আনলক হ’ব পাৰে।\n\nআপোনাৰ দুচকু বন্ধ হৈ থাকিলেও আন কোনোবাই ফ’নটো আপোনাৰ মুখৰ আগত দাঙি ধৰি সেইটো আনলক কৰিব পাৰে।\n\nআপোনাৰ ফ’নটো এনে কোনো লোকেও আনলক কৰিব পাৰে যি দেখাত বহুখিনি আপোনাৰ দৰে, যেনে দেখাত একেই সহোদৰ-সহোদৰা।"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"মুখমণ্ডলৰ ডেটা মচিবনে?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"মুখাৱয়বৰ দ্বাৰা আনলক কৰা সুবিধাটোৱে ব্যৱহাৰ কৰা মুখাৱয়ব সম্পৰ্কীয় ডেটা স্থায়ী আৰু সুৰক্ষিতভাৱে মচা হ’ব। আঁতৰোৱাৰ পাছত, আপোনাৰ ফ’নটো আনলক কৰিবলৈ, এপ্‌সমূহত ছাইন ইন কৰিবলৈ আৰু পৰিশোধসমূহ নিশ্চিত কৰিবলৈ আপোনাক নিজৰ পিন, আৰ্হি অথবা পাছৱৰ্ডৰ প্ৰয়োজন হ’ব।"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"আপোনাৰ ফ’নটো আনলক কৰিবলৈ মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধাটো ব্যৱহাৰ কৰক"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"আপোনাৰ ফ\'নটো আনলক কৰিবলৈ বা ক্ৰয়ৰ অনুমোদন জনাবলৈ আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰক৷\n\nটোকা: আপুনি এই ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ ফিংগাৰপ্ৰিণ্ট ব্যৱহাৰ কৰিব নোৱাৰে৷ অধিক তথ্যৰ বাবে, আপোনাৰ প্ৰতিষ্ঠানৰ প্ৰশাসকৰ লগত যোগাযোগ কৰক৷"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"আপোনাৰ ফিংগাৰপ্ৰিণ্টটো ব্যৱহাৰ কৰি আপোনাৰ ফ’নটো আনলক কৰক বা ক্ৰয়ত অনুমোদন দিয়ক।\n\nটোকা: এটা জটিল আৰ্হি বা পিনতকৈ আপোনাৰ ফিংগাৰপ্ৰিণ্টটো কম সুৰক্ষিত হ’ব পাৰে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"বাতিল কৰক"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"নালাগে, ধন্যবাদ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"চলাই ৰাখক"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"এৰি যাওক"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"পৰৱৰ্তী"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"আপোনাৰ টেবলেটটো স্ক্রীণ লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে বা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধাটো ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। উভতি যাবলৈ বাতিল কৰক-ত টিপক।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"আপোনাৰ ডিভাইচটো স্ক্রীণ লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে বা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধাটো ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। উভতি যাবলৈ বাতিল কৰক-ত টিপক।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"আপোনাৰ ফ’নটো স্ক্রীণ লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে বা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। মুখাৱয়বৰদ্বাৰা আনলক কৰা সুবিধাটো ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীণ লক বিকল্পৰো প্ৰয়োজন। উভতি যাবলৈ বাতিল কৰক-ত টিপক।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"আপোনাৰ টেবলেটটো স্ক্ৰীন লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে অথবা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। বায়’মেট্ৰিক্স ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীন লক বিকল্পৰো আৱশ্যক হয়। উভতি যাবলৈ বাতিল কৰকত টিপক।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"আপোনাৰ ডিভাইচটো স্ক্ৰীন লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে অথবা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। বায়’মেট্ৰিক্স ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীন লক বিকল্পৰো আৱশ্যক হয়। উভতি যাবলৈ বাতিল কৰকত টিপক।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"আপোনাৰ ফ’নটো স্ক্ৰীন লক কৰা কোনো বিকল্পেৰে সুৰক্ষিত কৰিলে সেইটো হেৰালে অথবা চুৰি হ’লেও কোনেও ব্যৱহাৰ কৰিব নোৱাৰিব। বায়’মেট্ৰিক্স ছেট আপ কৰিবলৈ আপোনাক এটা স্ক্ৰীন লক বিকল্পৰো আৱশ্যক হয়। উভতি যাবলৈ বাতিল কৰকত টিপক।"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"পিন ছেট আপ নকৰাকৈ এৰি যাবনে?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"পাছৱৰ্ড ছেট আপ এৰি যাব নেকি?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"আৰ্হি ছেট আপ এৰি যাব নেকি?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ডিভাইচৰ সুৰক্ষা সুবিধাসমূহ সক্ৰিয় কৰি আপোনাৰ অনুমতি নোহোৱাকৈ আনে এই টেবলেটটো ব্যৱহাৰ কৰাৰ পৰা বাৰণ কৰক।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ডিভাইচৰ সুৰক্ষা সুবিধাসমূহ সক্ৰিয় কৰি আপোনাৰ অনুমতি নোহোৱাকৈ আনে এই টে\'বলেটটো ব্যৱহাৰ কৰিব নোৱাৰা কৰক। আপুনি ব্যৱহাৰ কৰিব বিচৰা স্ক্ৰীণ লকটো নিৰ্বাচন কৰক৷"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ডিভাইচৰ সুৰক্ষা সুবিধাসমূহ সক্ৰিয় কৰি আপোনাৰ অনুমতি নোহোৱাকৈ আনক এই ফ\'নটো ব্যৱহাৰ কৰাৰ পৰা বাৰণ কৰক৷ আপুনি ব্যৱহাৰ কৰিবলৈ বিচৰা স্ক্ৰীণ লকটো নিৰ্বাচন কৰক৷"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"আপোনাৰ বেকআপ স্ক্ৰীণ লক পদ্ধতি নিৰ্বাচন কৰক"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"আপোনাৰ বেক আপ স্ক্ৰীণ লক পদ্ধতি নিৰ্বাচন কৰক"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"বেকআপ হিচাপে ব্যৱহাৰ কৰিবলৈ আপোনাৰ স্ক্ৰীন লক পদ্ধতিটো বাছনি কৰক"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"স্ক্ৰীণ লক সম্পৰ্কীয় বিকল্প"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"স্ক্ৰীণ লক সম্পৰ্কীয় বিকল্প"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"স্ক্ৰীণ লক"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"মুখাৱয়বৰদ্বাৰা আনলক + পাছৱৰ্ড"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"মুখাৱয়বৰ দ্বাৰা আনলক কৰা সুবিধাটো ব্যৱহাৰ কৰি অব্যাহত ৰাখক"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"আপুনি নিজৰ চেহেৰা ব্যৱহাৰ কৰি আপোনাৰ ফ\'নৰ লক খুলিব পাৰে। সুৰক্ষাৰ বাবে, এই বিকল্পটোক বেক আপ স্ক্ৰীণ লকৰ প্ৰয়োজন।"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"বায়’মেট্ৰিক্স + আৰ্হি"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"বায়’মেট্ৰিক্স + পিন"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"বায়’মেট্ৰিক্স + পাছৱৰ্ড"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"বায়’মেট্ৰিক্সৰ অবিহনে অব্যাহত ৰাখক"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"আপুনি নিজৰ বায়’মেট্ৰিক্স ব্যৱহাৰ কৰি আপোনাৰ ফ’নটো আনলক কৰিব পাৰে। সুৰক্ষাৰ বাবে এই বিকল্পটোক এটা বেকআপ স্ক্ৰীন লকৰ আৱশ্যক হয়।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"প্ৰশাসক, এনক্ৰিপশ্বন নীতি বা ক্ৰেডেনশ্বিয়েল সঞ্চয়াগাৰৰ দ্বাৰা অক্ষম কৰা হৈছে"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"নাই"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ছোৱাইপ কৰক"</string>
@@ -619,7 +640,6 @@
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g>টা সংখ্যাতকৈ কম হ\'বই লাগিব</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ডিভাইচ এডমিনে আপুনি ব্যৱহাৰ কৰা অন্তিমটো পিন আকৌ ব্যৱহাৰ কৰিবলৈ অনুমতি দিয়া নাই"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"আপোনাৰ আইটি প্ৰশাসকে বিশেষত্বহীন পিনবোৰ অৱৰোধ কৰি থৈছে৷ এটা পৃথক পিনেৰে চেষ্টা কৰক৷"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"কেৱল বৈধ বৰ্ণহে দিয়ক"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"কমেও এটা বৰ্ণ থাকিব লাগিব"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"কমেও এটা অংক থাকিব লাগিব"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">অতি কমেও <xliff:g id="COUNT">%d</xliff:g>টা এনেকুৱা বৰ্ণ থাকিবই লাগিব যিটো সংখ্যা নহয়</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ডিভাইচৰ প্ৰশাসকে শেহতীয়া পাছৱৰ্ড ব্যৱহাৰ কৰিব নিদিয়ে"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"আইটি এডমিনে উমৈহতীয়া পাছৱৰ্ডসমূহ অৱৰোধ কৰি থৈছে। এটা পৃথক পাছৱৰ্ডেৰে চেষ্টা কৰক।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"সংখ্যাবোৰৰ ঊৰ্দ্ধগামী, অধোগামী বা পুনৰাবৃত্তি ক্ৰম অনুমোদিত নহয়"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"নিশ্চিত কৰক"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"বাতিল কৰক"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"ৱাই-ফাই"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"বাই-ফাই অন কৰক"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"ৱাই-ফাই"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ৱাই-ফাই ব্যৱহাৰ কৰক"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ৱাই-ফাই ব্যৱহাৰ কৰক"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ৱাই-ফাই ছেটিংসমূহ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"ৱাই-ফাই"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ৱায়াৰলেচ একচেছ পইণ্টসমূহ ছেটআপ আৰু পৰিচালনা কৰক"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>”ৰ সৈতে সংযোগ কৰিবলৈ তলৰ কিউআৰ ক’ডটো কেমেৰা ৱিণ্ড’ৰ মাজত ৰাখক"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"এটা কিউআৰ ক’ড স্কেন কৰি ৱাই-ফাইৰ লগত সংযোগ কৰক"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ৱাই-ফাই শ্বেয়াৰ কৰক"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>”ৰ সৈতে সংযোগ কৰিবলৈ কিউআৰ ক’ডটো স্কেন কৰক আৰু পাছৱৰ্ড শ্বেয়াৰ কৰক"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>”ত যোগদান কৰিবলৈ অন্য এটা ডিভাইচেৰে এই কিউআৰ ক’ডটো স্কেন কৰক"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>”ৰ সৈতে সংযোগ কৰিবলৈ এই কিউআৰ ক’ডটো স্কেন কৰক"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"আকৌ চেষ্টা কৰক। যদি এই সমস্যাটো চলি থাকে তেন্তে ডিভাইচ নিৰ্মাতাৰ সৈতে যোগাযোগ কৰক"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"কিবা সমস্যা হৈছে"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ৱাই-ফাইৰ পাছৱৰ্ড: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"হটস্পটৰ পাছৱৰ্ড: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"স্বয়ং-সংযোগ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ফ\'নটো এই নেটৱর্কটোৰ কাষত থাকিলে স্বয়ংক্ৰিয়ভাৱে সংযোগ হ\'বলৈ অনুমতি দিয়ক"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"টেবলেটটো এই নেটৱর্কটোৰ কাষত থাকিলে স্বয়ংক্ৰিয়ভাৱে সংযোগ হ\'বলৈ অনুমতি দিয়ক"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"পৰিসৰত থাকিলে এই নেটৱর্কলৈ সংযোগৰ অনুমতি দিয়ক"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ডিভাইচ যোগ কৰক"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"এই নেটৱৰ্কটোত কোনো ডিভাইচ যোগ কৰিবলৈ এটা কিউআৰ ক’ড ব্যৱহাৰ কৰক"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"কিউআৰ ক\'ডটো মান্য ফৰ্মেট নহয়"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ছিষ্টেমৰ প্ৰমাণপত্ৰ ব্যৱহাৰ কৰক"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"প্ৰদান নকৰিব"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"মান্য় নকৰিব"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"কোনো প্ৰমাণপত্ৰ নিৰ্দিষ্ট কৰা হোৱা নাই। আপোনাৰ সংযোগ ব্যক্তিগত ৰূপত নাথাকিব।"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"নেটৱৰ্কৰ নাম অতি দীঘল হৈছে৷"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"এটা ড\'মেইন নিৰ্দিষ্ট কৰিবই লাগিব"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"প্ৰমাণপত্ৰৰ প্ৰয়োজন।"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"সংযোগ কৰক"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ৱাই-ফাই অন কৰা হ’ল"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰা হৈছে"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰি থকা হৈছে"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"সংযোগ কৰি থকা হৈছে…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"নেটৱৰ্কৰ সৈতে সংযোগ কৰিব পৰা নগ\'ল"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"নেটৱৰ্ক পৰিসৰত নাই"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ডিভাইচৰ MAC ঠিকনা"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"যাদৃচ্ছিক MAC ঠিকনা"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"যাদৃচ্ছিক MAC ঠিকনা (অন্তিমবাৰ ব্যৱহৃত)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"আইপি ঠিকনা"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"নেটৱৰ্কৰ সবিশেষ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ছাবনেট মাস্ক"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 ঠিকনাবোৰ"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"ছেভ কৰি ৰখা নেটৱৰ্কসমূহ"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"গ্ৰাহকভুক্তি"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"অন্য নেটৱৰ্ক"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"আইপি ছেটিংসমূহ"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"এই ব্যৱহাৰকাৰীৰ বাবে ৱাই-ফাইৰ উচ্চখাপৰ ছেটিংসমূহ উপলব্ধ নহয়"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"ছেভ কৰক"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"এটা মান্য গেইটৱে\' ঠিকনা টাইপ কৰক"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"এটা মান্য ডিএনএছ ঠিকনা লিখক।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"০ আৰু ৩২ ৰ মাজৰ দৈৰ্ঘ্যৰ এটা নেটৱৰ্ক প্ৰিফিক্স টাইপ কৰক।"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"ডিএনএছ ১"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"ডিএনএছ ২"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS ১ (যদিহে ব্যক্তিগত DNSএ অ’ভাৰৰাইড কৰা নাই)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS ২ (যদিহে ব্যক্তিগত DNSএ অ’ভাৰৰাইড কৰা নাই)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"গেইটৱে\'"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"নেটৱৰ্ক প্ৰিফিক্সৰ দীঘ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"ৱাই-ফাই ডাইৰেক্ট"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"এপে সমল শ্বেয়াৰ কৰি আছে৷ ইণ্টাৰনেট সংযোগ শ্বেয়াৰ কৰিবলৈ, হটস্পট অফ কৰি পিছত আকৌ অন কৰক"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"কোনো পাছৱৰ্ড ছেট কৰা হোৱা নাই"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"হটস্পটৰ নাম"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> অন কৰি থকা হৈছে..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> অন কৰি থকা হৈছে…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ৰ সৈতে অইন ডিভাইচে সংযোগ কৰিব পাৰে"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"হটস্পটৰ পাছৱৰ্ড"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"এপি বেণ্ড"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"মসৃণ ডিছপ্লে’"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"কিছুমান সমলৰ বাবে ৰিফ্ৰেশ্বৰ হাৰ স্বয়ংক্ৰিয়ভাৱে ৬০ৰ পৰা ৯০হাৰ্টজলৈ বঢ়ায়। বেটাৰীৰ ব্যৱহাৰ বৃদ্ধি কৰে।"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"মসৃণ ডিছপ্লে’"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"৯০হাৰ্টজ ৰিফ্ৰেশ্বৰ হাৰ বলপূৰ্বকভাৱে প্ৰয়োগ কৰক"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"স্পৰ্শৰ উন্নত সংবেদনশীলতা আৰু এনিমেশ্বনৰ গুণগত মানৰ বাবে সৰ্বোচ্চ ৰিফ্ৰেশ্বৰ হাৰ। বেটাৰীৰ ব্যৱহাৰ বৃদ্ধি কৰে।"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"স্ক্ৰীণৰ সতর্কতা"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"অন / আপুনি যদি চাই থাকে তেন্তে স্ক্ৰীণখন কেতিয়াও বন্ধ নহয়"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"স্ক্ৰীনখন গাঢ় ৰঙৰ হৈ থকা সময়ত, এইটোৱে নতুন জাননীসমূহৰ বাবে অন কৰে"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"সময় আৰু তথ্য সদায় দেখুৱাওক"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"বেটাৰীৰ বৰ্ধিত ব্যৱহাৰ"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"ব’ল্ড কৰা পাঠ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ফণ্টৰ আকাৰ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"পাঠ ডাঙৰ বা সৰু কৰক"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"ছিম কাৰ্ড লক কৰা ছেটিংসমূহ"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android সংস্কৰণ"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android সুৰক্ষা আপডে’ট"</string>
     <string name="model_info" msgid="8997566254717810904">"মডেল"</string>
-    <string name="model_summary" msgid="2246651782442466213">"মডেল: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"মডেল আৰু হাৰ্ডৱেৰ"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"হাৰ্ডৱেৰৰ সংস্কৰণ"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"সঁজুলিৰ ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"এপিএন মচক"</string>
     <string name="menu_new" msgid="6571230342655509006">"নতুন এপিএন"</string>
     <string name="menu_save" msgid="6611465355127483100">"ছেভ কৰক"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"অগ্ৰাহ্য কৰক"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"বাতিল কৰক"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"নামৰ ঠাইখন খালী থাকিব নোৱাৰে"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"এপিএন খালী থাকিব নোৱাৰে।"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"এপ্‌সমূহ ৰিছেট কৰিব পাৰি"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"ৱাই-ফাই, ম’বাইল আৰু ব্লুটুথ ৰিছেট কৰক"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"ইয়ে :\n\n"<li>"ৱাই-ফাই"</li>\n<li>"ম\'বাইল ডেটা"</li>\n<li>"ব্লুটুথ"</li>"কে আদি কৰি সকলো নেটৱৰ্ক ছেটিং ৰিছেট কৰিব"</string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"মচক"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ডাউনল’ড কৰা ছিমবোৰ মচক"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"বিকল্প ছিম ডাউনল’ড কৰিবলৈ আপোনাৰ বাহকৰ সৈতে যোগাযোগ কৰক। ই কোনো ম’বাইল সেৱাৰ আঁচনি বাতিল নকৰে।"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"ই কোনো ম’বাইল সেৱাৰ আঁচনি বাতিল নকৰে। সলনি কৰা ছিম ডাউনল’ড কৰিবলৈ আপোনাৰ বাহকৰ সৈতে যোগাযোগ কৰক।"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"ছেটিংসমূহ ৰিছেট কৰক"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"সকলো নেটৱৰ্কৰ ছেটিংসমূহ ৰিছেট কৰিবনে? আপুনি এই কাৰ্যটো আনডু কৰিব নোৱাৰিব।"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"সকলো নেটৱৰ্ক ছেটিং ৰিছেট কৰিবনে আৰু সকলো ডাউনল’ড কৰা ছিম মচিবনে? আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰিব।"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"নেটৱৰ্ক ছেটিংসমূহ ৰিছেট কৰা হ’ল"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ছিমবোৰ আঁতৰাব পৰা নগ’ল"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ডাউনল’ড কৰা ছিমটো কোনো অজ্ঞাত আঁসোৱাহৰ বাবে মচিব পৰা নগ’ল।\n\nআপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰি আকৌ চেষ্টা কৰক।"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"সকলো ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"সকলো ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ইয়ে \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্ ডেটা আৰু ছেটিং"</li>\n<li>"ডাউনল’ড কৰা এপ্"</li>" আদিকে ধৰি আপোনাৰ টেবলেটটোৰ "<b>"আভ্যন্তৰিক সঞ্চয়াগাৰ"</b>"ত থকা সকলো ডেটা মচিব।"</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ইয়ে \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্ ডেটা আৰু ছেটিং"</li>\n<li>"ডাউনল’ড কৰা এপ্"</li>" আদিকে ধৰি আপোনাৰ ফ’নটোৰ "<b>"আভ্যন্তৰিক সঞ্চয়াগাৰ"</b>"ত থকা সকলো ডেটা মচিব।"</string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"আপুনি বৰ্তমান এই একাউণ্টসমূহত ছাইন ইন হৈ আছে:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"এই ডিভাইচত আৰু ব্যৱহাৰকাৰী আছে।\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"সংগীত"</li>\n<li>"ফট\'"</li>\n<li>"অইন ব্যৱহাৰকাৰীৰ ডেটা"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ই-ছিমবোৰ"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"এইটোৱে আপোনাৰ ম’বাইল সেৱাৰ আঁচনিক বাতিল নকৰে৷"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"সংগীত, চিত্ৰ আৰু অন্যান্য ব্যৱহাৰকাৰীৰ ডেটা নাইকীয়া কৰিবলৈ, "<b>"USB সঞ্চয়াগাৰ"</b>" মচিব লাগিব।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"সংগীত, চিত্ৰ আৰু অন্যান্য ব্যৱহাৰকাৰীৰ ডেটা নাইকীয়া কৰিবলৈ, "<b>"এছডি কাৰ্ড"</b>" মচিব লাগিব৷"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"সকলো ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"সকলো ডেটা মচক (ফেক্টৰী ৰিছেট)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"এই কাৰ্যই \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্‌ ডেটা আৰু ছেটিংসমূহ"</li>\n<li>"ডাউনল’ড কৰা এপ্‌"</li>" আদিকে ধৰি আপোনাৰ টেবলেটটোৰ "<b>"অভ্যন্তৰীণ ষ্ট’ৰেজ"</b>"ত থকা সকলো ডেটা মচিব"</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"এই কাৰ্যই \n\n"<li>"আপোনাৰ Google একাউণ্ট"</li>\n<li>"ছিষ্টেম আৰু এপ্‌ ডেটা আৰু ছেটিংসমূহ"</li>\n<li>"ডাউনল’ড কৰা এপ্‌"</li>" আদিকে ধৰি আপোনাৰ ফ’নটোৰ "<b>"অভ্যন্তৰীণ ষ্ট’ৰেজ"</b>"ত থকা সকলো ডেটা মচিব"</string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"আপুনি বৰ্তমান এই একাউণ্টসমূহত ছাইন ইন হৈ আছে:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"এই ডিভাইচত আৰু ব্যৱহাৰকাৰী আছে।\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"সংগীত"</li>\n<li>"ফট’"</li>\n<li>"অন্য ব্যৱহাৰকাৰীৰ ডেটা"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"ই-ছিমসমূহh"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"এইটোৱে আপোনাৰ ম’বাইল সেৱাৰ আঁচনি বাতিল নকৰে।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"সংগীত, চিত্ৰ আৰু অন্য ব্যৱহাৰকাৰীৰ ডেটা মচিবলৈ, "<b>"USB ষ্ট’ৰেজ"</b>" মচিব লাগিব।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"সংগীত, চিত্ৰ আৰু অন্য ব্যৱহাৰকাৰীৰ ডেটা মচিবলৈ, "<b>"এছডি কাৰ্ডখন"</b>" মচিব লাগিব।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"ইউএছবি সঞ্চয়াগাৰ মচক"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD কাৰ্ড মচক"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"সংগীত, ফট\' আদিকে ধৰি আভ্যন্তৰিণ USB সঞ্চয়াগাৰত থকা সকলো ডেটা মচক"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"সংগীত বা ফট\' আদিকে ধৰি এছডি কাৰ্ডত থকা সকলো ডেটা মচক"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"সকলো ডেটা মচক"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"সকলো ডেটা মচক"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"আপোনাৰ সকলো ব্যক্তিগত তথ্য আৰু ডাউনল’ড কৰা এপ্ মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰিব।"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ডাউনল’ড কৰা এপ্ আৰু ছিমকে ধৰি আপোনাৰ সকলো ব্যক্তিগত তথ্য আৰু ডাউনল’ড কৰা এপ্ মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰিব।"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"সকলোবোৰ মচক"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ৰিছেট কৰা নহ\' ল কাৰণ, ছিষ্টেম পৰিষ্কাৰ সেৱা উপলব্ধ নহয়।"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"সকলো ডেটা মচিবনে?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"এই ব্যৱহাৰকাৰীজনৰ বাবে ফেক্টৰী ৰিছেট উপলব্ধ নহয়"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"মচি থকা হৈছে"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"অনুগ্রহ কৰি অপেক্ষা কৰক..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"সকলো ডেটা মচক"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"সকলো ডেটা মচক"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"আপোনাৰ সকলো ব্যক্তিগত তথ্য আৰু ডাউনল’ড কৰা এপ্‌ মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰে।"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ডাউনল’ড কৰা এপ্‌সমূহ আৰু ছিমকে ধৰি আপোনাৰ সকলো ব্যক্তিগত তথ্য মচা হ’ব। আপুনি এই কাৰ্য আনডু কৰিব নোৱাৰে।"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"সকলো ডেটা মচিবনে?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"এই ব্যৱহাৰকাৰীগৰাকীৰ বাবে ফেক্টৰী ৰিছেট সুবিধাটো উপলব্ধ নহয়"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"মচি থকা হৈছে"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"অনুগ্ৰহ কৰি অপেক্ষা কৰক…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"কল ছেটিংসমূহ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ভইচমেইল, কল ফৰৱাৰ্ডিং, কল অপেক্ষা, কল কৰোঁতাৰ আইডি ছেটআপ কৰক"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"ইউএছবি টেডাৰিং"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>তকৈ অধিক ডিভাইচলৈ টেডাৰিং কৰিব নোৱাৰি।"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>ক টেডাৰ কৰা নহ’ব।"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ইথাৰনেট টে\'ডাৰিং"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ইউএছবি ইথাৰনেটৰ মাধ্যমেৰে ফ\'নটোৰ ইণ্টাৰনেট সংযোগ শ্বেয়াৰ কৰক"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ইথাৰনেটৰ মাধ্যমেৰে ফ’নটোৰ ইণ্টাৰনেট সংযোগ শ্বেয়াৰ কৰক"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"আপোনাৰ ম\'বাইলৰ ডেটা ব্যৱহাৰ কৰি অন্য ডিভাইচবোৰক ইণ্টাৰনেট ব্যৱহাৰ কৰিব দিবলৈ হ\'টস্পট আৰু টেদৰিং সুবিধা ব্যৱহাৰ কৰক। নিকটবৰ্তী ডিভাইচসমূহৰ সৈতে সমল শ্ৱেয়াৰ কৰিবলৈ এপসমূহে হ\'টস্পট ও সৃষ্টি কৰিব পাৰে।"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"আপোনাৰ ৱাই-ফাই অথবা ম’বাইল ডেটাৰ জৰিয়তে অন্য ডিভাইচসমূহক ইণ্টাৰনেট প্ৰদান কৰিবলৈ হটস্পট আৰু টে\'ডাৰিং ব্যৱহাৰ কৰক। নিকটৱৰ্তী ডিভাইচসমূহৰ সৈতে সমল শ্বেয়াৰ কৰিবলৈ এপ্‌সমূহেও এটা হটস্পট সৃষ্টি কৰিব পাৰে।"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"সহায়"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ব্লুটুথ স্কেনিং"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ব্লুটুথ অফ থকা অৱস্থাতও এপ্ আৰু সেৱাসমূহক যিকোনো সময়ত নিকটৱৰ্তী ডিভাইচবোৰ স্কেন কৰিবলৈ দিয়ক। এই কাৰ্যটো, যেনে, অৱস্থান সম্পৰ্কীয় সুবিধা আৰু সেৱাসমূহক উন্নত কৰিবলৈ ব্য়ৱহাৰ কৰিব পাৰি।"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"কৰ্মস্থানৰ বাবে অৱস্থান সেৱা"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণ"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণ"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"বৰ্তমানৰ সময় মণ্ডলটো চিনাক্ত কৰিবলৈ ডিভাইচটোৰ অৱস্থান ব্যৱহাৰ কৰিবলৈ দিয়ে। ৱাই-ফাই স্কেনিঙৰ দৰে অন্য অৱস্থান ছেটিংসমূহে সময় মণ্ডলৰ চিনাক্তকৰণৰ সঠিকতা প্ৰভাৱিত কৰিব পাৰে।"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"অন আছ"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"অফ আছে"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"স্বয়ংক্ৰিয়ভাৱে সময় মণ্ডল চিনাক্ত কৰা সুবিধাটো অক্ষম কৰা আছে"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণৰ সুবিধাটো অক্ষম কৰা হৈছে"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণৰ সুবিধাটো সমৰ্থিত নহয়"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"অৱস্থানৰ সময় মণ্ডল চিনাক্তকৰণৰ সালসলনিৰ অনুমতি দিয়া নহয়"</string>
     <string name="location_network_based" msgid="5247042890080021887">"ৱাই-ফাই আৰু ম’বাইল নেটৱৰ্কৰ স্থান"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"আপোনাৰ অৱস্থান দ্ৰুতভাৱে নিৰ্ণয় কৰিবলৈ এপসমূহক Googleৰ অৱস্থান সেৱা ব্যৱহাৰ কৰিবলৈ দিয়ক। অৱস্থান তথ্য নামবিহীনভাৱে সংগ্ৰহ কৰা হ\'ব আৰু Googleলৈ প্ৰেৰণ কৰা হ\'ব।"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"ৱাই-ফাইএ অৱস্থান নিৰ্ণয় কৰিছে"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"মুখাৱয়বৰদ্বাৰা আনলকৰ বেক আপ ছেট কৰক"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"মুখাৱয়বৰদ্বাৰা কৰা আনলকৰ বেকআপ ছেট কৰক"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"মুখাৱয়বৰদ্বাৰা কৰা আনলকৰ বেকআপ ছেট কৰক"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"বায়’মেট্ৰিক আনলক বেকআপ ছেট কৰক"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"বায়’মেট্ৰিক আনলক বেকআপ ছেট কৰক"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"বায়’মেট্ৰিক আনলক বেকআপ ছেট কৰক"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"আপোনাৰ পাছৱর্ডটো পাহৰিলে নেকি?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"আপোনাৰ আর্হিটো পাহৰিলে নেকি?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"আপোনাৰ পিনটো পাহৰিলে নেকি?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"কেপশ্বনৰ অগ্ৰাধিকাৰসমূহ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"বিবৰ্ধন"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"বিবৰ্ধন কৰা অংশ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"বিবৰ্ধন সক্ষম"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"স্ক্ৰীনখন বিবৰ্ধন কৰোঁতে আপুনি ব্যৱহাৰ কৰিব খোজা বিবৰ্ধন কৰা অংশ(সমূহ) বাছনি কৰক"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"পূৰ্ণ স্ক্ৰীন"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"স্ক্ৰীনৰ কিছু অংশ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"পূৰ্ণ স্ক্ৰীন আৰু স্ক্ৰীনৰ অংশ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"গোটেই স্ক্ৰীনখন বিবৰ্ধন কৰক"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"স্ক্ৰীনৰ কিছু অংশ বিবৰ্ধন কৰক"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"সাধ্য-সুবিধাৰ বুটামলৈ সলনি কৰিবনে?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"স্ক্ৰীনৰ কোনো অংশ বিবৰ্ধন কৰিবলৈ তিনিবাৰ টিপাৰ সুবিধাটো ব্যৱহাৰ কৰিলে টাইপ কৰা আৰু অন্য কাৰ্যসমূহত বিলম্ব হয়।\n\nবিবৰ্ধন কৰিবলৈ আপুনি সাধ্য-সুবিধাৰ বুটাম ব্যৱহাৰ কৰিব বিচাৰেনে?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"সাধ্য-সুবিধাৰ বুটামলৈ সলনি কৰক"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"বিবৰ্ধন কৰিবলৈ তিনিবাৰ টিপাৰ সুবিধাটো ৰাখক"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"বিবৰ্ধন কৰাৰ ছেটিংসমূহ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"তিনিবাৰ টুকুৰিয়াই বিবৰ্ধন কৰক"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"শ্বৰ্টকাটৰ দ্বাৰা বিৱৰ্ধিত কৰক"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"পাৱাৰ বুটাম টিপিলে কল সমাপ্ত হ\'ব"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"মাউছৰ পইণ্টাৰ ডাঙৰ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"এনিমেশ্বন আঁতৰাওক"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ম\'ন\' ধ্বনি"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"অডিঅ\' প্লে কৰাৰ সময়ত চেনেলসমূহ একত্ৰ কৰক"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"অডিঅ\' বেলেঞ্চ"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"বাওঁফাল"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"সোঁফাল"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ম’ন’ অডিঅ’"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"অডিঅ’ প্লে’ কৰাৰ সময়ত চেনেলসমূহ একত্ৰিত কৰক"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"অডিঅ’ বেলেঞ্চ"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"বাওঁ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"সোঁ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ডিফ’ল্ট"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"১০ ছেকেণ্ড"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"৩০ ছেকেণ্ড"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"জাননীৰ কম্পন"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ৰিং কম্পন"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"স্পৰ্শৰ প্ৰতিক্ৰিয়া"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ব্যৱহাৰ কৰক"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> খোলক"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ৰং শুধৰণি ব্যৱহাৰ কৰক"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"কেপশ্বনসমূহ দেখুৱাওক"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"কেৱল সমৰ্থিত এপৰ বাবে"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ব্যৱহাৰ কৰক"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> খোলক"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ৰং শুধৰণী ব্যৱহাৰ কৰক"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"কেপশ্বনসমূহ দেখুৱাওক"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"কেৱল সমৰ্থিত এপৰ বাবে"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"কেপশ্বনৰ আকাৰ আৰু শৈলী"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> আকাৰৰ পাঠ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"অধিক বিকল্প"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ডিউটাৰএন’মেলী"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"প্ৰ’টান’মেলী"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ট্ৰাইটান’মেলী"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"গ্ৰে’স্কে’ল"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ৰঙা-সেউজীয়া"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ৰঙা-সেউজীয়া"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"নীলা-হালধীয়া"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"নেপথ্য়ৰ সীমিতকৰণ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"এই এপটো নেপথ্যত চলিবলৈ অনুমতি দিয়ক"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"নেপথ্যত চলাবৰ বাবে এপক অনুমতি দিয়া হোৱা নাই"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"নেপথ্য়ত হোৱা ব্য়ৱহাৰ সীমিত কৰিব নোৱাৰি"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"পটভূমিত হোৱা ব্যৱহাৰ সীমিত কৰিব নোৱাৰি"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"নেপথ্যৰ কাৰ্যকলাপ সীমিত কৰিবনে?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"আপুনি এটা এপৰ নেপথ্য কাৰ্যকলাপ সীমিত কৰিলে ই অস্বাভাৱিক আচৰণ কৰিব পাৰে"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"যিহেতু এই এপটো বেটাৰি অপ্টিমাইজ কৰিবলৈ ছেট কৰি থোৱা হোৱা নাই, সেয়ে ইয়াক আপুনি সীমিত কৰিব নোৱাৰে।\n\nএপটো সীমিত কৰিবলৈ প্ৰথমে বেটাৰি অপ্টিমাইজেশ্বন অন কৰক।"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"টেবলেট সামান্য অৱস্থাতকৈ বেছি ব্যৱহাৰ কৰা হ’ল"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ডিভাইচ সামান্য অৱস্থাতকৈ বেছি ব্যৱহাৰ কৰা হ’ল"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"বেটাৰি আনদিনাতকৈ আগতেই শেষ হ’ব পাৰে"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"বেটাৰীৰ অৱস্থা অপ্টিমাইজ কৰি থকা হৈছে"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"বেটাৰী সাময়িকভাৱে সীমিত কৰা হৈছে। অধিক জানিবলৈ টিপক।"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"আপোনাৰ ফ’নটো স্বাভাৱিকতকৈ বেছি ব্যৱহাৰ কৰা হৈছে। আপোনাৰ বেটাৰি আশা কৰাতকৈ আগতেই শেষ হ’ব পাৰে।\n\nআটাইতকৈ বেছি বেটাৰি ব্যৱহাৰ কৰা এপ্‌সমূহ:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"আপোনাৰ টেবলেটটো স্বাভাৱিকতকৈ বেছি ব্যৱহাৰ কৰা হৈছে। আপোনাৰ বেটাৰি আশা কৰাতকৈ আগতেই শেষ হ’ব পাৰে।\n\nআটাইতকৈ বেছি বেটাৰি ব্যৱহাৰ কৰা এপ্‌সমূহ:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"আপোনাৰ ডিভাইচটো স্বাভাৱিকতকৈ বেছি ব্যৱহাৰ কৰা হৈছে। আপোনাৰ বেটাৰি আশা কৰাতকৈ আগতেই শেষ হ’ব পাৰে।\n\nআটাইতকৈ বেছি বেটাৰি ব্যৱহাৰ কৰা এপ্‌সমূহ:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">%1$d এপক নিষিদ্ধ কৰা হ’ল</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"আপোনাৰ বেটাৰী মিটাৰ পঢ়োঁতে সমস্যা হৈছে"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"আপোনাৰ বেটাৰী মিটাৰ পঢ়োঁতে সমস্যা হৈছে। "<annotation id="url">"অধিক জানিবলৈ"</annotation>" টিপক"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"এপ্ বন্ধ কৰিবনে?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"আপোনাৰ ফ\'নটোৱে স্বাভাৱিকভাৱে বেটাৰি পৰিচালনা কৰিব নোৱাৰে, কাৰণ <xliff:g id="APP">%1$s</xliff:g>এ আপোনাৰ ফ\'নটোক জাগ্ৰত কৰি ৰাখিছে।\n\nএই সমস্যাটো সমাধান কৰিবলৈ আপুনি এপটোক বন্ধ কৰিব পাৰে।\n\nযদি সেই পদক্ষেপটো লোৱাৰ পিছতো সমস্যাটো চলিয়েই থাকে, তেন্তে আপুনি বেটাৰিৰ খৰচ কম কৰিবলৈ এপটো আনইনষ্টল কৰিবলগীয়া হ\'ব পাৰে।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"আপোনাৰ টে\'বলেটটোৱে স্বাভাৱিকভাৱে বেটাৰি পৰিচালনা কৰিব নোৱাৰে, কাৰণ <xliff:g id="APP">%1$s</xliff:g> এ আপোনাৰ টে\'বলেটটোক জাগ্ৰত কৰি ৰাখিছে।\n\nএই সমস্যাটো সমাধান কৰিবলৈ আপুনি এপটোক বন্ধ কৰিব পাৰে।\n\nযদি সেই পদক্ষেপটো লোৱাৰ পিছতো সমস্যাটো চলিয়েই থাকে তেন্তে আপুনি বেটাৰিৰ খৰচ কম কৰিবলৈ এপটো আনইনষ্টল কৰিবলগীয়া হ\'ব পাৰে।"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"সময়সূচী ছেট কৰক"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"বেটাৰিৰ জীৱনকাল বৃদ্ধি কৰক"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"চাৰ্জ সম্পূৰ্ণ হ’লে বন্ধ কৰক"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"আপোনাৰ ফ’ন <xliff:g id="PERCENT">%1$s</xliff:g> হ’লে বেটাৰি সঞ্চয়কাৰী অফ হয়"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"আপোনাৰ টেবলেটৰ বেটাৰি <xliff:g id="PERCENT">%1$s</xliff:g>ত থাকিলে বেটাৰি সঞ্চয়কাৰী অফ হয়।"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"আপোনাৰ ডিভাইচ <xliff:g id="PERCENT">%1$s</xliff:g> হ’লে বেটাৰি সঞ্চয়কাৰী অফ হয়"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"আপোনাৰ ফ’নটো <xliff:g id="PERCENT">%1$s</xliff:g>তকৈ অধিক চাৰ্জ হ’লে বেটাৰী সঞ্চয়কাৰী অফ হয়"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"আপোনাৰ টেবলেটটো <xliff:g id="PERCENT">%1$s</xliff:g>তকৈ অধিক চাৰ্জ হ’লে বেটাৰী সঞ্চয়কাৰী অফ হয়"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"আপোনাৰ ডিভাইচটো <xliff:g id="PERCENT">%1$s</xliff:g>তকৈ অধিক চাৰ্জ হ’লে বেটাৰী সঞ্চয়কাৰী অফ হয়"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"অন কৰক"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ৰিছেট কৰক"</string>
     <string name="tts_play" msgid="2945513377250757221">"চলাওক"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"ভিপিএন"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"অভিযোজিত সংযোগ"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"আপোনাৰ নেটৱৰ্কৰ সংযোগসমূহ স্বয়ংক্ৰিয়ভাৱে পৰিচালনা কৰি বেটাৰীৰ জীৱনকাল বৃদ্ধি কৰে আৰু ডিভাইচৰ কাৰ্যক্ষমতা উন্নত কৰে"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ক্ৰেডেনশ্বিয়েল সঞ্চয়াগাৰ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"এখন প্ৰমাণপত্ৰ ইনষ্টল কৰক"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"সঞ্চয়াগাৰৰ পৰা প্ৰমাণপত্ৰ ইনষ্টল কৰক"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ব্যৱহাৰকাৰীৰ ক্ৰেডেনশ্বিয়েল"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"সঞ্চয় কৰা প্ৰমাণপত্ৰসমূহ চাওক আৰু সংশোধন কৰক"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"উচ্চখাপৰ ছেটিংসমূহ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"সঞ্চয়াগাৰৰ প্ৰকাৰ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"হাৰ্ডৱেৰ-সমৰ্থিত"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"কেৱল ছফ্‌টৱেৰ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"এই ব্যৱহাৰকাৰীৰ বাবে ক্ৰেডেনশ্বিয়েলসমূহ উপলব্ধ নহয়"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ভিপিএন আৰু এপ্‌সমূহৰ বাবে ইনষ্টল কৰা হৈছে"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ৱাই-ফাইৰ বাবে ইনষ্টল কৰা হৈছে"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"ইনষ্টল নকৰিব"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"যিহ’লেও ইনষ্টল কৰক"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"প্ৰমাণপত্ৰ ইনষ্টল নহ’ল"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g>ক এই ডিভাইচটোত প্ৰমাণপত্ৰসমূহ ইনষ্টল কৰিবলৈ দিবনে?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"এই প্ৰমাণপত্ৰসমূহে তলৰ এপ্‌ আৰু URLসমূহৰ সৈতে আপোনাৰ পৰিচয় কৰাব"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"অনুমতি নিদিব"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"অনুমতি দিয়ক"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"অধিক দেখুৱাওক"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"প্ৰমাণপত্ৰ পৰিচালনা এপ্‌"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"একো নাই"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"এই এপ্‌টোৱে ইনষ্টল কৰা প্ৰমাণপত্ৰই তলৰ এপ্‌ আৰু URLসমূহৰ সৈতে আপোনাৰ পৰিচয় কৰাব"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"আঁতৰাওক"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"জৰুৰীকালীন অৱস্থাত ডায়েল কৰা ছিগনেল"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"জৰুৰীকালীন কল কৰোতে কৰিবলগীয়া আচৰণ ছেট কৰক"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"বেকআপ"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ছেট আপ কৰা হোৱা নাই - কৰ্মস্থানৰ প্ৰ’ফাইল"</string>
     <string name="user_admin" msgid="4024553191395768119">"প্ৰশাসক"</string>
     <string name="user_you" msgid="3070562015202859996">"আপুনি (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"উপনাম"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"আপুনি <xliff:g id="USER_COUNT">%1$d</xliff:g> জন লৈকে ব্যৱহাৰকাৰী যোগ কৰিব পাৰে"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"কেৱল টেবলেটৰ গৰাকীয়ে ব্যৱহাৰকাৰীসকলক পৰিচালনা কৰিব পাৰে।"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"কেৱল ফ\'নটোৰ গৰাকীয়েহে ব্যৱহাৰকাৰীসকলক পৰিচালনা কৰিব পাৰে।"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"টাৰ্মিনেলত ধন পৰিশোধ কৰা"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ধন পৰিশোধ কৰিবলৈ এটা এপ্ ছেট আপ কৰক। তাৰ পিছত পইচা পৰিশোধ কৰিবলৈ যিকোনো স্পৰ্শহীন প্ৰতীক অঁকা থকা টাৰ্মিনেলত ফ\'নটোৰ পিছফালটো ওচৰ চপাই ধৰক।"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"বুজি পালোঁ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"অধিক…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"অধিক…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ডিফ’ল্ট পৰিশোধ এপ্‌ ছেট কৰক"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ডিফ’ল্ট পৰিশোধ এপ্‌ আপডে’ট কৰক"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"এটা স্পৰ্শবিহীন টাৰ্মিনেলত <xliff:g id="APP">%1$s</xliff:g>ৰ জৰিয়তে পৰিশোধ কৰক"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"উভতি যাওক"</string>
     <string name="wizard_next" msgid="3884832431439072471">"পৰৱৰ্তী"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"সমাপ্ত"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"এখন ফট’ তোলক"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"এখন প্ৰতিচ্ছবি বাছনি কৰক"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ফট\' বাছনি কৰক"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ছিম কাৰ্ডসমূহ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ছিম কাৰ্ডবোৰ"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"কল কৰিবলৈ সদায় ইয়াক ব্যৱহাৰ কৰক"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ডেটাৰ বাবে এখন ছিম বাছনি কৰক"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"এছএমএছৰ বাবে এখন ছিম বাছনি কৰক"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ডেটা ছিম সলনি কৰি থকা হৈছে, এই কাম সম্পূৰ্ণ হ\'বলৈ একমিনিটলৈকে সময় লাগিব পাৰে..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ডেটা ছিম সলনি কৰি থকা হৈছে, ইয়াৰ বাবে এক মিনিট পৰ্যন্ত সময় লাগিব পাৰে…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"এই ছিমৰ সহায়ত কল কৰক"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"এখন ছিম কাৰ্ড বাছনি কৰক"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ছিম <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ৰুটিন, সময়সূচী, বেটাৰী সঞ্চয়কাৰী, পাৱাৰ ছেভাৰ, বেটাৰী, স্বয়ংক্ৰিয়, শতাংশ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, উচ্চখাপৰ কলিং, 4g কলিং"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ভাষা যোগ কৰক, এটা ভাষা যোগ কৰক"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ফণ্টৰ আকাৰ"</string>
     <string name="default_sound" msgid="6604374495015245195">"ডিফ\'ল্ট ধ্বনি"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ৰিং আৰু জাননীৰ ভলিউম <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ভলিউম, কম্পন, অসুবিধা নিদিব"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"পাৱাৰ অনৰ ধ্বনিসমূহ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"লাইভ কেপশ্বন"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"স্বয়ংক্ৰিয় কেপশ্বন মিডিয়া"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"একো নাই"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> খন সময়সূচী ছেট কৰা হৈছে</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> খন সময়সূচী ছেট কৰা হৈছে</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{এটাও নাই}=1{1 খন সময়সূচী ছেট কৰা হৈছে}one{# খন সময়সূচী ছেট কৰা হৈছে}other{# খন সময়সূচী ছেট কৰা হৈছে}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"অসুবিধা নিদিব"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"কেৱল গুৰুত্বপূর্ণ লোক আৰু এপ্‌সমূহৰ পৰা জাননী পাওক"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"বাধাবোৰ সীমিত কৰক"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"কেৱল গুৰুত্বপূৰ্ণ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"অন / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"অফ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"অফ হৈ আছে"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"অন হৈ আছে"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"প্ৰতিবাৰতে সোধক"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"আপুনি অফ নকৰা পর্যন্ত"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ঘণ্টা</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ঘণ্টা</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> মিনিট"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টা সময়সূচী স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টা সময়সূচী স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{১ ঘণ্টা}one{# ঘণ্টা}other{# ঘণ্টা}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{১ মিনিট}one{# মিনিট}other{# মিনিট}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{অফ আছে}=1{অফ আছে / ১ খন সময়সূচী স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে}one{অফ আছে / # খন সময়সূচী স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে}other{অফ আছে / # খন সময়সূচী স্বয়ংক্ৰিয়ভাৱে অন হ’ব পাৰে}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"অসুবিধা নিদিব ম’ডটোক কিহে ব্যাঘাত জন্মাব পাৰে"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"লোক"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"এপ্‌সমূহ"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"কম অগ্ৰাধিকাৰপ্ৰপ্ত জাননীসমূহ স্বয়ংক্ৰিয়ভাৱে সাধাৰণলৈ ছেট কৰক"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"অভিযোজিত জাননীৰ ক্ৰম"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"প্ৰাসংগিকতা অনুযায়ী জাননীসমূহ স্বয়ংক্ৰিয়ভাৱে ক্ৰমত সজাওক"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"অভিযোজিত জাননীৰ মতামত"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"জাননীসমূহত ঘটোৱা সালসলনিসমূহ দৰ্শায় আৰু ছিষ্টেমটোক মতামত জনাবলৈ বিকল্পসমূহ দেখুৱায়"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"জাননীৰ গুৰুত্ব ৰিছেট কৰক"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"ব্যৱহাৰকাৰীয়ে সলনি কৰা গুৰুত্বৰ ছেটিং ৰিছেট কৰক আৰু জাননী সহায়কক অগ্ৰাধিকাৰ নিৰ্ধাৰণ কৰিবলৈ অনুমতি দিয়ক"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"পৰামর্শ হিচাপে পোৱা কার্য আৰু প্ৰত্যুত্তৰসমূহ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"পৰামর্শ হিচাপে পোৱা কার্য &amp; প্ৰত্যুত্তৰসমূহ স্বয়ংক্ৰিয়ভাৱে দেখুৱাওক"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"শেহতীয়া আৰু স্নুজ কৰা জাননীসমূহ দেখুৱাওক"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"অগ্ৰাধিকাৰপ্ৰাপ্ত বার্তালাপসমূহ"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"বাৰ্তালাপ শাখাটোৰ একেবাৰে ওপৰত দেখুৱাওক আৰু ওপঙা বাবল হিচাপে প্ৰদর্শন কৰক"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"বাৰ্তালাপ শাখাটোৰ একেবাৰে ওপৰত দেখুৱাওক"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"অন্য বার্তালাপসমূহ"</string>
+    <string name="other_conversations" msgid="551178916855139870">"অগ্ৰাধিকাৰ নথকা বাৰ্তালাপসমূহ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"আপুনি সালসলনি কৰা বার্তালাপসমূহ"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"শেহতীয়া বাৰ্তালাপসমূহ"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"শেহতীয়াসমূহ মচক"</string>
+    <string name="clear" msgid="5092178335409471100">"মচক"</string>
     <string name="important_bubble" msgid="7911698275408390846">"অগ্ৰাধিকাৰপ্ৰাপ্ত বার্তালাপসমূহ বাবল কৰক"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"অগ্ৰাধিকাৰপ্ৰাপ্ত বার্তালাপসমূহ পুল-ডাউন শ্বেডটোৰ একেবাৰে ওপৰত দেখুওৱা হয়। আপুনি সেইবোৰ বাবললৈ ছেট কৰিব পাৰে আৰু অসুবিধা নিদিবত ব্যাঘাত জন্মাব পাৰে।"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"অগ্ৰাধিকাৰপ্ৰাপ্ত আৰু সংশোধন কৰা বার্তালাপসমূহ ইয়াত দেখা যাব"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"অসুবিধা নিদিবত অনুমতি"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"অসুবিধা নিদিব ম’ডক অনুমতি দিয়ক"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ইনষ্টল কৰি থোৱা কোনো এপে অসুবিধা নিদিবত প্ৰৱেশৰ অনুমতি বিচৰা নাই"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"এপ্‌সমূহ ল’ড কৰি থকা হৈছে..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"এপসমূহ ল’ড কৰি থকা হৈছে…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"আপোনাৰ অনুৰোধত, Android-এ এই ডিভাইচটোত এই এপৰ জাননীসমূহ দেখাবলৈ বাধা দি আছে"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"আপোনাৰ অনুৰোধমৰ্মে, Androidএ জাননীসমূহৰ এই শ্ৰেণীটোক এই ডিভাইচটোত দৃশ্যমান হ\'বলৈ দিয়া নাই"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"আপোনাৰ অনুৰোধমৰ্মে, Androidএ জাননীসমূহৰ এই গোটটোক এই ডিভাইচটোত দৃশ্যমান হ\'বলৈ দিয়া নাই"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"সকলো বাৰ্তালাপ"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"অগ্ৰাধিকাৰপ্ৰাপ্ত বার্তালাপসমূহ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"একো নাই"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> টা বাৰ্তালাপ</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> টা বাৰ্তালাপ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"একো নাই"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{এটাও নাই}=1{১ টা বাৰ্তালাপ}one{# টা বাৰ্তালাপ}other{# টা বাৰ্তালাপ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ব্যাঘাত জন্মাব পৰা সকল"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"কল"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"কলসমূহ"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"অনুমতি দিয়া কলসমূহ আহিলে যাতে ধ্বনি বজোৱা হয় তাক নিশ্চিত কৰিবলৈ ডিভাইচটো ৰিং কৰিবলৈ ছেট কৰা আছেনে পৰীক্ষা কৰক"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ৰ বাবে অন্তৰ্গামী কল অৱৰোধ কৰা হৈছে। আপুনি আপোনাৰ বন্ধু, পৰিয়ালৰ লোক বা অইন সম্পৰ্ক ব্যক্তিয়ে আপোনাৰ সৈতে যোগাযোগ কৰিব পৰাকৈ ছেটিং মিলাব পাৰে।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"তৰাযুক্ত সম্পৰ্কসমূহ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> অন্য</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> অন্য</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"একো নাই"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{এটাও নাই}=1{{contact_1}}=2{{contact_1} আৰু {contact_2}}=3{{contact_1}, {contact_2} আৰু {contact_3}}one{{contact_1}, {contact_2} আৰু অন্য # টা}other{{contact_1}, {contact_2} আৰু অন্য # টা}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(কোনো নাম নাই)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"বাৰ্তাসমূহ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ৰ ক্ষেত্ৰত অন্তৰ্গামী বাৰ্তাসমূহ অৱৰোধ কৰা হয়। আপুনি আপোনাৰ বন্ধুবৰ্গ, পৰিয়ালৰ লোক বা অইন সম্পৰ্কসমূহে আপোনাৰ সৈতে যোগাযোগ কৰিব পৰাকৈ ছেটিংসমূহ মিলাব পাৰে।"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"সকলো বাৰ্তাই আপোনাৰ সৈতে সম্পৰ্ক স্থাপন কৰিব পাৰে"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"সকলো কলে আপোনাৰ সৈতে সম্পৰ্ক স্থাপন কৰিব পাৰে"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"একো নাই"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> টা সম্পৰ্ক</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> টা সম্পৰ্ক</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{এটাও নাই}=1{১ টা সম্পৰ্ক}one{# টা সম্পর্ক}other{# টা সম্পর্ক}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"যিকোনো লোক"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"সম্পর্কসমূহ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"তৰাযুক্ত সম্পৰ্কসমূহ"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"সকলো জাননী"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"কিছুমান জাননী"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"আপুনি এপ্‌সমূহক ব্যাঘাত জন্মাবলৈ নিদিলেও বাছনি কৰা লোকসকলে তথাপি আপোনাৰ সৈতে যোগাযোগ কৰিব পাৰে"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g>এ ব্যাঘাত জন্মাব পাৰে</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g>এ ব্যাঘাত জন্মাব পাৰে</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> টা অধিক"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{কোনো এপে ব্যাঘাত জন্মাব নোৱাৰে}=1{{app_1}এ ব্যাঘাত জন্মাব পাৰে}=2{{app_1} আৰু {app_2}এ ব্যাঘাত জন্মাব পাৰে}=3{{app_1}, {app_2} আৰু {app_3} এ ব্যাঘাত জন্মাব পাৰে}one{{app_1}, {app_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}other{{app_1}, {app_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"এপ্‌সমূহ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"সকলো জাননী"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"কিছুমান জাননী"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ব্যাঘাত জন্মাব পৰা জাননীসমূহ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"সকলো জাননীক অনুমতি দিয়ক"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>এ ব্যাঘাত জন্মাব পাৰে</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>এ ব্যাঘাত জন্মাব পাৰে</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"একোৱেই ব্যাঘাত জন্মাব নোৱাৰে"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> টা অধিক"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{একোৱেই ব্যাঘাত জন্মাব নোৱাৰে}=1{{sound_category_1}এ ব্যাঘাত জন্মাব পাৰে}=2{{sound_category_1} আৰু {sound_category_2}এ ব্যাঘাত জন্মাব পাৰে}=3{{sound_category_1}, {sound_category_2} আৰু {sound_category_3}এ ব্যাঘাত জন্মাব পাৰে}one{{sound_category_1}, {sound_category_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}other{{sound_category_1}, {sound_category_2} আৰু # টাই ব্যাঘাত জন্মাব পাৰে}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"একোৱেই ব্যাঘাত জন্মাব নোৱাৰে"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"কোনো মানুহেই ব্যাঘাত জন্মাব নোৱাৰে"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"কিছুমান মানুহে ব্যাঘাত জন্মাব পাৰে"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"সকলো মানুহে ব্যাঘাত জন্মাব পাৰে"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"অন কৰক"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"অফ কৰক"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"এপ্ পিন কৰা"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"এপ্ পিন কৰা সুবিধাটোৱে আপোনাক আপুনি বর্তমানৰ এপ্‌টো আনপিন নকৰা পর্যন্ত সেইটোক দেখা পোৱা কৰি ৰাখিবলৈ দিয়ে। এই সুবিধাটো ব্যৱহাৰ কৰিব পৰা যায়, যেনে, কোনো বিশ্বাসী বন্ধুক এটা নির্দিষ্ট গে\'ম খেলিবলৈ দিবলৈ। \n\nকোনো এটা এপ্ পিন কৰি ৰখাৰ সময়ত, পিন কৰি ৰখা এপ্‌টোৱে হয়তো অন্য এপ্‌সমূহ খুলিব পাৰে আৰু ব্যক্তিগত ডেটা এক্সেছ কৰিব পাৰে। \n\nএপ্ পিন কৰা সুবিধাটো ব্যৱহাৰ কৰিবলৈ: 	\n১)	এপ্ পিন কৰা সুবিধাটো অন কৰক 	\n২)	অৱলোকন খোলক 	\n৩)	স্ক্ৰীনখনৰ একেবাৰে ওপৰত থকা এপ্ চিহ্নটোত টিপক, তাৰ পাছত পিন কৰকত টিপক"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"এপ্ পিন কৰা সুবিধাটোৱে আপোনাক আপুনি বর্তমানৰ এপ্‌টো আনপিন নকৰা পর্যন্ত সেইটোক দেখা পোৱা কৰি ৰাখিবলৈ দিয়ে। কোনো বিশ্বাসী বন্ধুক এটা নির্দিষ্ট গে’ম খেলিবলৈ দিয়াৰ দৰে কাৰ্যৰ বাবে এই সুবিধাটো ব্যৱহাৰ কৰিব পাৰি। \n\nকোনো এটা এপ্‌ পিন কৰি ৰখাৰ সময়ত, পিন কৰি ৰখা এপ্‌টোৱে হয়তো অন্য এপ্‌সমূহ খুলিব পাৰে আৰু ব্যক্তিগত ডেটা এক্সেছ কৰিব পাৰে। \n\nযদি আপুনি নিজৰ ডিভাইচটো কাৰোবাৰ সৈতে সুৰক্ষিতভাৱে শ্বেয়াৰ কৰিব খোজে, তেন্তে ইয়াৰ পৰিৱৰ্তে এটা অতিথি প্ৰ’ফাইল ব্যৱহাৰ কৰি চাওক। \n\nএপ্‌ পিন কৰা সুবিধাটো ব্যৱহাৰ কৰিবলৈ: 	\n১)	এপ্‌ পিন কৰা সুবিধাটো অন কৰক 	\n২)	ৰূপৰেখা খোলক 	\n৩)	স্ক্ৰীনখনৰ একেবাৰে ওপৰত থকা এপ্‌ চিহ্নটোত টিপক, তাৰ পাছত পিন কৰকত টিপক"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"এপ্‌ পিন কৰা সুবিধাটোৱে আপোনাক আপুনি বৰ্তমানৰ এপ্‌টো আনপিন নকৰা পৰ্যন্ত সেইটোক দেখা পোৱা কৰি ৰাখিবলৈ দিয়ে। কোনো বিশ্বাসী বন্ধুক এটা নিৰ্দিষ্ট গে’ম খেলিবলৈ দিয়াৰ দৰে কাৰ্যৰ বাবে এই সুবিধাটো ব্যৱহাৰ কৰিব পাৰি।"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"কোনো এটা এপ্‌ পিন কৰি ৰখাৰ সময়ত, পিন কৰি ৰখা এপ্‌টোৱে হয়তো অন্য এপ্‌সমূহ খুলিব পাৰে আৰু ব্যক্তিগত ডেটা এক্সেছ কৰিব পাৰে। \n\nএপ্‌ পিন কৰা সুবিধাটো ব্যৱহাৰ কৰিবলৈ: 	\n১)	এপ্‌ পিন কৰা সুবিধাটো অন কৰক 	\n২)	ৰূপৰেখা খোলক 	\n৩)	স্ক্ৰীনখনৰ একেবাৰে ওপৰত থকা এপৰ চিহ্নটোত টিপক, তাৰ পাছত পিন কৰকত টিপক"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"কোনো এটা এপ্‌ পিন কৰি ৰখাৰ সময়ত, পিন কৰি ৰখা এপ্‌টোৱে হয়তো অন্য এপ্‌সমূহ খুলিব পাৰে আৰু ব্যক্তিগত ডেটা এক্সেছ কৰিব পাৰে। \n\nযদি আপুনি নিজৰ ডিভাইচটো কাৰোবাৰ সৈতে সুৰক্ষিতভাৱে শ্বেয়াৰ কৰিব বিচাৰে, তেন্তে ইয়াৰ পৰিৱৰ্তে এটা অতিথি প্ৰ’ফাইল ব্যৱহাৰ কৰি চাওক। \n\nএপ্‌ পিন কৰা সুবিধাটো ব্যৱহাৰ কৰিবলৈ: 	\n১)	এপ্‌ পিন কৰা সুবিধাটো অন কৰক 	\n২)	ৰূপৰেখা খোলক 	\n৩)	স্ক্ৰীনখনৰ একেবাৰে ওপৰত থকা এপৰ চিহ্নটোত টিপক, তাৰ পাছত পিন কৰকত টিপক"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"কোনো এটা এপ্ পিন কৰি ৰখাৰ সময়ত: \n\n•		ব্যক্তিগত ডেটা এক্সেছ কৰিব পৰা যাব পাৰে \n		(যেনে সম্পর্কসমূহ আৰু ইমেইলৰ সমল) \n•	 পিন কৰি ৰখা এপ্‌টোৱে হয়তো অন্য এপ্‌সমূহ খুলিব পাৰে \n\nআপুনি বিশ্বাস কৰা লোকসকলৰ সৈতেহে এপ্ পিন কৰা সুবিধাটো ব্যৱহাৰ কৰক।"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"আনপিন কৰাৰ পূৰ্বে আনলক আৰ্হি দিবলৈ কওক"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"আনপিন কৰোতে পাছৱৰ্ড বিচাৰক"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ চেহেৰা ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক পিন দিলেহে ষ্টাৰ্ট আপ হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা বা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধায়ে ডিভাইচ হেৰালে বা চুৰি হ\'লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচ ষ্টাৰ্ট হোৱাৰ সময়ত পিন দিয়াটো দৰকাৰী কৰেনে?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ চেহেৰা ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক আৰ্হি দিলেহে ষ্টাৰ্ট আপ হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা বা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধায়ে ডিভাইচ হেৰালে বা চুৰি হ\'লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচ ষ্টাৰ্ট হোৱাৰ সময়ত আৰ্হি দিয়াটো দৰকাৰী কৰেনে?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ চেহেৰা ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক পাছৱৰ্ড দিলেহে ষ্টাৰ্ট আপ হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা বা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধায়ে ডিভাইচ হেৰালে বা চুৰি হ\'লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচ ষ্টাৰ্ট হোৱাৰ সময়ত পাছৱৰ্ড দিয়াটো দৰকাৰী কৰেনে?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ বায়’মেট্ৰিক্স ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক পিন দিলেহে ষ্টাৰ্ট হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা অথবা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধাটোৱে ডিভাইচটো হেৰালে অথবা চুৰি হ’লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচটো ষ্টাৰ্ট হ’বলৈ পিন দিয়াটো দৰকাৰী কৰিবনে?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ বায়’মেট্ৰিক্স ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক আৰ্হি দিলেহে ষ্টাৰ্ট হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা অথবা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধাটোৱে ডিভাইচটো হেৰালে অথবা চুৰি হ’লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচটো ষ্টাৰ্ট হ’বলৈ আৰ্হি দিয়াটো দৰকাৰী কৰিবনে?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"আপোনাৰ ডিভাইচটো আনলক কৰিবলৈ আপোনাৰ বায়’মেট্ৰিক্স ব্যৱহাৰ কৰাৰ উপৰি, আপুনি ডিভাইচটো আৰু অধিক সুৰক্ষিত কৰিবলৈ ইয়াক পাছৱৰ্ড দিলেহে ষ্টাৰ্ট হোৱা কৰিব পাৰে। ডিভাইচটো ষ্টাৰ্ট হোৱাৰ আগতে ই এলাৰ্মৰ লগতে কল, বাৰ্তা অথবা জাননী আদি লাভ কৰিব নোৱাৰিব।\n\nএই সুবিধাটোৱে ডিভাইচটো হেৰালে অথবা চুৰি হ’লে ডেটা সুৰক্ষিত কৰাত সহায় কৰে। আপোনাৰ ডিভাইচটো ষ্টাৰ্ট হ’বলৈ পাছৱৰ্ড দিয়াটো দৰকাৰী কৰিবনে?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"হয়"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"নহয়"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"সীমিত"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"নিম্ন বস্তুয়ে ইউএছবিক নিয়ন্ত্ৰিত কৰে"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"সংযোগ হৈ থকা ডিভাইচ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"এইটো ডিভাইচ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"সলনি কৰি থকা হৈছে..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"সলনি কৰি থকা হৈছে…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"সলনি কৰিব পৰা নগ\'ল"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ডিভাইচটো চ্চাৰ্জ কৰা হৈছে"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"সংযুক্ত ডিভাইচ চ্চাৰ্জ কৰিৰ বাবে"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"ম’বাইল ডেটাৰ ব্যৱহাৰ"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"এপে ব্যৱহাৰ কৰা ডেটা"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"ৱাই-ফাই ডেটাৰ ব্যৱহাৰ"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"বাহক বহিৰ্ভূত ডেটাৰ ব্যৱহাৰ"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ইথাৰনেট ডেটাৰ ব্যৱহাৰ"</string>
     <string name="wifi" msgid="2932584495223243842">"ৱাই-ফাই"</string>
     <string name="ethernet" msgid="4665162609974492983">"ইথাৰনেট"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>টা সীমাবদ্ধতা</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"বাহকৰ ডেটা গণনা কাৰ্য ডিভাইচৰ গণনাতকৈ পৃথক হ’ব পাৰে"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"বাহকৰ নেটৱৰ্কসমূহে ব্যৱহাৰ কৰা ডেটা বহিৰ্ভূত কৰে"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> খৰচ কৰা হৈছে"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ডেটা ব্যৱহাৰৰ সকীয়নি ছেট কৰক"</string>
     <string name="data_warning" msgid="2925054658166062884">"ডেটা সকিয়নী"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"সবিশেষ চাওক"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ডেটা সঞ্চয়কাৰী"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"অপৰিমিত ডেটা"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"নেপথ্যৰ ডেটা অফ কৰা হৈছে"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"পটভুমিৰ ডেটা অফ কৰা হৈছে"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"অন হৈ আছে"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"অফ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ডেটা সঞ্চয়কাৰী ব্যৱহাৰ কৰক"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ডিভাইচটো লক হৈ থাকোতে, টাইপিং উত্তৰ বা অইন পাঠ জাননীসমূহ নেদেখুৱাব"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ডিফ\'ল্ট বানান পৰীক্ষক"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"বানান পৰীক্ষক বাছনি কৰক"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"বানান পৰীক্ষক ব্য়ৱহাৰ কৰক"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"বানান পৰীক্ষক ব্যৱহাৰ কৰক"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"বাছনি কৰা হোৱা নাই"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"পোৱা নগ\'ল"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"সঞ্চয়াগাৰত ঠাই খালী কৰিবৰ কাৰণে সহায় কৰিবলৈ সঞ্চয়াগাৰ মেনেজাৰে আপোনাৰ ডিভাইচৰ পৰা বেকআপ কৰা ফট\' আৰু ভিডিঅ\'বোৰ আঁতৰাই দিয়ে।"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ফট\' আৰু ভিডিঅ\'সমূহ আঁতৰাওক"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"সঞ্চয়াগাৰ পৰিচালক"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"সঞ্চয়াগাৰ পৰিচালক ব্যৱহাৰ কৰক"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ষ্ট’ৰেজ পৰিচালক ব্যৱহাৰ কৰক"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"স্বয়ংক্ৰিয়"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"হস্তকৃত"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"এতিয়া খালী স্থান উলিয়াওক"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ফ\'ন চাবলৈ দুবাৰ টুকুৰিয়াওক"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"টেবলেটো চাবলৈ দুবাৰ টুকুৰিয়াওক"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ডিভাইচ চাবলৈ দুবাৰ টুকুৰিয়াওক"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"জাননীবোৰৰ বাবে ছোৱাইপ কৰক"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"আপোনাৰ জাননীসমূহ দেখুৱাবলৈ স্ক্ৰীনখনৰ তলৰ কাষটোত তললৈ ছোৱাইপ কৰক"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"এখন হাতেৰে ব্যৱহাৰ কৰা ম’ড"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"এখন হাতেৰে ব্যৱহাৰ কৰা ম’ড ব্যৱহাৰ কৰক"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"এটা এপৰ পৰা অন্য এটা এপলৈ যাওঁতে বাহিৰ হওক"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"সময় উকলিছে"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"৪ ছেকেণ্ড"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"৮ ছেকেণ্ড"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"১২ ছেকেণ্ড"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ঢুকি পাব পৰা অৱস্থা"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"সময়, জাননী আৰু অন্য তথ্য চাবলৈ আপোনাৰ স্ক্ৰীণত দুবাৰ টিপক।"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ফ’ন চাবলৈ তোলক"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"টে\'বলেট চাবলৈ ওপৰলৈ উঠাওক"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"টেবলেটটো পৰীক্ষা কৰিবলৈ টিপক"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ডিভাইচটো পৰীক্ষা কৰিবলৈ টিপক"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"সময়, জাননী আৰু অন্য তথ্য চাবলৈ আপোনাৰ স্ক্ৰীণত টিপক।"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"জৰুৰীকালীন SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"জৰুৰীকালীন SOS ব্যৱহাৰ কৰক"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g>এ পৰিচালনা কৰা"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"পাৱাৰ বুটামটো ক্ষিপ্ৰতাৰে ৫ অথবা তাতকৈ অধিক বাৰ টিপি তলত দিয়া কাৰ্যবিলাক আৰম্ভ কৰক"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"কাউণ্টডাউন এলাৰ্ম প্লে’ কৰক"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"সহায়ৰ বাবে জাননী পঠিওৱাৰ আগতে এটা তীব্ৰ ধ্বনি প্লে’ কৰক"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"সহায়ৰ বাবে কল কৰক"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"সহায়ৰ বাবে কল কৰিবলৈ নম্বৰ"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>। সলনি কৰিবলৈ টিপক"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"যদি আপুনি এটা অ-জৰুৰীকালীন নম্বৰ দিয়ে:\n • জৰুৰীকালীন SOS ব্যৱহাৰ কৰিবলৈ আপোনাৰ ডিভাইচটো আনলক হৈ থাকিবই লাগিব\n • আপোনাৰ কলৰ উত্তৰ দিয়া নহ’ব পাৰে"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"জাননীৰ বাবে ফিংগাৰপ্ৰিণ্ট ছোৱাইপ কৰক"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ফিংগাৰপ্ৰিণ্ট ছোৱাইপ কৰক"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"জাননীবিলাক চাবলৈ আপোনাৰ ফ\'নটোৰ পিছফালে থকা ফিংগাৰপ্ৰিণ্ট ছেন্সৰত ওপৰৰ পৰা তললৈ আঙুলি বুলাওক।"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"দেখিব পৰা অধিকতম ডেটাছেট"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ডিফ’ল্ট মানলৈ ৰিছেট কৰক"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"বিকাশকৰ্তাৰ স্বয়ংপূৰ্তি হোৱা বিকল্পসমূহ ৰিছেট কৰা হৈছে"</string>
+    <string name="location_category" msgid="3496759112306219062">"অৱস্থান"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"স্থিতি দণ্ডত অৱস্থানৰ সূচক"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"নেটৱৰ্ক আৰু সংযোগকে ধৰি আটাইবোৰ অৱস্থানৰ বাবে দেখুৱাওক"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"সম্পূৰ্ণ জিএনএছএছ পৰিমাপ প্ৰয়োগ কৰক"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"কোনো উপযোগীতা অনুপাতৰ সহায় নোলোৱাকৈ GNSS কনষ্টেলেশ্বন আৰু ফ্ৰিকুৱেন্সী নিৰীক্ষণ কৰক"</string>
     <string name="device_theme" msgid="5027604586494772471">"ডিভাইচৰ থিম"</string>
     <string name="default_theme" msgid="4815428567082263639">"ডিফ\'ল্ট"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"নেটৱৰ্কৰ নাম"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"মনোযোগ বৰ্তাই ৰাখিবলৈ জাননী বন্ধ কৰক"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"সুবিধাসমূহ উপলব্ধ নহয়"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"এই সুবিধাটোৱে আপোনাৰ ফ\'নটোৰ কার্যকলাপ লেহেমীয়া কৰে বাবে ইয়াক অফ কৰা হৈছে"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"সম্পূৰ্ণ জিএনএছএছ পৰিমাপ প্ৰয়োগ কৰক"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"কোনো উপযোগীতা অনুপাতৰ সহায় নোলোৱাকৈ GNSS কনষ্টেলেশ্বন আৰু ফ্ৰিকুৱেন্সী নিৰীক্ষণ কৰক"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"সদায় ক্ৰেশ্ব ডায়ল\'গ দেখুৱাওক"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"কোনো এপ্ ক্ৰেশ্ব হ\'লে প্ৰতিবাৰতে ডায়ল\'গ দেখুৱাওক"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE সক্ষম কৰি ৰখা এপ্লিকেশ্বন বাছনি কৰক"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"সকলো এপৰ বাবে সক্ষম কৰক"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"গ্ৰাফিক্স ড্ৰাইভাৰ বাছনি কৰক"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ডিফ’ল্ট"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"গে’ম ড্ৰাইভাৰ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"গে’ম ড্ৰাইভাৰ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"বিকাশকৰ্তাৰ ড্ৰাইভাৰ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ছিষ্টেম গ্ৰাফিক্স ড্ৰাইভাৰ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"অন আছে (মিউট)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"অফ আছে"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"নেটৱৰ্কৰ সবিশেষ"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"আপোনাৰ ডিভাইচটোৰ নাম আপোনাৰ ফ\'নটোত থকা এপসমূহৰ বাবে দৃশ্যমান। আপুনি ব্লুটুথ ডিভাইচৰ সৈতে সংযোগ কৰোঁতে বা ৱাই-ফাই হটস্পট  ছেট আপ কৰোঁতেও নামটো অইনে দেখা পাব পাৰে।"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"আপোনাৰ ডিভাইচটোৰ নাম আপোনাৰ ফ’নটোত থকা এপ্‌সমূহৰ বাবে দৃশ্যমান। আপুনি ব্লুটুথ ডিভাইচৰ সৈতে সংযোগ কৰোঁতে, ৱাই-ফাই নেটৱৰ্কৰ সৈতে সংযোগ কৰোঁতে অথবা ৱাই-ফাই হটস্পট ছেট আপ কৰোঁতেও এইটো অন্য লোকে দেখা পাব পাৰে।"</string>
     <string name="devices_title" msgid="649715719278562515">"ডিভাইচসমূহ"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"সকলো ছেটিং"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"পৰামৰ্শ"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"নেটৱৰ্ক বিচাৰি পোৱা নগ\'ল। আকৌ চেষ্টা কৰক।"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(নিষিদ্ধ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"কোনো ছিম কাৰ্ড নাই"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ছিম"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ছিম নাই"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ছিমৰ একো তথ্য নাই"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"সংযোগ কৰিবলৈ ছিমৰ প্ৰয়োজন"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"সংযোগ কৰিবলৈ <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>ৰ ছিমৰ প্ৰয়োজন"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: WCDMA অগ্ৰাধিকাৰপ্ৰাপ্ত"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: GSM মাত্ৰ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"অগ্ৰাধিকাৰ দিয়া নেটৱৰ্কৰ ম\'ড: WCDMA মাত্ৰ"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ম’বাইল ডেটা"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ম’বাইল নেটৱৰ্ক ব্যৱহাৰ কৰি ডেটা এক্সেছ কৰক"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ফ’নটো পৰিসৰলৈ আহিলে স্বয়ংক্ৰিয়ভাৱে এইটো বাহকৰ সৈতে সংযোগ হ’ব"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"কোনো ছিম কাৰ্ড উপলব্ধ নহয়"</string>
     <string name="calls_preference" msgid="2166481296066890129">"কল সম্পৰ্কীয় অগ্ৰাধিকাৰ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"এছএমএছ সম্পৰ্কীয় অগ্ৰাধিকাৰ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"প্ৰতিবাৰতে সোধক"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>ৰ সৈতে সংযোগ কৰিলে উপলব্ধ নহয়"</string>
     <string name="see_more" msgid="7499355691042812723">"অধিক চাওক"</string>
     <string name="see_less" msgid="2642392725363552793">"কমকৈ চাওক"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> অন কৰিবনে?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ছিম অন কৰিবনে?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰিবনে?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ছিম কাৰ্ড ব্যৱহাৰলৈ সলনি কৰিবনে?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"এবাৰত কেৱল এখন ছিমহে সক্ৰিয় হৈ থাকিব পাৰে। \n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰিলে আপোনাৰ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> সেৱা বাতিল নহয়।"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"এটা সময়ত ডাউনল’ড কৰা এখন ছিমহে সক্ৰিয় কৰিব পাৰি। \n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰিলে আপোনাৰ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> সেৱা বাতিল নহয়।"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"এবাৰত কেৱল এখন ছিমহে সক্ৰিয় হৈ থাকিব পাৰে। \n\nসলনি কৰিলে আপোনাৰ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> সেৱা বাতিল নহয়।"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰক"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"নেটৱৰ্কৰ সৈতে সংযোগ কৰি থকা হৈছে…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>লৈ সলনি কৰি থকা হৈছে"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"বাহক সলনি কৰিব নোৱাৰি"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"কিবা এটা আসোঁৱাহ থকাৰ কাৰণে বাহক সলনি কৰিব নোৱাৰি।"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> অফ কৰিবনে?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ছিম অফ কৰিবনে?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ছিম অফ কৰি থকা হৈছে<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"বাহকক অক্ষম কৰিব নোৱাৰি"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"কিবা ভুল হ’ল আৰু সেয়ে আপোনাৰ বাহকক অক্ষম কৰিব পৰা নগ’ল।"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"২ খন ছিম ব্যৱহাৰ কৰিবনে?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"এই ডিভাইচটোত এবাৰত ২ খন ছিম সক্ৰিয় হৈ থাকিব পাৰে। এবাৰত ১ খন ছিম ব্যৱহাৰ কৰাটো অব্যাহত ৰাখিবলৈ \"নালাগে ধন্যবাদ\"ত টিপক।"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ডিভাইচটো ৰিষ্টাৰ্ট কৰিবনে?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"আৰম্ভ কৰিবলৈ আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক। তাৰ পাছত আপুনি অন্য এখন ছিম যোগ কৰিব পাৰে।"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"অব্যাহত ৰাখক"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ৰিষ্টাৰ্ট কৰক"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"নালাগে, ধন্যবাদ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"সলনি কৰক"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ছিমখন সক্ৰিয় কৰিব নোৱাৰি"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ছিমখন আঁতৰাওক আৰু পুনৰ ভৰাওক। সমস্যাটো অব্যাহত থাকিলে আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক।"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ছিমখন পুনৰ অন কৰিবলৈ চেষ্টা কৰক। সমস্যাটো অব্যাহত থাকিলে আপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰক।"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"নেটৱৰ্ক সক্ৰিয়কৰণ"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> সক্ৰিয় হৈ আছে"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ছিমৰ ছেটিং আপডে’ট কৰিবলৈ টিপক"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"ছিম কাৰ্ড"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"এই ডাউনল’ড কৰা ছিমখন মচিবনে?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"এই ছিমখন আঁতৰালে এই ডিভাইচটোৰ পৰা <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> সেৱা আঁতৰোৱা হ’ব।\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>ৰ সেৱা বাতিল কৰা নহয়।"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"মচক"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"ছিম মচি থকা হৈছে…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"ছিম মচিব নোৱাৰি"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"এই ছিমখন কোনো অজ্ঞাত আসোঁৱাহৰ বাবে আঁতৰাব নোৱাৰি।\n\nআপোনাৰ ডিভাইচটো ৰিষ্টাৰ্ট কৰি আকৌ চেষ্টা কৰক।"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ডিভাইচৰ সৈতে সংযোগ কৰক"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> এপ্‌টোৱে আপোনাৰ ডিভাইচটোৰ সৈতে সংযোগ কৰিবলৈ এটা অস্থায়ী ৱাই-ফাই নেটৱৰ্ক ব্যৱহাৰ কৰিব বিচাৰিছে"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"কোনো ডিভাইচ বিচাৰি পোৱা নগ’ল। ডিভাইচ যাতে অন হৈ থাকে আৰু সংযোগ কৰিব পৰাকৈ উপলব্ধ থাকে সেইয়া নিশ্চিত কৰক।"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"জৰুৰীকালীন কল"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"আপোনাৰ বাহকত ৱাই-ফাই কলিং ব্যৱহাৰ কৰি জৰুৰীকালীন কল কৰাৰ সুবিধা নাই।\nজৰুৰীকালীন কল কৰিবলৈ ডিভাইচটোৱে স্বয়ংক্ৰিয়ভাৱে চেলুলাৰ নেটৱৰ্কলৈ সলনি কৰে।\nকেৱল চেলুলাৰ নেটৱৰ্ক থকা ঠাইৰ পৰাহে জৰুৰীকালীন কল কৰিব পৰা যায়।"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"মান উন্নত কৰিবলৈ কল কৰোঁতে ৱাই-ফাই ব্যৱহাৰ কৰক"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"ক্ৰছ-ছিম কলিং"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"এইখন ছিমৰ জৰিয়তে অন্য ছিমৰ পৰা কল কৰাৰ আৰু এছএমএছ পঠিওৱাৰ অনুমতি দিয়ক।"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"ক্ৰছ-ছিম কলিং"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"অন্তৰ্গামী এমএমএছ বার্তা"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"এমএমএছ বার্তা পঠিয়াব নোৱাৰি"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"ম’বাইল ডেটা অফ হৈ থকাৰ সময়তো <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>ত এমএমএছ বার্তা পঠিওৱাৰ অনুমতি দিবলৈ টিপক"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"ছেটিংসমূহত স্ক্ৰীন অ’ভাৰলে’ৰ অনুমতি দিয়ে"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"এনে এপ্‌সমূহক অনুমতি দিয়ে যি ছেটিংসমূহৰ স্ক্ৰীনসমূহ অ’ভাৰলে’ কৰিবলৈ অন্য এপ্‌সমূহৰ ওপৰত প্ৰদৰ্শিত হ’ব পাৰে"</string>
     <string name="media_controls_title" msgid="403271085636252597">"মিডিয়া"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"মিডিয়া ছেশ্বনটো সমাপ্ত হ’লে প্লে’য়াৰটো লুকুৱাওক"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"প্লে’য়াৰটোৱে আপোনাক বিস্তাৰ কৰা ক্ষিপ্ৰ ছেটিংসমূহৰ পেনেলটোৰ পৰা কোনো ছেশ্বন পুনৰ আৰম্ভ কৰিবলৈ দিয়ে।"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ক্ষিপ্ৰ ছেটিংসমূহত মিডিয়া প্লে’য়াৰ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"প্লে’বেক সহজে পুনৰ আৰম্ভ কৰিবলৈ মিডিয়া প্লে’য়াৰ এক দীঘলীয়া সময়ৰ বাবে দেখুৱাওক"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"প্লে’য়াৰটো লুকুৱাওক"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"প্লে’য়াৰটো দেখুৱাওক"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"কোনো প্লে’য়াৰ উপলব্ধ নহয়"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"অনুমোদিত এপ্‌সমূহ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"মিডিয়া"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ব্লুটুথ অন কৰা হ’ব"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"অন আছে"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"অফ আছে"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"ইণ্টাৰনেট"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"ছিম"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"এয়াৰপ্লেন-সুৰক্ষিত নেটৱৰ্ক"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"এয়াৰপ্লেন-সুৰক্ষিত নেটৱৰ্ক বিচাৰক আৰু তাৰ সৈতে সংযোগ কৰক"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"এয়াৰপ্লেন, এয়াৰপ্লেন-সুৰক্ষিত"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"কল আৰু এছএমএছ"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"ৱাই-ফাই কলিং"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ৱাই-ফাই নেটৱৰ্কৰ দৰে বাহক বহিৰ্ভূত নেটৱৰ্কৰ জৰিয়তে কল কৰক আৰু লাভ কৰক"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"ৱাই-ফাই কলিঙৰ সুবিধাটোৱে আপোনাক কিছুমান ৱাই-ফাই নেটৱৰ্কৰ দৰে বাহক বহিৰ্ভূত নেটৱৰ্কৰ জৰিয়তে কল কৰিবলৈ আৰু লাভ কৰিবলৈ সুবিধা দিয়ে।"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"কল"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"এছএমএছ"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"অগ্ৰাধিকাৰ দিয়া"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"কলক অগ্ৰাধিকাৰ দিয়া হৈছে"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"এছএমএছক অগ্ৰাধিকাৰ দিয়া হৈছে"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"উপলব্ধ নহয়"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"ছিম নাই"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"অগ্ৰাধিকাৰ"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ৰাজহুৱা নেটৱৰ্কসমূহৰ সৈতে সংযোগ কৰক"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"নেটৱৰ্ক সংযোগ, ইণ্টাৰনেট, বেতাঁৰ, ডেটা, ৱাইফাই, ৱাই-ফাই, ৱাই ফাই, চেলুলাৰ, ম’বাইল, চেল কেৰিয়াৰ, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"এয়াৰপ্লেন-সুৰক্ষিত নেটৱৰ্ক চাওক"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"এয়াৰপ্লেন ম’ডটো অফ কৰক"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"শোৱাৰ সময়ৰ ম’ড অন হৈ থকাৰ বাবে উপলব্ধ নহয়"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"জাননীৰ গুৰুত্ব ৰিছেট কৰাটো সম্পূৰ্ণ হৈছে।"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"এপ্‌"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"অবিশ্বস্ত ডিভাইচে আপোনাৰ বাৰ্তাসমূহ এক্সেছ কৰিব বিচাৰিছে। সবিশেষ জানিবলৈ টিপক।"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"বাৰ্তাৰ এক্সেছ দিবনে?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"এটা অবিশ্বস্ত ব্লুটুথ ডিভাইচ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]এ, আপোনাৰ বাৰ্তাসমূহ এক্সেছ কৰিব বিচাৰিছে।\n\nআপুনি আগতে [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]ৰ সৈতে সংযোগ কৰা নাই।"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"অবিশ্বস্ত ডিভাইচে আপোনাৰ সম্পৰ্কসূচী আৰু কল লগ এক্সেছ কৰিব বিচাৰিছে। সবিশেষ জানিবলৈ টিপক।"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"সম্পৰ্কসূচী আৰু কল লগ এক্সেছ কৰিবলৈ দিবনে?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"এটা অবিশ্বস্ত ব্লুটুথ ডিভাইচ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]এ, আপোনাৰ সম্পৰ্কসূচী আৰু কল লগ এক্সেছ কৰিব বিচাৰিছে। ইয়াত অন্তৰ্গামী আৰু বহিৰ্গামী কল সম্পৰ্কীয় ডেটা অন্তৰ্ভুক্ত।\n\nআপুনি আগতে [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]ৰ সৈতে সংযোগ কৰা নাই।"</string>
 </resources>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 1a73dd6..a9b0da0 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Orta"</item>
     <item msgid="6740026006576843477">"Uzun"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Qısa"</item>
+    <item msgid="7397961711906421599">"Orta"</item>
+    <item msgid="4079132024502041928">"Uzun"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Defolt"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Qlobal"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Yalnız TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Qlobal"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index c4acf7c..3e10a02 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Tarix və vaxt"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Tarix və vaxt ayarlayın"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Tarix, vaxt, vaxt zonası və formatları ayarlayın"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Şəbəkə vaxtından istifadə edin"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Şəbəkənin saat qurşağından istifadə edin"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Vaxtı avtomatik ayarlayın"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Saat qurşağını avtomatik ayarlayın"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Yerli defolt ayarlardan istifadə edin"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑saat formatı"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 saat formatından istifadə et"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Kilid ekranında profil haqqında infonu göstər"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Hesablar"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Yer"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Məkan istifadə edin"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Məkan işlədin"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Deaktiv"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aktiv - <xliff:g id="COUNT_1">%1$d</xliff:g> tətbiqin məkana giriş icazəsi var</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekran kilidi, üzün kiliddən çıxarılması"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekran kilidi, barmaq izi"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekran kilidi"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Telefonunuzu üzünüz və barmaq izinizlə etibarlı şəkildə kiliddən çıxara bilərsiniz"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Həmçinin, tətbiqlərdə hesabınıza daxil ola və ödənişləri təsdiqləyə bilərsiniz"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Kiliddən çıxarmanı bununla quraşdırın:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Üz ilə kiliddən çıxarma"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Telefonunuzu kiliddən çıxarmağı asanlaşdırın"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Barmaq izi"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Telefonunuzu cibinizdə olarkən kiliddən çıxarmaqla vaxta qənaət edin"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Ötür"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Növbəti"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Üz əlavə edildi"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Üz kilidi ayarlayın"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Üz kilidi"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Doğrulamaq üçün üzünüzdən istifadə edin"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Başladın"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Əlçatımlılıq üz ilə kiliddən çıxarması funksiyası deaktiv olarsa, bəzi ayarlama mərhələləri TalkBack ilə düzgün işləməyə bilər."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Qayıdın"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Ayarlamağa davam edin"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Əlçatımlıq quraşdırması istifadə edin"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Tətbiqlərdə üz kilidi istifadə etdikdə həmişə təsdiq tələb edin"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Üz datasını silin"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Üz kilidi ayarlayın"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Cihazı kiliddən çıxarmaq, tətbiqlərə daxil olmaq və ödənişləri təsdiq etmək üçün üz ilə kiliddən çıxarmadan istifadə edin.\n\nUnutmayın:\nTelefona baxmaqla istəmədiyiniz halda belə onu kiliddən çıxara bilərsiniz.\n\nTelefon üzünüzə tutularsa, başqası tərəfindən açıla bilər.\n\nTelefonunuz, əkiziniz kimi sizə çox bənzəyən şəxs tərəfindən kiliddən çıxarıla bilər."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Cihazı kiliddən çıxarmaq, tətbiqlərə daxil olmaq və ödənişləri təsdiq etmək üçün üz kilidindən istifadə edin.\n\nUnutmayın:\nAçmaq istəmədiyiniz vaxt telefona baxmaqla onu kiliddən çıxara bilərsiniz.\n\nHətta gözləriniz bağlı halda telefon üzünüzə tərəf tutularsa, başqası tərəfindən açıla bilər.\n\nTelefonunuz, həmçinin Sizə oxşayan övladınız və ya oxşar bacı/qardaşınız tərəfindən kiliddən çıxarıla bilər."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Cihazınızı kiliddən çıxarmaq, tətbiqlərə daxil olmaq və ödənişləri təsdiq etmək üçün üz ilə kiliddən çıxarma funksiyasını istifadə edin."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Unutmayın:\nAçmaq istəmədiyiniz vaxt telefona baxmaqla onu kiliddən çıxara bilərsiniz.\n\nTelefon üzünüzə tərəf tutularsa, başqası tərəfindən açıla bilər.\n\nTelefonunuz, həmçinin sizə oxşayan övladınız və ya oxşar bacı/qardaşınız tərəfindən kiliddən çıxarıla bilər"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Unutmayın:\nAçmaq istəmədiyiniz vaxt telefona baxmaqla onu kiliddən çıxara bilərsiniz.\n\nHətta gözləriniz bağlı halda telefon üzünüzə tərəf tutularsa, başqası tərəfindən açıla bilər.\n\nTelefonunuz, həmçinin sizə oxşayan övladınız və ya oxşar bacı/qardaşınız tərəfindən kiliddən çıxarıla bilər."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Üz datası silinsin?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Üz ilə kiliddən çıxarma üçün istifadə edilən üz datası həmişəlik və təhlükəsiz silinəcək. Silindikdən sonra telefonu kiliddən çıxarmaq, tətbiqlərə daxil olmaq və ödənişləri təsdiq etmək üçün PIN, model və ya parol tələb ediləcək."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Telefonu kiliddən çıxarmaq üçün üz kilidindən istifadə edin"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Telefonu kiliddən çıxarmaq və ya satınalmaları təsdiq etmək üçün barmaq izindən istifadə edin.\n\nYadda saxlayın: Bu cihazı kiliddən çıxarmaq üçün barmaq izindən istifadə edə bilməzsiniz. Ətraflı məlumat üçün təşkilat admini ilə əlaqə saxlayın."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Telefonu kiliddən çıxarmaq və ya satınalmaları təsdiqləmək üçün barmaq izindən istifadə edin.\n\nYadda saxlayın: Barmaq izi güclü nümunə və ya PIN\'dən daha az təhlükəsiz ola bilər."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Ləğv edin"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Xeyr, təşəkkürlər"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Davam edin"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ötürün"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Növbəti"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Planşetinizi ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Üz kilidi quraşdırmaq üçün də ekran kilidi tələb edilir. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Cihazınızı ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Üz kilidi quraşdırmaq üçün də ekran kilidi tələb edilir. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Telefonunuzu ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Üz kilidi quraşdırmaq üçün də ekran kilidi tələb edilir. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Planşetinizi ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Biometrik məlumatları ayarlamaq üçün də ekran kilidi tələb olunur. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Cihazınızı ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Biometrik məlumatları ayarlamaq üçün də ekran kilidi tələb olunur. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Telefonunuzu ekran kilidi ilə qorusanız, itməsi və ya oğurlanması halında başqası ondan istifadə edə bilməyəcək. Biometrik məlumatları ayarlamaq üçün də ekran kilidi tələb olunur. Geri qayıtmaq üçün \"Ləğv edin\" seçiminə toxunun."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN ayarlanmasını keçmək istəyirsiniz?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Parol ayarlanmasını keçmək istəyirsən?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Model ayarlanmasını keçmək istəyirsiniz?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu planşetdən istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu cihazdan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Cihazın qorunması xüsusiyyətlərini aktivləşdirməklə, icazəniz olmadan başqalarının bu telefondan istifadəsinə mane olun. İsifadə etmək istədiyiniz ekran kilidini seçin."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Yedəkləmə ekranı kilid metodunu seçin"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Yedəkləmə ekranı kilid üsulunu seçin"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Ehtiyat ekran kilidi üsulunu seçin"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Ekran kilidi seçimləri"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Ekran kilidi seçimləri"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Ekran kilidi"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Üz kilidi + parol"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Üz kilidi olmadan davam edin"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Barmaq izinizi istifadə edərək telefonun kilidini aça bilərsiniz. Təhlükəsizlik üçün bu seçim yedək ekran kilidi tələb edir."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrik məlumatlar + Model"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrik məlumatlar + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrik məlumatlar + Parol"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Biometrik məlumatlar olmadan davam edin"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Biometrik məlumatlarınızdan istifadə edərək telefonunuzu kiliddən çıxara bilərsiniz. Təhlükəsizlik üçün bu seçim ehtiyat ekran kilidi tələb edir."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Admin, siyasət və ya yaddaş deaktiv etdi"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Heç biri"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Silin"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> rəqəmdən az olmalıdır</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Cihaz admini son vaxtlardakı PIN kodu istifadə etməyə icazə vermir"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Ümumi PIN-lər IT admini tərəfindən blok edilib. Fərqli PIN-i sınayın."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Yalnış simvol daxil edə bilməzsiniz"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Ən azı bir hərf olmalıdır"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Ən azı bir rəqəm olmalıdır"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Ən azı rəqəm olmayan 1 simvol olmalıdır</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Cihaz admini son vaxtlardakı parolu istifadə etməyə icazə vermir"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Ümumi parollar IT admini tərəfindən blok edilib. Fərqli parolu sınayın."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Artan, azalan və ya təkrarlanan rəqəm ardıcıllığı qadağandır"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Təsdiq edin"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Ləğv et"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi yandırın"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi istifadə edin"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi istifadə edin"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi ayarları"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Simzis giriş nöqtələrini quraşdırın və idarə edin"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"\"<xliff:g id="SSID">%1$s</xliff:g>\" şəbəkəsinə qoşulmaq üçün aşağıdakı QR kodunu kameranın mərkəzinə tutun"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR kodunu skan etməklə Wi‑Fi şəbəkəsinə qoşulun"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi şəbəkəsini paylaşın"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"\"<xliff:g id="SSID">%1$s</xliff:g>\" şəbəkəsinə qoşulmaq və parolu paylaşmaq üçün bu QR kodunu skan edin"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"\"<xliff:g id="SSID">%1$s</xliff:g>\" şəbəkəsinə qoşulmaq üçün bu QR kodunu başqa cihazla skan edin"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"\"<xliff:g id="SSID">%1$s</xliff:g>\" şəbəkəsinə qoşulmaq üçün bu QR kodunu skan edin"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Yenidən cəhd edin. Problem davam edərsə, cihaz istehsalçısı ilə əlaqə saxlayın"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Xəta baş verdi"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi parolu: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot parolu: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Avto bağlantı"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Bu şəbəkənin yaxınlığında telefonun avtomatik qoşulmasına icazə verin"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Bu şəbəkənin yaxınlığında planşetin avtomatik qoşulmasına icazə verin"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Əhatə dairəsində olduqda bu şəbəkəyə bağlanmağa icazə verin"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Cihaz əlavə edin"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Bu şəbəkəyə cihaz əlavə etmək üçün QR kodundan istifadə edin"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kodu doğru formatda deyil"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Sistem sertifikatlarını istifadə edin"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Təmin etməyin"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Düzgünlüyü yoxlamayın"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Sertifikat təyin olunmayıb. Bağlantınız şəxsi olmayacaq."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Şəbəkə adı çox uzundur."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domen göstərilməlidir."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikat tələb edilir."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Qoşul"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wifi aktivdir"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> şəbəkəsinə qoşulub"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> şəbəkəsinə qoşulur"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Qoşulur…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Şəbəkəyə qoşulmaq alınmadı"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Şəbəkə aralıqda deyil"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Cihazın MAC ünvanı"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Təsadüfi MAC ünvanı"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Təsadüfi MAC ünvanı (son dəfə istifadə edilən)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ünvanı"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Şəbəkə bilgisi"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Alt şəbəkə maskası"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 ünvanları"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Saxlanmış şəbəkələr"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abunəliklər"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Digər şəbəkələr"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP ayarları"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Təkmilləşmiş Wi‑Fi ayarları bu istifadəçi üçün əlçatmazdır"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Yadda saxlayın"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Düzgün Şlüz ünvanı yazın."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Düzgün DNS ünvanı yazın."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 və 32 uzunluqlu şəbəkə prefiks daxil edin"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (Şəxsi DNS tərəfindən ləğv edilmədiyi halda)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (Şəxsi DNS tərəfindən ləğv edilmədiyi halda)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Keçid"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Şəbəkə prefiks uzunluğu"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Tətbiq kontenti paylaşır. İnternet bağlantısını paylaşmaq üçün hotspotu deaktiv, sonra aktiv edin"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Parol ayarlanmayıb"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot adı"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktiv edilir..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktiv edilir…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Digər cihazlar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> şəbəkəsinə qoşula bilər"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot parolu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Diapazonu"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Rahat Displey"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Bəzi məzmun üçün yeniləmə dərəcəsini 60 Hs-dən 90 Hs-ə avtomatik yüksəldir. Batareya istifadəsini artırır."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Rahat Displey"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hs yeniləmə dərəcəsini məcbur tətbiq edin"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Təkmilləşdirilmiş toxunuş həssaslığı və animasiya keyfiyyəti üçün yüksək yeniləmə dərəcəsi. Batareya istifadəsini artırır."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ekran həssaslığı"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktiv/ Ekrana baxırsınızsa, sönməyəcək"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Ekran tünd olduqda o, yeni bildirişləri göstərmək üçün aktiv olur"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Həmişə vaxt və bilgini göstər"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Batareya istifadəsi artdı"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Qalın mətn"</string>
     <string name="title_font_size" msgid="570613010306330622">"Şrift ölçüsü"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Mətni kiçildin və ya böyüdün"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SİM kart kilidi parametrləri"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android versiyası"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android güvənlik güncəlləməsi"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model və avadanlıq"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Avadanlıq versiyası"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Avadanlıq ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN silin"</string>
     <string name="menu_new" msgid="6571230342655509006">"Yeni APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Yadda saxla"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Kənarlaşdır"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Ləğv edin"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Ad sahəsi boş ola bilməz."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN boş ola bilməz."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Tətbiqlər sıfırlana bilər"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi, mobil və Bluetooth\'u sıfırlayın"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Bununla bütün şəbəkə ayarları sıfırlanacaq, bura daxildir:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobil data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Silin"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Endirilən SIM-ləri silin"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Yedək SIM-i endirmək üçün operatorla əlaqə saxlayın. Bu, hər hansı mobil xidmət planını ləğv etməyəcək."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Bununla hər hansı mobil xidmət planı ləğv edilməyəcək. Əvəzedici SIM\'ləri endirmək üçün operatorunuzla əlaqə saxlayın."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Ayarları sıfırlayın"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Bütün şəbəkə ayarları sıfırlansın? Bu əməliyyatı geri qaytara bilməzsiniz."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Bütün şəbəkə ayarları sıfırlanıb, endirilən SIM-lər silinsin? Bu əməliyyatı geri qaytara bilməzsiniz."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Şəbəkə ayarları sıfırlandı"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-ləri silmək mümkün deyil"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Endirilmiş SIM-ləri xəta səbəbindən silmək mümkün deyil.\n\nCihazı yenidən başladıb təkrar cəhd edin."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Bütün datanı silin (fabrika sıfırlaması)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Bütün datanı silin (fabrika sıfırlaması)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Bu, planşetin "<b>"daxili yaddaşındakı"</b>" bütün datanı siləcək, bura daxildir:\n\n"<li>"Google Hesabı"</li>\n<li>"Sistem və tətbiq datası və ayarları"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Bu, telefonun "<b>"daxili yaddaşındakı"</b>" bütün datanı siləcək, bura daxildir:\n\n"<li>"Google Hesabı"</li>\n<li>"Sistem və tətbiq datası və ayarları"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Hazırda bu hesablara daxil olmusunuz:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Bu cihazda başqa istifadəçilər iştirak edir.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musiqi"</li>\n<li>"Fotolar"</li>\n<li>"Digər istifadəçi datası"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-lər"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Bununla mobil xidmət planı ləğv edilməyəcək."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Həmçinin musiqi, şəkil və digər istifadəçi datası təmizləmək üçün "<b>"USB yaddaşı"</b>" silinməlidir."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Musiqi, şəkil, və digər istifadəçi datasını silmək üçün "<b>"SD kartı"</b>" təmizləmək lazımdır."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Bütün datanı silin (zavod sıfırlaması)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Bütün datanı silin (zavod sıfırlaması)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Bu, planşetin "<b>"daxili yaddaşındakı"</b>" bütün datanı siləcək, bura daxildir:\n\n"<li>"Google Hesabı"</li>\n<li>"Sistem və tətbiq datası və ayarları"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Bu, telefonun "<b>"daxili yaddaşındakı"</b>" bütün datanı siləcək, bura daxildir:\n\n"<li>"Google Hesabı"</li>\n<li>"Sistem və tətbiq datası və ayarları"</li>\n<li>"Endirilmiş tətbiqlər"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Hazırda bu hesablara daxil olmusunuz:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Bu cihazda başqa istifadəçilər mövcuddur.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musiqi"</li>\n<li>"Fotolar"</li>\n<li>"Digər istifadəçi datası"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-lər"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Bununla mobil xidmət planı ləğv edilməyəcək."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Həmçinin musiqi, şəkil və digər istifadəçi datası təmizləmək üçün "<b>"USB yaddaşı"</b>" silinməlidir."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Musiqi, şəkil, və digər istifadəçi datasını silmək üçün "<b>"SD kartı"</b>" təmizləmək lazımdır."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB yaddaşı sil"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD kartı sil"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Daxili USB yaddaşında mahnı və ya şəkil kimi bütün datanı sil"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD kartda musiqi və foto kimi bütün məlumatları silin."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Bütün datanı silin"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Bütün datanı silin"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Şəxsi məlumat və endirilən tətbiqlərin hamısı silinəcək. Bu əməliyyatı geri qaytara bilməzsiniz."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Endirilən tətbiqlər və SIM-lər daxil olmaqla şəxsi məlumatın hamısı silinəcək. Bu əməliyyatı geri qaytara bilməzsiniz."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Hər şeyi silin"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Sistem Təmizləmə xidməti aktiv olmadığına görə heç bir sıfırlama həyata keçirilmədi."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Bütün data silinsin?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Fabrik sıfırlaması bu istifadəçi üçün əlçatan deyil"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Silinir"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Lütfən, gözləyin..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Bütün datanı silin"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Bütün datanı silin"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Şəxsi məlumat və endirilən tətbiqlərin hamısı silinəcək. Bu əməliyyatı geri qaytara bilməzsiniz."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Endirilən tətbiqlər və SIM-lər daxil olmaqla şəxsi məlumatın hamısı silinəcək. Bu əməliyyatı geri qaytara bilməzsiniz."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Bütün data silinsin?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Zavod sıfırlaması bu istifadəçi üçün əlçatan deyil"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Silinir"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Gözləyin…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Zəng ayarları"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Səsli poçt, çağrı yönləndirməsi, çağrı gözləmə, çağrı kimliyi quraşdırın"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB Birləşmə"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> cihazdan çoxu ilə birləşə bilməz."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> idarəolunmaz olacaq."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet bağlantısı"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB Ethernet vasitəsilə telefonun internet bağlantısını paylaşın"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Ethernet vasitəsilə telefonun internet bağlantısını paylaşın"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Mobil data bağlantısı vasitəsilə digər cihazları internetlə təmin etmək üçün hotspot və birləşmədən istifadə edin. Tətbiqlər yaxınlıqdakı cihazlarla kontenti paylaşmaq üçün də hotspot yarada bilər."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Wi‑Fi və ya mobil məlumat bağlantısı vasitəsilə digər cihazları internetlə təmin etmək üçün hotspot və birləşmədən istifadə edin. Tətbiqlər yaxınlıqdakı cihazlarla məzmun paylaşmaq üçün də hotspot yarada bilər."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Yardım"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth skan edilir"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth deaktiv olsa belə, tətbiq və xidmətlərə yaxınlıqdakı cihazları istənilən zaman skan etməsinə icazə verin. Məsələn, bu, məkanla bağlı funksiya və xidmətləri təkmilləşdirmək üçün istifadə edilə bilər."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"İş üçün məkan xidmətləri"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Məkan üzrə saat qurşağının aşkarlanması"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Məkan üzrə saat qurşağının aşkarlanması"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Cari saat qurşağını aşkarlamaq üçün cihazın məkanının istifadəsinə imkan verir. Wi‑Fi skanlaması kimi digər məkan ayarları saat qurşağının aşkarlanma dəqiqliyinə təsir edə bilər."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aktiv"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Deaktiv"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Saat qurşağının avtomatik aşkarlanması deaktiv edilib"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Məkan üzrə saat qurşağının aşkarlanması deaktiv edilib"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Məkan üzrə saat qurşağının aşkarlanması dəstəklənmir"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Məkan üzrə saat qurşağının aşkarlanması dəyişikliklərinə icazə verilmir"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi və mobil şəbəkə yerləşməsi"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Yerləşmənizi daha tez tapmaq üçün tətbiqlərə Google\'un yerləşmə xidmətindən istifadə etməyə icazə verin."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Wi‑Fi ilə müəyyən olunmuş yer"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Üz kilidi üçün parol ayarlayın"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Üz kilidindən üçün model ayarlayın"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Üz kilidi istifadə etmək üçün PIN ayarlayın"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biometrik məlumatlardan istifadə üçün parol təyin edin"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biometrik məlumatlardan istifadə üçün model təyin edin"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biometrik məlumatlardan istifadə üçün PIN təyin edin"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Parolu unutmusunuz?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Modeli unutmusunuz?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN\'i unutmusunuz?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Subtitr tərcihləri"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Böyütmə"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Böyütmə sahəsi"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Böyütmənin aktivləşdirilməsi"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Ekranı böyüdərkən istifadə etmək istədiyiniz böyütmə sahələrini seçin"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Tam ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ekranın bir hissəsi"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Tam ekran &amp; ekranın bir hissəsi"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Bütün ekranı böyüdün"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ekranın bir hissəsini böyüdün"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Əlçatımlılıq düyməsinə keçsin?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ekranın bir hissəsini böyütmək üçün üç dəfə toxunmadan istifadə etmək yazma və digər əməliyyatların gecikməsinə səbəb olacaq.\n\nBöyütmək üçün əlçatımlılıq düyməsindən istifadəyə keçmək istəyirsiniz?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Əlçatımlılıq düyməsinə keçin"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Böyütmək üçün üç dəfə toxunmadan istifadə edin"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Böyütmə ayarları"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Üç dəfə klikləməklə böyüdün"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Qısayol ilə böyüdün"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Yanıdırıb-söndürmə düyməsi zəngi sonlandırır"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Böyük maus kursoru"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animasiyaları silin"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Audio oxudulan zaman kanalları birləşdirin"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balans"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Sol"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Sağ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Audio oxudulan zaman kanalları birləşdirin"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balansı"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Sol"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Sağ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Defolt"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 saniyə"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 saniyə"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Bildiriş vibrasiyası"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Zəng vibrasiyası"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Toxunuş rəyi"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> istifadə edin"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> tətbiqini açın"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Rəng düzəlişini işlədin"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Başlıqları göstərin"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Yalnız dəstəklənən tətbiq üçün"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> istifadə edin"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> tətbiqini açın"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Rəng korreksiyasından istifadə edin"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Subtitrləri göstərin"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Yalnız dəstəklənən tətbiq üçün"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Altyazı ölçü və üslubu"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> mətn ölçüsü"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Daha çox seçim"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deyteranomaliya"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaliya"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaliya"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Ağ-qara"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Qırmızı-yaşıl"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Qırmızı-yaşıl"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mavi-sarı"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Arxa fonun məhdudlaşdırılması"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Tətbiqin arxa fonda işləməsinə icazə verin"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Tətbiqin arxa fonda işləmək üçün icazəsi yoxdur"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Arxa fon istifadəsi məhdudlaşdırıla bilər"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Arxa fon istifadəsi məhdudlaşdırıla bilməz"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Arxa fon fəaliyyəti məhdudlaşdırılsın?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Tətbiqin arxa fon fəaliyyətini məhdudlaşdırsanız, o səhv işləyə bilər"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Bu tətbiqdə batareyanın optimallaşdırılması ayarlanmadığına görə onu məhdudlaşdıra bilməzsiniz.\n\nTətbiqi məhdudlaşdırmaq üçün əvvəlcə batareya optimallaşdırmasını aktiv edin."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Planşet hədindən çox istifadə etdi"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Cihaz həddindən çox istifadə etdi"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Batareya həmişə olduğundan daha tez bitə bilər"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Enerjiyə qənaət üçün optimallaşdırma"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batareya müvəqqəti məhdudlaşdırılıb. Ətraflı məlumat üçün toxunun."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefon həddindən artıq çox işlədilib. Batareya gözləniləndən tez bitə bilər.\n\nƏn çox batareya işlədən tətbiqlər:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Planşet həddindən artıq çox işlədilib. Batareya gözləniləndən tez bitə bilər.\n\nƏn çox batareya işlədən tətbiqlər:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Cihaz həddindən artıq çox işlədilib. Batareya gözləniləndən tez bitə bilər.\n\nƏn çox batareya işlədən tətbiqlər:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d tətbiq məhdudlaşdırılıb</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Batareya ölçüsünü oxuyarkən problem yarandı"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Batareya ölçüsünü oxuyarkən problem yarandı. "<annotation id="url">"Ətraflı məlumat"</annotation>" üçün toxunun"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Tətbiq dayandırılsın?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Telefon batareya istifadəsini normal idarə edə bilmir, çünki <xliff:g id="APP">%1$s</xliff:g> telefonu oyaq saxlamağa davam edir.\n\nBu problemi həll etmək üçün tətbiqi dayandıra bilərsiniz.\n\nProblem baş verməyə davam edərsə, batareya performansını yaxşılaşdırmaq üçün tətbiqi sistemdən silməyiniz tələb edilə bilər."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Planşet batareya istifadəsini normal idarə edə bilmir, çünki <xliff:g id="APP">%1$s</xliff:g> planşeti oyaq saxlamağa davam edir.\n\nBu problemi həll etmək üçün tətbiqi dayandıra bilərsiniz.\n\nProblem baş verməyə davam edərsə, batareya performansını yaxşılaşdırmaq üçün tətbiqi sistemdən silməyiniz tələb edilə bilər."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Plan ayarlayın"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Batareya istifadəsinin müddətini artırın"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Şarj olduqda deaktiv edin"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Telefonun batareyası <xliff:g id="PERCENT">%1$s</xliff:g> olduqda Enerjiyə qənaət deaktiv edilir"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Planşetin batareyası <xliff:g id="PERCENT">%1$s</xliff:g> olduqda Enerjiyə Qənaət deaktiv edilir"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Cihazın batareyası <xliff:g id="PERCENT">%1$s</xliff:g> olduqda Enerjiyə Qənaət deaktiv edilir"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Telefonunuz <xliff:g id="PERCENT">%1$s</xliff:g>-dən çox şarj olduqda Enerjiyə Qənaət deaktiv edilir"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Planşetiniz <xliff:g id="PERCENT">%1$s</xliff:g>-dən çox şarj olduqda Enerjiyə Qənaət deaktiv edilir"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Cihazınız <xliff:g id="PERCENT">%1$s</xliff:g>-dən çox şarj olduqda Enerjiyə Qənaət deaktiv edilir"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktiv edin"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Sıfırlayın"</string>
     <string name="tts_play" msgid="2945513377250757221">"Oxutma"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN (Virtual Şəxsi Şəbəkələr)"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Uyğunlaşan bağlantı"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"şəbəkə bağlantılarınızı avtomatik idarə edərək batareyanın ömrünü artırır və cihazın performansını yaxşılaşdırır"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Etimadnamə yaddaşı"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sertifikat quraşdırın"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikatları yaddaşdan quraşdırın"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"İstifadəçi məlumatı"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Saxlanılan məlumatlara baxın və dəyişin"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Qabaqcıl ayarlar"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Saxlama növü"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Avadanlıq təminatı"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Yalnız proqram"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredensiallar bu istifadəçi üçün əlçatan deyil"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN və tətbiq üçün quraşdırılıb"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi üçün quraşdırılıb"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Quraşdırmayın"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"İstənilən halda quraşdırın"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sertifikat quraşdırılmadı"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g> tətbiqinə bu cihazda sertifikatları quraşdırmaq üçün icazə verilsin?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Bu sertifikatlar aşağıdakı tətbiqlər və URL\'lar üçün kimliyinizi doğrulayacaq"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"İcazə verməyin"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"İcazə verin"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Daha çoxunu göstərin"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Sertifikat idarəetmə tətbiqi"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Yoxdur"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Bu tətbiq tərəfindən quraşdırılan sertifikatlar aşağıdakı tətbiqlər və URL\'lar üçün kimliyinizi doğrulayır"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Silin"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Təcili zəng siqnalı"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Təcili zəng olduqda davranış təyin et"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Yedək"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Quraşdırılmayıb - İş profili"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"Siz (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nik"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> istifadəçiyə qədər əlavə edə bilərsiniz"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Yalnız planşet sahibi istifadəçiləri idarə edə bilər."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Yalnız telefon sahibi istifadəçiləri idarə edə bilər"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Terminalda ödəniş"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Ödəniş tətbiqini ayarlayın. Sonra telefonunuzun arxa tərəfini kontaktsız simvolu olan hər hansı terminala tərəf tutun."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Anladım"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Digər..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Daha çox…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Defolt ödəniş tətbiqini ayarlayın"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Defolt ödəniş tətbiqini güncəlləyin"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kontaktsız terminalda <xliff:g id="APP">%1$s</xliff:g> ilə ödəyin:"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Geri"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Növbəti"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Bitir"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Foto çəkin"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Şəkil seçin"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Foto seçin"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartlar"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartlar"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Həmişə bu zənglər üçün istifadə edin"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Data üçün SIM seçin"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS üçün SIM seçin"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Data SİM-i dəyişdirilir, bu bir neçə dəqiqə çəkə bilər..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Data SİM-i dəyişdirilir, bu bir neçə dəqiqə çəkə bilər…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Çağrı üçün SIM:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM kart seçin"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rejim, cədvəl, enerjiyə qənaət, batareyaya qənaət, batareya, avtomatik, faiz"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volt, qabaqcıl zəng, 4g zəng"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dil əlavə edin, bir dil əlavə edin"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"mətn ölçüsü"</string>
     <string name="default_sound" msgid="6604374495015245195">"Defolt səs"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Zəng &amp; bildiriş səsi səviyyəsi <xliff:g id="PERCENTAGE">%1$s</xliff:g> faizdir"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Səs, vibrasiya, \"Narahat etməyin\" rejimi"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Səsləri aktiv edin"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Canlı Subtitrlər"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Avtomatik başlıq mediası"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Heç biri"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> cədvəl ayarlanıb</item>
-      <item quantity="one">1 cədvəl ayarlanıb</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Heç biri}=1{1 cədvəl ayarlanıb}other{# cədvəl ayarlanıb}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Narahat Etməyin"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Yalnız vacib şəxs və tətbiqlərdən bildiriş alın."</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Kəsintiləri məhdudlaşdırın"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Yalnız prioritet"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Deaktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Deaktiv"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aktiv"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Həmişə soruşun"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Deaktiv edənə qədər"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> saat</item>
-      <item quantity="one">1 saat</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> dəqiqə"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> nəzarət avtomatik aktiv edilə bilər</item>
-      <item quantity="one">1 nəzarət avtomatik aktiv edilə bilər</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 saat}other{# saat}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 dəqiqə}other{# dəqiqə}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Deaktiv}=1{Deaktiv / 1 cədvəl avtomatik aktiv edilə bilər}other{Deaktiv / # cədvəl avtomatik aktiv edilə bilər}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Narahat Etməyin rejimini nə durdura bilər"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Şəxslər"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Tətbiqlər"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Mühüm olmayan bildirişləri avtomatik olaraq \"Daha az əhəmiyyətli\" seçiminə ayarlayın"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptiv bildiriş sıralaması"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Bildirişləri avtomatik olaraq aktuallığına görə sıralayın"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptiv bildiriş rəyi"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bildirişlərə edilən tənzimləmələri göstərin və sistemə rəy bildirmək üçün seçimi göstərin"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Bildiriş əhəmiyyətliliyini sıfırlayın"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"İstifadəçinin dəyişdiyi əhəmiyyətlilik ayarlarını sıfırlayın və bildiriş assistentinin prioritetləşdirməsinə icazə verin"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Təklif edilən əməliyyat və cavablar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Təklif edilən əməliyyat və cavabları avtomatik göstərin"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Son və mürgü rejiminə keçirilmiş bildirişləri göstərin"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioritet söhbətlər"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Söhbət bölməsinin yuxarısında göstərilsin və üzən qabarcıqlar kimi görünsün"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Söhbət bölməsinin yuxarısında göstərilsin"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Digər söhbətlər"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Prioritet olmayan söhbətlər"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Dəyişikliklər etdiyiniz söhbətlər"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Son söhbətlər"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Sonuncuları silin"</string>
+    <string name="clear" msgid="5092178335409471100">"Silin"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prioritet söhbətləri qabaqcıq şəklində göstərin"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritet söhbətlər bildiriş panelinin yuxarısında göstərilir. Həmçinin, onların qabaqcıq şəklində göstərilməsini və \"Narahat Etməyin\" rejimini bölməsini ayarlaya bilərsiniz."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Prioritet və dəyişdirilmiş söhbətlər burada görünəcək"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"Narahat etməyin\" girişi"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\"Narahat etməyin\" rejiminə icazə verin"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Heç bir tətbiq \"Narahat etməyin\" girişi sorğusu göndərməyib"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Tətbiqlər endirilir..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Tətbiqlər yüklənir…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Təklifinizə əsasən Android tətbiq bildirişinin bu cihazda görünməsini blok edir"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Təklifinizə əsasən Android bu kateqoriyalı bildirişin cihazda görünməsini blok edir"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Təklifinizə əsasən Android bu qrupdan olan bildirişin cihazda görünməsini blok edir"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Bütün söhbətlər"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritet söhbətlər"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Heç biri"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> söhbət</item>
-      <item quantity="one">1 söhbət</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Heç biri"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Heç biri}=1{1 söhbət}other{# söhbət}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kim bölə bilər"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Zənglər"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Çağrılar"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"İcazə verilən zənglərin səs çıxardığından əmin olmaq üçün cihazın zəng çalmağa ayarlandığını yoxlayın"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" üçün daxil olan zənglər blok edilir. Dostlar, ailə və ya digər kontakların əlaqə saxlaması üçün ayarları tənzimləyə bilərsiniz."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Ulduzlanmış kontaktlar"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> digər</item>
-      <item quantity="one">1 digər</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Heç biri"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Heç biri}=1{{contact_1}}=2{{contact_1} və {contact_2}}=3{{contact_1}, {contact_2} və {contact_3}}other{{contact_1}, {contact_2} və daha # kontakt}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Ad yoxdur)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mesajlar"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mesajlar"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mesajlar"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" üçün gələn mesajlar blok edilir. Dostlar, ailə və ya digər kontakların Sizinlə əlaqə saxlaması üçün ayarları tənzimləyə bilərsiniz."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Bütün mesajlar sizə çata bilər"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Bütün zənglər sizə çata bilər"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Heç biri"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakt</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Heç biri}=1{1 kontakt}other{# kontakt}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"İstənilən şəxs"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktlar"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Ulduzlanmış kontaktlar"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Bütün bildirişlər"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Bəzi bildirişlər"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Tətbiqlərə bölmək icazəsi verməsəniz belə, seçilmiş şəxslər hələ də sizinlə əlaqə saxlaya bilər"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> bölə bilər</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> bölə bilər</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"daha <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Heç bir tətbiq bölə bilməz}=1{{app_1} bölə bilər}=2{{app_1} və {app_2} bölə bilər}=3{{app_1}, {app_2} və {app_3} bölə bilər}other{{app_1}, {app_2} və daha # tətbiq bölə bilər}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Tətbiqlər"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Bütün bildirişlər"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Bəzi bildirişlər"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Bölə bilən bildirişlər"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Bütün bildirişlərə icazə verin"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> bölə bilər</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> bölə bilər</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Heç nə bölə bilməz"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"daha <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Heç nə bölə bilməz}=1{{sound_category_1} bölə bilər}=2{{sound_category_1} və {sound_category_2} bölə bilər}=3{{sound_category_1}, {sound_category_2} və {sound_category_3} bölə bilər}other{{sound_category_1}, {sound_category_2} və daha # tətbiq bölə bilər}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Heç nə bölə bilməz"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Heç kim bölə bilməz"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Bəzi şəxslər bölə bilər"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Bütün şəxslər bölə bilər"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Aktiv"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Deaktiv"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Tətbiq bərkidilməsi"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Tətbiq bərkidilməsi cari tətbiqin ayrılanadək ekranda qalmasına imkan verir. Məsələn, bu funksiya etibarlı dostun xüsusi oyunu oynamasına imkan vermək üçün istifadə edilə bilər. \n\nTətbiq bərkidildikdə, bu tətbiq başqa tətbiqləri aça bilər və şəxsi dataya giriş edilə bilər. \n\nTətbiq bərkidilməsini istifadə etmək üçün: 	\n1.	Tətbiq bərkidilməsini aktiv edin 	\n2.	İcmalı Açın 	\n3.	Ekranın yuxarısında tətbiq ikonasına toxunun, sonra \"Bərkidin\" seçiminə toxunun"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Tətbiq bərkidilməsi cari tətbiqin ayrılanadək ekranda qalmasına imkan verir. Məsələn, bu funksiya etibarlı dostun xüsusi oyunu oynamasına imkan vermək üçün istifadə edilə bilər. \n\nTətbiq bərkidildikdə, bu tətbiq başqa tətbiqləri aça bilər və şəxsi dataya giriş edilə bilər. \n\nCihazınızı etibarlı şəkildə başqası ilə paylaşmaq istəyirsinizsə, qonaq istifadəçi olaraq işlədin. \n\nTətbiq bərkidilməsini istifadə etmək üçün: 	\n1.	Tətbiq bərkidilməsini aktiv edin 	\n2.	İcmalı Açın 	\n3.	Ekranın yuxarısında tətbiq ikonasına toxunun, sonra \"Bərkidin\" seçiminə toxunun"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Tətbiq bərkidilməsi cari tətbiqin ayrılanadək ekranda qalmasına imkan verir. Məsələn, bu funksiya etibarlı dostun xüsusi oyunu oynamasına imkan vermək üçün istifadə edilə bilər."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Tətbiq bərkidildikdə, bu tətbiq başqa tətbiqləri aça bilər və şəxsi dataya giriş edilə bilər. \n\nTətbiq bərkidilməsini istifadə etmək üçün: 	\n1.	Tətbiq bərkidilməsini aktiv edin \n2.	İcmalı Açın \n3.	Ekranın yuxarısında tətbiq ikonasına toxunun, sonra \"Bərkidin\" seçiminə toxunun"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Tətbiq bərkidildikdə, bu tətbiq başqa tətbiqləri aça bilər və şəxsi dataya giriş edilə bilər. \n\nCihazınızı etibarlı şəkildə başqası ilə paylaşmaq istəyirsinizsə, qonaq istifadəçi istifadə edin. \n\nTətbiq bərkidilməsini istifadə etmək üçün: 	\n1.	Tətbiq bərkidilməsini aktiv edin \n2.	İcmalı Açın 	\n3.	Ekranın yuxarısında tətbiq ikonasına toxunun, sonra \"Bərkidin\" seçiminə toxunun"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Tətbiq bərkidildikdə: \n\n•	 Şəxsi dataya giriş edilə bilər \n		(məsələn, kontaktlar və e-məktub məzmunu) \n•	 Bərkidilmiş tətbiq digər tətbiqləri aça bilər \n\nYalnız etibar etdiyiniz dostlarla tətbiq bərkidilməsini istifadə edin."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Ayırmadan öncə kilid modeli istənilsin"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Ayırmadan öncə PIN istənilsin"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə PIN tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün PIN tələb edilsin?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə model tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün model tələb edilsin?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə parol tələb edərək onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün parol tələb edilsin?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Cihazınızı kiliddən çıxarmaq üçün biometrik məlumatlarınızdan istifadə etməkdən əlavə, cihazı işə salmadan öncə PIN tələb edərək onu qoruya bilərsiniz. Cihaz işə düşənədək siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün PIN tələb edilsin?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Cihazınızı kiliddən çıxarmaq üçün biometrik məlumatlarınızdan istifadə etməkdən əlavə, cihazı işə salmadan öncə model tələb edərək onu qoruya bilərsiniz. Cihaz işə düşənədək siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün model tələb edilsin?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Cihazınızı kiliddən çıxarmaq üçün biometrik məlumatlarınızdan istifadə etməkdən əlavə, cihazı işə salmadan öncə parolunuzu tələb edərək onu qoruya bilərsiniz. Cihaz işə düşənədək siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün parol tələb edilsin?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Bəli"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Xeyr"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Məhdudlaşdırılmış"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB nəzarətçisi"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Qoşulmuş cihaz"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Bu cihaz"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Dəyişdirilir..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Dəyişdirilir…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Dəyişdirmək alınmadı"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Enerji dodlurulması"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Qoşulmuş cihaza enerji doldurulur"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobil data istifadəsi"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Tətbiq data istifadəsi"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi data istifadəsi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Operatordan kənar data istifadəsi"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet data istifadəsi"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 məhdudiyyət</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data hesablanması cihazınızın hesablamasından fərqli ola bilər"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Operator şəbəkələri tərəfindən istifadə edilən data daxil deyil"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> istifadə edildi"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Data xəbərdarlığı ayarlayın"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data xəbərdarlığı"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Detallara baxın"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Qənaəti"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Məhdudlaşdırılmamış data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Arxa fon datası deaktiv edilib"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Arxa fon datası deaktiv edilib"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aktiv"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Deaktiv"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Data Qənaətindən istifadə edin"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Cihaz kilidlidirsə, bildirişlərdə cavab və ya digər mətnlərin yazılmasının qarşısını alın."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Defolt orfoqrafik yoxlama"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Orfoqrafik yoxlama seçin"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Orfoqrafik yoxlama işlədin"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Orfoqrafik yoxlamadan istifadə edin"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Seçilməyib"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(heç biri)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Yaddaşda boş yer yaratmaq üçün, yaddaş meneceri yedəklənmiş foto və videoları cihazınızdan silir."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Foto və videoları silin"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Yaddaş Meneceri"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Yaddaş menecerindən istifadə edin"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Yaddaş menecerindən istifadə edin"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Avtomatik"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Təlimat"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"İndi yer boşaldın"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Telefonu yoxlamaq üçün iki dəfə tıklayın"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Planşeti yoxlamaq üçün iki dəfə tıklayın"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Cihazı yoxlamaq üçün iki dəfə tıklayın"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Bildirişlər üçün sürüşdürün"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Bildirişləri göstərmək üçün ekranın aşağı kənarından aşağıya doğru sürüşdürün"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Bir əlli rejim"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Bir əlli rejimdən istifadə edin"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Tətbiqləri dəyişərkən çıxış edin"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Taymaut"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 saniyə"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 saniyə"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 saniyə"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"əlçatanlıq"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Vaxt, bildiriş və digər məlumatı yoxlamaq üçün iki dəfə ekrana klikləyin."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Telefonu yoxlamaq üçün qaldırın"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Planşeti yoxlamaq üçün qaldırın"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Planşeti yoxlamaq üçün klikləyin"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Cihazı yoxlamaq üçün klikləyin"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Vaxt, bildiriş və digər məlumatı yoxlamaq üçün ekrana klikləyin."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Fövqəladə halda SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Fövqəladə halda SOS xidmətindən istifadə edin"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> tərəfindən idarə edilir"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Yandırıb-söndürmə düyməsini 5 dəfə və ya daha çox cəld basaraq aşağıdakı əməliyyatları başladın"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Geri sayım siqnalını oxudun"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Yardım üçün bildiriş verməzdən əvvəl ucadan səs oxudun"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Yardım üçün əlaqə saxlayın"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Yardım çağırmaq üçün nömrə"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Dəyişdirmək üçün toxunun"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Təcili olmayan nömrə daxil etsəniz:\n • SOS xidmətindən istifadə üçün cihazınız kiliddən çıxarılmalıdır\n • Zənginizə cavab verilməyə bilər"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Bildirişlər üçün barmaq izinizi sürüşdürün"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Barmaq izini sürüşdürün"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Bildirişləri yoxlamaq üçün, barmaq izi sensorunda aşağı sürüşdürün."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maksimum görünən datasetlər"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Defolt dəyərlərə sıfırlayın"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Avto doldurma developer seçimləri sıfırlanıb"</string>
+    <string name="location_category" msgid="3496759112306219062">"Məkan"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Status bölməsi məkan göstəricisi"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Şəbəkə və bağlantı daxil olmaqla bütün məkanlar üçün göstərin"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Tam GNSS ölçülərini icra edin"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"İş sistemi olmadan bütün GNSS qruplaşmaları və tezliklərini izləyin"</string>
     <string name="device_theme" msgid="5027604586494772471">"Cihaz teması"</string>
     <string name="default_theme" msgid="4815428567082263639">"Defolt"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Şəbəkə adı"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Foksulanmağa davam etmək üçün bildirişləri dayandırın"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funksiya əlçatan deyil"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Bu funksiya telefonu yavaşlatdığı üçün deaktiv edilib"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Tam GNSS ölçülərini icra edin"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"İş sistemi olmadan bütün GNSS qruplaşmaları və tezliklərini izləyin"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Xəta dialoqunu həmişə göstərin"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Tətbiqdə xəta baş verdiyi zaman dialoqu göstərin"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE aktiv olan tətbiq seçin"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Bütün tətbiqlər üçün aktivləşdirin"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Qrafik Disk seçin"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Defolt"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Oyun Diski"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Oyun Drayveri"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Tərtibatçı Sürücüsü"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Qrafik Sistem Diski"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Aktiv (səssiz)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Deaktiv"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Şəbəkə bilgisi"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Cihazın adı telefondakı tətbiqlərdə görünəcək. Bluetooth cihazlarına qoşulduqda və ya Wi-Fi hotspotu ayarladıqda digərləri də onu görə bilər."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Cihazın adı telefondakı tətbiqlərdə görünəcək. Bluetooth cihazlarına qoşulduqda və ya Wi-Fi hotspotu ayarladıqda digərləri də onu görə bilər."</string>
     <string name="devices_title" msgid="649715719278562515">"Cihazlar"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Bütün Ayarlar"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Təkliflər"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Şəbəkə tapılmadı. Yenidən cəhd edin."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(qadağandır)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM kart yoxdur"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM yoxdur"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Heç biri"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Qoşulmaq üçün SIM tələb olunur"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Qoşulmaq üçün <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM tələb olunur"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Tərcih edilmiş şəbəkə rejimi: WCDMA tərcih edilir"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Tərcih edilmiş şəbəkə rejimi: Yalnız GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Tərcih edilmiş şəbəkə rejimi: yalnız WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobil data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Mobil şəbəkədən istifadə edərək dataya daxil olun"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Aralıqda olduqda telefon avtomatik bu operatora keçəcək"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM kart əlçatan deyil"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Zəng seçimi"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS seçimi"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Həmişə soruşun"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ünvanına qoşulduqda əlçatan deyil"</string>
     <string name="see_more" msgid="7499355691042812723">"Ətraflı"</string>
     <string name="see_less" msgid="2642392725363552793">"Baxışı kiçildin"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktiv edilsin?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM aktiv edilsin?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatoruna keçilsin?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM kart istifadəsinə keçilsin?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Eyni vaxtda yalnız bir SIM aktiv ola bilər.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operatoruna keçdikdə <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> xidməti ləğv edilməyəcək."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Eyni vaxtda yalnız bir endirilmiş SIM aktiv ola bilər.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operatoruna keçdikdə <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> xidməti ləğv edilməyəcək."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Eyni vaxtda yalnız bir SIM aktiv ola bilər.\n\nDigərinə keçdikdə <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> xidməti ləğv edilməyəcək."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatoruna keçin"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Şəbəkəyə qoşulur…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatoruna keçirsiniz"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Başqa operatora keçmək mümkün deyil"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Xəta səbəbi ilə başqa operatora keçmək mümkün deyil."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> deaktiv edilsin?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM deaktiv edilsin?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM deaktiv edilir<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operatoru deaktiv etmək mümkün deyil"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Xəta baş verdi və operatoru deaktiv etmək mümkün olmadı."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIM-dən istifadə etmək istəyirsiniz?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Bu cihazda eyni vaxtda 2 SIM aktiv ola bilər. Eyni vaxtda 1 SIM-dən istifadəyə davam etmək üçün \"Xeyr, təşəkkürlər\" seçiminə toxunun."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Cihaz yenidən başladılsın?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Başlatmaq üçün cihazı yenidən başladın. Sonra başqa SIM əlavə edə bilərsiniz."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Davam edin"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Yenidən başladın"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Xeyr, təşəkkür"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Keçin"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-i aktiv etmək mümkün deyil"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-i çıxarıb yenidən taxın. Problem həll olmasa, cihazı yenidən başladın."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM-i yenidən aktiv etməyə çalışın. Problem həll olmasa, cihazı yenidən başladın."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Şəbəkənin aktiv edilməsi"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktivdir"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ayarlarını yeniləmək üçün toxunun"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM kart"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Endirilən SIM silinsin?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Bu SIM silindikdə <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> xidməti bu cihazdan silinəcək.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> üçün xidmət ləğv edilməyəcək."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Silin"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM silinir…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM-i silmək mümkün deyil"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Xəta baş verdiyinə görə bu SIM-i silmək mümkün deyil.\n\nCihazı yenidən başlatdıqdan sonra cəhd edin."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Cihaza qoşulun"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> cihazınıza qoşulmaq üçün müvəqqəti Wi‑Fi şəbəkəsindən istifadə etmək istəyir"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Cihaz tapılmadı. Cihazların aktiv olması və qoşulmaq üçün əlçatan olmasından əmin olun."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Təcili zənglər"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Operator Wi‑Fi Zəngi ilə təcili zəngləri dəstəkləmir.\nTəcili zəng etmək üçün cihaz avtomotik olaraq mobil şəbəkəyə keçir.\nTəcili zənglər yalnız mobil əhatə dairələrində əlçatandır."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Keyfiyyəti təkmilləşdirmək üçün zənglər zamanı Wi‑Fi şəbəkəsindən istifadə edin"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Çarpaz SIM zəngi"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Bu SIM üzərindən başqa SIM zənglər və SMS\'lərə icazə verin."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"çarpaz sim zəngi"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Gələn MMS mesajı"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS mesajı göndərmək mümkün deyil"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Mobil data deaktiv olduqda <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> ilə MMS mesajı göndərməyə icazə vermək üçün toxunun"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Ayarlarda ekranların üst-üstə yerləşdirilməsinə icazə verin"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Digər tətbiqlər üzərində görüntülənə biləcək tətbiqlərə Ayarlar ekranlarını üst-üstə yerləşdirməyə icazə verin"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Media sessiyası bitdikdə oyunçunu gizlədin"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Oyunçu genişləndirilmiş Sürətli Ayarlar panelindən sessiyaya davam etməyə icazə verir."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Sürətli Ayarlarda media pleyer"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Oxutmanı asanlıqla davam etdirmək üçün media pleyeri daha uzun müddət göstərin"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Oyunçunu gizlədin"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Oyunçunu göstərin"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Əlçatan oyunçu yoxdur"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"İcazəli tətbiqlər"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth aktivləşəcək"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Aktiv"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Deaktiv"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"İnternet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-lər"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Güvənli təyyarə şəbəkələri"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Güvənli təyyarə şəbəkələrini tapın və qoşulun"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"təyyarə, güvənli təyyarə şəbəkəsi"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Zənglər və SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi Zəngi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi‑Fi kimi operator olmayan şəbəkələr üzərindən zəng edin və qəbul edin"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi zəngi bəzi Wi‑Fi şəbəkələri kimi operator olmayan şəbəkələr üzərindən zəng etmək və qəbul etməyinizə imkan verir."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Zənglər"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"tərcih edilənlər"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"tərcih edilən zənglər"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS tərcih edilir"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"əlçatmazdır"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM yoxdur"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Tərcihlər"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"İctimai şəbəkələrə qoşulun"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"şəbəkə bağlantısı, internet, simsiz, data, wifi, wi-fi, wi fi, mobil şəbəkə, mobil, mobil operator, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Təyyarə üçün güvənli şəbəkələrə baxın"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Təyyarə Rejimini deaktiv edin"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Yuxu vaxtı rejimi aktiv olduğuna görə əlçatan deyil"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Bildiriş əhəmiyyətinin sıfırlanması tamamlandı."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Tətbiqlər"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Güvənsiz cihaz mesajlarınıza giriş etmək istəyir. Detallar üçün toxunun."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Mesajlara girişə icazə verilsin?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Güvənsiz Bluetooth cihazı [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] mesajlarınıza giriş etmək istəyir.\n\nDaha öncə [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] cihazına qoşulmamısınız."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Güvənsiz cihaz kontaktlarınıza və zəng siyahınıza giriş etmək istəyir. Detallar üçün toxunun."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Kontaktlara və zəng siyahısına girişə icazə verilsin?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Güvənsiz Bluetooth cihazı [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] kontaktlarınıza və zəng siyahınıza giriş etmək istəyir. Gələn və gedən zənglər barədə data buna daxildir.\n\nDaha öncə [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] cihazına qoşulmamısınız."</string>
 </resources>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index c58829c..3c116dd 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Srednje"</item>
     <item msgid="6740026006576843477">"Dugačko"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kratko"</item>
+    <item msgid="7397961711906421599">"Srednje"</item>
+    <item msgid="4079132024502041928">"Dugo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Podrazumevano"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalna"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index f50080a..11c8bce 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -256,8 +256,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Datum i vreme"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Podešavanje datuma i vremena"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Podešavanje datuma, vremena, vremenske zone i formata"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Koristi vreme mreže"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Koristi vremensku zonu mreže"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Podesite vreme automatski"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Podesite vremensku zonu automatski"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Koristi podrazumevanu vrednost za lokalitet"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-časovni format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Koristi 24-časovni format"</string>
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Prikaži podatke o profilu na zaključanom ekranu"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Nalozi"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokacija"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Koristi lokaciju"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Koristite lokaciju"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Isključena"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Uključeno – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacija ima pristup lokaciji</item>
@@ -323,6 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaključavanje ekrana, otključavanje licem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaključavanje ekrana, otisak prsta"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zaključavanje ekrana"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Otključajte telefon bezbedno pomoću lica i otiska prsta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Moguće je i prijavljivanje u aplikacije i potvrđivanje plaćanja"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Podesite otključavanje pomoću:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Otključavanje licem"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Pojednostavite otključavanje telefona"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Otisak prsta"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Uštedite na vremenu i otključajte telefon u džepu"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Preskoči"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Dalje"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Lice je dodato"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Podesite otključavanje licem"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Otključavanje licem"</string>
@@ -332,6 +341,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Potvrdite identitet licem"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Započnite"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ako je otključavanje licem sa funkcijom pristupačnosti isključeno, neki koraci za podešavanje možda neće ispravno raditi sa TalkBack-om."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Nazad"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Nastavite podešavanje"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Koristite podeš. za pristupačn."</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -376,8 +388,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Uvek zahtevaj potvrdu pri korišćenju otključavanja licem u aplikacijama"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Briši podatke o licu"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Podesite otključavanje licem"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Otključajte uređaj, prijavite se u aplikaciju i potvrdite plaćanje pomoću otključavanja licem.\n\nImajte u vidu:\nAko pogledate telefon, možete nehotice da ga otključate.\n\nTelefon može da otključa neko drugi ako ga približi vašem licu.\n\nTelefon može da otključa neko ko mnogo liči na vas, na primer, identični blizanac."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Otključajte uređaj, prijavite se u aplikaciju i potvrdite plaćanje pomoću otključavanja licem.\n\nImajte u vidu:\nAko pogledate telefon, možete nehotice da ga otključate.\n\nTelefon može da otključa neko drugi ako ga približi vašem licu čak i ako su vam oči zatvorene.\n\nTelefon može da otključa neko ko mnogo liči na vas, na primer, identični blizanac."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Otključavanje licem koristite da biste otključali telefon, prijavljivali se u aplikacije i potvrđivali plaćanja."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Imajte na umu:\nAko pogledate telefon, možete i nehotice da ga otključate.\n\nTelefon može da otključa neko drugi ako ga približi vašem licu.\n\nTelefon može da otključa neko ko mnogo liči na vas, na primer, identični blizanac."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Imajte na umu:\nAko pogledate telefon, možete i nehotice da ga otključate.\n\nTelefon može da otključa neko drugi ako ga približi vašem licu, čak i ako su vam oči zatvorene.\n\nTelefon može da otključa neko ko mnogo liči na vas, na primer, identični blizanac."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Brišete podatke o licu?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Podaci o licu koje koristi otključavanje licem biće trajno i bezbedno izbrisani. Posle uklanjanja trebaće vam PIN, obrazac ili lozinka da biste otključali telefon, prijavljivali se u aplikacije i potvrđivali plaćanja."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Otključajte telefon licem"</string>
@@ -398,6 +411,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Otključavajte telefon ili odobravajte kupovine pomoću otiska prsta.\n\nNapomena: Ne možete da otključavate ovaj uređaj pomoću otiska prsta. Više informacija zatražite od administratora organizacije."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Otključavajte telefon ili odobravajte kupovine pomoću otiska prsta.\n\nNapomena: Otisak prsta može da bude manje bezbedan od jakog šablona ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Otkaži"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Nastavi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Dalje"</string>
@@ -435,6 +449,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Zaštitite tablet pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili otključavanje licem. Dodirnite Otkaži da biste se vratili."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Zaštitite uređaj pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili otključavanje licem. Dodirnite Otkaži da biste se vratili."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Zaštitite telefon pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili otključavanje licem. Dodirnite Otkaži da biste se vratili."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Zaštitite tablet pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili biometriju. Dodirnite Otkaži da biste se vratili."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Zaštitite uređaj pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili biometriju. Dodirnite Otkaži da biste se vratili."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Zaštitite telefon pomoću opcije zaključavanja ekrana da niko ne bi mogao da ga koristi ako ga izgubite ili vam ga ukradu. Opcija zaključavanja ekrana vam treba i da biste podesili biometriju. Dodirnite Otkaži da biste se vratili."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Želite li da preskočite podešavanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Želite li da preskočite podešavanje lozinke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Želite li da preskočite podešavanje šablona?"</string>
@@ -507,8 +524,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Sprečite druge da koriste ovaj tablet bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Sprečite druge da koriste ovaj uređaj bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Sprečite druge da koriste ovaj telefon bez dozvole tako što ćete aktivirati funkcije zaštite uređaja. Izaberite zaključavanje ekrana koje želite da koristite."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Izaberite rezervni način za zaključavanje ekrana"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Izaberite rezervni način za zaključavanje ekrana"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Odaberite rezervni način za zaključavanje ekrana"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcije zaključavanja ekrana"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcije zaključavanja ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zaključavanje ekrana"</string>
@@ -540,6 +556,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Otključavanje licem + lozinka"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Nastavite bez otključavanja licem"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Možete da otključate telefon pomoću lica. Ova opcija zahteva rezervni metod zaključavanja ekrana iz bezbednosnih razloga."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrija + šablon"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrija + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrija + lozinka"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Nastavite bez biometrije"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Možete da otključate telefon pomoću biometrije. Ova opcija zahteva rezervni metod zaključavanja ekrana iz bezbednosnih razloga."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogućio administrator, smernice za šifrovanje ili skladište akreditiva"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Prevucite"</string>
@@ -627,7 +648,6 @@
       <item quantity="other">Mora da sadrži manje od <xliff:g id="NUMBER_1">%d</xliff:g> cifara</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administrator uređaja ne dozvoljava upotrebu nedavno korišćenog PIN-a"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT administrator blokira česte PIN-ove. Izaberite drugi PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ne sme da obuhvata nevažeći znak"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Mora da sadrži najmanje jedno slovo"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Mora da sadrži najmanje jednu cifru"</string>
@@ -668,7 +688,6 @@
       <item quantity="other">Mora da sadrži najmanje <xliff:g id="COUNT">%d</xliff:g> znakova koji nisu brojevi</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administrator uređaja ne dozvoljava upotrebu nedavno korišćene lozinke"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT administrator blokira česte lozinke. Izaberite drugu lozinku."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Rastući, opadajući ili ponovljeni niz cifara nije dozvoljen"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Otkaži"</string>
@@ -812,7 +831,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Uključivanje WiFi-a"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Koristi WiFi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Koristi WiFi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"WiFi podešavanja"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Podešavanje i upravljanje bežičnim pristupnim tačkama"</string>
@@ -920,7 +939,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Postavite QR kôd u nastavku da biste dodali uređaj na mrežu „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Povežite se na Wi‑Fi mrežu tako što ćete skenirati QR kôd"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Deli Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skenirajte ovaj QR kôd da biste se povezali sa „<xliff:g id="SSID">%1$s</xliff:g>“ i delili lozinku"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skenirajte ovaj QR kôd pomoću drugog uređaja da biste se pridružili mreži <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skenirajte ovaj QR kôd da biste se pridružili mreži „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Probajte ponovo. Ako se problem nastavi, kontaktirajte proizvođača uređaja"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Došlo je do greške"</string>
@@ -946,8 +965,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Lozinka za WiFi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Lozinka hotspota: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatsko povezivanje"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Dozvolite telefonu da se automatski povezuje u blizini ove mreže"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Dozvolite tabletu da se automatski povezuje u blizini ove mreže"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Dozvolite povezivanje sa ovom mrežom kada je uređaj u dometu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Dodaj uređaj"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Koristite QR kôd da biste dodali uređaj na ovu mrežu"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kôd nije u važećem formatu"</string>
@@ -959,7 +977,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Koristi sertifikate sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne pružaj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne proveravaj"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nije naveden nikakav sertifikat. Veza neće biti privatna."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Naziv mreže je predugačak."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Morate da navedete domen."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikat je obavezan."</string>
@@ -986,6 +1003,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Poveži"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"WiFi je uključen"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Povezano je na mrežu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Povezujete se na <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Povezuje se…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Povezivanje sa mrežom nije uspelo"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Mreža nije u dometu"</string>
@@ -1016,6 +1034,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC adresa uređaja"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Nasumična MAC adresa"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Nasumična MAC adresa (poslednji put korišćena)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresa"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalji o mreži"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podmreže"</string>
@@ -1023,8 +1042,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 adrese"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Sačuvane mreže"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Pretplate"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Ostale mreže"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP podešavanja"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Napredna podešavanja Wi‑Fi mreže nisu dostupna za ovog korisnika"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Sačuvaj"</string>
@@ -1033,8 +1051,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Unesite važeću adresu mrežnog prolaza."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Unesite važeću DNS adresu."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Unesite prefiks mreže dužine između 0 i 32 znaka."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (osim ako ga ne zameni privatni DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (osim ako ga ne zameni privatni DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Mrežni prolaz"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Dužina prefiksa mreže"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1060,7 +1078,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacija deli sadržaj. Da biste delili internet vezu, isključite, pa uključite hotspot"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Niste podesili lozinku"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Naziv hotspota"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> se uključuje..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Uključuje se WiFi hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Drugi uređaji mogu da se povežu sa hotspotom <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Lozinka hotspota"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Opseg pristupne tačke"</string>
@@ -1210,7 +1228,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Tečni prikaz"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatski podiže učestalost osvežavanja sa 60 na 90 Hz za određeni sadržaj. Povećava potrošnju baterije."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Tečni prikaz"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Nametni učestalost osvežavanja od 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Najveća učestalost osvežavanja za poboljšan odziv na dodir i kvalitet animacije. Povećava potrošnju baterije."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Pažnja ekrana"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Uključeno/ekran se neće isključiti ako gledate u njega"</string>
@@ -1301,6 +1319,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kada je ekran taman, uključuje se ambijentalni ekran za nova obaveštenja"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Uvek prikazuj vreme i podatke"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Potrošnja baterije je povećana"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Podebljani tekst"</string>
     <string name="title_font_size" msgid="570613010306330622">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Omogućava da tekst bude veći ili manji"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Zaključavanje SIM kartice"</string>
@@ -1350,7 +1369,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android verzija"</string>
     <string name="security_patch" msgid="4071756145347865382">"Bezbednosno ažuriranje za Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model i hardver"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Verzija hardvera"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID opreme"</string>
@@ -1371,7 +1389,7 @@
     <string name="storage_settings_summary" product="default" msgid="267557695753980969">"Oslobađanje SD kartice, prikaz dostupnog skladišta"</string>
     <string name="imei_multi_sim" msgid="71477088017585479">"IMEI (otvor za SIM: %1$d)"</string>
     <string name="view_saved_network" msgid="1232387673095080910">"Da biste videli, odaberite sačuvanu mrežu"</string>
-    <string name="status_number" product="tablet" msgid="3597945414666253183">"Broj mobilnog direktorijuma"</string>
+    <string name="status_number" product="tablet" msgid="3597945414666253183">"Broj mobilnog foldera"</string>
     <string name="status_number" product="default" msgid="8407999629121682207">"Broj telefona"</string>
     <string name="status_number_sim_slot" product="tablet" msgid="6582203988975619529">"MDN (otvor za SIM: %1$d)"</string>
     <string name="status_number_sim_slot" product="default" msgid="5724823197745786398">"Br. tel. (otvor za SIM: %1$d)"</string>
@@ -1599,7 +1617,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Izbriši naziv pristupne tačke"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nov naziv pristupne tačke"</string>
     <string name="menu_save" msgid="6611465355127483100">"Sačuvaj"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Odbaci"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Otkaži"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Polje Naziv ne sme da bude prazno."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Polje Naziv pristupne tačke ne sme da bude prazno."</string>
@@ -1614,8 +1632,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Aplikacije mogu da se resetuju"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Resetuj WiFi, mobilnu mrežu i Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Ovim resetujete sva podešavanja mreže, uključujući:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobilne podatke"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Obriši"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Obriši preuzete SIM kartice"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Da biste preuzeli zamenske SIM kartice, kontaktirajte mobilnog operatera. Time se neće otkazati nijedan tarifni paket."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Ovim ne otkazujete nijedan tarifni paket. Da biste preuzimali rezervne SIM kartice, obratite se mobilnom operateru."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Resetuj podešavanja"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Želite li da resetujete sva podešavanja mreže? Ova radnja ne može da se opozove."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Želite li da resetujete podešavanja mreže i obrišete preuzete SIM kartice? Ova radnja ne može da se opozove."</string>
@@ -1625,31 +1644,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Podešavanja mreže su resetovana"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Brisanje SIM kartica nije uspelo"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Preuzete SIM kartice ne mogu da se obrišu zbog greške.\n\nRestartujte uređaj i probajte ponovo."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Izbriši sve podatke (vrati na fabrička podešavanja)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Izbriši sve podatke (vrati na fabrička podešavanja)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" tableta, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"podatke i podešavanja sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" telefona, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"Podaci i podešavanja sistema i aplikacija"</li>\n<li>"Preuzete aplikacije"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Trenutno ste prijavljeni na sledeće naloge:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Na ovom uređaju su prisutni i drugi korisnici.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muzika"</li>\n<li>"Fotografije"</li>\n<li>"Drugi korisnički podaci"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ovi"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Na taj način nećete otkazati mobilni tarifni paket."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Da biste obrisali muziku, slike i druge korisničke podatke, treba da izbrišete "<b>"USB memoriju"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Da biste obrisali muziku, slike i druge korisničke podatke, treba da izbrišete sadržaj "<b>"SD kartice"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Obriši sve podatke (fabrička podešavanja)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Obriši sve podatke (fabrička podešavanja)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" tableta, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"podatke i podešavanja sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ovim brišete sve podatke iz "<b>"interne memorije"</b>" telefona, uključujući:\n\n"<li>"Google nalog"</li>\n<li>"podatke i podešavanja sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Trenutno ste prijavljeni na sledeće naloge:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Na ovom uređaju su prisutni i drugi korisnici.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muzika"</li>\n<li>"Slike"</li>\n<li>"Drugi podaci korisnika"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ovi"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Na taj način nećete otkazati mobilni tarifni paket."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Da biste obrisali muziku, slike i druge podatke korisnika, treba da obrišete "<b>"USB memoriju"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Da biste obrisali muziku, slike i druge podatke korisnika, treba da obrišete sadržaj "<b>"SD kartice"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Izbriši USB memoriju"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Izbriši SD karticu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Obriši sve podatke iz interne USB memorije, kao što su muzika i fotografije."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Izbriši sve podatke sa SD kartice, kao što su muzika ili fotografije"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Izbriši sve podatke"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Izbriši sve podatke"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Izbrisaćete sve lične informacije i preuzete aplikacije. Ova radnja ne može da se opozove."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Sve lične informacije, uključujući preuzete aplikacije i SIM kartice, biće izbrisane. Ova radnja ne može da se opozove."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Izbriši sve"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nije obavljeno vraćanje na početne vrednosti zato što usluga brisanja sistema nije dostupna."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Izbrisati sve podatke?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Resetovanje na fabrička podešavanja nije dostupno za ovog korisnika"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Brisanje"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Sačekajte..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Obriši sve podatke"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Obriši sve podatke"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Izbrisaćete sve lične podatke i preuzete aplikacije. Ova radnja ne može da se opozove."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Svi lični podaci, uključujući preuzete aplikacije i SIM kartice, biće izbrisani. Ova radnja ne može da se opozove."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Želite da obrišete sve podatke?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Resetovanje na fabrička podešavanja nije dostupno za ovog korisnika"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Briše se"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Sačekajte…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Podešavanja poziva"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Podešavanje glasovne pošte, preusmeravanja poziva, stavljanja poziva na čekanje, ID-a pozivaoca"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB privezivanje"</string>
@@ -1697,7 +1714,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Privezivanje na više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja nije moguće."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Internet veza sa uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> će biti prekinuta."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Privezivanje eterneta"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Deljenje internet veze telefona preko USB eterneta"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Deljenje internet veze telefona preko eterneta"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Koristite hotspot i privezivanje da biste obezbedili internet drugim uređajima pomoću veze za mobilne podatke. Aplikacije mogu da prave hotspotove i za deljenje sadržaja sa uređajima u blizini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Koristite hotspot i privezivanje da biste omogućili internet na drugim uređajima pomoću Wi‑Fi veze ili veze za prenos podataka preko mobilnog operatera. Aplikacije mogu i da prave hotspotove za deljenje sadržaja sa uređajima u blizini."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomoć"</string>
@@ -1740,6 +1757,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth skeniranje"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dozvolite aplikacijama i uslugama da traže uređaje u blizini u svakom trenutku, čak i kada je Bluetooth isključen. Ovo može da se koristi, na primer, za poboljšanje funkcija i usluga zasnovanih na lokaciji."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Otkrivanje vremenske zone lokacije"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Otkrivanje vremenske zone lokacije"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Omogućava da se lokacija uređaja koristi za otkrivanje aktuelne vremenske zone. Druga podešavanja lokacije, poput Wi‑Fi skeniranja, mogu da utiču na preciznost otkrivanja vremenske zone."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Uključeno"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Isključeno"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatsko otkrivanje vremenske zone je onemogućeno"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Otkrivanje vremenske zone lokacije je onemogućeno"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Otkrivanje vremenske zone lokacije nije podržano"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Promene otkrivanja vremenske zone lokacije nisu dozvoljene"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Lokac. na osnovu WiFi i mob. mreže"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Neka apl. koriste Google-ovu uslugu lociranja za brže određivanje lokacije. Anonimni podaci o lokaciji prikupljaće se i slati Google-u."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Lokacija se određuje pomoću WiFi-a"</string>
@@ -1803,6 +1829,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Otključavanje licem zahteva lozinku"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Otključavanje licem zahteva šablon"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Otključavanje licem zahteva PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Podesite lozinku za korišćenje biometrije"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Podesite šablon za korišćenje biometrije"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Podesite PIN za korišćenje biometrije"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Zaboravili ste lozinku?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Zaboravili ste šablon?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Zaboravili ste PIN?"</string>
@@ -2141,13 +2170,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Podešavanja titla"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Uvećanje"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Oblast za uvećanje"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Omogućite uvećanje"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Odaberite oblasti za uvećanje koje želite da koristite kada uvećavate ekran"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Ceo ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Deo ekrana"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Ceo ekran i deo ekrana"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Uvećajte ceo ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Uvećajte deo ekrana"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Želite li da pređete na dugme Pristupačnost?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ako uvećate deo ekrana pomoću trostrukog dodira, unos teksta i druge radnje se odlažu.\n\nŽelite li da pređete na uveličavanje pomoću dugmeta Pristupačnost?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Pređi na dugme Pristupačnost"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Zadrži uveličavanje pomoću trostrukog dodira"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Podešavanja uvećanja"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Uvećanje pomoću trostrukog dodira"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Uvećavajte pomoću prečice"</string>
@@ -2201,11 +2233,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Dugme uključi/isključi prekida poziv"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Veliki pokazivač miša"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Ukloni animacije"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono zvuk"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombinuj kanale pri puštanju audio sadržaja"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balans zvuka"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Levo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Desno"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono zvuk"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombinujte kanale pri puštanju audio sadržaja"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balans zvuka"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Levo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Desno"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Podrazumevano"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekundi"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekundi"</string>
@@ -2235,11 +2267,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibriranje obaveštenja"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibriranje zvona"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Dodirne povratne informacije"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Koristite aplikaciju <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otvorite aplikaciju <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Koristi korekciju boja"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Prikaži titl"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Samo za podržane aplikacije"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Koristite aplikaciju <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otvorite aplikaciju <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Koristite korekciju boja"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Prikažite titl"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Samo za podržane aplikacije"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Veličina i stil titla"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Veličina teksta: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Još opcija"</string>
@@ -2270,6 +2302,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Sivilo"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo-žuto"</string>
@@ -2405,7 +2438,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ograničenje aplikacija u pozadini"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Dozvolite aplikaciji da se pokreće u pozadini"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikacije kojima nije dozvoljeno pokretanje u pozadini"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Aplikacije u pozadini ne možete da ograničite"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Korišćenje u pozadini ne možete da ograničite"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Želite li da ograničite aktivnosti u pozadini?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ako ograničite aktivnosti aplikacije u pozadini, možda će se ponašati neočekivano."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Apl. nije podešena za optimizaciju baterije, pa ne možete da je ograničite. \n\nZa ogr. apl. uključite optimizaciju baterije."</string>
@@ -2454,6 +2487,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet ste koristili duže nego obično"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Uređaj ste koristili duže nego obično"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Baterija može da se isprazni ranije nego obično"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimizuje se radi dobrog stanja baterije"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Baterija je trenutno ograničena. Dodirnite da biste saznali više."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Uređaj ste koristili duže nego obično. Baterija može da se isprazni ranije od očekivanog.\n\nAplikacije sa najvećom potrošnjom baterije:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablet ste koristili duže nego obično. Baterija može da se isprazni ranije od očekivanog.\n\nAplikacije sa najvećom potrošnjom baterije:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Uređaj ste koristili duže nego obično. Baterija može da se isprazni ranije od očekivanog.\n\nAplikacije sa najvećom potrošnjom baterije:"</string>
@@ -2516,6 +2551,8 @@
       <item quantity="other">%1$d aplikacija je ograničeno</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problem sa očitavanjem merača baterije"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problem sa očitavanjem merača baterije. Dodirnite da biste "<annotation id="url">"saznali više"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Zaustavljate aplikaciju?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Telefon ne može da upravlja baterijom na uobičajen način jer mu <xliff:g id="APP">%1$s</xliff:g> ne dozvoljava da pređe u stanje spavanja.\n\nDa biste rešili ovaj problem, možete da zaustavite tu aplikaciju.\n\nAko se ovo dešava i dalje, možda treba da deinstalirate aplikaciju da biste poboljšali performanse baterije."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Tablet ne može da upravlja baterijom na uobičajen način jer mu <xliff:g id="APP">%1$s</xliff:g> ne dozvoljava da pređe u stanje spavanja.\n\nDa biste rešili ovaj problem, možete da zaustavite tu aplikaciju.\n\nAko se ovo dešava i dalje, možda treba da deinstalirate aplikaciju da biste poboljšali performanse baterije."</string>
@@ -2629,9 +2666,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Podesite raspored"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Produžite trajanje baterije"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Isključi kada se napuni"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Ušteda baterije se isključuje kada je telefon na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Ušteda baterije se isključuje kada je tablet na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Ušteda baterije se isključuje kada je uređaj na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Ušteda energije se isključuje kada je telefon napunjen više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Ušteda energije se isključuje kada je tablet napunjen više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Ušteda energije se isključuje kada je uređaj napunjen više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Uključi"</string>
@@ -2696,6 +2733,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Resetuj"</string>
     <string name="tts_play" msgid="2945513377250757221">"Pusti"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Prilagodljivo povezivanje"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Produžuje trajanje baterije i poboljšava učinak uređaja tako što automatski upravlja mrežnim vezama"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Skladište akreditiva"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instaliraj sertifikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instaliraj sertifikate iz memorije"</string>
@@ -2707,9 +2746,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Korisnički akreditivi"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Pregledajte i menjajte sačuvane akreditive"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Napredna"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tip memorijskog prostora"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Podržan hardverom"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverski"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Akreditivi nisu dostupni za ovog korisnika"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirano za VPN i aplikacije"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalirano za WiFi"</string>
@@ -2725,6 +2761,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ne instaliraj"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Ipak instaliraj"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sertifikat nije instaliran"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Želite da dozvolite da <xliff:g id="APP_NAME">%s</xliff:g> instalira sertifikate na ovom uređaju?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Ovi sertifikati će potvrditi vaš identitet za aplikacije i URL-ove u nastavku"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Ne dozvoli"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Dozvoli"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Prikaži više"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Upravljanje sertifikatima"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Nema"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Sertifikati koje ova aplikacija instalira identifikuju vas aplikacijama i URL-ovima u nastavku"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Ukloni"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Signal za hitne pozive"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Podešavanje ponašanja kada se uspostavlja hitan poziv"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Rezervne kopije"</string>
@@ -3053,7 +3098,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nije podešeno – poslovni profil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Vi (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nadimak"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Možete da dodate najviše <xliff:g id="USER_COUNT">%1$d</xliff:g> korisnika"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Samo vlasnik tableta može da upravlja korisnicima."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Samo vlasnik telefona može da upravlja korisnicima."</string>
@@ -3103,7 +3147,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Plaćanje na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Podesite aplikaciju za plaćanje. Zatim samo zadržite zadnji deo telefona pored bilo kog terminala sa simbolom za povezivanje bez kontakta."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Važi"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Još..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Još…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Podesite podrazumevanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ažurirajte podrazumevanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na terminalu za beskontaktno plaćanje koristiće se <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3173,9 +3217,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Nazad"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Dalje"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Završi"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Slikajte"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Odaberite sliku"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Izaberite sliku"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartice"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartice"</string>
@@ -3187,7 +3228,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Uvek koristi ovo za pozive"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Izaberite SIM karticu za podatke"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Izaberite SIM za SMS-ove"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Prebacuje se SIM za podatke. To može da potraje do jedan minut..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Prebacuje se SIM za podatke. To može da potraje do jedan minut…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Pozovi pomoću"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Izbor SIM kartice"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM kartica <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3372,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, raspored, ušteda baterije, ušteda energije, baterija, automatsko, procenat"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, napredno pozivanje, 4g pozivanje"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dodaj jezik, dodajte jezik"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"veličina teksta"</string>
     <string name="default_sound" msgid="6604374495015245195">"Podrazumevani zvuk"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Jačina zvuka za zvono i obaveštenja je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Jačina zvuka, vibracija, Ne uznemiravaj"</string>
@@ -3370,12 +3412,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Zvukovi pri uključivanju"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Titl uživo"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatski titl za medije"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ništa"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> raspored je podešen</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda su podešena</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda je podešeno</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nijedan}=1{1 raspored je podešen}one{# raspored je podešen}few{# rasporeda su podešena}other{# rasporeda je podešeno}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne uznemiravaj"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Dobijajte obaveštenja samo od važnih osoba i aplikacija"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograničite prekide"</string>
@@ -3443,22 +3480,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Samo prioritetni prekidi"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Isključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Isključeno"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Uključeno"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pitaj svaki put"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dok ne isključite"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> sat</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> sata</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> sati</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> raspored može da se uključuje automatski</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda mogu da se uključuju automatski</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda može da se uključuje automatski</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 sat}one{# sat}few{# sata}other{# sati}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minut}one{# minut}few{# minuta}other{# minuta}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Isključeno}=1{Isključeno/1 raspored može da se uključuje automatski}one{Isključeno/# raspored može da se uključuje automatski}few{Isključeno/# rasporeda mogu da se uključuju automatski}other{Isključeno/# rasporeda može da se uključuje automatski}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Šta može da prekine režim Ne uznemiravaj"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Ljudi"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
@@ -3491,7 +3518,7 @@
     <string name="work_sync_dialog_yes" msgid="9161415252411868574">"Zameni"</string>
     <string name="work_sync_dialog_message" msgid="1328692374812258546">"Zvukovi sa ličnog profila će se koristiti za poslovni profil"</string>
     <string name="ringtones_install_custom_sound_title" msgid="3885712267015760638">"Dodati prilagođeni zvuk?"</string>
-    <string name="ringtones_install_custom_sound_content" msgid="5844996763705884979">"Ova datoteka će biti kopirana u direktorijum <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
+    <string name="ringtones_install_custom_sound_content" msgid="5844996763705884979">"Ova datoteka će biti kopirana u folder <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Melodije zvona"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Drugi zvukovi i vibracije"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Obaveštenja"</string>
@@ -3504,6 +3531,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatski podešava obaveštenja nižeg prioriteta na Diskretno"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Prilagodljivo rangiranje obaveštenja"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatski rangira obaveštenja prema relevantnosti"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivim obaveštenjima"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Označite podešavanja obaveštenja i prikažite opciju za slanje povratnih informacija sistemu"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Resetujte važnost obaveštenja"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Resetujte podešavanja važnosti koja je promenio korisnik i omogućite pomoćniku za obaveštenja da određuje prioritet"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predložene radnje i odgovori"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatski prikazuje predložene radnje i odgovore"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Pogledajte nedavna i odložena obaveštenja"</string>
@@ -3602,8 +3633,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioritetne konverzacije"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Prikazuju se u vrhu odeljka za konverzacije i u obliku oblačića"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Prikazuju se u vrhu odeljka za konverzacije"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Ostale konverzacije"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Konverzacije koje nisu prioritetne"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Konverzacije koje ste menjali"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Nedavne konverzacije"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Obriši nedavno"</string>
+    <string name="clear" msgid="5092178335409471100">"Obriši"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prikaži prioritetne konverzacije u oblačićima"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritetne konverzacije se prikazuju u vrhu kliznog panela. Možete i da ih podesite tako da imaju oblačiće i da prekidaju režim Ne uznemiravaj."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Prioritetne i izmenjene konverzacije se prikazuju ovde"</string>
@@ -3705,7 +3739,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Pristup opciji Ne uznemiravaj"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Dozvoli režim Ne uznemiravaj"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nijedna instalirana aplikacija nije zahtevala pristup opciji Ne uznemiravaj"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Učitavaju se aplikacije..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Aplikacije se učitavaju…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Na vaš zahtev, Android blokira prikazivanje obaveštenja ove aplikacije na ovom uređaju"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Na vaš zahtev, Android blokira prikazivanje ove kategorije obaveštenja na ovom uređaju"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Na vaš zahtev, Android blokira prikazivanje ove grupe obaveštenja na ovom uređaju"</string>
@@ -3800,12 +3834,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Sve konverzacije"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritetne konverzacije"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ništa"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzacija</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzacije</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzacija</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ništa"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nijedna}=1{1 konverzacija}one{# konverzacija}few{# konverzacije}other{# konverzacija}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ko može da prekida"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Pozivi"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Pozivi"</string>
@@ -3814,12 +3843,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Da biste bili sigurni da će se dozvoljeni pozivi čuti, proverite da li je uređaj podešen da zvoni"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Dolazni pozivi su blokirani za „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Možete da prilagodite podešavanja i dozvolite prijateljima, članovima porodice ili drugim kontaktima da dopru do vas."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakti sa zvezdicom"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-      <item quantity="few">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osobe</item>
-      <item quantity="other">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ništa"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nijedan}=1{{contact_1}}=2{{contact_1} i {contact_2}}=3{{contact_1}, {contact_2} i {contact_3}}one{{contact_1}, {contact_2} i još #}few{{contact_1}, {contact_2} i još #}other{{contact_1}, {contact_2} i još #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Bez imena)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Poruke"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"poruke"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Poruke"</string>
@@ -3828,12 +3853,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Dolazne poruke su blokirane za „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Možete da prilagodite podešavanja i dozvolite prijateljima, članovima porodice ili drugim kontaktima da dopru do vas."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Dostupni ste za sve poruke"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Dostupni ste za sve pozive"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ništa"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakt</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakta</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakata</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nijedan}=1{1 kontakt}one{# kontakt}few{# kontakta}other{# kontakata}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Svi"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakti"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakti sa zvezdicom"</string>
@@ -3871,24 +3891,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Sva obaveštenja"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Neka obaveštenja"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Izabrani ljudi i dalje dopiru do vas čak i ako ne omogućite aplikacijama da vas prekidaju"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> mogu da prekinu</item>
-      <item quantity="few"><xliff:g id="APP_NAMES">%s</xliff:g> mogu da prekinu</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> mogu da prekinu</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nijedna aplikacija ne može da prekine}=1{{app_1} može da prekine}=2{{app_1} i {app_2} mogu da prekinu}=3{{app_1}, {app_2} i {app_3} mogu da prekinu}one{Aplikacije {app_1}, {app_2} i još # mogu da prekinu}few{Aplikacije {app_1}, {app_2} i još # mogu da prekinu}other{Aplikacije {app_1}, {app_2} i još # mogu da prekinu}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacije"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Sva obaveštenja"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Neka obaveštenja"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Obaveštenja koja mogu da prekidaju"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Omogući sva obaveštenja"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu da prekinu</item>
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu da prekinu</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu da prekinu</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ništa ne može da prekine"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ništa ne može da prekine}=1{{sound_category_1} može da prekine}=2{{sound_category_1} i {sound_category_2} mogu da prekinu}=3{{sound_category_1}, {sound_category_2} i {sound_category_3} mogu da prekinu}one{Zvukovi {sound_category_1}, {sound_category_2} i još # mogu da prekinu}few{Zvukovi {sound_category_1}, {sound_category_2} i još # mogu da prekinu}other{Zvukovi {sound_category_1}, {sound_category_2} i još # mogu da prekinu}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ništa ne može da prekine"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niko ne može da prekine"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Neki ljudi mogu da prekinu"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Svi ljudi mogu da prekinu"</string>
@@ -3936,8 +3946,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Uključeno"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Isključeno"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Kačenje aplikacija"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Kačenje aplikacija vam omogućava da zadržite prikaz aplikacije dok je ne otkačite. Pomoću ove funkcije možete, na primer, da dozvolite pouzdanom prijatelju da igra određenu igru. \n\nKada je aplikacija zakačena, može da otvara druge aplikacije i lični podaci mogu da budu dostupni. \n\nDa biste koristili kačenje aplikacija: 	\n1.	Uključite kačenje aplikacija 	\n2.	Otvorite Pregled 	\n3.	Dodirnite ikonu aplikacije u vrhu ekrana, pa dodirnite Zakači"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Kačenje aplikacija vam omogućava da zadržite prikaz aktuelne aplikacije dok je ne otkačite. Pomoću ove funkcije možete, na primer, da dozvolite pouzdanom prijatelju da igra određenu igru. \n\nKada je aplikacija zakačena, može da otvara druge aplikacije i lični podaci mogu da budu dostupni. \n\nAko želite da bezbedno delite uređaj sa nekim, bolje koristite profil gosta. \n\nDa biste koristili kačenje aplikacija: 	\n1.	Uključite kačenje aplikacija 	\n2.	Otvorite Pregled 	\n3.	Dodirnite ikonu aplikacije u vrhu ekrana, pa dodirnite Zakači"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Kačenje aplikacija vam omogućava da zadržite prikaz aktuelne aplikacije dok je ne otkačite. Pomoću ove funkcije možete, na primer, da dozvolite pouzdanom prijatelju da igra određenu igru."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Kada je aplikacija zakačena, može da otvara druge aplikacije i lični podaci mogu da budu dostupni. \n\nDa biste koristili kačenje aplikacija: 	\n1.	Uključite kačenje aplikacija 	\n2.	Otvorite Pregled 	\n3.	Dodirnite ikonu aplikacije u vrhu ekrana, pa dodirnite Zakači"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Kada je aplikacija zakačena, može da otvara druge aplikacije i lični podaci mogu da budu dostupni. \n\nAko želite da bezbedno delite uređaj sa nekim, bolje koristite profil gosta. \n\nDa biste koristili kačenje aplikacija: 	\n1.	Uključite kačenje aplikacija 	\n2.	Otvorite Pregled 	\n3.	Dodirnite ikonu aplikacije u vrhu ekrana, pa dodirnite Zakači"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Kada je aplikacija zakačena: \n\n•	 Mogu da budu dostupni lični podaci \n		(na primer, kontakti i sadržaj imejlova) \n•	 Zakačena aplikacija može da otvara druge aplikacije \n\nKoristite kačenje aplikacija samo sa ljudima kojima verujete."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Traži šablon za otključavanje pre otkačinjanja"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Traži PIN pre otkačinjanja"</string>
@@ -3959,6 +3970,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Pored toga što možete da otključavate uređaj pomoću lica, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži PIN pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva unos PIN-a pri pokretanju uređaja?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Pored toga što možete da otključavate uređaj pomoću lica, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži šablon pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva unos šablona pri pokretanju uređaja?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Pored toga što možete da otključavate uređaj pomoću lica, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži lozinke pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva unos lozinke pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Pored toga što možete da otključavate uređaj pomoću biometrije, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži PIN pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva unos PIN-a pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Pored toga što možete da otključavate uređaj pomoću biometrije, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži šablon pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva šablon pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Pored toga što možete da otključavate uređaj pomoću biometrije, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži lozinku pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Želite li da se zahteva unos lozinke pri pokretanju uređaja?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Da"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ograničeno"</string>
@@ -4142,7 +4156,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB kontroliše:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Povezani uređaj"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ovaj uređaj"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Menja se..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Menja se…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Promena nije uspela"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Punjenje uređaja"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Punjenje povezanog uređaja"</string>
@@ -4340,6 +4354,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Potrošnja mobil. podataka"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Korišćenje podataka aplikacije"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Potrošnja WiFi podataka"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Potrošnja podataka koji ne pripadaju mobilnom operateru"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Potrošnja podataka na eternetu"</string>
     <string name="wifi" msgid="2932584495223243842">"WiFi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Eternet"</string>
@@ -4359,6 +4374,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Obračun podataka kod mobilnog operatera se možda razlikuje od obračuna uređaja."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ne obuhvata podatke koje koriste mreže mobilnih operatera"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Podesi upozorenje o podacima"</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozorenje za potrošnju podataka"</string>
@@ -4396,7 +4412,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Prikaži detalje"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Ušteda podataka"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neograničen pristup podacima"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Prenos podataka u pozadini je isključen"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Pozadinski podaci su isključeni"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Uključeno"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Isključeno"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Koristi Uštedu podataka"</string>
@@ -4419,7 +4435,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ako je uređaj zaključan, spreči unos odgovora ili drugog teksta u obaveštenja"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Podrazumevana provera pravopisa"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Izaberite proveru pravopisa"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Koristi proveru pravopisa"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Koristite proveru pravopisa"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nije izabrano"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nijedno)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4529,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Da bi oslobodio memorijski prostor, menadžer memorijskog prostora uklanja rezervne kopije slika i video snimaka sa uređaja."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Uklonite slike i video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Menadžer memorijskog prostora"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Koristi Menadžer memorijskog prostora"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Koristite menadžer memorijskog prostora"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatska"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ručna"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Oslobodi prostor"</string>
@@ -4551,6 +4567,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dvaput dodirnite telefon da biste ga proverili"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dvaput dodirnite tablet da biste ga proverili"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dvaput dodirnite uređaj da biste ga proverili"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Prevucite za obaveštenja"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Prevucite nadole na donjoj ivici ekrana radi prikazivanja obaveštenja"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Režim jednom rukom"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Koristi režim jednom rukom"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Izađi pri prelasku sa jedne aplikacije na drugu"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Vremensko ograničenje"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunde"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekundi"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekundi"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"dostupnost"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Da biste proverili vreme, obaveštenja i druge informacije, dvaput dodirnite ekran."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Podignite telefon da biste ga proverili"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Podignite tablet da biste ga proverili"</string>
@@ -4563,6 +4589,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dodirnite da biste proverili tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dodirnite da biste proverili uređaj"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Da biste proverili vreme, obaveštenja i druge informacije, dodirnite ekran."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Hitni slučajevi"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Koristi hitne slučajeve"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Pokrenite radnje u nastavku tako što ćete brzo pritisnuti dugme za uključivanje najmanje 5 puta"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Pusti alarm za odbrojavanje"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Pustite glasan zvuk pre nego što zatražite pomoć"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Pozovite da biste dobili pomoć"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Broj telefona za pomoć"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Dodirnite da biste promenili"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Ako unesete broj koji nije za hitne slučajeve:\n • Uređaj mora da bude otključan radi korišćenja hitnih slučajeva\n • Možda se niko neće javiti na poziv"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Prevucite prstom za obaveštenja"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Prevucite prstom"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Da biste proverili obaveštenja, prevucite prstom nadole po senzoru za otisak prsta na zadnjoj strani telefona."</string>
@@ -4695,6 +4731,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maksimalan broj vidljivih skupova podataka"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Resetuj na podrazumevane vrednosti"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Opcije za programera za automatsko popunjavanje su resetovane"</string>
+    <string name="location_category" msgid="3496759112306219062">"Lokacija"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indikator lokacije statusne trake"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Prikaži sve lokacije, uključujući mrežu i povezivanje"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Prinudno pokreni puna GNSS merenja"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Prati sve GNSS konstalacije i frekvencije bez ciklusa rada"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema uređaja"</string>
     <string name="default_theme" msgid="4815428567082263639">"Podrazumevana"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Naziv mreže"</string>
@@ -4711,8 +4752,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pauzirajte obaveštenja radi bolje koncentracije"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funkcija nije dostupna"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Ova funkcija je isključena jer usporava telefon"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Prinudno pokreni puna GNSS merenja"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Prati sve GNSS konstalacije i frekvencije bez ciklusa rada"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Uvek prikazuj dijalog o otkazivanju"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Prikaži dijalog svaki put kada aplikacija otkaže"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Izaberi aplikaciju omogućenu za ANGLE"</string>
@@ -4724,7 +4763,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogući za sve aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Izaberite upravljački program za grafiku"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Podrazumevano"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Upravljački program za igre"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Upravljački program za igre"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Upravljački program za programere"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistemski upravljački program za grafiku"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4780,7 +4819,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Uključeno (zvuk je isključen)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Isključeno"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detalji o mreži"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Ime uređaja vide aplikacije na telefonu. Mogu da ga vide i drugi ljudi kad se povežete sa Bluetooth uređajima ili podesite WiFi hotspot."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Aplikacije na telefonu mogu da vide naziv uređaja. I drugi ljudi mogu da vide naziv uređaja mogu kada se povežete sa Bluetooth uređajima ili WiFi mrežom ili podesite WiFi hotspot."</string>
     <string name="devices_title" msgid="649715719278562515">"Uređaji"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Sva podešavanja"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Predlozi"</string>
@@ -4793,6 +4832,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nismo uspeli da pronađemo mreže. Probajte ponovo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(zabranjeno)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nema SIM kartice"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nema SIM kartice"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nema"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Neophodan je SIM radi povezivanja"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Neophodan je <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM radi povezivanja"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Željeni režim mreže: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Željeni režim mreže: samo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Željeni režim mreže: samo WCDMA"</string>
@@ -4846,6 +4890,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilni podaci"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Koristi podatke preko mobilne mreže"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon će automatski preći na ovog operatera kada bude u dometu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM kartica nije dostupna"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Podešavanje poziva"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Željena podešavanja za SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pitaj svaki put"</string>
@@ -4907,6 +4952,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada je uspostavljena veza sa operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Prikaži još"</string>
     <string name="see_less" msgid="2642392725363552793">"Prikaži manje"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Želite li da uključite uslugu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Želite li da uključite SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Želite li da pređete na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Želite li da pređete na SIM karticu?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"U datom trenutku može da bude aktivna samo jedna SIM kartica.\n\nPrebacivanjem na <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nećete otkazati uslugu <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"U datom trenutku može da bude aktivna samo jedna preuzeta SIM kartica.\n\nPrebacivanjem na <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nećete otkazati uslugu <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"U datom trenutku može da bude aktivna samo jedna SIM kartica.\n\nPrebacivanjem nećete otkazati uslugu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Pređi na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Povezuje se sa mrežom…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Prelazi se na <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Promena mobilnog operatera nije uspela"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Promena mobilnog operatera nije uspela zbog greške."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Želite li da isključite uslugu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Želite li da isključite SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM se isključuje<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Onemogućavanje mobilnog operatera nije uspelo"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Došlo je do greške i onemogućavanje mobilnog operatera nije uspelo."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Želite li da koristite 2 SIM kartice?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Na ovom uređaju 2 SIM kartice mogu da budu aktivne istovremeno. Da biste nastavili da koristite samo 1 SIM karticu, dodirnite „Ne, hvala“."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Želite li da restartujete uređaj?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Da biste započeli, restartujte uređaj. Zatim možete da dodate još jednu SIM karticu."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Nastavi"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Restartuj"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Pređi"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Aktiviranje SIM kartice nije uspelo"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Uklonite SIM karticu, pa je stavite ponovo. Ako se problem i dalje javlja, restartujte uređaj."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probajte ponovo da uključite SIM karticu. Ako se problem i dalje javlja, restartujte uređaj."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivacija mreže"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Mobilni operater <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivan"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dodirnite da biste ažurirali podešavanja SIM-a"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM kartica"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Želite li da obrišete ovaj preuzeti SIM?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Brisanjem ove SIM kartice uklonićete <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> uslugu sa ovog uređaja.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> usluga neće biti otkazana."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Obriši"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM se briše…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Brisanje SIM-a nije uspelo"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Ovaj SIM ne može da se obriše zbog greške.\n\nRestartujte uređaj i probajte ponovo."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Povežite se sa uređajem"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacija <xliff:g id="APPNAME">%1$s</xliff:g> želi da koristi privremenu Wi‑Fi mrežu da bi se povezala sa uređajem"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nije pronađen nijedan uređaj Proverite da li je uređaj uključen i dostupan za povezivanje."</string>
@@ -4980,6 +5063,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Hitni pozivi"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Mobilni operater ne podržava hitne pozive pomoću funkcije Pozivanje preko WiFi-a.\nUređaj automatski prelazi na mobilnu mrežu da bi uputio hitan poziv.\nHitni pozivi su mogući samo u oblastima pokrivenim mobilnom mrežom."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Koristite Wi‑Fi za pozive da biste poboljšali kvalitet"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Pozivi sa više SIM kartica"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Dozvolite pozive i SMS-ove sa druge SIM kartice umesto ove."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"pozivi sa više SIM kartica"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Dolazna MMS poruka"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Slanje MMS poruka nije moguće"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Dodirnite da biste omogućili slanje MMS poruka na uređaju <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> kada su mobilni podaci isključeni"</string>
@@ -5031,10 +5117,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dozvoli prekrivanje sadržaja ekrana Podešavanja"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dozolite aplikacijama koje mogu da se prikazuju preko drugih aplikacija da prekrivaju sadržaj ekrana Podešavanja"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Mediji"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Sakrijte plejer kada se sesija medija završi"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Plejer vam dozvoljava da nastavite sesiju iz proširenog okna za brza podešavanja."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Medija plejer u Brzim podešavanjima"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Prikazuje medija plejer u dužem periodu da bi se lako nastavila reprodukcija"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Sakrij plejer"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Prikaži plejer"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nije dostupan nijedan plejer"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Dozvoljene aplikacije"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"mediji"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth će se uključiti"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Uključeno"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Isključeno"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM kartice"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Mreže koje su bezbedne po avion"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Pronađite mreže koje su bezbedne po avion i povežite se na njih"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, bezbedno po avion"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Pozivanje preko WiFi-a"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Upućujte i primajte pozive preko mreža koje ne pripadaju mobilnom operateru, na primer, WiFi-ja"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Pozivanje preko WiFi-ja vam omogućava da primate i upućujete pozive preko mreža koje ne pripadaju mobilnom operateru, na primer, nekih WiFi mreža."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Pozivi"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"prednost"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"prednost imaju pozivi"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"prednost ima SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"nedostupno"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM kartice"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Podešavanja"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povežite se sa javnim mrežama"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežično, podaci, wifi, wi-fi, wi fi, mobilni telefon, mobilni, mobilni operater, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Prikaži mreže bezbedne za avion"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Isključi režim rada u avionu"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nedostupno je jer je noćni režim uključen"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Resetovanje važnosti obaveštenja je dovršeno."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacije"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nepouzdani uređaj želi da pristupa porukama. Dodirnite za detalje."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Želite li da dozvolite pristup porukama?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nepouzdani Bluetooth uređaj, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], želi da pristupa porukama.\n\nRanije se niste povezivali sa uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nepouzdani uređaj želi da pristupa kontaktima i evidenciji poziva. Dodirnite za detalje."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Želite li da dozvolite pristup kontaktima i evidenciji poziva?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nepouzdani Bluetooth uređaj, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], želi da pristupa kontaktima i evidenciji poziva. To obuhvata podatke o dolaznim i odlaznim pozivima.\n\nRanije se niste povezivali sa uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 0e22b48..d103f51 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Сярэдняя"</item>
     <item msgid="6740026006576843477">"Доўгая"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Кароткая затрымка"</item>
+    <item msgid="7397961711906421599">"Сярэдняя затрымка"</item>
+    <item msgid="4079132024502041928">"Доўгая затрымка"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Стандартная"</item>
     <item msgid="4234707448428002595">"Без засечак"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глабальная"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Толькі TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Увесь свет"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 2d312fc..875967b 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -258,8 +258,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Дата і час"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Усталяваць дату і час"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Задаць дату, час, гадзiнны пояс і фарматы"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Выкарыстоўваць час сеткі"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Выкарыстоўваць часавы пояс сеткі"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Задаваць час аўтаматычна"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Задаваць часавы пояс аўтаматычна"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Выкарыстоўваць стандартныя рэгіянальныя налады"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑гадзінны фармат"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Выкарыстоўваць 24-гадзінны фармат"</string>
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Паказваць звесткi профiлю на экране блакiроўкі"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Уліковыя запісы"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Месцазнаходжанне"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Выкарыстаць месцазнаходжанне"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Выкарыстоўваць геалакацыю"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Выкл."</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Укл. – <xliff:g id="COUNT_1">%1$d</xliff:g> праграма мае доступ да даных месцазнаходжання</item>
@@ -326,6 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Блакіроўка экрана, распазнаванне твару"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Блакіроўка экрана, адбітак пальца"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Блакіроўка экрана"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Разблакіруйце тэлефон з дапамогай твару і адбітка пальца"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Яшчэ вы можаце ўваходзіць у праграмы і пацвярджаць плацяжы"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Наладзіць разблакіроўку з дапамогай:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Распазнаванне твару"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Зрабіце разблакіроўку тэлефона простай"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Адбітак пальца"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Зэканомце час, разблакіруйце ў кішэні"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Прапусціць"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Далей"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Твар дададзены"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Наладзіць распазнаванне твару"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Распазнаванне твару"</string>
@@ -335,6 +344,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Выкарыстоўвайце твар для аўтэнтыфікацыі"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Пачаць"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Калі спецыяльныя магчымасці функцыі распазнавання твару выключаны, некаторыя крокі наладкі могуць не працаваць з TalkBack належным чынам."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Працягнуць наладку"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Наладка спецыяльных магчымасцей"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -379,8 +391,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Пры распазнаванні твару ў праграмах патрабуецца этап пацвярджэння"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Выдаліць даныя твару"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Наладзьце распазнаванне твару"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Выкарыстоўвайце функцыю распазнавання твару, каб разблакіраваць прыладу, уваходзіць у праграмы і пацвярджаць плацяжы.\n\nМайце на ўвазе:\nГледзячы на тэлефон, вы можаце разблакіраваць яго, нават калі не маеце такога намеру.\n\nВаш тэлефон можа быць разблакіраваны кімсьці яшчэ, хто трымае яго на ўзроўні вашага твару.\n\nВаш тэлефон можа быць разблакіраваны кімсьці, хто падобны на вас – напрыклад, гэта можа быць ваш брат ці сястра."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Выкарыстоўвайце функцыю распазнавання твару, каб разблакіраваць прыладу, уваходзіць у праграмы і пацвярджаць плацяжы.\n\nМайце на ўвазе:\nВы можаце ненаўмысна разблакіраваць тэлефон, проста гледзячы на экран.\n\nВаш тэлефон можа быць разблакіраваны кімсьці яшчэ, хто трымае яго на ўзроўні вашага твару, нават калі ў вас заплюшчаны вочы.\n\nВаш тэлефон можа быць разблакіраваны кімсьці, хто падобны на вас – напрыклад, гэта можа быць ваш брат ці сястра."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Выкарыстоўвайце функцыю распазнавання твару для разблакіроўкі прылады, уваходу ў праграмы і пацвярджэння плацяжоў."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Майце на ўвазе:\nВы можаце ненаўмысна разблакіраваць тэлефон, проста гледзячы на экран.\n\nВаш тэлефон можа быць разблакіраваны кімсьці яшчэ, хто трымае яго на ўзроўні вашага твару.\n\nВаш тэлефон можа быць разблакіраваны кімсьці, хто падобны на вас – напрыклад, гэта можа быць ваш брат ці сястра."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Майце на ўвазе:\nВы можаце ненаўмысна разблакіраваць тэлефон, проста гледзячы на экран.\n\nВаш тэлефон можа быць разблакіраваны кімсьці яшчэ, хто трымае яго на ўзроўні вашага твару, нават калі ў вас заплюшчаны вочы.\n\nВаш тэлефон можа быць разблакіраваны кімсьці, хто падобны на вас – напрыклад, гэта можа быць ваш брат ці сястра."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Выдаліць даныя пра твар?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Даныя твару, якія выкарыстоўваюцца функцыяй распазнавання твару, будуць бяспечна выдалены. Пасля выдалення для разблакіроўкі тэлефона, уваходу ў праграмы і пацвярджэння плацяжоў трэба выкарыстоўваць PIN-код, узор разблакіроўкі ці пароль."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Выкарыстоўвайце функцыю распазнавання твару для разблакіроўкі тэлефона"</string>
@@ -402,6 +415,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Для ўхвалення куплі ці разблакіроўкі тэлефона можна карыстацца адбіткам пальца.\n\nЗаўвага. Вы не можаце выкарыстоўваць адбітак пальца для разблакіроўкі гэтай прылады. Для атрымання дадатковай інфармацыі звяжыцеся з адміністратарам арганізацыі."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Для ўхвалення куплі ці разблакіроўкі тэлефона можна карыстацца адбіткам пальца.\n\nЗаўвага. Выкарыстанне адбітка пальца можа быць менш бяспечным, чым складаны ўзор разблакіроўкі або PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Скасаваць"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, дзякуй"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Далей"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Прапусціць"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Далей"</string>
@@ -439,6 +453,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Калі планшэт абаронены з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ім у выпадку прапажы ці крадзяжу. Гэта функцыя таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Калі прылада абаронена з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ёй у выпадку прапажы ці крадзяжу. Гэта функцыя таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Калі тэлефон абаронены з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ім у выпадку прапажы ці крадзяжу. Гэта функцыя таксама спатрэбіцца вам, каб наладзіць распазнаванне твару. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Калі планшэт абаронены з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ім у выпадку прапажы ці крадзяжу. Функцыя блакіроўкі экрана таксама неабходная для наладкі біяметрыі. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Калі прылада абаронена з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ёй у выпадку прапажы ці крадзяжу. Функцыя блакіроўкі экрана таксама неабходная для наладкі біяметрыі. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Калі тэлефон абаронены з дапамогай функцыі блакіроўкі экрана, ніхто не зможа карыстацца ім у выпадку прапажы ці крадзяжу. Функцыя блакіроўкі экрана таксама неабходная для наладкі біяметрыі. Каб вярнуцца назад, націсніце \"Скасаваць\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Прапусціць наладку PIN-кода?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Прапусціць наладку пароля?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Прапусціць наладку ўзору разблакіроўкі?"</string>
@@ -511,8 +528,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Прадухіліце выкарыстанне гэтага планшэта без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Прадухіліце выкарыстанне гэтай прылады без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Прадухіліце выкарыстанне гэтага тэлефона без вашага дазволу, актываваўшы функцыі абароны прылады. Выберыце спосаб блакіроўкі экрана, які вы хочаце выкарыстоўваць."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Выберыце дадатковы спосаб блакіроўкі экрана"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Выберыце дадатковы спосаб блакіроўкі экрана"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Выберыце дадатковы спосаб блакіроўкі экрана"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Параметры экрана блакіроўкі"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Параметры экрана блакіроўкі"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Блакіроўка экрана"</string>
@@ -544,6 +560,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Распазнаванне твару + пароль"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Працягнуць без распазнавання твару"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Вы можаце выконваць разблакіроўку тэлефона з дапамогай функцыі распазнавання твару. У мэтах бяспекі для гэтага варыянта патрабуецца дадатковы спосаб блакіроўкі экрана."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Біяметрыя + узор разблакіроўкі"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Біяметрыя + PIN-код"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Біяметрыя + пароль"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Працягнуць без біяметрыі"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Вы можаце выконваць разблакіроўку тэлефона з дапамогай функцыі распазнавання біяметрычных даных. У мэтах бяспекі для гэтага варыянта патрабуецца дадатковы спосаб блакіроўкі экрана."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Адключана адміністратарам, палітыкай шыфравання ці сховішчам уліковых даных"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Правядзенне пальцам"</string>
@@ -635,7 +656,6 @@
       <item quantity="other">PIN-код павінен змяшчаць менш за <xliff:g id="NUMBER_1">%d</xliff:g> лічбы</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Адміністратар прылады не дазваляе выкарыстоўваць апошні PIN-код"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT адміністратар блакіруе папулярныя PIN-коды. Паспрабуйце іншы PIN-код."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Не можа змяшчаць недапушчальны сімвал"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Павінен змяшчаць не менш за адну літару"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Павінен змяшчаць не менш за адну лічбу"</string>
@@ -683,7 +703,6 @@
       <item quantity="other">Павінен змяшчаць не менш за <xliff:g id="COUNT">%d</xliff:g> сімвала, якія не з\'яўляюцца лічбамі</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Адміністратар прылады не дазваляе выкарыстоўваць апошні пароль"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT адміністратар блакіруе папулярныя паролі. Паспрабуйце іншы пароль."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Забаронена ўводзіць узрастаючую, убываючую або паўторную паслядоўнасць лічбаў"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Пацвердзіць"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Скасаваць"</string>
@@ -829,7 +848,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Уключыць Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Выкарыстоўваць Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Выкарыстоўваць Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Налады Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Усталяванне бесправадных кропак доступу і кіраванне iмi"</string>
@@ -937,7 +956,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Каб падключыцца да сеткі \"<xliff:g id="SSID">%1$s</xliff:g>\", навядзіце камеру на QR-код, паказаны. ніжэй"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Далучыцеся да сеткі Wi‑Fi, прасканіраваўшы QR-код"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Абагуліць Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Прасканіруйце QR-код, каб падключыцца да сеткі \"<xliff:g id="SSID">%1$s</xliff:g>\" і абагуліць пароль"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Прасканіруйце QR-код з дапамогай іншай прылады, каб далучыцца да сеткі \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Каб падключыцца да \"<xliff:g id="SSID">%1$s</xliff:g>\", прасканіруйце гэты QR-код"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Паўтарыце спробу. Калі памылка застанецца, звярніцеся да вытворцы прылады"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Нешта пайшло не так"</string>
@@ -963,8 +982,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Пароль Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Пароль хот-спота: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Аўтаматычнае падключэнне"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Дазволіць тэлефону аўтаматычна падключацца да гэтай сеткі, калі ён знаходзіцца паблізу ад яе"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Дазвольце планшэту аўтаматычна падключацца да гэтай сеткі, калі ён знаходзіцца паблізу ад яе"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Дазвольце падключэнне да гэтай сеткі, калі сігнал будзе ў межах дасягальнасці"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Дадаць прыладу"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Каб дадаць прыладу ў гэту сетку, скарыстайце QR-код"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-код мае несапраўдны фармат"</string>
@@ -976,7 +994,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Выкарыстоўваць сістэмныя сертыфікаты"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Не даваць"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Не правяраць"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Сертыфікат не пазначаны. Ваша падлучэнне не будзе прыватным."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Імя сеткі занадта доўгае."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Неабходна ўказаць дамен."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Патрэбны сертыфікат."</string>
@@ -1003,6 +1020,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Падключыцца"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi уключаны"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Падключана да сеткi <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Ідзе падключэнне да сеткі \"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>\""</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Ідзе падключэнне…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Не атрымалася падключыцца да сеткі"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Сетка не ў зоне дасягальнасці"</string>
@@ -1036,6 +1054,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-адрас прылады"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Выпадковы MAC-адрас"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Выпадковы MAC-адрас (апошні з выкарыстаных)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-адрас"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Інфармацыя аб сетцы"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Маска падсеткі"</string>
@@ -1043,8 +1062,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-адрасы"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Захаваныя сеткі"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Падпіскі"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Іншыя сеткі"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Налады IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Пашыраныя налады Wi-Fi не даступныя для гэтага карыстальніка"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Захаваць"</string>
@@ -1053,8 +1071,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Увядзіце сапраўдны адрас шлюза."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Увядзіце сапраўдны адрас DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Увядзіце даўжыню сеткавага прэфікса ад 0 і 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (калі не перавызначана прыватным DNS-серверам)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (калі не перавызначана прыватным DNS-серверам)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Даўжыня прэфікса сеткі"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1080,7 +1098,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Праграма абагульвае змесціва. Каб абагульваць падключэнне да інтэрнэту, адключыце, а потым зноў уключыце хот-спот"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Пароль не ўстаноўлены"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Назва хот-спота"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ідзе ўключэнне <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Уключаецца <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Іншыя прылады могуць падключацца да <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Пароль хот-спота"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Дыяпазон частот Wi-Fi"</string>
@@ -1230,7 +1248,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Плаўнае адлюстраванне"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Аўтаматычна павялічвае частату абнаўлення пэўнага змесціва з 60 да 90 Гц. Павышае выкарыстанне зараду акумулятара."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Плаўнае адлюстраванне"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Прымусовая частата абнаўлення: 90 Гц"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Найвышэйшая частата абнаўлення для лепшага рэагавання на дотыкі і вышэйшай якасці анімацыі. Павышае выкарыстанне зараду акумулятара."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Адаптыўны рэжым"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Укл. / Калі глядзець на экран, ён не будзе выключацца"</string>
@@ -1321,6 +1339,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Цёмны экран уключаецца, калі прыходзяць новыя апавяшчэнні"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Заўсёды паказваць час і даныя"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Павышанае выкарыстанне зараду"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Тлусты шрыфт"</string>
     <string name="title_font_size" msgid="570613010306330622">"Памер шрыфту"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Павялічыць або паменшыць тэкст"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Налады блакіроўкі SIM-карты"</string>
@@ -1371,7 +1390,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Версія Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Абнаўленне сістэмы бяспекі Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Мадэль"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Мадэль: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Мадэль і апаратнае забеспячэнне"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Версія апаратнага забеспячэння"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Iдэнтыфiкатар абсталявання"</string>
@@ -1620,7 +1638,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Выдаліць APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Новы APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Захаваць"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Адхіліць"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Скасаваць"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Поле «Імя» не можа быць пустым."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Значэнне APN не можа быць пустым."</string>
@@ -1635,8 +1653,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Праграмы могуць быць скінуты"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Скінуць налады Wi-Fi, мабільнай перадачы даных і Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Гэта прывядзе да скіду ўсіх налад сеткі, у тым ліку:\n\n"<li>"Wi‑Fi"</li>\n<li>"мабільнай перадачы даных"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Сцерці даныя"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Сцерці даныя спампаваных SIM"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Каб спампаваць SIM на замену, звярніцеся да аператара. Гэта не прывядзе да скасавання тарыфных планаў."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Гэта дзеянне не прывядзе да скасавання тарыфных планаў. Каб спампаваць новыя SIM-карты, звярніцеся да аператара."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Скід налад"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Скінуць усе налады сеткі? Гэта дзеянне нельга адрабіць."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Скінуць усе налады сеткі і сцерці ўсе даныя смампаваных SIM? Гэта дзеянне нельга адрабіць."</string>
@@ -1646,31 +1665,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Налады сеткі былі скінутыя"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Не ўдалося сцерці даныя SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Памылка сцірання спампаваных SIM.\n\nПеразапусціце прыладу і паўтарыце спробу."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Сцерці ўсе даныя (cкід да заводскіх налад)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Сцерці ўсе даныя (скід да заводскіх налад)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага планшэта, у тым ліку:\n\n"<li>"Ваш Уліковы запiс Google"</li>\n<li>"Сістэмныя даныя і налады, а таксама даныя і налады праграм"</li>\n<li>"Спампаваныя праграмы"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Гэта дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага тэлефона, у тым ліку:\n\n"<li>"Ваш Уліковы запіс Google"</li>\n<li>"Сістэмныя даныя і налады, а таксама даныя і налады праграм"</li>\n<li>"Спампаваныя праграмы"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"У дадзены момант вы зайшлі ў наступныя ўліковыя запісы:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"На гэтай прыладзе ёсць іншыя карыстальнікі.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Музыка"</li>\n<li>"Фатаграфіі"</li>\n<li>"Іншыя дадзеныя карыстальніка"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-карты"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Гэта не прывядзе да скасавання вашага тарыфнага плана."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя даныя карыстальніка, трэба ачысціць "<b>"USB-назапашвальнік"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Каб выдаліць музыку, фатаграфіі і іншыя даныя карыстальніка, трэба выдаліць інфармацыю з "<b>"SD-карты"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Сцерці ўсе даныя (скід да заводскіх налад)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Сцерці ўсе даныя (скід да заводскіх налад)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Гэта дзеянне дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага планшэта, у тым ліку:\n\n"<li>"ваш Уліковы запіс Google;"</li>\n<li>"сістэмныя даныя і налады, а таксама даныя і налады праграм;"</li>\n<li>"спампаваныя праграмы"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Гэта дзеянне дазволіць сцерці ўсе даныя з "<b>"унутранага сховішча"</b>" вашага тэлефона, у тым ліку:\n\n"<li>"ваш Уліковы запіс Google;"</li>\n<li>"сістэмныя даныя і налады, а таксама даныя і налады праграм;"</li>\n<li>"спампаваныя праграмы"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"У дадзены момант вы зайшлі ў наступныя ўліковыя запісы:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"На гэтай прыладзе ёсць іншыя карыстальнікі.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Музыка"</li>\n<li>"Фота"</li>\n<li>"Іншая інфармацыя карыстальніка"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-карты"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Гэта дзеянне не прывядзе да скасавання вашага тарыфнага плана."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Каб выдаліць музыку, фатаграфіі і іншую інфармацыю карыстальніка, трэба сцерці даныя з "<b>"USB-сховішча"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Каб выдаліць музыку, фатаграфіі і іншую інфармацыю карыстальніка, трэба сцерці даныя з "<b>"SD-карты"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Ачысціць USB-назапашвальнiк"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Сцерці SD-карту"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Выдаліць з унутранага USB-назапашвальнiка ўсе дадзеныя, напрыклад музыку i фатаграфіі"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Выдаліць з SD-карты ўсе дадзеныя, напрыклад музыку i фатаграфіі."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Сцерці ўсе даныя"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Сцерці ўсе даныя"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Усе вашы асабістыя даныя і спампаваныя праграмы будуць выдалены. Гэта дзеянне нельга адрабіць."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Уся асабістая інфармацыя, у тым ліку спампаваныя праграмы і SIM, будзе выдалена. Гэта дзеянне нельга адрабіць."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Выдаліць усе"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Скід не выкананы, таму што недаступна паслуга Ачысткі сістэмы."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Сцерці ўсе даныя?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Аднаўленне завадскіх параметраў недаступна для гэтага карыстальніка"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Выдаленне"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Калі ласка, пачакайце..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Сцерці ўсе даныя"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Сцерці ўсе даныя"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Уся асабістая інфармацыя і спампаваныя праграмы будуць выдалены. Гэта дзеянне нельга адрабіць."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Уся асабістая інфармацыя, у тым ліку спампаваныя праграмы і SIM-карты, будзе выдалена. Гэта дзеянне нельга адрабіць."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Сцерці ўсе даныя?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Скід да заводскіх налад недаступны для гэтага карыстальніка"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Даныя сціраюцца"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Пачакайце…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Налады выклікаў"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Выбраць галасавую пошту, перанакіраванне выклікаў, чаканне выклікаў, аўтаматычны вызначальнiк нумару"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-мадэм"</string>
@@ -1718,7 +1735,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Немагчыма падлучыць больш прылад, чым <xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Адбудзецца адключэнне прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Мадэм Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Абагуліць інтэрнэт-падключэнне гэтага тэлефона праз USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Абагуліць інтэрнэт-падключэнне гэтага тэлефона праз Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Выкарыстоўвайце хот-спот і рэжым мадэма для падключэння да інтэрнэту іншых прылад праз мабільную перадачу даных. Праграмы таксама могуць ствараць хот-спот для абагульвання змесціва з прыладамі паблізу."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Для падключэння да інтэрнэту іншых прылад праз Wi-Fi ці мабільную перадачу даных выкарыстоўвайце хот-спот і рэжым мадэма. Для абагульвання змесціва з прыладамі паблізу праграмы таксама могуць ствараць хот-спот."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Даведка"</string>
@@ -1762,6 +1779,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Сканіраванне Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дазвольце праграмам і сэрвісам шукаць прылады паблізу, нават калі Bluetooth выключаны. Гэту функцыю можна выкарыстоўваць для паляпшэння працы геасэрвісаў."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Службы геалакацыі для працы"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Вызначэнне часавага пояса месцазнаходжання"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Вызначэнне часавага пояса месцазнаходжання"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Дазваляе выкарыстоўваць для вызначэння бягучага часавага пояса звесткі пра месцазнаходжанне прылады. На дакладнасць вызначэння часавага пояса могуць уплываць іншыя налады месцазнаходжання, напрыклад пошук сетак Wi-Fi."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Уключана"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Выключана"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Аўтаматычнае вызначэнне часавага пояса выключана"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Вызначэнне часавага пояса месцазнаходжання выключана"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Вызначэнне часавага пояса месцазнаходжання не падтрымліваецца"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Не дазволена змяняць вызначэнне часавага пояса месцазнаходжання"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Месцазнаходжанне Wi-Fi і мабiльнай сеткi"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Дазв. дадаткам выкар. службу вызнач. месцазн., каб знах. вас хутчэй. Ананiмныя даныя пра месцазн. будуць збiр. i адпр. у Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Месцазнаходжанне вызначаецца праз Wi-Fi"</string>
@@ -1825,6 +1851,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Для распазнавання твару задайце пароль"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Для распазнавання твару наладзьце ўзор"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Для распазнавання твару задайце PIN-код"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Каб скарыстаць біяметрыю, задайце пароль"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Каб скарыстаць біяметрыю, задайце ўзор"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Каб скарыстаць біяметрыю, задайце PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Забылі пароль?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Забылі ўзор разблакіроўкі?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Забылі PIN-код?"</string>
@@ -2165,13 +2194,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Налады субцітраў"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Павелічэнне"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Вобласць павелічэння"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Уключэнне павелічэння"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Выберыце вобласць павелічэння, якую хочаце выкарыстоўваць падчас павелічэння экрана"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Поўнаэкранны рэжым"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Частка экрана"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Поўнаэкранны рэжым і рэжым паказу часткі экрана"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Павялічыць увесь экран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Павялічыць частку экрана"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Пераключыцца на кнопку спецыяльных магчымасцей?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Калі для павелічэння часткі экрана выкарыстаць трайное націсканне, будуць прыпынены ўвод тэксту і іншыя дзеянні.\n\nХочаце замест гэтага выкарыстоўваць для павелічэння кнопку спецыяльных магчымасцей?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Перайсці на кнопку спецыяльных магчымасцей"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Захаваць для павелічэння трайное націсканне"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Налады павелічэння"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Павялічваць трайным дотыкам"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Павялічваць спалучэннем клавіш"</string>
@@ -2225,11 +2257,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Завяршыць выклік кнопкай сілкавання"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Вялікі ўказальнік мышы"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Адключыць анімацыю"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Манафанічны гук"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Аб\'ядноўваць каналы пры прайграванні аўдыя"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс гуку"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Злева"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Справа"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Монафанія"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Аб\'ядноўваць каналы пры прайграванні аўдыя"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс аўдыя"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Улева"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Управа"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Стандартны"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2259,11 +2291,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вібрацыя пры апавяшчэнні"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вібрацыя пры выкліку"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Вібрацыя тактыльнага водгуку"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Выкарыстоўваць праграму \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Адкрыць праграму \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Карыстанне карэкцыяй колераў"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Паказваць субцітры"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Толькі для праграмы, якая падтрымліваецца"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Выкарыстоўваць праграму \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Адкрыць праграму \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Выкарыстоўваць карэкцыю колераў"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Паказваць субцітры"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Толькі для праграмы, якая падтрымліваецца"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Памер і стыль субцітраў"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Памер шрыфту: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Дадатковыя параметры"</string>
@@ -2295,6 +2327,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дэйтэранамалія"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Пратанамалія"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Трытанамалія"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Адценні шэрага"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Чырвоны і зялёны"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Чырвоны і зялёны"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Сіні і жоўты"</string>
@@ -2436,7 +2469,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Абмежаванне работы ў фонавым рэжыме"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Дазволіць праграме працаваць у фонавым рэжыме"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"У праграмы няма дазволу на працу ў фонавым рэжыме"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Не ўдалося абмежаваць работу ў фонавым рэжыме"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Не ўдалося абмежаваць работу ў фонавым рэжыме"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Абмежаваць фонавую дзейнасць?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Абмежаванне фонавай дзейнасці праграмы можа прывесці да збояў"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Паколькі ў гэтай праграме не наладжана аптымізацыя выкарыстання зараду акумулятара, вы не можаце абмежаваць яе працу. \n\n Для гэтага спачатку  ўключыце аптымізацыю акумулятара."</string>
@@ -2485,6 +2518,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Планшэт выкарыстоўваецца больш, чым звычайна"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Прылада выкарыстоўваецца больш, чым звычайна"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Акумулятар можа разрадзіцца хутчэй, чым звычайна"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Аптымізацыя стану акумулятара"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Зарад акумулятара часова абмежаваны. Націсніце, каб даведацца больш."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Тэлефон выкарыстоўваецца больш, чым звычайна. Акумулятар хутка разрадзіцца.\n\nПраграмы з самым высокім спажываннем энергіі:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Планшэт выкарыстоўваецца больш, чым звычайна. Акумулятар хутка разрадзіцца.\n\nПраграмы з самым высокім спажываннем энергіі:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Ваша прылада выкарыстоўваецца больш, чым звычайна. Акумулятар хутка разрадзіцца.\n\nПраграмы з самым высокім спажываннем энергіі:"</string>
@@ -2554,6 +2589,8 @@
       <item quantity="other">Абмежаваных праграм: %1$d</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small></string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Праблема з чытаннем індыкатара зараду акумулятара"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Праблема з чытаннем індыкатара зараду акумулятара. Націсніце, каб "<annotation id="url">"даведацца больш"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Спыніць праграму?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Ваш тэлефон не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP">%1$s</xliff:g> трымае тэлефон у актыўным рэжыме.\n\nВырашыць гэту праблему можна, прымусова спыніўшы праграму.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб павысіць прадукцыйнасць акумулятара."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Ваш планшэт не можа нармальна кіраваць зарадам акумулятара, бо <xliff:g id="APP">%1$s</xliff:g> трымае планшэт у актыўным рэжыме.\n\nВырашыць гэту праблему можна, прымусова спыніўшы праграму.\n\nКалі гэта не дапамагло, трэба выдаліць праграму, каб павысіць прадукцыйнасць акумулятара."</string>
@@ -2667,9 +2704,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Задаць расклад"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Павялічыць тэрмін службы акумулятара"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Выключаць, калі прылада поўнасцю зарадзіцца"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Рэжым эканоміі зараду выключаецца, калі зарад тэлефона дасягае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Рэжым эканоміі зараду выключаецца, калі зарад планшэта дасягае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Рэжым эканоміі зараду выключаецца, калі зарад прылады дасягае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Рэжым эканоміі зараду выключаецца, калі зарад тэлефона перавышае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Рэжым эканоміі зараду выключаецца, калі зарад планшэта перавышае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Рэжым эканоміі зараду выключаецца, калі зарад прылады перавышае <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Уключыць"</string>
@@ -2734,6 +2771,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Скінуць"</string>
     <string name="tts_play" msgid="2945513377250757221">"Прайграць"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Адаптыўная магчымасць падключэння"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Павялічвае тэрмін службы акумулятара і павышае прадукцыйнасць прылады праз аўтаматычнае кіраванне падключэннямі да сеткі"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Сховішча ўліковых даных"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Усталяваць сертыфікат"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Усталяваць сертыфікаты са сховішча"</string>
@@ -2745,9 +2784,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Уліковыя даныя карыстальніка"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Прагляд і рэдагаванне захаваных уліковых даных"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Пашыраныя налады"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тып сховішча"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Апаратнае"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Толькі праграмнае забеспячэнне"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Сертыфікаты недаступныя для гэтага карыстальніка"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Усталявана для VPN і праграм"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Усталявана для Wi-Fi"</string>
@@ -2763,6 +2799,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Не ўсталёўваць"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Усё роўна ўсталяваць"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Сертыфікат не ўсталяваны"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Дазволіць, каб праграма <xliff:g id="APP_NAME">%s</xliff:g> магла ўсталяваць сертыфікаты на гэтай прыладзе?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Дзякуючы гэтым сертыфікатам пералічаныя ніжэй праграмы і вэб-старонкі змогуць вызначаць вас"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Не дазваляць"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Дазволіць"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Разгарнуць"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Праграма кантролю сертыфікатаў"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Няма"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Дзякуючы ўсталяваным гэтай праграмай сертыфікатам пералічаныя ніжэй праграмы і вэб-старонкі змогуць вызначаць вас"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Выдаліць"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Сігнал набору нумару ў аварыйнай сітуацыі"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Задаць паводзіны на выпадак экстранага выкліку"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Рэзервовае капіраванне"</string>
@@ -3096,7 +3141,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Не наладжана – Рабочы профіль"</string>
     <string name="user_admin" msgid="4024553191395768119">"Адміністратар"</string>
     <string name="user_you" msgid="3070562015202859996">"Вы (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Псеўданім"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Вы можаце дадаць да <xliff:g id="USER_COUNT">%1$d</xliff:g> карыстальнікаў"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Толькі ўладальнік планшэта можа кіраваць карыстальнікамі."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Толькі ўладальнік тэлефона можа кіраваць карыстальнікамі."</string>
@@ -3146,7 +3190,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Аплата ў тэрмінале"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Наладзьце плацежную праграму. Затым проста прыкладзіце тэлефон задняй часткай да любога тэрмінала з сімвалам бескантактнай аплаты."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Зразумела"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Больш..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Яшчэ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Задаць стандартную плацежную праграму"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Абнавіць стандартную плацежную праграму"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Пры бескантактнай аплаце плаціць з дапамогай праграмы \"<xliff:g id="APP">%1$s</xliff:g>\""</string>
@@ -3216,9 +3260,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Далей"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Завершыць"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Зрабіць фота"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Выбраць відарыс"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Выбраць фота"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-карты"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-карты"</string>
@@ -3230,7 +3271,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Заўсёды выкарыстоўваць гэта для выклікаў"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Выберыце SIM-карту для даных"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Выберыце SIM для SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Пераключэнне SIM-карты для даных, гэта можа заняць да 1 хвіліны..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Пераключаецца SIM-карта для даных. Гэта можа заняць да 1 хвіліны…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Выклікаць праз"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Выбар SIM-карты"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3416,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"працэдура, расклад, эканомія зараду, эканомія энергіі, акумулятар, аўтаматычна, працэнт"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, пашыраныя магчымасці выкліку, выклік у 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"дадаць мову, дадаць мову"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"памер тэксту"</string>
     <string name="default_sound" msgid="6604374495015245195">"Гук па змаўчанні"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Гучнасць званкоў і апавяшчэнняў: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Гучнасць, вібрацыя, рэжым \"Не турбаваць\""</string>
@@ -3414,13 +3456,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Гукі пры ўключэнні"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Імгненныя субцітры"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Аўтаматычна дадаваць субцітры"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Няма"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Зададзены <xliff:g id="ON_COUNT">%d</xliff:g> расклад</item>
-      <item quantity="few">Зададзена <xliff:g id="ON_COUNT">%d</xliff:g> расклады</item>
-      <item quantity="many">Зададзена <xliff:g id="ON_COUNT">%d</xliff:g> раскладаў</item>
-      <item quantity="other">Зададзена <xliff:g id="ON_COUNT">%d</xliff:g> раскладу</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ніводнага}=1{Зададзены 1 расклад}one{Зададзены # расклад}few{Зададзена # расклады}many{Зададзена # раскладаў}other{Зададзена # раскладу}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не турбаваць"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Атрымліваць апавяшчэнні толькі ад важных людзей і праграм"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Абмежаванне колькасці непатрэбных апавяшчэнняў"</string>
@@ -3488,24 +3524,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Толькі прыярытэтныя"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Уключана / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Выключана / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Выключана"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Уключана"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Заўсёды пытацца"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Пакуль не выключыце"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> гадзіна</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> гадзіны</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> гадзін</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> гадзіны</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> хв"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> расклад можа ўключацца аўтаматычна</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> расклады могуць уключацца аўтаматычна</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> раскладаў могуць уключацца аўтаматычна</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> раскладу могуць уключацца аўтаматычна</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 гадзіна}one{# гадзіна}few{# гадзіны}many{# гадзін}other{# гадзіны}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 хвіліна}one{# хвіліна}few{# хвіліны}many{# хвілін}other{# хвіліны}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Выключана}=1{Выключана / 1 расклад можа ўключацца аўтаматычна}one{Выключана / # расклад можа ўключацца аўтаматычна}few{Выключана / # расклады могуць уключацца аўтаматычна}many{Выключана / # раскладаў могуць уключацца аўтаматычна}other{Выключана / # раскладу могуць уключацца аўтаматычна}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"На што не распаўсюджваецца рэжым \"Не турбаваць\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Людзі"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Праграмы"</string>
@@ -3551,6 +3575,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Аўтаматычна пераводзіць апавяшчэнні з нізкім прыярытэтам у ціхі рэжым"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Адаптыўнае ранжыраванне апавяшчэнняў"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Аўтаматычна ранжыраваць апавяшчэнні паводле адпаведнасці"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Водгук пра адаптыўнае апавяшчэнне"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Указваць карэкціроўкі, зробленыя ў апавяшчэннях, і паказваць варыянт дадавання водгуку ў сістэму"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Скінуць налады важнасці апавяшчэнняў"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Скінуць налады важнасці, змененыя карыстальнікам, і дазволіць вызначаць прыярытэты памочніку па апавяшчэннях"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Прапанаваныя дзеянні і адказы"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Аўтаматычна паказваць прапанаваныя дзеянні і адказы"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Паказаць апошнія і адкладзеныя апавяшчэнні"</string>
@@ -3650,8 +3678,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Прыярытэтныя размомы"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Паказваць уверсе раздзела размоў у выглядзе рухомых усплывальных апавяшчэнняў"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Паказваць уверсе раздзела размоў"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Іншыя размовы"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Непрыярытэтныя размовы"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Размовы, у якія вы ўнеслі змяненні"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Нядаўнія размовы"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Ачысціць нядаўнія"</string>
+    <string name="clear" msgid="5092178335409471100">"Ачысціць"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Паказваць прыярытэтныя размовы ў выглядзе ўсплывальных апавяшчэнняў"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Прыярытэтныя размовы паказваюцца ў верхняй частцы панэлі апавяшчэнняў. Вы можаце таксама наладзіць іх паказ у выглядзе ўсплывальных апавяшчэнняў і пры ўключаным рэжыме \"Не турбаваць\"."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Прыярытэтныя і змененыя размовы будуць паказвацца тут"</string>
@@ -3757,7 +3788,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Доступ да рэжыму \"Не турбаваць\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Дазволіць рэжым \"Не турбаваць\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Запытаў доступу да рэжыму «Не турбаваць» ад усталяваных дадаткаў не паступала"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Загрузка дадаткаў..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Праграмы загружаюцца…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Па вашым запыце Android блакіруе апавяшчэнні ад дадзенай праграмы на гэтай прыладзе"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Па вашым запыце Android блакіруе дадзеную катэгорыю апавяшчэнняў на гэтай прыладзе"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Па вашым запыце Android блакіруе дадзеную групу апавяшчэнняў на гэтай прыладзе"</string>
@@ -3855,13 +3886,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Усе размовы"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Прыярытэтныя размовы"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ніякія"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> размова</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> размовы</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> размоў</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> размовы</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Няма"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ніводнай}=1{1 размова}one{# размова}few{# размовы}many{# размоў}other{# размовы}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"На што гэты рэжым не распаўсюджваецца"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Выклікі"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Выклікі"</string>
@@ -3870,13 +3895,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Каб прылада апавяшчала пра дазволеныя выклікі гукавым сігналам, праверце адпаведную наладу"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Для раскладу \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" прыём выклікаў заблакіраваны. Вы можаце змяніць налады, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязвацца з вамі."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Пазначаныя кантакты"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="few">яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="many">яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">яшчэ <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Няма"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ніводнага}=1{{contact_1}}=2{{contact_1} і {contact_2}}=3{{contact_1}, {contact_2} і {contact_3}}one{{contact_1}, {contact_2} і яшчэ #}few{{contact_1}, {contact_2} і яшчэ #}many{{contact_1}, {contact_2} і яшчэ #}other{{contact_1}, {contact_2} і яшчэ #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Без назвы)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Паведамленні"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"паведамленні"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Паведамленні"</string>
@@ -3885,13 +3905,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Для раскладу \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" прыём уваходных паведамленняў заблакіраваны. Вы можаце змяніць налады, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязвацца з вамі."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Вы будзеце чуць усе паведамленні"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Вы будзеце чуць усе выклікі"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Няма"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> кантакт</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> кантакты</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> кантактаў</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> кантакту</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ніводнага}=1{1 кантакт}one{# кантакт}few{# кантакты}many{# кантактаў}other{# кантакту}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Любыя"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Кантакты"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Пазначаныя кантакты"</string>
@@ -3929,26 +3943,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Усе апавяшчэнні"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Некаторыя апавяшчэнні"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Выбраныя людзі змогуць звязацца з вамі, нават калі вы распаўсюдзіце рэжым \"Не турбаваць\" на ўсе праграмы"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Гэты рэжым не распаўсюджваецца на праграмы \"<xliff:g id="APP_NAMES">%s</xliff:g>\"</item>
-      <item quantity="few">Гэты рэжым не распаўсюджваецца на праграмы \"<xliff:g id="APP_NAMES">%s</xliff:g>\"</item>
-      <item quantity="many">Гэты рэжым не распаўсюджваецца на праграмы \"<xliff:g id="APP_NAMES">%s</xliff:g>\"</item>
-      <item quantity="other">Гэты рэжым не распаўсюджваецца на праграмы \"<xliff:g id="APP_NAMES">%s</xliff:g>\"</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"і яшчэ <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Рэжым \"Не турбаваць\" распаўсюджваецца на ўсе праграмы}=1{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграму \"{app_1}\"}=2{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\" і \"{app_2}\"}=3{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\", \"{app_2}\" і \"{app_3}\"}one{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\", \"{app_2}\" і яшчэ #}few{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\", \"{app_2}\" і яшчэ #}many{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\", \"{app_2}\" і яшчэ #}other{Рэжым \"Не турбаваць\" не распаўсюджваецца на праграмы \"{app_1}\", \"{app_2}\" і яшчэ #}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Праграмы"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Усе апавяшчэнні"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Некаторыя апавяшчэнні"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Апавяшчэнні, на якія рэжым \"Не турбаваць\" не распаўсюджваецца"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Дазволіць усе апавяшчэнні"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Гэты рэжым не распаўсюджваецца на гукі \"<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>\"</item>
-      <item quantity="few">Гэты рэжым не распаўсюджваецца на гукі \"<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>\"</item>
-      <item quantity="many">Гэты рэжым не распаўсюджваецца на гукі \"<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>\"</item>
-      <item quantity="other">Гэты рэжым не распаўсюджваецца на гукі \"<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>\"</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Гэты рэжым распаўсюджваецца на ўсё без выключэння"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"і яшчэ <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Рэжым \"Не турбаваць\" распаўсюджваецца на ўсё без выключэння}=1{Рэжым \"Не турбаваць\" не распаўсюджваецца на гук \"{sound_category_1}\"}=2{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\" і \"{sound_category_2}\"}=3{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\", \"{sound_category_2}\" і \"{sound_category_3}\"}one{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\", \"{sound_category_2}\" і яшчэ #}few{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\", \"{sound_category_2}\" і яшчэ #}many{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\", \"{sound_category_2}\" і яшчэ #}other{Рэжым \"Не турбаваць\" не распаўсюджваецца на гукі \"{sound_category_1}\", \"{sound_category_2}\" і яшчэ #}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Рэжым \"Не турбаваць\" распаўсюджваецца на ўсё без выключэння"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Гэты рэжым распаўсюджваецца на ўсіх людзей"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Гэты рэжым не распаўсюджваецца на некаторыя кантакты"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Гэты рэжым не распаўсюджваецца на людзей"</string>
@@ -3998,8 +4000,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Уключана"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Выключана"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Замацаванне праграм"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Замацаванне праграм дазваляе трымаць праграму ў полі зроку, пакуль яна не будзе адмацавана. Гэту функцыю можна скарыстаць, каб, напрыклад, дазволіць даверанаму сябру пагуляць у пэўную гульню. \n\nКалі праграма замацавана, яна можа адкрываць іншыя праграмы і даваць доступ да асабістых даных. \n\nКаб выкарыстоўваць замацаванне праграмы, выканайце наступныя дзеянні: 	\n1.	Уключыце замацаванне праграм 	\n2.	Адкрыйце \"Агляд\" 	\n3.	Націсніце на значок праграмы ўверсе экрана, а потым выберыце \"Замацаваць\""</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Замацаванне праграм дазваляе трымаць праграму ў полі зроку, пакуль яна не будзе адмацавана. Гэту функцыю можна скарыстаць, каб, напрыклад, дазволіць даверанаму сябру пагуляць у пэўную гульню. \n\nКалі праграма замацавана, яна можа адкрываць іншыя праграмы і даваць доступ да асабістых даных. \n\nКалі вы хочаце бяспечна абагуліць з кім-небудзь сваю прыладу, лепш скарыстайце профіль гасцявога карыстальніка. \n\nКаб выкарыстоўваць замацаванне праграмы, выканайце наступныя дзеянні: 	\n1.	Уключыце замацаванне праграм 	\n2.	Адкрыйце \"Агляд\" 	\n3.	Націсніце на значок праграмы ўверсе экрана, а потым выберыце \"Замацаваць\""</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Замацаванне праграмы дазваляе трымаць праграму ў полі зроку, пакуль яна не будзе адмацавана. Гэту функцыю можна скарыстаць, каб, напрыклад, дазволіць даверанаму сябру пагуляць у пэўную гульню."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Калі праграма замацавана, яна можа адкрываць іншыя праграмы і даваць доступ да асабістых даных. \n\nКаб выкарыстоўваць замацаванне праграмы, выканайце наступныя дзеянні: 	\n1.	Уключыце замацаванне праграмы 	\n2.	Адкрыйце \"Агляд\" 	\n3.	Націсніце на значок праграмы ўверсе экрана, а потым выберыце \"Замацаваць\""</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Калі праграма замацавана, яна можа адкрываць іншыя праграмы і даваць доступ да асабістых даных. \n\nКалі вы хочаце бяспечна абагуліць з кім-небудзь сваю прыладу, лепш скарыстайце профіль гасцявога карыстальніка. \n\nКаб выкарыстоўваць замацаванне праграмы, выканайце наступныя дзеянні: 	\n1.	Уключыце замацаванне праграмы 	\n2.	Адкрыйце \"Агляд\" 	\n3.	Націсніце на значок праграмы ўверсе экрана, а потым выберыце \"Замацаваць\""</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Калі праграма замацавана: \n\n•		Могуць быць даступныя асабістыя даныя \n		(напрыклад, кантакты і змесціва электроннай пошты) \n•	 Замацаваная праграма можа адкрываць іншыя праграмы \n\nВыкарыстоўвайце замацаванне праграм толькі з людзьмі, якім давяраеце."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Запытваць узор разблакіроўкі перад адмацаваннем"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Запытваць PIN-код перад адмацаваннем"</string>
@@ -4021,6 +4024,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"У дадатак да выкарыстання функцыі выяўлення твару для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання PIN-кода пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць PIN-код для запуску вашай прылады?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"У дадатак да выкарыстання функцыі выяўлення твару для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання ўзору пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць узор разблакіроўкі для запуску вашай прылады?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання пароля пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць пароль для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"У дадатак да выкарыстання біяметрычных даных для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання PIN-кода перад запускам. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні і апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на згубленых або ўкрадзеных прыладах. Запытваць PIN-код для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"У дадатак да выкарыстання біяметрычных даных для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання ўзору разблакіроўкі перад запускам. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні і апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на згубленых або ўкрадзеных прыладах. Запытваць узор разблакіроўкі для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"У дадатак да выкарыстання біяметрычных даных для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання пароля перад запускам. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні і апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на згубленых або ўкрадзеных прыладах. Запытваць пароль для запуску вашай прылады?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Так"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Не"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"З абмежаваннямі"</string>
@@ -4212,7 +4218,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Рэжым працы USB"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Падключаная прылада"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Гэта прылада"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Пераключэнне…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Выконваецца пераключэнне…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Адбылася памылка"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Зарадка гэтай прылады"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Зарадка падключанай прылады"</string>
@@ -4414,6 +4420,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Выкарыстанне мабільнага трафіку"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Выкарыстанне трафіка"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Выкарыстанне трафіка сеткай Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Выкарыстанне трафіка праз сеткі, якія не належаць аператарам"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Выкарыстанне даных Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4434,6 +4441,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> абмежавання</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Улік даных аператара можа адрознівацца ад уліку прылады"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Выключае трафік пра сеткі, якія належаць аператарам"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> выкарыстана"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Укл. папярэджанне пра трафік"</string>
     <string name="data_warning" msgid="2925054658166062884">"Папярэджанне пра трафік"</string>
@@ -4473,7 +4481,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Праглядзець звесткі"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Эканомія трафіка"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Неабмежаваныя даныя"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Фонавая перадача даных выключана"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Фонавая перадача даных выключана"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Уключана"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Выключана"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Уключыць эканомію трафіка"</string>
@@ -4496,7 +4504,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Калі прылада заблакіравана, не дазваляць набіраць адказы або іншы тэкст у апавяшчэннях"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Стандартная праверка правапісу"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Праверка правапісу"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Уключыць праверку правапісу"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Выкарыстоўваць праверку правапісу"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Не выбрана"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(няма)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4602,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Каб вызваліць месца ў сховішчы, Менеджар сховішча выдаляе фота і відэа, для якіх створаны рэзервовыя копіі, з вашай прылады."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Выдаліць фота і відэа"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Менеджар сховішча"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Карыстанне менеджарам сховішча"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Выкарыстоўваць менеджар сховішча"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Аўтаматычна"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Уручную"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Вызваліць месца"</string>
@@ -4632,6 +4640,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Двойчы дакрануцца, каб праверыць апавяшчэнні"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Двойчы дакраніцеся, каб праверыць планшэт"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Двойчы дакраніцеся, каб праверыць прыладу"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Прагартаць (апавяшчэнні)"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Каб праглядзець апавяшчэнні, правядзіце пальцам па ніжняй частцы экрана ўніз"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Рэжым кіравання адной рукой"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Выкарыстоўваць рэжым кіравання адной рукой"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Выходзіць з праграмы пры пераключэнні на іншую праграму"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Час чакання"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунды"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"дасягальнасць"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Каб праверыць час, апавяшчэнні і іншую інфармацыю, двойчы дакраніцеся да экрана."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Падняць тэлефон, каб праверыць апавяшчэнні"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Падніміце планшэт, каб праверыць яго"</string>
@@ -4644,6 +4662,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Націсніце, каб праверыць планшэт"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Націсніце, каб праверыць прыладу"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Каб праверыць час, апавяшчэнні і іншую інфармацыю, дакраніцеся да экрана."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Экстранны выклік SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Выкарыстоўваць экстранны выклік SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Пад кіраваннем праграмы \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Запусціце выкананне прыведзеных далей дзеянняў, хутка націснуўшы кнопку сілкавання 5 ці больш разоў"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Прайграць сігнал з адваротным адлікам"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Прайграць моцны гук перад тым, як запытаць дапамогу"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Звярнуцца па дапамогу"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Нумар для выкліку дапамогі"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Націсніце, каб змяніць"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Калі замест нумара экстраннай службы вы ўвялі іншы нумар:\n • Каб зрабіць экстранны выклік, вам трэба разблакіраваць прыладу\n • Вы можаце не атрымаць адказ на выклік"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Правядзіце пальцам, каб убачыць апавяшчэнні"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Сканер адбіткаў"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Каб праверыць апавяшчэнні, правядзіце пальцам уніз па сканеры адбіткаў пальцаў на заднім боку тэлефона."</string>
@@ -4783,6 +4811,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Максімальная колькасць бачных набораў даных"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Скінуць значэнні да стандартных"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Аўтазапаўненне параметраў распрацоўшчыка было скінута"</string>
+    <string name="location_category" msgid="3496759112306219062">"Месцазнаходжанне"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Індыкатар месцазнаходжання на панэлі стану"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Паказваць для ўсіх месцазнаходжанняў, у тым ліку для месцазнаходжання ў сетцы і месцаў падключэння"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Прымусова правесці поўныя вымярэнні GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Адсочваць усе групы і частоты GNSS з выключаным працоўным цыклам"</string>
     <string name="device_theme" msgid="5027604586494772471">"Тэма прылады"</string>
     <string name="default_theme" msgid="4815428567082263639">"Стандартная"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Назва сеткі"</string>
@@ -4799,8 +4832,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Прыпыніце апавяшчэнні, каб яны не адцягвалі ўвагу"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Функцыя недаступная"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Гэта функцыя выключана, таму што яна запавольвае працу вашага тэлефона"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Прымусова правесці поўныя вымярэнні GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Адсочваць усе групы і частоты GNSS з выключаным працоўным цыклам"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Заўсёды паказваць дыялогавыя вокны з памылкамі"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Паказваць дыялогавае акно кожны раз, калі адбываецца збой праграмы"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Выбраць праграму з падтрымкай ANGLE"</string>
@@ -4812,7 +4843,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Уключыць для ўсіх праграм"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Выбраць драйвер графічнай сістэмы"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Стандартна"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Драйвер гульні"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Драйвер гульні"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драйвер распрацоўшчыка"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Драйвер графічнай сістэмы"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4868,7 +4899,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Уключана (без гуку)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Выключана"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Інфармацыя аб сетцы"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Назва вашай прылады даступная для праграм на вашым тэлефоне. Яе таксама будуць бачыць іншыя людзі, калі вы падключыцеся да прылад праз Bluetooth ці наладзіце хот-спот Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Назва вашай прылады даступная для праграм на вашым тэлефоне. Яе таксама будуць бачыць іншыя людзі, калі вы падключыцеся да прылад праз Bluetooth, падключыцеся да сеткі Wi-Fi ці наладзіце хот-спот Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Прылады"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Усе налады"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Прапановы"</string>
@@ -4881,6 +4912,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Не ўдалося знайсці сеткі. Паўтарыце спробу."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(забаронена)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Няма SIM-карты"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Няма SIM-карты"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Няма"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Для падключэння неабходная SIM-карта"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Для падключэння неабходная SIM-карта аператара \"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>\""</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Прыярытэтны рэжым сеткі: пераважна WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Прыярытэтны рэжым сеткі: толькі GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Прыярытэтны рэжым сеткі: толькі WCDMA"</string>
@@ -4934,6 +4970,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мабільная перадача даных"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ да даных па мабільнай сетцы"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Калі сігнал гэтага аператара будзе ў межах дасягальнасці, тэлефон аўтаматычна пераключыцца на яго"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM-карты недаступныя"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Параметры выклікаў"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Параметры SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Заўсёды пытацца"</string>
@@ -4996,6 +5033,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недаступна праз аператара \"<xliff:g id="CARRIER">%1$s</xliff:g>\""</string>
     <string name="see_more" msgid="7499355691042812723">"Яшчэ"</string>
     <string name="see_less" msgid="2642392725363552793">"Паказаць менш"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Уключыць аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Уключыць SIM-карту?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Пераключыцца на аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Пераключыцца на выкарыстанне SIM-карты?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Нельга актываваць адначасова некалькі SIM-карт.\n\nПераключэнне на аператара \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\" не скасуе абслугоўванне ў аператара \"<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>\"."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Нельга актываваць адначасова некалькі спампаваных SIM-карт.\n\nПераключэнне на аператара \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\" не скасуе абслугоўванне ў аператара \"<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>\"."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Нельга актываваць адначасова некалькі SIM-карт.\n\nПераключэнне не скасуе абслугоўванне ў аператара \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\"."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Пераключыцца на аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\""</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Ідзе падключэнне да сеткі…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Ідзе пераключэнне на аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\""</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Не ўдалося пераключыць аператара"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Не ўдалося пераключыць аператара з-за памылкі."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Адключыць аператара \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Адключыць SIM-карту?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Адключаецца SIM-карта<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Не ўдалося адключыць аператара"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Нешта пайшло не так. Не ўдалося адключыць вашага аператара."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Выкарыстоўваць 2 SIM-карты?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"На гэтай прыладзе можна актываваць адначасова 2 SIM-карты. Каб і далей карыстацца толькі адной SIM-картай, націсніце \"Не, дзякуй\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Перазапусціць прыладу?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Каб пачаць, перазапусціце прыладу. Пасля гэтага можна дадаць яшчэ адну SIM-карту."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Далей"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Перазапусціць"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, дзякуй"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Пераключыцца"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не ўдалося актываваць SIM-карту"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Выдаліце SIM-карту і ўстаўце яе зноў. Калі праблема застанецца, перазапусціце прыладу."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Паспрабуйце зноў уключыць SIM-карту. Калі праблема застанецца, перазапусціце прыладу."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Актывацыя сеткі"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Сетка \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\" актыўная"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Націсніце, каб абнавіць налады SIM-карты"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-карта"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Сцерці даныя гэтай спампаванай SIM?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Сціранне даных гэтай SIM-карты выдаляе з прылады магчымасць карыстацца паслугамі аператара \"<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>\".\n\nАбслугоўванне ў аператара \"<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>\" будзе працягнута."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Сцерці"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Сціраюцца даныя SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Не ўдалося сцерці даныя SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Памылка сцірання даных гэтай SIM.\n\nПеразапусціце прыладу і паўтарыце спробу."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Падключыць да прылады"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Праграма \"<xliff:g id="APPNAME">%1$s</xliff:g>\" запытвае дазвол на часовае выкарыстанне сеткі Wi‑Fi для падключэння да вашай прылады"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Прылады не знойдзены. Пераканайцеся, што прылады ўключаны і даступныя для падключэння."</string>
@@ -5071,6 +5146,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Экстранныя выклікі"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Экстранныя выклікі праз Wi‑Fi-тэлефанію не падтрымліваюцца вашым аператарам.\nКаб зрабіць экстранны выклік, прылада аўтаматычна пераключыцца на мабільную сетку.\nЭкстранныя выклікі можна рабіць толькі ў зонах сотавага пакрыцця."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Каб палепшыць якасць выклікаў, выкарыстоўвайце Wi‑Fi"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Тэлефанія паміж SIM-картамі"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Дазваляе іншай SIM-карце рабіць выклікі і адпраўляць SMS праз гэтую SIM-карту."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"тэлефанія паміж SIM-картамі"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Уваходнае MMS-паведамленне"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Не ўдалося адправіць MMS-паведамленне"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Націсніце, каб дазволіць адпраўляць MMS-паведамленні ў <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>, калі мабільная перадача даных адключана"</string>
@@ -5122,10 +5200,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дазволіць экранныя накладкі на Налады"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дазвольце праграмам, якія могуць паказвацца паверх іншых, накладацца на экраны Налад"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Мультымедыя"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Схаваць прайгравальнік пасля завяршэння сеанса"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Прайгравальнік дазваляе вам узнавіць сеанс з разгорнутай панэлі \"Хуткія налады\"."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Медыяпрайгравальнік у Хуткіх наладах"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Паказваць медыяпрайгравальнік працяглы час для лёгкага ўзнаўлення прайгравання"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Схаваць прайгравальнік"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Паказаць прайгравальнік"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Няма даступных прайгравальнікаў"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Дазволеныя праграмы"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"мультымедыя"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Будзе ўключаны Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Уключана"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Выключана"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"інтэрнэт"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-карты"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Сеткі, бяспечныя ў самалёце"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Шукаць сеткі, бяспечныя ў самалёце, і падключацца да іх"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самалёт, бяспека ў самалёце"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Выклікі і SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi-тэлефанія"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Рабіце і атрымлівайце выклікі з выкарыстаннем сетак, якія не належаць аператарам, напрыклад Wi-Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi-тэлефанія дазваляе рабіць і прымаць выклікі праз сеткі, якія не належаць аператарам, напрыклад праз некаторыя сеткі Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Выклікі"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"прыярытэтны"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"прыярытэтныя выклікі"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"прыярытэтныя SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"недаступны"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Няма SIM-карты"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметры"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Падключацца да агульнадаступных сетак"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"падключэнне да сеткі, інтэрнэт, бесправадны, даныя, wifi, wi-fi, wi fi, сотавая сетка, мабільны, аператар сотавай сувязі, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Праглядзець бяспечныя ў самалёце сеткі"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Выключыць рэжым палёту"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Недаступна, бо ўключаны начны рэжым"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Скід налад важнасці апавяшчэнняў завершаны."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Праграмы"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Падазроная прылада запытвае доступ да вашых паведамленняў. Націсніце, каб убачыць больш інфармацыі."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Дазволіць доступ да паведамленняў?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Падазроная прылада з Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], запытвае доступ да вашых паведамленняў.\n\nРаней вы не падключаліся да прылады [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Падазроная прылада запытвае доступ да кантактаў і журнала выклікаў. Націсніце, каб убачыць больш інфармацыі."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Дазволіць доступ да кантактаў і журнала выклікаў?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Падазроная прылада з Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], запытвае доступ да кантактаў і журнала выклікаў, у тым ліку да даных пра ўваходныя і выходныя выклікі.\n\nРаней вы не падключаліся да прылады [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 6960746..dfb8c46 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Средно"</item>
     <item msgid="6740026006576843477">"Продължително"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Кратко"</item>
+    <item msgid="7397961711906421599">"Средно"</item>
+    <item msgid="4079132024502041928">"Продължително"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Стандартни"</item>
     <item msgid="4234707448428002595">"Безсерифни"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобална мрежа"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Само TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобални"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 0203018..08f6d6f 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Дата и час"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Задаване на дата и час"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Задаване на дата, час, часова зона и формати"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Използване на часа, предоставен от мрежата"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Използване на часовата зона, предоставена от мрежата"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Автоматично задаване на часа"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Автоматично задаване на часовата зона"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Използване на стандартния формат за локала"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-часов формат"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-часов формат"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Показв. на инф. за потр. профил върху закл. екран"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Профили"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Местоположение"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Използване на местоположението"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Използване на местоположението"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Изкл."</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Включено – <xliff:g id="COUNT_1">%1$d</xliff:g> приложения имат достъп до местоположението</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Заключване на екрана, отключване с лице"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Опция за заключване на екрана, отпечатък"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Опция за заключване на екрана"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Отключвайте телефона си надеждно чрез лицето и отпечатъка си"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Можете също да влизате в приложения и потвърждавате плащания"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Настройте отключване посредством:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Отключване с лице"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Улеснете отключването на телефона си"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Отпечатък"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Отключвайте телефона си бързо и лесно"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Пропускане"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Напред"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Добавено е лице"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Настройване на отключването с лице"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Отключване с лице"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Ползване на лицето ви за удостоверяване"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Стартиране"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ако функцията за отключване с лице е изключена, някои стъпки за настройване може да не работят правилно с TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Продължаване за настройване"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Настр. на ф-ята за достъпност: Ползване"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"При отключване с лице в приложенията винаги да се изисква потвърждение"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Изтриване на лицата"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Настройване на отключването с лице"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Използвайте „Отключване с лице“, за да отключвате устройството си, да влизате в профила си в приложения и да потвърждавате плащания.\n\nИмайте предвид следното:\nМожете да отключите телефона неволно, като го погледнете.\n\nТелефонът ви може да бъде отключен от друг човек, ако бъде приближен до лицето ви.\n\nТой би могъл да бъде отключен и от някого, който много прилича на вас, например от ваши брат или сестра близнак."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Използвайте „Отключване с лице“, за да отключвате устройството си, да влизате в профила си в приложения и да потвърждавате плащания.\n\nИмайте предвид следното:\nМожете да отключите телефона неволно, като го погледнете.\n\nТелефонът ви може да бъде отключен от друг човек, ако бъде приближен до лицето ви дори ако очите ви са затворени.\n\nТой би могъл да бъде отключен и от някого, който много прилича на вас, например от ваши брат или сестра близнак."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Използвайте функцията за отключване с лице, за да отключвате устройството си, да влизате в приложения и да потвърждавате плащания."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Имайте предвид следните неща:\nМожете да отключите телефона неволно, като го погледнете.\n\nТой може да бъде отключен от друг човек, ако бъде приближен до лицето ви.\n\nТой може да бъде отключен от някого, който много прилича на вас, например от ваши брат или сестра близнак."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Имайте предвид следните неща:\nМожете да отключите телефона неволно, като го погледнете.\n\nТой може да бъде отключен от друг човек, ако бъде приближен до лицето ви, дори очите ви да са затворени.\n\nТой може да бъде отключен от някого, който много прилича на вас, например от ваши брат или сестра близнак."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Да се изтрият ли данните за лицето?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Използваните от функцията за отключване с лице данни за лицето ще бъдат изтрити надеждно и за постоянно. След премахването ще имате нужда от ПИН кода, фигурата или паролата си, за да отключвате телефона си, да влизате в приложения и да потвърждавате плащания."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Използвайте функцията „Отключване с лице“, за да отключите телефона си"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Използвайте отпечатъка си, за да отключвате телефона си или да одобрявате покупки.\n\nЗабележка: Не можете да отключвате това устройство с отпечатъка си. За повече информация се свържете с администратора на организацията си."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Използвайте отпечатъка си, за да отключвате телефона си или да одобрявате покупки.\n\nЗабележка: Отпечатъкът ви може да е по-малко сигурен в сравнение с надеждна фигура или ПИН код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Отказ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, благодаря"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Напред"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Пропускане"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Напред"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Като защитите таблета си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубен или откраднат. Такава опция е нужна и за настройване на отключването с лице. За да се върнете назад, докоснете „Отказ“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Като защитите устройството си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубено или откраднато. Такава опция е нужна и за настройване на отключването с лице. За да се върнете назад, докоснете „Отказ“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Като защитите телефона си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубен или откраднат. Такава опция е нужна и за настройване на отключването с лице. За да се върнете назад, докоснете „Отказ“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Като защитите таблета си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубен или откраднат. Такава опция е необходима и за настройването на биометрично удостоверяване. За да се върнете назад, докоснете „Отказ“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Като защитите устройството си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубено или откраднато. Такава опция е необходима и за настройването на биометрично удостоверяване. За да се върнете назад, докоснете „Отказ“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Като защитите телефона си с опция за заключване на екрана, никой няма да може да го използва, ако бъде изгубен или откраднат. Такава опция е необходима и за настройването на биометрично удостоверяване. За да се върнете назад, докоснете „Отказ“."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Да се пропусне ли настройването на ПИН?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Да се пропусне ли настройването на парола?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Да се пропусне ли настройването на фигура?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Предотвратете използването на този таблет от други хора без разрешението ви, като активирате функциите за защита на устройството. Изберете опцията за заключване на екрана, която искате да използвате."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Предотвратете използването на това устройство от други хора без разрешението ви, като активирате функциите за защитата му. Изберете опцията за заключване на екрана, която искате да използвате."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Предотвратете използването на този телефон от други хора без разрешението ви, като активирате функциите за защита на устройството. Изберете опцията за заключване на екрана, която искате да използвате."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Изберете резервния си начин на заключване на екрана"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Изберете резервния си начин на заключване на екрана"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Изберете резервния си начин на заключване на екрана"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Опции за заключване на екрана"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Опции за заключване на екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Заключване на екрана"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Отключване с лице + парола"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Продължаване без отключване с лице"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Можете да отключвате телефона си посредством лицето си. От съображения за сигурност трябва да зададете резервна опция за заключване на екрана."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрично удостоверяване + фигура"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрично удостоверяване + ПИН код"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрично удостоверяване + парола"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Продължаване без биометрично удостоверяване"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Можете да отключвате телефона си посредством биометричните си данни. От съображения за сигурност трябва да зададете резервна опция за заключване на екрана."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Деакт. от админ., правила за шифроване или хранил. за идент. данни"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Няма"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"С бързо плъзгане"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Трябва да съдържа по-малко от <xliff:g id="NUMBER_0">%d</xliff:g> цифра</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Администраторът на у-вото не разрешава ползването на скорошен ПИН"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Често срещаните ПИН кодове се блокират от системния ви администратор. Опитайте с друг ПИН код."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Не може да включва невалиден знак"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Трябва да съдържа поне една буква"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Трябва да съдържа поне една цифра"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Трябва да съдържа поне 1 нецифрен знак</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Администраторът на у-вото не разрешава ползването на скорошна парола"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Често срещаните пароли се блокират от системния ви администратор. Опитайте с друга парола."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Възходящите, низходящите и повтарящите се поредици от цифри не са разрешени"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Потвърждаване"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Отказ"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Включване на Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Използване на Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Използване на Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Настройки за Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Задаване и управление на безжични точки за достъп"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"За да се свържете с „<xliff:g id="SSID">%1$s</xliff:g>“, центрирайте по-долу кода за бърза реакция"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Присъединете се към  Wi‑Fi мрежата, като сканирате код за бърза реакция"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Споделяне на Wi‑Fi мрежата"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Сканирайте този код за бърза реакция, за да се свържете към „<xliff:g id="SSID">%1$s</xliff:g>“ и да споделите паролата"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Сканирайте този код за бърза реакция с друго устройство, за да се присъедините към <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Сканирайте този код за бърза реакция, за да се свържете към „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Опитайте отново. Ако проблемът не се отстрани, свържете се с производителя на устройството."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Нещо се обърка"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Парола за Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Парола за точката за достъп: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Автоматично свързване"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Разрешаване телефонът автоматично да се свързва в района на тази мрежа"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Разрешаване таблетът автоматично да се свързва в района на тази мрежа"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Разрешете свързване с тази мрежа, когато е в обхват"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Добавяне на устройство"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Използвайте код за бърза реакция, за да добавите устройство към тази мрежа"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Невалиден формат на кода за бърза реакция"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Използване на системни сертификати"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Без предоставяне"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Без удостоверяване"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Не е посочен сертификат. Връзката ви няма да бъде частна."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Името на мрежата е твърде дълго."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Трябва да посочите домейн."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Изисква се сертификат."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Свързване"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Функцията за Wi-Fi е включена"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Установена е връзка с(ъс) <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Свързване към <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Свързва се…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Свързването с мрежата не бе успешно"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Мрежата не е в обхват"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC адрес на устройството"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Рандомизиран MAC адрес"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Рандомизиран MAC адрес (последно използван)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP адрес"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Подробно за мрежата"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Подмрежова маска"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 адреси"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Запазени мрежи"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Абонаменти"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Други мрежи"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Настройки за IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Разширените настройки за Wi-Fi не са налице за този потребител"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Запазване"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Въведете валиден адрес за шлюз."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Въведете валиден адрес за DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Въведете дължина на мреж. префикс между 0 и 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (освен ако не се замени с частен DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (освен ако не се замени с частен DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Дължина на мрежов префикс"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Приложението споделя съдържание. За да споделите връзката с интернет, изключете точката за достъп и я включете отново"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Няма зададена парола"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Име на точката за достъп"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"„<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“ се включва..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> се включва…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Други устройства могат да се свързват към „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Парола за точката за достъп"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Честота на точката за достъп"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Плавно показване"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Автоматично увеличава честотата на опресняване от 60 на 90 Hz за част от съдържанието. По-интензивно използване на батерията."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Плавно показване"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Принудителна честота на опресняване при 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Най-висока честота на опресняване за по-добро реагиране при докосване и качество на анимациите. По-интензивно използване на батерията."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Внимание към екрана"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Вкл. – Екранът няма да се изключи, ако гледате в него"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Екранът се включва при нови известия, когато е изключен"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Часът и информ. да се показват"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"По-интензивно използване на батерията"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Удебелен текст"</string>
     <string name="title_font_size" msgid="570613010306330622">"Размер на шрифта"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Уголемяване или намаляване на текст"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Заключване на SIM картата"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Версия на Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Актуализация за сигурността на Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Модел"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Модел: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Модел и хардуер"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Версия на хардуера"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Идент. № на оборудването"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Изтриване на името на точката за достъп (APN)"</string>
     <string name="menu_new" msgid="6571230342655509006">"Ново име на точка за достъп (APN)"</string>
     <string name="menu_save" msgid="6611465355127483100">"Запазване"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Отхвърляне"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Отказ"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Полето за име трябва да се попълни."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Името на точката за достъп (APN) трябва да се попълни."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Приложенията могат да бъдат нулирани"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Нулиране на настройките за Wi-Fi, мобилни данни и Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Така ще нулирате всички мрежови настройки, включително тези за:\n\n"<li>"Wi‑Fi;"</li>\n<li>"мобилни данни;"</li>\n<li>"Bluetooth."</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Изтриване на данните"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Изтеглени SIM карти: Изтриване"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"За да изтеглите SIM карти за замяна, свържете се с оператора си. Плановете за мобилни услуги няма да бъдат анулирани."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Плановете за мобилни услуги няма да бъдат анулирани. Обърнете се към оператора си, за да изтеглите резервни SIM карти."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Нулиране на настройките"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Да се нулират ли всички настройки за мрежата? Не можете да отмените това действие."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Да се нулират ли всички мрежови настройки и да се изтрият изтеглените SIM карти? Не можете да отмените това действие."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Мрежовите настройки са нулирани"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM картите не могат да се изтрият"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Изтеглените SIM карти не могат да бъдат изтрити поради грешка.\n\nРестартирайте устройството си и опитайте отново."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Изтриване на всички данни (възстановяване на фабричните настройки)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Изтрив. на данните (възст. на фабр. настр.)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данни и настройки от системата и приложенията;"</li>\n<li>"изтеглени приложения."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google"</li>\n<li>"данни и настройки от системата и приложенията"</li>\n<li>"изтеглени приложения"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Понастоящем сте влезли в следните профили:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"На това устройство има други потребители.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Музика"</li>\n<li>"Снимки"</li>\n<li>"други потребителски данни"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"електронни SIM карти"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Планът ви за мобилна услуга няма да бъде анулиран."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"USB хранилището"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Изтриване на всички данни (възстановяване на фабричните настройки)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Изтрив. на данните (възст. на фабр. настр.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на таблета ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данните и настройките от системата и приложенията;"</li>\n<li>"изтеглените приложения."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Това ще изтрие всички данни от "<b>"вътрешното хранилище"</b>" на телефона ви, включително:\n\n"<li>"профила ви в Google;"</li>\n<li>"данните и настройките от системата и приложенията;"</li>\n<li>"изтеглените приложения."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Понастоящем сте влезли в следните профили:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"На това устройство има други потребители.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"музика"</li>\n<li>"снимки"</li>\n<li>"други потребителски данни"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"електронни SIM карти"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Планът ви за мобилна услуга няма да бъде анулиран."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"USB хранилището"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"За да изчистите музиката, снимките и другите потребителски данни, трябва да се изтрие "<b>"SD картата"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Изтриване на USB хранилището"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Изтриване на SD картата"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Изтриване на всички данни във вътрешното USB хранилище, като музика или снимки"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Да се изтриват всички данни в SD картата, като музика или снимки"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Изтриване на всички данни"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Изтриване на всички данни"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Цялата ви лична информация и всички изтеглени приложения ще бъдат изтрити. Не можете да отмените това действие."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Цялата ви лична информация, включително изтеглените приложения и SIM карти, ще бъде изтрита. Не можете да отмените това действие."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Изтриване на всичко"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Не се състоя рестартиране, защото услугата за изчистване на системата не се предлага."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Да се изтрият ли всички данни?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"За този потребител не е налице възстановяване на фабричните настройки"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Изтрива се"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Моля, изчакайте..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Изтриване на всички данни"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Изтриване на всички данни"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Цялата ви лична информация и всички изтеглени приложения ще бъдат изтрити. Не можете да отмените това действие."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Цялата ви лична информация, включително изтеглените приложения и SIM карти, ще бъде изтрита. Не можете да отмените това действие."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Да се изтрият ли всички данни?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"За този потребител не е налице възстановяване на фабричните настройки"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Изтрива се"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Моля, изчакайте…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Настройки за обаждане"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Настройка на гласова поща, пренасочване, изчакване и идентификация на обаждането"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Тетъринг през USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Не може да се извърши тетъринг с над <xliff:g id="MAXCONNECTION">%1$d</xliff:g> устройства."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Тетърингът на <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ще бъде прекъснат."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Тетъринг чрез Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Споделете връзката с интернет на телефона чрез Ethernet през USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Споделете връзката с интернет на телефона чрез Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Използвайте точка за достъп и тетъринг, за да предоставите достъп до интернет на други устройства чрез мобилната си връзка за данни. Приложенията могат също да създават точки за достъп, за да споделят съдържание с устройства в близост."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Използвайте точка за достъп и тетъринг, за да предоставите достъп до интернет на други устройства чрез Wi-Fi или мобилната си връзка за данни. Приложенията могат също да създават точки за достъп, за да споделят съдържание с устройства в близост."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Помощ"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Сканиране за устройства с Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Разрешете на приложенията и услугите да сканират за устройства в близост по всяко време дори когато функцията за Bluetooth e изключена. Това може да послужи например за подобряване на базиращите се на местоположението функции и услуги."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуги за местоположение за служебни цели"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Установяване на часовата зона чрез местоположението"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Установяване на часовата зона чрез местоположение"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Разрешава местоположението на устройството да се използва за установяване на текущата часова зона. Други настройки за местоположението, като например сканирането за Wi-Fi, могат да повлияят на точността на установяването на часовата зона."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Включено"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Изключено"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Автоматичното установяване на часовата зона е деактивирано"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Установяването на часовата зона чрез местоположението е деактивирано"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Установяването на часовата зона чрез местоположението не се поддържа"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Не се разрешават промени в установяването на часовата зона чрез местоположението"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Mестоп. от Wi‑Fi и моб. мрежа"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Прилож. да ползват услугата ни за местоп., за да прогнозират по-бързо вашето. Анонимни данни за местоп. ще се събират и изпращат на Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Местоположението се определя чрез Wi‑Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"За да отключвате с лице, задайте парола"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"За да отключвате с лице, задайте фигура"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"За да отключвате с лице, задайте ПИН"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Задайте парола като резервна опция"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Задайте фигура като резервна опция"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Задайте ПИН като резервна опция"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Забравили сте паролата?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Забравили сте фигурата?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Забравили сте ПИН кода?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Предпочитания за надписите"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ниво на мащаба"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Област за увеличаване"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Режим за увеличение: Активиране"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Изберете кои области от екрана да бъдат увеличени при използване на съответната функция"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Цял екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Част от екрана"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Целият екран и част от екрана"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Увеличаване на целия екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Увеличаване на част от екрана"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Да се превключи ли към бутона за достъпност?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Трикратното докосване с цел увеличение на част от екрана ще предизвика забавяне при въвеждането и други действия.\n\nИскате ли вместо това да използвате за увеличение бутона за достъпност?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Превключване към бутона за достъпност"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Запазване на трикратното докосване с цел увеличение"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Настройки за увеличението"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Увеличаване с трикратно докосване"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Увеличаване на мащаба с пряк път"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Край на обажд.: Бутон за захранване"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Голям курсор на мишката"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Премахване на анимациите"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Монозвук"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Комбиниране на каналите при възпроизв. на звук"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс на звука"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Ляво"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Дясно"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Монозвук"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Комбиниране на каналите при възпроизв. на звук"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс на звука"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Ляво"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Дясно"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"По подразбиране"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунди"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунди"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вибриране при известия"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вибриране при звънене"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Обратна връзка при докосване"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Използване на „<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>“"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Отваряне на <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Използване на корекция на цветовете"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Показване на надписите"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Само за поддържаното приложение"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Използване на <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Отваряне на <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Използване на корекция на цветовете"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Показване на надписите"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Само за поддържаното приложение"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Размер и стил на надписите"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Размер на текста: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Още опции"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Деутераномалия"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалия"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалия"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Сива скала"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Червено-зелено"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Червено-зелено"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синьо-жълто"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ограничение за заден план"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Разрешаване приложението да се изпълнява на заден план"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Приложението няма разрешение да се изпълнява на заден план"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Използването на заден план не може да бъде ограничено"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Използването на заден план не може да бъде ограничено"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Да се ограничи ли активността на заден план?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ако ограничите активността на заден за дадено приложение, то може да не функционира правилно"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Тъй като прил. не е зададено да оптимизира батерията, можете да го ограничите.\n\nЗа тази цел първо включете оптим. на батерията."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Таблетът е използван повече от обикновено"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Устройството е използвано повече от обикновено"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Батерията може да се изтощи по-рано от обикновено"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Оптимизиране за състоянието на батерията"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Батерията е временно ограничена. Докоснете, за да научите повече."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Телефонът ви е използван повече от обикновено. Батерията може да се изтощи по-рано от очакваното.\n\nПриложения с най-висок разход на батерията:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Таблетът ви е използван повече от обикновено. Батерията може да се изтощи по-рано от очакваното.\n\nПриложения с най-висок разход на батерията:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Устройството ви е използвано повече от обикновено. Батерията може да се изтощи по-рано от очакваното.\n\nПриложения с най-висок разход на батерията:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d приложение е ограничено</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Възникна проблем при четенето на данните за нивото на батерията"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Възникна проблем при четенето на данните за нивото на батерията. Докоснете, за да "<annotation id="url">"научите повече"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Да се спре ли приложението?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Телефонът ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно го активира.\n\nЗа да опитате да решите проблема, можете да спрете приложението.\n\nАко това не помогне, може да се наложи да деинсталирате приложението, за да подобрите ефективността на батерията."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Таблетът ви не е в състояние да управлява батерията нормално, защото <xliff:g id="APP">%1$s</xliff:g> постоянно го активира.\n\nЗа да опитате да решите проблема, можете да спрете приложението.\n\nАко това не помогне, може да се наложи да деинсталирате приложението, за да подобрите ефективността на батерията."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Задаване на график"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Удължаване на живота на батерията"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Изключване при зареждане"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Режимът за запазване на батерията се изключва, когато телефонът ви е зареден на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Режимът за запазване на батерията се изключва, когато таблетът ви е зареден на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Режимът за запазване на батерията се изключва, когато устройството ви е заредено на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Режимът за запазване на батерията се изключва, когато телефонът ви се зареди над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Режимът за запазване на батерията се изключва, когато таблетът ви се зареди над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Режимът за запазване на батерията се изключва, когато устройството ви се зареди над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Включване"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Нулиране"</string>
     <string name="tts_play" msgid="2945513377250757221">"Възпроизвеждане"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Функция за адаптивно свързване"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Удължава живота на батерията и подобрява ефективността на устройството чрез автоматично управление на връзките с мрежата"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Хранилище за идент. данни"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Инсталиране на сертификат"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Инсталиране на сертификати от хранилището"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Идентиф. данни на потребителя"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Преглед и промяна на съхранените идентификационни данни"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Разширени"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип на хранилището"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"С хардуерна поддръжка"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтуерно"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Идентификационните данни не са налице за този потребител"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталирани за виртуалната частна мрежа (VPN) и приложения"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Инсталирани за Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Без инсталиране"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Инсталиране въпреки това"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Сертификатът не е инсталиран"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Разрешавате ли на <xliff:g id="APP_NAME">%s</xliff:g> да инсталира сертификати на това устройство?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Тези сертификати ще ви идентифицират пред приложенията и URL адресите по-долу"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Забраняване"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Разрешаване"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Показване на още"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Прил. за управл. на сертифик."</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Няма"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Сертификатите, инсталирани от това приложение, ви идентифицират пред приложенията и URL адресите по-долу"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Премахване"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Сигнал за набиране при спешен случай"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Задаване на поведение при спешно обаждане"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Резервно копие"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Не е настроен – Служебен потребителски профил"</string>
     <string name="user_admin" msgid="4024553191395768119">"Администратор"</string>
     <string name="user_you" msgid="3070562015202859996">"Вие (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Псевдоним"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Можете да добавите до <xliff:g id="USER_COUNT">%1$d</xliff:g> потребители"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Само собственикът на таблета може да управлява потребителите."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Само собственикът на телефона може да управлява потребителите."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Плащане на терминал"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Настройте приложение за плащане. След което трябва само да задържите задната част на телефона си до който и да е терминал със символа за безконтактно плащане."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Разбрах"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Още..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Още…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Задаване на основно приложение за плащане"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Актуализиране на основното приложение за плащане"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"На терминала за безконтактно плащане платете посредством <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Напред"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Край"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Правене на снимка"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Избиране на изображение"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Избиране на снимка"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM карти"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM карти"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Използване винаги за обаждания"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Изберете SIM карта за данни"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Изберете SIM карта за SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"SIM картата за данни се превключва. Това може да отнеме до една минута..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"SIM картата за данни се превключва. Това може да отнеме до една минута…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Обаждане чрез"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Изберете SIM карта"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM карта <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"поредица, график, режим за запазване на батерията, енергоспестяващ режим, батерия, автоматично, процент"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, разширени обаждания, обаждане през 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"добавяне на език, език: добавяне"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"размер на текста"</string>
     <string name="default_sound" msgid="6604374495015245195">"Стандартен звук"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Силата на звука за звъненето и известията е зададена на <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Сила на звука, вибриране, „Не безпокойте“"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Звуци при включване"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Надписи в реално време"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Мултимедия с автоматични надписи"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Няма"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Зададени са <xliff:g id="ON_COUNT">%d</xliff:g> графика</item>
-      <item quantity="one">Зададен е 1 график</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Нито един}=1{Зададен е 1 график}other{Зададени са # графика}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не безпокойте"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Получаване на известия само от важни хора и приложения"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ограничаване на прекъсванията"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Само с приоритет"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Включено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Изключено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Изкл."</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Включено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Извеждане на запитване всеки път"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"До изключване"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> часа</item>
-      <item quantity="one">1 час</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> минути"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> графика могат да се включват автоматично</item>
-      <item quantity="one">1 график може да се включва автоматично</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 час}other{# часа}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минута}other{# минути}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Изкл.}=1{Изкл./1 график може да се включва автоматично}other{Изкл./# графика могат да се включват автоматично}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Кое може да прекъсва режима „Не безпокойте“"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Хора"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Приложения"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Известията с по-нисък приоритет автоматично се задават като ненатрапчиви"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Адаптивно класиране на известията"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматично класиране на известията по уместност"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Отзиви за адаптивните известия"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Посочва приложените към известията корекции и показва опцията за изпращане на отзиви до системата"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Нулиране на настройките за важност на известията"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Нулиране на променените от потребителя настройки за важността и разрешаване помощникът за известия да задава приоритет"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Предложени действия и отговори"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматично показване на предложените действия и отговори"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Показване на скорошните и отложените известия"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Разговори с приоритет"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Показване най-горе в секцията с разговори и поставяне в плаващи балончета"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Показване най-горе в секцията с разговори"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Други разговори"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Разговори без приоритет"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Разговори, в които сте направили промени"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Скорошни разговори"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Изчистване на скорошни"</string>
+    <string name="clear" msgid="5092178335409471100">"Изчистване"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Показване на балонче за приоритетните разговори"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Приоритетните разговори се показват най-горе в падащия панел. Можете също да зададете да се поставят в балонче и да ви прекъсват, когато използвате режима „Не безпокойте“."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Приоритетните и променените разговори ще се показват тук"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Достъп до „Не безпокойте“"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Разрешаване на режима „Не безпокойте“"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Никое инсталирано приложение не е заявило достъп до „Не безпокойте“"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Приложенията се зареждат..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Приложенията се зареждат…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"По ваша заявка Android блокира показването на известията от това приложение на устройството"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"По ваша заявка Android блокира показването на тази категория известия на устройството"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"По ваша заявка Android блокира показването на тази група известия на устройството"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Всички разговори"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Разговори с приоритет"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Никакви"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговора</item>
-      <item quantity="one">1 разговор</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Никакви"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Нито един}=1{1 разговор}other{# разговора}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Кой може да прекъсва режима"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Обаждания"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Обаждания"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"За да се уверите, че за разрешените обаждания се възпроизвежда звук, проверете дали за устройството е зададено звънене"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Входящите обаждания за „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“ са блокирани. Можете да коригирате настройките, за да разрешите на близки, приятели и други контакти да се свързват с вас."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Контакти със звезда"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Още <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">Още 1</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Няма"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Нито един}=1{{contact_1}}=2{{contact_1} и {contact_2}}=3{{contact_1}, {contact_2} и {contact_3}}other{{contact_1}, {contact_2} и още #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Няма име)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Съобщения"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"съобщения"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Съобщения"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Входящите съобщения са блокирани за „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Можете да коригирате настройките, за да разрешите на близки, приятели и други контакти да се свързват с вас."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Можете да получавате всички съобщения"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Можете да получавате всички обаждания"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Няма"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакта</item>
-      <item quantity="one">1 контакт</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Нито един}=1{1 контакт}other{# контакта}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Всеки"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти със звезда"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Всички известия"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Някои известия"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Избраните хора пак могат да се свързват с вас дори ако не разрешавате на приложенията да прекъсват режима"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> могат да прекъсват</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> може да прекъсва</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"още <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Нито едно приложение не може да прекъсва режима}=1{{app_1} може да прекъсва режима}=2{{app_1} и {app_2} могат да прекъсват режима}=3{{app_1}, {app_2} и {app_3} могат да прекъсват режима}other{{app_1}, {app_2} и още # могат да прекъсват режима}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Приложения"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Всички известия"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Някои известия"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Известия, които могат да прекъсват режима"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Разрешаване на всички известия"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> могат да прекъсват</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> може да прекъсва</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Нищо не може да прекъсва режима"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"още <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Нищо не може да прекъсва режима}=1{{sound_category_1} може да прекъсва режима}=2{{sound_category_1} и {sound_category_2} могат да прекъсват режима}=3{{sound_category_1}, {sound_category_2} и {sound_category_3} могат да прекъсват режима}other{{sound_category_1}, {sound_category_2} и още # могат да прекъсват режима}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Нищо не може да прекъсва режима"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Никой не може да прекъсва режима"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Някои хора могат да прекъсват режима"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Всички хора могат да прекъсват режима"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Вкл."</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Изключено"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Фиксиране на приложения"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Функцията за фиксиране на приложения ви дава възможност да задържите текущото приложение на преден план, докато не го премахнете. С нейна помощ можете например да позволите на доверен приятел да играе конкретна игра. \n\nКогато дадено приложение е фиксирано, то може да отваря други приложения. Възможно е също някои лични данни да са достъпни. \n\nЗа да използвате функцията за фиксиране на приложения: 	\n1.	Включете я. 	\n2.	Отворете екрана за общ преглед. 	\n3.	Докоснете иконата на приложението в горната част на екрана, след което изберете „Фиксиране“."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Функцията за фиксиране на приложения ви дава възможност да задържите текущото приложение на преден план, докато не го премахнете. С нейна помощ можете например да позволите на доверен приятел да играе конкретна игра. \n\nКогато дадено приложение е фиксирано, то може да отваря други приложения. Възможно е също някои лични данни да са достъпни. \n\nАко искате по сигурен начин да споделите устройството си с друг човек, използвайте режима на гост. \n\nЗа да използвате функцията за фиксиране на приложения: 	\n1.	Включете я. 	\n2.	Отворете екрана за общ преглед. 	\n3.	Докоснете иконата на приложението в горната част на екрана, след което изберете „Фиксиране“."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Функцията за фиксиране на приложения ви дава възможност да задържите текущото приложение на преден план, докато не го премахнете. С нейна помощ можете например да позволите на доверен приятел да играе конкретна игра."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Когато дадено приложение е фиксирано, то може да отваря други приложения. Възможно е също някои лични данни да са достъпни. \n\nЗа да използвате функцията за фиксиране на приложения: 	\n1.	Включете я. 	\n2.	Отворете екрана за общ преглед. 	\n3.	Докоснете иконата на приложението в горната част на екрана, след което изберете „Фиксиране“."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Когато дадено приложение е фиксирано, то може да отваря други приложения. Възможно е също някои лични данни да са достъпни. \n\nАко искате по сигурен начин да споделите устройството си с друг човек, използвайте режима на гост. \n\nЗа да използвате функцията за фиксиране на приложения: 	\n1.	Включете я. 	\n2.	Отворете екрана за общ преглед. 	\n3.	Докоснете иконата на приложението в горната част на екрана, след което изберете „Фиксиране“."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Когато дадено приложение е фиксирано: \n\n•		някои лични данни може да бъдат достъпни \n		(като например контактите и съдържанието на имейлите); \n•		то може да отваря други приложения. \n\nИзползвайте функцията само с хора, на които имате доверие."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Запитване за фигура за отключване преди освобождаване"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"ПИН код преди освобождаване"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"В допълнение към отключването посредством лицето ви можете да осигурите допълнителен защитен слой за това устройство, като зададете ПИН кодът ви да се изисква при стартиране. Преди въвеждането му няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"В допълнение към отключването посредством лицето ви можете да осигурите допълнителен защитен слой за това устройство, като зададете фигурата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"В допълнение към отключването посредством лицето ви можете да осигурите допълнителен защитен слой за това устройство, като зададете паролата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"В допълнение към отключването посредством биометрични данни можете да осигурите допълнителен защитен слой за това устройство, като зададете ПИН кодът ви да се изисква при стартиране. Преди въвеждането му няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"В допълнение към отключването посредством биометрични данни можете да осигурите допълнителен защитен слой за това устройство, като зададете фигурата ви да се изисква при стартиране. Преди въвеждането ѝ няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"В допълнение към отключването посредством биометрични данни можете да осигурите допълнителен защитен слой за това устройство, като зададете паролата ви да се изисква при стартиране. Преди въвеждането ѝ няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Да"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Не"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ограничено"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB се контролира от"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"свързаното устройство"</string>
     <string name="usb_control_device" msgid="527916783743021577">"това устройство"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Превключва се..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Превключва се…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Превключването не бе успешно"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Зареждане на това устройство"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Зареждане на свързаното устройство"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Пренос на мобилни данни"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Пренос на данни от приложенията"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Пренос на данни през Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Пренос на данни, които не са на мобилни оператори"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Пренос на данни през Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 ограничение</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Отчетените от оператора данни може да се различават от показаните на устройството"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Изключва данните, които се използват от мрежите на операторите"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Използвали сте <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Задаване на предупр. за данните"</string>
     <string name="data_warning" msgid="2925054658166062884">"Предупреждение за данните"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Преглед на подробностите"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Икономия на данни"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Неограничен достъп до данни"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Данните на заден план са изключени"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Данните на заден план са изключени"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Включено"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Изключено"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Използване на „Икономия на данни“"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Предотвратяване на въвеждането на отговори или друг текст в известията, когато устройството е заключено"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Стандартна правописна проверка"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Избор на правописна проверка"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Използване на правописна проверка"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Използване на проверка на правописа"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Не е избрано"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(няма)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"За да ви помогне да освободите място за съхранение, мениджърът на хранилището премахва от устройството ви резервните копия на снимки и видеоклипове."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Премахване на снимките и видеоклиповете"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Мениджър на хранилището"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Използване на мениджъра на хранилището"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Използване на мениджъра на хранилището"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автоматично"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ръчни"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Освободете място сега"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Двукратно докосване за проверка на телефона"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Двукратно докосване за проверка на таблета"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Двукратно докосване за проверка на устройството"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Прекарване на пръст за известия"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Прекарайте пръст надолу през долния край на екрана, за да видите известията си"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Режим за работа с една ръка"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Използване на режима за работа с една ръка"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Изход при превключване на приложенията"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Време за изчакване"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунди"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунди"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунди"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"достъпност"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"За да проверите часа, известията и друга информация, докоснете екрана два пъти."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Повдигане на телефона за проверка"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Повдигане за проверка на таблета"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Докоснете за проверка на таблета"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Докоснете за проверка на устройството"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"За да проверите часа, известията и друга информация, докоснете екрана."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Спешен случай (SOS)"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Използване на функцията за спешни случаи (SOS)"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Управлява се от <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Стартирайте действията по-долу с бързо петкратно натискане на бутона за включване/изключване"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Възпроизвеждане на аларма с обратен брояч"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Възпроизвеждане на висок звук преди известяване за помощ"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Обадете се за помощ"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Телефонен номер за помощ"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Докоснете, за да промените"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Ако въведете номер, който не е за спешни случаи:\n • устройството ви трябва да бъде отключено, за да използвате функцията за спешни случаи (SOS);\n • възможно е да няма отговор на обаждането ви."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Преглед на известията с плъзване през сензора за отпечатъци"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Плъзване през сензора за отпечат."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"За да проверите известията си, плъзнете пръст надолу през сензора за отпечатъци на гърба на телефона си."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Максимален брой видими набори от данни"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Възстановяване на стандартните стойности"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Опциите за автоматично попълване за програмисти са нулирани"</string>
+    <string name="location_category" msgid="3496759112306219062">"Местоположение"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Индикатор за местоположението в лентата на състоянието"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Показване за всички местоположения, включително от мрежата и други връзки"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Налагане на пълно проследяване на измерванията с GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Проследяване на всички констелации и честоти на GNSS без използване на коефициент на запълване"</string>
     <string name="device_theme" msgid="5027604586494772471">"Тема на устройството"</string>
     <string name="default_theme" msgid="4815428567082263639">"Стандартно"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Име на мрежата"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Поставете известията на пауза, за да не ви разсейват"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Функцията не е налице"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Тази функция бе изключена, защото забавя телефона ви"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Налагане на пълно проследяване на измерванията с GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Проследяване на всички констелации и честоти на GNSS без използване на коефициент на запълване"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Диалоговият прозорец за сривове да се показва винаги"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Диалоговият прозорец да се показва всеки път, когато дадено приложение претърпи срив"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Избиране на активирано за ANGLE приложение"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Активиране за всички приложения"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Избиране на графичен драйвер"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"По подразбиране"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Драйвер за игри"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Драйвер за игри"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драйвер за програмисти"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системен графичен драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Вкл. (заглушаване)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Изкл."</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Подробности за мрежата"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Името на устройството ви е видимо за приложенията на телефона ви. То може да се вижда и от други хора, когато се свържете с устройства с Bluetooth или настроите точка за достъп до Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Името на устройството ви е видимо за приложенията на телефона ви. То може да се вижда и от други хора, когато се свържете с устройства с Bluetooth или настроите точка за достъп до Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Устройства"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Всички настройки"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Предложения"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Не можаха да бъдат намерени мрежи. Опитайте отново."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(забранено)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Няма SIM карта"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Няма SIM карта"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Няма"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"За установяването на връзка се изисква SIM карта"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"За установяването на връзка се изисква SIM карта от <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Предпочитан режим на мрежата: Предпочита се WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Предпочитан режим на мрежата: Само GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Предпочитан режим на мрежата: Само WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилни данни"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Достъп до данните през мобилната мрежа"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефонът автоматично ще превключва към този оператор, когато е в обхват"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Няма налице SIM карта"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Предпочитание за обажданията"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Предпочитание за SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Запитване всеки път"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Не е налице, когато е установена връзка с(ъс) <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Вижте още"</string>
     <string name="see_less" msgid="2642392725363552793">"Преглед на по-малко"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Да се включи ли <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Да се включи ли SIM картата?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Да се превключи ли към <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Искате ли да превключите към използването на SIM карта?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Само една SIM карта може да бъде активна в даден момент.\n\nПревключването към <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> няма да анулира услугата на <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Само една изтеглена SIM карта може да бъде активна в даден момент.\n\nПревключването към <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> няма да анулира услугата на <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Само една SIM карта може да бъде активна в даден момент.\n\nПревключването няма да анулира услугата на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Превключване към <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Установява се връзка с мрежата…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Превключва се към <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Не може да се превключи към друг оператор"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Не може да се превключи към друг оператор поради грешка."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Да се изключи ли <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Да се изключи ли SIM картата?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM картата се изключва<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Операторът не може да бъде деактивиран"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Нещо се обърка и операторът ви не бе деактивиран."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Искате ли да използвате 2 SIM карти?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"На това устройство може да има 2 активни SIM карти едновременно. За да продължите да използвате само една, докоснете „Не, благодаря“."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Да се рестартира ли устройството?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"За да започнете, рестартирайте устройството си. След това можете да добавите друга SIM карта."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Напред"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Рестартиране"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, благодаря"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Превключване"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM картата не може да се активира"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Премахнете SIM картата и я поставете отново. Ако проблемът не се отстрани, рестартирайте устройството си."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Включете отново SIM картата. Ако проблемът не се отстрани, рестартирайте устройството си."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активиране на мрежа"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Услугата <xliff:g id="CARRIER_NAME">%1$s</xliff:g> е активна"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Докоснете, за да актуализирате настройките за SIM картата"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM карта"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Да се изтрие ли тази изтеглена SIM карта?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"С изтриването на тази SIM карта услугата на <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> се премахва от устройството.\n\nУслугата за <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> няма да бъде анулирана."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Изтриване на данните"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM картата се изтрива…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM картата не може да се изтрие"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Тази SIM карта не може да бъде изтрита поради грешка.\n\nРестартирайте устройството си и опитайте отново."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Свързване с устройство"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Приложението <xliff:g id="APPNAME">%1$s</xliff:g> иска да използва временна Wi-Fi мрежа, за да се свърже с устройството ви"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Няма намерени устройства. Уверете се, че устройствата са включени и налице за свързване."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Спешни обаждания"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Операторът ви не поддържа спешни обаждания през Wi-Fi.\nУстройството автоматично превключва към мобилна мрежа, за да извърши спешно обаждане.\nИзвършването на спешни обаждания е възможно само в райони с мобилно покритие."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Използване на Wi-Fi за обажданията с цел подобряване на качеството"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Обаждания през друга SIM карта"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Разрешете на тази SIM карта обажданията и SMS съобщенията от друга."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"обаждания през друга SIM карта"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Входящо MMS съобщение"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Не могат да бъдат изпращани MMS съобщения"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Докоснете, за да разрешите MMS съобщенията за <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>, когато мобилните данни са изключени"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Разрешаване на екранни наслагвания в/у „Настройки“"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Разрешаване на приложенията, които могат да се показват върху други приложения, да се наслагват върху екрана на „Настройки“"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Мултимедия"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Скриване на плейъра при прикл. сесия за мултимедия"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Плейърът ви позволява да възобновите дадена сесия от разгънатия панел с бързи настройки."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Медиен плейър в бързите настройки"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Показване на медийния плейър за продължителен период от време с цел лесно възобновяване на възпроизвеждането"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Скриване на плейъра"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Показване на плейъра"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Няма налични плейъри"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Разрешени приложения"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"мултимедия"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Ще се включи Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Вкл."</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Изкл."</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM карти"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Мрежи, които са безопасни за използване по време на полет"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Намиране и свързване с мрежи, които са безопасни за използване по време на полет"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самолет, безопасно за използване по време на полет"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Обаждания и SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Обаждания през Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Извършване и получаване на обаждания през мрежи, които не са на мобилни оператори, като например Wi-Fi мрежи"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Функцията за обаждания през Wi-Fi ви дава възможност да извършвате и получавате обаждания през мрежи, които не са на мобилни оператори, като например някои Wi-Fi мрежи."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Обаждания"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"предпочитани"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"предпочитат се обаждания"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"предпочитат се SMS съобщения"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"не е налице"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Няма SIM карта"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Предпочитания"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Свързване с обществени мрежи"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"връзка с мрежата, интернет, безжична мрежа, данни, Wi-Fi, мобилни данни, мобилна мрежа, мобилен оператор, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Мрежи, безопасни за ползване по време на полет"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Изключете самолетния режим"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Не е налице, тъй като режимът „Време за сън“ е включен"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Нулирането на настройките за важност на известията завърши."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Приложения"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ненадеждно устройство иска достъп до съобщенията ви. Докоснете за подробности."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Да се разреши ли достъпът до съобщенията?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Ненадеждно устройство с Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) иска достъп до съобщенията ви.\n\nДосега не сте се свързвали с(ъс) <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ненадеждно устройство иска достъп до контактите и списъка с обажданията ви. Докоснете за подробности."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Да се разреши ли достъпът до контактите и списъка с обажданията?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Ненадеждно устройство с Bluetooth (<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>) иска достъп до контактите и списъка с обажданията ви. Това включва данни за входящите и изходящите обаждания.\n\nДосега не сте се свързвали с(ъс) <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>."</string>
 </resources>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 8b5aaa1..2ede29b 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"মাঝারি"</item>
     <item msgid="6740026006576843477">"দীর্ঘ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ছোট"</item>
+    <item msgid="7397961711906421599">"মাঝারি"</item>
+    <item msgid="4079132024502041928">"বড়"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ডিফল্ট"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"গ্লোবাল"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"শুধুমাত্র TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"গ্লোবাল"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index eb42269..a307ea8 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"তারিখ ও সময়"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"তারিখ এবং সময় সেট করুন"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"তারিখ, সময়, সময় অঞ্চল ও ফর্ম্যাট সেট করুন"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"নেটওয়ার্ক প্রদত্ত সময় ব্যবহার করুন"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"নেটওয়ার্ক প্রদত্ত টাইম জোন ব্যবহার করুন"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"সময় অটোমেটিক সেট করুন"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"টাইম জোন অটোমেটিক সেট করুন"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"লোকেল ডিফল্ট ব্যবহার করুন"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"২৪-ঘণ্টা বিন্যাস"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"২৪ ঘন্টার ফর্ম্যাট ব্যবহার করুন"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"লক স্ক্রিনে প্রোফাইলের তথ্য প্রদর্শন করুন"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"অ্যাকাউন্টগুলি"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"লোকেশন"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"লোকেশন ব্যবহার করুন"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"লোকেশন ব্যবহার করুন"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"বন্ধ আছে"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">চালু আছে - <xliff:g id="COUNT_1">%1$d</xliff:g>টি অ্যাপ লোকেশন অ্যাক্সেস করতে পারবে</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"স্ক্রিন লক, মুখের সাহায্যে আনলক"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"স্ক্রিন লক, আঙ্গুলের ছাপ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"স্ক্রিন লক"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"আপনার মুখ এবং আঙ্গুলের ছাপের সাহায্যে নিরাপদে ফোন আনলক করুন"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"এছাড়া, আপনি অ্যাপে সাইন-ইন করেও পেমেন্ট কনফার্ম করতে পারেন"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"এর সাথে আনলক সেট আপ করুন:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"মুখের সাহায্যে আনলক করার ফিচার"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"আপনার ফোন আনলক করার বিষয়টি সহজ করে তুলুন"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"আঙ্গুলের ছাপ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"পকেটে ফোন আনলক করে সময় সাশ্রয় করুন"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"এড়িয়ে যান"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"পরবর্তী"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ফেস যোগ করা হয়েছে"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"মুখের সাহায্যে আনলক করার ফিচার সেট-আপ করুন"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"মুখের সাহায্যে আনলক"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"যাচাইকরণ করতে আপনার ফেস ব্যবহার করুন"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"শুরু করুন"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"অ্যাক্সেসিবিলিটি ফেস আনলক বন্ধ থাকলে কিছু সেটআপ পদ্ধতি টকব্যাকের ক্ষেত্রে সঠিকভাবে কাজ নাও করতে পারে।"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ফিরে যান"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"সেটআপ চালিয়ে যান"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"অ্যাক্সেসিবিলিটি সেট-আপ ব্যবহার"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"অ্যাপে \"মুখের সাহায্যে আনলক\" ব্যবহারের সময়ে প্রতিবার কনফার্ম করতে হবে"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ফেস ডেটা মুছে ফেলুন"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"মুখের সাহায্যে আনলক করার ফিচার সেট-আপ করুন"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"আপনার ডিভাইস আনলক, অ্যাপে সাইন-ইন এবং পেমেন্ট কনফার্ম করতে মুখের সাহায্যে আনলক করার সুবিধাটি ব্যবহার করুন। \n\nমনে রাখবেন:\nআপনি না চাইলেও ফোনের দিকে তাকালে সেটি আনলক হয়ে যেতে পারে।\n\nআপনার চোখ খোলা থাকা অবস্থায় অন্য কেউ আপনার মুখের সামনে ফোনটি ধরে আনলক করতে পারবেন।\n\nআপনার মতো দেখতে এমন যে কেউ; যেমন আপনার যমজ ভাই বা বোন, আপনার ফোন আনলক করতে পারবেন।"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"আপনার ডিভাইস আনলক, অ্যাপে সাইন-ইন এবং পেমেন্ট কনফার্ম করতে মুখের সাহায্যে আনলক করার সুবিধাটি ব্যবহার করুন।\n\nমনে রাখবেন:\nআপনি না চাইলেও ফোনের দিকে তাকালে সেটি আনলক হয়ে যেতে পারে।\n\nআপনার চোখ বন্ধ অবস্থায় থাকলেও অন্য কেউ আপনার মুখের সামনে ফোনটি ধরে আনলক করতে পারেন।\n\nআপনার মতো অনেকটা দেখতে এমন যে কেউ; যেমন আপনার যমজ ভাই বা বোন, আপনার ফোন আনলক করতে পারেন।"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"আপনার ডিভাইস আনলক করতে মুখের সাহায্যে আনলক করার ফিচার ব্যবহার করুন, অ্যাপে সাইন-ইন করুন ও পেমেন্ট কনফার্ম করুন।"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"মনে রাখবেন:\nআপনি না চাইলেও, ফোনের দিকে তাকিয়ে থাকলে, আপনার ফোন আনলক হয়ে যেতে পারে।\n\nআপনার মুখের সামনে ধরে অন্য যেকেউ আপনার ফোন আনলক করে নিতে পারে।\n\nএকই রকম দেখতে ভাই-বোনের মতো আপনার মুখের চেহারার সাথে অনেক মিল থাকা কারও মুখ দেখিয়েও আপনার ফোন আনলক করা যাবে।"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"মনে রাখবেন:\nআপনি না চাইলেও, ফোনের দিকে তাকিয়ে থাকলে, আপনার ফোন আনলক হয়ে যেতে পারে।\n\nআপনার চোখ বন্ধ করা থাকলেও, আপনার মুখের সামনে ধরে অন্য যেকেউ আপনার ফোন আনলক করে নিতে পারে।\n\nএকই রকম দেখতে ভাই-বোনের মতো, আপনার মুখের চেহারার সাথে অনেক মিল থাকা কারও মুখ দেখিয়েও আপনার ফোন আনলক করা যাবে।"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"মুখ শনাক্তকরণ ডেটা মুছে ফেলতে চান?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"\'মুখের সাহায্যে আনলক\' ফিচারটি মুখ সংক্রান্ত যে ডেটা ব্যবহার করেছে তা স্থায়ীভাবে এবং নিরাপদে মুছে ফেলা হবে। সরানো হয়ে গেলে, ফোন আনলক, অ্যাপে সাইন-ইন এবং পেমেন্ট কনফার্ম করতে আপনার পিন, প্যাটার্ন অথবা পাসওয়ার্ডের প্রয়োজন হবে।"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"আপনার ফোন আনলক করার জন্য ফেসের সাহায্যে আনলক বিকল্প ব্যবহার করুন"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"আপনার ফোন আনলক বা কেনাকাটাগুলির অনুমোদন করতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন। \n\nদ্রষ্টব্য: আপনি এই ডিভাইসটি আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করতে পারবেন না। আরও তথ্যের জন্য, আপনার প্রতিষ্ঠানের প্রশাসকের সাথে যোগাযোগ করুন।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"আপনার ফোন আনলক বা কেনাকাটাগুলি অনুমোদন করতে আপনার আঙ্গুলের ছাপ ব্যবহার করুন।\n\nদ্রষ্টব্য: একটি দৃঢ় বা সুরক্ষিত প্যাটার্ন বা পিনের তুলনায় আপনার আঙ্গুলের ছাপ কম সুরক্ষিত হতে পারে।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"বাতিল করুন"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"না থাক"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"চালিয়ে যান"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"এড়িয়ে যান"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"পরবর্তী"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ট্যাবলেটের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া, মুখের সাহায্যে আনলক করার সুবিধাটি সেট-আপ করতে হলে আপনাকে স্ক্রিন লক ব্যবহার করতে হবে। ফিরে যেতে বাতিল বোতামে ট্যাপ করুন।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ডিভাইসের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া, মুখের সাহায্যে আনলক করার সুবিধাটি সেট-আপ করতে হলে আপনাকে স্ক্রিন লক ব্যবহার করতে হবে। ফিরে যেতে বাতিল বোতামে ট্যাপ করুন।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ফোনের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া, মুখের সাহায্যে আনলক করার সুবিধাটি সেট-আপ করতে হলে আপনাকে স্ক্রিন লক ব্যবহার করতে হবে। ফিরে যেতে বাতিল বোতামে ট্যাপ করুন।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ট্যাবলেটের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া বায়োমেট্রিক্স ফিচার সেট আপ করার জন্য আপনার স্ক্রিন লক বিকল্পের প্রয়োজন। ফিরে যেতে \'বাতিল করুন\' বোতামে ট্যাপ করুন।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ডিভাইসের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া বায়োমেট্রিক্স ফিচার সেট আপ করার জন্য আপনার স্ক্রিন লক বিকল্পের প্রয়োজন। ফিরে যেতে \'বাতিল করুন\' বোতামে ট্যাপ করুন।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ফোনের নিরাপত্তার জন্য স্ক্রিন লক ব্যবহার করলে, সেটি যদি চুরি হয় বা হারিয়ে যায় তাহলেও অন্য কেউ সেটি ব্যবহার করতে পারবে না। এছাড়া বায়োমেট্রিক্স ফিচার সেট আপ করার জন্য আপনার স্ক্রিন লক বিকল্পের প্রয়োজন। ফিরে যেতে \'বাতিল করুন\' বোতামে ট্যাপ করুন।"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"পিন সেট-আপ করার পদ্ধতি এড়াতে চান?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"পাসওয়ার্ড সেট-আপ করার ধাপটি এড়াতে চান?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"প্যাটার্ন সেট-আপ করার ধাপ এড়াতে চান?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ট্যাবলেটটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রিন লক বেছে নিন৷"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ডিভাইসটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রিন লক বেছে নিন৷"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ডিভাইস সুরক্ষা বৈশিষ্ট্যগুলি সক্রিয় করার দ্বারা আপনার অনুমতি ছাড়া অন্যদের এই ফোনটি ব্যবহার করা থেকে আটকান৷ আপনি ব্যবহার করতে চান এমন স্ক্রিন লক বেছে নিন৷"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"আপনার ব্যাকআপ স্ক্রিন লক পদ্ধতি বেছে নিন"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"আপনার ব্যাক-আপ স্ক্রিন লক পদ্ধতি বেছে নিন"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"আপনার ব্যাক-আপ স্ক্রিন লক পদ্ধতি বেছে নিন"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"স্ক্রিন লক-এর বিকল্প"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"স্ক্রিন লক-এর বিকল্পগুলি"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"স্ক্রিন লক"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"মুখের সাহায্যে আনলক + পাসওয়ার্ড"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"মুখের সাহায্যে আনলক সেট-আপ না করা"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"আপনার ফেস ব্যবহার করে আপনি ফোন আনলক করতে পারবেন। নিরাপত্তার খাতিরে, এই বিকল্পটির জন্য একটি ব্যাক-আপ স্ক্রিন লকের প্রয়োজন।"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"বায়োমেট্রিক্স + প্যাটার্ন"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"বায়োমেট্রিক্স + পিন"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"বায়োমেট্রিক্স + পাসওয়ার্ড"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"বায়োমেট্রিক্স ছাড়াই চালিয়ে যান"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"বায়োমেট্রিক্স ব্যবহার করে আপনার নিজের ফোন আনলক করতে পারেন। নিরাপত্তার খাতিরে, এই বিকল্পটির জন্য একটি ব্যাক-আপ স্ক্রিন লকের প্রয়োজন।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"প্রশাসক, এনক্রিপশন নীতি বা ক্রেডেনশিয়াল স্টোরেজ দ্বারা অক্ষম"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"কোনও কিছুই নয়"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"সোয়াইপ করুন"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">অবশ্যই <xliff:g id="NUMBER_1">%d</xliff:g>টি সংখ্যার থেকে কম হতে হবে</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ডিভাইস প্রশাসক একটি সাম্প্রতিক পিন ব্যবহার করতে দেয় না"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"একইধরনের পিন আপনার আইটি অ্যাডমিনের মাধ্যমে ব্লক করা হয়। অন্য একটি পিন ব্যবহার করার চেষ্টা করুন।"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"এতে কোনো অবৈধ অক্ষর অন্তর্ভুক্ত করা যাবে না"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"কমপক্ষে একটি অক্ষর থাকতে হবে"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"কমপক্ষে একটি সংখ্যা থাকতে হবে"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">কমপক্ষে এমন <xliff:g id="COUNT">%d</xliff:g>টি অক্ষর থাকতে হবে যেটি সংখ্যা নয়</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ডিভাইস প্রশাসক একটি সাম্প্রতিক পাসওয়ার্ড ব্যবহার করতে দেয় না"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"একইধরনের পাসওয়ার্ড আপনার আইটি অ্যাডমিনের মাধ্যমে ব্লক করা হয়। অন্য একটি পাসওয়ার্ড ব্যবহার করার চেষ্টা করুন।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"সংখ্যাগুলি ছোট থেকে বড় ক্রমে, বড় থেকে ছোট ক্রমে বা একই সংখ্যাকে বার বার লেখা যাবে না"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"নিশ্চিত করুন"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"বাতিল"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"ওয়াই-ফাই"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"ওয়াই-ফাই চালু করুন"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"ওয়াই-ফাই"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ওয়াই-ফাই ব্যবহার করুন"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ওয়াই-ফাই ব্যবহার করুন"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ওয়াই-ফাই সেটিংস"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"ওয়াই-ফাই"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ওয়্যারলেস অ্যাক্সেস পয়েন্ট সেট-আপ ও পরিচালনা করুন"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>”-এর সাথে কানেক্ট করার জন্য QR কোড মাঝখানে রাখুন"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR কোড স্ক্যান করে ওয়াই-ফাইতে যোগ দিন"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ওয়াই-ফাই শেয়ার করুন"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>”-এ কানেক্ট করতে এই QR কোড স্ক্যান করুন ও পাসওয়ার্ড শেয়ার করুন"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>”-এ যোগ করতে অন্য ডিভাইস ব্যবহার করে এই QR কোড স্ক্যান করুন"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>”-এর সাথে কানেক্ট করতে এই QR কোড স্ক্যান করুন"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"আবার চেষ্টা করুন৷ সমস্যা যদি তাও থেকে যায় তাহলে ডিভাইসের প্রস্তুতকারকের সাথে যোগাযোগ করুন"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"কোনও সমস্যা হয়েছে"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ওয়াই-ফাইয়ের পাসওয়ার্ড: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"হটস্পটের পাসওয়ার্ড: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"অটো-কানেক্ট"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"এই নেটওয়ার্কের কাছাকাছি আসলেই আপনার ফোন যাতে অটোমেটিক কানেক্ট হয়ে যায়, তার অনুমতি দিন"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"এই নেটওয়ার্কের কাছাকাছি আসলেই আপনার ট্যাবলেট যাতে অটোমেটিক কানেক্ট হয়ে যায়, তার অনুমতি দিন"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"সীমার মধ্যে থাকলে এই নেটওয়ার্কে কানেকশনের অনুমতি দিন"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ডিভাইস যোগ করুন"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"এই নেটওয়ার্কে কোনও ডিভাইস যোগ করার জন্য QR কোড ব্যবহার করুন"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR কোড ফর্ম্যাট ভুল"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"সিস্টেমের সার্টিফিকেটগুলি ব্যবহার করুন"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"প্রদান করবেন না"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"যাচাই করবেন না"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"কোনও সার্টিফিকেট নির্দিষ্ট করা নেই৷ আপনার কানেকশন ব্যক্তিগত করা হবে না৷"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"নেটওয়ার্কের নাম খুব বড়।"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"একটি ডোমেন উল্লেখ করা আবশ্যক৷"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"সার্টিফিকেট প্রয়োজন।"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"কানেক্ট করুন"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ওয়াই-ফাই চালু আছে"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-এ কানেক্ট আছে"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-এ কানেক্ট করা হচ্ছে"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"কানেক্ট করা হচ্ছে…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"নেটওয়ার্কের সাথে কানেক্ট করতে ব্যর্থ হয়েছে"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"নেটওয়ার্ক পরিষেবা সীমার মধ্যে নেই"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ডিভাইস MAC অ্যাড্রেস"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"র‌্যান্ডামাইজ করা MAC অ্যাড্রেস"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"র‌্যান্ডামাইজ করা MAC অ্যাড্রেস (শেষবার ব্যবহৃত)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"আইপি অ্যাড্রেস"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"নেটওয়ার্কের বিবরণ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"সাবনেট মাস্ক"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 অ্যাড্রেসগুলি"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"সেভ করা নেটওয়ার্ক"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"সাবস্ক্রিপশন"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"অন্য নেটওয়ার্ক"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP সেটিংস"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"এই ব্যবহারকারীর জন্য ওয়াই-ফাই এর উন্নত সেটিংস উপলব্ধ নয়"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"সেভ করুন"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"একটি বৈধ গেটওয়ে ঠিকানা টাইপ করুন।"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"একটি বৈধ DNS ঠিকানা টাইপ করুন।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"০ এবং ৩২ এর মধ্যে একটি নেটওয়ার্ক প্রিফিক্স দৈর্ঘ্য টাইপ করুন।"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"ডিএনএস ১ (যদি ব্যক্তিগত ডিএনএস-এ পরিবর্তন না করা হয়)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"ডিএনএস ২ (যদি ব্যক্তিগত ডিএনএস-এ পরিবর্তন না করা হয়)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"গেটওয়ে"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"নেটওয়ার্ক প্রিফিক্স দৈর্ঘ্য"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"ওয়াই-ফাই ডাইরেক্ট"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"অ্যাপ থেকে কন্টেন্ট শেয়ার করা হচ্ছে। ইন্টারনেট কানেকশন শেয়ার করতে হটস্পট বন্ধ করে আবার চালু করুন"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"পাসওয়ার্ড সেট করা নেই"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"হটস্পটের নাম"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> চালু করা হচ্ছে..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> চালু করা হচ্ছে…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> এর সাথে অন্য ডিভাইস কানেক্ট হতে পারে"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"হটস্পটের পাসওয়ার্ড"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ব্যান্ড"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"স্মুথ ডিসপ্লে"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"কিছু কন্টেন্টের রিফ্রেশ রেট অটোমেটিক ৬০ থেকে ৯০ Hz পর্যন্ত বেড়ে যায়। ব্যাটারির ব্যবহার বেড়ে যায়।"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"স্মুথ ডিসপ্লে"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ফোর্স 90 Hz রিফ্রেশ রেট"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"সর্বাধিক রিফ্রেশ রেট সেট করে টাচ রেসপন্সিভনেস এবং অ্যানিমেশন কোয়ালিটি উন্নত করুন। ব্যাটারির খরচ বেড়ে যায়।"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"স্ক্রিন অ্যাটেনশন"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"চালু আছে / আপনি এটির দিকে তাকিয়ে থাকলে স্ক্রিন বন্ধ হবে না"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"স্ক্রিন অন্ধকার থাকা অবস্থায় নতুন বিজ্ঞপ্তি এলে সেটি চালু হয়ে যায়"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"সবসময় সময় এবং তথ্য দেখান"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ব্যাটারির ব্যবহার বেড়ে যায়"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"বোল্ড টেক্সট"</string>
     <string name="title_font_size" msgid="570613010306330622">"ফন্ট সাইজ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"টেক্সট বড় বা ছোট করুন"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"সিম কার্ড লক সেটিংস"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ভার্সন"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-এর নিরাপত্তা সংক্রান্ত আপডেট"</string>
     <string name="model_info" msgid="8997566254717810904">"মডেল"</string>
-    <string name="model_summary" msgid="2246651782442466213">"মডেল: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"মডেল ও হার্ডওয়্যার"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"হার্ডওয়্যার ভার্সন"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"টুল ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN মুছে দিন"</string>
     <string name="menu_new" msgid="6571230342655509006">"নতুন APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"সেভ করুন"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"খারিজ করুন"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"বাতিল করুন"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"নাম ফিল্ডটি খালি থাকতে পারে না।"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN খালি থাকতে পারে না।"</string>
@@ -1593,8 +1611,11 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"অ্যাপ রিসেট করা যেতে পারে"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"ওয়াই-ফাই, মোবাইল ও ব্লুটুথ রিসেট"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"এগুলি সহ সমস্ত নেটওয়ার্ক সেটিংস আবার সেট করবে:\n\n"<li>"ওয়াই ফাই "</li>\n<li>"সেলুলার ডেটা "</li>\n<li>"ব্লুটুথ"</li></string>
+    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
+    <skip />
     <string name="reset_esim_title" msgid="6152167073280852849">"ডাউনলোড করা সিম মুছে ফেলা"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"পরিবর্ত সিম ডাউনলোড করতে আপনার পরিষেবা প্রদানকারীর সাথে যোগাযোগ করুন। এটি মোবাইল পরিষেবার কোনও প্ল্যান বাতিল করবে না।"</string>
+    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
+    <skip />
     <string name="reset_network_button_text" msgid="2281476496459610071">"সেটিংস রিসেট করুন"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"সব নেটওয়ার্ক সেটিংস রিসেট করবেন? আগের সেটিংসে আর ফিরে যেতে পারবেন না।"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"সব নেটওয়ার্ক সেটিংস রিসেট করতে ও ডাউনলোড করা সিম মুছে ফেলতে চান? এটি আগের অবস্থায় আর ফিরিয়ে আনা যাবে না।"</string>
@@ -1604,31 +1625,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"নেটওয়ার্ক সেটিংস আবার সেট করা হয়েছে"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"সিমগুলি মোছা যাচ্ছে না"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ডাউনলোড করা সিম কোনও সমস্যার জন্য মোছা যাচ্ছে না।\n\nআপনার ডিভাইস আবার চালু করে চেষ্টা করুন।"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"সমস্ত ডেটা মুছুন (ফ্যাক্টরি রিসেট)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"সবকিছু মুছুন (ফ্যাক্টরি রিসেট)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"এটি আপনার ট্যাবলেটের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"এটি আপনার ফোনের "<b>"ইন্টারনাল স্টোরেজ"</b>", থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"আপনি বর্তমানে নিম্নলিখিত অ্যাকাউন্টে সাইন-ইন করে আছেন:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"এই ডিভাইসে অন্যান্য ব্যবহারকারীরাও রয়েছেন৷\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"সঙ্গীত"</li>\n<li>"ফটো"</li>\n<li>"অন্যান্য ব্যবহারকারী ডেটা"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ই-সিম"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"এতে আপনার মোবাইল পরিষেবার প্ল্যান বাতিল হবে না।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"USB সঞ্চয়স্থানটিকে"</b>" মুছে দিতে হবে।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"আপনার সঙ্গীত, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা সাফ করতে, "<b>"SD কার্ডটিকে"</b>" মুছে দিতে হবে।"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"সমস্ত ডেটা মুছুন (ফ্যাক্টরি রিসেট)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"সমস্ত ডেটা মুছুন (ফ্যাক্টরি রিসেট)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"এটি আপনার ট্যাবলেটের "<b>"ইন্টার্নাল স্টোরেজ"</b>" থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"এটি আপনার ফোনের "<b>"ইন্টার্নাল স্টোরেজ"</b>" থেকে সমস্ত ডেটা মুছে দেবে, এগুলি সহ:\n\n"<li>"আপনার Google অ্যাকাউন্ট"</li>\n<li>"সিস্টেম এবং অ্যাপ ডেটা এবং সেটিংস"</li>\n<li>"ডাউনলোড করা অ্যাপ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"আপনি বর্তমানে নিম্নলিখিত অ্যাকাউন্টে সাইন-ইন করে আছেন:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"এই ডিভাইসে অন্যান্য ব্যবহারকারীরাও রয়েছেন।\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"মিউজিক"</li>\n<li>"ফটো"</li>\n<li>"অন্যান্য ব্যবহারকারী ডেটা"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"ই-সিম"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"এতে আপনার মোবাইল পরিষেবার প্ল্যান বাতিল হবে না।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"আপনার মিউজিক, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা মোছার জন্য "<b>"ইউএসবি স্টোরেজ"</b>" খালি করতে হবে।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"আপনার মিউজিক, ছবি এবং অন্যান্য ব্যবহারকারী ডেটা মোছার জন্য "<b>"এসডি কার্ড"</b>" সরিয়ে দিতে হবে।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB স্টোরেজ মুছে ফেলুন"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD কার্ড মুছে ফেলুন"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"অভ্যন্তরীণ USB সঞ্চয়স্থানের সমস্ত ডেটা মুছে দিন, যেমন সঙ্গীত বা ফটো"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD কার্ডের সমস্ত তথ্য মুছে দিন, যেমন সঙ্গীত এবং ফটো"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"সব ডেটা মুছে দিন"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"সব ডেটা মুছে দিন"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ডাউনলোড করা অ্যাপ সহ আপনার সব ব্যক্তিগত তথ্য মুছে যাবে। এটি আগের অবস্থায় আর ফিরিয়ে আনা যাবে না।"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ডাউনলোড করা অ্যাপ ও সিম সহ আপনার সব ব্যক্তিগত তথ্য মুছে যাবে। এটি আগের অবস্থায় আর ফিরিয়ে আনা যাবে না।"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"সবকিছু মুছে দিন"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"সিস্টেম সাফ করুন পরিষেবাটি উপলব্ধ না থাকার কারণে কোনো আবার সেট করুন নির্দেশ সঞ্চালনা করা যায়নি।"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"সমস্ত ডেটা মুছে ফেলতে চান?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"এই ব্যবহারকারীর জন্য ফ্যাক্টরি রিসেট উপলব্ধ নেই"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"মোছা হচ্ছে"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"দয়া করে অপেক্ষা করুন..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"সব ডেটা মুছে দিন"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"সব ডেটা মুছে দিন"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ডাউনলোড করা অ্যাপ সহ আপনার সব ব্যক্তিগত তথ্য মুছে যাবে। এটি আগের অবস্থায় আর ফিরিয়ে আনা যাবে না।"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ডাউনলোড করা অ্যাপ ও সিম সহ আপনার সব ব্যক্তিগত তথ্য মুছে যাবে। এটি আগের অবস্থায় আর ফিরিয়ে আনা যাবে না।"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"সমস্ত ডেটা মুছে ফেলতে চান?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"এই ব্যবহারকারীর জন্য ফ্যাক্টরি রিসেটের সুবিধা উপলভ্য নেই"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"মোছা হচ্ছে"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"একটু অপেক্ষা করুন…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"কল সেটিংস"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ভয়েসমেল, কল ফরওয়ার্ডিং, কল ওয়েটিং, কলার আইডি সেট-আপ করুন"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB টিথারিং"</string>
@@ -1676,7 +1695,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ডিভাইসের থেকে বেশি ডিভাইসে টেদার করা যাবে না।"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> আনটেদার্ড হয়ে যাবে।"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ইথারনেট টিথারিং"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ইউএসবি কেবেলের মাধ্যমে ফোনের ইন্টারনেট কানেকশন শেয়ার করুন"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ইথারনেটের মাধ্যমে ফোনের ইন্টারনেট কানেকশন শেয়ার করুন"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"আপনার মোবাইল ডেটা কানেকশন মাধ্যমে অন্যান্য ডিভাইসে ইন্টারনেট কানেকশন দিতে হটস্পট এবং টিথারিং ব্যবহার করুন। অ্যাপগুলিও আশেপাশের ডিভাইসের সাথে কন্টেন্ট শেয়ার করার জন্য হটস্পট তৈরি করে নিতে পারে।"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"আপনার মোবাইল ডেটা কানেকশন অথবা ওয়াই-ফাই থেকে অন্য ডিভাইসে ইন্টারনেট কানেকশন দিতে হটস্পট এবং টেথারিং ব্যবহার করুন। অ্যাপগুলি আশেপাশের ডিভাইসের সাথে কন্টেন্ট শেয়ার করার জন্য হটস্পট তৈরি করতে পারে।"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"সহায়তা"</string>
@@ -1718,6 +1737,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ব্লুটুথ স্ক্যানিং"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ব্লুটুথ বন্ধ থাকলেও অ্যাপ এবং পরিষেবাগুলিকে যেকোনও সময় আশেপাশে থাকা অন্যান্য ডিভাইস স্ক্যান করার অনুমতি দিন। এটি বিভিন্ন ক্ষেত্রে কাজে লাগতে পারে, যেমন লোকেশন-ভিত্তিক বৈশিষ্ট্য এবং পরিষেবার উন্নতির জন্য।"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"কাজের জন্য অবস্থান ভিত্তিক পরিষেবা"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"বর্তমান টাইম জোন শনাক্ত করার জন্য ডিভাইসের লোকেশন ব্যবহার করতে অনুমতি দেয়। অন্যান্য লোকেশন সেটিংস যেমন ওয়াই-ফাই স্ক্যানিং নির্ভুলভাবে টাইম জোন শনাক্ত করার ব্যাপারটি প্রভাবিত করতে পারে।"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"চালু আছে"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"বন্ধ আছে"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"টাইম জোন অটোমেটিক শনাক্ত করার বিকল্প বন্ধ করা আছে"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প বন্ধ করা আছে"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প কাজ করছে না"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"লোকেশনের টাইম জোন শনাক্ত করার বিকল্প পরিবর্তনের অনুমতি নেই"</string>
     <string name="location_network_based" msgid="5247042890080021887">"ওয়াই-ফাই ও মোবাইল নেটওয়ার্ক লোকেশন"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"দ্রুত আপনার লোকেশন নির্ধারণ করতে অ্যাপগুলিকে Google লোকেশন পরিষেবা ব্যবহার করতে দিন। বেনামী লোকেশন ডেটা সংগ্রহ করা হবে এবং Google এ পাঠানো হবে।"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"ওয়াই-ফাই দ্বারা লোকেশন নির্ণয় করা হয়েছে"</string>
@@ -1781,6 +1809,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"মুখের সাহায্যে আনলক করতে পাসওয়ার্ড সেট"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"মুখের সাহায্যে আনলক করতে প্যাটার্ন সেট"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"মুখের সাহায্যে আনলক করতে পিন সেট করা"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"বায়োমেট্রিক্স ব্যবহার করতে পাসওয়ার্ড সেট করুন"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"বায়োমেট্রিক্স ব্যবহার করতে প্যাটার্ন সেট করুন"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"বায়োমেট্রিক্স ব্যবহার করতে পিন সেট করুন"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"পাসওয়ার্ড ভুলে গেছেন?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"প্যাটার্ন ভুলে গেছেন?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"পিন ভুলে গেছেন?"</string>
@@ -2117,13 +2148,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ক্যাপশন অভিরুচি"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"বড় করে দেখা"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"বড় করার জায়গা"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"স্ক্রিন বড় করে দেখা চালু করার মোড"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"স্ক্রিনকে বড় করার সময় আপনি যে জায়গা বড় করতে চান তা বেছে নিন"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ফুল স্ক্রিন"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"স্ক্রিনের অংশ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ফুল স্ক্রিন এবং স্ক্রিনের অংশ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"সম্পূর্ণ স্ক্রিন বড় করুন"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"স্ক্রিনের অংশ বড় করুন"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"বদল করে অ্যাক্সেসিবিলিটি বোতাম ব্যবহার করতে চান?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"স্ক্রিনের কিছু অংশ বড় করে দেখার জন্য ট্রিপল ট্যাপ করা হলে টাইপিং এবং অন্যান্য কাজ দেরি হতে পারে।\n\nআপনি কি এর বদলে বড় করে দেখার জন্য অ্যাক্সেসিবিলিটি বোতাম ব্যবহার করতে চান?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"বদল করে অ্যাক্সেসিবিলিটি বোতাম ব্যবহার করুন"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"বড় করে দেখার জন্য ট্রিপল ট্যাপ করার সুবিধা রাখুন"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"বড় করে দেখার সেটিংস"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"তিনবার ট্যাপ করে বড় করে দেখুন"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"শর্টকাটের সাহায্যে বড় করে দেখা"</string>
@@ -2177,11 +2211,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"পাওয়ার বোতামে কল শেষ হয়"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"বড় মাউস পয়েন্টার"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"অ্যানিমেশন সরিয়ে দিন"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"মোনো অডিও"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"অডিও বাজানোর সময় চ্যানেলগুলিকে একত্রিত করুন"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"অডিও ব্যালেন্স"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"বাঁদিক"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ডানদিক"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"মোনো অডিও"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"অডিও বাজানোর সময় সব চ্যানেলের অডিও সিঙ্ক করুন"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"অডিও ব্যালেন্স"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"বাঁদিকে"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ডানদিকে"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ডিফল্ট"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"১০ সেকেন্ড"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"৩০ সেকেন্ড"</string>
@@ -2211,11 +2245,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"বিজ্ঞপ্তির ভাইব্রেশন"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"রিং ভাইব্রেশন"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"টাচ ফিডব্যাক"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ব্যবহার করুন"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> খুলুন"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"রঙ সংশোধন ফিচারটি ব্যবহার করুন"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"ক্যাপশন দেখুন"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"শুধুমাত্র সমর্থিত অ্যাপের জন্যই"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ব্যবহার করুন"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> খুলুন"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"কালার কারেকশন ব্যবহার করুন"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"ক্যাপশন দেখুন"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"শুধুমাত্র ব্যবহারযোগ্য অ্যাপের জন্য"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"ক্যাপশনের সাইজ এবং স্টাইল"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> টেক্সটের সাইজ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"আরও বিকল্প"</string>
@@ -2245,6 +2279,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ডিউটারনোম্যালি"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"প্রোটানোম্যালি"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ট্রিট্যানোম্যালি"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"গ্রেস্কেল"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"লাল-সবুজ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"লাল-সবুজ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"নীল-হলুদ"</string>
@@ -2374,7 +2409,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ব্যাকগ্রাউন্ডে ব্যবহার সীমাবদ্ধ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"অ্যাপটি পটভূমিতে চলতে দিন"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"অ্যাপটির পটভুমিতে চালু থাকার অনুমতি নেই"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ব্যাকগ্রাউন্ডে ব্যবহারের সীমা নির্দিষ্ট করা যায় না"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ব্যাকগ্রাউন্ড অ্যাক্টিভিটিতে বিধিনিষেধ আরোপ করা যাবে না"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ব্যাকগ্রাউন্ড অ্যাক্টিভিটি সীমিত করবেন?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"কোনও অ্যাপের ব্যাকগ্রাউন্ড অ্যাক্টিভিটি সীমিত করলে তা সঠিক ভাবে কাজ নাও করতে পারে"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"যেহেতু এই অ্যাপটিকে ব্যাটারি অপ্টিমাইজ করার জন্য সেট করা হয়নি, তাই আপনি এটির অ্যাক্টিভিটি সীমিত করতে পারবেন না।\n\nঅ্যাপের অ্যাক্টিভিটি সীমিত করতে আগে ব্যাটারি অপ্টিমাইজেশন চালু করুন।"</string>
@@ -2423,6 +2458,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ট্যাবলেট স্বাভাবিকের চেয়ে বেশি ব্যবহৃত হয়েছে"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ডিভাইস স্বাভাবিকের চেয়ে বেশি ব্যবহৃত হয়েছে"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"প্রত্যাশিত সময়ের আগেই চার্জ শেষ হয়ে যেতে পারে"</string>
+    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
+    <skip />
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ব্যাটারির ব্যবহার কিছুক্ষণের জন্য সীমিত করা হয়েছে। আরও জানতে ট্যাপ করুন।"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"আপনার ফোন স্বাভাবিকের চেয়ে বেশি ব্যবহার হয়েছে। প্রত্যাশিত সময়ের আগেই ব্যাটারির চার্জ শেষ হয়ে যেতে পারে।\n\nব্যাটারি বেশি ব্যবহার করে এমন অ্যাপ:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"আপনার ট্যাবলেট স্বাভাবিকের চেয়ে বেশি ব্যবহার হয়েছে। প্রত্যাশিত সময়ের আগেই ব্যাটারির চার্জ শেষ হয়ে যেতে পারে।\n\nব্যাটারি বেশি ব্যবহার করে এমন অ্যাপ:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"আপনার ডিভাইস স্বাভাবিকের চেয়ে বেশি ব্যবহার হয়েছে। প্রত্যাশিত সময়ের আগেই ব্যাটারির চার্জ শেষ হয়ে যেতে পারে।\n\nব্যাটারি বেশি ব্যবহার করে এমন অ্যাপ:"</string>
@@ -2478,6 +2516,8 @@
       <item quantity="other">%1$dটি অ্যাপে বিধিনিষেধ আরোপ করা হয়েছে</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"আপনার ব্যাটারির মিটার পড়ার সময় সমস্যা হয়েছে"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"আপনার ব্যাটারির মিটার পড়ার সময় সমস্যা হয়েছে। "<annotation id="url">"আরও জানতে"</annotation>" ট্যাপ করুন"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"অ্যাপটি বন্ধ করবেন?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> অ্যাপটি আপনার ফোনকে জাগিয়ে রাখছে, তাই আপনার ফোন স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি অ্যাপটি বন্ধ করতে পারেন।\n\nতার পরেও যদি এরকম ঘটতে থাকে, তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টল করতে হতে পারে।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> অ্যাপটি আপনার ট্যাবলেট জাগিয়ে রাখছে, তাই আপনার ট্যাবলেট স্বাভাবিকভাবে ব্যাটারি পরিচালনা করতে পারছে না।\n\nএই সমস্যার সমাধানের জন্য আপনি অ্যাপটি বন্ধ করতে পারেন।\n\nতার পরেও যদি এরকম ঘটতে থাকে, তাহলে ব্যাটারির পারফরম্যান্সের উন্নতি করতে এই অ্যাপটি আনইনস্টল করতে হতে পারে।"</string>
@@ -2591,9 +2631,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"সময়সূচি সেট করুন"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ব্যাটারি আরও বেশি সময় চলবে"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"চার্জের সময় বন্ধ করুন"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"আপনার ফোনের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g> হলে ব্যাটারি সেভার বন্ধ হয়ে যায়"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"আপনার ট্যাবলেটের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g> হলে ব্যাটারি সেভার বন্ধ হয়ে যায়"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"আপনার ডিভাইসের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g> হলে ব্যাটারি সেভার বন্ধ হয়ে যায়"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"আপনার ফোনের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g>-এর বেশি হলে ব্যাটারি সেভার বন্ধ হয়ে যাবে"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"আপনার ট্যাবলেটের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g>-এর বেশি হলে ব্যাটারি সেভার বন্ধ হয়ে যাবে"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"আপনার ডিভাইসের চার্জ <xliff:g id="PERCENT">%1$s</xliff:g>-এর বেশি হলে ব্যাটারি সেভার বন্ধ হয়ে যাবে"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"চালু করুন"</string>
@@ -2658,6 +2698,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"রিসেট করুন"</string>
     <string name="tts_play" msgid="2945513377250757221">"চালান"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"অ্যাডাপ্টিভ কানেক্টিভিটি"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"আপনার নেটওয়ার্ক কানেকশন অটোমেটিক ম্যানেজ করে ব্যাটারি আরও বেশিক্ষণ ব্যবহার করুন এবং ডিভাইসের পারফর্ম্যান্স উন্নত করুন"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ক্রেডেনশিয়াল স্টোরেজ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"সার্টিফিকেট ইনস্টল করা"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"স্টোরেজ থেকে সার্টিফিকেট ইনস্টল করুন"</string>
@@ -2669,9 +2711,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ব্যবহারকারীর সার্টিফিকেট"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"সংরক্ষিত সার্টিফিকেট দেখুন এবং সংশোধন করুন"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"উন্নত"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"স্টোরেজের প্রকার"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"হার্ডওয়্যার-ব্যাকড"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"শুধুমাত্র সফ্টওয়্যার"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"এই ব্যবহারকারীর জন্য প্রমাণপ্রত্রাদি উপলব্ধ নয়"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN এবং অ্যাপ্সের জন্য ইনস্টল করা হয়েছে"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ওয়াই-ফাই এর জন্য ইনস্টল করা হয়েছে"</string>
@@ -2687,6 +2726,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"ইনস্টল করবেন না"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"তা সত্ত্বেও ইনস্টল করুন"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"সার্টিফিকেট ইনস্টল করা হয়নি"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"এই ডিভাইসে সার্টিফিকেট ইনস্টল করতে <xliff:g id="APP_NAME">%s</xliff:g> অ্যাপকে অনুমতি দেবেন?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"নীচে দেওয়া অ্যাপ এবং ইউআরএল-এ এই সব সার্টিফিকেটের মাধ্যমে আপনাকে শনাক্ত করা হবে"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"অনুমতি দেবেন না"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"অনুমতি দিন"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"আরও দেখুন"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"সার্টিফিকেট ম্যানেজমেন্ট অ্যাপ"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"কোনওটিই নয়"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"এই অ্যাপ দিয়ে যে সার্টিফিকেট ইনস্টল করা হয়েছে সেই অ্যাপ ও নিচের ইউআরএল দিয়ে আপনাকে শনাক্ত করে"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"সরান"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"আপদকালীন ডায়ালিং সিগন্যাল"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"জরুরি কল স্থাপন করা সময় কি ধরণের অ্যাক্টিভিটি করবে তা সেট করুন"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"ব্যাক-আপ"</string>
@@ -3010,7 +3058,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"সেট-আপ করা নেই - কর্মস্থলের প্রোফাইল"</string>
     <string name="user_admin" msgid="4024553191395768119">"প্রশাসক"</string>
     <string name="user_you" msgid="3070562015202859996">"আপনি (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ডাকনাম"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"আপনি <xliff:g id="USER_COUNT">%1$d</xliff:g> জন পর্যন্ত ব্যবহারকারী যোগ করতে পারেন"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"শুধুমাত্র ট্যাবলেটেরর মালিক ব্যবহারকারীদের পরিচালনা করতে পারেন।"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"শুধুমাত্র ফোনের মালিক ব্যবহারকারীদের পরিচালনা করতে পারেন।"</string>
@@ -3060,7 +3107,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"টার্মিনালে পেমেন্টের পদ্ধতি"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"একটি পেমেন্ট অ্যাপ সেট করুন। কন্ট্যাক্টলেস চিহ্ন থাকা যেকোনও টার্মিনালের উপর ফোনের পিছন দিকটি  রাখুন।"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"বুঝেছি"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"আরো..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"আরও…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ডিফল্ট পেমেন্ট অ্যাপ সেট করুন"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ডিফল্ট পেমেন্ট অ্যাপ আপডেট করুন"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"কন্ট্যাক্টলেস টার্মিনালে, <xliff:g id="APP">%1$s</xliff:g> ব্যবহার করে পেমেন্ট করুন"</string>
@@ -3130,9 +3177,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ফিরুন"</string>
     <string name="wizard_next" msgid="3884832431439072471">"পরবর্তী"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"শেষ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ফটো তুলুন"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"একটি ছবি বেছে নিন"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ফটো বেছে নিন"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"সিম কার্ডগুলি"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"সিম কার্ডগুলি"</string>
@@ -3144,7 +3188,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"কলের জন্য সবসময় এটি ব্যবহার করুন"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ডেটার জন্য একটি সিম বেছে নিন"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"এসএমএসের জন্য কোনও একটি সিম বেছে নিন"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ডেটা সিম পাল্টাতে এক মিনিট পর্যন্ত সময় লাগতে পারে..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ডেটা সিম পাল্টাতে এক মিনিট পর্যন্ত সময় লাগতে পারে…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"এর মাধ্যমে কল করুন"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"একটি সিম কার্ড বেছে নিন"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"সিম <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3331,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"রুটিন, সময়সূচি, ব্যাটারি সেভার, পাওয়ার সেভার, ব্যাটারি, অটোমেটিক, শতাংশ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, উন্নত কলিং, 4G কলিং"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ভাষা যোগ করুন, কোনও একটি ভাষা যোগ করুন"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"টেক্সটের সাইজ"</string>
     <string name="default_sound" msgid="6604374495015245195">"ডিফল্ট সাউন্ড"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"রিং ও বিজ্ঞপ্তির ভলিউম <xliff:g id="PERCENTAGE">%1$s</xliff:g>-এ সেট করা আছে"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ভলিউম, ভাইব্রেশন, বিরক্ত করবে না"</string>
@@ -3326,11 +3371,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ধ্বনিগুলিতে শক্তি"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"লাইভ ক্যাপশন"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"মিডিয়া অটোমেটিক ক্যাপশন করুন"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"কোনওটিই নয়"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টি শিডিউল সেট করা হয়েছে</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি শিডিউল সেট করা হয়েছে</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{একটিও নেই}=1{১টি শিডিউল সেট করা হয়েছে}one{#টি শিডিউল সেট করা হয়েছে}other{#টি শিডিউল সেট করা হয়েছে}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"বিরক্ত করবে না"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"শুধু গুরুত্বপূর্ণ লোকজন এবং অ্যাপ থেকে বিজ্ঞপ্তি পান"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"বিরক্তিকর কন্টেন্ট বন্ধ করা"</string>
@@ -3398,20 +3439,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"শুধুমাত্র অগ্রাধিকার"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"চালু / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"বন্ধ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"বন্ধ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"চালু"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"প্রতিবার জিজ্ঞেস করুন"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"যতক্ষণ না আপনি বন্ধ করছেন"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ঘণ্টা</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ঘণ্টা</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> মিনিট"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টি সময়সূচী নিজে থেকে চালু হতে পারে</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি সময়সূচী নিজে থেকে চালু হতে পারে</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{১ ঘণ্টা}one{# ঘণ্টা}other{# ঘণ্টা}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{১ মিনিট}one{# মিনিট}other{# মিনিট}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{বন্ধ আছে}=1{বন্ধ আছে / ১টি শিডিউল অটোমেটিক চালু হতে পারে}one{বন্ধ আছে / #টি শিডিউল অটোমেটিক চালু হতে পারে}other{বন্ধ আছে / #টি শিডিউল অটোমেটিক চালু হতে পারে}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'বিরক্ত করবে না\' মোড কী কারণে বাধা পেতে পারে"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"লোকজন"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"অ্যাপ"</string>
@@ -3457,6 +3490,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"কম অগ্রাধিকার সম্পন্ন বিজ্ঞপ্তি অটোমেটিক সাইলেন্ট মোডে সেট করা থাকে"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"অ্যাডাপ্টিভ বিজ্ঞপ্তির র‌্যাঙ্কিং"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"প্রাসঙ্গিকতার ভিত্তিতে অটোমেটিক র‌্যাঙ্কিংয়ের বিজ্ঞপ্তি"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"অ্যাডাপ্টিভ বিজ্ঞপ্তির মতামত"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"বিজ্ঞপ্তি দেখানোর ক্ষেত্রে করা পরিবর্তনগুলি জানায় এবং সিস্টেমে মতামত জানানোর বিকল্প দেখায়"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"বিজ্ঞপ্তির গুরুত্ব রিসেট করুন"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"ব্যবহারকারীর পরিবর্তন করা গুরুত্বপূর্ণ সেটিংস রিসেট করুন এবং সেই সঙ্গে প্রাধান্য দেওয়ার জন্য বিজ্ঞপ্তি অ্যাসিস্ট্যান্টকে অনুমতি দিন"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"সাজেস্ট করা অ্যাকশন ও উত্তর"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"সাজেস্ট করা অ্যাকশন ও উত্তর অটোমেটিক দেখানো হয়"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"সাম্প্রতিক এবং স্নুজ করা বিজ্ঞপ্তি দেখুন"</string>
@@ -3554,8 +3591,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"গুরুত্বপূর্ণ কথোপকথন"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"কথোপকথনের বিভাগের উপরে দেখুন এবং ফ্লোটিং বাবলের মতো দেখাবে"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"কথোপকথন বিভাগের একদম উপরে দেখুন"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"অন্যান্য কথোপকথন"</string>
+    <string name="other_conversations" msgid="551178916855139870">"গুরুত্বপূর্ণ নয় এমন কথোপকথন"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"কথোপকথনে আপনার করা পরিবর্তন"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"সাম্প্রতিক কথোপকথন"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"সাম্প্রতিক কথোপকথন মুছুন"</string>
+    <string name="clear" msgid="5092178335409471100">"মুছুন"</string>
     <string name="important_bubble" msgid="7911698275408390846">"গুরুত্বপূর্ণ কথোপকথন বাবল করুন"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"পুল-ডাউন শেডের উপরে গুরুত্বপূর্ণ কথোপকথন দেখায়। আপনি এগুলি বাবলে সেট করতে পারেন এবং \'বিরক্ত করবেন না\' মোড থামাতে পারেন।"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"গুরুত্বপূর্ণ এবং পরিবর্তন করা কথোপকথন এখানে দেখানো হবে"</string>
@@ -3653,7 +3693,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"বিরক্ত করবে না মোডের ক্ষেত্রে অ্যাক্সেস"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'বিরক্ত করবে না\' মোডের জন্য অনুমতি দিন"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ইনস্টল করা নেই এমন অ্যাপগুলি বিরক্ত করবে না অ্যাক্সেস করুন এর অনুরোধ জানিয়েছে"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"অ্যাপ্লিকেশানগুলি লোড করা হচ্ছে..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"অ্যাপ লোড হচ্ছে…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"আপনার অনুরোধ অনুযায়ী Android এই অ্যাপের বিজ্ঞপ্তি এই ডিভাইসে দেখাচ্ছে না"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"আপনার অনুরোধ অনুযায়ী Android এই বিভাগের বিজ্ঞপ্তিগুলি এই ডিভাইসে দেখাচ্ছে না"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"আপনার অনুরোধ অনুযায়ী Android এই ধরনের বিজ্ঞপ্তিগুলি এই ডিভাইসে দেখাচ্ছে না"</string>
@@ -3745,11 +3785,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"সমস্ত কথোপকথন"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"গুরুত্বপূর্ণ কথোপকথন"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"এমন কেউ নেই"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g>টি কথোপকথন</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g>টি কথোপকথন</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"এমন কেউ নেই"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{একটিও নেই}=1{১টি কথোপকথন}one{#টি কথোপকথন}other{#টি কথোপকথন}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"যেগুলি \'বিরক্ত করবে না\' মোড এড়িয়ে নিজের কাজ করতে পারে"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"কল"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"কল"</string>
@@ -3758,11 +3794,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"কল আসলে রিং বাজবে কিনা তা নিশ্চিত করতে ডিভাইসটি রিং হওয়ার মোডে সেট করা আছে কিনা"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-এর জন্য ইনকামিং কল ব্লক করা হয়েছে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি সেটিংস অ্যাডজাস্ট করে নিতে পারেন।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"তারা চিহ্নিত পরিচিতি"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">আরও <xliff:g id="NUM_PEOPLE">%d</xliff:g>টি</item>
-      <item quantity="other">আরও <xliff:g id="NUM_PEOPLE">%d</xliff:g>টি</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"কোনও তারা চিহ্নিত পরিচিতি নেই"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{কেউ নেই}=1{{contact_1}}=2{{contact_1} এবং {contact_2}}=3{{contact_1}, {contact_2} এবং {contact_3}}one{{contact_1}, {contact_2} এবং অন্যান্য #জন}other{{contact_1}, {contact_2} এবং অন্যান্য #জন}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(কোনও নাম নেই)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"মেসেজ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3804,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-এর জন্য ইনকামিং মেসেজ ব্লক করা হয়েছে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি সেটিংস অ্যাডজাস্ট করে নিতে পারেন।"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"আপনার ফোনে সব মেসেজই আসতে পারবে"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"এক্ষেত্রে আপনার ফোনে সব কলই আসবে"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"কোনও পরিচিতি নেই"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g>টি পরিচিতি</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g>টি পরিচিতি</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{কেউ নেই}=1{১টি পরিচিতি}one{#টি পরিচিতি}other{#টি পরিচিতি}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"যেকেউ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"পরিচিতি"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"তারা চিহ্নিত পরিচিতিগুলি"</string>
@@ -3813,22 +3842,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"সব বিজ্ঞপ্তি"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"কিছু বিজ্ঞপ্তি"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"এমনকী আপনি অ্যাপগুলিকে বিরক্ত করতে না দিলেও বেছে নেওয়া লোকজন আপনার সাথে যোগাযোগ করতে পারবেন"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> বাধা দিতে পারবে</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> বাধা দিতে পারবে</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"আরও <xliff:g id="NUMBER">%d</xliff:g>টি"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{কোনও অ্যাপই বাধা দিতে পারবে না}=1{{app_1} বাধা দিতে পারবে}=2{{app_1} ও {app_2} বাধা দিতে পারবে}=3{{app_1}, {app_2} ও {app_3} বাধা দিতে পারবে}one{{app_1}, {app_2}, ও #টি অ্যাপ বাধা দিতে পারবে}other{{app_1}, {app_2}, ও #টি অ্যাপ বাধা দিতে পারবে}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"অ্যাপ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"সমস্ত বিজ্ঞপ্তি"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"কিছু বিজ্ঞপ্তি"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"যে বিজ্ঞপ্তিগুলি \'বিরক্ত করবে না\' মোড এড়িয়ে নিজের কাজ করতে পারে"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"সব বিজ্ঞপ্তিকে অনুমতি দিন"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> বাধা দিতে পারবে</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> বাধা দিতে পারবে</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"কিছুই বাধা দিতে পারবে না"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"আরও <xliff:g id="NUMBER">%d</xliff:g>টি"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{কিছুই বাধা দিতে পারবে না}=1{{sound_category_1} বাধা দিতে পারবে}=2{{sound_category_1} ও {sound_category_2} বাধা দিতে পারবে}=3{{sound_category_1}, {sound_category_2} ও {sound_category_3} বাধা দিতে পারবে}one{{sound_category_1}, {sound_category_2}, ও #টি অ্যাপ বাধা দিতে পারবে}other{{sound_category_1}, {sound_category_2}, ও #টি অ্যাপ বাধা দিতে পারবে}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"কেউ বাধা দিতে পারবে না"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"কেউই বাধা দিতে পারবে না"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"কিছু লোকজন বাধা দিতে পারবে"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"সবাই বাধা দিতে পারবে"</string>
@@ -3874,8 +3895,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"চালু করুন"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"বন্ধ করুন"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"অ্যাপ পিন করার ফিচার"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"অ্যাপ পিন করার ফিচারটি ব্যবহার করে আপনি বর্তমান অ্যাপটিকে আনপিন না করা পর্যন্ত দেখতে পাবেন। এই ফিচারটি অনেক কিছুর জন্য ব্যবহার করা যেতে পারে, উদাহরণস্বরূপ, কোনও বিশ্বস্ত বন্ধুকে ডিভাইসে কেবল একটি নির্দিষ্ট গেম খেলতে দেওয়া। \n\nযখন কোনও অ্যাপ পিন করা থাকে, তখন পিনযুক্ত অ্যাপটি অন্যান্য অ্যাপ খুলতে পারে এবং ব্যক্তিগত ডেটা অ্যাক্সেসযোগ্য হতে পারে। \n\nঅ্যাপ পিন করার ফিচারটি ব্যবহার করার জন্য: 	\n১.	অ্যাপ পিন করার ফিচারটি চালু করুন 	\n২.	ওভারভিউ বিকল্প খুলুন 	\n৩.	স্ক্রিনের একদম উপরে অ্যাপ আইকন ট্যাপ করে পিন করুন বিকল্পে ট্যাপ করুন"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"অ্যাপ পিন করার ফিচারটি ব্যবহার করে আপনি বর্তমান অ্যাপটিকে আনপিন না করা পর্যন্ত দেখতে পাবেন। এই ফিচারটি অনেক কিছুর জন্য ব্যবহার করা যেতে পারে, যেমন, কোনও বিশ্বস্ত বন্ধুকে ডিভাইসে কেবল একটি নির্দিষ্ট গেম খেলতে দেওয়া। \n\nযখন কোনও অ্যাপ পিন করা থাকে, তখন পিনযুক্ত অ্যাপটি অন্যান্য অ্যাপ খুলতে পারে এবং ব্যক্তিগত ডেটা অ্যাক্সেসযোগ্য হতে পারে। \n\nআপনি যদি নিরাপদে কারোর সাথে আপনার ডিভাইস শেয়ার করতে চান তাহলে বরং গেস্ট ইউজার ব্যবহার করার চেষ্টা করুন। \n\nঅ্যাপ পিন করার ফিচারটি ব্যবহার করার জন্য: 	\n১.	অ্যাপ পিন করার ফিচারটি চালু করুন 	\n২.	ওভারভিউ বিকল্প খুলুন 	\n৩.	স্ক্রিনের একদম উপরে অ্যাপ আইকন ট্যাপ করে পিন করুন বিকল্পে ট্যাপ করুন"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"অ্যাপ পিন করার ফিচারটি ব্যবহার করে আপনি বর্তমান অ্যাপটিকে আনপিন না করা পর্যন্ত দেখতে পাবেন। এই ফিচারটি অনেক কিছুর জন্য ব্যবহার করা যেতে পারে, যেমন, কোনও বিশ্বস্ত বন্ধুকে ডিভাইসে কেবল একটি নির্দিষ্ট গেম খেলতে দেওয়া।"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"যখন কোনও অ্যাপ পিন করা থাকে, তখন পিনযুক্ত অ্যাপটি অন্যান্য অ্যাপ খুলতে পারে এবং ব্যক্তিগত ডেটা অ্যাক্সেসযোগ্য হতে পারে। \n\nঅ্যাপ পিন করার ফিচারটি ব্যবহার করার জন্য: 	\n১.	অ্যাপ পিন করার ফিচারটি চালু করুন 	\n২.	ওভারভিউ বিকল্প খুলুন 	\n৩.	স্ক্রিনের একদম উপরে অ্যাপ আইকন ট্যাপ করে পিন করুন বিকল্পে ট্যাপ করুন"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"যখন কোনও অ্যাপ পিন করা থাকে, তখন পিনযুক্ত অ্যাপটি অন্যান্য অ্যাপ খুলতে পারে এবং ব্যক্তিগত ডেটা অ্যাক্সেসযোগ্য হতে পারে। \n\nআপনি যদি নিরাপদে কারোর সাথে আপনার ডিভাইস শেয়ার করতে চান তাহলে বরং গেস্ট ইউজার ব্যবহার করার চেষ্টা করুন। \n\nঅ্যাপ পিন করার ফিচারটি ব্যবহার করার জন্য: 	\n১.	অ্যাপ পিন করার ফিচারটি চালু করুন 	\n২.	ওভারভিউ বিকল্প খুলুন 	\n৩.	স্ক্রিনের একদম উপরে অ্যাপ আইকন ট্যাপ করে পিন করুন বিকল্পে ট্যাপ করুন"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"যখন কোনও অ্যাপ পিন করা থাকে: \n\n•	 ব্যক্তিগত ডেটা অ্যাক্সেসযোগ্য হতে পারে \n		(যেমন পরিচিতি এবং ইমেল কন্টেন্ট) \n•	 পিনযুক্ত অ্যাপটি অন্যান্য অ্যাপ খুলতে পারে\n\nআপনি বিশ্বাস করেন শুধু এমন ব্যক্তির সাথে অ্যাপ পিন করার ফিচারটি ব্যবহার করুন।"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"আনপিন করার আগে আনলক প্যাটার্ন চান"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"আনপিন করার আগে পিন চান"</string>
@@ -3897,6 +3919,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"আপনার ডিভাইস আনলক করার জন্য আপনার ফেস ব্যবহার করা ছাড়াও, এটি চালু হওয়ার আগে আপনার পিন চাওয়ার মাধ্যমে আপনি ডিভাইসটিকে আরও সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, মেসেজ বা অ্যালার্মের কোনও বিজ্ঞপ্তি আসবে না।\n\nএর ফলে ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলেও আপনার ডেটা সুরক্ষিত থাকবে। আপনার ডিভাইসটি চালু করার সময় পিন দেওয়ার ব্যবস্থা রাখতে চান?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"আপনার ডিভাইস আনলক করার জন্য আপনার ফেস ব্যবহার করা ছাড়াও, এটি চালু হওয়ার আগে আপনার প্যাটার্ন চাওয়ার মাধ্যমে আপনি ডিভাইসটিকে আরও সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, মেসেজ বা অ্যালার্মের কোনও বিজ্ঞপ্তি আসবে না।\n\nএর ফলে ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলেও আপনার ডেটা সুরক্ষিত থাকবে। আপনার ডিভাইসটি চালু করার সময় প্যাটার্ন দেওয়ার ব্যবস্থা রাখতে চান?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"আপনার ডিভাইস আনলক করার জন্য ফেস ব্যবহার করা ছাড়াও, ডিভাইসটি চালু হওয়ার সময় পাসওয়ার্ড দেওয়ার মাধ্যমে আপনি এটিকে আরও সুরক্ষিত রাখতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত এতে কল, মেসেজ বা অ্যালার্মের কোনও বিজ্ঞপ্তি আসবে না।\n\nএর ফলে ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলেও আপনার ডেটা সুরক্ষিত থাকবে। আপনার ডিভাইসটি চালু করার সময় পাসওয়ার্ড দেওয়ার ব্যবস্থা রাখতে চান?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ডিভাইস আনলক করার জন্য আপনার বায়োমেট্রিক্স ব্যবহার করা ছাড়াও, চালু করার জন্য আবশ্যক হিসেবে আপনার পিন চাওয়ার মাধ্যমে সেটিকে আপনি আরও সুরক্ষিত রাখতে পারেন। চালু না হওয়া পর্যন্ত, এটি কল বা মেসেজ পাবে না এবং অ্যালার্ম সহ সতর্কতা দেখাতে পারবে না।\n\nএইভাবে হারিয়ে যাওয়া বা চুরি হয়ে যাওয়া ডিভাইসে ডেটা সুরক্ষিত রাখা যায়। পিন দিয়ে আপনার ডিভাইস চালু করতে চান?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ডিভাইস আনলক করার জন্য আপনার বায়োমেট্রিক্স ব্যবহার করা ছাড়াও, চালু করার জন্য আবশ্যক হিসেবে আপনার প্যাটার্ন চাওয়ার মাধ্যমে সেটিকে আপনি আরও সুরক্ষিত রাখতে পারেন। চালু না হওয়া পর্যন্ত, এটি কল বা মেসেজ পাবে না এবং অ্যালার্ম সহ সতর্কতা দেখাতে পারবে না।\n\nএইভাবে হারিয়ে যাওয়া বা চুরি হয়ে যাওয়া ডিভাইসে ডেটা সুরক্ষিত রাখা যায়। প্যাটার্ন দিয়ে আপনার ডিভাইস চালু করতে চান?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ডিভাইস আনলক করার জন্য আপনার বায়োমেট্রিক্স ব্যবহার করা ছাড়াও, চালু করার জন্য আবশ্যক হিসেবে আপনার পাসওয়ার্ড চাওয়ার মাধ্যমে সেটিকে আপনি আরও সুরক্ষিত রাখতে পারেন। চালু না হওয়া পর্যন্ত, এটি কল বা মেসেজ পাবে না এবং অ্যালার্ম সহ সতর্কতা দেখাতে পারবে না।\n\nএইভাবে হারিয়ে যাওয়া বা চুরি হয়ে যাওয়া ডিভাইসে ডেটা সুরক্ষিত রাখা যায়। পাসওয়ার্ড দিয়ে আপনার ডিভাইস চালু করতে চান?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"হ্যাঁ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"না"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"সীমাবদ্ধ"</string>
@@ -4072,7 +4097,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"ইউএসবি দ্বারা নিয়ন্ত্রিত"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"কানেক্ট থাকা ডিভাইস"</string>
     <string name="usb_control_device" msgid="527916783743021577">"এই ডিভাইসটি"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"পাল্টানো হচ্ছে…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"পাল্টানো হচ্ছে…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"পাল্টানো যায়নি"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"এই ডিভাইসটি চার্জ করা হচ্ছে"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"কানেক্ট ডিভাইসে চার্জ দেওয়া"</string>
@@ -4266,6 +4291,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"মোবাইল ডেটার ব্যবহার"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"অ্যাপ ডেটার ব্যবহার"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"ওয়াই-ফাই ডেটার ব্যবহার"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"পরিষেবা প্রদানকারী নয় এমন নেটওয়ার্কের ডেটার ব্যবহার"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ইথারনেট ডেটার ব্যবহার"</string>
     <string name="wifi" msgid="2932584495223243842">"ওয়াই-ফাই"</string>
     <string name="ethernet" msgid="4665162609974492983">"ইথারনেট"</string>
@@ -4284,6 +4310,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g>টি সীমাবদ্ধতা</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"পরিষেবা প্রদানকারী ডেটার হিসাব, ডিভাইসের হিসাব থেকে ভিন্ন হতে পারে"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"পরিষেবা প্রদানকারী নেটওয়ার্ক যে ডেটা ব্যবহার করে তা অন্তর্ভুক্ত নয়"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ব্যবহৃত হয়েছে"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ডেটা সতর্কতা সেট করুন"</string>
     <string name="data_warning" msgid="2925054658166062884">"ডেটা সতর্কতা"</string>
@@ -4319,7 +4346,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"বিবরণ দেখুন"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ডেটা সেভার"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"অসীমিত ডেটা"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"পটভূমির ডেটা বন্ধ রয়েছে"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ব্যাকগ্রাউন্ড ডেটা বন্ধ করা আছে"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"চালু আছে"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"বন্ধ আছে"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ডেটা সেভার ব্যবহার করুন"</string>
@@ -4342,7 +4369,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"যদি ডিভাইসটি লক থাকে তাহলে, বিজ্ঞপ্তিগুলির মধ্যে উত্তর বা অন্যান্য পাঠ্য লেখা আটকায়"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ডিফল্ট বানান পরিক্ষক"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"বানান পরীক্ষক চয়ন করুন"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"বানান পরিক্ষক ব্যবহার করুন"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"বানান-পরীক্ষক ফিচার ব্যবহার করুন"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"নির্বাচন করা হয়নি"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(কোনো কিছুই নয়)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4459,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"স্টোরেজ খালি করার কাজে সাহায্য করার জন্য, স্টোরেজ ম্যানেজার আপনার ডিভাইস থেকে ব্যাক-আপ নেওয়া ফটো এবং ভিডিওগুলিকে সরিয়ে দেয়৷"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ফটো এবং ভিডিওগুলিকে সরান"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"সঞ্চয়স্থানের পরিচালক"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"স্টোরেজ পরিচালক ব্যবহার করুন"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"\'স্টোরেজ ম্যানেজার\' ব্যবহার করুন"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"অটোমেটিক"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ম্যানুয়াল"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"এখনই জায়গা খালি করুন"</string>
@@ -4470,6 +4497,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ফোন চেক করতে ডাবল-ট্যাপ করুন"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ট্যাবলেট চেক করতে ডাবল-ট্যাপ করুন"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ডিভাইস চেক করতে ডাবল-ট্যাপ করুন"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"বিজ্ঞপ্তি দেখতে সোয়াইপ করুন"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"বিজ্ঞপ্তি দেখার জন্য স্ক্রিনের নিচের দিকে সোয়াইপ করুন"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"এক হাতে ব্যবহার করার মোড"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"এক হাতে ব্যবহার করার মোড ব্যবহার করুন"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"একটি অ্যাপ থেকে আরেকটিতে যাওয়ার সময় বেরিয়ে আসুন"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"সময় সমাপ্ত"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"৪ সেকেন্ড"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"৮ সেকেন্ড"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"১২ সেকেন্ড"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"রিচেবিলিটি"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার স্ক্রিনে ডবল-ট্যাপ করুন।"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ফোন চেক করতে সেটিকে হাতে নিন"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"চেক করতে ট্যাবলেটটিকে হাতে নিন"</string>
@@ -4482,6 +4519,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ট্যাবলেট যাচাই করতে ট্যাপ করুন"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ডিভাইস যাচাই করতে ট্যাপ করুন"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"সময়, বিজ্ঞপ্তি এবং অন্যান্য তথ্য দেখতে আপনার স্ক্রিনে ট্যাপ করুন।"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ইমার্জেন্সি SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"জরুরি SOS ব্যবহার করুন"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g>-এর ম্যানেজ করা"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"নিচের ইমার্জেন্সি অ্যাকশন চালু করতে পাওয়ার বোতাম দ্রুত পরপর ৫ বা তারও বেশি বার প্রেস করুন"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"কাউন্টডাউন অ্যালার্ম চালু করুন"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"আপনি সাহায্য চেয়ে বিজ্ঞপ্তি পাঠানোর আগে খুব জোরে আওয়াজ হবে"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"সাহায্যের জন্য কল করুন"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"সাহায্যের জন্য কল করার নম্বর"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>। পরিবর্তন করতে ট্যাপ করুন"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"আপনি সাধারণ নম্বর লিখলে:\n • জরুরী SOS ব্যবহার করার জন্য আপনার ডিভাইস অবশ্যই আনলক করতে হবে\n • আপনার কলটির হয়ত উত্তর দেওয়া যাবে না"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"বিজ্ঞপ্তির জন্য আঙ্গুলের ছাপ সোয়াইপ করা"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"আঙ্গুলের ছাপ সোয়াইপ করুন"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"আপনার বিজ্ঞপ্তিগুলি চেক করতে, আপনার ফোনের পিছনে আঙ্গুলের ছাপ নেওয়ার সেন্সরে নিচের দিকে সোয়াইপ করুন৷"</string>
@@ -4607,6 +4654,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"সবচেয়ে বেশিবার দেখা ডেটাসেট"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ডিফল্ট মানে রিসেট করুন"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"অটো-ফিল ডেভেলপার বিকল্প রিসেট করা হয়েছে"</string>
+    <string name="location_category" msgid="3496759112306219062">"লোকেশন"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"স্ট্যাটাস বার লোকেশন সূচক"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"নেটওয়ার্ক ও কানেক্টিভিটি সমেত সব লোকেশন দেখুন"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GnssMeasurement সম্পূর্ণভাবে ট্র্যাক করুন"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ডিউটি-সাইক্লিং বাদে সমস্ত কন্সটেলেশন এবং ফ্রিকোয়েন্সি ট্র্যাক করুন"</string>
     <string name="device_theme" msgid="5027604586494772471">"ডিভাইসের থিম"</string>
     <string name="default_theme" msgid="4815428567082263639">"ডিফল্ট"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"নেটওয়ার্কের নাম"</string>
@@ -4623,8 +4675,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"যাতে বিরক্ত হতে না হয় তার জন্য বিজ্ঞপ্তি পজ করুন"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ফিচারটি উপলভ্য নেই"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"এই ফিচারটি বন্ধ করা হয়েছে কারণ এটি আপনার ফোনের স্পিড কমিয়ে দেয়"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GnssMeasurement সম্পূর্ণভাবে ট্র্যাক করুন"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ডিউটি-সাইক্লিং বাদে সমস্ত কন্সটেলেশন এবং ফ্রিকোয়েন্সি ট্র্যাক করুন"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"প্রত্যেকবার ক্র্যাশ ডায়ালগ দেখাতে দিন"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"কোনও অ্যাপ ক্র্যাশ করলে প্রত্যেকবার ডায়ালগ দেখাতে দিন"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE চালু আছে এমন অ্যাপ বেছে নিন"</string>
@@ -4636,7 +4686,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"সব অ্যাপের জন্য চালু করুন"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"গ্রাফিক্স ড্রাইভার বেছে নিন"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ডিফল্ট"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"গেম ড্রাইভার"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"গেম ড্রাইভার"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ডেভেলপার ড্রাইভার"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"সিস্টেম গ্রাফিক্স ড্রাইভার"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4742,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"চালু (মিউট)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"বন্ধ"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"নেটওয়ার্কের বিবরণ"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"আপনার ডিভাইসের নাম আপনার ফোনে থাকা অ্যাপে দেখা যাবে। আপনি যখন এটিকে ব্লুটুথ ডিভাইসের সাথে কানেক্ট করেন বা ওয়াই-ফাই হটস্পট সেট-আপ করেন তখন এটি অন্যরাও দেখতে পেতে পারেন।"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"আপনার ফোনের অ্যাপে আপনার ডিভাইসের নাম দেখা যাবে। আপনি ব্লুটুথ ডিভাইসে বা ওয়াই-ফাই নেটওয়ার্কে কানেক্ট করলে অথবা ওয়াই-ফাই হটস্পট সেট আপ করলে এটি অন্যরাও হয়ত দেখতে পাবেন।"</string>
     <string name="devices_title" msgid="649715719278562515">"ডিভাইস"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"সমস্ত সেটিংস"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"সাজেশন"</string>
@@ -4705,6 +4755,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"নেটওয়ার্ক পাওয়া যায়নি। আবার চেষ্টা করুন।"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(নিষিদ্ধ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"কোনও সিম কার্ড নেই"</string>
+    <string name="sim_card" msgid="6381158752066377709">"সিম"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"কোনও সিম নেই"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"কোনও কিছুই নয়"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"কানেক্ট করার জন্য সিম প্রয়োজন"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"কানেক্ট করার জন্য <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> সিম প্রয়োজন"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"পছন্দের নেটওয়ার্ক মোড: বেছে নেওয়া WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"পছন্দের নেটওয়ার্ক মোড: শুধুমাত্র GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"পছন্দের নেটওয়ার্ক মোড: শুধুমাত্র WCDMA"</string>
@@ -4758,6 +4813,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"মোবাইল ডেটা"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"মোবাইল নেটওয়ার্ক ব্যবহার করে ডেটা অ্যাক্সেস করুন"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"সীমার মধ্যে আসলে ফোনটি এই প্রদানকারীর পরিষেবা অটোমেটিক ব্যবহার করবে"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"কোনও সিম কার্ড নেই"</string>
     <string name="calls_preference" msgid="2166481296066890129">"কোন নেটওয়ার্ক থেকে কল করবেন"</string>
     <string name="sms_preference" msgid="7742964962568219351">"কোন নেটওয়ার্কে এসএমএস পাবেন"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"প্রতিবার জিজ্ঞাসা করা হবে"</string>
@@ -4818,6 +4874,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>-এ কনেক্ট থাকলে উপলভ্য থাকে না"</string>
     <string name="see_more" msgid="7499355691042812723">"আরও দেখুন"</string>
     <string name="see_less" msgid="2642392725363552793">"কম দেখুন"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> চালু করতে চান?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"সিম চালু করবেন?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-এ পাল্টাতে চান?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"সিম কার্ডে পাল্টাতে চান?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"যেকোনও সময় শুধুমাত্র একটি সিম কাজ করবে।.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-এ পাল্টালে <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-এর পরিষেবা বাতিল হয়ে যাবে না।"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"যেকোনও সময় শুধুমাত্র একটি ডাউনলোড করা সিম কাজ করবে।\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> পাল্টালে <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-এর পরিষেবা বাতিল হয়ে যাবে না।"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"যেকোনও সময় শুধুমাত্র একটি সিম কাজ করবে।.\n\nপাল্টালে <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-এর পরিষেবা বাতিল করা হবে না।"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-এ পাল্টান"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"নেটওয়ার্কে কানেক্ট করা হচ্ছে…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-এ পাল্টানো হচ্ছে"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"পরিষেবা প্রদানকারী পাল্টানো যাচ্ছে না"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"একটি সমস্যার কারণে পরিষেবা প্রদানকারী পাল্টানো যাবে না।"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> পরিষেবা বন্ধ করতে চান?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"সিম বন্ধ করতে চান?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"সিম বন্ধ করা হচ্ছে<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"পরিষেবা প্রদানকারীকে বন্ধ করা যাচ্ছে না"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"কোনও সমস্যা হয়েছে এবং আপনার পরিষেবা প্রদানকারীর পরিষেবা বন্ধ করা যায়নি।"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"২টি সিম ব্যবহার করতে চান?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"এই ডিভাইসে একসাথে ২টি সিম চালু থাকতে পারে। একবারে ১টি সিম ব্যবহার করা চালিয়ে যেতে \"না থাক\" বিকল্পে ট্যাপ করুন।"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ডিভাইস রিস্টার্ট করতে চান?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"শুরু করতে, আপনার ডিভাইস রিস্টার্ট করুন। তারপরে, আপনি আরেকটি সিম যোগ করতে পারবেন।"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"চালিয়ে যান"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"রিস্টার্ট করুন"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"না থাক"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"পাল্টান"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"সিম চালু করা যাচ্ছে না"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"সিম কার্ডটি বের করে আবার ইনসার্ট করুন। এতেও সমস্যা ঠিক না হলে, ডিভাইস রিস্টার্ট করুন।"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"সিমটি আবার চালু করার চেষ্টা করুন। এতেও সমস্যা ঠিক না হলে, ডিভাইস রিস্টার্ট করুন।"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"নেটওয়ার্ক চালু করা"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> চালু আছে"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"সিম সেটিংস আপডেট করতে ট্যাপ করুন"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"সিম কার্ড"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"এই ডাউনলোড করা সিম মুছে ফেলতে চান?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"এই সিম মুছে দিলে এই ডিভাইসে <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> পরিষেবা আর পাওয়া যাবে না।\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> পরিষেবা কিন্তু বাতিল হবে না।"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"মুছুন"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"সিম মুছে ফেলা হচ্ছে…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"সিম মুছে ফেলা যায়নি"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"কোনও সমস্যার জন্য এই সিম মোছা যাচ্ছে না।\n\nআপনার ডিভাইস রিস্টার্ট করে আবার চেষ্টা করুন।"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ডিভাইসে কানেক্ট করুন"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"আপনার ডিভাইসে কানেক্ট করার জন্য <xliff:g id="APPNAME">%1$s</xliff:g> অ্যাপ সাময়িকভাবে একটি ওয়াই-ফাই নেটওয়ার্ক ব্যবহার করতে চায়"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"কোনও ডিভাইস খুঁজে পাওয়া যায়নি। ডিভাইস চালু আছে এবং কানেক্ট করার জন্য তৈরি কিনা তা ভাল করে দেখে নিন।"</string>
@@ -4889,6 +4983,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"জরুরি কলগুলি"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"আপনার পরিষেবা প্রদানকারী নেটওয়ার্কের মাধ্যমে ওয়াই-ফাই কলিং ফিচারের সাহায্যে জরুরি কল করা যাবে না।\nজরুরি কল করতে ডিভাইস নিজে থেকে মোবাইল নেটওয়ার্ক পরিবর্তন করে নেবে।\nমোবাইল কভারেজ আছে এমন জায়গাতেই শুধুমাত্র জরুরি কল করা যাবে।"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"কল কোয়ালিটির উন্নতি করতে ওয়াই-ফাই ব্যবহার করুন"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"ক্রস সিম কলিং"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"এই সিম চালু থাকাকালীন অন্য একটি সিম দিয়ে কল ও এসএমএস করার অনুমতি দিন।"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"ক্রস সিম কলিং"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"ইনকামিং এমএমএস মেসেজ"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"এমএমএস মেসেজ পাঠানো যায়নি"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"মোবাইল ডেটা বন্ধ থাকার সময়ে <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>-এ এমএমএস মেসেজের অনুমতি দিতে ট্যাপ করুন"</string>
@@ -4940,10 +5037,50 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"সেটিংসে স্ক্রিন ওভারলে করার অনুমতি দিন"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"যেসব অ্যাপ অন্যান্য অ্যাপের উপর কন্টেন্ট দেখাতে পারে সেগুলিকে সেটিংস স্ক্রিনের উপর ওভারলে করার অনুমতি দিন"</string>
     <string name="media_controls_title" msgid="403271085636252597">"মিডিয়া"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"মিডিয়া সেশন শেষ হয়ে গেলে প্লেয়ার লুকান"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"আপনি প্লেয়ার ব্যবহার করে বড় করা দ্রুত সেটিংস প্যানেল থেকে সেশন আবার শুরু করতে পারবেন।"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"দ্রুত সেটিংসে মিডিয়া প্লেয়ার"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"প্লেব্যাক সহজেই আবার শুরু করতে, মিডিয়া প্লেয়ারকে আরও দীর্ঘ সময়ের জন্য দেখান"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"প্লেয়ার লুকান"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"প্লেয়ার দেখুন"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"কোনও প্লেয়ার উপলভ্য নেই"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"অনুমোদিত অ্যাপ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"মিডিয়া"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth চালু হবে"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"চালু আছে"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"বন্ধ আছে"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"ইন্টারনেট"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"সিম"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"বিমান-সুরক্ষা নেটওয়ার্ক"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"বিমান-সুরক্ষা নেটওয়ার্ক খুঁজে সেই পরিষেবাতে কানেক্ট করুন"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"বিমান, বিমান-সুরক্ষা"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"কল ও এসএমএস"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"ওয়াই-ফাই কলিং"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ওয়াই-ফাই নেটওয়ার্কের মতো পরিষেবা প্রদানকারী নয় এমন নেটওয়ার্ক ব্যবহার করে কল করুন এবং কল রিসিভ করুন"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"ওয়াই-ফাই কলিংয়ের সাহায্যে ওয়াই-ফাই নেটওয়ার্কের মতো কিছু পরিষেবা প্রদানকারী নয় এমন নেটওয়ার্ক ব্যবহার করে কল করতে এবং কল রিসিভ করতে পারবেন।"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"কল"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"এসএমএস"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"পছন্দসই"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"কল করা যেতে পারে"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"এসএমএস করা যেতে পারে"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"উপলভ্য নেই"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"কোনও সিম নেই"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"অভিরুচি"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"সর্বজনীন নেটওয়ার্কে কানেক্ট করুন"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"নেটওয়ার্ক কানেকশন, ইন্টারনেট, ওয়্যারলেস, ডেটা, ওয়াই-ফাই, ওয়াই-ফাই, ওয়াই-ফাই, মোবাইল ডেটা, মোবাইল, মোবাইল পরিষেবা প্রদানকারী, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"বিমানে ব্যবহার করার মতো নেটওয়ার্ক দেখুন"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"বিমান মোড বন্ধ করুন"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"বেডটাইম মোড চালু থাকায় এই সুবিধা উপলভ্য নয়"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"বিজ্ঞপ্তির দেখানোর অগ্রাধিকার রিসেট করার প্রক্রিয়া সম্পূর্ণ হয়েছে।"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"অ্যাপ"</string>
+    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <skip />
 </resources>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 5c46116..edb3023 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Srednje"</item>
     <item msgid="6740026006576843477">"Dugo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kratko"</item>
+    <item msgid="7397961711906421599">"Srednje"</item>
+    <item msgid="4079132024502041928">"Dugo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Zadano"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalno"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 4c77de2..ab26f46 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -256,8 +256,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Datum i vrijeme"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Postavljanje datuma i vremena"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Postavljanje datuma, vremena, vremenske zone i formata"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Koristi vrijeme koje definira mreža"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Koristi vremensku zonu koju definira mreža"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Postavi vrijeme automatski"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Automatski postavi vremensku zonu"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Koristi lokalni zadani format"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-satni format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Koristi 24-satni format"</string>
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Prikazuj informacije o profilu na zaključ. ekranu"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Računi"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokacija"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Koristi lokaciju"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Koristi lokaciju"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Isključeno"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Uključeno – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacija ima pristup lokaciji</item>
@@ -323,6 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaključavanje ekrana, otključavanje licem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaključavanje ekrana, otisak prsta"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zaključavanje ekrana"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Sigurno otključajte telefon licem i otiskom prsta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Možete se prijaviti i u aplikacije i potvrditi plaćanja"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Postavite otključavanje koristeći:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Otključavanje licem"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Pojednostavite otključavanje telefona"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Otisak prsta"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Otključajte telefon dok vam je u džepu"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Preskoči"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Naprijed"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Lice je dodano"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Postavite otključavanje licem"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Otključavanje licem"</string>
@@ -332,6 +341,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Koristite lice za autentifikaciju"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Započni"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ako je otključavanje licem za pristupačnost isključeno, neki koraci za postavljanje možda neće funkcionirati ispravno s Talkbackom."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Nazad"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Nastavi postavljanje"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Koristi postavku za pristupačnost"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -376,8 +388,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Kod otključavanja licem za aplikacije, uvijek tražite potvrdu"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Izbriši podatke o licu"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Postavite otključavanje licem"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Otključavanje licem možete koristiti za otključavanje uređaja, prijavu u aplikacije i potvrđivanje plaćanja.\n\nNapomena:\nTelefon možete otključati ako pogledate u njega čak i kada vam to nije namjera.\n\nVaš telefon je moguće otključati ako ga neko prinese vašem licu.\n\nVaš telefon može otključati osoba koja mnogo liči na vas, kao što je identični blizanac."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Otključavanje licem možete koristiti za otključavanje uređaja, prijavu u aplikacije i potvrđivanje plaćanja.\n\nNapomena:\nTelefon možete otključati ako pogledate u njega čak i kada vam to nije namjera.\n\nVaš telefon je moguće otključati ako ga neko prinese vašem licu čak i dok su vam oči zatvorene.\n\nVaš telefon može otključati osoba koja mnogo liči na vas, kao što je identični blizanac."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Koristite otključavanje licem za otključavanje uređaja, prijavu u aplikacije i potvrdu plaćanja."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Imajte na umu:\nTelefon možete otključati ako pogledate u njega, čak i kada vam to nije namjera.\n\nVaš telefon može otključati i neko drugi ako ga prinese vašem licu.\n\nVaš telefon može otključati osoba koja mnogo liči na vas, kao što je identični blizanac."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Imajte na umu:\nTelefon možete otključati ako pogledate u njega, čak i kada vam to nije namjera.\n\nVaš telefon može otključati i neko drugi ako ga prinese vašem licu, čak i dok su vam oči zatvorene.\n\nVaš telefon može otključati osoba koja mnogo liči na vas, kao što je identični blizanac."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Izbrisati podatke o licu?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Podaci o licu koje je koristila funkcija otključavanja licem će se trajno i sigurno izbrisati. Nakon uklanjanja, trebat će vam PIN, uzorak ili lozinka za otključavanje telefona, prijavu u aplikacije i potvrdu plaćanja."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Otključajte telefon pomoću funkcije Otključavanje licem"</string>
@@ -398,6 +411,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak prsta ne možete koristiti za otključavanje ovog uređaja. Za više informacija, obratite se administratoru svoje organizacije"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Pomoću otiska prsta otključavajte telefon ili odobravajte kupovinu.\n\nNapomena: otisak prsta može biti manje siguran od jakog uzorka ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Otkaži"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Nastavi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Naprijed"</string>
@@ -435,6 +449,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Kada zaštitite tablet opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Kada zaštitite uređaj opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i za postavljanje otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Kada zaštitite telefon opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Zaključavanje ekrana vam je potrebno i da postavite otključavanja licem. Da se vratite, dodirnite Otkaži."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Kada zaštitite tablet opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Opcija zaključavanja ekrana vam treba i da postavite biometriju. Da se vratite, dodirnite Otkaži."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Kada zaštitite uređaj opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Opcija zaključavanja ekrana vam treba i da postavite biometriju. Da se vratite, dodirnite Otkaži."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Kada zaštitite telefon opcijom zaključavanja ekrana, niko ga neće moći koristiti u slučaju da ga izgubite ili ga neko ukrade. Opcija zaključavanja ekrana vam treba i da postavite biometriju. Da se vratite, dodirnite Otkaži."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Preskočiti postavljanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Preskočiti postavljanje lozinke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Preskočiti postavljanje uzorka?"</string>
@@ -507,8 +524,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Spriječite da druge osobe koriste ovaj tablet bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Spriječite da druge osobe koriste ovaj uređaj bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Spriječite da druge osobe koriste ovaj telefon bez vašeg odobrenja tako što ćete aktivirati funkcije za zaštitu uređaja. Odaberite koji način zaključavanja ekrana želite koristiti."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Odaberite alternativni način zaključavanja ekrana"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Odaberite alternativni način zaključavanja ekrana"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Odaberite rezervni način zaključavanja ekrana"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcije zaključavanja ekrana"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcije zaključavanja ekrana"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zaključavanje ekrana"</string>
@@ -540,6 +556,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Otključavanje licem + lozinka"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Nastavite s otključavanjem licem"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Možete otključati telefon pomoću svog lica. Iz sigurnosnih razloga, ova opcija zahtijeva alternativni način zaključavanja ekrana."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrija + uzorak"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrija + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrija + lozinka"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Nastavite bez biometrije"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefon možete otključati pomoću biometrije. Iz sigurnosnih razloga, ova opcija zahtijeva rezervni način zaključavanja ekrana."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogućio administrator, pravila šifriranja ili pohrana akreditiva"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Prevlačenje prstom"</string>
@@ -627,7 +648,6 @@
       <item quantity="other">Ukupan broj cifara mora biti manji od <xliff:g id="NUMBER_1">%d</xliff:g></item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administrator uređaja ne dozvoljava korištenje nedavnog PIN-a"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Vaš IT administrator je blokirao česte PIN kôdove. Probajte drugi PIN kôd."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ne može sadržavati nevažeći znak"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Mora sadržavati najmanje jedno slovo"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Mora sadržavati najmanje jednu cifru"</string>
@@ -668,7 +688,6 @@
       <item quantity="other">Mora sadržavati najmanje <xliff:g id="COUNT">%d</xliff:g> znakova koji nisu brojevi</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administrator uređaja ne dozvoljava korištenje nedavne lozinke"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Vaš IT administrator je blokirao česte lozinke. Probajte drugu lozinku."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Nije dozvoljen rastući, opadajući ili ponavljajući niz cifara"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Otkaži"</string>
@@ -812,7 +831,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Uključite Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"WiFi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Koristi WiFi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Koristi WiFi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"WiFi postavke"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"WiFi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Podešavanje bežičnih pristupnih tačaka i upravljanje njima"</string>
@@ -920,7 +939,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrirajte QR kôd ispod da se povežete na mrežu “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Skenirajte QR kôd da se pridružite WiFi mreži"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Dijeli WiFi mrežu"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skenirajte ovaj QR kôd da se povežete s mrežom “<xliff:g id="SSID">%1$s</xliff:g>” i dijelite lozinku"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skenirajte ovaj QR kôd pomoću drugog uređaja da se pridružite mreži “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skenirajte ovaj QR kôd da se povežete s mrežom “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Pokušajte ponovo. Ako se problem ne riješi, kontaktirajte proizvođača uređaja"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Nešto nije uredu"</string>
@@ -946,8 +965,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Lozinka WiFi mreže: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Lozinka pristupne tačke: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatsko povezivanje"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Dozvoli telefonu da se automatski poveže kada je u blizini ove mreže"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Dozvoli tabletu da se automatski poveže kada je u blizini ove mreže"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Dozvolite povezivanje s ovom mrežom kada je u dometu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Dodaj uređaj"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Dodajte uređaj na ovu mrežu pomoću QR koda"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Format QR koda nije važeći"</string>
@@ -959,7 +977,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Koristi certifikate sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne navodi"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne potvrđuj valjanost"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nije naveden certifikat. Veza neće biti privatna."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Naziv mreže je predug."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Morate navesti domenu."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Potreban je certifikat."</string>
@@ -986,6 +1003,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Poveži se"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"WiFi je uključen"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Povezano s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Povezivanje s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Povezivanje…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Povezivanje na mrežu nije uspjelo"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Mreža nije u dometu"</string>
@@ -1016,6 +1034,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC adresa uređaja"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Nasumično odabrana MAC adresa"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Nasumično odabrana MAC adresa (zadnje korišteno)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresa"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalji o mreži"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podmreže"</string>
@@ -1023,8 +1042,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 adrese"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Sačuvane mreže"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Pretplate"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Druge mreže"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP postavke"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Napredne WiFi postavke nisu dostupne za ovog korisnika"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Sačuvaj"</string>
@@ -1033,8 +1051,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Unesite važeću adresu pristupnika."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Unesite važeću DNS adresu."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Unesite dužinu mrežnog prefiksa između 0 i 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (osim ako ga nije poništio privatni DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (osim ako ga nije poništio privatni DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Pristupnik"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Dužina prefiksa mreže"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"WiFi Direct"</string>
@@ -1060,7 +1078,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacija dijeli sadržaj. Za dijeljenje internetske veze isključite pa uključite pristupnu tačku"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Lozinka nije postavljena"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Naziv pristupne tačke"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Uključivanje pristupne tačke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Uključivanje pristupne tačke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Drugi uređaji se mogu povezati na pristupnu tačku <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Lozinka pristupne tačke"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP opseg"</string>
@@ -1210,7 +1228,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Glatki prikaz"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatski povećava interval osvježavanja sa 60 na 90 Hz za određeni sadržaj. Povećava potrošnju baterije."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Glatki prikaz"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Nametni brzinu osvježavanja od 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Najveća brzina osvježavanja za poboljšanu reakciju na dodir i kvalitet animacije. Povećava potrošnju baterije."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Svjesni ekran"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Uključeno / ekran se neće isključiti ako gledate u njega"</string>
@@ -1301,6 +1319,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kada je ekran zatamnjen, uključuje se zbog novih obavještenja"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Uvijek prikaži vrijeme i info."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Povećana potrošnja baterije"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Boldiranje teksta"</string>
     <string name="title_font_size" msgid="570613010306330622">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Povećajte ili smanjite tekst"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Postavke zaključavanja SIM kartice"</string>
@@ -1350,7 +1369,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Verzija Androida"</string>
     <string name="security_patch" msgid="4071756145347865382">"Sigurnosno ažuriranje za Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model i hardver"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Verzija hardvera"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID opreme"</string>
@@ -1599,7 +1617,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Izbriši APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Novi APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Sačuvaj"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Odbaci"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Otkaži"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Polje Ime ne može ostati prazno."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Naziv pristupne tačke ne može biti prazan."</string>
@@ -1614,8 +1632,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Aplikacije se mogu vratiti na zadano"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Vrati WiFi, mobilnu i Bluetooth vezu na zadano"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Sve postavke mreže vratit će se na zadano, uključujući:\n\n"<li>"WiFi"</li>\n<li>"Prijenos podataka na mobilnoj mreži"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Izbriši"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Izbriši preuzete SIM-ove"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Za preuzimanje zamjenskih SIM-ova, obratite se svom mobilnom operateru. Ovim se neće otkazati nijedan paket mobilne usluge."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Ovim se neće otkazati paketi mobilnih usluga. Da preuzmete zamjenske SIM-ove, kontaktirajte svog mobilnog operatera."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Vrati postavke na zadano"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Vratiti sve postavke mreže na zadano? Ovu radnju ne možete poništiti."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Vratiti sve postavke mreže na zadano i izbrisati preuzete SIM-ove? Ovu radnju ne možete poništiti."</string>
@@ -1625,31 +1644,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Postavke mreže vraćene su na zadano"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nije moguće izbrisati SIM-ove"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Preuzete SIM-ove nije moguće izbrisati zbog greške.\n\nPonovo pokrenite uređaj i pokušajte ponovo."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Izbriši sve podatke (vraćanje na fabričke postavke)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Potpuno izbriši sve podatke"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Na ovaj način će se izbrisati svi podaci "<b>"interne memorije"</b>" tableta, uključujući:\n\n"<li>"Google račun"</li>\n<li>"sistemske i aplikacijske podatke i postavke"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Na ovaj način će se izbrisati svi podaci "<b>"interne memorije"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Trenutno ste prijavljeni u sljedeće račune:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Drugi korisnici su prisutni na ovom uređaju.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ove"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Ovim se neće otkazati vaš plan usluga mobilnog operatera."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Da biste izbrisali muziku, slike i ostale korisničke podatke, "<b>"SD kartica"</b>" treba biti izbrisana."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Potpuno izbriši sve podatke (vraćanje na fabričke postavke)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Potpuno izbriši sve podatke (vraćanje na fabričke postavke)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ovim će se u potpunosti izbrisati svi podaci "<b>"unutrašnje memorije"</b>" tableta, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ovim će se potpuno izbrisati svi podaci "<b>"unutrašnje memorije"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sistema i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Trenutno ste prijavljeni na sljedećim računima:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Drugi korisnici su prisutni na ovom uređaju.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"muziku"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ove"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ovim se neće otkazati vaš plan usluga mobilnog operatera."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Da obrišete muziku, slike i druge korisničke podatke, potrebno je potpuno izbrisati podatke s "<b>"USB memorije"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Da obrišete muziku, slike i druge korisničke podatke, potrebno je potpuno izbrisati podatke sa "<b>"SD kartice"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Izbriši USB pohranu"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Izbriši SD karticu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Izbrišite sve podatke na unutrašnjoj USB pohrani, poput muzike ili fotografija"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Izbrišite sve podatke na SD kartici, poput muzike ili fotografija"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Izbriši sve podatke"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Izbriši sve podatke"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Izbrisat će se svi vaši lični podaci i preuzete aplikacije. Ne možete poništiti ovu radnju."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Izbrisat će se svi vaši lični podaci, uključujući preuzete aplikacije i SIM-ove. Ne možete poništiti ovu radnju."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Izbriši sve"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Resetovanje nije izvršeno jer usluga Brisanje sistema nije dostupna."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Izbrisati sve podatke?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Vraćanje na fabričke postavke nije dostupno za ovog korisnika"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Brisanje u toku"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Pričekajte..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Potpuno izbriši sve podatke"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Potpuno izbriši sve podatke"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Izbrisat će se svi vaši lični podaci i preuzete aplikacije. Ne možete poništiti ovu radnju."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Izbrisat će se svi vaši lični podaci, uključujući preuzete aplikacije i SIM-ove. Ne možete poništiti ovu radnju."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Potpuno izbrisati sve podatke?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Vraćanje na fabričke postavke nije dostupno za ovog korisnika"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Brisanje"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Pričekajte…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Postavke poziva"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Postavite govornu poštu, prosljeđivanje poziva, poziv na čekanju, ID pozivaoca"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Povezivanje mobitela USB-om"</string>
@@ -1697,7 +1714,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Nije se moguće povezati sa više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Prestat će se dijeliti veza s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Povezivanje putem mobitela za Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Dijeljenje internetske veze telefona putem USB etherneta"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Dijeljenje internetske veze telefona putem etherneta"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Koristite pristupnu tačku i povezivanje putem mobitela za pružanje interneta drugim uređajima putem veze za prijenos podataka na mobilnoj mreži. Aplikacije također mogu kreirati pristupne tačke za dijeljenje sadržaja s uređajima u blizini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Koristite pristupnu tačku i povezivanje putem mobitela za pružanje interneta drugim uređajima putem WiFi mreže ili veze za prijenos podataka na mobilnoj mreži. Aplikacije također mogu kreirati pristupne tačke za dijeljenje sadržaja s uređajima u blizini."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomoć"</string>
@@ -1740,6 +1757,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skeniranje Bluetootha"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dozvolite aplikacijama i uslugama da skeniraju uređaje u blizini u svakom trenutku, čak i kada je Bluetooth isključen. Ovim se, naprimjer, mogu poboljšati funkcije i usluge zasnovane na lokaciji."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Otkrivanje vremenske zone pomoću lokacije"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Otkrivanje vremenske zone pomoću lokacije"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Omogućava korištenje lokacije uređaja radi određivanja trenutne vremenske zone. Ostale postavke lokacije kao što je skeniranje WiFi mreže mogu uticati na preciznost otkrivanja vremenske zone."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Uključeno"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Isključeno"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatsko određivanje vremenske zone je onemogućeno"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Otkrivanje vremenske zone pomoću lokacije je onemogućeno"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Otkrivanje vremenske zone pomoću lokacije nije podržano"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Promjene otkrivanja vremenske zone pomoću lokacije nisu dozvoljene"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Lokacija WiFi i mobilne mreže"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Omogućava da aplikacije koriste Googleovu uslugu lokacije kako bi brže procijenile vašu lokaciju. Anonimni podaci o lokaciji se prikupljaju i šalju Googleu."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Lokacija utvrđena putem WiFi mreže"</string>
@@ -1803,6 +1829,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Za otključavanje licem postavite lozinku"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Za otključavanje licem, postavite uzorak"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Za otključavanje licem, postavite PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Da koristite biometriju, postavite lozinku"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Da koristite biometriju, postavite uzorak"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Da koristite biometriju, postavite PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Zaboravili ste lozinku?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Zaboravili ste uzorak?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Zaboravili ste PIN?"</string>
@@ -2141,13 +2170,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Postavke titlova"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Uvećavanje"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Područje uvećavanja"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Omogućavanje uvećavanja"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Odabir područja uvećavanja koja želite koristiti prilikom uvećavanja ekrana"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Cijeli ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Dio ekrana"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Cijeli ekran i dio ekrana"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Povećavanje cijelog ekrana"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Uvećavanje dijela ekrana"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Prebaciti na dugme Pristupačnost?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Trostruki dodir za uvećavanje dijela ekrana će prouzrokovati kašnjenje unosa teksta i drugih radnji. \n\nŽelite li prebaciti na korištenje dugmeta Pristupačnost za uvećavanje?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Prebaci na dugme Pristupačnost"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Zadrži trostruki dodir za uvećavanje"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Postavke uvećavanja"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Uvećavanje trostrukim dodirom"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Uvećavanje pomoću prečice"</string>
@@ -2201,11 +2233,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Dugme uklj./isklj. prekida poziv"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Veliki pokazivač miša"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Ukloni animacije"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono zvuk"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balans zvuka"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Lijevo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Desno"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono zvuk"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balans zvuka"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Lijevo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Desno"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Zadano"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekundi"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekundi"</string>
@@ -2235,11 +2267,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibracija obavještenja"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibracija pri zvonu"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Vibracija na dodir"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Koristi <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otvori aplikaciju <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Koristi ispravku boje"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Prikaži titlove"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Samo za podržane aplikacije"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Korištenje aplikacije <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otvaranje aplikacije <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Koristi ispravku boja"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Prikaži titlove"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Samo za podržane aplikacije"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Veličina i stil titlova"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Veličina teksta: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Više opcija"</string>
@@ -2270,6 +2302,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Nijanse sive"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno-zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo-žuto"</string>
@@ -2405,7 +2438,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ograničenje rada u pozadini"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Dopustite aplikaciji da radi u pozadini"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikaciji nije dopušteno da radi u pozadini"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Nije moguće ograničiti upotrebu u pozadini"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Nije moguće ograničiti upotrebu u pozadini"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ograničiti aktivnost u pozadini?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ako aplikaciji ograničite aktivnost u pozadini, može raditi nepravilno"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikaciju ne možete ograničiti jer nije postavljena optimizacija baterije.\n\nDa je ograničite prvo uključite optimizaciju."</string>
@@ -2454,6 +2487,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Koristili ste tablet više nego obično"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Koristili ste uređaj više nego obično"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Baterija bi vam se mogla isprazniti brže nego obično"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimiziranje radi očuvanja baterije"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Baterija je privremeno ograničena. Dodirnite da saznate više."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Vaš telefon je korišten više nego obično. Baterija se može istrošiti brže nego što je predviđeno.\n\nAplikacije koje najviše troše bateriju:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Vaš tablet je korišten više nego obično. Baterija se može istrošiti brže nego što je predviđeno.\n\nAplikacije koje najviše troše bateriju:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Vaš uređaj je korišten više nego obično. Baterija se može istrošiti brže nego što je predviđeno.\n\nAplikacije koje najviše troše bateriju:"</string>
@@ -2516,6 +2551,8 @@
       <item quantity="other">Ograničeno je %1$d aplikacija</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Došlo je do problema prilikom očitavanja mjerača stanja baterije"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Došlo je do problema prilikom očitavanja mjerača stanja baterije. Dodirnite da "<annotation id="url">"saznate više"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Želite zaustaviti aplikaciju?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Vaš telefon ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno drži vaš telefon aktivnim.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju.\n\nAko se problem ne riješi, možda ćete trebati deinstalirati aplikaciju da poboljšate rad baterije."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Vaš tablet ne može normalno upravljati baterijom jer aplikacija <xliff:g id="APP">%1$s</xliff:g> stalno drži vaš tablet aktivnim.\n\nDa pokušate riješiti ovaj problem, možete zaustaviti aplikaciju.\n\nAko se problem ne riješi, možda ćete trebati deinstalirati aplikaciju da poboljšate rad baterije."</string>
@@ -2629,9 +2666,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Postavite raspored"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Produžite vijek trajanja baterije"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Isključi nakon punjenja"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Ušteda baterije se isključuje kada je baterija telefona napunjena <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Ušteda baterije se isključuje kada je baterija tableta napunjena <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Ušteda baterije se isključuje kada je baterija uređaja napunjena <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Ušteda baterije se isključuje kada se telefon napuni više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Ušteda baterije se isključuje kada se tablet napuni više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Ušteda baterije se isključuje kada se uređaj napuni više od <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Uključi"</string>
@@ -2696,6 +2733,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Vrati na zadano"</string>
     <string name="tts_play" msgid="2945513377250757221">"Pokreni"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Prilagodljiva povezivost"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Produžava vijek trajanja baterije i poboljšava performanse uređaja automatskim upravljanjem vaših mrežnih veza"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Pohrana akreditiva"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instaliranje certifikata"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instaliranje certifikata iz pohrane"</string>
@@ -2707,9 +2746,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Korisnički akreditivi"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Prikaz i izmjena pohranjenih akreditiva"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Napredno"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Vrsta pohrane"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Sa hardverskom podlogom"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverski"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Akreditivi nisu dostupni za ovog korisnika"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirani za VPN i aplikacije"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalirani za WiFi mrežu"</string>
@@ -2725,6 +2761,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Nemoj instalirati"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Ipak instaliraj"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Potvrda nije instalirana"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Dozvoliti aplikaciji <xliff:g id="APP_NAME">%s</xliff:g> da instalira certifikate na ovaj uređaj?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Ovi certifikati će vas identificirati aplikacijama i URL-ovima ispod"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Nemoj dozvoliti"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Dozvoli"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Prikaži više"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Apl. za upravljanje certifik."</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Nema"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certifikati koje je instalirala ova aplikacija vas identificiraju aplikacijama i URL-ovima navedenim u nastavku"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Ukloni"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Signal za hitne pozive"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Postavi ponašanje prilikom upućivanja poziva za hitne situacije"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Izrada sigurnosnih kopija"</string>
@@ -3053,7 +3098,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nije postavljen – Radni profil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Vi (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nadimak"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Možete dodati do <xliff:g id="USER_COUNT">%1$d</xliff:g> korisnika"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Samo vlasnik tableta može upravljati korisnicima."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Samo vlasnik telefona može upravljati korisnicima."</string>
@@ -3103,7 +3147,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Plaćanje na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Postavite aplikaciju za plaćanje, zatim jednostavno prislonite poleđinu svog telefona uz bilo koji terminal označen simbolom beskontaktnog povezivanja."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Razumijem"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Više..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Više…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Postavite zadanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ažurirajte zadanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na terminalu za beskontaktno plaćanje, platite koristeći aplikaciju <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3173,9 +3217,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Nazad"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Naprijed"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Kraj"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Snimite fotografiju"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Odaberite sliku"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Odaberite fotografiju"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartice"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartice"</string>
@@ -3187,7 +3228,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Uvijek koristi ovo za pozive"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Odaberite SIM za podatke"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Odaberite SIM za SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Prebacuje se SIM za prijenos podataka. Ovo može potrajati najviše jednu minutu..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Prebacivanje SIM-a za prijenos podataka. Ovo može potrajati najviše jednu minutu…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Poziv putem"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Odaberite SIM karticu"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3372,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, raspored, ušteda baterije, ušteda energije, baterija, automatski, procenat"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, napredno pozivanje, 4g pozivanje"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dodavanje jezika, dodaj jezik"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"veličina teksta"</string>
     <string name="default_sound" msgid="6604374495015245195">"Podrazumijevani zvuk"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Zvuk zvona i obavještenja postavljen je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Jačina zvuka, vibracija, Ne ometaj"</string>
@@ -3370,12 +3412,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Uključivanje zvukova"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Automatski titlovi"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatski titluj medije"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nema"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Postavljen je <xliff:g id="ON_COUNT">%d</xliff:g> raspored</item>
-      <item quantity="few">Postavljena su <xliff:g id="ON_COUNT">%d</xliff:g> rasporeda</item>
-      <item quantity="other">Postavljeno je <xliff:g id="ON_COUNT">%d</xliff:g> rasporeda</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nema}=1{Postavljen je 1 raspored}one{Postavljen je # raspored}few{Postavljena su # rasporeda}other{Postavljeno je # rasporeda}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne ometaj"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Primajte obavještenja samo od važnih osoba i aplikacija"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograničite ometanja"</string>
@@ -3443,22 +3480,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Samo prioriteti"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Uključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Isključeno / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Isključeno"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Uključeno"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pitaj svaki put"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dok ne isključite"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> sat</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> sata</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> sati</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> raspored se može automatski uključiti</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda se mogu automatski uključiti</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda se može automatski uključiti</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 sat}one{# sat}few{# sata}other{# sati}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuta}one{# minuta}few{# minute}other{# minuta}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Isključeno}=1{Isključeno/1 raspored se može automatski uključiti}one{Isključeno/# raspored se može automatski uključiti}few{Isključeno/# rasporeda se mogu automatski uključiti}other{Isključeno/# rasporeda se može automatski uključiti}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Šta može prekinuti funkciju Ne ometaj"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Osobe"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
@@ -3504,6 +3531,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Obavještenja niskog prioriteta automatski će se postaviti na Diskretno"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Prilagodljivo rangiranje obavještenja"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatski rangira obavještenja prema relevantnosti"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivim obavještenjima"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Pokazivanje prilagođavanja obavještenja i prikaz opcije za pružanje povratnih informacija sistemu"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Poništite važnost obavještenja"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Poništite postavke o važnosti koje je promijenio korisnik i dozvolite da asistent za obavještenja određuje prioritete"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predložene radnje i odgovori"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatski se prikazuju predložene radnje i odgovori"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Pregledajte nedavna i odgođena obavještenja"</string>
@@ -3602,8 +3633,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioritetni razgovori"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Prikazuju se na vrhu odjeljka za razgovor u vidu plutajućih oblačića"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Prikazuju se na vrhu odjeljka za razgovor"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Ostali razgovori"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Razgovori koji nisu prioritetni"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Razgovori koje ste mijenjali"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Nedavni razgovori"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Obriši nedavno"</string>
+    <string name="clear" msgid="5092178335409471100">"Obriši"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Smjesti prioritetne razgovore u oblačiće"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritetni razgovori se prikazuju na vrhu padajuće trake. Razgovore možete postaviti i u oblačić i prekinuti funkciju Ne ometaj."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Ovdje će se prikazati prioritetni i promijenjeni razgovori"</string>
@@ -3705,7 +3739,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Pristup načinu rada Ne ometaj"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Dozvoli način rada Ne ometaj"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nijedna instalirana aplikacija nije zatražila pristup za Ne ometaj"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Učitavaju se aplikacije..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Učitavanje aplikacija…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Na vaš zahtjev, Android blokira pojavljivanje obavještenja iz ove aplikacije na ovom uređaju"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Na vaš zahtjev, Android blokira pojavljivanje ove kategorije obavještenja na ovom uređaju"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Na vaš zahtjev, Android blokira pojavljivanje ove grupe obavještenja na ovom uređaju"</string>
@@ -3800,12 +3834,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Svi razgovori"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritetni razgovori"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nema"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovor</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovora</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovora</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nema"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nema}=1{1 razgovor}one{# razgovor}few{# razgovora}other{# razgovora}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ko vas može prekinuti"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Pozivi"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Pozivi"</string>
@@ -3814,12 +3843,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Da se uvjerite da ćete čuti dozvoljene pozive, provjerite je li uređaj postavljen da zvoni"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Dolazni pozivi su blokirani za raspored \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Postavke možete podesiti da omogućite prijateljima, porodici ili drugim kontaktima da vas kontaktiraju."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakti označeni zvjezdicom"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-      <item quantity="few">još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osobe</item>
-      <item quantity="other">još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ništa"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nema}=1{{contact_1}}=2{{contact_1} i {contact_2}}=3{{contact_1}, {contact_2} i {contact_3}}one{{contact_1}, {contact_2} i još # kontakt}few{{contact_1}, {contact_2} i još # kontakta}other{{contact_1}, {contact_2} i još # kontakata}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Bez imena)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Poruke"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"poruke"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Poruke"</string>
@@ -3828,12 +3853,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Dolazne poruke su blokirane za raspored \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Postavke možete podesiti da prijateljima, porodici ili drugim kontaktima dozvolite da vas kontaktiraju."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Primate sve poruke"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Primate sve pozive"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ništa"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakt</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakta</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakata</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nema}=1{1 kontakt}one{# kontakt}few{# kontakta}other{# kontakata}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Svako"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakti"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakti označeni zvjezdicom"</string>
@@ -3871,24 +3891,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Sva obavještenja"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Neka obavještenja"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Odabrane osobe vas i dalje mogu kontaktirati čak i ako ne dozvolite aplikacijama da vas prekidaju"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Aplikacije <xliff:g id="APP_NAMES">%s</xliff:g> mogu prekinuti</item>
-      <item quantity="few">Aplikacije <xliff:g id="APP_NAMES">%s</xliff:g> mogu prekinuti</item>
-      <item quantity="other">Aplikacije <xliff:g id="APP_NAMES">%s</xliff:g> mogu prekinuti</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nijedna aplikacija ne može prekinuti}=1{Aplikacija {app_1} može prekinuti}=2{Aplikacije {app_1} i {app_2} mogu prekinuti}=3{Aplikacije {app_1}, {app_2} i {app_3} mogu prekinuti}one{Aplikacije {app_1}, {app_2} i još # njih mogu prekinuti}few{Aplikacije {app_1}, {app_2} i još # njih mogu prekinuti}other{Aplikacije {app_1}, {app_2} i još # njih mogu prekinuti}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacije"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Sva obavještenja"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Neka obavještenja"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Obavještenja koja vas mogu prekinuti"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Dozvoli sva obavještenja"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Zvukovi <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekinuti</item>
-      <item quantity="few">Zvukovi <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekinuti</item>
-      <item quantity="other">Zvukovi <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekinuti</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ništa ne može prekinuti"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ništa ne može prekinut}=1{Zvuk {sound_category_1} može prekinuti}=2{Zvukovi {sound_category_1} i {sound_category_2} mogu prekinuti}=3{Zvukovi {sound_category_1}, {sound_category_2} i {sound_category_3} mogu prekinuti}one{Zvukovi {sound_category_1}, {sound_category_2} i još # njih mogu prekinuti}few{Zvukovi {sound_category_1}, {sound_category_2} i još # njih mogu prekinuti}other{Zvukovi {sound_category_1}, {sound_category_2} i još # njih mogu prekinuti}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ništa ne može prekinuti"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niko ne može prekinuti"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Neke osobe mogu prekinuti"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Sve osobe mogu prekinuti"</string>
@@ -3936,8 +3946,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Uključeno"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Isključeno"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Kačenje aplikacije"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Kačenje aplikacije omogućava da se trenutna aplikacija zadrži na ekranu dok je ne otkačite. Naprimjer, koristeći ovu funkciju možete omogućiti pouzdanom prijatelju da igra određenu igru. \n\nKada je aplikacija zakačena, ona može otvoriti druge aplikacije i omogućiti pristup ličnim podacima. \n\nDa koristite kačenje aplikacije: 	\n1.	Uključite kačenje aplikacije 	\n2.	Otvorite Pregled 	\n3.	Dodirnite ikonu aplikacije na vrhu ekrana, a zatim dodirnite Zakači"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Kačenje aplikacije omogućava da se trenutna aplikacija zadrži na ekranu dok je ne otkačite. Naprimjer, koristeći ovu funkciju možete omogućiti pouzdanom prijatelju da igra određenu igru. \n\nKada je aplikacija zakačena, ona može otvoriti druge aplikacije i omogućiti pristup ličnim podacima. \n\nAko želite podijeliti uređaj s nekim na siguran način, pokušajte koristiti profil za gosta korisnika. \n\nDa koristite kačenje aplikacije: 	\n1.	Uključite kačenje aplikacije 	\n2.	Otvorite Pregled 	\n3.	Dodirnite ikonu aplikacije na vrhu ekrana, a zatim dodirnite Zakači"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Kačenje aplikacije omogućava da se trenutna aplikacija zadrži na ekranu dok je ne otkačite. Naprimjer, koristeći ovu funkciju možete omogućiti pouzdanom prijatelju da igra određenu igru."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Kada je aplikacija zakačena, ona može otvoriti druge aplikacije i omogućiti pristup ličnim podacima. \n\nDa koristite kačenje aplikacije: 	\n1.	Uključite kačenje aplikacije 	\n2.	Otvorite Pregled 	\n3.	Dodirnite ikonu aplikacije na vrhu ekrana, a zatim dodirnite Zakači"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Kada je aplikacija zakačena, ona može otvoriti druge aplikacije i omogućiti pristup ličnim podacima. \n\nAko želite dijeliti uređaj s nekim na siguran način, pokušajte koristiti profil za gosta korisnika. \n\nDa koristite kačenje aplikacije: 	\n1.	Uključite kačenje aplikacije 	\n2.	Otvorite Pregled 	\n3.	Dodirnite ikonu aplikacije na vrhu ekrana, a zatim dodirnite Zakači"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Kada je aplikacija zakačena: \n\n•		Lični podaci mogu biti dostupni \n		(kao što su kontakti i sadržaj e-pošte) \n•		Zakačena aplikacija može otvoriti druge aplikacije \n\nKačenje aplikacije koristite samo s osobama kojima vjerujete."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Traži uzorak za otključavanje prije poništavanja kačenja"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Traži PIN prije poništavanja kačenja"</string>
@@ -3959,6 +3970,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Osim otključavanja pomoću lica, uređaj možete dodatno zaštititi zahtjevom za unos PIN-a prije pokretanja. Dok se uređaj ne pokrene, neće se moći primati pozivi, poruke ili obavještenja, uključujući i alarme.\n\nNa ovaj način se štite podaci na izgubljenim ili ukradenim uređajima. Zahtijevati PIN za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Osim otključavanja pomoću lica, uređaj možete dodatno zaštititi zahtjevom za unos uzorka prije pokretanja. Dok se uređaj ne pokrene, neće se moći primati pozivi, poruke ili obavještenja, uključujući i alarme.\n\nNa ovaj način se štite podaci na izgubljenim ili ukradenim uređajima. Zahtijevati uzorak za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Osim otključavanja pomoću lica, uređaj možete dodatno zaštititi zahtjevom za unos lozinke prije pokretanja. Dok se uređaj ne pokrene, neće se moći primati pozivi, poruke ili obavještenja, uključujući i alarme.\n\nNa ovaj način se štite podaci na izgubljenim ili ukradenim uređajima. Zahtijevati lozinku za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Osim korištenja biometrije za otključavanje, uređaj možete dodatno zaštiti zahtijevanjem unošenja PIN-a prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme.\n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja zahtijeva PIN?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Osim korištenja biometrije za otključavanje, uređaj možete dodatno zaštiti zahtijevanjem unošenja uzorka prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme.\n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja zahtijeva uzorak?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Osim korištenja biometrije za otključavanje, uređaj možete dodatno zaštiti zahtijevanjem unošenja lozinke prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme.\n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja zahtijeva lozinka?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Da"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ograničena"</string>
@@ -4142,7 +4156,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-om upravlja"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Povezani uređaj"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ovaj uređaj"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Prebacivanje…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Prebacivanje…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Prebacivanje nije uspjelo"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Punjenje ovog uređaja"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Punjenje povezanog uređaja"</string>
@@ -4340,6 +4354,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Prijenos podataka na mobilnoj mreži"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Prijenos podataka u aplikaciji"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Prijenos podataka putem WiFi-ja"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Prijenos podataka mimo mobilnog operatera"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Prijenos podataka putem Etherneta"</string>
     <string name="wifi" msgid="2932584495223243842">"WiFi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4359,6 +4374,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Obračun podataka koji vrši operater se može razlikovati od obračuna koji vrši uređaj."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ne obuhvata podatke koje koriste mreže mobilnog operatera"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Iskorišteno je <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Postavi upozor. o prij. podat."</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozorenje o prijenosu podataka"</string>
@@ -4396,7 +4412,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Prikaži detalje"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Ušteda podataka"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neograničen prijenos podataka"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Pozadinski podaci su isključeni"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Pozadinski podaci su isključeni"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Uključeno"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Isključeno"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Koristi funkciju Ušteda podataka"</string>
@@ -4419,7 +4435,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ako je uređaj zaključan, spriječiti kucanje odgovora ili drugog teksta u obavijestima"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Zadana provjera pravopisa"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Odaberite provjeru pravopisa"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Koristi provjeru pravopisa"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Koristi provjeru pravopisa"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nije odabrano"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ništa)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4529,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Radi lakšeg oslobađanja prostora za pohranu, upravitelj pohranom s vašeg uređaja uklanja sigurnosne kopije fotografija i videozapisa."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Ukloni fotografije i videozapise"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Upravitelj prostora za pohranu"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Koristi Upravitelja pohrane"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Koristi Upravitelja pohrane"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatski"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ručno"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Oslobodite prostor odmah"</string>
@@ -4551,6 +4567,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dodirnite dvaput da provjerite telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Provjera tableta dvostrukim dodirom"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Provjera uređaja dvostrukim dodirom"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Prevucite za obavještenja"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Prevucite prema dolje na dnu ekrana da prikažete obavještenja"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Način rada jednom rukom"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Koristi način rada jednom rukom"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Izađi pri prebacivanju između aplikacija"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Isteklo vrijeme"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunde"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekundi"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekundi"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"mogućnost dosega"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Dvaput dodirnite ekran da provjerite vrijeme, obavještenja i druge informacije."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Podignite da provjerite telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Podignite za provjeru tableta"</string>
@@ -4563,6 +4589,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dodirnite da provjerite tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dodirnite da provjerite uređaj"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Da provjerite vrijeme, obavještenja i druge informacije, dodirnite ekran."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Pomoć u hitnim slučajevima"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Koristite pomoć u hitnim slučajevima"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Funkcijom upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Pokrenite radnje ispod brzim pritiskanjem dugmeta za uključivanje 5 ili više puta"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Reproduciraj alarm s odbrojavanjem"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Reproduciranje glasnog zvuka prije slanja obavještenja za pomoć"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Poziv za pomoć"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Broj za pomoć"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Dodirnite da promijenite"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Ako unesete broj koji nije za hitne slučajeve:\n • Vaš uređaj mora biti otključan kako biste koristili pomoć u hitnim slučajevima\n • Možda nećete dobiti odgovor na poziv"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Prevucite prstom za obavještenja"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Prevlačenje prstom"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Da provjerite obavještenja, prevucite prstom prema dolje po senzoru za otisak prsta na poleđini uređaja."</string>
@@ -4695,6 +4731,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maksimalan broj vidljivih kompleta podataka"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Vraćanje na zadane vrijednosti"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Opcije za programere za automatsko popunjavanje su vraćene na zadane postavke"</string>
+    <string name="location_category" msgid="3496759112306219062">"Lokacija"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Pokazatelj lokacije na statusnoj traci"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Prikaz za sve lokacije, uključujući mreže i povezivost"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Prisilno omogući potpuno GNSS mjerenje"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Praćenje svih konstelacija i frekvencija GNSS-a bez ciklusa rada"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema uređaja"</string>
     <string name="default_theme" msgid="4815428567082263639">"Zadano"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Naziv mreže"</string>
@@ -4711,8 +4752,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pauzirajte obavještenja da ostanete fokusirani"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funkcija nije dostupna"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Ova funkcija je isključena jer usporava vaš telefon"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Prisilno omogući potpuno GNSS mjerenje"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Praćenje svih konstelacija i frekvencija GNSS-a bez ciklusa rada"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Uvijek prikaži dijaloški okvir za pad aplikacije"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Prikaz dijaloškog okvira pri svakom padu aplikacije"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Odaberite aplikaciju u kojoj je omogućen ANGLE"</string>
@@ -4724,7 +4763,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogućeno za sve aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Odabir drajvera za grafiku"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Zadano"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Drajver za igru"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Drajver za igru"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Drajver programera"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Drajver za grafiku sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4780,7 +4819,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Uključeno (isključen zvuk)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Isključeno"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detalji o mreži"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Naziv uređaja mogu vidjeti aplikacije na telefonu. Mogu ga vidjeti i druge osobe kada se povežete na Bluetooth uređaje ili postavite WiFi pristupnu tačku."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Aplikacije na vašem telefonu će moći vidjeti naziv vašeg uređaja. Također će ga moći vidjeti druge osobe prilikom povezivanja s Bluetooth uređajima i WiFi mrežom ili prilikom postavljanja WiFi pristupne tačke."</string>
     <string name="devices_title" msgid="649715719278562515">"Uređaji"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Sve postavke"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Prijedlozi"</string>
@@ -4793,6 +4832,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nisu pronađene mreže. Pokušajte ponovo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(zabranjeno)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nema SIM kartice"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nema SIM-a"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nema"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Potreban je SIM da se povežete"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Potreban je SIM operatera <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> da se povežete"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferirani način rada mreže: preferiraj WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferirani način rada mreže: samo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferirani način rada mreže: samo WCDMA"</string>
@@ -4846,6 +4890,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Prijenos podataka na mobilnoj mreži"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Pristup prijenosu podataka putem mobilne mreže"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon će se automatski prebaciti na ovog operatera kada bude u dometu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Sim kartica nije dostupna"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Postavke za pozive"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Postavke za SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pitaj svaki put"</string>
@@ -4907,6 +4952,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada ste povezani s operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Pogledajte više"</string>
     <string name="see_less" msgid="2642392725363552793">"Prikaži manje"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Uključiti operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Uključiti SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Prebaciti na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Prebaciti se na korištenje SIM kartice?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"U jednom trenutku može biti aktivan samo jedan SIM.\n\nPrebacivanjem na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati usluga mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Aktivan može biti samo po jedan SIM.\n\nPrebacivanjem na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati usluga mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"U jednom trenutku može biti aktivan samo jedan SIM.\n\nPrebacivanjem se neće otkazati usluga mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Prebaci na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Povezivanje s mrežom…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Prebacivanje na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nije moguće zamijeniti mobilne operatere"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Nije moguće zamijeniti mobilne operatere zbog greške."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Isključiti operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Isključiti SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Isključivanje SIM-a<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nije moguće onemogućiti mobilnog operatera"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Nešto nije uredu i nismo mogli onemogućiti vašeg operatera."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Koristiti 2 SIM-a?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Na uređaju mogu istovremeno biti 2 aktivna SIM-a. Da nastavite koristiti po 1 SIM, dodirnite \"Ne, hvala\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Ponovo pokrenuti uređaj?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Da započnete, ponovo pokrenite uređaj. Zatim možete dodati još jedan SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Nastavi"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Ponovo pokreni"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Prebaci"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nije moguće aktivirati SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izvadite SIM karticu i ponovo je umetnite. Ako se problem ne riješi, ponovo pokrenite uređaj."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pokušajte ponovo uključiti SIM. Ako se problem ne riješi, ponovo pokrenite uređaj."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktiviranje mreže"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operater <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivan"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dodirnite da ažurirate postavke SIM-a"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM kartica"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Potpuno izbrisati ovaj preuzeti SIM?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Ako potpuno izbrišete ovaj SIM, s ovog uređaja će se ukloniti usluga operatera <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>.\n\nUsluga za operatera <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> neće se otkazati."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Potpuno izbriši"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Potpuno brisanje SIM-a…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Nije moguće potpuno izbrisati SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Nije moguće potpuno izbrisati ovaj SIM zbog greške.\n\nPonovo pokrenite uređaj i pokušajte ponovo."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Povezivanje s uređajem"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacija <xliff:g id="APPNAME">%1$s</xliff:g> želi koristiti privremenu WiFi mrežu da se poveže s vašim uređajem"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nije pronađen nijedan uređaj Provjerite jesu li uređaji uključeni i dostupni za povezivanje."</string>
@@ -4980,6 +5063,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Hitni pozivi"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Vaš operater ne podržava hitne pozive preko funkcije Pozivanje putem WiFi-ja.\nUređaj će se automatski prebaciti na mobilnu mrežu kako bi se uspostavio hitni poziv.\nHitni pozivi su mogući samo na područjima pokrivenim mobilnom mrežom."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Korištenje WiFi-ja za pozive radi poboljšanja kvaliteta"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Pozivanje na različitim SIM-ovima"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Dozvolite pozive i SMS-ove drugog SIM-a putem ovog SIM-a."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"pozivanje na različitim SIM-ovima"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Dolazna MMS poruka"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Nije moguće poslati MMS poruku"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Dodirnite da dozvolite MMS poruke na mreži <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> kada je isključen prijenos podataka na mobilnoj mreži"</string>
@@ -5031,10 +5117,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dozvolite preklapanja ekrana na Postavkama"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dozvolite aplikacijama koje mogu prikazivati preko drugih aplikacija da preklapaju ekrane Postavki"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Mediji"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Sakrij plejer kada se sesija medija završi"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Ovaj plejer omogućava da nastavite sesiju iz proširene ploče Brze postavke."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media plejer u Brzim postavkama"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Prikažite Medija plejer produženi period da s lakoćom nastavite reprodukciju"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Sakrij plejer"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Prikaži plejer"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nema dostupnih plejera"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Odobrene aplikacije"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"mediji"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth će se uključiti"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Uključeno"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Isključeno"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-ovi"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Mreže sigurne za korištenje u avionu"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Pronađite mreže sigurne za korištenje u avionu i povežite se s njima"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sigurno za rad u avionu"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Pozivanje putem WiFi-ja"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Uspostavljajte i primajte pozive putem mreža koje ne pripadaju mobilnom operateru, kao što je WiFi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Pozivanje putem WiFi-ja vam omogućava da uspostavite i primate pozive putem mreža koje ne pripadaju mobilnom operateru, kao što su neke WiFi mreže."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Pozivi"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferirano"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"preferiraju se pozivi"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"preferiraju se SMS-ovi"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"nedostupno"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM-a"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Postavke"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povežite se s javnim mrežama"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežični, podaci, wifi, wi-fi, wi fi, celularni, mobilni, mobilni operater, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Pogledajte mreže sigurne za avion"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Isključite način rada u avionu"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nedostupno jer je uključen način rada za spavanje"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Poništavanje važnosti obavještenja je završeno."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacije"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nepouzdani uređaj želi pristupiti vašim porukama. Dodirnite za detalje."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Dozvoliti pristup porukama?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nepouzdani Bluetooth uređaj, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], želi pristupiti vašim porukama.\n\nNiste se prije povezivali s uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nepouzdani uređaj želi pristupiti vašim kontaktima i zapisniku poziva. Dodirnite za detalje."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Dozvoliti pristup kontaktima i zapisniku poziva?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nepouzdani Bluetooth uređaj, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], želi pristupiti vašim kontaktima i zapisniku poziva. To obuhvata podatke o dolaznim i odlaznim pozivima.\n\nNiste se prije povezivali s uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 30fa788..638f2f9 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Mitjà"</item>
     <item msgid="6740026006576843477">"Llarg"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Curt"</item>
+    <item msgid="7397961711906421599">"Mitjà"</item>
+    <item msgid="4079132024502041928">"Llarg"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predeterminat"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Només TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 885413e..4072467 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Data i hora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Estableix la data i l\'hora"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Defineix la data, l\'hora, la zona horària i els formats"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Utilitza l\'hora proporcionada per la xarxa"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Utilitza la zona horària proporcionada per la xarxa"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Defineix l\'hora automàticament"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Defineix la zona horària automàticament"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Utilitza la configuració regional predeterminada"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Format de 24 hores"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Format de 24 hores"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostra la inf. de perfil a la pantalla de bloqueig"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Comptes"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Ubicació"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Utilitza la ubicació"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utilitza la ubicació"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivat"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Activada - <xliff:g id="COUNT_1">%1$d</xliff:g> aplicacions tenen accés a la ubicació</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueig de pantalla, desbloqueig facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueig de pantalla, empremta digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueig de pantalla"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloqueja el telèfon amb la cara i l\'empremta digital"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"També pots iniciar la sessió en apps i confirmar pagaments"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configura el desbloqueig amb:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueig facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Desbloqueja el telèfon fàcilment"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Empremta digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Desbloqueja el telèfon des de la butxaca"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Omet"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Següent"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Cara afegida"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configura el desbloqueig facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueig facial"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Utilitza l\'autenticació facial"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Comença"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Si el desbloqueig facial amb accessibilitat està desactivat, és possible que alguns passos de configuració no funcionin correctament amb TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Torna"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continua la configuració"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Utilitza la config. d\'accessibilitat"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Quan utilitzis el desbloqueig facial en aplicacions, requereix sempre confirmació"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Suprimeix dades facials"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configura el desbloqueig facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Utilitza el desbloqueig facial per desbloquejar el teu dispositiu, iniciar la sessió a les aplicacions i confirmar els pagaments.\n\nTingues en compte el següent:\nSi mires el telèfon, es pot desbloquejar sense voler.\n\nUna altra persona pot desbloquejar el telèfon si te\'l posa davant de la cara.\n\nÉs possible que algú que s\'assembli molt a tu, com ara un bessó idèntic, pugui desbloquejar el telèfon."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Utilitza el desbloqueig facial per desbloquejar el teu dispositiu, iniciar la sessió a les aplicacions i confirmar els pagaments.\n\nTingues en compte el següent:\nSi mires el telèfon, es pot desbloquejar sense voler.\n\nUna altra persona pot desbloquejar el telèfon si te\'l posa davant de la cara, encara que tinguis els ulls tancats.\n\nÉs possible que algú que s\'assembli molt a tu, com ara un bessó idèntic, pugui desbloquejar el telèfon."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Utilitza el desbloqueig facial per desbloquejar el dispositiu, iniciar la sessió a les aplicacions i confirmar pagaments."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Recorda:\nSi mires el telèfon, es pot desbloquejar sense voler.\n\nUna altra persona pot desbloquejar el telèfon si te\'l posa davant de la cara.\n\nAlgú que s\'assembli molt a tu, com ara un germà idèntic, pot desbloquejar el telèfon."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Recorda:\nSi mires el telèfon, es pot desbloquejar sense voler.\n\nUna altra persona pot desbloquejar el telèfon si te\'l posa davant de la cara, encara que tinguis els ulls tancats.\n\nAlgú que s\'assembli molt a tu, com ara un germà idèntic, pot desbloquejar el telèfon."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vols suprimir les dades facials?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Les dades facials utilitzades pel desbloqueig facial se suprimiran permanentment i de manera segura. Un cop suprimides, necessitaràs el PIN, el patró o la contrasenya per desbloquejar el telèfon, iniciar la sessió a les aplicacions i confirmar pagaments."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Utilitza el desbloqueig facial per desbloquejar el telèfon"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilitza l\'empremta digital per desbloquejar el telèfon o aprovar compres.\n\nNota: no pots fer servir l\'empremta digital per desbloquejar aquest dispositiu. Per obtenir més informació, contacta amb l\'administrador de la teva organització."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilitza l\'empremta digital per desbloquejar el telèfon o aprovar compres.\n\nNota: és possible que l\'empremta digital sigui menys segura que un bon patró o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel·la"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, gràcies"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omet"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Següent"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Si protegeixes la tauleta amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-la si la perds o te la roben. També necessites una d\'aquestes opcions per configurar el desbloqueig facial. Per tornar enrere, toca Cancel·la."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Si protegeixes el dispositiu amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-lo si el perds o te\'l roben. També necessites una d\'aquestes opcions per configurar el desbloqueig facial. Per tornar enrere, toca Cancel·la."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Si protegeixes el telèfon amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-lo si el perds o te\'l roben. També necessites una d\'aquestes opcions per configurar el desbloqueig facial. Per tornar enrere, toca Cancel·la."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Si protegeixes la tauleta amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-la si la perds o te la roben. També necessites una opció de bloqueig de pantalla per configurar la biometria. Per tornar enrere, toca Cancel·la."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Si protegeixes el dispositiu amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-lo si el perds o te\'l roben. També necessites una opció de bloqueig de pantalla per configurar la biometria. Per tornar enrere, toca Cancel·la."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Si protegeixes el telèfon amb una opció de bloqueig de pantalla, ningú no podrà utilitzar-lo si el perds o te\'l roben. També necessites una opció de bloqueig de pantalla per configurar la biometria. Per tornar enrere, toca Cancel·la."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"No vols configurar el PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"No vols configurar la contrasenya?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"No vols configurar el patró?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquesta tauleta sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activa les funcions de protecció del dispositiu per impedir que altres persones el facin servir sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activa les funcions de protecció del dispositiu per impedir que altres persones utilitzin aquest telèfon sense permís. Tria el bloqueig de pantalla que vulguis utilitzar."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Tria un mètode de bloqueig de pantalla alternatiu"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Tria un mètode de bloqueig de pantalla alternatiu"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Tria un mètode de bloqueig de pantalla alternatiu"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcions de bloqueig de pantalla"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcions de bloqueig de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueig de pantalla"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueig facial + contrasenya"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continua sense el desbloqueig facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Pots desbloquejar el telèfon amb l\'autenticació facial. Per motius de seguretat, cal un bloqueig de pantalla alternatiu per utilitzar aquesta opció."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria + patró"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria + contrasenya"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continua sense biometria"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Pots desbloquejar el telèfon amb la biometria. Per motius de seguretat, cal un bloqueig de pantalla alternatiu per utilitzar aquesta opció."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desact. per l\'admin., política d\'encrip. o emmagat. creden."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Cap"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Llisca"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Ha de tenir <xliff:g id="NUMBER_0">%d</xliff:g> dígit o menys</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'administrador del dispositiu no permet que s\'utilitzi un PIN recent"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"L\'administrador de TI ha bloquejat els PIN més comuns. Prova un altre PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"No pot incloure un caràcter no vàlid"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Ha de contenir com a mínim una lletra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Ha de contenir com a mínim un dígit"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Ha de contenir com a mínim 1 caràcter que no sigui un número</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'administrador del dispositiu no permet que s\'utilitzi una contrasenya recent"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"L\'administrador de TI ha bloquejat les contrasenyes més comunes. Prova una altra contrasenya."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"No es permet cap seqüència de dígits ascendents, descendents ni repetits"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirma"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancel·la"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activa la Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utilitza la Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utilitza la Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Configuració de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configura i gestiona els punts d\'accés sense fil"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centra el codi QR a sota per connectar-te a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Escaneja un codi QR per unir-te a la xarxa Wi‑Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Comparteix la Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Escaneja aquest codi QR per connectar-te a <xliff:g id="SSID">%1$s</xliff:g> i compartir la contrasenya"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escaneja aquest codi QR amb un altre dispositiu per unir-te a <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Escaneja aquest codi QR per conectar-te a <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Torna-ho a provar. Si el problema continua, contacta amb el fabricant del dispositiu"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"S\'ha produït un error"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Contrasenya de la Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Contrasenya del punt d\'accés Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Connexió automàtica"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permet que el telèfon es connecti automàticament quan sigui a prop d\'aquesta xarxa"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permet que la tauleta es connecti automàticament quan sigui a prop d\'aquesta xarxa"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permet la connexió a aquesta xarxa quan estigui dins de l\'abast"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Afegeix un dispositiu"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Utilitza un codi QR per afegir un dispositiu a aquesta xarxa"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"El codi QR no té un format vàlid"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utilitza certificats del sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"No proporcionis un certificat d\'usuari"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"No validis"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No s\'ha especificat cap certificat. La connexió no serà privada."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"El nom de la xarxa és massa llarg."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Has d\'especificar un domini."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Es necessita un certificat."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connecta"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"La xarxa Wi‑Fi està activada"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connectat a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"S\'està connectant a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"S\'està connectant…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"No s\'ha pogut connectar a la xarxa"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"La xarxa està fora de l\'abast"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adreça MAC del dispositiu"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Adreça MAC aleatòria"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Adreça MAC aleatòria (darrer ús)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adreça IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalls de la xarxa"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Màscara de la subxarxa"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Adreces IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Xarxes desades"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Subscripcions"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Altres xarxes"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Configuració IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"La configuració avançada de la Wi‑Fi no està disponible per a aquest usuari"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Desa"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Escriu una adreça de passarel·la vàlida."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Escriu una adreça DNS vàlida."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Escriu una longitud de prefix de xarxa entre 0 i 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (tret que se substitueixi per un DNS privat)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (tret que se substitueixi per un DNS privat)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Passarel·la"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Longitud de prefix de xarxa"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"L\'aplicació està compartint contingut. Per compartir la connexió a Internet, desactiva el punt d\'accés Wi-Fi i torna\'l a activar."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No s\'ha definit cap contrasenya"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nom del punt d\'accés Wi-Fi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"S\'està activant <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"S\'està activant <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Altres dispositius es poden connectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Contrasenya del punt d\'accés Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda del punt d\'accés"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Augmenta automàticament la freqüència d\'actualització de 60 a 90 Hz en alguns continguts. Augmenta l\'ús de la bateria."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Força una freqüència d\'actualització de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"La freqüència d\'actualització més alta millora la resposta al tacte i la qualitat de les animacions. Augmenta l\'ús de la bateria."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atenció a la pantalla"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activat / La pantalla no s\'apagarà si estàs mirant-la"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Quan la pantalla està fosca, s\'activa per a notificacions noves"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostra sempre hora i detalls"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Augmenta l\'ús de la bateria"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Posa el text en negreta"</string>
     <string name="title_font_size" msgid="570613010306330622">"Mida de la lletra"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Amplia o redueix el text"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Config. de bloqueig de SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versió d\'Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Actualització de seguretat d\'Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model i maquinari"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versió del maquinari"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Id. de l\'equip"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Suprimeix l\'APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN nou"</string>
     <string name="menu_save" msgid="6611465355127483100">"Desa"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Descarta"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Cancel·la"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"El camp Nom no pot ser buit."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"L\'APN no pot ser buit."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Les aplicacions es poden restablir"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Restableix Wi-Fi, dades mòbils i Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Es restabliran totes les opcions de configuració de la xarxa, inclosos:\n\n"<li>"la Wi‑Fi"</li>\n<li>"les dades mòbils"</li>\n<li>"el Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Esborra"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Esborra les SIM baixades"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Per baixar targetes SIM de substitució, contacta amb el teu operador de telefonia mòbil. Aquesta acció no cancel·larà cap dels plans de servei mòbil."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Aquesta acció no cancel·larà cap dels plans de servei mòbil. Per baixar targetes SIM de substitució, contacta amb el teu operador."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Restableix la configuració"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Vols restablir totes les opcions de configuració de la xarxa? Aquesta acció no es pot desfer."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Vols restablir totes les opcions de configuració de la xarxa i esborrar les targetes SIM baixades? Aquesta acció no es pot desfer."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"S\'ha restablert la configuració de la xarxa"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"No es poden esborrar les targetes SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"No s\'han pogut esborrar les targetes SIM que has baixat a causa d\'un error.\n\nReinicia el dispositiu i torna-ho a provar."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Esborra totes les dades (restabliment de les dades de fàbrica)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Esborra totes les dades (restabliment dades fàbrica)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Aquesta acció esborrarà totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, com ara:\n\n"<li>"el teu Compte de Google"</li>\n<li>"les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"les aplicacions baixades"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"S\'esborraran totes les dades de l\'"<b>"emmagatzematge intern"</b>" del telèfon, inclosos:\n\n"<li>"El teu Compte de Google"</li>\n<li>"Les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"Les aplicacions baixades"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Tens la sessió iniciada als comptes següents:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"En aquest dispositiu hi ha altres usuaris.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Altres dades de l\'usuari"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"No es cancel·larà el teu pla de servei mòbil."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Per esborrar també música, imatges i altres dades d\'usuari, cal esborrar l\'"<b>"emmagatzematge USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Si vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris la "<b>"targeta SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Esborra totes les dades (restabliment de fàbrica)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Esborra totes les dades (restabliment dades fàbrica)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"S\'esborraran totes les dades de l\'"<b>"emmagatzematge intern"</b>" de la tauleta, com ara:\n\n"<li>"el teu Compte de Google"</li>\n<li>"les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"les aplicacions baixades"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"S\'esborraran totes les dades de l\'"<b>"emmagatzematge intern"</b>" del telèfon, com ara:\n\n"<li>"el teu Compte de Google"</li>\n<li>"les dades i la configuració del sistema i de les aplicacions"</li>\n<li>"les aplicacions baixades"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Tens la sessió iniciada als comptes següents:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"En aquest dispositiu hi ha altres usuaris.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"música"</li>\n<li>"fotos"</li>\n<li>"altres dades de l\'usuari"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"No es cancel·larà el teu pla de servei mòbil."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Si vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris l\'"<b>"emmagatzematge USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Si vols suprimir música, imatges i altres dades de l\'usuari, cal que esborris la "<b>"targeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Esborra l\'emmagatzematge USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Esborra la targeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Esborra totes les dades de l\'emmagatzematge USB intern, com ara música o fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Esborra totes les dades de la targeta SD, com ara música o fotos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Esborra totes les dades"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Esborra totes les dades"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Se suprimiran tota la teva informació personal i les aplicacions baixades. Aquesta acció no es pot desfer."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Se suprimirà tota la teva informació personal, incloses les aplicacions i SIM que hagis baixat. Aquesta acció no es pot desfer."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Esborra-ho tot"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No s\'ha restablert perquè el servei d\'esborrament del sistema no està disponible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vols esborrar totes les dades?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"El restabliment de fàbrica no està disponible per a aquest usuari."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"S\'està esborrant"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Espera…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Esborra totes les dades"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Esborra totes les dades"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Se suprimiran tota la teva informació personal i les aplicacions baixades. Aquesta acció no es pot desfer."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Se suprimirà tota la teva informació personal, incloses les targetes SIM i les aplicacions que hagis baixat. Aquesta acció no es pot desfer."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vols esborrar totes les dades?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"El restabliment de fàbrica no està disponible per a aquest usuari"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"S\'està esborrant"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Espera…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Configuració de trucades"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configura la bústia, la desviació de trucades, les trucades en espera i l\'identificador"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Compartició de xarxa per USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"No es pot compartir la xarxa amb més de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositius."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Es desactivarà la compartició de xarxa per a: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Compartició d\'Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Comparteix la connexió a Internet del telèfon per Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Comparteix la connexió a Internet del telèfon per Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utilitza el punt d\'accés Wi-Fi i la compartició de xarxa per proporcionar Internet a altres dispositius mitjançant la teva connexió de dades mòbils. Les aplicacions també poden crear un punt d\'accés Wi-Fi per compartir contingut amb els dispositius que es trobin a prop."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilitza el punt d\'accés Wi‑Fi i la compartició de xarxa per proporcionar Internet a altres dispositius amb la teva connexió Wi‑Fi o de dades mòbils. Les aplicacions també poden crear un punt d\'accés Wi‑Fi per compartir contingut amb els dispositius propers."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ajuda"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Cerca de dispositius Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permet que les aplicacions i els serveis cerquin dispositius propers en qualsevol moment, fins i tot quan el Bluetooth estigui desactivat. Aquesta opció es pot utilitzar, per exemple, per millorar les funcions i els serveis basats en la ubicació."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serveis d\'ubicació per a la feina"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detecció de la zona horària de la ubicació"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detecció de la zona horària de la ubicació"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permet utilitzar la ubicació del dispositiu per detectar la zona horària actual. Altres opcions de configuració de la ubicació, com ara la cerca de xarxes Wi‑Fi, poden afectar la precisió de la detecció de la zona horària."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activada"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desactivada"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"La detecció automàtica de la zona horària està desactivada"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"La detecció de la zona horària de la ubicació està desactivada"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"No s\'admet la detecció de la zona horària de la ubicació"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"No es permeten canvis en la detecció de la zona horària de la ubicació"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Ubicació p. Wi-Fi i xarxa mòb."</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Permet que les aplicacions utilitzin el servei d\'ubicació de Google per calcular la teva ubicació més ràpidament. Es recopilaran dades d\'ubicació anònimes i s\'enviaran a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Ubicació determinada per Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Per al desbloqueig facial, cal una contrasenya"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Per al desbloqueig facial, cal un patró"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Per al desbloqueig facial, cal un PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Per a la biometria, cal una contrasenya"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Per a la biometria, cal un patró"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Per a la biometria, cal un PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Has oblidat la contrasenya?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Has oblidat el patró?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Has oblidat el PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferències dels subtítols"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliació"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Àrea d\'ampliació"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Activa l\'ampliació"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Tria les àrees d\'ampliació que vols utilitzar en ampliar la pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pantalla completa"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Pantalla parcial"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pantalla completa i pantalla parcial"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Amplia tota la pantalla"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Amplia una part de la pantalla"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vols canviar al botó d\'accessibilitat?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Si fas triple toc per ampliar una part de la pantalla, l\'escriptura i altres accions funcionaran amb retard.\n\nVols utilitzar el botó d\'accessibilitat per ampliar la pantalla?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Canvia al botó d\'accessibilitat"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mantén el triple toc per ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configuració de l\'ampliació"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Amplia amb tres tocs"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Amplia amb una drecera"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"El botó d\'engegada penja"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Punter de ratolí gran"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Suprimeix les animacions"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Àudio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combina els canals en reproduir àudio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balanç d\'àudio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Esquerra"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Dreta"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Àudio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combina els canals en reproduir àudio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balanç d\'àudio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Esquerra"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Dreta"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predeterminat"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segons"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segons"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibració de les notificacions"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibració de les trucades"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Resposta tàctil"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Utilitza <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Obre <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Utilitza la correcció de color"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostra els subtítols"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Només per a aplicacions compatibles"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utilitza <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Obre <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Utilitza la correcció de color"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostra els subtítols"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Només per a aplicacions compatibles"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Mida i estil dels subtítols"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Mida del text: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Més opcions"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de grisos"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermell-verd"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermell-verd"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blau-groc"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restricció en segon pla"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permet que l\'aplicació s\'executi en segon pla"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"L\'aplicació no es pot executar en segon pla"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"No es pot restringir l\'ús en segon pla"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"No es pot restringir l\'ús en segon pla"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vols limitar l\'activitat en segon pla?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limites l\'activitat en segon pla d\'una aplicació, és possible que no funcioni correctament"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Com que aquesta aplicació no s\'ha configurat per optimitzar la bateria, no pots restringir-la.\n\nPer restringir l\'aplicació, activa l\'optimització de la bateria."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"La tauleta s\'ha utilitzat més del que és habitual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"El dispositiu s\'ha utilitzat més del que és habitual"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Pot ser que la bateria s\'esgoti massa ràpid"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"S\'està optimitzant per a l\'estat de la bateria"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Bateria limitada temporalment. Toca per obtenir més informació."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"El telèfon s\'ha fet servir més del que és habitual i és possible que la bateria s\'esgoti abans del previst.\n\nAplicacions que han consumit més bateria:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"La tauleta s\'ha fet servir més del que és habitual i és possible que la bateria s\'esgoti abans del previst.\n\nAplicacions que han consumit més bateria:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"El dispositiu s\'ha fet servir més del que és habitual i és possible que la bateria s\'esgoti abans del previst.\n\nAplicacions que han consumit més bateria:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">S\'ha restringit %1$d aplicació</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small><font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Hi ha hagut un problema en llegir el mesurador de la bateria"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Hi ha hagut un problema en llegir el mesurador de la bateria. Toca per "<annotation id="url">"obtenir més informació"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Vols aturar l\'aplicació?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"El telèfon no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> el manté actiu.\n\nPer solucionar el problema, pots aturar l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"La tauleta no pot gestionar el consum de la bateria amb normalitat perquè <xliff:g id="APP">%1$s</xliff:g> la manté activa.\n\nPer solucionar el problema, pots aturar l\'aplicació.\n\nSi el problema persisteix, pot ser que hagis de desinstal·lar l\'aplicació per millorar el rendiment de la bateria."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Defineix una programació"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Allarga la durada de la bateria"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desactiva quan estigui carregada"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"L\'estalvi de bateria es desactiva quan el telèfon té un <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"L\'estalvi de bateria es desactivarà quan la tauleta tingui un <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"L\'estalvi de bateria es desactivarà quan el dispositiu tingui un <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Estalvi de bateria es desactiva quan el telèfon té més d\'un <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Estalvi de bateria es desactiva quan la tauleta té més d\'un <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Estalvi de bateria es desactiva quan el dispositiu té més d\'un <xliff:g id="PERCENT">%1$s</xliff:g> de bateria"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activa"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Restableix"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reprodueix"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Connectivitat adaptativa"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Allarga la durada de la bateria i millora el rendiment del dispositiu gestionant automàticament les connexions a la xarxa"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Emmagatzematge de credencials"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instal·la un certificat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instal·la els certificats des de l\'emmagatzematge"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credencials d\'usuari"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Mostra i modifica les credencials emmagatzemades"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Configuració avançada"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipus d\'emmagatzematge"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Emmagatzemat en maquinari"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Només programari"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Les credencials no estan disponibles per a aquest usuari."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instal·lada per a xarxes VPN i aplicacions"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instal·lada per a xarxes Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"No instal·lis"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instal·la igualment"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"No s\'ha instal·lat el certificat"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Vols permetre a <xliff:g id="APP_NAME">%s</xliff:g> que instal·li certificats en aquest dispositiu?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Aquests certificats t\'identificaran a les aplicacions i als URL que hi ha a continuació"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"No permetis"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Permet"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Mostra\'n més"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App de gestió de certificats"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Cap"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Els certificats instal·lats per aquesta aplicació t\'identifiquen a les aplicacions i als URL que hi ha a continuació"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Suprimeix"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Senyal de trucada d\'emergència"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Defineix el comportament quan es fa una trucada d\'emergència"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Còpia de seguretat"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"El perfil de treball no està configurat."</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Tu (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Àlies"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Pots afegir fins a <xliff:g id="USER_COUNT">%1$d</xliff:g> usuaris"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Només el propietari de la tauleta pot gestionar els usuaris."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Només el propietari del telèfon pot gestionar els usuaris."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pagar al terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura una aplicació per pagar. A continuació, apropa la part posterior del telèfon a un terminal amb el símbol de pagament sense contacte."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entesos"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Més..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Més…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Defineix una aplicació per pagar predeterminada"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualitza l\'aplicació de pagament predeterminada"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"En un terminal sense contacte, paga amb <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Enrere"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Següent"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finalitza"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Fes una foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Tria una imatge"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Selecciona una foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Targetes SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Targetes SIM"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Utilitza sempre per a les trucades"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecciona una SIM per a les dades"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecciona una SIM per als SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"S\'està canviant la SIM de dades. Això pot tardar un minut..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"S\'està canviant la SIM de dades. Aquest procés pot tardar fins a un minut…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Truca mitjançant"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selecciona una targeta SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, programació, estalvi de bateria, estalvi d\'energia, bateria, automàtic, percentatge"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, trucades avançades, trucades 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"afegir idioma, afegir un idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"mida del text"</string>
     <string name="default_sound" msgid="6604374495015245195">"So predeterminat"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"El volum de les trucades i notificacions està establert al <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volum, vibració, No molestis"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sons d\'inici"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtítols instantanis"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Subtitula el contingut multimèdia automàticament"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Cap"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">S\'han definit <xliff:g id="ON_COUNT">%d</xliff:g> programacions</item>
-      <item quantity="one">S\'ha definit 1 programació</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Cap}=1{S\'ha definit 1 programació}other{S\'han definit # programacions}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"No molestis"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Rep notificacions només de persones i aplicacions importants"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Restringeix les interrupcions"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Només amb prioritat"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>."</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activat / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desactivat (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desactivat"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activat"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pregunta sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Fins que no el desactivis"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hores</item>
-      <item quantity="one">1 hora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuts"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programacions es poden activar automàticament</item>
-      <item quantity="one">1 programació es pot activar automàticament</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# hores}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minut}other{# minuts}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desactivat}=1{Desactivat / Es pot activar automàticament 1 programació}other{Desactivat / Es poden activar automàticament # programacions}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Què pot interrompre el mode No molestis"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Persones"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplicacions"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Estableix automàticament les notificacions de prioritat baixa com a discretes"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classificació de les notificacions adaptatives"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classifica automàticament les notificacions per ordre de rellevància"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Suggeriments sobre les notificacions adaptatives"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica els ajustos que s\'han fet a les notificacions i mostra l\'opció per enviar suggeriments al sistema"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Restableix la importància de les notificacions"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Restableix la configuració d\'importància que l\'usuari ha canviat i permet que es prioritzi l\'assistent de notificació"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Accions i respostes suggerides"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostra automàticament les accions i respostes suggerides"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Mostra les notificacions recents i posposades"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Converses prioritàries"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Mostra a la part superior de la secció de converses i com a bombolles flotants"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Mostra a la part superior de la secció de converses"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Altres converses"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Converses no prioritàries"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Converses en què has fet canvis"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Converses recents"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Esborra recents"</string>
+    <string name="clear" msgid="5092178335409471100">"Esborra"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Mostra les converses prioritàries com a bombolles"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Les converses prioritàries es mostren a la part superior de l\'àrea desplegable. També pots definir que es mostrin com a bombolles i interrompin el mode No molestis."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Les converses que hagis marcat com a prioritàries o en què hagis fet canvis es mostraran aquí"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Accés a No molestis"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permet l\'accés al mode No molestis"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Cap aplicació instal·lada no ha sol·licitat accés a No molestis."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"S\'estan carregant les aplicacions..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"S\'estan carregant les aplicacions…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Tal com has sol·licitat, Android està bloquejant les notificacions d\'aquesta aplicació perquè no apareguin al dispositiu"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Tal com has sol·licitat, Android està bloquejant aquesta categoria de notificacions perquè no apareguin al dispositiu"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Tal com has sol·licitat, Android està bloquejant aquest grup de notificacions perquè no apareguin al dispositiu"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Totes les converses"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Converses prioritàries"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Cap"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> converses</item>
-      <item quantity="one">1 conversa</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Cap"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Cap}=1{1 conversa}other{# converses}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Qui et pot interrompre"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Trucades"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Trucades"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Per assegurar-te que les trucades permeses emetin so, comprova que s\'hagi configurat el dispositiu perquè soni"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Amb la programació <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>, les trucades entrants es bloquegen. Pots ajustar la configuració per permetre que els teus amics, familiars o altres persones contactin amb tu."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactes destacats"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> persones més</item>
-      <item quantity="one">1 persona més</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Cap"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Cap}=1{{contact_1}}=2{{contact_1} i {contact_2}}=3{{contact_1}, {contact_2} i {contact_3}}other{{contact_1}, {contact_2} i # persones més}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sense nom)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Missatges"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"missatges"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Missatges"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Amb la programació \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", els missatges entrants es bloquegen. Pots ajustar la configuració per permetre que els teus amics, familiars o altres persones contactin amb tu."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Pots rebre tots els missatges"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Pots rebre totes les trucades"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Cap"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contactes</item>
-      <item quantity="one">1 contacte</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Cap}=1{1 contacte}other{# contactes}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Tothom"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactes"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactes destacats"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Totes les notificacions"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algunes notificacions"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Les persones seleccionades podran contactar amb tu, encara que les aplicacions no tinguin permís per interrompre\'t"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> poden interrompre</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> pot interrompre</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> més"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Cap aplicació no pot interrompre}=1{{app_1} pot interrompre}=2{{app_1} i {app_2} poden interrompre}=3{{app_1}, {app_2} i {app_3} poden interrompre}other{{app_1}, {app_2} i # més poden interrompre}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplicacions"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Totes les notificacions"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algunes notificacions"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificacions que et poden interrompre"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permet totes les notificacions"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> poden interrompre</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> pot interrompre</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Res no pot interrompre"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> més"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Res no pot interrompre}=1{{sound_category_1} pot interrompre}=2{{sound_category_1} i {sound_category_2} poden interrompre}=3{{sound_category_1}, {sound_category_2} i {sound_category_3} poden interrompre}other{{sound_category_1}, {sound_category_2} i # més poden interrompre}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Res no pot interrompre"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ningú no pot interrompre"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algunes persones poden interrompre"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Tothom pot interrompre"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Activat"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Desactivat"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Fixació d\'aplicacions"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"La fixació d\'aplicacions permet mantenir l’aplicació actual visible fins que es deixa de fixar. Aquesta funció es pot utilitzar, per exemple, per permetre que un amic de confiança jugui a un joc concret. \n\nQuan una aplicació està fixada, pot obrir-ne d\'altres i es pot accedir a les dades personals. \n\nPer utilitzar la fixació d\'aplicacions, segueix aquests passos: 	\n1.	Activa la fixació d\'aplicacions. 	\n2.	Obre Aplicacions recents. 	\n3.	Toca la icona de l\'aplicació a la part superior de la pantalla i, a continuació, toca Fixa."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"La fixació d\'aplicacions permet mantenir l’aplicació actual visible fins que es deixa de fixar. Aquesta funció es pot utilitzar, per exemple, per permetre que un amic de confiança jugui a un joc concret. \n\nQuan una aplicació està fixada, pot obrir-ne d\'altres i es pot accedir a les dades personals. \n\nSi vols compartir el teu dispositiu amb algú de manera segura, prova d\'utilitzar un usuari convidat. \n\nPer utilitzar la fixació d\'aplicacions, segueix aquests passos: 	\n1.	Activa la fixació d\'aplicacions. 	\n2.	Obre Aplicacions recents. 	\n3.	Toca la icona de l\'aplicació a la part superior de la pantalla i, a continuació, toca Fixa."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"La fixació d\'aplicacions permet mantenir l\'aplicació actual visible fins que es deixa de fixar. Aquesta funció es pot utilitzar, per exemple, per permetre que un amic de confiança jugui a un joc concret."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Quan una aplicació està fixada, pot obrir-ne d\'altres i accedir a les dades personals. \n\nPer utilitzar la fixació d\'aplicacions: 	\n1.	Activa la fixació d\'aplicacions. 	\n2.	Obre Aplicacions recents. 	\n3.	Toca la icona de l\'aplicació a la part superior de la pantalla i, a continuació, toca Fixa."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Quan una aplicació està fixada, pot obrir-ne d\'altres i accedir a les dades personals. \n\nSi vols compartir el teu dispositiu amb algú de manera segura, prova d\'utilitzar un usuari convidat. \n\nPer utilitzar la fixació d\'aplicacions: 	\n1.	Activa la fixació d\'aplicacions. 	\n2.	Obre Aplicacions recents. 	\n3.	Toca la icona de l\'aplicació a la part superior de la pantalla i, a continuació, toca Fixa."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Quan es fixa una aplicació: \n\n•		Es pot accedir a les dades personals \n		(com ara els contactes i el contingut dels correus electrònics). \n•		L\'aplicació fixada pot obrir altres aplicacions. \n\nUtilitza la fixació d\'aplicacions només amb gent de confiança."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Sol·licita el patró de desbloqueig per deixar de fixar"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Demana el codi PIN per deixar de fixar"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Per millorar la protecció del dispositiu, a més de fer servir l\'autenticació facial per desbloquejar-lo, pots configurar-lo perquè sol·liciti un PIN abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti un PIN per iniciar el dispositiu?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Per millorar la protecció del dispositiu, a més de fer servir l\'autenticació facial per desbloquejar-lo, pots configurar-lo perquè sol·liciti un patró abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti un patró per iniciar el dispositiu?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Per millorar la protecció del dispositiu, a més de fer servir l\'autenticació facial per desbloquejar-lo, pots configurar-lo perquè sol·liciti una contrasenya abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti una contrasenya per iniciar el dispositiu?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Per millorar la protecció del dispositiu, a més de fer servir la biometria per desbloquejar-lo, pots configurar-lo perquè sol·liciti un PIN abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti un PIN per iniciar el dispositiu?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Per millorar la protecció del dispositiu, a més de fer servir la biometria per desbloquejar-lo, pots configurar-lo perquè sol·liciti un patró abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti un patró per iniciar el dispositiu?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Per millorar la protecció del dispositiu, a més de fer servir la biometria per desbloquejar-lo, pots configurar-lo perquè sol·liciti una contrasenya abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que se sol·liciti una contrasenya per iniciar el dispositiu?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restringida"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlat per"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositiu connectat"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Aquest dispositiu"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"S\'està canviant..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"S\'està canviant…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"No s\'ha pogut canviar"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Càrregant el dispositiu"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Càrrega de dispositius connectats"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Ús de dades mòbils"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Ús de dades de les aplicacions"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Ús de dades Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Ús de dades de xarxes sense operador"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ús de dades Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 restricció</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"No inclou les dades que s\'utilitzen en xarxes d\'operadors"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Dades utilitzades: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Defineix advertiment de dades"</string>
     <string name="data_warning" msgid="2925054658166062884">"Advertiment de dades"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Mostra els detalls"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Economitzador de dades"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dades sense restricció"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Les dades en segon pla estan desactivades"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Les dades en segon pla estan desactivades"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activat"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desactivat"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Utilitza l\'Economitzador de dades"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Si el dispositiu està bloquejat, impedeix que s\'escriguin respostes o altres textos a les notificacions"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corrector predeterminat"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Tria un corrector ortogràfic"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utilitza el corrector ortogràfic"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Utilitza el corrector ortogràfic"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"No s\'ha seleccionat"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(cap)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Per alliberar espai, el gestor d\'emmagatzematge suprimeix del dispositiu les còpies de seguretat de fotos i vídeos."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Suprimeix fotos i vídeos amb"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gestor d\'emmagatzematge"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utilitza el gestor d\'emmagatzematge"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Utilitza el gestor d\'emmagatzematge"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automàtica"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Allibera espai ara"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Doble toc per consultar el telèfon"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Doble toc per consultar la tauleta"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Doble toc per consultar el dispositiu"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Llisca per a notificacions"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Llisca cap avall a la part inferior de la pantalla per mostrar les notificacions"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Mode d\'una mà"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Utilitza el mode d\'una mà"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Surt en canviar d\'aplicació"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Temps d\'espera"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segons"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segons"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segons"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accessibilitat"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Per veure l\'hora, les notificacions i altres dades, fes doble toc a la pantalla."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Aixeca per consultar el telèfon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Aixeca per consultar la tauleta"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toca per consultar la tauleta"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toca per consultar el dispositiu"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Per veure l\'hora, les notificacions i altres dades, toca la pantalla."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Accions d\'emergència"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Utilitza les accions d\'emergència"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gestionat per <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Inicia les accions a continuació prement el botó d\'engegada ràpidament 5 vegades o més"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Reprodueix una alarma de compte enrere"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Reprodueix un so alt abans de demanar ajuda"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Truca per demanar ajuda"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Número a què es trucarà per demanar ajuda"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Toca per canviar-lo"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Si introdueixes un número que no és d\'emergència:\n • El dispositiu ha d\'estar desbloquejat per utilitzar les accions d\'emergència.\n • És possible que no es respongui a la trucada."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Fes lliscar l\'empremta digital per veure notificacions"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Fes lliscar l\'empremta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Per consultar les notificacions, llisca cap avall al sensor d\'empremtes dactilars de la part posterior del telèfon."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Màxim de conjunts de dades visibles"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Restableix els valors predeterminats"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"S\'han restablert les opcions d\'emplenament automàtic per a desenvolupadors"</string>
+    <string name="location_category" msgid="3496759112306219062">"Ubicació"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicador d\'ubicació de la barra d\'estat"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Mostra per a totes les ubicacions, incloses la xarxa i la connectivitat"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Força mesuraments de GNSS complets"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Fes un seguiment de totes les freqüències i constel·lacions de GNSS sense cicle de treball"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema del dispositiu"</string>
     <string name="default_theme" msgid="4815428567082263639">"Predeterminat"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nom de la xarxa"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Posa en pausa les notificacions per centrar l\'atenció"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funció no disponible"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Aquesta funció s\'ha desactivat perquè alenteix el telèfon"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Força mesuraments de GNSS complets"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Fes un seguiment de totes les freqüències i constel·lacions de GNSS sense cicle de treball"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Mostra sempre el quadre de diàleg de bloqueig"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Mostra el quadre de diàleg cada vegada que una aplicació es bloquegi"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Selecciona l\'aplicació compatible amb ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activa per a totes les aplicacions"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecciona un controlador de gràfics"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predeterminat"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de jocs"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de jocs"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador per a desenvolupadors"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador de gràfics del sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Activat (silenci)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Desactivat"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detalls de la xarxa"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"El nom del dispositiu és visible per a les aplicacions del telèfon. També el poden veure altres persones si el connectes a un dispositiu Bluetooth o si configures un punt d\'accés Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"El nom del dispositiu és visible per a les aplicacions del telèfon. També el poden veure altres persones si el connectes a un dispositiu Bluetooth o a una xarxa Wi‑Fi, o si configures un punt d\'accés Wi‑Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Dispositius"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Tota la configuració"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Suggeriments"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"No s\'ha pogut trobar cap xarxa. Torna-ho a provar."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(prohibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No hi ha cap SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No hi ha cap SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Cap"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Cal una SIM per connectar-se"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Cal una SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> per connectar-se"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mode de xarxa preferent: WCDMA preferit"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mode de xarxa preferent: només GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mode de xarxa preferent: només WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dades mòbils"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accedeix a les dades amb la xarxa mòbil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"El telèfon canviarà de manera automàtica a aquest operador de telefonia mòbil quan estigui dins del seu abast"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No hi ha cap targeta SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferència de trucades"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferència d\'SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pregunta sempre"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"No està disponible quan està connectat a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Mostra\'n més"</string>
     <string name="see_less" msgid="2642392725363552793">"Mostra\'n menys"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vols activar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vols activar la SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vols canviar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vols utilitzar la targeta SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Només pot haver-hi una SIM activa.\n\nSi canvies a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, el teu servei <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> no es cancel·larà."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Només pot haver-hi una SIM baixada activa.\n\nSi canvies a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, el teu servei <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> no es cancel·larà."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Només pot haver-hi una SIM activa.\n\nSi canvies de SIM, el teu servei <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> no es cancel·larà."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Canvia a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"S\'està connectant a la xarxa…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"S\'està canviant a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"No es pot canviar d\'operador"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"S\'ha produït un error i no es pot canviar d\'operador."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vols desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vols desactivar la SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"S\'està desactivant la SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"No es pot desactivar l\'operador"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"S\'ha produït un error i no s\'ha pogut desactivar l\'operador."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vols utilitzar 2 SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Aquest dispositiu pot tenir 2 SIM actives alhora. Per continuar utilitzant només 1 SIM, toca \"No, gràcies\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Vols reiniciar el dispositiu?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Per començar, reinicia el dispositiu. A continuació, pots afegir una altra SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continua"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Reinicia"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"No, gràcies"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Canvia"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"No s\'ha pogut activar la SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Treu la SIM i torna-la a inserir. Si el problema continua, reinicia el dispositiu."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prova de tornar a activar la SIM. Si el problema continua, reinicia el dispositiu."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activació de la xarxa"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> està actiu"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toca per actualitzar la configuració de la targeta SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Targeta SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Vols esborrar la SIM que has baixat?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Si esborres aquesta targeta SIM, el servei <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> se suprimirà del dispositiu.\n\nEl servei <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> no es cancel·larà."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Esborra"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"S\'està esborrant la SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"No es pot esborrar la SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"No s\'ha pogut esborrar la targeta SIM a causa d\'un error.\n\nReinicia el dispositiu i torna-ho a provar."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connexió al dispositiu"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"L\'aplicació <xliff:g id="APPNAME">%1$s</xliff:g> vol fer servir una xarxa Wi‑Fi temporal per connectar-se al teu dispositiu"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No s\'ha trobat cap dispositiu. Comprova que els dispositius estiguin activats i disponibles per connectar-s\'hi."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Trucades d\'emergència"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"El teu operador de telefonia mòbil no permet fer trucades d\'emergència a través de la funció Trucades per Wi‑Fi.\nEl dispositiu canvia automàticament a una xarxa mòbil per fer una trucada d\'emergència.\nNomés es poden fer trucades d\'emergència en zones amb cobertura mòbil."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Fes trucades amb Wi‑Fi per augmentar-ne la qualitat"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Trucades entre targetes SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Permet les trucades i els SMS d\'una altra SIM en aquesta."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"trucades entre targetes sim"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Missatge MMS entrant"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"No es pot enviar el missatge MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Toca per permetre els missatges MMS amb <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> quan les dades mòbils estiguin desactivades"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permet les superposicions de pantalla a Configuració"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permet que les aplicacions que poden mostrar-se sobre altres aplicacions se superposin sobre les pantalles de Configuració"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimèdia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Amaga el reproductor quan la sessió multimèdia acabi"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"El reproductor et permet reprendre la sessió des del tauler desplegat de configuració ràpida."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Reproductor multimèdia a la configuració ràpida"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostra el reproductor multimèdia durant un període de temps llarg per poder reprendre la reproducció més fàcilment"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Amaga el reproductor"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostra el reproductor"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No hi ha cap reproductor disponible"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplicacions permeses"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multimèdia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"S\'activarà el Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Activat"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivat"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Targetes SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Xarxes segures per al mode d\'avió"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Cerca xarxes segures per al mode d\'avió i connecta-t\'hi"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"mode d\'avió, segur per al mode d\'avió"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Trucades i SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Trucades per Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Fes i rep trucades per xarxes sense operador, com ara una Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"La funció Trucades per Wi‑Fi et permet fer i rebre trucades per xarxes sense operador, com ara algunes xarxes Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Trucades"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferit"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"es prefereixen les trucades"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"es prefereixen els SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"no disponible"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"No hi ha cap SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferències"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connecta\'t a xarxes públiques"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"connexió a la xarxa, internet, sense fil, dades, wifi, wi‑fi, wi fi, mòbils, mòbil, operador de telefonia mòbil, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Mostra xarxes segures per al mode d\'avió"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desactiva el mode d\'avió"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"No està disponible perquè el mode d\'hora de dormir està activat"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"S\'ha completat el restabliment de la importància de les notificacions."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplicacions"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un dispositiu que no és de confiança vol accedir als teus missatges. Toca per veure més informació."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vols permetre l\'accés als missatges?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un dispositiu Bluetooth que no és de confiança, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vol accedir als teus missatges. \n\nNo t\'has connectat a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] abans."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un dispositiu que no és de confiança vol accedir als teus contactes i al registre de trucades. Toca per veure més informació."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vols permetre l\'accés als contactes i al registre de trucades?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un dispositiu Bluetooth que no és de confiança, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vol accedir als teus contactes i al registre de trucades. Això inclou dades sobre les trucades entrants i sortints.\n\nNo t\'has connectat a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] abans."</string>
 </resources>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 179cd3b..2f35036 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Střední"</item>
     <item msgid="6740026006576843477">"Dlouhá"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Krátký"</item>
+    <item msgid="7397961711906421599">"Střední"</item>
+    <item msgid="4079132024502041928">"Dlouhý"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Výchozí"</item>
     <item msgid="4234707448428002595">"Bezpatkové"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globální"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Pouze TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globální"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index edd8e05..1dc2e95 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -258,8 +258,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Datum a čas"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Nastavit datum a čas"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Umožňuje nastavit datum, čas, časové pásmo a formát"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Používat čas ze sítě"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Používat časové pásmo ze sítě"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Nastavit čas automaticky"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Nastavit časové pásmo automaticky"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Používat zdejší výchozí formát"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24hodinový formát"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Používat 24hodinový formát"</string>
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Zobrazit informace o profilu na zamčené obrazovce"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Účty"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Poloha"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Používat polohu"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Používat polohu"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Vypnuto"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="few">Zapnuto – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikace mají přístup k poloze</item>
@@ -326,6 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zámek obrazovky, odemknutí obličejem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zámek obrazovky, otisky prstů"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zámek obrazovky"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Odemykejte telefon bezpečně svým obličejem a otiskem prstu"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Můžete se také přihlašovat do aplikací a potvrzovat platby"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Nastavit odemykání pomocí:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Odemknutí obličejem"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Usnadněte si odemykání telefonu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Otisk prstu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Ušetřete čas odemykáním telefonu v kapse"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Přeskočit"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Další"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Obličej přidán"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Nastavit odemknutí obličejem"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Odemknutí obličejem"</string>
@@ -335,6 +344,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Ověření pomocí obličeje"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Začít"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Pokud je vypnuto odemknutí obličejem v režimu přístupnosti, některé kroky nastavení nemusí s aplikací TalkBack fungovat správně."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Zpět"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Pokračovat v nastavení"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Použít nastavení přístupnosti"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -379,8 +391,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Při použití odemknutí obličejem v aplikacích vždy vyžadovat potvrzení"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Smazat data obličeje"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Nastavit odemknutí obličejem"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Pomocí odemknutí obličejem můžete odemykat zařízení, přihlašovat se do aplikací a potvrzovat platby.\n\nPřipomínáme:\nTelefon můžete odemknout pohledem, i když zrovna nechcete.\n\nTelefon může odemknout i někdo jiný, když ho namíří na váš obličej.\n\nTelefon může odemknout i osoba, která je vám hodně podobná, například vaše dvojče."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Pomocí odemknutí obličejem můžete odemykat zařízení, přihlašovat se do aplikací a potvrzovat platby.\n\nPřipomínáme:\nTelefon můžete odemknout pohledem, i když zrovna nechcete.\n\nTelefon může odemknout i někdo jiný, když ho namíří na váš obličej (i když budete mít zavřené oči).\n\nTelefon by mohla odemknout i osoba, která je vám hodně podobná, například vaše dvojče."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Pomocí funkce odemknutí obličejem můžete odemykat zařízení, přihlašovat se k aplikacím a potvrzovat platby."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Důležité poznámky:\nTelefon můžete odemknout pohledem, i když zrovna nechcete.\n\nTelefon může odemknout i někdo jiný, když ho namíří na váš obličej.\n\nTelefon bude moci odemknout někdo, kdo je vám hodně podobný, například vaše identické dvojče."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Důležité poznámky:\nTelefon můžete odemknout pohledem, i když zrovna nechcete.\n\nTelefon může odemknout někdo jiný, když ho namíří na váš obličej (i když budete mít zavřené oči).\n\nTelefon bude moci odemknout někdo, kdo je vám hodně podobný, například vaše identické dvojče."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Smazat data o obličeji?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Údaje o obličeji používané k odemknutí obličejem budou trvale a bezpečně smazány. Po odstranění budete k odemknutí telefonu, přihlášení do aplikace nebo potvrzení platby muset zadat PIN, gesto nebo heslo."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Odemykejte telefon pomocí obličeje"</string>
@@ -402,6 +415,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Odemykejte telefon a schvalujte nákupy otiskem prstu.\n\nPoznámka: Otisk prstu nelze použít k odemykání tohoto zařízení. Další informace vám poskytne administrátor vaší organizace."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Odemykejte telefon a schvalujte nákupy otiskem prstu.\n\nPoznámka: Otisk prstu může být méně bezpečný než silné gesto nebo PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Zrušit"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, díky"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Pokračovat"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Přeskočit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Další"</string>
@@ -439,6 +453,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Pokud svůj tablet ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Zámek obrazovky je potřeba také k nastavení odemknutí obličejem. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Pokud své zařízení ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Zámek obrazovky je potřeba také k nastavení odemknutí obličejem. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Pokud svůj telefon ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Zámek obrazovky je potřeba také k nastavení odemknutí obličejem. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Pokud svůj tablet ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Možnost zámku obrazovky je potřeba také k nastavení biometrie. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Pokud své zařízení ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Možnost zámku obrazovky je potřeba také k nastavení biometrie. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Pokud svůj telefon ochráníte zámkem obrazovky, v případě ztráty či odcizení ho nebude moci použít nikdo cizí. Možnost zámku obrazovky je potřeba také k nastavení biometrie. Chcete-li se vrátit zpět, klepněte na Zrušit."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Přeskočit nastavení kódu PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Přeskočit nastavení hesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Přeskočit nastavení gesta?"</string>
@@ -511,8 +528,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání tabletu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v jeho používání bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Aktivujte funkce ochrany zařízení a zabraňte tak ostatním v používání telefonu bez vašeho svolení. Vyberte zámek obrazovky, který chcete používat."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Zvolte záložní metodu zámku obrazovky"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Zvolte záložní metodu zámku obrazovky"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Zvolte záložní metodu zámku obrazovky"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Možnosti zámku obrazovky"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Možnosti zámku obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zámek obrazovky"</string>
@@ -544,6 +560,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Odemknutí obličejem + heslo"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Pokračovat bez odemknutí obličejem"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Zařízení můžete odemknout pomocí obličeje. Z bezpečnostních důvodů tato možnost vyžaduje záložní zámek obrazovky."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrie + gesto"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrie + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrie + heslo"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Pokračovat bez biometrie"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefon můžete odemknout pomocí biometrie. Z bezpečnostních důvodů tato možnost vyžaduje záložní zámek obrazovky."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Zakázáno administrátorem, zásadami šifrování nebo úložištěm pověření"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Žádná"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Přejetí prstem"</string>
@@ -635,7 +656,6 @@
       <item quantity="one">Musí obsahovat méně než <xliff:g id="NUMBER_0">%d</xliff:g> číslici</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administrátor zařízení nedovoluje použití nedávno použitého kódu PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Obvyklé kódy PIN jsou blokovány administrátorem IT. Použijte jiný PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Heslo nesmí obsahovat neplatné znaky."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Heslo musí obsahovat alespoň jedno písmeno."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Heslo musí obsahovat alespoň jednu číslici."</string>
@@ -683,7 +703,6 @@
       <item quantity="one">Musí obsahovat alespoň 1 znak jiný než číslici</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administrátor zařízení neumožňuje použít heslo, které jste použili nedávno"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Obvyklá hesla jsou blokována administrátorem IT. Použijte jiné heslo."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Posloupnost rostoucích, klesajících nebo opakujících se číslic není povolena"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdit"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Zrušit"</string>
@@ -829,7 +848,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Zapnout Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Používat Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Použít Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Nastavení Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Umožňuje nastavit a spravovat přístupové body bezdrátové sítě"</string>
@@ -937,7 +956,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Chcete-li se připojit k síti <xliff:g id="SSID">%1$s</xliff:g>, níže vycentrujte QR kód"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Naskenováním QR kódu se připojíte k síti Wi-Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Sdílení sítě Wi-Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Chcete-li se připojit k síti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód a sdílejte heslo"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Chcete-li se připojit k síti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód v jiném zařízení"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Chcete-li se připojit k síti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Zkuste to znovu. Pokud problém přetrvává, obraťte se na výrobce zařízení"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Něco se pokazilo"</string>
@@ -963,8 +982,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Heslo k Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Heslo k hotspotu: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatické připojení"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Povolit telefonu automatické připojování v dosahu této sítě"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Povolit tabletu automatické připojování v dosahu této sítě"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Povolit připojení k této síti, když bude v dosahu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Přidat zařízení"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Pomocí QR kódu přidejte zařízení do této sítě"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kód není platný formát"</string>
@@ -976,7 +994,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Použít certifikáty systému"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Neposkytovat"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Neověřovat"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Není určen žádný certifikát. Připojení nebude soukromé."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Název sítě je příliš dlouhý."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Zadejte doménu."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Je vyžadován certifikát."</string>
@@ -1003,6 +1020,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Připojit"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Připojení Wi-Fi je zapnuto"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Připojeno k <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Připojování k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Připojování…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Připojení k síti se nezdařilo."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Síť není v dosahu"</string>
@@ -1036,6 +1054,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresa MAC zařízení"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Náhodná adresa MAC"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Náhodná adresa MAC (naposledy použitá)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresa"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Podrobnosti sítě"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podsítě"</string>
@@ -1043,8 +1062,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Adresy IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Uložené sítě"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Odběry"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Ostatní sítě"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Nastavení IP adresy"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Rozšířená nastavení sítě Wi-Fi nejsou pro tohoto uživatele dostupná."</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Uložit"</string>
@@ -1053,8 +1071,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Zadejte prosím platnou adresu brány."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Zadejte prosím platnou adresu DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Zadejte prosím délku síťové předpony v rozsahu 0 až 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"Server DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"Server DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (pokud není přepsán soukromým DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (pokud není přepsán soukromým DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Brána"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Délka síťové předpony"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1080,7 +1098,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikace sdílí obsah. Chcete-li sdílet připojení k internetu, vypněte hotspot a znovu jej zapněte"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Není nastaveno žádné heslo"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Název hotspotu"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Zapínám hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Zapínání hotspotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Ostatní zařízení se mohou připojit k hostpotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Heslo hotspotu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Pásmo přístupového bodu"</string>
@@ -1230,7 +1248,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Plynulé zobrazení"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"U některého obsahu automaticky zvýší obnovovací frekvenci z 60 na 90 Hz. Zvyšuje využití baterie."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Plynulé zobrazení"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Vynutit obnovovací frekvenci 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Vyšší obnovovací frekvence za účelem vylepšení responzivity klepnutí a kvality animace. Zvyšuje využití baterie."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Vnímavá obrazovka"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Zapnuto / obrazovka se nevypne, když se na ni budete dívat"</string>
@@ -1321,6 +1339,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Když je obrazovka tmavá, při novém oznámení se zapne"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vždy zobrazovat čas a informace"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Zvýšené využití baterie"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Tučný text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Velikost písma"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Umožňuje zvětšit nebo zmenšit text"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Nastavení zámku SIM"</string>
@@ -1371,7 +1390,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Verze systému Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Aktualizace zabezpečení Androidu"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model a hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Verze hardwaru"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID zařízení"</string>
@@ -1620,7 +1638,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Smazat přístupový bod"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nový přístupový bod"</string>
     <string name="menu_save" msgid="6611465355127483100">"Uložit"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Zahodit"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Zrušit"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Pole Jméno nesmí být prázdné."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Název přístupového bodu nesmí být prázdný."</string>
@@ -1635,8 +1653,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Aplikace lze resetovat"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Resetovat Wi-Fi, data a Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Budou resetována nastavení všech sítí, včetně následujících:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobilní data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Vymazat"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Vymazat stažení SIM karty"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Chcete-li stáhnout náhradní SIM kartu, kontaktujte operátora. Tímto krokem nebude zrušen mobilní tarif."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Tímto krokem nebude zrušen mobilní tarif. Pokud chcete stáhnout náhradní SIM karty, obraťte se na svého operátora."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Obnovit nastavení"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Chcete resetovat všechna nastavení sítí? Tuto akci nelze vrátit zpět."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Obnovit všechna síťová nastavení a vymazat stažené SIM karty? Tuto akci nelze vrátit zpět."</string>
@@ -1646,31 +1665,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Nastavení sítí bylo resetováno"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM karty nelze vymazat"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Staženou SIM kartu nelze vymazat z důvodu chyby.\n\nRestartujte zařízení a zkuste to znovu."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Vymazat data (tovární reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Vymazat data (tovární reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, např.:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, např.:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"V tomto zařízení jsou přítomni další uživatelé.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"hudba"</li>\n<li>"fotky"</li>\n<li>"další uživatelské údaje"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Tímto krokem nebude zrušen mobilní tarif."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"kartu SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Vymazat data (tovární reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Vymazat data (tovární reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" tabletu, např.:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Tato akce smaže veškerá data z "<b>"interního úložiště"</b>" telefonu, např.:\n\n"<li>"váš účet Google"</li>\n<li>"nastavení a data systému a aplikací"</li>\n<li>"stažené aplikace"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Aktuálně jste přihlášeni k těmto účtům:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"V tomto zařízení jsou přítomni další uživatelé.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"hudba"</li>\n<li>"fotky"</li>\n<li>"další uživatelská data"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Tímto krokem nebude zrušen mobilní tarif."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"úložiště USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Chcete-li smazat také hudbu, obrázky a další uživatelská data, je potřeba vymazat "<b>"kartu SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Smazat úložiště USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Smazat kartu SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Smazat všechna data v interním úložišti USB, například hudbu a fotografie."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Smazat všechna data na kartě SD, například hudbu a fotografie."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Vymazat všechna data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Vymazat všechna data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Všechny osobní údaje a stažené aplikace budou smazány. Tuto akci nelze vrátit zpět."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Budou smazány všechny vaše osobní údaje, včetně stažených aplikací a SIM karet. Tuto akci nelze vrátit zpět."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Vymazat vše"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Pokus o obnovení se nezdařil, protože služba System Clear není dostupná."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vymazat všechna data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Pro tohoto uživatele není obnovení továrního nastavení dostupné"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Mazání"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Prosím čekejte..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Vymazat všechna data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Vymazat všechna data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Všechny osobní údaje a stažené aplikace budou smazány. Tuto akci nelze vrátit zpět."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Budou smazány všechny vaše osobní údaje, včetně stažených aplikací a SIM karet. Tuto akci nelze vrátit zpět."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vymazat všechna data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Pro tohoto uživatele není resetování do továrního nastavení dostupné"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Mazání"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Čekejte prosím…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Nastavení hovorů"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Nastavení hlasové schránky, přesměrování a čekání hovorů a ID volajícího"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Připojení přes USB"</string>
@@ -1718,7 +1735,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Připojení lze sdílet s nejvýše <xliff:g id="MAXCONNECTION">%1$d</xliff:g> zařízeními."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"U zařízení <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude ukončeno sdílené připojení."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Tethering ethernetu"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Sdílet připojení telefonu k internetu přes USB ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Sdílet připojení telefonu k internetu přes ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Hotspot a tethering umožňují poskytovat připojení k internetu přes mobilní datové připojení dalším zařízením. Aplikace také mohou vytvořit hotspot ke sdílení obsahu s okolními zařízeními."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Hotspot a tethering umožňují poskytovat připojení k internetu přes připojení Wi-Fi nebo mobilní datové připojení dalším zařízením. Aplikace také mohou vytvořit hotspot ke sdílení obsahu s okolními zařízeními."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Nápověda"</string>
@@ -1762,6 +1779,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Vyhledávání Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Povolit aplikacím a službám vyhledávat zařízení v okolí kdykoliv, i když je rozhraní Bluetooth vypnuté. Tuto funkci lze využít například ke zlepšení funkcí a služeb založených na poloze."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Služby určování polohy pro práci"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zjišťování časového pásma"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zjišťování časového pásma"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Umožňuje na základě polohy zařízení zjistit aktuální časové pásmo. Přesnost zjišťování časového pásma mohou ovlivnit další nastavení polohy, např. vyhledávání Wi-Fi."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Zapnuto"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Vypnuto"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatická detekce časového pásma je vypnutá"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Zjišťování časového pásma je deaktivováno"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Zjišťování časového pásma není podporováno"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Změny zjišťování časového pásma nejsou povoleny"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Poloha Wi-Fi a mobilní sítě"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Povolit aplikacím používat službu určování polohy Google a rychleji odhadovat vaši polohu. Anonymní data budou sbírána a odesílána Googlu."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Poloha určená sítí Wi-Fi"</string>
@@ -1825,6 +1851,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Nastavte heslo pro odemknutí obličejem"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Nastavte gesto pro odemknutí obličejem"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Nastavte PIN pro odemknutí obličejem"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Před aktivací biometrie nastavte heslo"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Před aktivací biometrie nastavte gesto"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Před aktivací biometrie nastavte PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Zapomněli jste heslo?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Zapomněli jste gesto?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Zapomněli jste PIN?"</string>
@@ -2165,13 +2194,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Předvolby titulků"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Zvětšení"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Oblast zvětšení"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Povolit zvětšení"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Vyberte oblast zvětšení, kterou chcete použít při zvětšení obrazovky"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Celá obrazovka"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Část obrazovky"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Celá obrazovka a část obrazovky"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Zvětšit celou obrazovku"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Zvětšit část obrazovky"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Přepnout na tlačítko přístupnosti?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Pokud ke zvětšení části obrazovky budete používat trojité klepnutí, při psaní a dalších akcích bude docházet ke zpoždění.\n\nChcete přepnout na zvětšování pomocí tlačítka přístupnosti?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Přepnout na tlačítko přístupnosti"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"I nadále ke zvětšení používat trojité klepnutí"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nastavení zvětšení"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Zvětšení trojitým klepnutím"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Zvětšení zkratkou"</string>
@@ -2225,11 +2257,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Vypínač ukončí hovor"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Velký kurzor myši"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Odstranit animace"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Zvuk mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Při přehrávání zvuku kombinovat kanály"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Vyvážení zvuku"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vlevo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Vpravo"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Zvuk mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Při přehrávání zvuku kombinovat kanály"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Vyvážení zvuku"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Vlevo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Vpravo"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Výchozí"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekund"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekund"</string>
@@ -2259,11 +2291,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibrace při oznámení"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibrace při vyzvánění"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Odezva klepnutí"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Použít <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otevřít aplikaci <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Používat korekci barev"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Zobrazit titulky"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Jen pro podporovanou aplikaci"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Použít <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otevřít adresu <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Používat korekci barev"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Zobrazit titulky"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Jen pro podporovanou aplikaci"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Velikost a styl titulků"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> velikost textu"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Další možnosti"</string>
@@ -2295,6 +2327,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomálie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomálie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomálie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Zešednutí obrazovky"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Červená a zelená"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Červená a zelená"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modrá a žlutá"</string>
@@ -2436,7 +2469,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Omezení na pozadí"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Povolit aplikaci spouštění na pozadí"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikace nemá povoleno spouštění na pozadí"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Využití na pozadí omezit nelze"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Využití na pozadí omezit nelze"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Omezit aktivitu na pozadí?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Pokud u aplikace omezíte aktivitu na pozadí, může dojít k nepředvídatelnému chování"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikace není nastavena k optimalizaci baterie, nelze ji tedy omezit.\n\nChcete-li ji omezit, nejprve zapněte optimalizaci."</string>
@@ -2485,6 +2518,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet byl využíván víc než obvykle"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Zařízení bylo využíváno víc než obvykle"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Baterie se možná vybije dříve než obvykle"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimalizace pro výdrž baterie"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Baterie je dočasně omezena. Klepnutím zobrazíte další informace."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefon byl využíván víc než obvykle. Baterie se možná vybije dříve, než bylo očekáváno.\n\nAplikace, které nejvíce spotřebovávají baterii:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablet byl využíván víc než obvykle. Baterie se možná vybije dříve, než bylo očekáváno.\n\nAplikace, které nejvíce spotřebovávají baterii:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Zařízení bylo využíváno víc než obvykle. Baterie se možná vybije dříve, než bylo očekáváno.\n\nAplikace, které nejvíce spotřebovávají baterii:"</string>
@@ -2554,6 +2589,8 @@
       <item quantity="one">Je omezena %1$d aplikace</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problém s načtením měřiče baterie"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problém s načtením měřiče baterie. Klepnutím "<annotation id="url">"zobrazíte další informace"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Zastavit aplikaci?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Telefon nemůže normálně šetřit baterii, protože mu aplikace <xliff:g id="APP">%1$s</xliff:g> znemožňuje přejít do režimu spánku.\n\nTento problém můžete zkusit vyřešit tím, že aplikaci ukončíte.\n\nPokud se to bude dít neustále, kvůli prodloužení výdrže baterie bude aplikaci možná nutné odinstalovat."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Tablet nemůže normálně šetřit baterii, protože mu aplikace <xliff:g id="APP">%1$s</xliff:g> znemožňuje přejít do režimu spánku.\n\nTento problém můžete zkusit vyřešit tím, že aplikaci ukončíte.\n\nPokud se to bude dít neustále, kvůli prodloužení výdrže baterie bude aplikaci možná nutné odinstalovat."</string>
@@ -2667,9 +2704,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Nastavení plánu"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prodloužení výdrže baterie"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Vypnout při nabití"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Spořič baterie se vypne, až bude telefon na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Spořič baterie se vypne, až bude tablet na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Spořič baterie se vypne, až bude zařízení na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Spořič baterie se vypne, až se telefon nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Spořič baterie se vypne, až se tablet nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Spořič baterie se vypne, až se zařízení nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Zapnout"</string>
@@ -2734,6 +2771,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Obnovit"</string>
     <string name="tts_play" msgid="2945513377250757221">"Přehrát"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"Síť VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptivní připojení"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Prodlužuje životnost baterie a zlepšuje výkon zařízení tím, že automaticky spravuje síťová připojení"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Úložiště pověření"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalace certifikátu"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Nainstalovat certifikáty z úložiště"</string>
@@ -2745,9 +2784,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Identifikační údaje uživatele"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Zobrazení a úprava uložených identifikačních údajů"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Rozšířené nastavení"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Typ úložiště"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarové"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Pouze software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Pro tohoto uživatele jsou identifikační údaje nedostupné."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nainstalováno pro síť VPN a aplikace"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Nainstalování pro síť Wi-Fi"</string>
@@ -2763,6 +2799,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Neinstalovat"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Přesto nainstalovat"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certifikát nebyl nainstalován"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Povolit aplikaci <xliff:g id="APP_NAME">%s</xliff:g> instalovat certifikáty do tohoto zařízení?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Tyto certifikáty vás identifikují pro níže uvedené aplikace a adresy URL"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Nepovolovat"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Povolit"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Zobrazit více"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Aplikace na správu certifikátů"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"–"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certifikáty nainstalované touto aplikací vás identifikují pro níže uvedené aplikace a adresy URL"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Odstranit"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Signál nouzového vytáčení"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Nastavit chování při tísňovém volání"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Zálohování"</string>
@@ -3096,7 +3141,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nenastaveno – pracovní profil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrátor"</string>
     <string name="user_you" msgid="3070562015202859996">"Vy (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Přezdívka"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Maximální počet přidávaných uživatelů: <xliff:g id="USER_COUNT">%1$d</xliff:g>"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Uživatele smí spravovat pouze vlastník tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Uživatele smí spravovat pouze vlastník telefonu."</string>
@@ -3146,7 +3190,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Platba na terminálu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Nastavte platební aplikaci. Poté jen přidržte telefon zadní stranou u terminálu se symbolem bezkontaktních plateb."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Rozumím"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Další..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Více…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Nastavení výchozí platební aplikace"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Aktualizace výchozí platební aplikace"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na bezkontaktním terminálu zaplaťte pomocí aplikace <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3216,9 +3260,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Zpět"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Další"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Dokončit"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Vyfotit"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Zvolit obrázek"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Vybrat fotografii"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM karty"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM karty"</string>
@@ -3230,7 +3271,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Vždy používat pro hovory"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Vyberte SIM kartu pro data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Vyberte SIM kartu pro SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Přepínání datových SIM karet, tato operace může chvíli trvat..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Přepínání datových SIM karet, tato operace může chvíli trvat…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Volat pomocí"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Vyberte SIM kartu"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM karta <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3416,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"sled činností, plán, spořič baterie, úspora energie, baterie, automatické, procenta"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, rozšířené volání, volání 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"přidat jazyk, přidání jazyka"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"velikost textu"</string>
     <string name="default_sound" msgid="6604374495015245195">"Výchozí zvuk"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Hlasitost vyzvánění a oznámení je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Hlasitost, vibrace, režim Nerušit"</string>
@@ -3414,13 +3456,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Zvuky při spouštění"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Okamžité titulky"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatické přepisy médií"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Žádné"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="few">Nastaveny <xliff:g id="ON_COUNT">%d</xliff:g> plány</item>
-      <item quantity="many">Nastaveno <xliff:g id="ON_COUNT">%d</xliff:g> plánu</item>
-      <item quantity="other">Nastaveno <xliff:g id="ON_COUNT">%d</xliff:g> plánů</item>
-      <item quantity="one">Nastaven 1 plán</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Žádný}=1{Nastaven 1 plán}few{Nastaveny # plány}many{Nastaveno # plánu}other{Nastaveno # plánů}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Nerušit"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Přijímat pouze oznámení od důležitých lidí a z důležitých aplikací"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Omezení vyrušení"</string>
@@ -3488,24 +3524,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Pouze prioritní"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Zapnuto / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Vypnuto / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Vypnuto"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Zapnuto"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pokaždé se zeptat"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dokud tuto funkci nevypnete"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> hodiny</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> hodiny</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hodin</item>
-      <item quantity="one">1 hodina</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> plány se mohou zapnout automaticky</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> plánu se může zapnout automaticky</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> plánů se může zapnout automaticky</item>
-      <item quantity="one">1 plán se může zapnout automaticky</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hodina}few{# hodiny}many{# hodiny}other{# hodin}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuta}few{# minuty}many{# minuty}other{# minut}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Vypnuto}=1{1 plán se může zapnout automaticky}few{Vypnuto / # plány se můžou zapnout automaticky}many{Vypnuto / # plánu se může zapnout automaticky}other{Vypnuto / # plánů se může zapnout automaticky}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Co smí vyrušovat režim Nerušit"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Lidé"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikace"</string>
@@ -3551,6 +3575,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Oznámení s nižší prioritou automaticky nastavit na Nenápadná"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptivní hodnocení oznámení"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automaticky oznámení hodnotit podle relevance"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Zpětná vazba k adaptivnímu oznámení"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Uvádět, jaké úpravy byly u oznámení provedeny, a ukazovat možnost poskytnout systému zpětnou vazbu"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Resetovat důležitost oznámení"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Resetovat nastavení důležitosti změněná uživatelem a povolit stanovení priority pomocí asistenta oznámení"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Navrhované akce a odpovědi"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automaticky zobrazovat navrhované akce a odpovědi"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Zobrazit nedávná a odložená oznámení"</string>
@@ -3650,8 +3678,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioritní konverzace"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Zobrazovat v horní části sekce konverzací a jako plovoucí bubliny"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Zobrazovat v horní části sekce konverzací"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Jiné konverzace"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Neprioritní konverzace"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Konverzace, ve kterých jste provedli změny"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Poslední konverzace"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Vymazat poslední"</string>
+    <string name="clear" msgid="5092178335409471100">"Vymazat"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prioritní konverzace automaticky zobrazovat jako bubliny"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritní konverzace se zobrazují v horní části vysouvacího panelu. Můžete také nastavit, aby se zobrazovaly v bublinách a v režimu Nerušit."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Zde se budou zobrazovat prioritní a upravené konverzace"</string>
@@ -3757,7 +3788,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Přístup při nastavení Nerušit"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Povolit režim Nerušit"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"O přístup při nastavení Nerušit nepožádaly žádné nainstalované aplikace"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Načítání aplikací..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Načítání aplikací…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Oznámení této aplikace jsou v zařízení na vaši žádost blokována systémem Android"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Tato kategorie oznámení je v zařízení na vaši žádost blokována systémem Android"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Tato skupina oznámení je v zařízení na vaši žádost blokována systémem Android"</string>
@@ -3855,13 +3886,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Všechny konverzace"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritní konverzace"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Žádné"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzace</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzace</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzací</item>
-      <item quantity="one">1 konverzace</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Žádné"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Žádná}=1{1 konverzace}few{# konverzace}many{# konverzace}other{# konverzací}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kdo smí vyrušovat"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Volání"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Volání"</string>
@@ -3870,13 +3895,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Pokud chcete, aby povolená volání vydávala zvuk, zkontrolujte, zda je zařízení nastavené na vyzvánění"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"V plánu <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> jsou blokovány příchozí hovory. Nastavení můžete upravit, aby se s vámi mohli spojit kamarádi, členové rodiny nebo jiné vybrané kontakty."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakty označené hvězdičkou"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="few"><xliff:g id="NUM_PEOPLE">%d</xliff:g> další</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> dalšího</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> dalších</item>
-      <item quantity="one">1 další</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Žádné"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nikdo}=1{{contact_1}}=2{{contact_1} a {contact_2}}=3{{contact_1}, {contact_2} a {contact_3}}few{{contact_1}, {contact_2} a # další}many{{contact_1}, {contact_2} a # dalšího}other{{contact_1}, {contact_2} a # dalších}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Bez jména)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Zprávy"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"zprávy"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Zprávy"</string>
@@ -3885,13 +3905,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"V plánu <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> jsou blokovány příchozí zprávy. Nastavení můžete upravit, aby se vám dovolali kamarádi, členové rodiny nebo jiné vybrané kontakty."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Kdokoli vám může poslat zprávu"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Kdokoli se vám může dovolat"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Žádné"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakty</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktu</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktů</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nikdo}=1{1 kontakt}few{# kontakty}many{# kontaktu}other{# kontaktů}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Kdokoli"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakty"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakty označené hvězdičkou"</string>
@@ -3929,26 +3943,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Všechna oznámení"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Některá oznámení"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Vybraní lidé vás stále budou moct kontaktovat, i když aplikacím zakážete vyrušovat"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="few">Vyrušovat mohou aplikace <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="many">Vyrušovat mohou aplikace <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="other">Vyrušovat mohou aplikace <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="one">Vyrušovat může aplikace <xliff:g id="APP_NAME_0">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ještě <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Vyrušovat nemohou žádné aplikace}=1{Vyrušovat může aplikace {app_1}}=2{Vyrušovat můžou aplikace {app_1} a {app_2}}=3{Vyrušovat můžou aplikace {app_1}, {app_2} a {app_3}}few{Vyrušovat můžou aplikace {app_1}, {app_2} a # další}many{Vyrušovat můžou aplikace {app_1}, {app_2} a # další}other{Vyrušovat můžou aplikace {app_1}, {app_2} a # dalších}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikace"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Všechna oznámení"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Některá oznámení"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Oznámení, která smí vyrušovat"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Povolit všechna oznámení"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="few">Vyrušovat mohou <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="many">Vyrušovat mohou <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="other">Vyrušovat mohou <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="one">Vyrušovat mohou <xliff:g id="SOUND_CATEGORY">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nic nemůže vyrušovat"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ještě <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nic nemůže vyrušovat}=1{Vyrušovat může zvuk {sound_category_1}}=2{Vyrušovat můžou zvuky {sound_category_1} a {sound_category_2}}=3{Vyrušovat můžou zvuky {sound_category_1}, {sound_category_2} a {sound_category_3}}few{Vyrušovat můžou zvuky {sound_category_1}, {sound_category_2} a # další}many{Vyrušovat můžou zvuky {sound_category_1}, {sound_category_2} a # dalšího}other{Vyrušovat můžou zvuky {sound_category_1}, {sound_category_2} a # dalších}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nic nemůže vyrušovat"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nikdo nemůže vyrušovat"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Vyrušovat mohou někteří lidé"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Všichni lidé mohou vyrušovat"</string>
@@ -3998,8 +4000,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Zapnuto"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Vypnuto"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Připnutí aplikace"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Připnutí aplikace vám umožňuje nechat aktuální obrazovku zobrazenou, dokud ji neodepnete. Tuto funkci lze použít, například když chcete nechat důvěryhodného přítele hrát konkrétní hru. \n\nKdyž je aplikace připnutá, může otevírat další aplikace a mít přístup k soukromým datům. \n\nPoužití připnutí aplikace: 	\n1.	Zapněte připnutí aplikace 	\n2.	Otevřete Přehled 	\n3.	Klepněte na ikonu aplikace v horní části obrazovky a potom na Připnout"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Připnutí aplikace vám umožňuje nechat aktuální obrazovku zobrazenou, dokud ji neodepnete. Tuto funkci lze použít, například když chcete nechat důvěryhodného přítele hrát konkrétní hru. \n\nKdyž je aplikace připnutá, může otevírat další aplikace a mít přístup k soukromým datům. \n\nChcete-li s někým bezpečně sdílet zařízení, zkuste namísto toho použít režim hosta. \n\nPoužití připnutí aplikace: 	\n1.	Zapněte připnutí aplikace 	\n2.	Otevřete Přehled 	\n3.	Klepněte na ikonu aplikace v horní části obrazovky a potom na Připnout"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Připnutí aplikace vám umožňuje nechat aktuální obrazovku zobrazenou, dokud ji neodepnete. Tuto funkci lze použít, například když chcete nechat důvěryhodného přítele hrát konkrétní hru."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Když je aplikace připnutá, může otevírat další aplikace a mít přístup k soukromým datům. \n\nPoužití připnutí aplikace: 	\n1.	Zapněte připnutí aplikace 	\n2.	Otevřete Přehled 	\n3.	Klepněte na ikonu aplikace v horní části obrazovky a potom na Připnout"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Když je aplikace připnutá, může otevírat další aplikace a mít přístup k soukromým datům. \n\nChcete-li s někým bezpečně sdílet zařízení, zkuste místo toho použít režim hosta. \n\nPoužití připnutí aplikace: 	\n1.	Zapněte připnutí aplikace 	\n2.	Otevřete Přehled 	\n3.	Klepněte na ikonu aplikace v horní části obrazovky a potom na Připnout"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Když je aplikace připnutá: \n\n• Může mít přístup k soukromým datům \n (například kontaktům a obsahu e-mailů) \n• Připnutá aplikace může otevírat další aplikace \n\nPřipnutí aplikace používejte pouze s lidmi, kterým důvěřujete."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Před uvolněním požádat o bezpečnostní gesto"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Před uvolněním požádat o PIN"</string>
@@ -4021,6 +4024,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Kromě odemykání pomocí obličeje můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadován PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadován PIN?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Kromě odemykání pomocí obličeje můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadováno gesto. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno gesto?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Kromě odemykání pomocí obličeje můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadováno heslo. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno heslo?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Kromě odemykání pomocí biometrie můžete toto zařízení dále ochránit tak, že před jeho spuštěním bude požadován kód PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadován PIN?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Kromě odemykání pomocí biometrie můžete toto zařízení dále ochránit tak, že před jeho spuštěním bude požadováno gesto. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno gesto?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Kromě odemykání pomocí biometrie můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadováno heslo. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno heslo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ano"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Omezené"</string>
@@ -4212,7 +4218,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ovládá:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Připojené zařízení"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Toto zařízení"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Přepínání..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Přepínání…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nelze přepnout"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Nabíjení zařízení"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Nabíjení připojeného zařízení"</string>
@@ -4414,6 +4420,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Využití mobilních dat"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Využití dat aplikací"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Využití dat přes Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Využití dat mimo operátora"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Využití dat přes ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4434,6 +4441,7 @@
       <item quantity="one">1 omezení</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operátor může data počítat jinak než zařízení"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Vyloučí data využitá sítěmi operátora"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Využito <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nastavit upozornění na data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozornění na data"</string>
@@ -4473,7 +4481,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Zobrazit podrobnosti"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Spořič dat"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neomezená data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Data na pozadí jsou vypnuta"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Data na pozadí jsou vypnuta"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Zapnuto"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Vypnuto"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Použít spořič dat"</string>
@@ -4496,7 +4504,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Pokud je zařízení zamknuté, zakázat psaní odpovědí a jiných textů do oznámení"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Výchozí kontrola pravopisu"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Výběr kontroly pravopisu"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Použít kontrolu pravopisu"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Používat kontrolu pravopisu"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nevybráno"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(žádný)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4602,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Správce úložiště vám pomůže uvolnit místo v úložišti tím, že ze zařízení odstraní zálohované fotky a videa."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Odstranit fotky a videa"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Správce úložiště"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Používat správce úložiště"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Používat správce úložiště"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automaticky"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ruční"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Uvolnit místo"</string>
@@ -4632,6 +4640,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Kontrola telefonu dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Kontrola tabletu dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Kontrola zařízení dvojitým klepnutím"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Zobrazení oznámení přejetím prstem"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Oznámení zobrazíte přejetím prstem dolů na dolním okraji obrazovky"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Režim jedné ruky"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Použít režim jedné ruky"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Ukončit při přepnutí aplikací"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Časový limit"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekundy"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekund"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekund"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"dosažitelnost"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Chcete-li zobrazit čas, oznámení a další informace, dvakrát klepněte na obrazovku."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Kontrola telefonu zvednutím"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Kontrola tabletu zvednutím"</string>
@@ -4644,6 +4662,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Kontrola tabletu klepnutím"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Kontrola zařízení klepnutím"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Chcete-li zobrazit čas, oznámení a další informace, klepněte na obrazovku."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Nouzové SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Použití nouzového SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Spravováno aplikací <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Níže uvedené akce spustíte, když pětkrát za sebou rychle stisknete vypínač"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Přehrát upozornění na odpočet"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Přehrát hlasitý zvuk před zavoláním pomoci"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Zavolat pomoc"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Číslo k zavolání pomoci"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Klepnutím změníte"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Pokud nezadáte číslo tísňového volání:\n • Zařízení bude muset být odemčené, abyste mohli použít nouzové SOS\n • Je možné, že hovor nikdo nepřijme"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sejmout otisk prstu pro zobrazení oznámení"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sejmout otisk prstu"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně telefonu."</string>
@@ -4783,6 +4811,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Max. viditelných datových sad"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Resetovat na výchozí hodnoty"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Možnosti automatického vyplňování pro vývojáře byly resetovány"</string>
+    <string name="location_category" msgid="3496759112306219062">"Poloha"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indikátor polohy na stavovém řádku"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Zobrazit u všech poloh (včetně polohy zjištěné ze sítě a připojení)"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Vynutit úplné měření GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Sledovat všechny konstelace a frekvence GNSS bez cyklického vypínání a zapínání"</string>
     <string name="device_theme" msgid="5027604586494772471">"Motiv zařízení"</string>
     <string name="default_theme" msgid="4815428567082263639">"Výchozí"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Název sítě"</string>
@@ -4799,8 +4832,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pokud nechcete být rušeni, oznámení pozastavte"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funkce není k dispozici"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Tato funkce byla vypnuta, protože zpomaluje telefon"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Vynutit úplné měření GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Sledovat všechny konstelace a frekvence GNSS bez cyklického vypínání a zapínání"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Vždy zobrazit dialog o pádu"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Zobrazit dialog při každém pádu aplikace"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Vyberte aplikaci podporující ANGLE"</string>
@@ -4812,7 +4843,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Zapnout pro všechny aplikace"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Vyberte ovladač grafiky"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Výchozí"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Herní ovladač"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Herní ovladač"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ovladač pro vývojáře"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Systémový ovladač grafiky"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4868,7 +4899,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Zapnuto (ztlumeno)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Vypnuto"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Podrobnosti sítě"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Název vašeho zařízení je viditelný pro aplikace v telefonu. Mohou ho vidět také ostatní uživatelé, když se připojíte k zařízení Bluetooth nebo hotspotu Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Název vašeho zařízení je viditelný pro aplikace v telefonu. Mohou ho vidět také ostatní uživatelé, když se připojíte k zařízení Bluetooth nebo síti Wi-Fi, případně když vytvoříte hotspot Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Zařízení"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Všechna nastavení"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Návrhy"</string>
@@ -4881,6 +4912,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nebyla nalezena žádná síť. Zkuste to znovu."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(zakázáno)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Chybí SIM karta"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Žádná SIM karta"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Žádné"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"K připojení vyžaduje SIM kartu"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"K připojení vyžaduje SIM kartu <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferovaný režim sítě: preferováno WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferovaný režim sítě: pouze GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferovaný režim sítě: pouze WCDMA"</string>
@@ -4934,6 +4970,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilní data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Přistupovat k datům přes mobilní síť"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon se v dosahu automaticky přepne na tohoto operátora"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Není k dispozici žádná SIM karta"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Předvolby hovorů"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Předvolby SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pokaždé se zeptat"</string>
@@ -4996,6 +5033,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Při připojení k operátorovi <xliff:g id="CARRIER">%1$s</xliff:g> nedostupné"</string>
     <string name="see_more" msgid="7499355691042812723">"Zobrazit další"</string>
     <string name="see_less" msgid="2642392725363552793">"Zobrazit méně"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Zapnout operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Zapnout SIM kartu?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Přepnout na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Přepnout na SIM kartu?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"V jednu chvíli může být aktivní pouze jedna SIM karta.\n\nPřepnutím na operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nezrušíte službu <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"V jednu chvíli může být aktivní pouze jedna stažená SIM karta.\n\nPřepnutím na operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nezrušíte službu <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"V jednu chvíli může být aktivní pouze jedna SIM karta.\n\nPřepnutím nezrušíte službu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Přepnout na síť <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Připojování k síti…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Přepínání na síť <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operátora nelze přepnout"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operátora kvůli chybě nelze přepnout."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vypnout operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vypnout SIM kartu?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Vypínání SIM karty<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operátora nelze deaktivovat"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Něco se pokazilo a deaktivace operátora se nezdařila."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Používat dvě SIM karty?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"V tomto zařízení lze používat dvě SIM karty současně. Chcete-li používat jen jednu, klepněte na „Ne, díky“."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Restartovat zařízení?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Nejprve restartujte zařízení. Poté budete moci přidat druhou SIM kartu."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Pokračovat"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Restartovat"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, díky"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Přepnout"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM kartu nelze aktivovat"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Vyjměte SIM kartu a znovu ji vložte. Pokud problém přetrvává, restartujte zařízení."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Zkuste SIM kartu znovu zapnout. Pokud problém přetrvává, restartujte zařízení."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivace sítě"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Číslo <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivní"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Klepnutím aktualizujete nastavení SIM karty"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM karta"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Vymazat staženou SIM kartu?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Když vymažete tuto SIM kartu, ze zařízení bude odebrán operátor <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>.\n\nSlužba operátora <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> zrušena nebude."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Vymazat"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Mazání SIM karty…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM kartu nelze vymazat"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Tuto SIM kartu nelze vymazat z důvodu chyby.\n\nRestartujte zařízení a zkuste to znovu."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Připojení k zařízení"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikace <xliff:g id="APPNAME">%1$s</xliff:g> chce za účelem připojení k zařízení použít dočasnou síť Wi-Fi"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nebyla nalezena žádná zařízení. Zajistěte, aby zařízení byla zapnutá a dostupná k připojení."</string>
@@ -5071,6 +5146,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Tísňová volání"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Tísňová volání pomocí funkce volání přes Wi-Fi váš operátor nepodporuje.\nZařízení se automaticky přepne na mobilní síť, aby mohlo provést tísňové volání.\nTísňová volání lze uskutečnit jen v oblastech s mobilním signálem."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Používat k volání připojení Wi-Fi s cílem zvýšit kvalitu"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Volání napříč SIM kartami"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Povolit pro tuto SIM kartu hovory a SMS z jiné SIM karty."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"volání napříč SIM kartami"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Příchozí zpráva MMS"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Zprávu MMS se nepodařilo odeslat"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Klepnutím povolíte zprávy MMS u operátora <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> při vypnutých mobilních datech"</string>
@@ -5122,10 +5200,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Povolte překryvné vrstvy obrazovek v Nastavení"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Povolte aplikace, které se smí zobrazovat přes jiné aplikace a vytvářet vrstvy obrazovek Nastavení"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Média"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Skrýt přehrávač po ukončení relace média"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Přehrávač umožňuje obnovit relaci z rozbaleného panelu Rychlé nastavení."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Přehrávač médií v rychlém nastavení"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Zobrazit přehrávač médií delší dobu, aby bylo snadné obnovit přehrávání"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Skrýt přehrávač"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Zobrazit přehrávač"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nejsou k dispozici žádné přehrávače"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Povolené aplikace"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"média"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Zapne se Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Zapnuto"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Vypnuto"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM karty"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Sítě bezpečné v letadle"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Najděte sítě bezpečné v letadle a připojte se k nim"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"letadlo, bezpečné v letadle"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Volání a SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Volání přes Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Uskutečňujte a přijímejte hovory přes sítě nespravované operátory, např. přes Wi-Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Volání přes Wi-Fi umožňuje uskutečňovat a přijímat hovory ze sítí nespravované operátory, jako jsou některé sítě Wi-Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Volání"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferované"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"preferované hovory"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"preferované SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"není k dispozici"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Žádná SIM karta"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Předvolby"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Připojovat k veřejným sítím"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"připojení k síti, internet, bezdrátové, data, wifi, wi-fi, wi fi, mobilní síť, mobilní operátor, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Zobrazit sítě bezpečné pro letadlo"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Vypnout režim Letadlo"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nedostupné, protože je zapnutý režim večerky"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Reset důležitosti oznámení byl dokončen."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikace"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nedůvěryhodné zařízení žádá o přístup k vašim zprávám. Podrobnosti zobrazíte klepnutím."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Chcete povolit přístup ke zprávám?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nedůvěryhodné zařízení Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] žádá o přístup k vašim zprávám.\n\nK zařízení [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] jste se ještě nikdy nepřipojili."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nedůvěryhodné zařízení žádá o přístup k vašim kontaktům a seznamu hovorů. Podrobnosti zobrazíte klepnutím."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Chcete povolit přístup ke kontaktům a seznamu hovorů?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nedůvěryhodné zařízení Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] žádá o přístup k vašim kontaktům a seznamu hovorů. To zahrnuje data o příchozích a odchozích hovorech.\n\nK zařízení [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] jste se ještě nikdy nepřipojili."</string>
 </resources>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 2aa7c34..5a4e9e3 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Mellem"</item>
     <item msgid="6740026006576843477">"Lang"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kort"</item>
+    <item msgid="7397961711906421599">"Mellem"</item>
+    <item msgid="4079132024502041928">"Langt"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standard"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Kun TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 1b1d6e3..c90a66e 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Dato og tid"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Angiv dato og klokkeslæt"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Angiv dato, klokkeslæt, tidszone og formater"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Brug netværkets tid"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Brug netværkets tidszone"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Indstil klokkeslættet automatisk"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Indstil tidszonen automatisk"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Brug landestandard"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-timersformat"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Brug 24-timers format"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Vis profiloplysninger på låseskærmen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Konti"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Placering"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Brug placering"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Brug placering"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Fra"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Til – <xliff:g id="COUNT_1">%1$d</xliff:g> app har adgang til din placering</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skærmlås, Ansigtslås"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skærmlås, fingeraftryk"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Skærmlås"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Lås din telefon op på sikker vis med ansigt og fingeraftryk"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Du kan også logge ind på apps og bekræfte betalinger"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Konfigurer oplåsning med:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Ansigtslås"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Gør det nemt at låse telefonen op"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingeraftryk"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Lås telefonen op i lommen, og spar tid"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Spring over"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Næste"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Ansigt tilføjet"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Konfigurer ansigtslås"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Ansigtslås"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Brug dit ansigt til godkendelse"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Hvis hjælpefunktionen Ansigtslås er deaktiveret, vil nogle konfigurationstrin muligvis ikke fungere korrekt via TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Gå tilbage"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Fortsæt konfig."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Brug avanceret konfiguration"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Kræv altid et bekræftelsestrin ved brug af ansigtslås i apps"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Slet ansigtsdata"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Konfigurer ansigtslås"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Brug ansigtslås til at låse din enhed op, logge ind på apps og bekræfte betalinger.\n\nBemærk!\nDu kan komme til at låse telefonen op, hvis du kigger på den.\n\nDin telefon kan låses op af en anden, hvis den holdes op foran dit ansigt.\n\nDin telefon kan låses op af en anden, der ligner dig meget, f.eks. en søskende."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Brug ansigtslås til at låse din enhed op, logge ind på apps og bekræfte betalinger.\n\nBemærk!\nDu kan komme til at låse telefonen op, hvis du kigger på den.\n\nDin telefon kan låses op af en anden, hvis den holdes op foran dit ansigt, også selvom dine øjne er lukkede.\n\nDin telefon kan låses op af en anden, der ligner dig meget, f.eks. en tvilling."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Brug ansigtslås til at låse din enhed op, logge ind i apps og bekræfte betalinger."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Husk!\nDu kan komme til at låse telefonen op, hvis du kigger på den.\n\nDin telefon kan blive låst op af en anden, hvis den holdes op foran dit ansigt.\n\nDin telefon kan låses op af andre, der ligner dig meget, f.eks. en tvilling."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Husk!\nDu kan komme til at låse telefonen op, hvis du kigger på den.\n\nDin telefon kan blive låst op af en anden, hvis den holdes op foran dit ansigt, også selvom dine øjne er lukkede.\n\nDin telefon kan låses op af andre, der ligner dig meget, f.eks. en tvilling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vil du slette ansigtsdata?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"De ansigtsdata, der anvendes af ansigtslåsen, slettes permanent og forsvarligt. Efter fjernelsen skal du bruge din pinkode, dit mønster eller din adgangskode til at låse telefonen op, logge ind i apps og bekræfte betalinger."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Brug ansigtslås til at låse din telefon op"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Lås din telefon op eller godkend køb ved hjælp af dit fingeraftryk.\n\nBemærk! Du kan ikke bruge dit fingeraftryk til at låse op for denne enhed. Få flere oplysninger ved at kontakte administratoren for din organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Lås din telefon op eller godkend køb ved hjælp af dit fingeraftryk.\n\nBemærk! Dit fingeraftryk kan være mindre sikkert end et stærkt mønster eller en pinkode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuller"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nej tak"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Fortsæt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Spring over"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Næste"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Når du beskytter din tablet med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtslås. Tryk på Annuller for at gå tilbage."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Når du beskytter din enhed med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtslås. Tryk på Annuller for at gå tilbage."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Når du beskytter din telefon med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også bruge en skærmlås for at konfigurere ansigtslås. Tryk på Annuller for at gå tilbage."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Når du beskytter din tablet med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også have en skærmlås, hvis du vil konfigurere biometriske systemer. Tryk på Annuller for at gå tilbage."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Når du beskytter din enhed med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også have en skærmlås, hvis du vil konfigurere biometriske systemer. Tryk på Annuller for at gå tilbage."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Når du beskytter din telefon med en skærmlås, kan ingen bruge den, hvis du mister den, eller den bliver stjålet. Du skal også have en skærmlås, hvis du vil konfigurere biometriske systemer. Tryk på Annuller for at gå tilbage."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Vil du springe pinkodekonfiguration over?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Vil du springe adgangskodekonfiguration over?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Vil du springe mønsterkonfiguration over?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Du kan forhindre andre i at bruge denne tablet uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Du kan forhindre andre i at bruge denne enhed uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelser. Vælg den skærmlås, du vil bruge."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Du kan forhindre andre i at bruge denne telefon uden din tilladelse ved at aktivere funktionerne til enhedsbeskyttelse. Vælg den skærmlås, du vil bruge."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Vælg din alternative metode til skærmlåsning"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Vælg din alternative metode til skærmlåsning"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Vælg din alternative metode til skærmlåsning"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Valgmuligheder for skærmlås"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Valgmuligheder for skærmlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Skærmlås"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Ansigtslås + adgangskode"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Fortsæt uden ansigtslås"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Du kan låse din telefonen op ved hjælp af dit ansigt. Af hensyn til sikkerheden kræver denne mulighed en alternativ skærmlås."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometriske systemer + mønster"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometriske systemer + pinkode"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometriske systemer + adgangskode"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Fortsæt uden biometriske systemer"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Du kan låse telefonen op ved hjælp af biometriske systemer. Af hensyn til sikkerheden kræver denne mulighed en alternativ skærmlås."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Deaktiveret af administrator, krypteringspolitik eller Lager for loginoplysninger"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Stryg"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">Skal indeholde færre end <xliff:g id="NUMBER_1">%d</xliff:g> cifre</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Enhedens administrator tillader ikke brug af en nylig brugt pinkode"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Brug af almindelige pinkoder er blokeret af din it-administrator. Prøv en anden pinkode."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Der kan ikke bruges et ugyldigt tegn"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Skal indeholde mindst ét bogstav"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Skal indeholde mindst ét tal"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">Skal indeholde mindst <xliff:g id="COUNT">%d</xliff:g> tegn, som ikke er et tal</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Enhedens administrator tillader ikke brug af en nylig brugt adgangskode"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Brug af almindelige adgangskoder er blokeret af din it-administrator. Prøv en anden adgangskode."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Stigende eller faldende talsekvens og gentagne tal er ikke tilladt"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bekræft"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Annuller"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Slå Wi-Fi til"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Brug Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Brug Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Indstillinger for Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Konfiguration og administration af trådløse adgangspunkter"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrer QR-koden nedenfor for at oprette forbindelse til \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Opret forbindelse til Wi-Fi-netværket ved at scanne en QR-kode"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Del Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan denne QR-kode for at oprette forbindelse til \"<xliff:g id="SSID">%1$s</xliff:g>\" og dele adgangskoden"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan denne QR-kode med en anden enhed for at oprette forbindelse til \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan denne QR-kode for at oprette forbindelse til \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Prøv igen. Hvis problemet fortsætter, skal du kontakte enhedsproducenten"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Noget gik galt"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Adgangskode til Wi-Fi-netværk: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Adgangskode til hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Opret automatisk forbindelse"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Tillad, at telefonen automatisk opretter forbindelse, når den er i nærheden af dette netværk"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Tillad, at din tablet automatisk opretter forbindelse, når den er i nærheden af dette netværk"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Tillad forbindelse til dette netværk, når det er inden for rækkevidde"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Tilføj enhed"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Brug en QR-kode til at føje en enhed til dette netværk"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-koden har ikke et gyldigt format"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Brug systemets certifikater"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Angiv ikke"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Bekræft ikke"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Der er ikke angivet noget certifikat. Din forbindelse er ikke privat."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Netværksnavnet er for langt."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domæne skal angives."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certifikat er påkrævet."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Forbind"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi er slået til"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Forbundet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Opretter forbindelse til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Tilslutter…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Der kunne ikke oprettes forbindelse til netværket"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Netværket er ikke inden for rækkevidde"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Enhedens MAC-adresse"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Tilfældig MAC-adresse"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Tilfældig MAC-adresse (sidst anvendt)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-adresse"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Netværksoplysninger"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Undernetmaske"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-adresser"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Gemte netværk"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abonnementer"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Andre netværk"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP-indstillinger"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Avancerede Wi-Fi-indstillinger er ikke tilgængelige for denne bruger"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Gem"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Angiv en gyldig gatewayadresse."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Angiv en gyldig DNS-adresse."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Angiv gyldigt netværkspræfiks på 0-32 tegn."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (undtagen ved tilsidesættelse med privat DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (undtagen ved tilsidesættelse med privat DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Længde på netværkspræfiks"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Appen deler indhold. Hvis du vil dele internetforbindelsen, skal du deaktivere hotspot og derefter aktivere det"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Der er ikke indstillet nogen adgangskode"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Navn på hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Aktiverer <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Aktiverer <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Andre enheder kan oprette forbindelse til <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Adgangskode til hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-bånd"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Øger automatisk opdateringshastigheden fra 60 til 90 Hz for noget indhold. Medfører højere batteriforbrug."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Gennemtving en opdateringshastighed på 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Den højeste opdateringshastighed, som giver forbedret animationskvalitet og reaktionsevne ved berøring. Medfører højere batteriforbrug."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Opmærksom skærm"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Til – Skærmen slukker ikke, når du kigger på den"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Når skærmen er mørk, aktiveres den ved modtagelse af nye notifikationer"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vis altid tidspunkt og info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Øget batteriforbrug"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Brug fed tekst"</string>
     <string name="title_font_size" msgid="570613010306330622">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Gør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Indstillinger for låst SIM-kort"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Sikkerhedsopdatering til Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model og hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardwareversion"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Udstyrs-id"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Slet adgangspunkt"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nyt adgangspunkt"</string>
     <string name="menu_save" msgid="6611465355127483100">"Gem"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Kassér"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Luk"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Feltet Navn skal udfyldes."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Du skal angive et adgangspunkt."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Apps kan nulstilles"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Nulstil Wi-Fi, mobil og Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Denne handling nulstiller alle netværksindstillinger, bl.a.:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Ryd"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Ryd downloadede SIM-kort"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Kontakt dit mobilselskab for at downloade nye SIM-kort. Mobilabonnementer opsiges ikke."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Mobilabonnementer opsiges ikke. Kontakt dit mobilselskab for at downloade nye SIM-kort."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Nulstil indstillinger"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Vil du nulstille alle netværksindstillinger? Denne handling kan ikke fortrydes."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Vil du nulstille alle netværksindstillingerne og rydde downloadede SIM-kort? Denne handling kan ikke fortrydes."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Netværksindstillingerne er blevet nulstillet"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-kortene kan ikke ryddes"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloadede SIM-kort kan ikke ryddes på grund af en fejl.\n\nGenstart din enhed, og prøv igen."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Ryd alle data (gendan fabriksindstillinger)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Ryd alle data (nulstil)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Dette sletter alle data fra den "<b>"interne lagerplads"</b>" på din tablet, f.eks.: \n\n"<li>"Din Google-konto"</li>\n<li>"Data og indstillinger for system og apps"</li>\n<li>"Downloadede apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Dette sletter alle data fra den "<b>"interne lagerplads"</b>" på telefonen, f.eks.: \n\n"<li>"Din Google-konto"</li>\n<li>"Data og indstillinger for system og apps"</li>\n<li>"Downloadede apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Du er i øjeblikket logget ind på disse konti:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Der er andre brugere til stede på denne enhed.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-kort"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Dette vil ikke automatisk opsige dit mobilabonnement."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Ryd musik, billeder og andre brugerdata ved at formatere "<b>"USB-lager"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Hvis du vil rydde musik, billeder og andre brugerdata, skal du formatere "<b>"SD-kortet"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Ryd alle data (gendan fabriksindstillinger)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Ryd alle data (gendan fabriksindstillinger)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Dette rydder alle data fra den "<b>"interne lagerplads"</b>" på din tablet, f.eks.: \n\n"<li>"Din Google-konto"</li>\n<li>"Data og indstillinger for system og apps"</li>\n<li>"Downloadede apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Dette rydder alle data fra den "<b>"interne lagerplads"</b>" på din telefon, f.eks.: \n\n"<li>"Din Google-konto"</li>\n<li>"Data og indstillinger for system og apps"</li>\n<li>"Downloadede apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Du er i øjeblikket logget ind på følgende konti:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Der er andre brugere til stede på denne enhed.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musik"</li>\n<li>"Billeder"</li>\n<li>"Andre brugerdata"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-kort"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Dette opsiger ikke automatisk dit mobilabonnement."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Ryd musik, billeder og andre brugerdata ved at rydde "<b>"USB-lageret"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Hvis du vil rydde musik, billeder og andre brugerdata, skal du rydde "<b>"SD-kortet"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Slet USB-lager"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Formatér SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Slet alle data på det interne USB-lager, f.eks. musik eller billeder"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Formatér alle data på SD-kortet, f.eks. musik eller billeder"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Ryd alle data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Ryd alle data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Alle dine personlige oplysninger og downloadede apps slettes. Denne handling kan ikke fortrydes."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Alle dine personlige oplysninger, bl.a. downloadede apps og SIM-kort, slettes. Denne handling kan ikke fortrydes."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Slet alt"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Der blev ikke foretaget nogen nulstilling, fordi tjenesten Systemoprydning ikke er tilgængelig."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vil du slette alle data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Gendannelse af fabriksindstillinger er ikke tilgængeligt for denne bruger"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Sletter…"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Vent et øjeblik…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Ryd alle data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Ryd alle data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Alle dine personlige oplysninger og downloadede apps slettes. Denne handling kan ikke fortrydes."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Alle dine personlige oplysninger, bl.a. downloadede apps og SIM-kort, slettes. Denne handling kan ikke fortrydes."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vil du rydde alle data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Det er ikke muligt for denne bruger at gendanne fabriksindstillingerne"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Rydder"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Vent et øjeblik…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Indstillinger for opkald"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Konfigurer telefonsvarer, viderestilling af opkald, ventende opkald, opkalds-id"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Netdeling via USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Netdeling kan ikke bruges til mere end <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheder."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Netdelingen med <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vil blive afbrudt."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Netdeling via Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Del telefonens internetforbindelse via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Del telefonens internetforbindelse via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Brug hotspot og netdeling til at give andre enheder adgang til internettet via din mobildataforbindelse. Apps kan også oprette et hotspot for at dele indhold med enheder i nærheden."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Brug hotspot og netdeling til at give andre enheder adgang til internettet via din Wi-Fi- eller mobildataforbindelse. Apps kan også oprette et hotspot til at dele indhold med enheder i nærheden."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hjælp"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Tillad, at apps og tjenester altid kan søge efter enheder i nærheden, også selvom Bluetooth er deaktiveret. Dette kan f.eks. bruges til at forbedre placeringsbaserede funktioner og tjenester."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Placeringstjenester til arbejdet"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Registrering af tidszone ved hjælp af placering"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Registrering af tidszone ved hjælp af placering"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Tillad, at enhedens placering bruges til at registrere den aktuelle tidszone. Andre placeringsindstillinger, f.eks. Wi-Fi-scanning, kan påvirke nøjagtigheden af tidszoneregistrering."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aktiveret"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Deaktiveret"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatisk registrering af tidszone er deaktiveret"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Registrering af tidszone ved hjælp af placering er deaktiveret"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Registrering af tidszone ved hjælp af placering understøttes ikke"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Ændringer i forbindelse med registrering af tidszone ved hjælp af placering er ikke tilladt"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Placering af Wi-Fi- og mobilnet."</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Tillad, at apps bruger Googles placeringstjeneste til at beregne din placering hurtigere. Der indsamles anonyme placeringsdata, som sendes til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Placeringen fastlægges af Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Angiv sikkerhedskopi for ansigtslås"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Angiv mønster for at bruge ansigtslås"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Angiv pinkode for at bruge ansigtslås"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Angiv adgangskode for at bruge biometriske systemer"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Angiv mønster for at bruge biometriske systemer"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Angiv pinkode for at bruge biometriske systemer"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Har du glemt din adgangskode?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Har du glemt dit mønster?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Har du glemt din pinkode?"</string>
@@ -1808,7 +1837,7 @@
     <string name="lock_settings_title" msgid="665707559508132349">"Enhedssikkerhed"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"Skift oplåsningsmønster"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="7327409886587802756">"Skift pinkode til oplåsning"</string>
-    <string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"Tegn et oplåsningsmønster"</string>
+    <string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"Tegn et mønster til at låse op"</string>
     <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"Tryk på Menu for at få hjælp."</string>
     <string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"Slip, når du er færdig"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"Forbind mindst <xliff:g id="NUMBER">%d</xliff:g> punkter. Prøv igen."</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Præferencer for undertekster"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Forstørrelse"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Forstørrelsesområde"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Aktivering af forstørrelse"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Vælg de områder, du vil bruge, når du forstørrer skærmen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Fuld skærm"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"En del af skærmen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Fuld skærm og en del af skærmen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Forstør hele skærmen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Forstør en del af skærmen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vil du skifte til knappen Hjælpefunktioner?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Hvis du bruger bevægelsen med tre tryk til at forstørre dele af skærmen, forsinker det indtastning og andre handlinger.\n\nVil du skifte til at bruge knappen Hjælpefunktioner til at forstørre skærmen?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Skift til knappen Hjælpefunktioner"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Behold bevægelsen med tre tryk for at forstørre"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Forstørrelsesindstillinger"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Tryk tre gange for at forstørre"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Brug en genvej til forstørrelse"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Afbryderknap afslutter opkald"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Stor musemarkør"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Fjern animationer"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monolyd"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombiner kanaler ved afspilning af lyd"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Lydbalance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Venstre"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Højre"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monolyd"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombiner kanaler ved afspilning af lyd"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Lydbalance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Venstre"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Højre"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Standard"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekunder"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekunder"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibration ved notifikation"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibration ved opkald"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback ved tryk"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Brug <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Åbn <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Brug farvekorrigering"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Vis undertekster"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Kun til understøttet app"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Brug <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Åbn <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Brug farvekorrigering"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Vis undertekster"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Kun til understøttet app"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tekststørrelse og format"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tekststørrelse <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Flere valgmuligheder"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Gråtoner"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rød-grøn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rød-grøn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blå-gul"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Begrænsning af baggrundsaktivitet"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Giv appen tilladelse til at køre i baggrunden"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Appen har ikke tilladelse til at køre i baggrunden"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Baggrundsforbruget kan ikke begrænses"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Baggrundsforbruget kan ikke begrænses"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vil du begrænse baggrundsaktiviteten?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Hvis du begrænser en apps baggrundsaktivitet, kan det medføre, at den ikke fungerer korrekt"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Appen kan ikke begrænses, da batterioptimering er deaktiveret.\n\nAktivér batterioptimering for at begrænse appen."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Din tablet er blevet brugt mere end normalt"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Enheden er blevet brugt mere end normalt"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Batteriet aflades muligvis hurtigere end normalt"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimerer på baggrund af batteritilstanden"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batteriet er midlertidigt begrænset. Tryk for at få flere oplysninger."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Din telefon er blevet brugt mere end normalt. Dit batteri aflades muligvis hurtigere end forventet.\n\nHer kan du se apps sorteret efter batteriforbrug:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Din tablet er blevet brugt mere end normalt. Dit batteri aflades muligvis hurtigere end forventet.\n\nHer kan du se apps sorteret efter batteriforbrug:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Din enhed er blevet brugt mere end normalt. Dit batteri aflades muligvis hurtigere end forventet.\n\nHer kan du se apps sorteret efter batteriforbrug:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">%1$d apps er begrænset</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Der er problemer med at aflæse dit batteriniveau"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Der er problemer med at aflæse dit batteriniveau. Tryk for at "<annotation id="url">"få flere oplysninger"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Vil du standse appen?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Din telefon kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> forhindrer telefonen i at gå i dvale.\n\nDu kan prøve at løse problemet ved at stoppe appen.\n\nHvis problemet fortsætter, er du muligvis nødt til at afinstallere appen for at forbedre batteriets ydeevne."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Din tablet kan ikke administrere batteriet normalt, fordi <xliff:g id="APP">%1$s</xliff:g> forhindrer din tablet i at gå i dvale.\n\nDu kan prøve at løse problemet ved at stoppe appen.\n\nHvis problemet fortsætter, er du muligvis nødt til at afinstallere appen for at forbedre batteriets ydeevne."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Angiv en tidsplan"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Forlæng batteritiden"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Deaktiver, når enheden er opladet"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterisparefunktion slås fra, når din telefon er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterisparefunktion slås fra, når din tablet er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterisparefunktion slås fra, når din enhed er på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Batterisparefunktion deaktiveres, når din telefon er opladet til mere end <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Batterisparefunktion deaktiveres, når din tablet er opladet til mere end <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Batterisparefunktion deaktiveres, når din enhed er opladet til mere end <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktivér"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Nulstil"</string>
     <string name="tts_play" msgid="2945513377250757221">"Afspil"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Selvjusterende forbindelse"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Forlænger batteritiden og forbedrer enhedens ydeevne ved at administrere din netværksforbindelse automatisk"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Lager for loginoplysninger"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installer et certifikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installer certifikater fra lager"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Brugerloginoplysninger"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Se og rediger gemte loginoplysninger"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avanceret"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lagertype"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarebaseret"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Kun software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Loginoplysningerne for denne bruger er ikke tilgængelige"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installeret til VPN og apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installeret til Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Installer ikke"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Installer alligevel"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certifikatet er ikke installeret"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Vil du give <xliff:g id="APP_NAME">%s</xliff:g> tilladelse til at installere certifikater på denne enhed?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Disse certifikater lader nedenstående apps og webadresser identificere dig"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Tillad ikke"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Tillad"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Se mere"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App til certifikatadministration"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Ingen"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certifikater, som installeres af denne app, lader nedenstående apps og webadresser identificere dig"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Fjern"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Ringesignal i nødsituationer"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Angiv adfærd ved nødopkald"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Backup"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ikke konfigureret – Arbejdsprofil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Dig (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Kaldenavn"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Du kan tilføje op til <xliff:g id="USER_COUNT">%1$d</xliff:g> brugere"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Kun ejeren af tabletten kan administrere brugere."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Kun ejeren af telefonen kan administrere brugere."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Betaling på terminalen"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfigurer en betalingsapp. Derefter skal du blot holde bagsiden af din telefon mod en terminal med symbolet for kontaktløs betaling."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK, det er forstået"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Flere..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mere…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Angiv en standardapp til betalinger"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Opdater standardappen til betalinger"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Ved kontaktløse terminaler vil du betale med <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Tilbage"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Næste"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Udfør"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tag et billede"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Vælg et billede"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Vælg billede"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kort"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kort"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Brug altid denne indstilling til opkald"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Vælg et SIM-kort til data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Vælg et SIM-kort til sms"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Data-SIM skiftes. Dette kan tage op til et minut..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Data-SIM skiftes. Dette kan tage op til et minut…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Ring med"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Vælg et SIM-kort"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-kort: <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutine, tidsplan, batterisparefunktion, strømsparefunktion, batteri, automatisk, procent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, avancerede opkald, 4g-opkald"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"tilføj sprog, tilføj et sprog"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tekststørrelse"</string>
     <string name="default_sound" msgid="6604374495015245195">"Standardlyd"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Lydstyrken for ringetone og notifikationer er på <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Lydstyrke, vibration, Forstyr ikke"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Aktivér lyde"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Livetekstning"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Undertekster til medier"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ingen"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplan er angivet</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplaner er angivet</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ingen}=1{1 tidsplan er angivet}one{# tidsplan er angivet}other{# tidsplaner er angivet}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Forstyr ikke"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Få kun notifikationer om vigtige personer og apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Begræns antallet af afbrydelser"</string>
@@ -3373,7 +3411,7 @@
     <string name="zen_mode_block_effect_light" msgid="1997222991427784993">"Undlad at bruge blinkende lys"</string>
     <string name="zen_mode_block_effect_peek" msgid="2525844009475266022">"Undlad at vise notifikationer på skærmen"</string>
     <string name="zen_mode_block_effect_status" msgid="5765965061064691918">"Skjul statusbjælkeikoner øverst på skærmen"</string>
-    <string name="zen_mode_block_effect_badge" msgid="332151258515152429">"Skjul notifikationscirkler på appikoner"</string>
+    <string name="zen_mode_block_effect_badge" msgid="332151258515152429">"Skjul notifikationsprikker på appikoner"</string>
     <string name="zen_mode_block_effect_ambient" msgid="1247740599476031543">"Væk ikke ved notifikationer"</string>
     <string name="zen_mode_block_effect_list" msgid="7549367848660137118">"Skjul i panelet, der trækkes ned"</string>
     <string name="zen_mode_block_effect_summary_none" msgid="6688519142395714659">"Aldrig"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Kun prioritet"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Til – <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Fra – <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Fra"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Til"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Spørg hver gang"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Indtil du deaktiverer"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> time</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> timer</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutter"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplan kan starte automatisk</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplaner kan starte automatisk</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 time}one{# time}other{# timer}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minut}one{# minut}other{# minutter}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Deaktiveret}=1{Deaktiveret/1 tidsplan kan starte automatisk}one{Deaktiveret/# tidsplan kan starte automatisk}other{Deaktiveret/# tidsplaner kan starte automatisk}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Hvad kan afbryde Forstyr ikke"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personer"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Angiv automatisk notifikationer med lavere prioritet som Diskret"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Automatisk rangering af notifikationer"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Ranger automatisk notifikationer efter relevans"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback om tilpassede notifikationer"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Vis justeringer af notifikationer, og vis en mulighed for at give feedback til systemet"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Nulstil vigtigheden af notifikationer"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Nulstil brugerangivne indstillinger for vigtighed, og tillad, at notifikationsassistenten prioriterer."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Foreslåede handlinger og svar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Vis automatisk foreslåede handlinger og svar"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Vis seneste notifikationer og notifikationer, der er udsat"</string>
@@ -3471,7 +3505,7 @@
     <string name="snooze_options_title" msgid="2109795569568344617">"Tillad udsættelse af notifikationer"</string>
     <string name="hide_silent_icons_title" msgid="5951392023601167577">"Skjul ikoner fra diskrete notifikationer"</string>
     <string name="hide_silent_icons_summary" msgid="623763437631637232">"Ikoner fra diskrete notifikationer vises ikke på statusbjælken"</string>
-    <string name="notification_badging_title" msgid="5469616894819568917">"Notifikationscirkel på appikon"</string>
+    <string name="notification_badging_title" msgid="5469616894819568917">"Notifikationsprik på appikon"</string>
     <string name="notification_people_strip_title" msgid="1185857822541001139">"Vis linje med seneste samtaler"</string>
     <string name="notification_bubbles_title" msgid="5681506665322329301">"Bobler"</string>
     <string name="bubbles_feature_education" msgid="4088275802688887634">"Nogle notifikationer og andet indhold kan blive vist som bobler på skærmen. Tryk på en boble for at åbne den. Træk den ned ad skærmen for at lukke den."</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioriterede samtaler"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Vis øverst i samtalesektionen som svævende bobler"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Vises øverst i samtalesektionen"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Andre samtaler"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Ikke-prioriterede samtaler"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Samtaler, du har ændret"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Seneste samtaler"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Ryd seneste"</string>
+    <string name="clear" msgid="5092178335409471100">"Ryd"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Vis prioriterede samtaler som bobler"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriterede samtaler vises øverst i rullepanelet. Du kan også vise dem som bobler og afbryde Forstyr ikke."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Prioriterede og ændrede samtaler vises her"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Adgang til Forstyr ikke"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Tillad Forstyr ikke"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ingen installerede apps har anmodet om adgang, når indstillingen \"Forstyr ikke\" er aktiveret."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Indlæser apps..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Indlæser apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android blokerer på din anmodning notifikationer for denne app, så de ikke vises på enheden"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android blokerer på din anmodning notifikationer i denne kategori, så de ikke vises på enheden"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android blokerer på din anmodning notifikationer i denne gruppe, så de ikke vises på enheden"</string>
@@ -3681,8 +3718,8 @@
     <string name="app_notification_block_summary" msgid="1804611676339341551">"Vis aldrig disse notifikationer"</string>
     <string name="notification_content_block_title" msgid="6689085826061361351">"Vis notifikationer"</string>
     <string name="notification_content_block_summary" msgid="329171999992248925">"Vis aldrig notifikationer i underretningspanelet eller på eksterne enheder"</string>
-    <string name="notification_badge_title" msgid="6854537463548411313">"Tillad notifikationscirkel"</string>
-    <string name="notification_channel_badge_title" msgid="6505542437385640049">"Vis notifikationscirkel"</string>
+    <string name="notification_badge_title" msgid="6854537463548411313">"Tillad notifikationsprik"</string>
+    <string name="notification_channel_badge_title" msgid="6505542437385640049">"Vis notifikationsprik"</string>
     <string name="app_notification_override_dnd_title" msgid="3769539356442226691">"Tilsidesæt Forstyr ikke"</string>
     <string name="app_notification_override_dnd_summary" msgid="4894641191397562920">"Bliv ved med at få disse notifikationer, når Forstyr ikke er aktiveret"</string>
     <string name="app_notification_visibility_override_title" msgid="7778628150022065920">"Låseskærm"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alle samtaler"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriterede samtaler"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ingen"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> samtale</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> samtaler</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ingen"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ingen}=1{1 samtale}one{# samtale}other{# samtaler}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Hvem kan afbryde?"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Opkald"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Opkald"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Hvis du vil sørge for, at tilladte opkald benytter lyd, skal du tjekke, at enheden er indstillet til at ringe"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Indgående opkald blokeres for \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Du kan ændre indstillingerne, så dine venner, din familie eller andre kontakter kan få fat i dig."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Stjernemarkerede kontakter"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> anden</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> andre</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ingen"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ingen}=1{{contact_1}}=2{{contact_1} og {contact_2}}=3{{contact_1}, {contact_2} og {contact_3}}one{{contact_1}, {contact_2} og # mere}other{{contact_1}, {contact_2} og # andre}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Intet navn)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Beskeder"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"beskeder"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Beskeder"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Indgående beskeder er blokeret for \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Du kan ændre indstillingerne, så dine venner, din familie eller andre kontakter kan få fat i dig."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Du modtager alle beskeder"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Du modtager alle opkald"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ingen"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakt</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakter</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ingen}=1{1 kontakt}one{# kontakt}other{# kontakter}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Alle"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakter"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Stjernemarkerede kontakter"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alle notifikationer"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Nogle notifikationer"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Valgte personer kan stadig kontakte dig, selv hvis du ikke tillader, at apps kan afbryde"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> kan afbryde</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> kan afbryde</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> til"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ingen apps kan afbryde}=1{{app_1} kan afbryde}=2{{app_1} og {app_2} kan afbryde}=3{{app_1}, {app_2} og {app_3} kan afbryde}one{{app_1}, {app_2} og # mere kan afbryde}other{{app_1}, {app_2} og # andre kan afbryde}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alle notifikationer"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Nogle notifikationer"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifikationer, der kan afbryde"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Tillad alle notifikationer"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> kan afbryde</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> kan afbryde</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Intet kan afbryde"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> til"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Intet kan afbryde}=1{{sound_category_1} kan afbryde}=2{{sound_category_1} og {sound_category_2} kan afbryde}=3{{sound_category_1}, {sound_category_2} og{sound_category_3} kan afbryde}one{{sound_category_1}, {sound_category_2} og # mere kan afbryde}other{{sound_category_1}, {sound_category_2} og # andre kan afbryde}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Intet kan afbryde"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ingen kan afbryde"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Nogle personer kan afbryde"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alle personer kan afbryde"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Til"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Fra"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Appfastgørelse"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Appfastgørelse gør det muligt at beholde den aktuelle app i visningen, indtil du frigør den. Denne funktion kan f.eks. anvendes til at give en ven, du har tillid til, mulighed for at spille et specifikt spil. \n\nNår en app fastgøres, kan den fastgjorte app muligvis åbne andre apps og få adgang til personoplysninger. \n\nSådan bruger du appfastgørelse: 	\n1.	Aktivér appfastgørelse 	\n2.	Åbn Oversigt 	\n3.	Tryk på appikonet øverst på skærmen, og tryk derefter på Fastgør"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Appfastgørelse gør det muligt at beholde den aktuelle app i visningen, indtil du frigør den. Denne funktion kan f.eks. anvendes til at give en ven, du har tillid til, mulighed for at spille et specifikt spil. \n\nNår en app fastgøres, kan den fastgjorte app muligvis åbne andre apps og få adgang til personoplysninger. \n\nHvis du vil dele din enhed med en anden på en sikker måde, kan du prøve at bruge en gæstebruger i stedet. \n\nSådan bruger du appfastgørelse: 	\n1.	Aktivér appfastgørelse 	\n2.	Åbn Oversigt 	\n3.	Tryk på appikonet øverst på skærmen, og tryk derefter på Fastgør"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Med appfastgørelse kan du beholde den aktuelle app i visningen, indtil du frigør den. Denne funktion kan f.eks. anvendes til at give en ven, du har tillid til, mulighed for at spille et specifikt spil."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Når en app fastgøres, kan den fastgjorte app muligvis åbne andre apps og få adgang til personoplysninger. \n\nSådan bruger du appfastgørelse: 	\n1.	Aktivér appfastgørelse 	\n2.	Åbn Oversigt 	\n3.	Tryk på appikonet øverst på skærmen, og tryk derefter på Fastgør"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Når en app fastgøres, kan den fastgjorte app muligvis åbne andre apps og få adgang til personoplysninger. \n\nHvis du vil dele din enhed med en anden på en sikker måde, kan du prøve at bruge en gæstebruger i stedet. \n\nSådan bruger du appfastgørelse: 	\n1.	Aktivér appfastgørelse 	\n2.	Open Oversigt 	\n3.	Tryk på appikonet øverst på skærmen, og tryk derefter på Fastgør"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Når en app er fastgjort: \n\n•	 Personoplysninger kan muligvis tilgås \n		(f.eks. kontakter og mailindhold) \n•	 Den fastgjorte app kan muligvis åbne andre apps \n\nBrug kun appfastgørelse til brugere, du har tillid til."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Bed om oplåsningsmønster inden frigørelse"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Bed om pinkode inden frigørelse"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Ud over at låse din enhed op ved hjælp af dit ansigt kan du beskytte din enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder og notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Ud over at låse din enhed op ved hjælp af dit ansigt kan du beskytte din enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder og notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives et mønster, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Ud over at låse din enhed op ved hjælp af dit ansigt kan du beskytte din enhed yderligere ved at kræve, at din adgangskode skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder og notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Ud over at låse din enhed op ved hjælp af biometriske systemer kan du beskytte din enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder eller notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på din enhed, hvis du mister den, eller den bliver stjålet. Vil du kræve, at der skal angives en pinkode, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Ud over at låse din enhed op ved hjælp af biometriske systemer kan du beskytte din enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder eller notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på din enhed, hvis du mister den, eller den bliver stjålet. Vil du kræve, at der skal angives et mønster, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Ud over at låse din enhed op ved hjælp af biometriske systemer kan du beskytte din enhed yderligere ved at kræve, at din adgangskode skal angives, før enheden kan starte op. Enheden kan ikke modtage opkald, beskeder eller notifikationer, bl.a. alarmer, før den er startet op.\n\nDette er med til at beskytte data på din enhed, hvis du mister den, eller den bliver stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nej"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Begrænset"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB styres af"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Tilsluttet enhed"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Denne enhed"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Skifter…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Skifter…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Der kunne ikke skiftes"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Oplader denne enhed"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Den tilsluttede enhed oplades"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobildataforbrug"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Dataforbrug i apps"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Dataforbrug via Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Dataforbrug for andre netværk"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Forbrug af Ethernet-data"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> begrænsninger</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Mobilselskabets dataopgørelse kan afvige fra enhedens opgørelse."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Omfatter ikke data, der anvendes af mobilnetværk"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> brugt"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Konfigurer dataadvarsel"</string>
     <string name="data_warning" msgid="2925054658166062884">"Dataadvarsel"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Se info"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Datasparefunktion"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Ubegrænset data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Baggrundsdata er slået fra"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Baggrundsdata er deaktiveret"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Til"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Fra"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Brug datasparefunktion"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Der skal ikke kunne skrives svar eller anden tekst i notifikationer, når enheden er låst."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Standardstavekontrol"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Vælg stavekontrol"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Brug stavekontrol"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Brug stavekontrol"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ikke valgt"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ingen)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"For at hjælpe med at frigøre lagerplads fjerner lagerstyringen sikkerhedskopierede billeder og videoer fra din enhed."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fjern billeder og videoer"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Lagerstyring"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Brug lagerstyring"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Brug Lageradministrator"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatisk"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Frigør plads nu"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tryk to gange for at tjekke telefonen"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tryk to gange for at tjekke din tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tryk to gange for at tjekke enheden"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Stryg for notifikationer"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Stryg nedad ved skærmens nederste kant for at se dine notifikationer"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Enhåndstilstand"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Brug enhåndstilstand"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Afslut ved skift mellem apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunder"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekunder"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekunder"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"brug med en hånd"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Tryk to gange på skærmen for at se klokkeslæt, notifikationer og andre oplysninger."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Løft for at tjekke telefonen"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Løft for at tjekke din tablet"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tryk for at tjekke din tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tryk for at tjekke enheden"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Tryk på skærmen for at se klokkeslæt, notifikationer og andre oplysninger."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Funktion til nødsituationer"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Brug funktionen til nødsituationer"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Administreret af <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Start nedenstående handlinger ved at trykke på afbryderknappen hurtigt fem gange eller mere"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Afspil nedtællingsalarm"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Afspil en høj lyd, inden der ringes efter hjælp"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Ring efter hjælp"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Telefonnummer, der kan kontaktes for at få hjælp"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Tryk for at redigere"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Hvis du angiver et nummer, der ikke er et alarmnummer:\n • Din enhed skal låses op for at bruge funktionen til nødsituationer\n • Dit opkald besvares muligvis ikke"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Stryg over fingeraftrykslæser for at se notifikationer"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Stryg fingeraftryk"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Du kan tjekke dine notifikationer ved at stryge nedad på fingeraftrykslæseren på bagsiden af telefonen."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Højeste antal synlige datasæt"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Nulstil til standardværdierne"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Udviklerindstillingerne for autofyld blev nulstillet"</string>
+    <string name="location_category" msgid="3496759112306219062">"Placering"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Placeringsindikator i statusbjælke"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Vis i forbindelse med alle placeringer, herunder netværk og forbindelse"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Gennemtving fuld GNSS-måling"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Registrer alle GNSS-konstellationer og -frekvenser uden opgavegennemløb"</string>
     <string name="device_theme" msgid="5027604586494772471">"Enhedstema"</string>
     <string name="default_theme" msgid="4815428567082263639">"Standard"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Netværksnavn"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Sæt notifikationer på pause, så du kan koncentrere dig"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funktionen er ikke tilgængelig"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Denne funktion er blevet deaktiveret, fordi den gør din telefon langsom"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Gennemtving fuld GNSS-måling"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Registrer alle GNSS-konstellationer og -frekvenser uden opgavegennemløb"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Vis altid dialogboks med nedbrud"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Vis dialogboks, hver gang en app går ned"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Vælg ANGLE-aktiveret app"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktivér for alle apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Vælg grafikdriver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Udviklerdriver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafikdriver til system"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Til (lydløs)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Fra"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Netværksoplysninger"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Navnet på din enhed er synligt for apps på din telefon. Det kan muligvis også ses af andre, når du opretter forbindelse til Bluetooth-enheder eller konfigurerer et Wi-Fi-hotspot."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Din enheds navn er synligt for apps på din telefon. Det kan muligvis også ses af andre, når du opretter forbindelse til Bluetooth-enheder eller et Wi-Fi-netværk, eller når du konfigurerer et Wi-Fi-hotspot."</string>
     <string name="devices_title" msgid="649715719278562515">"Enheder"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Alle indstillinger"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Forslag"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Der blev ikke fundet nogen netværk. Prøv igen."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbudt)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Intet SIM-kort"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Intet SIM-kort"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ingen"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Du skal bruge et SIM-kort for at oprette forbindelse"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Du skal bruge et SIM-kort fra <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> for at oprette forbindelse"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Foretrukken netværkstilstand: WCDMA foretrækkes"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Foretrukken netværkstilstand: Kun GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Foretrukken netværkstilstand: Kun WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobildata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Brug data via mobilnetværk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefonen skifter automatisk til dette mobilselskab, når netværket er inden for rækkevidde"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Der er ikke noget tilgængeligt SIM-kort"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Opkaldspræference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Sms-præference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Spørg hver gang"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Utilgængelig ved forbindelse til <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Se mere"</string>
     <string name="see_less" msgid="2642392725363552793">"Se mindre"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vil du aktivere <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vil du aktivere SIM-kortet?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vil du skifte til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vil du skifte til at bruge SIM-kort?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Der kan kun være ét aktivt SIM-kort ad gangen.\n\nSelvom du skifter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, opsiges dit abonnement hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ikke."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Der kan kun være ét downloadet SIM-kort ad gangen.\n\nSelvom du skifter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, opsiges dit abonnement hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ikke."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Der kan kun være ét aktivt SIM-kort ad gangen.\n\nSelvom du skifter SIM-kort, opsiges dit abonnement hos <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ikke."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Skift til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Opretter forbindelse til netværket…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Skifter til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Det lykkedes ikke at skifte mobilselskab"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Det lykkedes ikke at skifte mobilselskab på grund af en fejl."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vil du deaktivere <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vil du deaktivere SIM-kortet?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Deaktiverer SIM-kort<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Mobilselskabet kunne ikke deaktiveres"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Noget gik galt, og dit mobilselskab kunne ikke deaktiveres."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vil du bruge to SIM-kort?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Denne enhed kan have to aktive SIM-kort på samme tid. Hvis du vil fortsætte med kun at bruge 1 SIM-kort ad gangen, kan du trykke på \"Nej tak\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Vil du genstarte enheden?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Genstart din enhed for at komme i gang. Derefter kan du tilføje et andet SIM-kort."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Fortsæt"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Genstart"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nej tak"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Skift"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-kortet kunne ikke aktiveres"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Tag SIM-kortet ud, og sæt det i igen. Genstart enheden, hvis problemet fortsætter."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prøv at aktivere SIM-kortet igen. Genstart enheden, hvis problemet fortsætter."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netværksaktivering"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> er aktiv"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tryk for at opdatere indstillingerne for SIM-kort"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-kort"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Vil du rydde dette downloadede SIM-kort?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Hvis du rydder dette SIM-kort, fjernes tjenesten fra <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> på denne enhed.\n\nTjenesten fra <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> opsiges ikke."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Ryd"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Rydder SIM-kort…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM-kortet kan ikke ryddes"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Dette SIM-kort kan ikke ryddes på grund af en fejl.\n\nGenstart din enhed, og prøv igen."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Opret forbindelse til enheden"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Appen <xliff:g id="APPNAME">%1$s</xliff:g> vil gerne have midlertidig adgang til dit Wi-Fi-netværk for at oprette forbindelse til din enhed"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Der blev ikke fundet nogen enheder. Sørg for, at enhederne er tændt, og at der kan oprettes forbindelse til dem."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Nødopkald"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Nødopkald via Wi‑Fi-opkald understøttes ikke af dit mobilselskab.\nEnheden skifter automatisk til et mobilnetværk for at foretage et nødopkald.\nDer kan kun foretages nødopkald i områder med mobilnetværksdækning."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Brug Wi‑Fi til opkald for at få en bedre kvalitet"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Opkald på tværs af SIM-kort"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Tillad, at et andet SIM-kort kan ringe og sende sms-beskeder via dette SIM-kort."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"opkald på tværs af SIM-kort"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Indgående mms-besked"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Mms-beskeden kan ikke sendes"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tryk for at tillade mms-beskeder via <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>, når mobildata er slået fra"</string>
@@ -4940,10 +5034,49 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Tillad overlejring af skærme fra Indstillinger"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Giv apps, som kan vises over andre apps, tilladelse til at overlejre skærme fra appen Indstillinger"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Medier"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Skjul afspiller, når mediesessionen er afsluttet"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"I denne afspiller kan du genoptage en session via det udvidede panel for Kvikmenu."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Medieafspiller i Kvikmenu"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Vis medieafspilleren i længere tid, så du nemmere kan genoptage afspilningen"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Skjul afspiller"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Vis afspiller"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Der er ingen tilgængelige afspillere"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Tilladte apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"Medier"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth aktiveres"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Til"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Fra"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kort"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Netværk til brug i fly"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Find og opret forbindelse til netværk, der kan bruges under flyrejsen"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"fly, sikkert netværk i fly"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Opkald og sms-beskeder"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-opkald"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Foretag og modtag opkald via netværk, der ikke er mobilnetværk, f.eks. Wi-Fi-netværk"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Med Wi-Fi-opkald kan du foretage og modtage opkald via netværk, der ikke er mobilnetværk, f.eks. Wi‑Fi-netværk."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Opkald"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"Sms"</string>
+    <!-- no translation found for calls_sms_preferred (6016477652522583496) -->
+    <skip />
+    <!-- no translation found for calls_sms_calls_preferred (252913858812799809) -->
+    <skip />
+    <!-- no translation found for calls_sms_sms_preferred (5826706870873784062) -->
+    <skip />
+    <!-- no translation found for calls_sms_unavailable (4055729705246556529) -->
+    <skip />
+    <!-- no translation found for calls_sms_no_sim (2336377399761819718) -->
+    <skip />
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Præferencer"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Opret forbindelse til offentlige netværk"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"netværksforbindelse, internet, trådløs, data, wifi, wi-fi, mobilnetværk, mobil, mobilselskab, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Se netværk til brug i fly"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Deaktiver flytilstand"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ikke tilgængelig, da sengetidstilstand er aktiveret"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Vigtigheden af notifikationer blev nulstillet."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"En ikke-godkendt enhed vil gerne have adgang til dine beskeder. Tryk for at få flere oplysninger."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vil du give adgang til beskeder?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"En ikke-godkendt Bluetooth-enhed, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vil gerne have adgang til dine beskeder.\n\nDu har ikke oprettet forbindelse til [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] før."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"En ikke-godkendt enhed vil gerne have adgang til dine kontakter og din opkaldsliste. Tryk for at få flere oplysninger."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vil du give adgang til kontakter og opkaldsliste?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"En ikke-godkendt Bluetooth-enhed, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vil gerne have adgang til dine kontakter og din opkaldsliste. Dette omfatter data om indgående og udgående opkald.\n\nDu har ikke oprettet forbindelse til [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] før."</string>
 </resources>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 4c32e97..882b02e 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Mittel"</item>
     <item msgid="6740026006576843477">"Lang"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kurz"</item>
+    <item msgid="7397961711906421599">"Mittel"</item>
+    <item msgid="4079132024502041928">"Lang"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standard"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Nur TD-SCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index daff8f8..dc99c3a 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Datum und Uhrzeit"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Datum und Uhrzeit einstellen"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Datum, Uhrzeit, Zeitzone und Formate festlegen"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Zeit aus Netzwerk verwenden"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Zeitzone aus Netzwerk verwenden"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Zeit automatisch einstellen"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Zeitzone automatisch einstellen"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Standardformat für die gewählte Spracheinstellung verwenden"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-Stunden-Format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-Stunden-Format"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Profilinformationen auf Sperrbildschirm anzeigen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Konten"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Standort"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Standort verwenden"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Standort verwenden"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Aus"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">An: <xliff:g id="COUNT_1">%1$d</xliff:g> Apps haben Zugriff auf den Standort</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Displaysperre, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Displaysperre und Fingerabdruck"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Displaysperre"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Smartphone mit deinem Gesicht oder Fingerabdruck sicher entsperren"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Du kannst dich damit auch in Apps anmelden und Zahlungen bestätigen"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Entsperren einrichten mit:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Smartphone ganz einfach entsperren"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingerabdruck"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Smartphone in der Tasche schneller entsperren"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Überspringen"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Weiter"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Gesicht hinzugefügt"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Face Unlock einrichten"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Per Gesichtserkennung authentifizieren"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Starten"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Wenn Face Unlock mit Bedienungshilfen deaktiviert ist, funktionieren manche Einrichtungsschritte möglicherweise nicht richtig mit TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Zurück"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Einrichtung fortsetzen"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Bedienungshilfen-Einrichtung verwenden"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Bei der Nutzung von Face Unlock in Apps immer Bestätigung anfordern"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Gesichtserkennungsdaten löschen"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Face Unlock einrichten"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Mit Face Unlock kannst du dein Gerät entsperren, dich in Apps anmelden und Zahlungen bestätigen.\n\nWenn du diese Funktion nutzt, solltest du Folgendes bedenken:\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise einem eineiigen Zwilling."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Mit Face Unlock kannst du dein Gerät entsperren, dich in Apps anmelden und Zahlungen bestätigen.\n\nWenn du diese Option nutzt, solltest du Folgendes bedenken:\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält, auch wenn deine Augen geschlossen sind.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise von einem eineiigen Zwilling."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Mit Face Unlock kannst du dein Gerät entsperren, dich in Apps anmelden und Zahlungen bestätigen."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Wenn du diese Option nutzt, solltest du Folgendes bedenken:\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise von einem eineiigen Zwilling."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Wenn du diese Option nutzt, solltest du Folgendes bedenken:\nEs kann passieren, dass das Smartphone unbeabsichtigt entsperrt wird, wenn du auf das Gerät blickst.\n\nEine andere Person kann dein Smartphone dadurch entsperren, dass sie es vor dein Gesicht hält, auch wenn deine Augen geschlossen sind.\n\nDein Smartphone kann eventuell auch von jemandem entsperrt werden, der dir sehr ähnlich sieht, beispielsweise von einem eineiigen Zwilling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Gesichtserkennungsdaten löschen?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Die von Face Unlock aufgezeichneten Gesichtserkennungsdaten werden endgültig und sicher gelöscht. Nach dem Entfernen benötigst du wieder deine PIN, dein Muster oder dein Passwort, um dein Smartphone entsperren, dich bei Apps anmelden und Zahlungen bestätigen zu können."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Verwende Face Unlock, um dein Smartphone zu entsperren"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Du kannst deinen Fingerabdruck verwenden, um dein Smartphone zu entsperren oder Käufe zu autorisieren.\n\nHinweis: Dieses Gerät kann nicht mit deinem Fingerabdruck entsperrt werden. Weitere Informationen erhältst du vom Administrator deiner Organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Du kannst deinen Fingerabdruck verwenden, um dein Smartphone zu entsperren oder Käufe zu autorisieren.\n\nHinweis: Dein Fingerabdruck ist möglicherweise nicht so sicher wie ein komplexes Muster oder eine PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Abbrechen"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nein danke"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Weiter"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Überspringen"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Weiter"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Mit der Displaysperre kannst du dein Tablet schützen, damit es niemand anders verwenden kann, falls es gestohlen wird oder du es verloren hast. Du musst auch die Displaysperre einrichten, um Face Unlock nutzen zu können. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Mit der Displaysperre kannst du dein Gerät schützen, damit es niemand anders verwenden kann, falls es gestohlen wird oder du es verloren hast. Du musst auch die Displaysperre einrichten, um Face Unlock nutzen zu können. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Mit der Displaysperre kannst du dein Smartphone schützen, damit es niemand anders verwenden kann, falls es gestohlen wird oder du es verloren hast. Du musst auch die Displaysperre einrichten, um Face Unlock nutzen zu können. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Mit einer Displaysperre kannst du dein Tablet schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Du benötigst die Displaysperre auch zur Einrichtung eines biometrischen Verfahrens. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Mit einer Displaysperre kannst du dein Gerät schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Du benötigst die Displaysperre auch zur Einrichtung eines biometrischen Verfahrens. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Mit einer Displaysperre kannst du dein Smartphone schützen, damit es bei Diebstahl oder anderweitigem Verlust von niemand anders verwendet werden kann. Du benötigst die Displaysperre auch zur Einrichtung eines biometrischen Verfahrens. Tippe auf \"Abbrechen\", um zurückzugehen."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN-Einrichtung überspringen?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Passworteinrichtung überspringen?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Mustereinrichtung überspringen?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Du kannst verhindern, dass andere Personen dieses Tablet ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Du kannst verhindern, dass andere Personen dieses Gerät ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Du kannst verhindern, dass andere Personen dieses Smartphone ohne deine Erlaubnis verwenden, indem du die Schutzfunktionen für dein Mobilgerät aktivierst. Wähle eine Displaysperre aus."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Alternative Methode für die Displaysperre auswählen"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Alternative Methode für die Displaysperre auswählen"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Alternative Methode für die Displaysperre auswählen"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Optionen für die Displaysperre"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Optionen für die Displaysperre"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Displaysperre"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face Unlock + Passwort"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Ohne Face Unlock fortfahren"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Du kannst dein Smartphone über die Gesichtserkennung entsperren. Aus Sicherheitsgründen benötigst du bei dieser Option eine alternative Displaysperre."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrisches Verfahren + Muster"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrisches Verfahren + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrisches Verfahren + Passwort"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Ohne biometrisches Verfahren fortfahren"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Du kannst dein Smartphone mit deinem biometrischen Verfahren entsperren. Aus Sicherheitsgründen ist bei dieser Option eine alternative Displaysperre erforderlich."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Durch Administrator, Richtlinie oder Anmeldedatenspeicher deaktiviert"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Keine"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Wischen"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Muss weniger als <xliff:g id="NUMBER_0">%d</xliff:g> Ziffer haben</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Der Geräteadministrator lässt die Verwendung einer früheren PIN nicht zu"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Häufig verwendete PINs werden von deinem IT-Administrator blockiert. Versuch es mit einer anderen PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Es sind keine ungültigen Zeichen zulässig"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Es muss mindestens ein Buchstabe enthalten sein"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Es muss mindestens eine Ziffer enthalten sein"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Passwort muss mindestens ein Zeichen enthalten, das keine Ziffer ist</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Der Geräteadministrator lässt die Verwendung eines früheren Passworts nicht zu"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Häufig verwendete Passwörter werden von deinem IT-Administrator blockiert. Versuch es mit einem anderen Passwort."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Aufsteigende, absteigende oder wiederholte Ziffernfolgen sind unzulässig"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bestätigen"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Abbrechen"</string>
@@ -796,7 +815,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"WLAN aktivieren"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"WLAN"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"WLAN verwenden"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"WLAN verwenden"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"WLAN-Einstellungen"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"WLAN-Zugangspunkte festlegen und verwalten"</string>
@@ -904,7 +923,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Wenn du eine Verbindung zu \"<xliff:g id="SSID">%1$s</xliff:g>\" herstellen möchtest, scanne den QR-Code unten"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Scanne den QR-Code, um dein Gerät mit dem WLAN zu verbinden"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"WLAN teilen"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scanne diesen QR-Code, um eine Verbindung mit \"<xliff:g id="SSID">%1$s</xliff:g>\" herzustellen und das Passwort zu teilen"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scanne diesen QR-Code mit einem anderen Gerät, um dich mit \"<xliff:g id="SSID">%1$s</xliff:g>\" zu verbinden"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Diesen QR-Code scannen, um eine Verbindung mit \"<xliff:g id="SSID">%1$s</xliff:g>\" herzustellen"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Versuche es noch einmal. Falls das Problem weiterhin besteht, wende dich an den Hersteller des Geräts"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Fehler"</string>
@@ -930,8 +949,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"WLAN-Passwort: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Passwort des Hotspots: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatische Verbindung"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Zulassen, dass das Smartphone automatisch eine Verbindung herstellt, wenn es in der Nähe dieses Netzwerks ist"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Zulassen, dass das Tablet automatisch eine Verbindung herstellt, wenn es in der Nähe dieses Netzwerks ist"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Verbindung zulassen, wenn dieses Netzwerk in Reichweite ist"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Gerät hinzufügen"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"QR-Code verwenden, um diesem Netzwerk ein Gerät hinzuzufügen"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-Code ist kein gültiges Format"</string>
@@ -943,7 +961,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Systemzertifikate verwenden"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Nicht bereitstellen"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Nicht validieren"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Kein Zertifikat angegeben. Es wird keine private Verbindung hergestellt."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Der Netzwerkname ist zu lang."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Angabe einer Domain erforderlich."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Zertifikat erforderlich."</string>
@@ -970,6 +987,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Verbinden"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"WLAN ist aktiviert"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Verbunden mit <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Verbindung zu <xliff:g id="NETWORK_NAME">%1$s</xliff:g> wird hergestellt"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Verbinden…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Netzwerkverbindung konnte nicht hergestellt werden."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Netzwerk außer Reichweite"</string>
@@ -997,6 +1015,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-Adresse des Geräts"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Zufällige MAC-Adresse"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Zufällige MAC-Adresse (zuletzt verwendet)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-Adresse"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Netzwerkdetails"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnetzmaske"</string>
@@ -1004,8 +1023,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-Adressen"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Gespeicherte WLANs"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abos"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Andere Netzwerke"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP-Einstellungen"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Erweiterte WLAN-Einstellungen sind für diesen Nutzer nicht verfügbar"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Speichern"</string>
@@ -1014,8 +1032,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Gib eine gültige Gateway-Adresse ein."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Gib eine gültige DNS-Adresse ein."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Netzwerkpräfix darf maximal 32 Zeichen enthalten."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (sofern nicht von privatem DNS überschrieben)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (sofern nicht von privatem DNS überschrieben)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Länge d. Netzwerkpräfixes"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1041,7 +1059,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Es werden Inhalte per App geteilt. Wenn du eine Internetverbindung freigeben möchtest, deaktiviere den Hotspot und aktiviere ihn dann neu."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Kein Passwort festgelegt"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Name des Hotspots"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> wird aktiviert..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> wird aktiviert…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Andere Geräte können sich mit <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> verbinden"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Passwort des Hotspots"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Band für Zugangspunkt"</string>
@@ -1191,7 +1209,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Setzt die Aktualisierungsrate für einige Inhalte automatisch von 60 auf 90 Hz herauf. Erhöhter Akkuverbrauch."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Aktualisierungsrate von 90 Hz erzwingen"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Höchste Aktualisierungsrate für bessere Touchscreen-Reaktion und flüssigere Animationen. Erhöhter Akkuverbrauch."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Aufmerksamkeitserkennung"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"An / Der Bildschirm wird nicht ausgeschaltet, solange du auf ihn blickst"</string>
@@ -1282,6 +1300,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Wenn das Display inaktiv ist, wird es bei neuen Benachrichtigungen aktiviert"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Zeit und Informationen immer anzeigen"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Erhöhter Akkuverbrauch"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Text fett markieren"</string>
     <string name="title_font_size" msgid="570613010306330622">"Schriftgröße"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Text vergrößern oder verkleinern"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Einstellungen für SIM-Sperre"</string>
@@ -1330,7 +1349,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-Version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-Sicherheitsupdate"</string>
     <string name="model_info" msgid="8997566254717810904">"Modell"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modell: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modell und Hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardwareversion"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Geräte-ID"</string>
@@ -1579,7 +1597,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN löschen"</string>
     <string name="menu_new" msgid="6571230342655509006">"Neuer APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Speichern"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Verwerfen"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Abbrechen"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Das Namensfeld darf nicht leer sein."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN darf nicht leer sein."</string>
@@ -1594,8 +1612,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Apps können zurückgesetzt werden"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"WLAN, mobile Daten &amp; Bluetooth zurücksetzen"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Hierdurch werden sämtliche Netzwerkeinstellungen zurückgesetzt, einschließlich:\n\n"<li>"WLAN"</li>\n<li>"Mobile Daten"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Löschen"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Heruntergeladene SIMs löschen"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Wenn du Ersatz-SIMs herunterladen möchtest, wende dich an deinen Mobilfunkanbieter. Dein Mobilfunkvertrag wird dadurch nicht gekündigt."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Dein Mobilfunkvertrag wird dadurch nicht gekündigt. Wende dich an deinen Mobilfunkanbieter, um Ersatz-SIMs herunterzuladen."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Einstellungen zurücksetzen"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Sämtliche Netzwerkeinstellungen zurücksetzen? Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Alle Netzwerkeinstellungen zurücksetzen und heruntergeladene SIMs löschen? Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
@@ -1605,31 +1624,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Die Netzwerkeinstellungen wurden zurückgesetzt."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIMs können nicht gelöscht werden"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Heruntergeladene SIMs können aufgrund eines Fehlers nicht gelöscht werden.\n\nStarte das Gerät neu und versuche es noch einmal."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Alle Daten löschen (auf Werkseinstellungen zurücksetzen)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Alle Daten löschen"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Tablets gelöscht, wie z. B. die Folgenden:\n\n"<li>"Dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Smartphones gelöscht, wie z. B. die Folgenden:\n\n"<li>"Dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Du bist zurzeit in folgenden Konten angemeldet:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Auf diesem Gerät sind andere Nutzer vorhanden.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-Elemente"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Dein Mobilfunkvertrag wird dadurch nicht gekündigt."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Alle Daten löschen (auf Werkseinstellungen zurücksetzen)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Alle Daten löschen"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Tablets gelöscht, wie z. B. die Folgenden:\n\n"<li>"Dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Hierdurch werden alle Daten aus dem "<b>"internen Speicher"</b>" deines Smartphones gelöscht, wie z. B. die Folgenden:\n\n"<li>"Dein Google-Konto"</li>\n<li>"System- und App-Daten sowie entsprechende Einstellungen"</li>\n<li>"Heruntergeladene Apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Du bist zurzeit in folgenden Konten angemeldet:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Auf diesem Gerät sind andere Nutzer vorhanden.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musik"</li>\n<li>"Fotos"</li>\n<li>"Sonstige Nutzerdaten"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Dein Mobilfunkvertrag wird dadurch nicht gekündigt."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss der "<b>"USB-Speicher"</b>" gelöscht werden."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Um auch Musik, Bilder und sonstige Nutzerdaten zu löschen, muss die "<b>"SD-Karte"</b>" gelöscht werden."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB-Speicher löschen"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD-Karte löschen"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Alle Daten, z. B. Musik und Fotos, aus dem internen USB-Speicher löschen"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Alle Daten, z. B. Musik und Fotos, von der SD-Karte löschen"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Alle Daten löschen"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Alle Daten löschen"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Alle deine personenbezogenen Daten und heruntergeladenen Apps werden gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Alle deine personenbezogenen Daten, einschließlich heruntergeladener Apps und SIMs, werden gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Alles löschen"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Die Zurücksetzung konnte nicht durchgeführt werden, weil der Dienst zur Systembereinigung nicht verfügbar ist."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Alle Daten löschen?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Das Zurücksetzen auf Werkseinstellungen ist für diesen Nutzer nicht verfügbar."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Löschen"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Bitte warten..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Alle Daten löschen"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Alle Daten löschen"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Alle deine personenbezogenen Daten und heruntergeladenen Apps werden gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Alle deine personenbezogenen Daten, einschließlich heruntergeladener Apps und SIMs, werden gelöscht. Dieser Vorgang kann nicht rückgängig gemacht werden."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Alle Daten löschen?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Das Zurücksetzen auf Werkseinstellungen ist für diesen Nutzer nicht verfügbar."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Wird gelöscht…"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Bitte warten…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Anrufeinstellungen"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Mailbox, Rufweiterleitung, Anklopfen, Anruferkennung einrichten"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-Tethering"</string>
@@ -1677,7 +1694,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Tethering nur für maximal <xliff:g id="MAXCONNECTION">%1$d</xliff:g> Geräte möglich"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Tethering für <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wird deaktiviert."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-Tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Internetverbindung des Smartphones über USB-Ethernet freigeben"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Internetverbindung des Smartphones über Ethernet freigeben"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Mithilfe der Hotspot- und Tethering-Funktion kannst du deine mobile Datenverbindung für andere Geräte freigeben, damit diese eine Internetverbindung erhalten. Apps können ebenfalls einen Hotspot erstellen und so das Teilen von Inhalten mit Geräten in der Nähe ermöglichen."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Mithilfe der Hotspot- und Tethering-Funktion kannst du anderen Geräten erlauben, deine Internetverbindung (WLAN oder mobile Daten) mitzunutzen. Es gibt auch Apps für das Erstellen eines Hotspots, damit Inhalte mit Geräten in der Nähe geteilt werden können."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hilfe"</string>
@@ -1719,6 +1736,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-Suche"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Apps und Dienste dürfen immer nach Geräten in der Nähe suchen, auch wenn Bluetooth deaktiviert ist. Dadurch können beispielsweise standortbasierte Funktionen und Dienste verbessert werden."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Standortdienste für die Arbeit"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zeitzone anhand des Standorts bestimmen"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zeitzone anhand des Standorts bestimmen"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Durch diese Funktion kann anhand des Standorts des Geräts die aktuelle Zeitzone bestimmt werden. Andere Standorteinstellungen wie die WLAN-Suche können die Genauigkeit der Zeitzonenerkennung beeinflussen."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"An"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Aus"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatische Zeitzonenerkennung ist deaktiviert"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Zeitzonenerkennung anhand des Standorts ist deaktiviert"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Zeitzonenerkennung anhand des Standorts wird nicht unterstützt"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Änderungen an den Einstellungen für die Zeitzonenerkennung sind nicht erlaubt"</string>
     <string name="location_network_based" msgid="5247042890080021887">"WLAN- &amp; Mobilfunknetz-Standort"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Apps dürfen meinen Standort mit dem Google-Standortdienst schneller bestimmen. Anonyme Standortdaten werden erfasst und an Google gesendet."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Standort per WLAN ermittelt"</string>
@@ -1782,6 +1808,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Für Face Unlock Passwort festlegen"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Für Face Unlock Muster festlegen"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Für Face Unlock PIN festlegen"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Passwort festlegen"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Muster festlegen"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"PIN festlegen"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Passwort vergessen?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Muster vergessen?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN vergessen?"</string>
@@ -2118,13 +2147,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Untertitel-Einstellungen"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Vergrößerung"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Vergrößerungsbereich"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Vergrößerung aktivieren"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Wähle die Bereiche aus, die bei der Bildschirmvergrößerung verwendet werden sollen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Ganzer Bildschirm"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Teil des Bildschirms"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Ganzer Bildschirm und Teil des Bildschirms"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ganzen Bildschirm vergrößern"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Teil des Bildschirms vergrößern"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Zur Schaltfläche \"Bedienungshilfen\" wechseln?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Wenn du dreimal tippst, um einen Teil des Bildschirms zu vergrößern, verzögern sich die Texteingabe und andere Aktionen.\n\nMöchtest du die Vergrößerung mit der Schaltfläche \"Bedienungshilfen\" trotzdem vornehmen?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Zur Schaltfläche \"Bedienungshilfen\" wechseln"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mit \"Dreimal tippen\" weiterhin vergrößern"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Vergrößerungseinstellungen"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Dreimal tippen zum Vergrößern"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Mit Tastenkombination vergrößern"</string>
@@ -2178,11 +2210,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Ein/Aus beendet Anruf"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Großer Mauszeiger"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animationen entfernen"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono-Audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kanäle bei Audiowiedergabe kombinieren"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audiobalance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Links"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Rechts"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono-Audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kanäle bei Audiowiedergabe kombinieren"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audiobalance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Links"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Rechts"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Standard"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 Sekunden"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 Sekunden"</string>
@@ -2212,11 +2244,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibration bei Benachrichtigungseingang"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibration bei Klingeln"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Haptisches Feedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> verwenden"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"\"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\" öffnen"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Farbkorrektur aktivieren"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Untertitel anzeigen"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Nur für unterstützte Apps"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> verwenden"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> öffnen"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Farbkorrektur aktivieren"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Untertitel anzeigen"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Nur für unterstützte Apps"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Untertitelgröße und -stil"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Textgröße: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Weitere Optionen"</string>
@@ -2246,6 +2278,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Graustufen"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rot-Grün-Sehschwäche"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rot-Grün-Sehschwäche"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blau-Gelb-Sehschwäche"</string>
@@ -2375,7 +2408,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Einschränkung der Hintergrundnutzung"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"App darf im Hintergrund ausgeführt werden"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App darf nicht im Hintergrund ausgeführt werden"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Hintergrundnutzung kann nicht eingeschränkt werden"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Hintergrundnutzung kann nicht eingeschränkt werden"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Hintergrundaktivität einschränken?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Wenn du die Hintergrundaktivität einer App einschränkst, kann dies zu unerwünschtem Verhalten führen"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Da bei dieser App die Akkunutzung nicht optimiert wird, kannst du sie nicht einschränken.\n\nDu musst du zunächst die Akkuoptimierung aktivieren."</string>
@@ -2424,6 +2457,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet mehr als üblich genutzt"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Gerät mehr als üblich genutzt"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Der Akku könnte früher als üblich leer sein"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimierung des Akkuzustands"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Akku vorübergehend eingeschränkt. Für weitere Informationen tippen."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Dein Smartphone wurde intensiver als üblich genutzt. Der Akku könnte deshalb früher als erwartet leer sein.\n\nApps mit höchstem Akkuverbrauch:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Dein Tablet wurde intensiver als üblich genutzt. Der Akku könnte deshalb früher als erwartet leer sein.\n\nApps mit höchstem Akkuverbrauch:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Dein Gerät wurde intensiver als üblich genutzt. Der Akku könnte deshalb früher als erwartet leer sein.\n\nApps mit höchstem Akkuverbrauch:"</string>
@@ -2479,6 +2514,8 @@
       <item quantity="one">%1$d App beschränkt</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Batterieanzeige konnte nicht gelesen werden"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Batterieanzeige konnte nicht gelesen werden. "<annotation id="url">"Für weitere Informationen tippen"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"App beenden?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Eine normale Verwaltung des Akkuverbrauchs deines Smartphones ist nicht möglich, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv gehalten wird.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Smartphones zu erhöhen."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Eine normale Verwaltung des Akkuverbrauchs deines Tablets ist nicht möglich, weil es durch <xliff:g id="APP">%1$s</xliff:g> aktiv gehalten wird.\n\nUm das Problem zu beheben, kannst du die App beenden.\n\nWenn dies öfter vorkommt, musst du die App eventuell deinstallieren, um die Laufzeit des Tablets zu erhöhen."</string>
@@ -2592,9 +2629,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Zeitplan festlegen"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Akkulaufzeit verlängern"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Bei vollem Akku ausschalten"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Der Energiesparmodus wird deaktiviert, sobald dein Smartphone wieder zu <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Der Energiesparmodus wird deaktiviert, wenn dein Tabletakku bei <xliff:g id="PERCENT">%1$s</xliff:g> steht"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Der Energiesparmodus wird deaktiviert, wenn dein Geräteakku bei <xliff:g id="PERCENT">%1$s</xliff:g> steht"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Der Energiesparmodus wird deaktiviert, wenn dein Smartphone-Akku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Der Energiesparmodus wird deaktiviert, wenn dein Tablet-Akku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Der Energiesparmodus wird deaktiviert, wenn dein Geräteakku zu über <xliff:g id="PERCENT">%1$s</xliff:g> geladen ist"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktivieren"</string>
@@ -2659,6 +2696,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Zurücksetzen"</string>
     <string name="tts_play" msgid="2945513377250757221">"Wiedergeben"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Automatische Konnektivität"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Verlängert die Akkulaufzeit und optimiert die Leistung des Geräts durch automatisches Verwalten deiner Netzwerkverbindungen"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Anmeldedatenspeicher"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Ein Zertifikat installieren"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Zertifikate von Speicher installieren"</string>
@@ -2670,9 +2709,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Nutzeranmeldedaten"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Gespeicherte Anmeldedaten anzeigen und ändern"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Erweitert"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Speichertyp"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-gestützt"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Nur Software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Anmeldedaten sind für diesen Nutzer nicht verfügbar."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installiert für VPN und Apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installiert für WLAN"</string>
@@ -2688,6 +2724,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Nicht installieren"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Trotzdem installieren"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Zertifikat nicht installiert"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Darf <xliff:g id="APP_NAME">%s</xliff:g> Zertifikate auf diesem Gerät installieren?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Mit diesen Zertifikaten wirst du in den unten genannten Apps und bei den unten genannten URLs identifiziert"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Nicht zulassen"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Zulassen"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Mehr anzeigen"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Zertifikatsverwaltungs-App"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Keine"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Mit den von dieser App installierten Zertifikaten wirst du in den unten genannten Apps und bei den unten genannten URLs identifiziert"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Entfernen"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Notrufsignal"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Verhalten bei einem Notruf festlegen"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Sicherung"</string>
@@ -3011,7 +3056,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nicht eingerichtet – Arbeitsprofil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Ich (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Spitzname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Du kannst bis zu <xliff:g id="USER_COUNT">%1$d</xliff:g> Nutzer hinzufügen."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Nur der Eigentümer des Tablets kann Nutzer verwalten."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Nur der Eigentümer des Telefons kann Nutzer verwalten."</string>
@@ -3061,7 +3105,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"An der Kasse bezahlen"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Richte eine Zahlungs-App ein. Halte die Rückseite deines Smartphones an eine beliebige Kasse mit dem Symbol zum kontaktlosen Bezahlen."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ok"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mehr…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mehr…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Standard-App für kontaktloses Bezahlen festlegen"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Standard-App für kontaktloses Bezahlen aktualisieren"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"An einem Terminal für kontaktloses Bezahlen <xliff:g id="APP">%1$s</xliff:g> nutzen"</string>
@@ -3131,9 +3175,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Zurück"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Weiter"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Fertig"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Foto aufnehmen"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Bild auswählen"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Foto auswählen"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-Karten"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-Karten"</string>
@@ -3145,7 +3186,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Diese SIM für alle Anrufe verwenden"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"SIM-Karte für Daten auswählen"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SIM-Karte für SMS auswählen"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Wechsel der Daten-SIM. Dies kann bis zu einer Minute dauern."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Daten-SIM wird gewechselt. Dies kann bis zu einer Minute dauern…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Anrufen mit"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM-Karte auswählen"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-Karte <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3288,6 +3329,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ablauf, zeitplan, energiesparmodus, stromsparfunktion, akku, automatisch, prozent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, erweiterte Anruffunktionen, 4G-Anrufe"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"Sprache hinzufügen, eine Sprache hinzufügen"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"Textgröße"</string>
     <string name="default_sound" msgid="6604374495015245195">"Standardton"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Lautstärke bei Klingeln und Benachrichtigungseingang auf <xliff:g id="PERCENTAGE">%1$s</xliff:g> %% eingestellt"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Lautstärke, Vibration, Bitte nicht stören"</string>
@@ -3327,11 +3369,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Töne beim Hochfahren"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Automatische Untertitel"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Medien automatisch untertiteln"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Keine"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> Zeitpläne festgelegt</item>
-      <item quantity="one">1 Zeitplan festgelegt</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Keiner}=1{1 Zeitplan festgelegt}other{# Zeitpläne festgelegt}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Bitte nicht stören"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Benachrichtigungen nur von wichtigen Personen und Apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Unterbrechungen einschränken"</string>
@@ -3399,20 +3437,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Nur wichtige Unterbrechungen"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>."</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"An / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Aus / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Aus"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"An"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Jedes Mal fragen"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Bis zur Deaktivierung"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> Stunden</item>
-      <item quantity="one">1 Stunde</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> Minuten"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> Zeitpläne können automatisch aktiviert werden</item>
-      <item quantity="one">1 Zeitplan kann automatisch aktiviert werden</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 Stunde}other{# Stunden}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 Minute}other{# Minuten}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Aus}=1{Aus/1 Zeitplan kann automatisch aktiviert werden}other{Aus/# Zeitpläne können automatisch aktiviert werden}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Was den \"Bitte nicht stören\"-Modus unterbrechen kann"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personen"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3458,6 +3488,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Benachrichtigungen mit niedriger Priorität automatisch auf \"Stumm\" schalten"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptive Sortierung der Benachrichtigungen"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Benachrichtigungen automatisch nach Relevanz sortieren"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback zu adaptiven Benachrichtigungen"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Änderungen an Benachrichtigungen und die Option für Systemfeedback anzeigen"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Wichtigkeit von Benachrichtigungen zurücksetzen"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Vom Nutzer geänderte Wichtigkeitseinstellungen zurücksetzen und dem Benachrichtigungsassistenten eine Priorisierung erlauben"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Aktions- und Antwortvorschläge"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Es werden automatisch Vorschläge für Aktionen und Antworten angezeigt"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Neue und zurückgestellte Benachrichtigungen anzeigen"</string>
@@ -3555,8 +3589,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Vorrangige Unterhaltungen"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Oben im Bereich \"Unterhaltungen\" und als unverankerte Bubbles anzeigen"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Werden oben im Bereich \"Unterhaltungen\" angezeigt"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Sonstige Unterhaltungen"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Unterhaltungen ohne Priorität"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Unterhaltungen, an denen Änderungen vorgenommen wurden"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Neueste Unterhaltungen"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Neueste löschen"</string>
+    <string name="clear" msgid="5092178335409471100">"Löschen"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Vorrangige Unterhaltungen als Bubble anzeigen"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Vorrangige Unterhaltungen werden oben in der Benachrichtigungsleiste angezeigt. Du kannst auch einstellen, dass sie als Bubbles angezeigt werden oder den \"Bitte nicht stören\"-Modus unterbrechen können."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Hier werden vorrangige und geänderte Unterhaltungen angezeigt"</string>
@@ -3654,7 +3691,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Zugriff während \"Bitte nicht stören\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\"Bitte nicht stören\" zulassen"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Keine installierte App hat während \"Bitte nicht stören\" Zugriff angefordert."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Apps werden geladen..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Apps werden geladen…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Gemäß deinen Einstellungen unterbindet Android die Anzeige von Benachrichtigungen dieser App auf diesem Gerät."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Gemäß deinen Einstellungen unterbindet Android die Anzeige von Benachrichtigungen dieser Kategorie auf diesem Gerät."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Gemäß deinen Einstellungen unterbindet Android die Anzeige von Benachrichtigungen dieser Gruppe auf diesem Gerät."</string>
@@ -3746,11 +3783,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alle Unterhaltungen"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Vorrangige Unterhaltungen"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Keine"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> Unterhaltungen</item>
-      <item quantity="one">1 Unterhaltung</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Keine"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Keine}=1{1 Unterhaltung}other{# Unterhaltungen}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Wer unterbrechen darf"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Anrufe"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Anrufe"</string>
@@ -3759,11 +3792,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Damit sichergestellt ist, dass bei zugelassenen Anrufen auch wirklich ein akustisches Signal ertönt, solltest du prüfen, ob der Klingeltonmodus aktiviert ist"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Im Modus \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" werden eingehende Anrufe blockiert. Du kannst die Einstellungen anpassen, sodass dich Freunde, Familie oder andere Kontakte erreichen können."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Markierte Kontakte"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> weitere Personen</item>
-      <item quantity="one">1 weitere Person</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Keine"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Keiner}=1{{contact_1}}=2{{contact_1} und {contact_2}}=3{{contact_1}, {contact_2} und {contact_3}}other{{contact_1}, {contact_2} und # weitere Kontakte}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Kein Name)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Nachrichten"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"Nachrichten"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Nachrichten"</string>
@@ -3772,11 +3802,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Eingehende Nachrichten für \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" werden blockiert. Du kannst die Einstellungen anpassen, sodass dich Freunde, Familie oder andere Kontakte erreichen können."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Alle Nachrichten können dich erreichen"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Alle Anrufe können dich erreichen"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Keine"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> Kontakte</item>
-      <item quantity="one">1 Kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Keiner}=1{1 Kontakt}other{# Kontakte}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Alle"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakte"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Markierte Kontakte"</string>
@@ -3814,22 +3840,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alle Benachrichtigungen"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Einige Benachrichtigungen"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Ausgewählte Personen können dich weiterhin erreichen, auch wenn du nicht zulässt, dass Apps dich unterbrechen."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> können ihn unterbrechen</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> kann ihn unterbrechen</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> weitere"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Keine Apps können ihn unterbrechen}=1{Die App \"{app_1}\" kann ihn unterbrechen}=2{Die Apps \"{app_1}\" und \"{app_2}\" können ihn unterbrechen}=3{Die Apps \"{app_1}\", \"{app_2}\" und \"{app_3}\" können ihn unterbrechen}other{Die App \"{app_1}\", \"{app_2}\" und # weitere können ihn unterbrechen}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alle Benachrichtigungen"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Einige Benachrichtigungen"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Benachrichtigungen, die unterbrechen dürfen"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Alle Benachrichtigungen zulassen"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> können ihn unterbrechen</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> kann ihn unterbrechen</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nichts kann ihn unterbrechen"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> weitere"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nichts kann ihn unterbrechen}=1{Geräusche der Kategorie \"{sound_category_1}\" können ihn unterbrechen}=2{Geräusche der Kategorie \"{sound_category_1}\" und \"{sound_category_2}\" können ihn unterbrechen}=3{Geräusche der Kategorie \"{sound_category_1}\", \"{sound_category_2}\" und \"{sound_category_3}\" können ihn unterbrechen}other{Geräusche der Kategorie \"{sound_category_1}\", \"{sound_category_2}\" und # weiteren können ihn unterbrechen}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nichts kann ihn unterbrechen"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niemand kann ihn unterbrechen"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Einige Personen können ihn unterbrechen"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alle Personen können ihn unterbrechen"</string>
@@ -3875,8 +3893,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"An"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Aus"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Bildschirmfixierung"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Mit der Option \"Bildschirmfixierung\" kannst du festlegen, dass auf deinem Gerät vorübergehend nur eine App ausgeführt und angezeigt wird. Auf diese Weise kannst du z. B. jemanden ein Spiel auf deinem Gerät spielen lassen, ohne dass die Person sonstigen Zugriff aufs Gerät hat. \n\nDie App, die während der Bildschirmfixierung angezeigt wird, kann unter Umständen andere Apps öffnen, wodurch personenbezogene Daten zugänglich gemacht werden können. \n\nSo verwendest du die Funktion: 	\n1.	Aktiviere \"Bildschirmfixierung\"  \n2.	Tippe auf \"Übersicht\" 	\n3.	Tippe auf das App-Symbol oben auf dem Bildschirm und dann auf \"Anpinnen\""</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Mit der Option \"Bildschirmfixierung\" kannst du festlegen, dass auf deinem Gerät vorübergehend nur eine App ausgeführt und angezeigt wird. Auf diese Weise kannst du z. B. jemanden ein Spiel auf deinem Gerät spielen lassen, ohne dass die Person sonstigen Zugriff aufs Gerät hat. \n\nDie App, die während der Bildschirmfixierung angezeigt wird, kann unter Umständen andere Apps öffnen, wodurch personenbezogene Daten zugänglich gemacht werden können. \n\nWenn du dein Gerät sicher mit jemandem teilen möchtest, kannst du stattdessen ein Gastprofil verwenden. \n\nSo verwendest du die Funktion: 	\n1.	Aktiviere \"Bildschirmfixierung\" 	\n2.	Tippe auf \"Übersicht\" 	\n3.	Tippe auf das App-Symbol oben auf dem Bildschirm und dann auf \"Anpinnen\""</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Mit der Option „Bildschirmfixierung“ kannst du festlegen, dass auf deinem Gerät vorübergehend nur eine App ausgeführt und angezeigt wird. Auf diese Weise kannst du z. B. jemanden ein Spiel auf deinem Gerät spielen lassen, ohne dass die Person sonstigen Zugriff aufs Gerät hat."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Die App, die während der Bildschirmfixierung angezeigt wird, kann unter Umständen andere Apps öffnen, wodurch personenbezogene Daten zugänglich gemacht werden können. \n\nSo verwendest du die Funktion „Bildschirmfixierung“: 	\n1.	Aktiviere „Bildschirmfixierung“ 	\n2.	Tippe auf „Übersicht“ 	\n3.	Tippe auf das App-Symbol oben auf dem Bildschirm und dann auf „Anpinnen“"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Die App, die während der Bildschirmfixierung angezeigt wird, kann unter Umständen andere Apps öffnen, wodurch personenbezogene Daten zugänglich gemacht werden können. \n\nWenn du dein Gerät sicher mit jemandem teilen möchtest, kannst du stattdessen ein Gastprofil verwenden. \n\nSo verwendest du die Funktion „Bildschirmfixierung“: 	\n1.	Aktiviere „Bildschirmfixierung“ 	\n2.	Tippe auf „Übersicht“ 	\n3.	Tippe auf das App-Symbol oben auf dem Bildschirm und dann auf „Anpinnen“"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Wenn eine App auf dem Bildschirm fixiert ist, gilt Folgendes: \n\n•	 Zugriff auf personenbezogene Daten ist möglich \n	z. B. auf Kontakte oder E-Mails) \n• Eine fixierte App kann andere Apps öffnen \n\nVerwende die Funktion \"Bildschirmfixierung\" nur dann, wenn du deinem Gegenüber vertraust."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Zum Loslösen nach Entsperrungsmuster fragen"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Vor Beenden nach PIN fragen"</string>
@@ -3898,6 +3917,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Neben Face Unlock zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass deine PIN vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden.\n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass deine PIN zum Starten des Geräts eingegeben werden muss?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Neben Face Unlock zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass dein Muster vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Warnmeldungen, empfangen werden.\n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass dein Muster zum Starten des Geräts eingegeben werden muss?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Neben der Verwendung von Face Unlock zum Entsperren des Geräts kannst du es zusätzlich schützen, indem du festlegst, dass vor dem Gerätestart die Eingabe deines Passworts erforderlich ist. Bis das Gerät startet, können weder Anrufe noch Nachrichten oder Benachrichtigungen, einschließlich Warnmeldungen, empfangen werden.\n\nSo schützt du Daten auf verloren gegangenen oder gestohlenen Geräten. Möchtest du festlegen, dass dein Passwort zum Starten des Geräts eingegeben werden muss?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Neben der Verwendung von biometrischen Verfahren zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass vor dem Gerätestart deine PIN eingegeben werden muss. Bis das Gerät startet, können weder Anrufe noch Nachrichten oder Benachrichtigungen, einschließlich Warnmeldungen, empfangen werden.\n\nDas hilft, Daten auf verloren gegangenen oder gestohlenen Geräten zu schützen. Möchtest du festlegen, dass zum Starten des Geräts deine PIN eingegeben werden muss?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Neben der Verwendung von biometrischen Verfahren zum Entsperren des Geräts kannst du es zusätzlich schützen, indem du festlegst, dass vor dem Gerätestart dein Entsperrungsmuster eingegeben werden muss. Bis das Gerät startet, können weder Anrufe noch Nachrichten oder Benachrichtigungen, einschließlich Warnmeldungen, empfangen werden.\n\nDas hilft, Daten auf verloren gegangenen oder gestohlenen Geräten zu schützen. Möchtest du festlegen, dass zum Starten des Geräts dein Entsperrmuster eingegeben werden muss?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Neben der Verwendung von biometrischen Verfahren zum Entsperren des Geräts kannst du es zusätzlich schützen, indem du festlegst, dass vor dem Gerätestart dein Passwort eingegeben werden muss. Bis das Gerät startet, können weder Anrufe noch Nachrichten oder Benachrichtigungen, einschließlich Warnmeldungen, empfangen werden.\n\nDas hilft, Daten auf verloren gegangenen oder gestohlenen Geräten zu schützen. Möchtest du festlegen, dass zum Starten des Geräts dein Passwort eingegeben werden muss?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"\"Ja\""</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nein"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Eingeschränkt"</string>
@@ -4073,7 +4095,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Gerät, das die USB-Verbindung steuert"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Verbundenes Gerät"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Dieses Gerät"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Wird gewechselt…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Wird gewechselt…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Wechsel nicht möglich"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Gerät aufladen"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Verbundenes Gerät wird aufgeladen"</string>
@@ -4267,6 +4289,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobile Datennutzung"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Datennutzung durch Apps"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"WLAN-Datennutzung"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Datennutzung in Netzwerken ohne Mobilfunkanbieter"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet-Datennutzung"</string>
     <string name="wifi" msgid="2932584495223243842">"WLAN"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4285,6 +4308,7 @@
       <item quantity="one">1 Beschränkung</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Dein Mobilfunkanbieter berechnet die Datennutzung eventuell anders als das Gerät"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Beinhaltet keine Daten, die in Mobilfunkanbieter-Netzwerken verwendet werden"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Verbrauchte Daten: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Datenwarnung festlegen"</string>
     <string name="data_warning" msgid="2925054658166062884">"Warnlimit für mobile Daten"</string>
@@ -4320,7 +4344,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Details ansehen"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Datensparmodus"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Uneingeschränkter Datenzugriff"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Hintergrunddaten sind deaktiviert"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Hintergrunddaten sind deaktiviert"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"An"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Aus"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Datensparmodus verwenden"</string>
@@ -4343,7 +4367,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Wenn das Gerät gesperrt ist, ist das Schreiben von Antworten oder anderen Texten in Nachrichten nicht möglich"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Standardrechtschreibprüfung"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Rechtschreibprüfung wählen"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Rechtschreibprüfung verwenden"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Rechtschreibprüfung verwenden"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nicht ausgewählt"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(keine)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4433,7 +4457,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Zur Freigabe von Speicherplatz entfernt der Speichermanager Back-ups von Fotos und Videos von deinem Gerät."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fotos &amp; Videos entfernen"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Speichermanager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Speichermanager aktivieren"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Speichermanager verwenden"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatisch"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuell"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Jetzt Speicherplatz freigeben"</string>
@@ -4471,6 +4495,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Beim Doppeltippen Display aktivieren"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Doppeltippen für schnellen Blick auf das Display des Tablets"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Doppeltippen für schnellen Blick auf das Display des Geräts"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Für Benachrichtigungen wischen"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Wische auf dem Bildschirm nach unten, um deine Benachrichtigungen aufzurufen"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Einhandmodus"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Einhandmodus verwenden"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Beim Wechseln zwischen Apps beenden"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Zeitlimit"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 Sekunden"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 Sekunden"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 Sekunden"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"Einhandbedienung"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Wenn du auf den Bildschirm doppeltippst, werden die Uhrzeit, Benachrichtigungen und andere Informationen angezeigt."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Beim Hochheben Display aktivieren"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tablet hochnehmen, um das Display anzusehen"</string>
@@ -4483,6 +4517,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Beim Tippen Display aktivieren"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Beim Tippen Display aktivieren"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Wenn du auf den Bildschirm tippst, werden die Uhrzeit, Benachrichtigungen und andere Informationen angezeigt."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Notfall"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Notruffunktion verwenden"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Verwaltet von <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Fünfmal oder öfter schnell die Ein-/Aus-Taste drücken, um die Aktionen unten zu starten"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Countdown-Alarm abspielen"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Ein lauter Ton wird abgespielt, bevor Hilfe benachrichtigt wird"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Hilfe anfordern"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Notrufnummer"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Zum Ändern berühren"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Wenn du eine beliebige Nummer (keine Notrufnummer) eingibst:\n • Dein Gerät muss entsperrt sein, damit du die Notrufnummer anrufen kannst\n • Dein Anruf wird möglicherweise nicht angenommen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Benachrichtigungen durch Wischen über Fingerabdrucksensor öffnen"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Fingerabdrucksensor verwenden"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Zum Lesen von Benachrichtigungen von oben nach unten über den Fingerabdrucksensor auf der Rückseite des Smartphones wischen"</string>
@@ -4608,6 +4652,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maximale Zahl sichtbarer Datensätze"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Auf Standardwerte zurücksetzen"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Die Optionen für automatisches Ausfüllen für Entwickler wurden zurückgesetzt"</string>
+    <string name="location_category" msgid="3496759112306219062">"Standort"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Standortanzeige in der Statusleiste"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Für alle Standorte anzeigen, einschließlich Netzwerk und Verbindung"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Vollständige GNSS-Messung erzwingen"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Alle GNSS-Konstellationen und -Frequenzen ohne GNSS-Zyklus erfassen"</string>
     <string name="device_theme" msgid="5027604586494772471">"Gerätedesign"</string>
     <string name="default_theme" msgid="4815428567082263639">"Standard"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Netzwerkname"</string>
@@ -4624,8 +4673,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Zur besseren Konzentration Benachrichtigungen pausieren"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funktion nicht verfügbar"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Diese Funktion wurde deaktiviert, weil sie dein Smartphone langsamer macht"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Vollständige GNSS-Messung erzwingen"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Alle GNSS-Konstellationen und -Frequenzen ohne GNSS-Zyklus erfassen"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Bei Absturz immer Absturz-Dialogfeld anzeigen"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Bei App-Abstürzen immer Dialogfeld anzeigen"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE-App auswählen"</string>
@@ -4637,7 +4684,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Für alle Apps aktivieren"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafiktreiber auswählen"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Entwickler-Treiber"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafiktreiber des Systems"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4693,7 +4740,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"An (stumm)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Aus"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Netzwerkdetails"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Dein Gerätename ist für Apps auf deinem Smartphone sichtbar. Wenn du dich mit Bluetooth-Geräten verbindest oder einen WLAN-Hotspot einrichtest, kann er möglicherweise auch von anderen Personen gesehen werden."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Dein Gerätename ist für Apps auf deinem Smartphone sichtbar. Wenn du dein Gerät mit Bluetooth-Geräten oder einem WLAN verbindest oder einen WLAN-Hotspot einrichtest, kann der Name möglicherweise auch von anderen Personen gesehen werden."</string>
     <string name="devices_title" msgid="649715719278562515">"Geräte"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Alle Einstellungen"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Vorschläge"</string>
@@ -4706,6 +4753,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Netzwerke nicht gefunden. Bitte versuch es noch einmal."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(nicht zulässig)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Keine SIM-Karte"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Keine SIM-Karte"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Keine"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Zum Herstellen einer Verbindung ist eine SIM-Karte erforderlich"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Zum Herstellen einer Verbindung ist eine <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-SIM-Karte erforderlich"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Bevorzugter Netzmodus: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Bevorzugter Netzmodus: nur GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Bevorzugter Netzmodus: nur WCDMA"</string>
@@ -4759,6 +4811,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile Daten"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Datenzugriff über Mobilfunknetz"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon wechselt automatisch zu diesem Mobilfunkanbieter, wenn er in Reichweite ist"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Keine SIM-Karte verfügbar"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Anrufeinstellung"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-Einstellung"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Jedes Mal fragen"</string>
@@ -4819,6 +4872,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Bei Verbindung mit <xliff:g id="CARRIER">%1$s</xliff:g> nicht verfügbar"</string>
     <string name="see_more" msgid="7499355691042812723">"Mehr anzeigen"</string>
     <string name="see_less" msgid="2642392725363552793">"Weniger anzeigen"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktivieren?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM aktivieren?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> wechseln?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM-Karte wechseln?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Es kann immer nur eine SIM-Karte aktiv sein.\n\nWenn du zu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> wechselst, wird dein <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-Dienst nicht beendet."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Es kann immer nur eine heruntergeladene eSIM aktiv sein.\n\nWenn du zu <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> wechselst, wird dein <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-Dienst nicht beendet."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Es kann immer nur eine SIM-Karte aktiv sein.\n\nWenn du zwischen ihnen wechselst, wird dein <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-Dienst nicht beendet."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> wechseln"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Verbindung zum Mobilfunknetz wird hergestellt…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Wechsel zu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Mobilfunkanbieter kann nicht gewechselt werden"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Der Mobilfunkanbieter kann aufgrund eines Fehlers nicht gewechselt werden."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> deaktivieren?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM deaktivieren?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM wird deaktiviert<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Mobilfunkanbieter kann nicht deaktiviert werden"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Ein Problem ist aufgetreten. Dein Mobilfunkanbieter konnte nicht deaktiviert werden."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Zwei SIM-Karten verwenden?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Auf diesem Gerät können zwei SIM-Karten gleichzeitig aktiv sein. Wenn du weiterhin nur eine SIM-Karte verwenden möchtest, tippe auf „Nein danke“."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Gerät neu starten?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Starte zuerst dein Gerät neu. Danach kannst du eine weitere SIM-Karte hinzufügen."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Weiter"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Neu starten"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nein danke"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Wechseln"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM kann nicht aktiviert werden"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Nimm die SIM heraus und lege sie dann wieder ein. Sollte das Problem weiterhin bestehen, starte das Gerät neu."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Versuche, die SIM noch einmal zu aktivieren. Sollte das Problem weiterhin bestehen, starte das Gerät neu."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netzwerkaktivierung"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ist aktiviert"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tippe, um die SIM-Einstellungen zu aktualisieren"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-Karte"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Diese heruntergeladene SIM löschen?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Wenn du diese SIM löschst, wird der <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-Dienst von diesem Gerät entfernt.\n\nDer Mobilfunkvertrag bei <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> wird dadurch nicht gekündigt."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Löschen"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM wird gelöscht…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM kann nicht gelöscht werden"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Beim Löschen der SIM ist ein Fehler aufgetreten.\n\nBitte starte dein Gerät neu und versuch es dann noch einmal."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Mit Gerät verbinden"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Die App \"<xliff:g id="APPNAME">%1$s</xliff:g>\" möchte sich über ein temporäres WLAN mit deinem Gerät verbinden"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Keine Geräte gefunden. Achte darauf, dass die Geräte eingeschaltet und zur Verbindung bereit sind."</string>
@@ -4890,6 +4981,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Notrufe"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Notrufe über WLAN-Telefonie werden von deinem Mobilfunkanbieter nicht unterstützt.\nDas Gerät wechselt automatisch zu einem Mobilfunknetz, um einen Notruf abzusetzen.\nNotrufe sind nur in Bereichen mit Mobilfunkabdeckung möglich."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Für Anrufe WLAN verwenden, um die Qualität zu verbessern"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"SIM-übergreifende Anrufe"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Andere SIM-Anrufe und SMS über diese SIM zulassen."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"SIM-übergreifende Anrufe"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Eingehende MMS"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS kann nicht gesendet werden"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tippen, um MMS über <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> zuzulassen, wenn mobile Daten deaktiviert sind"</string>
@@ -4941,10 +5035,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Apps dürfen über Einstellungen angezeigt werden"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Apps, die über anderen Apps angezeigt werden dürfen, dürfen auch über den Einstellungen angezeigt werden"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Medien"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Player ausblenden, wenn die Sitzung beendet ist"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Mit dem Player kannst du eine Sitzung aus dem erweiterten Bereich der Schnelleinstellungen fortsetzen."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediaplayer in den Schnelleinstellungen"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mediaplayer für längere Zeit anzeigen, um die Wiedergabe einfach fortsetzen zu können"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Player ausblenden"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Player anzeigen"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Es sind keine Player verfügbar."</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Zugelassene Apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"Medien"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth wird aktiviert"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"An"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Aus"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-Karten"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Flugsichere Netzwerke"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Flugsichere Netzwerke finden und Verbindung herstellen"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"Flug, Flugzeug, flugsicher"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Anrufe &amp; SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"WLAN-Anrufe"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Anrufe über Netzwerke ohne Mobilfunkanbieter starten und empfangen wie über ein WLAN"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Mit WLAN-Telefonie kannst du Anrufe über Netzwerke ohne Mobilfunkanbieter starten und empfangen, wie etwa über einige WLAN-Netzwerke."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Anrufe"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"bevorzugt"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"Anrufe bevorzugt"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS bevorzugt"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"nicht verfügbar"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Keine SIM-Karte"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Einstellungen"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Mit öffentlichen Netzwerken verbinden"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"netzwerkverbindung, internet, kabellos, drahtlos, daten, wlan, w-lan, mobilfunk, mobil, mobilfunkanbieter, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Flugsichere Netzwerke anzeigen"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Flugmodus deaktivieren"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nicht verfügbar, weil der Modus „Schlafenszeit“ aktiviert ist"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Die Wichtigkeit von Benachrichtigungen wurde zurückgesetzt."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ein nicht vertrauenswürdiges Gerät fordert Zugriff auf deine Nachrichten an. Weitere Informationen."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Möchtest du den Zugriff auf Nachrichten zulassen?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Ein nicht vertrauenswürdiges Bluetooth-Gerät, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, fordert Zugriff auf deine Nachrichten an.\n\nDu warst bisher noch nicht mit <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> verbunden."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ein nicht vertrauenswürdiges Gerät fordert Zugriff auf deine Kontakte und deine Anrufliste an. Weitere Informationen."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Möchtest du den Zugriff auf Kontakte und Anrufliste zulassen?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Ein nicht vertrauenswürdiges Bluetooth-Gerät, <xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>, fordert Zugriff auf deine Kontakte und deine Anrufliste an. Dazu gehören auch Daten über ein- und ausgehende Anrufe.\n\nDu warst bisher noch nicht mit <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> verbunden."</string>
 </resources>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index e0d0aa7..c8cd362 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Μεσαίο"</item>
     <item msgid="6740026006576843477">"Παρατεταμένο"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Σύντομο"</item>
+    <item msgid="7397961711906421599">"Μεσαίο"</item>
+    <item msgid="4079132024502041928">"Μεγάλο"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Προεπιλεγμένη"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Παγκόσμιο"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Μόνο TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Παγκόσμιο"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 411020d..fe8f6fc 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Ημερομηνία και ώρα"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Ορισμός ημερομηνίας και ώρας"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Ορισμός ημερομηνίας, ώρας, ζώνης ώρας και μορφές"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Χρ. ώρας που παρέχ. από δίκτυο"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Χρήση ζώνης ώρας που παρέχεται από το δίκτυο"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Αυτόματος ορισμός ώρας"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Αυτόματος ορισμός ζώνης ώρας"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Χρήση προεπιλογής τοπικών ρυθμίσεων"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24ωρη μορφή"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Χρήση μορφής 24ώρου"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Εμφάνιση πληροφοριών προφίλ στην οθόνη κλειδώματος"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Λογαριασμοί"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Τοποθεσία"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Χρήση τοποθεσίας"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Χρήση τοποθεσίας"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Απενεργοποίηση"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Ενεργή - <xliff:g id="COUNT_1">%1$d</xliff:g> εφαρμογές έχουν πρόσβαση στην τοποθεσία</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Κλείδωμα οθόνης, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Κλείδωμα οθόνης, δακτυλικό αποτύπωμα"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Κλείδωμα οθόνης"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Ξεκλείδωμα τηλεφώνου με το πρόσωπο ή το δακτυλικό αποτύπωμα"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Συνδεθείτε επίσης σε εφαρμογές και επιβεβαιώστε πληρωμές"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Ρύθμιση ξεκλειδώματος με:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Απλοποιήστε το ξεκλείδωμα του τηλεφώνου."</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Δακτυλικό αποτύπωμα"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Ξεκλειδώστε το τηλέφωνο στην τσέπη σας."</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Παράβλεψη"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Επόμενο"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Προστέθηκε πρόσωπο"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Ρύθμιση του Face Unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Χρήση προσώπου για έλεγχο ταυτότητας"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Αρχή"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Εάν το Face Unlock στη λειτουργία προσβασιμότητας είναι ανενεργό, ορισμένα βήματα ρύθμισης ενδέχεται να μην λειτουργούν σωστά με το TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Πίσω"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Συνέχιση ρύθμισης"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Χρήση ρύθμισης προσβασιμότητας"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Για χρήση του Face Unlock σε εφαρμ. να απαιτείται το βήμα επιβεβαίωσης"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Διαγρ. δεδ. προσώπου"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Ρύθμιση του Face Unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Χρησιμοποιήστε το Face Unlock, για να ξεκλειδώσετε τη συσκευή σας, να συνδεθείτε σε εφαρμογές και να επιβεβαιώσετε πληρωμές.\n\nΛάβετε υπόψη τα εξής:\nΤο τηλέφωνο μπορεί να ξεκλειδώσει όταν το κοιτάτε ακόμη και αν δεν σκοπεύετε να το ξεκλειδώσετε.\n\nΚάποιο άλλο άτομο μπορεί να ξεκλειδώσει το τηλέφωνό σας εάν το τηλέφωνο βρίσκεται μπροστά στο πρόσωπό σας.\n\nΤο τηλέφωνο μπορεί να ξεκλειδωθεί από κάποιο άτομο που σας μοιάζει πολύ, όπως για παράδειγμα, τον δίδυμο αδελφό σας."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Χρησιμοποιήστε το Face Unlock για να ξεκλειδώσετε τη συσκευή σας, να συνδεθείτε σε εφαρμογές και να επιβεβαιώσετε πληρωμές.\n\nΛάβετε υπόψη τα εξής:\nΤο τηλέφωνο μπορεί να ξεκλειδώσει όταν το κοιτάτε ακόμη και αν δεν σκοπεύετε να το ξεκλειδώσετε.\n\nΚάποιο άλλο άτομο μπορεί να ξεκλειδώσει το τηλέφωνό σας εάν είναι στραμμένο προς το πρόσωπό σας ακόμη και αν τα μάτια σας είναι κλειστά.\n\nΤο τηλέφωνο μπορεί να ξεκλειδωθεί από κάποιο άτομο που σας μοιάζει πολύ, όπως για παράδειγμα, το παιδί σας ή τον δίδυμο αδελφό σας."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Χρησιμοποιήστε το Face Unlock για να ξεκλειδώσετε τη συσκευή σας, να συνδεθείτε σε εφαρμογές και να επιβεβαιώσετε πληρωμές."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Λάβετε υπόψη τα εξής:\nΤο τηλέφωνο μπορεί να ξεκλειδώσει όταν το κοιτάτε ακόμη και αν δεν σκοπεύετε να το ξεκλειδώσετε.\n\nΚάποιο άλλο άτομο μπορεί να ξεκλειδώσει το τηλέφωνό σας εάν το τηλέφωνο βρίσκεται μπροστά στο πρόσωπό σας.\n\nΤο τηλέφωνο μπορεί να ξεκλειδωθεί από κάποιο άτομο που σας μοιάζει πολύ, όπως για παράδειγμα, τον δίδυμο αδελφό σας."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Λάβετε υπόψη τα εξής:\nΤο τηλέφωνο μπορεί να ξεκλειδώσει όταν το κοιτάτε ακόμη και αν δεν σκοπεύετε να το ξεκλειδώσετε.\n\nΚάποιο άλλο άτομο μπορεί να ξεκλειδώσει το τηλέφωνό σας εάν το τηλέφωνο βρίσκεται μπροστά στο πρόσωπό σας, ακόμη και αν τα μάτια σας είναι κλειστά.\n\nΤο τηλέφωνο μπορεί να ξεκλειδωθεί από κάποιο άτομο που σας μοιάζει πολύ, όπως για παράδειγμα, τον δίδυμο αδελφό σας."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Διαγραφή δεδομένων προσώπου;"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Τα δεδομένα προσώπου που χρησιμοποιεί το Face Unlock θα διαγραφούν οριστικά και με ασφάλεια. Μετά την κατάργηση, θα χρειαστείτε το PIN, το μοτίβο ή τον κωδικό πρόσβασης, για να ξεκλειδώσετε το τηλέφωνό σας, να συνδεθείτε σε εφαρμογές και να επιβεβαιώσετε πληρωμές."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Χρησιμοποιήστε το Face Unlock για να ξεκλειδώσετε το τηλέφωνό σας"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Χρησιμοποιήστε το δακτυλικό σας αποτύπωμα, για να ξεκλειδώνετε το τηλέφωνό σας ή να εγκρίνετε αγορές.\n\nΣημείωση: Δεν μπορείτε να χρησιμοποιήσετε το δακτυλικό σας αποτύπωμα, για να ξεκλειδώσετε αυτήν τη συσκευή. Για περισσότερες πληροφορίες, επικοινωνήστε με τον διαχειριστή του οργανισμού σας."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Χρησιμοποιήστε το δακτυλικό σας αποτύπωμα για ξεκλείδωμα του τηλεφώνου ή για έγκριση αγορών.\n\nΣημείωση: Το δακτυλικό σας αποτύπωμα μπορεί να είναι λιγότερο ασφαλές από ένα ισχυρό μοτίβο ή PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Ακύρωση"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Όχι, ευχαριστώ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Συνέχεια"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Παράβλεψη"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Επόμενο"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Προστατεύοντας το tablet με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε το Face Unlock. Για επιστροφή, πατήστε Ακύρωση."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Προστατεύοντας τη συσκευή σας με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να τη χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε το Face Unlock. Για επιστροφή, πατήστε Ακύρωση."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Προστατεύοντας το τηλέφωνό σας με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Θα χρειαστείτε επίσης μια επιλογή κλειδώματος οθόνης για να ρυθμίσετε το Face Unlock. Για επιστροφή, πατήστε Ακύρωση."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Προστατεύοντας το tablet σας με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Χρειάζεστε επίσης μια επιλογή κλειδώματος οθόνης για τη ρύθμιση της χρήσης βιομετρικών στοιχείων. Για επιστροφή, πατήστε Ακύρωση."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Προστατεύοντας τη συσκευή σας με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να τη χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Χρειάζεστε επίσης μια επιλογή κλειδώματος οθόνης για τη ρύθμιση της χρήσης βιομετρικών στοιχείων. Για επιστροφή, πατήστε Ακύρωση."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Προστατεύοντας το τηλέφωνό σας με μια επιλογή κλειδώματος οθόνης, κανείς δεν θα μπορεί να το χρησιμοποιήσει σε περίπτωση απώλειας ή κλοπής. Χρειάζεστε επίσης μια επιλογή κλειδώματος οθόνης για τη ρύθμιση της χρήσης βιομετρικών στοιχείων. Για επιστροφή, πατήστε Ακύρωση."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Παράβλεψη ρύθμισης PIN;"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Παράβλεψη ρύθμισης κωδικού πρόσβασης;"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Παράβλεψη ρύθμισης μοτίβου;"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Αποτρέψτε άλλους από τη χρήση αυτού του tablet χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Αποτρέψτε άλλους από τη χρήση αυτής της συσκευής χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Αποτρέψτε άλλους από τη χρήση αυτού του τηλεφώνου χωρίς την άδειά σας ενεργοποιώντας τις λειτουργίες προστασίας συσκευής. Επιλέξτε το κλείδωμα οθόνης που θέλετε να χρησιμοποιήσετε."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Επιλέξτε εφεδρική μέθοδο κλειδώματος οθόνης"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Επιλέξτε έναν εφεδρικό τρόπο κλειδώματος οθόνης"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Επιλογή μεθόδου εφεδρικού κλειδώματος οθόνης"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Επιλογές κλειδώματος οθόνης"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Επιλογές κλειδώματος οθόνης"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Κλείδωμα οθόνης"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face Unlock + κωδικός πρόσβασης"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Συνέχεια χωρίς το Face Unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Μπορείτε να ξεκλειδώνετε το τηλέφωνό σας χρησιμοποιώντας το πρόσωπό σας. Για λόγους ασφάλειας, αυτή η επιλογή απαιτεί εφεδρικό κλείδωμα οθόνης."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Βιομετρικά + Μοτίβο"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Βιομετρικά + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Βιομετρικά + Κωδικός πρόσβασης"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Συνέχεια χωρίς βιομετρικά"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Μπορείτε να ξεκλειδώνετε το τηλέφωνό σας χρησιμοποιώντας τα βιομετρικά σας. Για λόγους ασφάλειας, αυτή η επιλογή απαιτεί εφεδρικό κλείδωμα οθόνης."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Απενεργοποιήθηκε λόγω διαχειριστή, πολιτικής κρυπτογράφησης ή αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Κανένα"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Ολίσθηση"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Πρέπει να αποτελείται από λιγότερα από <xliff:g id="NUMBER_0">%d</xliff:g> ψηφίο</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Ο διαχειριστής της συσκευής δεν επιτρέπει τη χρήση πρόσφατου PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Τα συνηθισμένα PIN αποκλείονται από τον διαχειριστή IT. Δοκιμάστε να χρησιμοποιήσετε διαφορετικό PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Δεν μπορεί να περιλαμβάνει μη έγκυρο χαρακτήρα"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Πρέπει να περιλαμβάνει τουλάχιστον ένα γράμμα"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Πρέπει να περιλαμβάνει τουλάχιστον ένα ψηφίο"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Πρέπει να περιέχει τουλάχιστον 1 μη αριθμητικό χαρακτήρα</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Ο διαχειριστής της συσκευής δεν επιτρέπει τη χρήση πρόσφατου κωδικού πρόσβασης"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Οι συνηθισμένοι κωδικοί πρόσβασης αποκλείονται από τον διαχειριστή IT. Δοκιμάστε να χρησιμοποιήσετε διαφορετικό κωδικό πρόσβασης."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Δεν επιτρέπεται η αύξουσα, φθίνουσα ή επαναλαμβανόμενη ακολουθία ψηφίων"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Επιβεβαίωση"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Ακύρωση"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ενεργοποίηση Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Χρήση Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Χρήση Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Ρυθμίσεις Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Ορισμός &amp; διαχείριση ασύρματων σημείων πρόσβασης"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Κεντράρετε τον κωδικό QR παρακάτω για να συνδεθείτε στο \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Συνδεθείτε στο Wi‑Fi σαρώνοντας έναν κωδικό QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Μοιραστείτε το Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Σαρώστε αυτόν τον κωδικό QR για σύνδεση στο δίκτυο \"<xliff:g id="SSID">%1$s</xliff:g>\" και κοινοποιήστε τον κωδικό πρόσβασης"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Σαρώστε αυτόν τον κωδικό QR με μια άλλη συσκευή για να συνδεθείτε στο δίκτυο \"<xliff:g id="SSID">%1$s</xliff:g>\"."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Σάρωση αυτού του κωδικού QR για σύνδεση στο δίκτυο \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Δοκιμάστε ξανά. Εάν το πρόβλημα παραμένει, επικοινωνήστε με τον κατασκευαστή της συσκευής"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Παρουσιάστηκε κάποιο πρόβλημα"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Κωδικός πρόσβασης Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Κωδικός πρόσβασης σημείου πρόσβασης Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Αυτόματη σύνδεση"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Επιτρέψτε στο τηλέφωνο να συνδέεται αυτόματα όταν βρίσκεται κοντά σε αυτό το δίκτυο."</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Επιτρέψτε στο tablet να συνδέεται αυτόματα όταν βρίσκεται κοντά σε αυτό το δίκτυο."</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Να επιτρέπεται η σύνδεση σε αυτό το δίκτυο όταν βρίσκεται εντός εμβέλειας"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Προσθήκη συσκευής"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Χρησιμοποιήστε έναν κωδικό QR για να προσθέσετε μια συσκευή σε αυτό το δίκτυο"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Ο κωδικός QR δεν έχει έγκυρη μορφή"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Χρήση πιστοποιητικών συστήματος"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Να μην παρέχεται"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Να μην επικυρώνεται"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Δεν έχει καθοριστεί πιστοποιητικό. Η σύνδεσή σας δεν θα είναι ιδιωτική."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Το όνομα δικτύου είναι υπερβολικά μεγάλο."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Πρέπει να καθορίσετε έναν τομέα."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Απαιτείται πιστοποιητικό."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Σύνδεση"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Το Wi-Fi ενεργοποιήθηκε"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Σύνδεση σε <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Σύνδεση στο δίκτυο <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Σύνδεση…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Αποτυχία σύνδεσης στο δίκτυο"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Το δίκτυο δεν βρίσκεται εντός εμβέλειας"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Διεύθυνση MAC συσκευής"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Τυχαία διεύθυνση MAC"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Τυχαία διεύθυνση MAC (τελευταία χρήση)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Διεύθυνση IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Λεπτομέρειες δικτύου"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Μάσκα υποδικτύου"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Διευθύνσεις IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Αποθηκευμένα δίκτυα"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Συνδρομές"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Άλλα δίκτυα"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Ρυθμίσεις IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Οι σύνθετες ρυθμίσεις Wi‑Fi δεν είναι διαθέσιμες για αυτόν το χρήστη"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Αποθ/ση"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Πληκτρολογήστε μια έγκυρη διεύθυνση πύλης."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Πληκτρολογήστε μια έγκυρη διεύθυνση DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Εισαγάγετε το μήκος προθέματος δικτύου από 0 έως 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (εκτός αν παρακάμπτεται από Ιδιωτικό DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (εκτός αν παρακάμπτεται από Ιδιωτικό DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Πύλη"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Μήκος προθέματος δικτύου"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Η εφαρμογή μοιράζεται περιεχόμενο. Για να μοιραστείτε τη σύνδεση στο διαδίκτυο, απενεργοποιήστε το σημείο πρόσβασης Wi-Fi και έπειτα ενεργοποιήστε το."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Δεν έχει οριστεί κωδικός πρόσβασης"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Όνομα σημείου πρόσβασης Wi-Fi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ενεργοποίηση σημείου πρόσβασης Wi-Fi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Ενεργοποίηση <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Είναι δυνατή η σύνδεση άλλων συσκευών στο σημείο πρόσβασης Wi-Fi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Κωδικός σημείου πρόσβασης Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Ζώνη σημείου πρόσβασης"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Αυξάνει αυτόματα τον ρυθμό ανανέωσης από τα 60 στα 90 Hz για ορισμένο περιεχόμενο. Αυξάνει τη χρήση της μπαταρίας."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Επιβολή ρυθμού ανανέωσης 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Ο υψηλότερος δυνατός ρυθμός ανανέωσης για βελτιωμένη απόκριση αφής και ποιότητα κινούμενων εικόνων. Αυξάνει τη χρήση της μπαταρίας."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Παρακολούθηση οθόνης"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ενεργό/Η οθόνη δεν θα απενεργοποιείται εάν την κοιτάτε"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Όταν η οθόνη είναι σκοτεινή, ανάβει όταν λαμβάνετε νέες ειδοποιήσεις."</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Να εμφαν. πάντα ώρα και πληρ."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Αυξημένη χρήση μπαταρίας"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Κείμενο με έντονη γραφή"</string>
     <string name="title_font_size" msgid="570613010306330622">"Μέγεθος γραμματοσειράς"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Κάντε το κείμενο μεγαλύτερο ή μικρότερο"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Ρυθμίσεις κλειδ/τος SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Έκδοση Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Ενημέρωση ασφαλείας Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Μοντέλο"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Μοντέλο: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Μοντέλο και εξοπλισμός"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Έκδοση εξοπλισμού"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Αναγνωριστικό εξοπλισμού"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Διαγραφή APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Νέο APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Αποθ/ση"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Απόρριψη"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Ακύρωση"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Το πεδίο Όνομα δεν μπορεί να είναι κενό."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Το APN δεν μπορεί να είναι κενό."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Μπορεί να γίνει επαναφορά των εφαρμογών"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Επαναφ. Wi-Fi/mobile/Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Με αυτόν τον τρόπο θα γίνει επαναφορά όλων των ρυθμίσεων δικτύου, μεταξύ των οποίων για:\n\n"<li>"Wi‑Fi"</li>\n<li>"Δεδομένα κινητής τηλεφωνίας"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Διαγραφή"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Διαγραφή ληφθεισών SIM"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Για λήψη SIM αντικατάστασης, επικοινωνήστε με την εταιρεία κινητής τηλεφωνίας σας. Με αυτήν την ενέργεια, δεν θα ακυρωθεί κάποιο πρόγραμμα υπηρεσιών κινητής τηλεφωνίας."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Με αυτήν την ενέργεια, δεν θα ακυρωθεί κανένα πρόγραμμα υπηρεσιών κινητής τηλεφωνίας. Για τη λήψη SIM αντικατάστασης, επικοινωνήστε με την εταιρεία κινητής τηλεφωνίας σας."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Επαναφορά ρυθμίσεων"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Επαναφορά όλων των ρυθμίσεων δικτύου; Δεν μπορείτε να αναιρέσετε αυτή την ενέργεια."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Να γίνει επαναφορά όλων των ρυθμίσεων δικτύου και διαγραφή όλων των SIM των οποίων έγινε λήψη; Δεν μπορείτε να αναιρέσετε αυτή την ενέργεια."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Έγινε επαναφορά των ρυθμίσεων δικτύου."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Δεν είναι δυνατή η διαγραφή των SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Δεν είναι δυνατή η διαγραφή των SIM των οποίων έγινε λήψη λόγω ενός σφάλματος.\n\nΕπανεκκινήστε τη συσκευή σας και δοκιμάστε ξανά."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Διαγραφή δεδομένων (επαναφορά)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Διαγρ. δεδομ. (εργ. επαναφ.)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον εσωτερικό αποθηκευτικό χώρο "<b>"του tablet"</b>", συμπεριλαμβανομένων:\n\n"<li>"του Λογαριασμού σας Google"</li>\n<li>"των δεδομένων και των ρυθμίσεων συστήματος και εφαρμογών"</li>\n<li>"των ληφθέντων εφαρμογών"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον εσωτερικό αποθηκευτικό χώρο "<b>"του τηλεφώνου σας"</b>", συμπεριλαμβανομένων:\n\n"<li>"του Λογαριασμού σας Google"</li>\n<li>"των δεδομένων και των ρυθμίσεων συστήματος και εφαρμογών"</li>\n<li>"των ληφθέντων εφαρμογών"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Υπάρχουν άλλοι χρήστες σε αυτήν τη συσκευή.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Μουσική"</li>\n<li>"Φωτογραφίες"</li>\n<li>"Άλλα δεδομένα χρήστη"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Με αυτήν την ενέργεια, δεν θα ακυρωθεί το πρόγραμμα υπηρεσίας κινητής τηλεφωνίας που χρησιμοποιείτε."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Πρέπει να γίνει διαγραφή του "<b>"αποθηκευτικού χώρου USB"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των εικόνων και άλλων δεδομένων."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Πρέπει να γίνει διαγραφή της "<b>"κάρτας SD"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των εικόνων και άλλων δεδομένων."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Διαγραφή όλων των δεδομένων (επαναφορά εργοστασιακών ρυθμίσεων)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Διαγρ. δεδομ. (εργ. επαναφ.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον εσωτερικό αποθηκευτικό χώρο "<b>"του tablet"</b>", συμπεριλαμβανομένων:\n\n"<li>"του Λογαριασμού σας Google"</li>\n<li>"των δεδομένων και των ρυθμίσεων συστήματος και εφαρμογών"</li>\n<li>"των ληφθέντων εφαρμογών"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Με αυτόν τον τρόπο, θα διαγραφούν όλα τα δεδομένα από τον εσωτερικό αποθηκευτικό χώρο "<b>"του τηλεφώνου σας"</b>", συμπεριλαμβανομένων:\n\n"<li>"του Λογαριασμού σας Google"</li>\n<li>"των δεδομένων και των ρυθμίσεων συστήματος και εφαρμογών"</li>\n<li>"των ληφθέντων εφαρμογών"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Αυτήν τη στιγμή είστε συνδεδεμένοι στους παρακάτω λογαριασμούς:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Υπάρχουν άλλοι χρήστες σε αυτήν τη συσκευή.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Μουσική"</li>\n<li>"Φωτογραφίες"</li>\n<li>"Άλλα δεδομένα χρήστη"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Με αυτήν την ενέργεια, δεν θα ακυρωθεί το πρόγραμμα υπηρεσιών κινητής τηλεφωνίας που χρησιμοποιείτε."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Πρέπει να γίνει διαγραφή του "<b>"αποθηκευτικού χώρου USB"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των φωτογραφιών και άλλων δεδομένων χρήστη."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Πρέπει να γίνει διαγραφή της "<b>"κάρτας SD"</b>" για να γίνει, επίσης, διαγραφή της μουσικής, των φωτογραφιών και άλλων δεδομένων χρήστη."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Διαγρ. αποθ. χώρου USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Διαγραφή κάρτας SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στον εσωτερικό αποθηκευτικό χώρο USB του τηλεφώνου σας, όπως αρχεία μουσικής και φωτογραφίες"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Διαγράψτε όλα τα δεδομένα που υπάρχουν στην κάρτα SD, όπως αρχεία μουσικής και φωτογραφίες"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Διαγραφή όλων των δεδομένων"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Διαγραφή όλων των δεδομένων"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Θα διαγραφούν όλα τα προσωπικά στοιχεία και όλες οι ληφθείσες εφαρμογές σας. Δεν μπορείτε να αναιρέσετε αυτή την ενέργεια."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Θα διαγραφούν όλα τα προσωπικά στοιχεία, μεταξύ άλλων οι όλες οι ληφθείσες εφαρμογές σας και οι SIM σας. Δεν μπορείτε να αναιρέσετε αυτή την ενέργεια."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Διαγραφή όλων"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Δεν πραγματοποιήθηκε επαναφορά επειδή η υπηρεσία Εκκαθάρισης συστήματος δεν είναι διαθέσιμη."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Διαγραφή όλων των δεδομένων;"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Η επαναφορά των εργοστασιακών ρυθμίσεων δεν είναι διαθέσιμη γι\' αυτόν το χρήστη"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Διαγραφή"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Περιμένετε…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Διαγραφή όλων των δεδομένων"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Διαγραφή όλων των δεδομένων"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Θα διαγραφούν όλα τα προσωπικά στοιχεία και όλες οι ληφθείσες εφαρμογές σας. Δεν μπορείτε να αναιρέσετε αυτή την ενέργεια."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Θα διαγραφούν όλα τα προσωπικά στοιχεία, μεταξύ άλλων οι ληφθείσες εφαρμογές σας και οι SIM. Δεν μπορείτε να αναιρέσετε αυτή την ενέργεια."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Διαγραφή όλων των δεδομένων;"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Η επαναφορά των εργοστασιακών ρυθμίσεων δεν είναι διαθέσιμη γι\' αυτόν το χρήστη."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Διαγραφή"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Περιμένετε…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Ρυθμίσεις κλήσης"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Ορισμ.αυτόμ.τηλεφ., προώθ.κλήσης, αναμ.κλήσης, αναγν.κλήσ."</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Σύνδεση με USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Αδυναμία σύνδεσης σε περισσότερες από <xliff:g id="MAXCONNECTION">%1$d</xliff:g> συσκευές"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> θα αποσυνδεθεί."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Σύνδεση Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Κοινή χρήση της σύνδεσης του τηλεφώνου στο διαδίκτυο μέσω USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Κοινή χρήση της σύνδεσης του τηλεφώνου στο διαδίκτυο μέσω Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Χρησιμοποιήστε το σημείο πρόσβασης Wi-Fi και τη σύνδεση για να παρέχετε σύνδεση στο διαδίκτυο σε άλλες συσκευές, μέσω της σύνδεσης δεδομένων κινητής τηλεφωνίας που χρησιμοποιείτε. Οι εφαρμογές μπορούν επίσης να δημιουργούν ένα σημείο πρόσβασης Wi-Fi, για να μοιράζονται περιεχόμενο με κοντινές συσκευές."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Χρησιμοποιήστε το σημείο πρόσβασης Wi-Fi και τη σύνδεση, για να παρέχετε σύνδεση στο διαδίκτυο σε άλλες συσκευές, μέσω του δικτύου Wi-Fi ή της σύνδεσης δεδομένων κινητής τηλεφωνίας που χρησιμοποιείτε. Οι εφαρμογές μπορούν επίσης να δημιουργούν ένα σημείο πρόσβασης Wi-Fi, για να μοιράζονται περιεχόμενο με κοντινές συσκευές."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Βοήθεια"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Σάρωση Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Επιτρέψτε στις εφαρμογές και στις υπηρεσίες να εκτελούν σάρωση για κοντινές συσκευές ανά πάσα στιγμή, ακόμα και όταν το Bluetooth είναι απενεργοποιημένο. Η σάρωση μπορεί να χρησιμοποιηθεί, για παράδειγμα, για τη βελτίωση λειτουργιών και υπηρεσιών που εκτελούνται βάσει τοποθεσίας."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Οι υπηρεσίες τοποθεσίας δεν λειτουργούν"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Εντοπισμός ζώνης ώρας τοποθεσίας"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Εντοπισμός ζώνης ώρας τοποθεσίας"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Επιτρέπει τη χρήση της τοποθεσίας συσκευής για τον εντοπισμό της τρέχουσας ζώνης ώρας. Άλλες ρυθμίσεις τοποθεσίας όπως η σάρωση Wi‑Fi μπορούν να επηρεάσουν την ακρίβεια του εντοπισμού ζώνης ώρας."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Ενεργοποιημένος"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Απενεργοποιημένος"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Ο αυτόματος εντοπισμός ζώνης ώρας είναι απενεργοποιημένος"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Ο εντοπισμός ζώνης ώρας τοποθεσίας είναι απενεργοποιημένος"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Ο εντοπισμός ζώνης ώρας τοποθεσίας δεν υποστηρίζεται"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Δεν επιτρέπονται αλλαγές στον εντοπισμό ζώνης ώρας τοποθεσίας"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Τοποθεσία Wi‑Fi και δικτύων κιν. τηλεφ."</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Να επιτρέπεται στις εφαρμογές να χρησιμοποιούν την υπηρεσία τοποθεσίας της Google για γρήγορη εκτίμηση της τοποθεσίας σας. Θα συλλεχθούν ανώνυμα δεδομένα και θα αποσταλούν στην Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Η τοποθεσία καθορίζεται από το Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Ρυθμ. κωδ. πρ. για χρήση του Face Unlock"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Ρυθμ. μοτίβο για χρήση του Face Unlock"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Για να χρησιμοποιήσετε το Face Unlock, ορίστε ένα PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Ορισμός κωδικού πρόσβασης για χρήση βιομετρικών"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Ορισμός μοτίβου για χρήση βιομετρικών"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Ορισμός PIN για χρήση βιομετρικών"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Ξεχάσατε τον κωδικό πρόσβασής σας;"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Ξεχάσατε το μοτίβο σας;"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Ξεχάσατε το PIN σας;"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Προτιμήσεις υπότιτλων"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Μεγιστοποίηση"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Περιοχή μεγέθυνσης"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ενεργοποίηση μεγέθυνσης"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Επιλέξτε τις περιοχές μεγέθυνσης που θέλετε να χρησιμοποιήσετε κατά τη μεγέθυνση της οθόνης"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Πλήρης οθόνη"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Μέρος της οθόνης"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Πλήρης οθόνη και μέρος της οθόνης"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Μεγέθυνση ολόκληρης της οθόνης"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Μεγέθυνση μέρους της οθόνης"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Εναλλαγή σε κουμπί προσβασιμότητας;"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Η χρήση τριπλού πατήματος για τη μεγέθυνση ενός μέρους της οθόνης θα προκαλέσει καθυστέρηση της πληκτρολόγησης και άλλων ενεργειών.\n\nΘέλετε να κάνετε εναλλαγή σε χρήση του κουμπιού προσβασιμότητας για μεγέθυνση;"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Εναλλαγή σε κουμπί προσβασιμότητας"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Συνέχιση χρήσης τριπλού πατήματος για μεγέθυνση"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ρυθμίσεις μεγέθυνσης"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Μεγέθ. με 3πλό πάτημα"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Συντόμ. μεγέθυνσης"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Τερματ. κλήσης με κουμπί λειτουργίας"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Μεγάλος δείκτης ποντικιού"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Κατάργηση κινούμενων εικόνων"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Μονοφωνικός ήχος"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Συνδυασμός καναλιών κατά την αναπαραγωγή ήχου"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Ισορροπία ήχου"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Αριστερά"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Δεξιά"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Μονοφωνικός ήχος"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Συνδυασμός καναλιών κατά την αναπαραγωγή ήχου."</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Ισορροπία ήχου"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Αριστερά"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Δεξιά"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Προεπιλογή"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 δευτερόλεπτα"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 δευτερόλεπτα"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Δόνηση ειδοποίησης"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Δόνηση κλήσης"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Ανάδραση αφής"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Χρήση <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Άνοιγμα <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Χρήση διόρθωσης χρωμάτων"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Εμφάνιση υποτίτλων"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Μόνο για την υποστηριζόμενη εφαρμογή"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Χρήση <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Άνοιγμα <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Χρήση διόρθωσης χρωμάτων"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Εμφάνιση υποτίτλων"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Μόνο για την υποστηριζόμενη εφαρμογή."</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Μέγεθος και στιλ υποτίτλων"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> μέγεθος κειμένου"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Περισσότερες επιλογές"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Δευτερανοπία"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Πρωτανοπία"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Τριτανοπία"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Κλίμακα του γκρι"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Κόκκινο-πράσινο"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Κόκκινο-πράσινο"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Μπλε-κίτρινο"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Περιορισμός στο παρασκήνιο"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Να επιτρέπεται στην εφαρμογή να εκτελείται στο παρασκήνιο"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Δεν επιτρέπεται η εκτέλεση της εφαρμογής στο παρασκήνιο"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Δεν είναι δυνατός ο περιορισμός της χρήσης στο παρασκήνιο"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Δεν είναι δυνατός ο περιορισμός της χρήσης στο παρασκήνιο."</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Να περιοριστεί η δραστηριότητα στο παρασκήνιο;"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Εάν περιορίσετε τη δραστηριότητα στο παρασκήνιο για μια εφαρμογή, μπορεί να μην λειτουργήσει σωστά"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Εφόσον δεν έχει οριστεί βελτιστοποίηση μπαταρίας, δεν είναι δυνατός ο περιορισμός της εφαρμογής.\n\nΓια περιορισμό, ενεργοποιήστε τη βελτιστοποίηση."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Το tablet χρησιμοποιείται περισσότερο από το συνηθισμένο"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Η συσκευή χρησιμοποιείται περισσότερο από το συνηθισμένο"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Η μπαταρία μπορεί να εξαντληθεί νωρίτερα από το συνηθισμένο"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Βελτιστοποίηση για τη διατήρηση της καλής κατάστασης της μπαταρίας"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Η μπαταρία περιορίστηκε προσωρινά. Πατήστε για να μάθετε περισσότερα."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Το τηλέφωνό σας έχει χρησιμοποιηθεί περισσότερο από το συνηθισμένο. Η μπαταρία μπορεί να εξαντληθεί πιο σύντομα από το αναμενόμενο.\n\nΚορυφαίες εφαρμογές βάσει χρήσης μπαταρίας:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Το tablet έχει χρησιμοποιηθεί περισσότερο από το συνηθισμένο. Η μπαταρία μπορεί να εξαντληθεί πιο σύντομα από το αναμενόμενο.\n\nΚορυφαίες εφαρμογές βάσει χρήσης μπαταρίας:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Η συσκευή σας έχει χρησιμοποιηθεί περισσότερο από το συνηθισμένο. Η μπαταρία μπορεί να εξαντληθεί πιο σύντομα από το αναμενόμενο.\n\nΚορυφαίες εφαρμογές βάσει χρήσης μπαταρίας:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d εφαρμογή έχει περιοριστεί</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Υπάρχει κάποιο πρόβλημα με την ανάγνωση του μετρητή μπαταρίας"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Υπάρχει κάποιο πρόβλημα με την ανάγνωση του μετρητή μπαταρίας. Πατήστε για να "<annotation id="url">"μάθετε περισσότερα."</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Διακοπή εφαρμογής;"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Το τηλέφωνό σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί ενεργή τη συσκευή σας.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε αυτήν την εφαρμογή.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Το tablet σας δεν μπορεί να διαχειριστεί κανονικά την μπαταρία επειδή η εφαρμογή <xliff:g id="APP">%1$s</xliff:g> διατηρεί ενεργή τη συσκευή σας.\n\nΓια να δοκιμάσετε να επιλύσετε αυτό το πρόβλημα, μπορείτε να σταματήσετε αυτήν την εφαρμογή.\n\nΕάν το πρόβλημα δεν επιλυθεί, ίσως χρειαστεί να απεγκαταστήσετε την εφαρμογή για να βελτιώσετε τις επιδόσεις της μπαταρίας."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ορίστε ένα πρόγραμμα"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Επέκταση διάρκειας ζωής της μπαταρίας"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Απενεργοποίηση όταν είναι φορτισμένη"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν η στάθμη της μπαταρίας του τηλεφώνου σας είναι στο <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν η στάθμη της μπαταρίας του tablet σας είναι στο <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν η στάθμη της μπαταρίας της συσκευής σας είναι στο <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν το επίπεδο φόρτισης της μπαταρίας του τηλεφώνου σας είναι πάνω από <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν το επίπεδο φόρτισης της μπαταρίας του tablet σας είναι πάνω από <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Η Εξοικονόμηση μπαταρίας απενεργοποιείται όταν το επίπεδο φόρτισης της μπαταρίας της συσκευής σας είναι πάνω από <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ενεργοποίηση"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Επαναφορά"</string>
     <string name="tts_play" msgid="2945513377250757221">"Αναπαραγωγή"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Προσαρμοστική συνδεσιμότητα"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Επεκτείνει τη διάρκεια ζωής της μπαταρίας και βελτιώνει την απόδοση της συσκευής με αυτόματη διαχείριση των συνδέσεων δικτύου σας."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Αποθηκ. χώρος διαπιστευτηρίων"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Εγκαταστήστε ένα πιστοποιητικό"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Εγκατάσταση πιστοποιητικών από συσκευή αποθήκευσης"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Διαπιστευτήρια χρήστη"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Προβολή και τροποποίηση αποθηκευμένων διαπιστευτηρίων"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Για προχωρημένους"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Τύπος αποθήκευσης"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Με υποστήριξη εξοπλισμού"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Μόνο λογισμικό"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Τα διαπιστευτήρια δεν είναι διαθέσιμα γι\' αυτόν το χρήστη"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Εγκαταστάθηκε για VPN και εφαρμογές"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Εγκαταστάθηκε για Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Να μην γίνει εγκατάσταση"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Εγκατάσταση ούτως ή άλλως"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Δεν εγκαταστάθηκε πιστοποιητικό"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Επιτρέπετε στην εφαρμογή <xliff:g id="APP_NAME">%s</xliff:g> να εγκαταστήσει πιστοποιητικά σε αυτήν τη συσκευή;"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Αυτά τα πιστοποιητικά θα σας ταυτοποιούν στις παρακάτω εφαρμογές και URL"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Να μην επιτρέπεται"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Να επιτρέπεται"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Εμφάνιση περισσότερων"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Εφαρμογή διαχ. πιστοποιητικών"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Καμία"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Τα πιστοποιητικά που έχουν εγκατασταθεί από αυτήν την εφαρμογή σας προσδιορίζουν στις παρακάτω εφαρμογές και URL."</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Κατάργηση"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Σήμα κλήσης έκτακτης ανάγκης"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Ορισμός συμπεριφοράς κατά την πραγματοποίηση κλήσης επείγουσας ανάγκης"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Δημιουργία αντιγράφων ασφαλείας"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Δεν έχει ρυθμιστεί - Προφίλ εργασίας"</string>
     <string name="user_admin" msgid="4024553191395768119">"Διαχειριστής"</string>
     <string name="user_you" msgid="3070562015202859996">"Εσείς (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Ψευδώνυμο"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Μπορείτε να προσθέσετε έως και <xliff:g id="USER_COUNT">%1$d</xliff:g> χρήστες"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Μόνο ο κάτοχος του tablet μπορεί να διαχειριστεί χρήστες."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Μόνο ο κάτοχος του τηλεφώνου μπορεί να διαχειριστεί χρήστες."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Πληρωμή στο τερματικό"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Ρυθμίστε μια εφαρμογή πληρωμής. Στη συνέχεια, ακουμπήστε απλώς το πίσω μέρος του τηλεφώνου σας, σε οποιοδήποτε τερματικό με το σύμβολο ανεπαφικών πληρωμών."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Το κατάλαβα"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Περισσότερα…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Περισσότερα…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Ορισμός προεπιλεγμένης εφαρμογής πληρωμών"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ενημέρωση προεπιλεγμένης εφαρμογής πληρωμών"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Σε ανεπαφικά τερματικά, πληρωμή με την εφαρμογή <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Πίσω"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Επόμενο"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Τέλος"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Λήψη φωτογραφίας"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Επιλέξτε μια εικόνα"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Επιλογή φωτογραφίας"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Κάρτες SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Κάρτες SIM"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Να χρησιμοποιείται πάντα για κλήσεις"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Επιλέξτε μια κάρτα SIM για δεδομένα"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Επιλέξτε μια SIM για SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Εναλλαγή κάρτας SIM δεδομένων, αυτό μπορεί να διαρκέσει ένα λεπτό…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Εναλλαγή κάρτας SIM δεδομένων. Αυτό μπορεί να διαρκέσει έως και ένα λεπτό…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Κλήση με"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Επιλογή κάρτας SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ρουτίνα, χρονοδιάγραμμα, εξοικονόμηση μπαταρίας, εξοικονόμηση ενέργειας, μπαταρία, αυτόματα, ποσοστό"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, σύνθετες λειτουργίες κλήσης, κλήσεις 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"προσθήκη γλώσσας, προσθέστε μια γλώσσα"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"μέγεθος κειμένου"</string>
     <string name="default_sound" msgid="6604374495015245195">"Προεπιλεγμένος ήχος"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ένταση ήχου κουδουνίσματος και ειδοποιήσεων στο <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Ένταση ήχου, δόνηση, λειτουργία \"Μην ενοχλείτε\""</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ήχοι ενεργοποίησης"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Ζωντανοί υπότιτλοι"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Αυτόματοι υπότιτλοι στο μέσο"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Κανένα"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Ορίστηκαν <xliff:g id="ON_COUNT">%d</xliff:g> προγράμματα.</item>
-      <item quantity="one">Ορίστηκε 1 πρόγραμμα.</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Κανένα}=1{Ορίστηκε ένα χρονοδιάγραμμα.}other{Ορίστηκαν # χρονοδιαγράμματα.}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Μην ενοχλείτε"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Λήψη ειδοποιήσεων μόνο από σημαντικά άτομα και εφαρμογές"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Περιορισμός διακοπών"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Μόνο προτεραιότητας"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Ενεργή / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Απενεργοποιημένη / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Απενεργοποιημένη"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ενεργή"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ερώτηση κάθε φορά"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Μέχρι την απενεργοποίηση"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ώρες</item>
-      <item quantity="one">1 ώρα</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> λεπτά"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> πργράμματα μπορούν να ενεργοποιηθούν αυτόματα</item>
-      <item quantity="one">Ένα πρόγραμμα μπορεί να ενεργοποιηθεί αυτόματα</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{Μία ώρα}other{# ώρες}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{Ένα λεπτό}other{# λεπτά}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Ανενεργό}=1{Ανενεργό / Ένα χρονοδιάγραμμα μπορεί να ενεργοποιηθεί αυτόματα.}other{Ανενεργό / # χρονοδιαγράμματα μπορούν να ενεργοποιηθούν αυτόματα.}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Τι μπορεί να διακόπτει τη λειτουργία Μην ενοχλείτε"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Άτομα"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Εφαρμογές"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Αυτόματος ορισμός των ειδοποιήσεων χαμηλότερης προτεραιότητας ως διακριτικών"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Προσαρμοστική ταξινόμηση ειδοποιήσεων"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Αυτόματη ταξινόμηση ειδοποιήσεων κατά συνάφεια"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Σχόλια προσαρμοστικών ειδοποιήσεων"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Να υποδεικνύονται προσαρμογές που πραγματοποιούνται σε ειδοποιήσεις και να εμφανίζεται η επιλογή παροχής σχολίων στο σύστημα."</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Επαναφορά σημασίας ειδοποίησης"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Επαναφέρετε τις ρυθμίσεις σημασίας που άλλαξαν από τον χρήστη και επιτρέψτε στον βοηθό ειδοποιήσεων να ορίζει την προτεραιότητα."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Προτεινόμενες ενέργειες και απαντήσεις"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Αυτόματη εμφάνιση προτεινόμενων ενεργειών και απαντήσεων"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Εμφάνιση πρόσφατων ειδοποιήσεων και ειδοποιήσεων που έχουν αναβληθεί"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Συζητήσεις προτεραιότητας"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Να προβάλλονται στο επάνω μέρος της ενότητας συνομιλιών ως αιωρούμενα συννεφάκια."</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Εμφάνιση στο επάνω μέρος της ενότητας συνομιλιών"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Άλλες συζητήσεις"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Συζητήσεις χωρίς προτεραιότητα"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Οι συνομιλίες στις οποίες έχετε κάνει αλλαγές"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Πρόσφατες συνομιλίες"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Διαγραφή πρόσφατων"</string>
+    <string name="clear" msgid="5092178335409471100">"Διαγραφή"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Εμφάνιση των συνομιλιών προτεραιότητας σε συννεφάκι"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Οι συνομιλίες προτεραιότητας εμφανίζονται στο επάνω μέρος του αναπτυσσόμενου πλαισίου σκίασης. Μπορείτε επίσης να τις ρυθμίσετε ώστε να εμφανίζονται σε συννεφάκι και να διακόψετε τη λειτουργία Μην ενοχλείτε."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Εδώ θα εμφανίζονται οι συνομιλίες προτεραιότητας και οι τροποποιημένες συνομιλίες"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Πρόσβαση \"Μην ενοχλείτε\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Ενεργοποίηση λειτουργίας Μην ενοχλείτε"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Δεν ζητήθηκε πρόσβαση στη λειτουργία \"Μην ενοχλείτε\" από εγκατεστημένες εφαρμογές"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Φόρτωση εφαρμογών…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Φόρτωση εφαρμογών…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Μετά από αίτημά σας, το Android αποκλείει την εμφάνιση ειδοποιήσεων αυτής της εφαρμογής σε αυτήν τη συσκευή"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Μετά από αίτημά σας, το Android αποκλείει την εμφάνιση ειδοποιήσεων αυτής της κατηγορίας σε αυτήν τη συσκευή"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Μετά από αίτημά σας, το Android αποκλείει την εμφάνιση ειδοποιήσεων αυτής της ομάδας σε αυτήν τη συσκευή"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Όλες οι συζητήσεις"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Συζητήσεις προτεραιότητας"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Καμία"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> συζητήσεις</item>
-      <item quantity="one">1 συζήτηση</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Καμία"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Καμία}=1{Μία συζήτηση}other{# συζητήσεις}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ποιος μπορεί να διακόπτει"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Κλήσεις"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Κλήσεις"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Για να είστε σίγουροι ότι θα ακούγεται ήχος για τις επιτρεπόμενες κλήσεις, ελέγξτε ότι η συσκευή έχει ρυθμιστεί έτσι ώστε να ακούγεται το κουδούνισμα"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Οι εισερχόμενες κλήσεις έχουν αποκλειστεί για το \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" Μπορείτε να προσαρμόσετε τις ρυθμίσεις για να επιτρέψετε στους φίλους, στην οικογένεια και σε άλλες επαφές να επικοινωνήσουν μαζί σας."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Επαφές με αστέρι"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ακόμα</item>
-      <item quantity="one">1 ακόμα</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Καμία"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Καμία}=1{{contact_1}}=2{{contact_1} και {contact_2}}=3{{contact_1}, {contact_2} και {contact_3}}other{{contact_1}, {contact_2}, και # ακόμη}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Χωρίς όνομα)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Μηνύματα"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"μηνύματα"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Τα εισερχόμενα μηνύματα έχουν αποκλειστεί για το <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Μπορείτε να προσαρμόσετε τις ρυθμίσεις για να επιτρέψετε στους φίλους, στην οικογένεια και σε άλλες επαφές να επικοινωνήσουν μαζί σας."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Θα λαμβάνετε όλα τα μηνύματα"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Θα λαμβάνετε όλες τις κλήσεις"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Καμία"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> επαφές</item>
-      <item quantity="one">1 επαφή</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Καμία}=1{Μία επαφή}other{# επαφές}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Όλοι"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Επαφές"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Επαφές με αστέρι"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Όλες οι ειδοποιήσεις"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Ορισμένες ειδοποιήσεις"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Επιλεγμένα άτομα θα μπορούν ακόμη να επικοινωνήσουν μαζί σας, ακόμη και αν δεν επιτρέπετε τη διακοπή από τις εφαρμογές"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> εφαρμογές μπορούν να διακόπτουν.</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> εφαρμογή μπορεί να διακόπτει.</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> ακόμη"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Καμία εφαρμογή δεν μπορεί να διακόπτει.}=1{Η εφαρμογή {app_1} μπορεί να διακόπτει.}=2{Οι εφαρμογές {app_1} και {app_2} μπορούν να διακόπτουν.}=3{Οι εφαρμογές {app_1}, {app_2} και {app_3} μπορούν να διακόπτουν.}other{Οι εφαρμογές {app_1}, {app_2} και # ακόμη εφαρμογές μπορούν να διακόπτουν.}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Εφαρμογές"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Όλες οι ειδοποιήσεις"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Ορισμένες ειδοποιήσεις"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Ειδοποιήσεις που μπορούν να διακόπτουν"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Να επιτρέπονται όλες οι ειδοποιήσεις"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ήχοι μπορούν να διακόπτουν.</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> ήχος μπορεί να διακόπτει.</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Τίποτα δεν μπορεί να διακόπτει."</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> ακόμη"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Τίποτα δεν μπορεί να διακόπτει.}=1{Ο ήχος {sound_category_1} μπορεί να διακόπτει.}=2{Οι ήχοι {sound_category_1} και {sound_category_2} μπορούν να διακόπτουν.}=3{Οι ήχοι {sound_category_1}, {sound_category_2} και {sound_category_3} μπορούν να διακόπτουν.}other{Οι ήχοι {sound_category_1}, {sound_category_2} και # ακόμη ήχοι μπορούν να διακόπτουν.}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Τίποτα δεν μπορεί να διακόπτει."</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Κανείς δεν μπορεί να διακόπτει."</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Ορισμένα άτομα μπορούν να διακόπτουν."</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Όλα τα άτομα μπορούν να διακόπτουν."</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Ενεργό"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Ανενεργή"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Καρφίτσωμα εφαρμογών"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Το καρφίτσωμα εφαρμογών σάς επιτρέπει να διατηρείται την τρέχουσα εφαρμογή σε προβολή έως ότου την ξεκαρφιτσώσετε. Για παράδειγμα, αυτή η λειτουργία μπορεί να χρησιμοποιηθεί για να επιτρέψετε σε έναν έμπιστο φίλο να παίξει ένα συγκεκριμένο παιχνίδι. \n\nΌταν μια εφαρμογή έχει καρφιτσωθεί, η συγκεκριμένη εφαρμογή μπορεί να ανοίξει άλλες εφαρμογές και να παράσχει πρόσβαση σε προσωπικά δεδομένα. \n\nΓια να χρησιμοποιήσετε το καρφίτσωμα εφαρμογών: 	\n1.	Για να ενεργοποιήσετε το καρφίτσωμα εφαρμογών 	\n2.	Ανοίξτε την Επισκόπηση 	\n3.	Πατήστε το εικονίδιο εφαρμογής στο επάνω μέρος της οθόνης και έπειτα πατήστε Καρφίτσωμα."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Το καρφίτσωμα εφαρμογών σάς επιτρέπει να διατηρείτε την τρέχουσα εφαρμογή ορατή έως ότου την ξεκαρφιτσώσετε. Για παράδειγμα, αυτή η λειτουργία μπορεί να χρησιμοποιηθεί, για να επιτρέψετε σε έναν αξιόπιστο φίλο να παίξει ένα συγκεκριμένο παιχνίδι. \n\nΌταν μια εφαρμογή έχει καρφιτσωθεί, η συγκεκριμένη εφαρμογή μπορεί να ανοίξει άλλες εφαρμογές και να παράσχει πρόσβαση σε προσωπικά δεδομένα. \n\nΕάν θέλετε να μοιράζεστε με ασφάλεια τη συσκευή σας με κάποιο άλλο άτομο, δοκιμάστε να χρησιμοποιήσετε έναν χρήστη-επισκέπτη. \n\nΓια να χρησιμοποιήσετε το καρφίτσωμα εφαρμογών: \n1.Ενεργοποιήστε το καρφίτσωμα εφαρμογών \n2.Ανοίξτε την Επισκόπηση \n3.Πατήστε το εικονίδιο εφαρμογής στο επάνω μέρος της οθόνης και έπειτα πατήστε Καρφίτσωμα."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Το καρφίτσωμα εφαρμογών σάς επιτρέπει να διατηρείτε την τρέχουσα εφαρμογή ορατή έως ότου την ξεκαρφιτσώσετε. Για παράδειγμα, αυτή η λειτουργία μπορεί να χρησιμοποιηθεί για να επιτρέψετε σε έναν έμπιστο φίλο να παίξει ένα συγκεκριμένο παιχνίδι."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Όταν μια εφαρμογή έχει καρφιτσωθεί, η συγκεκριμένη εφαρμογή μπορεί να ανοίξει άλλες εφαρμογές και να παράσχει πρόσβαση σε προσωπικά δεδομένα. \n\nΓια να χρησιμοποιήσετε το καρφίτσωμα εφαρμογών: 	\n1.	Ενεργοποιήστε το καρφίτσωμα εφαρμογών. 	\n2.	Ανοίξτε την Επισκόπηση. 	\n3.	Πατήστε το εικονίδιο εφαρμογής στο επάνω μέρος της οθόνης και έπειτα πατήστε Καρφίτσωμα."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Όταν μια εφαρμογή έχει καρφιτσωθεί, η συγκεκριμένη εφαρμογή μπορεί να ανοίξει άλλες εφαρμογές και να παράσχει πρόσβαση σε προσωπικά δεδομένα. \n\nΕάν θέλετε να μοιράζεστε με ασφάλεια τη συσκευή σας με κάποιο άλλο άτομο, δοκιμάστε να χρησιμοποιήσετε έναν χρήστη-επισκέπτη. \n\nΓια να χρησιμοποιήσετε το καρφίτσωμα εφαρμογών: 	\n1.	Ενεργοποιήστε το καρφίτσωμα εφαρμογών. 	\n2.	Ανοίξτε την Επισκόπηση. 	\n3.	Πατήστε το εικονίδιο εφαρμογής στο επάνω μέρος της οθόνης και έπειτα πατήστε Καρφίτσωμα."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Όταν μια εφαρμογή είναι καρφιτσωμένη: \n\n•	 Τα προσωπικά δεδομένα ενδέχεται να είναι προσβάσιμα \n		(όπως επαφές και περιεχόμενο μηνυμάτων ηλεκτρονικού ταχυδρομείου) \n•	 Η καρφιτσωμένη εφαρμογή μπορεί να ανοίξει άλλες εφαρμογές \n\nΧρησιμοποιήστε το καρφίτσωμα εφαρμογών μόνο με άτομα που εμπιστεύεστε."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Να ζητείται το μοτίβο ξεκλειδώματος πριν από το ξεκαρφίτσωμα"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Να ζητείται το PIN πριν από το ξεκαρφίτσωμα"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Εκτός από τη χρήση του προσώπου σας για το ξεκλείδωμα της συσκευής σας, μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας τον αριθμό PIN πριν από την εκκίνηση της συσκευής. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών.\n\nΑυτό συμβάλλει στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται αριθμός PIN για την έναρξη λειτουργίας της συσκευής;"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Εκτός από τη χρήση του προσώπου σας για το ξεκλείδωμα της συσκευής σας, μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας την εισαγωγή του μοτίβου σας πριν από την εκκίνησή της. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτό συμβάλλει στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται μοτίβο για την έναρξη λειτουργίας της συσκευής;"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Εκτός από τη χρήση του προσώπου σας για το ξεκλείδωμα της συσκευής, μπορείτε να προστατεύσετε ακόμα περισσότερο αυτήν τη συσκευή με έναν κωδικό πρόσβασης ο οποίος θα ζητείται πριν από την εκκίνησή της. Μέχρι να ολοκληρωθεί η εκκίνηση της συσκευής, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών.\n\nΑυτή η ενέργεια συμβάλλει στην προστασία των δεδομένων των συσκευών σε περίπτωση απώλειας ή κλοπής. Θέλετε να ζητείται ο κωδικός πρόσβασης κατά την εκκίνηση της συσκευής;"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Εκτός από τη χρήση των βιομετρικών στοιχείων σας για το ξεκλείδωμα της συσκευής, μπορείτε να ενισχύσετε την προστασία της συσκευής με την υποχρεωτική εισαγωγή του PIN σας κατά την εκκίνηση. Μέχρι να ολοκληρωθεί η εκκίνηση της συσκευής, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων ξυπνητηριών.\n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων στις συσκευές σε περίπτωση απώλειας ή κλοπής. Θέλετε να ζητείται το PIN κατά την εκκίνηση της συσκευής;"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Εκτός από τη χρήση των βιομετρικών στοιχείων σας για το ξεκλείδωμα της συσκευής, μπορείτε να ενισχύσετε την προστασία της συσκευής με την υποχρεωτική εισαγωγή του μοτίβου σας κατά την εκκίνηση. Μέχρι να ολοκληρωθεί η εκκίνηση της συσκευής, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων ξυπνητηριών.\n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων στις συσκευές σε περίπτωση απώλειας ή κλοπής. Θέλετε να ζητείται το μοτίβο κατά την εκκίνηση της συσκευής;"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Εκτός από τη χρήση των βιομετρικών στοιχείων σας για το ξεκλείδωμα της συσκευής, μπορείτε να ενισχύσετε την προστασία της συσκευής με την υποχρεωτική εισαγωγή του κωδικού πρόσβασής σας κατά την εκκίνηση. Μέχρι να ολοκληρωθεί η εκκίνηση της συσκευής, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων ξυπνητηριών.\n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων στις συσκευές σε περίπτωση απώλειας ή κλοπής. Θέλετε να ζητείται ο κωδικός πρόσβασης κατά την εκκίνηση της συσκευής;"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ναι"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Όχι"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Περιορισμ. πρόσβασης"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Έλεγχος USB από"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Συνδεδεμένη συσκευή"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Αυτή η συσκευή"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Εναλλαγή…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Εναλλαγή…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Δεν ήταν δυνατή η εναλλαγή"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Φόρτιση αυτής της συσκευής"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Φόρτιση συνδεδεμένης συσκευής"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Χρήση δεδ. κιν. τηλεφ."</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Χρήση δεδομένων εφαρμογής"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Χρήση δεδομένων Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Χρήση δεδομένων εκτός εταιρείας κινητής τηλεφωνίας"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Χρήση δεδομένων Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 περιορισμός</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Ο υπολογισμός των δεδομένων από την εταιρεία κινητής τηλεφωνίας μπορεί να διαφέρει από τον υπολογισμό της συσκευής"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Εξαιρούνται δεδομένα που χρησιμοποιούνται από δίκτυα εταιρειών κινητής τηλεφωνίας."</string>
     <string name="data_used_template" msgid="8229342096562327646">"Χρησιμοποιήθηκαν <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ορισμός προειδοπ. δεδομένων"</string>
     <string name="data_warning" msgid="2925054658166062884">"Προειδοποίηση δεδομένων"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Προβολή λεπτομερειών"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Εξοικονόμηση δεδομένων"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Απεριόριστα δεδομένα"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Τα δεδομένα παρασκηνίου είναι απενεργοποιημένα"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Τα δεδομένα παρασκηνίου είναι απενεργοποιημένα."</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Ενεργή"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Απενεργοποιημένη"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Χρήση Εξοικονόμησης δεδομένων"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Αν η συσκευή είναι κλειδωμένη, να αποτρέπεται η πληκτρολόγηση απαντήσεων ή άλλου κειμένου στις ειδοποιήσεις"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Προεπιλ. ορθογραφικός έλεγχος"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Επιλογή ορθογραφικού ελέγχου"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Χρήση ορθογραφικού ελέγχου"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Χρήση ορθογραφικού ελέγχου"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Δεν έχει επιλεγεί"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(κανένας)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Η Διαχείριση αποθηκευτικού χώρου βοηθά στην απελευθέρωση αποθηκευτικού χώρου καταργώντας από τη συσκευή σας φωτογραφίες και βίντεο για τα οποία έχουν δημιουργηθεί αντίγραφα ασφαλείας."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Κατάργηση φωτογραφιών και βίντεο"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Διαχείριση αποθηκευτικού χώρου"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Χρήση Διαχείρισης αποθηκευτικού χώρου"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Χρήση Διαχειριστή αποθηκευτικού χώρου."</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Αυτόματο"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Εγχειρίδιο χρήσης"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Απελευθερώστε χώρο τώρα"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Πατήστε δύο φορές για να ελέγξετε το τηλέφωνο"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Πατήστε δύο φορές για να ελέγξετε το tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Πατήστε δύο φορές για να ελέγξετε τη συσκευή"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Σύρετε για ειδοποιήσεις"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Σύρετε προς τα κάτω στο κάτω μέρος της οθόνης για εμφάνιση των ειδοποιήσεών σας."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Λειτουργία ενός χεριού"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Χρήση λειτουργίας ενός χεριού"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Έξοδος κατά την εναλλαγή εφαρμογών"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Χρονικό όριο"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 δευτερόλεπτα"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 δευτερόλεπτα"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 δευτερόλεπτα"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"εύκολη πρόσβαση"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Για να ελέγξετε την ώρα, τις ειδοποιήσεις και άλλες πληροφορίες, πατήστε δύο φορές στην οθόνη."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Σηκώστε το για να δείτε"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Σηκώστε το tablet για να το ελέγξετε"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Πατήστε για έλεγχο του tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Πατήστε για έλεγχο της συσκευής"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Πατήστε την οθόνη για να ελέγξετε την ώρα, τις ειδοποιήσεις και άλλες πληροφορίες."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS έκτακτης ανάγκης"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Χρήση SOS έκτακτης ανάγκης"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Διαχείριση από <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Ξεκινήστε τις ενέργειες παρακάτω πατώντας γρήγορα το κουμπί λειτουργίας 5 φορές ή περισσότερες."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Αναπαραγωγή ειδοποίησης αντίστροφης μέτρησης"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Αναπαραγωγή ενός δυνατού ήχου πριν από την αποστολή ειδοποίησης για βοήθεια"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Κλήση σε βοήθεια"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Αριθμός που μπορείτε να καλέσετε για βοήθεια"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Πατήστε για αλλαγή."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Εάν εισαγάγετε έναν αριθμό μη έκτακτης ανάγκης:\n • Η συσκευή σας θα πρέπει να ξεκλειδωθεί για τη χρήση ενός SOS έκτακτης ανάγκης.\n • Η κλήση σας μπορεί να μην έχει απαντηθεί."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Σύρετε στον αισθητήρα δακτυλικών αποτυπωμάτων για ειδοποιήσεις"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Ολίσθηση δακτυλ. αποτυπ."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Για να ελέγξετε τις ειδοποιήσεις σας, σύρετε προς τα κάτω στον αισθητήρα δακτυλικών αποτυπωμάτων στο πίσω μέρος του τηλεφώνου."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Μέγιστα ορατά σύνολα δεδομένων"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Επαναφορά στις προεπιλεγμένες τιμές"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Έγινε επαναφορά των επιλογών προγραμματιστή αυτόματης συμπλήρωσης"</string>
+    <string name="location_category" msgid="3496759112306219062">"Τοποθεσία"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Ένδειξη τοποθεσίας στη γραμμή κατάστασης"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Εμφάνιση για όλες τις τοποθεσίες, συμπεριλαμβανομένου του δικτύου και της συνδεσιμότητας"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Αναγκαστικές πλήρεις μετρήσεις GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Παρακολούθηση όλων των πανοραμικών συνθέσεων και των συχνοτήτων GNSS χωρίς κύκλο λειτουργιών"</string>
     <string name="device_theme" msgid="5027604586494772471">"Θέμα συσκευής"</string>
     <string name="default_theme" msgid="4815428567082263639">"Προεπιλογή"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Όνομα δικτύου"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Θέστε σε παύση τις ειδοποιήσεις για να παραμένετε συγκεντρωμένοι"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Η λειτουργία δεν είναι διαθέσιμη"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Αυτή η λειτουργία απενεργοποιήθηκε επειδή καθυστερεί το τηλέφωνό σας"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Αναγκαστικές πλήρεις μετρήσεις GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Παρακολούθηση όλων των πανοραμικών συνθέσεων και των συχνοτήτων GNSS χωρίς κύκλο λειτουργιών"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Να εμφανίζεται πάντα το παράθυρο διαλόγου σφάλματος"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Να εμφανίζεται το παράθυρο διαλόγου κάθε φορά που παρουσιάζεται σφάλμα σε κάποια εφαρμογή"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Επιλογή εφαρμογής με δυνατότητα χρήσης ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ενεργοποίηση για όλες τις εφαρμογές"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Επιλογή προγράμματος οδήγησης γραφικών"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Προεπιλογή"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Πρόγραμμα οδήγησης παιχνιδιών"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Πρόγραμμα οδήγησης παιχνιδιών"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Πρόγραμμα οδήγησης γραφικών συστήματος"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Ενεργή (σίγαση)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Ανενεργή"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Λεπτομέρειες δικτύου"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Το όνομα της συσκευής σας είναι ορατό σε εφαρμογές στο τηλέφωνό σας. Ενδέχεται επίσης να είναι ορατό και σε άλλα άτομα, όταν συνδέεστε σε συσκευές Bluetooth ή ρυθμίζετε ένα σημείο πρόσβασης Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Το όνομα της συσκευής σας είναι ορατό σε εφαρμογές στο τηλέφωνό σας. Ενδέχεται επίσης να είναι ορατό και σε άλλα άτομα, όταν συνδέεστε σε συσκευές Bluetooth, συνδέεστε σε ένα δίκτυο Wi-Fi ή ρυθμίζετε ένα σημείο πρόσβασης Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Συσκευές"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Όλες οι ρυθμίσεις"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Προτάσεις"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Δεν ήταν δυνατή η εύρεση δικτύων. Δοκιμάστε ξανά."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(απαγορευμένο)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Δεν υπάρχει κάρτα SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Δεν υπάρχει SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Δεν υπάρχει"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Απαιτείται SIM για σύνδεση"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Απαιτείται SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> για σύνδεση"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Προτιμώμενη λειτουργία δικτύου: προτιμώμενο WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Προτιμώμενη λειτουργία δικτύου: μόνο GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Προτιμώμενη λειτουργία δικτύου: μόνο WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Δεδομένα κινητής τηλεφωνίας"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Πρόσβαση σε δεδομένα μέσω δικτύου κινητής τηλεφωνίας"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Το τηλέφωνο θα κάνει αυτόματα εναλλαγή σε αυτήν την εταιρεία κινητής τηλεφωνίας όταν βρίσκεται εντός εμβέλειας"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Δεν υπάρχει διαθέσιμη κάρτα SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Προτίμηση κλήσεων"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Προτίμηση SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ερώτηση κάθε φορά"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Δεν διατίθεται κατά τη σύνδεση σε <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Δείτε περισσότερα"</string>
     <string name="see_less" msgid="2642392725363552793">"Εμφάνιση λιγότερων"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Ενεργοποίηση <xliff:g id="CARRIER_NAME">%1$s</xliff:g>;"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Ενεργοποίηση κάρτας SIM;"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Εναλλαγή σε <xliff:g id="CARRIER_NAME">%1$s</xliff:g>;"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Εναλλαγή στη χρήση κάρτας SIM;"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Μόνο μία SIM μπορεί να είναι ενεργή κάθε φορά.\n\nΗ εναλλαγή στο δίκτυο <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> δεν θα ακυρώσει την υπηρεσία <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Μόνο μία ληφθείσα SIM μπορεί να είναι ενεργή κάθε φορά.\n\nΗ εναλλαγή στο δίκτυο <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> δεν θα ακυρώσει την υπηρεσία <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Μόνο μία SIM μπορεί να είναι ενεργή κάθε φορά.\n\nΗ εναλλαγή δεν θα ακυρώσει την υπηρεσία <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Εναλλαγή σε <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Σύνδεση στο δίκτυο…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Εναλλαγή σε <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Δεν είναι δυνατή η εναλλαγή εταιρείας κινητής τηλεφωνίας"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Δεν είναι δυνατή η εναλλαγή εταιρείας κινητής τηλεφωνίας λόγω ενός σφάλματος."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Απενεργοποίηση <xliff:g id="CARRIER_NAME">%1$s</xliff:g>;"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Απενεργοποίηση SIM;"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Απενεργοποίηση SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Δεν είναι δυνατή η απενεργοποίηση της εταιρείας κινητής τηλεφωνίας"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Παρουσιάστηκε κάποιο πρόβλημα και δεν ήταν δυνατή η απενεργοποίηση της εταιρείας κινητής τηλεφωνίας σας."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Χρήση 2 SIM;"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Αυτή η συσκευή μπορεί να έχει 2 ενεργές SIM ταυτόχρονα. Για να συνεχίσετε χρησιμοποιώντας 1 SIM τη φορά, πατήστε Όχι, ευχαριστώ."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Επανεκκίνηση συσκευής;"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Για να ξεκινήσετε, επανεκκινήστε τη συσκευή σας. Στη συνέχεια, μπορείτε να προσθέσετε μια άλλη SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Συνέχεια"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Επανεκκίνηση"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Όχι, ευχαριστώ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Εναλλαγή"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Δεν είναι δυνατή η ενεργοποίηση της SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Αφαιρέστε τη SIM και τοποθετήστε τη ξανά. Εάν το πρόβλημα δεν επιλυθεί, επανεκκινήστε τη συσκευή σας."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Δοκιμάστε να ενεργοποιήσετε ξανά τη SIM. Εάν το πρόβλημα δεν επιλυθεί, επανεκκινήστε τη συσκευή σας."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ενεργοποίηση δικτύου"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Η εταιρεία κινητής τηλεφωνίας <xliff:g id="CARRIER_NAME">%1$s</xliff:g> είναι ενεργή"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Πατήστε για ενημέρωση των ρυθμίσεων SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Κάρτα SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Διαγραφή αυτής της SIM της οποίας έγινε λήψη;"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Η διαγραφή αυτής της SIM καταργεί την υπηρεσία <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> από αυτήν τη συσκευή.\n\nΗ υπηρεσία για <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> δεν θα ακυρωθεί."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Διαγραφή"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Διαγραφή SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Δεν είναι δυνατή η διαγραφή της SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Δεν είναι δυνατή η διαγραφή της SIM λόγω ενός σφάλματος .\n\nΕπανεκκινήστε τη συσκευή σας και δοκιμάστε ξανά."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Σύνδεση με τη συσκευή"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Η εφαρμογή <xliff:g id="APPNAME">%1$s</xliff:g> θέλει να χρησιμοποιήσει ένα προσωρινό δίκτυο Wi‑Fi για να συνδεθεί στη συσκευή σας."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Δεν βρέθηκαν συσκευές. Βεβαιωθείτε ότι οι συσκευές είναι ενεργοποιημένες και διαθέσιμες για σύνδεση."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Κλήσεις έκτακτης ανάγκης"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Οι κλήσεις έκτακτης ανάγκης μέσω Κλήσης Wi‑Fi δεν υποστηρίζονται από την εταιρεία κινητής τηλεφωνίας σας.\nΗ συσκευή αλλάζει αυτόματα σε δίκτυο κινητής τηλεφωνίας για την πραγματοποίηση μιας κλήσης έκτακτης ανάγκης.\nΗ πραγματοποίηση κλήσεων έκτακτης ανάγκης είναι δυνατή μόνο σε περιοχές με κάλυψη δικτύου κινητής τηλεφωνίας."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Χρήση Wi‑Fi για κλήσεις για βελτίωση της ποιότητας"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Κλήση με πολλές SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Να επιτρέπονται κλήσεις και αποστολή SMS με άλλες SIM μέσω αυτής της SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"κλήση με πολλές SIM"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Εισερχόμενο μήνυμα MMS"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Αδυναμία αποστολής μηνύματος MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Πατήστε για να επιτρέψετε τα μηνύματα MMS στο <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> όταν τα δεδομένα κιν. τηλεφ. είναι απενεργοποιημένα"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Να επιτρέπονται οι επικαλ. οθόνης στις Ρυθμίσεις"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Να επιτρέπονται εφαρμογές που μπορούν να εμφανίζονται πάνω από άλλες εφαρμογές για επικάλυψη των οθονών ρυθμίσεων"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Μέσα"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Απόκρ. προγρ. αναπαραγωγής μετά τη λήξη των μέσων"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Το πρόγραμμα αναπαραγωγής σάς επιτρέπει να συνεχίσετε μια περίοδο λειτουργίας από το εκτεταμένο πλαίσιο Γρήγορων ρυθμίσεων."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Πρόγραμμα αναπαραγωγής μέσων στις Γρήγορες ρυθμίσεις"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Εμφάνιση του προγράμματος αναπαραγωγής μέσων για μεγαλύτερο χρονικό διάστημα για εύκολη συνέχιση της αναπαραγωγής."</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Απόκρυψη προγράμματος αναπαραγωγής"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Εμφάνιση προγράμματος αναπαραγωγής"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Δεν υπάρχουν διαθέσιμα προγράμματα αναπαραγωγής"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Επιτρεπόμενες εφαρμογές"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"μέσα"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Το Bluetooth θα ενεργοποιηθεί."</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Ενεργή"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Ανενεργή"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Διαδίκτυο"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Κάρτες SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Ασφαλή δίκτυα πτήσης"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Βρείτε και συνδεθείτε σε ασφαλή δίκτυα πτήσης"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"πτήση, ασφαλή για την πτήση"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Κλήσεις και SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Κλήση Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Πραγματοποίηση και λήψη κλήσεων μέσω δικτύων που δεν ανήκουν στην εταιρεία κινητής τηλεφωνίας, όπως Wi‑Fi."</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Με τη λειτουργία Κλήση Wi-Fi μπορείτε να πραγματοποιείτε και να λαμβάνετε κλήσεις μέσω δικτύων που δεν ανήκουν στην εταιρεία κινητής τηλεφωνίας, όπως ορισμένα δίκτυα Wi-Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Κλήσεις"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"προτιμώνται"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"προτιμώνται οι κλήσεις"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"προτιμώνται τα SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"μη διαθέσιμη"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Δεν υπάρχει SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Προτιμήσεις"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Σύνδεση σε δημόσια δίκτυα"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"σύνδεση δικτύου, διαδίκτυο, ασύρματο, δεδομένα, wifi, wi-fi, wi fi, δίκτυο κινητής τηλεφωνίας, κινητό, εταιρεία κινητής τηλεφωνίας, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Προβολή ασφαλών δικτύων για πτήση"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Απενεργοποίηση λειτουργίας πτήσης"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Μη διαθέσιμη επιλογή επειδή η λειτουργία ώρας ύπνου είναι ενεργή."</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Η επαναφορά σημασίας ειδοποίησης ολοκληρώθηκε."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Εφαρμογές"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Μια μη αξιόπιστη συσκευή θέλει να αποκτήσει πρόσβαση στα μηνύματά σας. Πατήστε για λεπτομέρειες."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Να επιτρέπεται η πρόσβαση σε μηνύματα;"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Μια μη αξιόπιστη συσκευή Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], θέλει να αποκτήσει πρόσβαση στα μηνύματά σας.\n\nΔεν έχετε συνδεθεί στη συσκευή [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] στο παρελθόν."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Μια μη αξιόπιστη συσκευή θέλει να αποκτήσει πρόσβαση στις επαφές και το αρχείο καταγραφής κλήσεων. Πατήστε για λεπτομέρειες."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Να επιτρέπεται η πρόσβαση στις επαφές και στο αρχείο καταγραφής κλήσεων;"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Μια μη αξιόπιστη συσκευή Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], θέλει να αποκτήσει πρόσβαση στις επαφές και το αρχείο καταγραφής κλήσεων. Αυτό περιλαμβάνει δεδομένα σχετικά με τις εισερχόμενες και τις εξερχόμενες κλήσεις.\n\nΔεν έχετε συνδεθεί στη συσκευή [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] στο παρελθόν."</string>
 </resources>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index ec8510a..ef08f35 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medium"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Short"</item>
+    <item msgid="7397961711906421599">"Medium"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 429df1f..3393b17 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Date and time"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Set date and time"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Set date, time, time zone, &amp; formats"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Use network-provided time"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Use network-provided time zone"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Set time automatically"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Set time zone automatically"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑hour format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Show profile info on lock screen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Accounts"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Location"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Use location"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Use location"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">On – <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Screen lock, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Screen lock, fingerprint"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Screen lock"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Unlock your phone securely with your face and fingerprint"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"You can also sign in to apps and confirm payments"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Set up unlock with:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Make unlocking your phone a breeze"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingerprint"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Save time unlocking phone in your pocket"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Skip"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Next"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Face added"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Set up face unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Use your face to authenticate"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Go back"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continue setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"When using face unlock in apps, always require confirmation step"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Delete face data"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Set up face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Use face unlock to unlock your device, sign in to apps and confirm payments."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Bear in mind that:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, for example an identical sibling."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Bear in mind that:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, for example an identical sibling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Delete face data?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"The face data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern or password to unlock your phone, sign in to apps and confirm payments."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Use face unlock to unlock your phone"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, thanks"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continue"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Next"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Skip PIN setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Skip password setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Skip pattern setup?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Choose your backup screen lock method"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Choose your backup screen lock method"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Choose your backup screen lock method"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Screen lock options"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Screen lock options"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Screen lock"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face unlock + password"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continue without face unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrics + Pattern"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrics + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrics + Password"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continue without biometrics"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"You can unlock your phone using your biometrics. For security, this option requires a backup screen lock."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disabled by admin, encryption policy or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipe"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Must be fewer than <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Device admin doesn\'t allow using a recent PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Common PINs are blocked by your IT admin. Try a different PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"This can\'t include an invalid character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Must contain at least one letter"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Must contain at least one digit"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Must contain at least 1 non-numeric character</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Device admin doesn\'t allow using a recent password"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Common passwords are blocked by your IT admin. Try a different password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirm"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancel"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Turn on Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Use Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Use Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi settings"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Set up &amp; manage wireless access points"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centre the QR code below to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Join Wi‑Fi by scanning a QR code"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Share Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\' and share the password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan this QR code with another device to join \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Try again. If the issue continues, contact the device manufacturer"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Something went wrong"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Auto‑connect"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Allow phone to automatically connect near this network"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Allow tablet to automatically connect near this network"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Allow connection to this network when in range"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Add device"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use a QR code to add a device to this network"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR code isn\'t a valid format"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Use system certificates"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Do not validate"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No certificate specified. Your connection will not be private."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Must specify a domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificate required."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connect"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi turned on"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connecting…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Failed to connect to network"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Network not in range"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Device MAC address"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomised MAC address"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Randomised MAC address (last used)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP address"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Network details"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 addresses"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Saved networks"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Subscriptions"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Other networks"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP settings"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Wi‑Fi advanced settings are not available for this user"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Save"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Please type a valid gateway address."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Type a valid DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Type a network prefix length between 0 and 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (unless overridden by private DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (unless overridden by private DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Network prefix length"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No password set"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot name"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP band"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Force 90 Hz refresh rate"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Highest refresh rate for improved touch responsiveness and animation quality. Increases battery usage."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Screen attention"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"When screen is dark, it turns on for new notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Always show time and info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Increased battery usage"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Bold text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Font size"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM card lock settings"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android security update"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Equipment ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Delete APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"New APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Save"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Discard"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Cancel"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"The Name field can\'t be empty."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"The APN cannot be empty."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Apps can be reset"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Reset wi-fi, mobile and Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Erase"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Erase downloaded SIMs"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"To download replacement SIMs, contact your carrier. This won\'t cancel any mobile service plans."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"This won’t cancel any mobile service plans. To download replacement SIMs, contact your operator."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Reset settings"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Reset all network settings? You can\'t undo this action."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Reset all network settings and erase downloaded SIMs? You can\'t undo this action."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Network settings have been reset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Can’t delete SIMs"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloaded SIMs can’t be deleted due to an error.\n\nRestart your device and try again."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Delete all data (factory reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Delete all data (factory reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"You are currently signed in to the following accounts:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"There are other users present on this device.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"This will not cancel your mobile service plan."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Erase all data (factory reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Erase all data (factory reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"There are other users present on this device.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"This will not cancel your mobile service plan."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Erase USB storage"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Erase all the data on the SD card, such as music or photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"All of your personal information and downloaded apps will be deleted. You can\'t undo this action."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can\'t undo this action."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Erase everything"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No reset was performed because the System Clear service isn\'t available."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Erase all data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Factory reset is not available for this user"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Erasing"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Please wait..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Erase all data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Factory reset is not available for this user"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Erasing"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Please wait…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Call settings"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB tethering"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Share phone’s Internet connection via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Share phone’s Internet connection via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use hotspot and tethering to provide Internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Help"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Allows the device’s location to be used to detect the current time zone. Other location settings such as Wi‑Fi scanning can affect the accuracy of time zone detection."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"On"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Off"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatic time zone detection is disabled"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Location time zone detection is disabled"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Location time zone detection is not supported"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Location time zone detection changes are not allowed"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Location determined by Wi‑Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"To use face unlock, set password"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"To use face unlock, set pattern"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"To use face unlock, set PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"To use biometrics, set password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"To use biometrics, set pattern"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"To use biometrics, set PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Forgot your password?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Forgot your pattern?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Forgotten your PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Choose the magnification area(s) that you want to use when magnifying the screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Full screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Part of screen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Full screen &amp; part of screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Magnify entire screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Magnify part of screen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Switch to accessibility button?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.\n\nDo you want to switch to using accessibility button to magnify?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Switch to accessibility button"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Keep triple tap to magnify"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Magnify with triple-tap"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Magnify with shortcut"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Power button ends call"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Large mouse cursor"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remove animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combine channels when playing audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Left"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Right"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combine channels when playing audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Left"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Right"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 seconds"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 seconds"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Notification vibration"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ring vibration"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Touch feedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Use colour correction"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Show captions"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"For supported app only"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Use colour correction"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Show captions"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"For supported app only"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Caption size and style"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> text size"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"More options"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Background restriction"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Allow the app to run in the background"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App not allowed to run in background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Background usage can’t be restricted"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Background usage can’t be restricted"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limit background activity?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet used more than usual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Device used more than usual"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Battery may run out earlier than usual"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimising for battery health"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Battery limited temporarily. Tap to learn more."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d app restricted</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problem reading your battery meter"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problem reading your battery meter. Tap to "<annotation id="url">"learn more"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Stop app?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Set a schedule"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Extend battery life"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Turn off when charged"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Battery Saver turns off when your phone is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Battery Saver turns off when your tablet is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Battery Saver turns off when your device is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Battery Saver turns off when your phone charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Battery Saver turns off when your tablet charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Battery Saver turns off when your device charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Turn on"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"Play"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive connectivity"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extends battery life and improves device performance by automatically managing your network connections"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Credential storage"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Install a certificate"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Install certificates from storage"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Don’t install"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Install anyway"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificate not installed"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Allow <xliff:g id="APP_NAME">%s</xliff:g> to install certificates on this device?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"These certificates will identify you to the apps and URLs below"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Don\'t allow"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Allow"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Show more"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Certificate management app"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"None"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certificates installed by this app identify you to the apps and URLs below"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Remove"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Emergency dialling signal"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Set behaviour when an emergency call is placed"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Backup"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Not set up – Work profile"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nickname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"You can add up to <xliff:g id="USER_COUNT">%1$d</xliff:g> users"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Only the tablet\'s owner can manage users."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Only the phone\'s owner can manage users."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paying at the terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Got it"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"More..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"More…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Set default payment app"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Update default payment app"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"At a contactless terminal, pay with <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Back"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Next"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finish"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Take a photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Choose an image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Select photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM cards"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM cards"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Always use this for calls"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Select a SIM for data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Select a SIM for SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Switching data SIM, this may take up to a minute..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Switching data SIM, this may take up to a minute…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Call with"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Select a SIM card"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, advanced calling, 4G calling"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"add language, add a language"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"text size"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default sound"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ring and notification volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Do Not Disturb"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Power on sounds"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatically caption media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"None"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
-      <item quantity="one">1 schedule set</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priority only"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ask every time"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Until you turn off"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
-      <item quantity="one">1 hour</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="one">1 schedule can turn on automatically</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hour}other{# hours}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 schedule can turn on automatically}other{Off/# schedules can turn on automatically}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"What can interrupt Do Not Disturb"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatically set lower priority notifications to Gentle"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptive notification ranking"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reset notification importance"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset user-changed importance settings and allow notification assistant to prioritise"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Priority conversations"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Show at top of conversation section and appear as floating bubbles"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Show at top of conversation section"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Other conversations"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Non-priority conversations"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations to which you’ve made changes"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Recent conversations"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Clear recents"</string>
+    <string name="clear" msgid="5092178335409471100">"Clear"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Bubble priority conversations"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Priority and modified conversations will appear here"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Do Not Disturb access"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Allow Do Not Disturb"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"No installed apps have requested Do Not Disturb access"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Loading apps..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Loading apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"All conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="one">1 conversation</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"None"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Calls"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"To make sure that allowed calls make a sound, check that the device is set to ring"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">1 other</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"None"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} and {contact_2}}=3{{contact_1}, {contact_2} and {contact_3}}other{{contact_1}, {contact_2} and # others}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(No name)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"All messages can reach you"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"All calls can reach you"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"None"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="one">1 contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{None}=1{1 contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Starred contacts"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Some notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Selected people can still reach you, even if you don’t allow apps to interrupt"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} can interrupt}=2{{app_1} and {app_2} can interrupt}=3{{app_1}, {app_2} and {app_3} can interrupt}other{{app_1}, {app_2} and # more can interrupt}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Some notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications that can interrupt"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Allow all notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nothing can interrupt"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} can interrupt}=2{{sound_category_1} and {sound_category_2} can interrupt}=3{{sound_category_1}, {sound_category_2} and {sound_category_3} can interrupt}other{{sound_category_1}, {sound_category_2} and # more can interrupt}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"On"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Off"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"App pinning"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. \n\nWhen an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. \n\nWhen an app is pinned, the pinned app may open other apps, and personal data may be accessible. \n\nIf you want to share your device securely with someone, try using a guest user instead. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap \'Pin\'"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nIf you want to securely share your device with someone, try using a guest user instead. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"When app is pinned: \n\n• Personal data may be accessible \n(such as contacts and email content) \n• Pinned app may open other apps \n\nOnly use app pinning with people that you trust."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Ask for unlock pattern before unpinning"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Ask for PIN before unpinning"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"In addition to using your face to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"In addition to using your face to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"In addition to using your face to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restricted"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Connected device"</string>
     <string name="usb_control_device" msgid="527916783743021577">"This device"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Switching…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Switching…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Couldn\'t switch"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Charging this device"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Charging connected device"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobile data usage"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"App data usage"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi‑Fi data usage"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Non-operator data usage"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet data usage"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data accounting may differ from device accounting"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"View details"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Unrestricted data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Background data is turned off"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Background data is turned off"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"On"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Use Data Saver"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"If device is locked, prevent typing replies or other text in notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Default spell checker"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Choose spell checker"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Use spell checker"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Use spellchecker"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Not selected"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(none)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Remove photos and videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Use storage manager"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Free up space now"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Double-tap to check phone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Double-tap to check tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Double-tap to check device"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swipe for notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swipe down on the bottom edge of the screen to show your notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"One-handed mode"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Use one-handed mode"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Exit when switching apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 seconds"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 seconds"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 seconds"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"reachability"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"To check time, notifications and other info, double-tap your screen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Lift to check tablet"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergency SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Use emergency SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Start the actions below by pressing the power button quickly five times or more"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Play countdown alarm"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Play a loud sound before notifying for help"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Call for help"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Number to call for help"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Tap to change"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"If you enter a non-emergency number:\n • Your device must be unlocked to use emergency SOS\n • Your call may not be answered"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Max visible datasets"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Reset to default values"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Auto-fill developer options have been reset"</string>
+    <string name="location_category" msgid="3496759112306219062">"Location"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Status bar location indicator"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Show for all locations, including network and connectivity"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Force full GNSS measurements"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="device_theme" msgid="5027604586494772471">"Device theme"</string>
     <string name="default_theme" msgid="4815428567082263639">"Default"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Network name"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pause notifications to stay focused"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Feature not available"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"This feature has been turned off because it slows down your phone"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Force full GNSS measurements"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Always show crash dialogue"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Show dialogue every time an app crashes"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Select ANGLE enabled app"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"On (mute)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Off"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Network details"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="649715719278562515">"Devices"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"All Settings"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Suggestions"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Couldn’t find networks. Try again."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbidden)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No SIM card"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"None"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Requires SIM to connect"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Requires <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM to connect"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferred network mode: WCDMA preferred"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferred network mode: GSM only"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferred network mode: WCDMA only"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"See more"</string>
     <string name="see_less" msgid="2642392725363552793">"See less"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Turn on <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Turn on SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Switch to using SIM card?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Only one SIM can be active at a time.\n\nSwitching won’t cancel your <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connecting to network…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Switching to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Can’t switch operator"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"The operator can’t be switched because of an error."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Can’t disable operator"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Use two SIMs?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"This device can have two SIMs active at once. To continue using one SIM at a time, tap \'No thanks\'."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Restart device?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"To get started, restart your device. Then you can add another SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continue"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM card"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Erase this downloaded SIM?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Erasing this SIM removes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> won\'t be cancelled."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Erase"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Erasing SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Can\'t erase SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"This SIM can\'t be erased due to an error.\n\nRestart your device and try again."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connect to device"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> app wants to use a temporary Wi‑Fi network to connect to your device"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No devices found. Make sure that devices are turned on and available to connect."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Emergency calls"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Emergency calls over Wi‑Fi Calling are not supported by your operator.\nThe device switches automatically to a mobile network to place an emergency call.\nEmergency calls are only possible in areas with mobile coverage."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Use Wi‑Fi for calls to improve quality"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Cross-SIM calling"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Allow other SIM calls and SMSs over this SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"cross-SIM calling"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Incoming MMS message"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Can’t send MMS message"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tap to allow MMS messaging on <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> when mobile data is off"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Hide player when the media session has ended"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"The player allows you to resume a session from the expanded Quick Settings panel."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media Player in Quick Settings"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Show media player for an extended period to easily resume playback"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Hide player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Show player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No players available"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Allowed apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"On"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Aeroplane-safe networks"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Find and connect to aeroplane‑safe networks"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Make and receive calls over non‑operator networks, like Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi calling allows you to make and receive calls over non‑operator networks, such as some Wi‑Fi networks."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferred"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"calls preferred"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS preferred"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"View aeroplane-safe networks"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Turn off aeroplane mode"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Unavailable because bedtime mode is on"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Reset notification importance completed."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Untrusted device wants to access your messages. Tap for details."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Allow access to messages?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your messages.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Untrusted device wants to access your contacts and call log. Tap for details."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Allow access to contacts and call log?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
 </resources>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 47c9e00..ebf9c10 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medium"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Short"</item>
+    <item msgid="7397961711906421599">"Medium"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index bae56ac..8f1ea0a 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Date and time"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Set date and time"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Set date, time, time zone, &amp; formats"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Use network-provided time"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Use network-provided time zone"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Set time automatically"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Set time zone automatically"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑hour format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Show profile info on lock screen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Accounts"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Location"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Use location"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Use location"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">On – <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Screen lock, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Screen lock, fingerprint"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Screen lock"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Unlock your phone securely with your face and fingerprint"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"You can also sign in to apps and confirm payments"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Set up unlock with:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Make unlocking your phone a breeze"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingerprint"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Save time unlocking phone in your pocket"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Skip"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Next"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Face added"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Set up face unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Use your face to authenticate"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Go back"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continue setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"When using face unlock in apps, always require confirmation step"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Delete face data"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Set up face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Use face unlock to unlock your device, sign in to apps and confirm payments."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Bear in mind that:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, for example an identical sibling."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Bear in mind that:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, for example an identical sibling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Delete face data?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"The face data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern or password to unlock your phone, sign in to apps and confirm payments."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Use face unlock to unlock your phone"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, thanks"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continue"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Next"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Skip PIN setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Skip password setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Skip pattern setup?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Choose your backup screen lock method"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Choose your backup screen lock method"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Choose your backup screen lock method"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Screen lock options"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Screen lock options"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Screen lock"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face unlock + password"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continue without face unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrics + Pattern"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrics + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrics + Password"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continue without biometrics"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"You can unlock your phone using your biometrics. For security, this option requires a backup screen lock."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disabled by admin, encryption policy or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipe"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Must be fewer than <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Device admin doesn\'t allow using a recent PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Common PINs are blocked by your IT admin. Try a different PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"This can\'t include an invalid character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Must contain at least one letter"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Must contain at least one digit"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Must contain at least 1 non-numeric character</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Device admin doesn\'t allow using a recent password"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Common passwords are blocked by your IT admin. Try a different password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirm"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancel"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Turn on Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Use Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Use Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi settings"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Set up &amp; manage wireless access points"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centre the QR code below to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Join Wi‑Fi by scanning a QR code"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Share Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan this QR code to connect to \"<xliff:g id="SSID">%1$s</xliff:g>\" and share the password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan this QR code with another device to join \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan this QR code to connect to \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Try again. If the issue continues, contact the device manufacturer"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Something went wrong"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Auto‑connect"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Allow phone to automatically connect near this network"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Allow tablet to automatically connect near this network"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Allow connection to this network when in range"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Add device"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use a QR code to add a device to this network"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR code isn\'t a valid format"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Use system certificates"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Do not validate"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No certificate specified. Your connection will not be private."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Must specify a domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificate required."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connect"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi turned on"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connecting…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Failed to connect to network"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Network not in range"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Device MAC address"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomised MAC address"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Randomised MAC address (last used)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP address"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Network details"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 addresses"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Saved networks"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Subscriptions"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Other networks"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP settings"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Wi‑Fi advanced settings are not available for this user"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Save"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Please type a valid gateway address."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Type a valid DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Type a network prefix length between 0 and 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (unless overridden by private DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (unless overridden by private DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Network prefix length"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No password set"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot name"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP band"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Force 90 Hz refresh rate"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Highest refresh rate for improved touch responsiveness and animation quality. Increases battery usage."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Screen attention"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"When screen is dark, it turns on for new notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Always show time and info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Increased battery usage"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Bold text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Font size"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM card lock settings"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android security update"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Equipment ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Delete APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"New APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Save"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Discard"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Cancel"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"The Name field can\'t be empty."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"The APN cannot be empty."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Apps can be reset"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Reset Wi-Fi, mobile and Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Erase"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Erase downloaded SIMs"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"To download replacement SIMs, contact your carrier. This won\'t cancel any mobile service plans."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"This won’t cancel any mobile service plans. To download replacement SIMs, contact your operator."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Reset settings"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Reset all network settings? You can\'t undo this action."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Reset all network settings and erase downloaded SIMs? You can\'t undo this action."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Network settings have been reset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Can’t delete SIMs"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloaded SIMs can’t be deleted due to an error.\n\nRestart your device and try again."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Erase all data (factory reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Erase all data (factory reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"This will erase all data from your phone\'s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"You are currently signed in to the following accounts:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"There are other users present on this device.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"This will not cancel your mobile service plan."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Erase all data (factory reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Erase all data (factory reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"There are other users present on this device.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"This will not cancel your mobile service plan."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Erase USB storage"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Erase all the data on the SD card, such as music or photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"All of your personal information and downloaded apps will be deleted. You can\'t undo this action."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"All of your personal information, including downloaded apps and SIMs, will be deleted. You can\'t undo this action."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Erase everything"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No reset was performed because the System Clear service isn\'t available."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Erase all data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Factory reset is not available for this user"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Erasing"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Please wait..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Erase all data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Factory reset is not available for this user"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Erasing"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Please wait…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Call settings"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB tethering"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Share phone’s Internet connection via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Share phone’s Internet connection via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use hotspot and tethering to provide Internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Help"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Allows the device’s location to be used to detect the current time zone. Other location settings such as Wi‑Fi scanning can affect the accuracy of time zone detection."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"On"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Off"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatic time zone detection is disabled"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Location time zone detection is disabled"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Location time zone detection is not supported"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Location time zone detection changes are not allowed"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Location determined by Wi‑Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"To use face unlock, set password"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"To use face unlock, set pattern"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"To use face unlock, set PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"To use biometrics, set password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"To use biometrics, set pattern"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"To use biometrics, set PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Forgot your password?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Forgot your pattern?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Forgotten your PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Choose the magnification area(s) that you want to use when magnifying the screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Full screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Part of screen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Full screen &amp; part of screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Magnify entire screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Magnify part of screen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Switch to accessibility button?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.\n\nDo you want to switch to using accessibility button to magnify?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Switch to accessibility button"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Keep triple tap to magnify"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Magnify with triple-tap"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Magnify with shortcut"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Power button ends call"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Large mouse cursor"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remove animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combine channels when playing audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Left"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Right"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combine channels when playing audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Left"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Right"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 seconds"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 seconds"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Notification vibration"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ring vibration"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Touch feedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Use colour correction"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Show captions"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"For supported app only"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Use colour correction"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Show captions"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"For supported app only"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Caption size and style"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> text size"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"More options"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Background restriction"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Allow the app to run in the background"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App not allowed to run in background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Background usage can’t be restricted"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Background usage can’t be restricted"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limit background activity?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimize battery, you can\'t restrict it.\n\nTo restrict the app, first turn on battery optimization."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet used more than usual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Device used more than usual"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Battery may run out earlier than usual"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimising for battery health"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Battery limited temporarily. Tap to learn more."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d app restricted</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problem reading your battery meter"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problem reading your battery meter. Tap to "<annotation id="url">"learn more"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Stop app?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Set a schedule"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Extend battery life"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Turn off when charged"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Battery Saver turns off when your phone is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Battery Saver turns off when your tablet is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Battery Saver turns off when your device is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Battery Saver turns off when your phone charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Battery Saver turns off when your tablet charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Battery Saver turns off when your device charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Turn on"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"Play"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive connectivity"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extends battery life and improves device performance by automatically managing your network connections"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Credential storage"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Install a certificate"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Install certificates from storage"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Don’t install"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Install anyway"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificate not installed"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Allow <xliff:g id="APP_NAME">%s</xliff:g> to install certificates on this device?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"These certificates will identify you to the apps and URLs below"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Don\'t allow"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Allow"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Show more"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Certificate management app"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"None"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certificates installed by this app identify you to the apps and URLs below"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Remove"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Emergency dialling signal"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Set behaviour when an emergency call is placed"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Backup"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Not set up – Work profile"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nickname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"You can add up to <xliff:g id="USER_COUNT">%1$d</xliff:g> users"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Only the tablet\'s owner can manage users."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Only the phone\'s owner can manage users."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paying at the terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Got it"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"More..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"More…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Set default payment app"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Update default payment app"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"At a contactless terminal, pay with <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Back"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Next"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finish"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Take a photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Choose an image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Select photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM cards"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM cards"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Always use this for calls"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Select a SIM for data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Select a SIM for SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Switching data SIM, this may take up to a minute..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Switching data SIM, this may take up to a minute…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Call with"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Select a SIM card"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, advanced calling, 4G calling"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"add language, add a language"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"text size"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default sound"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ring and notification volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Do Not Disturb"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Power on sounds"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatically caption media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"None"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
-      <item quantity="one">1 schedule set</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priority only"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ask every time"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Until you turn off"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
-      <item quantity="one">1 hour</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="one">1 schedule can turn on automatically</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hour}other{# hours}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 schedule can turn on automatically}other{Off/# schedules can turn on automatically}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"What can interrupt Do Not Disturb"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatically set lower priority notifications to Gentle"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptive notification ranking"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reset notification importance"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset user-changed importance settings and allow notification assistant to prioritise"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Priority conversations"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Show at top of conversation section and appear as floating bubbles"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Show at top of conversation section"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Other conversations"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Non-priority conversations"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations to which you’ve made changes"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Recent conversations"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Clear recents"</string>
+    <string name="clear" msgid="5092178335409471100">"Clear"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Bubble priority conversations"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Priority and modified conversations will appear here"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Do Not Disturb access"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Allow Do Not Disturb"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"No installed apps have requested Do Not Disturb access"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Loading apps..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Loading apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"All conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="one">1 conversation</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"None"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Calls"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"To make sure that allowed calls make a sound, check that the device is set to ring"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">1 other</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"None"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} and {contact_2}}=3{{contact_1}, {contact_2} and {contact_3}}other{{contact_1}, {contact_2} and # others}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(No name)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"All messages can reach you"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"All calls can reach you"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"None"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="one">1 contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{None}=1{1 contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Starred contacts"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Some notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Selected people can still reach you, even if you don’t allow apps to interrupt"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} can interrupt}=2{{app_1} and {app_2} can interrupt}=3{{app_1}, {app_2} and {app_3} can interrupt}other{{app_1}, {app_2} and # more can interrupt}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Some notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications that can interrupt"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Allow all notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nothing can interrupt"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} can interrupt}=2{{sound_category_1} and {sound_category_2} can interrupt}=3{{sound_category_1}, {sound_category_2} and {sound_category_3} can interrupt}other{{sound_category_1}, {sound_category_2} and # more can interrupt}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"On"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Off"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"App pinning"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. \n\nWhen an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. \n\nWhen an app is pinned, the pinned app may open other apps, and personal data may be accessible. \n\nIf you want to share your device securely with someone, try using a guest user instead. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap \'Pin\'"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nIf you want to securely share your device with someone, try using a guest user instead. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"When app is pinned: \n\n• Personal data may be accessible \n(such as contacts and email content) \n• Pinned app may open other apps \n\nOnly use app pinning with people that you trust."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Ask for unlock pattern before unpinning"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Ask for PIN before unpinning"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"In addition to using your face to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"In addition to using your face to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"In addition to using your face to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restricted"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Connected device"</string>
     <string name="usb_control_device" msgid="527916783743021577">"This device"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Switching…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Switching…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Couldn\'t switch"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Charging this device"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Charging connected device"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobile data usage"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"App data usage"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi‑Fi data usage"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Non-operator data usage"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet data usage"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Carrier data accounting may differ from device accounting"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"View details"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Unrestricted data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Background data is turned off"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Background data is turned off"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"On"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Use Data Saver"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"If device is locked, prevent typing replies or other text in notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Default spell checker"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Choose spell checker"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Use spell checker"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Use spellchecker"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Not selected"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(none)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Remove photos and videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Use storage manager"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Free up space now"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Double-tap to check phone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Double-tap to check tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Double-tap to check device"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swipe for notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swipe down on the bottom edge of the screen to show your notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"One-handed mode"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Use one-handed mode"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Exit when switching apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 seconds"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 seconds"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 seconds"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"reachability"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"To check time, notifications and other info, double-tap your screen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Lift to check tablet"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergency SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Use emergency SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Start the actions below by pressing the power button quickly five times or more"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Play countdown alarm"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Play a loud sound before notifying for help"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Call for help"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Number to call for help"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Tap to change"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"If you enter a non-emergency number:\n • Your device must be unlocked to use emergency SOS\n • Your call may not be answered"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Max visible datasets"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Reset to default values"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Auto-fill developer options have been reset"</string>
+    <string name="location_category" msgid="3496759112306219062">"Location"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Status bar location indicator"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Show for all locations, including network and connectivity"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Force full GNSS measurements"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="device_theme" msgid="5027604586494772471">"Device theme"</string>
     <string name="default_theme" msgid="4815428567082263639">"Default"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Network name"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pause notifications to stay focused"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Feature not available"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"This feature has been turned off because it slows down your phone"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Force full GNSS measurements"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Always show crash dialogue"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Show dialogue every time an app crashes"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Select ANGLE enabled app"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"On (mute)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Off"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Network details"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="649715719278562515">"Devices"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"All Settings"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Suggestions"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Couldn’t find networks. Try again."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbidden)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No SIM card"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"None"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Requires SIM to connect"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Requires <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM to connect"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferred network mode: WCDMA preferred"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferred network mode: GSM only"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferred network mode: WCDMA only"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"See more"</string>
     <string name="see_less" msgid="2642392725363552793">"See less"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Turn on <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Turn on SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Switch to using SIM card?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Only one SIM can be active at a time.\n\nSwitching won’t cancel your <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connecting to network…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Switching to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Can’t switch operator"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"The operator can’t be switched because of an error."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Can’t disable operator"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Use two SIMs?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"This device can have two SIMs active at once. To continue using one SIM at a time, tap \'No thanks\'."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Restart device?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"To get started, restart your device. Then you can add another SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continue"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM card"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Erase this downloaded SIM?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Erasing this SIM removes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> won\'t be cancelled."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Erase"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Erasing SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Can\'t erase SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"This SIM can\'t be erased due to an error.\n\nRestart your device and try again."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connect to device"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> app wants to use a temporary Wi‑Fi network to connect to your device"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No devices found. Make sure that devices are turned on and available to connect."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Emergency calls"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Emergency calls over Wi‑Fi Calling are not supported by your operator.\nThe device switches automatically to a mobile network to place an emergency call.\nEmergency calls are only possible in areas with mobile coverage."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Use Wi‑Fi for calls to improve quality"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Cross-SIM calling"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Allow other SIM calls and SMSs over this SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"cross-SIM calling"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Incoming MMS message"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Can’t send MMS message"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tap to allow MMS messaging on <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> when mobile data is off"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Hide player when the media session has ended"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"The player allows you to resume a session from the expanded Quick Settings panel."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media Player in Quick Settings"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Show media player for an extended period to easily resume playback"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Hide player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Show player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No players available"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Allowed apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"On"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Aeroplane-safe networks"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Find and connect to aeroplane‑safe networks"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Make and receive calls over non‑operator networks, like Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi calling allows you to make and receive calls over non‑operator networks, such as some Wi‑Fi networks."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferred"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"calls preferred"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS preferred"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"View aeroplane-safe networks"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Turn off aeroplane mode"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Unavailable because bedtime mode is on"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Reset notification importance completed."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Untrusted device wants to access your messages. Tap for details."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Allow access to messages?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your messages.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Untrusted device wants to access your contacts and call log. Tap for details."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Allow access to contacts and call log?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
 </resources>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index ec8510a..ef08f35 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medium"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Short"</item>
+    <item msgid="7397961711906421599">"Medium"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index efe844e..fa94b82 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Date and time"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Set date and time"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Set date, time, time zone, &amp; formats"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Use network-provided time"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Use network-provided time zone"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Set time automatically"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Set time zone automatically"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑hour format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Show profile info on lock screen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Accounts"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Location"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Use location"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Use location"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">On – <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Screen lock, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Screen lock, fingerprint"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Screen lock"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Unlock your phone securely with your face and fingerprint"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"You can also sign in to apps and confirm payments"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Set up unlock with:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Make unlocking your phone a breeze"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingerprint"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Save time unlocking phone in your pocket"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Skip"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Next"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Face added"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Set up face unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Use your face to authenticate"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Go back"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continue setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"When using face unlock in apps, always require confirmation step"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Delete face data"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Set up face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Use face unlock to unlock your device, sign in to apps and confirm payments."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Bear in mind that:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, for example an identical sibling."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Bear in mind that:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, for example an identical sibling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Delete face data?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"The face data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern or password to unlock your phone, sign in to apps and confirm payments."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Use face unlock to unlock your phone"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, thanks"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continue"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Next"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Skip PIN setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Skip password setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Skip pattern setup?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Choose your backup screen lock method"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Choose your backup screen lock method"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Choose your backup screen lock method"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Screen lock options"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Screen lock options"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Screen lock"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face unlock + password"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continue without face unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrics + Pattern"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrics + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrics + Password"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continue without biometrics"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"You can unlock your phone using your biometrics. For security, this option requires a backup screen lock."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disabled by admin, encryption policy or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipe"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Must be fewer than <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Device admin doesn\'t allow using a recent PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Common PINs are blocked by your IT admin. Try a different PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"This can\'t include an invalid character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Must contain at least one letter"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Must contain at least one digit"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Must contain at least 1 non-numeric character</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Device admin doesn\'t allow using a recent password"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Common passwords are blocked by your IT admin. Try a different password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirm"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancel"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Turn on Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Use Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Use Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi settings"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Set up &amp; manage wireless access points"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centre the QR code below to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Join Wi‑Fi by scanning a QR code"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Share Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\' and share the password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan this QR code with another device to join \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Try again. If the issue continues, contact the device manufacturer"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Something went wrong"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Auto‑connect"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Allow phone to automatically connect near this network"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Allow tablet to automatically connect near this network"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Allow connection to this network when in range"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Add device"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use a QR code to add a device to this network"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR code isn\'t a valid format"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Use system certificates"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Do not validate"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No certificate specified. Your connection will not be private."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Must specify a domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificate required."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connect"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi turned on"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connecting…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Failed to connect to network"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Network not in range"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Device MAC address"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomised MAC address"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Randomised MAC address (last used)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP address"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Network details"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 addresses"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Saved networks"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Subscriptions"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Other networks"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP settings"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Wi‑Fi advanced settings are not available for this user"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Save"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Please type a valid gateway address."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Type a valid DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Type a network prefix length between 0 and 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (unless overridden by private DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (unless overridden by private DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Network prefix length"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No password set"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot name"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP band"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Force 90 Hz refresh rate"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Highest refresh rate for improved touch responsiveness and animation quality. Increases battery usage."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Screen attention"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"When screen is dark, it turns on for new notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Always show time and info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Increased battery usage"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Bold text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Font size"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM card lock settings"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android security update"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Equipment ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Delete APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"New APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Save"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Discard"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Cancel"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"The Name field can\'t be empty."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"The APN cannot be empty."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Apps can be reset"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Reset Wi-Fi, mobile &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Erase"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Erase downloaded SIMs"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"To download replacement SIMs, contact your operator. This won’t cancel any mobile service plans."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"This won’t cancel any mobile service plans. To download replacement SIMs, contact your operator."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Reset settings"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Reset all network settings? You can’t undo this action."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Reset all network settings and delete downloaded SIMs? You can’t undo this action."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Network settings have been reset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Can’t delete SIMs"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloaded SIMs can’t be deleted due to an error.\n\nRestart your device and try again."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Delete all data (factory reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Delete all data (factory reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"You are currently signed in to the following accounts:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"There are other users present on this device.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"This will not cancel your mobile service plan."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Erase all data (factory reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Erase all data (factory reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"There are other users present on this device.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"This will not cancel your mobile service plan."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Erase USB storage"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Erase all the data on the SD card, such as music or photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Erase everything"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No reset was performed because the System Clear service isn\'t available."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Erase all data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Factory reset is not available for this user"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Erasing"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Please wait..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Erase all data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Factory reset is not available for this user"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Erasing"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Please wait…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Call settings"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB tethering"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Share phone’s Internet connection via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Share phone’s Internet connection via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use hotspot and tethering to provide Internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Help"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Allows the device’s location to be used to detect the current time zone. Other location settings such as Wi‑Fi scanning can affect the accuracy of time zone detection."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"On"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Off"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatic time zone detection is disabled"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Location time zone detection is disabled"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Location time zone detection is not supported"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Location time zone detection changes are not allowed"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Location determined by Wi‑Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"To use face unlock, set password"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"To use face unlock, set pattern"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"To use face unlock, set PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"To use biometrics, set password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"To use biometrics, set pattern"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"To use biometrics, set PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Forgot your password?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Forgot your pattern?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Forgotten your PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Choose the magnification area(s) that you want to use when magnifying the screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Full screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Part of screen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Full screen &amp; part of screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Magnify entire screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Magnify part of screen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Switch to accessibility button?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.\n\nDo you want to switch to using accessibility button to magnify?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Switch to accessibility button"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Keep triple tap to magnify"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Magnify with triple-tap"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Magnify with shortcut"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Power button ends call"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Large mouse cursor"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remove animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combine channels when playing audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Left"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Right"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combine channels when playing audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Left"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Right"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 seconds"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 seconds"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Notification vibration"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ring vibration"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Touch feedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Use colour correction"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Show captions"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"For supported app only"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Use colour correction"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Show captions"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"For supported app only"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Caption size and style"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> text size"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"More options"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Background restriction"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Allow the app to run in the background"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App not allowed to run in background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Background usage can’t be restricted"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Background usage can’t be restricted"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limit background activity?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet used more than usual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Device used more than usual"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Battery may run out earlier than usual"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimising for battery health"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Battery limited temporarily. Tap to learn more."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d app restricted</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problem reading your battery meter"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problem reading your battery meter. Tap to "<annotation id="url">"learn more"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Stop app?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Set a schedule"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Extend battery life"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Turn off when charged"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Battery Saver turns off when your phone is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Battery Saver turns off when your tablet is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Battery Saver turns off when your device is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Battery Saver turns off when your phone charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Battery Saver turns off when your tablet charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Battery Saver turns off when your device charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Turn on"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"Play"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive connectivity"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extends battery life and improves device performance by automatically managing your network connections"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Credential storage"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Install a certificate"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Install certificates from storage"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Don’t install"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Install anyway"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificate not installed"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Allow <xliff:g id="APP_NAME">%s</xliff:g> to install certificates on this device?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"These certificates will identify you to the apps and URLs below"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Don\'t allow"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Allow"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Show more"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Certificate management app"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"None"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certificates installed by this app identify you to the apps and URLs below"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Remove"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Emergency dialling signal"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Set behaviour when an emergency call is placed"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Backup"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Not set up – Work profile"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nickname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"You can add up to <xliff:g id="USER_COUNT">%1$d</xliff:g> users"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Only the tablet\'s owner can manage users."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Only the phone\'s owner can manage users."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paying at the terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Got it"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"More..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"More…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Set default payment app"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Update default payment app"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"At a contactless terminal, pay with <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Back"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Next"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finish"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Take a photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Choose an image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Select photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM cards"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM cards"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Always use this for calls"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Select a SIM for data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Select a SIM for SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Switching data SIM, this may take up to a minute..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Switching data SIM, this may take up to a minute…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Call with"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Select a SIM card"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, advanced calling, 4G calling"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"add language, add a language"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"text size"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default sound"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ring and notification volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Do Not Disturb"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Power on sounds"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatically caption media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"None"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
-      <item quantity="one">1 schedule set</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priority only"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ask every time"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Until you turn off"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
-      <item quantity="one">1 hour</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="one">1 schedule can turn on automatically</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hour}other{# hours}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 schedule can turn on automatically}other{Off/# schedules can turn on automatically}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"What can interrupt Do Not Disturb"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatically set lower priority notifications to Gentle"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptive notification ranking"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reset notification importance"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset user-changed importance settings and allow notification assistant to prioritise"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Priority conversations"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Show at top of conversation section and appear as floating bubbles"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Show at top of conversation section"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Other conversations"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Non-priority conversations"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations to which you’ve made changes"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Recent conversations"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Clear recents"</string>
+    <string name="clear" msgid="5092178335409471100">"Clear"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Bubble priority conversations"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Priority and modified conversations will appear here"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Do Not Disturb access"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Allow Do Not Disturb"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"No installed apps have requested Do Not Disturb access"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Loading apps..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Loading apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"All conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="one">1 conversation</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"None"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Calls"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"To make sure that allowed calls make a sound, check that the device is set to ring"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">1 other</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"None"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} and {contact_2}}=3{{contact_1}, {contact_2} and {contact_3}}other{{contact_1}, {contact_2} and # others}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(No name)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"All messages can reach you"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"All calls can reach you"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"None"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="one">1 contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{None}=1{1 contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Starred contacts"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Some notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Selected people can still reach you, even if you don’t allow apps to interrupt"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} can interrupt}=2{{app_1} and {app_2} can interrupt}=3{{app_1}, {app_2} and {app_3} can interrupt}other{{app_1}, {app_2} and # more can interrupt}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Some notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications that can interrupt"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Allow all notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nothing can interrupt"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} can interrupt}=2{{sound_category_1} and {sound_category_2} can interrupt}=3{{sound_category_1}, {sound_category_2} and {sound_category_3} can interrupt}other{{sound_category_1}, {sound_category_2} and # more can interrupt}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"On"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Off"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"App pinning"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. \n\nWhen an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. \n\nWhen an app is pinned, the pinned app may open other apps, and personal data may be accessible. \n\nIf you want to share your device securely with someone, try using a guest user instead. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap \'Pin\'"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nIf you want to securely share your device with someone, try using a guest user instead. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"When app is pinned: \n\n• Personal data may be accessible \n(such as contacts and email content) \n• Pinned app may open other apps \n\nOnly use app pinning with people that you trust."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Ask for unlock pattern before unpinning"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Ask for PIN before unpinning"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"In addition to using your face to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"In addition to using your face to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"In addition to using your face to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restricted"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Connected device"</string>
     <string name="usb_control_device" msgid="527916783743021577">"This device"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Switching…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Switching…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Couldn\'t switch"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Charging this device"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Charging connected device"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobile data usage"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"App data usage"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi‑Fi data usage"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Non-operator data usage"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet data usage"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data accounting may differ from device accounting"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"View details"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Unrestricted data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Background data is turned off"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Background data is turned off"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"On"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Use Data Saver"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"If device is locked, prevent typing replies or other text in notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Default spell checker"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Choose spell checker"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Use spell checker"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Use spellchecker"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Not selected"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(none)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Remove photos &amp; videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Use storage manager"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Free up space now"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Double-tap to check phone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Double-tap to check tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Double-tap to check device"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swipe for notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swipe down on the bottom edge of the screen to show your notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"One-handed mode"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Use one-handed mode"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Exit when switching apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 seconds"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 seconds"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 seconds"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"reachability"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"To check time, notifications and other info, double-tap your screen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Lift to check tablet"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergency SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Use emergency SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Start the actions below by pressing the power button quickly five times or more"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Play countdown alarm"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Play a loud sound before notifying for help"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Call for help"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Number to call for help"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Tap to change"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"If you enter a non-emergency number:\n • Your device must be unlocked to use emergency SOS\n • Your call may not be answered"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Max visible datasets"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Reset to default values"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Auto-fill developer options have been reset"</string>
+    <string name="location_category" msgid="3496759112306219062">"Location"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Status bar location indicator"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Show for all locations, including network and connectivity"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Force full GNSS measurements"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="device_theme" msgid="5027604586494772471">"Device theme"</string>
     <string name="default_theme" msgid="4815428567082263639">"Default"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Network name"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pause notifications to stay focused"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Feature not available"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"This feature has been turned off because it slows down your phone"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Force full GNSS measurements"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Always show crash dialogue"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Show dialogue every time an app crashes"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Select ANGLE enabled app"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"On (mute)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Off"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Network details"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="649715719278562515">"Devices"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"All Settings"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Suggestions"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Couldn’t find networks. Try again."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbidden)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No SIM card"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"None"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Requires SIM to connect"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Requires <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM to connect"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferred network mode: WCDMA preferred"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferred network mode: GSM only"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferred network mode: WCDMA only"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"See more"</string>
     <string name="see_less" msgid="2642392725363552793">"See less"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Turn on <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Turn on SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Switch to using SIM card?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Only one SIM can be active at a time.\n\nSwitching won’t cancel your <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connecting to network…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Switching to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Can’t switch operator"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"The operator can’t be switched because of an error."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Can’t disable operator"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Use two SIMs?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"This device can have two SIMs active at once. To continue using one SIM at a time, tap \'No thanks\'."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Restart device?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"To get started, restart your device. Then you can add another SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continue"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM card"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Erase this downloaded SIM?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Erasing this SIM removes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> won\'t be cancelled."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Erase"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Erasing SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Can\'t erase SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"This SIM can\'t be erased due to an error.\n\nRestart your device and try again."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connect to device"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> app wants to use a temporary Wi‑Fi network to connect to your device"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No devices found. Make sure that devices are turned on and available to connect."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Emergency calls"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Emergency calls over Wi‑Fi Calling are not supported by your operator.\nThe device switches automatically to a mobile network to place an emergency call.\nEmergency calls are only possible in areas with mobile coverage."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Use Wi‑Fi for calls to improve quality"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Cross-SIM calling"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Allow other SIM calls and SMSs over this SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"cross-SIM calling"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Incoming MMS message"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Can’t send MMS message"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tap to allow MMS messaging on <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> when mobile data is off"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Hide player when the media session has ended"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"The player allows you to resume a session from the expanded Quick Settings panel."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media Player in Quick Settings"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Show media player for an extended period to easily resume playback"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Hide player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Show player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No players available"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Allowed apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"On"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Aeroplane-safe networks"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Find and connect to aeroplane‑safe networks"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Make and receive calls over non‑operator networks, like Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi calling allows you to make and receive calls over non‑operator networks, such as some Wi‑Fi networks."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferred"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"calls preferred"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS preferred"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"View aeroplane-safe networks"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Turn off aeroplane mode"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Unavailable because bedtime mode is on"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Reset notification importance completed."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Untrusted device wants to access your messages. Tap for details."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Allow access to messages?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your messages.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Untrusted device wants to access your contacts and call log. Tap for details."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Allow access to contacts and call log?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
 </resources>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index ec8510a..ef08f35 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medium"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Short"</item>
+    <item msgid="7397961711906421599">"Medium"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA only"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 00423c9..66ce5da 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Date and time"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Set date and time"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Set date, time, time zone, &amp; formats"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Use network-provided time"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Use network-provided time zone"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Set time automatically"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Set time zone automatically"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Use locale default"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑hour format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Use 24-hour format"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Show profile info on lock screen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Accounts"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Location"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Use location"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Use location"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">On – <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Screen lock, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Screen lock, fingerprint"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Screen lock"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Unlock your phone securely with your face and fingerprint"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"You can also sign in to apps and confirm payments"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Set up unlock with:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Make unlocking your phone a breeze"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingerprint"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Save time unlocking phone in your pocket"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Skip"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Next"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Face added"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Set up face unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Use your face to authenticate"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Go back"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continue setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Use accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"When using face unlock in apps, always require confirmation step"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Delete face data"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Set up face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use face unlock to unlock your device, sign in to apps and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Use face unlock to unlock your device, sign in to apps and confirm payments."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Bear in mind that:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, for example an identical sibling."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Bear in mind that:\nLooking at the phone can unlock it when you don’t intend to.\n\nYour phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, for example an identical sibling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Delete face data?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"The face data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern or password to unlock your phone, sign in to apps and confirm payments."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Use face unlock to unlock your phone"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: You can’t use your fingerprint to unlock this device. For more information, contact your organisation’s admin."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancel"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, thanks"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continue"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Skip"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Next"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Skip PIN setup?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Skip password setup?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Skip pattern setup?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Prevent others from using this device without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock that you would like to use."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Choose your backup screen lock method"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Choose your backup screen lock method"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Choose your backup screen lock method"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Screen lock options"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Screen lock options"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Screen lock"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face unlock + password"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continue without face unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"You can unlock your phone using your face. For security, this option requires a backup screen lock."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrics + Pattern"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrics + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrics + Password"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continue without biometrics"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"You can unlock your phone using your biometrics. For security, this option requires a backup screen lock."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disabled by admin, encryption policy or credential storage"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"None"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipe"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Must be fewer than <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Device admin doesn\'t allow using a recent PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Common PINs are blocked by your IT admin. Try a different PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"This can\'t include an invalid character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Must contain at least one letter"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Must contain at least one digit"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Must contain at least 1 non-numeric character</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Device admin doesn\'t allow using a recent password"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Common passwords are blocked by your IT admin. Try a different password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ascending, descending or repeated sequence of digits isn\'t allowed"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirm"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancel"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Turn on Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Use Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Use Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi settings"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Set up &amp; manage wireless access points"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centre the QR code below to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Join Wi‑Fi by scanning a QR code"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Share Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\' and share the password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan this QR code with another device to join \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan this QR code to connect to \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Try again. If the issue continues, contact the device manufacturer"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Something went wrong"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot password: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Auto‑connect"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Allow phone to automatically connect near this network"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Allow tablet to automatically connect near this network"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Allow connection to this network when in range"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Add device"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use a QR code to add a device to this network"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR code isn\'t a valid format"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Use system certificates"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Do not provide"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Do not validate"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No certificate specified. Your connection will not be private."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Network name is too long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Must specify a domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificate required."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connect"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi turned on"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connecting…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Failed to connect to network"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Network not in range"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Device MAC address"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomised MAC address"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Randomised MAC address (last used)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP address"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Network details"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 addresses"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Saved networks"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Subscriptions"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Other networks"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP settings"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Wi‑Fi advanced settings are not available for this user"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Save"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Please type a valid gateway address."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Type a valid DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Type a network prefix length between 0 and 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (unless overridden by private DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (unless overridden by private DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Network prefix length"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App is sharing content. To share Internet connection, turn hotspot off, then on"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No password set"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot name"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Turning on <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Other devices can connect to <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot password"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP band"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Force 90 Hz refresh rate"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Highest refresh rate for improved touch responsiveness and animation quality. Increases battery usage."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Screen attention"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Screen won’t turn off if you’re looking at it"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"When screen is dark, it turns on for new notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Always show time and info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Increased battery usage"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Bold text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Font size"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Make text larger or smaller"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM card lock settings"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android security update"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model and hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardware version"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Equipment ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Delete APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"New APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Save"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Discard"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Cancel"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"The Name field can\'t be empty."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"The APN cannot be empty."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Apps can be reset"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Reset Wi-Fi, mobile and Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"This will reset all network settings, including:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Erase"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Erase downloaded SIMs"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"To download replacement SIMs, contact your operator. This won’t cancel any mobile service plans."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"This won’t cancel any mobile service plans. To download replacement SIMs, contact your operator."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Reset settings"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Reset all network settings? You can’t undo this action."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Reset all network settings and delete downloaded SIMs? You can’t undo this action."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Network settings have been reset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Can’t delete SIMs"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Downloaded SIMs can’t be deleted due to an error.\n\nRestart your device and try again."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Delete all data (factory reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Delete all data (factory reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"You are currently signed in to the following accounts:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"There are other users present on this device.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"This will not cancel your mobile service plan."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Erase all data (factory reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Erase all data (factory reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"This will erase all data from your tablet’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"This will erase all data from your phone’s "<b>"internal storage"</b>", including:\n\n"<li>"Your Google Account"</li>\n<li>"System and app data and settings"</li>\n<li>"Downloaded apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"You are currently signed in to the following accounts:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"There are other users present on this device.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Music"</li>\n<li>"Photos"</li>\n<li>"Other user data"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"This will not cancel your mobile service plan."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"To clear music, pictures and other user data, the "<b>"USB storage"</b>" needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"To clear music, pictures and other user data, the "<b>"SD card"</b>" needs to be erased."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Erase USB storage"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Erase SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Erase all the data on the internal USB storage, such as music or photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Erase all the data on the SD card, such as music or photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Erase all data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Erase everything"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No reset was performed because the System Clear service isn\'t available."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Erase all data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Factory reset is not available for this user"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Erasing"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Please wait..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Erase all data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"All of your personal information and downloaded apps will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Erase all data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Factory reset is not available for this user"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Erasing"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Please wait…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Call settings"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Set up voicemail, call forwarding, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB tethering"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Can\'t tether to more than <xliff:g id="MAXCONNECTION">%1$d</xliff:g> devices."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> will be untethered."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Share phone’s Internet connection via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Share phone’s Internet connection via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use hotspot and tethering to provide Internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use hotspot and tethering to provide Internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Help"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth scanning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Location time zone detection"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Location time zone detection"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Allows the device’s location to be used to detect the current time zone. Other location settings such as Wi‑Fi scanning can affect the accuracy of time zone detection."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"On"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Off"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatic time zone detection is disabled"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Location time zone detection is disabled"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Location time zone detection is not supported"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Location time zone detection changes are not allowed"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi &amp; mobile network location"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Let apps use Google\'s location service to estimate your location faster. Anonymous location data will be collected and sent to Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Location determined by Wi‑Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"To use face unlock, set password"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"To use face unlock, set pattern"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"To use face unlock, set PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"To use biometrics, set password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"To use biometrics, set pattern"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"To use biometrics, set PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Forgot your password?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Forgot your pattern?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Forgotten your PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Caption preferences"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Magnification"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Magnification area"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Choose the magnification area(s) that you want to use when magnifying the screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Full screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Part of screen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Full screen &amp; part of screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Magnify entire screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Magnify part of screen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Switch to accessibility button?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.\n\nDo you want to switch to using accessibility button to magnify?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Switch to accessibility button"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Keep triple tap to magnify"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Magnification settings"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Magnify with triple-tap"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Magnify with shortcut"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Power button ends call"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Large mouse cursor"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remove animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combine channels when playing audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balance"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Left"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Right"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combine channels when playing audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balance"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Left"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Right"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 seconds"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 seconds"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Notification vibration"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ring vibration"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Touch feedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Use colour correction"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Show captions"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"For supported app only"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Use <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Open <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Use colour correction"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Show captions"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"For supported app only"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Caption size and style"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> text size"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"More options"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Red-green"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Red-green"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blue-yellow"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Background restriction"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Allow the app to run in the background"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App not allowed to run in background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Background usage can’t be restricted"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Background usage can’t be restricted"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limit background activity?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"If you limit background activity for an app, it may misbehave"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Since this app is not set to optimise battery, you can’t restrict it.\n\nTo restrict the app, first turn on battery optimisation."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet used more than usual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Device used more than usual"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Battery may run out earlier than usual"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimising for battery health"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Battery limited temporarily. Tap to learn more."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d app restricted</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problem reading your battery meter"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problem reading your battery meter. Tap to "<annotation id="url">"learn more"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Stop app?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Your phone can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your phone awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Your tablet can\'t manage battery normally because <xliff:g id="APP">%1$s</xliff:g> is keeping your tablet awake.\n\nTo try to fix this issue, you can stop the app.\n\nIf this keeps happening, you may need to uninstall the app to improve battery performance."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Set a schedule"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Extend battery life"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Turn off when charged"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Battery Saver turns off when your phone is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Battery Saver turns off when your tablet is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Battery Saver turns off when your device is at <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Battery Saver turns off when your phone charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Battery Saver turns off when your tablet charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Battery Saver turns off when your device charges to above <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Turn on"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"Play"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive connectivity"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extends battery life and improves device performance by automatically managing your network connections"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Credential storage"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Install a certificate"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Install certificates from storage"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"User credentials"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"View and modify stored credentials"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Storage type"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software only"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Credentials are not available for this user"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installed for VPN and apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installed for Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Don’t install"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Install anyway"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificate not installed"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Allow <xliff:g id="APP_NAME">%s</xliff:g> to install certificates on this device?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"These certificates will identify you to the apps and URLs below"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Don\'t allow"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Allow"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Show more"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Certificate management app"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"None"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certificates installed by this app identify you to the apps and URLs below"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Remove"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Emergency dialling signal"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Set behaviour when an emergency call is placed"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Backup"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Not set up – Work profile"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"You (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nickname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"You can add up to <xliff:g id="USER_COUNT">%1$d</xliff:g> users"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Only the tablet\'s owner can manage users."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Only the phone\'s owner can manage users."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paying at the terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Got it"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"More..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"More…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Set default payment app"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Update default payment app"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"At a contactless terminal, pay with <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Back"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Next"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finish"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Take a photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Choose an image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Select photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM cards"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM cards"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Always use this for calls"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Select a SIM for data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Select a SIM for SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Switching data SIM, this may take up to a minute..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Switching data SIM, this may take up to a minute…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Call with"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Select a SIM card"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, schedule, battery saver, power saver, battery, automatic, per cent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, advanced calling, 4G calling"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"add language, add a language"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"text size"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default sound"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ring and notification volume at <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Do Not Disturb"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Power on sounds"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatically caption media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"None"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
-      <item quantity="one">1 schedule set</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{1 schedule set}other{# schedules set}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Do Not Disturb"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Only get notified by important people and apps"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limit interruptions"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priority only"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ask every time"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Until you turn off"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
-      <item quantity="one">1 hour</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="one">1 schedule can turn on automatically</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hour}other{# hours}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/1 schedule can turn on automatically}other{Off/# schedules can turn on automatically}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"What can interrupt Do Not Disturb"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"People"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatically set lower priority notifications to Gentle"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptive notification ranking"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatically rank notifications by relevance"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Adaptive notification feedback"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicate adjustments made to notifications and show the option to provide feedback to the system"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reset notification importance"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset user-changed importance settings and allow notification assistant to prioritise"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggested actions and replies"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatically show suggested actions and replies"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Show recent and snoozed notifications"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Priority conversations"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Show at top of conversation section and appear as floating bubbles"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Show at top of conversation section"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Other conversations"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Non-priority conversations"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations to which you’ve made changes"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Recent conversations"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Clear recents"</string>
+    <string name="clear" msgid="5092178335409471100">"Clear"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Bubble priority conversations"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Priority and modified conversations will appear here"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Do Not Disturb access"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Allow Do Not Disturb"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"No installed apps have requested Do Not Disturb access"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Loading apps..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Loading apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"At your request, Android is blocking this app\'s notifications from appearing on this device"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"At your request, Android is blocking this category of notifications from appearing on this device"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"At your request, Android is blocking this group of notifications from appearing on this device"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"All conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Priority conversations"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"None"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="one">1 conversation</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"None"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{1 conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Who can interrupt"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Calls"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Calls"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"To make sure that allowed calls make a sound, check that the device is set to ring"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming calls are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Starred contacts"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="one">1 other</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"None"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} and {contact_2}}=3{{contact_1}, {contact_2} and {contact_3}}other{{contact_1}, {contact_2} and # others}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(No name)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"For ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, incoming messages are blocked. You can adjust settings to allow your friends, family or other contacts to reach you."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"All messages can reach you"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"All calls can reach you"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"None"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="one">1 contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{None}=1{1 contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Anyone"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Starred contacts"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Some notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Selected people can still reach you, even if you don’t allow apps to interrupt"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} can interrupt}=2{{app_1} and {app_2} can interrupt}=3{{app_1}, {app_2} and {app_3} can interrupt}other{{app_1}, {app_2} and # more can interrupt}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"All notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Some notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications that can interrupt"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Allow all notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nothing can interrupt"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> more"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} can interrupt}=2{{sound_category_1} and {sound_category_2} can interrupt}=3{{sound_category_1}, {sound_category_2} and {sound_category_3} can interrupt}other{{sound_category_1}, {sound_category_2} and # more can interrupt}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nothing can interrupt"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"No one can interrupt"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Some people can interrupt"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"All people can interrupt"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"On"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Off"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"App pinning"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. \n\nWhen an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. \n\nWhen an app is pinned, the pinned app may open other apps, and personal data may be accessible. \n\nIf you want to share your device securely with someone, try using a guest user instead. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap \'Pin\'"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nIf you want to securely share your device with someone, try using a guest user instead. \n\nTo use app pinning: 	\n1.	Turn on app pinning 	\n2.	Open Overview 	\n3.	Tap the app icon at the top of the screen, then tap Pin"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"When app is pinned: \n\n• Personal data may be accessible \n(such as contacts and email content) \n• Pinned app may open other apps \n\nOnly use app pinning with people that you trust."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Ask for unlock pattern before unpinning"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Ask for PIN before unpinning"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"In addition to using your face to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"In addition to using your face to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"In addition to using your face to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"In addition to using your biometrics to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restricted"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlled by"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Connected device"</string>
     <string name="usb_control_device" msgid="527916783743021577">"This device"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Switching…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Switching…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Couldn\'t switch"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Charging this device"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Charging connected device"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobile data usage"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"App data usage"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi‑Fi data usage"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Non-operator data usage"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet data usage"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 restriction</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator data accounting may differ from device accounting"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excludes data that is used by operator networks"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> used"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Set data warning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Data warning"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"View details"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Unrestricted data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Background data is turned off"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Background data is turned off"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"On"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Use Data Saver"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"If device is locked, prevent typing replies or other text in notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Default spell checker"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Choose spell checker"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Use spell checker"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Use spellchecker"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Not selected"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(none)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Remove photos &amp; videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Use Storage Manager"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Use storage manager"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatic"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Free up space now"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Double-tap to check phone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Double-tap to check tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Double-tap to check device"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swipe for notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swipe down on the bottom edge of the screen to show your notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"One-handed mode"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Use one-handed mode"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Exit when switching apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 seconds"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 seconds"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 seconds"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"reachability"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"To check time, notifications and other info, double-tap your screen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Lift to check phone"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Lift to check tablet"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tap to check tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tap to check device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"To check time, notifications and other info, tap your screen."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergency SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Use emergency SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Managed by <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Start the actions below by pressing the power button quickly five times or more"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Play countdown alarm"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Play a loud sound before notifying for help"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Call for help"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Number to call for help"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Tap to change"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"If you enter a non-emergency number:\n • Your device must be unlocked to use emergency SOS\n • Your call may not be answered"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swipe fingerprint for notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swipe fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"To check your notifications, swipe down on the fingerprint sensor on the back of your phone."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Max visible datasets"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Reset to default values"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Auto-fill developer options have been reset"</string>
+    <string name="location_category" msgid="3496759112306219062">"Location"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Status bar location indicator"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Show for all locations, including network and connectivity"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Force full GNSS measurements"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="device_theme" msgid="5027604586494772471">"Device theme"</string>
     <string name="default_theme" msgid="4815428567082263639">"Default"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Network name"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pause notifications to stay focused"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Feature not available"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"This feature has been turned off because it slows down your phone"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Force full GNSS measurements"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Track all GNSS constellations and frequencies with no duty cycling"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Always show crash dialogue"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Show dialogue every time an app crashes"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Select ANGLE enabled app"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Enable for all apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Select graphics driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System graphics driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"On (mute)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Off"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Network details"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="649715719278562515">"Devices"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"All Settings"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Suggestions"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Couldn’t find networks. Try again."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbidden)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No SIM card"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"None"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Requires SIM to connect"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Requires <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM to connect"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferred network mode: WCDMA preferred"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferred network mode: GSM only"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferred network mode: WCDMA only"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Access data using mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Phone will automatically switch to this mobile operator when in range"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No SIM card available"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Calls preference"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS preference"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ask every time"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Unavailable when connected to <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"See more"</string>
     <string name="see_less" msgid="2642392725363552793">"See less"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Turn on <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Turn on SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Switch to using SIM card?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> won’t cancel your <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Only one SIM can be active at a time.\n\nSwitching won’t cancel your <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> service."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Switch to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connecting to network…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Switching to <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Can’t switch operator"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"The operator can’t be switched because of an error."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Turn off <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Turn off SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Turning off SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Can’t disable operator"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Something went wrong and your operator could not be disabled."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Use two SIMs?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"This device can have two SIMs active at once. To continue using one SIM at a time, tap \'No thanks\'."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Restart device?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"To get started, restart your device. Then you can add another SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continue"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Restart"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"No, thanks"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Switch"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Can’t activate SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remove the SIM and insert it again. If the problem continues, restart your device."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Try turning on the SIM again. If the problem continues, restart your device."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Network activation"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is active"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tap to update SIM settings"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM card"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Erase this downloaded SIM?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Erasing this SIM removes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> won\'t be cancelled."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Erase"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Erasing SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Can\'t erase SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"This SIM can\'t be erased due to an error.\n\nRestart your device and try again."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connect to device"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> app wants to use a temporary Wi‑Fi network to connect to your device"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No devices found. Make sure that devices are turned on and available to connect."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Emergency calls"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Emergency calls over Wi‑Fi Calling are not supported by your operator.\nThe device switches automatically to a mobile network to place an emergency call.\nEmergency calls are only possible in areas with mobile coverage."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Use Wi‑Fi for calls to improve quality"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Cross-SIM calling"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Allow other SIM calls and SMSs over this SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"cross-SIM calling"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Incoming MMS message"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Can’t send MMS message"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tap to allow MMS messaging on <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> when mobile data is off"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Allow screen overlays on settings"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Allow apps that can display over other apps to overlay settings screens"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Hide player when the media session has ended"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"The player allows you to resume a session from the expanded Quick Settings panel."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media Player in Quick Settings"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Show media player for an extended period to easily resume playback"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Hide player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Show player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No players available"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Allowed apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth will turn on"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"On"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Aeroplane-safe networks"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Find and connect to aeroplane‑safe networks"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplane, aeroplane-safe"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Calls and SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi calling"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Make and receive calls over non‑operator networks, like Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi calling allows you to make and receive calls over non‑operator networks, such as some Wi‑Fi networks."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Calls"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferred"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"calls preferred"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS preferred"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"unavailable"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"No SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connect to public networks"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, mobile operator, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"View aeroplane-safe networks"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Turn off aeroplane mode"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Unavailable because bedtime mode is on"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Reset notification importance completed."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Untrusted device wants to access your messages. Tap for details."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Allow access to messages?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your messages.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Untrusted device wants to access your contacts and call log. Tap for details."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Allow access to contacts and call log?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"An untrusted Bluetooth device, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven’t connected to [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] before."</string>
 </resources>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index d900cd1..baa23ba 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‎Medium‎‏‎‎‏‎"</item>
     <item msgid="6740026006576843477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎Long‎‏‎‎‏‎"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‎Short‎‏‎‎‏‎"</item>
+    <item msgid="7397961711906421599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎Medium‎‏‎‎‏‎"</item>
+    <item msgid="4079132024502041928">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎Long‎‏‎‎‏‎"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‎‎Default‎‏‎‎‏‎"</item>
     <item msgid="4234707448428002595">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎Sans-serif‎‏‎‎‏‎"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎CDMA/EvDo/GSM/WCDMA‎‏‎‎‏‎"</item>
     <item msgid="2847125869624632806">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎CDMA + LTE/EvDo‎‏‎‎‏‎"</item>
     <item msgid="2247906254631766720">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎GSM/WCDMA/LTE‎‏‎‎‏‎"</item>
-    <item msgid="1091258946200124345">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎Global‎‏‎‎‏‎"</item>
+    <item msgid="4147872615520331421">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‎LTE/CDMA/EvDo/GSM/WCDMA‎‏‎‎‏‎"</item>
     <item msgid="2908834445708457736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎LTE‎‏‎‎‏‎"</item>
     <item msgid="2947411877551747693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎LTE / WCDMA‎‏‎‎‏‎"</item>
     <item msgid="7723670142495874534">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‎TDSCDMA only‎‏‎‎‏‎"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎NR/LTE‎‏‎‎‏‎"</item>
     <item msgid="5237423971422723128">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎NR/LTE/CDMA/EvDo‎‏‎‎‏‎"</item>
     <item msgid="6856991565745877075">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎NR/LTE/GSM/WCDMA‎‏‎‎‏‎"</item>
-    <item msgid="473436147270962091">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎NR/LTE/CDMA/EvDo/GSM/WCDMA‎‏‎‎‏‎"</item>
+    <item msgid="8908263949185004366">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎Global‎‏‎‎‏‎"</item>
     <item msgid="6692179237956480280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎NR/LTE/WCDMA‎‏‎‎‏‎"</item>
     <item msgid="8160757136163231885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎NR/LTE/TDSCDMA‎‏‎‎‏‎"</item>
     <item msgid="2207530656708814396">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎NR/LTE/TDSCDMA/GSM‎‏‎‎‏‎"</item>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 3146501..ca37379 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎Date &amp; time‎‏‎‎‏‎"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎Set date and time‎‏‎‎‏‎"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎Set date, time, time zone, &amp; formats‎‏‎‎‏‎"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎Use network-provided time‎‏‎‎‏‎"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‎‎Use network-provided time zone‎‏‎‎‏‎"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‏‎Set time automatically‎‏‎‎‏‎"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎Set time zone automatically‎‏‎‎‏‎"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎Use locale default‎‏‎‎‏‎"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎24‑hour format‎‏‎‎‏‎"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‏‏‏‎‎Use 24-hour format‎‏‎‎‏‎"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‎Show profile info on lock screen‎‏‎‎‏‎"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‎‎Accounts‎‏‎‎‏‎"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‎‏‎‎Location‎‏‎‎‏‎"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎Use location‎‏‎‎‏‎"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎Use location‎‏‎‎‏‎"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎Off‎‏‎‎‏‎"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎On - ‎‏‎‎‏‏‎<xliff:g id="COUNT_1">%1$d</xliff:g>‎‏‎‎‏‏‏‎ apps have access to location‎‏‎‎‏‎</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎Screen lock, face unlock‎‏‎‎‏‎"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎Screen lock, fingerprint‎‏‎‎‏‎"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‎Screen lock‎‏‎‎‏‎"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎Unlock your phone securely with your face and fingerprint‎‏‎‎‏‎"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎You can also sign in to apps and confirm payments‎‏‎‎‏‎"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎Set up unlock with:‎‏‎‎‏‎"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎Face unlock‎‏‎‎‏‎"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‏‏‎‏‎‎Make unlocking your phone a breeze‎‏‎‎‏‎"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‏‏‎Fingerprint‎‏‎‎‏‎"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎Save time unlocking phone in your pocket‎‏‎‎‏‎"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎Skip‎‏‎‎‏‎"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‎Next‎‏‎‎‏‎"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‏‎‏‏‎‎Face added‎‏‎‎‏‎"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎Set up face unlock‎‏‎‎‏‎"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎Face unlock‎‏‎‎‏‎"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‎Use your face to authenticate‎‏‎‎‏‎"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎Start‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack.‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎Go back‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎Continue setup‎‏‎‎‏‎"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎Use accessibility setup‎‏‎‎‏‎"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎When using face unlock in apps, always require confirmation step‎‏‎‎‏‎"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎Delete face data‎‏‎‎‏‎"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎Set up face unlock‎‏‎‎‏‎"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎Use face unlock to unlock your device, sign in to apps, and confirm payments.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Keep in mind:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Looking at the phone can unlock it when you don’t intend to.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone else if it’s held up to your face.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone who looks a lot like you, say, an identical sibling.‎‏‎‎‏‎"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‎Use face unlock to unlock your device, sign in to apps, and confirm payments.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Keep in mind:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Looking at the phone can unlock it when you don’t intend to.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone who looks a lot like you, say, an identical sibling.‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎Use face unlock to unlock your device, sign in to apps, and confirm payments.‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎Keep in mind:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Looking at the phone can unlock it when you don’t intend to.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone else if it’s held up to your face.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone who looks a lot like you, say, an identical sibling.‎‏‎‎‏‎"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‎Keep in mind:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Looking at the phone can unlock it when you don’t intend to.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone else if it’s held up to your face, even if your eyes are closed.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Your phone can be unlocked by someone who looks a lot like you, say, an identical sibling.‎‏‎‎‏‎"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎Delete face data?‎‏‎‎‏‎"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‏‎The face data used by face unlock will be permanently and securely deleted. After removal, you will need your PIN, pattern, or password to unlock your phone, sign in to apps, and confirm payments.‎‏‎‎‏‎"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎Use face unlock to unlock your phone‎‏‎‎‏‎"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‎Use your fingerprint to unlock your phone or approve purchases.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Note: You can’t use your fingerprint to unlock this device. For more information, contact your organization’s admin.‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎Use your fingerprint to unlock your phone or approve purchases.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Note: Your fingerprint may be less secure than a strong pattern or PIN.‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎Cancel‎‏‎‎‏‎"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎No thanks‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‎‎‎Continue‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎Skip‎‏‎‎‏‎"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎Next‎‏‎‎‏‎"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel.‎‏‎‎‏‎"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel.‎‏‎‎‏‎"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel.‎‏‎‎‏‎"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‎By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel.‎‏‎‎‏‎"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel.‎‏‎‎‏‎"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‎‎By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel.‎‏‎‎‏‎"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎Skip PIN setup?‎‏‎‎‏‎"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‎Skip password setup?‎‏‎‎‏‎"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‎‎‎Skip pattern setup?‎‏‎‎‏‎"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎Prevent others from using this tablet without your permission by activating device protection features. Choose the screen lock you want to use.‎‏‎‎‏‎"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎Prevent others from using this device without your permission by activating device protection features. Choose the screen lock you want to use.‎‏‎‎‏‎"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock you want to use.‎‏‎‎‏‎"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎Choose your backup screen lock method‎‏‎‎‏‎"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎Choose your backup screen lock method‎‏‎‎‏‎"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎Choose your backup screen lock method‎‏‎‎‏‎"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎Screen lock options‎‏‎‎‏‎"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎Screen lock options‎‏‎‎‏‎"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‎Screen lock‎‏‎‎‏‎"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‎Face unlock + Password‎‏‎‎‏‎"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎Continue without face unlock‎‏‎‎‏‎"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎You can unlock your phone using your face. For security, this option requires a backup screen lock.‎‏‎‎‏‎"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎Biometrics + Pattern‎‏‎‎‏‎"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎Biometrics + PIN‎‏‎‎‏‎"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‎‎‎Biometrics + Password‎‏‎‎‏‎"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎Continue without biometrics‎‏‎‎‏‎"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎You can unlock your phone using your biometrics. For security, this option requires a backup screen lock.‎‏‎‎‏‎"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎Disabled by admin, encryption policy, or credential storage‎‏‎‎‏‎"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎None‎‏‎‎‏‎"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎Swipe‎‏‎‎‏‎"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎Must be fewer than ‎‏‎‎‏‏‎<xliff:g id="NUMBER_0">%d</xliff:g>‎‏‎‎‏‏‏‎ digit‎‏‎‎‏‎</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎Device admin doesn\'t allow using a recent PIN‎‏‎‎‏‎"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‎Common PINs are blocked by your IT admin. Try a different PIN.‎‏‎‎‏‎"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎This can\'t include an invalid character‎‏‎‎‏‎"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎Must contain at least one letter‎‏‎‎‏‎"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎Must contain at least one digit‎‏‎‎‏‎"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎Must contain at least 1 non-numerical character‎‏‎‎‏‎</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‏‏‎Device admin doesn\'t allow using a recent password‎‏‎‎‏‎"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎Common passwords are blocked by your IT admin. Try a different password.‎‏‎‎‏‎"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎Ascending, descending, or repeated sequence of digits isn\'t allowed‎‏‎‎‏‎"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎Confirm‎‏‎‎‏‎"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎Cancel‎‏‎‎‏‎"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‎Turn on Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎Wi‑Fi‎‏‎‎‏‎"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎Use Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎Use Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎Wi‑Fi settings‎‏‎‎‏‎"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎Wi‑Fi‎‏‎‎‏‎"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎Set up &amp; manage wireless access points‎‏‎‎‏‎"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎Center the QR code below to connect to “‎‏‎‎‏‏‎<xliff:g id="SSID">%1$s</xliff:g>‎‏‎‎‏‏‏‎”‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‎‎‎‎‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎Join Wi‑Fi by scanning a QR code‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎Share Wi‑Fi‎‏‎‎‏‎"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎Scan this QR code to connect to “‎‏‎‎‏‏‎<xliff:g id="SSID">%1$s</xliff:g>‎‏‎‎‏‏‏‎” and share the password‎‏‎‎‏‎"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎Scan this QR code with another device to join “‎‏‎‎‏‏‎<xliff:g id="SSID">%1$s</xliff:g>‎‏‎‎‏‏‏‎”‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎Scan this QR code to connect to “‎‏‎‎‏‏‎<xliff:g id="SSID">%1$s</xliff:g>‎‏‎‎‏‏‏‎”‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‎Try again. If the issue continues, contact the device manufacturer‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‎Something went wrong‎‏‎‎‏‎"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎Wi‑Fi password: ‎‏‎‎‏‏‎<xliff:g id="PASSWORD">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‎‎Hotspot password: ‎‏‎‎‏‏‎<xliff:g id="PASSWORD">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‎Auto‑connect‎‏‎‎‏‎"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‎‎Allow phone to automatically connect near this network‎‏‎‎‏‎"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎Allow tablet to automatically connect near this network‎‏‎‎‏‎"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎Allow connection to this network when in range‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎Add device‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎Use a QR code to add a device to this network‎‏‎‎‏‎"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎QR code isn\'t a valid format‎‏‎‎‏‎"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎Use system certificates‎‏‎‎‏‎"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎Do not provide‎‏‎‎‏‎"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎Do not validate‎‏‎‎‏‎"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎No certificate specified. Your connection will not be private.‎‏‎‎‏‎"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‎Network name is too long.‎‏‎‎‏‎"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎Must specify a domain.‎‏‎‎‏‎"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎Certificate required.‎‏‎‎‏‎"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎Connect‎‏‎‎‏‎"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎Wi‑Fi turned on‎‏‎‎‏‎"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎Connected to ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎Connecting to ‎‏‎‎‏‏‎<xliff:g id="NETWORK_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‎Connecting…‎‏‎‎‏‎"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎‎Failed to connect to network‎‏‎‎‏‎"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‎Network not in range‎‏‎‎‏‎"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‎SSID‎‏‎‎‏‎"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎Device MAC address‎‏‎‎‏‎"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎Randomized MAC address‎‏‎‎‏‎"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎Randomized MAC address (last used)‎‏‎‎‏‎"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎IP address‎‏‎‎‏‎"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎Network details‎‏‎‎‏‎"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎Subnet mask‎‏‎‎‏‎"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎IPv6 addresses‎‏‎‎‏‎"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎Saved networks‎‏‎‎‏‎"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎Subscriptions‎‏‎‎‏‎"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‎Other networks‎‏‎‎‏‎"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‏‏‏‎IP settings‎‏‎‎‏‎"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎Wi‑Fi advanced settings are not available for this user‎‏‎‎‏‎"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎‎Save‎‏‎‎‏‎"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎Type a valid gateway address.‎‏‎‎‏‎"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎Type a valid DNS address.‎‏‎‎‏‎"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎Type a network prefix length between 0 and 32.‎‏‎‎‏‎"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‎DNS 1‎‏‎‎‏‎"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‎DNS 2‎‏‎‎‏‎"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎DNS 1 (unless overridden by Private DNS)‎‏‎‎‏‎"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎DNS 2 (unless overridden by Private DNS)‎‏‎‎‏‎"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎Gateway‎‏‎‎‏‎"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎Network prefix length‎‏‎‎‏‎"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎Wi‑Fi Direct‎‏‎‎‏‎"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎App is sharing content. To share internet connection, turn hotspot off, then on‎‏‎‎‏‎"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‎No password set‎‏‎‎‏‎"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‎‏‏‎‏‏‎‎Hotspot name‎‏‎‎‏‎"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎Turning on ‎‏‎‎‏‏‎<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎...‎‏‎‎‏‎"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎Turning on ‎‏‎‎‏‏‎<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎…‎‏‎‎‏‎"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎Other devices can connect to ‎‏‎‎‏‏‎<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‎‎‏‎‎Hotspot password‎‏‎‎‏‎"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎AP Band‎‏‎‎‏‎"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎Smooth Display‎‏‎‎‏‎"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‏‎‎Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage.‎‏‎‎‏‎"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎Smooth Display‎‏‎‎‏‎"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‎Force 90 Hz refresh rate‎‏‎‎‏‎"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎Highest refresh rate for improved touch responsiveness &amp; animation quality. Increases battery usage.‎‏‎‎‏‎"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎Screen attention‎‏‎‎‏‎"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎On / Screen won’t turn off if you’re looking at it‎‏‎‎‏‎"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎When screen is dark, it turns on for new notifications‎‏‎‎‏‎"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎Always show time and info‎‏‎‎‏‎"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‏‎‎‎Increased battery usage‎‏‎‎‏‎"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎Bold Text‎‏‎‎‏‎"</string>
     <string name="title_font_size" msgid="570613010306330622">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎Font size‎‏‎‎‏‎"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎Make text larger or smaller‎‏‎‎‏‎"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎SIM card lock settings‎‏‎‎‏‎"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‏‏‎‏‎‏‏‎Android version‎‏‎‎‏‎"</string>
     <string name="security_patch" msgid="4071756145347865382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎Android security update‎‏‎‎‏‎"</string>
     <string name="model_info" msgid="8997566254717810904">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎Model‎‏‎‎‏‎"</string>
-    <string name="model_summary" msgid="2246651782442466213">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎Model: %1$s‎‏‎‎‏‎"</string>
     <string name="hardware_info" msgid="7035211991066637019">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎Model &amp; hardware‎‏‎‎‏‎"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎Hardware version‎‏‎‎‏‎"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‎Equipment ID‎‏‎‎‏‎"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎Delete APN‎‏‎‎‏‎"</string>
     <string name="menu_new" msgid="6571230342655509006">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‎‎‎‏‏‏‎‎New APN‎‏‎‎‏‎"</string>
     <string name="menu_save" msgid="6611465355127483100">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‎Save‎‏‎‎‏‎"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎Discard‎‏‎‎‏‎"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎Cancel‎‏‎‎‏‎"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‎The Name field can’t be empty.‎‏‎‎‏‎"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎The APN can’t be empty.‎‏‎‎‏‎"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎Apps can be reset‎‏‎‎‏‎"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‎‎‎‎Reset Wi-Fi, mobile &amp; Bluetooth‎‏‎‎‏‎"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎‎This will reset all network settings, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Wi‑Fi‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Mobile data‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Bluetooth‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‎Erase‎‏‎‎‏‎"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎Erase downloaded SIMs‎‏‎‎‏‎"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎To download replacement SIMs, contact your carrier. This won’t cancel any mobile service plans.‎‏‎‎‏‎"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎This won’t cancel any mobile service plans. To download replacement SIMs, contact your carrier.‎‏‎‎‏‎"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎Reset settings‎‏‎‎‏‎"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‏‎‎‏‎Reset all network settings? You can’t undo this action.‎‏‎‎‏‎"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎Reset all network settings and erase downloaded SIMs? You can’t undo this action.‎‏‎‎‏‎"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎Network settings have been reset‎‏‎‎‏‎"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎Can’t erase SIMs‎‏‎‎‏‎"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎Downloaded SIMs can’t be erased due to an error.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Restart your device and try again.‎‏‎‎‏‎"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‎Erase all data (factory reset)‎‏‎‎‏‎"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎Erase all data (factory reset)‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎This will erase all data from your tablet’s ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎internal storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Your Google Account‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎System and app data and settings‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Downloaded apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‎‏‏‎This will erase all data from your phone’s ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎internal storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Your Google Account‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎System and app data and settings‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Downloaded apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You are currently signed into the following accounts:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎There are other users present on this device.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Music‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Photos‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Other user data‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎eSIMs‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This will not cancel your mobile service plan.‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To clear music, pictures, and other user data, the ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎USB storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ needs to be erased.‎‏‎‎‏‎"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To clear music, pictures, and other user data, the ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎SD card‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ needs to be erased.‎‏‎‎‏‎"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎Erase all data (factory reset)‎‏‎‎‏‎"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‎Erase all data (factory reset)‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‎‏‎This will erase all data from your tablet’s ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎internal storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Your Google Account‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎System and app data and settings‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Downloaded apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‎‏‎‏‏‏‎This will erase all data from your phone’s ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎internal storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎, including:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Your Google Account‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎System and app data and settings‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Downloaded apps‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You are currently signed into the following accounts:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎There are other users present on this device.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Music‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Photos‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎Other user data‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎"<li>"‎‏‎‎‏‏‏‎eSIMs‎‏‎‎‏‏‎"</li>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This will not cancel your mobile service plan.‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To clear music, pictures, and other user data, the ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎USB storage‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ needs to be erased.‎‏‎‎‏‎"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To clear music, pictures, and other user data, the ‎‏‎‎‏‏‎"<b>"‎‏‎‎‏‏‏‎SD card‎‏‎‎‏‏‎"</b>"‎‏‎‎‏‏‏‎ needs to be erased.‎‏‎‎‏‎"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎Erase USB storage‎‏‎‎‏‎"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎Erase SD card‎‏‎‎‏‎"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎Erase all the data on the internal USB storage, such as music or photos‎‏‎‎‏‎"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‎Erase all the data on the SD card, such as music or photos‎‏‎‎‏‎"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎Erase all data‎‏‎‎‏‎"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎Erase all data‎‏‎‎‏‎"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎All of your personal information and downloaded apps will be deleted. You can’t undo this action.‎‏‎‎‏‎"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action.‎‏‎‎‏‎"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎Erase everything‎‏‎‎‏‎"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎No reset was performed because the System Clear service isn’t available.‎‏‎‎‏‎"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‎Erase all data?‎‏‎‎‏‎"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎Factory reset is not available for this user‎‏‎‎‏‎"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎Erasing‎‏‎‎‏‎"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‎Please wait...‎‏‎‎‏‎"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‎Erase all data‎‏‎‎‏‎"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‎Erase all data‎‏‎‎‏‎"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‎All of your personal information and downloaded apps will be deleted. You can’t undo this action.‎‏‎‎‏‎"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can’t undo this action.‎‏‎‎‏‎"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‎Erase all data?‎‏‎‎‏‎"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎Factory reset is not available for this user‎‏‎‎‏‎"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎Erasing‎‏‎‎‏‎"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎Please wait…‎‏‎‎‏‎"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎Call settings‎‏‎‎‏‎"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎Set up voicemail, call forwarding, call waiting, caller ID‎‏‎‎‏‎"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎USB tethering‎‏‎‎‏‎"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎Can’t tether to more than ‎‏‎‎‏‏‎<xliff:g id="MAXCONNECTION">%1$d</xliff:g>‎‏‎‎‏‏‏‎ devices.‎‏‎‎‏‎"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ will be untethered.‎‏‎‎‏‎"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎Ethernet tethering‎‏‎‎‏‎"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‎‏‎‎‎‏‏‏‎Share phone’s internet connection via USB Ethernet‎‏‎‎‏‎"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎Share phone’s internet connection via Ethernet‎‏‎‎‏‎"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎Use hotspot and tethering to provide internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices.‎‏‎‎‏‎"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎Use hotspot and tethering to provide internet to other devices through your Wi‑Fi or mobile data connection. Apps can also create a hotspot to share content with nearby devices.‎‏‎‎‏‎"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‎Help‎‏‎‎‏‎"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎Bluetooth scanning‎‏‎‎‏‎"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‎Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services.‎‏‎‎‏‎"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎Location services for work‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‎‏‎Location time zone detection‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎Location time zone detection‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎Allows the device’s location to be used to detect the current time zone. Other location settings such as Wi‑Fi scanning can affect the accuracy of time zone detection.‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎On‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‏‏‎‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎Off‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎Automatic time zone detection is disabled‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‎Location time zone detection is disabled‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎Location time zone detection is not supported‎‏‎‎‏‎"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‏‎Location time zone detection changes are not allowed‎‏‎‎‏‎"</string>
     <string name="location_network_based" msgid="5247042890080021887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎Wi‑Fi &amp; mobile network location‎‏‎‎‏‎"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎Let apps use Google’s location service to estimate your location faster. Anonymous location data will be collected and sent to Google.‎‏‎‎‏‎"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‎‏‎Location determined by Wi‑Fi‎‏‎‎‏‎"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎To use face unlock, set password‎‏‎‎‏‎"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎To use face unlock, set pattern‎‏‎‎‏‎"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‎To use face unlock, set PIN‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎To use biometrics, set password‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‏‎To use biometrics, set pattern‎‏‎‎‏‎"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‎‎‎‎‎‏‎‏‎To use biometrics, set PIN‎‏‎‎‏‎"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎Forgot your password?‎‏‎‎‏‎"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎Forgot your pattern?‎‏‎‎‏‎"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎Forgot your PIN?‎‏‎‎‏‎"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎Caption preferences‎‏‎‎‏‎"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‏‎Magnification‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‎‏‎Magnification area‎‏‎‎‏‎"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‏‎‎‎Magnification enable‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎Choose the magnification area(s) you want to use when magnifying the screen‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎Full screen‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎Part of screen‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎Full screen &amp; part of screen‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‎Magnify entire screen‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‎‎Magnify part of screen‎‏‎‎‏‎"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎Switch to accessibility button?‎‏‎‎‏‎"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Do you want to switch to using accessibility button to magnify?‎‏‎‎‏‎"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎Switch to accessibility button‎‏‎‎‏‎"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎Keep triple tap to magnify‎‏‎‎‏‎"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‏‎Magnification settings‎‏‎‎‏‎"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎Magnify with triple-tap‎‏‎‎‏‎"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‎Magnify with shortcut‎‏‎‎‏‎"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎Power button ends call‎‏‎‎‏‎"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎Large mouse pointer‎‏‎‎‏‎"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‎Remove animations‎‏‎‎‏‎"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎Mono audio‎‏‎‎‏‎"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‏‎Combine channels when playing audio‎‏‎‎‏‎"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‏‎Audio balance‎‏‎‎‏‎"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎Left‎‏‎‎‏‎"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎Right‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‎Mono audio‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎Combine channels when playing audio‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎Audio balance‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎Left‎‏‎‎‏‎"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‏‎Right‎‏‎‎‏‎"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‎‎Default‎‏‎‎‏‎"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‎‎10 seconds‎‏‎‎‏‎"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‏‏‎‏‏‎‎‎30 seconds‎‏‎‎‏‎"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎Notification vibration‎‏‎‎‏‎"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‎Ring vibration‎‏‎‎‏‎"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎Touch feedback‎‏‎‎‏‎"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎Use ‎‏‎‎‏‏‎<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎Open ‎‏‎‎‏‏‎<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎Use color correction‎‏‎‎‏‎"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎Show captions‎‏‎‎‏‎"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎For supported app only‎‏‎‎‏‎"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎Use ‎‏‎‎‏‏‎<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎Open ‎‏‎‎‏‏‎<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎Use color correction‎‏‎‎‏‎"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‏‎‏‎‎Show captions‎‏‎‎‏‎"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎For supported app only‎‏‎‎‏‎"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‎‏‏‏‏‎Caption size and style‎‏‎‎‏‎"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>‎‏‎‎‏‏‏‎ text size‎‏‎‎‏‎"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎More options‎‏‎‎‏‎"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎Deuteranomaly‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎Protanomaly‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎Tritanomaly‎‏‎‎‏‎"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎Grayscale‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‎Red-green‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎Red-green‎‏‎‎‏‎"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‏‎Blue-yellow‎‏‎‎‏‎"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‎Background restriction‎‏‎‎‏‎"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎Allow the app to run in the background‎‏‎‎‏‎"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‎‎App not allowed to run in background‎‏‎‎‏‎"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‎Background usage can’t be restricted‎‏‎‎‏‎"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‎Background usage can’t be restricted‎‏‎‎‏‎"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎Limit background activity?‎‏‎‎‏‎"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎If you limit background activity for an app, it may misbehave‎‏‎‎‏‎"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎Since this app is not set to optimize battery, you can’t restrict it.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To restrict the app, first turn on battery optimization.‎‏‎‎‏‎"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎Tablet used more than usual‎‏‎‎‏‎"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎Device used more than usual‎‏‎‎‏‎"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎Battery may run out earlier than usual‎‏‎‎‏‎"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎Optimizing for battery health‎‏‎‎‏‎"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‎‏‎Battery limited temporarily. Tap to learn more.‎‏‎‎‏‎"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎Your phone has been used more than usual. Your battery may run out sooner than expected.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Top apps by battery usage:‎‏‎‎‏‎"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‎Your tablet has been used more than usual. Your battery may run out sooner than expected.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Top apps by battery usage:‎‏‎‎‏‎"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎Your device has been used more than usual. Your battery may run out sooner than expected.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Top apps by battery usage:‎‏‎‎‏‎"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎%1$d app restricted‎‏‎‎‏‎</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">^1</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"<small>"‎‏‎‎‏‏‏‎ ‎‏‎‎‏‏‎"<font size="20">"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="UNIT">%</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"</font>"‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎"</small>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎Problem reading your battery meter‎‏‎‎‏‎"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎Problem reading your battery meter. Tap to ‎‏‎‎‏‏‎"<annotation id="url">"‎‏‎‎‏‏‏‎learn more‎‏‎‎‏‏‎"</annotation>"‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‏‎‏‏‏‎Stop app?‎‏‎‎‏‎"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‏‏‎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="426862716783569739">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎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>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‎Set a schedule‎‏‎‎‏‎"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎Extend battery life‎‏‎‎‏‎"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‏‎Turn off when charged‎‏‎‎‏‎"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎Battery Saver turns off when your phone is at ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‎‏‎‏‏‏‎‎‎‎Battery Saver turns off when your tablet is at ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎Battery Saver turns off when your device is at ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎Battery Saver turns off when your phone charges above ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎Battery Saver turns off when your tablet charges above ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎Battery Saver turns off when your device charges above ‎‏‎‎‏‏‎<xliff:g id="PERCENT">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎Turn on‎‏‎‎‏‎"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎Reset‎‏‎‎‏‎"</string>
     <string name="tts_play" msgid="2945513377250757221">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎Play‎‏‎‎‏‎"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‎VPN‎‏‎‎‏‎"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‎‎Adaptive connectivity‎‏‎‎‏‎"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎Extends battery life and improves device performance by automatically managing your network connections‎‏‎‎‏‎"</string>
     <string name="credentials_title" msgid="7535942196886123656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎Credential storage‎‏‎‎‏‎"</string>
     <string name="credentials_install" msgid="3933218407598415827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎Install a certificate‎‏‎‎‏‎"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎Install certificates from storage‎‏‎‎‏‎"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎User credentials‎‏‎‎‏‎"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎View and modify stored credentials‎‏‎‎‏‎"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎Advanced‎‏‎‎‏‎"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎Storage type‎‏‎‎‏‎"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎‏‎‎‎Hardware-backed‎‏‎‎‏‎"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎Software only‎‏‎‎‏‎"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‎‎‎‎‎Credentials are not available for this user‎‏‎‎‏‎"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‎‎Installed for VPN and apps‎‏‎‎‏‎"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‎‎‏‏‎‎Installed for Wi-Fi‎‏‎‎‏‎"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎Don’t install‎‏‎‎‏‎"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎Install anyway‎‏‎‎‏‎"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‏‎‎Certificate not installed‎‏‎‎‏‎"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎Allow ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%s</xliff:g>‎‏‎‎‏‏‏‎ to install certificates on this device?‎‏‎‎‏‎"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‎‏‎‎‎‎‎These certificates will identify you to the apps and URLs below‎‏‎‎‏‎"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎Don’t allow‎‏‎‎‏‎"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎Allow‎‏‎‎‏‎"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎Show more‎‏‎‎‏‎"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎Certificate management app‎‏‎‎‏‎"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‎‏‎None‎‏‎‎‏‎"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‏‎‎‎Certificates installed by this app identify you to the apps and URLs below‎‏‎‎‏‎"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎Remove‎‏‎‎‏‎"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎Emergency dialing signal‎‏‎‎‏‎"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‎Set behavior when an emergency call is placed‎‏‎‎‏‎"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎Backup‎‏‎‎‏‎"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‎‎Not set up - Work profile‎‏‎‎‏‎"</string>
     <string name="user_admin" msgid="4024553191395768119">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎Admin‎‏‎‎‏‎"</string>
     <string name="user_you" msgid="3070562015202859996">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎You (‎‏‎‎‏‏‎<xliff:g id="NAME">%s</xliff:g>‎‏‎‎‏‏‏‎)‎‏‎‎‏‎"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎Nickname‎‏‎‎‏‎"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎You can add up to ‎‏‎‎‏‏‎<xliff:g id="USER_COUNT">%1$d</xliff:g>‎‏‎‎‏‏‏‎ users‎‏‎‎‏‎"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‎‏‎Only the tablet’s owner can manage users.‎‏‎‎‏‎"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‎‎‏‏‎‎Only the phone’s owner can manage users.‎‏‎‎‏‎"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎Paying at the terminal‎‏‎‎‏‎"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‎‎‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol.‎‏‎‎‏‎"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎Got it‎‏‎‎‏‎"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎More...‎‏‎‎‏‎"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎More…‎‏‎‎‏‎"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎Set default payment app‎‏‎‎‏‎"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎Update default payment app‎‏‎‎‏‎"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‏‎‏‏‎‏‎‏‎‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎At a contactless terminal, pay with ‎‏‎‎‏‏‎<xliff:g id="APP">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎Back‎‏‎‎‏‎"</string>
     <string name="wizard_next" msgid="3884832431439072471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‏‎Next‎‏‎‎‏‎"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‏‏‏‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎Finish‎‏‎‎‏‎"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‏‎‎‏‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎Take a photo‎‏‎‎‏‎"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‎‏‎‏‏‎‎Choose an image‎‏‎‎‏‎"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‏‏‏‎Select photo‎‏‎‎‏‎"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‏‏‎SIM cards‎‏‎‎‏‎"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‏‏‏‎‏‏‎SIM cards‎‏‎‎‏‎"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‏‎Always use this for calls‎‏‎‎‏‎"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎Select a SIM for data‎‏‎‎‏‎"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‏‎Select a SIM for SMS‎‏‎‎‏‎"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎Switching data SIM, this may take up to a minute...‎‏‎‎‏‎"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎Switching data SIM, this may take up to a minute…‎‏‎‎‏‎"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎Call with‎‏‎‎‏‎"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎Select a SIM card‎‏‎‎‏‎"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎SIM ‎‏‎‎‏‏‎<xliff:g id="CARD_NUMBER">%1$d</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‏‎‎routine, schedule, battery saver, power saver, battery, automatic, percent‎‏‎‎‏‎"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎volte, advanced calling, 4g calling‎‏‎‎‏‎"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎add language, add a language‎‏‎‎‏‎"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎text size‎‏‎‎‏‎"</string>
     <string name="default_sound" msgid="6604374495015245195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎Default sound‎‏‎‎‏‎"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‎Ring &amp; notification volume at ‎‏‎‎‏‏‎<xliff:g id="PERCENTAGE">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎Volume, vibration, Do Not Disturb‎‏‎‎‏‎"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‏‏‏‎Power on sounds‎‏‎‎‏‎"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‎‏‏‏‎Live Caption‎‏‎‎‏‎"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‎Automatically caption media‎‏‎‎‏‎"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‎‏‎None‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="ON_COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ schedules set‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎1 schedule set‎‏‎‎‏‎</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎None‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎1 schedule set‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‏‎# schedules set‎‏‎‎‏‎}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‎Do Not Disturb‎‏‎‎‏‎"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎Only get notified by important people and apps‎‏‎‎‏‎"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‎Limit interruptions‎‏‎‎‏‎"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‎‎Priority only‎‏‎‎‏‎"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="ZEN_MODE">%1$s</xliff:g>‎‏‎‎‏‏‏‎. ‎‏‎‎‏‏‎<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎On / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‎Off / ‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎Off‎‏‎‎‏‎"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‎‏‎‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎On‎‏‎‎‏‎"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎Ask every time‎‏‎‎‏‎"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‏‎‎Until you turn off‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUM_HOURS">%d</xliff:g>‎‏‎‎‏‏‏‎ hours‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‎1 hour‎‏‎‎‏‎</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎<xliff:g id="NUM_MINUTES">%d</xliff:g>‎‏‎‎‏‏‏‎ minutes‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="ON_COUNT">%d</xliff:g>‎‏‎‎‏‏‏‎ schedules can turn on automatically‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎‏‎‎‎1 schedule can turn on automatically‎‏‎‎‏‎</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎1 hour‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‏‎‎‎# hours‎‏‎‎‏‎}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎1 minute‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‏‎# minutes‎‏‎‎‏‎}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎Off‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎Off / 1 schedule can turn on automatically‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎‎‎Off / # schedules can turn on automatically‎‏‎‎‏‎}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‎What can interrupt Do Not Disturb‎‏‎‎‏‎"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎People‎‏‎‎‏‎"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‏‎‏‎‏‎Apps‎‏‎‎‏‎"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎Automatically set lower priority notifications to Gentle‎‏‎‎‏‎"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‎Adaptive notification ranking‎‏‎‎‏‎"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‎‎Automatically rank notifications by relevance‎‏‎‎‏‎"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎Adaptive notification feedback‎‏‎‎‏‎"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎Indicate adjustments made to notifications and show the option to provide feedback to the system‎‏‎‎‏‎"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎Reset notification importance‎‏‎‎‏‎"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‏‎Reset user changed importance settings and allow notification assistant to prioritize‎‏‎‎‏‎"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‏‎Suggested actions and replies‎‏‎‎‏‎"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‎Automatically show suggested actions &amp; replies‎‏‎‎‏‎"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‏‏‎‎‎Show recent and snoozed notifications‎‏‎‎‏‎"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‎‏‏‏‎‎‎‎‏‎‎‏‎Priority conversations‎‏‎‎‏‎"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‎‎Show at top of conversation section and appear as floating bubbles‎‏‎‎‏‎"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‎Show at top of conversation section‎‏‎‎‏‎"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎Other conversations‎‏‎‎‏‎"</string>
+    <string name="other_conversations" msgid="551178916855139870">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‎‎‎‏‏‏‏‎‎Non-priority conversations‎‏‎‎‏‎"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‎‏‏‎‎‎‏‎Conversations you’ve made changes to‎‏‎‎‏‎"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎Recent conversations‎‏‎‎‏‎"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‎Clear recents‎‏‎‎‏‎"</string>
+    <string name="clear" msgid="5092178335409471100">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‏‏‏‎‎‎Clear‎‏‎‎‏‎"</string>
     <string name="important_bubble" msgid="7911698275408390846">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎Bubble priority conversations‎‏‎‎‏‎"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‎Priority conversations show at the top of the pull-down shade. You can also set them to bubble and interrupt Do Not Disturb.‎‏‎‎‏‎"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‎Priority and modified conversations will appear here‎‏‎‎‏‎"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‏‎Do Not Disturb access‎‏‎‎‏‎"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎Allow Do Not Disturb‎‏‎‎‏‎"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‏‎‏‏‎‎‎‎No installed apps have requested Do Not Disturb access‎‏‎‎‏‎"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎Loading apps...‎‏‎‎‏‎"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‎‎‏‎Loading apps…‎‏‎‎‏‎"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎At your request, Android is blocking this app\'s notifications from appearing on this device‎‏‎‎‏‎"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‏‏‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎At your request, Android is blocking this category of notifications from appearing on this device‎‏‎‎‏‎"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‎‏‏‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‎‎‎At your request, Android is blocking this group of notifications from appearing on this device‎‏‎‎‏‎"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎All conversations‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎Priority conversations‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‎‏‏‏‏‎‏‎None‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‏‎<xliff:g id="CONVERSATIONS">%d</xliff:g>‎‏‎‎‏‏‏‎ conversations‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎1 conversation‎‏‎‎‏‎</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‏‏‏‎None‎‏‎‎‏‎"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎None‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎1 conversation‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‏‎# conversations‎‏‎‎‏‎}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‎‎‏‎‏‎‎‏‏‏‏‎‎Who can interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎Calls‎‏‎‎‏‎"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‎Calls‎‏‎‎‏‎"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‎‏‏‏‏‏‏‏‎‏‏‎To make sure allowed calls make sound, check that device is set to ring‎‏‎‎‏‎"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‎‎‎‏‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎For ‘‎‏‎‎‏‏‎<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎’ incoming calls are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.‎‏‎‎‏‎"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎Starred contacts‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUM_PEOPLE">%d</xliff:g>‎‏‎‎‏‏‏‎ others‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‎‏‎1 other‎‏‎‎‏‎</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‎None‎‏‎‎‏‎"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎None‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎{contact_1}‎‏‎‎‏‏‏‎‎‏‎‎‏‎}=2{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎{contact_1}‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎{contact_2}‎‏‎‎‏‏‏‎‎‏‎‎‏‎}=3{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎{contact_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{contact_2}‎‏‎‎‏‏‏‎, and ‎‏‎‎‏‏‎{contact_3}‎‏‎‎‏‏‏‎‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎{contact_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{contact_2}‎‏‎‎‏‏‏‎, and # others‎‏‎‎‏‎}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎(No name)‎‏‎‎‏‎"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‎Messages‎‏‎‎‏‎"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‎‏‎‎messages‎‏‎‎‏‎"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‏‎‎‏‏‎‏‎‎‎‏‎‏‎‏‏‏‎‎‎‎‏‎‏‎Messages‎‏‎‎‏‎"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎For ‘‎‏‎‎‏‏‎<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎’ incoming messages are blocked. You can adjust settings to allow your friends, family, or other contacts to reach you.‎‏‎‎‏‎"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‏‎‎‎‎‎‏‏‏‏‎‎‎‏‏‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‎‎All messages can reach you‎‏‎‎‏‎"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎All calls can reach you‎‏‎‎‏‎"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‏‏‎‏‎None‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUM_CONTACTS">%d</xliff:g>‎‏‎‎‏‏‏‎ contacts‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎1 contact‎‏‎‎‏‎</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎None‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎1 contact‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎# contacts‎‏‎‎‏‎}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎‎‎‏‏‏‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‏‏‏‎‎Anyone‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‎‎Contacts‎‏‎‎‏‎"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‎Starred contacts‎‏‎‎‏‎"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‎‎‎‎‎All notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎Some notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‎Selected people can still reach you, even if you don’t allow apps to interrupt‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="APP_NAMES">%s</xliff:g>‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‏‎<xliff:g id="APP_NAME_0">%s</xliff:g>‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%d</xliff:g>‎‏‎‎‏‏‏‎ more‎‏‎‎‏‎"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎No apps can interrupt‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎{app_1}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}=2{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎{app_1}‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎{app_2}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}=3{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎{app_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{app_2}‎‏‎‎‏‏‏‎, and ‎‏‎‎‏‏‎{app_3}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‎‎‎‎‏‎‏‏‎‎‎‏‎‎‏‏‎{app_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{app_2}‎‏‎‎‏‏‏‎, and # more can interrupt‎‏‎‎‏‎}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎Apps‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‎‎‎All notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‎Some notifications‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‏‎Notifications that can interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‏‎‏‏‎‎‎‎‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎Allow all notifications‎‏‎‎‏‎"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎</item>
-      <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎<xliff:g id="SOUND_CATEGORY">%s</xliff:g>‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‏‎‎‏‏‎‎‎‏‏‏‎‎Nothing can interrupt‎‏‎‎‏‎"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="NUMBER">%d</xliff:g>‎‏‎‎‏‏‏‎ more‎‏‎‎‏‎"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎Nothing can interrupt‎‏‎‎‏‎}=1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎{sound_category_1}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}=2{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎{sound_category_1}‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎{sound_category_2}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}=3{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎{sound_category_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{sound_category_2}‎‏‎‎‏‏‏‎, and ‎‏‎‎‏‏‎{sound_category_3}‎‏‎‎‏‏‏‎ can interrupt‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎{sound_category_1}‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎{sound_category_2}‎‏‎‎‏‏‏‎, and # more can interrupt‎‏‎‎‏‎}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‎‏‏‎‏‏‎‎‎Nothing can interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎No one can interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‎‏‎‎‏‎Some people can interrupt‎‏‎‎‏‎"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‎‎‏‎‏‏‎‏‏‎‎‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‏‎‏‎All people can interrupt‎‏‎‎‏‎"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‏‏‎‎‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‎‏‎On‎‏‎‎‏‎"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎Off‎‏‎‎‏‎"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎App pinning‎‏‎‎‏‎"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎When an app is pinned, the pinned app may open other apps and personal data may be accessible. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To use app pinning: 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎1.	Turn on app pinning 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎2.	Open Overview 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎3.	Tap the app icon at the top of the screen, then tap Pin‎‏‎‎‏‎"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‎‎App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎When an app is pinned, the pinned app may open other apps and personal data may be accessible. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If you want to securely share your device with someone, try using a guest user instead. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To use app pinning: 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎1.	Turn on app pinning 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎2.	Open Overview 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎3.	Tap the app icon at the top of the screen, then tap Pin‎‏‎‎‏‎"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‎‎‎‎‏‏‏‎‏‎‏‎‏‎App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game.‎‏‎‎‏‎"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‎‎‏‏‎‎‎When an app is pinned, the pinned app may open other apps and personal data may be accessible. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To use app pinning: 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎1.	Turn on app pinning 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎2.	Open Overview 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎3.	Tap the app icon at the top of the screen, then tap Pin‎‏‎‎‏‎"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‏‏‏‎‎When an app is pinned, the pinned app may open other apps and personal data may be accessible. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎If you want to securely share your device with someone, try using a guest user instead. ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎To use app pinning: 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎1.	Turn on app pinning 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎2.	Open Overview 	‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎3.	Tap the app icon at the top of the screen, then tap Pin‎‏‎‎‏‎"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎When app is pinned: ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎•		Personal data may be accessible ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎		(such as contacts and email content) ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎•		Pinned app may open other apps ‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Only use app pinning with people you trust.‎‏‎‎‏‎"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎Ask for unlock pattern before unpinning‎‏‎‎‏‎"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‏‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‏‏‏‏‏‏‎Ask for PIN before unpinning‎‏‎‎‏‎"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‎‎‏‏‎‏‎‎‏‎‏‎‏‎‏‎‎‎‎‎‏‎In addition to using your face to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This helps protect data on lost or stolen devices. Require PIN to start your device?‎‏‎‎‏‎"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎In addition to using your face to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This helps protect data on lost or stolen devices. Require pattern to start your device?‎‏‎‎‏‎"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‏‏‏‎‏‏‏‎‏‎‏‏‎‏‎In addition to using your face to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This helps protect data on lost or stolen devices. Require password to start your device?‎‏‎‎‏‎"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎In addition to using your biometrics to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This helps protect data on lost or stolen devices. Require PIN to start your device?‎‏‎‎‏‎"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‏‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎In addition to using your biometrics to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This helps protect data on lost or stolen devices. Require pattern to start your device?‎‏‎‎‏‎"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎In addition to using your biometrics to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages, or notifications, including alarms.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎This helps protect data on lost or stolen devices. Require password to start your device?‎‏‎‎‏‎"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‏‏‎‏‏‎‏‎‏‏‎‏‎‏‎Yes‎‏‎‎‏‎"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎No‎‏‎‎‏‎"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‎‎‎‏‎‏‏‎‎‎Restricted‎‏‎‎‏‎"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‏‎USB controlled by‎‏‎‎‏‎"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‎‏‏‏‏‎Connected device‎‏‎‎‏‎"</string>
     <string name="usb_control_device" msgid="527916783743021577">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎This device‎‏‎‎‏‎"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎Switching...‎‏‎‎‏‎"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎Switching…‎‏‎‎‏‎"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‎Couldn\'t switch‎‏‎‎‏‎"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‏‎‎Charging this device‎‏‎‎‏‎"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‏‏‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎Charging connected device‎‏‎‎‏‎"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎Mobile data usage‎‏‎‎‏‎"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‎App data usage‎‏‎‎‏‎"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‎Wi‑Fi data usage‎‏‎‎‏‎"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‏‎‎‎‏‏‎Non-carrier data usage‎‏‎‎‏‎"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎Ethernet data usage‎‏‎‎‏‎"</string>
     <string name="wifi" msgid="2932584495223243842">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‎‎‏‎‎‎‎‏‎‎Wi-Fi‎‏‎‎‏‎"</string>
     <string name="ethernet" msgid="4665162609974492983">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎Ethernet‎‏‎‎‏‎"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎1 restriction‎‏‎‎‏‎</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‏‎‏‏‎Carrier data accounting may differ from device accounting‎‏‎‎‏‎"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎Excludes data that is used by carrier networks‎‏‎‎‏‎"</string>
     <string name="data_used_template" msgid="8229342096562327646">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎<xliff:g id="ID_1">%1$s</xliff:g>‎‏‎‎‏‏‏‎ used‎‏‎‎‏‎"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‏‏‎‎Set data warning‎‏‎‎‏‎"</string>
     <string name="data_warning" msgid="2925054658166062884">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‎‎‎Data warning‎‏‎‎‏‎"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎View details‎‏‎‎‏‎"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‎Data Saver‎‏‎‎‏‎"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎Unrestricted data‎‏‎‎‏‎"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎Background data is turned off‎‏‎‎‏‎"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‎‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‎‎‏‎‏‏‎‎‎‎Background data is turned off‎‏‎‎‏‎"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎On‎‏‎‎‏‎"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‎‏‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎Off‎‏‎‎‏‎"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎Use Data Saver‎‏‎‎‏‎"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎If device is locked, prevent typing replies or other text in notifications‎‏‎‎‏‎"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‏‎Default spell checker‎‏‎‎‏‎"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‏‎‎‎‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‎‏‎‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎Choose spell checker‎‏‎‎‏‎"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‎‎‏‎‎‏‏‎Use spell checker‎‏‎‎‏‎"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎Use spell checker‎‏‎‎‏‎"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‎Not selected‎‏‎‎‏‎"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‏‏‎‏‏‎(none)‎‏‎‎‏‎"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‎‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‎‎‏‏‎‏‏‎‏‏‏‎‏‎‏‎‏‎‏‏‎‎‎‏‏‏‏‏‎‏‎: ‎‏‎‎‏‎ "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‎‎‏‎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="5077286114860539367">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‎‎‏‏‏‎Remove photos &amp; videos‎‏‎‎‏‎"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‎Storage manager‎‏‎‎‏‎"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎‏‎Use Storage manager‎‏‎‎‏‎"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‏‎‏‎‏‎‎Use Storage manager‎‏‎‎‏‎"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‎Automatic‎‏‎‎‏‎"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎Manual‎‏‎‎‏‎"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‎Free up space now‎‏‎‎‏‎"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‎‎‏‏‏‏‎‎‏‎‎‎Double-tap to check phone‎‏‎‎‏‎"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‎Double-tap to check tablet‎‏‎‎‏‎"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‏‎‏‎‎‏‎‎Double-tap to check device‎‏‎‎‏‎"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‏‏‎‎‎Swipe for notifications‎‏‎‎‏‎"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‎Swipe down on the bottom edge of the screen to show your notifications‎‏‎‎‏‎"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‎‏‏‎‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‎‏‎One-Handed mode‎‏‎‎‏‎"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‎‏‏‎‎‎‏‏‎Use one-handed mode‎‏‎‎‏‎"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‎‎‏‏‏‎Exit when switching apps‎‏‎‎‏‎"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‏‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎Timeout‎‏‎‎‏‎"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‏‎‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‏‎‎‏‏‎4 seconds‎‏‎‎‏‎"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‎‎‎‏‏‏‎‏‎‏‎‎8 seconds‎‏‎‎‏‎"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎12 seconds‎‏‎‎‏‎"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎‏‎‏‎reachability‎‏‎‎‏‎"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎‏‏‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‎‎To check time, notifications, and other info, double-tap your screen.‎‏‎‎‏‎"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‏‎‎‎Lift to check phone‎‏‎‎‏‎"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‏‏‎‏‏‏‎‎‏‎Lift to check tablet‎‏‎‎‏‎"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‎‎‎‎Tap to check tablet‎‏‎‎‏‎"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎Tap to check device‎‏‎‎‏‎"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‏‎‎‏‎‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎To check time, notifications, and other info, tap your screen.‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎Emergency SOS‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎Use emergency SOS‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‎‎‏‎‎Managed by ‎‏‎‎‏‏‎<xliff:g id="APP_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‎‎‎‏‎‎‎‎‏‎‎‎‎Start the actions below by pressing the power button quickly 5 times or more‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎Play countdown alarm‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‎‎‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎‏‏‎Play a loud sound before notifying for help‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‎‏‏‏‏‏‎‎‏‏‎‏‏‏‎‎Call for help‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‎‏‎Number to call for help‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‏‏‎<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>‎‏‎‎‏‏‏‎. Tap to change‎‏‎‎‏‎"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‎‎‎‏‎‏‎If you enter a non-emergency number:‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ • Your device must be unlocked to use emergency SOS‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎ • Your call may not be answered‎‏‎‎‏‎"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‏‎‎‏‎Swipe fingerprint for notifications‎‏‎‎‏‎"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‏‏‎‏‎‎Swipe fingerprint‎‏‎‎‏‎"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‎To check your notifications, swipe down on the fingerprint sensor on the back of your phone.‎‏‎‎‏‎"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎Max visible datasets‎‏‎‎‏‎"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎‎‎‎Reset to default values‎‏‎‎‏‎"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‏‎‏‎‏‎Autofill developer options have been reset‎‏‎‎‏‎"</string>
+    <string name="location_category" msgid="3496759112306219062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‎‏‏‎‎Location‎‏‎‎‏‎"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎Status bar location indicator‎‏‎‎‏‎"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‎‎‎‏‎‏‎‎‎‏‎‏‎‎‎‎‏‏‎‎‏‎‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‎‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‎‏‎Show for all locations, including network and connectivity‎‏‎‎‏‎"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‎Force full GNSS measurements‎‏‎‎‏‎"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎Track all GNSS constellations and frequencies with no duty cycling‎‏‎‎‏‎"</string>
     <string name="device_theme" msgid="5027604586494772471">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‏‏‎Device theme‎‏‎‎‏‎"</string>
     <string name="default_theme" msgid="4815428567082263639">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‏‎Default‎‏‎‎‏‎"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‏‎‎‎Network name‎‏‎‎‏‎"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‎‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‎Pause notifications to stay focused‎‏‎‎‏‎"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‏‏‏‎‏‎‎‏‏‎Feature not available‎‏‎‎‏‎"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‏‎‏‏‎‏‎‎‎‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‎This feature has been turned off because it slows down your phone‎‏‎‎‏‎"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‎Force full GNSS measurements‎‏‎‎‏‎"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‏‎Track all GNSS constellations and frequencies with no duty cycling‎‏‎‎‏‎"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‏‏‎‎‎‎‎‏‏‏‎‎‎‎‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‎‏‏‎‏‎Always show crash dialog‎‏‎‎‏‎"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‎‏‎‏‎‎‏‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‎Show dialog every time an app crashes‎‏‎‎‏‎"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‎Select ANGLE enabled app‎‏‎‎‏‎"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‏‏‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎Enable for all apps‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‏‎‏‏‎‏‎‎‏‎Select Graphics Driver‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‎‏‏‏‏‎‎‎‎‎‏‏‎‎‏‏‏‏‎‎‎‎‏‏‏‏‎Default‎‏‎‎‏‎"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎Game Driver‎‏‎‎‏‎"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‎‎‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‎‎‎‏‏‎Game Driver‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‏‏‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‎‎Developer Driver‎‏‎‎‏‎"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎System Graphics Driver‎‏‎‎‏‎"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‏‏‏‎‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‏‎‎‎‎On (mute)‎‏‎‎‏‎"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‏‎‎‎‎‎Off‎‏‎‎‏‎"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎‎‎Network details‎‏‎‎‏‎"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‎‏‏‎Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot.‎‏‎‎‏‎"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‎‏‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot.‎‏‎‎‏‎"</string>
     <string name="devices_title" msgid="649715719278562515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‎‏‏‎‎‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‎Devices‎‏‎‎‏‎"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‎‏‏‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎All Settings‎‏‎‎‏‎"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‎‏‎‏‎‎‏‎‏‎‏‎‎‎‎Suggestions‎‏‎‎‏‎"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‎‎‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎Couldn’t find networks. Try again.‎‏‎‎‏‎"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‏‏‏‏‎‎‎‎‏‏‎‏‏‏‏‎‎‏‏‏‏‎(forbidden)‎‏‎‎‏‎"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎No SIM card‎‏‎‎‏‎"</string>
+    <string name="sim_card" msgid="6381158752066377709">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‎‏‎‎‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‏‎SIM‎‏‎‎‏‎"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‎‎‏‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‏‎‎‎‎No SIM‎‏‎‎‏‎"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎None‎‏‎‎‏‎"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎Requires SIM to connect‎‏‎‎‏‎"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‏‏‎‏‎‎‏‏‎‏‎‎Requires ‎‏‎‎‏‏‎<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>‎‏‎‎‏‏‏‎ SIM to connect‎‏‎‎‏‎"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‏‏‏‎Preferred network mode: WCDMA preferred‎‏‎‎‏‎"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‏‎‏‎‎‎‎‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎Preferred network mode: GSM only‎‏‎‎‏‎"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‏‎‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‏‏‎‏‎‎‎Preferred network mode: WCDMA only‎‏‎‎‏‎"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‏‏‏‏‎‎‏‎‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‏‎‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎Mobile data‎‏‎‎‏‎"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‎‏‎‎‎‏‏‏‎‏‎‏‏‏‎Access data using mobile network‎‏‎‎‏‎"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‏‎‎‏‎‎‏‏‏‎‏‏‏‎‏‏‏‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‎‎‎‎‎‎‏‎Phone will automatically switch to this carrier when in range‎‏‎‎‏‎"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎No SIM card available‎‏‎‎‏‎"</string>
     <string name="calls_preference" msgid="2166481296066890129">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‎‏‎‎‎‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‎‎‎‏‎Calls preference‎‏‎‎‏‎"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‏‎‏‎‏‏‎‏‎‏‏‏‎SMS preference‎‏‎‎‏‎"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‎‏‎‏‎Ask every time‎‏‎‎‏‎"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‎‎‏‏‎‏‏‏‏‎Unavailable when connected to ‎‏‎‎‏‏‎<xliff:g id="CARRIER">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
     <string name="see_more" msgid="7499355691042812723">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‎‏‏‎‎‏‏‎‎‏‏‎‎‏‏‎See more‎‏‎‎‏‎"</string>
     <string name="see_less" msgid="2642392725363552793">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‏‎‏‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎See less‎‏‎‎‏‎"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎Turn on ‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‏‎‎‏‏‎‎‏‎‎‏‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎‎‎‎‎‎‏‏‎‎Turn on SIM?‎‏‎‎‏‎"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‏‎‎‎‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎Switch to ‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‎‎‎‎‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‏‏‏‎‎‎‎‎‎Switch to using SIM card?‎‏‎‎‏‎"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‎‎‏‎‎‎‎‎‎‎‏‏‎‏‏‎‎‎‎‏‏‎‏‏‎‎‏‏‎‎‎Only one SIM can be active at a time.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Switching to ‎‏‎‎‏‏‎<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ won’t cancel your ‎‏‎‎‏‏‎<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>‎‏‎‎‏‏‏‎ service.‎‏‎‎‏‎"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‏‎‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎‏‎‎‏‎‎‎‏‎‏‎‎‏‏‏‎‎‎‏‎‏‏‎‎‎‏‎‏‎‏‎‏‏‎Only one downloaded SIM can be active at a time.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Switching to ‎‏‎‎‏‏‎<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ won’t cancel your ‎‏‎‎‏‏‎<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>‎‏‎‎‏‏‏‎ service.‎‏‎‎‏‎"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‎‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎Only one SIM can be active at a time.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Switching won’t cancel your ‎‏‎‎‏‏‎<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ service.‎‏‎‎‏‎"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎Switch to ‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‎‎‎‏‎‏‏‎‏‎‏‎‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‏‎‎‎‏‎‏‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎Connecting to network…‎‏‎‎‏‎"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‎‎‎‏‎‎‏‏‏‎‏‏‏‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‏‏‎‏‎‎‎‎‏‏‎‏‏‎‏‏‎‎Switching to ‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‎‎‎‎‎‎‎‏‏‎‏‎‏‎‏‏‏‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‏‎‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎Can’t switch carrier‎‏‎‎‏‎"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‏‎‎‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎The carrier can’t be switched due to an error.‎‏‎‎‏‎"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‎‎‏‏‏‏‏‏‏‎‏‎‏‎‎‎‏‎‎‏‏‎‏‎‎‏‎‎‏‎‎‏‎‎Turn off ‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎?‎‏‎‎‏‎"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‏‏‏‎‏‎‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‎‏‏‎‎‎‎Turn off SIM?‎‏‎‎‏‎"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‎‎‏‏‏‎‏‏‏‏‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‏‎‏‏‎‎Turning off SIM‎‏‎‎‏‏‎<xliff:g id="ELLIPSIS">…</xliff:g>‎‏‎‎‏‏‏‎‎‏‎‎‏‎"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‎‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‎‏‏‎‎‎‎‎‏‏‎‎‎‏‏‎Can’t disable carrier‎‏‎‎‏‎"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‎Something went wrong and your carrier could not be disabled.‎‏‎‎‏‎"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‏‏‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‏‎Use 2 SIMs?‎‏‎‎‏‎"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‏‎‎‏‏‎‏‎‎‎‏‏‎‎‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‎‏‏‎‏‎This device can have 2 SIMs active at once. To continue using 1 SIM at a time, tap \"No thanks\".‎‏‎‎‏‎"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‏‏‏‎‎‏‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‎‏‏‎‎‎‎‏‎Restart device?‎‏‎‎‏‎"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‏‎‏‎‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‏‎To get started, restart your device. Then you can add another SIM.‎‏‎‎‏‎"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‏‏‎‎‏‏‎‏‏‎‎‏‎‎‎‎‎‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‎Continue‎‏‎‎‏‎"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‎‎Restart‎‏‎‎‏‎"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‏‎No thanks‎‏‎‎‏‎"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‏‏‎‏‎‏‏‎‏‎‎‏‎‏‏‎‎‏‏‏‎‎‎‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‏‎‏‏‎Switch‎‏‎‎‏‎"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‏‎‏‎‎Can’t activate SIM‎‏‎‎‏‎"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎Remove the SIM and insert it again. If the problem continues, restart your device.‎‏‎‎‏‎"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‎Try turning on the SIM again. If the problem continues, restart your device.‎‏‎‎‏‎"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‎‏‎‎‏‏‎Network activation‎‏‎‎‏‎"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‏‏‏‎‏‎‏‏‎‏‎‏‎‎‎‏‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ is active‎‏‎‎‏‎"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‎‎‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‏‎‎‎‎‏‏‎‏‎‎‎‏‎‎Tap to update SIM settings‎‏‎‎‏‎"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‎‎‏‎‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‏‎‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‏‎‏‏‎SIM card‎‏‎‎‏‎"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‎‎‎‏‏‏‎‏‎‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‏‏‏‎‏‏‏‎‎‎‎Erase this downloaded SIM?‎‏‎‎‏‎"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‎‎‎‎‏‎‎‏‏‏‎‏‏‎‎‏‎‏‏‎‏‎Erasing this SIM removes ‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>‎‏‎‎‏‏‏‎ service from this device.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Service for ‎‏‎‎‏‏‎<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>‎‏‎‎‏‏‏‎ won\'t be canceled.‎‏‎‎‏‎"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‏‏‏‎‏‎‎‎‏‎‏‏‎‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎‏‏‏‎‏‏‏‎‏‎Erase‎‏‎‎‏‎"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‎‎‏‏‎‎‏‏‏‎‎‏‎‏‎‏‏‎‎‏‏‏‎‎‏‏‏‎‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎Erasing SIM…‎‏‎‎‏‎"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‎‏‎‎‎‏‏‎‏‏‎Can\'t erase SIM‎‏‎‎‏‎"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‎‏‏‎‏‏‎‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‏‏‏‎‏‏‎This SIM can\'t be erased due to an error.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Restart your device and try again.‎‏‎‎‏‎"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‎‏‎‎Connect to device‎‏‎‎‏‎"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎‏‏‎<xliff:g id="APPNAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ app wants to use a temporary Wi‑Fi network to connect to your device‎‏‎‎‏‎"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‎‎‏‎‎‏‏‏‎‎‎No devices found. Make sure devices are turned on and available to connect.‎‏‎‎‏‎"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‏‎‏‎‏‎‏‎‏‎‏‎‎Emergency calls‎‏‎‎‏‎"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‎‎‎‏‏‎‎‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‏‎‎‎‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎‎‎‏‎‎‎Emergency calls over Wi‑Fi Calling are not supported by your carrier.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎The device switches automatically to a cellular network to place an emergency call.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎Emergency calls are only possible in areas with cellular coverage.‎‏‎‎‏‎"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‏‏‎Use Wi‑Fi for calls to improve quality‎‏‎‎‏‎"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‎‏‎‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‎Cross SIM calling‎‏‎‎‏‎"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‏‏‎‎‏‎‏‏‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‏‎‎‏‎‎‏‏‏‏‎Allow another SIM calls and SMSs over this SIM.‎‏‎‎‏‎"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‏‏‏‏‎‎‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‎cross sim calling‎‏‎‎‏‎"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‎‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎‏‎‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‎‏‏‎‏‎‏‎‏‎‎‎‎Incoming MMS message‎‏‎‎‏‎"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎Can’t send MMS message‎‏‎‎‏‎"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‏‎‎‎‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‎‎‎Tap to allow MMS messaging on ‎‏‎‎‏‏‎<xliff:g id="OPERATOR_NAME">%1$s</xliff:g>‎‏‎‎‏‏‏‎ when mobile data is off‎‏‎‎‏‎"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‎‏‎‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‎‏‏‎‏‎Allow screen overlays on Settings‎‏‎‎‏‎"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎Allow apps that can display over other apps to overlay Settings screens‎‏‎‎‏‎"</string>
     <string name="media_controls_title" msgid="403271085636252597">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‏‏‏‏‎‎‎‏‎‎‎‏‏‏‏‎‎‏‏‏‎‏‏‎‏‎‏‎Media‎‏‎‎‏‎"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‏‎‏‎‏‎‏‏‎‎‎‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‎‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‎Hide player when the media session has ended‎‏‎‎‏‎"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎The player allows you to resume a session from the expanded Quick Settings panel.‎‏‎‎‏‎"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎Media player in Quick Settings‎‏‎‎‏‎"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎‏‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‏‎‎‎‏‏‏‏‏‎‏‏‎Show media player for an extended period to easily resume playback‎‏‎‎‏‎"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‏‎‎‎‏‎‏‏‏‏‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‏‏‏‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‏‏‎Hide player‎‏‎‎‏‎"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‎‎‏‎‎‏‏‎‏‏‎‏‎‏‎‎‎‎‎‏‎‏‎Show player‎‏‎‎‏‎"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‎‎‏‎‏‎‎No players available‎‏‎‎‏‎"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‎‎‏‎‏‏‎‏‏‏‏‎‎‎‎Allowed apps‎‏‎‎‏‎"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‎‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‎‎‎‎‎‎‎‏‎‎‏‏‏‎‎media‎‏‎‎‏‎"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‎‎‎‏‏‎‎‎Bluetooth will turn on‎‏‎‎‏‎"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‏‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‎‏‏‎‏‏‏‎‏‏‏‏‎‏‎‏‏‎‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‏‏‏‏‎‎‎On‎‏‎‎‏‎"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‏‏‏‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‎‏‎‏‎Off‎‏‎‎‏‎"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎‏‎‎‎‏‎‎‏‏‎‏‏‏‏‎‏‎‏‏‎Internet‎‏‎‎‏‎"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‏‏‎‏‎‎‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‏‏‎‎SIMs‎‏‎‎‏‎"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‏‎‏‏‏‏‎‎‏‏‏‎‏‎‏‏‏‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‎‎‏‎‏‎Airplane-safe networks‎‏‎‎‏‎"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‏‏‏‏‏‎‏‎‎‏‏‏‎‎‎‎‏‎‎‎‎‎‏‎‎‎‎‏‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎Find and connect to airplane‑safe networks‎‏‎‎‏‎"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‎‎‎‏‎‎‏‎‎‎‎‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‏‎‏‎airplane, airplane-safe‎‏‎‎‏‎"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‏‎‏‎‏‎‎‎‏‎‏‎‏‎‏‎‎Calls &amp; SMS‎‏‎‎‏‎"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‎‏‏‎‏‏‎‏‎‎‏‎‏‏‏‎‎‏‏‎‎‏‎‎‏‏‏‎‎‏‏‎‏‏‎‏‎‎‎‏‏‏‏‏‎‎Wi‑Fi Calling‎‏‎‎‏‎"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‎‏‏‎‏‏‎‎‏‎‎‏‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‎‏‏‎‎Make and receive calls over non‑carrier networks like Wi‑Fi‎‏‎‎‏‎"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‎‏‏‎‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‎‎‏‏‎‎‎‎Wi‑Fi calling allows you to make and receive calls over non‑carrier networks such as some Wi‑Fi networks.‎‏‎‎‏‎"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‏‏‎‎‎‎‏‏‎‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‏‏‏‏‎‏‏‎‎‎‎Calls‎‏‎‎‏‎"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‏‏‎‎‏‎‎‎‎‎‏‎‏‏‎‎‏‎‎‎‏‎‎‏‏‎‎‏‎‎‏‎‏‏‎‏‏‎‎‏‏‎‎‏‏‎‎‎‎‏‎‏‏‎SMS‎‏‎‎‏‎"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‎‎‏‏‎‎‎‏‎‏‏‏‎‏‏‎‏‎‏‏‏‏‎‏‎‎‎‏‎‏‏‏‎‎‏‎‎‎‎preferred‎‏‎‎‏‎"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‎‎‎‏‏‏‏‏‎‏‎‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‏‏‏‏‎‏‏‎‏‎‏‏‎‏‎‎‎‎‎‏‎calls preferred‎‏‎‎‏‎"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‏‏‏‎‎‏‎‎‎‎‎‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‎‏‏‏‏‏‏‏‎‎SMS preferred‎‏‎‎‏‎"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‎‎‎‏‎‎‏‎‎‎‏‏‎‏‏‎‎‎‏‎‏‎‏‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‎‎‎‏‎unavailable‎‏‎‎‏‎"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‏‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‎‏‏‎‎No SIM‎‏‎‎‏‎"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‏‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‎‎‎‏‎‏‎‎‎‏‎‎‎‏‏‏‏‎Preferences‎‏‎‎‏‎"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‎‏‎‎‎‏‏‎‎‏‏‏‏‎‏‏‏‏‎‎‎‏‏‏‎‏‎‎‎‏‏‏‎‎‎‏‏‎‏‏‏‏‎‎‏‏‎‎‏‎Connect to public networks‎‏‎‎‏‎"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‎‎‎‏‏‎‎network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte‎‏‎‎‏‎"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‎‏‏‏‎‏‎‏‎‏‏‎‎‏‎‎View airplane-safe networks‎‏‎‎‏‎"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‎‏‎‎‎‎‏‎‎‎‎‎‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‏‏‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎Turn off Airplane Mode‎‏‎‎‏‎"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎‎‏‏‎‏‎‏‏‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‎‏‏‎‎‎‎Unavailable because bedtime mode is on‎‏‎‎‏‎"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‎‎‏‏‎‏‎‎‎‏‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‎‎‎‎‎‎‏‏‎‏‎‏‎Reset notification importance completed.‎‏‎‎‏‎"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‎‏‏‎‏‎‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‎‏‏‎‏‎‎‏‏‏‎‏‏‎‎‏‎‎‏‏‎‏‎‏‎‎Apps‎‏‎‎‏‎"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‏‎‎‎‎‏‏‎‎‏‎‎‏‏‏‎‎‎‏‏‏‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎Untrusted device wants to access your messages. Tap for details.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‎‎‎‎‏‎‎‏‎‏‎‏‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‏‏‏‏‎‏‎‏‎‎‏‎‏‏‎Allow access to messages?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‏‏‎‏‏‏‏‏‏‏‎‎‎‏‎‎‏‏‏‏‏‎‏‎‎‎‎‏‏‏‎An untrusted Bluetooth device, [‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎], wants to access your messages.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You haven’t connected to [‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎] before.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‏‎‏‏‎‎‏‏‎‏‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‎Untrusted device wants to access your contacts and call log. Tap for details.‎‏‎‎‏‎"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‏‏‎‏‎‎‎‎‎‎‎‎‏‏‎‎‏‎‎‏‎‎‏‏‎‏‎‎‏‏‎‎‏‏‏‏‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‏‎‎‎‏‎Allow access to contacts and call log?‎‏‎‎‏‎"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‎‎‎‎‏‏‏‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎An untrusted Bluetooth device, [‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>‎‏‎‎‏‏‏‎], wants to access your contacts and call log. This includes data about incoming and outgoing calls.‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎‎‏‎‎‏‏‎\n‎‏‎‎‏‏‏‎You haven’t connected to [‎‏‎‎‏‏‎<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>‎‏‎‎‏‏‏‎] before.‎‏‎‎‏‎"</string>
 </resources>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index e1c0b85..8f85139 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medio"</item>
     <item msgid="6740026006576843477">"Largo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Corto"</item>
+    <item msgid="7397961711906421599">"Medio"</item>
+    <item msgid="4079132024502041928">"Largo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predeterminado"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Solo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 958605b..5ae9844 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Fecha y hora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Configurar fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Establecer fecha, hora, zona horaria y formatos"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Usar la hora de la red"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Usar la zona horaria proporcionada por la red"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Establecer la hora automáticamente"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Establecer la zona horaria automáticamente"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar configuración regional predeterminada"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Formato de 24 horas"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar datos del perfil en pantalla bloqueada"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Cuentas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Ubicación"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usar ubicación"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usar ubicación"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivado"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Encendido: <xliff:g id="COUNT_1">%1$d</xliff:g> apps tienen acceso a la ubicación</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueo de pantalla, desbloqueo facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueo de pantalla, huella digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueo de pantalla"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Usa tu rostro y huella digital para desbloquear el teléfono"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"También puedes acceder a apps y confirmar pagos"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configura el desbloqueo con:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueo facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Desbloquea el teléfono con facilidad"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Huella digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Desbloquea el teléfono desde el bolsillo"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Omitir"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Siguiente"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Se agregó el rostro"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurar el desbloqueo facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueo facial"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Usa tu rostro para autenticarte"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Iniciar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Si el desbloqueo facial de accesibilidad está desactivado, es posible que algunos pasos de la configuración no funcionen correctamente con TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Atrás"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Seguir configurando"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Usar config. de accesibilidad"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Solicitar confirmación al usar el desbloqueo facial en apps"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Borrar datos faciales"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurar el desbloqueo facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Usa el desbloqueo facial para desbloquear tu dispositivo, acceder a las apps y confirmar pagos.\n\nTen en cuenta lo siguiente:\nMirar el teléfono puede desbloquearlo aunque no lo desees.\n\nUn tercero puede desbloquear el teléfono si lo sostiene frente a tu rostro.\n\nPor otro lado, también puede desbloquearlo cualquier persona que se parezca a ti, como un hermano gemelo."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Usa el desbloqueo facial para desbloquear tu dispositivo, acceder a apps y confirmar pagos.\n\nTen en cuenta lo siguiente:\nMirar el teléfono puede desbloquearlo aunque no lo desees.\n\nUn tercero puede desbloquear el teléfono si lo sostiene frente a tu rostro, incluso aunque tengas los ojos cerrados.\n\nPor otro lado, también puede desbloquearlo cualquier persona que se parezca mucho a ti, como un hermano gemelo."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Usa el desbloqueo facial para desbloquear el dispositivo, acceder a apps y confirmar pagos."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Ten en cuenta lo siguiente:\nPuedes desbloquear el teléfono aunque no lo desees cuando lo miras.\n\nUn tercero puede desbloquear el teléfono si lo sostiene frente a tu rostro.\n\nTambién puede desbloquearlo cualquier persona que se parezca a ti, como un hermano gemelo."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Ten en cuenta lo siguiente:\nPuedes desbloquear el teléfono aunque no lo desees cuando lo miras.\n\nUn tercero puede desbloquear el teléfono si lo sostiene frente a tu rostro, incluso si tienes los ojos cerrados.\n\nTambién puede desbloquearlo cualquier persona que se parezca a ti, como un hermano gemelo."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"¿Quieres borrar los datos faciales?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Se borrarán los datos del rostro que usa el desbloqueo facial definitivamente y de manera segura. Tras la eliminación, deberás ingresar el PIN, el patrón o la contraseña para desbloquear el teléfono, acceder a las apps y confirmar pagos."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Usa tu rostro para desbloquear el teléfono"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Usa tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes usar tu huella digital para desbloquear este dispositivo. Para obtener más información, comunícate con el administrador de la organización."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Usa tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: Es posible que la huella digital no sea tan segura como un PIN o un patrón eficaz."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, gracias"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omitir"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Siguiente"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Si proteges tu tablet con una opción de bloqueo de pantalla, nadie podrá usarla si la pierdes o te la roban. También debes establecer una opción para configurar el desbloqueo facial. Si necesitas ir hacia atrás, presiona Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Si proteges tu dispositivo con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También debes establecer una opción para configurar el desbloqueo facial. Si necesitas ir hacia atrás, presiona Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Si proteges tu teléfono con una opción de bloqueo de pantalla, y lo pierdes o te lo roban, nadie podrá usarlo. También debes establecer una opción para configurar el desbloqueo facial. Si necesitas ir hacia atrás, presiona Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Si proteges tu tablet con una opción de bloqueo de pantalla, nadie podrá usarla si la pierdes o te la roban. También debes establecer una opción antes de configurar el desbloqueo biométrico. Si necesitas ir hacia atrás, presiona Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Si proteges tu dispositivo con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También debes establecer una opción antes de configurar el desbloqueo biométrico. Si necesitas ir hacia atrás, presiona Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Si proteges tu teléfono con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También debes establecer una opción antes de configurar el desbloqueo biométrico. Si necesitas ir hacia atrás, presiona Cancelar."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"¿Omitir configuración del PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"¿Omitir configuración de la contraseña?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"¿Omitir configuración del patrón?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activa las funciones de protección del dispositivo para impedir que terceros usen esta tablet sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activa las funciones de protección del dispositivo para impedir que terceros lo usen sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activa las funciones de protección del dispositivo para impedir que terceros usen este teléfono sin tu permiso. Elige el bloqueo de pantalla que quieres usar."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Elegir el método secundario de bloqueo de pantalla"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Elige el método secundario de bloqueo de pantalla"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Elige el método secundario de bloqueo de pantalla"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opciones de bloqueo de la pantalla"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opciones de bloqueo de la pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueo de pantalla"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueo facial y contraseña"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuar sin el desbloqueo facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Puedes desbloquear tu teléfono con el reconocimiento facial. Para mayor seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Datos biométricos + patrón"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Datos biométricos + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Datos biométricos + contraseña"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuar sin configurar datos biométricos"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Puedes desbloquear el teléfono con tus datos biométricos. Por razones de seguridad, esta opción requiere un método secundario de bloqueo de pantalla."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Inhabilitada: admin, encriptación o credenciales"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ninguno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Debe tener menos de <xliff:g id="NUMBER_0">%d</xliff:g> dígito</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"El administrador del dispositivo no permite el uso de un PIN reciente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Tu administrador de TI bloquea los PIN comunes. Prueba uno diferente."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"No puede incluir un carácter no válido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Debe tener al menos una letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Debe tener al menos un dígito"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Debe tener al menos 1 carácter no numérico</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"El administrador del dispositivo no permite el uso de contraseñas recientes"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Tu administrador de TI bloquea las contraseñas comunes. Prueba una diferente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"No se permiten secuencias de dígitos ascendentes, descendentes ni repetidas"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activar Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Usar Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Usar Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Configuración de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurar y administrar los puntos de acceso de teléfonos inalámbricos"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centra el código QR debajo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Escanea un código QR para unirte a la red Wi-Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartir Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Escanea este código QR para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\" y compartir la contraseña"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escanea este código QR con otro dispositivo para unirte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Escanea este código QR para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Vuelve a intentarlo. Si el problema persiste, comunícate con el fabricante del dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Se produjo un error"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Contraseña de Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Contraseña del hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conectar automáticamente"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permitir que el teléfono se conecte automáticamente cerca de esta red"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permite que la tablet se conecte automáticamente cerca de esta red"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permitir conexión a esta red al entrar en su rango"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Agregar dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Usar un código QR para agregar un dispositivo a esta red"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"El código QR no es un formato válido"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Usar certificados de sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"No proporcionar"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"No validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No especificaste ningún certificado. Tu conexión no será privada."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"El nombre de la red es demasiado largo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Se debe especificar un dominio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Se requiere un certificado."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi activado"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Estableciendo conexión con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Conectando…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"No se pudo establecer conexión con la red."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Red fuera de alcance"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Dirección MAC del dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Dirección MAC aleatoria"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Dirección MAC aleatoria (último uso)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Dirección IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalles de la red"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de subred"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Direcciones IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Redes guardadas"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Suscripciones"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Otras redes"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Configuración de IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"La configuración avanzada de Wi‑Fi no está disponible para este usuario"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Guardar"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Escribe una dirección de puerta de enlace válida."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Escribe una dirección DNS válida."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Escribe una longitud de prefijo de red entre 0 y 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a menos que lo anule un DNS privado)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a menos que lo anule un DNS privado)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Puerta de enlace"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Longitud de prefijo de red"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi directo"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"La app está compartiendo contenido. Para compartir la conexión a Internet, desactiva el hotspot y vuelve a activarlo"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No se configuró una contraseña"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nombre del hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Otros dispositivos pueden conectarse a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Contraseña del hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda del PA"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumentar automáticamente la frecuencia de actualización de 60 Hz a 90 Hz para cierto contenido. Incrementa el uso de batería"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forzar frecuencia de actualización de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"La máxima frecuencia de actualización mejora la respuesta táctil y la calidad de las animaciones. Incrementa el uso de batería."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atención a la pantalla"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activado: No se apagará la pantalla si estás mirándola"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"La pantalla se enciende para indicar nuevas notificaciones cuando está apagada"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostrar información y hora"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"El uso de la batería será mayor"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Texto en negrita"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamaño de fuente"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Aumenta o reduce el tamaño del texto en pantalla"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Bloqueo de la tarjeta SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versión de Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Actualización de seguridad de Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo y hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versión de hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID del equipo"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Eliminar APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN nuevo"</string>
     <string name="menu_save" msgid="6611465355127483100">"Guardar"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Descartar"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Cancelar"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"El campo Nombre no puede estar vacío."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"El APN no puede estar vacío."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Se pueden restablecer las apps"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Restablecer configuración de Wi-Fi, datos móviles y Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Se restablecerán las opciones de configuración de todas las redes, lo que incluye:\n\n"<li>"Wi‑Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Borrar"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Borrar tarjeta SIM descargada"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Para descargar tarjetas SIM de reemplazo, comunícate con tu proveedor. Esta acción no cancelará ningún plan de servicio móvil."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Esta acción no cancelará ningún plan de servicio móvil. Para descargar tarjetas SIM de reemplazo, comunícate con tu proveedor."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Restablecer configuración"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"¿Quieres restablecer toda la configuración de red? No podrás deshacer esta acción."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"¿Quieres restablecer toda la configuración de red y borrar las tarjetas SIM descargadas? No podrás deshacer esta acción."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Se restableció la configuración de red."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"No se pueden borrar las tarjetas SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"No es posible borrar las tarjetas SIM descargadas debido a un error.\n\nReinicia el dispositivo y vuelve a intentarlo."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Borrar todos los datos (restablecer la configuración de fábrica)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Borrar todos los datos"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Esta acción borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, como\n\n"<li>"Tu Cuenta de Google"</li>\n<li>"Los datos y la configuración del sistema y de las apps"</li>\n<li>"Las apps descargadas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, por ejemplo:\n\n"<li>"Tu Cuenta de Google"</li>\n<li>"Los datos y la configuración del sistema y de las apps"</li>\n<li>"Las apps descargadas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Accediste a las siguientes cuentas:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"No se cancelará tu plan de servicio móvil."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para borrar música, imágenes y otros datos del usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Borrar todos los datos (restablecer la configuración de fábrica)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Borrar todo (restablecer configuración de fábrica)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Esta acción borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, como\n\n"<li>"Tu Cuenta de Google"</li>\n<li>"Los datos y la configuración del sistema y de las apps"</li>\n<li>"Las apps descargadas"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Esta acción borrará todos los datos del "<b>"almacenamiento interno"</b>" de tu teléfono, como\n\n"<li>"Tu Cuenta de Google"</li>\n<li>"Los datos y la configuración del sistema y de las apps"</li>\n<li>"Las apps descargadas"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Accediste a las siguientes cuentas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos del usuario"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"No se cancelará tu plan de servicio móvil."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para borrar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para borrar música, imágenes y otros datos del usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Eliminar almacenamiento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Borrar tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Borra todos los datos del almacenamiento USB, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Borra todos los datos de la tarjeta SD, como música o fotos."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Borrar todos los datos"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Borrar todos los datos"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Se borrarán las apps que hayas descargado y tu información personal. No podrás deshacer esta acción."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Se borrará toda tu información personal, incluidas las apps y las tarjetas SIM descargadas. No podrás deshacer esta acción."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Eliminar todo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No se realizó ningún restablecimiento debido a que el servicio \"Eliminar sistema\" no está disponible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"¿Borrar todos los datos?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"El restablecimiento de la configuración de fábrica no está disponible para este usuario."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Borrando"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Espera un momento…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Borrar todos los datos"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Borrar todos los datos"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Se borrarán las apps que hayas descargado y tu información personal. No podrás deshacer esta acción."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Se borrará toda tu información personal, incluidas las apps y las tarjetas SIM descargadas. No podrás deshacer esta acción."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"¿Quieres borrar todos los datos?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"El restablecimiento de la configuración de fábrica no está disponible para este usuario"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Borrando"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Espera…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Configuración"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Establecer correo de voz, desvío de llamadas, llamada en espera, identificador de llamadas"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Conexión a red por USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"No se puede anclar a red a más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ya no se anclará a red."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Conexión a Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Compartir la conexión a Internet del teléfono mediante Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Compartir la conexión a Internet del teléfono mediante Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Usa la función de hotspot y conexión mediante dispositivo portátil para brindar acceso a Internet a otros dispositivos mediante tu conexión de datos móviles. Las apps también pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Usa un hotspot y una conexión mediante dispositivo móvil para brindar acceso a Internet a otros dispositivos a través de una conexión Wi-Fi o de datos móviles. Las apps también pueden crear un hotspot para compartir contenido con dispositivos cercanos."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ayuda"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Búsqueda de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que las apps y los servicios busquen dispositivos cercanos en cualquier momento, aunque la conexión Bluetooth esté desactivada. Esta función puede usarse, por ejemplo, para mejorar las funciones y los servicios basados en la ubicación."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicios de ubicación para el trabajo"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detección de la zona horaria de la ubicación"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detección de la zona horaria de la ubicación"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite que la ubicación del dispositivo se utilice para detectar la zona horaria actual. Otras configuraciones de la ubicación, como la búsqueda de Wi-Fi, pueden afectar la exactitud de la detección de la zona horaria."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activada"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desactivada"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Se inhabilitó la detección automática de la zona horaria"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Se inhabilitó la detección de la zona horaria de la ubicación"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"La detección de la zona horaria de la ubicación no es compatible"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"No se permiten los cambios de detección de la zona horaria de la ubicación"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Ubicación de Wi-Fi y red móvil"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Permitir que aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación (se enviarán datos anónimos a Google)"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Ubicación determinada por Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Establece una contraseña"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Establece patrón para desbloqueo facial"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Establece PIN para desbloqueo facial"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Para datos biométricos, elige contraseña"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Para datos biométricos, elige un patrón"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Para datos biométricos, elige un PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"¿Olvidaste la contraseña?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"¿Olvidaste el patrón?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"¿Olvidaste el PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencias de subtítulos"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliación"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliación"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Habilitar ampliación"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Selecciona las áreas en las que quieres implementar la ampliación de pantalla al usar la función"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pantalla completa"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte de la pantalla"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pantalla completa y parte de la pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar toda la pantalla"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte de la pantalla"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"¿Quieres cambiar al botón de accesibilidad?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Cuando presionas tres veces para ampliar una parte de la pantalla, algunas acciones, como escribir, demorarán más tiempo.\n\n¿Prefieres usar el botón de accesibilidad para ampliar?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Cambiar al botón de accesibilidad"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mantener presionar tres veces para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configuración de ampliación"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar presionando tres veces"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ampliar con gesto"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Cortar con el botón de encendido"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Puntero del mouse grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Quitar animaciones"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combinar canales cuando se reproduce audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balance de audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Izquierda"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Derecha"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combinar canales cuando se reproduce audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balance de audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Izquierda"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Derecha"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predeterminado"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibración de las notificaciones"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibración del tono"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Respuesta táctil"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usar la corrección de color"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar subtítulos"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Solo para apps compatibles"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usar la corrección de colores"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar subtítulos"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Solo para apps compatibles"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Estilo y tamaño de los subtítulos"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamaño del texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Más opciones"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteronomalía"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalía"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalía"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de grises"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rojo-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rojo-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarillo"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restricción en segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permite que la app se ejecute en segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"La app no puede ejecutarse en segundo plano"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"No se puede restringir el uso en segundo plano"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"No se puede restringir el uso en segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"¿Limitar actividad en segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limitas la actividad en segundo plano de una app, es posible que no funcione correctamente"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Como no se configuró la app para optimizar la batería, no puedes restringirla.\n\nPrimero, activa optimización de batería."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"La tablet se usó más de lo habitual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"El dispositivo se usó más de lo habitual"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"La batería podría agotarse antes de lo habitual"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimizando el estado de la batería"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batería limitada temporalmente. Presiona para obtener más información."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"El teléfono se usó más de lo habitual. Es posible que la batería se agote antes de lo esperado.\n\nEstas son las apps que más batería consumen:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"La tablet se usó más de lo habitual. Es posible que la batería se agote antes de lo esperado.\n\nEstas son las apps que más batería consumen:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"El dispositivo se usó más de lo habitual. Es posible que la batería se agote antes de lo esperado.\n\nEstas son las apps que más batería consumen:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d app restringida</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problema al leer el medidor de batería"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Ocurrió un problema al leer el medidor de batería; presiona para "<annotation id="url">"obtener más información"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"¿Quieres detener la app?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Establecer un programa"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Extender la duración de la batería"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desactivar después de la carga"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"El Ahorro de batería se desactiva cuando el teléfono tiene <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"El Ahorro de batería se desactiva cuando la tablet tiene <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"El Ahorro de batería se desactiva cuando el dispositivo tiene <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"El Ahorro de batería se desactiva cuando el teléfono tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"El Ahorro de batería se desactiva cuando la tablet tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"El Ahorro de batería se desactiva cuando el dispositivo tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de carga"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activar"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Restablecer"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproducir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividad Adaptable"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extiende la duración de batería y mejora el rendimiento del dispositivo, ya que administra automáticamente las conexiones de red"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Almacenamiento de credenciales"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instala un certificado"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalar certificados desde el almacenamiento"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciales de usuario"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver y modificar las credenciales guardadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Configuración avanzada"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamiento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Copia de seguridad en hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Las credenciales no están disponibles para este usuario."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Se instaló para redes VPN y apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Se instaló para redes Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"No instalar"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instalar de todas formas"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"No se instaló el certificado"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"¿Deseas permitir que <xliff:g id="APP_NAME">%s</xliff:g> instale certificados en este dispositivo?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Estos certificados te identificarán en las siguientes apps y URL"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"No permitir"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Permitir"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Mostrar más"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App administrada de certificados"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Ninguna"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Los certificados que instaló esta app te identifican con las siguientes aplicaciones y URL"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Quitar"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Indicador de marcado de emergencia"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Establecer el comportamiento cuando se establece una llamada de emergencia"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Copia de seguridad"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Sin configurar: perfil de trabajo"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Tú (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Seudónimo"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Puedes agregar hasta <xliff:g id="USER_COUNT">%1$d</xliff:g> usuarios"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Solo los propietarios de la tablet pueden administrar los usuarios."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Solo los propietarios del dispositivo pueden administrar los usuarios."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Cómo pagar en la terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura una aplicación para efectuar pagos. A continuación, solo tienes que sostener la parte posterior del teléfono sobre cualquier terminal con el símbolo de pago sin contacto."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entendido"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Más…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Más…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Establecer app de pagos predeterminada"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualizar app de pagos predeterminada"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"En una terminal para pagar sin contacto, usar <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Atrás"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Siguiente"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finalizar"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tomar una foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Elegir una imagen"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Seleccionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Tarjetas SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Tarjetas SIM"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Usar siempre para llamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Seleccionar SIM para datos"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecciona una SIM para los SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Cambiando SIM de datos, esto puede demorar unos minutos…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Cambiando SIM de datos. Este proceso puede demorar unos minutos…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Llamar con"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Seleccionar una tarjeta SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, programa, ahorro de batería, ahorro de energía, batería, automático, porcentaje"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, llamadas avanzadas, llamadas mediante 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"agregar idioma, agregar un idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamaño del texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Sonido predeterminado"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volumen de tono y notificaciones al <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volumen, vibración, No interrumpir"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Activar los sonidos"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtitulado instantáneo"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Subtitular automáticamente"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ninguno"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Se establecieron <xliff:g id="ON_COUNT">%d</xliff:g> programas</item>
-      <item quantity="one">Se estableció 1 programa</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ninguno}=1{Se estableció 1 programa}other{Se establecieron # programas}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"No interrumpir"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Solo recibe notificaciones de las personas y apps que más te interesan"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar las interrupciones"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Solo prioridad"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desactivado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Preguntar siempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Hasta que lo desactives"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-      <item quantity="one">1 hora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programas se pueden actualizar automáticamente</item>
-      <item quantity="one">1 programa se puede actualizar automáticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desactivada}=1{Desactivada/1 programa se puede activar automáticamente}other{Desactivada/# programas se pueden activar automáticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Pueden suspender la función No interrumpir:"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Configurar automáticamente las notificaciones de menor prioridad a silenciosas"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Clasificación de notificaciones adaptables"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Clasificar las notificaciones automáticamente por relevancia"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Comentarios sobre notificaciones adaptables"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica los ajustes realizados a las notificaciones y muestra la opción para enviar comentarios al sistema"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Restablece la prioridad de notificaciones"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Restablece la configuración de importancia cambiada por el usuario y permite que el asistente de notificaciones establezca las prioridades"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respuestas y acciones sugeridas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostrar automáticamente respuestas y acciones sugeridas"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Visualiza notificaciones recientes y pospuestas"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Conversaciones prioritarias"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Se muestran en la parte superior de la sección de conversaciones como burbujas flotantes."</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Se mostrarán en la parte superior de la sección de conversaciones"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Otras conversaciones"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Conversaciones no prioritarias"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversaciones que modificaste"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Conversaciones recientes"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Borrar recientes"</string>
+    <string name="clear" msgid="5092178335409471100">"Borrar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Guardar conversaciones prioritarias en burbujas"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Las conversaciones prioritarias se muestran en la parte superior del panel desplegable. También puedes configurarlas para que aparezcan como burbujas y que suspendan la función No interrumpir."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Las conversaciones prioritarias y modificadas aparecerán aquí"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acceso en No interrumpir"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir opción No interrumpir"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ninguna aplicación instalada solicitó acceso en No interrumpir."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Cargando aplicaciones…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Cargando apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"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="6202042207121633488">"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="9096417708500595424">"Como lo solicitaste, Android bloquea este grupo de notificaciones para que no se muestren en el dispositivo"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas las conversaciones"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversaciones prioritarias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ninguna"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversaciones</item>
-      <item quantity="one">1 conversación</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ninguna"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ninguna}=1{1 conversación}other{# conversaciones}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quiénes pueden interrumpir"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Llamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Llamadas"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"A fin de asegurarte de que el dispositivo suene cuando recibes llamadas permitidas, verifica que esté configurado para emitir un sonido"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Se bloquearán las llamadas entrantes durante \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Puedes ajustar la configuración para permitir que tus amigos, familia y otros contactos se comuniquen contigo."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactos destacados"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> más</item>
-      <item quantity="one">1 más</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ninguno"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ninguno}=1{{contact_1}}=2{{contact_1} y {contact_2}}=3{{contact_1}, {contact_2} y {contact_3}}other{{contact_1}, {contact_2} y # más}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sin nombre)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensajes"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensajes"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensajes"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Se bloquearán los mensajes entrantes durante \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Puedes ajustar la configuración para permitir que tus amigos, familiares y otros contactos se comuniquen contigo."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Puedes recibir todos los mensajes"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Puedes recibir todas las llamadas"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ninguno"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contactos</item>
-      <item quantity="one">1 contacto</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ninguno}=1{1 contacto}other{# contactos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Cualquier usuario"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactos destacados"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas las notificaciones"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algunas notificaciones"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Las personas seleccionadas podrán comunicarse contigo, incluso si no permites que las apps causen interrupciones"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> pueden interrumpir</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> puede interrumpir</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> más"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ninguna app puede interrumpir}=1{{app_1} puede interrumpir}=2{{app_1} y {app_2} pueden interrumpir}=3{{app_1}, {app_2} y {app_3} pueden interrumpir}other{{app_1}, {app_2} y # más pueden interrumpir}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas las notificaciones"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algunas notificaciones"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificaciones que pueden interrumpir"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas las notificaciones"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> pueden interrumpir</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> puede interrumpir</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada puede interrumpir"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> más"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada puede interrumpir}=1{{sound_category_1} puede interrumpir}=2{{sound_category_1} y {sound_category_2} pueden interrumpir}=3{{sound_category_1}, {sound_category_2} y {sound_category_3} pueden interrumpir}other{{sound_category_1}, {sound_category_2} y # más pueden interrumpir}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada puede interrumpir"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguna persona puede interrumpir"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algunas personas pueden interrumpir"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Cualquier persona puede interrumpir"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Activada"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Desactivado"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Fijar apps"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Al fijar una app, esta se mantiene visible hasta que dejas de fijarla. Esta función se puede utilizar, por ejemplo, para dejar que alguien de confianza juegue un juego específico. \n\nSi fijas una app, esta podrá abrir otras apps y acceder a tus datos personales. \n\nPara fijar una app, sigue estos pasos: 	\n1.	Activa fijar apps. 	\n2.	Abre Recientes. 	\n3.	Presiona el icono de la app que se encuentra en la parte superior de la pantalla y, luego, Fijar."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Al fijar una app, esta se mantiene visible hasta que dejas de fijarla. Esta función se puede utilizar, por ejemplo, para dejar que alguien de confianza juegue un juego específico. \n\nSi fijas una app, esta podrá abrir otras apps y acceder a tus datos personales. \n\nSi quieres compartir tu dispositivo con alguien de forma segura, usa un perfil de invitado. \n\nPara fijar una app, sigue estos pasos: 	\n1.	Activa Fijar apps. 	\n2.	Abre Recientes. 	\n3.	Presiona el icono de la app que se encuentra en la parte superior de la pantalla y, luego, Fijar."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Al fijar una app, esta se mantiene visible hasta que dejas de fijarla. Esta función se puede utilizar, por ejemplo, para dejar que alguien de confianza juegue un juego específico."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Si fijas una app, esta podrá abrir otras apps y acceder a tus datos personales. \n\nPara usar la fijación de apps, sigue estos pasos: 	\n1.	Activa la fijación de apps. 	\n2.	Abre Recientes. 	\n3.	Presiona el icono de la app que se encuentra en la parte superior de la pantalla y, luego, Fijar."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Si fijas una app, esta podrá abrir otras apps y acceder a tus datos personales. \n\nSi quieres compartir tu dispositivo con alguien de forma segura, usa un perfil de invitado. \n\nPara usar la fijación de apps, sigue estos pasos: 	\n1.	Activa la fijación de apps. 	\n2.	Abre Recientes. 	\n3.	Presiona el icono de la app que se encuentra en la parte superior de la pantalla y, luego, Fijar."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Cuando fijas una app, puede ocurrir lo siguiente: \n\n•		Esta podrá acceder a datos personales (como contactos y contenido de los correos electrónicos). \n•	 Es posible que las apps fijadas abran otras apps.		 \n\nUsa la función para fijar apps solo con personas de confianza.\n"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Solicitar desbloqueo para quitar fijación"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Solicitar PIN para quitar fijación"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar un PIN antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes, ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar un PIN para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar un patrón antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar un patrón para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Además de usar el reconocimiento facial para desbloquear el dispositivo, puedes solicitar una contraseña antes de iniciarlo para mayor protección. Mientras se enciende el dispositivo, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción protege los datos en dispositivos perdidos o robados. ¿Quieres solicitar una contraseña para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Además de usar tus datos biométricos para desbloquear el dispositivo, puedes solicitar un PIN antes de iniciarlo a fin de aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Quieres solicitar un PIN para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Además de usar tus datos biométricos para desbloquear el dispositivo, puedes solicitar un patrón antes de iniciarlo a fin de aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Quieres solicitar un patrón para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Además de usar tus datos biométricos para desbloquear el dispositivo, puedes solicitar una contraseña antes de iniciarlo a fin de aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Quieres solicitar una contraseña para iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restringida"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo conectado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Cambiando…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Cambiando…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"No se pudo cambiar"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Cargando este dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Cargando dispositivo conectado"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Uso de datos móviles"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Uso de datos de la app"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Uso de datos Wi‑Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Uso de datos que no corresponde al proveedor"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Uso de datos de Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 restricción</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"El cálculo de datos del proveedor puede diferir del que hace el dispositivo."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excluye los datos que usan las redes del proveedor"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Datos usados: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Configurar advertencia"</string>
     <string name="data_warning" msgid="2925054658166062884">"Advertencia de datos"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalles"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Ahorro de datos"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Datos sin restricciones"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Se desactivaron los datos en segundo plano"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Se desactivaron los datos en segundo plano"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activado"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desactivado"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usar Ahorro de datos"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Si el dispositivo está bloqueado, evita la escritura de respuestas y otros textos en las notificaciones"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corrector predeterminado"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Elegir corrector ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Usar el corrector ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usar el corrector ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Sin seleccionar"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ninguno)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Quitar fotos y videos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Administrador de almacenamiento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Usar el Administrador de almacenamiento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usar el Administrador de almacenamiento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liberar espacio ahora"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Presionar la pantalla dos veces para revisar el teléfono"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Presionar dos veces la tablet para revisarla"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Presionar dos veces el dispositivo para revisarlo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Desliza para ver notific."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Desliza el dedo hacia abajo desde el borde inferior para ver las notificaciones"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo de una mano"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usar el modo de una mano"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Salir del modo cuando se cambia de app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tiempo de espera"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accesibilidad"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para consultar la hora, las notificaciones y otra información, presiona dos veces la pantalla."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar el teléfono para revisarlo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levanta la tablet para revisarla"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Presiona para revisar la tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Presiona para revisar el dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para consultar la hora, las notificaciones y otra información, presiona la pantalla."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Ayuda en emergencias"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Usar SOS de emergencia"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Administrador: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Inicia las acciones que se indican más abajo presionando rápidamente el botón de encendido 5 veces o más."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Reproducir alarma de cuenta regresiva"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Reproducir un sonido fuerte antes de solicitar ayuda"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Llamar para obtener ayuda"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Número al que llamar para pedir ayuda"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>; presiona para cambiar"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Si ingresas un número que no es de emergencia:\n • Tu dispositivo debe estar desbloqueado para usar SOS de emergencia.\n • Es posible que no se responda tu llamada."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar tu huella para ver notificaciones"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Deslizar huella digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales ubicado en la parte posterior del teléfono."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Máximo de conjuntos de datos visibles"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Restablecer valores predeterminados"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Se restablecieron las opciones de autocompletar para desarrolladores"</string>
+    <string name="location_category" msgid="3496759112306219062">"Ubicación"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicador de ubicación de la barra de estado"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Mostrar para todas las ubicaciones, incluidas la red y la conectividad"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forzar dimensiones GNSS completas"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Seguir todas las frecuencias y constelaciones de GNSS sin ciclo de funciones"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema del dispositivo"</string>
     <string name="default_theme" msgid="4815428567082263639">"Predeterminado"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nombre de la red"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pausa las notificaciones para concentrarte"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Función no disponible"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Se desactivó esta función porque ralentiza el teléfono"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forzar dimensiones GNSS completas"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Seguir todas las frecuencias y constelaciones de GNSS sin ciclo de funciones"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Mostrar siempre el cuadro de diálogo de bloqueos"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Mostrar el cuadro de diálogo cada vez que falle una app"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Seleccionar app compatible con ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Habilitar para todas las apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleccionar controlador gráfico"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predeterminado"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de juegos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de juegos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador para desarrolladores"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador gráfico del sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Activado (silencio)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Desactivado"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detalles de la red"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"El nombre de tu dispositivo es visible para las apps del teléfono. Es posible que también lo vean otras personas cuando te conectes a dispositivos Bluetooth o configures un hotspot de Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"El nombre de tu dispositivo es visible para las apps del teléfono. Es posible que también lo vean otras personas cuando te conectes a dispositivos Bluetooth o a una red Wi-Fi, o cuando configures un hotspot de Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Dispositivos"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Toda la configuración"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Sugerencias"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"No se encontraron redes. Vuelve a intentarlo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(prohibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Sin tarjeta SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"No hay ninguna tarjeta SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"No hay información"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Se requiere una tarjeta SIM para conectarse"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Se requiere una tarjeta SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> para conectarse"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modo de red preferido: WCDMA preferido"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modo de red preferido: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modo de red preferido: solo WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datos móviles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acceder a los datos usando la red móvil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"El teléfono cambiará a este proveedor automáticamente en cuanto esté dentro del rango"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"No hay ninguna tarjeta SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencia de llamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencia de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Preguntar siempre"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"No está disponible cuando estás conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ver más"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"¿Quieres activar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"¿Quieres activar la SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"¿Quieres cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"¿Cambiar a uso de tarjeta SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Solo se puede activar una tarjeta SIM a la vez.\n\nSi cambias a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, no se cancelará el servicio de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Solo puede activarse una tarjeta SIM descargada a la vez.\n\nSi cambias a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, no se cancelará el servicio de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Solo se puede activar una tarjeta SIM a la vez.\n\nSi cambias, no se cancelará el servicio de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Estableciendo conexión con la red…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Cambiando a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"No se puede cambiar de proveedor"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"No se puede cambiar de proveedor debido a un error."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"¿Quieres desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"¿Quieres desactivar la tarjeta SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desactivando SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"No se puede inhabilitar el proveedor"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Se produjo un error y no se pudo inhabilitar tu proveedor."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"¿Quieres usar 2 tarjetas SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo puede tener 2 tarjetas SIM activas al mismo tiempo. Para seguir usando una sola, presiona \"No, gracias\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"¿Quieres reiniciar el dispositivo?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Para comenzar, reinicia el dispositivo. Luego, podrás agregar otra tarjeta SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"No, gracias"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Cambiar"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"No se puede activar la SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Quita la SIM y vuelve a insertarla. Si el problema persiste, reinicia el dispositivo."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Vuelve a activar la SIM. Si el problema persiste, reinicia el dispositivo."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activación de red"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> está activo"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Presiona para actualizar la configuración de la tarjeta SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Tarjeta SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"¿Quieres borrar esta tarjeta SIM descargada?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Si borras esta tarjeta SIM, se quitará el servicio de <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> de este dispositivo.\n\nSin embargo, no se cancelará el servicio de <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Borrar"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Borrando tarjeta SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"No se puede borrar la tarjeta SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"No es posible borrar esta tarjeta SIM porque se produjo un error.\n\nReinicia el dispositivo y vuelve a intentarlo."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectar al dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"La app de <xliff:g id="APPNAME">%1$s</xliff:g> quiere usar una red Wi-Fi temporal para conectarse a tu dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No se encontraron dispositivos. Asegúrate de que los dispositivos estén encendidos y puedan conectarse."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Llamadas de emergencia"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Tu proveedor no admite llamadas de emergencia mediante la función Llamada por Wi-Fi.\nEl dispositivo cambia automáticamente a una red móvil para hacer una llamada de emergencia.\nEste tipo de llamadas solo se pueden realizar en áreas con cobertura móvil."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Usar Wi‑Fi para mejorar la calidad de las llamadas"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Llamadas entre tarjetas SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Permite hacer llamadas y enviar SMS con otra SIM mediante esta."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"llamadas entre tarjetas SIM"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Mensaje MMS entrante"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"No se puede enviar el mensaje MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Presiona para permitir los mensajes MMS en <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> cuando los datos móviles estén desactivados"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir pantallas superpuestas en Configuración"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permite que las apps que pueden mostrar contenido sobre otras se superpongan a las pantallas de Configuración"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Contenido multimedia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ocultar reproductor al terminar sesión multimedia"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"El reproductor te permite reanudar una sesión desde el panel expandido de Configuración rápida."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Reproductor multimedia en la Configuración rápida"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Muestra el reproductor multimedia durante un período extendido para reanudar la reproducción de manera sencilla"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar reproductor"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar reproductor"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No hay jugadores disponibles"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Apps permitidas"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"contenido multimedia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Se activará el Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Activado"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivado"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para aviones"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Busca y conéctate a redes seguras para aviones"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avión, segura para aviones"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Llamadas y SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Llamada por Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Hacer y recibir llamadas a través de redes que no pertenecen a ningún proveedor, como Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Con las Llamadas por Wi‑Fi, puedes llamar y recibir llamadas a través de redes que no son de proveedores, como algunas redes Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Llamadas"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferencia"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"preferencia para llamadas"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"preferencia para SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"no disponible"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"No hay ninguna tarjeta SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"conexión de red, internet, inalámbrico, datos, wifi, wi-fi, wi fi, datos móviles, móvil, proveedor de telefonía, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver redes seguras para aviones"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desactivar el Modo de avión"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"No disponible cuando el modo hora de dormir está activado"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Se restableció la prioridad de notificaciones."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un dispositivo que no es de confianza quiere acceder a tus mensajes. Presiona para ver más detalles"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"¿Quieres permitir el acceso a los mensajes?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un dispositivo Bluetooth que no es de confianza, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quiere acceder a tus mensajes.\n\nNo te conectaste a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un dispositivo que no es de confianza quiere acceder a tus contactos y al registro de llamadas. Presiona para ver más detalles"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"¿Quieres permitir el acceso a los contactos y al registro de llamadas?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un dispositivo Bluetooth que no es de confianza, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quiere acceder a tus contactos y al registro de llamadas. Esto incluye datos sobre llamadas entrantes y salientes.\n\nNo te conectaste a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
 </resources>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 1f2dc1a..d48f1cf 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medio"</item>
     <item msgid="6740026006576843477">"Largo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Corto"</item>
+    <item msgid="7397961711906421599">"Medio"</item>
+    <item msgid="4079132024502041928">"Largo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predeterminado"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA, EvDo, GSM o WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA y LTE o EvDo"</item>
     <item msgid="2247906254631766720">"GSM, WCDMA o LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE o WCDMA"</item>
     <item msgid="7723670142495874534">"Solo TD-SCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR o LTE"</item>
     <item msgid="5237423971422723128">"NR, LTE, CDMA o EvDo"</item>
     <item msgid="6856991565745877075">"NR, LTE, GSM o WCDMA"</item>
-    <item msgid="473436147270962091">"NR, LTE, CDMA, EvDo, GSM o WCDMA"</item>
+    <item msgid="8908263949185004366">"Mundial"</item>
     <item msgid="6692179237956480280">"NR, LTE o WCDMA"</item>
     <item msgid="8160757136163231885">"NR, LTE o TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR, LTE, TDSCDMA o GSM"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4efbfe9..cbc38df 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Fecha y hora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Establecer fecha y hora"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Establecer fecha, hora, zona horaria y formatos"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Usar la hora proporcionada por la red"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Usar la zona horaria proporcionada por la red"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Definir hora automáticamente"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Definir zona horaria automáticamente"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar la configuración regional predeterminada"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar información de perfil en pantalla bloqueo"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Cuentas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Ubicación"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usar ubicación"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usar ubicación"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivado"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Activada ‑ <xliff:g id="COUNT_1">%1$d</xliff:g> aplicaciones tienen acceso a la ubicación</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueo de pantalla, desbloqueo facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueo de pantalla y huella digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueo de pantalla"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloquea el móvil de forma segura con tu cara y huella"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"También puedes iniciar sesión en apps y confirmar pagos"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configura el desbloqueo con:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueo facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Haz que desbloquear tu móvil sea fácil"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Huella digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Ahorra tiempo desbloqueando tu teléfono desde el bolsillo"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Saltar"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Siguiente"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Cara añadida"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configura el desbloqueo facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueo facial"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Usa tu cara para autenticarte"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Empezar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Si el desbloqueo facial está desactivado, es posible que algunos pasos de la configuración no funcionen correctamente con TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Atrás"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuar configuración"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Utilizar ajustes accesibilidad"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Solicita confirmación al usar el desbloqueo facial en aplicaciones"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Eliminar datos faciales"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurar desbloqueo facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Con el desbloqueo facial, puedes desbloquear tu dispositivo, iniciar sesión en aplicaciones y confirmar pagos.\n\nTen en cuenta lo siguiente:\nEs posible que el teléfono se desbloquee si lo miras aunque no sea tu intención.\n\nOtra persona puede desbloquear el teléfono si lo pone frente a tu cara.\n\nEs posible que una persona que se parezca mucho a ti, como un gemelo, pueda desbloquear el teléfono."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Utiliza el desbloqueo facial para desbloquear tu dispositivo, iniciar sesión en aplicaciones y confirmar pagos.\n\nTen en cuenta lo siguiente:\nEs posible que el teléfono se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el teléfono si lo pone frente a tu cara, incluso si tienes los ojos cerrados.\n\nEs posible que una persona que se parezca mucho a ti (como un hermano o una hermana) pueda desbloquear el teléfono."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Utiliza el desbloqueo facial para desbloquear el dispositivo, iniciar sesión en aplicaciones y confirmar pagos."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Ten en cuenta lo siguiente:\nEs posible que el teléfono se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el teléfono si lo pone frente a tu cara.\n\nOtra persona que se parezca mucho a ti, como un hermano gemelo, puede desbloquear el teléfono."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Ten en cuenta lo siguiente:\nEs posible que el teléfono se desbloquee si lo miras, aunque no sea tu intención.\n\nOtra persona puede desbloquear el teléfono si lo pone frente a tu cara, incluso si tienes los ojos cerrados.\n\nOtra persona que se parezca mucho a ti, como un hermano gemelo, puede desbloquear el teléfono."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"¿Eliminar los datos faciales?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Los datos faciales que se utilizan para el reconocimiento facial se eliminarán definitivamente y de forma segura. Una vez que se hayan eliminado, tendrás que usar tu PIN, patrón o contraseña para desbloquear el teléfono, iniciar sesión en aplicaciones y confirmar pagos."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Úsalo para desbloquear el teléfono"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utiliza tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: No puedes utilizar tu huella digital para desbloquear este dispositivo. Si quieres consultar más información, ponte en contacto con el administrador de tu organización."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utiliza tu huella digital para desbloquear el teléfono o aprobar compras.\n\nNota: Es posible que tu huella digital sea menos segura que un buen patrón o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No, gracias"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Saltar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Siguiente"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Si proteges el tablet con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar el desbloqueo facial. Para volver, toca Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Si proteges el dispositivo con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar el desbloqueo facial. Para volver, toca Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Si proteges el teléfono con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar el desbloqueo facial. Para volver, toca Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Si proteges tu tablet con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar la biometría. Para volver, toca Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Si proteges tu dispositivo con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar la biometría. Para volver, toca Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Si proteges tu teléfono con una opción de bloqueo de pantalla, nadie podrá usarlo si lo pierdes o te lo roban. También necesitas una opción de bloqueo de pantalla para configurar la biometría. Para volver, toca Cancelar."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"¿No quieres configurar un PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"¿No quieres configurar la contraseña?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"¿No quieres configurar el patrón?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el tablet sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activa las funciones de protección del dispositivo para evitar que otros lo utilicen sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activa las funciones de protección del dispositivo para evitar que otros utilicen el teléfono sin tu permiso. Elige el bloqueo de pantalla que quieras utilizar."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Selecciona el método de bloqueo de pantalla alternativo"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Selecciona el método de bloqueo de pantalla alternativo"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Selecciona un método de bloqueo de pantalla alternativo"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opciones de bloqueo de pantalla"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opciones de bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueo de pantalla"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueo facial + contraseña"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuar sin el desbloqueo facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Puedes desbloquear el teléfono con tu cara. Por motivos de seguridad, para utilizar esta opción necesitas un método de bloqueo de pantalla alternativo."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometría y patrón"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometría y PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometría y contraseña"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuar sin biometría"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Puedes desbloquear tu teléfono con biometría. Por motivos de seguridad, para utilizar esta opción necesitas un método de bloqueo de pantalla alternativo."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Inhabilitada por admin., política cifrado o almac. creden."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ninguno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Debe tener menos de <xliff:g id="NUMBER_0">%d</xliff:g> dígito</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"El administrador de dispositivos no permite utilizar un PIN reciente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"El administrador de TI bloquea los PIN comunes. Prueba a utilizar otro PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"No puede incluir un carácter que no sea válido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Debe tener al menos una letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Debe tener al menos un dígito"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Debe contener al menos 1 carácter no numérico</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"El administrador de dispositivos no permite utilizar una contraseña reciente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"El administrador de TI bloquea las contraseñas comunes. Prueba a utilizar otra contraseña."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"No se permite utilizar una secuencia ascendente, descendente ni repetida de dígitos"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -750,7 +769,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="6993526033095292609">"Ajustes de recordatorio"</string>
     <string name="bluetooth_max_connected_audio_devices_string" msgid="3114156958598821615">"Máximo de dispositivos de audio conectados por Bluetooth"</string>
     <string name="bluetooth_max_connected_audio_devices_dialog_title" msgid="4056811727247312473">"Selecciona el número máximo de dispositivos de audio conectados por Bluetooth"</string>
-    <string name="wifi_display_settings_title" msgid="6451625615274960175">"Enviar pantalla"</string>
+    <string name="wifi_display_settings_title" msgid="6451625615274960175">"Enviar"</string>
     <string name="keywords_wifi_display_settings" msgid="5753883229564422679">"proyectar"</string>
     <string name="wifi_display_enable_menu_item" msgid="7391841780777318134">"Habilitar pantalla inalámbrica"</string>
     <string name="wifi_display_no_devices_found" msgid="7904877793677102805">"No hay dispositivos cercanos."</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activar conexión Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Usar Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utilizar Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Ajustes de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurar y administrar puntos de acceso inalámbricos"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Encuadra el código QR abajo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Escanea el código QR para conectarte a la red Wi‑Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartir Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Escanea este código QR con otro dispositivo para conectarlo a \"<xliff:g id="SSID">%1$s</xliff:g>\" y compartir la contraseña"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escanea el código QR con otro dispositivo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Escanea este código QR con otro dispositivo para conectarte a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Vuelve a intentarlo. Si el problema persiste, ponte en contacto con el fabricante del dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Ha habido un error"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Contraseña de la red Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Contraseña del punto de acceso: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conexión automática"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permite que el teléfono se conecte automáticamente a esta red cuando esté cerca"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permitir que el tablet se conecte automáticamente a esta red cuando esté cerca"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permitir conectarse a esta red cuando esté en rango"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Añadir dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Usa un código QR para añadir un dispositivo a esta red"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"El formato del código QR no es válido"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Usar certificados del sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"No proporcionar"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"No validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"No se ha especificado ningún certificado. La conexión no será privada."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"El nombre de la red es demasiado largo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Se debe especificar un dominio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Se necesita un certificado."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Red Wi‑Fi activada"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Con conexión a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Conectando a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Conectando…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Error al conectar a la red"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"La red está fuera de rango"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Dirección MAC del dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Dirección MAC aleatoria"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Dirección MAC aleatorizada (última utilizada)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Dirección IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalles de la red"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de subred"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Direcciones IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Redes guardadas"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Suscripciones"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Otras redes"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Ajustes de IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Este usuario no puede utilizar los ajustes avanzados de Wi‑Fi"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Guardar"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Introduce una dirección de puerta de enlace válida."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Introduce una dirección DNS válida."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Introduce un prefijo de red que tenga entre 0 y 32 caracteres."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a menos que un DNS privado lo anule)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a menos que un DNS privado lo anule)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Puerta de enlace"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Longitud del prefijo de red"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"La aplicación está compartiendo contenido. Para compartir la conexión a Internet, desactiva el punto de acceso y vuelve a activarlo"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"No se ha definido ninguna contraseña"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nombre del punto de acceso"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Otros dispositivos pueden conectarse a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Contraseña del punto de acceso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda del punto de acceso"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Pantalla fluida"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automáticamente la frecuencia de actualización de 60 a 90 Hz en determinados tipos de contenido. Se usará más batería."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Pantalla fluida"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forzar frecuencia de actualización de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Se utiliza la mayor frecuencia de actualización posible para mejorar la capacidad de respuesta a toques y la calidad de las animaciones. Aumenta el uso de batería."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atención a la pantalla"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activado / La pantalla no se apagará si estás mirándola"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Cuando la pantalla está apagada, se activa si hay notificaciones nuevas"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostrar información y hora"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Aumenta el uso de la batería"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Texto en negrita"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamaño de la fuente"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Aumenta o disminuye el tamaño del texto"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Ajustes bloqueo de SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versión de Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Actualización de seguridad de Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo y hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versión de hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID de equipo"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Eliminar APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nuevo APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Guardar"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Descartar"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Cancelar"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"El campo Nombre no puede estar vacío."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"El campo APN no puede estar vacío."</string>
@@ -1593,8 +1611,11 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Las aplicaciones se pueden reiniciar"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Recuperar Wi-Fi, red móvil y Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Se recuperarán todos los ajustes de red, como:\n\n"<li>"Wi‑Fi"</li>\n<li>"Datos móviles"</li>\n<li>"Bluetooth"</li></string>
+    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
+    <skip />
     <string name="reset_esim_title" msgid="6152167073280852849">"Borrar las SIM descargadas"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Para descargar SIM de sustitución, ponte en contacto con tu operador. Esta acción no cancelará ningún plan de servicios móviles."</string>
+    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
+    <skip />
     <string name="reset_network_button_text" msgid="2281476496459610071">"Recuperar ajustes"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"¿Quieres restablecer la configuración de red? No podrás deshacer esta acción."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"¿Quieres recuperar todos los ajustes de red y borrar todas las SIM descargadas? No podrás deshacer esta acción."</string>
@@ -1604,31 +1625,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Se han recuperado los ajustes de red"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"No se pueden borrar las SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"No se pueden eliminar las SIM descargadas debido a un error.\n\nReinicia el dispositivo y vuelve a intentarlo."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Volver al estado de fábrica (borrar todo)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Volver al estado de fábrica (borrar todo)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" del teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Has iniciado sesión en las cuentas que se indican a continuación:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Esta acción no cancelará tu plan de servicios móviles."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Volver al estado de fábrica (borrar todo)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Volver al estado de fábrica (borrar todo)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" de tu tablet, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Se borrarán todos los datos del "<b>"almacenamiento interno"</b>" de tu teléfono, como:\n\n"<li>"Tu cuenta de Google"</li>\n<li>"Los ajustes y los datos de aplicaciones y del sistema"</li>\n<li>"Las aplicaciones descargadas"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Has iniciado sesión en estas cuentas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Hay otros usuarios presentes en este dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Otros datos de usuario"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"No se cancelará tu plan de servicios móviles."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar el "<b>"almacenamiento USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para eliminar la música, las imágenes y otros datos de usuario, debes borrar la "<b>"tarjeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Borrar almacenamiento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Borrar tarjeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Borra todos los datos del almacenamiento USB interno, como la música o las fotos."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Borrar todos los datos de la tarjeta SD"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Borrar todos los datos"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Borrar todos los datos"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Se eliminarán las aplicaciones que hayas descargado y tu información personal. No podrás deshacer esta acción."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Toda tu información personal, incluidas las aplicaciones y las SIM descargadas, se eliminarán. No podrás deshacer esta acción."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Borrar todo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"No se ha reiniciado el sistema porque el servicio Borrado del sistema no está disponible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"¿Borrar todos los datos?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Este usuario no puede restablecer el estado de fábrica"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Borrando"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Espera..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Borrar todos los datos"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Borrar todos los datos"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Se eliminarán las aplicaciones que hayas descargado y tu información personal. No podrás deshacer esta acción."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Se eliminará toda tu información personal, incluidas las aplicaciones y las tarjetas SIM descargadas. No podrás deshacer esta acción."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"¿Borrar todos los datos?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Este usuario no puede restablecer el estado de fábrica"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Borrando"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Espera…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Ajustes de llamadas"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configurar buzón, llamada en espera, desvío e identificador"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Compartir conexión por USB"</string>
@@ -1676,7 +1695,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"No se puede anclar a más de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Se desactivará el anclaje a red de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Compartir Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Comparte la conexión a Internet del teléfono por USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Comparte la conexión a Internet del teléfono por Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utiliza el punto de acceso y la conexión compartida para que otros dispositivos puedan conectarse a Internet a través de tu conexión de datos móviles. Las aplicaciones también pueden crear un punto de acceso para compartir contenido con dispositivos cercanos."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utiliza el punto de acceso y la conexión compartida para que otros dispositivos puedan conectarse a Internet a través de tu red Wi‑Fi o tus datos móviles. Las aplicaciones también pueden crear un punto de acceso para compartir contenido con dispositivos cercanos."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ayuda"</string>
@@ -1718,6 +1737,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Búsqueda de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que las aplicaciones y los servicios busquen dispositivos cercanos en cualquier momento aunque la conexión Bluetooth esté desactivada. Se utiliza, por ejemplo, para mejorar los servicios y funciones basados en la ubicación."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicios de ubicación para el trabajo"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detección de la zona horaria por ubicación"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detección de la zona horaria por ubicación"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite que se utilice la ubicación del dispositivo para detectar la zona horaria actual. Otros ajustes de ubicación (como la búsqueda de redes Wi‑Fi) pueden afectar a la precisión de la detección de la zona horaria."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activada"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desactivada"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Se ha inhabilitado la detección automática de la zona horaria"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"La detección de la zona horaria por ubicación está inhabilitada"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"No se admite la detección de la zona horaria por ubicación"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"No se permiten cambios en la detección de la zona horaria por ubicación"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Ubicación por red móvil y Wi‑Fi"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Permitir que las aplicaciones usen el servicio de ubicación de Google para calcular tu ubicación más rápido. Se recopilarán datos de ubicación anónimos y se enviarán a Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Ubicación determinada por Wi-Fi"</string>
@@ -1781,6 +1809,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Para usar el desbloqueo facial, establece una contraseña"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Para usar el desbloqueo facial, establece un patrón"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Para usar el desbloqueo facial, establece un PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Para usar la biometría, elige una contraseña"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Para usar la biometría, elige un patrón"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Para usar la biometría, elige un PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"¿Has olvidado la contraseña?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"¿Has olvidado el patrón?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"¿Has olvidado el PIN?"</string>
@@ -2117,13 +2148,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencias de subtítulos"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliación"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliación"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Habilitar la ampliación"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Selecciona qué áreas quieres ver al ampliar la pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pantalla completa"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte de la pantalla"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pantalla completa y parte de la pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar toda la pantalla"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte de la pantalla"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"¿Cambiar al botón Accesibilidad?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Cuando se toca tres veces una parte de la pantalla para ampliarla, se retardan la escritura y otras acciones.\n\n¿Quieres pasar a usar el botón Accesibilidad para ampliar la pantalla?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Cambiar al botón Accesibilidad"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Seguir tocando tres veces para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ajustes de ampliación"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar con tres toques"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ampliación con acceso directo"</string>
@@ -2177,11 +2211,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"El botón de encendido cuelga"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Puntero del ratón grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Quitar animaciones"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio en mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combina canales al reproducir audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balance de audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Izquierdo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Derecho"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio en mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combina canales al reproducir audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balance de audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Izquierda"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Derecha"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predeterminado"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,11 +2245,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibración de las notificaciones"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibración del tono"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Respuesta táctil"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usar corrección de color"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar subtítulos"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Solo en aplicaciones admitidas"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usar corrección de color"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar subtítulos"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Solo en aplicaciones compatibles"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tamaño y estilo de los subtítulos"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamaño del texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Más opciones"</string>
@@ -2245,6 +2279,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteronomalía"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalía"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalía"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de grises"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rojo-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rojo-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarillo"</string>
@@ -2374,7 +2409,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restricción en segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permite que la aplicación se ejecute en segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"La aplicación no puede funcionar en segundo plano"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"No se puede restringir el uso en segundo plano"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"No se puede restringir el uso en segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"¿Limitar actividad en segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limitas la actividad en segundo plano de una aplicación, puede que no funcione correctamente"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Esta aplicación no optimiza la batería, por lo que no puedes restringirla.\n\nPara hacerlo, activa antes la optimización."</string>
@@ -2423,6 +2458,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"El tablet se ha usado más de lo normal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"El dispositivo se ha usado más de lo normal"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Quizás se agote la batería antes de lo normal"</string>
+    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
+    <skip />
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batería limitada temporalmente. Toca para ver más información."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Tu teléfono se ha usado más de lo normal y es posible te quedes sin batería antes de lo esperado.\n\nEstas son las aplicaciones que más batería consumen:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tu tablet se ha usado más de lo normal y es posible te quedes sin batería antes de lo esperado.\n\nEstas son las aplicaciones que más batería consumen:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Tu dispositivo se ha usado más de lo normal y es posible te quedes sin batería antes de lo esperado.\n\nEstas son las aplicaciones que más batería consumen:"</string>
@@ -2478,6 +2516,8 @@
       <item quantity="one">%1$d aplicación restringida</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small><font size="20">" <xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Se ha producido un problema al leer tu indicador de batería"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Se ha producido un problema al leer tu indicador de batería. Toca para "<annotation id="url">"consultar más información"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"¿Detener la aplicación?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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 solucionarlo, detén la aplicación.\n\nSi el problema persiste, desinstala la aplicación para mejorar el rendimiento de la batería."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Tu tablet 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 solucionarlo, detén la aplicación.\n\nSi el problema persiste, desinstala la aplicación para mejorar el rendimiento de la batería."</string>
@@ -2591,9 +2631,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Programar"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Amplía la duración de la batería"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desactivar cuando la batería esté cargada"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"El modo Ahorro de batería se desactiva cuando el teléfono está al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"El modo Ahorro de batería se desactiva cuando el teléfono está al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"El modo Ahorro de batería se desactiva cuando el teléfono está al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Ahorro de batería se desactiva cuando tu teléfono tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Ahorro de batería se desactiva cuando tu tablet tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Ahorro de batería se desactiva cuando tu dispositivo tiene más del <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activar"</string>
@@ -2658,6 +2698,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Restablecer"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproducir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividad adaptativa"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Alarga la duración de la batería y mejora el rendimiento del dispositivo gestionando automáticamente las conexiones de red"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Almacenamiento de credenciales"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalar certificados"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instala certificados desde el almacenamiento"</string>
@@ -2669,9 +2711,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciales de usuario"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Consulta y modifica credenciales almacenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avanzado"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamiento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Almacenado en hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Las credenciales no están disponibles para este usuario"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para redes VPN y aplicaciones"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para redes Wi-Fi"</string>
@@ -2687,6 +2726,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"No instalar"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instalar (no seguro)"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"No se ha instalado el certificado"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"¿Permitir que <xliff:g id="APP_NAME">%s</xliff:g> instale certificados en este dispositivo?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Con estos certificados, las aplicaciones y las URL que se indican a continuación podrán identificarte"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"No permitir"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Permitir"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Mostrar más"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App de gestión de certificados"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Ninguna"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Con los certificados que instale esta aplicación, te podrán identificar las aplicaciones y la URL que se indican a continuación"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Quitar"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Señal de llamada de emergencia"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Establecer comportamiento al realizar una llamada de emergencia"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Copia de seguridad"</string>
@@ -3010,7 +3058,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Sin configurar: perfil de trabajo"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Tú (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Apodo"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Puedes añadir hasta <xliff:g id="USER_COUNT">%1$d</xliff:g> usuarios"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Solo el propietario del tablet puede administrar los usuarios."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Solo el propietario del teléfono puede administrar los usuarios."</string>
@@ -3060,7 +3107,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Cómo pagar en el terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura una aplicación de pago. A continuación, solo tienes que sostener la parte trasera del teléfono sobre cualquier terminal con el símbolo de pago contactless."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entendido"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Más..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Más…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Elegir aplicación de pago predeterminada"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualizar aplicación de pago predeterminada"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"En un terminal contactless, paga con <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3177,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Volver"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Siguiente"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finalizar"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Hacer una foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Seleccionar una imagen"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Seleccionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Tarjetas SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Tarjetas SIM"</string>
@@ -3144,7 +3188,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Usar siempre esta para llamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecciona una SIM de datos"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecciona una tarjeta SIM para los SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Cambiando SIM de datos. Este proceso puede tardar hasta un minuto..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Cambiando SIM de datos. Este proceso puede tardar hasta un minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Llamar con"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selecciona una tarjeta SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3331,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, horario, ahorro de batería, ahorro de corriente, batería, automático, porcentaje"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, llamadas avanzadas, llamadas 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"añadir idioma, añadir un idioma, añadir lengua, añadir una lengua"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamaño del texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Sonido predeterminado"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"El volumen del tono de llamada y de las notificaciones está al <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volumen, vibración, No molestar"</string>
@@ -3326,11 +3371,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sonidos de encendido"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtítulos automáticos"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Subtitula automáticamente el contenido multimedia"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ninguna"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horarios establecidos</item>
-      <item quantity="one">1 horario establecido</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ninguno}=1{1 horario creado}other{# horarios creados}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"No molestar"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Recibe notificaciones solo de personas y aplicaciones importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar interrupciones"</string>
@@ -3398,20 +3439,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Solo interrupciones prioritarias"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desactivado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desactivado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Preguntar siempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Hasta que lo desactives"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-      <item quantity="one">1 hora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programaciones se pueden activar automáticamente</item>
-      <item quantity="one">1 programación se puede activar automáticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desactivado}=1{Desactivado; 1 horario puede activarlo automáticamente}other{Desactivado; # horarios pueden activarlo automáticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Qué puede interrumpirte con el modo No molestar"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplicaciones"</string>
@@ -3457,6 +3490,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Establece automáticamente las notificaciones prioritarias como Discretas"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Clasificación de notificaciones adaptable"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Clasificar las notificaciones por importancia automáticamente"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Comentarios sobre notificaciones adaptativas"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica los ajustes hechos a las notificaciones y muestra la opción para enviar comentarios al sistema"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Restablecer la importancia de las notificaciones"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Revierte los cambios en los ajustes de la importancia del usuario y permite que se priorice el asistente de notificaciones"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Acciones y respuestas sugeridas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Muestra automáticamente las acciones y las respuestas sugeridas"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Mostrar notificaciones recientes y pospuestas"</string>
@@ -3554,8 +3591,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Conversaciones prioritarias"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Mostrar en la parte superior de la sección de conversaciones y en forma de burbuja"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Mostrar en la parte superior de la sección de conversaciones"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Otras conversaciones"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Conversaciones no prioritarias"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversaciones en las que has hecho cambios"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Conversaciones recientes"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Borrar recientes"</string>
+    <string name="clear" msgid="5092178335409471100">"Borrar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Convertir conversaciones prioritarias en burbujas"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Las conversaciones prioritarias se muestran en la parte superior del panel desplegable. También puedes configurarlas para que se muestren en burbujas y puedan interrumpirte aunque esté activado No molestar."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Aquí se mostrarán las conversaciones prioritarias y las modificadas"</string>
@@ -3653,7 +3693,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acceso a No molestar"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir No molestar"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ninguna aplicación instalada ha solicitado acceso de No molestar"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Cargando aplicaciones..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Cargando aplicaciones…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Como solicitaste, Android está bloqueando las notificaciones de esta aplicación para que no aparezcan en el dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Como solicitaste, Android está bloqueando esta categoría de notificaciones para que no aparezcan en el dispositivo"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Como solicitaste, Android está bloqueando este grupo de notificaciones para que no aparezcan en el dispositivo"</string>
@@ -3745,11 +3785,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas las conversaciones"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversaciones prioritarias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ninguna"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversaciones</item>
-      <item quantity="one">1 conversación</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ninguna"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ninguna}=1{1 conversación}other{# conversaciones}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quién puede interrumpirte"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Llamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Llamadas"</string>
@@ -3758,11 +3794,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para asegurarte de que las llamadas permitidas suenan, comprueba que el dispositivo está configurado para sonar"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Las llamadas entrantes se bloquean en la programación \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Cambia los ajustes para que tus amigos, familiares u otros puedan contactar contigo."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactos destacados"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> más</item>
-      <item quantity="one">1 más</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ninguno"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nadie}=1{{contact_1}}=2{{contact_1} y {contact_2}}=3{{contact_1}, {contact_2} y {contact_3}}other{{contact_1}, {contact_2} y # más}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sin nombre)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensajes"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensajes"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensajes"</string>
@@ -3771,11 +3804,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Los mensajes entrantes se bloquean en la programación \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Cambia los ajustes para que tus amigos, familiares u otros puedan contactar contigo."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Todos los mensajes pueden interrumpirte"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Todas las llamadas pueden interrumpirte"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ninguno"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contactos</item>
-      <item quantity="one">1 contacto</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nadie}=1{1 contacto}other{# contactos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Todo el mundo"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactos destacados"</string>
@@ -3813,22 +3842,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas las notificaciones"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algunas notificaciones"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Las personas seleccionadas podrán ponerse en contacto contigo, incluso si no permites que las aplicaciones puedan interrumpirte"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> pueden interrumpirte</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> puede interrumpirte</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> más"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ninguna aplicación puede interrumpirte}=1{{app_1} puede interrumpirte}=2{{app_1} y {app_2} pueden interrumpirte}=3{{app_1}, {app_2} y {app_3} pueden interrumpirte}other{{app_1}, {app_2} y # más pueden interrumpirte}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplicaciones"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas las notificaciones"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algunas notificaciones"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificaciones que pueden interrumpirte"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas las notificaciones"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> pueden interrumpirte</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> puede interrumpirte</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada puede interrumpirte"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> más"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada puede interrumpirte}=1{{sound_category_1} puede interrumpirte}=2{{sound_category_1} y {sound_category_2} pueden interrumpirte}=3{{sound_category_1}, {sound_category_2} y {sound_category_3} pueden interrumpirte}other{{sound_category_1}, {sound_category_2} y # más pueden interrumpirte}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada puede interrumpirte"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nadie puede interrumpirte"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algunas personas pueden interrumpirte"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Todo el mundo puede interrumpirte"</string>
@@ -3874,8 +3895,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Activado"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Desactivado"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Fijar aplicaciones"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Al fijar una aplicación, se mantiene visible hasta que dejas de fijarla. Esta función se puede utilizar, por ejemplo, para dejar que alguien de confianza juegue a un juego específico. \n\nEs posible que una aplicación fijada pueda abrir otras aplicaciones y que se pueda acceder a datos personales. \n\nPara fijar una aplicación, sigue estos pasos: \n1. Activa la función de fijar aplicaciones. \n2. Abre Aplicaciones recientes. \n3. Toca el icono de la aplicación situado en la parte superior de la pantalla y, a continuación, toca Fijar."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Al fijar una aplicación, se mantiene visible hasta que dejas de fijarla. Esta función se puede utilizar, por ejemplo, para dejar que alguien de confianza juegue a un juego específico. \n\nEs posible que una aplicación fijada puede abrir otras aplicaciones y que se pueda acceder a datos personales. \n\nSi quieres compartir tu dispositivo con alguien de forma segura, prueba a usar un usuario invitado. \n\nPara fijar una aplicación, sigue estos pasos: 	\n1.	Activa la función de fijar aplicaciones. 	\n2.	Abre Aplicaciones recientes. 	\n3.	Toca el icono de la aplicación situado en la parte superior de la pantalla y, a continuación, toca Fijar."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Al fijar una aplicación, se mantiene visible hasta que dejas de fijarla. Esta función se puede utilizar, por ejemplo, para dejar que alguien de confianza juegue a un juego específico."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Al fijar una aplicación, es posible que se abran otras aplicaciones y que se pueda acceder a datos personales. \n\nPara fijar una aplicación, sigue estos pasos: 	\n1.	Activa la función de fijar aplicaciones. 	\n2.	Abre Aplicaciones recientes. 	\n3.	En la parte superior de la pantalla, toca el icono de la aplicación y, después, toca Fijar."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Al fijar una aplicación, es posible que se abran otras aplicaciones y que se pueda acceder a datos personales. \n\nSi quieres compartir tu dispositivo con alguien de forma segura, prueba con la función para usuarios invitados. \n\nPara fijar una aplicación, sigue estos pasos: 	\n1.	Activa la función de fijar aplicaciones. 	\n2.	Abre Aplicaciones recientes. 	\n3.	En la parte superior de la pantalla, toca el icono de la aplicación y, después, toca Fijar."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Al fijar una aplicación: \n\n• Es posible que se pueda acceder a datos personales (como contactos y contenido de correos). \n• Es posible que las aplicaciones fijadas abran otras aplicaciones. \n\n\nUsa la función de fijar aplicaciones solo con personas de confianza."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Solicitar patrón de desbloqueo para desactivar"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Solicitar PIN para desactivar"</string>
@@ -3897,6 +3919,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Además de utilizar tu cara para desbloquear el dispositivo, puedes protegerlo aún más si lo configuras para solicitar el PIN antes de iniciarse. El dispositivo no recibe llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Quieres que el dispositivo pida el PIN para iniciarse?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Además de utilizar tu cara para desbloquear el dispositivo, puedes protegerlo aún más si lo configuras para solicitar el patrón antes de iniciarse. El dispositivo no recibe llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Quieres que el dispositivo pida el patrón para iniciarse?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Además de utilizar tu cara para desbloquear el dispositivo, puedes protegerlo aún más si lo configuras para solicitar la contraseña antes de iniciarse. El dispositivo no recibe llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Quieres que el dispositivo pida la contraseña para iniciarse?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Además de utilizar biometría para desbloquear tu dispositivo, puedes protegerlo aún más si lo configuras para solicitar el PIN antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Además de utilizar biometría para desbloquear tu dispositivo, puedes protegerlo aún más si lo configuras para solicitar el patrón antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Además de utilizar biometría para desbloquear tu dispositivo, puedes mejorar su protección si lo configuras para solicitar la contraseña antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sí"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restringida"</string>
@@ -4072,7 +4097,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo conectado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Cambiando..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Cambiando…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"No se ha podido hacer el cambio"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Cargando este dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Cargando dispositivo conectado"</string>
@@ -4266,6 +4291,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Uso de datos móviles"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Uso de datos de las aplicaciones"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Uso de datos con Wi‑Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Uso de datos que no son de operadores"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Uso de datos de Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4310,7 @@
       <item quantity="one">1 restricción</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"El cálculo del uso de datos del operador puede ser diferente al calculado por el dispositivo."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"No se incluyen los datos utilizados en redes de operadores"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> usados"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Establecer advertencia de datos"</string>
     <string name="data_warning" msgid="2925054658166062884">"Advertencia de datos"</string>
@@ -4319,7 +4346,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalles"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Ahorro de datos"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Datos sin restricción"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Las datos en segundo plano están desactivadas"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Los datos en segundo plano están desactivados"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activado"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desactivado"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usar ahorro de datos"</string>
@@ -4342,7 +4369,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Si el dispositivo está bloqueado, evitar que se escriban respuestas u otros textos en las notificaciones"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corrector predeterminado"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Elige corrector ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Usar corrector ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usar corrector ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"No seleccionado"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ninguno)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4459,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Para liberar espacio, el Administrador de Almacenamiento borrará de tu dispositivo las fotos y vídeos que tengan copia de seguridad."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Borrar fotos y vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Administrador de almacenamiento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utilizar el Administrador de Almacenamiento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usar administrador de almacenamiento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liberar espacio ahora"</string>
@@ -4470,6 +4497,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Doble toque para consultar el teléfono"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Doble toque para consultar el tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Doble toque para consultar el dispositivo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Desliza para ver notific."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Desliza el dedo hacia abajo en el borde inferior para ver tus notificaciones"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo una mano"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usar modo una mano"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Salir al cambiar de aplicación"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tiempo de espera"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"fácil alcance"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Toca la pantalla dos veces para consultar la hora, las notificaciones y otra información."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar el teléfono para consultarlo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levantar el tablet para comprobar las notificaciones"</string>
@@ -4482,6 +4519,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toca para comprobar el tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toca para comprobar el dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para ver la hora, las notificaciones y otra información, toca la pantalla."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS de emergencia"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Usar SOS de emergencia"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gestionado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Inicia las acciones que se indican más abajo pulsando rápidamente el botón de encendido 5 o más veces."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Poner alarma de cuenta atrás"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Emite un fuerte sonido antes de pedir ayuda."</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Llamar para pedir ayuda"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Número al que llamar para pedir ayuda"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>; toca para cambiarlo"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Si indicas un número que no es de los servicios de emergencias:\n • El dispositivo debe estar desbloqueado para usar SOS de emergencia.\n • Puede que no se responda a tu llamada."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar por el sensor de huellas para ver notificaciones"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Deslizar por sensor de huella digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales de la parte trasera del teléfono."</string>
@@ -4607,6 +4654,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Número máximo de conjuntos de datos visibles"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Restablecer valores predeterminados"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Se ha restablecido la opción de autocompletar las opciones del desarrollador"</string>
+    <string name="location_category" msgid="3496759112306219062">"Ubicación"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicador de ubicación en la barra de estado"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Mostrar con todas las ubicaciones, incluidas la red y la conectividad"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forzar mediciones de GNSS completas"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Registrar todas las frecuencias y constelaciones de GNSS sin ciclo de servicio"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema del dispositivo"</string>
     <string name="default_theme" msgid="4815428567082263639">"Predeterminado"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nombre de la red"</string>
@@ -4623,8 +4675,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pausa las notificaciones para concentrarte"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Función no disponible"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Esta función se ha desactivado porque ralentiza el teléfono"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forzar mediciones de GNSS completas"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Registrar todas las frecuencias y constelaciones de GNSS sin ciclo de servicio"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Mostrar siempre el cuadro de diálogo de fallos"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Mostrar el cuadro de diálogo cuando una aplicación falle"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Seleccionar una aplicación para usar ANGLE"</string>
@@ -4636,7 +4686,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Habilitar en todas las aplicaciones"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleccionar controlador de gráficos"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Opción predeterminada"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de juegos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de juegos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador para desarrolladores"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador de gráficos del sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4742,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Activado (silenciar)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Desactivado"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detalles de la red"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Las aplicaciones de tu teléfono pueden ver el nombre de tu dispositivo. También es posible que lo vean otros usuarios si lo conectas con dispositivos Bluetooth o configuras un punto de acceso Wi‑Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Las aplicaciones de tu teléfono pueden ver el nombre de tu dispositivo. También es posible que lo vean otros usuarios si lo conectas con dispositivos Bluetooth, si te conectas a una red Wi-Fi o si configuras un punto de acceso Wi‑Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Dispositivos"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Todos los ajustes"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Sugerencias"</string>
@@ -4705,6 +4755,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"No se ha encontrado ninguna red. Vuelve a intentarlo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(prohibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"No hay ninguna tarjeta SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"Tarjeta SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ninguna tarjeta SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nada"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Se necesita una tarjeta SIM para conectarse"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Se necesita una tarjeta SIM de <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> para conectarse"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferencia de modo de red: WCDMA preferido"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferencia de modo de red: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferencia de modo de red: solo WCDMA"</string>
@@ -4758,6 +4813,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datos móviles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acceder a datos con la red móvil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"El teléfono cambiará automáticamente a este operador cuando esté en su rango"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ninguna tarjeta SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencias de llamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencia de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Preguntar siempre"</string>
@@ -4818,6 +4874,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"No está disponible cuando se está conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ver más"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"¿Activar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"¿Activar tarjeta SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"¿Cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"¿Pasar a usar tarjeta SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Solo puede haber una tarjeta SIM activa a la vez.\n\nSi cambias a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, no se cancelará tu servicio de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Solo puede haber una tarjeta SIM descargada activa a la vez.\n\nSi cambias a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, no se cancelará tu servicio de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Solo puede haber una tarjeta SIM activa a la vez.\n\nSi cambias, no se cancelará tu servicio de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Conectándose a la red…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Cambiando a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"No se ha podido cambiar de operador"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"No se ha podido cambiar de operador debido a un error."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"¿Desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"¿Desactivar tarjeta SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desactivando tarjeta SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"No se ha podido inhabilitar el operador"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Se ha producido un error y no se ha podido inhabilitar tu operador."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"¿Usar 2 tarjetas SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo puede tener 2 tarjetas SIM activas a la vez. Para seguir usando solo una, toca No, gracias."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"¿Reiniciar el dispositivo?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Para empezar, reinicia tu dispositivo. A continuación, podrás añadir otra tarjeta SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"No, gracias"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Cambiar"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"No se ha podido activar la tarjeta SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Extrae la tarjeta SIM e insértala de nuevo. Si el problema continúa, reinicia el dispositivo."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prueba a activar la tarjeta SIM de nuevo. Si el problema continúa, reinicia el dispositivo."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activación de la red"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> está activo"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toca para actualizar los ajustes de la tarjeta SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Tarjeta SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"¿Borrar esta SIM descargada?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Si borras esta SIM, el servicio de <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> dejará de estar disponible en este dispositivo.\n\nNo se cancelará el servicio de <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Borrar"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Borrando SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"No se puede borrar la SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"No se puede borrar esta SIM debido a un error.\n\nReinicia el dispositivo y vuelve a intentarlo."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectar a dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"La aplicación <xliff:g id="APPNAME">%1$s</xliff:g> quiere usar una red Wi-Fi temporal para conectarse a tu dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"No se ha encontrado ningún dispositivo. Comprueba que estén encendidos y listos para conectarse."</string>
@@ -4889,6 +4983,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Llamadas de emergencia"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Este operador no admite las llamadas de emergencia por Wi‑Fi.\nEl dispositivo cambia automáticamente a una red móvil para hacer una llamada de emergencia.\nSolo se pueden hacer llamadas de emergencia en zonas con cobertura móvil."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Usar Wi‑Fi en las llamadas para mejorar la calidad"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Llamadas entre tarjetas SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Permite usar esta SIM para hacer llamadas y enviar SMS como si fuera otra SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"llamadas entre tarjetas SIM"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Mensaje MMS entrante"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"No se puede enviar el mensaje MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Toca para permitir mensajes MMS con <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> cuando los datos móviles estén desactivados"</string>
@@ -4940,10 +5037,50 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir las superposiciones en pantallas de Ajustes"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permite que otras aplicaciones se superpongan a la aplicación ajustes"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimedia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ocultar reproductor al acabar la sesión multimedia"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"El reproductor te permite seguir con una sesión desde el panel ampliado de ajustes rápidos."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Reproductor multimedia en los ajustes rápidos"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Muestra el reproductor durante mucho tiempo para que puedas reanudar fácilmente el contenido"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar reproductor"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar reproductor"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"No hay reproductores disponibles"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplicaciones permitidas"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multimedia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Se activará el Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Activado"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivado"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para modo avión"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Busca y conéctate a redes seguras para modo avión"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"modo avión, seguro para modo avión"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Llamadas y SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Llamada por Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Llama o recibe llamadas por redes que no sean de ningún operador, como redes Wi-Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Con las llamadas por Wi‑Fi, puedes llamar y recibir llamadas por redes que no son de operadores, como ciertas redes Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Llamadas"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferida"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"preferida para las llamadas"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"preferida para los SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"no disponible"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sin tarjeta SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"conexión de red, internet, inalámbrico, datos, wifi, wi-fi, wi fi, datos móviles, móvil, operador de telefonía, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver redes seguras para aviones"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desactivar modo avión"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"No disponible porque el modo Descanso está activado"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Borrado de la importancia de las notificaciones completado."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplicaciones"</string>
+    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <skip />
 </resources>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 036cf5f..1bdf94b 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Keskmine"</item>
     <item msgid="6740026006576843477">"Pikk"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Lühike"</item>
+    <item msgid="7397961711906421599">"Keskmine"</item>
+    <item msgid="4079132024502041928">"Pikk"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Vaikeseade"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Üldine"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Ainult TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Üldine"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 779ffc1..e294c19 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Kuupäev ja kellaaeg"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Kuupäeva ja kellaaja määramine"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Määra kuupäev, kellaaeg, ajavöönd ja vormingud"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Kasuta võrgu pakutud kellaaega"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Kasuta võrgu pakutud ajavööndit"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Kellaaja automaatne määramine"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Ajavööndi automaatne määramine"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Kasuta lokaadi vaikeseadet"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-tunnine vorming"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-tunnise vormingu kasutamine"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Kuva lukustusekraanil profiili teave"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Kontod"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Asukoht"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Kasuta asukohta"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Kasuta asukohta"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Väljas"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Sees – <xliff:g id="COUNT_1">%1$d</xliff:g> rakendusel on asukohale juurdepääs</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekraanilukk, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekraanilukk, sõrmejälg"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekraanilukk"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Avage telefon turvaliselt oma näo ja sõrmejäljega"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Samuti saate rakendustesse sisse logida ja makseid kinnitada"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Seadistage avamine järgmisega."</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Muutke oma telefoni avamine imelihtsaks"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Sõrmejälg"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Säästke aega, avades telefoni oma taskus"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Jäta vahele"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Järgmine"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Nägu on lisatud"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Seadistage Face Unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Kasutage autentimiseks oma nägu"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Alustamine"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Kui juurdepääsetavuse Face Unlock välja lülitatakse, ei pruugi mõned seadistustoimingud TalkBackiga õigesti töötada."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Mine tagasi"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Jätka seadistamist"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Kasuta juurdepääset. seadistust"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Face Unlocki kasutamisel rakendustes nõutakse alati kinnitustoimingut"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Kustuta näoandmed"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Funktsiooni Face Unlock seadistamine"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Kasutage Face Unlocki oma seadme avamiseks, rakendustesse sisselogimiseks ja maksete kinnitamiseks.\n\nTasub teada.\nTelefoni vaatamisel võib see soovimatult avaneda.\n\nKeegi teine võib teie telefoni avada, kui seda hoitakse teie näo ees.\n\nVõib juhtuda, et teiega väga sarnane inimene, näiteks teie kaksikvend/-õde, saab teie telefoni avada."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Kasutage Face Unlocki oma seadme avamiseks, rakendustesse sisselogimiseks ja maksete kinnitamiseks.\n\nTasub teada.\nTelefoni vaatamisel võib see soovimatult avaneda.\n\nKeegi teine võib teie telefoni avada, kui seda hoitakse teie näo ees. Seda isegi siis, kui teie silmad on suletud.\n\nTelefoni saab avada teiega sarnane inimene, nt teie identne vend/õde."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Kasutage funktsiooni Face Unlock seadme avamiseks, rakendustesse sisselogimiseks ja maksete kinnitamiseks."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Pidage meeles järgmist.\nTelefoni vaatamisel võib see soovimatult avaneda.\n\nKeegi teine võib teie telefoni avada, kui seda hoitakse teie näo ees.\n\nTeiega sarnane inimene, näiteks teie identne vend/õde, saab teie telefoni avada."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Pidage meeles järgmist.\nTelefoni vaatamisel võib see soovimatult avaneda.\n\nKeegi teine võib teie telefoni avada, kui seda hoitakse teie näo ees. Seda isegi siis, kui teie silmad on suletud.\n\nTeiega sarnane inimene, näiteks teie identne vend/õde, saab teie telefoni avada."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Kas soovite näoandmed kustutada?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Face Unlocki kasutatavad näoandmed kustutatakse jäädavalt ja turvaliselt. Pärast eemaldamist vajate telefoni avamiseks, rakendustesse sisselogimiseks ja maksete kinnitamiseks PIN-koodi, mustrit või parooli."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Kasutage oma telefoni avamiseks funktsiooni Face Unlock"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Kasutage telefoni avamiseks või ostude kinnitamiseks oma sõrmejälge.\n\nMärkus: te ei saa kasutada oma sõrmejälge selle seadme avamiseks. Lisateabe saamiseks võtke ühendust oma organisatsiooni administraatoriga."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Kasutage telefoni avamiseks või ostude kinnitamiseks oma sõrmejälge.\n\nMärkus: teie sõrmejälg võib olla ebaturvalisem kui tugev muster või PIN-kood."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Tühista"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Tänan, ei"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Jätka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Jäta vahele"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Järgmine"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Kaitstes oma tahvelarvuti ekraaniluku valikuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka Face Unlocki seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Kaitstes oma seadme ekraaniluku valikuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka Face Unlocki seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Kaitstes oma telefoni ekraanilukuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraanilukku on vaja ka Face Unlocki seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Kaitstes oma tahvelarvutit ekraaniluku valikuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka biomeetria seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Kaitstes oma seadet ekraaniluku valikuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka biomeetria seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Kaitstes oma telefoni ekraaniluku valikuga, ei saa keegi seda kasutada, kui see kaotsi läheb või varastatakse. Ekraaniluku valikut on vaja ka biomeetria seadistamiseks. Tagasiminemiseks puudutage valikut Tühista."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Kas jätta PIN-koodi määramine vahele?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Kas jätta parooli määramine vahele?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Kas jätta mustri määramine vahele?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata tahvelarvutit kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata seadet kasutada. Valige kasutatav ekraanilukk."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Aktiveerige seadme kaitsefunktsioonid, et teised ei saaks ilma teie loata telefoni kasutada. Valige kasutatav ekraanilukk."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Valige oma ekraaniluku varumeetod"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Valige oma ekraaniluku varumeetod"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Valige oma ekraaniluku varumeetod"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Ekraaniluku valikud"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Ekraaniluku valikud"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Ekraanilukk"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face Unlock + parool"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Jätka ilma Face Unlockita"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefoni võite avada oma näoga. Turvalisuse tagamiseks nõuab see valik varuekraanilukku."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biomeetria ja muster"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biomeetria ja PIN-kood"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biomeetria ja parool"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Jätka ilma biomeetriata"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefoni saate avada oma biomeetriaga. Turvalisuse tagamiseks nõuab see valik varuekraanilukku."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Administraator, krüpteerimiseeskirjad või mandaatide salvestusruum on selle keelanud"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Puudub"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Pühkimine"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Peab olema alla <xliff:g id="NUMBER_0">%d</xliff:g> numbri</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Seadme administraator ei luba kasutada viimast PIN-koodi"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT-administraator on levinud PIN-koodid blokeerinud. Proovige muud PIN-koodi."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"See ei tohi sisaldada sobimatut tähemärki"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Peab sisaldama vähemalt ühte tähte"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Peab sisaldama vähemalt ühte numbrit"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Peab sisaldama vähemalt 1 tähemärki, mis ei ole number</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Seadme administraator ei luba kasutada hiljutist parooli"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT-administraator on levinud paroolid blokeerinud. Proovige muud parooli."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Kasvavad, kahanevad või korduvad numbrijadad on keelatud"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Kinnita"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Tühista"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Lülita WiFi sisse"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"WiFi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"WiFi kasutus"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"WiFi kasutus"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"WiFi-seaded"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"WiFi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Määra ja halda traadita pääsupunkte"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Võrguga „<xliff:g id="SSID">%1$s</xliff:g>” ühenduse oomiseks paigutage QR-kood allolevas aknas keskele"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Liituge WiFi-võrguga, skannides QR-koodi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"WiFi jagamine"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skannige see QR-kood, et luua ühendus võrguga „<xliff:g id="SSID">%1$s</xliff:g>” ja jagada parooli"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Võrguga „<xliff:g id="SSID">%1$s</xliff:g>” liitumiseks skannige see QR-kood teise seadmega"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Võrguga „<xliff:g id="SSID">%1$s</xliff:g>” ühenduse loomiseks skannige see QR-kood"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Proovige uuesti. Kui see probleem jätkub, võtke ühendust seadme tootjaga"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Midagi läks valesti"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"WiFi-võrgu parool: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Kuumkoha parool: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automaatne ühendamine"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Luba telefonil selle võrgu läheduses automaatselt ühendada"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Luba tahvelarvutil selle võrgu läheduses automaatselt ühendada"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Luba levialas selle võrguga ühendamine"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Seadme lisamine"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Kasutage sellesse võrku seadme lisamiseks QR-koodi"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-kood ei ole sobilik vorming"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Kasuta süsteemi sertifikaate"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ära esita"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ära kinnita"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Sertifikaati pole määratud. Teie ühendus pole privaatne."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Võrgu nimi on liiga pikk."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domeeni määramine on kohustuslik."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikaat on nõutav."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Ühenda"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"WiFi on sisse lülitatud"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Ühendatud võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Ühendamine võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Ühendamine …"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Võrguga ühenduse loomine ebaõnnestus"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Te ei ole võrgu levialas"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Seadme MAC-aadress"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Juhulikustatud MAC-aadress"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Juhuslikustatud MAC-aadress (viimati kasutatud)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-aadress"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Võrgu üksikasjad"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Alamvõrgu mask"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-aadressid"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Salvestatud võrgud"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Tellimused"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Muud võrgud"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP-seaded"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"WiFi täpsemad seaded pole selle kasutaja jaoks saadaval"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Salvesta"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Sisestage kehtiv lüüsi aadress."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Sisestage kehtiv DNS-aadress."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Sisestage võrgu eesliide pikkusega 0 kuni 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (kui privaatne DNS pole seda alistanud)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (kui privaatne DNS pole seda alistanud)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Lüüs"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Võrgu prefiksi pikkus"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"WiFi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Rakendus jagab sisu. Interneti-ühenduse jagamiseks lülitage kuumkoht välja ja seejärel uuesti sisse."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Parool on määramata"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Kuumkoha nimi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Võrgu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sisselülitamine …"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Kuumkoha <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sisselülitamine …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Teised seadmed saavad luua ühenduse võrguga <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Kuumkoha parool"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Pääsupunkti sagedusriba"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Suurendab teatud sisu puhul värskendamissagedust 60 hertsilt 90 hertsini. Akukasutus suureneb."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Jõusta 90 Hz värskendamissagedus"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Kõrgeim värskendamissagedus täiustab puutetundlikkust ja pakub sujuvamaid animatsioone. Akukasutus suureneb."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ekraanivaatamise tuvastus"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Sees / ekraan jääb sisselülitatuks, kui seda vaatate"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kui ekraan on välja lülitatud, lülitatakse see uute märguannete puhul sisse"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Alati aja ja teabe kuvamine"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Suurem akukasutus"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Paks tekst"</string>
     <string name="title_font_size" msgid="570613010306330622">"Fondi suurus"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Teksti suuremaks või väiksemaks muutmine"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM-kaardi luku seaded"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Androidi versioon"</string>
     <string name="security_patch" msgid="4071756145347865382">"Androidi turvavärskendus"</string>
     <string name="model_info" msgid="8997566254717810904">"Mudel"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Mudel: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Mudel ja riistvara"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Riistvara versioon"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Seadme ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Kustuta pääsupunktinimi"</string>
     <string name="menu_new" msgid="6571230342655509006">"Uus pääsupunkt"</string>
     <string name="menu_save" msgid="6611465355127483100">"Salvesta"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Loobu"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Tühista"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Nimeväli ei tohi tühi olla."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN ei saa olla tühi."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Rakendused saab lähtestada"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Lähtesta WiFi, mobiilne andmeside ja Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"See lähtestab kõik võrguseaded, sh:\n\n"<li>"WiFi"</li>\n<li>"Mobiilne andmeside"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Kustuta"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Kustuta allalaaditud SIM-id"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Asendus-SIM-kaartide allalaadimiseks võtke ühendust operaatoriga. See ei tühista mobiilsideteenuse pakette."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"See ei tühista mobiilsideteenuse pakette. Asendus-SIM-kaartide allalaadimiseks võtke ühendust operaatoriga."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Lähtesta seaded"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Kas soovite kõik võrguseaded lähtestada? Seda toimingut ei saa tagasi võtta."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Kas soovite kõik võrguseaded lähtestada ja allalaaditud SIM-id kustutada? Seda toimingut ei saa tagasi võtta."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Võrguseaded lähtestati"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-kaarte ei saa kustutada"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Allalaaditud SIM-kaarte ei saa vea tõttu kustutada.\n\nTaaskäivitage seade ja proovige uuesti."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Kõigi andmete kustutamine (tehaseseadetele lähtestamine)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Kõigi andmete kustutamine (tehaseseaded)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"See kustutab teie tahvelarvuti "<b>"sisemälust"</b>" kõik andmed, sh:\n\n"<li>"teie Google\'i konto;"</li>\n<li>"süsteemi ja rakenduste andmed ning seaded;"</li>\n<li>"allalaaditud rakendused."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"See kustutab teie telefoni "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Seadmes on teisi kasutajaid.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muusika"</li>\n<li>"Fotod"</li>\n<li>"Muud kasutajaandmed"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-id"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"See ei tühista teie mobiilsideteenuse paketti."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Muusika, piltide ja muu kasutajateabe kustutamiseks tuleb tühjendada ka "<b>"USB-mäluseade"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Muusika, piltide ja muude kasutajaandmete kustutamiseks tuleb tühjendada ka "<b>"SD-kaart"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Kustuta kõik andmed (tehaseseadetele lähtestamine)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Kõigi andmete kustutamine (tehaseseaded)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"See kustutab teie tahvelarvuti "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"See kustutab teie telefoni "<b>"sisemälust"</b>" kõik andmed, sh järgmised.\n\n"<li>"Teie Google\'i konto"</li>\n<li>"Süsteemi- ja rakenduste andmed ning seaded"</li>\n<li>"Allalaaditud rakendused"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Olete praegu sisse logitud järgmistele kontodele:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Seadmes on teisi kasutajaid.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muusika"</li>\n<li>"Fotod"</li>\n<li>"Muud kasutajaandmed"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-id"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"See ei tühista teie mobiilsideteenuse paketti."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Muusika, piltide ja muude kasutajaandmete kustutamiseks tuleb tühjendada ka "<b>"USB-mäluseade"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Muusika, piltide ja muude kasutajaandmete kustutamiseks tuleb tühjendada ka "<b>"SD-kaart"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Kustuta USB-mäluseade"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Kustuta SD-kaart"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Sisemiselt USB-mäluseadmelt kõikide andmete (nt muusika või fotode) kustutamine"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD-kaardilt kõigi andmete (nt muusika või fotode) kustutamine"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Kustuta kõik andmed"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Kustuta kõik andmed"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Kõik teie isiklikud andmed ja allalaaditud rakendused kustutatakse. Seda toimingut ei saa tagasi võtta."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Kõik teie isiklikud andmed, sealhulgas allalaaditud rakendused ja SIM-id kustutatakse. Seda toimingut ei saa tagasi võtta."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Kustuta kõik"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Lähtestust ei tehtud, sest süsteemi kustutamise teenus pole saadaval."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Kas kustutada kõik andmed?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Tehaseseadetele lähtestamine pole selle kasutaja puhul saadaval"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Kustutamine"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Oodake ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Kustuta kõik andmed"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Kustuta kõik andmed"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Kõik teie isiklikud andmed ja allalaaditud rakendused kustutatakse. Seda toimingut ei saa tagasi võtta."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Kõik teie isiklikud andmed, sealhulgas allalaaditud rakendused ja SIM-kaardid kustutatakse. Seda toimingut ei saa tagasi võtta."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Kas kustutada kõik andmed?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Tehaseseadetele lähtestamine pole selle kasutaja puhul saadaval"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Kustutamine"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Oodake …"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Kõneseaded"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Seadista kõnepost, kõne edastamine, ootel kõne, helistaja ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB jagamine"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Ei saa jagada rohkem kui <xliff:g id="MAXCONNECTION">%1$d</xliff:g> seadmele."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühenduse jagamine lõpetatakse."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Etherneti jagamine"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Telefoni internetiühenduse jagamine USB Etherneti kaudu"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Telefoni internetiühenduse jagamine Etherneti kaudu"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Teistele seadmetele mobiilse andmesidevõrgu kaudu Interneti-ühenduse pakkumiseks kasutage kuumkohta ja ühenduse jagamist. Samuti saavad kuumkoha luua rakendused, et jagada sisu läheduses olevate seadmetega."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Teistele seadmetele WiFi- või mobiilse andmesidevõrgu kaudu internetiühenduse pakkumiseks kasutage kuumkohta ja ühenduse jagamist. Samuti saavad kuumkoha luua rakendused, et jagada sisu läheduses olevate seadmetega."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Abi"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetoothi skannimine"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Lubage rakendustel ja teenustel alati otsida läheduses olevaid seadmeid, isegi kui Bluetooth on väljas. Seda saab kasutada näiteks asukohapõhiste funktsioonide ja teenuste täiustamiseks."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Asukohateenused töö jaoks"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Asukohapõhine ajavööndi tuvastamine"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Asukohapõhine ajavööndi tuvastamine"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Lubab kasutada seadme asukohta praeguse ajavööndi tuvastamiseks. Ajavööndi tuvastamise täpsust võivad mõjutada teised asukohaseaded, näiteks WiFi-skannimine."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Sees"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Väljas"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automaatne ajavööndi tuvastamine on keelatud"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Asukohapõhine ajavööndi tuvastamine on keelatud"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Asukohapõhine ajavööndi tuvastamine pole toetatud"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Asukohapõhise ajavööndi tuvastamise muudatused pole lubatud"</string>
     <string name="location_network_based" msgid="5247042890080021887">"WiFi/mobiilsidevõrgu asukoht"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Lubage rakendustel kasutada Google\'i asukohateenust, et asukohta kiiremini määrata. Kogutud anonüümsed asukohaandmed saadetakse Google\'ile."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"WiFi järgi määratud asukoht"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Määrake Face Unlocki kasutamiseks parool"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Määrake Face Unlocki kasutamiseks muster"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Määrake Face Unlocki kasutamiseks PIN-kood"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biomeetria kasutamiseks määrake parool"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biomeetria kasutamiseks määrake muster"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biomeetria kasutamiseks määrake PIN-kood"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Kas unustasite parooli?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Kas unustasite mustri?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Kas unustasite PIN-koodi?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Subtiitrite eelistused"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Suurendus"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Suurendusala"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Suurendamise lubamine"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Valige ala(d), mida ekraanikuva suurendamisel suurendada"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Täisekraan"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Osa ekraanikuvast"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Täisekraan ja osa ekraanikuvast"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Kogu ekraanikuva suurendamine"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ekraanikuva osa suurendamine"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Kas lülitada juurdepääsetavuse nupule?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Kolmikpuudutuse kasutamine ekraanikuva teatud osa suurendamiseks põhjustab teksti sisestamisel ja muude toimingute tegemisel viiteid.\n\nKas soovite suurendamiseks lülitada juurdepääsetavuse nupu kasutamisele?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Lülita juurdepääsetavuse nupule"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Säilita suurendamiseks kolmikpuudutus"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Suurendamisseaded"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Kolmikpuudutusega suurendamine"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Otsetee abil suurendamine"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Toitenupp lõpetab kõne"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Suur hiirekursor"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animatsioonide eemaldamine"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monoheli"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kanalite ühendamine heli esitamisel"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Heli tasakaal"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vasak"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Parem"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monoheli"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kanalite ühendamine heli esitamisel"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Heli tasakaal"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Vasak"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Parem"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Vaikeseade"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekundit"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekundit"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Märguanne koos vibreerimisega"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Helin koos vibreerimisega"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Puudutuste tagasiside"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Kasuta funktsiooni <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Ava <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Kasuta värvide korrigeerimist"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Kuva subtiitrid"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Ainult toetatud rakendustes"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Kasuta rakendust <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"URL-i <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> avamine"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Kasuta värvide korrigeerimist"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Kuva subtiitrid"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Ainult toetatud rakendustes"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Subtiitrite suurus ja stiil"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Teksti suurus – <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Rohkem valikuid"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Halltoonid"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Punane-roheline"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Punane-roheline"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Sinine-kollane"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Taustal kasutamise piiramine"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Lubatakse rakenduse taustal käitamine"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Rakendusel ei ole lubatud taustal töötada"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Taustal kasutamist ei saa piirata"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Taustal kasutamist ei saa piirata"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Kas piirata taustal tegevust?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Kui piirate rakenduse tegevust taustal, võib rakendus toimida valesti."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Kuna rak. pole aku optimeerimine seadistatud, ei saa te seda piirata.\n\nRak. piiramiseks lülit. esmalt sisse aku optimeerimine."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tahvelarvutit on kasutatud tavapärasest rohkem"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Seadet on kasutatud tavapärasest rohkem"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Aku võib tavapärasest kiiremini tühjaks saada"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimeerimine aku seisukorra põhjal"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Akutase on ajutiselt piiratud. Lisateabe saamiseks puudutage."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Teie telefoni on kasutatud tavapärasest rohkem. Aku võib oodatust kiiremini tühjaks saada.\n\nEnim akut kasutanud rakendused:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Teie tahvelarvutit on kasutatud tavapärasest rohkem. Aku võib oodatust kiiremini tühjaks saada.\n\nEnim akut kasutanud rakendused:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Teie seadet on kasutatud tavapärasest rohkem. Aku võib oodatust kiiremini tühjaks saada.\n\nEnim akut kasutanud rakendused:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d rakendus on piiratud</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Probleem akumõõdiku lugemisel"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Probleem akumõõdiku lugemisel. "<annotation id="url">"Lisateabe"</annotation>" saamiseks puudutage"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Kas peatada rakendus?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Teie telefon ei saa akut tavapärasel moel hallata, kuna <xliff:g id="APP">%1$s</xliff:g> hoiab seadet ärkvel.\n\nProbleemi lahendamiseks võite proovida rakenduse peatada.\n\nKui probleem ei lahene, tuleb teil aku tööea pikendamiseks võib-olla rakendus desinstallida."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Teie tahvelarvuti ei saa akut tavapärasel moel hallata, kuna <xliff:g id="APP">%1$s</xliff:g> hoiab seadet ärkvel.\n\nProbleemi lahendamiseks võite proovida rakenduse peatada.\n\nKui probleem ei lahene, tuleb teil aku tööea pikendamiseks võib-olla rakendus desinstallida."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ajakava määramine"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Aku tööea pikendamine"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Lülita välja, kui aku on täis laetud"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Akusäästja lülitub välja, kui telefoni aku laetuse tase on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Akusäästja lülitub välja, kui tahvelarvuti aku laetuse tase on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Akusäästja lülitub välja, kui seadme aku laetuse tase on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Akusäästja lülitub välja, kui telefoni laetuse tase ületab <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Akusäästja lülitub välja, kui tahvelarvuti laetuse tase ületab <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Akusäästja lülitub välja, kui seadme laetuse tase ületab <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Lülita sisse"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Lähtesta"</string>
     <string name="tts_play" msgid="2945513377250757221">"Esita"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Kohanduv ühenduvus"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Pikendab aku tööiga ja täiustab seadme toimivust, hallates automaatselt teie võrguühendusi"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Mandaatide salvestusruum"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sertifikaadi installimine"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikaatide installimine salvestusseadmelt"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kasutaja mandaadid"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Salvestatud mandaatide vaatamine ja muutmine"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Täpsemad"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Salvestusruumi tüüp"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Riistvaratoega"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Ainult tarkvara"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Mandaadid pole selle kasutaja jaoks saadaval"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installitud VPN-i ja rakenduste jaoks"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installitud WiFi jaoks"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ära installi"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Installi ikkagi"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sertifikaat on installimata"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Kas lubada rakendusel <xliff:g id="APP_NAME">%s</xliff:g> sellesse seadmesse sertifikaadid installida?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Need sertifikaadid tuvastavad teid allolevate rakenduste ja URL-ide jaoks"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Ära luba"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Luba"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Kuva rohkem"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Sertifikaadihalduse rakendus"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Pole"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Selle rakenduse installitud sertifikaadid tuvastavad teid allolevates rakendustes ja URL-idel"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Eemalda"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Hädaabikõne signaal"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Määra käitumine hädaabikõne korral"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Varundamine"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Seadistamata – tööprofiil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administraator"</string>
     <string name="user_you" msgid="3070562015202859996">"Teie (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Hüüdnimi"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Saate lisada kuni <xliff:g id="USER_COUNT">%1$d</xliff:g> kasutajat"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Ainult tahvelarvuti omanik saab hallata kasutajaid."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Ainult telefoni omanik saab hallata kasutajaid."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Terminali kaudu maksmine"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Seadistage makserakendus. Seejärel peate oma telefoni tagakülge hoidma lihtsalt mis tahes terminali suunas, millel on kontaktivaba makse sümbol."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Selge"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Rohkem ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Rohkem …"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Määrake vaikemakserakenduseks"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Värskendage vaikemakserakendust"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kontaktivabas terminalis maksate rakendusega <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Tagasi"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Järgmine"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Lõpeta"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Pildista"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Vali pilt"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Foto valimine"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kaardid"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kaardid"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Kasuta helistamiseks alati seda"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Andmete SIM-kaardi valimine"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Valige SMS-i jaoks SIM-kaart"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Andmete SIM-kaardi vahetamine, selleks võib kuluda kuni üks minut ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Andmete SIM-kaardi vahetamine, selleks võib kuluda kuni üks minut …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Helistamine SIM-kaardiga"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM-kaardi valimine"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutiin, ajakava, akusäästja, toite säästmine, aku, automaatne, protsent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, täiustatud helistamine, 4g-kõned"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"lisa keel, keele lisamine"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"teksti suurus"</string>
     <string name="default_sound" msgid="6604374495015245195">"Vaikeheli"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Helina ja märguannete helitugevus on <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Helitugevus, vibreerimine, režiim Mitte segada"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sisselülitamise helid"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Reaalajas subtiitrid"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Meediasisu automaatsed subtiitrid"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Mitte ükski"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ajakava on määratud</item>
-      <item quantity="one">1 ajakava on määratud</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Puudub}=1{1 ajakava on määratud}other{# ajakava on määratud}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Mitte segada"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ainult oluliste inimeste ja rakendustega seotud märguanded"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Katkestuste piiramine"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Ainult prioriteetsed"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Sees / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Väljas / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Väljas"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Sees"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Küsi iga kord"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Kuni välja lülitate"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> tundi</item>
-      <item quantity="one">1 tund</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutit"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ajakava saab automaatselt sisse lülitada</item>
-      <item quantity="one">1 ajakava saab automaatselt sisse lülitada</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 tund}other{# tundi}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minut}other{# minutit}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Väljas}=1{Väljas / 1 ajakava saab automaatselt sisse lülitada}other{Väljas / # ajakava saavad automaatselt sisse lülitada}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Mis saavad režiimi Mitte segada katkestada?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Inimesed"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Rakendused"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Madalama prioriteediga märguanded määratakse automaatselt leebeteks märguanneteks"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Märguannete kohanduv järjestamine"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Järjesta märguanded automaatselt asjakohasuse järgi"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Kohanduvate märguannete tagasiside"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Näitab, kuidas on märguandeid kohandatud. Samuti näitab valikut süsteemile tagasiside andmiseks."</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Märguande olulisuse lähtestamine"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Kasutaja muudetud olulisuse seadete lähtestamine ja märguannete assistendil prioriseerimise lubamine"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Soovitatud toimingud ja vastused"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Kuva soovitatud toimingud ja vastused automaatselt"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Kuva hiljutisi ja edasilükatud märguandeid"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioriteetsed vestlused"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Kuvatakse vestluste jaotise kohal hõljuvate mullidena"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Kuva vestluste jaotise kohal"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Muud vestlused"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Vähemtähtsad vestlused"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Vestlused, milles olete muudatusi teinud"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Hiljutised vestlused"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Kustuta hiljutised"</string>
+    <string name="clear" msgid="5092178335409471100">"Kustuta"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Kuva prioriteetsed vestlused mullis"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriteetsed vestlused kuvatakse allatõmmatava ala ülaosas. Saate lasta need kuvada ka mullis ja katkestada funktsiooni Mitte segada."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Prioriteetsed ja muudetud vestlused kuvatakse siin"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Mitte segada juurdepääs"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Luba funktsioon Mitte segada"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ükski installitud rakendus pole palunud juurdepääsu funktsioonile Mitte segada"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Rakenduste laadimine ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Rakenduste laadimine …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Teie taotluse kohaselt blokeerib Android selle rakenduse märguannete kuvamise selles seadmes"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Teie taotluse kohaselt blokeerib Android selle märguandekategooria kuvamise selles seadmes"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Teie taotluse kohaselt blokeerib Android selle märguandegrupi kuvamise selles seadmes"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Kõik vestlused"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriteetsed vestlused"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Mitte ükski"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> vestlust</item>
-      <item quantity="one">1 vestlus</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Mitte ükski"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Puudub}=1{1 vestlus}other{# vestlust}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kes saavad katkestada?"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Kõned"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Kõned"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Selleks et telefon lubatud kõnede puhul heliseks, kontrollige, kas helinarežiim on aktiveeritud."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Ajakava „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” puhul on sissetulevad kõned blokeeritud. Võite seadeid kohandada, et võimaldada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Tärniga tähistatud kontaktid"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Veel <xliff:g id="NUM_PEOPLE">%d</xliff:g> inimest</item>
-      <item quantity="one">Veel 1 inimene</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Mitte ükski"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Puudub}=1{{contact_1}}=2{{contact_1} ja {contact_2}}=3{{contact_1}, {contact_2} ja {contact_3}}other{{contact_1}, {contact_2} ja veel #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Nimi puudub)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Sõnumid"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"sõnumid"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Sõnumid"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Ajakava „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” puhul on sissetulevad sõnumid blokeeritud Võite seadeid kohandada, et võimaldada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Kõik sõnumid jõuavad teieni"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Kõik kõned jõuavad teieni"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Puuduvad"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakti</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Puudub}=1{1 kontakt}other{# kontakti}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Kõik"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktid"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Tärniga tähistatud kontaktid"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Kõik märguanded"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Mõned märguanded"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Valitud inimesed saavad teiega ühendust võtta, isegi kui te ei luba rakendustel end segada"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> saavad katkestada</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> saab katkestada</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Veel <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Mitte ükski rakendus ei saa katkestada}=1{{app_1} saab katkestada}=2{{app_1} ja {app_2} saavad katkestada}=3{{app_1}, {app_2} ja {app_3} saavad katkestada}other{{app_1}, {app_2} ja veel # saavad katkestada}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Rakendused"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Kõik märguanded"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Mõnd märguanded"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Märguanded, mis saavad katkestada"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Luba kõik märguanded"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> saavad katkestada</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> saab katkestada</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Mitte miski ei saa katkestada"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Veel <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Mitte miski ei saa katkestada}=1{{sound_category_1} saab katkestada}=2{{sound_category_1} ja {sound_category_2} saavad katkestada}=3{{sound_category_1}, {sound_category_2} ja {sound_category_3} saavad katkestada}other{{sound_category_1}, {sound_category_2} ja veel # saavad katkestada}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Mitte miski ei saa katkestada"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Mitte keegi ei saa katkestada"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Mõned inimesed saavad katkestada"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Kõik inimesed saavad katkestada"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Sees"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Väljas"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Rakenduse kinnitamine"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Rakenduse kinnitamine võimaldab teil praeguse rakenduse kuval hoida seni, kuni selle vabastate. Seda funktsiooni saab kasutada näiteks selleks, et lubada usaldusväärsel sõbral teatud mängu mängida. \n\nKui rakendus on kinnitatud, saab kinnitatud rakendus avada teisi rakendusi ja isiklikud andmed võivad olla juurdepääsetavad. \n\nRakenduse kinnitamise kasutamiseks toimige järgmiselt. 	\n1.	Lülitage rakenduse kinnitamine sisse. 	\n2.	Avage leht Ülevaade. 	\n3.	Puudutage ekraanikuva ülaosas rakenduse ikooni ja siis käsku Kinnita."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Rakenduse kinnitamine võimaldab teil praeguse rakenduse kuval hoida seni, kuni selle vabastate. Seda funktsiooni saab kasutada näiteks selleks, et lubada usaldusväärsel sõbral teatud mängu mängida. \n\nKui rakendus on kinnitatud, saab kinnitatud rakendus avada teisi rakendusi ja isiklikud andmed võivad olla juurdepääsetavad. \n\nKui soovite oma seadet kellegagi turvaliselt jagada, proovige selle asemel kasutada külaliskasutajat. \n\nRakenduse kinnitamise kasutamiseks toimige järgmiselt. 	\n1.	Lülitage rakenduse kinnitamine sisse. 	\n2.	Avage leht Ülevaade. 	\n3.	Puudutage ekraanikuva ülaosas rakenduse ikooni ja siis käsku Kinnita."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Rakenduse kinnitamine võimaldab teil praeguse rakenduse kuval hoida seni, kuni selle vabastate. Seda funktsiooni saab kasutada näiteks selleks, et lubada usaldusväärsel sõbral teatud mängu mängida."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Kui rakendus on kinnitatud, saab kinnitatud rakendus avada teisi rakendusi ja isiklikud andmed võivad olla juurdepääsetavad. \n\nRakenduse kinnitamise kasutamiseks toimige järgmiselt. 	\n1.	Lülitage rakenduse kinnitamine sisse. 	\n2.	Avage leht Ülevaade. 	\n3.	Puudutage ekraanikuva ülaosas rakenduse ikooni ja siis käsku Kinnita."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Kui rakendus on kinnitatud, saab kinnitatud rakendus avada teisi rakendusi ja isiklikud andmed võivad olla juurdepääsetavad. \n\nKui soovite oma seadet kellegagi turvaliselt jagada, proovige selle asemel kasutada külaliskasutajat. \n\nRakenduse kinnitamise kasutamiseks toimige järgmiselt. 	\n1.	Lülitage rakenduse kinnitamine sisse. 	\n2.	Avage leht Ülevaade. 	\n3.	Puudutage ekraanikuva ülaosas rakenduse ikooni ja siis käsku Kinnita."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Kui rakendus on kinnitatud: \n\n•		võivad isiklikud andmed (nt kontaktid\nja meilide sisu) olla juurdepääsetavad; \n•		kinnitatud rakendus võib avada teisi rakendusi. \n\nKasutage rakenduse kinnitamist ainult usaldusväärsete inimestega."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Enne vabastamist küsi avamismustrit"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Enne vabastamist küsi PIN-koodi"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Lisaks sellele, et võite seadme avamiseks kasutada oma nägu, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel PIN-koodi. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme. \n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel PIN-koodi?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Lisaks sellele, et võite seadme avamiseks kasutada oma nägu, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel mustrit. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme. \n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel mustrit?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Lisaks sellele, et võite seadme avamiseks kasutada oma nägu, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel parooli. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel parooli?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Lisaks sellele, et võite seadme avamiseks kasutada oma biomeetriat, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel PIN-koodi. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel PIN-koodi?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Lisaks sellele, et võite seadme avamiseks kasutada oma biomeetriat, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel mustrit. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel mustrit?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Lisaks sellele, et võite seadme avamiseks kasutada oma biomeetriat, saate oma seadet veelgi paremini kaitsta, nõudes käivitamisel parooli. Enne seadme käivitumist ei saa te vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kaotatud või varastatud seadmetes olevaid andmeid. Kas küsida seadme käivitamisel parooli?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Jah"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ei"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Piiratud"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-liidest juhib"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Ühendatud seade"</string>
     <string name="usb_control_device" msgid="527916783743021577">"See seade"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Vahetamine …"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Vahetamine …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Ei õnnestunud vahetada"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Selle seadme laadimine"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Ühendatud seadme laadimine"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobiilse andmeside kasutus"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Rakenduste andmekasutus"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"WiFi-andmekasutus"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Operaatoriväline andmekasutus"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Etherneti andmekasutus"</string>
     <string name="wifi" msgid="2932584495223243842">"WiFi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 piirang</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operaatori andmemahuarvestus võib erineda seadme andmemahuarvestusest"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Välistab andmed, mida kasutatakse operaatorite võrkude kaudu"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> on kasutatud"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Andmekasutuse hoiatuse määramine"</string>
     <string name="data_warning" msgid="2925054658166062884">"Andmemahu hoiatus"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Kuva üksikasjad"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Andmemahu säästja"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Piiramata andmeside"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Taustaandmed on välja lülitatud"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Taustaandmed on välja lülitatud"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Sees"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Väljas"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Andmemahu säästja kasutamine"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Kui seade on lukus, keela märguannetes vastuste või muu teksti sisestamine"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Vaikeõigekirjakontroll"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Õigekirjakontrolli valimine"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Kasuta õigekirjakontrolli"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Kasuta õigekirjakontrolli"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Pole valitud"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(puudub)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Salvestusruumi vabastamiseks eemaldab salvestusruumi haldur varundatud fotod ja videod teie seadmest."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fotode ja videote eemaldamine"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Salvestusruumi haldur"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Kasuta salvestusruumi haldurit"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Kasuta salvestusruumi haldurit"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automaatne"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Käsitsi"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Vabastage ruumi"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Telefoni kontrollimiseks topeltpuudutamine"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Topeltpuudutage tahvelarvuti kontrollimiseks"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Topeltpuudutage seadme kontrollimiseks"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Märguan. nägem. pühkimine"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Märguannete kuvamiseks pühkige ekraanikuva alumises servas alla"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Ühekäerežiim"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Kasuta ühekäerežiimi"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Välju rakenduste vahel vahetamisel"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Ajalõpp"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekundit"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekundit"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekundit"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ühe käega kasutamine"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Kellaaja, märguannete ja muu teabe vaatamiseks topeltpuudutage oma ekraani."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Telefoni kontrollimiseks tõstmine"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tahvelarvuti kontrollimiseks tõstke seda"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Puudutamine tahvelarvuti kontrollimiseks"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Puudutamine seadme kontrollimiseks"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Kellaaja, märguannete ja muu teabe vaatamiseks puudutage oma ekraani."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Hädaolukorra SOS-teavitus"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Hädaolukorra SOS-teavituse kasutamine"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Haldab <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Allolevate toimingute käivitamiseks vajutage kiiresti vähemalt viis korda järjest toitenuppu"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Loendusalarmi esitamine"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Enne abi kutsumist esitatakse vali heli"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Helistamine abi saamiseks"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Number abi kutsumiseks"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Puudutage muutmiseks."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Kui sisestate numbri, mis pole hädaabinumber.\n • Teie telefon peab hädaolukorra SOS-teavituste kasutamiseks olema avatud.\n • Teie kõnele ei pruugita vastata."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sõrmejälje pühkimine märguannete vaatamiseks"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sõrmejälje pühkimine"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Märguannete kontrollimiseks pühkige telefoni tagaküljel oleval sõrmejäljeanduril alla."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Max nähtavate andmekomplektide arv"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Vaikeväärtustele lähtestamine"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Arendaja automaattäite valikud on lähtestatud"</string>
+    <string name="location_category" msgid="3496759112306219062">"Asukoht"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Olekuriba asukohanäidik"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Kuva kõikide asukohtade puhul (sh võrk ja ühenduvus)"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Jõusta GNSS-i täielikud mõõtmistulemused"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Jälgi kõiki GNSS-i radu ja sagedusi ilma töötsüklita"</string>
     <string name="device_theme" msgid="5027604586494772471">"Seadme teema"</string>
     <string name="default_theme" msgid="4815428567082263639">"Vaikeseade"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Võrgu nimi"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Keskendumiseks peatage märguanded"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funktsioon pole saadaval"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"See funktsioon on välja lülitatud, kuna see muudab teie telefoni aeglaseks"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Jõusta GNSS-i täielikud mõõtmistulemused"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Jälgi kõiki GNSS-i radu ja sagedusi ilma töötsüklita"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Kuva alati kokkujooksmise dialoog"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Dialoog kuvatakse alati, kui rakendus kokku jookseb"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Valige rakendus, milles ANGLE on lubatud"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Luba kõigi rakenduste puhul"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Graafikadraiveri valimine"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Vaikeseade"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Mängudraiver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Mängudraiver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Arendaja draiver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Süsteemi graafikadraiver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Sees (vaigistatud)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Väljas"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Võrgu üksikasjad"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Teie seadme nimi on telefonis rakendustele nähtav. Bluetoothi seadmetega ühendamisel või WiFi-pääsupunkti loomisel võivad seda näha ka teised inimesed."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Teie seadme nimi on teie telefonis olevatele rakendustele nähtav. Bluetooth-seadmetega või WiFi-võrguga ühenduse loomisel või WiFi-kuumkoha seadistamisel võivad seda näha ka teised inimesed."</string>
     <string name="devices_title" msgid="649715719278562515">"Seadmed"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Kõik seaded"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Soovitused"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Võrke ei õnnestunud leida. Proovige uuesti."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(keelatud)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM-kaarti pole"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-kaart"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM-kaarti pole"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Pole"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Ühendamiseks on vaja SIM-kaarti"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Ühendamiseks on vaja operaatori <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM-kaarti"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Eelistatud võrgurežiim: eelistatud WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Eelistatud võrgurežiim: ainult GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Eelistatud võrgurežiim: ainult WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiilne andmeside"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Andmesideühendus mobiilsidevõrgu abil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon aktiveerib levialasse jõudmisel selle operaatori automaatselt"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ühtegi SIM-i pole saadaval"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Kõnede eelistus"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-i eelistus"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Küsi iga kord"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Pole saadaval, kui on ühendus on loodud operaatoriga <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Kuva rohkem"</string>
     <string name="see_less" msgid="2642392725363552793">"Kuva vähem"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Kas lülitada operaator <xliff:g id="CARRIER_NAME">%1$s</xliff:g> sisse?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Kas lülitada SIM-kaart sisse?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Kas soovite aktiveerida operaatori <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Kas aktiveerida SIM-kaardi kasutamine?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Korraga saab aktiivne olla vaid üks SIM-kaart.\n\nOperaatori <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> aktiveerimisel ei tühistata operaatori <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> teenust."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Korraga saab aktiivne olla vaid üks allalaaditud SIM-kaart.\n\nOperaatori <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> aktiveerimisel ei tühistata operaatori <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> teenust."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Korraga saab aktiivne olla vaid üks SIM-kaart.\n\nAktiveerimine ei tühista operaatori <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> teenust."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Aktiveeri operaator <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Võrguga ühendamine …"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Operaatori <xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktiveerimine"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operaatorit ei saa vahetada"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operaatorit ei saa vea tõttu vahetada."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Kas lülitada <xliff:g id="CARRIER_NAME">%1$s</xliff:g> välja?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Kas lülitada SIM-kaart välja?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-kaardi väljalülitamine <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operaatorit ei saa keelata"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Midagi läks valesti ja teie operaatorit ei saanud keelata."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Kas kasutada kahte SIM-kaarti?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Selles seadmes saavad korraga aktiivsed olla kaks SIM-kaarti. Korraga ühe SIM-kaardi kasutamise jätkamiseks puudutage valikut „Tänan, ei”."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Kas soovite seadme taaskäivitada?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Alustamiseks taaskäivitage oma seade. Seejärel lisage veel üks SIM-kaart."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Jätka"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Taaskäivita"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Tänan, ei"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Vaheta"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-kaarti ei saa aktiveerida"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Eemaldage SIM-kaart ja sisestage uuesti. Kui probleem jätkub, taaskäivitage seade."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Lülitage SIM-kaart uuesti sisse. Kui probleem jätkub, taaskäivitage seade."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Võrgu aktiveerimine"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> on aktiivne"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Puudutage SIM-kaardi seadete värskendamiseks"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-kaart"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Kas soovite allalaaditud SIM-kaardi kustutada?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"SIM-kaardi kustutamisel eemaldatakse seadmest operaatori <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> teenus.\n\nOperaatori <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> teenust ei tühistata."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Kustuta"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM-kaardi kustutamine …"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM-kaarti ei saa kustutada"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Seda SIM-kaarti ei saa vea tõttu kustutada.\n\nTaaskäivitage seade ja proovige uuesti."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Seadmega ühendamine"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Rakendus <xliff:g id="APPNAME">%1$s</xliff:g> soovib kasutada ajutist WiFi-võrku, et teie seadmega ühendus luua"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Seadmeid ei leitud. Veenduge, et seadmed oleksid sisse lülitatud ja ühendamiseks saadaval."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Hädaabikõned"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Teie operaator ei toeta hädaabikõnesid WiFi-kõnede kaudu.\nSeade lülitub hädaabikõne tegemiseks automaatselt mobiilsidevõrgule.\nHädaabikõned on võimalikud ainult mobiilsidevõrgu levialas."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Kvaliteedi parandamiseks kasutage kõnede puhul WiFi-t"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Helistamine mitme SIM-kaardi kaudu"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Luba selle SIM-kaardi kaudu muu SIM-kaardi kõned ja SMS-id."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"helistamine mitme SIM-kaardi kaudu"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Sissetulev MMS-sõnum"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS-i ei saa saata"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Puudutage, et lubada MMS-sõnumside operaatori <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> võrgus, kui mobiilne andmeside on välja lülitatud"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Lubage seadetes ekraani ülekatted"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Lubage rakendustel, mida tohib kuvada teiste rakenduste peal, katta seadete ekraanikuvasid"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Meedia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Peida pleier, kui meediaseanss on lõppenud"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Pleier võimaldab teil seanssi jätkata kiirseadete laiendatud paneelil."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Meediapleier kiirseadetes"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Meediapleieri kuvamine pikemaks ajaks, et hõlpsalt taasesitust jätkata"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Peida pleier"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Kuva pleier"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Ühtegi pleierit pole saadaval"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Lubatud rakendused"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"meedia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth lülitub sisse"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Sees"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Väljas"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kaardid"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Lennukikindlad võrgud"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Lennukikindlate võrkude leidmine ja nendega ühenduse loomine"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lennuk, lennukikindel"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Kõned ja SMS-id"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"WiFi-kõned"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Helistamine ja kõnede vastuvõtmine operaatoriväliste võrkude kaudu (nt WiFi-võrgud)"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"WiFi-kõned võimaldavad teil helistada ja kõnesid vastu võtta operaatoriväliste võrkude kaudu (nt mõned WiFi-võrgud)."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Kõned"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"eelistatud"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"eelistatud on kõned"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"eelistatud on SMS-id"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"pole saadaval"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-kaarti pole"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Eelistused"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ühenda avalike võrkudega"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"võrguühendus, internet, juhtmeta, andmeside, wifi, wi-fi, wi fi, mobiilside, mobiilsideoperaator, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Kuva lennukikindlad võrgud"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Lennukirežiimi väljalülitamine"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Pole saadaval, kuna uneaja režiim on sisse lülitatud"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Märguande olulisuse lähtestamine viidi lõpule."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Rakendused"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ebausaldusväärne seade soovib saada juurdepääsu teie sõnumitele. Puudutage üksikasjade nägemiseks."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Kas lubada juurdepääs sõnumitele?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Ebausaldusväärne Bluetooth-seade [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] soovib saada juurdepääsu teie sõnumitele.\n\nTe pole seadmega [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] varem ühendust loonud."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ebausaldusväärne seade soovib saada juurdepääsu teie kontaktidele ja kõnelogile. Puudutage üksikasjade nägemiseks."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Kas lubada juurdepääs kontaktidele ja kõnelogile?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Ebausaldusväärne Bluetooth-seade [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] soovib saada juurdepääsu teie kontaktidele ja kõnelogile. See hõlmab andmeid sissetulevate ja väljuvate kõnede kohta.\n\nTe pole seadmega [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] varem ühendust loonud."</string>
 </resources>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 7bbff21..2ec1da0 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Ertaina"</item>
     <item msgid="6740026006576843477">"Luzea"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Laburra"</item>
+    <item msgid="7397961711906421599">"Ertaina"</item>
+    <item msgid="4079132024502041928">"Luzea"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Lehenetsia"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Orokorrak"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA soilik"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Orokorrak"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index bab16d6..905d11f 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Data eta ordua"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Zehaztu data eta ordua"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Ezarri data, ordua, ordu-zona eta formatuak"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Erabili sareak emandako ordua"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Erabili sareak emandako ordu-zona"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Ezarri ordua automatikoki"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Ezarri ordu-zona automatikoki"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Erabili lurraldeko ezarpen lehenetsiak"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 orduko formatua"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Erabili 24 orduko formatua"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Erakutsi profileko informazioa pantaila blokeatuan."</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Kontuak"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Kokapena"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Erabili kokapena"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Erabili kokapena"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desaktibatuta"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aktibatuta: <xliff:g id="COUNT_1">%1$d</xliff:g> aplikaziok kokapena atzi dezakete</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Pantailaren blokeoa, aurpegiaren bidez desblokeatzea"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Pantailaren blokeoa, hatz-marka"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Pantailaren blokeoa"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desblokeatu telefonoa segurtasunez aurpegiarekin eta hatz-markarekin"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Aplikazioetan saioa has dezakezu, eta ordainketak berretsi"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Konfiguratu desblokeatzeko eginbidea honekin:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desblokeatu aurpegiaren bidez"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Erraztu telefonoa desblokeatzeko prozesua"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Hatz-marka"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Desblokeatu telefonoa poltsikoan denbora aurrezteko"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Saltatu"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Hurrengoa"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Gehitu da aurpegia"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Konfiguratu aurpegiaren bidez desblokeatzeko eginbidea"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Aurpegiaren bidez desblokeatzeko eginbidea"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Erabili aurpegia autentifikatzeko"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Hasi"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Aurpegiaren bidez desblokeatzeko eginbidea desaktibatuta badago erabilerraztasun moduan, baliteke konfigurazio-urratsek ongi ez funtzionatzea TalkBack-ekin."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Egin atzera"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Jarraitu konfiguratzen"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Erabili erabilerraztasun-konfigurazioa"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Aplikazioetan aurpegiaren bidez desblokeatzeko eginbidea erabiltzean, eskatu beti berresteko"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Ezabatu aurpegiari buruzko datuak"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Konfiguratu aurpegiaren bidez desblokeatzeko eginbidea"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Erabili aurpegiaren bidez desblokeatzeko eginbidea gailua desblokeatzeko, aplikazioetan saioa hasteko eta ordainketak berresteko.\n\nGogoan izan:\ntelefonoari begiratuz gero, baliteke hura desblokeatzea, halako asmorik ez baduzu ere.\n\nBeste norbaitek ere desblokea dezake telefonoa zuri begira jartzen badu.\n\nZure antz handia dutenek ere desblokea dezakete telefonoa; esate baterako, bikiek."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Erabili aurpegiaren bidez desblokeatzeko eginbidea gailua desblokeatzeko, aplikazioetan saioa hasteko eta ordainketak berresteko.\n\nGogoan izan:\ntelefonoari begiratuz gero, baliteke hura desblokeatzea, halako asmorik ez baduzu ere.\n\nBeste norbaitek ere desblokea dezake telefonoa zuri begira jartzen badu, baita begiak itxita badituzu ere.\n\nZure antz handia dutenek ere desblokea dezakete telefonoa; esate baterako, bikiek."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Erabili aurpegiaren bidez desblokeatzeko eginbidea gailua desblokeatzeko, aplikazioetan saioa hasteko eta ordainketak berresteko."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Gogoan izan:\nbegiratze hutsarekin desblokea dezakezu telefonoa, horretarako asmorik izan ez arren.\n\nBeste norbaitek ere desblokea dezake telefonoa, hura zure aurpegira zuzentzen badu.\n\nZure antza handia duen norbaitek ere desblokea dezake telefonoa; adibidez, biki batek."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Gogoan izan:\nbegiratze hutsarekin desblokea dezakezu telefonoa, horretarako asmorik izan ez arren.\n\nBeste norbaitek ere desblokea dezake telefonoa, hura zure aurpegira zuzentzen badu zuk begiak itxita eduki arren.\n\nZure antza handia duen norbaitek ere desblokea dezake telefonoa; adibidez, biki batek."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Aurpegiari buruzko datuak ezabatu nahi dituzu?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Aurpegiaren bidez desblokeatzeko eginbideak erabiltzen dituen aurpegiari buruzko datuak betiko ezabatuko dira, modu seguruan. Horren ondoren, PIN kodea, eredua edo pasahitza beharko duzu telefonoa desblokeatzeko, aplikazioetan saioa hasteko eta ordainketak berresteko."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Erabili telefonoa aurpegiaren bidez desblokeatzeko eginbidea"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Erabili hatz-marka telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: ezin duzu erabili hatz-marka gailu hau desblokeatzeko. Informazio gehiago lortzeko, jarri zure erakundearen administratzailearekin harremanetan."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Erabili hatz-marka telefonoa desblokeatzeko eta erosketak onartzeko.\n\nOharra: baliteke hatz-markak ez izatea eredu edo PIN kode konplexuak bezain seguruak."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Utzi"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ez, eskerrik asko"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Egin aurrera"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Saltatu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Hurrengoa"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Tableta pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegiaren bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Gailua pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegiaren bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Telefonoa pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da aurpegiaren bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Tableta pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da sistema biometrikoen bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Gailua pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da sistema biometrikoen bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Telefonoa pantailaren blokeoarekin babestuta, inork ez du izango hura erabiltzeko aukerarik inoiz galtzen baduzu edo lapurtzen badizute. Halaber, pantailaren blokeoa ezinbestekoa da sistema biometrikoen bidez desblokeatzeko eginbidea konfiguratzeko. Atzera egiteko, sakatu Utzi."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN kodearen konfigurazioa saltatu nahi duzu?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pasahitzaren konfigurazioa saltatu nahi duzu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Ereduaren konfigurazioa saltatu nahi duzu?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Galarazi inork tableta baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Galarazi inork gailua baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Galarazi inork telefonoa baimenik gabe erabiltzea gailuaren babes-eginbideak aktibatuta. Aukeratu nola blokeatu nahi duzun pantaila."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Aukeratu pantaila blokeatzeko ordezko metodoa"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Aukeratu pantaila blokeatzeko ordezko metodoa"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Aukeratu pantaila blokeatzeko ordezko metodoa"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Pantaila blokeatzeko aukerak"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Pantaila blokeatzeko aukerak"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Pantailaren blokeoa"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Aurpegiaren bidez desblokeatzea + pasahitza"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Egin aurrera aurpegiaren bidez desblokeatzeko eginbidea gabe"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Aurpegia erabil dezakezu telefonoa desblokeatzeko. Segurtasuna bermatzeko, pantaila blokeatzeko ordezko metodo bat konfiguratu behar da."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Sistema biometrikoak + Eredua"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Sistema biometrikoak + PIN kodea"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Sistema biometrikoak + Pasahitza"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Egin aurrera sistema biometrikorik gabe"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Sistema biometrikoak erabil ditzakezu telefonoa desblokeatzeko. Segurtasuna bermatzeko, pantaila blokeatzeko ordezko metodo bat konfiguratu behar da."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Administratzaileak, enkriptatze-gidalerroek edo kredentzialen biltegiak desgaituta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Bat ere ez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Hatza pasatzea"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> digitu baino gutxiago izan behar du</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Gailuaren administratzaileak ez du eman beste PIN kode bat erabiltzeko baimenik"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IKT saileko administratzaileak blokeatu egiten ditu asmatzen errazak diren PIN kodeak. Erabili beste PIN bat."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ezin da erabili onartzen ez den karaktererik"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Hizki bat eduki behar du gutxienez"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Zenbaki bat eduki behar du gutxienez"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Gutxienez, zenbakizkoa ez den 1 karaktere izan behar du</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Gailuaren administratzaileak ez du eman beste pasahitz bat erabiltzeko baimenik"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IKT saileko administratzaileak blokeatu egiten ditu asmatzen errazak diren pasahitzak. Erabili beste pasahitz bat."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ezin da erabili goranzko, beheranzko edo errepikatutako digitu-sekuentziarik"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Berretsi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Utzi"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wifia"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Aktibatu Wi-Fia"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wifia"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Erabili wifi-konexioa"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Erabili wifi-konexioa"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi ezarpenak"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wifia"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Konfiguratu eta kudeatu hari gabeko sarbide-puntuak"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"\"<xliff:g id="SSID">%1$s</xliff:g>\" sarera konektatzeko, erdiratu QR kodea hemen behean"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wifi-sarean sartzeko, eskaneatu QR kodea"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Partekatu wifi-konexioa"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Eskaneatu QR kode hau \"<xliff:g id="SSID">%1$s</xliff:g>\" sarera konektatu eta pasahitza partekatzeko"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"\"<xliff:g id="SSID">%1$s</xliff:g>\" sarean sartzeko, eskaneatu QR kode hau beste gailu batekin"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Eskaneatu QR kode hau \"<xliff:g id="SSID">%1$s</xliff:g>\" sarera konektatzeko"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Saiatu berriro. Arazoak badirau, jarri gailuaren fabrikatzailearekin harremanetan."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Arazoren bat izan da"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wifi-sarearen pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Wifi-gunearen pasahitza: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Konexio automatikoa"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Baimendu telefonoari automatikoki konektatzea sare honetatik gertu dagoenean"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Baimendu tabletari automatikoki konektatzea sare honetatik gertu dagoenean"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Baimendu sare honetara konektatzea barrutian dagoenean"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Gehitu gailu bat"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Erabili QR kode bat sare honetan gailu bat gehitzeko"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kodearen formatua ez da baliozkoa"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Erabili sistemaren ziurtagiriak"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ez zehaztu"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ez balidatu"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ez da zehaztu ziurtagiririk. Konexioa ez da izango pribatua."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Sarearen izena luzeegia da."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domeinua zehaztu behar da."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Ziurtagiria behar da."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Konektatu"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wifi konexioa aktibatu da"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Hona konektatuta: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> sarera konektatzen"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Konektatzen…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Ezin izan da sarera konektatu"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Sarea ez dago barrutian"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Gailuaren MAC helbidea"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Ausaz antolatutako MAC helbidea"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Ausaz antolatutako MAC helbidea (erabilitako azkena)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP helbidea"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Sarearen xehetasunak"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Azpisare-maskara"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 helbideak"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Gordetako sareak"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Harpidetzak"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Beste sare batzuk"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IParen ezarpenak"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Erabiltzaile honek ezin ditu erabili Wi-Fi aurreratuaren ezarpenak"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Gorde"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Idatzi baliozko atebide-helbidea."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Idatzi baliozko DNS helbidea."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Idatzi 0 eta 32 karaktere arteko sare-aurrizkia."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (DNS pribatuak ordezten ez duen kasuetan)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (DNS pribatuak ordezten ez duen kasuetan)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Atebidea"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Sare-aurrizkiaren luzera"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Edukia partekatzen ari da aplikazioa. Interneteko konexioa partekatzeko, desaktibatu eta aktibatu berriro wifi-gunea"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Ez da ezarri pasahitzik"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Wifi-gunearen izena"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktibatzen…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> aktibatzen…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> sarera konekta daitezke beste gailuak"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Wifi-gunearen pasahitza"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Sarbide-puntuaren banda"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatikoki igotzen du freskatze-abiadura 60 Hz-tik 90 Hz-ra zenbait edukitarako. Bateria-erabilera luzatzen du."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Aplikatu 90 Hz-ko freskatze-abiadura"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Freskatze-abiadura handiena, ukipenei erantzuteko gaitasuna eta animazioen kalitatea hobetzeko. Bateria-erabilera luzatzen du."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Pantaila kontzientea"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktibatuta / Pantaila ez da itzaliko hari begira zauden bitartean"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Pantaila ilun dagoenean, piztu egiten da jakinarazpenak jasotzean"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Erakutsi ordua eta informazioa"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Bateria asko kontsumitzen du"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Testu lodia"</string>
     <string name="title_font_size" msgid="570613010306330622">"Letra-tamaina"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Handitu edo txikitu testua"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM txartelaren blokeo-ezarpenak"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-en bertsioa"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-en segurtasun-eguneratzea"</string>
     <string name="model_info" msgid="8997566254717810904">"Modeloa"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modeloa: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modeloa eta hardwarea"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardware-bertsioa"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Ekipoaren IDa"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Ezabatu APNa"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN berria"</string>
     <string name="menu_save" msgid="6611465355127483100">"Gorde"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Baztertu"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Utzi"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Izena eremuak ezin du hutsik egon."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APNak ezin du hutsik egon."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Berrezar daitezke aplikazioak"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Berrezarri wifi, Bluetooth eta sare mugikorrak"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Hori eginez gero, sare guztien ezarpenak berrezarriko dira, besteak beste: \n\n"<li>"Wifia"</li>\n<li>"Datu-konexioa"</li>\n<li>"Bluetooth-a"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Ezabatu eduki guztia"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Ezabatu deskargatutako SIMen edukia"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Ordezko SIM txartelak deskargatzeko, jarri operadorearekin harremanetan. Ez da utziko bertan behera mugikorraren zerbitzu-planik."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Ez da utziko bertan behera mugikorraren zerbitzu-planik. Ordezko SIMak deskargatzeko, jarri harremanetan operadorearekin."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Berrezarri ezarpenak"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Sareko ezarpen guztiak berrezarri nahi dituzu? Ezin da desegin ekintza hori."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Sareko ezarpen guztiak berrezarri eta deskargatutako SIM txartelen datu guztiak ezabatu nahi dituzu? Ezin da desegin ekintza hori."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Berrezarri dira sareko ezarpenak"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Ezin da ezabatu SIM txarteletako eduki guztia"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Ezin da ezabatu deskargatutako SIM txartelen edukia errore bat gertatu delako.\n\nBerrabiarazi gailua eta saiatu berriro."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Ezabatu datu guztiak (berrezarri jatorrizkoak)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Ezabatu datu guztiak (berrezarri jatorrizkoak)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google kontua,"</li>\n<li>"sistemako eta aplikazioetako datuak eta ezarpenak,"</li>\n<li>"deskargatutako aplikazioak."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google-ko kontua"</li>\n<li>"Sistemako eta aplikazioetako datuak eta ezarpenak"</li>\n<li>"Deskargatutako aplikazioak"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Badaude erabiltzaile gehiago gailu honetan.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musika"</li>\n<li>"Argazkiak"</li>\n<li>"Bestelako erabiltzaile-datuak"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM txartelak"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Horrek ez du utziko bertan behera operadorearekin kontratatuta duzun zerbitzu-plana."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"USB bidezko memoria"</b>" ezabatu behar da."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"SD txartela"</b>" ezabatu behar da."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Ezabatu datu guztiak (berrezarri jatorrizkoak)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Ezabatu datu guztiak (berrezarri jatorrizkoak)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tabletaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google-ko kontua,"</li>\n<li>"sistemako eta aplikazioetako datuak eta ezarpenak,"</li>\n<li>"deskargatutako aplikazioak."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Telefonoaren "<b>"barneko memoriako"</b>" datu guztiak ezabatuko dira, besteak beste:\n\n"<li>"Google-ko kontua,"</li>\n<li>"sistemako eta aplikazioetako datuak eta ezarpenak,"</li>\n<li>"deskargatutako aplikazioak."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Kontu hauetan hasi duzu saioa:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Badaude erabiltzaile gehiago gailu honetan.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musika"</li>\n<li>"Argazkiak"</li>\n<li>"Bestelako erabiltzaile-datuak"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM txartelak"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ez da utziko bertan behera operadorearekin kontratatuta duzun zerbitzu-plana."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"USB bidezko memoriako"</b>" eduki guztia ezabatu behar da."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Musika, irudiak eta bestelako erabiltzaile-datuak garbitzeko, "<b>"SD txarteleko"</b>" eduki guztia ezabatu behar da."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Ezabatu USB bidezko memoria"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Ezabatu SD txartela"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ezabatu USB bidezko barneko memoriako datu guztiak; adibidez, musika edo argazkiak"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Ezabatu SD txarteleko datu guztiak, besteak beste, musika edo argazkiak."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Ezabatu datu guztiak"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Ezabatu datu guztiak"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Informazio pertsonal guztia eta deskargatutako aplikazioak ezabatuko dira. Ezin da desegin ekintza hori."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Informazio pertsonal guztia ezabatuko da, deskargatutako aplikazioak eta SIM txartelak barne. Ezin da desegin ekintza hori."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Ezabatu guztia"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Ez da berrezartzerik gauzatu, sistema garbitzeko zerbitzua ez dagoelako erabilgarri."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Datu guztiak ezabatu nahi dituzu?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Erabiltzaileak ez du jatorrizko datuak berrezartzeko baimenik"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Ezabatzen"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Itxaron, mesedez…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Ezabatu datu guztiak"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Ezabatu datu guztiak"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Informazio pertsonal guztia eta deskargatutako aplikazioak ezabatuko dira. Ezin da desegin ekintza."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Informazio pertsonal guztia ezabatuko da, deskargatutako aplikazioak eta SIM txartelak barne. Ezin da desegin ekintza."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Datu guztiak ezabatu nahi dituzu?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Erabiltzaileak ez du jatorrizko datuak berrezartzeko baimenik"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Eduki guztia ezabatzen"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Itxaron, mesedez…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Dei-ezarpenak"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Konfiguratu erantzungailua, dei-desbideratzea, deia zain uzteko eginbidea, deien identifikazio-zerbitzua."</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Konexioa partekatzea (USB)"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Ezin da <xliff:g id="MAXCONNECTION">%1$d</xliff:g> gailurekin baino gehiagorekin konexioa partekatu."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuko konexioa amaituko da."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Konexioa Ethernet bidez partekatzea"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Partekatu telefonoaren Interneteko konexioa USB Ethernet bidez"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Partekatu telefonoaren Interneteko konexioa Ethernet bidez"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Erabili wifi-gunea eta konexioa partekatzea beste gailuei Interneteko konexioa emateko zure datu-konexioaren bidez. Halaber, aplikazioek wifi-guneak sor ditzakete, edukia inguruko gailuekin partekatzeko."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Erabili wifi-guneak eta konexioa partekatzeko aukera beste gailu batzuei Interneteko konexioa emateko wifi- edo datu-konexioaren bidez. Aplikazioek ere wifi-guneak sor ditzakete edukia inguruko gailuekin partekatzeko."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Laguntza"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth bidezko gailuen bilaketa"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Eman inguruko gailuak edozein unetan bilatzeko baimena aplikazioei eta zerbitzuei, baita Bluetooth-a desaktibatuta dagoenean ere. Kokapenean oinarritutako eginbideak eta zerbitzuak hobetzeko erabil daiteke hori, besteak beste."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Lanerako kokapen-zerbitzuak"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Kokapeneko ordu-zona hautemateko aukera"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Kokapeneko ordu-zona hautemateko aukera"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Eman gailuaren kokapena erabiltzeko baimena uneko ordu-zona hauteman ahal izateko. Beste kokapen-ezarpen batzuek (adibidez, wifi-sareen bilaketak) eragina izan dezakete ordu-zona hautemateko zehaztasunean."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aktibatuta"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desaktibatuta"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Desgaituta dago ordu-zona automatikoki hautemateko aukera"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Kokapeneko ordu-zona hautemateko aukera desgaituta dago"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Ez da onartzen kokapeneko ordu-zona hautemateko aukera erabiltzea"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Ez da onartzen aldaketarik egitea kokapeneko ordu-zona hautemateko aukeretan"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi eta sare mugikor bidezko kokapena"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Utzi aplikazioei zure kokapena bizkorrago zehazteko Google-ren kokapen-zerbitzua erabiltzen. Kokapen-datu anonimoak bildu eta Google-ra bidaliko dira."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Kokapena Wi-Fi bidez zehaztuta"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Aurpegiaren bidez desblokeatzeko, ezarri pasahitza"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Aurpegiaren bidez desblokeatzeko, ezarri eredua"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Aurpegiaren bidez desblokeatzeko, ezarri PINa"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Ezarri pasahitza"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Ezarri eredua"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Ezarri PIN kodea"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Pasahitza ahaztu zaizu?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Eredua ahaztu zaizu?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN kodea ahaztu zaizu?"</string>
@@ -1808,7 +1837,7 @@
     <string name="lock_settings_title" msgid="665707559508132349">"Gailuaren segurtasuna"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"Aldatu desblokeatzeko eredua"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="7327409886587802756">"Aldatu desblokeatzeko PINa"</string>
-    <string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"Marraztu desblokeatzeko eredua"</string>
+    <string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"Marraztu desblokeatzeko eredu bat"</string>
     <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"Laguntza lortzeko, sakatu Menua."</string>
     <string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"Bukatutakoan, jaso hatza"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"Konektatu <xliff:g id="NUMBER">%d</xliff:g> puntu gutxienez. Saiatu berriro."</string>
@@ -1829,7 +1858,7 @@
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="2202430156268094229">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> fidagarritasun-agenteak desblokeatuta mantentzen duenean izan ezik"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="2193588309557281466">"Ezarri desblokeatzeko eredua"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="7614155083815661347">"Aldatu desblokeatzeko eredua"</string>
-    <string name="lockpattern_settings_help_how_to_record" msgid="2093801939046625774">"Desblokeatzeko eredua nola marraztu"</string>
+    <string name="lockpattern_settings_help_how_to_record" msgid="2093801939046625774">"Desblokeatzeko eredu bat nola marraztu"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="7891484005551794824">"Saiakera oker gehiegi egin dituzu. Saiatu berriro <xliff:g id="NUMBER">%d</xliff:g> segundo barru."</string>
     <string name="activity_not_found" msgid="5464331414465894254">"Ez duzu aplikazioa telefonoan instalatu."</string>
     <string name="lock_settings_profile_title" msgid="103605580492566086">"Laneko profilaren segurtasuna"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Azpitituluen hobespenak"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Lupa"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Handitutako zatia"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Gaitu lupa"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Aukeratu pantailako zer zati handitu behar diren pantaila handitzean"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pantaila osoa"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Pantailaren zati bat"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pantaila osoa eta pantailaren zati bat"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Handitu pantaila osoa"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Handitu pantailaren zati bat"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Erabilerraztasun-botoia erabili nahi duzu?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Hiru aldiz sakatzen baduzu pantailaren zati bat lupaz ikusteko, idazketa eta beste ekintza batzuk atzeratu egingo dira.\n\nErabilerraztasun-botoia erabili nahi duzu lupaz ikusteko?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Erabili erabilerraztasun-botoia"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mantendu hiru aldiz sakatzeko ekintza lupaz ikusteko"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Luparen ezarpenak"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Handitzeko, sakatu hiru aldiz"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Handitu pantaila lasterbidearekin"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Amaitu deiak pizteko etengailuarekin"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Saguaren erakusle handia"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Kendu animazioak"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio monofonikoa"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Konbinatu kanalak audioa erreproduzitzean"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audioaren oreka"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Ezkerrekoa"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Eskuinekoa"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio monofonikoa"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Konbinatu kanalak audioa erreproduzitzean"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audioaren oreka"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Ezkerrekoa"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Eskuinekoa"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Lehenetsia"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundo"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundo"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Jakinarazpenen dardara"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Tonuaren dardara"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Ukipenaren erantzuna"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Erabili <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Ireki <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Erabili koloreen zuzenketa"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Erakutsi azpitituluak"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Bateragarriak diren aplikazioetarako bakarrik"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Erabili <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Ireki <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Erabili koloreen zuzenketa"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Erakutsi azpitituluak"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Bateragarriak diren aplikazioetarako bakarrik"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Azpitituluen tamaina eta estiloa"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Testuaren tamaina: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Aukera gehiago"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Daltonismoa"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanopia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanopia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grisen eskala"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Gorri-berdea"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Gorri-berdea"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Urdin-horia"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Atzeko planoan erabiltzeko murriztapena"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Eman atzeko planoan exekutatzeko baimena aplikazioari"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikazioak ez du baimenik atzeko planoan exekutatzeko"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Ezin da mugatu atzeko planoko erabilera"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Ezin da mugatu atzeko planoko erabilera"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Atzeko planoko jarduerak mugatu nahi dituzu?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Aplikazio baten atzeko planoko jarduerak mugatzen badituzu, baliteke aplikazioak behar bezala ez funtzionatzea"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikazio hau bateria optimizatzeko konfiguratuta ez dagoenez, ezin duzu mugatu.\n\nMugatzeko, aktibatu bateriaren optimizazioa."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tableta ohi baino gehiago erabili da"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Gailua ohi baino gehiago erabili da"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Baliteke bateria ohi baino lehenago agortzea"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimizatzen, bateria egoera onean mantentzeko"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Bateria mugatuta egongo da aldi batez. Informazio gehiago lortzeko, sakatu hau."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefonoa ohi baino gehiago erabili da. Baliteke bateria espero baino lehenago agortzea.\n\nBateria gehien erabili duten aplikazioak:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tableta ohi baino gehiago erabili da. Baliteke bateria espero baino lehenago agortzea.\n\nBateria gehien erabili duten aplikazioak:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Gailua ohi baino gehiago erabili da. Baliteke bateria espero baino lehenago agortzea.\n\nBateria gehien erabili duten aplikazioak:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d aplikazio dago murriztuta</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="UNIT">%</xliff:g> <xliff:g id="NUMBER">^1</xliff:g>"<small><font size="20"></font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Arazo bat gertatu da bateria-neurgailua irakurtzean"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Arazo bat gertatu da bateria-neurgailua irakurtzean. Sakatu hau "<annotation id="url">"informazio gehiago lortzeko"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Aplikazioa gelditu nahi duzu?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g>\n\n\n\n"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"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>
@@ -2588,12 +2625,12 @@
     <string name="battery_saver_auto_percentage" msgid="558533724806281980">"Bateria-mailaren ehunekoan oinarrituta"</string>
     <string name="battery_saver_auto_routine_summary" msgid="3913145448299472628">"Bateria kargatzeko ohiko ordua iritsi aurretik bateria agortzeko arriskua badago aktibatzen da bateria-aurrezlea"</string>
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"Bateria-maila <xliff:g id="PERCENT">%1$s</xliff:g> denean aktibatuko da"</string>
-    <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ezarri programazioa"</string>
+    <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ezarri programazio bat"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Luzatu bateriaren iraupena"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desaktibatu kargatuta dagoenean"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Telefonoaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> denean, desaktibatu egiten da bateria-aurrezlea"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Tabletaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> denean, desaktibatu egiten da bateria-aurrezlea"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Gailuaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> denean, desaktibatu egiten da bateria-aurrezlea"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Telefonoaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> baino gehiago kargatu denean, desaktibatu egiten da bateria-aurrezlea"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Tabletaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> baino gehiago kargatu denean, desaktibatu egiten da bateria-aurrezlea"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Gailuaren bateria <xliff:g id="PERCENT">%1$s</xliff:g> baino gehiago kargatu denean, desaktibatu egiten da bateria-aurrezlea"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktibatu"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Berrezarri"</string>
     <string name="tts_play" msgid="2945513377250757221">"Erreproduzitu"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Sareko konexio egokitua"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Bateriaren iraupena luzatzen, eta gailuaren errendimendua hobetzen du sareko konexioak automatikoki kudeatuz."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Kredentzialen biltegia"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalatu ziurtagiri bat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalatu ziurtagiriak biltegitik"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Erabiltzaile-kredentzialak"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ikusi eta aldatu gordetako kredentzialak"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Aurreratuak"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Biltegiratze mota"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardwarean gordetakoa"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Softwarean soilik"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Erabiltzaile honek ez dauka kredentzialik"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN konexioarekin eta aplikazioekin erabiltzeko instalatuta"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi konexioarekin erabiltzeko instalatuta"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ez instalatu"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instalatu halere"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Ziurtagiria ez dago instalatuta"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Gailu honetan ziurtagiriak instalatzeko baimena eman nahi diozu <xliff:g id="APP_NAME">%s</xliff:g> aplikazioari?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Ziurtagiri hauek beheko aplikazioetan eta URLtan identifikatuko zaituzte"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Ez eman baimenik"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Eman baimena"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Erakutsi gehiago"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Ziurtagiriak kudeatzeko aplikazioa"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Bat ere ez"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Aplikazio honek instalatzen dituen ziurtagiriek beheko aplikazioetan eta URLtan identifikatuko zaituzte"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Kendu"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Larrialdi-deien seinalea"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Ezarri larrialdi-deiak egitean izan beharreko portaera."</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Babeskopiak"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Konfiguratu gabe: laneko profila"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administratzailea"</string>
     <string name="user_you" msgid="3070562015202859996">"Zu (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Goitizena"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> erabiltzaile gehi ditzakezu gehienez"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Tabletaren jabeak baino ezin ditu erabiltzaileak kudeatu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Telefonoaren jabeak baino ezin ditu erabiltzaileak kudeatu."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Terminalean ordaintzea"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfiguratu ordaintzeko aplikazioa. Ondoren, jarri telefonoaren atzeko aldea kontakturik gabeko sistemaren ikurra duen terminalaren aurrean."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ados"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Gehiago…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Gehiago…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Ezarri ordainketak egiteko aplikazio lehenetsia"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Eguneratu ordainketak egiteko aplikazio lehenetsia"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kontakturik gabeko ordainketa-terminaletan, erabili <xliff:g id="APP">%1$s</xliff:g> ordainketak egiteko"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Atzera"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Hurrengoa"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Amaitu"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Atera argazki bat"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Aukeratu irudi bat"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Hautatu argazkia"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM txartelak"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM txartelak"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Erabili beti hau deietarako"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Hautatu datuetarako SIM txartela"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Hautatu SMSetarako SIMa"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Datuetarako erabili beharreko SIMa aldatzen ari da. Minutu oso bat behar izan daiteke horretarako…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Datuetarako erabili beharreko SIMa aldatzen ari gara. Minutu bat inguru beharko dugu…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Deitu SIM honekin:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Hautatu SIM txartela"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>. SIM txartela"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ohitura, ordutegia, programazioa, programatu, bateria-aurrezlea, aurreztu bateria, bateria automatikoa, ehunekoa"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, deitzeko aukera aurreratuak, 4G bidezko deiak"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"gehitu hizkuntza, gehitu hizkuntza bat"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"testuaren tamaina"</string>
     <string name="default_sound" msgid="6604374495015245195">"Soinu lehenetsia"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Deien tonuaren eta jakinarazpenen bolumena: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Bolumena, dardara, ez molestatzeko modua"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Pizteko soinuak"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Istanteko azpitituluak"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Ezarri azpitituluak automatikoki"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Bat ere ez"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programazio ezarri dira</item>
-      <item quantity="one">1 programazio ezarri da</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Bat ere ez}=1{1 programazio ezarri da}other{# programazio ezarri dira}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ez molestatzeko modua"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Jaso jende eta aplikazio garrantzitsuen jakinarazpenak soilik"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Mugatu etenaldiak"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Lehentasuna dutenak soilik"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aktibatuta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desaktibatuta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desaktibatuta"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aktibatuta"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Galdetu beti"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Zuk desaktibatu arte"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ordu</item>
-      <item quantity="one">1 ordu</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutu"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programazio aktiba daitezke automatikoki</item>
-      <item quantity="one">1 programazio aktiba daiteke automatikoki</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ordu}other{# ordu}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minutu}other{# minutu}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desaktibatuta}=1{Desaktibatuta / 1 programazio aktiba daiteke automatikoki}other{Desaktibatuta / # programazio aktiba daitezke automatikoki}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ez molestatzeko modua eten dezaketenak"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Jendea"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikazioak"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Ezarri lehentasun txikiagoko jakinarazpenak soinurik gabeko jakinarazpen gisa automatikoki"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Jakinarazpenen sailkapen doigarria"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Sailkatu jakinarazpenak automatikoki garrantziaren arabera"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Jakinarazpen doigarriei buruzko iritzia"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Adierazi jakinarazpenetan egindako doikuntzak eta erakutsi sistemara iritzia bidaltzeko aukera"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Berrezarri jakinarazpenen garrantzia"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Berrezarri erabiltzaileak aldatutako garrantzi-ezarpenak eta eman lehentasunak ezartzeko baimena jakinarazpenen laguntzaileari"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Ekintza eta erantzun iradokiak"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Erakutsi automatikoki ekintza eta erantzun iradokiak"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Erakutsi azken jakinarazpenak eta atzeratutakoak"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Lehentasunezko elkarrizketak"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Erakutsi elkarrizketen atalaren goialdean, burbuila gainerakor gisa"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Erakutsi elkarrizketen atalaren goialdean"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Beste elkarrizketa batzuk"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Lehentasunezkoak ez diren elkarrizketak"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Aldatu dituzun elkarrizketak"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Azken elkarrizketak"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Garbitu azkenak"</string>
+    <string name="clear" msgid="5092178335409471100">"Garbitu"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Bistaratu lehentasunezko elkarrizketak burbuila gainerakor gisa"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Lehentasunezko elkarrizketak goitibeherako barraren goialdean agertzen dira. Nahi izanez gero, burbuila gisa ikus ditzakezu, ez molestatzeko moduan salbuespen izan daitezen."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Lehentasunezko edo aldatutako elkarrizketak agertuko dira hemen"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Ez molestatzeko modurako sarbidea"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Eman ez molestatzeko modua atzitzeko baimena"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ez dago ez molestatzeko modurako sarbidea eskatu duen aplikaziorik"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Aplikazioak kargatzen…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Aplikazioak kargatzen…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Zure eskaerari jarraikiz, aplikazio honen jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Zure eskaerari jarraikiz, jakinarazpen-kategoria hau gailu honetan erakustea galarazten ari da Android"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Zure eskaerari jarraikiz, jakinarazpen talde hau gailu honetan erakustea galarazten ari da Android"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Elkarrizketa guztiak"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Lehentasunezko elkarrizketak"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Bat ere ez"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> elkarrizketa</item>
-      <item quantity="one">1 elkarrizketa</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Bat ere ez"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Bat ere ez}=1{1 elkarrizketa}other{# elkarrizketa}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Eten zaitzaketen pertsonak"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Deiak"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Deiak"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Baimendutako deiak jasotzean soinua entzuten dela ziurtatzeko, egiaztatu gailua tonua jotzeko ezarrita dagoela"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” arauan, blokeatuta dago deiak jasotzeko aukera. Lagunak, familia eta beste kontaktu batzuk zurekin harremanetan jartzeko aukera izan dezaten, aldatu ezarpenak."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontaktu izardunak"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">beste <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">beste bat</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Bat ere ez"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Bat ere ez}=1{{contact_1}}=2{{contact_1} eta {contact_2}}=3{{contact_1}, {contact_2} eta {contact_3}}other{{contact_1}, {contact_2} eta beste #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Izengabea)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mezuak"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"Mezu"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mezuak"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” antolaketan, blokeatuta dago mezuak jasotzeko aukera. Lagunak, familia eta beste kontaktu batzuk zurekin harremanetan jartzeko aukera izan dezaten, aldatu ezarpenak."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Mezu guztiak iritsiko zaizkizu"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Dei guztiak iritsiko zaizkizu"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Bat ere ez"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktu</item>
-      <item quantity="one">1 kontaktu</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Bat ere ez}=1{1 kontaktu}other{# kontaktu}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Edonor"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktuak"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontaktu izardunak"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Jakinarazpen guztiak"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Jakinarazpen batzuk"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Aplikazioek jarduera eteteko baimenik ez badute ere, hautatzen duzun jendea salbuetsita geratuko da"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> aplikazioek eten dezakete</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> aplikazioak eten dezake</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Beste <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ez dago eten dezakeen aplikaziorik}=1{{app_1} aplikazioak eten dezake}=2{{app_1} eta {app_2} aplikazioek eten dezakete}=3{{app_1}, {app_2} eta {app_3} aplikazioek eten dezakete}other{\"{app_1}\", \"{app_2}\" eta beste # soinuk eten dezakete}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikazioak"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Jakinarazpen guztiak"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Jakinarazpen batzuk"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Jarduera eten dezaketen jakinarazpenak"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Eman baimena jakinarazpen guztiei"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">Eten dezaketenak: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="one">Eten dezaketenak: <xliff:g id="SOUND_CATEGORY">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ez dago eten dezakeen ezer"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Beste <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ez dago eten dezakeen ezer}=1{\"{sound_category_1}\" soinuak eten dezake}=2{\"{sound_category_1}\" eta \"{sound_category_2}\" soinuek eten dezakete}=3{\"{sound_category_1}\", \"{sound_category_2}\" eta \"{sound_category_3}\" soinuek eten dezakete}other{\"{sound_category_1}\", \"{sound_category_2}\" eta beste # soinuk eten dezakete}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ez dago eten dezakeen ezer"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ezin du inork eten"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Pertsona batzuek eten dezakete"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Edonork eten dezake"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Aktibatuta"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Desaktibatuta"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Aplikazioak ainguratzea"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Aplikazioak ainguratuz gero, uneko aplikazioa begi bistan izango duzu beti, harik eta aingura kentzen diozun arte. Lagun fidagarri bati joko zehatz batean aritzea ahalbidetzeko erabil dezakezu, adibidez. \n\nAplikazio bat ainguratuta dagoenean, baliteke beste aplikazio batzuk irekitzeko gai izatea, eta haiek zure datu pertsonalak atzitu ahal izango dituzte agian. \n\nAplikazioak ainguratzeko aukera erabiltzeko: 	\n1.	Aktibatu aplikazioak ainguratzeko aukera. 	\n2.	Ireki Ikuspegi orokorra. 	\n3.	Sakatu pantailaren goialdean dagoen aplikazioaren ikonoa eta, ondoren, sakatu Ainguratu."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Aplikazioak ainguratuz gero, uneko aplikazioa begi bistan izango duzu beti, harik eta aingura kentzen diozun arte. Lagun fidagarri bati joko zehatz batean aritzea ahalbidetzeko erabil dezakezu, adibidez. \n\nAplikazio bat ainguratuta dagoenean, baliteke beste aplikazio batzuk irekitzeko gai izatea, eta haiek zure datu pertsonalak atzitu ahal izango dituzte agian. \n\nGailua segurtasunez partekatu nahi baduzu beste norbaitekin, gonbidatuentzako erabiltzaile-profil bat ere erabil dezakezu. \n\nAplikazioak ainguratzeko aukera erabiltzeko: 	\n1.	Aktibatu aplikazioak ainguratzeko aukera. 	\n2.	Ireki Ikuspegi orokorra. 	\n3.	Sakatu pantailaren goialdean dagoen aplikazioaren ikonoa eta, ondoren, sakatu Ainguratu."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Ainguratuz gero, uneko aplikazioa begi bistan izango duzu beti, harik eta aingura kentzen diozun arte. Lagun fidagarri bati joko zehatz batean aritzea ahalbidetzeko erabil dezakezu, adibidez."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Aplikazio bat ainguratuta dagoenean, baliteke beste aplikazio batzuk irekitzeko gai izatea, eta haiek zure datu pertsonalak atzitu ahal izango dituzte agian. \n\nAplikazioak ainguratzeko aukera erabiltzeko: 	\n1.	Aktibatu aplikazioak ainguratzeko aukera. 	\n2.	Ireki Ikuspegi orokorra. 	\n3.	Sakatu pantailaren goialdean dagoen aplikazioaren ikonoa eta, ondoren, sakatu Ainguratu."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Aplikazio bat ainguratuta dagoenean, baliteke beste aplikazio batzuk irekitzeko gai izatea, eta haiek zure datu pertsonalak atzitu ahal izango dituzte agian. \n\nGailua segurtasunez partekatu nahi baduzu beste norbaitekin, gonbidatuentzako erabiltzaile-profil bat ere erabil dezakezu. \n\nAplikazioak ainguratzeko aukera erabiltzeko: 	\n1.	Aktibatu aplikazioak ainguratzeko aukera. 	\n2.	Ireki Ikuspegi orokorra. 	\n3.	Sakatu pantailaren goialdean dagoen aplikazioaren ikonoa eta, ondoren, sakatu Ainguratu."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Aplikazioa ainguratuta dagoenean: \n\n• Baliteke aplikazioak datu pertsonalak atzitu ahal izatea (adibidez, kontaktuak eta posta elektronikoko edukia). \n\n• Baliteke beste aplikazio batzuk irekitzeko gai izatea. \n\nPertsona fidagarriekin soilik erabili beharko zenuke aplikazioak ainguratzeko aukera."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Eskatu desblokeatzeko eredua aingura kendu aurretik"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Eskatu PIN kodea aingura kendu aurretik"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Aurpegia erabiltzeaz gain, gailua are gehiago babesteko, PIN kodea eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. PIN kodea eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Aurpegia erabiltzeaz gain, gailua are gehiago babesteko, eredua eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Eredua eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Aurpegia erabiltzeaz gain, gailua are gehiago babesteko, pasahitza eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Pasahitza eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Sistema biometrikoak erabiltzeaz gain, gailua are gehiago babesteko, PIN kodea eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. PIN kodea eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Sistema biometrikoak erabiltzeaz gain, gailua are gehiago babesteko, eredua eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Eredua eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Sistema biometrikoak erabiltzeaz gain, gailua are gehiago babesteko, pasahitza eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, eta alarmek ez dute joko.\n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Pasahitza eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Bai"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ez"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Murriztapena du"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Honek kontrolatzen du USB bidezko konexioa:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Konektatutako gailua"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Gailu hau"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Aldatzen…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Aldatzen…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Ezin izan da aldatu"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Gailua kargatzen"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Konektatutako gailua kargatzea"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Datu-konexioaren erabilera"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Aplikazioak erabilitako datuak"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wifi-datuen erabilera"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Operadorearenak ez diren datuen erabilera"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet datuen erabilera"</string>
     <string name="wifi" msgid="2932584495223243842">"Wifia"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 murriztapen</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Agian ez dira bat etorriko gailuak eta operadoreak egindako datu-kontsumoen neurketak"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ez dira hartzen kontuan operadorearen sareek erabilitako datuak"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> erabilita"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ezarri datuen erabileraren abisua"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datuen erabileraren abisua"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ikusi xehetasunak"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Datu-aurrezlea"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Datuen erabilera mugagabea"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Atzeko planoko datuak desaktibatuta daude"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Atzeko planoko datuak desaktibatuta daude"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aktibatuta"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desaktibatuta"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Erabili datu-aurrezlea"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Gailua blokeatuta badago, eragotzi jakinarazpenetan erantzunak edo beste edozer idaztea"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Zuzentzaile lehenetsia"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Aukeratu zuzentzailea"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Erabili ortografia-zuzentzailea"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Erabili ortografia-zuzentzailea"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Hautatu gabe"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(bat ere ez)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Memorian tokia egiteko, babeskopiak dituzten argazkiak eta bideoak gailutik kentzen ditu memoria-kudeatzaileak."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Kendu argazkiak eta bideoak"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Memoria-kudeatzailea"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Erabili Memoria-kudeatzailea"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Erabili biltegi-kudeatzailea"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatikoa"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Eskuzko ezarpenak"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Egin tokia"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Sakatu birritan telefonoa pantailako informazioa ikusteko"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Sakatu birritan tableta bertan dagoela ikusteko"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Sakatu birritan gailua bertan dagoela ikusteko"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Pasatu hatza jakinarazpenak ikusteko"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Pantailaren beheko ertzean, pasatu hatza behera, jakinarazpenak ager daitezen"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Esku bakarreko modua"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Erabili esku bakarreko modua"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Irten aplikazioa aldatzean"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Denbora-muga"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundo"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundo"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundo"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"irisgarritasuna"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, sakatu pantaila birritan."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Jaso telefonoa pantailako informazioa ikusteko"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Jaso tableta bertan dagoela ikusteko"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Sakatu tableta egiaztatzeko"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Sakatu gailua egiaztatzeko"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ordua, jakinarazpenak eta bestelako informazioa ikusteko, sakatu pantaila."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Larrialdia"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Erabili larrialdietarako laguntzaren eginbidea"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Kudeatzailea: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Abiarazi ekintza hauek etengailua bost aldiz edo gehiagoz bizkor sakatuta"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Erreproduzitu atzera-kontaketa duen alarma"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Egin zarata ozen bat laguntza eskatu baino lehen"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Deitu laguntza behar izanez gero"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Laguntza behar izanez gero erabili beharreko zenbakia"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Sakatu aldatzeko."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Larrialdi-zerbitzuetakoa ez den zenbaki bat idazten baduzu:\n • Gailuak desblokeatuta egon beharko du larrialdietarako laguntzaren eginbidea erabiltzeko.\n • Baliteke deiari inork ez erantzutea."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Pasatu hatza sentsoretik jakinarazpenak ikusteko"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Pasatu hatza sentsoretik"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Jakinarazpenei begiratu bat emateko, pasatu hatza behera telefonoaren atzealdeko hatz-marken sentsorean."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Ikusgai dauden gehieneko datu multzoak"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Berrezarri balio lehenetsiak"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Garatzaileak ez ditu berrezarri betetze automatikoko aukerak"</string>
+    <string name="location_category" msgid="3496759112306219062">"Kokapena"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Kokapen-adierazlearen egoera-barra"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Erakutsi kokapen guztietan, sarea eta konektagarritasuna barne"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Behartu GNSS neurketa osoak gauzatzera"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Egin GNSS konstelazio eta maiztasun guztien jarraipena, eginbeharren ziklorik gabe"</string>
     <string name="device_theme" msgid="5027604586494772471">"Gailuaren gaia"</string>
     <string name="default_theme" msgid="4815428567082263639">"Lehenetsia"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Sarearen izena"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pausatu jakinarazpenak arreta ez galtzeko"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Eginbidea ez dago erabilgarri"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Eginbidea desaktibatu egin da, telefonoa moteltzen duelako"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Behartu GNSS neurketa osoak gauzatzera"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Egin GNSS konstelazio eta maiztasun guztien jarraipena, eginbeharren ziklorik gabe"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Erakutsi beti hutsegiteen leihoak"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Erakutsi leiho bat aplikazioren batek huts egiten duen bakoitzean"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Hautatu ANGLE-rekin bateragarria den aplikazio bat"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Gaitu aplikazio guztietan"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Hautatu grafikoen kontrolatzailea"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Lehenetsia"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Jokoen kontrolatzailea"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Jokoen kontrolatzailea"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistemaren grafikoen kontrolatzailea"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Aktibatuta (audioa desaktibatuta)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Desaktibatuta"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Sarearen xehetasunak"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Mugikorreko aplikazioek gailuaren izena ikus dezakete. Halaber, jendeak ere ikus dezake Bluetooth bidezko gailuetara konektatzean edo wifi-gune bat konfiguratzean."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Mugikorreko aplikazioek gailuaren izena ikus dezakete. Halaber, jendeak ere ikus dezake Bluetooth bidezko gailuetara edo wifi-sare batera konektatzean, edo wifi-gune bat konfiguratzean."</string>
     <string name="devices_title" msgid="649715719278562515">"Gailuak"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Ezarpen guztiak"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Iradokizunak"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Ezin izan da aurkitu sarerik. Saiatu berriro."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(debekatuta)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Ez dago SIM txartelik"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM txartela"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ez dago SIM txartelik"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Bat ere ez"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM txartela behar da konektatzeko"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> operadorearen SIM txartela behar da konektatzeko"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Sare modu hobetsia: WCDMA hobetsita"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Sare modu hobetsia: GSM soilik"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Sare modu hobetsia: WCDMA soilik"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datu-konexioa"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Atzitu datuak datu-konexioaren bidez"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Barrutian dagoenean, automatikoki aldatuko da telefonoa operadore honetara"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ez dago SIM txartelik erabilgarri"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Deien hobespena"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS mezuen hobespena"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Galdetu beti"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ez dago erabilgarri <xliff:g id="CARRIER">%1$s</xliff:g> operadorera konektatuta egoteagatik"</string>
     <string name="see_more" msgid="7499355691042812723">"Ikusi gehiago"</string>
     <string name="see_less" msgid="2642392725363552793">"Ikusi gutxiago"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktibatu nahi duzu?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM txartela aktibatu nahi duzu?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operadorera aldatu nahi duzu?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM txartela erabiltzen hasi nahi duzu?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"SIM txartel bakarra aktiba daiteke aldiko.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operadorera aldatuta ere ez da bertan behera utziko <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> zerbitzua."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Deskargatutako SIM txartel bakarra aktiba daiteke aldiko.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operadorera aldatuta ere ez da bertan behera utziko <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> zerbitzua."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"SIM txartel bakarra aktiba daiteke aldiko.\n\n Aldatuta ere, ez da utziko bertan behera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> zerbitzua."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Aldatu <xliff:g id="CARRIER_NAME">%1$s</xliff:g> operadorera"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Sarera konektatzen…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operadorera aldatzen"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Ezin da aldatu operadorea"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Errore bat gertatu da eta ezin da aldatu operadorea."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> desaktibatu nahi duzu?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM txartela desaktibatu nahi duzu?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM txartela desaktibatzen<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Ezin da desgaitu operadorea"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Arazoren bat izan da, eta ezin izan da desgaitu operadorea."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Bi SIM txartel erabili nahi dituzu?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Gailu honek bi SIM txartel izan ditzake aktibo aldi berean. SIM txartel bakarra erabili nahi baduzu, sakatu \"Ez, eskerrik asko\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Gailua berrabiarazi nahi duzu?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Hasteko, berrabiarazi gailua. Gero, beste SIM txartel bat gehitu ahalko duzu."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Egin aurrera"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Berrabiarazi"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ez"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Aldatu"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Ezin da aktibatu SIM txartela"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Kendu SIM txartela eta sar ezazu berriro. Arazoak badirau, berrabiarazi gailua."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Saiatu berriro SIM txartela aktibatzen. Arazoak badirau, berrabiarazi gailua."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Sarearen aktibazioa"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Aktibo dago <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Sakatu hau SIM txartelarenaren ezarpenak eguneratzeko"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM txartela"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Deskargatutako SIM txartel honetako eduki guztia ezabatu?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"SIM txartel honetako eduki guztia ezabatuz gero, <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> operadorearen zerbitzua kenduko da gailu honetatik.\n\nEz da utziko bertan behera <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> operadorearen zerbitzua."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Ezabatu eduki guztia"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM txarteleko eduki guztia ezabatzen…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Ezin da ezabatu SIM txarteleko eduki guztia"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Ezin da ezabatu SIM txarteleko eduki guztia errore bat gertatu delako.\n\nBerrabiarazi gailua eta saiatu berriro."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Konektatu gailura"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> aplikazioak aldi baterako wifi-sare bat erabili nahi du zure gailura konektatzeko"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Ez da aurkitu gailurik. Ziurtatu gailuak piztuta daudela eta konekta daitezkeela."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Larrialdi-deiak"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Zure operadoreak ez ditu onartzen wifi bidezko larrialdi-deiak.\nLarrialdi-dei bat egin behar dela hautematean, gailua automatikoki aldatzen da sare mugikor batera deia egiteko.\nSare mugikorren estaldura-eremuetan bakarrik egin daitezke larrialdi-deiak."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Kalitatea hobetzeko, erabili wifi-konexioa deietan"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Beste SIM txartel batetik deitzeko aukera"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Egin deiak eta bidali SMS mezuak beste SIM txartel batekin SIM txartel hau erabilita."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"beste SIM txartel batetik deitzeko aukera"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"MMS mezu bat jaso duzu"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Ezin da bidali MMS mezua"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Sakatu hau <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> operadorearekin MMS mezuak erabiltzeko baimena emateko datu-konexioa desaktibatuta dagoenean"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Eman pantailetan gainjartzeko baimena ezarpenetan"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Eman ezarpenenen pantailetan gainjartzeko baimena aplikazioen gainean bistara daitezkeen aplikazioei"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimedia-edukia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ezkutatu erreproduzigailua multimedia-saioa amaitzean"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Erreproduzigailuari esker, saioei berrekin diezaiekezu Ezarpen bizkorrak panel zabaldutik."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Multimedia-erreproduzigailua Ezarpen bizkorrak atalean"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Erreprodukzioari modu errazean berrekiteko, erakutsi multimedia-erreproduzigailua luzaroan"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ezkutatu erreproduzigailua"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Erakutsi erreproduzigailua"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Ez dago erreproduzigailurik erabilgarri"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Baimenduta dauden aplikazioak"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multimedia-edukia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth bidezko konexioa aktibatuko da"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Aktibatuta"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desaktibatuta"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM txartelak"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Hegaldietarako seguruak diren sareak"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Aurkitu hegaldietarako seguruak diren sareak eta konektatu haietara"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"hegaldia, hegaldietarako segurua"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Deiak eta SMSak"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi bidezko deiak"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Egin eta jaso deiak wifia eta operadore batenak ez diren antzeko sareen bitartez"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wifi bidezko deiekin, deiak egin eta jaso ahalko dituzu operadore batenak ez diren sareen bitartez (adibidez, zenbait wifi-sare)."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Deiak"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMSa"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"hobetsiak"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"deiak hobesten dira"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMSak hobesten dira"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ez dago erabilgarri"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ez dago SIM txartelik"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Hobespenak"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Konektatu sare publikoetara"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"sareko konexioa, internet, hari gabeko konexioak, datuak, wifia, mugikorra, telefono mugikorra, operadorea, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ikusi hegaldietarako seguruak diren sareak"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desaktibatu hegaldi modua"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ez dago erabilgarri, lo egiteko garaiaren modua aktibatuta dagoelako"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Berrezarri da jakinarazpenen garrantzia."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikazioak"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Fidagarria ez den gailu batek zure mezuak atzitu nahi ditu. Sakatu xehetasunak ikusteko."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Mezuak atzitzeko baimena eman nahi diozu?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Fidagarria ez den Bluetooth bidezko gailu batek ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) zure mezuak atzitu nahi ditu.\n\nEz zara inoiz konektatu [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] gailura."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Fidagarria ez den gailu batek zure kontaktuak eta deien historia atzitu nahi ditu. Sakatu xehetasunak ikusteko."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Kontaktuak eta deien historia atzitzeko baimena eman nahi diozu?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Fidagarria ez den Bluetooth bidezko gailu batek ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) zure kontaktuak eta deien historia atzitu nahi ditu. Hor sartzen dira jasotako eta egindako deiei buruzko datuak.\n\nEz zara inoiz konektatu [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] gailura."</string>
 </resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 9f010de..74c4a88 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"متوسط"</item>
     <item msgid="6740026006576843477">"طولانی"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"کوتاه"</item>
+    <item msgid="7397961711906421599">"متوسط"</item>
+    <item msgid="4079132024502041928">"طولانی"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"پیش‌فرض"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"جهانی"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"‏فقط TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"سراسری"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4fbc395..f801e7c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"تاریخ و ساعت"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"تنظیم تاریخ و زمان"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"تنظیم تاریخ، ساعت، منطقهٔ زمانی و قالب‌ها"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"استفاده از زمان ارائه‌شده شبکه"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"استفاده از منطقه زمانی ارائه‌شده از شبکه"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"تنظیم خودکار زمان"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"تنظیم خودکار منطقه زمانی"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"استفاده از پیش‌فرض منطقه زبانی"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"قالب ۲۴ ساعته"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"استفاده از قالب ۲۴ ساعته"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"نمایش اطلاعات نمایه در صفحه قفل"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"حساب‌ها"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"مکان"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"استفاده از مکان"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"استفاده از مکان"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"خاموش"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">فعال - <xliff:g id="COUNT_1">%1$d</xliff:g> برنامه به مکان شما دسترسی دارند</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"قفل صفحه، باز کردن قفل با چهره"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"قفل صفحه، اثر انگشت"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"قفل صفحه"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"قفل تلفن را به‌طور ایمن با چهره و اثر انگشتتان باز کنید"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"تأیید پرداخت‌ها ازطریق ورود به سیستم برنامه‌ها نیز ممکن است"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"راه‌اندازی قفل‌گشایی با:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"بازگشایی با چهره"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"قفل تلفن را مثل آب خوردن باز کنید"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"اثر انگشت"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"صرفه‌جویی در وقت با قفل‌گشایی تلفن در جیب"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"رد شدن"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"بعدی"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"چهره افزوده شد"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"راه‌اندازی بازگشایی با چهره"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"بازگشایی با چهره"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"استفاده از چهره‌تان برای اصالت‌سنجی"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"شروع"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"‏اگر «بازگشایی با چهره» درحالت دسترس‌پذیری خاموش باشد، ممکن است برخی مراحل راه‌اندازی به‌خوبی با TalkBack کار نکنند."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"برگشت"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ادامه راه‌اندازی"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"استفاده از تنظیمات دسترس‌پذیری"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"هنگام استفاده از «بازگشایی با چهره» در برنامه‌ها، همیشه به تأیید نیاز است"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"حذف داده‌های چهره"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"راه‌اندازی بازگشایی با چهره"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"از «بازگشایی با چهره» برای باز کردن قفل دستگاه، ورود به سیستم برنامه‌ها، و تأیید پرداخت‌ها استفاده کنید.\n\nبه‌خاطر بسپارید:\nنگاه کردن به تلفن می‌تواند قفل آن را باز کند، حتی اگر قصد این کار را نداشته باشید.\n\nهر کسی می‌تواند با نگه داشتن تلفن در جلوی صورت شما قفل آن را باز کند.\n\nفردی که شباهت زیادی به شما دارد، مثلاً خواهر یا برادر دوقلو، می‌تواند قفل تلفنتان را باز کند."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"از «بازگشایی با چهره» برای باز کردن قفل دستگاه، ورود به سیستم برنامه‌ها و تأیید پرداخت‌ها استفاده کنید.\n\nبه خاطر بسپارید:\nبا نگاه کردن به تلفن (حتی اگر نخواهید)، ممکن است قفل آن باز شود.\n\nاگر فردی تلفن را جلوی صورت شما بگیرد، ممکن است قفل آن باز شود، حتی اگر چشمانتان بسته باشد.\n\nفرد دیگری که شباهت زیادی به شما دارد - مثلاً خواهر یا برادر دوقلو - می‌تواند قفل تلفن را باز کند."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"بااستفاده از «بازگشایی با چهره»، قفل دستگاهتان را باز کنید، به سیستم برنامه‌ها وارد شوید، و پرداخت‌ها را تأیید کنید."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"به‌خاطر بسپارید:\nنگاه کردن به تلفن می‌تواند قفل آن را باز کند، حتی اگر قصد این کار را نداشته باشید.\n\nهر کسی می‌تواند با نگه داشتن تلفن در جلوی صورت شما قفل آن را باز کند.\n\nفردی که شباهت زیادی به شما دارد، مثلاً خواهر یا برادر دوقلو، می‌تواند قفل تلفنتان را باز کند."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"به‌خاطر بسپارید:\nنگاه کردن به تلفن می‌تواند قفل آن را باز کند، حتی اگر قصد این کار را نداشته باشید.\n\nهر کسی می‌تواند با نگه داشتن تلفن در جلوی صورت شما قفل آن را باز کند، حتی اگر چشمانتان بسته باشد.\n\nفردی که شباهت زیادی به شما دارد، مثلاً خواهر یا برادر دوقلو، می‌تواند قفل تلفنتان را باز کند."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"داده‌های چهره حذف شود؟"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"داده‌های چهره که «بازگشایی با چهره» از آن استفاده کرده به‌طور دائم و ایمن حذف می‌شود. پس از حذف، برای باز کردن قفل تلفن، ورود به سیستم برنامه‌ها، و تأیید پرداخت‌ها، به پین، الگو، یا گذرواژه نیاز دارید."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"‏با Face Unlock، قفل تلفنتان را باز کنید"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"از اثر انگشتتان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: نمی‌توانید از اثر انگشتتان برای باز کردن قفل این دستگاه استفاده کنید. برای اطلاعات بیشتر، با سرپرست سیستم سازمانتان تماس بگیرید."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"از اثر انگشتتان برای باز کردن قفل تلفن یا تأیید خریدها استفاده کنید.\n\nتوجه: ممکن است امنیت اثر انگشت از یک الگو یا پین قوی کمتر باشد."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"لغو"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"نه متشکرم"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ادامه"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"رد شدن"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"بعدی"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"از رایانه لوحی‌تان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی «بازگشایی با چهره»، همچنین به گزینه قفل صفحه نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"از دستگاهتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی «بازگشایی با چهره»، همچنین به گزینه قفل صفحه نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"از تلفنتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی «بازگشایی با چهره»، همچنین به گزینه قفل صفحه نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"از رایانه لوحی‌تان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به‌سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی زیست‌سنجشی به گزینه قفل صفحه هم نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"از دستگاهتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به‌سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی زیست‌سنجشی به گزینه قفل صفحه هم نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"از تلفنتان با گزینه قفل صفحه محافظت کنید تا درصورت گم شدن یا به‌سرقت رفتن هیچ فردی نتواند از آن استفاده کند. برای راه‌اندازی زیست‌سنجشی به گزینه قفل صفحه هم نیاز دارید. برای برگشت، روی «لغو» ضربه بزنید."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"راه‌اندازی پین رد شود؟"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"راه‌اندازی گذرواژه رد شود؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"راه‌اندازی الگو رد شود؟"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این رایانه لوحی استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این دستگاه استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"با فعال کردن قابلیت‌های حفاظتی دستگاه، نگذارید دیگران بدون اجازه شما از این تلفن استفاده کنند. قفل صفحه موردنظر برای استفاده را انتخاب کنید."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"روش پشتیبان قفل صفحه را انتخاب کنید"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"روش پشتیبان قفل صفحه را انتخاب کنید"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"روش پشتیبان قفل صفحه را انتخاب کنید"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"گزینه‌های قفل صفحه"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"گزینه‌های قفل صفحه"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"قفل صفحه"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"بازگشایی با چهره + گذرواژه"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ادامه بدون «بازگشایی با چهره»"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"می‌توانید با استفاده از چهره‌تان قفل تلفنتان را باز کنید. بنا به دلایل ایمنی این گزینه مستلزم قفل صفحه پشتیبان است."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"زیست‌سنجشی + الگو"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"زیست‌سنجشی + پین"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"زیست‌سنجشی + گذرواژه"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ادامه دادن بدون زیست‌سنجشی"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"می‌توانید بااستفاده از زیست‌سنجشی، قفل تلفنتان را باز کنید. بنا به دلایل ایمنی، افزودن قفل صفحه پشتیبان برای این گزینه الزامی است."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"توسط سرپرست غیرفعال شده، طبق خط‌مشی رمزگذاری یا حافظه اطلاعات کاربردی"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"خالی"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"تند کشیدن"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">باید کمتر از <xliff:g id="NUMBER_1">%d</xliff:g> رقم باشد</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"سرپرست دستگاه اجازه استفاده از پین اخیر را نمی‌دهد"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"پین‌های رایج توسط سرپرست فناوری اطلاعات شما مسدود شده‌اند. پین متفاوتی را امتحان کنید."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"نمی‌تواند نویسه نامعتبر داشته باشد"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"باید حداقل یک حرف داشته باشد"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"باید حداقل یک عدد داشته باشد"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">باید حداقل <xliff:g id="COUNT">%d</xliff:g> نویسه غیرعددی داشته باشد</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"سرپرست دستگاه اجازه استفاده از گذرواژه اخیر را نمی‌دهد"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"گذرواژه‌های رایج توسط سرپرست فناوری اطلاعات شما مسدود شده‌اند. گذرواژه متفاوتی را امتحان کنید."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ترتیب صعودی، نزولی یا تکراری ارقام مجاز نیست"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"تأیید"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"لغو"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"‏روشن کردن Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"‏استفاده از Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"‏استفاده از Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"‏تنظیمات Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"تنظیم و مدیریت نقاط دسترسی بی سیم"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»،‌ رمزینه پاسخ‌سریع را در مرکز پنجره زیر قرار دهید"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"‏با اسکن کردن رمزینه پاسخ‌سریع، به Wi‑Fi بپیوندید"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"‏استفاده مشترک از Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»، این رمزینه پاسخ‌سریع را اسکن کنید و گذرواژه مربوطه را هم‌رسانی کنید"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"برای پیوستن به «<xliff:g id="SSID">%1$s</xliff:g>»، این رمزینه پاسخ‌سریع را با دستگاه دیگری اسکن کنید"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"برای اتصال به «<xliff:g id="SSID">%1$s</xliff:g>»، این رمزینه پاسخ‌سریع را اسکن کنید"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"دوباره امتحان کنید. اگر مشکل همچنان ادامه دارد، با سازنده دستگاه تماس بگیرید"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"مشکلی رخ داده است"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"‏گذرواژه Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"گذرواژه نقطه اتصال: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"اتصال خودکار"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"به تلفن اجازه داده شود نزدیک این شبکه به‌طور خودکار متصل شود"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"به رایانه لوحی اجازه داده شود نزدیک این شبکه به‌طور خودکار متصل شود"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"مجاز کردن اتصال به این شبکه (وقتی در محدوده باشد)"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"افزودن دستگاه"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"برای افزودن دستگاه به این شبکه، از رمزینه پاسخ‌سریع استفاده کنید"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"رمزینه پاسخ‌سریع، قالب معتبری نیست"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"استفاده از گواهی‌های سیستم"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ارائه نشود"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"راستی‌آزمایی نشود"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"مجوزی مشخص نشده است. اتصال شما خصوصی نخواهد بود."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"نام شبکه خیلی طولانی است."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"باید دامنه‌ای مشخص کنید."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"به گواهینامه نیاز است."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"اتصال"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"‏Wi-Fi روشن شد"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"به <xliff:g id="NETWORK_NAME">%1$s</xliff:g> متصل شد"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"درحال اتصال به <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"درحال اتصال…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"اتصال به شبکه برقرار نشد"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"شبکه در محدوده نیست"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"‏نشانی MAC دستگاه"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"‏نشانی MAC تصادفی"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"‏نشانی MAC تصادفی (آخرین استفاده)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"‏نشانی IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"جزئیات شبکه"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"پوشش زیرشبکه"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"‏نشانی‌های IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"شبکه‌های ذخیره‌شده"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"اشتراک‌ها"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"شبکه‌های دیگر"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"‏تنظیمات IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"‏تنظیمات پیشرفته Wi‑Fi برای این کاربر در دسترس نیست"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"ذخیره"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"یک آدرس دروازه معتبر را تایپ کنید."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"‏یک آدرس DNS معتبر را تایپ کنید."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"یک پیشوند شبکه با طول بین 0 تا 32 نویسه تایپ کنید."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"ساناد ۱ (مگراینکه «ساناد خصوصی» آن را ملغی کند)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"ساناد ۲ (مگراینکه «ساناد خصوصی» آن را ملغی کند)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"دروازه"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"طول پیشوند شبکه"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"‏اتصال مستقیم Wi-Fi"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"برنامه محتوا را هم‌رسانی می‌کند. برای هم‌رسانی اتصال اینترنت، نقطه اتصال را خاموش و سپس روشن کنید"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"گذرواژه‌ای تنظیم نشده است"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"نام نقطه اتصال"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"درحال روشن کردن <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"درحال روشن کردن <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"سایر دستگاه‌ها می‌توانند به <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> متصل شوند."</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"گذرواژه نقطه اتصال"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"‏باند AP"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"نمایشگر روان"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"به‌طور خودکار سرعت بازخوانی را برای بعضی محتواها، از ۶۰ هرتز تا ۹۰ هرتز بالا می‌برد. مصرف باتری را افزایش می‌دهد."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"نمایشگر روان"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"اجباری کردن نرخ بازخوانی ۹۰ هرتز"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"بالاترین نرخ بازخوانی برای پاسخ‌گویی بهبودیافته لمس و کیفیت پویانمایی. مصرف باتری را افزایش می‌دهد."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"توجه به صفحه"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"روشن / تازمانی‌که درحال تماشای صفحه‌نمایش باشید، صفحه خاموش نخواهد شد"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"وقتی صفحه تاریک است، برای اعلان‌های جدید روشن می‌شود"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"همیشه زمان و اطلاعات نمایش داده شود"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"مصرف باتری بالا"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"نوشتار پررنگ"</string>
     <string name="title_font_size" msgid="570613010306330622">"اندازه قلم"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"نوشتار را بزرگ‌تر یا کوچک‌تر کنید"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"تنظیمات قفل سیم کارت"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"‏نسخهٔ Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"‏به‌روزرسانی امنیتی Android"</string>
     <string name="model_info" msgid="8997566254717810904">"مدل"</string>
-    <string name="model_summary" msgid="2246651782442466213">"‏مدل: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"مدل و سخت‌افزار"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"نسخه سخت‌افزار"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"شناسه دستگاه"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"حذف نام نقطه دستیابی"</string>
     <string name="menu_new" msgid="6571230342655509006">"نام نقطه دستیابی جدید"</string>
     <string name="menu_save" msgid="6611465355127483100">"ذخیره"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"صرف‌نظر"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"لغو"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"قسمت نام نباید خالی باشد."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"نام نقطه دستیابی نمی‌تواند خالی باشد."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"برنامه‌ها را می‌توان بازنشانی کرد"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"‏بازنشانی Wi-Fi، داده شبکه همراه و بلوتوث"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"‏این کار همه تنظیمات شبکه را بازنشانی می‌کند، ازجمله:\n\n"<li>"Wi-Fi‏"</li>\n<li>"داده شبکه تلفن همراه"</li>\n<li>"بلوتوث"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"پاک‌سازی"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"پاک‌سازی سیم‌کارت‌های بارشده"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"برای بارگیری سیم‌کارت‌های جایگزین، با شرکت مخابراتی‌تان تماس بگیرید. با این کار، هیچ‌یک از طرح‌های سرویس دستگاه همراه لغو نمی‌شود."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"با این کار، هیچ‌یک از طرح‌های سرویس تلفن همراه لغو نمی‌شود. برای بارگیری سیم‌کارت‌های جایگزین، با شرکت مخابراتی‌تان تماس بگیرید."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"بازنشانی تنظیمات"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"همه تنظیمات شبکه بازنشانی شود؟ این کنش واگرد نمی‌شود."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"همه تنظیمات شبکه بازنشانی شود و سیم‌کارت‌های بارگیری‌شده پاک‌سازی شود؟ این کنش واگرد نمی‌شود."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"تنظیمات شبکه بازنشانی شد"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"سیم‌کارت‌ها پاک‌سازی نشدند"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"به‌دلیل بروز خطا، سیم‌کارت‌های بارگیری‌شده پاک‌سازی نشدند.\n\nدستگاه را بازراه‌اندازی کنید و دوباره امتحان کنید."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" رایانه لوحی‌تان پاک می‌شود، از جمله:\n\n"<li>"حساب Google شما"<li>\n</li>"داده‌ها و تنظیمات سیستم و برنامه "<li>\n</li>"برنامه‌های بارگیری‌شده"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" تلفنتان پاک می‌شود، از جمله: \n\n"<li>"حساب Google شما"</li>\n<li>"تنظیمات و داده‌های سیستم و برنامه"</li>\n<li>"برنامه‌های بارگیری‌شده"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"شما در حال حاضر به حساب‌های زیر وارد شده‌اید:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"کاربران دیگری در این دستگاه وجود دارند.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"موسیقی"</li>\n<li>"عکس ها"</li>\n<li>"سایر اطلاعات کاربر"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"سیم‌کارت داخلی"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"با این کار طرح سرویس تلفن همراهتان لغو نخواهد شد."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"‏\n\nبرای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"حافظهٔ USB"</b>" باید پاک شود."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">"‏\n\nبرای پاک کردن موسیقی، عکس‌ها و سایر داده‌های کاربر، "<b>"کارت SD"</b>" باید پاک شود."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"پاک کردن همه داده‌ها (بازنشانی کارخانه‌ای)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" رایانه لوحی‌تان پاک می‌شود، ازجمله:\n\n"<li>"«حساب Google» شما"<li>\n</li>"داده‌ها و تنظیمات سیستم و برنامه "<li>\n</li>"برنامه‌های بارگیری‌شده"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"‏با این کار همه داده‌های "<b>"حافظه داخلی"</b>" تلفنتان پاک می‌شود، ازجمله: \n\n"<li>"«حساب Google» شما"</li>\n<li>"تنظیمات و داده‌های سیستم و برنامه"</li>\n<li>"برنامه‌های بارگیری‌شده"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"درحال‌حاضر به سیستم حساب‌های زیر وارد شده‌اید:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"کاربران دیگری در این دستگاه وجود دارند.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"موسیقی"</li>\n<li>"عکس"</li>\n<li>"دیگر اطلاعات کاربر"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"سیم‌کارت داخلی"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"با این کار طرح خدمات تلفن همراهتان لغو نخواهد شد."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"‏\n\nبرای پاک کردن فایل‌های موسیقی، تصاویر، و دیگر داده‌های کاربر، "<b>"حافظه USB"</b>" باید پاک شود."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">"‏\n\nبرای پاک کردن فایل‌های موسیقی، تصاویر، و دیگر داده‌های کاربر، "<b>"کارت SD"</b>" باید پاک شود."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"‏پاک کردن حافظهٔ USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"‏پاک کردن کارت SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"‏همه داده‌های موجود در حافظهٔ USB داخلی مانند موسیقی یا عکس‌ها را پاک کنید"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"‏همه داده‌های موجود در کارت SD از جمله موسیقی یا عکس‌ها حذف می‌شوند"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"پاک کردن تمام داده‌ها"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"پاک کردن تمام داده‌ها"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"همه اطلاعات شخصی و برنامه‌های بارگیری‌شده حذف خواهد شد. این کنش واگرد نمی‌شود."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"همه اطلاعات شخصی‌تان، ازجمله برنامه‌ها و سیم‌کارت‌های بارگیری‌شده، حذف می‌شود. این کنش واگرد نمی‌شود."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"پاک کردن همه موارد"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"هیچ بازنشانی انجام نشد زیرا سرویس پاکسازی سیستم در دسترس نیست."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"همه داده‌ها پاک شود؟"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"بازنشانی به تنظیمات کارخانه برای این کاربر در دسترس نیست"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"در حال پاک کردن"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"لطفاً صبر کنید..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"پاک کردن تمام داده‌ها"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"پاک کردن تمام داده‌ها"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"همه اطلاعات شخصی و برنامه‌های بارگیری‌شده حذف خواهد شد. این کنش واگردشدنی نیست."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"همه اطلاعات شخصی‌تان، ازجمله سیم‌کارت‌ها و برنامه‌های بارگیری‌شده، حذف می‌شود. این کنش واگردشدنی نیست."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"همه داده‌ها پاک شود؟"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"بازنشانی کارخانه‌ای برای این کاربر دردسترس نیست"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"درحال پاک‌سازی"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"لطفاً منتظر بمانید…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"تنظیمات تماس"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"تنظیم پست صوتی، هدایت تماس، انتظار تماس، شناسه تماس‌گیرنده"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"‏اشتراک‌گذاری اینترنت با USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"اتصال اینترنتی با تلفن همراه به بیش از <xliff:g id="MAXCONNECTION">%1$d</xliff:g> دستگاه امکان‌پذیر نیست."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> از اتصال اینترنتی با تلفن همراه قطع می‌شود."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"اشتراک‌گذاری اینترنت با اترنت"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"‏هم‌رسانی اتصال اینترنت تلفن ازطریق «اترنت USB»"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"هم‌رسانی اتصال اینترنت تلفن ازطریق اترنت"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"برای ارائه اینترنت به سایر دستگاه‌ها ازطریق اتصال داده تلفن همراهتان، از نقطه اتصال و اشتراک‌گذاری اینترنت استفاده کنید. همچنین برنامه‌ها می‌توانند نقطه اتصالی ایجاد کنند تا محتوا را با دستگاه‌های اطراف هم‌رسانی کند."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‏برای ارائه اینترنت به سایر دستگاه‌ها ازطریق اتصال داده تلفن همراه یا Wi-Fi، از نقطه اتصال و اشتراک‌گذاری اینترنت استفاده کنید. برنامه‌ها همچنین می‌تواند نقطه اتصالی ایجاد کند تا محتوا را با دستگاه‌های اطراف هم‌رسانی کند."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"راهنمایی"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"اسکن کردن بلوتوث"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"به برنامه‌ها و سرویس‌ها اجازه دهید درهر زمانی (حتی وقتی «بلوتوث» خاموش است) دستگاه‌های اطراف را اسکن کنند. برای مثال این مورد مي‌تواند برای بهبود ویژگی‌ها و سرویس‌های مکان‌مبنا استفاده شود."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"خدمات مکان برای کار"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"تشخیص منطقه زمانی بااستفاده از مکان"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"تشخیص منطقه زمانی بااستفاده از مکان"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"‏اجازه می‌دهد از مکان دستگاه برای تشخیص منطقه زمانی کنونی استفاده شود. دیگر تنظیمات مکان مثل اسکن کردن Wi‑Fi می‌تواند بر دقت تشخیص منطقه زمانی تأثیر داشته باشد."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"روشن"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"خاموش"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"تشخیص خودکار منطقه زمانی غیرفعال است"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"تشخیص منطقه زمانی بااستفاده از مکان غیرفعال است"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"تشخیص منطقه زمانی بااستفاده از مکان پشتیبانی نمی‌شود"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"تغییر تشخیص منطقه زمانی بااستفاده از مکان مجاز نیست"</string>
     <string name="location_network_based" msgid="5247042890080021887">"‏مکان شبکه تلفن همراه و Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"‏به برنامه‌ها اجازه داده شود با سرویس مکان Google مکانتان را سریع‌تر تخمین بزنند. داده‌های مکان ناشناس جمع‌آوری شده و به Google ارسال خواهد شد."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"‏موقعیت مکانی تعیین شده توسط Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"برای استفاده از «بازگشایی با چهره»، گذرواژه تنظیم کنید"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"برای استفاده از «بازگشایی با چهره»، الگو تنظیم کنید"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"برای استفاده از «بازگشایی با چهره»، پین تنظیم کنید"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"تنظیم گذرواژه برای استفاده از زیست‌سنجشی"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"تنظیم الگو برای استفاده از زیست‌سنجشی"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"تنظیم پین برای استفاده از زیست‌سنجشی"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"گذرواژه را فراموش کردید؟"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"الگو را فراموش کردید؟"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"پین خود را فراموش کرده‌اید؟"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"اولویت‌های زیرنویس"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"بزرگ‌نمایی"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ناحیه بزرگ‌نمایی"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"فعال کردن بزرگ‌نمایی"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ناحیه(های) بزرگ‌نمایی موردنظر را برای استفاده هنگام بزرگ‌نمایی صفحه‌نمایش انتخاب کنید"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"تمام‌صفحه"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"بخشی از صفحه"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"تمام‌صفحه و بخشی از صفحه"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"بزرگ‌نمایی تمام صفحه"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"بزرگ‌نمایی بخشی از صفحه"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"به دکمه دسترس‌پذیری می‌روید؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"استفاده از سه ضربه برای درشت‌نمایی بخشی از صفحه، باعث می‌شود تایپ کردن و دیگر کنش‌ها با تأخیر انجام شوند.\n\nمی‌خواهید به استفاده از دکمه دسترس‌پذیری برای درشت‌نمایی بروید؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"رفتن به دکمه دسترس‌پذیری"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ادامه استفاده از سه ضربه برای درشت‌نمایی"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"تنظیمات بزرگ‌نمایی"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"درشت‌نمایی با سه ضربه"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"درشت‌نمایی بااستفاده از میان‌بر"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"قطع تماس با دکمه روشن/خاموش"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"اشاره‌گر موشواره بزرگ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"برداشتن پویانمایی‌ها"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"صدای مونو"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ترکیب کانال‌ها هنگام پخش صدا"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"توازن صوتی"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"چپ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"راست"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"صدای مونو"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ترکیب کانال‌ها هنگام پخش صوت"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"توازن صوتی"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"چپ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"راست"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"پیش‌فرض"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"۱۰ ثانیه"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"۳۰ ثانیه"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"لرزش برای اعلان"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"لرزش هنگام زنگ خوردن"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"بازخورد لمسی"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"استفاده از <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"باز کردن <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"استفاده از تصحیح رنگ"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"نشان دادن زیرنویس"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"فقط برای برنامه پشتیبانی‌شده"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"استفاده از <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"باز کردن <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"استفاده از تصحیح رنگ"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"نشان دادن زیرنویس ناشنوایان"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"فقط برای برنامه پشتیبانی‌شده"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"اندازه و سبک زیرنویس"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"اندازه نوشتار <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"گزینه‌های دیگر"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"سبزدشواربینی"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"قرمزدشواربینی"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"آبی‌دشواربینی"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"سیاه‌وسفید"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"قرمز-سبز"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"قرمز-سبز"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"آبی-زرد"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"محدودیت پس‌زمینه"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"به برنامه اجازه دهید در پس‌زمینه اجرا شود"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"به برنامه اجازه اجرا شدن در پس‌زمینه داده نشد"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"استفاده در پس‌زمینه نمی‌تواند محدود شود"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"استفاده در پس‌زمینه نمی‌تواند محدود شود"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"فعالیت پس‌زمینه محدود شود؟"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"محدود کردن فعالیت پس‌زمینه برای برنامه ممکن است باعث عملکرد نادرست آن شود."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"از آنجا که این برنامه برای بهینه کردن باتری تنظیم نشده است، نمی‌توانید آن را محدود کنید.\n\nبرای محدود کردن برنامه، ابتدا بهینه‌سازی باتری را روشن کنید."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"رایانه لوحی بیشتر از حد معمول استفاده شده است"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"دستگاه بیشتر از حد معمول استفاده شده است"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ممکن است شارژ باتری زودتر از معمول تمام شود"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"بهینه‌سازی برای سلامت باتری"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"باتری موقتاً محدود شده است. برای اطلاعات بیشتر، ضربه بزنید."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"از تلفنتان بیش‌ازحد معمول استفاده شده است. ممکن است باتری آن زودتر از موعد موردانتظار تمام شود.\n\nبرنامه‌های برتر براساس مصرف باتری:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"از رایانه لوحی بیش از حد معمول استفاده شده است. ممکن است باتری آن زودتر از موعد موردانتظار تمام شود.\n\nبرنامه‌های برتر براساس مصرف باتری:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"از دستگاه بیش از حد معمول استفاده شده است. ممکن است باتری آن زودتر از موعد موردانتظار تمام شود.\n\nبرنامه‌های برتر براساس مصرف باتری:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">‏%1$d برنامه محدود شد</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"مشکلی در خواندن میزان باتری وجود دارد"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"مشکلی در خواندن میزان باتری وجود دارد. برای "<annotation id="url">"اطلاعات بیشتر"</annotation>" ضربه بزنید"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"برنامه متوقف شود؟"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"تلفنتان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا <xliff:g id="APP">%1$s</xliff:g> آن را بیدار نگه می‌دارد.\n\nبرای برطرف کردن این مشکل، می‌توانید برنامه را متوقف کنید.\n\nاگر مشکل ادامه داشت، ممکن است لازم باشد برنامه را حذف نصب کنید تا عملکرد باتری بهبود یابد."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"رایانه لوحی‌تان نمی‌تواند به‌طور عادی میزان استفاده از شارژ باتری را مدیریت کند، زیرا <xliff:g id="APP">%1$s</xliff:g> آن را بیدار نگه می‌دارد.\n\nبرای برطرف کردن این مشکل، می‌توانید برنامه را متوقف کنید.\n\nاگر مشکل ادامه داشت، ممکن است لازم باشد برنامه را حذف نصب کنید تا عملکرد باتری بهبود یابد."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"تنظیم زمان‌بندی"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"افزایش عمر باتری"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"وقتی شارژ شد خاموش شود"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"وقتی شارژ تلفن <xliff:g id="PERCENT">%1$s</xliff:g> شود، «بهینه‌سازی باتری» خاموش می‌شود"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"وقتی شارژ رایانه لوحی <xliff:g id="PERCENT">%1$s</xliff:g> باشد، «بهینه‌سازی باتری» خاموش می‌شود"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"وقتی شارژ دستگاه <xliff:g id="PERCENT">%1$s</xliff:g> باشد، «بهینه‌سازی باتری» خاموش می‌شود"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"وقتی شارژ تلفن بیشتر از <xliff:g id="PERCENT">%1$s</xliff:g> شود، «بهینه‌سازی باتری» خاموش می‌شود"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"وقتی شارژ رایانه لوحی بیشتر از <xliff:g id="PERCENT">%1$s</xliff:g> شود، «بهینه‌سازی باتری» خاموش می‌شود"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"وقتی شارژ دستگاه بیشتر از <xliff:g id="PERCENT">%1$s</xliff:g> شود، «بهینه‌سازی باتری» خاموش می‌شود"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"روشن کردن"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"بازنشانی"</string>
     <string name="tts_play" msgid="2945513377250757221">"پخش"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"اتصال تطبیقی"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"با مدیریت خودکار اتصال‌های شبکه، عمر باتری را افزایش می‌دهد و عملکرد دستگاه را بهبود می‌بخشد"</string>
     <string name="credentials_title" msgid="7535942196886123656">"حافظه اطلاعات کاربری"</string>
     <string name="credentials_install" msgid="3933218407598415827">"نصب گواهینامه"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"نصب گواهی‌ها از حافظه"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"اطلاعات کاربری"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"مشاهده و تغییر اطلاعات کاربری ذخیره‌شده"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"پیشرفته"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"نوع فضای ذخیره‌سازی"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"سخت‌افزاری"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"فقط نرم‌افزاری"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"اطلاعات کاربری این کاربر در دسترس نیست"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏نصب‌شده برای VPN و برنامه‌ها"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏نصب‌شده برای Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"نصب نشود"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"درهرحال نصب شود"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"گواهینامه نصب نشد"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"به <xliff:g id="APP_NAME">%s</xliff:g> اجازه داده شود گواهینامه‌ها را در این دستگاه نصب کند؟"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"این گواهینامه‌ها باعث می‌شوند برنامه‌ها و نشانی‌های وب زیر هویت شما را شناسایی کنند"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"مجاز نیست"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"مجاز است"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"بیشتر ببینید"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"برنامه مدیریت گواهینامه"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"برنامه‌ای وجود ندارد"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"گواهینامه‌هایی که این برنامه نصب کرده است هویت شما را در برنامه‌ها و نشانی‌های وب زیر شناسایی می‌کنند"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"برداشتن"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"سیگنال شماره‌گیری اضطراری"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"واکنش موجود در هنگام برقراری تماس اضطراری را تنظیم کنید"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"پشتیبان‌گیری"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"تنظیم نشده - نمایه کاری"</string>
     <string name="user_admin" msgid="4024553191395768119">"سرپرست"</string>
     <string name="user_you" msgid="3070562015202859996">"شما (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"نام مستعار"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"تا <xliff:g id="USER_COUNT">%1$d</xliff:g> کاربر می‌توانید اضافه کنید"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"فقط صاحب رایانه لوحی می‌تواند کاربران را مدیریت کند."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"فقط صاحب گوشی می‌تواند کاربران را مدیریت کند."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"پرداخت در پایانه"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"یک برنامه پرداخت تنظیم کنید. سپس کافی است پشت تلفنتان را بالای هر پایانه دارای نشان «بدون تماس» نگه دارید."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"متوجه شدم"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"بیشتر..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"بیشتر…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"تنظیم برنامه پرداخت پیش‌فرض"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"به‌روزرسانی برنامه پرداخت پیش‌فرض"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"در پایانه «غیرلمسی»، با <xliff:g id="APP">%1$s</xliff:g> پرداخت شود"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"برگشت"</string>
     <string name="wizard_next" msgid="3884832431439072471">"بعدی"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"پایان"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"عکس گرفتن"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"انتخاب تصویر"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"انتخاب عکس"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"سیم‌کارت‌ها"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"سیم‌کارت‌ها"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"همیشه این سیم برای تماس‌‌ها استفاده شود"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"یک سیم کارت برای داده‌ انتخاب کنید"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"انتخاب سیم‌کارت برای پیامک"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"در حال تغییر سیم‌کارت داده، این کار ممکن است تا یک دقیقه طول بکشد..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"درحال عوض کردن سیم‌کارت داده، این کار ممکن است تا یک دقیقه طول بکشد…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"تماس با"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"انتخاب سیم‌کارت"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"سیم‌کارت <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"روال، زمان‌بندی، بهینه‌سازی باتری، بهینه‌سازی نیرو، باتری، خودکار، درصد"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"‏volte، تماس پیشرفته، تماس 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"افزودن زبان، افزودن یک زبان"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"اندازه نوشتار"</string>
     <string name="default_sound" msgid="6604374495015245195">"صدای پیش‌فرض"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"میزان صدای زنگ و اعلان <xliff:g id="PERCENTAGE">%1$s</xliff:g> است"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"میزان صدا، لرزش، «مزاحم نشوید»"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"صدای راه‌اندازی"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"زیرنویس زنده"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"رسانه زیرنویس خودکار"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"هیچ‌کدام"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> زمان‌بندی تنظیم شد</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> زمان‌بندی تنظیم شد</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{هیچ‌کدام}=1{۱ زمان‌بندی تنظیم شد}one{# زمان‌بندی تنظیم شده است}other{# زمان‌بندی تنظیم شده است}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"مزاحم نشوید"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"فقط در ارتباط با افراد و برنامه‌های مهم اعلان دریافت کنید"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"محدود کردن وقفه‌ها"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"فقط اولویت‌دار"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"روشن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"خاموش / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"خاموش"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"روشن"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"هربار پرسیده شود"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"تا زمانی‌که آن را خاموش کنید"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعت</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ساعت</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> دقیقه"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> زمان‌بندی می‌تواند به‌طور خودکار روشن شود</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> زمان‌بندی می‌تواند به‌طور خودکار روشن شود</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{۱ ساعت}one{# ساعت}other{# ساعت}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{۱ دقیقه}one{# دقیقه}other{# دقیقه}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{خاموش}=1{خاموش / ۱ زمان‌بندی می‌تواند به‌طور خودکار روشن شود}one{خاموش / # زمان‌بندی می‌تواند به‌طور خودکار روشن شود}other{خاموش / # زمان‌بندی می‌تواند به‌طور خودکار روشن شود}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"مواردی که می‌توانند در حالت «مزاحم نشوید» وقفه ایجاد کنند"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"افراد"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"برنامه‌ها"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"اعلان‌های دارای اولویت پایین‌تر به‌طور خودکار روی آرام تنظیم شود"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"رتبه‌بندی اعلان تطبیقی"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"رتبه‌بندی خودکار اعلان‌ها براساس ارتباط"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"بازخورد اعلان تطبیقی"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"تنظیمات انجام‌شده برای اعلان‌ها را مشخص می‌کند و گزینه مربوط به ارائه بازخورد به سیستم را نمایش می‌دهد"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"بازنشاندن اهمیت اعلان"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"بازنشاندن تنظیمات اهمیت تغییریافته توسط کاربر و مجاز کردن دستیار اعلان برای اولویت‌بندی"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"پاسخ‌ها و اقدامات پیشنهادی"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"نمایش خودکار اقدامات و پاسخ‌های پیشنهادی"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"نمایش اعلان‌های اخیر و به‌تعویق افتاده"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"مکالمه‌های اولویت‌دار"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"در بالای بخش مکالمه و به‌شکل حبابک‌های شناور نمایش داده می‌شود"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"در بالای بخش مکالمه نمایش داده می‌شود"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"دیگر مکالمه‌ها"</string>
+    <string name="other_conversations" msgid="551178916855139870">"مکالمه‌های بدون اولویت"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"مکالمه‌هایی که در آن‌ها تغییر ایجاد کرده‌اید"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"مکالمه‌های اخیر"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"پاک کردن موارد اخیر"</string>
+    <string name="clear" msgid="5092178335409471100">"پاک کردن"</string>
     <string name="important_bubble" msgid="7911698275408390846">"نمایش مکالمه اولویت‌دار به‌صورت حباب"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"مکالمه‌های اولویت‌دار در بالای کشوی پایین‌پر نمایش داده می‌شوند. به‌علاوه می‌توانید تنظیم کنید به‌صورت حباب ظاهر شوند و در حالت «مزاحم نشوید» وقفه ایجاد کنند."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"مکالمه‌های اولویت‌دار و اصلاح‌شده در اینجا نشان داده می‌شوند"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"دسترسی به «مزاحم نشوید»"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"مجاز کردن «مزاحم نشوید»"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"هیچ برنامه نصب شده‌ای دسترسی به «مزاحم نشوید» را درخواست نکرده است"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"در حال بارگیری برنامه..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"درحال بارگیری برنامه‌‌ها…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏طبق درخواست شما، Android اعلان‌های این برنامه را مسدود می‌کند تا در این دستگاه نشان داده نشوند"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏طبق درخواست شما، Android این دسته از اعلان‌ها را مسدود می‌کند تا در این دستگاه نشان داده نشوند"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‏طبق درخواست شما، Android این گروه از اعلان‌ها را مسدود می‌کند تا در این دستگاه نشان داده نشوند"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"همه مکالمه‌ها"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"مکالمه‌های اولویت‌دار"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"هیچ‌کدام"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> مکالمه</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> مکالمه</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"هیچ‌کدام"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{هیچ‌کدام}=1{۱ مکالمه}one{# مکالمه}other{# مکالمه}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"افرادی که می‌توانند وقفه ایجاد کنند"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"تماس‌ها"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"تماس‌ها"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"برای اطمینان از اینکه تماس‌های مجاز صدا داشته باشند، بررسی کنید دستگاه روی زنگ زدن تنظیم شده باشد"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"تماس‌های ورودی برای «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» مسدود می‌شود. برای اینکه به دوستان و خانواده و سایر مخاطبین امکان دسترسی به خودتان بدهید، می‌توانید تنظیمات را تغییر دهید."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"مخاطبین ستاره‌دار"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> نفر دیگر</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> نفر دیگر</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"موردی وجود ندارد"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{هیچ‌کدام}=1{{contact_1}}=2{{contact_1} و {contact_2}}=3{{contact_1}، {contact_2} و {contact_3}}one{{contact_1}، {contact_2}، و # نفر دیگر}other{{contact_1}، {contact_2}، و # نفر دیگر}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(بدون نام)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"پیام‌ها"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"پیام‌ها"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"پیام‌ها"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"پیام‌های ورودی برای «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» مسدود شده‌اند. برای اینکه به دوستان و خانواده و سایر مخاطبین امکان دهید به شما دسترسی داشته باشند، می‌توانید تنظیمات را تغییر دهید."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"همه پیام‌ها را می‌توانید دریافت کنید."</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"همه تماس‌ها را می‌توانید دریافت کنید."</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"موردی وجود ندارد"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> مخاطب</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> مخاطب</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{هیچ‌کدام}=1{۱ مخاطب}one{# مخاطب}other{# مخاطب}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"همه"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"مخاطبین"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"مخاطبین ستاره‌دار"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"همه اعلان‌ها"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"برخی از اعلان‌ها"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"افراد انتخاب‌شده همچنان می‌توانند با شما ارتباط برقرار کنند، حتی اگر به برنامه‌ها اجازه ایجاد وقفه نداده باشید"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> می‌تواند وقفه ایجاد کند</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> می‌توانند وقفه ایجاد کند</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> برنامه دیگر"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{هیچ برنامه‌ای نمی‌تواند وقفه ایجاد کند}=1{{app_1} می‌تواند وقفه ایجاد کند}=2{{app_1} و {app_2} می‌توانند وقفه ایجاد کنند}=3{{app_1}، {app_2}، و {app_3} می‌توانند وقفه ایجاد کنند}one{{app_1}، {app_2}، و # برنامه دیگر می‌توانند وقفه ایجاد کنند}other{{app_1}، {app_2}، و # برنامه دیگر می‌توانند وقفه ایجاد کنند}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"برنامه‌ها"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"همه اعلان‌ها"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"برخی اعلان‌ها"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"اعلان‌هایی که می‌توانند وقفه ایجاد کنند"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"مجاز بودن همه اعلان‌ها"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> می‌تواند وقفه ایجاد کند</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> می‌توانند وقفه ایجاد کند</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"هیچ موردی نمی‌تواند وقفه ایجاد کند"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> صدای دیگر"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{هیچ موردی نمی‌تواند وقفه ایجاد کند}=1{{sound_category_1} می‌تواند وقفه ایجاد کند}=2{{sound_category_1} و {sound_category_2} می‌توانند وقفه ایجاد کنند}=3{{sound_category_1}، {sound_category_2}، و {sound_category_3} می‌توانند وقفه ایجاد کنند}one{{sound_category_1}، {sound_category_2}، و # مورد دیگر می‌توانند وقفه ایجاد کنند}other{{sound_category_1}، {sound_category_2}، و # مورد دیگر می‌توانند وقفه ایجاد کنند}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"هیچ موردی نمی‌تواند وقفه ایجاد کند"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"هیچ فردی نمی‌تواند وقفه ایجاد کند"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"بعضی از افراد می‌توانند وقفه ایجاد کنند"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"همه افراد می‌توانند وقفه ایجاد کنند"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"روشن"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"خاموش"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"پین کردن برنامه"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"با پین کردن برنامه می‌توانید برنامه کنونی را تا زمان برداشتن پین درمعرض دید نگه دارید. برای مثال، بااستفاده از این ویژگی می‌توانید به دوست معتمدی اجازه دهید بازی خاصی را بازی کند. \n\nوقتی برنامه‌ای پین می‌شود، ممکن است برنامه پین‌شده برنامه‌های دیگر را باز کند و داده‌های شخصی در دسترس قرار گیرد. \n\nبرای استفاده از پین کردن برنامه: 	\n۱.	پین کردن برنامه را روشن کنید 	\n۲.	«نمای کلی» را باز کنید 	\n۳.	روی نماد برنامه در بالای صفحه‌نمایش ضربه بزنید، سپس روی «پین کردن» ضربه بزنید"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"با پین کردن برنامه می‌توانید برنامه کنونی را تا زمان برداشتن پین درمعرض دید نگه دارید. برای مثال، بااستفاده از این ویژگی می‌توانید به دوست معتمدی اجازه دهید بازی خاصی را بازی کند. \n\nوقتی برنامه‌ای پین می‌شود، ممکن است برنامه پین‌شده برنامه‌های دیگر را باز کند و داده‌های شخصی در دسترس قرار گیرد. \n\nاگر می‌خواهید دستگاهتان را بااطمینان دراختیار فرد دیگری قرار دهید، سعی کنید درعوض از کاربر مهمان استفاده کنید. \n\nبرای استفاده از پین کردن برنامه: 	\n۱.	پین کردن برنامه را روشن کنید 	\n۲.	«نمای کلی» را باز کنید 	\n۳.	روی نماد برنامه در بالای صفحه‌نمایش ضربه بزنید، سپس روی «پین کردن» ضربه بزنید"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"با پین کردن برنامه می‌توانید برنامه کنونی را تا زمان برداشتن پین درمعرض دید نگه دارید. برای مثال، بااستفاده از این ویژگی می‌توانید به دوست معتمدی اجازه دهید بازی خاصی را بازی کند."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"وقتی برنامه‌ای پین شود، ممکن است برنامه پین‌شده برنامه‌های دیگر را باز کند و داده‌های شخصی دردسترس قرار گیرد. \n\nبرای استفاده از «پین کردن برنامه»: 	\n۱.	«پین کردن برنامه» را روشن کنید 	\n۲.	«نمای کلی» را باز کنید 	\n۳.	روی نماد برنامه در بالای صفحه‌نمایش ضربه بزنید، سپس روی «پین کردن» ضربه بزنید"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"وقتی برنامه‌ای پین شود، ممکن است برنامه پین‌شده برنامه‌های دیگر را باز کند و داده‌های شخصی دردسترس قرار گیرد. \n\nاگر می‌خواهید دستگاهتان را بااطمینان دراختیار فرد دیگری قرار دهید، سعی کنید درعوض از کاربر مهمان استفاده کنید. \n\nبرای استفاده از پین کردن برنامه: 	\n۱.	پین کردن برنامه را روشن کنید 	\n۲.	«نمای کلی» را باز کنید 	\n۳.	روی نماد برنامه در بالای صفحه‌نمایش ضربه بزنید، سپس روی «پین کردن» ضربه بزنید"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"وقتی برنامه پین می‌شود: \n\n•		ممکن است داده‌های شخصی (مانند مخاطبین و محتوای ایمیل) در دسترس قرار گیرد \n		 \n•		ممکن است برنامه پین‌شده برنامه‌های دیگر را باز کند \n\nفقط با افراد معتمد از پین کردن برنامه استفاده کنید."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"درخواست الگوی باز کردن قفل قبل از برداشتن پین"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"درخواست کد پین قبل از برداشتن پین"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"علاوه بر استفاده از چهره رای باز کردن قفل دستگاه، به‌منظور محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن پین موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن پین الزامی است؟"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"علاوه بر استفاده از چهره برای باز کردن قفل دستگاه، به‌منظور محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن الگو موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن الگو الزامی است؟"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"علاوه بر استفاده از چهره‌تان برای باز کردن قفل دستگاه، به‌منظور محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن گذرواژه موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. وارد کردن گذرواژه برای راه‌اندازی دستگاهتان الزامی شود؟"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"علاوه‌بر استفاده از زیست‌سنجشی برای قفل‌گشایی دستگاه، برای محافظت بیشتر از این دستگاه می‌توانید وارد کردن پین را برای راه‌اندازی آن الزامی کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام، یا اعلان، ازجمله زنگ هشدار دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. وارد کردن پین برای راه‌اندازی دستگاه الزامی شود؟"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"علاوه بر استفاده از زیست‌سنجشی برای قفل‌گشایی دستگاه، برای محافظت بیشتر از این دستگاه می‌توانید وارد کردن الگو را برای راه‌اندازی آن الزامی کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام، یا اعلان، ازجمله زنگ هشدار دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. وارد کردن الگو برای راه‌اندازی دستگاه الزامی شود؟"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"علاوه بر استفاده از زیست‌سنجشی برای قفل‌گشایی دستگاه، برای محافظت بیشتر از این دستگاه، می‌توانید وارد کردن گذرواژه را برای راه‌اندازی آن الزامی کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام، یا اعلان، ازجمله زنگ هشدار دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. وارد کردن گذرواژه برای راه‌اندازی دستگاه الزامی شود؟"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"بله"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"نه"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"محدودشده"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"‏USB تحت کنترل"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"دستگاه متصل‏"</string>
     <string name="usb_control_device" msgid="527916783743021577">"این دستگاه"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"درحال تغییر وضعیت…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"درحال رفتن به…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"تغییر وضعیت انجام نشد"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"درحال شارژ کردن این دستگاه"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"شارژ دستگاه متصل‌‌شده"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"مصرف داده شبکه تلفن همراه"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"مصرف داده برنامه"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"‏مصرف داده Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"مصرف داده غیرمخابراتی"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"میزان مصرف داده اترنت"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"اترنت"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> محدودیت</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"روش شرکت مخابراتی برای اندازه‌گیری مصرف داده ممکن است با روش دستگاهتان متفاوت باشد."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"داده‌هایی را که شبکه‌های شرکت مخابراتی استفاده می‌کنند لحاظ نمی‌کند"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> مصرف شده"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"تنظیم هشدار داده"</string>
     <string name="data_warning" msgid="2925054658166062884">"هشدار داده"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"مشاهده جزئیات"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"صرفه‌جویی داده"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"داده نامحدود"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"داده‌های پس‌زمینه خاموش است"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"داده پس‌زمینه خاموش است"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"روشن"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"خاموش"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"استفاده از صرفه‌جویی داده"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"درصورت قفل بودن دستگاه، از تایپ پاسخ یا نوشتارهای دیگر در اعلان‌ها جلوگیری شود"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"غلط‌گیر املای پیش‌فرض"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"انتخاب غلط‌گیر املا"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"استفاده از غلط‌گیر املا"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"استفاده از غلط‌گیر املا"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"انتخاب نشده"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(خالی)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"برای کمک به خالی کردن فضای ذخیره‌سازی، مدیر ذخیره‌سازی عکس‌ها و ویدیوهای پشتیبان‌گیری‌شده را از دستگاهتان پاک می‌کند."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"پاک کردن عکس‌ها و ویدئوها"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"مدیر فضای ذخیره‌سازی"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"استفاده از «مدیر فضای ذخیره‌سازی»"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"استفاده از مدیر فضای ذخیره‌سازی"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"خودکار"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"دستی"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"هم‌اکنون فضا را خالی کنید"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"دو ضربه برای چک کردن تلفن"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"برای بررسی رایانه لوحی، دو ضربه سریع بزنید"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"برای بررسی دستگاه، دو ضربه سریع بزنید"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"کشیدن برای دیدن اعلان‌ها"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"برای نمایش اعلان‌ها، در قسمت پایین لبه صفحه تند به‌پایین بکشید"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"حالت تک حرکت"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"استفاده از حالت تک حرکت"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"خروج وقتی‌که بین برنامه‌ها جابه‌جا می‌شوید"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"درنگ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"۴ ثانیه"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"۸ ثانیه"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"۱۲ ثانیه"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"قابلیت دسترسی"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"برای بررسی زمان، اعلان‌ها و اطلاعات دیگر، روی صفحه‌نمایش دو ضربه سریع بزنید."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"بررسی تلفن با برداشتن"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"برای بررسی رایانه لوحی، آن را بردارید"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ضربه زدن برای بررسی رایانه لوحی"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ضربه زدن برای بررسی دستگاه"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"برای بررسی زمان، اعلان‌ها و اطلاعات دیگر، روی صفحه‌نمایش ضربه بزنید."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"کمک اضطراری"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"استفاده از کمک اضطراری"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"تحت مدیریت <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"با ۵ بار یا بیشتر فشار دادن سریع دکمه روشن/خاموش، کنش‌های زیر راه‌اندازی می‌شود"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"پخش هشدار شمارش معکوس"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"قبل‌از اعلان برای دریافت کمک، صدای بلندی پخش شود"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"تماس برای کمک"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"شماره تماس برای دریافت کمک"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. برای تغییر ضربه بزنید"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"اگر شماره تلفن غیراضطراری وارد کنید:\n • برای استفاده از درخواست کمک اضطراری، قفل دستگاهتان باید باز باشد\n • ممکن است تماستان پاسخ داده نشود"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"تند کشیدن اثر انگشت برای اعلان‌ها"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"تند کشیدن اثر انگشت"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"برای بررسی اعلان‌ها، انگشتتان را روی حسگر اثر انگشت (در پشت تلفن) تند به‌پایین بکشید."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"حداکثر مجموعه داده‌های مرئی"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"بازنشانی به مقادیر پیش‌فرض"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"گزینه‌های برنامه‌نویس تکمیل خودکار بازنشانی شد"</string>
+    <string name="location_category" msgid="3496759112306219062">"مکان"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"نشانگر مکان در نوار وضعیت"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"برای همه مکان‌ها نشان داده شود، ازجمله شبکه و اتصال"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"‏اجرای کامل اندازه‌گیری GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"بدون دوره کاری، همه دسته عکس‌های پانوراما و فرکانس‌ها را ردیابی کنید."</string>
     <string name="device_theme" msgid="5027604586494772471">"طرح زمینه دستگاه"</string>
     <string name="default_theme" msgid="4815428567082263639">"پیش‌فرض"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"نام شبکه"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"توقف موقت اعلان‌ها برای متمرکز ماندن"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ویژگی دردسترس نیست."</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"این ویژگی غیرفعال شده است چون سرعت تلفنتان را کاهش می‌دهد"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"‏اجرای کامل اندازه‌گیری GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"بدون دوره کاری، همه دسته عکس‌های پانوراما و فرکانس‌ها را ردیابی کنید."</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"همیشه کادر گفتگوی خرابی نمایش داده شود"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"نمایش کادر گفتگو هنگامی که برنامه‌ای خراب می‌شود"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"‏برنامه دارای ANGLE فعال انتخاب کنید"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"فعال کردن برای همه برنامه‌ها"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"انتخاب درایور گرافیک"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"پیش‌فرض"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"درایور بازی"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"درایور بازی"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"درایور برنامه‌نویس"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"درایور گرافیک سیستم"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"روشن (بی‌صدا)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"خاموش"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"جزئیات شبکه"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"‏نام دستگاه شما برای برنامه‌های موجود در تلفنتان قابل‌مشاهده است. ممکن است وقتی به دستگاه‌های بلوتوث متصل می‌شوید یا نقطه اتصال Wi-Fi راه‌اندازی می‌کنید، برای سایر افراد نیز قابل‌مشاهده باشد."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"‏نام دستگاه شما برای برنامه‌های موجود در تلفنتان قابل‌مشاهده است. همچنین ممکن است هنگام اتصال به دستگاه‌های بلوتوث، اتصال به شبکه Wi-Fi، یا راه‌اندازی نقطه اتصال Wi-Fi، برای افراد دیگر قابل‌مشاهده باشد."</string>
     <string name="devices_title" msgid="649715719278562515">"دستگاه‌ها"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"همه تنظیمات"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"پیشنهادها"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"شبکه‌ها پیدا نشدند. دوباره امتحان کنید."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ممنوع است)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"سیم‌کارت موجود نیست"</string>
+    <string name="sim_card" msgid="6381158752066377709">"سیم‌کارت"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"سیم‌کارتی وجود ندارد"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"موردی وجود ندارد"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"وجود سیم‌کارت برای اتصال لازم است"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"وجود سیم‌کارت <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> برای اتصال لازم است"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"‏حالت شبکه برگزیده: WCDMA برگزیده"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"‏حالت شبکه برگزیده: فقط GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"‏حالت شبکه برگزیده: فقط WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"داده تلفن همراه"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"دسترسی به داده‌ها با استفاده از شبکه تلفن همراه"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"تلفن، وقتی در محدوده باشد، به‌طور خودکار به این شرکت مخابراتی جابه‌جا می‌شود"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"سیم‌کارت موجود نیست"</string>
     <string name="calls_preference" msgid="2166481296066890129">"تنظیمات ترجیحی تماس‌ها"</string>
     <string name="sms_preference" msgid="7742964962568219351">"اولویت‌ها پیامک"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"هربار پرسیده شود"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"هنگام اتصال به <xliff:g id="CARRIER">%1$s</xliff:g>، دردسترس نیست"</string>
     <string name="see_more" msgid="7499355691042812723">"موارد بیشتر"</string>
     <string name="see_less" msgid="2642392725363552793">"مشاهده موارد کمتر"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> روشن شود؟"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"سیم‌کارت روشن شود؟"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"به <xliff:g id="CARRIER_NAME">%1$s</xliff:g> می‌روید؟"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"برای استفاده از سیم‌کارت، شرکت مخابراتی‌تان را عوض می‌کنید؟"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"هربار فقط یک سیم‌کارت را می‌توان فعال کرد.\n\nبا رفتن به <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>، سرویس <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> شما را لغو نخواهد کرد."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"هربار فقط یک سیم‌کارت بارگیری‌شده می‌تواند فعال شود.\n\nبا رفتن به <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>، سرویس <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> شما لغو نخواهد شد."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"هربار فقط یک سیم‌کارت را می‌توان فعال کرد.\n\nعوض کردن شرکت مخابراتی، باعث لغو سرویس <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> شما نخواهد شد."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"رفتن به <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"درحال اتصال به شبکه…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"درحال رفتن به <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"شرکت مخابراتی عوض نشد"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"به‌دلیل بروز خطا، این شرکت مخابراتی عوض نشد."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> خاموش شود؟"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"سیم‌کارت خاموش شود؟"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"خاموش کردن سیم‌کارت<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"شرکت مخابراتی غیرفعال نشد"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"مشکلی پیش آمد و شرکت مخابراتی‌تان غیرفعال نشد."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"از ۲ سیم‌کارت استفاده می‌کنید؟"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"این دستگاه می‌تواند هم‌زمان ۲ سیم‌کارت فعال داشته باشد. برای ادامه استفاده از ۱ سیم‌کارت در هربار، روی «نه متشکرم» ضربه بزنید."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"دستگاه بازراه‌اندازی شود؟"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"برای شروع به کار، دستگاهتان را بازراه‌اندازی کنید. سپس می‌توانید سیم‌کارت دیگری اضافه کنید."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ادامه"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"بازراه‌اندازی"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"نه متشکرم"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"عوض کردن"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"سیم‌کارت فعال نشد"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"سیم‌کارت را خارج کنید و دوباره در دستگاه بگذارید. اگر مشکل ادامه داشت، دستگاهتان را بازراه‌اندازی کنید."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"سیم‌کارت را دوباره روشن کنید. اگر مشکل ادامه داشت، دستگاهتان را بازراه‌اندازی کنید."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"فعال‌سازی شبکه"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> فعال است"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"برای به‌روزرسانی تنظیمات سیم‌کارت ضربه بزنید"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"سیم‌کارت"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"این سیم‌کارت بارگیری‌شده پاک‌سازی شود؟"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"با پاک‌سازی این سیم‌کارت، سرویس <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> از این دستگاه برداشته می‌شود.\n\nسرویس مربوط به <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> لغو نمی‌شود."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"پاک‌سازی"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"درحال پاک‌سازی سیم‌کارت…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"سیم‌کارت پاک‌سازی نشد"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"به‌دلیل بروز خطا، این سیم‌کارت پاک‌سازی نشد.\n\nدستگاه را بازراه‌اندازی کنید و دوباره امتحان کنید."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"اتصال به دستگاه"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"‏برنامه <xliff:g id="APPNAME">%1$s</xliff:g> برای اتصال به دستگاهتان می‌خواهد از شبکه Wi-Fi موقت استفاده کند"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"دستگاهی پیدا نشد. مطمئن شوید دستگاه‌ها روشن و برای اتصال دردسترس هستند."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"تماس‌های اضطراری"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"‏شرکت مخابراتی شما از تماس‌های اضطراری با استفاده از «تماس ازطریق Wi‑Fi» پشتیبانی نمی‌کند. \nدستگاه برای برقراری یک تماس اضطراری، به‌طور خودکار به یک شبکه تلفن همراه جابه‌جا می‌شود.\nتماس‌های اضطراری فقط در مناطق دارای پوشش تلفن همراه امکان‌پذیر هستند."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"‏برای بهبود کیفیت تماس‌ها، از Wi‑Fi استفاده کنید"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"تماس بین سیم‌کارت"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"مجاز کردن تماس‌ها و پیامک‌های سیم‌کارت دیگر در این سیم‌کارت."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"تماس بین سیم‌کارت"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"پیام فراپیام ورودی"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"پیام فراپیام ارسال نشد"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"برای مجاز کردن ارسال پیام فراپیام در <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> وقتی داده تلفن همراه خاموش است، ضربه بزنید"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"مجاز کردن هم‌پوشانی صفحه‌ها در «تنظیمات»"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"مجاز کردن برنامه‌هایی که برای همپوشانی صفحه‌های «تنظیمات» می‌توانند روی برنامه‌های دیگر نمایش داده شوند"</string>
     <string name="media_controls_title" msgid="403271085636252597">"رسانه"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"پس از اتمام جلسه رسانه، پخش‌کننده پنهان شود"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"پخش‌کننده به شما اجازه می‌دهد جلسه‌ای را از پانل «تنظیمات فوری» گسترده‌ ازسر بگیرید."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"پخش‌کننده رسانه در «تنظیمات فوری»"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"پخش‌کننده رسانه برای مدت‌زمان طولانی‌تری نشان داده می‌شود تا به‌آسانی بتوانید بازپخش را ازسر بگیرید."</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"پنهان کردن پخش‌کننده"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"نمایش دادن پخش‌کننده"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"پخش‌کننده‌ای دردسترس نیست"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"برنامه‌های مجاز"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"رسانه‌"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"بلوتوث روشن می‌شود"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"روشن"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"خاموش"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"اینترنت"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"سیم‌کارت‌ها"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"شبکه‌های ایمن در هواپیما"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"پیدا کردن و متصل شدن به شبکه‌های ایمن در هواپیما"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"هواپیما، ایمن در هواپیما"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"تماس و پیامک"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"‏تماس ازطریق WiFi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"‏برقراری و دریافت تماس ازطریق شبکه‌های غیرمخابراتی مثل Wi-Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"‏«تماس ازطریق Wi-Fi» امکان برقراری و دریافت تماس ازطریق شبکه‌های غیرمخابراتی را (برای مثل برخی از شبکه‌های Wi-Fi) به شما می‌دهد."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"تماس"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"پیامک"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"دارای اولویت"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"اولویت با تماس"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"اولویت با پیامک"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"دردسترس نیست"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"سیم‌کارتی وجود ندارد"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"اولویت‌ها"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"اتصال به شبکه‌های عمومی"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"‏اتصال شبکه، اینترنت، بی‌سیم، داده، wifi،‏ wi-fi، ‏wi fi، شبکه تلفن همراه، تلفن همراه، شرکت مخابراتی تلفن همراه، 4g،‏ 3g،‏ 2g،‏ lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"مشاهده شبکه‌های ایمن در هواپیما"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"خاموش کردن «حالت هواپیما»"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"دردسترس نیست زیرا «حالت وقت خواب» روشن است"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"بازنشاندن اهمیت اعلان تکمیل شد."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"برنامه‌ها"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"دستگاه غیرمطمئنی می‌خواهد به پیام‌هایتان دسترسی داشته باشد. برای دیدن جزئیات، ضربه بزنید."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"دسترسی به پیام‌ها مجاز شود؟"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"دستگاه بلوتوث غیرمطمئنی، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، می‌خواهد به پیام‌هایتان دسترسی داشته باشد.\n\nتاکنون به [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] متصل نشده‌اید."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"دستگاه غیرمطمئنی می‌خواهد به مخاطبین و گزارش تماس شما دسترسی داشته باشد. برای دیدن جزئیات، ضربه بزنید."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"دسترسی به مخاطبین و گزارش تماس مجاز شود؟"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"دستگاه بلوتوث غیرمطمئنی، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، می‌خواهد به مخاطبین و گزارش تماس شما دسترسی داشته باشد. این شامل داده‌های مربوط به تماس‌های ورودی و خروجی می‌شود.\n\nتاکنون به [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] متصل نشده‌اید."</string>
 </resources>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index 92a3668..69d51cf 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Keskipitkä"</item>
     <item msgid="6740026006576843477">"Pitkä"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Lyhyt"</item>
+    <item msgid="7397961711906421599">"Keskipitkä"</item>
+    <item msgid="4079132024502041928">"Pitkä"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Oletus"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Maailmanlaajuinen"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Vain TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Yleiset"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 791f41f..150f98b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Päivämäärä ja aika"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Aseta päivämäärä ja aika"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Aseta päivämäärä, aika, aikavyöhyke ja muodot"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Käytä verkon määrittämää aikaa"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Käytä verkon määrittämää aikavyöhykettä"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Aseta aika automaattisesti"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Aseta aikavyöhyke automaattisesti"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Käytä paikallista oletusasetusta"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 tunnin kello"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Käytä 24-tuntista kelloa"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Näytä profiilin tiedot lukitusnäytöllä"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Tilit"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Sijainti"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Käytä sijaintia"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Käytä sijaintia"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Pois päältä"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Päällä – <xliff:g id="COUNT_1">%1$d</xliff:g> sovelluksella on sijainnin käyttöoikeus</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Näytön lukitus, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Näytön lukitus, sormenjälki"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Näytön lukitus"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Avaa puhelimen lukitus kasvoilla ja sormenjäljellä"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Voit myös kirjautua sovelluksiin ja vahvistaa maksuja"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Ota käyttöön lukituksen avaus tällä:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Helpota puhelimen lukituksen avaamista"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Sormenjälki"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Säästä aikaa avaamalla puhelin taskussa"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Ohita"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Seuraava"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Kasvot lisätty"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Ota Face Unlock käyttöön"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Todennus kasvojen avulla"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Aloita"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Jos esteettömyyden Face Unlock on poissa päältä, jotkin käyttöönottovaiheet eivät välttämättä toimi oikein TalkBackilla."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Palaa"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Jatka käyttöönottoa"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Käytä esteettömyysvalintoja"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Vaadi aina vahvistusta, kun lukitus avataan kasvoilla sovelluksissa"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Poista kasvodata"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Ota Face Unlock käyttöön"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Face Unlockin avulla voit avata laitteesi lukituksen, kirjautua sovelluksiin ja vahvistaa maksuja.\n\nPidä mielessä:\nPuhelimen katsominen voi avata sen lukituksen haluamattasi.\n\nJoku muu voi avata puhelimesi lukituksen pitämällä sitä kasvojesi edessä.\n\nSinulta näyttävä henkilö (esim. identtinen kaksonen) voi avata puhelimen lukituksen."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Face Unlockin avulla voit avata laitteesi lukituksen, kirjautua sovelluksiin ja vahvistaa maksuja.\n\nPidä mielessä:\nPuhelimen katsominen voi avata sen lukituksen haluamattasi.\n\nJoku muu voi avata puhelimesi lukituksen pitämällä sitä kasvojesi edessä, vaikka silmäsi ovat kiinni.\n\nSinulta näyttävä henkilö (esim. identtinen kaksonen) voi avata puhelimen lukituksen."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Käytä Face Unlockia laitteen lukituksen avaamiseen, sovelluksiin kirjautumiseen ja maksujen vahvistamiseen."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Muista:\nPuhelimen katsominen voi avata sen haluamattasi.\n\nJoku muu voi avata puhelimesi lukituksen pitämällä sitä kasvojesi edessä.\n\nJoku muu voi ehkä avata puhelimesi lukituksen, jos hän näyttää sinulta (esim. identtinen kaksonen)."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Muista:\nPuhelimen katsominen voi avata sen haluamattasi.\n\nJoku muu voi avata puhelimesi lukituksen pitämällä sitä kasvojesi edessä, vaikka silmäsi ovat kiinni.\n\nJoku muu voi ehkä avata puhelimesi lukituksen, jos hän näyttää sinulta (esim. identtinen kaksonen)."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Poistetaanko kasvodata?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Face Unlockin käyttämä kasvodata poistetaan pysyvästi ja turvallisesti. Poistamisen jälkeen tarvitset PIN-koodia, kuviota tai salasanaa puhelimen lukituksen avaamiseen, sovelluksiin kirjautumiseen ja maksujen vahvistamiseen."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Avaa puhelimen lukitus Face Unlockilla"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Avaa puhelin tai hyväksy ostoksia sormenjäljellä.\n\nHuom. Tämän laitteen lukitusta ei voi avata sormenjäljellä. Saat lisätietoja organisaatiosi järjestelmänvalvojalta."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Avaa puhelin tai hyväksy ostoksia sormenjäljellä.\n\nHuom. Sormenjälki ei välttämättä ole yhtä turvallinen kuin vahva kuvio tai PIN-koodi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Peruuta"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ei kiitos"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Jatka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ohita"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seuraava"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Kun suojaat tablettisi näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi Face Unlockin. Palaa takaisin valitsemalla Peruuta."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Kun suojaat laitteen näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi Face Unlockin. Palaa takaisin valitsemalla Peruuta."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Kun suojaat puhelimen näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset näytön lukituksen myös määrittääksesi Face Unlockin. Palaa takaisin valitsemalla Peruuta."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Kun suojaat tabletin näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset myös näytönlukitusvaihtoehdon biometriikan käyttöönottoa varten. Palaa takaisin valitsemalla Peruuta."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Kun suojaat laitteen näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset myös näytönlukitusvaihtoehdon biometriikan käyttöönottoa varten. Palaa takaisin valitsemalla Peruuta."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Kun suojaat puhelimen näytön lukituksella, kukaan ei voi käyttää sitä, jos se katoaa tai varastetaan. Tarvitset myös näytönlukitusvaihtoehdon biometriikan käyttöönottoa varten. Palaa takaisin valitsemalla Peruuta."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Ohitetaanko PIN-koodin asetus?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Ohitetaanko salasanan asetus?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Ohitetaanko kuvion asetus?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Estä tablettisi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Estä laitteesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Estä puhelimesi luvaton käyttö ottamalla laitteen suojausominaisuudet käyttöön. Valitse näytön lukitusmenetelmä."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Valitse toissijainen näytönlukitusmenetelmä"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Valitse toissijainen näytönlukitusmenetelmä"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Valitse toissijainen näytönlukitustapa"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Näytön lukitusvaihtoehdot"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Näytön lukitusvaihtoehdot"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Näytön lukitus"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face Unlock ja salasana"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Jatka ilman Face Unlockia"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Voit avata puhelimen lukituksen kasvojentunnistuksella. Turvallisuussyistä tämä edellyttää, että määrität näytön varalukitustavan."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometriikka + kuvio"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometriikka + PIN-koodi"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometriikka + salasana"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Jatka ilman biometriikkaa"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Voit avata puhelimen lukituksen biometriikalla. Turvallisuussyistä tämä edellyttää, että määrität näytön varalukitustavan."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Järj.valvojan, salauskäyt. tai tunnuksien tall.tilan estämä"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ei mitään"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Pyyhkäisy"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">PIN-koodissa saa olla enintään <xliff:g id="NUMBER_0">%d</xliff:g> numero.</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Järjestelmänvalvoja esti PIN-koodin, koska sitä on käytetty hiljattain."</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT-järjestelmänvalvoja on estänyt yleiset PIN-koodit. Kokeile eri PIN-koodia."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Salasanassa ei saa olla virheellisiä merkkejä."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Salasanassa täytyy olla vähintään yksi kirjain."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Salasanassa täytyy olla vähintään yksi numero."</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Salasanassa on oltava vähintään 1 merkki, joka ei ole numero</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Järjestelmänvalvoja esti salasanan, koska sitä on käytetty hiljattain."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT-järjestelmänvalvoja on estänyt yleiset salasanat. Kokeile eri salasanaa."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Nousevat, laskevat tai toistuvat numerosarjat on kielletty."</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Vahvista"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Peruuta"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ota Wi-Fi käyttöön"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Käytä Wi-Fiä"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Käytä Wi-Fi-yhteyttä"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi-asetukset"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Ota käyttöön ja hallinnoi langattoman yhteyden tukiasemia"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Keskitä QR-koodi alle yhdistääksesi <xliff:g id="SSID">%1$s</xliff:g>:iin"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Yhdistä Wi-Fi-verkkoon lukemalla QR-koodi."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Jaa Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g>:iin lukemalla tämä QR-koodi ja jaa salasana."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g> lukemalla tämä QR-koodi toisella laitteella"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Yhdistä <xliff:g id="SSID">%1$s</xliff:g> skannaamalla tämä QR-koodi"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Yritä uudelleen. Jos ongelma ei ratkea, ota yhteyttä laitteen valmistajaan"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Jotain meni pieleen"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-verkon salasana: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspotin salasana: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automaattinen yhdistäminen"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Salli puhelimen yhdistää automaattisesti tämän verkon lähellä"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Salli tabletin yhdistää automaattisesti tämän verkon lähellä"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Salli tähän verkkoon yhdistäminen sen kantoalueella ollessa"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Lisää laite"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Lisää laite tähän verkkoon QR-koodin avulla"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-koodin muoto ei kelpaa"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Käytä järjestelmän varmenteita"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Älä anna"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Älä vahvista"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ei määritettyä varmennetta. Yhteytesi ei ole yksityinen."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Verkon nimi on liian pitkä."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Määritä verkkotunnus."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Varmenne vaaditaan."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Yhdistä"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi on käytössä"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Yhdistetty verkkoon <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Yhdistetään: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Yhdistetään…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Yhteyden muodostaminen verkkoon epäonnistui."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Verkko ei ole kantoalueella"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Laitteen MAC-osoite"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Satunnaistettu MAC-osoite"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Satunnaistettu MAC-osoite (viimeksi käytetty)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-osoite"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Verkon tiedot"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Aliverkon peite"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-osoitteet"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Tallennetut verkot"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Tilaukset"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Muut verkot"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP-asetukset"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Wi‑Fi-lisäasetukset eivät ole tämän käyttäjän käytettävissä."</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Tallenna"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Anna kelvollinen yhdyskäytävän osoite."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Anna kelvollinen nimipalvelun osoite."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Anna verkon etuliite, jonka pituus on välillä 0–32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ellei ohitettu yksityisellä DNS:llä)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ellei ohitettu yksityisellä DNS:llä)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Yhdyskäytävä"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Verkon etuliitteen pituus"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1034,20 +1052,20 @@
     <string name="wifi_p2p_cancel_connect_message" msgid="2409074184473879809">"Haluatko peruuttaa laitteelle <xliff:g id="PEER_NAME">%1$s</xliff:g> lähetetyn yhteydenmuodostuskutsun?"</string>
     <string name="wifi_p2p_delete_group_message" msgid="4880242270742385699">"Unohdetaanko tämä ryhmä?"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="1549663436920597006">"Wi‑Fi-hotspot"</string>
-    <string name="wifi_hotspot_off_subtext" msgid="2751383134504362078">"Internetyhteyttä tai sisältöä ei jaeta muiden laitteiden kanssa."</string>
+    <string name="wifi_hotspot_off_subtext" msgid="2751383134504362078">"Internetyhteyttä tai sisältöä ei jaeta muille laitteille."</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="tablet" msgid="5832429443898690152">"Tabletin internetyhteys jaetaan hotspotin kautta"</string>
     <string name="wifi_hotspot_tethering_on_subtext" product="default" msgid="5451921191609178326">"Puhelimen internetyhteys jaetaan hotspotin kautta"</string>
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Sovellus jakaa sisältöä – jos haluat jakaa internetyhteyden, sammuta hotspot ja käynnistä se uudelleen"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Ei salasanaa"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspotin nimi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Käynnistetään <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Laitetaan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> päälle…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> on muiden laitteiden käytettävissä."</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspotin salasana"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-taajuus"</string>
     <string name="wifi_hotspot_footer_info_regular" msgid="6620216295510397461">"Hotspot-ominaisuudella voit luoda muille laitteillesi Wi-Fi-verkon. Ominaisuus jakaa internetyhteyden muille laitteille mobiilidatayhteydellä. Lisämaksuja mobiilidatan käytöstä voidaan periä."</string>
-    <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Sovellukset voivat luoda hotspotin ja jakaa sisältöä lähellä olevien laitteiden kanssa."</string>
+    <string name="wifi_hotspot_footer_info_local_only" msgid="3813311942370920903">"Sovellukset voivat luoda hotspotin ja jakaa sisältöä lähellä oleville laitteille."</string>
     <string name="wifi_hotspot_auto_off_title" msgid="8855711787485504882">"Laita hotspot pois päältä automaattisesti"</string>
-    <string name="wifi_hotspot_auto_off_summary" msgid="8283656069997871354">"Kun laitteita ei ole yhdistetty"</string>
+    <string name="wifi_hotspot_auto_off_summary" msgid="8283656069997871354">"Kun laitteita ei ole yhdistettynä"</string>
     <string name="wifi_tether_starting" msgid="8879874184033857814">"Otetaan yhteyspiste käyttöön..."</string>
     <string name="wifi_tether_stopping" msgid="4416492968019409188">"Poistetaan yhteyspiste käytöstä..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="5085002421099821056">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivinen"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Nostaa tietyn sisällön päivitysvälin automaattisesti 60 hertsistä 90:een. Lisää akun käyttöä."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Pakota 90 Hz:n päivitysväli"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Korkein päivitysväli parantaa kosketukseen vastaamista ja animaatioiden laatua. Lisää akun käyttöä."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Huomionäyttö"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Päällä / näyttö ei sammu, kun katsot sitä"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kun näyttö on pimeä, se aktivoituu uusien ilmoitusten myötä"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Näytä aina aika ja tiedot"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Tämä asetus kuluttaa akkua nopeammin"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Lihavoi teksti"</string>
     <string name="title_font_size" msgid="570613010306330622">"Fontin koko"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Suurenna tai pienennä tekstiä."</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM-kortin lukitusasetukset"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-versio"</string>
     <string name="security_patch" msgid="4071756145347865382">"Androidin tietoturvapäivitys"</string>
     <string name="model_info" msgid="8997566254717810904">"Malli"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Malli: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Malli ja laitteisto"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Laitteistoversio"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Varustetunnus"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Poista APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Uusi APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Tallenna"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Hylkää"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Peru"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Nimi-kenttä ei voi olla tyhjä."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN ei voi olla tyhjä."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Sovellukset voidaan nollata"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Nollaa Wi-Fin, mobiiliverkon ja Bluetoothin asetukset"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Tämä nollaa kaikki verkkoasetukset, esimerkiksi seuraavat:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiilidata"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Tyhjennä"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Tyhjennä ladatut SIM-kortit"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Jos haluat ladata korvaavia SIM-kortteja, ota yhteyttä operaattoriin. Tämä ei peruuta liittymäsopimustasi."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Tämä ei peruuta liittymäsopimustasi. Jos haluat ladata korvaavia SIM-kortteja, ota yhteyttä operaattoriin."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Nollaa asetukset"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Nollataanko kaikki verkkoasetukset? Toimintoa ei voi kumota."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Haluatko nollata kaikki verkkoasetukset ja tyhjentää ladatut SIM-kortit? Toimintoa ei voi kumota."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Verkkoasetuksesi on nollattu."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-korttien tyhjennys ei onnistu"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Ladattuja SIM-kortteja ei voi poistaa virheen vuoksi.\n\nKäynnistä laite uudelleen ja yritä sitten uudelleen."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Poista kaikki tiedot (palauta tehdasasetukset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Poista data (tehdasasetuksiin)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tämä poistaa kaiken datan tabletin "<b>"sisäisestä tallennustilasta"</b>", esimerkiksi\n\n"<li>"Google-tilisi"</li>\n<li>"järjestelmän ja sovellusten datan ja asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tämä poistaa kaiken datan puhelimen "<b>"sisäisestä tallennustilasta"</b>", esimerkiksi\n\n"<li>"Google-tilisi"</li>\n<li>"järjestelmän ja sovellusten datan ja asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Olet kirjautunut sisään seuraaviin tileihin:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Tällä laitteella on muita paikalla olevia käyttäjiä.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muut käyttäjän tiedot"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMit"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Tämä ei peruuta mobiilipalvelupakettiasi."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"USB-tallennustila"</b>" tulee tyhjentää."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Jos haluat poistaa musiikin, kuvat ja muut käyttäjän tiedot, "<b>"SD-kortti"</b>" tulee tyhjentää."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Poista data (tehdasasetuksiin)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Poista data (tehdasasetuksiin)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tämä poistaa tabletin "<b>"sisäisestä tallennustilasta"</b>" kaiken datan, esimerkiksi\n\n"<li>"Google-tilisi"</li>\n<li>"järjestelmän ja sovellusten datan ja asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Tämä poistaa puhelimen "<b>"sisäisestä tallennustilasta"</b>" kaiken datan, esimerkiksi\n\n"<li>"Google-tilisi"</li>\n<li>"järjestelmän ja sovellusten datan ja asetukset"</li>\n<li>"ladatut sovellukset"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Olet kirjautunut sisään seuraaville tileille:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Muut käyttävät laitetta parhaillaan.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musiikki"</li>\n<li>"Valokuvat"</li>\n<li>"Muu käyttäjädata"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMit"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Tämä ei peruuta mobiilipalvelupakettiasi."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Jos haluat poistaa musiikin, kuvat ja muun käyttäjädatan, tyhjennä "<b>"USB-tallennustila"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Jos haluat poistaa musiikin, kuvat ja muun käyttäjädatan, tyhjennä "<b>"SD-kortti"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Tyhjennä USB-tallennustila"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Tyhjennä SD-kortti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Poista kaikki sisäisen USB-tallennustilan tiedot, kuten musiikki tai kuvat."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Poista kaikki SD-kortin tiedot, kuten musiikki tai kuvat."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Pyyhi kaikki tiedot"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Pyyhi kaikki tiedot"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Kaikki henkilökohtaiset tietosi ja ladatut sovellukset poistetaan. Toimintoa ei voi kumota."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Kaikki henkilökohtaiset tietosi poistetaan, mukaan lukien ladatut sovellukset ja SIM-kortit. Toimintoa ei voi kumota."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Poista kaikki"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Palauttamista ei suoritettu, koska System Clear -palvelu ei ole käytettävissä."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Poistetaanko kaikki data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Tämä käyttäjä ei voi palauttaa tehdasasetuksia"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Tyhjennetään"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Odota…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Poista kaikki data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Poista kaikki data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Kaikki henkilökohtaiset tietosi ja ladatut sovellukset poistetaan. Toimintoa ei voi kumota."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Kaikki henkilökohtaiset tietosi poistetaan, mukaan lukien ladatut sovellukset ja SIM-kortit. Toimintoa ei voi kumota."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Poistetaanko kaikki data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Tämä käyttäjä ei voi palauttaa tehdasasetuksia"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Poistetaan"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Odota…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Puheluasetukset"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Ota käyttöön puhelinvastaaja, soitonsiirrot, koputuspalvelu, soittajan tunnus"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Jaettu yhteys USB:n kautta"</string>
@@ -1655,7 +1672,7 @@
     <string name="tether_settings_summary_hotspot_and_bluetooth_and_ethernet" msgid="4104425838594994441">"Hotspot, Bluetooth, Ethernet"</string>
     <string name="tether_settings_summary_usb_and_bluetooth_and_ethernet" msgid="5880591133984166550">"USB, Bluetooth, Ethernet"</string>
     <string name="tether_settings_summary_all" msgid="7565193614882005775">"Hotspot, USB, Bluetooth, Ethernet"</string>
-    <string name="tether_settings_summary_off" msgid="2526164899130351968">"Internetyhteyttä ei jaeta muiden laitteiden kanssa."</string>
+    <string name="tether_settings_summary_off" msgid="2526164899130351968">"Internetyhteyttä ei jaeta muille laitteille."</string>
     <string name="tethering_interface_options" msgid="7575535888135143650">"Puhelimen käyttäminen modeemina"</string>
     <string name="disable_wifi_hotspot_title" msgid="2167985468585290478">"Älä käytä Wi-Fi-hotspotia"</string>
     <string name="disable_wifi_hotspot_when_usb_on" msgid="220439059794714583">"Jaa verkkoyhteys vain USB:n kautta"</string>
@@ -1676,9 +1693,9 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Voidaan yhdistää korkeintaan <xliff:g id="MAXCONNECTION">%1$d</xliff:g> laitteeseen."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Jaettu internetyhteys katkaistaan laitteesta <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernetin jakaminen"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Jaa puhelimen internetyhteys USB-Ethernetillä"</string>
-    <string name="tethering_footer_info" msgid="6782375845587483281">"Hotspot- ja yhteyden jako ‑ominaisuuksien avulla voit jakaa internetyhteyden muille laitteille mobiilidatayhteydellä. Sovellukset voivat myös luoda hotspotin ja jakaa sisältöä lähellä olevien laitteiden kanssa."</string>
-    <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Jaa internetyhteys muille laitteille Wi-Fin tai mobiilidatan avulla hotspotilla tai käyttämällä puhelinta modeemina. Sovellukset voivat myös luoda hotspotin ja jakaa sisältöä lähellä olevien laitteiden kanssa."</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Jaa puhelimen internetyhteys Ethernetillä"</string>
+    <string name="tethering_footer_info" msgid="6782375845587483281">"Hotspot- ja yhteyden jako ‑ominaisuuksien avulla voit jakaa internetyhteyden muille laitteille mobiilidatayhteydellä. Sovellukset voivat myös luoda hotspotin ja jakaa sisältöä lähellä oleville laitteille."</string>
+    <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Jaa internetyhteys muille laitteille Wi-Fin tai mobiilidatan avulla hotspotilla tai käyttämällä puhelinta modeemina. Sovellukset voivat myös luoda hotspotin ja jakaa sisältöä lähellä oleville laitteille."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ohjeet"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"Mobiiliverkko"</string>
     <string name="manage_mobile_plan_title" msgid="5616930513733409064">"Mobiilisopimus"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-haku"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Salli sovellusten ja palvelujen hakea lähellä olevia laitteita aina, vaikka Bluetooth olisi pois käytöstä. Näin voidaan esimerkiksi kehittää sijaintiin perustuvia ominaisuuksia ja palveluja."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Sijaintipalvelut työkäyttöön"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Sijainnin aikavyöhykkeen tunnistus"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Sijainnin aikavyöhykkeen tunnistus"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Sallii laitteen sijainnin käyttämisen nykyisen aikavyöhykkeen tunnistamiseksi. Muut sijaintiasetukset, esim. Wi-Fi-haku, voivat vaikuttaa aikavyöhykkeen tunnistustarkkuuteen."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Päällä"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Poissa päältä"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automaattinen aikavyöhykkeen tunnistus on poistettu käytöstä"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Sijainnin aikavyöhykkeen tunnistus on poistettu käytöstä"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Sijainnin aikavyöhykkeen tunnistusta ei tueta"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Sijainnin aikavyöhykkeen tunnistukseen ei voi tehdä muutoksia"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi- ja mobiiliverkkosijainti"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Anna sovellusten arvioida sijaintisi Googlen sijaintipalvelulla. Anonyymejä sijaintitietoja kerätään ja lähetetään Googlelle."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Sijainti on määritetty Wi-Fi-yhteyden perusteella"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Määritä salasana Face Unlockia varten"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Valitse kuvio Face Unlockia varten"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Määritä PIN-koodi Face Unlockia varten"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biometriikka: aseta salasana"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biometriikka: aseta kuvio"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biometriikka: aseta PIN-koodi"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Unohditko salasanasi?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Unohditko kuviosi?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Unohditko PIN-koodisi?"</string>
@@ -1808,7 +1837,7 @@
     <string name="lock_settings_title" msgid="665707559508132349">"Laitteen suojaus"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5853706275279878879">"Vaihda lukituksenpoistokuvio"</string>
     <string name="lockpattern_change_lock_pin_label" msgid="7327409886587802756">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
-    <string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"Piirrä lukituksenpoistokuvio"</string>
+    <string name="lockpattern_recording_intro_header" msgid="8325736706877916560">"Piirrä lukituksen avaava kuvio"</string>
     <string name="lockpattern_recording_intro_footer" msgid="2656868858594487197">"Saat ohjeita painamalla Valikko-painiketta."</string>
     <string name="lockpattern_recording_inprogress" msgid="7268008332694009191">"Nosta sormi, kun olet valmis"</string>
     <string name="lockpattern_recording_incorrect_too_short" msgid="3351522018450593723">"Yhdistä vähintään <xliff:g id="NUMBER">%d</xliff:g> pistettä. Yritä uudelleen."</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Tekstitysvalinnat"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Suurennus"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Suurennettava alue"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Suurennuksen käyttöönotto"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Valitse alueet, joihin näytön suurennusta käytetään"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Koko näyttö"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Osa näytöstä"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Koko näyttö ja osa näytöstä"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Suurenna koko näyttö"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Suurenna osa näytöstä"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vaihdetaanko esteettömyyspainikkeeseen?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Jos käytät kolmoisnapautusta näytön osan suurentamiseen, kirjoittamisessa ja muissa toiminnoissa voi esiintyä viivettä.\n\nHaluatko suurentaa jatkossa esteettömyyspainikkeella?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Vaihda esteettömyyspainikkeeseen"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Jatka suurentamista kolmoisnapautuksella"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Suurennusasetukset"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Suurenna kolmoisnapautuksella"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Suurenna pikanäppäimellä"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Puhelun katkaisu virtapainikkeella"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Suuri hiiren osoitin"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Poista animaatiot"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monoääni"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Yhdistä kanavat ääntä toistettaessa"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Äänitasapaino"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vasen"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Oikea"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monoaudio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Yhdistä kanavat audiota toistettaessa"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audiotasapaino"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Vasen"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Oikea"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Oletus"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekuntia"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekuntia"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Ilmoitusvärinä"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Soittoäänen värinä"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Kosketuspalaute"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Valitse <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Avaa <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Käytä värinkorjausta"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Näytä tekstitykset"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Vain tuetuille sovelluksille"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> käytössä"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Avaa <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Käytä värinkorjausta"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Näytä tekstitykset"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Vain tuetuille sovelluksille"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tekstitysten koko ja tyyli"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tekstin koko: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Lisää asetuksia"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Harmaasävy"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Puna-vihersokeus"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Puna-vihersokeus"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Sini-keltasokeus"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Taustakäytön rajoitus"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Salli sovelluksen toimia taustalla"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Sovellus ei saa toimia taustalla."</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Taustakäyttöä ei voi rajoittaa."</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Taustakäyttöä ei voi rajoittaa"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Rajoitetaanko toimintaa taustalla?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jos rajoitat sovelluksen toimintaa taustalla, se voi alkaa toimia virheellisesti."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Sovellusta ei voi rajoittaa, koska akun optimointi ei ole käytössä.\n\nOta optimointi käyttöön rajoittamista varten."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablettia on käytetty tavallista enemmän"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Laitetta on käytetty tavallista enemmän"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Akku voi loppua odotettua aiemmin"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Akun kunnon optimointi"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Akun käyttöä rajoitettu tilapäisesti. Lue lisää napauttamalla."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Puhelinta käytetty tavallista enemmän. Akku voi loppua odotettua aiemmin.\n\nAkkua eniten käyttäneet sovellukset:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablettia on käytetty tavallista enemmän. Akku voi loppua odotettua aiemmin.\n\nAkkua eniten käyttäneet sovellukset:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Laitetta on käytetty tavallista enemmän. Akku voi loppua odotettua aiemmin.\n\nAkkua eniten käyttäneet sovellukset:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d sovellus rajoitettu</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Ongelma akkumittarin lukemisessa"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Ongelma akkumittarin lukemisessa. "<annotation id="url">"Lue lisää"</annotation>" napauttamalla."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Lopetetaanko sovellus?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Puhelin ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP">%1$s</xliff:g> pitää näyttöä aktivoituna.\n\nOngelman korjaamiseksi voit pakottaa sovelluksen lopetuksen.\n\nJos tämä tapahtuu toistuvasti, akun optimointi voi edellyttää sovelluksen poistamista."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Tabletti ei voi hallita akunkäyttöä normaalisti, koska <xliff:g id="APP">%1$s</xliff:g> pitää näyttöä aktivoituna.\n\nOngelman korjaamiseksi voit pakottaa sovelluksen lopetuksen.\n\nJos tämä tapahtuu toistuvasti, akun optimointi voi edellyttää sovelluksen poistamista."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Luo aikataulu"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Pidennä akunkestoa"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Laita pois päältä, kun lataus on valmis"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Virransäästö menee pois päältä, kun puhelimen varaus on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Virransäästö menee pois päältä, kun tabletin varaus on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Virransäästö menee pois päältä, kun laitteen varaus on <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Virransäästö menee pois päältä, kun puhelimen varaus on yli <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Virransäästö menee pois päältä, kun tabletin varaus on yli <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Virransäästö menee pois päältä, kun laitteen varaus on yli <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ota käyttöön"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Nollaa"</string>
     <string name="tts_play" msgid="2945513377250757221">"Toista"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Mukautuvat yhteydet"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Parantaa akunkestoa ja laitteen suorituskykyä hallinnoimalla automaattisesti verkkoyhteyksiäsi"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Kirjautumistietojen tallennustila"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Varmenteen asentaminen"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Asenna varmenteet tallennustilasta."</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Käyttäjän kirjautumistiedot"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Tarkastele ja muokkaa tallennettuja kirjautumistietoja."</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Lisäasetukset"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tallennustilan tyyppi"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Laitteiston tukema"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Vain ohjelmisto"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kirjautumistunnukset eivät ole tämän käyttäjän käytettävissä"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Asennettu VPN:ää ja sovelluksia varten"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Asennettu Wi-Fiä varten"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Älä asenna"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Asenna silti"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Varmennetta ei asennettu."</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Saako <xliff:g id="APP_NAME">%s</xliff:g> asentaa varmenteita tälle laitteelle?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Alla olevat sovellukset ja URL-osoitteet tunnistavat sinut näistä varmenteista"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Älä salli"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Salli"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Näytä enemmän"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Varmenteiden hallintasovellus"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"–"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Tämän sovelluksen asentamat varmenteet yhdistävät sinut alla oleviin sovelluksiin ja URL-osoitteisiin"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Poista"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Hätäpuhelun äänimerkki"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Aseta toiminta hätäpuhelun tapauksessa"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Varmuuskopiointi"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ei määritetty – työprofiili"</string>
     <string name="user_admin" msgid="4024553191395768119">"Järjestelmänvalvoja"</string>
     <string name="user_you" msgid="3070562015202859996">"Sinä (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Lempinimi"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Voit lisätä korkeintaan <xliff:g id="USER_COUNT">%1$d</xliff:g> käyttäjää."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Vain tablet-laitteen omistaja voi hallita käyttäjiä."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Vain puhelimen omistaja voi hallita käyttäjiä."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Maksaminen päätteellä"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Asenna maksusovellus. Maksa ostoksesi pitämällä puhelimen takaosaa lähimaksupäätettä vasten."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Selvä"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Lisää…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Lisää…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Valitse oletusmaksusovellus"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Päivitä oletusmaksusovellus"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Maksa lähimaksupäätteellä tällä sovelluksella: <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Takaisin"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Seuraava"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Valmis"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Ota kuva"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Valitse kuva"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Valitse kuva"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kortit"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kortit"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Käytä kaikille puheluille"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Valitse SIM-kortti tiedonsiirtoon"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Valitse SIM-kortti tekstiviesteille"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Vaihdetaan tiedonsiirron SIM-korttia, odota hetki…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Vaihdetaan datan SIM-korttia, hetkinen…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Valitse puhelinoperaattori:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM-kortin valinta"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-kortti <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ohjelma, aikataulu, virransäästö, virran säästäminen, akku, automaattinen, prosentti"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, puhelujen lisävaihtoehdot, 4g-puhelut"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"lisää kieli"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tekstin koko"</string>
     <string name="default_sound" msgid="6604374495015245195">"Oletusääni"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Soittoäänen ja ilmoitusten äänenvoimakkuus <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Äänenvoimakkuus, värinä, Älä häiritse"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Käynnistysäänet"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live-tekstitys"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Tekstitä media automaattisesti"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ei mitään"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> aikataulua luotu</item>
-      <item quantity="one">1 aikataulu luotu</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ei yhtään}=1{1 aikataulu luotu}other{# aikataulua luotu}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Älä häiritse"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Salli ilmoitukset vain tärkeiltä ihmisiltä ja sovelluksilta"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Keskeytysten rajoittaminen"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Vain tärkeät"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Päällä / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Pois päältä / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Pois päältä"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Päällä"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Kysy aina"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Kunnes laitat pois päältä"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> tuntia</item>
-      <item quantity="one">1 tunti</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuuttia"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> aikataulua voi käynnistyä automaattisesti</item>
-      <item quantity="one">1 aikataulu voi käynnistyä automaattisesti</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 tunti}other{# tuntia}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuutti}other{# minuuttia}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Pois päältä}=1{Pois päältä / 1 aikataulu voi käynnistyä automaattisesti}other{Pois päältä / # aikataulua voi käynnistyä automaattisesti}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Mikä voi keskeyttää Älä häiritse ‑tilan"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Ihmiset"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Sovellukset"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Aseta alemman prioriteetin ilmoitukset automaattisesti varovaisiksi."</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Ilmoitusten mukautuva järjestäminen"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Järjestä ilmoitukset automaattisesti olennaisuuden mukaan"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Mukautuva ilmoituspalaute"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Näytä ilmoituksiin tehdyt muutokset ja miten järjestelmästä voi antaa palautetta"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Nollaa ilmoitusten tärkeys"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Nollaa käyttäjän muuttamat tärkeysasetukset ja salli ilmoitusapurin priorisoida ilmoituksia"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Toiminta- ja vastausehdotukset"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Näytä toiminta- ja vastausehdotukset automaattisesti."</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Näytä viimeaikaiset ja myöhemmäksi siirretyt ilmoitukset"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Tärkeät keskustelut"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Näkyy keskustelukohdan yläosassa ja kuplana"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Näkyy keskustelukohdan yläosassa"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Muut keskustelut"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Vähemmän tärkeät keskustelut"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Keskustelut, joihin teit muutoksia"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Uusimmat keskustelut"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Tyhjennä uusimmat"</string>
+    <string name="clear" msgid="5092178335409471100">"Tyhjennä"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Näytä kuplia tärkeistä keskusteluista"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Tärkeät keskustelut näkyvät vedettävän ilmoitusalueen yläreunassa. Voit myös valita, että ne näkyvät kuplina ja keskeyttävät Älä häiritse ‑tilan."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Tärkeät ja muutetut keskustelut näkyvät tässä"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Älä häiritse -pääsy"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Salli Älä häiritse ‑tila"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Yksikään asennettu sovellus ei ole pyytänyt Älä häiritse -tilan käyttöoikeutta."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Ladataan sovelluksia…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Ladataan sovelluksia…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android estää pyynnöstäsi tämän sovelluksen ilmoituksien näyttämisen tällä laitteella."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android estää pyynnöstäsi tähän luokkaan kuuluvien ilmoituksien näyttämisen tällä laitteella."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android estää pyynnöstäsi tähän ryhmään kuuluvien ilmoituksien näyttämisen tällä laitteella."</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Kaikki keskustelut"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Tärkeät keskustelut"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"–"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> keskustelua</item>
-      <item quantity="one">1 keskustelu</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"–"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ei yhtään}=1{1 keskustelu}other{# keskustelua}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kuka saa keskeyttää"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Puhelut"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Puhelut"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Varmista sallittujen puhelujen kuuluminen tarkistamalla, että laitteen tilana on soittoääni"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Saapuvat puhelut estetään: <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Voit määrittää asetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Tähdelliset yhteystiedot"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> muuta</item>
-      <item quantity="one">1 muu</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"–"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ei yhtään}=1{{contact_1}}=2{{contact_1} ja {contact_2}}=3{{contact_1}, {contact_2} ja {contact_3}}other{{contact_1}, {contact_2} ja # muuta}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Ei nimeä)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Viestit"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"viestit"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Viestit"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Saapuvat viestit estetään: <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Voit määrittää asetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Näet kaikki viestit"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Saat kaikki puhelut"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"–"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktia</item>
-      <item quantity="one">1 kontakti</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ei yhtään}=1{1 kontakti}other{# kontaktia}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Kaikki"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktit"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Tähdellä merkityt kontaktit"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Kaikki ilmoitukset"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Osa ilmoituksista"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Valitsemasi ihmiset voivat edelleen ottaa sinuun yhteyttä, vaikka et anna sovellusten keskeyttää"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> voivat keskeyttää</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> voi keskeyttää</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> muuta"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Mitkään sovellukset eivät voi keskeyttää}=1{{app_1} voi keskeyttää}=2{{app_1} ja {app_2} voivat keskeyttää}=3{{app_1}, {app_2} ja {app_3} voivat keskeyttää}other{{app_1}, {app_2} ja # muuta voivat keskeyttää}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Sovellukset"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Kaikki ilmoitukset"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Osa ilmoituksista"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Ilmoitukset, jotka saavat keskeyttää"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Salli kaikki ilmoitukset"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> voivat keskeyttää</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> voi keskeyttää</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Mikään ei voi keskeyttää"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> muuta"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Mikään ei voi keskeyttää}=1{{sound_category_1} voi keskeyttää}=2{{sound_category_1} ja {sound_category_2} voivat keskeyttää}=3{{sound_category_1}, {sound_category_2} ja {sound_category_3} voivat keskeyttää}other{{sound_category_1}, {sound_category_2} ja # muuta voivat keskeyttää}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Mikään ei voi keskeyttää"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Kukaan ei voi keskeyttää"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Jotkut voivat keskeyttää"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Kaikki käyttäjät voivat keskeyttää"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Päällä"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Ei päällä"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Sovelluksen kiinnitys"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Kiinnittämällä sovelluksen voit pitää sen näkyvissä siihen asti kunnes irrotat kiinnityksen. Tätä ominaisuutta voit käyttää esimerkiksi, kun annat luotettavan kaverisi pelata jotain tiettyä peliä. \n\nKun sovellus on kiinnitetty, sillä voi avata muita sovelluksia ja päästä henkilökohtaisiin tietoihin. \n\nSovelluksen kiinnittäminen: 	\n1.	Laita sovelluksen kiinnitys päälle 	\n2.	Avaa Viimeisimmät 	\n3.	Valitse näytön yläreunasta sovelluksen kuvake ja sitten Kiinnitä"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Kiinnittämällä sovelluksen voit pitää nykyisen sovelluksen näkyvissä, kunnes irrotat kiinnityksen. Tätä ominaisuutta voit käyttää esimerkiksi, kun annat luotettavan kaverisi pelata jotain tiettyä peliä. \n\nKun sovellus on kiinnitetty, sillä voi avata muita sovelluksia ja päästä henkilökohtaisiin tietoihin. \n\nJos haluat jakaa laitteesi turvallisesti toisen henkilön kanssa, kokeile sen sijaan vieraskäyttäjää. \n\nSovelluksen kiinnittäminen: 	\n1.	Laita sovelluksen kiinnitys päälle 	\n2.	Avaa Viimeisimmät 	\n3.	Valitse näytön yläreunasta sovelluksen kuvake ja sitten Kiinnitä"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Sovelluksen kiinnityksellä voit pitää nykyisen sovelluksen näkyvissä, kunnes irrotat sen. Tällä ominaisuudella voi esimerkiksi antaa luotettavan kaverin pelata tiettyä peliä."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Kun sovellus on kiinnitetty, sillä voi avata muita sovelluksia ja saada pääsyn henkilökohtaisiin tietoihin. \n\nSovelluksen kiinnittäminen: 	\n1.	Laita Sovelluksen kiinnitys päälle 	\n2.	Avaa Viimeisimmät 	\n3.	Valitse näytön yläreunasta sovelluksen kuvake ja sitten Kiinnitä"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Kun sovellus on kiinnitetty, sillä voi avata muita sovelluksia ja saada pääsyn henkilökohtaisiin tietoihin. \n\nJos haluat jakaa laitteesi turvallisesti toisen henkilön kanssa, kokeile sen sijaan vieraskäyttäjää. \n\nSovelluksen kiinnittäminen: 	\n1.	Laita sovelluksen kiinnitys päälle 	\n2.	Avaa Viimeisimmät 	\n3.	Valitse näytön yläreunasta sovelluksen kuvake ja sitten Kiinnitä"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Kun sovellus on kiinnitetty: \n\n•		Henkilökohtaisiin tietoihin saattaa olla pääsy \n		(esim. yhteystiedot ja sähköpostin sisältö) \n•		Kiinnitetty sovellus voi avata muita sovelluksia \n\nKäytä sovelluksen kiinnitystä vain ihmisten kanssa, joihin luotat."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Pyydä lukituksenpoistokuviota ennen irrotusta"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Pyydä PIN ennen irrotusta"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Kasvojentunnistuksella avaamisen lisäksi voit parantaa laitteen suojausta vaatimalla PIN-koodin antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko PIN-koodin antamista laitteen käynnistyksen yhteydessä?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Kasvojentunnistuksella avaamisen lisäksi voit parantaa laitteen suojausta vaatimalla kuvion antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko kuvion antamista laitteen käynnistyksen yhteydessä?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Kasvojentunnistuksella avaamisen lisäksi voit parantaa laitteen suojausta pyytämällä salasanaa ennen käynnistymistä. Laite ei vastaanota puheluita, viestejä tai ilmoituksia, esimerkiksi herätyksiä, ennen kuin se on käynnistynyt.\n\nTämä auttaa suojaamaan kadonneen tai varastetun laitteen tietoja. Otetaanko salasanan pyytäminen käynnistettäessä käyttöön?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Biometriikalla avaamisen lisäksi voit parantaa laitteen suojausta vaatimalla PIN-koodin antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko PIN-koodia laitteen käynnistyksen yhteydessä?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Biometriikalla avaamisen lisäksi voit parantaa laitteen suojausta vaatimalla kuvion antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko kuviota laitteen käynnistyksen yhteydessä?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Biometriikalla avaamisen lisäksi voit parantaa laitteen suojausta entisestään pyytämällä salasanaa ennen käynnistymistä. Laite ei vastaanota puheluita, viestejä tai ilmoituksia, esimerkiksi herätyksiä, ennen kuin se on käynnistynyt.\n\nTämä auttaa suojaamaan kadonneen tai varastetun laitteen tietoja. Vaaditaanko salasanaa laitteen käynnistyksen yhteydessä?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Kyllä"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ei"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Rajoitettu"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-yhteyttä ohjaa"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Yhdistetty laite"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Tämä laite"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Vaihdetaan…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Vaihdetaan…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Vaihtaminen epäonnistui"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Laitteen lataaminen"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Yhdistetyn laitteen lataaminen"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobiilidatan käyttö"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Sovelluksen datan käyttö"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi-datan käyttö"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Muu kuin operaattorien käyttämä data"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet-datan käyttö"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 rajoitus</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operaattorin mittaama datan määrä voi erota laitteen mittaustuloksesta."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ei sisällä operaattoriverkkojen käyttämää dataa"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> käytetty"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Aseta datankäyttövaroitus"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datavaroitus"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Näytä tiedot"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Rajoittamaton data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Taustatiedonsiirto ei käytössä"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Taustatiedot on poistettu käytöstä"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Päällä"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Pois päältä"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Käytä virransäästöä"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Estä vastausten ja muun tekstin kirjoittaminen ilmoituksiin, kun laite on lukittu."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Oletusarvoinen oikoluku"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Valitse oikoluku"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Tarkista oikeinkirjoitus"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Käytä oikolukua"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ei valittu"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ei mitään)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Tallennustilan hallinta vapauttaa tilaa poistamalla varmuuskopioituja kuvia ja videoita laitteeltasi."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Poista kuvia ja videoita"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Tallennustilan hallinta"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Käytä tallennustilan hallintaa"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Käytä tallennustilan ylläpitoa"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automaattinen"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuaalinen"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Vapauta tilaa"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tarkista ilmoitukset kaksoisnapauttamalla puhelimen näyttöä"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tarkista ilmoitukset kaksoisnapauttamalla tabletin näyttöä"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tarkista ilmoitukset kaksoisnapauttamalla laitteen näyttöä"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Ilmoitukset pyyhkäisyllä"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Näytä ilmoitukset pyyhkäisemällä alas näytön alareunasta"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Yhden käden moodi"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Käytä yhden käden moodia"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Poistu, kun sovellusta vaihdetaan"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Aikaraja"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekuntia"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekuntia"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekuntia"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"tavoitettavuus"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Kaksoisnapauta näyttöä, niin näet ajan, ilmoitukset ja muita tietoja."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Tarkista nostamalla"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tarkista ilmoitukset nostamalla tablettisi"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tarkista tabletin ilmoitukset napauttamalla"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tarkista laitteen ilmoitukset napauttamalla"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Napauta näyttöä, niin näet ajan, ilmoitukset ja muita tietoja."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Hätätilanne"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Käytä hätätilannepalvelua"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Hallinnoija: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Aloita alla olevien palvelujen käyttö painamalla virtapainiketta nopeasti vähintään viisi kertaa"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Toista lähtölaskennan hälytys"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Toista kova ääni ennen avun pyytämistä"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Soita ja pyydä apua"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Numero, josta voi pyytää apua"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Muuta napauttamalla"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Jos lisäät muun kuin hätänumeron\n • laitteen lukituksen on oltava avattuna hätätilannepalvelujen käyttöä varten\n • puheluun ei välttämättä vastata."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Pyyhkäise ilmoitukset esiin"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sormenjäljen pyyhkäisy"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Voit katsoa ilmoitukset pyyhkäisemällä puhelimen takaosassa olevasta sormenjälkitunnistimesta alaspäin."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Näkyvien data-aineistojen enimmäismäärä"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Palauta oletusarvot"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Automaattisen täytön kehittäjäasetukset palautettu"</string>
+    <string name="location_category" msgid="3496759112306219062">"Sijainti"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Tilapalkin sijaintiosoitin"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Näytä kaikista sijainneista (myös verkko ja yhteydet)"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Pakota täydet GNSS-mitat"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Seuraa kaikkia GNSS-kuvioita ja ‑taajuuksia, joissa ei ole pulssisuhdetta."</string>
     <string name="device_theme" msgid="5027604586494772471">"Laitteen teema"</string>
     <string name="default_theme" msgid="4815428567082263639">"Oletus"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Verkon nimi"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Keskeytä ilmoitukset, jotta voit keskittyä"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Ominaisuutta ei ole saatavilla"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Tämä ominaisuus on poistettu käytöstä, koska se hidastaa puhelintasi."</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Pakota täydet GNSS-mitat"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Seuraa kaikkia GNSS-kuvioita ja ‑taajuuksia, joissa ei ole pulssisuhdetta."</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Näytä aina kaatumisikkuna"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Näytä valintaikkuna aina, kun sovellus kaatuu."</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Valitse ANGLE-yhteensopiva sovellus"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ota käyttöön kaikissa sovelluksissa"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Valitse grafiikkaohjain"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Oletus"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Peliajuri"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Peliajuri"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Kehittäjän ajuri"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Järjestelmän grafiikkaohjain"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Päällä (mykistys)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Ei päällä"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Verkon tiedot"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Puhelimen sovellukset näkevät laitteesi nimen. Muut voivat myös nähdä nimen, kun muodostat Bluetooth-yhteyden laitteisiin tai aktivoit Wi-Fi-hotspotin."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Puhelimen sovellukset näkevät laitteesi nimen. Myös muut käyttäjät voivat nähdä nimen, kun muodostat Bluetooth-yhteyden laitteisiin, yhteyden Wi-Fi-verkkoon tai aktivoit Wi-Fi-hotspotin."</string>
     <string name="devices_title" msgid="649715719278562515">"Laitteet"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Kaikki asetukset"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Ehdotukset"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Verkkoja ei löytynyt. Yritä uudelleen."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(kielletty)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Ei SIM-korttia"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-kortti"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ei SIM-korttia"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ei mitään"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Yhdistämiseen tarvitaan SIM-kortti"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Yhdistämiseen tarvitaan SIM-kortti (<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>)"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Ensisijainen verkkotila: ensisijaisesti WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Ensisijainen verkkotila: vain GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Ensisijainen verkkotila: vain WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiilidata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Käytä mobiiliverkon dataa"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Puhelin vaihtaa automaattisesti tähän operaattoriin, kun se on kantoalueella."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ei SIM-korttia käytettävissä"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Puheluasetus"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Tekstiviestiasetus"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Kysy aina"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ei käytettävissä <xliff:g id="CARRIER">%1$s</xliff:g> ‑käytön aikana"</string>
     <string name="see_more" msgid="7499355691042812723">"Lisää"</string>
     <string name="see_less" msgid="2642392725363552793">"Näytä vähemmän"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Otetaanko <xliff:g id="CARRIER_NAME">%1$s</xliff:g> käyttöön?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Otetaanko SIM-kortti käyttöön?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vaihdetaanko <xliff:g id="CARRIER_NAME">%1$s</xliff:g> käyttöön?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vaihdetaanko SIM-korttiin?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Vain yksi SIM-kortti voi olla kerrallaan aktiivinen.\n\nVanhaa palvelua (<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>) ei peruuteta, jos <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> otetaan käyttöön."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Vain yksi ladattu SIM-kortti voi olla kerrallaan aktiivinen.\n\nVanhaa palvelua (<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>) ei peruuteta, jos <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> otetaan käyttöön."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Vain yksi SIM-kortti voi olla kerrallaan aktiivinen.\n\nVanhaa palvelua (<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>) ei peruuteta, jos vaihdat uuteen."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Vaihda: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Yhdistetään verkkoon…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> otetaan käyttöön"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operaattoria ei voi vaihtaa"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operaattorin vaihto ei onnistu virheen takia."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Laitetaanko <xliff:g id="CARRIER_NAME">%1$s</xliff:g> pois päältä?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Laitetaanko SIM-kortti pois päältä?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Laitetaan SIM-korttia pois päältä<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operaattoria ei voi poistaa käytöstä"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Jotain meni pieleen. Operaattoria ei voitu poistaa käytöstä."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Käytetäänkö kahta SIM-korttia?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Tällä laitteella voi olla kaksi aktiivista SIM-korttia yhtä aikaa. Jos haluat edelleen käyttää yhtä kerrallaan, valitse Ei kiitos."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Käynnistetäänkö laite uudelleen?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Käynnistä ensin laite uudelleen. Sitten voit lisätä toisen SIM-kortin."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Jatka"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Käynnistä uudelleen"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ei kiitos"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Vaihda"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-korttia ei voi aktivoida"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Poista SIM-kortti ja aseta se takaisin. Jos ongelma ei ratkea, käynnistä laite uudelleen."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Kokeile kytkeä SIM-kortti päälle uudelleen. Jos ongelma ei ratkea, käynnistä laite uudelleen."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Verkon aktivointi"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> on aktiivinen"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Päivitä SIM‑asetukset napauttamalla"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-kortti"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Tyhjennetäänkö ladattu SIM-kortti?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Tämän SIM-kortin tyhjentäminen poistaa palvelun (<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>) laitteelta.\n\nPalvelua (<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>) ei peruuteta."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Tyhjennä"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Tyhjennetään SIM-korttia…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM-korttia ei voi tyhjentää"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"SIM-korttia ei voi tyhjentää virheen vuoksi.\n\nKäynnistä laite uudelleen ja yritä sitten uudelleen."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Laitteeseen yhdistäminen"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> haluaa käyttää väliaikaista Wi-Fi-verkkoa laitteeseen yhdistämiseksi"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Laitteita ei löytynyt. Varmista, että laitteet ovat päällä ja voivat muodostaa yhteyden."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Hätäpuhelut"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Operaattorisi ei tue hätäpuhelun soittamista Wi-Fi-puheluna.\nLaite vaihtaa automaattisesti mobiiliverkkoon soittaakseen hätäpuhelun.\nHätäpuheluja voi soittaa vain matkapuhelinverkon kantaman sisällä."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Soita puhelut Wi‑Fillä parantaaksesi laatua"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"SIM-korttien väliset puhelut"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Salli toisen SIM-kortin puhelut ja tekstiviestit tämän SIM-kortin kanssa."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"SIM-korttien väliset puhelut"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Saapuva MMS-viesti"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS-viestiä ei voi lähettää"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Napauta, jos haluat sallia MMS-viestit (<xliff:g id="OPERATOR_NAME">%1$s</xliff:g>), kun mobiilidata ei ole käytössä."</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Salli näytön peitto Asetukset-sovelluksessa"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Anna sovellusten, jotka voivat näkyä muiden sovellusten päällä, peittää Asetukset-sovelluksen näytöt"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Piilota soitin kun median käyttökerta on päättynyt"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Tällä soittimella voit jatkaa käyttökertaa laajennetusta pika-asetuspaneelista."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediasoitin pika-asetuksissa"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Pidä mediasoitin näkyvillä pitkään, niin voit jatkaa toistoa helposti"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Piilota soitin"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Näytä soitin"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Soittimia ei saatavilla"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Sallitut sovellukset"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth käynnistyy."</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Päällä"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Poissa päältä"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kortit"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Lentokoneturvalliset verkot"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Hae lentokoneturvallisia verkkoja ja muodosta yhteys niihin"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lentokone, lentokoneturvallinen"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Puhelut ja tekstiviestit"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-puhelut"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Soita ja vastaanota puheluita muun kuin operaattorin verkon (esim. Wi-Fi-verkon) kautta"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi-puheluilla voit soittaa ja vastaanottaa puheluita muun kuin operaattorin verkon (esim. joidenkin Wi-Fi-verkkojen) kautta."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Puhelut"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"Tekstiviestit"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"ensisijainen"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"ensisijainen: puhelut"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"ensisijainen: tekstiviestit"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ei saatavilla"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ei SIM-korttia"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Valinnat"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Yhdistä julkisiin verkkoihin"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"verkkoyhteys, internet, langaton, data, langaton yhteys, Wi-Fi, Wi Fi, datayhteys, mobiili, puhelinoperaattori, 4g, 3g, 2g, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Näytä lentokoneturvalliset verkot"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Laita lentokonetila pois päältä"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ei käytettävissä, koska Nukkuma-aikamoodi on päällä"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Ilmoitusten tärkeys nollattu"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Sovellukset"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Epäluotettava laite pyytää pääsyä viesteihisi. Katso lisätietoja napauttamalla."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Sallitaanko pääsy viesteihin?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Epäluotettava Bluetooth-laite, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], pyytää pääsyä viesteihisi.\n\n[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ei ole ennen ollut yhteydessä laitteeseesi."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Epäluotettava laite pyytää pääsyä yhteystietoihisi ja puhelulokiisi. Katso lisätietoja napauttamalla."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Sallitaanko pääsy yhteystietoihin ja puhelulokiin?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Epäluotettava Bluetooth-laite, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], pyytää pääsyä yhteystietoihisi ja puhelulokiisi. Tämä sisältää datan saapuvista ja lähtevistä puheluista.\n\n[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ei ole ennen ollut yhteydessä laitteeseesi."</string>
 </resources>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 70688e9..cf4b15d 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Moyen"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Court"</item>
+    <item msgid="7397961711906421599">"Moyen"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Par défaut"</item>
     <item msgid="4234707448428002595">"Sans empattement"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA uniquement"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Mondial"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 5612770..f652f33 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -25,7 +25,6 @@
     <string name="device_info_default" msgid="1406619232867343310">"Inconnu"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
       <item quantity="one">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir concepteur.</item>
-      <item quantity="many">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="other">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étapes pour devenir concepteur.</item>
     </plurals>
     <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes maintenant concepteur!"</string>
@@ -209,7 +208,6 @@
     <string name="add_a_language" msgid="2126220398077503271">"Ajouter une langue"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="2845515796732609837">
       <item quantity="one">Supprimer la langue sélectionnée?</item>
-      <item quantity="many">Remove selected languages?</item>
       <item quantity="other">Supprimer les langues sélectionnées?</item>
     </plurals>
     <string name="dlg_remove_locales_message" msgid="8110560091134252067">"Le texte s\'affichera dans une autre langue."</string>
@@ -237,7 +235,7 @@
     <string name="settings_label" msgid="943294133671632976">"Paramètres"</string>
     <string name="settings_label_launcher" msgid="820982375501978609">"Paramètres"</string>
     <string name="settings_shortcut" msgid="8548239727871847171">"Raccourci vers les paramètres"</string>
-    <string name="airplane_mode" msgid="3196085857882526817">"Mode avion"</string>
+    <string name="airplane_mode" msgid="3196085857882526817">"Mode Avion"</string>
     <string name="wireless_networks_settings_title" msgid="8557542379234105369">"Sans fil et réseaux"</string>
     <string name="radio_controls_summary" msgid="9028430178697624501">"Gérer le Wi-Fi, le Bluetooth, le mode Avion, les réseaux mobiles et les RPV"</string>
     <string name="cellular_data_summary" msgid="6551434804367912367">"Auto. utilisation données sur réseau cell."</string>
@@ -256,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Date et heure"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Régler la date et l\'heure"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Configurer la date, l\'heure, le fuseau horaire et les formats"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Utiliser la date et l\'heure fournies par le réseau"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Utiliser le fuseau horaire fourni par le réseau"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Définir l\'heure automatiquement"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Définir le fuseau horaire automatiquement"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Utiliser les paramètres régionaux par défaut"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Format 24 heures"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Utiliser le format 24 h"</string>
@@ -298,11 +296,10 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Afficher infos de profil sur écran de verrouillage"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Comptes"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Position"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Utiliser ma position"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utiliser ma position"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Désactivé"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Activé : <xliff:g id="COUNT_1">%1$d</xliff:g> application a accès à la position</item>
-      <item quantity="many">On - <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
       <item quantity="other">Activé : <xliff:g id="COUNT_1">%1$d</xliff:g> applications ont accès à la position</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Chargement en cours…"</string>
@@ -323,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Verrouillage de l\'écran, déverrouillage par reconnaissance du visage"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Verrouillage de l\'écran, empreintes digitales"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Verrouillage de l\'écran"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Déverr. votre tél. avec votre visage et votre empr. digitale"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Connectez-vous à des applications et confirmez vos paiements"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurer le déverrouillage avec :"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Déverrouill. par reconn. faciale"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Simplifiez le déverrouillage du téléphone"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Empreinte digitale"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Déverr. votre téléphone dans votre poche"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Ignorer"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Suivant"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Visage ajouté"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurer le déverrouillage par reconnaissance faciale"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Déverrouill. par reconn. faciale"</string>
@@ -332,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Utiliser son visage pour s\'authentifier"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Démarrer"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Si la fonctionnalité de déverr. par reconnaissance faciale est désactivée, certaines étapes de configuration pourraient ne pas fonctionner avec TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Retour"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Poursuivre configur."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Utiliser config. d\'accessibilité"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -376,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Toujours demander confirm. lors du déverr. par rec. faciale dans applis"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Supprimer données visage"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurer le déverr. par reconn. faciale"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Servez-vous du déverrouillage par reconnaissance faciale pour déverrouiller votre appareil, vous connecter à des applications et confirmer des paiements.\n\nRemarque importante :\nLe fait de regarder le téléphone pourrait le déverrouiller même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, par exemple un jumeau identique."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Servez-vous du déverrouillage par reconnaissance faciale pour déverrouiller votre appareil, vous connecter à des applications et confirmer des paiements.\n\nRemarque importante :\nLe fait de regarder le téléphone pourrait le déverrouiller même si vous ne cherchiez pas à le faire.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage, même si vos yeux sont fermés.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, par exemple un jumeau identique."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Utilisez le déverrouillage par reconnaissance faciale pour déverrouiller votre appareil, vous connecter aux applications et confirmer les paiements."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Remarque importante : \nVous pouvez déverrouiller votre téléphone sans le vouloir, simplement en le regardant.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, par exemple un jumeau identique."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Remarque importante : \nVous pouvez déverrouiller votre téléphone sans le vouloir, simplement en le regardant.\n\nUne autre personne pourrait déverrouiller votre téléphone en le tenant devant votre visage, même si vous avez les yeux fermés.\n\nVotre téléphone pourrait être déverrouillé par une personne qui vous ressemble beaucoup, par exemple un jumeau identique."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Supprimer les données du visage?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Les données sur les visages utilisées pour le déverrouillage par reconnaissance faciale seront supprimées de manière permanente et sécuritaire. Après la suppression, vous aurez besoin de votre NIP, de votre schéma ou de votre mot de passe pour déverrouiller votre téléphone, vous connecter à des applications et confirmer les paiements."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Utilisez le déverrouillage par reconnaissance faciale pour déverrouiller votre téléphone"</string>
@@ -388,7 +398,6 @@
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5451094461919440992">"verrouillage de l\'écran"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="988602245530967106">
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> empreinte digitale configurée</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints set up</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empreintes digitales configurées</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
@@ -398,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou autoriser des achats.\n\nRemarque : Vous ne pouvez pas utiliser vos empreintes digitales pour déverrouiller cet appareil. Pour obtenir plus d\'information, communiquez avec l\'administrateur de votre organisation."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou autoriser des achats.\n\nRemarque : Votre empreinte digitale peut être moins sécurisée qu\'un schéma ou un NIP fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuler"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Non merci"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Passer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Suivant"</string>
@@ -435,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"En protégeant votre tablette avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer le déverrouillage par reconnaissance faciale, vous devez aussi configurer une option de verrouillage de l\'écran. Pour revenir en arrière, touchez Annuler."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"En protégeant votre appareil avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer le déverrouillage par reconnaissance faciale, vous devez aussi configurer une option de verrouillage de l\'écran. Pour revenir en arrière, touchez Annuler."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Si vous protégez votre téléphone avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer le déverrouillage par reconnaissance faciale, vous devez aussi configurer une option de verrouillage de l\'écran. Pour revenir en arrière, touchez Annuler."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"En protégeant votre tablette avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Vous devez également utiliser une option de verrouillage d\'écran pour configurer les données biométriques. Pour revenir en arrière, touchez Annuler."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"En protégeant votre appareil avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Vous devez également utiliser une option de verrouillage d\'écran pour configurer les données biométriques. Pour revenir en arrière, touchez Annuler."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"En protégeant votre téléphone avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Vous devez également utiliser une option de verrouillage d\'écran pour configurer les données biométriques. Pour revenir en arrière, touchez Annuler."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Ignorer la configuration du NIP?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Ignorer la configuration du mot de passe?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Ignorer la configuration du schéma?"</string>
@@ -507,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Choisissez votre méthode secondaire de verrouillage d\'écran"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Choisissez votre méthode secondaire de verrouillage d\'écran"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Choisissez votre méthode secondaire de verrouillage d\'écran"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Options de verrouillage de l\'écran"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Options de verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Verrouillage de l\'écran"</string>
@@ -540,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Déverr. par reconn. faciale + mot de passe"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuer sans configurer le déverr. par reconn. faciale"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Vous pouvez déverrouiller votre téléphone avec votre visage. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Données biométriques et schéma"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Données biométriques et NIP"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Données biométriques et mot de passe"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuer sans configurer les données biométriques"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Vous pouvez déverrouiller votre téléphone avec vos données biométriques. Pour plus de sécurité, cette option exige un verrouillage d\'écran secondaire."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Désactivé par admin., politique cryptage, stock. authentifiants"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Balayer l\'écran"</string>
@@ -607,68 +624,55 @@
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="170155081899679669">"Ignorer"</string>
     <plurals name="lockpassword_password_too_short" formatted="false" msgid="2192234965414232157">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT_1">%d</xliff:g> caractère</item>
-      <item quantity="many">Must be at least <xliff:g id="COUNT_1">%d</xliff:g> characters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT_1">%d</xliff:g> caractères</item>
     </plurals>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
       <item quantity="one">Le NIP doit contenir au moins <xliff:g id="COUNT_1">%d</xliff:g> chiffre</item>
-      <item quantity="many">PIN must be at least <xliff:g id="COUNT_1">%d</xliff:g> digits</item>
       <item quantity="other">Le NIP doit contenir au moins <xliff:g id="COUNT_1">%d</xliff:g> chiffres</item>
     </plurals>
     <string name="lockpassword_continue_label" msgid="2507983991979547816">"Continuer"</string>
     <plurals name="lockpassword_password_too_long" formatted="false" msgid="8118091957172967677">
       <item quantity="one">Doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> caractère</item>
-      <item quantity="many">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> characters</item>
       <item quantity="other">Doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> caractères</item>
     </plurals>
     <plurals name="lockpassword_pin_too_long" formatted="false" msgid="8706992338720310765">
       <item quantity="one">Doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> chiffre</item>
-      <item quantity="many">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> digits</item>
       <item quantity="other">Doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> chiffres</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'administrateur de l\'appareil ne permet pas l\'utilisation d\'un NIP récent"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Les NIP communs sont bloqués par l\'administrateur de votre service informatique. Essayez un NIP différent."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Vous ne pouvez pas inclure de caractère non valide"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Doit contenir au moins une lettre"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Doit contenir au moins un chiffre"</string>
     <string name="lockpassword_password_requires_symbol" msgid="6178512486154701321">"Doit contenir au moins un symbole"</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="2385916409676839024">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettre</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettres</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2057467885488612701">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettre minuscule</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettres minuscules</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="4541266279643052025">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettre majuscule</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> lettres majuscules</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="70617964591376248">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> chiffre</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> chiffres</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="7981236881269921943">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractère spécial</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères spéciaux</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="1567877061888948467">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractère autre qu\'une lettre</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères autres qu\'une lettre</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonnumerical" formatted="false" msgid="5056743974888384475">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractère non numérique</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-numerical characters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères non numériques</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'administrateur de l\'appareil ne permet pas l\'utilisation d\'un mot de passe récent"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Les mots de passe communs sont bloqués par l\'administrateur de votre service informatique. Essayez un mot de passe différent."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Les suites croissantes, décroissantes ou répétitives de chiffres ne sont pas autorisées"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmer"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Annuler"</string>
@@ -681,7 +685,6 @@
     <string name="number_of_device_admins_none" msgid="152926922020437312">"Aucune application active"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="2528735319390151989">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application active</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications actives</item>
     </plurals>
     <string name="manage_trust_agents" msgid="6410149930029992356">"Agents de confiance"</string>
@@ -689,7 +692,6 @@
     <string name="manage_trust_agents_summary" msgid="6423843123607674286">"Aucun"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5438047398376802735">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> agent de confiance actif</item>
-      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> active trust agents</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agent(s) de confiance actif(s)</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="5955341060378240781">"Bluetooth"</string>
@@ -812,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activer le Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utiliser le Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utiliser le Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Paramètres Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurer et gérer les points d\'accès sans fil"</string>
@@ -920,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrez le code QR ci-dessous pour vous connecter à « <xliff:g id="SSID">%1$s</xliff:g> »"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Connectez-vous au Wi-Fi en numérisant un code QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Partager le Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Numérisez ce code QR pour établir la connexion au réseau « <xliff:g id="SSID">%1$s</xliff:g> » et partager le mot de passe"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Numérisez ce code QR avec un autre appareil pour vous connecter à « <xliff:g id="SSID">%1$s</xliff:g> »"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Numérisez ce code QR pour établir la connexion au réseau « <xliff:g id="SSID">%1$s</xliff:g> »"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Réessayez. Si le problème persiste, communiquez avec le fabricant de l\'appareil"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Un problème s\'est produit"</string>
@@ -946,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Mot de passe Wi-Fi : <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Mot de passe du point d\'accès : <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Connexion automatique"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Autoriser le téléphone à se connecter automatiquement lorsqu\'il est à proximité de ce réseau"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Autoriser la tablette à se connecter automatiquement lorsqu\'elle est à proximité de ce réseau"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Autoriser la connexion à ce réseau lorsqu\'il est à portée"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Ajouter un appareil"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Utiliser un code QR pour ajouter un appareil à ce réseau"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Le format du code QR est incorrect"</string>
@@ -959,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utiliser les certificats système"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne pas fournir"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne pas valider"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Aucun certificat indiqué. Votre connexion ne sera pas privée."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Le nom du réseau est trop long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Vous devez spécifier un domaine."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificat obligatoire."</string>
@@ -986,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connexion"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi activé"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connecté à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connexion à <xliff:g id="NETWORK_NAME">%1$s</xliff:g> en cours…"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connexion en cours…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Échec de la connexion au réseau."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Réseau hors de portée"</string>
@@ -999,23 +1000,21 @@
     <string name="wifi_forget_dialog_message" msgid="8419499588321940243">"Tous les mots de passe de ce réseau seront supprimés"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="2802436466732147888">
       <item quantity="one">%d réseau</item>
-      <item quantity="many">%d networks</item>
       <item quantity="other">%d réseaux</item>
     </plurals>
     <plurals name="wifi_saved_passpoint_access_points_summary" formatted="false" msgid="5802057518058840450">
       <item quantity="one">%d abonnement</item>
-      <item quantity="many">%d subscriptions</item>
       <item quantity="other">%d abonnements</item>
     </plurals>
     <plurals name="wifi_saved_all_access_points_summary" formatted="false" msgid="5125849180309374451">
       <item quantity="one">%d réseau et abonnement</item>
-      <item quantity="many">%d networks &amp; subscriptions</item>
       <item quantity="other">%d réseaux et abonnements</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Paramètres Wi-Fi avancés"</string>
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresse MAC de l\'appareil"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Adresse MAC aléatoire"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Adresse MAC aléatoire (dernière utilisée)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adresse IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Infos sur le réseau"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Masque de sous-réseau"</string>
@@ -1023,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Adresses IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Réseaux enregistrés"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abonnements"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Autres réseaux"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Paramètres IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Les paramètres Wi-Fi avancés ne sont pas accessibles pour cet utilisateur"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Enregistrer"</string>
@@ -1033,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Saisissez une adresse de passerelle valide."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Saisissez une adresse DNS correcte."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Le préfixe réseau doit être compris entre 0 et 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (sauf si un DNS privé ignore ce paramètre)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (sauf si un DNS privé ignore ce paramètre)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Passerelle"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Longueur préfixe réseau"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1060,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"L\'application partage du contenu. Pour partager la connexion Internet, désactivez puis réactivez le point d\'accès."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Aucun mot de passe défini"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nom du point d\'accès"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Activation du point d\'accès <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> en cours…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Activation du point d\'accès <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> en cours…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"D\'autres appareils peuvent se connecter à <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Mot de passe du point d\'accès"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Bande du point d\'accès"</string>
@@ -1210,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Affichage fluide"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Augmente automatiquement la fréquence d\'actualisation de 60 Hz à 90 Hz pour certains contenus. Cette fonction sollicite davantage la pile de l\'appareil."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Affichage fluide"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forcer le taux d\'actualisation de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Taux d\'actualisation supérieur pour une amélioration de la réactivité tactile et de la fluidité des animations. Cette fonction sollicite davantage la pile de l\'appareil."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Écran attentif"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activé : L\'écran ne s\'éteint pas pendant que vous le regardez"</string>
@@ -1301,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Lorsque l\'écran est sombre, il s\'allume en cas de nouvelles notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Toujours affich. heure et données"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Utilisation accrue de la pile"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Mettre le texte en gras"</string>
     <string name="title_font_size" msgid="570613010306330622">"Taille de police"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Agrandissez ou réduisez le texte"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Paramètres de verrouillage SIM"</string>
@@ -1340,7 +1339,6 @@
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"NIP de carte SIM incorrect. Vous devez maintenant communiquer avec votre fournisseur de services pour déverrouiller votre appareil."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
       <item quantity="one">Le NIP de la carte SIM incorrect. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentative.</item>
-      <item quantity="many">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="other">Le NIP de la carte SIM incorrect. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentatives.</item>
     </plurals>
     <string name="wrong_pin_code_one" msgid="6924852214263071441">"NIP de module SIM incorrect. Il vous reste une tentative. Après cela, vous devrez communiquer avec votre fournisseur de services pour déverrouiller votre appareil."</string>
@@ -1350,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Version d\'Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Mise à jour de sécurité Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modèle"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modèle : %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modèle et matériel"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Version du matériel"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Equipment ID"</string>
@@ -1599,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Supprimer l\'APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nouveau nom point d\'accès"</string>
     <string name="menu_save" msgid="6611465355127483100">"Enregistrer"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Supprimer"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Annuler"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Le champ « Nom » est obligatoire."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"L\'APN est obligatoire."</string>
@@ -1614,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Les applications peuvent être réinitialisées"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Réinitialiser les paramètres Wi-Fi, cellulaires et Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Cette opération entraîne la réinitialisation de tous les paramètres réseau, y compris :\n\n"<li>"Le Wi‑Fi"</li>\n<li>"Les données cellulaires"</li>\n<li>"Le Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Effacer"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Effacer cartes SIM téléchargées"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Pour télécharger une carte SIM de remplacement, communiquez avec votre fournisseur de services. Cela n\'annulera aucun forfait de services cellulaires."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Cela n\'annulera aucun forfait de services cellulaires. Pour télécharger une carte SIM de remplacement, communiquez avec votre fournisseur de services."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Réinitialiser les paramètres"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Réinitialiser tous les paramètres réseau? Cette action est irréversible."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Réinitialiser tous les paramètres réseau et effacer les cartes SIM téléchargées? Vous ne pouvez pas annuler cette action."</string>
@@ -1625,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Les paramètres réseau ont été réinitialisés"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Impossible d\'effacer les cartes SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Les cartes SIM téléchargées ne peuvent pas être effacées en raison d\'une erreur.\n\nRedémarrez votre appareil et réessayez."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Effacer toutes les données (réinitialisation d\'usine)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Effac. ttes données (réinit.)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données utilisateur"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"Cartes eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Cela n\'annulera pas votre forfait de services cellulaires."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Effacer toutes les données (réinitialisation des paramètres par défaut)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Effacer toutes les données"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et de l\'application"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musique"</li>\n<li>"Photos"</li>\n<li>"Autres données de l\'utilisateur"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"Modules eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Cela n\'annulera pas votre forfait de services cellulaires."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Pour supprimer la musique, les photos et les autres données de l\'utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Pour supprimer la musique, les photos et les autres données de l\'utilisateur, vous devez effacer la "<b>"carte SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Effacer la mémoire de stockage USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Effacer la carte SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Effacer toutes les données de la mémoire de stockage USB interne, telles que la musique ou les photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Effacer toutes les données"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Effacer toutes les données"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Tous vos renseignements personnels et les applications téléchargées seront supprimés. Vous ne pouvez pas annuler cette action."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Tous vos renseignements personnels, y compris les applications et les cartes SIM téléchargées, seront supprimées. Vous ne pouvez pas annuler cette action."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Tout effacer"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Effacer toutes les données?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Le rétablissement des paramètres par défaut n\'est pas possible pour cet utilisateur"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Suppression en cours..."</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Veuillez patienter..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Effacer toutes les données"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Effacer toutes les données"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Tous vos renseignements personnels et les applications téléchargées seront supprimés. Vous ne pouvez pas annuler cette action."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Tous vos renseignements personnels, y compris les applications téléchargées et les modules SIM, seront supprimés. Vous ne pouvez pas annuler cette action."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Effacer toutes les données?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"La réinitialisation aux paramètres par défaut n\'est pas possible pour cet utilisateur"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Suppression en cours…"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Veuillez patienter…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Paramètres d\'appel"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configurer la messagerie vocale, le transfert d\'appel, la mise en attente d\'appels, le numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Partage de connexion par USB"</string>
@@ -1697,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Partage connexion impossible au-delà de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> appareils."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Le partage de connexion avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être annulé."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Partage connexion Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Partager la connexion Internet du téléphone par connexion Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Partager la connexion Internet du téléphone par connexion Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion cellulaire. Les applications peuvent aussi créer un point d\'accès pour partager du contenu avec d\'autres appareils à proximité."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès Internet à d\'autres appareils par l\'intermédiaire de votre connexion de données Wi-Fi ou cellulaire. Les applications peuvent aussi créer un point d\'accès pour partager du contenu avec d\'autres appareils à proximité."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Aide"</string>
@@ -1725,7 +1721,6 @@
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"Le signalement de position est désactivé"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> application sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> a accès à la position</item>
-      <item quantity="many"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps have access to location</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> applications sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ont accès à la position</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="7880996987927703141">"Accès récents à la position"</string>
@@ -1740,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Recherche d\'appareils Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Autoriser les applications et les services à rechercher les appareils à proximité en tout temps, même lorsque le Bluetooth est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Services de localisation pour le travail"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Détection du fuseau horaire basée sur la position"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Détection du fuseau horaire basée sur la position"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permet d\'utiliser la position de l\'appareil pour détecter le fuseau horaire actuel. D\'autres paramètres de localisation, comme la recherche de réseaux Wi-Fi, peuvent avoir un impact sur la précision de la détection du fuseau horaire."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activée"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Désactivée"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"La détection automatique de fuseau horaire est désactivée"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"La détection du fuseau horaire basée sur la position est désactivée"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"La détection du fuseau horaire basée sur la position n\'est pas prise en charge"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Les modifications de la détection du fuseau horaire basée sur la position ne sont pas autorisées"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Localis. via Wi-Fi et réseau mob."</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Position déterminée par le Wi-Fi"</string>
@@ -1803,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Pour util. dév. par rec. faciale, créer mot de passe"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Pour util. dév. par rec. faciale, config. schéma"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Pour util. dév. par rec. faciale, config. NIP"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Pour util. donn. bio., déf. mot de passe"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Pour util. données bio., déf. un schéma"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Pour util. données bio., défin. un NIP"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Mot de passe oublié?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Schéma oublié?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"NIP oublié?"</string>
@@ -1874,7 +1881,6 @@
     <string name="recent_app_category_title" msgid="189758417804427533">"Applications récemment ouvertes"</string>
     <plurals name="see_all_apps_title" formatted="false" msgid="6864581406735745400">
       <item quantity="one">Afficher %1$d application</item>
-      <item quantity="many">See all %1$d apps</item>
       <item quantity="other">Afficher %1$d applications</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"Contacter l\'administrateur informatique"</string>
@@ -1895,7 +1901,6 @@
     <string name="cache_size_label" msgid="313456088966822757">"Cache"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="8212425823423508096">
       <item quantity="one">%d élément</item>
-      <item quantity="many">%d items</item>
       <item quantity="other">%d éléments</item>
     </plurals>
     <string name="clear_uri_btn_text" msgid="4828117421162495134">"Supprimer l\'accès"</string>
@@ -2141,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Préférences de sous-titres"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Zoom"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Région d\'agrandissement"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Activer l\'agrandissement"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Choisir la ou les régions d\'agrandissement que vous voulez utiliser quand vous agrandissez l\'écran"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Plein écran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Partie de l\'écran"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Plein écran et partie de l\'écran"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Agrandir l\'écran entier"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Agrandir une partie de l\'écran"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Passer au bouton d\'accessibilité?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"L\'utilisation du triple toucher pour agrandir une partie de l\'écran aura pour effet de retarder l\'entrée et les autres actions.\n\nSouhaitez-vous passer à l\'utilisation du bouton d\'accessibilité pour agrandir?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Passer au bouton d\'accessibilité"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Conserver le triple toucher pour agrandir"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Paramètres d\'agrandissement"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Agrandir en touchant 3 fois"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Agrandir avec un raccourci"</string>
@@ -2201,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Interrupteur pour raccrocher"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Grand curseur de souris"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Supprimer les animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combiner les chaînes lors de la lecture audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Équilibre sonore"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Gauche"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Droite"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combiner les chaînes lors de la lecture audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Équilibre sonore"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Gauche"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Droite"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Par défaut"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 secondes"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 secondes"</string>
@@ -2235,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibration pour les notifications"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibration pour la sonnerie"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Retour tactile"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Utiliser <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Ouvrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Utiliser la correction des couleurs"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Afficher les sous-titres"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Pour l\'application prise en charge seulement"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utiliser <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Ouvrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Utiliser la correction des couleurs"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Afficher les sous-titres"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Pour l\'application prise en charge seulement"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Taille et style des sous-titres"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Taille du texte : <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Autres options"</string>
@@ -2256,7 +2264,6 @@
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> est actif"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
       <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> prothèse auditive enregistrée</item>
-      <item quantity="many"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> saved hearing aids</item>
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> prothèses auditives enregistrées</item>
     </plurals>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Raccourci activé"</string>
@@ -2270,27 +2277,24 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deutéranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Nuances de gris"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rouge-vert"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rouge-vert"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bleu-jaune"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5354221071353645263">
       <item quantity="one">Court (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
-      <item quantity="many">Short (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Court (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondes)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_medium_delay" formatted="false" msgid="1550891909800510628">
       <item quantity="one">Moyen (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
-      <item quantity="many">Medium (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Moyen (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondes)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="2230755548820485984">
       <item quantity="one">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
-      <item quantity="many">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> secondes)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_delay_unit_second" formatted="false" msgid="4537791441118261556">
       <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> seconde</item>
-      <item quantity="many"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> secondes</item>
     </plurals>
     <string name="accessibility_vibration_summary" msgid="27904038683405084">"Sonnerie : <xliff:g id="SUMMARY_RING">%1$s</xliff:g>. Notifications : <xliff:g id="SUMMARY_NOTIFICATION">%2$s</xliff:g>. Toucher : <xliff:g id="SUMMARY_TOUCH">%3$s</xliff:g>."</string>
@@ -2363,12 +2367,10 @@
     <string name="print_settings_summary_no_service" msgid="6721731154917653862">"Désactivé"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="1034273609054146099">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> service d\'impression actif</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> services d\'impression actifs</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="3933688846338306536">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> tâche d\'impression</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tâches d\'impression</item>
     </plurals>
     <string name="print_settings_title" msgid="7680498284751129935">"Services d\'impression"</string>
@@ -2405,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restriction de l\'utilisation en arrière-plan"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Autoriser l\'application à fonctionner en arrière-plan"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"L\'application n\'est pas autorisée à fonctionner en arrière-plan"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Impossible de restreindre l\'utilisation en arrière-plan"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Impossible de restreindre l\'utilisation en arrière-plan"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limiter l\'activité en arrière-plan?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer un fonctionnement instable"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Comme cette appli n\'est pas config. pour optim. la pile, vous ne pouvez pas la restr.\n\nPour la restr., activez l\'optim. de pile."</string>
@@ -2454,33 +2456,30 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"La tablette a été sollicitée plus que d\'habitude"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"L\'appareil a été sollicité plus que d\'habitude"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"La pile pourrait s\'épuiser plus tôt que d\'habitude"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimisation en fonction de la santé de la pile"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Pile limitée temporairement. Touchez ici pour en savoir plus."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Votre téléphone a été sollicité plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les applications qui ont utilisé le plus d\'énergie :"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Votre tablette a été sollicitée plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les applications qui ont utilisé le plus d\'énergie :"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Votre appareil a été sollicité plus que d\'habitude. Sa pile pourrait s\'épuiser plus rapidement que prévu.\n\nVoici les applications qui ont utilisé le plus d\'énergie :"</string>
     <string name="battery_tip_dialog_message_footer" msgid="986542164372177504">"Inclut les activités énergivores en arrière-plan"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="3108195491484891588">
       <item quantity="one">Restreindre %1$d application</item>
-      <item quantity="many">Restrict %1$d apps</item>
       <item quantity="other">Restreindre %1$d applications</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_title" formatted="false" msgid="5862649927574803958">
       <item quantity="one">%2$d application récemment restreinte</item>
-      <item quantity="many">%2$d apps recently restricted</item>
       <item quantity="other">%2$d applications récemment restreintes</item>
     </plurals>
     <plurals name="battery_tip_restrict_summary" formatted="false" msgid="3328499737453686910">
       <item quantity="one">%2$d application sollicite beaucoup la pile en arrière-plan</item>
-      <item quantity="many">%2$d apps have high background battery usage</item>
       <item quantity="other">%2$d applications sollicitent beaucoup la pile en arrière-plan</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="3036853535034350991">
       <item quantity="one">Cette application ne peut pas fonctionner en arrière-plan</item>
-      <item quantity="many">These apps can\'t run in the background</item>
       <item quantity="other">Ces applications ne peuvent pas fonctionner en arrière-plan</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="7897944678619251740">
       <item quantity="one">Restreindre %1$d application?</item>
-      <item quantity="many">Restrict %1$d apps?</item>
       <item quantity="other">Restreindre %1$d applications?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Pour économiser la pile, empêchez <xliff:g id="APP">%1$s</xliff:g> de l\'utiliser en arrière-plan. Il se peut que cette application ne fonctionne pas correctement et que les notifications soient retardées."</string>
@@ -2501,7 +2500,6 @@
     <string name="restricted_app_title" msgid="6585080822121007436">"Applications restreintes"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">
       <item quantity="one">Limitation de l\'utilisation de la pile pour %1$d application</item>
-      <item quantity="many">Limiting battery usage for %1$d apps</item>
       <item quantity="other">Limitation de l\'utilisation de la pile pour %1$d applications</item>
     </plurals>
     <string name="restricted_app_time_summary" msgid="3097721884155913252">"Application restreinte : <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -2512,10 +2510,11 @@
     <string name="battery_manager_off" msgid="673547668722420924">"Désactivé"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">
       <item quantity="one">%1$d application restreinte</item>
-      <item quantity="many">%1$d apps restricted</item>
       <item quantity="other">%1$d applications restreintes</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Un problème est survenu lors de la lecture du niveau de charge de la pile"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Un problème est survenu lors de la lecture du niveau de charge de la pile. Touchez pour "<annotation id="url">"en savoir plus"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Arrêter l\'application?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2629,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Configurer un horaire"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolonger l\'autonomie de la pile"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Désactiver lorsque l\'appareil est chargé"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g> sur votre téléphone"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g> sur votre tablette"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Le mode Économiseur de pile se désactive lorsque le niveau de charge de la pile atteint <xliff:g id="PERCENT">%1$s</xliff:g> sur votre appareil"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activer"</string>
@@ -2696,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Réinitialiser"</string>
     <string name="tts_play" msgid="2945513377250757221">"Lire"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"RPV"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Connectivité adaptative"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Prolonge l\'autonomie de la pile et améliore la performance de l\'appareil en gérant automatiquement vos connexions réseau"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Stockage des identifiants"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installer un certificat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installer les certificats à partir de la mémoire de stockage"</string>
@@ -2707,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Authentifiants d\'utilisateur"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Afficher et modifier les authentifiants stockés"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avancés"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Type de stockage"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Intégré au matériel"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Uniquement logiciel"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Les identifiants ne sont pas accessibles pour cet utilisateur"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installé pour le RPV et les applications"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installé pour le Wi-Fi"</string>
@@ -2725,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ne pas installer"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Installer quand même"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificat non installé"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Autoriser <xliff:g id="APP_NAME">%s</xliff:g> à installer des certificats sur cet appareil?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Ces certificats font en sorte que les applications et les URL ci-dessous vous reconnaissent"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Ne pas autoriser"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Autoriser"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Afficher plus d\'options"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Appli de gest. de certificats"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Aucune"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Les certificats installés par cette application permettent aux applications et aux URL ci-dessous de vous reconnaître"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Retirer"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Signal de composition d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Définir le comportement en cas d\'appel d\'urgence"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Sauvegarde"</string>
@@ -2771,7 +2778,6 @@
     <string name="notification_history_dismiss" msgid="6180321217375722918">"Récemment ignorées"</string>
     <plurals name="notification_history_count" formatted="false" msgid="1859304685071321991">
       <item quantity="one"><xliff:g id="NUMBER_1">%d</xliff:g> notification</item>
-      <item quantity="many"><xliff:g id="NUMBER_1">%d</xliff:g> notifications</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> notifications</item>
     </plurals>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="9090693401915654528">"Sonnerie et vibreur pour les appels"</string>
@@ -3021,23 +3027,19 @@
     <string name="done_button" msgid="6269449526248267">"Terminé"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="5491460811755938449">
       <item quantity="one">Faire confiance au certificat ou le supprimer</item>
-      <item quantity="many">Trust or remove certificates</item>
       <item quantity="other">Faire confiance aux certificats ou les supprimer</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="2788832560436163252">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé une autorité de certification sur votre appareil, ce qui peut leur permettre de surveiller son activité réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.</item>
-      <item quantity="many"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé des autorités de certification sur votre appareil, ce qui peut leur permettre de surveiller son activité réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ces certificats, communiquez avec votre administrateur.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="3989916958347169622">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé une autorité de certification pour votre profil professionnel, ce qui peut leur permettre de surveiller l\'activité du réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, communiquez avec votre administrateur.</item>
-      <item quantity="many"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé des autorités de certification pour votre profil professionnel, ce qui peut leur permettre de surveiller l\'activité du réseau, y compris les courriels, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ces certificats, communiquez avec votre administrateur.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Un tiers peut surveiller votre activité réseau, y compris les courriels, les applications et les sites Web sécurisés. \n\nUn certificat de confiance installé sur votre appareil rend cela possible."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
       <item quantity="one">Vérifier le certificat</item>
-      <item quantity="many">Check certificates</item>
       <item quantity="other">Vérifier les certificats</item>
     </plurals>
     <string name="user_settings_title" msgid="6550866465409807877">"Plusieurs utilisateurs"</string>
@@ -3053,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Non configuré : profil professionnel"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"Vous (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudonyme"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Vous pouvez ajouter jusqu\'à <xliff:g id="USER_COUNT">%1$d</xliff:g> utilisateurs"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
@@ -3103,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paiement à un terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configurez une application de paiement. Il suffit ensuite de poser l\'arrière de votre téléphone sur n\'importe quel terminal disposant du symbole Sans contact."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Plus..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Plus…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Définissez l\'application de paiement par défaut"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Mettez à jour l\'application de paiement par défaut"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"À un terminal sans contact, payer avec <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3173,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Précédent"</string>
     <string name="wizard_next" msgid="3884832431439072471">"SUIVANT"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Terminer"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Prendre une photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Sélectionner une image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Sélectionner une photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Cartes SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Cartes SIM"</string>
@@ -3187,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Toujours l\'utiliser pour les appels"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Sélectionnez une carte SIM pour données"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Sélectionnez la carte SIM pour les textos"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Changement de carte SIM pour les données, cela peut prendre jusqu\'à une minute..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Changement de carte SIM pour les données, cela peut prendre jusqu\'à une minute…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Appeler avec"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Sélectionnez une carte SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Carte SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3219,7 +3217,6 @@
     <string name="dashboard_title" msgid="5660733037244683387">"Paramètres"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="6585075562837786847">
       <item quantity="one">Afficher %d élément masqué</item>
-      <item quantity="many">Show %d hidden items</item>
       <item quantity="other">Afficher %d éléments masqués</item>
     </plurals>
     <string name="network_dashboard_title" msgid="788543070557731240">"Réseau et Internet"</string>
@@ -3331,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, horaire, économiseur de pile, économie d\'énergie, pile, automatique, pour cent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, appels avancés, appels 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ajouter langue, ajouter une langue"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"taille du texte"</string>
     <string name="default_sound" msgid="6604374495015245195">"Son par défaut"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Le volume pour la sonnerie et les notifications est réglé à <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibration, Ne pas déranger"</string>
@@ -3370,12 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Activation par les sons"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Transcription instantanée"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Ajouter automatiquement des sous-titres aux contenus multimédias"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Aucun"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire programmé</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires programmés</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Aucun}=1{1 horaire programmé}one{# horaire programmé}other{# horaires programmés}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne pas déranger"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Recevez uniquement les notifications des personnes et des applications importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limiter les interruptions"</string>
@@ -3443,22 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Prioritaires seulement"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activé/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Désactivé : <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Désactivé"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activé"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Toujours demander"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Jusqu\'à la désactivation"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> heure</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> heures</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutes"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire peut s\'activer automatiquement</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires peuvent s\'activer automatiquement</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 heure}one{# heure}other{# heures}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}one{# minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Désactivé}=1{Désactivé : 1 horaire peut s\'activer automatiquement}one{Désactivé : # horaire peut s\'activer automatiquement}other{Désactivé : # horaires peuvent s\'activer automatiquement}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ce qui peut interrompre le mode Ne pas déranger"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personnes"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Applications"</string>
@@ -3504,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Définir automatiquement les notifications à faible priorité sur Discrètes"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classement adaptatif des notifications"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classer automatiquement les notifications par pertinence"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Commentaires à propos des notifications adaptatives"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indiquer les ajustements apportés aux notifications et afficher l\'option de fournir des commentaires au système"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Réinitialiser l\'importance des notifications"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Réinitialiser les paramètres d\'importances modifiés par l\'utilisateur et autoriser l\'assistant des notifications à prioriser"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Suggestions d\'actions et de réponses"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Afficher automatiquement les suggestions d\'actions et de réponses"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Afficher les notifications récentes et reportées"</string>
@@ -3596,14 +3583,16 @@
     <string name="priority_conversation_count_zero" msgid="3862289535537564713">"Aucune conversation prioritaire"</string>
     <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> conversation prioritaire</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> priority conversations</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> conversations prioritaires</item>
     </plurals>
     <string name="important_conversations" msgid="1233893707189659401">"Conversations prioritaires"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Afficher dans le haut de la section des conversations comme bulles flottantes"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Afficher dans le haut de la section des conversations"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Autres conversations"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Conversations non prioritaires"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations auxquelles vous avez apporté des modifications"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Conversations récentes"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Eff. celles récentes"</string>
+    <string name="clear" msgid="5092178335409471100">"Effacer"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Afficher les conversations prioritaires en bulles"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Les conversations prioritaires s\'affichent dans le haut du volet déroulant. Vous pouvez aussi les configurer pour qu\'elles s\'affichent dans des bulles et interrompent le mode Ne pas déranger."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Les conversations prioritaires et modifiées s\'afficheront ici"</string>
@@ -3635,12 +3624,10 @@
     <string name="default_notification_assistant" msgid="243718059890346442">"Notifications adaptatives"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
       <item quantity="one">~<xliff:g id="NUMBER_1">%d</xliff:g> notification par jour</item>
-      <item quantity="many">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications per day</item>
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications par jour</item>
     </plurals>
     <plurals name="notifications_sent_weekly" formatted="false" msgid="4913443431857170519">
       <item quantity="one">~<xliff:g id="NUMBER_1">%d</xliff:g> notification par semaine</item>
-      <item quantity="many">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications per week</item>
       <item quantity="other">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications par semaine</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Jamais"</string>
@@ -3649,7 +3636,6 @@
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Les applications ne peuvent pas lire les notifications."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
       <item quantity="one">%d application peut lire les notifications</item>
-      <item quantity="many">%d apps can read notifications</item>
       <item quantity="other">%d application peuvent lire les notifications</item>
     </plurals>
     <string name="notification_assistant_title" msgid="6983941403582134437">"Notifications adaptatives"</string>
@@ -3696,7 +3682,6 @@
     <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Aucune application associée"</string>
     <plurals name="interact_across_profiles_number_of_connected_apps" formatted="false" msgid="6991750455661974772">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application connectée</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> apps connected</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications connectées</item>
     </plurals>
     <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Pour connecter ces applications, installez <xliff:g id="NAME">%1$s</xliff:g> dans votre profil professionnel"</string>
@@ -3705,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Accès à Ne pas déranger"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Autoriser le mode Ne pas déranger"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Aune application installée n\'a demandé l\'accès au mode « Ne pas déranger »"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Chargement des applications en cours..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Chargement des applications en cours…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"À votre demande, Android empêche les notifications de cette application de s\'afficher sur cet appareil"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"À 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="9096417708500595424">"À votre demande, Android empêche ce groupe de notifications de s\'afficher sur cet appareil"</string>
@@ -3713,7 +3698,6 @@
     <string name="notification_channels_other" msgid="18159805343647908">"Autre"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"Cette application n\'a publié aucune notification"</string>
@@ -3722,12 +3706,10 @@
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"Activé pour toutes les applications"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
       <item quantity="one">Désactivé pour <xliff:g id="COUNT_1">%d</xliff:g> application</item>
-      <item quantity="many">Off for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Désactivé pour <xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="5963473421547029532">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie supprimée</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories supprimées</item>
     </plurals>
     <string name="notification_toggle_on" msgid="1624283327379059003">"Activées"</string>
@@ -3800,12 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Toutes les conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversations prioritaires"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Aucune"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversation</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Aucune"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Aucune}=1{1 conversation}one{# conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Qui peut provoquer des interruptions"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Appels"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Appels"</string>
@@ -3814,12 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Pour vous assurer que les appels autorisés émettent un son, vérifiez si votre appareil est réglé pour sonner"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Pendant « <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> », les appels entrants sont bloqués. Vous pouvez régler les paramètres pour permettre à vos amis, à votre famille ou à d\'autres contacts de vous joindre."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contacts marqués d\'une étoile"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autre personne</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autres personnes</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Aucun"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Aucun}=1{{contact_1}}=2{{contact_1} et {contact_2}}=3{{contact_1}, {contact_2} et {contact_3}}one{{contact_1}, {contact_2} et # autre}other{{contact_1}, {contact_2} et # autres}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sans nom)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3828,12 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Pendant « <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> », les messages entrants sont bloqués. Vous pouvez régler les paramètres pour permettre à vos amis, à votre famille ou à d\'autres contacts de vous joindre."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Tous les messages peuvent vous parvenir"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Tous les appels peuvent vous parvenir"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Aucun"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contact</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Aucun}=1{1 contact}one{# contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Tout le monde"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contacts marqués d\'une étoile"</string>
@@ -3871,24 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Toutes les notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Quelques notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Les personnes sélectionnées peuvent toujours vous joindre, même si vous n\'autorisez pas les applications à provoquer des interruptions"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> peut provoquer des interruptions</item>
-      <item quantity="many"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> peuvent provoquer des interruptions</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> autres"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Aucune application ne peut provoquer d\'interruption}=1{{app_1} peut provoquer des interruptions}=2{{app_1} et {app_2} peuvent provoquer des interruptions}=3{{app_1}, {app_2} et {app_3} peuvent provoquer des interruptions}one{{app_1}, {app_2} et # autre application peuvent provoquer des interruptions}other{{app_1}, {app_2} et # autres applications peuvent provoquer des interruptions}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Applications"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Toutes les notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Quelques notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications qui peuvent provoquer des interruptions"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Autoriser toutes les notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peut provoquer des interruptions</item>
-      <item quantity="many"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peuvent provoquer des interruptions</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Rien ne peut provoquer d\'interruption"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> autres"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Rien ne peut provoquer d\'interruption}=1{{sound_category_1} peut provoquer des interruptions}=2{{sound_category_1} et {sound_category_2} peuvent provoquer des interruptions}=3{{sound_category_1}, {sound_category_2} et {sound_category_3} peuvent provoquer des interruptions}one{{sound_category_1}, {sound_category_2} et # autre application peuvent provoquer des interruptions}other{{sound_category_1}, {sound_category_2} et # autres applications peuvent provoquer des interruptions}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Rien ne peut provoquer d\'interruption"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Personne ne peut provoquer d\'interruption"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Certaines personnes peuvent provoquer des interruptions"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Tout le monde peut provoquer des interruptions"</string>
@@ -3913,12 +3871,10 @@
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="910047326128154945">"Ne recevoir que les alarmes sans limite de temps"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="1900512966361163390">
       <item quantity="one">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minute, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
-      <item quantity="many">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
       <item quantity="other">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="955991428001659124">
       <item quantity="one">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heure, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
-      <item quantity="many">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
       <item quantity="other">Alarmes seulement pendant <xliff:g id="DURATION">%1$d</xliff:g> heures, jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
@@ -3936,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Activé"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Désactivé"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Épinglage d\'application"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"L\'épinglage d\'écran vous permet de garder l\'application actuelle en vue jusqu\'à ce que vous annuliez l\'épinglage. Cette fonctionnalité peut être utilisée, par exemple, pour laisser un ami de confiance jouer à un certain jeu. \n\nLorsqu\'une application est épinglée, elle peut ouvrir d\'autres applications, et certaines données personnelles pourraient être accessibles. \n\nPour utiliser l\'épinglage d\'application : 	\n1.	Activez l\'épinglage d\'application 	\n2.	Ouvrez Aperçu 	\n3.	Touchez l\'icône de l\'application dans le haut de l\'écran, puis touchez Épingler"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Avec l\'épinglage d\'application, l\'application actuelle reste affichée jusqu\'à ce que vous annuliez l\'épinglage. Cette fonctionnalité peut être utilisée, par exemple, pour laisser un ami de confiance jouer à un certain jeu. \n\nLorsqu\'une application est épinglée, elle peut ouvrir d\'autres applications, et certaines données personnelles pourraient être accessibles. \n\nSi vous souhaitez partager votre appareil de manière sécuritaire, essayez d\'utiliser un profil d\'utilisateur invité à la place. \n\nPour utiliser l\'épinglage d\'application : 	\n1.	Activez l\'épinglage d\'application 	\n2.	Ouvrez Aperçu 	\n3.	Touchez l\'icône de l\'application dans le haut de l\'écran, puis touchez Épingler"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"L\'épinglage d\'écran vous permet de garder l\'application actuelle en vue jusqu\'à ce que vous annuliez l\'épinglage. Cette fonctionnalité peut être utilisée, par exemple, pour laisser un ami de confiance jouer à un certain jeu."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Lorsqu\'une application est épinglée, elle peut ouvrir d\'autres applications, et certaines données personnelles pourraient être accessibles. \n\nPour utiliser l\'épinglage d\'application : 	\n1.	Activez l\'épinglage d\'application 	\n2.	Ouvrez Aperçu 	\n3.	Touchez l\'icône de l\'application dans le haut de l\'écran, puis touchez Épingler"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Lorsqu\'une application est épinglée, elle peut ouvrir d\'autres applications, et certaines données personnelles pourraient être accessibles. \n\nSi vous souhaitez partager votre appareil de manière sécuritaire, essayez d\'utiliser un profil d\'utilisateur invité à la place. \n\nPour utiliser l\'épinglage d\'application : 	\n1.	Activez l\'épinglage d\'application 	\n2.	Ouvrez Aperçu 	\n3.	Touchez l\'icône de l\'application dans le haut de l\'écran, puis touchez Épingler"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Lorsqu\'une application est épinglée : \n\n•	 Certaines données personnelles pourraient être accessibles \n		(comme les contacts et le contenu des courriels) \n•	 L\'application épinglée peut ouvrir d\'autres applications \n\nUtilisez l\'épinglage d\'application uniquement avec les gens en qui vous avez confiance."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Demander le schéma de déverrouillage avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Demander le NIP avant d\'annuler l\'épinglage"</string>
@@ -3959,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre NIP avant que l\'appareil ne démarre, en plus de la reconnaissance du visage. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le NIP pour démarrer l\'appareil?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre schéma avant que l\'appareil ne démarre, en plus de la reconnaissance du visage. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le schéma pour démarrer l\'appareil?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre mot de passe avant que l\'appareil ne démarre, en plus de la reconnaissance du visage. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le mot de passe pour démarrer l\'appareil?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre NIP avant que l\'appareil ne démarre, en plus de l\'utilisation des données biométriques. L\'appareil ne peut pas recevoir d\'appels, de messages ni de notifications, y compris les alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le NIP pour démarrer l\'appareil?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre schéma avant que l\'appareil ne démarre, en plus de l\'utilisation des données biométriques. L\'appareil ne peut pas recevoir d\'appel, de message ni de notifications, y compris les alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le schéma pour démarrer l\'appareil?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre mot de passe avant que l\'appareil ne démarre, en plus de l\'utilisation des données biométriques. L\'appareil ne peut pas recevoir d\'appels, de messages, ni de notifications, y compris les alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger un mot de passe pour démarrer l\'appareil?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Oui"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Non"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restreinte"</string>
@@ -4000,22 +3960,18 @@
     <string name="notification_summary_channel" msgid="8459033623057872803">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="notifications_categories_off" formatted="false" msgid="1385401442703692986">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie désactivée</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories turned off</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories désactivées</item>
     </plurals>
     <plurals name="permissions_summary" formatted="false" msgid="5015472550875144481">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="2091022049141391855">
       <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> autorisation accordée sur <xliff:g id="COUNT_3">%d</xliff:g></item>
-      <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorisations accordées sur <xliff:g id="COUNT_3">%d</xliff:g></item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="5888624648943937645">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisation supplémentaire</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> additional permissions</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations supplémentaires</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"Aucune autorisation accordée"</string>
@@ -4045,7 +4001,6 @@
     <string name="domain_urls_apps_summary_off" msgid="2534980824850890416">"Aucune application ouvrant des liens compatibles"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="7864816862441985323">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application ouvrant des liens compatibles</item>
-      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications ouvrant des liens compatibles</item>
     </plurals>
     <string name="app_link_open_always" msgid="9167065494930657503">"Autoriser l\'application à gérer les liens pris en charge"</string>
@@ -4053,7 +4008,6 @@
     <string name="app_link_open_never" msgid="5299808605386052350">"Ne pas autoriser l\'application à ouvrir les liens"</string>
     <plurals name="app_link_open_always_summary" formatted="false" msgid="1816161439007251694">
       <item quantity="one">L\'application revendique <xliff:g id="COUNT_1">%d</xliff:g> lien</item>
-      <item quantity="many">App claims to handle <xliff:g id="COUNT_1">%d</xliff:g> links</item>
       <item quantity="other">L\'application revendique <xliff:g id="COUNT_1">%d</xliff:g> liens</item>
     </plurals>
     <string name="open_supported_links_footer" msgid="3188808142432787933">"L\'application réclame les liens suivants :"</string>
@@ -4096,12 +4050,10 @@
     <string name="hide_extra_apps" msgid="7313907836289865123">"Afficher utilisation des applis"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="573433136005336970">
       <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> application se comporte de manière anormale</item>
-      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> applications se comportent de manière anormale</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="8013115866788425817">
       <item quantity="one">Application qui draine la pile</item>
-      <item quantity="many">Apps draining battery</item>
       <item quantity="other">Applications qui drainent la pile</item>
     </plurals>
     <string name="high_power_filter_on" msgid="447849271630431531">"Non optimisée"</string>
@@ -4142,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB contrôlé par"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Appareil connecté"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Cet appareil"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Changement en cours…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Changement en cours…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Impossible de changer de mode"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Chargement de l\'appareil"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Chargement de l\'appareil connecté"</string>
@@ -4179,7 +4131,6 @@
     <string name="memory_usage_apps" msgid="5776108502569850579">"Mémoire utilisée par les applications"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="1355637088533572208">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> application a utilisé de la mémoire au cours de la période suivante : <xliff:g id="DURATION_1">%2$s</xliff:g></item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> apps used memory in the last <xliff:g id="DURATION_1">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications ont utilisé de la mémoire au cours de la période suivante : <xliff:g id="DURATION_1">%2$s</xliff:g></item>
     </plurals>
     <string name="running_frequency" msgid="7260225121706316639">"Fréquence"</string>
@@ -4254,7 +4205,6 @@
     <string name="data_usage_wifi_format" msgid="7644390582649568117">"<xliff:g id="AMOUNT">^1</xliff:g> utilisés sur Wi‑Fi"</string>
     <plurals name="notification_summary" formatted="false" msgid="7638388920823212470">
       <item quantity="one">Désactivé pour <xliff:g id="COUNT">%d</xliff:g> application</item>
-      <item quantity="many">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
       <item quantity="other">Désactivé pour <xliff:g id="COUNT">%d</xliff:g> applications</item>
     </plurals>
     <string name="notification_summary_none" msgid="9179312319023988089">"Activées pour toutes les applications"</string>
@@ -4321,12 +4271,10 @@
     <string name="suggestions_more_title" msgid="240124526378997009">"+<xliff:g id="ID_1">%1$d</xliff:g> autre(s)"</string>
     <plurals name="suggestions_collapsed_title" formatted="false" msgid="5023679825210836444">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
     </plurals>
     <plurals name="suggestions_collapsed_summary" formatted="false" msgid="3789011332018516832">
       <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
-      <item quantity="many">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
     </plurals>
     <string name="suggestion_remove" msgid="6753986344585367776">"Supprimer"</string>
@@ -4340,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Utilis. données cell."</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Utilisation des données des applications"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Utilisation des données Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Utilisation de données sur un réseau non cellulaire"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Utilisation de données Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4355,10 +4304,10 @@
     <string name="network_restrictions" msgid="8385824604048229846">"Restrictions réseau"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="3875128958788008975">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restriction</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Le suivi de consommation de données du fournisseur de services peut différer de celui de l\'appareil"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Les données utilisées sur les réseaux cellulaires sont exclues"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Activer une alerte"</string>
     <string name="data_warning" msgid="2925054658166062884">"Seuil d\'alerte"</string>
@@ -4370,7 +4319,6 @@
     <string name="data_usage_other_apps" msgid="5649047093607329537">"Autres applications incluses dans l\'utilisation"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> application est autorisée à ignorer les restrictions lorsque la fonction Économiseur de données est activée</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications sont autorisées à ignorer les restrictions lorsque la fonction Économiseur de données est activée</item>
     </plurals>
     <string name="data_usage_title" msgid="4039024073687469094">"Données primaires"</string>
@@ -4383,7 +4331,6 @@
     <string name="data_usage_chart_no_data_content_description" msgid="5481968839079467231">"Aucune donnée durant cette période"</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="661792524671718753">
       <item quantity="one">Il reste %d jour</item>
-      <item quantity="many">%d days left</item>
       <item quantity="other">Il reste %d jours</item>
     </plurals>
     <string name="billing_cycle_none_left" msgid="1694844019159277504">"Aucun temps restant"</string>
@@ -4396,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Afficher les détails"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Économiseur de données"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Données sans restrictions"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Les données en arrière-plan sont désactivées"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Les données en arrière-plan sont désactivées"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activé"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Désactivé"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Utiliser l\'économiseur de données"</string>
@@ -4419,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Si l\'appareil est verrouillé, empêcher l\'entrée de réponses ou de texte dans les notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Correcteur ortho par défaut"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Sélectionner correcteur ortho"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utiliser le correcteur orthographique"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Utiliser le correcteur orthographique"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Non sélectionné"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(aucun)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">" : "</string>
@@ -4457,7 +4404,6 @@
     <string name="special_access" msgid="1767980727423395147">"Accès spéciaux applis"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut utiliser les données sans restriction</item>
-      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent utiliser les données sans restriction</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"En voir plus"</string>
@@ -4496,24 +4442,21 @@
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Afficher les événements professionnels dans l\'agenda personnel"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> heure</item>
-      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> heures</item>
     </plurals>
     <plurals name="minutes" formatted="false" msgid="6244503272924425418">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
-      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="4237020272336995370">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconde</item>
-      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondes</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Gérer l\'espace de stockage"</string>
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Supprimer les photos et les vidéos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gestionnaire de stockage"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utiliser le gestionnaire de stockage"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Utiliser le gestionnaire de stockage"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatique"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Libérer de l\'espace maintenant"</string>
@@ -4551,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Toucher deux fois le téléphone pour le consulter"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Touchez l\'écran deux fois pour consulter votre tablette"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Touchez l\'écran deux fois pour consulter votre appareil"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Glisser un doigt pour afficher les notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Balayez vers le bas le bord inférieur de l\'écran pour afficher vos notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Mode Une main"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Utiliser le mode Une main"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Quitter lors du changement d\'application"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Expiration du délai"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 secondes"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 secondes"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 secondes"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accessibilité"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, toucher deux fois l\'écran."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Saisir le téléphone pour le consulter"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Saisissez la tablette pour consulter les notifications"</string>
@@ -4563,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toucher pour vérifier la tablette"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toucher pour vérifier l\'appareil"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Pour vérifier l\'heure, vos notifications et d\'autres renseignements, touchez l\'écran."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Alerte SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Utiliser la fonctionnalité Alerte SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gestion effectuée par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Démarrez les actions ci-dessous en appuyant rapidement cinq fois ou plus sur l\'interrupteur"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Faire jouer l\'alarme de compte à rebours"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Émettre un signal sonore très fort avant d\'appeler à l\'aide"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Appeler au secours"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Numéro à composer pour appeler au secours"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Toucher pour modifier"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Si vous entrez un numéro autre qu\'un numéro d\'urgence :\n • Votre appareil doit être déverrouillé pour utiliser la fonctionnalité Alerte SOS\n • Il se pourrait que personne ne réponde à votre appel"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Balayer le lecteur d\'empreintes pour voir les notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Balayer empreinte digit."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Pour consulter vos notifications, passer votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière du téléphone."</string>
@@ -4611,7 +4574,6 @@
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Le nombre d\'applications est estimé. Il peut exclure les applications installées à partir d\'une source autre que la boutique Google Play Store."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5403847001419529018">
       <item quantity="one">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> application</item>
-      <item quantity="many">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="8023838718108456971">"Autorisations de localisation"</string>
@@ -4620,7 +4582,6 @@
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="7498546659083996300">"Applications par défaut"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="8568544906431825430">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="3278314982700662246">"Clavier par défaut"</string>
@@ -4634,7 +4595,6 @@
     <string name="enterprise_privacy_ca_certs_work" msgid="4318941788592655561">"Certificats de confiance installés dans votre profil professionnel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="6459725295322004179">
       <item quantity="one">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> certificat CA</item>
-      <item quantity="many">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="other">Minimum de <xliff:g id="COUNT_1">%d</xliff:g> certificats CA</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"L\'administrateur peut verrouiller l\'appareil et réinitialiser le mot de passe"</string>
@@ -4643,7 +4603,6 @@
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Nombre maximal de tentatives d\'entrée du mot de passe avant de supprimer les données du profil professionnel"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> tentative</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentatives</item>
     </plurals>
     <string name="do_disclosure_generic" msgid="3067459392402324538">"Cet appareil est géré par votre organisation."</string>
@@ -4652,20 +4611,17 @@
     <string name="learn_more" msgid="3534519107947510952">"En savoir plus"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8112432929729136399">
       <item quantity="one">Application d\'appareil photo</item>
-      <item quantity="many">Camera apps</item>
       <item quantity="other">Applications d\'appareil photo</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="1870095225089706093">"Application d\'agenda"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"Application de contacts"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
       <item quantity="one">Application de client de courriel</item>
-      <item quantity="many">Email client apps</item>
       <item quantity="other">Applications de client de courriel</item>
     </plurals>
     <string name="default_map_app_title" msgid="7569231732944853320">"Application de carte"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="4222188821845826493">
       <item quantity="one">Application de téléphone</item>
-      <item quantity="many">Phone apps</item>
       <item quantity="other">Applications de téléphone</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8320181646458855457">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g> et <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
@@ -4695,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Nombre maximal d\'ensembles de données"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Réinitialiser aux valeurs par défaut"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Les options de remplissage automatique du concepteur ont été réinitialisées"</string>
+    <string name="location_category" msgid="3496759112306219062">"Localisation"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicateur de localisation dans la barre d\'état"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Afficher pour tous les lieux, y compris le réseau et la connectivité"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forcer les mesures GNSS complètes"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Faire le suivi de toutes les constellations et les fréquences GNSS sans cycle de tâches"</string>
     <string name="device_theme" msgid="5027604586494772471">"Thème de l\'appareil"</string>
     <string name="default_theme" msgid="4815428567082263639">"Par défaut"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nom du réseau"</string>
@@ -4711,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Suspendre les notifications pour rester concentré"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Cette fonctionnalité n\'est pas accessible"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Cette fonctionnalité a été désactivée, car elle ralentit votre téléphone"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forcer les mesures GNSS complètes"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Faire le suivi de toutes les constellations et les fréquences GNSS sans cycle de tâches"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Toujours afficher la fenêtre de plantage"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Afficher la fenêtre chaque fois qu\'une application plante"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Sélectionnez l\'application compatible avec ANGLE"</string>
@@ -4724,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activer pour toutes les applications"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Sélectionner un pilote graphique"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Par défaut"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Pilote du jeu"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Pilote du jeu"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Pilote pour concepteurs"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Pilote graphique du système"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4780,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Activé (muet)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Désactivé"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Infos sur le réseau"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Le nom de votre appareil est visible pour les applications de votre téléphone. Il est aussi possible que d\'autres personnes le voient lorsque vous vous connectez à des appareils Bluetooth ou lorsque vous configurez un point d\'accès Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Le nom de votre appareil est visible pour les applications de votre téléphone. Il est aussi possible que d\'autres personnes le voient lorsque vous vous connectez à des appareils Bluetooth ou à un réseau Wi-Fi, ou lorsque vous configurez un point d\'accès Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Appareils"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Tous les paramètres"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Suggestions"</string>
@@ -4793,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Impossible de trouver des réseaux. Réessayez."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(interdit)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Aucune carte SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Aucune carte SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Aucune"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Une carte SIM est requise pour établir la connexion"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Une carte SIM de <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> est requise pour établir la connexion"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mode réseau préféré : WCDMA de préférence"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mode réseau préféré : GSM uniquement"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mode réseau préféré : WCDMA uniquement"</string>
@@ -4846,13 +4810,13 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Données cellulaires"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accéder aux données sur réseau cellulaire"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Le téléphone passera automatiquement sur le réseau de ce fournisseur de services lorsqu\'il se trouve dans sa zone de couverture"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Aucune carte SIM n\'est accessible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Préférences d\'appel"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Préférences de messagerie texte"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Toujours demander"</string>
     <string name="mobile_network_summary_add_a_network" msgid="9079866102827526779">"Ajouter un réseau"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="5173633860800230925">
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> carte SIM</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> SIMs</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> cartes SIM</item>
     </plurals>
     <string name="default_for_calls" msgid="2788950217176988034">"Valeur par défaut pour les appels"</string>
@@ -4907,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponible lorsque vous êtes connectés au réseau de <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"En voir plus"</string>
     <string name="see_less" msgid="2642392725363552793">"En voir moins"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Activer <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Activer la carte SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Passer au réseau de <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Passer à l\'utilisation d\'une carte SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Une seule carte SIM peut être active à la fois.\n\nLe fait de passer au réseau de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'annulera pas votre service auprès de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Une seule carte SIM téléchargée peut être active à la fois.\n\nLe fait de passer au réseau de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'annulera pas votre service auprès de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Une seule carte SIM peut être active à la fois.\n\nLe fait de passer à un autre réseau n\'annulera pas votre service auprès de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Passer à <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connexion au réseau en cours…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Passage à <xliff:g id="CARRIER_NAME">%1$s</xliff:g> en cours…"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Impossible de changer de fournisseur de services"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Impossible de changer de fournisseur de services en raison d\'une erreur."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Désactiver <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Désactiver la carte SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Désactivation de la carte SIM en cours<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Impossible de désactiver le fournisseur de services"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Une erreur s\'est produite et le fournisseur de services n\'a pas pu être désactivé."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Utiliser deux cartes SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Cet appareil prend en charge deux cartes SIM actives simultanément. Pour continuer d\'utiliser une seule carte SIM à la fois, touchez « Non merci »"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Redémarrer l\'appareil?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Pour commencer, redémarrez votre appareil. Vous pourrez ensuite ajouter une carte SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continuer"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Redémarrer"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Non merci"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Changer"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Impossible d\'activer la carte SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Retirez la carte SIM, puis réinsérez-la. Si le problème persiste, redémarrez votre appareil."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Réessayer d\'activer la carte SIM. Si le problème persiste, redémarrez votre appareil."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activation du réseau"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> est actif"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Touchez l\'écran pour mettre à jour les paramètres de la carte SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Carte SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Effacer ce module SIM téléchargé?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Si vous effacez ce module SIM, le service de <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> sera retiré de cet appareil.\n\nLe service de <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ne sera pas annulé."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Effacer"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Effacement du module SIM en cours…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Impossible d\'effacer le module SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Ce module SIM ne peut pas être effacé en raison d\'une erreur.\n\nRedémarrez votre appareil et réessayez."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Se connecter à l’appareil"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"L\'application <xliff:g id="APPNAME">%1$s</xliff:g> souhaite utiliser un réseau Wi‑Fi temporaire pour se connecter à votre appareil"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Aucun appareil trouvé. Assurez-vous que l\'appareil est allumé et prêt à se connecter."</string>
@@ -4949,13 +4951,11 @@
     <string name="permission_bar_chart_details" msgid="5816698018592357088">"Tout afficher dans le tableau de bord"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="4853396794340896078">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> application</item>
-      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> applications</item>
     </plurals>
     <string name="accessibility_usage_title" msgid="9190967143518779145">"Usage des fonctions d\'accessibilité"</string>
     <plurals name="accessibility_usage_summary" formatted="false" msgid="6910643986958263005">
       <item quantity="one"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> application a l\'accès complet à votre appareil</item>
-      <item quantity="many"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> apps have full access to your device</item>
       <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> applications ont l\'accès complet à votre appareil</item>
     </plurals>
     <string name="media_output_panel_title" msgid="5920946795078065159">"Changer de sortie"</string>
@@ -4980,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Appels d\'urgence"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Votre fournisseur de services ne prend pas en charge les appels Wi‑Fi.\nL\'appareil basculera automatiquement vers le réseau cellulaire pour faire un appel urgence.\nLes appels d\'urgence sont uniquement possibles dans les régions couvertes par un réseau cellulaire."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Utiliser le Wi‑Fi pour les appels afin d\'améliorer la qualité"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Appels multi-SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Autoriser les appels et les messages texte d\'une autre carte SIM par celle-ci."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"appels multi-sim"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Message multimédia entrant"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Impossible d\'envoyer le message multimédia"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Touchez pour autor. mess. multim. sur le réseau de <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> lorsque les données cellulaires sont désactivées"</string>
@@ -5031,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Autoriser les superpos. d\'écran pour les paramètres"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Autorisez les applications qui peuvent se superposer à d\'autres à afficher du contenu par-dessus les écrans des paramètres"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Commandes multimédias"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Masquer le lecteur à la fin de la session multimédia"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Le lecteur vous permet de reprendre une session à partir du panneau Paramètres rapides développé."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Lecteur multimédia dans le menu Paramétres rapides"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Afficher le lecteur multimédia pendant une période prolongée pour reprendre la lecture facilement"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Masquer le lecteur"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Afficher le lecteur"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Aucun lecteur n\'a été trouvé"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Applications autorisées"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"commandes multimédias"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Le Bluetooth sera activé."</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Activé"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Désactivé"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Cartes SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Réseaux sécuritaires pour les avions"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Trouvez des réseaux sécuritaires pour les avions et connectez-vous-y"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sécuritaire pour les avions"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Appels et messages texte"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Appels Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Faites et recevez des appels sur des réseaux autres que des réseaux cellulaires, comme des réseaux Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"La fonctionnalité d\'appels Wi-Fi vous permet d\'effectuer des appels sur des réseaux autres que des réseaux cellulaires, comme des réseaux Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Appels"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"Messages texte"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"préféré"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"appels préférés"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"messages texte préférés"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"non accessible"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Aucune carte SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Préférences"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Se connecter aux réseaux publics"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"connexion réseau, internet, sans fil, données, wifi, wi-fi, wi fi, cellulaire, mobile, fournisseur cellulaire, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Voir réseaux sécuritaires pour les avions"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Désactiver le mode Avion"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Cette fonctionnalité n\'est pas accessible parce que le mode Nuit est activé"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"L\'importance de la notification a bien été réinitialisée."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Applications"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un appareil non vérifié souhaite accéder à vos messages. Touchez l\'écran pour en savoir plus."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Autoriser l\'accès aux messages?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un appareil Bluetooth non vérifié, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], souhaite accéder à vos messages.\n\nVous ne vous êtes jamais connecté à [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] auparavant."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un appareil non vérifié veut accéder à vos contacts et à votre journal d\'appels. Touchez l\'écran pour en savoir plus."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Autoriser l\'accès aux contacts et au journal d\'appels?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un appareil Bluetooth non vérifié, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], souhaite accéder à vos contacts et à votre journal d\'appels. Cela comprend des données concernant les appels entrants et sortants.\n\nVous ne vous êtes jamais connecté à [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] auparavant."</string>
 </resources>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 93d84fd..5ddfb13 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Moyen"</item>
     <item msgid="6740026006576843477">"Long"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Court"</item>
+    <item msgid="7397961711906421599">"Moyen"</item>
+    <item msgid="4079132024502041928">"Long"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Par défaut"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Général"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA uniquement"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3e63352..a2f0b23 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -25,7 +25,6 @@
     <string name="device_info_default" msgid="1406619232867343310">"Inconnu"</string>
     <plurals name="show_dev_countdown" formatted="false" msgid="1646187747875476269">
       <item quantity="one">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étape pour devenir développeur.</item>
-      <item quantity="many">You are now <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> steps away from being a developer.</item>
       <item quantity="other">Plus que <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> étapes pour devenir développeur.</item>
     </plurals>
     <string name="show_dev_on" msgid="2840850085134853754">"Vous êtes désormais un développeur !"</string>
@@ -209,7 +208,6 @@
     <string name="add_a_language" msgid="2126220398077503271">"Ajouter une langue"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="2845515796732609837">
       <item quantity="one">Supprimer la langue sélectionnée ?</item>
-      <item quantity="many">Remove selected languages?</item>
       <item quantity="other">Supprimer les langues sélectionnées ?</item>
     </plurals>
     <string name="dlg_remove_locales_message" msgid="8110560091134252067">"Le texte s\'affichera dans une autre langue."</string>
@@ -256,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Date et heure"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Régler la date et l\'heure"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Configurer la date, l\'heure, le fuseau horaire et les formats"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Utiliser la date et l\'heure fournies par le réseau"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Utiliser le fuseau horaire fourni par le réseau"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Définir l\'heure automatiquement"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Définir le fuseau horaire automatiquement"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Utiliser les paramètres régionaux par défaut"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Format 24 heures"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Utiliser le format 24h"</string>
@@ -298,11 +296,10 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Afficher infos de profil sur écran de verrouillage"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Comptes"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Localisation"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Utiliser ma position"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utiliser ma position"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Désactivé"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Activée - <xliff:g id="COUNT_1">%1$d</xliff:g> application a accès à votre position</item>
-      <item quantity="many">On - <xliff:g id="COUNT_1">%1$d</xliff:g> apps have access to location</item>
       <item quantity="other">Activée - <xliff:g id="COUNT_1">%1$d</xliff:g> applications ont accès à votre position</item>
     </plurals>
     <string name="location_settings_loading_app_permission_stats" msgid="6054103701535557342">"Chargement…"</string>
@@ -323,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Verrouillage de l\'écran, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Verrouillage de l\'écran, empreinte digitale"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Verrouillage de l\'écran"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Profitez du déverrouillage par visage et empreinte digitale"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Connectez-vous aux applications et confirmez les paiements"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurez le déverrouillage par :"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Déverrouillez votre téléphone facilement"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Empreinte digitale"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Déverrouillez le téléphone dans la poche"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Passer"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Suivant"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Visage ajouté"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurer Face Unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -332,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Vous authentifier avec votre visage"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Démarrer"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Si Face Unlock avec l\'option Accessibilité est désactivée, certaines étapes de configuration risquent de ne pas fonctionner correctement avec TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Retour"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Poursuivre configuration"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Utiliser config. d\'accessibilité"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -376,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Toujours demander la confirmation pour Face Unlock dans les applis"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Supprimer les données de reconnaissance faciale"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurer Face Unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Utilisez Face Unlock pour déverrouiller votre appareil, vous connecter à des applications et confirmer des paiements.\n\nÀ savoir :\nVous pouvez déverrouiller votre téléphone sans le vouloir, simplement en le regardant.\n\nQuelqu\'un d\'autre peut également le déverrouiller en le tenant devant votre visage.\n\nEnfin, une personne qui vous ressemble beaucoup, comme votre jumeau/jumelle peut également déverrouiller votre téléphone."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Utilisez Face Unlock pour déverrouiller votre appareil, vous connecter à des applications et confirmer des paiements.\n\nÀ savoir :\nVous pouvez déverrouiller votre téléphone sans le vouloir, simplement en le regardant.\n\nQuelqu\'un d\'autre peut également le déverrouiller en le tenant devant votre visage, même si vous avez les yeux fermés.\n\nEnfin, quelqu\'un qui vous ressemble beaucoup, comme votre jumeau/jumelle peut également déverrouiller votre téléphone."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Utilisez Face Unlock pour déverrouiller votre appareil, vous connecter aux applications et confirmer les paiements."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"À savoir :\nVous pouvez déverrouiller votre téléphone sans le vouloir, simplement en le regardant.\n\nQuelqu\'un d\'autre peut également le déverrouiller en le tenant devant votre visage.\n\nEnfin, une personne qui vous ressemble beaucoup, comme votre jumeau/jumelle, peut également déverrouiller votre téléphone."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"À savoir :\nVous pouvez déverrouiller votre téléphone sans le vouloir, simplement en le regardant.\n\nQuelqu\'un d\'autre peut également le déverrouiller en le tenant devant votre visage, même si vous avez les yeux fermés.\n\nEnfin, une personne qui vous ressemble beaucoup, comme votre jumeau/jumelle, peut également déverrouiller votre téléphone."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Supprimer les données de reconnaissance faciale ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Les données de reconnaissance faciale utilisées par Face Unlock seront supprimées définitivement et ce, en toute sécurité. Vous devrez alors utiliser votre code, votre schéma ou votre mot de passe pour déverrouiller votre téléphone, vous connecter aux applications et confirmer les paiements."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Utilisez Face Unlock pour déverrouiller votre téléphone"</string>
@@ -388,7 +398,6 @@
     <string name="fingerprint_enable_keyguard_toggle_title" msgid="5451094461919440992">"verrouillage de l\'écran"</string>
     <plurals name="security_settings_fingerprint_preference_summary" formatted="false" msgid="988602245530967106">
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> empreinte digitale configurée</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> fingerprints set up</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> empreintes digitales configurées</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1044059475710838504"></string>
@@ -398,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou approuver des achats.\n\nRemarque : Vous ne pouvez pas utiliser votre empreinte digitale pour déverrouiller cet appareil. Pour en savoir plus, contactez l\'administrateur de votre entreprise."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilisez votre empreinte digitale pour déverrouiller votre téléphone ou approuver des achats.\n\nRemarque : Votre empreinte digitale peut être moins sécurisée qu\'un schéma ou un code fiable."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuler"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Non, merci"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ignorer"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Suivant"</string>
@@ -435,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Si vous protégez votre tablette avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer Face Unlock. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Si vous protégez votre appareil avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer Face Unlock. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Si vous protégez votre téléphone avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. L\'option de verrouillage de l\'écran est également nécessaire pour configurer Face Unlock. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Si vous protégez votre tablette avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer l\'authentification biométrique, vous devez aussi définir une option de verrouillage de l\'écran. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Si vous protégez votre appareil avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer l\'authentification biométrique, vous devez aussi définir une option de verrouillage de l\'écran. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Si vous protégez votre téléphone avec une option de verrouillage de l\'écran, personne ne pourra l\'utiliser en cas de perte ou de vol. Pour configurer l\'authentification biométrique, vous devez aussi définir une option de verrouillage de l\'écran. Pour revenir en arrière, appuyez sur \"Annuler\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Passer la configuration du code PIN ?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Passer la configuration du mot de passe ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Passer la configuration du schéma ?"</string>
@@ -507,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cette tablette sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser cet appareil sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activez les fonctionnalités de protection de l\'appareil pour empêcher d\'autres personnes d\'utiliser ce téléphone sans votre autorisation. Choisissez la méthode de verrouillage de l\'écran à utiliser."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Choisissez une méthode supplémentaire pour verrouiller l\'écran."</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Choisissez une méthode secondaire pour verrouiller l\'écran"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Choisissez une méthode secondaire de verrouillage de l\'écran"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Options de verrouillage de l\'écran"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Options de verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Verrouillage de l\'écran"</string>
@@ -540,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face Unlock + mot de passe"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuer sans Face Unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Vous pouvez déverrouiller votre téléphone à l\'aide de votre visage. Pour plus de sécurité, cette option doit être associée à un mode de verrouillage d\'écran secondaire."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Authentification biométrique + Schéma"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Authentification biométrique + Code"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Authentification biométrique + Mot de passe"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuer sans authentification biométrique"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Vous pouvez déverrouiller votre téléphone par authentification biométrique. Pour plus de sécurité, définissez une méthode secondaire de verrouillage de l\'écran."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Désactivé par l\'admin, règles chiffrement, stockage ID"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Aucun"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Balayer l\'écran"</string>
@@ -607,68 +624,55 @@
     <string name="lock_failed_attempts_now_wiping_dialog_dismiss" msgid="170155081899679669">"Ignorer"</string>
     <plurals name="lockpassword_password_too_short" formatted="false" msgid="2192234965414232157">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT_1">%d</xliff:g> caractère</item>
-      <item quantity="many">Must be at least <xliff:g id="COUNT_1">%d</xliff:g> characters</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT_1">%d</xliff:g> caractères</item>
     </plurals>
     <plurals name="lockpassword_pin_too_short" formatted="false" msgid="6817086810898414162">
       <item quantity="one">Le code doit comporter au moins <xliff:g id="COUNT_1">%d</xliff:g> chiffre</item>
-      <item quantity="many">PIN must be at least <xliff:g id="COUNT_1">%d</xliff:g> digits</item>
       <item quantity="other">Le code doit comporter au moins <xliff:g id="COUNT_1">%d</xliff:g> chiffres</item>
     </plurals>
     <string name="lockpassword_continue_label" msgid="2507983991979547816">"Continuer"</string>
     <plurals name="lockpassword_password_too_long" formatted="false" msgid="8118091957172967677">
       <item quantity="one">Le mot de passe doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> caractère</item>
-      <item quantity="many">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> characters</item>
       <item quantity="other">Le mot de passe doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> caractères</item>
     </plurals>
     <plurals name="lockpassword_pin_too_long" formatted="false" msgid="8706992338720310765">
       <item quantity="one">Le code doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> chiffre</item>
-      <item quantity="many">Must be fewer than <xliff:g id="NUMBER_1">%d</xliff:g> digits</item>
       <item quantity="other">Le code doit contenir moins de <xliff:g id="NUMBER_1">%d</xliff:g> chiffres</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'administrateur de l\'appareil n\'autorise pas l\'utilisation d\'un code récent"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Les codes courants sont bloqués par votre administrateur informatique. Choisissez un autre code."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Vous ne pouvez pas inclure de caractère non valide."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Veuillez inclure au moins une lettre."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Veuillez inclure au moins un chiffre."</string>
     <string name="lockpassword_password_requires_symbol" msgid="6178512486154701321">"Veuillez inclure au moins un symbole."</string>
     <plurals name="lockpassword_password_requires_letters" formatted="false" msgid="2385916409676839024">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettre</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> letters</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettres</item>
     </plurals>
     <plurals name="lockpassword_password_requires_lowercase" formatted="false" msgid="2057467885488612701">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettre minuscule</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> lowercase letters</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettres minuscules</item>
     </plurals>
     <plurals name="lockpassword_password_requires_uppercase" formatted="false" msgid="4541266279643052025">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettre majuscule</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> uppercase letters</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> lettres majuscules</item>
     </plurals>
     <plurals name="lockpassword_password_requires_numeric" formatted="false" msgid="70617964591376248">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> chiffre</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> numerical digits</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> chiffres</item>
     </plurals>
     <plurals name="lockpassword_password_requires_symbols" formatted="false" msgid="7981236881269921943">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> symbole spécial</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> special symbols</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> symboles spéciaux</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonletter" formatted="false" msgid="1567877061888948467">
       <item quantity="one">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> caractère autre qu\'une lettre</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-letter characters</item>
       <item quantity="other">Le mot de passe doit comporter au moins <xliff:g id="COUNT">%d</xliff:g> caractères autre qu\'une lettre</item>
     </plurals>
     <plurals name="lockpassword_password_requires_nonnumerical" formatted="false" msgid="5056743974888384475">
       <item quantity="one">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractère non numérique</item>
-      <item quantity="many">Must contain at least <xliff:g id="COUNT">%d</xliff:g> non-numerical characters</item>
       <item quantity="other">Doit contenir au moins <xliff:g id="COUNT">%d</xliff:g> caractères non numériques</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'administrateur de l\'appareil n\'autorise pas l\'utilisation d\'un mot de passe récent"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Les mots de passe courants sont bloqués par votre administrateur informatique. Choisissez un autre mot de passe."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Les suites de chiffres croissantes, décroissantes ou répétitives ne sont pas autorisées"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmer"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Annuler"</string>
@@ -681,7 +685,6 @@
     <string name="number_of_device_admins_none" msgid="152926922020437312">"Aucune application active"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="2528735319390151989">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application active</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> active apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications actives</item>
     </plurals>
     <string name="manage_trust_agents" msgid="6410149930029992356">"Agents de confiance"</string>
@@ -689,7 +692,6 @@
     <string name="manage_trust_agents_summary" msgid="6423843123607674286">"Aucun"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="5438047398376802735">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> agent de confiance actif</item>
-      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> active trust agents</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agents de confiance actifs</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="5955341060378240781">"Bluetooth"</string>
@@ -812,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activer le Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utiliser le Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utiliser le Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Paramètres Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurer et gérer les points d\'accès sans fil"</string>
@@ -920,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrez le code QR ci-dessous pour établir la connexion à \"<xliff:g id="SSID">%1$s</xliff:g>\"."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Connectez-vous au Wi-Fi en scannant un code QR."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Partager le Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scannez ce code QR pour vous connecter à \"<xliff:g id="SSID">%1$s</xliff:g>\" et partager le mot de passe."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scannez ce code QR avec un autre appareil pour vous connecter à \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scannez ce code QR pour vous connecter à \"<xliff:g id="SSID">%1$s</xliff:g>\"."</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Réessayez. Si le problème persiste, contactez le fabricant de l\'appareil"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Un problème est survenu"</string>
@@ -946,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Mot de passe Wi-Fi : <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Mot de passe du point d\'accès : <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Connexion automatique"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Autoriser le téléphone à se connecter automatiquement lorsqu\'il se trouve à proximité de ce réseau"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Autoriser la tablette à se connecter automatiquement lorsqu\'elle se trouve à proximité de ce réseau"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Autoriser la connexion à ce réseau lorsqu\'il est à portée"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Ajouter un appareil"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Utiliser un code QR pour ajouter un appareil à ce réseau"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Le format de code QR n\'est pas valide"</string>
@@ -959,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utiliser les certificats du système"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne pas fournir"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne pas valider"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Aucun certificat indiqué. Votre connexion ne sera pas privée."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Le nom du réseau est trop long."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Vous devez spécifier un domaine."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificat requis."</string>
@@ -986,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Se connecter"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi activé"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connecté à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connexion à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connexion…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Échec de la connexion au réseau."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Réseau hors de portée"</string>
@@ -999,23 +1000,21 @@
     <string name="wifi_forget_dialog_message" msgid="8419499588321940243">"Tous les mots de passe pour ce réseau seront supprimés"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="2802436466732147888">
       <item quantity="one">%d réseau</item>
-      <item quantity="many">%d networks</item>
       <item quantity="other">%d réseaux</item>
     </plurals>
     <plurals name="wifi_saved_passpoint_access_points_summary" formatted="false" msgid="5802057518058840450">
       <item quantity="one">%d abonnement</item>
-      <item quantity="many">%d subscriptions</item>
       <item quantity="other">%d abonnements</item>
     </plurals>
     <plurals name="wifi_saved_all_access_points_summary" formatted="false" msgid="5125849180309374451">
       <item quantity="one">%d réseau et abonnement</item>
-      <item quantity="many">%d networks &amp; subscriptions</item>
       <item quantity="other">%d réseaux et abonnements</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="1234150304285575798">"Paramètres Wi-Fi avancés"</string>
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresse MAC de l\'appareil"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Adresse MAC aléatoire"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Adresse MAC aléatoire (dernière utilisée)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adresse IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Détails du réseau"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Masque de sous-réseau"</string>
@@ -1023,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Adresses IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Réseaux enregistrés"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abonnements"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Autres réseaux"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Paramètres IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Les paramètres Wi-Fi avancés ne sont pas disponibles pour cet utilisateur."</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Enregistrer"</string>
@@ -1033,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Saisissez une adresse de passerelle valide."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Saisissez une adresse DNS correcte."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Le préfixe réseau doit être compris entre 0 et 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (sauf si un DNS privé a la priorité)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (sauf si un DNS privé a la priorité)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Passerelle"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Longueur du préfixe réseau"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1060,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"L\'application partage du contenu. Pour partager la connexion Internet, désactivez le point d\'accès, puis réactivez-le"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Aucun mot de passe défini"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nom du point d\'accès"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Activation du point d\'accès \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Activation du point d\'accès <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"D\'autres appareils peuvent se connecter au point d\'accès \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Mot de passe du point d\'accès"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Bande du point d\'accès"</string>
@@ -1210,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Affichage fluide"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Augmente automatiquement la fréquence d\'actualisation de 60 à 90 Hz pour certains contenus. Accroît l\'utilisation de la batterie."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Affichage fluide"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forcer la fréquence d\'actualisation à 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Fréquence d\'actualisation la plus élevée pour améliorer la réactivité au toucher et la qualité d\'animation. Accroît l\'utilisation de la batterie."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Regard sur écran"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activé - L\'écran ne s\'éteint pas pendant que vous le regardez"</string>
@@ -1301,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Lorsque l\'écran est sombre, il s\'allume en cas de nouvelles notifications"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Toujours afficher heure et infos"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Batterie davantage sollicitée"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Mettre en gras"</string>
     <string name="title_font_size" msgid="570613010306330622">"Taille de la police"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Agrandir ou réduire le texte"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Verrouillage SIM"</string>
@@ -1340,7 +1339,6 @@
     <string name="wrong_pin_code_pukked" msgid="3414172752791445033">"Code PIN de la carte SIM incorrect. Vous devez désormais contacter votre opérateur pour déverrouiller votre appareil."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="4054088588731305475">
       <item quantity="one">Code PIN de la carte SIM erroné. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentative.</item>
-      <item quantity="many">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
       <item quantity="other">Code PIN de la carte SIM erroné. Il vous reste <xliff:g id="NUMBER_1">%d</xliff:g> tentatives.</item>
     </plurals>
     <string name="wrong_pin_code_one" msgid="6924852214263071441">"Code PIN de la carte SIM incorrect. Il vous reste 1 tentative. Après cela, vous devrez contacter votre opérateur pour déverrouiller votre appareil."</string>
@@ -1350,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Version d\'Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Mise à jour de sécurité Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modèle"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modèle : %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modèle et matériel"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Version du matériel"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID de l\'équipement"</string>
@@ -1599,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Supprimer l\'APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nouvel APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Enregistrer"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Annuler"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Annuler"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Le champ \"Nom\" est obligatoire."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"L\'APN est obligatoire."</string>
@@ -1614,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Vous pouvez réinitialiser les applications"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Réinitialiser le Wi-Fi, les données mobiles et le Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Tous les paramètres réseau seront réinitialisés, y compris les suivants :\n\n"<li>"Wi‑Fi"</li>\n<li>"Données mobiles"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Effacer"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Effacer les cartes SIM téléchargées"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Pour télécharger des cartes SIM de remplacement, contactez votre opérateur. Cela n\'entraînera la résiliation d\'aucun forfait mobile."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Cela n\'entraînera la résiliation d\'aucun forfait mobile. Pour télécharger des cartes SIM de remplacement, contactez votre opérateur."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Réinitialiser les paramètres"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Réinitialiser tous les paramètres du réseau ? Cette action est irréversible."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Réinitialiser tous les paramètres réseau et effacer les cartes SIM téléchargées ? Cette action est irréversible."</string>
@@ -1625,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Les paramètres réseau ont bien été réinitialisés."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Impossible d\'effacer les cartes SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Une erreur empêche d\'effacer les cartes SIM téléchargées.\n\nRedémarrez votre appareil et réessayez."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Effacer toutes les données (rétablir la configuration d\'usine)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Effacer données (rétablir config. d\'usine)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"La musique"</li>\n<li>"Les photos"</li>\n<li>"Les autres données utilisateur"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"Les cartes eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Cette opération n\'annulera pas votre forfait mobile."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez formater la "<b>"carte SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Effacer toutes les données (rétablir la configuration d\'usine)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Effacer données (rétablir config. d\'usine)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre tablette, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Cette action effacera toutes les données de la "<b>"mémoire de stockage interne"</b>" de votre téléphone, y compris :\n\n"<li>"Votre compte Google"</li>\n<li>"Les données et paramètres du système et des applications"</li>\n<li>"Les applications téléchargées"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Vous êtes actuellement connecté aux comptes suivants :\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"D\'autres personnes utilisent cet appareil.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"La musique"</li>\n<li>"Les photos"</li>\n<li>"Les autres données utilisateur"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"Les cartes eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Cette opération n\'annulera pas votre forfait mobile."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez effacer la "<b>"mémoire de stockage USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Pour supprimer la musique, les photos et les autres données utilisateur, vous devez formater la "<b>"carte SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Effacer la mémoire USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Formater la carte SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Effacer toutes les données de la mémoire de stockage USB interne, telles que la musique ou les photos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Effacer toutes les données de la carte SD, telles que la musique ou les photos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Effacer toutes les données"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Effacer toutes les données"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Toutes vos informations personnelles et les applications téléchargées seront supprimées. Cette action est irréversible."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Toutes vos informations personnelles, y compris les applications et les cartes SIM téléchargées, seront supprimées. Cette action est irréversible."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Tout effacer"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Les données n\'ont pas été réinitialisées, car le service de nettoyage du système n\'est pas disponible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Effacer toutes les données ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Le rétablissement de la configuration d\'usine n\'est pas disponible pour cet utilisateur."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Suppression en cours"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Veuillez patienter..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Effacer toutes les données"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Effacer toutes les données"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Toutes vos informations personnelles et les applications téléchargées seront supprimées. Cette action est irréversible."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Toutes vos informations personnelles, y compris les applications et les cartes SIM téléchargées, seront supprimées. Cette action est irréversible."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Effacer toutes les données ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Le rétablissement de la configuration d\'usine n\'est pas disponible pour cet utilisateur"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Suppression en cours"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Veuillez patienter…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Paramètres d\'appel"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Messagerie vocale, transferts d\'appel, mise en attente, numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Partage de connexion via USB"</string>
@@ -1697,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Partage connexion impossible au-delà de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> appareils."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Le partage connexion avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> va être annulé."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Partage via Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Partager la connexion Internet du téléphone via un câble Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Partager la connexion Internet du téléphone via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès à Internet à d\'autres appareils via votre connexion de données mobiles. Les applications peuvent également créer un point d\'accès pour partager du contenu avec des appareils à proximité."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilisez un point d\'accès et le partage de connexion pour fournir un accès à Internet à d\'autres appareils via votre Wi-Fi ou votre connexion de données mobiles. Les applications peuvent également créer un point d\'accès pour partager du contenu avec des appareils à proximité."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Aide"</string>
@@ -1725,7 +1721,6 @@
     <string name="location_app_permission_summary_location_off" msgid="2711822936853500335">"La localisation est désactivée"</string>
     <plurals name="location_app_permission_summary_location_on" formatted="false" msgid="8286873148858526214">
       <item quantity="one"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> application sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> a accès à votre position</item>
-      <item quantity="many"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> of <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> apps have access to location</item>
       <item quantity="other"> <xliff:g id="PERMITTED_LOCATION_APP_COUNT_2">%1$d</xliff:g> applications sur <xliff:g id="TOTAL_LOCATION_APP_COUNT_3">%2$d</xliff:g> ont accès à votre position</item>
     </plurals>
     <string name="location_category_recent_location_access" msgid="7880996987927703141">"Accès récent à votre position"</string>
@@ -1740,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Recherche Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Autoriser les applications et les services à rechercher des appareils à proximité à tout moment, même si le Bluetooth est désactivé. Cette autorisation peut permettre, par exemple, d\'améliorer les fonctionnalités et les services basés sur la localisation."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Services de localisation pour le travail"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Détection du fuseau horaire basée sur la position"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Détection du fuseau horaire basée sur la position"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Autorisez l\'utilisation de la position de l\'appareil pour détecter le fuseau horaire actuel. D\'autres paramètres de localisation tels que la recherche Wi‑Fi peuvent affecter la précision de la détection du fuseau horaire."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activée"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Désactivée"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Détection de fuseau horaire automatique désactivée"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Détection du fuseau horaire basée sur la position désactivée"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Détection du fuseau horaire basée sur la position incompatible"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Modifications de la détection du fuseau horaire basée sur la position non autorisées"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Localis. via Wi-Fi et réseaux mobiles"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Position déterminée par le Wi-Fi"</string>
@@ -1803,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Pour utiliser Face Unlock, définissez un mot de passe"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Pour utiliser Face Unlock, définissez un schéma"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Pour utiliser Face Unlock, définissez un code"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biométrie : définir le mot de passe"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biométrie : définir le schéma"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biométrie : définir le code"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Mot de passe oublié ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Schéma oublié ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Code oublié ?"</string>
@@ -1874,7 +1881,6 @@
     <string name="recent_app_category_title" msgid="189758417804427533">"Applications ouvertes récemment"</string>
     <plurals name="see_all_apps_title" formatted="false" msgid="6864581406735745400">
       <item quantity="one">Afficher l\'application</item>
-      <item quantity="many">See all %1$d apps</item>
       <item quantity="other">Afficher les %1$d applications</item>
     </plurals>
     <string name="forgot_password_title" msgid="3967873480875239885">"Contacter votre administrateur informatique"</string>
@@ -1895,7 +1901,6 @@
     <string name="cache_size_label" msgid="313456088966822757">"Cache"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="8212425823423508096">
       <item quantity="one">%d élément</item>
-      <item quantity="many">%d items</item>
       <item quantity="other">%d éléments</item>
     </plurals>
     <string name="clear_uri_btn_text" msgid="4828117421162495134">"Supprimer l\'accès"</string>
@@ -2141,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Préférences pour les sous-titres"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Agrandissement"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Zone à agrandir"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Activer l\'agrandissement"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Sélectionnez la ou les zones de l\'écran que vous souhaitez pouvoir agrandir"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Tout l\'écran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Partie de l\'écran"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Tout ou partie de l\'écran"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Agrandir tout l\'écran"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Agrandir une partie de l\'écran"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Passer au bouton Accessibilité ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Si vous appuyez trois fois pour agrandir une partie de l\'écran, la saisie et d\'autres actions pourront être retardées.\n\nVoulez-vous utiliser le bouton Accessibilité pour agrandir ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Passer au bouton Accessibilité"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Continuer à appuyer trois fois pour agrandir"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Paramètres d\'agrandissement"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Agrandir en appuyant trois fois"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Agrandir avec un raccourci"</string>
@@ -2201,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Bouton Marche/Arrêt pour raccrocher"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Grand curseur de souris"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Supprimer les animations"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combiner les chaînes lors de la lecture audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balance audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Gauche"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Droite"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combiner les chaînes lors de la lecture audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balance audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Gauche"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Droite"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Par défaut"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 secondes"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 secondes"</string>
@@ -2235,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibreur des notifications"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibreur de la sonnerie"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Retour tactile"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Utiliser <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Ouvrir la fonctionnalité <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Utiliser la correction des couleurs"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Afficher les sous-titres"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Pour les applications compatibles uniquement"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utiliser <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Ouvrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Utiliser la correction des couleurs"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Afficher les sous-titres"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Pour les applications compatibles uniquement"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Style et taille des sous-titres"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Taille de la police : <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Autres options"</string>
@@ -2256,7 +2264,6 @@
     <string name="accessibility_hearingaid_active_device_summary" msgid="509703438222873967">"Appareil \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" actif"</string>
     <plurals name="show_number_hearingaid_count" formatted="false" msgid="776000580683647556">
       <item quantity="one"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> appareil auditif enregistré</item>
-      <item quantity="many"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> saved hearing aids</item>
       <item quantity="other"><xliff:g id="NUMBER_DEVICE_COUNT_1">%1$d</xliff:g> appareils auditifs enregistrés</item>
     </plurals>
     <string name="accessibility_summary_shortcut_enabled" msgid="4030427268146752644">"Raccourci activé"</string>
@@ -2270,27 +2277,24 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deutéranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Nuances de gris"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rouge-vert"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rouge-vert"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bleu-jaune"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay" formatted="false" msgid="5354221071353645263">
       <item quantity="one">Court (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
-      <item quantity="many">Short (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Court (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_medium_delay" formatted="false" msgid="1550891909800510628">
       <item quantity="one">Moyen (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
-      <item quantity="many">Medium (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Moyen (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_preference_subtitle_long_delay" formatted="false" msgid="2230755548820485984">
       <item quantity="one">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
-      <item quantity="many">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconds)</item>
       <item quantity="other">Long (<xliff:g id="CLICK_DELAY_LABEL_1">%1$s</xliff:g> seconde)</item>
     </plurals>
     <plurals name="accessibilty_autoclick_delay_unit_second" formatted="false" msgid="4537791441118261556">
       <item quantity="one"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> seconde</item>
-      <item quantity="many"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="CLICK_DELAY_LABEL_2">%1$s</xliff:g> seconde</item>
     </plurals>
     <string name="accessibility_vibration_summary" msgid="27904038683405084">"Sonnerie : <xliff:g id="SUMMARY_RING">%1$s</xliff:g>, Notification : <xliff:g id="SUMMARY_NOTIFICATION">%2$s</xliff:g>, Appui : <xliff:g id="SUMMARY_TOUCH">%3$s</xliff:g>"</string>
@@ -2363,12 +2367,10 @@
     <string name="print_settings_summary_no_service" msgid="6721731154917653862">"Désactivé"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="1034273609054146099">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> service d\'impression activé</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> services d\'impression activés</item>
     </plurals>
     <plurals name="print_jobs_summary" formatted="false" msgid="3933688846338306536">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> tâche d\'impression</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> print jobs</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> tâches d\'impression</item>
     </plurals>
     <string name="print_settings_title" msgid="7680498284751129935">"Services d\'impression"</string>
@@ -2405,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restriction en arrière-plan"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Autoriser l\'application à s\'exécuter en arrière-plan"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Application non autorisée à s\'exécuter en arrière-plan"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"L\'utilisation en arrière-plan ne peut pas être restreinte"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"L\'utilisation en arrière-plan ne peut pas être restreinte"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limiter l\'activité en arrière-plan ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si vous limitez l\'activité en arrière-plan d\'une application, cela peut provoquer son dysfonctionnement"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Cette appli n\'étant pas configurée pour optimiser batterie, vous ne pouvez pas la limiter.\n\nActivez optimisation batterie."</string>
@@ -2454,33 +2456,30 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablette plus utilisée que d\'habitude"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Appareil plus utilisé que d\'habitude"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"La batterie pourrait s\'épuiser plus tôt que prévu"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimisation pour préserver la batterie"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batterie limitée temporairement. Appuyez sur cette notification pour en savoir plus."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Votre téléphone a été plus utilisé que d\'habitude. Il est possible que vous arriviez à court de batterie plus vite que prévu.\n\nClassement des applis par utilisation de la batterie :"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Votre tablette a été plus utilisée que d\'habitude. Il est possible que vous arriviez à court de batterie plus vite que prévu.\n\nClassement des applis par utilisation de la batterie :"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Votre appareil a été plus utilisé que d\'habitude. Il est possible que vous arriviez à court de batterie plus vite que prévu.\n\nClassement des applis par utilisation de la batterie :"</string>
     <string name="battery_tip_dialog_message_footer" msgid="986542164372177504">"Inclut les activités en arrière-plan qui sollicitent fortement la batterie"</string>
     <plurals name="battery_tip_restrict_title" formatted="false" msgid="3108195491484891588">
       <item quantity="one">Limiter %1$d application</item>
-      <item quantity="many">Restrict %1$d apps</item>
       <item quantity="other">Limiter %1$d applications</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_title" formatted="false" msgid="5862649927574803958">
       <item quantity="one">%2$d application récemment limitée</item>
-      <item quantity="many">%2$d apps recently restricted</item>
       <item quantity="other">%2$d applications récemment limitées</item>
     </plurals>
     <plurals name="battery_tip_restrict_summary" formatted="false" msgid="3328499737453686910">
       <item quantity="one">%2$d application sollicite beaucoup la batterie en arrière-plan</item>
-      <item quantity="many">%2$d apps have high background battery usage</item>
       <item quantity="other">%2$d applications sollicitent beaucoup la batterie en arrière-plan</item>
     </plurals>
     <plurals name="battery_tip_restrict_handled_summary" formatted="false" msgid="3036853535034350991">
       <item quantity="one">Cette application ne peut pas s\'exécuter en arrière-plan</item>
-      <item quantity="many">These apps can\'t run in the background</item>
       <item quantity="other">Ces applications ne peuvent pas s\'exécuter en arrière-plan</item>
     </plurals>
     <plurals name="battery_tip_restrict_app_dialog_title" formatted="false" msgid="7897944678619251740">
       <item quantity="one">Restreindre l\'application ?</item>
-      <item quantity="many">Restrict %1$d apps?</item>
       <item quantity="other">Restreindre les %1$d applications ?</item>
     </plurals>
     <string name="battery_tip_restrict_app_dialog_message" msgid="137856003724730751">"Pour économiser la batterie, empêchez <xliff:g id="APP">%1$s</xliff:g> de l\'utiliser en arrière-plan. Cette application peut ne pas fonctionner correctement et ses notifications risquent d\'être retardées."</string>
@@ -2501,7 +2500,6 @@
     <string name="restricted_app_title" msgid="6585080822121007436">"Applications dont l\'accès est limité"</string>
     <plurals name="restricted_app_summary" formatted="false" msgid="6059772951505411003">
       <item quantity="one">Limitation de l\'utilisation de la batterie pour %1$d application</item>
-      <item quantity="many">Limiting battery usage for %1$d apps</item>
       <item quantity="other">Limitation de l\'utilisation de la batterie pour %1$d applications</item>
     </plurals>
     <string name="restricted_app_time_summary" msgid="3097721884155913252">"Limitée <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -2512,10 +2510,11 @@
     <string name="battery_manager_off" msgid="673547668722420924">"Désactivé"</string>
     <plurals name="battery_manager_app_restricted" formatted="false" msgid="6714534362166394848">
       <item quantity="one">%1$d application limitée</item>
-      <item quantity="many">%1$d apps restricted</item>
       <item quantity="other">%1$d applications limitées</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Un problème est survenu au niveau de la lecture de votre outil de mesure de batterie"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Un problème est survenu au niveau de la lecture de votre outil de mesure de batterie. Appuyez sur "<annotation id="url">"En savoir plus"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Arrêter l\'application ?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Votre téléphone ne peut pas gérer la batterie 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 batterie."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Votre tablette ne peut pas gérer la batterie 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 batterie."</string>
@@ -2629,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Programmer"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolonger l\'autonomie de la batterie"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Désactiver quand la batterie est chargée"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"L\'économiseur de batterie se désactive lorsque votre téléphone atteint un niveau de charge de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"L\'économiseur de batterie se désactive lorsque votre tablette atteint un niveau de charge de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"L\'économiseur de batterie se désactive lorsque votre appareil atteint un niveau de charge de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Désactiver l\'économiseur de batterie quand le téléphone est chargé à plus de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Désactiver l\'économiseur de batterie quand la tablette est chargée à plus de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Désactiver l\'économiseur de batterie quand l\'appareil est chargé à plus de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activer"</string>
@@ -2696,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Réinitialiser"</string>
     <string name="tts_play" msgid="2945513377250757221">"Lecture"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Connectivité adaptative"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Prolonge l\'autonomie de la batterie et améliore les performances de l\'appareil en gérant automatiquement vos connexions réseau"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Stockage des identifiants"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installer un certificat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installer les certificats depuis la mémoire de stockage"</string>
@@ -2707,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Identifiants de l\'utilisateur"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Afficher et modifier les identifiants enregistrés"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Paramètres avancés"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Type de stockage"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Intégré au matériel"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Uniquement logiciel"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Les identifiants ne sont pas disponibles pour cet utilisateur."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installé pour le VPN et les applications"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installé pour le Wi-Fi"</string>
@@ -2725,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ne pas installer"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Installer quand même"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificat non installé"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Autoriser <xliff:g id="APP_NAME">%s</xliff:g> à installer des certificats sur cet appareil ?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Ces certificats vous identifieront auprès des applis et des URL ci-dessous"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Ne pas autoriser"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Autoriser"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Afficher plus"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Appli de gestion de certificats"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Aucune"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Les certificats installés par cette application vous identifient auprès des applications et des URL ci-dessous"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Supprimer"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Signal de numérotation d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Définir le comportement en cas d\'appel d\'urgence"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Sauvegarde"</string>
@@ -2771,7 +2778,6 @@
     <string name="notification_history_dismiss" msgid="6180321217375722918">"Notifications ignorées récemment"</string>
     <plurals name="notification_history_count" formatted="false" msgid="1859304685071321991">
       <item quantity="one"><xliff:g id="NUMBER_1">%d</xliff:g> notification</item>
-      <item quantity="many"><xliff:g id="NUMBER_1">%d</xliff:g> notifications</item>
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> notifications</item>
     </plurals>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="9090693401915654528">"Sonnerie et vibreur pour les appels"</string>
@@ -3021,23 +3027,19 @@
     <string name="done_button" msgid="6269449526248267">"OK"</string>
     <plurals name="ssl_ca_cert_dialog_title" formatted="false" msgid="5491460811755938449">
       <item quantity="one">Considérer le certificat comme fiable ou le supprimer</item>
-      <item quantity="many">Trust or remove certificates</item>
       <item quantity="other">Considérer les certificats comme fiables ou les supprimer</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="2788832560436163252">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé une autorité de certification sur votre appareil afin de contrôler l\'activité réseau de l\'appareil, y compris les e-mails, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, contactez votre administrateur.</item>
-      <item quantity="many"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities on your device, which may allow them to monitor your device network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé des autorités de certification sur votre appareil afin de contrôler l\'activité réseau de l\'appareil, y compris les e-mails, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ces certificats, contactez votre administrateur.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="3989916958347169622">
       <item quantity="one"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé une autorité de certification pour votre profil professionnel afin de contrôler l\'activité sur le réseau, y compris les e-mails, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ce certificat, contactez votre administrateur.</item>
-      <item quantity="many"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> has installed certificate authorities for your work profile, which may allow them to monitor work network activity, including emails, apps, and secure websites.\n\nFor more information about these certificates, contact your admin.</item>
       <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> a installé des autorités de certification pour votre profil professionnel afin de contrôler l\'activité sur le réseau, y compris les e-mails, les applications et les sites Web sécurisés.\n\nPour en savoir plus sur ces certificats, contactez votre administrateur.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"Des tiers ont la possibilité de surveiller votre activité sur le réseau, y compris en ce qui concerne les e-mails, les applications et les sites Web sécurisés.\n\nUn certificat de confiance installé sur votre appareil rend cela possible."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
       <item quantity="one">Vérifier le certificat</item>
-      <item quantity="many">Check certificates</item>
       <item quantity="other">Vérifier les certificats</item>
     </plurals>
     <string name="user_settings_title" msgid="6550866465409807877">"Utilisateurs multiples"</string>
@@ -3053,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Non configuré – Profil professionnel"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrateur"</string>
     <string name="user_you" msgid="3070562015202859996">"Vous (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudonyme"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Vous pouvez ajouter jusqu\'à <xliff:g id="USER_COUNT">%1$d</xliff:g> utilisateurs."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Seul le propriétaire de la tablette peut gérer les utilisateurs."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Seul le propriétaire du téléphone peut gérer les utilisateurs."</string>
@@ -3103,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Paiement à un terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configurez une application de paiement. Il suffit ensuite d\'approcher l\'arrière de votre appareil de n\'importe quel terminal disposant du symbole Sans contact."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Plus..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Plus…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Définir l\'application de paiement par défaut"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Modifier l\'application de paiement par défaut"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Application à utiliser au terminal de paiement sans contact : <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3173,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Retour"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Suivant"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Terminer"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Prendre une photo"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Choisir une image"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Sélectionner une photo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Cartes SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Cartes SIM"</string>
@@ -3187,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Toujours l\'utiliser pour les appels"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Sélectionnez carte SIM pour les données"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Sélectionnez une carte SIM pour les SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Changement de carte SIM en cours… Cela peut prendre jusqu\'à une minute."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Changement de carte SIM… Cela peut prendre jusqu\'à une minute."</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Appeler avec"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Sélectionnez une carte SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Carte SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3219,7 +3217,6 @@
     <string name="dashboard_title" msgid="5660733037244683387">"Paramètres"</string>
     <plurals name="settings_suggestion_header_summary_hidden_items" formatted="false" msgid="6585075562837786847">
       <item quantity="one">Afficher %d élément masqué</item>
-      <item quantity="many">Show %d hidden items</item>
       <item quantity="other">Afficher %d éléments masqués</item>
     </plurals>
     <string name="network_dashboard_title" msgid="788543070557731240">"Réseau et Internet"</string>
@@ -3331,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, planning, économiseur de batterie, économiseur d\'énergie, batterie, automatique, pourcentage"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, appel avancé, appel en 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ajouter langue, ajouter une langue"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"taille du texte"</string>
     <string name="default_sound" msgid="6604374495015245195">"Son par défaut"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume des sonneries et notifications à <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibreur, Ne pas déranger"</string>
@@ -3370,12 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sons de mise en route"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Sous-titres instantanés"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Sous-titres automatiques"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Aucune"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire défini</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> horaires définis</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires définis</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Aucune}=1{1 planification définie}one{# planification définie}other{# planifications définies}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne pas déranger"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ne recevoir des notifications que des personnes et applications importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limiter les interruptions"</string>
@@ -3443,22 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Prioritaires uniquement"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Désactivé - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Désactivé"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activé"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Toujours demander"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Jusqu\'à la désactivation"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> heure</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> hours</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> heures</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minute"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> horaire peut être activé automatiquement</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horaires peuvent être activés automatiquement</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 heure}one{# heure}other{# heures}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minute}one{# minute}other{# minutes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Désactivé}=1{Désactivé/1 planification peut être activée automatiquement}one{Désactivé/# planification peut être activée automatiquement}other{Désactivé/# planifications peuvent être activées automatiquement}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ce qui peut interrompre le mode Ne pas déranger"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personnes"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Applications"</string>
@@ -3504,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Définir automatiquement les notifications à faible priorité sur Discret"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classement intelligent des notifications"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classer automatiquement les notifications par pertinence"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Commentaires sur les notifications intelligentes"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indiquer les ajustements apportés aux notifications et afficher l\'option pour fournir des commentaires au système"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Réinitialiser les paramètres d\'importance des notifications"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Réinitialiser les paramètres d\'importance modifiés par l\'utilisateur et autoriser l\'assistant de notifications à les hiérarchiser"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Actions et réponses suggérées"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Afficher automatiquement les actions et réponses suggérées"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Afficher les notifications récentes et répétées"</string>
@@ -3596,14 +3583,16 @@
     <string name="priority_conversation_count_zero" msgid="3862289535537564713">"Aucune conversation prioritaire"</string>
     <plurals name="priority_conversation_count" formatted="false" msgid="4229447176780862649">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> conversation prioritaire</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> priority conversations</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> conversations prioritaires</item>
     </plurals>
     <string name="important_conversations" msgid="1233893707189659401">"Conversations prioritaires"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Afficher en haut de la section des conversations et sous forme de bulles flottantes"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"S\'afficher en haut de la section des conversations"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Autres conversations"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Conversations non prioritaires"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversations auxquelles vous avez apporté des modifications"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Conversations récentes"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Effacer les conversations récentes"</string>
+    <string name="clear" msgid="5092178335409471100">"Effacer"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Afficher les conversations prioritaires sous forme de bulle"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Les conversations prioritaires s\'affichent en haut du volet déroulant. Vous pouvez aussi les configurer pour s\'afficher dans des bulles et les autoriser à interrompre le mode Ne pas déranger."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Les conversations prioritaires ou modifiées s\'afficheront ici"</string>
@@ -3635,12 +3624,10 @@
     <string name="default_notification_assistant" msgid="243718059890346442">"Notifications intelligentes"</string>
     <plurals name="notifications_sent_daily" formatted="false" msgid="1479283620504341566">
       <item quantity="one">Environ <xliff:g id="NUMBER_1">%d</xliff:g> notification par jour</item>
-      <item quantity="many">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications per day</item>
       <item quantity="other">Environ <xliff:g id="NUMBER_1">%d</xliff:g> notifications par jour</item>
     </plurals>
     <plurals name="notifications_sent_weekly" formatted="false" msgid="4913443431857170519">
       <item quantity="one">Environ <xliff:g id="NUMBER_1">%d</xliff:g> notification par semaine</item>
-      <item quantity="many">~<xliff:g id="NUMBER_1">%d</xliff:g> notifications per week</item>
       <item quantity="other">Environ <xliff:g id="NUMBER_1">%d</xliff:g> notifications par semaine</item>
     </plurals>
     <string name="notifications_sent_never" msgid="9081278709126812062">"Jamais"</string>
@@ -3649,7 +3636,6 @@
     <string name="manage_notification_access_summary_zero" msgid="7528633634628627431">"Les applications ne peuvent pas lire les notifications."</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="3703008881487586312">
       <item quantity="one">%d application peut lire les notifications.</item>
-      <item quantity="many">%d apps can read notifications</item>
       <item quantity="other">%d applications peuvent lire les notifications.</item>
     </plurals>
     <string name="notification_assistant_title" msgid="6983941403582134437">"Notifications intelligentes"</string>
@@ -3696,7 +3682,6 @@
     <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Aucune application associée"</string>
     <plurals name="interact_across_profiles_number_of_connected_apps" formatted="false" msgid="6991750455661974772">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application associée</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> apps connected</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications associées</item>
     </plurals>
     <string name="interact_across_profiles_install_work_app_title" msgid="2821669067014436056">"Pour connecter ces applications, installez <xliff:g id="NAME">%1$s</xliff:g> dans votre profil professionnel"</string>
@@ -3705,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Accès au mode \"Ne pas déranger\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Autoriser le mode Ne pas déranger"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Aucune demande d\'accès \"Ne pas déranger\" n\'a été envoyée par les applications installées."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Chargement des applications en cours…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Chargement des applications…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"À votre demande, Android bloque l\'affichage des notifications de cette application sur cet appareil"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"À votre demande, Android bloque l\'affichage de cette catégorie de notifications sur cet appareil"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"À votre demande, Android bloque l\'affichage de ce groupe de notifications sur cet appareil"</string>
@@ -3713,7 +3698,6 @@
     <string name="notification_channels_other" msgid="18159805343647908">"Autres"</string>
     <plurals name="notification_group_summary" formatted="false" msgid="483490958130993160">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories</item>
     </plurals>
     <string name="no_channels" msgid="4716199078612071915">"Cette application n\'a publié aucune notification"</string>
@@ -3722,12 +3706,10 @@
     <string name="app_notification_listing_summary_zero" msgid="2988400013221120744">"Activées pour toutes les applications"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="1506127395400503717">
       <item quantity="one">Désactivé pour <xliff:g id="COUNT_1">%d</xliff:g> application</item>
-      <item quantity="many">Off for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Désactivé pour <xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="5963473421547029532">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie supprimée</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories deleted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories supprimées</item>
     </plurals>
     <string name="notification_toggle_on" msgid="1624283327379059003">"Activées"</string>
@@ -3800,12 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Toutes les conversations"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversations prioritaires"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Aucune"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversation</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Aucune"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Aucune}=1{1 conversation}one{# conversation}other{# conversations}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Personnes qui peuvent interrompre le mode Ne pas déranger"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Appels"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Appels"</string>
@@ -3814,12 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Pour que le téléphone sonne lorsque vous recevez un appel autorisé, assurez-vous d\'avoir activé la sonnerie"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Les appels entrants sont bloqués pendant la plage horaire \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Vous pouvez ajuster les paramètres pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contacts favoris"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autre</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> autres</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Aucun"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Aucun}=1{{contact_1}}=2{{contact_1} et {contact_2}}=3{{contact_1}, {contact_2} et {contact_3}}one{{contact_1}, {contact_2} et # autre contact favori}other{{contact_1}, {contact_2} et # autres contacts favoris}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sans nom)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messages"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3828,12 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Les messages entrants sont bloqués pour \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Vous pouvez ajuster les paramètres pour que vos proches ou d\'autres contacts puissent quand même vous joindre."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Vous recevez tous les messages"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Vous recevez tous les appels"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Aucun"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contact</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Aucun}=1{1 contact}one{# contact}other{# contacts}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Tout le monde"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacts"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contacts favoris"</string>
@@ -3871,24 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Toutes les notifications"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Certaines notifications"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Les personnes sélectionnées peuvent vous contacter, même si vous n\'autorisez pas les applications à interrompre le mode Ne pas déranger"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> peut interrompre le mode Ne pas déranger</item>
-      <item quantity="many"><xliff:g id="APP_NAMES">%s</xliff:g> can interrupt</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> peuvent interrompre le mode Ne pas déranger</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> autre(s)"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Aucune application ne peut interrompre le mode Ne pas déranger}=1{{app_1} peut interrompre le mode Ne pas déranger}=2{{app_1} et {app_2} peuvent interrompre le mode Ne pas déranger}=3{{app_1}, {app_2} et {app_3} peuvent interrompre le mode Ne pas déranger}one{{app_1}, {app_2} et # autre application peuvent interrompre le mode Ne pas déranger}other{{app_1}, {app_2} et # autres applications peuvent interrompre le mode Ne pas déranger}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Applications"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Toutes les notifications"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Certaines notifications"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifications qui peuvent interrompre le mode Ne pas déranger"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Autoriser toutes les notifications"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peut interrompre le mode Ne pas déranger</item>
-      <item quantity="many"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> can interrupt</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> peuvent interrompre le mode Ne pas déranger</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Rien ne peut interrompre le mode Ne pas déranger"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> autre(s)"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Rien ne peut interrompre le mode Ne pas déranger}=1{{sound_category_1} peut interrompre le mode Ne pas déranger}=2{{sound_category_1} et {sound_category_2} peuvent interrompre le mode Ne pas déranger}=3{{sound_category_1}, {sound_category_2} et {sound_category_3} peuvent interrompre le mode Ne pas déranger}one{{sound_category_1}, {sound_category_2} et # autre son peuvent interrompre le mode Ne pas déranger}other{{sound_category_1}, {sound_category_2} et # autres sons peuvent interrompre le mode Ne pas déranger}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Rien ne peut interrompre le mode Ne pas déranger"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Personne ne peut interrompre le mode Ne pas déranger"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Certaines personnes peuvent interrompre le mode Ne pas déranger"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Toutes les personnes peuvent interrompre le mode Ne pas déranger"</string>
@@ -3913,12 +3871,10 @@
     <string name="zen_mode_summary_alarms_only_indefinite" msgid="910047326128154945">"Ne recevoir que les alarmes sans limite de temps"</string>
     <plurals name="zen_mode_summary_alarms_only_by_minute" formatted="false" msgid="1900512966361163390">
       <item quantity="one">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> minute jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
-      <item quantity="many">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
       <item quantity="other">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> minutes jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <plurals name="zen_mode_summary_alarms_only_by_hour" formatted="false" msgid="955991428001659124">
       <item quantity="one">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> heure jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
-      <item quantity="many">Change to alarms only for <xliff:g id="DURATION">%1$d</xliff:g> hours until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
       <item quantity="other">Ne recevoir que les alarmes pendant <xliff:g id="DURATION">%1$d</xliff:g> heures jusqu\'à <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g></item>
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="8140619669703968810">"Ne recevoir que les alarmes jusqu\'à <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
@@ -3936,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Activé"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Désactivé"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Épinglage d\'application"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Avec l\'épinglage d\'application, l\'application actuelle reste affichée jusqu\'à ce que vous la retiriez. Cette fonctionnalité vous permet par exemple de laisser une personne de confiance jouer à un jeu spécifique. \n\nLes données à caractère personnel peuvent être accessibles, et d\'autres applications peuvent être ouvertes depuis une application épinglée. \n\nPour utiliser l\'épinglage d\'application, procédez comme suit : 	\n1.	Activez l\'épinglage d\'application. 	\n2.	Ouvrez \"Aperçu\". 	\n3.	Appuyez sur l\'icône de l\'application en haut de l\'écran, puis sur \"Épingler\"."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Avec l\'épinglage d\'application, l\'application actuelle reste affichée jusqu\'à ce que vous la retiriez. Cette fonctionnalité vous permet, par exemple, de laisser une personne de confiance jouer à un jeu spécifique. \n\nLes données à caractère personnel peuvent être accessibles, et d\'autres applications peuvent être ouvertes depuis une application épinglée. \n\nSi vous souhaitez partager votre appareil de manière sécurisée, essayez plutôt d\'utiliser un profil invité. \n\nPour utiliser l\'épinglage d\'application, procédez comme suit : 	\n1.	Activez l\'épinglage d\'application. 	\n2.	Ouvrez \"Aperçu\". 	\n3.	Appuyez sur l\'icône de l\'application en haut de l\'écran, puis sur \"Épingler\"."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Avec l\'épinglage d\'application, l\'application actuelle reste affichée jusqu\'à ce que vous la retiriez. Cette fonctionnalité vous permet, par exemple, de laisser une personne de confiance jouer à un jeu spécifique."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Les données à caractère personnel peuvent être accessibles, et d\'autres applications peuvent être ouvertes depuis une application épinglée. \n\nPour utiliser l\'épinglage d\'application, procédez comme suit : 	\n1.	Activez l\'épinglage d\'application 	\n2.	Ouvrez \"Aperçu\" 	\n3.	Appuyez sur l\'icône d\'application en haut de l\'écran, puis sur \"Épingler\""</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Les données à caractère personnel peuvent être accessibles, et d\'autres applications peuvent être ouvertes depuis une application épinglée. \n\nSi vous souhaitez partager votre appareil de manière sécurisée, essayez plutôt d\'utiliser un profil invité. \n\nPour utiliser l\'épinglage d\'application, procédez comme suit : 	\n1.	Activez l\'épinglage d\'application 	\n2.	Ouvrez \"Aperçu\" 	\n3.	Appuyez sur l\'icône d\'application en haut de l\'écran, puis sur \"Épingler\""</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Lorsqu\'une application est épinglée : \n\n•	 Les données à caractère personnel peuvent être accessibles \n (comme les contacts et le contenu des e-mails) \n•		D\'autres applications peuvent être ouvertes depuis l\'application épinglée \n\nN\'utilisez l\'épinglage d\'application qu\'avec des personnes de confiance."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Demander le schéma de déverrouillage avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Demander le code avant d\'annuler l\'épinglage"</string>
@@ -3959,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Vous pouvez renforcer la protection de votre appareil en exigeant la saisie de votre code avant qu\'il ne démarre, en plus de l\'authentification faciale pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du code avant le démarrage de votre appareil ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Vous pouvez renforcer la protection de votre appareil en exigeant la saisie de votre schéma avant qu\'il ne démarre, en plus de l\'authentification faciale pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du schéma avant le démarrage de votre appareil ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Vous pouvez renforcer la protection de votre appareil en exigeant la saisie de votre mot de passe avant qu\'il ne démarre, en plus de l\'authentification faciale pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du mot de passe avant le démarrage de votre appareil ?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Vous pouvez renforcer la protection de votre appareil en exigeant, avant qu\'il ne démarre, la saisie de votre code en plus de l\'authentification biométrique pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du code avant le démarrage de votre appareil ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Vous pouvez renforcer la protection de votre appareil en exigeant, avant qu\'il ne démarre, la saisie de votre schéma en plus de l\'authentification biométrique pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du schéma avant le démarrage de votre appareil ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Vous pouvez renforcer la protection de votre appareil en exigeant, avant qu\'il ne démarre, la saisie de votre mot de passe en plus de l\'authentification biométrique pour le déverrouiller. L\'appareil ne peut alors pas recevoir d\'appels ni de messages, ni émettre de notifications, y compris des alarmes, tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Voulez-vous exiger la saisie du mot de passe avant le démarrage de votre appareil ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Oui"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Non"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Utilisation restreinte"</string>
@@ -4000,22 +3960,18 @@
     <string name="notification_summary_channel" msgid="8459033623057872803">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
     <plurals name="notifications_categories_off" formatted="false" msgid="1385401442703692986">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> catégorie désactivée</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> categories turned off</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> catégories désactivées</item>
     </plurals>
     <plurals name="permissions_summary" formatted="false" msgid="5015472550875144481">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisation accordée</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations accordées</item>
     </plurals>
     <plurals name="runtime_permissions_summary" formatted="false" msgid="2091022049141391855">
       <item quantity="one"><xliff:g id="COUNT_2">%d</xliff:g> autorisation accordée sur <xliff:g id="COUNT_3">%d</xliff:g></item>
-      <item quantity="many"><xliff:g id="COUNT_2">%d</xliff:g> of <xliff:g id="COUNT_3">%d</xliff:g> permissions granted</item>
       <item quantity="other"><xliff:g id="COUNT_2">%d</xliff:g> autorisations accordées sur <xliff:g id="COUNT_3">%d</xliff:g></item>
     </plurals>
     <plurals name="runtime_permissions_additional_count" formatted="false" msgid="5888624648943937645">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> autorisation supplémentaire</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> additional permissions</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> autorisations supplémentaires</item>
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="7456745929035665029">"Aucune autorisation accordée"</string>
@@ -4045,7 +4001,6 @@
     <string name="domain_urls_apps_summary_off" msgid="2534980824850890416">"Aucune application ouvrant des liens compatibles"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="7864816862441985323">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application ouvrant des liens compatibles</item>
-      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> apps opening supported links</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications ouvrant des liens compatibles</item>
     </plurals>
     <string name="app_link_open_always" msgid="9167065494930657503">"Autoriser l\'application à ouvrir les liens compatibles"</string>
@@ -4053,7 +4008,6 @@
     <string name="app_link_open_never" msgid="5299808605386052350">"Ne pas autoriser l\'application à ouvrir les liens compatibles"</string>
     <plurals name="app_link_open_always_summary" formatted="false" msgid="1816161439007251694">
       <item quantity="one">L\'application revendique <xliff:g id="COUNT_1">%d</xliff:g> lien</item>
-      <item quantity="many">App claims to handle <xliff:g id="COUNT_1">%d</xliff:g> links</item>
       <item quantity="other">L\'application revendique <xliff:g id="COUNT_1">%d</xliff:g> liens</item>
     </plurals>
     <string name="open_supported_links_footer" msgid="3188808142432787933">"L\'application revendique les liens suivants :"</string>
@@ -4096,12 +4050,10 @@
     <string name="hide_extra_apps" msgid="7313907836289865123">"Afficher utilisation appli"</string>
     <plurals name="power_high_usage_summary" formatted="false" msgid="573433136005336970">
       <item quantity="one"><xliff:g id="NUMBER">%2$d</xliff:g> application a un comportement anormal</item>
-      <item quantity="many"><xliff:g id="NUMBER">%2$d</xliff:g> apps behaving abnormally</item>
       <item quantity="other"><xliff:g id="NUMBER">%2$d</xliff:g> applications ont un comportement anormal</item>
     </plurals>
     <plurals name="power_high_usage_title" formatted="false" msgid="8013115866788425817">
       <item quantity="one">Une application décharge la batterie</item>
-      <item quantity="many">Apps draining battery</item>
       <item quantity="other">Des applications déchargent la batterie</item>
     </plurals>
     <string name="high_power_filter_on" msgid="447849271630431531">"Non optimisées"</string>
@@ -4142,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Connexion USB contrôlée par"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Appareil connecté"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Cet appareil"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Changement…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Changement…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Échec du changement"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Recharge de l\'appareil"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Recharge de l\'appareil connecté"</string>
@@ -4179,7 +4131,6 @@
     <string name="memory_usage_apps" msgid="5776108502569850579">"Mémoire utilisée par les applications"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="1355637088533572208">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> application a utilisé de la mémoire au cours de la période suivante : <xliff:g id="DURATION_1">%2$s</xliff:g>.</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> apps used memory in the last <xliff:g id="DURATION_1">%2$s</xliff:g></item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications ont utilisé de la mémoire au cours de la période suivante : <xliff:g id="DURATION_1">%2$s</xliff:g>.</item>
     </plurals>
     <string name="running_frequency" msgid="7260225121706316639">"Fréquence"</string>
@@ -4254,7 +4205,6 @@
     <string name="data_usage_wifi_format" msgid="7644390582649568117">"<xliff:g id="AMOUNT">^1</xliff:g> utilisés sur le réseau Wi-Fi"</string>
     <plurals name="notification_summary" formatted="false" msgid="7638388920823212470">
       <item quantity="one">Désactivé pour <xliff:g id="COUNT">%d</xliff:g> application</item>
-      <item quantity="many">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
       <item quantity="other">Désactivé pour <xliff:g id="COUNT">%d</xliff:g> applications</item>
     </plurals>
     <string name="notification_summary_none" msgid="9179312319023988089">"Activées pour toutes les applications"</string>
@@ -4321,12 +4271,10 @@
     <string name="suggestions_more_title" msgid="240124526378997009">"+<xliff:g id="ID_1">%1$d</xliff:g> autres"</string>
     <plurals name="suggestions_collapsed_title" formatted="false" msgid="5023679825210836444">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
     </plurals>
     <plurals name="suggestions_collapsed_summary" formatted="false" msgid="3789011332018516832">
       <item quantity="one">+<xliff:g id="COUNT">%1$d</xliff:g> suggestion</item>
-      <item quantity="many">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
       <item quantity="other">+<xliff:g id="COUNT">%1$d</xliff:g> suggestions</item>
     </plurals>
     <string name="suggestion_remove" msgid="6753986344585367776">"Supprimer"</string>
@@ -4340,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Conso données mobiles"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Consommation de données des applications"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Conso données Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Consommation des données hors opérateur"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Consommation de données Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4355,10 +4304,10 @@
     <string name="network_restrictions" msgid="8385824604048229846">"Restrictions sur le réseau"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="3875128958788008975">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restriction</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Le suivi de consommation de votre opérateur peut différer de celui qui est effectué sur votre appareil."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Les données consommées via les réseaux d\'opérateurs sont exclues"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> utilisé(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Définir un seuil d\'avertissement"</string>
     <string name="data_warning" msgid="2925054658166062884">"Seuil d\'avertissement"</string>
@@ -4370,7 +4319,6 @@
     <string name="data_usage_other_apps" msgid="5649047093607329537">"Autres applications incluses dans la consommation"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="3316296488378947221">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> application est autorisée à utiliser des données sans restrictions lorsque l\'économiseur de données est activé</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications sont autorisées à utiliser des données sans restrictions lorsque l\'économiseur de données est activé</item>
     </plurals>
     <string name="data_usage_title" msgid="4039024073687469094">"Données principales"</string>
@@ -4383,7 +4331,6 @@
     <string name="data_usage_chart_no_data_content_description" msgid="5481968839079467231">"Aucune donnée disponible pour cette plage de dates"</string>
     <plurals name="billing_cycle_days_left" formatted="false" msgid="661792524671718753">
       <item quantity="one">%d jour restant</item>
-      <item quantity="many">%d days left</item>
       <item quantity="other">%d jours restants</item>
     </plurals>
     <string name="billing_cycle_none_left" msgid="1694844019159277504">"Le cycle de facturation est arrivé à échéance"</string>
@@ -4396,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Afficher les détails"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Économiseur de données"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Données sans restrictions"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Les données en arrière-plan sont désactivées."</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Les données en arrière-plan sont désactivées"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activé"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Désactivé"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Utiliser l\'économiseur de données"</string>
@@ -4419,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Si l\'appareil est verrouillé, empêcher la saisie des réponses ou de texte dans les notifications"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Correcteur par défaut"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Sélectionner le correcteur"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utiliser le correcteur orthographique"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Utiliser le correcteur orthographique"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Non sélectionné"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(aucun)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">" : "</string>
@@ -4457,7 +4404,6 @@
     <string name="special_access" msgid="1767980727423395147">"Accès spécifiques des applications"</string>
     <plurals name="special_access_summary" formatted="false" msgid="4995506406763570815">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut utiliser les données sans restrictions</item>
-      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent utiliser les données sans restrictions</item>
     </plurals>
     <string name="special_access_more" msgid="132919514147475846">"En savoir plus"</string>
@@ -4496,24 +4442,21 @@
     <string name="cross_profile_calendar_summary" msgid="8856185206722860069">"Afficher les événements professionnels dans votre agenda personnel"</string>
     <plurals name="hours" formatted="false" msgid="1853396353451635458">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> heure</item>
-      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> hours</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> heures</item>
     </plurals>
     <plurals name="minutes" formatted="false" msgid="6244503272924425418">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> minute</item>
-      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> minutes</item>
     </plurals>
     <plurals name="seconds" formatted="false" msgid="4237020272336995370">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> seconde</item>
-      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> seconds</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> secondes</item>
     </plurals>
     <string name="automatic_storage_manager_settings" msgid="519158151463974656">"Gérer l\'espace de stockage"</string>
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Pour libérer de l\'espace de stockage, le gestionnaire d\'espace de stockage supprime des photos et des vidéos sauvegardées sur votre appareil."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Supprimer des photos et des vidéos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gestionnaire d\'espace de stockage"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utiliser le gestionnaire d\'espace de stockage"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Utiliser le gestionnaire d\'espace de stockage"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatique"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuels"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Libérer de l\'espace maintenant"</string>
@@ -4551,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Appuyer deux fois sur le téléphone pour le consulter"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Appuyez deux fois sur la tablette pour la consulter"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Appuyez deux fois sur l\'appareil pour le consulter"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Balayer pour notifications"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Balayez l\'écran vers le bas pour afficher vos notifications"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Mode une main"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Utiliser le mode une main"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Quitter le mode lors du changement d\'applications"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Délai inactivité"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 secondes"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 secondes"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 secondes"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accessibilité"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Pour afficher l\'heure, les notifications et d\'autres informations, appuyez deux fois sur l\'écran."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Saisir le téléphone pour le consulter"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Saisir la tablette pour la consulter"</string>
@@ -4563,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Appuyer pour vérifier la tablette"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Appuyer pour vérifier l\'appareil"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Pour afficher l\'heure, les notifications et d\'autres informations, appuyez sur l\'écran."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Utiliser la fonctionnalité SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Géré par <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Lancez les actions ci-dessous en appuyant rapidement cinq fois ou plus sur le bouton Marche/Arrêt"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Émettre un compte à rebours"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Émettre un signal sonore très fort avant d\'appeler à l\'aide"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Demander de l\'aide"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Numéro d\'urgence"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g> (appuyer pour modifier la sélection)"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Si vous saisissez un numéro autre que celui des services d\'urgence :\n • Votre appareil doit être déverrouillé pour que vous puissiez passer un appel d\'urgence.\n • Il est possible que votre appel ne soit pas traité."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Balayer le lecteur d\'empreinte digitale pour voir les notifications"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Balayer lecteur empreinte"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière du téléphone."</string>
@@ -4611,7 +4574,6 @@
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7959907857710107792">"Le nombre d\'applications est une estimation. Il est possible qu\'il n\'inclue pas les applications installées sans passer par le Play Store."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="5403847001419529018">
       <item quantity="one">Au moins <xliff:g id="COUNT_1">%d</xliff:g> application</item>
-      <item quantity="many">Minimum <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other">Au moins <xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <string name="enterprise_privacy_location_access" msgid="8023838718108456971">"Autorisations de localisation"</string>
@@ -4620,7 +4582,6 @@
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="7498546659083996300">"Applications par défaut"</string>
     <plurals name="enterprise_privacy_number_packages" formatted="false" msgid="8568544906431825430">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> application</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> applications</item>
     </plurals>
     <string name="enterprise_privacy_input_method" msgid="3278314982700662246">"Clavier par défaut"</string>
@@ -4634,7 +4595,6 @@
     <string name="enterprise_privacy_ca_certs_work" msgid="4318941788592655561">"Certificats de confiance dans votre profil professionnel"</string>
     <plurals name="enterprise_privacy_number_ca_certs" formatted="false" msgid="6459725295322004179">
       <item quantity="one">Au moins <xliff:g id="COUNT_1">%d</xliff:g> certificat CA</item>
-      <item quantity="many">Minimum <xliff:g id="COUNT_1">%d</xliff:g> CA certificates</item>
       <item quantity="other">Au moins <xliff:g id="COUNT_1">%d</xliff:g> certificats CA</item>
     </plurals>
     <string name="enterprise_privacy_lock_device" msgid="464054894363899866">"L\'administrateur peut verrouiller l\'appareil et réinitialiser le mot de passe"</string>
@@ -4643,7 +4603,6 @@
     <string name="enterprise_privacy_failed_password_wipe_work" msgid="2537582942554484170">"Tentatives de saisie du mot de passe avant la suppression des données du profil professionnel"</string>
     <plurals name="enterprise_privacy_number_failed_password_wipe" formatted="false" msgid="8811973918944217791">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> tentative</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%d</xliff:g> attempts</item>
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> tentatives</item>
     </plurals>
     <string name="do_disclosure_generic" msgid="3067459392402324538">"Cet appareil est géré par votre organisation."</string>
@@ -4652,20 +4611,17 @@
     <string name="learn_more" msgid="3534519107947510952">"En savoir plus"</string>
     <plurals name="default_camera_app_title" formatted="false" msgid="8112432929729136399">
       <item quantity="one">Appareil photo</item>
-      <item quantity="many">Camera apps</item>
       <item quantity="other">Appareil photo</item>
     </plurals>
     <string name="default_calendar_app_title" msgid="1870095225089706093">"Agenda"</string>
     <string name="default_contacts_app_title" msgid="7740028900741944569">"Contacts"</string>
     <plurals name="default_email_app_title" formatted="false" msgid="8338194872609410234">
       <item quantity="one">Client de messagerie</item>
-      <item quantity="many">Email client apps</item>
       <item quantity="other">Client de messagerie</item>
     </plurals>
     <string name="default_map_app_title" msgid="7569231732944853320">"Cartes"</string>
     <plurals name="default_phone_app_title" formatted="false" msgid="4222188821845826493">
       <item quantity="one">Téléphone</item>
-      <item quantity="many">Phone apps</item>
       <item quantity="other">Téléphone</item>
     </plurals>
     <string name="app_names_concatenation_template_2" msgid="8320181646458855457">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>"</string>
@@ -4695,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Nombre maximal d\'ensembles de données visibles"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Rétablir les valeurs par défaut"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Les options de saisie automatique du développeur ont été réinitialisées"</string>
+    <string name="location_category" msgid="3496759112306219062">"Localisation"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicateur de localisation dans la barre d\'état"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Afficher pour tous les emplacements, y compris le réseau et la connectivité"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forcer les mesures GNSS complètes"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Effectuer le suivi de toutes les fréquences et constellations GNSS sans rapport cyclique"</string>
     <string name="device_theme" msgid="5027604586494772471">"Thème de l\'appareil"</string>
     <string name="default_theme" msgid="4815428567082263639">"Par défaut"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nom du réseau"</string>
@@ -4711,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Suspendre les notifications pour rester concentré"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Fonctionnalité non disponible"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Cette fonctionnalité a été désactivée, car elle ralentit votre téléphone"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forcer les mesures GNSS complètes"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Effectuer le suivi de toutes les fréquences et constellations GNSS sans rapport cyclique"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Toujours afficher une boîte de dialogue en cas de plantage"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Afficher une boîte de dialogue chaque fois qu\'une application plante"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Sélectionner une application compatible avec ANGLE"</string>
@@ -4724,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activer pour toutes les applications"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Sélectionner un pilote graphique"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Par défaut"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Pilote de jeu"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Pilote de jeu"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Pilote pour les développeurs"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Pilote graphique du système"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4780,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Activé (son coupé)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Désactivé"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Détails du réseau"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Le nom de votre appareil est visible par les applications installées sur votre téléphone. Il peut l\'être également par d\'autres personnes en cas de connexion à des appareils Bluetooth ou de configuration d\'un point d\'accès Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Les applications de votre téléphone ont accès au nom de votre appareil. D\'autres personnes peuvent aussi le voir lorsque vous vous connectez à des appareils Bluetooth ou à un réseau Wi-Fi, ou lorsque vous configurez un point d\'accès Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Appareils"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Tous les paramètres"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Suggestions"</string>
@@ -4793,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Réseaux introuvables. Veuillez réessayer."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(interdit)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Pas de carte SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Aucune carte SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Aucune information"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM requise pour la connexion"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> requise pour la connexion"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mode réseau préféré : WCDMA de préférence"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mode réseau préféré : GSM uniquement"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mode réseau préféré : WCDMA uniquement"</string>
@@ -4846,13 +4810,13 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Données mobiles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accéder aux données via le réseau mobile"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Le téléphone basculera automatiquement sur cet opérateur lorsqu\'il sera à portée"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Aucune carte SIM disponible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Préférences pour les appels"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Préférences pour les SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Toujours demander"</string>
     <string name="mobile_network_summary_add_a_network" msgid="9079866102827526779">"Ajouter un réseau"</string>
     <plurals name="mobile_network_summary_count" formatted="false" msgid="5173633860800230925">
       <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> carte SIM</item>
-      <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> SIMs</item>
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> cartes SIM</item>
     </plurals>
     <string name="default_for_calls" msgid="2788950217176988034">"Utiliser par défaut pour les appels"</string>
@@ -4907,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponible lorsque connecté à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Voir plus"</string>
     <string name="see_less" msgid="2642392725363552793">"Moins de détails"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Activer <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Activer la carte SIM ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Passer à <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Passer à l\'utilisation de la carte SIM ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Vous ne pouvez activer qu\'une seule carte SIM à la fois.\n\nLe passage à <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'entraînera pas la résiliation de votre service <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Vous ne pouvez activer qu\'une seule carte SIM téléchargée à la fois.\n\nLe passage à <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> n\'entraînera pas la résiliation de votre service <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Vous ne pouvez activer qu\'une seule carte SIM à la fois.\n\nCe changement n\'entraînera pas la résiliation de votre service <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Passer à <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connexion au réseau…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Passage à <xliff:g id="CARRIER_NAME">%1$s</xliff:g>…"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Impossible de changer d\'opérateur"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Impossible de changer d\'opérateur en raison d\'une erreur."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Désactiver <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Désactiver la carte SIM ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Désactivation de la carte SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Impossible de désactiver l\'opérateur"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Un problème a empêché l\'appareil de désactiver votre opérateur."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Utiliser deux cartes SIM ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Cet appareil peut posséder deux cartes SIM actives en même temps. Pour continuer à utiliser une seule carte SIM à la fois, appuyez sur \"Non, merci\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Redémarrer l\'appareil ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Pour commencer, redémarrez votre appareil. Vous pouvez ensuite ajouter une autre carte SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continuer"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Redémarrer"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Non, merci"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Changer"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Impossible d\'activer la carte SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Retirez la carte SIM et insérez-la de nouveau. Si le problème persiste, redémarrez l\'appareil."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Essayez à nouveau d\'activer la carte SIM. Si le problème persiste, redémarrez l\'appareil."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activation du réseau"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> est actif"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Appuyez pour mettre à jour les paramètres de la carte SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Carte SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Effacer cette carte SIM téléchargée ?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"L\'effacement de cette carte SIM va supprimer le service <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> de cet appareil.\n\nLe service pour <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ne sera pas annulé."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Effacer"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Effacement de la carte SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Impossible d\'effacer la carte SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Une erreur empêche l\'effacement de cette carte SIM.\n\nRedémarrez votre appareil et réessayez."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connexion à l\'appareil"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"L\'application <xliff:g id="APPNAME">%1$s</xliff:g> souhaite utiliser un réseau Wi‑Fi temporaire pour établir la connexion à votre appareil"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Aucun appareil trouvé. Assurez-vous que des appareils soient activés et prêts à être connectés."</string>
@@ -4949,13 +4951,11 @@
     <string name="permission_bar_chart_details" msgid="5816698018592357088">"Tout afficher dans le tableau de bord"</string>
     <plurals name="permission_bar_chart_label" formatted="false" msgid="4853396794340896078">
       <item quantity="one"><xliff:g id="NUMBER">%s</xliff:g> application</item>
-      <item quantity="many"><xliff:g id="NUMBER">%s</xliff:g> apps</item>
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> applications</item>
     </plurals>
     <string name="accessibility_usage_title" msgid="9190967143518779145">"Utilisation de l\'accessibilité"</string>
     <plurals name="accessibility_usage_summary" formatted="false" msgid="6910643986958263005">
       <item quantity="one"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> application bénéficie d\'un accès complet à votre appareil</item>
-      <item quantity="many"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> apps have full access to your device</item>
       <item quantity="other"><xliff:g id="SERVICE_COUNT">%1$d</xliff:g> applications bénéficient d\'un accès complet à votre appareil</item>
     </plurals>
     <string name="media_output_panel_title" msgid="5920946795078065159">"Changer de sortie"</string>
@@ -4980,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Appels d\'urgence"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Les appels d\'urgence via la fonctionnalité Appels Wi-Fi ne sont pas compatibles avec votre opérateur.\nL\'appareil basculera automatiquement sur un réseau mobile pour passer un appel d\'urgence.\nLes appels d\'urgence sont possibles uniquement dans les zones couvertes par le réseau mobile."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Utiliser le Wi-Fi pour les appels afin d\'améliorer leur qualité"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Appels par cartes SIM croisées"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Autoriser les appels et les SMS via une autre carte SIM sur cette carte SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"appels par cartes SIM croisées"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"MMS entrant"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Impossible d\'envoyer le MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Appuyez ici pour autoriser les MMS avec <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> lorsque les données mobiles sont désactivées"</string>
@@ -5031,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Autoriser superpositions d\'écran dans paramètres"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Autoriser les applications pouvant se superposer à d\'autres à se superposer aux écrans de paramètres"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimédia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Masquer le lecteur à la fin de la session multimédia"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Le lecteur vous permet de reprendre une session depuis la fenêtre de configuration rapide une fois celle-ci développée."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Lecteur multimédia dans la fenêtre de configuration rapide"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Afficher le lecteur multimédia pendant une période prolongée pour reprendre la lecture facilement"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Masquer le lecteur"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Afficher le lecteur"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Aucun lecteur disponible"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Applications autorisées"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"Multimédia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Le Bluetooth sera activé"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Activé"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Désactivé"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Cartes SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Réseaux acceptés dans les avions"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Rechercher les réseaux acceptés dans les avions et s\'y connecter"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, accepté dans les avions"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Appels et SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Appels Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Passer et recevoir des appels sur des réseaux non gérés par des opérateurs, comme le Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"La fonctionnalité Appels Wi-Fi vous permet de passer et de recevoir des appels sur des réseaux non gérés par des opérateurs, comme certains réseaux Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Appels"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"mode préféré"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"appels préférés"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS préférés"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"non disponible"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Aucune carte SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Préférences"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Se connecter aux réseaux publics"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"connexion réseau, internet, sans fil, données, wifi, wi-fi, wi fi, cellulaire, mobile, opérateur mobile, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Afficher les réseaux acceptés en avion"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Désactivez le mode Avion"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Indisponible, car le mode Heure du coucher est activé"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"L\'importance de la notification a bien été réinitialisée."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Applications"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un appareil non vérifié souhaite accéder à vos messages. Appuyez ici pour plus de détails."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Autoriser l\'accès aux messages ?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un appareil Bluetooth non vérifié, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], souhaite accéder à vos messages.\n\nVous ne vous êtes jamais connecté à [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] auparavant."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un appareil non vérifié souhaite accéder à vos contacts et à votre journal d\'appels. Appuyez ici pour plus de détails."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Autoriser l\'accès aux contacts et au journal d\'appels ?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un appareil Bluetooth non vérifié, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], souhaite accéder à vos contacts et à votre journal d\'appels. Ceci inclut des données concernant les appels entrants et sortants.\n\nVous ne vous êtes jamais connecté à [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] auparavant."</string>
 </resources>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 7aa91b8..8db0ce1 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medio"</item>
     <item msgid="6740026006576843477">"Longo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Curto"</item>
+    <item msgid="7397961711906421599">"Medio"</item>
+    <item msgid="4079132024502041928">"Longo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predeterminado"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA e LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Só TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 5bd814e..8b0e44b 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Data e hora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Definir data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Axusta a data, a hora, o fuso horario e os formatos"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Usar hora indicada pola rede"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Usar fuso horario indicado pola rede"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Definir hora automaticamente"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Definir zona horaria automaticamente"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar configuración rexional predeterminada"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usar formato de 24 horas"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar info do perfil na pantalla de bloqueo"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Contas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Localización"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usar a localización"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usar localización"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desactivada"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Opción activada: <xliff:g id="COUNT_1">%1$d</xliff:g> aplicacións teñen acceso á localización</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueo de pantalla e Desbloqueo facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueo de pantalla, impresión dixital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueo de pantalla"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloquea o teléfono usando a cara e a impresión dixital"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Tamén podes iniciar sesión en aplicacións e confirmar pagos"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurar desbloqueo con:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueo facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Desbloquea o teléfono a fume de carozo"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Impresión dixital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Aforra tempo desbloqueando o teléfono no peto"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Omitir"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Seguinte"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Engadiuse a cara"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configura o desbloqueo facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueo facial"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Utilizar a autenticación facial"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Comezar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Se o desbloqueo facial da accesibilidade está desactivado, é posible que algúns pasos da configuración non funcionen ben con TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Atrás"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuar"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Usar axustes de accesibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Ao utilizar o desbloqueo facial en aplicacións, pedir confirmación"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Eliminar datos faciais"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurar desbloqueo facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Utiliza o desbloqueo facial para desbloquear o teu dispositivo, iniciar sesión en aplicacións e confirmar pagos.\n\nTen en conta o seguinte:\nAo mirar o teléfono, podes desbloquealo sen querer.\n\nOutra persoa pode desbloquealo se che pon o teléfono diante da cara.\n\nTamén pode desbloquealo alguén que se pareza moito a ti, como un xemelgo."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Utiliza o desbloqueo facial para desbloquear o teu dispositivo, iniciar sesión en aplicacións e confirmar pagos.\n\nTen en conta o seguinte:\nAo mirar o teléfono, podes desbloquealo sen querer.\n\nOutra persoa pode desbloquealo se che pon o teléfono diante da cara, aínda que teñas os ollos pechados.\n\nTamén pode desbloquealo alguén que se pareza moito a ti, como un xemelgo."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Utiliza o desbloqueo facial para desbloquear o teu dispositivo, iniciar sesión en aplicacións e confirmar pagos."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Ten en conta o seguinte:\nAo mirar o teléfono, podes desbloquealo sen querer.\n\nOutra persoa pode desbloquealo se che pon o teléfono diante da cara.\n\nTamén pode desbloquealo alguén que se pareza moito a ti, como un xemelgo."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Ten en conta o seguinte:\nAo mirar o teléfono, podes desbloquealo sen querer.\n\nOutra persoa pode desbloquealo se che pon o teléfono diante da cara, aínda que teñas os ollos pechados.\n\nTamén pode desbloquealo alguén que se pareza moito a ti, como un xemelgo."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Queres eliminar os datos faciais?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Os datos das caras utilizados polo desbloqueo facial eliminaranse de modo permanente e seguro. Tras quitalos, deberás utilizar o teu PIN, padrón ou contrasinal para desbloquear o teléfono, iniciar sesión nas aplicacións e confirmar pagos."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Úsao para desbloquear o teléfono"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utiliza a impresión dixital para desbloquear o teléfono ou autorizar as compras.\n\nNota: Non podes utilizar a impresión dixital para desbloquear este dispositivo. Para obter máis información, ponte en contacto co administrador da túa organización."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utiliza a impresión dixital para desbloquear o teléfono ou autorizar as compras.\n\nNota: É posible que a impresión dixital sexa menos segura que un padrón ou un PIN fiables."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Non, grazas"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omitir"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seguinte"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Ao protexer a túa tableta cunha opción de bloqueo de pantalla, ninguén poderá utilizala se a perdes ou cha rouban. Tamén é necesario o bloqueo de pantalla para configurar o desbloqueo facial. Para volver, toca Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Ao protexer o teu dispositivo cunha opción de bloqueo de pantalla, ninguén poderá utilizalo se o perdes ou cho rouban. Tamén é necesario o bloqueo de pantalla para configurar o desbloqueo facial. Para volver, toca Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Ao protexer o teu teléfono cunha opción de bloqueo de pantalla, ninguén poderá utilizalo se o perdes ou cho rouban. Tamén é necesario o bloqueo de pantalla para configurar o desbloqueo facial. Para volver, toca Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Ao protexer a túa tableta cunha opción de bloqueo de pantalla, ninguén poderá utilizala se a perdes ou cha rouban. Tamén é necesario para configurar a autenticación biométrica. Para volver, toca Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Ao protexer o teu dispositivo cunha opción de bloqueo de pantalla, ninguén poderá utilizalo se o perdes ou cho rouban. Tamén é necesario para configurar a autenticación biométrica. Para volver, toca Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Ao protexer o teu teléfono cunha opción de bloqueo de pantalla, ninguén poderá utilizalo se o perdes ou cho rouban. Tamén é necesario para configurar a autenticación biométrica. Para volver, toca Cancelar."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Queres omitir a configuración do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Queres omitir a configuración do contrasinal?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Queres omitir a configuración do padrón?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activa as funcións de protección da tableta para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activa as funcións de protección do dispositivo para evitar que outras persoas utilicen este dispositivo sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activa as funcións de protección do teléfono para evitar que outras persoas utilicen este teléfono sen o teu permiso. Selecciona o bloqueo da pantalla que queiras utilizar."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Escolle o método de bloqueo da pantalla alternativo"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Escolle o método de bloqueo de pantalla alternativo"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Escolle o método de bloqueo da pantalla alternativo"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcións de bloqueo da pantalla"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcións de bloqueo de pantalla"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueo de pantalla"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueo facial e contrasinal"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuar sen desbloqueo facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Podes desbloquear o teléfono utilizando a túa cara. Por motivos de seguranza, esta opción require un bloqueo de pantalla alternativo."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Autenticación biométrica + padrón"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Autenticación biométrica + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Autenticación biométrica + contrasinal"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Seguir sen autenticación biométrica"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Podes desbloquear o teléfono utilizando a autenticación biométrica. Por motivos de seguranza, esta opción require un bloqueo de pantalla alternativo."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desactivado por admin., encriptación ou almac. credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ningún"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Pasa o dedo"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Debe conter menos de <xliff:g id="NUMBER_0">%d</xliff:g> díxito</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"O administrador de dispositivos non permite o uso dun PIN recente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"O teu administrador de TI bloqueou os PIN comúns. Proba cun PIN diferente."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Non pode conter un carácter non válido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Debe conter polo menos unha letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Debe conter polo menos un díxito"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Debe conter polo menos 1 carácter que non sexa un número</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"O administrador de dispositivos non permite o uso dun contrasinal recente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"O teu administrador de TI bloqueou os contrasinais comúns. Proba cun contrasinal diferente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Non se permite unha secuencia de díxitos ascendente, descendente nin repetida"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wifi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activar a wifi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wifi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Usar rede wifi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Usar wifi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Configuración da wifi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configura e xestiona puntos de acceso sen fíos"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centra o código QR que aparece debaixo para establecer conexión con “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Conéctate á wifi escaneando un código QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartir wifi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Escanea este código QR para conectarte a “<xliff:g id="SSID">%1$s</xliff:g>” e compartir o contrasinal"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Escanea este código QR con outro dispositivo para conectarte á rede <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Escanea este código QR para conectarte a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Téntao de novo. Se o problema continúa, contacta co fabricante do dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Produciuse un erro"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Contrasinal da rede wifi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Contrasinal da zona wifi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conectar automaticamente"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permite que o teléfono se conecte automaticamente a esta rede cando estea preto dela"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permite que a tableta se conecte automaticamente a esta rede cando estea preto dela"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permite que o dispositivo se conecte a esta rede cando estea dentro da súa zona de cobertura"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Engadir dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Utiliza un código QR para engadir un dispositivo a esta rede"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"O formato do código QR non é válido"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utilizar certificados do sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Non fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Non validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Non se especificou ningún certificado. A túa conexión non será privada."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"O nome da rede é demasiado longo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Debe especificarse un dominio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Necesítase un certificado."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"A wifi está activada"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Conectácheste á rede <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Conectando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Conectando…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Erro ao conectar á rede"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Estás fóra da zona de cobertura da rede"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Enderezo MAC do dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Enderezo MAC aleatorio"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Enderezo MAC aleatorio (usado a última vez)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Enderezo IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalles da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de subrede"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Enderezos IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Redes gardadas"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Subscricións"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Outras redes"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Configuración IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"A configuración avanzada da wifi non está dispoñible para este usuario"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Gardar"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Escribe un enderezo de pasarela válido."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Escribe un enderezo DNS válido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Escribe un prefixo de rede con lonxitude de 0-32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a menos que o anule un DNS privado)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a menos que o anule un DNS privado)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Pasarela"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lonxitude prefixo de rede"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"A aplicación está compartindo contido. Para compartir a conexión a Internet, desactiva a zona wifi e volve activala"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Non hai ningún contrasinal definido"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nome da zona wifi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Activando a zona wifi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Activando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Outros dispositivos poden conectarse á zona wifi <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Contrasinal da zona wifi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda do punto de acceso"</string>
@@ -1166,7 +1184,7 @@
     <string name="brightness" msgid="6216871641021779698">"Nivel de brillo"</string>
     <string name="brightness_title" msgid="5457874893085305155">"Brillo"</string>
     <string name="brightness_summary" msgid="6309641759293018049">"Axusta o brillo da pantalla"</string>
-    <string name="auto_brightness_title" msgid="4239324728760986697">"Brillo automático"</string>
+    <string name="auto_brightness_title" msgid="4239324728760986697">"Brillo intelixente"</string>
     <string name="auto_brightness_summary" msgid="1737148869232725883">"O brillo da pantalla axústase ao contorno"</string>
     <string name="auto_brightness_summary_on" msgid="2748088951224387004">"Activado"</string>
     <string name="auto_brightness_summary_off" msgid="8077066192887677956">"Desactivado"</string>
@@ -1185,12 +1203,12 @@
     <string name="auto_brightness_off_summary" msgid="4993150980274474226">"Non axustar á luz dispoñible"</string>
     <string name="auto_brightness_very_high_summary" msgid="2784981315548144255">"Maior consumo de batería"</string>
     <string name="auto_brightness_disclaimer" msgid="1868395832774087351">"Optimiza o nivel de brillo segundo a luz dispoñible. Cando estea activado, poderás axustar o brillo temporalmente."</string>
-    <string name="auto_brightness_description" msgid="6807117118142381193">"O brillo da pantalla axustarase automaticamente segundo o ambiente e as actividades que leves a cabo. Podes mover o control desprazable de forma manual para que o brillo automático recoñeza as túas preferencias."</string>
+    <string name="auto_brightness_description" msgid="6807117118142381193">"O brillo da pantalla axustarase automaticamente segundo o ambiente e as actividades que leves a cabo. Podes mover o control desprazable de forma manual para que o brillo intelixente recoñeza as túas preferencias."</string>
     <string name="display_white_balance_title" msgid="2624544323029364713">"Balance de brancos da pantalla"</string>
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Incrementa automaticamente a frecuencia de actualización de 60 a 90 Hz en determinados tipos de contido. Aumenta o uso da batería."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forzar taxa de actualización de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"A taxa de actualización máis alta para mellorar a resposta aos toques e a calidade das animacións. Aumenta o uso da batería."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atención á pantalla"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activado/A pantalla non se apagará se miras para ela"</string>
@@ -1273,7 +1291,7 @@
     <string name="screensaver_settings_current" msgid="390472865895976891">"Protector de pantalla actual"</string>
     <string name="screensaver_settings_dream_start" msgid="6486360145976995856">"Iniciar agora"</string>
     <string name="screensaver_settings_button" msgid="6159236558934930238">"Configuración"</string>
-    <string name="automatic_brightness" msgid="4599827881929079513">"Brillo automático"</string>
+    <string name="automatic_brightness" msgid="4599827881929079513">"Brillo intelixente"</string>
     <string name="lift_to_wake_title" msgid="8994218158737714046">"Levantar para acender"</string>
     <string name="ambient_display_screen_title" msgid="8615947016991429325">"Pantalla en suspensión"</string>
     <string name="ambient_display_category_triggers" msgid="1216640141609270011">"Cando mostrar a pantalla"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Cando a pantalla está escura, actívase para notificacións novas"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostrar sempre a hora e datos"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Maior uso da batería"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Usar letra grosa"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamaño do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Reduce ou amplía o texto"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Configuración de bloqueo da SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versión de Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Actualización de seguranza de Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo e hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versión de hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID de equipamento"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Eliminar APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Novo APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Gardar"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Descartar"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Cancelar"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"O nome do campo non pode quedar baleiro."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"O APN non pode estar baleiro."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Pódense restablecer as aplicacións"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Restablecer wifi, rede móbil e Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Con esta selección, restableceranse todas as opcións de configuración de rede, entre elas as referentes a:\n\n"<li>"Wifi"</li>\n<li>"Datos móbiles"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Borrar"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Borrar SIM descargadas"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Para descargar tarxetas SIM de substitución, ponte en contacto co teu operador. Non se cancelará ningún dos plans de servizos móbiles que teñas."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Non se cancelará ningún dos plans de servizos móbiles que teñas. Para descargar tarxetas SIM de substitución, ponte en contacto co teu operador."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Restablecer configuración"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Queres restablecer toda a configuración de rede? Non se pode desfacer esta acción."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Queres restablecer todas as opcións de configuración de rede e borrar as SIM descargadas? Non se pode desfacer esta acción."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Restableceuse a configuración da rede"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Non se puideron borrar as SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"As SIM descargadas non se poden borrar debido a un erro.\n\nReinicia o dispositivo e téntao de novo."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Borrar todos os datos (restablecemento de fábrica)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Borrar todos os datos"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Con esta acción borraranse todos os datos do "<b>"almacenamento interno"</b>" da túa tableta, entre os que se inclúen:\n\n"<li>"A túa Conta de Google"</li>\n<li>"Os datos e a configuración do sistema e das aplicacións"</li>\n<li>"As aplicacións descargadas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Con esta acción borraranse todos os datos do "<b>"almacenamento interno"</b>" do teléfono, entre os que se inclúen:\n\n"<li>"A túa Conta de Google"</li>\n<li>"Os datos e a configuración do sistema e das aplicacións"</li>\n<li>"As aplicacións descargadas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Actualmente tes sesión iniciada nas seguintes contas:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Hai outros usuarios presentes neste dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros datos do usuario"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Con esta acción non se cancelará o teu plan de servizos móbiles."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar o "<b>"almacenamento USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar a "<b>"tarxeta SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Borrar todos os datos (restablecemento da configuración de fábrica)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Borrar todos os datos"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Con esta acción borraranse todos os datos do "<b>"almacenamento interno"</b>" da túa tableta, entre os que se inclúen:\n\n"<li>"A túa Conta de Google"</li>\n<li>"Os datos e a configuración do sistema e das aplicacións"</li>\n<li>"As aplicacións descargadas"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Con esta acción borraranse todos os datos do "<b>"almacenamento interno"</b>" do teléfono, entre os que se inclúen:\n\n"<li>"A túa Conta de Google"</li>\n<li>"Os datos e a configuración do sistema e das aplicacións"</li>\n<li>"As aplicacións descargadas"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Actualmente tes sesión iniciada nas seguintes contas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Hai outros usuarios presentes neste dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros datos do usuario"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Con esta acción non se cancelará o teu plan de servizos móbiles."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar o "<b>"almacenamento USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para borrar música, imaxes e outros datos do usuario, é necesario borrar a "<b>"tarxeta SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Borrar almacenamento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Borrar tarxeta SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Borra todos os datos do almacenamento USB interno, como a música ou as fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Borra todos os datos da tarxeta SD, como a música ou as fotos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Borrar todos os datos"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Borrar todos os datos"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Eliminaranse as aplicacións descargadas e a túa información persoal. Non se pode desfacer esta acción."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Eliminarase toda a túa información persoal, entre a que se inclúen as aplicacións e as SIM descargadas. Non se pode desfacer esta acción."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Borrar todo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Non se levou a cabo ningún restablecemento debido a que o servizo de borrado do sistema non está dispoñible."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Queres borrar todos os datos?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"O restablecemento de fábrica non está dispoñible para este usuario"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Borrando"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Agarda..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Borrar todos os datos"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Borrar todos os datos"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Eliminaranse as aplicacións descargadas e a túa información persoal. Non se pode desfacer esta acción."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Eliminarase toda a túa información persoal, entre a que se inclúen as aplicacións e as SIM descargadas. Non se pode desfacer esta acción."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Queres borrar todos os datos?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"O restablecemento da configuración de fábrica non está dispoñible para este usuario"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Borrando"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Agarda…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Configuración de chamada"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configura o correo de voz, o desvío de chamadas, a chamada en espera e o identificador de chamada"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Conexión compart. por USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Non se pode compartir a conexión con máis de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Desactivarase a conexión compartida de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet compartida"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Comparte a conexión a Internet do teléfono por Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Comparte a conexión a Internet do teléfono por Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utiliza a zona wifi e a conexión compartida para ofrecer acceso a Internet a outros dispositivos mediante a túa conexión de datos móbiles. As aplicacións tamén poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utiliza a zona wifi e a conexión compartida para ofrecer acceso a Internet a outros dispositivos mediante a túa wifi ou a túa conexión de datos móbiles. As aplicacións tamén poden crear unha zona wifi para compartir contido cos dispositivos que están cerca."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Axuda"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite ás aplicacións e aos servizos buscar dispositivos próximos en calquera momento, mesmo cando o Bluetooth está desactivado. Esta opción pode utilizarse, por exemplo, para mellorar as funcións e os servizos baseados na localización."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servizos de localización para o traballo"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detección do fuso horario da localización"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detección do fuso horario da localización"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite usar a localización do dispositivo para detectar o fuso horario actual. A exactitude da detección pode verse afectada por outras opcións de configuración da localización, como Busca de redes wifi."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activada"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desactivada"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"A detección automática do fuso horario está desactivada"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"A detección do fuso horario da localización está desactivada"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Non se admite a detección do fuso horario da localización"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Non está permitido modificar a detección do fuso horario da localización"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Situación por rede móbil/wifi"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Permite usar o servizo de localización para calcular a localización rápido. Recompilaranse datos anónimos e enviaranse a Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Localización determinada por wifi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Desbloqueo facial: cómpre un contrasinal"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Alternativa ao desbloqueo facial"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Alternativa ao desbloqueo facial"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Configura un contrasinal"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Configura un padrón"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Configura un PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Esqueciches o contrasinal?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Esqueciches o padrón?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Esqueciches o PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencias dos subtítulos"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliación"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliación"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Activación da ampliación"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Escolle as áreas de ampliación que queres usar para ampliar a pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pantalla completa"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte da pantalla"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pantalla completa e parte da pantalla"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar a pantalla completa"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte da pantalla"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Queres cambiar ao botón de accesibilidade?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Cando se toca tres veces una parte da pantalla para ampliala, a escritura e outras accións funcionan con atraso.\n\nQueres pasar a usar o botón de accesibilidade para ampliar a pantalla?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Cambiar ao botón de accesibilidade"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Manter tres toques para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configuración da ampliación"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar ao tocar tres veces"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ampliar con atallo"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Botón de acendido para colgar"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Punteiro do rato grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Eliminar animacións"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio en mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combina canles ao reproducir audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balance do audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Esquerda"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Dereita"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio en mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combinar canles ao reproducir audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balance do audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Esquerda"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Dereita"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predeterminado"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibración das notificacións"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibración do ton"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Reacción aos toques"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Utilizar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usar corrección da cor"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar subtítulos"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Só para aplicacións compatibles"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utilizar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usar corrección da cor"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar subtítulos"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Só para aplicacións compatibles"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tamaño e estilo dos subtítulos"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamaño do texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Máis opcións"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalía"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalía"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalía"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de grises"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermello-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermello-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restrición do uso en segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permite que a aplicación se execute en segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Non se permite a execución da aplicación en segundo plano"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Non se pode restrinxir o uso en segundo plano"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Non se pode restrinxir o uso en segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Queres limitar a actividade en segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Si limitas a actividade en segundo plano para unha aplicación, é posible que non funcione correctamente"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Non podes limitar a aplicación porque non se configurou para optimizar a batería.\n\nPrimeiro activa a optimización da batería."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Utilizouse a tableta máis do normal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Utilizouse o dispositivo máis do normal"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"A batería pode esgotarse antes do normal"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimización en curso para manter a batería en bo estado"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batería limitada temporalmente. Toca para obter máis información."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"O teu teléfono utilizouse máis do habitual. A batería pode esgotarse antes do previsto.\n\nAplicacións que máis batería consomen:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"A túa tableta utilizouse máis do habitual. A batería pode esgotarse antes do previsto.\n\nAplicacións que máis batería consomen:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"O teu dispositivo utilizouse máis do habitual. A batería pode esgotarse antes do previsto.\n\nAplicacións que máis batería consomen:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">Restrinxiuse %1$d aplicación</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Produciuse un problema ao ler o medidor da batería"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Produciuse un problema ao ler o medidor da batería. Toca para obter "<annotation id="url">"máis información"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Queres deter a aplicación?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"O teléfono non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> manteno activo.\n\nPara tentar solucionar este problema, podes deter a aplicación.\n\nSe o problema persiste, é posible que necesites desinstalala para mellorar o rendemento da batería."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"A tableta non pode xestionar o uso da batería con normalidade porque a aplicación <xliff:g id="APP">%1$s</xliff:g> mantena activa.\n\nPara tentar solucionar este problema, podes deter a aplicación.\n\nSe o problema persiste, é posible que necesites desinstalala para mellorar o rendemento da batería."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Establecer unha planificación"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Aumenta a duración da batería"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desactivar cando a batería estea cargada"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"A función Aforro de batería desactívase cando o nivel de batería do teu teléfono está ao <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"A función Aforro de batería desactívase cando o nivel de batería da túa tableta sexa o <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"A función Aforro de batería desactívase cando o nivel de batería do teu dispositivo sexa o <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"A función Aforro de batería desactívase cando a carga do teléfono é superior ao <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"A función Aforro de batería desactívase cando a carga da tableta é superior ao <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"A función Aforro de batería desactívase cando a carga do dispositivo é superior ao <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activar"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Restablecer"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproducir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividade intelixente"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Aumenta a duración da batería e mellora o rendemento do dispositivo ao xestionar automaticamente as conexións de rede"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Almacenamento de credenciais"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalar un certificado"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instala certificados desde o almacenamento"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuario"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Mostra e modifica as credenciais almacenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Configuración avanzada"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de almacenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Almacenado en hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Só software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais non están dispoñibles para este usuario"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para a VPN e as aplicacións"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para a wifi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Non instalar"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instalar igualmente"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Non se instalou o certificado"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Queres permitir que <xliff:g id="APP_NAME">%s</xliff:g> instale certificados neste dispositivo?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Estes certificados identificarante nas aplicacións e nos URL que se indican a continuación"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Non permitir"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Permitir"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Mostrar máis"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App de xestión de certificados"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Ningún"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Os certificados instalados por esta aplicación identifícante nas aplicacións e nos URL que aparecen máis abaixo"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Quitar"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Sinal de marcación de emerxencia"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Define o comportamento cando se realiza unha chamada de emerxencia"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Copia de seguranza"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Non configurado: perfil de traballo"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Ti (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Alcume"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Podes engadir ata <xliff:g id="USER_COUNT">%1$d</xliff:g> usuarios."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Só o propietario da tableta pode xestionar usuarios."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Só o propietario do teléfono pode xestionar usuarios."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pago no terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura unha aplicación de pago. A continuación, coloca a parte traseira do teu teléfono sobre calquera terminal que teña o símbolo de pago sen contacto."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entendido"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Máis..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Máis…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Define a aplicación de pagos predeterminada"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualiza a aplicación de pagos predeterminada"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Nos terminais sen contacto, pagar con <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Atrás"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Seguinte"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finalizar"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tirar unha foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Escoller unha imaxe"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Seleccionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Tarxetas SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Tarxetas SIM"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Usar sempre para as chamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Seleccionar unha SIM para datos"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Seleccionar unha SIM para as SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Cambiando SIM de datos. Este proceso pode tardar ata un minuto..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Cambiando SIM de datos. Este proceso pode tardar ata un minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Chamar con"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Seleccionar unha tarxeta SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3266,7 +3307,7 @@
     <string name="keywords_lock_screen_notif" msgid="6363144436467429932">"notificación da pantalla de bloqueo, notificacións"</string>
     <string name="keywords_face_settings" msgid="1360447094486865058">"cara"</string>
     <string name="keywords_fingerprint_settings" msgid="7345121109302813358">"impresión dixital, engadir impresión dixital"</string>
-    <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"atenuar pantalla, pantalla táctil, batería, brillo intelixente, brillo dinámico, brillo automático"</string>
+    <string name="keywords_display_auto_brightness" msgid="7162942396941827998">"atenuar pantalla, pantalla táctil, batería, brillo intelixente, brillo dinámico, brillo intelixente"</string>
     <string name="keywords_display_adaptive_sleep" msgid="8003895686008403685">"atenuar pantalla, modo de suspensión, batería, tempo de espera, atención, visualización, pantalla, inactividade"</string>
     <string name="keywords_auto_rotate" msgid="7914655570000378975">"xirar, voltear, xiro, retrato, orientación, horizontal, vertical"</string>
     <string name="keywords_system_update_settings" msgid="5769003488814164931">"actualizar, actualización, Android"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, programación, aforro de batería, aforro de enerxía, batería, automático, porcentaxe"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, chamadas avanzadas, chamadas 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"engadir idioma, engadir un idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamaño do texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Son predeterminado"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume de notificacións e son ao <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibración, Non molestar"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sons de acendido"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtítulos instantáneos"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Crea subtítulos automáticos"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ningunha"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Definíronse <xliff:g id="ON_COUNT">%d</xliff:g> planificacións</item>
-      <item quantity="one">Definiuse 1 planificación</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ningunha planificación}=1{Definiuse 1 planificación}other{Definíronse # planificacións}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Non molestar"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Só se reciben notificacións de aplicacións e persoas importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar as interrupcións"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Só prioridade"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desactivado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pregunta sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Ata a desactivación"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-      <item quantity="one">1 hora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> planificacións poden activarse automaticamente</item>
-      <item quantity="one">1 planificación pode activarse automaticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desactivado}=1{Desactivado: 1 planificación pode activarse automaticamente}other{Desactivado: # planificacións poden activarse automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Que pode interromper o modo Non molestar?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Persoas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplicacións"</string>
@@ -3453,10 +3483,14 @@
     <string name="advanced_section_header" msgid="6003255455888626056">"Configuración avanzada"</string>
     <string name="profile_section_header" msgid="4970209372372610799">"Notificacións do traballo"</string>
     <string name="smart_notifications_title" msgid="8995288376897952015">"Notificacións intelixentes"</string>
-    <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridade das notificacións automáticas"</string>
+    <string name="asst_capability_prioritizer_title" msgid="1181272430009156556">"Prioridade das notificacións intelixentes"</string>
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Define automaticamente como discretas as notificacións de prioridade baixa"</string>
-    <string name="asst_capability_ranking_title" msgid="312998580233257581">"Clasificación automática das notificacións"</string>
+    <string name="asst_capability_ranking_title" msgid="312998580233257581">"Clasificación intelixente das notificacións"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Clasifica as notificacións automaticamente por relevancia"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Comentarios sobre notificacións intelixentes"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica axustes realizados nas notificacións e mostra a opción de enviar comentarios ao sistema"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Restablecer importancia das notificacións"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Restablece as opcións de configuración da importancia modificadas polo usuario e permítelle ao asistente de notificacións establecer as prioridades"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Accións suxeridas e respostas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostra automaticamente accións suxeridas e respostas"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Mostra as notificacións recentes e as adiadas"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Conversas prioritarias"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Móstranse as conversas prioritarias como burbullas flotantes situadas na parte superior da sección de conversas"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Mostra as conversas prioritarias na parte superior da sección de conversas"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Outras conversas"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Conversas non prioritarias"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversas que modificases"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Conversas recentes"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Borrar recentes"</string>
+    <string name="clear" msgid="5092178335409471100">"Borrar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Mostrar conversas prioritarias nunha burbulla"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"As conversas prioritarias móstranse na parte superior do panel despregable. Tamén podes configuralas para que se inclúan en burbullas e interrompan o modo Non molestar."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Aquí aparecerán as conversas prioritarias e as modificadas"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acceso a Non molestar"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir modo Non molestar"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ningunha aplicación instalada solicitou acceso en modo Non molestar"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Cargando aplicacións..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Cargando aplicacións…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Segundo solicitaches, Android bloquea a visualización de notificacións desta aplicación neste dispositivo."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Segundo solicitaches, Android bloquea a visualización desta categoría de notificacións neste dispositivo."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Segundo solicitaches, Android bloquea a visualización deste grupo de notificacións neste dispositivo."</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas as conversas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversas prioritarias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ningunha"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversas</item>
-      <item quantity="one">1 conversa</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ningunha"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ningunha conversa}=1{1 conversa}other{# conversas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quen pode interromper"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chamadas"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para asegurarte de que soen as chamadas permitidas, comproba que o dispositivo teña activado o son"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"As chamadas entrantes para \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" están bloqueadas. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactos marcados con estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> máis</item>
-      <item quantity="one">1 máis</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ningún"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ningún contacto}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}other{{contact_1}, {contact_2} e # máis}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sen nome)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensaxes"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensaxes"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensaxes"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"As mensaxes entrantes para \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" están bloqueadas. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Podes recibir todas as mensaxes"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Podes recibir todas as chamadas"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ningún"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contactos</item>
-      <item quantity="one">1 contacto</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ningún contacto}=1{1 contacto}other{# contactos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Calquera"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactos marcados con estrela"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas as notificacións"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algunhas notificacións"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"As persoas seleccionadas seguirán podendo contactar contigo aínda que non permitas que as aplicacións te interrompan"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> teñen permiso para interromper o modo Non molestar</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> ten permiso para interromper o modo Non molestar</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> máis"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ningunha aplicación pode interromper o modo Non molestar}=1{{app_1} pode interromper o modo Non molestar}=2{{app_1} e {app_2} poden interromper o modo Non molestar}=3{{app_1}, {app_2} e {app_3} poden interromper o modo Non molestar}other{{app_1}, {app_2} e # aplicacións máis poden interromper o modo Non molestar}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplicacións"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas as notificacións"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algunhas notificacións"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificacións que poden interromper"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas as notificacións"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> teñen permiso para interromper o modo Non molestar</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> ten permiso para interromper o modo Non molestar</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada pode interromper o modo Non molestar"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> máis"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper o modo Non molestar}=1{{sound_category_1} pode interromper o modo Non molestar}=2{{sound_category_1} e {sound_category_2} poden interromper o modo Non molestar}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} poden interromper o modo Non molestar}other{{sound_category_1}, {sound_category_2} e # sons máis poden interromper o modo Non molestar}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper o modo Non molestar"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguén pode interromper o modo Non molestar"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algunhas persoas poden interromper o modo Non molestar"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Todas as persoas poden interromper o modo Non molestar"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Activado"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Desactivado"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Fixar aplicacións"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Podes fixar a aplicación actual para tela sempre á vista ata que a soltes. Con esta función podes, por exemplo, permitirlle a un amigo de confianza utilizar un xogo específico. \n\nCando unha aplicación está fixada, pode abrir outras aplicacións e pódese permitir o acceso aos datos persoais. \n\nPara utilizar a función de fixar aplicacións, sigue estes pasos: 	\n1.	Activa a función de fixar aplicacións 	\n2.	Abre Visión xeral 	\n3.	Toca a icona da aplicación na parte superior da pantalla e, despois, toca Fixar"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Podes fixar a aplicación actual para tela sempre á vista ata que a soltes. Con esta función podes, por exemplo, permitirlle a un amigo de confianza utilizar un xogo específico. \n\nCando unha aplicación está fixada, pode abrir outras aplicacións e pódese permitir o acceso aos datos persoais. \n\nSe queres compartir o teu dispositivo con alguén de forma segura, recomendámosche que probes a utilizar unha conta de usuario convidado. \n\nPara utilizar a función de fixar aplicacións, sigue estes pasos: 	\n1.	Activa a función de fixar aplicacións 	\n2.	Abre Visión xeral 	\n3.	Toca a icona da aplicación na parte superior da pantalla e, despois, toca Fixar"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Podes fixar a aplicación actual para tela sempre á vista ata que a soltes. Con esta función podes, por exemplo, permitirlle a un amigo de confianza utilizar un xogo específico."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Cando unha aplicación está fixada, pode abrir outras aplicacións e é posible que se permita o acceso aos datos persoais. \n\nPara utilizar a función de fixar aplicacións, sigue estes pasos: 	\n1.	Activa a función de fixar aplicacións 	\n2.	Abre Visión xeral 	\n3.	Toca a icona da aplicación na parte superior da pantalla e, despois, toca Fixar"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Cando unha aplicación está fixada, pode abrir outras aplicacións e é posible que se permita o acceso aos datos persoais. \n\nSe queres compartir o teu dispositivo con alguén de forma segura, recomendámosche que probes a utilizar unha conta de usuario convidado. \n\nPara utilizar a función de fixar aplicacións, sigue estes pasos: 	\n1.	Activa a función de fixar aplicacións 	\n2.	Abre Visión xeral 	\n3.	Toca a icona da aplicación na parte superior da pantalla e, despois, toca Fixar"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Cando unha aplicación está fixada, ocorre o seguinte: \n\n•		Pódese permitir o acceso a datos persoais \n		(por exemplo, aos contactos e ao contido dos correos electrónicos) \n•		A aplicación fixada pode abrir outras aplicacións \n\nUtiliza a función de fixar aplicacións só con persoas nas que confíes."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Solicitar padrón de desbloqueo para deixar de fixar a pantalla"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Solicitar PIN para soltar fixación"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Ademais de usar a túa cara para desbloquear o dispositivo, tamén podes protexelo solicitando o teu PIN antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tan sequera alarmas.\n\nDeste xeito, axúdache a protexer os datos en caso de perda ou roubo dos dispositivos. Queres solicitar o PIN para iniciar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Ademais de usar a túa cara para desbloquear o dispositivo, tamén podes protexelo solicitando o teu padrón antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tan sequera alarmas.\n\nDeste xeito, axúdache a protexer os datos en caso de perda ou roubo dos dispositivos. Queres solicitar o padrón para iniciar o dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Ademais de usar a túa cara para desbloquear o dispositivo, tamén podes protexelo solicitando o teu contrasinal antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tan sequera alarmas.\n\nDeste xeito, axúdache a protexer os datos en caso de perda ou roubo dos dispositivos. Queres solicitar o contrasinal para iniciar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Ademais de usar a autenticación biométrica para desbloquear o dispositivo, podes protexelo aínda máis configurándoo para que solicite o teu PIN antes de iniciarse. Ata entón, non poderá recibir chamadas, mensaxes, notificacións nin alarmas.\n\nDeste xeito, protéxense os datos en caso de perda ou roubo dos dispositivos. Queres que o dispositivo solicite o PIN para iniciarse?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Ademais de usar a autenticación biométrica para desbloquear o dispositivo, podes protexelo aínda máis configurándoo para que solicite o teu padrón antes de iniciarse. Ata entón, non poderá recibir chamadas, mensaxes, notificacións nin alarmas.\n\nDeste xeito, protéxense os datos en caso de perda ou roubo dos dispositivos. Queres que o dispositivo solicite o padrón para iniciarse?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Ademais de usar a autenticación biométrica para desbloquear o dispositivo, podes protexelo aínda máis configurándoo para que solicite o teu contrasinal antes de iniciarse. Ata entón, non poderá recibir chamadas, mensaxes, notificacións nin alarmas.\n\nDeste xeito, protéxense os datos en caso de perda ou roubo dos dispositivos. Queres que o dispositivo solicite o contrasinal para iniciarse?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Si"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Non"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restrinxido"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo conectado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Cambiando…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Cambiando…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Non se puido facer o cambio"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Cargando este dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Cargando o dispositivo conectado"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Uso de datos móbiles"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Uso de datos das aplicacións"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Uso de datos wifi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Uso de datos fóra das redes dos operadores"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Uso de datos de Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wifi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 restrición</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"A maneira na que o operador contabiliza os datos usados pode ser diferente á do dispositivo"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Exclúe os datos usados nas redes dos operadores"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Datos usados: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir aviso de consumo de datos"</string>
     <string name="data_warning" msgid="2925054658166062884">"Aviso de consumo de datos"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalles"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Aforro de datos"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Datos sen restricións"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Desactiváronse os datos en segundo plano"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Desactiváronse os datos en segundo plano"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activado"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desactivado"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usar Aforro de datos"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Se o dispositivo está bloqueado, impide escribir respostas ou outro texto nas notificacións"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corrector predeterminado"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Escoller corrector ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utilizar o corrector ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usar corrector ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Non seleccionado"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ningún)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Para axudar a liberar espazo de almacenamento, o xestor de almacenamento elimina as fotos e vídeos con copia de seguranza do teu dispositivo."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Eliminar fotos e vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Xestor de almacenamento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Usar xestor de almacenamento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usar xestor de almacenamento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liberar espazo agora"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dobre toque no teléfono para consultalo"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tocar dúas veces para consultar a tableta"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tocar dúas veces para consultar o dispositivo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Pasar dedo para notific."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Pasa o dedo cara abaixo no bordo inferior da pantalla para ver as notificacións"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo dunha soa man"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usar modo dunha soa man"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Saír ao cambiar de aplicación"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tempo de espera"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"fácil alcance"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para consultar a hora, as notificacións e outra información, toca a pantalla dúas veces."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar o teléfono para consultalo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levantar a tableta para consultala"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toca para consultar a tableta"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocar para consultar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para consultar a hora, as notificacións e outra información, toca a pantalla."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS de emerxencia"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Usar SOS de emerxencia"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Xestionado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Inicia as accións que se indican a continuación premendo rapidamente o botón de acendido 5 ou máis veces"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Facer soar alarma de conta atrás"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Reproduce un son forte antes de enviar unha notificación para pedir axuda"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Chamar para pedir axuda"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Número ao que chamar para pedir axuda"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Toca para cambiar"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Se pos un número que non sexa de emerxencias:\n • O teu dispositivo debe estar desbloqueado para usar SOS de emerxencia\n • É posible que non se responda a túa chamada"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Pasar o dedo polo sensor de impresións dixitais para ver as notificacións"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Pasar dedo polo sensor"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do teléfono."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Máximo de conxuntos de datos visibles"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Restablecer valores predeterminados"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Restablecéronse as opcións para programadores da función de autocompletar"</string>
+    <string name="location_category" msgid="3496759112306219062">"Localización"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicador de localización da barra de estado"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Mostrar para todas as localizacións, como a rede e a conectividade"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forzar medicións completas de GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Realiza un seguimento de todas as frecuencias e constelacións de satélites de GNSS sen ciclos"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema do dispositivo"</string>
     <string name="default_theme" msgid="4815428567082263639">"Predeterminado"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nome da rede"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pon en pausa as notificacións para concentrarte"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Función non dispoñible"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Desactivouse esta función porque fai que o teléfono vaia máis lento"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forzar medicións completas de GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Realiza un seguimento de todas as frecuencias e constelacións de satélites de GNSS sen ciclos"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Mostrar sempre o cadro de diálogo de fallos"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Mostra o cadro de diálogo cada vez que falla unha aplicación"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Seleccionar aplicación compatible con ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activar para todas as aplicacións"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleccionar controlador de gráficos"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predeterminado"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de xogos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de videoxogos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Controlador do programador"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador de gráficos do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Activado (silenciado)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Desactivado"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detalles da rede"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"As aplicacións do teu teléfono poden consultar o nome do teu dispositivo. Tamén poden velo outros usuarios cando te conectes a dispositivos Bluetooth ou configures zonas wifi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"As aplicacións do teu teléfono poden consultar o nome do teu dispositivo. Tamén poden velo outros usuarios cando te conectes a dispositivos Bluetooth ou a redes wifi, así como cando configures zonas wifi."</string>
     <string name="devices_title" msgid="649715719278562515">"Dispositivos"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Toda a configuración"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Suxestións"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Non se puido encontrar ningunha rede. Téntao de novo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(rede non-permitida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Non hai ningunha tarxeta SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Sen SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ningunha"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Require unha SIM para conectarse"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Require unha SIM de <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> para conectarse"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modo de rede preferido: WCDMA preferido"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modo de rede preferido: só GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modo de rede preferido: só WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Datos móbiles"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accede aos datos cunha rede de telefonía móbil"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O teléfono cambiará automaticamente a este operador cando esteas dentro da súa zona de cobertura"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Non hai ningunha tarxeta SIM dispoñible"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencia para chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencia para SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Preguntar sempre"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Non dispoñible cando o dispositivo está conectado a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ver máis"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Queres activar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Queres activar a SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Queres cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Queres pasar a utilizar a tarxeta SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Non se poden ter activadas varias SIM á vez.\n\nAo cambiar a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, non se cancelará o teu servizo de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Non se poden ter activadas varias SIM descargadas á vez.\n\nAo cambiar a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, non se cancelará o teu servizo de <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Non se poden ter activadas varias SIM á vez.\n\nAo cambiar, non se cancelará o teu servizo de <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Cambiar a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Establecendo conexión coa rede…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Cambiando a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Non se puido cambiar de operador"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Non se puido cambiar de operador debido a un erro."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Queres desactivar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Queres desactivar a SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desactivando SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Non se puido desactivar o operador"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Produciuse un erro e non se puido desactivar o operador."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Queres usar 2 SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo pode ter 2 SIM activadas á vez. Para continuar usando só 1 SIM, toca Non, grazas."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Queres reiniciar o dispositivo?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Para comezar, reinicia o dispositivo. Despois, poderás engadir outra SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Non, grazas"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Cambiar"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Non se puido activar a SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Quita a SIM e introdúcea de novo. Se o problema persiste, reinicia o dispositivo."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tenta activar a SIM de novo. Se o problema persiste, reinicia o dispositivo."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activación da rede"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operador activo: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toca para modificar a configuración da SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Tarxeta SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Queres borrar esta SIM descargada?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Ao borrar esta SIM, quitarase o servizo de <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> deste dispositivo.\n\nNon se cancelará o servizo de <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Borrar"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Borrando SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Non se puido borrar a SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Esta SIM non se puido borrar debido a un erro.\n\nReinicia o dispositivo e téntao de novo."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectar co dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"A aplicación <xliff:g id="APPNAME">%1$s</xliff:g> quere utilizar unha rede wifi temporal para conectar co teu dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Non se atoparon dispositivos. Asegúrate de que estean activados e dispoñibles para a conexión."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Chamadas de emerxencia"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Este operador non admite as chamadas de emerxencia por wifi.\nO dispositivo cambia automaticamente a unha rede de telefonía móbil para facer unha chamada de emerxencia.\nSó se poden realizar chamadas de emerxencia en áreas con cobertura móbil."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Usa a wifi para mellorar a calidade das chamadas"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Chamadas doutra SIM a través desta"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Permite que outra SIM faga chamadas e envíe SMS a través desta."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"chamadas doutra SIM a través desta"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Mensaxe MMS entrante"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Non se puido enviar a mensaxe MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Toca para permitir as mensaxes MMS en <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> cando os datos móbiles estean desactivados"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir superposic. na pantalla en Configuración"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permite que as aplicacións que se poden mostrar sobre outras se superpoñan nas pantallas da aplicación Configuración"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Contido multimedia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Oculta o reprodutor ao rematar a sesión multimedia"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"O reprodutor permíteche retomar unha sesión cando se desprega o panel Configuración rápida."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Reprodutor multimedia en Configuración rápida"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostra o reprodutor multimedia durante un período de tempo prolongado para retomar a reprodución facilmente"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar reprodutor"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar reprodutor"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Non hai reprodutores dispoñibles"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplicacións permitidas"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"contido multimedia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Activarase o Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Activar"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desactivar"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Tarxetas SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para os avións"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Busca redes seguras para os avións e establece conexión con elas"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avión, segura para os avións"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamadas por wifi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Fai e recibe chamadas a través de redes que non pertencen a ningún operador, como as redes wifi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Coa función Chamadas por wifi podes facer e recibir chamadas a través de redes que non pertencen a ningún operador, como algunhas redes wifi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"prefírense"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"prefírense as chamadas"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"prefírense as SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"non dispoñibles"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sen SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencias"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectarse a redes públicas"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"conexión de rede, Internet, sen fíos, datos, wifi, móbil, operador, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver redes seguras para os avións"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desactivar modo avión"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Non está dispoñible porque o modo hora de durmir está activado"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Completouse o restablecemento da importancia das notificacións."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplicacións"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un dispositivo non fiable quere acceder ás túas mensaxes. Toca para obter información."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Queres permitir o acceso ás mensaxes?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un dispositivo Bluetooth non fiable, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quere acceder ás túas mensaxes.\n\nNunca antes te conectaras a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un dispositivo non fiable quere acceder aos teus contactos e ao rexistro de chamadas. Toca para obter información."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Queres permitir o acceso aos contactos e ao rexistro de chamadas?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un dispositivo Bluetooth non fiable, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quere acceder aos teus contactos e ao rexistro de chamadas, incluídos os datos relacionados coas chamadas entrantes e saíntes.\n\nNunca antes te conectaras a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index 4c86afb..fa7a376 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"મધ્યમ"</item>
     <item msgid="6740026006576843477">"લાંબો"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"બસ દબાવીને છોડી દો"</item>
+    <item msgid="7397961711906421599">"દબાવો અને છોડો"</item>
+    <item msgid="4079132024502041928">"દવાબી રાખો"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ડિફૉલ્ટ"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"વૈશ્વિક"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"માત્ર TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"વૈશ્વિક"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 3ff9272..f6fed4e 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"તારીખ અને સમય"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"તારીખ અને સમય સેટ કરો"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"તારીખ, સમય, સમય ઝોન અને ફોર્મેટ્સ સેટ કરો"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"નેટવર્કે આપેલા સમયનો ઉપયોગ કરો"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"નેટવર્ક દ્વારા પ્રદાન કરાયેલ સમય ઝોનનો ઉપયોગ કરો"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"ઑટોમૅટિક રીતે સમય સેટ કરો"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"ઑટોમૅટિક રીતે સમય ઝોન સેટ કરો"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ડિફૉલ્ટ લોકેલનો ઉપયોગ કરો"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑કલાકનું ફોર્મેટ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-કલાક ફોર્મેટનો ઉપયોગ કરો"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"લૉક સ્ક્રીન પર પ્રોફાઇલ માહિતી બતાવો"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"એકાઉન્ટ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"સ્થાન"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"સ્થાનનો ઉપયોગ કરો"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"સ્થાનનો ઉપયોગ કરો"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"બંધ છે"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">ચાલુ છે - <xliff:g id="COUNT_1">%1$d</xliff:g> ઍપ સ્થાનનો ઍક્સેસ ધરાવે છે</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"સ્ક્રીન લૉક, ફેસ અનલૉક"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"સ્ક્રીન લૉક, ફિંગરપ્રિન્ટ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"સ્ક્રીન લૉક"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"તમારો ફોન ચહેરા અને ફિંગરપ્રિન્ટ વડે સુરક્ષિત રીતે અનલૉક કરો"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"તમે ઍપમાં સાઇન ઇન કરી અને ચુકવણીઓ કન્ફર્મ કરી શકો છો"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"આના વડે અનલૉક કરવાનું સેટઅપ કરો:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ફેસ અનલૉક"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"તમારા ફોનને અનલૉક કરવાનું સરળ બનાવો"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ફિંગરપ્રિન્ટ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ફોન તમારા ખિસ્સામાં અનલૉક કરી સમય બચાવો"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"છોડો"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"આગળ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ચહેરો ઉમેર્યો"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"ફેસ અનલૉકનું સેટઅપ કરો"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ફેસ અનલૉક"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"પ્રમાણિત કરવા તમારા ચહેરાનો ઉપયોગ કરો"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"શરૂ કરો"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"જો ઍક્સેસિબિલિટી ફેસ અનલૉકની સુવિધા બંધ કરવામાં આવે, તો ટૉકબૅક વડે સેટઅપના અમુક પગલાં યોગ્ય રીતે કામ કરી શકશે નહીં."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"પાછા ફરો"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"સેટઅપ ચાલુ રાખો"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ઍક્સેસિબિલિટી સેટઅપનો ઉપયોગ કરો"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ઍપમાં ફેસ અનલૉકનો ઉપયોગ કરતી વખતે, હંમેશાં કન્ફર્મેશન પગલાં જરૂરી છે"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ચહેરાનો ડેટા ડિલીટ કરો"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ફેસ અનલૉકનું સેટઅપ કરો"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"તમારા ડિવાઇસને અનલૉક કરવા, ઍપમાં સાઇન ઇન કરવા અને ચુકવણીઓને કન્ફર્મ કરવા માટે ફેસ અનલૉકની સુવિધાનો ઉપયોગ કરો.\n\nધ્યાનમાં રાખો કે:\nજ્યારે તમે તમારો ફોન અનલૉક કરવાનો ઇરાદો ધરાવતા ન હો ત્યારે પણ ફોનની સામે જોવાથી તે અનલૉક થઈ શકે છે.\n\nજો તમારા ફોનને તમારા ચહેરાની સામે રાખવામાં આવે તો અન્ય કોઈ વ્યક્તિ પણ તમારો ફોન અનલૉક કરી શકે છે.\n\nઅદ્દલ તમારી જેવા જ દેખાતા તમારા ભાઈ કે બહેન દ્વારા પણ ફોન અનલૉક કરવામાં આવી શકે છે."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"તમારા ડિવાઇસને અનલૉક કરવા, ઍપમાં સાઇન ઇન કરવા અને ચુકવણીઓને કન્ફર્મ કરવા માટે ફેસ અનલૉકની સુવિધાનો ઉપયોગ કરો.\n\nધ્યાનમાં રાખો કે:\nજ્યારે તમે તમારો ફોન અનલૉક કરવાનો ઇરાદો ધરાવતા ન હો ત્યારે પણ ફોનની સામે જોવાથી તે અનલૉક થઈ શકે છે.\n\nજો તમારી આંખો બંધ હોય, તો પણ જો તમારા ફોનને તમારા ચહેરાની સામે રાખવામાં આવે તો અન્ય કોઈ વ્યક્તિ પણ તમારો ફોન અનલૉક કરી શકે છે.\n\nઅદ્દલ તમારી જેવા જ દેખાતા તમારા ભાઈ કે બહેન દ્વારા પણ ફોન અનલૉક કરવામાં આવી શકે છે."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"તમારા ડિવાઇસને અનલૉક કરવા, ઍપમાં સાઇન ઇન કરવા અને ચુકવણીઓ કન્ફર્મ કરવા માટે, ફેસ અનલૉકનો ઉપયોગ કરો."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"ધ્યાનમાં રાખો:\nતમારે તમારો ફોન અનલૉક ન કરવો હોય, તો પણ ફોનની સામે જોવાથી તે અનલૉક થઈ શકે છે.\n\nજો તમારા ફોનને તમારા ચહેરાની સામે રાખવામાં આવે તો અન્ય કોઈ વ્યક્તિ પણ તમારો ફોન અનલૉક કરી શકે છે.\n\nતમારો ફોન સાવ તમારા જેવા જ દેખાતા વ્યક્તિ જેમ કે તમારા જેવા જ દેખાતા તમારા ભાઈ કે બહેન દ્વારા અનલૉક થઈ શકે છે."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"ધ્યાનમાં રાખો:\nતમારે તમારો ફોન અનલૉક ન કરવો હોય, તો પણ ફોનની સામે જોવાથી તે અનલૉક થઈ શકે છે.\n\nતમારી આંખો બંધ હોય, તો પણ જો તમારા ફોનને તમારા ચહેરાની સામે રાખવામાં આવે તો અન્ય કોઈ વ્યક્તિ પણ તમારો ફોન અનલૉક કરી શકે છે.\n\nતમારો ફોન સાવ તમારા જેવા જ દેખાતા વ્યક્તિ જેમ કે તમારા જેવા જ દેખાતા તમારા ભાઈ કે બહેન દ્વારા અનલૉક થઈ શકે છે."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ચહેરાનો ડેટા ડિલીટ કરીએ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ફેસ અનલૉકની સુવિધા વડે ઉપયોગમાં લેવાતો ચહેરાનો ડેટા કાયમ માટે અને સુરક્ષિત રીતે ડિલીટ કરવામાં આવશે. આને કાઢી નાખવામાં આવે, તે પછી તમને તમારો ફોન અનલૉક કરવા, ઍપમાં સાઇન ઇન કરવા અને ચુકવણીઓ કન્ફર્મ કરવા માટે તમારા પિન, પૅટર્ન અથવા પાસવર્ડની જરૂર રહેશે."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"તમારા ફોનને અનલૉક કરવા માટે ફેસ અનલૉકનો ઉપયોગ કરો"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો.\n\nનોંધ: આ ઉપકરણને અનલૉક કરવા માટે તમે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ નહીં કરી શકો. વધુ માહિતી માટે, તમારી સંસ્થાના વ્યવસ્થાપકનો સંપર્ક કરો."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"તમારા ફોનને અનલૉક કરવા અથવા ખરીદી મંજૂર કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરો.\n\nનોંધ: સશક્ત પૅટર્ન અથવા પિન કરતાં તમારી ફિંગરપ્રિન્ટ ઓછી સુરક્ષિત હોઈ શકે છે."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"રદ કરો"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ના, આભાર"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ચાલુ રાખો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"છોડો"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"આગલી"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ટૅબ્લેટનું રક્ષણ કરવાથી, જો તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકશે નહીં. તમને ફેસ અનલૉકનું સેટઅપ કરવા માટે પણ સ્ક્રીન લૉક વિકલ્પની જરૂર છે. પાછળ જવા માટે, રદ કરોને ટૅપ કરો."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ડિવાઇસનું રક્ષણ કરવાથી, જો તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકશે નહીં. તમને ફેસ અનલૉકનું સેટઅપ કરવા માટે પણ સ્ક્રીન લૉક વિકલ્પની જરૂર છે. પાછળ જવા માટે, રદ કરોને ટૅપ કરો."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ફોનનું રક્ષણ કરવાથી, જો તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકશે નહીં. તમને ફેસ અનલૉકનું સેટઅપ કરવા માટે પણ સ્ક્રીન લૉક વિકલ્પની જરૂર છે. પાછળ જવા માટે, રદ કરોને ટૅપ કરો."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ટૅબ્લેટનું રક્ષણ કરવાથી, જો તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકશે નહીં. બાયોમેટ્રિક્સ સેટઅપ કરવા માટે તમને સ્ક્રીન લૉકના વિકલ્પની જરૂર પણ પડશે. પાછળ જવા માટે, રદ કરોને ટૅપ કરો."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ડિવાઇસનું રક્ષણ કરવાથી, જો તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકશે નહીં. બાયોમેટ્રિક્સ સેટઅપ કરવા માટે તમને સ્ક્રીન લૉકના વિકલ્પની જરૂર પણ પડશે. પાછળ જવા માટે, રદ કરોને ટૅપ કરો."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"સ્ક્રીન લૉકના વિકલ્પથી તમારા ફોનનું રક્ષણ કરવાથી, જો તે ખોવાઈ અથવા ચોરાઈ જાય તો પણ કોઈ તેનો ઉપયોગ કરી શકશે નહીં. બાયોમેટ્રિક્સ સેટઅપ કરવા માટે તમને સ્ક્રીન લૉકના વિકલ્પની જરૂર પણ પડશે. પાછળ જવા માટે, રદ કરોને ટૅપ કરો."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"પિન સેટઅપ કરવાનું છોડીએ?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"પાસવર્ડ સેટઅપ કરવાનું છોડીએ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"પૅટર્ન સેટઅપ કરવાનું છોડીએ?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ટેબ્લેટનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ઉપકરણનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ઉપકરણ સુરક્ષા સુવિધાઓને સક્રિય કરીને તમારી પરવાનગી વિના અન્ય લોકોને આ ફોનનો ઉપયોગ કરવાથી અટકાવો. તમે ઉપયોગમાં લેવા ઇચ્છો છો તે સ્ક્રીન લૉક પસંદ કરો."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"તમારી બેકઅપ સ્ક્રીન લૉક પદ્ધતિ પસંદ કરો"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"તમારી બૅકઅપ સ્ક્રીન લૉક પદ્ધતિ પસંદ કરો"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"તમારી બૅકઅપ સ્ક્રીન લૉક પદ્ધતિ પસંદ કરો"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"સ્ક્રીન લૉકના વિકલ્પો"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"સ્ક્રીન લૉકના વિકલ્પો"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"સ્ક્રીન લૉક કરો"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ફેસ અનલૉક + પાસવર્ડ"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ફેસ અનલૉક વિના ચાલુ રાખો"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"તમે તમારા ફોનને તમારા ચહેરાની મદદથી અનલૉક કરી શકો છો. સુરક્ષા માટે, આ વિકલ્પ હેતુ બૅકઅપ સ્ક્રીન લૉક આવશ્યક છે."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"બાયોમેટ્રિક્સ + પૅટર્ન"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"બાયોમેટ્રિક્સ + પિન"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"બાયોમેટ્રિક્સ + પાસવર્ડ"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"બાયોમેટ્રિક્સ વિના ચાલુ રાખો"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"તમે તમારા ફોનને તમારા બાયોમેટ્રિક્સનો ઉપયોગ કરીને અનલૉક કરી શકો છો. સુરક્ષા ખાતર, આ વિકલ્પ માટે બૅકઅપ સ્ક્રીન લૉક આવશ્યક છે."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"વ્યવસ્થાપક, એન્ક્રિપ્શન નીતિ અથવા ઓળખપત્ર સ્ટોરેજ દ્વારા અક્ષમ કરાયેલ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"કોઈ નહીં"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"સ્વાઇપ કરો"</string>
@@ -619,7 +640,6 @@
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> કરતાં ઓછા અંક હોવા જરૂરી છે</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ઉપકરણ વ્યવસ્થાપક તાજેતરનાં પિનનો ઉપયોગ કરવાની મંજૂરી આપતા નથી"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"સામાન્ય પિન તમારા IT વ્યવસ્થાપક દ્વારા બ્લૉક કરવામાં આવે છે. એક અલગ પિન અજમાવી જુઓ."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"આમાં અમાન્ય અક્ષરોનો સમાવેશ થઈ શકતો નથી"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ઓછામાં ઓછો એક વર્ણ હોવો આવશ્યક છે"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ઓછામાં ઓછો એક અંક હોવો આવશ્યક છે"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">ઓછામાં ઓછા <xliff:g id="COUNT">%d</xliff:g> અક્ષર એવા હોવા જોઈએ કે જે સંખ્યા ન હોય</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ઉપકરણ વ્યવસ્થાપક તાજેતરનાં પાસવર્ડનો ઉપયોગ કરવાની મંજૂરી આપતા નથી"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"સામાન્ય પાસવર્ડ તમારા IT વ્યવસ્થાપક દ્વારા બ્લૉક કરવામાં આવે છે. એક અલગ પાસવર્ડ અજમાવી જુઓ."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"અંકોના ચઢતા ક્રમની, ઉતરતા ક્રમની અથવા પુનરાવર્તિત અનુક્રમની મંજૂરી નથી"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"કન્ફર્મ કરો"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"રદ કરો"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"વાઇ-ફાઇ"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"વાઇ-ફાઇ ચાલુ કરો"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"વાઇ-ફાઇ"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"વાઇ-ફાઇનો ઉપયોગ કરો"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"વાઇ-ફાઇનો ઉપયોગ કરો"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"વાઇ-ફાઇ સેટિંગ્સ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"વાઇ-ફાઇ"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"વાયરલેસ ઍક્સેસ પૉઇન્ટને સેટ અને મેનેજ કરો"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” સાથે કનેક્ટ કરવા માટે QR કોડને નીચેની બાજુએ વચ્ચે રાખો"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR કોડ સ્કૅન કરીને વાઇ-ફાઇ સાથે જોડાઓ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"વાઇ-ફાઇ શેર કરો"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” સાથે કનેક્ટ કરવા માટે આ QR કોડને સ્કૅન કરો અને પાસવર્ડ શેર કરો"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” સાથે જોડાવા માટે આ QR કોડને બીજા ડિવાઇસ વડે સ્કૅન કરો"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” સાથે કનેક્ટ કરવા માટે આ QR કોડને સ્કૅન કરો"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ફરી પ્રયાસ કરો. જો સમસ્યા ચાલુ રહે છે, તો ડિવાઇસ નિર્માતાનો સંપર્ક કરો"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"કંઈક ખોટું થયું હતું"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"વાઇ-ફાઇનો પાસવર્ડ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"હૉટસ્પૉટનો પાસવર્ડ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ઑટોમૅટિક રીતે કનેક્ટ કરો"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"આ નેટવર્કની નજીક ફોનને ઑટોમૅટિક રીતે કનેક્ટ થવાની મંજૂરી આપો"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"આ નેટવર્કની નજીક ટૅબ્લેટને ઑટોમૅટિક રીતે કનેક્ટ થવાની મંજૂરી આપો"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"જ્યારે રેન્જમાં હોય, ત્યારે આ નેટવર્કના કનેક્શનની મંજૂરી આપો"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ડિવાઇસ ઉમેરો"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"આ નેટવર્ક પર ડિવાઇસ ઉમેરવા માટે QR કોડનો ઉપયોગ કરો"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR કોડનું માન્ય ફોર્મેટ નથી"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"સિસ્ટમ પ્રમાણપત્રોનો ઉપયોગ કરો"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"પ્રદાન કરશો નહીં"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"માન્ય કરશો નહીં"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"કોઇ પ્રમાણપત્ર સ્પષ્ટ કરેલ નથી. તમારું કનેક્શન ખાનગી રહેશે નહીં."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"નેટવર્કનું નામ ખૂબ લાંબુ છે."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ડોમેનનો ઉલ્લેખ કરવો આવશ્યક છે."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"પ્રમાણપત્ર જરૂરી છે."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"કનેક્ટ કરો"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wifi ચાલુ કર્યું"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>થી કનેક્ટ થયા"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> સાથે કનેક્ટ કરી રહ્યાં છીએ"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"કનેક્ટ થઈ રહ્યું છે…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"નેટવર્ક સાથે કનેક્ટ કરવામાં નિષ્ફળ થયાં"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"નેટવર્ક રેન્જમાં નથી"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ડિવાઇસનું MAC ઍડ્રેસ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"રેન્ડમ કરેલું MAC ઍડ્રેસ"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"રેન્ડમ કરેલું MAC ઍડ્રેસ (છેલ્લે ઉપયોગ કરાયો)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ઍડ્રેસ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"નેટવર્કની વિગતો"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"સબનેટ માસ્ક"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 સરનામા"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"સાચવેલા નેટવર્ક"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"સબ્સ્ક્રિપ્શન"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"અન્ય નેટવર્ક"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP સેટિંગ"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"આ વપરાશકર્તા માટે વાઇ-ફાઇ વિગતવાર સેટિંગ્સ ઉપલબ્ધ નથી"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"સાચવો"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"એક માન્ય ગેટવે સરનામું લખો."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"એક માન્ય DNS સરનામું લખો."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 અને 32 વચ્ચે એક નેટવર્ક પ્રીફિક્સ લંબાઈ લખો."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (સિવાય કે ખાનગી DNS દ્વારા ઓવરરાઇડ કર્યું હોય)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (સિવાય કે ખાનગી DNS દ્વારા ઓવરરાઇડ કર્યું હોય)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ગેટવે"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"નેટવર્ક પ્રીફિક્સ લંબાઈ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"વાઇ-ફાઇ ડાઇરેક્ટ"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ઍપ કન્ટેન્ટ શેર કરી રહી છે. ઇન્ટરનેટ કનેક્શન શેર કરવા માટે હૉટસ્પૉટને બંધ કરીને ફરી ચાલુ કરો"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"કોઈ પાસવર્ડ સેટ કરવામાં આવ્યો નથી"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"હૉટસ્પૉટનું નામ"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ચાલુ કરીએ છીએ..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ચાલુ કરી રહ્યાં છીએ…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> સાથે અન્ય ઉપકરણો પણ કનેક્ટ કરી શકાય છે"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"હૉટસ્પૉટનો પાસવર્ડ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP બૅન્ડ"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"અમુક કન્ટેન્ટ માટે રિફ્રેશ થવાનો રેટ ઑટોમૅટિક રીતે 60થી વધારીને 90 Hz કરે છે. બૅટરીનો વપરાશ વધારે છે."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz રિફ્રેશ રેટ ફરજિયાત બનાવો"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"સ્પર્શના પ્રતિભાવમાં સુધારણા અને ઍનિમેશનની ક્વૉલિટી માટે ઉચ્ચતમ રિફ્રેશ રેટ. આ સુવિધા બૅટરીનો વપરાશ વધારે છે."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"સ્ક્રીન અટેન્શન"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ચાલુ / જો તમે સ્ક્રીન તરફ જોતા હો, તો તમારી સ્ક્રીન બંધ થશે નહીં"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"જ્યારે સ્ક્રીન ઘેરા રંગની હોય છે, ત્યારે તે નવા નોટિફિકેશન માટે ચાલુ થઈ જાય છે"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"સમય અને માહિતી હંમેશાં બતાવો"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"વધારેલો બૅટરી વપરાશ"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"બોલ્ડ ટેક્સ્ટ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ફોન્ટનું કદ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ટેક્સ્ટને નાની અથવા મોટી કરો"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"સિમ કાર્ડ લૉક સેટિંગ્સ"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android વર્ઝન"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android માટે સુરક્ષા અપડેટ"</string>
     <string name="model_info" msgid="8997566254717810904">"મોડલ"</string>
-    <string name="model_summary" msgid="2246651782442466213">"મૉડલ: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"મૉડલ અને હાર્ડવેર"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"હાર્ડવેર વર્ઝન"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"સાધન ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN કાઢી નાખો"</string>
     <string name="menu_new" msgid="6571230342655509006">"નવું APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"સાચવો"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"નિકાળો"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"રદ કરો"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"નામ ફીલ્ડ ખાલી હોઈ શકતું નથી."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN ખાલી હોઇ શકતું નથી."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ઍપ રીસેટ થઈ શકે છે"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"વાઇ-ફાઇ, મોબાઇલ અને બ્લૂટૂથ રીસેટ કરો"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"આ બધા નેટવર્ક સેટિંગ રીસેટ કરશે, જેમાં આનો સમાવેશ છે: \n\n"<li>"Wi‑Fi"</li>\n<li>"મોબાઇલ ડેટા"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"કાઢી નાખો"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ડાઉનલોડ કરેલાં સિમ કાઢી નખાશે"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"બદલીને લેવાના સિમ ડાઉનલોડ કરવા માટે, તમારા કૅરિઅરનો સંપર્ક કરો. આનાથી કોઈપણ મોબાઇલ સેવા પ્લાન રદ થશે નહીં."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"આનાથી કોઈપણ મોબાઇલ સેવા પ્લાન રદ થશે નહીં. બદલીના SIM કાર્ડ ડાઉનલોડ કરવા માટે, તમારા મોબાઇલ ઑપરેટરનો સંપર્ક કરો."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"સેટિંગ્સ ફરીથી સેટ કરો"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"બધાં નેટવર્ક સેટિંગ રીસેટ કરીએ? તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"બધા નેટવર્ક સેટિંગ રીસેટ કરીએ અને ડાઉનલોડ કરેલાં સિમ કાઢી નાખીએ? તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"નેટવર્ક સેટિંગ્સ ફરીથી સેટ કરવામાં આવી છે"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"સિમ કાઢી નાખી શકાતાં નથી"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ડાઉનલોડ કરેલાં સિમ ભૂલને કારણે કાઢી નાખી શકાતાં નથી.\n\nતમારું ડિવાઇસ ફરી શરૂ કરો અને ફરી પ્રયાસ કરો."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"બધો ડેટા કાઢી નાખો (ફેક્ટરી રીસેટ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"બધો ડેટા કાઢી નાખો (ફેક્ટરી રીસેટ)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"આ ક્રિયા તમારા ટૅબ્લેટના "<b>"આંતરિક સ્ટોરેજ"</b>"માંથી બધો ડેટા કાઢી નાખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ તેમજ ઍપ ડેટા અને સેટિંગ"</li>\n<li>"ડાઉનલોડ કરેલી ઍપ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"આ ક્રિયા તમારા ફોનના "<b>"આંતરિક સ્ટોરેજ"</b>"માંથી બધો ડેટા કાઢી નાખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ તેમજ ઍપ ડેટા અને સેટિંગ"</li>\n<li>"ડાઉનલોડ કરેલી ઍપ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"તમે હાલમાં નીચેના એકાઉન્ટ્સમાં સાઇન ઇન થયેલાં છો:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"આ ઉપકરણ પર અન્ય વપરાશકર્તા હાજર છે.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"સંગીત"</li>\n<li>"ફોટા"</li>\n<li>"અન્ય વપરાશકર્તા ડેટા"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ઇ-સિમ"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"આનાથી તમારો મોબાઇલ સેવા પ્લાન રદ થશે"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"સંગીત, ચિત્રો અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"USB સંગ્રહ"</b>"ને કાઢી નાખવાની જરૂર છે."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"સંગીત, ચિત્રો અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"SD કાર્ડ"</b>"ને કાઢી નાખવાની જરૂર છે."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"બધો ડેટા કાઢી નાખો (ફેક્ટરી રીસેટ)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"બધો ડેટા કાઢી નાખો (ફેક્ટરી રીસેટ)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"આ ક્રિયા તમારા ટૅબ્લેટના "<b>"આંતરિક સ્ટોરેજ"</b>"માંથી બધો ડેટા કાઢી નાખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ તેમજ ઍપ ડેટા અને સેટિંગ"</li>\n<li>"ડાઉનલોડ કરેલી ઍપ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"આ ક્રિયા તમારા ફોનના "<b>"આંતરિક સ્ટોરેજ"</b>"માંથી બધો ડેટા કાઢી નાખશે, જેમાં આનો સમાવેશ થાય છે:\n\n"<li>"તમારું Google એકાઉન્ટ"</li>\n<li>"સિસ્ટમ તેમજ ઍપ ડેટા અને સેટિંગ"</li>\n<li>"ડાઉનલોડ કરેલી ઍપ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"તમે અત્યારે નીચેના એકાઉન્ટમાં સાઇન ઇન થયેલા છો:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"આ ડિવાઇસ પર અન્ય વપરાશકર્તાઓ હાજર છે.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"મ્યુઝિક"</li>\n<li>"ફોટા"</li>\n<li>"અન્ય વપરાશકર્તા ડેટા"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"ઇ-સિમ"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"આનાથી તમારો મોબાઇલ સેવા પ્લાન રદ થશે નહીં."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"મ્યુઝિક, ફોટા અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"USB સ્ટોરેજ"</b>" કાઢી નાખવાની જરૂર છે."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"મ્યુઝિક, ફોટા અને અન્ય વપરાશકર્તા ડેટા સાફ કરવા માટે, "<b>"SD કાર્ડ"</b>" કાઢી નાખવાની જરૂર છે."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB સ્ટોરેજ ભૂસી નાખો"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD કાર્ડ કાઢી નાંખો"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"આંતરિક USB સંગ્રહમાંથી તમામ ડેટા કાઢી નાંખો, જેમ કે સંગીત અથવા ફોટો"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD કાર્ડ પરનો તમામ ડેટા કાઢી નાખો, જેમ કે સંગીત અથવા ફોટો"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"બધો ડેટા કાઢી નાખો"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"બધો ડેટા કાઢી નાખો"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"તમારી બધી વ્યક્તિગત માહિતી અને ડાઉનલોડ કરેલી ઍપ ડિલીટ કરવામાં આવશે. તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ડાઉનલોડ કરેલી ઍપ અને સિમ સહિતની તમારી બધી વ્યક્તિગત માહિતી ડિલીટ કરવામાં આવશે. તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"દરેક વસ્તુ કાઢી નાખો"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"કોઈ ફરીથી સેટ કરો કરવામાં આવ્યું નથી કારણ કે સિસ્ટમ સાફ સેવા ઉપલબ્ધ નથી."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"બધો ડેટા કાઢી નાખીએ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"આ વપરાશકર્તા માટે ફેક્ટરી રીસેટ ઉપલબ્ધ નથી"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"કાઢી નાંખી રહ્યું છે"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"કૃપા કરીને રાહ જુઓ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"બધો ડેટા કાઢી નાખો"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"બધો ડેટા કાઢી નાખો"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"તમારી બધી વ્યક્તિગત માહિતી અને ડાઉનલોડ કરેલી ઍપ ડિલીટ કરવામાં આવશે. તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ડાઉનલોડ કરેલી ઍપ અને સિમ સહિતની તમારી બધી વ્યક્તિગત માહિતી ડિલીટ કરવામાં આવશે. તમે આ ક્રિયા માટે કરેલો છેલ્લો ફેરફાર રદ કરી શકશો નહીં."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"બધો ડેટા કાઢી નાખીએ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"આ વપરાશકર્તા માટે ફેક્ટરી રીસેટ ઉપલબ્ધ નથી"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"કાઢી નાખી રહ્યાં છીએ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"કૃપા કરીને રાહ જુઓ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"કૉલ સેટિંગ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"વૉઇસમેઇલ, કૉલ ફોરવર્ડિંગ, કૉલ પ્રતીક્ષા, કૉલર ID સેટ કરો"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ટિથરિંગ"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> થી વધુ ઉપકરણો સાથે ટિથર કરી શકતાં નથી."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> અનટિથર થશે."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ઇથરનેટ ટિથરિંગ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ઇથરનેટ મારફતે ફોનનું ઇન્ટરનેટ કનેક્શન શેર કરો"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ઇથરનેટ મારફતે ફોનનું ઇન્ટરનેટ કનેક્શન શેર કરો"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"તમારા મોબાઇલ ડેટા કનેક્શન મારફતે અન્ય ઉપકરણોને ઇન્ટરનેટ પૂરું પાડવા માટે હૉટસ્પૉટ અને ટિથરિંગનો ઉપયોગ કરો. નજીકના ઉપકરણો સાથે કન્ટેન્ટ શેર કરવા માટે ઍપ પણ હૉટસ્પૉટ બનાવી શકે છે."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"તમારા વાઇ-ફાઇ અથવા મોબાઇલ ડેટા કનેક્શન મારફત અન્ય ડિવાઇસને ઇન્ટરનેટ પૂરું પાડવા માટે હૉટસ્પૉટ અને ઇન્ટરનેટ શેર કરવાની સુવિધાનો ઉપયોગ કરો. ઍપ નજીકનાં ડિવાઇસ સાથે કન્ટેન્ટ શેર કરવા માટે પણ હૉટસ્પૉટ બનાવી શકે છે."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"સહાય"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"બ્લૂટૂથ સ્કેનિંગ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"જ્યારે બ્લૂટૂથ બંધ હોય ત્યારે પણ ગમે ત્યારે ઍપ અને સેવાઓને નજીકના ઉપકરણો સ્કૅન કરવાની મંજૂરી આપો. ઉદાહરણ તરીકે, આનો ઉપયોગ સ્થાન આધારિત સુવિધાઓ અને સેવાઓને બહેતર બનાવવા માટે કરી શકાય છે."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"કાર્ય માટે સ્થાનની સેવાઓ"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"સ્થાનના સમય ઝોનની ઓળખ"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"સ્થાનના સમય ઝોનની ઓળખ"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"હાલના સમય ઝોનની ઓળખ કરવા માટે, ડિવાઇસના સ્થાનનો ઉપયોગ કરવાની મંજૂરી આપે છે. વાઇ-ફાઇ સ્કૅનિંગ જેવા અન્ય સ્થાન સેટિંગ, સમય ઝોનની ઓળખ કરવાની સચોટતા પર અસર કરી શકે છે."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ચાલુ છે"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"બંધ છે"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ઑટોમૅટિક રીતે સમય ઝોનની ઓળખ કરવાનું બંધ છે"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"સ્થાનના સમય ઝોનની ઓળખ બંધ કરવામાં આવેલી છે"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"સ્થાનના સમય ઝોનની ઓળખ કરવાને સપોર્ટ આપવામાં આવતો નથી"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"સ્થાનના સમય ઝોનની ઓળખમાં ફેરફાર કરવાની મંજૂરી નથી"</string>
     <string name="location_network_based" msgid="5247042890080021887">"વાઇ-ફાઇ અને મોબાઇલ નેટવર્ક સ્થાન"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"એપ્લિકેશન્સને તમારા સ્થાનનો વધુ ઝડપથી અંદાજ મેળવવા માટે Google ની સ્થાન સેવાનો ઉપયોગ કરવા દો. અનામી સ્થાન ડેટા એકત્રિત કરીને Google ને મોકલવામાં આવશે."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"સ્થાન વાઇ-ફાઇ દ્વારા નિર્ધારિત થયું"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ફેસ અનલૉકનો ઉપયોગ કરવા, પાસવર્ડ સેટ કરો"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ફેસ અનલૉકનો ઉપયોગ કરવા, પૅટર્ન સેટ કરો"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ફેસ અનલૉકનો ઉપયોગ કરવા, પિન સેટ કરો"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"બાયોમેટ્રિક્સ વાપરવા, પાસવર્ડ સેટ કરો"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"બાયોમેટ્રિક્સ વાપરવા, પૅટર્ન સેટ કરો"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"બાયોમેટ્રિક્સ વાપરવા, પિન સેટ કરો"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"તમારો પાસવર્ડ ભૂલી ગયાં?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"તમારા પૅટર્નને ભૂલી ગયાં?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"તમારો પિન ભૂલી ગયાં?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"કૅપ્શનની પસંદગીઓ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"વિસ્તૃતીકરણ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"વિસ્તૃતીકરણ ક્ષેત્ર"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"વિસ્તૃતીકરણ ચાલુ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"સ્ક્રીનનો વિસ્તાર કરો, ત્યારે તમે ઉપયોગ કરવા માગો છો તે વિસ્તૃતીકરણ ક્ષેત્રને પસંદ કરો"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"પૂર્ણ સ્ક્રીન"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"સ્ક્રીનનો ભાગ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"પૂર્ણ સ્ક્રીન અને સ્ક્રીનનો ભાગ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"સંપૂર્ણ સ્ક્રીનનો વિસ્તાર કરો"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"સ્ક્રીનના ભાગનો વિસ્તાર કરો"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"શું ઍક્સેસિબિલિટી બટન પર સ્વિચ કરીએ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"સ્ક્રીનના કોઈ ભાગને મોટો કરવા માટે ત્રણ વાર ટૅપનો ઉપયોગ કરવાથી ટાઇપિંગ અને અન્ય ક્રિયાઓ વિલંબિત થશે.\n\nશું તમે સ્ક્રીનના કોઈ ભાગને મોટો કરવા માટે, હજી પણ ઍક્સેસિબિલિટી બટનનો ઉપયોગ કરવા પર સ્વિચ કરવા માંગો છો?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ઍક્સેસિબિલિટી બટન પર સ્વિચ કરો"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"મોટું કરવા માટે ત્રણ વખત ટૅપ કરવાનું ચાલુ રાખો"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"સ્ક્રીન મોટી કરવાનું સેટિંગ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ત્રણ-ટૅપ વડે વિસ્તૃત કરો"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"શૉર્ટકટ વડે વિસ્તૃત કરો"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"પાવર બટન કૉલને સમાપ્ત કરે છે"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"મોટું માઉસ પોઇન્ટર"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ઍનિમેશન કાઢી નાખો"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"મૉનો ઑડિયો"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ઑડિયો ચલાવતી વખતે ચૅનલ્સ ભેગી કરો"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ઑડિયો બૅલેન્સ"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ડાબે"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"જમણે"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"મૉનો ઑડિયો"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ઑડિયો ચલાવતી વખતે ચૅનલ ભેગી કરો"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ઑડિયો બૅલેન્સ"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ડાબે"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"જમણે"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ડિફૉલ્ટ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 સેકન્ડ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 સેકન્ડ"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"નોટિફિકેશન વાઇબ્રેશન"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"રિંગ વાઇબ્રેશન"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"પ્રતિસાદને ટચ કરો"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>નો ઉપયોગ કરો"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ખોલો"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"રંગ સુધારણાનો ઉપયોગ કરો"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"કૅપ્શન બતાવો"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"માત્ર સપોર્ટ કરતી ઍપ માટે"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>નો ઉપયોગ કરો"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ખોલો"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"રંગ સુધારણાનો ઉપયોગ કરો"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"કૅપ્શન બતાવો"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"માત્ર સપોર્ટ હોય તેવી ઍપ માટે"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"કૅપ્શનનું કદ અને શૈલી"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ટેક્સ્ટનું કદ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"વધુ વિકલ્પો"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ડ્યૂટેરેનોમલી"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"પ્રોટેનોમલી"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ટ્રાઇટેનોમલી"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ગ્રેસ્કેલ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"લાલ-લીલો"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"લાલ-લીલો"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"વાદળી-પીળો"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"બૅકગ્રાઉન્ડ પ્રતિબંધ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ઍપ્લિકેશનને પૃષ્ઠભૂમિમાં ચાલવાની મંજૂરી આપો"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ઍપ્લિકેશનને પૃષ્ઠભૂમિમાં ચાલવાની મંજૂરી નથી"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"બૅકગ્રાઉન્ડ વપરાશને પ્રતિબંધિત કરી શકાય નહીં"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"બૅકગ્રાઉન્ડ વપરાશ પર પ્રતિબંધ મૂકી શકાય નહીં"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"બૅકગ્રાઉન્ડ પ્રવૃત્તિને મર્યાદિત કરીએ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"જો તમે બૅકગ્રાઉન્ડ પ્રવૃત્તિને એક ઍપ માટે મર્યાદિત કરો છો, તો તે અયોગ્ય વર્તન કરી શકે છે"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"આ ઍપ બૅટરી ઑપ્ટિમાઇઝ કરવા સેટ નથી તેથી તમે તેને પ્રતિબંધિત કરી શકશો નહીં.\n\nએને પ્રતિબંધિત કરવા, પહેલાં બૅટરી ઑપ્ટિમાઇઝ કરવાનું ચાલુ કરો."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"સામાન્ય કરતાં વધુ ઉપયોગમાં લેવાયેલું ટૅબ્લેટ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"સામાન્ય કરતાં વધુ ઉપયોગમાં લેવાયેલું ઉપકરણ"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"બૅટરી સામાન્ય કરતાં વહેલી સમાપ્ત થઈ શકે છે"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"બૅટરીની ક્ષમતા વધારવા ઑપ્ટિમાઇઝ કરી રહ્યાં છીએ"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"બૅટરીનો વપરાશ હંગામી રૂપે મર્યાદિત છે. વધુ જાણવા માટે ટૅપ કરો."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"તમારો ફોન સામાન્ય કરતાં વધુ ઉપયોગમાં લેવાયો છે. તમારી બૅટરી અપેક્ષા કરતાં વહેલી ખલાસ થઈ શકે છે.\n\nબૅટરી વપરાશ અનુસાર ટોચની ઍપ:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"તમારું ટૅબ્લેટ સામાન્ય કરતાં વધુ ઉપયોગમાં લેવાયું છે. તમારી બૅટરી અપેક્ષા કરતાં વહેલી ખલાસ થઈ શકે છે.\n\nબૅટરી વપરાશ અનુસાર ટોચની ઍપ:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"તમારું ડિવાઇસ સામાન્ય કરતાં વધુ ઉપયોગમાં લેવાયું છે. તમારી બૅટરી અપેક્ષા કરતાં વહેલી ખલાસ થઈ શકે છે.\n\nબૅટરી વપરાશ અનુસાર ટોચની ઍપ:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">%1$d ઍપ પ્રતિબંધિત છે</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"તમારું બૅટરી મીટર વાંચવામાં સમસ્યા આવી"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"તમારું બૅટરી મીટર વાંચવામાં સમસ્યા આવી. "<annotation id="url">"વધુ જાણવા"</annotation>" માટે ટૅપ કરો"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ઍપ્લિકેશન બંધ કરીએ?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"તમારો ફોન સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતો નથી કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ફોનને સક્રિય રાખે કરે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે ઍપ્લિકેશનને બંધ કરી શકો છો.\n\n જો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"તમારું ટૅબ્લેટ સામાન્ય રીતે બૅટરીનું સંચાલન કરી શકતું નથી કારણ કે <xliff:g id="APP">%1$s</xliff:g> તમારા ટૅબ્લેટને સક્રિય રાખે કરે છે.\n\nઆ સમસ્યાનું સમાધાન લાવવા માટે, તમે ઍપ્લિકેશનને બંધ કરી શકો છો.\n\n જો આમ થવાનું ચાલુ રહે, તો બૅટરીનું કાર્યપ્રદર્શન બહેતર બનાવવા માટે તમને ઍપ્લિકેશનને અનઇન્સ્ટૉલ કરવાની જરૂરી પડી શકે છે."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"શેડ્યૂલ સેટ કરો"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"બૅટરી આવરદા વધારો"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ચાર્જ થાય ત્યારે બંધ કરો"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"તમારો ફોન <xliff:g id="PERCENT">%1$s</xliff:g> પર હોય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"તમારું ટૅબ્લેટ <xliff:g id="PERCENT">%1$s</xliff:g> પર હોય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"તમારું ડિવાઇસ <xliff:g id="PERCENT">%1$s</xliff:g> પર હોય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"તમારો ફોન <xliff:g id="PERCENT">%1$s</xliff:g>થી વધારે ચાર્જ થાય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"તમારું ટૅબ્લેટ <xliff:g id="PERCENT">%1$s</xliff:g>થી વધારે ચાર્જ થાય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"તમારું ડિવાઇસ <xliff:g id="PERCENT">%1$s</xliff:g>થી વધારે ચાર્જ થાય ત્યારે બૅટરી સેવર બંધ થાય છે"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ચાલુ કરો"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ફરીથી સેટ કરો"</string>
     <string name="tts_play" msgid="2945513377250757221">"ચલાવો"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"એડૅપ્ટિવ કનેક્ટિવિટી"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"તમારા નેટવર્ક કનેક્શનને ઑટોમૅટિક રીતે મેનેજ કરીને બૅટરીની આવરદા વધારે છે અને ડિવાઇસનું કાર્યપ્રદર્શન બહેતર બનાવે છે"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ઓળખપત્ર સ્ટોરેજ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"પ્રમાણપત્ર ઇન્સ્ટૉલ કરો"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"સંગ્રહમાંથી પ્રમાણપત્રો ઇન્સ્ટોલ કરો"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"વપરાશકર્તા ઓળખપત્ર"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"સંગ્રહિત ઓળખપત્ર જુઓ અને સંશોધિત કરો"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"વિગતવાર"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"સંગ્રહ પ્રકાર"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"હાર્ડવેર-બેક્ડ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ફક્ત સોફ્ટવેર"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"આ વપરાશકર્તા માટે ઓળખપત્રો ઉપલબ્ધ નથી"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN અને ઍપ્લિકેશનો માટે ઇન્સ્ટૉલ કરેલ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"વાઇ-ફાઇ માટે ઇન્સ્ટૉલ કરેલ"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"ઇન્સ્ટૉલ કરશો નહીં"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"છતાં ઇન્સ્ટૉલ કરો"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"પ્રમાણપત્ર ઇન્સ્ટૉલ નથી કર્યું"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g>ને આ ડિવાઇસ પર પ્રમાણપત્રો ઇન્સ્ટૉલ કરવાની મંજૂરી આપીએ?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"નીચે આપેલી ઍપ અને URL પર તમે આ પ્રમાણપત્રોથી ઓળખાશો"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"મંજૂરી આપશો નહીં"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"મંજૂરી આપો"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"વધુ બતાવો"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"પ્રમાણપત્ર મેનેજમેન્ટની ઍપ"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"એકપણ નહીં"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"આ ઍપ દ્વારા ઇન્સ્ટૉલ કરવામાં આવેલા પ્રમાણપત્રો તમને નીચે આપેલી ઍપ અને URLs પર ઓળખે છે"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"કાઢી નાખો"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"કટોકટી સમયે ડાયલનું સિગ્નલ"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"જ્યારે કટોકટીનો કૉલ કરવામાં આવે ત્યારે વર્તન સેટ કરો"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"બૅકઅપ"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"સેટ કરેલ નથી - કાર્યાલયની પ્રોફાઇલ"</string>
     <string name="user_admin" msgid="4024553191395768119">"એડમિન"</string>
     <string name="user_you" msgid="3070562015202859996">"તમે (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ઉપનામ"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"તમે <xliff:g id="USER_COUNT">%1$d</xliff:g> જેટલા વપરાશકર્તાઓ ઉમેરી શકો છો"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"માત્ર ટૅબ્લેટના માલિક વપરાશકર્તાને મેનેજ કરી શકે છે."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"માત્ર ફોનના માલિક વપરાશકર્તાને મેનેજ કરી શકે છે."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ટર્મિનલ પર ચુકવવું"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ચુકવણી ઍપ્લિકેશન સેટ કરો. ત્યારબાદ તમારા ફોનની પાછળની ભાગને સંપર્કવિહીન પ્રતીક સાથેના કોઈપણ છેડાં પાસે પકડી રાખો."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"સમજાઈ ગયું"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"વધુ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"વધુ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ડિફૉલ્ટ ચુકવણી ઍપ સેટ કરો"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ડિફૉલ્ટ ચુકવણી ઍપ અપડેટ કરો"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"સંપર્ક રહિત ટર્મિનલ પર, <xliff:g id="APP">%1$s</xliff:g>થી ચુકવણી કરો"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"પાછળ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"આગલું"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"સમાપ્ત"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ફોટો લો"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"છબી પસંદ કરો"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ફોટો પસંદ કરો"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"સિમ કાર્ડ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"સિમ કાર્ડ"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"કૉલ્સ માટે આનો ઉપયોગ હંમેશાં કરો"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ડેટા માટે એક સિમ પસંદ કરો"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS માટે સિમ પસંદ કરો"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ડેટા સિમ પર સ્વિચ થઈ રહ્યો છે, આમાં એક મિનિટ લાગી શકે છે..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ડેટા સિમ પર સ્વિચ કરી રહ્યાં છીએ, આમાં એક મિનિટ જેટલો સમય લાગી શકે છે…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"આની સાથે કૉલ કરો"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"સિમ કાર્ડ પસંદ કરો"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"સિમ <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"રૂટિન, શેડ્યૂલ, બૅટરી સેવર, પાવર સેવર, બૅટરી, ઑટોમૅટિક, ટકા"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, વિગતવાર કૉલિંગ, 4g કૉલિંગ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ભાષા ઉમેરો, ભાષા ઉમેરો"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ટેક્સ્ટનું કદ"</string>
     <string name="default_sound" msgid="6604374495015245195">"ડિફોલ્ટ ધ્વનિ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"રિંગ અને નોટિફિકેશનનું વૉલ્યુમ <xliff:g id="PERCENTAGE">%1$s</xliff:g> છે"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"વૉલ્યૂમ, વાઇબ્રેશન, ખલેલ પાડશો નહીં"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ચાલુ થવા પર વાગનાર ધ્વનિ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"લાઇવ કૅપ્શન"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"મીડિયામાં કૅપ્શન ઑટોમૅટિક રીતે ઉમેરો"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"કોઈ નહીં"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ સેટ કરવામાં આવ્યું</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ સેટ કરવામાં આવ્યા</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{એકપણ નહીં}=1{એક શેડ્યૂલ સેટ કરવામાં આવ્યું}one{# શેડ્યૂલ સેટ કરવામાં આવ્યું}other{# શેડ્યૂલ સેટ કરવામાં આવ્યા}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ખલેલ પાડશો નહીં"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ફક્ત મહત્વપૂર્ણ લોકો અને ઍપ દ્વારા નોટિફિકેશન મેળવો"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"વિક્ષેપો મર્યાદિત કરો"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"માત્ર પ્રાધાન્યતા"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ચાલુ કરો / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"બંધ કરો / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"બંધ કરો"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ચાલુ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"દર વખતે પૂછો"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"તમે બંધ ન કરો ત્યાં સુધી"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> કલાક</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> કલાક</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> મિનિટ"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકશે</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકશે</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 કલાક}one{# કલાક}other{# કલાક}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 મિનિટ}one{# મિનિટ}other{# મિનિટ}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{બંધ}=1{બંધ / 1 શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}one{બંધ / # શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}other{બંધ / # શેડ્યૂલ ઑટોમૅટિક રીતે ચાલુ થઈ શકે છે}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'ખલેલ પાડશો નહીં\' સુવિધામાં શું વિક્ષેપ આવી શકે છે"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"લોકો"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ઍપ"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ઓછી પ્રાધાન્યતા ધરાવતા નોટિફિકેશનને ઑટોમૅટિક રીતે સામાન્ય નોટિફિકેશન પર સેટ કરો"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"નોટિફિકેશનનું સુવિધાજનક રેંકિંગ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ઑટોમૅટિક રીતે નોટિફિકેશનને સુસંગતતા અનુસાર રેંક આપો"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"સુવિધાજનક નોટિફિકેશનનો પ્રતિસાદ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"નોટિફિકેશનમાં કરવામાં આવેલી ગોઠવણો અને સિસ્ટમને પ્રતિસાદ આપવાનો વિકલ્પ બતાવો"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"નોટિફિકેશનનું મહત્ત્વ રીસેટ કરો"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"વપરાશકર્તા દ્વારા બદલવામાં આવેલા \'મહત્ત્વ વિશેના સેટિંગ\' રીસેટ કરો અને નોટિફિકેશન આસિસ્ટંટને પ્રાધાન્યતા નક્કી કરવાની મંજૂરી આપો"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"સૂચવેલી ક્રિયાઓ અને જવાબો"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ઑટોમૅટિક રીતે સૂચવેલી ક્રિયાઓ અને જવાબો બતાવો"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"એકદમ નવા અને સ્નૂઝ કરેલા નોટિફિકેશન બતાવો"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"પ્રાધાન્યવાળી વાતચીત"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"વાતચીત વિભાગની ટોચ પર અને ફ્લોટિંગ બબલ તરીકે બતાવો"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"વાતચીત વિભાગની ટોચ પર બતાવો"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"અન્ય વાતચીત"</string>
+    <string name="other_conversations" msgid="551178916855139870">"ગૌણ વાતચીતો"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"તમે જેમાં ફેરફારો કર્યા છે તેવી વાતચીતો"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"તાજેતરની વાતચીતો"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"હાલની વાતચીતો સાફ કરો"</string>
+    <string name="clear" msgid="5092178335409471100">"સાફ કરો"</string>
     <string name="important_bubble" msgid="7911698275408390846">"પ્રાધાન્યતા ધરાવતી વાતચીતો માટે બબલ બતાવો"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"પ્રાધાન્યતા ધરાવતી વાતચીતો નોટિફિકેશન શેડની ટોચ પર બતાવવામાં આવે છે. તમે તેને બબલ બતાવવા અને \'ખલેલ પાડશો નહીં\'ને વિક્ષેપિત કરવા માટે સેટ કરી શકો છો."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"પ્રાધાન્યતા ધરાવતી અને ફેરફાર કરેલી વાતચીતો અહીં દેખાશે"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"ખલેલ પાડશો નહીં નો ઍક્સેસ"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"ખલેલ પાડશો નહીંને મંજૂરી આપો"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"કોઇ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સએ ખલેલ પાડશો નહીં ઍક્સેસ કરવાની વિનંતી કરી નથી"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ઍપ લોડ કરી રહ્યાં છીએ…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનની કૅટેગરીને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"તમારી વિનંતી મુજબ Android આ ઍપના નોટિફિકેશનના ગ્રૂપને આ ડિવાઇસ પર પ્રદર્શિત થતા બ્લૉક કરી રહ્યું છે"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"બધી વાતચીત"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"પ્રાધાન્ય આપ્યું હોય તેવી વાતચીત"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"કોઈ નહીં"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> વાતચીત</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> વાતચીત</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"કોઈ નહીં"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{એકપણ નહીં}=1{1 વાતચીત}one{# વાતચીત}other{# વાતચીત}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"વિક્ષેપ ઊભો કરી શકે છે તે"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"કૉલ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"કૉલ"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"જે કૉલની મંજૂરી આપી હોય તેમાં સાઉન્ડ આવે તેની ખાતરી કરવા માટે, ડિવાઇસ રિંગ વાગે તેમ સેટ કરેલું હોવાનું ચેક કરો"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ માટે ઇનકમિંગ કૉલને બ્લૉક કરેલા છે. તમારા મિત્રો, પરિવારજનો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે સેટિંગને અનુકૂળ કરી શકો છો."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"સ્ટાર આપેલ સંપર્કો"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> અન્ય</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> અન્યો</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"કોઈ નહીં"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{એકપણ નહીં}=1{{contact_1}}=2{{contact_1} અને {contact_2}}=3{{contact_1}, {contact_2} અને {contact_3}}one{{contact_1}, {contact_2} અને # અન્ય વ્યક્તિ}other{{contact_1}, {contact_2} અને # અન્ય લોકો}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(નામ નથી)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"સંદેશા"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ માટે આવનારા સંદેશા બ્લૉક કરેલા છે. તમારા મિત્રો, કુટુંબના સભ્યો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે સેટિંગને ગોઠવી શકો છો."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"બધા સંદેશા તમને પ્રાપ્ત થઈ શકે છે"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"બધા કૉલ તમારા પર આવી શકે છે"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"કોઈ નહીં"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> સંપર્ક</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> સંપર્કો</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{એકપણ નહીં}=1{1 સંપર્ક}one{# સંપર્ક}other{# સંપર્કો}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"કોઈપણ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"સંપર્કો"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"સ્ટાર આપેલ સંપર્કો"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"બધા નોટિફિકેશન"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"અમુક નોટિફિકેશન"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"તમે ઍપને વિક્ષેપ પાડવાની મંજૂરી ન આપો તો પણ પસંદગીના લોકો તમારો સંપર્ક કરી શકે છે"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> વિક્ષેપ કરી શકે છે</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> વિક્ષેપ કરી શકે છે</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> વધુ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{કોઈપણ ઍપ \'ખલેલ પાડશો નહીં\' મોડને વિક્ષેપ કરી શકશે નહીં}=1{{app_1} વિક્ષેપ કરી શકે છે}=2{{app_1} અને {app_2} વિક્ષેપ કરી શકે છે}=3{{app_1}, {app_2} અને {app_3} વિક્ષેપ કરી શકે છે}one{{app_1}, {app_2} અને વધુ # વિક્ષેપ કરી શકે છે}other{{app_1}, {app_2} અને વધુ # વિક્ષેપ કરી શકે છે}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ઍપ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"બધા નોટિફિકેશન"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"કેટલાંક નોટિફિકેશન"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"વિક્ષેપ ઊભો કરી શકે તેવા નોટિફિકેશન"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"બધા નોટિફિકેશનની મંજૂરી આપો"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> વિક્ષેપ કરી શકે છે</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> વિક્ષેપ કરી શકે છે</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"કંઈપણ વિક્ષેપ આવી શકશે નહીં"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> વધુ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{કોઈપણ સાઉન્ડ \'ખલેલ પાડશો નહીં\' મોડને વિક્ષેપ કરી શકશે નહીં}=1{{sound_category_1} વિક્ષેપ કરી શકે છે}=2{{sound_category_1} અને {sound_category_2} વિક્ષેપ કરી શકે છે}=3{{sound_category_1}, {sound_category_2} અને {sound_category_3} વિક્ષેપ કરી શકે છે}one{{sound_category_1}, {sound_category_2} અને વધુ # વિક્ષેપ કરી શકે છે}other{{sound_category_1}, {sound_category_2} અને વધુ # વિક્ષેપ કરી શકે છે}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"કોઈપણ સાઉન્ડ \'ખલેલ પાડશો નહીં\' મોડને વિક્ષેપ કરી શકશે નહીં"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"કોઈપણ વિક્ષેપ કરી શકશે નહીં"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"અમુક લોકો વિક્ષેપ કરી શકે છે"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"બધા લોકો વિક્ષેપ કરી શકે છે"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ચાલુ"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"બંધ"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"ઍપ પિનિંગ"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"ઍપ પિનિંગ, તમે હાલની ઍપને અનપિન ન કરો ત્યાં સુધી તેને વ્યૂમાં રાખવાની તમને સુવિધા આપે છે. વિશ્વાસપાત્ર મિત્રને કોઈ ખાસ ગેમ રમવાની સવલત આપવા જેવા કાર્ય માટે આ સુવિધાનો ઉપયોગ થઈ શકે છે. \n\nઍપ પિન કરેલી હશે, ત્યારે પિન કરેલી ઍપ અન્ય ઍપ ખોલે અને વ્યક્તિગત ડેટા ઍક્સેસ કરી શકાય તેમ બની શકે છે. \n\nઍપ પિનિંગનો ઉપયોગ કરવા માટે: 	\n1.	ઍપ પિનિંગ ચાલુ કરો 	\n2.	ઓવરવ્યૂ ખોલો 	\n3.	સ્ક્રીનમાં સૌથી ઉપર આવેલા ઍપ આઇકન પર ટૅપ કરો, ત્યાર બાદ પિન કરો પર ટૅપ કરો"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"ઍપ પિનિંગ, તમે હાલની ઍપને અનપિન ન કરો ત્યાં સુધી તેને વ્યૂમાં રાખવાની તમને સુવિધા આપે છે. વિશ્વાસપાત્ર મિત્રને કોઈ ખાસ ગેમ રમવાની સવલત આપવા જેવા કાર્ય માટે આ સુવિધાનો ઉપયોગ થઈ શકે છે. \n\nઍપ પિન કરેલી હશે, ત્યારે પિન કરેલી ઍપ અન્ય ઍપ ખોલે અને વ્યક્તિગત ડેટા ઍક્સેસ કરી શકાય તેમ બની શકે છે. \n\nતમારે તમારું ડિવાઇસ કોઈ વ્યક્તિ સાથે સુરક્ષિત રીતે શેર કરવું હોય, તો વિકલ્પરૂપે અતિથિ વપરાશકર્તાનો ઉપયોગ કરી જુઓ. \n\nઍપ પિનિંગનો ઉપયોગ કરવા માટે: 	\n1.	ઍપ પિનિંગ ચાલુ કરો 	\n2.	ઓવરવ્યૂ ખોલો 	\n3.	સ્ક્રીનમાં સૌથી ઉપર આવેલા ઍપ આઇકન પર ટૅપ કરો, ત્યાર બાદ પિન કરો પર ટૅપ કરો"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"ઍપ પિનિંગ, તમે હાલની ઍપને અનપિન ન કરો ત્યાં સુધી તેને વ્યૂમાં રાખવાની તમને સુવિધા આપે છે. વિશ્વાસપાત્ર મિત્રને કોઈ ખાસ ગેમ રમવાની સવલત આપવા જેવા કાર્ય માટે આ સુવિધાનો ઉપયોગ થઈ શકે છે."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"ઍપ પિન કરેલી હશે, ત્યારે પિન કરેલી ઍપ અન્ય ઍપ ખોલે અને વ્યક્તિગત ડેટા ઍક્સેસ કરી શકાય તેમ બની શકે છે. \n\nઍપ પિનિંગનો ઉપયોગ કરવા માટે: 	\n1.	ઍપ પિનિંગ ચાલુ કરો 	\n2.	ઓવરવ્યૂ ખોલો 	\n3.	સ્ક્રીનમાં સૌથી ઉપર આવેલા ઍપ આઇકન પર ટૅપ કરો, ત્યાર બાદ પિન કરો પર ટૅપ કરો"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"ઍપ પિન કરેલી હશે, ત્યારે પિન કરેલી ઍપ અન્ય ઍપ ખોલે અને વ્યક્તિગત ડેટા ઍક્સેસ કરી શકાય તેમ બની શકે છે. \n\nતમારે તમારું ડિવાઇસ કોઈ વ્યક્તિ સાથે સુરક્ષિત રીતે શેર કરવું હોય, તો વિકલ્પરૂપે અતિથિ વપરાશકર્તાનો ઉપયોગ કરી જુઓ. \n\nઍપ પિનિંગનો ઉપયોગ કરવા માટે: 	\n1.	ઍપ પિનિંગ ચાલુ કરો 	\n2.	ઓવરવ્યૂ ખોલો 	\n3.	સ્ક્રીનમાં સૌથી ઉપર આવેલા ઍપ આઇકન પર ટૅપ કરો, ત્યાર બાદ પિન કરો પર ટૅપ કરો"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"ઍપ પિન કરેલી હોય, ત્યારે: \n\n•		વ્યક્તિગત ડેટા ઍક્સેસ કરી શકાય તેમ બની શકે \n		(જેમ કે સંપર્કો અને ઇમેલનું કન્ટેન્ટ) \n•		પિન કરેલી ઍપ અન્ય ઍપ ખોલે તેમ બની શકે \n\nમાત્ર તમારા વિશ્વાસપાત્ર લોકો સાથે ઍપ પિનિંગનો ઉપયોગ કરો."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"અનપિન કરતા પહેલાં અનલૉક પૅટર્ન માટે પૂછો"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"અનપિન કરતા પહેલાં પિન માટે પૂછો"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારા ચહેરાનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણ શરૂ થાય તે પહેલાં તમારો પિન આવશ્યક બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા નોટિફિકેશન પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણોના ખોવાઈ જવા કે ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પિન આવશ્યક છે?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારા ચહેરાનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણ શરૂ થાય તે પહેલાં તમારી પૅટર્ન આવશ્યક બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા નોટિફિકેશન પ્રાપ્ત કરી શકતું નથી.\n\nઆ ઉપકરણો ખોવાઈ અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પૅટર્ન આવશ્યક છે?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણ શરૂ થાય તે પહેલાં તમારો પાસવર્ડ જરૂરી બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે અલાર્મ સહિત કૉલ, સંદેશા અથવા નોટિફિકેશન પ્રાપ્ત કરી શકતું નથી.\n\nઆ ઉપકરણો ખોવાઈ કે ચોરાઈ જાય ત્યારે ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પાસવર્ડ આવશ્યક છે?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"તમારા ડિવાઇસને અનલૉક કરવા માટે તમારા બાયોમેટ્રિક્સનો ઉપયોગ કરવા ઉપરાંત, તમે આ ડિવાઇસ શરૂ થાય તે પહેલા તમારો પિન જરૂરી બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ડિવાઇસ શરૂ ન થાય ત્યાં સુધી, તે અલાર્મ સહિત કૉલ, સંદેશા અથવા નોટિફિકેશન પ્રાપ્ત કરી શકતું નથી.\n\nઆ ડિવાઇસ ખોવાઈ અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ડિવાઇસ શરૂ કરવા માટે પિન આવશ્યક છે?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"તમારા ડિવાઇસને અનલૉક કરવા માટે તમારા બાયોમેટ્રિક્સનો ઉપયોગ કરવા ઉપરાંત, તમે આ ડિવાઇસ શરૂ થાય તે પહેલા તમારી પૅટર્ન જરૂરી બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ડિવાઇસ શરૂ ન થાય ત્યાં સુધી, તે અલાર્મ સહિત કૉલ, સંદેશા અથવા નોટિફિકેશન પ્રાપ્ત કરી શકતું નથી.\n\nઆ ડિવાઇસ ખોવાઈ અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ડિવાઇસ શરૂ કરવા માટે પૅટર્ન આવશ્યક છે?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"તમારા ડિવાઇસને અનલૉક કરવા માટે તમારા બાયોમેટ્રિક્સનો ઉપયોગ કરવા ઉપરાંત, તમે આ ડિવાઇસ શરૂ થાય તે પહેલાં તમારો પાસવર્ડ જરૂરી બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ડિવાઇસ શરૂ ન થાય ત્યાં સુધી, તે અલાર્મ સહિત કૉલ, સંદેશા અથવા નોટિફિકેશન પ્રાપ્ત કરી શકતું નથી.\n\nઆ ડિવાઇસ ખોવાઈ અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ડિવાઇસ શરૂ કરવા માટે પાસવર્ડ આવશ્યક છે?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"હા"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"નહીં"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"પ્રતિબંધિત"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"આના દ્વારા નિયંત્રિત USB"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"કનેક્ટ થયેલ ઉપકરણ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"આ ડિવાઇસ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"સ્વિચ કરી રહ્યાં છીએ…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"સ્વિચ કરી રહ્યાં છીએ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"સ્વિચ કરી શક્યા નથી"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"આ ડિવાઇસને ચાર્જ કરવું"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"કનેક્ટેડ ઉપકરણ ચાર્જ કરી રહ્યાં છીએ"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"મોબાઇલ ડેટા વપરાશ"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"ઍપ ડેટા વપરાશ"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"વાઇ-ફાઇ ડેટા વપરાશ"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"મોબાઇલ ઑપરેટરના ડેટા સિવાયનો ડેટા વપરાશ"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ઇથરનેટ ડેટા વપરાશ"</string>
     <string name="wifi" msgid="2932584495223243842">"વાઇ-ફાઇ"</string>
     <string name="ethernet" msgid="4665162609974492983">"ઇથરનેટ"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> પ્રતિબંધ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"કૅરિઅર ડેટા ગણતરી, ડિવાઇસ ગણતરીથી અલગ હોઈ શકે છે"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"મોબાઇલ ઑપરેટરના નેટવર્ક દ્વારા વપરાયેલો ડેટા શામેલ નથી"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ઉપયોગ થયો"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ડેટા ચેતવણી સેટ કરો"</string>
     <string name="data_warning" msgid="2925054658166062884">"ડેટા ચેતવણી"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"વિગતો જુઓ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ડેટા સેવર"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"અપ્રતિબંધિત ડેટા"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"બૅકગ્રાઉન્ડ ડેટા બંધ કર્યો છે"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"બૅકગ્રાઉન્ડ ડેટા બંધ કર્યો છે"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ચાલુ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"બંધ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ડેટા સેવરનો ઉપયોગ કરો"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"જો ઉપકરણ લૉક કરેલ છે, તો સૂચનાઓમાં જવાબો અથવા અન્ય ટેક્સ્ટને લખવાનું ટાળો"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ડિફોલ્ટ જોડણી તપાસનાર"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"જોડણી તપાસનારને પસંદ કરો"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"જોડણી તપાસનારનો ઉપયોગ કરો"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"જોડણી તપાસનારનો ઉપયોગ કરો"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"પસંદ કર્યું નથી"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(કોઈ નહીં)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"સ્ટોરેજ સ્પેસ ખાલી કરવામાં સહાય માટે, સ્ટોરેજ સંંચાલક તમારા ઉપકરણમાંથી બૅકઅપ લીધેલા ફોટો અને વીડિઓને દૂર કરો."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ફોટો અને વીડિઓ દૂર કરો"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"સ્ટોરેજ સંચાલક"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"સ્ટોરેજ મેનેજરનો ઉપયોગ કરો"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"સ્ટોરેજ મેનેજરનો ઉપયોગ કરો"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ઑટોમૅટિક"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"મેન્યુઅલ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"હમણાં સ્પેસ ખાલી કરો"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ફોનને જોવા માટે બે વાર ટૅપ કરો"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ટેબ્લેટને જોવા માટે બે વાર ટૅપ કરો"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ઉપકરણને જોવા માટે બે વાર ટૅપ કરો"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"નોટિફિકેશન માટે સ્વાઇપ કરો"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"તમારી નોટિફિકેશન બતાવવા માટે સ્ક્રીનની નીચલી કિનારી પર નીચે સ્વાઇપ કરો"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"એક-હાથે વાપરો મોડ"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"એક-હાથે વાપરો મોડનો ઉપયોગ કરો"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ઍપ સ્વિચ કરતી વખતે એક-હાથે વાપરો મોડમાંથી બહાર નીકળો"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"સમયસમાપ્તિ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 સેકન્ડ"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 સેકન્ડ"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 સેકન્ડ"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"એક-હાથે વાપરો"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારી સ્ક્રીન પર બે વાર ટૅપ કરો."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ફોનને જોવા માટે ઉઠાવો"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ટેબ્લેટને જોવા માટે ઉઠાવો"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ટૅબ્લેટ ચેક કરવા માટે ટૅપ કરો"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ડિવાઇસ ચેક કરવા માટે ટૅપ કરો"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"સમય, નોટિફિકેશન અને અન્ય માહિતી ચેક કરવા માટે, તમારી સ્ક્રીન પર ટૅપ કરો."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ઇમર્જન્સી SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"ઇમર્જન્સી SOSનો ઉપયોગ કરો"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> દ્વારા મેનેજ કરવામાં આવે છે"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"ઝડપથી 5 કે તેથી વધુ વાર પાવર બટન દબાવીને નીચે આપેલી ક્રિયાઓ શરૂ કરો"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"કાઉન્ટડાઉન અલાર્મ વગાડો"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"સહાય માટે સૂચિત કરતા પહેલાં મોટો અવાજ કરો"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"સહાય માટે કૉલ કરો"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"સહાય માટે કૉલ કરવા માટેનો નંબર"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. બદલવા માટે ટૅપ કરો"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"જો તમે ઇમર્જન્સી નંબર ન હોય તેવો કોઈ નંબર દાખલ કરો તો:\n • ઇમર્જન્સી SOSનો ઉપયોગ કરવા માટે તમારું ડિવાઇસ અનલૉક થયેલું હોવું જોઈએ\n • તમારા કૉલનો જવાબ ન મળે તેવું બની શકે છે"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"નોટિફિકેશનો માટે ફિંગરપ્રિન્ટને સ્વાઇપ કરો"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ફિંગરપ્રિન્ટને સ્વાઇપ કરો"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"તમારા નોટિફિકેશનને જોવા માટે, તમારા ફોનની પાછળની બાજુએ ફિંગરપ્રિન્ટ સેન્સર પર નીચે સ્વાઇપ કરો."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"જોઈ શકાતા મહત્તમ ડેટાસેટની સંખ્યા"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ડિફૉલ્ટ મૂલ્યો પર રીસેટ કરો"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"ઑટોમૅટિક રીતે ભરવાના ડેવલપરના વિકલ્પો રીસેટ કરવામાં આવ્યા છે"</string>
+    <string name="location_category" msgid="3496759112306219062">"સ્થાન"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"સ્ટેટસ બાર પર સ્થાન સૂચક"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"નેટવર્ક અને કનેક્ટિવિટી સહિત બધા સ્થાનો માટે બતાવો"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"સંપૂર્ણ GNSS માપને લાગુ કરો"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"કોઈપણ ડ્યૂટી-સાઈક્લિંગ વગર બધા GNSS તારામંડળો અને આવર્તનો ટ્રૅક કરો"</string>
     <string name="device_theme" msgid="5027604586494772471">"ઉપકરણની થીમ"</string>
     <string name="default_theme" msgid="4815428567082263639">"ડિફૉલ્ટ"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"નેટવર્કનું નામ"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"ધ્યાન કેન્દ્રિત કરવા માટે નોટિફિકેશન થોભાવો"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"સુવિધા ઉપલબ્ધ નથી"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"આ સુવિધા બંધ કરવામાં આવી છે કારણ કે તે તમારા ફોનની કામ કરવાની ગતિ ધીમી કરે છે"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"સંપૂર્ણ GNSS માપને લાગુ કરો"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"કોઈપણ ડ્યૂટી-સાઈક્લિંગ વગર બધા GNSS તારામંડળો અને આવર્તનો ટ્રૅક કરો"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"હંમેશા ક્રૅશ સંવાદ બતાવો"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"જયારે પણ કોઈ ઍપ ક્રૅશ થાય ત્યારે સંવાદ બતાવો"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE દ્વારા ચાલુ ઍપ્લિકેશન પસંદ કરો"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"બધા ઍપ માટે ચાલુ કરો"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ગ્રાફિક્સ ડ્રાઇવર પસંદ કરો"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ડિફૉલ્ટ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ગેમ ડ્રાઇવર"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ગેમ માટેના ગ્રાફિક ડ્રાઇવર"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ડેવલપર ડ્રાઇવર"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"સિસ્ટમ ગ્રાફિક્સ ડ્રાઇવર"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"ચાલુ (મ્યૂટ)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"બંધ"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"નેટવર્કની વિગતો"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"તમારા ઉપકરણનું નામ તમારા ફોનની ઍપ પર જોઈ શકાય છે. તમે બ્લૂટૂથથી કનેક્ટ કરો અથવા વાઇ-ફાઇ હૉટસ્પૉટને સેટ કરો ત્યારે તે અન્ય લોકોને પણ દેખાઈ શકે છે."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"તમારા ડિવાઇસનું નામ તમારા ફોનની ઍપ પર જોઈ શકાય છે. તમે બ્લૂટૂથ ડિવાઇસથી કનેક્ટ કરો, વાઇ-ફાઇ નેટવર્કથી કનેક્ટ કરો અથવા વાઇ-ફાઇ હૉટસ્પૉટને સેટ કરો ત્યારે તે અન્ય લોકોને પણ દેખાઈ શકે છે."</string>
     <string name="devices_title" msgid="649715719278562515">"ઉપકરણો"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"બધી સેટિંગ"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"સૂચનો"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"નેટવર્ક શોધી શક્યાં નથી. ફરી પ્રયાસ કરો."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(પ્રતિબંધિત)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"કોઈ સિમ કાર્ડ નથી"</string>
+    <string name="sim_card" msgid="6381158752066377709">"સિમ કાર્ડ"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"કોઈ સિમ કાર્ડ નથી"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"કોઈ માહિતી નથી"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"કનેક્ટ કરવા માટે સિમ કાર્ડ જરૂરી છે"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"કનેક્ટ કરવા માટે <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> સિમ કાર્ડ જરૂરી છે"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"પસંદગીનો નેટવર્ક મોડ: WCDMA પસંદ કરેલ છે"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"પસંદગીનો નેટવર્ક મોડ: માત્ર GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"પસંદગીનો નેટવર્ક મોડ: માત્ર WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"મોબાઇલ ડેટા"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"મોબાઇલ નેટવર્કનો વપરાશ કરીને ડેટા ઍક્સેસ કરો"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"રેન્જમાં હશે ત્યારે ફોન ઑટોમૅટિક રીતે આ કૅરિઅર પર સ્વિચ કરશે"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"કોઈ સિમ કાર્ડ ઉપલબ્ધ નથી"</string>
     <string name="calls_preference" msgid="2166481296066890129">"કૉલની પસંદગી"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS પસંદગી"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"દર વખતે પૂછો"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"જ્યારે <xliff:g id="CARRIER">%1$s</xliff:g> સાથે કનેક્ટ થયેલ હોય, ત્યારે ઉપલબ્ધ નથી"</string>
     <string name="see_more" msgid="7499355691042812723">"વધુ જુઓ"</string>
     <string name="see_less" msgid="2642392725363552793">"ઓછું જુઓ"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ને ચાલુ કરીએ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"સિમ ચાલુ કરીએ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરીએ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"શું સિમ કાર્ડના ઉપયોગ પર સ્વિચ કરીએ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"એક સમયે માત્ર એક જ SIMને સક્રિય કરી શકાશે.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરવાથી <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>નો તમારો સેવા પ્લાન રદ થશે નહીં."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"એક સમયે ડાઉનલોડ કરેલું માત્ર એક જ સિમ સક્રિય રહી શકશે.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરવાથી તમારી <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>નો તમારો સેવા પ્લાન રદ થશે નહીં."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"એક સમયે માત્ર એક જ સિમને સક્રિય કરી શકાશે.\n\nસ્વિચ કરવાથી <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>નો તમારો સેવા પ્લાન રદ થશે નહીં."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરો"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"નેટવર્ક સાથે કનેક્ટ કરી રહ્યાં છીએ…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> પર સ્વિચ કરી રહ્યાં છીએ"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"મોબાઇલ ઑપરેટર સ્વિચ કરી શકાતા નથી"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"કોઈ ભૂલને કારણે મોબાઇલ ઑપરેટર સ્વિચ કરી શકાતા નથી."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ને બંધ કરીએ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"સિમ કાર્ડ બંધ કરીએ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"સિમ કાર્ડ બંધ કરી રહ્યાં છીએ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"મોબાઇલ ઑપરેટરને બંધ કરી શકાતા નથી"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"કંઈક ખોટું થયું હતું અને તમારા મોબાઇલ ઑપરેટરને બંધ કરી શક્યાં નથી."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 સિમનો ઉપયોગ કરીએ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"આ ડિવાઇસમાં એકવારમાં 2 સિમ સક્રિય થઈ શકે છે. એકવારમાં 1 જ સિમનો ઉપયોગ કરવાનું ચાલુ રાખવા માટે, \"ના, આભાર\" પર ટૅપ કરો."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ડિવાઇસ ફરી શરૂ કરીએ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"પ્રારંભ કરવા માટે, તમારા ડિવાઇસને ફરી શરૂ કરો. પછી તમે બીજું સિમ ઉમેરી શકો છો."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"આગળ વધો"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ફરી શરૂ કરો"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"ના, આભાર"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"સ્વિચ કરો"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"સિમ કાર્ડ સક્રિય કરી શકાતું નથી"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"સિમ કાર્ડ કાઢી નાખો અને તેને ફરીથી દાખલ કરો. તેમ છતાં સમસ્યા આવે, તો તમારું ડિવાઇસ ફરી શરૂ કરો."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"સિમ કાર્ડ ફરીથી ચાલુ કરવાનો પ્રયાસ કરો. તેમ છતાં સમસ્યા આવે, તો તમારું ડિવાઇસ ફરી શરૂ કરો."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"નેટવર્કનું સક્રિયકરણ"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> સક્રિય છે"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"સિમના સેટિંગ અપડેટ કરવા માટે ટૅપ કરો"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"સિમ કાર્ડ"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"આ ડાઉનલોડ કરેલું સિમ કાઢી નાખીએ?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"આ સિમ કાઢી નાખવાથી આ ડિવાઇસમાંથી <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> સેવા કાઢી નાખવામાં આવશે.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> માટેની સેવા રદ નહીં થાય."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"કાઢી નાખો"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"સિમ કાઢી નાખી રહ્યાં છીએ…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"સિમ કાઢી નાખી શકાતું નથી"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"ભૂલને કારણે આ સિમ કાઢી નાખી શકાતું નથી.\n\nતમારું ડિવાઇસ ફરી શરૂ કરો અને ફરી પ્રયાસ કરો."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ડિવાઇસ સાથે કનેક્ટ કરો"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> ઍપ તમારા ડિવાઇસ સાથે કનેક્ટ થવા માટે હંગામી વાઇ-ફાઇ નેટવર્કનો ઉપયોગ કરવા માગે છે"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"કોઈ ડિવાઇસ મળ્યું નથી. ખાતરી કરો કે ડિવાઇસ ચાલુ છે અને કનેક્ટ કરવા માટે ઉપલબ્ધ છે."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"ઇમર્જન્સી કૉલ"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"વાઇ-ફાઇ કૉલિંગ પર ઇમર્જન્સી કૉલ કરવાની સુવિધા તમારા કૅરિઅર પર સમર્થિત નથી.\nઇમર્જન્સી કૉલ કરવા માટે ડિવાઇસ ઑટોમૅટિક રીતે સેલ્યુલર નેટવર્ક પર સ્વિચ કરે છે.\nઇમર્જન્સી કૉલ કરવાનું ફક્ત સેલ્યુલર કવરેજ ધરાવતા વિસ્તારમાં જ શક્ય છે."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"ક્વૉલિટી સુધારવા કૉલ માટે વાઇ-ફાઇનો ઉપયોગ કરો"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"ક્રૉસ સિમ કૉલિંગ"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"આ સિમથી બીજા સિમ પર કૉલ કરવા અને SMSs મોકલવાની મંજૂરી આપો."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"ક્રૉસ સિમ કૉલિંગ"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"ઇનક્મિંગ MMS સંદેશ"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS સંદેશ મોકલી શકાતો નથી"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"મોબાઇલ ડેટા બંધ હોય ત્યારે પણ <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> પર MMS સંદેશ મોકલવાની મંજૂરી આપવા માટે ટૅપ કરો"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"સેટિંગ પર સ્ક્રીન ઓવરલે થવાની મંજૂરી આપો"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"સેટિંગ સ્ક્રીનને ઓવરલે કરવા માટે અન્ય ઍપની ટોચે પ્રદર્શિત થઈ શકે તેવી ઍપને મંજૂરી આપો"</string>
     <string name="media_controls_title" msgid="403271085636252597">"મીડિયા"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"મીડિયાનું સત્ર સમાપ્ત થઈ જાય ત્યારે, પ્લેયર છુપાવો"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"આ પ્લેયર ઝડપી સેટિંગના મોટા કરેલા પૅનલમાંથી કોઈ સત્ર ફરીથી શરૂ કરવાની મંજૂરી આપે છે."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ઝડપી સેટિંગમાં મીડિયા પ્લેયરના સેટિંગ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"પ્લેબૅક સરળતાથી ફરી શરૂ કરવા, મીડિયા પ્લેયરને લાંબા સમયગાળા માટે બતાવો"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"પ્લેયર છુપાવો"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"પ્લેયર બતાવો"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"કોઈ પ્લેયર ઉપલબ્ધ નથી"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"મંજૂર કરેલી ઍપ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"મીડિયા"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"બ્લૂટૂથ ચાલુ થશે"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ચાલુ"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"બંધ"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"ઇન્ટરનેટ"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"સિમ"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"એરપ્લેન મોડમાં ઉપયોગ માટે સુરક્ષિત નેટવર્ક"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"એરપ્લેન મોડમાં ઉપયોગ માટે સુરક્ષિત નેટવર્ક શોધો અને તેની સાથે કનેક્ટ કરો"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"એરપ્લેન, એરપ્લેન મોડમાં ઉપયોગ માટે સુરક્ષિત"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"કૉલ અને SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"વાઇ-ફાઇ કૉલિંગ"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"વાઇ-ફાઇ જેવા મોબાઇલ ઑપરેટર વિનાના નેટવર્ક પરથી કૉલ કરો અને મેળવો"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"અમુક વાઇ-ફાઇ નેટવર્ક જેમ કે મોબાઇલ ઑપરેટર વિનાના નેટવર્ક પરથી વાઇ-ફાઇ કૉલિંગની સેવા તમને કૉલ કરવાની અને મેળવવાની સુવિધા આપે છે."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"કૉલ"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"પસંદ કરેલું"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"કૉલ માટે પસંદ કરેલું સિમ કાર્ડ"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS માટે પસંદ કરેલું સિમ કાર્ડ"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ઉપલબ્ધ નથી"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"કોઈ સિમ કાર્ડ નથી"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"પસંદગીઓ"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"સાર્વજનિક નેટવર્ક સાથે કનેક્ટ કરો"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"નેટવર્ક કનેક્શન, ઇન્ટરનેટ, વાયરલેસ, ડેટા, વાઇ-ફાઇ, સેલ્યુલર, મોબાઇલ, સેલ, મોબાઇલ ઑપરેટર, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"એરપ્લેન મોડમાં ઉપયોગ માટે સુરક્ષિત નેટવર્ક જુઓ"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"એરપ્લેન મોડ બંધ કરો"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ઉપલબ્ધ નથી કારણ કે બેડટાઇમ મોડ ચાલુ છે"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"નોટિફિકેશનનું મહત્ત્વ રીસેટ કરવાની પ્રક્રિયા પૂર્ણ થઈ."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"ઍપ"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"અવિશ્વસનીય ડિવાઇસ તમારા સંદેશા ઍક્સેસ કરવા માગે છે. વિગતો માટે ટૅપ કરો."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"સંદેશા ઍક્સેસ કરવાની મંજૂરી આપીએ?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"અવિશ્વસનીય બ્લૂટૂથ ડિવાઇસ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], તમારા સંદેશા ઍક્સેસ કરવા માગે છે.\n\nતમે પહેલાં ક્યારેય [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] સાથે કનેક્ટ થયા નથી."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"અવિશ્વસનીય ડિવાઇસ તમારા સંપર્કો અને કૉલ લૉગ ઍક્સેસ કરવા માગે છે. વિગતો માટે ટૅપ કરો."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"સંપર્કો અને કૉલ લૉગ ઍક્સેસ કરવાની મંજૂરી આપીએ?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"અવિશ્વસનીય બ્લૂટૂથ ડિવાઇસ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], તમારા સંપર્કો અને કૉલ લૉગ ઍક્સેસ કરવા માગે છે. આમાં ઇનકમિંગ અને આઉટગોઇંગ કૉલ વિશેનો ડેટા શામેલ છે.\n\nતમે પહેલાં ક્યારેય [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] સાથે કનેક્ટ થયા નથી."</string>
 </resources>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 322456e..bf25943 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"मध्यम"</item>
     <item msgid="6740026006576843477">"ज़्यादा"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"थोड़े समय के लिए"</item>
+    <item msgid="7397961711906421599">"कुछ समय के लिए"</item>
+    <item msgid="4079132024502041928">"ज़्यादा समय के लिए"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"डिफ़ॉल्ट"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"हर जगह लागू"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"सिर्फ़ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ग्लोबल"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 37750cb..aca9822 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"तारीख और समय"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"तारीख और समय सेट करें"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"तारीख, समय, समय क्षेत्र और प्रारूप सेट करें"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"नेटवर्क का दिया हुआ समय इस्तेमाल करें"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"नेटवर्क का दिया समय क्षेत्र इस्तेमाल करें"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"समय अपने-आप सेट हो जाए"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"समय क्षेत्र अपने-आप सेट हो जाए"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"डिफ़ॉल्ट जगह का इस्तेमाल करें"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑घंटा प्रारूप"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-घंटे वाले फ़ॉर्मैट का उपयोग करें"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"लॉक स्क्रीन पर प्रोफ़ाइल की जानकारी दिखाएं"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"खाते"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"जगह"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"जगह की जानकारी की सुविधा का इस्तेमाल करें"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"जगह की जानकारी वाली सुविधा का इस्तेमाल करें"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"बंद करें"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">चालू है - <xliff:g id="COUNT_1">%1$d</xliff:g> ऐप्लिकेशन के पास जगह की जानकारी का ऐक्सेस है</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"स्‍क्रीन लॉक करने, मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"स्क्रीन लॉक, फ़िंगरप्रिंट"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"स्क्रीन लॉक"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"फ़िंगरप्रिंट और चेहरा पहचानने की सुविधा से, सुरक्षित तरीके से फ़ोन को अनलॉक करें"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"आप ऐप्लिकेशन में साइन इन करके भी पैसे चुकाने की पुष्टि कर सकते हैं"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"इनसे अनलॉक करने की सुविधा सेट करें:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"मालिक का चेहरा पहचानकर अनलॉक"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"अपने फ़ोन को अनलॉक करना आसान बनाएं"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"फ़िंगरप्रिंट"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"फ़िंगरप्रिंट सेट अप करके फ़ोन को फटाफट अनलॉक करें"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"अभी नहीं"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"आगे बढ़ें"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"चेहरा जोड़ा गया"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"\'मालिक का चेहरा पहचानकर अनलॉक करना\' सेट अप करें"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"मालिक का चेहरा पहचानकर अनलॉक"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"चेहरे का इस्तेमाल कर पुष्टि करें"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"शुरू करें"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"अगर सुलभता सुविधा में मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा बंद है, तो हो सकता है कि सेट अप के कुछ चरण, टॉकबैक के साथ ठीक से काम न करें."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"वापस जाएं"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"सेट अप जारी रखें"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"सुलभता सेटअप का इस्तेमाल करें"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ऐप में \'मालिक का चेहरा पहचानकर अनलॉक करना\' का इस्तेमाल करते समय हमेशा पुष्टि करना ज़रूरी है"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"चेहरे का डेटा मिटाएं"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"\'मालिक का चेहरा पहचानकर अनलॉक करना\' सेट अप करें"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"अपने डिवाइस को अनलॉक करने के लिए, मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा का इस्तेमाल करें. इसका इस्तेमाल, ऐप्लिकेशन में साइन इन करने और पैसे चुकाने की पुष्टि के लिए भी किया जा सकता है.\n\nध्यान रखें:\nफ़ोन को सामने से देखने पर, आपके न चाहते हुए भी फ़ोन अनलॉक हो सकता है.\n\nआपका फ़ोन, आपके चेहरे के सामने लाकर कोई भी व्यक्ति उसे अनलॉक कर सकता है.\n\nआपका फ़ोन कोई ऐसा व्यक्ति भी अनलॉक कर सकता है जिसका चेहरा आपसे काफ़ी मिलता हो, जैसे कि जुड़वां भाई या बहन."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"अपने डिवाइस को अनलॉक करने, ऐप्लिकेशन में साइन इन करने, और भुगतानों की पुष्टि करने के लिए आप मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा का इस्तेमाल कर सकते हैं.\n\nध्यान रखें:\nफ़ोन को सामने से देखने पर, आपके न चाहते हुए भी आपका फ़ोन अनलॉक हो सकता है.\n\nआपका फ़ोन आपके चेहरे के सामने लाकर कोई भी व्यक्ति उसे अनलॉक कर सकता है, भले ही आपकी आंखें बंद क्यों न हों.\n\nआपका फ़ोन कोई ऐसा व्यक्ति भी अनलॉक कर सकता है जिसका चेहरा आपसे मिलता-जुलता हो, जैसे कि कोई जुड़वां भाई-बहन."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"अपने डिवाइस को अनलॉक करने, ऐप्लिकेशन में साइन इन करने, और पैसे चुकाने की पुष्टि करने के लिए \'मालिक का चेहरा पहचानकर अनलॉक\' करने की सुविधा का इस्तेमाल करें."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"ध्यान रखें:\nफ़ोन को सामने से देखने पर, आपके न चाहते हुए भी फ़ोन अनलॉक हो सकता है.\n\nआपके फ़ोन को आपके चेहरे के सामने लाकर कोई भी व्यक्ति उसे अनलॉक कर सकता है.\n\nआपका फ़ोन कोई ऐसा व्यक्ति भी अनलॉक कर सकता है जिसका चेहरा आपसे बहुत मिलता हो, जैसे कि जुड़वां भाई या बहन."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"ध्यान रखें:\nफ़ोन को सामने से देखने पर, आपके न चाहते हुए भी आपका फ़ोन अनलॉक हो सकता है.\n\nआपके फ़ोन को आपके चेहरे के सामने लाकर कोई भी व्यक्ति उसे अनलॉक कर सकता है, भले ही आपकी आंखें बंद क्यों न हों.\n\nआपका फ़ोन कोई ऐसा व्यक्ति भी अनलॉक कर सकता है जिसका चेहरा आपसे बहुत मिलता हो, जैसे कि जुड़वां भाई या बहन."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"चेहरे का डेटा मिटाएं?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"मालिक का चेहरा पहचानकर अनलॉक करने वाली सुविधा के लिए इस्तेमाल किया जाने वाला चेहरे का डेटा, सुरक्षित तरीके से हमेशा के लिए मिटा दिया जाएगा. इसके बाद, फ़ोन अनलॉक करने, ऐप्लिकेशन में साइन इन करने, और पैसे चुकाने की पुष्टि करने के लिए आपको पिन, पैटर्न या पासवर्ड की ज़रूरत होगी."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"मालिक का चेहरा पहचानकर अनलॉक करने की सुविधा से अपना फ़ोन अनलॉक करें"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"अपना फ़ोन अनलॉक करने या खरीदारियों को मंज़ूरी देने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल करें.\n\nनोट: आप इस डिवाइस का लॉक खोलने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल नहीं कर सकते हैं. और जानकारी के लिए, अपने संगठन के एडमिन से संपर्क करें."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"अपना फ़ोन अनलॉक करने या खरीदारियों को मंज़ूरी देने के लिए अपने फ़िंगरप्रिंट का इस्तेमाल करें.\n\nनोट: आपका फ़िंगरप्रिंट किसी मज़बूत पैटर्न या पिन से कम सुरक्षित हो सकता है."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"रद्द करें"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"रहने दें"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"जारी रखें"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"अभी नहीं"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"आगे बढ़ें"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"अपना टैबलेट \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. \'मालिक का चेहरा पहचानकर अनलॉक करना\' सेट अप करने के लिए, आपको \'स्क्रीन लॉक\' की भी ज़रूरत है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"अपना डिवाइस \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. \'मालिक का चेहरा पहचानकर अनलॉक करना\' सेट अप करने के लिए, आपको \'स्क्रीन लॉक\' की भी ज़रूरत है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"अपना फ़ोन \'स्क्रीन लॉक\' की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. \'मालिक का चेहरा पहचानकर अनलॉक करना\' सेट अप करने के लिए, आपको \'स्क्रीन लॉक\' की भी ज़रूरत है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"अपने टैबलेट को स्क्रीन लॉक की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. आपको बायोमेट्रिक्स सेट अप करने के लिए भी, स्क्रीन लॉक की ज़रूरत होती है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"अपने डिवाइस को स्क्रीन लॉक की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. आपको बायोमेट्रिक्स सेट अप करने के लिए भी, स्क्रीन लॉक की ज़रूरत होती है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"अपने फ़ोन को स्क्रीन लॉक की मदद से सुरक्षित रखें, ताकि खोने या चोरी होने पर कोई इसका इस्तेमाल न कर पाए. आपको बायोमेट्रिक्स सेट अप करने के लिए भी, स्क्रीन लॉक की ज़रूरत होती है. वापस जाने के लिए, \'अभी नहीं\' पर टैप करें."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"पिन अभी सेट अप नहीं करना चाहते?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"पासवर्ड अभी सेट अप नहीं करना चाहते?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"पैटर्न अभी सेट अप नहीं करना चाहते?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस टैबलेट का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस डिवाइस का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"डिवाइस सुरक्षा सुविधाओं को सक्रिय करके अन्य लोगों को आपकी अनुमति के बिना इस फ़ोन का उपयोग करने से रोकें. वह स्क्रीन लॉक चुनें जिसका आप उपयोग करना चाहते हैं."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"अपनी बैकअप स्‍क्रीन लॉक विधि चुनें"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"अनलॉक करने का दूसरा तरीका चुनें"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"स्क्रीन अनलॉक करने का दूसरा तरीका चुनें"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"स्क्रीन लॉक के विकल्प"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"स्क्रीन लॉक विकल्प"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"स्क्रीन लॉक"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"मालिक का चेहरा पहचानकर अनलॉक + पासवर्ड"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"\'मालिक का चेहरा पहचानकर अनलॉक\' सेटअप किए बिना जारी रखें"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"आप अपने चेहरे के ज़रिए फ़ोन अनलॉक कर सकते हैं. डिवाइस को सुरक्षित रखने के लिए, यह ज़रूरी है कि चेहरे के अलावा अनलॉक करने का दूसरा विकल्प भी सेट किया जाए."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"बायोमेट्रिक्स + पैटर्न"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"बायोमेट्रिक्स + पिन"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"बायोमेट्रिक्स + पासवर्ड"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"बायोमेट्रिक्स सेट अप किए बिना जारी रखें"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"आप बायोमेट्रिक्स का इस्तेमाल करके, अपना फ़ोन अनलॉक कर सकते हैं. डिवाइस को सुरक्षित रखने के लिए यह ज़रूरी है कि बायोमेट्रिक्स के अलावा, अनलॉक करने का दूसरा विकल्प भी सेट किया जाए."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"एडमिन, सुरक्षित करने की नीति या क्रेडेंशियल स्टोरेज ने बंद किया है"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"कोई नहीं"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"स्वाइप करें"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">पिन में <xliff:g id="NUMBER_1">%d</xliff:g> से कम अंक होने चाहिए</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"डिवाइस व्यवस्थापक हाल ही के पिन का उपयोग करने की अनुमति नहीं देता"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"आपके आईटी एडमिन ने आम तौर पर इस्तेमाल होने वाले पिन पर रोक लगा रखी है. दूसरा पिन बनाएं."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"इसमें अमान्य वर्ण शामिल नहीं हो सकता"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"कम से कम एक अक्षर होना चाहिए"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"कम से कम एक अंक होना चाहिए"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">पासवर्ड में कम से कम <xliff:g id="COUNT">%d</xliff:g> वर्ण ऐसे होने चाहिए जो संख्या न हों</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"डिवाइस व्यवस्थापक हाल ही के पासवर्ड का उपयोग करने की अनुमति नहीं देता"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"आपके आईटी एडमिन ने आम तौर पर इस्तेमाल होने वाले पासवर्ड पर रोक लगा रखी है. कोई दूसरा पासवर्ड बनाएं."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"अंकों के बढ़ते, घटते या दोहराए जाने वाले क्रम की अनुमति नहीं है"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"पुष्टि करें"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"रद्द करें"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"वाई-फ़ाई"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"वाई-फ़ाई  चालू करें"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"वाई-फ़ाई"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"वाई-फ़ाई इस्तेमाल करें"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"वाई-फ़ाई इस्तेमाल करें"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"वाई-फ़ाई सेटिंग"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"वाई-फ़ाई"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"वायरलेस पहुंच बिंदुओं को सेट अप और प्रबंधित करें"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"डिवाइस को “<xliff:g id="SSID">%1$s</xliff:g>” से जोड़ने के लिए QR कोड को नीचे मौजूद कैमरा विंडो के बीच में लाएं"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR कोड स्कैन करके वाई-फ़ाई से जुड़ें"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"वाई-फ़ाई शेयर करें"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” से जुड़ने के लिए इस QR कोड को स्कैन करें और पासवर्ड शेयर करें"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” से जुड़ने के लिए किसी दूसरे डिवाइस से इस क्यूआर कोड को स्कैन करें"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” से जुड़ने के लिए इस QR कोड को स्कैन करें"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"फिर से कोशिश करें. अगर समस्या ठीक नहीं होती है, तो डिवाइस बनाने वाली कंपनी से संपर्क करें"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"काेई गड़बड़ी हुई"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"वाई-फ़ाई पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"हॉटस्पॉट का पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"अपने-आप कनेक्ट हो जाए"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"अनुमति दें कि इस वाई-फ़ाई नेटवर्क के पास आते ही आपका फ़ोन अपने-आप इससे कनेक्ट हो जाए"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"अनुमति दें कि इस वाई-फ़ाई नेटवर्क के पास आते ही आपका टैबलेट अपने-आप इससे कनेक्ट हो जाए"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"जब रेंज में हो, तब डिवाइस काे इस वाई-फ़ाई नेटवर्क से जुड़ने की अनुमति दें"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"डिवाइस जोड़ें"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"इस नेटवर्क से किसी डिवाइस को जोड़ने के लिए QR कोड का इस्तेमाल करें"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR कोड का फ़ॉर्मैट गलत है"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"सिस्टम प्रमाणपत्रों का उपयोग करें"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"मुहैया न कराएं"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"मान्‍य न करें"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"कोई प्रमाणपत्र मौजूद नहीं है. आपका कनेक्‍शन निजी नहीं होगा."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"नेटवर्क का नाम बहुत लंबा है."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"डोमेन बताना ज़रूरी है."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"प्रमाणपत्र ज़रूरी है."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"कनेक्ट करें"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"वाई-फ़ाई चालू किया गया"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्ट किया गया"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्ट हो रहा है"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"कनेक्ट हो रहा है…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"नेटवर्क से कनेक्ट करने में विफल रहा"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"नेटवर्क पहुंच से बाहर है"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"एसएसआईडी"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"डिवाइस का MAC पता"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"अनियमित चुना गया MAC पता"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"बिना किसी तय नियम के चुना गया मैक पता (पिछली बार इस्तेमाल किया गया)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"आईपी पता"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"नेटवर्क के बारे में जानकारी"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"सबनेट मास्क"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 पते"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"सेव किए गए नेटवर्क"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"सदस्यता"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"अन्य नेटवर्क"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"आईपी सेटिंग"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"वाई-फ़ाई की बेहतर सेटिंग इस उपयोगकर्ता के लिए मौजूद नहीं हैं"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"सेव करें"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"कोई मान्‍य गेटवे पता लिखें."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"कोई मान्‍य DNS पता लिखें."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 और 32 के बीच की लंबाई का नेटवर्क उपसर्ग लिखें."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"डीएनएस 1 (अगर निजी डीएनएस से बदला नहीं गया हो)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"डीएनएस 2 (अगर निजी डीएनएस से बदला नहीं गया हो)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"नेटवर्क उपसर्ग लंबाई"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"वाई-फ़ाई डायरेक्ट"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ऐप सामग्री शेयर कर रहा है. इंटरनेट कनेक्शन शेयर करने के लिए, हॉटस्पॉट बंद करके फिर उसे चालू करें"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"काेई पासवर्ड सेट नहीं है"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"हॉटस्पॉट का नाम"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> चालू किया जा रहा है..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> चालू हो रहा है…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"दूसरे डिवाइस <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> से कनेक्ट हो सकते हैं"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"हॉटस्पॉट का पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"एपी बैंड"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"स्मूद डिसप्ले"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"कुछ कॉन्टेंट के लिए, यह अपने-आप ही रीफ़्रेश दर को 60 हर्ट्ज़ से बढ़ाकर 90 हर्ट्ज़ कर देता है. इसमें बैटरी ज़्यादा खर्च होती है."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"स्मूद डिसप्ले"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"रीफ़्रेश दर को 90 हर्ट्ज़ पर सेट करें"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"रीफ़्रेश होने की सबसे ज़्यादा दर जिसके लागू होने के बाद छूकर की जाने वाली कार्रवाइयां तेज़ हो जाती हैं. साथ ही, ऐनिमेशन की क्वालिटी बेहतर हो जाती है. इसमें बैटरी ज़्यादा खर्च होती है."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"स्क्रीन चालू रखने की सुविधा"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"चालू / अगर आप स्क्रीन को देख रहे हैं, तो वह बंद नहीं होगी"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"जब स्क्रीन गहरे रंग की हो, तब यह नई सूचनाओं के लिए चालू हो जाती है"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"समय और जानकारी हमेशा दिखाएं"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"बढ़ा हुआ बैटरी खर्च"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"टेक्स्ट को बोल्ड करें"</string>
     <string name="title_font_size" msgid="570613010306330622">"फ़ॉन्ट साइज़"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"टेक्स्ट को बड़ा या छोटा करें"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"सिम कार्ड लॉक सेटिंग"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android वर्शन"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android की सुरक्षा से जुड़ा अपडेट"</string>
     <string name="model_info" msgid="8997566254717810904">"मॉडल"</string>
-    <string name="model_summary" msgid="2246651782442466213">"मॉडल: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"मॉडल और हार्डवेयर"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"हार्डवेयर वर्शन"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"डिवाइस आईडी"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN मिटाएं"</string>
     <string name="menu_new" msgid="6571230342655509006">"नया APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"सेव करें"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"रद्द करें"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"रद्द करें"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"नाम फ़ील्‍ड खाली मत छोड़िए."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN खाली नहीं हो सकता."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ऐप्लिकेशन रीसेट किए जा सकते हैं"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"वाई-फ़ाई, मोबाइल और ब्लूटूथ रीसेट करें"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"इससे सभी नेटवर्क सेटिंग रीसेट हो जाएंगी, जिनमें ये भी शामिल हैं:\n\n"<li>"वाई-फ़ाई"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटूथ"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"हमेशा के लिए मिटाएं"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"डाउनलोड किए गए सिम मिटाएं"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"दूसरा सिम डाउनलोड करने के लिए अपने मोबाइल और इंटरनेट सेवा देने वाली कंपनी से संपर्क करें. इससे कोई भी मोबाइल सेवा प्लान रद्द नहीं होगा."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"इससे मोबाइल सेवा का कोई भी प्लान रद्द नहीं होगा. दूसरा सिम डाउनलोड करने के लिए, मोबाइल और इंटरनेट सेवा देने वाली कंपनी से संपर्क करें."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"सेटिंग रीसेट करें"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"नेटवर्क की सभी सेटिंग रीसेट करें? आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"क्या आप नेटवर्क से जुड़ी सभी सेटिंग और डाउनलोड किए गए सिम रीसेट करना चाहते हैं? आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"नेटवर्क सेटिंग रीसेट कर दी गई हैं"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"सिम नहीं मिटाए जा सकते"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"गड़बड़ी की वजह से डाउनलोड किए गए सिम मिटाए नहीं जा सकते.\n\nअपना डिवाइस रीस्टार्ट करें और फिर से कोशिश करें."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"हमेशा के लिए सारा डेटा मिटाएं (फ़ैक्ट्री रीसेट)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"सारा डेटा हमेशा के लिए मिटाएं (फ़ैक्ट्री रीसेट)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"इससे आपके टैबलेट की "<b>"मेमोरी"</b>" से सारा डेटा हमेशा के लिए मिट जाएगा, जिसमें शामिल हैं:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम, ऐप्लिकेशन का डेटा, और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्लिकेशन"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"इससे आपके फ़ोन की "<b>"मेमोरी"</b>" से सारा डेटा मिट जाएगा, जिसमें शामिल हैं:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्‍टम, ऐप्लिकेशन का डेटा, और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्लिकेशन"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"आपने इस समय नीचे दिए गए खातों में साइन इन किया हुआ है:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"इस डिवाइस पर अन्‍य उपयोगकर्ता मौजूद हैं.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ई-सिम"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"इससे आपका मोबाइल सेवा प्लान रद्द नहीं होगा."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"संगीत, तस्वीर और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>" USB मैमोरी"</b>" मिटाना होगा."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"संगीत, तस्वीर और अन्‍य उपयोगकर्ता डेटा साफ़ करने के लिए "<b>"SD कार्ड"</b>" को साफ़ करना होगा."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"हमेशा के लिए पूरा डेटा मिटाएं (फ़ैक्ट्री रीसेट)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"हमेशा के लिए पूरा डेटा मिटाएं (फ़ैक्ट्री रीसेट)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"इससे आपके टैबलेट की "<b>"मेमोरी"</b>" से सारा डेटा हमेशा के लिए मिट जाएगा, जिसमें ये शामिल हैं:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्टम और ऐप्लिकेशन से जुड़ा डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्लिकेशन"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"इससे आपके फ़ोन की "<b>"मेमोरी"</b>" से सारा डेटा हमेशा के लिए मिट जाएगा, जिसमें ये शामिल हैं:\n\n"<li>"आपका Google खाता"</li>\n<li>"सिस्टम और ऐप्लिकेशन से जुड़ा डेटा और सेटिंग"</li>\n<li>"डाउनलोड किए गए ऐप्लिकेशन"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"आपने फ़िलहाल इन खातों में साइन इन किया हुआ है:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"इस डिवाइस पर अन्य उपयोगकर्ता मौजूद हैं.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"संगीत"</li>\n<li>"फ़ोटो"</li>\n<li>"उपयोगकर्ता का अन्य डेटा"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"इससे आपका मोबाइल सेवा प्लान रद्द नहीं होगा."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"संगीत, तस्वीर, और उपयोगकर्ता का अन्य डेटा मिटाने के लिए "<b>"यूएसबी मेमोरी"</b>" के डेटा को हमेशा के लिए मिटाना होगा."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"संगीत, तस्वीर, और उपयोगकर्ता का अन्य डेटा मिटाने के लिए "<b>"एसडी कार्ड"</b>" के डेटा को हमेशा के लिए मिटाना होगा."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB मेमोरी मिटाएं"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD कार्ड मिटाएं"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"आंतरिक USB मेमोरी का सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD कार्ड पर मौजूद सभी डेटा, जैसे संगीत या फ़ोटो, मिटाएं"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"सारा डेटा मिटाएं"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"सारा डेटा मिटाएं"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"आपकी सारी निजी जानकारी और डाउनलोड किए गए ऐप्लिकेशन मिटा दिए जाएंगे. आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"डाउनलोड किए गए ऐप्लिकेशन और सिम के साथ ही आपकी पूरी निजी जानकारी मिटा दी जाएगी. आप इस कार्रवाई को पहले जैसा नहीं कर सकते."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"सब कुछ मिटाएं"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"सिस्‍टम साफ़ करें सेवा उपलब्‍ध न होने के कारण कोई रीसेट निष्‍पादित नहीं किया गया था."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"पूरा डेटा मिटाना चाहते हैं?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"इस उपयोगकर्ता के लिए फ़ैक्ट्री रीसेट उपलब्ध नहीं है"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"मिटाया जा रहा है"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"कृपया प्रतीक्षा करें..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"हमेशा के लिए पूरा डेटा मिटाएं"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"हमेशा के लिए पूरा डेटा मिटाएं"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"आपकी सारी निजी जानकारी और डाउनलोड किए गए ऐप्लिकेशन मिटा दिए जाएंगे. आप मिटाया गया डेटा वापस नहीं पा सकते."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"डाउनलोड किए गए ऐप्लिकेशन और सिम के साथ ही आपकी सारी निजी जानकारी मिटा दी जाएगी. आप मिटाया गया डेटा वापस नहीं पा सकते."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"पूरा डेटा मिटाना चाहते हैं?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"इस उपयोगकर्ता के लिए फ़ैक्ट्री रीसेट उपलब्ध नहीं है"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"हमेशा के लिए मिटाया जा रहा है"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"कृपया इंतज़ार करें…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"कॉल सेटिंग"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"वॉइसमेल, कॉल को दूसरे नंबर पर भेजना, कॉल वेटिंग (कॉल के दौरान आ रहा दूसरा कॉल), कॉलर आईडी सेट करें"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"यूएसबी से टेदरिंग"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> डिवाइस से ज़्यादा को टेदर नहीं कर सकता."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> को अनटेदर किया जाएगा."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ईथरनेट टेदरिंग"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"यूएसबी ईथरनेट से फ़ोन का इंटरनेट कनेक्शन शेयर करें"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ईथरनेट से फ़ोन का इंटरनेट कनेक्शन शेयर करें"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"अपने मोबाइल डेटा कनेक्शन के ज़रिए दूसरे डिवाइस को इंटरनेट देने के लिए हॉटस्पॉट और टेदरिंग का इस्तेमाल करें. आस-पास के डिवाइस के साथ कॉन्टेंट शेयर करने के लिए, ऐप्लिकेशन भी हॉटस्पॉट बना सकते हैं."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"अपने मोबाइल डेटा कनेक्शन के ज़रिए दूसरे डिवाइस को इंटरनेट देने के लिए हॉटस्पॉट और टेदरिंग का इस्तेमाल करें. आस-पास के डिवाइस के साथ कॉन्टेंट शेयर करने के लिए, ऐप्लिकेशन भी हॉटस्पॉट बना सकते हैं."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"सहायता"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्‍लूटूथ स्‍कैन करना"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ऐप्लिकेशन और सेवाओं को किसी भी समय आस-पास के डिवाइस स्कैन करने की मंज़ूरी दें, भले ही ब्लूटूथ बंद हो. इसका इस्तेमाल करके, जगह की जानकारी जैसी सुविधाओं और सेवाओं में सुधार किया जा सकता है."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"दफ़्तर के लिए, जगह की जानकारी से जुड़ी सेवाएं."</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"जगह के समय क्षेत्र की पहचान करने की सुविधा"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"जगह के समय क्षेत्र की पहचान करने की सुविधा"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"मौजूदा समय क्षेत्र की पहचान करने के लिए, डिवाइस की जगह की जानकारी का इस्तेमाल करने देता है. जगह की जानकारी की दूसरी सेटिंग, समय क्षेत्र की सटीक पहचान करने पर असर डाल सकती है. जैसे कि वाई-फ़ाई स्कैन करना."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"चालू है"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"बंद है"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"समय क्षेत्र की अपने-आप पहचान करने की सुविधा बंद है"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"जगह के समय क्षेत्र की पहचान करने की सुविधा बंद है"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"जगह के समय क्षेत्र की पहचान करने की सुविधा काम नहीं कर रही"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"जगह के समय क्षेत्र की पहचान करने की सुविधा में, बदलाव करने की अनुमति नहीं है"</string>
     <string name="location_network_based" msgid="5247042890080021887">"वाई-फ़ाई और मोबाइल नेटवर्क जगह"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"आपकी जगह का तेज़ी से अनुमान लगाने के लिए, ऐप को Google की जगह की जानकारी का इस्तेमाल करने दें. अनजान जगह का डेटा इकट्ठा करके Google को भेजा जाएगा."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"यह जगह वाई-फ़ाई ने तय की है"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"\'चेहरा पहचानकर अनलॉक\' का बैकअप सेट करें"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"\'चेहरा पहचानकर अनलॉक\' का बैकअप सेट करें"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"\'चेहरा पहचानकर अनलॉक\' का बैकअप सेट करें"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"पासवर्ड सेट करें"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"पैटर्न सेट करें"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"पिन सेट करें"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"अपना पासवर्ड भूल गए हैं?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"अपना पैटर्न भूल गए हैं?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"अपना पिन भूल गए हैं?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"कैप्शन की प्राथमिकताएं"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"बड़ा करना"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"स्क्रीन का बड़ा किया गया हिस्सा"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"स्क्रीन बड़ी करने का मोड चालू करें"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"उस हिस्से को चुनें जिसे आप स्क्रीन पर बड़ा करके देखना चाहते हैं"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"फ़ुल स्क्रीन"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"स्क्रीन का हिस्सा"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"पूरी स्क्रीन और स्क्रीन का हिस्सा"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"पूरी स्क्रीन को बड़ा करें"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"स्क्रीन के किसी हिस्से को बड़ा करें"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"क्या आप सुलभता बटन का इस्तेमाल करना चाहते हैं?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"स्क्रीन का हिस्सा बड़ा करने के लिए तीन बार टैप करने की सुविधा के इस्तेमाल से, टाइपिंग और अन्य कार्रवाइयां धीमी पड़ जाएंगी.\n\nक्या आप ज़ूम के लिए सुलभता बटन इस्तेमाल करना चाहते हैं?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"सुलभता बटन का इस्तेमाल करें"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"तीन बार टैप करके ज़ूम करने वाली सुविधा चालू रखें"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"स्क्रीन को बड़ा करने की सेटिंग"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"तीन बार टैप करके आकार बढ़ाएं"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"शॉर्टकट की मदद से बड़ा करके देखें"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"पावर बटन से कॉल काटना"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"बड़ा माउस पॉइंटर"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ऐनिमेशन हटाएं"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"मोनो ऑडियो"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ऑडियो चलाते समय चैनलों को एक में जोड़ें"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ऑडियो बैलेंस"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"बायां"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"दायां"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"मोनो ऑडियो"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ऑडियो चलाते समय, सारी आवाज़ों को एक ही चैनल में जोड़ें"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ऑडियो बैलेंस"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"बाएं"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"दाएं"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"डिफ़ॉल्ट"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 सेकंड"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 सेकंड"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"सूचना के लिए वाइब्रेशन"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"घंटी के लिए वाइब्रेशन"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"टच फ़ीडबैक"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> का इस्तेमाल करें"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> खोलें"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"रंग में सुधार करने की सुविधा इस्तेमाल करें"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"कैप्शन दिखाएं"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"सिर्फ़ इस सुविधा के साथ काम करने वाले ऐप्लिकेशन के लिए"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> का इस्तेमाल करें"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> खोलें"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"रंग में सुधार करने की सुविधा इस्तेमाल करें"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"कैप्शन दिखाएं"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"सिर्फ़ इस सुविधा के साथ काम करने वाले ऐप्लिकेशन के लिए"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"कैप्शन का साइज़ और शैली"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> टेक्स्ट का साइज़"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ज़्यादा विकल्प"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"लाल-हरे रंग की पहचान न कर पाने की समस्या"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"हरा-लाल रंग पहचान न पाने की समस्या"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"नीले-पीले रंग की पहचान न कर पाने की समस्या"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ग्रेस्केल"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"लाल-हरा रंग पहचान न पाना"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"लाल-हरा रंग पहचान न पाना"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"नीला-पीला रंग पहचान न पाना"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"बैकग्राउंड की गतिविधियों पर रोक लगाना"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ऐप्लिकेशन को बैकग्राउंड में चलने दें"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ऐप्लिकेशन को बैकग्राउंड में चलने की अनुमति नहीं है"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"बैकग्राउंड में हो रहे बैटरी खर्च पर रोक नहीं लगाई जा सकती"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"बैकग्राउंड में चल रही गतिविधि पर पाबंदी नहीं लगा जा सकती"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ऐप की बैकग्राउंड गतिविधि को सीमित करें?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"अगर आप ऐप की बैकग्राउंड गतिविधि को सीमित करते हैं, तो हो सकता है यह ठीक ढंग से काम न करे"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ऐप्लिकेशन पर रोक नहीं लगेगी क्योंकि यह बैटरी ऑप्टिमाइज़ नहीं कर सकता.\n\nबैटरी ऑप्टिमाइज़ेशन चालू करके ही ऐसा हो सकता है."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"टैबलेट को सामान्य से ज़्यादा इस्तेमाल किया गया"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"डिवाइस को सामान्य से ज़्यादा इस्तेमाल किया गया"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"हो सकता है कि बैटरी सामान्य समय से पहले खत्म हो जाए"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"बैटरी की परफ़ॉर्मेंस बेहतर करने के लिए, ऑप्टिमाइज़ किया जा रहा है"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"कुछ समय के लिए, बैटरी पूरी तरह से चार्ज नहीं होगी. ज़्यादा जानने के लिए टैप करें."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"आपका फ़ोन सामान्य से ज़्यादा इस्तेमाल किया गया है. आपके फ़ोन की बैटरी समय से पहले खत्म हो सकती है.\n\nसबसे ज़्यादा बैटरी इस्तेमाल करने वाले ऐप्लिकेशन:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"आपका टैबलेट सामान्य से ज़्यादा इस्तेमाल हुआ है. आपके टैबलेट की बैटरी समय से पहले खत्म हो सकती है.\n\nसबसे ज़्यादा बैटरी इस्तेमाल करने वाले ऐप्लिकेशन:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"आपका डिवाइस सामान्य से ज़्यादा इस्तेमाल किया गया है. आपके डिवाइस की बैटरी समय से पहले खत्म हो सकती है.\n\nसबसे ज़्यादा बैटरी इस्तेमाल करने वाले ऐप्लिकेशन:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">%1$d ऐप्लिकेशन पर रोक लगाई गई</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"आपके डिवाइस के बैटरी मीटर की रीडिंग लेने में समस्या आ रही है"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"आपके डिवाइस के बैटरी मीटर की रीडिंग लेने में समस्या आ रही है. इस बारे में "<annotation id="url">"ज़्यादा जानने के लिए"</annotation>"टैप करें"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ऐप्लिकेशन रोकना चाहते हैं?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"आपका फ़ोन बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप्लिकेशन को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"आपका टैबलेट बैटरी को सामान्य सामान्य तौर पर प्रबंधित नहीं कर पा रहा है क्योंकि <xliff:g id="APP">%1$s</xliff:g> उसे चालू रख रहा है.\n\nइस समस्या को ठीक करने के लिए, आप ऐप को रोक सकते हैं.\n\nअगर ऐसा बार-बार हो रहा है, तो बैटरी का प्रदर्शन बेहतर करने के लिए आपको ऐप अनइंस्टॉल करना पड़ सकता है."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"शेड्यूल तय करें"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"बैटरी लाइफ़ बढ़ाएं"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"चार्ज होने पर बंद करें"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"आपके फ़ोन की बैटरी <xliff:g id="PERCENT">%1$s</xliff:g> होने पर बैटरी सेवर बंद हो जाता है"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"आपके टैबलेट की बैटरी <xliff:g id="PERCENT">%1$s</xliff:g> होने पर बैटरी सेवर बंद हो जाता है"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"आपके डिवाइस की बैटरी <xliff:g id="PERCENT">%1$s</xliff:g> होने पर बैटरी सेवर बंद हो जाता है"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"फ़ोन की बैटरी को <xliff:g id="PERCENT">%1$s</xliff:g> से ज़्यादा चार्ज करने पर, बैटरी सेवर मोड बंद हो जाता है"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"टैबलेट की बैटरी को <xliff:g id="PERCENT">%1$s</xliff:g> से ज़्यादा चार्ज करने पर, बैटरी सेवर मोड बंद हो जाता है"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"डिवाइस की बैटरी को <xliff:g id="PERCENT">%1$s</xliff:g> से ज़्यादा चार्ज करने पर, बैटरी सेवर मोड बंद हो जाता है"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"चालू करें"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"रीसेट करें"</string>
     <string name="tts_play" msgid="2945513377250757221">"चलाएं"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"वीपीएन"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"अडैप्टिव कनेक्टिविटी"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"अडैप्टिव कनेक्टिविटी का विकल्प चुनने पर, आपका इंटरनेट कनेक्शन अपने-आप मैनेज हो जाएगा. इससे बैटरी लाइफ़ बढ़ती है और डिवाइस की परफ़ॉर्मेंस बेहतर होती है"</string>
     <string name="credentials_title" msgid="7535942196886123656">"क्रेडेंशियल स्टोरेज"</string>
     <string name="credentials_install" msgid="3933218407598415827">"कोई प्रमाणपत्र इंस्टॉल करें"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"मेमोरी से प्रमाणपत्र इंस्‍टॉल करें"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"यूज़र क्रेडेंशियल"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"स्टोर किए गए क्रेडेंशियल देखें और उनमें बदलाव करें"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"बेहतर सेटिंग"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"मेमोरी का प्रकार"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेयर-समर्थित"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"केवल सॉफ़्टवेयर"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"इस उपयोगकर्ता के लिए क्रेडेंशियल मौजूद नहीं हैं"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN और ऐप्लिकेशन के लिए इंस्टॉल किया गया"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"वाई-फ़ाई के लिए इंस्टॉल किया गया"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"इंस्टॉल न करें"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"फिर भी इंस्टॉल करें"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"प्रमाणपत्र इंस्टॉल नहीं किया गया है"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"क्या आप <xliff:g id="APP_NAME">%s</xliff:g> को इस डिवाइस पर प्रमाणपत्र इंस्टॉल करने की अनुमति देना चाहते हैं?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"नीचे दिए गए ऐप्लिकेशन और यूआरएल में आप इन प्रमाणपत्रों से पहचाने जाएंगे"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"अनुमति न दें"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"अनुमति दें"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"ज़्यादा दिखाएं"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"प्रमाणपत्र प्रबंधन ऐप्लिकेशन"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"प्रमाणपत्र प्रबंधित करने के लिए कोई ऐप्लिकेशन नहीं है"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"यहां बताए गए ऐप्लिकेशन और यूआरएल में आपकी पहचान, इस ऐप्लिकेशन से इंस्टॉल किए गए प्रमाणपत्रों से होगी"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"हटाएं"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"आपातकालीन डायलिंग सिग्नल"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"आपातकालीन कॉल करने के दौरान व्‍यवहार सेट करें"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"बैकअप लें"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"सेट नहीं की गई - वर्क प्रोफ़ाइल"</string>
     <string name="user_admin" msgid="4024553191395768119">"एडमिन"</string>
     <string name="user_you" msgid="3070562015202859996">"आप (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"प्रचलित नाम"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"आप <xliff:g id="USER_COUNT">%1$d</xliff:g> उपयोगकर्ता तक जोड़ सकते हैं"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"केवल टैबलेट का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"केवल फ़ोन का स्वामी उपयोगकर्ताओं को प्रबंधित कर सकता है."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"पैसे चुकाने की मशीन का इस्तेमाल करना"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"पैसे चुकाने के लिए किसी ऐप्लिकेशन को चुनें. इसके बाद, टच किए बिना पैसे चुकाने के निशान वाले किसी टर्मिनल के ऊपर अपने फ़ोन का पिछला हिस्सा रखें."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ठीक है"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ज़्यादा..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ज़्यादा…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"पैसे चुकाने के लिए डिफ़ॉल्ट ऐप्लिकेशन सेट करें"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"पैसे चुकाने के डिफ़ॉल्ट ऐप्लिकेशन को अपडेट करें"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"टच किए बिना पैसे चुकाने के टर्मिनल पर, <xliff:g id="APP">%1$s</xliff:g> से पैसे चुकाएं"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"वापस जाएं"</string>
     <string name="wizard_next" msgid="3884832431439072471">"आगे बढ़ें"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"खत्म करें"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"फ़ोटो खींचें"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"इमेज चुनें"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"फ़ोटो चुनें"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"सिम कार्ड"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"सिम कार्ड"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"कॉल के लिए हमेशा इसका उपयोग करें"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"डेटा के लिए सिम चुनें"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"मैसेज (एसएमएस) के लिए सिम चुनें"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"डेटा सिम स्‍विच किया जा रहा है, इसमें एक मिनट तक लग सकता है..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"डेटा सिम स्विच किया जा रहा है, इसमें एक मिनट तक लग सकता है…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"इस सिम से कॉल करें"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"सिम कार्ड चुनें"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"सिम <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"रूटीन, शेड्यूल, बैटरी सेवर, पावर सेवर, बैटरी, ऑटोमैटिक, प्रतिशत"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, बेहतर कॉलिंग, 4g कॉलिंग"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"भाषा जोड़ें, किसी भाषा को जोड़ें"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"टेक्स्ट का साइज़"</string>
     <string name="default_sound" msgid="6604374495015245195">"डिफ़ॉल्‍ट ध्‍वनि"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"घंटी और सूचना की आवाज़ <xliff:g id="PERCENTAGE">%1$s</xliff:g> है"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"आवाज़, वाइब्रेशन, परेशान न करें"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"चालू होने की ध्वनि"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"लाइव कैप्शन"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ऑडियो-वीडियो पहचानकर अपने-आप कैप्शन बनना"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"कोई नहीं"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्यूल सेट किया गया है</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्यूल सेट किए गए हैं</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{किसी शेड्यूल का सेट नहीं है}=1{1 शेड्यूल का सेट है}one{# शेड्यूल का सेट है}other{# शेड्यूल के सेट हैं}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"परेशान न करें"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"सिर्फ़ ज़रूरी लोगों और ऐप्लिकेशन की सूचनाएं पाएं"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"रुकावटों को कम करें"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"सिर्फ़ ज़रूरी"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"चालू है / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"बंद / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"बंद"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"चालू है"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"हर बार पूछें"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"जब तक आप बंद नहीं करते"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> घंटे</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> घंटे</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> मिनट"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्यूल अपने आप चालू हो सकते हैं</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्यूल अपने आप चालू हो सकते हैं</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 घंटा}one{# घंटा}other{# घंटे}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 मिनट}one{# मिनट}other{# मिनट}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{बंद है}=1{बंद है / 1 शेड्यूल अपने-आप चालू हो सकता है}one{बंद है / # शेड्यूल अपने-आप चालू हो सकता है}other{बंद है / # शेड्यूल अपने-आप चालू हो सकते हैं}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'परेशान न करें\' मोड को कौन बायपास कर सकता है"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"लोग"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ऐप्लिकेशन"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"कम ज़रूरी सूचनाओं को बिना आवाज़ वाली सूचनाओं के तौर पर अपने आप सेट करें"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ज़रूरत के हिसाब से सूचनाओं को रैंक दें"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"कोई सूचना कितने काम की है, इस हिसाब से उसे अपने-आप रैंक करें"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ज़रूरत के हिसाब से सूचनाओं के बारे में सुझाव दें या शिकायत करें"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"यह सेटिंग, सूचनाओं की प्राथमिकताओं में किए गए बदलावों के बारे में बताती है और सिस्टम के बारे में राय/सुझाव देने के विकल्प दिखाती है"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"सूचना की प्राथमिकताएं रीसेट करें"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"उपयोगकर्ता की ओर से बदली गई प्राथमिकताएं सेटिंग को रीसेट करें. साथ ही, सूचना सहायक को प्राथमिकता तय करने की अनुमति दें"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"सुझाई गई कार्रवाइयां और जवाब"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"सुझाई गई कार्रवाइयां और जवाब अपने-आप दिखाएं"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"हाल ही में मिली और स्नूज़ की गई सूचनाएं दिखाएं"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"अहम बातचीत"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"बातचीत सेक्शन में सबसे ऊपर और फ्लोटिंग बबल्स के तौर पर दिखाएं"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"बातचीत सेक्शन में सबसे ऊपर दिखाएं"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"अन्य बातचीत"</string>
+    <string name="other_conversations" msgid="551178916855139870">"अन्य बातचीत"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"आपने जिन बातचीत में बदलाव किए हैं"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"हाल ही में की गई बातचीत"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"हाल की बातचीत मिटाएं"</string>
+    <string name="clear" msgid="5092178335409471100">"मिटाएं"</string>
     <string name="important_bubble" msgid="7911698275408390846">"अहम बातचीत को बबल करें"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"अहम बातचीत, पुल-डाउन शेड में सबसे ऊपर दिखती हैं. आप इन्हें बबल पर भी सेट कर सकते हैं और \'परेशान न करें\' मोड को रोक सकते हैं."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"यहां ऐसी बातचीत दिखेंगी जो ज़रूरी हैं और जिनमें बदलाव किए गए हैं"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\'परेशान न करें\' सुविधा का ऐक्सेस"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'परेशान न करें\' सुविधा चालू करें"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"इंस्टॉल किए गए किसी भी ऐप ने परेशान ना करें सुविधा के इस्तेमाल का अनुरोध नहीं किया है"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ऐप्लिकेशन लोड हो रहे हैं..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ऐप्लिकेशन लोड हो रहे हैं…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"आपके अनुरोध पर, Android इस ऐप्लिकेशन की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"आपके अनुरोध पर, Android इस श्रेणी की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"आपके अनुरोध पर, Android इस तरह की सूचनाओं को इस डिवाइस पर आने से रोक रहा है"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"सभी बातचीत"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"अहम बातचीत"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"कोई भी नहीं"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> बातचीत</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> बातचीत</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"कोई भी नहीं"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{कोई बातचीत नहीं}=1{1 बातचीत}one{# बातचीत}other{# बातचीत}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"वे कॉल और मैसेज जो \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"कॉल"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"कॉल"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"जिन कॉल के आने की अनुमति है उनके आने पर आवाज़ आए, यह पक्का करने के लिए देखें कि आपका डिवाइस रिंग करने वाले मोड पर सेट है"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ के लिए आने वाले कॉल ब्लॉक कर दिए गए हैं. आप सेटिंग में बदलाव करके दोस्तों, परिवार के लोगों, या दूसरे संपर्कों को आप तक पहुंचने की मंज़ूरी दे सकते हैं."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"तारे के निशान वाले संपर्क"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> और संपर्क</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> और संपर्क</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"कोई नहीं"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{स्टार के निशान वाला कोई संपर्क नहीं}=1{{contact_1}}=2{{contact_1} और {contact_2}}=3{{contact_1}, {contact_2}, और {contact_3}}one{{contact_1}, {contact_2}, और # अन्य संपर्क}other{{contact_1}, {contact_2}, और # अन्य संपर्क}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(कोई नाम नहीं)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"मैसेज"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"मैसेज"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"मैसेज"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ के लिए आने वाले मैसेज ब्लॉक कर दिए गए हैं. आप सेटिंग में अपने हिसाब से बदलाव करके दोस्तों, परिवार के सदस्यों या दूसरे लोगों को आपसे संपर्क करने की मंज़ूरी दे सकते हैं."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"सभी मैसेज \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"सभी कॉल \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"कोई नहीं"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> संपर्क</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> संपर्क</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{कोई संपर्क नहीं}=1{1 संपर्क}one{# संपर्क}other{# संपर्क}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"कोई भी"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"संपर्क"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"तारे के निशान वाले संपर्क"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"सभी सूचनाएं"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"कुछ सूचनाएं"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"अगर आपने ऐप्लिकेशन को \'परेशान न करें\' मोड में डाला है, तब भी चुने हुए लोग आपसे संपर्क कर सकते हैं"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> \'परेशान न करें\' मोड को बायपास कर सकता है</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> \'परेशान न करें\' मोड को बायपास कर सकते हैं</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> और"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{कोई भी ऐप्लिकेशन \'परेशान न करें\' मोड को बायपास नहीं कर सकता}=1{{app_1} \'परेशान न करें\' मोड को बायपास कर सकता है}=2{{app_1} और {app_2} \'परेशान न करें\' मोड को बायपास कर सकते हैं}=3{{app_1}, {app_2}, और {app_3} \'परेशान न करें\' मोड को बायपास कर सकते हैं}one{{app_1}, {app_2}, और # अन्य ऐप्लिकेशन \'परेशान न करें\' मोड को बायपास कर सकते हैं}other{{app_1}, {app_2}, और # अन्य ऐप्लिकेशन \'परेशान न करें\' मोड को बायपास कर सकते हैं}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ऐप्लिकेशन"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"सभी सूचनाएं"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"कुछ सूचनाएं"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"वे सूचनाएं जो \'परेशान न करें\' मोड को बायपास कर सकती हैं"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"सभी सूचनाओं को, \'परेशान न करें\' मोड बायपास करने की अनुमति दें"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> \'परेशान न करें\' मोड को बायपास कर सकती है</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> \'परेशान न करें\' मोड को बायपास कर सकती हैं</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"कोई भी दूसरी आवाज़ \'परेशान न करें\' मोड को बायपास नहीं कर सकती"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> और"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{कोई भी आवाज़ \'परेशान न करें\' मोड को बायपास नहीं कर सकती}=1{{sound_category_1} की आवाज़ \'परेशान न करें\' मोड को बायपास कर सकती है}=2{{sound_category_1} और {sound_category_2} की आवाज़ें \'परेशान न करें\' मोड को बायपास कर सकती हैं}=3{{sound_category_1}, {sound_category_2}, और {sound_category_3} की आवाज़ें \'परेशान न करें\' मोड को बायपास कर सकती हैं}one{{sound_category_1}, {sound_category_2}, और # अन्य आवाज़ \'परेशान न करें\' मोड को बायपास कर सकती है}other{{sound_category_1}, {sound_category_2}, और # अन्य आवाज़ें \'परेशान न करें\' मोड को बायपास कर सकती हैं}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"कोई भी आवाज़ \'परेशान न करें\' मोड को बायपास नहीं कर सकती"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"कोई भी व्यक्ति \'परेशान न करें\' मोड को बायपास नहीं कर सकता"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"कुछ चुने हुए लोग \'परेशान न करें\' मोड को बायपास कर सकते हैं"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"कोई भी व्यक्ति \'परेशान न करें\' मोड को बायपास कर सकता है"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"चालू"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"बंद"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"ऐप्लिकेशन पिन करना"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"किसी ऐप्लिकेशन को पिन करके, आप उसे तब तक स्क्रीन पर देख सकते हैं, जब तक आप उसे अनपिन नहीं करते. यह सुविधा कई चीज़ों के लिए इस्तेमाल की जा सकती है. उदाहरण के लिए, अपने किसी भरोसेमंद दोस्त को डिवाइस पर सिर्फ़ किसी खास गेम को खेलने की अनुमति देना. \n\nपिन किया गया कोई ऐप्लिकेशन, दूसरे ऐप्लिकेशन खोल सकता है और आपका निजी डेटा ऐक्सेस कर सकता है. \n\nकिसी ऐप्लिकेशन को पिन करने के लिए: 	\n1.	ऐप्लिकेशन पिन करने की सुविधा चालू करें 	\n2.	खास जानकारी खोलें 	\n3.	स्क्रीन पर सबसे ऊपर, ऐप्लिकेशन के आइकॉन पर टैप करें. इसके बाद \'पिन करें\' पर टैप करें"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"किसी ऐप्लिकेशन को पिन करके, आप उसे तब तक देख सकते हैं, जब तक आप उसे अनपिन नहीं करते. यह सुविधा कई चीज़ों के लिए इस्तेमाल की जा सकती है. उदाहरण के लिए, किसी भरोसेमंद दोस्त को डिवाइस पर सिर्फ़ किसी खास गेम को खेलने की अनुमति देना. \n\nपिन किया गया कोई ऐप्लिकेशन, दूसरे ऐप्लिकेशन खोल सकता है और आपका निजी डेटा ऐक्सेस कर सकता है. \n\nअगर आप अपना डिवाइस सुरक्षित तरीके से किसी के साथ शेयर करना चाहते हैं, तो \'मेहमान उपयोगकर्ता\' प्रोफ़ाइल का इस्तेमाल करें. \n\nकिसी ऐप्लिकेशन को पिन करने के लिए: 	\n1.	ऐप्लिकेशन पिन करने की सुविधा चालू करें 	\n2.	खास जानकारी खोलें 	\n3.	स्क्रीन पर सबसे ऊपर, ऐप्लिकेशन के आइकॉन पर टैप करें. इसके बाद, \'पिन करें\' पर टैप करें"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"किसी ऐप्लिकेशन को पिन करके, आप उसे तब तक स्क्रीन पर देख सकते हैं, जब तक आप उसे अनपिन नहीं करते. यह सुविधा कई चीज़ों के लिए इस्तेमाल की जा सकती है. उदाहरण के लिए, किसी भरोसेमंद दोस्त को डिवाइस पर सिर्फ़ किसी खास गेम को खेलने की अनुमति देना."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"पिन किया गया कोई ऐप्लिकेशन, दूसरे ऐप्लिकेशन खोल सकता है और आपका निजी डेटा ऐक्सेस कर सकता है. \n\nऐप्लिकेशन पिन करने की सुविधा का इस्तेमाल करने के लिए: 	\n1.	ऐप्लिकेशन पिन करने की सुविधा चालू करें 	\n2.	खास जानकारी खोलें 	\n3.	स्क्रीन पर सबसे ऊपर, ऐप्लिकेशन के आइकॉन पर टैप करें. इसके बाद, \'पिन करें\' पर टैप करें"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"पिन किया गया कोई ऐप्लिकेशन, दूसरे ऐप्लिकेशन खोल सकता है और आपका निजी डेटा ऐक्सेस कर सकता है. \n\nअगर आप अपना डिवाइस सुरक्षित तरीके से किसी के साथ शेयर करना चाहते हैं, तो मेहमान उपयोगकर्ता प्रोफ़ाइल का इस्तेमाल करें. \n\nऐप्लिकेशन पिन करने की सुविधा का इस्तेमाल करने के लिए: 	\n1.	ऐप्लिकेशन पिन करने की सुविधा चालू करें 	\n2.	खास जानकारी खोलें 	\n3.	स्क्रीन पर सबसे ऊपर, ऐप्लिकेशन के आइकॉन पर टैप करें. इसके बाद, \'पिन करें\' पर टैप करें"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"किसी ऐप्लिकेशन को पिन करने पर: \n\n•	 निजी डेटा ऐक्सेस किया जा सकता है \n		(जैसे कि आपकी संपर्क सूची और ईमेल) \n•	 पिन किया गया ऐप्लिकेशन, दूसरे ऐप्लिकेशन खोल सकता है \n\nऐप्लिकेशन को उन ही लोगों के लिए पिन करें जिन पर आप भरोसा करते हैं."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"अनपिन करने से पहले लॉक खोलने के पैटर्न के लिए पूछें"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"अनपिन करने से पहले पिन के लिए पूछें"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"डिवाइस का लॉक खोलने के लिए अपने चेहरे का इस्तेमाल करने के अलावा, आप आगे बताया गया तरीका अपनाकर डिवाइस की सुरक्षा बढ़ा सकते हैं. आप सेट कर सकते हैं कि जब बंद डिवाइस चालू किया जाए, तब वह सेट किए गए पिन से ही खुले. डिवाइस चालू होने तक, उस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी और अलार्म भी नहीं बजेगा.\n\nऐसा करने से आप खोए या चोरी हो चुके डिवाइस का डेटा सुरक्षित रख सकते हैं. डिवाइस चालू करने के लिए पिन डालना ज़रूरी बनाना चाहते हैं?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"डिवाइस का लॉक खोलने के लिए अपने चेहरे का इस्तेमाल करने के अलावा, आप आगे बताया गया तरीका अपनाकर डिवाइस की सुरक्षा बढ़ा सकते हैं. आप सेट कर सकते हैं कि जब बंद डिवाइस चालू किया जाए, तब वह सेट किए गए पैटर्न से ही खुले. डिवाइस चालू होने तक, उस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी और अलार्म भी नहीं बजेगा.\n\nऐसा करने से आप खोए या चोरी हो चुके डिवाइस का डेटा सुरक्षित रख सकते हैं. डिवाइस चालू करने के लिए पैटर्न डालना ज़रूरी बनाना चाहते हैं?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"डिवाइस का लॉक खोलने के लिए अपने चेहरे का इस्तेमाल करने के अलावा, आप आगे बताया गया तरीका अपनाकर डिवाइस की सुरक्षा बढ़ा सकते हैं. आप सेट कर सकते हैं कि जब बंद डिवाइस चालू किया जाए, तब वह सेट किए गए पासवर्ड से ही खुले. डिवाइस के चालू होने तक, उस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी और अलार्म भी नहीं बजेगा.\n\nऐसा करने से आप खोए या चोरी हो चुके डिवाइस का डेटा सुरक्षित रख सकते हैं. डिवाइस चालू करने के लिए पासवर्ड डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"डिवाइस को अनलॉक करने के लिए, आप यह ज़रूरी कर सकते हैं कि उसके चालू होने से पहले बायोमेट्रिक्स का इस्तेमाल करने के अलावा, पिन भी डाला जाए. जब तक डिवाइस चालू नहीं हो जाता, तब तक इस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी. साथ ही, डिवाइस के चालू होने तक अलार्म भी नहीं बजेगा.\n\nइससे डिवाइस के खोने या चोरी हो जाने पर, इसमें मौजूद डेटा सुरक्षित रखने में मदद मिलती है. क्या आप डिवाइस को चालू करने के लिए, पिन डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"डिवाइस को अनलॉक करने के लिए, आप यह ज़रूरी कर सकते हैं कि उसके चालू होने से पहले बायोमेट्रिक्स का इस्तेमाल करने के अलावा, पैटर्न भी डाला जाए. जब तक डिवाइस चालू नहीं हो जाता, तब तक इस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी. साथ ही, डिवाइस के चालू होने तक अलार्म भी नहीं बजेगा.\n\nइससे डिवाइस के खोने या चोरी हो जाने पर, इसमें मौजूद डेटा सुरक्षित रखने में मदद मिलती है. क्या आप डिवाइस को चालू करने के लिए, पैटर्न डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"डिवाइस को अनलॉक करने के लिए, आप यह ज़रूरी कर सकते हैं कि उसके चालू होने से पहले बायोमेट्रिक्स का इस्तेमाल करने के अलावा, पासवर्ड भी डाला जाए. जब तक डिवाइस चालू नहीं हो जाता, तब तक इस पर कॉल, मैसेज या सूचनाएं नहीं मिलेंगी. साथ ही, डिवाइस के चालू होने तक अलार्म भी नहीं बजेगा.\n\nइससे डिवाइस के खोने या चोरी हो जाने पर, इसमें मौजूद डेटा सुरक्षित रखने में मदद मिलती है. क्या आप डिवाइस को चालू करने के लिए, पासवर्ड डालना ज़रूरी बनाना चाहते हैं?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"हां"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"नहीं"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"रोक लगी है"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"यूएसबी का कंट्रोल किस डिवाइस के पास है"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"जोड़ा गया डिवाइस"</string>
     <string name="usb_control_device" msgid="527916783743021577">"यह डिवाइस"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"स्विच किया जा रहा है..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"स्विच किया जा रहा है…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"स्विच नहीं किया जा सका"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"यह डिवाइस चार्जिंग पर है"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"जोड़े गए डिवाइस को चार्ज करना"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"मोबाइल डेटा खर्च"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"ऐप का डेटा खर्च"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"वाई-फ़ाई डेटा खर्च"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का डेटा खर्च छोड़कर"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ईथरनेट डेटा खर्च"</string>
     <string name="wifi" msgid="2932584495223243842">"वाई-फ़ाई"</string>
     <string name="ethernet" msgid="4665162609974492983">"ईथरनेट"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> प्रतिबंध</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"डेटा खर्च को लेकर मोबाइल और इंटरनेट सेवा देने वाली कंपनी का हिसाब आपके डिवाइस के हिसाब से अलग हो सकता है."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी के बजाय किसी दूसरी कंपनी का इस्तेमाल किया गया डेटा"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> का उपयोग किया गया"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"डेटा चेतावनी सेट करें"</string>
     <string name="data_warning" msgid="2925054658166062884">"डेटा चेतावनी"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"जानकारी देखें"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"डेटा बचाने की सेटिंग"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"पाबंदी के बिना डेटा इस्तेमाल"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"पृष्ठभूमि डेटा बंद है"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"बैकग्राउंड डेटा बंद है"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"चालू"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"बंद"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"डेटा बचाने की सेटिंग चालू करें"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"अगर डिवाइस लॉक है, तो सूचनाओं का जवाब या अन्य लेख लिखने से रोकें"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"डिफ़ॉल्ट तौर पर स्पेलिंग जाँचने वाला"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"वर्तनी/स्पेलिंग जाँचकर्ता चुनें"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"स्पेलिंग जाँचने वाला टूल इस्तेमाल करें"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"स्पेलिंग जांचने वाली सुविधा का इस्तेमाल करें"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"नहीं चुना गया"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(कुछ नहीं)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"मेमोरी में जगह खाली करने में मदद करने के लिए, मेमोरी प्रबंधक आपके डिवाइस से बैकअप ली गई फ़ोटो और वीडियो निकाल देता है."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"फ़ोटो और वीडियो निकालें"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"मेमोरी प्रबंधक"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"मेमोरी मैनेजर इस्तेमाल करें"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"मेमोरी प्रबंधक टूल का इस्तेमाल करें"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"अपने-आप"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"मैन्युअल"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"अभी स्पेस खाली करें"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"फ़ोन देखने के लिए दो बार टैप करें"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"टैबलेट देखने के लिए दो बार छूएं"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"डिवाइस देखने के लिए दो बार छूएं"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"सूचनाओं के लिए स्वाइप करें"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"अपनी सूचनाएं देखने के लिए, स्क्रीन पर ऊपर से नीचे की ओर स्वाइप करें"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"वन-हैंडेड मोड"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"वन-हैंडेड मोड का इस्तेमाल करें"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"एक ऐप्लिकेशन से दूसरे पर जाते समय बाहर निकलें"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"टाइम आउट"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"चार सेकंड"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"आठ सेकंड"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 सेकंड"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"वन-हैंडेड ऐक्सेस"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"समय, सूचनाएं और दूसरी जानकारी देखने के लिए, फ़ोन की स्क्रीन पर दो बार टैप करें."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"फ़ोन चेक करने के लिए उसे उठाएं"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"टैबलेट देखने के लिए लिफ़्ट करें"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"टैबलेट की स्क्रीन पर टैप करके देखें कि सूचना मिली है या नहीं"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"डिवाइस की स्क्रीन पर टैप करके देखें कि सूचना मिली है या नहीं"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"समय, सूचनाएं, और दूसरी जानकारी देखने के लिए फ़ोन की स्क्रीन पर टैप करें."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"आपातकालीन एसओएस चेतावनी"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"आपातकालीन सेवाओं का इस्तेमाल करें"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> प्रबंधित करता है"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"आपातकालीन स्थिति में यहां बताई गई कार्रवाइयां करने के लिए, पावर बटन को पांच या इससे ज़्यादा बार तेज़ी से दबाएं"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"काउंटडाउन अलार्म बजाएं"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"मदद के लिए सूचना भेजने से पहले, तेज़ आवाज़ चलाएं"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"मदद पाने के लिए कॉल करें"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"मदद पाने के लिए फ़ोन नंबर"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. बदलने के लिए टैप करें"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"अगर आप कोई ऐसा नंबर डालते हैं जो आपातकालीन नंबर नहीं है:\n • आपातकालीन सेवाओं का इस्तेमाल करने के लिए, आपका डिवाइस अनलॉक होना चाहिए\n • शायद, आपके कॉल का जवाब न दिया जा सके"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"सूचनाओं के लिए फ़िंगरप्रिंट स्वाइप करें"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"फ़िंगरप्रिंट स्वाइप करें"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"अपनी सूचनाएं देखने के लिए, अपने फ़ोन के पीछे फ़िंगरप्रिंट सेंसर पर नीचे की तरफ़ स्वाइप करें."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"दिखने वाले डेटा सेट की ज़्यादा से ज़्यादा संख्या"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"डिफ़ॉल्ट मान पर रीसेट करें"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"डेवलपर के लिए अपने आप भरने की सुविधा (ऑटो फ़िल) सेटिंग और टूल रीसेट हो गए हैं"</string>
+    <string name="location_category" msgid="3496759112306219062">"जगह"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"स्टेटस बार पर जगह की जानकारी दिखाने वाला संकेत"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"सभी जगह की जानकारी दिखाएं. इसके लिए, नेटवर्क और कनेक्टिविटी का भी इस्तेमाल करें"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"जीएनएसएस माप को हर हाल में लागू करें"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"बिना ड्यूटी-साइक्लिंग के जीएनएसएस के सभी तारामंडल (कॉन्स्टलेशन) और फ़्रीक्वेंसी ट्रैक करें"</string>
     <string name="device_theme" msgid="5027604586494772471">"डिवाइस की थीम"</string>
     <string name="default_theme" msgid="4815428567082263639">"डिफ़ॉल्ट"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"नेटवर्क का नाम"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"ध्यान भटकने से रोकने के लिए डिवाइस की सूचनाओं को कुछ समय के लिए रोकें"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"सुविधा उपलब्ध नहीं है"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"यह सुविधा बंद कर दी गई है क्योंकि इससे आपका फ़ोन धीमा हो जाता है"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"जीएनएसएस माप को हर हाल में लागू करें"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"बिना ड्यूटी-साइक्लिंग के जीएनएसएस के सभी तारामंडल (कॉन्स्टलेशन) और फ़्रीक्वेंसी ट्रैक करें"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"क्रैश होने की सूचना हर बार दिखाएं"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"जब भी कोई ऐप्लिकेशन क्रैश हो, उसकी सूचना दिखाएं"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"कोण की सुविधा वाला ऐप्लिकेशन चुनें"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"सभी ऐप्लिकेशन के लिए चालू करें"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ग्राफ़िक ड्राइवर चुनें"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"डिफ़ॉल्ट"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"गेम ड्राइवर"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"गेम ड्राइवर"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"डेवलपर ड्राइवर"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"सिस्टम ग्राफ़िक ड्राइवर"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"चालू है (म्यूट)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"बंद है"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"नेटवर्क के बारे में जानकारी"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"आपके फ़ोन पर मौजूद ऐप्लिकेशन, आपके डिवाइस का नाम जान सकते हैं. ब्लूटूथ डिवाइस जोड़ते समय या वाई-फ़ाई हॉटस्पॉट सेटअप करते समय, इसे दूसरे लोग भी देख सकते हैं."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"आपके डिवाइस के नाम की जानकारी को फ़ोन पर मौजूद ऐप्लिकेशन ऐक्सेस कर सकते हैं. ब्लूटूथ डिवाइस जोड़ते समय, वाई-फ़ाई नेटवर्क से जुड़ते समय या वाई-फ़ाई हॉटस्पॉट सेट अप करते समय भी दूसरे लोग आपके डिवाइस का नाम देख सकते हैं."</string>
     <string name="devices_title" msgid="649715719278562515">"डिवाइस"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"सभी सेटिंग"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"सुझाव"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"कोई नेटवर्क नहीं मिला. फिर से कोशिश करें."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(मना है)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"कोई सिम कार्ड नहीं है"</string>
+    <string name="sim_card" msgid="6381158752066377709">"सिम कार्ड"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"कोई सिम कार्ड नहीं लगाया गया है"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"इस वाई-फ़ाई नेटवर्क पर सिम कार्ड की कोई जानकारी नहीं है"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"वाई-फ़ाई नेटवर्क से कनेक्ट करने के लिए, सिम कार्ड लगा होना चाहिए"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"वाई-फ़ाई नेटवर्क से कनेक्ट करने के लिए, <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> का सिम कार्ड लगा होना चाहिए"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"पसंदीदा नेटवर्क मोड: WCDMA को प्राथमिकता"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"पसंदीदा नेटवर्क मोड: सिर्फ़ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"पसंदीदा नेटवर्क मोड: सिर्फ़ WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"मोबाइल डेटा"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"मोबाइल नेटवर्क का इस्तेमाल करके डेटा ऐक्सेस करें"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"नेटवर्क होने पर फ़ोन अपने आप इस कैरियर पर आ जाएगा"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"सिम कार्ड मौजूद नहीं है"</string>
     <string name="calls_preference" msgid="2166481296066890129">"कॉल की प्राथमिकता"</string>
     <string name="sms_preference" msgid="7742964962568219351">"मैसेज (एसएमएस) की प्राथमिकता"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"हर बार पूछें"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> से कनेक्ट होने पर उपलब्ध नहीं है"</string>
     <string name="see_more" msgid="7499355691042812723">"ज़्यादा देखें"</string>
     <string name="see_less" msgid="2642392725363552793">"कम देखें"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"क्या आप <xliff:g id="CARRIER_NAME">%1$s</xliff:g> चालू करना चाहते हैं?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"क्या आप सिम चालू करना चाहते हैं?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"क्या आप <xliff:g id="CARRIER_NAME">%1$s</xliff:g> का इस्तेमाल करना चाहते हैं?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"क्या आप इस्तेमाल करने के लिए सिम कार्ड पर जाना चाहते हैं?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"एक समय में सिर्फ़ एक सिम इस्तेमाल किया जा सकता है.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> पर जाने से आपके <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"एक समय में, डाउनलोड किया गया सिर्फ़ एक सिम इस्तेमाल किया जा सकता है.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> पर जाने से आपके <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"एक समय में सिर्फ़ एक सिम इस्तेमाल किया जा सकता है.\n\nएक से दूसरे सिम पर जाने से, आपको मिल रही <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> की सेवा रद्द नहीं की जाएगी."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> पर जाएं"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"नेटवर्क से कनेक्ट किया जा रहा है…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> पर ले जाया जा रहा है"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी को बदला नहीं जा सकता"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"किसी गड़बड़ी की वजह से, मोबाइल और इंटरनेट सेवा देने वाली कंपनी को बदला नहीं जा सकता."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"क्या आप <xliff:g id="CARRIER_NAME">%1$s</xliff:g> को बंद करना चाहते हैं?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"क्या आप सिम बंद करना चाहते हैं?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"सिम बंद किया जा रहा है<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क बंद नहीं किया जा सकता"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"कोई गड़बड़ी हुई, जिसकी वजह से आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी का नेटवर्क बंद नहीं किया जा सका."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"क्या आप दो सिम इस्तेमाल करना चाहते हैं?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"इस डिवाइस में एक साथ दाे सिम चालू रह सकते हैं. अगर आप एक बार में एक सिम इस्तेमाल करना चाहते हैं, तो \"रहने दें\" पर टैप करें."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"क्या आप डिवाइस को रीस्टार्ट करना चाहते हैं?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"शुरू करने के लिए, अपने डिवाइस को रीस्टार्ट करें. इसके बाद, आप दूसरा सिम जोड़ सकते हैं."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"जारी रखें"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"रीस्टार्ट करें"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"रहने दें"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"दूसरे नेटवर्क पर जाएं"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"सिम चालू नहीं किया जा सका"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"सिम निकालकर फिर से लगाएं. अगर तब भी समस्या ठीक नहीं होती, तो डिवाइस को रीस्टार्ट करें."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"सिम दोबारा चालू करने की कोशिश करें. अगर तब भी समस्या ठीक नहीं होती, तो डिवाइस को रीस्टार्ट करें."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"नेटवर्क चालू करना"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> चालू है"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"सिम की सेटिंग अपडेट करने के लिए टैप करें"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"सिम कार्ड"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"क्या आप डाउनलोड किए गए इस सिम को हमेशा के लिए मिटाना चाहते हैं?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"इस सिम को डिवाइस से हमेशा के लिए मिटाने पर, <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> की सेवा हट जाती है.\n\nहालांकि, <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> की सेवा नहीं हटेगी."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"हमेशा के लिए मिटाएं"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"सिम को हमेशा के लिए मिटाया जा रहा है…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"सिम हमेशा के लिए नहीं मिटाया जा सका"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"किसी गड़बड़ी की वजह से, इस सिम को हमेशा के लिए नहीं मिटाया जा सका.\n\nडिवाइस को रीस्टार्ट करें और फिर से कोशिश करें."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"डिवाइस से कनेक्ट करें"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"आपके डिवाइस से कनेक्ट होने के लिए, <xliff:g id="APPNAME">%1$s</xliff:g> ऐप्लिकेशन को किसी वाई-फ़ाई नेटवर्क से कुछ समय के लिए जुड़ना होगा"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"कोई डिवाइस नहीं मिला देख लें कि डिवाइस चालू हों और कनेक्ट किए जा सकते हों."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"आपातकालीन कॉल"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"आपकी मोबाइल और इंटरनेट सेवा देने वाली कंपनी, \'वाई-फ़ाई कॉलिंग\' के ज़रिए आपातकालीन कॉल करने की सुविधा नहीं देती है.\n आपातकालीन कॉल करने के लिए डिवाइस अपने आप माेबाइल नेटवर्क पर स्विच करता है.\n आपातकालीन कॉल सिर्फ़ उन्हीं इलाकाें में किया जा सकता है जहां नेटवर्क कवरेज हाे."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"कॉल की क्वालिटी सुधारने के लिए वाई-फ़ाई का इस्तेमाल करें"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"क्रॉस सिम कॉलिंग"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"इस सिम कार्ड के चालू होने पर, दूसरे सिम कार्ड से कॉल और मैसेज (एसएमएस) करने या पाने की अनुमति दें."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"क्रॉस सिम कॉलिंग"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"आने वाले मल्टीमीडिया मैसेज (एमएमएस)"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"मल्टीमीडिया मैसेज (एमएमएस) नहीं भेज सकते"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"मोबाइल डेटा बंद होने पर <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> से मल्टीमीडिया मैसेज (एमएमएस) की सुविधा चालू करने के लिए टैप करें"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"\'सेटिंग\' पर स्क्रीन ओवरले करने की अनुमति दें"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"\'सेटिंग\' में जाकर उन ऐप्लिकेशन को स्क्रीन ओवरले करने की अनुमति दें जो दूसरे ऐप्लिकेशन के ऊपर दिख सकते हैं"</string>
     <string name="media_controls_title" msgid="403271085636252597">"मीडिया"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"मीडिया सेशन के खत्म होने पर, प्लेयर छिपाएं"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"आप मीडिया प्लेयर का इस्तेमाल करके, फटाफट सेटिंग के बड़े किए गए पैनल से सेशन फिर से शुरू कर सकते हैं."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"फटाफट सेटिंग में मीडिया प्लेयर की सेटिंग"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"वीडियो को फिर से चलाने के लिए, मीडिया प्लेयर को लंबे समय तक दिखाएं"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"मीडिया प्लेयर को छिपाएं"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"मीडिया प्लेयर दिखाएं"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"कोई मीडिया प्लेयर उपलब्ध नहीं है"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"इन ऐप्लिकेशन को इस्तेमाल करने की अनुमति है"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"मीडिया"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ब्लूटूथ चालू हो जाएगा"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"चालू है"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"बंद है"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"इंटरनेट"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"सिम"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"हवाई जहाज़ सुरक्षित नेटवर्क"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"हवाई जहाज़ सुरक्षित नेटवर्क ढूंढें और उससे जुड़ें"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"हवाई जहाज़, हवाई जहाज़ सुरक्षित नेटवर्क"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"कॉल और मैसेज (एसएमएस)"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"वाई-फ़ाई कॉलिंग"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ऐसे नेटवर्क से कॉल करें और उन पर कॉल पाएं जो सिम का इस्तेमाल नहीं करते, जैसे कि वाई-फ़ाई नेटवर्क"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"वाई-फ़ाई कॉलिंग आपको ऐसे नेटवर्क से कॉल करने और उन पर कॉल पाने की सुविधा देती है जो सिम का इस्तेमाल नहीं करते, जैसे कुछ वाई-फ़ाई नेटवर्क."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"कॉल"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"मैसेज (एसएमएस)"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"इस सिम का इस्तेमाल किया जाए"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"कॉल के लिए इस सिम का इस्तेमाल किया जाए"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"मैसेज (एसएमएस) के लिए इस सिम का इस्तेमाल किया जाए"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"उपलब्ध नहीं है"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"कोई सिम कार्ड नहीं लगाया गया है"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राथमिकताएं"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक नेटवर्क से कनेक्ट करें"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वाईफ़ाई, सेल्युलर, मोबाइल, मोबाइल और इंटरनेट सेवा देने वाली कंपनी, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"हवाई जहाज़ सुरक्षित नेटवर्क देखें"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"हवाई जहाज़ मोड बंद करें"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"बेडटाइम मोड चालू होने पर यह सुविधा काम नहीं करती है"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"सूचनाओं की प्राथमिकता को रीसेट करने की प्रक्रिया पूरी हुई."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"ऐप्लिकेशन"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"एक डिवाइस आपके मैसेज ऐक्सेस करना चाहता है, लेकिन इस डिवाइस पर भरोसा नहीं किया जा सकता. जानकारी के लिए टैप करें."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"क्या आप मैसेज का ऐक्सेस देना चाहते हैं?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"एक ब्लूटूथ डिवाइस, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], आपके मैसेज ऐक्सेस करना चाहता है, लेकिन इस डिवाइस पर भरोसा नहीं किया जा सकता.\n\nआपने इसे पहले कभी [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] से कनेक्ट नहीं किया है."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"एक डिवाइस, आपके संपर्क और कॉल लॉग ऐक्सेस करना चाहता है. जानकारी के लिए टैप करें."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"क्या आप अपने संपर्क और कॉल लॉग का ऐक्सेस देना चाहते हैं?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"एक ब्लूटूथ डिवाइस, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], आपके संपर्क और कॉल लॉग ऐक्सेस करना चाहता है, लेकिन इस डिवाइस पर भरोसा नहीं किया जा सकता. इसमें आपके किए गए कॉल (आउटगोइंग) और आने वाले कॉल (इनकमिंग) से जुड़ा डेटा भी शामिल है.\n\nआपने पहले कभी अपने [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] को इससे कनेक्ट नहीं किया है."</string>
 </resources>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 5c322b2..c2d3cba 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Srednje"</item>
     <item msgid="6740026006576843477">"Dugo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kratko"</item>
+    <item msgid="7397961711906421599">"Srednje"</item>
+    <item msgid="4079132024502041928">"Dugo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Zadano"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalno"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 5917ce6..2f4fddc 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -256,8 +256,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Datum i vrijeme"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Postavite datum i vrijeme"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Postavljanje datuma, vremena, vremenske zone i formata"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Upotrijebi vrijeme mreže"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Upotrijebi vremensku zonu mreže"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Automatsko postavljanje vremena"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Automatsko postavljanje vremenske zone"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Upotrijebi lokalnu zadanu postavku"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-satni oblik"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Koristi 24-satni format"</string>
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Prikaži informacije profila na zaključanom zaslonu"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Računi"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokacija"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Koristi se lokacijom"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Upotreba lokacije"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Isključeno"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Uključeno – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacija ima pristup lokaciji</item>
@@ -323,6 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaključavanje zaslona, otključavanje licem"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaključavanje zaslona, otisak prsta"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zaključavanje zaslona"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Sigurno otključajte telefon upotrebom lica i otiska prsta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Možete se prijavljivati u aplikacije i potvrditi plaćanja"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Postavite otključavanje pomoću:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Otključavanje licem"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Otključajte telefon u trenu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Otisak prsta"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Otključajte telefon dok vam je u džepu"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Preskoči"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Dalje"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Lice dodano"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Postavite otključavanje licem"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Otključavanje licem"</string>
@@ -332,6 +341,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Autentificirajte se licem"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Započni"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ako je otključavanje licem za pristupačnost isključeno, neki koraci za postavljanje možda neće pravilno funkcionirati s TalkBackom."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Natrag"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Nastavi postavljanje"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Koristi postav. za pristupačnost"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -376,8 +388,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Za upotrebu otključavanja licem u aplikacijama uvijek traži potvrdu"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Briši podatke o licu"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Postavite otključavanje licem"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Značajkom otključavanja licem otključajte uređaj, prijavite se u aplikacije i potvrdite plaćanja.\n\nNe zaboravite:\ngledajući telefon možete ga otključati i kad to ne namjeravate.\n\nVaš telefon može otključati i netko drugi ako ga prinese vašem licu.\n\nVaš bi telefon možda mogao otključati i netko tko vam je vrlo sličan, na primjer blizanac."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Značajkom otključavanja licem otključajte uređaj, prijavite se u aplikacije i potvrdite plaćanja.\n\nNe zaboravite:\ngledajući telefon možete ga otključati i kad to ne namjeravate.\n\nVaš telefon može otključati i netko drugi ako ga prinese vašem licu, čak i ako su vam oči zatvorene.\n\nVaš bi telefon možda mogao otključati i netko tko vam je vrlo sličan, na primjer blizanac."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Upotrijebite otključavanje licem da biste otključali uređaj, prijavili se u aplikacije i potvrdili plaćanja."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Napomena:\ngledajući telefon možete ga nehotice otključati.\n\nVaš telefon može otključati i netko drugi ako ga prinese vašem licu.\n\nVaš bi telefon možda mogao otključati i netko tko vam je vrlo sličan, na primjer blizanac."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Napomena:\ngledajući telefon možete ga nehotice otključati.\n\nVaš telefon može otključati i netko drugi ako ga prinese vašem licu, čak i ako su vam oči zatvorene.\n\nVaš bi telefon možda mogao otključati i netko tko vam je vrlo sličan, na primjer blizanac."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Želite li izbrisati podatke o licu?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Podaci o licu koje upotrebljava otključavanje licem trajno će se i sigurno izbrisati. Nakon uklanjanja trebat će vam PIN, uzorak ili zaporka da biste otključali telefon, prijavili se u aplikacije i potvrdili plaćanja."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Otključajte telefon licem"</string>
@@ -398,6 +411,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Otključajte telefon ili odobrite kupnje otiskom prsta.\n\nNapomena: ovaj uređaj ne možete otključati otiskom prsta. Za više informacija obratite se administratoru organizacije."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Otključajte telefon ili odobrite kupnje otiskom prsta.\n\nNapomena: otisak prsta može biti manje siguran od snažnog uzorka ili PIN-a."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Odustani"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Nastavi"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Dalje"</string>
@@ -435,6 +449,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Zaštite tablet pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje otključavanja licem. Da biste se vratili, dodirnite Odustani."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Zaštite uređaj pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje otključavanja licem. Da biste se vratili, dodirnite Odustani."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Zaštite telefon pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Opcija zaključavanja zaslona treba vam i za postavljanje otključavanja licem. Da biste se vratili, dodirnite Odustani."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Zaštite tablet pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Za postavljanje biometrijskih podataka trebat će vam i opcija zaključavanja zaslona. Da biste se vratili, dodirnite Odustani."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Zaštite uređaj pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Za postavljanje biometrijskih podataka trebat će vam i opcija zaključavanja zaslona. Da biste se vratili, dodirnite Odustani."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Zaštite telefon pomoću opcije zaključavanja zaslona kako se nitko ne bi mogao njime koristiti ako ga izgubite ili ga netko ukrade. Za postavljanje biometrijskih podataka trebat će vam i opcija zaključavanja zaslona. Da biste se vratili, dodirnite Odustani."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Preskočiti postavljanje PIN-a?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Preskočiti postavljanje zaporke?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Preskočiti postavljanje uzorka?"</string>
@@ -507,8 +524,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj tablet bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj uređaj bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Aktivirajte značajke zaštite uređaja kako biste onemogućili drugima da upotrebljavaju ovaj telefon bez vašeg dopuštenja. Odaberite zaključavanje zaslona koje želite upotrebljavati."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Odaberite pričuvni način zaključavanja zaslona"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Odaberite pričuvni način zaključavanja zaslona"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Odaberite pričuvni način zaključavanja zaslona"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcije zaključavanja zaslona"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcije zaključavanja zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zaključavanje zaslona"</string>
@@ -540,6 +556,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Otključavanje licem + zaporka"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Nastavi bez otključavanja licem"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Možete otključati telefon svojim licem. Iz sigurnosnih razloga ta opcija zahtijeva dodatno zaključavanje zaslona."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrijski podaci + uzorak"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrijski podaci + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrijski podaci + zaporka"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Nastavi s upotrebom biometrijskih podataka"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Možete otključati telefon upotrebom biometrijskih podataka. Iz sigurnosnih razloga ta opcija zahtijeva dodatno zaključavanje zaslona."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogućio administrator, pravila enkripcije ili pohrana vjerodajnica"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ništa"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Prelazak prstom"</string>
@@ -627,7 +648,6 @@
       <item quantity="other">Mora sadržavati manje od <xliff:g id="NUMBER_1">%d</xliff:g> znamenki</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administrator uređaja ne dopušta upotrebu nedavnog PIN-a"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Vaš je IT administrator blokirao uobičajene PIN-ove. Pokušajte s nekom drugim PIN-om."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Unos ne smije sadržavati nevažeće znakove"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Mora sadržavati najmanje jedno slovo"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Mora sadržavati najmanje jednu znamenku"</string>
@@ -668,7 +688,6 @@
       <item quantity="other">Mora sadržavati najmanje <xliff:g id="COUNT">%d</xliff:g> znakova koji nisu znamenke</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administrator uređaja ne dopušta upotrebu nedavne zaporke"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Vaš je IT administrator blokirao uobičajene zaporke. Pokušajte s nekom drugom zaporkom."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Uzastopno rastući ili padajući slijed brojeva ili ponavljanje brojeva nije dopušteno"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Odustani"</string>
@@ -812,7 +831,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Uključite Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Upotreba Wi-Fija"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Koristi Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Postavke Wi-Fija"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Postavljanje i upravljanje bežičnim pristupnim točkama"</string>
@@ -920,7 +939,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrirajte QR kôd u nastavku da biste se povezali s mrežom “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Pridružite se Wi‑Fiju tako što ćete skenirati QR kôd"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Dijelite Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skenirajte ovaj QR kôd da biste se povezali s mrežom \"<xliff:g id="SSID">%1$s</xliff:g>\" i podijelili zaporku"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skenirajte ovaj QR kôd nekim drugim uređajem da biste se pridružili mreži \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skenirajte ovaj QR kôd da biste se povezali s mrežom \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Pokušajte ponovo. Ako i dalje imate problema, obratite se proizvođaču uređaja"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Nešto nije u redu"</string>
@@ -946,8 +965,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Zaporka Wi-Fi mreže: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Zaporka žarišne točke: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatsko povezivanje"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Dopustite telefonu automatsko povezivanje kada je u blizini ove mreže"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Dopustite tabletu automatsko povezivanje kada je u blizini ove mreže"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Dopusti vezu s ovom mrežom kad je u dometu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Dodajte uređaj"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Dodajte uređaj u mrežu pomoću QR koda"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kôd nije u važećem formatu"</string>
@@ -959,7 +977,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Upotrijebi certifikate sustava"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Nemoj pružiti"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Nemoj potvrditi"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nije naveden nijedan certifikat. Veza neće biti privatna."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Mreža ima predugačak naziv."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Mora se navesti domena."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Potreban je certifikat."</string>
@@ -986,6 +1003,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Poveži"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi uključen"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Povezano s <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Povezivanje s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Povezivanje…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Povezivanje s mrežom nije uspjelo"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Mreža nije u dometu"</string>
@@ -1016,6 +1034,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC adresa uređaja"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Nasumično odabrana MAC adresa"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Nasumična MAC adresa (posljednja upotrijebljena)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresa"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Podaci o mreži"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podmreže"</string>
@@ -1023,8 +1042,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 adrese"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Spremljene mreže"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Pretplate"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Ostale mreže"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP postavke"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Napredne postavke Wi‑Fi-ja nisu dostupne za ovog korisnika"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Spremi"</string>
@@ -1033,8 +1051,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Upišite važeću adresu pristupnika."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Upišite važeću DNS adresu."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Upišite prefiks mreže duljine između 0 i 32 znaka."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ako ga ne nadjača privatni DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ako ga ne nadjača privatni DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Pristupnik"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Duljina mrežnog prefiksa"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1060,7 +1078,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacija dijeli sadržaj. Da biste dijelili internetsku vezu, isključite žarišnu točku, a zatim je ponovo uključite"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Zaporka nije postavljena"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Naziv žarišne točke"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Uključivanje žarišne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Uključivanje žarišne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Drugi uređaji mogu se povezati sa žarišnom točkom <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Zaporka žarišne točke"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Frekvencija pristupne točke"</string>
@@ -1210,7 +1228,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Glatki prikaz"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatski povećava učestalost osvježavanja sa 60 na 90 Hz za određeni sadržaj. Povećava potrošnju baterije."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Glatki prikaz"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Nametni učestalost osvježavanja od 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Najviša učestalost osvježavanja za poboljšano reagiranje na dodir i kvalitetu animacije. Povećava potrošnju baterije."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Pozornost zaslona"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Uključeno/zaslon se neće isključiti ako ga gledate"</string>
@@ -1301,6 +1319,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kada je zaslon taman, uključit će se u slučaju novih obavijesti"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Uvijek prikaži vrijeme i podatke"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Povećana potrošnja baterije"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Podebljano"</string>
     <string name="title_font_size" msgid="570613010306330622">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Smanjite ili povećajte tekst"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Postavke zaklj. SIM kartice"</string>
@@ -1350,7 +1369,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Verzija sustava Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Sigurnosno ažuriranje za Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model i hardver"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Verzija hardvera"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID opreme"</string>
@@ -1599,7 +1617,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Izbriši APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Novi APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Spremi"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Odbaci"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Odustani"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Polje naziva ne može biti prazno."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN ne može biti prazan."</string>
@@ -1614,8 +1632,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Aplikacije se mogu vratiti na zadano"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Poništi Wi-Fi, mobilnu mrežu i Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Ovime će se poništiti sve postavke mreže, uključujući:\n\n"<li>"Wi‑Fi"</li>\n<li>"mobilne podatke"</li>\n<li>"Bluetooth."</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Izbriši"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Izbriši preuzete SIM-ove"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Da biste preuzeli zamjenske SIM-ove, obratite se mobilnom operateru. Time se neće otkazati paketi mobilnih usluga."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Time se neće poništiti ugovori o mobilnim uslugama. Za preuzimanje zamjenskih SIM-ova obratite se mobilnom operateru."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Poništi postavke"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Želite li poništiti sve postavke mreže? Ta se radnja ne može poništiti."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Želite li vratiti sve postavke mreže na zadano i izbrisati preuzete SIM-ove? Ta se radnja ne može poništiti."</string>
@@ -1625,31 +1644,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Postavke mreže vraćene su na zadano."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Brisanje SIM-ova nije uspjelo"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Preuzeti SIM-ovi ne mogu se izbrisati zbog pogreške.\n\nPonovo pokrenite uređaj i pokušajte još jednom."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Izbriši sve podatke (vraćanje na tvorničke postavke)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Izbriši sve podatke (vraćanje na tvorničke postavke)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Time će se izbrisati svi podaci iz "<b>"unutarnje pohrane"</b>" tableta, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podaci i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Time će se izbrisati svi podaci iz "<b>"interne pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podaci i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Na ovom uređaju postoje i drugi korisnici.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Glazba"</li>\n<li>"Fotografije"</li>\n<li>"Ostali korisnički podaci"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ovi"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Time se neće otkazati vaš plan mobilne usluge."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, "<b>"USB pohrana"</b>" treba biti izbrisana."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"SD karticu"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Izbriši sve podatke (vraćanje na tvorničke postavke)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Izbriši sve podatke"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Time će se izbrisati svi podaci iz "<b>"interne pohrane"</b>" tableta, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Time će se izbrisati svi podaci iz "<b>"interne pohrane"</b>" telefona, uključujući:\n\n"<li>"vaš Google račun"</li>\n<li>"podatke i postavke sustava i aplikacija"</li>\n<li>"preuzete aplikacije"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Trenutačno ste prijavljeni na sljedeće račune:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Na ovom uređaju postoje i drugi korisnici.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"glazbu"</li>\n<li>"fotografije"</li>\n<li>"ostale korisničke podatke"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ove"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Time se neće otkazati vaš ugovor o mobilnoj usluzi."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"USB pohranu"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Da biste izbrisali glazbu, slike i ostale korisničke podatke, trebate izbrisati "<b>"SD karticu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Izbriši USB memoriju"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Izbriši SD karticu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Izbrisati sve podatke u unutarnjoj USB pohrani, poput glazbe ili fotografija"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Brišu se svi podaci na SD kartici, na primjer, glazba ili fotografije"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Brisanje svih podataka"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Brisanje svih podataka"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Svi vaši osobni podaci i preuzete aplikacije izbrisat će se. Ta se radnja ne može poništiti."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Izbrisat će se svi vaši osobni podaci, uključujući preuzete aplikacije i SIM-ove. Ta se radnja ne može poništiti."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Izbriši sve"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nije došlo do poništavanja jer nije dostupna usluga brisanja sustava."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Želite izbrisati sve podatke?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Vraćanje na tvorničko stanje nije dostupno za ovog korisnika"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Brisanje"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Pričekajte..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Izbriši sve podatke"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Izbriši sve podatke"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Izbrisat će se svi vaši osobni podaci i preuzete aplikacije. Ta se radnja ne može poništiti."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Izbrisat će se svi vaši osobni podaci, uključujući preuzete aplikacije i SIM-ove. Ta se radnja ne može poništiti."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Želite li izbrisati sve podatke?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Vraćanje na tvorničko stanje nije dostupno za ovog korisnika"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Brisanje"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Pričekajte…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Postavke poziva"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Postavite govornu poštu, preusmjeravanje poziva, ID pozivatelja"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB dijeljenje veze"</string>
@@ -1697,7 +1714,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Veza se ne može dijeliti s više od <xliff:g id="MAXCONNECTION">%1$d</xliff:g> uređaja."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> će biti oslobođen."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Dijeljenje veze Ethernetom"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Dijelite internetsku vezu telefona putem USB etherneta"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Dijelite internetsku vezu telefona putem etherneta"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Pomoću žarišne točke i modemskog povezivanja drugi se uređaji mogu povezati s internetom putem podatkovne veze vašeg mobilnog uređaja. Žarišnu točku mogu izraditi i aplikacije radi dijeljenja sadržaja s uređajima u blizini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Pomoću žarišne točke i modemskog povezivanja drugi se uređaji mogu povezati s internetom putem Wi-Fija ili podatkovne veze vašeg mobilnog uređaja. Žarišnu točku mogu izraditi i aplikacije radi dijeljenja sadržaja s uređajima u blizini."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomoć"</string>
@@ -1740,6 +1757,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Traženje Bluetootha"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Dopustite aplikacijama i uslugama da traže uređaje u blizini u bilo kojem trenutku, čak i kada je Bluetooth isključen. Na taj se način mogu, na primjer, poboljšati značajke i usluge koje se temelje na lokaciji."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usluge lokacije za posao"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Otkrivanje vremenske zone lokacije"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Otkrivanje vremenske zone lokacije"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Dopušta korištenje lokacije uređaja kako bi se utvrdila trenutačna vremenska zona. Ostale postavke lokacije, kao što je traženje Wi-Fija, mogu utjecati na točnost utvrđivanja vremenske zone."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Uključeno"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Isključeno"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatsko je otkrivanje vremenske zone onemogućeno"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Onemogućeno je otkrivanje vremenske zone lokacije"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Nije podržano otkrivanje vremenske zone lokacije"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Izmjene značajke otkrivanja vremenske zone lokacije nisu dopuštene"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Lokacija Wi-Fi i mob. mreža"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Omogućite aplik. da upotrebljavaju Googleovu uslugu lokacije za brže lociranje. Anonimni podaci prikupljat će se i slati Googleu."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Lokacija utvrđena pomoću Wi-Fija"</string>
@@ -1803,6 +1829,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Otključavanje licem zahtijeva zaporku"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Otključavanje licem zahtijeva uzorak"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Otključavanje licem zahtijeva PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Postavite zaporku za upotrebu biometrijskih podataka"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Postavite uzorak za upotrebu biometrijskih podataka"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Postavite PIN za upotrebu biometrijskih podataka"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Zaboravili ste zaporku?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Zaboravili ste uzorak?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Zaboravili ste PIN?"</string>
@@ -2141,13 +2170,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Postavke titlova"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Povećavanje"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Područje povećanja"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Omogućeno povećavanje"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Odaberite područje za povećavanje ili više njih koje želite upotrijebiti pri povećavanju zaslona"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Cijeli zaslon"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Dio zaslona"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Cijeli zaslon i dio zaslona"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Povećaj cijeli zaslon"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Povećaj dio zaslona"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Prijeći na gumb za Pristupačnost?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Trostruki dodir za povećavanje dijela zaslona prouzročit će kašnjenje u tipkanju i drugim radnjama.\n\nŽelite li početi upotrebljavati gumb za Pristupačnost za povećavanje?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Prijeđi na gumb za Pristupačnost"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Zadrži trostruki dodir za povećavanje"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Postavke povećanja"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Povećavanje trostrukim dodirom"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Povećanje pomoću prečaca"</string>
@@ -2201,11 +2233,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Tipka za uklj. prekida poziv"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Veliki pokazivač miša"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Uklanjanje animacija"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monozvuk"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Ravnoteža zvuka"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Lijeva"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Desna"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monozvuk"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Ravnoteža zvuka"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Lijevo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Desno"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Zadano"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekundi"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekundi"</string>
@@ -2235,11 +2267,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibracija za obavijesti"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibracija pri zvonjenju"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Reakcija na dodir"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Koristi uslugu <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otvori <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Korekcija boje"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Prikaži titlove"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Samo za podržanu aplikaciju"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Koristi uslugu <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otvori <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Upotreba korekcije boja"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Prikaži titlove"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Samo za podržanu aplikaciju"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Veličina i stil naslova"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> veličina teksta"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Više opcija"</string>
@@ -2270,6 +2302,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Nijanse sive"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Crveno – zeleno"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Crveno – zeleno"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Plavo – žuto"</string>
@@ -2405,7 +2438,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ograničenje upotrebe u pozadini"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Dopustite rad aplikacije u pozadini"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikaciji nije dopušten rad u pozadini"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Upotreba u pozadini ne može se ograničiti"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Upotreba u pozadini ne može se ograničiti"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Želite li ograničiti pozadinsku aktivnost?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ako ograničite pozadinsku aktivnost za aplikaciju, možda će se ponašati nepredviđeno"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikacija nije postavljena za optimizaciju baterije, pa je ne možete ograničiti.\n\nZa ograničenje uključite optimizaciju."</string>
@@ -2454,6 +2487,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet se upotrebljava više nego obično"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Uređaj se upotrebljava više nego obično"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Baterija bi se mogla isprazniti brže nego obično"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimiziranje radi zdravlja baterije"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Baterija je privremeno ograničena. Dodirnite da biste saznali više."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Vaš se telefon upotrebljavao više nego obično. Baterija bi se mogla isprazniti brže nego što očekujete.\n\nAplikacije koje najviše troše bateriju:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Vaš se tablet upotrebljavao više nego obično. Baterija bi se mogla isprazniti brže nego što očekujete.\n\nAplikacije koje najviše troše bateriju:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Vaš se uređaj upotrebljavao više nego obično. Baterija bi se mogla isprazniti brže nego što očekujete.\n\nAplikacije koje najviše troše bateriju:"</string>
@@ -2516,6 +2551,8 @@
       <item quantity="other">Ograničeno je %1$d aplikacija</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problem s očitavanjem mjerača baterije"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Došlo je do problema s očitavanjem mjerača baterije. Dodirnite da biste "<annotation id="url">"saznali više"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Zaustaviti aplikaciju?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2629,9 +2666,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Postavi raspored"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Produljenje trajanja baterije"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Isključi nakon punjenja"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Štednja baterije isključuje se kad je telefon na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Štednja baterije isključuje se kad je tablet na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Štednja baterije isključuje se kad je uređaj na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Štednja baterije isključuje se kad je telefon napunjen iznad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Štednja baterije isključuje se kad je tablet napunjen iznad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Štednja baterije isključuje se kad je uređaj napunjen iznad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Uključi"</string>
@@ -2696,6 +2733,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Vrati na zadano"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproduciraj"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptivna povezivost"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Automatski upravlja mrežnim vezama i tako produljuje trajanje baterije i poboljšava izvedbu uređaja"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Pohrana vjerodajnica"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instaliranje certifikata"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instaliraj certifikate iz memorije"</string>
@@ -2707,9 +2746,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Korisničke vjerodajnice"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Prikaz i izmjena pohranjenih vjerodajnica"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Dodatne postavke"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Vrsta pohrane"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardverska"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo softverska"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Za ovog korisnika nisu dostupne vjerodajnice"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalirano za VPN i aplikacije"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalirano za Wi-Fi"</string>
@@ -2725,6 +2761,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ne instaliraj"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Svejedno instaliraj"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certifikat nije instaliran"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Dopustiti aplikaciji <xliff:g id="APP_NAME">%s</xliff:g> da instalira certifikate na ovom uređaju?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Ovi certifikati identificirat će vas aplikacijama i URl-ovima u nastavku"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Nemoj dopustiti"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Dopusti"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Prikaži više"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Apl. za upravljanje certifik."</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Nema"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certifikati koje je instalirala ova aplikacija identificiraju vas aplikacijama i URL-ovima navedenim u nastavku"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Ukloni"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Signal za hitne pozive"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Postavite način ponašanja za hitni poziv"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Sigurnosna kopija"</string>
@@ -3053,7 +3098,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nije postavljen – radni profil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Vi (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nadimak"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Ne možete dodati više od <xliff:g id="USER_COUNT">%1$d</xliff:g> korisnika"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Samo vlasnik tabletnog računala može upravljati korisnicima."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Samo vlasnik telefona može upravljati korisnicima."</string>
@@ -3103,7 +3147,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Plaćanje na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Postavite aplikaciju za plaćanje. Zatim samo prislonite stražnju stranu telefona na bilo koji terminal sa simbolom beskontaktnog povezivanja."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Shvaćam"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Više..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Više…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Postavite zadanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ažurirajte zadanu aplikaciju za plaćanje"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na beskontaktnom terminalu plaćat će se putem aplikacije <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3173,9 +3217,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Natrag"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Dalje"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Završi"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Snimite fotografiju"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Odaberite sliku"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Odabir slike"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartice"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartice"</string>
@@ -3187,7 +3228,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Uvijek upotrebljavaj za pozive"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Odaberite SIM za podatke"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Odaberite SIM za SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Prebacuje se podatkovni SIM, to može potrajati najviše minutu..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Prebacuje se podatkovni SIM, to može potrajati najviše minutu…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Poziv putem usluge"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Odabir SIM kartice"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3372,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, raspored, štednja baterije, štednja energije, baterija, automatski, postotak"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, napredno pozivanje, 4g pozivanje"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dodaj jezik, dodajte jezik"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"veličina teksta"</string>
     <string name="default_sound" msgid="6604374495015245195">"Zadani zvuk"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Glasnoća zvona i obavijesti na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Glasnoća, vibracija, Ne ometaj"</string>
@@ -3370,12 +3412,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Uključi zvukove"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Automatski titlovi"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatski titlovi za medije"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ništa"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Postavljen je <xliff:g id="ON_COUNT">%d</xliff:g> raspored</item>
-      <item quantity="few">Postavljena su <xliff:g id="ON_COUNT">%d</xliff:g> rasporeda</item>
-      <item quantity="other">Postavljeno je <xliff:g id="ON_COUNT">%d</xliff:g> rasporeda</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nijedan}=1{Postavljen je jedan raspored}one{Postavljen je # raspored}few{Postavljena su # rasporeda}other{Postavljeno je # rasporeda}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne uznemiravaj"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Primajte obavijesti samo od važnih osoba i aplikacija"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograničavanje prekida"</string>
@@ -3443,22 +3480,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Samo prioritetno"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Uključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Isključeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Isključeno"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Uključeno"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pitaj svaki put"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dok ne isključite"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> sat</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> sata</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> sati</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> raspored može se uključiti automatski</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda mogu se uključiti automatski</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> rasporeda može se uključiti automatski</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 sat}one{# sat}few{# sata}other{# sati}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuta}one{# minuta}few{# minute}other{# minuta}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Isključeno}=1{Isključeno/jedan raspored može se uključiti automatski}one{Isključeno/# raspored može se uključiti automatski}few{Isključeno/# rasporeda mogu se uključiti automatski}other{Isključeno/# rasporeda može se uključiti automatski}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Što može prekidati značajku Ne uznemiravaj"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Osobe"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
@@ -3504,6 +3531,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Obavijesti nižeg prioriteta automatski se postavljaju na Neupadljivo"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Prilagodljiv poredak obavijesti"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatski poredaj obavijesti prema važnosti"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivim obavijestima"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Navedi prilagodbe obavijesti i prikaži opciju pružanja povratnih informacija sustavu"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Vraćanje važnosti obavijesti na zadano"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Postavke važnosti koje je korisnik promijenio vratite na zadane i dopustite pomoćniku za obavijesti da određuje prioritete"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predložene radnje i odgovori"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatski prikaži predložene radnje i odgovore"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Pregledajte nedavne i odgođene obavijesti"</string>
@@ -3602,8 +3633,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioritetni razgovori"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Prikazuje se pri vrhu odjeljka razgovora i kao pomični oblačići"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Prikazuje se pri vrhu odjeljka razgovora"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Ostali razgovori"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Razgovori koji nisu prioritetni"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Razgovori koje ste izmijenili"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Nedavni razgovori"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Izbriši nedavne"</string>
+    <string name="clear" msgid="5092178335409471100">"Izbriši"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prikaži prioritetne razgovore u oblačićima"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritetni razgovori prikazuju se pri vrhu zaslona obavijesti. Možete postaviti i da se prikazuju u oblačićima te vas ometaju dok je uključena značajka Ne uznemiravaj."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Ovdje će se prikazivati prioritetni i izmijenjeni razgovori"</string>
@@ -3705,7 +3739,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Pristup opciji Ne ometaj"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Dopusti Ne uznemiravaj"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nijedna instalirana aplikacija nije zatražila pristup opciji Ne ometaj"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Učitavanje aplikacija..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Učitavanje aplikacija…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android na vaš zahtjev blokira prikazivanje obavijesti te aplikacije na ovom uređaju"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android na vaš zahtjev blokira prikazivanje te kategorije obavijesti na ovom uređaju"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android na vaš zahtjev blokira prikazivanje te grupe obavijesti na ovom uređaju"</string>
@@ -3800,12 +3834,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Svi razgovori"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritetni razgovori"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ništa"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovor</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovora</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> razgovora</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ništa"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nijedan}=1{1 razgovor}one{# razgovor}few{# razgovora}other{# razgovora}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Tko može prekidati"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Pozivi"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Pozivi"</string>
@@ -3814,12 +3843,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Da biste provjerili mogu li se čuti dopušteni pozivi, provjerite je li uređaj postavljen na zvonjenje"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Za raspored \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" dolazni su pozivi blokirani. Možete prilagoditi postavke da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakti označeni zvjezdicom"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-      <item quantity="few">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osobe</item>
-      <item quantity="other">Još <xliff:g id="NUM_PEOPLE">%d</xliff:g> osoba</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nitko"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nijedan}=1{{contact_1}}=2{{contact_1} i {contact_2}}=3{{contact_1}, {contact_2} i {contact_3}}one{{contact_1}, {contact_2} i njih još #}few{{contact_1}, {contact_2} i njih još #}other{{contact_1}, {contact_2} i njih još #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Bez imena)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Poruke"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"poruke"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Poruke"</string>
@@ -3828,12 +3853,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Dolazne su poruke blokirane za raspored \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Možete prilagoditi postavke da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Dostupni ste za sve poruke"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Dostupni ste za sve pozive"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ništa"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakt</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakta</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakata</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nijedan}=1{1 kontakt}one{# kontakt}few{# kontakta}other{# kontakata}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Svi"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakti"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakti označeni zvjezdicom"</string>
@@ -3871,24 +3891,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Sve obavijesti"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Neke obavijesti"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Odabrane osobe i dalje vam se mogu obratiti, čak i ako ne dopustite aplikacijama da prekidaju"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> može prekidati</item>
-      <item quantity="few"><xliff:g id="APP_NAMES">%s</xliff:g> mogu prekidati</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> mogu prekidati</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nijedna aplikacija ne može prekidati}=1{{app_1} može prekidati}=2{{app_1} i {app_2} mogu prekidati}=3{{app_1}, {app_2} i {app_3} mogu prekidati}one{{app_1}, {app_2} i još # aplikacija mogu prekidati}few{{app_1}, {app_2} i još # aplikacije mogu prekidati}other{{app_1}, {app_2} i još # aplikacija mogu prekidati}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacije"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Sve obavijesti"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Neke obavijesti"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Obavijesti koje mogu prekidati"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Dopusti sve obavijesti"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekidati</item>
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekidati</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogu prekidati</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ništa ne može prekidati"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"još <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ništa ne može prekidati}=1{{sound_category_1} može prekidati}=2{{sound_category_1} i {sound_category_2} mogu prekidati}=3{{sound_category_1}, {sound_category_2} i {sound_category_3} mogu prekidati}one{{sound_category_1}, {sound_category_2} i još # zvuk mogu prekidati}few{{sound_category_1}, {sound_category_2} i još # zvuka mogu prekidati}other{{sound_category_1}, {sound_category_2} i još # zvukova mogu prekidati}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ništa ne može prekidati"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nitko ne može prekidati"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Neke osobe mogu prekidati"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Sve osobe mogu prekidati"</string>
@@ -3936,8 +3946,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Uključeno"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Isključeno"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Prikačivanje aplikacije"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Prikačivanje aplikacije omogućuje da vaša trenutačna aplikacija bude vidljiva dok je ne otkvačite. Tu značajku možete koristiti kako biste, na primjer, prijatelju kojem vjerujete dopustili da igra određenu igru. \n\nKad je aplikacija prikvačena, može otvarati druge aplikacije i osobni podaci mogu biti dostupni. \n\nKako upotrebljavati prikvačivanje aplikacije: 	\n1.	Uključite prikvačivanje aplikacije. 	\n2.	Otvorite Pregled. 	\n3.	Dodirnite ikonu aplikacije na vrhu zaslona, a potom dodirnite Prikvači."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Prikvačivanje aplikacije omogućuje da vaša trenutačna aplikacija bude vidljiva dok je ne otkvačite. Tu značajku možete koristiti kako biste, na primjer, prijatelju kojem vjerujete dopustili da igra određenu igru. \n\nKad je aplikacija prikvačena, može otvarati druge aplikacije i osobni podaci mogu biti dostupni. \n\nAko želite s nekim sigurno dijeliti svoj uređaj, pokušajte koristiti profil gosta. \n\nDa biste koristili prikvačivanje aplikacije. 	\n1.	Uključite prikvačivanje aplikacije 	\n2.	Otvorite Pregled. 	\n3.	Dodirnite ikonu aplikacije pri vrhu zaslona, a potom dodirnite Prikvači."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Prikvačivanje aplikacije omogućuje da vaša trenutačna aplikacija bude vidljiva dok je ne otkvačite. Tu značajku možete koristiti kako biste, na primjer, prijatelju kojem vjerujete dopustili da igra određenu igru."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Kad je aplikacija prikvačena, može otvarati druge aplikacije i osobni podaci mogu biti dostupni. \n\nKako upotrebljavati prikvačivanje aplikacije: 	\n1.	Uključite prikvačivanje aplikacije 	\n2.	Otvorite Pregled 	\n3.	Dodirnite ikonu aplikacije na vrhu zaslona, a potom dodirnite Prikvači"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Kad je aplikacija prikvačena, može otvarati druge aplikacije i osobni podaci mogu biti dostupni. \n\nAko želite s nekim sigurno dijeliti svoj uređaj, pokušajte koristiti profil gosta. \n\nKako upotrebljavati prikvačivanje aplikacije: 	\n1.	Uključite prikvačivanje aplikacije 	\n2.	Otvorite Pregled 	\n3.	Dodirnite ikonu aplikacije na vrhu zaslona, a potom dodirnite Prikvači"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Kad je aplikacija prikvačena: \n\n•		osobni podaci mogu biti dostupni \n		(primjerice, kontakti i sadržaj e-pošte) \n•		prikvačena aplikacija može otvarati druge aplikacije \n\nPrikvačivanje aplikacije koristite samo s osobama kojima vjerujete."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Traži uzorak za otključavanje radi otkvačivanja"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Traži PIN radi otkvačivanja"</string>
@@ -3959,6 +3970,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Osim otključavanja uređaja licem, uređaj možete dodatno zaštititi zahtijevanjem PIN-a kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ni obavijesti, uključujući alarme.\n\nTime se štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati PIN za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Osim otključavanja uređaja licem, uređaj možete dodatno zaštititi zahtijevanjem uzorka kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ni obavijesti, uključujući alarme.\n\nTime se štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati uzorak za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Osim otključavanja uređaja licem, ovaj uređaj možete zaštititi i zahtijevanjem zaporke prije pokretanja. Dok se uređaj ne pokrene, ne može primati pozive, poruke ni obavijesti, uključujući alarme.\n\nTime se štite podaci na izgubljenim i ukradenim uređajima. Želite li zahtijevati zaporku za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Osim otključavanja uređaja upotrebom biometrijskih podataka, ovaj uređaj možete zaštititi i zahtijevanjem PIN-a prije pokretanja. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Postaviti uzorak za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Osim otključavanja uređaja upotrebom biometrijskih podataka, ovaj uređaj možete zaštititi i zahtijevanjem uzorka prije pokretanja. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Postaviti uzorak za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Osim otključavanja uređaja upotrebom biometrijskih podataka, ovaj uređaj možete zaštititi i zahtijevanjem zaporke prije pokretanja. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Postaviti zaporku za pokretanje uređaja?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Da"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ograničeno"</string>
@@ -4142,7 +4156,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-om upravlja"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Povezani uređaj"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ovaj uređaj"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Prebacivanje..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Prebacivanje…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Prebacivanje nije uspjelo"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Punjenje ovog uređaja"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Punjenje povezanog uređaja"</string>
@@ -4340,6 +4354,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Potrošnja mobilnih podataka"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Potrošnja podatkovnog prometa aplikacija"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Potrošnja putem Wi-Fija"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Upotreba podataka koji ne pripadaju mobilnom operateru"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Potrošnja ethernet podataka"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4359,6 +4374,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Mobilni operater može obračunavati podatke na drugačiji način od uređaja"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Izuzima podatke koje koriste mreže mobilnog operatera"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Potrošili ste <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Postavi upozorenje o potrošnji"</string>
     <string name="data_warning" msgid="2925054658166062884">"Upozorenje o potrošnji"</string>
@@ -4396,7 +4412,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Prikaz pojedinosti"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Štednja podat. prometa"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neograničeni podaci"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Pozadinski su podaci isključeni"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Pozadinski su podaci isključeni"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Uključeno"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Isključeno"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Ograniči podatkovni promet"</string>
@@ -4419,7 +4435,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Spriječi unos odgovora ili drugog teksta u obavijesti kada je uređaj zaključan"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Zadana provjera pravopisa"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Odabir provjere pravopisa"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Upotreba provjere pravopisa"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Upotreba provjere pravopisa"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nije odabrano"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ništa)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4529,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Ukloni fotografije i videozapise"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Upravitelj pohrane"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Upotreba upravitelja pohrane"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Upotreba upravitelja pohrane"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatski"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Priručnik"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Oslobodi prostor odmah"</string>
@@ -4551,6 +4567,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dva dodira za provjeru"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dvaput dodirnite da biste provjerili tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dvaput dodirnite da biste provjerili uređaj"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Prijeđite prstom za obavijesti"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Za prikaz obavijesti prijeđite prstom prema dolje na donjem rubu zaslona"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Način rada jednom rukom"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Koristi način rada jednom rukom"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Izađi pri prelasku s aplikacije na aplikaciju"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Privremeni prekid"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunde"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekundi"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekundi"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"dostupnost"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Da biste pogledali vrijeme, obavijesti i druge informacije, dvaput dodirnite zaslon."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Provjera telefona podizanjem"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Podignite da biste provjerili tablet"</string>
@@ -4563,6 +4589,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dodirnite da biste provjerili tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dodirnite da biste provjerili uređaj"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Da biste pogledali vrijeme, obavijesti i druge informacije, dodirnite zaslon."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS upozorenje"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Upotreba SOS upozorenja"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Upravlja aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Pokrenite radnje u nastavku tako što ćete najmanje pet puta brzo pritisnuti tipku za uključivanje/isključivanje"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Reproduciraj alarm odbrojavanja"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Reproduciraj glasni zvuk prije pozivanja pomoći"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Nazovite za pomoć"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Telefonski broj za pomoć"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Dotaknite za promjenu"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Ako unesete broj koji nije broj hitne službe:\n • Uređaj mora biti otključan da biste upotrijebili SOS upozorenje\n • Možda vam se nitko neće javiti na poziv"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Prelazak prstom preko senzora za obavijesti"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Prelazak prstom preko senzora"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani telefona."</string>
@@ -4695,6 +4731,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maksimalan broj vidljivih skupova podataka"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Vrati na zadane vrijednosti"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Opcije automatskog popunjavanja za razvojne programere vraćene su na zadano"</string>
+    <string name="location_category" msgid="3496759112306219062">"Lokacija"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Pokazivač lokacije trake statusa"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Prikaži za sve lokacije, uključujući mrežu i povezivost"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Primijeni potpuna mjerenja GNSS-a"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Prati sve konstelacije i frekvencije GNSS-a bez određivanja radnog omjera"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema uređaja"</string>
     <string name="default_theme" msgid="4815428567082263639">"Zadano"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Naziv mreže"</string>
@@ -4711,8 +4752,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pauzirajte obavijesti da biste ostali usredotočeni"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Značajka nije dostupna"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Ta je značajka isključena jer usporava telefon"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Primijeni potpuna mjerenja GNSS-a"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Prati sve konstelacije i frekvencije GNSS-a bez određivanja radnog omjera"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Uvijek prikaži dijaloški okvir o rušenju"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Prikaži dijaloški okvir svaki put kada se aplikacija sruši"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Upotrijebite aplikaciju omogućenu za ANGLE"</string>
@@ -4724,7 +4763,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogućavanje za sve aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Odabir upravljačkog programa za grafiku"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Zadano"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Upravljački program za igru"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Upravljački program za igru"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Upravljački program razvojnog programera"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Upravljački program za grafiku sustava"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4780,7 +4819,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Uključi (isključi zvuk)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Isključi"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Podaci o mreži"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Naziv vašeg uređaja vidljiv je aplikacijama na vašem telefonu. Mogu ga vidjeti i drugi ljudi kada se povežete s Bluetooth uređajima ili postavite Wi-Fi žarišnu točku."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Naziv vašeg uređaja vidljiv je aplikacijama na vašem telefonu. Mogu ga vidjeti i drugi ljudi kada se povežete s Bluetooth uređajima ili Wi-Fi mrežom ili postavite Wi-Fi žarišnu točku."</string>
     <string name="devices_title" msgid="649715719278562515">"Uređaji"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Sve postavke"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Prijedlozi"</string>
@@ -4793,6 +4832,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nije pronađena nijedna mreža. Pokušajte ponovo."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(zabranjeno)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nema SIM kartice"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nema SIM kartice"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nema"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Potrebna je SIM kartica radi povezivanja"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Potrebna je SIM kartica operatera <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> radi povezivanja"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Način željene mreže: Preferirano WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Način željene mreže: Samo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Način željene mreže: Samo WCDMA"</string>
@@ -4846,6 +4890,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilni podaci"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Pristupi podacima pomoću mobilne mreže"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon će automatski prijeći na tog mobilnog operatera kad bude u dometu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nije dostupna nijedna SIM kartica"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencija za pozive"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferencija za SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pitaj svaki put"</string>
@@ -4907,6 +4952,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nedostupno kada je povezano s mobilnim operaterom <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Prikaži više"</string>
     <string name="see_less" msgid="2642392725363552793">"Prikaži manje"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Uključiti mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Uključiti SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Želite li prijeći na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Želite li prijeći na SIM karticu?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Istovremeno može biti aktivan samo jedan SIM.\n\nPrelaskom na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati vaša usluga kod mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Istovremeno može biti aktivan samo jedan preuzeti SIM.\n\nPrelaskom na mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> neće se otkazati vaša usluga kod mobilnog operatera <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Istovremeno može biti aktivan samo jedan SIM.\n\nPrelaskom se neće otkazati vaša usluga kod mobilnog operatera <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Prebacite se na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Povezivanje s mrežom…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Prijelaz na mobilnog operatera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Promjena mobilnog operatera nije uspjela"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Mobilni operater ne može se promijeniti zbog pogreške."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Isključiti uslugu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Isključiti SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Isključivanje SIM-a<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Onemogućivanje mobilnog operatera nije uspjelo"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Nešto je pošlo po zlu i onemogućivanje mobilnog operatera nije uspjelo."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Želite li upotrebljavati dvije SIM kartice?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Ovaj uređaj istovremeno može imati dvije aktivne SIM kartice. Da biste nastavili s upotrebom samo jedne SIM kartice, dodirnite \"Ne, hvala\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Želite li ponovo pokrenuti uređaj?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Za početak ponovo pokrenite uređaj. Zatim možete dodati drugu SIM karticu."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Nastavi"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Pokreni ponovo"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Promijeni"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM se ne može aktivirati"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izvadite SIM i umetnite ga ponovo. Ako se problem ponovi, ponovo pokrenite uređaj."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pokušajte ponovo uključiti SIM. Ako se problem ponovi, ponovo pokrenite uređaj."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivacija mreže"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktivan"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dodirnite da biste ažurirali postavke SIM-a"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM kartica"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Želite li izbrisati taj preuzeti SIM?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Brisanjem ovog SIM-a uklanja se usluga mobilnog operatera <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> s ovog uređaja.\n\nUsluga mobilnog operatera <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> neće se otkazati."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Izbriši"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Brisanje SIM-a…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Brisanje SIM-a nije uspjelo"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"SIM se ne može izbrisati zbog pogreške.\n\nPonovo pokrenite uređaj i pokušajte još jednom."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Povezivanje s uređajem"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacija <xliff:g id="APPNAME">%1$s</xliff:g> želi koristiti privremenu Wi‑Fi mrežu za povezivanje s vašim uređajem"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nije pronađen nijedan uređaj. Provjerite je li uređaj uključen i dostupan za povezivanje."</string>
@@ -4980,6 +5063,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Hitni pozivi"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Vaš mobilni operater ne podržava hitne pozive putem Wi‑Fi poziva.\nUređaj se automatski prebacuje na mobilnu mrežu kako bi uputio hitni poziv.\nHitni pozivi mogući su samo u područjima pokrivenim mobilnim mrežama."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Upotrijebi Wi‑Fi za pozive radi poboljšanja kvalitete"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Preusmjeravanje poziva na drugi SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Dopusti pozive i SMS-ove drugog SIM-a putem ovog SIM-a."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"preusmjeravanje poziva na drugi SIM"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Dolazna MMS poruka"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Nije moguće poslati MMS poruku"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Dodirnite da biste dopustili MMS poruke na usluzi <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> kad su mobilni podaci isključeni"</string>
@@ -5031,10 +5117,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dopustite preklapanja na zaslonu na Postavkama"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dopustite aplikacije koje se mogu prikazivati iznad drugih da se preklapaju na zaslonima Postavki"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Mediji"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Sakrij player kad se medijska sesija završi"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Player vam omogućuje da nastavite sesiju iz proširene ploče Brze postavke."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Player medija u Brzim postavkama"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Prikažite player medija dulje vrijeme da biste lako nastavili reprodukciju"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Sakrij player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Prikaži player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nijedan player nije dostupan"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Dopuštene aplikacije"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"mediji"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth će se uključiti"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Uključeno"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Isključeno"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-ovi"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Mreže sigurne za rad u zrakoplovu"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Pronađite mreže sigurne za rad u zrakoplovu i povežite se s njima"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"zrakoplov, sigurno za rad u zrakoplovu"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Pozivi i SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi pozivi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Upućujte i primajte pozive putem mreža koje ne pripadaju mobilnom operateru, kao što su Wi-Fi mreže"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi pozivi omogućuju vam da upućujete i odgovarate na pozive putem mreža koje ne pripadaju mobilnom operateru, kao što su neke Wi-Fi mreže."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Pozivi"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferirano"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"preferiraju se pozivi"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"preferiraju se SMS-ovi"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"nije dostupno"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nema SIM kartice"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Postavke"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Poveži se s javnim mrežama"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"mrežna veza, internet, bežično, podaci, wifi, wi-fi, wi fi, mobilno, mobilni uređaj, mobilni operater, 4 g, 3 g, 2 g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Pregled mreža sigurnih za rad u zrakopl."</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Isključite način rada u zrakoplovu"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nije dostupno jer je uključen način rada u vrijeme spavanja"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Dovršeno je vraćanje važnosti obavijesti na zadano."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacije"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nepouzdani uređaj želi pristupiti vašim porukama. Dodirnite da biste vidjeli pojedinosti."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Dopustiti pristup porukama?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nepouzdani Bluetooth uređaj [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] želi pristupiti vašim porukama.\n\nDo sad se niste povezali s uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nepouzdani uređaj želi pristupiti vašim kontaktima i zapisniku poziva. Dodirnite da biste vidjeli pojedinosti."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Dopustiti pristup kontaktima i zapisniku poziva?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nepouzdani Bluetooth uređaj [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] želi pristupiti vašim kontaktima i zapisniku poziva. To uključuje podatke o dolaznim i odlaznim pozivima.\n\nDo sad se niste povezali s uređajem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 8ea94c5..6fe7f5c 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Közepes"</item>
     <item msgid="6740026006576843477">"Hosszú"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Rövid"</item>
+    <item msgid="7397961711906421599">"Közepes"</item>
+    <item msgid="4079132024502041928">"Hosszú"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Alapértelmezett"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globális"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Csak TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globális"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index a8ffb00..fdd2ced 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Dátum és idő"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Dátum és idő beállítása"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Dátum, idő, időzóna és formátumok beállítása"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Hálózatról lekért idő használata"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Hálózatról lekért időzóna használata"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Időpont automatikus beállítása"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Időzóna automatikus beállítása"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Helyi alapértelmezés használata"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 órás formátum"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 órás formátum használata"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Profiladatok megjelenítése a lezáró képernyőn"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Fiókok"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Tartózkodási hely"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Helyadatok használata"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Helyadatok használata"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Ki"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Be – <xliff:g id="COUNT_1">%1$d</xliff:g> alkalmazás hozzáfér a helyadatokhoz</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Képernyőzár, arcalapú feloldás"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Képernyőzár, ujjlenyomat"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Képernyőzár"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"A telefon biztonságos feloldása arccal és ujjlenyomattal"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Bejelentkezhet alkalmazásokba és jóváhagyhat fizetéseket is"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Feloldás beállítása a következővel:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Arcalapú feloldás"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"A telefon feloldásának megkönnyítése"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Ujjlenyomat"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Időspórolás a telefon zsebben való feloldásával"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Kihagyás"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Tovább"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Arc hozzáadva"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Arcalapú feloldás beállítása"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Arcalapú feloldás"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Arc használata hitelesítéshez"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Kezdés"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"A kisegítő arcalapú feloldás ki van kapcsolva, ezért előfordulhat, hogy egyes beállítási lépések nem működnek megfelelően a TalkBack funkcióval."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Vissza"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Beállítás folytatása"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Kisegítő beállítás használata"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Alkalmazáson belüli arcalapú feloldáshoz megerősítés is szükséges"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Arcadatok törlése"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Arcalapú feloldás beállítása"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Az arcalapú feloldás segítségével feloldhatja eszköze zárolását, bejelentkezhet alkalmazásokba, illetve megerősíthet fizetéseket.\n\nNe feledje:\nA telefonjára nézve akkor is feloldhatja az eszközt, ha nem áll szándékában.\n\nTelefonját más is feloldhatja, ha az Ön arca elé tartja.\n\nElőfordulhat, hogy telefonja zárolását egy Önre nagyon hasonlító személy, például egypetéjű ikertestvére is fel tudja oldani."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Az arcalapú feloldás segítségével feloldhatja eszköze zárolását, bejelentkezhet alkalmazásokba, illetve megerősítheti a fizetéseket.\n\nNe feledje:\nAkaratlanul is feloldhatja a telefont, amikor ránéz.\n\nA telefont mások is feloldhatják, ha az Ön arca elé tartják, még akkor is, ha csukva van a szeme.\n\nElőfordulhat, hogy telefonja zárolását egy Önre nagyon hasonlító személy, például egypetéjű ikertestvére is feloldhatja."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Az arcalapú feloldást használhatja eszköze feloldására, alkalmazásokba való bejelentkezésre, illetve fizetési tranzakciók megerősítésére."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Ne feledje:\nHa ránéz a telefonra, azzal akaratlanul is feloldhatja.\n\nValaki más is feloldhatja telefonját, ha az Ön arca felé fordítja.\n\nOlyan személy is feloldhatja a telefont, aki nagyon hasonlít Önre, például az ikertestvére."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Ne feledje:\nHa ránéz a telefonra, azzal akaratlanul is feloldhatja.\n\nValaki más is feloldhatja telefonját, ha az Ön arca felé fordítja, még akkor is, ha Ön becsukja a szemét.\n\nOlyan személy is feloldhatja a telefont, aki nagyon hasonlít Önre, például az ikertestvére."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Törli az arcadatokat?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Az arcalapú feloldáshoz használt arcadatokat véglegesen és biztonságosan töröljük. Az eltávolítás után PIN-kódra, mintára vagy jelszóra lesz szüksége a telefon feloldásához, az alkalmazásokba való bejelentkezéshez és a tranzakciók megerősítéséhez."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"A telefon feloldásához használja az arcalapú feloldást"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Használja ujjlenyomatát a telefon feloldásához vagy vásárlások engedélyezéséhez.\n\nMegjegyzés: Nem használhatja ujjlenyomatát azt eszköz feloldására. További információért forduljon szervezete rendszergazdájához."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Használja ujjlenyomatát a telefon feloldásához vagy vásárlások engedélyezéséhez.\n\nMegjegyzés: Az ujjlenyomat kevésbé biztonságos, mint az erős minta vagy PIN-kód."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Mégse"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nem"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Tovább"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Kihagyás"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Következő"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Képernyőzárral védett táblagépéhez nem férhetnek hozzá, ha ellopják vagy elveszíti. A képernyőzár az arcalapú feloldás használatához is szükséges. A visszalépéshez koppintson a Mégse gombra."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Képernyőzárral védett eszközéhez nem férhetnek hozzá, ha ellopják vagy elveszíti. A képernyőzár az arcalapú feloldás használatához is szükséges. A visszalépéshez koppintson a Mégse gombra."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Képernyőzárral védett telefonjához nem férhetnek hozzá, ha ellopják vagy elveszíti. A képernyőzár az arcalapú feloldás használatához is szükséges. A visszalépéshez koppintson a Mégse gombra."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Képernyőzárral védett táblagépéhez nem férhetnek hozzá, ha ellopják vagy elveszíti. A biometriai feloldás beállításához rendelkeznie kell képernyőzár-beállítással is. A visszalépéshez koppintson a Mégse gombra."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Képernyőzárral védett eszközéhez nem férhetnek hozzá, ha ellopják vagy elveszíti. A biometriai feloldás beállításához rendelkeznie kell képernyőzár-beállítással is. A visszalépéshez koppintson a Mégse gombra."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Képernyőzárral védett telefonjához nem férhetnek hozzá, ha ellopják vagy elveszíti. A biometriai feloldás beállításához rendelkeznie kell képernyőzár-beállítással is. A visszalépéshez koppintson a Mégse gombra."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Kihagyja a PIN-kód beállítását?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Kihagyja a jelszó beállítását?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Kihagyja a minta beállítását?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a táblagépet. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják az eszközt. Válassza ki a használni kívánt képernyőlezárási módot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Az eszköz védelmi funkcióinak aktiválásával megakadályozhatja, hogy mások az Ön engedélye nélkül használják a telefont. Válassza ki a használni kívánt képernyőlezárási módot."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Válassza ki a biztonsági képernyő-zárolási módszert"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Válassza ki a másodlagos képernyőzárolási módszert"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Válassza ki a másodlagos képernyőzárolási módszert"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"A képernyőzár feloldása"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"A képernyőzár feloldása"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Képernyő zárolása"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Arcalapú feloldás + jelszó"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Folytatás arcalapú feloldás nélkül"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Feloldhatja telefonját arca segítségével. Biztonsági okokból ezen beállítás esetében szükség van másodlagos képernyőzárra is."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria és minta"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria és PIN-kód"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria és jelszó"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Folytatás biometriai feloldás nélkül"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Feloldhatja telefonja zárolását biometriai lehetőség használatával. Biztonsági okokból ezen beállítás esetében szükség van másodlagos képernyőzárra is"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Rendszergazda, szabályzat vagy adattár letiltotta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nincs"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Csúsztatás"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> számjegynél rövidebbnek kell lennie</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Az eszközrendszergazda nem engedélyezi a legutóbbi PIN-kódok használatát"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Rendszergazdája letiltotta a gyakran használt PIN-kódokat. Próbálkozzon másik PIN-kóddal."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ez nem tartalmazhat érvénytelen karaktert"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Tartalmazzon legalább egy betűt"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Tartalmazzon legalább egy számjegyet"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Tartalmaznia kell legalább 1 olyan karaktert, amely nem szám</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Az eszközrendszergazda nem engedélyezi a legutóbbi jelszavak használatát"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Rendszergazdája letiltotta a gyakran használt jelszavakat. Próbálkozzon másik jelszóval."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Növekvő, csökkenő vagy ismétlődő számsor megadása nem engedélyezett"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Megerősítés"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Mégse"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi bekapcsolása"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi használata"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi használata"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi beállítások"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Vezeték nélküli hozzáférési pontok beállítása és kezelése"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Irányítsa a QR-kódot az alábbi panel közepére, hogy hozzáadja az eszközt a(z) <xliff:g id="SSID">%1$s</xliff:g> hálózathoz"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Csatlakozzon Wi-Fi-hálózathoz QR-kód beolvasásával"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi megosztása"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"A(z) „<xliff:g id="SSID">%1$s</xliff:g>” hálózathoz való csatlakozás érdekében olvassa be ezt a QR-kódot, és ossza meg a jelszót"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Ha csatlakozni szeretne a(z) „<xliff:g id="SSID">%1$s</xliff:g>” hálózathoz egy másik eszközzel, olvassa be ezt a QR-kódot"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"A(z) „<xliff:g id="SSID">%1$s</xliff:g>” hálózathoz való csatlakozás érdekében olvassa be ezt a QR-kódot"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Próbálja újra. Ha a probléma továbbra is fennáll, vegye fel a kapcsolatot az eszköz gyártójával."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Hiba történt"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-jelszó: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot jelszava: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatikus csatlakozás"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"A telefon automatikusan csatlakozhat e hálózat közelében"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"A táblagép automatikusan csatlakozhat e hálózat közelében"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"A hálózathoz való csatlakozás engedélyezése hatótávolságon belül"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Eszköz hozzáadása"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Használjon QR-kódot, ha új eszközt szeretne hozzáadni a hálózathoz"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"A QR-kód nem érvényes formátum"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Rendszertanúsítvány használata"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne adja meg"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne hitelesítse"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nincs megadva tanúsítvány. A kapcsolat nem privát jellegű lesz."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"A hálózat neve túl hosszú."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"A domain megadása kötelező."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Tanúsítvány szükséges."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Kapcsolódás"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi bekapcsolva"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Kapcsolódva a(z) <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózathoz"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Csatlakozás a következőhöz: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Csatlakozás…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Nem sikerült hálózathoz csatlakozni."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"A hálózat nincs hatókörön belül"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Az eszköz MAC-címe"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Véletlenszerű MAC-cím"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Véletlenszerű MAC-cím (legutóbb használt)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-cím"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Hálózati információk"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Alhálózati maszk"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-címek"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Mentett hálózatok"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Előfizetések"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Egyéb hálózatok"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP-beállítások"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"A speciális Wi-Fi-beállítások nem állnak rendelkezésre ennél a felhasználónál"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Mentés"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Írjon be érvényes átjárócímet."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Írjon be érvényes DNS-címet."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 és 32 közti hosszt adjon meg a hálózati előtagnál."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"1. DNS"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"2. DNS"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (hacsak a privát DNS felül nem írja)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (hacsak a privát DNS felül nem írja)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Átjáró"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Hálózati előtag hossza"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Az alkalmazás tartalmat oszt meg. Az internetkapcsolat megosztásához kapcsolja ki, majd újra be a hotspotot"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nincs beállítva jelszó"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot neve"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> bekapcsolása…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> bekapcsolása…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Más eszközök is csatlakozhatnak a(z) <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> hotspothoz"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot jelszava"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-sáv"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Néhány tartalomnál automatikusan megemeli a frissítés gyakoriságát 60-ról 90 Hz-re. Növeli az akkumulátorhasználatot."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz-es frissítési gyakoriság kényszerítése"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Legnagyobb frissítési gyakoriság a kifinomultabb érintési érzékenység és a jobb minőségű animációk érdekében. Növeli az akkumulátorhasználatot."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Képernyőfigyelő"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Be / A képernyő nem kapcsol majd ki, ha Ön épp azt nézi"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Amikor a képernyő ki van kapcsolva, bekapcsol az új értesítéseknél"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Idő és adatok mindig láthatók"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Növeli az akkumulátorhasználatot"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Félkövér szöveg"</string>
     <string name="title_font_size" msgid="570613010306330622">"Betűméret"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Szöveg nagyítása és kicsinyítése"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM-kártya lezárási beállításai"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android verziója"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android biztonsági frissítés"</string>
     <string name="model_info" msgid="8997566254717810904">"Modell"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modell: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modell és hardver"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardververzió"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Eszközazonosító"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN törlése"</string>
     <string name="menu_new" msgid="6571230342655509006">"Új APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Mentés"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Elvetés"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Mégse"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"A Név mező nem lehet üres."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Az APN nem lehet üres."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Az Alkalmazások alaphelyzetbe állítható"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"A Wi-Fi, a mobiladatok és a Bluetooth beállításainak visszaállítása"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Az összes hálózati beállítást visszaállítja, például a következőket:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobiladat"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Törlés"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Letöltött SIM-ek törlése"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Csere SIM letöltése érdekében forduljon szolgáltatójához. Ezzel nem szűnik meg egyetlen mobil-előfizetési csomag sem."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Ezzel nem szűnik meg egyetlen mobil-előfizetési csomag sem. Csere-SIM letöltése érdekében forduljon szolgáltatójához."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Beállítások visszaállítása"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Alaphelyzetbe állítja az összes hálózati beállítást? Ez a művelet nem vonható vissza."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Visszaállítja az összes hálózati beállítást, és törli a letöltött SIM-eket? Ez a művelet nem vonható vissza."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"A hálózati beállítások vissza lettek állítva."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nem lehet törölni a SIM-eket"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Hiba történt, ezért nem sikerült a letöltött SIM törlése.\n\nIndítsa újra az eszközt, majd próbálja újra."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Összes adat törlése (gyári beállítások visszaállítása)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Az összes adat törlése"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Ez minden adatot töröl a táblagép "<b>"belső tárhelyéről"</b>", többek között: \n\n"<li>"az Ön Google-fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és a beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Ez minden adatot töröl a telefon "<b>"belső tárhelyéről"</b>", többek között:\n\n"<li>"az Ön Google-fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és a beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Más felhasználók is vannak ezen az eszközön.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ek"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Ezzel nem szünteti meg mobil-előfizetését."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-tárat"</b>" is törölnie kell."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Összes adat törlése (gyári beállítások visszaállítása)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Összes adat törlése"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ez minden adatot töröl a táblagép "<b>"belső tárhelyéről"</b>", többek között: \n\n"<li>"az Ön Google-fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és a beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ez minden adatot töröl a telefon "<b>"belső tárhelyéről"</b>", többek között:\n\n"<li>"az Ön Google-fiókját"</li>\n<li>"a rendszer- és alkalmazásadatokat és a beállításokat"</li>\n<li>"a letöltött alkalmazásokat"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Jelenleg a következő fiókokba van bejelentkezve:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Más felhasználók is vannak ezen az eszközön.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Zene"</li>\n<li>"Fotók"</li>\n<li>"Más felhasználói adatok"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ek"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ezzel nem szünteti meg mobil-előfizetését."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"USB-háttértárat"</b>" is törölnie kell."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"A zenék, képek és más felhasználói adatok törléséhez az "<b>"SD-kártyát"</b>" is törölnie kell."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB-tár törlése"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD-kártya törlése"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Minden adat, például zenék és képek törlése a belső USB-tárról"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Minden adat, például zenék és képek törlése az SD-kártyáról"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Minden adat törlése"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Minden adat törlése"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Az összes személyes információt és letöltött alkalmazást törli. Ez a művelet nem vonható vissza."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Az összes személyes adata törlődik (beleértve a letöltött alkalmazásokat és SIM-eket is). Ez a művelet nem vonható vissza."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Minden törlése"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nem történt visszaállítás, mert a Rendszertisztítás szolgáltatás nem érhető el."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Törli az összes adatot?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"A gyári beállítások visszaállítása nem hajtható végre ennél a felhasználónál"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Törlés"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Kérjük, várjon…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Minden adat törlése"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Minden adat törlése"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Az összes személyes adatot és letöltött alkalmazást törli. Ez a művelet nem vonható vissza."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Az összes személyes adata törlődik (beleértve a letöltött alkalmazásokat és SIM-eket is). Ez a művelet nem vonható vissza."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Törli az összes adatot?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"A gyári beállítások visszaállítása nem hajtható végre ennél a felhasználónál"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Törlés"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Kis türelmet…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Hívásbeállítások"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Hangposta, hívásátirányítás, hívásvárakoztatás és hívóazonosító beállítása"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-megosztás"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Nem köthető több mint <xliff:g id="MAXCONNECTION">%1$d</xliff:g> eszközhöz."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> megosztása meg lesz szüntetve."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet megosztása"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"A telefon internetkapcsolatának megosztása USB Etherneten keresztül"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"A telefon internetkapcsolatának megosztása Etherneten keresztül"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Hotspotot és internetmegosztást használhat annak érdekében, hogy internetet biztosítson más eszközöknek mobiladat-kapcsolat segítségével. Az alkalmazások is létrehozhatnak hotspotokat, hogy tartalmakat osszanak meg a közeli eszközökkel."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"A hotspot és az internetmegosztás funkcióval más eszközöknek biztosíthat internet-hozzáférést saját Wi‑Fi- vagy mobiladat-kapcsolatán keresztül. Az alkalmazások szintén létrehozhatnak hotspotot, hogy tartalmat osszanak meg a közeli eszközökkel."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Súgó"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-alapú keresés"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Engedélyezi az alkalmazásoknak és szolgáltatásoknak, hogy közeli eszközöket keressenek még akkor is, ha ki van kapcsolva a Bluetooth. Ez például a helyalapú funkciók és szolgáltatások javítására használható."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Munkahelyi helyszolgáltatások"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Helyalapú időzóna-meghatározás"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Helyalapú időzóna-meghatározás"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Lehetővé teszi, hogy a rendszer felhasználja az eszköz helyadatait az aktuális időzóna észleléséhez. Az egyéb helybeállítások, például a Wi‑Fi-keresés, befolyásolhatják az időzóna-felismerés pontosságát."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Be"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Ki"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Az időzóna automatikus észlelése ki van kapcsolva"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"A helyalapú időzóna-meghatározás ki van kapcsolva"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"A helyalapú időzóna-meghatározás nem támogatott"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"A helyalapú időzóna-meghatározásra vonatkozó módosítások nem engedélyezettek"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Hely Wi-Fi és mobilhálózat alapján"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Engedélyezze az alkalmazásoknak, hogy a Google helymeghatározó szolgáltatásával gyorsabban megbecsüljék tartózkodási helyét. A névtelen helyadatok összegyűjtés után a Google-hoz kerülnek."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Helymeghatározás Wi-Fi-vel"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Az arcalapú feloldáshoz adjon meg jelszót"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Az arcalapú feloldáshoz adjon meg mintát"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Az arcalapú feloldáshoz adjon meg PIN-kódot"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biometria használatához állítson be jelszót"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biometria használatához állítson be mintát"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biometria használatához állítson be PIN-kódot"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Elfelejtette jelszavát?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Elfelejtette mintáját?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Elfelejtette PIN-kódját?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Feliratbeállítások"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Nagyítás"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Nagyítási terület"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Nagyítás engedélyezve"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Válassza ki, hogy mely nagyítási területeket szeretné használni a képernyő nagyításakor"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Teljes képernyő"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Képernyő bizonyos része"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Teljes képernyő és képernyő bizonyos része"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Teljes képernyő nagyítása"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Képernyő bizonyos részének nagyítása"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Átvált a kisegítő lehetőségek gombra?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ha három koppintással felnagyítja a képernyő valamelyik részét, a gépelés és más műveletek késleltetve működnek.\n\nSzeretné inkább a nagyításhoz a kisegítő lehetőségek gombot használni?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Váltás a kisegítő lehetőségek gombra"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Továbbra is a három koppintást használom a nagyításhoz"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nagyítási beállítások"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Nagyítás három koppintással"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Nagyítás gyorsparanccsal"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"A bekapcs. gomb megszakítja a hívást"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Nagy egérmutató"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animációk eltávolítása"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monó hang"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Csatornák egyesítése hang lejátszásakor"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Hangegyensúly"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Bal"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Jobb"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monó hang"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Csatornák kombinálása hang lejátszásakor"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Hangegyensúly"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Balra"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Jobbra"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Alapértelmezett"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 másodperc"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 másodperc"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Értesítések rezgése"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Csengés rezgése"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Visszajelzés az érintésekről"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> használata"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> megnyitása"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Színkorrekció használata"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Felirat megjelenítése"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Csak támogatott alkalmazásnál"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> használata"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> megnyitása"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Színkorrekció használata"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Felirat megjelenítése"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Csak támogatott alkalmazásnál"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Feliratméret és -stílus"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> betűméret"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"További lehetőségek"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomália"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomália"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomália"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Szürkeárnyalatos"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vörös-zöld"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vörös-zöld"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Kék-sárga"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Háttérben történő használat korlátozása"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Az alkalmazás háttérben futásának engedélyezése"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Az alkalmazás háttérben futása le van tiltva"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"A háttérben történő használat nem korlátozható"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"A háttérben történő használat nem korlátozható"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Korlátozza a háttértevékenységet?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ha korlátozza az alkalmazások háttértevékenységét, lehetséges, hogy hibásan fognak működni"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Az alkalmazás nem korlátozható, mert nincs beállítva az akkumulátor optimalizálására.\n\nA korlátozáshoz kapcsolja be az akkumulátoroptimalizálást."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"A táblagépet többet használja a megszokottnál"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Az eszközt többet használja a megszokottnál"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Az akkumulátor a szokásosnál hamarabb lemerülhet"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Akkumulátor-élettartam optimalizálása"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Az akkumulátor ideiglenesen korlátozva. A részletekért koppintson."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"A telefont többet használta a megszokottnál. A vártnál hamarabb lemerülhet az akkumulátor.\n\nAz akkumulátort leginkább igénybe vevő alkalmazások:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"A táblagépet többet használta a megszokottnál. A vártnál hamarabb lemerülhet az akkumulátor.\n\nAz akkumulátort leginkább igénybe vevő alkalmazások:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Az eszközt többet használta a megszokottnál. A vártnál hamarabb lemerülhet az akkumulátor.\n\nAz akkumulátort leginkább igénybe vevő alkalmazások:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d alkalmazás korlátozva</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small><font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Probléma merült fel az akkumulátor-töltésmérő olvasásakor"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Probléma merült fel az akkumulátor-töltésmérő olvasásakor. Koppintson, ha "<annotation id="url">"további információra"</annotation>" van szüksége."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Leállítja az alkalmazást?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"A telefon nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazás ébren tartja az eszközt.\n\nA probléma megoldásához leállíthatja az alkalmazást.\n\nHa a probléma továbbra is fennáll, akkor az akkumulátor teljesítményének javításához lehet, hogy el kell távolítania az alkalmazást."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"A táblagép nem képes az akkumulátor normál kezelésére, mivel a(z) <xliff:g id="APP">%1$s</xliff:g> alkalmazás ébren tartja az eszközt.\n\nA probléma megoldásához leállíthatja az alkalmazást.\n\nHa a probléma továbbra is fennáll, akkor az akkumulátor teljesítményének javításához lehet, hogy el kell távolítania az alkalmazást."</string>
@@ -2590,10 +2627,10 @@
     <string name="battery_saver_auto_percentage_summary" msgid="6190884450723824287">"<xliff:g id="PERCENT">%1$s</xliff:g>-os értéknél kapcsol be"</string>
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ütemezés beállítása"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Az akkumulátor élettartamának növelése"</string>
-    <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Kikapcsolás töltés közben"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Az Akkumulátorkímélő mód <xliff:g id="PERCENT">%1$s</xliff:g>-os töltöttségi szint elérésekor kikapcsol"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Az Akkumulátorkímélő mód <xliff:g id="PERCENT">%1$s</xliff:g>-os töltöttségi szint elérésekor kikapcsol"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Az Akkumulátorkímélő mód <xliff:g id="PERCENT">%1$s</xliff:g>-os töltöttségi szint elérésekor kikapcsol"</string>
+    <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Kikapcsolás feltöltés után"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Az Akkumulátorkímélő mód kikapcsol, ha a telefon akkumulátora <xliff:g id="PERCENT">%1$s</xliff:g>-os szintre emelkedik."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Az Akkumulátorkímélő mód kikapcsol, ha a táblagép akkumulátora <xliff:g id="PERCENT">%1$s</xliff:g>-os szintre emelkedik."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Az Akkumulátorkímélő mód kikapcsol, ha az eszköz akkumulátora <xliff:g id="PERCENT">%1$s</xliff:g>-os szintre emelkedik."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Bekapcsolás"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Visszaállítás"</string>
     <string name="tts_play" msgid="2945513377250757221">"Lejátszás"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptív kapcsolódás"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"A hálózati kapcsolatok automatikus kezelésével megnöveli az akkumulátor élettartamát és javítja az eszköz teljesítményét"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Hitelesítési adatok tárolója"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Tanúsítvány telepítése"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Tanúsítványok telepítése tárhelyről"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Felhasználó hitelesítési adatai"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"A tárolt hitelesítési adatok megtekintése és módosítása"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Speciális"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tárhelytípus"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardveresen támogatott"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Kizárólag szoftveres"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"A hitelesítési adatok nem érhetők el ennél a felhasználónál"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN-hez és alkalmazásokhoz telepítve"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi-hez telepítve"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ne telepítse"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Telepítés mindenképp"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"A tanúsítvány nincs telepítve"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Engedélyezi a tanúsítványok telepítését a(z) <xliff:g id="APP_NAME">%s</xliff:g> alkalmazásnak ezen az eszközön?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Ezek a tanúsítványok azonosítják Önt az alábbi alkalmazások és URL-ek számára"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Tiltás"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Engedélyezés"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Több megjelenítése"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Tanúsítványkezelő alkalmazás"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Nincs"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Az alkalmazás által telepített tanúsítványok az alábbi alkalmazások és URL-ek számára azonosítják Önt"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Eltávolítás"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Segélyhívó jelzés"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Viselkedés beállítása segélyhívás kezdeményezésekor"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Biztonsági mentés"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Még nincs létrehozva – Munkaprofil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Rendszergazda"</string>
     <string name="user_you" msgid="3070562015202859996">"Ön (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Becenév"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Legfeljebb <xliff:g id="USER_COUNT">%1$d</xliff:g> felhasználót adhat hozzá"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Csak a táblagép tulajdonosa kezelheti a felhasználókat."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Csak a telefon tulajdonosa kezelheti a felhasználókat."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Fizetés a terminálnál"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Állítson be egy alkalmazást a fizetéshez. Ezután elég csak telefonja hátulját odatartani az érintéses fizetést jelző szimbólummal ellátott terminálhoz."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Értem"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Egyebek…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Továbbiak…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Alapértelmezett fizetési alkalmazás beállítása"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Alapértelmezett fizetési alkalmazás frissítése"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Érintéses terminálon a következő alkalmazással fizethet: <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Vissza"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Tovább"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Befejezés"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Fotó készítése"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Kép kiválasztása"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Fotó kiválasztása"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kártyák"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kártyák"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Mindig ezt használja hívásokhoz"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"SIM kiválasztása az adathasználathoz"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SIM-kártya kiválasztása SMS-ekhez"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Váltás az adatforgalomhoz használt SIM kártyák között, ez legfeljebb egy percet vesz igénybe."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Az adatforgalomhoz használt SIM-kártya váltása folyamatban – ez legfeljebb egy percet vesz igénybe…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Hívás a következővel:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Válasszon egy SIM kártyát"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>. SIM-kártya"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutin, ütemezés, akkumulátorkímélő mód, energiamegtakarítás, akkumulátor, automatikus, százalék"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, továbbfejlesztett telefonhívás, 4G-hívás"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"nyelv hozzáadása, egy nyelv hozzáadása"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"betűméret"</string>
     <string name="default_sound" msgid="6604374495015245195">"Alapértelmezett hang"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Csörgetés és értesítések hangereje <xliff:g id="PERCENTAGE">%1$s</xliff:g>-on"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Hangerő, rezgés, Ne zavarjanak"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Indítási hangok"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Élő feliratozás"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatikus feliratozás"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nincs"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ütemezés beállítva</item>
-      <item quantity="one">1 ütemezés beállítva</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nincs}=1{1 ütemezés beállítva}other{# ütemezés beállítva}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne zavarjanak"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Értesítés fogadása csak fontos személyektől és alkalmazásoktól"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"A megszakítások korlátozása"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Csak prioritásos"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Be/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Ki/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Ki"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Be"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Mindig kérdezzen rá"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Kikapcsolásig"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> óra</item>
-      <item quantity="one">1 óra</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> perc"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> szabály automatikusan bekapcsolhat</item>
-      <item quantity="one">1 szabály automatikusan bekapcsolhat</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 óra}other{# óra}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 perc}other{# perc}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Ki}=1{Ki / 1 szabály automatikusan bekapcsolhat}other{Ki / # szabály automatikusan bekapcsolhat}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Mi szakíthatja meg a „Ne zavarjanak” módot?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Személyek"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Alkalmazások"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Az alacsonyabb prioritású értesítések automatikus beállítása diszkrétre"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Értesítések adaptív rangsorolása"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Értesítések automatikus rangsorolása relevancia szerint"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Visszajelzés adaptív értesítésekről"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Az értesítések módosításainak jelzése, valamint a rendszernek küldhető visszajelzési lehetőség megjelenítése"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Fontossági beállítások visszaállítása"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"A felhasználó által módosított fontossági beállítások visszaállítása és a priorizálás engedélyezése az értesítési segéd számára."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Javasolt műveletek és válaszok"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Javasolt műveletek és válaszok automatikus megjelenítése"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Legutóbbi és elhalasztott értesítések megjelenítése"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Elsődleges beszélgetések"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"A beszélgetések szakaszának tetején, lebegő buborékként jelennek meg"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"A beszélgetések szakaszának tetején jelennek meg"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Egyéb beszélgetések"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Kevésbé fontos beszélgetések"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Azok a beszélgetések, amelyeket módosított"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Legutóbbi beszélgetések"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Legutóbbiak törlése"</string>
+    <string name="clear" msgid="5092178335409471100">"Törlés"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Elsődleges beszélgetések buborékba helyezése"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Az elsődleges beszélgetések a lehúzható értesítési felület tetején vannak. Beállíthatja azt is, hogy buborékban jelenjenek meg, és hogy a Ne zavarjanak beállítás mellett is láthatók legyenek."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Az elsődleges és a módosított beszélgetések itt jelennek meg"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"„Ne zavarjanak” elérés"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"A Ne zavarjanak mód engedélyezése"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Egy telepített alkalmazás sem kért „Ne zavarjanak” elérést"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Alkalmazások betöltése…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Alkalmazások betöltése…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Kérésére az Android letiltotta a jelen alkalmazás értesítéseinek megjelenését ezen az eszközön"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Kérésére az Android letiltotta a jelen értesítési kategória megjelenését ezen az eszközön"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Kérésére az Android letiltotta az értesítések jelen csoportjának megjelenését ezen az eszközön"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Az összes beszélgetés"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Elsődleges beszélgetések"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nincs"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> beszélgetés</item>
-      <item quantity="one">1 beszélgetés</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nincs"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nincs}=1{1 beszélgetés}other{# beszélgetés}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Megszakítás engedélyezve"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Hívások"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Hívások"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Győződjön meg arról, hogy az eszköz csörgésre van állítva, hogy az engedélyezett hívások hangot adhassanak ki"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"A(z) „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” ütemezésnél a bejövő hívások le vannak tiltva. A beállítások módosításával lehetővé teheti, hogy ismerősei, családtagjai vagy a névjegyei között megtalálható más személyek elérhessék Önt."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Csillagozott névjegyek"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> további</item>
-      <item quantity="one">1 további</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nincs"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nincs}=1{{contact_1}}=2{{contact_1} és {contact_2}}=3{{contact_1}, {contact_2} és {contact_3}}other{{contact_1}, {contact_2} és további #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Nincs név)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Üzenetek"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"üzenet"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"SMS-ek"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"A(z) „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” ütemezésnél le vannak tiltva a beérkező üzenetek. A beállítások módosításával lehetővé teheti, hogy ismerősei, családtagjai vagy a névjegyei között megtalálható más személyek elérhessék Önt."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Minden üzenet eljuthat Önhöz"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Minden hívás eljuthat Önhöz"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nincs"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> névjegy</item>
-      <item quantity="one">1 névjegy</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nincs}=1{1 névjegy}other{# névjegy}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Bárki"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Névjegyek"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Csillagozott névjegyek"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Összes értesítés"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Egyes értesítések"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"A kiválasztott személyek továbbra is elérhetik Önt, akkor is, ha nem engedélyezi az alkalmazásoknak, hogy megzavarják"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">A következők megszakíthatják a „Ne zavarjanak” módot: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="one">A következő megszakíthatja a „Ne zavarjanak” módot: <xliff:g id="APP_NAME_0">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> további"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Egy alkalmazás sem szakíthatja meg a „Ne zavarjanak” módot}=1{A következő megszakíthatja a „Ne zavarjanak” módot: {app_1}}=2{A következők megszakíthatják a „Ne zavarjanak” módot: {app_1} és {app_2}}=3{A következők megszakíthatják a „Ne zavarjanak” módot: {app_1}, {app_2} és {app_3}}other{A következők megszakíthatják a „Ne zavarjanak” módot: {app_1}, {app_2} és # egyéb}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Alkalmazások"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Összes értesítés"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Egyes értesítések"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Azok az értesítések, amelyeknél engedélyezve van a megszakítás"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Összes értesítés engedélyezése"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">A következők megszakíthatják a „Ne zavarjanak” módot: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="one">A következő megszakíthatja a „Ne zavarjanak” módot: <xliff:g id="SOUND_CATEGORY">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Semmi sem szakíthatja meg a „Ne zavarjanak” módot"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> további"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Semmi sem szakíthatja meg a „Ne zavarjanak” módot}=1{A következő megszakíthatja a „Ne zavarjanak” módot: {sound_category_1}}=2{A következők megszakíthatják a „Ne zavarjanak” módot: {sound_category_1} és {sound_category_2}}=3{A következők megszakíthatják a „Ne zavarjanak” módot: {sound_category_1}, {sound_category_2} és {sound_category_3}}other{A következők megszakíthatják a „Ne zavarjanak” módot: {sound_category_1}, {sound_category_2} és # egyéb}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Semmi sem szakíthatja meg a „Ne zavarjanak” módot"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Senki sem szakíthatja meg a „Ne zavarjanak” módot"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Néhány személy megszakíthatja a „Ne zavarjanak” módot"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Minden személy megszakíthatja a „Ne zavarjanak” módot"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Be"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Ki"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Alkalmazáskitűzés"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Az alkalmazáskitűzés funkcióval az aktuális alkalmazás az előtérben marad egészen addig, amíg meg nem szünteti a kitűzést. Így például biztosíthatja, hogy ha valaki másnak adja át eszközét, az illető csak a kiválasztott alkalmazást használhatja. \n\nA kitűzött alkalmazás megnyithat más alkalmazásokat, és bizonyos személyes adatok hozzáférhetők lehetnek. \n\nAz alkalmazásokat a következőképpen tűzheti ki: 	\n1.	Kapcsolja be az alkalmazáskitűzés beállítást. 	\n2.	Nyissa meg az Áttekintés nézetet. 	\n3.	Koppintson a képernyő tetején található alkalmazásikonra, majd a Kitűzés elemre."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Az alkalmazáskitűzés funkcióval az aktuális alkalmazás az előtérben marad egészen addig, amíg meg nem szünteti a kitűzést. Így például biztosíthatja, hogy ha valaki másnak adja át eszközét, az illető csak a kiválasztott alkalmazást használhatja. \n\nA kitűzött alkalmazás megnyithat más alkalmazásokat, és bizonyos személyes adatok hozzáférhetők lehetnek. \n\nHa szeretné biztonságosan megosztani eszközét másokkal, próbáljon inkább vendégprofilt használni. \n\nAz alkalmazásokat a következőképpen tűzheti ki: 	\n1.	Kapcsolja be az alkalmazáskitűzés beállítást. 	\n2.	Nyissa meg az Áttekintés nézetet. 	\n3.	Koppintson a képernyő tetején található alkalmazásikonra, majd a Kitűzés elemre."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Az alkalmazáskitűzés funkcióval az aktuális alkalmazás az előtérben marad egészen addig, amíg meg nem szünteti a kitűzést. Így például biztosíthatja, hogy ha valaki másnak adja át eszközét, az illető csak a kiválasztott alkalmazást használhatja."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"A kitűzött alkalmazás megnyithat más alkalmazásokat, és bizonyos személyes adatok hozzáférhetők lehetnek. \n\nAz alkalmazásokat a következőképpen tűzheti ki: 	\n1.	Kapcsolja be az alkalmazáskitűzés beállítást. 	\n2.	Nyissa meg az Áttekintés nézetet. 	\n3.	Koppintson a képernyő tetején található alkalmazásikonra, majd a Kitűzés elemre."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"A kitűzött alkalmazás megnyithat más alkalmazásokat, és bizonyos személyes adatok hozzáférhetők lehetnek. \n\nHa szeretné biztonságosan megosztani eszközét másokkal, próbáljon inkább vendégprofilt használni. \n\nAz alkalmazásokat a következőképpen tűzheti ki: 	\n1.	Kapcsolja be az alkalmazáskitűzés beállítást. 	\n2.	Nyissa meg az Áttekintés nézetet. 	\n3.	Koppintson a képernyő tetején található alkalmazásikonra, majd a Kitűzés elemre."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Az alkalmazás kitűzését követően: \n\n•		Bizonyos személyes adatok hozzáférhetők lehetnek \n		(például a névjegyek és az e-mailek tartalma). \n•		A kitűzött alkalmazás más alkalmazásokat is megnyithat. \n\nCsak olyan személyekkel használja az alkalmazáskitűzést, akikben megbízik."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Feloldási minta kérése a rögzítés feloldásához"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"PIN-kód kérése a feloldáshoz"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz rendszerindítás előtt PIN-kódot kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja PIN-kód kérését az eszköz indítása előtt?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz rendszerindítás előtt mintát kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja minta kérését az eszköz indítása előtt?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz jelszó magadásához köti a rendszerindítást. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segíti az elvesztett vagy ellopott eszközökön lévő adatok védelmét. Beállítja jelszó kérését az eszköz indítása előtt?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Amellett, hogy biometriai lehetőséggel oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz PIN-kód megadásához köti a rendszerindítást. Amíg az eszköz el nem indul, nem tud hívást, üzenetet és értesítéseket fogadni (így riasztásokat sem).\n\nEz segíti az elvesztett vagy ellopott eszközökön lévő adatok védelmét. Beállítja a PIN-kód eszközindítás előtti kérését?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Amellett, hogy biometriai lehetőséggel oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz minta megadásához köti a rendszerindítást. Amíg az eszköz el nem indul, nem tud hívást, üzenetet és értesítéseket fogadni (így riasztásokat sem).\n\nEz segíti az elvesztett vagy ellopott eszközökön lévő adatok védelmét. Beállítja minta kérését az eszköz indítása előtt?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Amellett, hogy biometriai lehetőséggel oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz jelszó megadásához köti a rendszerindítást. Amíg az eszköz el nem indul, nem tud hívást, üzenetet és értesítéseket fogadni (így riasztásokat sem).\n\nEz segíti az elvesztett vagy ellopott eszközökön lévő adatok védelmét. Beállítja jelszó kérését az eszköz indítása előtt?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Igen"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nem"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Korlátozott"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Az USB-t vezérli:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Csatlakoztatott eszköz"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ez az eszköz"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Átváltás folyamatban..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Átváltás…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Sikertelen átváltás"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Az eszköz töltése"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Folyamatban van a csatlakoztatott eszköz töltése"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobiladat-forgalom"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Alkalmazás adathasználata"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Adathasználat – Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Nem szolgáltatói adathasználat"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Adathasználat Ethernet-kapcsolaton"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 korlátozás</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"A szolgáltató adatszámlálási módja eltérhet az eszközétől"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Nem tartalmazza a szolgáltatói hálózatokon használt adatforgalmat"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> felhasználva"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Forgalmi figyelmeztetés beáll."</string>
     <string name="data_warning" msgid="2925054658166062884">"Adatforgalmi figyelmeztetés"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Részletek"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Adatforgalom-csökkentő"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Korlátlan adat"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Háttéradatok kikapcsolva"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Háttéradatok kikapcsolva"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Be"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Ki"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Az Adatforgalom-csökkentő használata"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ha az eszköz zárolva van, ne lehessen választ vagy egyéb szöveget beírni az értesítéseknél"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Szokásos helyesírás-ellenőrző"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Helyesírás-ellenőrző"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Helyesírás-ellenőrző használata"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Helyesírás-ellenőrző használata"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nincs kiválasztva"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nincs)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"A tárhelykezelő tárhely felszabadítása érdekében eltávolítja az eszközről azokat a fotókat és videókat, amelyekről már készült biztonsági másolat."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fotók és videók eltávolítása"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Tárhelykezelő"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Tárhelykezelő használata"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Tárhelykezelő használata"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatikus"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Kézi"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Szabadítson fel tárhelyet most"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dupla koppintás a képernyő megtekintéséhez"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Koppintson duplán a táblagép képernyőjének megtekintéséhez"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Koppintson duplán az eszköz képernyőjének megtekintéséhez"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Értesítések csúsztatással"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Csúsztassa lefelé az ujját a képernyő alsó részén az értesítések megtekintéséhez"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Egykezes mód"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Egykezes mód használata"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Kilépés alkalmazások váltásakor"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Időkorlát"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 másodperc"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 másodperc"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 másodperc"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"elérhetőség"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Az idő, az értesítések és egyéb információk megtekintéséhez koppintson duplán a képernyőre."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Ellenőrzés felemeléssel"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Ellenőrzés a táblagép felemelésével"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Koppintson a táblagép megtekintéséhez"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Koppintson az eszköz megtekintéséhez"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Az idő, az értesítések és egyéb információk megtekintéséhez koppintson a képernyőre."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Vészhelyzet – SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Vészhelyzeti műveletek használata"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Kezelő: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"A bekapcsológombot egymás után ötször vagy többször gyorsan lenyomva az alábbi műveleteket kezdeményezheti."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Visszaszámláló figyelmeztetés lejátszása"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Hangos hangjelzés lejátszása segítségkérés előtt"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Hívjon segítséget"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Segítséghívásra szolgáló telefonszám"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. A módosításhoz koppintson rá."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Ha nem segélyhívó telefonszámot hív:\n • Segélyhíváshoz előbb fel kell oldania az eszköz zárolását\n • Előfordulhat, hogy hívását nem fogadják"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Értesítések ujjlenyomattal"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Ujjlenyomat csúsztatása"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Megtekintheti értesítéseit, ha ujját lefelé húzza a telefonja hátulján található ujjlenyomat-érzékelőn."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maximális látható adatkészletek"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Alapértelmezett értékek visszaállítása"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Az automatikus kitöltésre vonatkozó fejlesztői beállítások vissza lettek állítva"</string>
+    <string name="location_category" msgid="3496759112306219062">"Hely"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Helyadathasználat jelzése az állapotsoron"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Megjelenítés minden helyadathasználat esetén (pl. hálózat és kapcsolódás)"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Teljes GNSS-mérés indítása"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Az összes GNSS-műhold és -frekvencia nyomon követése aktívciklus-szabályozás nélkül"</string>
     <string name="device_theme" msgid="5027604586494772471">"Eszköztéma"</string>
     <string name="default_theme" msgid="4815428567082263639">"Alapértelmezett"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Hálózat neve"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Az összpontosításhoz szüneteltetheti az értesítéseket"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"A funkció nem áll rendelkezésre"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"A rendszer kikapcsolta ezt a funkciót, mert lelassítja a telefont"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Teljes GNSS-mérés indítása"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Az összes GNSS-műhold és -frekvencia nyomon követése aktívciklus-szabályozás nélkül"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Összeomlási párbeszédablak megjelenítése minden alkalommal"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Mindig megjeleníti a párbeszédablakot, amikor valamelyik alkalmazás összeomlik"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE-kompatibilis alkalmazás kiválasztása"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Engedélyezés minden alkalmazásnál"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafikus driver kiválasztása"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Alapértelmezett"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Játékdriver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Játékdriver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Fejlesztői driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Rendszer grafikus drivere"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Be (némítás)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Ki"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Hálózati információk"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Eszköze neve látható a telefonján lévő alkalmazások számára. Mások is láthatják, ha csatlakoztatja telefonját más Bluetooth-eszközökhöz, vagy ha Wi-Fi-hotspotot állít be."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Eszköze neve látható a telefonján lévő alkalmazások számára. Mások is láthatják, ha csatlakoztatja telefonját más Bluetooth-eszközökhöz, Wi-Fi-hálózathoz, vagy ha Wi-Fi-hotspotot állít be."</string>
     <string name="devices_title" msgid="649715719278562515">"Eszközök"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Minden beállítás"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Javaslatok"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nincs hálózat. Próbálja újra."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(tiltott)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nincs SIM-kártya"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nincs SIM-kártya"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nincs"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"A csatlakozáshoz SIM-kártya szükséges"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"A csatlakozáshoz <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM-kártya szükséges"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Előnyben részesített hálózati mód: preferált WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Előnyben részesített hálózati mód: csak GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Előnyben részesített hálózati mód: csak WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiladat"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Adathozzáférés a mobilhálózaton keresztül"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"A telefon automatikusan erre a szolgáltatóra vált, ha hatókörön belül van"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nem áll rendelkezésre SIM-kártya"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Hívásokra vonatkozó preferencia"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-preferencia"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Mindig kérdezzen rá"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nem hozzáférhető, amikor a következőhöz csatlakozik: <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Továbbiak"</string>
     <string name="see_less" msgid="2642392725363552793">"Kevesebb megjelenítése"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Bekapcsolja a következőt: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Bekapcsolja a SIM-et?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vált a(z) <xliff:g id="CARRIER_NAME">%1$s</xliff:g> szolgáltatóra?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Átvált SIM-kártya használatára?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Egyszerre csak egy SIM-kártya lehet aktív.\n\nA(z) <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> szolgáltatóra történő váltással nem mondja le a(z) <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> szolgáltatását."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Egyszerre csak egy letöltött SIM lehet aktív.\n\nA(z) <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> szolgáltatóra történő váltással nem mondja le a(z) <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> szolgáltatását."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Egyszerre csak egy SIM-kártya lehet aktív.\n\nA váltással nem mondja le a(z) <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> szolgáltatását."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Váltás erre: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Csatlakozás hálózathoz…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"A következőre történő váltás folyamatban van: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nem lehet szolgáltatót váltani"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Hiba történt, ezért nem lehet szolgáltatót váltani."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Kikapcsolja a következőt: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Kikapcsolja a SIM-et?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM kikapcsolása<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nem sikerült a szolgáltató letiltása"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Hiba történt, ezért nem sikerült a szolgáltató letiltása."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Kettő SIM-kártyát szeretne használni?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Ezen az eszközön egyszerre két SIM-kártya is aktív lehet. Ha továbbra is csak egy SIM-kártyát szeretne használni, koppintson a „Köszönöm, nem” gombra."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Újraindítja az eszközt?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Kezdő lépésként indítsa újra az eszközt. Ezt követően újabb SIM-kártyát adhat hozzá."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Tovább"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Újraindítás"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Köszönöm, nem"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Váltás"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nem sikerült a SIM aktiválása"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Távolítsa el a SIM-kártyát, majd helyezze be újra. Ha a probléma továbbra is fennáll, indítsa újra az eszközt."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Próbálkozzon meg újra a SIM bekapcsolásával. Ha a probléma továbbra is fennáll, indítsa újra az eszközt."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Hálózat aktiválása"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>: aktív"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Koppintson a SIM-beállítások frissítéséhez."</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-kártya"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Törli ezt a letöltött SIM-et?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"A SIM törlésével eltávolítja a(z) <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> szolgáltatását erről az eszközről.\n\nA(z) <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> szolgáltatását nem mondja le."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Törlés"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM törlése…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Nem lehet törölni a SIM-et"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Hiba történt, ezért nem sikerült a letöltött SIM törlése.\n\nIndítsa újra az eszközt, majd próbálja újra."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Csatlakozás adott eszközhöz"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"A(z) <xliff:g id="APPNAME">%1$s</xliff:g> alkalmazás ideiglenes Wi-Fi-hálózatot szeretne használni az eszközhöz való csatlakozáshoz."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nem találhatók eszközök. Ellenőrizze, hogy be vannak-e kapcsolva az eszközök, és lehetséges-e a hozzájuk való csatlakozás."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Segélyhívások"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"A szolgáltatója nem támogatja a Wi‑Fi-híváson keresztüli segélyhívásokat.\nAz eszköz automatikusan mobilhálózatra vált a segélyhívás indításához.\nSegélyhívások indítása csak mobilhálózati lefedettséggel rendelkező területen lehetséges."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Wi-Fi használata a hívásokhoz a minőség javítása érdekében"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"SIM-eken keresztüli hívás"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Más SIM-en keresztüli hívások és SMS-ek engedélyezése ezen a SIM-en keresztül."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"sim-eken keresztüli hívás"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Bejövő MMS-üzenet"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Nem lehet MMS-üzenetet küldeni"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Koppintson az MMS-üzenet-küldés engedélyezéséhez a(z) <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> hálózatán kikapcsolt mobiladatok esetén"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Beállítások feletti képernyőfedvény engedélyezése"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Engedélyezi a más alkalmazások felett megjeleníthető alkalmazások számára a Beállítások képernyők fedését"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Média"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Lejátszó elrejtése a munkamenet befejezésekor"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"A lejátszó lehetővé teszi a munkamenet folytatását a kibontott Gyorsbeállítások panelen."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Médialejátszó a Gyorsbeállításokban"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Médialejátszó hosszabb időtartamon keresztüli megjelenítése a lejátszás könnyebb folytatása érdekében"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Lejátszó elrejtése"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Lejátszó megjelenítése"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nincs rendelkezésre álló lejátszó"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Engedélyezett alkalmazások"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"média"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"A Bluetooth bekapcsol"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Be"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Ki"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kártyák"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Repülőgépen használható hálózatok"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Repülőgépen használható hálózatok keresése és csatlakozás hozzájuk"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"repülőgép, repülőgépen használható"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Hívások és SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-hívás"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Hívások indítása és fogadása nem szolgáltatói hálózaton (pl. Wi-Fi)"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"A Wi-Fi-hívás funkció segítségével hívásokat indíthat és fogadhat nem szolgáltatói hálózatokon, így például bizonyos Wi-Fi-hálózatokon."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Hívások"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"előnyben részesített"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"hívások előnyben részesítése"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS-ek előnyben részesítése"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"nem áll rendelkezésre"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-kártya nélkül"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Beállítások"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Csatlakozás nyilvános hálózatokhoz"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"hálózati kapcsolat, internet, vezeték nélküli, mobiladat, adat, wifi, wi-fi, mobil, mobiltelefon, szolgáltató, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Repülőn használható hálózatok mutatása"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Repülős üzemmód kikapcsolása"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nem áll rendelkezésre, mert be van kapcsolva az alvásidő mód"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Értesítés fontosságának visszaállítása befejezve."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Alkalmazások"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Egy nem megbízható eszköz hozzá szeretne férni az Ön üzeneteihez. Koppintson a részletekért."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Engedélyezi az üzenetekhez való hozzáférést?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Egy nem megbízható Bluetooth-eszköz ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) hozzá szeretne férni az Ön üzeneteihez.\n\nEddig még nem csatlakozott a következő eszközhöz: [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Egy nem megbízható eszköz hozzá szeretne férni az Ön névjegyeihez és hívásnaplójához. Koppintson a részletekért."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Engedélyezi a névjegyeihez és a hívásnaplójához való hozzáférést?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Egy nem megbízható Bluetooth-eszköz ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) hozzá szeretne férni az Ön névjegyeihez és hívásnaplójához. Ide tartoznak a bejövő és kimenő hívások adatai is.\n\nEddig még nem csatlakozott a következő eszközhöz: [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index 50238b9..76e669e 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Միջին"</item>
     <item msgid="6740026006576843477">"Երկար"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Կարճ"</item>
+    <item msgid="7397961711906421599">"Միջին"</item>
+    <item msgid="4079132024502041928">"Երկար"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Կանխադրված"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Համաշխարհային"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Միայն TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Գլոբալ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 2f631f1..de8669c 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Ամսաթիվ և ժամ"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Սահմանել ամսաթիվն ու ժամը"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Սահմանել ամսաթիվը, ժամը, ժամային գոտին, &amp; ձևաչափերը"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Օգտագործել ցանցի ժամանակը"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Օգտագործել ցանցի ժամային գոտին"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Ժամի ավտոմատ կարգավորում"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Ժամային գոտու ավտոմատ կարգավորում"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Օգտագործել կանխադրված տեղույթը"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-ժամյա ձևաչափ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Օգտագործել 24-ժամյա ձևաչափը"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Կողպէկրանին ցույց տալ պրոֆիլի տվյալները"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Հաշիվներ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Տեղադրություն"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Օգտագործել տեղորոշումը"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Օգտագործել տեղորոշումը"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Անջատված է"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Միացված է – Տեղադրության տվյալները հասանելի են <xliff:g id="COUNT_1">%1$d</xliff:g> հավելվածի</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Էկրանի կողպում, դեմքով ապակողպում"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Էկրանի կողպում, մատնահետք"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Էկրանի կողպում"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Անվտանգ ապակողպեք հեռախոսը դեմքի և մատնահետքի օգնությամբ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Դուք կարող եք նաև մտնել հավելվածներ և հաստատել վճարումները"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Ապակողպման եղանակը՝"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Դեմքով ապակողպում"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Հեշտացրեք հեռախոսի ապակողպումը"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Մատնահետք"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Ժամանակ խնայեք՝ ապակողպելով հեռախոսը գրպանում"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Բաց թողնել"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Առաջ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Դեմքն ավելացվեց"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Կարգավորեք դեմքով ապակողպումը"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Դեմքով ապակողպում"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Օգտագործեք դեմքը՝ նույնականացման համար"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Սկսել"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Եթե դեմքով ապակողպման պարզեցված եղանակն անջատված է, կարգավորման որոշ քայլեր կարող են ինչպես հարկն է չաշխատել TalkBack-ի հետ։"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Հետ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Շարունակել կարգավորումը"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Ցուցադրել հասանելիութ. կարգավոր."</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Միշտ հաստատում պահանջել հավելվածներում դեմքով ապակողպման ժամանակ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Ջնջել դեմքը"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Կարգավորեք դեմքով ապակողպումը"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"«Դեմքով ապակողպում» գործառույթի միջոցով դուք կարող եք ապակողպել սարքը, մտնել հավելվածներ և հաստատել վճարումները։\n\nՆկատի ունեցեք.\nհեռախոսին նայելու դեպքում դուք կարող եք ապակողպել էկրանը, նույնիսկ եթե մտադրված չեք դա անել:\n\nՁեր հեռախոսը կարող է ապակողպել այլ անձ, եթե էկրանը ձեր դեմքին է ուղղված:\n\nՀեռախոսը կարող է ապակողպել ձեզ շատ նման մեկ ուրիշը, օրինակ՝ ձեր երեխան, հարազատ եղբայրը կամ քույրը:"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"«Դեմքով ապակողպում» գործառույթի միջոցով դուք կարող եք ապակողպել սարքը, մտնել հավելվածներ և հաստատել վճարումները։\n\nՆկատի ունեցեք.\nհեռախոսին նայելու դեպքում դուք կարող եք ապակողպել էկրանը, նույնիսկ եթե մտադրված չեք դա անել:\n\nՁեր հեռախոսը կարող է ապակողպել այլ անձ, եթե էկրանը ձեր դեմքին է ուղղված, նույնիսկ երբ ձեր աչքերը փակ են:\n\nՀեռախոսը կարող է ապակողպել ձեզ շատ նման մեկ ուրիշը, օրինակ՝ ձեր երեխան, հարազատ եղբայրը կամ քույրը:"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Օգտագործեք դեմքով ապակողպումը՝ սարքը բացելու, հավելվածներ մուտք գործելու և վճարումները հաստատելու համար։"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Նկատի առեք․\nՀեռախոսին նայելու դեպքում դուք կարող եք ապակողպել էկրանը, նույնիսկ եթե մտադրված չեք դա անել:\n\nՀեռախոսը կարող է ապակողպել այլ անձ, եթե էկրանը ձեր դեմքին է ոuղղված:\n\nՀեռախոսը նաև կարող է ապակողպել ձեզ շատ նման մեկ ուրիշը, օրինակ՝ ձեր հարազատ եղբայրը կամ քույրը:"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Նկատի առեք․\nՀեռախոսին նայելու դեպքում դուք կարող եք ապակողպել էկրանը, նույնիսկ եթե մտադրված չեք դա անել:\n\nՀեռախոսը կարող է ապակողպել այլ անձ, եթե էկրանը ձեր դեմքին է ոuղղված, նույնիսկ երբ ձեր աչքերը փակ են:\n\nՀեռախոսը նաև կարող է ապակողպել ձեզ շատ նման մեկ ուրիշը, օրինակ՝ ձեր հարազատ եղբայրը կամ քույրը:"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Ջնջե՞լ դեմքի տվյալները"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Ապակողպման համար օգտագործվող դեմքի տվյալներն ընդմիշտ կջնջվեն: Դրանից հետո հեռախոսը ապակողպելու, հավելվածներ մուտք գործելու և վճարումներ հաստատելու համար անհրաժեշտ կլինի մուտքագրել PIN կոդը, նախշը կամ գաղտնաբառը։"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Օգտագործեք դեմքի ճանաչումը՝ հեռախոսն ապակողպելու համար"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Օգտագործեք ձեր մատնահետքը՝ հեռախոսն ապակողպելու կամ գնումներ թույլատրելու համար:\n\nՆշում. այս սարքն ապակողպելու համար չեք կարող օգտագործել ձեր մատնահետքը: Լրացուցիչ տեղեկություններ ստանալու համար դիմեք ձեր կազմակերպության ադմինիստրատորին:"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Օգտագործեք ձեր մատնահետքը՝ հեռախոսն ապակողպելու կամ գնումներ թույլատրելու համար:\n\nՆշում. ապակողպման հուսալի նախշը կամ PIN կոդը կարող է մատնահետքից ավելի ապահով լինել:"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Չեղարկել"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ոչ, շնորհակալություն"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Շարունակել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Բաց թողնել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Հաջորդը"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Պաշտպանեք ձեր պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքով ապակողպումը կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»:"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Պաշտպանեք ձեր սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքով ապակողպումը կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»:"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Պաշտպանեք ձեր հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան: Էկրանի կողպումն անհրաժեշտ է նաև դեմքով ապակողպումը կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»:"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Պաշտպանեք պլանշետը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան։ Էկրանի կողպումն անհրաժեշտ է նաև կենսաչափական տվյալները կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»։"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Պաշտպանեք սարքը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան։ Էկրանի կողպումն անհրաժեշտ է նաև կենսաչափական տվյալները կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»։"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Պաշտպանեք հեռախոսը էկրանի կողպման միջոցով, որպեսզի ձեր տվյալները հասանելի չդառնան կողմնակի անձանց, եթե այն կորցնեք կամ գողանան։ Էկրանի կողպումն անհրաժեշտ է նաև կենսաչափական տվյալները կարգավորելու համար։ Վերադառնալու համար հպեք «Չեղարկել»։"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Բաց թողնե՞լ PIN-ի կարգավորումը"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Բաց թողնե՞լ գաղտնաբառի կարգավորումը"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Բաց թողնե՞լ նախշի կարգավորումը"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Կանխեք այս պլանշետի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Կանխեք այս սարքի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Կանխեք այս հեռախոսի չթույլատրված օգտագործումն այլ անձանց կողմից՝ ակտիվացնելով սարքի պաշտպանության գործառույթները: Ընտրեք էկրանի կողպման ցանկալի եղանակը:"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Ընտրեք էկրանի կողպման պահուստային եղանակը"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Ընտրեք էկրանի կողպման ռեզերվային եղանակը"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Ընտրեք էկրանի կողպման լրացուցիչ եղանակը"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Էկրանի կողպման տարբերակներ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Էկրանի կողպման տարբերակներ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Էկրանի կողպում"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Դեմքով ապակողպում + Գաղտնաբառ"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Շարունակել առանց դեմքով ապակողպման"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Դուք կարող եք ապակողպել հեռախոսը դեմքի ճանաչման միջոցով: Անվտանգության նկատառումներով այս ընտրանքը պահանջում է կարգավորել էկրանի կողպման լրացուցիչ տարբերակ:"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Կենսաչափական տվյալներ + նախշ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Կենսաչափական տվյալներ + PIN կոդ"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Կենսաչափական տվյալներ + գաղտնաբառ"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Շարունակել առանց կենսաչափական տվյալների"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Կարող եք ապակողպել հեռախոսը կեսաչափական տվյալների օգնությամբ։ Անվտանգության նկատառումներից ելնելով՝ այս ընտրանքը պահանջում է էկրանի կողպման լրացուցիչ տարբերակ։"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Անջատված է ադմինիստրատորի, գաղտնագրման քաղաքականության կամ հավատարմագրային պահոցի կողմից"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ոչ մեկը"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Սահեցնել"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">Պետք է <xliff:g id="NUMBER_1">%d</xliff:g>-ից քիչ թվանշան պարունակի</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Սարքի ադմինիստրատորը չի թույլատրում օգտագործել վերջին PIN կոդերը"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ՏՏ ադմինիստրատորն արգելափակել է պարզ PIN կոդերը: Փորձեք մեկ այլ PIN:"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Այն չի կարող պարունակել անվավեր գրանշան"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Պետք է պարունակի առնվազն մեկ տառ"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Պետք է պարունակի առնվազն մեկ թվանշան"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">Պետք է պարունակի առնվազն <xliff:g id="COUNT">%d</xliff:g> ոչ թվային նիշ</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Սարքի ադմինիստրատորը թույլ չի տալիս օգտագործել վերջին գաղտնաբառը"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ՏՏ ադմինիստրատորն արգելափակել է պարզ գաղտնաբառերը: Փորձեք մեկ այլ գաղտնաբառ:"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Թվանշանների աճող, նվազող կամ կրկնվող հաջորդականությունն արգելված է"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Հաստատել"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Չեղարկել"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Միացնել Wi-Fi-ը"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Օգտագործել Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Օգտագործել Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi կարգավորումներ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Կարգավորել և կառավարել անլար միացման կետերը"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"«<xliff:g id="SSID">%1$s</xliff:g>» ցանցին միանալու համար տեսախցիկը պահեք QR կոդի վրա"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wi‑Fi ցանցին միանալու համար սկանավորեք QR կոդը"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Կիսվել Wi‑Fi-ով"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"«<xliff:g id="SSID">%1$s</xliff:g>» ցանցին միանալու և գաղտնաբառով կիսվելու համար սկանավորեք այս QR կոդը"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"«<xliff:g id="SSID">%1$s</xliff:g>» ցանցին միանալու համար սկանավորեք այս QR կոդը մեկ այլ սարքով"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"«<xliff:g id="SSID">%1$s</xliff:g>» ցանցին միանալու համար սկանավորեք այս QR կոդը"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Նորից փորձեք: Եթե խնդիրը չվերանա, դիմեք սարքի արտադրողին"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Սխալ առաջացավ"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-ի գաղտնաբառ՝ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Թեժ կետի գաղտնաբառը՝ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Ավտոմատ միացում"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Թույլատրել հեռախոսին ավտոմատ միանալ այս ցանցի տարածքում"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Թույլատրել պլանշետին ավտոմատ միանալ այս ցանցի տարածքում"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Թույլատրեք միանալ այս ցանցին, երբ այն հասանելի լինի"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Ավելացնել սարք"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Այս ցանցին սարք ավելացնելու համար օգտագործեք QR կոդ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR կոդը վավեր ձևաչափ չէ"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Օգտագործել համակարգի հավաստագրերը"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Չտրամադրել"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Չվավերացնել"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Վկայականը նշված չէ: Միացումը գաղտնի չի լինի:"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Ցանցի անունը չափազանց երկար է։"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Անհրաժեշտ է նշել տիրույթը:"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Պահանջվում է հավաստագիր։"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Միանալ"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi-ը միացած է"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Միացած է <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ցանցին"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Միացում <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ցանցին"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Միացում…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Ցանցին միանալ չհաջողվեց"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Ցանցն անհասանելի է"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Սարքի MAC հասցե"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Պատահական ընտրված MAC հասցե"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Պատահական հերթականությամբ դասավորված MAC հասցե (վերջին օգտագործված)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP հասցե"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Ցանցի տվյալներ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Ենթացանցի դիմակ"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 հասցեներ"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Պահված ցանցեր"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Բաժանորդագրումներ"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Այլ ցանցեր"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP կարգավորումներ"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Wi-Fi-ի լրացուցիչ կարգավորումներն անհասանելի են այս օգտատիրոջը"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Պահել"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Մուտքագրեք վավեր անցախցի հասցե"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Մուքագրեք վավեր DNS հասցե:"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Մուտքագրեք ցանցի նախածանցի երկարությունը` 0-ից 32-ի սահմանում:"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (եթե չի վրագրվել մասնավոր DNS-ի կողմից)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (եթե չի վրագրվել մասնավոր DNS-ի կողմից)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Անցախուց"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Ցանցի նախածանցի երկարություն"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Հավելվածը բովանդակություն է տարածում: Ինտերնետ կապ տրամադրելու համար անջատեք, ապա կրկին միացրեք թեժ կետը:"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Գաղտնաբառ նշված չէ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Թեժ կետի անունը"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ը միանում է…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> թեժ կետը միանում է…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Այլ սարքերը կարող են միանալ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ին"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Թեժ կետի գաղտնաբառը"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Հաճախականությունների միջակայք"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Սահուն պատկեր"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Որոշակի բովանդակության համար թարմացման հաճախականությունը 60-ից կդառնա 90 Հց։ Երկարացնում է մարտկոցի օգտագործման ժամանակը։"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Սահուն պատկեր"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Պարտադիր միացնել 90 Հց թարմացման հաճախականությունը"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Էկրանի թարմացման բարձր հաճախականությունը լավացնում է հպման արձագանքը և շարժանկարների որակը։ Այն նաև երկարացնում է մարտկոցի օգտագործման ժամանակը։"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ադապտիվ քնի ռեժիմ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Միացված է – Եթե նայում եք էկրանին, այն չի անջատվի։"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Նոր ծանուցումներ ստանալու դեպքում էկրանը կմիանա"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Միշտ ցույց տալ ժամը/տվյալները"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Մարտկոցի ավելի արագ սպառում"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Թավ տառատեսակով տեքստ"</string>
     <string name="title_font_size" msgid="570613010306330622">"Տառաչափ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Տառաչափի մեծացում կամ փոքրացում"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM քարտի կողպման կարգավորումներ"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-ի տարբերակը"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-ի անվտանգության համակարգի թարմացում"</string>
     <string name="model_info" msgid="8997566254717810904">"Մոդելը"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Մոդել՝ %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Մոդել և սարքակազմ"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Սարքակազմի տարբերակը"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Սարքավորման ID-ն"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Ջնջել APN-ը"</string>
     <string name="menu_new" msgid="6571230342655509006">"Նոր APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Պահել"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Հրաժարվել"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Չեղարկել"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Անվանման դաշտը պետք է լրացված լինի:"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN-ը չի կարող դատարկ լինել:"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Հավելվածների կարգավորումները կարելի է զրոյացնել"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Զրոյացնել Wi-Fi-ի, բջջային թրաֆիկի և Bluetooth-ի կարգավորումները"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Արդյունքում կզրոյացվեն բոլոր ցանցային կարգավորումները, ներառյալ հետևյալը՝\n\n"<li>"Wi‑Fi"</li>\n<li>"Բջջային ինտերնետ"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Ջնջել"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Ջնջել ներբեռնված SIM-երը"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Նոր SIM քարտ ներբեռնելու համար դիմեք ձեր օպերատորին։ Բջջային կապի սակագնային պլանները չեն չեղարկվի:"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Բջջային կապի սակագնային պլանները չեն չեղարկվի։ Նոր SIM քարտ ներբեռնելու համար դիմեք ձեր օպերատորին։"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Զրոյացնել կարգավորումները"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Զրոյացնե՞լ ցանցի բոլոր կարգավորումները: Այս գործողությունը հնարավոր չի լինի հետարկել:"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Զրոյացնե՞լ ցանցի բոլոր կարգավորումները և ջնջել ներբեռնված SIM քարտերի տվյալները։ Այս գործողությունը չեք կարող հետարկել:"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Ցանցի կարգավորումները վերակայվել են"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Չհաջողվեց ջնջել SIM քարտերը"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Սխալի պատճառով չհաջողվեց ջնջել ներբեռնված SIM-երը։\n\nՎերագործարկեք սարքը և նորից փորձեք։"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Ջնջել բոլոր տվյալները (գործարանային կարգավորումների վերականգնում)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Ջնջել բոլոր տվյալները (գործարանային կարգավորումների վերականգնում)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Կջնջվեն բոլոր տվյալները ձեր պլանշետի "<b>"ներքին հիշողությունից"</b>", այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Կջնջվեն բոլոր տվյալները ձեր հեռախոսի "<b>"ներքին հիշողությունից"</b>", այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Հաշիվներն այս սարքում՝\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Այս սարքում այլ օգտատերերի հաշիվներ կան:\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Երաժշտություն"</li>\n<li>"Լուսանկարներ"</li>\n<li>"Օգտվողի այլ տվյալներ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM քարտեր"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Բջջային ծառայությունների ձեր փաթեթը չի չեղարկվի:"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Երաժշտությունը, նկարները և այլ տվյալները ջնջելու համար "<b>"USB կրիչը "</b>"պետք է ջնջվի:"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Երաժշտությունը, նկարները և այլ տվյալները "<b>"SD քարտից"</b>" մաքրելու համար՝ այն պետք է ջնջել:"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Ջնջել բոլոր տվյալները (գործ. վերակայում)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Ջնջել բոլոր տվյալները (գործ. վերակայում)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ձեր պլանշետի "<b>"ներքին հիշողությունից"</b>" կջնջվեն բոլոր տվյալները, այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ձեր հեռախոսի "<b>"ներքին հիշողությունից"</b>" կջնջվեն բոլոր տվյալները, այդ թվում՝\n\n"<li>"Ձեր Google հաշիվը"</li>\n<li>"Համակարգի և հավելվածների տվյալներն ու կարգավորումները"</li>\n<li>"Ներբեռնված հավելվածները"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Հաշիվներն այս սարքում՝\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Այս սարքում այլ օգտատերերի հաշիվներ կան։\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Երաժշտությունը"</li>\n<li>"Լուսանկարները"</li>\n<li>"Օգտատիրոջ մյուս տվյալները"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM քարտեր"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ձեր սակագնային պլանը չի չեղարկվի։"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Երաժշտությունը, նկարները և մյուս տվյալները հեռացնելու համար անհրաժեշտ է մաքրել "<b>"USB կրիչը "</b>"։"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Երաժշտությունը, նկարները և մյուս տվյալները հեռացնելու համար անհրաժեշտ է մաքրել "<b>"SD քարտը"</b>"։"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Ջնջել USB կրիչը"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Ջնջել SD քարտը"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ջնջել ներքին USB կրիչի բոլոր տվյալները, ինչպիսիք են երաժշտությունը կամ լուսանկարները"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Ջնջել SD քարտի բոլոր տվյալները, ինչպիսիք են երաժշտությունը կամ լուսանկարները"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Ջնջել բոլոր տվյալները"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Ջնջել բոլոր տվյալները"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Ձեր բոլոր անձնական տվյալները և ներբեռնված հավելվածները կջնջվեն։ Այս գործողությունը չեք կարող հետարկել:"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Ձեր բոլոր անձնական տվյալները, այդ թվում՝ ներբեռնված հավելվածները և SIM քարտերը կջնջվեն։ Այս գործողությունը չեք կարող հետարկել:"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Ջնջել ամենը"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Վերականգնում տեղի չի ունեցել, քանի որ համակարգի մաքրիչ ծառայությունը հասանելի չէ:"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Ջնջե՞լ բոլոր տվյալները"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Այս օգտատերը չի կարող վերակայել սարքը և վերականգնել գործարանային կարգավորումները"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Ջնջում"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Խնդրում ենք սպասել..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Ջնջել բոլոր տվյալները"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Ջնջել բոլոր տվյալները"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Ձեր բոլոր անձնական տվյալները և ներբեռնված հավելվածները կջնջվեն։ Այս գործողությունը չեք կարող հետարկել։"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Ձեր բոլոր անձնական տվյալները, այդ թվում՝ ներբեռնված հավելվածները և SIM քարտերը կջնջվեն։ Այս գործողությունը չեք կարող հետարկել։"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Ջնջե՞լ բոլոր տվյալները"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Այս օգտատերը չի կարող վերակայել սարքը և վերականգնել գործարանային կարգավորումները"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Ջնջում"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Սպասեք…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Զանգի կարգավորումները"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Կարգավորեք ձայնային փոստը, զանգի վերահասցեավորումը, զանգի սպասումը, զանգողի ID-ն"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB մոդեմ"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Հնարավոր չէ միանալ ավելի քան <xliff:g id="MAXCONNECTION">%1$d</xliff:g> սարքերի հետ:"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ը կանջատվի:"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet մոդեմ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Տարածել հեռախոսի ինտերնետ կապը USB Ethernet-ով"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Տարածել հեռախոսի ինտերնետ կապը Ethernet-ով"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Օգտագործեք թեժ կետն ու մոդեմի ռեժիմը՝ բջջային ցանցի միջոցով մյուս սարքերին ինտերնետային կապ տրամադրելու համար: Հավելվածները նաև կարող են ստեղծել թեժ կետ՝ մոտակա սարքերին նյութեր փոխանցելու համար:"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Օգտագործեք թեժ կետն ու մոդեմի ռեժիմը՝ ձեր Wi-Fi-ի կամ բջջային ցանցի միջոցով մյուս սարքերին ինտերնետ կապ տրամադրելու համար։ Հավելվածները նույնպես կարող են թեժ կետ ստեղծել՝ մոտակա սարքերի հետ բովանդակությամբ կիսվելու համար։"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Օգնություն"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth սարքերի որոնում"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Թույլ տալ հավելվածներին և ծառայություններին որոնել մոտակայքում գտնվող սարքեր նույնիսկ երբ Bluetooth-ն անջատած է: Դա կարող է բարելավել տեղորոշում օգտագործող գործառույթների և ծառայությունների աշխատանքը:"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Տեղորոշման ծառայություններ աշխատանքի համար"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Ժամային գոտու որոշում տեղադրության միջոցով"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Ժամային գոտու որոշում տեղադրության միջոցով"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Թույլ է տալիս օգտագործել սարքի տեղադրությունը՝ ընթացիկ ժամային գոտին որոշելու համար։ Տեղադրության մյուս կարգավորումները (օրինակ՝ Wi‑Fi ցանցերի որոնումը) կարող են ազդել ճշգրտության վրա։"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Միացված է"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Անջատված է"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Ժամային գոտու ավտոմատ որոշումն անջատված է"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Տեղադրության միջոցով ժամային գոտու որոշումն անջատված է"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Տեղադրության միջոցով ժամային գոտու որոշումը չի աջակցվում"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Դուք չեք կարող փոփոխել տեղադրության միջոցով ժամային գոտու որոշման կարգավորումները"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi &amp; շարժական ցանցի տեղադրություն"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Թույլատրել ծրագրերին օգտագործել Google-ի տեղակայման ծառայությունները` ձեր տեղադրությունը ավելի արագ որոշելու համար: Անանուն տեղակայման տվյալները կհավաքագրվեն և կուղարկվեն Google-ին:"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Տեղադրությունը որոշված է Wi‑Fi-ի օգնությամբ"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Դեմքով ապակողպման համար նշեք գաղտնաբառ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Դեմքով ապակողման համար նշեք նախշ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Դեմքով ապակողպման համար նշեք PIN կոդ"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Ապակողպման լրացուցիչ եղանակ կարգավորեք"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Ապակողպման լրացուցիչ եղանակ կարգավորեք"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Ապակողպման լրացուցիչ եղանակ կարգավորեք"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Մոռացել եմ գաղտնաբառը"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Մոռացել եմ նախշը"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Մոռացել եմ PIN-ը"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Ենթագրերի կարգավորումներ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Խոշորացում"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Խոշորացման հատվածը"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Խոշորացումը միացված է"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Ընտրեք, թե էկրանի որ հատված(ներ)ն է պետք խոշորացնել"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Լիաէկրան"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Էկրանի հատվածը"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Լիաէկրան ռեժիմ և մասնակի էկրանի ռեժիմ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Խոշորացնել ամբողջ էկրանը"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Խոշորացնել էկրանի որոշակի հատվածը"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Օգտագործե՞լ «Հատուկ գործառույթներ» կոճակը"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Երբ դուք օգտագործում եք եռակի հպումը՝ էկրանի որոշակի հատված խոշորացնելու համար, տեքստի մուտքագրումը և այլ գործողություններ կարող են դանդաղել։\n\nՕգտագործե՞լ «Հատուկ գործառույթներ» կոճակը խոշորացման համար։"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Օգտագործել «Հատուկ գործառույթներ» կոճակը"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Խոշորացնել էկրանը եռակի հպման միջոցով"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Խոշորացման կարգավորումներ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Խոշորացում եռակի հպման միջոցով"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Խոշորացում դյուրանցման միջոցով"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Սնուցման կոճակը ավարտում է զանգը"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Մկնիկի խոշոր նշորդ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Անջատել շարժունացումը"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Մոնո"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Աուդիո նվագարկելիս միավորել ալիքները"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Աուդիո բալանս"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Ձախ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Աջ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Մոնո"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Աուդիո նվագարկելիս միավորել ալիքները"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Աուդիո բալանս"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Ձախ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Աջ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Կանխադրված"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 վայրկյան"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 վայրկյան"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Թրթռոց ծանուցման ժամանակ"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Թրթռազանգ"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Հպման արձագանք"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Օգտագործել <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> հավելվածը"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Բացել <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> հավելվածը"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Օգտագործել գունաշտկումը"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Ցուցադրել ենթագրերը"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Միայն աջակցվող հավելվածի համար"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Օգտագործել <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-ը"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Բացել <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> հավելվածը"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Օգտագործել գունաշտկումը"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Ցուցադրել ենթագրերը"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Միայն աջակցվող հավելվածի համար"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Ենթագրերի չափը և ոճը"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Տեքստի չափը – <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Այլ ընտրանքներ"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Դեյտերանոմալիա"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Պրոտանոմալիա"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Տրիտանոմալիա"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Մոխրագույնի երանգներ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Կարմիր-կանաչ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Կարմիր-կանաչ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Կապույտ-դեղին"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ֆոնային ռեժիմում աշխատանքի սահմանափակում"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Թույլ տալ հավելվածին աշխատել ֆոնային ռեժիմում"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Հավելվածին չի թույլատրվում աշխատել ֆոնում"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Ֆոնային ռեժիմում աշխատանքը հնարավոր չէ սահմանափակել"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Ֆոնային ռեժիմում աշխատանքը հնարավոր չէ սահմանափակել"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Սահմանափակե՞լ ֆոնային գործողությունները"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Հավելվածի ֆոնային գործողությունների սահմանափակումը կարող է ազդել վերջինիս աշխատանքի վրա"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Մարտկոցի օպտիմալացումն այս հավելվածի համար կարգավորված չէ։\n\nՄիացրեք այն՝ հավելվածը սահմանափակելու համար։"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Պլանշետը սովորականից շատ է էներգիա օգտագործել"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Սարքը սովորականից շատ է էներգիա օգտագործել"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Մարտկոցի լիցքը կարող է սովորականից շուտ սպառվել"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Օպտիմալացում՝ մարտկոցի ծառայության ժամկետը երկարացնելու համար"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Մարտկոցը ժամանակավորապես սահմանափակված է։ Հպեք՝ ավելին իմանալու համար։"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Ձեր հեռախոսը սովորականից շատ է էներգիա օգտագործել։ Մարտկոցի լիցքը կարող է սպասվածից շուտ սպառվել։\n\nԱմենից շատ էներգիա սպառող հավելվածներն են՝"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Ձեր պլանշետը սովորականից շատ է էներգիա օգտագործել։ Մարտկոցի լիցքը կարող է սպասվածից շուտ սպառվել։\n\nԱմենից շատ էներգիա սպառող հավելվածներն են՝"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Ձեր սարքը սովորականից շատ է էներգիա օգտագործել։ Մարտկոցի լիցքը կարող է սպասվածից շուտ սպառվել։\n\nԱմենից շատ էներգիա սպառող հավելվածներն են՝"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">Սահմանափակված է %1$d հավելված</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Մարտկոցի ցուցիչի ցուցմունքը կարդալու հետ կապված խնդիր կա"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Մարտկոցի ցուցիչի ցուցմունքը կարդալու հետ կապված խնդիր կա։ Հպեք՝ "<annotation id="url">"ավելին իմանալու համար"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Փակե՞լ հավելվածը"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Ձեր հեռախոսը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը սարքին թույլ չի տալիս անցնել քնի ռեժիմ:։\n\nԱյս խնդիրը շտկելու համար կարող եք դադարեցնել\n\nհավելվածի աշխատանքը: Եթե խնդիրը չվերանա, ապա հնարավոր է պահանջվի ապատեղադրել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Ձեր պլանշետը չի կարող ինչպես հարկն է կառավարել մարտկոցի լիցքը, քանի որ <xliff:g id="APP">%1$s</xliff:g> հավելվածը պլանշետին թույլ չի տալիս անցնել քնի ռեժիմ:\n\nԱյս խնդիրը շտկելու համար կարող եք դադարեցնել\n\nհավելվածի աշխատանքը: Եթե խնդիրը չվերանա, ապա հնարավոր է պահանջվի ապատեղադրել հավելվածը՝ մարտկոցի աշխատանքը բարելավելու համար:"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ստեղծել ժամանակացույց"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Երկարացնել մարտկոցի աշխատաժամանակը"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Անջատել, երբ լիցքավորվի"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ հեռախոսի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g> է"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ պլանշետի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g> է"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ ձեր սարքի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g> է"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ հեռախոսի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g>-ից անցնում է։"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ պլանշետի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g>-ից անցնում է։"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Մարտկոցի տնտեսման ռեժիմն անջատվում է, երբ սարքի լիցքը <xliff:g id="PERCENT">%1$s</xliff:g>-ից անցնում է։"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Միացնել"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Վերակայել"</string>
     <string name="tts_play" msgid="2945513377250757221">"Նվագարկել"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Հարմարվող կապ"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Ձեր ցանցային կապերն ավտոմատ կառավարելու միջոցով երկարացնում է մարտկոցի աշխատանքի տևողությունը և բարելավում սարքի արդյունավետությունը"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Մուտքի տվյալների պահոց"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Հավաստագրի տեղադրում"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Տեղադրել հավաստագրերը պահոցից"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Օգտատիրոջ մուտքի տվյալներ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Դիտել և փոփոխել պահված մուտքի տվյալները"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Ընդլայնված"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Պահոցի տեսակը"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Սարքակազմ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Միայն ծրագրային"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Հավատարմագրերը հասանելի չեն այս օգտատիրոջ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Տեղադրվել է VPN-ի և հավելվածների համար"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Տեղադրվել է Wi-Fi-ի համար"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Չտեղադրել"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Տեղադրել"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Հավաստագիրը չի տեղադրվել"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Թույլատրե՞լ <xliff:g id="APP_NAME">%s</xliff:g> հավելվածին հավաստագրեր տեղադրել այս սարքում"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Այս հավաստագրերը կնույնականացնեն ձեզ ստորև բերված հավելվածների և URL հասցեների համար"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Չթույլատրել"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Թույլատրել"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Ցույց տալ ավելին"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Հավաստագրերի կառավարման հավելված"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Չկա"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Այս հավելվածի կողմից տեղադրված հավաստագրերը կնույնականացնեն ձեզ ստորև բերված հավելվածների և URL հասցեների համար"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Հեռացնել"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Արտակարգ կանչի համարհավաքման ազդանշան"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Կարգավորել աշխատանքի ռեժիմը շտապ կանչի դեպքում"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Պահուստավորում"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Կարգավորված չէ - Աշխատանքային պրոֆիլ"</string>
     <string name="user_admin" msgid="4024553191395768119">"Ադմինիստրատոր"</string>
     <string name="user_you" msgid="3070562015202859996">"Դուք (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Կեղծանուն"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Մինչև <xliff:g id="USER_COUNT">%1$d</xliff:g> օգտատիրոջ ավելացում"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Միայն պլանշետի սեփականատերը կարող է կառավարել օգտատերերին:"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Միայն հեռախոսի օգտատերը կարող է կառավարել օգտատերերին:"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Վճարում տերմինալով"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Կարգավորեք վճարային հավելվածը, ապա հեռախոսի հետևի մասով հպեք անհպում վճարման նշան ունեցող որևէ տերմինալի։"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Պարզ է"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Ավելին..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Ավելին…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Ընտրեք վճարման կանխադրված հավելված"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Թարմացնել վճարման կանխադրված հավելվածը"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Անհպում վճարման դեպքում կօգտագործվի <xliff:g id="APP">%1$s</xliff:g> հավելվածը"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Հետ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Հաջորդը"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Ավարտել"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Լուսանկարել"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Ընտրել պատկեր"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Ընտրեք լուսանկարը"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM քարտեր"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM քարտեր"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Միշտ օգտագործել այս քարտը՝ զանգերի համար"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Ընտրեք SIM քարտը տվյալների համար"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Ընտրեք SIM քարտ SMS-ների համար"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Տվյալների SIM քարտը փոխարկվում է: Դա կարող է մինչև մեկ րոպե տևել..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Անցում է կատարվում բջջային ինտերնետի SIM քարտին։ Դա կարող է մինչև մեկ րոպե տևել…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Զանգել հետևյալով"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Ընտրեք SIM քարտը"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"գործողությունների հերթականություն, ժամանակացույց, մարտկոցի տնտեսում, էներգախնայում, մարտկոց, ավտոմատ, տոկոս"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ընդլայնված հնարավորություններով զանգեր, 4g զանգեր"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ավելացնել լեզու, նոր լեզու"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"տեքստի չափը"</string>
     <string name="default_sound" msgid="6604374495015245195">"Կանխադրված զանգերանգը"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Զանգի ու ծանուցումների ազդանշանների ուժգնությունը <xliff:g id="PERCENTAGE">%1$s</xliff:g> է"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Ձայնի ուժգնություն, թրթռոց, Չանհանգստացնել ռեժիմ"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Միացման ձայներ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Կենդանի ենթագրեր"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Ավտոմատ ավելացնել ենթագրեր"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Չկան"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Սահմանված է <xliff:g id="ON_COUNT">%d</xliff:g> ժամանակացույց</item>
-      <item quantity="other">Սահմանված է <xliff:g id="ON_COUNT">%d</xliff:g> ժամանակացույց</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ոչ մի ժամանակացույց}=1{Սահմանված է 1 ժամանակացույց}one{Սահմանված է # ժամանակացույց}other{Սահմանված է # ժամանակացույց}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Չանհանգստացնել"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ծանուցում ստանալ միայն կարևոր մարդկանցից և հավելվածներից"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ընդհատումների սահմանափակում"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Միայն կարևորները"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>։ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Միացված է/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Անջատված է/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Անջատված է"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Միացված է"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ամեն անգամ հարցնել"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Մինչև չանջատեք"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ժամ</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ժամ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> րոպե"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ժամանակացույց կարող է ավտոմատ միանալ</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ժամանակացույց կարող է ավտոմատ միանալ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ժամ}one{# ժամ}other{# ժամ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 րոպե}one{# րոպե}other{# րոպե}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Անջատված է}=1{Անջատված է / 1 ժամանակացույց կարող է ավտոմատ միանալ}one{Անջատված է / # ժամանակացույց կարող է ավտոմատ միանալ}other{Անջատված է / # ժամանակացույց կարող է ավտոմատ միանալ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ինչը կարող է ընդհատել «Չանհանգստացնել» ռեժիմը"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Մարդիկ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Հավելվածներ"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"«Անձայն» ռեժիմի ավտոմատ սահմանում ցածր առաջնահերթությամբ ծանուցումների համար"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Առաջնահերթության ավտոմատ որոշում"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Ավտոմատ տեսակավորել ծանուցումներն ըստ կարևորության"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Հարմարվող ծանուցումների մասին կարծիքի հայտնում"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Նշել ծանուցումների հետ կապված ճշգրտումները և ցույց տալ, թե ինչպես կարծիք ուղարկել համակարգին"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Վերակայել ծանուցումների կարևորության կարգավորումները"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Վերակայել օգտատիրոջ կողմից փոփոխված կարևորության կարգավորումները և թույլատրել հավելվածին որոշել ծանուցումների առաջնահերթությունը"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Առաջարկվող գործողություններ և պատասխաններ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Ավտոմատ ցուցադրել առաջարկվող գործողություններն ու պատասխանները"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Տեսնել վերջին և հետաձգված ծանուցումները"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Կարևոր զրույցները"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Ցուցադրվում են զրույցների բաժնի վերևում՝ լողացող ամպիկի տեսքով"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Ցուցադրվում են «Զրույցներ» բաժնի վերևում"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Այլ զրույցներ"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Ոչ առաջնահերթ զրույցները"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Զրույցներ, որոնցում փոփոխություններ եք կատարել"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Վերջին զրույցները"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Ջնջել վերջինները"</string>
+    <string name="clear" msgid="5092178335409471100">"Մաքրել"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Ցույց տալ կարևոր խոսակցություններն ամպիկներում"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Կարևոր զրույցները ցուցադրվում են իջնող վահանակի վերևում։ Դուք կարող եք կարգավորել այնպես, որ դրանք ցուցադրվեն ամպիկի տեսքով և դադարեցնեն «Չանհանգստացնել» ռեժիմը։"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Առաջնահերթ և փոփոխված խոսակցությունները կցուցադրվեն այստեղ"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"«Չանհանգստացնել» գործառույթի հասանելիություն"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Թույլատրել «Չանհանգստացնել» ռեժիմը"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Տեղադրված հավելվածներից ոչ մեկը Չանհանգստացնել հարցում չի ուղարկել"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Ծրագրերը բեռնվում են..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Հավելվածների բեռնում…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Դուք անջատել եք այս հավելվածի ծանուցումները"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Դուք անջատել եք ծանուցումների այս կատեգորիան"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Դուք անջատել եք ծանուցումների այս խումբը"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Բոլոր զրույցները"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Կարևոր զրույցները"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ոչ մեկը"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> խոսակցություն</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> խոսակցություն</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ոչ մեկը"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ոչ մի զրույց}=1{1 զրույց}one{# զրույց}other{# զրույց}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ով կարող է ընդհատել"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Զանգեր"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Զանգեր"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Որպեսզի համոզվեք, որ թույլատրված զանգերը կազդանշվեն, ստուգեք՝ արդյոք սարքում միացված է զանգի ձայնը։"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"«<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» կանոնի համար մուտքային զանգերն արգելափակված են: Փոխեք կարգավորումները, որպեսզի ձեր մտերիմները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Աստղանշված կոնտակտներ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">ևս <xliff:g id="NUM_PEOPLE">%d</xliff:g> կոնտակտ</item>
-      <item quantity="other">ևս <xliff:g id="NUM_PEOPLE">%d</xliff:g> կոնտակտ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Չկան"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ոչ մի կոնտակտ}=1{{contact_1}}=2{{contact_1} և {contact_2}}=3{{contact_1}, {contact_2} և {contact_3}}one{{contact_1} և {contact_2} օգտատերերն ու ևս # հոգի}other{{contact_1} և {contact_2} օգտատերերն ու ևս # հոգի}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Անանուն)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Հաղորդագրություններ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"հաղորդագրություններ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Հաղորդագրություններ"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Երբ գործում է «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>» կանոնը, մուտքային հաղորդագրություններն արգելափակվում են: Դուք կարող եք փոխել կարգավորումները, որպեսզի ձեր մտերիմները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Կստանաք բոլոր հաղորդագրությունները"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Կստանաք բոլոր զանգերը"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Չկան"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> կոնտակտ</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> կոնտակտ</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ոչ մի կոնտակտ}=1{1 կոնտակտ}one{# կոնտակտ}other{# կոնտակտ}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Բոլորը"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Կոնտակտներ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Աստղանշված կոնտակտներ"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Բոլոր ծանուցումները"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Որոշ ծանուցումներ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Ընտրված մարդիկ կարող են կապվել ձեզ հետ, նույնիսկ եթե չեք թույլատրում հավելվածներին ընդհատել"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">«<xliff:g id="APP_NAMES">%s</xliff:g>» հավելվածը</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ևս <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ոչ մի հավելված չի կարող ընդհատել}=1{{app_1} հավելվածը կարող է ընդհատել}=2{{app_1} և {app_2} հավելվածները կարող են ընդհատել}=3{{app_1}, {app_2} և {app_3} հավելվածները կարող են ընդհատել}one{{app_1} և {app_2} հավելվածներն ու ևս # հավելված կարող են ընդհատել}other{{app_1} և {app_2} հավելվածներն ու ևս # հավելված կարող են ընդհատել}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Հավելվածներ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Բոլոր ծանուցումները"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Որոշ ծանուցումներ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Ծանուցումներ, որոնք կարող են ընդհատել"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Թույլատրել բոլոր ծանուցումները"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ոչինչ չի կարող ընդհատել"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ևս <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ոչինչ չի կարող ընդհատել}=1{«{sound_category_1}» կատեգորիայի ձայները կարող են ընդհատել}=2{«{sound_category_1}» և «{sound_category_2}» կատեգորիաների ձայները կարող են ընդհատել}=3{«{sound_category_1}», «{sound_category_2}» և «{sound_category_3}» կատեգորիաների ձայները կարող են ընդհատել}one{«{sound_category_1}» և «{sound_category_2}» կատեգորիաների ու ևս # կատեգորիայի ձայները կարող են ընդհատել}other{«{sound_category_1}» և «{sound_category_2}» կատեգորիաների ու ևս # կատեգորիայի ձայները կարող են ընդհատել}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ոչինչ չի կարող ընդհատել"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ոչ ոք չի կարող ընդհատել"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Որոշ մարդիկ"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Բոլոր մարդիկ"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Միացված է"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Անջատված է"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Հավելվածների ամրացում"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Հավելվածների ամրացման օգնությամբ դուք կարող եք տեսադաշտում պահել ընթացիկ հավելվածն այնքան ժամանակ, մինչև չապամրացնեք այն։ Այս գործառույթը կարող է օգտագործվել, օրինակ, երբ ուզում եք թույլ տալ ձեր վստահելի ընկերոջը որոշակի խաղ խաղալ։ \n\nԵրբ որևէ հավելված ամրացված է, այն կարող է բացել այլ հավելվածներ։ Դրան կարող են նաև հասանելի լինել ձեր անձնական տվյալները։ \n\nՀավելվածների ամրացման գործառույթն օգտագործելու համար՝ 	\n1.	Միացրեք հավելվածների ամրացումը 	\n2.	Բացեք Համատեսքը 	\n3.	Էկրանի վերևում հպեք հավելվածի պատկերակին, այնուհետև հպեք «Ամրացնել»"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Հավելվածների ամրացման օգնությամբ դուք կարող եք տեսադաշտում պահել ընթացիկ հավելվածն այնքան ժամանակ, մինչև չապամրացնեք այն։ Այս գործառույթը կարող է օգտագործվել, օրինակ, երբ ուզում եք թույլ տալ ձեր վստահելի ընկերոջը որոշակի խաղ խաղալ։ \n\nԵրբ որևէ հավելված ամրացված է, այն կարող է այլ հավելվածներ բացել։ Դրան կարող են նաև հասանելի լինել ձեր անձնական տվյալները։ \n\nԵթե ձեր սարքից պետք է այլ մարդիկ օգտվեն, և դուք ուզում եք ձեզ ապահով զգալ, կարող եք հյուր ստեղծել։ \n\nՀավելվածների ամրացման գործառույթն օգտագործելու համար՝ 	\n1.	Միացրեք հավելվածների ամրացումը 	\n2.	Բացեք Համատեսքը 	\n3.	Էկրանի վերևում հպեք հավելվածի պատկերակին, այնուհետև հպեք «Ամրացնել»"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Հավելվածների ամրացման օգնությամբ դուք կարող եք տեսադաշտում պահել ընթացիկ հավելվածն այնքան ժամանակ, մինչև չապամրացնեք այն։ Այս գործառույթը կարող է օգտագործվել, օրինակ, երբ ուզում եք թույլ տալ ձեր վստահելի ընկերոջը որոշակի խաղ խաղալ։"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Երբ որևէ հավելված ամրացված է, այն կարող է այլ հավելվածներ բացել։ Դրան կարող են նաև հասանելի լինել ձեր անձնական տվյալները։ \n\nՀավելվածների ամրացման գործառույթն օգտագործելու համար՝ 	\n1.	Միացրեք հավելվածների ամրացումը 	\n2.	Բացեք Համատեսքը 	\n3.	Էկրանի վերևում հպեք հավելվածի պատկերակին, այնուհետև հպեք «Ամրացնել»"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Երբ որևէ հավելված ամրացված է, այն կարող է այլ հավելվածներ բացել։ Դրան կարող են նաև հասանելի լինել ձեր անձնական տվյալները։ \n\nԵթե ձեր սարքից պետք է այլ մարդիկ օգտվեն, և դուք ուզում եք ձեզ ապահով զգալ, կարող եք հյուր ստեղծել։ \n\nՀավելվածների ամրացման գործառույթն օգտագործելու համար՝ 	\n1.	Միացրեք հավելվածների ամրացումը 	\n2.	Բացեք Համատեսքը 	\n3.	Էկրանի վերևում հպեք հավելվածի պատկերակին, այնուհետև հպեք «Ամրացնել»"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Երբ հավելվածն ամրացված է՝ \n\n•	 Դրան կարող են հասանելի լինել ձեր անձնական տվյալները \n		(օր․՝ կոնտակտները և նամակների բովանդակությունը) \n•	 Այն կարող է բացել այլ հավելվածներ \n\nԱմրացված հավելվածներից թույլ տվեք օգտվել միայն մարդկանց, ում վստահում եք։"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Հարցնել ապակողպող նախշը"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Հարցնել PIN կոդը"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Դուք նաև կարող եք ընտրել, որ ապակողպվելու համար սարքը PIN կոդ պահանջի՝ որպես լրացուցիչ պաշտպանության միջոց։ Այդ դեպքում, քանի դեռ սարքը կողպված է, այն չի կարող ստանալ զանգեր, հաղորդագրություններ և ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում: Պահանջե՞լ PIN կոդ։"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Դուք նաև կարող եք ընտրել, որ ապակողպվելու համար սարքը ապակողպման նախշ պահանջի՝ որպես լրացուցիչ պաշտպանության միջոց։ Այդ դեպքում, քանի դեռ սարքը կողպված է, այն չի կարող ստանալ զանգեր, հաղորդագրություններ և ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում: Պահանջե՞լ նախշ։"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Դուք նաև կարող եք ընտրել, որ ապակողպվելու համար սարքը գաղտնաբառ պահանջի՝ որպես լրացուցիչ պաշտպանության միջոց։ Այդ դեպքում, քանի դեռ սարքը կողպված է, այն չի կարող ստանալ զանգեր, հաղորդագրություններ և ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում: Պահանջե՞լ գաղտնաբառ։"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Դուք նաև կարող եք PIN կոդ սահմանել սարքը գործարկելու համար։ Դա կօգնի ավելի հուսալիորեն պաշտպանել ձեր տվյալները, եթե, օրինակ, կորցնեք հեռախոսը։ Քանի դեռ սարքը կողպված է, զանգերը, հաղորդագրությունները և ծանուցումները հասանելի չեն լինի։ Զարթուցիչի ազդանշանները նույնպես չեն աշխատի։\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում։ Սահմանե՞լ PIN կոդ։"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Դուք նաև կարող եք նախշ սահմանել սարքը գործարկելու համար։ Դա կօգնի ավելի հուսալիորեն պաշտպանել ձեր տվյալները, եթե, օրինակ, կորցնեք հեռախոսը։ Քանի դեռ սարքը կողպված է, զանգերը, հաղորդագրությունները և ծանուցումները հասանելի չեն լինի։ Զարթուցիչի ազդանշանները նույնպես չեն աշխատի։\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում։ Սահմանե՞լ նախշ։"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Դուք նաև կարող եք գաղտնաբառ սահմանել սարքը գործարկելու համար։ Դա կօգնի ավելի հուսալիորեն պաշտպանել ձեր տվյալները, եթե, օրինակ, կորցնեք հեռախոսը։ Քանի դեռ սարքը կողպված է, զանգերը, հաղորդագրությունները և ծանուցումները հասանելի չեն լինի։ Զարթուցիչի ազդանշանները նույնպես չեն աշխատի։\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում։ Սահմանե՞լ գաղտնաբառ։"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Այո"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ոչ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Սահմանափակված է"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-ն վերահսկող սարքը"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Միացված սարք"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Այս սարքը"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Փոխարկում…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Սպասեք…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Չհաջողվեց փոխարկել"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Այս սարքի լիցքավորում"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Միացված սարքի լիցքավորում"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Բջջային թրաֆիկ"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Թրաֆիկի օգտագործումը հավելվածի կողմից"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi թրաֆիկ"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Այլ ցանցերի տվյալների օգտագործում"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet տվյալների օգտագործում"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> սահմանափակում</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Օպերատորի վիճակագրությունը կարող է տարբերվել սարքի տվյալներից։"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Չեն հետագծվում այն ցանցերի տվյալները, որոնք սպասարկվում են օպերատորների կողմից"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Օգտագործվել է <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Նախազգուշացում դնել"</string>
     <string name="data_warning" msgid="2925054658166062884">"Նախազգուշացում"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Տեսնել մանրամասները"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Թրաֆիկի տնտեսում"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Տվյալների անսահմանափակ օգտագործում"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Ֆոնային տվյալներն անջատված են"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Տվյալների փոխանակման ֆոնային ռեժիմն անջատված է"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Միացված է"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Անջատված է"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Միացնել թրաֆիկի տնտեսումը"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Արգելել ծանուցումներում պատասխանների կամ այլ տեքստերի մուտքագրումը, երբ սարքը կողպված է"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Կանխադրված ուղղագրիչ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Ընտրեք ուղղագրիչը"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Օգտագործել ուղղագրիչը"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Օգտագործել ուղղագրիչը"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ընտրված չէ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ոչ մեկը)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"՝ "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Տարածք ազատելու նպատակով հիշողության կառավարիչը ձեր սարքից հեռացնում է պահուստավորած լուսանկարները և տեսանյութերը:"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Հեռացնել լուսանկարները և տեսանյութերը"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Հիշողության կառավարիչ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Օգտագործել հիշողության կառավարիչը"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Օգտագործել հիշողության կառավարիչը"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Ավտոմատ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ձեռքով"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Ազատել տարածք հիմա"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Կրկնակի հպել՝ հեռախոսը ստուգելու համար"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Կրկնակի հպեք՝ պլանշետը ստուգելու համար"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Կրկնակի հպեք՝ սարքը ստուգելու համար"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Ինչպես ծանուցումներ դիտել"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Ծանուցումները դիտելու համար մատը սահեցրեք ներքև էկրանի ստորին մասում"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Մեկ ձեռքի ռեժիմ"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Օգտագործել մեկ ձեռքի ռեժիմը"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Դուրս գալ՝ մյուս հավելված անցնելու ժամանակ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Սպասման ժամանակ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 վայրկյան"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 վայրկյան"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 վայրկյան"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"մատչելիություն"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ժամը, ծանուցումները և այլ տեղեկություններ տեսնելու համար կրկնակի հպել էկրանին:"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Բարձրացնել՝ հեռախոսը ստուգելու համար"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Բարձրացրեք՝ պլանշետը ստուգելու համար"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Հպեք՝ պլանշետը ստուգելու համար"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Հպեք՝ սարքը ստուգելու համար"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ժամը, ծանուցումները և այլ տեղեկություններ տեսնելու համար կրկնակի հպեք էկրանին:"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Արտակարգ իրավիճակի SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Օգտագործել «Շտապ կանչ» գործառույթը"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Ադմինիստրատոր՝ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Գործարկեք ստորև ցուցադրված գործողությունները՝ սնուցման կոճակը 5 անգամ արագ սեղմելով"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Նվագարկել ձայնային ազդանշան՝ հետհաշվարկով"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Նվագարկել ձայնային բարձր ազդանշան՝ նախքան օգնության դիմելը"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Դիմեք օգնության"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Օգնության հեռախոսահամար"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>։ Հպեք՝ փոխելու համար։"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Եթե մուտքագրեք ոչ արտակարգ իրավիճակների հեռախոսահամար՝\n • Ձեր սարքը պետք է ապակողպված լինի, որպեսզի կարողանաք օգտագործել SOS կանչը\n • Ձեր զանգին հնարավոր է՝ ոչ ոք չպատասխանի"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Ծանուցումները դիտելու համար օգտագործել մատնահետքերի սկաները"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Մատնահետքերի սկաներ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Ծանուցումները տեսնելու համար՝ մատը սահեցրեք ներքև հեռախոսի հետևի մասում գտնվող մատնահետքերի սկաների վրա"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Տեսանելի տվյալակազմերի առավելագույն քանակը"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Վերականգնել կանխադրված արժեքները"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Ինքնալրացման կարգավորումները զրոյացվեցին"</string>
+    <string name="location_category" msgid="3496759112306219062">"Տեղադրություն"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Տեղադրության ցուցիչ կարգավիճակի գոտում"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Ցուցադրել բոլոր վայրերի համար (ներառյալ ցանցի ու կապակցման միջոցով որոշվողները)"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS-ի չափումների ամբողջական բեռնում"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Հետագծել GNSS-ի բոլոր սխեմաներն ու հաճախականությունները՝ առանց աշխատաշրջանի"</string>
     <string name="device_theme" msgid="5027604586494772471">"Սարքի թեման"</string>
     <string name="default_theme" msgid="4815428567082263639">"Կանխադրված"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Ցանցի անունը"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Չցուցադրել շեղող ծանուցումները"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Գործառույթն անհասանելի է"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Այս գործառույթն անջատվել է, քանի որ այն դանդաղեցնում էր ձեր հեռախոսի աշխատանքը"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS-ի չափումների ամբողջական բեռնում"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Հետագծել GNSS-ի բոլոր սխեմաներն ու հաճախականությունները՝ առանց աշխատաշրջանի"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Միշտ ցույց տալ խափանման մասին ծանուցումը"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Ցույց տալ ծանուցումը հավելվածի խափանման դեպքում"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Ընտրեք ANGLE-ի աջակցմամբ հավելված"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Միացնել բոլոր հավելվածների համար"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Ընտրեք գրաֆիկական սարքավարը"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Կանխադրված"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Խաղային սարքավար"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Խաղային սարքավար"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Մշակողների համար նախատեսված սարքավար"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Համակարգի գրաֆիկական սարքավար"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Միացնել (անջատել ձայնը)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Անջատված է"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Ցանցի տվյալներ"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Ձեր սարքի անունը տեսանելի է հեռախոսի հավելվածներին։ Այն կարող են տեսնել օգտատերերը, երբ միանում եք Bluetooth սարքերի կամ կարգավորում եք Wi-Fi թեժ կետը։"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Ձեր սարքի անունը տեսանելի է հեռախոսում տեղադրված հավելվածներին։ Այն կարող են տեսնել օգտատերերը, երբ միանում եք Bluetooth սարքերի, Wi-Fi ցանցի, կամ կարգավորում եք Wi-Fi թեժ կետ։"</string>
     <string name="devices_title" msgid="649715719278562515">"Սարքեր"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Բոլոր կարգավորումները"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Հուշումներ"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Չհաջողվեց ցանցեր գտնել: Նորից փորձեք:"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(արգելված)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM քարտ չկա"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM քարտ"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM քարտ չկա"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Չկա"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Միանալու համար անհրաժեշտ է SIM քարտ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Միանալու համար անհրաժեշտ է <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-ի SIM քարտ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Ցանցի նախընտրելի ռեժիմը՝ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Ցանցի նախընտրելի ռեժիմը՝ միայն GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Ցանցի նախընտրելի ռեժիմը՝ միայն WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Բջջային ինտերնետ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Օգտվել բջջային ինտերնետից"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Հեռախոսն ավտոմատ կանցնի այս օպերատորին, երբ այն հասանելի լինի"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM քարտը հասանելի չէ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Զանգերի կարգավորում"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-ների կարգավորում"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ամեն անգամ հարցնել"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Հասանելի չէ <xliff:g id="CARRIER">%1$s</xliff:g>-ին միանալու դեպքում"</string>
     <string name="see_more" msgid="7499355691042812723">"Տեսնել ավելին"</string>
     <string name="see_less" msgid="2642392725363552793">"Տեսնել ավելի քիչ"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Միացնե՞լ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ը"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Միացնե՞լ SIM քարտը"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Անցնե՞լ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ին"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Անցնե՞լ SIM քարտի օգտագործմանը"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Միաժամանակ ակտիվ կարող է լինել միայն մեկ SIM քարտ։\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ին անցնելու դեպքում <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-ի սակագնային պլանը չի չեղարկվի։"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Միաժամանակ ակտիվ կարող է լինել միայն մեկ ներբեռնված SIM քարտ։\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ին անցնելու դեպքում <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-ի սակագնային պլանը չի չեղարկվի։"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Միաժամանակ ակտիվ կարող է լինել միայն մեկ SIM քարտ։\n\nՕպերատորին փոխելու դեպքում <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ի սակագնային պլանը չի չեղարկվի։"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Անցնել <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ին"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Սարքը միանում է ցանցին…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Անցում <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ին…"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Չհաջողվեց փոխել օպերատորին"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Չհաջողվեց փոխել օպերատորին։"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Անջատե՞լ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> օպերատորին"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Անջատե՞լ SIM քարտը"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM քարտն անջատվում է<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Չհաջողվեց անջատել օպերատորին"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Սխալի պատճառով հնարավոր չէ անջատել ձեր օպերատորին։"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Օգտագործե՞լ 2 SIM քարտ"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Այս սարքում հնարավոր է օգտագործել միաժամանակ 2 SIM քարտ։ Միայն մեկ SIM քարտ օգտագործելու համար հպեք «Ոչ, շնորհակալություն» կոճակին։"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Վերագործարկե՞լ սարքը"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Սկսելու համար վերագործարկեք սարքը։ Այնուհետև կարող եք ավելացնել այլ SIM քարտ։"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Շարունակել"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Վերագործարկել"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ոչ, շնորհակալություն"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Փոխել օպերատորին"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Չհաջողվեց ակտիվացնել SIM քարտը"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Հանեք, այնուհետև նորից տեղադրեք SIM քարտը։ Եթե խնդիրը չվերանա, վերագործարկեք սարքը։"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Փորձեք նորից միացնել SIM քարտը։ Եթե խնդիրը չվերանա, վերագործարկեք սարքը։"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ցանցի ակտիվացում"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ցանցն ակտիվ է"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Հպեք՝ SIM քարտի կարգավորումները թարմացնելու համար"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM քարտ"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Ջնջե՞լ այս ներբեռնված SIM քարտը"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Այս SIM-ը ջնջելու դեպքում <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-ի ծառայությունը կհեռացվի սարքից։\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>-ի ծառայությունը չի չեղարկվի։"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Ջնջել"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM քարտի տվյալները ջնջվում են…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM քարտի տվյալները հնարավոր չէ ջնջել"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Սխալի պատճառով չհաջողվեց ջնջել SIM քարտի տվյալները։\n\nՎերագործարկեք սարքը և նորից փորձեք։"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Միացում սարքին"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> հավելվածը ցանկանում է օգտագործել ժամանակավոր Wi‑Fi ցանց՝ ձեր սարքին միանալու համար։"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Սարքեր չեն գտնվել։ Համոզվեք, որ սարքերը միացված են և հասանելի են կապակցման համար։"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Շտապ կանչեր"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Ձեր օպերատորի ցանցում հնարավոր չէ շտապ կանչեր անել «Զանգեր Wi-Fi-ով» գործառույթի միջոցով:\nՇտապ կանչ կատարելու համար սարքն ավտոմատ կանցնի բջջային ցանցին:\nՇտապ կանչեր կարող եք անել միայն այն տարածքներում, որտեղ կա բջջային ցանցի ծածկույթ:"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Միացեք Wi‑Fi ցանցի՝ զանգերի որակը լավացնելու համար"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"SIM քարտերով խաչաձև զանգեր"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Թույլատրել նաև զանգել և SMS գրել այլ SIM քարտերով։"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"sim քարտերով խաչաձև զանգեր"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Մուտքային MMS հաղորդագրություն"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Չհաջողվեց ուղարկել MMS հաղորդագրությունը"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Հպեք՝ MMS հաղորդագրությունները <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>-ի ցանցում թույլատրելու համար, երբ բջջային ինտերնետն անջատած է"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Թույլատրել Կարգավորումների էկրանների վրադրումները"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Թույլատրել հավելվածներին, որոնք կարող են ցուցադրվել այլ հավելվածների վրա, վրադրել Կարգավորումների էկրանները"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Մեդիա"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Թաքցնել նվագարկիչը, երբ մեդիայի աշխատաշրջանն ավարտվում է"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Աշխատաշրջանը հնարավոր է վերականգնել նվագարկիչի Արագ կարգավորումների ծավալված վահանակից։"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Մեդիա նվագարկիչը՝ արագ կարգավորումներում"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Ցուցադրել մեդիա նվագարկիչը երկար ժամանակով՝ նվագարկումը հեշտությամբ վերսկսելու համար"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Թաքցնել նվագարկիչը"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Ցուցադրել նվագարկիչը"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Հասանելի նվագարկիչներ չկան"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Թույլատրված հավելվածներ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"մեդիա"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Կմիանա Bluetooth-ը"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Միացված է"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Անջատված է"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Ինտերնետ"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM քարտեր"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Ցանցեր, որոնք անվտանգ են ինքնաթիռում"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Գտնել և միանալ ցանցի, որն անվտանգ է ինքնաթիռում"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ինքնաթիռ, ինքնաթիռում անվտանգ"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Զանգեր և SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Զանգեր Wi-Fi-ով"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Կատարեք և ստացեք զանգեր ոչ բջջային ցանցերի (օրինակ՝ Wi-Fi-ի) միջոցով"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"«Զանգեր Wi-Fi-ով» գործառույթը թույլ է տալիս ստանալ և կատարել զանգերը ոչ բջջային ցանցերի (օրինակ՝ որոշ Wi‑Fi ցանցերի) միջոցով։"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Զանգեր"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"նախընտրելի"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"նախընտրելի զանգեր"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"նախընտրելի SMS-ներ"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"անհասանելի է"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM քարտ չկա"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Կարգավորումներ"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Միանալ հանրային ցանցերին"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"կապ, համացանց, անլար, ինտերնետ, wifi, wi-fi, wi fi, բջջային, շարժական, բջջային օպերատոր, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ցանցեր, որոնք անվտանգ են ինքնաթիռում"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Անջատել ավիառեժիմը"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Անհասանելի է, քանի որ քնի ռեժիմը միացված է"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Ծանուցումների կարևորության կարգավորումները զրոյացվեցին։"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Հավելվածներ"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Մի ոչ վստահելի սարք ուզում է հասանելիություն ստանալ ձեր հաղորդագրություններին։ Հպեք՝ ավելին իմանալու համար։"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Հասանելի դարձնե՞լ հաղորդագրությունները"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"[<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] սարքը, որը ոչ վստահելի Bluetooth սարք է, ուզում է հասանելիություն ստանալ ձեր հաղորդագրություններին։\n\nԴուք նախկինում չեք միացել [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] սարքին։"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Մի ոչ վստահելի սարք ուզում է հասանելիություն ստանալ ձեր կոնտակտներին և զանգերի մատյանին։ Հպեք՝ ավելին իմանալու համար։"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Հասանելի դարձնե՞լ կոնտակտներն ու զանգերի մատյանը"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"[<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] սարքը, որը ոչ վստահելի Bluetooth սարք է, ուզում է հասանելիություն ստանալ ձեր կոնտակտներին և զանգերի մատյանին, որը ներառում է մուտքային և ելքային զանգերի մասին տվյալներ։\n\nԴուք նախկինում չեք միացել [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] սարքին։"</string>
 </resources>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 0974a2b..894a9cb 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Sedang"</item>
     <item msgid="6740026006576843477">"Lama"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Singkat"</item>
+    <item msgid="7397961711906421599">"Sedang"</item>
+    <item msgid="4079132024502041928">"Lama"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Hanya TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d4e4fef..27e096e 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Tanggal &amp; waktu"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Setel tanggal dan waktu"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Menyetel tanggal, waktu, zona waktu &amp; format"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Gunakan waktu yang disediakan jaringan"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Gunakan zona waktu yang disediakan jaringan"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Setel waktu otomatis"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Setel zona waktu otomatis"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gunakan default lokal"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Format 24 jam"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gunakan format 24 jam"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Tampilkan info profil di layar kunci"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Akun"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokasi"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Gunakan lokasi"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Gunakan lokasi"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Nonaktif"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aktif - <xliff:g id="COUNT_1">%1$d</xliff:g> aplikasi memiliki akses ke lokasi</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kunci layar, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kunci layar, sidik jari"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Kunci layar"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Buka kunci ponsel Anda dengan aman menggunakan wajah dan sidik jari"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Anda juga dapat login ke apl dan mengonfirmasi pembayaran"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Siapkan buka kunci dengan:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Membuka kunci ponsel Anda dengan mudah"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Sidik jari"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Hemat waktu membuka kunci ponsel di saku Anda"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Lewati"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Berikutnya"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Wajah ditambahkan"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Siapkan face unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Gunakan wajah Anda untuk mengautentikasi"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Mulai"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Jika face unlock aksesibilitas dinonaktifkan, beberapa langkah penyiapan mungkin tidak akan berfungsi baik dengan TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Kembali"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Lanjutkan penyiapan"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Gunakan penyiapan aksesibilitas"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Saat menggunakan Face Unlock di apl, selalu minta langkah konfirmasi"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Hapus data wajah"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Siapkan face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Gunakan face unlock untuk membuka kunci perangkat, login ke aplikasi, dan mengonfirmasi pembayaran.\n\nPerlu diingat:\nDengan melihat ponsel, Anda dapat membuka kuncinya meski tidak bermaksud untuk membukanya.\n\nOrang lain dapat membuka kunci ponsel Anda jika orang itu mendekatkan ponsel ke wajah Anda.\n\nPonsel dapat dibuka kuncinya oleh orang lain yang terlihat sangat mirip dengan Anda, misalnya saudara kembar identik Anda."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Gunakan face unlock untuk membuka kunci perangkat, login ke aplikasi, dan mengonfirmasi pembayaran.\n\nPerlu diingat:\nPonsel dapat terbuka kuncinya jika Anda melihat ponsel, meskipun Anda tidak bermaksud untuk membukanya.\n\nPonsel dapat dibuka kuncinya oleh orang lain jika orang itu mendekatkan ponsel ke wajah Anda meskipun mata Anda tertutup.\n\nPonsel dapat dibuka kuncinya oleh orang lain yang terlihat sangat mirip dengan Anda, misalnya anak atau saudara kembar identik Anda."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Gunakan face unlock untuk membuka kunci perangkat, login ke aplikasi, dan mengonfirmasi pembayaran."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Perlu diingat:\nDengan melihat ponsel, Anda dapat membuka kuncinya meski tidak bermaksud melakukannya.\n\nOrang lain dapat membuka kunci ponsel Anda jika ia mendekatkan ponsel ke wajah Anda.\n\nPonsel dapat dibuka kuncinya oleh orang lain yang sangat mirip dengan Anda, misalnya saudara kembar identik."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Perlu diingat:\nDengan melihat ponsel, Anda dapat membuka kuncinya meski tidak bermaksud melakukannya.\n\nOrang lain dapat membuka kunci ponsel Anda jika ia mendekatkan ponsel ke wajah Anda, meskipun mata Anda tertutup.\n\nPonsel dapat dibuka kuncinya oleh orang lain yang sangat mirip dengan Anda, misalnya saudara kembar identik."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Hapus data wajah?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Data wajah yang digunakan oleh face unlock akan dihapus dengan aman dan secara permanen. Setelah data dihapus, Anda harus memasukkan PIN, pola, atau sandi untuk membuka kunci ponsel, login ke aplikasi, dan mengonfirmasi pembayaran."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Gunakan fitur Face Unlock untuk membuka kunci ponsel Anda"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gunakan sidik jari untuk membuka ponsel atau menyetujui pembelian.\n\nCatatan: Anda tidak dapat menggunakan sidik jari untuk membuka perangkat ini. Untuk informasi selengkapnya, hubungi admin organisasi Anda."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gunakan sidik jari untuk membuka kunci ponsel atau menyetujui pembelian.\n\nCatatan: Sidik jari Anda mungkin kurang aman daripada pola atau PIN yang rumit."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Batal"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Lain kali"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Lanjutkan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Lewati"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Berikutnya"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Dengan melindungi tablet dengan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika tablet hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan Face Unlock. Untuk kembali, ketuk Batal."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Dengan melindungi perangkat dengan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika perangkat hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan Face Unlock. Untuk kembali, ketuk Batal."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Dengan melindungi ponsel dengan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika ponsel hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan Face Unlock. Untuk kembali, ketuk Batal."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Dengan melindungi tablet menggunakan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika tablet hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan biometrik. Untuk kembali, ketuk Batal."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Dengan melindungi perangkat menggunakan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika perangkat hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan biometrik. Untuk kembali, ketuk Batal."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Dengan melindungi ponsel menggunakan opsi kunci layar, tidak ada orang yang dapat menggunakannya jika ponsel hilang atau dicuri. Anda juga memerlukan opsi kunci layar untuk menyiapkan biometrik. Untuk kembali, ketuk Batal."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Lewati penyiapan PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Lewati penyiapan sandi?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Lewati penyiapan pola?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Cegah orang lain menggunakan tablet ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Cegah orang lain menggunakan perangkat ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Cegah orang lain menggunakan ponsel ini tanpa izin Anda dengan mengaktifkan fitur perlindungan perangkat. Pilih kunci layar yang ingin Anda gunakan."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Pilih metode kunci layar cadangan"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Pilih metode kunci layar cadangan"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Pilih metode kunci layar cadangan"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opsi kunci layar"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opsi kunci layar"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Kunci layar"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face unlock + Sandi"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Lanjutkan tanpa face unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Anda dapat membuka kunci ponsel menggunakan wajah. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrik + Pola"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrik + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrik + Sandi"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Lanjutkan tanpa biometrik"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Anda dapat membuka kunci ponsel menggunakan biometrik. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Dinonaktifkan oleh admin, kebijakan enkripsi, atau penyimpanan kredensial"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Tidak ada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Geser"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Harus kurang dari <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Admin perangkat tidak mengizinkan penggunaan PIN terbaru."</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"PIN umum diblokir oleh admin IT. Coba PIN lain."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Tidak boleh berisi karakter yang tidak valid"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Minimal berisi satu huruf"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Minimal berisi satu digit"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Minimal harus berisi 1 karakter bukan numerik</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Admin perangkat tidak mengizinkan penggunaan sandi terbaru."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Sandi umum diblokir oleh admin IT. Coba sandi lain."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Urutan digit naik, turun, atau berulang tidak diizinkan"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Konfirmasi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Batal"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Nyalakan Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Gunakan Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Gunakan Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Setelan Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Siapkan &amp; kelola titik akses nirkabel"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Posisikan kode QR di tengah jendela kamera untuk menyambungkan ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Hubungkan ke Wi‑Fi dengan memindai kode QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Bagikan Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Pindai kode QR ini untuk terhubung ke “<xliff:g id="SSID">%1$s</xliff:g>” dan membagikan sandi"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Pindai kode QR ini dengan perangkat lain untuk bergabung ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Pindai kode QR ini untuk terhubung ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Coba lagi. Jika masalah berlanjut, hubungi produsen perangkat"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Ada masalah"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Sandi Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Sandi hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Hubungkan otomatis"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Izinkan ponsel untuk terhubung otomatis di dekat jaringan ini"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Izinkan tablet untuk terhubung otomatis di dekat jaringan ini"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Izinkan sambungan ke jaringan ini saat berada dalam jangkauan"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Tambahkan perangkat"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Gunakan kode QR untuk menambahkan perangkat ke jaringan ini"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Format kode QR tidak valid"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Gunakan sertifikat sistem"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Jangan berikan"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Jangan validasi"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Sertifikat tidak ditentukan. Sambungan tidak bersifat pribadi."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Nama jaringan terlalu panjang."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domain harus ditentukan."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Perlu sertifikat."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Sambungkan"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi diaktifkan"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Terhubung ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Menghubungkan ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Menyambungkan…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Gagal menyambung ke jaringan"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Jaringan di luar jangkauan"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Alamat MAC perangkat"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Alamat MAC yang diacak"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Alamat MAC acak (terakhir digunakan)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Alamat IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detail jaringan"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Alamat IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Jaringan tersimpan"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Langganan"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Jaringan lain"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Setelan IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Setelan lanjutan Wi-Fi tidak tersedia untuk pengguna ini"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Simpan"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Ketikkan alamat gerbang yang valid."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Ketik alamat DNS yang valid."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Ketikkan panjang awalan jaringan antara 0 dan 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (kecuali diganti dengan DNS Pribadi)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (kecuali diganti dengan DNS Pribadi)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Panjang awalan jaringan"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Langsung"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikasi membagikan konten. Untuk membagikan koneksi internet, nonaktifkan hotspot lalu aktifkan kembali"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Sandi tidak disetel"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nama hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Mengaktifkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Mengaktifkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Perangkat lainnya dapat terhubung ke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Sandi hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Band"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Otomatis meningkatkan rasio pembaruan dari 60 menjadi 90 Hz untuk beberapa konten. Meningkatkan penggunaan baterai."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Paksa rasio pembaruan 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Rasio pembaruan tertinggi untuk penyempurnaan respons sentuhan &amp; kualitas animasi. Meningkatkan penggunaan baterai."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Fokus ke layar"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktif / Layar tidak akan mati jika Anda sedang melihatnya"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Dalam keadaan mati, layar akan menyala saat ada notifikasi baru"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Selalu tampilkan waktu dan info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Penggunaan baterai meningkat"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Tebalkan Teks"</string>
     <string name="title_font_size" msgid="570613010306330622">"Ukuran font"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Membuat teks menjadi lebih besar atau lebih kecil"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Setelan kunci kartu SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versi Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Update keamanan Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model &amp; hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versi hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID Peralatan"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Hapus APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN baru"</string>
     <string name="menu_save" msgid="6611465355127483100">"Simpan"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Buang"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Batal"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Bidang Nama wajib diisi."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN wajib diisi."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Aplikasi dapat direset"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Reset Wi-Fi, data seluler &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Tindakan ini akan mereset semua setelan jaringan, termasuk:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data seluler"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Hapus"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Hapus SIM hasil download"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Untuk mendownload SIM pengganti, hubungi operator Anda. Tindakan ini tidak akan membatalkan paket pembelian layanan seluler apa pun."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Tindakan ini tidak akan membatalkan paket pembelian seluler apa pun. Untuk mendownload SIM pengganti, hubungi operator Anda."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Reset setelan"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Reset semua setelan jaringan? Anda tidak dapat mengurungkan tindakan ini."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Reset semua setelan jaringan dan hapus SIM yang didownload? Anda tidak dapat mengurungkan tindakan ini."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Setelan jaringan telah direset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Tidak dapat menghapus SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"SIM hasil download tidak dapat dihapus karena terjadi error.\n\nMulai ulang perangkat Anda, lalu coba lagi."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Reset ke setelan pabrik"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Reset ke setelan pabrik"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tindakan ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang didownload"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tindakan ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang didownload"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Saat ini Anda telah login ke akun berikut:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Ada pengguna lain yang aktif di perangkat ini.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Untuk menghapus gambar, musik, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Reset ke setelan pabrik"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Reset ke setelan pabrik"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tindakan ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" tablet Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang didownload"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Tindakan ini akan menghapus semua data dari "<b>"penyimpanan internal"</b>" ponsel Anda, termasuk:\n\n"<li>"Akun Google Anda"</li>\n<li>"Data sistem dan aplikasi serta setelan"</li>\n<li>"Aplikasi yang didownload"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Saat ini Anda telah login ke akun berikut:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Ada pengguna lain yang aktif di perangkat ini.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna lainnya"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Tindakan ini tidak akan membatalkan paket layanan seluler."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"penyimpanan USB"</b>" perlu dihapus."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Untuk menghapus musik, gambar, dan data pengguna lainnya, "<b>"kartu SD"</b>" perlu dihapus."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Hapus penyimpanan USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Hapus kartu SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Hapus semua data di penyimpanan USB internal, seperti musik atau foto."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Hapus semua data di kartu SD, seperti musik atau foto"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Hapus semua data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Hapus semua data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Semua informasi pribadi dan aplikasi yang didownload akan dihapus. Anda tidak dapat mengurungkan tindakan ini."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Semua informasi pribadi, termasuk aplikasi &amp; SIM yang telah download, akan dihapus. Anda tidak dapat mengurungkan tindakan ini."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Hapus semua"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Peresetan tidak dilakukan karena layanan System Clear tidak tersedia."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Hapus semua data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Fitur kembalikan ke setelan pabrik tidak tersedia untuk pengguna ini"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Menghapus"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Harap tunggu..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Hapus semua data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Hapus semua data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Semua informasi pribadi dan aplikasi yang didownload akan dihapus. Anda tidak dapat mengurungkan tindakan ini."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Semua informasi pribadi, termasuk aplikasi &amp; SIM yang telah didownload, akan dihapus. Anda tidak dapat mengurungkan tindakan ini."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Hapus semua data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Reset ke setelan pabrik tidak tersedia untuk pengguna ini"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Menghapus"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Harap tunggu …"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Setelan panggilan"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Siapkan kotak pesan, penerusan panggilan, nada tunggu, nomor penelepon"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Tidak dapat menambatkan ke lebih dari <xliff:g id="MAXCONNECTION">%1$d</xliff:g> perangkat."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dilepas dari penambatan."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Tethering ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Bagikan koneksi internet ponsel melalui Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Bagikan koneksi internet ponsel melalui Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Gunakan hotspot dan tethering untuk menyediakan koneksi internet bagi perangkat lain melalui koneksi kuota seluler Anda. Aplikasi juga dapat membuat hotspot untuk berbagi konten dengan perangkat sekitar."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Gunakan hotspot dan tethering untuk menyediakan koneksi internet bagi perangkat lain melalui koneksi Wi‑Fi atau data seluler Anda. Aplikasi juga dapat membuat hotspot untuk membagikan konten ke perangkat di sekitar."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Bantuan"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pemindaian Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Izinkan aplikasi dan layanan untuk memindai perangkat di sekitar kapan saja, meski Bluetooth nonaktif. Ini dapat dilakukan, misalnya, untuk menyempurnakan fitur dan layanan berbasis lokasi."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Layanan lokasi untuk profil kerja"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Deteksi zona waktu lokasi"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Deteksi zona waktu lokasi"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Mengizinkan penggunaan lokasi perangkat untuk mendeteksi zona waktu saat ini. Setelan lokasi lainnya seperti pemindaian Wi-Fi dapat memengaruhi akurasi deteksi zona waktu."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aktif"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Nonaktif"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Deteksi zona waktu otomatis dinonaktifkan"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Deteksi zona waktu lokasi dinonaktifkan"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Deteksi zona waktu lokasi tidak didukung"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Perubahan deteksi zona waktu lokasi tidak diizinkan"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Lokasi Wi-Fi &amp; seluler"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Izinkan aplikasi menggunakan layanan lokasi Google untuk memperkirakan lokasi Anda dengan lebih cepat. Data lokasi anonim akan dikumpulkan dan dikirim ke Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Lokasi yang ditentukan oleh Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Untuk memakai face unlock, setel sandi"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Untuk memakai face unlock, setel pola"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Untuk memakai face unlock, setel PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Untuk menggunakan biometrik, setel sandi"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Untuk menggunakan biometrik, setel pola"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Untuk menggunakan biometrik, setel PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Lupa sandi?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Lupa pola?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Lupa PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferensi teks"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Pembesaran"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Area pembesaran"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Aktifkan pembesaran"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Pilih area pembesaran yang ingin digunakan saat memperbesar layar"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Layar penuh"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Sebagian layar"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Layar penuh &amp; sebagian layar"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Perbesar seluruh layar"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Perbesar sebagian layar"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Beralih ke tombol Aksesibilitas?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Menggunakan ketuk tiga kali untuk memperbesar bagian layar akan menyebabkan pengetikan dan tindakan lainnya tertunda.\n\nIngin beralih ke tombol Aksesibilitas untuk memperbesar?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Beralih ke tombol Aksesibilitas"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Tetap gunakan ketuk tiga kali untuk memperbesar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Setelan pembesaran"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Perbesar dengan ketuk 3 kali"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Perbesar dengan pintasan"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Tombol daya untuk tutup telepon"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Penunjuk mouse besar"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Hapus animasi"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Gabungkan saluran saat memutar audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Keseimbangan audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Kiri"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Kanan"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Gabungkan saluran saat memutar audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Keseimbangan audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kiri"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Kanan"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 detik"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 detik"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Getaran notifikasi"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Getaran dering"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Masukan sentuhan"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Gunakan <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Buka <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Gunakan koreksi warna"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Tampilkan teks"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Hanya untuk aplikasi yang didukung"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Gunakan <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Buka <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Gunakan koreksi warna"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Tampilkan teks"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Hanya untuk aplikasi yang didukung"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Ukuran dan gaya teks"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Ukuran teks <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Opsi lainnya"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Hitam putih"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Merah-hijau"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Merah-hijau"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Biru-kuning"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Pembatasan akses latar belakang"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Izinkan aplikasi berjalan di latar belakang"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikasi tidak diizinkan berjalan di background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Penggunaan background tidak dapat dibatasi"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Penggunaan latar belakang tidak dapat dibatasi"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Batasi aktivitas background?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jika aktivitas background aplikasi dibatasi, mungkin fungsinya terganggu."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Anda tidak dapat membatasi aplikasi karena tidak disetel untuk mengoptimalkan baterai.\n\nAktifkan pengoptimalan baterai untuk membatasi aplikasi."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet digunakan lebih lama dari biasanya"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Perangkat digunakan lebih lama dari biasanya"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Baterai mungkin lebih cepat habis daripada biasanya"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Mengoptimalkan untuk kesehatan baterai"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Daya baterai terbatas untuk sementara. Ketuk untuk mempelajari lebih lanjut."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Ponsel dipakai lebih lama dari biasanya. Baterai mungkin lebih cepat habis dari perkiraan.\n\nAplikasi yang paling banyak menggunakan baterai:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablet digunakan lebih sering dari biasanya. Baterai mungkin lebih cepat habis dari yang diperkirakan.\n\nAplikasi yang paling banyak menggunakan baterai:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Perangkat Anda digunakan lebih sering dari biasanya. Baterai mungkin lebih cepat habis dari yang diperkirakan.\n\nAplikasi yang paling banyak menggunakan baterai:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d aplikasi dibatasi</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Terjadi masalah saat membaca indikator baterai"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Terjadi masalah saat membaca indikator baterai. Ketuk untuk "<annotation id="url">"mempelajari lebih lanjut"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Hentikan aplikasi?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Setel jadwal"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Memperpanjang masa pakai baterai"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Nonaktifkan saat daya penuh"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Penghemat Baterai nonaktif saat daya ponsel Anda mencapai <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Penghemat Baterai nonaktif saat daya tablet Anda mencapai <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Penghemat Baterai nonaktif saat daya perangkat Anda mencapai <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Penghemat Baterai nonaktif saat daya ponsel terisi lebih dari <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Penghemat Baterai nonaktif saat daya tablet terisi lebih dari <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Penghemat Baterai nonaktif saat daya perangkat terisi lebih dari <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktifkan"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"Putar"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Konektivitas adaptif"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Memperpanjang masa pakai baterai dan meningkatkan performa perangkat dengan mengelola koneksi jaringan Anda secara otomatis"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Penyimpanan kredensial"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Menginstal sertifikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instal sertifikat dari penyimpanan"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kredensial pengguna"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Lihat dan ubah kredensial yang tersimpan"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Lanjutan"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Jenis penyimpanan"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Menggunakan hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Khusus software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredensial tidak tersedia untuk pengguna ini"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Dipasang untuk VPN dan aplikasi"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Dipasang untuk Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Jangan instal"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Tetap instal"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sertifikat tidak diinstal"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Izinkan <xliff:g id="APP_NAME">%s</xliff:g> menginstal sertifikat di perangkat ini?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Sertifikat ini akan mengidentifikasi Anda di aplikasi dan URL berikut"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Jangan izinkan"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Izinkan"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Tampilkan lebih banyak"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Apl pengelolaan sertifikat"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Tidak ada"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Sertifikat yang diinstal oleh aplikasi ini membuat aplikasi dan URL di bawah dapat mengidentifikasi Anda"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Hapus"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Sinyal panggilan darurat"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Setel perilaku ketika panggilan darurat dilakukan"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Cadangan"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Tidak disiapkan - Profil kerja"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"Anda (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nama panggilan"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Anda dapat menambahkan maksimal <xliff:g id="USER_COUNT">%1$d</xliff:g> pengguna"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Hanya pemilik tablet yang dapat mengelola pengguna."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Hanya pemilik ponsel yang dapat mengelola pengguna."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Membayar di terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Siapkan aplikasi pembayaran. Lalu, cukup dekatkan bagian belakang ponsel ke terminal mana saja yang memiliki simbol nirkontak."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Mengerti"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Lainnya..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Lainnya …"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Setel aplikasi pembayaran default"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Update aplikasi pembayaran default"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Di terminal tanpa kontak kartu fisik, bayar dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Kembali"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Berikutnya"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Selesai"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Ambil foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Pilih gambar"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Pilih foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Kartu SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Kartu SIM"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Selalu gunakan ini untuk telepon"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Pilih SIM untuk data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Pilih SIM untuk SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Mengalihkan SIM data, mungkin perlu waktu beberapa saat..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Mengalihkan SIM data, mungkin perlu waktu beberapa saat …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Telepon dengan"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Pilih kartu SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutinitas, jadwal, penghemat baterai, penghemat daya, baterai, otomatis, persen"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, panggilan telepon lanjutan, panggilan telepon 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"tambahkan bahasa, tambahkan sebuah bahasa"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ukuran teks"</string>
     <string name="default_sound" msgid="6604374495015245195">"Suara default"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume dering &amp; notifikasi pada <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, getar, Jangan Ganggu"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Aktifkan suara"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Teks Otomatis"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Otomatis tambahkan teks ke media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Tidak ada"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> jadwal disetel</item>
-      <item quantity="one">1 jadwal disetel</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Tidak ada}=1{1 jadwal disetel}other{# jadwal disetel}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Jangan Ganggu"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Hanya dapatkan notifikasi dari aplikasi dan orang yang penting"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Batasi gangguan"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Hanya untuk prioritas"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Nonaktif / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Nonaktif"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aktif"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Selalu tanya"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Sampai Anda menonaktifkannya"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> jam</item>
-      <item quantity="one">1 jam</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> menit"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> jadwal dapat aktif otomatis</item>
-      <item quantity="one">1 jadwal dapat aktif otomatis</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 jam}other{# jam}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 menit}other{# menit}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Nonaktif}=1{Nonaktif/1 jadwal dapat aktif otomatis}other{Nonaktif/# jadwal dapat aktif otomatis}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Apa yang dapat mengganggu fitur Jangan Ganggu"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Orang"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikasi"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Otomatis setel notifikasi dengan prioritas yang lebih rendah ke Senyap"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Urutan notifikasi adaptif"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Otomatis mengurutkan notifikasi menurut relevansi"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Masukan notifikasi adaptif"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Menunjukkan penyesuaian yang dilakukan pada notifikasi dan menampilkan opsi untuk memberikan masukan ke sistem"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Mereset tingkat kepentingan notifikasi"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reset setelan penting yang diubah pengguna dan izinkan asisten notifikasi diprioritaskan"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Saran tindakan dan balasan"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Otomatis tampilkan saran tindakan &amp; balasan"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Tampilkan notifikasi baru-baru ini dan yang ditunda"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Percakapan prioritas"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Muncul di atas bagian percakapan dan ditampilkan sebagai balon yang mengambang"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Muncul di atas bagian percakapan"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Percakapan lain"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Percakapan non-prioritas"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Percakapan yang telah Anda ubah"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Percakapan terbaru"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Hapus yang terbaru"</string>
+    <string name="clear" msgid="5092178335409471100">"Hapus"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Tampilkan balon percakapan prioritas"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Percakapan prioritas muncul di bagian atas menu notifikasi. Anda juga dapat menyetelnya untuk menampilkan balon dan mengganggu fitur Jangan Ganggu."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Percakapan prioritas dan yang diubah akan muncul di sini"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Akses Jangan Ganggu"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Izinkan Mode Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Tidak ada aplikasi terpasang yang meminta akses Jangan Ganggu"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Memuat aplikasi..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Memuat aplikasi …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Sesuai permintaan, Android memblokir notifikasi aplikasi ini agar tidak muncul di perangkat ini"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Sesuai permintaan, Android memblokir kategori notifikasi ini agar tidak muncul di perangkat ini"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Sesuai permintaan, Android memblokir grup notifikasi ini agar tidak muncul di perangkat ini"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Semua percakapan"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Percakapan prioritas"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Tidak ada"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> percakapan</item>
-      <item quantity="one">1 percakapan</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Tidak ada"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Tidak ada}=1{1 percakapan}other{# percakapan}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Siapa yang dapat mengganggu"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Panggilan telepon"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Panggilan telepon"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Untuk memastikan panggilan yang diizinkan mengeluarkan suara, pastikan perangkat disetel untuk berdering"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Untuk ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, panggilan masuk akan diblokir. Anda dapat menyesuaikan setelan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontak berbintang"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> lainnya</item>
-      <item quantity="one">1 lainnya</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Tidak ada"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Tidak ada}=1{{contact_1}}=2{{contact_1} dan {contact_2}}=3{{contact_1}, {contact_2}, dan {contact_3}}other{{contact_1}, {contact_2}, dan # lainnya}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Tanpa nama)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Pesan"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"pesan"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Pesan"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Untuk ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, pesan masuk akan diblokir. Anda dapat menyesuaikan setelan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Semua pesan dapat ditampilkan"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Semua panggilan dapat ditampilkan"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Tidak ada"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontak</item>
-      <item quantity="one">1 kontak</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Tidak ada}=1{1 kontak}other{# kontak}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Siapa saja"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontak"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontak berbintang"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Semua notifikasi"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Beberapa notifikasi"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Orang yang dipilih tetap dapat menghubungi Anda, meski aplikasi tidak diizinkan untuk mengganggu"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> dapat mengganggu</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> dapat mengganggu</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> lainnya"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Tidak ada aplikasi yang dapat mengganggu}=1{{app_1} dapat mengganggu}=2{{app_1} dan {app_2} dapat mengganggu}=3{{app_1}, {app_2}, dan {app_3} dapat mengganggu}other{{app_1}, {app_2}, dan # lainnya dapat mengganggu}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikasi"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Semua notifikasi"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Beberapa notifikasi"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifikasi yang dapat mengganggu"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Izinkan semua notifikasi"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> dapat mengganggu</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> dapat mengganggu</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Tidak ada yang dapat mengganggu"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> lainnya"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Tidak ada yang dapat mengganggu}=1{{sound_category_1} dapat mengganggu}=2{{sound_category_1} dan {sound_category_2} dapat mengganggu}=3{{sound_category_1}, {sound_category_2}, dan {sound_category_3} dapat mengganggu}other{{sound_category_1}, {sound_category_2}, dan # lainnya dapat mengganggu}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Tidak ada yang dapat mengganggu"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Tidak ada yang dapat mengganggu"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Beberapa orang dapat mengganggu"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Semua orang dapat mengganggu"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Aktif"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Nonaktif"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Pemasangan pin aplikasi"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Pemasangan pin aplikasi memungkinkan Anda terus menampilkan aplikasi saat ini hingga pinnya dilepas. Fitur ini dapat digunakan, misalnya, untuk mengizinkan teman tepercaya memainkan game tertentu. \n\nSaat sebuah aplikasi dipasangi pin, aplikasi itu dapat membuka aplikasi lain dan data pribadi dapat diakses. \n\nUntuk menggunakan pemasangan pin aplikasi: 	\n1.	Aktifkan pemasangan pin aplikasi 	\n2.	Buka Ringkasan \n3.	Ketuk ikon aplikasi di bagian atas layar, lalu ketuk Pasang pin"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Pemasangan pin aplikasi memungkinkan Anda terus menampilkan aplikasi saat ini hingga pinnya dilepas. Fitur ini dapat digunakan, misalnya, untuk mengizinkan teman tepercaya memainkan game tertentu. \n\nSaat sebuah aplikasi dipasangi pin, aplikasi itu dapat membuka aplikasi lain dan data pribadi dapat diakses. \n\nJika Anda ingin membagikan perangkat secara aman ke seseorang, coba gunakan pengguna tamu. \n\nUntuk menggunakan pemasangan pin aplikasi: 	\n1.	Aktifkan pemasangan pin aplikasi 	\n2.	Buka Ringkasan 	\n3.	Ketuk ikon aplikasi di bagian atas layar, lalu ketuk Pasang pin"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Penyematan aplikasi memungkinkan Anda terus menampilkan aplikasi saat ini hingga pinnya dilepas. Fitur ini dapat digunakan, misalnya, untuk mengizinkan teman tepercaya bermain game tertentu."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Saat aplikasi disematkan, aplikasi tersebut dapat membuka aplikasi lain dan data pribadi mungkin dapat diakses. \n\nUntuk menggunakan penyematan aplikasi: 	\n1.	Aktifkan penyematan aplikasi 	\n2.	Buka Ringkasan 	\n3.	Ketuk ikon aplikasi di bagian atas layar, lalu ketuk Sematkan"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Saat aplikasi disematkan, aplikasi tersebut dapat membuka aplikasi lain dan data pribadi mungkin dapat diakses. \n\nJika Anda ingin perangkat digunakan orang lain dengan aman, coba gunakan pengguna tamu. \n\nUntuk menggunakan penyematan aplikasi: 	\n1.	Aktifkan penyematan aplikasi 	\n2.	Buka Ringkasan 	\n3.	Ketuk ikon aplikasi di bagian atas layar, lalu ketuk Sematkan"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Saat aplikasi disematkan: \n\n•	 Data pribadi dapat diakses \n		(seperti kontak dan konten email) \n•	 Aplikasi yang disematkan dapat membuka aplikasi lain \n\nGunakan penyematan aplikasi hanya untuk orang yang Anda percayai."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Minta pola pembuka kunci sebelum melepas pin"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Minta PIN sebelum lepas pin"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Selain menggunakan wajah untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum mulai mengaktifkan perangkat. Jika perangkat belum aktif, panggilan telepon, SMS, atau notifikasi, termasuk alarm, tidak dapat diterima.\n\nIni membantu melindungi data di perangkat yang hilang atau dicuri. Minta PIN untuk mulai mengaktifkan perangkat?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Selain menggunakan wajah untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta pola sebelum mulai mengaktifkan perangkat. Jika perangkat belum aktif, panggilan telepon, SMS, atau notifikasi, termasuk alarm, tidak dapat diterima.\n\nIni membantu melindungi data di perangkat yang hilang atau dicuri. Minta pola untuk mulai mengaktifkan perangkat?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Selain menggunakan wajah untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta sandi sebelum mulai mengaktifkan perangkat. Jika perangkat belum aktif, panggilan telepon, SMS, atau notifikasi, termasuk alarm, tidak dapat diterima.\n\nIni membantu melindungi data di perangkat yang hilang atau dicuri. Minta sandi untuk mulai mengaktifkan perangkat?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Selain menggunakan biometrik untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum mulai mengaktifkan perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat diaktifkan.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta PIN untuk mengaktifkan perangkat Anda?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Selain menggunakan biometrik untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta pola sebelum mulai mengaktifkan perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat diaktifkan.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta pola untuk mengaktifkan perangkat Anda?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Selain menggunakan biometrik untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta sandi sebelum mulai mengaktifkan perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat diaktifkan.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta sandi untuk mengaktifkan perangkat Anda?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ya"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Tidak"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Dibatasi"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB dikontrol oleh"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Perangkat yang terhubung"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Perangkat ini"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Beralih..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Mengalihkan …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Tidak dapat beralih"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Mengisi baterai perangkat ini"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Mengisi daya perangkat yang terhubung"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Penggunaan kuota seluler"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Penggunaan data oleh aplikasi"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Penggunaan data Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Penggunaan data non-operator"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Penggunaan data ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 pembatasan</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Perhitungan data oleh operator dapat berbeda dengan perhitungan perangkat"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Mengecualikan data yang digunakan oleh jaringan operator"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Setel peringatan penggunaan data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Peringatan penggunaan data"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Lihat detail"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Penghemat Data"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Data tidak dibatasi"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Data latar belakang nonaktif"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Data latar belakang nonaktif"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aktif"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Nonaktif"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Gunakan Penghemat Data"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Jika perangkat terkunci, cegah mengetik balasan atau teks lainnya di notifikasi"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Pemeriksa ejaan default"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Pilih pemeriksa ejaan"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Gunakan pemeriksa ejaan"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Gunakan pemeriksa ejaan"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Tidak dipilih"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(tidak ada)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Untuk membantu mengosongkan ruang penyimpanan, pengelola penyimpanan menghapus foto dan video cadangan dari perangkat Anda."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Hapus foto &amp; video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Pengelola penyimpanan"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Gunakan Pengelola penyimpanan"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Gunakan Pengelola penyimpanan"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Otomatis"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Kosongkan ruang sekarang"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Ketuk dua kali untuk memeriksa ponsel"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Ketuk dua kali untuk memeriksa tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Ketuk dua kali untuk memeriksa perangkat"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Geser untuk notifikasi"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Geser ke bawah di bagian tepi bawah layar untuk menampilkan notifikasi"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Mode satu tangan"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Gunakan mode satu tangan"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Keluar saat beralih ke aplikasi lain"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Waktu habis"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 detik"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 detik"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 detik"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"jangkauan"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Untuk memeriksa waktu, notifikasi, dan info lainnya, ketuk dua kali layar Anda."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Angkat untuk memeriksa ponsel"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Angkat untuk memeriksa tablet"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Ketuk untuk memeriksa tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ketuk untuk memeriksa perangkat"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Untuk memeriksa waktu, notifikasi, dan info lainnya, ketuk layar Anda."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS Darurat"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Gunakan SOS darurat"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Dikelola oleh <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Mulai tindakan di bawah dengan menekan cepat tombol daya sebanyak 5 kali atau lebih"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Putar alarm hitung mundur"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Putar suara yang keras sebelum meminta bantuan"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Telepon bantuan"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Nomor untuk mendapatkan bantuan"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Ketuk untuk mengubah"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Jika Anda memasukkan nomor non-darurat:\n • Perangkat harus dibuka kuncinya untuk menggunakan SOS darurat\n • Panggilan Anda mungkin tidak dijawab"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Usapkan sidik jari untuk melihat notifikasi"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usapkan sidik jari"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Untuk memeriksa notifikasi, usapkan jari ke bawah pada sensor sidik jari di bagian belakang ponsel."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Jumlah set data maks yang terlihat"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Reset ke nilai default"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Opsi developer IsiOtomatis telah direset"</string>
+    <string name="location_category" msgid="3496759112306219062">"Lokasi"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Status bar indikator lokasi"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Tampilkan untuk semua lokasi, termasuk jaringan dan konektivitas"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Paksa ukuran GNSS penuh"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Lacak semua konstelasi dan frekuensi GNSS tanpa siklus tugas"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema perangkat"</string>
     <string name="default_theme" msgid="4815428567082263639">"Default"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nama jaringan"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Jeda notifikasi agar tetap fokus"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Fitur tidak tersedia"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Fitur ini telah dinonaktifkan karena memperlambat ponsel Anda"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Paksa ukuran GNSS penuh"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Lacak semua konstelasi dan frekuensi GNSS tanpa siklus tugas"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Selalu tampilkan dialog error"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Tampilkan dialog setiap kali aplikasi tidak bekerja"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Pilih aplikasi yang berkemampuan ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktifkan untuk semua aplikasi"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Pilih Driver Grafis"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver Game"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver Game"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver Grafis Sistem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Aktif (suara dimatikan)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Nonaktif"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detail jaringan"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Nama perangkat terlihat oleh aplikasi di ponsel, dan juga mungkin dilihat oleh orang lain saat Anda menghubungkan ke perangkat Bluetooth atau menyiapkan hotspot Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Nama perangkat terlihat oleh aplikasi di ponsel, dan juga mungkin dilihat oleh orang lain saat Anda menghubungkan ke perangkat Bluetooth atau jaringan Wi-Fi, atau saat menyiapkan hotspot Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Perangkat"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Semua Setelan"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Saran"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Tidak dapat menemukan jaringan. Coba lagi."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(terlarang)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Tidak ada kartu SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Tidak ada SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Tidak ada"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Memerlukan SIM agar terhubung"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Memerlukan SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> agar terhubung"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mode jaringan pilihan: WCDMA dipilih"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mode jaringan pilihan: hanya GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mode jaringan pilihan: hanya WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Data seluler"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Akses data menggunakan jaringan seluler"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Ponsel akan otomatis beralih ke operator ini saat berada dalam jangkauan"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Tidak ada kartu SIM yang tersedia"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferensi panggilan"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferensi SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Selalu tanya"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Tidak tersedia saat terhubung ke <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Lihat lainnya"</string>
     <string name="see_less" msgid="2642392725363552793">"Lihat lebih sedikit"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Aktifkan <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Aktifkan SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Beralih ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Beralih menggunakan kartu SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Hanya satu SIM yang dapat diaktifkan pada satu waktu.\n\nBeralih ke <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan layanan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> Anda."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Hanya satu SIM hasil download yang dapat diaktifkan pada satu waktu.\n\nBeralih ke <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan layanan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> Anda."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Hanya satu SIM yang dapat diaktifkan pada satu waktu.\n\nPengalihan tidak akan membatalkan layanan <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Beralih ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Menghubungkan ke jaringan…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Mengalihkan ke <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Tidak dapat mengalihkan operator"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operator tidak dapat dialihkan karena error."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Nonaktifkan <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Nonaktifkan SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Menonaktifkan SIM <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Tidak dapat menonaktifkan operator"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Terjadi error dan operator Anda tidak dapat dinonaktifkan."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Gunakan 2 SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Perangkat ini dapat memiliki 2 SIM aktif sekaligus. Untuk terus menggunakan 1 SIM dalam satu waktu, ketuk \"Lain kali\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Mulai ulang perangkat?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Untuk memulai, mulai ulang perangkat. Lalu, Anda dapat menambahkan SIM lain."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Lanjutkan"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Mulai ulang"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Lain kali"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Alihkan"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Tidak dapat mengaktifkan SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Keluarkan SIM, lalu masukkan lagi. Jika masalah berlanjut, mulai ulang perangkat."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Coba aktifkan SIM lagi. Jika masalah berlanjut, mulai ulang perangkat."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivasi jaringan"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktif"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Ketuk untuk memperbarui setelan SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Kartu SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Hapus SIM yang didownload ini?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Menghapus SIM ini akan menghapus layanan <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> dari perangkat ini.\n\nLayanan untuk <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> tidak akan dibatalkan."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Hapus"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Menghapus SIM …"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Tidak dapat menghapus SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"SIM ini tidak dapat dihapus karena terjadi error.\n\nMulai ulang perangkat, lalu coba lagi."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Hubungkan ke perangkat"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikasi <xliff:g id="APPNAME">%1$s</xliff:g> ingin menggunakan jaringan Wi-Fi sementara untuk terhubung ke perangkat"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Perangkat tidak ditemukan. Pastikan perangkat dihidupkan dan dapat tersambung ke jaringan."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Panggilan darurat"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Panggilan darurat melalui Panggilan Wi‑Fi tidak didukung oleh operator Anda.\nPerangkat beralih ke jaringan seluler secara otomatis untuk melakukan panggilan darurat.\nPanggilan darurat hanya dapat dilakukan dengan cakupan seluler."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Gunakan Wi‑Fi untuk melakukan panggilan dengan kualitas lebih baik"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Panggilan lintas-SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Izinkan SMS dan panggilan SIM lain melalui SIM ini."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"panggilan lintas-sim"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Pesan MMS masuk"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Tidak dapat mengirim pesan MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Ketuk untuk mengizinkan pengiriman pesan MMS menggunakan <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> saat kuota nonaktif"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Mengizinkan overlay layar pada Setelan"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Izinkan aplikasi yang dapat ditampilkan di atas aplikasi lain untuk menempatkan layar Setelan"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Menyembunyikan pemutar saat sesi media berakhir"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Pemutar memungkinkan Anda melanjutkan sesi dari panel Setelan Cepat yang diperluas."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Pemutar media di Setelan Cepat"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Tampilkan pemutar media dalam waktu lama untuk melanjutkan pemutaran dengan mudah"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Sembunyikan pemutar"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Menampilkan pemutar"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Tidak ada pemutar yang tersedia"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplikasi yang diizinkan"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth akan diaktifkan"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Aktif"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Nonaktif"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Jaringan aman di pesawat"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Temukan dan hubungkan ke jaringan aman di pesawat"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"pesawat, aman di pesawat"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Panggilan Telepon dan SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Panggilan Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Melakukan dan menerima panggilan melalui jaringan non-operator seperti Wi-Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Dengan Panggilan Wi-Fi, Anda dapat melakukan dan menerima panggilan melalui jaringan non-operator seperti jaringan Wi-Fi tertentu."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Panggilan Telepon"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"pilihan"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"panggilan pilihan"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS pilihan"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"tidak tersedia"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Tidak ada SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferensi"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Hubungkan ke jaringan publik"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"koneksi jaringan, internet, nirkabel, data, wifi, wi-fi, wi fi, seluler, (perangkat) seluler, operator seluler, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Tampilkan jaringan aman di pesawat"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Nonaktifkan Mode Pesawat"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Tidak tersedia karena mode waktu tidur diaktifkan"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Reset nilai penting notifikasi selesai."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikasi"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Perangkat tidak tepercaya ingin mengakses pesan Anda. Ketuk untuk melihat detailnya."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Izinkan akses ke pesan?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Perangkat Bluetooth yang tidak tepercaya, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ingin mengakses pesan Anda.\n\nAnda belum pernah terhubung ke [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] sebelumnya."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Perangkat yang tidak tepercaya ingin mengakses kontak dan log panggilan Anda. Ketuk untuk melihat detailnya."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Izinkan akses ke kontak dan log panggilan?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Perangkat Bluetooth yang tidak tepercaya, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ingin mengakses kontak dan log panggilan Anda. Ini mencakup data tentang panggilan masuk dan keluar.\n\nAnda belum pernah terhubung ke [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] sebelumnya."</string>
 </resources>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 90d6b3b..2d8956e 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Meðallangt"</item>
     <item msgid="6740026006576843477">"Langt"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Stutt"</item>
+    <item msgid="7397961711906421599">"Miðlungs"</item>
+    <item msgid="4079132024502041928">"Löng"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Sjálfgefið"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Alþjóðlegt"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Aðeins TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Um allan heim"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 10403f3..ba88954 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Dagsetning og tími"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Stilla dagsetningu og tíma"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Velja dagsetningu, tíma, tímabelti og snið"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Nota tíma frá símkerfi"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Nota tímabelti frá símkerfi"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Stilla tíma sjálfkrafa"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Stilla tímabelti sjálfkrafa"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Nota sjálfgefið snið staðar"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 tíma snið"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Nota 24 tíma snið"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Sýna notandaupplýsingar á lásskjá"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Reikningar"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Staðsetning"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Nota staðsetningu"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Nota staðsetningu"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Slökkt"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Kveikt – <xliff:g id="COUNT_1">%1$d</xliff:g> forrit hefur aðgang að staðsetningu</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skjálás, andlitsopnun"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skjálás, fingrafar"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Skjálás"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Opnaðu símann á öruggan hátt með andliti eða fingrafari"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Þú getur líka skráð þig inn í forrit og staðfest greiðslur"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Stilla opnun með:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Andlitsopnun"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Auðveldaðu þér að taka símann úr lás"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingrafar"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Sparaðu tíma - opnaðu símann í vasanum"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Sleppa"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Áfram"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Andliti bætt við"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Setja upp andlitsopnun"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Andlitsopnun"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Notaðu andlitið til að staðfesta"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Hefjast handa"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ef slökkt er á andlitsopnun fyrir aðgengi er ekki víst að öll skref virki eins og skyldi með TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Til baka"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Halda uppsetningu áfram"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Nota uppsetningu aðgengis"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Krefjast alltaf staðfestingarþreps þegar andlitsopnun er notuð"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Eyða andlitsgögnum"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Setja upp andlitsopnun"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Notaðu andlitsopnun til að taka tækið úr lás, skrá þig inn í forrit og staðfesta greiðslur.\n\nHafðu í huga að:\nSíminn gæti opnast óvart þegar þú lítur á hann.\n\nAðrir geta opnað símann með því að halda honum upp að andlitinu þínu.\n\nEinhver sem er mjög lík(ur) þér getur opnað símann þinn, t.d. eineggja tvíburi."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Notaðu andlitsopnun til að taka tækið úr lás, skrá þig inn í forrit og staðfesta greiðslur.\n\nHafðu í huga að:\nSíminn gæti opnast óvart þegar þú lítur á hann.\n\nAðrir geta opnað símann með því að halda honum upp að andlitinu þínu, jafnvel þegar þú ert með augun lokuð.\n\nEinhver sem er mjög lík(ur) þér getur opnað símann þinn, t.d. eineggja tvíburi."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Notaðu andlitsopnun til að taka tækið þitt úr lás, skrá þig inn í forrit og staðfesta greiðslur."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Hafðu þetta í huga:\nSíminn gæti opnast óvart þegar þú lítur á hann.\n\nAðrir geta opnað símann með því að halda honum upp að andlitinu á þér.\n\nEinhver sem líkist þér mikið gæti tekið símann úr lás, t.d. eineggja tvíburi."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Hafðu þetta í huga:\nSíminn gæti opnast óvart þegar þú lítur á hann.\n\nAðrir geta opnað símann með því að halda honum upp að andlitinu á þér, jafnvel þótt þú sért með augun lokuð.\n\nEinhver sem líkist þér mikið gæti tekið símann úr lás, t.d. eineggja tvíburi."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Eyða andlitsgögnum?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Andlitsgögnum sem andlitsopnun notar verður eytt varanlega og á öruggan hátt. Þegar þeim hefur verið eytt þarftu PIN-númer, mynstur eða aðgangsorð til að taka símann úr lás, skrá þig inn í forrit og staðfesta greiðslur."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Nota andlitsopnun til að taka símann úr lás"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Notaðu fingrafarið til að taka símann úr lás eða staðfesta kaup.\n\nAthugaðu: Þú getur ekki notað fingrafarið til að taka lásinn af þessu tæki. Hafðu samband við kerfisstjóra fyrirtækisins þíns til að fá frekari upplýsingar."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Notaðu fingrafarið til að taka símann úr lás eða staðfesta kaup.\n\nAthugaðu: Fingrafar kann að vera ótraustari aðferð en sterkt mynstur eða PIN-númer."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Hætta við"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nei, takk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Halda áfram"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Sleppa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Áfram"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Ef þú verndar spjaldtölvuna þína með því að velja skjálás getur enginn notað hana ef hún týnist eða ef henni er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsopnun. Ýttu á „Hætta við“ til að fara til baka."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Ef þú verndar tækið þitt með því að velja skjálás getur enginn notað það ef það týnist eða ef því er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsopnun. Ýttu á „Hætta við“ til að fara til baka."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Ef þú verndar símann þinn með því að velja skjálás getur enginn notað hann ef hann týnist eða ef honum er stolið. Þú þarft einnig að velja skjálás til að setja upp andlitsopnun. Ýttu á „Hætta við“ til að fara til baka."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Ef þú verndar spjaldtölvuna þína með því að velja skjálás getur enginn notað hana ef hún týnist eða ef henni er stolið. Þú þarft líka að velja skjálás til að setja upp lífkenni. Ýttu á „Hætta við“ til að fara til baka."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Ef þú verndar tækið þitt með því að velja skjálás getur enginn notað það ef það týnist eða ef því er stolið. Þú þarft líka að velja skjálás til að setja upp lífkenni. Ýttu á „Hætta við“ til að fara til baka."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Ef þú verndar símann þinn með því að velja skjálás getur enginn notað hann ef hann týnist eða ef honum er stolið. Þú þarft líka að velja skjálás til að setja upp lífkenni. Ýttu á „Hætta við“ til að fara til baka."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Viltu sleppa uppsetningu PIN-númers?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Viltu sleppa uppsetningu aðgangsorðs?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Viltu sleppa uppsetningu mynsturs?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Komdu í veg fyrir að aðrir noti þessa spjaldtölvu í heimildarleysi með því að virkja varnareiginleika spjaldtölvunnar. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Komdu í veg fyrir að aðrir noti þetta tæki í heimildarleysi með því að virkja varnareiginleika tækisins. Veldu þann skjálás sem þú vilt nota."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Komdu í veg fyrir að aðrir noti þennan síma í heimildarleysi með því að virkja varnareiginleika símans. Veldu þann skjálás sem þú vilt nota."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Veldu varaleið fyrir skjálás"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Veldu varaleið fyrir skjálás"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Veldu varaleið skjáláss"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Valkostir skjálæsingar"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Valkostir skjálæsingar"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Skjálás"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Andlitsopnun + aðgangsorð"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Halda áfram án andlitsopnunar"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Þú getur tekið símann úr lás með því að nota andlitið. Af öryggisástæðum krefst þessi valkostur að varaskjálás sé til staðar."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Lífkenni + mynstur"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Lífkenni + PIN-númer"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Lífkenni + aðgangsorð"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Halda áfram án lífkenna"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Þú getur tekið símann úr lás með lífkennum. Af öryggisástæðum krefst þessi valkostur þess að varaskjálás sé til staðar."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Stjórnandi, dulkóðunarstefna eða skilríkjageymsla hefur gert óvirkt"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Enginn"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Strjúka"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">Má ekki vera lengra en <xliff:g id="NUMBER_1">%d</xliff:g> tölustafir</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Tækjastjóri leyfir ekki notkun nýlegs PIN-númers"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Kerfisstjórinn þinn hefur lokað á algeng PIN-númer. Prófaðu annað PIN-númer."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Þetta má ekki innihalda ógildan staf"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Verður að innihalda minnst einn bókstaf"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Verður að innihalda minnst einn tölustaf"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">Verður að innihalda að minnsta kosti <xliff:g id="COUNT">%d</xliff:g> staftákn sem er ekki tölustafur</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Tækjastjóri leyfir ekki notkun nýlegs aðgangsorðs"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Kerfisstjórinn þinn hefur lokað á algeng aðgangsorð. Prófaðu annað aðgangsorð."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Hækkandi, lækkandi eða endurtekin röð tölustafa er óheimil"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Staðfesta"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Hætta við"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Kveikja á Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Nota Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Nota Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Stillingar Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Setja upp og stjórna þráðlausum aðgangsstöðum"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Færðu QR-kóðann í miðjan rammann til að tengja tækið við „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Tengjast Wi‑Fi með því að skanna QR-kóða"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Deila Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skannaðu þennan QR-kóða til að tengjast „<xliff:g id="SSID">%1$s</xliff:g>“ og deildu aðgangsorðinu"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skannaðu þennan QR-kóða með öðru tæki til að tengjast „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skannaðu þennan QR-kóða til að tengjast „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Reyndu aftur. Ef vandamálið er viðvarandi skaltu hafa samband við framleiðandi tækisins"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Eitthvað fór úrskeiðis"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi aðgangsorð: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Aðgangsorð fyrir heitan reit: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Sjálfvirk tenging"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Leyfa síma að tengjast sjálfkrafa nálægt þessu netkerfi"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Leyfa spjaldtölvu að tengjast sjálfkrafa nálægt þessu netkerfi"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Leyfa tengingu við þetta net þegar samband næst"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Bæta tæki við"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Nota QR-kóða til að bæta tæki við þetta net"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-kóði er ekki gilt snið"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Nota kerfisvottorð"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ekki bjóða upp á"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ekki staðfesta"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ekkert vottorð tilgreint. Tengingin verður ekki lokuð."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Heiti netkerfis er of langt."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Tilgreina þarf lén."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Vottorðs krafist."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Tengjast"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Kveikt á Wi-Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Tengt við <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Tengist <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Tengist…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Ekk tókst að tengjast neti"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Ekkert samband við netkerfi"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-vistfang tækis"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"MAC-vistfang af handahófi"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Slembiraðað MAC-vistfang (síðast notað)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-tala"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Upplýsingar um net"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Undirnetssía"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-tölur"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Vistuð net"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Áskriftir"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Önnur netkerfi"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP-stillingar"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Ítarlegar Wi‑Fi stillingar eru ekki í boði fyrir þennan notanda"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Vista"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Sláðu inn gilt vistfang gáttar."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Sláðu inn gilt DNS-vistfang."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Sláðu inn lengd netforskeytis á bilinu 0–32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (nema því sé hnekkt með lokuðu DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (nema því sé hnekkt með lokuðu DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gátt"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lengd netforskeytis"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Forrit deilir efni. Til að deila nettengingu skaltu slökkva á heita reitnum og kveikja svo á honum aftur"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Ekkert aðgangsorð valið"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Heiti á heitum reit"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Kveikir á <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Kveikir á <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Önnur tæki geta tengst <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Aðgangsorð fyrir heitan reit"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Tíðnisvið"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Hnökralaus skjár"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Breytir endurnýjunarhraða sjálfkrafa úr 60 í 90 Hz fyrir sumt efni. Eykur rafhlöðunotkun."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Hnökralaus skjár"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Þvinga fram 90 Hz endurnýjunarhraða"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Mesti endurnýjunarhraði fyrir bætta snertisvörun og gæði hreyfimynda. Eykur rafhlöðunotkun."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Skjáskynjun"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Kveikt / Það slokknar ekki á skjánum ef þú horfir á hann"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Skjárinn kveikir á sér ef nýjar tilkynningar berast"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Sýna alltaf klukku og uppl."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Aukin rafhlöðunotkun"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Feitletra texta"</string>
     <string name="title_font_size" msgid="570613010306330622">"Leturstærð"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Gera texta stærri eða minni"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Stillingar SIM-kortaláss"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android útgáfa"</string>
     <string name="security_patch" msgid="4071756145347865382">"Öryggisuppfærsla fyrir Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Gerð"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Gerð: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Gerð og vélbúnaður"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Vélbúnaðarútgáfa"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Auðkenni búnaðar"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Eyða aðgangsstað"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nýr aðgangsstaður"</string>
     <string name="menu_save" msgid="6611465355127483100">"Vista"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Fleygja"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Hætta við"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Reiturinn fyrir heiti má ekki vera auður."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Heiti aðgangsstaðar má ekki vera autt."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Hægt er að endurstilla forrit"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Endurstilla Wi-Fi, farsímagögn og Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Þetta mun endurstilla allar netkerfisstillingar, þar á meðal:\n\n"<li>"Wi‑Fi"</li>\n<li>"Farsímagögn"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Eyða"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Eyða sóttum SIM-kortum"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Til að sækja ný SIM-kort þarftu að hafa samband við símafyrirtækið þitt. Þetta segir ekki upp neinni áskrift hjá símafyrirtæki."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Þetta segir ekki upp neinni áskrift hjá símafyrirtæki. Til að sækja ný SIM-kort þarftu að hafa samband við símafyrirtækið þitt."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Endurstilla"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Endurstilla allar netstillingar? Ekki er hægt að afturkalla þessa aðgerð."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Viltu endurstilla allar netstillingar og hreinsa sótt SIM? Ekki er hægt að afturkalla þessa aðgerð."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Netstillingar voru endurstilltar"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Ekki tókst að eyða SIM-korti"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Ekki er hægt að eyða sóttum SIM-kortum vegna villu.\n\nEndurræstu tækið og reyndu aftur."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Eyða öllum gögnum (núllstilla)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Eyða öllum gögnum (núllstilla)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" spjaldtölvunnar, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" símans, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Þú ert skráð(ur) inn á eftirfarandi reikninga:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Aðrir notendur eru til staðar í þessu tæki.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Tónlist"</li>\n<li>"Myndum"</li>\n<li>"Öðrum notandagögnum"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-kortum"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Þetta mun ekki segja upp farsímaáskrift þinni."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"USB-geymslunni"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"SD-kortinu"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Eyða öllum gögnum (núllstilla)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Eyða öllum gögnum (núllstilla)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" spjaldtölvunnar, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Þessi aðgerð eyðir öllum gögnum úr "<b>"innbyggðri geymslu"</b>" símans, þar á meðal:\n\n"<li>"Google reikningnum þínum"</li>\n<li>"Gögnum og stillingum forrita og kerfis"</li>\n<li>"Forritum sem hafa verið sótt"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Þú ert skráð(ur) inn á eftirfarandi reikninga:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Aðrir notendur eru til staðar í þessu tæki.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Tónlist"</li>\n<li>"Myndir"</li>\n<li>"Önnur notandagögn"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-kort"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Þetta mun ekki segja upp farsímaáskrift þinni."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"USB-geymslunni"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Til að hreinsa tónlist, myndir og önnur notandagögn þarf að hreinsa allt út af "<b>"SD-kortinu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Hreinsa út af USB-geymslu"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Hreinsa út af SD-korti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Eyða öllum gögnum í innbyggðu USB-geymslunni, svo sem tónlist eða myndum"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Eyða öllum gögnum á SD-korti, svo sem tónlist eða ljósmyndum"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Eyða öllum gögnum"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Eyða öllum gögnum"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Öllum persónuupplýsingunum þínum og forritum sem hafa verið sótt verður eytt. Ekki er hægt að afturkalla þessa aðgerð."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Öllum persónuupplýsingunum þínum verður eytt, þar á meðal forritum og SIM-kortum sem hafa verið sótt. Ekki er hægt að afturkalla þessa aðgerð."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Eyða öllu"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Endurstilling var ekki framkvæmd vegna þess að kerfishreinsunarþjónustan er ekki tiltæk."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Viltu eyða öllum gögnum?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Núllstilling er ekki í boði fyrir þennan notanda"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Þurrkað út"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Augnablik..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Eyða öllum gögnum"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Eyða öllum gögnum"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Öllum persónuupplýsingunum þínum og forritum sem hafa verið sótt verður eytt. Ekki er hægt að afturkalla þessa aðgerð."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Öllum persónuupplýsingunum þínum verður eytt, þar á meðal forritum og SIM-kortum sem hafa verið sótt. Ekki er hægt að afturkalla þessa aðgerð."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Viltu eyða öllum gögnum?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Núllstilling er ekki í boði fyrir þennan notanda"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Eyðir"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Augnablik…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Símtalsstillingar"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Setja upp talhólf, framsendingu símtala, símtöl í bið, númerabirtingu"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-tjóðrun"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Ekki er hægt að tjóðra fleiri en <xliff:g id="MAXCONNECTION">%1$d</xliff:g> tæki."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Tjóðrun <xliff:g id="DEVICE_NAME">%1$s</xliff:g> verður slitið."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-tjóðrun"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Deila nettengingu símans gegnum USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Deila nettengingu símans gegnum Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Notaðu heitan reit og tjóðrun til að tengja önnur tæki við internetið í gegnum farsímagagnatenginguna þína. Forrit geta einnig búið til heitan reit til að deila efni með nálægum tækjum."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Notaðu heitan reit og tjóðrun til að tengja önnur tæki við internetið í gegnum Wi-Fi eða farsímagagnatenginguna þína. Forrit geta einnig búið til heitan reit til að deila efni með nálægum tækjum."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hjálp"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-leit"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Leyfa forritum og þjónustu að leita að nálægum tækjum hvenær sem er, jafnvel þegar slökkt er á Bluetooth. Sem dæmi er hægt að nota þetta til að bæta eiginleika og þjónustu sem byggja á staðsetningu."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Staðsetningarþjónustur fyrir vinnuna"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Staðsetningargreining tímabeltis"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Staðsetningargreining tímabeltis"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Heimilar að staðsetning tækisins sé notuð til að greina hvaða tímabelti það er í. Aðrar staðsetningarstillingar, til dæmis Wi‑Fi leit, geta haft áhrif á nákvæmni tímabeltisgreiningar."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Kveikt"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Slökkt"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Slökkt er á sjálfvirkri greiningu tímabeltis"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Slökkt er á staðsetningargreiningu tímabeltis"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Staðsetningargreining tímabeltis er ekki studd"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Breytingar á staðsetningargreiningu tímabeltis eru ekki leyfðar"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Staðsetning frá Wi-Fi og kerfi"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Leyfir forritum að nota þjónustu Google fyrir hraðvirkari staðsetningarákvörðun. Nafnlausar upplýsingar verða sendar til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Wi-Fi ákvarðar staðsetningu"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Veldu aðgangsorð til að nota andlitsopnun"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Veldu mynstur til að nota andlitsopnun"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Veldu PIN til að nota andlitsopnun"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Stilltu aðgangsorð til að nota lífkenni"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Stilltu mynstur til að nota lífkenni"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Stilltu PIN-númer til að nota lífkenni"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Gleymt aðgangsorð?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Gleymdirðu mynstrinu?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Gleymdirðu PIN-númerinu?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Kjörstillingar skjátexta"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Stækkun"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Stækkunarsvæði"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Kveikja á stækkun"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Veldu svæðin sem eru stækkuð þegar þú stækkar skjáinn"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Allur skjárinn"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Hluti skjás"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Allur skjárinn eða hluti skjásins"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Stækka allan skjáinn"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Stækka hluta skjásins"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Viltu skipta yfir í aðgengishnappinn?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ef ýtt er þrisvar til að stækka hluta af skjánum getur það valdið töfum á innslætti og öðrum aðgerðum.\n\nViltu skipta yfir í að nota aðgengishnappinn til að stækka?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Skipta yfir í aðgengishnappinn"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Halda áfram að ýta þrisvar til að stækka"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Stillingar stækkunar"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Stækka með því að ýta þrisvar"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Stækka með flýtilykli"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Aflrofi lýkur símtali"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Stór músarbendill"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Fjarlægja hreyfimyndir"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Einóma hljóð"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Sameina rásir þegar hljóð er spilað"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Hljóðjöfnun"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vinstri"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Hægri"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Einóma hljóð"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Sameina rásir þegar hljóð er spilað"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Hljóðjöfnun"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Vinstri"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Hægri"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Sjálfgefið"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekúndur"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekúndur"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Titringur tilkynninga"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Titringur hringingar"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Snertisvörun"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Nota <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Opna <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Nota litaleiðréttingu"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Birta skjátexta"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Aðeins fyrir stutt forrit"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Nota <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>: Opna"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Nota litaleiðréttingu"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Birta skjátexta"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Aðeins fyrir stutt forrit"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Stærð og stíll skjátexta"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> textastærð"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Fleiri valkostir"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Græn litblinda"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Rauð litblinda"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Blágul litblinda"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grátónar"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rauðgræn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rauðgræn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blágul"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Takmörkun á notkun í bakgrunni"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Leyfa forriti að keyra í bakgrunni"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Forrit má ekki keyra í bakgrunni"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Ekki er hægt að takmarka notkun í bakgrunni"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Ekki er hægt að takmarka notkun í bakgrunni"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Viltu takmarka bakgrunnsvirkni?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ef þú takmarkar bakgrunnsvirkni forrits gæti það látið illa"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Forrit notar ekki fínstillingu á rafhlöðu og því er ekki hægt að takmarka það.\n\nKveiktu á fínstillingu til að takmarka."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Spjaldtölva notuð meira en venjulega"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Tæki notað meira en venjulega"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Rafhlaðan gæti tæmst fyrr en venjulega"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Fínstillir fyrir rafhlöðuendingu"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Rafhlaða takmörkuð tímabundið. Ýttu til að fá frekari upplýsingar."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Síminn hefur verið notaður meira en venjulega. Rafhlaðan gæti tæmst fyrr en ella.\n\nForrit með mestu rafhlöðunotkunina:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Spjaldtölvan hefur verið notuð meira en venjulega. Rafhlaðan gæti tæmst fyrr en ella.\n\nForrit með mestu rafhlöðunotkunina:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Tækið hefur verið notað meira en venjulega. Rafhlaðan gæti tæmst fyrr en ella.\n\nForrit með mestu rafhlöðunotkunina:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">%1$d forrit takmörkuð</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Vandamál við að lesa stöðu rafhlöðu"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Vandamál við að lesa stöðu rafhlöðu. Ýttu til að "<annotation id="url">"fá frekari upplýsingar"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Stöðva forritið?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Síminn getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP">%1$s</xliff:g> heldur símanum vakandi.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Spjaldtölvan getur ekki stjórnað rafhlöðunni venjulega þar sem <xliff:g id="APP">%1$s</xliff:g> heldur spjaldtölvunni vakandi.\n\nTil að reyna að lagfæra vandamálið geturðu stöðvað forritið.\n\nEf þetta gerist í sífellu gætirðu þurft að fjarlægja forritið til að bæta afköst rafhlöðunnar."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Stilla virknitíma"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Lengja endingartíma rafhlöðu"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Slökkva þegar tækið er hlaðið"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Slökkt er á rafhlöðusparnaði þegar hleðsla símans er <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Slökkt er á rafhlöðusparnaði þegar hleðsla spjaldtölvunnar er <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Slökkt er á rafhlöðusparnaði þegar hleðsla tækisins er <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Slökkt er á rafhlöðusparnaði þegar hleðsla símans er yfir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Slökkt er á rafhlöðusparnaði þegar hleðsla spjaldtölvunnar er yfir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Slökkt er á rafhlöðusparnaði þegar hleðsla tækisins er yfir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Kveikja"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Endurstilla"</string>
     <string name="tts_play" msgid="2945513377250757221">"Spila"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Sjálfstillandi tengigeta"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Eykur endingu rafhlöðunnar og bætir afköst tækisins með því að stjórna nettengingu sjálfkrafa"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Skilríkjageymsla"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Setja vottorð upp"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Setja upp vottorð úr geymslu"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Notandaskilríki"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Skoða og breyta vistuðum skilríkjum"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Ítarlegt"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Gerð geymslu"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Byggist á vélbúnaði"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Hugbúnaður eingöngu"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Skilríki eru ekki í boði fyrir þennan notanda"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Sett upp fyrir VPN og forrit"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Sett upp fyrir Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ekki setja upp"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Setja samt upp"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Vottorðið var ekki sett upp"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Leyfa <xliff:g id="APP_NAME">%s</xliff:g> að setja upp vottorð í þessu tæki?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Þessi vottorð munu auðkenna þig í forritunum og á vefslóðunum hér fyrir neðan"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Ekki leyfa"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Leyfa"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Sýna meira"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Vottorðastjórnunarforrit"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Ekkert"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Vottorð sem eru sett upp með þessu forriti auðkenna þig í forritunum og á vefslóðunum hér fyrir neðan"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Fjarlægja"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Neyðarhringimerki"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Velja hvað gerist þegar neyðarsímtal er hringt"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Öryggisafrit"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ekki uppsett – vinnusnið"</string>
     <string name="user_admin" msgid="4024553191395768119">"Stjórnandi"</string>
     <string name="user_you" msgid="3070562015202859996">"Þú (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Gælunafn"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Þú getur bætt við allt að <xliff:g id="USER_COUNT">%1$d</xliff:g> notendum"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Aðeins eigandi spjaldtölvunnar getur haft umsjón með notendum."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Aðeins eigandi símans getur haft umsjón með notendum."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Borgað við posann"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Settu upp greiðsluforrit. Þá þarftu bara að bera bakhlið símans upp að posa með snjallgreiðslumerki."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ég skil"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Meira..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Meira…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Velja sjálfgefið greiðsluforrit"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Uppfæra sjálfgefið greiðsluforrit"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Greiða í snertifríum posa með <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Til baka"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Áfram"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Ljúka"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Taka mynd"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Velja mynd"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Velja mynd"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kort"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kort"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Nota þetta alltaf fyrir símtöl"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Veldu SIM-kort fyrir gögn"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Veldu SIM fyrir SMS-skilaboð"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Skiptir um SIM-kort fyrir gögn, þetta kann að taka allt að mínútu..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Skiptir um SIM-kort fyrir gögn, þetta kann að taka allt að mínútu…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Hringja með"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Velja SIM-kort"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"venja, áætlun, rafhlöðusparnaður, orkusparnaður, rafhlaða, sjálfvirkt, prósent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, betri símtöl, 4g-símtöl"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"nýtt tungumál, bæta við tungumáli"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"textastærð"</string>
     <string name="default_sound" msgid="6604374495015245195">"Sjálfgefið hljóð"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Hljóðstyrkur símtala og tilkynninga í <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Hljóðstyrkur, titringur, ónáðið ekki"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ræsingarhljóð"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Skjátextar í rauntíma"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Setja sjálfkrafa skjátexta við efni"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ekkert"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> áætlun stillt</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> áætlanir stilltar</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Engin}=1{1 áætlun stillt}one{# áætlun stillt}other{# áætlanir stilltar}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ónáðið ekki"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Fáðu aðeins tilkynningar frá mikilvægum einstaklingum og forritum"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Takmarka truflanir"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Aðeins forgangur"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Kveikt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Slökkt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Slökkt"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Kveikt"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Spyrja í hvert skipti"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Þar til þú slekkur"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> klukkustund</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> klukkustundir</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> mín."</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> áætlun getur farið sjálfkrafa í gang</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> áætlanir geta farið sjálfkrafa í gang</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 klst.}one{# klukkustund}other{# klukkustundir}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 mínúta}one{# mínúta}other{# mínútur}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Slökkt}=1{Slökkt / 1 áætlun getur farið sjálfkrafa í gang}one{Slökkt / # áætlun getur farið sjálfkrafa í gang}other{Slökkt / # áætlanir geta farið sjálfkrafa í gang}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Hvað má trufla „Ónáðið ekki“"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Fólk"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Forrit"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Stilla tilkynningar með lægri forgangi sjálfkrafa á Lágstemmdar"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Breytilegt vægi tilkynninga"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Raða tilkynningum sjálfkrafa eftir vægi"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Breytilegar ábendingar um tilkynningar"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Gefa til kynna breytingar á tilkynningum og sýna valkostinn til að senda kerfinu ábendingar"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Endurstilla forgang tilkynninga"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Endurstilla forgangsröðun notanda og leyfa tilkynningahjálpara að forgangsraða"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Tillögur að aðgerðum og svörum"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Sýna sjálfkrafa tillögur að aðgerðum og svörum"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Sýna nýlegar og frestaðar tilkynningar"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Forgangssamtöl"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Sýna yfir samtalshluta og birta í fljótandi blöðru"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Birtast efst í samtalshluta"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Önnur samtöl"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Samtöl sem eru ekki í forgangi"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Samtöl sem þú hefur gert breytingar á"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Nýleg samtöl"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Hreinsa nýlegt"</string>
+    <string name="clear" msgid="5092178335409471100">"Hreinsa"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Forgangssamtöl í blöðrum"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Forgangssamtöl birtast efst á tilkynningasvæðinu. Þú getur einnig stillt þau á að birtast í blöðru og trufla þannig „Ónáðið ekki“."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Forgangssamtöl og breytt samtöl birtast hér"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"„Ónáðið ekki“ aðgangur"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Leyfa aðgang að „Ónáðið ekki“"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Engin uppsett forrit hafa óskað eftir „Ónáðið ekki“ aðgangi"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Hleður forrit..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Hleður forrit…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android kemur í veg fyrir að tilkynningar þessa forrits birtist í þessu tæki, samkvæmt beiðni frá þér"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android kemur í veg fyrir að þessi tilkynningaflokkur birtist í þessu tæki, samkvæmt beiðni frá þér"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android kemur í veg fyrir að þessi tilkynningahópur birtist í þessu tæki, samkvæmt beiðni frá þér"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Öll samtöl"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Forgangssamtöl"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Engin"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> samtal</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> samtöl</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Engin"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Engin}=1{1 samtal}one{# samtal}other{# samtöl}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Hver má trufla"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Símtöl"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Símtöl"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Til að tryggja að það heyrist í leyfðum símtölum skaltu athuga hvort tækið sé stillt á að hringja"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Lokað er fyrir móttekin símtöl fyrir „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Hægt er að breyta stillingum til að leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Stjörnumerktir tengiliðir"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> í viðbót</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> í viðbót</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Engir"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Engin}=1{{contact_1}}=2{{contact_1} og {contact_2}}=3{{contact_1}, {contact_2} og {contact_3}}one{{contact_1}, {contact_2} og # í viðbót}other{{contact_1}, {contact_2} og # í viðbót}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Nafn vantar)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Skilaboð"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"skilaboð"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Skilaboð"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Lokað er fyrir móttekin skilaboð fyrir „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Hægt er að breyta stillingum til að leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Þú færð öll skilaboð"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Þú færð öll símtöl"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Engir"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> tengiliður</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> tengiliðir</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Engin}=1{1 tengiliður}one{# tengiliður}other{# tengiliðir}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Hver sem er"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Tengiliðir"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Stjörnumerktir tengiliðir"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Allar tilkynningar"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Sumar tilkynningar"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Valið fólk getur áfram náð í þig jafnvel þótt þú leyfir ekki forritum að trufla"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> má trufla</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> mega trufla</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> í viðbót"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Engin forrit mega trufla}=1{{app_1} má trufla}=2{{app_1} og {app_2} mega trufla}=3{{app_1}, {app_2}, og {app_3} mega trufla}one{{app_1}, {app_2}, og # til viðbótar mega trufla}other{{app_1}, {app_2}, og # til viðbótar mega trufla}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Forrit"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Allar tilkynningar"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Sumar tilkynningar"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Tilkynningar sem mega trufla"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Leyfa allar tilkynningar"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mega trufla</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mega trufla</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ekkert má trufla"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> í viðbót"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ekkert má trufla}=1{{sound_category_1} má trufla}=2{{sound_category_1} og {sound_category_2} mega trufla}=3{{sound_category_1}, {sound_category_2} og {sound_category_3} mega trufla}one{{sound_category_1}, {sound_category_2}, og # til viðbótar mega trufla}other{{sound_category_1}, {sound_category_2}, og # til viðbótar mega trufla}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ekkert má trufla"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Enginn má trufla"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Sumt fólk má trufla"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Allt fólk má trufla"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Kveikt"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Slökkt"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Forritsfesting"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Forritsfesting gerir þér kleift að láta núverandi forrit vera sýnilegt á skjánum þar til þú losar það. Þú getur til dæmis notað þennan eiginleika til að leyfa vini að spila ákveðinn leik. \n\nÞegar forrit er fest getur festa forritið opnað önnur forrit og persónuupplýsingar gætu verið aðgengilegar. \n\nTil að nota forritsfestingu: 	\n1.	Kveiktu á forritsfestingu 	\n2.	Opnaðu Yfirlit 	\n3.	Ýttu á forritstáknið efst á skjánum og ýttu svo á Festa"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Forritsfesting gerir þér kleift að láta núverandi forrit vera sýnilegt á skjánum þar til þú losar það. Þú getur til dæmis notað þennan eiginleika til að leyfa vini að spila ákveðinn leik. \n\nÞegar forrit er fest getur festa forritið opnað önnur forrit og persónuupplýsingar gætu verið aðgengilegar. \n\nEf þú vilt deila tækinu þínu með einhverjum á öruggan hátt skaltu prófa að nota gestanotanda. \n\nTil að nota forritsfestingu: 	\n1.	Kveiktu á forritsfestingu 	\n2.	Opnaðu Yfirlit 	\n3.	Ýttu á forritstáknið efst á skjánum og ýttu svo á Festa"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Forritsfesting gerir þér kleift að birta núverandi forrit á skjánum þar til þú losar það. Þú getur til dæmis notað þennan eiginleika til að leyfa vini að spila ákveðinn leik."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Þegar forrit er fest getur það opnað önnur forrit og persónuupplýsingar gætu verið aðgengilegar. \n\nTil að nota forritsfestingu: 	\n1.	Kveiktu á forritsfestingu 	\n2.	Opnaðu Yfirlit 	\n3.	Ýttu á forritstáknið efst á skjánum og ýttu svo á Festa"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Þegar forrit er fest getur það opnað önnur forrit og persónuupplýsingar gætu verið aðgengilegar. \n\nEf þú vilt deila tækinu þínu með einhverjum á öruggan hátt skaltu prófa að nota gestanotanda frekar. \n\nTil að nota forritsfestingu: 	\n1.	Kveiktu á forritsfestingu 	\n2.	Opnaðu Yfirlit 	\n3.	Ýttu á forritstáknið efst á skjánum og ýttu svo á Festa"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Þegar forrit er fest: \n\n•		Geta persónuupplýsingar verið aðgengilegar \n		(til dæmis tengiliðir og innihald tölvupósts) \n•	 Getur fest forrit opnað önnur forrit \n\nNotaðu aðeins forritsfestingu með fólki sem þú treystir."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Biðja um opnunarmynstur til að losa"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Biðja um PIN-númer til að losa"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Til viðbótar við að nota andlitið til að opna tækið geturðu aukið vernd tækisins með því að krefjast PIN-númers áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig.\n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast PIN-númers til að ræsa tækið þitt?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Til viðbótar við að nota andlitið til að opna tækið geturðu aukið vernd tækisins með því að krefjast mynsturs áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig.\n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast mynsturs til að ræsa tækið þitt?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Auk þess að nota andlitið til að taka tækið úr lás geturðu aukið vernd tækisins með því að krefjast aðgangsorðsins áður en það kveikir á sér. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, þar til það hefur kveikt á sér.\n\nÞetta bætir gagnavernd á tækjum sem hafa týnst eða þeim verið stolið. Krefjast aðgangsorðs til að ræsa tækið?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Auk þess að nota lífkenni til að taka tækið úr lás geturðu aukið vernd tækisins með því að krefjast PIN-númersins áður en það kveikir á sér. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd tækja sem glatast eða er stolið. Viltu krefjast PIN-númers til að ræsa tækið þitt?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Auk þess að nota lífkenni til að taka tækið úr lás geturðu aukið vernd tækisins með því að krefjast mynstursins áður en það kveikir á sér. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd tækja sem glatast eða er stolið. Viltu krefjast mynsturs til að ræsa tækið þitt?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Auk þess að nota lífkenni til að taka tækið úr lás geturðu aukið vernd tækisins með því að krefjast aðgangsorðsins áður en það kveikir á sér. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd tækja sem glatast eða er stolið. Viltu krefjast aðgangsorðs til að ræsa tækið þitt?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Já"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nei"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Takmarkað"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB stjórnað af"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Tengdu tæki"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Þessu tæki"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Skiptir..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Skiptir…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Ekki tókst að skipta"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Hleður þetta tæki"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Hlaða tengt tæki"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Notkun farsímagagna"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Gagnanotkun forrits"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi gagnanotkun"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Gagnanotkun utan símafyrirtækis"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet-gagnanotkun"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> takmarkanir</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Gögn símafyrirtækisins kunna að vera önnur en tækið sýnir"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Tekur ekki með gögn sem eru notuð af netkerfum símafyrirtækja"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> notuð"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Stilla gagnaviðvörun"</string>
     <string name="data_warning" msgid="2925054658166062884">"Gagnaviðvörun"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Skoða upplýsingar"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Gagnasparnaður"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Engin takmörkun á gögnum"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Slökkt er á bakgrunnsgögnum"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Slökkt er á bakgrunnsgögnum"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Kveikt"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Slökkt"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Nota gagnasparnað"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ekki leyfa að svör eða annar texti sé sleginn inn í tilkynningar þegar tækið er læst"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Sjálfgefin ritvilluleit"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Veldu ritvilluleit"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Nota ritvilluleit"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Nota ritvilluleit"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ekki valið"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ekkert)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Geymslustjórnun fjarlægir afritaðar myndir og myndskeið úr tækinu þínu til að losa um geymslupláss."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fjarlægja myndir og myndskeið"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Geymslustjórnun"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Nota geymslustjórnun"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Nota geymslustjórnun"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Sjálfvirkt"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Handbók"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Losa geymslupláss núna"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Ýta tvisvar til að skoða"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Ýta tvisvar til að athuga spjaldtölvu"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Ýta tvisvar til að athuga tæki"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Strjúktu til að sjá tilk."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Strjúktu niður á neðri hluta skjásins til að birta tilkynningarnar þínar"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Einhent stilling"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Nota einhenta stillingu"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Lokað þegar skipt er um forrit"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tímamörk"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekúndur"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekúndur"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekúndur"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"seiling"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Til að sjá hvað klukkan er og sjá tilkynningar og aðrar upplýsingar skaltu ýta tvisvar á skjáinn."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Taka upp til að skoða"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Taka upp til að athuga spjaldtölvu"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Ýttu til að athuga spjaldtölvu"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ýttu til að athuga tæki"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Til að sjá hvað klukkan er og sjá tilkynningar og aðrar upplýsingar skaltu ýta á skjáinn."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Neyðartilkynning"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Nota neyðartilkynningu"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Stýrt af <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Ræstu aðgerðirnar hér fyrir neðan með því að ýta hratt á aflrofann 5 sinnum eða oftar"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Spila niðurtalningarviðvörun"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Spila hátt hljóð áður en hjálparbeiðni er send"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Hringja á hjálp"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Símanúmer til að hringja á hjálp"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Ýttu til að breyta"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Ef þú slærð inn númer sem er ekki neyðarnúmer:\n • Tækið þitt verður að vera ólæst til að nota neyðartilkynningar\n • Ekki er víst að símtalinu þínu verði svarað"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Fingrafar til að opna tilkynningar"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Lesa fingrafar"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Strjúktu niður á fingrafaraskynjaranum aftan á símanum til að skoða tilkynningarnar."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Hámark sýnilegra gagnasafna"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Endurstilla á sjálfgildi"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Forritunarkostir sjálfvirkrar endurstillingar hafa verið endurstilltir"</string>
+    <string name="location_category" msgid="3496759112306219062">"Staðsetning"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Staðsetningarvísir stöðustiku"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Birta fyrir allar staðsetningar, þ. á m. netkerfi og tengigetu"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Full GNSS-mæling"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Rekja öll GNSS söfn og tíðnir með engum vinnulotum"</string>
     <string name="device_theme" msgid="5027604586494772471">"Þema tækisins"</string>
     <string name="default_theme" msgid="4815428567082263639">"Sjálfgefið"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Heiti nets"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Gera hlé á tilkynningum svo þær trufli ekki"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Eiginleikinn er ekki í boði"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Slökkt hefur verið á þessum eiginleika því hann hægir á símanum"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Full GNSS-mæling"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Rekja öll GNSS söfn og tíðnir með engum vinnulotum"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Sýna alltaf hrunglugga"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Sýna glugga í hvert sinn sem forrit hrynur"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Velja forrit sem styður ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Kveikja fyrir öll forrit"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Velja myndvinnslurekil"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Sjálfgefið"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Leikjarekill"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Leikjarekill"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Rekill þróunaraðila"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Myndvinnslurekill kerfis"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Kveikt (þaggað)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Slökkt"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Upplýsingar um net"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Heiti tækisins þíns er sýnilegt forritum í símanum. Heiti þess er hugsanlega einnig sýnilegt öðru fólki þegar þú tengist Bluetooth-tækjum eða setur upp heitan Wi-Fi reit."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Heiti tækisins þíns er sýnilegt forritum í símanum. Heiti þess er hugsanlega einnig sýnilegt öðru fólki þegar þú tengist Bluetooth-tækjum, Wi-Fi neti eða setur upp heitan Wi-Fi reit."</string>
     <string name="devices_title" msgid="649715719278562515">"Tæki"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Allar stillingar"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Tillögur"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Ekkert símkerfi fannst. Reyndu aftur."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(bannað)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Ekkert SIM-kort"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ekkert SIM-kort"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ekkert"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM-kort er nauðsynlegt til að tengjast"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM-kort er nauðsynlegt til að tengjast"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Valin símkerfisstilling: WCDMA fyrsta val"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Valin símkerfisstilling: GSM eingöngu"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Valin símkerfisstilling: WCDMA eingöngu"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Farsímagögn"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Aðgangur að gögnum um farsímakerfi"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Síminn skiptir sjálfkrafa yfir í þetta símafyrirtæki þegar samband næst"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ekkert SIM-kort til staðar"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Símtalastilling"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-kjörstilling"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Spyrja í hvert skipti"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ekki í boði þegar tenging við <xliff:g id="CARRIER">%1$s</xliff:g> er til staðar"</string>
     <string name="see_more" msgid="7499355691042812723">"Sjá meira"</string>
     <string name="see_less" msgid="2642392725363552793">"Sjá minna"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Viltu kveikja á <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Kveikja á SIM-korti?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Skipta yfir í <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Viltu skipta yfir í að nota SIM-kort?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Aðeins eitt SIM-kort getur verið virkt í einu.\n\nÞótt þú skiptir yfir í <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> verður þjónustunni hjá <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ekki sagt upp."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Aðeins eitt sótt SIM-kort getur verið virkt í einu.\n\nÞótt þú skiptir yfir í <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> verður þjónustunni hjá <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ekki sagt upp."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Aðeins eitt SIM-kort getur verið virkt í einu.\n\nÞótt þú skiptir verður þjónustunni hjá <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ekki sagt upp."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Skipta yfir í <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Tengist farsímakerfi…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Skiptir yfir í <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Ekki hægt að skipta um símafyrirtæki"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Ekki er hægt að skipta um símafyrirtæki sökum villu."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Viltu slökkva á <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Slökkva á SIM-korti?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Slekkur á SIM-korti<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Ekki er hægt að gera símafyrirtæki óvirkt"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Eitthvað fór úrskeiðis og ekki var hægt að gera símafyrirtækið óvirkt."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Viltu nota 2 SIM-kort?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Þetta tæki getur verið með tvö SIM-kort virk í einu. Ýttu á „Nei takk“ til að halda áfram að nota aðeins eitt SIM-kort."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Endurræsa tæki?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Endurræstu tækið til að hefjast handa. Að því loknu geturðu bætt öðru SIM-korti við."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Áfram"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Endurræsa"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nei, takk"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Skipta"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Ekki er hægt að virkja SIM-kort"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Fjarlægðu SIM-kortið og settu það inn aftur. Ef vandamálið leysist ekki skaltu endurræsa tækið."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prófaðu að kveikja aftur á SIM-kortinu. Ef vandamálið leysist ekki skaltu endurræsa tækið."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Virkjun símkerfis"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> er virkt"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Ýttu til að uppfæra stillingar SIM-korts"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-kort"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Viltu eyða þessu sótta SIM-korti?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Ef þessu SIM-korti er eytt verður þjónusta <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> fjarlægð úr þessu tæki.\n\nÞjónustu <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> verður ekki sagt upp."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Eyða"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Eyðir SIM-korti…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Ekki er hægt að eyða SIM-korti"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Ekki er hægt að eyða þessu SIM-korti vegna villu.\n\nEndurræstu tækið og reyndu aftur."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Tengjast tæki"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Forritið <xliff:g id="APPNAME">%1$s</xliff:g> vill nota tímabundið Wi‑Fi net til að tengjast við tækið þitt"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Engin tæki fundust. Gakktu úr skugga um að kveikt sé á tækjunum og að hægt sé að tengjast við þau."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Neyðarsímtöl"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Símafyrirtækið þitt styður ekki neyðarsímtöl í gegnum Wi-Fi.\nTækið skiptir sjálfkrafa yfir í farsímakerfi til að hringja neyðarsímtal.\nAðeins er hægt að hringja neyðarsímtöl á svæðum sem eru með farsímasamband."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Notaðu Wi-Fi fyrir símtöl til að bæta gæðin"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Símtöl – skipt á milli SIM-korta"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Veita öðru SIM-korti forgang á símtöl og SMS umfram þetta SIM-kort."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"símtöl – skipt á milli sim-korta"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"MMS-skilaboð bárust"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Ekki er hægt að senda MMS-skilaboð"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Ýttu til að leyfa MMS-skilaboð hjá <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> þegar slökkt er á farsímagögnum"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Leyfa yfirlögn yfir stillingar"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Leyfa forrit sem geta birst yfir öðrum forritum að leggjast yfir stillingaskjái"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Margmiðlunarefni"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Fela spilara þegar efnislotunni lýkur"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Spilarinn gerir þér kleift að halda lotu áfram á stækkaða flýtistillingasvæðinu."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Efnisspilari í flýtistillingum"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Sýna efnisspilara í langan tíma til að halda spilun auðveldlega áfram"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Fela spilara"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Sýna spilara"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Engir spilarar tiltækir"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Leyfð forrit"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"margmiðlunarefni"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Kveikt verður á Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Kveikt"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Slökkt"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Örugg flugnetkerfi"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Finna og tengjast öruggum flugnetkerfum"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"flugnetkerfi, öruggt flugnet"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Símtöl og SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi símtöl"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Hringja og svara símtölum utan farsímakerfis, t.d. á Wi-Fi neti"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Með Wi-Fi símtölum geturðu hringt og svarað símtölum utan farsímakerfis, t.d. á sumum Wi-Fi netum."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Símtöl"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"í forgangi"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"símtöl í forgangi"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS í forgangi"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ekki tiltækt"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ekkert SIM-kort"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Kjörstillingar"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Tengjast opnum netum"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"nettenging, internetið, þráðlaust, gögn, wifi, wi-fi, wi fi, farsímakerfi, farsími, símafyrirtæki, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Skoða netkerfi sem eru örugg fyrir flug"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Slökkva á flugstillingu"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ekki í boði vegna þess að kveikt er á háttatímastillingu"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Endurstilling forgangs tilkynninga tókst."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Forrit"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ótraust tæki vill fá aðgang að skilaboðunum þínum. Ýttu til að fá frekari upplýsingar."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Leyfa aðgang að skilaboðum?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Ótraust Bluetooth-tæki, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vill fá aðgang að skilaboðunum þínum.\n\nÞú hefur ekki tengst [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] áður."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ótraust tæki vill fá aðgang að tengiliðunum þínum og símtalaskránni. Ýttu til að fá frekari upplýsingar."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Leyfa aðgang að tengiliðum og símtalaskrá?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Ótraust Bluetooth-tæki, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vill fá aðgang að tengiliðum þínum og símtalaskrá. Þetta felur í sér gögn um móttekin og hringd símtöl.\n\nÞú hefur ekki tengst [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] áður."</string>
 </resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 5a9f87f..64150e8 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medio"</item>
     <item msgid="6740026006576843477">"Lungo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Breve"</item>
+    <item msgid="7397961711906421599">"Medio"</item>
+    <item msgid="4079132024502041928">"Lungo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predefinito"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globale"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Solo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globale"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4a81519..5e08e69 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Data e ora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Imposta data e ora"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Imposta data, ora, fuso orario e formati"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Usa l\'ora fornita dalla rete"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Usa il fuso orario fornito dalla rete"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Imposta automaticamente l\'orario"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Imposta automaticamente il fuso orario"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usa impostazioni internazionali predefinite"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Formato 24 ore"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Usa formato 24 ore"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostra info profilo in schermata di blocco"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Account"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Geolocalizzazione"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usa geolocalizzazione"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usa posizione"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">On - <xliff:g id="COUNT_1">%1$d</xliff:g> app hanno accesso alla posizione</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Blocco schermo, Sblocco con il volto"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Blocco schermo, impronta"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Blocco schermo"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Sblocca il telefono in sicurezza con il volto e l\'impronta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Puoi anche accedere alle app e confermare pagamenti"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configura lo sblocco con:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Sblocco con il volto"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Sblocca il telefono con facilità"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Impronta"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Sblocca il telefono in tasca"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Salta"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Avanti"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Volto aggiunto"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Imposta Sblocco con il volto"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Sblocco con il volto"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Usa il tuo volto per l\'autenticazione"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Inizia"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Se la funzionalità Sblocco con il volto (accessibilità) non è attiva, alcuni passaggi della configurazione potrebbero non funzionare correttamente con TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Indietro"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continua configurazione"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Usa configurazione accessibilità"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Chiedi sempre conferma se viene usato Sblocco con il volto nelle app"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Elimina dati volto"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Imposta Sblocco con il volto"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Usa la funzionalità Sblocco con il volto per sbloccare il dispositivo, accedere alle app e confermare pagamenti.\n\nTieni presente che:\nSe guardi direttamente il telefono, potresti sbloccarlo anche senza volerlo.\n\nIl tuo telefono può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso.\n\nIl tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un gemello."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Usa la funzionalità Sblocco con il volto per sbloccare il dispositivo, accedere alle app e confermare pagamenti.\n\nTieni presente che:\nSe guardi il telefono puoi sbloccarlo anche quando non hai intenzione di farlo.\n\nIl tuo telefono può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso, anche se hai gli occhi chiusi.\n\nIl tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un fratello gemello."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Usa lo sblocco con il volto per sbloccare il tuo dispositivo, accedere alle app e confermare i pagamenti."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Tieni presente che:\nSe guardi direttamente il telefono, potresti sbloccarlo anche senza volerlo.\n\nIl tuo telefono può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso.\n\nIl tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un gemello."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Tieni presente che:\nSe guardi direttamente il telefono, potresti sbloccarlo anche senza volerlo.\n\nIl tuo telefono può essere sbloccato da un\'altra persona se viene rivolto verso il tuo viso, anche se hai gli occhi chiusi.\n\nIl tuo telefono può essere sbloccato da qualcuno che ti assomiglia molto, ad esempio un gemello."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Eliminare i dati del volto?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"I dati del viso usati da Sblocco con il volto verranno eliminati in modo definitivo e sicuro. Dopo la rimozione, ti servirà il PIN, la sequenza o la password per sbloccare il telefono, accedere alle app e confermare i pagamenti."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Usa la funzionalità Sblocco con il volto per sbloccare il tuo telefono"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilizza la tua impronta per sbloccare il telefono o approvare un acquisto.\n\nNota: non puoi utilizzare la tua impronta per sbloccare questo dispositivo. Per ulteriori informazioni, contatta l\'amministratore dell\'organizzazione."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilizza la tua impronta per sbloccare il telefono o approvare un acquisto.\n\nNota: la tua impronta potrebbe essere meno sicura di una sequenza o un codice PIN complessi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annulla"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"No grazie"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ignora"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Avanti"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Se proteggi il tablet con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare Sblocco con il volto. Per tornare indietro, tocca Annulla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Se proteggi il dispositivo con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare Sblocco con il volto. Per tornare indietro, tocca Annulla."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Se proteggi il telefono con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Occorre un\'opzione di blocco schermo anche per impostare Sblocco con il volto. Per tornare indietro, tocca Annulla."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Se proteggi il tablet con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Un\'opzione di blocco schermo è necessaria anche per configurare la biometria. Per tornare indietro, tocca Annulla."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Se proteggi il dispositivo con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Un\'opzione di blocco schermo è necessaria anche per configurare la biometria. Per tornare indietro, tocca Annulla."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Se proteggi il telefono con un\'opzione di blocco schermo, nessuno potrà utilizzarlo in caso di smarrimento o furto. Un\'opzione di blocco schermo è necessaria anche per configurare la biometria. Per tornare indietro, tocca Annulla."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Saltare l\'impostazione del PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Saltare l\'impostazione della password?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Saltare l\'impostazione della sequenza?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Impedisci ad altri di utilizzare il tablet senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Impedisci ad altri di utilizzare il dispositivo senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Impedisci ad altri di utilizzare il telefono senza la tua autorizzazione attivando le funzioni di protezione del dispositivo. Scegli il blocco schermo che desideri utilizzare."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Scegli il metodo di backup per il blocco dello schermo"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Scegli il metodo di blocco schermo alternativo"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Scegli il metodo di blocco schermo alternativo"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opzioni di blocco schermo"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opzioni di blocco schermo"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Blocco schermo"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Sblocco con il volto + password"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continua senza Sblocco con il volto"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Puoi sbloccare il telefono usando il tuo volto. Per motivi di sicurezza, questa opzione richiede un blocco schermo alternativo."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria e sequenza"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria e PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria e password"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continua senza biometria"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Puoi sbloccare il telefono usando la biometria. Per motivi di sicurezza, questa opzione richiede un blocco schermo alternativo."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Disattivata da amministratore, norma crittografia o archivio credenziali"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nessuno"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Scorrimento"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Deve contenere meno di <xliff:g id="NUMBER_0">%d</xliff:g> cifra</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"L\'amministratore del dispositivo non consente l\'utilizzo di un PIN recente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"I PIN comuni sono stati bloccati dall\'amministratore IT. Prova a usare un altro PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Non può contenere un carattere non valido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Deve contenere almeno una lettera"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Deve contenere almeno una cifra"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Deve contenere almeno 1 carattere non numerico</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"L\'amministratore del dispositivo non consente l\'utilizzo di una password recente."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Le password comuni sono state bloccate dall\'amministratore IT. Prova a usare un\'altra password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Non sono consentite sequenze di cifre in ordine ascendente o discendente oppure ripetute"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Conferma"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Annulla"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Attiva Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utilizza Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utilizza Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Impostazioni Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configura e gestisci punti di accesso wireless"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Inquadra il codice QR nel riquadro sottostante per connetterti alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Connettiti alla rete Wi‑Fi eseguendo la scansione di un codice QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Condividi Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Esegui la scansione di questo codice QR per connetterti alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\" e condividere la password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scansiona questo codice QR con un altro dispositivo per collegarti alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Esegui la scansione di questo codice QR per connetterti alla rete \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Riprova. Se il problema persiste, contatta il produttore del dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Si è verificato un problema"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Password Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Password hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Connessione automatica"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Consenti la connessione automatica del telefono nei pressi di questa rete"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Consenti la connessione automatica del tablet nei pressi di questa rete"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Consenti la connessione a questa rete quando è disponibile"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Aggiungi dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Usa un codice QR per aggiungere un dispositivo a questa rete"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Il formato del codice QR non è valido"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utilizza certificati di sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Non fornire"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Non convalidare"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nessun certificato specificato. La connessione non sarà privata."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Il nome della rete è troppo lungo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Specifica un dominio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificato obbligatorio."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Connetti"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi attivato"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Connessione alla rete <xliff:g id="NETWORK_NAME">%1$s</xliff:g> stabilita"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Connessione a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Connessione…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Impossibile connettersi alla rete"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rete fuori portata"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Indirizzo MAC del dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Indirizzo MAC casuale"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Indirizzo MAC casuale (ultimo usato)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Indirizzo IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Dettagli rete"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Indirizzi IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Reti salvate"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Iscrizioni"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Altre reti"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Impostazioni IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Le impostazioni Wi‑Fi avanzate non sono disponibili per questo utente"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Salva"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Digita l\'indirizzo di un gateway valido."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Digita un indirizzo DNS valido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Digita un prefisso di rete di 0-32 caratteri."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a meno che venga sostituito da DNS privato)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a meno che venga sostituito da DNS privato)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lunghezza prefisso rete"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"L\'app sta condividendo contenuti. Per condividere la connessione Internet, disattiva e riattiva l\'hotspot"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nessuna password impostata"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nome hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Attivazione di <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Attivazione di <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Gli altri dispositivi possono collegarsi a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Password hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda AP"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Display fluido"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automaticamente la frequenza di aggiornamento da 60 a 90 Hz per alcuni contenuti. Aumenta l\'utilizzo della batteria."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Display fluido"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forza frequenza di aggiornamento a 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Massima frequenza di aggiornamento per migliore reattività al tocco e qualità dell\'animazione. Aumenta il consumo della batteria."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Schermo vigile"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"On/Lo schermo non si spegne se lo stai guardando"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Quando lo schermo è scuro, si attiva per le nuove notifiche"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostra sempre ora e informazioni"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Maggiore utilizzo della batteria"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Testo in grassetto"</string>
     <string name="title_font_size" msgid="570613010306330622">"Dimensioni carattere"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Ingrandisci o riduci il testo"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Impostazioni blocco SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versione di Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Aggiornamento della sicurezza Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modello"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modello: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modello e hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versione hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID attrezzatura"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Elimina APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nuovo APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Salva"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Ignora"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Annulla"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Il campo Nome non può essere vuoto."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Il campo APN non può essere vuoto."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Le app possono essere reimpostate"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Reimposta Wi-Fi, dati mobili e Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Verranno reimpostate tutte le impostazioni di rete, tra cui:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dati mobili"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Resetta"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Cancella SIM scaricate"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Per scaricare le SIM sostitutive, contatta il tuo operatore. Ciò non annullerà alcun piano di servizio mobile."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Gli eventuali piani di servizio mobile non verranno annullati. Per scaricare SIM sostitutive, contatta il tuo operatore."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Reimposta"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Ripristinare tutte le impostazioni della rete? Questa azione non può essere annullata."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Reimpostare tutte le impostazioni di rete e resettare tutte le SIM scaricate? Questa azione non può essere annullata."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Le impostazioni di rete sono state reimpostate"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Impossibile resettare le SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Le SIM scaricate non possono essere resettate a causa di un errore.\n\nRiavvia il dispositivo e riprova."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Cancella tutti i dati (ripristino dati fabbrica)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Cancella tutti i dati"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tutti i dati saranno cancellati dalla "<b>"memoria interna"</b>" del tablet, inclusi:\n\n"<li>"Il tuo Account Google"</li>\n<li>"I dati e le impostazioni del sistema e delle app"</li>\n<li>"Le app scaricate"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tutti i dati saranno cancellati dalla "<b>"memoria interna"</b>" del telefono, inclusi:\n\n"<li>"Il tuo Account Google"</li>\n<li>"Le impostazioni e i dati di sistema e delle app"</li>\n<li>"Le app scaricate"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Al momento hai eseguito l\'accesso ai seguenti account:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Sono presenti altri utenti su questo dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Il tuo piano di servizio dati mobile non verrà annullato."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Per cancellare musica, foto e altri dati dell\'utente, è necessario cancellare i dati della "<b>"scheda SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Cancella tutti i dati (ripristino dei dati di fabbrica)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Cancella tutti i dati"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Verranno cancellati tutti i dati dalla "<b>"memoria interna"</b>" del tablet, inclusi:\n\n"<li>"Il tuo Account Google"</li>\n<li>"Le impostazioni e i dati di sistema e delle app"</li>\n<li>"Le app scaricate"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Verranno cancellati tutti i dati dalla "<b>"memoria interna"</b>" del telefono, inclusi:\n\n"<li>"Il tuo Account Google"</li>\n<li>"Le impostazioni e i dati di sistema e delle app"</li>\n<li>"Le app scaricate"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Hai eseguito l\'accesso ai seguenti account:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Sono presenti altri utenti su questo dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musica"</li>\n<li>"Foto"</li>\n<li>"Altri dati utente"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Il tuo piano di servizio dati mobile non verrà annullato."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Per cancellare musica, foto e altri dati utente, è necessario cancellare i dati dell\'"<b>"archivio USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Per cancellare musica, foto e altri dati utente, è necessario cancellare i dati della "<b>"scheda SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Cancella archivio USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Cancella scheda SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Cancella tutti i dati nell\'archivio USB interno, come musica o foto"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Cancella tutti i dati sulla scheda SD, come musica o foto"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Cancella tutti i dati"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Cancella tutti i dati"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Tutte le tue informazioni personali e le app scaricate saranno eliminate. Questa azione non può essere annullata."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Tutte le tue informazioni personali, tra cui le app e le SIM scaricate, saranno eliminate. Questa azione non può essere annullata."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Cancella tutto"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nessun ripristino eseguito perché il servizio System Clear non è disponibile."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Cancellare tutti i dati?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Il ripristino dati di fabbrica non è consentito per questo utente"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Cancellazione in corso"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Attendere prego…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Cancella tutti i dati"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Cancella tutti i dati"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Tutte le tue informazioni personali e le app scaricate saranno eliminate. Questa azione non può essere annullata."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Tutte le tue informazioni personali, tra cui le app e le SIM scaricate, saranno eliminate. Questa azione non può essere annullata."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vuoi cancellare tutti i dati?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Il ripristino dei dati di fabbrica non è disponibile per questo utente"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Cancellazione…"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Attendi…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Impostazioni chiamate"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Imposta segreteria, deviazione chiamate, avviso di chiamata, ID chiamante"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Tethering impossibile con più di <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivi."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Sarà annullato il tethering per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Tethering Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Condividi la connessione a Internet del telefono tramite Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Condividi la connessione a Internet del telefono tramite Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utilizza hotspot e tethering per consentire ad altri dispositivi di accedere a Internet tramite la tua connessione dati mobili. Le app possono, inoltre, creare un hotspot per condividere contenuti con i dispositivi vicini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilizza hotspot e tethering per consentire ad altri dispositivi di accedere a Internet usando la tua connessione Wi-Fi o dati mobili. Le app possono inoltre creare un hotspot per condividere contenuti con i dispositivi vicini."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Guida"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Scansione di dispositivi Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Consenti ad app e servizi di cercare dispositivi nelle vicinanze in qualsiasi momento, anche quando il Bluetooth non è attivo. Questa funzione è utile, ad esempio, per migliorare funzioni e servizi basati sulla posizione."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Location services for work"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Rilevamento del fuso orario in base alla posizione"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Rilevamento del fuso orario in base alla posizione"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Consenti l\'utilizzo della posizione di questo dispositivo per rilevare il fuso orario attuale. Altre impostazioni di geolocalizzazione, come la ricerca di reti Wi-Fi, possono influire sulla precisione del rilevamento del fuso orario."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"On"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Off"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Il rilevamento automatico del fuso orario è disattivato"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Il rilevamento del fuso orario in base alla posizione è disattivato"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Il rilevamento del fuso orario in base alla posizione non è supportato"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Non sono consentite modifiche relative al rilevamento del fuso orario in base alla posizione"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Posizione Wi‑Fi e rete mobile"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Consenti alle app di usare geolocalizzazione Google per stabilire la posizione. Saranno raccolti e inviati a Google dati anonimi."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Posizione determinata da Wi‑Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Scegli password per Sblocco con il volto"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Scegli sequenza per Sblocco con il volto"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Scegli PIN per Sblocco con il volto"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Per biometria: imposta password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Per biometria: imposta sequenza"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Per biometria: imposta PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Hai dimenticato la password?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Hai dimenticato la sequenza?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Hai dimenticato il PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferenze sottotitoli"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ingrandimento"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Area di ingrandimento"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Attivazione ingrandimento"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Scegli le aree di ingrandimento che vuoi usare quando ingrandisci lo schermo"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Schermo intero"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte dello schermo"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Schermo intero e parte dello schermo"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ingrandisci l\'intero schermo"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ingrandisci parte dello schermo"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vuoi passare al pulsante Accessibilità?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"L\'uso del triplo tocco per ingrandire parte dello schermo causa un ritardo della digitazione e di altre azioni.\n\nVuoi passare all\'uso del pulsante Accessibilità per ingrandire?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Passa a pulsante Accessibilità"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Continua a usare triplo tocco per ingrandire"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Impostazioni ingrandimento"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ingrandisci con triplo tocco"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ingrandisci con scorciatoia"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Chiudi chiamata con tasto accensione"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Puntatore del mouse grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Rimuovi le animazioni"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio in formato mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Unisci i canali durante la riproduzione dell\'audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Bilanciamento audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Sinistra"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Destra"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio in formato mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Unisci i canali durante la riproduzione dell\'audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Bilanciamento audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Sinistra"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Destra"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predefinito"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 secondi"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 secondi"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibrazione notifiche"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibrazione allo squillo"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback tattile"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Usa <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Apri <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usa correzione del colore"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostra sottotitoli"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Solo per app supportate"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Usa <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Apri <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usa correzione del colore"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostra sottotitoli"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Solo per app supportate"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Stile e dimensioni sottotitoli"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Dimensioni testo <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Altre opzioni"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Scala di grigi"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rosso-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rosso-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blu-giallo"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Limitazione in background"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Consenti l\'esecuzione in background dell\'app"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Esecuzione in background dell\'app non consentita"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"L\'utilizzo in background non può essere limitato"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"L\'utilizzo in background non può essere limitato"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitare l\'attività in background?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se limiti l\'attività in background per un\'app, tale app potrebbe funzionare in modo anomalo"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Per limitare l\'app,\n\ndevi prima attivare l\'ottimizzazione della batteria."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet utilizzato più del solito"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Dispositivo usato più del solito"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"La batteria potrebbe esaurirsi prima del solito"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Ottimizzazione per integrità batteria"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batteria momentaneamente limitata. Tocca per scoprire di più."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Hai utilizzato il telefono più del solito. La batteria potrebbe esaurirsi prima del previsto.\n\nApp con il maggior consumo di batteria:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Hai utilizzato il tablet più del solito. La batteria potrebbe esaurirsi prima del previsto.\n\nApp con il maggiore consumo di batteria:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Hai utilizzato il dispositivo più del solito. La batteria potrebbe esaurirsi prima del previsto.\n\nApp con il maggiore consumo di batteria:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d app con restrizioni</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problema durante la lettura dell\'indicatore di livello della batteria"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problema durante la lettura dell\'indicatore di livello della batteria. Tocca per avere "<annotation id="url">"ulteriori informazioni"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Arrestare l\'app?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Imposta una pianificazione"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolunga la durata della batteria"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Disattiva quando la batteria è carica"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Risparmio energetico si disattiva quando il livello di carica del telefono è <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Risparmio energetico si attiva quando il tablet è a un livello di carica pari a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Risparmio energetico si attiva quando il dispositivo è a un livello di carica pari a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Il risparmio energetico viene disattivato quando la carica del telefono è superiore al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Il risparmio energetico viene disattivato quando la carica del tablet è superiore al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Il risparmio energetico viene disattivato quando la carica del dispositivo è superiore al <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Attiva"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Reimposta"</string>
     <string name="tts_play" msgid="2945513377250757221">"Riproduci"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Connettività adattiva"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Prolunga la durata della batteria e migliora le prestazioni del dispositivo gestendo automaticamente le connessioni di rete"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Archivio credenziali"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installa un certificato"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installa certificati da archivio"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenziali utente"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Visualizza e modifica credenziali archiviate"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avanzate"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo di archivio"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Basato sull\'hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Solo software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Le credenziali non sono disponibili per questo utente"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installata per VPN e app"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installata per Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Non installare"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Installa comunque"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificato non installato"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Vuoi consentire all\'app <xliff:g id="APP_NAME">%s</xliff:g> di installare certificati su questo dispositivo?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Questi certificati consentiranno la tua identificazione per le app e gli URL indicati di seguito"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Non consentire"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Consenti"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Mostra altro"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App di gestione certificati"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Nessuna"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"I certificati installati da questa app consentono la tua identificazione per le app e gli URL indicati di seguito"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Rimuovi"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Segnale chiamata di emergenza"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Imposta il comportamento in caso di chiamata di emergenza"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Backup"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Non configurato - Profilo di lavoro"</string>
     <string name="user_admin" msgid="4024553191395768119">"Amministratore"</string>
     <string name="user_you" msgid="3070562015202859996">"Tu (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nickname"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Puoi aggiungere fino a <xliff:g id="USER_COUNT">%1$d</xliff:g> utenti"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Solo il proprietario del tablet può gestire gli utenti."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Solo il proprietario del telefono può gestire gli utenti."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pagamento al terminale"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configura un\'app per il pagamento e appoggia il retro del telefono su qualsiasi terminale con il simbolo del pagamento contactless."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Altro..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Altro…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Imposta app predefinita per i pagamenti"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Aggiorna l\'app predefinita per i pagamenti"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Se è disponibile un terminale contactless, paga con l\'app <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Indietro"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Avanti"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Fine"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Scatta una foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Scegli un\'immagine"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Seleziona foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Schede SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Schede SIM"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Usa sempre questa per chiamare"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Seleziona una SIM per i dati"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Seleziona una SIM per gli SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Passaggio a un\'altra SIM dati in corso. L\'operazione potrebbe richiedere un minuto."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Passaggio a un\'altra SIM dati. L\'operazione potrebbe richiedere un minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Chiama con"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Seleziona una scheda SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, programmazione, risparmio energetico, risparmiare batteria, batteria, automatico, percento"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, chiamate avanzate, chiamate 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"aggiungere lingua, aggiungere una lingua"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"dimensioni testo"</string>
     <string name="default_sound" msgid="6604374495015245195">"Suono predefinito"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume suoneria e notifiche: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibrazione, Non disturbare"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Attiva suoni"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Sottotitoli in tempo reale"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Sottotitoli automatici"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nessuna"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programmazioni impostate</item>
-      <item quantity="one">1 programmazione impostata</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nessuna}=1{1 programmazione impostata}other{# programmazioni impostate}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Non disturbare"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Ricevi soltanto le notifiche di app e persone importanti"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitare le interruzioni"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Solo con priorità"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"On/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Off/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"On"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Chiedi ogni volta"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Fino alla disattivazione"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ore</item>
-      <item quantity="one">1 ora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuti"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">Possono essere attivate automaticamente <xliff:g id="ON_COUNT">%d</xliff:g> pianificazioni</item>
-      <item quantity="one">Può essere attivata automaticamente 1 pianificazione</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ora}other{# ore}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minuti}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{Off/Può essere attivata automaticamente 1 programmazione}other{Off/Possono essere attivate automaticamente # programmazioni}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Possono interrompere la modalità Non disturbare"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Persone"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"App"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Imposta automaticamente le notifiche con priorità inferiore su Senza avvisi"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Posizionamento adattivo delle notifiche"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Posiziona automaticamente le notifiche in base alla pertinenza"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback relativo alle notifiche adattive"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indica le modifiche apportate alle notifiche e mostra la possibilità di fornire feedback al sistema"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Reimposta importanza notifiche"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reimposta le impostazioni relative all\'importanza modificate dall\'utente e consenti all\'assistente notifiche di assegnare la priorità"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Azioni e risposte consigliate"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostra automaticamente azioni e risposte consigliate"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Mostra notifiche recenti e posticipate"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Conversazioni prioritarie"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Appaiono in cima alla sezione delle conversazioni sotto forma di bolle mobili"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Appaiono in cima alla sezione delle conversazioni"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Altre conversazioni"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Conversazioni non prioritarie"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversazioni a cui hai apportato modifiche"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Conversazioni recenti"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Cancella recenti"</string>
+    <string name="clear" msgid="5092178335409471100">"Cancella"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Usa bolla per conversazioni prioritarie"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Le conversazioni prioritarie vengono mostrate nella parte superiore dell\'area a discesa. Puoi anche impostarle in modo che vengano visualizzate come bolle e che interrompano la modalità Non disturbare."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Le conversazioni prioritarie e modificate verranno visualizzate qui"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Accesso Non disturbare"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Consenti \"Non disturbare\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nessuna delle app installate ha richiesto l\'accesso Non disturbare"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Caricamento app..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Caricamento delle app…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Come richiesto, Android sta bloccando la visualizzazione delle notifiche dell\'app su questo dispositivo"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Come richiesto, Android sta bloccando la visualizzazione di questa categoria di notifiche su questo dispositivo"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Come richiesto, Android sta bloccando la visualizzazione di questo gruppo di notifiche su questo dispositivo"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Tutte le conversazioni"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversazioni prioritarie"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nessuna"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversazioni</item>
-      <item quantity="one">1 conversazione</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nessuna"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nessuna}=1{1 conversazione}other{# conversazioni}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Chi può interrompere"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chiamate"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chiamate"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Per assicurarti che la suoneria delle chiamate consentite sia attiva, controlla che il dispositivo sia impostato per squillare"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Per \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" le chiamate in arrivo sono bloccate. Puoi regolare le impostazioni per permettere ai tuoi amici, alla tua famiglia e ad altri contatti di raggiungerti."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contatti speciali"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">altri <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">1 altro</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nessuno"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nessuno}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}other{{contact_1}, {contact_2} e altri # contatti}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Nessun nome)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messaggi"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"messaggi"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messaggi"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Per \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" i messaggi in arrivo sono bloccati. Puoi modificare le impostazioni per permettere ai tuoi amici, alla tua famiglia e ad altri contatti di raggiungerti."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Puoi ricevere tutti i messaggi"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Puoi ricevere tutte le chiamate"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nessuno"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contatti</item>
-      <item quantity="one">1 contatto</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nessuno}=1{1 contatto}other{# contatti}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Chiunque"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contatti"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contatti speciali"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Tutte le notifiche"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Alcune notifiche"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Le persone selezionate possono ancora contattarti, anche se non consenti l\'interruzione da parte delle app"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> possono interrompere</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> può interrompere</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"altre <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nessuna app può interrompere}=1{{app_1} può interrompere}=2{{app_1} e {app_2} possono interrompere}=3{{app_1}, {app_2} e {app_3} possono interrompere}other{{app_1}, {app_2} e altre # app possono interrompere}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"App"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Tutte le notifiche"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Alcune notifiche"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notifiche che possono interrompere"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Consenti tutte le notifiche"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> possono interrompere</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> può interrompere</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Niente può interrompere"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"altri <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niente può interrompere}=1{{sound_category_1} può interrompere}=2{{sound_category_1} e {sound_category_2} possono interrompere}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} possono interrompere}other{{sound_category_1}, {sound_category_2} e altri # suoni possono interrompere}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niente può interrompere"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nessuno può interrompere"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Alcune persone possono interrompere"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Tutte le persone possono interrompere"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"On"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Off"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Blocco delle app su schermo"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Con il blocco delle app su schermo, l\'app corrente resterà visibile fino a quando decidi di sbloccarla. Questa funzionalità può essere utilizzata, ad esempio, per consentire a un amico di cui ti fidi di giocare a un gioco specifico. \n\nQuando un\'app è bloccata su schermo, questa potrebbe aprire altre app e i dati personali potrebbero essere accessibili. \n\nPer utilizzare il blocco delle app su schermo: 	\n1.	Attiva il blocco delle app su schermo 	\n2.	Apri Panoramica 	\n3.	Tocca l\'icona dell\'app nella parte superiore della schermata, quindi tocca Blocca"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Con il blocco delle app su schermo, l\'app corrente resterà visibile fino a quando decidi di sbloccarla. Questa funzionalità può essere utilizzata, ad esempio, per consentire a un amico di cui ti fidi di giocare a un gioco specifico. \n\nUn\'app bloccata potrebbe aprire altre app e i dati personali potrebbero essere accessibili. \n\nSe vuoi condividere il tuo dispositivo con qualcuno in modo sicuro, prova a usare invece un utente ospite. \n\nPer utilizzare il blocco delle app su schermo: 	\n1.	Attiva il blocco delle app su schermo. 	\n2.	Apri Panoramica. 	\n3.	Tocca l\'icona dell\'app nella parte superiore della schermata, quindi tocca Blocca."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"La funzionalità di blocco app su schermo ti consente di mantenere visibile l\'app corrente finché non decidi di sbloccarla. Questa funzionalità può essere utilizzata, ad esempio, per consentire a un amico di cui ti fidi di giocare a un gioco specifico."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Un\'app bloccata potrebbe aprire altre app e i dati personali potrebbero essere accessibili. \n\nPer usare la funzionalità di blocco app su schermo: 	\n1.	Attiva il blocco app su schermo. 	\n2.	Apri Panoramica. 	\n3.	Tocca l\'icona dell\'app nella parte superiore dello schermo, quindi tocca Blocca."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Un\'app bloccata potrebbe aprire altre app e i dati personali potrebbero essere accessibili. \n\nSe vuoi condividere il tuo dispositivo con qualcuno in modo sicuro, prova a usare invece un utente ospite. \n\nPer usare la funzionalità di blocco app su schermo: 	\n1.	Attiva il blocco app su schermo. 	\n2.	Apri Panoramica. 	\n3.	Tocca l\'icona dell\'app nella parte superiore dello schermo, quindi tocca Blocca."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Quando un\'app è bloccata su schermo: \n\n•		I dati personali potrebbero essere accessibili (ad esempio i contatti o i contenuti delle email) \n\n•		Le app bloccate potrebbero aprire altre app \n\nUtilizza il blocco delle app su schermo solo con persone di cui ti fidi."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Richiedi sequenza di sblocco prima di sbloccare"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Richiedi il PIN per lo sblocco"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Oltre a usare il tuo volto per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo il PIN prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o persi. Vuoi richiedere il PIN per avviare il dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Oltre a usare il tuo volto per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo la sequenza prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o persi. Vuoi richiedere la sequenza per avviare il dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Oltre a usare il tuo volto per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo la password prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o persi. Vuoi richiedere la password per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Oltre a usare la biometria per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo il PIN prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o smarriti. Vuoi richiedere il PIN per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Oltre a usare la biometria per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo la sequenza prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o smarriti. Vuoi richiedere la sequenza per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Oltre a usare la biometria per sbloccare il dispositivo, puoi proteggere ulteriormente il dispositivo richiedendo la password prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati memorizzati su dispositivi rubati o smarriti. Vuoi richiedere la password per avviare il dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sì"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Con limitazioni"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controllata da"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo connesso"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Questo dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Commutazione…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Cambio…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Impossibile eseguire la commutazione"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Ricarica del dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Ricarica del dispositivo collegato"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Utilizzo dati mobili"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Utilizzo dati delle app"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Utilizzo dei dati Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Utilizzo dei dati non dell\'operatore"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Utilizzo dei dati Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 restrizione</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"I dati dell\'operatore potrebbero differire da quelli del dispositivo"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Vengono esclusi i dati usati dalle reti dell\'operatore"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Dati utilizzati: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Imposta avviso sui dati"</string>
     <string name="data_warning" msgid="2925054658166062884">"Avviso sui dati"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Visualizza dettagli"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Risparmio dati"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dati senza limitazioni"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"I dati in background sono disattivati"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"I dati in background sono disattivati"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"On"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usa Risparmio dati"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Impedisci di digitare risposte o altro testo nelle notifiche quando il dispositivo è bloccato"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Controllo ortografico predefinito"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Scegli controllo ortografico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Usa il controllo ortografico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usa il controllo ortografico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Non selezionato"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nessuno)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Rimuovi foto e video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gestione memoria"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utilizza Gestione archiviazione"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usa Gestione archiviazione"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatiche"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuali"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Libera spazio ora"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tocca due volte per controllare il telefono"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tocca due volte il tablet per controllare le notifiche"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tocca due volte il dispositivo per controllare le notifiche"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Scorri per le notifiche"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Scorri verso il basso sul bordo inferiore dello schermo per vedere le notifiche"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modalità one-hand"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usa modalità one-hand"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Esci al cambio di app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 secondi"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 secondi"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 secondi"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accessibilità one-hand"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Per controllare l\'ora, le notifiche e altre informazioni, tocca due volte lo schermo."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Solleva per controllare il telefono"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Solleva il tablet per controllare le notifiche"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tocca per selezionare le notifiche"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocca per selezionare il dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Per controllare l\'ora, le notifiche e altre informazioni, tocca lo schermo."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS di emergenza"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Usa SOS di emergenza"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Funzionalità gestita dall\'app <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Avvia le azioni che seguono premendo rapidamente per almeno 5 volte il tasto di accensione"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Attiva allarme con conto alla rovescia"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Viene riprodotto un suono forte prima di chiedere aiuto"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Chiama per chiedere aiuto"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Numero da chiamare per chiedere aiuto"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Tocca per cambiarlo"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Se inserisci un numero non di emergenza:\n • Il tuo dispositivo deve essere sbloccato per poter usare l\'SOS di emergenza\n • La tua chiamata potrebbe non ricevere risposta"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Usa l\'impronta per le notifiche"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usa l\'impronta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte sul retro del telefono."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Set di dati visibili massimi"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Reimposta i valori predefiniti"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Le opzioni di compilazione automatica per gli sviluppatori sono state reimpostate"</string>
+    <string name="location_category" msgid="3496759112306219062">"Posizione"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicatore di posizione nella barra di stato"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Mostra per tutte le posizioni, incluse quelle rilevate tramite rete e connettività"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forza esecuzione completa delle misurazioni GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Monitora tutte le costellazioni e le frequenze GNSS senza ciclo di lavoro utile"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema del dispositivo"</string>
     <string name="default_theme" msgid="4815428567082263639">"Valore predefinito"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nome della rete"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Metti in pausa le notifiche per mantenere la concentrazione"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funzionalità non disponibile"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Questa funzionalità è stata disattivata perché rallenta il telefono"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forza esecuzione completa delle misurazioni GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Monitora tutte le costellazioni e le frequenze GNSS senza ciclo di lavoro utile"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Mostra sempre finestra di dialogo di arresti anomali"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Mostra finestra di dialogo a ogni arresto anomalo delle app"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Seleziona le app che supportano ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Attiva per tutte le app"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Seleziona il driver di grafica"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predefinito"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver di gioco"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver di gioco"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Driver sviluppatore"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver di grafica di sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Su (audio disattivato)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Non attivo"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Dettagli rete"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Il nome del tuo dispositivo è visibile alle app installate sul telefono. Potrebbe essere visibile anche ad altre persone se ti connetti a dispositivi Bluetooth o configuri un hotspot Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Il nome del tuo dispositivo è visibile alle app installate sul telefono. Potrebbe essere visibile anche ad altre persone quando ti connetti a dispositivi Bluetooth, a una rete Wi-Fi o configuri un hotspot Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Dispositivi"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Tutte le impostazioni"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Suggerimenti"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Impossibile trovare reti. Riprova."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(vietato)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nessuna scheda SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nessuna SIM rilevata"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nessuna"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"È necessaria una SIM per connettersi"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"È necessaria una SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> per connettersi"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modalità di rete preferita: WCDMA (preferita)"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modalità di rete preferita: solo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modalità di rete preferita: solo WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dati mobili"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accedi ai dati tramite la rete mobile"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Il telefono passerà automaticamente a questo operatore quando si trova in portata"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nessuna scheda SIM disponibile"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferenza per le chiamate"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferenza per gli SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Chiedi ogni volta"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Non disponibile se è attiva la connessione a <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Altro"</string>
     <string name="see_less" msgid="2642392725363552793">"Comprimi"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vuoi attivare <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vuoi attivare la SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vuoi passare a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vuoi passare alla scheda SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"È possibile attivare una sola SIM alla volta.\n\nIl passaggio a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> non annullerà il servizio di <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"È possibile attivare una sola SIM scaricata alla volta.\n\nIl passaggio a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> non annullerà il servizio di <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"È possibile attivare una sola SIM alla volta.\n\nIl passaggio non annullerà il servizio di <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Passa a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Connessione alla rete…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Passaggio a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Impossibile passare a un altro operatore"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Impossibile passare a un altro operatore a causa di un errore."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vuoi disattivare <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vuoi disattivare la SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Disattivazione SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Impossibile disattivare l\'operatore"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Si è verificato un problema; impossibile disattivare l\'operatore."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vuoi usare due SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Questo dispositivo può avere due SIM attive alla volta. Per continuare a utilizzare una sola SIM alla volta, tocca \"No grazie\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Vuoi riavviare il dispositivo?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Per iniziare, riavvia il dispositivo. Dopodiché puoi aggiungere un\'altra SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continua"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Riavvia"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"No grazie"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Cambia"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Impossibile attivare la SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Rimuovi la SIM e inseriscila di nuovo. Se il problema persiste, riavvia il dispositivo."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Riprova ad attivare la SIM. Se il problema persiste, riavvia il dispositivo."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Attivazione della rete"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"L\'operatore <xliff:g id="CARRIER_NAME">%1$s</xliff:g> è attivo"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tocca per aggiornare le impostazioni della SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Scheda SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Resettare questa SIM scaricata?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Se resetti questa SIM, il servizio di <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> verrà rimosso da questo dispositivo.\n\nIl servizio di <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> non verrà annullato."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Resetta"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Reset della SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Impossibile resettare la SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Questa SIM non può essere resettata a causa di un errore.\n\nRiavvia il dispositivo e riprova."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Connessione al dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"L\'app <xliff:g id="APPNAME">%1$s</xliff:g> vorrebbe usare una rete Wi-Fi temporanea per connettersi al tuo dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nessun dispositivo trovato. Assicurati che i dispositivi siano accesi e disponibili per la connessione."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Chiamate di emergenza"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Le chiamate di emergenza tramite Chiamate Wi-Fi non sono supportate dal tuo operatore.\nIl dispositivo passa automaticamente a una rete dati per fare una chiamata di emergenza.\nÈ possibile fare chiamate di emergenza soltanto in zone con copertura mobile."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Utilizza il Wi-Fi per migliorare la qualità delle chiamate"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Chiamate tramite più SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Consenti chiamate e SMS di un\'altra SIM tramite questa SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"chiamate tramite più sim"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Messaggio MMS in arrivo"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Impossibile inviare messaggio MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tocca per consentire i messaggi MMS su <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> quando i dati mobili non sono attivi"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Consenti gli overlay schermo sulle Impostazioni"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Consenti alle app visualizzabili sopra altre app di sovrapporre le schermate Impostazioni"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Contenuti multimediali"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Nascondi lettore al termine della sessione multimediale"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Il lettore multimediale ti consente di riprendere una sessione dal riquadro espanso Impostazioni rapide."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media player nelle Impostazioni rapide"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostra il media player per un periodo prolungato in modo da poter riprendere facilmente la riproduzione"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Nascondi lettore multimediale"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostra lettore multimediale"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nessun lettore multimediale disponibile"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"App consentite"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"contenuti multimediali"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Verrà attivato il Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"On"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Off"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Reti utilizzabili in aereo"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Cerca e collegati a reti utilizzabili in aereo"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aereo, utilizzabile in aereo"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Chiamate e SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Chiamate Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Effettua e ricevi chiamate tramite reti non dell\'operatore, come le reti Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"La funzionalità Chiamate Wi-Fi consente di effettuare e ricevere chiamate tramite reti non dell\'operatore, come alcune reti Wi-Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Chiamate"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"Preferiti"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"Chiamate preferite"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS preferiti"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"Non disponibili"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nessuna SIM rilevata"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferenze"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Connetti a reti pubbliche"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"connessione rete, internet, wireless, dati, wifi, wi-fi, wi fi, cellulare, dispositivo mobile, operatore cellulare, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Visualizza reti utilizzabili in aereo"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Disattiva la modalità aereo"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Non disponibili perché la modalità Riposo è attiva"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Reimpostazione dell\'importanza delle notifiche completata."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"App"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un dispositivo non attendibile richiede l\'accesso ai tuoi messaggi. Tocca per conoscere i dettagli."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vuoi consentire l\'accesso ai messaggi?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un dispositivo Bluetooth non attendibile, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], richiede l\'accesso ai tuoi messaggi.\n\nNon hai mai effettuato la connessione al dispositivo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un dispositivo non attendibile richiede l\'accesso ai tuoi contatti e al tuo registro chiamate. Tocca per conoscere i dettagli."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vuoi consentire l\'accesso a contatti e registro chiamate?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un dispositivo Bluetooth non attendibile, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], richiede l\'accesso ai tuoi contatti e al tuo registro chiamate, inclusi i dati relativi a chiamate in arrivo e in uscita.\n\nNon hai mai effettuato la connessione al dispositivo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index f71da6d..bb6a5c1 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"בינוני"</item>
     <item msgid="6740026006576843477">"ארוך"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"קצר"</item>
+    <item msgid="7397961711906421599">"בינוני"</item>
+    <item msgid="4079132024502041928">"ארוך"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ברירת מחדל"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"כללי"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"‏TDSCDMA בלבד"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"‏NR‏/LTE"</item>
     <item msgid="5237423971422723128">"‏NR‏/LTE‏/CDMA‏/EvDo"</item>
     <item msgid="6856991565745877075">"‏NR‏/LTE‏/GSM‏/WCDMA"</item>
-    <item msgid="473436147270962091">"‏NR‏/LTE‏/CDMA‏/EvDo‏/GSM‏/WCDMA"</item>
+    <item msgid="8908263949185004366">"גלובלי"</item>
     <item msgid="6692179237956480280">"‏NR‏/LTE‏/WCDMA"</item>
     <item msgid="8160757136163231885">"‏NR‏/LTE‏/TDSCDMA"</item>
     <item msgid="2207530656708814396">"‏NR‏/LTE‏/TDSCDMA‏/GSM"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 9a7e0fa..2421999 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -258,8 +258,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"תאריך ושעה"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"הגדרת תאריך ושעה"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"הגדרת תאריך, שעה, אזור זמן ופורמטים"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"לפי השעה שמספקת הרשת"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"לפי אזור הזמן שמספקת הרשת"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"הגדרת זמן באופן אוטומטי"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"הגדרת אזור זמן באופן אוטומטי"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"לפי ברירת המחדל של הלוקאל"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"פורמט 24 שעות"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"פורמט 24 שעות"</string>
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"הצג פרטי פרופיל במסך הנעילה"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"חשבונות"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"מיקום"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"שימוש במיקום"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"שימוש במיקום"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"כבוי"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="two">פועלת - ל-<xliff:g id="COUNT_1">%1$d</xliff:g> אפליקציות יש גישה למיקום</item>
@@ -326,6 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"נעילת מסך, שחרור נעילה על ידי זיהוי פנים"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"נעילת מסך, טביעת אצבע"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"נעילת מסך"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ביטול נעילת הטלפון באופן מאובטח באמצעות הפנים וטביעת האצבע"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"אפשר גם להיכנס לאפליקציות ולאשר תשלומים"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"הגדרת ביטול נעילה באמצעות:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"שחרור נעילה על ידי זיהוי פנים"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"איך מבטלים את נעילת הטלפון בקלות"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"טביעת אצבע‏"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ביטול נעילה מהיר כשהטלפון מונח בכיס"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"דילוג"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"הבא"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"הפנים נוספו"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"הגדרת שחרור נעילה על ידי זיהוי פנים"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"שחרור נעילה בזיהוי פנים"</string>
@@ -335,6 +344,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"שימוש באימות פנים"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"התחלה"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"‏אם הגדרות נגישות של שחרור נעילה על ידי זיהוי פנים מושבתות, ייתכן שחלק משלבי ההגדרה לא יפעלו באופן תקין עם TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"חזרה"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"להמשך הגדרה"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"שימוש בהגדרת הנגישות"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -379,8 +391,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"כשמשתמשים בשחרור נעילה על ידי זיהוי פנים באפליקציות, יש לדרוש תמיד שלב אימות"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"מחיקת נתוני הפנים"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"הגדרת שחרור נעילה על ידי זיהוי פנים"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"אפשר להשתמש בשחרור נעילה על ידי זיהוי פנים כדי לבטל את נעילת המכשיר, להיכנס לאפליקציות ולאשר תשלומים.\n\nחשוב לזכור:\nמבט לטלפון עלול לבטל נעילה בלי כוונה.\n\nנעילת הטלפון עלולה להתבטל על ידי מישהו אחר, אם הטלפון מופנה אל הפנים שלך.\n\nנעילת הטלפון עלולה להתבטל על ידי מישהו שדומה לך מאוד, כמו למשל אח/ות זהה."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"אפשר להשתמש בשחרור נעילה על ידי זיהוי פנים כדי לשחרר את נעילת המכשיר, להיכנס לחשבון באפליקציות ולאשר תשלומים.\n\nחשוב לזכור:\nמבט לטלפון עשוי לבטל נעילה בלי כוונה.\n\nנעילת הטלפון עשויה להתבטל על ידי מישהו אחר אם הוא יפנה את הטלפון לפנים שלך, גם אם עיניך עצומות.\n\nנעילת הטלפון עשויה להתבטל על ידי מישהו שדומה לך מאוד, כמו למשל אח/ות זהה."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"באמצעות שחרור הנעילה של המכשיר על ידי זיהוי פנים ניתן להיכנס לאפליקציות ולאשר תשלומים."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"חשוב לזכור:\nמבט לטלפון עשוי לבטל את הנעילה בלי כוונה.\n\nנעילת הטלפון עשויה להתבטל על ידי מישהו אחר אם הוא יפנה את הטלפון לפנים שלך.\n\nכמו כן, נעילת הטלפון עשויה להתבטל על ידי מישהו שדומה לך מאוד, כמו למשל אח/ות זהה."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"חשוב לזכור:\nמבט לטלפון עשוי לבטל את הנעילה בלי כוונה.\n\nנעילת הטלפון עשויה להתבטל על ידי מישהו אחר אם הוא יפנה את הטלפון לפנים שלך, גם אם עיניך עצומות.\n\nכמו כן, נעילת הטלפון עשויה להתבטל על ידי מישהו שדומה לך מאוד, כמו למשל אח/ות זהה."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"למחוק נתוני פנים?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"נתוני הפנים שמשמשים את התכונה \'שחרור נעילה על ידי זיהוי פנים\' יימחקו לתמיד ובאופן מאובטח. אחרי ההסרה יהיה צורך בקוד האימות, קו ביטול הנעילה או הסיסמה כדי לבטל את נעילת הטלפון, להיכנס לאפליקציות ולאשר תשלומים."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"שימוש בשחרור נעילה על ידי זיהוי פנים לצורך ביטול הנעילה של הטלפון"</string>
@@ -402,6 +415,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"שימוש בטביעת אצבע כדי לבטל את הנעילה של הטלפון או לאשר רכישות.\n\nהערה: לא ניתן להשתמש בטביעת אצבע כדי לבטל את הנעילה של המכשיר הזה. לקבלת מידע נוסף, אפשר לפנות למנהל המערכת של הארגון."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"שימוש בטביעת אצבע כדי לבטל את הנעילה של הטלפון או לאשר רכישות.\n\nהערה: שימוש בטביעת אצבע יכול להיות פחות מאובטח משימוש בקו ביטול נעילה או בקוד גישה."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ביטול"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"לא תודה"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"המשך"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"דילוג"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"הבא"</string>
@@ -439,6 +453,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"עם הגדרת הגנה על הטאבלט באמצעות אפשרות של נעילת מסך, אף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר שחרור נעילה על ידי זיהוי פנים. כדי לחזור יש להקיש על ביטול."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"עם הגדרת הגנה על המכשיר באמצעות אפשרות של נעילת מסך, אף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר שחרור נעילה על ידי זיהוי פנים. כדי לחזור יש להקיש על ביטול."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"הודות להגנה על הטלפון בנעילת מסך, אף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. האפשרות של נעילת המסך נדרשת גם כדי להגדיר שחרור נעילה על ידי זיהוי פנים. כדי לחזור יש להקיש על ביטול."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"עם הגדרת הגנה על הטאבלט באמצעות אפשרות של נעילת מסך, איש לא יוכל להשתמש בו אם הוא יאבד או ייגנב. נדרשת אפשרות נעילת מסך גם כדי להגדיר מידע ביומטרי. כדי לחזור יש להקיש על ביטול."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"עם הגדרת הגנה על המכשיר באמצעות האפשרות של נעילת המסך, איש לא יוכל להשתמש בו אם הוא יאבד או ייגנב. נדרשת אפשרות נעילת מסך גם כדי להגדיר מידע ביומטרי. כדי לחזור יש להקיש על ביטול."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"עם הגדרת הגנה על הטלפון באמצעות אפשרות של נעילת מסך, אף אחד לא יוכל להשתמש בו אם הוא יאבד או ייגנב. נדרשת אפשרות נעילת מסך גם כדי להגדיר מידע ביומטרי. כדי לחזור יש להקיש על ביטול."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"לדלג על הגדרת קוד הגישה?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"לדלג על הגדרת הסיסמה?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"לדלג על הגדרת קו ביטול הנעילה?"</string>
@@ -511,8 +528,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש בטאבלט הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש במכשיר הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"הפעל את תכונות הגנת המכשיר כדי למנוע מאחרים להשתמש בטלפון הזה ללא אישורך. בחר בנעילת המסך שבה תרצה להשתמש."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"בחר את שיטת הגיבוי לנעילת המסך"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"יש לבחור את שיטת הגיבוי לנעילת המסך"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"יש לבחור את שיטת הגיבוי לנעילת המסך"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"אפשרויות לנעילת המסך"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"אפשרויות לנעילת המסך"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"נעילת מסך"</string>
@@ -544,6 +560,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"שחרור נעילה על ידי זיהוי פנים וסיסמה"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"המשך ללא שחרור נעילה על ידי זיהוי פנים"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"ניתן לבטל את נעילת הטלפון באמצעות אימות פנים. מטעמי אבטחה, אפשרות זו מחייבת נעילת מסך לגיבוי."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"מידע ביומטרי + קו ביטול נעילה"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"מידע ביומטרי + קוד אימות"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"מידע ביומטרי + סיסמה"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"המשך ללא מידע ביומטרי"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ניתן לבטל את נעילת הטלפון באמצעות המידע הביומטרי שלך. מטעמי אבטחה, אפשרות זו מחייבת נעילת מסך לגיבוי."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"הושבת על ידי מדיניות ההצפנה של מנהל המכשיר, או אחסון פרטי כניסה"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ללא"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"החלקה"</string>
@@ -635,7 +656,6 @@
       <item quantity="one">צריכה להכיל פחות מספרה אחת (<xliff:g id="NUMBER_0">%d</xliff:g>)</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"מנהל המכשיר לא מאפשר להשתמש בקוד גישה שנעשה בו שימוש לאחרונה"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"‏קודי גישה נפוצים חסומים בידי מנהל ה-IT. יש לנסות קוד גישה אחר."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"לא ניתן לכלול תו לא חוקי"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"חייבת להכיל אות אחת לפחות"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"צריכה להכיל ספרה אחת לפחות"</string>
@@ -683,7 +703,6 @@
       <item quantity="one">חייבת להכיל לפחות תו אחד שאינו מספר</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"מנהל המכשיר לא מאפשר להשתמש בסיסמה שנעשה בה שימוש לאחרונה"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"‏סיסמאות נפוצות חסומות בידי מנהל ה-IT. יש לנסות סיסמה אחרת."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"אין להגדיר רצף ספרות עולה, יורד או חוזר"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"אישור"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ביטול"</string>
@@ -829,7 +848,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"‏הפעל את ה-Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"‏שימוש ב-Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"‏שימוש ב-Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"‏הגדרות Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"הגדרה וניהול של נקודות גישה אלחוטיות"</string>
@@ -937,7 +956,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"‏יש להציב במרכז את קוד ה-QR שבהמשך כדי להתחבר אל “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"‏ניתן להצטרף לרשת Wi‑Fi על ידי סריקה של קוד QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"‏שיתוף Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"‏כדי להתחבר אל “<xliff:g id="SSID">%1$s</xliff:g>” ולשתף את הסיסמה צריך לסרוק את קוד ה-QR הזה"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"‏יש לסרוק קוד QR זה בעזרת מכשיר אחר כדי להצטרף אל “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"‏כדי להתחבר אל \"<xliff:g id="SSID">%1$s</xliff:g>\" צריך לסרוק את קוד ה-QR הזה"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"יש לנסות שוב. אם הבעיה ממשיכה להופיע, יש לפנות ליצרן המכשיר"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"משהו השתבש"</string>
@@ -963,8 +982,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"‏סיסמת ה-Wi‑Fi היא: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"סיסמה של נקודה לשיתוף אינטרנט: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"חיבור אוטומטי"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"הטלפון יוכל להתחבר באופן אוטומטי בסביבת הרשת הזו"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"הטאבלט יוכל להתחבר באופן אוטומטי בסביבת הרשת הזו"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"יש להפעיל את החיבור לרשת זו כשנמצאים בטווח"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"הוספת מכשיר"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"‏אפשר להשתמש בקוד QR כדי להוסיף מכשיר לרשת זו"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"‏קוד QR אינו בפורמט חוקי"</string>
@@ -976,7 +994,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"השתמש באישורי מערכת"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ללא אישור"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ללא אימות"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"לא הוגדר אישור. החיבור שלך לא יהיה פרטי."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"שם הרשת ארוך מדי."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"חובה לציין דומיין."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"נדרש אישור."</string>
@@ -1003,6 +1020,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"התחברות"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"‏Wi-Fi הופעל"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"יש חיבור אל <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"מתבצעת התחברות אל <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"מתחבר…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"נכשל הניסיון להתחבר לרשת"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"הרשת לא בטווח"</string>
@@ -1036,6 +1054,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"‏כתובת MAC של המכשיר"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"‏כתובת MAC אקראית"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"‏כתובת MAC שנקבעה אקראית (היתה בשימוש לאחרונה)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"‏כתובת IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"פרטי הרשת"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"מסכת רשת משנה"</string>
@@ -1043,8 +1062,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"‏כתובות IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"רשתות שנשמרו"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"מינויים"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"רשתות אחרות"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"‏הגדרות IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"‏הגדרות Wi-Fi מתקדמות אינן זמינות למשתמש הזה"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"שמירה"</string>
@@ -1053,8 +1071,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"הקלד כתובת שער חוקית."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"‏הקלד כתובת DNS חוקית."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"הקלד אורך לקידומת רשת בין 0 ו-32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"‏DNS 1 (אלא אם בוטל על ידי שרת DNS פרטי)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"‏DNS 2 (אלא אם בוטל על ידי שרת DNS פרטי)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"שער"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"אורך קידומת של רשת"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"‏Wi-Fi ישיר"</string>
@@ -1080,7 +1098,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"מתבצע שיתוף תכנים באחת האפליקציות. כדי לשתף חיבור לאינטרנט, יש להשבית את הנקודה לשיתוף אינטרנט ולהפעיל אותה מחדש"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"לא הוגדרה סיסמה"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"שם הנקודה לשיתוף אינטרנט"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"המערכת מפעילה את <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"מתבצעת הפעלה של <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"אפשר לחבר מכשירים נוספים לנקודה <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"הסיסמה לנקודה לשיתוף אינטרנט"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"‏תדר AP"</string>
@@ -1230,7 +1248,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"תצוגה חלקה"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"‏קצב הרענון עולה באופן אוטומטי מ-60 ל-Hz‏90 לחלק מהתוכן. פעולה זו מגבירה את השימוש בסוללה."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"תצוגה חלקה"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"אילוץ קצב רענון של 90 הרץ"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"קצב הרענון הגבוה ביותר לתגובה משופרת למגע ולאיכות אנימציה טובה יותר. פעולה זו מגבירה את השימוש בסוללה."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"המסך נשאר דלוק"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"התכונה פועלת / המסך לא נכבה כשמביטים בו"</string>
@@ -1321,6 +1339,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"כשהמסך מוחשך, הוא יופעל כשיהיו התראות חדשות"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"הצגה תמידית של השעה והפרטים"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"שימוש מוגבר בסוללה"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"הדגשת הטקסט"</string>
     <string name="title_font_size" msgid="570613010306330622">"גודל גופן"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"הגדלה או הקטנה של גודל הטקסט"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"‏הגדרות נעילת כרטיס SIM"</string>
@@ -1371,7 +1390,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"‏גרסת Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"‏עדכון אבטחה ל-Android"</string>
     <string name="model_info" msgid="8997566254717810904">"דגם"</string>
-    <string name="model_summary" msgid="2246651782442466213">"‏מודל: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"דגם וחומרה"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"גרסת חומרה"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"זיהוי ציוד"</string>
@@ -1620,7 +1638,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"‏מחיקת APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"‏הוספת APN חדש"</string>
     <string name="menu_save" msgid="6611465355127483100">"שמירה"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"מחיקה"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"ביטול"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"השדה \'שם\' לא יכול להיות ריק."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"‏ה-APN לא יכול להיות ריק."</string>
@@ -1635,8 +1653,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"אפשר לאפס את האפליקציות"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"‏איפוס ההגדרות של Wi-Fi, חבילת גלישה ו-Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"‏פעולה זו תאפס את כל הגדרות הרשת, כולל:\n\n"<li>"Wi‑Fi"</li>\n<li>"חבילת גלישה"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"מחיקה"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"‏מחיקת כרטיסי SIM שהורדת"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"‏כדי להוריד כרטיסי SIM חלופיים יש לפנות אל הספק. הפעולה הזו לא תבטל חבילות גלישה קיימות."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"‏פעולה זו לא תבטל אף אחריות מורחבת בתשלום. כדי להוריד כרטיסי SIM חלופיים, יש לפנות לספק חבילת הסלולר."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"איפוס הגדרות"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"לאפס את כל הגדרות הרשת? לא ניתן לבטל את הפעולה הזו."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"‏לאפס את כל הגדרות הרשת ולמחוק את כרטיסי ה-SIM שהורדת? לא ניתן לבטל את הפעולה הזו."</string>
@@ -1646,39 +1665,37 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"הגדרות הרשת אופסו"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"‏לא ניתן למחוק כרטיסי SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"‏עקב שגיאה, לא ניתן למחוק כרטיסי SIM שהורדת.\n\nצריך להפעיל מחדש את המכשיר ולנסות שוב."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"מחיקת כל הנתונים (איפוס להגדרות היצרן)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"מחיקת כל הנתונים (איפוס)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות שלך"</li>\n<li>"האפליקציות שהורדת"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות"</li>\n<li>"אפליקציות שהורדת"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"החשבונות הבאים שלך פעילים כעת:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"קיימים משתמשים אחרים במכשיר זה.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"מוסיקה"</li>\n<li>"תמונות"</li>\n<li>"נתוני משתמש אחרים"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727">"‏"<li>"כרטיסי eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"מחיקת הנתונים לא תבטל את תוכנית השירות הסלולרי שלך."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"אחסון ה-USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"כרטיס ה-SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"מחיקת כל הנתונים (איפוס להגדרות המקוריות)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"מחיקת כל הנתונים (איפוס להגדרות המקוריות)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטאבלט, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות"</li>\n<li>"האפליקציות שהורדת"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"‏פעולה זו תמחק את כל הנתונים מ"<b>"האחסון הפנימי"</b>" של הטלפון, כולל:\n\n"<li>"חשבון Google שלך"</li>\n<li>"הנתונים וההגדרות של המערכת והאפליקציות"</li>\n<li>"אפליקציות שהורדת"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"החשבונות הבאים שלך פעילים כעת:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"קיימים משתמשים אחרים במכשיר זה.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"מוזיקה"</li>\n<li>"תמונות"</li>\n<li>"נתוני משתמש אחרים"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729">"‏"<li>"כרטיסי eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"מחיקת הנתונים לא תבטל את תוכנית השירות הסלולרי שלך."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"אחסון ה-USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">"‏\n\nכדי למחוק פריטי מוזיקה, תמונות ונתוני משתמש אחרים, יש למחוק את "<b>"כרטיס ה-SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"‏מחק אחסון USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"‏מחק כרטיס SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"‏מחיקת כל הנתונים באחסון ה-USB הפנימי, כגון פריטי מוזיקה או תמונות"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"‏מחיקת כל הנתונים שבכרטיס ה-SD, כגון מוזיקה או תמונות"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"מחיקת כל הנתונים"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"מחיקת כל הנתונים"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"כל המידע האישי שלך והאפליקציות שהורדת יימחקו. לא ניתן לבטל את הפעולה הזו."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"‏כל המידע האישי שלך יימחק, כולל אפליקציות וכרטיסי SIM שהורדת. לא ניתן לבטל את הפעולה הזו."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"מחיקת הכל"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"לא בוצע איפוס מכיוון שהשירות \'ניקוי מערכת\' אינו זמין."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"האם למחוק את כל הנתונים?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"איפוס להגדרות היצרן אינו זמין עבור המשתמש הזה"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"מוחק"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"אנא המתן..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"מחיקת כל הנתונים"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"מחיקת כל הנתונים"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"כל המידע האישי שלך והאפליקציות שהורדת יימחקו. לא ניתן לבטל את הפעולה הזו."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"‏כל המידע האישי שלך יימחק, כולל אפליקציות וכרטיסי SIM שהורדת. לא ניתן לבטל את הפעולה הזו."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"האם למחוק את כל הנתונים?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"איפוס להגדרות המקוריות אינו זמין עבור המשתמש הזה"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"מתבצעת מחיקה"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"יש להמתין…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"הגדרות שיחה"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"הגדרת דואר קולי, העברת שיחות, שיחה ממתינה, זיהוי מתקשר"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"‏שיתוף אינטרנט דרך USB"</string>
     <string name="tether_settings_title_wifi" msgid="4327056146425282159">"נקודה לשיתוף אינטרנט"</string>
     <string name="tether_settings_title_bluetooth" msgid="8878813702520141084">"‏שיתוף אינטרנט דרך Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="4437274151658505496">"שיתוף אינטרנט בין ניידים"</string>
-    <string name="tether_settings_title_all" msgid="6807525590937697228">"נקודה לשיתוף אינטרנט ושיתוף אינטרנט בין ניידים"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="6110241048260139633">"נקודה לשיתוף אינטרנט פועלת, שיתוף אינטרנט בין ניידים"</string>
+    <string name="tether_settings_title_all" msgid="6807525590937697228">"‏שיתוף אינטרנט (hotspot ו-tethering)"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="6110241048260139633">"‏שיתוף האינטרנט פועל (hotspot ו-tethering)"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="5057598961245943644">"נקודה לשיתוף אינטרנט פועלת"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="7181518138494995888">"שיתוף אינטרנט"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="9054069463426952689">"‏לא ניתן לשתף אינטרנט בין ניידים או להשתמש בנקודה ניידת לשיתוף אינטרנט כשחוסך הנתונים (Data Saver) פועל."</string>
@@ -1709,7 +1726,7 @@
     <string name="disable_wifi_hotspot_when_usb_and_bluetooth_and_ethernet_on" msgid="3934609816834760008">"‏שיתוף אינטרנט רק באמצעות USB, ‏Bluetooth ו-Ethernet"</string>
     <string name="usb_title" msgid="1157283449840612901">"USB"</string>
     <string name="usb_tethering_button_text" msgid="7364633823180913777">"‏שיתוף אינטרנט דרך USB"</string>
-    <string name="usb_tethering_subtext" product="default" msgid="3168636595109044213">"‏שיתוף בחיבור לאינטרנט של הטלפון דרך USB"</string>
+    <string name="usb_tethering_subtext" product="default" msgid="3168636595109044213">"‏שיתוף האינטרנט של הטלפון דרך USB"</string>
     <string name="usb_tethering_subtext" product="tablet" msgid="1749659335004856576">"‏שיתוף בחיבור לאינטרנט של הטאבלט דרך USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="6108398414967813545">"‏שיתוף אינטרנט דרך Bluetooth"</string>
     <string name="bluetooth_tethering_subtext" product="tablet" msgid="2023654677593885805">"‏שיתוף החיבור לאינטרנט של הטאבלט דרך Bluetooth"</string>
@@ -1717,10 +1734,10 @@
     <string name="bluetooth_tethering_off_subtext_config" msgid="6941934844527406581">"‏החיבור לאינטרנט של <xliff:g id="DEVICE_NAME">%1$d</xliff:g> זה משותף דרך Bluetooth"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"לא ניתן לשתף אינטרנט בין למעלה מ-<xliff:g id="MAXCONNECTION">%1$d</xliff:g> מכשירים."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"קשירת <xliff:g id="DEVICE_NAME">%1$s</xliff:g> תבוטל."</string>
-    <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"‏שיתוף אינטרנט עם Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"‏שיתוף החיבור לאינטרנט של הטלפון דרך USB Ethernet"</string>
+    <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"‏שיתוף אינטרנט דרך Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"‏שיתוף החיבור לאינטרנט של הטלפון דרך Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"אפשר להשתמש בנקודה לשיתוף אינטרנט ובשיתוף אינטרנט בין ניידים כדי לאפשר למכשירים אחרים להתחבר לאינטרנט דרך חבילת הגלישה שלך. ניתן גם להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
-    <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‏ניתן להשתמש בנקודה לשיתוף אינטרנט ובשיתוף אינטרנט בין מכשירים כדי לאפשר למכשירים אחרים להתחבר לאינטרנט דרך ה-Wi-Fi או דרך חבילת הגלישה שלך. ניתן גם להשתמש באפליקציות כדי ליצור נקודה לשיתוף אינטרנט ולשתף תכנים בין מכשירים שנמצאים בקרבת מקום."</string>
+    <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‏נקודה לשיתוף אינטרנט (Hotspot) ושיתוף אינטרנט בין מכשירים (tethering) מאפשרים למכשירים אחרים להתחבר לאינטרנט דרך Wi-Fi או דרך חבילת הגלישה שלך. יש גם אפליקציות שמאפשרות ליצור נקודה לשיתוף אינטרנט ולשתף תכנים עם מכשירים קרובים."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"עזרה"</string>
     <string name="network_settings_title" msgid="4663717899931613176">"רשתות סלולריות"</string>
     <string name="manage_mobile_plan_title" msgid="5616930513733409064">"תכנית לנייד"</string>
@@ -1762,6 +1779,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"‏סריקת Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"‏אפליקציות ושירותים יוכלו לסרוק מכשירים בקרבת מקום בכל עת, גם כאשר ה-Bluetooth כבוי. ניתן להשתמש בכך, למשל, כדי לשפר תכונות ושירותים מבוססי מיקום."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"שירותי מיקום לעבודה"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"זיהוי אזור הזמן של המיקום"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"זיהוי אזור הזמן של המיקום"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"‏מתן אישור לשימוש במיקום המכשיר כדי לזהות את אזור הזמן הנוכחי. הגדרות מיקום אחרות, כמו חיפוש נקודות Wi-Fi, יכולות להשפיע על הדיוק של זיהוי אזור הזמן."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"התכונה פועלת"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"התכונה כבויה"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"הזיהוי האוטומטי של אזור הזמן מושבת"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"זיהוי אזור הזמן של המיקום מושבת"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"אין תמיכה בזיהוי אזור הזמן של המיקום"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"אין לבצע שינויים בזיהוי אזור הזמן של המיקום"</string>
     <string name="location_network_based" msgid="5247042890080021887">"‏מיקום רשת Wi-Fi ורשת סלולרית"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"‏אפשר לאפליקציות להשתמש בשירות המיקום של Google כדי להעריך את מיקומך מהר יותר. נתוני מיקום אנונימיים ייאספו ויישלחו אל Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"‏המיקום נקבע באמצעות Wi-Fi"</string>
@@ -1825,6 +1851,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"צריך סיסמה לשחרור נעילה עם זיהוי פנים"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"צריך קו ביטול נעילה לשחרור עם זיהוי פנים"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"צריך קוד אימות לשחרור על ידי זיהוי פנים"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"לשימוש במידע ביומטרי, יש להגדיר סיסמה"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"לשימוש במידע ביומטרי, יש להגדיר סיסמה"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"לשימוש במידע ביומטרי יש להגדיר קוד אימות"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"שכחת סיסמה?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"שכחת את קו ביטול הנעילה?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"שכחת את קוד האימות?"</string>
@@ -2165,13 +2194,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"כתוביות"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"הגדלה"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"אזור ההגדלה"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"הפעלת ההגדלה"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"יש לבחור את אזורי ההגדלה שישמשו אותך בזמן הגדלת המסך"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"מסך מלא"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"חלק מהמסך"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"מסך מלא וחלק מהמסך"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"הגדלת כל המסך"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"הגדלת חלק מהמסך"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"לעבור ללחצן הנגישות?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"השימוש בהקשה שלוש פעמים להגדלת חלק מהמסך יגרום להשהייה של ההקלדה ופעולות אחרות.\n\nרוצה לעבור לשימוש בלחצן הנגישות להגדלה?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"מעבר ללחצן הנגישות"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"אמשיך להקיש שלוש פעמים להגדלה"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"הגדרות ההגדלה"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"הגדלה על-ידי הקשה שלוש פעמים"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"הגדלה בעזרת קיצור דרך"</string>
@@ -2225,11 +2257,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"לחצן ההפעלה מסיים שיחה"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"מצביע עכבר גדול"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"הסרת אנימציות"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"אודיו במונו"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"שילוב ערוצים כאשר מפעילים אודיו"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"איזון אודיו"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"שמאל"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ימין"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"אודיו במונו"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"שילוב ערוצים כאשר מפעילים אודיו"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"איזון אודיו"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"שמאל"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ימין"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ברירת מחדל"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 שניות"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 שניות"</string>
@@ -2259,11 +2291,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"רטט ההתראה"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"רטט הצלצול"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"משוב מגע"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"שימוש באפליקציה <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"פתיחת <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"שימוש בתיקון צבע"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"הצגת הכתוביות"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"רק לאפליקציה נתמכת"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"שימוש באפליקציה <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"פתיחה של <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"שימוש בתיקון צבע"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"הצגת הכתוביות"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"רק לאפליקציה נתמכת"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"גודל וסגנון הכתוביות"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"גודל טקסט: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"אפשרויות נוספות"</string>
@@ -2295,6 +2327,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"דוטרנומליה"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"פרוטנומליה"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"טריטנומליה"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"גווני אפור"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"אדום-ירוק"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"אדום-ירוק"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"כחול-צהוב"</string>
@@ -2436,7 +2469,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"הגבלת פעילות ברקע"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"התר לאפליקציה לפעול ברקע"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"האפליקציה לא מורשית לפעול ברקע"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"לא ניתן להגביל שימוש ברקע"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"לא ניתן להגביל שימוש ברקע"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"להגביל את הפעילות ברקע?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"הגבלת הפעילות של אפליקציה ברקע עלולה לשבש את פעולתה"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"מכיוון שהאפליקציה לא מוגדרת לאופטימיזציה של הסוללה, לא ניתן להגבילה.\n\nכדי להגביל אותה, תחילה יש להפעיל אופטימיזציה של הסוללה."</string>
@@ -2485,6 +2518,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"הטאבלט נמצא בשימוש יותר מהרגיל"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"המכשיר נמצא בשימוש יותר מהרגיל"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ייתכן שהסוללה תתרוקן מוקדם מהרגיל"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"מופעלת אופטימיזציה לשמירה על תקינות הסוללה"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"הסוללה מוגבלת באופן זמני. למידע נוסף יש להקיש."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"השתמשת בטלפון יותר מהרגיל. ייתכן שהסוללה תתרוקן מוקדם מהצפוי.\n\nהאפליקציות המובילות לפי שימוש בסוללה:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"השתמשת בטאבלט יותר מהרגיל. ייתכן שהסוללה תתרוקן מוקדם מהצפוי.\n\nהאפליקציות המובילות לפי שימוש בסוללה:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"השתמשת במכשיר יותר מהרגיל. ייתכן שהסוללה תתרוקן מוקדם מהצפוי.\n\nהאפליקציות המובילות לפי שימוש בסוללה:"</string>
@@ -2554,6 +2589,8 @@
       <item quantity="one">אפליקציה מוגבלת אחת</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659"><small>" "<font size="20">"<xliff:g id="NUMBER">^1</xliff:g>"</font></small>"<xliff:g id="UNIT">%</xliff:g>"</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"בעיה בקריאת מדדי הסוללה"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"בעיה בקריאת מדדי הסוללה. יש להקיש "<annotation id="url">"לקבלת מידע נוסף"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"לעצור את האפליקציה?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"הניהול של צריכת הסוללה בטלפון לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> לא מאפשרת למכשיר להיכנס למצב שינה.\n\nכדי לפתור את הבעיה, ניתן להפסיק את פעולת האפליקציה.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את התקנת האפליקציה כדי לשפר את ביצועי הסוללה."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"הניהול של צריכת הסוללה בטאבלט לא תקין, כי האפליקציה <xliff:g id="APP">%1$s</xliff:g> לא מאפשרת למכשיר להיכנס למצב שינה.\n\nכדי לפתור את הבעיה, ניתן להפסיק את פעולת האפליקציה.\n\nאם הבעיה תימשך, ייתכן שיהיה עליך להסיר את התקנת האפליקציה כדי לשפר את ביצועי הסוללה."</string>
@@ -2667,9 +2704,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"הגדרת לוח זמנים"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"הארכת חיי הסוללה"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"כיבוי כשהסוללה טעונה"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"\'חיסכון בסוללה\' כבה כשהטלפון מגיע ל-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"\'חיסכון בסוללה\' כבה כשהטאבלט מגיע ל-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"\'חיסכון בסוללה\' כבה כשהמכשיר מגיע ל-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"\'חיסכון בסוללה\' כבה כשטעינת הטלפון גבוהה מ-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"\'חיסכון בסוללה\' כבה כשטעינת הטאבלט גבוהה מ-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"\'חיסכון בסוללה\' כבה כשטעינת המכשיר גבוהה מ-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"הפעלה"</string>
@@ -2734,6 +2771,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"איפוס המכשיר"</string>
     <string name="tts_play" msgid="2945513377250757221">"הפעלה"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"קישוריות ניתנת להתאמה"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ההעדפה הזו מאריכה את חיי הסוללה ומשפרת את ביצועי המכשיר על ידי ניהול אוטומטי של החיבורים שלך לרשת"</string>
     <string name="credentials_title" msgid="7535942196886123656">"אחסון אישורים"</string>
     <string name="credentials_install" msgid="3933218407598415827">"התקנת אישור"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"התקנת אישורים מאמצעי אחסון"</string>
@@ -2745,9 +2784,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"פרטי משתמש"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"הצגה ועריכה של פרטי כניסה מאוחסנים"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"אפשרויות מתקדמות"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"סוג אחסון"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"מגובה באמצעות חומרה"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"תוכנה בלבד"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"פרטי כניסה אינם זמינים עבור המשתמש הזה"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏מותקן עבור VPN ואפליקציות"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏מותקן עבור Wi-Fi"</string>
@@ -2763,6 +2799,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"לא להתקין"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"אני רוצה להתקין בכל זאת"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"לא הותקן אישור"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"לאפשר לאפליקציה <xliff:g id="APP_NAME">%s</xliff:g> להתקין אישורים במכשיר הזה?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"‏אישורים אלה ישמשו לזיהוי שלך באפליקציות ובכתובות ה-URL שמופיעות למטה"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"אין אישור"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"אישור"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"הצגת פרטים נוספים"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"אפליקציית ניהול אישורים"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"ללא"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"‏אישורים המותקנים על ידי האפליקציה הזו ישמשו לזיהוי שלך באפליקציות ובכתובות ה-URL שמופיעות למטה"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"הסרה"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"אות לחיוג חירום"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"הגדרת אופן פעולה בעת ביצוע שיחת חירום"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"גיבוי"</string>
@@ -3096,7 +3141,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"לא מוגדר - פרופיל עבודה"</string>
     <string name="user_admin" msgid="4024553191395768119">"מנהל מערכת"</string>
     <string name="user_you" msgid="3070562015202859996">"את/ה (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"כינוי"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"אפשר להוסיף עד <xliff:g id="USER_COUNT">%1$d</xliff:g> משתמשים"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"רק הבעלים של הטאבלט יכול לנהל משתמשים."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"רק הבעלים של הטלפון יכול לנהל משתמשים."</string>
@@ -3146,7 +3190,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"תשלום במסוף"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"הגדר אפליקציית תשלום. לאחר מכן עליך רק להצמיד את גב הטלפון למסוף שעליו מופיע סמל התשלום ללא מגע."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"הבנתי"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"עוד..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"עוד…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"הגדרה של אפליקציית התשלומים שתשמש כברירת המחדל"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"עדכון של אפליקציית התשלומים שתשמש כברירת המחדל"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"במסוף ללא מגע, יש לשלם באמצעות <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3216,9 +3260,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"הקודם"</string>
     <string name="wizard_next" msgid="3884832431439072471">"הבא"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"סיום"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"צילום תמונה"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"לבחירת תמונה"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"בחירת תמונה"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"‏כרטיסי SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"‏כרטיסי SIM"</string>
@@ -3230,7 +3271,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"השתמש תמיד עבור שיחות"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"‏בחר SIM לנתונים"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"‏יש לבחור SIM ל-SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"‏מחליף את כרטיס ה-SIM המשמש לתקשורת נתונים. הפעולה עשויה לערוך עד דקה..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"‏מתבצעת החלפה של כרטיס ה-SIM המשמש לתקשורת נתונים. הפעולה עשויה להימשך עד דקה…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"התקשר באמצעות"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"‏בחירת כרטיס SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"‏SIM ‏<xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3416,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"תרחיש, לוח זמנים, מצב חיסכון בסוללה, חיסכון בחשמל, סוללה, אוטומטי, אחוז"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"‏volte, שיחות טלפון מתקדמות; שיחות 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"הוספת שפה, להוסיף שפה"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"גודל טקסט"</string>
     <string name="default_sound" msgid="6604374495015245195">"צליל ברירת מחדל"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"עוצמת הקול של צלצול והתראות ברמה של <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"עוצמת קול, רטט ומצב \'נא לא להפריע\'"</string>
@@ -3414,13 +3456,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"הפעלת צלילים"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"כתוביות בזמן אמת"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"הוספת כתוביות אוטומטית למדיה"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ללא"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="two">הוגדרו <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים</item>
-      <item quantity="many">הוגדרו <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים</item>
-      <item quantity="other">הוגדרו <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים</item>
-      <item quantity="one">הוגדר לוח זמנים אחד</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{אין}=1{הוגדר לוח זמנים אחד}two{הוגדרו # לוחות זמנים}many{הוגדרו # לוחות זמנים}other{הוגדרו # לוחות זמנים}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"נא לא להפריע"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"שליחת התראה רק מאפליקציות ומאנשים חשובים"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"הגבלת הפרעות"</string>
@@ -3488,24 +3524,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"עדיפות בלבד"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"פועל / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"כבוי / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"כבוי"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"פועל"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"יש לשאול בכל פעם"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"עד הכיבוי"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="two">שעתיים (<xliff:g id="NUM_HOURS">%d</xliff:g>)</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> שעות</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> שעות</item>
-      <item quantity="one">שעה</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> דקות"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="two">ניתן להפעיל <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים באופן אוטומטי</item>
-      <item quantity="many">ניתן להפעיל <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים באופן אוטומטי</item>
-      <item quantity="other">ניתן להפעיל <xliff:g id="ON_COUNT">%d</xliff:g> לוחות זמנים באופן אוטומטי</item>
-      <item quantity="one">ניתן להפעיל לוח זמנים אחד באופן אוטומטי</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{שעה}two{שעתיים}many{# שעות}other{# שעות}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{דקה אחת}two{# דקות}many{# דקות}other{# דקות}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{כבוי}=1{כבוי/ניתן להפעיל לוח זמנים אחד באופן אוטומטי}two{כבוי/ניתן להפעיל # לוחות זמנים באופן אוטומטי}many{כבוי/ניתן להפעיל # לוחות זמנים באופן אוטומטי}other{כבוי/ניתן להפעיל # לוחות זמנים באופן אוטומטי}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"מה יכול להפריע לתכונה \'נא לא להפריע\'"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"אנשים"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"אפליקציות"</string>
@@ -3551,6 +3575,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"הגדרה אוטומטית של התראות בעדיפות נמוכה כ\'רמה מתונה\'"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"דירוג מותאם של התראות"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"דירוג אוטומטי של התראות לפי רלוונטיות"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"משוב להתראות מותאמות"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ציון התאמות שבוצעו בהתראות והצגת האפשרות לספק למערכת משוב"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"איפוס הגדרת החשיבות של התראות"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"איפוס הגדרות חשיבות שהמשתמש שינה ומתן הרשאה לאסיסטנט ההתראות לקביעת סדר עדיפויות"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"הצעות לפעולות ותשובות"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"הצגה אוטומטית של פעולות ותגובות מומלצות"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"הצגת התראות אחרונות והתראות שהועברו למצב נודניק"</string>
@@ -3625,7 +3653,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="1456262034599029028">"איך להציג התראות פרופיל כשהמכשיר נעול?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="6950124772255324448">"התראות פרופיל"</string>
     <string name="notifications_title" msgid="4221655533193721131">"התראות"</string>
-    <string name="app_notifications_title" msgid="248374669037385148">"התראות אפליקציה"</string>
+    <string name="app_notifications_title" msgid="248374669037385148">"התראות של האפליקציה"</string>
     <string name="notification_channel_title" msgid="8859880871692797611">"קטגוריית התראות"</string>
     <string name="notification_group_title" msgid="7525666535695631538">"קבוצת קטגוריות של התראות"</string>
     <string name="notification_importance_title" msgid="1545158655988342703">"התנהגות"</string>
@@ -3650,8 +3678,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"שיחות בעדיפות גבוהה"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"מופיעות בחלק העליון של קטע השיחות בתור בועות צפות"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"מופיעות בחלק העליון של קטע השיחות"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"שיחות אחרות"</string>
+    <string name="other_conversations" msgid="551178916855139870">"שיחות בעדיפות לא גבוהה"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"שיחות שערכת בהן שינויים"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"שיחות אחרונות"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"מחיקת פריטים אחרונים"</string>
+    <string name="clear" msgid="5092178335409471100">"ניקוי"</string>
     <string name="important_bubble" msgid="7911698275408390846">"הצגת שיחות בעדיפות גבוהה בבועות"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"שיחות בעדיפות גבוהה יוצגו בחלק העליון של חלונית ההתראות הנפתחת. בנוסף, אפשר להגדיר שיוצגו בבועות ויפריעו לתכונה \'נא לא להפריע\'."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"שיחות בעדיפות גבוהה ושיחות שנערכו בהן שינויים יופיעו כאן"</string>
@@ -3757,7 +3788,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"גישה אל \'נא לא להפריע\'"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"הפעלת ההרשאה \'נא לא להפריע\'"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"אין אפליקציות מותקנות שביקשו גישה אל \'נא לא להפריע\'"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"טוען אפליקציות..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"מתבצעת טעינה של אפליקציות…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏לבקשתך, מערכת Android לא מאפשרת להציג במכשיר הזה התראות מהאפליקציה הזו"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏לבקשתך, מערכת Android לא מאפשרת להציג במכשיר הזה התראות ששייכות לקטגוריה הזו"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‏לבקשתך, מערכת Android לא מאפשרת להציג במכשיר הזה התראות מקבוצה זו"</string>
@@ -3855,13 +3886,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"כל השיחות"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"שיחות בעדיפות גבוהה"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ללא"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="two"><xliff:g id="CONVERSATIONS">%d</xliff:g> שיחות</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> שיחות</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> שיחות</item>
-      <item quantity="one">שיחה אחת</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ללא"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{אין}=1{שיחה אחת}two{# שיחות}many{# שיחות}other{# שיחות}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"מי יכול להפריע"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"שיחות"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"שיחות"</string>
@@ -3870,13 +3895,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"כדי לוודא ששיחות מורשות יישמעו, יש לבדוק אם המכשיר מוגדר לצלצול"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"למשך ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, שיחות נכנסות ייחסמו. ניתן לשנות את ההגדרות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"אנשי קשר שמסומנים בכוכב"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="two"><xliff:g id="NUM_PEOPLE">%d</xliff:g> נוספים</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> נוספים</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> נוספים</item>
-      <item quantity="one">1 נוסף</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"אף איש קשר שסומן בכוכב"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{אין}=1{{contact_1}}=2{{contact_1} וגם {contact_2}}=3{{contact_1}, {contact_2} וגם {contact_3}}many{{contact_1}, {contact_2} ו-# אנשים נוספים}other{{contact_1}, {contact_2} ו-# אנשים נוספים}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(ללא שם)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"התראות"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"הודעות"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"הודעות"</string>
@@ -3885,13 +3905,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"למשך ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, הודעות נכנסות ייחסמו. ניתן לשנות את ההגדרות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"כל ההודעות יכולות להגיע אליך"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"כל השיחות יכולות להגיע אליך"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"אף איש קשר"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="two"><xliff:g id="NUM_CONTACTS">%d</xliff:g> אנשי קשר</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> אנשי קשר</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> אנשי קשר</item>
-      <item quantity="one">איש קשר אחד</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{אין}=1{איש קשר אחד}two{# אנשי קשר}many{# אנשי קשר}other{# אנשי קשר}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"כולם"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"אנשי קשר"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"אנשי קשר שמסומנים בכוכב"</string>
@@ -3929,26 +3943,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"כל ההתראות"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"חלק מההתראות"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"האנשים הנבחרים יוכלו ליצור איתך קשר, גם אם לא אישרת לאפליקציות להפריע"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="two"><xliff:g id="APP_NAMES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="many"><xliff:g id="APP_NAMES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> יכולה להפריע</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"עוד <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{אף אפליקציה לא יכולה להפריע}=1{האפליקציה {app_1} יכולה להפריע}=2{האפליקציות {app_1} וגם {app_2} יכולות להפריע}=3{האפליקציות {app_1}, {app_2} וגם {app_3} יכולות להפריע}many{האפליקציות {app_1}, {app_2} ועוד # יכולות להפריע}other{האפליקציות {app_1}, {app_2} ועוד # יכולות להפריע}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"אפליקציות"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"כל ההתראות"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"חלק מההתראות"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"התראות שיכולות להפריע"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"אישור לכל ההתראות"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="two">הקטגוריות <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="many">הקטגוריות <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="other">הקטגוריות <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> יכולות להפריע</item>
-      <item quantity="one">הקטגוריה <xliff:g id="SOUND_CATEGORY">%s</xliff:g> יכולה להפריע</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"שום דבר לא יכול להפריע"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"עוד <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{שום דבר לא יכול להפריע}=1{הקטגוריה {sound_category_1} יכולה להפריע}=2{הקטגוריות {sound_category_1} וגם {sound_category_2} יכולות להפריע}=3{הקטגוריות {sound_category_1}, {sound_category_2} וגם {sound_category_3} יכולות להפריע}many{האפליקציות {sound_category_1}, {sound_category_2} ועוד # יכולות להפריע}other{האפליקציות {sound_category_1}, {sound_category_2} ועוד # יכולות להפריע}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"שום דבר לא יכול להפריע"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"אף אחד לא יכול להפריע"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"אנשים מסוימים יכולים להפריע"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"כל אחד יכול להפריע"</string>
@@ -3998,8 +4000,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"פועל"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"כבוי"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"הקפאת אפליקציה"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"הקפאת אפליקציה מאפשרת לך לקבע את האפליקציה הנוכחית בתצוגה עד לביטול ההקפאה. ניתן להשתמש בתכונה, למשל, כשנותנים לחבר מהימן לשחק במשחק מסוים. \n\nלאחר הקפאת אפליקציה כלשהי, ייתכן שייפתחו אפליקציות אחרו מאותה אפליקציה ושתתאפשר גישה למידע האישי. \n\nכדי להשתמש בהקפאת אפליקציה: 	\n1.	מפעילים את הקפאת האפליקציה 	\n2.	פותחים את הסקירה הכללית 	\n3.	מקישים על סמל האפליקציה שמופיע בחלק העליון של המסך ואז מקישים על \'הקפאה\'"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"הקפאת אפליקציה מאפשרת לך לקבע את האפליקציה הנוכחית בתצוגה עד לביטול ההקפאה. ניתן להשתמש בתכונה, למשל, כשנותנים לחבר מהימן לשחק במשחק מסוים. \n\nלאחר הקפאת אפליקציה כלשהי, ייתכן שייפתחו אפליקציות אחרו מאותה אפליקציה ושתתאפשר גישה למידע האישי. \n\nכדי לשתף את המכשיר באופן מאובטח עם אדם אחר, כדאי להשתמש במשתמש אורח במקום זאת. \n\nכדי להשתמש בהקפאת אפליקציה: ←\n1.	מפעילים את הקפאת האפליקציה ←\n2.	פותחים את הסקירה הכללית ←\n3.	מקישים על סמל האפליקציה שמופיע בחלק העליון של המסך ואז מקישים על \'הקפאה\'"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"הצמדת אפליקציה מאפשרת לך לקבע את האפליקציה הנוכחית בתצוגה עד לביטול ההצמדה. ניתן להשתמש בתכונה, למשל, כשנותנים לחבר מהימן לשחק במשחק מסוים."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"לאחר הצמדת אפליקציה כלשהי, ייתכן שייפתחו אפליקציות אחרות מאותה אפליקציה ושתתאפשר גישה למידע האישי. \n\nכדי להשתמש בהצמדת אפליקציה: ←\n1.	מפעילים את הצמדת האפליקציה ←\n2.	פותחים את הסקירה הכללית ←\n3.	מקישים על סמל האפליקציה שמופיע בחלק העליון של המסך ואז מקישים על \'הצמדה\'"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"לאחר הצמדת אפליקציה כלשהי, ייתכן שייפתחו אפליקציות אחרות מאותה אפליקציה ושתתאפשר גישה למידע האישי. \n\nכדי לשתף את המכשיר באופן מאובטח עם אדם אחר, כדאי להשתמש במשתמש אורח במקום זאת. \n\nכדי להשתמש בהצמדת אפליקציה: ←\n1.	מפעילים את הקפאת האפליקציה ←\n2.	פותחים את הסקירה הכללית ←\n3.	מקישים על סמל האפליקציה שמופיע בחלק העליון של המסך ואז מקישים על \'הצמדה\'"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"לאחר שמקפיאים אפליקציה: \n\n•	 ייתכן שתתאפשר גישה למידע אישי \n		(כמו אנשי קשר ותוכן מהאימייל) \n•	 האפליקציה שהוקפאה עשויה לפתוח אפליקציות אחרות \n\nיש להשתמש בהקפאת אפליקציה רק עם אנשים מהימנים."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"בקש קו ביטול נעילה לפני ביטול הצמדה"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"בקש קוד גישה לפני ביטול הצמדה"</string>
@@ -4021,6 +4024,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"בנוסף לביטול הנעילה של המכשיר באמצעות אימות פנים, ניתן לשפר את הגנת המכשיר על ידי דרישת קוד גישה לפני הפעלתו. כל עוד המכשיר לא יופעל, לא ניתן יהיה לקבל שיחות, עדכונים או התראות.\n\nכך, אפשר להגן על הנתונים אם המכשיר ייגנב או יאבד. לדרוש קוד גישה להפעלת המכשיר?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"בנוסף לביטול הנעילה של המכשיר באמצעות אימות פנים, ניתן לשפר את הגנת המכשיר על ידי דרישת קו ביטול נעילה לפני הפעלתו. כל עוד המכשיר לא יופעל, לא ניתן יהיה לקבל שיחות, עדכונים או התראות.\n\nכך, אפשר להגן על הנתונים אם המכשיר ייגנב או יאבד. לדרוש קו ביטול נעילה להפעלת המכשיר?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"בנוסף לביטול הנעילה של המכשיר באמצעות אימות פנים, ניתן לשפר את הגנת המכשיר על ידי דרישת סיסמה לפני הפעלתו. כל עוד המכשיר לא יופעל, לא ניתן יהיה לקבל שיחות, עדכונים או התראות.\n\nכך, אפשר להגן על הנתונים אם המכשיר ייגנב או יאבד. לדרוש סיסמה להפעלת המכשיר?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"בנוסף לביטול הנעילה של המכשיר באמצעות מידע ביומטרי, אפשר לשפר את ההגנה עליו על ידי דרישת קוד אימות לפני ההפעלה. רק לאחר הפעלת המכשיר, ניתן יהיה לקבל בו שיחות, הודעות או התראות, כולל התראות קוליות.\n\nאמצעי זה יעזור להגן על נתונים במכשירים שאבדו או נגנבו. לדרוש קוד אימות כדי להפעיל את המכשיר?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"בנוסף לביטול הנעילה של המכשיר באמצעות מידע ביומטרי, אפשר לשפר את ההגנה עליו על ידי דרישת קו ביטול נעילה לפני ההפעלה. רק לאחר הפעלת המכשיר, ניתן יהיה לקבל בו שיחות, הודעות או התראות, כולל התראות קוליות.\n\nאמצעי זה יעזור להגן על נתונים במכשירים שאבדו או נגנבו. לדרוש קו ביטול נעילה כדי להפעיל את המכשיר?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"בנוסף לביטול הנעילה של המכשיר באמצעות מידע ביומטרי, אפשר לשפר את הגנת המכשיר על ידי דרישת סיסמה לפני הפעלתו. רק לאחר הפעלת המכשיר, ניתן יהיה לקבל בו שיחות, הודעות או התראות, כולל התראות קוליות.\n\nאמצעי זה יעזור להגן על נתונים במכשירים שאבדו או נגנבו. לדרוש סיסמה כדי להפעיל את המכשיר?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"כן"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"לא"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"מוגבל"</string>
@@ -4212,7 +4218,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"‏USB נשלט על ידי"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"מכשיר מחובר"</string>
     <string name="usb_control_device" msgid="527916783743021577">"מכשיר זה"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"מתבצע מעבר..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"מתבצע מעבר…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"לא ניתן היה לעבור"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"טעינת המכשיר"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"טעינת המכשיר המחובר"</string>
@@ -4361,7 +4367,7 @@
     <string name="condition_turn_on" msgid="3911077299444314791">"הפעלה"</string>
     <string name="condition_expand_show" msgid="1501084007540953213">"הצג"</string>
     <string name="condition_expand_hide" msgid="8347564076209121058">"הסתר"</string>
-    <string name="condition_hotspot_title" msgid="7903918338790641071">"הנקודה לשיתוף אינטרנט פעילה"</string>
+    <string name="condition_hotspot_title" msgid="7903918338790641071">"‏נקודת ה-hotspot פעילה"</string>
     <string name="condition_airplane_title" msgid="5847967403687381705">"מצב טיסה מופעל"</string>
     <string name="condition_airplane_summary" msgid="1964500689287879888">"הרשתות לא זמינות"</string>
     <string name="condition_zen_title" msgid="7674761111934567490">"מצב \'נא לא להפריע\' מופעל"</string>
@@ -4414,6 +4420,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"שימוש בחבילת הגלישה"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"שימוש בנתונים באפליקציות"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"‏שימוש בחבילת הגלישה ב-Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"שימוש בחבילת גלישה שאינה של הספק"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"‏שימוש בנתוני Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4434,6 +4441,7 @@
       <item quantity="one">הגבלה אחת</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ייתכן שחישוב השימוש בנתונים אצל הספק יהיה שונה מזה שבמכשיר"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"לא כולל נתונים שמשמשים את רשתות הספק"</string>
     <string name="data_used_template" msgid="8229342096562327646">"נעשה שימוש ב-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"מתי תופיע אזהרת שימוש בנתונים"</string>
     <string name="data_warning" msgid="2925054658166062884">"אזהרה לגבי שימוש בנתונים"</string>
@@ -4473,7 +4481,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"לפרטים"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"‏חוסך הנתונים (Data Saver)"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"גישה בלתי מוגבלת לנתונים"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"נתוני הרקע כבויים"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"נתוני הרקע כבויים"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"פועל"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"כבוי"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"‏שימוש בחוסך הנתונים (Data Saver)"</string>
@@ -4496,7 +4504,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"כשהמכשיר נעול לא תתאפשר הקלדת תגובות או טקסט אחר בהתראות"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ברירת מחדל לבודק איות"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"בחירת בודק איות"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"שימוש בבדיקת איות"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"שימוש בבדיקת איות"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"לא נבחר"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ללא)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4602,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"כדי לעזור בפינוי שטח אחסון, מנהל האחסון מסיר מהמכשיר שלך תמונות וסרטונים מגובים."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"הסרת תמונות וסרטונים"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"מנהל אחסון"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"שימוש במנהל אחסון"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"שימוש במנהל האחסון"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"באופן אוטומטי"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ידני"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"פינוי שטח אחסון עכשיו"</string>
@@ -4632,6 +4640,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"הקשה כפולה לבדיקת הטלפון"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"הקשה כפולה לבדיקת הטאבלט"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"הקשה כפולה לבדיקת המכשיר"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"החלקה לקריאת הודעות"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"כדי להציג את ההתראות, יש להחליק למטה בקצה התחתון של המסך"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"מצב שימוש ביד אחת"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"שימוש במצב שימוש ביד אחת"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"יציאה מהמצב בזמן החלפת אפליקציות"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"זמן קצוב לתפוגה"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 שניות"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 שניות"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 שניות"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"גישה ביד אחת"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"כדי להתעדכן מה השעה, לבדוק התראות ולהציג מידע נוסף, צריך להקיש פעמיים על המסך."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"הרמה לבדיקת הטלפון"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"הרמה לבדיקת הטאבלט"</string>
@@ -4644,6 +4662,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"הקשה לבדיקת הטאבלט"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"הקשה לבדיקת המכשיר"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"כדי להתעדכן מה השעה, לבדוק התראות ולהציג מידע נוסף, צריך להקיש על המסך."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"מקרה חירום"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"שימוש במקרה חירום"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"מנוהל על ידי <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"כדי להפעיל את הפעולות המפורטות בהמשך, יש ללחוץ על לחצן ההפעלה במהירות 5 פעמים לפחות"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"הפעלת אזעקה עם ספירה לאחור"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"הפעלת צליל חזק לפני קריאה לעזרה"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"התקשרות לקבלת עזרה"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"מספר טלפון להתקשרות לקבלת עזרה"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. יש להקיש כדי לשנות זאת"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"אם מזינים מספר טלפון שאינו לחירום:\n • צריך לבטל את הנעילה של המכשיר כדי לבצע שיחת חירום\n • ייתכן שהשיחה לא תיענה"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"החלקת טביעת אצבע לקריאת התראות"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"החלקה של טביעת אצבע"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"כדי לבדוק התראות יש להחליק כלפי מטה בחיישן טביעות האצבע שבחלק האחורי של הטלפון."</string>
@@ -4783,6 +4811,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"מקסימום מערכי נתונים גלויים"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"איפוס לערכי ברירת המחדל"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"האפשרויות למפתחים למילוי האוטומטי אופסו"</string>
+    <string name="location_category" msgid="3496759112306219062">"מיקום"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"אינדיקטור מיקום של שורת סטטוס"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"הצגת כל המיקומים, כולל רשת וקישוריות"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"‏אילוץ של הרצה מלאה של מדידות Gnss"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"‏מעקב אחר כל מערכות הניווט והתדרים של GNSS ללא מחזור פעילות"</string>
     <string name="device_theme" msgid="5027604586494772471">"עיצוב המכשיר"</string>
     <string name="default_theme" msgid="4815428567082263639">"ברירת מחדל"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"שם הרשת"</string>
@@ -4799,8 +4832,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"אפשר להשהות את ההתראות כדי שלא יפריעו לך"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"התכונה לא זמינה"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"התכונה הזו הושבתה מפני שהיא מאטה את הטלפון שלך"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"‏אילוץ של הרצה מלאה של מדידות Gnss"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"‏מעקב אחר כל מערכות הניווט והתדרים של GNSS ללא מחזור פעילות"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"הצג תמיד דו-שיח של קריסות מחשב"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"הצג דו-שיח בכל פעם שאפליקציה קורסת"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"‏בחירת אפליקציה המותאמת ל-ANGLE"</string>
@@ -4812,7 +4843,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"הפעלה לכל האפליקציות"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"בחירת מנהל ההתקן לגרפיקה"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ברירת מחדל"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"מנהל ההתקן של המשחק"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"מנהל ההתקן של המשחק"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"מנהל ההתקן למפתחים"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"מנהל ההתקן לגרפיקה של המערכת"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4868,7 +4899,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"מופעל (השתקה)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"כבוי"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"פרטי הרשת"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"‏שם המכשיר שלך גלוי לאפליקציות בטלפון שלך. כמו כן, ייתכן שאנשים אחרים יראו אותו בהתחברות למכשירי Bluetooth או כשמגדירים נקודת Wi-Fi לשיתוף אינטרנט."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"‏שם המכשיר שלך גלוי לאפליקציות בטלפון. כמו כן, ייתכן שאנשים אחרים יראו אותו בהתחברות למכשירי Bluetooth, לרשת Wi-Fi, או בהגדרת נקודת Wi-Fi לשיתוף אינטרנט."</string>
     <string name="devices_title" msgid="649715719278562515">"מכשירים"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"כל ההגדרות"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"הצעות"</string>
@@ -4881,6 +4912,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"לא נמצאו רשתות. אפשר לנסות שוב."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(אסור)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"‏אין כרטיס SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"‏אין כרטיס SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"‏אין מידע על רשת ה-Wi-Fi"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"‏נדרש כרטיס SIM כדי להתחבר לרשת ה-Wi-Fi"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"‏נדרש כרטיס SIM של <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> כדי להתחבר לרשת ה-Wi-Fi"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"‏מצב רשת מועדפת: WCDMA מועדף"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"‏מצב רשת מועדפת: GSM בלבד"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"‏מצב רשת מועדפת: WCDMA בלבד"</string>
@@ -4934,6 +4970,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"חבילת גלישה"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"שימוש בחבילת הגלישה דרך הרשת הסלולרית"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"הטלפון יעבור באופן אוטומטי לספק הזה כשיהיה בטווח"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‏אין כרטיס SIM זמין"</string>
     <string name="calls_preference" msgid="2166481296066890129">"העדפת שיחות"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‏העדפת SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"הצגת שאלה בכל פעם"</string>
@@ -4996,6 +5033,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"לא זמין כשהמכשיר מחובר ל-<xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"הצגת פריטים נוספים"</string>
     <string name="see_less" msgid="2642392725363552793">"הצג פחות"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"להפעיל את <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"‏להפעיל SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"לעבור אל <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"‏להחליף לשימוש בכרטיס SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"‏רק כרטיס SIM אחד יכול להיות פעיל בכל רגע נתון.\n\nמעבר אל <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> לא יבטל את השירות של <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"‏בכל רגע נתון אפשר להשתמש רק בכרטיס SIM אחד שהורדת.\n\nמעבר אל <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> לא יבטל את השירות של <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"‏רק כרטיס SIM אחד יכול להיות פעיל בכל רגע נתון.\n\nהחלפת כרטיס לא תבטל את השירות של <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"מעבר אל <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"מתבצעת התחברות לרשת…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"מתבצע מעבר אל <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"לא ניתן להחליף את הספק"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"לא ניתן להחליף את הספק עקב שגיאה."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"לכבות את <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"‏לכבות את כרטיס ה-SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"‏מתבצע כיבוי של כרטיס ה-SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"לא ניתן להשבית את הספק"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"משהו השתבש ולא ניתן היה להשבית את הספק."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"‏להשתמש בשני כרטיסי SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"‏מכשיר זה יכול להכיל שני כרטיסי SIM פעילים בו-זמנית. כדי להמשיך להשתמש ב-SIM אחד בכל פעם, יש להקיש על \"לא תודה\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"להפעיל את המכשיר מחדש?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"‏כדי להתחיל, יש להפעיל את המכשיר מחדש. לאחר מכן, אפשר יהיה להוסיף עוד SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"המשך"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"הפעלה מחדש"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"לא תודה"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"מעבר"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"‏לא ניתן להפעיל את ה-SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏יש להוציא את ה-SIM ולהכניס אותו חזרה. אם הבעיה נמשכת, יש להפעיל מחדש את המכשיר."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‏יש להפעיל שוב את ה-SIM. אם הבעיה נמשכת, יש להפעיל מחדש את המכשיר."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"הפעלת רשת"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> פעיל"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‏יש להקיש כדי לעדכן את ההגדרות של כרטיס ה-SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"‏כרטיס SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"‏למחוק את ה-SIM הזה שהורדת?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"‏מחיקת כרטיס ה-SIM הזה מסירה את השירות של <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> מהמכשיר הזה.\n\nהשירות של <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> לא יבוטל."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"מחיקה"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"‏מתבצעת מחיקת SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"‏לא ניתן למחוק את ה-SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"‏עקב שגיאה, לא ניתן למחוק את ה-SIM הזה.\n\nצריך להפעיל מחדש את המכשיר ולנסות שוב."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"התחברות למכשיר"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"‏האפליקציה <xliff:g id="APPNAME">%1$s</xliff:g> מבקשת להשתמש ברשת Wi-Fi זמנית כדי להתחבר למכשיר שלך"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"לא נמצאו מכשירים. יש לוודא שהמכשירים פועלים וזמינים לחיבור."</string>
@@ -5071,6 +5146,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"שיחות חירום"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"‏הספק שלך לא תומך בשיחות חירום ב-Wi-Fi.\n. הגדרות המכשיר עוברות באופן אוטומטי לרשת סלולרית כדי לבצע שיחת חירום.\nניתן לבצע שיחות חירום רק באזורים שבהם יש קליטה סלולרית."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"‏שימוש ברשת Wi-Fi לשיחות לצורך שיפור האיכות"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"‏העברת שיחות בין כרטיסי SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"‏הרשאה לקבלת שיחות והודעות SMS מ-SIM אחר ב-SIM הזה."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"‏העברת שיחות בין כרטיסי SIM"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"‏הודעת MMS נכנסת"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"‏לא ניתן לשלוח הודעת MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"‏יש להקיש כדי להתיר העברת הודעות MMS ב-<xliff:g id="OPERATOR_NAME">%1$s</xliff:g> כשחבילת הגלישה מושבתת"</string>
@@ -5122,10 +5200,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"אפשרות של שכבות-על במסכי \'הגדרות\'"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"אפליקציות שיכולות להופיע מעל אפליקציות אחרות יוכלו ליצור שכבות-על במסכי ההגדרות"</string>
     <string name="media_controls_title" msgid="403271085636252597">"מדיה"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"הנגן יוסתר כשסשן המדיה יסתיים"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"הנגן מאפשר לך להמשיך סשן מחלונית מורחבת של הגדרות מהירות."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"‏Media Player בהגדרות המהירות"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"‏הצגת Media Player לפרק זמן ממושך כדי להמשיך את ההפעלה בקלות"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"הסתרת הנגן"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"הצגת הנגן"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"אין נגנים זמינים"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"אפליקציות מורשות"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"מדיה"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"‏ה-Bluetooth יופעל"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"התכונה פועלת"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"התכונה כבויה"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"אינטרנט"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"‏כרטיסי SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"רשתות בטוחות לטיסה"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"חיפוש רשתות בטוחות לטיסה והתחברות אליהן"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"טיסה, בטוח לטיסה"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"‏שיחות והודעות SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"‏שיחות Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"‏התקשרות וקבלת שיחות באמצעות רשתות שאינן רשתות הספקים, כמו Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"‏התכונה שיחות Wi-Fi מאפשרת להתקשר ולקבל שיחות באמצעות רשתות שאינן רשתות הספקים, כמו רשתות Wi‑Fi מסוימות."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"שיחות"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"מועדפות"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"שיחות מועדפות"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"‏הודעות SMS מועדפות"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"לא זמין"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏אין כרטיס SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"העדפות"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"חיבור לרשתות ציבוריות"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"‏חיבור לרשת, אינטרנט, אלחוטי, נתונים, Wi-Fi, wi-fi, wi fi, סלולרי, נייד, ספק סלולרי, 4g,‏ 3g,‏ 2g,‏ lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"הצגת רשתות בטוחות לטיסה"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"כיבוי מצב טיסה"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"אינו זמין כאשר מצב שינה מופעל"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"הושלם איפוס הגדרת החשיבות של ההתראות."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"אפליקציות"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"מכשיר לא מהימן מבקש לקבל גישה להודעות. יש להקיש לקבלת פרטים."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"להעניק גישה להודעות?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"‏מכשיר Bluetooth לא מהימן, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], מבקש גישה להודעות.\n\nלא התחברת בעבר למכשיר [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"מכשיר לא מהימן מבקש גישה לאנשי הקשר וליומן השיחות. יש להקיש לקבלת פרטים."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"להעניק גישה לאנשי הקשר וליומן השיחות?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"‏מכשיר Bluetooth לא מהימן, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], מבקש גישה לאנשי הקשר וליומן השיחות. הגישה תכלול גם נתונים על שיחות נכנסות ויוצאות.\n\nלא התחברת בעבר למכשיר [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index a73bef3..ebdc090 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"中"</item>
     <item msgid="6740026006576843477">"長め"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"短め"</item>
+    <item msgid="7397961711906421599">"中"</item>
+    <item msgid="4079132024502041928">"長め"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"デフォルト"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA / EV-DO / GSM / WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE / EV-DO"</item>
     <item msgid="2247906254631766720">"GSM / WCDMA / LTE"</item>
-    <item msgid="1091258946200124345">"グローバル"</item>
+    <item msgid="4147872615520331421">"LTE / CDMA / EvDo / GSM / WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA のみ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR / LTE"</item>
     <item msgid="5237423971422723128">"NR / LTE / CDMA / EV-DO"</item>
     <item msgid="6856991565745877075">"NR / LTE / GSM / WCDMA"</item>
-    <item msgid="473436147270962091">"NR / LTE / CDMA / EV-DO / GSM / WCDMA"</item>
+    <item msgid="8908263949185004366">"グローバル"</item>
     <item msgid="6692179237956480280">"NR / LTE / WCDMA"</item>
     <item msgid="8160757136163231885">"NR / LTE / TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR / LTE / TDSCDMA / GSM"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 4366163..b4eb687 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"日付と時刻"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"日時の設定"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"日付、時刻、タイムゾーン、フォーマットを設定する"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"ネットワークの時刻を使用する"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"ネットワークから提供されたタイムゾーンを使用する"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"時間を自動的に設定する"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"タイムゾーンを自動的に設定する"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"言語 / 地域のデフォルトを使用する"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24時間表示"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24時間表示"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"ロック画面にプロファイル情報を表示"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"アカウント"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"位置情報"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"位置情報の使用"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"位置情報の使用"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"OFF"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ON - <xliff:g id="COUNT_1">%1$d</xliff:g> 個のアプリに位置情報へのアクセスを許可</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"画面ロック、顔認証"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"画面ロック、指紋"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"画面ロック"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"顔認証と指紋認証でスマートフォンを安全にロック解除できます"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"アプリへのログイン、お支払いの承認もできます"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ロック解除方法を設定:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"顔認証"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"スマートフォンのロック解除が簡単になります"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"指紋"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ポケットの中でスマートフォンのロックをすぐに解除できます"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"スキップ"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"次へ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"顔を追加済みです"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"顔認証を設定します"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"顔認証"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"顔で認証"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"開始"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ユーザー補助の顔認証が OFF に設定されている場合、一部の設定手順は TalkBack を使用して適切に行えないことがあります。"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"戻る"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"設定を続行"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ユーザー補助の設定を使用"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"アプリで顔認証を使用する場合、常に確認手順を要求します"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"顔認証データを削除"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"顔認証を設定"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"顔認証を使用して、デバイスのロック解除、アプリへのログイン、お支払いの承認を行えます。\n\n注:\nスマートフォンに無意識に顔を向けても、ロックが解除されることがあります。\n\nスマートフォンを顔に近づけられた場合、他のユーザーによってスマートフォンのロックが解除されることがあります。\n\n双子など、あなたによく似た人であればスマートフォンのロックを解除できる可能性があります。"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"顔認証を使用して、デバイスのロック解除、アプリへのログイン、お支払いの承認ができます。\n\n注:\nスマートフォンに無意識に顔を向けても、ロックが解除されることがあります。\n\n目を閉じているときでもスマートフォンを顔に近づけられた場合、他のユーザーによってスマートフォンのロックが解除されることがあります。\n\n双子など、あなたによく似た人であればスマートフォンのロックを解除できる可能性があります。"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"顔認証を使用して、デバイスのロック解除、アプリへのログイン、お支払いの承認を行えます。"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"注:\nスマートフォンに無意識に顔を向けても、ロックが解除されることがあります。\n\nスマートフォンを顔に近づけられた場合、他のユーザーによってスマートフォンのロックが解除されることがあります。\n\n双子など、あなたによく似た人であればスマートフォンのロックを解除できる可能性があります。"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"注:\nスマートフォンに無意識に顔を向けても、ロックが解除されることがあります。\n\n目を閉じているときでもスマートフォンを顔に近づけられた場合、他のユーザーによってスマートフォンのロックが解除されることがあります。\n\n双子など、あなたによく似た人であればスマートフォンのロックを解除できる可能性があります。"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"顔認証データを削除しますか？"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"顔認証によって使用された顔認証データは安全かつ完全に削除されます。削除後に、スマートフォンのロック解除、アプリへのログイン、お支払いの承認を行うには、PIN、パターン、パスワードのいずれかが必要になります。"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"顔認証を使用して、スマートフォンのロックを解除します"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"指紋を使って、スマートフォンのロック解除や購入の承認を行います。\n\n注: 指紋を使ってこのデバイスのロックを解除することはできません。詳しくは、組織の管理者にお問い合わせください。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"指紋を使って、スマートフォンのロック解除や購入の承認を行います。\n\n注: 指紋は複雑なパターンや PIN よりも安全面で劣る場合があります。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"キャンセル"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"利用しない"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"次へ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"スキップ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"次へ"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"画面ロックでタブレットを保護することで、紛失や盗難があった場合に誰も使用できなくなります。また、顔認証の設定にも画面ロックが必要になります。戻るには [キャンセル] をタップします。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"画面ロックでデバイスを保護することで、紛失や盗難があった場合に誰も使用できなくなります。また、顔認証の設定にも画面ロックが必要になります。戻るには [キャンセル] をタップします。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"画面ロックでスマートフォンを保護することで、紛失や盗難があった場合に誰も使用できなくなります。また、顔認証の設定にも画面ロックが必要になります。戻るには [キャンセル] をタップします。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"画面ロックでタブレットを保護することで、紛失や盗難があった場合に誰も使用できなくなります。生体認証システムを設定するには、画面ロックのオプションも必要になります。戻るには [キャンセル] をタップします。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"画面ロックでデバイスを保護することで、紛失や盗難があった場合に誰も使用できなくなります。生体認証システムを設定するには、画面ロックのオプションも必要になります。戻るには [キャンセル] をタップします。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"画面ロックでスマートフォンを保護することで、紛失や盗難があった場合に誰も使用できなくなります。生体認証システムを設定するには、画面ロックのオプションも必要になります。戻るには [キャンセル] をタップします。"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN の設定をスキップしますか？"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"パスワードの設定をスキップしますか？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"パターンの設定をスキップしますか？"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"このタブレットが他人に無断で使用されるのを防ぐには、デバイス保護機能を有効にします。利用する画面ロックを選択してください。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"このデバイスが他人に無断で使用されるのを防ぐには、デバイス保護機能を有効にします。利用する画面ロックを選択してください。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"このスマートフォンが他人に無断で使用されるのを防ぐには、デバイス保護機能を有効にします。利用する画面ロックを選択してください。"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"予備の画面ロック方式を選択してください"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"予備の画面ロック方式を選択してください"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"予備の画面ロック方式を選択してください"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"画面ロックの方法"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"画面ロックの方法"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"画面ロック"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"顔認証 + パスワード"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"顔認証を設定せずに続行"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"顔認証を使用してスマートフォンのロックを解除できます。セキュリティ上の理由により、この方法を使用する際は予備の画面ロックを選択する必要があります。"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"生体認証システム + パターン"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"生体認証システム + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"生体認証システム + パスワード"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"生体認証システムを設定せずに続行"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"生体認証システムを使ってスマートフォンのロックを解除できます。セキュリティ上の理由により、この方法を使用する場合は予備の画面ロック方式を選択する必要があります。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"管理者、暗号化ポリシー、または認証情報ストレージにより無効化"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"なし"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"スワイプ"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> 桁未満にしてください</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"デバイス管理により、最近使用した PIN は使用できません"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"一般的な PIN は IT 管理者によってブロックされています。別の PIN をお試しください。"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"無効な文字があります"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"英字が 1 文字以上必要です"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"数字が 1 つ以上必要です"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">数字以外の文字を 1 個以上使用してください</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"デバイス管理により、最近使用したパスワードは使用できません"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"一般的なパスワードは IT 管理者によってブロックされています。別のパスワードをお試しください。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"一連の数字を昇順や降順にしたり、繰り返したりすることはできません"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"確認"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"キャンセル"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-FiをONにする"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi の使用"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi の使用"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fiの設定"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ワイヤレスアクセスポイントを設定する"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"「<xliff:g id="SSID">%1$s</xliff:g>」に接続するには、下記の中心に QR コードを合わせてください"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wi‑Fi に接続するには、QR コードをスキャンしてください"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi の共有"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"この QR コードをスキャンすると、パスワードが共有されて「<xliff:g id="SSID">%1$s</xliff:g>」に接続できます"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"「<xliff:g id="SSID">%1$s</xliff:g>」に参加するには、別のデバイスでこの QR コードをスキャンしてください"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"「<xliff:g id="SSID">%1$s</xliff:g>」に接続するには、この QR コードをスキャンしてください"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"もう一度お試しください。問題が解決しない場合は、デバイスのメーカーにお問い合わせください"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"エラーが発生しました"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi パスワード: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"アクセス ポイントのパスワード: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"自動接続"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"このネットワークに近付いたら自動で接続する"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"このネットワークの近くで自動接続することをタブレットに許可する"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"圏内に入ると自動的にこのネットワークに接続するようになります"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"デバイスを追加"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"QR コードを使用して、このネットワークにデバイスを追加できます"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR コードの形式が無効です"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"システム証明書を使用"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"指定しない"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"検証しない"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"証明書が指定されていません。この接続ではプライバシーが保護されません。"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ネットワーク名が長すぎます。"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ドメインを指定する必要があります。"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"証明書が必要です。"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"接続"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi を有効にしました"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> に接続しました"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> に接続中"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"接続しています…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ネットワークに接続できませんでした"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ネットワーク圏外です"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"デバイスの MAC アドレス"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ランダム MAC アドレス"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"ランダム MAC アドレス（前回使用したもの）"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP アドレス"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ネットワークの詳細"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"サブネット マスク"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 アドレス"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"保存済みネットワーク"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"サブスクリプション"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"その他のネットワーク"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP 設定"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"このユーザーは Wi‑Fi 詳細設定を利用できません"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"保存"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"有効なゲートウェイアドレスを入力してください。"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"有効なDNSアドレスを入力してください。"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"ネットワークプレフィックス長は0～32で指定します。"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1（プライベート DNS でオーバーライドされる場合を除く）"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2（プライベート DNS でオーバーライドされる場合を除く）"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ゲートウェイ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ネットワークプレフィックス長"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"アプリがコンテンツを共有しています。インターネット接続を共有するには、アクセス ポイントを OFF にしてから再度 ON にします"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"パスワードが設定されていません"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"アクセス ポイント名"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> を ON にしています..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> を ON にしています…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"他のデバイスが <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> に接続できます"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"アクセス ポイントのパスワード"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP 周波数帯"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"スムーズ ディスプレイ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"コンテンツに応じて、リフレッシュ レートを自動的に 60 Hz から 90 Hz に変更します。電池使用量が増えます。"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"スムーズ ディスプレイ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz リフレッシュ レートの適用"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"最高のリフレッシュ レートを適用します。タップの反応とアニメーションの品質が向上します。電池使用量が増えます。"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"スクリーン アテンション"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ON / 見ている間は画面が OFF になりません"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"画面が暗いときに新着の通知が届いた場合、画面を ON にします"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"時間と情報を常に表示"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"電池使用量が増えます"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"テキストを太字にする"</string>
     <string name="title_font_size" msgid="570613010306330622">"フォントサイズ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"テキストのサイズを変更します"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM カードロック設定"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android バージョン"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android セキュリティ アップデート"</string>
     <string name="model_info" msgid="8997566254717810904">"モデル"</string>
-    <string name="model_summary" msgid="2246651782442466213">"モデル: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"モデルとハードウェア"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ハードウェア バージョン"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"装置ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APNを削除"</string>
     <string name="menu_new" msgid="6571230342655509006">"新しい APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"保存"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"破棄"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"キャンセル"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"[名前]フィールドは必須です。"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APNは必ず指定してください。"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"アプリをリセットできます"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi、モバイル、Bluetooth をリセット"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"以下を含む、すべてのネットワーク設定がリセットされます。\n\n"<li>"Wi‑Fi"</li>\n<li>"モバイルデータ"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"消去"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ダウンロードされた eSIM の消去"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"別の eSIM をダウンロードするには、携帯通信会社にお問い合わせください。この操作でモバイルのサービスプランが解約されることはありません。"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"この操作でモバイルのサービスプランが解約されることはありません。交換用 SIM のダウンロードについては、携帯通信会社にお問い合わせください。"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"設定をリセット"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"すべてのネットワーク設定をリセットしますか？この操作を取り消すことはできません。"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"すべてのネットワーク設定をリセットして、ダウンロードされた eSIM を消去しますか？この操作を取り消すことはできません。"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ネットワーク設定をリセットしました"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM を消去できません"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"エラーのためダウンロード型 SIM を消去できません。\n\nデバイスを再起動してもう一度お試しください。"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"すべてのデータを消去（出荷時リセット）"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"全データを消去（出荷時リセット）"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"この操作を行うと、以下のデータを含め、タブレットの"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Google アカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"この操作を行うと、以下のデータを含め、スマートフォンの"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Google アカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"以下のアカウントにログインしています:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"このデバイスには他にもユーザーがいます。\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"音楽"</li>\n<li>"画像"</li>\n<li>"他のユーザーデータ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"この操作を行っても、ご利用のモバイル サービス プランはキャンセルされません。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"音楽、画像、その他のユーザーデータを消去する場合は"<b>"USBストレージデータ"</b>"を消去する必要があります。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"音楽、画像、その他のユーザーデータを消去するには、"<b>"SDカード"</b>"を消去する必要があります。"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"全データを消去（出荷時リセット）"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"全データを消去（出荷時リセット）"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"この操作を行うと、以下のデータを含め、タブレットの"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Google アカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"この操作を行うと、以下のデータを含め、スマートフォンの"<b>"内部ストレージ"</b>"の全データが消去されます。\n\n"<li>"Google アカウント"</li>\n<li>"システムやアプリのデータと設定"</li>\n<li>"ダウンロードしたアプリ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"以下のアカウントにログインしています:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"このデバイスには他にもユーザーがいます。\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"音楽"</li>\n<li>"画像"</li>\n<li>"他のユーザーデータ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"この操作を行っても、ご利用のモバイル サービス プランはキャンセルされません。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"音楽、画像、その他のユーザーデータを消去する場合は "<b>"USB ストレージ データ"</b>"を消去する必要があります。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"音楽、画像、その他のユーザーデータを消去するには、"<b>"SD カード"</b>"を消去する必要があります。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USBストレージ内データの消去"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SDカード内データを消去"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"内部USBストレージ内の全データ（音楽、画像など）を消去します"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SDカード内の全データ（音楽、画像など）を消去します"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"すべてのデータを消去"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"すべてのデータを消去"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"個人情報とダウンロードしたアプリがすべて削除されます。この操作を取り消すことはできません。"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ダウンロードしたアプリや SIM を含め、個人情報がすべて削除されます。この操作を取り消すことはできません。"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"すべて消去"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"System Clearサービスが利用できないため、リセットされませんでした。"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"すべてのデータを消去しますか？"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"このユーザーは出荷時設定へのリセットを許可されていません"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"消去中"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"お待ちください..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"すべてのデータを消去"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"すべてのデータを消去"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"個人情報とダウンロードしたアプリがすべて削除されます。この操作を取り消すことはできません。"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ダウンロードしたアプリや SIM を含め、個人情報がすべて削除されます。この操作を取り消すことはできません。"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"すべてのデータを消去しますか？"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"このユーザーは出荷時設定へのリセットを許可されていません"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"消去しています"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"お待ちください…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"通話設定"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ボイスメール、着信転送、発信者番号など"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB テザリング"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"テザリングできるデバイスは<xliff:g id="MAXCONNECTION">%1$d</xliff:g>個までです。"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>のテザリングを解除します。"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"イーサネット テザリング"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"スマートフォンのインターネット接続を USB イーサネット経由で共有"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"スマートフォンのインターネット接続をイーサネット経由で共有"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"アクセス ポイントとテザリングを使用して、モバイルデータ通信により他のデバイスにインターネット接続を提供します。アプリを使ってアクセス ポイントを作成し、コンテンツを近くのデバイスと共有することもできます。"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"アクセス ポイントとテザリングを使用して、Wi-Fi やモバイルデータ通信により他のデバイスにインターネット接続を提供します。アプリを使ってアクセス ポイントを作成し、コンテンツを近くのデバイスと共有することもできます。"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ヘルプ"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetoothのスキャン"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"アプリやサービスに対し、Bluetooth が OFF の場合でも、常に付近のデバイスをスキャンすることを許可します。この設定は、位置情報を使用する機能やサービスの改善などに役立ちます。"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"仕事用プロファイル向けの位置情報サービス"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置情報によるタイムゾーン検出"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置情報によるタイムゾーン検出"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"デバイスの位置情報を使用して、現在のタイムゾーンを検出できるようにします。タイムゾーンの検出精度は、Wi-Fi スキャンなどの位置情報の設定によって異なります。"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ON"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"OFF"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"タイムゾーンの自動検出が無効です"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"位置情報によるタイムゾーン検出は無効です"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"位置情報によるタイムゾーン検出はサポートされていません"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"位置情報によるタイムゾーン検出は変更できません"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi/モバイル接続時の位置情報"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Googleの位置情報サービスで現在地をすばやく推定することをアプリに許可します。匿名の現在地データが収集され、Googleに送信されます。"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Wi-Fiで検出される現在地"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"顔認証のバックアップの設定"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"顔認証のバックアップの設定"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"顔認証のバックアップの設定"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"生体認証システムの使用には、パスワード設定が必要です"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"生体認証システムの使用には、パターン設定が必要です"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"生体認証システムの使用には、PIN 設定が必要です"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"パスワードを忘れた場合"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"パターンを忘れた場合"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN を忘れた場合"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕の設定"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"拡大"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"拡大領域"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"拡大の有効化"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"画面を拡大する際の拡大領域を選択します"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"全画面"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"画面の一部"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"全画面と画面の一部"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"画面全体を拡大します"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"画面の一部を拡大します"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ユーザー補助機能ボタンに切り替えますか？"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"トリプルタップで画面の一部を拡大すると、入力などの操作が遅くなります。\n\nユーザー補助機能ボタンを使用した拡大に切り替えますか？"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ユーザー補助機能ボタンに切り替え"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"トリプルタップによる拡大を維持"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"画面の拡大設定"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"トリプルタップで拡大"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ショートカットで拡大"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"電源ボタンで通話を終了"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"マウスポインタを拡大"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"アニメーションを無効化"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"モノラル音声"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"音声再生時のチャンネルを統合する"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"オーディオ バランス"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"左"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"右"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"モノラル音声"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"音声再生時のチャンネルを統合する"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"オーディオ バランス"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"左"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"右"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"デフォルト"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10秒"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30秒"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"通知時のバイブレーション"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"着信時のバイブレーション"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"触覚フィードバック"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> を使用"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>を開く"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"色補正の使用"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"字幕を表示"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"サポートされているアプリのみ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」の使用"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>を開く"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"色補正の使用"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"字幕の表示"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"サポートされているアプリのみ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"字幕のサイズとスタイル"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"文字サイズ: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"その他のオプション"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"第二色弱"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"第一色弱"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"第三色弱"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"グレースケール"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"赤 / 緑"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"赤 / 緑"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"青 / 黄"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"バックグラウンドでの使用の制限"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"バックグラウンドでのアプリの実行を許可"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"バックグラウンドでのアプリの実行は許可されません"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"バックグラウンドでの使用を制限できません"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"バックグラウンドでの使用を制限できません"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"バックグラウンド アクティビティの制限"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"アプリのバックグラウンド アクティビティを制限すると、アプリが正常に機能しないことがあります"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"このアプリは、電池の最適化が設定されていないため、制限することはできません。\n\nこのアプリを制限するには、電池の最適化を ON にしてください。"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"タブレットの電池使用量が通常より多くなっています"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"デバイスの電池使用量が通常より多くなっています"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"電池が通常より早くなくなる可能性があります"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"電池の状態を最適化"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"電池の使用が一時的に制限されています。タップして詳細をご確認ください。"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"スマートフォンの電池使用量が通常より多いため、予想より早く電池がなくなる可能性があります。\n\n電池を多く使用しているアプリ:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"タブレットの電池使用量が通常より多いため、予想より早く電池がなくなる可能性があります。\n\n電池を多く使用しているアプリ:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"デバイスの電池使用量が通常より多いため、予想より早く電池がなくなる可能性があります。\n\n電池を多く使用しているアプリ:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">制限されているアプリ: %1$d 個</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small></string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"電池残量の読み込み中に問題が発生しました"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"電池残量の読み込み中に問題が発生しました。タップして"<annotation id="url">"詳細をご確認ください"</annotation>"。"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"アプリを停止しますか？"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> によりスリープ状態に移行しないため、スマートフォンで電池を正常に管理できません。\n\nアプリを停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> によりスリープ状態に移行しないため、タブレットで電池を正常に管理できません。\n\nアプリを停止して、問題が解消するか試してみることができます。\n\n問題が解消しない場合、電池を長持ちさせるにはアプリのアンインストールが必要になる可能性があります。"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"スケジュールの設定"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"電池を長持ちさせる"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"充電時にオフにする"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"スマートフォンの電池が <xliff:g id="PERCENT">%1$s</xliff:g> まで充電されると、バッテリー セーバーが OFF になります"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"タブレットの電池残量が <xliff:g id="PERCENT">%1$s</xliff:g> になると、バッテリー セーバーは無効になります"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"デバイスの電池残量が <xliff:g id="PERCENT">%1$s</xliff:g> になると、バッテリー セーバーは無効になります"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"スマートフォンの電池が <xliff:g id="PERCENT">%1$s</xliff:g> 以上充電されると、バッテリー セーバーが OFF になります"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"タブレットの電池が <xliff:g id="PERCENT">%1$s</xliff:g> 以上充電されると、バッテリー セーバーが OFF になります"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"デバイスの電池が <xliff:g id="PERCENT">%1$s</xliff:g> 以上充電されると、バッテリー セーバーが OFF になります"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ON にする"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"リセット"</string>
     <string name="tts_play" msgid="2945513377250757221">"再生"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"接続の自動調整"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ネットワーク接続を自動的に管理することで、電池が長持ちし、デバイスのパフォーマンスが改善します"</string>
     <string name="credentials_title" msgid="7535942196886123656">"認証情報ストレージ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"証明書のインストール"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ストレージから証明書をインストールする"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ユーザー認証情報"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"保存されている認証情報の表示と変更"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"詳細設定"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ストレージのタイプ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ハードウェア式"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ソフトウェアのみ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"認証情報はこのユーザーには表示されません"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN とアプリ用にインストール済み"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi 用にインストール済み"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"インストールしない"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"インストールする"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"証明書はインストールされませんでした"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"このデバイスに証明書をインストールすることを <xliff:g id="APP_NAME">%s</xliff:g> に許可しますか？"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"これらの証明書により、下記のアプリと URL はあなたを特定します"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"許可しない"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"許可"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"もっと見る"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"証明書管理アプリ"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"なし"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"このアプリがインストールした証明書により、下記のアプリと URL はあなたを特定します"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"削除"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"緊急通報信号"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"緊急通報時の動作を設定します"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"バックアップ"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"セットアップしていません - 仕事用プロファイル"</string>
     <string name="user_admin" msgid="4024553191395768119">"管理者"</string>
     <string name="user_you" msgid="3070562015202859996">"自分（<xliff:g id="NAME">%s</xliff:g>）"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ニックネーム"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"最大<xliff:g id="USER_COUNT">%1$d</xliff:g>人のユーザーを追加できます"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ユーザーを管理できるのはタブレットの所有者のみです。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ユーザーを管理できるのはモバイルデバイスの所有者のみです。"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"デバイス機器でのお支払い"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"決済アプリを設定してから、スマートフォンの背面を非接触型決済マークのあるデバイスにかざしてください。"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"その他..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"その他…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"デフォルトのお支払いアプリの設定"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"デフォルトのお支払いアプリの更新"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"非接触型決済端末でのお支払いに <xliff:g id="APP">%1$s</xliff:g> を使用"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"戻る"</string>
     <string name="wizard_next" msgid="3884832431439072471">"次へ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"終了"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"写真を撮る"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"画像を選択"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"写真を選択"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIMカード"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIMカード"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"このSIMを常に通話に使用する"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"データに使用するSIMを選択してください"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS 用の SIM を選択します"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"データSIMに切り替えています。最大で1分ほどかかる場合があります..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"データ SIM に切り替えています。最大で 1 分ほどかかる場合があります…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"通話に使用するSIMを選択してください"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIMカードを選択"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIMカード番号: <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ルーティン, スケジュール, バッテリー セーバー, パワーセーバー, 電池, 自動, パーセント, 繰り返し, 定型, 消費電力, 節約, パワー, バッテリー"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE、拡張モードでの通話、4G 回線による通話"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"言語を追加, 追加 言語"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"文字サイズ"</string>
     <string name="default_sound" msgid="6604374495015245195">"デフォルトの通知音"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"着信音と通知の音量: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"音量、バイブレーション、サイレント モード"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"電源オンの音"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"自動字幕起こし"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"メディアの自動字幕起こし"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"なし"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 個のスケジュールを設定</item>
-      <item quantity="one">1 個のスケジュールを設定</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{なし}=1{1 件のスケジュールを設定}other{# 件のスケジュールを設定}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"サイレント モード"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"大切な人やアプリからの通知のみ受け取ります"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"割り込みを制限する"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"優先的な通知のみ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ON / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"OFF / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"OFF"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ON"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"毎回確認"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"OFF にするまで"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g>時間</item>
-      <item quantity="one">1時間</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g>分"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 件のスケジュールを自動的に ON にできます</item>
-      <item quantity="one">1 件のスケジュールを自動的に ON にできます</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1時間}other{#時間}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1分}other{#分}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{OFF}=1{OFF / 1 件のスケジュールを自動的に ON にできます}other{OFF / # 件のスケジュールを自動的に ON にできます}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"サイレント モードに割り込み可能なもの"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"人物"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"アプリ"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"優先度の低い通知を自動的に通知音なしに設定します"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"通知のランキングの自動調整"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"関連性を基準に通知のランキングを自動的に調整する"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"通知の自動調整に関するフィードバック"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"通知に加えた調整と、システムにフィードバックを提供するオプションが表示されます"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"重要度の設定をリセットする"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"ユーザーが変更した重要度の設定をリセットして、通知アシスタントが優先度を設定できるようにします"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"操作や返信の候補"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"操作や返信の候補が自動的に表示されます"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"最近の通知とスヌーズに設定した通知を表示します"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"優先度の高い会話"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"会話セクションの一番上にバブルとして表示されます"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"会話セクションの一番上に表示"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"他の会話"</string>
+    <string name="other_conversations" msgid="551178916855139870">"優先度の低い会話"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"設定に変更を加えた会話"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"最近の会話"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"最近の項目の消去"</string>
+    <string name="clear" msgid="5092178335409471100">"消去"</string>
     <string name="important_bubble" msgid="7911698275408390846">"優先度の高い会話をバブルとして表示"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"優先度の高い会話はプルダウン シェードの一番上に表示されます。サイレント モードに割り込んでバブルとして表示されるよう、設定することもできます。"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"優先度の高い会話や設定を変更した会話がここに表示されます"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"サイレント モードへのアクセス"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"サイレント モードを許可"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"サイレント モードへのアクセスをリクエストしたインストール済みアプリはありません"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"アプリを読み込んでいます..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"アプリを読み込んでいます…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"選択された設定に基づき、このアプリの通知はこのデバイスに表示されません"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"選択された設定に基づき、このカテゴリの通知はこのデバイスには表示されません"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"リクエストに従い、このグループの通知はこのデバイスには表示されません"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"すべての会話"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"優先度の高い会話"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"なし"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> 件の会話</item>
-      <item quantity="one">1 件の会話</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"なし"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{なし}=1{1 件の会話}other{# 件の会話}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"割り込み可能なユーザー"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通話"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"通話"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"許可した通話で必ず音が鳴るようにするには、デバイスの設定が着信音になっていることをご確認ください"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」の間、着信がブロックされます。設定を調整することで、友だち、家族などの連絡先からの着信のブロックを解除できます。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"スター付きの連絡先"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">他 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
-      <item quantity="one">他 1 人</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"なし"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{なし}=1{{contact_1}}=2{{contact_1} さんと {contact_2} さん}=3{{contact_1} さん、{contact_2} さん、{contact_3} さん}other{{contact_1} さん、{contact_2} さん、他 # 人}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"（名前なし）"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"メッセージ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"メッセージ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"メッセージ"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」の間、受信メッセージはブロックされます。設定を調整することで、友だち、家族などの連絡先からの受信メッセージのブロックを解除できます。"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"すべてのメッセージが届く"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"すべての通話が届く"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"なし"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> 件の連絡先</item>
-      <item quantity="one">1 件の連絡先</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{なし}=1{1 件の連絡先}other{# 件の連絡先}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"全員"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"連絡先"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"スター付きの連絡先"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"すべての通知"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"一部の通知"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"アプリの割り込みを許可していない場合でも、選択したユーザーからの連絡は引き続き届きます"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> が割り込み可能</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> が割り込み可能</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"他 <xliff:g id="NUMBER">%d</xliff:g> 個"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{アプリは割り込み不可}=1{{app_1} が割り込み可能}=2{{app_1} と {app_2} が割り込み可能}=3{{app_1}、{app_2}、{app_3} が割り込み可能}other{{app_1}、{app_2}、他 # 個が割り込み可能}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"アプリ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"すべての通知"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"一部の通知"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"割り込み可能な通知"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"すべての通知を許可"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> が割り込み可能</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> が割り込み可能</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"すべて割り込み不可"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"他 <xliff:g id="NUMBER">%d</xliff:g> 個"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{すべて割り込み不可}=1{{sound_category_1} が割り込み可能}=2{{sound_category_1} と {sound_category_2} が割り込み可能}=3{{sound_category_1}、{sound_category_2}、{sound_category_3} が割り込み可能}other{{sound_category_1}、{sound_category_2}、他 # 件が割り込み可能}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"すべて割り込み不可"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"すべてのユーザーが割り込み不可"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"一部のユーザーが割り込み可能"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"すべてのユーザーが割り込み可能"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ON"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"OFF"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"アプリ固定"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"アプリ固定機能を使用すると、固定を解除するまで現在のアプリを表示したままにすることができます。たとえば、この機能を使用して、信頼できる友だちが特定のゲームをプレイすることを許可できます。\n\nアプリを固定した場合、そのアプリが他のアプリを開いたり、個人データにアクセスされたりする可能性があります。\n\nアプリ固定機能を使用するには: 	\n1.	アプリ固定機能を ON にします 	\n2.	[概要] を開きます 	\n3.	画面上部のアプリアイコンをタップし、[固定] をタップします"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"アプリ固定機能を使用すると、固定を解除するまで現在のアプリを表示したままにすることができます。たとえば、この機能を使用して、信頼できる友だちが特定のゲームをプレイすることを許可できます。\n\nアプリを固定した場合、そのアプリが他のアプリを開いたり、個人データにアクセスされたりする可能性があります。\n\nデバイスを他のユーザーと安全に共有するには、代わりにゲストユーザーを使用してみてください。\n\nアプリ固定機能を使用するには: 	\n1.	アプリ固定機能を ON にします 	\n2.	[概要] を開きます 	\n3.	画面上部のアプリアイコンをタップし、[固定] をタップします"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"アプリ固定機能を使用すると、固定を解除するまで現在のアプリを表示したままにすることができます。たとえば、この機能を使用して、信頼できる友だちに特定のゲームをプレイすることを許可できます。"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"アプリを固定した場合、そのアプリが他のアプリを開いたり、個人データにアクセスしたりする可能性があります。\n\nアプリ固定機能を使用するには: 	\n1.	アプリ固定機能を ON にします 	\n2.	[概要] を開きます 	\n3.	画面上部のアプリアイコンをタップし、[固定] をタップします"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"アプリを固定した場合、そのアプリが他のアプリを開いたり、個人データにアクセスしたりする可能性があります。\n\nデバイスを他のユーザーと安全に共有するには、代わりにゲストユーザーを使用してみてください。\n\nアプリ固定機能を使用するには: 	\n1.	アプリ固定機能を ON にします 	\n2.	[概要] を開きます 	\n3.	画面上部のアプリアイコンをタップし、[固定] をタップします"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"アプリが固定されている場合: \n\n•	 個人データにアクセスされる可能性があります（連絡先、メールの内容など） \n•	 固定されたアプリが他のアプリを開く可能性があります \n\nアプリ固定機能は、信頼できる人とのみ使用してください。\n"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"画面固定の解除前にロック解除パターンを要求"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"画面固定の解除前にPINを要求"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"デバイスのロック解除に顔認証を使うだけでなく、起動時に PIN を入力することでこのデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスを紛失したり盗まれたりしてもデバイス上のデータを保護することができます。このデバイスの起動に PIN を必要としますか？"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"デバイスのロック解除に顔認証を使うだけでなく、起動時にパターンを入力することでこのデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスを紛失したり盗まれたりしてもデバイス上のデータを保護することができます。このデバイスの起動にパターンを必要としますか？"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"デバイスのロック解除に顔認証を使うだけでなく、起動時にパスワードを入力することでこのデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスを紛失したり盗まれたりしてもデバイス上のデータを保護することができます。このデバイスの起動にパスワードを必要としますか？"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"デバイスのロック解除に生体認証システムを使うだけでなく、デバイスの起動前の PIN 入力を必須すると、このデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスの紛失または盗難にあってもデバイス上のデータを保護できます。このデバイスの起動時に PIN の入力を要求するように設定しますか？"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"デバイスのロック解除に生体認証システムを使用するだけでなく、デバイスの起動前のパターン入力を必須にすると、このデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスの紛失または盗難にあってもデバイス上のデータを保護できます。このデバイスの起動時にパターンの入力を要求するように設定しますか？"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"デバイスのロック解除時に生体認証システムを使用するだけでなく、デバイス起動前のパスワード入力を必須にすると、このデバイスの保護を強化できます。デバイスが起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、デバイスの紛失または盗難にあってもデバイス上のデータを保護できます。このデバイスの起動時にパスワードの入力を要求するように設定しますか？"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"はい"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"いいえ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"制限"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB の管理"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"接続済みのデバイス"</string>
     <string name="usb_control_device" msgid="527916783743021577">"このデバイス"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"切り替えています..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"切り替えています…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"切り替えができませんでした"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"このデバイスを充電する"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"接続デバイスの充電"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"モバイルデータ使用量"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"アプリのデータ使用量"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi データ使用量"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"携帯通信会社以外のデータ使用量"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"イーサネット データ使用量"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"イーサネット"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 個の制限</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"デバイスで記録されるデータ使用量と携帯通信会社のデータ使用量は異なる場合があります"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"携帯通信会社のネットワークで使用したデータ使用量は除外しています"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> 使用"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"データ使用量を警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"警告するデータ使用量"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"詳細を表示"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"データセーバー"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"モバイルデータの無制限利用"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"バックグラウンド データは無効になっています"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"バックグラウンド データが OFF です"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ON"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"OFF"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"データセーバーを使用"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"デバイスがロックされている場合に、通知で返信などのテキストを入力できないようにする"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"デフォルトのスペル チェッカー"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"スペル チェッカーの選択"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"スペルチェックの使用"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"スペルチェックの使用"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"選択していません"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"（なし）"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ストレージの空き容量を増やすため、ストレージ マネージャはバックアップした写真や動画をお使いのデバイスから削除します。"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"写真と動画を削除"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ストレージ マネージャ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ストレージ マネージャの使用"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ストレージ管理ツールの使用"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"自動"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"手動"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"今すぐ空き容量を増やす"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"画面をダブルタップして通知を確認"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"タブレットの画面をダブルタップして通知をチェック"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"デバイスの画面をダブルタップして通知をチェック"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"スワイプで通知確認"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"画面の下端で下にスワイプすると通知が表示されます"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"片手モード"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"片手モードの使用"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"アプリの切り替え時に終了"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"タイムアウト"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4秒"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8秒"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12秒"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"片手モード"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"画面をダブルタップして、時刻、通知などの情報を確認できます。"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"スマートフォンを持ち上げて通知を確認"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"タブレットを持ち上げて通知をチェック"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"タブレットをタップしてチェックする"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"デバイスをタップしてチェックする"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"時刻、通知などの情報を確認するには、画面をタップします。"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS 緊急通報"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"SOS 緊急通報の使用"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g>によって管理されています"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"電源ボタンを 5 回以上すばやく押すと、下記の緊急時対応が開始されます"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"カウントダウン アラームを鳴らす"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"支援を求める前に大きな音が鳴ります"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"支援を求める"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"緊急通報用の電話番号"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>。タップで変更"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"緊急通報番号以外の番号を入力した場合:\n • SOS 緊急通報を使用するには、デバイスのロックを解除する必要があります\n • 電話をかけても応答がない可能性があります"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"指紋センサーをスワイプして通知を表示"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"指紋センサーのスワイプ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"スマートフォンの背面にある指紋認証センサーを下にスワイプして、通知を確認できます。"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"表示するデータセットの最大数"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"デフォルト値にリセット"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"自動入力の開発者向けオプションをリセットしました"</string>
+    <string name="location_category" msgid="3496759112306219062">"場所"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"ステータスバーの場所インジケーター"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"ネットワークや接続を含め、すべての場所で表示されます"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS 計測の完全な実行"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"デューティ サイクリングを無効にした状態で、すべての GNSS コンステレーションと頻度をトラッキングします"</string>
     <string name="device_theme" msgid="5027604586494772471">"デバイスのテーマ"</string>
     <string name="default_theme" msgid="4815428567082263639">"デフォルト"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"ネットワーク名"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"集中するために通知を一時停止する"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"この機能はご利用いただけません"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"この機能はスマートフォンのパフォーマンスを低下させるため OFF になっています"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS 計測の完全な実行"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"デューティ サイクリングを無効にした状態で、すべての GNSS コンステレーションと頻度をトラッキングします"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"クラッシュ ダイアログを常に表示"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"アプリのクラッシュが発生するごとにダイアログを表示します"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE 対応のアプリを選択してください"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"すべてのアプリで有効"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"グラフィックス ドライバの選択"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"デフォルト"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ゲームドライバ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ゲームドライバ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"システムのグラフィックス ドライバ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"ON（ミュート）"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"OFF"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"ネットワークの詳細"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"デバイス名がスマートフォンのアプリに表示されます。また、Bluetooth デバイスに接続したり Wi-Fi アクセス ポイントを設定したりすると、他のユーザーもデバイス名を確認できるようになります。"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"デバイス名がスマートフォンのアプリに表示されます。また、Bluetooth デバイスや Wi-Fi ネットワークに接続したり Wi-Fi アクセス ポイントを設定したりすると、他のユーザーもデバイス名を確認できるようになります。"</string>
     <string name="devices_title" msgid="649715719278562515">"デバイス"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"すべての設定"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"おすすめの設定"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ネットワークが見つかりませんでした。もう一度お試しください。"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"（禁止）"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM カードなし"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM なし"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"なし"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM を接続する必要があります"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> の SIM を接続する必要があります"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"優先ネットワーク モード: WCDMA 優先"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"優先ネットワーク モード: GSM のみ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"優先ネットワーク モード: WCDMA のみ"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"モバイルデータ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"モバイル ネットワーク経由でデータにアクセス"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"スマートフォンは圏内に入るとこの携帯通信会社に自動的に切り替わります"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"利用できる SIM カードがありません"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通話の設定"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS の設定"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"毎回確認"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> への接続時は利用できません"</string>
     <string name="see_more" msgid="7499355691042812723">"詳細"</string>
     <string name="see_less" msgid="2642392725363552793">"一部を表示"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> を ON にしますか？"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM を ON にしますか？"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> に切り替えますか？"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM カードの使用に切り替えますか？"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"SIM は一度に 1 つのみ有効にできます。\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> に切り替えても、<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> サービスが解約されることはありません。"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ダウンロード型 SIM は一度に 1 つのみ有効にできます。\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> に切り替えても、<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> サービスが解約されることはありません。"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"SIM は一度に 1 つのみ有効にできます。\n\n切り替えても、<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> サービスが解約されることはありません。"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> に切り替え"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ネットワークに接続しています…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> に切り替えています"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"携帯通信会社の切り替えエラー"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"エラーが発生したため、携帯通信会社を切り替えることができません。"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> を OFF にしますか？"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM を OFF にしますか？"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM を OFF にしています<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"携帯通信会社の無効化エラー"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"エラーが発生したため、携帯通信会社を無効にできませんでした。"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 枚の SIM を使用しますか？"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"このデバイスでは同時に 2 枚の SIM を使用できます。引き続き 1 枚のみを使用するには、[いいえ] をタップしてください。"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"デバイスを再起動しますか？"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"まず、デバイスを再起動します。これで、別の SIM を追加できます。"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"続行"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"再起動"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"いいえ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"切り替える"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM を有効にできません"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM カードを取り出して、もう一度挿入してください。問題が解決しない場合は、デバイスを再起動してください。"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM をもう一度 ON にしてみてください。問題が解決しない場合は、デバイスを再起動してください。"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"ネットワークの有効化"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> は有効です"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM の設定を更新するにはタップしてください"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM カード"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"このダウンロード型 SIM を消去しますか？"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"この SIM を消去すると、このデバイスから <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> サービスが削除されます。\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> のサービスが解約されることはありません。"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"消去"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM を消去しています…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM を消去できません"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"エラーのため、この SIM を消去できません。\n\nデバイスを再起動してもう一度お試しください。"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"デバイスに接続"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> アプリがデバイスに接続するために、Wi-Fi ネットワークを一時的に使用します"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"デバイスが見つかりません。デバイスの電源が入っており、接続が可能であることを確認してください。"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"緊急通報"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"お使いの携帯通信会社は、Wi‑Fi 通話による緊急通報には対応していません。\n緊急通報できるようデバイスはモバイル ネットワークに自動的に切り替わります。\n緊急通報が可能なのは、通信エリア内の地域のみです。"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"通話に Wi-Fi を使用して品質を改善する"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Cross-SIM 通話"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"この SIM での通話と SMS を別の SIM に許可する"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"Cross-SIM 通話"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"MMS メッセージの受信"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS メッセージを送信できません"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"モバイルデータが OFF のときに <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> で MMS メッセージを送受信できるようにするには、タップします"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"設定での画面オーバーレイを許可する"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"他のアプリの上に重ねて表示して設定画面をオーバーレイすることをアプリに許可します"</string>
     <string name="media_controls_title" msgid="403271085636252597">"メディア"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"メディア セッションの終了にプレーヤーを非表示にする"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"プレーヤーを使用すると、クイック設定の展開パネルからセッションを再開できます。"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"クイック設定のメディア プレーヤー"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"メディア プレーヤーを長時間表示し、再生を簡単に再開できるようにします"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"プレーヤーを非表示"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"プレーヤーを表示"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"プレーヤーなし"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"許可されているアプリ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"メディア"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth が ON になります"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ON"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"OFF"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"インターネット"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"機内で利用できるネットワーク"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"機内で利用できるネットワークを検出して接続します"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"機内、機内で利用できる"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"通話と SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 通話"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"携帯通信会社以外のネットワーク（Wi-Fi など）を利用して通話の発信と着信を行います"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi 通話では、携帯通信会社以外のネットワーク（一部の Wi-Fi ネットワークなど）を利用して通話の発信と着信を行えます。"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"通話"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"優先"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"通話優先"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS 優先"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"使用不可"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM なし"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"設定"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"パブリック ネットワークに接続する"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ネットワーク接続, インターネット, ワイヤレス, データ, wifi, Wi-Fi, ワイファイ, 携帯, モバイル, 携帯通信会社, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"機内で利用できるネットワークを表示"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"機内モードを OFF にする"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"おやすみ時間モードが ON のため利用できません"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"通知の重要度をリセットしました。"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"アプリ"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"信頼できないデバイスがメッセージにアクセスしようとしています。タップして詳細をご確認ください。"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"メッセージへのアクセスを許可しますか？"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"信頼できない Bluetooth デバイス「<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>」がメッセージにアクセスしようとしています。\n\nこれまでに「<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>」に接続したことはありません。"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"信頼できないデバイスが連絡先と通話履歴にアクセスしようとしています。タップして詳細をご確認ください。"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"連絡先と通話履歴へのアクセスを許可しますか？"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"信頼できない Bluetooth デバイス「<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>」が連絡先と通話履歴にアクセスしようとしています。これには着信や発信に関するデータも含まれます。\n\nこれまでに「<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>」に接続したことはありません。"</string>
 </resources>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index 077403f..a6c3410 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"საშუალო"</item>
     <item msgid="6740026006576843477">"ვრცელი"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ხანმოკლე"</item>
+    <item msgid="7397961711906421599">"საშუალო"</item>
+    <item msgid="4079132024502041928">"ხანგრძლივი"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ნაგულისხმევი"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"გლობალური"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"მხოლოდ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"გლობალური"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index bdf0472..64e214d 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"თარიღი და დრო"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"თარიღისა და დროის დაყენება"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"თარიღის, დროის, დროის ზონის და ფორმატების დაყენება"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"ქსელის მოწოდებული დროის გამოყენება"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"ქსელის მოწოდებული სასაათო სარტყლის გამოყენება"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"დროის ავტომატურად დაყენება"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"სასაათო სარტყლის ავტომატურად დაყენება"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ლოკალის ნაგულისხმევი პარამეტრის გამოყენება"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-საათიანი ფორმატი"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-საათიანი ფორმატი"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"პროფილის ინფორმაციის დაბლოკილ ეკრანზე ჩვენება"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ანგარიშები"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"მდებარეობა"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"მდებარეობის გამოყენება"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"მდებარეობის გამოყენება"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"გამორთული"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ჩართულია - მდებარეობაზე წვდომა აქვს <xliff:g id="COUNT_1">%1$d</xliff:g> აპს</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ეკრანის დაბლოკვა, განბლოკვა სახით"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ეკრანის დაბლოკვა, თითის ანაბეჭდი"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ეკრანის დაბლოკვა"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"უსაფრთხოდ განბლოკეთ ტელეფონი თქვენი სახით და თითის ანაბეჭდით"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"ასევე, შეგიძლიათ აპებში შესვლა და გადახდის დადასტურება"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"განბლოკვის შემდეგით დაყენება:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"სახით განბლოკვა"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"გახადეთ ტელეფონის განბლოკვა სუნთქვასავით მარტივი"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"თითის ანაბეჭდი"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"დაზოგეთ დრო ტელეფონის ჯიბეშივე განბლოკვით"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"გამოტოვება"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"შემდეგ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"სახე დამატებულია"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"სახით განბლოკვის დაყენება"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"განბლოკვა სახით"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"გამოიყენეთ თქვენი სახე ავტორიზაციისთვის"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"დაწყება"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"თუ მარტივი წვდომის მეშვეობით სახით განბლოკვა გამორთულია, დაყენების ზოგიერთი ეტაპმა შესაძლოა TalkBack-თან გამართულად არ იმუშაოს."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"უკან"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"დაყენების გაგრძელება"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ადაპტირებული დაყენება"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"აპებში სახით განბლოკვის გამოყენებისას, ყოველთვის მოითხოვეთ დადასტურება"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"სახის მონაცემ. წაშლა"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"სახით განბლოკვის დაყენება"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"გამოიყენეთ სახით განბლოკვა მოწყობილობის განსაბლოკად, აპებში შესასვლელად და გადახდების დასადასტურებლად.\n\nგაითვალისწინეთ:\nტელეფონზე შეხედვამ შეიძლება განბლოკოს ის, როდესაც ამის განზრახვა არ გაქვთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს სხვა პირმა, თუ მას თქვენი სახის პირისპირ დაიჭერს.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს ისეთმა პირმა, რომელიც ძალიან გგავთ, მაგალითად, თქვენმა იდენტურმა დამ ან ძმამ."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"გამოიყენეთ სახით განბლოკვა მოწყობილობის განსაბლოკად, აპებში შესასვლელად და გადახდების დასადასტურებლად.\n\nგაითვალისწინეთ:\nტელეფონზე შეხედვამ შეიძლება განბლოკოს ის, როდესაც ამის განზრახვა არ გაქვთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს სხვა პირმა, თუ მას თქვენი სახის პირისპირ დაიჭერს, თუნდაც თვალები დახუჭული გქონდეთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს ისეთმა პირმა, რომელიც ძალიან გგავთ, მაგალითად, თქვენმა იდენტურმა დამ ან ძმამ."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"ისარგებლეთ სახით განბლოკვით თქვენი მოწყობილობის განსაბლოკად, აპებში შესასვლელად და გადახდების დასადასტურებლად."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"გაითვალისწინეთ:\nტელეფონზე შეხედვამ შეიძლება განბლოკოს ის, როდესაც ამის განზრახვა არ გაქვთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს სხვა პირმა, თუ მას თქვენი სახის პირისპირ დაიჭერს.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს ისეთმა პირმა, რომელიც ძალიან გგავთ, მაგალითად, თქვენმა იდენტურმა დამ ან ძმამ."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"გაითვალისწინეთ:\nტელეფონზე შეხედვამ შეიძლება განბლოკოს ის, როდესაც ამის განზრახვა არ გაქვთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს სხვა პირმა, თუ მას თქვენი სახის პირისპირ დაიჭერს, თუნდაც თვალები დახუჭული გქონდეთ.\n\nთქვენი ტელეფონი შეიძლება განბლოკოს ისეთმა პირმა, რომელიც ძალიან გგავთ, მაგალითად, თქვენმა იდენტურმა დამ ან ძმამ."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"წაიშალოს სახის მონაცემები?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"სახით განბლოკვის მიერ გამოყენებული სახის მონაცემები სამუდამოდ და უსაფრთხოდ წაიშლება. ამოშლის შემდეგ, ტელეფონის განსაბლოკად, აპებში შესასვლელად და გადახდების დასადასტურებლად თქვენი PIN-კოდი, ნიმუში ან პაროლი დაგჭირდებათ."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"ტელეფონის განსაბლოკად გამოიყენეთ განბლოკვა სახით"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"გამოიყენეთ თქვენი თითის ანაბეჭდი ტელეფონის განსაბლოკად ან შენაძენების დასადასტურებლად.\n\nგაითვალისწინეთ: თითის ანაბეჭდს ამ მოწყობილობის განსაბლოკად ვერ გამოიყენებთ. დამატებითი ინფორმაციისთვის დაუკავშირდით თქვენი ორგანიზაციის ადმინისტრატორს."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"გამოიყენეთ თქვენი თითის ანაბეჭდი ტელეფონის განსაბლოკად ან შენაძენების დასადასტურებლად.\n\nგაითვალისწინეთ: თითის ანაბეჭდი შესაძლოა ნაკლებად უსაფრთხო იყოს, ვიდრე მძლავრი განმბლოკავი ნიმუში ან PIN-კოდი."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"გაუქმება"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"არა, გმადლობთ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"გაგრძელება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"გამოტოვება"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"შემდეგი"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"თქვენი ტაბლეტის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახით განბლოკვის დასაყენებლადაც. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"თქვენი მოწყობილობის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახით განბლოკვის დასაყენებლადაც. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"თქვენი ტელეფონის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. ეკრანის დაბლოკვის ვარიანტი დაგჭირდებათ სახით განბლოკვის დასაყენებლადაც. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"თქვენი ტაბლეტის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. თქვენ ასევე უნდა დააყენოთ ეკრანის დაბლოკვის ერთ-ერთი ვარიანტი, რათა ბიომეტრიული მონაცემების დაყენება შეძლოთ. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"თქვენი მოწყობილობის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. თქვენ ასევე უნდა დააყენოთ ეკრანის დაბლოკვის ერთ-ერთი ვარიანტი, რათა ბიომეტრიული მონაცემების დაყენება შეძლოთ. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"თქვენი ტელეფონის ეკრანის დაბლოკვის ვარიანტით დაცვის შემთხვევაში, ვერავინ შეძლებს მის გამოყენებას დაკარგვის ან მოპარვის შემთხვევაში. თქვენ ასევე უნდა დააყენოთ ეკრანის დაბლოკვის ერთ-ერთი ვარიანტი, რათა ბიომეტრიული მონაცემების დაყენება შეძლოთ. უკან დასაბრუნებლად შეეხეთ გაუქმებას."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"გამოტოვებთ PIN-კოდის დაყენებას?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"გამოტოვებთ პაროლის დაყენებას?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"გამოტოვებთ ნიმუშის დაყენებას?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს ტაბლეტი ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს მოწყობილობა ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"გაააქტიურეთ მოწყობილობის დაცვის ფუნქციები, რათა თქვენი ნებართვის გარეშე ეს ტელეფონი ვერავინ გამოიყენოს. აირჩიეთ ეკრანის დაბლოკვის სასურველი ხერხი."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"აირჩიეთ თქვენი სარეზერვო ეკრანის დაბლოკვის მეთოდი"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"აირჩიეთ ეკრანის დაბლოკვის სარეზერვო მეთოდი"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"აირჩიეთ ეკრანის დაბლოკვის სარეზერვო მეთოდი"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ეკრანის დაბლოკვის ვარიანტები"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ეკრანის დაბლოკვის ვარიანტები"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ეკრანის დაბლოკვა"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"განბლოკვა სახით + პაროლი"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"გაგრძელება სახით განბლოკვის გარეშე"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"თქვენი ტელეფონის განბლოკვას შეძლებთ სახის მეშვეობით. უსაფრთხოების მოსაზრებებიდან გამომდინარე, ეს ვარიანტი საჭიროებს ეკრანის დაბლოკვის სარეზერვო მეთოდსაც."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ბიომეტრიული მონაცემები + განმბლოკავი ნიმუში"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ბიომეტრიული მონაცემები + PIN-კოდი"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ბიომეტრიული მონაცემები + პაროლი"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ბიომეტრიული მონაცემების გარეშე გაგრძელება"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"თქვენი ტელეფონის განბლოკვას შეძლებთ ბიომეტრიული მონაცემების მეშვეობით. უსაფრთხოების მოსაზრებებიდან გამომდინარე, ეს ვარიანტი საჭიროებს ეკრანის დაბლოკვის სარეზერვო მეთოდსაც."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"გათიშულია ადმინისტრატორის მიერ დაშიფვრის წესების ან სამომხმარებლო მონაცემების საცავის გამო"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"არც ერთი"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"გასრიალება"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">უნდა შეიცავდეს <xliff:g id="NUMBER_0">%d</xliff:g> ციფრზე ნაკლებს</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ბოლოდროინდელი PIN-კოდის ხელახლა გამოყენება მოწყობილობის ადმინისტრატორის მიერ ნებადართული არ არის"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ხშირად გამოყენებული PIN-კოდები თქვენი IT ადმინისტრატორის მიერ დაბლოკილია. ცადეთ სხვა PIN-კოდი."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"არ უნდა შეიცავდეს არასწორ სიმბოლოს"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"უნდა შეიცავდეს მინიმუმ ერთ ასოს"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"უნდა შეიცავდეს მინიმუმ ერთ ციფრს"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">უნდა შეიცავდეს, სულ მცირე, 1 არარიცხვით სიმბოლოს</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ბოლოდროინდელი პაროლის ხელახლა გამოყენება მოწყობილობის ადმინისტრატორის მიერ ნებადართული არ არის"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ხშირად გამოყენებული პაროლები თქვენი IT ადმინისტრატორის მიერ დაბლოკილია. ცადეთ სხვა პაროლი."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ციფრების ზრდადი, კლებადი ან გამეორებადი მიმდევრობის გამოყენება ნებადართული არ არის"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"დადასტურება"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"გაუქმება"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi-ს ჩართვა"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi-ს გამოყენება"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi-ს გამოყენება"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi პარამეტრები"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"უსადენო წვდომის წერტილების დაყენება და მართვა"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"„<xliff:g id="SSID">%1$s</xliff:g>“-თან დასაკავშირებლად, ქვემოთ მოაქციეთ QR კოდი ცენტრში"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wi‑Fi ქსელთან დასაკავშირებლად დაასკანირეთ QR კოდი"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi კავშირის გაზიარება"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"„<xliff:g id="SSID">%1$s</xliff:g>“-თან დასაკავშირებლად დაასკანერეთ ეს QR კოდი და გააზიარეთ პაროლი"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"„<xliff:g id="SSID">%1$s</xliff:g>“-თან დასაკავშირებლად დაასკანირეთ ეს QR კოდი სხვა მოწყობილობით"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"„<xliff:g id="SSID">%1$s</xliff:g>“-თან დასაკავშირებლად დაასკანერეთ ეს QR კოდი"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ცადეთ ხელახლა. თუ პრობლემა არ მოგვარდება, დაუკავშირდით მოწყობილობის მწარმოებელს."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"წარმოიქმნა შეფერხება"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi ქსელის პაროლი: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"უსადენო ქსელის პაროლი: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ავტოდაკავშირება"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ტელეფონს შეეძლოს ავტომატურად დაკავშირება ამ ქსელთან ახლოს ყოფნისას"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ტაბლეტს შეეძლოს ავტომატურად დაკავშირება ამ ქსელთან ახლოს ყოფნისას"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"დაუშვით ამ ქსელთან დაკავშირება, როდესაც დიაპაზონში მოხვდება"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"მოწყობილობის დამატება"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ამ ქსელზე მოწყობილობის დასამატებლად გამოიყენეთ QR კოდი"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR კოდის ფორმატი არასწორია"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"სისტემის სერტიფიკატების გამოყენება"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"არ მსურს მიწოდება"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"არ მსურს დადასტურება"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"სერტიფიკატი მითითებული არ არის. კავშირი არ იქნება კონფიდენციალური."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ქსელის სახელი მეტისმეტად გრძელია."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"მიუთითეთ დომენი."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"საჭიროა სერტიფიკატი."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"დაკავშირება"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ჩართულია"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"დაკავშირებულია <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-თან"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"მიმდინარეობს <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-თან დაკავშირება"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"დაკავშირება…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ქსელთან დაკავშირება ვერ ხერხდება"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ქსელი არეალში არ არის"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"მოწყობილობის MAC მისამართი"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"შემთხვევითი MAC მისამართი"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"შემთხვევითი MAC მისამართი (ბოლოს გამოყენებული)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP მისამართი"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ქსელის დეტალები"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ქვექსელის ნიღაბი"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 მისამართები"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"დამახსოვრ.ქსელები"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"გამოწერები"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"სხვა ქსელები"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP პარამეტრები"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"გაფართოებული Wi‑Fi პარამეტრები ამ მომხმარებლისთვის მიუწვდომელია"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"შენახვა"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"შეიყვანეთ გეითვეის სწორი მისამართი."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"შეიყვანეთ სწორი DNS მისამართი."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"შეიყვანეთ ქსელის პრეფიქსი, რომლის სიგრძეა 0-დან 32-მდე."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (სანამ არ არის უგულებელყოფილი პირადი DNS-ის მიერ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (სანამ არ არის უგულებელყოფილი პირადი DNS-ის მიერ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"გეითვეი"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ქსელის პრეფიქსის სიგრძე"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"აპი კონტენტს აზიარებს. ინტერნეტ-კავშირის გასაზიარებლად, ჯერ გამორთეთ, შემდეგ კი ხელახლა ჩართეთ უსადენო ქსელი"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"პაროლი არაა დაყენებული"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"უსადენო ქსელის სახელი"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"მიმდინარეობს <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-ის ჩართვა…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"ირთვება <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"სხვა მოწყობილობებს შეუძლია <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-თან დაკავშირება"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"უსადენო ქსელის პაროლი"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Band"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ავტომატურად ზრდის განახლების სიხშირეს 60-დან და 90 ჰც-მდე გარკვეული კონტენტისთვის. გაზრდის ბატარეის მოხმარებას."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"იძულებითი 90 ჰც განახლების სიხშირე"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"განახლების უმაღლესი სიხშირე შეხებაზე გაუმჯობესებული რეაგირებისთვის და უფრო ერთგვაროვანი ანიმაციისთვის. გაზრდის ბატარეის მოხმარებას."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ეკრანზე ყურადღება"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ჩართულია / ეკრანი არ გამოირთვება, თუ მას უყურებთ"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"როცა ეკრანი მუქია, ის ჩაირთვება ახალი შეტყობინებებისთვის"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ყოველთვის ჩანდეს დრო და ინფო"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ბატარეის მოხმარება გაიზრდება"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"მუქი ტექსტი"</string>
     <string name="title_font_size" msgid="570613010306330622">"შრიფტის ზომა"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ტექსტის გადიდება ან დაპატარავება"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM ბარათის დაბლოკვის პარამეტრები"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-ის ვერსია"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-ის უსაფრთხოების განახლება"</string>
     <string name="model_info" msgid="8997566254717810904">"მოდელი"</string>
-    <string name="model_summary" msgid="2246651782442466213">"მოდელი: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"მოდელი და აპარატურა"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"აპარატურის ვერსია"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"მოწყობილობის ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN-ის წაშლა"</string>
     <string name="menu_new" msgid="6571230342655509006">"ახალი APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"შენახვა"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"გაუქმება"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"გაუქმება"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"სახელის ველი არ შეიძლება იყოს ცარიელი."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN არ უნდა იყოს ცარიელი."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"შესაძლებელია აპების გადაყენება"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi-ს, მობილური ინტერნეტის და Bluetooth კავშირის გადაყენება"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"ეს ქმედება ქსელის ყველა პარამეტრს გადააყენებს, მათ შორის, შემდეგს:\n\n"<li>"Wi‑Fi"</li>\n<li>"მობილური ინტერნეტი"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"ამოშლა"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ჩამოტვირთული SIM-ების ამოშლა"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"შემცვლელი SIM ბარათების ჩამოსატვირთად დაუკავშირდით თქვენს ოპერატორს. ეს ქმედება არ გააუქმებს მობილური მომსახურების მოქმედ გეგმებს."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"ეს არ გააუქმებს მობილური სერვისის მოქმედ გეგმებს. ჩამნაცვლებელი SIM-ების ჩამოსატვირთად დაუკავშირდით თქვენს ოპერატორს."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"პარამეტრების ჩამოყრა"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"გსურთ ქსელის ყველა პარამეტრის გადაყენება? ამ მოქმედებას ვერ გააუქმებთ."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"გსურთ ქსელის ყველა პარამეტრის გადაყენება და ჩამოტვირთული SIM ბარათების ამოშლა? ამ მოქმედებას ვერ გააუქმებთ."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ქსელის პარამეტრები ჩამოიყარა"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM ბარათების ამოშლა ვერ ხერხდება"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ჩამოტვირთული SIM ბარათები ვერ იშლება შეცდომის გამო.\n\nგადატვირთეთ მოწყობილობა და ხელახლა ცადეთ."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ეს ქმედება ამოშლის ყველა მონაცემს თქვენი ტაბლეტის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google ანგარიშს"</li>\n<li>"სისტემის/აპების მონაცემებსა და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ეს ქმედება ამოშლის ყველა მონაცემს თქვენი ტელეფონის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google ანგარიშს"</li>\n<li>"სისტემის/აპების მონაცემებსა და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ამჟამად შესული ხართ შემდეგ ანგარიშებში:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n" ამ მოწყობილობაზე წარმოდგენილია სხვა მომხმარებლები. \n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"მუსიკას"</li>\n<li>"ფოტოებს"</li>\n<li>"მომხმარებლის სხვა მონაცემებს"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ებს"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ეს არ გააუქმებს თქვენს მობილურ სერვისთა პაკეტს."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"მუსიკის, ფოტოების და მომხმარებლის სხვა მონაცემების წასაშლელად საჭიროა "<b>"USB მეხსიერების"</b>" წაშლა."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"მუსიკის, სურათებისა და მომხმარებლის სხვა მონაცემების წასაშლელად უნდა წაიშალოს "<b>"SD ბარათი"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ყველა მონაცემის ამოშლა (ქარხნული პარამეტრების დაბრუნება)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ეს ქმედება ამოშლის ყველა მონაცემს თქვენი ტაბლეტის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google ანგარიშს"</li>\n<li>"სისტემის/აპების მონაცემებსა და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ეს ქმედება ამოშლის ყველა მონაცემს თქვენი ტელეფონის "<b>"შიდა მეხსიერებიდან"</b>", მათ შორის:\n\n"<li>"თქვენს Google ანგარიშს"</li>\n<li>"სისტემის/აპების მონაცემებსა და პარამეტრებს"</li>\n<li>"ჩამოტვირთულ აპებს"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ამჟამად შესული ხართ შემდეგ ანგარიშებში:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n" ამ მოწყობილობაზე წარმოდგენილია სხვა მომხმარებლები. \n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"მუსიკა"</li>\n<li>"ფოტოები"</li>\n<li>"მომხმარებლის სხვა მონაცემები"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ები"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ეს არ გააუქმებს თქვენს მობილურ სერვისთა პაკეტს."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"მუსიკის, ფოტოების და მომხმარებლის სხვა მონაცემების წასაშლელად საჭიროა "<b>"USB მეხსიერების"</b>" წაშლა."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"მუსიკის, სურათებისა და მომხმარებლის სხვა მონაცემების წასაშლელად უნდა წაიშალოს "<b>"SD ბარათი"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB მეხსიერების წაშლა"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD ბარათის წაშლა"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"შიდა USB მეხსიერებიდან ყველა მონაცემების წაშლა, როგორიცაა მუსიკა ან ფოტოები"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"წაიშალოს SD ბარათის ყველა მონაცემი, როგორიცაა მუსიკა და ფოტოები"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ყველა მონაცემის ამოშლა"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ყველა მონაცემის ამოშლა"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"მთლიანად წაიშლება თქვენი პერსონალური ინფორმაცია და ჩამოტვირთული აპები. ამ მოქმედებას ვერ გააუქმებთ."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"მთლიანად წაიშლება თქვენი პერსონალური ინფორმაცია, მათ შორის, ჩამოტვირთული აპები და SIM ბარათები. ამ მოქმედებას ვერ გააუქმებთ."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ყველაფრის წაშლა"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"არ ჩამოყრილა, რადგან System Clear სამსახური მიუწვდომელია."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"გსურთ, ყველა მონაცემის ამოშლა?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ქარხნულ პარამეტრებზე დაბრუნება ამ მომხმარებლისათვის მიუწვდომელია"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ამოშლა"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"გთხოვთ, დაელოდოთ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ყველა მონაცემის ამოშლა"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ყველა მონაცემის ამოშლა"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"მთლიანად წაიშლება თქვენი პერსონალური ინფორმაცია და ჩამოტვირთული აპები. ამ მოქმედებას ვერ გააუქმებთ."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"მთლიანად წაიშლება თქვენი პერსონალური ინფორმაცია, მათ შორის, ჩამოტვირთული აპები და SIM ბარათები. ამ მოქმედებას ვერ გააუქმებთ."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"გსურთ ყველა მონაცემის ამოშლა?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ქარხნულ პარამეტრებზე დაბრუნება ამ მომხმარებლისათვის მიუწვდომელია"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"მიმდინარეობს ამოშლა"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"გთხოვთ, მოითმინოთ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"დარეკვის პარამეტრები"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ხმოვანი ფოსტის, ზარის გადამისამართების, ზარის დალოდების, დამრეკავის ID-ის დაყენება"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ტეტერინგი"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"შეუძლებელია <xliff:g id="MAXCONNECTION">%1$d</xliff:g>-ზე მეტ მოწყობილობაზე მოედმის მიერთება."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან კავშირი გაწყდება."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-ტეტერინგი"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ტელეფონის ინტერნეტ-კავშირის USB Ethernet-ის მეშვეობით გაზიარება"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ტელეფონის ინტერნეტ-კავშირის Ethernet-ის მეშვეობით გაზიარება"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"უსადენო ქსელი და ტეტერინგი მობილური ინტერნეტის სხვა მოწყობილობებთან გაზიარების საშუალებას მოგცემთ. აპებს ასევე შეუძლიათ უსადენო ქსელის შექმნა, რათა გაუზიარონ კონტენტი ახლომდებარე მოწყობილობებს."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"უსადენო ქსელი და ტეტერინგი საშუალებას მოგცემთ, გაუზიაროთ მობილური ინტერნეტი ან Wi‑Fi კავშირი სხვა მოწყობილობებს. უსადენო ქსელის შექმნა შეუძლია აპებსაც, კონტენტის გასაზიარებლად ახლომახლო მოწყობილობებთან."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"დახმარება"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth სკანირება"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"აპებისა და სერვისებისთვის სკანირების ნებართვის მინიჭება ახლომდებარე მოწყობილობების ნებისმიერ დროს აღმოსაჩენად, მაშინაც კი, როცა Bluetooth გამორთულია. მაგალითისთვის, ამის გამოყენება შესაძლებელია მდებარეობაზე დაფუძნებული ფუნქციების და სხვა სერვისების გასაუმჯობესებლად."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"მდებარეობის სერვისები სამსახურისთვის"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"მდებარეობის სასაათო სარტყლის განსაზღვრა"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"მდებარეობის სასაათო სარტყლის განსაზღვრა"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"საშუალებას იძლევა, მოწყობილობის მდებარეობის მეშვეობით განისაზღვროს მიმდინარე სასაათო სარტყელი. მდებარეობის სხვა პარამეტრებმა, მაგალითად, Wi-Fi სკანირებამ, შეიძლება იმოქმედოს სასაათო სარტყლის განსაზღვრის სიზუსტეზე."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ჩართულია"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"გამორთულია"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"სასაათო სარტყლის ავტომატური ამოცნობა გათიშულია"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"მდებარეობის სასაათო სარტყლის განსაზღვრა გათიშულია"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"მდებარეობის სასაათო სარტყლის განსაზღვრა მხარდაუჭერელია"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"მდებარეობის სასაათო სარტყლის განსაზღვრის ცვლილებები არ არის დაშვებული"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi &amp; მობილური ქსელის მდებარეობა"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"თქვენი ადგილმდებარეობის უფრო სწრაფად დასადგენად დართეთ აპებს ნება, გამოიყენონ Google-ის მდებარეობის სერვისი. ანონიმური მდებარეობის მომაცემები შეგროვდება და გაეგზავნება Google-ს."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Wi‑Fi-ს მიერ დადგენილი ადგილმდებარეობა"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"სახით განბლოკვისთვის დააყენეთ პაროლი"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"სახით განბლოკვისთვის დააყენეთ ნიმუში"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"სახით განბლოკვისთვის დააყენეთ PIN-კოდი"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ბიომეტრიული მონაცემების გამოსაყენებლად პაროლი უნდა დააყენოთ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ბიომეტრიული მონაცემების გამოსაყენებლად განმბლოკავი ნიმუში უნდა დააყენოთ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ბიომეტრიული მონაცემების გამოსაყენებლად PIN-კოდი უნდა დააყენოთ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"პაროლი დაგავიწყდათ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"დაგავიწყდათ ნიმუში?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"დაგავიწყდათ PIN-კოდი?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"სუბტიტრების პარამეტრები"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"გადიდება"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"გადიდების უბანი"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"გადიდების ჩართვა"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"აირჩიეთ უბანი (უბნები), რომელთა გამოყენებაც ეკრანის გადიდებისას გსურთ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"სრული ეკრანი"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ეკრანის ნაწილი"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"სრული ეკრანი და ეკრანის ნაწილი"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"მთლიანი ეკრანის გადიდება"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ეკრანის ნაწილის გადიდება"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"გსურთ, გადაერთოთ მარტივი წვდომის ღილაკზე?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ეკრანის რომელიმე ნაწილის გასადიდებლად სამმაგი შეხების გამოყენებით დაგვიანდება აკრეფა და სხვა მოქმედებები.\n\nგსურთ, გადაერთოთ მარტივი წვდომის ღილაკის გამოყენებაზე გასადიდებლად?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"მოხდეს მარტივი წვდომის ღილაკზე გადართვა"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"შენარჩუნდეს სამმაგი შეხება გასადიდებლად"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"გადიდების პარამეტრები"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"გადიდება სამმაგი შეხებით"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"გადიდება მალსახმობით"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ზარი შეწყდება ჩართვის ღილაკზე დაჭერით"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"მაუსის დიდი კურსორი"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ანიმაციის გათიშვა"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"მონო აუდიო"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"აუდიოს დაკვრისას არხების კომბინირება"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"აუდიოს ბალანსი"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"მარცხენა"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"მარჯვენა"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"მონო აუდიო"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"აუდიოს დაკვრისას არხების კომბინირება"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"აუდიოს ბალანსი"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"მარცხენა"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"მარჯვენა"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ნაგულისხმევი"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 წამი"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 წამი"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"შეტყობინების ვიბრაცია"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ზარის ვიბრაცია"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"რეაქცია შეხებაზე"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-ის გამოყენება"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"გახსენით <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ფერის კორექციის გამოყენება"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"წარწერების ჩვენება"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"მხოლოდ მხარდაჭერილი აპებისთვის"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-ის გამოყენება"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"გახსენით <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ფერთა კორექციის გამოყენება"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"წარწერების ჩვენება"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"მხოლოდ მხარდაჭერილი აპებისთვის"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"წარწერის ზომა და სტილი"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"ტექსტის ზომა <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"სხვა ვარიანტები"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"დეიტერანომალია"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"პროტანომალია"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ტრიტანომალია"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ნაცრისფერი ტონები"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"წითელი-მწვანე"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"წითელი-მწვანე"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ლურჯი-ყვითელი"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ფონურ რეჟიმში შეზღუდვა"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"აპისთვის ფონურ რეჟიმში მუშაობის დაშვება"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"აპს ფონურ რეჟიმში მუშაობის უფლება არ აქვს"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ფონურ რეჟიმში მოხმარების შეზღუდვა ვერ მოხერხდება"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ფონურ რეჟიმში მოხმარება ვერ შეიზღუდება"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"გსურთ ფონური აქტივობის შეზღუდვა?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"აპისთვის ფონური აქტივობის შეზღუდვის შემთხვევაში, მან შეიძლება არასათანადოდ იმუშაოს"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"რადგან ეს აპი ბატარეის ოპტიმიზებისთვის დაყენებული არაა, მას ვერ შეზღუდავთ.\n\nჩართეთ ბატარეის ოპტიმიზაცია აპის შესაზღუდავად."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ტაბლეტი ჩვეულებრივზე მეტად მოიხმარება"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"მოწყობილობა ჩვეულებრივზე მეტად მოიხმარება"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ბატარეა შესაძლოა ჩვეულებრივზე ადრე დაიცალოს"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ოპტიმიზაცია ბატარეის გამართულობისთვის"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ბატარეა დროებით შეზღუდულია. შეეხეთ, რომ შეიტყოთ მეტი."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"თქვენი ტელეფონი ჩვეულებრივზე მეტად მოიხმარებოდა. ბატარეა შესაძლოა მოსალოდნელზე ადრე დაიცალოს.\n\nაპები, რომლებიც ბატარეას ყველაზე მეტად მოიხმარს:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"თქვენი ტაბლეტი ჩვეულებრივზე მეტად მოიხმარებოდა. ბატარეა შესაძლოა მოსალოდნელზე ადრე დაიცალოს.\n\nაპები, რომლებიც ბატარეას ყველაზე მეტად მოიხმარს:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"თქვენი მოწყობილობა ჩვეულებრივზე მეტად მოიხმარებოდა. ბატარეა შესაძლოა მოსალოდნელზე ადრე დაიცალოს.\n\nაპები, რომლებიც ბატარეას ყველაზე მეტად მოიხმარს:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">შეზღუდულია %1$d აპი</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"თქვენი ბატარეის მზომის წაკითხვასთან დაკავშირებით პრობლემა დაფიქსირდა"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"თქვენი ბატარეის მზომის წაკითხვასთან დაკავშირებით პრობლემა დაფიქსირდა. შეეხეთ, რათა "<annotation id="url">"შეიტყოთ მეტი"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"გსურთ აპის შეჩერება?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"თქვენი ტელეფონი სათანადოდ ვერ მართავს ბატარეას, რადგან <xliff:g id="APP">%1$s</xliff:g> მას გამოღვიძებულ რეჟიმში ტოვებს.\n\nამის მოსაგვარებლად, შეგიძლიათ აპის შეჩერება.\n\nპრობლემის განმეორების შემთხვევაში, ბატარეის წარმადობის გასაუმჯობესებლად, შესაძლოა აპის დეინსტალაცია დაგჭირდეთ."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"თქვენი ტაბლეტი სათანადოდ ვერ მართავს ბატარეას, რადგან <xliff:g id="APP">%1$s</xliff:g> მას გამოღვიძებულ რეჟიმში ტოვებს.\n\nამის მოსაგვარებლად, შეგიძლიათ აპის შეჩერება.\n\nპრობლემის განმეორების შემთხვევაში, ბატარეის წარმადობის გასაუმჯობესებლად, შესაძლოა აპის დეინსტალაცია დაგჭირდეთ."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"განრიგის დაწესება"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ზრდის ბატარეის მუშაობის ხანგრძლივობას"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"გამოირთოს, როდესაც დაიტენება"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი ტელეფონი <xliff:g id="PERCENT">%1$s</xliff:g>-ს მიაღწევს"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი ტაბლეტი <xliff:g id="PERCENT">%1$s</xliff:g>-ს მიაღწევს"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი მოწყობილობა <xliff:g id="PERCENT">%1$s</xliff:g>-ს მიაღწევს"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი ტელეფონი <xliff:g id="PERCENT">%1$s</xliff:g>-ზე მეტად დაიტენება"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი ტაბლეტი <xliff:g id="PERCENT">%1$s</xliff:g>-ზე მეტად დაიტენება"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ბატარეის დამზოგი გამოირთვება, როდესაც თქვენი მოწყობილობა <xliff:g id="PERCENT">%1$s</xliff:g>-ზე მეტად დაიტენება"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ჩართვა"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"გადაყენება"</string>
     <string name="tts_play" msgid="2945513377250757221">"დაკვრა"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ადაპტაციური კავშირი"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ახანგრძლივებს ბატარეის მუშაობას და აუმჯობესებს მოწყობილობის შესრულებას ქსელთან კავშირის ავტომატურად მართვით."</string>
     <string name="credentials_title" msgid="7535942196886123656">"ავტორიზაციის მონაცემთა საცავი"</string>
     <string name="credentials_install" msgid="3933218407598415827">"სერტიფიკატის ინსტალაცია"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"სერტიფიკატების საცავიდან დაყენება"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"მომხმ. ავტორიზაციის მონაცემები"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"შენახული ავტორიზაციის მონაცემების ნახვა და შეცვლა"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"გაფართოებული"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"საცავის ტიპი"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"აპარატურული"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"მხოლოდ პროგრამული"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ამ მომხმარებლისთვის ავტორიზაციის მონაცემები ხელმისაწვდომი არ არის"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"დაინსტალირებულია VPN-ისა და აპებისთვის"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"დაინსტალირებულია Wi-Fi-სთვის"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"არ დაინსტალირდეს"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"ინსტალაცია მიუხედავად ამისა"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"სერტიფიკატი არ არის დაინსტალირებული"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"დაიშვას <xliff:g id="APP_NAME">%s</xliff:g>-ის მიერ სერტიფიკატების ინსტალაცია ამ მოწყობილობაზე?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"ეს სერტიფიკატები თქვენს ვინაობას გაუმჟღავნებს ქვემოთ მოცემულ აპებსა და URL-ებს"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"არ დაიშვას"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"დაიშვას"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"მეტის ჩვენება"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"სერტიფიკატის მმართველი აპი"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"არცერთი"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"ამ აპით ინსტალირებული სერტიფიკატები თქვენს ვინაობას გაუმჟღავნებს ქვემოთ მოცემულ აპებსა და URL-ებს"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"ამოშლა"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"საგანგებო დარეკვის სიგნალი"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"ქცევის დაყენება, როცა განხორციელებულია გადაუდებელი ზარი"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"სარეზერვო კოპირება"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"არ არის დაყენებული - სამუშაო პროფილი"</string>
     <string name="user_admin" msgid="4024553191395768119">"ადმინისტრატორი"</string>
     <string name="user_you" msgid="3070562015202859996">"თქვენ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"მეტსახელი"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"შეგიძლიათ დაამატოთ <xliff:g id="USER_COUNT">%1$d</xliff:g>-მდე მომხმარებელი"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"მომხმარებლების მართვა შეუძლია მხოლოდ ტაბლეტის მფლობელს."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"მომხმარებლების მართვა შეუძლია მხოლოდ ტელეფონის მფლობელს."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ტერმინალთან გადახდა"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"დააყენეთ გადახდის აპი. შემდეგ უბრალოდ მიუახლოეთ თქვენი ტელეფონის უკანა მხარე ნებისმიერ ტერმინალს, რომელსაც უკონტაქტო სიმბოლო აქვს."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"გასაგებია"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"მეტი..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"სხვა…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"გადახდის ნაგულისხმევი აპის დაყენება"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"გადახდის ნაგულისხმევი აპის განახლება"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"უკონტაქტო ტერმინალში გადახდისთვის: <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"უკან"</string>
     <string name="wizard_next" msgid="3884832431439072471">"მომდევნო"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"დასრულება"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ფოტოს გადაღება"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"სურათის არჩევა"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ფოტოს არჩევა"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM ბარათები"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM ბარათები"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ზარებისთვის მუდამ ამის გამოყენება"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"მობილური ინტერნეტისთვის SIM-ის არჩევა"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"აირჩიეთ SIM ბარათი SMS-ისთვის"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"მონაცემების SIM-ზე გადართვა, ამას შესაძლოა ერთ წუთამდე დასჭირდეს..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"მიმდინარეობს მონაცემების SIM-ზე გადართვა, ამას შესაძლოა ერთ წუთამდე დასჭირდეს…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"დარეკვა SIM-ით:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"აირჩიეთ SIM ბარათი"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"რუტინა, განრიგი, ბატარეის დამზოგი, ენერგიის დამზოგი, ბატარეა, ავტომატური, პროცენტი"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, გაუმჯობესებული დარეკვა, 4g დარეკვა"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ენის დამატება, დაამატეთ ენა"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ტექსტის ზომა"</string>
     <string name="default_sound" msgid="6604374495015245195">"ნაგულისხმევი ხმა"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ზარებისა და შეტყობინებების ხმა <xliff:g id="PERCENTAGE">%1$s</xliff:g>-ზეა"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ხმა, ვიბრაცია, არ შემაწუხოთ"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ჩართვის ხმები"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"პირდაპირი სუბტიტრები"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"მედიის ავტომ. სუბტიტრირება"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"არცერთი"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">დაყენებულია <xliff:g id="ON_COUNT">%d</xliff:g> განრიგი</item>
-      <item quantity="one">დაყენებულია 1 განრიგი</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{არცერთი}=1{დაყენებულია 1 განრიგი}other{დაყენებულია # განრიგი}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"არ შემაწუხოთ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"შეტყობინებების მიღება მხოლოდ მნიშვნელოვანი ხალხისგან და აპებიდან"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"წყვეტების შეზღუდვა"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"მხოლოდ პრიორიტეტული"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ჩართულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"გამორთულია / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"გამორთული"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ჩართული"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ყოველ ჯერზე კითხვა"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"გამორთვამდე"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> საათი</item>
-      <item quantity="one">1 საათი</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> წუთი"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> განრიგი შეიძლება ავტომატურად ჩაირთოს</item>
-      <item quantity="one">1 განრიგი შეიძლება ავტომატურად ჩაირთოს</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 საათი}other{# საათი}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 წუთი}other{# წუთი}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{გამორთულია}=1{გამორთულია / 1 განრიგი შეიძლება ავტომატურად ჩაირთოს}other{გამორთულია / # განრიგი შეიძლება ავტომატურად ჩაირთოს}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"რამ შეიძლება შეწყვიტოს „არ შემაწუხოთ“"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ხალხი"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"აპები"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"დაბალი პრიორიტეტის შეტყობინებები ავტომატურად დაყენდეს, როგორც მსუბუქი"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ადაპტირებადი შეტყობინებების კლასიფიკაცია"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"შეტყობინებების ავტომატური კლასიფიკაცია შესაბამისობის მიხედვით"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"შეტყობინებათა ადაპტირებადი გამოხმაურება"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"შეტყობინებათა დარეგულირების ცვლილებათა ასახვა და სისტემისთვის გამოხმაურების მიწოდების ვარიანტის ჩვენება"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"შეტყობინების მნიშვნელოვნობის გადაყენება"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"მომხმარებლის მიერ შეცვლილი მნიშვნელოვნობის პარამეტრების გადაყენება და შეტყობინებების ასისტენტის პრიორიტეტიზაციის დაშვება"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"შემოთავაზებული მოქმედებები და პასუხები"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"შემოთავაზებული მოქმედებების და პასუხების ავტომატურად ჩვენება"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ბოლო და ჩაჩუმებული შეტყობინებების ჩვენება"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"პრიორიტეტული საუბრები"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"მიმოწერების სექციის ზედა ნაწილში ჩვენება და მოლივლივე ბუშტის სახით გამოჩენა"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"მიმოწერების სექციის ზედა ნაწილში ჩვენება"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"სხვა საუბრები"</string>
+    <string name="other_conversations" msgid="551178916855139870">"არაპრიორიტეტული მიმოწერები"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"მიმოწერები, რომლებშიც ცვლილებები შეიტანეთ"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"ბოლო მიმოწერები"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ბოლოების გასუფთავება"</string>
+    <string name="clear" msgid="5092178335409471100">"გასუფთავება"</string>
     <string name="important_bubble" msgid="7911698275408390846">"პრიორიტეტული მიმოწერების ბუშტებად ჩვენება"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"პრიორიტეტული მიმოწერები გამოჩნდება ჩამოსაშლელი ფარდის ზედა ნაწილში. ასევე, მათი დაყენება შეგიძლიათ ისე, რომ გამოჩნდნენ ბუშტებად და შეწყვიტონ „არ შემაწუხოთ“ რეჟიმი."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"აქ გამოჩნდება პრიორიტეტული და შეცვლილი მიმოწერები"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"„არ შემაწუხოთ“ წვდომა"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"„არ შემაწუხოთ“ რეჟიმის დაშვება"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"დაუინსტალირებელმა აპებმა მოითხოვა „არ შემაწუხოთ“ წვდომა"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"აპები იტვირთება..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"მიმდინარეობს აპების ჩატვირთვა…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"თქვენი მოთხოვნის მიხედვით, Android ბლოკავს ამ აპის შეტყობინებების მოწყობილობაზე გამოჩენას"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"თქვენი მოთხოვნის მიხედვით, Android ბლოკავს შეტყობინებების ამ კატეგორიის მოწყობილობაზე გამოჩენას"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"თქვენი მოთხოვნის მიხედვით, Android ბლოკავს შეტყობინებების ამ ჯგუფის გამოჩენას მოწყობილობაზე"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ყველა საუბარი"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"პრიორიტეტული საუბრები"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"არცერთი"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> საუბარი</item>
-      <item quantity="one">1 საუბარი</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"არცერთი"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{არცერთი}=1{1 მიმოწერა}other{# მიმოწერა}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ვის შეუძლია შეწყვეტა"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ზარები"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ზარები"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"იმაში დასარწმუნებლად, რომ დაშვებული ზარები გამოსცემს ხმას, გადაამოწმეთ რომ მოწყობილობა დაყენებულია დარეკვის რეჟიმზე"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"„<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“-ის ფარგლებში შემომავალი ზარები დაბლოკილია. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ვარსკვლავით მონიშნული კონტაქტები"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> სხვა</item>
-      <item quantity="one">1 სხვა</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"არცერთი"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{არცერთი}=1{{contact_1}}=2{{contact_1} და {contact_2}}=3{{contact_1}, {contact_2} და {contact_3}}other{{contact_1}, {contact_2} და # სხვა}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(უსახელო)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"შეტყობინებები"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"შეტყობინებები"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"შეტყობინებები"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"„<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“-ის ფარგლებში შემომავალი შეტყობინებები დაბლოკილია. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"თქვენამდე მოაღწევს ყველა შეტყობინება"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"თქვენთან გამოსვლას შეძლებს ყველა ზარი"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"არცერთი"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> კონტაქტი</item>
-      <item quantity="one">1 კონტაქტი</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{არცერთი}=1{1 კონტაქტი}other{# კონტაქტი}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ნებისმიერი"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"კონტაქტები"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ვარსკვლავით მონიშნული კონტაქტები"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ყველა შეტყობინება"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ზოგიერთი შეტყობინება"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"თუნდაც აპებს შეწყვეტის უფლება არ ჰქონდეთ, არჩეულ ადამიანებს მაინც შეუძლიათ თქვენთან დაკავშირება"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g>-ს შეუძლია შეწყვეტა</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g>-ს შეუძლია შეწყვეტა</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> სხვას"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{შეწყვეტა არცერთ აპს არ შეუძლია}=1{{app_1}-ს შეუძლია შეწყვეტა}=2{{app_1}-სა და {app_2}-ს შეუძლია შეწყვეტა}=3{{app_1}-ს, {app_2}-სა და {app_3}-ს შეუძლია შეწყვეტა}other{{app_1}-ს, {app_2}-სა და # სხვას შეუძლია შეწყვეტა}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"აპები"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ყველა შეტყობინება"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ზოგიერთი შეტყობინება"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"შეტყობინებები, რომლებსაც შეწყვეტა შეუძლია"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ყველა შეტყობინების დაშვება"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>-ს შეუძლია შეწყვეტა</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g>-ს შეუძლია შეწყვეტა</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"შეწყვეტა არაფერს შეუძლია"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> სხვას"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{შეწყვეტა არაფერს შეუძლია}=1{{sound_category_1}-ს შეუძლია შეწყვეტა}=2{{sound_category_1}-სა და {sound_category_2}-ს შეუძლია შეწყვეტა}=3{{sound_category_1}-ს, {sound_category_2}-სა და{sound_category_3}-ს შეუძლია შეწყვეტა}other{{sound_category_1}-ს, {sound_category_2}-სა და # სხვას შეუძლია შეწყვეტა}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"შეწყვეტა არაფერს შეუძლია"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"შეწყვეტა არავის შეუძლია"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"შეწყვეტა შეუძლია ზოგიერთ ადამიანს"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"შეწყვეტა შეუძლია ყველას"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ჩართული"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"გამორთული"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"აპის ჩამაგრება"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"აპის ჩამაგრება საშუალებას გაძლევთ, ჩანდეს მიმდინარე აპი, სანამ ჩამაგრებას არ მოხსნით. ამ ფუნქციის გამოყენებით შეგიძლიათ, მაგალითად, სანდო მეგობარი დაუშვათ კონკრეტულ თამაშზე. \n\nროდესაც აპი ჩამაგრებულია, ჩამაგრებულმა აპმა შეიძლება გახსნას სხვა აპები და მისაწვდომი გახდეს პერსონალური მონაცემები. \n\nაპის ჩამაგრებით სარგებლობისთვის: 	\n1.	ჩართეთ აპის ჩამაგრება 	\n2.	გახსენით მიმოხილვა 	\n3.	შეეხეთ აპის ხატულას ეკრანის ზედა ნაწილში, შემდეგ შეეხეთ „ჩამაგრებას“"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"აპის ჩამაგრება საშუალებას გაძლევთ, ჩანდეს მიმდინარე აპი, სანამ ჩამაგრებას არ მოხსნით. ამ ფუნქციის გამოყენებით შეგიძლიათ, მაგალითად, სანდო მეგობარი დაუშვათ კონკრეტულ თამაშზე. \n\nროდესაც აპი ჩამაგრებულია, ჩამაგრებულმა აპმა შეიძლება გახსნას სხვა აპები და მისაწვდომი გახდეს პერსონალური მონაცემები. \n\nთუ გსურთ, უსაფრთხოდ გაუზიაროთ თქვენი მოწყობილობა სხვას, ამის ნაცვლად, ცადეთ სტუმარი მომხმარებლის გამოყენება. \n\nაპის ჩამაგრებით სარგებლობისთვის: 	\n1.	ჩართეთ აპის ჩამაგრება 	\n2.	გახსენით მიმოხილვა 	\n3.	შეეხეთ აპის ხატულას ეკრანის ზედა ნაწილში, შემდეგ შეეხეთ „ჩამაგრებას“"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"აპის ჩამაგრება საშუალებას გაძლევთ, ჩანდეს მიმდინარე აპი, სანამ ჩამაგრებას არ მოხსნით. ამ ფუნქციის გამოყენებით შეგიძლიათ, მაგალითად, სანდო მეგობარი დაუშვათ კონკრეტულ თამაშზე."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"როდესაც აპი ჩამაგრებულია, ჩამაგრებულმა აპმა შეიძლება გახსნას სხვა აპები და მისაწვდომი გახდეს პერსონალური მონაცემები. \n\nაპის ჩამაგრებით სარგებლობისთვის: 	\n1.	ჩართეთ აპის ჩამაგრება 	\n2.	გახსენით მიმოხილვა 	\n3.	შეეხეთ აპის ხატულას ეკრანის ზედა ნაწილში, შემდეგ შეეხეთ „ჩამაგრებას“"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"როდესაც აპი ჩამაგრებულია, ჩამაგრებულმა აპმა შეიძლება გახსნას სხვა აპები და მისაწვდომი გახდეს პერსონალური მონაცემები. \n\nთუ გსურთ, უსაფრთხოდ გაუზიაროთ თქვენი მოწყობილობა სხვას, ამის ნაცვლად, ცადეთ სტუმარი მომხმარებლის გამოყენება. \n\nაპის ჩამაგრებით სარგებლობისთვის: 	\n1.	ჩართეთ აპის ჩამაგრება 	\n2.	გახსენით მიმოხილვა 	\n3.	შეეხეთ აპის ხატულას ეკრანის ზედა ნაწილში, შემდეგ შეეხეთ „ჩამაგრებას“"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"როდესაც აპი ჩამაგრებულია: \n\n•		შეიძლება მისაწვდომი გახდეს პერსონალური მონაცემები \n		(მაგალითად, კონტაქტები და ელფოსტის კონტენტი) \n•		ჩამაგრებულმა აპმა შეიძლება გახსნას სხვა აპები \n\nაპის ჩამაგრება მხოლოდ სანდო ადამიანებთან გამოიყენეთ."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"ფიქსაციის მოხსნამდე განბლოკვის ნიმუშის მოთხოვნა"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"ჩამაგ. მოხსნამდე PIN-ის მოთხოვნა"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"განსაბლოკად სახის გამოყენებასთან ერთად, დამატებითი უსაფრთოხებისთვის შეგიძლიათ მოითხოვოთ, რომ ამ მოწყობილობის გასაშვებად საჭირო იყოს PIN-კოდის შეყვანა. გაშვებამდე მოწყობილობა ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nზემოაღნიშნული დაგეხმარებათ მონაცემების დაცვაში მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში. გსურთ, თქვენი მოწყობილობის გასაშვებად საჭირო იყოს PIN-კოდის შეყვანა?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"განსაბლოკად სახის გამოყენებასთან ერთად, დამატებითი უსაფრთოხებისთვის შეგიძლიათ მოითხოვოთ, რომ ამ მოწყობილობის გასაშვებად საჭირო იყოს ნიმუშის დახატვა. გაშვებამდე მოწყობილობა ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nზემოაღნიშნული დაგეხმარებათ მონაცემების დაცვაში მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში. გსურთ, თქვენი მოწყობილობის გასაშვებად საჭირო იყოს ნიმუშის დახატვა?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"განსაბლოკად სახის გამოყენებასთან ერთად, დამატებითი უსაფრთოხებისთვის შეგიძლიათ მოითხოვოთ, რომ ამ მოწყობილობის გასაშვებად საჭირო იყოს პაროლის შეყვანა. გაშვებამდე მოწყობილობა ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nზემოაღნიშნული დაგეხმარებათ მონაცემების დაცვაში მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში. გსურთ, თქვენი მოწყობილობის გასაშვებად საჭირო იყოს პაროლის შეყვანა?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"განსაბლოკად თქვენი ბიომეტრიული მონაცემების ერთად, დამატებითი უსაფრთხოებისთვის შეგიძლიათ მოითხოვოთ, რომ ამ მოწყობილობის გასაშვებად საჭირო იყოს PIN-კოდის შეყვანა. გაშვებამდე მოწყობილობა ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nზემოაღნიშნული დაგეხმარებათ მონაცემების დაცვაში მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში. გსურთ, თქვენი მოწყობილობის გასაშვებად საჭირო იყოს PIN-კოდის შეყვანა?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"განსაბლოკად თქვენი ბიომეტრიული მონაცემების გამოყენებასთან ერთად, ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად განმბლოკავი ნიმუშის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. მოხდეს განმბლოკავი ნუმუშის შეყვანის მოთხოვნა თქვენი მოწყობილობის გასაშვებად?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"განსაბლოკად ბიომეტრიული მონაცემების გამოყენებასთან ერთად, ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. მოხდეს პაროლის შეყვანის მოთხოვნა თქვენი მოწყობილობის გასაშვებად?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"დიახ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"არა"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"შეზღუდული"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB იმართება"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"დაკავშირებული მოწყობილობა"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ეს მოწყობილობა"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"მიმდინარეობს გადართვა…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"მიმდინარეობს გადართვა…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"გადართვა ვერ მოხერხდა"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ამ მოწყობილობის დატენვა"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"დაკავშირებული მოწყობილობის დატენვა"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"მობილური ინტერნეტის მოხმარება"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"აპის მონაცემთა გამოყენება"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi მონაცემთა მოხმარება"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"არაოპერატორის მონაცემთა მოხმარება"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet მონაცემთა მოხმარება"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 შეზღუდვა</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ოპერატორი თქვენ მიერ მოხმარებულ ინტერნეტს შეიძლება მოწყობილობისგან განსხვავებულად ითვლიდეს"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"გამორიცხავს მონაცემებს, რომლებსაც ოპერატორის ქსელები იყენებს"</string>
     <string name="data_used_template" msgid="8229342096562327646">"გამოყენებულია <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"მონაც. გაფრთხილების დაყენება"</string>
     <string name="data_warning" msgid="2925054658166062884">"მოხმარების შესახებ გაფრთხილება"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"დეტალების ნახვა"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"მონაცემთა დამზოგველი"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"მონაცემებზე შეუზღუდავი წვდომით"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ფონური მონაცემები გამორთულია"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ფონური მონაცემები გამორთულია"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ჩართული"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"გამორთული"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"გამოიყენეთ მონაცემთა დამზოგი"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"შეტყობინებებში პასუხების ან სხვა ტექსტის აკრეფის აკრძალვა, როცა მოწყობილობა ჩაკეტილია"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ნაგულ. მართლწერის შემმოწმებელი"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"მართლწერის შემმოწმებლის არჩევა"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"მართლწერის შემმოწმებლის გამოყენება"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"მართლწერის შემმოწმებლის გამოყენება"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"არ არის არჩეული"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(არაფერი)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"მეხსიერების გამოთავისუფლების ხელშეწყობის მიზნით, მეხსიერების მენეჯერი თქვენი მოწყობილობიდან იმ ფოტოებსა და ვიდეოებს ამოშლის, რომელთა სარეზერვო ასლებიც უკვე შექმნილია."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ფოტოებისა და ვიდეოების ამოშლა"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"მეხსიერების მენეჯერი"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"მეხსიერების მენეჯერის გამოყენება"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"მეხსიერების მმართველის გამოყენება"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ავტომატური"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"მექანიკური"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"მეხსიერების გამოთავისუფლება"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ტელეფონის შესამოწმებლად, შეეხეთ ორმაგად"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ტაბლეტის შესამოწმებლად, შეეხეთ ორმაგად"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"მოწყობილობის შესამოწმებლად, შეეხეთ ორმაგად"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"გადაფურცვლა შეტყობინებების სანახავად"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"შეტყობინებათა საჩვენებლად ეკრანის ქვედა ნაწილზე გადაფურცლეთ ქვემოთ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ცალი ხელის რეჟიმი"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ცალი ხელის რეჟიმის გამოყენება"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"გასვლა აპების გადართვისას"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ლოდინის დრო"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 წამი"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 წამი"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 წამი"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"მისაწვდომობა"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ორმაგად შეეხეთ ეკრანს დროის, შეტყობინებებისა და სხვა ინფორმაციის სანახავად."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ასწიეთ ტელეფონის შესამოწმებლად"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ასწიეთ ტაბლეტის შესამოწმებლად"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"შეეხეთ ტაბლეტის შესამოწმებლად"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"შეეხეთ მოწყობილობას შესამოწმებლად"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"დროის, შეტყობინებებისა და სხვა ინფორმაციის სანახავად შეეხეთ ეკრანს."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"საგანგებო SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"გამოიყენეთ საგანგებო SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"მართავს <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"დაიწყეთ ქვემოთ მოცემული მოქმედებები ჩართვის ღილაკზე სწრაფად 5-ჯერ ან მეტჯერ დაჭერით"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"ჩართეთ უკუთვლის სიგნალი"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"დახმარების მოთხოვნამდე ჩართეთ ხმამაღალი ხმა"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"დარეკვა დახმარების სათხოვნელად"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"ნომერი დახმარების სათხოვნელად"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. შეეხეთ შესაცვლელად"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"თუ შეგყავთ ნომერი, რომელიც გადაუდებელი დახმარების სამსახურის არ არის:\n • თქვენი მოწყობილობა განბლოკილი უნდა იყოს საგანგებო SOS-ის გამოსაყენებლად\n • თქვენს ზარს შეიძლება არ უპასუხონ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"თითის ანაბეჭდით გადაფურცვლა შეტყობინებების შესამოწმებლად"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ანაბეჭდით გადაფურცვლა"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"თქვენი შეტყობინებების შესამოწმებლად, ჩამოუსვით თითი თითის ანაბეჭდის სენსორს, რომელიც თქვენი ტელეფონის უკანა ნაწილზე მდებარეობს."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"მონაცემთა ნაკრებების მაქსიმალური რაოდენობა"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ნაგულისხმევ მნიშვნელობებზე გადაყენება"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"ავტომატური შევსების დეველოპერის პარამეტრები გადაყენებულია"</string>
+    <string name="location_category" msgid="3496759112306219062">"მდებარეობა"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"მდებარეობის ინდიკატორი სტატუსის ზოლში"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"ხმოვანი სიგნალები ყველა მდებარეობისთვის, ქსელის და კავშირის ჩათვლით"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"სრული GNSS გაზომვის განხორციელების იძულება"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ყველა GNSS კონსტელაციისა და სიხშირის აღრიცხვა, დატვირთვის კოეფიციენტის გარეშე"</string>
     <string name="device_theme" msgid="5027604586494772471">"მოწყობილობის თემა"</string>
     <string name="default_theme" msgid="4815428567082263639">"ნაგულისხმევი"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"ქსელის სახელი"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"შეტყობინებების დაპაუზება კონცენტრირების შესანარჩუნებლად"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ფუნქცია მიუწვდომელია"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"ეს ფუნქცია გამოირთო, რადგან ის ტელეფონს ანელებს"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"სრული GNSS გაზომვის განხორციელების იძულება"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ყველა GNSS კონსტელაციისა და სიხშირის აღრიცხვა, დატვირთვის კოეფიციენტის გარეშე"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"ავარიულად გათიშვის დიალოგური ფანჯრის ყოველთვის ჩვენება"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"დიალოგური ფანჯრის ყოველთვის ჩვენება, როცა აპი ავარიულად ითიშება"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"აირჩიეთ ANGLE-ის მხარდაჭერის მქონე აპი"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ჩართვა ყველა აპისთვის"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"აირჩიეთ გრაფიკული დრაივერი"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ნაგულისხმევი"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"თამაშის დრაივერი"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"თამაშის დრაივერი"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"დეველოპერების დრაივერი"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"სისტემის გრაფიკული დრაივერი"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"ჩართულია (დადუმებული)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"გამორთული"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"ქსელის დეტალები"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"თქვენი მოწყობილობის სახელი ხილულია თქვენს ტელეფონზე არსებული აპებისთვის. მისი დანახვას ასევე შეძლებენ სხვა პირები, როცა Bluetooth მოწყობილობებს დაუკავშირდებით ან Wi-Fi უსადენო ქსელით ისარგებლებთ."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"თქვენი მოწყობილობის სახელი ხილულია თქვენს ტელეფონზე არსებული აპებისთვის. მის დანახვას შეძლებენ სხვა პირებიც, როცა Bluetooth მოწყობილობებს ან Wi-Fi ქსელს დაუკავშირდებით, ან Wi-Fi უსადენო ქსელს დააყენებთ."</string>
     <string name="devices_title" msgid="649715719278562515">"მოწყობილობები"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"ყველა პარამეტრი"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"შემოთავაზებები"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ქსელები ვერ მოიძებნა. ცადეთ ხელახლა."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(აკრძალული)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM ბარათი არ არის"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM არ არის"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"არცერთი"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"დასაკავშირებლად სჭირდება SIM"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"დასაკავშირებლად სჭირდება <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-ის SIM"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ქსელის სასურველი რეჟიმი: სასურველია WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ქსელის სასურველი რეჟიმი: მხოლოდ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ქსელის სასურველი რეჟიმი: მხოლოდ WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"მობილური ინტერნეტი"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ინტერნეტზე წვდომა მობილური ქსელით"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ტელეფონი ავტომატურად გადაერთვება ამ ოპერატორზე, როდესაც არეალში მოხვდება"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ხელმისაწვდომი SIM ბარათი არ არის"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ზარების პარამეტრები"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-შეტყობინებების პარამეტრები"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ყოველთვის შეკითხვა"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"მიუწვდომელია, როცა დაკავშირებულია <xliff:g id="CARRIER">%1$s</xliff:g>-თან"</string>
     <string name="see_more" msgid="7499355691042812723">"მეტის ნახვა"</string>
     <string name="see_less" msgid="2642392725363552793">"ნაკლების ნახვა"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"გსურთ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ის ჩართვა?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"გსურთ SIM-ის ჩართვა?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"გსურთ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ზე გადართვა?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"გსურთ SIM ბარათის გამოყენებაზე გადართვა?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ყოველ ჯერზე მხოლოდ ერთი SIM ბარათი შეიძლება იყოს აქტიური.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ზე გადართვა <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-ის სერვისს არ გააუქმებს."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ყოველ ჯერზე მხოლოდ ერთი ჩამოტვირთული SIM ბარათი შეიძლება იყოს აქტიური.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ზე გადართვა <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-ის სერვისს არ გააუქმებს."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ყოველ ჯერზე მხოლოდ ერთი SIM ბარათი შეიძლება იყოს აქტიური.\n\nგადართვა <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-ის სერვისს არ გააუქმებს."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ზე გადართვა"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"მიმდინარეობს ქსელთან დაკავშირება…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"მიმდინარეობს <xliff:g id="CARRIER_NAME">%1$s</xliff:g>-ზე გადართვა"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ოპერატორის გადართვა ვერ მოხერხდა"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ოპერატორის გადართვა ვერ მოხერხდა წარმოქმნილი შეცდომის გამო."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"გამოირთოს <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"გამოირთოს SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"მიმდინარეობს SIM-ის გამორთვა<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ოპერატორი ვერ გაითიშა"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ოპერატორი ვერ გაითიშა წარმოქმნილი შეფერხების გამო."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"გამოიყენებთ 2 SIM ბარათს?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ამ მოწყობილობას შეუძლია ერთდროულად 2 SIM ბარათი ჰქონდეს აქტიური. იმისათვის, რომ განაგრძოთ ყოველ ჯერზე ერთი SIM ბარათის გამოყენება, შეეხეთ ტექსტს „არა, გმადლობთ“."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"გსურთ მოწყობილობის გადატვირთვა?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"დასაწყებად გადატვირთეთ მოწყობილობა. ამის შემდეგ შეგიძლიათ დაამატოთ სხვა SIM ბარათი."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"გაგრძელება"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"გადატვირთვა"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"არა, გმადლობთ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"გადართვა"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM ბარათის გააქტიურება ვერ ხერხდება"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ამოიღეთ SIM ბარათი და მოათავსეთ ის ხელახლა. თუ პრობლემა არ მოგვარდა, გადატვირთეთ მოწყობილობა."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ცადეთ, ხელახლა ჩართოთ SIM ბარათი. თუ პრობლემა არ მოგვარდა, გადატვირთეთ მოწყობილობა."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"ქსელის გააქტიურება"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> აქტიურია"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"შეეხეთ SIM-ბარათის პარამეტრების გასაახლებლად"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM ბარათი"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"ამოიშალოს ეს ჩამოტვირთული SIM ბარათი?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ამ SIM ბარათის ამოშლა მოწყობილობიდან <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-ის სერვისს ამოიღებს.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>-ის სერვისი არ გაუქმდება."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"ამოშლა"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"მიმდინარეობს SIM ბარათის ამოშლა…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM ბარათი ვერ იშლება"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"ეს SIM ბარათი ვერ იშლება შეცდომის გამო.\n\nგადატვირთეთ მოწყობილობა და ხელახლა ცადეთ."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"მოწყობილობასთან დაკავშირება"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> აპს სურს დროებითი Wi-Fi ქსელის გამოყენება თქვენს მოწყობილობასთან დასაკავშირებლად"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"მოწყობილობები ვერ მოიძებნა. დარწმუნდით, რომ მოწყობილობები ჩართულია და ხელმისაწვდომია დასაკავშირებლად."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"გადაუდებელი ზარები"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"გადაუდებელი ზარების Wi‑Fi დარეკვის საშუალებით შესრულება არ არის მხარდაჭერილი თქვენი ოპერატორის მიერ.\nგადაუდებელი ზარის განსახორციელებლად მოწყობილობა ავტომატურად გადაერთვება ფიჭურ ქსელზე.\nგადაუდებელი ზარები მხოლოდ იმ არეალებშია შესაძლებელი, სადაც ფიჭური კავშირგაბმულობა არსებობს."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"ხარისხის გასაუმჯობესებლად ზარებისთვის Wi‑Fi გამოიყენეთ"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"SIM-თაშორისი დარეკვა"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"დაუშვით დარეკვა სხვა SIM-ით და SMS-ები ამ SIM-ით."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"sim-თაშორისი დარეკვა"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"შემომავალი MMS შეტყობინება"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS შეტყობინების გაგზავნა ვერ ხერხდება"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"შეეხეთ MMS შეტყობინებების დასაშვებად <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>-ზე, როდესაც მობილური ინტერნეტი გამორთულია"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"პარამეტრებზე ეკრანის გადაფარვის დაშვება"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"პარამეტრების ეკრანების გადაფარვის დაშვება აპებისთვის, რომლებსაც სხვა აპების ზემოდან გამოჩენა შეუძლია"</string>
     <string name="media_controls_title" msgid="403271085636252597">"მედია"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"დამკვრელი დაიმალოს მედიასესიის დასრულებისას"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"დამკვრელი საშუალებას გაძლევთ, განაგრძოთ სესია სწრაფი პარამეტრების გაფართოებული პანელიდან."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"მედია დამკვრელი სწრაფ პარამეტრებში"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"მედია დამკვრელის ხანგრძლივი დროით ჩვენება დაკვრის მარტივად გასაგრძელებლად"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"დამკვრელის დამალვა"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"დამკვრელის ჩვენება"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"დამკვრელები მიუწვდომელია"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"დაშვებული აპები"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"მედია"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ჩაირთვება Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ჩართულია"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"გამორთულია"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"ინტერნეტი"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-ები"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"თვითმფრინავისთვის უსაფრთხო ქსელები"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"იპოვეთ და დაუკავშირდით თვითმფრინავისთვის უსაფრთხო ქსელებს"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"თვითმფრინავი, თვითმფრინავისთვის უსაფრთხო"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"ზარები და SMS-ები"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi დარეკვა"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"დარეკეთ და მიიღეთ ზარები არაოპერატორის ქსელების, მაგალითად, Wi-Fi ქსელის მეშვეობით"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi დარეკვა საშუალებას გაძლევთ, დარეკოთ და მიიღოთ ზარები არაოპერატორის ქსელების, მაგალითად, ზოგიერთი Wi-Fi ქსელის მეშვეობით."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"ზარები"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"უპირატესი"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"უპირატესია ზარები"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"უპირატესია SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"მიუწვდომელი"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM არ არის"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"პრიორიტეტები"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"საჯარო ქსელებთან დაკავშირება"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ქსელთან კავშირი, ინტერნეტი, უსადენო, მონაცემები, wifi, wi-fi, wi fi, ფიჭური, მობილური, ფიჭური ოპერატორი, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"თვითმფრინავისთვის უსაფრთხო ქსელის ნახვა"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"თვითმფრინავის რეჟიმის გამორთვა"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"მიუწვდომელია, რადგან ჩართულია ძილის დროის რეჟიმი"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"შეტყობინების მნიშვნელობის გადაყენება დასრულებულია."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"აპები"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"არასანდო მოწყობილობას თქვენს შეტყობინებებზე წვდომა სურს. შეეხეთ დეტალების სანახავად."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"დაუშვებთ შეტყობინებებზე წვდომას?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"არასანდო Bluetooth მოწყობილობას, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], თქვენს შეტყობინებებზე წვდომა სურს.\n\nაქამდე [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]-ს არ დაკავშირებიხართ."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"არასანდო მოწყობილობას თქვენს კონტაქტებსა და ზარების ჟურნალზე წვდომა სურს. შეეხეთ დეტალების სანახავად."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"დაუშვებთ წვდომას კონტაქტებსა და ზარების ჟურნალზე?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"არასანდო Bluetooth მოწყობილობას, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], თქვენს კონტაქტებსა და ზარების ჟურნალზე წვდომა სურს. ეს მოიცავს მონაცემებს შემომავალი და გამავალი ზარების შესახებ.\n\nაქამდე [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]-ს არ დაკავშირებიხართ."</string>
 </resources>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index a69562f..396d63a 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Орташа"</item>
     <item msgid="6740026006576843477">"Ұзақ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Қысқа"</item>
+    <item msgid="7397961711906421599">"Орташа"</item>
+    <item msgid="4079132024502041928">"Ұзақ"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Әдепкі"</item>
     <item msgid="4234707448428002595">"Готикалық шрифт"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Бүкіл әлем"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Тек TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Жалпы"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 20404c4..a785e88 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Күні мен уақыты"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Күні мен уақытын реттеу"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Күнін, уақытын, уақыт аймағын, форматтарды реттеу"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Желі уақытын пайдалану"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Желінің уақыт белдеуін пайдалану"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Уақытты автоматты түрде белгілеу"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Уақыт белдеуін автоматты түрде белгілеу"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Жергілікті әдепкі параметрді пайдалану"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 сағаттық формат"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 сағаттық форматты қолдану"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Бекіту экранында профайл ақпаратын көрсету"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Есептік жазбалар"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Орналасу"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Орналасу дерегін пайдалану"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Орынды пайдалану"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Өшірулі"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Қосулы – <xliff:g id="COUNT_1">%1$d</xliff:g> қолданба орналасу туралы ақпаратты пайдалана алады.</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Экранды құлыптау, Face Unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Экранды құлыптау, саусақ ізі"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Экранды құлыптау"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Телефоныңыздың құлпын бет және саусақ ізі арқылы ашыңыз"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Қолданбаларға кіріп, төлеміңізді растауыңызға болады."</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Құлыпты ашу әдісі:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face Unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Телефоныңыздың құлпын оңай ашыңыз"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Саусақ ізі"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Телефонның құлпын саусақ ізімен ашыңыз"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Өткізіп жіберу"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Келесі"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Бет енгізілді"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Face Unlock функциясын реттеу"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face Unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Бетті тану функциясын пайдаланыңыз"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Бастау"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Егер \"Face Unlock\" функциясының арнайы мүмкіндіктері өшірулі болса, кейбір реттеу қадамдары TalkBack функциясымен бірге дұрыс жұмыс істемеуі мүмкін."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Артқа"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Реттеуді жалғастыру"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Арнайы мүмкіндіктерді пайдалану"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Қолданбаларда Face Unlock функциясын пайдаланған кезде, растау қадамын сұрау"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Адам жүзі деректерін жою"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Face Unlock функциясын реттеу"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Құрылғыңыздың құлпын ашу, қолданбаларға кіру және төлемдеріңізді растау үшін Face Unlock функциясын пайдаланыңыз.\n\nЕсте сақтаңыз:\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылады.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та оның құлпын аша алады.\n\nТелефонның құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Құрылғыңыздың құлпын ашу, қолданбаларға кіру және төлемдеріңізді растау үшін Face Unlock функциясын пайдаланыңыз.\n\nЕсте сақтаңыз:\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылады.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та оның құлпын аша алады (көзіңізді жұмып тұрсаңыз да).\n\nТелефонның құлпын өзіңізге ұқсайтын біреу, мысалы, егіз бауырыңыз ашып алуы мүмкін."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Face Unlock функциясын құрылғыңыздың құлпын ашу, қолданбаларға кіру және төлемдерді растау үшін пайдаланыңыз."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Есте сақтаңыз:\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылады.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та оның құлпын аша алады.\n\nТелефонның құлпын өзіңізге қатты ұқсайтын біреу, мысалы, сыңарыңыз ашып алуы мүмкін."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Есте сақтаңыз:\nӘдейі істемесеңіз де, телефонға қараған кезде, оның құлпы ашылады.\n\nБасқа біреу телефоныңызды бетіңізге жақындатып ұстап тұрып та оның құлпын аша алады (көзіңізді жұмып тұрсаңыз да).\n\nТелефонның құлпын өзіңізге қатты ұқсайтын біреу, мысалы, сыңарыңыз ашып алуы мүмкін."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Адам жүзі туралы деректер жойылсын ба?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Face Unlock функциясы пайдаланған адам жүзі туралы деректер біржола және қауіпсіз жойылады. Жойылғаннан кейін, телефоныңыздың құлпын ашу, қолданбаларға кіру және төлемдерді растау үшін PIN коды, өрнек немесе құпия сөз қажет болады."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Телефонның құлпын ашу үшін Face Unlock функциясын пайдаланыңыз."</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Саусақ ізімен телефон құлпын ашыңыз не сатып алған нәрсені мақұлдаңыз.\n\nЕскертпе: бұл құрылғының құлпын саусақ ізімен ашу мүмкін емес. Қосымша ақпарат алу үшін ұйым әкімшісіне хабарласыңыз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Саусақ ізімен телефон құлпын ашыңыз не сатып алған нәрсені мақұлдаңыз.\n\nЕскертпе: қауіпсіздік тұрғысынан саусақ ізі күрделі өрнекке не PIN кодына қарағанда әлсіздеу болуы мүмкін."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Бас тарту"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Жоқ, рақмет"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Жалғастыру"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Өткізіп жіберу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Келесі"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Планшетіңіз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экран құлпымен қорғаңыз. Face Unlock функциясын реттеу үшін де экран құлпы қажет. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Құрылғыңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экран құлпымен қорғаңыз. Face Unlock функциясын реттеу үшін де экран құлпы қажет. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Телефоныңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмайтын етіп экран құлпымен қорғаңыз. Face Unlock функциясын реттеу үшін де экран құлпы қажет. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Планшетіңіз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Биометрика орнату үшін де экран құлпы керек. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Құрылғыңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Биометрика орнату үшін де экран құлпы керек. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Телефоныңыз жоғалғанда не ұрланғанда, оны ешкім пайдалана алмауы үшін, экранды құлыптау мүмкіндігін қолданыңыз. Биометрика орнату үшін де экран құлпы керек. Артқа оралу үшін \"Бас тарту\" түймесін түртіңіз."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN коды реттелмесін бе?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Құпия сөз реттелмесін бе?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Өрнек реттелмесін бе?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"құрылғы қорғау мүмкіндіктерін іске қосу арқылы сіздің рұқсатыңызсыз планшетті басқалардың пайдалануына жол бермеңіз. Пайдаланғыңыз келетін экран құлпын таңдаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы құрылғыны рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Құрылғыны қорғау мүмкіндіктерін белсендіру арқылы басқалардың осы телефонды рұқсатыңызсыз пайдалануын болдырмаңыз. Пайдаланғыңыз келетін экран бекітпесін таңдаңыз."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Сақтық көшірме экранын құлыптау әдісін таңдаңыз"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Қосымша экран құлпы әдісін таңдаңыз"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Қосымша экран құлпы әдісін таңдаңыз"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Экран құлпы опциялары"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Экран құлпы опциялары"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Экран құлпы"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face unlock + құпия сөз"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Face Unlock функциясынсыз жалғастыру"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Телефонның құлпын бетті тану функциясымен ашуға болады. Қауіпсіздік мақсатында бұл опцияға қосымша экран құлпы керек болады."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрика + Өрнек"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрика + PIN коды"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрика + Құпия сөз"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Биометрикасыз жалғастыру"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Телефоныңыздың құлпын биометрика арқылы ашуыңызға болады. Қауіпсіздік мақсатында бұл опцияға қосымша экран құлпы керек болады."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Әкімші, шифрлау саясаты немесе тіркелкі деректерінің жады өшірген"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ешқандай"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Экранды сырғыту"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> таңбадан аз болуы керек</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Құрылғы әкімшісі жақында пайдаланылған PIN кодын қолдануға рұқсат бермейді"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"АТ әкімшісі оңай PIN кодтарына тыйым салды. Басқа PIN кодын енгізіп көріңіз."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Жарамсыз таңба болмауы керек"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Кемінде бір әріп болуы керек"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Кемінде бір сан болуы керек"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Кемінде 1 сандық емес таңба болуы керек.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Құрылғы әкімшісі жуықтағы құпиясөзді қолдануға рұқсат бермейді"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Оңай құпия сөздерге АТ әкімшісі тыйым салды. Басқа құпия сөз енгізіп көріңіз."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Сандардың артатын, кемитін немесе қайталанатын ретіне рұқсат берілмейді"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Растау"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Бас тарту"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi қосу"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi пайдалану"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi пайдалану"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi параметрлері"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Сымсыз қол жетімділік нүктесін орнату және басқару"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” желісіне жалғау үшін төмендегі QR кодын ортасына туралаңыз"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR кодын сканерлеп, Wi‑Fi желісіне жалғаныңыз"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi желісін бөлісу"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"\"<xliff:g id="SSID">%1$s</xliff:g>\" желісіне жалғану үшін QR кодын сканерлеңіз және құпия сөзді бөлісіңіз."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"\"<xliff:g id="SSID">%1$s</xliff:g>\" желісіне қосылу үшін бұл QR кодын басқа құрылғымен сканерлеңіз."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"\"<xliff:g id="SSID">%1$s</xliff:g>\" желісіне жалғану үшін осы QR кодын сканерлеңіз."</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Қайталап көріңіз. Ақау жойылмаса, құрылғы өндірушісіне хабарласыңыз."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Бірдеңе дұрыс болмады."</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi құпия сөзі: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Хотспот құпия сөзі: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Aвтоматты жалғау"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Осы желіге жақын болғанда, телефонға оған қосылуға рұқсат ету"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Осы желіге жақын болғанда, планшетке оған қосылуға рұқсат ету"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Аралықта болғанда, осы желімен байланысқа рұқсат ету"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Құрылғы қосу"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Желіге құрылғы қосу үшін QR кодын пайдаланыңыз."</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR кодының форматы жарамсыз."</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Жүйелік сертификаттарды пайдалану"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Қамтамасыз етпеу"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Тексермеу"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Сертификат көрсетілмеген. Байланыс жеке болмайды."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Желі атауы тым ұзын."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Доменді көрсету керек."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Сертификат қажет."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Жалғау"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi қосылды."</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> желісіне жалғанды."</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> желісіне қосылуда"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Жалғануда…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Желіге қосылу орындалмады"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Желі байланыс аясында емес."</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Құрылғының MAC мекенжайы"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Кездейсоқ MAC мекенжайы"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Кездейсоқ MAC мекенжайы (соңғы пайдаланылған)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP мекенжайы"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Желі деректері"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Қосалқы желі маскасы"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 мекенжайлары"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Сақталған желілер"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Жазылымдар"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Басқа желілер"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP параметрлері"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Wi-Fi кеңейтілген параметрлері осы пайдаланушы үшін қолжетімді емес"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Сақтау"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Жарамды торап мекенжайын теріңіз."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Жарамды DNS мекенжайын теріңіз."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Желі префиксінің ұзындығын 0 және 32 аралығында теріңіз"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (жеке DNS-пен ауыстырылмаса)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (жеке DNS-пен ауыстырылмаса)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Торап"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Желі префиксінің ұзындығы"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Қолданба мазмұнды бөлісуде. Интернетпен байланысты бөлісу үшін хотспотты өшіріп, қайта қосыңыз"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Құпия сөз жоқ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Хотспот атауы"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> қосылуда…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> қосылуда…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Басқа құрылғылар <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> хотспотына қосыла алады"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Хотспот құпия сөзі"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP диапазоны"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Кейбір мазмұндар үшін жаңарту жиілігі 60-тан 90 Гц-ке автоматты түрде артады. Батарея заряды тезірек таусылады."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Гц жаңарту жиілігін қолмен қосу"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Жақсартылған датчик сезгіштігі және анимация сапасына арналған ең жоғарғы жаңарту жиілігі. Батарея заряды тезірек таусылады."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Зейінді экран"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Қосулы кезде экранға қарап тұрсаңыз, ол өшпейді."</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Жаңа хабарландырулар келгенде, экран қосылады."</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Уақыт пен ақпаратты көрсету"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Батарея заряды тезірек таусылады"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Қалың шртифтілі мәтін"</string>
     <string name="title_font_size" msgid="570613010306330622">"Қаріп өлшемі"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Мәтінді үлкейтеді немесе кішірейтеді"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM картасын құлыптау параметрлері"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android нұсқасы"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android қауіпсіздік жүйесін жаңарту"</string>
     <string name="model_info" msgid="8997566254717810904">"Үлгісі"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Үлгі: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Үлгі және жабдық"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Жабдық нұсқасы"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Жабдық ЖА"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN жою"</string>
     <string name="menu_new" msgid="6571230342655509006">"Жаңа APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Сақтау"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Өшіру"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Бас тарту"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Атау жақтауы бос болмауы тиіс."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN (Apple хабар жіберу қызметі )бос болмауы тиіс."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Қолданбаларды бастапқы күйге қайтаруға болады."</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi, мобильдік деректер және Bluetooth параметрлерін бастапқы күйіне қайтару"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Мұның нәтижесінде барлық желі параметрлері бастапқы күйіне қайтарылады, соның ішінде:\n\n"<li>"Wi‑Fi"</li>\n<li>"мобильдік деректер"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Жою"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Жүктеп алынған SIM карталарын тазарту"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Жаңа SIM карталарын жүктеп алу үшін операторға хабарласыңыз. Мобильдік қызмет жоспарларынан бас тартылмайды."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Бұл әрекет нәтижесінде мобильдік тарифтерден бас тартылмайды. Жаңа SIM карталарын жүктеп алу үшін операторға хабарласыңыз."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Параметрлерді бастапқы күйге қайтару"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Барлық желі параметрлері бастапқы күйіне қайтарылсын ба? Бұл әрекетті қайтару мүмкін емес."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Барлық желі параметрлері бастапқы күйіне қайтарылып, жүктеп алынған SIM карталары өшірілсін бе? Бұл әрекет кері қайтарылмайды."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Желі параметрлері қалпына келтірілген"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM карталары тазартылмайды"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Жүктеп алынған SIM карталарын қатеге байланысты жою мүмкін емес.\n\nҚұрылғыны қайта қосып, әрекетті қайталаңыз."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Барлық деректерді өшіру"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерек өшеді, оның ішінде:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе мен қолданба деректері және параметрлері"</li>\n<li>"Жүктеп алынған қолданбалар"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Телефонның "<b>"ішкі жадынан"</b>" барлық дерек өшеді, оның ішінде:\n\n"<li>"Google есептік жазбаңыз"</li>\n<li>"Жүйе мен қолданба деректері және параметрлері"</li>\n<li>"Жүктеп алынған қолданбалар"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Осы құрылғыда басқа пайдаланушылар бар.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Mузыка"</li>\n<li>"Фотосуреттер"</li>\n<li>"Басқа пайдаланушы деректері"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM карталары"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Мұның нәтижесінде мобильдік қызмет жоспарыңыздан бас тартылмайды."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Музыка, фотосуреттер және басқа деректерді өшіру үшін, "<b>"USB жадын"</b>" өшіру қажет."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Музыка, фотосуреттер және басқа пайдаланушы деректерін тазалау үшін "<b>"SD картасы"</b>" өшірілуі тиіс."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Барлық деректерді өшіру (зауыттық параметрлерді қайтару)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Планшетіңіздің "<b>"ішкі жадынан"</b>" барлық дерек өшеді, соның ішінде:\n\n"<li>"Google есептік жазбаңыз;"</li>\n<li>"жүйе мен қолданба деректері және параметрлері;"</li>\n<li>"жүктеп алынған қолданбалар."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Телефонның "<b>"ішкі жадынан"</b>" барлық дерек өшеді, соның ішінде:\n\n"<li>"Google есептік жазбаңыз;"</li>\n<li>"жүйе мен қолданба деректері және параметрлері;"</li>\n<li>"жүктеп алынған қолданбалар."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Сіз келесі есептік жазбаларға кірдіңіз:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Бұл құрылғыны басқа да пайдаланушылар қолдана алады.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Mузыка;"</li>\n<li>"фотосуреттер;"</li>\n<li>"басқа пайдаланушы деректері."</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM карталары"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Мұның нәтижесінде мобильдік қызмет жоспарыңыздан бас тартылмайды."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Музыканы, фотосуреттерді және басқа деректерді өшіру үшін "<b>"USB жады"</b>" тазартылуы қажет."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Музыканы, фотосуреттерді және басқа пайдаланушы деректерін өшіру үшін "<b>"SD картасы"</b>" тазартылуы тиіс."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB жадын өшіру"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD картасын өшіру"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ішкі USB жадындағы музыка немесе фотолар сияқты барлық деректерді өшіру"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD картадағы музыка және фотосуреттер сияқты барлық деректерді өшіру"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Барлық деректі өшіру"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Барлық деректі өшіру"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Барлық жеке ақпаратыңыз бен жүктеп алынған қолданбаларыңыз жойылады. Бұл әрекет кері қайтарылмайды."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Барлық жеке ақпаратыңыз, соның ішінде жүктеп алынған қолданбалар мен SIM карталары жойылады. Бұл әрекет кері қайтарылмайды."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Барлығын өшіру"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Қайта реттеулер орындалмады, себебі Жүйе Тазалау қызметі қол жетімсіз."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Барлық дерек өшірілсін бе?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Зауыттық параметрлерді қалпына келтіру бұл пайдаланушы үшін қол жетімді емес"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Өшірілуде"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Күте тұрыңыз…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Барлық деректі өшіру"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Барлық деректі өшіру"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Барлық жеке ақпаратыңыз бен жүктеп алынған қолданбаларыңыз жойылады. Бұл әрекет кері қайтарылмайды."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Барлық жеке ақпаратыңыз, соның ішінде жүктеп алынған қолданбалар мен SIM карталары жойылады. Бұл әрекет кері қайтарылмайды."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Барлық дерек өшірілсін бе?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Бұл пайдаланушы зауыттық параметрлерді қайтара алмайды."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Өшіріліп жатыр"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Күте тұрыңыз…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Қоңырау параметрлері"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Дауыстық пошта, қоңырауды басқа нөмірге бағыттау және ұстап тұру, қоңырау шалушыт нөмірлерді автоматты анықтау"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB тетеринг"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> көп құрылғыға тетеринг жалғау мүмкін емес."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысы тетеринг арқылы ажыратылады."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet тетерингі"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Телефонның интернет байланысын USB Ethernet арқылы бөлісу"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Телефонның интернет байланысын Ethernet арқылы бөлісу"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Мобильдік деректер байланысы арқылы басқа құрылғыларды интернетке қосу үшін хотспот және тетеринг функцияларын пайдаланыңыз. Сондай-ақ қолданбалар хоспот жасап, маңайдағы құрылғылармен мазмұн бөлісе алады."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Wi‑Fi не мобильдік деректер байланысы арқылы басқа құрылғыларды интернетке қосу үшін хотспот және тетеринг функцияларын пайдаланыңыз. Қолданбалар маңайдағы құрылғылармен мазмұнды бөлісу үшін де хотспот жасай алады."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Көмек"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth іздеу"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth өшірулі болса да, қолданбалар мен қызметтерге маңайдағы құрылғыларды іздеуге рұқсат беру. Бұл параметрді, мысалы, орналасуды анықтау функциялары мен қызметтерін жақсарту үшін пайдалануға болады."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Жұмыс профиліне арналған орынды анықтау қызметтері"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Орынның уақыт белдеуін анықтау"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Орынның уақыт белдеуін анықтау"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Ағымдағы уақыт белдеуін анықтау үшін құрылғының орнын қолдануға мүмкіндік береді. Wi‑Fi желісін іздеу сияқты басқа орналасу параметрлері уақыт белдеуінің дәл анықталуына әсер етуі мүмкін."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Қосулы"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Өшірулі"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Уақыт белдеуін автоматты түрде анықтау функциясы өшірулі."</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Орынның уақыт белдеуін анықтау функциясы өшірулі."</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Орынның уақыт белдеуін анықтау функциясына қолдау көрсетілмейді."</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Орынның уақыт белдеуін анықтау функциясына өзгеріс енгізуге болмайды."</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi және ұялы желі орны"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Аймағыңызды жылдамырақ анықтау үшін қолданбаларға Google\' аймақтар қызметін қолдануға рұқсат етіңіз. Аймақ туралы деректер анонимді түрде жинақталып, Google-ға жіберіледі."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Орын Wi‑Fi арқылы анықталды"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Face Unlock функциясын пайдалану үшін құпия сөз орнатыңыз"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Face Unlock қолдану үшін өрнек орнатыңыз"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Face Unlock функциясын пайдалану үшін PIN кодын орнатыңыз"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Құпия сөз орнатып, биомерика қолданыңыз"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Өрнек орнатып, биометрика қолданыңыз"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"PIN кодын орнатып, биометрика қолданыңыз"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Құпия сөзді ұмытып қалдыңыз ба?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Өрнекті қалдыңыз ба?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN кодын ұмытып қалдыңыз ба?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Субтитр параметрлері"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ұлғайту"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Ұлғайту аймағы"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ұлғауды іске қосу"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Экранды ұлғайту кезінде ұлғайтқыңыз келетін аймақтарды таңдаңыз."</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Толық экран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Экранның бөлігі"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Толық экран және экран бөлігі"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Толық экранды ұлғайту"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Экранның бөлігін ұлғайту"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"\"Арнайы мүмкіндіктер\" түймесіне ауысасыз ба?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Экран бөлігін үш рет түртіп ұлғайту мәтін теру мен басқа әрекеттердің кідіруіне әкеледі.\n\nҰлғайту үшін \"Арнайы мүмкіндіктер\" түймесін пайдалануға ауысқыңыз келе ме?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"\"Арнайы мүмкіндіктер\" түймесіне ауысу"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Экранды үш рет түртіп ұлғайту"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ұлғайту параметрлері"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Үш рет түртіп үлкейту"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Таңбашамен үлкейту"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Қуат түймесі арқылы қоңырауды үзу"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Үлкен тінтуір меңзері"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Анимацияны өшіру"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Моно аудио"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Аудионы ойнату кезінде арналарды біріктіру"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Аудио балансы"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Сол жақ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Оң жақ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Моно аудио"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Аудионы ойнату кезінде арналарды біріктіру"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Аудио балансы"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Сол"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Оң"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Әдепкі"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Хабарландыру дірілі"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Қоңырау дірілі"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Түрту кезіндегі діріл"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> қолданбасын пайдалану"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ашу"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Түсті түзету функциясын пайдалану"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Субтитрді көрсету"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Тек қолдау көрсетілетін қолданба үшін"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> пайдалану"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> қолданбасын ашу"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Түсті түзету функциясын пайдалану"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Жазуларды көрсету"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Тек қолдау көрсетілетін қолданба үшін"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Субтитр өлшемі және стилі"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> мәтін өлшемі"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Басқа опциялар"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дейтераномалия"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалия"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалия"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Сұр түс реңктері"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Қызыл – жасыл"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Қызыл – жасыл"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Көк – сары"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Фондық режимде жұмыс істеуді шектеу"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Қолданбаға фондық режимде іске қосылуға рұқсат беру"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Қолданбаның фондық режимде жұмыс істеуге рұқсаты жоқ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Фондық режимде пайдалану шектелмеген"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Фондық режимде пайдалану шектелмеген."</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Фондық режимдегі әрекет шектелсін бе?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Қолданбаның фондық режимдегі әрекетін шектесеңіз, күтпеген әрекет көрсетуі мүмкін."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Бұл қолданба батареяны оңтайландыруға реттелмегендіктен, оны шектей алмайсыз. \n\nБұл үшін батареяны оңтайландыруды қосыңыз."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Планшет әдеттегіден көп қолданылды"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Құрылғы әдеттегіден көп қолданылды"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Батареяның заряды тез бітуі мүмкін."</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Батареяның жұмыс істеу қабілеті оңтайландырылуда"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Батарея жұмысы уақытша шектелген. Толығырақ ақпарат алу үшін түртіңіз."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Телефоныңыз әдеттегіден көп қолданылды. Батареяның заряды тез бітуі мүмкін.\n\nБатареяны ең көп пайдаланатын қолданбалар:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Планшетіңіз әдеттегіден көп пайдаланылды. Батареяның заряды тез бітуі мүмкін.\n\nБатареяны ең көп пайдаланатын қолданбалар:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Құрылғыңыз әдеттегіден көп қолданылды. Батареяның заряды тез бітуі мүмкін.\n\nБатареяны ең көп пайдаланатын қолданбалар:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d қолданба шектелді</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Батарея зарядының дерегі алынбай жатыр."</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Батарея зарядының дерегі алынбай жатыр. "<annotation id="url">"Толығырақ ақпарат алу"</annotation>" үшін түртіңіз."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Қолданба тоқтатылсын ба?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Телефоныңыз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP">%1$s</xliff:g> қолданбасы оны қосулы күйде ұстауда.\n\nБұл мәселені шешу үшін қолданбаны тоқтатуыңызға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Планшетіңіз батареяны қалыпты басқара алмайды, себебі <xliff:g id="APP">%1$s</xliff:g> қолданбасы оны қосулы күйде ұстауда.\n\nБұл мәселені шешу үшін қолданбаны тоқтатуыңызға болады.\n\nМұндай жағдай қайталана берсе, батарея жұмысын жақсарту үшін қолданбаны жою қажет болуы мүмкін."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Кестені белгілеу"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Батарея жұмысының ұзақтығын арттыру"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Толық зарядталғанда өшіру"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Телефон заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда, Батареяны үнемдеу режимі өшеді."</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Планшет заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда, Battery Saver өшіріледі."</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Құрылғы заряды <xliff:g id="PERCENT">%1$s</xliff:g> болғанда, Battery Saver өшіріледі."</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Телефон <xliff:g id="PERCENT">%1$s</xliff:g>-дан аса зарядталғанда, Battery Saver өшеді."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Планшет <xliff:g id="PERCENT">%1$s</xliff:g>-дан аса зарядталғанда, Battery Saver өшеді."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Құрылғы <xliff:g id="PERCENT">%1$s</xliff:g>-дан аса зарядталғанда, Battery Saver өшеді."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Қосу"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Бастапқы күйге қайтару"</string>
     <string name="tts_play" msgid="2945513377250757221">"Ойнату"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Бейімделгіш қосылу мүмкіндігі"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Желі байланыстарын автоматты басқару арқылы батарея жұмысының ұзақтығын арттырады және құрылғы жұмысын жақсартады."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Тіркелу деректерінің жады"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Сертификат орнату"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Сертификаттарды жадтан орнату"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Пайдаланушының тіркелу деректері"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Сақталған тіркелу деректерін көру және өзгерту"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Қосымша"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Жад түрі"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппараттық"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Компьютерлік бағдарлама ғана"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Осы пайдаланушы үшін тіркелгі деректері қол жетімді емес"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN желілері мен қолданбалар үшін орнатылған"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi үшін орнатылған"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Орнатпау"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Бәрібір орнату"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Сертификат орнатылмады"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g> қолданбасы бұл құрылғыда сертификаттар орнатсын ба?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Бұл сертификаттар жеке бас дерегіңізді төмендегі қолданбалар мен URL сілтемелеріне көрсетеді."</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Рұқсат бермеу"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Рұқсат ету"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Жаю"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Сертификат басқару қолданбасы"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Жоқ"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Бұл қолданбаның орнатқан сертификаттары жеке бас дерегіңізді төмендегі қолданбалар мен URL сілтемелеріне көрсетеді."</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Өшіру"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Төтенше жағдайда теру сигналы"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Төтенше қоңырау шалу әрекетін орнату"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Сақтық көшірме"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Орнатылмаған – жұмыс профилі"</string>
     <string name="user_admin" msgid="4024553191395768119">"Әкімші"</string>
     <string name="user_you" msgid="3070562015202859996">"Сіз (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Қысқа аты"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> пайдаланушыға дейін қоса аласыз"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Планшет иесі ғана пайдаланушыларды басқара алады."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Телефон иесі ғана пайдаланушыларды басқара алады."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Терминалда төлеу"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Төлем қолданбасын реттеңіз. Содан кейін телефонның артқы жағын контактісіз төлем таңбасы бар терминалға жақындатыңыз."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Түсінікті"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Қосымша…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Басқалары…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Негізгі төлем қолданбасы етіп орнату"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Негізгі төлем қолданбасын жаңарту"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Контактісіз төлем терминалында <xliff:g id="APP">%1$s</xliff:g> арқылы төлеу"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Артқа"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Келесі"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Аяқтау"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Суретке түсіру"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Кескін таңдау"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Фотосурет таңдау"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM карталары"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM карталары"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Осыны қоңыраулар үшін әрқашан пайдалану"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Деректер үшін SIM картасын таңдау"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS үшін SIM картасын таңдаңыз."</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Деректер SIM картасы ауыстырылуда, бұл бір минутқа дейін алуы мүмкін..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Деректер SIM картасы ауыстырылуда, бұл бір минутқа дейін уақыт алуы мүмкін…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Келесімен қоңырау шалу"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM картасын таңдау"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"әрекеттер тізімі, кесте, battery saver, қуат үнемдеу, батарея, автоматты, пайыз"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, жетілдірілген қоңырау, 4g қоңырауы"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"тілді енгізу, тіл енгізу"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"мәтін өлшемі"</string>
     <string name="default_sound" msgid="6604374495015245195">"Әдепкі дыбыс"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Қоңыраулар мен хабарландырулардың дыбыс деңгейі: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Дыбыс деңгейі, діріл, \"Мазаламау\" режимі"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Дыбыстарды қосу"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Автоматты субтитр қосу"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Жоқ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> жоспар орнатылған.</item>
-      <item quantity="one">1 жоспар орнатылған.</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Жоқ}=1{1 жоспар орнатылған}other{# жоспар орнатылған}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Мазаламау"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Хабарландыруды маңызды адамдардан және қолданбалардан ғана алу"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Хабарландыруларды шектеу"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Маңыздылары ғана"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Қосулы / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Өшірулі / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Өшірулі"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Қосулы"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Әрдайым сұрау"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Өшірілгенге дейін"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> сағат</item>
-      <item quantity="one">1 сағат</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> минут"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> кестені автоматты түрде қосуға болады</item>
-      <item quantity="one">1 кестені автоматты түрде қосуға болады</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 сағат}other{# сағат}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минут}other{# минут}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Өшірулі}=1{Өшірулі/1 кесте автоматты түрде қосылады‎‎‎‎‎‎}other{Өшірулі/# кесте автоматты түрде қосылады‎‎‎‎‎‎}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\"Мазаламау\" режимін тоқтата алатындар"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Адамдар"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Қолданбалар"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Маңыздылығы төмен хабарландыруларды автоматты түрде дыбыссыз режимге орнату"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Хабарландыруларды автоматты түрде сұрыптау"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Хабарландыруларды сәйкестігіне қарай сұрыптау"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Бейімделетін хабарландырулар туралы пікірлер"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Хабарландыруларға жасалған түзетулерді көрсетеді және жүйеге пікір жіберуді ұсынады"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Хабарландырулардың маңыздылық параметрлерін бастапқы күйге қайтару"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Пайдаланушы өзгерткен маңыздылық параметрлерін бастапқы күйге қайтарып, хабарландыру көмекшісінің басымдықты анықтауына рұқсат ету"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Ұсынылған әрекеттер және жауаптар"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Ұсынылған әрекеттер мен жауаптарды автоматты түрде көрсету"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Соңғы және кейінге қалған хабарландыруларды көрсету"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Маңызды әңгімелер"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Әңгіме бөлімінің жоғарғы жағында тұрады және қалқыма хабар ретінде шығады."</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Әңгімелер бөлімінің жоғарғы жағында көрсетіледі."</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Басқа әңгімелер"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Басымдығы төмен сұхбаттар"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Өзгертулер енгізілген әңгімелер"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Соңғы сұхбаттар"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Соңғыларын өшіру"</string>
+    <string name="clear" msgid="5092178335409471100">"Өшіру"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Маңызды чаттарды қалқымалы ету"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Маңызды әңгімелер ашылмалы панельдің жоғарғы жағында көрсетіледі. Оларды қалқыма хабар ретінде және \"Мазаламау\" режимі қосулы болса да шығатындай етіп реттеуіңізге болады."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Маңызды және өзгертілген әңгімелер осы жерде көрсетіледі"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"Мазаламау\" режимін пайдалану"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\"Мазаламау\" режимін пайдалануға рұқсат ету"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Орнатылған қолданбалардың ешбірі Мазаламау режиміне кіруге рұқсат сұрамады"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Қолданбаларды жүктеу…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Қолданбалар жүктелуде…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Сұрауыңыз бойынша Android бұл қолданбаның хабарландыруларын көрсетпейді"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Сұрауыңыз бойынша Android мұндай хабарландыруларды көрсетпейді"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Сұрауыңыз бойынша Android бұл құрылғыда мұндай хабарландырулар тобын бөгейді"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Барлық әңгіме"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Маңызды әңгімелер"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Жоқ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> әңгіме</item>
-      <item quantity="one">1 әңгіме</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Жоқ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Жоқ}=1{1 чат}other{# чат}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Тоқтата алатындар"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Қоңыраулар"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Қоңыраулар"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Рұқсат етілген қоңыраулар келгенде, дыбыстық сигнал берілуі үшін, құрылғы дыбысы қосылып тұрғанын тексеріңіз."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" үшін кіріс қоңыраулар бөгеледі. Параметрлерді достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алатын етіп реттей аласыз."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Жұлдызшалы контактілер"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">тағы <xliff:g id="NUM_PEOPLE">%d</xliff:g> контакт</item>
-      <item quantity="one">тағы 1 контакт</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ешқандай жұлдызшалы контакт жоқ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Жоқ}=1{{contact_1}}=2{{contact_1} және {contact_2}}=3{{contact_1}, {contact_2} және {contact_3}}other{{contact_1}, {contact_2} және тағы басқа # контакт‎‎}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Аты берілмеген)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Хабарлар"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"хабарлар"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Хабарлар"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" үшін кіріс хабарларға тыйым салынған. Достарыңыз, отбасыңыздың мүшелері не басқа контактілеріңіз сізге хабарласа алуы үшін, параметрлерді реттеуіңізге болады."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Барлық хабар келеді"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Барлық қоңырау келеді"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ешқандай контакт жоқ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакт</item>
-      <item quantity="one">1 контакт</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Жоқ}=1{1 контакт}other{# контакт}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Кез келген адам"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контактілер"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Жұлдызшалы контактілер"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Барлық хабарландыру"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Кейбір хабарландырулар"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Таңдалған адамдар қолданбада мазаламау режимі қосулы болса да сізге хабарласа алады."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> тоқтата алады</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> тоқтата алады</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Тағы <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ешқандай қолданба мазаламайды}=1{{app_1} мазалайды}=2{{app_1} және {app_2} мазалайды}=3{{app_1}, {app_2} және {app_3} мазалайды}other{{app_1}, {app_2} және тағы басқа # қолданба мазалайды}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Қолданбалар"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Барлық хабарландыру"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Кейбір хабарландырулар"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Тоқтата алатын хабарландырулар"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Барлық хабарландыруға рұқсат ету"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> тоқтата алады</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> тоқтата алады</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ештеңе тоқтата алмайды"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Тағы <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ештеңе мазаламайды}=1{{sound_category_1} мазалайды}=2{{sound_category_1} және {sound_category_2} мазалайды}=3{{sound_category_1}, {sound_category_2} және {sound_category_3} мазалайды}other{{sound_category_1}, {sound_category_2} және тағы басқа # дыбыс мазалайды}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ештеңе мазаламайды"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ешкім тоқтата алмайды"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Кейбір адамдар тоқтата алады"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Барлығы тоқтата алады"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Қосулы"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Өшірулі"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Қолданбаны бекіту"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Қолданбаны бекіту функциясы экранға бір қолданба терезесін бекітіп қоюға мүмкіндік береді. Оны, мысалы, досыңыз құрылғыңызды бір ойын ойнау үшін сұрағанда қолдануға болады. \n\nҚолданба бекітілген кезде, ол арқылы басқа қолданбаларды және жеке деректерді ашуға болады. \n\nҚолданбаны бекіту функциясын пайдалану үшін: 	\n1.	Оны іске қосыңыз. 	\n2.	\"Шолу\" мәзірін ашыңыз. 	\n3.	Экранның жоғарғы жағындағы қолданба белгішесін, одан кейін \"Бекіту\" түймесін түртіңіз."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Қолданбаны бекіту функциясы экранға бір қолданба терезесін бекітіп қоюға мүмкіндік береді. Оны, мысалы, досыңыз құрылғыңызды бір ойын ойнау үшін сұрағанда, қолдануға болады. \n\nҚолданба бекітілген кезде, ол арқылы басқа қолданбаларды және жеке деректерді ашуға болады. \n\nЕгер құрылғыңызды біреумен қауіпсіз күйде бөліскіңіз келсе, қонақ профилін пайдаланыңыз. \n\nҚолданба бекіту функциясын пайдалану үшін: 	\n1.	Оны іске қосыңыз. 	\n2.	\"Шолу\" мәзірін ашыңыз. 	\n3.	Экранның жоғарғы жағындағы қолданба белгішесін, одан кейін \"Бекіту\" түймесін түртіңіз."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Қолданбаны бекіту функциясы телефондағы басқа қолданбаларды жауып, белгілі бір қолданба экранын бекітуге мүмкіндік береді. Оны, мысалы, досыңыз құрылғыңызды бір ойын ойнау үшін сұрағанда қолдануға болады."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Қолданба бекітілген кезде, ол арқылы басқа қолданбаларды және жеке деректерді ашуға болады. \n\nҚолданбаны бекіту функциясын пайдалану үшін: 	\n1.	Оны іске қосыңыз. 	\n2.	\"Шолу\" мәзірін ашыңыз. 	\n3.	Экранның жоғарғы жағындағы қолданба белгішесін, одан кейін \"Бекіту\" түймесін түртіңіз."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Қолданба бекітілген кезде, ол арқылы басқа қолданбаларды және жеке деректерді ашуға болады. \n\nЕгер құрылғыңызды біреумен қауіпсіз күйде бөліскіңіз келсе, қонақ профилін пайдаланыңыз. \n\nҚолданбаны бекіту функциясын пайдалану үшін: 	\n1.	Оны іске қосыңыз. 	\n2.	\"Шолу\" мәзірін ашыңыз. 	\n3.	Экранның жоғарғы жағындағы қолданба белгішесін, одан кейін \"Бекіту\" түймесін түртіңіз."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Қолданба бекітілген кезде: \n\n•	 жеке деректерді пайдалануға болады \n		(мысалы, контактілер және электрондық хаттың мазмұны); \n•	 бекітілген қолданбалар басқа да қолданбаларды аша алады. \n\nБұл функцияны сенімді адамдармен ғана пайдаланыңыз."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Босату алдында құлыпты ашу өрнегін сұрау"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Босату алдында PIN кодын сұрау"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Құрылғының құлпын ашу үшін бетті тану функциясын қолданумен қатар, құрылғыны іске қосу алдында PIN кодын енгізу сұралатын етіп қауіпсіздік функциясын реттеуіңізге болады. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (дабылдарды қоса) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектесетін болады. Құрылғыны іске қосқанда, PIN кодын енгізу сұралсын ба?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Құрылғының құлпын ашу үшін бетті тану функциясын қолданумен қатар, құрылғыны іске қосу алдында өрнек сызу сұралатын етіп қауіпсіздік функциясын реттеуіңізге болады. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (дабылдарды қоса) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектесетін болады. Құрылғыны іске қосқанда, өрнекті сызу сұралсын ба?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Құрылғының құлпын ашу үшін бетті тану функциясын қолданумен қатар, құрылғыны іске қосу алдында құпия сөз сұралатын етіп қауіпсіздік функциясын реттеуіңізге болады. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (дабылдарды қоса) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектесетін болады. Құрылғыны іске қосқанда, құпия сөз сұралсын ба?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Құрылғының құлпын ашуға қолданылатын биометрикадан бөлек, оны іске қосар алдында терілетін PIN коды арқылы қауіпсіздік деңгейін күшейтіңіз. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (сондай-ақ, дабылдарды) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектеседі. Құрылғыны қосу үшін PIN коды сұралсын ба?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Құрылғының құлпын ашуға қолданылатын биометрикадан бөлек, оны іске қосар алдында сызылатын өрнек арқылы қауіпсіздік деңгейін күшейтіңіз. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (сондай-ақ, дабылдарды) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектеседі. Құрылғыны қосу үшін өрнек сызу сұралсын ба?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Құрылғының құлпын ашуға қолданылатын биометрикадан бөлек, оны іске қосар алдында терілетін құпия сөз арқылы қауіпсіздік деңгейін күшейтіңіз. Құрылғы іске қосылмайынша, ол қоңырауларды, хабарларды немесе хабарландыруларды (сондай-ақ, дабылдарды) қабылдай алмайды.\n\nҚұрылғыларыңыз жоғалса немесе ұрланса, бұл функция деректеріңізді қорғауға көмектеседі. Құрылғыңызды қосу үшін құпия сөз сұралсын ба?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Иә"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Жоқ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Шектелген"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-ді басқаратын құрылғы"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Жалғанған құрылғы"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Осы құрылғы"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Ауыстырылуда..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Ауыстырылуда…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Ауыстырылмады"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Осы құрылғыны зарядтауда."</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Жалғанған құрылғыны зарядтау"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Мобильдік дерек шығыны"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Қолданбаның дерек шығыны"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi дерек шығыны"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Өзге оператор дерек трафигі"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet деректерін пайдалану"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 шектеу</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Оператордың деректер есебі құрылғының есебінен өзгеше болуы мүмкін."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Оператор желілері пайдаланған деректерді қамтымайды."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> пайдаланылған"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Дерек шығыны туралы ескерту"</string>
     <string name="data_warning" msgid="2925054658166062884">"Дерек шығыны туралы ескерту"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Мәліметтерді көру"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Шектелмейтін деректер"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Фондық дерек өшірілген"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Фондық дерек өшірілген."</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Қосулы"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Өшірулі"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Data Saver функциясын қолдану"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Құрылғы құлыптаулы кезде, хабарландыруларда жауап немесе басқа мәтін теруге тыйым салу"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Әдепкі емлені тексеру құралы"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Емлені тексеру құралын таңдау"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Емле тексеру құралын пайдалану"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Емле тексеру құралын пайдалану"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Таңдалмаған"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ешқандай)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Жад кеңістігін босату үшін жад реттегіші құрылғыдағы сақтық көшірмесі жасалған фотосуреттер мен бейнелерді өшіреді."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Фотосуреттер мен бейнелерді жою"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Жад реттегіші"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Жад менеджерін пайдалану"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Жадты басқару құралын пайдалану"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Aвтоматты"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Қолмен"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Орынды қазір босату"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Телефонды тексеру үшін екі рет түрту"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Планшетті тексеру үшін екі рет түртіңіз"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Құрылғыны тексеру үшін екі рет түртіңіз"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Хабарландыруларға қарай сырғыту"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Хабарландыруларды көру үшін экранның төменгі жиегінен төмен сырғытыңыз."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Бір қолмен енгізу режимі"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Бір қолмен енгізу режимін пайдалану"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Бір қолданбадан екіншісіне ауысқанда, одан шығу"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Тайм-аут"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунд"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"бір қолмен басқару"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Уақытты, хабарландыруларды және басқа ақпаратты көру үшін экранды екі рет түртіңіз."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Телефонды тексеру үшін көтеру"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Планшетті тексеру үшін оны көтеріңіз"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Планшетті тексеру үшін түртіңіз"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Құрылғыны тексеру үшін түртіңіз"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Уақытты, хабарландыруларды және басқа ақпаратты көру үшін экранды түртіңіз."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Төтенше жағдай дабылы"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Төтенше жағдай дабылын пайдалану"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> басқарады"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Қуат түймесін 5 рет жылдам басу арқылы төмендегі әрекеттерді іске қосыңыз."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Кері санақ дабылын ойнату"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Құтқару қызметіне қоңырау шалмас бұрын, қатты дыбыс ойнату"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Көмек сұрау"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Көмек сұрауға арналған телефон нөмірі"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Өзгерту үшін түртіңіз."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Егер құтқару қызметінің нөмірінен басқа нөмірді енгізсеңіз:\n • Төтенше жағдай дабылын пайдалану үшін құрылғыңыздың құлпы ашылуы керек. \n • Қоңырауыңызға жауап берілмеуі мүмкін."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Хабарландыруларды көру үшін саусақ ізін пайдалану"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Саусақ ізі сканері"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Хабарландыруларды көру үшін телефонның артындағы саусақ ізін оқу сканерін саусақпен төмен қарай сипап өтіңіз."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Көрсетілетін деректердің максималды көлемі"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Әдепкі мәндерге қайтару"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Автотолтыру бойынша Developer Options бастапқы күйіне қайтарылды"</string>
+    <string name="location_category" msgid="3496759112306219062">"Орын"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Күй жолағындағы орын индикаторы"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Желі және байланысты қоса алғанда, барлық орындар үшін көрсету"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS толық өлшемдерін қосу"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Жұмыс циклінсіз барлық GNSS тізбектері мен жиіліктерін қадағалау"</string>
     <string name="device_theme" msgid="5027604586494772471">"Құрылғы тақырыбы"</string>
     <string name="default_theme" msgid="4815428567082263639">"Әдепкі"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Желі атауы"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Алаңдататын хабарландыруларды кідірту"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Функция қолжетімді емес."</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Бұл функция өшірілді, себебі телефоныңыздың жұмысына кедергі келтіреді."</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS толық өлшемдерін қосу"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Жұмыс циклінсіз барлық GNSS тізбектері мен жиіліктерін қадағалау"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Ақау туралы хабарларды әрдайым көрсету"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Қолданбада ақау болған сайын, диалог көрсету"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE қолдайтын қолданбаны таңдау"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Барлық қолданбалар үшін қосу"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Графикалық драйверді таңдау"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Әдепкі"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Ойын драйвері"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Графикалық жүйе драйвері"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Қосулы (дыбыссыз)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Өшіру"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Желі деректері"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Құрылғыңыздың аты телефоныңыздағы қолданбаларға көрінеді. Сонымен қатар Bluetooth құрылғыларына қосылғанда немесе Wi-Fi хотспотын орнатқанда, басқа адамдарға көрінуі мүмкін."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Құрылғыңыздың аты телефоныңыздағы қолданбаларға көрінеді. Сонымен қатар Bluetooth құрылғыларына қосылғанда, Wi-Fi желісіне қосылғанда немесе Wi-Fi хотспотын орнатқанда, басқа адамдарға көрінуі мүмкін."</string>
     <string name="devices_title" msgid="649715719278562515">"Құрылғылар"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Барлық параметрлер"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Ұсыныстар"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Желілер табылмады. Қайталап көріңіз."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(тыйым салынған)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM картасы салынбаған"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM жоқ."</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Жоқ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Қосылу үшін SIM картасы қажет."</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Қосылу үшін <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM картасы қажет"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Оңтайлы желі режимі: WCDMA таңдалды"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Оңтайлы желі режимі: тек GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Оңтайлы желі режимі: тек WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобильдік деректер"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Интернетке мобильдік желі арқылы кіру"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон байланыс аясында болған кезде, автоматты түрде осы операторға ауысады."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM картасы жоқ."</string>
     <string name="calls_preference" msgid="2166481296066890129">"Қоңыраулар параметрлері"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS параметрі"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Әрдайым сұрау"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> операторына қосылып тұрғанда қолжетімді емес"</string>
     <string name="see_more" msgid="7499355691042812723">"Басқаларын көру"</string>
     <string name="see_less" msgid="2642392725363552793">"Азырақ көру"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> қызметін қосасыз ба?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM картасын қосасыз ба?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> қызметіне ауысу қажет пе?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM картасы арқылы ауыстырасыз ба?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Бір уақытта тек бір SIM картасын пайдалануға болады.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> қызметіне ауыссаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> қызметінен бас тартылмайды."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Бір уақытта тек бір жүктеп алынған SIM картасын пайдалануға болады.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> қызметіне ауыссаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> қызметінен бас тартылмайды."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Бір уақытта тек бір SIM картасын пайдалануға болады. \n\nБасқа қызметке ауыссаңыз, <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> қызметінен бас тартылмайды."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> қызметіне ауысу"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Желіге қосылуда…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> қызметіне ауысуда"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Оператор ауыстырылмады"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Қатеге байланысты оператор ауыстырылмады."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> өшірілсін бе?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM картасы өшірілсін бе?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM картасы өшірілуде<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Оператор өшірілмеді"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Бірдеңеден қате кетті де, оператор өшірілмеді."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIM картасын пайдаланасыз ба?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Құрылғыда бір уақытта 2 SIM картасын пайдалануға болады. 1 SIM картасын пайдалану үшін \"Жоқ, рақмет\" түймесін түртіңіз."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Құрылғыны қайта қосасыз ба?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Бастау үшін құрылғыңызды қайта қосыңыз. Одан кейін басқа SIM картасын енгізе аласыз."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Жалғастыру"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Қайта қосу"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Жоқ, рақмет"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Ауысу"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM картасын іске қосу мүмкін емес"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM картасын шығарып, қайта салыңыз. Егер ақау жойылмаса, құрылғыны өшіріп қосыңыз."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM картасын қайтадан қосып көріңіз. Егер ақау жойылмаса, құрылғыны өшіріп қосыңыз."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Желіні іске қосу"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> қосулы"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM параметрлерін жаңарту үшін түртіңіз."</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM картасы"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Бұл жүктеп алынған SIM картасы өшірілсін бе?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Бұл SIM картасының деректерін өшірсеңіз, <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> қызметі бұл құрылғыдан жойылады.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> қызметінен бас тартылмайды."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Жою"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM тазартылуда…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM картасының деректері өшірілмеді"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Қатеге байланысты бұл SIM картасының деректерін өшіру мүмкін емес.\n\nҚұрылғыны қайта қосып, әрекетті қайталаңыз."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Құрылғыға қосылу"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> қолданбасы құрылғыңызға қосылу үшін уақытша Wi‑Fi желісін пайдаланғысы келеді."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Ешбір құрылғы табылмады. Құрылғылардың қосулы екенін, оларды жалғауға болатынын тексеріңіз."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Құтқару қызметіне қоңырау шалу"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Wi‑Fi қоңыраулары арқылы жедел қызметке қоңырау шалуды операторыңыз қолдамайды.\nЖедел қызметке қоңырау шалу үшін құрылғы ұялы желіге автоматты түрде ауысады.\nТек мобильдік байланыс бар аймақтарда ғана жедел қызметке қоңырау шалуға болады."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Қоңыраудың сапасы жақсы болуы үшін, Wi‑Fi желісін пайдаланыңыз."</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"SIM карталары арасында қоңырау шалу"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Осы SIM картасы арқылы басқа қоңыраулар мен SMS-терге рұқсат беріңіз."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"sim карталары арасында қоңырау шалу"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Кіріс MMS хабары"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS хабары жіберілмейді"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Мобильдік интернет өшірулі кезде, <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> операторында MMS қызметіне рұқсат ету үшін түртіңіз."</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Параметрлер экранының үстін жабуға рұқсат ету"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Басқа қолданбалардың үстінен шыға алатын қолданбаларға параметрлер экрандарының бетіне қабаттасуға рұқсат ету"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Мультимедиа"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Мультимедиа сеансы аяқталғанда ойнатқышты жасыру"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Ойнатқыш кеңейтілген \"Жылдам параметрлер\" панелінен жалғастыруға мүмкіндік береді."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Жылдам параметрлердегі Media Player"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Оңай ойната бастау үшін Media Player-ді ұзақ уақыт көрсетіңіз"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ойнатқышты жасыру"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Ойнатқышты көрсету"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Ойнатқыштар жоқ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Рұқсат етілген қолданбалар"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"мультимeдиа"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth қосылады."</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Қосулы"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Өшірулі"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM карталары"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Ұшақта пайдалануға болатын желілер"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Ұшақта пайдалануға болатын желілерді тауып, қосылу"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ұшақ, ұшақта қолдануға болатын желі"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Қоңыраулар мен SMS хабарлары"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi қоңыраулары"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Оператордан өзге желілер арқылы (мысалы, Wi‑Fi желісі) қоңырау шалу не қабылдау"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi қоңыраулары оператордан өзге желілер арқылы (мысалы, кейбір Wi‑Fi желілері) қоңырау шалуға не қабылдауға мүмкіндік береді."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Қоңыраулар"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"таңдаулы"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"қоңыраулар таңдалған"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS таңдалған"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"қолжетімді емес"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM картасы жоқ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметрлер"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Қоғамдық жерлердегі желілерге қосылу"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"желі байланысы, интернет, сымсыз байланыс, деректер, wifi, Wi-Fi, Wi Fi, ұялы, мобильдік, ұялы байланыс операторы, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ұшақта қолдануға болатын желілерді көру"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Ұшақ режимін өшіру"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ұйықтау уақыты режимі қосулы болғандықтан, қолжетімді емес."</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Хабарландырулардың маңыздылық параметрлерін бастапқы күйге қайтару аяқталды."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Қолданбалар"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Күдікті құрылғы хабарларыңызды пайдаланғысы келеді. Толық мәлімет алу үшін түртіңіз."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Хабарларды пайдалануға рұқсат берілсін бе?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Күдікті Bluetooth құрылғысы ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) хабарларыңызды пайдаланғысы келеді.\n\nСіз бұрын-соңды [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] құрылғысына қосылмағансыз."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Күдікті құрылғы контактілер тізімі мен қоңыраулар журналын пайдаланғысы келеді. Толық мәлімет алу үшін түртіңіз."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Контактілер тізімі мен қоңыраулар журналын пайдалануға рұқсат берілсін бе?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Күдікті Bluetooth құрылғысы ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) контактілер тізімі мен қоңыраулар журналын пайдаланғысы келеді. Оған кіріс және шығыс қоңыраулары деректері кіреді.\n\nСіз бұрын-соңды [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] құрылғысына қосылмағансыз."</string>
 </resources>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index d074efd..e4f2b19 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"មធ្យម"</item>
     <item msgid="6740026006576843477">"វែង"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ខ្លី"</item>
+    <item msgid="7397961711906421599">"មធ្យម"</item>
+    <item msgid="4079132024502041928">"វែង"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"លំនាំដើម"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"សកល"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ប៉ុណ្ណោះ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"សកល"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 5d10972..2b0507c 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"កាល​បរិច្ឆេទ​ &amp; ពេលវេលា"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"កំណត់​កាលបរិច្ឆេទ និង​ពេលវេលា"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"កំណត់​កាលបរិច្ឆេទ ពេលវេលា តំបន់​ពេលវេលា &amp; ទ្រង់ទ្រាយ"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"ប្រើ​ម៉ោង​ដែល​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"ប្រើ​ល្វែងម៉ោង​ដែល​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"កំណត់ម៉ោង​ដោយស្វ័យប្រវត្តិ"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"កំណត់ល្វែងម៉ោង​ដោយស្វ័យប្រវត្តិ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ប្រើភាសា​លំនាំដើម"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"ប្រព័ន្ធ 24 ម៉ោង"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"ប្រើ​ប្រព័ន្ធ ២៤ ម៉ោង"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"បង្ហាញ​ព័ត៌មាន​​ប្រវត្តិរូប​លើ​អេក្រង់ចាក់សោ"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"គណនី"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ទី​តាំង​"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ប្រើទីតាំង"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ប្រើទីតាំង"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"បិទ"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">បើក - កម្មវិធី <xliff:g id="COUNT_1">%1$d</xliff:g> មានសិទ្ធិ​ចូលប្រើ​ទីតាំង</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ការចាក់សោអេក្រង់ ការដោះសោតាមទម្រង់មុខ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ការចាក់សោអេក្រង់ ស្នាមម្រាមដៃ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ការចាក់សោអេក្រង់"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ដោះសោទូរសព្ទរបស់អ្នកដោយសុវត្ថិភាព ដោយប្រើមុខ និងស្នាមម្រាមដៃរបស់អ្នក"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"អ្នកក៏អាច​ចូលកម្មវិធី ដើម្បីបញ្ជាក់​ការបង់ប្រាក់​បានផងដែរ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"រៀបចំ​ការដោះសោ​ដោយប្រើ៖"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ដោះសោ​តាមទម្រង់មុខ"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ធ្វើឱ្យងាយស្រួលដោះសោទូរសព្ទរបស់អ្នកបំផុត"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ស្នាម​ម្រាមដៃ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ចំណេញពេលដោយដោះសោទូរសព្ទក្នុងហោប៉ៅ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"រំលង"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"បន្ទាប់"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"បាន​បញ្ចូល​មុខ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"រៀបចំ​ការដោះសោ​តាម​ទម្រង់​មុខ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ការដោះសោ​តាមទម្រង់មុខ"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ប្រើ​មុខ​របស់អ្នកដើម្បីផ្ទៀងផ្ទាត់"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ចាប់ផ្ដើម"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ប្រសិនបើការដោះសោ​តាមទម្រង់មុខ​សម្រាប់​ភាពងាយស្រួលត្រូវបានបិទ ជំហាន​រៀបចំ​មួយចំនួនអាច​នឹង​ដំណើរការ​មិន​ប្រក្រតីជាមួយមុខងារ​តបវិញ។"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ថយក្រោយ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"បន្ត​រៀបចំ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ប្រើការរៀបចំភាពងាយស្រួល"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"តម្រូវឱ្យបញ្ជាក់ជានិច្ច នៅពេលប្រើការដោះសោតាមទម្រង់មុខនៅក្នុងកម្មវិធី"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"លុប​ទិន្នន័យ​ទម្រង់មុខ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"រៀបចំ​ការដោះសោ​តាម​ទម្រង់​មុខ"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ប្រើ​ការដោះសោ​តាមទម្រង់មុខ ដើម្បី​ដោះសោ​ឧបករណ៍​របស់អ្នក ចូល​កម្មវិធី និង​បញ្ជាក់​ការបង់ប្រាក់។\n\nសូមចងចាំ​ថា៖\nការមើល​ទូរសព្ទ​អាច​ដោះសោ​ទូរសព្ទបាន ទោះបីជា​អ្នក​មិនមាន​បំណង​ដោះសោ​ក៏ដោយ។\n\nអ្នកផ្សេងអាច​ដោះសោទូរសព្ទ​របស់អ្នក​ ប្រសិនបើ​ទូរសព្ទនេះ​ស្ថិតនៅ​ចំពី​មុខរបស់អ្នក។\n\nអ្នកដែល​មាន​មុខមាត់​ស្រដៀង​អ្នកខ្លាំង ដូចជា​បងប្អូន​បង្កើត​ដែលមានមុខមាត់​ដូចអ្នក​អាចនឹង​ដោះសោ​ទូរសព្ទ​របស់អ្នក​បាន។"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ប្រើ​ការដោះសោ​តាមទម្រង់មុខ ដើម្បី​ដោះសោ​ឧបករណ៍​របស់អ្នក ចូល​កម្មវិធី និង​បញ្ជាក់​ការបង់ប្រាក់។\n\nសូមចងចាំ​ថា៖\nការមើលទៅ​​ទូរសព្ទ​អាច​ដោះសោ​ទូរសព្ទបាន ទោះបីជា​អ្នក​មិនចង់​ដោះសោ​ក៏ដោយ។\n\nអ្នកផ្សេងអាច​ដោះសោទូរសព្ទ​របស់អ្នក​ ប្រសិនបើ​វា​ស្ថិតនៅ​ចំពី​មុខរបស់អ្នក ទោះបីជាអ្នកបិទ​ភ្នែកក៏ដោយ។\n\nអ្នកដែល​មាន​មុខមាត់​ស្រដៀង​អ្នកខ្លាំង ដូចជា​បងប្អូន​បង្កើត​ដែលមានមុខមាត់​ដូចអ្នក​អាច​ដោះសោ​ទូរសព្ទ​របស់អ្នក​បាន។"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"ប្រើការដោះសោ​តាមទម្រង់មុខ ដើម្បីដោះសោ​ឧបករណ៍​របស់អ្នក ចូលកម្មវិធី និងបញ្ជាក់​ការបង់ប្រាក់។"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"សូមចងចាំថា៖\nការមើលទៅទូរសព្ទអាច​ដោះសោ​ទូរសព្ទបាន ទោះបីជាអ្នក​មិនមានបំណង​ដោះសោ​ក៏ដោយ។\n\nអ្នកផ្សេងអាច​ដោះសោទូរសព្ទ​របស់អ្នក ប្រសិនបើ​ទូរសព្ទនេះ​ស្ថិតនៅ​ចំពី​មុខរបស់អ្នក។\n\nអ្នកដែល​មាន​មុខមាត់​ស្រដៀង​អ្នកខ្លាំង ដូចជា​បងប្អូន​បង្កើត​ដែលមានមុខមាត់​ដូចអ្នក​អាចនឹង​ដោះសោ​ទូរសព្ទ​របស់អ្នក​បាន។"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"សូមចងចាំថា៖\nការមើលទៅទូរសព្ទអាច​ដោះសោ​ទូរសព្ទបាន ទោះបីជាអ្នក​មិនមានបំណង​ដោះសោ​ក៏ដោយ។\n\nអ្នកផ្សេងអាច​ដោះសោទូរសព្ទ​របស់អ្នក ប្រសិនបើ​ទូរសព្ទនេះ​ស្ថិតនៅ​ចំពី​មុខរបស់អ្នក ទោះបីជាអ្នក​បិទភ្នែក​ក៏ដោយ។\n\nអ្នកដែល​មាន​មុខមាត់​ស្រដៀង​អ្នកខ្លាំង ដូចជា​បងប្អូន​បង្កើត​ដែលមានមុខមាត់​ដូចអ្នក​អាចនឹង​ដោះសោ​ទូរសព្ទ​របស់អ្នក​បាន។"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"លុប​ទិន្នន័យ​ទម្រង់​មុខ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ទិន្នន័យ​ទម្រង់មុខ​ដែលប្រើដោយ​មុខងារ​ដោះសោ​តាមទម្រង់មុខ​នឹងត្រូវបាន​លុបជាអចិន្ត្រៃយ៍ និង​ប្រកបដោយ​សុវត្ថិភាព។ បន្ទាប់ពី​លុបហើយ អ្នក​នឹងត្រូវប្រើកូដ PIN, លំនាំ ឬ​ពាក្យសម្ងាត់ ដើម្បី​ដោះសោ​ទូរសព្ទ​របស់អ្នក ចូលកម្មវិធី និង​បញ្ជាក់​ការបង់ប្រាក់​ជាដើម។"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"ប្រើ​ការដោះ​សោ​តាម​​ទម្រង់​មុខ ដើម្បី​ដោះសោ​ទូរសព្ទរបស់អ្នក"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ប្រើស្នាមម្រាមដៃរបស់អ្នកដើម្បីដោះសោទូរសព្ទរបស់អ្នក ឬយល់ព្រមលើការទិញ។\n\nចំណាំ៖ អ្នកមិនអាចប្រើស្នាមម្រាមដៃរបស់អ្នក ដើម្បីដោះសោឧបករណ៍នេះឡើយ។ សម្រាប់ព័ត៌មានបន្ថែម សូមទាក់ទងអ្នកគ្រប់គ្រង​របស់​ស្ថាប័នអ្នក។"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ប្រើស្នាមម្រាមដៃរបស់អ្នកដើម្បីដោះសោទូរសព្ទរបស់អ្នក ឬយល់ព្រមលើការទិញ។\n\nចំណាំ៖ ស្នាមម្រាមដៃរបស់អ្នកអាចមិនសូវមានសុវត្ថិភាពដូចការប្រើលំនាំ ឬកូដ PIN ដែលរឹងមាំនោះទេ។"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"បោះបង់"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ទេ អរគុណ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"បន្ត"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"រំលង"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"បន្ទាប់"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"តាមរយៈ​ការការពារ​ថេប្លេត​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើថេប្លេត​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់មួយ ដើម្បី​រៀបចំ​ការដោះសោតាមទម្រង់មុខ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"តាមរយៈ​ការការពារ​ឧបករណ៍​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើ​ឧបករណ៍​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់មួយ ដើម្បី​រៀបចំ​ការដោះសោតាមទម្រង់មុខ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"តាមរយៈ​ការការពារ​ទូរសព្ទ​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើទូរសព្ទ​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏​ត្រូវការជម្រើស​ចាក់សោអេក្រង់មួយ ដើម្បី​រៀបចំ​ការដោះសោតាមទម្រង់មុខ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"តាមរយៈ​ការការពារ​ថេប្លេត​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើថេប្លេត​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏ត្រូវប្រើ​ជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ជីវមាត្រ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"តាមរយៈ​ការការពារ​ឧបករណ៍​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើ​ឧបករណ៍​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏ត្រូវប្រើ​ជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ជីវមាត្រ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"តាមរយៈ​ការការពារ​ទូរសព្ទ​របស់អ្នក​ដោយប្រើ​ជម្រើស​ចាក់សោអេក្រង់​ណាមួយ គ្មាននរណា​អាចប្រើទូរសព្ទ​នេះបានទេ ប្រសិនបើ​បាត់ ឬ​ត្រូវចោរលួច។ អ្នកក៏ត្រូវប្រើ​ជម្រើស​ចាក់សោអេក្រង់ ដើម្បី​រៀបចំ​ជីវមាត្រ​ផងដែរ។ ដើម្បី​ត្រឡប់​ទៅវិញ សូមចុច \"បោះបង់\"។"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"រំលងការ​រៀបចំកូដ PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"រំលង​ការរៀបចំ​ពាក្យសម្ងាត់?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"រំលង​ការរៀបចំ​លំនាំ?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើថេប្លេតនេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើឧបករណ៍នេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ទប់ស្កាត់អ្នកផ្សេងពីការប្រើទូរស័ព្ទនេះដោយគ្មានការអនុញ្ញាតពីអ្នកដោយធ្វើឲ្យលក្ខណៈពិសេសការពារឧបករណ៍សកម្ម។ សូមជ្រើសការចាក់សោអេក្រង់ដែលអ្នកចង់ប្រើ។"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"ជ្រើសរើសវិធីចាក់សោអេក្រង់បម្រុងទុក"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"ជ្រើសរើសវិធីចាក់សោអេក្រង់បម្រុងទុក​របស់អ្នក"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ជ្រើសរើស​វិធីចាក់សោ​អេក្រង់បម្រុង​របស់អ្នក"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ជម្រើស​ចាក់សោអេក្រង់"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ជម្រើស​ចាក់សោអេក្រង់"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ចាក់សោ​អេក្រង់"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ការដោះសោ​តាមទម្រង់មុខ + ពាក្យសម្ងាត់"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"បន្ត​ដោយមិនរៀបចំ​ការដោះសោតាមទម្រង់មុខ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"អ្នកអាចដោះសោទូរសព្ទរបស់អ្នកដោយប្រើមុខរបស់អ្នក។ ដើម្បីសុវត្ថិភាព ជម្រើសនេះតម្រូវឱ្យមានការចាក់សោអេក្រង់បម្រុងទុក។"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ជីវមាត្រ + លំនាំ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ជីវមាត្រ + កូដ PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ជីវមាត្រ + ពាក្យ​សម្ងាត់"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"បន្តដោយ​មិនប្រើ​ជីវមាត្រ"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"អ្នកអាច​ដោះសោ​ទូរសព្ទរបស់អ្នក​ដោយប្រើ​ជីវមាត្រ​របស់អ្នក។ ដើម្បី​សុវត្ថិភាព ជម្រើសនេះ​តម្រូវឱ្យមាន​ការចាក់សោអេក្រង់​បម្រុង។"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"បិទដោយអ្នកគ្រប់គ្រង គោលការណ៍​អ៊ិនគ្រីប ឬទំហំផ្ទុកព័ត៌មានសម្គាល់ខ្លួន"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"គ្មាន"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"អូស"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">ត្រូវ​តែ​តិច​ជាង <xliff:g id="NUMBER_0">%d</xliff:g> ខ្ទង់</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"អ្នក​គ្រប់គ្រង​ឧបករណ៍​មិនអនុញ្ញាត​កូដ PIN ​ទើបប្រើហើយទេ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"កូដ PIN លក្ខណៈ​សាមញ្ញ​ត្រូវ​បាន​ទប់ស្កាត់​ដោយ​អ្នក​គ្រប់គ្រង​ព័ត៌មាន​វិទ្យា​របស់អ្នក។ សាកល្បង​ប្រើ​កូដ PIN ផ្សេង​ពី​នេះ។"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"វាមិនអាចប្រើតួអក្សរដែលគ្មានសុពលភាពទេ"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ត្រូវមានអក្សរយ៉ាងហោចណាស់មួយតួ"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ត្រូវមានលេខយ៉ាងហោចណាស់មួយតួ"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">ត្រូវតែមាន​តួដែលមិនមែន​ជាលេខ​យ៉ាងហោចណាស់ 1</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"អ្នក​គ្រប់គ្រង​ឧបករណ៍​មិន​អនុញ្ញាត​ឲ្យ​ប្រើ​ពាក្យ​សម្ងាត់​បច្ចុប្បន្ន​ទេ"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ពាក្យសម្ងាត់​លក្ខណៈ​សាមញ្ញ​ត្រូវ​បាន​ទប់ស្កាត់​ដោយ​អ្នក​គ្រប់គ្រង​ព័ត៌មាន​វិទ្យា​របស់អ្នក។ សាកល្បង​ប្រើ​ពាក្យ​សម្ងាត់​ផ្សេង​ពី​នេះ។"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"មិន​អនុញ្ញាត​ឲ្យ​មានលំដាប់ឡើង ចុះ ឬច្រំដែលទេ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"បញ្ជាក់"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"បោះ​បង់​"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"បើក​វ៉ាយហ្វាយ"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ប្រើ Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ប្រើ Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ការកំណត់​វ៉ាយហ្វាយ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"រៀបចំ &amp; គ្រប់គ្រង​ចំណុច​ចូល​ដំណើរការ​ឥត​ខ្សែ"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"ដាក់កូដ QR ខាងក្រោមឱ្យ​នៅចំកណ្ដាល ដើម្បីភ្ជាប់ទៅ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"ចូលរួម Wi-Fi ដោយស្កេនកូដ QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ចែករំលែក Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"ស្កេន​កូដ​ QR នេះដើម្បី​ភ្ជាប់​ទៅ “<xliff:g id="SSID">%1$s</xliff:g>” និងចែករំលែក​ពាក្យសម្ងាត់"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"ស្កេន​កូដ​ QR នេះដោយប្រើ​ឧបករណ៍​ផ្សេង ដើម្បី​ចូលរួម “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"ស្កេន QR កូដនេះ ដើម្បីភ្ជាប់ជាមួយ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"សូមព្យាយាមម្ដងទៀត។ ប្រសិនបើ​បញ្ហា​នៅតែបន្តកើតឡើង សូមទាក់ទង​ក្រុមហ៊ុនផលិត​ឧបករណ៍"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"មានអ្វីមួយ​ខុសប្រក្រតី"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ពាក្យសម្ងាត់ Wi‑Fi៖ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ពាក្យសម្ងាត់​ហតស្ប៉ត៖ <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ភ្ជាប់ដោយ​ស្វ័យប្រវត្តិ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"អនុញ្ញាតឱ្យ​ទូរសព្ទភ្ជាប់ដោយស្វ័យប្រវត្តិ នៅពេលនៅជិត​បណ្ដាញនេះ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"អនុញ្ញាតឱ្យ​ថេប្លេតភ្ជាប់ដោយស្វ័យប្រវត្តិ នៅពេលនៅជិត​បណ្ដាញនេះ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"អនុញ្ញាត​ឱ្យភ្ជាប់​ជាមួយ​បណ្ដាញនេះ នៅពេល​មានសេវា"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"បញ្ចូល​ឧបករណ៍"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ប្រើកូដ QR ដើម្បី​បញ្ចូល​ឧបករណ៍​ទៅ​បណ្តាញ​នេះ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"កូដ QR មិនមែនជា​ទម្រង់​ដែលត្រឹមត្រូវ​ទេ"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ប្រើវិញ្ញាបនបត្រប្រព័ន្ធ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"កុំផ្តល់"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"កុំបញ្ជាក់សុពលភាព"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"មិនមានវិញ្ញាបនបត្រដែលបានបញ្ជាក់ទេ។ ការតភ្ជាប់របស់អ្នកនឹងមិនមានលក្ខណៈឯកជនទេ។"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ឈ្មោះ​បណ្តាញ​វែងពេក​ហើយ។"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ត្រូវតែបញ្ជាក់ដែន"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"តម្រូវឱ្យ​មាន​វិញ្ញាបនបត្រ។"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"តភ្ជាប់"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"បានបើក Wi‑Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"បានភ្ជាប់ជាមួយ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"កំពុងភ្ជាប់ទៅ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"កំពុងភ្ជាប់…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"បាន​បរាជ័យ​ក្នុង​ការ​តភ្ជាប់​បណ្ដាញ"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"បណ្ដាញ​មិន​មានសេវា​ទេ"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"អាសយដ្ឋាន​ឧបករណ៍ MAC"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"អាសយដ្ឋាន MAC ចៃដន្យ"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"អាសយដ្ឋាន MAC ចៃដន្យ (បានប្រើចុងក្រោយ)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"អាសយដ្ឋាន IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ព័ត៌មាន​បណ្ដាញ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"របាំងបណ្តាញរង"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"អាសយដ្ឋាន IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"បណ្ដាញ​ដែលបាន​រក្សាទុក"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"ការ​ជាវ"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"បណ្តាញផ្សេងទៀត"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"ការ​កំណត់ IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"ការកំណត់កម្រិតខ្ពស់នៃ Wi‑Fi មិនអាចប្រើបានសម្រាប់អ្នកប្រើនេះទេ"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"រក្សាទុក"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"បញ្ចូល​អាសយដ្ឋាន​ច្រកចេញ​ចូល​ដែល​ត្រឹមត្រូវ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"បញ្ចូល​អាសយដ្ឋាន DNS ដែល​ត្រឹមត្រូវ។"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"បញ្ចូល​ប្រវែង​បុព្វបទ​បណ្ដាញ​ចន្លោះ ០ និង ៣២។"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ប្រសិនបើមិនលុបពីលើដោយ DNS ឯកជន)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ប្រសិនបើមិនលុបពីលើដោយ DNS ឯកជន)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ច្រក​"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ប្រវែង​បុព្វបទ​បណ្ដាញ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi ​ផ្ទាល់"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"កម្មវិធីកំពុងចែករំលែកខ្លឹមសារ។ ដើម្បីចែករំលែកការភ្ជាប់អ៊ីនធឺណិត សូមបិទហតស្ប៉ត រួចបើកឡើងវិញ"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"មិនមានការកំណត់ពាក្យសម្ងាត់​ទេ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ឈ្មោះ​ហតស្ប៉ត"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"កំពុងបើក <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"កំពុងបើក <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ឧបករណ៍​ផ្សេងទៀត​អាចភ្ជាប់​ជាមួយ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ពាក្យសម្ងាត់​ហតស្ប៉ត"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"កម្រិតបញ្ជូន AP"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"បង្កើន​អត្រា​ផ្ទុកឡើងវិញ​ដោយស្វ័យប្រវត្តិ​ពី 60 ទៅ 90 Hz សម្រាប់​ខ្លឹមសារ​មួយចំនួន។ ប្រើប្រាស់ថ្ម​ច្រើន​ជាងមុន។"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ជំរុញឱ្យមានអត្រា​ផ្ទុកឡើងវិញ 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"អត្រា​ផ្ទុកឡើងវិញ​ខ្ពស់បំផុតសម្រាប់​គុណភាពនៃ​រូបមានចលនា និង​ការឆ្លើយតបនៃ​ការចុចប្រសើរជាងមុន។ ប្រើប្រាស់ថ្ម​ច្រើន​ជាងមុន។"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ការដឹងថាកំពុងនៅប្រើ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"បើក / អេក្រង់​នឹងមិន​បិទទេ ប្រសិនបើ​អ្នក​កំពុង​មើល​អេក្រង់"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"នៅពេល​អេក្រង់​ងងឹត មុខងារនេះ​នឹងបើក​សម្រាប់ការ​ជូនដំណឹងថ្មីៗ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"បង្ហាញម៉ោង និង​ព័ត៌មាន​ជានិច្ច"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ប្រើ​ថាមពលថ្ម​ច្រើនជាងមុន"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"អក្សរ​ដិត"</string>
     <string name="title_font_size" msgid="570613010306330622">"ទំហំពុម្ពអក្សរ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ធ្វើឲ្យអក្សរធំជាងមុន ឬតូចជាងមុន"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"កំណត់​ការ​ចាក់សោ​ស៊ីម​កាត"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"កំណែ Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"កំណែ​សុវត្ថិភាពថ្មី​របស់ Android"</string>
     <string name="model_info" msgid="8997566254717810904">"ម៉ូដែល"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ម៉ូដែល៖ %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ម៉ូដែល និងហាតវែរ"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"កំណែ​ហាតវែរ"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"លេខ​សម្គាល់​បរិក្ខារ"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"លុប APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN ថ្មី"</string>
     <string name="menu_save" msgid="6611465355127483100">"រក្សាទុក"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"បោះបង់"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"បោះបង់"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"វាល​ឈ្មោះ​មិន​អាច​ទទេ។"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN មិន​អាច​ទទេ។"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"អាច​កំណត់​កម្មវិធី​ឡើងវិញ​បាន"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"កំណត់ Wi-Fi ឧបករណ៍ចល័ត និងប៊្លូធូសឡើងវិញ"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"វា​នឹង​កំណត់​ការកំណត់​បណ្តាញ​ទាំងអស់​ឡើងវិញ រួម​មាន៖\n\n"<li>"Wi‑Fi"</li>\n<li>"ទិន្នន័យ​ទូរសព្ទចល័ត"</li>\n<li>"ប៊្លូធូស"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"លុប"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"លុប​ស៊ីម​ដែលបាន​ទាញយក"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"ដើម្បី​ទាញយក​ស៊ីមជំនួស សូម​ទាក់ទង​ក្រុមហ៊ុន​សេវាទូរសព្ទរបស់​អ្នក។ សកម្មភាព​នេះ​នឹង​មិន​បោះបង់​គម្រោង​សេវាទូរសព្ទចល័ត​ណាមួយ​ឡើយ។"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"សកម្មភាពនេះ​នឹងមិនបោះបង់​គម្រោង​សេវាទូរសព្ទចល័ត​ណាមួយឡើយ។ ដើម្បី​ទាញយក​ស៊ីមជំនួស សូម​ទាក់ទង​ក្រុមហ៊ុន​សេវាទូរសព្ទរបស់​អ្នក។"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"កំណត់ការកំណត់ឡើងវិញ"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"កំណត់ការកំណត់​បណ្ដាញ​ទាំងអស់​ឡើងវិញ? អ្នកមិន​អាចត្រឡប់​សកម្មភាពនេះ​វិញបានទេ។"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"កំណត់ការកំណត់បណ្តាញទាំងអស់ឡើងវិញ និង​លុប​ស៊ីមដែលបាន​ទាញយក? អ្នកមិន​អាចត្រឡប់​សកម្មភាពនេះ​វិញបានទេ។"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"បានកំណត់ការកំណត់បណ្តាញឡើងវិញ"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"មិន​អាចលុប​ស៊ីម​បានទេ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"មិន​អាច​លុប​ស៊ីម​ដែលបានទាញយក​ទេ ដោយសារ​មានបញ្ហា។\n\nសូម​ចាប់ផ្ដើម​​ឧបករណ៍​របស់អ្នក​ឡើងវិញ រួចព្យាយាម​ម្ដងទៀត។"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"លុបទិន្នន័យទាំងអស់ (កំណត់ដូចថ្មីវិញ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"លុបទិន្នន័យទាំងអស់ (កំណត់ដូចថ្មីវិញ)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ការធ្វើបែបនេះ​នឹង​លុប​ទិន្នន័យ​ទាំងអស់ពី "<b>"ទំហំផ្ទុកខាងក្នុង"</b>"នៃថេប្លេត​របស់អ្នក រួមទាំង៖\n\n"<li>"កម្មវិធី​ដែលបានទាញយក"</li>\n<li>"ទិន្នន័យ​កម្មវិធី និង​ប្រព័ន្ធ​ ព្រមទាំងការកំណត់​"</li>\n<li>"គណនី Google របស់អ្នក"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ការធ្វើបែបនេះ​នឹង​លុប​ទិន្នន័យ​ទាំងអស់​ពី​ "<b>"ទំហំផ្ទុក​ខាង​ក្នុង"</b>"នៃ​ទូរសព្ទ​របស់​អ្នក រួមទាំង៖\n\n"<li>"កម្មវិធី​ដែលបាន​ទាញ​យក"</li>\n<li>"ទិន្នន័យ​កម្មវិធី និង​ប្រព័ន្ធ​ ព្រមទាំងការកំណត់"</li>\n<li>"គណនី Google របស់​អ្នក"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"បច្ចុប្បន្ន​ អ្នក​បាន​ចូល​គណនី​ដូច​ខាង​ក្រោម៖ \n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"មានអ្នកផ្សេងច្រើនទៀតមានវត្តមាននៅលើឧបករណ៍នេះ។\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"តន្ត្រី"</li>\n<li>"រូបថត"</li>\n<li>"ទិន្នន័យ​អ្នក​ប្រើ​ផ្សេង​ទៀត"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ការធ្វើបែបនេះនឹងមិនបោះបង់គម្រោងសេវាកម្មទូរសព្ទចល័តរបស់អ្នកទេ។"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"ដើម្បី​សម្អាត​តន្ត្រី រូបថត និង​ទិន្នន័យ​អ្នក​ប្រើ​ផ្សេងៗ តម្រូវ​ឲ្យ​លុប"<b>"ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</b>" ។"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"ដើម្បី​សម្អាត​តន្ត្រី, រូបភាព និង​ទិន្នន័យ​អ្នកប្រើ​ផ្សេងទៀត "<b>"ចាំបាច់​ត្រូវ"</b>" លុប​កាត​អេសឌី។"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"លុបទិន្នន័យទាំងអស់ (កំណត់ដូច​ចេញពីរោងចក្រ)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"លុបទិន្នន័យទាំងអស់ (កំណត់ដូច​ចេញពីរោងចក្រ)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ការធ្វើបែបនេះ​នឹង​លុប​ទិន្នន័យ​ទាំងអស់ពី"<b>"ទំហំផ្ទុកខាងក្នុង"</b>"នៃថេប្លេត​របស់អ្នក រួមទាំង៖\n\n"<li>"គណនី Google របស់អ្នក"</li>\n<li>"ទិន្នន័យ​កម្មវិធី​និង​ប្រព័ន្ធ​ និងការកំណត់​"</li>\n<li>"កម្មវិធី​ដែលបានទាញយក"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ការធ្វើបែបនេះ​នឹង​លុប​ទិន្នន័យ​ទាំងអស់​ពី"<b>"ទំហំផ្ទុក​ខាង​ក្នុង"</b>"នៃ​ទូរសព្ទ​របស់​អ្នក រួមទាំង៖\n\n"<li>"គណនី Google របស់​អ្នក"</li>\n<li>"ទិន្នន័យ​កម្មវិធី​និង​ប្រព័ន្ធ​ និងការកំណត់"</li>\n<li>"កម្មវិធី​ដែលបាន​ទាញ​យក"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"បច្ចុប្បន្ន អ្នក​បាន​ចូល​គណនី​ដូច​ខាង​ក្រោម៖\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"មានអ្នកប្រើប្រាស់​ផ្សេងទៀតមានវត្តមាន​នៅលើឧបករណ៍នេះ។\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"តន្ត្រី"</li>\n<li>"រូបថត"</li>\n<li>"ទិន្នន័យ​អ្នក​ប្រើ​ប្រាស់ផ្សេង​ទៀត"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"សកម្មភាពនេះ​នឹងមិនលុបចោលគម្រោង​សេវាកម្មឧបករណ៍ចល័ត​របស់អ្នកទេ។"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"ដើម្បី​សម្អាតតន្ត្រី រូបភាព និង​ទិន្នន័យ​អ្នកប្រើប្រាស់​ផ្សេងទៀត ចាំបាច់ត្រូវលុប"<b>"ឧបករណ៍ផ្ទុក USB"</b>"។"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"ដើម្បី​សម្អាត​តន្ត្រី រូបភាព និង​ទិន្នន័យ​អ្នកប្រើប្រាស់​ផ្សេងទៀត ចាំបាច់ត្រូវលុប"<b>"កាត SD"</b>"។"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"លុប​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"លុប​កាត​​អេសឌី"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"លុប​ទិន្នន័យ​ទាំងអស់​លើ​ឧបករណ៍​ផ្ទុក​យូអេសប៊ី​ខាង​ក្នុង ដូច​ជា​តន្ត្រី ឬ​​រូបថត"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"លុប​ទិន្នន័យ​ទាំងអស់​លើ​កាត​អេសឌី ដូច​ជា​តន្ត្រី ឬ​រូបថត"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"លុប​ទិន្នន័យ​ទាំង​អស់"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"លុប​ទិន្នន័យ​ទាំង​អស់"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ព័ត៌មាន​ផ្ទាល់ខ្លួន និងកម្មវិធី​ដែលបានទាញយក​ទាំងអស់​របស់អ្នកនឹងត្រូវបានលុបចេញ។ អ្នកមិន​អាចត្រឡប់​សកម្មភាពនេះ​វិញបានទេ។"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ព័ត៌មាន​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់អ្នក រួម​ទាំង​ស៊ីម និងកម្មវិធី​ដែលបាន​ទាញយកនឹងត្រូវបានលុបចេញ។ អ្នកមិន​អាចត្រឡប់​សកម្មភាពនេះ​វិញបានទេ។"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"លុប​អ្វីៗ​ទាំងអស់"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"គ្មាន​ការ​កំណត់​ឡើងវិញ​ត្រូវ​បាន​អនុវត្ត ព្រោះ​សេវាកម្ម​សម្អាត​ប្រព័ន្ធ​មិន​អាច​ប្រើ​បាន។"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"លុប​ទិន្នន័យ​ទាំង​អស់​?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ការ​កំណត់​ដូច​ចេញ​ពី​រោងចក្រ​ឡើង​វិញ​មិន​អាច​ប្រើ​បាន​សម្រាប់​អ្នក​ប្រើ​ម្នាក់​នេះ"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"លុប"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"សូម​រង់ចាំ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"លុប​ទិន្នន័យ​ទាំង​អស់"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"លុប​ទិន្នន័យ​ទាំង​អស់"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ព័ត៌មាន​ផ្ទាល់ខ្លួន និងកម្មវិធី​ដែលបានទាញយក​ទាំងអស់​របស់អ្នកនឹងត្រូវបានលុបចេញ។ អ្នកមិន​អាចត្រឡប់​សកម្មភាពនេះ​វិញបានទេ។"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ព័ត៌មាន​ផ្ទាល់ខ្លួន​ទាំងអស់​របស់អ្នក រួម​ទាំង​ស៊ីម និងកម្មវិធី​ដែលបាន​ទាញយកនឹងត្រូវបានលុបចេញ។ អ្នកមិន​អាចត្រឡប់​សកម្មភាពនេះ​វិញបានទេ។"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"លុប​ទិន្នន័យ​ទាំង​អស់ឬ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ការកំណត់​ដូចចេញពី​រោងចក្រ​មិនអាចប្រើបាន​សម្រាប់​អ្នកប្រើប្រាស់​នេះទេ"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"កំពុងលុប"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"សូម​រង់ចាំ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"កំណត់​ការ​ហៅ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"រៀបចំ​សារ​ជា​សំឡេង បញ្ជូន​ការ​ហៅ​បន្ត រង់ចាំ​ការ​ហៅ លេខ​សម្គាល់​អ្នក​ហៅ"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"ការ​ភ្ជាប់តាម USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"មិន​អាច​ភ្ជាប់​ទៅ​ឧបករណ៍​ច្រើន​ជាង <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ។"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> នឹង​ត្រូវ​បាន​ផ្ដាច់។"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ការ​ភ្ជាប់អ៊ីសឺរណិត"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទតាមរយៈអ៊ីសឺរណិត USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ទូរសព្ទតាមរយៈអ៊ីសឺរណិត"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ប្រើហតស្ប៉ត និងការភ្ជាប់ ដើម្បីផ្តល់អ៊ីនធឺណិតដល់ឧបករណ៍ផ្សេងទៀតតាមរយៈការភ្ជាប់ទិន្នន័យទូរសព្ទចល័តរបស់អ្នក។ កម្មវិធីក៏អាចបង្កើតហតស្ប៉ត ដើម្បីចែករំលែកខ្លឹមសារជាមួយឧបករណ៍ដែលនៅជិតផងដែរ។"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ប្រើ​ហតស្ប៉ត និង​ការភ្ជាប់ ដើម្បី​ផ្តល់​អ៊ីនធឺណិត​ដល់​ឧបករណ៍​ផ្សេងទៀត​តាមរយៈ​ការតភ្ជាប់ Wi-Fi ឬ​ទិន្នន័យ​ទូរសព្ទ​ចល័ត​របស់​អ្នក។ កម្មវិធី​ក៏​អាច​បង្កើត​ហតស្ប៉ត ដើម្បី​ចែករំលែក​ខ្លឹមសារ​ជាមួយ​ឧបករណ៍​ដែល​នៅជិត​បាន​ផងដែរ។"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ជំនួយ"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ការស្កេនប៊្លូធូស"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"អនុញ្ញាត​ឱ្យ​កម្មវិធី និងសេវាកម្ម​ស្កេនរក​ឧបករណ៍ដែល​នៅ​ជិត​បាន​គ្រប់ពេល ទោះបីជា​ប៊្លូធូសបិទ​ក៏ដោយ។ ឧទាហរណ៍ សកម្មភាព​នេះ​អាច​ត្រូវ​បាន​ប្រើ ដើម្បី​កែលម្អ​មុខងារ និងសេវាកម្មនានា​ដែល​ផ្អែក​លើ​ទីតាំង។"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"សេវាកម្មទីតាំង​សម្រាប់​ការងារ"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំង"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំង"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"អនុញ្ញាតឱ្យប្រើ​ទីតាំងរបស់ឧបករណ៍ ដើម្បីចាប់ដឹងពី​ល្វែងម៉ោងបច្ចុប្បន្ន។ ការកំណត់ទីតាំង​ផ្សេងទៀតដូចជា ការស្កេន Wi‑Fi ជាដើម​អាចប៉ះពាល់ដល់​ភាពត្រឹមត្រូវនៃការចាប់ដឹងពី​ល្វែងម៉ោង។"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"បើក"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"បិទ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ការចាប់ដឹងពី​ល្វែងម៉ោង​ដោយស្វ័យប្រវត្តិ​ត្រូវបាន​បិទ"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំងត្រូវបានបិទ"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ការចាប់ដឹងពី​ល្វែងម៉ោងរបស់ទីតាំង​មិនអាចប្រើបានទេ"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ការផ្លាស់ប្ដូរ​ការចាប់ដឹងពីល្វែងម៉ោង​របស់ទីតាំងមិនត្រូវបាន​អនុញ្ញាតទេ"</string>
     <string name="location_network_based" msgid="5247042890080021887">"វ៉ាយហ្វាយ &amp; ទីតាំង​បណ្ដាញ​ចល័ត"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"ឲ្យ​កម្មវិធី​ប្រើ​សេវាកម្ម​ទីតាំង​របស់ Google ដើម្បី​ស្មាន​ទីតាំង​របស់​អ្នក​កាន់តែ​លឿន។ ទិន្នន័យ​ទីតាំង​អនាមិក​នឹង​ត្រូវ​បាន​ប្រមូល​ រួច​ផ្ញើ​ទៅ Google ។"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"ទីតាំង​បាន​កំណត់​ដោយ​វ៉ាយហ្វាយ"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ដើម្បី​ប្រើ​ការដោះសោតាមទម្រង់មុខ សូមកំណត់​ពាក្យសម្ងាត់"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ដើម្បី​ប្រើ​ការដោះសោតាមទម្រង់មុខ សូមកំណត់​លំនាំ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ដើម្បី​ប្រើ​ការដោះសោតាមទម្រង់មុខ សូមកំណត់​កូដ PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ដើម្បីប្រើជីវមាត្រ សូមកំណត់ពាក្យសម្ងាត់"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ដើម្បីប្រើ​ជីវមាត្រ សូមកំណត់​លំនាំ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ដើម្បីប្រើ​ជីវមាត្រ សូមកំណត់​កូដ PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"ភ្លេចពាក្យសម្ងាត់​របស់អ្នកឬ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ភ្លេចលំនាំ​របស់អ្នកឬ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ភ្លេចកូដ PIN របស់អ្នកឬ?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ចំណូលចិត្ត​អក្សររត់"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ការពង្រីក"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ផ្ទៃ​ពង្រីក"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"មុខងារ​បើក​ការពង្រីក"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ជ្រើសរើស​ផ្ទៃពង្រីក​ដែលអ្នក​ចង់ប្រើ នៅពេល​ពង្រីក​អេក្រង់"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"អេក្រង់ពេញ"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ផ្នែក​នៃ​អេក្រង់"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"អេក្រង់ពេញ និង​ផ្នែកនៃ​អេក្រង់"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ពង្រីក​អេក្រង់​ទាំងមូល"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ពង្រីក​ផ្នែកនៃ​អេក្រង់"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ប្ដូរទៅប៊ូតុង​ភាពងាយស្រួលឬ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ការប្រើការចុចបីដង ដើម្បីពង្រីកផ្នែកនៃអេក្រង់​នឹងបង្កឱ្យការវាយបញ្ចូល និងសកម្មភាពផ្សេងទៀត​ពន្យារពេល។\n\nតើអ្នកចង់ប្ដូរទៅប្រើប៊ូតុង​ភាពងាយស្រួល ដើម្បីពង្រីកដែរទេ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ប្ដូរទៅប៊ូតុង​ភាពងាយស្រួល"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"រក្សា​ការចុចបីដង ដើម្បីពង្រីក"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ការកំណត់​ការពង្រីក"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ពង្រីកដោយធ្វើការចុចបីដង"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ពង្រីកដោយប្រើផ្លូវកាត់"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ប៊ូតុងថាមពល​បញ្ចប់​ការ​ហៅ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ព្រួញកណ្តុរធំ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"លុប​រូបភាព​មាន​ចលនា"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"សំឡេងម៉ូណូ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"រួមផ្សំប៉ុស្តិ៍ចូលគ្នាពេលកំពុងចាក់សំឡេង"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"តុល្យភាព​សំឡេង"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ឆ្វេង"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ស្ដាំ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"សំឡេងម៉ូណូ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"រួមផ្សំប៉ុស្តិ៍ចូលគ្នាពេលកំពុងចាក់សំឡេង"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"តុល្យភាព​សំឡេង"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ឆ្វេង"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ស្ដាំ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"លំនាំដើម"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 វិនាទី"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 វិនាទី"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"ការ​ញ័រនៃការជូនដំណឹង"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ការញ័រ​នៃសំឡេងរោទ៍"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ប្រតិកម្មតបនឹងការប៉ះ"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"ប្រើ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"បើក <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ប្រើ​ការ​កែតម្រូវពណ៌"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"បង្ហាញ​អក្សររត់"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"សម្រាប់​កម្មវិធី​ដែលអាច​ប្រើបាន​តែប៉ុណ្ណោះ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"ប្រើ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"បើក <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ប្រើ​ការ​កែតម្រូវពណ៌"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"បង្ហាញ​អក្សររត់"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"សម្រាប់​កម្មវិធី​ដែលអាច​ប្រើបាន​តែប៉ុណ្ណោះ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"រចនាប័ទ្ម និង​ទំហំ​អក្សររត់"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"ទំហំ​អក្សរ <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ជម្រើស​ច្រើនទៀត"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ការមើល​មិនឃើញ​ពណ៌​បៃតង"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ការមើល​មិនឃើញ​ពណ៌ក្រហម"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ការមើល​មិនឃើញ​ពណ៌ខៀវ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"មាត្រដ្ឋានពណ៌​ប្រផេះ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ក្រហម-បៃតង"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ក្រហម-បៃតង"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ខៀវ-លឿង"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ការ​ដាក់កំហិត​នៅ​ផ្ទៃ​ខាងក្រោយ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"អនុញ្ញាត​ឲ្យ​កម្មវិធី​នេះ​ដំណើរការ​នៅ​ផ្ទៃ​ខាង​ក្រោយ"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"កម្មវិធីមិន​ត្រូវ​បាន​អនុញ្ញាត​ឲ្យ​ដំណើរការ​នៅ​ផ្ទៃខាងក្រោយ​ទេ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"​មិន​អាច​ដាក់​កំហិត​ការប្រើប្រាស់​នៅ​ផ្ទៃ​ខាងក្រោយ​បានទេ"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"​មិន​អាច​ដាក់​កំហិតលើ​ការប្រើប្រាស់​នៅ​ផ្ទៃ​ខាងក្រោយ​បានទេ"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ដាក់កម្រិតលើសកម្មភាពផ្ទៃខាងក្រោយ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ប្រសិនបើអ្នកដាក់កម្រិតលើសកម្មភាពផ្ទៃខាងក្រោយសម្រាប់កម្មវិធី វាអាចនឹងដំណើរការខុសប្រក្រតី"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ដោយសារ​កម្មវិធីនេះ​មិនត្រូវ​បានកំណត់ ដើម្បី​បង្កើន​ប្រសិទ្ធភាពថ្ម អ្នកមិន​អាចដាក់​កំហិតវា​បានទេ។\n\nដើម្បី​ដាក់កំហិត​កម្មវិធី សូមបើក​ការបង្កើន​ប្រសិទ្ធភាពថ្ម​ជាមុនសិន។"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ថេប្លេត​ត្រូវបានប្រើប្រាស់ច្រើន​ជាង​ធម្មតា"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ឧបករណ៍​ត្រូវបានប្រើប្រាស់​ច្រើន​ជាង​ធម្មតា"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"អាចនឹងឆាប់​អស់​ថ្ម​​ជាងធម្មតា"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"កំពុងបង្កើនប្រសិទ្ធភាព​គុណភាពថ្ម"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"បានដាក់កម្រិតថ្ម​ជាបណ្ដោះអាសន្ន។ សូមចុច ដើម្បី​ស្វែងយល់​បន្ថែម។"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"ទូរសព្ទរបស់អ្នក​ត្រូវបាន​ប្រើប្រាស់​ច្រើន​ជាងធម្មតា។ ថ្ម​របស់អ្នក​អាច​នឹង​ឆាប់អស់ជាង​ការរំពឹងទុក។\n\nកម្មវិធី​ដែល​ប្រើប្រាស់​ច្រើន​បំផុត តាមរយៈ​ការប្រើប្រាស់​ថ្ម៖"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"ថេប្លេតរបស់អ្នក​ត្រូវបាន​ប្រើប្រាស់​ច្រើន​ជាងធម្មតា។ ថ្ម​របស់អ្នក​អាច​នឹង​ឆាប់អស់ជាង​ការរំពឹងទុក។\n\nកម្មវិធី​ដែល​ប្រើប្រាស់​ច្រើន​បំផុត តាមរយៈ​ការប្រើប្រាស់​ថ្ម៖"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"ឧបករណ៍របស់អ្នក​ត្រូវបាន​ប្រើប្រាស់​ច្រើន​ជាងធម្មតា។ ថ្ម​របស់អ្នក​អាច​នឹង​ឆាប់អស់ជាង​ការរំពឹងទុក។\n\nកម្មវិធី​ដែល​ប្រើប្រាស់​ច្រើន​បំផុត តាមរយៈ​ការប្រើប្រាស់​ថ្ម៖"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">កម្មវិធី %1$d ត្រូវបាន​ដាក់កំហិត</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"មានបញ្ហាក្នុង​ការអាន​ឧបករណ៍រង្វាស់កម្រិតថ្មរបស់អ្នក"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"មានបញ្ហាក្នុង​ការអាន​ឧបករណ៍រង្វាស់កម្រិតថ្មរបស់អ្នក។ សូមចុចដើម្បី"<annotation id="url">"ស្វែងយល់បន្ថែម"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"បញ្ឈប់កម្មវិធី?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"ទូរសព្ទ​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP">%1$s</xliff:g> កំពុង​បន្ត​ធ្វើឲ្យទូរសព្ទ​របស់អ្នក​ភ្ញាក់។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នក​អាច​បញ្ឈប់​កម្មវិធី​នេះ​។\n\nប្រសិនបើ​បញ្ហា​នេះ​នៅតែបន្ត​កើត​ឡើង អ្នក​គួរ​តែលុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"ថេប្លេត​របស់អ្នក​មិនអាច​គ្រប់គ្រង​ថ្ម​បានដូចធម្មតានោះទេ ដោយសារ <xliff:g id="APP">%1$s</xliff:g> កំពុង​បន្ត​ធ្វើឲ្យថេប្លេត​របស់អ្នក​ភ្ញាក់។\n\nដើម្បី​ព្យាយាម​ដោះស្រាយបញ្ហានេះ អ្នក​អាច​បញ្ឈប់​កម្មវិធី​នេះ​។\n\nប្រសិនបើ​បញ្ហា​នេះ​នៅតែបន្ត​កើត​ឡើង អ្នក​គួរ​តែលុប​កម្មវិធីនេះ ដើម្បី​ធ្វើ​ឲ្យ​ដំណើរការថ្ម​មានភាពប្រសើរឡើង។"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"កំណត់​កាលវិភាគ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"បង្កើនកម្រិត​ថាមពល​ថ្ម"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"បិទ នៅពេល​សាកថ្មពេញ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"មុខងារ​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលទូរសព្ទរបស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"មុខងារ​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលថេប្លេត​របស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"មុខងារ​សន្សំ​ថ្មនឹង​បិទ​ នៅពេលឧបករណ៍របស់អ្នកមានថ្ម <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"មុខងារសន្សំថ្មនឹងបិទ នៅពេល​ទូរសព្ទរបស់អ្នក​សាកថ្មលើសពី <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"មុខងារសន្សំថ្មនឹងបិទ នៅពេល​ថេប្លេតរបស់អ្នក​សាកថ្មលើសពី <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"មុខងារសន្សំថ្មនឹងបិទ នៅពេល​ឧបករណ៍របស់អ្នក​សាកថ្មលើសពី <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"បើក"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"កំណត់​ឡើងវិញ"</string>
     <string name="tts_play" msgid="2945513377250757221">"លេង"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ការតភ្ជាប់មានភាពបត់បែន"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"បង្កើនកម្រិតថាមពលថ្ម និងកែលម្អសមត្ថភាព​ឧបករណ៍​ដោយគ្រប់គ្រងការតភ្ជាប់បណ្ដាញ​របស់អ្នកដោយស្វ័យប្រវត្តិ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"កន្លែងផ្ទុកព័ត៌មានសម្ងាត់"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ដំឡើង​វិញ្ញាបនបត្រ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ដំឡើង​វិញ្ញាបនបត្រ​ពី​ឧបករណ៍​ផ្ទុក"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ព័ត៌មានសម្គាល់ខ្លួនអ្នកប្រើ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"មើល និងកែប្រែព័ត៌មានសម្គាល់ខ្លួនដែលបានផ្ទុក"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"កម្រិត​ខ្ពស់"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ប្រភេទ​ឧបករណ៍​ផ្ទុក"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"កន្លែង​ផ្ទុក​របស់​​ផ្នែក​រឹង"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"កន្លែង​ផ្ទុក​របស់​​កម្មវិធី"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ព័ត៌មាន​សម្ងាត់​មិន​មាន​សម្រាប់​អ្នកប្រើ​នេះ​ទេ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"បានដំឡើេងសម្រាប់ VPN និងកម្មវិធី"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"បានដំឡើងសម្រាប់ Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"កុំ​ដំឡើង"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"មិនអីទេ ដំឡើងចុះ"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"មិនបាន​ដំឡើង​វិញ្ញាបនបត្រទេ"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"អនុញ្ញាតឱ្យ <xliff:g id="APP_NAME">%s</xliff:g> ដំឡើងវិញ្ញាបនបត្រ​នៅលើឧបករណ៍នេះឬ?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"វិញ្ញាបនបត្រទាំងនេះ​នឹងកំណត់អត្តសញ្ញាណ​អ្នកឱ្យកម្មវិធី និង URL ខាងក្រោមស្គាល់"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"មិនអនុញ្ញាត"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"អនុញ្ញាត"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"បង្ហាញ​ច្រើនទៀត"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"កម្មវិធីគ្រប់គ្រងវិញ្ញាបនបត្រ"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"គ្មាន"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"វិញ្ញាបនបត្រ​ដែលបានដំឡើង​ដោយកម្មវិធីនេះ​កំណត់អត្តសញ្ញាណ​អ្នកឱ្យកម្មវិធី និង URL ខាងក្រោមស្គាល់"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"លុប"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"សញ្ញា​ហៅទូរសព្ទ​ពេលអាសន្ន"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"កំណត់​ឥរិយាបថ​ពេល​ហៅ​ពេល​មាន​អាសន្ន"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"បម្រុង​ទុក"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"មិន​បាន​រៀបចំ - ប្រវត្តិរូប​ការងារ"</string>
     <string name="user_admin" msgid="4024553191395768119">"អ្នកគ្រប់គ្រង"</string>
     <string name="user_you" msgid="3070562015202859996">"អ្នក (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"សម្មតិនាម"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"អ្នកអាចបន្ថែមអ្នកប្រើរហូតដល់ <xliff:g id="USER_COUNT">%1$d</xliff:g> នាក់"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"មាន​តែ​ម្ចាស់​កុំព្យូទ័រ​បន្ទះ​ប៉ុណ្ណោះ​អាច​គ្រប់គ្រង​អ្នកប្រើ"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"មាន​តែ​ម្ចាស់​ទូរស័ព្ទ​ប៉ុណ្ណោះ​អាច​គ្រប់គ្រង​អ្នកប្រើ។"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"បង់ប្រាក់នៅកន្លែងដែលមានឧបករណ៍គិតប្រាក់"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ដំឡើងកម្មវិធីបង់ប្រាក់ ហើយបន្ទាប់មកដាក់ផ្នែកខាងក្រោយនៃទូរសព្ទរបស់អ្នកទៅលើឧបករណ៍គិតប្រាក់ណាមួយដែលមាននិមិត្តសញ្ញាមិនចាំបាច់ប៉ះម៉ាស៊ីនគិតប្រាក់។"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"យល់ហើយ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ច្រើន​ទៀត..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ច្រើនទៀត…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"កំណត់​កម្មវិធី​បង់ប្រាក់​លំនាំដើម"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ធ្វើបច្ចុប្បន្នភាព​កម្មវិធី​បង់ប្រាក់​លំនាំដើម"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"នៅម៉ាស៊ីន​គិតប្រាក់​ដោយ​មិនចាំបាច់ប៉ះ សូមបង់ប្រាក់​តាមរយៈ <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ថយក្រោយ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"បន្ទាប់​"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"បញ្ចប់"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ថតរូប"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ជ្រើសរើស​រូបភាព"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ជ្រើស​រូបថត"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ស៊ី​ម​កាត"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ស៊ី​ម​កាត"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ប្រើ​វា​សម្រាប់​ការ​ហៅ​ជា​និច្ច"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ជ្រើស​ស៊ីម​សម្រាប់​ទិន្នន័យ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"ជ្រើសរើស​ស៊ីម​សម្រាប់​សារ SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"កំពុងប្តូរស៊ីមទិន្នន័យ វាអាចចំណាយពេលមួយនាទី..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"កំពុងប្ដូរស៊ីមទិន្នន័យ សកម្មភាពនេះ​អាចចំណាយពេល​មួយនាទី…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ហៅ​ជាមួយ"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ជ្រើស​ស៊ី​ម​កាត"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ស៊ី​ម <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ទម្លាប់ កាលវិភាគ មុខងារ​សន្សំ​ថ្ម កម្មវិធីសន្សំថាមពល ថ្ម ស្វ័យប្រវត្តិ ភាគរយ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ការហៅទូរសព្ទ​កម្រិតខ្ពស់, ការហៅទូរសព្ទតាមរយៈប្រព័ន្ធ 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"បញ្ចូលភាសា បញ្ចូលភាសាមួយ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ទំហំ​អក្សរ"</string>
     <string name="default_sound" msgid="6604374495015245195">"សំឡេង​លំនាំ​ដើម"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"កម្រិតសំឡេង​រោទ៍ និង​ការជូន​ដំណឹង​ត្រឹម <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"កម្រិត​សំឡេង ការញ័រ កុំរំខាន"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"បើកសំឡេង"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"អក្សររត់ក្នុងពេលជាក់ស្ដែង"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ដាក់អក្សររត់លើមេឌៀដោយស្វ័យប្រវត្តិ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"គ្មាន"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">បានកំណត់​កាលវិភាគ <xliff:g id="ON_COUNT">%d</xliff:g></item>
-      <item quantity="one">បានកំណត់​កាលវិភាគ 1</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{គ្មាន}=1{បានកំណត់​កាលវិភាគ 1}other{បានកំណត់​កាលវិភាគ #}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"កុំ​រំខាន"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ទទួលការជូនដំណឹង​ពីកម្មវិធី និងមនុស្សសំខាន់ៗ​តែប៉ុណ្ណោះ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"កាត់បន្ថយ​ការរំខាន"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"អាទិភាពប៉ុណ្ណោះ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"បើក / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"បិទ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"បិទ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"បើក"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"សួរគ្រប់ពេល"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"រហូតទាល់តែ​អ្នកបិទ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ម៉ោង</item>
-      <item quantity="one">1 ម៉ោង</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> នាទី"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">កាលវិភាគ <xliff:g id="ON_COUNT">%d</xliff:g> អាច​បើកដោយស្វ័យប្រវត្តិ</item>
-      <item quantity="one">កាលវិភាគ 1 អាច​បើកដោយស្វ័យប្រវត្តិ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ម៉ោង}other{# ម៉ោង}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 នាទី}other{# នាទី}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{បិទ}=1{បិទ / កាលវិភាគ 1 អាច​បើកដោយស្វ័យប្រវត្តិ}other{បិទ / កាលវិភាគ # អាចបើក​ដោយស្វ័យប្រវត្តិ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"អ្វីដែល​អាច​ផ្អាក​មុខងារ​កុំរំខាន"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"មនុស្ស"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"កម្មវិធី"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"កំណត់​ការជូនដំណឹង​អាទិភាពទាប​ទៅជាការជូនដំណឹង​ស្ងាត់ៗ​ដោយស្វ័យប្រវត្តិ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ការ​ចាត់ថ្នាក់​ការជូន​ដំណឹង​ដែល​មាន​ភាព​បត់បែន"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ចាត់ថ្នាក់​ការជូន​ដំណឹង​តាម​ភាព​ពាក់ព័ន្ធ​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"មតិកែលម្អ​អំពីការជូនដំណឹង​ដែលមានភាពបត់បែន"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"បង្ហាញ​ការកែតម្រូវដែលបានធ្វើឡើង​ចំពោះការជូនដំណឹង និងបង្ហាញ​ជម្រើស​ក្នុងការ​ផ្ដល់មតិកែលម្អ​ទៅប្រព័ន្ធ"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"កំណត់​កម្រិតសំខាន់​នៃការជូនដំណឹង​ឡើងវិញ"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"កំណត់ឡើងវិញ​នូវ​ការកំណត់​កម្រិតសំខាន់​ដែលផ្លាស់ប្ដូរ​ដោយអ្នកប្រើប្រាស់ រួច​អនុញ្ញាតឱ្យ​ជំនួយការ​ជូនដំណឹង​ធ្វើការកំណត់​អាទិភាព"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ការឆ្លើយតប និង​សកម្មភាព​ដែលបានណែនាំ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"បង្ហាញការឆ្លើយតប និង​សកម្មភាព​ដែលបានណែនាំដោយស្វ័យប្រវត្តិ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"បង្ហាញ​ការជូនដំណឹង​ថ្មីៗ និង​ការជូនដំណឹង​ដែលបាន​ផ្អាក"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"ការសន្ទនា​អាទិភាព"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"បង្ហាញនៅ​ខាងលើ​ផ្នែកសន្ទនា និងបង្ហាញជា​សារលេចឡើង​អណ្ដែត"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"បង្ហាញនៅ​ខាងលើ​ផ្នែកសន្ទនា"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"ការ​សន្ទនា​ផ្សេងទៀត"</string>
+    <string name="other_conversations" msgid="551178916855139870">"ការសន្ទនាដែល​មិនមែនជាអាទិភាព"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ការសន្ទនា​ដែលអ្នកបានធ្វើ​ការផ្លាស់ប្ដូរ"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"ការសន្ទនាថ្មីៗ"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"សម្អាត​ការសន្ទនាថ្មីៗ"</string>
+    <string name="clear" msgid="5092178335409471100">"សម្អាត"</string>
     <string name="important_bubble" msgid="7911698275408390846">"បង្ហាញ​ការសន្ទនាអាទិភាព​ជាសារលេចឡើង"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ការសន្ទនាអាទិភាព​បង្ហាញ​នៅ​ផ្នែកខាងលើ​នៃ​ផ្ទាំង​ទាញចុះ។ អ្នកក៏អាចកំណត់​ការសន្ទនាទាំងនោះឱ្យ​បង្ហាញជា​សារលេចឡើង និងផ្អាក​ការកុំ​រំខាន​បានផងដែរ។"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ការសន្ទនា​ដែលបានកែប្រែ និងការសន្ទនាអាទិភាព​នឹងបង្ហាញ​នៅទីនេះ"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"ចូលដំណើរការមុខងារកុំរំខាន"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"អនុញ្ញាតមុខងារកុំរំខាន"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"គ្មានកម្មវិធីបានដំឡើងណាមួយបានស្នើការចូលដំណើរការមុខងារកុំរំខានទេ"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"កំពុងផ្ទុកកម្មវិធី…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"តាមសំណើ​របស់អ្នក Android កំពុង​ទប់ស្កាត់​ការជូនដំណឹង​របស់កម្មវិធី​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ប្រភេទនៃការជូនដំណឹង​​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"តាមសំណើ​របស់អ្នក ប្រព័ន្ធ​ប្រតិបត្តិការ Android កំពុង​ទប់ស្កាត់​ក្រុមនៃ​ការជូនដំណឹង​នេះ​មិន​ឱ្យ​បង្ហាញ​នៅលើ​ឧបករណ៍​នេះទេ"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ការសន្ទនា​ទាំងអស់"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ការសន្ទនា​អាទិភាព"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"គ្មាន"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">ការ​សន្ទនា <xliff:g id="CONVERSATIONS">%d</xliff:g></item>
-      <item quantity="one">ការ​សន្ទនា 1</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"គ្មាន"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{គ្មាន}=1{ការ​សន្ទនា 1}other{ការសន្ទនា #}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"អ្នកដែល​អាច​ផ្អាកបាន"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ការហៅ​ទូរសព្ទ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ហៅ"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ដើម្បី​ប្រាកដថា ការហៅទូរសព្ទ​ដែលមាន​ការអនុញ្ញាត​អាចរោទ៍សំឡេងបាន សូមពិនិត្យមើល​ថាឧបករណ៍​ត្រូវបានកំណត់ឱ្យរោទ៍"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"បាន​ទប់ស្កាត់​ការហៅចូល​សម្រាប់ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ។ អ្នកអាចកែតម្រូវការកំណត់ ដើម្បីអនុញ្ញាតឱ្យមិត្តភ័ក្តិ គ្រួសារ ឬទំនាក់ទំនងផ្សេងទៀតរបស់អ្នកអាចទាក់ទងអ្នកបាន។"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ទំនាក់​ទំនង​​​​​មាន​ផ្កាយ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> នាក់ទៀត</item>
-      <item quantity="one">1 នាក់ទៀត</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"គ្មាន"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{គ្មាន}=1{{contact_1}}=2{{contact_1} និង {contact_2}}=3{{contact_1}, {contact_2} និង {contact_3}}other{{contact_1}, {contact_2} និង # នាក់ទៀត}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(គ្មាន​ឈ្មោះ)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"សារ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"សារ​"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"សារ"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"បានទប់ស្កាត់​សារចូល​សម្រាប់ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’។ អ្នកអាចកែតម្រូវការកំណត់ ដើម្បីអនុញ្ញាតឱ្យមិត្តភ័ក្តិ គ្រួសារ ឬទំនាក់ទំនងផ្សេងទៀតរបស់អ្នកអាចទាក់ទងអ្នកបាន។"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"សារទាំងអស់​អាចទាក់ទង​អ្នកបាន"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ការហៅទាំងអស់​អាចទាក់ទង​អ្នកបាន"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"គ្មាន"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">ទំនាក់ទំនង <xliff:g id="NUM_CONTACTS">%d</xliff:g></item>
-      <item quantity="one">ទំនាក់ទំនង 1</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{គ្មាន}=1{ទំនាក់ទំនង 1}other{ទំនាក់ទំនង #}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"គ្រប់គ្នា"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ទំនាក់ទំនង"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ទំនាក់ទំនង​មាន​ផ្កាយ"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ការ​ជូន​ដំណឹង​ទាំងអស់"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ការជូនដំណឹង​មួយចំនួន"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"មនុស្សដែល​បានជ្រើសរើសនៅតែ​អាចទាក់ទងអ្នក​បានដដែល ទោះបីជាអ្នក​មិនអនុញ្ញាតឱ្យ​កម្មវិធីបង្អាក់ក៏ដោយ"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> អាច​ផ្អាកបាន</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> អាច​ផ្អាកបាន</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> ទៀត"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{គ្មាន​កម្មវិធី​ដែលអាចផ្អាក​បានទេ}=1{{app_1} អាច​ផ្អាកបាន}=2{{app_1} និង {app_2} អាចផ្អាកបាន}=3{{app_1}, {app_2} និង {app_3} អាចផ្អាកបាន}other{{app_1}, {app_2} និង # ទៀតអាចផ្អាកបាន}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"កម្មវិធី"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ការ​ជូន​ដំណឹង​ទាំងអស់"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ការជូនដំណឹង​មួយចំនួន"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ការជូនដំណឹង​ដែលអាចបង្អាក់"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"អនុញ្ញាត​ការជូនដំណឹង​ទាំងអស់"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> អាច​ផ្អាកបាន</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> អាច​ផ្អាកបាន</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"គ្មានអ្វីមួយ​អាចផ្អាក​បានទេ"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> ទៀត"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{គ្មានអ្វីមួយ​អាចផ្អាក​បានទេ}=1{{sound_category_1} អាច​ផ្អាកបាន}=2{{sound_category_1} និង {sound_category_2} អាចផ្អាកបាន}=3{{sound_category_1}, {sound_category_2} និង {sound_category_3} អាចផ្អាកបាន}other{{sound_category_1}, {sound_category_2} និង # ទៀតអាចផ្អាកបាន}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"គ្មានអ្វីមួយ​អាចផ្អាក​បានទេ"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"គ្មាន​នរណា​អាចផ្អាក​បានទេ"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"មនុស្ស​មួយចំនួន​អាចផ្អាក​បាន"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"នរណា​ក៏អាច​ផ្អាក​បានដែរ"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"បើក"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"បិទ"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"ការខ្ទាស់​កម្មវិធី"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"ការខ្ទាស់កម្មវិធី​អនុញ្ញាតឱ្យអ្នក​បន្តមើល​ឃើញកម្មវិធីបច្ចុប្បន្ន រហូតទាល់តែ​អ្នកដកខ្ទាស់​កម្មវិធីនោះ។ ឧទាហរណ៍ មុខងារនេះ​អាចប្រើ ដើម្បីអនុញ្ញាតឱ្យ​មិត្តភ័ក្តិដែលជឿទុកចិត្ត​លេងហ្គេម​ជាក់លាក់បាន។ \n\nនៅពេលខ្ទាស់កម្មវិធី កម្មវិធីដែលបានខ្ទាស់​អាចនឹងបើក​កម្មវិធីផ្សេងទៀត ហើយអាចនឹងចូលប្រើទិន្នន័យ​ផ្ទាល់ខ្លួន។ \n\nដើម្បីប្រើ​ការខ្ទាស់កម្មវិធី៖ 	\n1.	បើក​ការខ្ទាស់កម្មវិធី 	\n2.	បើក​ទិដ្ឋភាពរួម 	\n3.	ចុច​រូបកម្មវិធី​នៅផ្នែកខាងលើ​នៃអេក្រង់ បន្ទាប់មកចុច \"ខ្ទាស់\""</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"ការខ្ទាស់កម្មវិធី​អនុញ្ញាតឱ្យអ្នក​បន្តមើល​ឃើញកម្មវិធីបច្ចុប្បន្ន រហូតទាល់តែ​អ្នកដកខ្ទាស់​កម្មវិធីនោះ។ ឧទាហរណ៍ មុខងារនេះ​អាចប្រើ ដើម្បីអនុញ្ញាតឱ្យ​មិត្តភ័ក្តិដែលជឿទុកចិត្ត​លេងហ្គេម​ជាក់លាក់បាន។ \n\nនៅពេលខ្ទាស់កម្មវិធី កម្មវិធីដែលបានខ្ទាស់​អាចនឹងបើក​កម្មវិធីផ្សេងទៀត ហើយអាចនឹងចូលប្រើទិន្នន័យ​ផ្ទាល់ខ្លួន។ \n\nប្រសិនបើ​អ្នក​ចង់​ចែករំលែក​ឧបករណ៍​របស់អ្នក​ជាមួយ​នរណាម្នាក់​ប្រកបដោយសុវត្ថិភាព សូម​សាកល្បងប្រើ​អ្នកប្រើប្រាស់ជាភ្ញៀវ​ជំនួសវិញ​។ \n\nដើម្បីប្រើការខ្ទាស់កម្មវិធី៖ 	\n1.	បើក​ការខ្ទាស់កម្មវិធី 	\n2.	បើក​ទិដ្ឋភាពរួម 	\n3.	ចុច​រូបកម្មវិធី​នៅផ្នែកខាងលើ​នៃអេក្រង់ បន្ទាប់មកចុច \"ខ្ទាស់\""</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"ការខ្ទាស់កម្មវិធី​អនុញ្ញាតឱ្យអ្នក​បន្តមើល​ឃើញកម្មវិធីបច្ចុប្បន្ន រហូតទាល់តែ​អ្នកដកខ្ទាស់​កម្មវិធីនោះ។ ឧទាហរណ៍ មុខងារនេះ​អាចប្រើ ដើម្បីអនុញ្ញាតឱ្យ​មិត្តភ័ក្តិដែលជឿទុកចិត្ត​លេងហ្គេម​ជាក់លាក់បាន។"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"នៅពេលខ្ទាស់កម្មវិធី កម្មវិធីដែលបានខ្ទាស់​អាចបើក​កម្មវិធីផ្សេងទៀត ហើយអាចចូលប្រើទិន្នន័យ​ផ្ទាល់ខ្លួនបាន។ \n\nដើម្បីប្រើការខ្ទាស់កម្មវិធី៖ 	\n1.	បើក​ការខ្ទាស់កម្មវិធី 	\n2.	បើក​ទិដ្ឋភាពរួម 	\n3.	ចុច​រូបកម្មវិធី​នៅផ្នែកខាងលើ​នៃអេក្រង់ បន្ទាប់មកចុច \"ខ្ទាស់\""</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"នៅពេលខ្ទាស់កម្មវិធី កម្មវិធីដែលបានខ្ទាស់​អាចបើក​កម្មវិធីផ្សេងទៀត ហើយអាចចូលប្រើទិន្នន័យ​ផ្ទាល់ខ្លួនបាន។ \n\nប្រសិនបើ​អ្នក​ចង់​ចែករំលែក​ឧបករណ៍​របស់អ្នក​ជាមួយ​នរណាម្នាក់​ប្រកបដោយសុវត្ថិភាព សូម​សាកល្បងប្រើ​អ្នកប្រើប្រាស់ជាភ្ញៀវ​ជំនួសវិញ​។ \n\nដើម្បីប្រើ​ការខ្ទាស់កម្មវិធី៖ 	\n1.	បើក​ការខ្ទាស់កម្មវិធី 	\n2.	បើក​ទិដ្ឋភាពរួម 	\n3.	ចុច​រូបកម្មវិធី​នៅផ្នែកខាងលើ​នៃអេក្រង់ បន្ទាប់មកចុច \"ខ្ទាស់\""</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"នៅពេលខ្ទាស់កម្មវិធី៖ \n\n•		អាចចូលប្រើ​ទិន្នន័យផ្ទាល់ខ្លួន​បាន \n		(ដូចជា ទំនាក់ទំនង និងខ្លឹមសារអ៊ីមែលជាដើម) \n•		កម្មវិធីដែលបានខ្ទាស់​អាចបើក​កម្មវិធីផ្សេងទៀត \n\nប្រើការខ្ទាស់កម្មវិធី​ជាមួយមនុស្សដែលអ្នកជឿទុកចិត្ត​តែប៉ុណ្ណោះ។"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"សួរ​រក​លំនាំ​ដោះ​សោ​មុន​ពេល​ផ្ដាច់"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"សួរ​រក​កូដ PIN មុន​ពេល​ផ្ដាច់"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"បន្ថែម​ពី​លើ​ការប្រើប្រាស់​មុខរបស់​អ្នកដើម្បីដោះសោឧបករណ៍​របស់​អ្នក អ្នក​អាច​​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយតម្រូវ​ឱ្យ​​បញ្ចូលកូដ PIN ​មុន​ពេល​​ចាប់ផ្តើមឧបករណ៍។ ឧបករណ៍​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹង រួម​ទាំង​ម៉ោងរោទ៍បានទេ ប្រសិនបើ​វា​មិនទាន់​ចាប់ផ្ដើម។\n\nសកម្មភាព​នេះ​ជួយ​ការពារ​ទិន្នន័យ​នៅ​លើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវគេ​លួច។ តម្រូវ​​ឱ្យ​​បញ្ចូលកូដ PIN ​ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នកដែរទេ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"បន្ថែម​ពី​លើ​ការប្រើប្រាស់​មុខរបស់អ្នកដើម្បីដោះសោឧបករណ៍​របស់​អ្នក អ្នក​អាច​​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយតម្រូវ​ឱ្យ​​បញ្ចូលលំនាំ ​មុន​ពេល​​ចាប់ផ្តើមឧបករណ៍។ ឧបករណ៍​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹង រួម​ទាំង​ម៉ោងរោទ៍បានទេ ប្រសិនបើ​វា​មិនទាន់​ចាប់ផ្ដើម។\n\nសកម្មភាព​នេះ​ជួយ​ការពារ​ទិន្នន័យ​នៅ​លើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវគេ​លួច។ តម្រូវ​ឱ្យ​​បញ្ចូលលំនាំ ​ដើម្បី​​ចាប់ផ្តើមឧបករណ៍របស់អ្នកដែរទេ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"បន្ថែម​ពី​លើ​ការប្រើប្រាស់​មុខរបស់អ្នកដើម្បីដោះសោឧបករណ៍​របស់​អ្នក អ្នក​អាច​​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយតម្រូវ​ឱ្យ​​បញ្ចូលពាក្យ​សម្ងាត់ ​មុន​ពេល​​ចាប់ផ្តើមឧបករណ៍។ ឧបករណ៍​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹង រួម​ទាំង​ម៉ោងរោទ៍បានទេ ប្រសិនបើ​វា​មិនទាន់​ចាប់ផ្ដើម។\n\nសកម្មភាព​នេះ​ជួយ​ការពារ​ទិន្នន័យ​នៅ​លើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវគេ​លួច។ តម្រូវ​ឱ្យ​​បញ្ចូលពាក្យ​សម្ងាត់ ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នកដែរទេ?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"បន្ថែមពីលើ​ការប្រើប្រាស់​ជីវមាត្រ​របស់អ្នក​ដើម្បី​ដោះសោឧបករណ៍​របស់អ្នក អ្នកអាច​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយ​តម្រូវឱ្យប្រើកូដ PIN របស់អ្នក មុនពេលដែល​ឧបករណ៍​ចាប់ផ្តើម។ ឧបករណ៍នេះ​មិនអាចទទួល​ការហៅទូរសព្ទ សារ ឬ​ការជូនដំណឹង​រួមទាំង​ម៉ោងរោទ៍​បានទេ រហូតទាល់តែវា​ចាប់ផ្ដើម។\n\nសកម្មភាពនេះ​ជួយការពារទិន្នន័យ​នៅលើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវចោរលួច។ តម្រូវឱ្យប្រើ​កូដ PIN ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នក​ដែរទេ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"បន្ថែមពីលើ​ការប្រើប្រាស់​ជីវមាត្រ​របស់អ្នក​ដើម្បី​ដោះសោឧបករណ៍​របស់អ្នក អ្នកអាច​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយ​តម្រូវឱ្យប្រើ​លំនាំរបស់អ្នក មុនពេលដែល​ឧបករណ៍​ចាប់ផ្តើម។ ឧបករណ៍នេះ​មិនអាចទទួល​ការហៅទូរសព្ទ សារ ឬ​ការជូនដំណឹង​រួមទាំង​ម៉ោងរោទ៍​បានទេ រហូតទាល់តែវា​ចាប់ផ្ដើម។\n\nសកម្មភាពនេះ​ជួយការពារទិន្នន័យ​នៅលើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវចោរលួច។ តម្រូវឱ្យប្រើ​លំនាំ ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នក​ដែរទេ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"បន្ថែមពីលើ​ការប្រើប្រាស់​ជីវមាត្រ​របស់អ្នក​ដើម្បីដោះសោ​ឧបករណ៍​របស់អ្នក អ្នកអាច​ការពារ​ឧបករណ៍នេះបន្ថែម ដោយតម្រូវឱ្យ​ប្រើពាក្យសម្ងាត់​របស់អ្នក មុនពេលដែល​ឧបករណ៍​ចាប់ផ្តើម។ ឧបករណ៍នេះ​មិនអាចទទួល​ការហៅទូរសព្ទ សារ ឬ​ការជូនដំណឹង​រួមទាំង​ម៉ោងរោទ៍​បានទេ រហូតទាល់តែវា​ចាប់ផ្ដើម។\n\nសកម្មភាពនេះ​ជួយការពារទិន្នន័យ​នៅលើ​ឧបករណ៍​ដែលបាត់ ឬ​ត្រូវចោរលួច។ តម្រូវឱ្យប្រើ​ពាក្យសម្ងាត់ ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នក​ដែរទេ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"បាទ/ចាស"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ទេ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"បាន​ដាក់​កំហិត"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ត្រូវបានគ្រប់គ្រងដោយ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"​ឧបករណ៍ដែលបាន​ភ្ជាប់"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ឧបករណ៍នេះ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"កំពុង​ប្ដូរ..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"កំពុងប្ដូរ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"មិន​អាច​ប្ដូរ​បានទេ"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"កំពុងសាកថ្ម​ឧបករណ៍​នេះ"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"សាកថ្ម​ឧបករណ៍​ដែលបាន​ភ្ជាប់"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"ការប្រើ​ទិន្នន័យ​ទូរសព្ទចល័ត"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"ការប្រើទិន្នន័យកម្មវិធី"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"ការប្រើប្រាស់​ទិន្នន័យ Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"ការប្រើទិន្នន័យ​ដែលមិនមានប្រភព​មកពីក្រុមហ៊ុនសេវាទូរសព្ទ"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ការប្រើប្រាស់ទិន្នន័យអ៊ីសឺរណិត"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"អ៊ីសឺរណិត"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">ការដាក់កំហិត 1</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ការគណនាទិន្នន័យរបស់ក្រុមហ៊ុនសេវាទូរសព្ទអាចនឹងខុសគ្នាពីការគណនារបស់ឧបករណ៍"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"មិនរួមបញ្ចូល​ទិន្នន័យ​ដែលប្រើ​ដោយ​បណ្ដាញដែលមានប្រភព​មកពីក្រុមហ៊ុនសេវាទូរសព្ទ​ទេ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"បានប្រើ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"កំណត់ការព្រមានពីការប្រើទិន្នន័យ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ការព្រមានពីការប្រើទិន្នន័យ"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"មើល​ព័ត៌មាន​លម្អិត"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"កម្មវិធីសន្សំសំចៃទិន្នន័យ"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ទិន្នន័យ​ដែល​គ្មាន​ការដាក់​កំហិត"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ទិន្នន័យផ្ទៃខាងក្រោយបានបិទ"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ទិន្នន័យផ្ទៃខាងក្រោយបានបិទ"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"បើក"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"បិទ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ប្រើ​កម្មវិធី​សន្សំ​សំចៃ​ទិន្នន័យ"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ពេលឧបករណ៍ជាប់សោ ទប់ស្កាត់ការវាយអក្សរឆ្លើយតប ឬអត្ថបទផ្សេងទៀតនៅក្នុងការជូនដំណឹង"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"កម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធលំនាំដើម"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ជ្រើសរើសកម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ប្រើកម្មវិធីពិនិត្យអក្ខរាវិរុទ្ធ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ប្រើ​មុខងារ​ពិនិត្យ​អក្ខរាវិរុទ្ធ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"មិនបានជ្រើស"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(គ្មាន)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"៖ "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ដើម្បីបង្កើនទំហំផ្ទុក កម្មវិធីគ្រប់គ្រងទំហំផ្ទុកយករូបថត និងវីដេអូដែលបានបម្រុងទុកចេញពីឧបករណ៍របស់អ្នក។"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"យករូបថត និងវីដេអូចេញ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"កម្មវិធីគ្រប់គ្រងទំហំផ្ទុក"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ប្រើ​កម្មវិធីគ្រប់គ្រង​ទំហំផ្ទុក"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ប្រើ​កម្មវិធីគ្រប់គ្រង​ទំហំផ្ទុក"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ស្វ័យប្រវត្តិ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ឯកសារណែនាំ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"បង្កើនទំហំផ្ទុកឥឡូវនេះ"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ចុចពីរដងដើម្បីពិនិត្យទូរសព្ទ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ប៉ះពីរដងដើម្បីពិនិត្យថេប្លេត"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ប៉ះពីរដងដើម្បីពិនិត្យឧបករណ៍"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"អូសដើម្បីមើលការជូនដំណឹង"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"អូសចុះក្រោម​នៅលើគែមខាងក្រោមនៃអេក្រង់ ដើម្បីបង្ហាញ​ការជូនដំណឹងរបស់អ្នក"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"មុខងារប្រើដៃម្ខាង"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ប្រើមុខងារប្រើដៃម្ខាង"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ចាកចេញនៅពេលប្ដូរកម្មវិធី"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"អស់ម៉ោង"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 វិនាទី"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 វិនាទី"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 វិនាទី"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"លទ្ធភាពចុចដល់"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ដើម្បី​ពិនិត្យមើល​ម៉ោង ការជូន​ដំណឹង និងព័ត៌មាន​ផ្សេងទៀត សូម​ចុចអេក្រង់​របស់អ្នក​ពីរដង។"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"លើកដើម្បីពិនិត្យទូរសព្ទ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"លើកដើម្បីពិនិត្យថេប្លេត"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ចុចដើម្បី​ពិនិត្យមើលថេប្លេត"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ចុចដើម្បី​ពិនិត្យមើល​ឧបករណ៍"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ដើម្បី​ពិនិត្យមើល​ម៉ោង ការជូន​ដំណឹង និងព័ត៌មាន​ផ្សេងទៀត សូម​ចុចអេក្រង់​របស់អ្នក។"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ការហៅទៅ​លេខសង្គ្រោះបន្ទាន់"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"ប្រើ​ការហៅទៅ​លេខសង្គ្រោះបន្ទាន់"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"គ្រប់គ្រងដោយ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"ចាប់ផ្ដើម​សកម្មភាព​ខាងក្រោម ដោយចុច​ប៊ូតុង​ថាមពល​ឱ្យរហ័ស​យ៉ាងតិច 5 ដង"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"ចាក់​សំឡេងរោទ៍​រាប់ថយក្រោយ"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"ចាក់​សំឡេង​ឮៗ មុនពេល​ជូនដំណឹង​ដើម្បី​សុំជំនួយ"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"ហៅទូរសព្ទ​សុំជំនួយ"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"លេខ​សម្រាប់ហៅទូរសព្ទ​សុំជំនួយ"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>។ ចុចដើម្បីប្ដូរ"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"ប្រសិនបើ​អ្នកបញ្ចូល​លេខទូរសព្ទ​ដែលមិនមែនជា​លេខសង្គ្រោះបន្ទាន់៖\n • ឧបករណ៍របស់អ្នក​ត្រូវតែបានដោះសោ ទើបអាចប្រើ​ការហៅទៅ​លេខសង្គ្រោះបន្ទាន់បាន\n • ការហៅទូរសព្ទរបស់អ្នក​អាចនឹងមិន​ទទួលបាន​ការឆ្លើយតប​ទេ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"អូសលើ​ឧបករណ៍ចាប់ស្នាមម្រាមដៃ​សម្រាប់​ការជូនដំណឹង"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"អូសស្នាមម្រាមដៃ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ដើម្បីពិនិត្យមើលការជូនដំណឹងរបស់អ្នក សូមអូសចុះក្រោមនៅលើឧបករណ៍ចាប់ស្នាមម្រាមដៃ ដែលស្ថិតនៅផ្នែកខាងក្រោយទូរសព្ទរបស់អ្នក។"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"សំណុំទិន្នន័យ​មើល​ឃើញ​អតិបរមា"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"កំណត់​ឡើងវិញទៅ​តម្លៃ​លំនាំដើម"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"បំពេញ​ជម្រើស​អ្នកអភិវឌ្ឍន៍ដែលបាន​កំណត់​ឡើងវិញ"</string>
+    <string name="location_category" msgid="3496759112306219062">"ទីតាំង"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"សូចនាករ​ទីតាំង​នៅលើរបារស្ថានភាព"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"បង្ហាញ​ទីតាំង​ទាំងអស់ រួមទាំង​បណ្ដាញ និងការតភ្ជាប់"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"ជំរុញការវាស់ GNSS ពេញលេញ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"តាមដានក្រុមរូបថត និងហ្រេ្វកង់ GNSS ទាំងអស់​ដែល​គ្មាន​ការបែង​ចែក​រយៈពេល​ដំណើរការ"</string>
     <string name="device_theme" msgid="5027604586494772471">"រចនាប័ទ្ម​ឧបករណ៍"</string>
     <string name="default_theme" msgid="4815428567082263639">"លំ​នាំ​ដើម"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"ឈ្មោះ​បណ្តាញ"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"ផ្អាក​ការជូនដំណឹង​ដើម្បីផ្តោត​អារម្មណ៍"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"មិនអាចប្រើ​មុខងារនេះបានទេ"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"មុខងារនេះ​ត្រូវបានបិទ ដោយសារវា​ធ្វើឱ្យទូរសព្ទរបស់អ្នក​ដើរយឺត"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"ជំរុញការវាស់ GNSS ពេញលេញ"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"តាមដានក្រុមរូបថត និងហ្រេ្វកង់ GNSS ទាំងអស់​ដែល​គ្មាន​ការបែង​ចែក​រយៈពេល​ដំណើរការ"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"បង្ហាញ​ប្រអប់បញ្ចូល​នៃ​ការ​គាំង​ជានិច្ច"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"បង្ហាញ​ប្រអប់បញ្ចូល​រាល់ពេលដែល​កម្មវិធី​គាំង"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ជ្រើសរើស​កម្មវិធី​ដែលអាច​ប្រើ ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"បើកសម្រាប់​កម្មវិធីទាំងអស់"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ជ្រើសរើសដ្រាយវើ​ក្រាហ្វិក"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"លំនាំដើម"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ដ្រាយវើ​ហ្គេម"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ដ្រាយវើ​ហ្គេម"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ដ្រាយវើរបស់​អ្នកអភិវឌ្ឍន៍"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ដ្រាយវើ​ក្រាហ្វិកប្រព័ន្ធ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"បើក (បិទសំឡេង)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"បិទ"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"ព័ត៌មាន​បណ្ដាញ"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"ឈ្មោះ​ឧបករណ៍​របស់អ្នក​អាច​ឱ្យ​កម្មវិធី​នៅលើ​ទូរសព្ទ​របស់អ្នក​មើលឃើញ។ វា​ក៏​អាច​ឱ្យ​អ្នក​ដទៃ​មើល​ឃើញ​ផងដែរ នៅពេល​ដែលអ្នក​ភ្ជាប់​ទៅ​ឧបករណ៍​ប៊្លូធូស ឬ​រៀបចំ​ហតស្ប៉ត Wi-Fi ។"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"ឈ្មោះ​ឧបករណ៍​របស់អ្នក​អាច​ឱ្យ​កម្មវិធី​នៅលើ​ទូរសព្ទ​របស់អ្នក​មើលឃើញ។ វាក៏​អាចឱ្យ​អ្នកដទៃ​មើលឃើញ​ផងដែរ នៅពេលអ្នក​ភ្ជាប់​ជាមួយឧបករណ៍​ប៊្លូធូស បណ្ដាញ Wi-Fi ឬរៀបចំ ហតស្ប៉ត Wi-Fi។"</string>
     <string name="devices_title" msgid="649715719278562515">"ឧបករណ៍"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"ការកំណត់​ទាំងអស់"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"ការណែនាំ"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"រក​បណ្ដាញ​មិនឃើញទេ។ សូមព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ហាម)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"គ្មាន​ស៊ីម​កាត​ទេ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ស៊ីម"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"មិនមានស៊ីមទេ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"គ្មាន"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"តម្រូវឱ្យមាន​ស៊ីម ដើម្បីភ្ជាប់"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"តម្រូវឱ្យមានស៊ីម <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ដើម្បីភ្ជាប់"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"មុខងារ​​​បណ្ដាញដែលប្រើជាអាទិភាព​៖ ប្រើ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"មុខងារ​​​បណ្ដាញដែលប្រើជាអាទិភាព​៖ GSM ប៉ុណ្ណោះ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"មុខងារ​​​បណ្ដាញដែលប្រើជាអាទិភាព​៖ WCDMA ប៉ុណ្ណោះ"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ទិន្នន័យ​ទូរសព្ទចល័ត"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ចូល​ប្រើ​ទិន្នន័យ​ដោយ​ប្រើ​បណ្ដាញ​​ទូរសព្ទ​ចល័ត"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ទូរសព្ទនឹង​ប្ដូរ​ទៅប្រើប្រាស់ក្រុមហ៊ុន​សេវាទូរសព្ទនេះ​ដោយស្វ័យប្រវត្តិ នៅពេល​មានសេវា"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"គ្មាន​ស៊ីមកាត​ទេ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ចំណូលចិត្ត​នៃ​ការហៅ​ទូរសព្ទ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"ចំណូល​ចិត្តសារ SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"សួរគ្រប់ពេល"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"មិន​អាច​ប្រើបាន​ទេ នៅពេលភ្ជាប់ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"មើលច្រើន​ទៀត"</string>
     <string name="see_less" msgid="2642392725363552793">"​មើល​តិច​ជាង"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"បើក <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ឬ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"បើកស៊ីមឬ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"ប្ដូរទៅ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ឬ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ប្ដូរ​ទៅប្រើ​ស៊ីមកាតឬ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"អាចបើកដំណើរការ​ស៊ីម​ម្តងមួយតែប៉ុណ្ណោះ។\n\nការប្ដូរទៅ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> នឹងមិនបោះបង់​សេវាកម្ម <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> របស់អ្នកទេ។"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"អាចបើកដំណើរការ​ស៊ីមដែលបានទាញយក​ម្ដងមួយតែប៉ុណ្ណោះ​។\n\nការប្ដូរទៅ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> នឹងមិនបោះបង់សេវាកម្ម​ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> របស់អ្នក​ទេ។"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"អាចបើក​ដំណើរការ​ស៊ីម​ម្តងមួយតែប៉ុណ្ណោះ។\n\nការប្ដូរ​នឹងមិន​បោះបង់​សេវាកម្ម <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> របស់អ្នក​ទេ។"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"ប្ដូរទៅ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"កំពុងភ្ជាប់​បណ្ដាញ…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"កំពុង​ប្ដូរទៅ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"មិនអាច​ប្ដូរក្រុមហ៊ុនសេវា​ទូរសព្ទ​បានទេ"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"មិនអាច​ប្ដូរក្រុមហ៊ុនសេវា​ទូរសព្ទ​បានទេ ដោយសារ​មានបញ្ហា។"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"បិទ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ឬ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"បិទ​ស៊ីម​ឬ​?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"កំពុង​បិទស៊ីម<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"មិនអាច​បិទក្រុមហ៊ុន​សេវាទូរសព្ទ​បានទេ"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"មានអ្វីមួយ​ខុស​ប្រក្រតី ទើបមិនអាចបិទ​ក្រុមហ៊ុន​សេវាទូរសព្ទ​របស់អ្នកបាន។"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"ប្រើស៊ីម 2 ឬ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ឧបករណ៍នេះ​អាច​ដំណើរការ​ស៊ីម 2 ក្នុងពេល​តែមួយបាន។ ដើម្បី​បន្តប្រើ​ស៊ីម 1 ក្នុងមួយលើក សូមចុច​ពាក្យ \"ទេ អរគុណ\"។"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ចាប់ផ្ដើម​ឧបករណ៍​ឡើងវិញឬ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ដើម្បី​ចាប់ផ្ដើម សូមចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នក​ឡើងវិញ។ បន្ទាប់មក​អ្នកអាច​បញ្ចូល​ស៊ីម​ផ្សេងទៀត​បាន។"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"បន្ត"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ចាប់ផ្ដើមឡើងវិញ"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"ទេ អរគុណ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"ប៊ូតុង​បិទបើក"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"មិនអាច​បើកដំណើរការ​ស៊ីមបានទេ"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"សូមដកស៊ីម រួចបញ្ចូលឡើងវិញ។ ប្រសិនបើនៅតែមានបញ្ហា សូម​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នកឡើងវិញ។"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"សូម​សាកល្បង​បើកស៊ីមម្ដងទៀត។ ប្រសិនបើនៅតែមានបញ្ហា សូម​ចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នកឡើងវិញ។"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"ការបើកដំណើរការ​បណ្ដាញ"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> កំពុង​ដំណើរការ"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ចុច​ដើម្បី​ធ្វើបច្ចុប្បន្នភាព​ការកំណត់​ស៊ីម"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"ស៊ីមកាត"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"លុប​ស៊ីមដែលបានទាញយក​នេះឬ?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ការលុប​ស៊ីមនេះ​នឹងលុប​សេវាកម្ម <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ពីឧបករណ៍​នេះ។\n\nសេវាកម្ម​សម្រាប់ <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> នឹង​មិនត្រូវបាន​បោះបង់ទេ។"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"លុប"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"កំពុង​លុបស៊ីម…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"មិនអាច​លុប​ស៊ីម​បានទេ"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"មិនអាចលុប​ស៊ីមនេះ​បានទេ​ ដោយសារមាន​បញ្ហា។\n\nសូមចាប់ផ្ដើម​ឧបករណ៍​របស់អ្នក​ឡើងវិញ​ រួច​ព្យាយាម​ម្ដងទៀត។"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ភ្ជាប់​ឧបករណ៍"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"កម្មវិធី <xliff:g id="APPNAME">%1$s</xliff:g> ចង់ប្រើ​បណ្ដាញ Wi‑Fi បណ្ដោះអាសន្ន ដើម្បីភ្ជាប់ជាមួយ​ឧបករណ៍​របស់អ្នក"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"រកមិន​ឃើញ​ឧបករណ៍ទេ។ សូម​ប្រាកដថា​ឧបករណ៍​បានបើក និងអាច​ភ្ជាប់បាន។"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"ការហៅ​ទៅលេខ​សង្គ្រោះបន្ទាន់"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"ក្រុមហ៊ុន​សេវាទូរសព្ទ​របស់អ្នក​​មិនផ្ដល់សេវាហៅ​ទៅលេខ​សង្គ្រោះបន្ទាន់​តាមរយៈការហៅតាម Wi‑Fi ទេ។\nឧបករណ៍​ប្ដូរទៅប្រើ​បណ្តាញចល័ត​ដោយស្វ័យប្រវត្តិ​ ដើម្បី​ហៅ​ទៅលេខ​សង្គ្រោះបន្ទាន់។\nការហៅ​ទៅលេខ​សង្គ្រោះបន្ទាន់​អាច​ធ្វើ​បាននៅក្នុង​តំបន់​ដែលមាន​សេវាគ្របដណ្តប់​បណ្តាញ​ចល័ត​តែប៉ុណ្ណោះ។"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"ប្រើ Wi‑Fi សម្រាប់​ការហៅទូរសព្ទ ដើម្បី​កែលម្អ​គុណភាព"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"ការហៅទូរសព្ទឆ្លងស៊ីម"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"អនុញ្ញាត SMS និងការហៅទូរសព្ទតាមរយៈស៊ីមផ្សេងទៀតនៅលើស៊ីមនេះ។"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"ការហៅទូរសព្ទឆ្លងស៊ីម"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"សារ MMS ចូល"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"មិនអាច​ផ្ញើសារ MMS បានទេ"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"ចុចដើម្បីអនុញ្ញាត​ឱ្យមានការផ្ញើសារ MMS នៅលើ <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> នៅពេល​បិទទិន្នន័យទូរសព្ទចល័ត"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"អនុញ្ញាត​ការត្រួតគ្នាលើ​អេក្រង់នៅលើ​ការកំណត់"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"អនុញ្ញាតឱ្យ​កម្មវិធីដែលអាច​បង្ហាញនៅលើកម្មវិធី​ផ្សេងទៀត​ដាក់អេក្រង់ការកំណត់​ត្រួតគ្នា"</string>
     <string name="media_controls_title" msgid="403271085636252597">"មេឌៀ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"លាក់​កម្មវិធីចាក់ នៅពេលវគ្គ​មេឌៀបានបញ្ចប់"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"កម្មវិធីចាក់​អនុញ្ញាតឱ្យអ្នក​បន្តវគ្គពីផ្ទាំង​ការកំណត់រហ័ស​ដែលបានពង្រីក។"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"កម្មវិធីចាក់មេឌៀនៅក្នុងការកំណត់រហ័ស"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"បង្ហាញកម្មវិធីចាក់មេឌៀរយៈពេលយូរ ដើម្បីងាយស្រួលបន្តការចាក់"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"លាក់​កម្មវិធីចាក់"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"បង្ហាញ​កម្មវិធីចាក់"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"មិនមាន​កម្មវិធីចាក់ទេ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"កម្មវិធី​ដែល​បាន​អនុញ្ញាត"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"មេឌៀ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ប៊្លូធូសនឹងបើក"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"បើក"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"បិទ"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"អ៊ីនធឺណិត"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"ស៊ី​ម"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"បណ្ដាញ​មានសុវត្ថិភាព​ពេលជិះយន្តហោះ"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"រកមើល និង​ភ្ជាប់​បណ្ដាញ​មានសុវត្ថិភាព​ពេលជិះយន្តហោះ"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"យន្តហោះ មានសុវត្ថិភាព​ពេលជិះយន្តហោះ"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"ការហៅទូរសព្ទ និង SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"ការហៅ​តាម Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ហៅ និងទទួលទូរសព្ទតាម​បណ្ដាញដែលមិនមានប្រភព​មកពីក្រុមហ៊ុនសេវាទូរសព្ទ​ដូចជា Wi‑Fi ជាដើម"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"ការហៅតាម Wi-Fi អនុញ្ញាតឱ្យអ្នក​ហៅ និងទទួលទូរសព្ទ​តាម​បណ្ដាញដែលមិនមាន​ប្រភពមកពីក្រុមហ៊ុនសេវាទូរសព្ទ​ដូចជា បណ្ដាញ Wi‑Fi មួយចំនួនជាដើម។"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"ការហៅទូរសព្ទ"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"សារ SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"ជាអាទិភាព"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"ការហៅទូរសព្ទ​ជាអាទិភាព"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS ជាអាទិភាព"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"មិនអាចប្រើ​បានទេ"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"មិនមានស៊ីមទេ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ចំណូលចិត្ត"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ភ្ជាប់ជាមួយ​បណ្ដាញសាធារណៈ"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ការតភ្ជាប់បណ្ដាញ, អ៊ីនធឺណិត, ឥតខ្សែ, ទិន្នន័យ, wifi, wi-fi, wi fi, បណ្ដាញចល័ត, ឧបករណ៍​ចល័ត, ក្រុមហ៊ុន​សេវាទូរសព្ទចល័ត, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"មើលបណ្ដាញ​មានសុវត្ថិភាព​ពេលជិះយន្តហោះ"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"បិទ​មុខងារពេលជិះ​យន្តហោះ"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"មិនអាច​ប្រើបានទេ ដោយសារ​បើកមុខងារ​ម៉ោងគេង"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"បានបញ្ចប់​ការកំណត់កម្រិតសំខាន់​នៃការជូនដំណឹង​ឡើងវិញ។"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"កម្មវិធី"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"ឧបករណ៍​ដែលមិនគួរឱ្យទុកចិត្ត​ចង់ចូលប្រើ​សារ​របស់អ្នក។ សូមចុច​ដើម្បី​ទទួលបាន​ព័ត៌មាន​លម្អិត។"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"អនុញ្ញាតឱ្យ​ចូលប្រើសារឬ?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"ឧបករណ៍​ប៊្លូធូស​ដែលមិនគួរឱ្យទុកចិត្ត [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] ចង់ចូលប្រើ​សារ​របស់អ្នក។\n\nអ្នកមិនបានភ្ជាប់ទៅ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ពីមុនទេ។"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"ឧបករណ៍​ដែលមិនគួរឱ្យទុកចិត្ត​ចង់ចូលប្រើ​ទំនាក់ទំនង និងកំណត់ហេតុហៅទូរសព្ទ​របស់អ្នក។ សូមចុច​ដើម្បី​ទទួលបាន​ព័ត៌មាន​លម្អិត។"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"អនុញ្ញាតឱ្យ​ចូលប្រើទំនាក់ទំនង និងកំណត់ហេតុហៅទូរសព្ទឬ?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"ឧបករណ៍​ប៊្លូធូស​ដែលមិនគួរឱ្យទុកចិត្ត [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] ចង់ចូលប្រើ​ទំនាក់ទំនង និងកំណត់ហេតុហៅ​ទូរសព្ទ​របស់អ្នក។ សកម្មភាពនេះ​រួមបញ្ចូលទិន្នន័យ​អំពី​ការហៅចូល និងការហៅចេញ។\n\nអ្នកមិនបានភ្ជាប់ទៅ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ពីមុនទេ។"</string>
 </resources>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index e858ca6..d6a5696 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ಮಧ್ಯಮ"</item>
     <item msgid="6740026006576843477">"ದೊಡ್ಡದು"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ಚಿಕ್ಕದು"</item>
+    <item msgid="7397961711906421599">"ಮಧ್ಯಮ"</item>
+    <item msgid="4079132024502041928">"ದೀರ್ಘ"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ಡಿಫಾಲ್ಟ್"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ಜಾಗತಿಕ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ಮಾತ್ರ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ಜಾಗತಿಕ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 46fabff..5d9f06f 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"ದಿನಾಂಕ &amp; ಸಮಯ"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"ದಿನಾಂಕ ಮತ್ತು ಸಮಯವನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"ದಿನಾಂಕ, ಸಮಯ, ಸಮಯದ ವಲಯದ, &amp; ಸ್ವರೂಪಗಳನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"ನೆಟ್‌ವರ್ಕ್ ಒದಗಿಸಿದ ಸಮಯವನ್ನು ಬಳಸಿ"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"ನೆಟ್‌ವರ್ಕ್ ಒದಗಿಸಲಾದ ಸಮಯವಲಯವನ್ನು ಬಳಸಿ"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"ಸಮಯವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊಂದಿಸಿ"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"ಸಮಯವಲಯವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊಂದಿಸಿ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ಸ್ಥಳೀಯ ಭಾಷೆ ಡೀಫಾಲ್ಟ್ ಬಳಸಿ"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑ಗಂಟೆಯ ಸ್ವರೂಪ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-ಗಂಟೆ ಫಾರ್ಮ್ಯಾಟ್‌‌ ಬಳಸಿ"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"ಲಾಕ್‌ ಪರದೆಯಲ್ಲಿ ಪ್ರೊಫೈಲ್‌ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ಖಾತೆಗಳು"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ಸ್ಥಳ"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ಸ್ಥಳ ಬಳಸಿ"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ಸ್ಥಳ ಬಳಸಿ"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ಆಫ್ ಮಾಡಿ"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">ಆನ್ ಆಗಿದೆ - <xliff:g id="COUNT_1">%1$d</xliff:g> ಆ್ಯಪ್‌ಗಳು ಸ್ಥಳಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿದೆ</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ಸ್ಕ್ರೀನ್ ಲಾಕ್, ಫೇಸ್ ಅನ್‌ಲಾಕ್"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ಸ್ಕ್ರೀನ್ ಲಾಕ್, ಫಿಂಗರ್‌ಪ್ರಿಂಟ್"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ಪರದೆ ಲಾಕ್"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ನಿಮ್ಮ ಮುಖ ಮತ್ತು ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್ ಮೂಲಕ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಅನ್‌ಲಾಕ್ ಮಾಡಿ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"ನೀವು ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಿ ಕೂಡ ಪಾವತಿಗಳನ್ನು ಖಚಿತಪಡಿಸಬಹುದು"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ಇದರೊಂದಿಗೆ ಅನ್‌ಲಾಕ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಿ:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ಫೇಸ್ ಅನ್‌ಲಾಕ್"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡುವುದಕ್ಕೆ ಅನುಮತಿಸಿ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ಫಿಂಗರ್‌ ಪ್ರಿಂಟ್"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ನಿಮ್ಮ ಜೇಬಿನಲ್ಲಿ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡುವ ಮೂಲಕ ಸಮಯವನ್ನು ಉಳಿಸಿ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ಸ್ಕಿಪ್ ಮಾಡಿ"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ಮುಂದಿನದು"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ಮುಖ ಸೇರಿಸಲಾಗಿದೆ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ಫೇಸ್ ಅನ್‌ಲಾಕ್"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ದೃಢೀಕರಣಕ್ಕಾಗಿ ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದರೆ, ಕೆಲವು ಸೆಟಪ್ ಹಂತಗಳು TalkBack ಜೊತೆಗೆ ಕಾರ್ಯನಿರ್ವಹಿಸದೆ ಇರಬಹುದು."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ಹಿಂದಿರುಗಿ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ಸೆಟಪ್ ಮುಂದುವರಿಸಿ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ಪ್ರವೇಶಿಸುವಿಕೆ ಸೆಟಪ್‌ ಬಳಸಿ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ಆ್ಯಪ್‌ಗಳಿಗೆ ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸುವಾಗ, ಯಾವಾಗಲೂ ಖಚಿತಪಡಿಸುವ ಅಗತ್ಯವಿದೆ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ಮುಖದ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಿ"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಮತ್ತು ಪಾವತಿಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಿ.\n\nನೆನಪಿಡಿ:\nಫೋನ್ ಕಡೆ ನೋಡಿದರೆ, ನಿಮಗೆ ಬೇಡದಿದ್ದಾಗಲೂ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಆಗಬಹುದು.\n\nಫೋನ್ ಅನ್ನು ನಿಮ್ಮ ಮುಖದ ಎದುರು ಹಿಡಿಯುವ ಮೂಲಕ, ಯಾರು ಬೇಕದಾರೂ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು.\n\nನಿಮ್ಮನ್ನು ತುಂಬಾ ಹೋಲುವ ವ್ಯಕ್ತಿ, ಉದಾಹರಣೆಗೆ ನಿಮ್ಮ ತದ್ರೂಪಿ ಸಹೋದರ/ಸಹೋದರಿಯೂ ಕೂಡಾ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಮತ್ತು ಪಾವತಿಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಿ.\n\nನೆನಪಿಡಿ:\nಫೋನ್ ಕಡೆ ನೋಡಿದರೆ, ನಿಮಗೆ ಬೇಡದಿದ್ದಾಗಲೂ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಆಗಬಹುದು.\n\nನಿಮ್ಮ ಕಣ್ಣುಗಳು ಮುಚ್ಚಿರುವಾಗಲೂ, ಫೋನ್‌ ಅನ್ನು ನಿಮ್ಮ ಮುಖದ ಕಡೆಗೆ ತೋರಿಸಿ ಬೇರೊಬ್ಬರು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು.\n\nನಿಮ್ಮನ್ನು ತುಂಬಾ ಹೋಲುವ ವ್ಯಕ್ತಿ, ಉದಾಹರಣೆಗೆ ನಿಮ್ಮ ತದ್ರೂಪಿ ಸಹೋದರ/ಸಹೋದರಿಯೂ ಕೂಡಾ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಮತ್ತು ಪಾವತಿಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಅನ್ನು ಬಳಸಿ."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"ನೆನಪಿಡಿ:\nಫೋನ್ ಕಡೆ ನೋಡಿದರೆ, ನಿಮಗೆ ಬೇಡದಿದ್ದಾಗಲೂ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಆಗಬಹುದು.\n\nಫೋನ್ ಅನ್ನು ನಿಮ್ಮ ಮುಖದ ಎದುರು ಹಿಡಿಯುವ ಮೂಲಕ, ಬೇರೆ ಯಾರಾದರೂ ಕೂಡ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು.\n\nನಿಮ್ಮ ಹಾಗೆಯೇ ಕಾಣುವ ಬೇರೊಬ್ಬರು ಸಹ, ಅಂದರೆ ಅವಳಿಗಳು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"ನೆನಪಿಡಿ:\nನೀವು ಫೋನ್‌ನ ಕಡೆಗೆ ಉದ್ದೇಶಪೂರ್ವಕವಾಗಿ ನೋಡಿಲ್ಲವಾದರೂ ಅದು ಅನ್‍‍ಲಾಕ್ ಆಗಬಹುದು ಎಂಬುದನ್ನು ಗಮನಿಸಿ.\n\nನಿಮ್ಮ ಕಣ್ಣುಗಳು ಮುಚ್ಚಿರುವಾಗಲೂ, ಫೋನ್‌ ಅನ್ನು ನಿಮ್ಮ ಮುಖದ ಕಡೆಗೆ ತೋರಿಸಿ ಬೇರೊಬ್ಬರು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು.\n\nನಿಮ್ಮ ಹಾಗೆಯೇ ಕಾಣುವ ಬೇರೊಬ್ಬರು ಸಹ, ಅಂದರೆ ಅವಳಿಗಳು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ಮುಖ ಗುರುತಿಸುವಿಕೆ ಡೇಟಾ ಅಳಿಸುವುದೇ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಿದ ಫೇಸ್ ಡೇಟಾವನ್ನು ಶಾಶ್ವತವಾಗಿ ಮತ್ತು ಸುರಕ್ಷಿತವಾಗಿ ಅಳಿಸಲಾಗುತ್ತದೆ. ಅದನ್ನು ತೆಗೆದುಹಾಕಿದ ನಂತರ, ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು, ಆ್ಯಪ್‌ಗಳಿಗೆ ಸೈನ್ ಇನ್ ಮಾಡಲು ಮತ್ತು ಪಾವತಿಗಳನ್ನು ಖಚಿತಪಡಿಸಲು ನಿಮ್ಮ ಪಿನ್, ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಾಸ್‌ವರ್ಡ್‌ನ ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಿ"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ.\n\nಗಮನಿಸಿ: ಈ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ನೀವು ಬಳಸಲು ಸಾಧ್ಯವಿಲ್ಲ. ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ, ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ನಿರ್ವಾಹಕರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ನಿಮ್ಮ ಫೋನ್ ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಅಥವಾ ಖರೀದಿಗಳನ್ನು ಅನುಮೋದಿಸಲು ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಬಳಸಿ.\n\nಗಮನಿಸಿ: ಸಮರ್ಥ ಪ್ಯಾಟರ್ನ್ ಅಥವಾ ಪಿನ್‌ಗಿಂತ ನಿಮ್ಮ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್‌ ಕಡಿಮೆ ಸುರಕ್ಷಿತವಾಗಿರಬಹುದು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ರದ್ದುಮಾಡಿ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ಬೇಡ, ಧನ್ಯವಾದಗಳು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ಮುಂದುವರಿಸು"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ಸ್ಕಿಪ್‌"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ಮುಂದೆ"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಲು ಕೂಡಾ ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಅಗತ್ಯವಿದೆ. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಸಾಧನವನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಲು ಕೂಡಾ ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಅಗತ್ಯವಿದೆ. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಸೆಟಪ್ ಮಾಡಲು ಕೂಡಾ ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯ ಅಗತ್ಯವಿದೆ. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯೂ ಬೇಕು. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಸಾಧನವನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯೂ ಬೇಕು. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಸಂರಕ್ಷಿಸುವುದರಿಂದ, ಅದು ಕಳೆದುಹೋದರೆ ಅಥವಾ ಕಳುವಾದರೆ, ಯಾರೂ ಅದನ್ನು ಬಳಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಅನ್ನು ಹೊಂದಿಸಲು ನಿಮಗೆ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಯೂ ಬೇಕು. ಹಿಂದಕ್ಕೆ ಹೋಗಲು, ರದ್ದುಗೊಳಿಸಿ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ಪಿನ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡಬೇಕೇ?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"ಪಾಸ್‌ವರ್ಡ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ಪ್ಯಾಟರ್ನ್ ಸೆಟಪ್ ಸ್ಕಿಪ್ ಮಾಡುವುದೇ?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಟ್ಯಾಬ್ಲೆಟ್ ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಸಾಧನವನ್ನು ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ಸಾಧನದ ರಕ್ಷಣೆ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಮೂಲಕ ನಿಮ್ಮ ಅನುಮತಿ ಇಲ್ಲದೆ ಇತರರು ಈ ಫೋನ್ ಬಳಸುವುದನ್ನು ತಡೆಯಿರಿ. ನೀವು ಬಳಸಲು ಬಯಸುವ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಮಾಡಿ."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ವಿಧಾನವನ್ನು ಆರಿಸಿಕೊಳ್ಳಿ"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ವಿಧಾನವನ್ನು ಆರಿಸಿಕೊಳ್ಳಿ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ನಿಮ್ಮ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್ ವಿಧಾನವನ್ನು ಆರಿಸಿಕೊಳ್ಳಿ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಗಳು"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ಸ್ಕ್ರೀನ್ ಲಾಕ್ ಆಯ್ಕೆಗಳು"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ಸ್ಕ್ರೀನ್ ಲಾಕ್"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ + ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಇಲ್ಲದೆ ಮುಂದುವರಿಯಿರಿ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"ನಿಮ್ಮ ಮುಖವನ್ನು ಬಳಸಿಕೊಂಡು ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ನೀವು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು. ಭದ್ರತೆಗಾಗಿ, ಈ ಆಯ್ಕೆಗೆ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ + ಪ್ಯಾಟರ್ನ್"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ + ಪಿನ್"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ + ಪಾಸ್‌ವರ್ಡ್"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಇಲ್ಲದೆ ಮುಂದುವರಿಯಿರಿ"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ನಿಮ್ಮ ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸಿ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬಹುದು. ಸುರಕ್ಷತೆಯ ದೃಷ್ಟಿಯಿಂದ, ಈ ಆಯ್ಕೆಗೆ ಬ್ಯಾಕಪ್ ಸ್ಕ್ರೀನ್ ಲಾಕ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ಅಡ್ಮಿನ್, ಎನ್‍ಕ್ರಿಪ್ಷನ್, ರುಜುವಾತಿನಿಂದಾಗಿ ನಿಷ್ಕ್ರಿಯ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ಸ್ವೈಪ್"</string>
@@ -619,7 +640,6 @@
       <item quantity="other"> <xliff:g id="NUMBER_1">%d</xliff:g> ಗಿಂತ ಕಡಿಮೆ ಅಂಕಿಗಳನ್ನು ಹೊಂದಿರಬೇಕು</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ಇತ್ತೀಚಿನ ಪಿನ್ ಬಳಸಲು ಸಾಧನದ ನಿರ್ವಾಹಕರು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ಸರಳವಾದ ಪಿನ್‌ಗಳನ್ನು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಂದ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ಬೇರೆಯ ಪಿನ್ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ಇದು ಅಮಾನ್ಯ ಅಕ್ಷರವನ್ನು ಒಳಗೊಂಡಿರಬಾರದು"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ಕನಿಷ್ಠ ಒಂದು ಅಕ್ಷರವನ್ನು ಹೊಂದಿರಬೇಕು"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ಕನಿಷ್ಠ ಒಂದು ಅಂಕಿಯನ್ನು ಹೊಂದಿರಬೇಕು"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">ಕನಿಷ್ಠ <xliff:g id="COUNT">%d</xliff:g> ಸಂಖ್ಯೆಯಲ್ಲದ ಅಕ್ಷರಗಳನ್ನು ಹೊಂದಿರಬೇಕು</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ಇತ್ತೀಚಿನ ಪಾಸ್‌ವರ್ಡ್ ಬಳಸಲು ಸಾಧನದ ನಿರ್ವಾಹಕರು ಅನುಮತಿಸುವುದಿಲ್ಲ"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ಸರಳವಾದ ಪಾಸ್‌ವರ್ಡ್‌ಗಳನ್ನು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರಿಂದ ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ಬೇರೆಯ ಪಾಸ್‌ವರ್ಡ್‌ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ಅಂಕಿಗಳ ಆರೋಹಣ, ಅವರೋಹಣ ಅಥವಾ ಪುನರಾವರ್ತಿತ ಅನುಕ್ರಮವನ್ನು ನಿಷೇಧಿಸಲಾಗಿದೆ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ದೃಢೀಕರಿಸಿ"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ರದ್ದುಮಾಡಿ"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi ಆನ್‌ ಮಾಡಿ"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ವೈ-ಫೈ ಬಳಸಿ"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ವೈ-ಫೈ ಬಳಸಿ"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ವಯರ್‌ಲೆಸ್‌ ಪ್ರವೇಶಿಸುವಿಕೆ ಅಂಶಗಳನ್ನು ಹೊಂದಿಸಿ &amp; ನಿರ್ವಹಿಸಿ"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” ಗೆ ಸಂಪರ್ಕಿಸಲು QR ಕೋಡ್ ಅನ್ನು ಕೆಳಗೆ ಕೇಂದ್ರೀಕರಿಸಿ"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR ಕೋಡ್ ಸ್ಕ್ಯಾನ್ ಮಾಡುವ ಮೂಲಕ ವೈ-ಫೈ ಗೆ ಸೇರಿ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ವೈ-ಫೈ ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಲು ಮತ್ತು ಪಾಸ್‌ವರ್ಡ್ ಹಂಚಿಕೊಳ್ಳಲು ಈ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” ಅನ್ನು ಸೇರಿಕೊಳ್ಳಲು ಬೇರೊಂದು ಸಾಧನವನ್ನು ಬಳಸಿ ಈ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” ಗೆ ಸಂಪರ್ಕಪಡಿಸಲು ಈ QR ಕೋಡ್ ಅನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ಪುನಃ ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ಸಾಧನ ತಯಾರಕರನ್ನು ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"ಏನೋ ದೋಷ ಸಂಭವಿಸಿದೆ"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ವೈ-ಫೈ ಪಾಸ್‌ವರ್ಡ್: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಪಾಸ್‌ವರ್ಡ್: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ಸ್ವಯಂ-ಕನೆಕ್ಟ್"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ನೀವು ಆ ನೆಟ್‌ವರ್ಕ್ ಬಳಿ ಇರುವಾಗ ನಿಮ್ಮ ಫೋನ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕನೆಕ್ಟ್ ಆಗಲು ಅನುಮತಿಸಿ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ನೀವು ಆ ನೆಟ್‌ವರ್ಕ್ ಬಳಿ ಇರುವಾಗ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಕನೆಕ್ಟ್ ಆಗಲು ಅನುಮತಿಸಿ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"ವ್ಯಾಪ್ತಿಯಲ್ಲಿರುವಾಗ ಈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕವನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ಸಾಧನವನ್ನು ಸೇರಿಸಿ"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ಈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಾಧನವನ್ನು ಸೇರಿಸಲು QR ಕೋಡ್ ಅನ್ನು ಬಳಸಿ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR ಕೋಡ್ ಮಾನ್ಯ ಫಾರ್ಮ್ಯಾಟ್‌ನಲ್ಲಿ ಇಲ್ಲ"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ಸಿಸ್ಟಂ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಬಳಸಿ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ಒದಗಿಸಬೇಡಿ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ಮೌಲ್ಯೀಕರಿಸಬೇಡಿ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"ಯಾವುದೇ ಪ್ರಮಾಣಪತ್ರ ನಿರ್ದಿಷ್ಟಪಡಿಸಲಾಗಿಲ್ಲ. ನಿಮ್ಮ ಸಂಪರ್ಕವು ಖಾಸಗಿಯಾಗಿರುವುದಿಲ್ಲ."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ನೆಟ್‌ವರ್ಕ್‌ ಹೆಸರು ತುಂಬಾ ಉದ್ದವಾಗಿದೆ."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ಡೊಮೇನ್ ನಿರ್ದಿಷ್ಟ ಪಡಿಸಬೇಕು."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"ಪ್ರಮಾಣಪತ್ರ ಅಗತ್ಯವಿದೆ."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"ಸಂಪರ್ಕಪಡಿಸು"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ವೈ-ಫೈ ಆನ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ನೆಟ್‌ವರ್ಕ್‌ ಸಂಪರ್ಕಿಸಲು ವಿಫಲವಾಗಿದೆ"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ನೆಟ್‌ವರ್ಕ್ ವ್ಯಾಪ್ತಿಯಲ್ಲಿಲ್ಲ"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ಸಾಧನದ MAC ವಿಳಾಸ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ಯಾದೃಚ್ಛಿಕಗೊಳಿಸಿದ MAC ವಿಳಾಸ"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"ಯಾದೃಚ್ಛಿಕಗೊಳಿಸಿದ MAC ವಿಳಾಸ (lಕೊನೆಯದಾಗಿ ಬಳಸಿರುವುದು)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ವಿಳಾಸ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ನೆಟ್‌ವರ್ಕ್‌ ವಿವರಗಳು"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ಸಬ್‌ನೆಟ್‌ ಮಾಸ್ಕ್‌"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 ವಿಳಾಸಗಳು"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"ಉಳಿಸಿದ ನೆಟ್‌ವರ್ಕ್‌"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"ಸಬ್‌ಸ್ಕ್ರಿಪ್ಶನ್‌ಗಳು"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"ಇತರ ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"ಈ ಬಳಕೆದಾರರಿಗೆ ವೈ ಫೈ ಸುಧಾರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"ಉಳಿಸಿ"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ಮಾನ್ಯವಾದ ಗೇಟ್‌ವೇ ವಿಳಾಸವನ್ನು ಟೈಪ್‌ ಮಾಡಿ."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"ಮಾನ್ಯವಾದ DNS ವಿಳಾಸವನ್ನು ಟೈಪ್‌ ಮಾಡಿ."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 ಮತ್ತು 32 ನಡುವಿನ ಉದ್ದದ ನೆಟ್‌ವರ್ಕ್‌ ಪೂರ್ವಪ್ರತ್ಯಯವನ್ನು ಟೈಪ್‌ ಮಾಡಿ."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ಖಾಸಗಿ DNS‌ ನಿಂದ ಅತಿಕ್ರಮಿಸದಿದ್ದರೆ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ಖಾಸಗಿ DNS‌ ನಿಂದ ಅತಿಕ್ರಮಿಸದಿದ್ದರೆ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ಗೇಟ್‌ವೇ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ನೆಟ್‌ವರ್ಕ್‌ ಪೂರ್ವಪ್ರತ್ಯಯದ ಅಳತೆ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi ಡೈರೆಕ್ಟ್"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ಅಪ್ಲಿಕೇಶನ್‌ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳುತ್ತಿದೆ. ಇಂಟರ್ನೆಟ್‌ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಹಾಟ್‌ಸ್ಪಾಟ್‌ ಆಫ್‌ ಮಾಡಿ ನಂತರ ಆನ್‌ ಮಾಡಿ"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"ಯಾವುದೇ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ಹೊಂದಿಸಿಲ್ಲ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಹೆಸರು"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಆನ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ಇತರೆ ಸಾಧನಗಳು <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕವನ್ನು ಪಡೆದುಕೊಳ್ಳಬಹುದು"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಪಾಸ್‌ವರ್ಡ್"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ಬ್ಯಾಂಡ್"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"ನಯವಾದ ಡಿಸ್‌ಪ್ಲೇ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ಕೆಲವು ವಿಷಯಗಳಿಗೆ ರಿಫ್ರೆಶ್ ರೇಟ್ ಅನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ 60 ರಿಂದ 90 ಕ್ಕೆ ಏರಿಸುತ್ತದೆ. ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸುತ್ತದೆ."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ಸ್ಮೂತ್ ಡಿಸ್‌ಪ್ಲೇ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz ರಿಫ್ರೆಶ್ ರೇಟ್ ಅನ್ನು ಅನ್ವಯಿಸಿ"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ಸುಧಾರಿತ ಸ್ಪರ್ಶ ಪ್ರತಿಕ್ರಿಯೆ ಮತ್ತು ಆ್ಯನಿಮೇಶನ್ ಗುಣಮಟ್ಟಗಳಿಗಾಗಿ ಅತ್ಯಧಿಕ ರಿಫ್ರೆಶ್ ರೇಟ್. ಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಹೆಚ್ಚಿಸುತ್ತದೆ."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ಸ್ಕ್ರೀನ್ ಆನ್ ಆಗಿರುವಿಕೆ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ನೀವು ಸ್ಕ್ರೀನ್‌ನ ಕಡೆಗೆ ವೀಕ್ಷಿಸುತ್ತಿರುವಾಗ, ಆನ್‌ / ಸ್ಕ್ರೀನ್ ಆಫ್ ಆಗುವುದಿಲ್ಲ"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ಪರದೆಯು ಡಾರ್ಕ್ ಆಗಿದ್ದಾಗ, ಅದು ಹೊಸ ಅಧಿಸೂಚನೆಗಳಿಗಾಗಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ಯಾವಾಗಲೂ ಸಮಯ &amp; ಮಾಹಿತಿ ತೋರಿಸಿ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ಅಧಿಕ ಬ್ಯಾಟರಿ ಬಳಕೆ"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"ದಪ್ಪ ಅಕ್ಷರದ ಪಠ್ಯ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ಫಾಂಟ್ ಗಾತ್ರ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ಪಠ್ಯವನ್ನು ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದು ಮಾಡಿ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಲಾಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ಆವೃತ್ತಿ"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android ಭದ್ರತೆ ಅಪ್‌ಡೇಟ್"</string>
     <string name="model_info" msgid="8997566254717810904">"ಮಾಡೆಲ್"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ಮಾದರಿ: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ಮಾಡೆಲ್ ಮತ್ತು ಹಾರ್ಡ್‌ವೇರ್"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ಹಾರ್ಡ್‌ವೇರ್ ಆವೃತ್ತಿ"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ಸಲಕರಣೆ ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN ಅಳಿಸಿ"</string>
     <string name="menu_new" msgid="6571230342655509006">"ಹೊಸ APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"ಉಳಿಸಿ"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"ತ್ಯಜಿಸಿ"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"ರದ್ದುಮಾಡಿ"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"ಹೆಸರಿನ ಕ್ಷೇತ್ರವು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN ಖಾಲಿ ಇರುವಂತಿಲ್ಲ."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ಆ್ಯಪ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸಬಹುದಾಗಿದೆ"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"ವೈ-ಫೈ, ಮೊಬೈಲ್ ಮತ್ತು ಬ್ಲೂಟೂತ್ ಮರುಹೊಂದಿಸಿ"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"ಕೆಳಗಿನವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಇದು ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುತ್ತದೆ:\n\n"<li>"ವೈ-ಫೈ"</li>\n<li>"ಮೊಬೈಲ್ ಡೇಟಾ"</li>\n<li>"ಬ್ಲೂಟೂತ್‌"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"ಅಳಿಸಿ"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ SIM ಅಳಿಸಿ"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"ಬದಲಿ SIM ಗಳನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು, ನಿಮ್ಮ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಿ. ಇದು ಯಾವುದೇ ಮೊಬೈಲ್ ಸೇವಾ ಪ್ಲಾನ್‌ಗಳನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"ಇದು ಯಾವುದೇ ಮೊಬೈಲ್ ಸೇವಾ ಪ್ಲಾನ್‌ಗಳನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ. ಬದಲಾಯಿಸಿದ SIM ಗಳನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿಕೊಳ್ಳಲು, ನಿಮ್ಮ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ? ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"ಎಲ್ಲಾ ನೆಟ್‌ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸುವುದೇ ಹಾಗೂ ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾದ SIM ಗಳನ್ನು ಅಳಿಸುವುದೇ? ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM ಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ SIM ಗಳನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\nನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ ಮತ್ತು ಪುನಃ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ರಿಸೆಟ್‌)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ರಿಸೆಟ್‌)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ಇದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಅವುಗಳೆಂದರೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಆ್ಯಪ್‌ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಆ್ಯಪ್‌ಗಳು"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ಇದು ನಿಮ್ಮ ಫೋನ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ"</b>", ಇವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಆ್ಯಪ್‌ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಆ್ಯಪ್‌ಗಳು"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ನೀವು ಪ್ರಸ್ತುತ ಕೆಳಗಿನ ಖಾತೆಗಳಿಗೆ ಸೈನ್ ಇನ್ ಆಗಿರುವಿರಿ:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ಈ ಸಾಧನದಲ್ಲಿ ಪ್ರಸ್ತುತ ಇತರ ಬಳಕೆದಾರರಿದ್ದಾರೆ.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"ಸಂಗೀತ"</li>\n<li>"ಫೋಟೋಗಳು"</li>\n<li>"ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM ಗಳು"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ಇದು ನಿಮ್ಮ ಮೊಬೈಲ್ ಸೇವಾ ಯೋಜನೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"USB ಸಂಗ್ರಹಣೆಯನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಬಳಕೆದಾರರ ಇತರೆ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"SD ಕಾರ್ಡ್‌ ಅನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ಎಲ್ಲಾ ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ರಿಸೆಟ್)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ಡೇಟಾ ಅಳಿಸಿ (ಫ್ಯಾಕ್ಟರಿ ರಿಸೆಟ್)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ಇದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ"</b>" ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಇವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ:\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಆ್ಯಪ್‌ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಆ್ಯಪ್‌ಗಳು"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ಇದು ನಿಮ್ಮ ಫೋನ್‌ನ "<b>"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ"</b>" ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಇವುಗಳನ್ನು ಒಳಗೊಂಡಂತೆ :\n\n"<li>"ನಿಮ್ಮ Google ಖಾತೆ"</li>\n<li>"ಸಿಸ್ಟಂ ಮತ್ತು ಆ್ಯಪ್‌ ಡೇಟಾ ಹಾಗೂ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</li>\n<li>"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿರುವ ಆ್ಯಪ್‌ಗಳು"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ಪ್ರಸ್ತುತ, ನೀವು ಈ ಕೆಳಗಿನ ಖಾತೆಗಳಿಗೆ ಸೈನ್ ಇನ್ ಆಗಿರುವಿರಿ:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ಪ್ರಸ್ತುತ, ಈ ಸಾಧನದಲ್ಲಿ ಇತರ ಬಳಕೆದಾರರಿದ್ದಾರೆ.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"ಸಂಗೀತ"</li>\n<li>"ಫೋಟೋಗಳು"</li>\n<li>"ಬಳಕೆದಾರರ ಇತರ ಡೇಟಾ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"ಇ-ಸಿಮ್‌ಗಳು"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ಇದು ನಿಮ್ಮ ಮೊಬೈಲ್ ಸೇವಾ ಯೋಜನೆಯನ್ನು ರದ್ದುಗೊಳಿಸುವುದಿಲ್ಲ."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಬಳಕೆದಾರರ ಇತರ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"USB ಸಂಗ್ರಹಣೆಯನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಬಳಕೆದಾರರ ಇತರ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"SD ಕಾರ್ಡ್"</b>"‌ ಅನ್ನು ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಿ"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD ಕಾರ್ಡ್‌ ಅಳಿಸಿ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ಆಂತರಿಕ USB ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ ಸಂಗೀತ ಅಥವಾ ಫೋಟೋಗಳಂಥ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"ಸಂಗೀತ ಫೋಟೋಗಳನ್ನು ಒಳಗೊಂಡಂತೆ SD ಕಾರ್ಡ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ನಿಮ್ಮ ಎಲ್ಲಾ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು SIM ಗಳು ಸೇರಿದಂತೆ, ನಿಮ್ಮ ಎಲ್ಲಾ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿಯನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ಎಲ್ಲವನ್ನೂ ಅಳಿಸಿ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ಸಿಸ್ಟಂ ತೆರವುಗೊಳಿಸುವ ಸೇವೆಯು ಲಭ್ಯವಿಲ್ಲದಿರುವ ಕಾರಣ ಮರುಹೊಂದಿಸುವಿಕೆಯನ್ನು ನಿರ್ವಹಿಸಲಾಗಲಿಲ್ಲ."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸುವುದೇ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ಈ ಬಳಕೆದಾರರಿಗೆ ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಕೆ ಲಭ್ಯವಿಲ್ಲ"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ಅಳಿಸಲಾಗುತ್ತಿದೆ"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"ದಯವಿಟ್ಟು ನಿರೀಕ್ಷಿಸಿ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ನಿಮ್ಮ ಎಲ್ಲಾ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಆ್ಯಪ್‌ಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು ಸಿಮ್‌ಗಳು ಸೇರಿದಂತೆ, ನಿಮ್ಮ ಎಲ್ಲಾ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿಯನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ. ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸಬೇಕೇ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ಈ ಬಳಕೆದಾರರಿಗೆ ಫ್ಯಾಕ್ಟರಿ ರಿಸೆಟ್ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"ಅಳಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"ಕೊಂಚ ನಿರೀಕ್ಷಿಸಿ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"ಕರೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ಧ್ವನಿಮೇಲ್, ಕರೆ ಫಾರ್ವರ್ಡ್ ಮಾಡುವಿಕೆ, ಕರೆ ನಿರೀಕ್ಷೆ, ಕರೆಮಾಡುವವರ ID ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ಟೆಥರಿಂಗ್"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ಗಿಂತ ಹೆಚ್ಚಿನ ಸಾಧನಗಳಿಗೆ ಟೆಥರ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಅನ್ನು ಅನ್‌ಟೆಥರ್ ಮಾಡಲಾಗುತ್ತದೆ."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ಇಥರ್ನೆಟ್ ಟೆಥರಿಂಗ್"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ಇಥರ್ನೆಟ್‌ನ ಮೂಲಕ ಫೋನ್‌ನ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ಇಥರ್ನೆಟ್‌ನ ಮೂಲಕ ಫೋನ್‌ನ ಇಂಟರ್ನೆಟ್ ಕನೆಕ್ಷನ್ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಿ"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ನಿಮ್ಮ ಮೊಬೈಲ್ ಡೇಟಾ ಸಂಪರ್ಕದ ಮೂಲಕ ಇತರ ಸಾಧನಗಳಿಗೆ ಇಂಟರ್ನೆಟ್ ಒದಗಿಸಲು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮತ್ತು ಟೆಥರಿಂಗ್ ಬಳಸಿ. ಹತ್ತಿರದ ಸಾಧನಗಳೊಂದಿಗೆ ವಿಷಯವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಸಹ ರಚಿಸಬಹುದು."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ನಿಮ್ಮ ವೈ-ಫೈ ಅಥವಾ ಮೊಬೈಲ್ ಡೇಟಾ ಕನೆಕ್ಷನ್ ಮೂಲಕ ಇತರ ಸಾಧನಗಳಿಗೆ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಒದಗಿಸಲು ಹಾಟ್‌ಸ್ಪಾಟ್ ಮತ್ತು ಟೆಥರಿಂಗ್ ಅನ್ನು ಬಳಸಿ. ಸಮೀಪದಲ್ಲಿರುವ ಸಾಧನಗಳ ಜೊತೆಗೆ ವಿಷಯಗಳನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಆ್ಯಪ್‌ಗಳು ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಸಹ ರಚಿಸಬಹುದು."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ಸಹಾಯ"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ಬ್ಲೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ಬ್ಲೂಟೂತ್‌ ಆಫ್‌ ಆಗಿದ್ದರೂ ಸಹ, ಯಾವ ಸಮಯದಲ್ಲಾದರೂ ಸಮೀಪದ ಸಾಧನಗಳಿಗೆ ಸ್ಕ್ಯಾನ್‌ ಮಾಡಲು ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಅನುಮತಿಸಿ. ಉದಾಹರಣೆಗೆ, ಸ್ಥಳ ಆಧಾರಿತ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಮತ್ತು ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸಲು ಇದನ್ನು ಬಳಸಬಹುದಾಗಿದೆ."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ಕೆಲಸಕ್ಕಾಗಿ ಸ್ಥಳ ಸೇವೆಗಳು"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆ"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆ"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"ಪ್ರಸ್ತುತ ಸಮಯವಲಯವನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಈ ಸಾಧನದ ಸ್ಥಳವನ್ನು ಬಳಸಲು ಅನುಮತಿಸುತ್ತದೆ. ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್‌ನಂತಹ ಇತರ ಸ್ಥಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆಯ ನಿಖರತೆಯ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರಬಹುದು."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ಆನ್ ಆಗಿದೆ"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ಆಫ್ ಆಗಿದೆ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ಸಮಯವಲಯವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಪತ್ತೆಹಚ್ಚುವ ವೈಶಿಷ್ಟ್ಯವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆಯನ್ನು ಬೆಂಬಲಿಸಲಾಗುವುದಿಲ್ಲ"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ಸ್ಥಳದ ಸಮಯವಲಯದ ಪತ್ತೆಹಚ್ಚುವಿಕೆಯಲ್ಲಿ ಬದಲಾವಣೆ ಮಾಡಲು ಅನುಮತಿಯಿಲ್ಲ"</string>
     <string name="location_network_based" msgid="5247042890080021887">"ವೈ-ಫೈ,ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಥಳ"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಅತಿ ವೇಗವಾಗಿ ಅಂದಾಜು ಮಾಡಲು Google ನ ಸ್ಥಳ ಸೇವೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸಿ. ಅನಾಮಧೇಯ ಸ್ಥಳದ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲಾಗುವುದು ಮತ್ತು Google ಗೆ ಕಳುಹಿಸಲಾಗುವುದು."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"ವೈ-ಫೈ ಮೂಲಕ ನಿರ್ಧರಿಸಲಾಗಿರುವ ಸ್ಥಳ"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಬಳಸಲು ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ಫೇಸ್ ಅನ್‌ಲಾಕ್ ಅನ್ನು ಬಳಸಲು ಪಿನ್ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸಲು, ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸಲು, ಪ್ಯಾಟರ್ನ್ ಹೊಂದಿಸಿ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸಲು, ಪಿನ್‌‌ ಹೊಂದಿಸಿ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ಮರೆತುಹೋಗಿರುವಿರಾ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ಮರೆತಿದ್ದೀರಾ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ಮರೆತಿದ್ದೀರಾ?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ಶೀರ್ಷಿಕೆ ಆದ್ಯತೆಗಳು"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ಹಿಗ್ಗಿಸುವಿಕೆ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ಝೂಮ್ ಮಾಡಿದ ಪ್ರದೇಶ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ಮ್ಯಾಗ್ನಿಫಿಕೇಶನ್ ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ಸ್ಕ್ರೀನ್‌ ಅನ್ನು ಝೂಮ್ ಮಾಡುವಾಗ, ನೀವು ಬಳಸಲು ಬಯಸುವ ಝೂಮ್ ಮಾಡಬೇಕಾದ ಪ್ರದೇಶ(ಗಳು) ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ಪೂರ್ಣ ಸ್ಕ್ರೀನ್"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ಸ್ಕ್ರೀನ್‌ನ ಅರ್ಧಭಾಗ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ಪೂರ್ಣ ಸ್ಕ್ರೀನ್, ಸ್ಕ್ರೀನ್‌ನ ಅರ್ಧಭಾಗ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ಸ್ಕ್ರೀನ್‌ನ ಸಂಪೂರ್ಣ ಭಾಗವನ್ನು ಝೂಮ್ ಮಾಡಿ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ಸ್ಕ್ರೀನ್‌ನ ಅರ್ಧಭಾಗವನ್ನು ಝೂಮ್ ಮಾಡಿ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್‌ಗೆ ಬದಲಾಯಿಸುವುದೇ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ಸ್ಕ್ರೀನ್‌ನ‌ ಒಂದು ಭಾಗವನ್ನು ದೊಡ್ಡದಾಗಿಸಲು ಟ್ರಿಪಲ್ ಟ್ಯಾಪ್ ಅನ್ನು ಬಳಸುವುದರಿಂದ ಟೈಪಿಂಗ್ ಮತ್ತು ಇತರ ಆ್ಯಕ್ಷನ್‌ಗಳ ವಿಳಂಬಗಳಿಗೆ ಕಾರಣವಾಗಬಹುದು.\n\nದೊಡ್ಡದಾಗಲು ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್ ಅನ್ನು ಬಳಸಲು ನೀವು ಬದಲಾಯಿಸಲು ಬಯಸುವಿರಾ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ಪ್ರವೇಶಿಸುವಿಕೆ ಬಟನ್‌ಗೆ ಬದಲಾಯಿಸಿ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ದೊಡ್ಡದಾಗಿಸಲು ಟ್ರಿಪಲ್ ಟ್ಯಾಪ್ ಅನ್ನು ಬಳಸಿ"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ಝೂಮ್ ಮಾಡಿದ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ಟ್ರಿಪಲ್-ಟ್ಯಾಪ್ ಮೂಲಕ ಹಿಗ್ಗಿಸಿ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ಶಾರ್ಟ್‌ಕಟ್ ಮೂಲಕ ಹಿಗ್ಗಿಸಿ"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ಪವರ್ ಬಟನ್ ಕರೆಯನ್ನು ಕೊನೆಗೊಳಿಸುತ್ತದೆ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ದೊಡ್ಡ ಮೌಸ್ ಪಾಯಿಂಟರ್"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ಅನಿಮೇಷನ್‌ಗಳನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ಮೊನೊ ಆಡಿಯೊ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ಆಡಿಯೊ ಪ್ಲೇ ಮಾಡುತ್ತಿರುವಾಗ ಚಾನಲ್‌ಗಳನ್ನು ಒಂದುಗೂಡಿಸಿ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ಆಡಿಯೋ ಬ್ಯಾಲೆನ್ಸ್"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ಎಡ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ಬಲ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ಮೊನೊ ಆಡಿಯೊ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ಆಡಿಯೊ ಪ್ಲೇ ಮಾಡುತ್ತಿರುವಾಗ ಚಾನಲ್‌ಗಳನ್ನು ಒಂದುಗೂಡಿಸಿ"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ಆಡಿಯೊ ಬ್ಯಾಲೆನ್ಸ್"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ಎಡ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ಬಲ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ಡೀಫಾಲ್ಟ್"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ಸೆಕೆಂಡುಗಳು"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ಸೆಕೆಂಡುಗಳು"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"ಅಧಿಸೂಚನೆಯ ವೈಬ್ರೇಷನ್"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ರಿಂಗ್‌ನೊಂದಿಗೆ ವೈಬ್ರೇಷನ್"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ಸ್ಪರ್ಶ ಪ್ರತಿಕ್ರಿಯೆ"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ಅನ್ನು ಬಳಸಿ"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ಅನ್ನು ತೆರೆಯಿರಿ"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ಬಣ್ಣ ತಿದ್ದುಪಡಿಯನ್ನು ಬಳಸಿ"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"ಶೀರ್ಷಿಕೆಗಳನ್ನು ತೋರಿಸಿ"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ಬೆಂಬಲಿತ ಆ್ಯಪ್‌ಗೆ ಮಾತ್ರ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ಅನ್ನು ಬಳಸಿ"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ಅನ್ನು ತೆರೆಯಿರಿ"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ಬಣ್ಣ ತಿದ್ದುಪಡಿಯನ್ನು ಬಳಸಿ"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"ಶೀರ್ಷಿಕೆಗಳನ್ನು ತೋರಿಸಿ"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ಬೆಂಬಲಿತ ಆ್ಯಪ್‌ಗೆ ಮಾತ್ರ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"ಶೀರ್ಷಿಕೆಯ ಗಾತ್ರ ಮತ್ತು ಶೈಲಿ"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ಪಠ್ಯದ ಗಾತ್ರ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ಡ್ಯುಟೆರೊನೊಮಾಲಿ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ಪ್ರೊಟನೊಮಾಲಿ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ಟ್ರೈಟನೊಮಾಲಿ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ಗ್ರೇಸ್ಕೇಲ್"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ಕೆಂಪು-ಹಸಿರು"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ಕೆಂಪು-ಹಸಿರು"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ನೀಲಿ-ಹಳದಿ"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ಹಿನ್ನೆಲೆ ನಿರ್ಬಂಧ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿ ನೀಡಿ"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ಹಿನ್ನೆಲೆಯಲ್ಲಿ ರನ್ ಆಗಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಯಿಲ್ಲ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ಹಿನ್ನೆಲೆ ಬಳಕೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ಹಿನ್ನೆಲೆ ಬಳಕೆಯನ್ನು ನಿರ್ಬಂಧಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ಸೀಮಿತಗೊಳಿಸುವುದೇ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ಒಂದು ಅಪ್ಲಿಕೇಶನ್‌ನ ಹಿನ್ನೆಲೆ ಚಟುವಟಿಕೆಯನ್ನು ನೀವು ಸೀಮಿತಗೊಳಿಸಿದರೆ, ಅದು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ಬ್ಯಾಟರಿ ಅನ್ನು ಆಪ್ಟಿಮೈಜ್ ಮಾಡಲು ಈ ಅಪ್ಲಿಕೇಶನ್ ಹೊಂದಿಸದ ಕಾರಣ, ನೀವು ಇದನ್ನು ನಿರ್ಬಂಧಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\n ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿರ್ಬಂಧಿಸಲು, ಮೊದಲು ಬ್ಯಾಟರಿ ಆಪ್ಟಿಮೈಸೇಷನ್ ಅನ್ನು ಆನ್ ಮಾಡಿ."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ಟ್ಯಾಬ್ಲೆಟ್ ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದನ್ನು ಬಳಸಿದೆ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ಸಾಧನವು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚಿನದನ್ನು ಬಳಸಿದೆ"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ಬ್ಯಾಟರಿ ಸಾಮಾನ್ಯ ಅವಧಿಗಿಂತ ಮೊದಲೇ ಖಾಲಿಯಾಗಬಹುದು"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ಬ್ಯಾಟರಿಯ ಆರೋಗ್ಯಕ್ಕಾಗಿ ಆಪ್ಟಿಮೈಸ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ಬ್ಯಾಟರಿಯನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ಸೀಮಿತಗೊಳಿಸಲಾಗಿದೆ. ಇನ್ನಷ್ಟು ತಿಳಿಯಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"ನಿಮ್ಮ ಫೋನ್‌ ಅನ್ನು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಳಸಲಾಗಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿಯು ನಿರೀಕ್ಷಿಸಿದ ಅವಧಿಗಿಂತ ಮುನ್ನವೇ ಖಾಲಿಯಾಗಬಹುದು.\n\nಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಧರಿಸಿ ಇವುಗಳು ಟಾಪ್ ಆ್ಯಪ್‌ಗಳಾಗಿವೆ:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಳಸಲಾಗಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿಯು ನಿರೀಕ್ಷಿಸಿದ ಅವಧಿಗಿಂತ ಮುನ್ನವೇ ಖಾಲಿಯಾಗಬಹುದು.\n\nಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಧರಿಸಿ ಇವುಗಳು ಟಾಪ್ ಆ್ಯಪ್‌ಗಳಾಗಿವೆ:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಸಾಮಾನ್ಯಕ್ಕಿಂತ ಹೆಚ್ಚು ಬಳಸಲಾಗಿದೆ. ನಿಮ್ಮ ಬ್ಯಾಟರಿಯು ನಿರೀಕ್ಷಿಸಿದ ಅವಧಿಗಿಂತ ಮುನ್ನವೇ ಖಾಲಿಯಾಗಬಹುದು.\n\nಬ್ಯಾಟರಿ ಬಳಕೆಯನ್ನು ಆಧರಿಸಿ ಇವುಗಳು ಟಾಪ್ ಆ್ಯಪ್‌ಗಳಾಗಿವೆ:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">%1$d ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಮೀಟರ್ ಓದುವಾಗ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"ನಿಮ್ಮ ಬ್ಯಾಟರಿ ಮೀಟರ್ ಓದುವಾಗ ಸಮಸ್ಯೆ ಎದುರಾಗಿದೆ. "<annotation id="url">"ಇನ್ನಷ್ಟು ತಿಳಿಯಲು"</annotation>" ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಲ್ಲಿಸಬೇಕೇ?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಫೋನ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g>ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ ಅನ್ನು ಚಾಲನೆಯಲ್ಲಿಟ್ಟಿರುವ ಕಾರಣದಿಂದಾಗಿ ಸಾಮಾನ್ಯವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬ್ಯಾಟರಿಯನ್ನು ನಿರ್ವಹಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಈ ಸಮಸ್ಯೆಯನ್ನು ಸರಿಪಡಿಸಲು, ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಲ್ಲಿಸಬಹುದು.\n\nಇದನ್ನು ಮುಂದುವರಿಸಿದ್ದಲ್ಲಿ, ಬ್ಯಾಟರಿ ಕಾರ್ಯಕ್ಷಮತೆ ಸುಧಾರಿಸಲು ನೀವು ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಸ್ಥಾಪಿಸಬೇಕಾಗುತ್ತದೆ."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ವೇಳಾಪಟ್ಟಿಯನ್ನು ಸೆಟ್ ಮಾಡಿ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ಬ್ಯಾಟರಿ ಬಾಳಿಕೆ ವಿಸ್ತರಿಸಿ"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ಚಾರ್ಜ್‌ ಆದ ನಂತರ ಆಫ್ ಮಾಡಿ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ನಿಮ್ಮ ಫೋನ್ ಬ್ಯಾಟರಿ <xliff:g id="PERCENT">%1$s</xliff:g> ಇದ್ದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತದೆ"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ಬ್ಯಾಟರಿ <xliff:g id="PERCENT">%1$s</xliff:g> ಇದ್ದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತದೆ"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ನಿಮ್ಮ ಸಾಧನದ ಬ್ಯಾಟರಿ <xliff:g id="PERCENT">%1$s</xliff:g> ಇದ್ದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತದೆ"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ನಿಮ್ಮ ಫೋನ್ <xliff:g id="PERCENT">%1$s</xliff:g> ಗಿಂತ ಹೆಚ್ಚು ಚಾರ್ಜ್ ಆದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್‌ ಆಫ್ ಆಗುತ್ತದೆ"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ <xliff:g id="PERCENT">%1$s</xliff:g> ಗಿಂತ ಹೆಚ್ಚು ಚಾರ್ಜ್ ಆದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್‌ ಆಫ್ ಆಗುತ್ತದೆ"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ನಿಮ್ಮ ಸಾಧನವು <xliff:g id="PERCENT">%1$s</xliff:g> ಗಿಂತ ಹೆಚ್ಚು ಚಾರ್ಜ್ ಆದಾಗ, ಬ್ಯಾಟರಿ ಸೇವರ್‌ ಆಫ್ ಆಗುತ್ತದೆ"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ಆನ್"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ಮರುಹೊಂದಿಸಿ"</string>
     <string name="tts_play" msgid="2945513377250757221">"ಪ್ಲೇ"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ಅಡಾಪ್ಟಿವ್ ಕನೆಕ್ಷನ್"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್‌ಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನಿರ್ವಹಿಸುವ ಮೂಲಕ ಬ್ಯಾಟರಿ ಅವಧಿಯನ್ನು ವಿಸ್ತರಿಸುತ್ತದೆ ಮತ್ತು ಸಾಧನದ ಕಾರ್ಯಕ್ಷಮತೆಯನ್ನು ಸುಧಾರಿಸುತ್ತದೆ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ರುಜುವಾತು ಸಂಗ್ರಹಣೆ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ಪ್ರಮಾಣಪತ್ರ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ಸಂಗ್ರಹಣೆಯಿಂದ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸಿ"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ಬಳಕೆದಾರ ರುಜುವಾತುಗಳು"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ಸಂಗ್ರಹಿಸಲಾದ ರುಜುವಾತುಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಮಾರ್ಪಡಿಸಿ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ಸುಧಾರಿತ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ಸಂಗ್ರಹಣೆಯ ಪ್ರಕಾರ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ಹಾರ್ಡ್‌ವೇರ್‌ ಬೆಂಬಲಿತ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ಸಾಫ್ಟ್‌ವೇರ್‌ ಮಾತ್ರ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ಈ ಬಳಕೆದಾರರಿಗೆ ರುಜುವಾತುಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗಾಗಿ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ವೈ-ಫೈಗೆ ಸ್ಥಾಪಿಸಲಾಗಿದೆ"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಬೇಡಿ"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"ಪರವಾಗಿಲ್ಲ, ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿ"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"ಪ್ರಮಾಣಪತ್ರವನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಿಲ್ಲ"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"ಈ ಸಾಧನದಲ್ಲಿ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲು <xliff:g id="APP_NAME">%s</xliff:g> ಗೆ ಅನುಮತಿಸುವುದೇ?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"ಕೆಳಗಿನ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು URL ಗಳಲ್ಲಿ ಈ ಪ್ರಮಾಣಪತ್ರಗಳ ಮೂಲಕ ನಿಮ್ಮನ್ನು ಗುರುತಿಸಲಾಗುತ್ತದೆ"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"ಅನುಮತಿಸಬೇಡಿ"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"ಅನುಮತಿಸಿ"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"ಇನ್ನಷ್ಟು ತೋರಿಸಿ"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"ಪ್ರಮಾಣಪತ್ರ ನಿರ್ವಹಣೆ ಆ್ಯಪ್"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"ಯಾವುದೂ ಅಲ್ಲ"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"ಈ ಆ್ಯಪ್‌ನಿಂದ ಇನ್‌ಸ್ಟಾಲ್ ಮಾಡಲಾದ ಪ್ರಮಾಣಪತ್ರಗಳ ಮೂಲಕ ಕೆಳಗಿನ ಆ್ಯಪ್‌ಗಳು ಮತ್ತು URL ಗಳಲ್ಲಿ ನಿಮ್ಮನ್ನು ಗುರುತಿಸಲಾಗುತ್ತದೆ"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"ತೆಗೆದುಹಾಕಿ"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"ತುರ್ತು ಡೈಯಲಿಂಗ್ ಸಿಗ್ನಲ್"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"ತುರ್ತು ಕರೆ ಮಾಡಿದಾಗ ಕಾರ್ಯ ರೀತಿಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"ಬ್ಯಾಕಪ್"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ಹೊಂದಿಸಿಲ್ಲ - ಕೆಲಸದ ಪ್ರೊಫೈಲ್"</string>
     <string name="user_admin" msgid="4024553191395768119">"ನಿರ್ವಾಹಕ"</string>
     <string name="user_you" msgid="3070562015202859996">"ನೀವು (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ಅಡ್ಡಹೆಸರು"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"ನೀವು <xliff:g id="USER_COUNT">%1$d</xliff:g> ರವರೆಗೆ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಬಹುದು"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ಕೇವಲ ಟ್ಯಾಬ್ಲೆಟ್‌ಗಳ ಮಾಲೀಕರು ಬಳಕೆದಾರರನ್ನು ನಿರ್ವಹಿಸಬಹುದು."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ಕೇವಲ ಫೋನ್‌ಗಳ ಮಾಲೀಕರು ಬಳಕೆದಾರರನ್ನು ನಿರ್ವಹಿಸಬಹುದು."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ಟರ್ಮಿನಲ್‌ನಲ್ಲಿ ಪಾವತಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ಪಾವತಿ ಆ್ಯಪ್ ಹೊಂದಿಸಿ. ನಂತರ ಸಂಪರ್ಕವಿಲ್ಲದ ಚಿಹ್ನೆಯೊಂದಿಗೆ ಯಾವುದೇ ಟರ್ಮಿನಲ್‌ಗೆ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ತಿಳಿಯಿತು"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ಇನ್ನಷ್ಟು..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ಇನ್ನಷ್ಟು…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ಡೀಫಾಲ್ಟ್ ಪಾವತಿ ಆ್ಯಪ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ಡೀಫಾಲ್ಟ್ ಪಾವತಿ ಆ್ಯಪ್ ಅನ್ನು ಅಪ್‌ಡೇಟ್ ಮಾಡಿ"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ಸಂಪರ್ಕರಹಿತ ಟರ್ಮಿನಲ್‌ನಲ್ಲಿ, <xliff:g id="APP">%1$s</xliff:g> ಆ್ಯಪ್ ಬಳಸಿ ಪಾವತಿಸಿ"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ಹಿಂದೆ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ಮುಂದೆ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ಪೂರ್ಣಗೊಳಿಸು"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ಫೋಟೋವನ್ನು ಸೆರೆಹಿಡಿಯಿರಿ"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ಚಿತ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ಗಳು"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ಸಿಮ್‌ ಕಾರ್ಡ್‌ಗಳು"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ಕರೆಗಳನ್ನು ಮಾಡಲು ಯಾವಾಗಲೂ ಇದನ್ನು ಬಳಸಿ"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ಡೇಟಾಗಾಗಿ ಸಿಮ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"ಎಸ್‌ಎಂಎಸ್‌ಗಾಗಿ ಸಿಮ್ ಅನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ಡೇಟಾ ಸಿಮ್ ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ, ಇದಕ್ಕೆ ಒಂದು ನಿಮಿಷದವರೆಗೆ ಸಮಯ ತೆಗೆದುಕೊಳ್ಳಬಹುದು..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ಡೇಟಾ ಸಿಮ್ ಅನ್ನು ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ, ಇದಕ್ಕೆ ಒಂದು ನಿಮಿಷದಷ್ಟು ಸಮಯಾವಕಾಶ ಬೇಕಾಗಬಹುದು…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ಇದರೊಂದಿಗೆ ಕರೆ ಮಾಡಿ"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ಸಿಮ್‌ ಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ಸಿಮ್‌ <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ದಿನಚರಿ, ವೇಳಾಪಟ್ಟಿ, ಬ್ಯಾಟರಿ ಸೇವರ್, ಪವರ್ ಸೇವರ್, ಬ್ಯಾಟರಿ, ಸ್ವಯಂಚಾಲಿತ, ಶೇಕಡಾ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ಸುಧಾರಿತ ಕರೆ, 4g ಕರೆ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ಭಾಷೆಯನ್ನು ಸೇರಿಸಿ, ಭಾಷೆಯೊಂದನ್ನು ಸೇರಿಸಿ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ಪಠ್ಯದ ಗಾತ್ರ"</string>
     <string name="default_sound" msgid="6604374495015245195">"ಡಿಫಾಲ್ಟ್‌‌ ಧ್ವನಿ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ರಿಂಗ್ ಮತ್ತು ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ರಲ್ಲಿದೆ"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ವಾಲ್ಯೂಮ್, ವೈಬ್ರೇಶನ್‌, ಅಡಚಣೆ ಮಾಡಬೇಡಿ"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ಧ್ವನಿಗಳನ್ನು ಪವರ್ ಆನ್ ಮಾಡಿ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"ಲೈವ್ ಶೀರ್ಷಿಕೆ"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ಸ್ವಯಂಚಾಲಿತ ಶೀರ್ಷಿಕೆ ಮಾಧ್ಯಮ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ಏನೂ ಇಲ್ಲ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ವೇಳಾಪಟ್ಟಿಗಳ ಸೆಟ್</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ವೇಳಾಪಟ್ಟಿಗಳ ಸೆಟ್</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ಯಾವುದೂ ಇಲ್ಲ}=1{1 ವೇಳಾಪಟ್ಟಿಯನ್ನು ಸೆಟ್ ಮಾಡಲಾಗಿದೆ}one{# ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸೆಟ್ ಮಾಡಲಾಗಿದೆ}other{# ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸೆಟ್ ಮಾಡಲಾಗಿದೆ}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ಪ್ರಮುಖ ಜನರು ಮತ್ತು ಆ್ಯಪ್‌ಗಳಿಂದ ಮಾತ್ರ ಅಧಿಸೂಚನೆ ಪಡೆಯಿರಿ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ಅಡಚಣೆಗಳನ್ನು ಮಿತಿಗೊಳಿಸಿ"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ಆದ್ಯತೆ ಮಾತ್ರ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ಆನ್ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ಆಫ್ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ಆಫ್"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ಆನ್"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ಪ್ರತಿ ಬಾರಿ ಕೇಳಿ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ನೀವು ಆಫ್ ಮಾಡುವವರೆಗೆ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ಗಂಟೆಗಳು</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ಗಂಟೆಗಳು</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> ನಿಮಿಷಗಳು"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಬಹುದು</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಬಹುದು</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ಗಂಟೆ}one{# ಗಂಟೆಗಳು}other{# ಗಂಟೆಗಳು}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 ನಿಮಿಷ}one{# ನಿಮಿಷಗಳು}other{# ನಿಮಿಷಗಳು}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ಆಫ್}=1{ಆಫ್ / 1 ವೇಳಾಪಟ್ಟಿಯನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಬಹುದು}one{ಆಫ್ / # ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಬಹುದು}other{ಆಫ್ / # ವೇಳಾಪಟ್ಟಿಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಬಹುದು}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಸೆಟ್ಟಿಂಗ್ ಅನ್ನು ಯಾವುದು ಅಡ್ಡಿಪಡಿಸಬಹುದು"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ಜನರು"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ಆ್ಯಪ್‌ಗಳು"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ಕಡಿಮೆ ಆದ್ಯತೆಯ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸಾಮಾನ್ಯ ಎಂಬುದಕ್ಕೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹೊಂದಿಸಿ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ಅಡಾಪ್ಟೀವ್ ಅಧಿಸೂಚನೆ ದರ್ಜೆ ನೀಡುವಿಕೆ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ಪ್ರಸ್ತುತತೆಯಿಂದ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಅಧಿಸೂಚನೆಗಳಿಗೆ ದರ್ಜೆ ನೀಡಿ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ಅಡಾಪ್ಟಿವ್‌ ಅಧಿಸೂಚನೆಯ ಪ್ರತಿಕ್ರಿಯೆ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ಅಧಿಸೂಚನೆಗಳಿಗೆ ಮಾಡಿದ ಹೊಂದಾಣಿಕೆಗಳನ್ನು ಸೂಚಿಸಿ ಮತ್ತು ಸಿಸ್ಟಂಗೆ ಪ್ರತಿಕ್ರಿಯೆ ಒದಗಿಸುವ ಆಯ್ಕೆಯನ್ನು ತೋರಿಸಿ"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"ಅಧಿಸೂಚನೆ ಪ್ರಾಮುಖ್ಯತೆಯನ್ನು ಮರುಹೊಂದಿಸಿ"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"ಬಳಕೆದಾರರು ಬದಲಾಯಿಸಿದ ಪ್ರಮುಖ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮರುಹೊಂದಿಸಿ ಮತ್ತು ಅಧಿಸೂಚನೆ ಸಹಾಯಕಕ್ಕೆ ಆದ್ಯತೆ ನೀಡಲು ಅನುಮತಿಸಿ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ಸೂಚಿಸಲಾಗಿರುವ ಕ್ರಿಯೆಗಳು ಮತ್ತು ಪ್ರತ್ಯುತ್ತರಗಳು"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ಸಲಹೆ ಮಾಡಿರುವ ಕ್ರಿಯೆಗಳು &amp; ಪ್ರತ್ಯುತ್ತರಗಳನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತೋರಿಸಿ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ಇತ್ತೀಚಿನ ಮತ್ತು ಸ್ನೂಜ್ ಮಾಡಲಾದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಿ"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳು"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"ಸಂಭಾಷಣೆ ವಿಭಾಗದ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಕಾಣಿಸುತ್ತದೆ ಮತ್ತು ಫ್ಲೋಟಿಂಗ್ ಬಬಲ್‌ನ ಹಾಗೆ ಗೋಚರಿಸುತ್ತದೆ"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"ಸಂಭಾಷಣೆ ವಿಭಾಗದ ಮೇಲ್ಭಾಗದಲ್ಲಿ ತೋರಿಸಿ"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"ಇತರ ಸಂಭಾಷಣೆಗಳು"</string>
+    <string name="other_conversations" msgid="551178916855139870">"ಆದ್ಯತೆಯಲ್ಲದ ಸಂಭಾಷಣೆಗಳು"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ನೀವು ಬದಲಾವಣೆ ಮಾಡಿದ ಸಂಭಾಷಣೆಗಳು"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"ಇತ್ತೀಚಿನ ಸಂಭಾಷಣೆಗಳು"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ಇತ್ತೀಚಿನ ಸಂಭಾಷಣೆಗಳನ್ನು ತೆರವುಗೊಳಿಸಿ"</string>
+    <string name="clear" msgid="5092178335409471100">"ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ಬಬಲ್ ಗುರುತು ಮಾಡಿದ ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳು"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ಪುಲ್-ಡೌನ್ ಶೇಡ್‌ನ ಮೇಲ್ಭಾಗದಲ್ಲಿ ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳನ್ನು ತೋರಿಸಲಾಗುವುದು. ನೀವು ಸಹ ಬಬಲ್ ಮತ್ತು \'ಅಡಚಣೆ ಮಾಡಬೇಡಿ\' ಮೋಡ್‌ಗೆ ಅಡ್ಡಿಪಡಿಸಲು ಅವುಗಳನ್ನು ಹೊಂದಿಸಬಹುದು."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ಆದ್ಯತೆ ಮತ್ತು ಮಾರ್ಪಡಿಸಿದ ಸಂಭಾಷಣೆಗಳು ಇಲ್ಲಿ ಗೋಚರಿಸುತ್ತವೆ"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆ"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"ಅಡಚಣೆ ಮಾಡಬೇಡ ಆಯ್ಕೆಯನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ಯಾವುದೇ ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶಿಸುವಿಕೆಯನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ಆ್ಯಪ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಆ್ಯಪ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳು ಕಾಣಿಸದಂತೆ Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಈ ಪ್ರಕಾರದ ಅಧಿಸೂಚನೆಗಳು ಕಾಣಿಸದಂತೆ Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"ನಿಮ್ಮ ವಿನಂತಿಯ ಮೇರೆಗೆ, ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಅಧಿಸೂಚನೆಗಳ ಗುಂಪನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ಎಲ್ಲಾ ಸಂಭಾಷಣೆಗಳು"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ಆದ್ಯತೆಯ ಸಂಭಾಷಣೆಗಳು"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> ಸಂಭಾಷಣೆಗಳು</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> ಸಂಭಾಷಣೆಗಳು</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ಯಾವುದೂ ಇಲ್ಲ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ಯಾವುದೂ ಇಲ್ಲ}=1{1 ಸಂಭಾಷಣೆ}one{# ಸಂಭಾಷಣೆಗಳು}other{# ಸಂಭಾಷಣೆಗಳು}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ಯಾರು ಅಡಚಣೆಯನ್ನು ಉಂಟುಮಾಡಬಹುದು"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ಕರೆಗಳು"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ಕರೆಗಳು"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ಅನುಮತಿಸಿದ ಕರೆಗಳ ಧ್ವನಿ ಕೇಳಿಸುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಲು, ಸಾಧನವನ್ನು \"ರಿಂಗ್\"ಗೆ ಹೊಂದಿಸಲಾಗಿದೆಯೇ ಎಂಬುದನ್ನು ಪರಿಶೀಲಿಸಿ"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ಗಾಗಿ ಒಳಬರುವ ಕರೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿ ನೀಡುವಂತೆ ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಸರಿಹೊಂದಿಸಬಹುದು."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ನಕ್ಷತ್ರ ಹಾಕಿರುವ ಸಂಪರ್ಕಗಳು"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ಇತರೆ</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ಇತರೆ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ಯಾವುದೂ ಇಲ್ಲ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ಯಾವುದೂ ಇಲ್ಲ}=1{{contact_1}}=2{{contact_1} ಮತ್ತು {contact_2}}=3{{contact_1}, {contact_2} ಮತ್ತು {contact_3}}one{{contact_1}, {contact_2} ಮತ್ತು # ಇತರರು}other{{contact_1}, {contact_2} ಮತ್ತು # ಇತರರು}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(ಯಾವುದೇ ಹೆಸರಿಲ್ಲ)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ಸಂದೇಶಗಳು"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ಗಾಗಿ ಒಳಬರುವ ಸಂದೇಶಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿ ನೀಡುವಂತೆ ನೀವು ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಸರಿಹೊಂದಿಸಬಹುದು."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"ಎಲ್ಲಾ ಸಂದೇಶಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಬಹುದು"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ಎಲ್ಲಾ ಕರೆಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಬಹುದು"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ಯಾವುದೂ ಇಲ್ಲ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ಸಂಪರ್ಕಗಳು</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ಸಂಪರ್ಕಗಳು</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ಯಾವುದೂ ಇಲ್ಲ}=1{1 ಸಂಪರ್ಕ}one{# ಸಂಪರ್ಕಗಳು}other{# ಸಂಪರ್ಕಗಳು}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ಯಾರಾದರೂ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ಸಂಪರ್ಕಗಳು"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ನಕ್ಷತ್ರ ಹಾಕಿ ಗುರುತು ಮಾಡಿದ ಸಂಪರ್ಕಗಳು"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ಎಲ್ಲಾ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ಕೆಲವು ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ನೀವು ಆ್ಯಪ್‌ಗಳಿಗೆ ಅಡಚಣೆ ಉಂಟುಮಾಡಲು ಅನುಮತಿಸದಿದ್ದರೂ, ಆಯ್ದ ವ್ಯಕ್ತಿಗಳು ಈಗಲೂ ನಿಮ್ಮನ್ನು ಸಂಪರ್ಕಿಸಬಹುದು"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> ಅಡಚಣೆ ಮಾಡಬಹುದು</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ಅಡಚಣೆ ಮಾಡಬಹುದು</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ಇನ್ನೂ <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ಯಾವುದೇ ಆ್ಯಪ್‌ಗಳು ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ}=1{{app_1} ಆ್ಯಪ್ ಅಡಚಣೆ ಮಾಡಬಹುದು}=2{{app_1} ಮತ್ತು {app_2} ಆ್ಯಪ್‌ಗಳು ಅಡಚಣೆ ಮಾಡಬಹುದು}=3{{app_1}, {app_2} ಮತ್ತು {app_3} ಆ್ಯಪ್‌ಗಳು ಅಡಚಣೆ ಮಾಡಬಹುದು}one{{app_1}, {app_2} ಮತ್ತು # ಇನ್ನಷ್ಟು ಅಡಚಣೆ ಮಾಡಬಹುದು}other{{app_1}, {app_2} ಮತ್ತು # ಇನ್ನಷ್ಟು ಅಡಚಣೆ ಮಾಡಬಹುದು}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ಎಲ್ಲಾ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ಕೆಲವು ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ಅಡಚಣೆ ಉಂಟುಮಾಡಬಹುದಾದ ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ಎಲ್ಲಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ಅಡಚಣೆ ಮಾಡಬಹುದು</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ಅಡಚಣೆ ಮಾಡಬಹುದು</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ಯಾವುದೂ ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ಇನ್ನೂ <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ಯಾವುದೂ ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ}=1{{sound_category_1} ಅಡಚಣೆ ಮಾಡಬಹುದು}=2{{sound_category_1} ಮತ್ತು {sound_category_2} ಅಡಚಣೆ ಮಾಡಬಹುದು}=3{{sound_category_1}, {sound_category_2} ಮತ್ತು {sound_category_3} ಅಡಚಣೆ ಮಾಡಬಹುದು}one{{sound_category_1}, {sound_category_2} ಮತ್ತು # ಇನ್ನಷ್ಟು ಅಡಚಣೆ ಮಾಡಬಹುದು}other{{sound_category_1}, {sound_category_2} ಮತ್ತು # ಇನ್ನಷ್ಟು ಅಡಚಣೆ ಮಾಡಬಹುದು}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ಯಾವುದೂ ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ಯಾರೂ ಅಡಚಣೆ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"ಕೆಲವು ಜನರು ಅಡಚಣೆ ಮಾಡಬಹುದು"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ಎಲ್ಲಾ ಜನರು ಅಡಚಣೆ ಮಾಡಬಹುದು"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ಆನ್"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"ಆಫ್"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"ಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"ನೀವು ಆ್ಯಪ್ ಅನ್ನು ಅನ್‌ಪಿನ್ ಮಾಡುವವರೆಗೆ ಪ್ರಸ್ತುತ ಆ್ಯಪ್ ಅನ್ನು ನೋಡಲು, ಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, ವಿಶ್ವಾಸಾರ್ಹ ಸ್ನೇಹಿತರೊಂದಿಗೆ ನಿರ್ದಿಷ್ಟ ಆಟವನ್ನು ಆಡಲು ನೀವು ಈ ಫೀಚರ್ ಬಳಸಬಹುದು. \n\nಆ್ಯಪ್ ಅನ್ನು ಪಿನ್ ಮಾಡಿದಾಗ, ಇದು ಇತರ ಆ್ಯಪ್‌ಗಳನ್ನು ತೆರೆಯಬಹುದು ಮತ್ತು ವೈಯಕ್ತಿಕ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಬಹುದು. \n\nಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ಬಳಸಲು: 	\n1.	ಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ಆನ್ ಮಾಡಿ	\n2.	ಸಮಗ್ರ ನೋಟ ತೆರೆಯಿರಿ 	\n3.	ಸ್ಕ್ರೀನ್‌ನ ಮೇಲ್ಭಾಗದಲ್ಲಿರುವ ಆ್ಯಪ್ ಐಕಾನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪಿನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"ನೀವು ಆ್ಯಪ್ ಅನ್ನು ಅನ್‌ಪಿನ್ ಮಾಡುವವರೆಗೆ ಪ್ರಸ್ತುತ ಆ್ಯಪ್ ಅನ್ನು ನೋಡುತ್ತಿರಲು ಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, ವಿಶ್ವಾಸಾರ್ಹ ಸ್ನೇಹಿತನಿಗೆ ನಿರ್ದಿಷ್ಟ ಆಟವನ್ನು ಆಡುವುದಕ್ಕೆ ಅವಕಾಶ ನೀಡಲು ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಬಹುದು. \n\nಆ್ಯಪ್ ಅನ್ನು ಪಿನ್ ಮಾಡಿದಾಗ, ಪಿನ್ ಮಾಡಲಾದ ಆ್ಯಪ್ ಇತರ ಆ್ಯಪ್‌ಗಳನ್ನು ತೆರೆಯಬಹುದು ಮತ್ತು ವೈಯಕ್ತಿಕ ಡೇಟಾಗೆ ಪ್ರವೇಶ ದೊರಕಬಹುದು. \n\nನಿಮ್ಮ ಸಾಧನವನ್ನು ಇತರರೊಂದಿಗೆ ಸುರಕ್ಷಿತವಾಗಿ ಹಂಚಿಕೊಳ್ಳಲು ನೀವು ಬಯಸಿದರೆ, ಅದರ ಬದಲಿಗೆ ಅತಿಥಿ ಪ್ರೊಫೈಲ್ ಬಳಸಲು ಪ್ರಯತ್ನಿಸಿ. \n\nಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ಬಳಸಲು: 	\n1.	ಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ಆನ್ ಮಾಡಿ 	\n2.	ಸಮಗ್ರ ನೋಟವನ್ನು ತೆರೆಯಿರಿ 	\n3.	ಸ್ಕ್ರೀನ್‌ನ ಮೇಲ್ಭಾಗದಲ್ಲಿರುವ ಆ್ಯಪ್ ಐಕಾನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪಿನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"ನೀವು ಆ್ಯಪ್ ಅನ್ನು ಅನ್‌ಪಿನ್ ಮಾಡುವವರೆಗೆ ಪ್ರಸ್ತುತ ಆ್ಯಪ್ ಅನ್ನು ನೋಡುತ್ತಿರಲು ಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ. ಉದಾಹರಣೆಗೆ, ವಿಶ್ವಾಸಾರ್ಹ ಸ್ನೇಹಿತರೊಂದಿಗೆ ನಿರ್ದಿಷ್ಟ ಆಟವನ್ನು ಆಡಲು ನೀವು ಈ ಫೀಚರ್ ಬಳಸಬಹುದು."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"ಆ್ಯಪ್ ಅನ್ನು ಪಿನ್ ಮಾಡಿದಾಗ, ಪಿನ್ ಮಾಡಲಾದ ಆ್ಯಪ್ ಇತರ ಆ್ಯಪ್‌ಗಳನ್ನು ತೆರೆಯಬಹುದು ಮತ್ತು ವೈಯಕ್ತಿಕ ಡೇಟಾಗೆ ಪ್ರವೇಶ ದೊರಕಬಹುದು. \n\nಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ಬಳಸಲು: 	\n1.	ಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ಆನ್ ಮಾಡಿ 	\n2.	ಸಮಗ್ರ ನೋಟವನ್ನು ತೆರೆಯಿರಿ 	\n3.	ಸ್ಕ್ರೀನ್‌ನ ಮೇಲ್ಭಾಗದಲ್ಲಿರುವ ಆ್ಯಪ್ ಐಕಾನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪಿನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"ಆ್ಯಪ್ ಅನ್ನು ಪಿನ್ ಮಾಡಿದಾಗ, ಪಿನ್ ಮಾಡಲಾದ ಆ್ಯಪ್ ಇತರ ಆ್ಯಪ್‌ಗಳನ್ನು ತೆರೆಯಬಹುದು ಮತ್ತು ವೈಯಕ್ತಿಕ ಡೇಟಾಗೆ ಪ್ರವೇಶ ದೊರಕಬಹುದು. \n\nನಿಮ್ಮ ಸಾಧನವನ್ನು ಇತರರೊಂದಿಗೆ ಸುರಕ್ಷಿತವಾಗಿ ಹಂಚಿಕೊಳ್ಳಲು ನೀವು ಬಯಸಿದರೆ, ಅದರ ಬದಲಿಗೆ ಅತಿಥಿ ಪ್ರೊಫೈಲ್ ಬಳಸಲು ಪ್ರಯತ್ನಿಸಿ. \n\nಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ಬಳಸಲು: 	\n1.	ಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ಆನ್ ಮಾಡಿ	\n2.	ಸಮಗ್ರ ನೋಟ ತೆರೆಯಿರಿ 	\n3.	ಸ್ಕ್ರೀನ್‌ನ ಮೇಲ್ಭಾಗದಲ್ಲಿರುವ ಆ್ಯಪ್ ಐಕಾನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ, ನಂತರ ಪಿನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"ಆ್ಯಪ್ ಅನ್ನು ಪಿನ್ ಮಾಡಿರುವಾಗ: \n\n•		ವೈಯಕ್ತಿಕ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಬಹುದು \n		(ಉದಾ, ಸಂಪರ್ಕಗಳು ಮತ್ತು ಇಮೇಲ್ ವಿಷಯ) \n•		ಪಿನ್ ಮಾಡಿದ ಆ್ಯಪ್ ಇತರೆ ಆ್ಯಪ್‌ಗಳನ್ನು ತೆರೆಯಬಹುದು\n\nನಿಮ್ಮ ವಿಶ್ವಾಸಾರ್ಹ ಜನರೊಂದಿಗೆ ಮಾತ್ರ ಆ್ಯಪ್ ಪಿನ್ನಿಂಗ್ ಬಳಸಿ."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"ಅನ್‌ಪಿನ್ ಮಾಡಲು ಅನ್‌ಲಾಕ್ ಪ್ಯಾಟರ್ನ್ ಕೇಳು"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"ಅನ್‌ಪಿನ್‌ ಮಾಡಲು ಪಿನ್‌ ಕೇಳಿ"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖಗಳನ್ನು ಬಳಸುವುದು ಮಾತ್ರವಲ್ಲದೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ಹೆಚ್ಚಿನ ಭದ್ರತೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ, ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಗೊಳಿಸುವುದೇ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖಗಳನ್ನು ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಭದ್ರತೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಯಾವುದೇ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಮುಖಗಳನ್ನು ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಭದ್ರತೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಯಾವುದೇ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಿನ್‌‌ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ರಕ್ಷಣೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಿನ್ ಅಗತ್ಯವಿದೆಯೇ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪ್ಯಾಟರ್ನ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ರಕ್ಷಣೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆಯೇ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಬಯೋಮೆಟ್ರಿಕ್ಸ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಅವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ರಕ್ಷಣೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರಾಂಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳುವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಾಸ್‌ವರ್ಡ್ ಅಗತ್ಯವಿದೆಯೇ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ಹೌದು"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ಇಲ್ಲ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"ಇದರ ಮೂಲಕ USB ಅನ್ನು ನಿಯಂತ್ರಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"ಕನೆಕ್ಟ್ ಆದ ಸಾಧನ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ಈ ಸಾಧನ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"ಬದಲಾಯಿಸಲಾಗುತ್ತಿದೆ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"ಬದಲಾಯಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ಈ ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡುವುದು"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"ಸಂಪರ್ಕಗೊಂಡಿರುವ ಸಾಧನವನ್ನು ಚಾರ್ಜ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"ಮೊಬೈಲ್ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"ಅಪ್ಲಿಕೇಶನ್‌ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"ವೈ-ಫೈ ಡೇಟಾ ಬಳಕೆ"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"ವಾಹಕ-ರಹಿತ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ಇಥರ್ನೆಟ್ ಡೇಟಾ ಬಳಕೆ"</string>
     <string name="wifi" msgid="2932584495223243842">"ವೈ-ಫೈ"</string>
     <string name="ethernet" msgid="4665162609974492983">"ಇಥರ್ನೆಟ್"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ನಿರ್ಬಂಧಗಳು</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ವಾಹಕ ಡೇಟಾ ಲೆಕ್ಕಾಚಾರವು ಸಾಧನ ಲೆಕ್ಕಾಚಾರಕ್ಕಿಂತ ಭಿನ್ನವಾಗಿರಬಹುದು"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ವಾಹಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ಬಳಸುವ ಡೇಟಾವನ್ನು ಹೊರತುಪಡಿಸುತ್ತದೆ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ಬಳಸಲಾಗಿದೆ"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ಡೇಟಾ ಎಚ್ಚರಿಕೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ಡೇಟಾ ಎಚ್ಚರಿಕೆ"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ವಿವರಗಳನ್ನು ವೀಕ್ಷಿಸಿ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ಡೇಟಾ ಸೇವರ್"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ಅನಿಯಂತ್ರಿತ ಡೇಟಾ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ಹಿನ್ನೆಲೆ ಡೇಟಾವನ್ನು ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ಹಿನ್ನೆಲೆ ಡೇಟಾವನ್ನು ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ಆನ್"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ಆಫ್"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ಡೇಟಾ ಸೇವರ್ ಅನ್ನು ಬಳಸಿ"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ಸಾಧನವು ಲಾಕ್ ಆಗಿದ್ದರೆ, ಅಧಿಸೂಚನೆಗಳಲ್ಲಿ ಪ್ರತ್ಯುತ್ತರಗಳು,ಇತರ ಪಠ್ಯವನ್ನು ಟೈಪ್ ಮಾಡುವುದನ್ನು ತಡೆ"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ಡಿಫಾಲ್ಟ್ ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ ಬಳಸಿ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ ಬಳಸಿ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ಆಯ್ಕೆಮಾಡಲಾಗಿಲ್ಲ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ಯಾವುದೂ ಇಲ್ಲ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ಸಂಗ್ರಹಣೆ ಸ್ಥಳಾವಕಾಶ ಮುಕ್ತಗೊಳಿಸುವಲ್ಲಿ ಸಹಾಯ ಮಾಡಲು, ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕವು ಬ್ಯಾಕಪ್ ಮಾಡಲಾದ ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ನಿಮ್ಮ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕುತ್ತದೆ."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕವನ್ನು ಬಳಸಿ"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ಸಂಗ್ರಹಣೆ ನಿರ್ವಾಹಕವನ್ನು ಬಳಸಿ"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ಸ್ವಯಂಚಾಲಿತ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ಹಸ್ತಚಾಲಿತ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ಈಗ ಸ್ಥಳಾವಕಾಶವನ್ನು ಮುಕ್ತಗೊಳಿಸಿ"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ಫೋನ್ ಅನ್ನು ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ಸಾಧನವನ್ನು ಪರಿಶೀಲಿಸಲು ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"ಅಧಿಸೂಚನೆಗಳಿಗಾಗಿ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಲು, ಸ್ಕ್ರೀನ್‌ನ ಕೆಳಭಾಗದ ಅಂಚಿನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ಒಂದು ಕೈ ಮೋಡ್‌"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ಒಂದು ಕೈ ಮೋಡ್ ಅನ್ನು ಬಳಸಿ"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ಆ್ಯಪ್‌ಗಳನ್ನು ಬದಲಿಸುವಾಗ ನಿರ್ಗಮಿಸಿ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ಅವಧಿ ಮೀರಿದೆ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ಸೆಕೆಂಡುಗಳು"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ಸೆಕೆಂಡುಗಳು"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ಸೆಕೆಂಡುಗಳು"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ಒಂದೇ ಕೈಯಲ್ಲಿ ಆ್ಯಕ್ಸೆಸ್"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ಸಮಯ, ಅಧಿಸೂಚನೆಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ವೀಕ್ಷಿಸಲು, ನಿಮ್ಮ ಪರದೆಯನ್ನು ಡಬಲ್-ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ಫೋನ್‌ ಪರಿಶೀಲಿಸಲು ಕೈಗೆತ್ತಿಕೊಳ್ಳಿ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಎತ್ತಿರಿ"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ಟ್ಯಾಬ್ಲೆಟ್ ಪರಿಶೀಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ಸಾಧನವನ್ನು ಪರಿಶೀಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ಸಮಯ, ಅಧಿಸೂಚನೆಗಳು ಮತ್ತು ಇತರ ಮಾಹಿತಿಯನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಸ್ಕ್ರೀನ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ತುರ್ತು SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"ತುರ್ತು SOS ಬಳಸಿ"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಮೂಲಕ ನಿರ್ವಹಿಸಲಾಗಿದೆ"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"ಪವರ್ ಬಟನ್ ಅನ್ನು ತ್ವರಿತವಾಗಿ 5 ಬಾರಿ ಒತ್ತುವ ಮೂಲಕ ಕೆಳಗಿನ ಕ್ರಿಯೆಗಳನ್ನು ಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"ಕೌಂಟ್‌ಡೌನ್ ಅಲಾರಾಂ ಪ್ಲೇ ಮಾಡಿ"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"ಮೊದಲು ದೊಡ್ಡ ಧ್ವನಿಯನ್ನು ಪ್ಲೇ ಮಾಡಿ, ತದನಂತರ ಸಹಾಯ ಅಧಿಸೂಚನೆಯನ್ನು ಕಳುಹಿಸಿ"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"ಸಹಾಯಕ್ಕಾಗಿ ಕರೆಮಾಡಿ"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"ಸಹಾಯಕ್ಕಾಗಿ ಕರೆ ಮಾಡಬೇಕಾದ ಸಂಖ್ಯೆ"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. ಬದಲಾಯಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"ನೀವು ತುರ್ತು ಸಂಖ್ಯೆ ಅಲ್ಲದ್ದನ್ನು ಪ್ರವೇಶಿಸಿದರೆ:\n • ತುರ್ತು SOS ಅನ್ನು ಬಳಸಲು ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಬೇಕು\n • ನಿಮ್ಮ ಕರೆಗೆ ಉತ್ತರಿಸದೇ ಇರಬಹುದು"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ಅಧಿಸೂಚನೆಗಳಿಗಾಗಿ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಅನ್ನು ಸ್ವೈಪ್ ಮಾಡಿ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಫೋನ್ ಹಿಂಭಾಗದಲ್ಲಿನ ಫಿಂಗರ್‌ಪ್ರಿಂಟ್ ಸೆನ್ಸರ್‌ನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"ಗರಿಷ್ಠ ಗೋಚರಿಸುವ ಡೇಟಾ ಸೆಟ್‌ಗಳು"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ಡಿಫಾಲ್ಟ್ ಮೌಲ್ಯಗಳಿಗೆ ಮರುಹೊಂದಿಸಿ"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"ಸ್ವಯಂ ಭರ್ತಿ ಡೆವಲಪರ್ ಆಯ್ಕೆಗಳನ್ನು ಮರುಹೊಂದಿಸಲಾಗಿದೆ"</string>
+    <string name="location_category" msgid="3496759112306219062">"ಸ್ಥಳ"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"ಸ್ಥಿತಿ ಪಟ್ಟಿ ಸ್ಥಳ ಸೂಚಕ"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"ನೆಟ್‌ವರ್ಕ್ ಮತ್ತು ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆಯನ್ನು ಒಳಗೊಂಡಂತೆ ಎಲ್ಲಾ ಸ್ಥಳಗಳನ್ನು ತೋರಿಸಿ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"ಫೋರ್ಸ್‌ ಫುಲ್ GNSS ಅಳತೆಗಳು"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ಯಾವುದೇ ಡ್ಯೂಟಿ ಸೈಕ್ಲಿಂಗ್ ಇಲ್ಲದೆ ಎಲ್ಲಾ GNSS ಕಾನ್ಸ್ಟಲೇಶನ್‌ಗಳು ಮತ್ತು ಆವರ್ತನೆಗಳನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಿ"</string>
     <string name="device_theme" msgid="5027604586494772471">"ಸಾಧನದ ಥೀಮ್‌"</string>
     <string name="default_theme" msgid="4815428567082263639">"ಡಿಫಾಲ್ಟ್"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"ನೆಟ್‌ವರ್ಕ್‌ ಹೆಸರು"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"ಫೋಕಸ್‌ ಆಗಿ ಇರಲು ಅಧಿಸೂಚನೆಗಳನ್ನು ವಿರಾಮಗೊಳಿಸಿ"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ವೈಶಿಷ್ಟ್ಯ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಆಫ್ ಮಾಡಲಾಗಿದೆ ಏಕೆಂದರೆ ಇದು ನಿಮ್ಮ ಫೋನ್‌ನ ಕಾರ್ಯಾಚರಣೆಯನ್ನು ನಿಧಾನಗೊಳಿಸುತ್ತದೆ"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"ಫೋರ್ಸ್‌ ಫುಲ್ GNSS ಅಳತೆಗಳು"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ಯಾವುದೇ ಡ್ಯೂಟಿ ಸೈಕ್ಲಿಂಗ್ ಇಲ್ಲದೆ ಎಲ್ಲಾ GNSS ಕಾನ್ಸ್ಟಲೇಶನ್‌ಗಳು ಮತ್ತು ಆವರ್ತನೆಗಳನ್ನು ಟ್ರ್ಯಾಕ್ ಮಾಡಿ"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"ಯಾವಾಗಲೂ ಕ್ರ್ಯಾಶ್ ಸಂವಾದವನ್ನು ತೋರಿಸಿ"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"ಅಪ್ಲಿಕೇಶನ್ ಕ್ರ್ಯಾಶ್ ಆಗುವಾಗ ಪ್ರತಿ ಬಾರಿ ಸಂವಾದವನ್ನು ತೋರಿಸಿ"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE ಸಕ್ರಿಯಗೊಳಿಸಿದ ಆ್ಯಪ್‌ ಆಯ್ಕೆಮಾಡಿ"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ಎಲ್ಲಾ ಆ್ಯಪ್‌ಗಳಿಗಾಗಿ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ಗ್ರಾಫಿಕ್ಸ್ ಡ್ರೈವರ್ ಆಯ್ಕೆ ಮಾಡಿ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ಡೀಫಾಲ್ಟ್"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ಗೇಮ್‌ ಡ್ರೈವರ್"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ಗೇಮ್ ಡ್ರೈವರ್"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ಡೆವಲಪರ್ ಡ್ರೈವರ್‌"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ಸಿಸ್ಟಂ ಗ್ರಾಫಿಕ್ಸ್ ಡ್ರೈವರ್"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"(ಮ್ಯೂಟ್) ನಲ್ಲಿ"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ಆಫ್"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"ನೆಟ್‌ವರ್ಕ್‌ ವಿವರಗಳು"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"ನಿಮ್ಮ ಸಾಧನದ ಹೆಸರು ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿರುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿ ಗೋಚರಿಸುತ್ತದೆ. ನೀವು ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಸಂಪರ್ಕಿಸಿದಾಗ ಅಥವಾ ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಹೊಂದಿಸಿದಾಗ ಇತರ ಜನರು ಸಹ ಅದನ್ನು ನೋಡಬಹುದು."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿರುವ ಆ್ಯಪ್‌ಗಳಿಗೆ ನಿಮ್ಮ ಸಾಧನದ ಹೆಸರು ಕಾಣಿಸುತ್ತದೆ. ನೀವು ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳಿಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿದಾಗ, ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿದಾಗ ಅಥವಾ ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್ ಅನ್ನು ಸೆಟಪ್ ಮಾಡಿದಾಗ ಇತರ ಜನರು ಸಹ ಅದನ್ನು ನೋಡಬಹುದು."</string>
     <string name="devices_title" msgid="649715719278562515">"ಸಾಧನಗಳು"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"ಎಲ್ಲಾ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"ಸಲಹೆಗಳು"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಹುಡುಕಲಾಗಲಿಲ್ಲ. ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ನಿಷೇಧಿತ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ಯಾವುದೇ ಸಿಮ್ ಕಾರ್ಡ್ ಇಲ್ಲ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ಸಿಮ್"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ಯಾವುದೇ ಸಿಮ್‌ ಇಲ್ಲ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ಯಾವುದೂ ಅಲ್ಲ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ಕನೆಕ್ಟ್ ಮಾಡಲು ಸಿಮ್‌ನ ಅಗತ್ಯವಿದೆ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ಕನೆಕ್ಟ್ ಮಾಡಲು <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ಸಿಮ್‌ನ ಅಗತ್ಯವಿದೆ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌: WCDMA ಗೆ ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಲಾಗಿದೆ"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌‌: GSM ಮಾತ್ರ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ಪ್ರಾಶಸ್ತ್ಯ ನೀಡಿದ ನೆಟ್‌ವರ್ಕ್‌ ಮೋಡ್‌: WCDMA ಮಾತ್ರ"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ಮೊಬೈಲ್ ಡೇಟಾ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಬಳಸಿ ಡೇಟಾ ಪ್ರವೇಶಿಸಿ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ಫೋನ್ ಈ ವಾಹಕದ ವ್ಯಾಪ್ತಿಯಲ್ಲಿದ್ದಾಗ, ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಈ ವಾಹಕಕ್ಕೆ ಬದಲಾಗುತ್ತದೆ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ಯಾವುದೇ SIM ಕಾರ್ಡ್ ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ಕರೆಗಳ ಆದ್ಯತೆಗಳು"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ಆದ್ಯತೆ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ಪ್ರತಿ ಬಾರಿ ಕೇಳಿ"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಿಸಿದಾಗ ಲಭ್ಯವಿರುವುದಿಲ್ಲ"</string>
     <string name="see_more" msgid="7499355691042812723">"ಇನ್ನಷ್ಟು ನೋಡಿ"</string>
     <string name="see_less" msgid="2642392725363552793">"ಕಡಿಮೆ ನೋಡಿ"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಅನ್ನು ಆನ್ ಮಾಡಬೇಕೇ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM ಅನ್ನು ಆನ್ ಮಾಡಬೇಕೇ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಬೇಕೇ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ಬಳಸುತ್ತಿರುವ ಸಿಮ್‌ ಕಾರ್ಡ್‌ಗೆ ಬದಲಿಸಬೇಕೇ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ಒಂದು ಬಾರಿಗೆ ಕೇವಲ ಒಂದು SIM ಮಾತ್ರ ಸಕ್ರಿಯವಾಗಿರಬಹುದು.\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸುವುದರಿಂದ, ನಿಮ್ಮ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ಒಂದು ಬಾರಿಗೆ ಕೇವಲ ಒಂದು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ SIM ಮಾತ್ರ ಸಕ್ರಿಯವಾಗಿರಬಹುದು.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸುವುದರಿಂದ, ನಿಮ್ಮ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ಒಂದು ಬಾರಿಗೆ ಕೇವಲ ಒಂದು ಸಿಮ್ ಮಾತ್ರ ಸಕ್ರಿಯವಾಗಿರಬಹುದು.\n\nಸಿಮ್‌ಗಳನ್ನು ಬದಲಿಸುವುದರಿಂದ ನಿಮ್ಮ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಿ"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಕನೆಕ್ಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಗೆ ಬದಲಿಸಲಾಗುತ್ತಿದೆ"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ವಾಹಕವನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ದೋಷವೊಂದರ ಕಾರಣದಿಂದಾಗಿ ವಾಹಕವನ್ನು ಬದಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಅನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ಸಿಮ್ ಅನ್ನು ಆಫ್ ಮಾಡುವುದೇ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ಸಿಮ್ ಅನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತಿದೆ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ವಾಹಕವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ಏನೋ ತಪ್ಪಾಗಿದೆ ಮತ್ತು ನಿಮ್ಮ ವಾಹಕವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 ಸಿಮ್‌ಗಳನ್ನು ಬಳಸಬೇಕೇ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ಈ ಸಾಧನವು ಒಂದೇ ಬಾರಿಗೆ 2 ಸಕ್ರಿಯ ಸಿಮ್‌ಗಳನ್ನು ಹೊಂದಿರಬಹುದು. ಒಂದು ಬಾರಿಗೆ 1 ಸಿಮ್ ಬಳಸುವುದನ್ನು ಮುಂದುವರಿಸಲು \"ಧನ್ಯವಾದಗಳು\" ಎಂಬುದನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಬೇಕೇ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ಪ್ರಾರಂಭಿಸಲು, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ. ನಂತರ ನೀವು ಮತ್ತೊಂದು ಸಿಮ್‌ ಅನ್ನು ಸೇರಿಸಬಹುದು."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ಮುಂದುವರಿಸಿ"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ಮರುಪ್ರಾರಂಭಿಸಿ"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"ಧನ್ಯವಾದಗಳು"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"ಬದಲಿಸಿ"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ಸಿಮ್ ಅನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ಸಿಮ್ ಅನ್ನು ತೆಗೆದುಹಾಕಿ ಹಾಗೂ ಅದನ್ನು ಮತ್ತೆ ಸೇರಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ಸಿಮ್ ಅನ್ನು ಮತ್ತೆ ಆನ್ ಮಾಡಲು ಪ್ರಯತ್ನಿಸಿ. ಸಮಸ್ಯೆ ಮುಂದುವರಿದರೆ, ನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"ನೆಟ್‌ವರ್ಕ್ ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ಸಕ್ರಿಯವಾಗಿದೆ"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಅಪ್‌ಡೇಟ್‌ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"ಸಿಮ್‌ ಕಾರ್ಡ್"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಈ ಸಿಮ್ ಅನ್ನು ಅಳಿಸುವುದೇ?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ಈ ಸಿಮ್ ಅನ್ನು ಅಳಿಸುವುದರಿಂದ, ಅದು ಈ ಸಾಧನದಿಂದ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ಸೇವೆಯನ್ನು ತೆಗೆದುಹಾಕುತ್ತದೆ.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ಗಾಗಿ ಇರುವ ಸೇವೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲಾಗುವುದಿಲ್ಲ."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"ಅಳಿಸಿ"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"ಸಿಮ್ ಅಳಿಸಲಾಗುತ್ತಿದೆ…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"ಸಿಮ್ ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"ದೋಷದ ಕಾರಣದಿಂದಾಗಿ ಈ ಸಿಮ್ ಅನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\nನಿಮ್ಮ ಸಾಧನವನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ ಹಾಗೂ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಿಸಿ"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"ನಿಮ್ಮ ಸಾಧನಕ್ಕೆ ಕನೆಕ್ಟ್ ಮಾಡಲು ತಾತ್ಕಾಲಿಕ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್ ಅನ್ನು ಬಳಸಲು <xliff:g id="APPNAME">%1$s</xliff:g> ಆ್ಯಪ್ ಬಯಸುತ್ತದೆ"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ಯಾವುದೇ ಸಾಧನಗಳು ಕಂಡುಬಂದಿಲ್ಲ. ಸಾಧನಗಳನ್ನು ಆನ್ ಮಾಡಲಾಗಿದೆ ಮತ್ತು ಸಂಪರ್ಕಿಸಲು ಲಭ್ಯವಿದೆ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"ತುರ್ತು ಕರೆಗಳು"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ ಮೂಲಕ ಮಾಡಲಾಗುವ ತುರ್ತು ಕರೆಗಳನ್ನು ನಿಮ್ಮ ವಾಹಕವು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ.\nತುರ್ತು ಕರೆ ಮಾಡಲು ಸಾಧನವು ಸೆಲ್ಯುಲರ್ ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಬದಲಾಯಿಸುತ್ತದೆ.\nಸೆಲ್ಯುಲರ್ ಪ್ರಸಾರ ವ್ಯಾಪ್ತಿ ಇರುವ ಪ್ರದೇಶಗಳಲ್ಲಿ ಮಾತ್ರ ತುರ್ತು ಕರೆಗಳನ್ನು ಮಾಡಲು ಸಾಧ್ಯ."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"ಗುಣಮಟ್ಟವನ್ನು ಹೆಚ್ಚಿಸಲು ಕರೆಗಳನ್ನು ಮಾಡಲು ವೈ-ಫೈ ಬಳಸಿ"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"ಕ್ರಾಸ್-ಸಿಮ್ ಕರೆ ಮಾಡುವಿಕೆ"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"ಈ ಸಿಮ್‌ನ ಮೂಲಕ ಮತ್ತೊಂದು ಸಿಮ್‌ನ ಕರೆಗಳನ್ನು ಮಾಡಲು ಮತ್ತು SMS ಗಳನ್ನು ಕಳುಹಿಸಲು ಅನುಮತಿಸಿ."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"ಕ್ರಾಸ್-ಸಿಮ್ ಕರೆ ಮಾಡುವಿಕೆ"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"ಒಳಬರುವ MMS ಸಂದೇಶ"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS ಸಂದೇಶವನ್ನು ಕಳುಹಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"ಮೊಬೈಲ್ ಡೇಟಾ ಆಫ್ ಇರುವಾಗ, <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> ನಲ್ಲಿ MMS ಸಂದೇಶ ಕಳುಹಿಸುವುದನ್ನು ಅನುಮತಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ ಸ್ಕ್ರೀನ್ ಓವರ್‌ಲೇಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಸ್ಕ್ರೀನ್‌ಗಳನ್ನು ಓವರ್‌ಲೇ ಮಾಡಲು ಇತರ ಆ್ಯಪ್‌ಗಳಲ್ಲಿ ಡಿಸ್‌ಪ್ಲೇ ಮಾಡಬಹುದಾದ ಆ್ಯಪ್‌ಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"ಮಾಧ್ಯಮ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"ಮಾಧ್ಯಮ ಸೆಶನ್ ಮುಗಿದ ನಂತರ ಪ್ಲೇಯರ್ ಅನ್ನು ಮರೆಮಾಡಿ"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"ವಿಸ್ತರಿತ ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳ ಫಲಕದಿಂದ ಸೆಶನ್ ಅನ್ನು ಪುನರಾರಂಭಿಸಲು ಪ್ಲೇಯರ್ ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ತ್ವರಿತ ಸೆಟ್ಟಿಂಗ್‌‌ಗಳಲ್ಲಿ ಮೀಡಿಯಾ ಪ್ಲೇಯರ್"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"ಪ್ಲೇಬ್ಯಾಕ್ ಅನ್ನು ಸುಲಭವಾಗಿ ಪುನರಾರಂಭಿಸಲು, ವಿಸ್ತರಿತ ಅವಧಿಗೆ ಮೀಡಿಯಾ ಪ್ಲೇಯರ್ ಅನ್ನು ತೋರಿಸಿ"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ಪ್ಲೇಯರ್ ಮರೆಮಾಡಿ"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ಪ್ಲೇಯರ್ ತೋರಿಸಿ"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ಯಾವುದೇ ಪ್ಲೇಯರ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ಅನುಮತಿಸಲಾದ ಆ್ಯಪ್‌ಗಳು"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"ಮಾಧ್ಯಮ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ಬ್ಲೂಟೂತ್ ಆನ್ ಆಗುತ್ತದೆ"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ಆನ್ ಆಗಿದೆ"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"ಆಫ್ ಆಗಿದೆ"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"ಇಂಟರ್ನೆಟ್"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"ಸಿಮ್‌ಗಳು"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"ಏರ್‌ಪ್ಲೇನ್-ಸುರಕ್ಷತಾ ನೆಟ್‌ವರ್ಕ್‌ಗಳು"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ಏರ್‌ಪ್ಲೇನ್-ಸುರಕ್ಷತಾ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಹುಡುಕಿ ಮತ್ತು ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ಏರ್‌ಪ್ಲೇನ್, ಏರ್‌ಪ್ಲೇನ್-ಸುರಕ್ಷತಾ"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"ಕರೆಗಳು &amp; SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"ವೈ-ಫೈ ಕರೆ ಮಾಡುವಿಕೆ"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ವೈ-ಫೈ ರೀತಿಯ ವಾಹಕ-ರಹಿತ ನೆಟ್‌ವರ್ಕ್‌ಗಳ ಮೂಲಕ ಕರೆಗಳನ್ನು ಮಾಡಿ ಮತ್ತು ಸ್ವೀಕರಿಸಿ"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"ವೈ-ಫೈ ಕರೆಮಾಡುವಿಕೆಯು, ಕೆಲವು ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳು ವಾಹಕ-ರಹಿತ ನೆಟ್‌ವರ್ಕ್‌ಗಳ ಮೂಲಕ ಕರೆಗಳನ್ನು ಮಾಡಲು ಮತ್ತು ಸ್ವೀಕರಿಸಲು ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"ಕರೆಗಳು"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"ಕರೆಗಳಿಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"ಯಾವುದೇ ಸಿಮ್ ಇಲ್ಲ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ಪ್ರಾಶಸ್ತ್ಯಗಳು"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ಸಾರ್ವಜನಿಕ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಕನೆಕ್ಟ್ ಮಾಡಿ"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ನೆಟ್‌ವರ್ಕ್ ಕನೆಕ್ಷನ್, ಇಂಟರ್ನೆಟ್, ವೈರ್‌ಲೆಸ್, ಡೇಟಾ, ವೈಫೈ, ವೈ-ಫೈ, ವೈ ಫೈ, ಸೆಲ್ಯುಲಾರ್, ಮೊಬೈಲ್, ಸೆಲ್ ವಾಹಕ, 4g, 3g, 2g, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ಏರೋಪ್ಲೇನ್-ಸುರಕ್ಷಿತ ನೆಟ್‌ವರ್ಕ್ ನೋಡಿ"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ಏರ್‌ಪ್ಲೇನ್ ಮೋಡ್ ಆಫ್ ಮಾಡಿ"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ಬೆಡ್‌ಟೈಮ್ ಮೋಡ್ ಆನ್ ಇರುವುದರಿಂದ ಲಭ್ಯವಿಲ್ಲ"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"ಮರುಹೊಂದಿಕೆ ಅಧಿಸೂಚನೆ ಪ್ರಾಮುಖ್ಯತೆ ಪೂರ್ಣಗೊಂಡಿದೆ."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"ಆ್ಯಪ್‌ಗಳು"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"ವಿಶ್ವಾಸಾರ್ಹವಲ್ಲದ ಸಾಧನವು ನಿಮ್ಮ ಸಂದೇಶಗಳಿಗೆ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ವಿವರಗಳಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"ಸಂದೇಶಗಳಿಗೆ ಪ್ರವೇಶವನ್ನು ಅನುಮತಿಸಬೇಕೇ?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"ಒಂದು ವಿಶ್ವಾಸಾರ್ಹವಲ್ಲದ ಬ್ಲೂಟೂತ್ ಸಾಧನ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ನಿಮ್ಮ ಸಂದೇಶಗಳಿಗೆ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ.\n\nನೀವು ಈ ಮೊದಲು [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿರಲಿಲ್ಲ."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"ವಿಶ್ವಾಸಾರ್ಹವಲ್ಲದ ಸಾಧನವು ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆಯ ಲಾಗ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ವಿವರಗಳಿಗಾಗಿ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆಯ ಲಾಗ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ಅನುಮತಿಸಬೇಕೇ?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"ಒಂದು ವಿಶ್ವಾಸಾರ್ಹವಲ್ಲದ ಬ್ಲೂಟೂತ್ ಸಾಧನ, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ನಿಮ್ಮ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಕರೆಯ ಲಾಗ್‌ಗೆ ಪ್ರವೇಶಿಸಲು ಬಯಸುತ್ತದೆ. ಇದು ಒಳಬರುವ ಮತ್ತು ಹೊರಹೋಗುವ ಕರೆಗಳ ಡೇಟಾವನ್ನು ಒಳಗೊಂಡಿರುತ್ತದೆ.\n\nನೀವು ಈ ಮೊದಲು [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ಕ್ಕೆ ಸಂಪರ್ಕ ಹೊಂದಿರಲಿಲ್ಲ."</string>
 </resources>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index 8c61c6b..7f685f7 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"보통"</item>
     <item msgid="6740026006576843477">"길게"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"짧게"</item>
+    <item msgid="7397961711906421599">"보통"</item>
+    <item msgid="4079132024502041928">"길게"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"기본값"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA+LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"글로벌"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA 전용"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"전체"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 306c1c3..098f6d2 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"날짜 및 시간"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"날짜 및 시간 설정"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"날짜, 시간, 표준시간대 및 형식 설정"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"네트워크 시간 사용"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"네트워크 시간대 사용"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"자동으로 시간 설정"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"자동으로 시간대 설정"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"언어 기본값 사용"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24시간 형식"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24시간 형식 사용"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"잠금 화면에 프로필 정보 표시"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"계정"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"위치"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"위치 사용"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"위치 사용"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"사용 안함"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">사용 - <xliff:g id="COUNT_1">%1$d</xliff:g>개의 앱이 위치에 액세스할 수 있음</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"화면 잠금, 얼굴인식 잠금해제"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"화면 잠금, 지문"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"화면 잠금"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"얼굴과 지문으로 안전하게 휴대전화를 잠금 해제하세요"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"앱에 로그인하여 결제를 확인하는 방법도 있습니다."</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"설정할 잠금 해제 수단:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"얼굴인식 잠금해제"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"더욱 간편하게 휴대전화를 잠금 해제하세요"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"지문"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"주머니에서 휴대전화를 바로 잠금 해제하세요"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"건너뛰기"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"다음"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"얼굴 추가 완료"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"얼굴인식 잠금해제 설정"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"얼굴인식 잠금해제"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"얼굴로 인증"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"시작"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"접근성 얼굴인식 잠금해제가 사용 중지되면 음성 안내 지원 사용 시 일부 설정 단계가 제대로 작동하지 않을 수 있습니다."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"뒤로"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"설정 계속"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"접근성 설정 사용"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"앱에서 얼굴인식 잠금해제를 사용할 때 항상 확인 요청"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"얼굴 데이터 삭제"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"얼굴인식 잠금해제 설정"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"얼굴인식 잠금해제를 사용하여 기기를 잠금 해제하거나 앱에 로그인하거나 결제를 확인하세요.\n\n주의사항:\n휴대전화를 바라보면 의도치 않게 잠금이 해제될 수 있습니다.\n\n다른 사람이 내 얼굴에 휴대전화를 가져다 대면 잠금이 해제될 수 있습니다.\n\n나와 많이 닮은 사람(예: 일란성 쌍둥이)이 휴대전화의 잠금을 해제할 수도 있습니다."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"얼굴인식 잠금해제를 사용하여 기기를 잠금 해제하거나 앱에 로그인하거나 결제를 확인하세요.\n\n주의사항:\n휴대전화를 바라보면 의도치 않게 잠금이 해제될 수 있습니다.\n\n다른 사람이 내 얼굴에 휴대전화를 가져다 대면 눈을 감고 있더라도 잠금이 해제될 수 있습니다.\n\n일란성 쌍둥이와 같이 나와 많이 닮은 사람이 휴대전화의 잠금을 해제할 수도 있습니다."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"얼굴인식 잠금해제를 사용하여 기기를 잠금 해제하거나 앱에 로그인하거나 결제를 확인하세요."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"주의사항:\n휴대전화를 바라보면 의도치 않게 잠금이 해제될 수 있습니다.\n\n다른 사람이 내 얼굴에 휴대전화를 가져다 대면 잠금이 해제될 수 있습니다.\n\n일란성 쌍둥이와 같이 나와 많이 닮은 사람이 휴대전화의 잠금을 해제할 수도 있습니다."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"주의사항:\n휴대전화를 바라보면 의도치 않게 잠금이 해제될 수 있습니다.\n\n다른 사람이 내 얼굴에 휴대전화를 가져다 대면 눈을 감고 있더라도 잠금이 해제될 수 있습니다.\n\n일란성 쌍둥이와 같이 나와 많이 닮은 사람이 휴대전화의 잠금을 해제할 수도 있습니다."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"얼굴 데이터를 삭제하시겠습니까?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"얼굴인식 잠금해제에 사용되는 얼굴 데이터가 영구적으로 안전하게 삭제됩니다. 삭제한 후 휴대전화를 잠금 해제하거나 앱에 로그인하거나 결제를 확인하려면 PIN, 패턴 또는 비밀번호가 필요합니다."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"얼굴인식 잠금해제로 휴대전화 잠금 해제"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"지문을 사용하여 휴대전화를 잠금 해제하거나 구매를 승인하세요.\n\n참고: 이 기기는 지문을 사용하여 잠금 해제할 수 없습니다. 자세한 내용은 조직의 관리자에게 문의하세요."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"지문을 사용하여 휴대전화를 잠금 해제하거나 구매를 승인하세요.\n\n참고: 지문은 안전한 패턴 또는 PIN보다 보안 수준이 낮을 수 있습니다."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"취소"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"취소"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"계속"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"건너뛰기"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"다음"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"태블릿을 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 태블릿을 보호하세요. 또한 얼굴인식 잠금해제를 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"기기를 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 기기를 보호하세요. 또한 얼굴인식 잠금해제를 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"휴대전화를 분실하거나 도난당한 경우 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 휴대전화를 보호하세요. 또한 얼굴인식 잠금해제를 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"태블릿을 분실하거나 도난당했을 때 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 태블릿을 보호하세요. 생체 인식을 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"기기를 분실하거나 도난당했을 때 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 기기를 보호하세요. 생체 인식을 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"휴대전화를 분실하거나 도난당했을 때 다른 사람이 사용할 수 없도록 화면 잠금 옵션으로 휴대전화를 보호하세요. 생체 인식을 설정하려면 화면 잠금 옵션이 필요합니다. 돌아가려면 취소를 탭하세요."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN 설정을 건너뛰시겠습니까?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"비밀번호 설정을 건너뛰시겠습니까?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"패턴 설정을 건너뛰시겠습니까?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 태블릿을 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 기기를 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"기기 보호 기능을 활성화하여 다른 사람이 내 허가 없이 이 스마트폰을 사용하는 것을 방지합니다. 사용하려는 화면 잠금을 선택하세요."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"백업 화면 잠금 방식 선택"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"백업 화면 잠금 방식 선택"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"백업 화면 잠금 방식 선택"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"화면 잠금 옵션"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"화면 잠금 옵션"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"화면 잠금"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"얼굴인식 잠금해제 + 비밀번호"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"얼굴인식 잠금해제 없이 계속하기"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"얼굴을 사용하여 휴대전화를 잠금 해제할 수 있습니다. 이 옵션을 사용하려면 보안을 위해 백업 화면 잠금이 필요합니다."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"생체 인식 + 패턴"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"생체 인식 + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"생체 인식 + 비밀번호"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"생체 인식 없이 계속"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"생체 인식을 사용하여 휴대전화를 잠금 해제할 수 있습니다. 이 옵션을 사용하려면 보안을 위해 백업 화면 잠금이 필요합니다."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"관리자, 암호화 정책 또는 사용자 인증 정보 저장소에 의해 사용 중지됨"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"없음"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"스와이프"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g>자리 미만이어야 합니다.</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"기기 관리자가 최근 PIN 사용을 허용하지 않습니다."</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT 관리자가 일반 PIN을 차단했습니다. 다른 PIN을 시도해 보세요."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"잘못된 문자를 포함할 수 없습니다."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"문자가 1개 이상 포함되어야 합니다."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"숫자가 1개 이상 포함되어야 합니다."</string>
@@ -653,7 +673,6 @@
       <item quantity="one">숫자가 아닌 문자를 1개 이상 포함해야 합니다.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"기기 관리자가 최근 비밀번호 사용을 허용하지 않습니다."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT 관리자가 일반적인 단어로 된 비밀번호를 허용하지 않습니다. 다른 비밀번호를 시도해 보세요."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"연속으로 올라가거나 내려가는 숫자 또는 반복되는 숫자의 배열은 허용되지 않습니다."</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"확인"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"취소"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi 사용"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi 사용"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi 사용"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi 설정"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"무선 액세스포인트(AP) 설정 및 관리"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"\'<xliff:g id="SSID">%1$s</xliff:g>\'에 연결하려면 아래 창의 가운데 부분에 QR 코드를 맞추세요."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR 코드를 스캔하여 Wi‑Fi에 연결하세요."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi 공유"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"이 QR 코드를 스캔하여 \'<xliff:g id="SSID">%1$s</xliff:g>\'에 연결하고 비밀번호를 공유하세요."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"다른 기기로 이 QR 코드를 스캔하여 \'<xliff:g id="SSID">%1$s</xliff:g>\'에 연결"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"이 QR 코드를 스캔하여 \'<xliff:g id="SSID">%1$s</xliff:g>\'에 연결"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"다시 시도해 보세요. 문제가 계속되면 기기 제조업체에 문의하세요."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"문제 발생"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi 비밀번호: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"핫스팟 비밀번호: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"자동 연결"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"이 네트워크 근처에 있을 때 휴대전화가 자동으로 연결되도록 허용"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"이 네트워크 근처에 있을 때 태블릿이 자동으로 연결되도록 허용"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"범위 안에 들어오면 이 네트워크의 연결을 허용합니다."</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"기기 추가"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"QR 코드를 사용하여 네트워크에 기기 추가"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR 코드가 유효한 형식이 아닙니다."</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"시스템 인증 사용"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"제공하지 않음"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"확인하지 않음"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"지정한 인증서가 없습니다. 비공개로 연결되지 않습니다."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"네트워크 이름이 너무 깁니다."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"도메인을 지정해야 합니다."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"인증서가 필요합니다."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"연결"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi 사용 설정됨"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결됨"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결 중"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"연결 중…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"네트워크 연결 실패"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"범위 안에 네트워크가 없음"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"기기 MAC 주소"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"무작위 MAC 주소"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"무작위 MAC 주소(마지막으로 사용됨)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP 주소"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"네트워크 세부정보"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"서브넷 마스크"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 주소"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"저장된 네트워크"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"구독"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"기타 네트워크"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP 설정"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"이 사용자는 Wi‑Fi 고급 설정을 사용할 수 없습니다."</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"저장"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"올바른 게이트웨이 주소를 입력하세요."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"올바른 DNS 주소를 입력하세요."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0에서 32 사이의 네트워크 접두어 길이를 입력해 주세요."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1(비공개 DNS가 우선 적용되지 않는 경우)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2(비공개 DNS가 우선 적용되지 않는 경우)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"게이트웨이"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"네트워크 접두어 길이"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"앱에서 콘텐츠를 공유하지 않습니다. 인터넷 연결을 공유하려면 핫스팟을 껐다가 켜세요"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"설정된 비밀번호 없음"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"핫스팟 이름"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> 켜는 중..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> 켜는 중…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"다른 기기에서 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>에 연결할 수 있습니다."</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"핫스팟 비밀번호"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP 대역"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"스무스 디스플레이"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"일부 콘텐츠의 새로고침 빈도를 자동으로 60Hz에서 90Hz로 늘립니다. 이렇게 하면 배터리 사용량이 증가합니다."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"스무스 디스플레이"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90Hz 새로고침 빈도 강제 적용"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"향상된 터치 반응 속도 및 애니메이션 품질에 맞는 가장 높은 새로고침 빈도입니다. 배터리 사용량이 증가합니다."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"화면 시선 감지"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"사용/화면을 보고 있으면 꺼지지 않음"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"화면을 어둡게 설정한 경우 새 알림이 오면 절전 모드 자동 해제 기능을 사용 설정합니다."</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"시간 및 정보 항상 표시"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"배터리 사용량 증가"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"텍스트 굵게 표시"</string>
     <string name="title_font_size" msgid="570613010306330622">"글꼴 크기"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"텍스트를 확대 또는 축소"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM 카드 잠금 설정"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android 버전"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android 보안 업데이트"</string>
     <string name="model_info" msgid="8997566254717810904">"모델"</string>
-    <string name="model_summary" msgid="2246651782442466213">"모델: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"모델 및 하드웨어"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"하드웨어 버전"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"장비 ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN 삭제"</string>
     <string name="menu_new" msgid="6571230342655509006">"새 APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"저장"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"취소"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"취소"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"이름 입력란은 비워둘 수 없습니다."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN을 비워둘 수 없습니다."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"앱을 재설정할 수 있습니다."</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi, 모바일, 블루투스 초기화"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"다음을 포함한 모든 네트워크 설정이 초기화됩니다.\n\n"<li>"Wi‑Fi"</li>\n<li>"모바일 데이터"</li>\n<li>"블루투스"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"삭제"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"다운로드한 SIM 삭제"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"교체 SIM을 다운로드하려면 이동통신사에 문의하세요. 이렇게 해도 모바일 서비스 요금제는 취소되지 않습니다."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"이렇게 해도 모바일 서비스 요금제는 취소되지 않습니다. 교체 SIM을 다운로드하려면 이동통신사에 문의하세요."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"설정 초기화"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"네트워크 설정을 모두 초기화하시겠습니까? 이 작업은 실행취소할 수 없습니다."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"모든 네트워크 설정을 초기화하고 다운로드한 SIM을 삭제하시겠습니까? 이 작업은 실행취소할 수 없습니다."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"네트워크 설정이 재설정되었습니다."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM을 삭제할 수 없음"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"오류로 인해 다운로드한 SIM을 삭제할 수 없습니다.\n\n기기를 재부팅하고 다시 시도하세요."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"모든 데이터 삭제(초기화)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"모든 데이터 삭제(초기화)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"초기화하면 다음을 포함한 태블릿의 "<b>"내부 저장소"</b>"의 모든 데이터가 삭제됩니다.\n\n"<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"초기화하면 다음을 포함한 휴대전화 "<b>"내부 저장소"</b>"의 모든 데이터가 삭제됩니다.\n\n"<li>"Google 계정"</li>\n<li>"시스템과 앱 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"현재 로그인한 계정:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"이 기기에 다른 사용자가 있습니다.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"음악"</li>\n<li>"사진"</li>\n<li>"기타 사용자 데이터"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"모바일 서비스 요금제는 취소되지 않습니다."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"USB 저장소"</b>"를 삭제해야 합니다."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"SD 카드"</b>"를 삭제해야 합니다."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"모든 데이터 삭제(초기화)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"모든 데이터 삭제(초기화)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"초기화하면 다음을 포함한 태블릿 "<b>"내부 저장소"</b>"의 모든 데이터가 삭제됩니다.\n\n"<li>"Google 계정"</li>\n<li>"시스템과 앱의 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"초기화하면 다음을 포함한 휴대전화 "<b>"내부 저장소"</b>"의 모든 데이터가 삭제됩니다.\n\n"<li>"Google 계정"</li>\n<li>"시스템과 앱의 데이터 및 설정"</li>\n<li>"다운로드된 앱"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"현재 로그인한 계정:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"이 기기에 다른 사용자가 있습니다.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"음악"</li>\n<li>"사진"</li>\n<li>"기타 사용자 데이터"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"모바일 서비스 요금제는 취소되지 않습니다."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"USB 저장소"</b>"를 삭제해야 합니다."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"음악이나 사진, 기타 사용자 데이터를 지우려면 "<b>"SD 카드"</b>"를 삭제해야 합니다."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB 저장소 지우기"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD 카드 지우기"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"내부 USB 저장소에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD 카드에 있는 모든 데이터(예: 음악 또는 사진)를 지웁니다."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"모든 데이터 삭제"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"모든 데이터 삭제"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"모든 개인정보와 다운로드한 앱이 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"다운로드한 앱 및 SIM을 포함한 모든 개인정보가 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"모두 지우기"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"시스템 지우기 서비스를 사용할 수 없어 초기화하지 못했습니다."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"모든 데이터를 삭제하시겠습니까?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"초기화를 수행할 권한이 없는 사용자입니다."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"지우는 중"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"잠시 기다려 주세요..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"모든 데이터 삭제"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"모든 데이터 삭제"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"모든 개인 정보와 다운로드한 앱이 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"다운로드한 앱 및 SIM을 포함한 모든 개인 정보가 삭제됩니다. 이 작업은 실행취소할 수 없습니다."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"모든 데이터를 삭제하시겠습니까?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"초기화를 실행할 권한이 없는 사용자입니다."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"삭제 중"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"잠시만 기다려 주세요…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"통화 설정"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"음성메일, 착신전환, 통화중 대기, 발신자 번호 설정"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB 테더링"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>개의 기기까지만 테더링 사용 가능"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 기기의 테더링이 끊깁니다."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"이더넷 테더링"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB 이더넷을 통해 휴대전화의 인터넷 연결 공유"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"이더넷을 통해 휴대전화의 인터넷 연결 공유"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"핫스팟 및 테더링을 사용하여 다른 기기에서 내 모바일 데이터 연결을 통해 인터넷을 사용할 수 있도록 합니다. 앱에서도 핫스팟을 만들어 주변 기기와 콘텐츠를 공유할 수 있습니다."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"핫스팟 및 테더링으로 다른 기기에서 내 Wi-Fi 또는 모바일 데이터 연결을 통해 인터넷을 사용할 수 있도록 합니다. 앱에서도 핫스팟을 만들어 주변 기기와 콘텐츠를 공유할 수 있습니다."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"고객센터"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"블루투스 검색"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"블루투스가 꺼져 있을 때도 항상 앱과 서비스에서 주변 기기를 검색하도록 허용합니다. 이 설정은 위치 기반 기능 및 서비스 개선 등에 사용될 수 있습니다."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"업무용 위치 서비스"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"위치 시간대 감지"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"위치 시간대 감지"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"현재 시간대를 감지하기 위하여 기기 위치를 사용할 수 있도록 허용합니다. Wi-Fi 검색과 같은 다른 위치 설정이 시간대 감지의 정확도에 영향을 줄 수 있습니다."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"사용"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"사용 안함"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"시간대 자동 감지가 사용 중지됩니다."</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"위치 시간대 감지가 사용 중지됩니다."</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"위치 시간대 감지가 지원되지 않습니다."</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"위치 시간대 감지 변경이 허용되지 않습니다."</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi 및 모바일 네트워크 위치"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"사용자의 위치를 빠르게 파악하도록 앱에서 Google의 위치 서비스를 사용합니다. 익명의 위치 정보가 수집되어 Google로 전송됩니다."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Wi-Fi에서 측정된 위치"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"비밀번호 설정 후 얼굴인식 잠금해제 설정"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"패턴 설정 후 얼굴인식 잠금해제 설정"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"PIN 설정 후 얼굴인식 잠금해제 설정"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"생체 인식 사용을 위한 비밀번호 설정"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"생체 인식 사용을 위한 패턴 설정"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"생체 인식 사용을 위한 PIN 설정"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"비밀번호를 잊으셨나요?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"패턴을 잊으셨나요?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN을 잊으셨나요?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"자막 환경설정"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"확대"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"확대 영역"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"확대 사용 설정"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"화면 확대 시 사용할 확대 영역 선택"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"전체 화면"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"화면 일부"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"전체 화면 및 화면 일부"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"전체 화면 확대"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"화면 일부 확대"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"접근성 버튼으로 전환할까요?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"화면 일부를 확대하기 위해 세 번 탭하는 동작을 사용하면 입력 및 기타 작업이 지연됩니다.\n\n접근성 버튼을 사용하여 확대하는 동작으로 전환하시겠습니까?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"접근성 버튼으로 전환"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"세 번 탭하여 확대하기 계속 사용"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"확대 설정"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"세 번 탭하여 확대"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"바로가기를 사용하여 확대"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"전원 버튼으로 통화 종료"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"대형 마우스 포인터"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"애니메이션 삭제"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"모노 오디오"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"오디오 재생 시 채널 통합"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"오디오 밸런스"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"왼쪽"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"오른쪽"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"모노 오디오"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"오디오 재생 시 채널 통합"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"오디오 밸런스"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"왼쪽"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"오른쪽"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"기본"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10초"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30초"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"알림 진동"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"벨소리 진동"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"터치 반응"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> 사용"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> 열기"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"색상 보정 사용"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"자막 보기"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"지원되는 앱만 해당"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> 사용"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> 열기"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"색상 보정 사용"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"자막 보기"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"지원되는 앱만 해당"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"자막 크기 및 스타일"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"텍스트 크기: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"추가 옵션"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"녹색약"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"적색약"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"청색약"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"그레이 스케일"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"적녹색약"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"적녹색약"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"청황색약"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"백그라운드 제한"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"앱이 백그라운드에서 실행되도록 허용"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"앱이 백그라운드에서 실행되도록 허용하지 않습니다."</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"백그라운드 사용은 제한할 수 없습니다."</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"백그라운드 사용은 제한할 수 없음"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"백그라운드 활동을 제한하시겠습니까?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"앱의 백그라운드 활동을 제한하면 앱이 정상적으로 작동하지 않을 수도 있습니다."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"배터리 최적화를 설정하지 않아 이 앱을 제한할 수 없습니다.\n\n앱을 제한하려면 먼저 배터리 최적화를 사용 설정하세요."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"태블릿을 평소보다 더 많이 사용함"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"기기를 평소보다 더 많이 사용함"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"배터리가 평소보다 빨리 소진될 수 있습니다."</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"배터리 상태 최적화 중"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"일시적으로 배터리 사용이 제한됩니다. 자세히 알아보려면 탭하세요."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"휴대전화를 평소보다 더 많이 사용했습니다. 배터리가 예상보다 빨리 소진될 수 있습니다.\n\n배터리 사용량이 가장 많은 앱:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"태블릿을 평소보다 더 많이 사용했습니다. 배터리가 예상보다 빨리 소진될 수 있습니다.\n\n배터리 사용량이 가장 많은 앱:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"기기를 평소보다 더 많이 사용했습니다. 배터리가 예상보다 빨리 소진될 수 있습니다.\n\n배터리 사용량이 가장 많은 앱:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">앱 %1$d개가 제한됨</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"배터리 수준을 읽는 중에 문제가 발생함"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"배터리 수준을 읽는 중에 문제가 발생했습니다. 탭하여 "<annotation id="url">"자세히 알아보세요"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"앱을 종료하시겠습니까?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g>에서 휴대전화를 작동 상태로 유지하고 있어 휴대전화에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 앱을 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g>에서 태블릿을 작동 상태로 유지하고 있어 태블릿에서 배터리를 정상적으로 관리할 수 없습니다.\n\n문제를 해결하려면 앱을 종료하세요.\n\n문제가 계속되는 경우 앱을 제거하고 배터리 성능을 개선해야 할 수도 있습니다."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"일정 설정"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"배터리 수명 연장"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"충전 완료 시 사용 중지"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"휴대전화가 <xliff:g id="PERCENT">%1$s</xliff:g>가 되면 절전 모드를 사용 중지합니다."</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"태블릿이 <xliff:g id="PERCENT">%1$s</xliff:g>가 되면 절전 모드를 사용 중지합니다."</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"기기가 <xliff:g id="PERCENT">%1$s</xliff:g>가 되면 절전 모드를 사용 중지합니다."</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"휴대전화가 <xliff:g id="PERCENT">%1$s</xliff:g> 이상 충전되면 절전 모드를 사용 중지합니다."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"태블릿이 <xliff:g id="PERCENT">%1$s</xliff:g> 이상 충전되면 절전 모드를 사용 중지합니다."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"기기가 <xliff:g id="PERCENT">%1$s</xliff:g> 이상 충전되면 절전 모드를 사용 중지합니다."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"사용 설정"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"재설정"</string>
     <string name="tts_play" msgid="2945513377250757221">"재생"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"스마트 연결"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"네트워크 연결을 자동으로 관리하여 배터리 수명을 연장하고 기기 성능을 개선합니다."</string>
     <string name="credentials_title" msgid="7535942196886123656">"사용자 인증 정보 저장소"</string>
     <string name="credentials_install" msgid="3933218407598415827">"인증서 설치"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"저장소에서 인증서 설치"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"사용자 인증 정보"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"저장된 사용자 인증 정보를 확인하고 수정"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"고급"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"저장공간 유형"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"하드웨어 지원"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"소프트웨어 전용"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"이 사용자는 자격증명을 확인하거나 수정할 수 없습니다."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN 및 앱에 사용하도록 설치됨"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi에 사용하도록 설치됨"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"설치 안함"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"계속 설치"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"인증서가 설치되지 않음"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g> 앱에서 이 기기에 인증서를 설치하도록 허용하시겠습니까?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"이 인증서를 통해 아래 앱 및 URL에서 사용자를 식별합니다."</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"허용 안함"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"허용"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"자세히 보기"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"인증서 관리 앱"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"없음"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"이 앱으로 설치한 인증서를 통해 아래 앱 및 URL에서 사용자 인증 정보를 식별합니다."</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"삭제"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"응급 상황 다이얼링 신호"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"긴급 통화 중 동작 설정"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"백업"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"설정되지 않음 - 직장 프로필"</string>
     <string name="user_admin" msgid="4024553191395768119">"관리자"</string>
     <string name="user_you" msgid="3070562015202859996">"나(<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"닉네임"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"사용자 <xliff:g id="USER_COUNT">%1$d</xliff:g>명까지 추가 가능"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"태블릿의 소유자만 사용자를 관리할 수 있습니다."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"휴대전화의 소유자만 사용자를 관리할 수 있습니다."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"단말기에서 결제"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"결제 앱을 설정하세요. 그런 다음 미접촉 기호가 있는 단말기 위에 휴대전화의 뒷면을 갖다 대세요."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"확인"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"더보기..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"더보기…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"기본 결제 앱 설정"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"기본 결제 앱 업데이트"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"미접촉 결제 단말기에서 <xliff:g id="APP">%1$s</xliff:g> 앱으로 결제"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"뒤로"</string>
     <string name="wizard_next" msgid="3884832431439072471">"다음"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"완료"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"사진 찍기"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"이미지 선택"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"사진 선택"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM 카드"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM 카드"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"통화에 항상 사용"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"데이터에 사용할 SIM 선택"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS용 SIM 선택"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"데이터 SIM을 전환하는 중입니다. 최대 1분 정도 걸릴 수 있습니다..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"데이터 SIM을 전환하는 중입니다. 최대 1분 정도 걸릴 수 있습니다…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"통화에 사용할 SIM"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM 카드 선택"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"루틴, 일정, 절전 모드, 전력 절약 모드, 배터리, 자동, 퍼센트"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, 고급 통화, 4G 통화"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"언어 추가, 언어 한 개 추가"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"텍스트 크기"</string>
     <string name="default_sound" msgid="6604374495015245195">"기본 사운드"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"벨소리 및 알림 볼륨이 <xliff:g id="PERCENTAGE">%1$s</xliff:g>로 설정되었습니다."</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"볼륨, 진동, 방해 금지 모드"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"부팅 소리"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"실시간 자막"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"미디어 자막 자동 생성"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"없음"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">예약 <xliff:g id="ON_COUNT">%d</xliff:g>개 설정됨</item>
-      <item quantity="one">예약 1개 설정됨</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{없음}=1{일정 1개 설정됨}other{일정 #개 설정됨}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"방해 금지 모드"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"중요한 사람과 앱의 알림만 받기"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"방해 요소 제한"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"중요 알림만 허용"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"켜짐/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"사용 안함/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"사용 안함"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"켜짐"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"항상 확인"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"사용 중지할 때까지"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g>시간</item>
-      <item quantity="one">1시간</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g>분"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>개의 예약이 자동으로 사용 설정될 수 있습니다.</item>
-      <item quantity="one">1개의 예약이 자동으로 사용 설정될 수 있습니다.</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1시간}other{#시간}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1분}other{#분}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{꺼짐}=1{꺼짐/일정 1개가 자동으로 사용 설정될 수 있음}other{꺼짐/일정 #개가 자동으로 사용 설정될 수 있음}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"방해 금지 모드 예외 항목"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"사람"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"앱"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"우선순위가 낮은 알림을 조용한 알림으로 자동 설정합니다."</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"적응형 알림 순위 지정"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"관련성에 따라 자동으로 알림 순위 지정"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"적응형 알림 의견"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"알림의 수정사항을 표시하며 시스템에 의견을 제공하는 옵션을 보여줍니다."</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"알림 중요도 재설정"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"사용자가 변경한 중요도 설정을 재설정하고 알림 어시스턴트가 우선순위를 지정하도록 허용합니다."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"추천 작업 및 답장"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"추천 작업 및 답장을 자동으로 표시"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"최근 알림 및 일시 중지된 알림 표시"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"우선순위 대화"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"대화 섹션 상단에 플로팅 대화창으로 표시"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"대화 섹션의 상단에 표시"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"기타 대화"</string>
+    <string name="other_conversations" msgid="551178916855139870">"우선순위가 아닌 대화"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"변경한 대화"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"최근 대화"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"최근 항목 삭제"</string>
+    <string name="clear" msgid="5092178335409471100">"삭제"</string>
     <string name="important_bubble" msgid="7911698275408390846">"우선순위 대화를 버블로 설정"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"우선순위 대화는 풀다운 창 상단에 표시됩니다. 버블로 설정하여 방해 금지 모드를 무시하도록 할 수도 있습니다."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"우선순위 대화 및 수정된 대화가 여기에 표시됩니다"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"방해 금지 모드 액세스"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"방해 금지 모드 허용"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"설치된 앱 중에서 방해 금지 모드 액세스를 요청한 앱이 없습니다."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"앱 로드 중..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"앱 로드 중…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"사용자의 요청에 따라 Android에서 기기에 이 앱의 알림이 표시되지 않도록 차단하고 있습니다"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"사용자의 요청에 따라 Android에서 기기에 이 카테고리의 알림이 표시되지 않도록 차단하고 있습니다"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"사용자의 요청에 따라 Android에서 기기에 이 그룹의 알림이 표시되지 않도록 차단하고 있습니다"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"모든 대화"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"우선순위 대화"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"없음"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">대화 <xliff:g id="CONVERSATIONS">%d</xliff:g>개</item>
-      <item quantity="one">대화 1개</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"없음"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{없음}=1{대화 1개}other{대화 #개}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"예외 사용자"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"전화"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"전화"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"허용된 전화를 놓치지 않도록 기기가 벨소리로 설정되어 있는지 확인하세요."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"예약된 시간(‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\')에 수신 전화가 차단됩니다. 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자의 연락을 허용할 수 있습니다."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"별표 표시한 연락처"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">외 <xliff:g id="NUM_PEOPLE">%d</xliff:g>명</item>
-      <item quantity="one">외 1명</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"없음"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{없음}=1{{contact_1}}=2{{contact_1} 및 {contact_2}}=3{{contact_1}, {contact_2} 및 {contact_3}}other{{contact_1}, {contact_2} 외 #명}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(이름 없음)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"메시지"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"메시지"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"메시지"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"예약된 시간(‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\')에 수신 메시지가 차단됩니다. 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자의 연락을 허용할 수 있습니다."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"모든 메시지 받기"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"모든 전화 받기"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"없음"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">연락처 <xliff:g id="NUM_CONTACTS">%d</xliff:g>개</item>
-      <item quantity="one">연락처 1개</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{없음}=1{연락처 1개}other{연락처 #개}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"모든 사용자"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"연락처"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"별표표시한 연락처"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"모든 알림"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"일부 알림"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"선택된 사람은 앱 알림이 사용 중지되어 있어도 나에게 연락할 수 있습니다."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> 예외</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> 예외</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"외 <xliff:g id="NUMBER">%d</xliff:g>개"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{예외 앱 없음}=1{{app_1} 예외}=2{{app_1} 및 {app_2} 예외}=3{{app_1}, {app_2}, {app_3} 예외}other{{app_1}, {app_2} 외 #개 예외}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"앱"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"모든 알림"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"일부 알림"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"예외 알림"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"모든 알림 허용"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> 예외</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> 예외</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"예외 소리 없음"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"외 <xliff:g id="NUMBER">%d</xliff:g>개"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{예외 소리 없음}=1{{sound_category_1} 예외}=2{{sound_category_1} 및 {sound_category_2} 예외}=3{{sound_category_1}, {sound_category_2}, {sound_category_3} 예외}other{{sound_category_1}, {sound_category_2} 외 #가지 예외}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"예외 소리 없음"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"예외 사용자 없음"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"일부 사용자만 예외"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"모든 사람 예외"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"사용"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"사용 안함"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"앱 고정"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"앱 고정 기능을 사용하면 고정 해제할 때까지 현재 앱이 계속 화면에 표시되도록 할 수 있습니다. 예를 들어 신뢰할 수 있는 친구가 특정 게임을 할 수 있도록 허용할 때 이 기능을 사용할 수 있습니다. \n\n고정된 앱을 통해 다른 앱이 열릴 수 있으며 개인 데이터가 표시될 수 있습니다. \n\n앱 고정 기능을 사용하려면 다음 단계를 따르세요. 	\n1.	앱 고정을 사용 설정합니다. 	\n2.	최근 사용을 엽니다. 	\n3.	화면 상단의 앱 아이콘을 탭한 후 고정을 탭합니다."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"앱 고정 기능을 사용하면 고정 해제할 때까지 현재 앱이 계속 화면에 표시되도록 할 수 있습니다. 예를 들어 신뢰할 수 있는 친구가 특정 게임을 하도록 허용할 때 이 기능을 사용해 보세요. \n\n고정된 앱을 통해 다른 앱이 열릴 수 있으며 개인 데이터가 표시될 수 있습니다. \n\n기기를 다른 사람과 안전하게 공유하고 싶다면 게스트 사용자를 대신 사용해 보세요. \n\n앱 고정 기능을 사용하려면 다음 단계를 따르세요. 	\n1.	앱 고정을 사용 설정합니다. 	\n2.	최근 사용을 엽니다. 	\n3.	화면 상단의 앱 아이콘을 탭한 후 고정을 탭합니다."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"앱을 고정하여 고정 해제할 때까지 계속 화면에 표시되도록 할 수 있습니다. 예를 들어 신뢰할 수 있는 친구가 특정 게임을 하도록 허용할 때 이 기능을 사용해 보세요."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"고정된 앱을 통해 다른 앱이 열리고 개인 정보가 표시될 수 있습니다. \n\n앱 고정을 사용하려면 다음 단계를 따르세요. 	\n1.	앱 고정을 사용 설정합니다. 	\n2.	최근 사용을 엽니다. 	\n3.	화면 상단의 앱 아이콘을 탭한 후 고정을 탭합니다."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"고정된 앱을 통해 다른 앱이 열리고 개인 정보가 표시될 수 있습니다. \n\n기기를 다른 사람과 안전하게 공유하고 싶다면 게스트 사용자를 대신 사용해 보세요. \n\n앱 고정을 사용하려면 다음 단계를 따르세요. 	\n1.	앱 고정을 사용 설정합니다. 	\n2.	최근 사용을 엽니다. 	\n3.	화면 상단의 앱 아이콘을 탭한 후 고정을 탭합니다."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"앱이 고정되었을 때 다음 사항이 적용됩니다. \n\n•	 개인 데이터가 표시될 수 있습니다.\n		(연락처, 이메일 내용 등) \n•	 고정된 앱을 통해 다른 앱이 열릴 수 있습니다. \n\n신뢰할 수 있는 상대에게만 앱 고정을 사용하세요."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"고정 해제 이전에 잠금해제 패턴 요청"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"고정 해제 이전에 PIN 요청"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"얼굴을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 PIN을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 PIN을 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"얼굴을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 패턴을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 패턴을 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"얼굴을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"생체 인식을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 PIN을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 기기를 분실하거나 도난당했을 때 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 PIN을 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"생체 인식 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 패턴을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 기기를 분실하거나 도난당했을 때 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 패턴을 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"생체 인식을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 기기를 분실하거나 도난당했을 때 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"예"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"아니요"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"제한됨"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB 제어 기기"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"연결된 기기"</string>
     <string name="usb_control_device" msgid="527916783743021577">"이 기기"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"전환 중..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"전환 중…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"전환할 수 없습니다."</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"기기 충전"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"연결된 기기 충전 중"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"모바일 데이터 사용량"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"앱 데이터 사용량"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi 데이터 사용량"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"비이동통신사 네트워크 데이터 사용량"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"이더넷 데이터 사용량"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"이더넷"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">제한 1개</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"기기에 표시되는 데이터 사용량은 이동통신사에서 산출한 데이터 사용량과 다를 수 있습니다."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"이동통신사 네트워크를 통해 사용한 데이터는 제외됩니다."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> 사용함"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"데이터 경고 설정"</string>
     <string name="data_warning" msgid="2925054658166062884">"데이터 경고"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"세부정보 보기"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"데이터 절약 모드"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"무제한 데이터"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"백그라운드 데이터 사용 중지됨"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"백그라운드 데이터 사용 중지됨"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"사용"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"사용 안함"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"데이터 절약 모드 사용"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"기기가 잠기면 알림에 답장이나 다른 텍스트를 입력하지 못하게 합니다."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"기본 맞춤법 검사기"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"맞춤법 검사기 선택"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"맞춤법 검사기 사용"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"맞춤법 검사기 사용"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"선택되지 않음"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(없음)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"저장용량 관리자가 저장 공간을 확보하기 위해 백업된 사진과 동영상을 기기에서 삭제합니다."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"사진 및 동영상 삭제"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"저장용량 관리자"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"저장용량 관리자 사용"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"저장용량 관리자 사용"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"자동"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"수동"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"지금 여유 공간 확보"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"두 번 탭하여 휴대전화 확인"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"두 번 탭하여 태블릿 확인"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"두 번 탭하여 기기 확인"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"스와이프하여 알림 확인"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"화면 하단에서 아래로 스와이프하여 알림을 표시합니다."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"한 손 사용 모드"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"한 손 사용 모드 사용"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"앱 전환 시 종료"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"시간 제한"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4초"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8초"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12초"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"한 손 사용 가능 여부"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"시간, 알림, 기타 정보를 확인하려면 화면을 두 번 탭하세요."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"들어 올려 휴대전화 확인"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"들어서 태블릿 확인"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"탭하여 태블릿 확인"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"탭하여 기기 확인"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"시간, 알림, 기타 정보를 확인하려면 화면을 탭하세요."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"응급 SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"응급 SOS 사용"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"관리자: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"전원 버튼을 빠르게 5회 이상 누르면 아래 조치가 시작됩니다."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"카운트다운 알림 재생"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"도움을 요청하기 전에 알림음을 크게 재생합니다."</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"전화를 걸어 도움 요청"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"긴급 통화에 사용할 전화번호"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. 변경하려면 탭하세요."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"긴급 전화번호가 아닌 번호를 입력할 경우:\n • 긴급 SOS를 사용하려면 기기가 잠금 해제되어 있어야 합니다.\n • 전화가 연결되지 않을 수도 있습니다."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"지문을 스와이프하여 알림 보기"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"지문 스와이프"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"알림을 확인하려면 휴대전화 뒷면의 지문 센서에서 아래로 스와이프합니다."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"표시할 데이터세트 최대 개수"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"기본값으로 초기화"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"개발자 옵션 자동완성 기능이 초기화되었습니다."</string>
+    <string name="location_category" msgid="3496759112306219062">"위치"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"상태 표시줄 위치 표시기"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"네트워크 및 연결 등 모든 센서를 통해 위치 표시"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"전체 GNSS 측정 강제 사용"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"듀티 사이클 없이 모든 GNSS 배열 및 빈도를 추적"</string>
     <string name="device_theme" msgid="5027604586494772471">"기기 테마"</string>
     <string name="default_theme" msgid="4815428567082263639">"기본값"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"네트워크 이름"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"방해받지 않도록 알림 일시중지"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"제공되지 않는 기능"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"이 기능은 휴대전화의 속도를 느리게 하므로 사용 중지되었습니다."</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"전체 GNSS 측정 강제 사용"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"듀티 사이클 없이 모든 GNSS 배열 및 빈도를 추적"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"비정상 종료 대화상자 항상 표시"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"앱이 비정상 종료될 때마다 대화상자 표시"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE 사용 앱 선택"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"모든 앱에서 사용 설정"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"그래픽 드라이버 선택"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"기본값"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"게임 드라이버"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"게임 드라이버"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"개발자 드라이버"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"시스템 그래픽 드라이버"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"사용(음소거)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"사용 안함"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"네트워크 세부정보"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"휴대전화에 설치된 앱에 기기 이름이 표시됩니다. 기기 이름은 블루투스 기기에 연결하거나 Wi-Fi 핫스팟을 설정할 때 다른 사용자에게 표시될 수도 있습니다."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"기기 이름이 휴대전화에 있는 앱에 표시됩니다. 기기 이름은 블루투스 기기 및 Wi-Fi 네트워크에 연결하거나 Wi-Fi 핫스팟을 설정할 때 다른 사용자에게도 표시될 수 있습니다."</string>
     <string name="devices_title" msgid="649715719278562515">"기기"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"모든 설정"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"추천"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"네트워크를 찾지 못했습니다. 다시 시도해 주세요."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(금지됨)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM 카드 없음"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM 없음"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"없음"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"연결하려면 SIM이 필요합니다."</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"연결하려면 <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM이 필요합니다."</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"기본 네트워크 모드: WCDMA 선호"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"기본 네트워크 모드: GSM 전용"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"기본 네트워크 모드: WCDMA 전용"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"모바일 데이터"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"모바일 네트워크를 사용하여 데이터 액세스"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"범위 안에 들어오면 휴대전화가 이 이동통신사로 자동 전환됩니다."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"사용할 수 있는 SIM 카드가 없음"</string>
     <string name="calls_preference" msgid="2166481296066890129">"통화 환경설정"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS 환경설정"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"항상 확인"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>에 연결된 경우 사용할 수 없음"</string>
     <string name="see_more" msgid="7499355691042812723">"더보기"</string>
     <string name="see_less" msgid="2642392725363552793">"간략히 보기"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> 서비스를 사용하시겠습니까?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM을 사용 설정하시겠습니까?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> 서비스로 전환하시겠습니까?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM 카드 사용으로 전환하시겠습니까?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"SIM은 한 번에 하나만 활성화할 수 있습니다.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 서비스로 전환해도 <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> 서비스는 취소되지 않습니다."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"다운로드한 SIM은 한 번에 하나만 활성화할 수 있습니다.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 서비스로 전환해도 <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> 서비스는 취소되지 않습니다."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"SIM은 한 번에 하나만 활성화할 수 있습니다.\n\nSIM을 전환해도 <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 서비스는 취소되지 않습니다."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> 서비스로 전환"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"네트워크에 연결 중…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> 서비스로 전환하는 중"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"이동통신사를 전환할 수 없음"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"오류로 인해 이동통신사를 전환할 수 없습니다."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>을(를) 사용 중지하시겠습니까?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM을 사용 중지하시겠습니까?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM을 사용 중지하는 중<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"이동통신사를 사용 중지할 수 없음"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"문제가 발생하여 이동통신사를 사용 중지하지 못했습니다."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2개의 SIM을 사용하시겠습니까?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"이 기기에서는 한 번에 2개의 SIM을 활성화할 수 있습니다. 계속해서 한 번에 1개의 SIM만 사용하려면 \'사용 안함\'을 탭하세요."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"기기를 다시 시작하시겠습니까?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"시작하려면 기기를 다시 시작하세요. 그런 다음 다른 SIM을 추가할 수 있습니다."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"계속"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"다시 시작"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"취소"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"전환"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM을 활성화할 수 없음"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM을 삭제하고 다시 삽입해 보세요. 그래도 문제가 지속되면 기기를 다시 시작하세요."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM을 다시 사용 설정해 보세요. 그래도 문제가 지속되면 기기를 다시 시작하세요."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"네트워크 활성화"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>이(가) 활성화됨"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM 설정을 업데이트하려면 탭하세요."</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM 카드"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"다운로드한 SIM을 삭제하시겠습니까?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"이 SIM을 삭제하면 기기에서 <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> 서비스가 삭제됩니다.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> 서비스는 취소되지 않습니다."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"삭제"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM 삭제 중…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM을 삭제할 수 없음"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"오류로 인해 SIM을 삭제할 수 없습니다.\n\n기기를 다시 시작하고 다시 시도해 보세요."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"기기에 연결"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> 앱에서 임시 Wi‑Fi 네트워크를 사용하여 기기에 연결하려고 합니다."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"기기가 없습니다. 기기가 켜져 있으며 연결 가능한지 확인하세요."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"긴급 전화"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Wi‑Fi 통화를 사용한 긴급 전화가 이용 중인 이동통신사에서 지원되지 않습니다.\n긴급 전화를 걸면 기기에서 모바일 네트워크로 자동 전환합니다.\n긴급 전화는 모바일 데이터가 지원되는 지역에서만 사용할 수 있습니다."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"통화에 Wi‑Fi를 사용하여 통화 품질을 개선합니다."</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Cross SIM 통화"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"현재 사용 중인 SIM에서 다른 SIM으로 통화 및 SMS 허용"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"cross sim 통화"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"MMS 메시지 수신 중"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS 메시지 전송 불가"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"탭하여 모바일 데이터가 꺼져 있을 때 <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>에서 MMS 메시지 허용"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"설정에서 화면 오버레이 허용"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"다른 앱 위에 표시할 수 있는 앱이 설정 화면을 오버레이하도록 허용합니다."</string>
     <string name="media_controls_title" msgid="403271085636252597">"미디어"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"미디어 세션이 종료되면 플레이어를 숨깁니다."</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"플레이어를 사용하여 펼쳐진 빠른 설정 패널에서 세션을 다시 시작할 수 있습니다."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"빠른 설정의 미디어 플레이어"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"쉽게 이어서 재생할 수 있도록 미디어 플레이어를 오랫동안 표시합니다."</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"플레이어를 숨깁니다."</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"플레이어를 표시합니다."</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"사용 가능한 플레이어가 없습니다."</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"허용되는 앱"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"미디어"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"블루투스를 사용 설정함"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"사용"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"사용 안함"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"인터넷"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"항공 안전 네트워크"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"항공 안전 네트워크를 찾아 연결합니다."</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"항공, 항공 안전"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"통화 및 SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 통화"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi‑Fi와 같은 비이동통신사 네트워크를 통해 전화를 주고받습니다."</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi 통화를 사용하면 Wi‑Fi 네트워크와 같은 비이동통신사 네트워크를 통해 전화를 주고받을 수 있습니다."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"통화"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"기본"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"기본 전화"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"기본 SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"사용할 수 없음"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM 없음"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"환경설정"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"공용 네트워크에 연결"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"네트워크 연결, 인터넷, 무선, 데이터, Wifi, Wi-Fi, Wi Fi, 셀룰러, 모바일, 이동통신사, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"항공 안전 네트워크 보기"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"비행기 모드 사용 중지"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"취침 모드가 켜져 있으므로 사용할 수 없습니다."</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"알림 중요도가 재설정되었습니다."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"앱"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"신뢰할 수 없는 기기에서 메시지에 액세스하려고 합니다. 세부정보를 확인하려면 탭하세요."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"메시지 액세스를 허용하시겠습니까?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"신뢰할 수 없는 블루투스 기기 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]에서 메시지에 액세스하려고 합니다.\n\n전에는 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]에 연결한 적이 없습니다."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"신뢰할 수 없는 기기에서 연락처와 통화 기록에 액세스하려고 합니다. 세부정보를 확인하려면 탭하세요."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"연락처와 통화 기록 액세스를 허용하시겠습니까?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"신뢰할 수 없는 블루투스 기기 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]에서 연락처와 통화 기록에 액세스하려고 합니다. 여기에는 수신 전화와 발신 전화에 관한 데이터도 포함됩니다.\n\n전에는 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]에 연결한 적이 없습니다."</string>
 </resources>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index 0cd420a..c489e9e 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Орточо"</item>
     <item msgid="6740026006576843477">"Узун"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Кыска"</item>
+    <item msgid="7397961711906421599">"Орто"</item>
+    <item msgid="4079132024502041928">"Узун"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Демейки"</item>
     <item msgid="4234707448428002595">"Санс-сериф"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Жалпы"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA гана"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Жалпы"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 300147d..709f21d 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Күн жана убакыт"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Күн жана убакытын коюу"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Датаны, убакытты, саат алкагын, жана форматтарды тууралоо"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Тармактын убакыты колдонулсун"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Тармактын убакыт алкагы колдонулсун"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Убакытты автоматтык түрдө коюу"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Убакыт алкагын автоматтык түрдө коюу"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Демейки жергиликтүү форматты колдонуу"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 сааттык формат"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 сааттык форматты колдонуу"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Бөгөт көшөгөсүндө профайлдын маалыматын көргөзүү"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Аккаунттар"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Жайгашкан жер"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Кайда жүргөнүм көрүнүп турсун"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Жайгашкан жерди колдонуу"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Өчүк"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Күйүк - <xliff:g id="COUNT_1">%1$d</xliff:g> колдонмо жайгашкан жерди көрө алат</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Экранды кулпулоо, жүзүнөн таануу"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Экранды кулпулоо, манжа изи"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Экран кулпусу"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Телефондун кулпусун жүзүңүз жана манжа изиңиз менен ачыңыз"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Колдонмолорго кирип, төлөмдөрдү ырастай аласыз"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Кулпуну ачуу ыкмасын тандаңыз:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Жүзүнөн таанып ачуу"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Телефондун кулпусун оңой ачуу"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Манжа изи"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Телефондун кулпусун бир тийип ачуу"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Өткөрүп жиберүү"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Кийинки"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Жүз кошулду"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Жүзүнөн таануу функциясын жөндөө"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Жүзүнөн таануу"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Жүзүңүз менен аныктыгыңызды текшертиңиз"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Баштадык"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Атайын мүмкүнчүлүктөр кызматындагы жүзүнөн таанып ачуу функциясы өчүрүлсө, TalkBack\'теги айрым жөндөө кадамдары туура иштебеши мүмкүн."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Артка"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Жөндөөнү улантуу"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Атайын мүмкүнчүлүктөрдү колдонуу"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Жүзүнөн таануу функциясы колдонулганда, ар дайым ырастоо талап кылынат"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Маалыматты өчүрүү"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Жүзүнөн таануу функциясын жөндөө"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"\"Жүзүнөн таануу\" функциясы аркылуу түзмөгүңүздүн кулпусун ачып, колдонмолорго кирип жана төлөмдөрдү ырастай аласыз.\n\nКөңүл буруңуз:\nЭкранды карап койсоңуз эле, түзмөгүңүздүн кулпусу ачылып калышы мүмкүн.\n\nОшондой эле кимдир бирөө көзүңүз ачылып турганда телефонуңузду жүзүңүзгө жакын алып келип ачып алышы ыктымал.\n\nТелефонуңуздун кулпусун сизге аябай окшош адам (мисалы, эгизиңиз) ачып алышы мүмкүн."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"\"Жүзүнөн таануу\" функциясы аркылуу түзмөгүңүздүн кулпусун ачып, колдонмолорго кирип жана төлөмдөрдү ырастай аласыз.\n\nКөңүл буруңуз:\nЭкранды карап койсоңуз эле, түзмөгүңүздүн кулпусу ачылып калышы мүмкүн.\n\nОшондой эле кимдир бирөө көзүңүз жумулуп турганда да, телефонуңузду жүзүңүзгө жакын алып келип ачып алышы ыктымал.\n\nТелефонуңуздун кулпусун сизге аябай окшош (мисалы, эгизиңиз) адам ачып алышы мүмкүн."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Жүзүнөн таанып ачуу функциясы менен түзмөгүңүздүн кулпусун ачып, колдонмолорго кирип, төлөмдөрдү ырастаңыз."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Көңүл буруңуз:\nЭкранды карап койсоңуз эле, түзмөгүңүздүн кулпусу ачылып калышы мүмкүн.\n\nОшондой эле кимдир бирөө көзүңүз ачылып турганда, телефонуңузду жүзүңүзгө жакын алып келип, ачып алышы ыктымал.\n\nТелефонуңуздун кулпусун сизге аябай окшош адам (мисалы, эгизиңиз) ачып алышы мүмкүн."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Көңүл буруңуз:\nЭкранды карап койсоңуз эле, түзмөгүңүздүн кулпусу ачылып калышы мүмкүн.\n\nОшондой эле кимдир бирөө көзүңүз жабылып турса да, телефонуңузду жүзүңүзгө жакын алып келип, ачып алышы ыктымал.\n\nТелефонуңуздун кулпусун сизге аябай окшош адам (мисалы, эгизиңиз) ачып алышы мүмкүн."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Жүзүңүздү таануу дайындарын өчүрөсүзбү?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Адамды жүзүнөн таануу үчүн колдонулган дайын-даректер биротоло өчүрүлөт. Өчүрүлгөндөн кийин, телефонуңуздун кулпусун ачып, колдонмолорго кирип жана төлөмдөрдү ырастоо үчүн, PIN код, графикалык ачкыч же сырсөз суралат."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Телефонуңузду Жүзүнөн таануу функциясы менен ачыңыз"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Манжаңыздын изи менен, телефонуңуздун кулпусун ачып, ар кандай нерселерди сатып ала аласыз.\n\nЭскертүү: Бул түзмөктүн кулпусун манжаңыздын изи менен ачууга болбойт. Кененирээк маалымат алгыңыз келсе, ишканаңыздын администраторуна кайрылыңыз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Манжаңыздын изи менен, телефонуңуздун кулпусун ачып, ар кандай нерселерди сатып ала аласыз.\n\nЭскертүү: Түзмөгүңүздү манжа изи менен коргоого караганда, графикалык ачкыч же PIN код менен коргоо бир кыйла коопсуз."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Жокко чыгаруу"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Жок, рахмат"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Улантуу"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Өткөрүп жиберүү"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Кийинки"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Планшетиңизди экранды бөгөттөө опциясы менен коргосоңуз, ал жоголуп же уурдалып кетсе, эч ким аны колдоно албай калат. Ошондой эле, жүзүнөн таанууну жөндөө үчүн да экранды бөгөттөө функциясы керек болот. Артка кайтуу үчүн, \"Жокко чыгарууну\" таптаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Түзмөгүңүздү экранды бөгөттөө опциясы менен коргосоңуз, ал жоголуп же уурдалып кетсе, эч ким аны колдоно албай калат. Ошондой эле, жүзүнөн таанууну жөндөө үчүн да экранды бөгөттөө функциясы керек болот. Артка кайтуу үчүн, \"Жокко чыгарууну\" таптаңыз."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Жүзүнөн таанып ачууну жөндөө үчүн, телефондун экранын кулпулоону иштетүү керек. Ушуну менен, телефонуңуз жоголуп же бирөө уурдап кетсе, анын ичиндегилерди эч ким көрө албай калат. Артка кайтуу үчүн, \"Жок\" дегенди басыңыз."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Планшетиңизди экранды кулпулоо параметри менен коргосоңуз, ал жоголуп же уурдалып кетсе, аны эч ким колдоно албайт. Биометриканы жөндөө үчүн да, экранды кулпулоо параметрин колдонушуңуз керек. Артка кайтуу үчүн \"Жок\" дегенди таптаңыз."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Түзмөгүңүздү экранды кулпулоо параметри менен коргосоңуз, ал жоголуп же уурдалып кетсе, аны эч ким колдоно албайт. Биометриканы жөндөө үчүн да, экранды кулпулоо параметрин колдонушуңуз керек. Артка кайтуу үчүн \"Жок\" дегенди таптаңыз."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Телефонуңузду экранды кулпулоо параметри менен коргосоңуз, ал жоголуп же уурдалып кетсе, аны эч ким колдоно албайт. Биометриканы жөндөө үчүн да, экранды кулпулоо параметрин колдонушуңуз керек. Артка кайтуу үчүн \"Жок\" дегенди таптаңыз."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN кодду жөндөөнү өткөрүп жибересизби?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Сырсөздү жөндөөнү өткөрүп жибересизби?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Графикалык ачкычты жөндөөнү өткөрүп жибересизби?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул планшетти сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул түзмөктү сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Түзмөктү коргоо функциялары жандырылганда, башкалар бул телефонду сиздин уруксатыңызсыз пайдалана албай калышат. Колдонгуңуз келген экран кулпусун тандаңыз."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Экранды кулпулоонун көмөкчү ыкмасын тандаңыз"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Экранды кулпулоонун көмөкчү ыкмасын тандаңыз"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Экранды кулпулоонун көмөкчү ыкмасын тандаңыз"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Экранды кулпулоо параметрлери"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Экранды кулпулоо параметрлери"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Экранды кулпулоо"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Жүзүнөн таануу + Сырсөз"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Жүзүнөн таануу функциясыз уланта берүү"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Телефонуңуздун кулпусун жүзүңүздү көрсөтүп ачсаңыз болот. Коопсуздук максатында кулпуну ачуунун дагы бир ыкмасын тандап коюңуз."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрика + Графикалык ачкыч"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрика + PIN код"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрика + Сырсөз"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Биометрикасыз улантуу"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Телефонуңуздун кулпусун биометрикаңыз менен ача аласыз. Коопсуздук максатында, кулпуну ачуунун дагы бир ыкмасын тандап коюңуз."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Администратор же башка эрежелер б-ча тыюу салынган"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Жок"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Экранды сүрүү"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> сандан ашпашы керек</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Түзмөктүн администратору акыркы PIN кодду колдонууга тыюу салган"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Жөнөкөй PIN-коддорду коюу IT администраторуңуз тарабынан бөгөттөлгөн. Татаалыраак PIN-кодду коюп көрүңүз."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Бул жерде жараксыз белги камтылбашы керек"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Кеминде бир тамга болушу керек"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Кеминде бир сан болушу керек"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Тамгадан башка кеминде 1 сандык эмес символ болушу керек</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Түзмөктүн администратору акыркы сырсөздү колдонууга тыюу салган"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Жөнөкөй сырсөздөрү коюу IT администраторуңуз тарабынан бөгөттөлгөн. Татаалыраак сырсөздү коюп көрүңүз."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Сандар чоңойгон, кичирейген же кайталанган ыраатта болбошу керек"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Ырастоо"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Жокко чыгаруу"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi\'ды жандыруу"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi\'ды иштетүү"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi\'ды колдонуу"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi тууралоолору"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Зымсыз кошулуу түйүндөрүн орнотуу жана башкаруу"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына кошулуу үчүн, камераны төмөнкү QR кодго алып келиңиз"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wi‑Fi\'га кошулуу үчүн, QR кодун скандаңыз"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi\'ды бөлүшүү"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына туташып, сырсөз менен бөлүшүү үчүн, бул QR кодун скандаңыз"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына кошулуу үчүн башка түзмөктө QR кодун скандаңыз"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"\"<xliff:g id="SSID">%1$s</xliff:g>\" тармагына туташуу үчүн, бул QR кодун скандаңыз"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Кайталап көрүңүз. Эгер маселе чечилбесе, түзмөктү өндүрүүчүгө кайрылыңыз"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Бир жерден ката кетти"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi сырсөзү: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Байланыш түйүнүнүн сырсөзү: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Авто-туташуу"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Ушул тармакка жакын жерде автоматтык түрдө туташууга уруксат берүү"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Планшетке ушул тармакка автоматтык түрдө туташууга уруксат берүү"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Тейлөө аймагына келгенде, бул тармакка туташууга уруксат берүү"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Түзмөк кошуу"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Түзмөктү бул тармакка кошуу үчүн, QR кодун колдонуңуз"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR кодунун форматы жараксыз"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Тутумдун тастыктамаларын көрсөтүү"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Берилбесин"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Текшерилбесин"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Эч тастыктама көрсөтүлгөн жок. Туташууңуз купуя болбойт."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Тармактын аталышы өтө узун."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Домен көрсөтүлүшү керек."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Тастыктама талап кылынат."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Туташуу"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi күйгүзүлдү"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> менен туташты"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> менен туташууда"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Туташууда…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Түйүндгө байланышкан жок"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Тармак тейлөө аймагында эмес"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Түзмөктүн MAC дареги"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Туш келди MAC дареги"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Башаламан иретте түзүлгөн MAC дареги (акыркы)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP дарек"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Тармактын чоо-жайы"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Көмөкчү тармактын маскасы"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 даректери"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Сакталган тармактар"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Жазылуулар"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Башка тармактар"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP жөндөөлөрү"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Бул колдонуучу үчүн Wi‑Fi өздөштүрүлгөн жөндөөлөрү жеткиликсиз"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Сактоо"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Жарактуу шлюз дарегин териңиз."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Жарактуу DNS дарегин териңиз."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Тармактын префикси 0дөн 32ге чейин болушу керек."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (Купуя DNS тарабынан өзгөртүлбөсө)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (Купуя DNS тарабынан өзгөртүлбөсө)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Тармак префиксинин узуну"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Колдонмо мазмунду бөлүшүүдө. Интернет байланышын бөлүшүү үчүн байланыш түйүнүн өчүрүп, кайра күйгүзүңүз"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Бир да сырсөз коюлган жок"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Байланыш түйүнүнүн аталышы"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> күйгүзүлүүдө…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> күйгүзүлүүдө…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Башка түзмөктөр <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> тармагына туташа алышат"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Байланыш түйүнүнүн сырсөзү"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Wi-Fi жыштыктарынын диапазону"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Айрым мазмундар үчүн жаңыртуу ылдамдыгын 60 Герцтен 90 Герцке көтөрөт. Батареянын колдонулушун жогорулатат."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Герц жаңыртуу ылдамдыгын колдонуу"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Сенсордун функциясын жана анимациянын сапатын жакшыртуу үчүн жаңыртуу ылдамдыгы жогорулатылды. Батареянын колдонулушун жогорулатат."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ыңгайлашуучу көшүү режими"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Күйүк / Экранды карап турганда, ал өчүп калбайт"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Экран караңгы болуп турганда жаңы билдирме келсе, ал күйөт"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Убакыт жана маалымат ар дайым көрүнүп турсун"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Батарея тез отуруп калат"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Жоон текст"</string>
     <string name="title_font_size" msgid="570613010306330622">"Арип өлчөмү"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Текстти чоңойтуп же кичирейтесиз"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM картаны кулпулоо жөндөөлөрү"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android версиясы"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android\'дин коопсуздукту жаңыртуусу"</string>
     <string name="model_info" msgid="8997566254717810904">"Үлгүсү"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Үлгүсү: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Түзмөктүн үлгүсү/аппараттык камсыздалышы"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Аппараттык камсыздоонун версиясы"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Жабдуунун ID\'си"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN жок кылуу"</string>
     <string name="menu_new" msgid="6571230342655509006">"Жаңы APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Сактоо"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Сакталбасын"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Жокко чыгаруу"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Аталыш сабы бош болбошу керек."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN бош болбошу керек."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Колдонмону баштапкы абалга келтирүүгө болот"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi\'ды, мобилдик түзмөктү жана Bluetooth\'ду баштапкы абалга келтирүү"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Ушуну менен тармактын бардык жөндөөлөрү баштапкы абалга келет. Тактап айтканда: \n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилдик Интернет"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Тазалоо"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Жүктөп алган SIM’дерди өчүрүү"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Ордуна башка SIM карта жүктөп алуу үчүн, операторуңуз менен байланышыңыз. Тарифтик пландарыңыз өзгөрбөйт."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Тарифтик пландарыңыз өзгөрбөйт. Башка SIM-карталарды жүктөп алуу үчүн байланыш операторуна кайрылыңыз."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Жөндөөлөрдү кайра коюу"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Тармак жөндөөлөрүн баштапкы абалга келтирсеңиз, аларды артка кайтара албайсыз. Уланта бересизби?"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Тармак жөндөөлөрүнүн баарын баштапкы абалга келтирип, жүктөлүп алынган SIM карталарды өчүрөсүзбү? Бул аракетти артка кайтара албайсыз."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Тармак жөндөөлөрү баштапкы абалга келди"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM карталар тазаланбай жатат"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Жүктөлүп алынган SIM карталарды катадан улам тазалоого болбойт.\n\nТүзмөгүңүздү өчүрүп күйгүзүп, кайталап көрүңүз."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Бардык дайын-даректерди тазалоо (баштапкы абалга келтирүү)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Бардык дайын-даректерди тазалоо"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Планшетиңиздин "<b>"ички сактагычындагы"</b>" бардык маалымат өчүрүлөт, тактап айтканда:\n\n"<li>"Google аккаунтуңуз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Телефонуңуздун "<b>"ички сактагычындагы"</b>" бардык маалымат өчүрүлөт, тактап айтканда:\n\n"<li>"Google аккаунтуңуз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Ушул түзмөктөгү аккаунттар:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Бул түзмөктө башка колдонуучулар бар.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Музыка"</li>\n<li>"Сүрөттөр"</li>\n<li>"Башка колдонуучу дайындары"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-карталар"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Байланыш операторуңуздун кызматын пайдалана бересиз."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Музыканы, сүрөттөрдү, жана башка колдонуучу берилиштерин өчүрүш үчүн, "<b>"USB сактагычты"</b>" тазалаш керек."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Музыканы, сүрөттөрдү, жана башка колдонуучу берилиштерин өчүрүш үчүн, "<b>"SD-картаны"</b>" тазалаш керек."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Бардык дайындарды өчүрүү (демейки жөндөөлөргө кайтаруу)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Бардык дайындарды өчүрүү (демейки жөндөөлөргө кайтаруу)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Планшетиңиздин "<b>"ички сактагычындагы"</b>" бардык маалымат өчүрүлөт, тактап айтканда:\n\n"<li>"Google аккаунтуңуз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Телефонуңуздун "<b>"ички сактагычындагы"</b>" бардык маалымат өчүрүлөт, тактап айтканда:\n\n"<li>"Google аккаунтуңуз"</li>\n<li>"Тутумдун жана колдонмолордун жөндөөлөрү жана дайындары"</li>\n<li>"Жүктөлүп алынган колдонмолор"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Учурда төмөнкү аккаунттарга кирип турасыз:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Бул түзмөктө башка колдонуучулар бар.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Музыка"</li>\n<li>"Сүрөттөр"</li>\n<li>"Колдонуучунун башка дайындары"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-карталар"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Байланыш операторуңуздун кызматын пайдалана бересиз."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Музыканы, сүрөттөрдү, жана колдонуучунун башка дайындарын өчүрүү үчүн, "<b>"USB эстутумун"</b>" тазалоо керек."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Музыканы, сүрөттөрдү, жана колдонуучунун башка дайындарын өчүрүү үчүн, "<b>"SD-картаны"</b>" тазалоо керек."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB сактагычты тазалоо"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD картаны тазалоо"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ички USB сактагычтагы музыка же сүрөттөр сыяктуу бардык берилиштерди тазалоо"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD-картадагы музыка же сүрөттөр сыяктуу бардык берилиштерди тазалоо"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Бардык маалыматты өчүрүү"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Бардык маалыматты өчүрүү"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Бардык жеке маалыматыңыз жана жүктөлүп алынган колдонмолор өчүрүлөт. Бул аракетти артка кайтара албайсыз."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Бардык жеке маалыматыңыз, анын ичинде жүктөлүп алынган колдонмолор жана SIM карталар өчүрүлөт. Бул аракетти артка кайтара албайсыз."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Баарын тазалоо"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Тазалоо аткарылган жок, анткени System Clear кызматы жеткиликсиз."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Бардык дайындар тазалансынбы?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Бул колдонуучу демейки абалга келтире албайт"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Өчүрүүдө"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Күтө туруңуз…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Бардык дайындарды тазалоо"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Бардык дайындарды тазалоо"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Бардык жеке маалыматыңыз жана жүктөлүп алынган колдонмолор өчүрүлөт. Бул аракетти артка кайтара албайсыз."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Бардык жеке маалыматыңыз, анын ичинде жүктөлүп алынган колдонмолор жана SIM карталар жок кылынат. Бул аракетти артка кайтара албайсыз."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Бардык дайындар тазалансынбы?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Бул колдонуучунун демейки жөндөөлөргө кайтарууга уруксаты жок"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Өчүрүлүүдө"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Күтө туруңуз…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Чалуу жөндөөлөрү"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Үн почтасы, чалууну багыттоо, чалууну кармоо, номурду аныктоону жөндөө"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB модем"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ашык түзмөк менен интернет бөлүшүү болбойт."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> жалгашуудан бошотулат."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet модем режими"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Телефондогу Интернетти Ethernet USB аркылуу бөлүшөсүз"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Телефондогу Интернетти Ethernet аркылуу бөлүшөсүз"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Башка түзмөктөрдү мобилдик Интернетке туташтыруу үчүн байланыш түйүнүн же модем режимин колдонуңуз. Колдонмолор да жакын жердеги түзмөктөр менен мазмун бөлүшүү үчүн байланыш түйүнүн түзө алышат."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Башка түзмөктөрдү Wi‑Fi же мобилдик Интернетке туташтыруу үчүн байланыш түйүнүн же модем режимин колдонуңуз. Ошондой эле, колдонмолор жакын жердеги түзмөктөр менен кандайдыр бир нерселерди бөлүшүү үчүн, байланыш түйүндөрүн түзө алышат."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Жардам"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth түзмөктөрүн издөө"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth өчүп турса да, колдонмолор менен кызматтарга жакын жердеги түзмөктөрдү издегенге уруксат бересиз. Бул параметр менен жайгашкан жерди тагыраак аныктоого болот."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Жумуш үчүн Жайгашкан жерди аныктоо кызматтары"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Убакыт алкагын жайгашкан жер аркылуу аныктоо"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Убакыт алкагын жайгашкан жер аркылуу аныктоо"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Түзмөктүн жайгашкан жери учурдагы убакыт алкагын аныктоо үчүн колдонулат. Жайгашкан жерди аныктоонун башка жөндөөлөрү, мисалы, Wi-Fi тармактарын издөө жайгашкан жерди аныктоого таасирин тийгизиши мүмкүн."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Күйүк"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Өчүк"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Убакыт алкагын автоматтык түрдө аныктоо өчүрүлгөн"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Убакыт алкагын жайгашкан жер аркылуу аныктоо өчүрүлгөн"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Убакыт алкагын жайгашкан жер аркылуу аныктоо колдоого алынбайт"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Убакыт алкагын жайгашкан жер аркылуу аныктоо жөндөөлөрүн өзгөртүүгө болбойт"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi ж-а мобилдик жайгаштыруу"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Колдонмолорго Google жайгаштыруу м-н ордуңузду тактоого жол берүү. Жайгашуу берилиштери аноним. чогултулат ж-а Google\'га берилет."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Жайгашуу Wi‑Fi аркылуу аныкталды"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Сырсөздү коюңуз"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Графикалык ачкычты коюңуз"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Функцияны колдонуу үчүн PIN код коюңуз"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Биометрика менен кошо сырсөздү коюңуз"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Биометрика менен кошо графикалык ачкычты коюңуз"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Биометрика менен кошо PIN кодду коюңуз"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Сырсөзүңүздү унутуп койдуңузбу?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Графикалык ачкычты унутуп койдуңузбу?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN кодуңузду унутуп койдуңузбу?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Коштомо жазуулардын жөндөөлөрү"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Чоңойтуу"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Чоңойтуу аймагы"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Чоңойтууну иштетүү"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Экранды чоңойтуп жатканда чоңойтула турган аймакты(тарды) тандаңыз"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Толук экран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Экрандын бир бөлүгү"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Толук экран жана экранды бир бөлүгү"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Толук экранды чоңойтуу"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Экрандын бир бөлүгүн чоңойтуу"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Атайын мүмкүнчүлүктөр баскычына которуласызбы?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Экранды чоңойтуу үчүн үч жолу басканда терүү же башка аракеттер кечигүү менен аткарылат.\n\nЭкранды чоңойтуу үчүн атайын мүмкүнчүлүктөр баскычын колдоносузбу?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Атайын мүмкүнчүлүктөр баскычына которулуу"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Чоңойтуу үчүн үч жолуу басуу аракетин колдонуу"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Чоңойтуу жөндөөлөрү"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Үч жолу таптап чоңойтуу"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ыкчам баскыч менен чоңойтуу"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Чалууну кубат баскычы бүтүрөт"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Чычкандын чоң көрсөткүчү"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Анимацияларды алып салуу"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Моно аудио"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Аудио ойнотулуп жатканда каналдар биригет"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Аудионун балансы"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Сол"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Оң"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Моно аудио"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Аудио ойнотулуп жатканда каналдар биригет"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Аудионун балансы"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Сол"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Оң"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Демейки"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Билдирменин дирилдөөсү"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Шыңгырдын дирилдөөсү"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Басып жооп берүү"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> колдонмосун пайдалануу"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ачуу"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Түсүн тууралоону иштетүү"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Коштомо жазууларды көрсөтүү"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Колдоого алынган колдонмолордо гана"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> колдонмосун пайдалануу"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> колдонмосун ачуу"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Түстөрдү тууралоону колдонуу"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Коштомо жазууларды көрсөтүү"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Колдоого алынган колдонмолордо гана"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Коштомо жазуунун өлчөмү жана стили"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Текст өлчөмү: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Көбүрөөк параметр"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дейтераномалия"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалия"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалия"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Боз"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Кызыл-жашыл"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Кызыл-жашыл"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Көк-сары"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Фондо керектелишин чектөө"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Колдонмо фондо аткарылсын"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Колдонмону фондо иштетүүгө уруксат жок"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Фондо колдонуу чектелбейт"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Фондо колдонуу чектелбейт"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Фондогу аракеттери чектелсинби?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Колдонмонун фондогу аракеттери чектелсе, ал туура эмес иштеп калышы мүмкүн"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Бул колдонмодо батареянын үнөмдөлүшү жөндөлбөгөндүктөн, аны чектөөгө болбойт.\n\nКолдонмону чектөө үчүн, адегенде Батареяны үнөмдөө режимин күйгүзүңүз."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Планшет адаттагыдан көбүрөөк колдонулду"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Түзмөк адаттагыдан көбүрөөк колдонулду"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Батарея эртерээк отуруп калышы мүмкүн"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Батареянын кубатын үнөмдөө иштетилди"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Батареяны колдонуу убактылуу чектелген. Кененирээк маалымат алуу үчүн таптап коюңуз."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Телефонуңузду адаттагыдан көбүрөөк колдонуп жатасыз. Ушундан улам батареяңыз тез отуруп калышы мүмкүн.\n\nБатареяны эң көп пайдаланган колдонмолор:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Планшетиңизди адаттагыдан көбүрөөк колдонуп жатасыз. Ушундан улам батареяңыз тез отуруп калышы мүмкүн.\n\nБатареяны эң көп пайдаланган колдонмолор:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Түзмөгүңүздү адаттагыдан көбүрөөк колдонуп жатасыз. Ушундан улам батареяңыз тез отуруп калышы мүмкүн.\n\nБатареяны эң көп пайдаланган колдонмолор:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d колдонмо чектелген</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Батареяңыздын кубаты аныкталбай жатат"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Батареяңыздын кубаты аныкталбай жатат. "<annotation id="url">"Кеңири маалымат алуу"</annotation>" үчүн таптап коюңуз"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Колдонмону токтотосузбу?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу телефонуңузга көшүү режимине өткөнгө мүмкүнчүлүк бербей жаткандыктан, анын батареясы тез отуруп калып жатат.\n\nМаселени чечүү үчүн колдонмону мажбурлап токтотуп коюңуз.\n\nЭгер көйгөй кайталана берсе, колдонмону телефондон чыгарып салууга туура келет."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> колдонмосу планшетиңизге көшүү режимине өткөнгө мүмкүнчүлүк бербей жаткандыктан, анын батареясы тез отуруп калып жатат.\n\nМаселени чечүү үчүн колдонмону мажбурлап токтотуп коюңуз.\n\nЭгер көйгөй кайталана берсе, колдонмону планшеттен чыгарып салууга туура келет."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Пландаштыруу"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Батареяны үнөмдөө"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Кубатталганда өчүрүү"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Телефон <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Планшет <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Түзмөк <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Телефон <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Планшет <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Түзмөк <xliff:g id="PERCENT">%1$s</xliff:g> жеткенде, батареяны үнөмдөгүч өчүп калат"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Күйгүзүү"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Баштапкы абалга келтирүү"</string>
     <string name="tts_play" msgid="2945513377250757221">"Угуу"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Ыңгайлаштырылган туташуу"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Батареянын кубатынын мөөнөтүн узартып, түзмөктүн майнаптуулугун тармактык туташууларды автоматтык түрдө башкаруу жолу менен жакшыртат."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Каттоо маалыматы сакталган жер"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Тастыктаманы орнотуу"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Тастыктамалар сактагычтан орнотулат"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Колдонуучунун каттоо маалыматы"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Сакталган эсептик дайын-даректерди көрүп/өзгөртө аласыз"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Өркүндөтүлгөн"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Сактагычтын түрү"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппараттык негизде"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Програмдык гана"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Бул колдонуучу далдаштырма дайындарын колдоно албайт"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN жана колдонмолор үчүн орнотулган"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi үчүн орнотулган"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Орнотулбасын"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Баары бир орнотулсун"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Тастыктама орнотулган жок"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g> колдонмосуна ушул түзмөккө тастыктамаларды орнотууга уруксат берилсинби?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Бул тастыктамалар төмөндөгү колдонмолор менен URL даректеринде өздүгүңүздү аныктайт"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Уруксат берилбесин"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Уруксат берүү"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Көбүрөөк көрсөтүү"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Тастыктама башкаруу колдонмосу"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Жок"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Бул колдонмо орноткон тастыктамалар төмөндөгү колдонмолор менен URL даректеринде өздүгүңүздү аныктайт"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Өчүрүү"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Шашылыш чалуу сигналы"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Шашылыш чалуу аткарылганда көрүлчү аракетти коюу"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Камдык көчүрмөнү сактоо"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Коюлган эмес – Жумуш профили"</string>
     <string name="user_admin" msgid="4024553191395768119">"Админ"</string>
     <string name="user_you" msgid="3070562015202859996">"Сиз (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Каймана аты"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> чейин колдонуучу кошсоңуз болот"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Планшеттин ээси гана колдонуучуларды башкара алат."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Телефондун ээси гана колдонуучуларды башкара алат."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Терминалдан акы төлөө"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Төлөм колдонмосун жөндөп туруп, телефондун арткы бетин тийбей төлөө белгиси түшүрүлгөн терминалга жакындатыңыз."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Түшүндүм"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Дагы…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Дагы…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Демейки төлөм колдонмосун коюу"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Демейки төлөм колдонмосун жаңыртуу"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Тийбей төлөө терминалында <xliff:g id="APP">%1$s</xliff:g> менен төлөңүз"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Артка"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Кийинки"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Аяктоо"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Сүрөткө тартуу"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Сүрөт тандоо"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Сүрөт тандаңыз"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM карталар"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM карталар"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Бул нерсе дайым чалуулр үчүн колдонулсн"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Дайындар үчүн SIM тандаңыз"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS жөнөтүү үчүн SIM картаны тандаңыз"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Дайындар SIM\'и которулууда, бул бир мүнөткө чейин созулушу мүмкүн…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Интернетти колдонуу үчүн SIM карта которулууда, бул бир мүнөткө чейин созулушу мүмкүн…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Төмөнкү менен чалуу"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM карта тандаңыз"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"тартип, ырааттама, батареяны үнөмдөгүч режими, батареяны үнөмдөгүч, батаеря, автоматтык түрдө, пайыз"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, өркүндөтүлгөн чалуу, 4g чалуу"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"тил кошуу, тил кошуу"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"текст өлчөмү"</string>
     <string name="default_sound" msgid="6604374495015245195">"Демейки үн"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Шыңгырлар менен билдирмелердин үнүнүн катуулугу <xliff:g id="PERCENTAGE">%1$s</xliff:g> коюлду"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Үн деңгээли, дирилдөө, \"Тынчымды алба\" режими"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Түзмөк күйгүзүлгөндөгү үндөр"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Ыкчам коштомо жазуулар"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Автоматтык коштомо жазуулар"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Жок"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> график коюлду</item>
-      <item quantity="one">1 график коюлду</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Жок}=1{1 график коюлду}other{# график коюлду}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Тынчымды алба"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Маанилүү байланыштар менен колдонмолордон гана билдирмелерди алуу"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Билдирмелерди чектөө"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Шашылыш билдирүүлөр гана"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Күйүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Өчүк / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Өчүк"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Күйүк"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Ар дайым суралсын"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Бул функция өчүрүлгөнгө чейин"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> саат</item>
-      <item quantity="one">1 саат</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> мүнөт"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ырааттама автоматтык түрдө иштетилет</item>
-      <item quantity="one">1 ырааттама автоматтык түрдө иштетилет</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 саат}other{# саат}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 мүнөт}other{# мүнөт}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Өчүк}=1{Өчүк / 1 ырааттама автоматтык түрдө иштетилет}other{Өчүк / # ырааттама автоматтык түрдө иштетилет}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\"Тынчымды алба\" режимин эмне үзгүлтүккө учуратышы мүмкүн"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Байланыштар"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Колдонмолор"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Маанилүү эмес билдирмелерге үнсүз режим автоматтык түрдө коюлат"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Ыңгайлаштырылуучу билдирменин ирети"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Билдирмелерди ылайыктуулугу боюнча автоматтык түрдө иреттөө"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Ыңгайлаштырылуучу билдирмелер жөнүндө пикир билдирүү"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Билдирмелерге киргизилген тууралоолорду жана тутумга пикир билдирүү опциясын көрсөтүү"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Маанилүүлүк жөндөөлөрүн баштапкы абалга келтирүү"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Колдонуучу өзгөрткөн маанилүүлүк жөндөөлөрүн баштапкы абалга келтирип, билдирмелер жардамчысына маанилүүлөрдү аныктоого уруксат бересиз"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Сунушталган аракеттер жана жооптор"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Сунушталган аракеттер менен жооптор автоматтык түрдө көрүнөт"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Акыркы жана тындырылган билдирмелер көрүнөт"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Маанилүү жазышуулар"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Жазышуу бөлүмүнүн үстүндө жана калкып чыкма билдирмелер түрүндө көрүнөт"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Жазышуулар тизмесинин үстүндө көрүнөт"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Башка жазышуулар"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Маанилүү эмес жазышуулар"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Өзгөрүү киргизилген жазышуулар"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Акыркы жазышуулар"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Акыркыларды тазалоо"</string>
+    <string name="clear" msgid="5092178335409471100">"Тазалоо"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Маанилүү жазышууларды калкып чыкма билдирмелерде көрсөтүү"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Маанилүү жазышуулар билдирмелер тактасынын жогору жагында көрүнөт. Ошондой эле аларды калкып чыкма билдирмелер түрүнө \"Тынчымды алба\" режиминде көрсөтүлгөндөй кылып жөндөй аласыз."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Маанилүү жана өзгөртүлгөн жазышуулар бул жерде көрүнөт"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"Тынчымды алба\" функциясы"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\"Тынчымды алба\" режимине уруксат берүү"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Орнотулган колдонмолор үчүн \"Тынчымды алба\" функциясы талап кылынбайт"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Колдонмолор жүктөлүүдө…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Колдонмолор жүктөлүүдө…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Өтүнүчүңүз боюнча Android бул колдонмонун билдирмелерин бул түзмөктө көрсөтпөй, жашырып жатат"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Суранычыңыз боюнча Android ушул категориядагы билдирмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Суранычыңыз боюнча Android ушул категориядагы билдирмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Бардык жазышуулар"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Маанилүү жазышуулар"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Эч бири"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> жазышуу</item>
-      <item quantity="one">1 жазышуу</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Эч бири"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Жок}=1{1 жазышуу}other{# жазышуу}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"\"Тынчымды алба\" режими таасир этпеген колдонуучулар"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Чалуулар"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Чалуулар"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Маанилүү чалууларды өткөрүп жибербөө үчүн, түзмөгүңүздүн үнүн чыгарып коюңуз."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Кирүүчү чалуулар \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" эрежеси менен бөгөттөлгөн. Достордун, үй-бүлө мүчөлөрүнүн же башка тааныштарыңыздын чалууларын кабыл алуу үчүн жөндөөлөрдү тууралап алыңыз."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Жылдызчаланган байланыштар"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Башка <xliff:g id="NUM_PEOPLE">%d</xliff:g> байланыш</item>
-      <item quantity="one">Башка 1 байланыш</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Жок"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Жок}=1{{contact_1}}=2{{contact_1} жана {contact_2}}=3{{contact_1}, {contact_2} жана {contact_3}}other{{contact_1}, {contact_2} жана дагы #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Аты жок)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Билдирүүлөр"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"билдирүүлөр"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Билдирүүлөр"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" эрежеси иштетилгенде, билдирүүлөр алынбайт. Достордун, үй-бүлө мүчөлөрүнүн же башка тааныштарыңыздын билдирүүлөрүн алуу үчүн жөндөөлөрдү тууралап алыңыз."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"\"Тынчымды алба\" режими айрым билдирүүлөр үчүн иштебейт"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"\"Тынчымды алба\" режими айрым чалуулар үчүн иштебейт"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Жок"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> байланыш</item>
-      <item quantity="one">1 байланыш</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Жок}=1{1 байланыш}other{# байланыш}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Баары"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Байланыштар"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Жылдызчаланган байланыштар"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Бардык билдирмелер"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Айрым билдирмелер"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Колдонмолор үчүн \"Тынчымды алба\" режими иштетилген болсо да, тандалган адамдар сиз менен баары бир байланыша беришет."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> үзгүлтүккө учуратышы мүмкүн</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> үзгүлтүккө учуратышы мүмкүн</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Дагы <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Бир да колдонмо үзгүлтүккө учурата албайт}=1{{app_1} үзгүлтүккө учурата алат}=2{{app_1} жана {app_2} үзгүлтүккө учурата алат}=3{{app_1}, {app_2} жана {app_3} үзгүлтүккө учурата алат}other{{app_1}, {app_2} жана дагы # үзгүлтүккө учурата алат}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Колдонмолор"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Бардык билдирмелер"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Айрым билдирмелер"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"\"Тынчымды алба\" режими таасир этпеген билдирмелер"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Бардык билдирмелерге уруксат берүү"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> үзгүлтүккө учуратышы мүмкүн</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> үзгүлтүккө учуратышы мүмкүн</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Эч нерсе үзгүлтүккө учурата албайт"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Дагы <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Эч нерсе үзгүлтүккө учурата албайт}=1{{sound_category_1} үзгүлтүккө учурата алат}=2{{sound_category_1} жана {sound_category_2} үзгүлтүккө учурата алат}=3{{sound_category_1}, {sound_category_2} жана {sound_category_3} үзгүлтүккө учурата алат}other{{sound_category_1}, {sound_category_2} жана дагы # үзгүлтүккө учурата алат}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Эч нерсе үзгүлтүккө учурата албайт"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Эч ким үзгүлтүккө учурата албайт"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Айрым байланыштар үзгүлтүккө учуратышы мүмкүн"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Бардык байланыштар үзгүлтүккө учуратышы мүмкүн"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Күйүк"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Өчүк"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Колдонмону кадап коюу"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Бул функция белгилүү бир колдонмонун экранын кадап, телефондогу калган программаларды жаап коет. Анын жардамы менен, досуңузга телефонуңуздагы оюнду ойноого мүмкүнчүлүк бере аласыз. \n\nКадалган колдонмо башка колдонмолорду ачып, жеке маалыматты көрө алат. \n\nБул функцияны колдонуу үчүн,: \n1. Аны жөндөөлөрдөн иштетиңиз. \n2. \"Серептөөнү\" басыңыз. \n3. Экрандын өйдө жагындагы колдонмонун сүрөтчөсүн басып, \"Кадоо\" дегенди тандаңыз."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Бул функция белгилүү бир колдонмонун экранын кадап, телефондогу калган программаларды жаап коет. Анын жардамы менен, досуңузга телефонуңуздагы оюнду ойноого мүмкүнчүлүк бере аласыз. \n\nКадалган колдонмо башка колдонмолорду ачып, жеке маалыматты көрө алат. \n\nТүзмөгүңүздү башка бирөө менен коопсуз бөлүшкүңүз келсе, конок режимин иштетсеңиз болот. \n\nКолдонмону кадоо үчүн: 	\n1.Аны жөндөөлөрдөн ачыңыз. 	\n2.	\"Серептөөнү\" басыңыз. 	\n3.	Экрандын өйдө жагындагы колдонмонун сүрөтчөсүн басып, \"Кадоо\" дегенди тандаңыз."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Бул функция иштетилгенде түзмөктө бир гана колдонмо ачык болуп турат. Мисалы, бул функциянын жардамы менен ишенген досуңузга белгилүү бир оюнду ойногонго уруксат берсеңиз болот."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Кадалган колдонмо башка колдонмолорду ачып, жеке дайындарга кире алат. \n\nКолдонмону кадап коюну үчүн: 	\n1.	Колдонмону кадап коюну күйгүзүңүз 	\n2.	Жалпы маалыматты ачыңыз 	\n3.	Экрандын жогору жагында жайгашкан колдонмонун сүрөтчөсүн басып, андан кийин Кадап коюну таптаңыз"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Кадалган колдонмо башка колдонмолорду ачып, жеке дайындарга кире алат. \n\nТүзмөгүңүздү башка бирөө менен коопсуз бөлүшкүңүз келсе, конок катары колдонсоңуз болот. \n\nКолдонмону кадап коюну колдонуу үчүн: 	\n1.	Колдонмону кадап коюуну күйгүзүңүз 	\n2.	Назарды ачыңыз 	\n3.	Экрандын жогору жагында жайгашкан колдонмонун сүрөтчөсүн басып, андан кийин Кадап коюну таптаңыз"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Кадалган колдонмо: \n\n•   Жеке маалыматты көрө алат; \n		(байланыштарды жана каттардын мазмунун) \n•   Башка колдонмолорду ача алат. \n\nБул функцияны ишенген адамдарыңыз менен гана пайдаланыңыз."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Бошотуудан мурун графикалык ачкыч суралсын"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Бошотуудан мурун PIN суралсын"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайын-даректерди коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн PIN код коёсузбу?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары графикалык ачкыч менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайын-даректерди коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн графикалык ачкыч коёсузбу?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Түзмөгүңүздү коргоо үчүн аны жүзүңүздү таануу функциясынан тышкары сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайын-даректерди коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн сырсөз коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Түзмөгүңүздү коргоо үчүн аны биометрикаңыз менен кошо PIN код менен да кулпулап койсоңуз болот. Ал иштетилмейинче, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nУшуну менен, түзмөгүңүз жоголуп же уурдалып кетсе андагы маалыматты коргой аласыз. PIN кодду коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Түзмөгүңүздү коргоо үчүн аны биометрикаңыз менен кошо графикалык ачкыч менен да кулпулап койсоңуз болот. Ал иштетилмейинче, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nУшуну менен, түзмөгүңүз жоголуп же уурдалып кетсе андагы маалыматты коргой аласыз. Графикалык ачкычты коёсузбу?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Түзмөгүңүздү коргоо үчүн аны биометрикаңыз менен кошо сырсөз менен да кулпулап койсоңуз болот. Ал иштетилмейинче, чалуулар, билдирүүлөр же билдирмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nУшуну менен, түзмөгүңүз жоголуп же уурдалып кетсе андагы маалыматты коргой аласыз. Сырсөздү коёсузбу?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ооба"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Жок"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Чектелген"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB\'ни көзөмөлдөгөн түзмөк:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Туташкан түзмөк"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ушул түзмөк"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Которулууда..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Которулууда…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Которулбай калды"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Бул түзмөктү кубаттап жатат"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Туташкан түзмөктү кубаттоо"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Мобилдик трафик"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Колдонмолордун трафиги"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi трафиги"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Дайын-даректердин өткөрүлүшү (байланыш операторунан тышкары)"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet дайындарынын колдонулушу"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi‑Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 чектөө</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Байланыш операторунун статистикасы түзмөгүңүздүн статистикасынан айырмаланышы мүмкүн."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Байланыш операторунун тармактары колдонгон дайын-даректерден тышкары"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> колдонулду"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Трафик тууралуу эскертүү"</string>
     <string name="data_warning" msgid="2925054658166062884">"Эскертүүлөр"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Кеңири маалымат"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Трафикти үнөмдөө"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Чексиз трафик"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Фондук дайындар өчүрүлгөн"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Фондогу дайындарды колдонуу өчүрүлдү"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Күйүк"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Өчүк"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Трафикти үнөмдөө режимин иштетүү"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Түзмөк кулпуланып турса, эскертмелерде жооптор жана башка тексттер жазылбасын"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Демейки орфография текшергич"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Орфографияны текшергич тандаңыз"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Орфографияны текшергичти колдонуу"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Орфография текшергичин колдонуу"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Тандалган жок"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(эч бири)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Орун бошотуу үчүн сактагычты көзөмөлдөгүч камдык көчүрмөсү сакталган сүрөттөр менен видеолорду жок кылат."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Сүрөттөрдү жана видеолорду алып салуу"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Сактагычты көзөмөлдөгүч"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Сактагычты көзөмөлдөгүчтү колдонуу"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Сактагычты башкаргыч куралын колдонуу"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автоматтык"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Кол менен"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Орун бошотуу"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Убакытты жана билдирмелерди текшерүү үчүн, эки жолу басуу"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Планшетти текшерүү үчүн, эки жолу таптаңыз"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Түзмөктү текшерүү үчүн, эки жолу таптаңыз"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Билдирмелер үчүн сүрүү"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Билдирмелериңизди көрсөтүү үчүн, экрандын ылдый жагынан төмөн көздөй сүрүңүз"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Бир кол режими"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Бир кол режимин колдонуу"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Колдонмолор которуштурулганда чыгуу"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Таймаут"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунд"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"бир кол менен колдонуу"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн, экраныңызды эки жолу таптаңыз."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Билдирмелерди текшерүү үчүн, телефонду көтөрүү"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Планшетти текшерүү үчүн, көтөрүңүз"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Планшетти текшерүү үчүн, басып коюу"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Түзмөктү текшерүү үчүн, басып коюу"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Убакытты, билдирмелерди жана башка маалыматты көрүү үчүн, экранды таптап коюңуз."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Шашылыш SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"SOS аракеттерин колдонуу"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> башкарат"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Төмөндөгү аракеттерди иштетүү үчүн түзмөктү күйгүзүү/өчүрүү баскычын кеминде 5 жолу тез-тез басыңыз"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Убакыттын тескери эсебинин сигналын ойнотуу"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Куткаруучу кызматтардан жардам суроодон мурун катуу сигнал чыгат"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Жардам сурап чалуу"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Жардам сурап чалуу номери"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Өзгөртүү үчүн басыңыз"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Кырсыктаганда жардамга келчү кызматтын эмес, башка номерди киргизсеңиз:\n • SOS аракеттерин колдонуу үчүн түзмөгүңүздүн кулпусу ачык болушу керек\n • Чалууңузга жооп берилбей калышы мүмкүн"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Билдирмелерди манжа изинин сенсору менен көрүү"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Манжа изинин сканери"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Билдирмелериңизди текшерүү үчүн, телефондун аркасындагы манжа изинин сенсорун ылдый сүртүп коюңуз"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Көрүнүп турган дайындар топтомунун эң жогорку саны"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Демейки маанилерге кайтаруу"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Иштеп чыгуучунун параметрлерин автотолтуруу жөндөөсү кайра коюлду"</string>
+    <string name="location_category" msgid="3496759112306219062">"Жайгашкан жер"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Абал тилкесинин жайгашкан жеринин индикатору"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Бардык жерлер, ошондой эле байланыш жана тармактарда көрсөтүлөт"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS көрсөткүчтөрүнө толук көз салууну иштетүү"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Иштөө цикли өчүрүлүп, бардык GNSS топторуна жана жыштыктарга көз салынат"</string>
     <string name="device_theme" msgid="5027604586494772471">"Түзмөктүн темасы"</string>
     <string name="default_theme" msgid="4815428567082263639">"Демейки"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Тармактын аталышы"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Алагды кылбоо үчүн билдирмелерди тындыруу"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Функция жеткиликтүү эмес"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Бул функция телефонуңузду жай иштетип жаткандыктан өчүрүлгөн"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS көрсөткүчтөрүнө толук көз салууну иштетүү"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Иштөө цикли өчүрүлүп, бардык GNSS топторуна жана жыштыктарга көз салынат"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Ката диалогун ар дайым көрсөтүү"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Колдонмо бузулган сайын диалог көрүнөт"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE иштетилген колдонмону тандоо"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Бардык колдонмолор үчүн иштетүү"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Графикалык драйвер тандоо"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Демейки"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Оюн драйвери"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Оюн драйвери"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Иштеп чыгуучунун драйвери"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Тутумдун графикалык драйвери"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Күйүк (үнсүз)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Өчүк"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Тармактын чоо-жайы"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Түзмөгүңүздүн аталышы телефонуңуздагы колдонмолорго көрүнүктүү. Bluetooth түзмөктөрүнө туташканыңызда же Wi‑Fi байланыш түйүнүн жөндөгөнүңүздө, аны башка адамдар да көрүшү мүмкүн."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Түзмөгүңүздүн аталышы телефонуңуздагы колдонмолорго көрүнүп турат. Bluetooth түзмөктөрүнө, Wi‑Fi тармагына туташканыңызда же Wi‑Fi байланыш түйүнүн жөндөгөнүңүздө, аны башка адамдар да көрүшү мүмкүн."</string>
     <string name="devices_title" msgid="649715719278562515">"Түзмөктөр"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Бардык жөндөөлөр"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Сунуштар"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Тармактар табылбай койду. Кайталап көрүңүз."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(тыюу салынган)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM-карта жок"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-карта"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM-карта жок"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Жок"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM-картаны туташтыруу талап кылынат"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM-картасын туташтыруу талап кылынат"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Тандалган тармак режими: WCDMA тандалган"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Тандалган тармак режими: GSM гана"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Тандалган тармак режими: WCDMA гана"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилдик Интернет"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Интернетке мобилдик тармак аркылуу чыгуу"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Тейлөө аймагына келгенде, телефон автоматтык түрдө бул операторго которулат"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM-карта жеткиликсиз"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Чалуулардын параметрлери"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS билдирүүлөрүнүн параметрлери"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Ар дайым суралсын"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> операторуна туташып турганда жеткиликсиз"</string>
     <string name="see_more" msgid="7499355691042812723">"Дагы көрүү"</string>
     <string name="see_less" msgid="2642392725363552793">"Азыраак көрүү"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> күйгүзүлсүнбү?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM-карта күйгүзүлсүнбү?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторуна которулсунбу?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM-картаны колдонууга которуласызбы?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Бир учурда бир гана SIM-карта активдүү болушу керек.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> кызматыңыз жокко чыгарылбайт."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Бир учурда бир гана жүктөлүп алынган SIM-карта активдүү болушу керек.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> операторуна которулсаңыз, <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> кызматыңыз жокко чыгарылбайт."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Бир учурда бир гана SIM-карта активдүү болушу керек.\n\nБашка SIM-картага которулсаңыз, <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> кызматыңыз жокко чыгарылбайт."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторуна которулуу"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Байланыш операторуна туташууда…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> операторуна которулууда"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Байланыш оператору которуштурулбай жатат"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Катадан улам байланыш оператору которуштурулбай жатат."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> өчүрүлсүнбү?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM-карта өчүрүлсүнбү?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-карта өчүрүлүүдө<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Байланыш оператору өчүрүлгөн жок"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Бир жерден ката кетти, байланыш операторуңуз өчүрүлгөн жок."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIM-картаны колдоносузбу?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Бул түзмөктө бир эле убакта 2 SIM-картаны иштетүүгө болот. Бир эле убакта 1 SIM-картаны гана колдонуу үчүн \"Жок, рахмат\" баскычын таптап коюңуз."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Түзмөк өчүп күйсүнбү?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Баштоо үчүн түзмөктү өчүрүп күйгүзүңүз. Андан соң башка SIM-картаны кошсоңуз болот."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Улантуу"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Өчүрүп күйгүзүү"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Жок, рахмат"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Которулуу"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM-карта иштетилген жок"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM-картаны чыгарып, кайра салыңыз. Эгер маселе чечилбесе, түзмөктү өчүрүп күйгүзүңүз."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM-картаны кайра күйгүзүп көрүңүз. Эгер маселе чечилбесе, түзмөктү өчүрүп күйгүзүңүз."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Тармакты иштетүү"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> иштеп жатат"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM-картанын жөндөөлөрүн жаңыртуу үчүн таптап коюңуз"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-карта"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Бул жүктөлүп алынган SIM картадагы маалыматты тазалайсызбы?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Бул SIM картадагы маалыматты тазаласаңыз, түзмөктү <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> байланыш оператору тейлебей калат. Бирок \n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> байланыш операторунун тарифтик планы мурунку бойдон эле калат."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Тазалоо"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM карта тазаланууда…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM карта тазаланбай жатат"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Ката кетти.\n\nТүзмөгүңүздү өчүрүп күйгүзүп, кайталап көрүңүз."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Түзмөккө туташуу"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> түзмөгүңүзгө убактылуу Wi‑Fi тармагы аркылуу туташканы жатат"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Түзмөктөр табылган жок. Түзмөктөр күйгүзүлүп, байланышууга даяр экенин текшериңиз."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Шашылыш чалуулар"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Операторуңузда кырсыктаганда Wi‑Fi аркылуу чалуу мүмкүнчүлүгү каралган эмес.\nКырсыктаганда жардамга келчү кызматтарга чалганыңызда, түзмөгүңүз автоматтык түрдө мобилдик тармакка которулат.\nМындай кырдаалдарда мобилдик тармак кармаган аймактарда гана чала аласыз."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Чалуунун сапатын жогорулатуу үчүн Wi‑Fi тармагына туташыңыз"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"SIM-карталардан кайчылаш чалуу"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Ушул SIM-карта менен башка SIM-карталардан чалууга жана SMS билдирүүлөрдү жөнөтүүгө уруксат бериңиз."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"sim-карталардан кайчылаш чалуу"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Кирүүчү MMS билдирүү"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS билдирүү жөнөтүлгөн жок"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Мобилдик Интернет өчүп турса да, <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> операторунан MMS билдирүүлөрдү алып туруу үчүн басып коюңуз"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Колдонмолорду жөндөөлөрдүн үстүнө коюуга уруксат берүү"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Башка колдонмолордун үстүнөн көрүнгөн колдонмолорго Жөндөөлөр экранынын үстүнөн да көрүнүүгө уруксат берүү"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Медиа"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Медиа сеанс аягына чыгарылганда ойноткучту жашыруу"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Бул ойноткуч сеансты жайылып көрсөтүлгөн Ыкчам жөндөөлөр панелинде улантууга мүмкүнчүлүк берет."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Ыкчам жөндөөлөрдөгү Медиа ойноткуч"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Ойнотууну оңой улантуу үчүн, медиа ойноткучту узагыраак убакытка көрсөтүңүз"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ойноткучту жашыруу"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Ойноткучту көрсөтүү"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Ойноткучтар жеткиликсиз"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Уруксат берилген колдонмолор"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"медиа"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth күйгүзүлөт"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Күйүк"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Өчүк"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM карталар"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Учак режимине ылайыктуу тармактар"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Учак режимине ылайыктуу тармактарды таап, туташыңыз"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"учак, учак режимине ылайыктуу"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Телефон чалуу жана SMS жөнөтүү"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi аркылуу чалуу"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Мобилдик байланыш эмес, Wi‑Fi тармагы сыяктуу байланыш аркылуу чалып, чалууларга жооп бериңиз"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi аркылуу чалуу менен мобилдик байланыш оператору аркылуу эмес, айрым Wi‑Fi тармактарын колдонуп чала аласыз."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Чалуулар"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"артыкчылыктуу"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"чалуулар артыкчылыктуу"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS артыкчылыктуу"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"жеткиликсиз"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM-карта жок"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Жеке жөндөөлөр"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Жалпыга ачык тармактарга туташуу"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"тармакка туташуу, интернет, зымсыз, маалымат, wifi, wi-fi, wi fi, уюлдук, мобилдик, байланыш оператору, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Учактагы коопсуз тармактарды көрүү"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Учак режимин өчүрүү"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Уйку режиминде иштебейт"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Билдирмелердин маанилүүлүгүн баштапкы абалга келтирүү аяктады."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Колдонмолор"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Кооптуу түзмөк билдирүүлөрүңүздү көргөнү жатат. Чоо-жайын көрүү үчүн таптап коюңуз."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Билдирүүлөрдү көрүүгө уруксат берилсинби?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Кооптуу Bluetooth түзмөгү, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], билдирүүлөрүңүздү көргөнү жатат.\n\n[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] түзмөгүнө буга чейин туташкан эмессиз."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Кооптуу түзмөк байланыштарыңызды жана чалуулар тизмесин көргөнү жатат. Чоо-жайын көрүү үчүн таптап коюңуз."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Байланыштар менен чалуулар тизмесин көрүүгө уруксат берилсинби?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Кооптуу Bluetooth түзмөгү, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], байланыштарыңызды жана чалуулар тизмесин көргөнү жатат. Буга кирүүчү жана чыгуучу чалуулар кирет.\n\n[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] түзмөгүнө буга чейин туташкан эмессиз."</string>
 </resources>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 2568a52..8cc06d3 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ຂະໜາດກາງ"</item>
     <item msgid="6740026006576843477">"ຍາວ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ສັ້ນ"</item>
+    <item msgid="7397961711906421599">"ກາງ"</item>
+    <item msgid="4079132024502041928">"ຍາວ"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ຄ່າເລີ່ມຕົ້ນ"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ທົ່ວໂລກ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA ເທົ່ານັ້ນ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ທົ່ວໂລກ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 0f65f1e..1f97968 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"ວັນທີ ແລະ ເວລາ"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"ຕັ້ງວັນທີ ແລະເວລາ"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"ຕັ້ງຄ່າວັນທີ, ເວລາ, ເຂດເວລາ &amp; ຮູບແບບ"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"ໃຊ້ເວລາທີ່ລະບຸໂດຍເຄືອຂ່າຍ"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"ໃຊ້ເຂດເວລາທີ່ລະບຸໂດຍເຄືອຂ່າຍ"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"ຕັ້ງເວລາອັດຕະໂນມັດ"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"ຕັ້ງເຂດເວລາອັດຕະໂນມັດ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ໃຊ້ຄ່າເລີ່ມຕົ້ນຂອງສະຖານທີ່"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"ຮູບ​ແບບ​ເວ​ລາ 24 ຊົ່ວ​ໂມງ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"ໃຊ້ຮູບແບບ 24 ຊົ່ວໂມງ"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"ສະແດງຂໍ້ມູນໂປຣໄຟລ໌ໃນໜ້າຈໍລັອກ"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ບັນຊີ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ສະຖານທີ່"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ໃຊ້​ສະຖານທີ່"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ໃຊ້ສະຖານທີ່"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ປິດ"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ເປີດ - <xliff:g id="COUNT_1">%1$d</xliff:g> ແອັບມີສິດເຂົ້າເຖິງສະຖານທີ່</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ລັອກໜ້າຈໍ, ການປົດລັອກດ້ວຍໃບໜ້າ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ການລັອກໜ້າຈໍ, ລາຍນິ້ວມື"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ການລັອກໜ້າຈໍ"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ປົດລັອກໂທລະສັບຂອງທ່ານໄດ້ຢ່າງປອດໄພດ້ວຍໃບໜ້າ ແລະ ລາຍນິ້ວມືທ່ານ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"ທ່ານສາມາດເຂົ້າສູ່ລະບົບຫາແອັບ ແລະ ຢືນຢັນການຈ່າຍເງິນໄດ້ນຳ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ຕັ້ງຄ່າການປົດລັອກດ້ວຍ:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ປົດລັອກດ້ວຍໜ້າ"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ປົດລັອກໂທລະສັບຂອງທ່ານໄດ້ຢ່າງງ່າຍດາຍ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ລາຍນີ້ວມື"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ປະຢັດເວລາປົດລັອກໂທລະສັບໃນຖົງໂສ້ງຂອງທ່ານ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ຂ້າມ"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ຕໍ່ໄປ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ເພີ່ມໜ້າແລ້ວ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"ຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ປົດລັອກດ້ວຍໜ້າ"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ໃຊ້ໃບໜ້າຂອງທ່ານເພື່ອພິສູດຢືນຢັນ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ເລີ່ມ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ຫາກປິດການປົດລັອກດ້ວຍໃບໜ້າແບບຊ່ວຍເຂົ້າເຖິງໄວ້, ຂັ້ນຕອນການຕັ້ງຄ່າບາງຢ່າງອາດບໍ່ສາມາດເຮັດວຽກກັບ TalkBack ໄດ້ຕາມປົກກະຕິ."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ກັບຄືນ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ສືບຕໍ່ການຕັ້ງຄ່າ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ໃຊ້ການຕັ້ງຄ່າການຊ່ວຍເຂົ້າເຖິງ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ເມື່ອໃຊ້ການປົດລັອກດ້ວຍໜ້າໃນແອັບຕ່າງໆ, ໃຫ້ຢືນຢັນນຳທຸກເທື່ອ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ລຶບຂໍ້ມູນໃບໜ້າອອກ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ໃຊ້ການປົດລັອກດ້ວຍໜ້າເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ, ເຂົ້າສູ່ລະບົບແອັບ ແລະ ຢືນຢັນການຈ່າຍເງິນ.\n\nກະລຸນາຮັບຊາບວ່າ:\nການເບິ່ງໂທລະສັບສາມາດປົດລັອກມັນໄດ້ໂດຍທີ່ທ່ານບໍ່ໄດ້ຕັ້ງໃຈ.\n\nໂທລະສັບຂອງທ່ານສາມາດຖືກປົດລັອກໄດ້ໂດຍຄົນອື່ນຫາກມັນຖືກນຳໄປຍື່ນໃສ່ໜ້າທ່ານ.\n\nໂທລະສັບຂອງທ່ານສາມາດຖືກປົດລັອກໄດ້ໂດຍຄົນທີ່ໜ້າຄ້າຍທ່ານຫຼາຍ ເຊັ່ນ: ລູກຂອງທ່ານ ຫຼື ອ້າຍນ້ອງທີ່ເປັນຝາແຝດ."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ໃຊ້ການປົດລັອກດ້ວຍໜ້າເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ, ເຂົ້າສູ່ລະບົບແອັບ ແລະ ຢືນຢັນການຈ່າຍເງິນ.\n\nກະລຸນາຮັບຊາບວ່າ:\nການເບິ່ງໂທລະສັບສາມາດປົດລັອກມັນໄດ້ໂດຍທີ່ທ່ານບໍ່ໄດ້ຕັ້ງໃຈ.\n\nໂທລະສັບຂອງທ່ານສາມາດຖືກປົດລັອກໄດ້ໂດຍຄົນອື່ນຫາກມັນຖືກນຳໄປຍື່ນໃສ່ໜ້າທ່ານ, ເຖິງແມ່ນວ່າທ່ານຈະກຳລັງຫຼັບຕາຢູ່ກໍຕາມ.\n\nໂທລະສັບຂອງທ່ານສາມາດຖືກປົດລັອກໄດ້ໂດຍຄົນທີ່ໜ້າຄ້າຍທ່ານຫຼາຍ ເຊັ່ນ: ລູກຂອງທ່ານ ຫຼື ອ້າຍນ້ອງທີ່ເປັນຝາແຝດ."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"ໃຊ້ການປົດລັອກດ້ວຍໜ້າເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານ, ເຂົ້າສູ່ລະບົບຫາແອັບ ແລະ ຢືນຢັນການຈ່າຍເງິນ."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"ກະລຸນາຮັບຊາບ:\nການເບິ່ງໂທລະສັບຈະສາມາດປົດລັອກມັນໄດ້ຕອນທີ່ທ່ານບໍ່ໄດ້ຕັ້ງໃຈປົດລັອກໄດ້.\n\nຄົນອື່ນສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໄດ້ຫາກຖືມັນໄປໃສ່ໜ້າຂອງທ່ານ.\n\nຄົນທີ່ໜ້າຕາຄ້າຍທ່ານຫຼາຍສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໄດ້ ເຊັ່ນ: ອ້າຍນ້ອງຝາແຝດຂອງທ່ານ."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"ກະລຸນາຮັບຊາບ:\nການເບິ່ງໂທລະສັບຈະສາມາດປົດລັອກມັນໄດ້ຕອນທີ່ທ່ານບໍ່ໄດ້ຕັ້ງໃຈປົດລັອກໄດ້.\n\nຄົນອື່ນສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໄດ້ຫາກຖືມັນໄປໃສ່ໜ້າຂອງທ່ານ, ເຖິງແມ່ນວ່າທ່ານຈະກຳລັງຫຼັບຕາຢູ່ກໍຕາມ.\n\nຄົນທີ່ໜ້າຕາຄ້າຍທ່ານຫຼາຍສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໄດ້ ເຊັ່ນ: ອ້າຍນ້ອງຝາແຝດຂອງທ່ານ."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ລຶບຂໍ້ມູນໃບໜ້າອອກບໍ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ຂໍ້ມູນໃບໜ້າທີ່ໃຊ້ໂດຍປົດລັອກດ້ວຍໜ້າຈະຖືກລຶບອອກຢ່າງຖາວອນ ແລະ ປອດໄພ. ຫຼັງຈາກການລຶບແລ້ວ, ທ່ານຈະຕ້ອງໃຊ້ PIN, ຮູບແບບປົດລັອກ ຫຼື ລະຫັດຜ່ານໃນການປົດລັອກໂທລະສັບ, ການລົງຊື່ເຂົ້າໃຊ້ແອັບ ແລະ ການຢືນຢັນການຈ່າຍເງິນ."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"ໃຊ້ການປົດລັອກດ້ວຍໜ້າເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານ"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ ຫຼື ອະນຸມັດການສັ່ງຊື້.\n\nໝາຍເຫດ: ທ່ານບໍ່ສາມາດໃຊ້ນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກອຸປະກອນນີ້ໄດ້. ສຳລັບຂໍ້ມູນເພີ່ມເຕີມ, ໃຫ້ຕິດຕໍ່ຜູ້ເບິ່ງແຍງລະບົບອົງກອນຂອງທ່ານ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກໂທລະສັບ ຫຼື ອະນຸມັດການສັ່ງຊື້.\n\nໝາຍເຫດ: ນິ້ວມືຂອງທ່ານອາດມີຄວາມປອດໄພທີ່ໜ້ອຍກວ່າຮູບແບບປົດລັອກ ຫຼື ລະຫັດ PIN ທີ່ຍາກ."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"​ຍົກ​ເລີກ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ບໍ່, ຂອບໃຈ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"​ສືບ​ຕໍ່"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ຂ້າມ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ຕໍ່ໄປ"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ໂດຍການປົກປ້ອງແທັບເລັດຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຈະຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍນຳເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ໂດຍການປົກປ້ອງອຸປະກອນຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຈະຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍນຳເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ໂດຍການປົກປ້ອງໂທລະສັບຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຈະຕ້ອງໃຊ້ຕົວເລືອກການລັອກໜ້າຈໍນຳເພື່ອຕັ້ງຄ່າການປົດລັອກດ້ວຍໜ້າ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ໂດຍການປົກປ້ອງແທັບເລັດຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຕ້ອງໃຊ້ຕົວເລືອກໜ້າຈໍລັອກນຳເພື່ອຕັ້ງຄ່າລະບົບຊີວະມິຕິ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ໂດຍການປົກປ້ອງອຸປະກອນຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຕ້ອງໃຊ້ຕົວເລືອກໜ້າຈໍລັອກນຳເພື່ອຕັ້ງຄ່າລະບົບຊີວະມິຕິ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ໂດຍການປົກປ້ອງໂທລະສັບຂອງທ່ານດ້ວຍຕົວເລືອກໜ້າຈໍລັອກ, ຈະບໍ່ມີໃຜສາມາດໃຊ້ມັນໄດ້ຫາກມັນເສຍ ຫຼື ຖືກລັກ. ທ່ານຕ້ອງໃຊ້ຕົວເລືອກໜ້າຈໍລັອກນຳເພື່ອຕັ້ງຄ່າລະບົບຊີວະມິຕິ. ເພື່ອກັບຄືນ, ໃຫ້ແຕະຍົກເລີກ"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ຂ້າມການຕັ້ງລະຫັດ PIN ບໍ?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"ຂ້າມການຕັ້ງລະຫັດບໍ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ຂ້າມການຕັ້ງຮູບແບບປົດລັອກບໍ?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ແທັບເລັດນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ອຸປະກອນນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ປ້ອງກັນບໍ່ໃຫ້ຄົນອື່ນໃຊ້ໂທລະສັບນີ້ໂດຍບໍ່ໄດ້ຮັບອະນຸຍາດຈາກທ່ານ ໂດຍການເປີດນຳໃຊ້ຄຸນສົມບັດການປົກປ້ອງອຸປະກອນ. ເລືອກການລັອກໜ້າຈໍທີ່ທ່ານຕ້ອງການໃຊ້."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"ເລືອກວິ​ທີ​ລັອກ​ໜ້າ​ຈໍ​ການ​ສຳ​ຮອງ​ຂອງ​ທ່ານ"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"ເລືອກວິທີລັອກໜ້າຈໍການສຳຮອງຂອງທ່ານ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ເລືອກວິທີລັອກໜ້າຈໍການສຳຮອງຂອງທ່ານ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ຕົວເລືອກໜ້າຈໍລັອກ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ຕົວເລືອກໜ້າຈໍລັອກ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ການລັອກໜ້າຈໍ"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ປົດລັອກດ້ວຍໜ້າ + ລະຫັດຜ່ານ"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ສືບຕໍ່ໂດຍບໍ່ຕ້ອງໃຊ້ການປົດລັອກດ້ວຍໜ້າ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"ທ່ານສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໂດຍໃຊ້ໃບໜ້າຂອງທ່ານໄດ້. ເພື່ອຄວາມປອດໄພ, ຕົວເລືອກນີ້ຈະຕ້ອງໃຊ້ວິທີລັອກໜ້າຈໍສຳຮອງນຳ."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ລະບົບຊີວະມິຕິ + ຮູບແບບ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ລະບົບຊີວະມິຕິ + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ລະບົບຊີວະມິຕິ + ລະຫັດຜ່ານ"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ສືບຕໍ່ໂດຍບໍ່ໃຊ້ລະບົບຊີວະມິຕິ"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ທ່ານສາມາດປົດລັອກໂທລະສັບຂອງທ່ານໂດຍໃຊ້ລະບົບຊີວະມິຕິທ່ານໄດ້. ເພື່ອຄວາມປອດໄພ, ຕົວເລືອກນີ້ຈະຕ້ອງໃຊ້ວິທີລັອກໜ້າຈໍສຳຮອງນຳ."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ຖືກປິດການນຳໃຊ້ໂດຍຜູ້ເບິ່ງແຍງລະບົບ, ນະໂຍບາຍການເຂົ້າລະຫັດ ຫຼື ບ່ອນຈັດເກັບຂໍ້ມູນລັບ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ບໍ່ໃຊ້"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ປັດ​ໄປ​ຂ້າງ"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">ຕ້ອງມີໜ້ອຍກວ່າ <xliff:g id="NUMBER_0">%d</xliff:g> ຕົວເລກ</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ຜູ້ເບິ່ງແຍງລະບົບອຸປະກອນບໍ່ອະນຸຍາດໃຫ້ໃຊ້ລະຫັດ PIN ເມື່ອບໍ່ດົນມານີ້"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ລະຫັດ PIN ທົ່ວໄປແມ່ນຖືກບລັອກໂດຍຜູ້ເບິ່ງແຍງລະບົບໄອທີຂອງທ່ານ. ໃຫ້ລອງໃຊ້ລະຫັດ PIN ອື່ນແທນ."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ນີ້ບໍ່ສາມາດຮວມມີຕົວອັກສອນທີ່ບໍ່ຖືກຕ້ອງນຳໄດ້"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ຕ້ອງມີຢ່າງໜ້ອຍໜຶ່ງຕົວອັກສອນ"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ຕ້ອງມີຢ່າງໜ້ອຍໜຶ່ງຕົວເລກ"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">ຕ້ອງມີຕົວອັກສອນທີ່ບໍ່ແມ່ນຕົວເລກຢ່າງໜ້ອຍ 1 ຕົວ</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ຜູ້ເບິ່ງແຍງລະບົບບໍ່ອະນຸຍາດໃຫ້ໃຊ້ລະຫັດຜ່ານເມື່ອບໍ່ດົນມານີ້ໄດ້"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ລະຫັດຜ່ານທົ່ວໄປແມ່ນຖືກບລັອກໂດຍຜູ້ເບິ່ງແຍງລະບົບໄອທີຂອງທ່ານ. ໃຫ້ລອງໃຊ້ລະຫັດອື່ນແທນ."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ນ້ອຍຫາໃຫຍ່, ໃຫຍ່ຫານ້ອຍ ຫຼື ຊຸດຕົວເລກຊ້ຳໆແມ່ນບໍ່ສາມາດໃຊ້ໄດ້"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ຢືນຢັນ"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ຍົກເລີກ"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi​-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"ເປີດໃຊ້ Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi​-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ໃຊ້ Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ໃຊ້ Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ການຕັ້ງຄ່າ Wi​-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi​-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ຕັ້ງຄ່າ &amp; ຈັດການຈຸດການເຂົ້າໃຊ້ລະບົບໄຮ້ສາຍ"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"ວາງລະຫັດ QR ໄວ້ທາງກາງຢູ່ລຸ່ມເພື່ອເຊື່ອມຕໍ່ຫາ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"ເຂົ້າຮ່ວມ Wi‑Fi ໂດຍການສະແກນລະຫັດ QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ແບ່ງປັນ Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"ສະແກນລະຫັດ QR ນີ້ເພື່ອເຊື່ອມຕໍ່ຫາ “<xliff:g id="SSID">%1$s</xliff:g>” ແລະ ແບ່ງປັນລະຫັດຜ່ານ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"ກະລຸນາສະແກນລະຫັດ QR ນີ້ດ້ວຍອຸປະກອນອື່ນເພື່ອເຂົ້າຮ່ວມ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"ສະແກນລະຫັດ QR ນີ້ເພື່ອເຊື່ອມຕໍ່ຫາ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ລອງໃໝ່ອີກເທື່ອໜຶ່ງ. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ກະລຸນາຕິດຕໍ່ຜູ້ຜະລິດອຸປະກອນ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"ມີບາງຢ່າງຜິດພາດ"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ລະຫັດຜ່ານ Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ລະຫັດຜ່ານຮັອດສະປອດ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ເຊື່ອມຕໍ່ອັດຕະໂນມັດ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ອະນຸຍາດໃຫ້ໂທລະສັບເຊື່ອມຕໍ່ໃກ້ເຄືອຂ່າຍນີ້ໂດຍອັດຕະໂນມັດ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ອະນຸຍາດໃຫ້ແທັບເລັດເຊື່ອມຕໍ່ໃກ້ເຄືອຂ່າຍນີ້ໂດຍອັດຕະໂນມັດ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"ອະນຸຍາດການເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍນີ້ເມື່ອຢູ່ໃນໄລຍະ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ເພີ່ມອຸປະກອນ"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ໃຊ້ລະຫັດ QR ເພື່ອເພີ່ມອຸປະກອນໃສ່ເຄືອຂ່າຍນີ້"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"ຮູບແບບລະຫັດ QR ບໍ່ຖືກຕ້ອງ"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ໃຊ້ໃບຮັບຮອງລະບົບ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ບໍ່ໃຫ້"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ບໍ່ກວດຮັບຮອງ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"ບໍ່ໄດ້ລະບຸໃບຢັ້ງຢືນໃດໆ. ການເຊື່ອມຕໍ່ຂອງທ່ານຈະບໍ່ເປັນສ່ວນຕົວ."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ຊື່ເຄືອຂ່າຍຍາວເກີນໄປ."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ຕ້ອງລະບຸໂດເມນ."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"ຕ້ອງມີໃບຮັບຮອງ."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"ເຊື່ອມຕໍ່"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ເປີດໃຊ້ Wi-Fi ແລ້ວ"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"ເຊື່ອມຕໍ່ຫາ <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ແລ້ວ"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"ກຳລັງເຊື່ອມຕໍ່ຫາ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"ກຳລັງເຊື່ອມຕໍ່…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ລົ້ມເຫລວໃນການເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ເຄືອຂ່າຍບໍ່ຢູ່ໃນໄລຍະ"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ທີ່ຢູ່ MAC ຂອງອຸປະກອນ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ທີ່ຢູ່ MAC ທີ່ສຸ່ມມາ"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"ທີ່ຢູ່ MAC ທີ່ສຸ່ມມາແລ້ວ (ໃຊ້ຫຼ້າສຸດ)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"ທີ່ຢູ່ IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ລາຍລະອຽດເຄືອຂ່າຍ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet Mask"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"ທີ່ຢູ່ IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"ເຄືອຂ່າຍ​ທີ່​ບັນທຶກ​ໄວ້"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"ການສະໝັກໃຊ້"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"ເຄືອຂ່າຍອື່ນໆ"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"ການຕັ້ງຄ່າ IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"ບໍ່ສາມາດໃຊ້ການຕັ້ງຄ່າ Wi‑Fi ຂັ້ນສູງກັບຜູ້ໃຊ້ນີ້ໄດ້"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"ບັນທຶກ"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ພິມທີ່ຢູ່ gateway ທີ່ຖືກຕ້ອງ."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"ພິມທີ່ຢູ່ DNS ທີ່ຖືກຕ້ອງ."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"ພິມຄວາມຍາວ network prefix ລະຫວ່າງ 0 ຫາ 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ເວັ້ນເສຍແຕ່ຈະຖືກຍົກເລີກໂດຍ DNS ສ່ວນຕົວ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ເວັ້ນເສຍແຕ່ຈະຖືກຍົກເລີກໂດຍ DNS ສ່ວນຕົວ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ຄວາມຍາວ Network prefix"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ແອັບກຳລັງແບ່ງປັນເນື້ອຫາ. ເພື່ອແບ່ງປັນອິນເຕີເນັດ, ໃຫ້ປິດຮັອດສະປອດໄວ້ກ່ອນ ຈາກນັ້ນເປີດຄືນໃໝ່"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"ບໍ່ໄດ້ຕັ້ງລະຫັດຜ່ານ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ຊື່ຮັອດສະປອດ"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"ກຳລັງເປີດໃຊ້ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"ກຳລັງເປີດໃຊ້ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ອຸປະກອນອື່ນສາມາດເຊື່ອມຕໍ່ຫາ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ໄດ້"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ລະຫັດຜ່ານຮັອດສະປອດ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"ຄື້ນ AP"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ເພີ່ມຣີເຟຣຊເຣດຈາກ 60 ເປັນ 90 Hz ສຳລັບບາງເນື້ອຫາໂດຍອັດຕະໂນມັດ. ເພີ່ມການນຳໃຊ້ແບັດເຕີຣີ."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ບັງຄັບໃຫ້ເປັນຣີເຟຣດເຣດ 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ຣີເຟຣດເຣດສູງສຸດເພື່ອປັບປຸງການຕອບສະໜອງການສຳຜັດ ແລະ ຄຸນນະພາບອະນິເມຊັນ. ເພີ່ມການນຳໃຊ້ແບັດເຕີຣີ."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ການເອົາໃຈໃສ່ໜ້າຈໍ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ເປີດ / ໜ້າຈໍຈະບໍ່ປິດຫາກທ່ານເບິ່ງມັນຢູ່"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ເມື່ອໜ້າຈໍມືດ, ມັນຈະຖືກເປີດໃຊ້ສຳລັບການແຈ້ງເຕືອນໃໝ່"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ສະແດງເວລາ ແລະ ຂໍ້ມູນຕະຫຼອດ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ເພີ່ມການນຳໃຊ້ແບັດເຕີຣີ"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"ຂໍ້ຄວາມຕົວໜາ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ຂະໜາດຕົວອັກສອນ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ເຮັດໃຫ້ຂໍ້ຄວາມໃຫຍ່ຂຶ້ນ ຫຼື ນ້ອຍລົງ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"ການຕັ້ງຄ່າການລັອກ SIM ກາດ"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"ເວີຊັນຂອງ Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"ອັບເດດຄວາມປອດໄພ Android"</string>
     <string name="model_info" msgid="8997566254717810904">"ໂມເດວ"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ໂມເດວ: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ໂມເດວ ແລະ ຮາດແວ"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ເວີຊັນຂອງຮາດແວ"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ໝາຍເລກອຸປະກອນ"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"ລຶບ APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"ເພີ່ມ APN ໃໝ່"</string>
     <string name="menu_save" msgid="6611465355127483100">"ບັນທຶກ"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"ຍົກເລີກ"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"ຍົກເລີກ"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"ແຖບຂໍ້ມູນຊື່ບໍ່ສາມາດປ່ອຍຫວ່າງໄດ້."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN ບໍ່ສາມາດປ່ອຍໃຫ້ຫວ່າງໄດ້."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ແອັບສາມາດຣີເຊັດໄດ້"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"ຣີເຊັດ Wi-Fi, ມືຖື ແລະ Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"ນີ້ຈະເປັນການຣີເຊັດການຕັ້ງຄ່າເຄືອຂ່າຍທັງໝົດ, ຮວມເຖິງ:\n\n"<li>"Wi‑Fi"</li>\n<li>"ອິນເຕີເນັດມືຖື"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"ລຶບ"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ລຶບ SIM ທີ່ດາວໂຫລດມາແລ້ວອອກ"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"ເພື່ອດາວໂຫລດ SIM ແທນທີ່, ກະລຸນາຕິດຕໍ່ຜູ້ໃຫ້ບໍລິການຂອງທ່ານ. ນີ້ຈະບໍ່ເປັນການຍົກເລີກແພັກເກດບໍລິການມືຖືໃດໆ."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"ນີ້ຈະບໍ່ເປັນການຍົກເລີກແພັກເກດບໍລິການມືຖືໃດໆ. ເພື່ອດາວໂຫຼດຊິມທົດແທນ, ໃຫ້ຕິດຕໍ່ຫາຜູ້ໃຫ້ບໍລິການຂອງທ່ານ."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"ຣີ​ເຊັດການຕັ້ງຄ່າ"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"ຣີເຊັດການຕັ້ງຄ່າເຄືອຂ່າຍທັງໝົດບໍ? ທ່ານຈະບໍ່ສາມາດຍົກເລີກຄຳສັ່ງນີ້ໄດ້."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"ຣີເຊັດການຕັ້ງຄ່າເຄືອຂ່າຍທັງໝົດ ແລະ ລຶບລ້າງ SIM ທີ່ດາວໂຫລດມາແລ້ວອອກບໍ? ທ່ານບໍ່ສາມາດຍົກເລີກຄຳສັ່ງນີ້ໄດ້."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"​ການ​ຕັ້ງ​ຄ່າ​ເຄືອ​ຂ່າຍ​ຖືກຕັ້ງ​ຄ່າ​ຄືນ​ໃໝ່​ແລ້ວ."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ບໍ່ສາມາດລຶບ SIM ອອກໄດ້"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ບໍ່ສາມາດລຶບຂໍ້ມູນ SIM ທີ່ດາວໂຫລດມາໄດ້ເນື່ອງຈາກມີຂໍ້ຜິດພາດຂຶ້ນ.\n\nກະລຸນາຣີສະຕາດແອັບຂອງທ່ານແລ້ວລອງໃໝ່."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຈາກ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງແທັບເລັດຂອງທ່ານ, ຮວມທັງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນ ແລະ ການຕັ້ງຄ່າຂອງລະບົບ ແລະ ແອັບພລິເຄຊັນ"</li>\n<li>"ແອັບທີ່ດາວໂຫລດມາ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດໃນ "<b>"ໜ່ວຍຄວາມຈຳພາຍໃນ"</b>" ຂອງໂທລະສັບທ່ານ ຮວມທັງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນ ແລະ ການຕັ້ງຄ່າຂອງລະບົບ ແລະ ແອັບພລິເຄຊັນ"</li>\n<li>"ແອັບພລິເຄຊັນທີ່ດາວໂຫລດມາ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ປັດຈຸບັນທ່ານກຳລັງເຂົ້າສູ່ລະບົບບັນຊີຕໍ່ໄປນີ້:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ມີ​ຜູ້​ໃຊ້​ອື່ນ​ຢູ່​ເທິງ​ອຸ​ປະ​ກອນ​ນີ້.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"ເພງ"</li>\n<li>"ຮູບພາບ"</li>\n<li>"ຂໍ້ມູນຜູ່ໃຊ້ອື່ນໆ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ນີ້ຈະບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະ ຂໍ້ມູນຜູ້ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</b>" ອອກນຳ."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະ ຂໍ້ມູນຜູ້ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</b>" ອອກນຳ."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ລຶບຂໍ້ມູນທັງໝົດ (ຣີເຊັດເປັນຄ່າຈາກໂຮງງານ)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຈາກ "<b>"ພື້ນທີ່ຈັດເກັບພາຍໃນ"</b>" ຂອງແທັບເລັດຂອງທ່ານ, ຮວມທັງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນ ແລະ ການຕັ້ງຄ່າຂອງລະບົບ ແລະ ແອັບພລິເຄຊັນ"</li>\n<li>"ແອັບທີ່ດາວໂຫຼດມາ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ນີ້ຈະເປັນການລຶບຂໍ້ມູນທັງໝົດໃນ "<b>"ພື້ນທີ່ຈັດເກັບພາຍໃນ"</b>" ຂອງໂທລະສັບທ່ານ, ຮວມທັງ:\n\n"<li>"ບັນຊີ Google ຂອງທ່ານ"</li>\n<li>"ຂໍ້ມູນ ແລະ ການຕັ້ງຄ່າຂອງລະບົບ ແລະ ແອັບພລິເຄຊັນ"</li>\n<li>"ແອັບພລິເຄຊັນທີ່ດາວໂຫຼດມາ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ຕອນນີ້ທ່ານກຳລັງເຂົ້າສູ່ລະບົບບັນຊີຕໍ່ໄປນີ້:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ມີ​ຜູ້​ໃຊ້​ອື່ນ​ຢູ່​ເທິງ​ອຸ​ປະ​ກອນ​ນີ້.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"ເພງ"</li>\n<li>"ຮູບພາບ"</li>\n<li>"ຂໍ້ມູນຜູ້ໃຊ້ອື່ນໆ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ນີ້ຈະບໍ່ແມ່ນການຍົກເລີກແພັກເກດບໍລິການມືຖືຂອງທ່ານ."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ້ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"ບ່ອນຈັດເກັບຂໍ້ມູນ USB"</b>" ອອກນຳ."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"ເພື່ອລຶບເພງ, ຮູບພາບ ແລະຂໍ້ມູນຜູ້ໃຊ້ອື່ນໆ, ຈະຕ້ອງລຶບ "<b>"SD card"</b>" ອອກນຳ."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"ລຶບພື້ນທີ່ຈັດເກັບຂໍ້ມູນ USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"ລຶບຂໍ້ມູນ SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ລຶບຂໍ້ມູນທຸກຢ່າງທີ່ຢູ່ໃນພື້ນທີ່ຈັດເກັບຂໍ້ມູນ USB ພາຍໃນ ເຊັ່ນເພງ ຫຼືຮູບພາບ"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"ລຶບຂໍ້ມູນທັງໝົດໃນ SD card ເຊັ່ນ: ເພງ ແລະຮູບພາບ"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ລຶບຂໍ້ມູນທັງໝົດ"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ລຶບຂໍ້ມູນທັງໝົດ"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານ ແລະ ແອັບທີ່ດາວໂຫຼດມາທັງໝົດຈະຖືກລຶບອອກ. ທ່ານບໍ່ສາມາດຍົກເລີກຄຳສັ່ງນີ້ໄດ້."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ຂໍ້ມູນສ່ວນຕົວທັງໝົດຂອງທ່ານ, ຮວມທັງແອັບທີ່ດາວໂຫລດມາແລ້ວ ແລະ SIM ຈະຖືກລຶບອອກ. ທ່ານບໍ່ສາມາດຍົກເລີກຄຳສັ່ງນີ້ໄດ້."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ລຶບທຸກສິ່ງທຸກຢ່າງ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ບໍ່ໄດ້ດຳເນີນການຣີເຊັດເທື່ອ ເນື່ອງຈາກບໍລິການ System Clear ບໍ່ສາມາດເຮັດວຽກໄດ້."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ລຶບຂໍ້ມູນທັງໝົດບໍ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ຜູ່​ໃຊ້​ນີ້​ບໍ່​ສາ​ມາດ​ຣີ​ເຊັດ​ຄ່າ​ໂຮງ​ງານ​​ໄດ້"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ກຳລັງລຶບ"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"ກະລຸນາລໍຖ້າ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ລຶບຂໍ້ມູນທັງໝົດ"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ລຶບຂໍ້ມູນທັງໝົດ"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ຂໍ້ມູນສ່ວນຕົວຂອງທ່ານ ແລະ ແອັບທີ່ດາວໂຫຼດມາທັງໝົດຈະຖືກລຶບອອກ. ທ່ານບໍ່ສາມາດຍົກເລີກຄຳສັ່ງນີ້ໄດ້."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ຂໍ້ມູນສ່ວນຕົວທັງໝົດຂອງທ່ານ, ຮວມທັງແອັບທີ່ດາວໂຫຼດມາແລ້ວ ແລະ SIM ຈະຖືກລຶບອອກ. ທ່ານບໍ່ສາມາດຍົກເລີກຄຳສັ່ງນີ້ໄດ້."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ລຶບຂໍ້ມູນທັງໝົດອອກບໍ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ຜູ້​ໃຊ້​ນີ້​ບໍ່​ສາ​ມາດ​ຣີ​ເຊັດ​ຄ່າ​ໂຮງ​ງານ​​ໄດ້"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"ກຳລັງລຶບ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"ກະລຸນາລໍຖ້າ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"ຕັ້ງຄ່າການໂທ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ຕັ້ງຄ່າຂໍ້ຄວາມສຽງ, ການໂອນສາຍ, ສາຍຊ້ອນ, ID ຜູ່ໂທ"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"ການປ່ອຍສັນຍານຜ່ານ USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"ບໍ່ສາມາດປ່ອຍສັນຍານໃຫ້ໄດ້ຫຼາຍກວ່າ <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ອຸປະກອນ."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ຈະຖືກຍົກເລີກການປ່ອຍສັນຍານ."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ການປ່ອຍສັນຍານ Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ແບ່ງປັນອິນເຕີເນັດຂອງໂທລະສັບຜ່ານທາງ USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ແບ່ງປັນອິນເຕີເນັດຂອງໂທລະສັບຜ່ານທາງ Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ໃຊ້ຮັອດສະປອດ ແລະ ການປ່ອຍສັນຍານເພື່ອສະໜອງອິນເຕີເນັດໃຫ້ອຸປະກອນອື່ນຜ່ານທາງການເຊື່ອມຕໍ່ອິນເຕີເນັດມືຖືຂອງທ່ານ. ແອັບຕ່າງໆສາມາດສ້າງຮັອດສະປອດ ແລະ ແບ່ງປັນເນື້ອຫາກັບອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ໃຊ້ຮັອດສະປອດ ແລະ ການປ່ອຍສັນຍານເພື່ອສະໜອງອິນເຕີເນັດໃຫ້ກັບອຸປະກອນອື່ນຜ່ານການເຊື່ອມຕໍ່ Wi‑Fi ຫຼື ອິນເຕີເນັດມືຖືຂອງທ່ານ. ແອັບສາມາດສ້າງຮັອດສະປອດເພື່ອແບ່ງປັນເນື້ອຫາກັບອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້ນຳ."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ຊ່ວຍເຫຼືອ"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ການ​ສະ​ແກນ Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ອະນຸຍາດໃຫ້ແອັບ ແລະ ບໍລິການຕ່າງໆສະແກນຫາອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງໄດ້ທຸກເວລາ, ເຖິງແມ່ນວ່າຈະປິດ Bluetooth ໄວ້ກໍຕາມ. ຄຸນສົມບັດນີ້ສາມາດໃຊ້ເພື່ອປັບປຸງຄຸນສົມບັດ ແລະ ບໍລິການທີ່ອ້າງອີງສະຖານທີ່ໄດ້."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ບໍລິການສະຖານທີ່ສຳລັບວຽກ"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ການກວດຫາເຂດເວລາສະຖານທີ່"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ການກວດຫາເຂດເວລາສະຖານທີ່"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"ອະນຸຍາດໃຫ້ໃຊ້ສະຖານທີ່ຂອງອຸປະກອນເພື່ອກວດຫາເຂດເວລາປັດຈຸບັນ ການຕັ້ງຄ່າສະຖານທີ່ອື່ນໆ ເຊັ່ນ: ການສະແກນ Wi‑Fi ອາດມີຜົນກະທົບກັບຄວາມຖືກຕ້ອງຂອງການກວດຫາເຂດເວລາໄດ້."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ເປີດ"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ປິດ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ປິດການນຳໃຊ້ການກວດຫາເຂດເວລາອັດຕະໂນມັດແລ້ວ"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ປິດການນຳໃຊ້ການກວດຫາເຂດເວລາສະຖານທີ່ແລ້ວ"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ບໍ່ຮອງຮັບການກວດຫາເຂດເວລາສະຖານທີ່"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ບໍ່ອະນຸຍາດໃຫ້ປ່ຽນການກວດຫາເຂດເວລາສະຖານທີ່"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi &amp; ສະຖານທີ່ເຄືອຂ່າຍມືຖື"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"ໃຫ້ແອັບຯຕ່າງໆໃຊ້ບໍລິການສະຖານທີ່ຂອງ Google ເພື່ອປະເມີນສະຖານທີ່ຂອງທ່ານໄດ້ໄວຂຶ້ນ. ຂໍ້ມູນສະຖານທີ່ທີ່ບໍ່ລະບຸໂຕຕົນຈະຖືກເກັບກຳ ແລະສົ່ງໃຫ້ Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"ສະຖານທີ່ທີ່ລະບຸໂດຍ Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ກະລຸນາຕັ້ງລະຫັດຜ່ານເພື່ອປົດລັອກດ້ວຍໜ້າ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ກະລຸນາຕັ້ງຮູບແບບເພື່ອໃຊ້ການປົດລັອກດ້ວຍໜ້າ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ກະລຸນາຕັ້ງ PIN ເພື່ອປົດລັອກດ້ວຍໜ້າ"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ຕັ້ງລະຫັດຜ່ານກ່ອນເພື່ອໃຊ້ລະບົບຊີວະມິຕິ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ຕັ້ງຮູບແບບກ່ອນເພື່ອໃຊ້ລະບົບຊີວະມິຕິ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ຕັ້ງ PIN ກ່ອນເພື່ອໃຊ້ລະບົບຊີວະມິຕິ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"ລືມລະຫັດຜ່ານຂອງທ່ານບໍ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ລືມຮູບແບບຂອງທ່ານບໍ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ລືມ PIN ຂອງທ່ານບໍ?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ການຕັ້ງຄ່າຄຳບັນຍາຍ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ການຂະຫຍາຍ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ພື້ນທີ່ການຂະຫຍາຍ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ເປີດການນຳໃຊ້ການຂະຫຍາຍ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ເລືອກພື້ນທີ່ການຂະຫຍາຍທີ່ທ່ານຕ້ອງການໃຊ້ເມື່ອຂະຫຍາຍໜ້າຈໍ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ເຕັມຈໍ"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ບາງສ່ວນຂອງໜ້າຈໍ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ເຕັມຈໍ ແລະ ບາງສ່ວນຂອງຈໍ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ຂະຫຍາຍທັງໜ້າຈໍ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ຂະຫຍາຍບາງສ່ວນຂອງໜ້າຈໍ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ສະຫຼັບໄປໃຊ້ປຸ່ມການຊ່ວຍເຂົ້າເຖິງບໍ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ການແຕະສາມເທື່ອເພື່ອຂະຫຍາຍບາງສ່ວນຂອງໜ້າຈໍຈະເຮັດໃຫ້ການພິມ ແລະ ຄຳສັ່ງອື່ນໆຊ້າລົງ.\n\nທ່ານຕ້ອງການສະຫຼັບໄປໃຊ້ປຸ່ມການຊ່ວຍເຂົ້າເຖິງເພື່ອຂະຫຍາຍບໍ່?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ສະຫຼັບໄປໃຊ້ປຸ່ມການຊ່ວຍເຂົ້າເຖິງ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ເກັບການແຕະສາມເທື່ອເພື່ອຂະຫຍາຍໄວ້"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ການຕັ້ງຄ່າການຂະຫຍາຍ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ຂະຫຍາຍດ້ວຍການແຕະສາມເທື່ອ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ຂະຫຍາຍດ້ວຍທາງລັດ"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ກົດປຸ່ມ ປິດ/ເປີດ ເພື່ອວາງສາຍ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ຕົວຊີ້ເມົ້າຂະໜາດໃຫຍ່"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ລຶບການເຄື່ອນໄຫວອອກ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ສຽງໂມໂນ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ຮວມຊ່ອງເມື່ອຫຼິ້ນສຽງ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ສົມດຸນສຽງ"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ຊ້າຍ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ຂວາ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ສຽງໂມໂນ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ຮວມຊ່ອງເມື່ອຫຼິ້ນສຽງ"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ສົມດຸນສຽງ"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ຊ້າຍ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ຂວາ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ວິນາທີ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ວິນາທີ"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"ການແຈ້ງເຕືອນແບບສັ່ນເຕືອນ"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ສຽງພ້ອມການສັ່ນເຕືອນ"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ການຕອບສະໜອງການສຳຜັດ"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"ໃຊ້ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"ເປີດ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ໃຊ້ການປັບແຕ່ງສີ"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"ສະແດງຄຳບັນຍາຍ"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ສຳລັບແອັບທີ່ຮອງຮັບເທົ່ານັ້ນ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"ໃຊ້ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"ເປີດ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ໃຊ້ການແກ້ໄຂສີ"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"ສະແດງຄຳບັນຍາຍ"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ສຳລັບແອັບທີ່ຮອງຮັບເທົ່ານັ້ນ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"ຂະໜາດ ແລະ ຮູບແບບຄຳບັນຍາຍ"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"ຂະໜາດຕົວອັກສອນ <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ຕົວເລືອກເພີ່ມເຕີມ"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ຕາບອດຈາງສີຂຽວ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ຕາບອດຈາງສີແດງ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ຕາບອດຈາງສີຟ້າ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ຂາວດຳ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ສີແດງ-ຂຽວ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ສີແດງ-ຂຽວ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ສີຟ້າ-ເຫຼືອງ"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ການຈຳກັດການນຳໃຊ້ໃນພື້ນຫຼັງ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ອະນຸຍາດໃຫ້ແອັບເຮັດວຽກໃນພື້ນຫຼັງໄດ້"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ແອັບບໍ່ອະນຸຍາດໃຫ້ໃຊ້ໃນພື້ນຫຼັງໄດ້"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ບໍ່ສາມາດຈຳກັດການນຳໃຊ້ໃນພື້ນຫຼັງໄດ້"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ບໍ່ສາມາດຈຳກັດການນຳໃຊ້ໃນພື້ນຫຼັງໄດ້"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງບໍ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ຫາກທ່ານຈຳກັດການເຄື່ອນໄຫວໃນພື້ນຫຼັງສຳລັບແອັບໃດໜຶ່ງ, ມັນຈະເຮັດວຽກຜິດປົກກະຕິ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ເນື່ອງຈາກແອັບນີ້ຍັງບໍ່ໄດ້ປັບແຕ່ງໃຫ້ໃຊ້ແບັດເຕີຣີໄດ້ຢ່າງເໝາະສົມເທື່ອ, ທ່ານຈຶ່ງບໍ່ສາມາດຈຳກັດມັນໄດ້.\n\nເພື່ອຈຳກັດແອັບດັ່ງກ່າວ, ໃຫ້ເປີດການປັບແຕ່ງແບັດເຕີຣີໃຫ້ເໝາະສົມກ່ອນ."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ໃຊ້ແທັບເລັດຫຼາຍກວ່າປົກກະຕິ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ໃຊ້ອຸປະກອນຫຼາຍກວ່າປົກກະຕິ"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ແບັດເຕີຣີອາດໝົດໄວກວ່າປົກກະຕິ"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ກຳລັງເພີ່ມປະສິດທິພາບເພື່ອສຸຂະພາບແບັດເຕີຣີ"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ຈຳກັດແບັດເຕີຣີຊົ່ວຄາວ. ແຕະເພື່ອສຶກສາເພີ່ມເຕີມ."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"ມີການນຳໃຊ້ໂທລະສັບຂອງທ່ານຫຼາຍກວ່າປົກກະຕິ. ແບັດເຕີຣີອາດໝົດໄວກວ່າທີ່ຄາດໄວ້.\n\nແອັບທີ່ໃຊ້ແບັດເຕີຣີຫຼາຍສຸດແມ່ນ:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"ມີການນຳໃຊ້ແທັບເລັດຂອງທ່ານຫຼາຍກວ່າປົກກະຕິ. ແບັດເຕີຣີອາດໝົດໄວກວ່າທີ່ຄາດໄວ້.\n\nແອັບທີ່ໃຊ້ແບັດເຕີຣີຫຼາຍສຸດແມ່ນ:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"ມີການນຳໃຊ້ອຸປະກອນຂອງທ່ານຫຼາຍກວ່າປົກກະຕິ. ແບັດເຕີຣີອາດໝົດໄວກວ່າທີ່ຄາດໄວ້.\n\nແອັບທີ່ໃຊ້ແບັດເຕີຣີຫຼາຍສຸດແມ່ນ:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">ຈຳກັດ %1$d ແແອັບແລ້ວ</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"ເກີດບັນຫາໃນການອ່ານຕົວວັດແທກແບັດເຕີຣີຂອງທ່ານ"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"ເກີດບັນຫາໃນການອ່ານຕົວວັດແທກແບັດເຕີຣີຂອງທ່ານ. ແຕະເພື່ອ "<annotation id="url">"ສຶກສາເພີ່ມເຕີມ"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ຢຸດແອັບໄວ້ບໍ?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"ໂທລະສັບຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ຕາມປົກກະຕິເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມເປີດໜ້າຈໍໂທລະສັບຂອງທ່ານໄວ້.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດບັງຄັບປິດແອັບດັ່ງກ່າວໄວ້ໄດ້.\n\nຫາກບັນຫານີ້ຍັງຄົງເກີດຂຶ້ນເລື້ອຍໆ, ທ່ານອາດຈຳເປັນຕ້ອງຖອນການຕິດຕັ້ງແອັບດັ່ງກ່າວເພື່ອປັບປຸງປະສິດທິພາບແບັດເຕີຣີ."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"ແທັບເລັດຂອງທ່ານບໍ່ສາມາດຈັດການແບັດເຕີຣີໄດ້ຕາມປົກກະຕິເນື່ອງຈາກ <xliff:g id="APP">%1$s</xliff:g> ພະຍາຍາມເປີດໜ້າຈໍແທັບເລັດຂອງທ່ານໄວ້.\n\nເພື່ອແກ້ໄຂບັນຫານີ້, ທ່ານສາມາດບັງຄັບປິດແອັບດັ່ງກ່າວໄວ້ໄດ້.\n\nຫາກບັນຫານີ້ຍັງຄົງເກີດຂຶ້ນເລື້ອຍໆ, ທ່ານອາດຈຳເປັນຕ້ອງຖອນການຕິດຕັ້ງແອັບດັ່ງກ່າວເພື່ອປັບປຸງປະສິດທິພາບແບັດເຕີຣີ."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ຕັ້ງກຳນົດເວລາ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ຂະຫຍາຍອາຍຸແບັດເຕີຣີ"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ປິດເມື່ອສາກເຕັມແລ້ວ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ປິດຕົວປະຢັດແບັດເຕີຣີເມື່ອໂທລະສັບຂອງທ່ານເຫຼືອ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ປິດຕົວປະຢັດແບັດເຕີຣີເມື່ອແທັບເລັດຂອງທ່ານເຫຼືອ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ປິດຕົວປະຢັດແບັດເຕີຣີເມື່ອອຸປະກອນຂອງທ່ານເຫຼືອ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ຕົວປະຢັດ​ແບັດເຕີຣີຈະປິດເມື່ອໂທລະສັບຂອງທ່ານມີແບັດເຕີຣີເກີນ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ຕົວປະຢັດ​ແບັດເຕີຣີຈະປິດເມື່ອແທັບເລັດຂອງທ່ານມີແບັດເຕີຣີເກີນ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ຕົວປະຢັດ​ແບັດເຕີຣີຈະປິດເມື່ອອຸປະກອນຂອງທ່ານມີແບັດເຕີຣີເກີນ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ເປີດ"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ຣີເຊັດ"</string>
     <string name="tts_play" msgid="2945513377250757221">"ຫຼິ້ນ"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ການເຊື່ອມຕໍ່ແບບປັບຕົວໄດ້"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ຍືດອາຍຸແບັດເຕີຣີ ແລະ ປັບປຸງປະສິດທິພາບອຸປະກອນໂດຍອັດຕະໂນມັດດ້ວຍການຈັດການການເຊື່ອມຕໍ່ເຄືອຂ່າຍຂອງທ່ານ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ຕິດຕັ້ງໃບຮັບຮອງ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ຕິດຕັ້ງໃບຮັບຮອງຈາກບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ຂໍ້ມູນປະຈໍາຕົວຜູ້ໃຊ້"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ເບິ່ງ ແລະ ດັດ​ແປງ​ຂໍ້ມູນປະຈໍາຕົວທີ່ເກັບໄວ້"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ຂັ້ນສູງ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ປະເພດພື້ນທີ່ຈັດເກັບຂໍ້ມູນ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ໃຊ້ຮາດແວ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ຊອບແວເທົ່ານັ້ນ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ບໍ່​ມີຂໍ້​ມູນ​​ຮັບ​ຮອງ​ໂຕສຳ​ລັບ​ຜູ່​ໃຊ້​ນີ້"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ຕິດຕັ້ງສຳລັບ VPN ແລະ ແອັບຕ່າງໆແລ້ວ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ຕິດຕັ້ງສຳລັບ Wi-Fi ແລ້ວ"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"ຢ່າ​ຕິດ​ຕັ້ງ"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"ຢືນຢັນການຕິດຕັ້ງ"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"ບໍ່ໄດ້ຕິດຕັ້ງໃບຮັບຮອງເທື່ອ"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"ອະນຸຍາດໃຫ້ <xliff:g id="APP_NAME">%s</xliff:g> ຕິດຕັ້ງໃບຮັບຮອງຢູ່ອຸປະກອນນີ້ບໍ?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"ໃບຮັບຮອງເຫຼົ່ານີ້ຈະລະບຸຕົວຕົນທ່ານຫາແອັບ ແລະ URL ທາງລຸ່ມ"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"ບໍ່ອະນຸຍາດ"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"ອະນຸຍາດ"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"ສະແດງເພີ່ມເຕີມ"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"ແອັບການຈັດການໃບຮັບຮອງ"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"ບໍ່ມີ"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"ໃບຮັບຮອງທີ່ຕິດຕັ້ງໂດຍແອັບນີ້ຈະລະບຸຕົວຕົນທ່ານຫາແອັບ ແລະ URL ທາງລຸ່ມ"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"ລຶບອອກ"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"ສັນຍານການໂທສຸກເສີນ"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"ຕັ້ງຄ່າການເຮັດວຽກເມື່ອມີການໂທຫາໝາຍເລກສຸກເສີນ"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"ສຳຮອງຂໍ້ມູນ"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"​ບໍ່​ໄດ້​ຕິດ​ຕັ້ງ - ​ໂປຣ​ໄຟລ໌​ບ່ອນ​ເຮັດ​ວຽກ"</string>
     <string name="user_admin" msgid="4024553191395768119">"ຜູ້​ຄວບ​ຄຸມ"</string>
     <string name="user_you" msgid="3070562015202859996">"ທ່ານ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ຊື່ຫຼິ້ນ"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"ທ່ານ​ສາ​ມາດ​ເພີ່ມ​ຜູ້​ໃຊ້​ໄດ້​ເຖິງ <xliff:g id="USER_COUNT">%1$d</xliff:g> ຄົນ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ສະເພາະເຈົ້າຂອງແທັບເລັດທີ່ສາມາດຈັດການຜູ່ໃຊ້ໄດ້."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ສະເພາະເຈົ້າຂອງໂທລະສັບທີ່ສາມາດຈັດການຜູ່ໃຊ້ໄດ້."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ການຈ່າຍເງິນຢູ່ເຄື່ອງຈ່າຍເງິນ"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ຕັ້ງ​ແອັບ​ການຈ່າຍເງິນ. ຈາກນັ້ນ​ຈັບ​ດ້ານ​ຫຼັງໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ຂຶ້ນເທິງ​ເຄື່ອງຈ່າຍເງິນ​ໃດ​ໜຶ່ງ​ທີ່​ມີ​ສັນ​ຍາ​ລັກ​ contactless​."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ໄດ້​ແລ້ວ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ເພີ່ມເຕີມ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ເພີ່ມເຕີມ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ຕັ້ງແອັບການຈ່າຍເງິນເລີ່ມຕົ້ນ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ອັບເດດແອັບການຈ່າຍເງິນເລີ່ມຕົ້ນ"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ຢູ່ຈຸດຈ່າຍເງິນແບບ Contactless, ໃຫ້ຈ່າຍດ້ວຍ <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ກັບຄືນ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ຕໍ່ໄປ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ແລ້ວໆ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ຖ່າຍຮູບ"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ເລືອກຮູບ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ເລືອກຮູບ"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM ກາດ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM ກາດ"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ໃຊ້​ອັນ​ນີ້​ທຸກ​ເທື່ອ​ເພື່ອ​ໂທ"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"​ເລືອກ​ຊິມ​ທີ່​ໃຊ້​ສຳ​ລັບ​ຂໍ້​ມູນ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"ເລືອກ SIM ສຳລັບ SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ກຳ​ລັງ​ສະ​ຫຼັບ​ SIM ຂໍ້​ມູນ, ອັນ​ນີ້​ອາດ​ຈະ​ໃຊ້​ເວ​ລາ​ເປັນ​ນາ​ທີ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ກຳ​ລັງ​ສະ​ຫຼັບ​ SIM ອິນເຕີເນັດ, ຂັ້ນຕອນ​ນີ້​ອາດ​ຈະ​ໃຊ້​ເວ​ລາ​ຮອດ​ນາ​ທີ…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ໂທ​ດ້ວຍ"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ເລືອກ SIM ກາດ"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ກິດຈະກັດ, ກຳນົດການ, ຕົວປະຢັດແບັດເຕີຣີ, ຕົວປະຢັດໄຟ, ແບັດເຕີຣີ, ອັດຕະໂນມັດ, ເປີເຊັນ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ການໂທຂັ້ນສູງ, ການໂທ 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ເພີ່ມພາສາ, ເພີ່ມພາສາໃດໜຶ່ງ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ຂະໜາດຂໍ້ຄວາມ"</string>
     <string name="default_sound" msgid="6604374495015245195">"​ສຽງ​ເລີ່ມ​ຕົ້ນ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ລະດັບສຽງໂທເຂົ້າ ແລະ ສຽງແຈ້ງເຕືອນທີ່ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ລະດັບສຽງ, ການສັ່ນເຕືອນ, ຫ້າມລົບກວນ"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ສຽງຕອນເປີດເຄື່ອງ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"ຄຳບັນຍາຍສົດ"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ສ້າງຄຳບັນຍາຍມີເດຍໂດຍອັດຕະໂນມັດ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ບໍ່ມີ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">ຕັ້ງກຳນົດເວລາ <xliff:g id="ON_COUNT">%d</xliff:g> ລາຍການແລ້ວ</item>
-      <item quantity="one">ຕັ້ງກຳນົດເວລາ 1 ລາຍການແລ້ວ</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ບໍ່ມີ}=1{ຕັ້ງກຳນົດເວລາ 1 ລາຍການແລ້ວ}other{ຕັ້ງກຳນົດເວລາ # ລາຍການແລ້ວ}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ຫ້າມລົບກວນ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ຮັບການແຈ້ງເຕືອນສະເພາະຄົນ ແລະ ແອັບສຳຄັນເທົ່ານັ້ນ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ຈຳກັດການລົບກວນ"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ສຳຄັນເທົ່ານັ້ນ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ເປີດ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ປິດ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ປິດ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ເປີດ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ຖາມທຸກເທື່ອ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ຈົນກວ່າທ່ານຈະປິດ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ຊົ່ວໂມງ</item>
-      <item quantity="one">1 ຊົ່ວໂມງ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> ນາທີ"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">ສາມາດເປີດໃຊ້ <xliff:g id="ON_COUNT">%d</xliff:g> ການກຳນົດເວລາໃຫ້ເປັນອັດຕະໂນມັດໄດ້</item>
-      <item quantity="one">ສາມາດເປີດໃຊ້ 1 ການກຳນົດເວລາໃຫ້ເປັນອັດຕະໂນມັດໄດ້</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ຊົ່ວໂມງ}other{# ຊົ່ວໂມງ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 ນາທີ}other{# ນາທີ}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ປິດ}=1{ປິດ / ສາມາດເປີດໃຊ້ 1 ການກຳນົດເວລາໃຫ້ເປັນອັດຕະໂນມັດໄດ້}other{ປິດ / ສາມາດເປີດໃຊ້ # ການກຳນົດເວລາໃຫ້ເປັນອັດຕະໂນມັດໄດ້}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"ມີຫຍັງສາມາດລົບກວນໂໝດຫ້າມລົບກວນໄດ້ແດ່"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ຜູ້ຄົນ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ແອັບ"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ຕັ້ງການແຈ້ງເຕືອນທີ່ມີຄວາມສຳຄັນຕ່ຳກວ່າໃຫ້ເປັນແບບສຸພາບໂດຍອັດຕະໂນມັດ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ການຈັດອັນດັບການແຈ້ງເຕືອນແບບປັບແຕ່ງອັດຕະໂນມັດ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ຈັດອັນດັບການແຈ້ງເຕືອນຕາມຄວາມກ່ຽວຂ້ອງ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ຄຳຕິຊົມການແຈ້ງເຕືອນແບບປັບຕົວໄດ້"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ຊີ້ບອກການປັບແຕ່ງທີ່ເກີດຂຶ້ນກັບການແຈ້ງເຕືອນ ແລະ ສະແດງຕົວເລືອກເພື່ອສົ່ງຄຳຕິຊົມຫາລະບົບ"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"ຣີເຊັດຄວາມສຳຄັນການແຈ້ງເຕືອນ"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"ຣີເຊັດການຕັ້ງຄ່າຄວາມສຳຄັນທີ່ຜູ້ໃຊ້ເປັນຄົນປ່ຽນ ແລະ ອະນຸຍາດຜູ້ຊ່ວຍການແຈ້ງເຕືອນໃຫ້ຕັ້ງຄວາມສຳຄັນໄດ້"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ຄຳສັ່ງ ແລະ ການຕອບກັບທີ່ແນະນຳ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ສະແດງຄຳສັ່ງ ແລະ ການຕອບກັບທີ່ແນະນຳໂດຍອັດຕະໂນມັດ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ສະແດງການແຈ້ງເຕືອນຫຼ້າສຸດ ແລະ ການແຈ້ງເຕືອນທີ່ເລື່ອນໄປແລ້ວ"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"ການສົນທະນາສຳຄັນ"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"ສະແດງຢູ່ເທິງສຸດຂອງພາກສ່ວນການສົນທະນາ ແລະ ປາກົດເປັນ bubble ລອຍ"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"ສະແດງຢູ່ເທິງສຸດຂອງພາກສ່ວນການສົນທະນາ"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"ການສົນທະນາອື່ນໆ"</string>
+    <string name="other_conversations" msgid="551178916855139870">"ການສົນທະນາທີ່ບໍ່ສຳຄັນ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ການສົນທະນາທີ່ທ່ານປ່ຽນແປງ"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"ການສົນທະນາຫຼ້າສຸດ"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ລຶບລ້າງອັນຫຼ້າສຸດ"</string>
+    <string name="clear" msgid="5092178335409471100">"ລຶບລ້າງ"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ຕັ້ງການສົນທະນາສຳຄັນເປັນ Bubble"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ການສົນທະນາສຳຄັນຈະສະແດງຢູ່ເທິງສຸດຂອງແຖບແບບເລື່ອນລົງ. ນອກຈາກນັ້ນ, ທ່ານຍັງສາມາດຕັ້ງໃຫ້ພວກມັນສະແດງເປັນ Bubble ແລະ ລົບກວນໂໝດຫ້າມລົບກວນໄດ້ນຳ."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ການສົນທະນາສຳຄັນ ແລະ ການສົນທະນາທີ່ມີການແກ້ໄຂຈະປາກົດຢູ່ບ່ອນນີ້"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"​ການເຂົ້າເຖິງ ຫ້າມ​ລົບ​ກວນ"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"ອະນຸຍາດໂໝດຫ້າມລົບກວນ"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ບໍ່​ມີ​ການ​ຂໍ​ແອັບ​ທີ່​ຕິດ​ຕັ້ງ​ໄວ້ ​ຫາ​ຫ້າມ​ລົບ​ກວນການ​ເຂົ້າ"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"​ກຳ​ລັງ​ໂຫລດ​ແອັບຯ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ກໍາລັງໂຫຼດແອັບ…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"ຕາມຄຳຂໍຂອງທ່ານ, Android ຈະບລັອກການແຈ້ງເຕືອນຂອງແອັບນີ້ບໍ່ໃຫ້ປາກົດຢູ່ອຸປະກອນນີ້"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"ຕາມຄຳຂໍຂອງທ່ານ, Android ຈະບລັອກໝວດໝູ່ການແຈ້ງເຕືອນນີ້ບໍ່ໃຫ້ປາກົດຢູ່ອຸປະກອນນີ້"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"ຕາມຄຳຂໍຂອງທ່ານ, Android ຈະບລັອກກຸ່ມການແຈ້ງເຕືອນນີ້ບໍ່ໃຫ້ປາກົດຢູ່ອຸປະກອນນີ້"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ການສົນທະນາທັງໝົດ"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ການສົນທະນາສຳຄັນ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ບໍ່ມີ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> ການສົນທະນາ</item>
-      <item quantity="one">1 ການສົນທະນາ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ບໍ່ມີ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ບໍ່ມີ}=1{1 ການສົນທະນາ}other{# ການສົນທະນາ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ໃຜທີ່ສາມາດລົບກວນໄດ້"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ການໂທ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"​ການ​ໂທ"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ກວດສອບວ່າທ່ານຕັ້ງຄ່າອຸປະກອນໃຫ້ສົ່ງສຽງ, ເພື່ອໃຫ້ແນ່ໃຈວ່າອຸປະກອນຈະສົ່ງສຽງເມື່ອມີສາຍທີ່ອະນຸຍາດໂທເຂົ້າ"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"ສຳລັບ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, ສາຍໂທເຂົ້າຈະຖືກບລັອກໄວ້. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າເພື່ອອະນຸຍາດໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດດາວ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">ອີກ <xliff:g id="NUM_PEOPLE">%d</xliff:g> ຄົນ</item>
-      <item quantity="one">ອີກ 1 ຄົນ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ບໍ່ມີ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ບໍ່ມີ}=1{{contact_1}}=2{{contact_1} ແລະ {contact_2}}=3{{contact_1}, {contact_2} ແລະ {contact_3}}other{{contact_1}, {contact_2} ແລະ ອີກ # ຄົນ}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(ບໍ່ມີຊື່)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"ຂໍ້​ຄວາມ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ຂໍ້ຄວາມ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"ຂໍ້ຄວາມ"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"ສຳລັບ ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, ຂໍ້ຄວາມຂາເຂົ້າຈະຖືກບລັອກໄວ້. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າເພື່ອອະນຸຍາດໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"ທຸກຂໍ້ຄວາມສາມາດສົ່ງຫາທ່ານໄດ້"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ທຸກສາຍສາມາດຕິດຕໍ່ຫາທ່ານໄດ້"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ບໍ່ມີ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ລາຍຊື່ຜູ້ຕິດຕໍ່</item>
-      <item quantity="one">1 ລາຍຊື່ຜູ້ຕິດຕໍ່</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ບໍ່ມີ}=1{1 ລາຍຊື່ຜູ້ຕິດຕໍ່}other{# ລາຍຊື່ຜູ້ຕິດຕໍ່}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ທຸກຄົນ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ລາຍຊື່ຜູ້ຕິດຕໍ່"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ລາຍຊື່ຜູ້ຕິດຕໍ່ທີ່ຕິດດາວ"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ການແຈ້ງເຕືອນທັງໝົດ"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ການແຈ້ງເຕືອນບາງຢ່າງ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ຄົນທີ່ເລືອກຈະຍັງຄົງສາມາດຕິດຕໍ່ຫາທ່ານໄດ້ຢູ່, ເຖິງແມ່ນວ່າທ່ານຈະບໍ່ອະນຸຍາດໃຫ້ແອັບລົບກວນໄດ້ກໍຕາມ"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ສາມາດລົບກວນໄດ້</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> ສາມາດລົບກວນໄດ້</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ອີກ <xliff:g id="NUMBER">%d</xliff:g> ແອັບ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ບໍ່ມີແອັບທີ່ສາມາດລົບກວນໄດ້}=1{{app_1} ສາມາດລົບກວນໄດ້}=2{{app_1} ແລະ {app_2} ສາມາດລົບກວນໄດ້}=3{{app_1}, {app_2}, ແລະ {app_3} ສາມາດລົບກວນໄດ້}other{{app_1}, {app_2} ແລະ ອີກ # ແອັບສາມາດລົບກວນໄດ້}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ແອັບ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ການແຈ້ງເຕືອນທັງໝົດ"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ການແຈ້ງເຕືອນບາງຢ່າງ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ການແຈ້ງເຕືອນທີ່ສາມາດລົບກວນໄດ້"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ອະນຸຍາດການແຈ້ງເຕືອນທັງໝົດ"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ສາມາດລົບກວນໄດ້</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> ສາມາດລົບກວນໄດ້</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ບໍ່ມີຫຍັງທີ່ສາມາດລົບກວນໄດ້"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ອີກ <xliff:g id="NUMBER">%d</xliff:g> ແອັບ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ບໍ່ມີຫຍັງທີ່ສາມາດລົບກວນໄດ້}=1{{sound_category_1} ສາມາດລົບກວນໄດ້}=2{{sound_category_1} ແລະ {sound_category_2} ສາມາດລົບກວນໄດ້}=3{{sound_category_1}, {sound_category_2} ແລະ {sound_category_3} ສາມາດລົບກວນໄດ້}other{{sound_category_1}, {sound_category_2} ແລະ ອີກ # ໝວດໝູ່ສາມາດລົບກວນໄດ້}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ບໍ່ມີຫຍັງທີ່ສາມາດລົບກວນໄດ້"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ບໍ່ມີໃຜສາມາດລົບກວນໄດ້"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"ບາງຄົນສາມາດລົບກວນໄດ້"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ທຸກຄົນສາມາດລົບກວນໄດ້"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ເປີດ"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"ປິດ"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"ການປັກໝຸດແອັບ"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"ການປັກໝຸດແອັບຈະເຮັດໃຫ້ທ່ານສາມາດຈຶ້ງແອັບປັດຈຸບັນໄວ້ໃນມຸມມອງຈົນກວ່າທ່ານຈະຖອດປັກໝຸດມັນ. ຕົວຢ່າງ: ທ່ານສາມາດໃຊ້ຄຸນສົມບັດນີ້ເພື່ອອະນຸຍາດໃຫ້ໝູ່ທີ່ເຊື່ອຖືໄດ້ຫຼິ້ນເກມສະເພາະໃດໜຶ່ງໄດ້. \n\nເມື່ອປັກໝຸດແອັບໃດໜຶ່ງໄວ້ແລ້ວ, ແອັບທີ່ປັກມຸດໄວ້ອາດເປີດແອັບອື່ນ ຫຼື ອາດເຂົ້າເຖິງຂໍ້ມູນສ່ວນຕົວໄດ້. \n\nເພື່ອໃຊ້ການປັກໝຸດແອັບ: 	\n1.	ເປີດໃຊ້ການປັກໝຸດແອັບ 	\n2.	ເປີດພາບຮວມ 	\n3.	ແຕະໄອຄອນແອັບຢູ່ເທິງສຸດຂອງໜ້າຈໍ, ຈາກນັ້ນແຕະປັກໝຸດ"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"ການປັກໝຸດແອັບຈະເຮັດໃຫ້ທ່ານສາມາດຈຶ້ງແອັບປັດຈຸບັນໄວ້ໃນມຸມມອງຈົນກວ່າທ່ານຈະຖອດປັກໝຸດມັນ. ຕົວຢ່າງ: ທ່ານສາມາດໃຊ້ຄຸນສົມບັດນີ້ເພື່ອອະນຸຍາດໃຫ້ໝູ່ທີ່ເຊື່ອຖືໄດ້ຫຼິ້ນເກມສະເພາະໃດໜຶ່ງໄດ້. \n\nເມື່ອປັກໝຸດແອັບໃດໜຶ່ງໄວ້ແລ້ວ, ແອັບທີ່ປັກມຸດໄວ້ອາດເປີດແອັບອື່ນ ຫຼື ອາດເຂົ້າເຖິງຂໍ້ມູນສ່ວນຕົວໄດ້. \n\nຫາກທ່ານຕ້ອງການແບ່ງປັນອຸປະກອນຂອງທ່ານໃຫ້ຄົນອື່ນໃຊ້ຢ່າງປອດໄພ, ໃຫ້ລອງໃຊ້ຜູ້ໃຊ້ແຂກແທນ. \n\nເພື່ອໃຊ້ການປັກໝຸດແອັບ: 	\n1.	ເປີດການປັກໝຸດແອັບ	\n2.	ເປີດພາບຮວມ 	\n3.	ແຕະໄອຄອນແອັບຢູ່ເທິງສຸດຂອງໜ້າຈໍ, ຈາກນັ້ນແຕະປັກໝຸດ"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"ການປັກໝຸດແອັບຈະເຮັດໃຫ້ທ່ານສາມາດຈຶ້ງແອັບປັດຈຸບັນໄວ້ໃນມຸມມອງຈົນກວ່າທ່ານຈະຖອດປັກໝຸດມັນ. ຕົວຢ່າງ: ທ່ານສາມາດໃຊ້ຄຸນສົມບັດນີ້ເພື່ອອະນຸຍາດໃຫ້ໝູ່ທີ່ເຊື່ອຖືໄດ້ຫຼິ້ນເກມສະເພາະໃດໜຶ່ງໄດ້."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"ເມື່ອປັກໝຸດແອັບໃດໜຶ່ງໄວ້ແລ້ວ, ແອັບທີ່ປັກໝຸດໄວ້ອາດເປີດແອັບອື່ນ ຫຼື ອາດເຂົ້າເຖິງຂໍ້ມູນສ່ວນຕົວໄດ້. \n\nເພື່ອໃຊ້ການປັກໝຸດແອັບ: \n1.	ເປີດການປັກໝຸດແອັບ \n2.	ເປີດພາບຮວມ \n3.	ແຕະໄອຄອນແອັບຢູ່ເທິງສຸດຂອງໜ້າຈໍ, ຈາກນັ້ນແຕະປັກໝຸດ"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"ເມື່ອປັກໝຸດແອັບໃດໜຶ່ງໄວ້ແລ້ວ, ແອັບທີ່ປັກໝຸດໄວ້ອາດເປີດແອັບອື່ນ ຫຼື ອາດເຂົ້າເຖິງຂໍ້ມູນສ່ວນຕົວໄດ້. \n\nຫາກທ່ານຕ້ອງການແບ່ງປັນອຸປະກອນຂອງທ່ານໃຫ້ຄົນອື່ນໃຊ້ຢ່າງປອດໄພ, ໃຫ້ລອງໃຊ້ຜູ້ໃຊ້ແຂກແທນ. \n\nເພື່ອໃຊ້ການປັກໝຸດແອັບ: 	\n1.	ເປີດໃຊ້ການປັກໝຸດແອັບ \n2.	ເປີດພາບຮວມ \n3.	ແຕະໄອຄອນແອັບຢູ່ເທິງສຸດຂອງໜ້າຈໍ, ຈາກນັ້ນແຕະປັກໝຸດ"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"ເມື່ອປັກໝຸດແອັບແລ້ວ: \n\n•		ຂໍ້ມູນສ່ວນຕົວອາດຖືກເຂົ້າເຖິງໄດ້\n		(ເຊັ່ນ: ລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ເນື້ອຫາອີເມວ) \n•		ແອັບທີ່ປັກໝຸດໄວ້ອາດເປີດແອັບອື່ນໆ \n\nຄວນໃຊ້ການປັກໝຸດແອັບກັບຄົນທີ່ທ່ານເຊື່ອຖືເທົ່ານັ້ນ."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"​ຖາມ​ຫາ​ຮູບ​ແບບ​ປົດ​ລັອກ​ກ່ອນ​ຍົກ​ເລີກ​ການ​ປັກ​ໝຸດ"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"​ຖາມ​ຫາ PIN ກ່ອນ​ຍົກ​ເລີກ​ການປັກ​ໝຸດ"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດ PIN ກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດ PIN ເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ຮູບແບບປົດລັອກກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ຮູບແບບປົດລັອກເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດຜ່ານກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດຜ່ານເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ນອກເໜືອໄປຈາກການໃຊ້ລະບົບຊີວະມິຕິເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດ PIN ກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດ PIN ເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ນອກເໜືອໄປຈາກການໃຊ້ລະບົບຊີວະມິຕິເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ຮູບແບບປົດລັອກກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ຮູບແບບປົດລັອກເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ນອກເໜືອໄປຈາກການໃຊ້ລະບົບຊີວະມິຕິເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດຜ່ານກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດຜ່ານເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ແມ່ນແລ້ວ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ບໍ່"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ຈຳກັດ"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ຖືກຄວບຄຸມໂດຍ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"ອຸປະກອນທີ່ເຊື່ອມຕໍ່"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ອຸປະກອນນີ້"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"ກຳລັງສຳຫຼັບ..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"ກຳລັງສະຫຼັບ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"ບໍ່ສາມາດສະຫຼັບໄດ້"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ກຳລັງສາກໄຟອຸປະກອນນີ້"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"ການສາກໄຟອຸປະກອນທີ່ເຊື່ອມຕໍ່"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"ການນຳໃຊ້ອິນເຕີເນັດມືຖື"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"ການ​​ໃຊ້​ຂໍ້​ມູນ​ແອັບ"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"ການໃຊ້ອິນເຕີເນັດ Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"ການນຳໃຊ້ອິນເຕີເນັດທີ່ບໍ່ແມ່ນຂອງຜູ້ໃຫ້ບໍລິການ"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ການໃຊ້ຂໍ້ມູນອີເທີເນັດ"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi​-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"ອີເທີເນັດ"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 ຂໍ້ຈຳກັດ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ການນັບຂໍ້ມູນຈາກຜູ້ໃຫ້ບໍລິການ ອາດມີຄວາມແຕກຕ່າງຈາກການນັບຂອງອຸປະກອນ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ບໍ່ຮວມການໃຊ້ອິນເຕີເນັດທີ່ຖືກໃຊ້ໂດຍເຄືອຂ່າຍຜູ້ໃຫ້ບໍລິການ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"ໃຊ້ໄປແລ້ວ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ຕັ້ງການເຕືອນຂໍ້ມູນ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ຄຳເຕືອນຂໍ້ມູນ"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ເບິ່ງລາຍລະອຽດ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ຕົວປະຢັດອິນເຕີເນັດ"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ຂໍ້ມູນທີ່ບໍ່ຖືກຈຳກັດ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ຂໍ້ມູນພື້ນຫຼັງຖືກປິດໄວ້"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ຂໍ້ມູນພື້ນຫຼັງຖືກປິດໄວ້"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ເປີດ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ປິດ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ໃຊ້ຕົວປະຢັດອິນເຕີເນັດ"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ຫາກອຸປະກອນຖືກລັອກໄວ້, ຈະມີການປ້ອງກັນບໍ່ໃຫ້ພິມຕອບກັບ ຫຼື ຂໍ້ຄວາມອື່ນໆໃນການແຈ້ງເຕືອນ"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ຕົວກວດການສະກົດຄຳເລີ່ມຕົ້ນ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ເລືອກຕົວກວດການສະກົດຄຳ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ໃຊ້ຕົວກວດການສະກົດຄຳ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ໃຊ້ຕົວກວດການສະກົດຄຳ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ບໍ່ໄດ້ເລືອກ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ບໍ່ມີ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ເພື່ອຊ່ວຍເພີ່ມພື້ນທີ່ຫວ່າງສຳລັບການຈັດເກັບຂໍ້ມູນ, ຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນຈະລຶບຮູບພາບ ແລະ ວິດີໂອທີ່ສຳຮອງຂໍ້ມູນໄວ້ອອກຈາກອຸປະກອນຂອງທ່ານ."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ລຶບຮູບພາບ ແລະ ວິດີໂອ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ໃຊ້ຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ໃຊ້ຕົວຈັດການບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ອັດຕະໂນມັດ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ຕັ້ງຄ່າເອງ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ສ້າງພື້ນທີ່ຈັດເກັບຂໍ້ມູນເພີ່ມ"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ແຕະສອງເທື່ອເພື່ອກວດສອບໂທລະສັບ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ແຕະສອງເທືື່ອເພື່ອກວດສອບແທັບເລັດ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ແຕະສອງເທືື່ອເພື່ອກວດສອບອຸປະກອນ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"ປັດເພື່ອເບິ່ງການແຈ້ງເຕືອນ"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ປັດລົງຢູ່ຂອບລຸ່ມຂອງໜ້າຈໍເພື່ອສະແດງການແຈ້ງເຕືອນຂອງທ່ານ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ໂໝດມືດຽວ"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ໃຊ້ໂໝດມືດຽວ"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ອອກເມື່ອສະຫຼັບແອັບ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ໝົດເວລາ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ວິນາທີ"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ວິນາທີ"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ວິນາທີ"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ຄວາມສາມາດໃນການເອື້ອມເຖິງ"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ເພື່ອກວດສອບເວລາ, ການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ແຕະສອງເທື່ອຢູ່ໜ້າຈໍຂອງທ່ານ."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ຍົກຂຶ້ນເພື່ອກວດສອບໂທລະສັບ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ຍົກຂຶ້ນເພື່ອກວດສອບແທັບເລັດ"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ແຕະເພື່ອກວດສອບແທັບເລັດ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ແຕະເພື່ອກວດສອບອຸປະກອນ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ເພື່ອກວດສອບເວລາ, ການແຈ້ງເຕືອນ ແລະ ຂໍ້ມູນອື່ນໆ, ໃຫ້ແຕະໃສ່ໜ້າຈໍຂອງທ່ານ."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS ສຸກເສີນ"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"ໃຊ້ SOS ສຸກເສີນ"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"ຈັດການໂດຍ <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"ເລີ່ມຄຳສັ່ງທາງລຸ່ມໂດຍການກົດປຸ່ມເປີດປິດໄວໆ 5 ເທື່ອ ຫຼື ຫຼາຍກວ່ານັ້ນ"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"ເປີດສຽງໂມງປຸກນັບຖອຍຫຼັງ"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"ເປີດສຽງດັງໆກ່ອນການແຈ້ງຂໍຄວາມຊ່ວຍເຫຼືອ"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"ໂທຂໍຄວາມຊ່ວຍເຫຼືອ"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"ເບີໂທຂໍຄວາມຊ່ວຍເຫຼືອ"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. ແຕະເພື່ອປ່ຽນ"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"ຫາກທ່ານລະບຸເບີໂທທີ່ບໍ່ແມ່ນເບີສຸກເສີນ:\n • ອຸປະກອນຂອງທ່ານຈະຕ້ອງປົດລັອກເພື່ອໃຊ້ SOS ສຸກເສີນ\n • ອາດບໍ່ມີຄົນຮັບສາຍຂອງທ່ານ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ປັດລາຍນິ້ວມືສຳລັບການແຈ້ງເຕືອນ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ປັດລາຍນິ້ວມື"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ເພື່ອກວດເບິ່ງການແຈ້ງເຕືອນຂອງທ່ານ, ໃຫ້ເລື່ອນລົງໃສ່ເຊັນເຊີນລາຍນິ້ວມືທີ່ຢູ່ຫຼັງໂທລະສັບຂອງທ່ານ."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"ຊຸດຂໍ້ມູນທີ່ສະແດງສູງສຸດ"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ຣີເຊັດເປັນຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"ຣີເຊັດຕົວເລືອກການຕື່ມຂໍ້ມູນນັກພັດທະນາໂດຍອັດຕະໂນມັດແລ້ວ"</string>
+    <string name="location_category" msgid="3496759112306219062">"ສະຖານທີ່"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"ຕົວລະບຸສະຖານທີ່ແຖບສະຖານະ"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"ສະແດງສຳລັບສະຖານທີ່ທັງໝົດ, ຮວມທັງເຄືອຂ່າຍ ແລະ ການເຊື່ອມຕໍ່"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"ບັງຄັບການກວດສອບ GNSS ເຕັມຮູບແບບ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ຕິດຕາມກຸ່ມ ແລະ ຄວາມຖີ່ GNSS ທັງໝົດໂດຍບໍ່ມີຮອບຕາມພັນທະ"</string>
     <string name="device_theme" msgid="5027604586494772471">"ຮູບແບບສີສັນອຸປະກອນ"</string>
     <string name="default_theme" msgid="4815428567082263639">"ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"ຊື່ເຄືອຂ່າຍ"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"ຢຸດການແຈ້ງເຕືອນຊົ່ວຄາວເພື່ອໃຫ້ມີສະມາທິ"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ບໍ່ສາມາດໃຊ້ຄຸນສົມບັດໄດ້"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"ຄຸນສົມບັດນີ້ຖືກປິດໄວ້ແລ້ວເນື່ອງຈາກມັນເຮັດໃຫ້ໂທລະສັບຂອງທ່ານຊ້າ"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"ບັງຄັບການກວດສອບ GNSS ເຕັມຮູບແບບ"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ຕິດຕາມກຸ່ມ ແລະ ຄວາມຖີ່ GNSS ທັງໝົດໂດຍບໍ່ມີຮອບຕາມພັນທະ"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"ສະແດງກ່ອງຂໍ້ຄວາມການເຮັດວຽກລົ້ມເຫລວທຸກເທື່ອ"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"ສະແດງກ່ອງຂໍ້ຄວາມທຸກເທື່ອທີ່ແອັບເຮັດວຽກລົ້ມເຫລວ"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ເລືອກແອັບທີ່ໃຊ້ ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ເປີດໃຊ້ສຳລັບທຸກແອັບ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ເລືອກໄດຣເວີກຣາບຟິກ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ຄ່າເລີ່ມຕົ້ນ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ໄດຣເວີເກມ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ໄດຣເວີເກມ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ໄດຣເວີນັກພັດທະນາ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ໄດຣເວີກຣາບຟິກລະບົບ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"ເປີດ (ປິດສຽງ)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ປິດ"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"ລາຍລະອຽດເຄືອຂ່າຍ"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"ຊື່ອຸປະກອນຂອງທ່ານຈະສາມາດເບິ່ງເຫັນໄດ້ໂດຍແອັບຢູ່ໂທລະສັບຂອງທ່ານ. ນອກຈາກນັ້ນ, ຄົນອື່ນອາດຈະເຫັນມັນໄດ້ເມື່ອທ່ານເຊື່ອມຕໍ່ຫາອຸປະກອນ Bluetooth ຫຼື ຕັ້ງ Wi-Fi ຮັອດສະປອດ."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"ຊື່ອຸປະກອນຂອງທ່ານຈະສະແດງໃຫ້ແອັບຕ່າງໆຢູ່ໂທລະສັບເຫັນ. ມັນອາດຖືກສະແດງໃຫ້ຄົນອື່ນເຫັນໃນເວລາທີ່ທ່ານເຊື່ອມຕໍ່ຫາອຸປະກອນ Bluetooth, ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍ Wi-Fi ຫຼື ຕັ້ງຄ່າຮັອດສະປອດ Wi-Fi ນຳ."</string>
     <string name="devices_title" msgid="649715719278562515">"ອຸປະກອນ"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"ການຕັ້ງຄ່າທັງໝົດ"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"ຄຳແນະນຳ"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ບໍ່ພົບເຄືອຂ່າຍ. ກະລຸນາລອງໃໝ່ອີກເທື່ອໜຶ່ງ."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ຕ້ອງຫ້າມ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ບໍ່ມີຊິມກາດ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ບໍ່ມີຊິມ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ບໍ່ມີ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ຕ້ອງໃຊ້ SIM ເພື່ອເຊື່ອມຕໍ່"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ຕ້ອງໃຊ້ SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ເພື່ອເຊື່ອມຕໍ່"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: ຕ້ອງການ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: GSM ເທົ່ານັ້ນ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ໂໝດເຄືອຂ່າຍທີ່ຕ້ອງການ: WCDMA ເທົ່ານັ້ນ"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ອິນເຕີເນັດມືຖື"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ເຂົ້າເຖິງອິນເຕີເນັດຜ່ານເຄືອຂ່າຍມືຖື"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ໂທລະສັບຈະສະຫຼັບໄປໃຊ້ຜູ້ໃຫ້ບໍລິການນີ້ໂດຍອັດຕະໂນມັດເມື່ອຢູ່ໃນໄລຍະ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ບໍ່ມີຊິມກາດທີ່ສາມາດໃຊ້ໄດ້"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ການຕັ້ງຄ່າການໂທ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"ການຕັ້ງຄ່າ SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ຖາມທຸກເທື່ອ"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ບໍ່ສາມາດໃຊ້ໄດ້ເມື່ອເຊື່ອມຕໍ່ກັບ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"ເບິ່ງເພີ່ມເຕີມ"</string>
     <string name="see_less" msgid="2642392725363552793">"​​ເບິ່ງ​ໜ້ອຍ​ລົງ"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"ເປີດໃຊ້ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ບໍ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ເປີດໃຊ້ຊິມບໍ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"ສະຫຼັບໄປໃຊ້ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ບໍ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ສະຫຼັບໄປໃຊ້ຊິມກາດບໍ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ສາມາດເປີດໃຊ້ເທື່ອລະຊິມເທົ່ານັ້ນ.\n\nການສະຫຼັບໄປໃຊ້ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ຈະບໍ່ຍົກເລີກບໍລິການ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ຂອງທ່ານ."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ສາມາດເປີດໃຊ້ຊິມທີ່ດາວໂຫລດມາແລ້ວເທື່ອລະອັນເທົ່ານັ້ນ.\n\nການສະຫຼັບໄປໃຊ້ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ຈະບໍ່ຍົກເລີກບໍລິການ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ຂອງທ່ານ."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ສາມາດເປີດໃຊ້ໄດ້ເທື່ອລະຊິມເທົ່ານັ້ນ.\n\nການສະຫຼັບຈະບໍ່ຍົກເລີກບໍລິການ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ຂອງທ່ານ."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"ສະຫຼັບໄປ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ກຳລັງເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍ…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"ກຳລັງສຳຫຼັບໄປ <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ບໍ່ສາມາດສະຫຼັບຜູ້ໃຫ້ບໍລິການໄດ້"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ບໍ່ສາມາດສະຫຼັບຜູ້ໃຫ້ບໍລິການໄດ້ເນື່ອງຈາກເກີດຄວາມຜິດພາດຂຶ້ນ."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"ປິດ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ໄວ້ບໍ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ປິດ SIM ບໍ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ກຳລັງປິດ SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ບໍ່ສາມາດປິດການນຳໃຊ້ຜູ້ໃຫ້ບໍລິການໄດ້"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ມີບາງຢ່າງຜິດພາດເກີດຂຶ້ນ ແລະ ບໍ່ສາມາດປິດການນຳໃຊ້ຜູ້ໃຫ້ບໍລິການຂອງທ່ານໄດ້."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"ໃຊ້ 2 ຊິມບໍ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ອຸປະກອນນີ້ສາມາດເປີດໃຊ້ 2 ຊິມໄດ້ພ້ອມກັນ. ເພື່ອດຳເນີນການຕໍ່ໂດຍໃຊ້ເທື່ອລະຊິມ, ໃຫ້ແຕະໃສ່ \"ບໍ່, ຂອບໃຈ\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ຣີສະຕາດອຸປະກອນບໍ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ເພື່ອເລີ່ມຕົ້ນ, ໃຫ້ຣີສະຕາດອຸປະກອນຂອງທ່ານກ່ອນ. ຈາກນັ້ນທ່ານສາມາດເພີ່ມຊິມອື່ນໃສ່ໄດ້."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ສືບຕໍ່"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ຣີສະຕາດ"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"ບໍ່, ຂອບໃຈ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"ສະຫຼັບ"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ບໍ່ສາມາດເປີດນຳໃຊ້ຊິມໄດ້"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ກະລຸນາຖອດຊິມອອກແລ້ວໃສ່ເຂົ້າໄປໃໝ່. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ໃຫ້ຣີສະຕາດອຸປະກອນຂອງທ່ານ."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ໃຫ້ລອງເປີດຊິມຄືນໃໝ່. ຫາກຍັງຄົງພົບບັນຫາຢູ່, ໃຫ້ຣີສະຕາດອຸປະກອນຂອງທ່ານ."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"ການເປີດນຳໃຊ້ເຄືອຂ່າຍ"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"ເປີດໃຊ້ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ຢູ່"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ແຕະເພື່ອອັບເດດການຕັ້ງຄ່າຊິມກາດ"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"ຊິມກາດ"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"ລຶບ SIM ທີ່ດາວໂຫລດມາແລ້ວນີ້ອອກບໍ?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ການລຶບ SIM ນີ້ຈະລຶບບໍລິການ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ອອກຈາກອຸປະກອນນີ້.\n\nຈະບໍ່ຍົກເລີກບໍລິການສຳລັບ <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"ລຶບ"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"ກຳລັງລຶບ SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"ບໍ່ສາມາດລຶບ SIM ອອກໄດ້"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"ບໍ່ສາມາດລຶບ SIM ອອກໄດ້ເນື່ອງຈາກມີຂໍ້ຜິດພາດ.\n\nກະລຸນາຣີສະຕາດອຸປະກອນຂອງທ່ານແລ້ວລອງໃໝ່."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ເຊື່ອມຕໍ່ຫາອຸປະກອນ"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"ແອັບ <xliff:g id="APPNAME">%1$s</xliff:g> ຕ້ອງການໃຊ້ເຄືອຂ່າຍ Wi‑Fi ຊົ່ວຄາວເພື່ອເຊື່ອມຕໍ່ຫາອຸປະກອນຂອງທ່ານ"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ບໍ່ພົບອຸປະກອນ. ກະລຸນາກວດສອບວ່າເປີດອຸປະກອນແລ້ວ ແລະ ສາມາດເຊື່ອມຕໍ່ໄດ້."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"​ການ​ໂທ​ສຸກ​ເສີນ"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"ຜູ້ໃຫ້ບໍລິການຂອງທ່ານບໍ່ຮອງຮັບການໂທສຸກເສີນຜ່ານ Wi‑Fi.\nອຸປະກອນຈະສະຫຼັບໄປໃຊ້ເຄືອຂ່າຍມືຖືໂດຍອັດຕະໂນມັດເພື່ອໂທສຸກເສີນ.\nທ່ານສາມາດໂທສຸກເສີນໄດ້ສະເພາະໃນເວລາທີ່ຢູ່ໃນພື້ນທີ່ທີ່ມີສັນຍານໂທລະສັບມືຖືເທົ່ານັ້ນ."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"ໃຊ້ Wi‑Fi ສຳລັບການໂທເພື່ອປັບປຸງຄຸນນະພາບ"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"ການໂທຂ້າມຊິມ"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"ອະນຸຍາດໃຫ້ມີການໂທ ແລະ ສົ່ງ SMS ຂອງຊິມອື່ນຜ່ານຊິມນີ້."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"ການໂທຂ້າມຊິມ"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"ຂໍ້ຄວາມ MMS ຂາເຂົ້າ"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"ບໍ່ສາມາດສົ່ງຂໍ້​ຄວາມ MMS ໄດ້"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"ແຕະເພື່ອອະນຸຍາດໃຫ້ສົ່ງຂໍ້ຄວາມ MMS ຢູ່ <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> ໄດ້ເມື່ອປິດການໃຊ້ອິນເຕີເນັດມືຖື"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"ອະນຸຍາດໃຫ້ມີການຊ້ອນໜ້າຈໍຢູ່ການຕັ້ງຄ່າ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ອະນຸຍາດໃຫ້ແອັບທີ່ສາມາດສະແດງຜົນທັບແອັບອື່ນເພື່ອຊ້ອນໜ້າຈໍການຕັ້ງຄ່າ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"ມີເດຍ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"ເຊື່ອງຕົວຫຼິ້ນເມື່ອເຊດຊັນມີເດຍສິ້ນສຸດແລ້ວ"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"ຕົວຫຼິ້ນຈະເຮັດໃຫ້ທ່ານສາມາດສືບຕໍ່ເຊດຊັນໃດໜຶ່ງໄດ້ຈາກແຜງການຕັ້ງຄ່າດ່ວນທີ່ຂະຫຍາຍແລ້ວໄດ້."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ເຄື່ອງຫຼິ້ນມີເດຍໃນການຕັ້ງຄ່າດ່ວນ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"ສະແດງເຄື່ອງຫຼິ້ນມີເດຍດົນຂຶ້ນເພື່ອສືບຕໍ່ການຫຼິ້ນໄດ້ຢ່າງງ່າຍດາຍ"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ເຊື່ອງຕົວຫຼິ້ນ"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ສະແດງຕົວຫຼິ້ນ"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ບໍ່ມີຕົວຫຼິ້ນທີ່ສາມາດໃຊ້ໄດ້"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ແອັບທີ່ອະນຸຍາດແລ້ວ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"ມີເດຍ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ຈະ​ເປີດ"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ເປີດ"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"ປິດ"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"ອິນເຕີເນັດ"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"ເຄືອຂ່າຍທີ່ປອດໄພກັບຍົນ"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ຊອກຫາ ແລະ ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍທີ່ປອດໄພກັບຍົນ"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ຍົນ, ປອດໄພກັບຍົນ"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"ການໂທ ແລະ SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"ການໂທ Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ໂທ ແລະ ຮັບສາຍຜ່ານເຄືອຂ່າຍທີ່ບໍ່ແມ່ນຂອງຜູ້ໃຫ້ບໍລິການ ເຊັ່ນ: Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"ການໂທ Wi‑Fi ຈະເຮັດໃຫ້ທ່ານສາມາດໂທ ແລະ ຮັບສາຍຜ່ານເຄືອຂ່າຍທີ່ບໍ່ແມ່ນຂອງຜູ້ໃຫ້ບໍລິການໄດ້ ເຊັ່ນ: ເຄືອຂ່າຍ Wi‑Fi ບາງບ່ອນ."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"ການໂທ"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"ຕ້ອງການ"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"ຕ້ອງການການໂທ"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"ຕ້ອງການ SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ບໍ່ມີຂໍ້ມູນ"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"ບໍ່ມີຊິມ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ການຕັ້ງຄ່າ"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍສາທາລະນະ"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ການເຊື່ອມຕໍ່ເຄືອຂ່າຍ, ອິນເຕີເນັດ, ໄຮ້ສາຍ, ອິນເຕີເນັດມືຖື, wifi, wi-fi, wi fi, ເຄືອຂ່າຍທືຖື, ມືຖື, ຜູ້ໃຫ້ບໍລິການມືຖື, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ເບິ່ງເຄືອຂ່າຍທີ່ປອດໄພສຳລັບຍົນ"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ປິດໂໝດຢູ່ໃນຍົນ"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ບໍ່ສາມາດໃຊ້ໄດ້ເນື່ອງຈາກເປີດໂໝດເວລານອນຢູ່"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"ຣີເຊັດຄວາມສຳຄັນການແຈ້ງເຕືອນສຳເລັດແລ້ວ."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"ແອັບ"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"ມີອຸປະກອນທີ່ບໍ່ເຊື່ອຖືຕ້ອງການເຂົ້າເຖິງຂໍ້ຄວາມຂອງທ່ານ. ແຕະເພື່ອເບິ່ງລາຍລະອຽດ."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"ອະນຸຍາດການເຂົ້າເຖິງຂໍ້ຄວາມບໍ?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"ອຸປະກອນ Bluetooth ທີ່ບໍ່ເຊື່ອຖື, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ຕ້ອງການເຂົ້າເຖິງຂໍ້ຄວາມຂອງທ່ານ.\n\nທ່ານບໍ່ເຄີຍເຊື່ອມຕໍ່ຫາ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ມາກ່ອນ."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"ມີອຸປະກອນທີ່ບໍ່ເຊື່ອຖືຕ້ອງການເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ບັນທຶກການໂທຂອງທ່ານ. ແຕະເພື່ອເບິ່ງລາຍລະອຽດ."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"ອະນຸຍາດການເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ບັນທຶກການໂທບໍ?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"ອຸປະກອນ Bluetooth ທີ່ບໍ່ເຊື່ອຖື, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ຕ້ອງການເຂົ້າເຖິງລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະ ບັນທຶກການໂທຂອງທ່ານ. ນີ້ຮວມເຖິງຂໍ້ມູນກ່ຽວກັບການໂທເຂົ້າ ແລະ ໂທອອກນຳ.\n\nທ່ານບໍ່ເຄີຍເຊື່ອມຕໍ່ຫາ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ມາກ່ອນ."</string>
 </resources>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index d423cd5..5b42dbf 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Vidutinė"</item>
     <item msgid="6740026006576843477">"Ilga"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Trumpas"</item>
+    <item msgid="7397961711906421599">"Vidutinis"</item>
+    <item msgid="4079132024502041928">"Ilgas"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Numatytasis"</item>
     <item msgid="4234707448428002595">"Be užraitų"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA / „EvDo“ / GSM / WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA ir LTE / „EvDo“"</item>
     <item msgid="2247906254631766720">"GSM / WCDMA / LTE"</item>
-    <item msgid="1091258946200124345">"Visuotinis"</item>
+    <item msgid="4147872615520331421">"LTE / CDMA / „EvDo“ / GSM / WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Tik TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR / LTE"</item>
     <item msgid="5237423971422723128">"NR / LTE / CDMA / „EvDo“"</item>
     <item msgid="6856991565745877075">"NR / LTE / GSM / WCDMA"</item>
-    <item msgid="473436147270962091">"NR / LTE / CDMA / „EvDo“ / GSM / WCDMA"</item>
+    <item msgid="8908263949185004366">"Visuotinis"</item>
     <item msgid="6692179237956480280">"NR / LTE / WCDMA"</item>
     <item msgid="8160757136163231885">"NR / LTE / TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR / LTE / TDSCDMA / GSM"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index c6b04e19..f18d429 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -258,8 +258,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Data ir laikas"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Nustatyti datą ir laiką"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Nustatyti datą, laiką, laiko juostą ir formatus"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Naudoti tinklo pateiktą laiką"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Naudoti tinklo pateiktą laiko juostą"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Nustatyti laiką automatiškai"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Nustatyti laiko juostą automatiškai"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Naudoti numatytuosius lokalės nustatymus"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 val. formatas"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Naudoti 24 val. formatą"</string>
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Rodyti profilio informaciją užrakinimo ekrane"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Paskyros"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Vietovė"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Naudoti vietovę"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Naudoti vietovę"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Išjungti"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Įjungta – <xliff:g id="COUNT_1">%1$d</xliff:g> programa gali pasiekti vietovę</item>
@@ -326,6 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekrano užraktas, atrakinimas pagal veidą"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekrano užraktas, piršto antspaudas"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekrano užraktas"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Saugiai atrakinkite telefoną veidu ir kontroliniu kodu"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Galite prisijungti prie programų ir patvirtinti mokėjimus"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Nustatyti atrakinimą naudojant:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Atrakinimas pagal veidą"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Palengvinkite telefono atrakinimą"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Kontrolinis kodas"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Atrakinkite telefoną dar kišenėje"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Praleisti"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Kitas"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Veidas pridėtas"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Nustatykite Atrakinimą pagal veidą"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Atrakinimas pagal veidą"</string>
@@ -335,6 +344,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Autentifikavimas naudojant veidą"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Pradėti"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Jei pritaikomumo atrakinimo pagal veidą funkcija išjungta, kai kurie sąrankos veiksmai gali tinkamai neveikti su „TalkBack“."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Grįžti"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Tęsti sąranką"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Naud. pritaikymo neįgal. sąranką"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -379,8 +391,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Naudojant Atrakinimą pagal veidą programose, reikalauti patvirtinimo"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Ištrinti veido duom."</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Nustatyti Atrakinimą pagal veidą"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Naudodami Atrakinimą pagal veidą atrakinkite įrenginį, prisijunkite prie programų ir patvirtinkite mokėjimus.\n\nNepamirškite toliau nurodytų dalykų\nŽiūrėdami į telefoną galite jį atrakinti net neketindami to daryti.\n\nTelefoną gali atrakinti kitas asmuo, laikydamas jį priešais jūsų veidą.\n\nTelefoną gali atrakinti į jus labai panašus asmuo, pvz., identiškas dvynys."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Naudodami Atrakinimą pagal veidą atrakinkite įrenginį, prisijunkite prie programų ir patvirtinkite mokėjimus.\n\nNepamirškite toliau nurodytų dalykų:\nŽiūrint į telefoną jis gali būt atrakintas, kai to neketinate atlikti.\n\nTelefoną gali atrakinti kitas asmuo, laikydamas jį prieš jus, net kai esate užsimerkę.\n\nTelefoną gali atrakinti į jus labai panašus asmuo, pvz., identiškas dvynys."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Naudokite atrakinimo pagal veidą funkciją telefonui atrakinti, prisijungti prie programų ir mokėjimams patvirtinti."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Pastabos.\nŽiūrėdami į telefoną galite jį atrakinti net neketindami to daryti.\n\nTelefoną gali atrakinti kitas asmuo, laikydamas jį priešais jūsų veidą.\n\nTelefoną gali atrakinti į jus labai panašus asmuo, pvz., identiškas dvynys."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Pastabos.\nŽiūrėdami į telefoną galite jį atrakinti net neketindami to daryti.\n\nTelefoną gali atrakinti kitas asmuo, laikydamas jį prieš jus, net kai esate užsimerkę.\n\nTelefoną gali atrakinti į jus labai panašus asmuo, pvz., identiškas dvynys."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Ištrinti veido duomenis?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Atrakinimo pagal veidą funkcijos naudojami veido duomenys bus visam laikui ir saugiai ištrinti. Pašalinus reikės PIN kodo, atrakinimo piešinio arba slaptažodžio norint atrakinti telefoną, prisijungti prie programų ir patvirtinti mokėjimus."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Naudokite Atrakinimą pagal veidą, kad atrakintumėte telefoną"</string>
@@ -402,6 +415,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Atrakinkite telefoną ir patvirtinkite pirkimo operacijas piršto atspaudu.\n\nPastaba: negalite atrakinti šio įrenginio piršto atspaudu. Norėdami gauti daugiau informacijos, susisiekite su organizacijos administratoriumi."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Atrakinkite telefoną ir patvirtinkite pirkimo operacijas piršto atspaudu.\n\nPastaba: piršto atspaudas gali būti ne toks saugus kaip patikimas atrakinimo piešinys ar PIN kodas."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Atšaukti"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, ačiū"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Tęsti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Praleisti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Kitas"</string>
@@ -439,6 +453,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Pasirinkę ekrano užrakto parinktį apsaugosite planšetinį kompiuterį, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti Atrakinimą pagal veidą. Jei norite grįžti, palieskite „Atšaukti“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Pasirinkę ekrano užrakto parinktį apsaugosite įrenginį, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti Atrakinimą pagal veidą. Jei norite grįžti, palieskite „Atšaukti“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Pasirinkę ekrano užrakto parinktį apsaugosite telefoną, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Ekrano užrakto taip pat reikia norint nustatyti Atrakinimą pagal veidą. Jei norite grįžti, palieskite „Atšaukti“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Pasirinkę ekrano užrakto parinktį apsaugosite planšetinį kompiuterį, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Norėdami nustatyti biometrinius duomenis taip pat turite įjungti ekrano užrakto parinktį. Jei norite grįžti, palieskite „Atšaukti“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Pasirinkę ekrano užrakto parinktį apsaugosite įrenginį, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Norėdami nustatyti biometrinius duomenis taip pat turite įjungti ekrano užrakto parinktį. Jei norite grįžti, palieskite „Atšaukti“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Pasirinkę ekrano užrakto parinktį apsaugosite telefoną, kad jo niekas negalėtų naudoti, jei jį pamestumėte ar jis būtų pavogtas. Norėdami nustatyti biometrinius duomenis taip pat turite įjungti ekrano užrakto parinktį. Jei norite grįžti, palieskite „Atšaukti“."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Praleisti PIN kodo sąranką?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Praleisti slaptažodžio sąranką?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Praleisti atrakinimo piešinio sąranką?"</string>
@@ -511,8 +528,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Neleiskite kitiems asmenims naudoti šio planšetinio kompiuterio be leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Neleiskite kitiems asmenims naudoti šio įrenginio be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Neleiskite kitiems asmenims naudoti šio telefono be jūsų leidimo, suaktyvinę įrenginio apsaugos funkcijas. Pasirinkite norimą naudoti užrakinimo ekraną."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Pasirinkite atsarginį ekrano užrakto metodą"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Pasirinkite atsarginį ekrano užrakto metodą"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Pasirinkite atsarginį ekrano užrakto metodą"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Ekrano užrakto parinktys"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Ekrano užrakto parinktys"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Ekrano užraktas"</string>
@@ -544,6 +560,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Atrakinimas pagal veidą ir slaptažodis"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Tęsti nenaudojant Atrakinimo pagal veidą"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefoną galite atrakinti naudodami veidą. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometriniai duomenys ir atrakinimo piešinys"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometriniai duomenys ir PIN kodas"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometriniai duomenys ir slaptažodis"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Tęsti be biometrinių duomenų"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefoną galite atrakinti naudodami biometrinius duomenis. Saugos sumetimais, įgalinus šią parinktį, reikia naudoti atsarginį ekrano užraktą."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Neleido: admin., šifr. polit. ar pr. duom. atmin."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nėra"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Perbraukti"</string>
@@ -635,7 +656,6 @@
       <item quantity="other">Turi būti mažiau nei <xliff:g id="NUMBER_1">%d</xliff:g> skaitmenų</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Įrenginio administratorius neleidžia naudoti pastarojo PIN kodo"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Dažnai naudojamus PIN kodus užblokavo IT administratorius. Bandykite naudoti kitą PIN kodą."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Negali būti netinkamų simbolių"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Turi būti bent viena raidė"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Turi būti bent vienas skaitmuo"</string>
@@ -683,7 +703,6 @@
       <item quantity="other">Turi būti bent <xliff:g id="COUNT">%d</xliff:g> neskaitinių simbolių</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Įrenginio administratorius neleidžia naudoti pastarojo slaptažodžio"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Dažnai naudojamus slaptažodžius užblokavo IT administratorius. Bandykite naudoti kitą slaptažodį."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Didėjanti, mažėjanti ar pasikartojanti skaitmenų seka neleidžiama"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Patvirtinti"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Atšaukti"</string>
@@ -829,7 +848,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Įjungti „Wi-Fi“"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Naudoti „Wi-Fi“"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Naudoti „Wi-Fi“"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"„Wi-Fi“ nustatymai"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Nustatyti ir valdyti bevielius prieigos taškus"</string>
@@ -937,7 +956,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centruokite toliau pateiktą QR kodą, kad galėtumėte prisijungti prie „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Prisijunkite prie „Wi‑Fi“ nuskaitydami QR kodą"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"„Wi‑Fi“ bendrinimas"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Nuskaitykite šį QR kodą, kad prisijungtumėte prie „<xliff:g id="SSID">%1$s</xliff:g>” ir galėtumėte bendrinti slaptažodį"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Nuskaitykite šį QR kodą kitu įrenginiu, kad prisijungtumėte prie „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Nuskaitykite šį QR kodą, kad prisijungtumėte prie „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Bandykite dar kartą. Jei problema išlieka, susisiekite su įrenginio gamintoju"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Iškilo problema"</string>
@@ -963,8 +982,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"„Wi-Fi“ slaptažodis: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Viešosios interneto prieigos taško slaptažodis: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatiškai prisijungti"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Leisti telefonui automatiškai prisijungti esant netoli šio tinklo"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Leisti planšetiniam kompiuteriui automatiškai prisijungti esant netoli šio tinklo"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Leisti prisijungti prie šio tinklo, kai įrenginys bus tinklo diapazone"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Pridėti įrenginį"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Naudokite QR kodą, kad galėtumėte pridėti įrenginį prie šio tinklo"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kodas netinkamo formato"</string>
@@ -976,7 +994,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Naudoti sistemos sertifikatus"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Neteikti"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Nepatvirtinti"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nenurodytas joks sertifikatas. Ryšys nebus privatus."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Tinklo pavadinimas per ilgas."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Būtina nurodyti domeną."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Būtinas sertifikatas."</string>
@@ -1003,6 +1020,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Prijungti"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"„Wi-Fi“ įjungtas"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Prisijungta prie „<xliff:g id="NETWORK_NAME">%1$s</xliff:g>“"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Prisijungiama prie „<xliff:g id="NETWORK_NAME">%1$s</xliff:g>“"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Prijungiama…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Jungiantis prie tinklo įvyko klaida."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Tinklas ne diapazone"</string>
@@ -1036,6 +1054,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Įrenginio MAC adresas"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Atsitiktinis MAC adresas"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Atsitiktinai parinktas MAC adresas (pastarasis)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresas"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Išsami tinklo info."</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Potinklio kaukė"</string>
@@ -1043,8 +1062,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"„IPv6“ adresai"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Išsaugoti tinklai"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Prenumeratos"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Kiti tinklai"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP nustatymai"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"„Wi‑Fi“ išplėstiniai nustatymai nepasiekiami šiam naudotojui"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Išsaugoti"</string>
@@ -1053,8 +1071,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Įveskite galiojantį tinklų sietuvo adresą."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Įveskite galiojantį DNS adresą."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Įveskite 0–32 simbolių tinklo kodą."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (nebent nepaisoma taikant privačią DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (nebent nepaisoma taikant privačią DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Tinklų sietuvas"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Tinklo kodo ilgis"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Tiesiog. „Wi-Fi“ r."</string>
@@ -1080,7 +1098,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Programa bendrina turinį. Norėdami bendrinti interneto ryšį, išjunkite viešosios interneto prieigos tašką ir vėl jį įjunkite."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nenustatyta jokių slaptažodžių"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Viešosios interneto prieigos taško pavadinimas"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Įjungiamas „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Įjungiama „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Kiti įrenginiai gali prisijungti prie „<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>“"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Viešosios interneto prieigos taško slaptažodis"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Prieigos taško juosta"</string>
@@ -1230,7 +1248,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automatiškai padidinamas kai kurio turinio atnaujinimo dažnis nuo 60 iki 90 Hz. Vartojama daugiau akumuliatoriaus energijos."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Priverstinis 90 Hz atnaujinimo dažnis"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Didžiausias atnaujinimo dažnis, siekiant patobulinti palietimo atsakomumą ir animacijos kokybę. Vartojama daugiau akumuliatoriaus energijos."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Žiūrėjimas į ekraną"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Įjungta – ekranas neišsijungs, kol į jį žiūrėsite"</string>
@@ -1321,6 +1339,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Tamsus ekranas įjungiamas gavus naujų pranešimų"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Visada rodyti laiką ir inform."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Naudojama daugiau akumuliatoriaus energijos"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Pusjuodis tekstas"</string>
     <string name="title_font_size" msgid="570613010306330622">"Šrifto dydis"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Padidinkite arba sumažinkite tekstą"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM kort. užrakto nust."</string>
@@ -1371,7 +1390,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"„Android“ versija"</string>
     <string name="security_patch" msgid="4071756145347865382">"„Android“ saugos naujinys"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelis"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelis: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelis, aparat. įranga"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Aparatinės įrangos versija"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Įrangos ID"</string>
@@ -1620,7 +1638,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Ištrinti APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Naujas APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Išsaugoti"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Atmesti"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Atšaukti"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Pavadinimo laukas negali būti tuščias."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN negali būti tuščias."</string>
@@ -1635,8 +1653,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Programas galima nustatyti iš naujo"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Iš naujo nustatyti „Wi-Fi“, mobiliųjų duomenų ir „Bluetooth“ nustatymus"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Bus iš naujo nustatyti visi tinklo nustatymai, įskaitant:\n\n"<li>"„Wi‑Fi“;"</li>\n<li>"mobiliojo ryšio duomenis;"</li>\n<li>"„Bluetooth“."</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Ištrinti"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Ištrinti atsisiųstas SIM kort."</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Jei norite atsisiųsti pakaitinių SIM kortelių, susisiekite su operatoriumi. Tai atlikus mobiliojo ryšio paslaugų planai nebus atšaukti."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Šiuo veiksmu neatšauksite jokio mobiliųjų paslaugų plano. Jei norite atsisiųsti pakaitinių SIM kortelių, susisiekite su operatoriumi."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Nustatyti iš naujo"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Iš naujo nustatyti visus tinklo nustatymus? Negalite anuliuoti šio veiksmo."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Iš naujo nustatyti visus tinklo nustatymus ir ištrinti atsisiųstas SIM korteles? Negalite anuliuoti šio veiksmo."</string>
@@ -1646,31 +1665,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Tinklo nustatymai nustatyti iš naujo"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nepavyko ištrinti SIM kortelių"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Atsisiųstų SIM kortelių negalima ištrinti dėl klaidos.\n\nIš naujo paleiskite įrenginį ir bandykite dar kartą."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Ištrinti visus duomenis (atkurti gamyklinius duomenis)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Ištrinti visus duomenis (atkurti gamyklinius duomenis)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą;"</li>\n<li>"sistemos ir programų duomenis bei nustatymus;"</li>\n<li>"atsisiųstas programas."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Bus ištrinti visi duomenys iš telefono "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą;"</li>\n<li>"sistemos ir programų duomenis bei nustatymus;"</li>\n<li>"atsisiųstas programas."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Yra kitų šio įrenginio naudotojų.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muzika"</li>\n<li>"Nuotraukos"</li>\n<li>"Kiti naudotojo duomenys"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"„eSIM“ kortelės"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Tai atlikus mobiliojo ryšio paslaugos planas nebus atšauktas."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Norint išvalyti muzikos failus, paveikslėlius bei kitus naudotojo duomenis, reikia ištrinti "<b>"USB atmintį"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Norint išvalyti muzikos failus, paveikslėlius ir kitus naudotojo duomenis, reikia ištrinti "<b>"SD kortelę"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Ištrinti visus duomenis (atkurti gamyklinius nustatymus)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Ištr. duom. (atk. gam. nust.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Bus ištrinti visi duomenys iš planšetinio kompiuterio "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą;"</li>\n<li>"sistemos ir programų duomenis bei nustatymus;"</li>\n<li>"atsisiųstas programas."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Bus ištrinti visi duomenys iš telefono "<b>"vidinės atminties"</b>", įskaitant:\n\n"<li>"„Google“ paskyrą;"</li>\n<li>"sistemos ir programų duomenis bei nustatymus;"</li>\n<li>"atsisiųstas programas."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Šiuo metu esate prisijungę prie šių paskyrų:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Yra kitų šio įrenginio naudotojų.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muzika"</li>\n<li>"Nuotraukos"</li>\n<li>"Kiti naudotojo duomenys"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"„eSIM“ kortelės"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Tai atlikus mobiliojo ryšio paslaugų planas nebus atšauktas."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Norint išvalyti muzikos failus, nuotraukas ir kitus naudotojo duomenis, reikia ištrinti "<b>"USB atmintį"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Norint išvalyti muzikos failus, nuotraukas ir kitus naudotojo duomenis, reikia ištrinti "<b>"SD kortelę"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Ištrinti USB atmintinę"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Ištrinti SD kortelę"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ištrinti visus vidinės USB atminties duomenis, pvz., muzikos failus ar nuotraukas"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Ištrinti visus SD kortelės duomenis, pvz., muzikos failus ar nuotraukas"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Trinti visus duomenis"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Trinti visus duomenis"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Bus ištrinta visa asmens informacija ir atsisiųstos programos. Negalite anuliuoti šio veiksmo."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Bus ištrinta visa asmens informacija, įskaitant atsisiųstas programas ir SIM korteles. Negalite anuliuoti šio veiksmo."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Ištrinti viską"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nebuvo nustatyta iš naujo, nes paslauga „Sistemos išvalymas“ nepasiekiama."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Ištrinti visus duomenis?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Šis naudotojas negali atkurti gamyklinių nustatymų"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Ištrinama"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Palaukite..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Trinti visus duomenis"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Trinti visus duomenis"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Bus ištrinta visa asmens informacija ir atsisiųstos programos. Negalite anuliuoti šio veiksmo."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Bus ištrinta visa asmens informacija, įskaitant atsisiųstas programas ir SIM korteles. Negalite anuliuoti šio veiksmo."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Ištrinti visus duomenis?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Šis naudotojas negali atkurti gamyklinių nustatymų"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Ištrinama"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Palaukite…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Skambinimo nustatymai"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Nustatyti balso paštą, skambučio peradresavimą, skambučio laukimą, skambintojo ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB susiejimas"</string>
@@ -1718,7 +1735,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Negalima daugiau nei <xliff:g id="MAXCONNECTION">%1$d</xliff:g> įrenginių (-io) naudoti kaip modemo (-ų)."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ bus atsietas."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Eterneto susiejimas"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Bendrinkite telefono interneto ryšį per USB eternetu"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Bendrinkite telefono interneto ryšį eternetu"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Naudodami viešosios interneto prieigos tašką ir įrenginį kaip modemą galite teikti internetą kitiems įrenginiams per mobiliojo ryšio duomenų tinklą. Be to, programos gali sukurti viešosios interneto prieigos tašką ir bendrinti turinį su netoliese esančiais įrenginiais."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Naudodami viešosios interneto prieigos tašką ir įrenginį kaip modemą galite teikti internetą kitiems įrenginiams „Wi-Fi“ arba mobiliųjų duomenų ryšiu. Be to, programos gali sukurti viešosios interneto prieigos tašką ir bendrinti turinį su netoliese esančiais įrenginiais."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pagalba"</string>
@@ -1762,6 +1779,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"„Bluetooth“ nuskaitymas"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Leisti programoms ir paslaugoms bet kuriuo metu nuskaityti ieškant netoliese esančių įrenginių, net kai „Bluetooth“ išjungtas. Tai galima naudoti norint, pvz., tobulinti pagal vietovę teikiamas funkcijas ir paslaugas."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Darbui skirtos Vietovės paslaugos"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Vietovės laiko juostos nustatymas"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Vietovės laiko juostos nustatymas"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Leidžiama naudoti įrenginio vietovės informaciją norint nustatyti dabartinę laiko juostą. Kiti vietovės nustatymai, pvz., „Wi‑Fi“ nuskaitymas, gali turėti įtakos laiko juostos nustatymo tikslumui."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Įjungta"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Išjungta"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatinis laiko juostos nustatymas išjungtas"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Vietovės laiko juostos nustatymas išjungtas"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Vietovės laiko juostos nustatymas nepalaikomas"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Vietovės laiko juostos nustatymo pakeitimai neleidžiami"</string>
     <string name="location_network_based" msgid="5247042890080021887">"„Wi-Fi“ ir mob. tinklo vietovė"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Leisti programoms naud. „Google“ viet. pasl., kad viet. būtų nustatoma greičiau. Anonim. viet. duom. bus renk. ir siunč. „Google“."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Vietą nustatė „Wi-Fi“"</string>
@@ -1825,6 +1851,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"N. naud. Atr. pagal v., nust. slaptaž."</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"N. naud. Atr. pagal v., nust. atr. pieš."</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"N. naud. Atr. pagal v., nust. slaptažodį"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Nustatykite slaptažodį (biometr. duom.)"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Nustatyk. atrak. pieš. (biometr. duom.)"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Nustatykite PIN kodą (biometr. duomen.)"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Pamiršote slaptažodį?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Pamiršote atrakinimo piešinį?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Pamiršote PIN kodą?"</string>
@@ -2165,13 +2194,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Subtitrų nuostatos"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Didinimas"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Didinimo sritis"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Didinimo įgalinimas"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Pasirinkite didinimo sritį (-is), kurią (-ias) norite naudoti, kai didinate ekraną"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Visas ekranas"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ekrano dalis"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Visas ekranas ir ekrano dalis"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Didinti visą ekraną"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Didinti ekrano dalį"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Perjungti į pritaikomumo mygtuką?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Jei didinsite ekrano dalį naudodami palietimo tris kartus funkciją, įvesties ir kiti veiksmai vėluos.\n\nAr norite didinti naudodami pritaikomumo mygtuką?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Perjungti į pritaikomumo mygtuką"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Didinti paliečiant tris kartus"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Didinimo nustatymai"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Didinti palietus tris kartus"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Didinimas naudojant spart. klavišą"</string>
@@ -2225,11 +2257,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Maitinimo mygt. baig. skamb."</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Didelis pelės žymeklis"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Pašalinti animacijas"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monofoninis garsas"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Sujungti kanalus leidžiant garsą"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Garso balansas"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Kairė"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Dešinė"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monofoninis garsas"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Sujungti kanalus leidžiant garsą"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Garso balansas"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kairysis"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Dešinysis"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Numatytasis"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sek."</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sek."</string>
@@ -2259,11 +2291,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibravimas gavus pranešimą"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibravimas skambant telefonui"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Lietimo grįžtamasis ryšys"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Naudoti „<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>“"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Atidaryti „<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>“"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Naudoti spalvų taisymą"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Rodyti subtitrus"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Tik palaikomai programai"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Naudoti „<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>“"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Atidaryti „<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>“"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Naudoti spalvų taisymą"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Rodyti subtitrus"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Tik palaikomai programai"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Antraštės dydis ir stilius"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Teksto dydis: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Daugiau parinkčių"</string>
@@ -2295,6 +2327,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Pilkumo tonas"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Raudona, žalia"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Raudona, žalia"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mėlyna, geltona"</string>
@@ -2436,7 +2469,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Fono ribojimas"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Leiskite vykdyti programą fone"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Neleidžiama vykdyti programos fone"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Naudojimo fone negalima apriboti"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Naudojimo fone negalima apriboti"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Apriboti veiklą fone?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jei apribosite programos veiklą fone, ji gali netinkamai veikti"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Negalite apriboti progr., nes ji nenust. optimiz. akum. naud.\n\nJei norite apr. progr., pirmiausia įj. akum. naud. optimiz."</string>
@@ -2485,6 +2518,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Planšetinis kompiuteris buvo naudojamas daugiau nei įprasta"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Įrenginys buvo naudojamas daugiau nei įprasta"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Akumuliatoriaus energija gali išsekti greičiau nei įprasta"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimizuojama siekiant apsaugoti akumuliatorių"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Akumuliatorius laikinai apribotas. Palieskite, kad sužinotumėte daugiau."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefonas buvo naudojamas daugiau nei įprastai. Akumuliatoriaus energija gali išsekti greičiau, nei tikėjotės.\n\nDaugiausiai akumuliatoriaus energijos suvartojančios programos:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Planšetinis kompiuteris buvo naudojamas daugiau nei įprastai. Akumuliatoriaus energija gali išsekti greičiau, nei tikėjotės.\n\nDaugiausiai akumuliatoriaus energijos suvartojančios programos:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Įrenginys buvo naudojamas daugiau nei įprastai. Akumuliatoriaus energija gali išsekti greičiau, nei tikėjotės.\n\nDaugiausiai akumuliatoriaus energijos suvartojančios programos:"</string>
@@ -2554,6 +2589,8 @@
       <item quantity="other">Apribota %1$d programų</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Nuskaitant akumuliatoriaus skaitiklį iškilo problema"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Nuskaitant akumuliatoriaus skaitiklį iškilo problema. Palieskite, kad "<annotation id="url">"sužinotumėte daugiau"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Sustabdyti programą?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2667,9 +2704,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Nustatyti tvarkaraštį"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Pailginti akumuliatoriaus veikimo laiką"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Išjungti įkrovus"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Akumuliatoriaus tausojimo priemonė išjungiama telefonui pasiekus <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Akumuliatoriaus tausojimo priemonė išjungiama planšetiniam kompiuteriui pasiekus <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Akumuliatoriaus tausojimo priemonė išjungiama įrenginiui pasiekus <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Akumuliatoriaus tausojimo priemonė išjungiama, kai telefono įkrovimo lygis viršija <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Akumuliatoriaus tausojimo priemonė išjungiama, kai planšetinio kompiuterio įkrovimo lygis viršija <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Akumuliatoriaus tausojimo priemonė išjungiama, kai įrenginio įkrovimo lygis viršija <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Įjungti"</string>
@@ -2734,6 +2771,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Nustatyti iš naujo"</string>
     <string name="tts_play" msgid="2945513377250757221">"Paleisti"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptyvusis ryšių tvarkymas"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Automatiškai tvarkant tinklo ryšius pailgėja akumuliatoriaus veikimo laikas ir pagerėja įrenginio našumas"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Prisijungimo duomenų saugykla"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Įdiegti sertifikatą"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Įdiegti sertifikatus iš saugyklos"</string>
@@ -2745,9 +2784,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Naudotojo prisijungimo duom."</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Peržiūrėkite ir keiskite išsaugotus prisijungimo duomenis"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Išplėstiniai"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Saugyklos tipas"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Atsarginė kopija saugoma įrenginio vidinėje atmintyje"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Saugoma tik programinėje įrangoje"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Prisijungimo duomenys nepasiekiami šiam naudotojui"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Įdiegta VPN ir programoms"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Įdiegta „Wi-Fi“"</string>
@@ -2763,6 +2799,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Neįdiegti"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Vis tiek įdiegti"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sertifikatas neįdiegtas"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Leisti „<xliff:g id="APP_NAME">%s</xliff:g>“ įdiegti sertifikatus šiame įrenginyje?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Šie sertifikatai identifikuos jus, kai naudosite toliau nurodytas programas ir URL"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Neleisti"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Leisti"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Rodyti daugiau"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Sertifikatų tvarkymo programa"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Nėra"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Sertifikatai, kuriuos įdiegė ši programa, identifikuos jus, kai naudosite toliau nurodytas programas ir URL"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Pašalinti"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Kritinės padėties numerio rinkimo signalas"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Nustatyti elgesį, kai skambinama pagalbos numeriu"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Atsarginė kopija"</string>
@@ -3096,7 +3141,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nenustatytas – darbo profilis"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administratorius"</string>
     <string name="user_you" msgid="3070562015202859996">"Jūs (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Slapyvardis"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Galite pridėti iki <xliff:g id="USER_COUNT">%1$d</xliff:g> naudotoj."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Tik planšetinio kompiuterio savininkas gali tvarkyti naudotojus."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Tik telefono savininkas gali tvarkyti naudotojus."</string>
@@ -3146,7 +3190,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Mokėjimas terminale"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Nustatykite mokėjimo programą. Tada tiesiog palaikykite užpakalinę telefono dalį prie bet kokios terminalo su nekontaktinio mokėjimo simboliu."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Supratau"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Daugiau..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Daugiau…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Nustatyti numatytąją mokėjimo programą"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Atnaujinti numatytąją mokėjimo programą"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Nekontaktiniame terminale galima mokėti naudojant „<xliff:g id="APP">%1$s</xliff:g>“"</string>
@@ -3216,9 +3260,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Atgal"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Kitas"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Užbaigti"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Fotografuoti"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Pasirinkti vaizdą"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Pasirinkti nuotrauką"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kortelės"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kortelės"</string>
@@ -3230,7 +3271,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Visada naudoti tai skambučiams"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Pasirinkite duomenims skirtą SIM"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Pasirinkite SIM arba SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Perjungiama duomenų SIM kortelė. Tai gali užtrukti iki minutės..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Perjungiama duomenų SIM kortelė. Tai gali užtrukti iki minutės…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Skambinkite naudodami…"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Pasirinkite SIM kortelę"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM Nr. <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3416,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"veiksmų seka, tvarkaraštis, akumuliatoriaus tausojimo priemonė, energijos tausojimo priemonė, akumuliatorius, automatinis, procentai"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"„VoLTE“, išplėstinės skambinimo parinktys, 4G skambinimas"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"pridėti kalbą"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"teksto dydis"</string>
     <string name="default_sound" msgid="6604374495015245195">"Numatytasis garsas"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Skambučių ir nustatymų garsumas: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Garsumas, vibravimas, netrukdymo režimas"</string>
@@ -3414,13 +3456,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Įjungti garsus"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtitrai realiuoju laiku"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Taikyti automatinius medijos subtitrus"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nėra"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Nustatytas <xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraštis</item>
-      <item quantity="few">Nustatyti <xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščiai</item>
-      <item quantity="many">Nustatyta <xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščio</item>
-      <item quantity="other">Nustatyta <xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščių</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nė vieno}=1{Nustatytas 1 tvarkaraštis}one{Nustatytas # tvarkaraštis}few{Nustatyti # tvarkaraščiai}many{Nustatyta # tvarkaraščio}other{Nustatyta # tvarkaraščių}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Netrukdymo režimas"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Gauti pranešimus tik iš svarbių žmonių ar įvykių"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Pertraukčių apribojimas"</string>
@@ -3488,24 +3524,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Tik prioritetiniai"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Įjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Išjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Išjungta"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Įjungta"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Klausti kaskart"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Kol išjungsite"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> valanda</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> valandos</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> valandos</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> valandų</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min."</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraštis gali įsijungti automatiškai</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščiai gali įsijungti automatiškai</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščio gali įsijungti automatiškai</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> tvarkaraščių gali įsijungti automatiškai</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 valanda}one{# valanda}few{# valandos}many{# valandos}other{# valandų}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minutė}one{# minutė}few{# minutės}many{# minutės}other{# minučių}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Išjungta}=1{Išjungta; 1 tvarkaraštis gali įsijungti automatiškai}one{Išjungta; # tvarkaraštis gali įsijungti automatiškai}few{Išjungta; # tvarkaraščiai gali įsijungti automatiškai}many{Išjungta; # tvarkaraščio gali įsijungti automatiškai}other{Išjungta; # tvarkaraščių gali įsijungti automatiškai}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Kas gali trikdyti netrukdymo režimu"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Žmonės"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Programos"</string>
@@ -3551,6 +3575,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Žemesnio prioriteto pranešimus automatiškai nustatyti kaip netrikdančius"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Prisitaikantis pranešimų reitingavimas"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatiškai reitinguoti pranešimus pagal atitikimą"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Atsiliepimai apie adaptyviuosius pranešimus"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Nurodyti pranešimų koregavimus ir rodyti parinktį teikti atsiliepimus apie sistemą"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Iš naujo nustatyti pranešimų svarbą"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Iš naujo nustatykite naudotojo pakeistus svarbos nustatymus ir leiskite pranešimų pagelbikliui priskirti prioritetą"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Siūlomi veiksmai ir atsakymai"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatiškai rodyti siūlomus veiksmus ir atsakymus"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Naujausių ir atidėtų pranešimų rodymas"</string>
@@ -3650,8 +3678,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Svarbiausi pokalbiai"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Rodyti pokalbių skilties viršuje kaip slankiuosius burbulus"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Rodyti pokalbių skilties viršuje"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Kiti pokalbiai"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Ne prioritetiniai pokalbiai"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Pakeisti pokalbiai"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Paskutiniai pokalbiai"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Išvalyti naujausius"</string>
+    <string name="clear" msgid="5092178335409471100">"Išvalyti"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Rodyti svarbiausių pokalbių debesėlius"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Svarbiausi pokalbiai rodomi išskleidžiamojo skydelio viršuje. Taip pat galite nustatyti, kad jie būtų rodomi debesėliuose ir pertrauktų netrukdymo režimą."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Svarbiausi ir pakeisti pokalbiai bus rodomi čia"</string>
@@ -3757,7 +3788,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Prieiga „Netrukdyti“"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Leisti netrukdymo režimą"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Jokios įdiegtos programos nepateikė prieigos „Netrukdyti“ užklausos"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Įkeliamos programos..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Įkeliamos programos…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"„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="6202042207121633488">"„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="9096417708500595424">"„Android“ jūsų prašymu blokuoja šios grupės pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
@@ -3855,13 +3886,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Visi pokalbiai"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Svarbiausi pokalbiai"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nėra"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> pokalbis</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> pokalbiai</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> pokalbio</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> pokalbių</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nėra"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nė vieno}=1{1 pokalbis}one{# pokalbis}few{# pokalbiai}many{# pokalbio}other{# pokalbių}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kas gali trikdyti"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Skambučiai"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Skambučiai"</string>
@@ -3870,13 +3895,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Kad užtikrintumėte, jog įrenginys skambės priimant leidžiamus skambučius, patikrinkite, ar jame nustatytas skambėjimo režimas"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Veikiant „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“ blokuojami gaunamieji skambučiai. Galite koreguoti nustatymus ir leisti draugams, šeimos nariams ar kitiems kontaktams jus pasiekti."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Žvaigždute pažymėti kontaktai"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">Dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktas</item>
-      <item quantity="few">Dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktai</item>
-      <item quantity="many">Dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontakto</item>
-      <item quantity="other">Dar <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktų</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nėra"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nė vieno}=1{{contact_1}}=2{{contact_1} ir {contact_2}}=3{{contact_1}, {contact_2} ir {contact_3}}one{{contact_1}, {contact_2} ir dar # žmogus}few{{contact_1}, {contact_2} ir dar # žmonės}many{{contact_1}, {contact_2} ir dar # žmogaus}other{{contact_1}, {contact_2} ir dar # žmonių}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Nėra pavadinimo)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Pranešimai"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"pranešimai"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Pranešimai"</string>
@@ -3885,13 +3905,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Veikiant „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“ blokuojami gaunami pranešimai. Galite koreguoti nustatymus ir leisti draugams, šeimos nariams ar kitiems kontaktams jus pasiekti."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Visi pranešimai gali jus pasiekti"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Visi skambučiai gali jus pasiekti"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nėra"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktas</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktai</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakto</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktų</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nė vieno}=1{1 kontaktas}one{# kontaktas}few{# kontaktai}many{# kontakto}other{# kontaktų}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Bet kas"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktai"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Žvaigždutėmis pažymėti kontaktai"</string>
@@ -3929,26 +3943,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Visi pranešimai"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Kai kurie pranešimai"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Pasirinkti žmonės vis tiek gali jus pasiekti, net jei neleidžiate programoms trikdyti"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">„<xliff:g id="APP_NAMES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="few">„<xliff:g id="APP_NAMES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="many">„<xliff:g id="APP_NAMES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="other">„<xliff:g id="APP_NAMES">%s</xliff:g>“ gali trikdyti</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Dar <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Jokios programos negali trikdyti}=1{„{app_1}“ gali trikdyti}=2{„{app_1}“ ir „{app_2}“ gali trikdyti}=3{„{app_1}“, „{app_2}“ ir „{app_3}“ gali trikdyti}one{„{app_1}“, „{app_2}“ ir dar # programa gali trikdyti}few{„{app_1}“, „{app_2}“ ir dar # programos gali trikdyti}many{„{app_1}“, „{app_2}“ ir dar # programos gali trikdyti}other{„{app_1}“, „{app_2}“ ir dar # programų gali trikdyti}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Programos"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Visi pranešimai"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Kai kurie pranešimai"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Pranešimai, kurie gali trikdyti"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Leisti visus pranešimus"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">„<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="few">„<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="many">„<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>“ gali trikdyti</item>
-      <item quantity="other">„<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>“ gali trikdyti</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Niekas negali trikdyti"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Dar <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niekas negali trikdyti}=1{„{sound_category_1}“ gali trikdyti}=2{„{sound_category_1}“ ir „{sound_category_2}“ gali trikdyti}=3{„{sound_category_1}“, „{sound_category_2}“ ir „{sound_category_3}“ gali trikdyti}one{„{sound_category_1}“, „{sound_category_2}“ ir dar # garsas gali trikdyti}few{„{sound_category_1}“, „{sound_category_2}“ ir dar # garsai gali trikdyti}many{„{sound_category_1}“, „{sound_category_2}“ ir dar # garso gali trikdyti}other{„{sound_category_1}“, „{sound_category_2}“ ir dar # garsų gali trikdyti}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niekas negali trikdyti"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niekas negali trikdyti"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Kai kurie žmonės gali trikdyti"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Visi žmonės gali trikdyti"</string>
@@ -3998,8 +4000,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Įjungta"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Išjungta"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Programos prisegimas"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Prisegus dabartinę programą ji liks rodinyje tol, kol ją atsegsite. Šią funkciją galima naudoti, pavyzdžiui, leidžiant patikimam draugui žaisti konkretų žaidimą. \n\nPrisegta programa gali atidaryti kitas programas ir pasiekti asmens duomenis \n\nNorėdami prisegti programą, atlikite toliau nurodytus veiksmus. 	\n1.	Įjunkite programos prisegimą. 	\n2.	Atidarykite „Apžvalga“. 	\n3.	Palieskite programos piktogramą ekrano viršuje, tada palieskite „Prisegti“."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Prisegta dabartinė programa liks rodinyje tol, kol ją atsegsite. Šią funkciją galima naudoti, pavyzdžiui, leidžiant patikimam draugui žaisti konkretų žaidimą. \n\nPrisegta programa gali atidaryti kitas programas ir pasiekti asmens duomenis. \n\nJei norite saugiai bendrinti įrenginį su kitais asmenimis, išbandykite naudotojo svečio profilį. \n\nNorėdami prisegti programą, atlikite toliau nurodytus veiksmus. 	\n1.	Įjunkite programos prisegimą. 	\n2.	Atidarykite „Apžvalga“. 	\n3.	Palieskite programos piktogramą ekrano viršuje, tada palieskite „Prisegti“."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Prisegta dabartinė programa liks rodinyje tol, kol ją atsegsite. Šią funkciją galima naudoti, pavyzdžiui, leidžiant patikimam draugui žaisti konkretų žaidimą."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Prisegta programa gali atidaryti kitas programas ir pasiekti asmens duomenis. \n\ndami prisegti programą, atlikite toliau nurodytus veiksmus. 	\n1.	Įjunkite programos prisegimo funkciją. 	\n2.	Atidarykite „Apžvalga“. 	\n3.	Palieskite programos piktogramą ekrano viršuje, tada palieskite „Prisegti“."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Prisegta programa gali atidaryti kitas programas ir pasiekti asmens duomenis. \n\nJei norite saugiai bendrinti įrenginį su kitais asmenimis, išbandykite naudotojo svečio profilį. \n\nNorėdami prisegti programą, atlikite toliau nurodytus veiksmus. 	\n1.	Įjunkite programos prisegimo funkciją. 	\n2.	Atidarykite „Apžvalga“. 	\n3.	Palieskite programos piktogramą ekrano viršuje, tada palieskite „Prisegti“."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Kai programa prisegta \n\n•	 Gali būti pasiekiami asmens duomenys \n		(pvz., kontaktai ir el. pašto turinys) \n•		Prisegta programa gali atidaryti kitas programas \n\nProgramas prisekite tik su žmonėmis, kuriais pasitikite."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Prašyti atrakinimo piešinio prieš atsegant"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Prašyti PIN kodo prieš atsegant"</string>
@@ -4021,6 +4024,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Be veido, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami įvesti PIN kodą prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti PIN kodo paleidžiant įrenginį?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Be veido, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami nubrėžti atrakinimo piešinį prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti atrakinimo piešinio paleidžiant įrenginį?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Be veido, kurį naudodami atrakinate įrenginį, galite dar geriau apsaugoti šį įrenginį reikalaudami įvesti slaptažodį prieš jį paleidžiant. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti slaptažodžio paleidžiant įrenginį?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Galite dar labiau apsaugoti šį įrenginį, be jam atrakinti naudojamų biometrinių duomenų, pareikalaudami prieš jį paleidžiant įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Galite dar labiau apsaugoti šį įrenginį, be jam atrakinti naudojamų biometrinių duomenų, pareikalaudami prieš jį paleidžiant nubrėžti atrakinimo piešinį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti atrakinimo piešinio norint paleisti jūsų įrenginį?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Galite dar labiau apsaugoti šį įrenginį, be jam atrakinti naudojamų biometrinių duomenų, pareikalaudami prieš jį paleidžiant įvesti slaptažodį. Kol įrenginys nepaleidžiamas, juo negalima gauti skambučių ar pranešimų, įskaitant signalus.\n\nTai padeda apsaugoti duomenis prarastuose arba pavogtuose įrenginiuose. Reikalauti slaptažodžio paleidžiant įrenginį?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Taip"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Apribota"</string>
@@ -4212,7 +4218,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB valdo"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Prijungtas įrenginys"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Šis įrenginys"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Perjungiama..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Perjungiama…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nepavyko perjungti"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Šio įrenginio įkrovimas"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Įkraunamas prijungtas įrenginys"</string>
@@ -4414,6 +4420,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobiliojo ryšio duom. naud."</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Programos duomenų naudojimas"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"„Wi-Fi“ duomenų naudojimas"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Ne operatoriaus duomenų naudojimas"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Eterneto duomenų naudojimas"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Eternetas"</string>
@@ -4434,6 +4441,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> apribojimų</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatoriaus duomenų apskaita gali skirtis nuo įrenginio duomenų apskaitos"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Išskiriami duomenys, kuriuos naudoja operatorių tinklai"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Išnaudota <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nustatyti duomenų įspėjimą"</string>
     <string name="data_warning" msgid="2925054658166062884">"Duomenų įspėjimas"</string>
@@ -4473,7 +4481,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Žr. išsamią informaciją"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Duom. taupymo priem."</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neriboti duomenys"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Foniniai duomenys išjungti"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Foniniai duomenys išjungti"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Įjungta"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Išjungta"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Naudoti duomenų taupymo priemonę"</string>
@@ -4496,7 +4504,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Jei įrenginys užrakintas, neleisti įvesti atsakymų ar kito teksto pranešimuose"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Numatytasis rašybos tikrinimas"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Rašybos tikrinimo pasirinkimas"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Naudoti rašybos tikrinimą"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Naudoti rašybos tikrinimą"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nepasirinkta"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nėra)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4602,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Pašalinti nuotraukas ir vaizdo įrašus"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Saugyklos tvarkytuvė"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Naudoti Saugyklos tvarkytuvę"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Naudoti Saugyklos tvarkytuvę"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatiniai"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Neautomatiniai"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Atlaisvinkite vietos dabar"</string>
@@ -4632,6 +4640,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Telefono tikrinimas dukart palietus"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Planšetinio kompiuterio tikrinimas dukart palietus"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Įrenginio tikrinimas dukart palietus"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Perbraukimas norint patikrinti pranešimus"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Perbraukite žemyn ekrano apatiniame krašte, kad būtų rodomi pranešimai"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Vienos rankos režimas"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Naudoti vienos rankos režimą"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Išeiti perjungiant programas"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Skirtasis laikas"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sek."</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sek."</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sek."</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"pasiekiamumas"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, dukart palieskite ekraną."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Telefono tikrinimas pakėlus"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Planšetinio kompiuterio tikrinimas pakėlus"</string>
@@ -4644,6 +4662,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Palieskite, kad patikrintumėte planšetinį kompiuterį"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Palieskite, kad patikrintumėte įrenginį"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Norėdami sužinoti laiką, peržiūrėti pranešimus ir kitą informaciją, palieskite ekraną."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Pagalbos iškvietimas kritiniu atveju"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Naudoti pagalbos iškvietimo kritiniu atveju paslaugą"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Tvarko „<xliff:g id="APP_NAME">%1$s</xliff:g>“"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Pradėkite veiksmus toliau penkis ar daugiau kartų greitai paspausdami maitinimo mygtuką"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Paleisti atvirkštinio skaičiavimo signalą"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Leisti skambų garsą prieš kviečiant pagalbą"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Skambinimas dėl pagalbos"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Numeris, kuriuo skambinti prireikus pagalbos"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Palieskite, kad pakeistumėte"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Jei įvedate ne pagalbos numerį:\n • jūsų įrenginys turi būti atrakintas, kad būtų galima iškviesti pagalbą kritiniu atveju,\n • į jūsų skambutį gali būti neatsiliepta"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Perbraukimas piršto antspaudo jutikliu norint peržiūrėti pranešimus"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Perbr. kontr. k. jutikliu"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Jei norite patikrinti pranešimus, perbraukite žemyn piršto antspaudo jutikliu telefono užpakalinėje dalyje."</string>
@@ -4783,6 +4811,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maks. matomų duomenų rinkinių"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Nustatyti numatytąsias vertes iš naujo"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Automatinio pildymo kūrėjo parinktys nustatytos iš naujo"</string>
+    <string name="location_category" msgid="3496759112306219062">"Vieta"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Būsenos juostos vietos indikatorius"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Rodyti visoms vietoms, įskaitant tinklą ir ryšį"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Priversti vykdyti visus GNSS matavimus"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Stebėti visas GNSS konferencijas ir visus dažnius netaikant darbo ciklų"</string>
     <string name="device_theme" msgid="5027604586494772471">"Įrenginio tema"</string>
     <string name="default_theme" msgid="4815428567082263639">"Numatytoji"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Tinklo pavadinimas"</string>
@@ -4799,8 +4832,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pristabdyti pranešimus, kad neblaškytų dėmesio"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funkcija negalima"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Ši funkcija buvo išjungta, nes, kai ji įjungta, telefonas veikia lėčiau"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Priversti vykdyti visus GNSS matavimus"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Stebėti visas GNSS konferencijas ir visus dažnius netaikant darbo ciklų"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Visada rodyti strigčių dialogo langą"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Rodyti dialogo langą kiekvieną kartą, kai programa užstringa"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Pasirinkti programą, kurioje įgalinta ANGLE"</string>
@@ -4812,7 +4843,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Įgalinimas visose programose"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafikos tvarkyklės pasirinkimas"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Numatytasis"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Žaidimų tvarkyklė"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Žaidimų tvarkyklė"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Kūrėjo tvarkyklė"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistemos grafikos tvarkyklė"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4868,7 +4899,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Įjungti (nutildyti)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Išjungti"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Išsami tinklo info."</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Įrenginio pavadinimas matomas jūsų telefone esančioms programoms. Kai prisijungiate prie „Bluetooth“ įrenginių arba nustatote „Wi-Fi“ viešosios interneto prieigos tašką, jį taip pat gali matyti kiti žmonės."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Įrenginio pavadinimas matomas jūsų telefone esančioms programoms. Kai prisijungiate prie „Bluetooth“ įrenginių ar „Wi-FI“ tinklo arba nustatote „Wi-Fi“ viešosios interneto prieigos tašką, jį taip pat gali matyti kiti žmonės."</string>
     <string name="devices_title" msgid="649715719278562515">"Įrenginiai"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Visi nustatymai"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Pasiūlymai"</string>
@@ -4881,6 +4912,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nepavyko rasti tinklų. Bandykite dar kartą."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(uždrausta)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nėra SIM kortelės"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nėra SIM kortelės"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nėra"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Kad būtų galima prisijungti, reikia SIM kortelės"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Kad būtų galima prisijungti, reikia „<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>“ SIM kortelės"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Pageidaujamas tinklo režimas: pageidautina WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Pageidaujamas tinklo režimas: tik GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Pageidaujamas tinklo režimas: tik WCDMA"</string>
@@ -4934,6 +4970,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilieji duomenys"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Prieiga prie duomenų naudojant mobiliojo ryšio tinklą"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefone bus automatiškai perjungtos šio operatoriaus paslaugos, kai bus pasiekiamos"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nepasiekiama jokia SIM kortelė"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Skambučių nuostata"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS nuostata"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Klausti kaskart"</string>
@@ -4996,6 +5033,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nepasiekiama, kai prisijungta prie „<xliff:g id="CARRIER">%1$s</xliff:g>“"</string>
     <string name="see_more" msgid="7499355691042812723">"Žr. daugiau"</string>
     <string name="see_less" msgid="2642392725363552793">"Žr. mažiau"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Įjungti „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Įjungti SIM kortelę?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Perjungti į „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Perjungti į SIM kortelę?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Vienu metu gali būti aktyvi tik viena SIM kortelė.\n\nPerjungus į „<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>“ jums teikiamos „<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>“ paslaugos nebus atšauktos."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Vienu metu gali būti aktyvi tik viena atsisiųsta SIM kortelė.\n\nPerjungus į „<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>“ jums teikiamos „<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>“ paslaugos nebus atšauktos."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Vienu metu gali būti aktyvi tik viena SIM kortelė.\n\nPerjungus jums teikiamos „<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>“ paslaugos nebus atšauktos."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Perjungti į „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Prisijungiama prie tinklo…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Perjungiama į „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nepavyksta perjungti operatoriaus"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Nepavyksta perjungti operatoriaus dėl klaidos."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Išjungti „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Išjungti SIM kortelę?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Išjungiama SIM kortelė<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nepavyksta išjungti operatoriaus"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Kažkas nepavyko, todėl operatorius nebuvo išjungtas."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Naudoti dvi SIM korteles?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Šiame įrenginyje vienu metu gali būti dvi aktyvios SIM kortelės. Jei norite toliau naudoti vieną SIM kortelę vienu metu, palieskite „Ne, ačiū“."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Paleisti įrenginį iš naujo?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Kad galėtumėte pradėti, paleiskite įrenginį iš naujo. Tada galėsite pridėti kitą SIM kortelę."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Tęsti"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Paleisti iš naujo"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, ačiū"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Perjungti"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nepavyko suaktyvinti SIM kortelės"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Išimkite SIM kortelę ir vėl įdėkite. Jei problema išlieka, iš naujo paleiskite įrenginį."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Pabandykite vėl įjungti SIM kortelę. Jei problema išlieka, iš naujo paleiskite įrenginį."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Tinklo aktyvinimas"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operatorius „<xliff:g id="CARRIER_NAME">%1$s</xliff:g>“ aktyvus"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Palieskite ir atnaujinkite SIM nustatymus"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM kortelė"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Ištrinti šią atsisiųstą SIM kortelę?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Ištrynus šią SIM kortelę bus pašalintos „<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>“ paslaugos iš šio įrenginio.\n\n„<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>“ paslaugos nebus atšauktos."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Ištrinti"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Ištrinama SIM kortelė…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Nepavyko ištrinti SIM kortelės"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Šios SIM kortelės negalima ištrinti dėl klaidos.\n\nPaleiskite įrenginį iš naujo ir bandykite dar kartą."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Prijungimas prie įrenginio"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Programa „<xliff:g id="APPNAME">%1$s</xliff:g>“ nori naudoti laikiną „Wi‑Fi“ tinklą, kad galėtų prisijungti prie jūsų įrenginio"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nerasta jokių įrenginių. Įsitikinkite, kad įrenginiai įjungti ir prie jų galima prisijungti."</string>
@@ -5071,6 +5146,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Skambučiai pagalbos numeriu"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Jūsų operatorius nepalaiko skambučių pagalbos numeriu naudojant „Wi‑Fi“ skambinimo funkciją.\nSkambinant pagalbos numeriu automatiškai perjungiama į įrenginio mobiliojo ryšio tinklą.\nSkambinti pagalbos numeriu galima, tik kur veikia mobilusis ryšys."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Naudokite „Wi‑Fi“ skambučiams atlikti, kad pagerintumėte kokybę"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Skambinimas per SIM korteles"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Leiskite skambučius ir SMS pranešimus iš kitos SIM kortelės per šią SIM kortelę."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"skambinimas per SIM korteles"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Gaunamas MMS pranešimas"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Nepavyko išsiųsti MMS pranešimo"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Palieskite, kad leistumėte siųsti MMS pranešimus „<xliff:g id="OPERATOR_NAME">%1$s</xliff:g>“ tinkle, kai mobiliojo ryšio duomenys išjungti"</string>
@@ -5122,10 +5200,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Leisti ekranų perdangas skiltyje „Nustatymai“"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Leiskite virš kitų programų rodomoms programoms perdengti skilties „Nustatymai“ ekranus"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Medija"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Slėpti leistuvę pasibaigus medijos seansui"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Naudodami leistuvę galite tęsti seansą iš išskleisto sparčiųjų nustatymų skydelio."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Medijos leistuvė sparčiuosiuose nustatymuose"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Medijos leistuvę rodyti ilgiau, kad būtų paprasta atnaujinti atkūrimą"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Slėpti leistuvę"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Rodyti leistuvę"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nėra jokių pasiekiamų leistuvių"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Leidžiamos programos"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"medija"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bus įjungtas „Bluetooth“"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Įjungta"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Išjungta"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internetas"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Tinklai, kuriais saugu naudotis lėktuvuose"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Raskite tinklų, kuriais saugu naudotis lėktuvuose, ir prisijunkite prie jų"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lėktuvas, saugu naudoti lėktuvuose"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Skambučiai ir SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"„Wi‑Fi“ skambučiai"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Atlikite ir gaukite skambučius ne operatoriaus tinklais, pvz., „Wi‑Fi“"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Naudodami „Wi-Fi“ skambinimą galite atlikti ir gauti skambučius ne operatoriaus tinklais, pvz., kai kuriais „Wi‑Fi“ tinklais."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Skambučiai"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"pageidaujama"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"pageidaujami skambučiai"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"pageidaujami SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"nepasiekiama"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nėra SIM kortelės"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Nuostatos"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Prisijungti prie viešųjų tinklų"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"tinklo ryšys, internetas, belaidis ryšys, duomenys, „Wifi“, „Wi-Fi“, „Wi Fi“, mobilusis ryšys, mobilusis, mobiliojo ryšio operatorius, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Žr. tinklus, kuriais saugu naudotis lėktuvuose"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Išjungti lėktuvo režimą"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nepasiekiama, nes įjungtas laiko eiti miegoti režimas"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Pranešimų svarba nustatyta iš naujo."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Programos"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nepatikimas įrenginys nori pasiekti jūsų pranešimus. Palieskite, jei reikia išsamios informacijos."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Leisti pasiekti pranešimus?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nepatikimas „Bluetooth“ įrenginys „<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>“ nori pasiekti jūsų pranešimus.\n\nPrie „<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>“ dar niekada nebuvote prisijungę."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nepatikimas įrenginys nori pasiekti jūsų kontaktus ir skambučių žurnalą. Palieskite, jei reikia išsamios informacijos."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Leisti pasiekti kontaktus ir skambučių žurnalą?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nepatikimas „Bluetooth“ įrenginys „<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>“ nori pasiekti jūsų kontaktus ir skambučių žurnalą. Tai apima duomenis apie gaunamuosius ir siunčiamuosius skambučius.\n\nPrie „<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>“ dar niekada nebuvote prisijungę."</string>
 </resources>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index f3d5006..6be4c8f 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Vidējs"</item>
     <item msgid="6740026006576843477">"Ilgs"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Īsa"</item>
+    <item msgid="7397961711906421599">"Vidēja"</item>
+    <item msgid="4079132024502041928">"Ilga"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Noklusējums"</item>
     <item msgid="4234707448428002595">"Bezserifa"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA un LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Vispārējie"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Tikai TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Vispārīgie"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 54f153a..be467ed 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -256,8 +256,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Datums un laiks"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Datuma un laika iestatīšana"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Iestatīt datumu, laiku, laika joslu un formātus"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Izmantot tīklā sniegto laiku"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Izmantot tīkla nodrošināto laika joslu"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Iestatīt laiku automātiski"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Automātiski iestatīt laika joslu"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Izmantot lokalizācijas noklusējuma vērtību"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 stundu formāts"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Izmantot 24 stundu formātu"</string>
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Rādīt profila informāciju bloķētā ekrānā"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Konti"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Atrašanās vieta"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Izmantot atrašanās vietu"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Izmantot atrašanās vietu"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Izslēgta"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="zero">Ieslēgta — <xliff:g id="COUNT_1">%1$d</xliff:g> lietotnēm ir piekļuve atrašanās vietai</item>
@@ -323,6 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekrāna bloķēšana, autorizācija pēc sejas"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekrāna bloķēšana, pirksta nospiedums"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekrāna bloķēšana"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Droša tālruņa atbloķēšana ar seju un pirksta nospiedumu"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Varat arī pierakstīties lietotnēs un apstiprināt maksājumus"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Iestatiet sensorus, ar ko atbloķēt."</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Autorizācija pēc sejas"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Atvieglot tālruņa atbloķēšanu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Pirksta nospiedums"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Taupiet laiku, atbloķējot tālruni kabatā"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Izlaist"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Tālāk"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Seja pievienota"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Iestatiet autorizāciju pēc sejas"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Autorizācija pēc sejas"</string>
@@ -332,6 +341,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Autentificēšana, izmantojot seju"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Sākt"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ja pieejamības autorizācija pēc sejas ir izslēgta, noteiktas iestatīšanas darbības var nedarboties pareizi ar TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Atpakaļ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Turpināt iestatīšanu"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Izmantot pieejamības iestatīšanu"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -376,8 +388,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Autorizējoties ar seju lietotnēs, vienmēr pieprasīt apstiprinājumu"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Dzēst sejas datus"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Iestatīt autorizāciju pēc sejas"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Izmantojot autorizāciju pēc sejas, varat atbloķēt ierīci, pierakstīties lietotnēs un apstiprināt maksājumus.\n\nSvarīga informācija!\nPaskatoties uz tālruni, tas var tikt nejauši atbloķēts.\n\nJūsu tālruni var atbloķēt kāds cits, ja tālrunis tiek turēts pret jūsu seju.\n\nJūsu tālruni var atbloķēt jums līdzīga persona, piemēram, identiskais dvīnis."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Izmantojot autorizāciju pēc sejas, varat atbloķēt ierīci, pierakstīties lietotnēs un apstiprināt maksājumus.\n\nSvarīga informācija!\nSkatoties uz tālruni, tas var tikt nejauši atbloķēts.\n\nJūsu tālruni var atbloķēt kāds cits, ja tālrunis tiek turēts pret jūsu seju, kad jūsu acis ir aizvērtas.\n\nJūsu tālruni var atbloķēt jums līdzīga persona, piemēram, identiskais dvīnis."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Izmantojiet autorizāciju pēc sejas, lai atbloķētu savu ierīci, pierakstītos lietotnēs un apstiprinātu maksājumus."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Svarīga informācija!\nSkatoties uz tālruni, tas var tikt nejauši atbloķēts.\n\nJūsu tālruni var atbloķēt kāds cits, ja tālrunis tiek turēts pret jūsu seju.\n\nJūsu tālruni var atbloķēt jums līdzīga persona, piemēram, identiskais dvīnis."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Svarīga informācija!\nSkatoties uz tālruni, tas var tikt nejauši atbloķēts.\n\nJūsu tālruni var atbloķēt kāds cits, ja tālrunis tiek turēts pret jūsu seju, kad jūsu acis ir aizvērtas.\n\nJūsu tālruni var atbloķēt jums līdzīga persona, piemēram, identiskais dvīnis."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vai dzēst sejas datus?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Sejas dati, ar kuriem tiek veikta autorizācija pēc sejas, tiks neatgriezeniski un droši izdzēsti. Pēc noņemšanas jums būs jāizmanto PIN, kombinācija vai parole, lai atbloķētu tālruni, pierakstītos lietotnēs un apstiprinātu maksājumus."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Izmantot tālruņa atbloķēšanai autorizāciju pēc sejas"</string>
@@ -398,6 +411,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Izmantojiet pirksta nospiedumu, lai atbloķētu tālruni vai apstiprinātu pirkumu.\n\nPiezīme. Pirksta nospiedumu nevar izmantot šīs ierīces atbloķēšanai. Lai iegūtu plašāku informāciju, sazinieties ar savas organizācijas administratoru."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Izmantojiet pirksta nospiedumu, lai atbloķētu tālruni vai apstiprinātu pirkumu.\n\nPiezīme. Pirksta nospiedums var būt mazāk drošs nekā sarežģīta kombinācija vai PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Atcelt"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nē, paldies"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Turpināt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Izlaist"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Tālāk"</string>
@@ -435,6 +449,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Ja aizsargāsiet savu planšetdatoru, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot planšetdatoru tā nozaudēšanas vai nozagšanas gadījumā. Ekrāna bloķēšanas iespēja ir nepieciešama arī tāpēc, lai varētu iestatīt autorizāciju pēc sejas. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Ja aizsargāsiet savu ierīci, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot ierīci, ja tā tiks nozagta vai pazaudēta. Ekrāna bloķēšanas iespēja ir nepieciešama arī tāpēc, lai varētu iestatīt autorizāciju pēc sejas. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Ja aizsargāsiet savu tālruni, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot tālruni tā nozaudēšanas vai nozagšanas gadījumā. Ekrāna bloķēšanas iespēja ir nepieciešama arī tāpēc, lai varētu iestatīt autorizāciju pēc sejas. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Ja aizsargāsiet savu planšetdatoru, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot planšetdatoru tā nozaudēšanas vai nozagšanas gadījumā. Ekrāna bloķēšanas iespēja ir vajadzīga arī biometrijas iestatīšanai. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Ja aizsargāsiet savu ierīci, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot ierīci tās nozaudēšanas vai nozagšanas gadījumā. Ekrāna bloķēšanas iespēja ir vajadzīga arī biometrijas iestatīšanai. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Ja aizsargāsiet savu tālruni, izmantojot ekrāna bloķēšanas iespēju, neviens nevarēs lietot tālruni tā nozaudēšanas vai nozagšanas gadījumā. Ekrāna bloķēšanas iespēja ir vajadzīga arī biometrijas iestatīšanai. Lai atgrieztos, pieskarieties vienumam “Atcelt”."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Vai izlaist PIN iestatīšanu?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Vai izlaist paroles iestatīšanu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Vai izlaist kombinācijas iestatīšanu?"</string>
@@ -507,8 +524,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo planšetdatoru bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo ierīci bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Aktivizējiet ierīces aizsardzības funkcijas, lai neļautu citiem lietot šo tālruni bez jūsu atļaujas. Izvēlieties bloķēšanas ekrānu, kuru vēlaties izmantot."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Izvēlieties rezerves ekrāna bloķēšanas metodi"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Izvēlieties rezerves ekrāna bloķēšanas metodi"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Izvēlieties rezerves ekrāna bloķēšanas metodi"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Ekrāna bloķēšanas opcijas"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Ekrāna bloķēšanas opcijas"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Ekrāna bloķēšana"</string>
@@ -540,6 +556,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Autorizācija pēc sejas un parole"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Turpināt bez autorizācijas pēc sejas"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Varat atbloķēt savu tālruni, izmantojot seju. Izvēloties šo opciju, drošības nolūkos ir nepieciešama rezerves ekrāna bloķēšanas metode."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrija un kombinācija"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrija un PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrija un parole"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Turpināt bez biometrijas"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Varat atbloķēt savu tālruni, izmantojot biometriju. Izvēloties šo opciju, drošības nolūkos ir nepieciešama rezerves ekrāna bloķēšanas metode."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Atspējoja administrators, šifrēšanas politika vai akreditācijas datu maiņa"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nav"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Vilkt"</string>
@@ -627,7 +648,6 @@
       <item quantity="other">Ir jābūt mazāk par <xliff:g id="NUMBER_1">%d</xliff:g> cipariem.</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Ierīces administrators neļauj izmantot nesen izveidotu PIN."</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Jūsu IT administrators ir bloķējis pārāk vienkāršus PIN kodus. Izmēģiniet sarežģītāku PIN kodu."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Nedrīkst ietvert nederīgu rakstzīmi."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Ir jāietver vismaz viens burts."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Ir jāietver vismaz viens cipars."</string>
@@ -668,7 +688,6 @@
       <item quantity="other">Ir jāietver vismaz <xliff:g id="COUNT">%d</xliff:g> rakstzīmes, kas nav cipari</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Ierīces administrators neļauj izmantot nesen izveidotu paroli."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Jūsu IT administrators ir bloķējis pārāk vienkāršas paroles. Izmēģiniet sarežģītāku paroli."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Augoša, dilstoša vai atkārtota ciparu secība nav atļauta."</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Apstiprināt"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Atcelt"</string>
@@ -812,7 +831,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ieslēgt Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Izmantot Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Izmantot Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi iestatījumi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Bezvadu piekļuves punktu iestatīšana un pārvaldība"</string>
@@ -920,7 +939,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Lai izveidotu savienojumu ar <xliff:g id="SSID">%1$s</xliff:g>, centrējiet tālāk norādīto QR kodu."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Lai pievienotos Wi-Fi tīklam, skenējiet ātrās atbildes kodu."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi tīkla koplietošana"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Lai izveidotu savienojumu ar tīklu “<xliff:g id="SSID">%1$s</xliff:g>” un kopīgotu paroli, skenējiet šo QR kodu"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Lai pievienotos tīklam “<xliff:g id="SSID">%1$s</xliff:g>”, skenējiet šo ātrās atbildes kodu, izmantojot citu ierīci."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Lai izveidotu savienojumu ar tīklu <xliff:g id="SSID">%1$s</xliff:g>, skenējiet šo QR kodu"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Mēģiniet vēlreiz. Ja problēma joprojām pastāv, sazinieties ar ierīces ražotāju."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Radās problēma"</string>
@@ -946,8 +965,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi tīkla parole: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Tīklāja parole: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automātiski izveidot savienojumu"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Ļaut tālrunim automātiski izveidot savienojumu šī tīkla tuvumā"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Ļaut planšetdatoram automātiski izveidot savienojumu šī tīkla tuvumā"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Atļaujiet savienojuma izveidi ar šo tīklu, kad tas ir pieejams"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Pievienot ierīci"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Izmantojiet ātrās atbildes kodu, lai pievienotu ierīci šim tīklam"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Ātrās atbildes koda formāts nav derīgs."</string>
@@ -959,7 +977,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Izmantot sistēmas sertifikātus"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Nenorādīt"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Neapstiprināt"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Sertifikāts nav norādīts. Savienojums nebūs privāts."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Tīkla nosaukums ir pārāk garš."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Norādiet domēnu."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Nepieciešams sertifikāts."</string>
@@ -986,6 +1003,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Izveidot savienojumu"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ir ieslēgts"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Izveidots savienojums ar tīklu “<xliff:g id="NETWORK_NAME">%1$s</xliff:g>”"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Notiek savienojuma izveide ar tīklu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Veido savienojumu…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Neizdevās izveidot savienojumu ar tīklu."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Neesat tīkla sasniedzamības zonā"</string>
@@ -1016,6 +1034,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Ierīces MAC adrese"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Nejauši atlasīta MAC adrese"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Nejauši atlasīta MAC adrese (pēdējā izmantotā)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adrese"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Dati par tīklu"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Apakštīkla maska"</string>
@@ -1023,8 +1042,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 adreses"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Saglabātie tīkli"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abonementi"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Citi tīkli"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP iestatījumi"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Wi‑Fi papildu iestatījumi šim lietotājam nav pieejami."</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Saglabāt"</string>
@@ -1033,8 +1051,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Ierakstiet derīgu vārtejas adresi."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Ierakstiet derīgu sistēmas DNS adresi."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Ierakstiet tīkla prefiksa garumu diapazonā 0–32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ja vien to neignorē privātā DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ja vien to neignorē privātā DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Vārteja"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Tīkla prefiksa garums"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1060,7 +1078,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Lietotne kopīgo saturu. Lai koplietotu interneta savienojumu, izslēdziet un ieslēdziet tīklāju."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nav iestatīta parole"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Tīklāja nosaukums"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Notiek tīklāja <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ieslēgšana..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Notiek tīklāja <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ieslēgšana…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Citas ierīces var savienot ar tīklāju <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Tīklāja parole"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Piekļuves punkta josla"</string>
@@ -1210,7 +1228,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Noteikta satura atsvaidzināšanas biežums tiek automātiski palielināts no 60 līdz 90 Hz. Tas palielina akumulatora lietojumu."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Piespiedu 90 Hz atsvaidzināšanas biežums"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Augstākais atsvaidzināšanas biežums uzlabotai reakcijai uz pieskārienu un labākai animācijas kvalitātei. Tas palielina akumulatora lietojumu."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atpazīšana ekrānā"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ieslēgts/ekrāns netiks izslēgts, ja uz to skatīsieties"</string>
@@ -1301,6 +1319,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kad ekrāns ir tumšs, tas tiek ieslēgts, saņemot jaunus paziņojumus"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vienmēr rādīt laiku un inform."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Palielināts akumulatora lietojums"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Teksts treknrakstā"</string>
     <string name="title_font_size" msgid="570613010306330622">"Fonta lielums"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Palielināt vai samazināt tekstu"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM kartes bloķēšanas iestatījumi"</string>
@@ -1350,7 +1369,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android versija"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android drošības atjauninājums"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelis"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelis: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelis un aparatūra"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Aparatūras versija"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Iekārtas ID"</string>
@@ -1599,7 +1617,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Dzēst APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Jauns APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Saglabāt"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Atmest"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Atcelt"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Lauks Nosaukums nedrīkst būt tukšs."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN nedrīkst būt tukšs."</string>
@@ -1614,8 +1632,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Lietotnes var atiestatīt"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Atiestatīt Wi-Fi, mobilo datu un Bluetooth iestatījumus"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Tādējādi tiks atiestatīti visi tīkla iestatījumi, tostarp:\n\n"<li>"Wi‑Fi;"</li>\n<li>"mobilie dati;"</li>\n<li>"Bluetooth."</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Dzēst"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Dzēst lejupielādētās SIM k."</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Lai lejupielādētu nomaiņas SIM kartes, sazinieties ar mobilo sakaru operatoru. Ar šo darbību netiks anulēti mobilo sakaru pakalpojumu plāni."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Ar šo darbību netiks anulēti mobilo sakaru pakalpojumu plāni. Lai lejupielādētu nomaiņas SIM kartes, sazinieties ar mobilo sakaru operatoru."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Atiestatīt iestatījumus"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Vai vēlaties atiestatīt visus tīkla iestatījumus? Šo darbību nevar atsaukt."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Vai vēlaties atiestatīt visus tīkla iestatījumus un izdzēst lejupielādētās SIM kartes? Šo darbību nevar atsaukt."</string>
@@ -1625,31 +1644,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Tīklu iestatījumi ir atiestatīti."</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nevar izdzēst SIM kartes"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Nevar izdzēst lejupielādētās SIM kartes, jo radās kļūda.\n\nRestartējiet ierīci un mēģiniet vēlreiz."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Notīrīt visus datus (atiestatīt rūpnīcas datus)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Atiestatīt rūpnīcas datus"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tādējādi tiks izdzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Pašlaik esat pierakstījies šādos kontos:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Šo ierīci izmanto vēl citi lietotāji.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Mūzika"</li>\n<li>"Fotoattēli"</li>\n<li>"Citi lietotāja dati"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM kartes"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Veicot šo darbību, netiks atcelts jūsu mobilo pakalpojumu plāns."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"USB atmiņas"</b>" saturs."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jādzēš "<b>"SD kartes"</b>" saturs."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Dzēst visus datus (atiestatīt rūpnīcas datus)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Atiestatīt rūpnīcas datus"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tādējādi tiks izdzēsti visi planšetdatora "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Tādējādi tiks izdzēsti visi tālruņa "<b>"iekšējā atmiņā"</b>" esošie dati, tostarp:\n\n"<li>"Google konta dati;"</li>\n<li>"sistēmas un lietotņu dati un iestatījumi;"</li>\n<li>"lejupielādētās lietotnes."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Jūs pašlaik esat pierakstījies tālāk norādītajos kontos.\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Šo ierīci izmanto vēl citi lietotāji.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Mūzika"</li>\n<li>"Fotoattēli"</li>\n<li>"Citi lietotāja dati"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM kartes"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Veicot šo darbību, netiks atcelts jūsu mobilo pakalpojumu plāns."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"USB atmiņas"</b>" saturs."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Lai dzēstu mūziku, attēlus un citus lietotāja datus, ir jāizdzēš "<b>"SD kartes"</b>" saturs."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Dzēst USB krātuvi"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Dzēst SD karti"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Dzēst visus iekšējā USB atmiņā saglabātos datus, piemēram, mūziku vai fotoattēlus"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Izdzēst visus SD kartē saglabātos datus, piemēram, mūziku vai fotoattēlus"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Dzēst visus datus"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Dzēst visus datus"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Tiks izdzēsta visa jūsu personas informācija un lejupielādētās lietotnes. Šo darbību nevar atsaukt."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Tiks izdzēsta visa jūsu personas informācija, tostarp lejupielādētās lietotnes un SIM kartes. Šo darbību nevar atsaukt."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Dzēst visu"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Atiestatīšana netika veikta, jo nav pieejams pakalpojums Sistēmas tīrīšana."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vai dzēst visus datus?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Šim lietotājam nav pieejama rūpnīcas datu atiestatīšana."</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Notiek dzēšana"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Lūdzu, uzgaidiet…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Dzēst visus datus"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Dzēst visus datus"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Tiks izdzēsta visa jūsu personas informācija un lejupielādētās lietotnes. Šo darbību nevar atsaukt."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Tiks izdzēsta visa jūsu personas informācija, tostarp lejupielādētās lietotnes un SIM kartes. Šo darbību nevar atsaukt."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vai dzēst visus datus?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Šim lietotājam nav pieejama rūpnīcas datu atiestatīšana."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Notiek dzēšana"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Lūdzu, uzgaidiet…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Zvanu iestatījumi"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Balss pasta, zvanu pāradresācijas, zvana gaidīšanas, zvanītāja ID iestatīšana"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB saistīšana"</string>
@@ -1697,7 +1714,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Nevar izveidot piesaisti vairāk nekā <xliff:g id="MAXCONNECTION">%1$d</xliff:g> ierīcēm."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Ierīce <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tiks atsaistīta."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet piesaiste"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Koplietojiet tālruņa interneta savienojumu, izmantojot USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Koplietojiet tālruņa interneta savienojumu, izmantojot tīklu Ethernet."</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Izmantojiet tīklāju un piesaisti, lai varētu lietot internetu citās ierīcēs, izveidojot mobilo datu savienojumu. Lietotnes var arī izveidot tīklāju satura kopīgošanai ar tuvumā esošajām ierīcēm."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Izmantojot tīklāju un piesaisti, jūsu ierīces Wi-Fi vai mobilo datu savienojums var nodrošināt interneta savienojumu citām ierīcēm. Lietotnes var arī izveidot tīklāju satura kopīgošanai ar tuvumā esošajām ierīcēm."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Palīdzība"</string>
@@ -1740,6 +1757,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth meklēšana"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Ļauj lietotnēm un pakalpojumiem meklēt tuvumā esošas ierīces vienmēr, pat ja Bluetooth ir izslēgts. Šo iestatījumu var izmantot, piemēram, lai uzlabotu atrašanās vietas funkcijas un pakalpojumus."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Atrašanās vietu pakalpojumi darbam"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Atrašanās vietas laika joslas noteikšana"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Atrašanās vietas laika joslas noteikšana"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Var tikt izmantota ierīces atrašanās vieta, lai noteiktu pašreizējo laika joslu. Laika joslas noteikšanas precizitāti var ietekmēt citi atrašanās vietas iestatījumi, piemēram, Wi‑Fi meklēšana."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Ieslēgta"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Izslēgta"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automātiska laika joslas noteikšana ir atspējota."</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Atrašanās vietas laika joslas noteikšana ir atspējota."</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Atrašanās vietas laika joslas noteikšana netiek atbalstīta."</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Atrašanās vietas laika joslas noteikšanas izmaiņas nav atļautas."</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi un mob. tīklu atr. vieta"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Ļaut lietotnēm izmantot Google atrašanās vietas pakalpojumu, lai ātrāk noteiktu jūsu atrašanās vietu. Tiks vākti un nosūtīti uz Google serveriem anonīmi atrašanās vietas dati."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Wi-Fi noteikta atrašanās vieta"</string>
@@ -1803,6 +1829,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Rezerves metode autorizācijai pēc sejas"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Rezerves metode autorizācijai pēc sejas"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Rezerves metode autorizācijai pēc sejas"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Lai lietotu biometriju, iestatiet paroli"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Rezerves metode biometrijas atbloķēšanai"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Lai lietotu biometriju, iestatiet PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Vai aizmirsāt paroli?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Vai aizmirsāt kombināciju?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Vai aizmirsāt PIN?"</string>
@@ -2141,13 +2170,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Subtitru preferences"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Palielinājums"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Palielināšanas apgabals"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Palielināšanas iespējošana"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Izvēlieties vienu vai vairākus palielināmos apgabalus ekrāna palielināšanai"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pilnekrāna režīms"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ekrāna daļa"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pilnekrāna režīms un ekrāna daļas palielināšana"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Palielināt visu ekrānu"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Palielināt ekrāna daļu"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vai pārslēgties uz pieejamības pogu?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Izmantojot trīskāršo skārienu, lai palielinātu daļu ekrāna, tiks aizkavēta ievade un citas darbības.\n\nVai vēlaties pārslēgties uz pieejamības pogas izmantošanu palielināšanai?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Pārslēgties uz pieejamības pogu"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Turpināt izmantot trīskāršo skārienu palielināšanai"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Palielināšanas iestatījumi"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Palielināt, trīsreiz pieskaroties"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Palielināšana ar saīsni"</string>
@@ -2201,11 +2233,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Barošanas poga beidz zvanu"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Liela rādītāja ikona"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Noņemt animācijas"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Apvienot kanālus, atskaņojot audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audio balanss"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Pa kreisi"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Pa labi"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Apvienot kanālus, ja tiek atskaņots audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio balanss"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Pa kreisi"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Pa labi"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Noklusējums"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekundes"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekundes"</string>
@@ -2235,11 +2267,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Paziņojuma vibrācija"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Zvana vibrācija"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Pieskarieties vienumam Atsauksmes"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Izmantot lietotni <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Atvērt lietotni <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Izmantot krāsu korekciju"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Rādīt parakstus"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Tikai atbalstītai lietotnei"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Izmantot lietotni <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Atvērt lietotni <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Izmantot krāsu korekciju"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Subtitru rādīšana"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Tikai atbalstītai lietotnei"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Subtitru lielums un stils"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> teksta lielums"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Citas iespējas"</string>
@@ -2270,6 +2302,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deiteranomālija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomālija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomālija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Pelēktoņu iestatījums"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Sarkana/zaļa krāsa"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Sarkana/zaļa krāsa"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Zila/dzeltena krāsa"</string>
@@ -2405,7 +2438,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Lietošanas fonā ierobežošana"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Atļaut lietotnei darboties fonā"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Lietotnes darbība fonā nav atļauta."</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Lietošanu fonā nevar ierobežot"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Lietošanu fonā nevar ierobežot."</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vai ierobežot darbību fonā?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ierobežojot lietotnes darbību fonā, var rasties šīs lietotnes darbības traucējumi."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Lietotnei nav iestatīta akumulatora optimizācija, tāpēc to nevar ierobežot.\n\nVispirms iestatiet akumulatora optimizāciju."</string>
@@ -2454,6 +2487,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Planšetdators tika izmantots vairāk nekā parasti."</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Ierīce tika izmantota vairāk nekā parasti."</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Akumulators var izlādēties ātrāk nekā parasti"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Akumulatora darbības optimizēšana"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Akumulatora uzlādes līmenis ir īslaicīgi ierobežots. Pieskarieties, lai uzzinātu vairāk."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Jūsu tālrunis tika izmantots vairāk nekā parasti. Akumulators var izlādēties ātrāk, nekā paredzēts.\n\nLietotnes, kas izmanto visvairāk akumulatora enerģijas:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Jūsu planšetdators tika izmantots vairāk nekā parasti. Akumulators var izlādēties ātrāk, nekā paredzēts.\n\nLietotnes, kas izmanto visvairāk akumulatora enerģijas:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Jūsu ierīce tika izmantota vairāk nekā parasti. Akumulators var izlādēties ātrāk, nekā paredzēts.\n\nLietotnes, kas izmanto visvairāk akumulatora enerģijas:"</string>
@@ -2516,6 +2551,8 @@
       <item quantity="other">Ierobežota %1$d lietotņu darbība</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small><font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Nevar iegūt informāciju par akumulatora uzlādes līmeni."</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Nevar iegūt informāciju par akumulatora uzlādes līmeni. Pieskarieties, lai "<annotation id="url">"uzzinātu vairāk"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Vai apturēt lietotni?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Jūsu tālrunis nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP">%1$s</xliff:g> arvien aktivizē jūsu tālruni.\n\nLai novērstu šo problēmu, varat apturēt lietotnes darbību.\n\nJa problēma atkārtojas, iespējams, būs jāatinstalē lietotne, lai uzlabotu akumulatora darbību."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Jūsu planšetdators nevar pārvaldīt akumulatora darbību kā parasti, jo lietotne <xliff:g id="APP">%1$s</xliff:g> arvien aktivizē jūsu planšetdatoru.\n\nLai novērstu šo problēmu, varat apturēt lietotnes darbību.\n\nJa problēma atkārtojas, iespējams, būs jāatinstalē lietotne, lai uzlabotu akumulatora darbību."</string>
@@ -2629,9 +2666,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Iestatīt grafiku"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Akumulatora darbības laika paildzināšana"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Izslēgt, kad uzlādējies"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad tālruņa uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad planšetdatora uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad ierīces uzlādes līmenis ir <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad tālruņa uzlādes līmenis pārsniedz <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad planšetdatora uzlādes līmenis pārsniedz <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Akumulatora enerģijas taupīšanas režīms tiek izslēgts, kad ierīces uzlādes līmenis pārsniedz <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ieslēgt"</string>
@@ -2696,6 +2733,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Atiestatīt"</string>
     <string name="tts_play" msgid="2945513377250757221">"Atskaņot"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptīvā savienojamība"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Tiek paildzināts akumulatora darbības ilgums un uzlabota ierīces veiktspēja, automātiski pārvaldot jūsu tīkla savienojumus."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Akreditācijas datu krātuve"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sertifikāta instalēšana"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalēt sertifikātus no atmiņas"</string>
@@ -2707,9 +2746,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Lietotāja akreditācijas dati"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Saglabāto akreditācijas datu skatīšana un pārvaldīšana"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Papildu"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Krātuves tips"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Krātuve aparatūrā"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Tikai programmatūrā"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Šim lietotājam nav pieejami akreditācijas dati."</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalēts VPN konfigurācijai un lietotnēm"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalēts Wi-Fi konfigurācijai"</string>
@@ -2725,6 +2761,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Neinstalēt"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Tik un tā instalēt"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sertifikāts nav instalēts"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Vai atļaut lietotnei <xliff:g id="APP_NAME">%s</xliff:g> instalēt sertifikātus šajā ierīcē?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Izmantojot šos sertifikātus, tālāk norādītās lietotnes un vietrāži URL varēs jūs identificēt."</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Neatļaut"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Atļaut"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Rādīt vairāk"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Sertifikātu pārvaldības lietotne"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Nav"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Izmantojot šīs lietotnes instalētos sertifikātus, tālāk norādītās lietotnes un vietrāži URL varēs jūs identificēt."</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Noņemt"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Ārkārtas zvana signāls"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Iestatīt uzvedību, kad tiek veikts ārkārtas zvans"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Dublēšana"</string>
@@ -3053,7 +3098,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Darba profils — nav iestatīts"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrators"</string>
     <string name="user_you" msgid="3070562015202859996">"Jūs (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Segvārds"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Varat pievienot līdz pat <xliff:g id="USER_COUNT">%1$d</xliff:g> lietotājiem."</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Lietotājus var pārvaldīt tikai planšetdatora īpašnieks."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Lietotājus var pārvaldīt tikai tālruņa īpašnieks."</string>
@@ -3103,7 +3147,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Maksāšana, izmantojot termināli"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Iestatiet maksājumu lietotni. Pēc tam pietuviniet tālruņa aizmuguri jebkuram terminālim, uz kura redzams bezvadu maksājumu simbols."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Labi"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Vairāk…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Vairāk…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Iestatiet noklusējuma maksājumu lietotni"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Atjauniniet noklusējuma maksājumu lietotni"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Bezkontakta terminālī maksājiet, izmantojot lietotni <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3173,9 +3217,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Atpakaļ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Tālāk"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Pabeigt"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Uzņemt fotoattēlu"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Izvēlēties attēlu"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Atlasīt fotoattēlu"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartes"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartes"</string>
@@ -3187,7 +3228,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Vienmēr izmantot šo iestatījumu zvaniem"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Atlasīt SIM karti datu pārraidei"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Atlasiet SIM karti, ko izmantot īsziņām"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Notiek datu SIM kartes mainīšana. Tas neaizņems vairāk par minūti..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Notiek datu SIM kartes mainīšana. Tas var ilgt kādu minūti…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Izmantot zvaniem"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM kartes atlasīšana"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM karte <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3372,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"darbību secība, grafiks, akumulatora enerģijas taupīšanas režīms, enerģijas taupīšanas režīms, akumulators, automātiski, procenti"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, paplašinātas zvanu iespējas, 4G zvani"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"pievienot valodu, valodas pievienošana"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"teksta lielums"</string>
     <string name="default_sound" msgid="6604374495015245195">"Noklusējuma skaņa"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Zvanu un paziņojumu signāla skaļums: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Skaļums, vibrācija, režīms “Netraucēt”"</string>
@@ -3370,12 +3412,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ieslēgšanas skaņas"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtitri reāllaikā"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automātiskie paraksti multividei"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nav"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="zero">Iestatīti <xliff:g id="ON_COUNT">%d</xliff:g> grafiki</item>
-      <item quantity="one">Iestatīts <xliff:g id="ON_COUNT">%d</xliff:g> grafiks</item>
-      <item quantity="other">Iestatīti <xliff:g id="ON_COUNT">%d</xliff:g> grafiki</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nav}=1{Iestatīts viens grafiks}zero{Iestatīti # grafiki}one{Iestatīts # grafiks}other{Iestatīti # grafiki}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Netraucēt"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Saņemt paziņojumus tikai no svarīgām personām un lietotnēm"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Traucējumu ierobežošana"</string>
@@ -3443,22 +3480,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Tikai prioritārie pārtraukumi"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Ieslēgts / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Izslēgts / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Izslēgts"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ieslēgts"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Vaicāt katru reizi"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Līdz brīdim, kad izslēgsiet"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="zero"><xliff:g id="NUM_HOURS">%d</xliff:g> stundu</item>
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> stunda</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> stundas</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="zero"><xliff:g id="ON_COUNT">%d</xliff:g> grafiki var tikt ieslēgti automātiski</item>
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> grafiks var tikt ieslēgts automātiski</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> grafiki var tikt ieslēgti automātiski</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{Viena stunda}zero{# stundu}one{# stunda}other{# stundas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{Viena minūte}zero{# minūšu}one{# minūte}other{# minūtes}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Izslēgts}=1{Izslēgts; viens grafiks var tikt ieslēgts automātiski}zero{Izslēgts; # grafiki var tikt ieslēgti automātiski}one{Izslēgts; # grafiks var tikt ieslēgts automātiski}other{Izslēgts; # grafiki var tikt ieslēgti automātiski}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Atļauts pārtraukt režīmā Netraucēt"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Lietotnes"</string>
@@ -3504,6 +3531,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automātiski iestatīt zemākas prioritātes paziņojumus kā neuzkrītošus"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptīvo paziņojumu ranžēšana"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automātiski ranžēt paziņojumus pēc atbilstības"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Atsauksmes par adaptīvajiem paziņojumiem"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Norādīt korekcijas, kas veiktas paziņojumiem, un rādīt opciju iesniegt sistēmā atsauksmes"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Svarīguma paziņojumu atiestatīšana"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Atiestatiet svarīguma iestatījumus, ko mainīja lietotājs, un atļaujiet paziņojumu asistentam piešķirt prioritāti."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Darbību un atbilžu ieteikumi"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automātiski rādīt ieteicamās darbības un atbildes"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Rādīt jaunākos un atliktos paziņojumus"</string>
@@ -3602,8 +3633,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioritāras sarunas"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Tiek rādītas sarunu sadaļas augšdaļā un kā peldoši burbuļi"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Tiek rādītas sarunu sadaļas augšdaļā"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Citas sarunas"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Sarunas, kas nav prioritāras"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Sarunas, kurās esat veicis izmaiņas"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Jaunākās sarunas"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Notīrīt nesenos"</string>
+    <string name="clear" msgid="5092178335409471100">"Notīrīt"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Rādīt burbulī prioritārās sarunas"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritārās sarunas tiek rādītas nolaižamā paneļa augšdaļā. Varat iestatīt, lai tās tiktu rādītas burbulī un režīmā “Netraucēt”."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Šeit būs redzamas prioritārās un mainītās sarunas"</string>
@@ -3705,7 +3739,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Piekļuve pie “Netraucēt”"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Atļaut režīmu “Netraucēt”"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nevienā instalētajā lietotnē nav pieprasīta piekļuve režīmam “Netraucēt”."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Notiek lietotņu ielāde..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Notiek lietotņu ielāde…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Pēc jūsu pieprasījuma Android neatļauj šīs lietotnes paziņojumu rādīšanu šajā ierīcē."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Pēc jūsu pieprasījuma Android neatļauj šīs kategorijas paziņojumu rādīšanu šajā ierīcē."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Pēc jūsu pieprasījuma Android neatļauj šīs grupas paziņojumu rādīšanu šajā ierīcē."</string>
@@ -3800,12 +3834,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Visas sarunas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritāras sarunas"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nav"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="zero"><xliff:g id="CONVERSATIONS">%d</xliff:g> sarunu</item>
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> saruna</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> sarunas</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nav"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nav}=1{Viena saruna}zero{# sarunu}one{# saruna}other{# sarunas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kas var pārtraukt"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Zvani"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Zvani"</string>
@@ -3814,12 +3843,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Lai dzirdētu atļauto zvanu signālus, pārbaudiet, vai ierīcē ir iestatīts zvanīšanas režīms"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Grafikam <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> ienākošie zvani ir bloķēti. Varat pielāgot iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Ar zvaigznīti atzīmētas kontaktpersonas"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="zero">Vēl <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktpersonu</item>
-      <item quantity="one">Vēl <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktpersona</item>
-      <item quantity="other">Vēl <xliff:g id="NUM_PEOPLE">%d</xliff:g> kontaktpersonas</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nav"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nav}=1{{contact_1}}=2{{contact_1} un {contact_2}}=3{{contact_1}, {contact_2} un {contact_3}}zero{{contact_1}, {contact_2} un vēl # kontaktpersonu}one{{contact_1}, {contact_2} un vēl # kontaktpersona}other{{contact_1}, {contact_2} un vēl # kontaktpersonas}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Nav vārda)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Ziņojumi"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ziņojumi"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Ziņojumi"</string>
@@ -3828,12 +3853,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Grafikam “<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” ienākošie ziņojumi ir bloķēti. Varat pielāgot iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Jūs saņemsiet visus ziņojumus"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Jūs saņemsiet visus zvanus"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nav"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="zero"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktpersonu</item>
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktpersona</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktpersonas</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nav}=1{Viena kontaktpersona}zero{# kontaktpersonu}one{# kontaktpersona}other{# kontaktpersonas}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Ikviens"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktpersonas"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Ar zvaigznīti atzīmētas kontaktpersonas"</string>
@@ -3871,24 +3891,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Visi paziņojumi"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Daži paziņojumi"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Atlasītie lietotāji joprojām var sazināties ar jums, pat ja neatļaujat lietotnēm traucēt jūs."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="zero"><xliff:g id="APP_NAMES">%s</xliff:g> atļauts pārtraukt</item>
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> atļauts pārtraukt</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> atļauts pārtraukt</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Vēl <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nevienai lietotnei nav atļauts pārtraukt}=1{Lietotnei {app_1} ir atļauts pārtraukt}=2{Lietotnei {app_1} un {app_2} ir atļauts pārtraukt}=3{Lietotnei {app_1}, {app_2} un {app_3} ir atļauts pārtraukt}zero{Lietotnei {app_1} un {app_2} un vēl # lietotnēm ir atļauts pārtraukt}one{Lietotnei {app_1} un {app_2} un vēl # lietotnei ir atļauts pārtraukt}other{Lietotnei {app_1} un {app_2} un vēl # lietotnēm ir atļauts pārtraukt}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Lietotnes"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Visi paziņojumi"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Daži paziņojumi"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Paziņojumi, kas var traucēt"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Atļaut visus paziņojumus"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="zero"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> atļauts pārtraukt</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> atļauts pārtraukt</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> atļauts pārtraukt</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nekam nav atļauts pārtraukt"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Vēl <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nekam nav atļauts pārtraukt}=1{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1}}=2{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1} un {sound_category_2}}=3{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1}, {sound_category_2} un {sound_category_3}}zero{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1}, {sound_category_2} un vēl #}one{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1}, {sound_category_2} un vēl #}other{Šādiem signāliem ir atļauts pārtraukt: {sound_category_1}, {sound_category_2} un vēl #}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nekam nav atļauts pārtraukt"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nevienai personai nav atļauts pārtraukt"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Dažām personām ir atļauts pārtraukt"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Visām personām ir atļauts pārtraukt"</string>
@@ -3936,8 +3946,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Ieslēgts"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Izslēgts"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Lietotņu piespraušana"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Izmantojot lietotņu piespraušanu, varat iestatīt, ka pašreizējā lietotne jārāda, līdz to atspraudīsiet. Šo funkciju var izmantot, piemēram, lai ļautu uzticamam draugam spēlēt noteiktu spēli. \n\nKamēr lietotne ir piesprausta, piespraustā lietotne var atvērt citas lietotnes un var būt iespējams piekļūt personas datiem. \n\nLai izmantotu lietotņu piespraušanu, veiciet tālāk norādītās darbības. 	\n1.	Ieslēdziet lietotņu piespraušanu. 	\n2.	Atveriet sadaļu Pārskats. 	\n3.	Ekrāna augšdaļā pieskarieties lietotnes ikonai un pēc tam pieskarieties vienumam Piespraust."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Izmantojot lietotņu piespraušanu, varat iestatīt, ka pašreizējā lietotne jārāda, līdz to atspraudīsiet. Šo funkciju var izmantot, piemēram, lai ļautu uzticamam draugam spēlēt noteiktu spēli. \n\nKamēr lietotne ir piesprausta, piespraustā lietotne var atvērt citas lietotnes un var būt iespējams piekļūt personas datiem. \n\nJa vēlaties droši kopīgot savu ierīci ar citu personu, lietotņu piespraušanas vietā varat izmantot vieslietotāja profilu. \n\nLai izmantotu lietotņu piespraušanu, veiciet tālāk norādītās darbības. 	\n1.	Ieslēdziet lietotņu piespraušanu. 	\n2.	Atveriet sadaļu Pārskats. 	\n3.	Ekrāna augšdaļā pieskarieties konkrētas lietotnes ikonai un pēc tam — vienumam Piespraust."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Izmantojot lietotņu piespraušanas funkciju, varat iestatīt, lai pašreizējā lietotne tiktu rādīta, līdz to atspraudīsiet. Šo funkciju var izmantot, piemēram, lai ļautu uzticamam draugam spēlēt noteiktu spēli."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Kamēr lietotne ir piesprausta, tā var atvērt citas lietotnes, kā arī var būt iespējams piekļūt personas datiem. \n\nLai izmantotu lietotņu piespraušanu, veiciet tālāk norādītās darbības: 	\n1.	Ieslēdziet lietotņu piespraušanu. 	\n2.	Atveriet sadaļu Pārskats. 	\n3.	Ekrāna augšdaļā pieskarieties konkrētas lietotnes ikonai un pēc tam — vienumam Piespraust."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Kamēr lietotne ir piesprausta, tā var atvērt citas lietotnes, kā arī var būt iespējams piekļūt personas datiem. \n\nJa vēlaties droši kopīgot savu ierīci ar citu personu, lietotņu piespraušanas vietā varat izmantot vieslietotāja profilu. \n\nLai izmantotu lietotņu piespraušanu, veiciet tālāk norādītās darbības. 	\n1.	Ieslēdziet lietotņu piespraušanu. 	\n2.	Atveriet sadaļu Pārskats. 	\n3.	Ekrāna augšdaļā pieskarieties konkrētas lietotnes ikonai un pēc tam — vienumam Piespraust."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Kamēr lietotne ir piesprausta, pastāv šādi riski. \n\n•	 Var būt iespējams piekļūt personas datiem \n		(piemēram, kontaktpersonu sarakstam un e-pasta ziņojumu saturam). \n•	 Piespraustā lietotne var atvērt citas lietotnes. \n\nIzmantojiet lietotņu piespraušanu tikai kopā ar uzticamām personām."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Pirms atspraušanas pieprasīt grafisko atsl."</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Prasīt PIN kodu pirms atspraušanas"</string>
@@ -3959,6 +3970,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Varat uzlabot ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas papildus atbloķēšanai ar seju tiktu pieprasīts PIN. Kamēr ierīce nav palaista, nevar saņemt zvanus, īsziņas vai paziņojumus, tostarp signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt PIN pirms ierīces palaišanas?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Varat uzlabot ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas papildus atbloķēšanai ar seju tiktu pieprasīta kombinācija. Kamēr ierīce nav palaista, nevar saņemt zvanus, īsziņas vai paziņojumus, tostarp signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt kombināciju pirms ierīces palaišanas?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Varat uzlabot ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas papildus atbloķēšanai ar seju tiktu pieprasīta parole. Kamēr ierīce nav palaista, nevar saņemt zvanus, īsziņas vai paziņojumus, tostarp signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt paroli pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Papildus atbloķēšanai ar biometriju varat uzlabot šīs ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas tiktu pieprasīts PIN. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt PIN pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Papildus atbloķēšanai ar biometriju varat uzlabot šīs ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta kombinācija. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt kombināciju pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Papildus atbloķēšanai ar biometriju varat uzlabot šīs ierīces aizsardzību, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta parole. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt paroli pirms ierīces palaišanas?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Jā"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nē"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ierobežota"</string>
@@ -4142,7 +4156,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB, ko pārvalda:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Pievienotā ierīce"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Šī ierīce"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Notiek pārslēgšana."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Notiek pārslēgšana…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Pārslēgšana neizdevās"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Šīs ierīces uzlāde"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Pievienotās ierīces uzlāde"</string>
@@ -4340,6 +4354,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobilo datu lietojums"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Lietotnes datu lietojums"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi datu lietojums"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Datu lietojums, ko nenodrošina mobilo sakaru operators"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet datu lietojums"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Tīkls Ethernet"</string>
@@ -4359,6 +4374,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ierobežojumi</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Mobilo sakaru operatora datu uzskaite var atšķirties no datu uzskaites ierīcē"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Neietver datu lietojumu, ko nodrošina mobilo sakaru operatoru tīkli."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> izmantoti"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ieslēgt brīdinājumu par datiem"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datu brīdinājums"</string>
@@ -4396,7 +4412,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Skatīt detalizētu informāciju"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Datu lietojuma samazinātājs"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neierobežoti dati"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Fona dati ir izslēgti."</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Fona dati ir izslēgti."</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Ieslēgts"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Izslēgts"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Izmantot datu lietojuma samazinātāju"</string>
@@ -4419,7 +4435,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ja ierīce ir bloķēta, neļaut paziņojumos rakstīt atbildes vai citu tekstu"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Nokl. pareizrakstības pārbaude"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Pareizrakst. pārb. atlasīšana"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Pareizrakstības pārbaudītāja izmantošana"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Izmantot pareizrakstības pārbaudītāju"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nav atlasīta"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nav)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4529,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Lai atbrīvotu vietu krātuvē, krātuves pārvaldnieks noņem no jūsu ierīces dublētos fotoattēlus un videoklipus."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fotoattēlu un videoklipu noņemšana"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Krātuves pārvaldnieks"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Izmantot krātuves pārvaldnieku"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Izmantot krātuves pārvaldnieku"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automātiski"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuāli"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Atbrīvot vietu"</string>
@@ -4551,6 +4567,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dubultskāriens, lai skatītu tālruņa paziņojumus"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dubultskāriens, lai skatītu planšetdatora paziņojumus"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dubultskāriens, lai skatītu ierīces paziņojumus"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Vilkšana paziņojumiem"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Ekrāna apakšējā malā velciet lejup, lai tiktu rādīti paziņojumi."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Vienas rokas režīms"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Izmantot vienas rokas režīmu"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Iziet, pārslēdzot lietotnes"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Noildze"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekundes"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekundes"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekundes"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"sasniedzamība"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Lai skatītu laiku, paziņojumus un citu informāciju, divreiz pieskarieties ekrānam."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Tālruņa pārbaude paceļot"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Planšetdatora pacelšana, lai skatītu paziņojumus"</string>
@@ -4563,6 +4589,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Planšetdatora paziņojumu pārbaude pieskaroties"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ierīces paziņojumu pārbaude pieskaroties"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Lai skatītu laiku, paziņojumus un citu informāciju, pieskarieties ekrānam."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Ārkārtas palīdzība"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Izmantot ārkārtas palīdzību"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Pārvalda <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Varat sākt tālāk norādītās darbības, vismaz piecas reizes strauji nospiežot barošanas pogu."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Laika atskaites signāla atskaņošana"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Atskaņot skaļu signālu pirms palīdzības pieprasīšanas"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Zvans palīdzības dienestam"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Numurs, uz kuru zvanīt, lai saņemtu palīdzību"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Pieskarieties, lai mainītu."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Ja ievadīsiet numuru, kas nav ārkārtas numurs, ņemiet vērā:\n • lai izmantotu ārkārtas palīdzību, jāatbloķē ierīce;\n • zvans var netikt atbildēts."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Ziņu skatīšana ar pirksta nospiedumu"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Nospiedumu skeneris"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru tālruņa aizmugurē."</string>
@@ -4695,6 +4731,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maksimālais redzamo datu kopu skaits"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Atiestatīt uz noklusējuma vērtībām"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Izstrādātājiem paredzēto opciju automātiskā aizpilde ir atiestatīta."</string>
+    <string name="location_category" msgid="3496759112306219062">"Atrašanās vieta"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Atrašanās vietas indikators statusa joslā"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Rādīt vienmēr, kad tiek noteikta atrašanās vieta, tostarp tad, ja tā var tikt atklāta, izmantojot tīklu vai savienojamību"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Veikt pilnus GNSS mērījumus"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Izsekot visas GNSS konstelācijas un frekvences bez darba cikliem"</string>
     <string name="device_theme" msgid="5027604586494772471">"Ierīces motīvs"</string>
     <string name="default_theme" msgid="4815428567082263639">"Noklusējums"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Tīkla nosaukums"</string>
@@ -4711,8 +4752,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pārtraukt paziņojumus, lai ilglaicīgi koncentrētos"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funkcija nav pieejama"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Šī funkcija ir izslēgta, jo tā palēnina jūsu tālruņa darbību."</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Veikt pilnus GNSS mērījumus"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Izsekot visas GNSS konstelācijas un frekvences bez darba cikliem"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Vienmēr rādīt avārijas dialoglodziņu"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Rādīt dialoglodziņu katru reizi, kad lietotne avarē"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Atlasiet lietotni, kam ANGLE ir iespējots"</string>
@@ -4724,7 +4763,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Iespējot visām lietotnēm"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafikas draivera atlase"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Noklusējums"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Spēles draiveris"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Spēles draiveris"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Grafikas draiveris izstrādātājiem"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistēmas grafikas draiveris"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4780,7 +4819,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Ieslēgt (izslēgt skaņu)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Izslēgt"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Dati par tīklu"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Jūsu ierīces nosaukums ir redzams tālrunī instalētajām lietotnēm. Ja izveidosiet savienojumu ar Bluetooth ierīcēm vai iestatīsiet Wi-Fi tīklāju, tas būs redzams arī citām personām."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Jūsu ierīces nosaukums ir redzams tālrunī instalētajām lietotnēm. Tas var būt redzams arī citām personām, ja izveidosiet savienojumu ar Bluetooth ierīcēm, Wi-Fi tīklu vai iestatīsiet Wi-Fi tīklāju."</string>
     <string name="devices_title" msgid="649715719278562515">"Ierīces"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Visi iestatījumi"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Ieteikumi"</string>
@@ -4793,6 +4832,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Neizdevās atrast tīklus. Mēģiniet vēlreiz."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(aizliegts)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nav SIM kartes"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM karte"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nav SIM kartes"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nav"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Lai izveidotu savienojumu, nepieciešama SIM karte"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Lai izveidotu savienojumu, nepieciešama <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM karte"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Ieteicamais tīkla režīms: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Ieteicamais tīkla režīms: tikai GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Ieteicamais tīkla režīms: tikai WCDMA"</string>
@@ -4846,6 +4890,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilie dati"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Piekļuve datiem, izmantojot mobilo tīklu"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Tālrunis tiks automātiski pārslēgts uz šo mobilo sakaru operatoru, ja būs sasniedzamības zonā"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nav pieejama neviena SIM karte."</string>
     <string name="calls_preference" msgid="2166481296066890129">"Vēlamais abonements zvaniem"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Vēlamais tīkls īsziņām"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vaicāt katru reizi"</string>
@@ -4907,6 +4952,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nav pieejams, ja izveidots savienojums ar operatoru <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Skatīt vairāk"</string>
     <string name="see_less" msgid="2642392725363552793">"Skatīt mazāk"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vai ieslēgt operatoru <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vai ieslēgt SIM karti?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vai pārslēgt uz operatoru <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vai pārslēgties uz SIM kartes izmantošanu?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Vienlaikus aktīva var būt tikai viena SIM karte.\n\nPārslēdzoties uz operatoru <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, netiks atcelti <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> pakalpojumi."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Vienlaikus aktīva var būt tikai viena lejupielādēta SIM karte.\n\nPārslēdzoties uz operatoru <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, netiks atcelti <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> pakalpojumi."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Vienlaikus var būt aktīva tikai viena SIM karte.\n\nPārslēdzoties netiks atcelti <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> pakalpojumi."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Pārslēgties uz operatoru <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Notiek savienojuma izveide ar tīklu…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Notiek pārslēgšanās uz operatoru <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nevar pārslēgties uz cita mobilo sakaru operatora tīklu"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Nevar pārslēgties uz cita mobilo sakaru operatora tīklu, jo radās kļūda."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vai izslēgt pakalpojumu <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vai izslēgt SIM karti?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Notiek SIM kartes izslēgšana<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nevar atspējot mobilo sakaru operatoru"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Radās kļūda, un mobilo sakaru operatoru nevarēja atspējot."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vai izmantot divas SIM kartes?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Šajā ierīcē vienlaikus var būt aktīvas divas SIM kartes. Lai turpinātu vienlaikus lietot vienu SIM karti, pieskarieties vienumam “Nē, paldies”."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Vai restartēt ierīci?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Lai sāktu darbu, restartējiet savu ierīci. Pēc tam varēsiet pievienot citu SIM karti."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Turpināt"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Restartēt"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nē, paldies"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Pārslēgt"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nevar aktivizēt SIM karti"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Izņemiet un atkal ievietojiet SIM karti. Ja problēma nav novērsta, restartējiet savu ierīci."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Mēģiniet atkal ieslēgt SIM karti. Ja problēma nav novērsta, restartējiet savu ierīci."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Tīkla aktivizācija"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ir aktīvs"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Pieskarieties, lai atjauninātu SIM kartes iestatījumus."</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM karte"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Vai dzēst šo lejupielādēto SIM karti?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Izdzēšot šo SIM karti, operatora “<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>” pakalpojumi tiek noņemti no šīs ierīces.\n\nOperatora “<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>” pakalpojumi netiks atcelti."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Dzēst"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Notiek SIM kartes dzēšana…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Nevar izdzēst SIM karti"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Šo SIM karti nevar izdzēst, jo radās kļūda.\n\nRestartējiet ierīci un mēģiniet vēlreiz."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Savienojuma izveide ar ierīci"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Lietotne <xliff:g id="APPNAME">%1$s</xliff:g> vēlas izmantot pagaidu Wi‑Fi tīklu, lai izveidotu savienojumu ar jūsu ierīci."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nav atrasta neviena ierīce. Ierīcēm ir jābūt ieslēgtām un pieejamām savienojuma izveidei."</string>
@@ -4980,6 +5063,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Ārkārtas zvani"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Jūsu mobilo sakaru operators neatbalsta ārkārtas zvanus kā Wi‑Fi zvanus.\nIerīcē tiek automātiski pārslēgts mobilais tīkls, lai veiktu ārkārtas zvanu.\nĀrkārtas zvanus iespējams veikt tikai apgabalos ar mobilā tīkla pārklājumu."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Zvaniem izmantot Wi‑Fi, lai uzlabotu kvalitāti"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Zvanīšana, izmantojot dažādas SIM kartes"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Pāradresējiet zvanus un īsziņas no citas SIM kartes uz šo SIM karti."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"zvanīšana, izmantojot dažādas SIM kartes"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Ienākoša multiziņa"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Nevar nosūtīt multiziņu"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Pieskarieties, lai atļautu multiziņu sūtīšanu, izmantojot operatoru <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>, kad mobilie dati ir izslēgti."</string>
@@ -5031,10 +5117,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Atļaut ekrānu pārklāšanu iestatījumos"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Atļaut lietotnēm, ko var rādīt pāri citām lietotnēm, pārklāt iestatījumu ekrānus"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multivide"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Paslēpiet atskaņotāju, multivides sesijai beidzoties"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Atskaņotāja sesiju varat atsākt izvērstajā ātro iestatījumu panelī."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Multivides atskaņotājs ātrajos iestatījumos"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Rādīt multivides atskaņotāju ilgāku laika periodu, lai varētu ērti atsākt atskaņošanu"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Paslēpt atskaņotāju"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Rādīt atskaņotāju"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nav pieejams neviens atskaņotājs"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Atļautās lietotnes"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multivide"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Tiks ieslēgts Bluetooth savienojums."</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Ieslēgta"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Izslēgta"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internets"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM kartes"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Tīkli, ko var izmantot lidojuma režīmā"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Atrodiet tīklus, ko var izmantot lidojuma režīmā, un izveidojiet savienojumu ar tiem."</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lidojuma režīms, var izmantot lidojuma režīmu"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Zvani un īsziņas"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi zvani"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Veiciet un saņemiet zvanus tīklos, ko nenodrošina mobilo sakaru operatori, piemēram, Wi-Fi tīklos."</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Izmantojot Wi-Fi zvanus, varat veikt un saņemt zvanus tīklos, ko nenodrošina mobilo sakaru operatori, piemēram, dažos Wi-Fi tīklos."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Zvani"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"Īsziņas"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"vēlamie"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"vēlamie zvani"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"vēlamās īsziņas"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"nav pieejami"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nav SIM kartes"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferences"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Izveidot savienojumu ar publiskiem tīkliem"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"tīkla savienojums, internets, bezvadu, dati, Wi-Fi, mobilais tīkls, mobilie sakari, mobilo sakaru operators, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Skatīt tīklus, kas droši lidojuma režīmā"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Izslēgt lidojuma režīmu"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Šī preference nav pieejama, jo ir ieslēgts naktsmiera režīms."</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Paziņojumu svarīguma līmeņa atiestatīšana ir pabeigta."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Lietotnes"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ierīce, kas nav saglabāta uzticamo ierīču sarakstā, pieprasa atļauju piekļūt jūsu ziņojumiem. Pieskarieties, lai skatītu detalizētu informāciju."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vai atļaujat piekļūt ziņojumiem?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Bluetooth ierīce [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kas nav saglabāta uzticamo ierīču sarakstā, pieprasa atļauju piekļūt jūsu ziņojumiem.\n\nJūs neesat iepriekš veidojis savienojumu ar ierīci [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ierīce, kas nav saglabāta uzticamo ierīču sarakstā, pieprasa atļauju piekļūt jūsu kontaktpersonu datiem un zvanu žurnālam. Pieskarieties, lai skatītu detalizētu informāciju."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vai atļaujat piekļūt kontaktpersonu datiem un zvanu žurnālam?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Bluetooth ierīce [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kas nav saglabāta uzticamo ierīču sarakstā, pieprasa atļauju piekļūt jūsu kontaktpersonu datiem un zvanu žurnālam. Tas attiecas arī uz datiem par ienākošajiem un izejošajiem zvaniem.\n\nJūs neesat iepriekš veidojis savienojumu ar ierīci [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 1517863..f43fb8f 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Средно"</item>
     <item msgid="6740026006576843477">"Долго"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Кратко"</item>
+    <item msgid="7397961711906421599">"Средно"</item>
+    <item msgid="4079132024502041928">"Долго"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Стандардни"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобален"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Само TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобален"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 4a190e9..9c58cde 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Датум и време"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Постави датум и време"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Постави датум, време, временска зона и формати"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Користи време од мрежата"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Користи часовна зона од мрежата"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Поставете време автоматски"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Поставете временска зона автоматски"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Користи локален стандард"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Формат од 24 часа"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Користи 24-часовен формат"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Прикажи информ. за профил при заклучување екран"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Сметки"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Локација"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Користи ја локацијата"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Користи ја локацијата"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Исклучено"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Вклучено - <xliff:g id="COUNT_1">%1$d</xliff:g> апликација има пристап до локацијата</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Заклучување екран, отклучување со лик"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Заклучување екран, отпечаток"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Заклучување екран"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Отклучувајте го телефонот безбедно со лицето и отпечаток"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Може да се најавувате на апликации и да потврдувате плаќања"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Поставете отклучување со:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Отклучување со лик"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Лесно отклучувајте го телефонот"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Отпечаток"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Отклучувајте го телефонот уште в џеб"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Прескокни"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Следно"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Додаден е лик"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Поставете „Отклучување со лик“"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Отклучување со лик"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Користење на лицето за проверка"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Започни"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ако функцијата за пристапност „Отклучување со лик“ е исклучена, некои чекори за поставување можеби нема да работат правилно со TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Продолжи"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Поставување на пристапноста"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"При користење „Отклучување со лик“ во апликации, секогаш барај потврда"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Избриши под. за лик"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Поставете „Отклучување со лик“"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Користете „Отклучување со лик“ за отклучување на уредот, најавување на апликации и потврдување плаќања.\n\nИмајте предвид:\nТелефонот може да се отклучи кога гледате во него, дури и ако немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го подигне до вашиот лик.\n\nТелефонот може да го отклучи некој што многу наликува на вас, на пример, ваш идентичен близнак."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Користете „Отклучување со лик“ за отклучување на уредот, најавување на апликации и потврдување плаќања.\n\nИмајте предвид:\nПоглед кон телефонот може да го отклучи и кога немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го подигне до вашиот лик, дури и ако очите ви се затворени.\n\nНекој што многу наликува на вас може да го отклучи вашиот телефон, на пример, ваш идентичен близнак."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Користете го отклучувањето со лик за да го отклучувате вашиот уред, да се најавувате на апликации и да потврдувате плаќања."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Имајте предвид:\nако гледате во телефонот, тој може да се отклучи дури и кога немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го држи до вашиот лик.\n\nТелефонот може да ви го отклучи некој што многу личи на вас, на пример, идентичен близнак."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Имајте предвид:\nако гледате во телефонот, тој може да се отклучи дури и кога немате таква намера.\n\nНекој друг може да го отклучи вашиот телефон ако го држи до вашиот лик дури и ако очите ви се затворени.\n\nТелефонот може да ви го отклучи некој што многу личи на вас, на пример, идентичен близнак."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Да се избришат податоците за ликот?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Податоците за лицето што се користат за „Отклучување со лик“ ќе се избришат трајно и безбедно. По отстранувањето, ќе ви треба PIN, шема или лозинка за да го отклучувате телефонот, да се најавувате на апликациите и да ги потврдувате плаќањата."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Користете „Отклучување со лик“ за отклучување на телефонот"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Користете го отпечатокот за да го отклучувате телефонот или да ги одобрувате купувањата.\n\nЗабелешка: не може да го користите отпечатокот за да го отклучувате уредов. За повеќе информации, контактирајте со администраторот на вашата организација."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Користете го отпечатокот за да го отклучувате телефонот или да ги одобрувате купувањата.\n\nЗабелешка: отпечатокот може да биде помалку безбеден од силна шема или PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Откажи"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, фала"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Продолжи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Прескокни"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Следно"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Ако го заштитите таблетот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите „Отклучување со лик“. За да се вратите назад, допрете „Откажи“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Ако го заштитите уредот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите „Отклучување со лик“. За да се вратите назад, допрете „Откажи“."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Ако го заштитите телефонот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Исто така, опцијата за заклучување екран ви е потребна за да поставите „Отклучување со лик“. За да се вратите назад, допрете „Откажи“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Ако го заштитите таблетот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Опцијата за заклучување екран исто така ви е потребна за да поставите биометрика. За да се вратите назад, допрете „Откажи“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Ако го заштитите уредот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Опцијата за заклучување екран исто така ви е потребна за да поставите биометрика. За да се вратите назад, допрете „Откажи“."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Ако го заштитите телефонот со опција за заклучување екран, никој нема да може да го користи ако го загубите или ви го украдат. Опцијата за заклучување екран исто така ви е потребна за да поставите биометрика. За да се вратите назад, допрете „Откажи“."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Да се прескокне поставувањето PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Да се прескокне поставувањето лозинка?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Да се прескокне поставувањето шема?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Спречете ги другите да го користат телефонот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Спречете ги другите да го користат уредот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Спречете ги другите да го користат телефонот без ваша дозвола со активирање на функциите за заштита на уред. Изберете го заклучувањето екран што сакате да го користите."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Изберете резервен метод за заклучување на екранот"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Изберете резервен метод за заклучување на екранот"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Изберете резервен метод за заклучување на екранот"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Опции за заклучување на екранот"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Опции за заклучување на екранот"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Заклучување екран"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Отклучување со лик + лозинка"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Продолжете без „Отклучување со лик“"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Може да го отклучите телефонот со лицето. Од безбедносни причини, потребно резервно заклучување екран за оваа опција."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрика + шема"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрика + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрика + лозинка"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Продолжи без биометрика"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Може да го отклучите телефонот со биометрика. Од безбедносни причини, за оваа опција е потребно резервно заклучување на екранот."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Оневозм. од админ., шифрир. или складир. акредит."</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ниедна"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Повлечи"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">Мора да има помалку од <xliff:g id="NUMBER_1">%d</xliff:g> цифри</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Администраторот на уредот не дозволува користење на неодамнешен PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Обичните PIN-кодови се блокирани од вашиот IT-администратор. Обидете се со друг PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ова не може да вклучува неважечки знак"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Мора да содржи најмалку една буква"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Мора да содржи најмалку една цифра"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">Мора да содржи најмалку <xliff:g id="COUNT">%d</xliff:g> знаци што не се букви</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Администраторот на уредот не дозволува користење на неодамнешна лозинка"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Обичните лозинки се блокирани од вашиот IT-администратор. Обидете се со друга лозинка."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Не е дозволена нагорна, надолна или повторлива секвенца на цифри"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Потврди"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Откажи"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Вклучи Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Користи Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Користи Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Поставки за Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Постави и управувај со безжични пристапни точки"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Наместете го QR-кодот во средината на подолниот прозорец за да се поврзете со „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Скенирајте го QR-кодот за да се поврзете на Wi‑Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Споделете Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Скенирајте го овој QR-код за да се поврзете со „<xliff:g id="SSID">%1$s</xliff:g>“ и да ја споделите лозинката"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Скенирајте го овој QR-код со друг уред за да се придружите на „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Скенирајте го овој QR-код за да се поврзете со „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Обидете се повторно. Ако проблемот продолжи, контактирајте со производителот на уредот"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Нешто тргна наопаку"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Лозинка за Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Лозинка за точката на пристап: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Автоматско поврзување"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Дозволи телефонот автоматски да се поврзува во близина на мрежава"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Дозволи таблетот автоматски да се поврзува во близина на мрежава"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Дозволете поврзување на мрежава кога ќе биде во опсег"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Додајте уред"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Користете QR-код за да додадете уред на мрежава"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-кодот не е во важечки формат"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Користи системски сертификати"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Не обезбедувај"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Не потврдувај"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Нема назначено сертификат. Вашата врска нема да биде приватна."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Името на мрежата е премногу долго."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Мора да се наведе домен."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Потребен е сертификат."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Поврзи се"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi мрежата е вклучена"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Поврзано со <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Поврзување со <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Се поврзува…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Не успеа да се поврзе со мрежата"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Мрежата не е во опсег"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-адреса на уредот"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Рандомизирана MAC-адреса"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Рандомизирана MAC-адреса (последно користена)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-адреса"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Детали за мрежата"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Подмрежна маска"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-адреси"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Зачувани мрежи"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Претплати"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Други мрежи"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Поставки за IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Напредни поставки за Wi‑Fi не се достапни за корисников"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Зачувај"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Внеси важечка адреса на капија."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Внеси важечка адреса на DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Внесете мрежен префикс со должина од 0 до 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (освен ако не се отфрли од Приватен DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (освен ако не се отфрли од Приватен DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Портал"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Должина на мрежен префикс"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Апликацијата споделува содржини. За споделување на интернет-врската, исклучете ја, а потоа вклучете ја точката на пристап"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Не е поставена лозинка"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Име на точката на пристап"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Се вклучува <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Се вклучува <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Другите уреди може да се поврзат на <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Лозинка за точката на пристап"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Опсег на точката на пристап"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Течен приказ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Автоматски ја зголемува зачестеноста на освежување од 60 на 90 Hz за некои содржини. Го зголемува користењето на батеријата."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Течен приказ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Наметни стапка на освежување од 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Највисока стапка на освежување за подобрена реакција на допир и квалитет на анимацијата. Го зголемува користењето на батеријата."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Вклучен екран"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Вклучено/Екранот нема да се исклучи додека гледате во него"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Кога екранот е темен, се вклучува за нови известувања"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Секогаш прикажи време и инфо."</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Зголемено користење на батеријата"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Текст во болд"</string>
     <string name="title_font_size" msgid="570613010306330622">"Големина на фонт"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Намалете го или зголемете го текстот"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Поставки на заклучување на SIM картичка"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Верзија на Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Безбедносно ажурирање на Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Модел"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Модел: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Модел и хардвер"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Верзија на хардвер"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID на опрема"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Избриши APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Нов APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Зачувај"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Отфрли"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Откажи"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Полето за име не може да биде празно."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN не може да биде празна."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Апликациите може да се ресетираат"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Ресетирај Wi-Fi, мобилен интернет и Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Ова ќе ги ресетира сите мрежни поставки, вклучувајќи:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилен интернет"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Избриши"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Избриши преземени SIM-картички"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"За да преземете SIM-картички за замена, контактирајте со операторот. Со ова не се откажуваат пакети за мобилни услуги."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Ова нема да ги откаже пакетите за мобилни услуги. За да преземете SIM-картички за замена, контактирајте со операторот."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Ресетирај поставки"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Да се ресетираат сите мрежни поставки? Ова дејство не може да се врати."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Да се ресетираат сите мрежни поставки и да се избришат преземените SIM-картички? Ова дејство не може да се врати."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Мрежните поставки се ресетирани"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Не може да се избришат SIM-картичките"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Преземените SIM-картички не може да се избришат поради грешка.\n\nРестартирајте го уредот и обидете се повторно."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Избриши ги сите податоци (фабричко ресетирање)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Избриши ги сите податоци"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>"на таблетот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоците и поставките на системот и апликациите"</li>\n<li>"преземените апликации"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>" на телефонот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоците и поставките на системот и апликациите"</li>\n<li>"преземените апликации"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Моментално сте најавени на следниве сметки:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Присутни се и други корисници на уредот.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"музиката"</li>\n<li>"фотографиите"</li>\n<li>"другите кориснички податоци"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-картичките"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Со ова нема да се откаже вашиот пакет за мобилни услуги."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"меморијата"</b>" треба да се избрише."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"СД картичката"</b>" треба да се избрише."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Избриши ги сите податоци"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Избриши ги сите податоци"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>"на таблетот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоците и поставките на системот и апликациите"</li>\n<li>"преземените апликации"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Ова ќе ги избрише сите податоци од "<b>"внатрешната меморија"</b>" на телефонот, заедно со:\n\n"<li>"вашата сметка на Google"</li>\n<li>"податоците и поставките на системот и апликациите"</li>\n<li>"преземените апликации"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Моментално сте најавени на следниве сметки:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Присутни се и други корисници на уредот.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Музика"</li>\n<li>"Фотографии"</li>\n<li>"Други податоци за корисникот"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-картичките"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Со ова нема да се откаже вашиот пакет за мобилни услуги."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"меморијата"</b>" треба да се избрише."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"За да исчистите музика, слики и други податоци на корисникот, "<b>"СД картичката"</b>" треба да се избрише."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Избриши USB меморија"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Избриши СД картичка"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Избриши ги сите податоци во внатрешната USB меморија, како што се музика или фотографии"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Избриши ги сите податоци на СД картичката, како што се музика или фотографии"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Избриши ги сите податоци"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Избриши ги сите податоци"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Сите ваши лични информации и преземени апликации ќе се избришат. Ова дејство не може да се врати."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Ќе се избришат сите ваши лични информации, заедно со преземените апликации и SIM-картички. Ова дејство не може да се врати."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Избриши сè"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Не се изврши ресетирање зашто услугата за чистење на системот не е достапна."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Да се избришат сите податоци?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Фабричкото ресетирање не е достапно за овој корисник"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Се брише"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Почекајте..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Избриши ги сите податоци"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Избриши ги сите податоци"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Сите ваши лични информации и преземени апликации ќе се избришат. Ова дејство не може да се врати."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Ќе се избришат сите ваши лични информации, заедно со преземените апликации и SIM-картички. Ова дејство не може да се врати."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Да се избришат сите податоци?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Фабричкото ресетирање не е достапно за овој корисник"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Се брише"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Почекајте…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Поставки за повици"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Постави говорна пошта, проследување на повик, повик на чекање, ID на повикувач"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Интернет преку USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Не може да се поврзе со повеќе од <xliff:g id="MAXCONNECTION">%1$d</xliff:g> уреди."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ќе се исклучи."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Интернет преку етернет"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Споделете ја интернет-врската на телефонот преку USB-етернет"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Споделете ја интернет-врската на телефонот преку етернет"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Користете точка на пристап и врзување за да овозможите интернет за другите уреди преку вашата мобилна интернет-врска. И апликациите може да создадат точка на пристап за споделување содржини со уредите во близина."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Користете точка на пристап и врзување за да им обезбедите пристап до интернет на други уреди преку Wi‑Fi врската или врската за мобилен интернет. Апликациите исто така може да создаваат точки на пристап за да споделуваат содржини со уредите во близина."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Помош"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Скенирање на Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволете апликациите и услугите да скенираат уреди во близина во секое време, дури и кога Bluetooth е исклучен. Ова може да се користи, на пример, за да се подобрат функциите и услугите базирани на локација."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуги според локација за работа"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Откривање временска зона на локација"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Откривање временска зона на локација"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Овозможува да се користи локацијата на уредот за откривање на тековната временска зона. Другите поставки за локација како скенирање за Wi‑Fi може да влијаат врз прецизноста на откривањето на временската зона."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Вклучено"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Исклучено"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Автоматското откривање на временската зона е оневозможено"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Откривање временска зона на локација е оневозможено"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Откривањето временска зона на локација не е поддржано"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Промените на откривањето временска зона на локација не се дозволени"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi &amp;лок. на моб. мрежа"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"За брза процена, овозможи услуга за локација на Google. Анонимните податоци за локација се собираат и се испраќаат на Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Локацијата е утврдена со Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"За „Отклучување со лик“, постави лозинка"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"За „Отклучување со лик“, поставете шема"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"За „Отклучување со лик“, поставете PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Поставете лозинка"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Поставете шема"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Поставете PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Ја заборавивте лозинката?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Ја заборавивте шемата?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Го заборавивте PIN-кодот?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Поставки за титлови"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Зголемување"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Област на зголемување"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Овозможи зголемување"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Изберете ја областа на зголемување што сакате да ја користите кога се зголемува екранот"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Цел екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Дел од екранот"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Цел екран и дел од екран"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Зголеми цел екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Зголеми дел од екранот"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Сакате ли да префрлите на копче за пристапност?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ако зголемувате дел од екранот со троен допир, пишувањето и другите дејства може да доцнат.\n\nДали сакате да користите копче за пристапност за да зголемувате?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Префрли на копче за пристапност"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Продолжи со зголемување со троен допир"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Поставки за зголемување"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Зголеми со троен допир"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Зголемување со кратенка"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Прекини повик со копче за вклучување"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Голем покажувач на глувчето"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Отстранување анимации"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Моно аудио"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Комбинирај канали кога се пушта аудио"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс на аудио"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Лево"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Десно"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Моно аудио"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Комбинирај канали кога се пушта аудио"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс на аудио"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Лево"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Десно"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Стандардно"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунди"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунди"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вибрации при известување"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вибрации при ѕвонење"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Вибрации при допир"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Користете <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Отвори <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Користи корекција на бои"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Прикажувај титлови"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Само за поддржани апликации"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Користи <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Отворете ја апликацијата <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Користи корекција на боите"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Прикажувај титлови"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Само за поддржани апликации"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Големина и стил на титловите"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Големина на текст: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Повеќе опции"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Девтераномалија"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалија"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалија"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Сиви тонови"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Црвена и зелена"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Црвена и зелена"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Сина и жолта"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ограничување во заднината"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Дозволете апликацијата да работи во заднина"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"На апликациите не им е дозволено да се извршуваат во заднина"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Користењето во заднина не може да се ограничи"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Користењето во заднина не може да се ограничи"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Да се ограничи активноста во заднина?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Апликацијата може да се однесува необично ако ја ограничите нејзината активност во заднина"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Апликацијава не е оптимизирана и не може да се ограничи.\n\nЗа да ја ограничите, прво вклучете оптимизација на батеријата."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Таблетот се користи повеќе од вообичаено"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Уредот се користи повеќе од вообичаено"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Батеријата може да се потроши порано од вообичаено"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Се оптимизира за состојба на батеријата"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Батеријата е привремено ограничена. Допрете за да дознаете повеќе."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Телефонот сте го користеле повеќе од вообичаено. Батеријата може да се потроши порано од очекуваното.\n\nАпликации што најмногу ја користеле батеријата:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Таблетот сте го користеле повеќе од вообичаено. Батеријата може да се потроши порано од очекуваното.\n\nАпликации што најмногу ја користеле батеријата:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Уредот сте го користеле повеќе од вообичаено. Батеријата може да се потроши порано од очекуваното.\n\nАпликации што најмногу ја користеле батеријата:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">%1$d апликации се ограничени</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Проблем при читањето на мерачот на батеријата"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Проблем при читањето на мерачот на батеријата. Допрете и "<annotation id="url">"дознајте повеќе"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Да се исклучи апликацијата?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Телефонот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го држи телефонот активен.\n\nЗа да го решите проблемов, може да ја исклучите апликацијата.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Таблетот не може да управува со батеријата нормално затоа што <xliff:g id="APP">%1$s</xliff:g> го држи телефонот активен.\n\nЗа да го решите проблемов, може да ја исклучите апликацијата.\n\nАко проблемот постои и понатаму, можеби ќе треба да ја деинсталирате апликацијата за да се подобри изведбата на батеријата."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Поставете распоред"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Продолжете го траењето на батеријата"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Исклучи кога ќе се наполни"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"„Штедачот на батерија“ ќе се исклучи кога нивото на батеријата на телефонот ќе биде <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"„Штедачот на батерија“ ќе се исклучи кога нивото на батеријата на таблетот ќе биде на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"„Штедачот на батерија“ ќе се исклучи кога нивото на батеријата на уредот ќе биде на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"„Штедачот на батерија“ ќе се исклучи кога телефонот е наполнет над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"„Штедачот на батерија“ ќе се исклучи кога таблетот е наполнет над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"„Штедачот на батерија“ ќе се исклучи кога уредот е наполнет над <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Вклучи"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Ресетирај"</string>
     <string name="tts_play" msgid="2945513377250757221">"Пушти"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Паметно поврзување"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Го продолжува траењето на батеријата и ја подобрува изведбата на уредот со автоматско управување со вашите мрежни врски"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Складирање акредитиви"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Инсталирајте сертификат"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Инсталирај сертификати од меморија"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Кориснички акредитиви"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Прегледајте и изменете ги зачуваните акредитиви"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Напредни"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип меморија"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Хардверска"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтвер"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Акредитивите не се достапни за овој корисник"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталиран за VPN и апликации"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Инсталиран за Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Не инсталирај"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Сепак инсталирај"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Сертификатот не е инсталиран"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Да се дозволи <xliff:g id="APP_NAME">%s</xliff:g> да инсталира сертификати на уредов?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Овие сертификати ќе ве идентификуваат на апликациите и URL-адресите подолу"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Не дозволувај"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Дозволи"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Прикажи повеќе"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Управување со сертификати"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Нема"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Сертификатите инсталирани од апликацијава ве идентификуваат на апликациите и URL-адресите подолу"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Отстрани"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Сигнал за итно бирање"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Постави однесување кога се прави итен повик"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Бекап"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Не е поставен – Работен профил"</string>
     <string name="user_admin" msgid="4024553191395768119">"Администратор"</string>
     <string name="user_you" msgid="3070562015202859996">"Вие (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Прекар"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Може да додадете најмногу <xliff:g id="USER_COUNT">%1$d</xliff:g> корисници"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Само сопственикот на таблетот може да управува со корисниците."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Само сопственикот на телефонот може да управува со корисниците."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Плаќање на терминалот"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Поставете апликација за плаќање. Потоа само задржете ја задната страна на телефонот до кој било терминал означен со симболот за плаќање без контакт."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Сфатив"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Повеќе..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Повеќе…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Поставете стандардна апликација за плаќање"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ажурирајте ја стандардната апликација за плаќање"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Кај бесконтактен терминал, плаќајте со <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Следно"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Заврши"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Фотографирајте"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Изберете слика"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Избери фотографија"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-картички"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-картички"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Секогаш користи го ова за повици"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Изберете SIM за податоци"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Изберете SIM за SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Се префрла SIM-картичката за податоци, ова може да потрае до една минута..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Се префрла SIM-картичката за податоци, ова може да потрае до една минута…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Повикајте со"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Избери SIM-картичка"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"рутина, распоред, штедач на батерија, штедач на енергија, батерија, автоматски, процент"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, напредно повикување, повикување преку 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"додај јазик, додај некој јазик"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"големина на текст"</string>
     <string name="default_sound" msgid="6604374495015245195">"Стандарден звук"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Јачината на звук при ѕвонење и известувања е <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Јачина на звук, вибрации и „Не вознемирувај“"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Вклучете ги звуците"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Автоматски титлови"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Автоматски титлови за аудиовизуелни содржини"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Нема"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Поставен е <xliff:g id="ON_COUNT">%d</xliff:g> распоред</item>
-      <item quantity="other">Поставени се <xliff:g id="ON_COUNT">%d</xliff:g> распореди</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ниеден}=1{Поставен е 1 распоред}one{Поставен е # распоред}other{Поставени се # распореди}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не вознемирувај"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Добивајте известувања само од важни луѓе и апликации"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ограничете ги прекините"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Само приоритетно"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Вклучено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Исклучено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Исклучено"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Вклучено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Секогаш прашувај"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Додека не го исклучите"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> час</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> часа</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> минути"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> распоред може да се вклучи автоматски</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> распореди може да се вклучат автоматски</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 час}one{# час}other{# часа}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минута}one{# минута}other{# минути}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Исклучено}=1{Исклучено / 1 распоред може да се вклучи автоматски}one{Исклучено / # распоред може да се вклучи автоматски}other{Исклучено / # распореди може да се вклучат автоматски}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Што може да го прекинува „Не вознемирувај“"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Луѓе"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Апликации"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Автоматски поставувај ги известувањата со понизок приоритет на „Тивко“"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Приспособливо рангирање известувања"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматски рангирај ги известувањата според важност"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Повратни информации за приспособливи известувања"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Означувај ги приспособувањата извршени на известувањата и прикажувај ја опцијата за обезбедување повратни информации на системот"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Ресетирајте ја важноста на известувањата"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Ресетирајте ги поставките за важност променети од корисникот и дозволете помошникот за известувања да одредува приоритети"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Предложени дејства и одговори"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматски прикажувај предложени дејства и одговори"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Прикажувај неодамнешни и одложени известувања"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Приоритетни разговори"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Се прикажуваат како лебдечки балончиња најгоре во делот со разговори"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Прикажи најгоре во делот со разговори"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Други разговори"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Неприоритетни разговори"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Разговори за кои сте извршиле промени"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Скорешни разговори"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Избриши скорешни"</string>
+    <string name="clear" msgid="5092178335409471100">"Избриши"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Стави ги приоритетните разговори во балонче"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Приоритетните разговори се прикажуваат на горниот дел од списокот со известувања. Може да ги поставите и во балонче и да ја прекинуваат „Не вознемирувај“."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Приоритетните и изменетите разговори ќе се појавуваат тука"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Пристап до „Не вознемирувај“"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Дозволи „Не вознемирувај“"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ниту една од инсталираните апликации не побарала пристап до „Не вознемирувај“"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Вчитување апликации…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Се вчитуваат апликации…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"На ваше барање, Android го блокира појавувањето на известувањата за апликацијава на уредов"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"На ваше барање, Android го блокира појавувањето на оваа категорија известувања на уредов"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"На ваше барање, Android го блокира појавувањето на оваа група известувања на уредов"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Сите разговори"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Приоритетни разговори"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Нема"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговор</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговори</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ниеден"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ниеден}=1{1 разговор}one{# разговор}other{# разговори}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Кој може да го прекинува"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Повици"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Повици"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"За да проверите дали дозволените повици пуштаат звук, видете дали уредот е поставен да ѕвони"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"За „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“, дојдовните повици се блокирани. Може да ги приспособите поставките за да им дозволите на пријателите, семејството или другите контакти да ве добијат."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Контакти означени со ѕвезда"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> друг</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> други</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Нема"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ниеден}=1{{contact_1}}=2{{contact_1} и {contact_2}}=3{{contact_1}, {contact_2} и {contact_3}}one{{contact_1}, {contact_2} и уште #}other{{contact_1}, {contact_2} и уште #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Без име)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Пораки"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"пораки"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Пораки"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"За „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“, дојдовните пораки се блокирани. Може да ги приспособите поставките за да им дозволите на пријателите, семејството или другите контакти да ве добијат."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Сите пораки може да стигнат до вас"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Сите повици може да стигнат до вас"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ниеден"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакт</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакти</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ниеден}=1{1 контакт}one{# контакт}other{# контакти}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Секој"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти означени со ѕвезда"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Сите известувања"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Некои известувања"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Избраните луѓе ќе може да стапат во контакт со вас, дури и ако не дозволувате апликациите да ве прекинуваат"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> може да го прекинуваат</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> може да го прекинуваат</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"уште <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ниедна апликација не може да го прекинува}=1{{app_1} може да го прекинува}=2{{app_1} и {app_2} може да го прекинуваат}=3{{app_1}, {app_2} и {app_3} може да го прекинуваат}one{{app_1}, {app_2} и уште # може да го прекинуваат}other{{app_1}, {app_2} и уште # може да го прекинуваат}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Апликации"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Сите известувања"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Некои известувања"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Известувања што може да прекинуваат"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Дозволи ги сите известувања"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> може да го прекинуваат</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> може да го прекинуваат</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ништо не може да го прекинува"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"уште <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ништо не може да го прекинува}=1{{sound_category_1} може да го прекинува}=2{{sound_category_1} и {sound_category_2} може да го прекинуваат}=3{{sound_category_1}, {sound_category_2} и{sound_category_3} може да го прекинуваат}one{{sound_category_1}, {sound_category_2} и уште # може да го прекинуваат}other{{sound_category_1}, {sound_category_2} и уште # може да го прекинуваат}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ништо не може да го прекинува"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Никој не може да го прекинува"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Некои луѓе може да го прекинуваат"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Сите луѓе може да го прекинуваат"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Вклучено"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Исклучено"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Прикачување апликации"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Прикачувањето апликации ви овозможува да ја гледате тековната апликација додека не ја откачите. Функцијава може да се користи, на пример, да се дозволи на доверлив пријател да игра конкретна игра. \n\nКога ќе се прикачи апликација, таа може да отвора други апликации и може да се овозможи пристап до личните податоци. \n\nЗа да користите прикачување апликации: 	\n1.	Вклучете прикачување апликации 	\n2.	Отворете „Преглед“ 	\n3.	Допрете ја иконата на апликацијата на врвот од екранот, а потоа допрете „Закачи“"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Прикачувањето апликации ви овозможува да ја гледате тековната апликација додека не ја откачите. Меѓу другото, со функцијава може да му се дозволи на доверлив пријател да игра конкретна игра. \n\nКога ќе се прикачи апликација, таа може да отвора други апликации и може да се овозможи пристап до личните податоци. \n\nАко сакате безбедно да го споделувате уредот со некого, споделете го со корисник-гостин. \n\nЗа да користите прикачување апликации: 	\n1.	Вклучете прикачување апликации 	\n2.	Отворете „Преглед“ 	\n3.	Допрете ја иконата на апликацијата на врвот од екранот, а потоа допрете „Закачи“"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Прикачувањето апликации ви овозможува да ја гледате тековната апликација додека не ја откачите. Меѓу другото, со функцијава може да му се дозволи на доверлив пријател да игра конкретна игра."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Кога ќе се прикачи апликација, таа може да отвора други апликации и може да се овозможи пристап до личните податоци. \n\nЗа да користите прикачување апликации: 	\n1.	Вклучете прикачување апликации 	\n2.	Отворете „Преглед“ 	\n3.	Допрете ја иконата на апликацијата на врвот од екранот, а потоа допрете „Закачи“"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Кога ќе се прикачи апликација, таа може да отвора други апликации и може да се овозможи пристап до личните податоци. \n\nАко сакате безбедно да го споделувате уредот со некого, споделете го со корисник-гостин. \n\nЗа да користите прикачување апликации: 	\n1.	Вклучете прикачување апликации 	\n2.	Отворете „Преглед“ 	\n3.	Допрете ја иконата на апликацијата на врвот од екранот, а потоа допрете „Закачи“"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Кога ќе се прикачи апликација: \n\n•	 Можно е да има пристап до личните податоци \n		(како контакти и содржини на е-пораки) \n•	 Прикачената апликација може да отвора други апликации \n\nКористете прикачување апликации само со луѓе во кои имате доверба."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Побарај шема за откл. пред откачување"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Побарај PIN пред откачување"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Покрај користењето на лицето за отклучување на уредот, може дополнително да го заштитите со барање PIN пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Покрај користењето на лицето за отклучување на уредот, може дополнително да го заштитите со барање шема пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Покрај користењето на лицето за отклучување на уредот, може дополнително да го заштитите со барање лозинка пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Покрај користењето биометрика за отклучување на уредот, може дополнително да го заштитите со барање PIN пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки, известувања, ниту аларми.\n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Покрај користењето биометрика за отклучување на уредот, може дополнително да го заштитите со барање шема пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки, известувања, ниту аларми.\n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Покрај користењето биометрика за отклучување на уредот, може дополнително да го заштитите со барање лозинка пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки, известувања, ниту аларми.\n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Да"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Не"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ограничено"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB контролирано од"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Поврзан уред"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Овој уред"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Префрлање…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Префрлање…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Не може да се префрли"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Полнење на уредот"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Се полни поврзаниот уред"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Потрошен мобилен интернет"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Потрошен сообраќај на апликациите"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Сообраќај преку Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Потрошен сообраќај што не е од операторот"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Потрошен етернет сообраќај"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Етернет"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничувања</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Пресметаниот сообраќај на операторот може да се разликува од пресметаниот сообраќај на вашиот уред"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Го исклучува сообраќајот што се користи во мрежите на операторот"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Потрошено <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Извести за потрошен интернет"</string>
     <string name="data_warning" msgid="2925054658166062884">"Предупредување за интернет"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Прикажи ги деталите"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Штедач на интернет"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Неограничен мобилен интернет"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Исклучен сообраќај во заднина"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Интернетот во заднина е исклучен"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Вклучено"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Исклучено"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Користи „Штедач на интернет“"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ако уредот е заклучен, спречете внесување одговори или друг текст во известувања"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Стандард. проверка на правопис"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Избери проверка на правопис"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Користење проверка на правопис"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Користи проверка на правопис"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Не е избран"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(нема)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"За помош при ослободувањето простор за меморијата, управникот со меморијата ги отстранува резервните копии од фотографиите и видеата од уредот."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Отстранете фотографии и видеа"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Управник со меморија"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Користи го управникот со меморија"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Користи го управувачот со простор"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автоматски"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Рачни"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Ослободете простор сега"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Допрете двапати за проверка на телефонот"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Допрете двапати за проверка на таблетот"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Допрете двапати за проверка на уредот"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Повлечете за известувања"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Повлечете надолу на долниот раб на екранот за да ги видите известувањата"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Режим со една рака"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Користи режи со една рака"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Излези при префрлување меѓу апликации"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Време на истекување"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунди"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунди"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунди"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"дофатливост"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"За да ги проверите времето, известувањата и другите информации, допрете двапати на екранот."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Подигни за проверка на телефонот"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Подигнете за да го проверите таблетот"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Допрете за да го проверите таблетот"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Допрете за да го проверите уредот"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"За да ги проверите времето, известувањата и другите информации, допрете го екранот."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS за итни случаи"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Користење SOS за итни случаи"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Управувано од <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Започнете ги дејствата подолу со брзо притискање на копчето за вклучување 5 или повеќе пати"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Пушти аларм за одбројување"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Пушти гласен звук пред повикување помош"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Повикајте помош"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Број за повикување помош"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Допрете за да промените"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Ако внесете број што не е за итни случаи:\n • уредот мора да се отклучи за да користите SOS за итни случаи\n • можеби нема да се воспостави повикот"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Повлечете отпечаток за известувања"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Повлечете отпечаток"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"За да ги проверите известувањата, повлечете надолу на сензорот за отпечатоци на задната страна на телефонот."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Максимум видливи збирови на податоци"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Ресетирај на стандардните вредности"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Опциите за програмери за автоматско пополнување се ресетирани"</string>
+    <string name="location_category" msgid="3496759112306219062">"Локација"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Индикатор за локација на статусната лента"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Прикажи за сите локации, вклучително и за мрежата и поврзливоста"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Присилување целосни мерења со GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Следете ги сите констелации и фреквенции со GNSS без работен циклус"</string>
     <string name="device_theme" msgid="5027604586494772471">"Тема на уредот"</string>
     <string name="default_theme" msgid="4815428567082263639">"Стандардно"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Име на мрежата"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Паузирајте ги известувањата за да останете фокусирани"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Функцијата не е достапна"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Функцијава е исклучена бидејќи го успорува телефонот"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Присилување целосни мерења со GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Следете ги сите констелации и фреквенции со GNSS без работен циклус"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Секогаш прикажувај дијалог на пад"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Прикажи дијалог при секој пад на апликација"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Избери апликација овозможена за ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Овозможи за сите апликации"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Изберете драјвер за графика"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Стандарден"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Драјвер за игри"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Драјвер за игри"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драјвер за програмери"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системски драјвер за графика"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Вклучено (исклучен звук)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Исклучено"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Детали за мрежата"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Името на уредот е видливо за апликациите на телефонот. Може да го видат и други луѓе кога ќе се поврзете со уреди со Bluetooth или кога ќе поставите Wi-Fi точка на пристап."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Името на уредот е видливо за апликациите на телефонот. Може да го видат и други луѓе кога ќе се поврзете со уреди со Bluetooth, ќе се поврзете на Wi-Fi мрежа или кога ќе поставите Wi-Fi точка на пристап."</string>
     <string name="devices_title" msgid="649715719278562515">"Уреди"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Сите поставки"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Предлози"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Не најдовме мрежи. Обидете се повторно."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(забранета)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Нема SIM-картичка"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Нема SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Нема"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Потребна е SIM за поврзување"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Потребна е SIM од <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> за поврзување"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Претпочитан режим на мрежа: претпочитан е WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Претпочитан режим на мрежа: само GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Претпочитан режим на мрежа: само WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилен интернет"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Пристап на интернет преку мобилната мрежа"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефонот автоматски ќе се префли на овој оператор кога ќе биде во опсег"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Нема SIM-картичка"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Претпочитана претплата за повици"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Претпочитана претплата за SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Секогаш прашувај"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недостапно кога сте поврзани на <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Видете повеќе"</string>
     <string name="see_less" msgid="2642392725363552793">"Види помалку"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Да се вклучи <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Да се вклучи SIM-картичката?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Дали сакате да се префрлите на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Дали сакате да се префрлите на SIM-картичката?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Само една SIM-картичка може да биде активна.\n\nАко се префрлите на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, нема да се откаже услугата на <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Само една од преземените SIM-картички може да биде активна.\n\nАко се префрлите на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, нема да се откаже услугата на <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Само една SIM-картичка може да биде активна.\n\nАко се префрлите, нема да се откаже услугата на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Префрли на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Се поврзува со мрежа…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Се префрла на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Не може да се промени операторот"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Операторот не може да се промени поради грешка."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Да се исклучи <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Да се исклучи SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Се исклучува SIM-картичката<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Не може да се оневозможи операторот"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Нешто тргна наопаку и не може да се оневозможи операторот."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Да се користат 2 SIM-картички?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Уредов може да има 2 активни SIM-картички истовремено. За да продолжите да користите само 1 SIM-картичка, допрете „Не, фала“."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Да се рестартира уредот?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"За да започнете, рестартирајте го уредот. Потоа може да додадете друга SIM-картичка."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Продолжи"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Рестартирај"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, фала"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Префрли"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не може да се активира SIM-картичката"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Извадете и повторно вметнете ја SIM-картичката. Ако и понатаму се соочувате со проблемот, рестартирајте го уредот."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Обидете се повторно да ја вклучите SIM-картичката. Ако и понатаму се соочувате со проблемот, рестартирајте го уредот."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активирање на мрежата"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> е активен"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Допрете за да ги ажурирате поставките на SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-картичка"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Да се избрише преземената SIM-картичка?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Ако ја избришете SIM-картичкава, услугата на <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ќе се отстрани од уредов.\n\nУслугата за <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> нема да се откаже."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Избриши"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Се брише SIM-картичката…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Не може да се избрише SIM-картичката"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Оваа SIM-картичка не може да се избрише поради грешка.\n\nРестартирајте го уредот и обидете се повторно."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Поврзување со уредот"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Апликацијата <xliff:g id="APPNAME">%1$s</xliff:g> сака да користи привремена Wi‑Fi мрежа за да се поврзе со уредот"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Не се најдени уреди. Уверете се дека уредите се вклучени и достапни за поврзување."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Итни повици"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Вашиот оператор не поддржува итни повици преку услугата „Повици преку Wi-Fi“.\nУредот се префрла автоматски на мобилна мрежа за да се оствари итен повик.\nИтните повици се можни само во области покриени со мобилна мрежа."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Користете Wi-Fi за повици за да го подобрите квалитетот"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Повици преку повеќе SIM-картички"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Дозволи SMS и повици од друга SIM пред оваа SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"повици преку повеќе SIM-картички"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Дојдовна MMS-порака"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Не може да се испрати MMS-порака"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Допрете за да дозволите размена на MMS-пораки на <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> кога е исклучен мобилниот интернет"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дозволи преклопување на екраните на Поставки"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дозволи апликации што може да прикажуваат врз други апликации да ги преклопуваат екраните на Поставки"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Аудиовизуелни содржини"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Сокриј го плеерот кога сесијата ќе заврши"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Плеерот ви овозможува да ја продолжите сесијата од проширената табла „Брзи поставки“."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Плеер во „Брзи поставки“"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Прикажувај го плеерот подолг период за полесно продолжување на репродукцијата"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Сокриј го плеерот"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Прикажи го плеерот"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Нема достапни плеери"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Дозволени апликации"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"аудиовизуелни содржини"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ќе се вклучи"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Вклучен"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Исклучен"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-картички"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Мрежи безбедни за во авион"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Најдете и поврзете се на мрежи безбедни за во авион"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"авион, безбедно за во авион"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Повици &amp; SMS-пораки"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Повици преку Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Упатувајте и примајте повици преку мрежи што не се на операторот, на пр., Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Функцијата „Повици преку Wi-Fi“ ви овозможува да упатувате и примате повици преку мрежи што не се на операторот, на пр., некои Wi‑Fi мрежи."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Повици"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"претпочитано"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"претпочитани се повици"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"претпочитана е SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"недостапно"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нема SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Поставки"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Поврзувајте се на јавни мрежи"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"мрежна врска, интернет, безжичен, мобилен, Wi-Fi, мобилна, мобилен оператор, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Прикажи мрежи безбедни за во авион"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Исклучете го авионскиот режим"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Недостапно бидејќи е вклучен „Режимот за спиење“"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Ресетирањето на важноста на известувањата е завршено."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Апликации"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Недоверлив уред сака да пристапи до вашите пораки. Допрете за детали."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Да се дозволи пристап до пораките?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Недоверлив уред со Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], сака да пристапи до вашите пораки.\n\nДосега не сте се поврзале со [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Недоверлив уред сака да пристапи до вашите контакти и евиденцијата на повици. Допрете за детали."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Да се дозволи пристап до контактите и евиденцијата на повици?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Недоверлив уред со Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], сака да пристапи до вашите контакти и евиденцијата на повици. Ова ги опфаќа податоците за дојдовните и појдовните повици.\n\nДосега не сте се поврзале со [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 2edb09e..144fc67 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ഇടത്തരം"</item>
     <item msgid="6740026006576843477">"ദൈർഘ്യമുള്ളത്"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"കുറഞ്ഞത്"</item>
+    <item msgid="7397961711906421599">"ഇടത്തരം"</item>
+    <item msgid="4079132024502041928">"കൂടിയത്"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"സ്ഥിരമായത്"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ആഗോളം"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA മാത്രം"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ആഗോളം"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 9e15693..78d8f7a 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"തീയതിയും സമയവും"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"തീയതിയും സമയവും സജ്ജീകരിക്കുക"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"തീയതി, സമയം, സമയ മേഖല, ഫോർമാറ്റുകൾ എന്നിവ സജ്ജീകരിക്കുക"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"നെറ്റ്‌വർക്ക് സമയം ഉപയോഗിക്കൂ"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"നെറ്റ്‌വർക്ക് നൽകുന്ന സമയ മേഖല ഉപയോഗിക്കുക"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"സമയം സ്വയമേവ സജ്ജീകരിക്കുക"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"സമയമേഖല സ്വയമേവ സജ്ജീകരിക്കുക"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ഡിഫോൾട്ട് ഭാഷ ഉപയോഗിക്കുക"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 മണിക്കൂർ ഫോർമാറ്റ്"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-മണി. ഫോർമാറ്റ് ഉപയോഗിക്കൂ"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"ലോക്ക് സ്‌ക്രീനിൽ പ്രൊഫൈൽ വിവരം ദൃശ്യമാക്കുക"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"അക്കൗണ്ടുകൾ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ലൊക്കേഷൻ"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ലൊക്കേഷൻ ഉപയോഗിക്കുക"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ലൊക്കേഷൻ ഉപയോഗിക്കുക"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ഓഫാക്കുക"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ഓണാണ് - <xliff:g id="COUNT_1">%1$d</xliff:g> ആപ്പുകൾക്ക് ലൊക്കേഷനിലേക്ക് ആക്‌സ‌സ് ഉണ്ട്</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"സ്ക്രീൻ ലോക്ക്, മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"സ്‌ക്രീൻ ലോക്കും ഫിംഗർപ്രിന്റും"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"സ്ക്രീൻ ലോക്ക്"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"മുഖവും ഫിംഗർപ്രിന്റും ഉപയോഗിച്ച് സുരക്ഷിതമായി അൺലോക്ക് ചെയ്യൂ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"ആപ്പുകളിൽ സൈൻ ഇൻ ചെയ്യാനും പേയ്മെന്റുകൾ സ്ഥിരീകരിക്കാനുമാകും"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ഇതുപയോഗിച്ച് അൺലോക്ക് ചെയ്യുക:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ഫോൺ അൺലോക്ക് ചെയ്യുന്നത് എളുപ്പമാക്കൂ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ഫിംഗർപ്രിന്റ്"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"പോക്കറ്റിൽ ഫോൺ അൺലോക്ക് ചെയ്ത് സമയം ലാഭിക്കൂ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ഒഴിവാക്കുക"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"അടുത്തത്"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"മുഖം ചേർത്തു"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് സജ്ജീകരിക്കുക"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"പരിശോധിച്ചുറപ്പിക്കാൻ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കൂ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ആരംഭിക്കുക"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗസഹായി ഓഫാക്കുകയാണെങ്കിൽ, ചില സജ്ജീകരണ ഘട്ടങ്ങൾ TalkBack-ന് ഒപ്പം ശരിയായി പ്രവർത്തിച്ചേക്കില്ല."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"മടങ്ങുക"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"സജ്ജമാക്കൽ തുടരുക"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ഉപയോഗസഹായി സജ്ജീകരണം ഉപയോഗിക്കുക"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ആപ്പുകളിൽ മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗിക്കുമ്പോൾ എല്ലായ്‌പ്പോഴും സ്ഥിരീകരണ ഘട്ടം ആവശ്യമാണ്"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"മുഖ ഡാറ്റ ഇല്ലാതാക്കൂ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് സജ്ജീകരിക്കുക"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"നിങ്ങളുടെ ഉപകരണം അൺലോക്ക് ചെയ്യാനും ആപ്പുകളിൽ സൈൻ ഇൻ ചെയ്യാനും പേയ്മെന്റുകൾ സ്ഥിരീകരിക്കാനും മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗിക്കുക.\n\nഓർക്കുക:\n വെറുതെ ഫോണിലേക്ക് നോക്കിയാൽ, നിങ്ങൾ ഉദ്ദേശിക്കാത്തപ്പോഴും അത് അൺലോക്കാകും.\n\nഫോൺ നിങ്ങളുടെ മുഖത്തിനു നേരെ നീട്ടി ആർക്കും അത് അൺലോക്ക് ചെയ്യാം.\n\nനിങ്ങളുമായി വളരെയധികം സാമ്യതയുള്ള ആർക്കും ഫോൺ അൺലോക്ക് ചെയ്യാനാവും, ഉദാഹരണത്തിന് നിങ്ങളുമായി സാദൃശ്യമുള്ള സഹോദരങ്ങൾ."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"നിങ്ങളുടെ ഉപകരണം അൺലോക്ക് ചെയ്യാനും ആപ്പുകളിൽ സൈൻ ഇൻ ചെയ്യാനും പേയ്മെന്റുകൾ സ്ഥിരീകരിക്കാനും മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗിക്കുക.\n\nഓർക്കുക:\n വെറുതെ ഫോണിലേക്ക് നോക്കിയാൽ, നിങ്ങൾ ഉദ്ദേശിക്കാത്തപ്പോഴും അത് അൺലോക്കാകും.\n\nകണ്ണുകൾ അടച്ചിരിക്കുമ്പോൾ പോലും മറ്റാർക്കെങ്കിലും ഫോൺ നിങ്ങളുടെ മുഖത്തിനു നേരെ നീട്ടി അൺലോക്ക് ചെയ്യാം.\n\nനിങ്ങളുമായി സാദൃശ്യമുള്ള സഹോദരങ്ങളെ പോലെ, നിങ്ങളുമായി വളരെയധികം സാമ്യതയുള്ള ആർക്കും ഫോൺ അൺലോക്ക് ചെയ്യാനാവും."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗിച്ച് നിങ്ങളുടെ ഉപകരണം അൺലോക്ക് ചെയ്യുക, ആപ്പുകളിലേക്ക് സൈൻ ചെയ്‌ത് പേയ്മെന്റുകൾ സ്ഥിരീകരിക്കുക."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"ഓർമ്മിക്കുക:\nവെറുതെ ഫോണിലേക്ക് നോക്കിയാൽ നിങ്ങൾ ഉദ്ദേശിക്കാത്തപ്പോഴും അത് അൺലോക്കാകും.\n\nമറ്റൊരാൾക്കും ഫോൺ നിങ്ങളുടെ മുഖത്തിന് നേരെ നീട്ടി അൺലോക്ക് ചെയ്യാം.\n\n ഒരേ മുഖച്ഛായയുള്ള സഹോദരങ്ങളെ പോലെ, നിങ്ങളുമായി വളരെയധികം സാമ്യമുള്ള ആർക്കും ഫോൺ അൺലോക്ക് ചെയ്യാനായേക്കാം."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"ഓർമ്മിക്കുക:\nവെറുതെ ഫോണിലേക്ക് നോക്കിയാൽ നിങ്ങൾ ഉദ്ദേശിക്കാത്തപ്പോഴും അത് അൺലോക്കാകും.\n\nകണ്ണുകൾ അടച്ചിരിക്കുമ്പോൾ പോലും മറ്റാർക്കെങ്കിലും ഫോൺ നിങ്ങളുടെ മുഖത്തിന് നേരെ നീട്ടി അൺലോക്ക് ചെയ്യാം.\n\nഒരേ മുഖച്ഛായയുള്ള സഹോദരങ്ങളെ പോലെ, നിങ്ങളുമായി വളരെയധികം സാമ്യമുള്ള ആർക്കും ഫോൺ അൺലോക്ക് ചെയ്യാനാകും."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"മുഖ ഡാറ്റ ഇല്ലാതാക്കണോ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"\'മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക്\' ഉപയോഗിക്കുന്ന മുഖ ഡാറ്റ ശാശ്വതമായും സുരക്ഷിതമായും ഇല്ലാതാക്കും. നീക്കം ചെയ്‌തതിനു ശേഷം, ഫോൺ അൺലോക്ക് ചെയ്യാനും ആപ്പുകളിലേക്ക് സൈൻ ഇൻ ചെയ്യാനും പേയ്മെന്റുകൾ സ്ഥിരീകരിക്കാനും നിങ്ങളുടെ പിൻ, പാറ്റേൺ, അല്ലെങ്കിൽ പാസ്‍വേഡ് ആവശ്യമാണ്."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്യാൻ മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഉപയോഗിക്കുക"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"നിങ്ങളുടെ ഫോൺ അൺലോക്കുചെയ്യുന്നതിനോ വാങ്ങലിന് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കുക.\n\nശ്രദ്ധിക്കുക: ഈ ഉപകരണം അൺലോക്കുചെയ്യുന്നതിന് നിങ്ങളുടെ ഫിംഗർപ്രിന്റ് ഉപയോഗിക്കാൻ കഴിയില്ല. കൂടുതൽ വിവരങ്ങൾക്ക്, നിങ്ങളുടെ സ്ഥാപനത്തിന്റെ അഡ്‌മിനെ ബന്ധപ്പെടുക."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"നിങ്ങളുടെ ഫോൺ അൺലോക്ക് ചെയ്യുന്നതിനോ വാങ്ങലിന് അംഗീകാരം നൽകാനോ നിങ്ങളുടെ ഫിംഗർപ്രിന്‍റ് ഉപയോഗിക്കുക.\n\nശ്രദ്ധിക്കുക: ശക്തമായ പാറ്റേൺ, പിൻ എന്നിവയേക്കാൾ ഫിംഗർപ്രിന്‍റിന് സുരക്ഷ കുറവായിരിക്കും."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"റദ്ദാക്കുക"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"വേണ്ട"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"തുടരൂ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ഒഴിവാക്കുക"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"അടുത്തത്"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് പരിരക്ഷിച്ചാൽ അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. തിരികെ മടങ്ങാൻ, റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"നിങ്ങളുടെ ഉപകരണം സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് പരിരക്ഷിച്ചാൽ, അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. തിരികെ മടങ്ങാൻ, റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"നിങ്ങളുടെ ഫോൺ സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് പരിരക്ഷിച്ചാൽ അത് നഷ്‌ടപ്പെട്ടാലോ മോഷ്‌ടിക്കപ്പെട്ടാലോ മറ്റാർക്കും ഉപയോഗിക്കാനാവില്ല. മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് സജ്ജീകരിക്കാൻ നിങ്ങൾക്ക് സ്‌ക്രീൻ ലോക്ക് ഓപ്‌ഷനും ആവശ്യമാണ്. തിരികെ മടങ്ങാൻ, റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"സ്ക്രീൻ ലോക്ക് ഓപ്ഷൻ ഉപയോഗിച്ച് നിങ്ങളുടെ ടാബ്‌ലെറ്റ് പരിരക്ഷിക്കുന്നതിലൂടെ, അത് നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌താൽ മറ്റാർക്കും ഉപയോഗിക്കാനാകില്ല. ബയോമെട്രിക്‌സ് സജ്ജീകരിക്കാൻ ഒരു സ്ക്രീൻ ലോക്ക് ഓപ്ഷനും ആവശ്യമാണ്. മടങ്ങാൻ റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"സ്ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് നിങ്ങളുടെ ഉപകരണം പരിരക്ഷിക്കുന്നതിലൂടെ, അത് നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌താൽ മറ്റാർക്കും ഉപയോഗിക്കാനാകില്ല. ബയോമെട്രിക്‌സ് സജ്ജീകരിക്കാൻ ഒരു സ്ക്രീൻ ലോക്ക് ഓപ്ഷനും ആവശ്യമാണ്. മടങ്ങാൻ റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"സ്ക്രീൻ ലോക്ക് ഓപ്‌ഷൻ ഉപയോഗിച്ച് നിങ്ങളുടെ ഫോൺ പരിരക്ഷിക്കുന്നതിലൂടെ, അത് നഷ്‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌താൽ മറ്റാർക്കും ഉപയോഗിക്കാനാകില്ല. ബയോമെട്രിക്‌സ് സജ്ജീകരിക്കാൻ ഒരു സ്ക്രീൻ ലോക്ക് ഓപ്ഷനും ആവശ്യമാണ്. മടങ്ങാൻ റദ്ദാക്കുക ടാപ്പ് ചെയ്യുക."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"പിൻ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"പാസ്‌വേഡ് സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"പാറ്റേൺ സജ്ജീകരണം ഒഴിവാക്കണോ?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ടാബ്‌ലെറ്റ് ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഉപകരണം ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ഉപകരണ പരിരക്ഷാ ഫീച്ചറുകൾ സജീവമാക്കുന്നതിലൂടെ നിങ്ങളുടെ അനുമതിയില്ലാതെ മറ്റുള്ളവർ ഈ ഫോൺ ഉപയോഗിക്കുന്നത് തടയുക. നിങ്ങൾ ഉപയോഗിക്കാൻ ആഗ്രഹിക്കുന്ന സ്ക്രീൻ ലോക്ക് തിരഞ്ഞെടുക്കുക."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"നിങ്ങളുടെ ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് രീതി തിരഞ്ഞെടുക്കുക"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"നിങ്ങളുടെ ബാക്കപ്പ് സ്‌ക്രീൻ ലോക്ക് രീതി തിരഞ്ഞെടുക്കുക"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"നിങ്ങളുടെ ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് രീതി തിരഞ്ഞെടുക്കുക"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"സ്‌ക്രീൻ ലോക്ക് ഓപ്ഷനുകള്‍"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"സ്‌ക്രീൻ ലോക്ക് ഓപ്ഷനുകള്‍"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"സ്ക്രീൻ ലോക്ക്"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് + പാസ്‌വേഡ്"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്ക് ഇല്ലാതെ തുടരുക"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"നിങ്ങളുടെ മുഖം ഉപയോഗിച്ച് ഫോൺ അൺലോക്ക് ചെയ്യാനാവും. സുരക്ഷയ്ക്കായി, ഈ ഓപ്‌ഷന് ഒരു ബാക്കപ്പ് സ്‌ക്രീൻ ലോക്ക് ആവശ്യമാണ്."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ബയോമെട്രിക്‌സ് + പാറ്റേൺ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ബയോമെട്രിക്‌സ് + പിൻ"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ബയോമെട്രിക്‌സ് + പാസ്‌വേഡ്"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ബയോമെട്രിക്‌സ് ചേർക്കാതെ തുടരുക"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"നിങ്ങളുടെ ബയോമെട്രിക്‌സ് ഉപയോഗിച്ച് ഫോൺ അൺലോക്ക് ചെയ്യാനാകും. സുരക്ഷയ്ക്കായി, ഈ ഓപ്‌ഷന് ഒരു ബാക്കപ്പ് സ്ക്രീൻ ലോക്ക് ആവശ്യമാണ്."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"അഡ്‌മിനോ എൻക്രിപ്‌ഷൻ നയമോ ക്രെഡൻഷ്യൽ സ്റ്റോറേജോ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ഒന്നുമില്ല"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"സ്വൈപ്പ് ചെയ്യുക"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> അക്കത്തിനേക്കാൾ കുറവായിരിക്കണം</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ഉപകരണ അഡ്‌മിൻ സമീപകാലത്തുള്ള പിൻ ഉപയോഗിക്കുന്നത് അനുവദിക്കുന്നില്ല"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"നിങ്ങളുടെ ഐടി അഡ്‌മിൻ സാധാരണ പിന്നുകൾ ബ്ലോക്ക് ചെയ്‌തിട്ടുണ്ട്. മറ്റൊരു പിൻ പരീക്ഷിക്കുക."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ഇതിൽ അസാധുവായൊരു പ്രതീകം ഉണ്ടായിരിക്കാൻ പാടില്ല"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"കുറഞ്ഞത് ഒരു അക്ഷരമെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"കുറഞ്ഞത് ഒരു അക്കമെങ്കിലും അടങ്ങിയിരിക്കണം"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">കുറഞ്ഞത് സംഖ്യയല്ലാത്ത ഒരു പ്രതീകമെങ്കിലും അടങ്ങിയിരിക്കണം</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ഒരു സമീപകാല പാസ്‌വേഡ് ഉപയോഗിക്കാൻ ഉപകരണ അഡ്‌മിൻ അനുവദിക്കുന്നില്ല"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"നിങ്ങളുടെ IT അഡ്‌മിൻ സാധാരണ പാസ്‍വേഡുകൾ ബ്ലോക്ക് ചെയ്‌തിട്ടുണ്ട്. മറ്റൊരു പാസ്‍വേഡ് പരീക്ഷിക്കുക."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"അക്കങ്ങൾ ആരോഹണ ക്രമത്തിലോ അവരോഹണ ക്രമത്തിലോ അനുക്രമമായോ നൽകുന്നത് അനുവദനീയമല്ല"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"സ്ഥിരീകരിക്കുക"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"റദ്ദാക്കുക"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"വൈഫൈ"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"വൈഫൈ ഓണാക്കുക"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"വൈഫൈ"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"വൈഫൈ ഉപയോഗിക്കുക"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"വൈഫൈ ഉപയോഗിക്കുക"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"വൈഫൈ ക്രമീകരണങ്ങൾ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"വൈഫൈ"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"വയർലെസ് ആക്‌സസ് പോയിന്റുകൾ സജ്ജീകരിക്കുക, നിയന്ത്രിക്കുക"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്യാൻ,  ചുവടെയുള്ള QR കോഡിലേക്ക് കേന്ദ്രീകരിക്കുക"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR കോഡ് സ്‍കാൻ ചെയ്ത് വൈഫൈയിൽ ചേരുക"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"വൈഫൈ പങ്കിടുക"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്യാൻ ഈ QR കോഡ് സ്‌കാൻ ചെയ്യുകയും പാസ്‌വേഡ് പങ്കിടുകയും ചെയ്യുക"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” എന്നതിൽ ചേരാൻ, മറ്റൊരു ഉപകരണം ഉപയോഗിച്ച് ഈ QR കോഡ് സ്‌കാൻ ചെയ്യുക"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>\" എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്യാൻ ഈ QR കോഡ് സ്‌കാൻ ചെയ്യുക"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"വീണ്ടും ശ്രമിക്കുക. പ്രശ്‌നം തുടരുകയാണെങ്കിൽ, ഉപകരണ നിർമ്മാതാവിനെ ബന്ധപ്പെടുക"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"എന്തോ കുഴപ്പമുണ്ടായി"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"വൈഫൈ പാസ്‌വേഡ്: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ഹോട്ട്‌സ്‌പോട്ടിന്റെ പാസ്‌വേഡ്: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"സ്വയമേവ കണ‌ക്റ്റ് ചെയ്യുക"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ഈ നെറ്റ്‌വർക്കിന് സമീപമെത്തുമ്പോൾ സ്വയമേവ കണക്‌റ്റ് ചെയ്യാൻ ഫോണിനെ അനുവദിക്കുക"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ഈ നെറ്റ്‌വർക്കിന് സമീപമെത്തുമ്പോൾ സ്വയമേവ കണക്‌റ്റ് ചെയ്യാൻ ടാബ്‌ലെറ്റിനെ അനുവദിക്കുക"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"പരിധിയിൽ വരുമ്പോൾ ഈ നെറ്റവർക്കിലേക്ക് കണക്ഷൻ അനുവദിക്കുക"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ഉപകരണം ചേർക്കുക"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ഈ നെറ്റ്‌വർക്കിലേക്ക് ഒരു ഉപകരണം ചേർക്കാൻ ഒരു QR കോഡ് ഉപയോഗിക്കൂ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR കോഡ് സാധുവായ ഫോർമാറ്റിലല്ല"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"സിസ്റ്റം സർട്ടിഫിക്കറ്റുകൾ ഉപയോഗിക്കുക"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"നൽകരുത്"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"സാധൂകരിക്കരുത്"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"സർട്ടിഫിക്കറ്റൊന്നും വ്യക്തമാക്കിയിട്ടില്ല. നിങ്ങളുടെ കണക്ഷൻ സ്വകാര്യമായിരിക്കുകയില്ല."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"നെറ്റ്‌വർക്കിന്റെ പേര് ദൈർഘ്യമേറിയതാണ്."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ഒരു ഡൊമെയ്ൻ വ്യക്തമാക്കിയിരിക്കണം."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"സർട്ടിഫിക്കറ്റ് ആവശ്യമാണ്."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"കണക്റ്റ് ചെയ്യുക"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"വൈഫൈ ഓണാക്കി"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> എന്നതിലേക്ക് കണക്റ്റ് ചെയ്‌തു"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്യുന്നു"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"കണക്റ്റ് ചെയ്യുന്നു…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"നെറ്റ്‌വർക്കിൽ കണക്റ്റുചെയ്യുന്നതിൽ പരാജയപ്പെട്ടു"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"നെറ്റ്‌വർക്ക് പരിധിയിലില്ല"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ഉപകരണ MAC വിലാസം"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ക്രമരഹിതമാക്കിയ MAC വിലാസം"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"ക്രമരഹിതമായ MAC വിലാസം (അവസാനം ഉപയോഗിച്ചത്)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP വിലാസം"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"നെറ്റ്‌വർക്ക് വിശദാംശങ്ങൾ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"സബ്‌നെറ്റ് മാസ്‌ക്"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 വിലാസങ്ങൾ"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"സംരക്ഷിച്ച നെറ്റ്‌വർക്ക്"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"സബ്‌സ്‌ക്രിപ്‌ഷനുകൾ"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"മറ്റ് നെറ്റ്‌വർക്കുകൾ"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP ക്രമീകരണങ്ങൾ"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"ഈ ഉപയോക്താവിന് വൈഫൈ വിപുല ക്രമീകരണം ലഭ്യമല്ല"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"സംരക്ഷിക്കുക"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"സാധുവായ ഗേറ്റ്‌വേ വിലാസം ടൈപ്പുചെയ്യുക."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"സാധുവായ DNS വിലാസം ടൈപ്പുചെയ്യുക."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0, 30 എന്നിവയ്‌ക്കിടയിലുള്ള ഒരു നെറ്റ്‌വർക്ക് പ്രിഫി‌ക്സ് ദൈർഘ്യം ടൈപ്പുചെയ്യുക."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (സ്വകാര്യ DNS അസാധുവാക്കിയില്ലെങ്കിൽ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (സ്വകാര്യ DNS അസാധുവാക്കിയില്ലെങ്കിൽ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ഗേറ്റ്‌വേ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"നെറ്റ്‌വർക്ക് പ്രിഫിക്‌സ് ദൈർഘ്യം"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi ഡയറക്‌ട്"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ആപ്പ് ഉള്ളടക്കം പങ്കിടുന്നു. ഇന്‍റർനെറ്റ് കണക്ഷൻ പങ്കിടാൻ, ഹോട്ട്‌സ്പോട്ട് ഓഫാക്കുക, തുടർന്ന് ഓണാക്കുക:"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"പാസ്‍വേഡ് സജ്ജീകരിച്ചിട്ടില്ല"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ഹോട്ട്‌സ്‌പോട്ടിന്റെ പേര്"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഓണാക്കുന്നു..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഓണാക്കുന്നു…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ഹോട്ട്‌സ്പോട്ടിലേക്ക് മറ്റ് ഉപകരണങ്ങൾക്ക് കണക്റ്റുചെയ്യാൻ കഴിയും"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ഹോട്ട്‌സ്‌പോട്ടിന്റെ പാസ്‌വേഡ്"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ബാൻഡ്"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"സ്‌മൂത്ത് ഡിസ്പ്ലേ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ചില ഉള്ളടക്കങ്ങളുടെ പുതുക്കൽ നിരക്ക് 60 Hz-ൽ നിന്നും 90 Hz-ലേക്ക് സ്വയമേവ ഉയർത്തുന്നു. ബാറ്ററി ഉപയോഗം വർദ്ധിപ്പിക്കുന്നു."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"സ്‌മൂത്ത് ഡിസ്പ്ലേ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ഫോഴ്‌സ് 90 Hz പുതുക്കൽ നിരക്ക്"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"മെച്ചപ്പെട്ട സ്‌പർശന പ്രതികരണശേഷി, ആനിമേഷൻ നിലവാരം എന്നിവയ്‌ക്കുള്ള ഉയർന്ന പുതുക്കൽ നിരക്ക്. ബാറ്ററി ഉപയോഗം വർദ്ധിപ്പിക്കുന്നു."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"സ്ക്രീൻ ശ്രദ്ധ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ഓണാണ് / നിങ്ങൾ അതിൽ നോക്കുന്നുണ്ടെങ്കിൽ സ്ക്രീൻ ഓഫാക്കില്ല"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"സ്ക്രീൻ ഓഫായിരിക്കുന്ന സമയത്ത്, പുതിയ അറിയിപ്പുകൾ വരുമ്പോൾ, ഇത് സ്ക്രീൻ ഓണാക്കുന്നു"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"സമയവും വിവരവും എപ്പോഴും കാണിക്കുക"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ഉയർന്ന ബാറ്ററി ഉപയോഗം"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"ബോൾഡ് ടെക്സ്റ്റ്"</string>
     <string name="title_font_size" msgid="570613010306330622">"ഫോണ്ട് വലുപ്പം"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ടെക്സ്റ്റ് ചെറുതോ വലുതോ ആക്കുക"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"സിം കാർഡ് ലോക്ക് ക്രമീകരണങ്ങൾ"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android പതിപ്പ്"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android സുരക്ഷാ അപ്ഡേറ്റ്"</string>
     <string name="model_info" msgid="8997566254717810904">"മോഡല്‍"</string>
-    <string name="model_summary" msgid="2246651782442466213">"മോഡൽ: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"മോഡലും ഹാർഡ്‌വെയറും"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ഹാർഡ്‌വെയർ പതിപ്പ്"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ഉപകരണ ഐഡി"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN ഇല്ലാതാക്കുക"</string>
     <string name="menu_new" msgid="6571230342655509006">"പുതിയ APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"സംരക്ഷിക്കുക"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"നിരസിക്കുക"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"റദ്ദാക്കുക"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"പേരിന്റെ ഫീൽഡ് ശൂന്യമായിരിക്കരുത്."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN ശൂന്യമായിരിക്കരുത്."</string>
@@ -1593,8 +1611,11 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ആപ്പുകൾ റീസെറ്റ് ചെയ്യാനാകും"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"വൈഫൈ, മൊബൈൽ, Bluetooth റീസെറ്റ് ചെയ്യുക"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"ഇനിപ്പറയുന്നവ ഉൾപ്പെടെ എല്ലാ നെറ്റ്‍വർക്ക് ക്രമീകരണങ്ങളും ഇത് റീസെറ്റ് ചെയ്യും:\n\n"<li>"വൈഫൈ"</li>\n<li>"മൊബൈൽ ഡാറ്റ"</li>\n<li>"Bluetooth"</li></string>
+    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
+    <skip />
     <string name="reset_esim_title" msgid="6152167073280852849">"ഡൗൺലോഡ് ചെയ്‌ത SIM-കൾ മായ്ക്കൂ"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"പകരം വയ്ക്കാനുള്ള SIM-കൾ ഡൗൺലോഡ് ചെയ്യാൻ, നിങ്ങളുടെ സേവനദാതാവിനെ ബന്ധപ്പെടുക. ഇത് മൊബൈൽ സേവന പ്ലാനുകളൊന്നും റദ്ദാക്കില്ല."</string>
+    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
+    <skip />
     <string name="reset_network_button_text" msgid="2281476496459610071">"ക്രമീകരണം റീസെറ്റ് ചെയ്യുക"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"എല്ലാ നെറ്റ്‌വർക്കിംഗ് ക്രമീകരണവും പുനഃസജ്ജീകരിക്കണോ? നിങ്ങൾക്ക് ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാവില്ല."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"എല്ലാ നെറ്റ്‌വർക്കിംഗ് ക്രമീകരണവും റീസെറ്റ് ചെയ്യുകയും ഡൗൺലോഡ് ചെയ്‌ത സിമ്മുകൾ മായ്ക്കുകയും ചെയ്യണോ? ഇത് പഴയപടിയാക്കാനാകില്ല."</string>
@@ -1604,31 +1625,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"നെറ്റ്‌വർക്ക് ക്രമീകരണം റീസെറ്റുചെയ്‌തു"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM-കൾ മായ്ക്കാനാവില്ല"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"പിശക് കാരണം ഡൗൺലോഡ് ചെയ്‌ത ഈ SIM-കൾ മായ്ക്കാനാവില്ല.\n\nനിങ്ങളുടെ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്‌ത് വീണ്ടും ശ്രമിക്കുക."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ഇത് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ "<b>"ഉള്ളിലെ മെമ്മറിയിൽ"</b>" നിന്നും ഇനിപ്പറയുന്നവയുൾപ്പെടെ എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്‌റ്റത്തിന്റെയും ആപ്പിന്റെയും, ഡാറ്റയും ക്രമീകരണവും"</li>\n<li>"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകൾ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ഇത് നിങ്ങളുടെ ഫോണിന്‍റെ "<b>"ഉള്ളിലെ മെമ്മറിയിലുള്ള"</b>" എല്ലാ ഡാറ്റയും മായ്ക്കും, അതിൽ ഇവയുൾപ്പെടുന്നു:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്‌റ്റത്തിന്റെയും ആപ്പിന്റെയും, ഡാറ്റയും ക്രമീകരണവും"</li>\n<li>"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകൾ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n" നിലവിൽ, നിങ്ങൾ ഇനിപ്പറയുന്ന അക്കൗണ്ടുകളിലേക്ക് സൈൻ ഇൻ ചെ‌യ്തിരിക്കുന്നു:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ഈ ഉപകരണത്തിൽ മറ്റ് ഉപയോക്താക്കളുണ്ട്.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"സംഗീതം"</li>\n<li>"ഫോട്ടോകൾ"</li>\n<li>"മറ്റ് ഉപയോക്തൃ ഡാറ്റ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ഇ-സിമ്മുകൾ"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"നിങ്ങളുടെ മൊബൈൽ സർവീസ് പ്ലാൻ ഇത് റദ്ദാക്കില്ല."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"USB സ്റ്റോറേജ് "</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"SD കാർഡ്"</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"എല്ലാ ഡാറ്റയും മായ്‌ക്കുക (ഫാക്‌ടറി റീസെറ്റ്)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ഇത് നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ "<b>"ഉള്ളിലെ മെമ്മറിയിൽ"</b>" നിന്നും ഇനിപ്പറയുന്നവ ഉൾപ്പെടെയുള്ള എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്‌റ്റം, ആപ്പ് ഡാറ്റയും ക്രമീകരണവും"</li>\n<li>"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകൾ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ഇത് നിങ്ങളുടെ ഫോണിന്‍റെ "<b>"ഉള്ളിലെ മെമ്മറിയിൽ"</b>" നിന്നും ഇനിപ്പറയുന്നവ ഉൾപ്പെയുള്ള എല്ലാ ഡാറ്റയും മായ്ക്കും:\n\n"<li>"നിങ്ങളുടെ Google അക്കൗണ്ട്"</li>\n<li>"സിസ്‌റ്റം, ആപ്പ് ഡാറ്റയും ക്രമീകരണവും"</li>\n<li>"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകൾ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n" ഇനിപ്പറയുന്ന അക്കൗണ്ടുകളിൽ നിങ്ങൾ നിലവിൽ സൈൻ ഇൻ ചെയ്‌തിരിക്കുന്നു:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ഈ ഉപകരണത്തിൽ മറ്റ് ഉപയോക്താക്കളുണ്ട്.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"സംഗീതം"</li>\n<li>"ഫോട്ടോകൾ"</li>\n<li>"മറ്റ് ഉപയോക്തൃ ഡാറ്റ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-കൾ"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"നിങ്ങളുടെ മൊബൈൽ സർവീസ് പ്ലാൻ ഇത് റദ്ദാക്കില്ല."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"USB സ്‌റ്റോറേജ് "</b>" മായ്ക്കേണ്ടതുണ്ട്."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"സംഗീതം, ചിത്രങ്ങൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുന്നതിന്, "<b>"SD കാർഡ്"</b>" മായ്‌ക്കേണ്ടതുണ്ട്."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB സ്റ്റോറേജ്  മായ്ക്കുക"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD കാർഡ് മായ്ക്കുക"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ആന്തരിക USB സംഭരണത്തിലെ സംഗീതമോ ഫോട്ടോകളോ പോലുള്ള എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"സംഗീതമോ ഫോട്ടോകളോ പോലുള്ള, SD കാർഡിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"നിങ്ങളുടെ എല്ലാ വ്യക്തിഗത വിവരവും ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകളും ഇല്ലാതാക്കപ്പെടും. ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകളും SIM-കളും ഉൾപ്പെടെ നിങ്ങളുടെ എല്ലാ വ്യക്തിഗത വിവരവും ഇല്ലാതാക്കപ്പെടും. ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"എല്ലാം മായ്ക്കുക"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"സി‌സ്റ്റം മായ്ക്കുക സേവനം ലഭ്യമല്ലാത്തതിനാൽ പുനഃസജ്ജീകരണമൊന്നും നടത്തിയില്ല."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"എല്ലാ ഡാറ്റയും മായ്‌ക്കണോ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ഈ ഉപയോക്താവിനായി ഫാക്‌ടറി പുനഃസജ്ജമാക്കൽ ലഭ്യമല്ല"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"മായ്‌ക്കുന്നു"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"കാത്തിരിക്കുക..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"എല്ലാ ഡാറ്റയും മായ്ക്കുക"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"നിങ്ങളുടെ എല്ലാ വ്യക്തിപര വിവരവും ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകളും ഇല്ലാതാക്കപ്പെടും. ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ഡൗൺലോഡ് ചെയ്‌ത ആപ്പുകളും SIM-കളും ഉൾപ്പെടെ നിങ്ങളുടെ എല്ലാ വ്യക്തിപര വിവരവും ഇല്ലാതാക്കപ്പെടും. ഈ പ്രവർത്തനം പഴയപടിയാക്കാനാകില്ല."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"എല്ലാ ഡാറ്റയും മായ്‌ക്കണോ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ഈ ഉപയോക്താവിനായി ഫാക്‌ടറി റീസെറ്റ് ലഭ്യമല്ല"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"മായ്‌ക്കുന്നു"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"കാത്തിരിക്കുക…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"കോൾ ക്രമീകരണങ്ങൾ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"വോയ്‌സ് മെയിൽ, കോൾ കൈമാറ്റം, കോൾ വെയ്‌റ്റിംഗ്, വിളിച്ച നമ്പർ എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ടെതറിംഗ്"</string>
@@ -1676,7 +1695,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>-ൽ കൂടുതൽ ഉപകരണങ്ങളിൽ ടെതർ ചെയ്യാനായില്ല."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ടെതർ ചെയ്‌തത് മാറ്റും."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ഇതർനെറ്റ് ടെതറിംഗ്"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ഇതർനെറ്റ് വഴി ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ഇതർനെറ്റ് വഴി ഫോണിന്റെ ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടുക"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"നിങ്ങളുടെ മൊബൈൽ ഡാറ്റാ കണക്ഷനിലൂടെ മറ്റ് ഉപകരണങ്ങളിലേക്ക് ഇന്‍റർനെറ്റ് നൽകാൻ ഹോട്ട്‌സ്പോട്ടും ‌ടെതറിംഗും ഉപയോഗിക്കുക. ചുറ്റുവട്ടത്തുള്ള ഉപകരണങ്ങളുമായി ഉള്ളടക്കം പങ്കിടാൻ ആപ്പുകൾക്കും ഹോട്ട്‌സ്പോട്ട് സൃഷ്ടിക്കാൻ കഴിയും."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"നിങ്ങളുടെ വൈഫൈ വഴിയോ മൊബൈൽ ഡാറ്റാ കണക്ഷൻ വഴിയോ മറ്റ് ഉപകരണങ്ങളിലേക്ക് ഇന്റർനെറ്റ് നൽകാൻ ഹോട്ട്‌സ്പോട്ടും ടെതറിംഗും ഉപയോഗിക്കുക. സമീപമുള്ള ഉപകരണങ്ങളുമായി ഉള്ളടക്കം പങ്കിടാൻ ആപ്പുകൾക്ക് ഹോട്ട്‌സ്പോട്ട് സൃഷ്‌ടിക്കാനുമാവും."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"സഹായം"</string>
@@ -1718,6 +1737,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth സ്‌കാനിംഗ്"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth ഓഫ് ആണെങ്കിൽ പോലും ആപ്പുകളെയും സേവനങ്ങളെയും ഏത് സമയവും അടുത്തുള്ള ഉപകരണം സ്‌കാൻ ചെയ്യാൻ അനുവദിക്കുക. ഉദാഹരണത്തിന്, ലൊക്കേഷൻ‌ അടിസ്ഥാനമാക്കിയുള്ള ഫീച്ചറുകളും സേവനങ്ങളും മെച്ചപ്പെടുത്താൻ ഇത് ഉപയോഗിക്കാം."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ജോലിക്കുള്ള ലൊക്കേഷൻ സേവനങ്ങൾ"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തൽ"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തൽ"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"നിലവിലുള്ള സമയമേഖല കണ്ടെത്തുന്നതിന് ഉപകരണത്തിന്റെ ലൊക്കേഷൻ ഉപയോഗിക്കാൻ അനുവദിക്കുന്നു. വൈഫൈ സ്‌കാനിംഗ് പോലുള്ള മറ്റ് ലൊക്കേഷൻ ക്രമീകരണം സമയമേഖല കണ്ടെത്തലിന്റെ കൃത്യതയെ ബാധിക്കും."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ഓണാണ്"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ഓഫാണ്"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"സ്വയമേവയുള്ള സമയമേഖല കണ്ടെത്തൽ പ്രവർത്തനരഹിതമാക്കി"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തൽ പ്രവർത്തനരഹിതമാക്കി"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തൽ പിന്തുണയ്ക്കുന്നില്ല"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ലൊക്കേഷൻ ഉപയോഗിച്ചുള്ള സമയമേഖല കണ്ടെത്തലിൽ മാറ്റങ്ങൾ അനുവദനീയമല്ല"</string>
     <string name="location_network_based" msgid="5247042890080021887">"വൈഫൈ &amp; മൊബൈൽ നെറ്റ്‌വർക്ക് ലൊക്കേഷൻ"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"നിങ്ങളുടെ ലൊക്കേഷൻ വേഗത്തിൽ നിർണ്ണയിക്കാൻ Google-ന്റെ ലൊക്കേഷൻ സേവനം ഉപയോഗിക്കാൻ അപ്ലിക്കേഷനുകളെ അനുവദിക്കുക. അജ്ഞാത ലൊക്കേഷൻ ഡാറ്റ ശേഖരിച്ച് Google-ന് അയയ്‌ക്കും."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"വൈഫൈ നിർണ്ണയിച്ച ലൊക്കേഷൻ"</string>
@@ -1781,6 +1809,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്കിന്, പാസ്‍വേഡ് സജ്ജീകരിക്കൂ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്കിന്, പാറ്റേൺ സജ്ജീകരിക്കൂ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"മുഖം തിരിച്ചറിഞ്ഞുള്ള അൺലോക്കിന്, പിൻ സജ്ജീകരിക്കൂ"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ബയോമെട്രിക്സിനായി പാസ്‍വേഡ് സജ്ജീകരിക്കൂ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ബയോമെട്രിക്‌സിനായി പാറ്റേൺ സജ്ജീകരിക്കൂ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ബയോമെട്രിക്‌സിനായി പിൻ സജ്ജീകരിക്കൂ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"പാസ്‌വേഡ് മറന്നോ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"പാറ്റേൺ മറന്നോ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"പിൻ മറന്നോ?"</string>
@@ -2117,13 +2148,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"അടിക്കുറിപ്പ് മുൻഗണനകൾ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"മാഗ്നിഫിക്കേഷൻ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"മാഗ്നിഫിക്കേഷൻ ഏരിയ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"മാഗ്നിഫിക്കേഷൻ പ്രവർത്തനക്ഷമമാക്കൽ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"സ്‌ക്രീൻ മാഗ്നിഫൈ ചെയ്യാൻ, മാഗ്നിഫിക്കേഷൻ ഏരിയ(കൾ) തിരഞ്ഞെടുക്കുക"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"പൂര്‍ണ്ണ സ്ക്രീന്‍"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"സ്‌ക്രീനിന്റെ ഭാഗം"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"പൂർണ്ണ സ്‌ക്രീനും സ്‌ക്രീനിന്റെ ഭാഗവും"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"മുഴുവൻ സ്‌ക്രീനും മാഗ്നിഫൈ ചെയ്യുക"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"സ്‌ക്രീനിന്റെ ഭാഗം മാഗ്നിഫൈ ചെയ്യുക"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ഉപയോഗസഹായി ബട്ടണിലേക്ക് മാറണോ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"സ്ക്രീനിലൊരു ഭാഗം മാഗ്നിഫൈ ചെയ്യാൻ മൂന്ന് തവണ ടാപ്പ് ചെയ്യൽ ഉപയോഗിക്കുന്നത് ടൈപ്പിംഗും മറ്റ് പ്രവർത്തനങ്ങളും വൈകുന്നതിന് കാരണമാകും.\n\nഉപയോഗസഹായി ബട്ടൺ ഉപയോഗിച്ച് മാഗ്നിഫൈ ചെയ്യുന്നതിലേക്ക് മാറണമെന്നുണ്ടോ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ഉപയോഗസഹായി ബട്ടണിലേക്ക് മാറുക"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"മൂന്ന് തവണ ടാപ്പ് ചെയ്‌ത് മാഗ്നിഫൈ ചെയ്യൽ തുടരുക"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"മാഗ്നിഫിക്കേഷൻ ക്രമീകരണം"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"3 തവണ ടാപ്പ് ചെയ്‌ത് മാഗ്നിഫൈചെയ്യൂ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"കുറുക്കുവഴിയിലൂടെ മാഗ്നിഫൈ ചെയ്യൂ"</string>
@@ -2177,11 +2211,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"പവർബട്ടൺ കോൾ നിർത്തുന്നു"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"വലിയ മൗസ് പോയിന്റർ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ആനിമേഷനുകൾ നീക്കം ചെയ്യുക"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"മോണോ ഓഡിയോ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ഓഡിയോ പ്ലേ ചെയ്യുമ്പോൾ ചാനലുകൾ സംയോജിപ്പിക്കുക"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ഓഡിയോ ബാലൻസ്"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ഇടത്"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"വലത്"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"മോണോ ഓഡിയോ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ഓഡിയോ പ്ലേ ചെയ്യുമ്പോൾ ചാനലുകൾ സംയോജിപ്പിക്കുക"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ഓഡിയോ ബാലൻസ്"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ഇടത്"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"വലത്"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ഡിഫോൾട്ട്"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 സെക്കൻഡ്"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 സെക്കൻഡ്"</string>
@@ -2211,11 +2245,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"അറിയിപ്പ് വൈബ്രേഷൻ"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"റിംഗ് വൈബ്രേഷൻ"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"സ്‌പർശന ഫീഡ്ബാക്ക്"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ഉപയോഗിക്കുക"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> തുറക്കുക"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"നിറം ക്രമീകരിക്കൽ ഉപയോഗിക്കുക"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"അടിക്കുറിപ്പുകൾ കാണിക്കുക"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"പിന്തുണയുള്ള ആപ്പിന് മാത്രം"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ഉപയോഗിക്കുക"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> തുറക്കുക"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"നിറം ശരിയാക്കൽ ഉപയോഗിക്കുക"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"അടിക്കുറിപ്പുകൾ കാണിക്കുക"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"പിന്തുണയുള്ള ആപ്പിന് മാത്രം"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"അടിക്കുറിപ്പിന്റെ വലുപ്പവും സ്‌റ്റെെലും"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ടെക്‌സ്‌റ്റ് വലുപ്പം"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"കൂടുതൽ‍ ഓപ്ഷനുകൾ"</string>
@@ -2245,6 +2279,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ചുവപ്പ്, പച്ച നിറങ്ങളോടുള്ള വർണ്ണാന്ധത"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ചുവപ്പ്, പച്ച നിറങ്ങളോടുള്ള വർണ്ണാന്ധത"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"നീല, മഞ്ഞ നിറങ്ങളോടുള്ള വർണ്ണാന്ധത"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ഗ്രേസ്‌കെയിൽ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ചുവപ്പ്-പച്ച"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ചുവപ്പ്-പച്ച"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"നീല-മഞ്ഞ"</string>
@@ -2374,7 +2409,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"പശ്ചാത്തല നിയന്ത്രണം"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"പശ്ചാത്തലത്തിൽ റൺ ചെയ്യുന്നതിന് ആപ്പിനെ അനുവദിക്കുക"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"പശ്ചാത്തലത്തിൽ റൺ ചെയ്യാൻ ആപ്പിനെ അനുവദിച്ചിട്ടില്ല"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"പശ്ചാത്തലം ഉപയോഗം നിയന്ത്രിക്കാനാവില്ല"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"പശ്ചാത്തല ഉപയോഗം നിയന്ത്രിക്കാനാകില്ല"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"പശ്ചാത്തല പ്രവർത്തനം പരിമിതപ്പെടുത്തണോ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"നിങ്ങൾ ഒരു ആപ്പിനായി പശ്ചാത്തല പ്രവർത്തനം പരിമിതപ്പെടുത്തുകയാണെങ്കിൽ, അത് ശരിയായി പ്രവർത്തിക്കാനിടയില്ല."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ബാറ്ററി ഓപ്‌റ്റിമൈസ് ചെയ്യാൻ ഈ ആപ്പ് സജ്ജീകരിക്കാത്തതിനാൽ, നിങ്ങൾക്ക് ഇത് നിയന്ത്രിക്കാനാവില്ല.\n\nആപ്പ് നിയന്ത്രിക്കാൻ, ആദ്യം ബാറ്ററി ഓപ്‌റ്റിമൈസേഷൻ ഓണാക്കുക."</string>
@@ -2423,6 +2458,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ടാബ്‌ലെറ്റ്, സാധാരണയിൽ കൂടുതൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ഉപകരണം, സാധാരണയിൽ കൂടുതൽ ഉപയോഗിച്ചു"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"സാധാരണയിലും നേരത്തെ ബാറ്ററി ചാർജ് തീർന്നേക്കാം"</string>
+    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
+    <skip />
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ബാറ്ററി താൽക്കാലം പരിമിതപ്പെടുത്തി. കൂടുതലറിയാൻ ടാപ്പ് ചെയ്യുക."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"നിങ്ങളുടെ ഫോൺ സാധാരണയിൽ കൂടുതൽ ബാറ്ററി ഉപയോഗിച്ചു. നിങ്ങളുടെ ബാറ്ററിയുടെ ചാർജ് പ്രതീക്ഷിച്ചതിനേക്കാൾ വേഗത്തിൽ തീർന്നേക്കാം\n\nബാറ്ററി ഉപയോഗമനുസരിച്ചുള്ള മുൻനിര ആപ്പുകൾ ഇനിപ്പറയുന്നു:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് സാധാരണയിൽ കൂടുതൽ ബാറ്ററി ഉപയോഗിച്ചു. നിങ്ങളുടെ ബാറ്ററിയുടെ ചാർജ് പ്രതീക്ഷിച്ചതിനേക്കാൾ വേഗത്തിൽ തീർന്നേക്കാം\n\nബാറ്ററി ഉപയോഗമനുസരിച്ചുള്ള മുൻനിര ആപ്പുകൾ ഇനിപ്പറയുന്നു:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"നിങ്ങളുടെ ഉപകരണം സാധാരണയിൽ കൂടുതൽ ബാറ്ററി ഉപയോഗിച്ചു. നിങ്ങളുടെ ബാറ്ററിയുടെ ചാർജ് പ്രതീക്ഷിച്ചതിനേക്കാൾ വേഗത്തിൽ തീർന്നേക്കാം\n\nബാറ്ററി ഉപയോഗമനുസരിച്ചുള്ള മുൻനിര ആപ്പുകൾ ഇനിപ്പറയുന്നു:"</string>
@@ -2478,6 +2516,8 @@
       <item quantity="one">%1$d ആപ്പ് പരിമിതപ്പെടുത്തി</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"നിങ്ങളുടെ ബാറ്ററി മീറ്റർ വായിക്കുന്നതിൽ പ്രശ്‌നമുണ്ട്"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"നിങ്ങളുടെ ബാറ്ററി മീറ്റർ വായിക്കുന്നതിൽ പ്രശ്‌നമുണ്ട്. "<annotation id="url">"കൂടുതലറിയാൻ"</annotation>" ടാപ്പ് ചെയ്യുക"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ആപ്പ് നിർത്തണോ?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"നിങ്ങളുടെ ഫോണിനെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ഫോണിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, ഈ ആപ്പിന്റെ പ്രവർത്തനം നിർത്തുക.\n\nപ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്‌റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"നിങ്ങളുടെ ടാബ്‌ലെറ്റിനെ <xliff:g id="APP">%1$s</xliff:g> സജീവമാക്കി നിലനിർത്തുന്നതിനാൽ ടാബ്‌ലെറ്റിന് സാധാരണ ഗതിയിൽ ബാറ്ററി മാനേജുചെയ്യാൻ കഴിയില്ല.\n\nഈ പ്രശ്‌നം പരിഹരിക്കാൻ ശ്രമിക്കുന്നതിന്, ഈ ആപ്പിന്റെ പ്രവർത്തനം നിർത്തുക.\n\nപ്രശ്‌നം നിലനിൽക്കുകയാണെങ്കിൽ, ബാറ്ററി പ്രകടനം മെച്ചപ്പെടുത്തുന്നതിന് നിങ്ങൾക്ക് ഈ ആപ്പ് അൺ‌ഇൻസ്‌റ്റാൾ ചെയ്യേണ്ടി വന്നേക്കാം."</string>
@@ -2591,9 +2631,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ഷെഡ്യൂള്‍‌ സജ്ജീകരിക്കൂ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ബാറ്ററി ലൈഫ് നീട്ടുക"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ചാർജായാൽ ഓഫാക്കുക"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"നിങ്ങളുടെ ഫോൺ <xliff:g id="PERCENT">%1$s</xliff:g>-ത്തിൽ എത്തുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാകും"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"നിങ്ങളുടെ ടാബ്‌ലെറ്റ് <xliff:g id="PERCENT">%1$s</xliff:g> എത്തുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാവും"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"നിങ്ങളുടെ ഉപകരണം <xliff:g id="PERCENT">%1$s</xliff:g> എത്തുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാവും"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"നിങ്ങളുടെ ഫോണിന്റെ ചാർജ് <xliff:g id="PERCENT">%1$s</xliff:g>-ത്തിന് മുകളിലാകുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാകും"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"നിങ്ങളുടെ ടാബ്‌ലെറ്റിന്റെ ചാർജ് <xliff:g id="PERCENT">%1$s</xliff:g>-ത്തിന് മുകളിലാകുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാകും"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"നിങ്ങളുടെ ഉപകരണത്തിന്റെ ചാർജ് <xliff:g id="PERCENT">%1$s</xliff:g>-ത്തിന് മുകളിലാകുമ്പോൾ ബാറ്ററി ലാഭിക്കൽ ഓഫാകും"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ഓണാക്കുക"</string>
@@ -2658,6 +2698,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"റീസെറ്റ് ചെയ്യുക"</string>
     <string name="tts_play" msgid="2945513377250757221">"പ്ലേ ചെയ്യുക"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"അഡാപ്റ്റീവ് കണക്റ്റിവിറ്റി"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"നിങ്ങളുടെ നെറ്റ്‌വർക്ക് കണക്ഷൻ സ്വയമേവ മാനേജ് ചെയ്യുന്നതിലൂടെ ബാറ്ററി ലൈഫ് വർദ്ധിപ്പിക്കുകയും ഉപകരണത്തിന്റെ പ്രകടനം മെച്ചപ്പെടുത്തുകയും ചെയ്യുന്നു"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ക്രെഡൻഷ്യൽ സ്റ്റോറേജ്"</string>
     <string name="credentials_install" msgid="3933218407598415827">"സർട്ടിഫിക്കറ്റ് ഇൻസ്റ്റാൾ ചെയ്യൂ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"സ്റ്റോറേജിൽനിന്ന് സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്റ്റാൾ ചെയ്യുക"</string>
@@ -2669,9 +2711,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ഉപയോക്തൃ ക്രെഡന്‍ഷ്യലുകൾ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"സംഭരിച്ച ക്രെഡന്‍ഷ്യലുകൾ കാണുക, പരിഷ്ക്കരിക്കുക"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"വിപുലമായത്"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"സ്‌റ്റോറേജ് തരം"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ഹാർഡ്‌വെയറിൽ സംഭരിച്ചത്"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"സോഫ്‌റ്റ്‌വെയറിൽ മാത്രം"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ഈ ഉപയോക്താവിന് ക്രെഡൻഷ്യലുകളൊന്നും ലഭ്യമല്ല"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN, ആപ്‌സ് എന്നിവയ്ക്കായി ഇൻസ്റ്റാൾ ചെയ്തു"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"വൈഫൈ ഇൻസ്റ്റാൾ ചെയ്തു"</string>
@@ -2687,6 +2726,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"ഇൻസ്റ്റാൾ ചെയ്യരുത്"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"എന്തായാലും ഇൻസ്റ്റാൾ ചെയ്യുക"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"സർട്ടിഫിക്കറ്റ് ഇൻസ്റ്റാൾ ചെയ്തില്ല"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"ഈ ഉപകരണത്തിൽ സർട്ടിഫിക്കറ്റുകൾ ഇൻസ്‌റ്റാൾ ചെയ്യാൻ <xliff:g id="APP_NAME">%s</xliff:g> എന്നതിനെ അനുവദിക്കണോ?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"ചുവടെയുള്ള ആപ്പുകളും URL-കളും ഈ സർട്ടിഫിക്കറ്റുകൾ ഉപയോഗിച്ച് നിങ്ങളെ തിരിച്ചറിയും"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"അനുവദിക്കരുത്"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"അനുവദിക്കുക"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"കൂടുതൽ കാണിക്കുക"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"സർട്ടിഫിക്കറ്റ് മാനേജ്മെന്റ് ആപ്പ്"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"ഒന്നുമില്ല"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"ചുവടെയുള്ള ആപ്പുകളും URL-കളും നിങ്ങൾ ആക്സസ് ചെയ്യുമ്പോൾ, ഈ ആപ്പ് ഇൻസ്റ്റാൾ ചെയ്ത സർട്ടിഫിക്കറ്റുകളിലൂടെ സിസ്റ്റം നിങ്ങളെ തിരിച്ചറിയും"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"നീക്കം ചെയ്യുക"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"അടിയന്തര ഡയലിംഗ് സിഗ്നൽ"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"ഒരു അടിയന്തര കോൾ ലഭിക്കുന്ന സമയത്തെ പ്രവർത്തരീതി സജ്ജീകരിക്കുക"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"ബാക്കപ്പെടുക്കുക"</string>
@@ -3010,7 +3058,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"സജ്ജീകരിച്ചിട്ടില്ല - ഔദ്യോഗിക പ്രൊഫൈൽ"</string>
     <string name="user_admin" msgid="4024553191395768119">"അഡ്‌മിന്‍"</string>
     <string name="user_you" msgid="3070562015202859996">"നിങ്ങൾ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"വിളിപ്പേര്"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> ഉപയോക്താക്കളെ വരെ നിങ്ങൾക്ക് ചേർക്കാം"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ടാബ്‌ലെറ്റ് ഉടമയ്‌ക്ക് മാത്രമേ ഉപയോക്താക്കളെ നിയന്ത്രിക്കാനാകൂ."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ഫോൺ ഉടമയ്‌ക്ക് മാത്രമേ ഉപയോക്താക്കളെ നിയന്ത്രിക്കാനാകൂ."</string>
@@ -3060,7 +3107,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"പേയ്മെന്റ് മെഷീനിൽ പണമടയ്ക്കൽ"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ഒരു പേയ്മെന്റ് ആപ്പ് സജ്ജീകരിക്കുക. തുടർന്ന് കോണ്ടാക്റ്റ്‍ലെസ് ചിഹ്നമുള്ള ഏത് പേയ്മെന്റ് മെഷീനിലും നിങ്ങളുടെ ഫോണിന്റെ പിൻവശം കാണിക്കുക."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"മനസ്സിലായി"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"കൂടുതൽ‍..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"കൂടുതൽ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ഡിഫോൾട്ട് പണം നൽകിയുള്ള ആപ്പ് സജ്ജീകരിക്കൂ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ഡിഫോൾട്ട് പണം നൽകിയുള്ള ആപ്പ് അപ്ഡേറ്റ് ചെയ്യുക"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"കോൺടാക്റ്റ്‌ലെസ് ടെർമിനലിൽ, <xliff:g id="APP">%1$s</xliff:g> ഉപയോഗിച്ച് പണമടയ്ക്കുക"</string>
@@ -3130,9 +3177,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"മടങ്ങുക"</string>
     <string name="wizard_next" msgid="3884832431439072471">"അടുത്തത്"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"പൂര്‍ത്തിയാക്കുക"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ഒരു ഫോട്ടോ എടുക്കുക"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ഒരു ചിത്രം തിരഞ്ഞെടുക്കുക"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ഫോട്ടോ തിരഞ്ഞെടുക്കുക"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"സിം കാർഡുകൾ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"സിം കാർഡുകൾ"</string>
@@ -3144,7 +3188,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ഇത് എല്ലായ്‌പ്പോഴും കോളുകൾക്കായി ഉപയോഗിക്കുക"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ഡാറ്റയ്‌ക്കായി ഒരു SIM തിരഞ്ഞെടുക്കുക"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS-നായി ഒരു SIM തിരഞ്ഞെടുക്കുക"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ഡാറ്റാ SIM മാറുന്നു, ഇതിന് കുറച്ച് സമയടുത്തേക്കാം..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ഡാറ്റാ SIM മാറുന്നു, ഇതിന് ഒരു മിനിറ്റ് വരെ സമയമെടുത്തേക്കാം…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ഇത് ഉപയോഗിച്ച് വിളിക്കുക"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ഒരു സിം കാർഡ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"സിം <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3331,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ദിനചര്യ, ഷെഡ്യൂൾ, ബാറ്ററി ലാഭിക്കൽ, പവർ സേവർ, ബാറ്ററി, സ്വയമേവ, ശതമാനം"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, വിപുലമായ കോളിംഗ്, 4g കോളിംഗ്"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ഭാഷ ചേർക്കുക, ഒരു ഭാഷ ചേർക്കുക"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ടെക്‌സ്‌റ്റ് വലുപ്പം"</string>
     <string name="default_sound" msgid="6604374495015245195">"സ്ഥിര ശബ്‌ദം"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"റിംഗ് ചെയ്യുന്നതിന്റെയും അറിയിപ്പിന്റെയും ശബ്‌ദം <xliff:g id="PERCENTAGE">%1$s</xliff:g> ആണ്"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ശബ്ദം, വൈബ്രേഷൻ, ശല്യപ്പെടുത്തരുത്"</string>
@@ -3326,11 +3371,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ശബ്ദങ്ങൾ ഓണാക്കുക"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"തത്സമയ ക്യാപ്‌ഷനുകൾ"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"മീഡിയയ്ക്ക് സ്വയമേവ അടിക്കുറിപ്പ് നൽകുക"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ഒന്നുമില്ല"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ഷെഡ്യൂളുകൾ സജ്ജീകരിച്ചു</item>
-      <item quantity="one">ഒരു ഷെഡ്യൂൾ സജ്ജീകരിച്ചു</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ഒന്നുമില്ല}=1{ഒരു ഷെഡ്യൂൾ സജ്ജീകരിച്ചു}other{# ഷെഡ്യൂളുകൾ സജ്ജീകരിച്ചു}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ശല്യപ്പെടുത്തരുത്"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"പ്രധാനപ്പെട്ട ആളുകളിൽ നിന്നും ആപ്പുകളിൽ നിന്നുമുള്ള അറിയിപ്പ് മാത്രം നേടുക"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"തടസ്സങ്ങൾ പരിമിതപ്പെടുത്തുക"</string>
@@ -3398,20 +3439,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"മുൻഗണന മാത്രം"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ഓൺ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ഓഫ് / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ഓഫ്"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ഓൺ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"എപ്പോഴും ചോദിക്കൂ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"നിങ്ങൾ ഓഫാക്കുന്നത് വരെ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> മണിക്കൂർ</item>
-      <item quantity="one">1 മണിക്കൂർ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> മിനിറ്റ്"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ഷെഡ്യൂളുകൾ സ്വമേധയാ ഓണാക്കാനാവും</item>
-      <item quantity="one">ഒരു ഷെഡ്യൂള്‍‌ സ്വമേധയാ ഓണാക്കാനാവും</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 മണിക്കൂർ}other{# മണിക്കൂർ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 മിനിറ്റ്}other{# മിനിറ്റ്}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ഓഫാണ്}=1{ഓഫാണ് / ഒരു ഷെഡ്യൂൾ സ്വയമേവ ഓണാകും}other{ഓഫാണ് / # ഷെഡ്യൂളുകൾ സ്വയമേവ ഓണാകും}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'ശല്യപ്പെടുത്തരുത്\' എന്നതിനെ തടസ്സപ്പെടുത്താൻ കഴിയുന്നവ"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ആളുകൾ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ആപ്പുകൾ"</string>
@@ -3457,6 +3490,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"മുൻഗണന കുറഞ്ഞ അറിയിപ്പുകളെ സ്വയമേവ സൗമ്യം എന്ന് സജ്ജീകരിക്കുക"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"അനുയോജ്യമായ അറിയിപ്പുകളുടെ റാങ്കിംഗ്"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"അറിയിപ്പുകൾ പ്രസക്‌തി അനുസരിച്ച് സ്വയമേവ റാങ്ക് ചെയ്യൂ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"അനുയോജ്യമായ അറിയിപ്പുകൾക്കുള്ള ഫീഡ്ബാക്ക്"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"അറിയിപ്പുകളിൽ വരുത്തിയ അഡ്‌ജസ്റ്റുമെന്റുകൾ സൂചിപ്പിക്കുകയും സിസ്റ്റത്തിലേക്ക് ഫീഡ്‌ബാക്ക് നൽകാനുള്ള ഓപ്ഷൻ കാണിക്കുകയും ചെയ്യുക"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"അറിയിപ്പിന്റെ പ്രാധാന്യം റീസെറ്റ് ചെയ്യുക"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"ഉപയോക്താവ് മാറ്റിയ പ്രാധാന്യ ക്രമീകരണം റീസെറ്റ് ചെയ്യുക, മുൻ‌ഗണന നൽകാൻ അറിയിപ്പ് സഹായിയെ അനുവദിക്കുക"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"നിർദ്ദേശിച്ച പ്രവർത്തനങ്ങളും മറുപടികളും"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"നിർദ്ദേശിച്ച പ്രവർത്തനങ്ങളും മറുപടികളും സ്വയമേവ കാണിക്കൂ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"സമീപകാലത്തുള്ളതും സ്‌നൂസ് ചെയ്‌തതുമായ അറിയിപ്പുകൾ കാണിക്കുക"</string>
@@ -3554,8 +3591,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"മുൻഗണനാ സംഭാഷണങ്ങൾ"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"സംഭാഷണ വിഭാഗത്തിന്റെ മുകളിൽ കാണിക്കുക, ഫ്ലോട്ടിംഗ് ബബിൾ ആയി ദൃശ്യമാകും"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"സംഭാഷണ വിഭാഗത്തിന്റെ മുകളിൽ കാണിക്കുക"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"മറ്റ് സംഭാഷണങ്ങൾ"</string>
+    <string name="other_conversations" msgid="551178916855139870">"മുൻഗണനയില്ലാത്ത സംഭാഷണങ്ങൾ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"നിങ്ങൾ മാറ്റങ്ങൾ വരുത്തിയ സംഭാഷണങ്ങൾ"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"അടുത്തിടെയുള്ള സംഭാഷണങ്ങൾ"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"പുതിയവ മായ്ക്കുക"</string>
+    <string name="clear" msgid="5092178335409471100">"മായ്ക്കുക"</string>
     <string name="important_bubble" msgid="7911698275408390846">"മുൻഗണനയുള്ള സംഭാഷണങ്ങൾ ബബിൾ ആക്കുക"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"മുൻഗണനയുള്ള സംഭാഷണങ്ങൾ പുൾ-ഡൗൺ ഷെയ്‌ഡിന്റെ മുകളിൽ കാണിക്കുന്നു. നിങ്ങൾക്ക് അവയെ ബബ്ൾ ആയി സജ്ജീകരിക്കാനും \'ശല്യപ്പെടുത്തരുത്\' ഓപ്ഷൻ തടസ്സപ്പെടുത്താനുമാവും."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"മുൻഗണനയുള്ളതും പരിഷ്‌കരിച്ചതുമായ സംഭാഷണങ്ങൾ ഇവിടെ ദൃശ്യമാവും"</string>
@@ -3653,7 +3693,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\'ശല്യപ്പെടുത്തരുത്\' ആക്‌സസ്"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'ശല്യപ്പെടുത്തരുത്\' അനുവദിക്കുക"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ഇൻസ്റ്റാളുചെയ്‌തവയൊന്നും \'ശല്യപ്പെടുത്തരുത്\' മോഡിൽ പ്രവേശിക്കാൻ അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ആപ്പുകൾ ലോഡ് ചെയ്യുന്നു…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഉപകരണത്തിൽ ഈ ആപ്പിന്‍റെ അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഉപകരണത്തിൽ ഈ വിഭാഗത്തിൽപ്പെട്ട അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"നിങ്ങളുടെ അഭ്യർത്ഥനപ്രകാരം, ഈ ഗ്രൂപ്പിൽപ്പെട്ട അറിയിപ്പുകൾ ഈ ഉപകരണത്തിൽ ദൃശ്യമാകുന്നത് Android ബ്ലോക്ക് ചെയ്യുന്നു"</string>
@@ -3745,11 +3785,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"എല്ലാ സംഭാഷണങ്ങളും"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"മുൻഗണനാ സംഭാഷണങ്ങൾ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ഒന്നും വേണ്ട"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> സംഭാഷണങ്ങൾ</item>
-      <item quantity="one">ഒരു സംഭാഷണം</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ഒന്നും വേണ്ട"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ഒന്നുമില്ല}=1{ഒരു സംഭാഷണം}other{# സംഭാഷണങ്ങൾ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"തടസ്സപ്പെടുത്താൻ കഴിയുന്നത് ആർക്ക്"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"കോളുകൾ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"കോളുകൾ"</string>
@@ -3758,11 +3794,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"അനുവദനീയമായ കോളുകൾക്ക് ശബ്‌ദം വരുന്നുണ്ടെന്ന് ഉറപ്പാക്കാൻ, റിംഗ് ചെയ്യുക എന്നതിലേക്ക് ഉപകരണം സജ്ജീകരിച്ചിട്ടുണ്ടോയെന്ന് പരിശോധിക്കുക"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ എന്നതിനായുള്ള ഇന്‍‌കമിംഗ് കോളുകള്‍ ബ്ലോക്ക് ചെയ്‌തിരിക്കുന്നു. സുഹൃത്തുക്കളേയും കുടുംബാംഗങ്ങളേയും മറ്റ് കോണ്‍‌ടാക്‌റ്റുകളേയും നിങ്ങളിലേക്ക് എത്തിച്ചേരാന്‍ അനുവദിക്കുന്നതിന്‌ ക്രമീകരണങ്ങളിൽ മാറ്റം വരുത്താനാവും."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"നക്ഷത്രചിഹ്നമിട്ട കോൺടാക്‌റ്റുകൾ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">മറ്റ് <xliff:g id="NUM_PEOPLE">%d</xliff:g> പേർ</item>
-      <item quantity="one">മറ്റൊരാൾ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ഒന്നുമില്ല"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ഒന്നുമില്ല}=1{{contact_1}}=2{{contact_1}, {contact_2} എന്നിവർ}=3{{contact_1}, {contact_2}, {contact_3} എന്നിവർ}other{{contact_1}, {contact_2} എന്നിവരും മറ്റ് # പേരും}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(പേരില്ല)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"സന്ദേശങ്ങള്‍"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"സന്ദേശങ്ങൾ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"സന്ദേശങ്ങൾ"</string>
@@ -3771,11 +3804,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ എന്നതിനുള്ള ഇന്‍‌കമിംഗ് സന്ദേശങ്ങൾ ബ്ലോക്ക് ചെയ്‌തിരിക്കുന്നു. സുഹൃത്തുക്കളേയും കുടുംബാംഗങ്ങളേയും മറ്റ് കോണ്‍‌ടാക്‌റ്റുകളേയും നിങ്ങളിലേക്ക് എത്തിച്ചേരാന്‍ അനുവദിക്കുന്നതിന്‌ ക്രമീകരണങ്ങളിൽ മാറ്റം വരുത്താനാവും."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"എല്ലാ സന്ദേശങ്ങളും നിങ്ങൾക്ക് ലഭിക്കും"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"എല്ലാ കോളുകളും നിങ്ങൾക്ക് ലഭിക്കും"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ഒന്നുമില്ല"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> കോൺടാക്റ്റുകൾ</item>
-      <item quantity="one">ഒരു കോൺടാക്റ്റ്</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ഒന്നുമില്ല}=1{ഒരു കോൺടാക്റ്റ്}other{# കോൺ‍ടാക്റ്റുകൾ}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ആർക്കും വിളിക്കാം"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"കോൺടാക്റ്റുകൾ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"നക്ഷത്രചിഹ്നമിട്ട കോൺടാക്‌റ്റുകൾ"</string>
@@ -3813,22 +3842,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"എല്ലാ അറിയിപ്പുകളും"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ചില അറിയിപ്പുകൾ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"തടസ്സപ്പെടുത്തുന്നതിന് ആപ്പുകളെ നിങ്ങൾ അനുവദിക്കുന്നില്ലെങ്കിലും, തിരഞ്ഞെടുത്ത ആളുകൾക്ക് ഇപ്പോഴും നിങ്ങളിലേക്ക് എത്തിച്ചേരാനാകും"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> എന്നിവയ്‌ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> എന്നതിന് തടസ്സപ്പെടുത്താൻ കഴിയും</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> എണ്ണം കൂടി"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ആപ്പിനൊന്നും തടസ്സപ്പെടുത്താൻ കഴിയില്ല}=1{{app_1} എന്നതിന് തടസ്സപ്പെടുത്താൻ കഴിയും}=2{{app_1}, {app_2} എന്നിവയ്ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും}=3{{app_1}, {app_2}, {app_3} എന്നിവയ്ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും}other{{app_1}, {app_2} എന്നിവയ്ക്കും മറ്റ് # എണ്ണത്തിനും തടസ്സപ്പെടുത്താൻ കഴിയും}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ആപ്പുകൾ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"എല്ലാ അറിയിപ്പുകളും"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ചില അറിയിപ്പുകൾ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"തടസ്സപ്പെടുത്താൻ കഴിയുന്ന അറിയിപ്പുകൾ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"എല്ലാ അറിയിപ്പുകളും അനുവദിക്കുക"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> എന്നിവയ്‌ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> എന്നതിന് തടസ്സപ്പെടുത്താൻ കഴിയും</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ഒന്നിനും തടസ്സപ്പെടുത്താൻ കഴിയില്ല"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> എണ്ണം കൂടി"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ഒന്നിനും തടസ്സപ്പെടുത്താൻ കഴിയില്ല}=1{{sound_category_1} എന്നതിന് തടസ്സപ്പെടുത്താൻ കഴിയും}=2{{sound_category_1}, {sound_category_2} എന്നിവയ്ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും}=3{{sound_category_1}, {sound_category_2}, {sound_category_3} എന്നിവയ്ക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും}other{{sound_category_1}, {sound_category_2} എന്നിവയ്ക്കും മറ്റ് # എണ്ണത്തിനും തടസ്സപ്പെടുത്താൻ കഴിയും}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ഒന്നിനും തടസ്സപ്പെടുത്താൻ കഴിയില്ല"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ഒരാൾക്കും തടസ്സപ്പെടുത്താൻ കഴിയില്ല"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"ചില ആളുകൾക്ക് തടസ്സപ്പെടുത്താൻ കഴിയും"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"എല്ലാ ആളുകൾക്കും തടസ്സപ്പെടുത്താൻ കഴിയും"</string>
@@ -3874,8 +3895,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ഓണാണ്"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"ഓഫാണ്"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"ആപ്പ് പിൻ ചെയ്യൽ"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"അൺപിൻ ചെയ്യുന്നത് വരെ നിലവിലെ ആപ്പ് കാണുന്ന വിധത്തിൽ നിലനിർത്താൻ ആപ്പ് പിൻ ചെയ്യൽ നിങ്ങളെ അനുവദിക്കുന്നു. ഉദാഹരണത്തിന്, ഒരു നിർദ്ദിഷ്‌ട ഗെയിം കളിക്കാൻ വിശ്വസ്‌ത സുഹൃത്തിനെ അനുവദിക്കുന്നതിന് ഈ ഫീച്ചർ ഉപയോഗിക്കാം. \n\nആപ്പ് പിൻ ചെയ്യുമ്പോൾ, പിൻ ചെയ്‌ത ആപ്പ് മറ്റ് ആപ്പുകൾ തുറക്കുകയും വ്യക്‌തിപരമായ ഡാറ്റ ആക്‌സസ് ചെയ്യുകയും ചെയ്‌തേക്കാം. \n\nആപ്പ് പിൻ ചെയ്യൽ ഉപയോഗിക്കാൻ: 	\n1.	ആപ്പ് പിൻ ചെയ്യൽ ഓണാക്കുക 	\n2.	അവലോകനം തുറക്കുക 	\n3.	സ്ക്രീനിന്റെ മുകളിലുള്ള ആപ്പ് ഐക്കണിൽ ടാപ്പ് ചെയ്യുക, തുടർന്ന് \'പിൻ\' ടാപ്പ് ചെയ്യുക"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"അൺപിൻ ചെയ്യുന്നത് വരെ നിലവിലെ ആപ്പ് കാണുന്ന വിധത്തിൽ നിലനിർത്താൻ ആപ്പ് പിൻ ചെയ്യൽ നിങ്ങളെ അനുവദിക്കുന്നു. ഉദാഹരണത്തിന്, ഒരു നിർദ്ദിഷ്‌ട ഗെയിം കളിക്കാൻ വിശ്വസ്‌ത സുഹൃത്തിനെ അനുവദിക്കുന്നതിന് ഈ ഫീച്ചർ ഉപയോഗിക്കാം. \n\nആപ്പ് പിൻ ചെയ്യുമ്പോൾ, പിൻ ചെയ്‌ത ആപ്പ് മറ്റ് ആപ്പുകൾ തുറക്കുകയും വ്യക്‌തിപരമായ ഡാറ്റ ആക്‌സസ് ചെയ്യുകയും ചെയ്‌തേക്കാം. \n\nനിങ്ങളുടെ ഉപകരണം മറ്റൊരാളുമായി സുരക്ഷിതമായി പങ്കിടണമെന്നുണ്ടെങ്കിൽ, പകരം ഒരു അതിഥി ഉപയോക്താവ് ഓപ്ഷൻ ഉപയോഗിക്കാൻ ശ്രമിക്കുക. \n\nആപ്പ് പിൻ ചെയ്യൽ ഉപയോഗിക്കാൻ: 	\n1.	ആപ്പ് പിൻ ചെയ്യൽ ഓണാക്കുക 	\n2.	അവലോകനം തുറക്കുക 	\n3.	സ്ക്രീനിന്റെ മുകളിലുള്ള ആപ്പ് ഐക്കണിൽ ടാപ്പ് ചെയ്യുക, തുടർന്ന് \'പിൻ ചെയ്യുക\' ടാപ്പ് ചെയ്യുക"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"അൺപിൻ ചെയ്യുന്നത് വരെ നിലവിലെ ആപ്പ് കാണുന്ന വിധത്തിൽ നിലനിർത്താൻ ആപ്പ് പിൻ ചെയ്യൽ നിങ്ങളെ അനുവദിക്കുന്നു. ഉദാഹരണത്തിന്, ഒരു നിർദ്ദിഷ്‌ട ഗെയിം കളിക്കാൻ വിശ്വസ്‌ത സുഹൃത്തിനെ അനുവദിക്കുന്നതിന് ഈ ഫീച്ചർ ഉപയോഗിക്കാം."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"ആപ്പ് പിൻ ചെയ്തിരിക്കുമ്പോൾ, പിൻ ചെയ്‌ത ആപ്പ് മറ്റ് ആപ്പുകൾ തുറക്കുകയും വ്യക്‌തിപരമായ ഡാറ്റ ആക്‌സസ് ചെയ്യുകയും ചെയ്‌തേക്കാം. \n\nആപ്പ് പിൻ ചെയ്യൽ ഉപയോഗിക്കാൻ: 	\n1.	ആപ്പ് പിൻ ചെയ്യൽ ഓണാക്കുക 	\n2.	അവലോകനം തുറക്കുക 	\n3.	സ്ക്രീനിന്റെ മുകളിലുള്ള ആപ്പ് ഐക്കണിൽ ടാപ്പ് ചെയ്യുക, തുടർന്ന് \'പിൻ\' ടാപ്പ് ചെയ്യുക"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"ആപ്പ് പിൻ ചെയ്തിരിക്കുമ്പോൾ, പിൻ ചെയ്‌ത ആപ്പ് മറ്റ് ആപ്പുകൾ തുറക്കുകയും വ്യക്‌തിപരമായ ഡാറ്റ ആക്‌സസ് ചെയ്യുകയും ചെയ്‌തേക്കാം. \n\nനിങ്ങളുടെ ഉപകരണം മറ്റൊരാളുമായി സുരക്ഷിതമായി പങ്കിടണമെന്നുണ്ടെങ്കിൽ, പകരം ഒരു അതിഥി ഉപയോക്താവ് ഓപ്ഷൻ ഉപയോഗിക്കാൻ ശ്രമിക്കുക. \n\nആപ്പ് പിൻ ചെയ്യൽ ഉപയോഗിക്കാൻ: 	\n1.	ആപ്പ് പിൻ ചെയ്യൽ ഓണാക്കുക 	\n2.	അവലോകനം തുറക്കുക 	\n3.	സ്ക്രീനിന്റെ മുകളിലുള്ള ആപ്പ് ഐക്കണിൽ ടാപ്പ് ചെയ്യുക, തുടർന്ന് \'പിൻ\' ടാപ്പ് ചെയ്യുക"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"ആപ്പ് പിൻ ചെയ്യുമ്പോൾ: \n\n•		വ്യക്തിപരമായ ഡാറ്റ ആക്‌സസ് ചെയ്‌തേക്കാം \n		(ഇമെയിൽ ഉള്ളടക്കവും കോൺടാക്റ്റുകളും പോലുള്ളവ) \n•		പിൻ ചെയ്‌ത ആപ്പ് മറ്റ് ആപ്പുകൾ തുറന്നേക്കാം \n\nനിങ്ങൾക്ക് വിശ്വാസമുള്ള ആളുകൾക്കൊപ്പം മാത്രം ആപ്പ് പിൻ ചെയ്യൽ ഉപയോഗിക്കുക."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"അൺപിന്നിനുമുമ്പ് അൺലോക്ക് പാറ്റേൺ ആവശ്യപ്പെടൂ"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"അൺപിൻ ചെയ്യുംമുമ്പ് പിൻ ചോദിക്കുക"</string>
@@ -3897,6 +3919,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കുന്നതിന് പുറമേ, അത് ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പിൻ ആവശ്യപ്പെടുന്നതിലൂടെ ഈ ഉപകരണം കൂടുതൽ പരിരക്ഷിക്കാനാവും. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, കോളുകളോ സന്ദേശങ്ങളോ അലാറങ്ങൾ ഉൾപ്പെടെയുള്ള അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാവില്ല.\n\nനഷ്‌ടപ്പെട്ട അല്ലെങ്കിൽ മോഷ്‌ടിക്കപ്പെട്ട ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കാൻ പിൻ ആവശ്യമാക്കണോ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കുന്നതിന് പുറമേ, അത് ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പാറ്റേൺ ആവശ്യപ്പെടുന്നതിലൂടെ ഈ ഉപകരണം കൂടുതൽ പരിരക്ഷിക്കാനാവും. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, കോളുകളോ സന്ദേശങ്ങളോ അലാറങ്ങൾ ഉൾപ്പെടെയുള്ള അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാവില്ല.\n\nനഷ്‌ടപ്പെട്ട അല്ലെങ്കിൽ മോഷ്‌ടിക്കപ്പെട്ട ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കാൻ പാറ്റേൺ ആവശ്യമാക്കണോ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ മുഖം ഉപയോഗിക്കുന്നതിന് പുറമേ, അത് ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പാസ്‌വേഡ് ആവശ്യപ്പെടുന്നതിലൂടെ ഈ ഉപകരണം കൂടുതൽ പരിരക്ഷിക്കാനാവും. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, കോളുകളോ സന്ദേശങ്ങളോ അലാറങ്ങൾ ഉൾപ്പെടെയുള്ള അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാവില്ല.\n\nനഷ്‌ടപ്പെട്ട അല്ലെങ്കിൽ മോഷ്‌ടിക്കപ്പെട്ട  ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കാൻ പാസ്‌വേഡ് ആവശ്യമാക്കണോ?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ ബയോമെട്രിക്‌സ് ഉപയോഗിക്കുന്നതിന് പുറമെ, ഈ ഉപകരണം ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പിൻ ആവശ്യപ്പെടുന്നതിലൂടെ കൂടുതൽ പരിരക്ഷ ഉറപ്പാക്കാം. ഉപകരണം ആരംഭിക്കുന്നത് വരെ, അലാറങ്ങൾ ഉൾപ്പടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിൽ ലഭ്യമാകില്ല.\n\nനഷ്‌ടപ്പെട്ടതോ മോഷ്‌ടിക്കപ്പെട്ടതോ ആയ ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പിൻ നിർബന്ധമാക്കണോ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ ബയോമെട്രിക്‌സ് ഉപയോഗിക്കുന്നതിന് പുറമെ, ഈ ഉപകരണം ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പാറ്റേൺ ആവശ്യപ്പെടുന്നതിലൂടെ കൂടുതൽ പരിരക്ഷ ഉറപ്പാക്കാം. ഉപകരണം ആരംഭിക്കുന്നത് വരെ, അലാറങ്ങൾ ഉൾപ്പടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിൽ ലഭ്യമാകില്ല.\n\nനഷ്‌ടപ്പെട്ടതോ മോഷ്‌ടിക്കപ്പെട്ടതോ ആയ ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പാറ്റേൺ നിർബന്ധമാക്കണോ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ഉപകരണം അൺലോക്ക് ചെയ്യാൻ നിങ്ങളുടെ ബയോമെട്രിക്‌സ് ഉപയോഗിക്കുന്നതിന് പുറമെ, ഈ ഉപകരണം ആരംഭിക്കുന്നതിന് മുമ്പ് നിങ്ങളുടെ പാസ്‌വേഡ് ആവശ്യപ്പെടുന്നതിലൂടെ കൂടുതൽ പരിരക്ഷ ഉറപ്പാക്കാം. ഉപകരണം ആരംഭിക്കുന്നത് വരെ, അലാറങ്ങൾ ഉൾപ്പടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിൽ ലഭ്യമാകില്ല.\n\nനഷ്‌ടപ്പെട്ടതോ മോഷ്‌ടിക്കപ്പെട്ടതോ ആയ ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. ഉപകരണം ആരംഭിക്കുന്നതിന് പാസ്‌വേഡ് നിർബന്ധമാക്കണോ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"അതെ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ഇല്ല"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"നിയന്ത്രിതം"</string>
@@ -4072,7 +4097,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB നിയന്ത്രിക്കുന്നത്"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"കണക്റ്റ് ചെയ്‌തിരിക്കുന്ന ഉപകരണം"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ഈ ഉപകരണം"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"സ്വിച്ച് ചെയ്യുന്നു..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"മാറുന്നു…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"സ്വിച്ച് ചെയ്യാനായില്ല"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ഈ ഉപകരണം ചാർജ് ചെയ്യൽ"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"കണക്‌റ്റ് ചെയ്‌ത ഉപകരണം ചാർജ് ചെയ്യുന്നു"</string>
@@ -4266,6 +4291,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"മൊബൈൽ ഡാറ്റ ഉപയോഗം"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"ആപ്പ് ഡാറ്റാ ഉപയോഗം"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"വൈഫൈ ഡാറ്റാ ഉപയോഗം"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"കാരിയർ ഇതര ഡാറ്റാ ഉപയോഗം"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ഇതർനെറ്റ് ഡാറ്റാ ഉപയോഗം"</string>
     <string name="wifi" msgid="2932584495223243842">"വൈഫൈ"</string>
     <string name="ethernet" msgid="4665162609974492983">"ഇതർനെറ്റ്"</string>
@@ -4284,6 +4310,7 @@
       <item quantity="one">ഒരു നിയന്ത്രണം</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ഉപകരണം കണക്കാക്കുന്നതിൽ നിന്നും വ്യത്യസ്തമായിട്ടായിരിക്കാം സേവനദാതാക്കള്‍ കണക്കാക്കുന്നത്"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"കാരിയർ നെറ്റ്‌വർക്കുകൾ ഉപയോഗിക്കുന്ന ഡാറ്റ ഒഴികെയുള്ളവ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ഉപയോഗിച്ചു"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ഡാറ്റാ മുന്നറിയിപ്പ് സജ്ജീകരിക്കുക"</string>
     <string name="data_warning" msgid="2925054658166062884">"ഡാറ്റാ മുന്നറിയിപ്പ്"</string>
@@ -4319,7 +4346,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"വിശദാംശങ്ങൾ കാണുക"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ഡാറ്റാ സേവർ"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"നിയന്ത്രണമില്ലാത്ത ഡാറ്റ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"പശ്ചാത്തല ഡാറ്റ ഓഫാക്കി"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"പശ്ചാത്തല ഡാറ്റ ഓഫാക്കി"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ഓൺ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ഓഫ്"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ഡാറ്റാ സേവർ ഉപയോഗിക്കുക"</string>
@@ -4342,7 +4369,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ഉപകരണം ലോക്കുചെയ്തിരിക്കുകയാണെങ്കിൽ അറിയിപ്പുകൾക്ക് മറുപടികളോ മറ്റ് ടെക്സ്റ്റുകളോ ടൈപ്പുചെയ്യുന്നത് തടയുക"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ഡിഫോൾട്ട് സ്പെൽ ചെക്കർ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"സ്പെൽ ചെക്കർ തിരഞ്ഞെടുക്കുക"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"സ്പെൽ ചെക്കര്‍ ഉപയോഗിക്കുക"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"സ്പെൽ ചെക്കർ ഉപയോഗിക്കുക"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"തിരഞ്ഞെടുത്തില്ല"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ഒന്നുമില്ല)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4459,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"സ്റ്റോറേജ് ഇടം സൃഷ്ടിക്കുന്നതിന്, ബാക്കപ്പെടുത്ത ഫോട്ടോകളും വീഡിയോകളും നിങ്ങളുടെ ഉപകരണത്തിൽ നിന്ന് സ്റ്റോറേജ് മാനേജർ നീക്കംചെയ്യുന്നു."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ഫോട്ടോകളും വീഡിയോകളും നീക്കംചെയ്യുക"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"സ്റ്റോറേജ് മാനേജർ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"സ്‌റ്റോറേജ് മാനേജർ ഉപയോഗിക്കുക"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"സ്‌റ്റോറേജ് മാനേജർ ഉപയോഗിക്കുക"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"സ്വയമേവ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"മാനുവൽ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ഇപ്പോൾ ഇടം സൃഷ്ടിക്കുക"</string>
@@ -4470,6 +4497,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ഫോൺ പരിശോധിക്കുന്നതിന്, ഡബിൾ ടാപ്പ് ചെയ്യുക"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ടാബ്‌ലെറ്റ് പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ഉപകരണം പരിശോധിക്കുന്നതിന്, രണ്ടുതവണ ടാപ്പുചെയ്യുക"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"അറിയിപ്പുകൾ കാണാൻ സ്വൈപ്പ് ചെയ്യുക"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"അറിയിപ്പുകൾ കാണാൻ സ്ക്രീനിന്റെ താഴത്തെ അരികിൽ നിന്ന് താഴേക്ക് സ്വൈപ്പ് ചെയ്യുക"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ഒറ്റക്കൈ മോഡ്"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ഒറ്റക്കൈ മോഡ് ഉപയോഗിക്കുക"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ആപ്പുകൾ മാറുമ്പോൾ ഒറ്റക്കൈ മോഡിൽ നിന്ന് പുറത്ത് കടക്കുക"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ടൈംഔട്ട്"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 സെക്കൻഡ്"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 സെക്കൻഡ്"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 സെക്കൻഡ്"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"റീച്ചബിളിറ്റി"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"സമയവും അറിയിപ്പുകളും മറ്റ് വിവരങ്ങളും പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ സ്ക്രീനിൽ രണ്ട് തവണ ടാപ്പ് ചെയ്യുക."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"പരിശോധിക്കാൻ ഫോണെടുക്കുക"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"പരിശോധിക്കുന്നതിന് ടാബ്‌ലെറ്റ് എടുത്തുയർത്തുക"</string>
@@ -4482,6 +4519,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ടാബ്‌ലെറ്റ് പരിശോധിക്കാൻ, ടാപ്പ് ചെയ്യുക"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ഉപകരണം പരിശോധിക്കാൻ, ടാപ്പ് ചെയ്യുക"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"സമയവും അറിയിപ്പുകളും മറ്റ് വിവരങ്ങളും പരിശോധിക്കാൻ, നിങ്ങളുടെ സ്ക്രീനിൽ ടാപ്പ് ചെയ്യുക."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"അടിയന്തര SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"അടിയന്തര SOS ഉപയോഗിക്കുക"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> മാനേജ് ചെയ്യുന്നത്"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"പവർ ബട്ടൺ വേഗത്തിൽ 5 പ്രാവശ്യമോ അതിലധികമോ അമർത്തുന്നതിലൂടെ പ്രവർത്തനങ്ങൾ ആരംഭിക്കുക"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"കൗണ്ട്ഡൗൺ അലാറം പ്ലേ ചെയ്യുക"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"സഹായത്തിന് അറിയിപ്പ് നൽകുന്നതിന് മുമ്പ് ഉച്ചത്തിലുള്ള ശബ്‌ദം പ്ലേ ചെയ്യുക"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"സഹായത്തിന് വിളിക്കുക"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"സഹായത്തിന് വിളിക്കാനുള്ള നമ്പർ"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. മാറ്റാൻ ടാപ്പ് ചെയ്യുക"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"നിങ്ങൾ അടിയന്തരമല്ലാത്ത ഒരു നമ്പർ നൽകിയാൽ:\n • അടിയന്തര SOS ഉപയോഗിക്കാൻ നിങ്ങളുടെ ഉപകരണം അൺലോക്ക് ചെയ്‌തിരിക്കണം\n • നിങ്ങളുടെ കോളിന് മറുപടി ലഭിച്ചേക്കില്ല"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"അറിയിപ്പുകൾക്ക് ഫിംഗർപ്രിന്റ് സ്വൈപ്പ് ചെയ്യുക"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ഫിംഗർപ്രിന്റ് സ്വൈപ്പ്"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"അറിയിപ്പുകൾ പരിശോധിക്കാൻ ഫോണിന്‍റെ പിൻവശത്തുള്ള ഫിംഗർപ്രിന്റ് സെൻസറിൽ താഴേക്ക് സ്വൈപ്പ് ചെയ്യുക."</string>
@@ -4607,6 +4654,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"കാണാനാവുന്ന പരമാവധി ഡാറ്റാസെറ്റുകൾ"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ഡിഫോൾട്ട് മൂല്യങ്ങളിലേക്ക് പുനഃക്രമീകരിക്കുക"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"സ്വമേധയാ പൂരിപ്പിക്കുന്ന ഡെവലപ്പർ ഓപ്‌ഷനുകൾ പുനഃക്രമീകരിച്ചു"</string>
+    <string name="location_category" msgid="3496759112306219062">"ലൊക്കേഷൻ"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"സ്‌റ്റാറ്റസ് ബാർ ലൊക്കേഷൻ ഇൻഡിക്കേറ്റർ"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"നെറ്റ്‌വർക്കും കണക്റ്റിവിറ്റിയും ഉൾപ്പെടെ, എല്ലാ ലൊക്കേഷനുകൾക്കും കാണിക്കുക"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"പൂർണ്ണ GNSS അളവുകൾ നടപ്പിലാക്കുക"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"നോ ഡ്യൂട്ടി സൈക്ലിംഗ് ഉപയോഗിച്ച് മുഴുവൻ GNSS കോൺസ്‌റ്റലേഷനുകളും ആവൃത്തികളും ട്രാക്ക് ചെയ്യൂ"</string>
     <string name="device_theme" msgid="5027604586494772471">"ഉപകരണത്തിന്റെ തീം"</string>
     <string name="default_theme" msgid="4815428567082263639">"ഡിഫോൾട്ട്"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"നെറ്റ്‌വർക്കിന്‍റെ പേര്"</string>
@@ -4623,8 +4675,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"ഫോക്കസ് ചെയ്‌ത നിലയിൽ തുടരാൻ, അറിയിപ്പുകൾ താൽക്കാലികമായി നിർത്തുക"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ഫീച്ചർ ലഭ്യമല്ല"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"നിങ്ങളുടെ ഫോണിൻ്റെ വേഗത കുറയ്‌ക്കുന്നതിനാൽ ഈ ഫീച്ചർ ഓഫാക്കി"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"പൂർണ്ണ GNSS അളവുകൾ നടപ്പിലാക്കുക"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"നോ ഡ്യൂട്ടി സൈക്ലിംഗ് ഉപയോഗിച്ച് മുഴുവൻ GNSS കോൺസ്‌റ്റലേഷനുകളും ആവൃത്തികളും ട്രാക്ക് ചെയ്യൂ"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"എപ്പോഴും ക്രാഷ് ഡയലോഗ് കാണിക്കുക"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"ആപ്പ് ക്രാഷാകുമ്പോഴെല്ലാം ഡയലോഗ് കാണിക്കുക"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE പ്രവർത്തനക്ഷമമാക്കിയ ആപ്പ് തിരഞ്ഞെടുക്കുക"</string>
@@ -4636,7 +4686,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"എല്ലാ ആപ്പുകൾക്കും പ്രവർത്തനക്ഷമമാക്കുക"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ഗ്രാഫിക്‌സ് ഡ്രൈവർ തിരഞ്ഞെടുക്കുക"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ഡിഫോൾട്ട്"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ഗെയിം ഡ്രൈവർ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ഗെയിം ഡ്രൈവർ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ഡെവലപ്പർ ഡ്രൈവർ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"സിസ്‌റ്റം ഗ്രാഫിക്‌സ് ഡ്രൈവർ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4742,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"ഓണാണ് (മ്യൂട്ട് ചെയ്യുക)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ഓഫാണ്"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"നെറ്റ്‌വർക്ക് വിശദാംശങ്ങൾ"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"നിങ്ങളുടെ ഫോണിലെ അപ്ലിക്കേഷനുകൾക്ക് നിങ്ങളുടെ ഉപകരണത്തിന്റെ പേര് ദൃശ്യമാണ്. വൈഫൈ ഹോട്ട്‌സ്‌പോട്ട് സജ്ജീകരിക്കുമ്പോഴോ Bluetooth ഉപകരണങ്ങളുമായി കണക്‌റ്റ് ചെയ്യുമ്പോഴോ, ഇത് മറ്റ് ആളുകൾക്കും കാണാനായേക്കും."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"ഫോണിലെ ആപ്പുകൾക്ക് നിങ്ങളുടെ ഉപകരണത്തിന്റെ പേര് ദൃശ്യമാണ്. Bluetooth ഉപകരണങ്ങളിലേക്കോ വൈഫൈ നെറ്റ്‌വർക്കിലേക്കോ കണക്റ്റ് ചെയ്യുമ്പോഴോ ഒരു വൈഫൈ ഹോട്ട്സ്പോട്ട് സജ്ജീകരിക്കുമ്പോഴോ ഇത് മറ്റ് ആളുകൾക്കും കാണാനായേക്കും."</string>
     <string name="devices_title" msgid="649715719278562515">"ഉപകരണങ്ങൾ"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"എല്ലാ ക്രമീകരണവും"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"നിർദ്ദേശങ്ങൾ"</string>
@@ -4705,6 +4755,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"നെറ്റ്‌വർക്കുകൾ കണ്ടെത്താനായില്ല. വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(നിരോധിക്കപ്പെട്ടത്)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"സിം കാർഡില്ല"</string>
+    <string name="sim_card" msgid="6381158752066377709">"സിം"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"സിം ഇല്ല"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ഒന്നുമില്ല"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"കണക്റ്റ് ചെയ്യാൻ സിം ആവശ്യമാണ്"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"കണക്റ്റ് ചെയ്യാൻ <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> സിം ആവശ്യമാണ്"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"മുൻഗണന നൽകുന്ന നെറ്റ്‌വർക്ക് മോഡ്: WCDMA-യ്ക്ക് മുൻഗണന"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"മുൻഗണന നൽകുന്ന നെറ്റ്‌വർക്ക് മോഡ്: GSM മാത്രം"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"മുൻഗണന നൽകുന്ന നെറ്റ്‌വർക്ക് മോഡ്: WCDMA മാത്രം"</string>
@@ -4758,6 +4813,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"മൊബൈൽ ഡാറ്റ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"മൊബൈൽ നെറ്റ്‌വർക്ക് ഉപയോഗിച്ച് ഡാറ്റ ആക്‌സസ് ചെയ്യുക"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"പരിധിയിൽ വരുമ്പോൾ ഫോൺ ഈ സേവനദാതാവിലേക്ക് സ്വയമേവ മാറും"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"സിം കാർഡ് ലഭ്യമല്ല"</string>
     <string name="calls_preference" msgid="2166481296066890129">"കോൾ മുൻഗണന"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS മുൻഗണന"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"എപ്പോഴും ചോദിക്കുക"</string>
@@ -4818,6 +4874,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> എന്നതിലേക്ക് കണക്‌റ്റ് ചെയ്‌തിരിക്കുമ്പോൾ ലഭ്യമല്ല"</string>
     <string name="see_more" msgid="7499355691042812723">"കൂടുതൽ കാണുക"</string>
     <string name="see_less" msgid="2642392725363552793">"കുറച്ച് കാണുക"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ഓണാക്കണോ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM ഓണാക്കണോ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറണോ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM കാർഡ് ഉപയോഗിച്ച് മാറണോ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ഒരു സമയത്ത് ഒരു SIM മാത്രമേ സജീവമായിരിക്കൂ.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറുന്നത് നിങ്ങളുടെ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> സേവനം റദ്ദാക്കില്ല."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ഡൗൺലോഡ് ചെയ്‌ത ഒരു SIM മാത്രമേ ഒരു സമയത്ത് സജീവമായിരിക്കൂ.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറുന്നത് നിങ്ങളുടെ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> സേവനം റദ്ദാക്കില്ല."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ഒരു സമയത്ത് ഒരു SIM മാത്രമേ സജീവമായിരിക്കൂ.\n\nമാറുന്നത് നിങ്ങളുടെ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> സേവനം റദ്ദാക്കില്ല."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറുക"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"നെറ്റ്‌വർക്കിലേക്ക് കണക്‌റ്റ് ചെയ്യുന്നു…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> എന്നതിലേക്ക് മാറുന്നു"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"കാരിയറെ മാറ്റാനാകുന്നില്ല"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ഒരു പിശക് കാരണം കാരിയറെ മാറ്റാനാകുന്നില്ല."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ഓഫാക്കണോ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM ഓഫാക്കണോ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"സിം ഓഫാക്കുന്നു<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"സേവനദാതാവിനെ പ്രവർത്തനരഹിതമാക്കാനാകില്ല"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"എന്തോ കുഴപ്പം സംഭവിച്ചതിനാൽ നിങ്ങളുടെ സേവനദാതാവിനെ പ്രവർത്തനരഹിതമാക്കാനായില്ല."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"രണ്ട് SIM-കളും ഉപയോഗിക്കണോ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ഈ ഉപകരണത്തിൽ ഒരേസമയം സജീവമായ രണ്ട് SIM-കൾ ആകാം. ഒരു സമയത്ത് ഒരു SIM മാത്രം ഉപയോഗിക്കുന്നത് തുടരാൻ, \"വേണ്ട\" ടാപ്പ് ചെയ്യുക."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യണോ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ആരംഭിക്കാൻ, നിങ്ങളുടെ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യുക. തുടർന്ന് നിങ്ങൾക്ക് മറ്റൊരു SIM ചേർക്കാം."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"തുടരുക"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"റീസ്‌റ്റാർട്ട് ചെയ്യുക"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"വേണ്ട"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"മാറുക"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM സജീവമാക്കാനാകില്ല"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM നീക്കം ചെയ്‌ത് വീണ്ടും ഇടുക. പ്രശ്‌നം തുടരുകയാണെങ്കിൽ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യുക."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM വീണ്ടും ഓണാക്കാൻ ശ്രമിക്കുക. പ്രശ്‌നം തുടരുകയാണെങ്കിൽ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്യുക."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"നെറ്റ്‌വർക്ക് സജീവമാക്കൽ"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> സജീവമാണ്"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"സിം ക്രമീകരണം അപ്ഡേറ്റ് ചെയ്യാൻ ടാപ്പ് ചെയ്യുക"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"സിം കാർഡ്"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"ഡൗൺലോഡ് ചെയ്‌ത ഈ സിം മായ്ക്കണോ?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ഈ സിം മായ്ക്കുന്നതിലൂടെ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> സേവനം ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കം ചെയ്യപ്പെടും.\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> സേവനം റദ്ദാക്കില്ല."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"മായ്ക്കുക"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"സിം മായ്ക്കുന്നു…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"സിം മായ്ക്കാനാകില്ല"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"ഒരു പിശക് കാരണം ഈ സിം മായ്ക്കാനാവില്ല.\n\nനിങ്ങളുടെ ഉപകരണം റീസ്‌റ്റാർട്ട് ചെയ്‌ത് വീണ്ടും ശ്രമിക്കുക."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ഉപകരണത്തിലേക്ക് കണക്റ്റ് ചെയ്യുക"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"നിങ്ങളുടെ ഉപകരണത്തിലേക്ക് കണക്‌റ്റ് ചെയ്യുന്നതിന് താൽക്കാലിക വെെഫെെ നെറ്റ്‌വർക്ക് ഉപയോഗിക്കാൻ <xliff:g id="APPNAME">%1$s</xliff:g> ആപ്പ് താൽപ്പര്യപ്പെടുന്നു"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ഉപകരണങ്ങളൊന്നും കണ്ടെത്തിയില്ല. ഉപകരണം ഓണാണെന്നും കണക്റ്റ് ചെയ്യാൻ ലഭ്യമാണെന്നും ഉറപ്പാക്കുക."</string>
@@ -4889,6 +4983,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"എമർജൻസി കോളുകൾ"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"വൈഫൈ കോളിംഗ് വഴി എമർജൻസി കോളുകൾ നിങ്ങളുടെ സേവനദാതാവ് പിന്തുണയ്ക്കുന്നില്ല.\nഎമർജൻസി കോൾ വിളിക്കാൻ ഉപകരണം ഒരു സെല്ലുലാർ നെറ്റ്‍വര്‍ക്കിലേക്ക് സ്വയമേവ സ്വിച്ചുചെയ്യുന്നു.\nസെല്ലുലാർ കവറേജ് ഉപയോഗിച്ച് മാത്രമേ എമർജൻസി കോളുകൾ സാധ്യമാകൂ."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"നിലവാരം മെച്ചപ്പെടുത്താൻ കോളുകൾക്കായി വൈഫൈ ഉപയോഗിക്കുക"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"ക്രോസ് സിം കോളിംഗ്"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"ഈ സിം കാർഡ് വഴി വിളിക്കാനും SMS-കൾ അയയ്ക്കാനും മറ്റൊരു സിം കാർഡിനെ അനുവദിക്കുക."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"ക്രോസ് സിം കോളിംഗ്"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"ഇൻകമിംഗ് MMS സന്ദേശം"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS സന്ദേശം അയയ്ക്കാനാവില്ല"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"മൊബൈൽ ഡാറ്റ ഓഫായിരിക്കുമ്പോൾ <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>-ൽ നിന്ന് MMS സന്ദേശം അയയ്ക്കുന്നത് അനുവദിക്കാൻ ടാപ്പ് ചെയ്യുക"</string>
@@ -4940,10 +5037,50 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Settings ആപ്പിൽ സ്‌ക്രീൻ ഓവർലേ അനുവദിക്കുക"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Settings സ്‌ക്രീനുകളിൽ ഓവർലേ ചെയ്യാൻ മറ്റ് ആപ്പുകൾക്ക് മുകളിൽ കാണിക്കാനാകുന്ന ആപ്പുകളെ അനുവദിക്കുക"</string>
     <string name="media_controls_title" msgid="403271085636252597">"മീഡിയ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"മീഡിയ സെഷൻ അവസാനിക്കുമ്പോൾ പ്ലേയർ മറയ്‌ക്കുക"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"വികസിപ്പിച്ച ദ്രുത ക്രമീകരണ പാനലിൽ നിന്ന് സെഷൻ പുനരാരംഭിക്കാൻ പ്ലേയർ നിങ്ങളെ അനുവദിക്കുന്നു."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ദ്രുത ക്രമീകരണത്തിൽ മീഡിയ പ്ലേയർ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"പ്ലേബാക്ക് എളുപ്പത്തിൽ പുനരാരംഭിക്കാൻ വിപുലീകരിച്ച കാലയളവിലേക്ക് മീഡിയ പ്ലേയർ കാണിക്കുക"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"പ്ലേയർ മറയ്‌ക്കുക"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"പ്ലേയർ കാണിക്കുക"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"പ്ലേയറുകളൊന്നും ലഭ്യമല്ല"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"അനുവദിച്ച ആപ്പുകൾ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"മീഡിയ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ഓണാകും"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ഓണാണ്"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"ഓഫാണ്"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"ഇന്റർനെറ്റ്"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"സിമ്മുകൾ"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"വിമാന-സുരക്ഷിത നെറ്റ്‌വർക്കുകൾ"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"വിമാന-സുരക്ഷിത നെറ്റ്‌വർക്കുകൾ കണ്ടെത്തി കണക്റ്റ് ചെയ്യുക"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"വിമാനം, വിമാന-സുരക്ഷിതം"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"കോളുകളും &amp; SMS-കളും"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"വൈഫൈ കോളിംഗ്"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"വൈഫൈ പോലുള്ള കാരിയർ ഇതര നെറ്റ്‌വർക്കുകളിലൂടെ കോളുകൾ ചെയ്യുക, സ്വീകരിക്കുക"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"ചില വൈ-ഫൈ നെറ്റ്‌വർക്കുകൾ പോലുള്ള കാരിയർ ഇതര നെറ്റ്‌വർക്കുകളിലൂടെ കോളുകൾ വിളിക്കാനും സ്വീകരിക്കാനും വൈഫൈ കോളിംഗ് നിങ്ങളെ അനുവദിക്കുന്നു."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"കോളുകൾ"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"തിരഞ്ഞെടുത്തത്"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"തിരഞ്ഞെടുത്ത കോളുകൾ"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"തിരഞ്ഞെടുത്ത SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ലഭ്യമല്ല"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"സിം ഇല്ല"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"മുൻഗണനകൾ"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"പൊതു നെറ്റ്‌വർക്കിലേക്ക് കണക്റ്റ് ചെയ്യുക"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"നെറ്റ്‌വർക്ക് കണക്ഷൻ, ഇന്‍റര്‍നെറ്റ്, വയർലെസ്, ഡാറ്റ, വൈഫൈ, വൈഫൈ, വൈഫൈ, സെല്ലുലാർ, മൊബൈൽ, സെൽ കാരിയർ, 4g, 3g, 2g, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"വിമാന-സുരക്ഷിത നെറ്റ്‌വർക്കുകൾ കാണുക"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ഫ്ലൈറ്റ് മോഡ് ഓഫാക്കുക"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ഉറക്ക സമയ മോഡ് ഓണായതിനാൽ ലഭ്യമല്ല"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"അറിയിപ്പുകളുടെ പ്രാധാന്യം റീസെറ്റ് ചെയ്യുന്നത് പൂർത്തിയാക്കി."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"ആപ്പുകൾ"</string>
+    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <skip />
 </resources>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 9010b17..bd639cf 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -275,7 +275,7 @@
     <item msgid="317746827951691657">"toast харуулах"</item>
     <item msgid="5679422988212309779">"төслийн медиа"</item>
     <item msgid="6454031639780101439">"VPN идэвхжүүлэх"</item>
-    <item msgid="2441327072846850561">"ханын зураг бичих"</item>
+    <item msgid="2441327072846850561">"дэлгэцийн зураг бичих"</item>
     <item msgid="2162456889277589861">"бүтцийг өөрчлөх"</item>
     <item msgid="4644645617399271070">"дэлгэцийн агшинг өөрчлөх"</item>
     <item msgid="8321845997769724385">"гар утасны төлөвийг унших"</item>
@@ -342,7 +342,7 @@
     <item msgid="4000577305179914546">"toast харуулах"</item>
     <item msgid="8660207174515570558">"Төслийн медиа"</item>
     <item msgid="3904996949561946108">"VPN идэвхжүүлэх"</item>
-    <item msgid="504052124101832515">"Ханын зураг бичих"</item>
+    <item msgid="504052124101832515">"Дэлгэцийн зураг бичих"</item>
     <item msgid="1657182386933187909">"Бүтцийг өөрчлөх"</item>
     <item msgid="437655393941385937">"Дэлгэцийн агшинг өөрчлөх"</item>
     <item msgid="973363520315356844">"Гар утасны төлөвийг унших"</item>
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Дундаж"</item>
     <item msgid="6740026006576843477">"Урт"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Богино"</item>
+    <item msgid="7397961711906421599">"Дунд"</item>
+    <item msgid="4079132024502041928">"Урт"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Үндсэн"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобал"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Зөвхөн TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобал"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 351f01e..ffae982 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Огноо &amp; цаг"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Огноо болон цагийг тохируулах"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Огноо, цаг, цагийн бүс &amp; форматуудыг тохируулах"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Сүлжээнээс олгосон цагийг ашиглах"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Сүлжээнээс олгосон цагийн бүсийг ашиглах"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Цагийг автоматаар тохируулах"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Цагийн бүсийг автоматаар тохируулах"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Бүс нутгийн өгөгдмөлийг ашиглах"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 цагийн формат"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 цагийн формат ашиглах"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Дэлгэц түгжигдэхэд профайлын мэдээллийг харуулах"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Бүртгэл"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Байршил"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Байршлыг ашиглах"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Байршлыг ашиглах"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Унтраалттай"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Асаалттай үед <xliff:g id="COUNT_1">%1$d</xliff:g> апп байршилд хандах боломжтой</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Дэлгэцийн түгжээ, царайгаар тайлах"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Дэлгэцийн түгжээ, хурууны хээ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Дэлгэцийн түгжээ"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Утасныхаа түгжээг царай, хурууны хээгээр аюулгүй тайлаарай"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Та мөн аппуудад нэвтэрч, төлбөрөө баталгаажуулах боломжтой"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Түгжээ тайлахыг дараахаар тохируулаарай:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Царайгаар тайлах"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Утасны түгжээгээ тайлахыг хурдан болгоорой"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Хурууны хээ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Утасныхаа түгжээг халаасандаа тайлж цаг хэмнээрэй"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Алгасах"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Дараах"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Царай нэмсэн"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Царайгаар тайлах онцлогийг тохируулах"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Царайгаар тайлах"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Баталгаажуулахын тулд царайгаа ашиглах"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Эхлэх"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Хандалтын царайгаар тайлах онцлог унтарсан тохиолдолд тохиргооны зарим алхам TalkBack-тай хэвийн ажиллахгүй байж болзошгүй."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Буцах"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Тохируулгыг үргэлжлүүлэх"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Хүртээмжийн тохируулгыг ашиглах"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Царайгаар тайлах онцлогийг аппуудад ашиглах үед баталгаажуулах алхмыг тогтмол шаардах"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Царайны өгөгдлийг устгах уу?"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Царайгаар тайлах онцлогийг тохируулах"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Төхөөрөмжийнхөө түгжээг тайлах, аппуудад нэвтрэх болон төлбөр баталгаажуулахад царайгаар тайлах онцлогийг ашиглана уу.\n\nДараахыг анхаарна уу:\nТа утас руу санамсаргүй харснаар түгжээг нь тайлах боломжтой.\n\nХэн нэгэн таны утсыг таны нүүр лүү харуулсан тохиолдолд түгжээг нь тайлах боломжтой.\n\nТаны төрсөн ах, эгч, дүү эсвэл ихэр зэрэг тантай маш адилхан харагддаг хүн таны утасны түгжээг тайлах боломжтой."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Төхөөрөмжийнхөө түгжээг тайлах, аппуудад нэвтрэх болон төлбөр баталгаажуулахын тулд царайгаар тайлах онцлогийг ашиглана уу.\n\nДараахыг анхаарна уу:\nТа утас руугаа санаандгүй харснаар түгжээг нь тайлах боломжтой.\n\nХэрэв хэн нэгэн таны утсыг нүүрний тань урд барьвал та нүдээ аньсан байсан ч түгжээг нь тайлах боломжтой.\n\nТаны төрсөн ах, эгч, дүү зэрэг тантай адилхан харагддаг хэн нэгэн таны утасны түгжээг тайлах боломжтой."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Төхөөрөмжийнхөө түгжээг тайлах, аппуудад нэвтрэх болон төлбөр баталгаажуулахдаа царайгаар тайлах онцлогийг ашиглана уу."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Дараахыг анхаарна уу:\nТа утас руугаа санамсаргүй харснаар түгжээг нь тайлах боломжтой.\n\nХэрэв хэн нэгэн таны утсыг нүүрний тань урд барьвал түгжээг нь тайлах боломжтой.\n\nТаны төрсөн ах, эгч, дүү зэрэг тантай адилхан царайтай хэн нэгэн таны утасны түгжээг тайлах боломжтой."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Дараахыг анхаарна уу:\nТа утас руугаа санамсаргүй харснаар түгжээг нь тайлах боломжтой.\n\nХэрэв хэн нэгэн таны утсыг нүүрний тань урд барьвал та нүдээ аньсан байсан ч түгжээг нь тайлах боломжтой.\n\nТаны төрсөн ах, эгч, дүү зэрэг тантай адилхан царайтай хэн нэгэн таны утасны түгжээг тайлах боломжтой."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Царайны өгөгдлийг устгах уу?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Царайгаар тайлах онцлогийн ашигласан царайны өгөгдлийг аюулгүйгээр, бүрмөсөн устгана. Та үүнийг хассаны дараа утасныхаа түгжээг тайлах, аппуудад нэвтрэх болон төлбөр баталгаажуулахын тулд ПИН, хээ эсвэл нууц үгээ оруулах шаардлагатай болно."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Утасныхаа түгжээг тайлахын тулд царайгаар тайлах онцлог ашиглах"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Утасныхаа түгжээг тайлах, худалдан авалт зөвшөөрөхийн тулд хурууны хээгээ ашиглана уу.\n\nСанамж: Та хурууны хээгээр энэ төхөөрөмжийн түгжээг тайлах боломжгүй. Дэлгэрэнгүй мэдээлэл авахын тулд байгууллагынхаа админтай холбогдоно уу."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Утасныхаа түгжээг тайлах, худалдан авалт зөвшөөрөхөд хурууны хээгээ ашиглана уу.\n\nСанамж: Таны хурууны хээ нь хүчтэй зурган түгжээ эсвэл PIN-с хамгаалалт муутай байж болзошгүй."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Цуцлах"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Үгүй баярлалаа"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Үргэлжлүүлэх"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Алгасах"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Дараагийн"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Та таблетаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн танд царайгаар тайлах онцлогийг тохируулахад дэлгэцийн түгжээний сонголт шаардлагатай. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Та төхөөрөмжөө дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн танд царайгаар тайлах онцлогийг тохируулахад дэлгэцийн түгжээний сонголт шаардлагатай. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Та утсаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Мөн танд царайгаар тайлах онцлогийг тохируулахад дэлгэцийн түгжээний сонголт шаардлагатай. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Та таблетаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг гээсэн эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Танд мөн биометрыг тохируулах дэлгэцийн түгжээний сонголт хэрэгтэй. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Та төхөөрөмжөө дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг гээсэн эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Танд мөн биометрыг тохируулах дэлгэцийн түгжээний сонголт хэрэгтэй. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Та утсаа дэлгэцийн түгжээний сонголтоор хамгаалснаар үүнийг алга болгосон эсвэл хулгайд алдсан тохиолдолд хэн нэгэн ашиглах боломжгүй болно. Танд мөн биометрыг тохируулах дэлгэцийн түгжээний сонголт хэрэгтэй. Буцахын тулд Цуцлах сонголтыг товшино уу."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ПИН-н тохируулгыг алгасах уу?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Нууц үгийн тохируулгыг алгасах уу?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Хээний тохируулгыг алгасах уу?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ таблетийг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ төхөөрөмжийг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Төхөөрөмжийн хамгаалалтын функцийг идэвхжүүлж хэн нэгэн таны зөвшөөрөлгүйгээр энэ утсыг ашиглахаас сэргийлнэ үү. Өөрийн ашиглахыг хүссэн дэлгэцийн түгжээг сонгоно уу."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Дэлгэц түгжих нөөц аргачлалаа сонгох"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Дэлгэцийн нөөц түгжээний аргачлалаа сонгох"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Дэлгэц түгжих нөөц аргачлалаа сонгох"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Дэлгэцийн түгжээний сонголт"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Дэлгэцийн түгжээний сонголт"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Дэлгэцийн түгжээ"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Царайгаар тайлах + Нууц үг"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Царайгаар тайлах онцлоггүйгээр үргэлжлүүлэх"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Та царайгаа ашиглан утасныхаа түгжээг тайлах боломжтой. Аюулгүй байдлын үүднээс энэ сонголтод нөөц дэлгэцийн түгжээ шаардлагатай."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометр + Хээ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометр + ПИН"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометр + Нууц үг"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Биометргүйгээр үргэлжлүүлэх"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Та биометрээ ашиглан утасныхаа түгжээг тайлах боломжтой. Аюулгүй байдлын үүднээс энэ сонголтод дэлгэцийн нөөц түгжээ шаардлагатай."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Админ, шифрлэлтийн бодлого, эсвэл итгэмжлэлийн сангаас цуцалсан"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Байхгүй"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Шудрах"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g>-с цөөн цифртэй байх ёстой</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Төхөөрөмжийн админ саяхны ПИН-г ашиглахыг зөвшөөрдөггүй"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Таны IT админ түгээмэл ПИН-г блоклосон байна. Өөр ПИН оруулна уу."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Үүнд хүчингүй тэмдэгт агуулах боломжгүй"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Хамгийн багадаа нэг үсэг агуулах шаардлагатай"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Хамгийн багадаа нэг тоо агуулах шаардлагатай"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Хамгийн багадаа тоон бус 1 тэмдэгт агуулах ёстой</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Төхөөрөмжийн админ саяхны нууц үгийг ашиглахыг зөвшөөрдөггүй"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Таны IT админ түгээмэл нууц үгийг блоклосон байна. Өөр нууц үг оруулна уу."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Цифр өсөх, буурах, давхцахыг зөвшөөрдөггүй"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Баталгаажуулах"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Цуцлах"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi-г асаах"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi-г ашиглах"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi ашиглах"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi тохиргоо"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Утасгүй хандалтын цэгүүдийг тохируулах &amp; удирдах"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>”-д холбогдохын тулд доорх QR кодыг голлуулна уу"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR кодыг скан хийж, Wi‑Fi-д нэгдэнэ үү"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi-г хуваалцах"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>”-д холбогдохын тулд энэ QR кодыг скан хийж, нууц үгийг хуваалцана уу"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>”-д нэгдэхийн тулд энэ QR кодыг өөр төхөөрөмжөөр скан хийнэ үү"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>”-д холбогдохын тулд энэ QR кодыг скан хийнэ үү"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Дахин оролдоно уу. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжийн үйлдвэрлэгчтэй холбогдоно уу"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Алдаа гарлаа"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi-н нууц үг: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Сүлжээний цэгийн нууц үг: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Автомат холболт"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Утсыг энэ сүлжээний ойролцоо байх үед автоматаар холбогдохыг зөвшөөрөх"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Таблетыг энэ сүлжээний ойролцоо байх үед автоматаар холбогдохыг зөвшөөрөх"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Хүрээнд байгаа үед энэ сүлжээнд холбогдохыг зөвшөөрнө үү"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Төхөөрөмж нэмэх"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Энэ сүлжээнд төхөөрөмж нэмэхийн тулд QR код ашиглах"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR код буруу форматтай байна"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Системийн гэрчилгээ ашигла"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"\"Бүү олго\""</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Бүү хүчин төгөлдөр болго"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ямар ч сертификат заагаагүй байна. Таны холболт хувийн биш байх болно."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Сүлжээний нэр хэтэрхий урт байна."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Домэйн зааж өгөх шаардлагатай."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Сертификат шаардлагатай."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Холбогдох"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi-г асаасан"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-д холбогдсон"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-д холбогдож байна"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Холбогдож байна…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Сүлжээнд холбогдож чадсангүй"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Сүлжээ хүрээнд алга"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Төхөөрөмжийн MAC хаяг"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Санамсаргүй сонгосон MAC хаяг"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Санамсаргүй байдлаар эмхэлсэн MAC хаягууд (сүүлд ашигласан)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP хаяг"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Сүлжээний мэдээлэл"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet маск"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 хаяг"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Хадгалсан сүлжээ"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Захиалга"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Бусад сүлжээ"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP тохиргоо"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Энэ хэрэглэгчид Wi-Fi дэлгэрэнгүй тохиргоо боломжгүй байна"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Хадгалах"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Зөв гарцын хаяг оруулна уу."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Зөв DNS хаяг оруулна уу."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 болон 32 хооронд урттай сүлжээний угтварыг бичнэ үү."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (Хувийн DNS-с дараагүй бол)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (Хувийн DNS-с дараагүй бол)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Гарц"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Сүлжээний угтварын урт"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Шууд"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Апп агуулга хуваалцаж байна. Интернет холболтыг хуваалцахын тулд сүлжээний цэгийг унтрааж дахин асаана уу"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Тохируулсан нууц үг алга"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Сүлжээний цэгийн нэр"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-г асааж байна..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-г асааж байна…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Бусад төхөөрөмж <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>-д холбогдох боломжтой"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Сүлжээний цэгийн нууц үг"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Мессеж"</string>
@@ -1159,10 +1177,10 @@
     <string name="color_mode_option_automatic" msgid="2281217686509980870">"Дасан зохицох"</string>
     <string name="color_mode_summary_natural" msgid="8298840714001791628">"Зөвхөн оновчтой өнгийг ашиглах"</string>
     <string name="color_mode_summary_automatic" msgid="8157885594041700275">"Тод болон оновчтой өнгө хооронд тохируулах"</string>
-    <string name="accelerometer_summary_on" product="tablet" msgid="6413384391658481700">"Таблетыг эргүүлбэл харагдацыг автоматаар эргүүлэх"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="7117139542131700779">"Утсыг эргүүлбэл харагдацыг автоматаар эргүүлэх"</string>
-    <string name="accelerometer_summary_off" product="tablet" msgid="3747370091309939684">"Таблетыг эргүүлбэл харагдацыг автоматаар эргүүлэх"</string>
-    <string name="accelerometer_summary_off" product="default" msgid="4451125241783158763">"Утсыг эргүүлбэл харагдацыг автоматаар эргүүлэх"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="6413384391658481700">"Таблетыг эргүүлбэл харагдцыг автоматаар эргүүлэх"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="7117139542131700779">"Утсыг эргүүлбэл харагдцыг автоматаар эргүүлэх"</string>
+    <string name="accelerometer_summary_off" product="tablet" msgid="3747370091309939684">"Таблетыг эргүүлбэл харагдцыг автоматаар эргүүлэх"</string>
+    <string name="accelerometer_summary_off" product="default" msgid="4451125241783158763">"Утсыг эргүүлбэл харагдцыг автоматаар эргүүлэх"</string>
     <string name="brightness" msgid="6216871641021779698">"Гэрэлтүүлгийн түвшин"</string>
     <string name="brightness_title" msgid="5457874893085305155">"Тодролт"</string>
     <string name="brightness_summary" msgid="6309641759293018049">"Дэлгэцийн тодролыг тохируулах"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Зарим контентын сэргээх хурдыг автоматаар 60-с 90 Гц болгож өсгөнө. Батарей ашиглалтыг нэмэгдүүлнэ."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Гц-н хүчээр сэргээх хурд"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Хүрэлтийн хариу үйлдэл болон анимацийн чанарыг сайжруулахад зориулсан хамгийн өндөр сэргээх үнэлгээ юм. Батарей ашиглалтыг нэмэгдүүлнэ."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Соргог дэлгэц"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Асаалттай / Хэрэв та дэлгэц рүү харж байвал унтрахгүй"</string>
@@ -1252,15 +1270,15 @@
     <string name="screen_timeout" msgid="7709947617767439410">"Дэлгэцийн завсарлага"</string>
     <string name="screen_timeout_title" msgid="785134393520893049">"Дэлгэц унтарна"</string>
     <string name="screen_timeout_summary" msgid="5558778019594643427">"Идвэхгүй <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> болсны дараа"</string>
-    <string name="wallpaper_settings_title" msgid="5635129851136006383">"Ханын зураг"</string>
-    <string name="style_and_wallpaper_settings_title" msgid="7580575814098427579">"Загвар ба ханын зураг"</string>
+    <string name="wallpaper_settings_title" msgid="5635129851136006383">"Дэлгэцийн зураг"</string>
+    <string name="style_and_wallpaper_settings_title" msgid="7580575814098427579">"Загвар ба дэлгэцийн зураг"</string>
     <string name="wallpaper_settings_summary_default" msgid="7569803705735001813">"Өгөгдмөл"</string>
     <string name="wallpaper_settings_summary_custom" msgid="3174561317688848729">"Захиалгат"</string>
-    <string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Ханын зураг солих"</string>
+    <string name="wallpaper_suggestion_title" msgid="3812842717939877330">"Дэлгэцийн зураг солих"</string>
     <string name="wallpaper_suggestion_summary" msgid="9077061486716754784">"Дэлгэцээ өөрчлөх"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="8445963841717633149">"Ханын зураг сонгох"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="8445963841717633149">"Дэлгэцийн зураг сонгох"</string>
     <string name="style_suggestion_title" msgid="1213747484782364775">"Утсаа өөрчлөх"</string>
-    <string name="style_suggestion_summary" msgid="4271131877800968159">"Өөр загвар, ханын зураг болон бусад зүйлийг туршиж үзнэ үү"</string>
+    <string name="style_suggestion_summary" msgid="4271131877800968159">"Өөр загвар, дэлгэцийн зураг болон бусад зүйлийг туршиж үзнэ үү"</string>
     <string name="screensaver_settings_title" msgid="3588535639672365395">"Дэлгэц амраагч"</string>
     <string name="screensaver_settings_summary_either_long" msgid="371949139331896271">"Цэнэглэх эсвэл суурилуулах үед"</string>
     <string name="screensaver_settings_summary_either_short" msgid="2126139984738506920">"Аль аль нь"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Дэлгэц бараан үед энэ нь шинэ мэдэгдэл ирэхэд асдаг"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Цаг, мэдээллийг үргэлж үзүүлэх"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Сайжруулсан батарей ашиглалт"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Тод текст"</string>
     <string name="title_font_size" msgid="570613010306330622">"Фонтын хэмжээ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Текстийг том эсвэл жижиг болгох"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM картын түгжээний тохиргоо"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Андройд хувилбар"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-н аюулгүй байдлын шинэчлэлт"</string>
     <string name="model_info" msgid="8997566254717810904">"Загвар"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Загвар: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Загвар, техник хангамж"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Техник хангамжийн хувилбар"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Төхөөрөмжийн ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN устгах"</string>
     <string name="menu_new" msgid="6571230342655509006">"Шинэ APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Хадгалах"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Цуцлах"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Цуцлах"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Нэр оруулах талбар хоосон байж болохгүй."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN хоосон байж болохгүй."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Аппуудыг шинэчлэх боломжтой"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi, мобайл &amp; Bluetooth-г шинэчлэх"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Энэ нь дараах бүх сүлжээний тохиргоог шинэчилнэ: \n\n"<li>"Wi‑Fi"</li>\n<li>"мобайл дата"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Устгах"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Татаж авсан СИМ-үүдийг устгах"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Солих СИМ-г татаж авахын тулд оператор компанитайгаа холбогдоно уу. Энэ нь мобайл үйлчилгээний ямар ч багцыг цуцлахгүй."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Энэ нь мобайл үйлчилгээний аливаа төлөвлөгөөг цуцлахгүй. Орлуулах SIM татахын тулд оператор компанитайгаа холбогдоно уу."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Дахин тохируулах"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Сүлжээний бүх тохиргоог шинэчлэх үү? Та энэ үйлдлийг буцаах боломжгүй."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Сүлжээний бүх тохиргоог шинэчилж, татсан СИМ-үүдийг устгах уу? Та энэ үйлдлийг буцаах боломжгүй."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Сүлжээний тохиргоог дахин тохируулсан байна"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"СИМ-үүдийг устгаж чадсангүй"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Татаж авсан СИМ-үүдийг алдааны улмаас устгах боломжгүй байна.\n\nТөхөөрөмжөө дахин эхлүүлээд дахин оролдоно уу."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Бүх өгөгдлийг устгах (үйлдвэрийн тохиргоогоор шинэчлэх)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Бүх өгөгдлийг устгах (үйлдвэрийн тохиргоо руу шинэчлэх)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Энэ нь таны таблетын "<b>"дотоор сангийн"</b>" бүх өгөгдлийг устгах бөгөөд үүнд:\n\n"<li>"Таны Google Бүртгэл"</li>\n<li>"Систем, аппын өгөгдөл болон тохиргоо"</li>\n<li>"Татсан аппууд"</li>" багтана"</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Энэ нь таны утасны "<b>"дотоод сангийн"</b>" бүх өгөгдлийг устгах бөгөөд үүнд:\n\n"<li>"Таны Google Бүртгэл"</li>\n<li>"Систем, аппын өгөгдөл болон тохиргоо"</li>\n<li>"Татсан аппууд"</li>" багтана"</string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Та одоогоор дараах бүртгэлүүдээр нэвтэрсэн байна:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Энэ төхөөрөмж дээр өөр хэрэглэгчид байна.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Хөгжим"</li>\n<li>"Зураг"</li>\n<li>"Бусад хэрэглэгчийн өгөгдөл"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-үүд"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Энэ нь таны мобайл үйлчилгээний багцыг цуцлахгүй."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"USB санг"</b>" арилгах шаардлагатай."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"SD картыг"</b>" арилгах шаардлагатай."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Бүх өгөгдлийг устгах (үйлдвэрийн тохиргоонд шинэчлэх)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Бүх өгөгдлийг устгах (үйлдвэрийн тохиргоонд шинэчлэх)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Энэ нь таны таблетын "<b>"дотоод сангийн"</b>" бүх өгөгдлийг устгах бөгөөд үүнд:\n\n"<li>"Таны Google Бүртгэл"</li>\n<li>"Систем, аппын өгөгдөл болон тохиргоо"</li>\n<li>"Татсан аппууд"</li>" багтана"</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Энэ нь таны утасны "<b>"дотоод сангийн"</b>" бүх өгөгдлийг устгах бөгөөд үүнд:\n\n"<li>"Таны Google Бүртгэл"</li>\n<li>"Систем, аппын өгөгдөл болон тохиргоо"</li>\n<li>"Татсан аппууд"</li>" багтана"</string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Та одоогоор дараах бүртгэлд нэвтэрсэн байна:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Энэ төхөөрөмж дээр өөр хэрэглэгч байна.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Хөгжим"</li>\n<li>"Зураг"</li>\n<li>"Бусад хэрэглэгчийн өгөгдөл"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-үүд"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Энэ нь таны мобайл үйлчилгээний багцыг цуцлахгүй."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"USB санг"</b>" устгах хэрэгтэй."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Хөгжим, зураг болон бусад хэрэглэгчийн өгөгдлийг цэвэрлэхийн тулд "<b>"SD картыг"</b>" устгах хэрэгтэй."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB санг арилгах"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD картыг арилгах"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Дотоод USB сан дээрх хөгжим буюу зураг гэх мэт бүх өгөгдлийг арилгах"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD карт дээрх хөгжим, зураг гэх мэт бүх өгөгдлүүдийг арчих"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Бүх өгөгдлийг устгах"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Бүх өгөгдлийг устгах"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Таны бүх хувийн мэдээлэл болон татсан аппыг устгана. Та энэ үйлдлийг буцаах боломжгүй."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Таны татаж авсан аппууд &amp; СИМ-үүд зэрэг бүх хувийн мэдээллийг устгана. Та энэ үйлдлийг буцаах боломжгүй."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Бүгдийг устгах"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Системийг Цэвэрлэх үйлчилгээг ашиглах боломжгүй байгаа учраас дахин шинэчлэх үйлдлийг гүйцэтгээгүй."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Бүх өгөгдлийг устгах уу?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Энэ хэрэглэгчийн хувьд үйлдвэрээс гарсан төлөв рүү шинэчлэх боломжгүй"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Арилгаж байна"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Түр хүлээнэ үү..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Бүх өгөгдлийг устгах"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Бүх өгөгдлийг устгах"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Таны бүх хувийн мэдээлэл болон татсан аппыг устгана. Та энэ үйлдлийг болих боломжгүй."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Таны татаж авсан аппууд болон СИМ-үүд зэрэг бүх хувийн мэдээллийг устгана. Та энэ үйлдлийг болих боломжгүй."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Бүх өгөгдлийг устгах уу?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Энэ хэрэглэгчийн хувьд үйлдвэрийн тохиргоонд шинэчлэх боломжгүй"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Устгаж байна"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Түр хүлээнэ үү…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Дуудлагын тохиргоо"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Дуут шуудан, дуудлага дамжуулах, дуудлага хүлээлгэх, залгагчий ID тохируулах"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB модем болгох"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>-с олон төхөөрөмжид модем болгох боломжгүй."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> модем болгохыг болиулах болно."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet модем болгох"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Утасны интернет холболтыг USB Ethernet-р хуваалцах"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Утасны интернет холболтыг Ethernet-р хуваалцах"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Мобайл дата холболтоороо бусад төхөөрөмжид интернет холболт цацахын тулд сүлжээний цэг, модем болгохыг ашиглана уу. Апп ойролцоох төхөөрөмжид агуулга хуваалцахын тулд сүлжээний цэг үүсгэх боломжтой."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Wi-Fi эсвэл мобайл дата холболтоороо бусад төхөөрөмжид интернэт цацахын тулд сүлжээний цэг болон модем болгохыг ашиглана уу. Түүнчлэн, аппууд ойролцоох төхөөрөмжүүдтэй контент хуваалцахын тулд сүлжээний цэг үүсгэх боломжтой."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Тусламж"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth скан"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Апп, үйлчилгээнд Bluetooth унтраалттай үед ч ойролцоох төхөөрөмжийг хүссэн үедээ скан хийхийг зөвшөөрнө үү. Үүнийг байршилд суурилсан онцлог, үйлчилгээнүүдийг сайжруулахад ашиглаж магадгүй."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Ажилд зориулсан байршлын үйлчилгээ"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Байршлын цагийн бүс илрүүлэх горим"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Байршлын цагийн бүс илрүүлэх горим"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Төхөөрөмжийн байршлыг одоогийн цагийн бүсийг илрүүлэхэд ашиглахыг зөвшөөрнө. Wi-Fi скан зэрэг байршлын бусад тохиргоо нь цагийн бүс илрүүлэх горимын оновчлолд нөлөөлөх боломжтой."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Асаалттай"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Унтраалттай"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Цагийн бүсийг автоматаар илрүүлэх горимыг идэвхгүй болгосон"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Байршлын цагийн бүс илрүүлэх горимыг идэвхгүй болгосон"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Байршлын цаг бүс илрүүлэх горимыг дэмждэггүй"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Байршлын цагийн бүс илрүүлэх горимыг өөрчлөхийг зөвшөөрөхгүй"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi &amp; мобайл сүлжээний байршил"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Апп-уудад Google-н байршлын үйлчилгээ ашиглан таны байршлыг хурдан олохыг зөвшөөрөх. Нэргүй байршлын мэдээлэл цуглуулагдаж Google рүү илгээгдэх болно."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Wi-Fi-р тодорхойлогдсон байршил"</string>
@@ -1747,7 +1773,7 @@
     <string name="module_license_title" msgid="8705484239826702828">"Google Play-н систем шинэчлэлтийн лиценз"</string>
     <string name="terms_title" msgid="2071742973672326073">"Ерөнхий нөхцлүүд"</string>
     <string name="webview_license_title" msgid="5832692241345780517">"Системийн WebView-ийн лиценз"</string>
-    <string name="wallpaper_attributions" msgid="3080339190260272255">"Ханын зураг"</string>
+    <string name="wallpaper_attributions" msgid="3080339190260272255">"Дэлгэцийн зураг"</string>
     <string name="wallpaper_attributions_values" msgid="987277439026021925">"Сансрын зураг нийлүүлэгчид: \n © 2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="1682978148920788484">"Гар ажиллагаатай"</string>
     <string name="settings_manual_activity_unavailable" msgid="2514549851682321576">"Гар ажиллагааг ачаалах явцад алдаа гарлаа."</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Царайгаар тайлахыг ашиглахын тулд нууц үг тохируулна уу"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Царайгаар тайлахыг ашиглахын тулд хээ тохируулна уу"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Царайгаар тайлахыг ашиглахын тулд ПИН тохируулна уу"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Биометр ашиглахын тулд нууц үг тохируулаарай"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Биометр ашиглахын тулд хээ тохируулаарай"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Биометр ашиглахын тулд ПИН тохируулаарай"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Нууц үгээ мартсан уу?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Хээгээ мартсан уу?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ПИН-ээ мартсан уу?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Тайлбарын сонголт"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Томруулах"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Томруулалтын хэсэг"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Томруулалтыг идэвхжүүлэх"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Дэлгэцийг томруулах үедээ хэрэглэхийг хүсэж байгаа томруулалтын хэсг(үүд)ээ сонгоно уу"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Бүтэн дэлгэц"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Дэлгэцийн нэг хэсэг"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Бүтэн дэлгэц; дэлгэцийн нэг хэсэг"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Дэлгэцийг бүхэлд нь томруулах"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Дэлгэцийн нэг хэсгийг томруулах"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Хандалтын товчлуур луу сэлгэх үү?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Дэлгэцийн хэсгийг томруулахын тулд гурав товшилтыг ашигласнаар бичих болон бусад үйлдлийг саатуулна.\n\nТа томруулахын тулд хандалтын товчлуур ашиглах сонголт руу сэлгэхийг хүсэж байна уу?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Хандалтын товчлуур луу сэлгэх"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Томруулахын тулд үргэлжлүүлэн гурав товших"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Томруулах тохиргоо"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Гурван удаа товшиж томруулах"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Товчлолоор томруулах"</string>
@@ -2134,7 +2166,7 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="2207048420669939150">"Томруулахын тулд 3 удаа дар"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="4885018322430052037">"Томруулахын тулд товчлуурыг товшино уу"</string>
     <string name="accessibility_screen_magnification_summary" msgid="2023126829553044999">"Контентыг илүү тодорхой үзүүлэхийн тулд дэлгэц дээр хурдан томруулна уу.&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Томруулахын тулд:&lt;/b&gt;&lt;br/&gt; 1. Томруулах онцлогийг эхлүүлэхийн тулд товчлол ашиглана уу&lt;br/&gt; 2. Дэлгэцийг товшино уу&lt;br/&gt; 3. Дэлгэц дээр шилжихийн тулд 2 хуруугаар чирнэ үү&lt;br/&gt; 4. Томруулалтыг тохируулахын тулд 2 хуруугаар чимхэнэ үү&lt;br/&gt; 5. Томруулах онцлогийг зогсоохын тулд товчлол ашиглана уу&lt;br/&gt;&lt;br/&gt; &lt;b&gt;Түр хугацаанд томруулахын тулд:&lt;/b&gt;&lt;br/&gt; 1. Томруулах онцлогийг эхлүүлэхийн тулд товчлол ашиглана уу&lt;br/&gt; 2. Дэлгэцийн аль нэг хэсэгт удаан дарна уу&lt;br/&gt; 3. Дэлгэц дээр шилжихийн тулд хуруугаар чирнэ үү&lt;br/&gt; 4. Томруулах онцлогийг зогсоохын тулд хуруугаа өргөнө үү"</string>
-    <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Томруулах сонголт асаалттай үед та дэлгэцээ томруулж болно.\n\n"<b>"Томруулахын тулд "</b>" томруулах сонголтыг эхлүүлж, дэлгэцийн аль нэг хэсгийг товшино уу.\n"<ul><li>"Гүйлгэхийн тулд 2 эсвэл түүнээс дээш хуруугаараа чирнэ үү"</li>\n<li>"Томруулах хэмжээг тохируулахын тулд 2 эсвэл түүнээс дээш хуруугаараа чимхэнэ үү"</li></ul>\n\n<b>"Түр хугацаанд томруулахын тулд "</b>" томруулах сонголтыг эхлүүлээд, дэлгэцийн аль нэг хэсэг дээр удаан дарна уу.\n"<ul><li>"Дэлгэцийн эргэн тойронд очихын тулд чирнэ үү"</li>\n<li>"Жижигрүүлэхийн тулд хуруугаа авна уу"</li></ul>\n\n"Та гар эсвэл навигацийн самбарт томруулах боломжгүй."</string>
+    <string name="accessibility_screen_magnification_navbar_summary" msgid="807985499898802296">"Томруулах сонголт асаалттай үед та дэлгэцээ томруулж болно.\n\n"<b>"Томруулахын тулд "</b>" томруулах сонголтыг эхлүүлж, дэлгэцийн аль нэг хэсгийг товшино уу.\n"<ul><li>"Гүйлгэхийн тулд 2 эсвэл түүнээс дээш хуруугаараа чирнэ үү"</li>\n<li>"Томруулах хэмжээг тохируулахын тулд 2 эсвэл түүнээс дээш хуруугаараа чимхэнэ үү"</li></ul>\n\n<b>"Түр хугацаанд томруулахын тулд "</b>" томруулах сонголтыг эхлүүлээд, дэлгэцийн аль нэг хэсэг дээр удаан дарна уу.\n"<ul><li>"Дэлгэцийн эргэн тойронд очихын тулд чирнэ үү"</li>\n<li>"Жижигрүүлэхийн тулд хуруугаа авна уу"</li></ul>\n\n"Та гар эсвэл навигацын самбарт томруулах боломжгүй."</string>
     <string name="accessibility_tutorial_pager" msgid="8461939455728454061">"<xliff:g id="NUM_PAGES">%2$d</xliff:g>-н <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>-р хуудас"</string>
     <string name="accessibility_tutorial_dialog_title_button" msgid="4681164949716215131">"Нээхийн тулд хандалтын товчлуурыг ашиглах"</string>
     <string name="accessibility_tutorial_dialog_title_volume" msgid="494810949830845234">"Нээхийн тулд дууны түвшний түлхүүрүүдийг удаан дар"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Асаах товч дуудлагыг таслана"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Том хулгана заагч"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Анимацийг устгах"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Моно аудио"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Аудиог тоглуулж байхад сувгийг нэгтгэх"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Аудионы түвшин"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Зүүн"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Баруун"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Моно аудио"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Аудиог тоглуулах үед сувгуудыг нэгтгэх"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Аудио баланс"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Зүүн"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Баруун"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Өгөгдмөл"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Мэдэгдлийн чичиргээ"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Хонхны чичиргээ"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Санал хүсэлтэд хүрэх"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-г ашиглах"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-г нээх"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Өнгө тохируулагчийг ашиглах"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Хадмалыг харуулах"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Зөвхөн дэмжсэн аппад зориулсан"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-г ашиглах"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>-г нээх"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Өнгөний засварыг ашиглах"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Хадмалыг харуулах"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Зөвхөн дэмждэг аппад"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Хадмалын хэмжээ болон загвар"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> текстийн хэмжээ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Бусад сонголт"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дьютераномаль"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномаль"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомаль"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Саарал өнгө"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Улаан-ногоон"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Улаан-ногоон"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Цэнхэр-шар"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Арын ашиглалтын хязгаарлалт"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Аппад цаана ажиллах зөвшөөрөл олгоно уу"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Аппыг цаана ачааллахыг зөвшөөрөөгүй"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Дэвсгэрийн хэрэглээг хязгаарлах боломжгүй"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Арын ашиглалтыг хязгаарлах боломжгүй"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Арын үйл ажиллагааг хязгаарлах уу?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Та арын үйл ажиллагааг аппад хязгаарласан тохиолдолд апп буруу ажиллаж болзошгүй"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Энэ аппыг батарейг оновчлохоор тохируулаагүй тул та үүнийг хязгаарлах боломжгүй.\n\nАппыг хязгаарлахын тулд эхлээд батарейны оновчлолыг асаана уу."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Таблетыг ердийнхөөс их хэмжээгээр ашигласан"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Төхөөрөмжийг ердийнхөөс их хэмжээгээр ашигласан"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Батарей ердийн үеийнхээс хурдан дуусаж болзошгүй"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Батарейн барилтыг оновчилж байна"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Батарейг түр хугацаанд хязгаарласан. Нэмэлт мэдээлэл авахын тулд товшино уу."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Таны утсыг ердийн үеийнхээс их хэмжээгээр ашигласан байна. Таны батарей тооцоолж байснаас хурдан дуусаж болзошгүй.\n\nБатарейг хамгийн их ашигласан аппууд:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Таны таблетыг ердийн үеийнхээс их хэмжээгээр ашигласан байна. Таны батарей тооцоолж байснаас хурдан дуусаж болзошгүй.\n\nБатарейг хамгийн их ашигласан аппууд:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Таны төхөөрөмжийг ердийн үеийнхээс их хэмжээгээр ашигласан байна. Таны батарей тооцоолж байснаас хурдан дуусаж болзошгүй.\n\nБатарейг хамгийн их ашигласан аппууд:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d аппыг хязгаарласан</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Таны батарей хэмжигчийг уншихад асуудал гарлаа"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Таны батарей хэмжигчийг уншихад асуудал гарлаа. "<annotation id="url">"Нэмэлт мэдээлэл авахын"</annotation>" тулд товшино уу"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Аппыг зогсоох уу?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> таны утсыг асаалттай байлгаж байгаа тул таны утас батерейг хэвийн түвшинд байлгах боломжгүй байна. \n\nЭнэ асуудлыг шийдвэрлэхийн тулд та аппыг зогсоох боломжтой.\n\nАсуудал үргэлжилсээр байвал та батерейны хэрэглээг сайжруулахын тулд энэ аппыг устгаж болно."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> таны таблетыг асаалттай байлгаж байгаа тул таны таблет батерейг хэвийн түвшинд байлгах боломжгүй байна. \n\nЭнэ асуудлыг шийдвэрлэхийн тулд та аппыг зогсоох боломжтой.\n\nАсуудал үргэлжилсээр байвал та батерейны хэрэглээг сайжруулахын тулд энэ аппыг устгаж болно."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Хуваарь тохируулах"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Батарейн ажиллах хугацааг сунгах"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Цэнэглэсэн үед унтраах"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Батарей хэмнэгч таны утсыг <xliff:g id="PERCENT">%1$s</xliff:g>-тай болох үед унтарна"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Батарей хэмнэгч таны таблетыг <xliff:g id="PERCENT">%1$s</xliff:g>-тай болох үед унтарна"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Батарей хэмнэгч таны төхөөрөмжийг <xliff:g id="PERCENT">%1$s</xliff:g>-тай болох үед унтарна"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Таны утас <xliff:g id="PERCENT">%1$s</xliff:g>-с дээш цэнэглэгдэхэд Батарей хэмнэгч унтарна"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Таны таблет <xliff:g id="PERCENT">%1$s</xliff:g>-с дээш цэнэглэгдэхэд Батарей хэмнэгч унтарна"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Таны төхөөрөмж <xliff:g id="PERCENT">%1$s</xliff:g>-с дээш цэнэглэгдэхэд Батарей хэмнэгч унтарна"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Асаах"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Шинэчлэх"</string>
     <string name="tts_play" msgid="2945513377250757221">"Тоглуулах"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Холболтыг тохируулах"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Таны сүлжээний холболтыг автоматаар удирдан батарейн ажиллах хугацааг уртасгаж, төхөөрөмжийн гүйцэтгэлийг сайжруулна"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Жуухын сан"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Cертификат суулгах"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Сертификатыг сангаас суулгах"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Хэрэглэгчийн итгэмжлэл"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Хадгалсан өгөгдлийг харах, өөрчлөх"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Дэлгэрэнгүй"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Хадгалах сангийн төрөл"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Техник хангамжаар дэмжигдсэн"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Зөвхөн программ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Энэ хэрэглэгчид итгэмжлэл байхгүй байна"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN, апп-д суулгасан"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi-д суулгасан"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Бүү суулга"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Ямар ч тохиолдолд суулгах"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Сертификатыг суулгаагүй"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g>-г энэ төхөөрөмж дээр сертификатууд суулгахыг зөвшөөрөх үү?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Эдгээр сертификат нь таныг доорх аппууд болон URL-уудад таниулна"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Бүү зөвшөөр"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Зөвшөөрөх"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Дэлгэрэнгүй харуулах"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Сертификатын менежментийн апп"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Байхгүй"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Энэ аппаар суулгасан сертификатууд нь таныг доорх аппууд, URL-уудад таниулна"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Хасах"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Яаралтай тусламжийн дуудлагын дохио"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Яаралтай дуудлага хийх үеийн үйлдлийг тохируулах"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Нөөцлөх"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Тохируулаагүй - Ажлын профайл"</string>
     <string name="user_admin" msgid="4024553191395768119">"Админ"</string>
     <string name="user_you" msgid="3070562015202859996">"Та (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Хоч"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Та <xliff:g id="USER_COUNT">%1$d</xliff:g> хүртэлх хэрэглэгч нэмж болно"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Зөвхөн таблетын эзэмшигч л хэрэглэгчдийг удирдаж болно."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Зөвхөн утасны эзэмшигч л хэрэглэгчдийг удирдаж болно."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Tерминалаар тооцоо хийж байна"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Төлбөрийн апп-г тохируулаарай. Зайнаас уншуулах тэмдэг бүхий терминалд утасныхаа ар талыг бариарай."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ойлголоо"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Илүү..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Бусад…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Төлбөрийн өгөгдмөл аппыг тохируулах"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Төлбөрийн өгөгдмөл аппыг шинэчлэх"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Зайнаас уншуулах терминал дээр <xliff:g id="APP">%1$s</xliff:g>-р төлөх"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Буцах"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Дараагийн"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Дуусгах"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Зураг авах"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Зураг сонгох"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Зураг сонгох"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"СИМ карт"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"СИМ карт"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Дуудлагад байнга үүнийг ашиглах"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Датанд ашиглах SIM-г сонгоно уу"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS-н SIM сонгох"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Мэдээллийн SIM-ийг сольж байна, энэ нь нэг минут орчим үргэлжилнэ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Өгөгдлийн SIM-г сэлгэж байна, үүнд хэдэн минут шаардлагатай…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Залгах"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM карт сонгох"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"хэвшил, хуваарь, батарей хэмнэгч, цахилгаан хэмнэгч, батарей, автомат, хувь"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, дэвшилтэт дуудлага, 4g дуудлага"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"хэл нэмэх, хэл нэмэх"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"текстийн хэмжээ"</string>
     <string name="default_sound" msgid="6604374495015245195">"Үндсэн дуу"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Хонх ба мэдэгдлийн дууны түвшин <xliff:g id="PERCENTAGE">%1$s</xliff:g> байна"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Түвшин, чичиргээ, Бүү саад бол"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Дууны чадал"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Шууд тайлбар"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Медиад автоматаар тайлбар нэмэх"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Байхгүй"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> хуваарийг тохируулсан</item>
-      <item quantity="one">1 хуваарийг тохируулсан</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Байхгүй}=1{1 хуваарийг тохируулсан}other{# хуваарийг тохируулсан}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Бүү саад бол"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Зөвхөн чухал хүмүүс болон аппуудаас мэдэгдэл авах"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Саад болох зүйлсийг хязгаарлах"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Зөвхөн чухал зүйлс"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Асаалттай / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Унтраасан / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Унтраасан"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Идэвхтэй"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Тухай бүрд асуух"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Таныг унтраах хүртэл"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> цаг</item>
-      <item quantity="one">1 цаг</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> минут"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>хуваарийг автоматаар асааж болно</item>
-      <item quantity="one">1 хуваарийг автоматаар асааж болно</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 цаг}other{# цаг}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минут}other{# минут}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Унтраалттай}=1{Унтраалттай / 1 хуваарийг автоматаар асааж болно}other{Унтраалттай / # хуваарийг автоматаар асааж болно}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Бүү саад бол горимыг тасалдуулж болох зүйлс"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Хүмүүс"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Аппууд"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Ач холбогдол багатай мэдэгдлүүдийг автоматаар Бага ач холбогдолтой гэж тохируулах"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Орчинтой тохирсон мэдэгдлийн зэрэглэл хийх"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Хамаарлын дагуу мэдэгдлийн зэрэглэлийг автоматаар хийх"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Орчинтой тохирсон мэдэгдлийн санал хүсэлт"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Мэдэгдэлд хийсэн тохируулгыг зааж, системд санал хүсэлт өгөх сонголтыг харуулах"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Мэдэгдлийн чухал байдлыг шинэчлэх"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Хэрэглэгчийн өөрчилсөн чухал байдлын тохиргоог шинэчилж, мэдэгдлийн туслахад хэр чухлаар нь дараалуулахыг зөвшөөрөх"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Санал болгосон үйлдлүүд болон хариу"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Санал болгосон үйлдлүүд болон хариуг автоматаар харуулах"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Саяхны болон түр хойшлуулсан мэдэгдлүүдийг харуулах"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Тэргүүлэх ач холбогдолтой харилцан яриа"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Харилцан ярианы дээд хэсэгт харуулж, хөвөгч бөмбөлөг болгон харуулдаг"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Харилцан ярианы хэсгийн дээд талд харуулдаг"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Бусад харилцан яриа"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Чухал биш харилцан яриа"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Таны өөрчлөлт хийсэн харилцан яриа"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Саяхны харилцан яриа"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Саяхныхыг арилгах"</string>
+    <string name="clear" msgid="5092178335409471100">"Арилгах"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Чухал харилцан яриаг бөмбөлөг болгох"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Чухал харилцан яриаг доош татдаг хураангуй самбарын дээд хэсэгт харуулдаг. Та мөн тэдгээрийг бөмбөлөг болгон тохируулж, Бүү саад бол горимыг тасалдуулж болно."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Чухал болон өөрчилсөн харилцан яриа энд харагдана"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"Бүү саад бол\" хандалт"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Бүү саад бол горимыг зөвшөөрөх"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Суулгасан апп-аас \"Бүү саад бол\" хандалтыг хүссэн апп байхгүй байна."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Апп-уудыг ачаалж байна..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Аппуудыг ачаалж байна…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Андройд таны хүсэлтээр энэ аппын мэдэгдлийг энэ төхөөрөмжид харуулахыг хориглож байна"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Андройд таны хүсэлтээр энэ ангиллын мэдэгдлийг тус төхөөрөмжид харуулахыг хориглож байна"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Андройд таны хүсэлтээр энэ бүлэг мэдэгдлийг энэ төхөөрөмжид харуулахыг хориглож байна"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Бүх харилцан яриа"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Чухал харилцан яриа"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Байхгүй"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> харилцан яриа</item>
-      <item quantity="one">1 харилцан яриа</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Байхгүй"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Байхгүй}=1{1 харилцан яриа}other{# харилцан яриа}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Хэн тасалдуулж болох вэ"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Дуудлага"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Дуудлага"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Зөвшөөрөгдсөн дуудлагууд дуугарч байгааг шалгахын тулд төхөөрөмжийг дуугаргах дээр нь тохируулсан эсэхийг шалгана уу"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-д ирэх дуудлагыг хориглосон. Та найзууд, гэр бүлийнхэн болон бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Одоор тэмдэглэсэн харилцагчид"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">бусад <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">бусад 1</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Байхгүй"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Байхгүй}=1{{contact_1}}=2{{contact_1} болон {contact_2}}=3{{contact_1}, {contact_2} болон {contact_3}}other{{contact_1}, {contact_2} болон бусад #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Нэр байхгүй)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Мессежүүд"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"мессеж"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Мессеж"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’-н ирэх мессежийг хориглосон. Та найзууд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд тохиргоогоо өөрчлөх боломжтой."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Бүх мессеж танд хүрэх боломжтой"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Бүх дуудлага танд хүрэх боломжтой"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Байхгүй"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> харилцагч</item>
-      <item quantity="one">1 харилцагч</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Байхгүй}=1{1 харилцагч}other{# харилцагч}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Дурын хүн"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Харилцагч"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Одоор тэмдэглэсэн харилцагчид"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Бүх мэдэгдэл"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Зарим мэдэгдэл"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Та аппуудад тасалдуулахыг зөвшөөрөөгүй ч сонгосон хүмүүс тантай холбогдох боломжтой хэвээр байна"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> нь тасалдуулах боломжтой</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> нь тасалдуулах боломжтой</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Бусад <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ямар ч апп тасалдуулах боломжгүй}=1{{app_1} нь тасалдуулах боломжтой}=2{{app_1} болон {app_2} нь тасалдуулах боломжтой}=3{{app_1}, {app_2}, болон {app_3} нь тасалдуулах боломжтой}other{{app_1}, {app_2}, болон бусад # нь тасалдуулах боломжтой}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Аппууд"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Бүх мэдэгдэл"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Зарим мэдэгдэл"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Тасалдуулах боломжтой мэдэгдэл"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Бүх мэдэгдлийг зөвшөөрөх"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> нь тасалдуулах боломжтой</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> нь тасалдуулах боломжтой</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ямар ч ая тасалдуулах боломжгүй"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Бусад <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Юу ч тасалдуулах боломжгүй}=1{{sound_category_1} нь тасалдуулах боломжтой}=2{{sound_category_1} болон {sound_category_2} нь тасалдуулах боломжтой}=3{{sound_category_1}, {sound_category_2}, болон {sound_category_3} нь тасалдуулах боломжтой}other{{sound_category_1}, {sound_category_2}, болон бусад # нь тасалдуулах боломжтой}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Юу ч тасалдуулах боломжгүй"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Хэн ч тасалдуулах боломжгүй"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Зарим хүн тасалдуулах боломжтой"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Бүх хүн тасалдуулах боломжтой"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Идэвхтэй"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Идэвхгүй"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Апп бэхлэлт"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Апп бэхлэлт нь одоогийн аппыг бэхлэснийг болиулах хүртэл харагдуулах боломжтой. Энэ онцлогийг итгэдэг найздаа тодорхой тоглоом тоглохыг нь зөвшөөрөх гэх мэтээр ашиглах боломжтой. \n\nАппыг тогтоосон үед тогтоосон апп бусад аппыг нээж, хувийн өгөгдөлд хандах боломжтой байж болзошгүй. \n\nАпп тогтоохыг ашиглахын тулд: 	\n1.	Апп тогтоохыг асаана уу 	\n2.	Тоймыг нээнэ үү 	\n3.	Дэлгэцийн дээд хэсэгт байрлах аппын дүрс тэмдгийг товшиж, дараа нь Тогтоох дээр товшино уу"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Апп бэхлэлт нь үүнийг болиулах хүртэл одоогийн аппыг харагдахаар байлгахыг зөвшөөрдөг. Энэ онцлогийг итгэдэг найздаа тодорхой тоглоом тоглохыг зөвшөөрөх зэргээр ашиглах боломжтой. \n\nАппыг бэхэлсэн үед бэхэлсэн апп бусад аппыг нээх болон хувийн өгөгдлийн хандалт боломжтой байж болзошгүй. \n\nХэрэв та төхөөрөмжийг хэн нэгэнтэй аюулгүйгээр хуваалцахыг хүсвэл оронд нь зочин хэрэглэгчийг ашиглаж үзнэ үү. \n\nАппын бэхлэлтийг ашиглахын тулд: 	\n1.	Аппын бэхлэлтийг асаана уу 	\n2.	Тоймыг нээнэ үү 	\n3.	Дэлгэцийн дээд хэсгийн аппын дүрс тэмдгийг товшиж, дараа нь бэхлэх дээр товшино уу"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Та апп бэхлэх онцлогийг ашигласнаар одоогийн аппыг бэхэлснийг болиулах хүртлээ харагдах байдалд байлгах боломжтой. Энэ онцлогийг итгэдэг найздаа тодорхой тоглоом тоглохыг нь зөвшөөрөх гэх мэтээр ашиглах боломжтой."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Аппыг бэхэлсэн үед бэхэлсэн апп бусад аппыг нээж, хувийн өгөгдөлд хандах боломжтой болж магадгүй. \n\nАпп бэхлэх онцлогийг ашиглахын тулд: 	\n1.	Апп бэхлэх онцлогийг асаана уу 	\n2.	Тоймыг нээнэ үү 	\n3.	Дэлгэцийн дээд хэсэгт байрлах аппын дүрс тэмдгийг товшиж, дараа нь Бэхлэх дээр товшино уу"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Аппыг бэхэлсэн үед бэхэлсэн апп бусад аппыг нээж, хувийн өгөгдөлд хандах боломжтой болж магадгүй. \n\nХэрэв та хэн нэгэнтэй төхөөрөмжөө аюулгүйгээр хуваалцахыг хүсвэл оронд нь зочин хэрэглэгчийг ашиглаж үзнэ үү. \n\nАпп бэхлэх онцлогийг ашиглахын тулд: 	\n1.	Апп бэхлэх онцлогийг асаана уу 	\n2.	Тоймыг нээнэ үү 	\n3.	Дэлгэцийн дээд хэсэгт байрлах аппын дүрс тэмдгийг товшиж, дараа нь Бэхлэх дээр товшино уу"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Аппыг бэхэлсэн үед: \n\n•	 Хувийн өгөгдөлд хандах боломжтой байж болзошгүй \n		(харилцагчид болон имэйлийн контент зэрэг) \n•	 Бэхэлсэн апп бусад аппыг нээж болзошгүй \n\nАпп бэхлэхийг зөвхөн итгэдэг хүмүүстэйгээ ашиглаарай."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Тогтоосныг суллахаас өмнө түгжээ тайлах хээ асуух"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Бэхэлснийг болиулахаасаа өмнө PIN асуух"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө хээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд хээ шаардах уу?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Нэмж дурдахад та царайгаа ашиглаж төхөөрөмжийнхөө түгжээг тайлсан ч цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө ПИН-ээ оруулахыг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө хээгээ оруулахыг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд хээ шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Та төхөөрөмжийнхөө түгжээг тайлахын тулд биометрээ ашиглахаас гадна цаашид энэ төхөөрөмжийг эхлүүлэхээс өмнө нууц үгээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, мессеж, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалахад тусална. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Тийм"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Үгүй"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Хязгаарласан"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-г дараахаар хянасан"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Холбогдсон төхөөрөмж"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Энэ төхөөрөмж"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Сэлгэж байна..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Сэлгэж байна…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Сэлгэж чадсангүй"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Энэ төхөөрөмжийг цэнэглэж байна"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Холбосон төхөөрөмжийг цэнэглэж байна"</string>
@@ -4191,8 +4213,8 @@
     <string name="storage_summary" msgid="5903562203143572768">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> ашигласан - <xliff:g id="FREE_SPACE">%2$s</xliff:g> сул"</string>
     <string name="storage_summary_with_sdcard" msgid="2063780050580228868">"Дотоод сан: <xliff:g id="PERCENTAGE">%1$s</xliff:g>-г ашигласан - <xliff:g id="FREE_SPACE">%2$s</xliff:g> сул"</string>
     <string name="display_summary" msgid="5526061030874717172">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> идэвхгүй байсны дараа унтах"</string>
-    <string name="display_dashboard_summary" msgid="5102247404958535634">"Ханын зураг, идэвхгүй, фонтын хэмжээ"</string>
-    <string name="display_dashboard_summary_with_style" msgid="2792175367835485163">"Загвар, ханын зураг, дэлгэцийн завсарлага, фонтын хэмжээ"</string>
+    <string name="display_dashboard_summary" msgid="5102247404958535634">"Дэлгэцийн зураг, идэвхгүй, фонтын хэмжээ"</string>
+    <string name="display_dashboard_summary_with_style" msgid="2792175367835485163">"Загвар, дэлгэцийн зураг, дэлгэцийн завсарлага, фонтын хэмжээ"</string>
     <string name="display_dashboard_nowallpaper_summary" msgid="6198590533661927162">"Идэвхгүй, фонтын хэмжээ"</string>
     <string name="display_summary_example" msgid="4275121979039344438">"10 минут идэвхгүй байсны дараа унтах"</string>
     <string name="memory_summary" msgid="8221954450951651735">"Ойролцоогоор <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>-н <xliff:g id="USED_MEMORY">%1$s</xliff:g> санах ойг ашигласан"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Мобайл дата ашиглалт"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Аппын дата ашиглалт"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi дата ашиглалт"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Оператор компанийн бус дата ашиглалт"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Этернэт дата хэрэглээ"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Этернэт"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 хязгаарлалт</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Оператор компанийн дата тооцоололт нь төхөөрөмжийн тооцоололтоос өөр байж болно"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Оператор компанийн сүлжээгээр ашигласан өгөгдлийг оруулдаггүй"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ашигласан"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Датаны сануулгыг тохируулах"</string>
     <string name="data_warning" msgid="2925054658166062884">"Дата хэрэглээний сануулга"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Дэлгэрэнгүй үзэх"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Дата хэмнэгч"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Хязгаарлалтгүй дата"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Арын дата унтарсан байна"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Арын дата унтраалттай байна"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Идэвхтэй"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Идэвхгүй"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Дата хэмнэгчийг ашиглах"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Төхөөрөмж түгжээтэй үед хариу бичих, бусад текстийг мэдэгдлээр ирэх эсэхийг тохируулна уу."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Өгөгдмөл алдаа шалгагч"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Алдаа шалгагч сонгох"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Зөв бичгийн алдаа шалгагч ашиглах"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Зөв бичгийн алдаа шалгагчийг ашиглах"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Сонгоогүй"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(байхгүй)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Сангийн багтаамжийг нэмэгдүүлэхийн тулд сангийн менежер нөөцөлсөн зураг, видеог таны төхөөрөмжөөс устгах болно."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Зураг, видео устгах"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Сангийн менежер"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Сангийн менежерийг ашиглах"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Хадгалах сангийн менежерийг ашиглах"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автомат"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Гар ажиллагаатай"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Одоо багтаамжаа нэмэгдүүлнэ үү"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Утсаа шалгахын тулд хоёр товшино уу"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Таблетаа шалгахын тулд хоёр товшино уу"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Төхөөрөмжийг шалгахын тулд хоёр товшино уу"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Мэдэгдлийг харахын тулд шударна уу"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Мэдэгдлээ харуулахын тулд дэлгэцийн доод хэсгээс доош шударна уу"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Нэг гарын горим"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Нэг гарын горимыг ашиглах"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Аппуудыг сэлгэхдээ гарах"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Хугацаа"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунд"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"хүрэх боломж"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Цаг, мэдэгдэл болон бусад мэдээллийг шалгахын тулд дэлгэцээ хоёр товшино уу."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Утсаа шалгахын тулд өргөнө үү"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Таблетаа шалгахын тулд өргөнө үү"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Таблетаа шалгахын тулд товшино уу"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Төхөөрөмжийг шалгахын тулд товшино уу"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Цаг, мэдэгдэл болон бусад мэдээллийг шалгахын тулд дэлгэцээ товшино уу."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Яаралтай тусламжийн SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Яаралтай тусламжийн SOS-г ашиглах"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> удирддаг"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Асаах/унтраах товчийг 5 эсвэл түүнээс олон удаа хурдан дарж, доорх үйлдлүүдийг эхлүүлээрэй"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Хугацаа тоолох дохиоллыг тоглуулах"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Тусламж дуудахын өмнө чанга дуу тоглуулна"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Тусламж авахын тулд залгах"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Тусламж авахын тулд залгах дугаар"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Өөрчлөхийн тулд товшино уу"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Та яаралтай тусламжийн бус утасны дугаар оруулсан тохиолдолд:\n • Яаралтай тусламжийн SOS-г ашиглахын тулд та төхөөрөмжийнхөө түгжээг тайлсан байх ёстой\n • Таны дуудлагад хариулахгүй байж болзошгүй"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Мэдэгдэл харах бол хурууны хээгээ шударна уу"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Хурууны хээгээр шудрах"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Мэдэгдлээ шалгахын тулд утасныхаа арын хурууны хээ мэдрэгчийг доош шударна уу."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Харагдах өгөгдлийн багцийн дээд хэмжээ"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Өгөгдмөл утга руу шинэчлэх"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Хөгжүүлэгчийн тохиргоог автоматаар бөглөх хэсгийг шинэчилсэн"</string>
+    <string name="location_category" msgid="3496759112306219062">"Байршил"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Статус самбарын байршлын заалт"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Сүлжээ болон холболтыг оруулаад бүх байршлыг харуулна"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Бүтэн GNSS хэмжилтийг хүчлэх"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Бүх GNSS орд болон давтамжийг давтамжийн түвшингүйгээр шинжлэх"</string>
     <string name="device_theme" msgid="5027604586494772471">"Төхөөрөмжийн загвар"</string>
     <string name="default_theme" msgid="4815428567082263639">"Өгөгдмөл"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Сүлжээний нэр"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Төвлөрсөн хэвэрэ байхын тулд мэдэгдлийг түр зогсоох"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Онцлог боломжгүй байна"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Энэ онцлог таны утсыг удаашруулж буй тул үүнийг унтраасан"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Бүтэн GNSS хэмжилтийг хүчлэх"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Бүх GNSS орд болон давтамжийг давтамжийн түвшингүйгээр шинжлэх"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Гэмтлийн харилцах цонхыг тогтмол харуулах"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Харилцах цонхыг апп гэмтэх бүрд харуулах"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ӨНЦӨГ идэвхжүүлсэн аппыг сонгох"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Бүх аппад идэвхжүүлэх"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Графикийн драйверыг сонгох"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Өгөгдмөл"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Тоглоомын драйвер"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Тоглоомын драйвер"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Хөгжүүлэгчийн драйвер"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системийн графикийн драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Асаалттай (дууг хаах)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Унтраалттай"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Сүлжээний мэдээлэл"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Таны төхөөрөмжийн нэр таны утасны аппуудад харагдана. Та Bluetooth төхөөрөмжүүдэд холбогдох эсвэл Wi-Fi сүлжээний цэгийг тохируулах үед энэ нь бусад хүмүүст харагдаж болзошгүй."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Таны төхөөрөмжийн нэр таны утсан дээрх аппуудад харагдана. Үүнийг мөн таныг Bluetooth төхөөрөмжүүд болон Wi-Fi сүлжээнд холбогдох эсвэл Wi-Fi сүлжээний цэг тохируулах үед бусад хүн харж болзошгүй."</string>
     <string name="devices_title" msgid="649715719278562515">"Төхөөрөмжүүд"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Бүх тохиргоо"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Зөвлөмж"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Сүлжээ олдсонгүй. Дахин оролдоно уу."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(хориглосон)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM карт алга"</string>
+    <string name="sim_card" msgid="6381158752066377709">"СИМ"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"СИМ алга"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Байхгүй"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Холбогдоход СИМ шаардлагатай"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Холбогдоход <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-н СИМ шаардлагатай"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Давуу эрхтэй сүлжээний горим: WCDMA давуу эрхтэй"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Давуу эрхтэй сүлжээний горим: зөвхөн GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Давуу эрхтэй сүлжээний горим: зөвхөн WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобайл дата"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Мобайл сүлжээг ашиглан датад холбогдох"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Утас энэ оператор компанийг хүрээнд байх үед автоматаар сэлгэнэ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"СИМ карт боломжгүй"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Дуудлагын сонголт"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-н сонголт"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Тухай бүрд асуух"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>-д холбогдсон үед боломжгүй"</string>
     <string name="see_more" msgid="7499355691042812723">"Дэлгэрэнгүй үзэх"</string>
     <string name="see_less" msgid="2642392725363552793">"Цөөнийг харах"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-г асаах уу?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"СИМ-г асаах уу?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> руу сэлгэх үү?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"СИМ картыг ашиглахад сэлгэх үү?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Нэг удаад зөвхөн нэг СИМ-г идэвхжүүлэх боломжтой.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> руу сэлгэснээр таны <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-н үйлчилгээг цуцлахгүй."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Нэг удаад зөвхөн нэг татаж авсан СИМ-г идэвхжүүлэх боломжтой.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> руу сэлгэснээр таны <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-н үйлчилгээг цуцлахгүй."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Нэг удаад зөвхөн нэг СИМ идэвхжүүлэх боломжтой.\n\nСэлгэснээр таны <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-н үйлчилгээг цуцлахгүй."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> руу сэлгэх"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Сүлжээнд холбогдож байна…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> руу сэлгэж байна"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Оператор компанийг сэлгэх боломжгүй"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Алдааны улмаас оператор компанийг сэлгэх боломжгүй байна."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>-г унтраах уу?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM-г унтраах уу?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-г унтрааж байна<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Оператор компанийг идэвхгүй болгох боломжгүй"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Алдаа гарсан тул таны оператор компанийг идэвхгүй болгож чадсангүй."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 СИМ ашиглах уу?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Энэ төхөөрөмжид 2 СИМ-г зэрэг идэвхжүүлэх боломжтой. Одоогоор 1 СИМ-г үргэлжлүүлэн ашиглах бол \"Үгүй, баярлалаа\"-г товшино уу."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Төхөөрөмжийг дахин эхлүүлэх үү?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Эхлүүлэхийн тулд төхөөрөмжөө дахин эхлүүлнэ үү. Дараа нь та өөр СИМ нэмэх боломжтой."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Үргэлжлүүлэх"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Дахин эхлүүлэх"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Үгүй, баярлалаа"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Сэлгэх"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"СИМ-г идэвхжүүлэх боломжгүй"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"СИМ-г салгаад, дахин хийнэ үү. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжөө дахин эхлүүлнэ үү."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"СИМ-г дахин асааж үзнэ үү. Хэрэв асуудал үргэлжилсээр байвал төхөөрөмжөө дахин эхлүүлнэ үү."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Сүлжээг идэвхжүүлэх"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> идэвхтэй байна"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"СИМ-н тохиргоог шинэчлэхийн тулд товшино уу"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"СИМ карт"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Энэ татаж авсан СИМ-г устгах уу?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Энэ СИМ-г устгаснаар <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-н үйлчилгээг энэ төхөөрөмжөөс хасна.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>-н үйлчилгээг цуцлахгүй."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Устгах"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"СИМ-г устгаж байна…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"СИМ-г устгаж чадсангүй"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Энэ СИМ-г алдааны улмаас устгаж чадсангүй.\n\nТөхөөрөмжөө дахин эхлүүлээд, дахин оролдоно уу."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Төхөөрөмжид холбох"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> апп таны төхөөрөмжид холбогдохын тулд түр зуурын Wi-Fi сүлжээ ашиглах хүсэлтэй байна"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Төхөөрөмж олдсонгүй. Төхөөрөмжүүдийг асаалттай бөгөөд холбогдох боломжтой эсэхийг нь шалгана уу."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Яаралтай дуудлага"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Таны оператор компани Wi‑Fi Дуудлагаар яаралтай дуудлага хийхийг дэмждэггүй.\nЭнэ төхөөрөмж яаралтай дуудлага хийхийн тулд үүрэн сүлжээ рүү автоматаар сэлгэнэ.\nЯаралтай дуудлагыг зөвхөн үүрэн сүлжээтэй газар хийх боломжтой."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Чанарыг сайжруулахын тулд Wi-Fi-г дуудлагад ашиглах"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Давхар SIM-н дуудлага"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Энэ SIM-д өөр SIM-н дуудлага болон SMS-г зөвшөөрнө үү."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"давхар sim-н дуудлага"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Ирж буй мультимедиа мессеж"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Мультимедиа мессеж илгээх боломжгүй"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Мобайл дата унтраалттай үед <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> дээр мультимедиа мессежийг зөвшөөрөхийн тулд товшино уу"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Тохиргооны дэлгэцэд давхарлахыг зөвшөөрөх"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Бусад аппын дээр үзүүлэх боломжтой аппуудыг Тохиргооны дэлгэцийг давхарлахыг зөвшөөрөх"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Медиа"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Медиа харилцан үйлдэл дуусахад тоглуулагчийг нуух"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Тоглуулагч нь танд харилцан үйлдлийг дэлгэсэн Шуурхай тохиргооны түр зуурын самбараас үргэлжлүүлэх боломж олгодог."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Шуурхай тохиргоон дахь Медиа тоглуулагч"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Дахин тоглуулахыг хялбар үргэлжлүүлэхийн тулд медиа тоглуулагчийг уртасгасан хугацаагаар үзүүлдэг"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Тоглуулагчийг нуух"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Тоглуулагчийг харуулах"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Боломжтой тоглуулагч алга"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Зөвшөөрсөн аппууд"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"медиа"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth-г асаана"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Асаалттай"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Унтраалттай"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Интернэт"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Нислэгийн аюулгүй сүлжээ"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Нислэгийн аюулгүй сүлжээг хайж олж, холбогдох"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"нислэг, нислэг аюулгүй"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Дуудлага, SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi дуудлага"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi-Fi зэрэг оператор компанийн бус сүлжээгээр дуудлага хийж, хүлээн аваарай"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi дуудлага нь танд зарим Wi-Fi сүлжээ гэх мэт оператор компанийн бус сүлжээгээр дуудлага хийх болон хүлээн авах боломжийг олгодог."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Дуудлага"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"сонгосон"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"дуудлагыг сонгосон"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS-г сонгосон"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"боломжгүй"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM байхгүй"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Сонголт"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Олон нийтийн Wi-Fi сүлжээнд холбогдох"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"сүлжээний холболт, интернэт, утасгүй интернэт, дата, wifi, wi-fi, wi fi, үүрэн холбоо, мобайл, үүрэн холбооны оператор, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Нислэгийн аюулгүй сүлжээг харах"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Нислэгийн горимыг унтраах"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Унтлагын цагийн горим асаалттай байгаа тул боломжгүй"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Мэдэгдлийн ач холбогдлыг шинэчилж дууссан."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Аппууд"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Итгэмжлэгдээгүй төхөөрөмж таны мессежид хандахыг хүсэж байна. Дэлгэрэнгүйг харахын тулд товшино уу."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Мессежид хандахыг зөвшөөрөх үү?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Итгэмжлэгдээгүй Bluetooth төхөөрөмж болох [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] таны мессежид хандахыг хүсэж байна.\n\nТа өмнө нь [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]-д холбогдож байгаагүй."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Итгэмжлэгдээгүй төхөөрөмж таны харилцагчид болон дуудлагын жагсаалтад хандахыг хүсэж байна. Дэлгэрэнгүйг харахын тулд товшино уу."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Харилцагчид болон дуудлагын жагсаалтад хандахыг зөвшөөрөх үү?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Итгэмжлэгдээгүй Bluetooth төхөөрөмж болох [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] таны харилцагчид болон дуудлагын жагсаалтад хандахыг хүсэж байна. Үүнд ирж буй болон залгасан дуудлагын талаарх өгөгдөл багтана.\n\nТа өмнө нь [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]-д холбогдож байгаагүй."</string>
 </resources>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 290c61f..739b892 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"मध्‍यम"</item>
     <item msgid="6740026006576843477">"दीर्घ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"लहान"</item>
+    <item msgid="7397961711906421599">"मध्‍यम"</item>
+    <item msgid="4079132024502041928">"दीर्घ"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"डीफॉल्ट"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"जागतिक"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"केवळ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"जागतिक"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 1ae81af..fdd5bac 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"तारीख आणि वेळ"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"तारीख आणि वेळ सेट करा"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"तारीख, वेळ, टाइम झोन आणि स्वरूपने सेट करा"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"नेटवर्कने पुरवलेली वेळ वापरा"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"नेटवर्कने पुरवलेला टाइमझोन वापरा"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"वेळ आपोआप सेट करा"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"टाइमझोन आपोआप सेट करा"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"लोकॅल डीफॉल्ट वापरा"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑तास स्वरूप"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"२४ तास फॉरमॅट वापरा"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"लॉक स्क्रीनवर प्रोफाईलची माहिती दर्शवा"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"खाती"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"स्थान"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"स्‍थान वापरा"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"स्थान वापरा"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"बंद"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">सुरू - <xliff:g id="COUNT_1">%1$d</xliff:g> ॲप्सना स्थानाचा अ‍ॅक्सेस आहे</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"स्क्रीन लॉक, फेस अनलॉक"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"स्क्रीन लॉक, फिंगरप्रिंट"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"स्क्रीन लॉक"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"तुमचा चेहरा व फिंगरप्रिंटने तुमचा फोन सुरक्षितपणे अनलॉक करा"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"तुम्ही अ‍ॅप्समध्ये साइन इन करूनदेखील पेमेंट निश्चित करू शकता"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"यासोबत अनलॉक सेट करा:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"फेस अनलॉक"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"तुमचा फोन अनलॉक करणे अत्यंत सोपे करा"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"फिंगरप्रिंट"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"तुमचा फोन खिशातच अनलॉक करून वेळ वाचवा"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"वगळा"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"पुढे"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"चेहरा जोडला आहे"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"फेस अनलॉक सेट करा"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"फेस अनलॉक"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ऑथेंटिकेट करण्यासाठी तुमचा चेहरा वापरा"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"सुरू करा"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"अ‍ॅक्सेसिबिलिटी फेस अनलॉक बंद असल्यास, कदाचित सेटअपच्या काही पायऱ्या TalkBack सह योग्यरीत्या काम करणार नाहीत."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"परत जा"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"सेटअप पुढे सुरू ठेवा"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"अ‍ॅक्सेसिबिलिटी सेटअप वापरा"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ॲप्समध्ये फेस अनलॉक वापरताना, नेहमी खात्री करणे आवश्यक आहे"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"फेस डेटा हटवा"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"फेस अनलॉक सेट करा"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"तुमचे डिव्हाइस अनलॉक करण्यासाठी, अ‍ॅप्समध्ये साइन इन करण्यासाठी आणि पेमेंटची खात्री करण्यासाठी फेस अनलॉक वापरा. \n\n लक्षात ठेवा:\nतुमचा हेतू नसताना देखील फोनकडे पाहिल्यास तो अनलॉक होऊ शकतो.\n\n एखाद्या व्यक्तीने तुमचा फोन तुमच्या चेहऱ्याकडे धरल्यास तुमचा फोन अनलॉक केला जाऊ शकतो\n\nतुमच्यासारखी दिसणारी व्यक्ती तुमचा फोन संभाव्यत: अनलॉक करू शकते, जसे की, तुमच्यासारखे दिसणारे भावंड."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"तुमचे डिव्हाइस अनलॉक करण्यासाठी, अ‍ॅप्समध्ये साइन इन करण्यासाठी आणि पेमेंटची खात्री करण्यासाठी फेस अनलॉक वापरा. \n\n लक्षात ठेवा:\nतुम्हाला फोन अनलॉक करायचा नसताना देखील तुम्ही फोनकडे पाहिल्यामुळे तो अनलॉक होऊ शकतो.\n\nतुमचे डोळे बंद असताना देखील दुसऱ्या कोणीतरी तुमचा फोन तुमच्या चेहऱ्यासमोर धरल्यास, तुमचा फोन अनलॉक केला जाऊ शकतो.\n\nअगदी तुमच्यासारख्या दिसणाऱ्या व्यक्तीकडून उदा. जुळ्या भावंडाकडून तुमचा फोन अनलॉक केला जाऊ शकतो."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"तुमचे डिव्हाइस अनलॉक करण्यासाठी, अ‍ॅप्समध्ये साइन इन करण्यासाठी आणि पेमेंटची खात्री करण्यासाठी फेस अनलॉक वापरा."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"लक्षात ठेवा:\nतुमचा हेतू नसतानादेखील फोनकडे पाहिल्याने तो अनलॉक होऊ शकतो.\n\nएखाद्या व्यक्तीने तुमचा फोन तुमच्या चेहऱ्यासमोर धरल्यास तुमचा फोन अनलॉक केला जाऊ शकतो.\n\nतुमच्यासारखी दिसणारी व्यक्ती तुमचा फोन अनलॉक करू शकते, जसे की, तुमच्यासारखे दिसणारे तुमचे सख्खे भावंड."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"लक्षात ठेवा:\nतुमचा हेतू नसतानादेखील फोनकडे पाहिल्याने तो अनलॉक होऊ शकतो.\n\nएखाद्या व्यक्तीने तुमचा फोन तुमच्या चेहऱ्यासमोर धरल्यास, तुमचे डोळे बंद असतानादेखील तुमचा फोन अनलॉक केला जाऊ शकतो.\n\nतुमच्यासारखी दिसणारी व्यक्ती तुमचा फोन अनलॉक करू शकते, जसे की, तुमच्यासारखे दिसणारे तुमचे सख्खे भावंड."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"फेस डेटा हटवायचा?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"फेस अनलॉकद्वारे वापरला जाणारा फेस डेटा कायमचा आणि सुरक्षितपणे हटवला जाईल. काढून टाकल्यानंतर, तुमचा फोन अनलॉक करण्यासाठी, अ‍ॅप्समध्ये साइन इन करण्यासाठी आणि पेमेंट निश्चित करण्यासाठी तुम्हाला तुमचा पिन, पॅटर्न किंवा पासवर्ड लागेल."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"तुमचा फोन अनलॉक करण्यासाठी फेस अनलॉक वापरा"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"फोन अनलॉक करण्यासाठी किंवा खरेदींना मंजूरी देण्यासाठी तुमचे फिंगरप्रिंट वापरा.\n\nटीप: तुम्ही हे डिव्हाइस अनलॉक करण्यासाठी तुम्‍ही तुमचे फिंगरप्रिंट वापरू शकत नाही. अधिक माहितीसाठी संस्थेच्या प्रशासकाशी संपर्क साधा."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"फोन अनलॉक करण्यासाठी किंवा खरेदीला मंजुरी देण्यासाठी तुमची फिंगरप्रिंट वापरा.\n\nटीप: क्लिष्ट पॅटर्न किंवा पिनच्या तुलनेत तुमची फिंगरप्रिंट ही कमी सुरक्षित असू शकते."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"रद्द करा"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"नाही, नको"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"सुरू ठेवा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"वगळा"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"पुढील"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"स्क्रीन लॉक पर्यायासह तुमचा टॅबलेट संरक्षित केल्याने, तो हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस अनलॉक सेट करण्यासाठी स्क्रीन लॉकचा पर्याय देखील आवश्यक आहे. मागे जाण्यासाठी, रद्द करा टॅप करा."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"स्क्रीन लॉक पर्यायासह तुमचे डिव्हाइस संरक्षित केल्याने, ते हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस अनलॉक सेट करण्यासाठी स्क्रीन लॉकचा पर्याय देखील आवश्यक आहे. मागे जाण्यासाठी, रद्द करा टॅप करा."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"स्क्रीन लॉक पर्यायासह तुमचा फोन संरक्षित केल्याने, तो हरवल्यास किंवा चोरी झाल्यास त्याचा वापर कोणीही करू शकणार नाही. तुम्हाला फेस अनलॉक सेट करण्यासाठी स्क्रीन लॉकचा पर्याय देखील आवश्यक आहे. मागे जाण्यासाठी, रद्द करा टॅप करा."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"स्क्रीन लॉक पर्यायाने तुमचा टॅबलेट संरक्षित केल्याने, तो हरवला किंवा चोरी झाला, तरी कोणालाही वापरता येणार नाही. बायोमेट्रिक सेट करण्यासाठी तुम्हाला स्क्रीन लॉक पर्यायाचीदेखील आवश्यकता आहे. मागे जाण्यासाठी, रद्द करा वर टॅप करा."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"स्क्रीन लॉक पर्यायाने तुमचे डिव्हाइस संरक्षित केल्याने, ते हरवले किंवा चोरी झाले, तरी कोणालाही वापरता येणार नाही. बायोमेट्रिक सेट करण्यासाठी तुम्हाला स्क्रीन लॉक पर्यायाचीदेखील आवश्यकता आहे. मागे जाण्यासाठी, रद्द करा वर टॅप करा."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"स्क्रीन लॉक पर्यायाने तुमचा फोन संरक्षित केल्याने, तो हरवला किंवा चोरी झाला, तरी कोणालाही वापरता येणार नाही. बायोमेट्रिक सेट करण्यासाठी तुम्हाला स्क्रीन लॉक पर्यायाचीदेखील आवश्यकता आहे. मागे जाण्यासाठी, रद्द करा वर टॅप करा."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"पिन सेट करणे वगळायचे का?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"पासवर्ड सेट करणे वगळायचे का?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"पॅटर्न सेट करणे वगळायचे का?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हा टॅब्लेट वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हे डिव्हाइस वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"डिव्हाइस संरक्षण वैशिष्ट्ये ॲक्टिव्हेट करून तुमच्या परवानगीशिवाय हा फोन वापरण्यापासून इतरांना प्रतिबंधित करा. तुम्ही वापरू इच्छित असलेले स्क्रीन लॉक निवडा."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"तुमची बॅक अप स्क्रीन लॉक पद्धत निवडा"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"तुमची बॅकअप स्क्रीन लॉक पद्धत निवडा"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"तुमची बॅकअप स्क्रीन लॉक पद्धत निवडा"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"स्क्रीन लॉक पर्याय"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"स्क्रीन लॉक पर्याय"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"स्क्रीन लॉक"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"फेस अनलॉक + पासवर्ड"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"फेस अनलॉक शिवाय सुरू ठेवा"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"तुम्ही तुमचा चेहरा वापरून तुमचा फोन अनलॉक करू शकता. सुरक्षिततेसाठी, या पर्यायासाठी बॅकअप स्क्रीन लॉक आवश्यक आहे."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"बायोमेट्रिक + पॅटर्न"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"बायोमेट्रिक + पिन"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"बायोमेट्रिक + पासवर्ड"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"बायोमेट्रिक न वापरता सुरू ठेवा"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"तुमची बायोमेट्रिक वापरून तुम्ही तुमचा फोन अनलॉक करू शकता. सुरक्षेसाठी, या पर्यायाला बॅकअप स्क्रीन लॉकची आवश्यकता आहे."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"प्रशासक, कूटबद्धीकरण धोरण किंवा क्रेडेन्शियल संचयनाद्वारे अक्षम केलेले"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"काहीही नाही"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"स्‍वाइप करा"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> अंकापेक्षा कमी असणे आवश्यक आहे</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"डिव्हाइस प्रशासक अलीकडील पिन वापरण्याची अनुमती देत नाही"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"सामान्यत: वापरले जाणारे पिन तुमच्या IT प्रशासनाने ब्लॉक केलेले आहेत. दुसरा एखादा पिन वापरून पाहा."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"यामध्ये अवैध वर्ण समाविष्ट असू शकत नाही"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"कमीत कमी एक अक्षर असणे आवश्यक आहे"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"कमीत कमी एक अंक असणे आवश्यक आहे"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">किमान एक अंक नसलेला वर्ण असणे आवश्यक आहे</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"डिव्हाइस प्रशासक अलीकडील पासवर्ड वापरण्याची अनुमती देत नाही"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"सामान्यत: वापरले जाणारे पासवर्ड तुमच्या IT प्रशासनाने ब्लॉक केलेले आहेत. दुसरा एखादा पासवर्ड वापरून पाहा."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"अंकांच्या चढत्या, उतरत्या किंवा पुनरावृत्त क्रमाला अनुमती नाही"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"खात्री करा"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"रद्द करा"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"वाय-फाय"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"वाय-फाय सुरू करा"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"वाय-फाय"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"वाय-फाय वापरा"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"वाय-फाय वापरा"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"वाय-फाय सेटिंग्ज"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"वाय-फाय"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"वायरलेस प्रवेश बिंदू सेट करा आणि  व्यवस्थापित करा"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” शी कनेक्ट करण्यासाठी खालील QR कोड मध्यभागी ठेवा"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR कोड स्कॅन करून वाय-फाय मध्ये सामील व्हा"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"वाय-फाय शेअर करा"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” शी कनेक्ट करण्यासाठी हा QR कोड स्कॅन करा आणि पासवर्ड शेअर करा"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” मध्ये सामील होण्यासाठी हा QR कोड दुसर्‍या डिव्हाइसने स्कॅन करा"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” शी कनेक्ट करण्यासाठी हा QR कोड स्कॅन करा"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"पुन्हा प्रयत्न करा. समस्या कायम राहिल्यास, डिव्हाइस निर्मात्याशी संपर्क साधा"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"काहीतरी चूक झाली"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"वाय-फाय पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"हॉटस्पॉट पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"आपोआप कनेक्‍ट करा"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"या नेटवर्कजवळ फोनला आपोआप कनेक्ट होण्याची अनुमती द्या"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"या नेटवर्कजवळ टॅबलेटला आपोआप कनेक्ट होण्याची अनुमती द्या"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"रेंजमध्ये असताना या नेटवर्कला कनेक्शनची अनुमती द्या"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"डिव्हाइस जोडा"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"या नेटवर्कमध्ये डिव्हाइस जोडण्यासाठी QR कोड वापरा"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR कोडचा फॉरमॅट चुकीचा आहे"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"सिस्टम प्रमाणपत्रे वापरा"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"प्रदान करू नका"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"प्रमाणित करू नका"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"कोणतेही प्रमाणपत्र नमूद केले नाही. तुमचे कनेक्शन खाजगी होणार नाही."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"नेटवर्कचे नाव फार लांबलचक आहे."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"एक डोमेन नमूद करणे आवश्यक आहे."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"प्रमाणपत्र आवश्यक आहे."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"कनेक्ट करा"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"वाय-फाय सुरू केले आहे"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> शी कनेक्ट केले आहे"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> शी कनेक्ट करत आहे"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"कनेक्ट करत आहे…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"नेटवर्कशी कनेक्‍ट करण्‍यात अयशस्वी"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"नेटवर्क रेंजमध्ये नाही"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"डिव्हाइसचा MAC ॲड्रेस"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"रँडमाइझ केलेला MAC पत्ता"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"रँडमाइझ केलेला MAC ॲड्रेस (शेवटी वापरला गेला होता)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP पत्ता"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"नेटवर्क तपशील"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"सबनेट मास्क"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 अ‍ॅड्रेस"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"सेव्ह केलेली नेटवर्क"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"सदस्यत्वे"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"इतर नेटवर्क"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP सेटिंग्ज"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"वाय‑फाय प्रगत सेटिंग्ज या वापरकर्त्यासाठी उपलब्ध नाहीत"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"सेव्ह करा"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"वैध गेटवे पत्ता टाइप करा."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"वैध DNS पत्ता टाइप करा."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 आणि 32 दरम्यान नेटवर्क उपसर्ग लांबी टाइप करा."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (खाजगी DNS ओव्हरराइड करेपर्यंत)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (खाजगी DNS ओव्हरराइड करेपर्यंत)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"नेटवर्क उपसर्ग लांबी"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"वाय-फाय डिरेक्ट"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"अ‍ॅप आशय शेअर करत आहे. इंटरनेट कनेक्शन शेअर करण्यासाठी, हॉटस्‍पॉट बंद करा, नंतर सुरू करा"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"पासवर्ड सेट केलेला नाही"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"हॉटस्पॉट नाव"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> सुरू करत आहे..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> सुरू करत आहे…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"इतर डिव्हाइस <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>शी कनेक्ट होऊ शकतात"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"हॉटस्पॉट पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP बॅंड"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"काही आशयासाठी रिफ्रेश रेट ६० ते ९० Hz पर्यंत आपोआप वाढवते. बॅटरी वापर वाढवते."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"फोर्स ९० Hz रिफ्रेश रेट"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"सुधारित स्पर्श प्रतिसाद आणि अ‍ॅनिमेशन गुणवत्तेसाठी उच्चतम रिफ्रेश रेट. बॅटरी वापर वाढवतो."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"स्क्रीन अटेंशन"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"सुरू करा / तुम्ही स्क्रीनकडे पाहत असल्यास स्क्रीन बंद होणार नाही"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"स्क्रीन गडद असल्यास, नवीन सूचनांसाठी ती सुरू होते"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"वेळ आणि माहिती कायम दाखवा"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"वाढलेला बॅटरी वापर"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"ठळक मजकूर"</string>
     <string name="title_font_size" msgid="570613010306330622">"फॉंट आकार"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"मजकूर आणखी लहान-मोठा करा"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"सिम कार्ड लॉक सेटिंग्ज"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android आवृत्ती"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android सुरक्षा अपडेट"</string>
     <string name="model_info" msgid="8997566254717810904">"मॉडेल"</string>
-    <string name="model_summary" msgid="2246651782442466213">"मॉडेल: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"मॉडेल आणि हार्डवेअर"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"हार्डवेअर आवृत्‍ती"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"उपकरण आयडी"</string>
@@ -1579,7 +1597,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN हटवा"</string>
     <string name="menu_new" msgid="6571230342655509006">"नवीन APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"सेव्ह करा"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"टाकून द्या"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"रद्द करा"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"नाव फील्ड रिक्त असू शकत नाही."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN रिक्त असू शकत नाही."</string>
@@ -1594,8 +1612,11 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ॲप्स रीसेट केली जाऊ शकतात"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"वाय-फाय, मोबाइल आणि ब्लूटूथ रीसेट करा"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"हे यांसह सर्व नेटवर्क सेटिंग्‍ज रीसेट करेल:\n\n"<li>"वाय‑फाय"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लूटुथ"</li></string>
+    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
+    <skip />
     <string name="reset_esim_title" msgid="6152167073280852849">"डाउनलोड केलेली सिम मिटवा"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"बदली सिम डाउनलोड करण्यासाठी तुमच्या वाहकाशी संपर्क साधा. हे केल्याने कोणतेही मोबाइल सेवा प्लॅन रद्द होणार नाहीत."</string>
+    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
+    <skip />
     <string name="reset_network_button_text" msgid="2281476496459610071">"सेटिंग्ज रीसेट करा"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"सर्व नेटवर्क सेटिंग्ज रीसेट करायची? तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"सर्व नेटवर्क सेटिंग्ज रीसेट करायची आणि डाउनलोड केलेली सिम मिटवायची? तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
@@ -1605,31 +1626,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"नेटवर्क सेटिंग्ज रीसेट केल्या गेल्या आहेत"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"सिम मिटवू शकत नाही"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"डाउनलोड केलेली सिम एका एररमुळे मिटवता येत नाहीत.\n\nतुमचे डिव्हाइस रीस्टार्ट करा आणि पुन्हा प्रयत्न करा."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, यासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"तुम्ही सध्या खालील खात्यांवर साइन इन केले आहे:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"या डिव्‍हाइसवर इतर वापरकर्ते उपस्‍थित आहेत.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"संगीत"</li>\n<li>"फोटो"</li>\n<li>"अन्य वापरकर्ता डेटा"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"हे केल्‍याने तुमचा मोबाइल सेवा प्‍लॅन रद्द होणार नाही."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"संगीत, चित्रे आणि अन्य वापरकर्ता डेटा साफ करण्यासाठी, "<b>"USB स्टोरेज"</b>" मिटविणे आवश्यक आहे."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"संगीत, चित्रे आणि अन्य वापरकर्ता डेटा साफ करण्यासाठी, "<b>"SD कार्ड"</b>" पुसण्याची आवश्यकता आहे."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"सर्व डेटा मिटवा (फॅक्टरी रीसेट)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"हे तुमच्या टॅबलेटच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, पुढील गोष्टींच्या समावेशासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा आणि सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"हे तुमच्या फोनच्या "<b>"अंतर्गत स्टोरेज"</b>" वरील सर्व डेटा मिटवेल, पुढील गोष्टींच्या समावेशासह:\n\n"<li>"तुमचे Google खाते"</li>\n<li>"सिस्टम आणि अ‍ॅप डेटा सेटिंग्ज"</li>\n<li>"डाउनलोड केलेली अ‍ॅप्स"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"तुम्ही सध्या खालील खात्यांमध्ये साइन इन केले आहे:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"या डिव्‍हाइसवर इतर वापरकर्ते उपस्‍थित आहेत.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"संगीत"</li>\n<li>"फोटो"</li>\n<li>"इतर वापरकर्ता डेटा"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"यामुळे तुमचा मोबाइल सेवा प्‍लॅन रद्द होणार नाही."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"संगीत, फोटो आणि इतर वापरकर्ता डेटा साफ करण्यासाठी "<b>"USB स्टोरेज"</b>" मिटविणे आवश्यक आहे."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"संगीत, फोटो आणि इतर वापरकर्ता डेटा साफ करण्यासाठी "<b>"SD कार्ड"</b>" मिटवणे आवश्यक आहे."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB स्टोरेज मिटवा"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD कार्ड मिटवा"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"अंतर्गत USB संचयनावरील सर्व डेटा मिटवा, जसे की संगीत किंवा फोटो"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD कार्डवरील सर्व डेटा मिटवा, जसे की संगीत किंवा फोटो"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"सर्व डेटा मिटवा"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"सर्व डेटा मिटवा"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"तुमची सर्व वैयक्तिक माहिती आणि डाउनलोड केलेली अ‍ॅप्स हटवली जातील. तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"डाउनलोड केलेली अ‍ॅप्स आणि सिमसह, तुमची सर्व वैयक्तिक माहिती हटवली जाईल. तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"प्रत्येकगोष्ट मिटवा"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"सिस्टम साफ करा सेवा उपलब्ध नसल्यामुळे कोणतेही रीसेट केले नाही."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"सर्व डेटा मिटवायचा?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"या वापरकर्त्यासाठी फॅक्‍टरी रीसेट उपलब्‍ध नाही"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"मिटवत आहे"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"कृपया प्रतीक्षा करा..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"सर्व डेटा मिटवा"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"सर्व डेटा मिटवा"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"तुमची सर्व वैयक्तिक माहिती आणि डाउनलोड केलेली अ‍ॅप्स हटवली जातील. तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"डाउनलोड केलेली अ‍ॅप्स आणि सिमसह, तुमची सर्व वैयक्तिक माहिती हटवली जाईल. तुम्ही ही कृती पहिल्यासारखी करू शकत नाही."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"सर्व डेटा मिटवायचा का?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"या वापरकर्त्यासाठी फॅक्‍टरी रीसेट उपलब्‍ध नाही"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"मिटवत आहे"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"कृपया प्रतीक्षा करा…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"कॉल सेटिंग्ज"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"व्हॉइसमेल, कॉल फॉरवर्डिंग, कॉल प्रतीक्षा, कॉलर आयडी सेट करा"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB टेदरिंग"</string>
@@ -1677,7 +1696,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> पेक्षा अधिक डिव्हाइसेसवर टेदर करू शकत नाही."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> टेदर करणे रद्द करेल."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"इथरनेट टेदरिंग"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"फोनचे इंटरनेट कनेक्शन USB इथरनेटमार्फत शेअर करा"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"फोनचे इंटरनेट कनेक्शन इथरनेटमार्फत शेअर करा"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"तुमच्या मोबाइल डेटा कनेक्शनने इतर डिव्हाइसना इंटरनेट देण्यासाठी हॉटस्पॉट आणि टेदरिंगचा वापर करा. जवळपासच्या डिव्हाइससोबत आशय शेअर करण्यासाठी अ‍ॅप्स हॉटस्‍पॉट देखील तयार करू शकतात."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"तुमच्या मोबाइल डेटा कनेक्शन किंवा वाय-फाय द्वारे इतर डिव्हाइसना इंटरनेट पुरवण्यासाठी हॉटस्पॉट आणि टेदरिंगचा वापर करा. जवळपासच्या डिव्हाइससह आशय शेअर करण्यासाठी अ‍ॅप्स हॉटस्पॉटदेखील तयार करू शकतात."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"मदत"</string>
@@ -1719,6 +1738,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्लूटूथ स्कॅनिंग"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ब्लूटूथ बंद असले, तरीही अ‍ॅप्स आणि सेवांना जवळपासची डिव्हाइस कधीही स्कॅन करण्याची अनुमती द्या. याचा वापर उदाहरणार्थ, स्थान आधारित वैशिष्ट्ये आणि सेवा सुधारण्यासाठी केला जाऊ शकतो."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ऑफिससाठीच्या स्थान सेवा"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"स्थानाचे टाइमझोन डिटेक्शन"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"स्थानाचे टाइमझोन डिटेक्शन"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"सध्याचा टाइमझोन डिटेक्ट करण्यासाठी डिव्हाइसचे स्थान वापरण्याची परवानगी द्या. वाय-फाय स्कॅनिंग सारखी इतर स्थान सेटिंग्ज टाइमझोन डिटेक्शनच्या अचूकतेवर परिणाम करू शकतात."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"सुरू करा"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"बंद करा"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ऑटोमॅटिक टाइमझोन डिटेक्शन बंद केले आहे"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"स्थानाचे टाइमझोन डिटेक्शन बंद केले आहे"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"स्थानाच्या टाइमझोन डिटेक्शनला सपोर्ट नाही"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"स्थानाच्या टाइमझोन डिटेक्शनमधील बदलांना अनुमती नाही"</string>
     <string name="location_network_based" msgid="5247042890080021887">"वाय-फाय आणि मोबाइल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"आपल्या स्थानाचा अधिक जलद अंदाज घेण्यासाठी ॲप्सना Google ची स्थान सेवा वापरू द्या. अनामित स्थान डेटा संकलित केला जाईल आणि Google कडे पाठविला जाईल."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"वाय-फाय द्वारे निर्धारित केलेले स्थान"</string>
@@ -1782,6 +1810,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"फेस अनलॉक वापरण्यासाठी, पासवर्ड सेट करा"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"फेस अनलॉक वापरण्यासाठी, पॅटर्न सेट करा"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"फेस अनलॉक वापरण्यासाठी, पिन सेट करा"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"बायोमेट्रिक वापरण्यासाठी पासवर्ड सेट करा"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"बायोमेट्रिक वापरण्यासाठी, पॅटर्न सेट करा"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"बायोमेट्रिक वापरण्यासाठी, पिन सेट करा"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"तुमचा पासवर्ड विसरलात का?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"तुमचा पॅटर्न विसरलात का?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"तुमचा पिन विसरलात का?"</string>
@@ -2118,13 +2149,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"कॅप्शन प्राधान्ये"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"मॅग्निफिकेशन"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"मॅग्निफाय करायचा असलेला भाग"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"मॅग्निफिकेशन सुरू करा"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"तुम्हाला स्क्रीन मॅग्निफाय करताना वापरायचे असलेले मॅग्निफाय करण्याचे भाग निवडा"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"फुल स्क्रीन"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"स्क्रीनचा काही भाग"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"फुल स्क्रीन &amp; स्क्रीनचा काही भाग"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"संपूर्ण स्क्रीन मॅग्निफाय करा"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"स्क्रीनचा काही भाग मॅग्निफाय करा"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"अ‍ॅक्सेसिबिलिटी बटणावर स्विच करायचे आहे का?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"स्क्रीनचा एखादा भाग मॅग्निफाय करण्यासाठी तीनदा टॅप केल्याने टायपिंग आणि इतर कृतींना उशीर होईल. \n\nमॅग्निफाय करण्यासाठी तुम्हाला अ‍ॅक्सेसिबिलिटी बटण वापरून स्विच करायचे आहे का?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"अ‍ॅक्सेसिबिलिटी बटणावर स्विच करा"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"मॅग्निफाय करण्यासाठी तीनदा टॅप करणे सुरू ठेवा"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"मॅग्निफिकेशन सेटिंग्ज"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"तीन वेळा टॅप करून मोठे करा"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"शॉर्टकटद्वारे मॅग्निफाय करा"</string>
@@ -2178,11 +2212,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"पॉवर बटण कॉल समाप्त करते"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"मोठा माउस पॉइंटर"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"अ‍ॅनिमेशन काढा"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"मोनो ऑडिओ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ऑडिओ प्ले करताना चॅनल एकत्र करा"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ऑडिओ संतुलन"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"डावे"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"उजवे"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"मोनो ऑडिओ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ऑडिओ प्ले करताना चॅनल एकत्र करा"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ऑडिओ संतुलन"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"डावे"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"उजवे"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"डीफॉल्ट"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 सेकंद"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"३० सेकंद"</string>
@@ -2212,11 +2246,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"सूचना कंपन"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"रिंग कंपन"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"स्पर्श फीडबॅक"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> वापरा"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> उघडा"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"रंग सुधारणा वापरा"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"कॅप्शन दाखवा"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"फक्त सपोर्ट असलेल्या ॲपसाठी"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> वापरा"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> उघडा"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"रंग सुधारणा वापरा"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"कॅप्शन दाखवा"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"फक्त सपोर्ट असलेल्या ॲपसाठी"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"कॅप्शनचा आकार आणि शैली"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> मजकूर आकार"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"अधिक पर्याय"</string>
@@ -2246,6 +2280,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ड्यूटरअनॉमली"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"प्रोटनॉमली"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ट्रायटनॉमली"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ग्रेस्केल"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"लाल-हिरवा"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"लाल-हिरवा"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"निळा-पिवळा"</string>
@@ -2375,7 +2410,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"बॅकग्राउंड वापर मर्यादा"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"अ‍ॅपला पार्श्वभूमीत चालण्याची अनुमती द्या"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ॲपला पार्श्वभूमीमध्ये चालण्याची अनुमती नाही"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"बॅकग्राउंड वापर मर्यादित केला जाऊ शकत नाही"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"बॅकग्राउंडचा वापर मर्यादित केला जाऊ शकत नाही"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"बॅकग्राउंड ॲक्टिव्हिटी मर्यादित ठेवायची?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"तुम्‍ही एखाद्या ॲपसाठी बॅकग्राउंड ॲक्टिव्हिटी मर्यादित ठेवल्‍यास, ते व्‍यवस्थित न चालण्‍याची शक्‍यता आहे"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"हे अ‍ॅप बॅटरी ऑप्टिमाइझ करण्यासाठी सेट केलेले नसल्याने, तुम्ही ते प्रतिबंधित करू शकत नाही.\n\nअ‍ॅप प्रतिबंधित करण्यासाठी, प्रथम बॅटरी ऑप्टिमायझेशन सुरू करा"</string>
@@ -2424,6 +2459,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"टॅबलेट नेहमीपेक्षा जास्त वापरले गेला"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"डिव्हाइस नेहमीपेक्षा जास्त वापरले गेले"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"बॅटरी नेहमीपेक्षा लवकर संपू शकते"</string>
+    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
+    <skip />
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"बॅटरी तात्पुरती मर्यादित आहे. अधिक जाणून घेण्यासाठी टॅप करा."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"तुमचा फोन नेहमीपेक्षा जास्त वापरला गेला आहे. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते.\n\nबॅटरीच्या वापरावर आधारित टॉप अ‍ॅप्स:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"तुमचा टॅबलेट नेहमीपेक्षा जास्त वापरला गेला आहे. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते.\n\nबॅटरीच्या वापरावर आधारित टॉप अ‍ॅप्स:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"तुमचे डिव्हाइस नेहमीपेक्षा जास्त वापरले गेले आहे. तुमची बॅटरी अपेक्षेपेक्षा लवकर संपू शकते.\n\nबॅटरीच्या वापरावर आधारित टॉप अ‍ॅप्स:"</string>
@@ -2479,6 +2517,8 @@
       <item quantity="one">%1$d अ‍ॅप प्रतिबंधित केले</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"तुमचे बॅटरी मीटर वाचताना समस्या आली"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"तुमचे बॅटरी मीटर वाचताना समस्या आली. अधिक जाणून घेण्यासाठी "<annotation id="url">" वर टॅप करा"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"अ‍ॅप बंद करायचे का?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"तुमचा फोन, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या फोनला जागे ठेवत राहते.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास, बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"तुमचा टॅबलेट, बॅटरी सामान्यपणे हाताळू शकत नाही कारण <xliff:g id="APP">%1$s</xliff:g> तुमच्या टॅबलेटला जागे ठेवत राहते.\n\nही समस्या सोडवण्यासाठी, तुम्ही अ‍ॅप थांबवू शकता.\n\nहे होत राहिल्यास बॅटरीचे कार्यप्रदर्शन सुधारण्यासाठी तुम्हाला अ‍ॅप कदाचित अनइंस्टॉल करावे लागेल."</string>
@@ -2592,9 +2632,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"शेड्युल सेट करा"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"बॅटरी लाइफ वाढवा"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"चार्ज झाल्यानंतर बंद करा"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"तुमचा फोन <xliff:g id="PERCENT">%1$s</xliff:g> वर असताना बॅटरी सेव्हर बंद होते"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"तुमचे टॅबलेट <xliff:g id="PERCENT">%1$s</xliff:g> वर असताना बॅटरी सेव्हर बंद होतो"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"तुमचे डिव्हाइस <xliff:g id="PERCENT">%1$s</xliff:g> वर असताना बॅटरी सेव्हर बंद होतो"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"तुमचा फोन <xliff:g id="PERCENT">%1$s</xliff:g> पेक्षा जास्त चार्ज होतो तेव्हा बॅटरी सेव्हर बंद होतो"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"तुमचा टॅबलेट <xliff:g id="PERCENT">%1$s</xliff:g> पेक्षा जास्त चार्ज होतो तेव्हा बॅटरी सेव्हर बंद होतो"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"तुमचे डिव्हाइस <xliff:g id="PERCENT">%1$s</xliff:g> पेक्षा जास्त चार्ज होते तेव्हा बॅटरी सेव्हर बंद होतो"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"सुरू करा"</string>
@@ -2659,6 +2699,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"रीसेट करा"</string>
     <string name="tts_play" msgid="2945513377250757221">"प्ले करा"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"अडॅप्टिव्ह कनेक्टिव्हिटी"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"तुमची नेटवर्क कनेक्शन आपोआप व्यवस्थापित करून बॅटरी लाइफ वाढवते आणि डिव्हाइसचा परफॉर्मन्स सुधारते"</string>
     <string name="credentials_title" msgid="7535942196886123656">"क्रेडेन्शियल स्टोरेज"</string>
     <string name="credentials_install" msgid="3933218407598415827">"एक प्रमाणपत्र इंस्टॉल करा"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"स्टोरेजमधील प्रमाणपत्रे इंस्टॉल करा"</string>
@@ -2670,9 +2712,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"वापरकर्ता क्रेडेंशियल"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"स्टोअर केलेली क्रेडेंशियल पाहा आणि त्यांत सुधारणा करा"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"प्रगत"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"स्टोरेज प्रकार"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेअर बॅकअप घेतला"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"केवळ सॉफ्टवेअर"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"या वापरकर्त्यासाठी क्रेडेंशियल उपलब्ध नाहीत"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN आणि ॲप्ससाठी इंस्टॉल केले"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"वाय-फाय साठी इंस्टॉल केले"</string>
@@ -2688,6 +2727,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"इंस्टॉल करू नका"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"तरीही इंस्टॉल करा"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"प्रमाणपत्र इंस्टॉल केलेले नाही"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"या डिव्हाइसवर <xliff:g id="APP_NAME">%s</xliff:g> ला प्रमाणपत्रे इंस्टॉल करण्याची अनुमती द्यायची का?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"ही प्रमाणपत्रे तुम्हाला खालील ॲप आणि URL वर ओळखतील"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"अनुमती देऊ नका"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"अनुमती द्या"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"आणखी दाखवा"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"प्रमाणपत्र व्यवस्थापन ॲप"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"काहीही नाही"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"या ॲपद्वारे इंस्टॉल केलेली प्रमाणपत्रे खालील ॲप्स आणि URL वर तुम्हाला ओळखतील"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"काढून टाका"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"आणीबाणी डायलिंग सिग्नल"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"आणीबाणी कॉल केला जातो तेव्हा वर्तन सेट करा"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"बॅकअप"</string>
@@ -3011,7 +3059,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"सेट केलेले नाही - कार्य प्रोफाईल"</string>
     <string name="user_admin" msgid="4024553191395768119">"ॲडमिन"</string>
     <string name="user_you" msgid="3070562015202859996">"तुम्ही (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"टोपणनाव"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"तुम्ही सुमारे <xliff:g id="USER_COUNT">%1$d</xliff:g> वापरकर्ते जोडू शकता"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"केवळ टॅब्लेटचा मालक वापरकर्त्यांना व्यवस्थापित करु शकतो."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"केवळ फोनचा मालक वापरकर्त्यांना व्यवस्थापित करु शकतो."</string>
@@ -3061,7 +3108,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"टर्मिनलवर पेमेंट करा"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"पेमेंट अ‍ॅप सेट करा. त्यानंतर संपर्करहित पेमेंटचा आयकन असलेल्या कोणत्याही टर्मिनलवर तुमच्या फोनची मागील बाजू धरा."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"समजले"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"आणखी..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"आणखी…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"डीफॉल्ट पेमेंट अ‍ॅप सेट करा"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"डीफॉल्ट पेमेंट अ‍ॅप अपडेट करा"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"संपर्करहित टर्मिनलवर <xliff:g id="APP">%1$s</xliff:g> वापरून पैसे द्या"</string>
@@ -3131,9 +3178,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"परत"</string>
     <string name="wizard_next" msgid="3884832431439072471">"पुढील"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"समाप्‍त"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"फोटो काढा"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"इमेज निवडा"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"फोटो निवडा"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"सिम कार्ड"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"सिम कार्ड"</string>
@@ -3145,7 +3189,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"कॉल साठी हे नेहमी वापरा"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"डेटासाठी एक सिम निवडा"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"एसएमएससाठी एक सिम निवडा"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"डेटा सिम स्‍विच करत आहे, यास सुमारे एक मिनिट लागेल..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"डेटा सिम स्‍विच करत आहे, यास सुमारे एक मिनिट लागेल…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"यासह कॉल करा"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"एक सिम कार्ड निवडा"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"सिम <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3288,6 +3332,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"दिनक्रम, शेड्युल, बॅटरी सेव्हर, पॉवर सेव्हर, बॅटरी, ऑटोमॅटिक, टक्के"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, प्रगत कॉलिंग, 4G कॉलिंग"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"भाषा जोडा, एखादी भाषा जोडा"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"मजकुराचा आकार"</string>
     <string name="default_sound" msgid="6604374495015245195">"डीफॉल्ट ध्‍वनी"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"रिंग आणि सूचनेचा व्हॉल्यूम <xliff:g id="PERCENTAGE">%1$s</xliff:g> वर आहे"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"आवाज, व्हायब्रेट, व्यत्यय आणू नका"</string>
@@ -3327,11 +3372,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ध्वनी सुरू करा"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"लाइव्ह कॅप्शन"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"मीडियाला आपोआप सबटायटल द्या"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"काहीही नाही"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्युल सेट केली आहेत</item>
-      <item quantity="one">एक शेड्युल सेट केले आहे</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{None}=1{एक शेड्युल सेट केले}other{# शेड्युल सेट केली}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"व्यत्यय आणू नका"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"फक्त तुम्हाला विश्वास असलेल्या लोकांकडील सूचना मिळवा"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"व्यत्यय मर्यादित करा"</string>
@@ -3399,20 +3440,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"केवळ प्राधान्य"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"सुरू आहे / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"बंद आहे / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"बंद"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"सुरू"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"प्रत्येकवेळी विचारा"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"तुम्ही बंद करेपर्यंत"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> तास</item>
-      <item quantity="one">एक तास</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> मिनिटे"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> शेड्युल आपोआप सुरू केले जाऊ शकतात</item>
-      <item quantity="one">एक शेड्युल आपोआप सुरू केले जाऊ शकते</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{एक तास}other{# तास}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{एक मिनिट}other{# मिनिटे}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Off}=1{बंद आहे / एक शेड्युल आपोआप सुरू होऊ शकते}other{बंद आहे / # शेड्युल आपोआप सुरू होऊ शकतात}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"व्यत्यय आणू नका या सेटिंगमध्ये कशामुळे व्यत्यय येऊ शकतो"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"लोक"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"अ‍ॅप्स"</string>
@@ -3458,6 +3491,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"कमी प्राधान्य असलेल्या सूचना हळू आवाजावर आपोआप सेट करा"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"अ‍ॅडाप्टिव्ह सूचना रॅंकिंग"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"उपयुक्ततेनुसार सूचनांना आपोआप रँक करा"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"अडॅप्टिव्ह सूचना फीडबॅक"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"सूचनांमध्ये केलेल्‍या अ‍ॅडजस्टमेंट दाखवा आणि सिस्‍टममध्ये फीडबॅक देण्याचा पर्याय नमूद करा"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"सूचनेचे महत्त्व रीसेट करा"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"वापरकर्त्याने बदललेली महत्त्वपूर्ण सेटिंग्ज रीसेट करा आणि सूचना असिस्टंटला प्राधान्य देण्याची परवानगी द्या"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"सुचवलेली कृती आणि उत्तरे"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"सुचवलेली कृती आणि उत्तरे आपोआप दाखवा"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"अलीकडील आणि स्नूझ केलेल्या सूचना दाखवा"</string>
@@ -3555,8 +3592,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"प्राधान्यावर असलेली संभाषणे"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"संभाषण विभागाच्या सर्वात वरती दाखवा आणि फ्लोटिंग बबल म्हणून दिसतील"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"संभाषण विभागाच्या सर्वात वरती दाखवा"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"इतर संभाषणे"</string>
+    <string name="other_conversations" msgid="551178916855139870">"प्राधान्य नसलेली संभाषणे"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"तुम्ही बदल केलेली संभाषणे"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"अलीकडील संभाषणे"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"अलीकडचे साफ करा"</string>
+    <string name="clear" msgid="5092178335409471100">"साफ करा"</string>
     <string name="important_bubble" msgid="7911698275408390846">"प्राधान्य असलेल्या संभाषणांना बबल करा"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"प्राधान्य असलेली संभाषणे पुल-डाउन शेडच्या सर्वात वरती दिसतात. तुम्ही त्यांना बबलवरदेखील सेट करू शकता आणि व्यत्यय आणू नका मध्ये व्यत्यय आणू शकता."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"प्राधान्य असलेली आणि बदल केलेली संभाषणे येथे दिसतील"</string>
@@ -3654,7 +3694,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"व्यत्यय आणू नका प्रवेश"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"व्यत्यय आणू नका ची अनुमती द्या"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"कोणत्याही इंस्टॉल केलेल्या ॲप्सने व्यत्यय आणू नका प्रवेशाची विनंती केली नाही"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"अ‍ॅप्स लोड करत आहे..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"अ‍ॅप्स लोड होत आहेत…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"तुमच्या विनंतीनुसार Android या अ‍ॅपच्या सूचना, या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"तुमच्या विनंतीनुसार Android, सूचनांच्या या वर्गवारीचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"तुमच्या विनंतीनुसार Android, सूचनांच्या या समूहाचे या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
@@ -3746,11 +3786,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"सर्व संभाषणे"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"प्राधान्य दिलेली संभाषणे"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"कोणतीही नाहीत"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> संभाषणे</item>
-      <item quantity="one">एक संभाषण</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"कोणतीही नाहीत"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{None}=1{एक संभाषण}other{# संभाषणे}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"कोण व्यत्यय आणू शकतात"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"कॉल"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"कॉल"</string>
@@ -3759,11 +3795,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"अनुमती असलेल्या कॉलचा आवाज होईल याची खात्री करण्यासाठी, डिव्हाइस रिंगवर सेट केले आहे का ते तपासा"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ साठी येणारे कॉल ब्लॉक केले आहेत. तुमच्या मित्रमैत्रिणींना, कुटुंबीयांना किंवा इतर संपर्कांना तुमच्याशी संपर्क साधण्याची अनुमती देण्यासाठी तुम्ही सेटिंग्ज अ‍ॅडजस्ट करू शकता."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"तारांकित संपर्क"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> अन्य</item>
-      <item quantity="one">एक अन्य</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"कोणतेही नाहीत"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{None}=1{{contact_1}}=2{{contact_1} आणि {contact_2}}=3{{contact_1}, {contact_2} आणि {contact_3}}other{{contact_1}, {contact_2} आणि # इतर}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(नाव नाही)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"मेसेज"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3772,11 +3805,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ साठी येणारे मेसेज ब्लॉक केले आहेत. तुमच्या मित्रमैत्रिणींना, कुटुंबीयांना किंवा इतर संपर्कांना तुमच्याशी संपर्क साधण्याची अनुमती देण्यासाठी तुम्ही सेटिंग्ज अ‍ॅडजस्ट करू शकता."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"सर्व मेसेज तुमच्यापर्यंत पोहोचू शकतील"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"सर्व कॉल तुमच्यापर्यंत पोहोचू शकतील"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"कोणतेही नाहीत"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> संपर्क</item>
-      <item quantity="one">एक संपर्क</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{None}=1{एक संपर्क}other{# संपर्क}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"कोणीही"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"संपर्क"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"तारांकित संपर्क"</string>
@@ -3814,22 +3843,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"सर्व सूचना"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"काही सूचना"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"तुम्ही अ‍ॅप्‍सना व्यत्यय आणण्याची अनुमती दिली नसली तरीही निवडक लोक तुमच्याशी संपर्क साधू शकतात"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> व्यत्यय आणू शकतात</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> व्यत्यय आणू शकते</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"आणखी <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{No apps can interrupt}=1{{app_1} व्यत्यय आणू शकते}=2{{app_1} आणि {app_2} व्यत्यय आणू शकतात}=3{{app_1}, {app_2}, आणि {app_3} व्यत्यय आणू शकतात}other{{app_1}, {app_2} आणि आणखी # व्यत्यय आणू शकतात}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"अ‍ॅप्स"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"सर्व सूचना"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"काही सूचना"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"व्यत्यय आणणाऱ्या सूचना"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"सर्व सूचनांना अनुमती द्या"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> व्यत्यय आणू शकतात</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> व्यत्यय आणू शकते</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"काहीही व्यत्यय आणू शकत नाही"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"आणखी <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nothing can interrupt}=1{{sound_category_1} व्यत्यय आणू शकते}=2{{sound_category_1} आणि {sound_category_2} व्यत्यय आणू शकतात}=3{{sound_category_1}, {sound_category_2}, आणि {sound_category_3} व्यत्यय आणू शकतात}other{{sound_category_1}, {sound_category_2} आणि आणखी # व्यत्यय आणू शकते}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"काहीही व्यत्यय आणू शकत नाही"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"कोणीही व्यत्यय आणू शकत नाही"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"काही लोक व्यत्यय आणू शकतात"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"सर्व लोक व्यत्यय आणू शकतात"</string>
@@ -3875,8 +3896,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"सुरू"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"बंद"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"ॲप पिनिंग"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"अ‍ॅप पिनिंग हे तुम्ही जोपर्यंत पिन केलेले ॲप अनपिन करत नाही तोपर्यंत ते पाहू देते. उदाहरणार्थ, हे वैशिष्ट्य एखाद्या विश्वासू मित्र/मैत्रिणीला विशिष्ट गेम खेळू देण्यासाठी वापरले जाऊ शकते. \n\nएखादे अ‍ॅप पिन केले जाते, तेव्हा पिन केलेली इतर अ‍ॅप्स उघडू शकतात आणि वैयक्तिक डेटा अ‍ॅक्सेस केला जाऊ शकतो. \n\nॲप पिनिंग वापरण्यासाठी: \n१.	ॲप पिनिंग सुरू करा \n२.	अवलोकन उघडा \n३.	स्क्रीनच्या सर्वात वरती असलेल्या ॲप आयकनवर टॅप करा त्यानंतर पिन वर टॅप करा"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"अ‍ॅप पिनिंग हे तुम्ही पिन केलेले ॲप अनपिन करत नाही तोपर्यंत ते पाहू शकता. उदाहरणार्थ, हे वैशिष्ट्य एखाद्या विश्वासू मित्रमैत्रिणीला विशिष्ट गेम खेळू देण्यासाठी वापरले जाऊ शकते. \n\nएखादे ॲप पिन केलेले असते तेव्हा त्या पिन केलेल्या ॲपद्वारे कदाचित इतर अ‍ॅप्स उघडता येतील आणि वैयक्तिक डेटा अ‍ॅक्सेस करता येईल. \n\nतुम्हाला एखाद्या व्यक्तीसह तुमचे डिव्हाइस सुरक्षितपणे शेअर करायचे असल्यास, तुमच्याऐवजी अतिथी वापरकर्ता वापरून पाहा. \n\nॲप पिनिंग वापरण्यासाठी: \n१.	ॲप पिनिंग सुरू करा \n२.	अवलोकन उघडा \n३.	स्क्रीनच्या सर्वात वरती असलेल्या ॲप आयकनवर टॅप करा त्यानंतर पिन वर टॅप करा"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"अ‍ॅप पिनिंग हे तुम्ही पिन केलेले ॲप अनपिन करत नाही तोपर्यंत ते पाहू शकता. उदाहरणार्थ, हे वैशिष्ट्य एखाद्या विश्वासू मित्रमैत्रिणीला विशिष्ट गेम खेळू देण्यासाठी वापरले जाऊ शकते."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"एखादे ॲप पिन केलेले असते तेव्हा त्या पिन केलेल्या ॲपद्वारे कदाचित इतर अ‍ॅप्स उघडता येतील आणि वैयक्तिक डेटा अ‍ॅक्सेस करता येईल. \n\nॲप पिनिंग वापरण्यासाठी: \n१.	ॲप पिनिंग सुरू करा \n२.	अवलोकन उघडा \n३.	स्क्रीनच्या सर्वात वरती असलेल्या ॲप आयकनवर टॅप करा त्यानंतर पिन करा वर टॅप करा"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"एखादे ॲप पिन केलेले असते तेव्हा त्या पिन केलेल्या ॲपद्वारे कदाचित इतर अ‍ॅप्स उघडता येतील आणि वैयक्तिक डेटा अ‍ॅक्सेस करता येईल. \n\nतुम्हाला एखाद्या व्यक्तीसह तुमचे डिव्हाइस सुरक्षितपणे शेअर करायचे असल्यास, तुमच्याऐवजी अतिथी वापरकर्ता वापरून पाहा. \n\nॲप पिनिंग वापरण्यासाठी: \n१.	ॲप पिनिंग सुरू करा \n२.	अवलोकन उघडा \n३.	स्क्रीनच्या सर्वात वरती असलेल्या ॲप आयकनवर टॅप करा त्यानंतर पिन करा वर टॅप करा"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"ॲप पिन केले जाते तेव्हा: \n\n• वैयक्तिक डेटा अ‍ॅक्सेस केला जाऊ शकतो \n(जसे की, संपर्क आणि ईमेल आशय) \n• पिन केलेले ॲप हे इतर ॲप्स उघडू शकते \n\nतुमचा विश्वास असलेल्या लोकांसोबतच ॲप पिनिंग वापरा."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"अनपिन करण्‍यापूर्वी अनलॉक नमुन्यासाठी विचारा"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"अनपिन करण्‍यापूर्वी पिन साठी विचारा"</string>
@@ -3898,6 +3920,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमचा चेहेरा वापरण्यबरोबरच, ते सुरू होण्यापूर्वी तुम्ही तुमच्या पिनचा वापर अनिवार्य करून हे डिव्हाइस अधिक सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मच्या समावेशासह कॉल, मेसेज किंवा सूचना मिळवू शकणार नाही.\n\nहे हरवलेल्या किंवा चोरलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत करते. तुमचे डिव्हाइस सुरू करण्यासाठी पिनची आवश्यकता आहे का?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमचा चेहेरा वापरण्यबरोबरच, ते सुरू होण्यापूर्वी तुम्ही तुमच्या पॅटर्नचा वापर अनिवार्य करून हे डिव्हाइस अधिक सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मच्या समावेशासह कॉल, मेसेज किंवा सूचना मिळवू शकणार नाही.\n\nहे हरवलेल्या किंवा चोरलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत करते. तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्नची आवश्यकता आहे का?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"तुमचे डिव्हाइस अनलॉक करण्यासाठी तुमचा चेहेरा वापरण्यबरोबरच, ते सुरू होण्यापूर्वी तुम्ही तुमच्या पासवर्डचा वापर अनिवार्य करून हे डिव्हाइस अधिक सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मच्या समावेशासह कॉल, मेसेज किंवा सूचना मिळवू शकणार नाही.\n\nहे हरवलेल्या किंवा चोरलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत करते. तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्डची आवश्यकता आहे का?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"तुमचे डिव्हाइस अनलॉक करण्‍यासाठी तुमची बायोमेट्रिक वापरण्‍याव्यतिरिक्त, ते सुरू होण्‍यापूर्वी तुमचा पिन अनिवार्य करून तुम्ही हे डिव्हाइस आणखी सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मसह कॉल, मेसेज किंवा सूचना मिळवू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पिन अनिवार्य करायचा का?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"तुमचे डिव्हाइस अनलॉक करण्‍यासाठी तुमची बायोमेट्रिक वापरण्‍याव्यतिरिक्त, ते सुरू होण्‍यापूर्वी तुमचा पॅटर्न अनिवार्य करून तुम्ही हे डिव्हाइस आणखी सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मसह कॉल, मेसेज किंवा सूचना मिळवू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पॅटर्न अनिवार्य करायचा का?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"तुमचे डिव्हाइस अनलॉक करण्‍यासाठी तुमची बायोमेट्रिक वापरण्‍याव्यतिरिक्त, ते सुरू होण्‍यापूर्वी तुमचा पासवर्ड अनिवार्य करून तुम्ही हे डिव्हाइस आणखी सुरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते अलार्मसह कॉल, मेसेज किंवा सूचना मिळवू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइस वरील डेटाचे संरक्षण करण्यात मदत होते. तुमचे डिव्हाइस सुरू करण्यासाठी पासवर्ड अनिवार्य करायचा का?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"होय"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"नाही"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"प्रतिबंधित"</string>
@@ -4073,7 +4098,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB वर यांचे नियंत्रण आहे"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"कनेक्ट केलेले डिव्हाइस"</string>
     <string name="usb_control_device" msgid="527916783743021577">"हे डिव्हाइस"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"स्विच करत आहे..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"स्विच करत आहे…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"स्विच करता आले नाही"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"हे डिव्हाइस चार्ज करत आहे"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"कनेक्ट केलेले डिव्हाइस चार्ज करत आहे"</string>
@@ -4267,6 +4292,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"मोबाइल डेटा वापर"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"अ‍ॅप डेटा वापर"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"वाय-फाय डेटा वापर"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"वाहकाने न केलेला डेटा वापर"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"इथरनेट डेटा वापर"</string>
     <string name="wifi" msgid="2932584495223243842">"वाय-फाय"</string>
     <string name="ethernet" msgid="4665162609974492983">"इथरनेट"</string>
@@ -4285,6 +4311,7 @@
       <item quantity="one">1 निर्बंध</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"वाहक डेटा गणना तुमच्या डिव्हाइसपेक्षा भिन्न असू शकते"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"वाहकाच्या नेटवर्कद्वारे वापरलेल्या डेटाचा समावेश करत नाही"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> वापरला"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"डेटा चेतावणी सेट करा"</string>
     <string name="data_warning" msgid="2925054658166062884">"डेटा चेतावणी"</string>
@@ -4320,7 +4347,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"तपशील पहा"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"डेटा सेव्हर"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"अनिर्बंध डेटा"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"पार्श्वभूमीवरील डेटा बंद केला आहे"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"बॅकग्राउंड डेटा बंद केला आहे"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"सुरू"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"बंद"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"डेटा सेव्हर वापरा"</string>
@@ -4343,7 +4370,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"डिव्हाइस लॉक केले असल्यास, प्रत्युत्तरे किंवा सूचनांमध्ये इतर मजकूर टाइप करण्यास प्रतिबंधित करा"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"डीफॉल्ट शब्दलेखन तपासक"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"शब्दलेखन तपासक निवडा"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"स्पेलचेकर वापरा"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"स्पेल चेकर वापरा"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"न निवडलेले"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(काहीही नाही)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4433,7 +4460,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"स्टोरेज स्थान मोकळे करण्यात मदत करण्यासाठी, स्टोरेज व्यवस्थापक तुमच्या डिव्हाइस वरून बॅक अप घेतलेले फोटो आणि व्हिडिओ काढतो."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"फोटो आणि व्हिडिओ काढा"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"स्टोरेज व्यवस्थापक"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"स्टोरेज व्यवस्थापक वापरा"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"स्टोरेज व्यवस्थापक वापरा"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"स्वयंचलित"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"व्यक्तिचलित"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"आता स्थान मोकळे करा"</string>
@@ -4471,6 +4498,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"फोन तपासण्‍यासाठी दोनदा टॅप करा"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"टॅब्लेट तपासण्‍यासाठी दोनदा-टॅप करा"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"डिव्हाइस तपासण्‍यासाठी दोनदा टॅप करा"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"सूचनांसाठी स्वाइप करा"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"तुमच्या सूचना दाखवण्यासाठी स्क्रीनच्या तळाशी कडेला खाली स्वाइप करा"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"एकहाती मोड"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"एकहाती मोड वापरा"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"अ‍ॅप्स स्विच करताना बाहेर पडा"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"टाइमआउट"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"४ सेकंद"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"८ सेकंद"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"१२ सेकंद"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"पोहोच"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"वेळ, सूचना आणि इतर माहिती तपासण्यासाठी, तुमच्या स्क्रीनवर दोनदा टॅप करा."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"फोन तपासण्‍यासाठी तो उचला"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"टॅब्लेट तपासण्‍यासाठी तो उचला"</string>
@@ -4483,6 +4520,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"टॅबलेट तपासण्यासाठी टॅप करा"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"डिव्हाइस तपासण्यासाठी टॅप करा"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"वेळ, सूचना आणि इतर माहिती तपासण्यासाठी तुमच्या स्क्रीनवर टॅप करा."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"आणीबाणी SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"आणीबाणी SOS वापरा"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> द्वारे व्यवस्थापित केलेले"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"पॉवर बटण झटपट पाच किंवा त्याहून अधिक वेळा दाबून खालील क्रिया सुरू करा"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"काउंटडाउन अलार्म प्ले करा"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"मदतीसाठी सूचित करण्यापूर्वी एखादा मोठा आवाज प्ले करा"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"मदतीसाठी कॉल करा"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"मदतीसाठी कॉल करण्याकरिता नंबर"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. बदलण्यासाठी टॅप करा"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"तुम्ही आणीबाणी नंबर नसलेला नंबर एंटर केल्यास:\n • तुमचे डिव्हाइस आणीबाणी SOS वापरण्यासाठी अनलॉक असले पाहिजे\n • तुमच्या कॉलला उत्तर दिले न जाण्याची शक्यता आहे"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"सूचनांसाठी फिंगरप्रिंट स्वाइप करा"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"फिंगरप्रिंट स्वाइप करा"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"तुमच्या सूचना तपासण्यासाठी, तुमच्या फोनच्या पाठीमागे फिंगरप्रिंट सेन्सरवर खाली स्वाइप करा."</string>
@@ -4608,6 +4655,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"कमाल दृश्यमान डेटासेट"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"डीफॉल्ट मूल्यांवर रीसेट करा"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"ऑटोफिल डेव्हलपर पर्याय रीसेट केले गेले आहेत"</string>
+    <string name="location_category" msgid="3496759112306219062">"स्थान"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"स्टेटस बारचा स्थान इंडिकेटर"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"नेटवर्क आणि कनेक्टिव्हिटीसह सर्व स्थानांसाठी दाखवा"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"पूर्ण GNSS मापांची सक्ती करा"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"कुठल्याही ड्युटी सायकलिंग शिवाय सर्व GNSS तारामंडळे आणि वारंवारता ट्रॅक करा"</string>
     <string name="device_theme" msgid="5027604586494772471">"डिव्हाइस थीम"</string>
     <string name="default_theme" msgid="4815428567082263639">"डीफॉल्ट"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"नेटवर्कचे नाव"</string>
@@ -4624,8 +4676,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"लक्ष केंद्रित केलेले राहण्यासाठी सूचना थांंबवा"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"वैशिष्‍ट्य उपलब्ध नाही"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"हे वैशिष्ट्य बंद केले गेले आहे कारण, ते तुमच्या फोनला धीमे करते"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"पूर्ण GNSS मापांची सक्ती करा"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"कुठल्याही ड्युटी सायकलिंग शिवाय सर्व GNSS तारामंडळे आणि वारंवारता ट्रॅक करा"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"नेहमी क्रॅश डायलॉग दाखवा"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"अ‍ॅप क्रॅश झाल्यावर प्रत्येक वेळी डायलॉग दाखवा"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE सुरू केलेले अ‍ॅप निवडा"</string>
@@ -4637,7 +4687,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"सर्व अ‍ॅप्ससाठी सुरू करा"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ग्राफिक ड्रायव्हर निवडा"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"डीफॉल्ट"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"गेम ड्रायव्हर"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"गेम ड्रायव्हर"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"डेव्हलपर ड्रायव्हर"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"सिस्टम ग्राफिक ड्रायव्हर"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4693,7 +4743,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"सुरू (म्‍यूट)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"बंद"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"नेटवर्क तपशील"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"तुमचे डिव्हाइस नाव तुमच्या फोनवरील ॲप्सना दृश्यमान आहे. तुम्ही ब्लूटूथ डिव्हाइसशी जोडता किंवा वाय-फाय हॉटस्पॉट सेट करता, तेव्हा हे इतर लोकांद्वारे देखील बघितले जाऊ शकते."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"तुमच्या डिव्हाइसचे नाव तुमच्या फोनवरील ॲप्सना दृश्यमान आहे. तुम्ही ब्लूटूथ डिव्हाइसशी कनेक्ट करता, वाय-फाय नेटवर्कशी कनेक्ट करता किंवा वाय-फाय हॉटस्पॉट सेट करता तेव्हा हे कदाचित इतर लोकदेखील पाहू शकतात."</string>
     <string name="devices_title" msgid="649715719278562515">"डिव्हाइस"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"सर्व सेटिंग्ज"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"सूचना"</string>
@@ -4706,6 +4756,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"नेटवर्क मिळू शकले नाहीत. पुन्‍हा प्रयत्‍न करा."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(मनाई केलेले)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"सिम कार्ड नाही"</string>
+    <string name="sim_card" msgid="6381158752066377709">"सिम"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"सिम नाही"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"काहीही नाही"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"कनेक्ट करण्यासाठी सिम आवश्यक आहे"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"कनेक्ट करण्यासाठी <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> चे सिम आवश्यक आहे"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"प्राधान्‍यकृत नेटवर्क मोड: WCDMA प्राधान्‍यकृत"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"प्राधान्‍यकृत नेटवर्क मोड: केवळ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"प्राधान्‍यकृत नेटवर्क प्रकार: केवळ WCDMA"</string>
@@ -4759,6 +4814,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"मोबाइल डेटा"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"मोबाइल नेटवर्क वापरून डेटा अ‍ॅक्सेस करा"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"रेंजमध्ये असताना फोन आपोआप या वाहकावर स्विच करेल"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"सिम कार्ड उपलब्ध नाही"</string>
     <string name="calls_preference" msgid="2166481296066890129">"कॉल प्राधान्य"</string>
     <string name="sms_preference" msgid="7742964962568219351">"एसएमएस प्राधान्य"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"प्रत्येक वेळी विचारा"</string>
@@ -4819,6 +4875,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>शी कनेक्ट केले असल्यास उपलब्ध नाही"</string>
     <string name="see_more" msgid="7499355691042812723">"आणखी पाहा"</string>
     <string name="see_less" msgid="2642392725363552793">"कमी पहा"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> सुरू करायचे आहे का?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"सिम सुरू करायचे आहे का?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> वर स्विच करायचे आहे का?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"सिम कार्ड वापरण्यावर स्विच करायचे आहे का?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"एका वेळी एक सिम अ‍ॅक्टिव्ह असू शकते.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> वर स्विच केल्याने तुमची <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> सेवा रद्द होणार नाही."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"एका वेळी डाउनलोड केलेले फक्त एकच सिम अ‍ॅक्टिव्ह असू शकते.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> वर स्विच केल्याने तुमच्या <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> सेवा रद्द होणार नाहीत."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"एकावेळी एकच सिम अ‍ॅक्टिव्ह असू शकते.\n\nस्विच केल्याने तुमची <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> सेवा रद्द होणार नाही."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> वर स्विच करा"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"नेटवर्कशी कनेक्ट करत आहे…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> वर स्विच करत आहे"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"वाहक स्विच करू शकत नाही"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"एररमुळे वाहक स्विच करू शकत नाही."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> बंद करायचे आहे का?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"सिम बंद करायचे आहे का?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"सिम बंद करत आहे<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"वाहक बंद करू शकत नाही"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"काहीतरी गडबड झाली आणि तुमचा वाहक बंद करता आला नाही."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"दोन सिम वापरायची आहेत का?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"या डिव्हाइसमध्ये एकाच वेळी दोन सिम अ‍ॅक्टिव्ह असू शकतात. एकावेळी एक सिम वापरणे सुरू ठेवण्यासाठी, \"नाही, नको\" वर टॅप करा."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"डिव्हाइस रीस्टार्ट करायचे आहे का?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"सुरुवात करण्यासाठी, तुमचे डिव्हाइस रीस्टार्ट करा. नंतर तुम्ही दुसरे सिम जोडू शकता."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"पुढे सुरू ठेवा"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"रीस्टार्ट करा"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"नाही, नको"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"स्विच करा"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"सिम ॲक्टिव्हेट करू शकत नाही"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"सिम काढा आणि ते पुन्हा घाला. समस्या कायम राहिल्यास, तुमचे डिव्हाइस रीस्टार्ट करा."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"सिम पुन्हा सुरू करून पाहा. समस्या सुरू राहिल्यास, तुमचे डिव्हाइस रीस्टार्ट करा."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"नेटवर्क अ‍ॅक्टिव्हेशन"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> अ‍ॅक्टिव्ह आहे"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"सिमची सेटिंग्ज अपडेट करण्यासाठी टॅप करा"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"सिम कार्ड"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"हे डाउनलोड केलेले सिम मिटवायचे?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"हे सिम मिटवल्याने या डिव्हाइसवरून <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> सेवा काढली जाते.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ची सेवा रद्द केली जाणार नाही."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"मिटवा"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"सिम मिटवत आहे…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"सिम मिटवू शकत नाही"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"हे सिम एका एररमुळे मिटवता येत नाही.\n\nतुमचे डिव्हाइस रीस्टार्ट करा आणि पुन्हा प्रयत्न करा."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"डिव्हाइसशी कनेक्ट करा"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"तुमच्या डिव्हाइसशी कनेक्ट करण्यासाठी <xliff:g id="APPNAME">%1$s</xliff:g> ॲपला तात्पुरते वाय-फाय नेटवर्क वापरायचे आहे"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"डिव्हाइस सापडले नाही. डिव्हाइस सुरू केली आहेत आणि ती कनेक्ट करण्यासाठी उपलब्ध आहेत याची खात्री करा."</string>
@@ -4890,6 +4984,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"आणीबाणी कॉल"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"तुमचा वाहक वाय-फाय कॉलिंगवर आणीबाणी कॉल करण्यासाठी सपोर्ट करत नाही.\nतुमचे डिव्हाइस आणीबाणी कॉल करण्यासाठी सेल्युलर नेटवर्कवर आपोआप स्विच होते.\n फक्त सेल्युलर नेटवर्कच्या परिसरात आणीबाणी कॉल करता येतात."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"कॉलची गुणवत्ता वाढवण्यासाठी वाय-फाय वापरा"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"क्रॉस सिम कॉलिंग"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"इतर सिमवरील कॉल आणि एसएमएस ना या सिमवर अनुमती द्या."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"क्रॉस सिम कॉलिंग"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"येणारा MMS मेसेज"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS मेसेज पाठवू शकत नाही"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"मोबाइल डेटा बंद असताना MMS मेसेजिंगला अनुमती देण्यासाठी <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> वर टॅप करा"</string>
@@ -4941,10 +5038,50 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Settings यामध्ये स्‍क्रीन ओव्‍हरलेची अनुमती द्या"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Settings स्क्रीनवर ओव्हरले करण्यासाठी इतर अ‍ॅप्सवर प्रदर्शित करू शकणाऱ्या अ‍ॅप्सना अनुमती द्या"</string>
     <string name="media_controls_title" msgid="403271085636252597">"मीडिया"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"मीडिया सेशन संपेल तेव्हा प्‍लेअर लपवा"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"प्‍लेअर तुम्हाला विस्तार केलेल्या क्विक सेटिंग्ज पॅनलमधून सेशन पुन्‍हा सुरू करण्याची अनुमती देतो."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"क्विक सेटिंग्ज मध्ये मीडिया प्लेअर"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"प्लेबॅक सहजरीत्‍या पुन्‍हा सुरू करण्यासाठी मीडिया प्लेअर विस्तारित कालावधीसाठी दाखवा"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"प्‍लेअर लपवा"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"प्‍लेअर दाखवा"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"कोणताही प्‍लेअर उपलब्ध नाही"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"अनुमती असलेली अ‍ॅप्स"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"मीडिया"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ब्लूटूथ सुरू होईल"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"सुरू करा"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"बंद करा"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"इंटरनेट"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"सिम"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"विमानामध्ये वापरण्यासाठी सुरक्षित असलेले नेटवर्क"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"विमानामध्ये वापरण्यासाठी सुरक्षित असलेले नेटवर्क शोधा आणि कनेक्ट करा"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"विमान, विमान सुरक्षित"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"कॉल आणि एसएमएस"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"वाय-फाय कॉलिंग"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"वाय-फाय यांसारख्या वाहक नसलेल्या नेटवर्कवरून कॉल करा आणि घ्या"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"वाय-फाय कॉलिंग तुम्हाला वाय-फाय यांसारख्या वाहक नसलेल्या नेटवर्कवरून कॉल करण्याची आणि घेण्याची अनुमती देते."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"कॉल"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"एसएमएस"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"प्राधान्य दिलेले"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"कॉलला प्राधान्य आहे"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS ला प्राधान्य आहे"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"उपलब्ध नाही"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"सिम नाही"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राधान्ये"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक नेटवर्कशी कनेक्ट करा"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्शन, इंटरनेट, वायरलेस, डेटा, वायफाय, वाय-फाय, वाय फाय, सेल्युलर, मोबाइल, सेल वाहक, 4g, 3g, 2g, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"विमानात वापरण्यास सुरक्षित नेटवर्क पहा"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"विमान मोड बंद करा"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"बेडटाइम मोड सुरू असल्यामुळे उपलब्ध नाही"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"सूचनांचे महत्त्व रीसेट करणे पूर्ण झाले."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"ॲप्स"</string>
+    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <skip />
 </resources>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 9a9aadc..117b7aa 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Sederhana"</item>
     <item msgid="6740026006576843477">"Panjang"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Pendek"</item>
+    <item msgid="7397961711906421599">"Sederhana"</item>
+    <item msgid="4079132024502041928">"Panjang"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Lalai"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA sahaja"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index cc651da..f3170e5 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Tarikh &amp; masa"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Tetapkan tarikh dan masa"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Tetapkan tarikh, masa, zon masa, &amp; format"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Gnakan masa diberikan rngkaian"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Gunakan zon waktu yang diberikan oleh rangkaian"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Tetapkan masa secara automatik"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Tetapkan zon waktu secara automatik"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gunakan tetapan lalai tempat peristiwa"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Format 24 jam"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gunakan format 24 jam"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Tunjukkan maklumat profil pada skrin kunci"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Akaun"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokasi"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Gunakan lokasi"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Gunakan lokasi"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Mati"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Hidup - <xliff:g id="COUNT_1">%1$d</xliff:g> apl mempunyai akses kepada lokasi</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kunci skrin, wajah buka kunci"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kunci skrin, cap jari"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Kunci skrin"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Buka kunci telefon dengan selamat dengan wajah dan cap jari"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Anda boleh mendaftar masuk ke apl dan mengesahkan pembayaran"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Sediakan pembukaan kunci dengan:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Wajah buka kunci"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Mudahkan pembukaan kunci telefon"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Cap jari"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Jimat masa buka kunci telefon dalam poket anda"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Langkau"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Seterusnya"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Wajah ditambahkan"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Sediakan wajah buka kunci"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Wajah buka kunci"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Gunakan wajah untuk membuat pengesahan"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Mula"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Jika wajah buka kunci kebolehaksesan dimatikan, beberapa langkah persediaan mungkin tidak berfungsi dengan baik dengan TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Kembali"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Teruskan persediaan"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Gunakan persediaan kebolehaksesan"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Apabila ciri ini digunakan dalam apl, sentiasa perlukan pengesahan"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Padamkan data wajah"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Sediakan wajah buka kunci"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Gunakan wajah buka kunci untuk membuka kunci peranti anda, log masuk ke apl dan mengesahkan pembayaran.\n\nJangan lupa:\nTindakan melihat telefon boleh membuka kunci telefon itu apabila anda tidak bermaksud untuk berbuat demikian.\n\nTelefon anda boleh dibuka kuncinya oleh orang lain jika telefon itu dihalakan rapat ke wajah anda.\n\nTelefon anda boleh dibuka kuncinya oleh seseorang yang mirip anda, seperti adik beradik yang berwajah seiras anda."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Gunakan wajah buka kunci untuk membuka kunci peranti anda, log masuk ke apl dan mengesahkan pembayaran.\n\nJangan lupa:\nTindakan melihat telefon boleh membuka kunci telefon itu walaupun anda tidak bermaksud untuk berbuat demikian.\n\nTelefon anda boleh dibuka kunci oleh orang lain jika telefon itu dihalakan rapat ke wajah anda meskipun mata anda tertutup.\n\nTelefon anda boleh dibuka kunci oleh seseorang yang mirip anda, seperti adik beradik yang berwajah seiras anda."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Gunakan wajah buka kunci untuk membuka kunci peranti anda, log masuk ke apl dan mengesahkan pembayaran."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Jangan lupa:\nTindakan melihat telefon boleh membuka kunci telefon itu walaupun anda tidak berniat untuk berbuat demikian.\n\nTelefon anda boleh dibuka kunci oleh orang lain jika dihalakan rapat ke wajah anda.\n\nTelefon anda boleh dibuka kunci oleh seseorang dengan wajah yang mirip wajah anda, seperti adik beradik anda yang berwajah seiras."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Jangan lupa:\nTindakan melihat telefon boleh membuka kunci telefon itu walaupun anda tidak berniat untuk berbuat demikian.\n\nTelefon anda boleh dibuka kunci oleh orang lain jika dihalakan rapat ke wajah anda meskipun mata anda tertutup.\n\nTelefon anda boleh dibuka kunci oleh seseorang dengan wajah yang mirip wajah anda, seperti adik beradik anda yang berwajah seiras."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Padamkan data wajah?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Data wajah yang digunakan oleh wajah buka kunci akan dipadamkan secara kekal dan selamat. Selepas pengalihan keluar, anda memerlukan PIN, corak atau kata laluan untuk membuka kunci telefon, log masuk ke apl dan mengesahkan pembayaran."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Gunakan wajah buka kunci untuk membuka kunci telefon anda"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gunakan cap jari anda untuk membuka kunci telefon atau membenarkan pembelian.\n\nPerhatian: Anda tidak boleh menggunakan cap jari untuk membuka kunci peranti ini. Untuk mendapatkan maklumat lanjut, hubungi pentadbir organisasi anda."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gunakan cap jari anda untuk membuka kunci telefon atau membenarkan pembelian.\n\nPerhatian: Cap jari anda mungkin kurang selamat berbanding corak atau PIN yang kukuh."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Batal"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Tidak perlu"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Teruskan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Langkau"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seterusnya"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Dengan melindungi tablet anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan tablet itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan wajah buka kunci. Untuk kembali, ketik Batal."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Dengan melindungi peranti anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan peranti itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan wajah buka kunci. Untuk kembali, ketik Batal."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Dengan melindungi telefon anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan telefon itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan wajah buka kunci. Untuk kembali, ketik Batal."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Dengan melindungi tablet anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan tablet itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan biometrik. Untuk kembali, ketik Batal."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Dengan melindungi peranti anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan peranti itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan biometrik. Untuk kembali, ketik Batal."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Dengan melindungi telefon anda menggunakan pilihan kunci skrin, tiada sesiapa yang dapat menggunakan telefon itu jika hilang atau dicuri. Anda juga memerlukan pilihan kunci skrin untuk menyediakan biometrik. Untuk kembali, ketik Batal."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Langkau persediaan PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Langkau persediaan kata laluan?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Langkau persediaan corak?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Halang orang lain daripada menggunakan tablet ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Halang orang lain daripada menggunakan peranti ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Halang orang lain daripada menggunakan telefon ini tanpa kebenaran anda dengan mengaktifkan ciri perlindungan peranti. Pilih kunci skrin yang anda ingin gunakan."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Pilih kaedah kunci skrin sandaran anda"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Pilih kaedah kunci skrin sandaran anda"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Pilih kaedah kunci skrin sandaran anda"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Pilihan kunci skrin"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Pilihan kunci skrin"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Kunci skrin"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Wajah buka kunci + Kata laluan"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Teruskan tanpa wajah buka kunci"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Anda boleh membuka kunci telefon menggunakan wajah. Untuk keselamatan, pilihan ini memerlukan kunci skrin sandaran."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrik + Corak"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrik + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrik + Kata laluan"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Teruskan tanpa biometrik"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Anda boleh membuka kunci telefon anda menggunakan biometrik anda. Untuk keselamatan, pilihan ini memerlukan kunci skrin sandaran."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Dlumpuhkn pentadbir, dsr penyulitan/storan bukti klayakn"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Tiada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Leret"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Mesti kurang daripada <xliff:g id="NUMBER_0">%d</xliff:g> digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Pentadbir peranti tidak membenarkan penggunaan PIN terbaharu"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"PIN lazim disekat oleh pentadbir IT anda. Cuba PIN yang lain."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Tidak boleh menyertakan aksara yang tidak sah"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Mesti mengandungi sekurang-kurangnya satu huruf"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Mesti mengandungi sekurang-kurangnya satu digit"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Mesti mengandungi sekurang-kurangnya 1 aksara bukan angka</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Pentadbir peranti tidak membenarkan penggunaan kata laluan terbaharu"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Kata laluan lazim disekat oleh pentadbir IT anda. Cuba kata laluan yang lain."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Angka menaik, menurun atau jujukan berulang tidak dibenarkan"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Sahkan"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Batal"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Hidupkan Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Gunakan Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Gunakan Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Tetapan Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Sediakan &amp; urus titik capaian wayarles"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Tengahkan kod QR di bawah untuk menyambung ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Sertai Wi‑Fi dengan mengimbas kod QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Kongsi Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Imbas kod QR ini untuk menyambung ke “<xliff:g id="SSID">%1$s</xliff:g>” dan berkongsi kata laluan"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Imbas kod QR ini menggunakan peranti lain untuk menyertai “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Imbas kod QR ini untuk menyambung ke “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Cuba lagi. Jika isu berterusan, hubungi pengilang peranti"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Kesilapan telah berlaku"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Kata laluan Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Kata laluan tempat liputan: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Autosambung"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Benarkan telefon bersambung secara automatik berdekatan rangkaian ini"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Benarkan tablet bersambung secara automatik berdekatan rangkaian ini"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Benarkan sambungan kepada rangkaian ini apabila berada dalam julat"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Tambah peranti"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Gunakan kod QR untuk menambahkan peranti pada rangkaian ini"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Kod QR bukan dalam format yang sah"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Gunakan sijil sistem"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Jangan berikan"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Jangan sahkan"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Tiada sijil yang ditentukan. Sambungan anda tidak akan menjadi sambungan peribadi."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Nama rangkaian terlalu panjang."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Perlu nyatakan domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sijil diperlukan."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Sambung"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi dihidupkan"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Disambungkan kepada <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Menyambung ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Menyambung…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Gagal menyambung ke rangkaian."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rangkaian di luar liputan"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Alamat MAC peranti"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Alamat MAC terawak"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Alamat MAC terawak (terakhir digunakan)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Alamat IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Butiran rangkaian"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Tapisan subrangkaian"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Alamat IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Rangkaian disimpan"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Langganan"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Rangkaian lain"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Tetapan IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Tetapan terperinci Wi-Fi tidak tersedia untuk pengguna ini"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Simpan"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Taipkan alamat gerbang yang sah."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Taipkan alamat DNS yang sah."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Sila taip awalan rgkaian yg pjgnya antara 0 &amp; 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (melainkan dibatalkan oleh DNS Peribadi)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (melainkan dibatalkan oleh DNS Peribadi)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Get laluan"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Panjang awalan rangkaian"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Apl berkongsi kandungan. Untuk berkongsi sambungan Internet, matikan dan hidupkan tempat liputan"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Tiada kata laluan yang ditetapkan"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nama tempat liputan"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Menghidupkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Menghidupkan <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Peranti lain boleh bersambung ke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Kata laluan tempat liputan"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Jalur AP"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Meningkatkan kadar muat semula daripada 60 kepada 90 Hz untuk sesetengah kandungan secara automatik. Meningkatkan penggunaan bateri."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Paksa kadar muat semula 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Kadar muat semula tertinggi untuk keresponsifan sentuhan &amp; kualiti animasi yang dipertingkat. Meningkatkan penggunaan bateri."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Perhatian skrin"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Hidup / Skrin tidak akan dimatikan jika anda melihat pada skrin"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Apabila skrin gelap, skrin akan dihidupkan untuk pemberitahuan baharu"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Sentiasa papar masa &amp; maklumat"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Penggunaan bateri bertambah"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Teks Huruf Tebal"</string>
     <string name="title_font_size" msgid="570613010306330622">"Saiz fon"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Besarkan atau kecilkan teks"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Tetapan kunci kad SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versi Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Kemas kini keselamatan Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model &amp; perkakasan"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versi perkakasan"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID Peralatan"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Padam APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN Baharu"</string>
     <string name="menu_save" msgid="6611465355127483100">"Simpan"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Buang"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Batal"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Medan Nama tidak boleh kosong."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN tidak boleh kosong."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Apl boleh ditetapkan semula"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Tetapkan semula Wi-Fi, mudah alih &amp; Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Tindakan ini akan menetapkan semula semua tetapan rangkaian, termasuk:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data mudah alih"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Padam"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Padamkan SIM yang dimuat turun"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Untuk memuat turun SIM gantian, hubungi pembawa anda. Tindakan ini tidak akan membatalkan sebarang pelan perkhidmatan mudah alih."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Tindakan ini tidak akan membatalkan mana-mana pelan perkhidmatan mudah alih. Untuk memuat turun SIM gantian, hubungi pembawa anda."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Tetapkan semula tetapan"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Tetapkan semula semua tetapan rangkaian? Tindakan ini tidak boleh dibuat asal."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Tetapkan semula semua tetapan rangkaian dan padamkan SIM yang dimuat turun? Tindakan ini tidak boleh dibuat asal."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Tetapan rangkaian telah ditetapkan semula"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Tidak dapat memadamkan SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"SIM yang dimuat turun tidak dapat dipadamkan disebabkan ralat.\n\nMulakan semula peranti anda, kemudian cuba lagi."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Padamkan semua data (tetapan semula kilang)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Padamkan semua data"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>"Data serta tetapan sistem dan apl"</li>\n<li>"Apl yang telah dimuat turun"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>"Data serta tetapan sistem dan apl"</li>\n<li>"Apl yang dimuat turun"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Terdapat pengguna lain pada peranti ini.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Ini tidak akan membatalkan pelan perkhidmatan mudah alih anda."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Untuk memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"kad SD"</b>" perlu dipadamkan."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Padamkan semua data (tetapan semula kilang)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Padamkan semua data (tetapan semula kilang)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" tablet anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>"Sistem dan data serta tetapan apl"</li>\n<li>"Apl yang telah dimuat turun"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Tindakan ini akan memadamkan semua data daripada "<b>"storan dalaman"</b>" telefon anda, termasuk:\n\n"<li>"Akaun Google Anda"</li>\n<li>" Sistem dan data serta tetapan apl"</li>\n<li>"Apl yang dimuat turun"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Anda melog masuk ke dalam akaun berikut buat masa ini:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Terdapat pengguna lain pada peranti ini.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muzik"</li>\n<li>"Foto"</li>\n<li>"Data pengguna yang lain"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ini tidak akan membatalkan pelan perkhidmatan mudah alih anda."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Untuk memadam bersih muzik, gambar dan data pengguna lain, "<b>"storan USB"</b>" perlu dipadamkan."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Untuk turut memadam bersih muzik, gambar dan data pengguna lain, "<b>"kad SD"</b>" perlu dipadamkan."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Padamkan storan USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Padam kad SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Padamkan semua data pada storan USB dalaman, seperti muzik atau foto"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Padamkan semua data pada kad SD, seperti muzik atau foto"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Padamkan semua data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Padamkan semua data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Semua maklumat peribadi anda dan apl yang dimuat turun akan dipadamkan. Tindakan ini tidak boleh dibuat asal."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Semua maklumat peribadi anda, termasuk apl &amp; SIM yang dimuat turun, akan dipadamkan. Tindakan ini tidak boleh dibuat asal."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Padamkan semua"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Tiada penetapan semula dijalankan kerana perkhidmatan Padam Bersih Sistem tidak tersedia."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Padamkan semua data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Tetapan semula kilang tidak tersedia untuk pengguna ini"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Memadam"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Sila tunggu..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Padamkan semua data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Padamkan semua data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Semua maklumat peribadi anda dan apl yang dimuat turun akan dipadamkan. Tindakan ini tidak boleh dibuat asal."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Semua maklumat peribadi anda, termasuk apl &amp; SIM yang dimuat turun akan dipadamkan. Tindakan ini tidak boleh dibuat asal."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Padamkan semua data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Tetapan semula kilang tidak tersedia untuk pengguna ini"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Memadam"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Sila tunggu…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Tetapan panggilan"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Tetapkan mel suara, pemajuan panggilan, panggilan menunggu, ID pemanggil"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Penambatan USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Tidak boleh menambat pada lebih daripada <xliff:g id="MAXCONNECTION">%1$d</xliff:g> peranti."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> akan dinyahtambat."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Penambatan Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Kongsi sambungan Internet telefon melalui Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Kongsi sambungan Internet telefon melalui Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Gunakan tempat liputan dan penambatan untuk menyediakan Internet kepada peranti lain melalui sambungan data mudah alih anda. Apl juga boleh membuat tempat liputan untuk berkongsi kandungan dengan peranti berdekatan."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Gunakan tempat liputan dan penambatan untuk menyediakan Internet kepada peranti lain melalui Wi-Fi atau sambungan data mudah alih anda. Apl juga boleh membuat tempat liputan untuk berkongsi kandungan dengan peranti berdekatan."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Bantuan"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pengimbasan Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Benarkan apl dan perkhidmatan mengimbas untuk mengesan peranti berdekatan pada bila-bila masa, meskipun apabila Bluetooth dimatikan. Ini dapat digunakan, contohnya, untuk meningkatkan ciri berasaskan lokasi dan perkhidmatan."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Perkhidmatan lokasi untuk kerja"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Pengesanan zon waktu lokasi"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Pengesanan zon waktu lokasi"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Membolehkan lokasi peranti digunakan untuk mengesan zon waktu semasa. Tetapan lokasi lain seperti pengimbasan Wi-Fi boleh mempengaruhi ketepatan pengesanan zon waktu."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Hidup"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Mati"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Pengesanan zon waktu automatik dilumpuhkan"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Pengesanan zon waktu lokasi dilumpuhkan"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Pengesanan zon waktu lokasi tidak disokong"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Perubahan pengesanan zon waktu lokasi tidak dibenarkan"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Lokasi Wi-Fi &amp; rangkaian mudah alih"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Biar apl guna perkhidmatan lokasi Google utk anggar lokasi lebih cepat. Data lokasi tanpa nama dikumpul dan dihantar kpd Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Lokasi ditentukan oleh Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Tetapkan sandaran wajah buka kunci"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Tetapkan sandaran wajah buka kunci"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Tetapkan sandaran wajah buka kunci"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Tetapkan sandaran buka kunci biometrik"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Tetapkan corak untuk gunakan biometrik"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Tetapkan PIN untuk menggunakan biometrik"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Terlupa kata laluan anda?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Terlupa corak anda?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Terlupa nombor PIN anda?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Pilihan sari kata"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Pembesaran"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Kawasan pembesaran"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Pembesaran didayakan"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Pilih kawasan pembesaran yang ingin digunakan apabila membesarkan skrin"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Skrin penuh"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Sebahagian skrin"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Skrin penuh &amp; sebahagian skrin"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Besarkan seluruh skrin"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Besarkan sebahagian skrin"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Tukar kepada butang kebolehaksesan?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Tindakan menggunakan tiga ketikan untuk membesarkan sebahagian daripada skrin akan menyebabkan penaipan dan tindakan lain ditangguhkan.\n\nAdakah anda ingin menukar kepada penggunaan butang kebolehaksesan untuk membesarkan item?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Tukar kepada butang kebolehaksesan"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Kekalkan tiga ketikan untuk membesarkan"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Tetapan pembesaran"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Besarkan dengan tiga ketikan"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Besarkan menggunakan pintasan"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Butang kuasa menamatkan panggilan"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Penuding tetikus besar"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Alih keluar animasi"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Gabungkan saluran semasa memainkan audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Keseimbangan audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Kiri"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Kanan"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Gabungkan saluran semasa memainkan audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Keseimbangan audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kiri"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Kanan"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Lalai"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 saat"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 saat"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Getaran pemberitahuan"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Getaran deringan"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Maklum balas sentuhan"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Gunakan <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Buka <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Gunakan pembetulan warna"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Tunjukkan kapsyen"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Untuk apl yang disokong sahaja"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Gunakan <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Buka <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Gunakan pembetulan warna"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Tunjukkan kapsyen"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Untuk apl yang disokong sahaja"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Saiz dan gaya kapsyen"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Saiz teks <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Lagi pilihan"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Skala kelabu"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Merah-hijau"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Merah-hijau"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Biru-Kuning"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Pengehadan latar belakang"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Benarkan apl berjalan di latar belakang"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Apl tidak dibenarkan berjalan di latar belakang"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Penggunaan latar belakang tidak boleh dihadkan"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Penggunaan latar belakang tidak boleh dihadkan"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Hadkan aktiviti latar belakang?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jika anda mengehadkan aktiviti latar belakang untuk apl, fungsi apl itu mungkin terganggu"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Apl ini tidak boleh dihadkan kerana tidak ditetapkan untuk mengoptimumkan bateri.\n\nHidupkan pengoptimuman bateri dahulu."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet digunakan lebih kerap berbanding biasa"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Peranti digunakan lebih kerap berbanding biasa"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Bateri mungkin kehabisan lebih awal daripada biasa"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Pengoptimuman untuk kesihatan bateri"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Bateri terhad untuk sementara. Ketik untuk mengetahui lebih lanjut."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefon anda telah digunakan lebih kerap berbanding biasa. Bateri anda mungkin kehabisan lebih cepat daripada jangkaan.\n\nApl yang paling banyak digunakan mengikut penggunaan bateri:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablet anda telah digunakan lebih kerap berbanding biasa. Bateri anda mungkin kehabisan lebih cepat daripada jangkaan.\n\nApl yang paling banyak digunakan mengikut penggunaan bateri:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Peranti anda telah digunakan lebih kerap berbanding biasa. Bateri anda mungkin kehabisan lebih cepat daripada jangkaan.\n\nApl yang paling banyak digunakan mengikut penggunaan bateri:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d apl disekat</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Masalah membaca meter bateri anda"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Masalah membaca meter bateri anda. Ketik untuk "<annotation id="url">"mengetahui lebih lanjut"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Hentikan apl?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Telefon anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> membuatkan telefon sentiasa berjaga.\n\nUntuk menyelesaikan isu ini, anda boleh menghentikan apl itu.\n\nJika perkara ini kerap berlaku, anda mungkin perlu menyahpasang apl tersebut untuk meningkatkan prestasi bateri."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Tablet anda tidak dapat mengurus bateri seperti biasa kerana <xliff:g id="APP">%1$s</xliff:g> membuatkan tablet sentiasa berjaga.\n\nUntuk menyelesaikan isu ini, anda boleh menghentikan apl itu.\n\nJika perkara ini kerap berlaku, anda mungkin perlu menyahpasang apl tersebut untuk meningkatkan prestasi bateri."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Tetapkan jadual"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Panjangkan hayat bateri"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Matikan apabila dicas"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Penjimat Bateri dimatikan apabila telefon anda pada <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Penjimat Bateri dimatikan apabila tablet anda pada <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Penjimat Bateri dimatikan apabila peranti anda pada <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Penjimat Bateri dimatikan apabila telefon anda dicas di atas <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Penjimat Bateri dimatikan apabila tablet anda dicas di atas <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Penjimat Bateri dimatikan apabila peranti anda dicas di atas <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Hidupkan"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Tetapkan semula"</string>
     <string name="tts_play" msgid="2945513377250757221">"Main"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Kesambungan mudah suai"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Melanjutkan hayat bateri dan meningkatkan prestasi peranti dengan mengurus sambungan rangkaian anda secara automatik"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Storan bukti kelayakan"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Pasang sijil"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Pasang sijil daripada storan"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Bukti kelayakan pengguna"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Lihat dan ubah suai bukti kelayakan yang disimpan"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Lanjutan"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Jenis storan"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Bersandarkan perkakasan"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Perisian sahaja"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Bukti kelayakan tidak tersedia untuk pengguna ini"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Dipasang untuk VPN dan apl"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Dipasang untuk Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Jangan pasang"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Pasang juga"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sijil tidak dipasang"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Benarkan <xliff:g id="APP_NAME">%s</xliff:g> untuk memasang sijil pada peranti ini?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Sijil-sijil ini akan mengenal pasti anda untuk apl dan URL di bawah"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Jangan benarkan"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Benarkan"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Tunjukkan lagi"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Apl pengurusan sijil"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Tiada"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Sijil yang dipasang oleh apl ini mengenal pasti anda kepada apl dan URL di bawah"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Alih keluar"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Isyarat dail kecemasan"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Tetapkan tingkah laku semasa membuat panggilan kecemasan"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Sandaran"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Tidak disediakan - Profil kerja"</string>
     <string name="user_admin" msgid="4024553191395768119">"Pentadbir"</string>
     <string name="user_you" msgid="3070562015202859996">"Anda (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nama samaran"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Anda boleh menambahkan sehingga <xliff:g id="USER_COUNT">%1$d</xliff:g> pengguna"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Hanya pemilik tablet boleh menguruskan pengguna."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Hanya pemilik telefon boleh menguruskan pengguna."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Membuat pembayaran di terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Sediakan apl bayaran. Kemudian, pegang telefon anda dengan bahagian belakang dihadapkan ke sebarang terminal yang terdapat simbol tanpa sentuhan."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Faham"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Lagi..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Lagi…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Tetapkan apl pembayaran lalai anda"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Kemas kini apl pembayaran lalai anda"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Pada terminal tanpa sentuhan, bayar dengan <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Kembali"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Seterusnya"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Selesai"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Ambil foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Pilih imej"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Pilih foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Kad SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Kad SIM"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Sentiasa gunakan ini untuk panggilan"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Pilih SIM untuk data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Pilih SIM untuk SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Menukar SIM data, proses ini boleh mengambil masa sehingga satu minit…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Menukar SIM data, ini boleh mengambil masa sehingga satu minit…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Panggil dengan"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Pilih kad SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutin, jadual, penjimat bateri, penjimat kuasa, bateri, automatik, peratus"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, panggilan lanjutan, panggilan 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"tambah bahasa, tambah satu bahasa"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"saiz teks"</string>
     <string name="default_sound" msgid="6604374495015245195">"Bunyi lalai"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Kelantangan dering &amp; pemberitahuan di <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Kelantangan, getaran, Jangan Ganggu"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Bunyi semasa kuasa dihidupkan"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Sari Kata Langsung"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Sari kata media automatik"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Tiada"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> jadual ditetapkan</item>
-      <item quantity="one">1 jadual ditetapkan</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Tiada}=1{1 jadual ditetapkan}other{# jadual ditetapkan}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Jangan Ganggu"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Dapatkan pemberitahuan oleh orang dan apl penting sahaja"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Hadkan gangguan"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Keutamaan sahaja"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Hidup / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Mati / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Mati"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Hidup"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Tanya setiap kali"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Sehingga anda matikan"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> jam</item>
-      <item quantity="one">1 jam</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minit"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> jadual boleh dihidupkan secara automatik</item>
-      <item quantity="one">1 jadual boleh dihidupkan secara automatik</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 jam}other{# jam}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minit}other{# minit}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Mati}=1{Mati / 1 jadual boleh dihidupkan secara automatik}other{Mati / # jadual boleh dihidupkan secara automatik}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Perkara yang boleh mengganggu Jangan Ganggu"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Orang"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apl"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Tetapkan pemberitahuan berkeutamaan rendah kepada Lembut secara automatik"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Kedudukan pemberitahuan boleh suai"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Atur kedudukan pemberitahuan secara automatik mengikut kaitan"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Maklum balas pemberitahuan mudah suai"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Tunjukkan pelarasan yang dibuat pada pemberitahuan dan tunjukkan pilihan untuk memberikan maklum balas kepada sistem"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Tetapkan semula kepentingan pemberitahuan"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Pengguna yang ditetapkan semula telah mengubah tetapan kepentingan dan membenarkan pembantu pemberitahuan untuk melakukan keutamaan."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Tindakan dan balasan yang dicadangkan"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Tunjukkan tindakan &amp; balasan yang dicadangkan secara automatik"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Tunjukkan pemberitahuan baru-baru ini dan pemberitahuan yang ditunda"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Perbualan keutamaan"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Tunjukkan di sebelah atas bahagian perbualan dan kelihatan sebagai gelembung terapung"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Muncul di atas bahagian perbualan"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Perbualan lain"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Perbualan tanpa keutamaan"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Perbualan yang telah anda buat perubahan"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Perbualan terbaharu"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Kosongkan baru-baru ini"</string>
+    <string name="clear" msgid="5092178335409471100">"Kosongkan"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Gelembungkan perbualan keutamaan"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Perbualan keutamaan ditunjukkan di bahagian atas bidai tarik turun. Anda juga boleh menetapkan perbualan ini agar dipaparkan dalam gelembung dan boleh mengganggu ciri Jangan Ganggu."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Perbualan keutamaan dan perbualan yang diubah suai akan dipaparkan di sini"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Akses Jangan Ganggu"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Benarkan Jangan Ganggu"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Tiada sebarang apl yang terpasang meminta akses Jangan Ganggu"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Memuatkan apl..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Memuatkan apl…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Atas permintaan anda, Android menyekat pemberitahuan apl ini daripada muncul pada peranti ini"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Atas permintaan anda, Android menyekat kategori pemberitahuan ini daripada muncul pada peranti ini"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Atas permintaan anda, Android menyekat kumpulan pemberitahuan ini daripada muncul pada peranti ini"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Semua perbualan"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Perbualan keutamaan"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Tiada"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> perbualan</item>
-      <item quantity="one">1 perbualan</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Tiada"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Tiada}=1{1 perbualan}other{# perbualan}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Orang yang boleh ganggu"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Panggilan"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Panggilan"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Untuk memastikan panggilan yang dibenarkan berbunyi, periksa bahawa peranti telah ditetapkan supaya berdering"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Panggilan masuk disekat untuk ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’. Anda boleh melaraskan tetapan untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kenalan dibintangi"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> yang lain</item>
-      <item quantity="one">seorang lagi</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Tiada"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Tiada}=1{{contact_1}}=2{{contact_1} dan {contact_2}}=3{{contact_1}, {contact_2} dan {contact_3}}other{{contact_1}, {contact_2} dan # yang lain}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Tiada nama)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mesej"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mesej"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mesej"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Mesej masuk disekat untuk ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’. Anda boleh melaraskan tetapan untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Anda boleh menerima semua mesej"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Anda boleh dihubungi oleh semua panggilan"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Tiada"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kenalan</item>
-      <item quantity="one">1 kenalan</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Tiada}=1{1 kenalan}other{# kenalan}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Sesiapa sahaja"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kenalan"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kenalan dibintangi"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Semua pemberitahuan"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Sesetengah pemberitahuan"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Orang yang dipilih masih dapat menghubungi anda walaupun anda tidak membenarkan apl mengganggu"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> boleh ganggu</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> boleh ganggu</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> lagi"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Tiada apl yang boleh ganggu}=1{{app_1} boleh ganggu}=2{{app_1} dan {app_2} boleh ganggu}=3{{app_1}, {app_2} dan {app_3} boleh ganggu}other{{app_1}, {app_2} dan # lagi boleh ganggu}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apl"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Semua pemberitahuan"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Sesetengah pemberitahuan"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Pemberitahuan yang boleh ganggu"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Benarkan semua pemberitahuan"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> boleh ganggu</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> boleh ganggu</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Tiada apa-apa yang boleh ganggu"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> lagi"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Tiada apa-apa yang boleh ganggu}=1{{sound_category_1} boleh ganggu}=2{{sound_category_1} dan {sound_category_2} boleh ganggu}=3{{sound_category_1}, {sound_category_2} dan {sound_category_3} boleh ganggu}other{{sound_category_1}, {sound_category_2} dan # lagi boleh ganggu}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Tiada apa-apa yang boleh ganggu"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Tiada seorang pun boleh ganggu"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Sesetengah orang boleh ganggu"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Semua orang boleh ganggu"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Hidup"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Mati"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Penyematan apl"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Penyematan apl membenarkan anda mengekalkan paparan apl semasa sehingga anda menyahsemat apl itu. Ciri ini boleh digunakan, contohnya, untuk membenarkan rakan yang dipercayai bermain permainan tertentu. \n\nApabila apl disemat, apl yang disemat itu boleh membuka apl lain dan data peribadi mungkin boleh diakses. \n\nUntuk menggunakan penyematan apl: 	\n1.	Hidupkan penyematan apl 	\n2.	Buka Ikhtisar 	\n3.	Ketik ikon kunci di bahagian atas skrin, kemudian ketik Pin"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Penyematan apl membenarkan anda mengekalkan paparan apl semasa sehingga anda menyahsemat apl itu. Ciri ini boleh digunakan, contohnya, untuk membenarkan rakan yang dipercayai bermain permainan tertentu. \n\nApabila apl disemat, apl yang disemat itu boleh membuka apl lain dan data peribadi mungkin boleh diakses. \n\nJika anda mahu berkongsi peranti anda dengan orang lain secara selamat, cuba gunakan pengguna tetamu. \n\nUntuk menggunakan penyematan apl: 	\n1.	Hidupkan penyematan apl 	\n2.	Buka Ikhtisar 	\n3.	Ketik ikon apl di bahagian atas skrin, kemudian ketik Semat"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Penyematan apl membenarkan anda mengekalkan paparan apl semasa sehingga anda menyahsemat apl itu. Ciri ini boleh digunakan, contohnya, untuk membenarkan rakan yang dipercayai bermain permainan tertentu."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Apabila apl disemat, apl yang disemat itu boleh membuka apl lain dan data peribadi mungkin boleh diakses. \n\nUntuk menggunakan penyematan apl: 	\n1.	Hidupkan penyematan apl 	\n2.	Buka Ikhtisar 	\n3.	Ketik ikon apl di bahagian atas skrin, kemudian ketik Semat"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Apabila apl disemat, apl yang disemat itu boleh membuka apl lain dan data peribadi mungkin boleh diakses. \n\nJika anda mahu berkongsi peranti anda dengan orang lain secara selamat, cuba gunakan pengguna tetamu. \n\nUntuk menggunakan penyematan apl: 	\n1.	Hidupkan penyematan apl 	\n2.	Buka Ikhtisar 	\n3.	Ketik ikon apl di bahagian atas skrin, kemudian ketik Semat"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Apabila apl disemat: \n\n•		Data peribadi mungkin boleh diakses \n		(seperti kenalan dan kandungan e-mel) \n•		Apl yang disemat boleh membuka apl lain \n\nHanya gunakan penyematan apl dengan orang yang anda percayai."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Minta corak buka kunci sebelum menyahsemat"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Minta PIN sebelum nyahsemat"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Selain menggunakan wajah untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta PIN sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta PIN untuk memulakan peranti anda?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Selain menggunakan wajah untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta corak sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta corak untuk memulakan peranti anda?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Selain menggunakan wajah untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta kata laluan sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan termasuk penggera sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta kata laluan untuk memulakan peranti anda?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Selain menggunakan biometrik untuk membuka kunci peranti anda, anda boleh melindungi peranti ini lagi dengan meminta PIN anda sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta PIN untuk memulakan peranti anda?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Selain menggunakan biometrik untuk membuka kunci peranti anda, anda boleh melindungi peranti ini lagi dengan meminta corak anda sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta corak untuk memulakan peranti anda?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Selain menggunakan biometrik untuk membuka kunci peranti anda, anda boleh melindungi peranti ini lagi dengan meminta kata laluan anda sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta kata laluan untuk memulakan peranti anda?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ya"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Tidak"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Terhad"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB dikawal oleh"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Peranti yang disambungkan"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Peranti ini"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Bertukar…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Bertukar…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Tidak dapat bertukar"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Mengecas peranti ini"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Mengecas peranti tersambung"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Penggunaan data mudah alih"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Penggunaan data apl"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Penggunaan data Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Penggunaan data bukan pembawa"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Penggunaan data Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 sekatan</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Cara pengiraan data pembawa mungkin berbeza daripada pengiraan peranti"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Kecualikan data yang digunakan oleh rangkaian pembawa"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> digunakan"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Tetapkan amaran data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Amaran data"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Lihat butiran"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Penjimat Data"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Data tanpa had"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Data latar belakang dimatikan"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Data latar belakang dimatikan"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Hidup"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Mati"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Gunakan Penjimat Data"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Jika peranti dikunci, halang penaipan balasan atau teks lain dalam pemberitahuan"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Penyemak ejaan lalai"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Pilih penyemak ejaan"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Gunakan penyemak ejaan"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Gunakan penyemak ejaan"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Tidak dipilih"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(tiada)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Untuk membantu mengosongkan ruang storan, pengurus storan akan mengalih keluar foto dan video sandaran daripada peranti anda."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Alih keluar foto &amp; video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Pengurus storan"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Gunakan pengurus Storan"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Gunakan Pengurus storan"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatik"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Kosongkan ruang sekarang"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Ketik dua kali untuk memeriksa telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Ketik dua kali untuk menyemak tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Ketik dua kali untuk menyemak peranti"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Leret untuk mendapatkan pemberitahuan"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Leret ke bawah di sisi bawah skrin untuk menunjukkan pemberitahuan anda"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Mod sebelah tangan"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Gunakan mod sebelah tangan"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Keluar apabila menukar apl"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tamat masa"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 saat"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 saat"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 saat"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"kebolehjangkauan"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Untuk menyemak masa, pemberitahuan dan maklumat lain, ketik dua kali pada skrin anda."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Angkat untuk memeriksa telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Angkat untuk menyemak tablet"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Ketik untuk memeriksa tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Ketik untuk memeriksa peranti"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Untuk menyemak masa, pemberitahuan dan maklumat lain, ketik skrin anda."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS Kecemasan"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Gunakan SOS kecemasan"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Diurus oleh <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Mulakan tindakan di bawah dengan menekan butang kuasa sebanyak 5 kali atau lebih dengan cepat"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Mainkan penggera hitung detik"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Mainkan bunyi yang kuat sebelum meminta bantuan"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Hubungi untuk mendapatkan bantuan."</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Nombor untuk dihubungi untuk mendapatkan bantuan"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Ketik untuk menukar"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Jika anda memasukkan nombor bukan kecemasan:\n • Peranti anda mesti dibuka kunci untuk menggunakan SOS kecemasan\n • Panggilan anda mungkin tidak dijawab"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Leret cap jari untuk pemberitahuan"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Leret cap jari"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Untuk menyemak pemberitahuan, leret ke bawah pada penderia cap jari di bahagian belakang telefon anda."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Set data maksimum yang kelihatan"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Tetapkan semula kepada nilai lalai"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Ciri autolengkapkan pilihan pembangun telah ditetapkan semula"</string>
+    <string name="location_category" msgid="3496759112306219062">"Lokasi"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Penunjuk lokasi bar status"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Tunjukkan untuk semua lokasi, termasuk rangkaian dan kesambungan"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Paksa ukuran GNSS penuh"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Jejak semua gugusan dan kekerapan GNSS tanpa kitaran tugas"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema peranti"</string>
     <string name="default_theme" msgid="4815428567082263639">"Lalai"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nama rangkaian"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Jeda pemberitahuan untuk mengekalkan tumpuan"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Ciri tidak tersedia"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Ciri ini telah dimatikan kerana memperlahankan telefon anda"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Paksa ukuran GNSS penuh"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Jejak semua gugusan dan kekerapan GNSS tanpa kitaran tugas"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Sentiasa tunjukkan dialog ranap sistem"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Tunjukkan dialog setiap kali apl ranap"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Pilih apl didayakan ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Dayakan untuk semua apl"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Pilih Pemacu Grafik"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Lalai"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Pemacu Permainan"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Pemacu Permainan"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Pemacu Pembangun"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Pemacu Grafik Sistem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Hidup (redam)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Mati"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Butiran rangkaian"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Nama peranti anda kelihatan kepada apl pada telefon anda. Nama ini mungkin dapat dilihat oleh orang lain juga apabila anda menyambung ke peranti Bluetooth atau menyediakan tempat liputan Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Nama peranti anda boleh dilihat oleh apl pada telefon anda. Nama peranti anda juga boleh dilihat oleh orang lain apabila anda menyambung kepada peranti Bluetooth, menyambung kepada rangkaian Wi-Fi atau menyediakan tempat liputan Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Peranti"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Semua Tetapan"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Cadangan"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Tidak menemui rangkaian. Cuba lagi."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(dilarang)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Tiada kad SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Tiada SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Tiada"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Memerlukan SIM untuk menyambung"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Memerlukan SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> untuk menyambung"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mod rangkaian pilihan: WCDMA diutamakan"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mod rangkaian pilihan: GSM sahaja"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mod rangkaian pilihan: WCDMA sahaja"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Data mudah alih"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Akses data menggunakan rangkaian mudah alih"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon akan bertukar kepada pembawa ini secara automatik apabila berada dalam liputan"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Tiada kad SIM yang tersedia"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Pilihan panggilan"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Pilihan SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Tanya setiap kali"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Tidak tersedia apabila disambungkan ke <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Lihat lagi"</string>
     <string name="see_less" msgid="2642392725363552793">"Lihat kurang"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Hidupkan <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Hidupkan SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Tukar kepada <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Tukar kepada penggunaan kad SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Hanya satu SIM yang boleh aktif pada satu-satu masa.\n\nBertukar kepada <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan perkhidmatan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> anda."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Hanya satu SIM yang dimuat turun boleh aktif pada satu-satu masa.\n\nBertukar kepada <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> tidak akan membatalkan perkhidmatan <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> anda."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Hanya satu SIM yang boleh aktif pada satu-satu masa.\n\nPenukaran tidak akan membatalkan perkhidmatan <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> anda."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Tukar kepada <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Menyambung kepada rangkaian…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Bertukar kepada <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Tidak dapat menukar pembawa"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Pembawa tidak dapat ditukar disebabkan ralat."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Matikan <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Matikan SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Mematikan SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Tidak dapat melumpuhkan pembawa"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Kesilapan telah berlaku dan pembawa anda tidak dapat dilumpuhkan."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Gunakan 2 SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Peranti ini boleh mempunyai 2 SIM aktif serentak. Untuk terus menggunakan 1 SIM pada satu-satu masa, ketik \"Tidak perlu\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Mulakan semula peranti?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Untuk bermula, mulakan semula peranti anda. Kemudian, anda boleh menambahkan SIM lain."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Teruskan"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Mulakan semula"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Tidak perlu"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Tukar"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Tidak dapat mengaktifkan SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Keluarkan SIM dan masukkan kad itu kembali. Jika masalah berlanjutan, mulakan semula peranti anda."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Cuba hidupkan SIM sekali lagi. Jika masalah berlanjutan, mulakan semula peranti anda."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Pengaktifan rangkaian"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> aktif"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Ketik untuk mengemas kini tetapan SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Kad SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Padamkan SIM yang dimuat turun ini?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Pemadaman SIM ini akan mengalih keluar perkhidmatan <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> daripada peranti ini.\n\nPerkhidmatan <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> tidak akan dibatalkan."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Padam"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Memadamkan SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Tidak dapat memadamkan SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"SIM ini tidak dapat dipadamkan disebabkan ralat.\n\nMulakan semula peranti anda, kemudian cuba lagi."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Sambung ke peranti"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Apl <xliff:g id="APPNAME">%1$s</xliff:g> mahu menggunakan rangkaian Wi-Fi sementara untuk menyambung ke peranti anda"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Tiada peranti ditemui. Pastikan peranti dihidupkan dan tersedia untuk menyambung."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Panggilan kecemasan"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Panggilan kecemasan melalui Panggilan Wi‑Fi tidak disokong oleh pembawa anda.\nPeranti akan bertukar kepada rangkaian selular secara automatik untuk membuat panggilan kecemasan.\nPanggilan kecemasan hanya boleh dibuat di kawasan yang terdapat liputan selular."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Gunakan Wi-Fi untuk panggilan untuk meningkatkan kualiti"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Panggilan silang SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Benarkan panggilan SIM dan SMS lain melalui SIM ini."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"panggilan silang sim"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Mesej MMS masuk"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Tidak dapat menghantar mesej MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Ketik untuk membenarkan pemesejan MMS pada <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> apabila data mudah alih dimatikan"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Benarkan tindanan skrin pada Tetapan"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Benarkan apl yang boleh dipaparkan di atas apl lain untuk menindan skrin Tetapan"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Sembunyikan pemain apabila sesi media tamat"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Pemain membolehkan anda menyambung semula sesi daripada panel Tetapan Pantas yang dikembangkan."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Pemain media dalam Tetapan Pantas"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Tunjukkan pemain media untuk tempoh yang lama untuk menyambung semula main balik dengan mudah"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Sembunyikan pemain"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Tunjukkan pemain"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Tiada pemain tersedia"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Apl dibenarkan"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth akan dihidupkan"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Hidup"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Mati"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Rangkaian selamat pesawat"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Cari dan sambung ke rangkaian selamat pesawat"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"pesawat, selamat pesawat"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Panggilan &amp; SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Panggilan Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Buat dan terima panggilan melalui rangkaian bukan pembawa seperti Wi-Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Panggilan Wi-Fi membolehkan anda membuat dan menerima panggilan melalui rangkaian bukan pembawa seperti sesetengah rangkaian Wi-Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Panggilan"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"diutamakan"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"panggilan diutamakan"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS diutamakan"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"tidak tersedia"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Tiada SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Pilihan"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Sambungkan kepada rangkaian awam"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"sambungan rangkaian, internet, wayarles, data, wifi, wi-fi, wi fi, selular, mudah alih, pembawa selular, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Paparkan rangkaian selamat pesawat"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Matikan Mod Pesawat"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Tidak tersedia kerana mod waktu tidur dihidupkan"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Selesai menetapkan semula kepentingan pemberitahuan."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apl"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Peranti yang tidak dipercayai ingin mengakses mesej anda. Ketik untuk mendapatkan butiran."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Benarkan akses kepada mesej?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Peranti Bluetooth yang tidak dipercayai, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ingin mengakses mesej anda.\n\nAnda belum pernah disambungkan kepada [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Peranti yang tidak dipercayai ingin mengakses kenalan dan log panggilan anda. Ketik untuk mendapatkan butiran."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Benarkan akses kepada kenalan dan log panggilan?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Peranti Bluetooth yang tidak dipercayai, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ingn mengakses kenalan dan log panggilan anda. Ini termasuk data tentang panggilan masuk dan keluar.\n\nAnda belum pernah disambungkan kepada [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 60f8af9..893fbb9 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"အတော်အသင့်"</item>
     <item msgid="6740026006576843477">"အရှည်"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"အတို"</item>
+    <item msgid="7397961711906421599">"အလယ်အလတ်"</item>
+    <item msgid="4079132024502041928">"အရှည်"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"မူလစာလုံး"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ကမ္ဘာအနှံ့"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA သာ"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ကမ္ဘာအနှံ့"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index acb6f3f..d5fec3a 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"ရက်စွဲနှင့် အချိန်"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"ရက်စွဲနှင့် အချိန် သတ်မှတ်ရန်"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"ရက်စွဲ အချိန် အချိန်ဇုန်နှင့် ပုံစံများအား သတ်မှတ်ရန်"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"ကွန်ရက်က ပြသောအချိန် သုံးပါ"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"ကွန်ရက်က ဖော်ပြထားသောအချိန်ဇုန်ကို သုံးရန်"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"အချိန် အလိုအလျောက် သတ်မှတ်ခြင်း"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"ဒေသစံတော်ချိန် အလိုအလျောက် သတ်မှတ်ခြင်း"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"အသုံးပြုမည့် ဒေသဘာသာစကား၏စနစ်ကို သုံးရန်"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"၂၄-နာရီပုံစံ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"၂၄-နာရီပုံစံကို အသုံးပြုမည်"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"သော့ခတ်ထားသောမျက်နှာပြင်ပေါ်သုံးစွဲသူ၏အကြောင်းပြရန်"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"အကောင့်များ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"တည်နေရာ"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"တည်နေရာကို သုံးရန်"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"တည်နေရာကို သုံးရန်"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ပိတ်ထားသည်"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ဖွင့်ထားသည် - အက်ပ် <xliff:g id="COUNT_1">%1$d</xliff:g> ခုက တည်နေရာ ဝင်သုံးခွင့်ရှိပါသည်</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ဖုန်းမျက်နှာပြင် လော့ခ်၊ မျက်နှာမှတ် သော့ဖွင့်ခြင်း"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ဖန်သားပြင် လော့ခ်ချခြင်း၊ လက်ဗွေ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ဖန်သားပြင် လော့ခ်ချခြင်း"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"သင့်ဖုန်းကို မျက်နှာ၊ လက်ဗွေတို့ဖြင့် လုံခြုံစွာဖွင့်လိုက်ပါ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"အက်ပ်များသို့လက်မှတ်ထိုးဝင်ပြီး ပေးချေမှုကို အတည်ပြုနိုင်သည်"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"လော့ခ်ဖွင့်ခြင်း သတ်မှတ်ရန်-"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"မျက်နှာမှတ် သော့ဖွင့်ခြင်း"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ဖုန်းကို အလွယ်ဖွင့်ရန်"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"လက်ဗွေ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"အိပ်ထဲ၌ ဖုန်းလော့ခ်ပွင့်ချိန် ချွေတာရန်"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ကျော်ရန်"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ရှေ့သို့"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"မျက်နှာ ထည့်သွင်းပြီး"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"မျက်နှာမှတ် သော့ဖွင့်ခြင်း ထည့်သွင်းပါ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"မျက်နှာမှတ် သော့ဖွင့်ခြင်း"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"အထောက်အထားစိစစ်ရန် သင့်မျက်နှာကို သုံးပါ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"စတင်ရန်"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"အများသုံးစွဲနိုင်သည့် မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ပိတ်ထားပါက အချို့သော စနစ်ထည့်သွင်းခြင်းအဆင့်များသည် TalkBack နှင့် အဆင်ပြေစွာအလုပ်မလုပ်နိုင်ပါ။"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"နောက်သို့"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ဆက်၍စနစ်ထည့်သွင်းရန်"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"အများသုံးစွဲနိုင်မှုကို သုံးရန်"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"အက်ပ်တွင် မျက်နှာမှတ် သော့ဖွင့်ခြင်းသုံးလျှင် အတည်ပြုရန်အမြဲလိုအပ်သည်"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"မျက်နှာဒေတာဖျက်ရန်"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"မျက်နှာမှတ်သော့ဖွင့်ခြင်း ထည့်သွင်းရန်"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"သင့်စက်ကို ဖွင့်ရန်၊ အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန်နှင့် ငွေပေးချေမှုများကို အတည်ပြုရန် မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို အသုံးပြုပါ။\n\nသတိပြုရန်-\nမတော်တဆ သင့်ဖုန်းကို ကြည့်မိရုံမျှဖြင့် ဖုန်းပွင့်သွားနိုင်ပါသည်။\n\nတစ်စုံတစ်ယောက်က သင့်မျက်နှာအနီး သင့်ဖုန်းကိုကိုင်၍လည်း ဖွင့်နိုင်သည်။\n\nသင့်အမြွှာကဲ့သို့ သင်နှင့် အလွန်တူသူများသည်လည်း သင့်ဖုန်းကို ဖွင့်နိုင်သည်။"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"သင့်စက်ကို ဖွင့်ရန်၊ အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန်နှင့် ငွေပေးချေမှုများကို အတည်ပြုရန် \'မျက်နှာမှတ် သော့ဖွင့်ခြင်း\' ကို အသုံးပြုပါ။\n\nသတိပြုရန်-\nသင့်ဖုန်းကို မတော်တဆကြည့်မိရုံဖြင့် ဖုန်းပွင့်သွားနိုင်သည်။\n\nမျက်လုံးများပိတ်ထားသော်လည်း တစ်စုံတစ်ယောက်က သင်၏မျက်နှာအနီးတွင် သင့်ဖုန်းကို ကိုင်ထားခြင်းဖြင့် လော့ခ်ဖွင့်နိုင်သည်။\n\nတထေရာတည်းတူသော မောင်နှမကဲ့သို့ သင်နှင့်အလွန်တူသူ တစ်ယောက်ယောက်က သင်၏ဖုန်းကို ဖွင့်နိုင်သည်။"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"သင့်စက်ကို ဖွင့်ရန်၊ အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ရန်နှင့် ငွေပေးချေမှုများကို အတည်ပြုရန် မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို အသုံးပြုပါ။"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"သတိပြုရန်-\nမတော်တဆ သင့်ဖုန်းကို ကြည့်မိရုံမျှဖြင့် ဖုန်းပွင့်သွားနိုင်ပါသည်။\n\nတစ်စုံတစ်ယောက်က သင့်မျက်နှာအနီး သင့်ဖုန်းကိုကိုင်၍လည်း ဖွင့်နိုင်သည်။\n\nသင့်အမြွှာကဲ့သို့ သင်နှင့် အလွန်တူသူများသည်လည်း သင့်ဖုန်းကို ဖွင့်နိုင်သည်။"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"သတိပြုရန်-\nမတော်တဆ သင့်ဖုန်းကို ကြည့်မိရုံမျှဖြင့် ဖုန်းပွင့်သွားနိုင်ပါသည်။\n\nမျက်လုံးများပိတ်ထားသော်လည်း တစ်စုံတစ်ယောက်က သင့်မျက်နှာအနီးတွင် သင့်ဖုန်းကိုကိုင်၍လည်း ဖွင့်နိုင်သည်။\n\nသင့်အမြွှာကဲ့သို့ သင်နှင့် အလွန်တူသူများသည်လည်း သင့်ဖုန်းကို ဖွင့်နိုင်သည်။"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"မျက်နှာဒေတာ ဖျက်လိုသလား။"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"မျက်နှာမှတ် သော့ဖွင့်ခြင်းက အသုံးပြုသည့် မျက်နှာဒေတာများကို လုံခြုံစွာ အပြီးအပိုင်ဖျက်လိုက်ပါမည်။ ဖျက်ပြီးသည့်အခါ သင့်ဖုန်းကိုလော့ခ်ဖွင့်ရန် ပင်နံပါတ်၊ ပုံစံ သို့မဟုတ် စကားဝှက်၊ အက်ပ်များသို့ လက်မှတ်ထိုးဝင်ခြင်းနှင့် ငွေပေးချေမှုများ အတည်ပြုခြင်းတို့ လိုအပ်ပါမည်။"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို အသုံးပြုပါ"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် သို့မဟုတ် ဝယ်ယူမှုများကို ခွင့်ပြုပေးရန် သင့်လက်ဗွေကို အသုံးပြုပါ။\n\nမှတ်ချက်- ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန် သင့်လက်ဗွေကို အသုံးမပြုနိုင်ပါ။ အသေးစိတ်အချက်များအတွက် သင့်အဖွဲ့အစည်း၏ စီမံခန့်ခွဲသူကို ဆက်သွယ်ပါ။"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"သင့်ဖုန်းကို လော့ခ်ဖွင့်ရန် သို့မဟုတ် ဝယ်ယူမှုများကို ခွင့်ပြုပေးရန် သင့်လက်ဗွေကို အသုံးပြုပါ။\n\nမှတ်ချက်- သင့်လက်ဗွေသည် ခိုင်မာသည့်ပုံစံ သို့မဟုတ် ပင်နံပါတ်တို့လောက် လုံခြုံမှုမရှိပါ။"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"မလုပ်တော့"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"မလိုပါ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ဆက်လုပ်ရန်"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ကျော်ပါ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ရှေ့သို့"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"သင့်တက်ဘလက်ကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"သင့်ကိရိယာကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"သင့်ဖုန်းကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ မျက်နှာမှတ် သော့ဖွင့်ခြင်းကို ထည့်သွင်းရန် ဖုန်းမျက်နှာပြင် လော့ခ်ချစနစ်တစ်ခုလည်း လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"သင့်တက်ဘလက်ကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"သင့်ကိရိယာကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"သင့်ဖုန်းကို ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ်နှင့် ကာကွယ်ထားခြင်းဖြင့် ၎င်းပျောက်သွားလျှင် သို့မဟုတ် ခိုးယူခံရလျှင် မည်သူမျှ အသုံးပြုနိုင်မည်မဟုတ်ပါ။ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို ထည့်သွင်းရန်အတွက်လည်း ဖုန်းမျက်နှာပြင်လော့ခ်ချစနစ် လိုအပ်သည်။ နောက်ပြန်သွားရန် \'မလုပ်တော့\' ကိုတို့ပါ။"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ပင်နံပါတ်သတ်မှတ်မှု ကျော်မလား။"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"စကားဝှက် ထည့်ခြင်း ကျော်မလား။"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ပုံစံ ထည့်သွင်းမှု ကျော်မလား။"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤတက်ဘလက်ကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤစက်ပစ္စည်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"စက်ပစ္စည်းကာကွယ်ခြင်း ဝန်ဆောင်မှုများကိုဖွင့်ခြင်းအားဖြင့် ဤဖုန်းကို သင့်ခွင့်ပြုချက်မရဘဲ မည်သူမျှအသုံးပြု၍မရအောင် ကာကွယ်ပါ။ သင်အသုံးပြုလိုသည့် မျက်နှာပြင်လော့ခ်ချမှုကို ရွေးချယ်ပါ။"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"သင့်ရဲ့အရန်သင့်သိမ်းဆည်းမျက်နှာပြင်သော့ခတ်တဲ့နည်းလမ်းကိုရွေးချယ်ပါ"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"အရန်မျက်နှာပြင်လော့ခ် နည်းလမ်းတစ်ခု ရွေးချယ်ပါ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"အရန်ဖန်သားပြင်လော့ခ် နည်းလမ်းတစ်ခု ရွေးချယ်ပါ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"မျက်နှာပြင် လော့ခ်ချရန် ရွေးချယ်စရာများ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"မျက်နှာပြင် လော့ခ်ချရန် ရွေးချယ်စရာများ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ဖန်သားပြင် လော့ခ်ချခြင်း"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"မျက်နှာမှတ် သော့ဖွင့်ခြင်း + စကားဝှက်"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"မျက်နှာမှတ် သော့ဖွင့်ခြင်းမပါဘဲ ရှေ့ဆက်ရန်"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"သင့်မျက်နှာကို အသုံးပြုပြီး သင့်ဖုန်းကို လော့ခ်ဖွင့်နိုင်ပါသည်။ လုံခြုံရေးအရ ဤနည်းလမ်းက အရန်မျက်နှာပြင်လော့ခ်တစ်ခု လိုအပ်ပါသည်။"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + ပုံစံ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + ပင်နံပါတ်"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ + စကားဝှက်"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ မပါဘဲ ရှေ့ဆက်ရန်"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ သုံး၍ ဖုန်းကို ဖွင့်နိုင်သည်။ လုံခြုံရေးအရ ဤနည်းလမ်းအတွက် အရန်ဖုန်းမျက်နှာပြင်လော့ခ်စနစ်တစ်ခု လိုအပ်သည်။"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"စီမံခန့်ခွဲသူ၊ အသွင်ဝှက်ခြင်း မူဝါဒ သို့မဟုတ် အထောက်အထား သိုလှောင်ခန်းက ပိတ်ထားပါသည်"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"မရှိ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ပွတ်ဆွဲရန်"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">ဂဏန်း <xliff:g id="NUMBER_0">%d</xliff:g> လုံးထက် နည်းရမည်</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"စက်ပစ္စည်း၏ စီမံခန့်ခွဲသူသည် မကြာသေးမီက အသုံးပြုခဲ့သည့် ပင်နံပါတ်ကို သုံးခွင့်မပြုပါ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"အသုံးပြုလေ့ရှိသော PIN များကို သင်၏ IT စီမံခန့်ခွဲသူက ပိတ်ထားသည်။ အခြား PIN တစ်ခုဖြင့် စမ်းကြည့်ပါ။"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"၎င်းတွင် မမှန်ကန်သည့်စကားလုံးများ ပါဝင်၍မရပါ"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"အနည်းဆုံး စာလုံးတစ်လုံး ပါရပါမည်"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"အနည်းဆုံး ဂဏန်းတစ်လုံး ပါရပါမည်"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">ဂဏန်းမဟုတ်သော အက္ခရာ အနည်းဆုံး ၁ လုံးပါရမည်</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"စက်ပစ္စည်းစီမံခန့်ခွဲသူသည် မကြာသေးမီက အသုံးပြုခဲ့သည့် စကားဝှက်ကို သုံးခွင့်မပြုပါ"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"အသုံးပြုလေ့ရှိသော စကားဝှက်များကို သင်၏ IT စီမံခန့်ခွဲသူက ပိတ်ထားသည်။ အခြား စကားဝှက်တစ်ခုဖြင့် စမ်းကြည့်ပါ။"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"အစဉ်လိုက်ဖြစ်နေသော ဂဏန်း အငယ်မှအကြီး၊ အကြီးမှအငယ် သို့မဟုတ် ထပ်နေသည့် နံပါတ်စဉ်များကို ခွင့်မပြုပါ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"အတည်ပြုရန်"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"မလုပ်တော့"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"ဝိုင်ဖိုင်ဖွင့်ရန်"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi သုံးရန်"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi သုံးပါ"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ဝိုင်ဖိုင်ဆက်တင်များ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ကြိုးမဲ့ချိတ်ဆက်ပွိုင့်များအား သတ်မှတ်ခြင်း &amp;  စီမံခြင်း"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” သို့ ချိတ်ဆက်ရန် အောက်ရှိ QR ကုဒ်ကို အလယ်တည့်တည့် ထားပါ"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR ကုဒ်ကို စကင်ဖတ်၍ Wi‑Fi ကို ချိတ်ဆက်ပါ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi မျှဝေပါ"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” နှင့် ချိတ်ဆက်ရန် ဤ QR ကုဒ်ကို စကင်ဖတ်ပြီး စကားဝှက် မျှဝေပါ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” သို့ ဝင်ရန် စက်နောက်တစ်ခုဖြင့် ဤ QR ကုဒ်ကို စကင်ဖတ်ပါ"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” နှင့်ချိတ်ဆက်ရန် ဤ QR ကုဒ်ကို စကင်ဖတ်ပါ"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ထပ်စမ်းကြည့်ပါ။ ပြဿနာဆက်ရှိနေလျှင် စက်ပစ္စည်းထုတ်လုပ်သူကို ဆက်သွယ်ပါ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"တစ်ခုခု မှားသွားသည်"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi စကားဝှက်− <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ဟော့စပေါ့စကားဝှက်− <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"အလိုအလျောက် ချိတ်ဆက်မှု"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ဤကွန်ရက်အနီးတွင် ဖုန်းရှိပါက အလိုအလျောက် ချိတ်ဆက်ခွင့်ပြုပါ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ဤကွန်ရက်အနီးတွင် တက်ဘလက်ရှိပါက အလိုအလျောက် ချိတ်ဆက်ခွင့်ပြုပါ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"ချိတ်ဆက်နိုင်သည့် အကွာအဝေးအတွင်း ရှိပါက ဤကွန်ရက်သို့ ချိတ်ဆက်မှုအား ခွင့်ပြုရန်"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"စက်ပစ္စည်း ထည့်ရန်"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ဤကွန်ရက်သို့ စက်တစ်ခုထည့်ရန် QR ကုဒ်ကို အသုံးပြုပါ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR ကုဒ်သည် မှန်ကန်သောဖော်မက် မဟုတ်ပါ"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"စနစ်ပိုင်း အသိအမှတ်ပြုလက်မှတ်များကို သုံးပါ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"မပေးထားပါ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"အတည်မပြုပါ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"အသိမှတ်ပြုလက်မှတ် သတ်မှတ်မထားပါ။ သင့်ချိတ်ဆက်မှု တသီးတသန့်ဖြစ်မည် မဟုတ်ပါ။"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ကွန်ရက်အမည် ရှည်လွန်းပါသည်။"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ဒိုမိန်းတစ်ခု သတ်မှတ်ပေးရပါမည်။"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"အသိအမှတ်ပြုလက်မှတ် လိုအပ်သည်။"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"ချိတ်ဆက်ရန်"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ဖွင့်ထားသည်"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> သို့ ချိတ်ဆက်ထားသည်"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> သို့ ချိတ်ဆက်နေပါသည်"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"ချိတ်ဆက်နေသည်…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ကွန်ရက်ကို ချိတ်ဆက်ရန် မအောင်မြင်ခဲ့ပါ"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ကွန်ရက်သည် ရနိုင်သောအကွာအဝေးတွင် မရှိပါ"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"စက်ပစ္စည်း MAC လိပ်စာ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ကျပန်းလုပ်ထားသည့် MAC လိပ်စာ"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"ကျပန်းလုပ်ထားသော MAC လိပ်စာ (နောက်ဆုံးသုံးထားသည့်)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"အိုင်ပီလိပ်စာ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ကွန်ရက် အသေးစိတ်များ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet ကွင်းဆက်နံပါတ်"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 လိပ်စာများ"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"သိမ်းထား ကွန်ရက်များ"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"စာရင်းသွင်းခြင်းများ"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"အခြားကွန်ရက်များ"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP ဆက်တင်များ"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Wi‑Fi အဆင့်မြှင့်ဆက်တင်များ ဤအသုံးပြုသူအတွက် မရပါ။"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"သိမ်းရန်"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ခိုင်လုံသောဝင်ပေါက် (gateway)လိပ်စာကို ရိုက်ထည့်ပါ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"ခိုင်လုံသော DNS လိပ်စာကို ရိုက်ထည့်ပါ"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"၀နှင့်၃၂အရှည်ရှိသော ကွန်ယက်အစပြုနံပတ်ကိုထည့်ပါ"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (သီးသန့် DNS အစားထိုးခြင်း မရှိပါက)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (သီးသန့် DNS အစားထိုးခြင်း မရှိပါက)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ဝင်ပေါက် (gateway)"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ကွန်ရက် အစပြုဂဏန်း၏အရှည်"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"တိုက်ရိုက် Wi-Fi"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"အက်ပ်သည် ပါဝင်သည့်အကြောင်းအရာများကို မျှဝေနေပါသည်။ အင်တာနက်ကို မျှဝေရန် ဟော့စပေါ့ကို ပိတ်ပြီး ပြန်ဖွင့်ပါ"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"မည်သည့် စကားဝှက်မျှ သတ်မှတ်မထားပါ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ဟော့စပေါ့အမည်"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ကို ဖွင့်နေပါသည်..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ဖွင့်နေသည်…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"အခြားစက်ပစ္စည်းများက <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> နှင့် ချိတ်ဆက်နိုင်ပါသည်"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ဟော့စပေါ့စကားဝှက်"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP လိုင်း"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"အကြောင်းအရာအချို့အတွက် ပြန်လည်စတင်နှုန်းကို ၆၀ မှ ၉၀ Hz သို့ အလိုအလျောက် တိုးပေးသည်။ ဘက်ထရီ အသုံးပြုမှု တိုးလာပါမည်။"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ချောမွေ့သော ဖန်သားပြင်ပြသမှု"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"၉၀ Hz ပြန်ဖွင့်မှုနှုန်းကို မဖြစ်မနေအသုံးပြုရန်"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ထိတွေ့မှု တုံ့ပြန်အားနှင့် ကာတွန်းပုံအရည်အသွေးပိုကောင်းလာရန် အမြင့်ဆုံးပြန်ဖွင့်မှုနှုန်း။ ဘက်ထရီ အသုံးပြုမှု တိုးလာပါမည်။"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ဖန်သားပြင်ကို အာရုံစိုက်ခြင်း"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ဖွင့်ထားသည် / ၎င်းကို သင်ကြည့်နေလျှင် မျက်နှာပြင် ပိတ်မည်မဟုတ်ပါ"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ဖန်သားပြင်မှောင်နေသည့်အခါ ၎င်းက အကြောင်းကြားချက်အသစ်များအတွက် ပွင့်ပေးသည်"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"အချိန်နှင့် အချက်အလက်အမြဲပြရန်"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ဘက်ထရီ အသုံးပြုမှု များလာသည်"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"စာလုံးထူ စာသား"</string>
     <string name="title_font_size" msgid="570613010306330622">"စာလုံးအရွယ်အစား"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"စာလုံးကို ပိုကြီးအောင် သို့မဟုတ် ပိုသေးအောင်ပြုလုပ်ပါ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"ဆင်းမ်ကဒ် လော့ခ်ဆက်တင်များ"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ဗားရှင်း"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android လုံခြုံရေးအပ်ဒိတ်"</string>
     <string name="model_info" msgid="8997566254717810904">"မော်ဒယ်"</string>
-    <string name="model_summary" msgid="2246651782442466213">"မော်ဒယ်- %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"မော်ဒယ်နှင့် စက်ပစ္စည်း"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"စက်ပစ္စည်းဗားရှင်း"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"စက်ပစ္စည်း အမှတ်"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APNကိုဖျက်မည်"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN အသစ်"</string>
     <string name="menu_save" msgid="6611465355127483100">"သိမ်းရန်"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"ဖယ်ပစ်ရန်"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"မလုပ်တော့"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"အမည်အကွက်မှာ ကွက်လပ်ဖြစ်မနေစေရပါ"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APNမှာ ကွက်လပ်ဖြစ်မနေစေရပါ"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"အက်ပ်များကို ပြင်ဆင်သတ်မှတ်နိုင်သည်"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi၊ မိုဘိုင်း၊ ဘလူးတုသ် ပြင်ဆင်သတ်မှတ်ရန်"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"၎င်းသည် အောက်ပါတို့အပါအဝင် ကွန်ရက်ဆက်တင်များအားလုံးကို ပြင်ဆင်သတ်မှတ်လိုက်ပါမည်−\n\n"<li>"Wi‑Fi"</li>\n<li>"မိုဘိုင်းဒေတာ"</li>\n<li>"ဘလူးတုသ်"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"ဖျက်ရန်"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ဒေါင်းလုဒ်လုပ်ထားသောကတ် ဖျက်ပါ"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"အစားထိုး ဆင်းမ်ကတ်များ ဒေါင်းလုဒ်လုပ်ရန် သင့်ဝန်ဆောင်မှုပေးသူကို ဆက်သွယ်ပါ။ ၎င်းက မိုဘိုင်းဝန်ဆောင်မှု အစီအစဉ်များကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"၎င်းက မိုဘိုင်းဝန်ဆောင်မှု အစီအစဉ်များကို ပယ်ဖျက်မည်မဟုတ်ပါ။ အစားထိုး ဆင်းမ်ကတ်များ ဒေါင်းလုဒ်လုပ်ရန် သင့်ဝန်ဆောင်မှုပေးသူကို ဆက်သွယ်ပါ။"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"ဆက်တင်များ ပြင်ဆင်သတ်မှတ်ရန်"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"ကွန်ရက်ဆက်တင်များ အားလုံးကို ပြင်ဆင်သတ်မှတ်လိုပါသလား။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"ကွန်ရက်ဆက်တင်အားလုံး ပြင်ဆင်သတ်မှတ်ပြီး ဒေါင်းလုဒ်လုပ်ထားသော ဆင်းမ်ကတ်များကို ဖျက်လိုသလား။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ကွန်ရက်ချိန်ညှိချက်များ ပြန်လည်သတ်မှတ်ပြီးပါပြီ"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ဆင်းမ်ကတ်များ ဖျက်၍မရပါ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"အမှားဖြစ်သွားသဖြင့် ဒေါင်းလုဒ်လုပ်ထားသော ဆင်းမ်ကတ်များကို ဖျက်၍မရပါ။\n\nသင့်စက်ပစ္စည်းကို ပြန်စတင်ပြီး ထပ်စမ်းကြည့်ပါ။"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ဒေတာအားလုံးဖျက်ခြင်း (စက်ရုံထုတ်ဆက်တင် သတ်မှတ်ရန်)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ဒေတာအားလုံးဖျက်ခြင်း (စက်ရုံထုတ်ဆက်တင် သတ်မှတ်ရန်)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ဤသို့ပြုလုပ်ခြင်းက သင့်တက်ဘလက်၏ "<b>"စက်အတွင်းသိုလှောင်ခန်း"</b>" အပါအဝင် အောက်ပါဒေတာအားလုံးကို ဖျက်ပါမည်-\n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ဤသို့ပြုလုပ်ခြင်းက သင့်ဖုန်း၏ "<b>"စက်အတွင်းသိုလှောင်ခန်း"</b>" အပါအဝင် အောက်ပါဒေတာအားလုံးကို ဖျက်ပါမည်- \n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"သင်သည် လက်ရှိတွင် အောက်ပါအကောင့်များကို ဝင်ရောက်ထားပါသည်\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ဤစက်ပစ္စည်းပေါ်တွင် အခြားအသုံးပြုသူများလဲ ရှိသည်။\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"သီချင်း"</li>\n<li>"ဓာတ်ပုံများ"</li>\n<li>"အသုံးပြုသူ၏တခြားဒေတာ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM များ"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"၎င်းက သင်၏ မိုဘိုင်းဝန်ဆောင်မှုအစီအစဉ်ကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"သီချင်း၊ ပုံများနှင့် အသုံးပြုသူ၏တခြားဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"USBသိုလှောင်ကိရိယာ"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"သီချင်း၊ ပုံများနှင့် တခြားသောအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SDကဒ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ဒေတာအားလုံးဖျက်ခြင်း (စက်ရုံထုတ်ဆက်တင် သတ်မှတ်ရန်)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ဒေတာအားလုံးဖျက်ခြင်း (စက်ရုံထုတ်ဆက်တင် သတ်မှတ်ရန်)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ဤသို့ပြုလုပ်ခြင်းက သင့်တက်ဘလက်၏ "<b>"စက်အတွင်းသိုလှောင်ခန်း"</b>" အပါအဝင် အောက်ပါဒေတာအားလုံးကို ဖျက်ပါမည်-\n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ဤသို့ပြုလုပ်ခြင်းက သင့်ဖုန်း၏ "<b>"စက်အတွင်းသိုလှောင်ခန်း"</b>" အပါအဝင် အောက်ပါဒေတာအားလုံးကို ဖျက်ပါမည်- \n\n"<li>"သင်၏ Google အကောင့်"</li>\n<li>"စနစ်နှင့် အက်ပ်ဒေတာ၊ ဆက်တင်များ၊"</li>\n<li>"ဒေါင်းလုဒ်လုပ်ထားသည့်အက်ပ်များ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"သင်သည် လက်ရှိတွင် အောက်ပါအကောင့်များကို ဝင်ရောက်ထားပါသည်\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ဤစက်ပစ္စည်းပေါ်တွင် အခြားအသုံးပြုသူများလည်း ရှိသည်။\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"သီချင်း"</li>\n<li>"ဓာတ်ပုံများ"</li>\n<li>"အသုံးပြုသူ၏အခြားဒေတာ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM များ"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"၎င်းက သင်၏ မိုဘိုင်းဝန်ဆောင်မှုအစီအစဉ်ကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"သီချင်း၊ ပုံများနှင့် အသုံးပြုသူ၏အခြားဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"USB သိုလှောင်ကိရိယာ"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"သီချင်း၊ ပုံများနှင့် အခြားာအသုံးပြုသူ၏ဒေတာများကို ရှင်းလင်းရန်အတွက်"<b>"SD ကဒ်"</b>"အား ဖျက်ရန်လိုအပ်ပါသည်။"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USBသိုလှောင်ကိရိယာအား ဖျက်ခြင်း"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SDကတ်အား ဖျက်ရန်"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"USBသိုလှောင်မှုထဲမှ သီချင်းနှင့် ဓါတ်ပုံကဲ့သို့ စက်တွင်းဒေတာအားလုံးအားဖျက်မည်"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SDကဒ်ထဲရှိ သီချင်းသို့မဟုတ် ဓါတ်ပုံကဲ့သို့ ဒေတာအားလုံးအား ဖျက်ရန်"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ဒေတာအားလုံး ဖျက်ရန်"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ဒေတာအားလုံး ဖျက်ရန်"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"သင့်ကိုယ်ရေးကိုယ်တာ အချက်အလက်များနှင့် ဒေါင်းလုဒ်လုပ်ထားသော အက်ပ်အားလုံးကို ဖျက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ဒေါင်းလုဒ်လုပ်ထားသော အက်ပ်နှင့် ဆင်းမ်ကတ်များ အပါအဝင် သင်၏ ကိုယ်ရေးကိုယ်တာ အချက်အလက်အားလုံးကို ဖျက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"အားလုံးကိုဖျက်ရန်"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"စနစ်အားရှင်းလင်းခြင်းဝန်ဆောင်မှုမရှိသောကြောင့် အစမှပြန်လည်စတင်နိုင်ခြင်းအားမပြုလုပ်နိုင်ပါ"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ဒေတာအားလုံးကို ဖျက်မလား။"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ဤအသုံးပြုသူအတွက် စက်ရုံပြန်လည် သတ်မှတ်မှု မရပါ"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ဖျက်နေသည်"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"ခဏစောင့်ပါ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ဒေတာအားလုံး ဖျက်ရန်"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ဒေတာအားလုံး ဖျက်ရန်"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"သင့်ကိုယ်ရေးကိုယ်တာအချက်အလက်များနှင့် ဒေါင်းလုဒ်လုပ်ထားသော အက်ပ်အားလုံးကို ဖျက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ဒေါင်းလုဒ်လုပ်ထားသော အက်ပ်နှင့် ဆင်းမ်ကဒ်များ အပါအဝင် သင်၏ ကိုယ်ရေးကိုယ်တာ အချက်အလက်အားလုံးကို ဖျက်ပါမည်။ ဤလုပ်ဆောင်ချက်ကို ပြန်ပြင်၍ မရပါ။"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ဒေတာအားလုံးကို ဖျက်မလား။"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ဤအသုံးပြုသူအတွက် စက်ရုံထုတ်အတိုင်း ပြန်လည်သတ်မှတ်မှု မရပါ"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"ဖျက်နေသည်"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"ခေတ္တစောင့်ပါ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"ခေါ်ဆိုမှု ဆက်တင်များ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"အသံဖြင့်စာတိုပို့ခြင်း၊ အဝင်ခေါ်ဆိုမှုအားထပ်ဆင့်ပို့ခြင်း၊ ခေါ်ဆိုမှုစောင့်ဆိုင်းခြင်း၊ ခေါ်ဆိုသူ၏အမှတ်သညာအား သတ်မှတ်ခြင်း"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB သုံး၍ချိတ်ဆက်ခြင်း"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> စက်လုံးထက် ပို၍တဆင့်ပြန်လည်ချိတ်ဆက်မရပါ"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> သည် ချိတ်ဆက်မှု ပြတ်တောက်မည်"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"အီသာနက် ချိတ်၍မျှဝေခြင်း"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ဖုန်း၏ အင်တာနက်ကို USB အီသာနက်မှတစ်ဆင့် မျှဝေရန်"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ဖုန်း၏ အင်တာနက်ကို အီသာနက်မှတစ်ဆင့် မျှဝေရန်"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"သင်၏ မိုဘိုင်းဒေတာ ချိတ်ဆက်မှုမှတစ်ဆင့် အခြားစက်များသို့ အင်တာနက် အသုံးပြုခွင့် ပေးလိုလျှင် ဟောစပေါ့နှင့် မိုဘိုင်းဖုန်းကို မိုဒမ်အဖြစ်အသုံးပြုခြင်းစနစ်ကို သုံးပါ။ အနီးတစ်ဝိုက်ရှိ စက်များနှင့် ပါဝင်သည့်အကြောင်းအရာများကို မျှဝေရန်အတွက်လည်း အက်ပ်များက ဟော့စပေါ့တစ်ခု ဖွင့်နိုင်ပါသည်။"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ဟော့စပေါ့နှင့် မိုဘိုင်းကို မိုဒမ်အဖြစ်သုံးပြီး သင်၏ Wi-Fi သို့မဟုတ် မိုဘိုင်းဒေတာ ချိတ်ဆက်မှုမှတစ်ဆင့် အခြားစက်ပစ္စည်းများသို့ အင်တာနက်လွှင့်ပေးပါ။ အနီးရှိစက်ပစ္စည်းများသို့ အကြောင်းအရာမျှဝေရန်အတွက် အက်ပ်များသည်လည်း ဟော့စပေါ့ပြုလုပ်နိုင်သည်။"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"အကူအညီ"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ဘလူးတုသ်ရှာဖွေနေသည်"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ဘလူးတုသ်ကို ပိတ်ထားလျှင်ပင် အနီးအနားရှိ စက်ပစ္စည်းများကို အချိန်မရွေးရှာဖွေရန် အက်ပ်များအား ခွင့်ပြုပါ။ ဥပမာအားဖြင့် ၎င်းကို တည်နေရာအခြေပြု ဝန်ဆောင်မှုနှင့် အခြားဝန်ဆောင်မှုများ တိုးတက်လာစေရန် အသုံးပြုနိုင်ပါသည်။"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"အလုပ်အတွက် တည်နေရာဝန်ဆောင်မှုများ"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်း"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်း"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"လက်ရှိဒေသစံတော်ချိန်ကို ရှာဖွေရာတွင် အသုံးပြုရန် ဤစက်၏တည်နေရာကို ခွင့်ပြုပါ။ Wi-Fi ရှာဖွေခြင်း ကဲ့သို့သော အခြား တည်နေရာပြ ဆက်တင်များက ဒေသစံတော်ချိန်ရှာဖွေခြင်း၏ တိကျမှန်ကန်မှုကို သက်ရောက်မှုရှိနိုင်သည်။"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ဖွင့်ထားသည်"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ပိတ်ထားသည်"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ဒေသစံတော်ချိန် အလိုအလျောက် ရှာဖွေခြင်းကို ပိတ်ထားသည်"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်းကို ပိတ်ထားသည်"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်းကို ပံ့ပိုးမထားပါ"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"တည်နေရာဖြင့် ဒေသစံတော်ချိန်ရှာဖွေခြင်း အပြောင်းအလဲများကို ခွင့်ပြုမထားပါ"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi  &amp; မိုဘိုင်းလ်ကွန်ယက်တည်နေရာ"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"သင့်တည်နေရာကို ခန့်မှန်းရာတွင် ပိုမြန်စေရန် အပလီကေးရှင်းကို Google၏ တည်နေရာဝန်ဆောင်မှု အသုံးပြုပါစေ။ အမည်မသိ တည်နေရာ အချက်အလက်များကို စု၍ ဂူဂဲလ်သို့ ပို့ပေးပါမည်။"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"ဝိုင်ဖိုင်မှ ဆုံးဖြတ်သော တည်နေရာ"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"မျက်နှာမှတ် သော့ဖွင့်ရန် စကားဝှက်ထည့်ပါ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"မျက်နှာမှတ် သော့ဖွင့်ရန် ပုံစံသတ်မှတ်ပါ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"မျက်နှာမှတ် သော့ဖွင့်ရန် ပင်နံပါတ်ထည့်ပါ"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ဇီဝအချက်များသုံးရန် စကားဝှက်သတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ဇီဝအချက်များသုံးရန် ပုံစံသတ်မှတ်ပါ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ဇီဝအချက်များသုံးရန် ပင်နံပါတ်သတ်မှတ်ပါ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"စကားဝှက် မေ့နေပါလား။"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ပုံစံ မေ့နေပါသလား။"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ပင်နံပါတ် မေ့နေပါသလား။"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"စာတန်း သတ်မှတ်ချက်များ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ပုံကြီးချဲ့ခြင်း"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ပုံကြီးချဲ့ရန် နေရာ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ပုံကြီးချဲ့ခြင်းကို ဖွင့်ထားသည်"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"မျက်နှာပြင်ကိုချဲ့နေစဉ် သင်အသုံးပြုလိုသော ပုံကြီးချဲ့ရန်နေရာ(များ) ကို ရွေးပါ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ဖန်သားပြင်အပြည့်"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ဖန်သားပြင် တစ်စိတ်တစ်ပိုင်း"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ဖန်သားပြင်အပြည့်နှင့် မျက်နှာပြင် တစ်စိတ်တစ်ပိုင်း"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ဖန်သားပြင် တစ်ခုလုံးကို ချဲ့ပါ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ဖန်သားပြင် တစ်စိတ်တစ်ပိုင်းကို ချဲ့ပါ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"အများသုံးစွဲနိုင်မှု ခလုတ်သို့ ပြောင်းမလား။"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ဖန်သားပြင်၏ တစ်စိတ်တစ်ပိုင်းကို ချဲ့ရန် သုံးချက်တို့ခြင်းသည် စာရိုက်ခြင်းနှင့် အခြားလုပ်ဆောင်ချက်များကို နှောင့်နှေးစေမည်။\n\n ချဲ့ရန် အများသုံးစွဲနိုင်မှု ခလုတ်ကို ပြောင်းသုံးမလား။"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"အများသုံးစွဲနိုင်မှု ခလုတ်သို့ ပြောင်းရန်"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ချဲ့ရန်အတွက် သုံးချက်တို့ရန်"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ပုံကြီးချဲ့ခြင်း ဆက်တင်များ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"သုံးချက်တို့၍ အကြီးချဲ့ခြင်း"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ဖြတ်လမ်းလင့်ခ်ဖြင့် ချဲ့ခြင်း"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ဖွင့်ပိတ်ခလုတ်ဖြင့် ဖုန်းချရန်"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"မောက်စ်သင်္ကေတအကြီးစား"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"လှုပ်ရှားမှုများ ဖယ်ရှားရန်"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"မိုနိုအသံ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"အသံဖွင့်နေစဉ် ချန်နယ်များကိုပေါင်းပါ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"အသံ ချိန်ညှိခြင်း"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ဘယ်"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ညာ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"မိုနိုအသံ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"အသံဖွင့်နေစဉ် ချန်နယ်များကိုပေါင်းသည်"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"အသံ ချိန်ညှိခြင်း"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ဘယ်"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ညာ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"မူရင်း"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"၁၀ စက္ကန့်"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"စက္ကန့် ၃၀"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"အကြောင်းကြားချက် တုန်ခါမှု"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ဖုန်းမြည်သံ တုန်ခါမှု"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ထိတွေ့ တုံ့ပြန်ချက်"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> သုံးရန်"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ကို ဖွင့်ရန်"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"အရောင်ပြင်ဆင်ခြင်းကို သုံးရန်"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"စာတန်းများကို ပြရန်"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ပံ့ပိုးထားသည့် အက်ပ်အတွက်သာ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> သုံးရန်"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ကို ဖွင့်ရန်"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"အရောင်ပြင်ဆင်ခြင်းကို သုံးရန်"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"စာတန်းများကို ပြရန်"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ပံ့ပိုးထားသည့် အက်ပ်အတွက်သာ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"စာတန်းအရွယ်/ပုံစံ"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> စာသား အရွယ်အစား"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"နောက်ထပ် ရွေးစရာများ"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"အစိမ်း မမြင်ရခြင်း"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"အနီ မမြင်ရခြင်း"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"အပြာ-အဝါ မမြင်ရခြင်း"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"အဖြူအမည်း"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"အနီ-အစိမ်း"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"အနီ-အစိမ်း"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"အပြာ-အဝါ"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"နောက်ခံအသုံးပြုမှု ကန့်သတ်ခြင်း"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"အက်ပ်ကို နောက်ခံတွင် ဖွင့်ခွင့်ပြုပါ"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"အက်ပ်ကို နောက်ခံတွင် ဖွင့်ခွင့်မပြုပါ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"နောက်ခံအသုံးပြုမှုကို ကန့်သတ်၍မရပါ"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"နောက်ခံအသုံးပြုမှုကို ကန့်သတ်၍မရပါ"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"နောက်ခံလုပ်ဆောင်ချက်ကို ကန့်သတ်လိုပါသလား။"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"အက်ပ်အတွက် နောက်ခံလုပ်ဆောင်ချက်ကို ကန့်သတ်လိုက်ပါက ပုံမှန်အလုပ်လုပ်မည် မဟုတ်ပါ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ဤအက်ပ်ကို ဘက်ထရီချိန်ညှိသုံးရန် သတ်မှတ်မထားသဖြင့် ကန့်သတ်၍မရပါ။\n\nအက်ပ်ကိုကန့်သတ်ရန် ဘက်ထရီချိန်ညှိသုံးခြင်း အရင်ဖွင့်ပါ။"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"တက်ဘလက်ကို ပုံမှန်ထက် ပိုသုံးထားသည်"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"စက်ပစ္စည်းကို ပုံမှန်ထက် ပိုသုံးထားသည်"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ပုံမှန်ထက် ဘက်ထရီ အကုန်မြန်နိုင်သည်"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ဘက်ထရီအခြေအနေကို အကောင်းဆုံးဖြစ်အောင် လုပ်နေသည်"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ဘက်ထရီ ယာယီကန့်သတ်ထားသည်။ ပိုမိုလေ့လာရန် တို့ပါ။"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"သင့်ဖုန်းကို ပုံမှန်ထက် ပိုသုံးထားသည်။ သင့်ဘက်ထရီသည် ခန့်မှန်းထားသည်ထက် စောလျင်စွာ ကုန်နိုင်ပါသည်။\n\nဘက်ထရီ အများဆုံး အသုံးပြုနေသည့် အက်ပ်များမှာ−"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"သင့်တက်ဘလက်ကို ပုံမှန်ထက် ပိုသုံးထားသည်။ သင့်ဘက်ထရီသည် ခန့်မှန်းထားသည်ထက် စောလျင်စွာ ကုန်နိုင်ပါသည်။\n\nဘက်ထရီ အများဆုံး အသုံးပြုနေသည့် အက်ပ်များမှာ−"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"သင့်စက်ပစ္စည်းကို ပုံမှန်ထက် ပိုသုံးထားသည်။ သင့်ဘက်ထရီသည် ခန့်မှန်းထားသည်ထက် စောလျင်စွာ ကုန်နိုင်ပါသည်။\n\nဘက်ထရီ အများဆုံး အသုံးပြုနေသည့် အက်ပ်များမှာ−"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">အက်ပ် %1$d ခု ကန့်သတ်ထားသည်</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"သင်၏ ဘက်ထရီမီတာကို ဖတ်ရာတွင် ပြဿနာရှိနေသည်"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"သင်၏ ဘက်ထရီမီတာကို ဖတ်ရာတွင် ပြဿနာရှိနေသည်။ "<annotation id="url">"ပိုမိုလေ့လာရန်"</annotation>" တို့ပါ"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"အက်ပ်ကို ရပ်ဆိုင်းလိုပါသလား။"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏ဖုန်းကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ၎င်းအက်ပ်ကို ရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာဆက်လက်ရှိနေသေးပါက ဘက်ထရီစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန် လိုအပ်နိုင်ပါသည်။"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> က သင်၏တက်ဘလက်ကို အမြဲပွင့်နေစေသောကြောင့် ၎င်းသည် ဘက်ထရီကို ပုံမှန်စီမံခန့်ခွဲ၍ မရပါ။\n\nဤပြဿနာကို ဖြေရှင်းရန် ၎င်းအက်ပ်ကို ရပ်ဆိုင်းကြည့်နိုင်သည်။\n\nပြဿနာဆက်လက်ရှိနေသေးပါက ဘက်ထရီစွမ်းဆောင်ရည်ကို တိုးမြှင့်ရန်အတွက် အက်ပ်ကို ဖယ်ရှားရန် လိုအပ်နိုင်ပါသည်။"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"အချိန်ဇယား သတ်မှတ်ပါ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ဘက်ထရီသက်တမ်းကို တိုးပေးသည်"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"အားသွင်းနေသည့်အခါ ပိတ်ရန်"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"သင်၏ဖုန်း <xliff:g id="PERCENT">%1$s</xliff:g> ဖြစ်သည့်အခါ \'ဘက်ထရီ အားထိန်း\' ကိုပိတ်ပါမည်"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"သင်၏တက်ဘလက် <xliff:g id="PERCENT">%1$s</xliff:g> ဖြစ်နေသည့်အခါ \'ဘက်ထရီ အားထိန်း\' ကိုပိတ်ပါမည်"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"သင့်စက်ပစ္စည်း <xliff:g id="PERCENT">%1$s</xliff:g> ဖြစ်နေသည့်အခါ \'ဘက်ထရီ အားထိန်း\' ကိုပိတ်ပါမည်"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"သင့်ဖုန်းကို <xliff:g id="PERCENT">%1$s</xliff:g> အထက်အားသွင်းပြီးသည့်အခါ \'ဘက်ထရီ အားထိန်း\' ပိတ်သွားမည်"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"သင့်တက်ဘလက်ကို <xliff:g id="PERCENT">%1$s</xliff:g> အထက်အားသွင်းပြီးသည့်အခါ \'ဘက်ထရီ အားထိန်း\' ပိတ်သွားမည်"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"သင့်စက်ကို <xliff:g id="PERCENT">%1$s</xliff:g> အထက်အားသွင်းပြီးသည့်အခါ \'ဘက်ထရီ အားထိန်း\' ပိတ်သွားမည်"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ဖွင့်ရန်"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ပြန်သတ်မှတ်ရန်"</string>
     <string name="tts_play" msgid="2945513377250757221">"ဖွင့်ရန်"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"အလိုက်သင့် ချိတ်ဆက်နိုင်မှု"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"သင်၏ ကွန်ရက်ချိတ်ဆက်မှုကို အလိုအလျောက် စီမံခန့်ခွဲခြင်းဖြင့် ဘက်ထရီ သက်တမ်းကို ရှည်စေပြီး စက်၏စွမ်းဆောင်ရည်ကို ပိုမိုကောင်းမွန်စေသည်"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ယုံကြည်စိတ်ချရသောသိုလှောင်နေရာ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"လက်မှတ် ထည့်သွင်းရန်"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"သိုလှောင်နေရာမှ အသိအမှတ်ပြုလက်မှတ်များကို ထည့်သွင်းရန်"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"အသုံးပြုသူ၏ အထောက်အထားများ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"သိမ်းဆည်းထားသည့် အထောက်အထားများကို ကြည့်ပြီး မွမ်းမံရန်"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"အဆင့်မြင့်"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"သိုလှောင်ခန်း အမျိုးအစား"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ဟာ့ဒ်ဝဲနှင့် ချိတ်ဆက်ထားသော"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ဆော့ဖ်ဝဲသပ်သပ်"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ဒီအသုံးပြုသူ အတွက် စိတ်ချရ အချက်များ မရှိ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN နှင့် အက်ပ်များအတွက် ထည့်သွင်းထားပါသည်"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi အတွက် ထည့်သွင်းထားပါသည်"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"မသွင်းပါနှင့်"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"မည်သို့ပင်ဖြစ်စေ ထည့်သွင်းရန်"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"အသိအမှတ်ပြုလက်မှတ်ကို ထည့်သွင်းမထားပါ"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"ဤစက်တွင် အသိအမှတ်ပြုလက်မှတ်များ ထည့်သွင်းရန် <xliff:g id="APP_NAME">%s</xliff:g> ကို ခွင့်ပြုမလား။"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"ဤအသိအမှတ်ပြုလက်မှတ်များက အောက်ပါ အက်ပ်နှင့် URL များတွင် သင့်ကို ခွဲခြားဖော်ပြပေးလိမ့်မည်"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"ခွင့်မပြုရန်"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"ခွင့်ပြုရန်"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"ပိုပြရန်"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"အသိအမှတ်ပြုလက်မှတ် စီမံခန့်ခွဲသည့်အက်ပ်"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"မရှိ"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"ဤအက်ပ်က ထည့်သွင်းထားသော အသိအမှတ်ပြုလက်မှတ်များသည် အောက်ပါ အက်ပ်နှင့် URL များတွင် သင့်ကို ခွဲခြားဖော်ပြပေးလိမ့်မည်"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"ဖယ်ရှားရန်"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"အရေးပေါ် ဖုန်းခေါ်ခြင်း လိုင်းအား"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"အရေးပေါ်ခေါ်ဆိုမှုအတွက် လုပ်ဆောင်ပုံကို သတ်မှတ်ရန်"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"အရန်သိမ်းရန်"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"အလုပ် ပရိုဖိုင် - မသတ်မှတ်ရသေး"</string>
     <string name="user_admin" msgid="4024553191395768119">"စီမံခန့်ခွဲသူ"</string>
     <string name="user_you" msgid="3070562015202859996">"သင် (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"နာမည်ဝှက်"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"သင် အသုံးပြုသူ <xliff:g id="USER_COUNT">%1$d</xliff:g> ယောက်အထိ ပေါင်းထည့်နိုင်သည်။"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"တက်ဘလက်၏ ပိုင်ရှင်သာ သုံးစွဲသူများကို စီမံခန့်ခွဲနိုင်သည်"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ဖုန်း၏ ပိုင်ရှင်သာ သုံးစွဲသူများကို စီမံခန့်ခွဲနိုင်သည်"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ငွေချေစက်တွင် ငွေပေးချေခြင်း"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ငွေပေးချေရေး အက်ပ်ကို သတ်မှတ်ပါ။ ၎င်းနောက် သင့်ဖုန်း၏ ကျောဘက်ကို ချိတ်ဆက်ရန် မလိုသင်္ကေတပါ ငွေချေစက် တစ်ခုဆီသို့ ကပ်လိုက်ပါ။"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ရပါပြီ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"နောက်ထပ်..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"နောက်ထပ်…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"မူရင်း ပေးချေမှုအက်ပ် သတ်မှတ်ရန်"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"မူရင်း ပေးချေမှုအက်ပ် အပ်ဒိတ်လုပ်ရန်"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ချိတ်ဆက်မှုမဲ့ ပေးချေရန်နေရာတွင် <xliff:g id="APP">%1$s</xliff:g> ဖြင့် ပေးပါ"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"နောက်သို့"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ရှေ့သို့"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ပြီးပြီ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ဓာတ်ပုံရိုက်ရန်"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ပုံရွေးရန်"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ဓာတ်ပုံ ရွေးရန်"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ဆင်းမ် ကဒ်များ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ဆင်းမ် ကဒ်များ"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ခေါ်ဆိုမှုများ အတွက် အမြဲတမ်း ဒါကို သုံးရန်"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ဒေတာ အတွက် SIM ကို ရွေးရန်"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS စာတိုစနစ်အတွက် ဆင်းမ်ကတ် ရွေးပါ"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ဒေတာ SIM သို့ပြောင်းနေသည်၊ ၎င်းသည် တစ်မိနစ်ခန့်ကြာနိုင်သည်..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ဒေတာ SIM ပြောင်းနေသည်၊ ၎င်းသည် တစ်မိနစ်ခန့်ကြာနိုင်သည်…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ဖြင့် ခေါ်ဆိုရန်"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ဆင်းမ် ကဒ်ကို ရွေးရန်"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ဆင်းမ် <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ပုံမှန်အစီအစဉ်၊ အချိန်ဇယား၊ ဘက်ထရီအားထိန်း၊ ပါဝါချွေတာစနစ်၊ ဘက်ထရီ၊ အလိုအလျောက်၊ ရာခိုင်နှုန်း"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte၊ အဆင့်မြင့် ခေါ်ဆိုခြင်း၊ 4g ခေါ်ဆိုခြင်း"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ဘာသာစကားထည့်ရန်၊ ဘာသာစကားတစ်ခုကို ထည့်ပါ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"စာလုံးအရွယ်အစား"</string>
     <string name="default_sound" msgid="6604374495015245195">"ပုံသေ အသံ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"မြည်သံနှင့် အကြောင်းကြားချက် အသံ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ရှိသည်"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"အသံအတိုးအကျယ်၊ တုန်ခါမှု၊ မနှောင့်ယှက်ရ"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"အသံများ ဖွင့်ထားပါ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"တိုက်ရိုက်စာတန်းထိုး"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"အလိုအလျောက် စာတန်းထိုးရန်"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"မရှိ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">အချိန်ဇယား <xliff:g id="ON_COUNT">%d</xliff:g> ခု သတ်မှတ်ထားသည်</item>
-      <item quantity="one">အချိန်ဇယား ၁ ခု သတ်မှတ်ထားသည်</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{မရှိ}=1{အချိန်ဇယား ၁ ခု သတ်မှတ်ထားသည်}other{အချိန်ဇယား # ခု သတ်မှတ်ထားသည်}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"မနှောင့်ယှက်ရ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"အရေးကြီးပုဂ္ဂိုလ်များနှင့် အက်ပ်များထံမှသာ အကြောင်းကြားချက် ရယူပါ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"အနှောင့်အယှက်များကို တားဆီးသည်"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ဦးစားပေးများသာ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>။ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ဖွင့်ရန် / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ပိတ်ရန် / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ပိတ်ရန်"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ဖွင့်ရန်"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"အမြဲမေးပါ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"သင်ပိတ်လိုက်သည် အထိ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> နာရီ</item>
-      <item quantity="one">၁ နာရီ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> မိနစ်"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">အချိန်ဇယား <xliff:g id="ON_COUNT">%d</xliff:g> ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်</item>
-      <item quantity="one">အချိန်ဇယား ၁ ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{၁ နာရီ}other{# နာရီ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{၁ မိနစ်}other{# မိနစ်}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ပိတ်ရန်}=1{ပိတ်ရန် / အချိန်ဇယား ၁ ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်}other{ပိတ်ရန် / အချိန်ဇယား # ခုကို အလိုအလျောက် ဖွင့်နိုင်သည်}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'မနှောင့်ယှက်ရ\' ကို ကြားဖြတ်နိုင်သည့်အရာ"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"လူများ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"အက်ပ်များ"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ဦးစားပေးမဟုတ်သော အကြောင်းကြားချက်များကို \'မသိမသာပြသမှု\'အဖြစ် အလိုအလျောက် သတ်မှတ်ပါ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"အလိုက်အထိုက် အဆင့်သတ်မှတ်မှု အကြောင်းကြားချက်"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"သက်ဆိုင်ရာအလိုက် အလိုလို သတ်မှတ်ထားသော အဆင့်သတ်မှတ်မှု အကြောင်းကြားချက်"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"အလိုက်သင့် အကြောင်းကြားချက်ဆိုင်ရာ အကြံပြုချက်"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"အကြောင်းကြားချက်များအပေါ်တွင် ပြုလုပ်ထားသော ပြင်ဆင်ချက်များကို ညွှန်ပြပြီး စနစ်သို့ အကြံပြုချက်ပေးသည့် ရွေးစရာကို ပြသသည်"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"အကြောင်းကြားချက် အရေးပါမှုကို ပြင်ဆင်သတ်မှတ်ခြင်း"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"အသုံးပြုသူက ပြောင်းလဲလိုက်သည့် အရေးကြီးသော ဆက်တင်များကို ပြင်ဆင်သတ်မှတ်ပြီး အကြောင်းကြားချက် အထောက်အကူကို ဦးစားပေးရန် ခွင့်ပြုသည်"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"အကြံပြုထားသော လုပ်ဆောင်ချက်နှင့် ပြန်ကြားချက်များ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"အကြံပြုထားသော လုပ်ဆောင်ချက်များနှင့် ပြန်ကြားချက်များကို အလိုအလျောက်ပြသပါ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"လတ်တလောနှင့် မှေးထားသည့် အကြောင်းကြားချက်များကို ပြရန်"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"ဦးစားပေး စကားဝိုင်းများ"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"စကားဝိုင်းကဏ္ဍ၏ ထိပ်တွင်ပြပြီး ပူဖောင်းကွက်အဖြစ် မြင်ရသည်"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"စကားဝိုင်းကဏ္ဍ၏ ထိပ်တွင်ပြရန်"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"အခြားစကားဝိုင်း"</string>
+    <string name="other_conversations" msgid="551178916855139870">"ဦးစားပေးမဟုတ်သည့် စကားဝိုင်းများ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"သင်အပြောင်းအလဲ ပြုလုပ်ထားသော စကားဝိုင်းများ"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"မကြာသေးမီက စကားဝိုင်းများ"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"လတ်တလောအရာ ရှင်းရန်"</string>
+    <string name="clear" msgid="5092178335409471100">"ရှင်းရန်"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ဦးစားပေး စကားဝိုင်းများကို ပူဖောင်းကွက်အဖြစ် ပြသခြင်း"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ဦးစားပေး စကားဝိုင်းများက ဆွဲချစာရင်း၏ ထိပ်တွင် ပေါ်လာသည်။ \'မနှောင့်ယှက်ရ\' တွင် ပူဖောင်းကွက်အဖြစ် ကြားဖြတ်ပြသရန်လည်း သတ်မှတ်နိုင်သည်။"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ဦးစားပေးနှင့် ပြုပြင်ထားသော စကားဝိုင်းများကို ဤနေရာတွင် ပြပါမည်"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"မနှောင့်ယှက်ရ\" ကိုအသုံးပြုခြင်း"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'မနှောင့်ယှက်ရ\' ကိုခွင့်ပြုရန်"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"မနှောက်ယှက်ရန် အသုံးပြုခြင်းအတွက် မည်သည့်ထည့်သွင်းထားသည့် အပ်ဖ်မှ တောင်းဆိုမှုမရှိပါ"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"အက်ပ်များကို တင်နေ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"အက်ပ်များကို ဖွင့်နေသည်…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအက်ပ်၏ အကြောင်းကြားချက်များ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအကြောင်းကြားချက်အမျိုးအစားများ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"သင့်တောင်းဆိုချက်အရ Android သည် ဤအကြောင်းကြားချက်အုပ်စုများ ဤစက်ပစ္စည်းပေါ်တွင် ပေါ်မလာအောင် ပိတ်ထားပါသည်"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"စကားဝိုင်းအားလုံး"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ဦးစားပေး စကားဝိုင်းများ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"မရှိ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">စကားဝိုင်း <xliff:g id="CONVERSATIONS">%d</xliff:g> ခု</item>
-      <item quantity="one">စကားဝိုင်း ၁ ခု</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"မရှိ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{မရှိ}=1{စကားဝိုင်း ၁ ခု}other{စကားဝိုင်း # ခု}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ကြားဖြတ်နိုင်သူ"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ခေါ်ဆိုမှုများ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ခေါ်ဆိုမှုများ"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ခွင့်ပြုထားသော ဖုန်းများ အသံထွက်ရန် စက်ကို အသံမြည်စေရန် သတ်မှတ်ထားခြင်း ရှိမရှိ စစ်ဆေးပါ"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ အတွက် အဝင်ခေါ်ဆိုမှုများကို ပိတ်ထားသည်။ သင့်မိတ်ဆွေ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များအား သင့်ကို ဆက်သွယ်ခွင့်ပြုရန်အတွက် ဆက်တင်များကို သင်ချိန်ညှိနိုင်သည်။"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ကြယ်ပွင့်ပြ အဆက်အသွယ်များ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">အခြား <xliff:g id="NUM_PEOPLE">%d</xliff:g> ယောက်</item>
-      <item quantity="one">အခြား ၁ ယောက်</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"မရှိ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{မရှိ}=1{{contact_1}}=2{{contact_1} နှင့် {contact_2}}=3{{contact_1}၊ {contact_2} နှင့် {contact_3}}other{{contact_1}၊ {contact_2} နှင့် အခြား # ခု}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(အမည်မရှိ)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"မက်ဆေ့ဂျ်များ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"မက်ဆေ့ဂျ်များ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"မက်ဆေ့ဂျ်များ"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ အတွက် အဝင်မက်ဆေ့ဂျ်များကို ပိတ်ထားသည်။ သင့်မိတ်ဆွေ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်အား ဆက်သွယ်နိုင်ရန် ဆက်တင်များကို ချိန်ညှိနိုင်သည်။"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"လူတိုင်းက မက်ဆေ့ဂျ်ပို့နိုင်သည်"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"လူတိုင်းက ခေါ်ဆိုနိုင်သည်"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"မရှိ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">အဆက်အသွယ် <xliff:g id="NUM_CONTACTS">%d</xliff:g> ဦး</item>
-      <item quantity="one">အဆက်အသွယ် 1 ဦး</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{မရှိ}=1{အဆက်အသွယ် ၁ ဦး}other{အဆက်အသွယ် # ခု}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"မည်သူမဆို"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"အဆက်အသွယ်များ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ကြယ်ပွင့်ပြထားသော အဆက်အသွယ်များ"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"အကြောင်းကြားချက် အားလုံး"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"အချို့ အကြောင်းကြားချက်များ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"အက်ပ်များကို ကြားဖြတ်ခွင့် မပြုသော်လည်း ရွေးထားသူများက သင့်ကိုဆက်သွယ်နိုင်ပါသေးသည်"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> က ကြားဖြတ်နိုင်သည်</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> က ကြားဖြတ်နိုင်သည်</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"နောက်ထပ် <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{မည်သည့်အက်ပ်မျှ ကြားမဖြတ်နိုင်ပါ}=1{{app_1} က ကြားဖြတ်နိုင်သည်}=2{{app_1} နှင့် {app_2} က ကြားဖြတ်နိုင်သည်}=3{{app_1}၊ {app_2} နှင့် {app_3} က ကြားဖြတ်နိုင်သည်}other{{app_1}၊ {app_2} နှင့် အခြားအက်ပ် # ခုက ကြားဖြတ်နိုင်သည်}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"အက်ပ်များ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"အကြောင်းကြားချက် အားလုံး"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"အချို့ အကြောင်းကြားချက်များ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ကြားဖြတ်နိုင်သည့် အကြောင်းကြားချက်များ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"အကြောင်းကြားချက်များအားလုံးကို ခွင့်ပြုခြင်း"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> က ကြားဖြတ်နိုင်သည်</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> က ကြားဖြတ်နိုင်သည်</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"မည်သည့်အရာကမျှ ကြားဖြတ်နိုင်ခြင်းမရှိပါ"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"နောက်ထပ် <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{မည်သည့်အရာကမျှ ကြားဖြတ်နိုင်ခြင်းမရှိပါ}=1{{sound_category_1} က ကြားဖြတ်နိုင်သည်}=2{{sound_category_1} နှင့် {sound_category_2} က ကြားဖြတ်နိုင်သည်}=3{{sound_category_1}၊ {sound_category_2} နှင့်{sound_category_3} က ကြားဖြတ်နိုင်သည်}other{{sound_category_1}၊ {sound_category_2} နှင့် အခြားအက်ပ် # ခုက ကြားဖြတ်နိုင်သည်}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"မည်သည့်အရာကမျှ ကြားဖြတ်နိုင်ခြင်းမရှိပါ"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"မည်သူမျှ ကြားဖြတ်နိုင်ခြင်းမရှိပါ"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"အချို့သူများ ကြားဖြတ်နိုင်သည်"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"လူတိုင်းက ကြားဖြတ်နိုင်သည်"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ဖွင့်ရန်"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"ပိတ်ရန်"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"အက်ပ်ပင်ထိုးခြင်း"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"အက်ပ်ပင်ထိုးခြင်းသည် လက်ရှိအက်ပ်ကို ပင်မဖြုတ်မချင်း မြင်ကွင်းထဲတွင် ဆက်ထားခွင့်ပြုသည်။ ဥပမာအားဖြင့် ဤဝန်ဆောင်မှုသည် ယုံကြည်စိတ်ချရသည့် မိတ်ဆွေတစ်ဦးအား ဂိမ်းတစ်ခုခုကို ကစားခွင့်ပြုသည်။ \n\nအက်ပ်တစ်ခုကို ပင်ထိုးထားသည့်အခါ ပင်ထိုးထားသည့်အက်ပ်သည် အခြားအက်ပ်များကို ဖွင့်နိုင်ပြီး ကိုယ်ရေးကိုယ်တာဒေတာများကို အသုံးပြုခွင့်ရှိနိုင်ပါသည်။ \n\nအက်ပ်ပင်ထိုးခြင်းကို အသုံးပြုရန်- 	\n၁။	အက်ပ်ပင်ထိုးခြင်းကို ဖွင့်ပါ 	\n၂။	အနှစ်ချုပ်ကို ဖွင့်ပါ 	\n၃။	မျက်နှာပြင်ထိပ်ဘက်ရှိ အက်ပ်သင်္ကေတကို တို့ပြီး \'ပင်ထိုးရန်\' ကို နှိပ်ပါ"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"အက်ပ်ပင်ထိုးခြင်းသည် လက်ရှိအက်ပ်ကို ပင်မဖြုတ်မချင်း မြင်ကွင်းထဲတွင် ဆက်ထားခွင့်ပြုသည်။ ဥပမာ ယုံကြည်စိတ်ချရသည့် မိတ်ဆွေတစ်ဦးအား ဂိမ်းတစ်ခုခုကစားခွင့်ပြုရန် ဤဝန်ဆောင်မှုကို သုံးနိုင်သည်။ \n\nအက်ပ်တစ်ခုကို ပင်ထိုးသည့်အခါ ၎င်းက အခြားအက်ပ်များကို ဖွင့်နိုင်ပြီး ကိုယ်ရေးကိုယ်တာဒေတာများကို အသုံးပြုနိုင်သည်။ \n\nသင့်စက်ကို တစ်စုံတစ်ယောက်နှင့် လုံခြုံစွာမျှဝေလိုပါက ဧည့်သည်အသုံးပြုသူကို သုံးကြည့်ပါ။ \n\nအက်ပ်ပင်ထိုးခြင်းကို အသုံးပြုရန်- 	\n၁။	အက်ပ်ပင်ထိုးခြင်းကို ဖွင့်ပါ 	\n၂။	အနှစ်ချုပ်ကို ဖွင့်ပါ 	\n၃။	ဖန်သားပြင်ထိပ်ရှိ အက်ပ်သင်္ကေတကို တို့ပြီး \'ပင်ထိုးရန်\' ကို နှိပ်ပါ"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"အက်ပ်ပင်ထိုးခြင်းသည် လက်ရှိအက်ပ်ကို ပင်မဖြုတ်မချင်း မြင်ကွင်းထဲတွင် ဆက်ထားခွင့်ပြုသည်။ ဥပမာ ယုံကြည်စိတ်ချရသည့် မိတ်ဆွေတစ်ဦးအား ဂိမ်းတစ်ခုခုကစားခွင့်ပြုရန် ဤဝန်ဆောင်မှုကို သုံးနိုင်သည်။"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"အက်ပ်တစ်ခုကို ပင်ထိုးသည့်အခါ ၎င်းက အခြားအက်ပ်များကို ဖွင့်နိုင်ပြီး ကိုယ်ရေးကိုယ်တာဒေတာများကို အသုံးပြုနိုင်သည်။ \n\nအက်ပ်ပင်ထိုးခြင်းကို အသုံးပြုရန်- 	\n၁။	အက်ပ်ပင်ထိုးခြင်းကို ဖွင့်ပါ 	\n၂။	အနှစ်ချုပ်ကို ဖွင့်ပါ 	\n၃။	ဖန်သားပြင်ထိပ်ရှိ အက်ပ်သင်္ကေတကို တို့ပြီး \'ပင်ထိုးရန်\' ကို နှိပ်ပါ"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"အက်ပ်တစ်ခုကို ပင်ထိုးသည့်အခါ ၎င်းက အခြားအက်ပ်များကို ဖွင့်နိုင်ပြီး ကိုယ်ရေးကိုယ်တာဒေတာများကို အသုံးပြုနိုင်သည်။ \n\nသင့်စက်ကို တစ်စုံတစ်ယောက်နှင့် လုံခြုံစွာမျှဝေလိုပါက ဧည့်သည်အသုံးပြုသူကို စမ်းသုံးကြည့်ပါ။ \n\nအက်ပ်ပင်ထိုးခြင်းကို အသုံးပြုရန်- 	\n၁။	အက်ပ်ပင်ထိုးခြင်းကို ဖွင့်ပါ 	\n၂။	အနှစ်ချုပ်ကို ဖွင့်ပါ 	\n၃။	ဖန်သားပြင်ထိပ်ရှိ အက်ပ်သင်္ကေတကို တို့ပြီး \'ပင်ထိုးရန်\' ကို နှိပ်ပါ"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"အက်ပ်ကို ပင်ထိုးထားသည့်အခါ- \n\n•	 ကိုယ်ရေးကိုယ်တာ ဒေတာများကို အသုံးပြုနိုင်ပါသည် \n		(အဆက်အသွယ်နှင့် အီးမေးလ်အကြောင်းအရာများကဲ့သို့) \n• ပင်ထိုးထားသည့်အက်ပ်သည် အခြားအက်ပ်များကို ဖွင့်နိုင်သည် \n\nသင်ယုံကြည်စိတ်ချရသူများနှင့်သာ အက်ပ်ပင်ထိုးခြင်းကို အသုံးပြုပါ။"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"ပင်မဖြုတ်မီမှာ သော့ဖွင့် ပုံစံကွက်ကို မေးရန်"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"ပင်မဖြုတ်မီမှာ PIN ကို မေးရန်"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ ပင်နံပါတ် တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပင်နံပါတ် သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ လော့ခ်ဖွင့်ပုံစံ တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် လော့ခ်ဖွင့်ပုံစံ သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"သင်၏စက်ပစ္စည်းလော့ခ်ဖွင့်ရန် မျက်နှာကို သုံးခြင်းအပြင် စက်မစတင်မီ စကားဝှက်တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသေးသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် စကားဝှက် သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များကို အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပင်နံပါတ် တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပင်နံပါတ် သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ ပုံစံတောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်သည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည်မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် ပုံစံ သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ဤစက်ပစ္စည်းကို လော့ခ်ဖွင့်ရန်အတွက် သင်၏ ဇီဝဗေဒဆိုင်ရာ အချက်အလက်များ အသုံးပြုခြင်းအပြင် ၎င်းမစတင်မီ စကားဝှက်တောင်းစေခြင်းဖြင့် ထပ်လောင်းကာကွယ်ထားနိုင်ပါသည်။ စက်ပစ္စည်း မစတင်မချင်း နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံနိုင်မည် မဟုတ်ပါ။\n\n၎င်းက ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးသည်။ သင်၏စက်ပစ္စည်းစတင်ရန် စကားဝှက် သတ်မှတ်ထားလိုပါသလား။"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Yes"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"No"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ကန့်သတ်ထားသည်"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ကို ထိန်းချုပ်သည့်စက်"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"ချိတ်ဆက်ထားသော စက်ပစ္စည်း"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ဤစက်ပစ္စည်း"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"ပြောင်းနေသည်..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"ပြောင်းနေသည်…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"ပြောင်း၍မရပါ"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ဤစက်ပစ္စည်းကို အားသွင်းနေသည်"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"ချိတ်ဆက်ထားသည့် စက်ကို အားသွင်းခြင်း"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"မိုဘိုင်းဒေတာ အသုံးပြုမှု"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"အက်ပ်ဒေတာ သုံးစွဲမှု"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi ဒေတာ အသုံးပြုမှု"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"ဝန်ဆောင်မှုပေးသူမှမဟုတ်သည့် ဒေတာသုံးစွဲမှု"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"အီတာနက်ဒေတာအသုံးပြုချက်"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"အီတာနက်"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">ကန့်သတ်ချက် ၁ ခု</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ဝန်ဆောင်မှုပေးသူ၏ ဒေတာအသုံးပြုမှု တွက်ချက်ခြင်းသည် စက်ပစ္စည်း၏ တွက်ချက်ခြင်းနှင့် ကွဲပြားနိုင်သည်"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ဝန်ဆောင်မှုပေးသူ၏ကွန်ရက်များက အသုံးပြုသော ဒေတာများ မပါဝင်ပါ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> အသုံးပြုထားသည်"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ဒေတာသတိပေးချက် သတ်မှတ်ရန်"</string>
     <string name="data_warning" msgid="2925054658166062884">"ဒေတာသတိပေးချက်"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"အသေးစိတ် ကြည့်ရန်"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ဒေတာချွေတာမှု"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ကန့်သတ်မဲ့ ဒေတာ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"နောက်ခံဒေတာကို ပိတ်ထားသည်"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"နောက်ခံဒေတာကို ပိတ်ထားသည်"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ဖွင့်ပါ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ပိတ်ထားသည်"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"\'ဒေတာ ချွေတာမှုစနစ်\' ကို သုံးရန်"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"စက်ပစ္စည်းကိုလော့ခ်ချထားလျှင်၊ သတိပေးချက်များတွင် ပြန်စာရေးခြင်း သို့မဟုတ် အခြားစာရေးခြင်းများ မပြုလုပ်နိုင်ရန် ကာကွယ်ထားပါသည်။"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"မူရင်းစာလုံးပေါင်းသတ်ပုံစစ်စနစ်"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"သတ်ပုံစစ်စနစ် ရွေးချယ်ပါ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"စာလုံးပေါင်းသတ်ပုံစစ်စနစ် အသုံးပြုပါ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"စာလုံးပေါင်းသတ်ပုံစစ်စနစ် အသုံးပြုပါ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"မရွေးထားပါ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(တစ်ခုမျှမဟုတ်ပါ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"− "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"သိုလှောင်ခန်း နေရာလွတ်များ ရှိလာစေရန် သိုလှောင်ခန်းမန်နေဂျာသည် သင့်စက်ပစ္စည်းပေါ်ရှိ မိတ္တူကူးယူထားသည့် ဓာတ်ပုံနှင့် ဗီဒီယိုများကို ဖယ်ရှားလိုက်ပါမည်။"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ဓာတ်ပုံနှင့် ဗီဒီယိုများကို ဖယ်ရှားပါ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"သိုလှောင်ခန်းမန်နေဂျာ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"သိုလှောင်ခန်း စီမံခန့်ခွဲမှုစနစ်ကို သုံးရန်"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"သိုလှောင်ခန်း စီမံခန့်ခွဲမှုစနစ်ကို သုံးရန်"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"အလိုအလျောက်"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ကိုယ်တိုင်ထည့်သွင်းခြင်း"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ယခုနေရာလွတ်ပြုလုပ်ပါ"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ဖုန်းကိုစစ်ရန် နှစ်ချက်တို့ခြင်း"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"တက်ဘလက်ကို စစ်ဆေးကြည့်ရန် နှစ်ချက်တို့ပါ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"စက်ပစ္စည်းကို စစ်ဆေးကြည့်ရန် နှစ်ချက်တို့ပါ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"အကြောင်းကြားချက်များကိုဖွင့်ရန် ပွတ်ဆွဲပါ"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"သင့်အကြောင်းကြားချက်များကို ပြသရန် ဖန်သားပြင်၏အောက်ခြေအစွန်း၌ ပွတ်ဆွဲချပါ။"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"လက်တစ်ဖက်သုံးမုဒ်"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"လက်တစ်ဖက်သုံးမုဒ် သုံးရန်"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"အက်ပ်များ ပြောင်းသည့်အခါ ထွက်ရန်"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"အချိန်ကုန်ပါပြီ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"၄ စက္ကန့်"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"၈ စက္ကန့်"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"၁၂ စက္ကန့်"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"လက်လှမ်းတမီရှိမှု"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"အချိန်၊ အကြောင်းကြားချက်များနှင့် အခြားအချက်အလက်များကို စစ်ရန် သင့်ဖန်သားပြင်ကို နှစ်ချက်တို့ပါ။"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ဖုန်းစစ်ရန် ကောက်ယူခြင်း"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"တက်ဘလက်ကို စစ်ဆေးကြည့်ရန် မ လိုက်ပါ"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"တက်ဘလက်ကို စစ်ဆေးရန် တို့ပါ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"စက်ပစ္စည်းကို စစ်ဆေးရန် တို့ပါ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"အချိန်၊ အကြောင်းကြားချက်များနှင့် အခြားအချက်အလက်များကို စစ်ဆေးရန် သင့်ဖန်သားပြင်ကို တို့ပါ။"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"အရေးပေါ် SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"အရေးပေါ် SOS ကို သုံးခြင်း"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> က စီမံခန့်ခွဲသည်"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"ဖွင့်ပိတ်ခလုတ်ကို ၅ ကြိမ် (သို့) ၅ ကြိမ်ထက်ပို၍ အမြန်နှိပ်ခြင်းဖြင့် အောက်ပါ လုပ်ဆောင်ချက်များကို စတင်နိုင်သည်"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"အချက်ပေးခေါင်းလောင်းသံ ဖွင့်ရန်"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"အကူအညီမတောင်းခင် ကျယ်လောင်သောအသံကို ဖွင့်သည်"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"အကူအညီအတွက် ခေါ်ဆိုပါ"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"အကူအညီအတွက် ခေါ်ဆိုရန်နံပါတ်"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>။ ပြောင်းရန်တို့ပါ"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"အရေးပေါ်မဟုတ်သောနံပါတ်ကို ရိုက်ထည့်ပါက-\n • အရေးပေါ် SOS များကို သုံးရန် သင့်စက်ကို လော့ခ်ဖွင့်ထားရမည်\n • သင်၏ခေါ်ဆိုမှုများကို ဖြေကြားမည်မဟုတ်ပါ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"သတိပေးချက်အတွက် လက်ဗွေပွတ်ဆွဲပါ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"လက်ဗွေပွတ်ဆွဲခြင်း"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"အကြောင်းကြားချက်များကို ကြည့်ရန် ဖုန်း၏ နောက်ကျောဘက်ရှိ လက်ဗွေ အာရုံခံကိရိယာပေါ်တွင် အောက်သို့ ပွတ်ဆွဲပါ။"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"အများဆုံးမြင်နိုင်သည့် ဒေတာအတွဲ အရေအတွက်"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"မူရင်းတန်ဖိုးများသို့ ပြင်ဆင်သတ်မှတ်ထားသည်"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"တီထွင်သူများရွေးစရာ အလိုအလျောက်ဖြည့်ခြင်းကို ပြင်ဆင်သတ်မှတ်ထားသည်"</string>
+    <string name="location_category" msgid="3496759112306219062">"တည်နေရာ"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"အခြေအနေပြဘား တည်နေရာအညွှန်း"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"ကွန်ရက်နှင့် ချိတ်ဆက်နိုင်မှုတို့ ပါဝင်သည့် တည်နေရာအားလုံးအတွက် ပြသည်"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS အတိုင်းအတာအပြည့် သက်ရောက်ရန်"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"လည်ပတ်ချိန်မပါဘဲ GNSS စက်ဝိုင်းပုံမြင်ကွင်းကျယ်ပုံများနှင့် ကြိမ်နှုန်းအားလုံးကို ခြေရာခံပါ"</string>
     <string name="device_theme" msgid="5027604586494772471">"စက်ပစ္စည်း အပြင်အဆင်"</string>
     <string name="default_theme" msgid="4815428567082263639">"မူရင်း"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"ကွန်ရက် အမည်"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"အာရုံစူးစိုက်နိုင်ရန် အကြောင်းကြားချက်များကို ခေတ္တရပ်ထားပါ"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ဝန်ဆောင်မှု မရနိုင်ပါ။"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"ဤဝန်ဆောင်မှုသည် သင့်ဖုန်းကို နှေးစေသောကြောင့် ၎င်းကို ပိတ်ထားပါသည်"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS အတိုင်းအတာအပြည့် သက်ရောက်ရန်"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"လည်ပတ်ချိန်မပါဘဲ GNSS စက်ဝိုင်းပုံမြင်ကွင်းကျယ်ပုံများနှင့် ကြိမ်နှုန်းအားလုံးကို ခြေရာခံပါ"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"ရပ်တန့်သွားမှု ဒိုင်ယာလော့ကို အမြဲပြရန်"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"အက်ပ်ရပ်တန့်သွားသည့်အခါတိုင်း ဒိုင်ယာလော့ကို ပြရန်"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE ကို ဖွင့်ထားသည့်အက်ပ်ကို ရွေးပါ"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"အက်ပ်အားလုံးအတွက် ဖွင့်ပါ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ဂရပ်ဖစ်ဒရိုင်ဗာ ရွေးချယ်ပါ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"မူလ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ဂိမ်းဒရိုင်ဗာ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ဂိမ်းဒရိုင်ဗာ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ဆော့ဖ်ဝဲရေးသူ ဒရိုင်ဗာ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"စနစ် ဂရပ်ဖစ်ဒရိုင်ဗာ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"ဖွင့်ရန် (အသံတိတ်ရန်)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ပိတ်ရန်"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"ကွန်ရက် အသေးစိတ်များ"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"သင့်စက်ပစ္စည်းအမည်ကို သင့်ဖုန်းပေါ်ရှိ အက်ပ်များက မြင်ရပါသည်။ သင် \'ဘလူးတုသ်\' စက်ပစ္စည်းများသို့ ချိတ်ဆက်သည့်အခါ သို့မဟုတ် Wi-Fi ဟော့စပေါ့ ထုတ်လွှင့်သည့်အခါ အခြားသူများက မြင်နိုင်ပါသည်။"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"သင့်စက်ပစ္စည်းအမည်ကို သင့်ဖုန်းပေါ်ရှိ အက်ပ်များက မြင်ရပါသည်။ သင် ဘလူးတုသ်သုံးစက်များသို့ ချိတ်ဆက်သည့်အခါ၊ Wi-Fi ကွန်ရက်သို့ ချိတ်ဆက်သည့်အခါ သို့မဟုတ် Wi-Fi ဟော့စပေါ့ ထုတ်လွှင့်သည့်အခါ တို့တွင်လည်း ၎င်းကို အခြားသူများက မြင်နိုင်ပါသည်။"</string>
     <string name="devices_title" msgid="649715719278562515">"စက်များ"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"ဆက်တင်အားလုံး"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"အကြံပြုချက်များ"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ကွန်ရက် ရှာမတွေ့ပါ။ ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(တားမြစ်ထားသည်)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ဆင်းမ်ကတ် မရှိပါ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ဆင်းကဒ်မရှိပါ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"မရှိ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ချိတ်ဆက်ရန် SIM ကတ်လိုအပ်သည်"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ချိတ်ဆက်ရန် <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM ကတ် လိုအပ်သည်"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- GSM သီးသန့်"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"အသုံးပြုလိုသော ကွန်ရက်မုဒ်- WCDMA သာ"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"မိုဘိုင်းဒေတာ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"မိုဘိုင်းကွန်ရက်သုံးပြီး ဒေတာကို ဝင်သုံးခွင့်ပေးပါ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ဖုန်းသည် ရနိုင်သည့်အကွာအဝေးအတွင်း ရောက်သည့်အခါ ဤဝန်ဆောင်မှုပေးသူသို့ အလိုအလျောက် ပြောင်းသွားပါမည်"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ဆင်းမ်ကတ် မရနိုင်ပါ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ခေါ်ဆိုမှု သတ်မှတ်ချက်"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS သတ်မှတ်ချက်"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"အမြဲမေးပါ"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> တွင် ချိတ်ဆက်ထားသည့်အခါ မရနိုင်ပါ"</string>
     <string name="see_more" msgid="7499355691042812723">"ပိုပြရန်"</string>
     <string name="see_less" msgid="2642392725363552793">"လျှော့ ကြည့်ရန်"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ကို ဖွင့်မလား။"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ဆင်းမ်ကို ဖွင့်မလား။"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> သို့ ပြောင်းမလား။"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ဆင်းမ်ကတ်အသုံးပြုခြင်းသို့ ပြောင်းမလား။"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"တစ်ကြိမ်တွင် ဆင်းမ်တစ်ကတ်သာ အသုံးပြုနိုင်ပါသည်။\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> သို့ပြောင်းခြင်းက သင့် <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ဝန်ဆောင်မှုကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"တစ်ကြိမ်တွင် ဒေါင်းလုဒ်လုပ်ထားသော ဆင်းမ်တစ်ကတ်သာ အသုံးပြုနိုင်ပါသည်။\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> သို့ပြောင်းခြင်းက သင့် <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ဝန်ဆောင်မှုကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"တစ်ကြိမ်တွင် ဆင်းမ်တစ်ကတ်သာ အသုံးပြုနိုင်ပါသည်။\n\nပြောင်းခြင်းက သင့် <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ဝန်ဆောင်မှုကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> သို့ ပြောင်းရန်"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ကွန်ရက်သို့ ချိတ်ဆက်နေသည်…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> သို့ ပြောင်းနေသည်"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ဝန်ဆောင်မှုပေးသူကို ပြောင်း၍မရပါ"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"အမှားအယွင်းတစ်ခုကြောင့် ဝန်ဆောင်မှုပေးသူကို ပြောင်း၍မရပါ။"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ပိတ်မလား။"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"\'ဆင်းမ်ကဒ်\' ပိတ်မလား။"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"\'ဆင်းမ်ကဒ်\' ပိတ်နေသည်<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ဝန်ဆောင်မှုပေးသူကို ပိတ်၍မရပါ"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"တစ်ခုခုမှားယွင်းသွားပါ၍ သင့်ဝန်ဆောင်မှုပေးသူကို ပိတ်မရခဲ့ပါ။"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"ဆင်းမ် ၂ ကတ် သုံးမလား။"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ဤစက်တွင် ဆင်းမ် ၂ ကတ် တစ်ပြိုင်နက် စတင်နိုင်သည်။ တစ်ကြိမ်တွင် ဆင်းမ် ၁ ကတ်ဖြင့် ဆက်သုံးရန် \"မလိုတော့ပါ\" ကိုတို့ပါ။"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"စက်ကို ပြန်စမလား။"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"စတင်ရန်အတွက် သင့်စက်ကို ပြန်စပါ။ ထို့နောက် နောက်ဆင်းမ်ကို ထည့်နိုင်ပါသည်။"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ရှေ့ဆက်ရန်"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ပြန်စရန်"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"မလိုပါ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"ပြောင်းရန်"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ဆင်းမ်ကို ဖွင့်၍မရပါ"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ဆင်းမ်ကို ဖယ်ရှားပြီး ပြန်ထည့်ကြည့်ပါ။ ပြဿနာရှိနေသေးပါက သင့်စက်ကို ပြန်လည်စတင်ပါ။"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ဆင်းမ်ကို ပြန်ဖွင့်ကြည့်ပါ။ ပြဿနာရှိနေသေးပါက သင့်စက်ကို ပြန်လည်စတင်ပါ။"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"ကွန်ရက် စတင်အသုံးပြုခြင်း"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ကို အသုံးပြုနေသည်"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"ဆင်းမ်ကတ်ဆက်တင်များ အပ်ဒိတ်လုပ်ရန် တို့ပါ"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"ဆင်းမ်ကတ်"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"ဒေါင်းလုဒ်လုပ်ထားသော ဤဆင်းမ်ကို ဖျက်လိုသလား။"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ဤဆင်းမ်ကို ဖျက်ခြင်းဖြင့် ဤစက်ပစ္စည်းမှ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ဝန်ဆောင်မှုကို ဖယ်ရှားပါမည်။\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> အတွက် ဝန်ဆောင်မှုကို ပယ်ဖျက်မည်မဟုတ်ပါ။"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"ဖျက်ရန်"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"ဆင်းမ်ကို ဖျက်နေသည်…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"ဆင်းမ်ကို ဖျက်၍မရပါ"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"အမှားအယွင်းရှိနေသောကြောင့် ဤဆင်းမ်ကို ဖျက်၍မရပါ။\n\nသင့်စက်ပစ္စည်းကို ပြန်စပြီး ထပ်စမ်းကြည့်ပါ။"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"စက်နှင့် ချိတ်ဆက်ခြင်း"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"သင့်စက်နှင့် ချိတ်ဆက်ရန် <xliff:g id="APPNAME">%1$s</xliff:g> အက်ပ်က ယာယီ Wi‑Fi ကွန်ရက်ကို အသုံးပြုလိုသည်"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"မည်သည့်စက်မျှ မတွေ့ပါ။ စက်များဖွင့်ထားပြီး ချိတ်ဆက်နိုင်ခြင်း ရှိမရှိ စစ်ဆေးပါ။"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"အရေးပေါ်ခေါ်ဆိုမှုများ"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"\'Wi‑Fi ခေါ်ဆိုခြင်း\' မှတစ်ဆင့် အရေးပေါ်ဖုန်းခေါ်ခြင်းများကို သင့်ဝန်ဆောင်မှုပေးသူက ပံ့ပိုးမထားပါ။\nအရေးပေါ်ဖုန်းခေါ်ခြင်း ပြုလုပ်ရန် စက်ပစ္စည်းသည် ဆယ်လူလာကွန်ရက်သို့ အလိုအလျောက် ပြောင်းသွားပါမည်။\nဆယ်လူလာကွန်ရက် ရရှိနိုင်သည့် နယ်မြေများတွင်သာ အရေးပေါ်ဖုန်းခေါ်ခြင်းများ ပြုလုပ်နိုင်ပါသည်။"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"ဖုန်းခေါ်ဆိုမှုများ အရည်အသွေး ပိုမိုကောင်းမွန်စေရန် Wi‑Fi အသုံးပြုသည်"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Cross SIM ခေါ်ဆိုမှု"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"ဤ SIM တွင် အခြား SIM ခေါ်ဆိုမှုနှင့် SMS များကို ခွင့်ပြုသည်။"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"cross sim ခေါ်ဆိုမှု"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"MMS မက်ဆေ့ဂျ် အဝင်"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS မက်ဆေ့ဂျ်များ ပို့၍မရပါ"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"မိုဘိုင်းဒေတာ ပိတ်ထားချိန် <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> တွင် MMS မက်ဆေ့ဂျ်ပို့ခွင့်ပြုရန် တို့ပါ"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"\'ဆက်တင်များ\' ပေါ် ဖန်သားပြင်ထပ်ဆင့်ပြခွင့်ပြုခြင်း"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"အခြားအက်ပ်များအပေါ်တွင် ပြသနိုင်သည့် အက်ပ်များအား \'ဆက်တင်များ\' မျက်နှာပြင်ကို ထပ်ဆင့်ပြခွင့်ပြုပါ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"မီဒီယာ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"မီဒီယာစက်ရှင် ပြီးဆုံးသွားလျှင် ပလေယာကိုဖျောက်မည်"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"ချဲ့ထားသော အမြန် ဆက်တင်များအကန့်မှ စက်ရှင်တစ်ခုကို ပလေယာက ဆက်လုပ်ခွင့်ပြုသည်။"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"\'အမြန် ဆက်တင်များ\' ရှိ မီဒီယာ ပလေယာ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"အလွယ်တကူပြန်ဖွင့်ရန်အတွက် မီဒီယာ ပလေယာကို အချိန်ကြာမြင့်စွာပြရန်"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ပလေယာကို ဖျောက်ထားမည်"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ပလေယာကို ပြရန်"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"မည်သည့်ပလေယာကိုမျှ မရရှိနိုင်ပါ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ခွင့်ပြု အက်ပ်များ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"မီဒီယာ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ဘလူးတုသ် ပွင့်ပါမည်"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ဖွင့်ထားသည်"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"ပိတ်ထားသည်"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"အင်တာနက်"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"ဆင်းမ်များ"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"လေယာဉ်ပျံမုဒ်တွင် လုံခြုံသော ကွန်ရက်များ"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"လေယာဉ်ပျံမုဒ်တွင် လုံခြုံသောကွန်ရက်များကို ရှာဖွေပြီး ချိတ်ဆက်သည်"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"လေယာဉ်ပျံ၊ လေယာဉ်ပျံမုဒ်တွင် လုံခြုံခြင်း"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"ခေါ်ဆိုမှုများနှင့် SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi ခေါ်ဆိုမှု"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi-Fi ကဲ့သို့သော ဖုန်းဝန်ဆောင်မှုပေးသူမဟုတ်သည့် ကွန်ရက်များတွင် ဖုန်းခေါ်ဆိုခြင်းနှင့် လက်ခံခြင်းများကို ပြုလုပ်ပါ"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi‑Fi ခေါ်ဆိုမှုက Wi-Fi ကွန်ရက်အချို့ကဲ့သို့သော ဖုန်းဝန်ဆောင်မှုပေးသူမဟုတ်သည့် ကွန်ရက်များတွင် ဖုန်းခေါ်ဆိုရန်နှင့် လက်ခံရန် ခွင့်ပြုပေးသည်။"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"ခေါ်ဆိုမှုများ"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"ဦးစားပေး"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"ခေါ်ဆိုမှုများ ဦးစားပေး"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS ဦးစားပေး"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"မရနိုင်ပါ"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM မရှိပါ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ရွေးချယ်မှုများ"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"အများသုံးကွန်ရက်များသို့ ချိတ်ဆက်လိုက်သည်"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ကွန်ရက်ချိတ်ဆက်မှု၊ အင်တာနက်၊ ကြိုးမဲ့၊ ဒေတာ၊ wifi၊ wi-fi၊ wi fi၊ ဆယ်လူလာ၊ မိုဘိုင်း၊ ဖုန်းဝန်ဆောင်မှုပေးသူ၊ 4g၊ 3g၊ 2g၊ lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"လေယာဉ်ပျံလုံခြုံရေး ကွန်ရက်များ ကြည့်ရန်"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"\'လေယာဉ်ပျံမုဒ်\' ကို ပိတ်ရန်"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"အိပ်ချိန်မုဒ်ကို ဖွင့်ထားသောကြောင့် မရရှိနိုင်ပါ"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"အကြောင်းကြားချက်၏ အရေးပါမှုကို ပြင်ဆင်သတ်မှတ်ပြီးပါပြီ။"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"အက်ပ်များ"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"မယုံကြည်ရသော စက်ပစ္စည်းက သင်၏ မက်ဆေ့ဂျ်များကို အသုံးပြုလိုသည်။ အသေးစိတ်အချက်အလက်များအတွက် တို့ပါ။"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"မက်ဆေ့ဂျ်များကို အသုံးပြုခွင့်ပေးမလား။"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"မယုံကြည်ရသော ဘလူးတုသ်သုံးစက်၊ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]၊ က သင်၏ မက်ဆေ့ဂျ်များကို အသုံးပြုလိုသည်။\n\nသင်သည် [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ကို ယခင်က မချိတ်ဆက်ဖူးပါ။"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"မယုံကြည်ရသော စက်ပစ္စည်းက သင်၏ အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းကို အသုံးပြုလိုသည်။ အသေးစိတ်အချက်အလက်များအတွက် တို့ပါ။"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းကို အသုံးပြုခွင့်ပေးမလား။"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"မယုံကြည်ရသော ဘလူးတုသ်သုံးစက်၊ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]၊ က သင်၏ အဆက်အသွယ်များနှင့် ခေါ်ဆိုမှုမှတ်တမ်းကို အသုံးပြုလိုသည်။ ၎င်းတွင် အဝင်နှင့် အထွက်ခေါ်ဆိုမှုများဆိုင်ရာ ဒေတာ ပါဝင်သည်။\n\nသင်သည် [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ကို ယခင်က မချိတ်ဆက်ဖူးပါ။"</string>
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 951578c..52a8ef5 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Middels"</item>
     <item msgid="6740026006576843477">"Lang"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kort"</item>
+    <item msgid="7397961711906421599">"Middels"</item>
+    <item msgid="4079132024502041928">"Lang"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standard"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalt"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Bare TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalt"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f9fbcfc..f8b0ab1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Dato og klokkeslett"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Angi dato og klokkeslett"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Angi dato, klokkeslett, tidssone og formater"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Bruk nettverkets klokkeslett"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Bruk nettverkets tidssone"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Angi klokkeslettet automatisk"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Angi tidssonen automatisk"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Bruk lokal standard"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-timers format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Bruk 24-timers format"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Vis profilinformasjon på låseskjermen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Kontoer"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Posisjon"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Bruk posisjon"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Bruk posisjon"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Av"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">På – <xliff:g id="COUNT_1">%1$d</xliff:g> apper har tilgang til posisjon</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skjermlås, ansiktslås"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skjermlås, fingeravtrykk"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Skjermlås"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Sikker opplåsing av telefonen med ansikt og fingeravtrykk"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Du kan også logge på apper og bekrefte betalinger"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Konfigurer opplåsing med:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Ansiktslås"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Gjør det enkelt å låse opp telefonen"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingeravtrykk"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Lås opp telefonen raskt i lommen"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Hopp over"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Neste"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Ansiktet er lagt til"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Konfigurer ansiktslås"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Ansiktslås"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Bruk ansiktet ditt til å godkjenne"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Start"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Hvis ansiktslås med tilgjengelighet er slått av, fungerer muligens ikke enkelte konfigureringstrinn som de skal, med TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Gå tilbake"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Fortsett konfig."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Bruk tilgjengelighetsoppsett"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Sørg for at det alltid kreves bekreftelse når ansiktslås brukes i apper"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Slett ansiktsdata"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Konfigurer ansiktslås"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Bruk ansiktslås til å låse opp enheten din, logge på apper og bekrefte betalinger.\n\nHusk:\nHvis du ser på telefonen, kan den låses opp, selv om det ikke er meningen.\n\nTelefonen din kan låses opp av noen andre hvis den holdes mot ansiktet ditt.\n\nTelefonen kan låses opp av noen som ser veldig ut som deg, for eksempel en tvilling."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Bruk ansiktslås til å låse opp enheten din, logge på apper og bekrefte betalinger.\n\nHusk:\nHvis du ser på telefonen, kan den låses opp, selv om det ikke er meningen.\n\nTelefonen din kan låses opp av noen andre hvis den holdes mot ansiktet ditt, selv om øynene dine er lukket.\n\nTelefonen kan låses opp av noen som ser veldig ut som deg, for eksempel en tvilling."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Bruk ansiktslås til å låse opp enheten, logge på apper og bekrefte betalinger."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Husk:\nHvis du ser på telefonen, kan den låses opp, selv om det ikke er meningen.\n\nTelefonen kan låses opp av andre hvis den holdes mot ansiktet ditt.\n\nTelefonen kan låses opp av noen som ligner veldig på deg, for eksempel en tvilling."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Husk:\nHvis du ser på telefonen, kan den låses opp, selv om det ikke er meningen.\n\nTelefonen kan låses opp av andre hvis den holdes mot ansiktet ditt, selv om øynene dine er lukket.\n\nTelefonen kan låses opp av noen som ligner veldig på deg, for eksempel en tvilling."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vil du slette ansiktsdata?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Ansiktsdataene som brukes av ansiktslåsen, blir permanent slettet på en sikker måte. Etter fjerning trenger du PIN-kode, mønster eller passord for å låse opp telefonen, logge på apper og bekrefte betalinger."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Bruk Ansiktslås til å låse opp telefonen din"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Bruk fingeravtrykk til å låse opp telefonen eller godta kjøp.\n\nMerk: Du kan ikke bruke fingeravtrykk til å låse opp denne enheten. Ta kontakt med administratoren for organisasjonen din for mer informasjon."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Bruk fingeravtrykk til å låse opp telefonen eller godta kjøp.\n\nMerk: Fingeravtrykket ditt kan være mindre sikkert enn sterke mønstre eller PIN-koder."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Avbryt"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nei takk"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Fortsett"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Hopp over"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Neste"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Når du beskytter nettbrettet ditt med et alternativ for skjermlås, kan ingen andre bruke det hvis det blir stjålet eller du mister det. Du trenger også et alternativ for skjermlås for å konfigurere Ansiktslås. For å gå tilbake, trykk på Avbryt."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Når du beskytter enheten din med et alternativ for skjermlås, kan ingen andre bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere Ansiktslås. For å gå tilbake, trykk på Avbryt."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Når du beskytter telefonen din med et alternativ for skjermlås, kan ingen andre bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere Ansiktslås. For å gå tilbake, trykk på Avbryt."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Når du beskytter nettbrettet ditt med et alternativ for skjermlås, kan ingen andre bruke det hvis det blir stjålet eller du mister det. Du trenger også et alternativ for skjermlås for å konfigurere biometri. For å gå tilbake, trykk på Avbryt."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Når du beskytter enheten med et alternativ for skjermlås, kan ingen andre bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere biometri. For å gå tilbake, trykk på Avbryt."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Når du beskytter telefonen din med et alternativ for skjermlås, kan ingen andre bruke den hvis den blir stjålet eller du mister den. Du trenger også et alternativ for skjermlås for å konfigurere biometri. For å gå tilbake, trykk på Avbryt."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Vil du hoppe over konfigurering av PIN-nummer?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Vil du hoppe over konfigurering av passord?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Vil du hoppe over konfigurering av mønster?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Hindre at andre bruker dette nettbrettet uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Hindre at andre bruker denne enheten uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Hindre at andre bruker denne telefonen uten din tillatelse, ved å aktivere funksjoner for enhetsbeskyttelse. Velg skjermlåsen du vil bruke."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Velg reservemetode for skjermlås"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Velg hva slags reserveskjermlås du vil bruke"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Velg hva slags reserveskjermlås du vil bruke"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Alternativer for skjermlås"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Alternativer for skjermlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Skjermlås"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Ansiktslås + passord"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Fortsett uten Ansiktslås"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Du kan låse opp telefonen med ansiktet. Av sikkerhetsgrunner krever dette alternativet en reserveskjermlås."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometri + mønster"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometri + PIN-kode"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometri + passord"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Fortsett uten biometri"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Du kan låse opp telefonen med biometri. Av sikkerhetsgrunner krever dette alternativet en reserveskjermlås."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Avslått av admin, krypteringsregel eller legitimasjonslager"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ingen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Sveip"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Må inneholde færre enn <xliff:g id="NUMBER_0">%d</xliff:g> siffer</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Enhetsadministratoren forbyr nylig brukt PIN-kode"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Vanlige PIN-koder er blokkert av IT-administratoren din. Prøv en annen PIN-kode."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Dette kan ikke inkludere et ugyldig tegn"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Må inneholde minst én bokstav"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Må inneholde minst ett siffer"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Må inneholde minst 1 tegn som ikke er et tall</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Enhetsadministratoren forbyr nylig brukte passord"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Vanlige passord er blokkert av IT-administratoren din. Prøv et annet passord."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"En sekvens av stigende, synkende eller like sifre er ikke tillatt"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bekreft"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Avbryt"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Slå på Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Bruk Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Bruk Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Innstillinger for Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Sett opp og styr trådløse aksesspunkt"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Sentrér QR-koden nedenfor for å koble til «<xliff:g id="SSID">%1$s</xliff:g>»"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Koble til Wi‑Fi ved å skanne en QR-kode"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Del Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skann denne QR-koden for å koble til «<xliff:g id="SSID">%1$s</xliff:g>» og dele passordet"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skann denne QR-koden med en annen enhet for å koble til «<xliff:g id="SSID">%1$s</xliff:g>»"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skann denne QR-koden for å koble til «<xliff:g id="SSID">%1$s</xliff:g>»"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Prøv igjen. Hvis problemet vedvarer, kan du kontakte enhetsprodusenten."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Noe gikk galt"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-passord: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Passord for Wi-Fi-sone: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatisk tilkobling"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Tillat at telefonen kobler seg til automatisk i nærheten av dette nettverket"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Tillat at nettbrettet kobler seg til automatisk i nærheten av dette nettverket"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Tillat tilkobling til dette nettverket når det er innen rekkevidde"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Legg til en enhet"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Bruk en QR-kode for å legge til en enhet på dette nettverket"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-kode er ikke et gyldig format"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Bruk systemsertifikat"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ikke oppgi"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ikke godkjenn"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ingen sertifikater er spesifisert. Tilkoblingen din blir ikke privat."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Nettverksnavnet er for langt."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Du må angi et domene."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikat er påkrevd."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Koble til"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi er slått på"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Koblet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Kobler til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Kobler til …"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Kan ikke koble til nettverket"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Nettverket er ikke innen rekkevidde"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Enhetens MAC-adresse"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Tilfeldig valgt MAC-adresse"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Tilfeldiggjort MAC-adresse (sist brukt)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-adresse"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Nettverksdetaljer"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Nettverksmaske"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-adresser"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Lagrede nettverk"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abonnementer"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Andre nettverk"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP-innstillinger"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"De avanserte innstillingene for Wi-Fi er ikke tilgjengelig for denne brukeren"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Lagre"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Angi en gyldig gateway-adresse."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Angi en gyldig DNS-adresse."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Angi lengde for nettverksprefiks mellom 0 og 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (med mindre det overstyres av privat DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (med mindre det overstyres av privat DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Nettverksprefiks-lengde"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Appen deler innhold. For å dele Internett-tilkoblingen, slå Wi-Fi-sonen av og deretter på"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Ingen passord er angitt"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Navn på Wi-Fi-sone"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Slår på <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Slår på <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Andre enheter kan koble til <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Passord for Wi-Fi-sone"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-bånd"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Øker oppdateringsfrekvensen automatisk fra 60 til 90 Hz for noe innhold. Øker batteribruken."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Tving oppdateringsfrekvens på 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Den høyeste oppdateringsfrekvensen for å oppnå bedre trykkfølsomhet og animasjonskvalitet. Øker batteribruken."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Skjermoppmerksomhet"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"På / skjermen slås ikke av hvis du ser på den"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Når skjermen er mørk, slås den på for nye varsler"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vis alltid tidspunkt og info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Økt batteribruk"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Fet tekst"</string>
     <string name="title_font_size" msgid="570613010306330622">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Gjør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Innstillinger for SIM-kort-lås"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-versjon"</string>
     <string name="security_patch" msgid="4071756145347865382">"Sikkerhetsoppdatering for Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modell"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modell: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modell og maskinvare"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Maskinvareversjon"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Utstyrs-ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Slett APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nytt APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Lagre"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Forkast"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Avbryt"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Navnefeltet kan ikke være tomt."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN kan ikke være tomt."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Apper kan tilbakestilles"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Tilbakestill Wi-Fi, mobil og Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Dette tilbakestiller alle nettverksinnstillinger, inkludert\n\n"<li>"Wi‑Fi"</li>\n<li>"mobildata"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Tøm"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Slett nedlastede SIM-kort"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Kontakt operatøren din for å laste ned erstatnings-SIM-kort. Dette kansellerer ingen mobilabonnementer."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Dette kansellerer ingen mobilabonnementer. Kontakt operatøren din for å laste ned erstatnings-SIM-kort."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Tilbakestill innstillingene"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Vil du tilbakestille alle nettverksinnstillingene? Denne handlingen kan ikke angres."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Vil du tilbakestille alle nettverksinnstillingene og slette nedlastede SIM-kort? Denne handlingen kan ikke angres."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Nettverksinnstillingene er tilbakestilt"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Kan ikke slette SIM-kort"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Nedlastede SIM-kort kan ikke slettes på grunn av en feil.\n\nStart enheten din å nytt og prøv igjen."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Slett alle data (tilbakestill til fabrikkstandard)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Slett alle data (tilbakestill)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Dette sletter alle data fra nettbrettets "<b>"interne lagringsplass"</b>", inkludert følgende:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Dette sletter alle data fra telefonens "<b>"interne lagringsplass"</b>", inkludert følgende:\n\n"<li>"Google-kontoen din"</li>\n<li>"Data og innstillinger for system og apper"</li>\n<li>"Nedlastede apper"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Du er for øyeblikket pålogget følgende kontoer:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Det er andre brukere tilstede på denne enheten.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musikk"</li>\n<li>"Bilder"</li>\n<li>"Andre brukerdata"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"e-SIM-kort"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Dette kansellerer ikke mobilabonnementet ditt."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"For å slette musikk, bilder og andre brukerdata må "<b>"USB-lageret"</b>" tømmes."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"For å slette musikk, bilder og andre brukerdata, må "<b>"SD-kortet"</b>" tømmes."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Slett alle data (tilbakestill til fabrikkstandard)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Slett alle data (tilbakestill)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Dette sletter alle data fra nettbrettets "<b>"internminne"</b>", inkludert\n\n"<li>"Google-kontoen din"</li>\n<li>"data og innstillinger for system og apper"</li>\n<li>"nedlastede apper"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Dette sletter alle data fra telefonens "<b>"internminne"</b>", inkludert\n\n"<li>"Google-kontoen din"</li>\n<li>"data og innstillinger for system og apper"</li>\n<li>"nedlastede apper"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Du er for øyeblikket pålogget følgende kontoer:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Det er andre brukere til stede på denne enheten.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"musikk"</li>\n<li>"bilder"</li>\n<li>"andre brukerdata"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"e-SIM-kort"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Dette sier ikke opp mobilabonnementet ditt."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"For å slette musikk, bilder og andre brukerdata må "<b>"USB-lagringen"</b>" tømmes."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"For å slette musikk, bilder og andre brukerdata må "<b>"SD-kortet"</b>" tømmes."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Slett USB-lagring"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Tøm SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Slett alle data på intern USB-lagring, som for eksempel musikk eller bilder"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Slett alle data fra SD-kortet, som musikk og bilder"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Slett alle data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Slett alle data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Alle personopplysningene dine og appene du har lastet ned, blir slettet. Denne handlingen kan ikke angres."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Alle personopplysningene dine, inkludert nedlastede apper og SIM-kort, blir slettet. Denne handlingen kan ikke angres."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Slett alt"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Tilbakestilling ble ikke utført fordi tilbakestillingstjenesten ikke er tilgjengelig."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vil du slette alle dataene?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Tilbakestilling til fabrikkstandard er ikke tilgjengelig for denne brukeren"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Sletter"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Vent litt …"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Slett alle data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Slett alle data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Alle personopplysningene dine og appene du har lastet ned, blir slettet. Denne handlingen kan ikke angres."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Alle personopplysningene dine, inkludert nedlastede apper og SIM-kort, blir slettet. Denne handlingen kan ikke angres."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vil du slette alle dataene?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Tilbakestilling til fabrikkstandard er ikke tilgjengelig for denne brukeren"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Tømmer"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Vent litt"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Samtaleinnstillinger"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Telefonsvarer, viderekobling, samtale venter, nummervisning"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-internettdeling"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Kan ikke knytte til mer enn <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheter."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-internettdeling"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Del telefonens internettilkobling via USB-Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Del telefonens internettilkobling via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Bruk Wi-Fi-sone og internettdeling for å gi andre enheter tilgang til internett via mobildataforbindelsen din. Apper kan også opprette en Wi-Fi-sone for å dele innhold med enheter i nærheten."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Bruk Wi-Fi-soner og internettdeling for å gi andre enheter internettilgang via Wi-Fi- eller mobildatatilkoblingen din. Du kan også bruke apper til å opprette Wi-Fi-soner for å dele innhold med enheter i nærheten."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hjelp"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-søking"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"La apper og tjenester søke etter enheter i nærheten når som helst, selv når Bluetooth er slått av. Dette kan for eksempel brukes til å forbedre posisjonsbaserte funksjoner og tjenester."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Posisjonstjenester for jobb"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Gjenkjenning av tidssone basert på posisjon"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Gjenkjenning av tidssone basert på posisjon"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Tillater at enhetsposisjonen brukes til å fastslå nåværende tidssone. Andre posisjonsinnstillinger, for eksempel Wi-Fi-skanning, kan påvirke nøyaktigheten til gjenkjenning av tidssone."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"På"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Av"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatisk gjenkjenning av tidssone er deaktivert"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Gjenkjenning av tidssone basert på posisjon er slått av"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Gjenkjenning av tidssone basert på posisjon støttes ikke"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Du har ikke tillatelse til å endre gjenkjenning av tidssone"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi- og mobilnettverksposisjon"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Tillat at apper bruker posisjonstjenesten fra Google til å finne posisjonen din raskere. Anonym posisjonsdata blir samlet inn og sendt til Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Posisjon fastsatt av Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"For å bruke Ansiktslås, angi et passord"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"For å bruke Ansiktslås, angi et mønster"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"For å bruke Ansiktslås, angi en PIN-kode"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Angi et passord for å bruke biometri"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Angi et mønster for å bruke biometri"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Angi en PIN-kode for å bruke biometri"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Har du glemt passordet ditt?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Har du glemt mønsteret ditt?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Har du glemt PIN-koden din?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Valg for teksting"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Forstørring"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Forstørrelsesområde"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Slå på forstørrelse"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Velg forstørrelsesområdene du vil bruke når du forstørrer skjermen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Fullskjerm"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"En del av skjermen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Fullskjerm og en del av skjermen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Forstørr hele skjermen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Forstørr en del av skjermen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vil du bytte til en Tilgjengelighet-knapp?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Hvis du bruker trippeltrykk for å forstørre en del av skjermen, blir skriving og andre handlinger forsinket.\n\nVil du bytte til å bruke en Tilgjengelighet-knapp til å forstørre?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Bytt til en Tilgjengelighet-knapp"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Behold trippeltrykk for å forstørre"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Forstørrelsesinnstillinger"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Forstørr med trippeltrykk"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Forstørr med snarvei"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Legg på med av/på-knappen"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Stor musepeker"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Fjern animasjoner"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monolyd"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombiner kanaler når du spiller av lyd"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Lydbalanse"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Venstre"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Høyre"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monolyd"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombiner kanaler når du spiller av lyd"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Lydbalanse"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Venstre"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Høyre"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Standard"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekunder"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekunder"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Varselvibrering"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ringevibrering"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Tilbakemelding ved berøring"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Bruk <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Åpne <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Bruk fargekorrigering"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Vis teksting"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Bare for apper som støttes"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Bruk <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Åpne <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Bruk fargekorrigering"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Vis teksting"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Bare for apper som støttes"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Størrelse og stil for teksting"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tekststørrelse <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Flere alternativer"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Gråtoner"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rød-grønn"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rød-grønn"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blå-gul"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Bakgrunnsbegrensning"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"La appen kjøre i bakgrunnen"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Appen har ikke tillatelse til å kjøre i bakgrunnen"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Bruk i bakgrunnen kan ikke begrenses"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Bruk i bakgrunnen kan ikke begrenses"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vil du begrense bakgrunnsaktivitet?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Hvis du begrenser bakgrunnsaktivitet for en app, kan det oppstå problemer"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Du kan ikke begrense appen siden den ikke er satt til å optimalisere batteriet.\n\nFor å begrense appen, slå på batterioptimalisering."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Nettbrettet brukes mer enn vanlig"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Enheten brukes mer enn vanlig"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Batteriet kan gå tomt raskere enn vanlig"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimaliserer batteritilstanden"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batteriet er midlertidig begrenset. Trykk for å finne ut mer."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefonen din har blitt brukt mer enn vanlig. Batteriet kan gå tomt raskere enn forventet.\n\nApper med høyest batteribruk:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Nettbrettet ditt har blitt brukt mer enn vanlig. Batteriet kan gå tomt raskere enn forventet.\n\nApper med høyest batteribruk:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Enheten din har blitt brukt mer enn vanlig. Batteriet kan gå tomt raskere enn forventet.\n\nApper med høyest batteribruk:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d app er begrenset</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Kunne ikke lese batterimåleren"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Kunne ikke lese batterimåleren. Trykk for å "<annotation id="url">"finne ut mer"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Vil du stoppe appen?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Angi en tidsplan"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Forleng batteriets levetid"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Slå av når den er ladet"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterisparing slås av når telefonen har <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterisparing slås av når nettbrettet har <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterisparing slås av når enheten har <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Batterisparing slås av når telefonen lades til over <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Batterisparing slås av når nettbrettet lades til over <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Batterisparing slås av når enheten lades til over <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Slå på"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Tilbakestill"</string>
     <string name="tts_play" msgid="2945513377250757221">"Spill av"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive Connectivity"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Forlenger batterilevetiden og enhetsytelsen ved å administrere nettverkstilkoblingene automatisk"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Legitimasjonslager"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installer et sertifikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installer sertifikater fra lagringsenhet"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Brukerlegitimasjon"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Se og endre lagret legitimasjon"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avansert"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lagringstype"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Maskinvarebasert"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Bare programvare"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Legitimasjon er ikke tilgjengelig for denne brukeren"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Installert for VPN og apper"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Installert for Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ikke installer"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Installer likevel"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sertifikatet ble ikke installert"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Vil du tillate at <xliff:g id="APP_NAME">%s</xliff:g> installerer sertifikater på denne enheten?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Disse sertifikatene identifiserer deg bare for appene og nettadressene nedenfor"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Ikke tillat"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Tillat"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Vis flere"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App for sertifikathåndtering"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Ingen"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Sertifikater som installeres av denne appen, identifiserer deg bare for appene og nettadressene nedenfor"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Fjern"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Ringesignal for nødssituasjoner"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Velg oppførsel når en nødsamtale opprettes"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Sikkerhetskopiering"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ikke konfigurert – arbeidsprofil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Du (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Kallenavn"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Du kan legge til opptil <xliff:g id="USER_COUNT">%1$d</xliff:g> brukere"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Bare eieren av nettbrettet kan administrere brukere."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Bare eieren av telefonen kan administrere brukere."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Betaling ved terminaler"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfigurer en betalingsapp. Deretter holder du baksiden av telefonen mot en terminal som har symbolet for kontaktløs betaling."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Skjønner"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mr"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mer"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Angi en standardapp for betaling"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Oppdater standardappen for betaling"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"I en kontaktløs terminal betaler du med <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Tilbake"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Neste"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Fullfør"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Ta et bilde"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Velg et bilde"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Velg bildet"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kort"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kort"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Bruk alltid dette for samtaler"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Velg et SIM-kort for data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Velg et SIM-kort for SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Bytter data-SIM-kort – dette kan ta opptil ett minutt …"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Bytter data-SIM-kort – dette kan ta opptil ett minutt …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Ring med"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Velg et SIM-kort"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutine, tidsplan, batterisparing, strømsparing, batteri, automatisk, prosent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, avansert ringing, 4g-ringing"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"Legg til språk, legg til et språk"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tekststørrelse"</string>
     <string name="default_sound" msgid="6604374495015245195">"Standardlyd"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ringe- og varselvolum er satt til <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volum, vibrasjon, ikke forstyrr"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Lyder ved oppstart"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Direkteteksting"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatisk medieteksting"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ingen"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplaner er angitt</item>
-      <item quantity="one">1 tidsplan er angitt</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ingen}=1{1 tidsplan er angitt}other{# tidsplaner er angitt}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ikke forstyrr"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Bli bare varslet av viktige personer og apper"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Begrens forstyrrelser"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Bare prioritet"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"På / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Av / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Av"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"På"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Spør hver gang"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Til du slår av"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> timer</item>
-      <item quantity="one">1 time</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutter"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> tidsplaner kan slås på automatisk</item>
-      <item quantity="one">1 tidsplan kan slås på automatisk</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 time}other{# timer}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minutt}other{# minutter}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Av}=1{Av / 1 tidsplan kan slås på automatisk}other{Av / # tidsplaner kan slås på automatisk}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Hva kan avbryte «Ikke forstyrr»?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personer"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apper"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Angi varsler med lavere prioritet automatisk til Diskré"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Tilpasset varselrangering"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Ranger varsler automatisk etter relevans"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Tilbakemelding om tilpasset varsel"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Vis justeringer av varsler og alternativet for å gi tilbakemelding til systemet"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Tilbakestill viktighet for varsler"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Tilbakestill viktighetsinnstillinger som er endret av brukeren, og tillat at varselassistenten angir prioritet"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Foreslåtte handlinger og svar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Vis foreslåtte handlinger og svar automatisk"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Vis nylige og slumrede varsler"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioriterte samtaler"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Vis øverst i samtaledelen som flytende bobler"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"De vises øverst i samtaledelen."</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Andre samtaler"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Samtaler som ikke prioriteres"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Samtaler du har endret"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Nylige samtaler"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Fjern nylige"</string>
+    <string name="clear" msgid="5092178335409471100">"Fjern"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Lag boble for prioriterte samtaler"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriterte samtaler vises øverst i nedtrekkspanelet. Du kan også få dem til å lage bobler og avbryte «Ikke forstyrr»."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Prioriterte og endrede samtaler vises her"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"«Ikke forstyrr»-tilgang"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Tillat «Ikke forstyrr»"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ingen installerte apper har bedt om «Ikke forstyrr»-tilgang"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Laster inn apper …"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Laster inn appene …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"I tråd med det du har valgt, hindrer Android at varsler fra denne appen vises på denne enheten"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"I tråd med det du har valgt, blokkerer Android denne varselkategorien fra å vises på denne enheten"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"I tråd med det du har valgt, blokkerer Android denne varselgruppen fra å vises på denne enheten"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alle samtaler"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriterte samtaler"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ingen"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> samtaler</item>
-      <item quantity="one">1 samtale</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ingen"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ingen}=1{1 samtale}other{# samtaler}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Hvem kan forstyrre?"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Anrop"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Anrop"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"For å kontrollere at tillatte anrop lager lyd, sjekk at enheten er satt til ringing"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Innkommende anrop er blokkert for «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>». Du kan justere innstillinger for å la venner, familie eller andre kontakter nå deg."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Stjernemerkede kontakter"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> andre</item>
-      <item quantity="one">1 annen</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ingen"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ingen}=1{{contact_1}}=2{{contact_1} og {contact_2}}=3{{contact_1}, {contact_2} og {contact_3}}other{{contact_1}, {contact_2} og # andre}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Uten navn)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Meldinger"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"meldinger"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Meldinger"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Innkommende meldinger er blokkert for «<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>». Du kan justere innstillinger for å la venner, familie eller andre kontakter nå deg."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Alle meldinger kan nå deg"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Alle anrop kan nå deg"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ingen"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakter</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ingen}=1{1 kontakt}other{# kontakter}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Alle"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakter"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Stjernemerkede kontakter"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alle varsler"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Noen varsler"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Utvalgte personer kan fremdeles nå deg, selv om du ikke tillater at apper forstyrrer"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> kan forstyrre</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> kan forstyrre</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> flere"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ingen apper kan forstyrre}=1{{app_1} kan forstyrre}=2{{app_1} og {app_2} kan forstyrre}=3{{app_1}, {app_2} og {app_3} kan forstyrre}other{{app_1}, {app_2} og # flere kan forstyrre}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apper"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alle varsler"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Noen varsler"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Varsler som kan forstyrre"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Tillat alle varsler"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> kan forstyrre</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> kan forstyrre</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ingenting kan forstyrre"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> flere"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ingenting kan forstyrre}=1{{sound_category_1} kan forstyrre}=2{{sound_category_1} og {sound_category_2} kan forstyrre}=3{{sound_category_1}, {sound_category_2} og {sound_category_3} kan forstyrre}other{{sound_category_1}, {sound_category_2} og # flere kan forstyrre}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ingenting kan forstyrre"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ingen kan forstyrre"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Noen personer kan forstyrre"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alle personer kan forstyrre"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"På"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Av"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Festing av apper"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Med festing av apper kan du holde appen du bruker for øyeblikket, synlig til du løsner den. Denne funksjonen kan for eksempel brukes til å la en venn du stoler på, spille et bestemt spill. \n\nNår en app er festet, kan den åpne andre apper, og personlige data kan være tilgjengelige. \n\nSlik bruker du festing av apper: 	\n1.	Slå på festing av apper. 	\n2.	Åpne Oversikt. 	\n3.	Trykk på appikonet øverst på skjermen, og trykk på Fest."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Med festing av apper kan du holde appen du bruker for øyeblikket, synlig til du løsner den. Denne funksjonen kan for eksempel brukes til å la en venn du stoler på, spille et bestemt spill. \n\nNår en app er festet, kan den åpne andre apper, og personlige data kan være tilgjengelige. \n\nBruk en gjestebruker i stedet hvis du vil dele enheten med noen på en sikker måte. \n\nSlik bruker du festing av apper: 	\n1.	Slå på festing av apper. 	\n2.	Åpne Oversikt. 	\n3.	Trykk på appikonet øverst på skjermen, og trykk på Fest."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Med festing av apper kan du holde appen du bruker for øyeblikket, synlig til du løsner den. Denne funksjonen kan for eksempel brukes til å la en venn du stoler på, spille et bestemt spill."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Når en app er festet, kan den åpne andre apper, og personlige data kan være tilgjengelige. \n\nSlik bruker du festing av apper: 	\n1.	Slå på festing av apper. 	\n2.	Åpne Oversikt. 	\n3.	Trykk på appikonet øverst på skjermen, og trykk på Fest."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Når en app er festet, kan den åpne andre apper, og personlige data kan være tilgjengelige. \n\nBruk en gjestebruker i stedet hvis du vil dele enheten med noen på en sikker måte. \n\nSlik bruker du festing av apper: 	\n1.	Slå på festing av apper. 	\n2.	Åpne Oversikt. 	\n3.	Trykk på appikonet øverst på skjermen, og trykk på Fest."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Når en app er festet \n\n•		kan personlige data være tilgjengelige \n		(for eksempel kontakter og e-postinnhold) \n•		kan appen som er festet, åpne andre apper \n\nBare bruk festing av apper med personer du stoler på."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Krev opplåsingsmønster for å løsne apper"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Krev PIN-kode for å løsne app"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"I tillegg til å bruke ansiktet til å låse opp enheten, kan du sikre den enda bedre ved å be om PIN-koden din ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve PIN-koden for å starte enheten?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"I tillegg til å bruke ansiktet til å låse opp enheten, kan du sikre den enda bedre ved å be om mønsteret ditt ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve mønsteret for å starte enheten?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"I tillegg til å bruke ansiktet til å låse opp enheten, kan du sikre den enda bedre ved å be om passord ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve passordet for å starte enheten?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"I tillegg til å bruke biometri til å låse opp enheten kan du sikre den enda bedre ved å be om PIN-koden din ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve PIN-koden for å starte enheten?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"I tillegg til å bruke biometri til å låse opp enheten kan du sikre den enda bedre ved å be om mønsteret ditt ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve mønsteret for å starte enheten?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"I tillegg til å bruke biometri til å låse opp enheten kan du sikre den enda bedre ved å be om passordet ditt ved oppstart. Enheten kan ikke motta anrop, SMS eller varsler – inkludert alarmer – før den starter.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve passordet for å starte enheten?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nei"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Begrenset"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB kontrolleres av"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Tilkoblet enhet"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Denne enheten"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Bytter …"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Bytter …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Kunne ikke bytte"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Lader denne enheten"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Lading av den tilkoblede enheten"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Bruk av mobildata"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Databruk av apper"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi-databruk"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Databruk utenfor operatøren"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet-databruk"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 begrensning</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatørens måling av databruk samsvarer ikke nødvendigvis med enhetens måling."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ekskluderer data som brukes av operatørnettverk"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> er brukt"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Angi varsel om databruk"</string>
     <string name="data_warning" msgid="2925054658166062884">"Varsel om databruk"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Se detaljer"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Datasparing"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Ubegrenset datatilgang"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Bakgrunnsdata er slått av"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Bakgrunnsdata er slått av"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"På"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Av"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Bruk Datasparing"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Når enheten er låst, kan man ikke skrive svar eller annen tekst i varsler"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Standard stavekontroll"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Velg stavekontroll"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Bruk stavekontroll"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Bruk stavekontroll"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ikke valgt"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ingen)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"For å frigjøre lagringsplass fjernes sikkerhetskopierte bilder og videoer fra enheten din av lagringsadministratoren."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fjern bilder og videoer"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Lagringsadministrator"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Bruk lagringsadministrator"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Bruk lagringsbehandling"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatisk"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuelle innstillinger"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Frigjør lagringsplass nå"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dobbelttrykk for å sjekke telefonen"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dobbelttrykk for å sjekke nettbrettet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dobbelttrykk for å sjekke enheten"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Sveip for varsler"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Sveip ned på den nederste kanten av skjermen for å se varslene"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Enhåndsmodus"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Bruk enhåndsmodus"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Avslutt når du bytter app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tidsavbrudd"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunder"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekunder"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekunder"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"tilgjengelighet"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Dobbelttrykk på skjermen for å sjekke klokkeslettet, varsler og annen informasjon."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Løft for å sjekke telefonen"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Løft for å sjekke nettbrettet"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Trykk for å sjekke nettbrettet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Trykk for å sjekke enheten"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Trykk på skjermen for å sjekke klokkeslettet, varsler og annen informasjon."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS for nødssituasjoner"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Bruk SOS for nødssituasjoner"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Administreres av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Start handlingene nedenfor ved å trykke raskt fem ganger eller mer på av/på-knappen"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Spill av nedtellingsalarmen"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Spill av en høy lyd før du varsler om hjelp"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Ring for å få hjelp"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Nummeret du kan ringe for å få hjelp"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Tapp for å endre"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Hvis du skriver inn et nummer som ikke er et nødnummer:\n • Enheten din må være låst opp for å bruke SOS for nødssituasjoner\n • Anropet ditt blir muligens ikke besvart"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sveip fingersensoren for varsler"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Sveip på fingersensoren"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av telefonen."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maksimalt antall synlige datasett"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Tilbakestill til standardverdier"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Autofyll av utvikleralternativer er tilbakestilt"</string>
+    <string name="location_category" msgid="3496759112306219062">"Posisjon"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Statusfelt for posisjonsindikator"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Vis for alle posisjoner, inkludert nettverk og tilkobling"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Tving fullstendige GNSS-målinger"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Spor alle GNSS-konstellasjoner og -frekvenser uten syklus for oppgaver"</string>
     <string name="device_theme" msgid="5027604586494772471">"Enhetstema"</string>
     <string name="default_theme" msgid="4815428567082263639">"Standard"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nettverksnavn"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Sett varsler på pause for å holde deg fokusert"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funksjonen er ikke tilgjengelig"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Denne funksjonen er slått av fordi den gjør telefonen din tregere"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Tving fullstendige GNSS-målinger"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Spor alle GNSS-konstellasjoner og -frekvenser uten syklus for oppgaver"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Vis alltid krasjdialogboksen"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Vis dialogboksen hver gang en app krasjer"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Velg en ANGLE-aktivert app"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktiver for alle apper"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Velg en grafikkdriver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Spilldriver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Spilldriver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Utviklerdriver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Systemets grafikkdriver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"På (kutt lyden)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Av"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Nettverksdetaljer"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Enhetsnavnet ditt er synlig for apper på telefonen. Det kan også ses av andre personer når du kobler til Bluetooth-enheter eller konfigurerer en Wi-Fi-sone."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Enhetsnavnet ditt er synlig for apper på telefonen. Det kan også ses av andre personer når du kobler til Bluetooth-enheter, kobler til et Wi-Fi-nettverk eller konfigurerer en Wi-Fi-sone."</string>
     <string name="devices_title" msgid="649715719278562515">"Enheter"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Alle innstillinger"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Forslag"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Fant ingen nettverk. Prøv på nytt."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(forbudt)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM-kortet mangler"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-kort"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Uten SIM-kort"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ingen"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Krever SIM-kort for å koble til"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Krever <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>-SIM-kort for å koble til"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Foretrukket nettverksmodus: WCDMA foretrekkes"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Foretrukket nettverksmodus: kun GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Foretrukket nettverksmodus: kun WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobildata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Bruk data via mobilnettverket"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefonen bytter automatisk til denne operatøren når den er innen rekkevidde"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Ingen SIM-kort er tilgjengelige"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Anropspreferanse"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS-preferanse"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Spør hver gang"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Utilgjengelig når du er koblet til <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Se flere"</string>
     <string name="see_less" msgid="2642392725363552793">"Se mindre"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vil du slå på <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vil du slå på SIM-kortet?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vil du bytte til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vil du bytte til å bruke SIM-kort?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Bare ett SIM-kort kan være aktivt om gangen.\n\nSelv om du bytter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, blir ikke <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-abonnementet ditt sagt opp."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Bare ett nedlastet SIM-kort kan være aktivt om gangen.\n\nSelv om du bytter til <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, blir ikke <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>-abonnementet ditt sagt opp."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Bare ett SIM-kort kan være aktivt om gangen.\n\nSelv om du bytter, blir ikke <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>-abonnementet ditt sagt opp."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Bytt til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Kobler til nettverket …"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Bytter til <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Kan ikke bytte operatør"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operatøren kan ikke byttes, på grunn av en feil."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vil du slå av <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vil du slå av SIM-kortet?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Slår av SIM-kort <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Kan ikke slå av operatøren"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Noe gikk galt, og enheten kunne ikke slå av operatøren."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vil du bruke to SIM-kort?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Denne enheten kan ha to SIM-kort aktive samtidig. For å fortsette å bruke ett SIM-kort om gangen, trykk på «Nei takk»"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Vil du starte enheten på nytt?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Start enheten på nytt for å komme i gang. Deretter kan du legge til et annet SIM-kort."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Fortsett"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Start på nytt"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nei takk"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Bytt"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kan ikke aktivere SIM-kortet"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Fjern SIM-kortet og sett det inn igjen. Start enheten på nytt hvis problemet vedvarer."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Prøv å slå på SIM-kortet igjen. Start enheten på nytt hvis problemet vedvarer."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivering av nettverk"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> er aktiv"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Trykk for å oppdatere SIM-kortinnstillingene"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-kort"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Vil du slette dette nedlastede SIM-kortet?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Hvis du tømmer dette SIM-kortet, fjernes <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-tjenesten fra denne enheten.\n\nTjenesten for <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> blir ikke kansellert."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Slett"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Sletter SIM-kortet …"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Kan ikke slette SIM-kortet"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Dette SIM-kortet kan ikke slettes, på grunn av en feil.\n\nStart enheten på nytt og prøv igjen."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Koble til enheten"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Appen <xliff:g id="APPNAME">%1$s</xliff:g> vil bruke et midlertidig Wi-Fi-nettverk for å koble til enheten din"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Fant ingen enheter. Sørg for at enhetene er slått på og tilgjengelige for tilkobling."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Nødanrop"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Nødanrop via Wi-Fi-anrop støttes ikke av operatøren din.\nEnheten bytter automatisk til et mobilnettverk for å foreta et nødanrop.\nNødanrop er bare mulige i områder med mobildekning."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Bruk Wi‑Fi for anrop for å forbedre kvaliteten"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Ringing mellom SIM-kort"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Tillat at et annet SIM-kort ringer og sender SMS over dette SIM-kortet."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"ringing mellom SIM-kort"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Innkommende MMS-melding"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Kan ikke sende MMS-meldinger"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Trykk for å tillate MMS-meldinger på <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> når mobildata er av"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Tillat skjermoverlegg over Innstillinger"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Tillat apper som kan vises over andre apper, å legge seg over Innstillinger-skjermer"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Medier"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Skjul spilleren når medieøkten er avsluttet"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Med spilleren kan du gjenoppta en økt fra det utvidede Hurtiginnstillinger-panelet."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediseavspiller i hurtiginnstillingene"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Vis medieavspilleren i en lengre periode for å gjenoppta avspilling enkelt"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Skjul spilleren"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Vis spilleren"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Det finnes ingen tilgjengelige spillere"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Tillatte apper"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"medier"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth slås på"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"På"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Av"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internett"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kort"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Nettverk som er trygge på fly"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Finn og koble til nettverk som er trygge på fly"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"fly, trygg på fly"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Anrop og SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi-anrop"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Ring og motta anrop via nettverk utenfor operatøren, for eksempel Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Med Wi-Fi-anrop kan du ringe og motta anrop via nettverk utenfor operatøren, for eksempel noen Wi-Fi-nettverk."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Anrop"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"foretrukket"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"anrop foretrekkes"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS foretrekkes"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"utilgjengelig"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Uten SIM-kort"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Innstillinger"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Koble til offentlige nettverk"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"nettverkstilkobling, internett, trådløs, data, wifi, wi-fi, wi fi, mobilnett, mobil, mobiloperatør, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Se nettverk som er trygge på fly"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Slå av flymodus"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Utilgjengelig fordi sengetidsmodus er på"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Tilbakestilling av viktighet for varsler er fullført."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apper"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"En enhet som ikke er klarert, vil ha tilgang til meldingene dine. Trykk for å se mer informasjon."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vil du gi tilgang til meldinger?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"En Bluetooth-enhet som ikke er klarert, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vil ha tilgang til meldingene dine.\n\nDu har ikke koblet til [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] tidligere."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"En enhet som ikke er klarert, vil ha tilgang til kontaktene dine og samtaleloggen din. Trykk for å se mer informasjon."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vil du gi tilgang til kontaktene og samtaleloggen?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"En Bluetooth-enhet som ikke er klarert, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vil ha tilgang til kontaktene dine og samtaleloggen din. Dette inkluderer data om innkommende og utgående anrop.\n\nDu har ikke koblet til [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] tidligere."</string>
 </resources>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index e891c0f..372c5ba 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"मध्यम"</item>
     <item msgid="6740026006576843477">"लामो"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"छोटो"</item>
+    <item msgid="7397961711906421599">"मध्यम"</item>
+    <item msgid="4079132024502041928">"लामो"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"पूर्वनिर्धारित"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"विश्वव्यापी"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA मात्र"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"विश्वव्यापी"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 76b56f3..3a811d9 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"मिति र समय"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"मिति र समय सेट गर्नुहोस्"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"मिति, समय, समय क्षेत्र र प्रारुपहरू सेट गर्नुहोस्"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"नेटवर्कप्रदत्त समय प्रयोग गर्नु"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"नेटवर्कप्रदत्त समय क्षेत्र प्रयोग गर्नुहोस्"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"समय स्वतः सेट गर्नुहोस्"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"समय क्षेत्र स्वतः सेट गर्नुहोस्"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"लोकेलको पूर्वनिर्धारित सेटिङ प्रयोग गर्नुहोस्"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"२४ घण्टे ढाँचामा"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"२४-घण्टे ढाँचा प्रयोग गर्नुहोस्"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"लक स्क्रिनमा प्रोफाइलको जानकारी देखाउनुहोस्"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"खाताहरू"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"स्थान"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"स्थान प्रयोग गर्नुहोस्"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"स्थानसम्बन्धी सेवा प्रयोग गर्नुहोस्"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"निष्क्रिय"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">सक्रिय - <xliff:g id="COUNT_1">%1$d</xliff:g> अनुप्रयोगसँग स्थानमाथिको पहुँच छ</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"स्क्रिन लक, फेस अनलक"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"स्क्रिन लक, फिंगरप्रिन्ट"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"स्क्रिन लक"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"अनुहार तथा फिंगरप्रिन्ट प्रयोग गरी आफ्नो फोन अनलक गर्नुहोस्"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"तपाईं एपमा साइन इन गर्न र भुक्तानी पुष्टि गर्न पनि सक्नुहुन्छ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"यसमार्फत अनलक सेटअप गर्नुहोस्:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"फेस अनलक"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"सहज तरिकाले आफ्नो फोन अनलक गर्नुहोस्"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"फिंगरप्रिन्ट"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"खल्तीमै फोन अनलक गरी समय बचत गर्नुहोस्"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"स्किप गर्नुहोस्"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"अर्को"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"अनुहार थपियो"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"फेस अनलक सेटअप गर्नुहोस्"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"फेस अनलक"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"प्रमाणित गर्न आफ्नो अनुहार प्रयोग गर्नु…"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"सुरु गर्नुहोस्"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"सुलभता मोडमा फेस अनलक गर्ने सुविधा अफ गरिएको छ भने TalkBack प्रयोग गरी सेटअपका केही चरणहरू पूरा गर्न नसकिने सम्भावना हुन्छ।"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"पछाडि जानु"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"सेटअप जारी राख्नु"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"पहुँचसम्बन्धी सेटअप प्रयोग गर्नु"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"एपहरूमा फेस अनलक प्रयोग गर्दा सधैँ पुष्टि गर्नु पर्ने बनाउनुहोस्"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"अनुहारसम्बन्धी डेटा मेटाउनु"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"फेस अनलक सेटअप गर्नुहोस्"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"आफ्नो यन्त्र अनलक गर्न, एपहरूमा साइन इन गर्न र भुक्तानीहरू पुष्टि गर्न फेस अनलक प्रयोग गर्नुहोस्।\n\nयाद राख्नुहोस्:\nफोनमा हेर्नुभयो भने तपाईंले अनलक गर्न नचाहेका बेला पनि फोन अनलक हुन सक्छ।\n\nअरू कसैले तपाईंको अनुहारका अगाडि फोन लगे भने तपाईंको फोन अनलक हुन सक्छ।\n\nतपाईंको अनुहारसँग धेरै मिल्दोजुल्दो अनुहार भएका दाजुभाइ/दिदीबहिनी जस्ता मान्छेहरूले पनि तपाईंको फोन अनलक गर्न सक्ने सम्भावना हुन्छ।"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"आफ्नो यन्त्र अनलक गर्न, एपहरूमा साइन इन गर्न र भुक्तानीहरू पुष्टि गर्न फेस अनलक प्रयोग गर्नुहोस्।\n\nयाद राख्नुहोस्:\nफोनमा हेर्नुभयो भने तपाईंले अनलक गर्न नचाहेका बेला पनि फोन अनलक हुन सक्छ।\n\nतपाईंका आँखा बन्द नै छन् भने पनि कसैले तपाईंको अनुहारका अगाडि फोन लगे भने तपाईंको फोन अनलक हुन सक्छ।\n\nतपाईंको अनुहारसँग धेरै मिल्दोजुल्दो अनुहार भएका दाजुभाइ/दिदीबहिनी जस्ता मान्छेहरूले पनि तपाईंको फोन अनलक गर्न सक्ने सम्भावना हुन्छ।"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"यन्त्र अनलक गर्न, एपहरूमा साइन इन गर्न र भुक्तानीहरू पुष्टि गर्न फेस अनलक गर्ने सुविधा प्रयोग गर्नुहोस्।"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"ख्याल गर्नुहोस्:\nतपाईंले अनलक गर्न नचाहेका बेला पनि फोनमा हेर्नुभयो भने फोन अनलक हुन सक्छ।\n\nअरू कसैले तपाईंको अनुहारका अगाडि फोन लगे भने तपाईंको फोन अनलक हुन सक्छ।\n\nतपाईंको अनुहारसँग मिल्दोजुल्दो अनुहार भएका दाजुभाइ/दिदीबहिनी जस्ता मान्छेहरूले पनि तपाईंको फोन अनलक गर्न सक्ने सम्भावना हुन्छ।"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"ख्याल गर्नुहोस्:\nतपाईंले अनलक गर्न नचाहेका बेला पनि फोनमा हेर्नुभयो भने फोन अनलक हुन सक्छ।\n\nतपाईंका आँखा बन्द नै छन् भने पनि कसैले तपाईंको अनुहारका अगाडि फोन लगे भने तपाईंको फोन अनलक हुन सक्छ।\n\nतपाईंको अनुहारसँग मिल्दोजुल्दो अनुहार भएका दाजुभाइ/दिदीबहिनी जस्ता मान्छेहरूले पनि तपाईंको फोन अनलक गर्न सक्ने सम्भावना हुन्छ।"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"अनुहारसम्बन्धी डेटा मेट्ने हो?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"फेस अनलक सुविधाले प्रयोग गरेको डेटा सदाका लागि सुरक्षित रूपमा मेटाइने छ। हटाइसकेपछि, तपाईंलाई आफ्नो फोन अनलक गर्न, एपहरूमा साइन इन गर्न र भुक्तानी पुष्टि गर्न आफ्नो PIN, ढाँचा वा पासवर्ड आवश्यक हुने छ।"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"आफ्नो फोन अनलक गर्न फेस अनलक प्रयोग गर्नुहोस्"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्ना फिंगरप्रिन्टहरूको प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईं यो यन्त्र अनलक गर्न आफ्नो फिंगरप्रिन्टको प्रयोग गर्न सक्नुहुन्न। थप जानकारीका लागि आफ्नो संगठनको प्रशासकलाई सम्पर्क गर्नुहोस्।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"तपाईंको फोन अनलक वा खरिदहरूको अनुमोदन गर्न आफ्नो फिंगरप्रिन्ट प्रयोग गर्नुहोस्।\n\nटिपोट: तपाईंको फिंगरप्रिन्ट भरपर्दो ढाँचा वा PIN भन्दा कम सुरक्षित हुनसक्छ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"रद्द गर्नुहोस्"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"पर्दैन, धन्यवाद"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"जारी राख्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"छोड्नुहोस्"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"अर्को"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"कुनै स्क्रिन लकमार्फत आफ्नो ट्याब्लेट सुरक्षित राख्दा उक्त ट्याब्लेट हराएमा वा चोरी भएमा कसैले पनि त्यसको प्रयोग गर्न सक्ने छैन। फेस अनलक सुविधा सेटअप गर्न स्क्रिन लक गर्ने विकल्प पनि सक्रिय गरिएको हुनु पर्छ। पछाडि जान रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"कुनै स्क्रिन लकमार्फत आफ्नो ट्याब्लेट सुरक्षित राख्दा उक्त यन्त्र हराएमा वा चोरी भएमा कसैले पनि त्यसको प्रयोग गर्न सक्ने छैन। फेस अनलक सुविधा सेटअप गर्न स्क्रिन लक गर्ने विकल्प पनि सक्रिय गरिएको हुनु पर्छ। पछाडि जान रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"कुनै स्क्रिन लकमार्फत आफ्नो ट्याब्लेट सुरक्षित राख्दा उक्त फोन हराएमा वा चोरी भएमा कसैले पनि त्यसको प्रयोग गर्न सक्ने छैन। फेस अनलक सुविधा सेटअप गर्न स्क्रिन लक गर्ने विकल्प पनि सक्रिय गरिएको हुनु पर्छ। पछाडि जान रद्द गर्नुहोस् नामक विकल्पमा ट्याप गर्नुहोस्।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"स्क्रिन लक गर्ने विकल्प प्रयोग गरी ट्याब्लेट सुरक्षित गरिएका खण्डमा ट्याब्लेट हराएमा वा चोरी भएमा कसैले पनि उक्त ट्याब्लेट प्रयोग गर्न सक्ने छैन। बायोमेट्रिक्स सेट गर्न स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। पछाडि जान \'रद्द गर्नुहोस्\' नामक बटनमा ट्याप गर्नुहोस्।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"स्क्रिन लक गर्ने विकल्प प्रयोग गरी यन्त्र सुरक्षित गरिएका खण्डमा उक्त यन्त्र हराएमा वा चोरी भएमा कसैले पनि त्यसको प्रयोग गर्न सक्ने छैन। बायोमेट्रिक्स सेट गर्न स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। पछाडि जान \'रद्द गर्नुहोस्\' नामक बटनमा ट्याप गर्नुहोस्।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"स्क्रिन लक गर्ने विकल्प प्रयोग गरी फोन सुरक्षित गरिएका खण्डमा फोन हराएमा वा चोरी भएमा कसैले पनि उक्त फोन प्रयोग गर्न सक्ने छैन। बायोमेट्रिक्स सेट गर्न स्क्रिन लक गर्ने विकल्प पनि चाहिन्छ। पछाडि जान \'रद्द गर्नुहोस्\' नामक बटनमा ट्याप गर्नुहोस्।"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN सेटअप गर्न छाड्ने हो?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"पासवर्ड सेटअप गर्न छाड्ने हो?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ढाँचा सेटअप गर्न छाड्ने हो?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो ट्याब्लेट प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो यन्त्र प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"यन्त्र सुरक्षा विशेषताहरू सक्रिय गरेर तपाईंको अनुमति बिना यो फोन प्रयोग गर्नबाट रोक्नुहोस्। तपाईंले प्रयोग गर्न चाहेको स्क्रिन लक रोज्नुहोस्।"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"तपाईँको ब्याकअप स्क्रिन लक विधि छनौंट गर्नुहोस्"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"आफ्नो ब्याकअप स्क्रिन लकको विधि छनौट गर्नुहोस्"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"आफ्नो यन्त्रको स्क्रिन लक गर्ने वैकल्पिक विधि छनौट गर्नुहोस्"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"स्क्रिन लकका विकल्पहरू"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"स्क्रिन लकका विकल्पहरू"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"स्क्रिन लक"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"फेस अनलक + पासवर्ड"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"फेस अनलक सुविधा सेट अप नगरी अगाडि बढ्नुहोस्"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"तपाईं आफ्नो अनुहारको प्रयोग गरी आफ्नो फोन अनलक गर्न सक्नुहुन्छ। सुरक्षा प्रयोजनका लागि, यो विकल्प प्रयोग गर्न कुनै ब्याकअप स्क्रिन लकको आवश्यकता पर्छ।"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"बायोमेट्रिक्स + ढाँचा"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"बायोमेट्रिक्स + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"बायोमेट्रिक्स + पासवर्ड"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"बायोमेट्रिक्स प्रयोग नगरिकनै जारी राख्नुहोस्"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"तपाईं आफ्नो बायोमेट्रिक्स प्रयोग गरेर आफ्नो फोन अनलक गर्न सक्नुहुन्छ। सुरक्षा प्रयोजनका लागि, यो विकल्प प्रयोग गर्न कुनै ब्याकअप स्क्रिन लकको आवश्यकता पर्छ।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"प्रशासक, इन्क्रिप्सन नीति वा प्रामाणिक भण्डारणद्वारा असक्षम पारिएको छ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"कुनै पनि होइन"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"स्वाइप गर्नुहोस्"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">अनिवार्य रूपमा <xliff:g id="NUMBER_0">%d</xliff:g> अङ्क भन्दा कम हुनु पर्छ</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"यन्त्र प्रशासकले पछिल्लो PIN प्रयोग गर्न अनुमति दिँदैन"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"तपाईंकसे IT व्यवस्थापकले धेरै प्रयोग हुने PIN हरूमाथि रोक लगाउनु भएको छ। कुनै फरक PIN प्रयोग गरी हेर्नुहोस्।"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"यसमा अमान्य वर्ण समावेश गर्न सकिँदैन"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"कम्तीमा एउटा अक्षर हुन अनिवार्य छ"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"कम्तीमा एउटा अङ्क हुन अनिवार्य छ"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">कम्तीमा पनि एउटा गैर-सङ्ख्यात्मक वर्ण हुनु अनिवार्य छ</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"यन्त्रको प्रशासकले पछिल्लो पासवर्ड प्रयोग गर्ने अनुमति दिँदैन"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"तपाईंकसे IT व्यवस्थापकले धेरै प्रयोग हुने पासवर्डहरूमाथि रोक लगाउनु भएको छ। कुनै फरक पासवर्ड प्रयोग गरी हेर्नुहोस्।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"बढ्दो, घट्दो वा दोहोरिएका अङ्कहरूको अनुक्रमलाई निषेध गरिएको छ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"पुष्टि गर्नुहोस्"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"रद्द गर्नुहोस्"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi खोल्नुहोस्"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi प्रयोग गर्नुहोस्"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi प्रयोग गर्नुहोस्"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi सेटिङहरू"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ताररहित पहुँच बिन्दुहरू सेटअप र प्रबन्ध गर्नुहोस्"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” मा जडान गर्न तलको QR कोडलाई मध्य भागमा राख्नुहोस्"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">" Wi‑Fi जोड्न QR कोड स्क्यान गर्नुहोस्"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi सेयर गर्नुहोस्"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” मा कनेक्ट गर्न र पासवर्ड सेयर गर्न यो QR कोड स्क्यान गर्नुहोस्"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” मा सामेल हुन कुनै अर्को यन्त्रबाट यो QR कोड स्क्यान गर्नुहोस्"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” मा जडान गर्न QR कोड स्क्यान गर्नुहोस्"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"फेरि प्रयास गर्नुहोस्। समस्या यथावत् रहिरहेमा यन्त्रका निर्मातासँग सम्पर्क गर्नुहोस्"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"केही चिज गडबड भयो"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi को पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"हटस्पटको पासवर्ड: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"स्वतः जडान"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"फोनलाई यो नेटवर्कका छेउमा हुँदा स्वतः कनेक्ट हुन दिनुहोस्"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ट्याब्लेटलाई यो नेटवर्कका छेउमा हुँदा स्वतः जोडिन दिनुहोस्"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"दायराभित्र भएको बेला यो नेटवर्कमा जडान हुने अनुमति दिनुहोस्"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"यन्त्र थप्नुहोस्"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"यो नेटवर्कमा थप्नका ला्गि कुनै QR प्रयोग गर्नुहोस्"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR कोडको ढाँचा मान्य छैन"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"प्रणालीका प्रमाणपत्रहरू प्रयोग गर्नुहोस्"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"प्रदान नगर्नुहोस्"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"प्रमाणित नगर्नुहोस्"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"कुनै प्रमाणपत्र निर्दिष्ट गरिएको छैन। तपाईंको जडान निजी हुने छैन।"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"नेटवर्कको नाम धेरै लामो भयो।"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"डोमेन तोक्नु पर्छ"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"प्रमाणपत्र चाहिन्छ।"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"जडान गर्नुहोस्"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi सक्रिय गरियो"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> मा कनेक्ट गरियो"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> मा कनेक्ट गरिँदै"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"जडान गर्दै…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"सञ्जालमा जडान गर्न विफल"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"नेटवर्क दायरामा छैन"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"यन्त्रको MAC ठेगाना"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"अनियमित बनाइएको MAC ठेगाना"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"र्‍यान्डमाइज्ड MAC ठेगाना (पछिल्लो पटक प्रयोग गरिएको)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ठेगाना"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"नेटवर्कको विवरण"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"सबनेट मास्क"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 ठेगानाहरू"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"सेभ गरिएका नेटवर्कहरू"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"सदस्यताहरू"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"अन्य नेटवर्कहरू"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP सेटिङहरू"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"यस प्रयोगकर्ताका लागि Wi‑Fi उन्नत सम्बन्धी सेटिङहरू उपलब्ध छैनन्"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"सुरक्षित गर्नुहोस्"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"एउटा मान्य गेटवे ठेगाना टाइप गर्नुहोस्।"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"एउटा मान्य DNS ठेगाना टाइप गर्नुहोस्।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"नेटवर्क प्रेफिक्सको लम्बाइ ० देखि ३२का बीच टाइप गर्नुहोस्।"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (निजी DNS ले ओभरराइड नगरुन्जेल)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (निजी DNS ले ओभरराइड नगरुन्जेल))"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"गेटवे"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"नेटवर्क उपसर्ग लम्बाइ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"अनुप्रयोगले सामग्री आदान प्रदान गर्दैछ। इन्टरनेट जडान साझा गर्न हटस्पट निष्क्रिय पार्नुहोस् र त्यसपछि फेरि सक्रिय गर्नुहोस्‌"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"पासवर्ड सेट गरिएको छैन"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"हटस्पटको नाम"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> सक्रिय गर्दै..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> अन गरिँदै…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"अन्य यन्त्रहरू <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> मा जडान गर्न सक्छन्"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"हटस्पटको पासवर्ड"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ब्यान्ड"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"केही सामग्रीका लागि रिफ्रेस रेट स्वतः ६० हर्ट्जबाट बढाएर ९० हर्ट्ज बनाउँछ। ब्याट्रीको उपयोग बढाउँछ।"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"रिफ्रेस गर्ने दर बलपूर्वक ९० हर्ज बनाउनुहोस्"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"स्क्रिनमा छुँदा स्क्रिनले जनाउने प्रतिक्रिया र एनिमेसनको गुणस्तर सुधार्न उच्चतम रिफ्रेस रेट। ब्याट्रीको खपत बढाउँछ।"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"स्क्रिनमा हेरिरहेको पहिचान गर्ने सुविधा"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"सक्रिय / तपाईं स्क्रिनमा हेर्दै हुनुहुन्छ भने यो बन्द हुने छैन"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"स्क्रिन अफ भएका बेला नयाँ सूचना प्राप्त हुँदा स्क्रिन अन हुन्छ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"समय र जानकारी सधैँ देखाइयोस्"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ब्याट्री बढी खपत हुने"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"बोल्ड टेक्स्ट"</string>
     <string name="title_font_size" msgid="570613010306330622">"फन्ट आकार"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"पाठ सन्देश अझ ठुलो वा सानो पार्नुहोस्"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM कार्ड लक सेटिङहरू"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"एन्ड्रोइड संस्करण"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android को सुरक्षासम्बन्धी अद्यावधिक"</string>
     <string name="model_info" msgid="8997566254717810904">"मोडेल"</string>
-    <string name="model_summary" msgid="2246651782442466213">"मोडेल: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"मोडेल तथा हार्डवेयर"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"हार्डवेयरको संस्करण"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"उपकरण ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN मेटाउनुहोस्"</string>
     <string name="menu_new" msgid="6571230342655509006">"नयाँ APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"सुरक्षित गर्नुहोस्"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"त्याग्नुहोस्"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"रद्द गर्नु…"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"नाम फिल्ड खाली हुन सक्तैन।"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN खाली हुन सक्तैन।"</string>
@@ -1593,8 +1611,11 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"एपहरू रिसेट गरिन सक्छ"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi, मोबाइल र ब्लुटुथ रिसेट गर्नुहोस्"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"यसले निम्न सेटिङहरू लगायत सम्पूर्ण नेटवर्क सम्बन्धी सेटिहरूलाई रिसेट गर्ने छ:\n\n"<li>"Wi‑Fi"</li>\n<li>"मोबाइल डेटा"</li>\n<li>"ब्लुटुथ"</li></string>
+    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
+    <skip />
     <string name="reset_esim_title" msgid="6152167073280852849">"डाउनलोड गरिएका SIM हरू मेट्नुहोस्"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"प्रतिस्थापनका लागि SIM हरू डाउनलोड गर्न आफ्ना सेवा प्रदायकसँग सम्पर्क गर्नुहोस्। यसले मोबाइल सेवाको कुनै पनि योजना रद्द गर्ने छैन।"</string>
+    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
+    <skip />
     <string name="reset_network_button_text" msgid="2281476496459610071">"सेटिङहरू रिसेट गर्नुहोस्"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"नेटवर्कसम्बन्धी सबै सेटिङहरू रिसेट गर्ने हो? तपाईं यो कार्य उल्टाउन सक्नुहुन्न।"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"नेटवर्कसम्बन्धी सबै सेटिङहरू रिसेट गर्ने र डाउनलोड गरिएका SIM हरू मेटाउने हो? तपाईं यस कार्यलाई अन्डू गर्न सक्नुहुन्न!"</string>
@@ -1604,31 +1625,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"सञ्जाल सेटिङहरू रिसेट गरियो"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM हरू मेट्न सकिँदैन"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"कुनै त्रुटि भएका कारण डाउनलोड गरिएका SIM हरू मेटाउन सकिएन।\n\nआफ्नो यन्त्र पुनः सुरु गरी फेरि प्रयास गर्नुहोस्।"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"यसले निम्नलगायतका सबै डेटा तपाईंको "<b>"आन्तरिक भण्डारणबाट मेटाउँदछ"</b>":\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र एप डेटा र सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"यस कार्यले तपाईंको यन्त्रको "<b>"आन्तरिक भण्डारण"</b>" बाट सम्पूर्ण डेटा मेटाउँछ, जसमा निम्न कुराहरू पर्दछन्:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र एपका डेटा तथा सेटिङहरू"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n" \nतपाईं अहिले निम्न खाताहरूमा साइन इन हुनुहुन्छ:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n" यस यन्त्रमा हाल अन्य प्रयोगकर्ताहरु छन्। \n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"संगीत"</li>\n<li>"तस्बिरहरू"</li>\n<li>"अन्य उपयोगकर्ता डेटा"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM हरू"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"यस कार्यले तपाईंको मोबाइल सेवाको योजना रद्द गर्नेछैन।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n" \n सङ्गीत, चित्र र अन्य उपयोगकर्ता डेटा हटाउन "<b>"USB संग्रह"</b>" मेटाउन जरुरी छ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n" \n सङ्गीत, तस्वीरहरू, र अन्य प्रयोगकर्ता डेटा मेटाउनका लागि, "<b>" SD कार्ड "</b>" मेटाउनु पर्छ।"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"सबै डेटा मेटाउनुहोस् (फ्याक्ट्री रिसेट गर्नुहोस्)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"यसो गर्नुभयो भने तपाईंको ट्याब्लेटको "<b>"आन्तरिक भण्डारण"</b>"मा भएका निम्नलगायतका सबै डेटा मेटाइने छ:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र एपका डेटा तथा सेटिङ"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"यसो गर्नुभयो भने तपाईंको फोनको "<b>"आन्तरिक भण्डारण"</b>"मा भएका निम्नलगायतका सबै डेटा मेटाइने छ:\n\n"<li>"तपाईंको Google खाता"</li>\n<li>"प्रणाली र एपका डेटा तथा सेटिङ"</li>\n<li>"डाउनलोड गरिएका एपहरू"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n" \nतपाईं हाल निम्न खाताहरूमा साइन इन हुनुहुन्छ:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"यो यन्त्रमा अन्य प्रयोगकर्ताहरू छन्।\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"सङ्गीत"</li>\n<li>"फोटोहरू"</li>\n<li>"प्रयोगकर्ताको अन्य डेटा"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM हरू"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"यसो गर्नुभयो भने तपाईंको मोबाइल सेवा योजना रद्द गरिने छ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n" \n सङ्गीत, फोटो तथा प्रयोगकर्ताको अन्य डेटा मेटाउनका लागि "<b>"USB भण्डारण"</b>" मेटाउनु पर्ने हुन्छ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n" \n सङ्गीत, फोटो र प्रयोगकर्ताको अन्य डेटा मेटाउनका लागि "<b>" SD कार्ड "</b>" मेटाउनु पर्ने हुन्छ।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB भण्डारण मेटाउनुहोस्"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD कार्ड मेटाउनुहोस्"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"आन्तरिक USB भण्डारणमा सबै डेटा मेटाउनुहोस्, जस्तै सङ्गीत वा फोटोहरू"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD कार्डबाट सबै डाटाहरू जस्तै सङ्गीत वा फोटोहरू मेटाउनुहोस्"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"सबै डेटा मेट्नुहोस्"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"सबै डेटा मेट्नुहोस्"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"तपाईंका सबै व्यक्तिगत जानकारी र डाउनलोड गरिएका एपहरू मेटिने छन्। तपाईं यस कार्यलाई अन्डू गर्न सक्नुहुन्न!"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"तपाईंका डाउनलोड गरिएका एप तथा SIM हरू लगायत सबै निजी जानकारी मेटाइने छन्। तपाईं यस कार्यलाई अन्डू गर्न सक्नुहुन्न!"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"सबै मेटाउनुहोस्"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"कुनै रिसेट हुन सकेन किनभने सिस्टम क्लिएर सेवा उपलब्ध छैन।"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"सबै डेटा मेट्ने हो?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"यस प्रयोगकर्ताको लागि कारखाना रिसेट गर्ने उपलब्ध छैन"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"मेटाउँदै"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"कृपया प्रतीक्षा गर्नुहोला..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"सबै डेटा मेट्नुहोस्"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"सबै डेटा मेट्नुहोस्"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"तपाईंका सबै व्यक्तिगत जानकारी र डाउनलोड गरिएका एपहरू मेटाइने छन्। तपाईं यो कार्य अन्डू गर्न सक्नुहुन्न।"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"तपाईंका डाउनलोड गरिएका एप तथा SIM लगायत सबै व्यक्तिगत जानकारी मेटाइने छन्। तपाईं यो कार्य अन्डू गर्न सक्नुहुन्न।"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"सबै डेटा मेट्ने हो?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"यी प्रयोगकर्ताले फ्याक्ट्री रिसेट गर्न पाउँदैनन्"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"मेटाइँदै छ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"कृपया पर्खनुहोस्…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"कल सेटिङहरू"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"भ्वाइस मेल, कल फर्वार्ड, कल प्रतीक्षा, र कलर ID सेटअप गर्नुहोस्"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB टेदर गर्दै"</string>
@@ -1676,7 +1695,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> उपकरणहरूभन्दा बढीसँग टेदर गर्न सक्दैन।"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> अनटेथर गरिने छ।"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"इथरनेट टेदरिङ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB इथरनेटमार्फत फोनको सेयर गर्नुहोस्"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"इथरनेटमार्फत फोनको इन्टरनेट कनेक्सन सेयर गर्नुहोस्"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"आफ्नो मोबाइल डेटा जडानमार्फत अन्य यन्त्रहरूलाई इन्टरनेट उपलब्ध गराउन हटस्पट र टेदरिङ प्रयोग गर्नुहोस्। नजिकैका यन्त्रहरूसँग सामग्री आदान प्रदान गर्नाका निम्ति एपहरूले हटस्पट सिर्जना गर्न पनि सक्छन्।"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"आफ्नो Wi‑Fi वा मोबाइल डेटा इन्टरनेटमार्फत अन्य यन्त्रहरूमा इन्टरनेट उपलब्ध गराउन हटस्पट र टेदरिङ प्रयोग गर्नुहोस्। एपहरूले पनि वरपरका यन्त्रहरूसँग सामग्री सेयर गर्न हटस्पट सिर्जना गर्न सक्छन्।"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"मद्दत"</string>
@@ -1718,6 +1737,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ब्लुटुथ स्क्यान हुँदै"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"एप तथा सेवाहरूलाई जुनसुकै बेला (ब्लुटुथ निष्क्रिय भएको बेलामा पनि) वरपरका यन्त्रहरू स्क्यान गर्न अनुमति दिनुहोस्‌। यसलाई स्थानमा आधारित सुविधा तथा सेवाहरू सुधार गर्ने जस्ता कार्यहरू गर्नाका लागि प्रयोग गर्न सकिन्छ।"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"कार्यस्थलका स्थानसम्बन्धी सेवाहरू"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"हालको समय क्षेत्र पत्ता लगाउनका निम्ति यन्त्रको स्थानसम्बन्धी जानकारी प्रयोग गर्न दिन्छ। Wi-Fi स्क्यान गर्ने सुविधा जस्ता स्थानसम्बन्धी अन्य सेटिङका कारण सटीक समय क्षेत्र पत्ता लगाउन गाह्रो हुन सक्छ।"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"अन छ"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"अफ छ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"समय क्षेत्र स्वतः पत्ता लगाउने सुविधा असक्षम पारिएको छ"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा असक्षम पारिएको छ"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधा प्रयोग गर्न मिल्दैन"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"स्थानको समय क्षेत्र पत्ता लगाउने सुविधासम्बन्धी सेटिङ परिवर्तन गर्न पाइँदैन"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi; मोबाइल नेटवर्क स्थान"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"तपाईँको स्थानलाई सीघ्र अनुमान गर्न एपहरूलाई Google स्थान सेवा प्रयोग गर्न अनुमति दिनुहोस्। बेनामी स्थान डेटा भेला गरिने छ र Googleमा पठाइने छ।"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"वाइ-फाइद्वारा निर्धारित स्थान"</string>
@@ -1781,6 +1809,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"फेस अनलक प्रयोग गर्न पासवर्ड सेट गर्नु…"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"फेस अनलक प्रयोग गर्न प्याटर्न सेट गर्नुहोस्"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"फेस अनलक प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"बायोमेट्रिक्स प्रयोग गर्न पासवर्ड सेट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"बायोमेट्रिक्स प्रयोग गर्न ढाँचा सेट गर्नुहोस्"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"बायोमेट्रिक्स प्रयोग गर्न PIN सेट गर्नुहोस्"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"आफ्नो पासवर्ड बिर्सनुभयो?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"आफ्नो ढाँचा बिर्सनुभयो?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"आफ्नो PIN बिर्सनुभयो?"</string>
@@ -2117,13 +2148,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"क्याप्सनसम्बन्धी प्राथमिकताहरू"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"म्याग्निफिकेसन"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"म्याग्निफिकेसन क्षेत्र"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"म्याग्निफिकेसन सक्षम पारिएको"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"स्क्रिन म्याग्निफाई गर्दा आफूले प्रयोग गर्न चाहेका म्याग्निफिकेसन क्षेत्र (हरू) छनौट गर्नुहोस्"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"फुल स्क्रिन"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"स्क्रिनको भाग"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"फुल स्क्रिन र स्क्रिनको भाग"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"समग्र स्क्रिन म्याग्निफाई गर्नुहोस्"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"स्क्रिनको भाग म्याग्निफाई गर्नुहोस्"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"पहुँचको बटन प्रयोग गर्ने हो?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"तपाईंले स्क्रिनमा तीन पटक ट्याप गरेर स्क्रिनको कुनै भाग म्याग्निफाई गर्ने सुविधा प्रयोग गर्नुभयो भने टाइपिङका साथै अन्य कारबाहीहरूमा ढिलाइ हुन्छ।\n\n तपाईं म्याग्निफाई गर्नका लागि पहुँचको बटन प्रयोग गर्न चाहनुहुन्छ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"पहुँचको बटन प्रयोग गर्नुहोस्"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"तीन पटक ट्याप गरेर म्याग्निफाई गर्ने सुविधा चालू राख्नुहोस्"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"म्याग्निफिकेसनसम्बन्धी सेटिङ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"तीन ट्यापमा म्याग्निफाइ गर्नुहोस्"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"सर्टकट प्रयोग गरी म्याग्निफाइ गर्नुहोस्"</string>
@@ -2177,11 +2211,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"पावर बटनले कल काट्छ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ठुलो माउस पोइन्टर"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"एनिमेसनहरू हटाउनुहोस्"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"मोनो अडियो"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"अडियो प्ले गर्दा च्यानलहरूलाई संयोजन गर्नुहोस्"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"अडियोको सन्तुलन"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"बायाँ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"दायाँ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"मोनो अडियो"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"सबै अडियो एउटै च्यानलबाट प्ले गर्नुहोस्"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"अडियोको सन्तुलन"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"बायाँ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"दायाँ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"पूर्वनिर्धारित"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"१० सेकेन्ड"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"३० सेकेन्ड"</string>
@@ -2211,11 +2245,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"सूचना आएको जनाउने कम्पन"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"कम्पनसहितको घन्टी"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"छोएर दिइने प्रतिक्रिया"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> प्रयोग गर्नुहोस्"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> खोल्नुहोस्"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"रङ्ग सुधार गर्ने सुविधा प्रयोग गर्नुहोस्"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"क्याप्सनहरू देखाउनुहोस्"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"यो सुविधा चल्ने एपहरूमा मात्र"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> प्रयोग गर्नुहोस्"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> खोल्नुहोस्"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"रङ सच्याउने सुविधा प्रयोग गर्नुहोस्"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"क्याप्सनहरू देखाउनुहोस्"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"यो सुविधा चल्ने एपमा मात्र"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"क्याप्सनको आकार र शैली"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> पाठको आकार"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"थप विकल्पहरू"</string>
@@ -2245,6 +2279,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ड्युटेरानोमेली"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"प्रोटानोमेली"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ट्रिटानोमेली"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ग्रेस्केल"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"रातो-हरियो"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"रातो-हरियो"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"निलो-पहेँलो"</string>
@@ -2374,7 +2409,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"पृष्ठभूमिको प्रतिबन्ध"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"एपलाई पृष्ठभूमिमा चल्न अनुमति दिनुहोस्"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"एपलाई पृष्ठभूमिमा चल्न दिइएको छैन"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"पृष्ठभूमिको प्रयोगमा प्रतिबन्ध लगाउन सकिँदैन"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ब्याकग्राउन्डमा हुने गतिविधिमाथि रोक लगाउन सकिँदैन"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"पृष्ठभूमिको गतिविधिलाई सीमित गर्ने हो?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"तपाईंले कुनै एपको पृष्ठभूमिको गतिविधिलाई सीमित गर्नुभयो भने यसले सही तरिकाले काम नगर्न सक्छ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"यो एपलाई ब्याट्री अप्टिमाइज गर्न भनी सेट नगरिएको हुनाले तपाईं यसमा बन्देज लगाउन सक्नुहुन्न।\n\nअनुप्रयोगमा बन्देज लगाउन पहिले ब्याट्री अप्टिमाइजेसन सुविधा सक्रिय गर्नुहोस्।"</string>
@@ -2423,6 +2458,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ट्याब्लेट सामान्यभन्दा बढी प्रयोग भयो"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"यन्त्रलाई सामान्यभन्दा बढी प्रयोग भयो"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ब्याट्री अरू बेलाभन्दा छिटै सकिन सक्छ"</string>
+    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
+    <skip />
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"केही समयका लागि ब्याट्रीको प्रयोग सीमित गरिएको छ। थप जान्न ट्याप गर्नुहोस्।"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"तपाईंको फोन सामान्यभन्दा धेरै प्रयोग भएको छ। तपाईंको ब्याट्रीको चार्ज अपेक्षा गरिएभन्दा चाँडो सकिन सक्छ।\n\nसबैभन्दा बढी ब्याट्री उपयोग गर्ने एपहरू:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"तपाईंको ट्याब्लेट सामान्यभन्दा धेरै प्रयोग भएको छ। तपाईंको ब्याट्रीको चार्ज अपेक्षा गरिएभन्दा चाँडो सकिन सक्छ।\n\nसबैभन्दा बढी ब्याट्री उपयोग गर्ने एपहरू:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"तपाईंको यन्त्र सामान्यभन्दा धेरै प्रयोग भएको छ। तपाईंको ब्याट्रीको चार्ज अपेक्षा गरिएभन्दा चाँडो सकिन सक्छ।\n\nसबैभन्दा बढी ब्याट्री उपयोग गर्ने एपहरू:"</string>
@@ -2478,6 +2516,8 @@
       <item quantity="one">%1$d अनुप्रयोगमा प्रतिबन्ध लगाइयो</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"यन्त्रको ब्याट्री मिटर पढ्ने क्रममा समस्या आयो"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"यन्त्रको ब्याट्री मिटर पढ्ने क्रममा समस्या आयो। थप जान्न "<annotation id="url">"मा ट्याप गर्नुहोस्"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"एपलाई रोक्ने हो?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको फोनलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त एपलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त एपको स्थापना रद्द गर्नु पर्ने हुन सक्छ।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> ले तपाईंको ट्याब्लेटलाई सक्रिय गरिरहने हुनाले तपाईंको यन्त्रले सामान्य रूपमा ब्याट्रीको व्यवस्थापन गर्न सक्दैन।\n\nयो समस्याको समाधान गर्ने प्रयास गर्न तपाईं उक्त एपलाई रोक्न सक्नुहुन्छ।\n\nयो समस्या भइरहेमा ब्याट्रीको कार्यसम्पादनमा सुधार गर्न तपाईंले उक्त एपको स्थापना रद्द गर्नु पर्ने हुन सक्छ।"</string>
@@ -2591,9 +2631,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"समयतालिका सेट गर्नुहोस्‌"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ब्याट्रीको खपत बढाउनुहोस्"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"चार्ज भएपछि अफ गर्नुहोस्"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"तपाईंको फोन <xliff:g id="PERCENT">%1$s</xliff:g> भएपछि ब्याट्री सेभर अफ हुन्छ"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"तपाईंको ट्याब्लेटको चार्ज <xliff:g id="PERCENT">%1$s</xliff:g> भएपछि ब्याट्री सेभर अफ हुन्छ"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"तपाईंको यन्त्र <xliff:g id="PERCENT">%1$s</xliff:g> भएपछि ब्याट्री सेभर अफ हुन्छ"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"तपाईंको फोन <xliff:g id="PERCENT">%1$s</xliff:g> भन्दा बढी चार्ज हुँदा ब्याट्री सेभर अफ हुन्छ"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"तपाईंको ट्याब्लेट <xliff:g id="PERCENT">%1$s</xliff:g> भन्दा बढी चार्ज हुँदा ब्याट्री सेभर अफ हुन्छ"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"तपाईंको यन्त्र <xliff:g id="PERCENT">%1$s</xliff:g> भन्दा बढी चार्ज हुँदा ब्याट्री सेभर अफ हुन्छ"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"सक्रिय गर्नुहोस्"</string>
@@ -2658,6 +2698,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"रिसेट गर्नुहोस्"</string>
     <string name="tts_play" msgid="2945513377250757221">"प्ले गर्नुहोस्"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"एड्याप्टिभ कनेक्टिभिटी"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"तपाईंले एड्याप्टिभ कनेक्टिभिटी नामक विकल्प छनौट गर्नुभयो भने तपाईंको इन्टरनेट कनेक्सन स्वतः व्यवस्थापन गरिन्छ। यसले गर्दा ब्याट्रीको आयु बढ्छ र यन्त्रको कार्यसम्पादनमा सुधार आउँछ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"प्रमाण संग्रहण"</string>
     <string name="credentials_install" msgid="3933218407598415827">"प्रमाणपत्र स्थापना गर्नुहोस्"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"भण्डारणबाट प्रमाणपत्रहरू स्थापना गर्नुहोस्"</string>
@@ -2669,9 +2711,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"प्रयोगकर्ताका प्रमाणपत्रहरू"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"भण्डारमा भएका प्रमाणपत्रहरू हेर्नुहोस् र परिमार्जन गर्नुहोस्"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"उन्नत"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"भण्डारण प्रकार"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"हार्डवेयर-ब्याक गरिएको"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"सफ्टवेयर मात्र"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"साखकर्ताहरू यस प्रयोगकर्ताका लागि उपलव्ध छैन"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN र अनुप्रयोगहरूका लागि स्थापना गरिएको"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi का लागि स्थापना गरिएको"</string>
@@ -2687,6 +2726,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"स्थापना नगर्नुहोस्"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"जे भए पनि पनि स्थापना गर्नुहोस्"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"प्रमाणपत्र स्थापना गरिएको छैन"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g> लाई यो यन्त्रमा प्रमाणपत्रहरू इन्स्टल गर्ने अनुमति दिने हो?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"यी प्रमाणपत्रहरूको सहायताले तल दिइएका एप र URL हरूमा तपाईंको पहिचान गरिने छ"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"अनुमति नदिनुहोस्"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"अनुमति दिनुहोस्"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"थप देखाइयोस्"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"प्रमाणपत्र व्यवस्थापन गर्ने एप"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"कुनै पनि होइन"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"यो एप प्रयोग गरी इन्स्टल गरिएका प्रमाणपत्रहरूका सहायताले तल दिइएका एप र URL हरूमा तपाईंका युजरनेम तथा पासवर्ड पहिचान गरिन्छ"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"हटाउनुहोस्"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"इमर्जेन्सी डाइलिङसम्बन्धी सङ्केत"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"आपातकालीन कल राखिएको बेलाको व्यवहार सेट गर्नुहोस्"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"ब्याकअप"</string>
@@ -3010,7 +3058,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"सेट भएको छैन - कार्य प्रोफाइल"</string>
     <string name="user_admin" msgid="4024553191395768119">"प्रशासक"</string>
     <string name="user_you" msgid="3070562015202859996">"तपाईं (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"उपनाम"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"तपाईँले <xliff:g id="USER_COUNT">%1$d</xliff:g> जना प्रयोगकर्ता सम्म थप्न सक्नुहुनेछ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ट्याब्लेटको मालिकले मात्र प्रयोगकर्ताहरूलाई व्यवस्थापन गर्न सक्छ।"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"केवल फोनको धनीले मात्र प्रयोगकर्ता व्यवस्थापन गर्न सक्छ"</string>
@@ -3060,7 +3107,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"टर्मिनलमा भुक्तानी"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"एउटा भुक्तानी एप सेटअप गर्नुहोस्। त्यसपछि आफ्नो फोनको पछाडिको भाग कन्ट्याक्टलेस सङ्केतभएको कुनै टर्मिनलले पहिचान गर्ने गरी होल्ड गर्नुहोस्।"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"बुझेँ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"थप..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"थप…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"पूर्वनिर्धारित भुक्तानी एप सेट गर्नुहोस्"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"पूर्वनिर्धारित भुक्तानी एप परिवर्तन गर्नु…"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"कन्ट्याक्टलेस टर्मिनलमा <xliff:g id="APP">%1$s</xliff:g> मार्फत भुक्तानी गर्नुहोस्"</string>
@@ -3130,9 +3177,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"पछाडि जानुहोस्"</string>
     <string name="wizard_next" msgid="3884832431439072471">"अर्को"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"समाप्त गर्नुहोस्"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"फोटो खिच्नुहोस्"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"कुनै फोटो छनौट गर्नुहोस्"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"फोटो छान्नुहोस्"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"सिम कार्ड"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM कार्डहरू"</string>
@@ -3144,7 +3188,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"सधैं यो कलको लागि प्रयोग गर्नुहोस्"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"डेटाको लागि सिम चयन गर्नुहोस्"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS गर्न कुनै SIM चयन गर्नुहोस्"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"डेटा SIM स्विच गर्दै, यसलाई करिब एक मिनेट लाग्न सक्छ ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"डेटा प्रयोग गर्ने SIM परिवर्तन गरिँदै छ, यसो गर्न एक मिनेटसम्म लाग्न सक्छ…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"संग कल"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM कार्ड चयन गर्नुहोस्"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3331,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"दिनचर्या, समयतालिका, ब्याट्री सेभर, पावर सेभर, ब्याट्री, स्वचालित, प्रतिशत"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, कल गर्ने उन्नत सुविधा, 4g मार्फत कल गर्ने सुविधा"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"भाषा थप्नुहोस्, कुनै भाषा थप्नुहोस्"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"पाठको आकार"</string>
     <string name="default_sound" msgid="6604374495015245195">"पूर्वनिर्धारित ध्वनि"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"घन्टी तथा सूचनाको भोल्युम <xliff:g id="PERCENTAGE">%1$s</xliff:g> मा सेट छ"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"भोल्युम, कम्पन, बाधा नपुर्‍याउनुहोस्"</string>
@@ -3326,11 +3371,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"यन्त्र सक्रिय हुँदाका ध्वनिहरू"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"लाइभ क्याप्सन"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"मिडियाको स्वत: क्याप्सन बनाउनुहोस्"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"कुनै पनि होइन"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> समयतालिकाहरू निर्धारण गरिए</item>
-      <item quantity="one">१ समयतालिका निर्धारण गरियो</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{कुनै पनि समयतालिका निर्धारण गरिएको छैन}=1{एउटा समयतालिका निर्धारण गरियो}other{# वटा समयतालिका निर्धारण गरिए}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"बाधा नपुऱ्याउनुहोस्"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"महत्त्वपूर्ण मान्छे र एपका सूचना मात्र प्राप्त गर्नुहोस्"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"अवरोधहरू सीमित पार्नुहोस्"</string>
@@ -3398,20 +3439,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"प्राथमिकता मात्र"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>। <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"सक्रिय छ/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"निष्क्रिय छ/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"निष्क्रिय छ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"सक्रिय"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"प्रत्येक पटक सोध्नुहोस्"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"तपाईंले निष्क्रिय नपारेसम्म"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> घन्टा</item>
-      <item quantity="one">१ घन्टा</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> मिनेट"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> समयतालिकाहरू स्वतः सक्रिय हुन सक्छन्‌</item>
-      <item quantity="one">१ समयतालिका स्वतः सक्रिय हुन सक्छ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{१ घन्टा}other{# घन्टा}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{१ मिनेट}other{# मिनेट}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{निष्क्रिय छ}=1{निष्क्रिय छ / एउटा समयतालिका स्वतः अन हुन सक्छ}other{निष्क्रिय छ / # वटा समयतालिका स्वतः अन हुन सक्छन्}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"बाधा नपुर्‍याउनुहोस् नामक सुविधालाई केले निष्क्रिय पार्न सक्छ"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"मान्छेहरू"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"एपहरू"</string>
@@ -3457,6 +3490,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"न्यून प्राथमिकता भएका सूचनाहरूलाई स्वतः मौन सूचनाका रूपमा सेट गर्नुहोस्"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"अनुकूल पार्न मिल्ने सूचनाहरूको श्रेणीकरण"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"सन्दर्भअनुसार सूचनाहरू स्वतः श्रेणीबद्ध गर्नुहोस्"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"परिस्थितिअनुसार प्राप्त हुने सूचनाबारे प्रतिक्रिया"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"सूचनाहरूमा गरिएको समायोजनबारे सूचित गर्छ र सिस्टमका बारेमा प्रतिक्रिया दिने विकल्प देखाउँछ"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"सूचनाको प्राथमिकता रिसेट गर्नुहोस्"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"प्रयोगकर्ताले परिवर्तन गरेका प्राथमिकतासम्बन्धी सेटिङ रिसेट गर्नुहोस् र सूचना सहायकलाई प्राथमिकता तय गर्ने अनुमति दिनुहोस्"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"सिफारिस गरिएका कारबाही तथा जवाफहरू"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"सिफारिस गरिएका कारबाही तथा जवाफहरू स्वतः देखाउनुहोस्"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"हालका र स्नुज गरिएका सूचनाहरू देखाउनुहोस्"</string>
@@ -3554,8 +3591,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"महत्वपूर्ण वार्तालापहरू"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"वार्तालाप खण्डको सिरानमा र तैरने बबलका रूपमा देखाइयोस्"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"वार्तालाप खण्डको सिरानमा देखाइयोस्"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"अन्य वार्तालापहरू"</string>
+    <string name="other_conversations" msgid="551178916855139870">"कम महत्त्वपूर्ण वार्तालापहरू"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"तपाईंले केही कुराहरू परिवर्तन गर्नुभएका वार्तालापहरू"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"हालैका वार्तालापहरू"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"हालका वार्तालाप हटाउनु…"</string>
+    <string name="clear" msgid="5092178335409471100">"हटाउनुहोस्"</string>
     <string name="important_bubble" msgid="7911698275408390846">"महत्त्वपूर्ण वार्तालापहरू बबलमा देखाइयोस्"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"महत्त्वपूर्ण वार्तालापहरू पुल डाउन सेडका सिरानमा देखिन्छन्। तपाईं वार्तालापहरूलाई बबलका रूपमा देखिने र बाधा नपुर्‍याउनुहोस् नामक मोड निष्क्रिय पार्ने गरी सेट गर्न पनि सक्नुहुन्छ।"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"महत्त्वपूर्ण तथा संशोधित वार्तालापहरू यहाँ देखिने छन्"</string>
@@ -3653,7 +3693,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"बाधा नपुर्‍यानुहोस् पहुँच"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"बाधा नपुर्‍याउनुहोस् नामक सुविधा सक्रिय गर्ने अनुमति दिनुहोस्"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"कुनै पनि स्थापित एपहरू द्वारा बाधा नपुर्‍यानुहोस् पहुँच को माग गरेका छैनन्"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"एपहरू लोड हुँदै..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"एपहरू लोड गरिँदै…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"तपाईंको अनुरोधबमोजिम Android ले यस एपका सूचनाहरूलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस कोटिलाई यो यन्त्रमा देखिन दिइरहेको छैन"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"तपाईंको अनुरोधबमोजिम Android ले सूचनाहरूको यस समूहलाई यो यन्त्रमा देखाउन दिइरहेको छैन"</string>
@@ -3745,11 +3785,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"सबै वार्तालापहरू"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"महत्वपूर्ण वार्तालापहरू"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"कुनै पनि होइन"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> वार्तालापहरू</item>
-      <item quantity="one">१ वार्तालाप</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"कुनै पनि होइन"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{कुनै पनि वार्तालाप होइन}=1{एउटा वार्तालाप}other{# वटा वार्तालाप}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"अवरोध गर्न सक्ने कुराहरू"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"कलहरू"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"कलहरू"</string>
@@ -3758,11 +3794,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"अनुमति दिइएका कलहरू आउँदा घन्टी बजोस् भन्नाका खातिर यन्त्रमा घन्टी बज्ने मोड सक्रिय गरिएको छ भन्ने कुरा सुनिश्चित गर्नुहोस्"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ का आगम कलहरूलाई रोक लगाइएको छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सम्पर्कहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ताराङ्कित सम्पर्कहरू"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">अन्य <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">अन्य १</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"कुनै पनि होइन"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{कुनै पनि ताराङ्कित सम्पर्क व्यक्ति होइन}=1{{contact_1}}=2{{contact_1} र {contact_2}}=3{{contact_1}, {contact_2} र {contact_3}}other{{contact_1}, {contact_2} र अरू #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(कुनै नाम छैन)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"सन्देशहरू"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"सन्देशहरू"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3804,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ का आगम कलहरूलाई रोक लगाइएको छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सूचीमा भएका अन्य मान्छेहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"\'बाधा नपुर्‍याउनुहोस्\' मोडले कुनै पनि सन्देश रोकिरहेको छैन"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"\'बाधा नपुर्‍याउनुहोस्\' मोडले कुनै पनि आगमन कल रोकिरहेको छैन"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"कुनै पनि होइन"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> सम्पर्क ठेगानाहरू</item>
-      <item quantity="one">१ सम्पर्क ठेगाना</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{सम्पर्क सूचीमा भएका कुनै पनि व्यक्ति होइन}=1{सम्पर्क सूचीमा भएका एक जना व्यक्ति}other{सम्पर्क सूचीमा भएका # जना व्यक्ति}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"जोसुकै"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"सम्पर्क ठेगानाहरू"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ताराङ्कित सम्पर्क ठेगानाहरू"</string>
@@ -3813,22 +3842,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"सबै सूचनाहरू"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"केही सूचनाहरू"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"तपाईंले एपहरूलाई बाधा पुर्‍याउन नदिए पनि निश्चित मान्छेहरू अझै पनि तपाईंलाई सम्पर्क गर्न सक्छन्"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ले अवरोध गर्न सक्छन्</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> ले अवरोध गर्न सक्छ</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"थप <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{कुनै पनि एपले अवरोध गर्न सक्दैन}=1{{app_1} ले अवरोध गर्न सक्छ}=2{{app_1} र {app_2} ले अवरोध गर्न सक्छन्}=3{{app_1}, {app_2} र {app_3} ले अवरोध गर्न सक्छन्}other{{app_1}, {app_2} र अरू # एपले अवरोध गर्न सक्छन्}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"एपहरू"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"सबै सूचनाहरू"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"केही सूचनाहरू"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"अवरोध गर्न सक्ने सूचनाहरू"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"सबै सूचनाहरूलाई अनुमति दिनुहोस्"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ले अवरोध गर्न सक्छन्</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> ले अवरोध गर्न सक्छ</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"कुनै पनि आवाजले अवरोध गर्न सक्दैन"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"थप <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{कुनै पनि आवाजले अवरोध गर्न सक्दैन}=1{{sound_category_1} ले अवरोध गर्न सक्छ}=2{{sound_category_1} र {sound_category_2} ले अवरोध गर्न सक्छन्}=3{{sound_category_1}, {sound_category_2} र {sound_category_3} ले अवरोध गर्न सक्छन्}other{{sound_category_1}, {sound_category_2} र अरू # आवाजले अवरोध गर्न सक्छन्}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"कुनै पनि आवाजले अवरोध गर्न सक्दैन"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"कोही पनि अवरोध गर्न सक्दैनन्"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"केही मान्छेहरू अवरोध गर्न सक्छन्"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"सबै मान्छेहरू अवरोध गर्न सक्छन्"</string>
@@ -3874,8 +3895,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"सक्रिय"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"निष्क्रिय"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"एप पिन गर्ने सुविधा"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"एप पिन गर्ने सुविधा प्रयोग गरेर तपाईं हाल प्रयोगमा रहेको कुनै एपलाई अनपनि नगर्दासम्म स्क्रिनमा उक्त एप मात्र देखिने गरी पिन गर्न सक्नुहुन्छ। उदाहरणका लागि, तपाईं आफूले विश्वास गर्ने कुनै साथीलाई कुनै निश्चित गेम खेल्न दिँदा यो सुविधा प्रयोग गर्न सक्नुहुन्छ। \n\nपिन गरिएको कुनै एपले अन्य एपहरू खोल्न सक्छ र तपाईंको यन्त्र चलाइरहेका व्यक्तिले तपाईंको व्यक्तिगत डेटा हेर्न तथा प्रयोग गर्न सक्छन्। \n\nएप पिन गर्ने सुविधा प्रयोग गर्न: 	\n१.	एप पिन गर्ने सुविधा सक्रिय गर्नुहोस् 	\n२.	स्क्रिनसम्बन्धी विवरण खोल्नुहोस् 	\n३.	स्क्रिनको सिरानमा रहेको एपको आइकनमा ट्याप गर्नुहोस् र त्यसपछि पिन गर्नुहोस् नामक बटनमा ट्याप गर्नुहोस्"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"एप पिन गर्ने सुविधा प्रयोग गरेर तपाईं हाल प्रयोगमा रहेको कुनै एपलाई अनपिन नगर्दासम्म स्क्रिनमा उक्त एप मात्र देखिने गरी पिन गर्न सक्नुहुन्छ। उदाहरणका लागि, तपाईं आफूले विश्वास गर्ने कुनै साथीलाई कुनै निश्चित गेम खेल्न दिँदा यो सुविधा प्रयोग गर्न सक्नुहुन्छ। \n\nपिन गरिएको कुनै एपले अन्य एपहरू खोल्न सक्छ र तपाईंको यन्त्र चलाइरहेका व्यक्तिले तपाईंको व्यक्तिगत डेटा हेर्न तथा प्रयोग गर्न सक्छन्। \n\nतपाईं आफ्नो यन्त्र पूर्ण रूपमा सुरक्षित रहने गरी कसैलाई प्रयोग गर्न दिन चाहनुहुन्छ भने यो सुविधाको साटो अतिथि प्रयोगकर्ता नामक सुविधा प्रयोग गरी हेर्नुहोस्। \n\nएप पिन गर्ने सुविधा प्रयोग गर्न: 	\n१.	एप पिन गर्ने सुविधा सक्रिय गर्नुहोस् 	\n२.	स्क्रिनसम्बन्धी विवरण खोल्नुहोस् 	\n३.	स्क्रिनको सिरानमा रहेको एपको आइकनमा ट्याप गर्नुहोस् र त्यसपछि पिन गर्नुहोस् नामक बटनमा ट्याप गर्नुहोस्"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"एप पिन गर्ने सुविधा प्रयोग गरेर तपाईं हाल प्रयोगमा रहेको कुनै एपलाई अनपिन नगर्दासम्म स्क्रिनमा उक्त एप मात्र देखिने गरी पिन गर्न सक्नुहुन्छ। उदाहरणका लागि, तपाईं आफूले विश्वास गर्ने कुनै साथीलाई कुनै निश्चित गेम खेल्न दिँदा यो सुविधा प्रयोग गर्न सक्नुहुन्छ।"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"पिन गरिएको कुनै एपले अन्य एपहरू खोल्न सक्छ र तपाईंको यन्त्र चलाइरहेका व्यक्तिले तपाईंको व्यक्तिगत डेटा हेर्न तथा प्रयोग गर्न सक्छन्। \n\nएप पिन गर्ने सुविधा प्रयोग गर्न: 	\n१.	एप पिन गर्ने सुविधा सक्रिय गर्नुहोस् 	\n२.	स्क्रिनसम्बन्धी विवरण खोल्नुहोस् 	\n३.	स्क्रिनको सिरानमा रहेको एपको आइकनमा ट्याप गर्नुहोस् र त्यसपछि पिन गर्नुहोस् नामक बटनमा ट्याप गर्नुहोस्"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"पिन गरिएको कुनै एपले अन्य एपहरू खोल्न सक्छ र तपाईंको यन्त्र चलाइरहेका व्यक्तिले तपाईंको व्यक्तिगत डेटा हेर्न तथा प्रयोग गर्न सक्छन्। \n\nतपाईं आफ्नो यन्त्र पूर्ण रूपमा सुरक्षित रहने गरी कसैलाई प्रयोग गर्न दिन चाहनुहुन्छ भने यो सुविधाको साटो अतिथि प्रयोगकर्ता नामक सुविधा प्रयोग गरी हेर्नुहोस्। \n\nएप पिन गर्ने सुविधा प्रयोग गर्न: 	\n१.	एप पिन गर्ने सुविधा सक्रिय गर्नुहोस् 	\n२.	स्क्रिनसम्बन्धी विवरण खोल्नुहोस् 	\n३.	स्क्रिनको सिरानमा रहेको एपको आइकनमा ट्याप गर्नुहोस् र त्यसपछि पिन गर्नुहोस् नामक बटनमा ट्याप गर्नुहोस्"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"कुनै एप पिन गरिएका बेला: \n\n•	व्यक्तिगत डेटा (जस्तै सम्पर्क ठेगाना र इमेलको सामग्री) \n		 हेर्न तथा प्रयोग गर्न मिल्ने हुन सक्छ \n•		पिन गरिएको एपले अन्य एपहरू खोल्न सक्छ \n\nआफ्नो फोन आफूले विश्वास गर्ने मान्छेहरूलाई प्रयोग गर्न दिँदा मात्र एप पिन गर्ने यो सुविधा प्रयोग गर्नुहोस्।"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"पिन निकाल्नुअघि खोल्ने ढाँचा सोध्नुहोस्"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"पिन निकाल्नुअघि PIN सोध्नुहोस्"</string>
@@ -3897,6 +3919,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"तपाईंको यन्त्र अनलक गर्न आफ्नो अनुहार प्रयोग गर्नुका साथसाथै यो यन्त्र खुल्नुअघि आफ्नो PIN चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसले कल, सन्देश वा अलार्मलगायतका सूचनाहरू प्राप्त गर्न सक्दैन।\n\nयसले हराएका वा चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्छ। आफ्नो यन्त्र खोल्नका लागि PIN चाहिने बनाउने हो?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"तपाईंको यन्त्र अनलक गर्न आफ्नो अनुहार प्रयोग गर्नुका साथसाथै यो यन्त्र खुल्नुअघि आफ्नो ढाँचा चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसले कल, सन्देश वा अलार्मलगायतका सूचनाहरू प्राप्त गर्न सक्दैन।\n\nयसले हराएका वा चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्छ। आफ्नो यन्त्र खोल्नका लागि ढाँचा चाहिने बनाउने हो?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"तपाईंको यन्त्र अनलक गर्न आफ्नो अनुहार प्रयोग गर्नुका साथसाथै यो यन्त्र खुल्नुअघि आफ्नो पासवर्ड चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसले कल, सन्देश वा अलार्मलगायतका सूचनाहरू प्राप्त गर्न सक्दैन।\n\nयसले हराएका वा चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्छ। आफ्नो यन्त्र खोल्नका लागि पासवर्ड चाहिने बनाउने हो?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"तपाईंको यन्त्र अनलक गर्न तपाईंको बायोमेट्रिक्स प्रयोग गर्नाका साथै, यो यन्त्र खुल्नुअघि आफ्नो PIN हाल्नु पर्ने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा अलार्म प्राप्त गर्नेलगायत फोन उठाउन, सन्देश वा सूचना प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न PIN हाल्नु पर्ने बनाउने हो?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"तपाईंको यन्त्र अनलक गर्न तपाईंको बायोमेट्रिक्स प्रयोग गर्नाका साथै, यो यन्त्र खुल्नुअघि आफ्नो ढाँचा हाल्नु पर्ने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा अलार्म प्राप्त गर्नेलगायत फोन उठाउन, सन्देश वा सूचना प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न ढाँचा हाल्नु पर्ने बनाउने हो?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"तपाईंको यन्त्र अनलक गर्न तपाईंको बायोमेट्रिक्स प्रयोग गर्नाका साथै, यो यन्त्र खुल्नुअघि आफ्नो पासवर्ड हाल्नु पर्ने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा अलार्म प्राप्त गर्नेलगायत फोन उठाउन, सन्देश वा सूचना प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न पासवर्ड हाल्नु पर्ने बनाउने हो?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"हो"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"होइन"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"प्रतिबन्धित"</string>
@@ -4072,7 +4097,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"निम्नमध्ये USB नियन्त्रण गर्ने चिज"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"जडान गरिएको यन्त्र"</string>
     <string name="usb_control_device" msgid="527916783743021577">"यो यन्त्र"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"बदल्दै..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"बदलिँदै…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"बदल्न सकिएन"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"यो यन्त्रलाई चार्ज गर्दै"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"जडान गरिएको यन्त्र चार्ज गर्दै"</string>
@@ -4266,6 +4291,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"मोबाइल डेटाको प्रयोग"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"अनुप्रयोगले गरेको डेटाको प्रयोग"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi डेटाको प्रयोग"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"सेवा प्रदायकबाहेक अन्य एपले प्रयोग गरेको डेटा"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"इथरनेट डेटाको उपयोग"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"इथरनेट"</string>
@@ -4284,6 +4310,7 @@
       <item quantity="one">१ वटा बन्देज</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"वाहकको डेटाको हिसाब-किताब राख्ने कार्य तपाईँको यन्त्रको हिसाब-किताब राख्ने कार्य भन्दा फरक हुन सक्छ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"यस विवरणमा सेवा प्रदायकको नेटवर्कले प्रयोग गरेको डेटा समावेश गरिएको छैन"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> प्रयोग गरियो"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"डेटाबारे चेतावनी सेट गर्नुहोस्"</string>
     <string name="data_warning" msgid="2925054658166062884">"डेटाबारे चेतावनी"</string>
@@ -4319,7 +4346,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"विवरणहरू हेर्नुहोस्"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"डेटा सेभर"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"असीमित डेटा"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"पृष्ठभूमिको डेटालाई निष्क्रिय पारियो"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ब्याकग्राउन्डको डेटा निष्क्रिय पारिएको छ"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"सक्रिय गर्नुहोस्"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"अफ छ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"डेटा सेभर प्रयोग गर्नुहोस्"</string>
@@ -4342,7 +4369,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"यदि यन्त्रलाई लक गरिएको छ भने सूचनाहरूमा जवाफ वा अन्य पाठ टाइप गर्न रोक लगाउनुहोस्"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"पूर्वनिर्धारित हिज्जे परीक्षक"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"हिज्जे परीक्षक छनोट गर्नुहोस्"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"हिज्जे जाँचकर्ता प्रयोग गर्नुहोस्"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"हिज्जे जाँचकर्ता प्रयोग गर्नुहोस्"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"चयन गरिएको छैन"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(कुनै पनि होइन)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4459,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"भण्डारण प्रबन्धकले भण्डारणको ठाउँ खाली गर्न मद्दतका लागि तपाईँको यन्त्रबाट ब्याक अप गरिएका फोटो र भिडियोहरू हटाउँदछ।"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"फोटो र भिडियोहरूलाई मेट्नुहोस्"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"भण्डारण प्रबन्धक"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"भण्डारण प्रबन्धक प्रयोग गर्नुहोस्"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"स्टोरेज म्यानेजर प्रयोग गर्नुहोस्"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"स्वतः"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"म्यानुअल"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"अहिले नै ठाउँ खाली गर्नुहोस्"</string>
@@ -4470,6 +4497,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"फोनको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ट्याब्लेटको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"यन्त्रको जाँच गर्न डबल-ट्याप गर्नुहोस्"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"सूचनाहरू हेर्न स्वाइप गर्नुहोस्"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"सूचनाहरू हेर्न स्क्रिनमा तलतिर स्वाइप गर्नुहोस्"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"एक हाते मोड"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"एक हाते मोड प्रयोग गर्नुहोस्"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"एउटा एपबाट अर्को एपमा जाँदा बाहिर निस्कनुहोस्"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"समयसीमा समाप्ति"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"४ सेकेन्ड"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"८ सेकेन्ड"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"१२ सेकेन्ड"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"गम्यता"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"समय, सूचना र अन्य जानकारी हेर्न आफ्नो यन्त्रको स्क्रिनमा डबल ट्याप गर्नुहोस्।"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"फोनको जाँच गर्न उठाउनुहोस्"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ट्याब्लेटको जाँच गर्न उठाउनुहोस्"</string>
@@ -4482,6 +4519,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ट्याब्लेटको जाँच गर्न ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"यन्त्रको जाँच गर्न ट्याप गर्नुहोस्"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"समय, सूचना र अन्य जानकारी हेर्न आफ्नो यन्त्रको स्क्रिनमा ट्याप गर्नुहोस्।"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"आपत्‌कालीन सेवा"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"आपत्‌कालीन सेवा प्रयोग गर्नुहोस्"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> ले व्यवस्थापन गरेको"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"आपत्‌कालीन स्थितिमा पावर बटन फटाफट ५ वा सोभन्दा बढी पटक थिचेर तल दिइएका कारबाही थाल्नुहोस्"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"काउन्टडाउन अलार्म बजाइयोस्"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"मद्दतका लागि सूचित गर्नुअघि ठुलो ध्वनि बजाइयोस्"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"मद्दत प्राप्त गर्न कल गरियोस्"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"आपत्‌कालीन अवस्थामा मद्दत प्राप्त गर्न कल गर्नु पर्ने नम्बर"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>। यो नम्बर परिवर्तन गर्न ट्याप गर्नुहोस्"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"तपाईंले आपत्‌कालीन नम्बरबाहेकका नम्बर हाल्नुभयो भने:\n • तपाईंको यन्त्र अनलक गरिएको छ भने मात्र आपत्‌कालीन सेवा प्रयोग गर्न मिल्छ\n • तपाईंको कल नउठ्न सक्छ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"सूचनाहरू प्राप्त गर्न फिंगरप्रिन्ट स्वाइप गर्नुहोस्"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"फिंगरप्रिन्ट स्वाइप गर्नु"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"अफ्ना सूचनाहरूको जाँच गर्न आफ्नो फोनको पछाडिको भागमा रहेको फिंगरप्रिन्ट सेन्सरमा तलतिर स्वाइप गर्नुहोस्।"</string>
@@ -4607,6 +4654,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"देख्न सकिने डेटासेटहरूको सङ्ख्या अधिकतम पार्नुहोस्"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"पूर्वनिर्धारित मानहरूमा रिसेट गर्नुहोस्"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"स्वतः भरणसम्बन्धी विकासकर्ताका विकल्पहरू रिसेट गरिएको छ"</string>
+    <string name="location_category" msgid="3496759112306219062">"स्थान"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"स्ट्याटस बारमा रहेको स्थानसम्बन्धी जानकारी दिने सूचक"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"नेटवर्क र कनेक्टिभिटीसहित सबै स्थानहरूको जानकारी देखाइयोस्"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"पूर्ण GNSS मापनहरू बलपूर्वक लागू गर्नुहोस्"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"कुनै उपयोगिता अनुपात बिना नै सबै GNSS कन्स्टेलेसन तथा फ्रिक्वेन्सीहरूलाई ट्र्याक गर्नुहोस्"</string>
     <string name="device_theme" msgid="5027604586494772471">"यन्त्रको विषयवस्तु"</string>
     <string name="default_theme" msgid="4815428567082263639">"पूर्वनिर्धारित"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"नेटवर्कको नाम"</string>
@@ -4623,8 +4675,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"केन्द्रित रहन सूचनाहरू पज गर्नुहोस्"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"सुविधा उपलब्ध छैन"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"यो सुविधाले तपाईंको फोन ढिलो बनाउने हुनाले यसलाई निष्क्रिय पारिएको छ"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"पूर्ण GNSS मापनहरू बलपूर्वक लागू गर्नुहोस्"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"कुनै उपयोगिता अनुपात बिना नै सबै GNSS कन्स्टेलेसन तथा फ्रिक्वेन्सीहरूलाई ट्र्याक गर्नुहोस्"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"सधैँ क्र्याससम्बन्धी संवाद देखाउनुस्"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"प्रत्येकपटक एप क्र्यास हुँदा संवाद देखाउनुहोस्‌"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"कोण सक्षम पारिएको एप चयन गर्नुहोस्"</string>
@@ -4636,7 +4686,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"सबै अनुप्रयोगहरूका हकमा सक्षम पार्नुहोस्"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ग्राफिक्स ड्राइभर चयन गर्नुहोस्"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"पूर्वनिर्धारित"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"गेम ड्राइभर"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"गेम ड्राइभर"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"विकासकर्ताको ड्राइभर"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"प्रणालीको ग्राफिक्स ड्राइभर"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4742,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"सक्रिय (म्युट)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"निष्क्रिय"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"नेटवर्कको विवरण"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"तपाईंको फोनमा रहेका एपहरूले तपाईंको यन्त्रको नाम देख्न सक्छन्। तपाईंले ब्लुटुथ यन्त्रहरूमा जडान गर्दा वा कुनै Wi-Fi हटस्पट सेटअप गर्दा अरू मान्छेहरू पनि यसलाई देख्न सक्छन्।"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"तपाईंको फोनमा रहेका एपको प्रयोग गरी तपाईंको यन्त्रको नाम हेर्न सकिन्छ। तपाईंले ब्लुटुथ चल्ने यन्त्रमा कनेक्ट गर्दा, कुनै Wi-Fi नेटवर्कमा कनेक्ट गर्दा वा कुनै Wi-Fi हटस्पट सेटअप गर्दा अरू मान्छेहरू पनि यसलाई देख्न सक्छन्।"</string>
     <string name="devices_title" msgid="649715719278562515">"यन्त्रहरू"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"सबै सेटिङहरू"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"सुझावहरू"</string>
@@ -4705,6 +4755,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"नेटवर्कहरू फेला पार्न सकिएन। फेरि प्रयास गर्नुहोस्।"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(निषेध गरिएको)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM कार्ड छैन"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM कार्ड छैन"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"SIM कार्डसम्बन्धी कुनै पनि जानकारी दिइएको छैन"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"कनेक्ट गर्न SIM कार्ड चाहिन्छ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"कनेक्ट गर्न <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> को SIM कार्ड चाहिन्छ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"रुचाइएको नेटवर्क मोड: WCDMA रुचाइएको"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"रुचाइएको नेटवर्क मोड: GSM मात्र"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"रुचाइएको नेटवर्क मोड: WCDMA मात्र"</string>
@@ -4758,6 +4813,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"मोबाइल डेटा"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"मोबाइल नेटवर्क प्रयोग गरी डेटामाथि पहुँच राख्नुहोस्"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"फोन दायरामा हुँदा यस सेवा प्रदायकमा स्वत: स्विच हुने छ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"कुनै पनि SIM कार्ड उपलब्ध छैन"</string>
     <string name="calls_preference" msgid="2166481296066890129">"कलसम्बन्धी प्राथमिकता"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS सम्बन्धी प्राथमिकता"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"प्रत्येक पटक सोध्नुहोस्"</string>
@@ -4818,6 +4874,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> मा जडान हुँदा उपलब्ध छैन"</string>
     <string name="see_more" msgid="7499355691042812723">"थप हेर्नुहोस्"</string>
     <string name="see_less" msgid="2642392725363552793">"कम हेर्नुहोस्"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> सक्रिय गर्ने हो?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM सक्रिय गर्ने हो?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"सेवा प्रदायक बदलेर <xliff:g id="CARRIER_NAME">%1$s</xliff:g> पार्ने हो?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"यो SIM बदलेर प्रयोग भइरहेको SIM प्रयोग गर्ने हो?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"एक पटकमा एउटा SIM मात्र सक्रिय हुन सक्छ।\n\nयसलाई बदलेर <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> बनाउँदा तपाईंको <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> को सेवा रद्द हुँदैन।"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"एक पटकमा, डाउनलोड गरिएको एउटा SIM मात्र सक्रिय हुन सक्छ।\n\nयसलाई बदलेर <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> बनाउँदा तपाईंको <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> को सेवा रद्द हुँदैन।"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"एक पटकमा एउटा SIM मात्र सक्रिय हुन सक्छ।\n\nSIM बदल्दा तपाईंको <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> को सेवा रद्द हुने छैन।"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"सेवा प्रदायक बदलेर <xliff:g id="CARRIER_NAME">%1$s</xliff:g> पार्नुहोस्"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"नेटवर्कमा जोडिँदै…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"सेवा प्रदायक बदलेर <xliff:g id="CARRIER_NAME">%1$s</xliff:g> पारिँदै"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"सेवा प्रदायक बदल्न सकिएन"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"कुनै त्रुटि भएकाले यो सेवा प्रदायक बदल्न सकिएन।"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> अफ गर्ने हो?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM अफ गर्ने हो?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM अफ गरिँदै<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"मोबाइल नेटवर्क अफ गर्न सकिएन"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"केही चिज गडबड भयो र तपाईंको मोबाइल सेवा प्रदायक असक्षम पार्न सकिएन।"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"दुईवटै SIM प्रयोग गर्ने हो?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"यो यन्त्रमा एकैसाथ २ वटा SIM सक्रिय गर्न सकिन्छ। एक पटकमा एउटा मात्र SIM प्रयोग गर्ने क्रम जारी राख्न \"पर्दैन, धन्यवाद\" मा ट्याप गर्नुहोस्।"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"यन्त्र रिस्टार्ट गर्ने हो?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"सुरु गर्न आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्। त्यसपछि तपाईं अर्को SIM हाल्न सक्नुहुन्छ।"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"जारी राख्नुहोस्"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"रिस्टार्ट गर्नुहोस्"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"पर्दैन, धन्यवाद"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"बदल्नुहोस्"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM सक्रिय गर्न सकिएन"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM बाहिर झिकेर फेरि हाल्नुहोस्। अझै समस्या रहिरह्यो भने आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्।"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"फेरि SIM सक्रिय गरी हेर्नुहोस्। अझै समस्या रहिरह्यो भने आफ्नो यन्त्र रिस्टार्ट गर्नुहोस्।"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"नेटवर्क सक्रिय गर्ने प्रक्रिया"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> सक्रिय छ"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM का सेटिङ परिवर्तन गर्न ट्याप गर्नुहोस्"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM कार्ड"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"डाउनलोड गरिएको यो SIM मेटाउने हो?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"तपाईंले यो SIM मेटाउनुभयो भने यस यन्त्रबाट <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> सेवा हटाइने छ।\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> को सेवा भने रद्द गरिने छैन।"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"मेट्नुहोस्"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM मेटाइँदै…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM मेटाउन सकिएन"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"कुनै त्रुटि भएका कारण यो SIM मेटाउन सकिएन।\n\nआफ्नो यन्त्र रिस्टार्ट गर्नुहोस् र फेरि प्रयास गर्नुहोस्।"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"यन्त्रमा कनेक्ट गरियोस्"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> एप तपाईंको यन्त्रमा कनेक्ट हुन कुनै अस्थायी Wi‑Fi नेटवर्क प्रयोग गर्न चाहन्छ"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"कुनै पनि यन्त्र फेला परेन। यन्त्रहरू सक्रिय हुनुका साथै जडान गर्नका लागि उपलब्ध भएको कुरा सुनिश्चित गर्नुहोस्।"</string>
@@ -4889,6 +4983,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"आपताकालीन कल"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"तपाईंको सेवा प्रदायकले Wi‑Fi मार्फत आपत्‌कालीन कल गर्ने सुविधा समर्थन गदैन। \nअपतकालीन कल गर्नका लागि उक्त यन्त्रले स्वतः सेलुलर नेटवर्क प्रयोग गर्छ।\n सेलुलर नेटवर्कको कभरेज राम्रो भएका क्षेत्रमा मात्र अपतकालीन कल गर्न सम्भव हुन्छ।"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"कलको गुणस्तर सुधार्न Wi‑Fi प्रयोग गरी कल गर्नुहोस्"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"क्रस SIM कलिङ"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"यो SIM कार्ड प्रयोगमा हुँदा अर्को SIM कार्डबाट कल वा SMS हरू पठाउने र प्राप्त गर्ने अनुमति दिनुहोस्।"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"क्रस SIM कलिङ"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"आगमन MMS सन्देश"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS सन्देश पठाउन सकिएन"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"मोबाइल डेटा निष्क्रिय हुँदा <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> लाई MMS सन्देश पठाउने अनुमति दिन ट्याप गर्नुहोस्"</string>
@@ -4940,10 +5037,50 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"सेटिङका स्क्रिनको माथिपट्टि देखिन दिनुहोस्"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"अन्य एपको माथिपट्टि देखिन सक्ने एपहरूलाई सेटिङका स्क्रिनको माथिपट्टि देखिन दिनुहोस्"</string>
     <string name="media_controls_title" msgid="403271085636252597">"मिडिया"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"मिडियाको सत्र सकिएपछि प्लेयर लुकाउनुहोस्"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"प्लेयरले तपाईंलाई विस्तृत गरिएको द्रुत सेटिङको प्यानलबाट कुनै सत्र सुचारु गर्न दिन्छ।"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"द्रुत सेटिङमा मिडिया प्लेयर"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"सजिलैसँग प्लेब्याक सुचारु गर्न मिडिया प्लेयर लामो अवधिसम्म देखाउनुहोस्"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"प्लेयर लुकाउनुहोस्"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"प्लेयर देखाउनुहोस्"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"कुनै पनि प्लेयर उपलब्ध छैन"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"अनुमति दिइएका एपहरू"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"मिडिया"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ब्लुटुथ अन हुने छ"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"अन"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"अफ"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"इन्टरनेट"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"हवाइजहाजका सुरक्षित नेटवर्कहरू"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"हवाइजहाजका सुरक्षित नेटवर्कहरू फेला पार्नुहोस् र तिनमा कनेक्ट गर्नुहोस्"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"हवाइजहाज, हवाइजहाजका सुरक्षित नेटवर्क"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"कल तथा SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi कलिङ"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi-Fi नेटवर्क जस्ता SIM रहित नेटवर्कमार्फत कल गर्नुहोस् र कल प्राप्त गर्नुहोस्"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"तपाईं Wi-Fi कलिङ सुविधा प्रयोग गरी केही Wi-Fi नेटवर्क जस्ता SIM रहित नेटवर्कमार्फत कल गर्न र कल प्राप्त गर्न सक्नुहुन्छ।"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"कलहरू"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"यो SIM कार्ड प्रयोग गरियोस्"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"यो SIM कार्ड कल गर्न प्रयोग गरियोस्"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"यो SIM कार्ड SMS पठाउन प्रयोग गरियोस्"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"उपलब्ध छैन"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM कार्ड छैन"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"प्राथमिकताहरू"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"सार्वजनिक Wi-Fi नेटवर्कमा कनेक्ट गरियोस्"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"नेटवर्क कनेक्सन, इन्टरनेट, वायरलेस, डेटा, wifi, wi-fi, wi fi, सेलुलर, मोबाइल, सेल सेवा प्रदायक, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"हवाइजहाजमा सुरक्षित रूपमा प्रयोग गर्न सकिने नेटवर्कहरू हेर्नु…"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"हवाइजहाज मोड अफ गर्नुहोस्"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"बेडटाइम मोड अन हुँदा यो सुविधाले काम गर्दैन"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"सूचनाको प्राथमिकता रिसेट गर्ने कार्य पूरा भयो।"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"एपहरू"</string>
+    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <skip />
 </resources>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 4ce02ee..4eb0afd 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -27,6 +27,7 @@
     <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>
     <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->
     <color name="notification_importance_button_unselected">#5F6368</color>
+    <color name="notification_history_background">#202124</color>
     <color name="face_intro_outline">?android:attr/colorAccent</color>
     <!-- Palette list preference colors. -->
     <color name="palette_list_gradient_background">@android:color/black</color>
@@ -37,6 +38,7 @@
     <color name="palette_list_color_cyan">@color/palette_list_dark_mode_color_cyan</color>
     <color name="palette_list_color_blue">@color/palette_list_dark_mode_color_blue</color>
     <color name="palette_list_color_purple">@color/palette_list_dark_mode_color_purple</color>
+    <color name="palette_list_color_gray">@color/palette_list_dark_mode_color_gray</color>
     <color name="gestures_setting_background_color">@android:color/black</color>
 </resources>
 
diff --git a/res/values-night/themes_suw.xml b/res/values-night/themes_suw.xml
new file mode 100644
index 0000000..16aba76
--- /dev/null
+++ b/res/values-night/themes_suw.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 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.
+  -->
+
+<!-- SUW related themes -->
+<resources>
+    <!-- DayNight themes -->
+    <style name="GlifTheme.DayNight" parent="GlifTheme" />
+    <style name="GlifV2Theme.DayNight" parent="GlifV2Theme" />
+    <style name="GlifV3Theme.DayNight" parent="GlifV3Theme" />
+    <style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Transparent" />
+    <style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Transparent" />
+    <style name="SetupWizardTheme.DayNight.Transparent" parent="SetupWizardTheme.Transparent" />
+    <style name="SuwAlertDialogThemeCompat.DayNight" parent="SuwAlertDialogThemeCompat" />
+</resources>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index ab29678..766efc7 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Normaal"</item>
     <item msgid="6740026006576843477">"Lang"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kort"</item>
+    <item msgid="7397961711906421599">"Normaal"</item>
+    <item msgid="4079132024502041928">"Lang"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standaard"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Algemeen"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Alleen TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Algemeen"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 0a5a958..06d7c71 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Datum en tijd"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Datum en tijd instellen"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Datum, tijd, tijdzone en notaties instellen"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Netwerktijd gebruiken"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Netwerktijdzone gebruiken"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Tijd automatisch instellen"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Tijdzone automatisch instellen"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Standaardinstelling voor land gebruiken"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑uursnotatie"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-uurs klok gebruiken"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Profielinfo weergeven op vergrendelscherm"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Accounts"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Locatie"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Locatie gebruiken"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Locatie gebruiken"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Uit"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aan: <xliff:g id="COUNT_1">%1$d</xliff:g> apps hebben toegang tot de locatie</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Schermvergrendeling, ontgrendelen via gezichtsherkenning"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Schermvergrendeling, vingerafdruk"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Schermvergrendeling"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Ontgrendel je telefoon veilig met je gezicht en vingerafdruk"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Je kunt ook inloggen bij apps en betalingen bevestigen"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Ontgrendelen instellen met:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Ontgrendelen via gezichtsherkenning"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Telefoon ontgrendelen makkelijker maken"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Vingerafdruk"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Telefoon ontgrendelen in je broekzak"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Overslaan"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Volgende"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Gezicht toegevoegd"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Ontgrendelen via gezichtsherkenning instellen"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Ontgrendelen via gezichtsherkenning"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Gebruik je gezicht voor verificatie"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Starten"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Als de toegankelijkheidsfunctie \'Ontgrendelen via gezichtsherkenning\' is uitgeschakeld, werken sommige instelstappen mogelijk niet goed met TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Terug"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Doorgaan met instellen"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Toegankelijkheidsinst. gebruiken"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Altijd bevestigingsstap vereisen bij ontgrendelen via gezichtsherkenning in apps"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Gezichtsinformatie verwijderen"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Ontgr. via gezichtsherkenning instellen"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Gebruik \'Ontgrendelen via gezichtsherkenning\' om je apparaat te ontgrendelen, in te loggen bij apps en betalingen te bevestigen.\n\nLet op:\nAls je naar de telefoon kijkt, kun je deze onbedoeld ontgrendelen.\n\nJe telefoon kan door iemand anders worden ontgrendeld als de telefoon voor je gezicht wordt gehouden.\n\nJe telefoon kan worden ontgrendeld door iemand die veel op je lijkt, zoals een identieke tweelingbroer of -zus."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Gebruik \'Ontgrendelen via gezichtsherkenning\' om je apparaat te ontgrendelen, bij apps in te loggen en betalingen te bevestigen.\n\nHoud rekening met het volgende:\nAls je naar de telefoon kijkt, kun je deze onbedoeld ontgrendelen.\n\nJe telefoon kan door iemand anders worden ontgrendeld als de telefoon voor je gezicht wordt gehouden, zelfs als je je ogen dicht hebt.\n\nJe telefoon kan worden ontgrendeld door iemand die veel op je lijkt, zoals een identieke tweelingbroer of -zus."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Gebruik ontgrendelen via gezichtsherkenning om je apparaat te ontgrendelen, in te loggen bij apps en betalingen te bevestigen."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Let op:\nAls je naar de telefoon kijkt, kun je deze onbedoeld ontgrendelen.\n\nJe telefoon kan door iemand anders worden ontgrendeld als de telefoon voor je gezicht wordt gehouden.\n\nJe telefoon kan worden ontgrendeld door iemand die veel op je lijkt, zoals een identieke tweelingbroer of -zus."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Let op:\nAls je naar de telefoon kijkt, kun je deze onbedoeld ontgrendelen.\n\nJe telefoon kan door iemand anders worden ontgrendeld als de telefoon voor je gezicht wordt gehouden, zelfs als je je ogen dicht hebt.\n\nJe telefoon kan worden ontgrendeld door iemand die veel op je lijkt, zoals een identieke tweelingbroer of -zus."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Gezichtsinformatie verwijderen?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"De gezichtsinformatie die wordt gebruikt voor ontgrendelen via gezichtsherkenning, wordt definitief en op een veilige manier verwijderd. Nadat deze is verwijderd, heb je je pincode, patroon of wachtwoord nodig om je telefoon te ontgrendelen, in te loggen bij apps of betalingen te bevestigen."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Ontgrendel je telefoon via gezichtsherkenning"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gebruik je vingerafdruk om je telefoon te ontgrendelen of aankopen goed te keuren.\n\nOpmerking: Je kunt je vingerafdruk niet gebruiken om dit apparaat te ontgrendelen. Neem contact op met de beheerder van je organisatie voor meer informatie."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gebruik je vingerafdruk om je telefoon te ontgrendelen of aankopen goed te keuren.\n\nOpmerking: Je vingerafdruk is mogelijk minder veilig dan een sterk patroon of sterke pincode."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Annuleren"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nee"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Doorgaan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Overslaan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Volgende"</string>
@@ -418,7 +432,7 @@
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="6027141901007342389">"Verwijderen"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="7391368057800077604">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="5010227772754175346">"Plaats je vinger op de sensor en til deze op nadat je een trilling hebt gevoeld."</string>
-    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Til op en raak opnieuw aan"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_title" msgid="9172202128243545021">"Raak de sensor aan"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="5382958363770893577">"Raak de sensor meerdere keren aan om de verschillende delen van je vingerafdruk toe te voegen."</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="3606325177406951457">"Vingerafdruk toegevoegd"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="8220458039597261933">"Als je dit icoon ziet, kun je je vingerafdruk gebruiken voor identificatie of om een aankoop goed te keuren."</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Als je je tablet beveiligt met een schermvergrendelingsoptie, kan niemand de tablet gebruiken in geval van verlies of diefstal. Je hebt ook een schermvergrendelingsoptie nodig om ontgrendelen via gezichtsherkenning in te stellen. Tik op Annuleren om terug te gaan."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Als je je apparaat beveiligt met een schermvergrendelingsoptie, kan niemand het apparaat gebruiken in geval van verlies of diefstal. Je hebt ook een schermvergrendelingsoptie nodig om ontgrendelen via gezichtsherkenning in te stellen. Tik op Annuleren om terug te gaan."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Als je je telefoon beveiligt met een schermvergrendelingsoptie, kan niemand de telefoon gebruiken in geval van verlies of diefstal. Je hebt ook een schermvergrendelingsoptie nodig om ontgrendelen via gezichtsherkenning in te stellen. Tik op Annuleren om terug te gaan."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Als je je tablet beveiligt met een schermvergrendelingsoptie, kan niemand de tablet gebruiken in geval van verlies of diefstal. Je hebt ook een optie voor schermvergrendeling nodig om biometrische systemen in te stellen. Tik op Annuleren om terug te gaan."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Als je je apparaat beveiligt met een schermvergrendelingsoptie, kan niemand het apparaat gebruiken in geval van verlies of diefstal. Je hebt ook een optie voor schermvergrendeling nodig om biometrische systemen in te stellen. Tik op Annuleren om terug te gaan."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Als je je telefoon beveiligt met een schermvergrendelingsoptie, kan niemand de telefoon gebruiken in geval van verlies of diefstal. Je hebt ook een optie voor schermvergrendeling nodig om biometrische systemen in te stellen. Tik op Annuleren om terug te gaan."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Instellen pincode overslaan?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Instellen van wachtwoord overslaan?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Instellen patroon overslaan?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze tablet zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen dit apparaat zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Stel apparaatbeschermingsfuncties in om te voorkomen dat anderen deze telefoon zonder je toestemming gebruiken. Kies de schermvergrendeling die je wilt gebruiken."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Kies je back-upmethode voor schermvergrendeling"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Kies je back-upmethode voor schermvergrendeling"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Kies je back-upmethode voor schermvergrendeling"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Schermvergrendelingsopties"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Schermvergrendelingsopties"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Schermvergrendeling"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Ontgrendelen via gezichtsherkenning + wachtwoord"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Doorgaan zonder ontgrendelen via gezichtsherkenning"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Je kunt je telefoon ontgrendelen met je gezicht. Uit beveiligingsoverwegingen is voor deze optie een extra schermvergrendeling vereist."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrische systemen + patroon"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrische systemen + pincode"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrische systemen + wachtwoord"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Doorgaan zonder biometrische systemen"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Je kunt je telefoon ontgrendelen met je biometrische gegevens. Uit beveiligingsoverwegingen is voor deze optie een extra schermvergrendeling vereist."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Uitgeschakeld door beheerder, versleutelingsbeleid of opslag certificaatgegevens"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swipen"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Moet minder dan <xliff:g id="NUMBER_0">%d</xliff:g> cijfer bevatten</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Apparaatbeheer staat het gebruik van een recente pincode niet toe"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Veelvoorkomende pincodes worden geblokkeerd door je IT-beheerder. Probeer een andere pincode."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Mag geen ongeldig teken bevatten"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Moet ten minste één letter bevatten"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Moet ten minste één cijfer bevatten"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Moet ten minste 1 niet-numeriek teken bevatten</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Apparaatbeheer staat het gebruik van een recent wachtwoord niet toe"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Veelvoorkomende wachtwoorden worden geblokkeerd door je IT-beheerder. Probeer een ander wachtwoord."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Een oplopende, aflopende of herhaalde reeks cijfers is niet toegestaan"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bevestigen"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Annuleren"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wifi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wifi inschakelen"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wifi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wifi gebruiken"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wifi gebruiken"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wifi-instellingen"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wifi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Draadloze toegangspunten instellen en beheren"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centreer de onderstaande QR-code om verbinding te maken met \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Maak verbinding met wifi door een QR-code te scannen"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wifi delen"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scan deze QR-code om verbinding te maken met \'<xliff:g id="SSID">%1$s</xliff:g>\' en het wachtwoord te delen"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scan deze QR-code met een ander apparaat om deel te nemen aan \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scan deze QR-code om verbinding te maken met \'<xliff:g id="SSID">%1$s</xliff:g>\'"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Probeer het nog eens. Als het probleem zich blijft voordoen, neem je contact op met de fabrikant van het apparaat."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Er is iets misgegaan"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wifi-wachtwoord: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Wachtwoord hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatisch verbinding maken"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Toestaan dat telefoon automatisch verbinding maakt met dit netwerk"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Toestaan dat tablet automatisch verbinding maakt met dit netwerk"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Verbinding met dit netwerk toestaan indien binnen bereik"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Apparaat toevoegen"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Gebruik een QR-code om een apparaat aan dit netwerk toe te voegen"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-code heeft geen geldige indeling"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Systeemcertificaten gebruiken"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Niet leveren"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Niet valideren"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Geen certificaat opgegeven. Je verbinding is niet privé."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Netwerknaam is te lang."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Je moet een domein opgeven."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificaat vereist."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Verbinden"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wifi ingeschakeld"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Verbonden met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Verbinding maken met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Verbinden…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Kan geen verbinding maken met het netwerk"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Netwerk is niet binnen bereik"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-adres van apparaat"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Willekeurig MAC-adres"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Willekeurig herschikt MAC-adres (laatst gebruikt)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-adres"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Netwerkgegevens"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnetmasker"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-adressen"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Opgeslagen netwerken"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abonnementen"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Andere netwerken"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP-instellingen"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Geavanceerde wifi-instellingen zijn niet beschikbaar voor deze gebruiker"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Opslaan"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Voer een geldig gateway-adres in."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Voer een geldig DNS-adres in."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Typ een netwerkprefix van 0-32 tekens."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (tenzij overschreven door privé-DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (tenzij overschreven door privé-DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lengte van netwerkprefix"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wifi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"App deelt content. Als je de internetverbinding wilt delen, schakel je de hotspot uit en weer in."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Geen wachtwoord ingesteld"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Naam hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> inschakelen..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> inschakelen…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Andere apparaten kunnen verbinding maken met <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Wachtwoord hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Frequentieband voor toegangspunt"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Hiermee wordt de vernieuwingssnelheid automatisch verhoogd van 60 naar 90 Hz voor bepaalde content. Het batterijgebruik neemt toe."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Vernieuwingssnelheid van 90 Hz afdwingen"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"De hoogste vernieuwingssnelheid voor verbeterde responsiviteit voor aanraking en animatiekwaliteit. Het batterijgebruik neemt toe."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Schermaandacht"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aan / Scherm schakelt niet uit als je ernaar kijkt"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Als het scherm donker is, wordt het ingeschakeld bij nieuwe meldingen"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Altijd tijd en info weergeven"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Hoger batterijgebruik"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Vetgedrukte tekst"</string>
     <string name="title_font_size" msgid="570613010306330622">"Lettergrootte"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Tekst groter of kleiner maken"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Instellingen simkaartvergrendeling"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-versie"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android-beveiligingsupdate"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model en hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardwareversie"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Apparatuur-ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN verwijderen"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nieuwe APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Opslaan"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Weggooien"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Annuleren"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Het veld \'Naam\' mag niet leeg zijn."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"De APN mag niet leeg zijn."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Apps kunnen worden gereset"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wifi, mobiel en bluetooth resetten"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Hiermee worden alle netwerkinstellingen gereset, waaronder:\n\n"<li>"wifi"</li>\n<li>"mobiele data"</li>\n<li>"bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Wissen"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Gedownloade simkaarten wissen"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Neem contact op met je provider als je vervangende simkaarten wilt downloaden. Hiermee worden geen mobiele abonnementen opgezegd."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Hiermee zeg je geen mobiele abonnementen op. Neem contact op met je provider als je vervangende simkaarten wilt downloaden."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Instellingen resetten"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Alle netwerkinstellingen resetten? Je kunt deze actie niet ongedaan maken."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Alle netwerkinstellingen resetten en gedownloade simkaarten wissen? Je kunt deze actie niet ongedaan maken."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Netwerkinstellingen zijn gereset"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Kan simkaarten niet wissen"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Door een fout kunnen gedownloade simkaarten niet worden gewist.\n\nStart je apparaat opnieuw en probeer het nogmaals."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je tablet gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je telefoon gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Je bent momenteel aangemeld bij de volgende accounts:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Er zijn andere gebruikers aanwezig op dit apparaat.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muziek"</li>\n<li>"Foto\'s"</li>\n<li>"Andere gebruikersgegevens"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"E-simkaarten"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Je mobiele abonnement wordt niet opgezegd."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Alle gegevens wissen (fabrieksinstellingen terugzetten)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je tablet gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Hiermee worden alle gegevens in de "<b>"interne opslag"</b>" van je telefoon gewist, waaronder:\n\n"<li>"Je Google-account"</li>\n<li>"Gegevens en instellingen van het systeem en de apps"</li>\n<li>"Gedownloade apps"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Je bent momenteel ingelogd op de volgende accounts:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Er zijn andere gebruikers aanwezig op dit apparaat.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muziek"</li>\n<li>"Foto\'s"</li>\n<li>"Andere gebruikersgegevens"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"E-simkaarten"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Je mobiele abonnement wordt niet opgezegd."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"USB-opslag"</b>" worden gewist."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Als je muziek, foto\'s en andere gebruikersgegevens wilt wissen, moet de "<b>"SD-kaart"</b>" worden gewist."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB-opslag wissen"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD-kaart wissen"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Alle gegevens in de interne USB-opslag wissen, zoals muziek en foto\'s"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Alle gegevens op de SD-kaart wissen, zoals muziek en foto\'s"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Alle gegevens wissen"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Alle gegevens wissen"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Al je persoonlijke gegevens en gedownloade apps worden verwijderd. Je kunt deze actie niet ongedaan maken."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Al je persoonlijke informatie wordt verwijderd, inclusief gedownloade apps en simkaarten. Je kunt deze actie niet ongedaan maken."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Alles wissen"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Niet gereset, omdat de service \'Systeem wissen\' niet beschikbaar is."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Alle gegevens wissen?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Terugzetten op fabrieksinstellingen is niet beschikbaar voor deze gebruiker"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Wissen"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Even geduld..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Alle gegevens wissen"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Alle gegevens wissen"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Al je persoonlijke informatie en gedownloade apps worden verwijderd. Je kunt deze actie niet ongedaan maken."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Al je persoonlijke informatie wordt verwijderd, waaronder gedownloade apps en simkaarten. Je kunt deze actie niet ongedaan maken."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Alle gegevens wissen?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Fabrieksinstellingen terugzetten is niet beschikbaar voor deze gebruiker"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Wissen"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Even geduld…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Gespreksinstellingen"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Voicemail, gesprekken doorschakelen, wisselgesprek, beller-ID instellen"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-tethering"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Kan niet meer dan <xliff:g id="MAXCONNECTION">%1$d</xliff:g> apparaten tetheren."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Tethering van <xliff:g id="DEVICE_NAME">%1$s</xliff:g> wordt opgeheven."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Internetverbinding van telefoon delen via USB-ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Internetverbinding van deze telefoon delen via ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Gebruik hotspot en tethering om internet aan andere apparaten te leveren via je mobiele dataverbinding. Apps kunnen ook hotspots maken om content te delen met apparaten in de buurt."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Gebruik hotspot en tethering om internet aan andere apparaten te leveren via je wifi- of mobiele dataverbinding. Apps kunnen ook hotspots maken om content te delen met apparaten in de buurt."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hulp"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-scannen"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Apps en services toestaan altijd te scannen naar apparaten in de buurt, zelfs als bluetooth is uitgeschakeld. Dit kan worden gebruikt om bijvoorbeeld locatiegebaseerde functies en services te verbeteren."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Locatieservices voor het werk"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Tijdzonedetectie op basis van locatie"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Tijdzonedetectie op basis van locatie"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Hiermee kan de locatie van het apparaat worden gebruikt om de huidige tijdzone te bepalen. Andere locatie-instellingen, zoals wifi-scannen, kunnen van invloed zijn op de nauwkeurigheid van de tijdzonedetectie."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aan"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Uit"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatische tijdzonedetectie is uitgeschakeld"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Tijdzonedetectie op basis van locatie is uitgeschakeld"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Tijdzonedetectie op basis van locatie wordt niet ondersteund"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Wijzigingen in tijdzonedetectie op basis van locatie zijn niet toegestaan"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wifi en mobiele netwerklocatie"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Apps toestaan de locatieservice van Google te gebruiken om je locatie sneller te schatten. Anonieme locatiegegevens worden verzameld en verzonden naar Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Locatie bepaald via wifi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Stel wachtwoord in voor ontgrendelen via gezichtsherkenning"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Stel patroon in voor ontgrendelen via gezichtsherkenning"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Stel pincode in voor ontgrendelen via gezichtsherkenning"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Wachtwoord instellen voor biometrie"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Patroon instellen voor biometrie"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Pincode instellen voor biometrie"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Je wachtwoord vergeten?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Je patroon vergeten?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Je pincode vergeten?"</string>
@@ -2101,7 +2130,7 @@
     <string name="accessibility_settings" msgid="4713215774904704682">"Toegankelijkheid"</string>
     <string name="accessibility_settings_title" msgid="6739115703615065716">"Instellingen voor toegankelijkheid"</string>
     <string name="accessibility_settings_summary" msgid="2195085206729325737">"Schermlezers, weergave, interactieopties"</string>
-    <string name="vision_settings_title" msgid="8919983801864103069">"Optische instellingen"</string>
+    <string name="vision_settings_title" msgid="8919983801864103069">"Visuele instellingen"</string>
     <string name="vision_settings_description" msgid="7614894785054441991">"Je kunt dit apparaat aanpassen aan je behoeften. Deze toegankelijkheidsfuncties kunnen later worden gewijzigd in Instellingen."</string>
     <string name="vision_settings_suggestion_title" msgid="4689275412658803919">"Lettergrootte wijzigen"</string>
     <string name="screen_reader_category_title" msgid="6195867428854871553">"Schermlezers"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Voorkeuren voor ondertiteling"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Vergroting"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Vergrotingsgebied"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Vergroting inschakelen"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Kies de vergrotingsgebieden die je wilt gebruiken als je het scherm vergroot"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Volledig scherm"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Deel van het scherm"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Volledig scherm en deel van het scherm"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Gehele scherm vergroten"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Deel van het scherm vergroten"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Overschakelen naar knop Toegankelijkheid?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Als je drie keer tikken gebruikt om een deel van het scherm te vergroten, worden typen en andere acties vertraagd.\n\nWil je in plaats daarvan de knop Toegankelijkheid gebruiken om te vergroten?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Overschakelen naar knop Toegankelijkheid"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Drie keer tikken blijven gebruiken om te vergroten"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Instellingen voor vergroting"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Vergroten door 3 keer te tikken"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Vergroten met sneltoets"</string>
@@ -2145,18 +2177,18 @@
     <string name="accessibility_tutorial_dialog_message_volume" msgid="5033080515460519183">"Als je deze functie wilt gebruiken, houd je beide volumetoetsen ingedrukt."</string>
     <string name="accessibility_tutorial_dialog_message_triple" msgid="5219991116201165146">"Tik ergens op je scherm om de vergroting te starten of te stoppen."</string>
     <string name="accessibility_tutorial_dialog_message_gesture" msgid="4148062210755434854">"Als je deze functie wilt gebruiken, swipe je met twee vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met twee vingers omhoog en houd vast om tussen functies te schakelen."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_talkback" msgid="8142847782708562793">"Als je deze functie wilt gebruiken, swipe je met drie vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met drie vingers omhoog en houd vast om tussen functies te schakelen."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_talkback" msgid="8142847782708562793">"Als je deze functie wilt gebruiken, swipe je met 3 vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met 3 vingers omhoog en houd vast om tussen functies te schakelen."</string>
     <string name="accessibility_tutorial_dialog_message_gesture_settings" msgid="40769674586981429">"Als je een toegankelijkheidsfunctie wilt gebruiken, swipe je met twee vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met twee vingers omhoog en houd vast om tussen functies te schakelen."</string>
-    <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"Als je een toegankelijkheidsfunctie wilt gebruiken, swipe je met drie vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met drie vingers omhoog en houd vast om tussen functies te schakelen."</string>
+    <string name="accessibility_tutorial_dialog_message_gesture_settings_talkback" msgid="7292969929578621958">"Als je een toegankelijkheidsfunctie wilt gebruiken, swipe je met 3 vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met 3 vingers omhoog en houd vast om tussen functies te schakelen."</string>
     <string name="accessibility_tutorial_dialog_button" msgid="2031773187678948436">"OK"</string>
     <string name="accessibility_shortcut_title" msgid="8125867833704517463">"Snelkoppeling voor <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
     <string name="accessibility_shortcut_edit_summary_software" msgid="6405629977940618205">"Knop Toegankelijkheid"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software_gesture" msgid="8078659880723370597">"Met twee vingers omhoog swipen"</string>
-    <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Met drie vingers omhoog swipen"</string>
+    <string name="accessibility_shortcut_edit_dialog_title_software_gesture_talkback" msgid="7422753388389160524">"Met 3 vingers omhoog swipen"</string>
     <string name="accessibility_shortcut_edit_dialog_title_software" msgid="4796192466943479849">"Tik op de knop Toegankelijkheid"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software" msgid="5606196352833449600">"Tik op de knop Toegankelijkheid <xliff:g id="ACCESSIBILITY_ICON">%s</xliff:g> onderaan je scherm.\n\nTik op de knop Toegankelijkheid en houd vast om tussen functies te schakelen."</string>
     <string name="accessibility_shortcut_edit_dialog_summary_software_gesture" msgid="8292555254353761635">"Swipe met twee vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met twee vingers omhoog en houd vast om tussen functies te schakelen."</string>
-    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"Swipe met drie vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met drie vingers omhoog en houd vast om tussen functies te schakelen."</string>
+    <string name="accessibility_shortcut_edit_dialog_summary_software_gesture_talkback" msgid="84483464524360845">"Swipe met 3 vingers omhoog vanaf de onderkant van het scherm.\n\nSwipe met 3 vingers omhoog en houd vast om tussen functies te schakelen."</string>
     <string name="accessibility_shortcut_edit_dialog_title_hardware" msgid="2356853121810443026">"Volumetoetsen ingedrukt houden"</string>
     <string name="accessibility_shortcut_hardware_keyword" msgid="3921915304537166064">"volumetoetsen ingedrukt houden"</string>
     <string name="accessibility_shortcut_edit_dialog_summary_hardware" msgid="2503134386397991634">"Houd beide volumetoetsen ingedrukt"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Aan/uit-knop beëindigt gesprek"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Grote muisaanwijzer"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animaties verwijderen"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monogeluid"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kanalen combineren bij het afspelen van geluid"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Audiobalans"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Links"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Rechts"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monogeluid"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kanalen combineren bij het afspelen van geluid"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audiobalans"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Links"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Rechts"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Standaard"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 seconden"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 seconden"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Trilling bij melding"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Trilling bij bellen"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Tikfeedback"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> gebruiken"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> openen"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Kleurcorrectie gebruiken"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Ondertiteling weergeven"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Alleen voor ondersteunde apps"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> gebruiken"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> openen"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Kleurcorrectie gebruiken"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Ondertiteling weergeven"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Alleen voor ondersteunde apps"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Grootte en stijl van ondertiteling"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tekstgrootte <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Meer opties"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grijstinten"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rood-groen"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rood-groen"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Blauw-geel"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Achtergrondbeperking"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Toestaan dat de app wordt uitgevoerd op de achtergrond"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"App mag niet worden uitgevoerd op de achtergrond"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Achtergrondgebruik kan niet worden beperkt"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Achtergrondgebruik kan niet worden beperkt"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Achtergrondactiviteit beperken?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Als je de achtergrondactiviteit voor een app beperkt, functioneert de app mogelijk niet meer correct"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Batterijoptimalisatie is niet ingesteld voor deze app. Je kunt de app dus niet beperken.\n\nSchakel eerst batterijoptimalisatie in als je de app wilt beperken."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet heeft meer verbruikt dan normaal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Apparaat heeft meer verbruikt dan normaal"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Batterij is mogelijk eerder leeg dan normaal"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimaliseren voor batterijduur"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batterij tijdelijk beperkt. Tik voor meer informatie."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Je telefoon is vaker gebruikt dan normaal. De batterij is mogelijk eerder leeg dan verwacht.\n\nTop-apps op basis van batterijgebruik:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Je tablet is vaker gebruikt dan normaal. De batterij is mogelijk eerder leeg dan verwacht.\n\nTop-apps op basis van batterijgebruik:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Je apparaat is vaker gebruikt dan normaal. De batterij is mogelijk eerder leeg dan verwacht.\n\nTop-apps op basis van batterijgebruik:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d app beperkt</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Probleem bij het lezen van je batterijmeter"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Probleem bij het lezen van je batterijmeter. Tik voor "<annotation id="url">"meer informatie"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"App stoppen?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Je telefoon kan de batterij niet normaal beheren omdat <xliff:g id="APP">%1$s</xliff:g> je telefoon ingeschakeld houdt.\n\nAls je dit probleem wilt verhelpen, kun je de app stoppen.\n\nAls dit blijft gebeuren, moet je de app mogelijk verwijderen om de prestaties van de batterij te verbeteren."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Je tablet kan de batterij niet normaal beheren omdat <xliff:g id="APP">%1$s</xliff:g> je tablet ingeschakeld houdt.\n\nAls je dit probleem wilt verhelpen, kun je de app stoppen.\n\nAls dit blijft gebeuren, moet je de app mogelijk verwijderen om de prestaties van de batterij te verbeteren."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Een planning instellen"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Gebruiksduur van de batterij verlengen"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Uitschakelen als opgeladen"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterijbesparing wordt uitgeschakeld als je telefoon <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterijbesparing wordt uitgeschakeld wanneer je tablet <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterijbesparing wordt uitgeschakeld wanneer je apparaat <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Batterijbesparing wordt uitgeschakeld als je telefoon meer dan <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Batterijbesparing wordt uitgeschakeld als je tablet meer dan <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Batterijbesparing wordt uitgeschakeld als je apparaat meer dan <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading heeft"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Inschakelen"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Resetten"</string>
     <string name="tts_play" msgid="2945513377250757221">"Afspelen"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptieve connectiviteit"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Verlengt de batterijduur en verbetert de prestaties van het apparaat door de netwerkverbindingen automatisch te beheren"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Opslag certificaatgegevens"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Een certificaat installeren"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Certificaten vanuit opslag installeren"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Inloggegevens van gebruiker"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Opgeslagen inloggegevens bekijken en aanpassen"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Geavanceerd"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Opslagtype"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Ondersteund door hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Alleen software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Er zijn geen inloggegevens beschikbaar voor deze gebruiker"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Geïnstalleerd voor VPN en apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Geïnstalleerd voor wifi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Niet installeren"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Toch installeren"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificaat niet geïnstalleerd"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Toestaan dat <xliff:g id="APP_NAME">%s</xliff:g> certificaten installeert op dit apparaat?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Met deze certificaten word je geïdentificeerd bij de onderstaande apps en URL\'s"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Niet toestaan"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Toestaan"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Meer weergeven"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App voor certificaatbeheer"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Geen"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Aan de hand van de certificaten die worden geïnstalleerd door deze app, word je geïdentificeerd bij de onderstaande apps en URL\'s"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Verwijderen"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Noodoproepsignaal"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Gedrag bij noodoproepen instellen"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Back-up"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Niet ingesteld - Werkprofiel"</string>
     <string name="user_admin" msgid="4024553191395768119">"Beheerder"</string>
     <string name="user_you" msgid="3070562015202859996">"Jij (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Bijnaam"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Je kunt maximaal <xliff:g id="USER_COUNT">%1$d</xliff:g> gebruikers toevoegen"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Alleen de eigenaar van de tablet kan gebruikers beheren."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Alleen de eigenaar van de telefoon kan gebruikers beheren."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Betalen bij de betaalautomaat"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Stel een betalings-app in. Houd de achterzijde van je telefoon tegen een terminal met het logo voor contactloos betalen."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ik snap het"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Meer…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Meer…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Standaard betaal-app instellen"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Standaard betaal-app updaten"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Bij een contactloze betaalautomaat betalen met <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Terug"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Volgende"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Voltooien"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Een foto maken"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Een afbeelding kiezen"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Foto selecteren"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Simkaarten"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Simkaarten"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Altijd gebruiken voor gesprekken"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecteer een simkaart voor gegevens"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecteer een simkaart voor sms"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Schakelen naar simkaart voor mobiele data, dit kan even duren…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Schakelen naar simkaart voor mobiele data, dit kan even duren…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Bellen met"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Een simkaart selecteren"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Simkaart <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, planning, batterijbesparing, energiebesparing, batterij, automatisch, procent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, geavanceerd bellen, bellen via 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"taal toevoegen, een taal toevoegen"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tekstgrootte"</string>
     <string name="default_sound" msgid="6604374495015245195">"Standaardgeluid"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume van ringtone en meldingen op <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, trillen, niet storen"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Opstartgeluiden"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live ondertiteling"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Media automatisch ondertitelen"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Geen"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> planningen ingesteld</item>
-      <item quantity="one">1 planning ingesteld</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Geen}=1{1 planning ingesteld}other{# planningen ingesteld}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Niet storen"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Alleen meldingen van belangrijke mensen en apps ontvangen"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Onderbrekingen beperken"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Alleen prioriteit"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Uit / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Uit"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aan"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Altijd vragen"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Totdat je uitschakelt"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> uur</item>
-      <item quantity="one">1 uur</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuten"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> planningen kunnen automatisch worden ingeschakeld</item>
-      <item quantity="one">1 planning kan automatisch worden ingeschakeld</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 uur}other{# uur}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuut}other{# minuten}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Uit}=1{Uit / 1 planning kan automatisch worden ingeschakeld}other{Uit / # planningen kunnen automatisch worden ingeschakeld}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Waardoor \'Niet storen\' mag worden onderbroken"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Mensen"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Meldingen met lagere prioriteit automatisch instellen op Subtiel"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Aanpasbare rangschikking van meldingen"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Meldingen automatisch rangschikken op relevantie"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Aanpasbare meldingsfeedback"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Aanpassingen aan meldingen aangeven en de optie weergeven om feedback te geven aan het systeem"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Belang van meldingen resetten"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Door de gebruiker gewijzigde instellingen voor belang resetten en de meldingenassistent toestaan om de prioriteit te bepalen"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Voorgestelde acties en antwoorden"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Voorgestelde acties en antwoorden automatisch weergeven"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Recente en gesnoozede meldingen weergeven"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioriteitsgesprekken"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Bovenaan het gespreksgedeelte weergeven als zwevende bubbels"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Bovenaan het gespreksgedeelte weergeven"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Andere gesprekken"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Niet-prioriteitsgesprekken"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Gesprekken waarin je wijzigingen hebt aangebracht"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Recente gesprekken"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Recente items wissen"</string>
+    <string name="clear" msgid="5092178335409471100">"Wissen"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prioriteitsgesprekken als bubbel weergeven"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriteitsgesprekken worden bovenaan het pull-downvenster weergegeven. Je kunt ook instellen dat ze als bubbels worden weergegeven en \'Niet storen\' onderbreken."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Prioriteitsgesprekken en gewijzigde gesprekken worden hier weergegeven"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Toegang tot \'Niet storen\'"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'Niet storen\' toestaan"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Er zijn geen geïnstalleerde apps die toegang tot \'Niet storen\' hebben aangevraagd"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Apps laden..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Apps laden…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Op jouw verzoek blokkeert Android de weergave van meldingen van deze app op dit apparaat"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Op jouw verzoek blokkeert Android de weergave van deze categorie meldingen op dit apparaat"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Op jouw verzoek blokkeert Android de weergave van deze groep meldingen op dit apparaat"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alle gesprekken"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriteitsgesprekken"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Geen"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> gesprekken</item>
-      <item quantity="one">1 gesprek</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Geen"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Geen}=1{1 gesprek}other{# gesprekken}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Wie mag onderbreken"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Oproepen"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Oproepen"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Zorg dat je apparaat niet in de stille modus staat, zodat je zeker weet dat het hoorbaar overgaat bij toegestane gesprekken"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Voor \'<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\' worden inkomende gesprekken geblokkeerd. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contacten met ster"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> anderen</item>
-      <item quantity="one">1 andere persoon</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Geen"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Geen}=1{{contact_1}}=2{{contact_1} en {contact_2}}=3{{contact_1}, {contact_2} en {contact_3}}other{{contact_1}, {contact_2} en nog # anderen}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Geen naam)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Berichten"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"berichten"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Berichten"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Voor \'<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\' worden inkomende berichten geblokkeerd. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Je ontvangt alle berichten"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Je ontvangt alle oproepen"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Geen"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacten</item>
-      <item quantity="one">1 contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Geen}=1{1 contact}other{# contacten}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Iedereen"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contacten"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contacten met ster"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alle meldingen"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Bepaalde meldingen"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Geselecteerde mensen kunnen je nog steeds bereiken, ook als je niet toestaat dat apps je onderbreken"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> mogen onderbreken</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> mag onderbreken</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"nog <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Geen apps mogen onderbreken}=1{{app_1} mag onderbreken}=2{{app_1} en {app_2} mogen onderbreken}=3{{app_1}, {app_2} en {app_3} mogen onderbreken}other{{app_1}, {app_2} en nog # mogen onderbreken}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alle meldingen"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Bepaalde meldingen"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Meldingen die mogen onderbreken"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Alle meldingen toestaan"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogen onderbreken</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> mag onderbreken</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Niets mag onderbreken"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"en nog <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Niets mag onderbreken}=1{{sound_category_1} mag onderbreken}=2{{sound_category_1} en {sound_category_2} mogen onderbreken}=3{{sound_category_1}, {sound_category_2} en {sound_category_3} mogen onderbreken}other{{sound_category_1}, {sound_category_2} en nog # mogen onderbreken}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Niets mag onderbreken"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Niemand mag onderbreken"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Bepaalde mensen mogen onderbreken"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alle mensen mogen onderbreken"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Aan"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Uit"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"App vastzetten"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Als je een app vastzet, kun je de huidige app blijven weergeven totdat je deze losmaakt. Je kunt deze functie bijvoorbeeld gebruiken om een vriend die je vertrouwt een specifieke game te laten spelen. \n\nAls een app is vastgezet, kan de vastgezette app mogelijk andere apps openen en zijn er misschien persoonlijke gegevens toegankelijk. \n\nEen app vastzetten: 	\n1.	Schakel \'App vastzetten\' in. 	\n2.	Open \'Overzicht\'. 	\n3.	Tik bovenaan het scherm op het app-icoon en daarna op \'Vastzetten\'."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Als je een app vastzet, kun je de huidige app in beeld houden totdat je deze weer losmaakt. Je kunt deze functie bijvoorbeeld gebruiken om een vriend die je vertrouwt, een specifieke game te laten spelen. \n\nAls een app is vastgezet, kan de vastgezette app mogelijk andere apps openen en zijn er misschien persoonlijke gegevens toegankelijk. \n\nAls je je apparaat op een veilige manier met iemand wilt delen, gebruik dan liever een gastgebruiker. \n\nEen app vastzetten: 	\n1.	Schakel \'App vastzetten\' in. 	\n2.	Open \'Overzicht\'. 	\n3.	Tik bovenaan het scherm op het app-icoon en daarna op \'Vastzetten\'."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Als je een app vastzet, kun je de huidige app in beeld houden totdat je deze losmaakt. Je kunt deze functie bijvoorbeeld gebruiken om een vriend die je vertrouwt, een specifieke game te laten spelen."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Als je een app hebt vastgezet, kan de vastgezette app mogelijk andere apps openen en zijn er misschien persoonsgegevens toegankelijk. \n\nZo zet je een app vast: 	\n1.	Schakel \'App vastzetten\' in. 	\n2.	Open Overzicht. 	\n3.	Tik bovenaan het scherm op het app-icoon en daarna op Vastzetten."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Als je een app hebt vastgezet, kan de vastgezette app mogelijk andere apps openen en zijn er misschien persoonsgegevens toegankelijk. \n\nAls je je apparaat beveiligd met iemand wilt delen, probeer je een gastgebruiker. \n\nZo zet je een app vast: 	\n1.	Schakel \'App vastzetten\' in. 	\n2.	Open Overzicht. 	\n3.	Tik bovenaan het scherm op het app-icoon en daarna op Vastzetten."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Als een app is vastgezet: \n\n•	 Persoonlijke gegevens kunnen toegankelijk zijn \n		(zoals contacten en e-mailcontent). \n•	 De vastgezette app kan mogelijk andere apps openen. \n\nGebruik deze functie alleen met mensen die je vertrouwt."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Vraag om ontgrendelingspatroon voor losmaken"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Vraag pin voor losmaken"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Naast het gebruik van je gezicht om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een pincode vereist is om het apparaat op te starten?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Naast het gebruik van je gezicht om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je patroon moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een patroon vereist is om het apparaat op te starten?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Naast het gebruik van je gezicht om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je wachtwoord moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten of meldingen (waaronder wekkers) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een wachtwoord vereist is om het apparaat op te starten?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Naast het gebruik van je biometrische gegevens om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten en meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd. Wil je instellen dat een pincode vereist is om het apparaat te starten?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Naast het gebruik van je biometrische gegevens om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je patroon moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten en meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd. Wil je instellen dat een patroon vereist is om het apparaat te starten?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Naast het gebruik van je biometrische gegevens om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je wachtwoord moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten gesprekken, berichten en meldingen (waaronder wekkers) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd. Wil je instellen dat een wachtwoord vereist is om het apparaat te starten?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nee"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Beperkt"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB beheerd door"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Verbonden apparaat"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Dit apparaat"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Overschakelen..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Overschakelen…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Kan niet schakelen"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Dit apparaat wordt opgeladen"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Verbonden apparaat wordt opgeladen"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Gebruik van mobiele data"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Datagebruik van app"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wifi-datagebruik"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Ander datagebruik dan door providers"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernetdatagebruik"</string>
     <string name="wifi" msgid="2932584495223243842">"Wifi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 beperking</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Het door de provider berekende dataverbruik kan afwijken van de berekening van het apparaat"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Sluit data uit die worden gebruikt door providernetwerken"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> gebruikt"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Datawaarschuwing instellen"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datawaarschuwing"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Details bekijken"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Databesparing"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Onbeperkte data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Achtergrondgegevens zijn uitgeschakeld"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Achtergrondgegevens zijn uitgeschakeld"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aan"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Uit"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Databesparing gebruiken"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Het typen van reacties of andere tekst in meldingen blokkeren als het apparaat is vergrendeld"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Standaard spellingcontrole"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Spellingcontrole kiezen"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Spellingcontrole gebruiken"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Spellingcontrole gebruiken"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Niet geselecteerd"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(geen)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Opslagbeheer verwijdert foto\'s en video\'s waarvan een back-up is gemaakt, van je apparaat om opslagruimte vrij te maken."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Foto\'s en video\'s verwijderen"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Opslagbeheer"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Opslagbeheer gebruiken"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Opslagbeheer gebruiken"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatisch"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Handmatig"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Nu ruimte vrijmaken"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dubbeltikken om telefoon te checken"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dubbeltikken om tablet te checken"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dubbeltikken om apparaat te checken"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swipen voor meldingen"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swipe omlaag op de onderste rand van het scherm om je meldingen te bekijken"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Bediening met één hand"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Bediening met één hand gebruiken"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Afsluiten bij schakelen tussen apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Time-out"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 seconden"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 seconden"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 seconden"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"bediening met één hand"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Dubbeltik op je scherm om de tijd, meldingen en andere informatie te bekijken."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Oppakken om telefoon te checken"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Oppakken om tablet te checken"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tik om tablet te controleren"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tik om apparaat te controleren"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Tik op je scherm om de tijd, meldingen en andere informatie te bekijken."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Nood-SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Nood-SOS gebruiken"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Beheerd door <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Start de onderstaande acties door snel 5 keer of vaker op de aan/uit-knop te drukken"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Aftelalarm afspelen"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Een hard geluid afspelen voordat de hulpdiensten worden gebeld"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Bellen voor hulp"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Nummer om te bellen voor hulp"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Tik om te wijzigen"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Als je een niet-alarmnummer opgeeft:\n • Je apparaat moet zijn ontgrendeld om nood-SOS te gebruiken\n • Je gesprek wordt misschien niet beantwoord"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Over vingerafdruksensor swipen voor meldingen"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Over vingerafdruk swipen"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Als je je meldingen wilt bekijken, swipe je omlaag over de vingerafdruksensor achter op je telefoon."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Max. zichtbare gegevenssets"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Resetten naar standaardwaarden"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Ontwikkelaarsopties voor automatisch invullen zijn gereset"</string>
+    <string name="location_category" msgid="3496759112306219062">"Locatie"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Locatie-indicator in statusbalk"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Tonen voor alle locaties, inclusief netwerk en connectiviteit"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Volledige GNSS-metingen afdwingen"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Alle GNSS-constellaties en -frequenties bijhouden zonder duty cycling"</string>
     <string name="device_theme" msgid="5027604586494772471">"Apparaatthema"</string>
     <string name="default_theme" msgid="4815428567082263639">"Standaard"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Netwerknaam"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Meldingen onderbreken om gefocust te blijven"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"De functie is niet beschikbaar"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Deze functie is uitgeschakeld omdat je telefoon erdoor wordt vertraagd"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Volledige GNSS-metingen afdwingen"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Alle GNSS-constellaties en -frequenties bijhouden zonder duty cycling"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Altijd een crashvenster weergeven"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Bij gecrashte apps altijd een venster weergeven"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"App met ANGLE-functionaliteit selecteren"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Inschakelen voor alle apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafisch stuurprogramma selecteren"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standaard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Stuurprogramma voor ontwikkelaars"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafisch stuurprogramma voor systeem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Aan (dempen)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Uit"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Netwerkgegevens"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"De naam van je apparaat is zichtbaar voor apps op je telefoon. De apparaatnaam kan ook door andere mensen worden gezien wanneer je verbinding maakt met Bluetooth-apparaten of een wifi-hotspot instelt."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Je apparaatnaam is zichtbaar voor apps op je telefoon. De apparaatnaam kan ook door andere mensen worden gezien als je verbinding maakt met bluetooth-apparaten of een wifi-netwerk, of als je een wifi-hotspot instelt."</string>
     <string name="devices_title" msgid="649715719278562515">"Apparaten"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Alle instellingen"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Suggesties"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Kan geen netwerken vinden. Probeer het opnieuw."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(niet toegestaan)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Geen simkaart"</string>
+    <string name="sim_card" msgid="6381158752066377709">"Simkaart"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Geen simkaart"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Geen"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Simkaart vereist voor verbinding"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Simkaart van <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> vereist voor verbinding"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Voorkeursnetwerkmodus: voorkeur voor WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Voorkeursnetwerkmodus: alleen GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Voorkeursnetwerkmodus: alleen WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobiele data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Datatoegang via mobiel netwerk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefoon schakelt automatisch over naar deze provider als deze binnen bereik is"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Geen simkaart beschikbaar"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Voorkeur voor gesprekken"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Sms-voorkeuren"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Altijd vragen"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Niet beschikbaar wanneer verbonden met <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Meer bekijken"</string>
     <string name="see_less" msgid="2642392725363552793">"Minder weergeven"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> inschakelen?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Simkaart inschakelen?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Overschakelen naar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Overschakelen naar simkaart gebruiken?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Er kan slechts 1 simkaart tegelijk actief zijn.\n\nAls je overschakelt naar <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, wordt de service van <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> niet geannuleerd."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Er kan slechts 1 gedownloade simkaart tegelijk actief zijn.\n\nAls je overschakelt naar <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, wordt de service van <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> niet geannuleerd."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Er kan slechts 1 simkaart tegelijk actief zijn.\n\nAls je overschakelt, wordt de service van <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> niet geannuleerd."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Overschakelen naar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Verbinding maken met netwerk…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Overschakelen naar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Kan provider niet wijzigen"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"De provider kan niet worden gewijzigd vanwege een fout."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> uitschakelen?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Simkaart uitschakelen?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Simkaart uitschakelen<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Kan provider niet uitschakelen"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Er is iets misgegaan. Je provider kan niet worden uitgeschakeld."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 simkaarten gebruiken?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Op dit apparaat kunnen 2 simkaarten tegelijk actief zijn. Tik op \'Nee, bedankt\' als je 1 simkaart tegelijk wilt blijven gebruiken."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Apparaat opnieuw opstarten?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Start je apparaat opnieuw op om aan de slag te gaan. Daarna kun je nog een simkaart toevoegen."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Doorgaan"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Opnieuw opstarten"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nee, bedankt"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Overschakelen"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kan simkaart niet activeren"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Verwijder de simkaart en plaats deze opnieuw. Als het probleem blijft optreden, start je het apparaat opnieuw op."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Probeer de simkaart weer in te schakelen. Als het probleem blijft optreden, start je het apparaat opnieuw op."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Netwerkactivering"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> is actief"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tik om de instellingen voor de simkaart te updaten"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Simkaart"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Deze gedownloade simkaart wissen?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Als deze simkaart wordt gewist, wordt de <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>-service van dit apparaat verwijderd.\n\nDe service voor <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> wordt niet geannuleerd."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Wissen"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Simkaart wissen…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Kan simkaart niet wissen"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Door een fout kan deze simkaart niet worden gewist.\n\nStart je apparaat opnieuw op en probeer het nogmaals."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Verbinding maken met apparaat"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"De app <xliff:g id="APPNAME">%1$s</xliff:g> wil een tijdelijk wifi-netwerk gebruiken om verbinding te maken met je apparaat."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Geen apparaten gevonden. Zorg dat apparaten zijn ingeschakeld en beschikbaar zijn voor verbinding."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Noodoproepen"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Noodoproepen via wifi worden niet ondersteund door je provider.\nHet apparaat schakelt automatisch over naar een mobiel netwerk om een noodoproep te plaatsen.\nNoodoproepen zijn alleen mogelijk in gebieden met mobiele dekking."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Wifi gebruiken voor gesprekken om de kwaliteit te verbeteren"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Cross-sim-bellen"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Toestaan dat een andere simkaart belt en sms\'t via deze simkaart."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"cross-sim-bellen"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Inkomende mms"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Kan mms niet verzenden"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tik om mms-berichten via <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> toe te staan wanneer mobiele data zijn uitgeschakeld"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Schermoverlays toestaan voor Instellingen"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Toestaan dat apps die vóór andere apps kunnen worden weergegeven, vóór instellingsschermen worden weergegeven"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Speler verbergen als de mediasessie is afgelopen"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Met de speler kun je een sessie hervatten vanuit het uitgevouwen deelvenster \'Snelle instellingen\'."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediaspeler in Snelle instellingen"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mediaspeler langer weergeven om afspelen makkelijker te hervatten"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Speler verbergen"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Speler weergeven"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Geen spelers beschikbaar"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Toegestane apps"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth wordt ingeschakeld"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Aan"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Uit"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Simkaarten"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Netwerken die geschikt zijn voor vliegtuigen"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Netwerken vinden en gebruiken die geschikt zijn voor vliegtuigen"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"vliegtuig, geschikt voor vliegtuigen"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Gesprekken en sms\'jes"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Bellen via wifi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Bellen en gebeld worden via niet-providernetwerken zoals wifi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Met bellen via wifi kun je bellen en gebeld worden via niet-providernetwerken zoals bepaalde wifi-netwerken."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Gesprekken"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"Sms"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"voorkeur"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"voorkeur voor gesprekken"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"voorkeur voor sms"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"niet beschikbaar"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Geen simkaart"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Voorkeuren"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Verbinden met openbare netwerken"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"netwerkverbinding, internet, draadloos, data, wifi, wi-fi, wi fi, mobiel, mobiele provider, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Netwerken bekijken die geschikt zijn voor vliegtuigen"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Vliegtuigmodus uitschakelen"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Niet beschikbaar omdat de bedtijdstand is ingeschakeld"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Belang van meldingen is gereset."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Een niet-vertrouwd apparaat wil toegang tot je berichten. Tik voor details."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Toegang tot berichten toestaan?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Een niet-vertrouwd bluetooth-apparaat, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wil toegang tot je berichten.\n\nJe hebt niet eerder verbinding gemaakt met [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Een niet-vertrouwd apparaat wil toegang tot je contacten en gesprekslijst. Tik voor details."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Toegang tot contacten en gesprekslijst toestaan?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Een niet-vertrouwd bluetooth-apparaat, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], wil toegang tot je contacten en gesprekslijst. Dit omvat gegevens over inkomende en uitgaande gesprekken.\n\nJe hebt niet eerder verbinding gemaakt met [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index 7bf9193..bf3b84b 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ମଧ୍ୟମ"</item>
     <item msgid="6740026006576843477">"ଲମ୍ଵା"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ଛୋଟ"</item>
+    <item msgid="7397961711906421599">"ମଧ୍ୟମ"</item>
+    <item msgid="4079132024502041928">"ଲମ୍ଵା"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ"</item>
     <item msgid="4234707448428002595">"ସାନ୍ସ-ସେରିଫ୍‌"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ଗ୍ଲୋବାଲ୍"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"କେବଳ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ଗ୍ଲୋବାଲ୍"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 886517c..f9094fb 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"ତାରିଖ ଓ ସମୟ"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"ତାରିଖ ଓ ସମୟ ସେଟ କରନ୍ତୁ"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"ତାରିଖ, ସମୟ, ସମୟ ଅଞ୍ଚଳ, ଓ ଫର୍ମାଟ୍‌ ସେଟ୍‌ କରନ୍ତୁ"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"ନେଟ୍‌ୱର୍କ ପ୍ରଦତ୍ତ ସମୟ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"ନେଟ୍‌ୱର୍କ ପ୍ରଦତ୍ତ ସମୟ କ୍ଷେତ୍ର ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"ସ୍ୱଚାଳିତ ଭାବେ ସମୟ ସେଟ୍ କରନ୍ତୁ"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"ସ୍ୱଚାଳିତ ଭାବେ ଟାଇମ୍ ଜୋନ୍ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ଡିଫଲ୍ଟ ସ୍ଥାନର ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑ଘଣ୍ଟିଆ ଫର୍ମାଟ୍‌"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-ଘଣ୍ଟିଆ ଫର୍ମାଟ ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"ଲକ୍‌ ସ୍କ୍ରୀନ୍‌ରେ ପ୍ରୋଫାଇଲ୍‌ ସୂଚନା ଦେଖନ୍ତୁ"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ଆକାଉଣ୍ଟ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ଲୋକେସନ୍‌"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ଲୋକେସନ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ଲୋକେସନ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ବନ୍ଦ"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">ଚାଲୁ - <xliff:g id="COUNT_1">%1$d</xliff:g>ଟି ଆପର ଲୋକେସନ୍‌କୁ ଆକ୍ସେସ୍ ଅଛି</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ସ୍କ୍ରିନ୍‍ ଲକ୍‌, ଫେସ୍‌ ଅନ୍‌ଲକ୍‌"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌, ଟିପଚିହ୍ନ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ଆପଣଙ୍କ ଚେହେରା ଓ ଟିପଚିହ୍ନ ସହ ନିଜର ଫୋନକୁ ସୁରକ୍ଷିତ ଭାବେ ଅନଲକ କର"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"ଆପଣ ଆପ୍ସରେ ସାଇନ୍ ଇନ୍ କରି ପେମେଣ୍ଟ ମଧ୍ୟ ସୁନିଶ୍ଚିତ କରିପାରିବେ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ଏହା ସହ ଅନଲକ୍ ସେଟ୍ ଅପ୍ କରନ୍ତୁ:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ଫେସ୍ ଅନଲକ୍"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ଆପଣଙ୍କ ଫୋନ୍ ଅନଲକ୍ କରିବା ସହଜ କରନ୍ତୁ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ଟିପଚିହ୍ନ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ଆପଣଙ୍କ ପକେଟରେ ଫୋନ ଅନଲକ କରି ସମୟ ବଞ୍ଚାନ୍ତୁ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ବାଦ୍ ଦିଅନ୍ତୁ"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ପରବର୍ତ୍ତୀ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ଫେସ୍‌ ଯୋଡ଼ାଗଲା"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"ଫେସ୍ ଅନ୍‌ଲକ୍ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ଫେସ୍ ଅନ୍‌ଲକ୍"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ପ୍ରମାଣ ପାଇଁ ଆପଣଙ୍କର ମୁହଁକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ଆରମ୍ଭ କରନ୍ତୁ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ଯଦି ଆକ୍ସେସିବିଲିଟୀ ଫେସ୍ ଅନଲକ୍ ବନ୍ଦ କରାଯାଇଛି, ତେବେ TalkBack ସହ କିଛି ସେଟଅପ୍ ଷ୍ଟେପ୍ ସଠିକ୍ ଭାବରେ କାମ କରିନପାରେ।"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ପଛକୁ ଯାଅ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ସେଟଅପ୍ ଜାରି ରଖନ୍ତୁ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ଆକ୍ସେସିବିଲିଟୀ ସେଟ୍‌ଅପ୍‌ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ଆପ୍ସରେ ଫେସ୍ ଅନ୍‌ଲକ୍ ବ୍ୟବହାର କରିବା ସମୟରେ, ସୁନିଶ୍ଚିତକରଣ ଷ୍ଟେପ୍ ସର୍ବଦା ଆବଶ୍ୟକ ହୋଇଥାଏ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ଫେସ ଡାଟା ଡିଲିଟ କରନ୍ତୁ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ଫେସ୍ ଅନ୍‌ଲକ୍ ସେଟ୍ ଅପ୍ କରନ୍ତୁ"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ଆପଣଙ୍କର ଡିଭାଇସ୍ ଅନଲକ୍ କରିବା, ଆପ୍ସରେ ସାଇନ୍ ଇନ୍ କରିବା ଏବଂ ପେମେଣ୍ଟ ସୁନିଶ୍ଚିତ କରିବା ପାଇଁ ଫେସ୍ ଅନଲକ୍ ବ୍ୟବହାର କରନ୍ତୁ।\n\nମନେରଖନ୍ତୁ:\nଆପଣ ଅଜାଣତରେ ଯଦି ଆପଣଙ୍କ ଫୋନକୁ ଦେଖନ୍ତି, ତେବେ ଏହା ଅନଲକ୍ ହୋଇପାରିବ।\n\nକେହିବି ଯଦି ଆପଣଙ୍କର ଫୋନକୁୁ ଆପଣଙ୍କ ମୁହଁ ପାଖରେ ରଖନ୍ତିି ତେବେ ଏହା ଅନଲକ୍ ହୋଇପାରିବ।\n\nଆପଣଙ୍କ ଭଳି ଦେଖାଯାଉଥିବା ବ୍ୟକ୍ତି, ଯେପରି ଆପଣଙ୍କର ଭାଇ/ଭଉଣୀ, ଆପଣଙ୍କର ଫୋନକୁ ଅନଲକ୍ କରିପାରିବେ।"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ଅନ୍‌ଲକ୍ କରିବା, ଆପ୍‌ରେ ସାଇନ୍ ଇନ୍ କରିବା, ଏବଂ ପେମେଣ୍ଟ ସୁନିଶ୍ଚିତ କରିବା ପାଇଁ ଫେସ୍ ଅନ୍‌ଲକ୍ ବ୍ୟବହାର କରନ୍ତୁ।\n\nମନେ ରଖନ୍ତୁ:\nଆପଣ ଅଜାଣତରେ ଯଦି ଆପଣଙ୍କ ଫୋନ୍‌କୁ ଦେଖିନ୍ତି, ତେବେ ଏହା ଅନ୍‌ଲକ୍ ହୋଇଯାଇପାରେ।\n\nଆପଣଙ୍କର ଆଖି ବନ୍ଦ ଥିବା ବେଳେ ମଧ୍ୟ କେହିବି ଆପଣଙ୍କର ମୁହଁ ସାମ୍ନାରେ ଫୋନ୍ ରଖି ଆପଣଙ୍କର ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍ କରିପାରିବେ।\n\nଆପଣଙ୍କ ଭଳି ଦେଖାଯାଉଥିବା ବ୍ୟକ୍ତି ଯେମିତି ଯାଆଁଳା ଭାଇ/ଭଉଣୀ, ଆପଣଙ୍କ ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍ କରିପାରିବେ।"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"ଆପଣଙ୍କ ଡିିିିଭାଇସକୁ ଅନଲକ୍ କରିବା, ଆପଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରିବା ଓ ପେମେଣ୍ଟଗୁଡ଼ିକୁ ସୁନିଶ୍ଚିତ କରିବା ପାଇଁ ଫେସ୍ ଅନଲକ୍ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"ମନେ ରଖନ୍ତୁ:\nଆପଣ ଅଜାଣତରେ ଆପଣଙ୍କ ଫୋନକୁ ଦେଖିଲେ ଏହା ଅନଲକ୍ ହୋଇପାରିବ।\n\nଅନ୍ୟ କେହି ଜଣେ ବ୍ୟକ୍ତି ଆପଣଙ୍କ ଫୋନକୁ ଆପଣଙ୍କ ମୁହଁ ସାମ୍ନାରେ ରଖି ଅନଲକ୍ କରିପାରିବେ।\n\nଆପଣଙ୍କ ପରି ଦେଖାଯାଉଥିବା, କଥା କହୁଥିବା ଅନ୍ୟ ଜଣେ ବ୍ୟକ୍ତି ଆପଣଙ୍କ ଫୋନକୁ ଅନଲକ୍ କରିପାରିବେ, ଯେପରିକି ଆପଣଙ୍କ ଭାଇ/ଭଉଣୀ।"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"ମନେ ରଖନ୍ତୁ:\nଆପଣ ଅଜାଣତରେ ଆପଣଙ୍କ ଫୋନକୁ ଦେଖିଲେ ଏହା ଅନଲକ୍ ହୋଇପାରିବ।\n\nଆପଣଙ୍କ ଆଖି ବନ୍ଦ ଥିବା ବେଳେ ମଧ୍ୟ ଅନ୍ୟ କେହି ଜଣେ ବ୍ୟକ୍ତି ଆପଣଙ୍କ ଫୋନକୁ ଆପଣଙ୍କ ମୁହଁ ସାମ୍ନାରେ ରଖି ଅନଲକ୍ କରିପାରିବେ।\n\nଆପଣଙ୍କ ପରି ଦେଖାଯାଉଥିବା, କଥା କହୁଥିବା କେହି ଜଣେ ବ୍ୟକ୍ତି ଆପଣଙ୍କ ଫୋନକୁ ଅନଲକ୍ କରିପାରିବେ, ଯେପରିକି ଆପଣଙ୍କ ଭାଇ/ଭଉଣୀ।"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ଫେସ୍ ଡାଟା ଡିଲିଟ୍ କରିବେ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ଫେସ୍ ଅନ୍‌ଲକ୍ ଦ୍ୱାରା ବ୍ୟବହାର କରାଯାଇଥିବା ଫେସ୍ ଡାଟା ସ୍ଥାୟୀ ଏବଂ ସୁରକ୍ଷିତ ଭାବରେ ଡିଲିଟ୍ କରିଦିଆଯିବ। କାଢ଼ି ଦେବା ପରେ, ଆପଣଙ୍କର ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍ କରିବା, ଆପ୍‌ଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରିବା ଏବଂ ପେମେଣ୍ଟ ସୁନିଶ୍ଚିତ କରିବା ପାଇଁ ଆପଣ ଆପଣଙ୍କର ପିନ୍, ପାଟର୍ନ ବା ପାସ୍‌ୱାର୍ଡ ଆବଶ୍ୟକ କରିବେ।"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"ଆପଣଙ୍କର ଫୋନ୍ ଅନ୍‍ଲକ୍ କରିବାକୁ ଫେସ୍ ଅନଲକ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ଫୋନ୍‌କୁ ଅନ୍‌ଲକ୍‌ କରିବା କିମ୍ୱା କିଣାକିଣିକୁ ଅନୁମୋଦନ କରିବା ପାଇଁ ନିଜ ଟିପଚିହ୍ନର ବ୍ୟବହାର କରନ୍ତୁ।\n\nଧ୍ୟାନଦିଅନ୍ତୁ: ଏହି ଡିଭାଇସ୍‌ ଅନଲକ୍‌ କରିବାକୁ ଆପଣ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଅଧିକ ସୂଚନା ପାଇଁ, ଆପଣଙ୍କ ସଂସ୍ଥାର ଆଡମିନଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ଫୋନ୍‌କୁ ଅନଲକ୍‌ କିମ୍ୱା କିଣାକିଣିକୁ ଅନୁମୋଦନ କରିବା ପାଇଁ ନିଜ ଟିପଚିହ୍ନ ବ୍ୟବହାର କରନ୍ତୁ।\n\nଧ୍ୟାନଦିଅନ୍ତୁ: ଜଟିଳ ପାଟର୍ନ କିମ୍ୱା ପିନ୍‌ ତୁଳନାରେ ଆପଣଙ୍କର ଟିପଚିହ୍ନ କମ୍ ସୁରକ୍ଷିତ ହୋଇପାରେ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"କ୍ୟାନ୍ସଲ୍‌"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ନା, ଧନ୍ୟବାଦ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ଜାରି ରଖ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ଛାଡିଦିଅନ୍ତୁ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ପରବର୍ତ୍ତୀ"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଟାବ୍‌ଲେଟ୍‍କୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ ବା ଚୋରୀ ହୋଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ଫେସ୍ ଅନ୍‌ଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ମଧ୍ୟ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ଆବଶ୍ୟକ। ପଛକୁ ଫେରିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ ବା ଚୋରୀ ହୋଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ଫେସ୍ ଅନ୍‌ଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ମଧ୍ୟ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ଆବଶ୍ୟକ। ପଛକୁ ଫେରିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କର ଫୋନ୍‌କୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ ବା ଚୋରୀ ହୋ‍ଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ଫେସ୍ ଅନ୍‌ଲକ୍ ସେଟ୍ ଅପ୍ କରିବା ପାଇଁ ଆପଣଙ୍କୁ ମଧ୍ୟ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ଆବଶ୍ୟକ। ପଛକୁ ଫେରିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କ ଟାବଲେଟକୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ବାୟୋମେଟ୍ରିକ୍ସ ସେଟ୍ ଅପ୍ କରିବାକୁ ଆପଣଙ୍କୁ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପର ମଧ୍ୟ ଆବଶ୍ୟକତା ରହିଛି। ପଛକୁ ଯିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ବାୟୋମେଟ୍ରିକ୍ସ ସେଟ୍ ଅପ୍ କରିବାକୁ ଆପଣଙ୍କୁ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପର ମଧ୍ୟ ଆବଶ୍ୟକତା ରହିଛି। ପଛକୁ ଯିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପ ସାହାଯ୍ୟରେ ଆପଣଙ୍କ ଫୋନକୁ ସୁରକ୍ଷିତ ରଖିବା ଦ୍ୱାରା, ଯଦି ଏହା ହଜିଯାଏ କିମ୍ବା ଚୋରି ହୋଇଯାଏ, ତେବେ କେହି ଏହାକୁ ବ୍ୟବହାର କରିବା ପାଇଁ ସକ୍ଷମ ହେବେ ନାହିଁ। ବାୟୋମେଟ୍ରିକ୍ସ ସେଟ୍ ଅପ୍ କରିବାକୁ ଆପଣଙ୍କୁ ଏକ ସ୍କ୍ରିନ୍ ଲକ୍ ବିକଳ୍ପର ମଧ୍ୟ ଆବଶ୍ୟକତା ରହିଛି। ପଛକୁ ଯିବା ପାଇଁ, ’ବାତିଲ୍ କରନ୍ତୁ’ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN ସେଟ୍‌ଅପ୍ ବାଦ୍ ଦେବେ କି?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"ପାସ୍‌ୱାର୍ଡ ସେଟ୍ ଅପ୍ ବାଦ୍ ଦେବେ କି?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ପାଟର୍ନ ସେଟ୍‌ଅପ୍‌କୁ ବାଦ୍ ଦେବେ କି?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ଡିଭାଇସ୍‌ର ସୁରକ୍ଷା ବୈଶିଷ୍ଟ୍ୟକୁ ସକ୍ରିୟ କରି ଆପଣଙ୍କ ଅନୁମତି ବିନା ଏହି ଟାବ୍‌ଲେଟ୍‌କୁ ଅନ୍ୟମାନେ ବ୍ୟବହାର କରିବାରୁ ପ୍ରତିରୋଧ କରନ୍ତୁ। ଆପଣ ବ୍ୟବହାର କରିବାକୁ ଚାହୁଁଥିବା ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବାଛନ୍ତୁ।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ଡିଭାଇସ୍‌ ସୁରକ୍ଷା ବୈଶିଷ୍ଟ୍ୟକୁ ସକ୍ରିୟ କରି, ଆପଣଙ୍କ ଅନୁମତି ବିନା ଏହାକୁ ବ୍ୟବହାର କରିବାରୁ ଅନ୍ୟମାନଙ୍କୁ ରୋକନ୍ତୁ। ଆପଣ ବ୍ୟବହାର କରିବାକୁ ଚାହୁଁଥିବା ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବାଛନ୍ତୁ।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ଡିଭାଇସ୍‌ର ସୁରକ୍ଷା ବୈଶିଷ୍ଟ୍ୟକୁ ସକ୍ରିୟ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କ ଅନୁମତି ବିନା ଏହି ଫୋନକୁ ଅନ୍ୟମାନେ ବ୍ୟବହାର କରିପାରିବେ ନାହିଁ। ଆପଣ ବ୍ୟବହାର କରିବାକୁ ଚାହୁଁଥିବା ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ବାଛି ନିଅନ୍ତୁ।"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"ନିଜର ବ୍ୟାକଅପ୍ ସ୍କ୍ରିନ୍‌ ଲକ୍‌ ପଦ୍ଧତି ବାଛନ୍ତୁ"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"ନିଜର ବ୍ୟାକଅପ୍‌ ସ୍କ୍ରିନ୍‌ ଲକ୍‌ ପଦ୍ଧତି ବାଛନ୍ତୁ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ଆପଣଙ୍କ ବ୍ୟାକଅପ୍ ସ୍କ୍ରିନ୍ ଲକ୍ ପଦ୍ଧତି ବାଛନ୍ତୁ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌ ବିକଳ୍ପ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌ ବିକଳ୍ପ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ସ୍କ୍ରିନ୍‌ ଲକ୍‌"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ଫେସ୍ ଅନ୍‌ଲକ୍ + ପାସ୍‌ୱାର୍ଡ"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ବିନା ଫେସ୍ ଅନ୍‌ଲକ୍‌ରେ ଜାରି ରଖନ୍ତୁ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"ନିଜର ଫେସ୍‍ ବ୍ୟବହାର କରି ନିଜର ଫୋନ୍‌ ଆପଣ ଅନଲକ୍‌ କରିପାରିବେ। ସୁରକ୍ଷା କାରଣରୁ, ଏହି ବିକଳ୍ପ ପାଇଁ ଏକ ବ୍ୟାକଅପ୍‌ ସ୍କ୍ରୀନ୍‌ ଲକ୍‌ ଆବଶ୍ୟକ।"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ବାୟୋମେଟ୍ରିକ୍ସ + ପାଟର୍ନ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ବାୟୋମେଟ୍ରିକ୍ସ + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ବାୟୋମେଟ୍ରିକ୍ସ + ପାସୱାର୍ଡ"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ବାୟୋମେଟ୍ରିକ୍ସ ବିନା ଜାରି ରଖନ୍ତୁ"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ଆପଣ ଆପଣଙ୍କ ବାୟୋମେଟ୍ରିକ୍ସ ବ୍ୟବହାର କରି ଆପଣଙ୍କର ଫୋନ୍ ଅନଲକ୍ କରିପାରିବେ। ସୁରକ୍ଷା ପାଇଁ, ଏହି ବିକଳ୍ପ ଏକ ବ୍ୟାକଅପ୍ ସ୍କ୍ରିନ୍ ଲକ୍ ଆବଶ୍ୟକ କରେ।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ପ୍ରଶାସକ, ଏନକ୍ରିପ୍‌ଶନ୍‌ ନୀତି, କିମ୍ବା କ୍ରେଡେନ୍‌ଶିଆଲ୍‌ ଷ୍ଟୋରେଜ୍‌ ଦ୍ୱାରା ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"କିଛି ନାହିଁ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ସ୍ୱାଇପ୍"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> ଅଙ୍କରୁ କମ୍‌ ହେବା ଦରକାର</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ଏକ ସାମ୍ପ୍ରତିକ ପିନ୍‌ର ବ୍ୟବହାରକୁ ଡିଭାଇସ୍‌ ଆଡ୍‌ମିନ୍‌ ଅନୁମତି ଦେବନାହିଁ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ସାଧାରଣ PINଗୁଡିକ ଆପଣଙ୍କ IT ଆଡମିନ୍‌ଙ୍କ ଦ୍ୱାରା ଅବରୋଧ କରିଦିଆଯାଇଛି। ଭିନ୍ନ PIN ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ଏକ ଭୁଲ ଅକ୍ଷରକୁ ଏହା ମିଶାଇ ପାରିବନାହିଁ"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ଅତିକମ୍‌ରେ ଗୋଟିଏ ଅକ୍ଷର ରହିବା ଦରକାର"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ଅତିକମ୍‌ରେ ଗୋଟିଏ ସଂଖ୍ୟା ରହିବା ଜରୁରୀ"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">ଅତିକମ୍‌ରେ 1ଟି ଅକ୍ଷର ହେବା ନିହାତି ଆବଶ୍ୟକ ଯାହା ସଂଖ୍ୟା ହୋଇନଥିବା</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ଏକ ସମ୍ପ୍ରତି ପାସ୍‌ୱର୍ଡ ବ୍ୟବହାର କରିବାକୁ ଡିଭାଇସ୍‌ ଆଡମିନ୍‌ ଅନୁମତି ଦିଅନ୍ତି ନାହିଁ"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ଆପଣଙ୍କର ଆଇଟି ଆଡ୍‌ମିନ୍‌ ଦ୍ୱାରା ସାଧାରଣ ପାସ୍‌ୱର୍ଡଗୁଡ଼ିକୁ ରୋକିଦିଆଯାଇଛି। ଏକ ଭିନ୍ନ ପାସ୍‌ୱର୍ଡ ଦିଅନ୍ତୁ।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ସଂଖ୍ୟାର କ୍ରମବୃଦ୍ଧି, କ୍ରମହ୍ରାସ, କିମ୍ବା ପୁନରାବୃତ୍ତ କ୍ରମ ଅନୁମୋଦିତ ନୁହେଁ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ନିଶ୍ଚିତ"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"କ୍ୟାନ୍ସଲ୍‌ କରନ୍ତୁ"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"ୱାଇଫାଇ"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"ୱାଇ-ଫାଇ ଅନ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"ୱାଇ-ଫାଇ"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ୱାଇ-ଫାଇ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ୱାଇ-ଫାଇ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ୱାଇ-ଫାଇ ସେଟିଂସ୍"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"ୱାଇ-ଫାଇ"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ୱାୟର୍‌ଲେସ୍‌ ଆକ୍ସେସ୍‌ ପଏଣ୍ଟର ସେଟ୍‌ଅପ୍‍ ଓ ପରିଚାଳନା"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” ସହ ସଂଯୋଗ କରିବାକୁ ନିମ୍ନରେ ଥିବା କେନ୍ଦ୍ରକୁ ଆଣନ୍ତୁ"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"ଗୋଟିଏ QR କୋଡ୍ ସ୍କାନ୍‌ କରି ୱାଇ-ଫାଇରେ ଯୋଗ ଦିଅନ୍ତୁ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ୱାଇ-ଫାଇ ସେୟାର୍‌ କରନ୍ତୁ"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” ସହ ସଂଯୋଗ କରିବାକୁ ଏହି QR କୋଡ୍ ସ୍କାନ୍ କରନ୍ତୁ ଏବଂ ପାସୱାର୍ଡ ସେୟାର୍ କରନ୍ତୁ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>”ରେ ଯୋଗଦେବାକୁ, ଏହି QR କୋଡକୁ ଅନ୍ୟ ଏକ ଡିଭାଇସରେ ସ୍କାନ୍ କରନ୍ତୁ"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>”କୁ ସଂଯୋଗ କରିବାକୁ ଏହି QR କୋଡ୍ ସ୍କାନ୍ କରନ୍ତୁ"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରୁହେ, ଡିଭାଇସ୍‍ର ନିର୍ମାତାଙ୍କୁ ଯୋଗାଯୋଗ କରନ୍ତୁ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"କିଛି ଭୁଲ ହୋଇଗଲା"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ୱାଇ-ଫାଇ ପାସୱାର୍ଡ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ହଟସ୍ପଟ୍ ପାସୱାର୍ଡ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ସ୍ଵତଃ-ସଂଯୋଗ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ଏହି ନେଟୱାର୍କର ପାଖାପାଖି ହେଲେ ଫୋନକୁ ସ୍ୱଚାଳିତ ଭାବେ ସଂଯୋଗ ହେବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ଏହି ନେଟୱାର୍କର ପାଖାପାଖି ହେଲେ ଟାବଲେଟକୁ ସ୍ୱଚାଳିତ ଭାବେ ସଂଯୋଗ ହେବାକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"ରେଞ୍ଜରେ ରହିଲେ ଏହି ନେଟୱାର୍କକୁ ସଂଯୋଗ ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ଡିଭାଇସ୍‌ ଯୋଗ କରନ୍ତୁ"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ଏହି ନେଟ୍‌ୱାର୍କରେ ଏକ ଡିଭାଇସ୍ ଯୋଗ କରିବା ପାଇଁ ଏକ QR କୋଡ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR କୋଡ୍ ଏକ ବୈଧ ଫର୍ମାଟ୍ ନୁହେଁ"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ସିଷ୍ଟମ୍‌ ସାର୍ଟିଫିକେଟ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ପ୍ରଦାନ କରନ୍ତୁ ନାହିଁ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ବୈଧ କରନ୍ତୁ ନାହିଁ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"କୌଣସି ସର୍ଟିଫିକେଟ୍‌ ଦର୍ଶାଯାଇନାହିଁ। ଆପଣଙ୍କ ସଂଯୋଗ ଗୋପନ ରହିବ ନାହିଁ।"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ନେଟୱାର୍କ ନାମ ବହୁତ ଲମ୍ଵା ଅଟେ।"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ନିଶ୍ଚିତ ଭାବେ ଏକ ଡୋମେନ୍‌ ଦେବାକୁ ପଡ଼ିବ।"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"ସାର୍ଟିଫିକେଟ ଆବଶ୍ୟକ।"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ୱାଇ-ଫାଇ ଅନ୍‍ ଅଛି"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ସହ ସଂଯୁକ୍ତ ହୋଇଛି"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ସହ ସଂଯୋଗ ହେଉଛି"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"ସଂଯୋଗ ହେଉଛି…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ନେଟ୍‌ୱର୍କକୁ ସଂଯୋଗ କରିପାରିଲା ନାହିଁ।"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ନେଟ୍‌ୱର୍କ ପରିସୀମା ମଧ୍ୟରେ ନାହିଁ"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ଡିଭାଇସ୍‌ର MAC ଠିକଣା"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ରେଣ୍ଡମାଇଜ୍ ହୋଇଥିବା MAC ଠିକଣା"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"ରେଣ୍ଡମାଇଜ୍ ହୋଇଥିବା MAC ଠିକଣା (ଗତଥର ବ୍ୟବହାର ହୋଇଛି)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ଠିକଣା"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ନେଟୱାର୍କ୍ ବିବରଣୀ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ସବ୍‌ନେଟ୍‌ ମାସ୍କ"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 ଠିକଣା"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"ସେଭ୍‌ ହୋଇଥିବା ନେଟ୍‌ୱାର୍କ"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"ସଦସ୍ୟତା"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"ଅନ୍ୟ ନେଟୱାର୍କ"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP ସେଟିଂସ୍"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ୱାଇ-ଫାଇ ଉନ୍ନତ ସେଟିଙ୍ଗ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"ସେଭ୍‌ କରନ୍ତୁ"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ଏକ ମାନ୍ୟ ଗେଟ୍‌ୱେ ଠିକଣା ଟାଇପ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"ଏକ ବୈଧ DNS ଠିକଣା ଟାଇପ୍‌ କରନ୍ତୁ।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 ଓ 32 ମଧ୍ୟରେ ଏକ ନେଟୱାର୍କ ପ୍ରିଫିକ୍ସ ଦୌର୍ଘ୍ୟ ଟାଇପ୍‌ କରନ୍ତୁ।"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ବ୍ୟକ୍ତିଗତ DNS ଦ୍ୱାରା ଓଭରରିଡେନ୍ ହୋଇନଥିଲେ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ବ୍ୟକ୍ତିଗତ DNS ଦ୍ୱାରା ଓଭରରିଡେନ୍ ହୋଇନଥିଲେ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ଗେଟ୍‌ୱେ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ନେଟୱାର୍କ ପ୍ରିଫିକ୍ସ ଦୈର୍ଘ୍ୟ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"ୱାଇ-ଫାଇ ଡାଇରେକ୍ଟ"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ଆପ୍‍ କଣ୍ଟେଣ୍ଟ ଶେୟର୍ କରୁଛି। ଇଣ୍ଟରନେଟ୍‌ ସଂଯୋଜନା ଶେୟାର କରିବାକୁ, ହଟ୍‌ସ୍ପଟ୍‌ ଅଫ୍‌ କରି ଅନ୍‌ କରନ୍ତୁ"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"କୌଣସି ପାସ୍‌ୱାର୍ଡ୍‌ ସେଭ୍‌ ହୋଇନାହିଁ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ହଟସ୍ପଟ୍‌ ନାମ"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ଅନ୍‌ ହେଉଛି..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ଚାଲୁ କରାଯାଉଛି…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ସହ ଅନ୍ୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ ସଂଯୁକ୍ତ ହୋଇପାରିବ"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ହଟସ୍ପଟ୍‌ ପାସ୍‌ୱାର୍ଡ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ବ୍ୟାଣ୍ଡ"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"ସ୍ମୁଥ୍ ଡିସପ୍ଲେ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"କିଛି ବିଷୟବସ୍ତୁ ପାଇଁ ରିଫ୍ରେସ୍ ରେଟ୍ ସ୍ୱଚାଳିତ ଭାବରେ 60ରୁ 90 Hz ପର୍ଯ୍ୟନ୍ତ ବଢ଼ାଇଥାଏ। ବ୍ୟାଟେରୀର ବ୍ୟବହାର ବଢ଼ାଇଥାଏ।"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ସ୍ମୁଥ୍ ଡିସପ୍ଲେ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz ରିଫ୍ରେସ୍ ହାର ଲାଗୁ କରନ୍ତୁ"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ଉନ୍ନତ ସ୍ପର୍ଶ ପ୍ରତିକ୍ରିୟା ଓ ଆନିମେସନ୍ ଗୁଣବତ୍ତା ପାଇଁ ସର୍ବାଧିକ ରିଫ୍ରେସ୍ ରେଟ୍। ବ୍ୟାଟେରୀର ବ୍ୟବହାର ବଢ଼ାଇଥାଏ।"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ସ୍କ୍ରିନ୍ ଆଟେନ୍‌ସନ୍"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ଯଦି ଆପଣ ଏହାକୁ ଦେଖୁଥିବେ ତେବେ ଚାଲୁ / ସ୍କ୍ରିନ୍ ବନ୍ଦ ହେବ ନାହିଁ"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ଯେତେବେଳେ ସ୍କ୍ରିନ ଗାଢ଼ ହୁଏ, ନୂଆ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ପାଇଁ ଏହା ଚାଲୁ ହୋଇଥାଏ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ସର୍ବଦା ସମୟ ଏବଂ ସୂଚନା ଦେଖାନ୍ତୁ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ବ୍ୟାଟେରୀ ବ୍ୟବହାରରେ ବୃଦ୍ଧି"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"ଟେକ୍ସଟକୁ ବୋଲ୍ଡ କରନ୍ତୁ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ଫଣ୍ଟ ସାଇଜ୍"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ଟେକ୍ସଟ୍‌କୁ ବଡ଼ କିମ୍ୱା ଛୋଟ କରନ୍ତୁ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM କାର୍ଡ ଲକ୍‌ ସେଟିଙ୍ଗ"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ଭର୍ସନ୍‌"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android ସୁରକ୍ଷା ଅପଡେଟ୍"</string>
     <string name="model_info" msgid="8997566254717810904">"ମଡେଲ୍‌"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ମଡେଲ୍‌: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ମଡେଲ୍‌ ଓ ହାର୍ଡୱେର୍"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ହାର୍ଡୱେର୍‌ ଭର୍ସନ୍‌"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ଉପକରଣ ଆଇଡି"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN ଡିଲିଟ୍‌ କରନ୍ତୁ"</string>
     <string name="menu_new" msgid="6571230342655509006">"ନୂଆ APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"ସେଭ୍‌ କରନ୍ତୁ"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"ପରିତ୍ୟାଗ"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"ବାତିଲ୍ କରନ୍ତୁ"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"ନାମ ସ୍ଥାନ ଶୂନ୍ୟ ରହିପାରିବ ନାହିଁ।"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APNକୁ ଖାଲି ରଖାଯାଇପାରିବ ନାହିଁ।"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ଆପ୍‍ଗୁଡ଼ିକୁ ରିସେଟ୍ କରାଯାଇପାରିବ"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"ୱାଇ-ଫାଇ, ମୋବାଇଲ ଓ ବ୍ଲୁଟୁଥ୍‌ ରିସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"ଏହା ସମସ୍ତ ନେଟୱାର୍କ ସେଟିଂସକୁ ରିସେଟ୍‌ କରିବ, ଯେଉଁଥିରେ ଏସବୁ ରହିଛି:\n\n"<li>"ୱାଇ-ଫାଇ"</li>\n<li>"ମୋବାଇଲ୍‌ ଡାଟା"</li>\n<li>"ବ୍ଲୁଟୁଥ୍‍"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"ଖାଲି କରନ୍ତୁ"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ଡାଉନଲୋଡ୍ ହୋଇଥିବା SIMକୁ ଖାଲି କରନ୍ତୁ"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"ରିପ୍ଲେସମ୍ୟାଣ୍ଟ୍ SIMଗୁଡ଼ିକୁ ଡାଉନଲୋଡ୍ କରିବାକୁ, ଆପଣଙ୍କର କ୍ୟାରିଅରଙ୍କୁ ଯୋଗାଯୋଗ କରନ୍ତୁ। ଏହା କୌଣସି ମୋବାଇଲ୍‍ ସେବା ପ୍ଲାନ୍‍ ବାତିଲ୍‍ କରିବ ନାହିଁ।"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"ଏହା କୌଣସି ମୋବାଇଲ ସେବା ପ୍ଲାନକୁ ବାତିଲ୍ କରିବ ନାହିଁ। ରିପ୍ଲେସମେଣ୍ଟ SIMଗୁଡ଼ିକୁ ଡାଉନଲୋଡ୍ କରିବାକୁ ଆପଣଙ୍କ କ୍ୟାରିଅରଙ୍କ ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"ସେଟିଂସ୍ ରିସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"ସମସ୍ତ ନେଟ୍‌ୱାର୍କ ସେଟିଂ ରିସେଟ୍ କରିବେ? ଏହାକୁ ଆପଣ ଆଉ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"ସମସ୍ତ ନେଟ୍‌ୱର୍କ ସେଟିଂ ରିସେଟ୍ ଏବଂ ଡାଉନଲୋଡ୍ ହୋଇଥିବା SIMକୁ ଖାଲି କରିବେ କି? ଆପଣ ଏହି କାର୍ଯ୍ୟକୁ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ନେଟ୍‌ୱର୍କ ସେଟିଙ୍ଗକୁ ରିସେଟ୍‌ କରିଦିଆଯାଇଛି"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIMକୁ ଖାଲି କରିହେବ ନାହିଁ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ଏକ ତ୍ରୁଟି ଯୋଗୁଁ ଡାଉନଲୋଡ୍ ହୋଇଥିବା SIMଗୁଡ଼ିକ ଲିଭାଯାଇ ପାରିବାନାହିଁ।\n\nଆପଣଙ୍କର ଡିଭାଇସ୍‌କୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ ଏବଂ ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ସମସ୍ତ ଡାଟା ଖାଲି କରିଦିଅନ୍ତୁ (ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‌)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ସମସ୍ତ ଡାଟା ଖାଲି କରିଦିଅନ୍ତୁ (ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‌)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ଏହା, ଆପଣଙ୍କ ଟାବ୍‍‍ଲେଟ୍‍ର "<b>"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍‍‍"</b>"ରେ ଥିବା ସମସ୍ତ ଡାଟାକୁ ଖାଲି କରିଦେବ, ଯେପରିକି:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଓ ଆପ୍ ଡାଟା ଓ ସେଟିଂସ୍"</li>\n<li>"ଡାଉନ୍‌ଲୋଡ୍‌ ହୋଇଥିବା ଆପ୍ "</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ଏହା ଆପଣଙ୍କ ଫୋନ୍‍ର "<b>"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍"</b>"ରେ ଥିବା ସମସ୍ତ ଡାଟା ସହିତ ଏସବୁକୁ ମଧ୍ୟ ଖାଲି କରିଦେବ:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଓ ଆପ୍ ଡାଟା ଓ ସେଟିଂସ୍"</li>\n<li>"ଡାଉନ୍‌ଲୋଡ୍‌ ହୋଇଥିବା ଆପ୍"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ଆପଣ ବର୍ତ୍ତମାନ ନିମ୍ନ ଆକାଉଣ୍ଟଗୁଡ଼ିକରେ ସାଇନ୍‌ ଇନ୍‌ କରିଛନ୍ତି:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ଏହି ଡିଭାଇସ୍‌ରେ ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତାମାନେ ଅଛନ୍ତି।\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"ମ୍ୟୁଜିକ୍‌"</li>\n<li>"ଫଟୋ"</li>\n<li>"ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଡାଟା"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ଏହା ଆପଣଙ୍କ ମୋବାଇଲ୍‌ ସେବା ପ୍ଲାନ୍‌ ବାତିଲ୍‌ କରିବ ନାହିଁ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"ସଙ୍ଗୀତ, ଛବି ଓ ଅନ୍ୟାନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଡାଟାକୁ ସଫା କରିବା ପାଇଁ "<b>"USB ଷ୍ଟୋରେଜ୍‌"</b>"କୁ ଖାଲି କରିବା ଆବଶ୍ୟକ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"ମ୍ୟୁଜିକ୍‌, ଛବି ଓ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଅନ୍ୟାନ୍ୟ ଡାଟାକୁ ସଫା କରିବାକୁ, "<b>"SD କାର୍ଡ"</b>" ଲିଭାଯିବା ଆବଶ୍ୟକ କରେ।"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ (ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ (ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ଏହା, ଆପଣଙ୍କ ଟାବଲେଟର "<b>"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ"</b>"ରେ ଥିବା ସମସ୍ତ ଡାଟା ସମେତ ଏହି ସବୁ ମଧ୍ୟ ଖାଲି କରିଦେବ:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଏବଂ ଆପ୍ ଡାଟା ଓ ସେଟିଂସ୍"</li>\n<li>"ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଆପଗୁଡ଼ିକ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ଏହା, ଆପଣଙ୍କ ଫୋନର "<b>"ଇଣ୍ଟର୍ନଲ୍ ଷ୍ଟୋରେଜ୍"</b>"ରେ ଥିବା ସମସ୍ତ ଡାଟା ସମେତ ଏହି ସବୁ ମଧ୍ୟ ଖାଲି କରିଦେବ:\n\n"<li>"ଆପଣଙ୍କ Google ଆକାଉଣ୍ଟ"</li>\n<li>"ସିଷ୍ଟମ ଏବଂ ଆପ୍ ଡାଟା ଓ ସେଟିଂସ୍"</li>\n<li>"ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଆପଗୁଡ଼ିକ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ଆପଣ ବର୍ତ୍ତମାନ ନିମ୍ନୋକ୍ତ ଆକାଉଣ୍ଟଗୁଡ଼ିକରେ ସାଇନ୍ ଇନ୍ କରିଛନ୍ତି:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ଏହି ଡିଭାଇସରେ ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଅଛନ୍ତି।\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"ସଙ୍ଗୀତ"</li>\n<li>"ଫଟୋ"</li>\n<li>"ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଡାଟା"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ଏହା ଆପଣଙ୍କ ମୋବାଇଲ ସେବା ପ୍ଲାନକୁ ବାତିଲ୍ କରିବ ନାହିଁ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"ସଙ୍ଗୀତ, ଛବି ଓ ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଡାଟାକୁ ଖାଲି କରିବାକୁ "<b>"USB ଷ୍ଟୋରେଜ୍"</b>"କୁ ଖାଲି କରିବା ଆବଶ୍ୟକ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"ସଙ୍ଗୀତ, ଛବି ଓ ଅନ୍ୟ ଉପଯୋଗକର୍ତ୍ତା ଡାଟାକୁ ଖାଲି କରିବାକୁ "<b>"SD କାର୍ଡ"</b>"କୁ ଖାଲି କରିବା ଆବଶ୍ୟକ।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB ଷ୍ଟୋରେଜ୍‌କୁ ଲିଭାନ୍ତୁ"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD କାର୍ଡ ଲିଭାନ୍ତୁ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ଇଣ୍ଟର୍‌ନଲ୍ USB ଷ୍ଟୋରେଜ୍‌ରେ ସମସ୍ତ ଡାଟା ଲିଭାନ୍ତୁ, ଯେପରିକି ମ୍ୟୁଜିକ୍‌ କିମ୍ବା ଫଟୋଗୁଡ଼ିକ"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD କାର୍ଡ୍‌ରୁ ସମସ୍ତ ଡାଟା ଲିଭାଇଦିଅନ୍ତୁ, ଯେପରିକି ମ୍ୟୁଜିକ୍‌ କିମ୍ବା ଫଟୋଗୁଡ଼ିକ"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ଆପଣଙ୍କର ସମସ୍ତ ବ୍ୟକ୍ତିଗତ ସୂଚନା ଏବଂ ଡାଉନଲୋଡ୍‌ କରିଥିବା ଆପ୍‌ଗୁଡ଼ିକ ଡିଲିଟ୍ ହୋଇଯିବ। ଆପଣ ଏହି କାର୍ଯ୍ୟକୁ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ଆପଣଙ୍କର ସମସ୍ତ ବ୍ୟକ୍ତିଗତ ସୂଚନା ସମେତ ଡାଉନଲୋଡ୍ କରିଥିବା ଆପ୍ସ &amp; SIM ଡିଲିଟ୍ ହୋଇଯିବ। ଆପଣ ଏହି କାର୍ଯ୍ୟକୁ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ସବୁକିଛି ଖାଲି କରିଦିଅନ୍ତୁ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ରିସେଟ୍‌ କରାଯାଇନାହିଁ, କାରଣ ସିଷ୍ଟମ୍‌ କ୍ଲିଅର୍ ସର୍ଭିସ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ସମସ୍ତ ଡାଟା ଖାଲି କରିବେ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍‌ ଉପଲବ୍ଧ ନାହିଁ"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ଲିଭାଉଛି"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ସମସ୍ତ ଡାଟା ଖାଲି କରନ୍ତୁ"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ଆପଣଙ୍କର ସମସ୍ତ ବ୍ୟକ୍ତିଗତ ସୂଚନା ଏବଂ ଡାଉନଲୋଡ୍ କରାଯାଇଥିବା ଆପ୍ ଡିଲିଟ୍ ହୋଇଯିବ। ଆପଣ ଏହି କାର୍ଯ୍ୟକୁ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ଡାଉନଲୋଡ୍ କରାଯାଇଥିବା ଆପ୍ ଓ SIM ସମେତ ଆପଣଙ୍କର ସମସ୍ତ ବ୍ୟକ୍ତିଗତ ସୂଚନା ଡିଲିଟ୍ ହୋଇଯିବ। ଆପଣ ଏହି କାର୍ଯ୍ୟକୁ ପୂର୍ବବତ୍ କରିପାରିବେ ନାହିଁ।"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ସମସ୍ତ ଡାଟା ଖାଲି କରିବେ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପାଇଁ ଫ୍ୟାକ୍ଟୋରୀ ରିସେଟ୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"ଖାଲି କରାଯାଉଛି"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"କଲ୍‌ ସେଟିଂସ୍"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ଭଏସ୍‌ମେଲ୍‌, କଲ୍‌ ଫର୍‌ୱାର୍ଡିଙ୍ଗ, କଲ୍‌ ୱେଟିଙ୍ଗ, କଲର୍‌ ID ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ଟିଥରିଂ"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ଡିଭାଇସ୍‌ଠାରୁ ଅଧିକ ସହ ଟିଥର୍‌ କରିପାରିବ ନାହିଁ।"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>କୁ ଅନ୍‌ଟିଥର୍ କରାଯିବ"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ଇଥରନେଟ୍ ଟିଥରିଂ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ଇଥରନେଟ୍ ମାଧ୍ୟମରେ ଫୋନର ଇଣ୍ଟର୍ନେଟ୍ ସଂଯୋଗ ସେୟାର୍ କରନ୍ତୁ"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ଇଥରନେଟ୍ ମାଧ୍ୟମରେ ଫୋନର ଇଣ୍ଟରନେଟ୍ ସଂଯୋଗ ସେୟାର୍ କରନ୍ତୁ"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ଆପଣଙ୍କ ମୋବାଇଲ୍‌ ଡାଟା ସଂଯୋଗ ମାଧ୍ୟମରେ ଅନ୍ୟ ଡିଭାଇସଗୁଡିକୁ ଇଣ୍ଟରନେଟ୍‌ ପ୍ରଦାନ କରିବା ପାଇଁ ହଟସ୍ପଟ୍ ଏବଂ ଟିଥରିଂ ବ୍ୟବହାର କରନ୍ତୁ। ଆଖପାଖରେ ଥିବା ଡିଭାଇସ୍‌ଗୁଡ଼ିକ ସହ କଣ୍ଟେଣ୍ଟ ସେୟାର୍‌ କରିବାକୁ ଆପ୍‌ଗୁଡ଼ିକ ମଧ୍ୟ ଗୋଟିଏ ହଟ୍‌ସ୍ପଟ୍‌ ତିଆରି କରିପାରିବେ।"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ଆପଣଙ୍କ ୱାଇ-ଫାଇ ବା ମୋବାଇଲ୍ ଡାଟା ସଂଯୋଗ ମାଧ୍ୟମରେ ଅନ୍ୟ ଡିଭାଇସକୁ ଇଣ୍ଟର୍ନେଟ୍ ପ୍ରଦାନ କରିବାକୁ ହଟସ୍ପଟ୍ ଏବଂ ଟିଥରିଂ ବ୍ୟବହାର କରନ୍ତୁ। ନିକଟସ୍ଥ ଡିଭାଇସଗୁଡ଼ିକ ସହ ବିଷୟବସ୍ତୁ ସେୟାର୍ କରିବାକୁ ଆପ୍ସ ମଧ୍ୟ ଏକ ହଟସ୍ପଟ୍ ତିଆରି କରିପାରିବ।"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ସାହାଯ୍ୟ"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ବ୍ଲୁଟୁଥ ସ୍କାନିଂ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ଆପ୍ ଓ ସେବାଗୁଡ଼ିକୁ ଯେକୌଣସି ସମୟରେ ଆଖପାଖରେ ଥିବା ଡିଭାଇସ୍‌ ଖୋଜିବାକୁ ଦିଅନ୍ତୁ, ଏପରିକି ବ୍ଲୁଟୂଥ୍‍‌ ଅଫ୍‌ ଥିଲେ ମଧ୍ୟ। ଏହାକୁ ଲୋକେସନ୍‌ ଆଧାରିତ ଫିଚର୍ ଓ ସେବା ଇତ୍ୟାଦିକୁ ଉନ୍ନତ କରିବା ପାଇଁ ବ୍ୟବହାର କରାଯାଇପାରେ।"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"କାର୍ଯ୍ୟ ପାଇଁ ଲୋକେସନ୍ ସମ୍ପର୍କିତ ସେବା"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"ବର୍ତ୍ତମାନର ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟ କରିବାକୁ ଡିଭାଇସର ଲୋକେସନ୍ ବ୍ୟବହାର କରିବା ପାଇଁ ଅନୁମତି ଦିଏ। ୱାଇ‑ଫାଇ ସ୍କାନିଂ ପରି ଅନ୍ୟ ଲୋକେସନ୍ ସେଟିଂସ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣର ସଠିକତାକୁ ପ୍ରଭାବିତ କରିପାରେ।"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ଚାଲୁ ଅଛି"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ବନ୍ଦ ଅଛି"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ସ୍ୱଚାଳିତ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ ଅକ୍ଷମ କରାଯାଇଛି"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ ଅକ୍ଷମ କରାଯାଇଛି"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ ସମର୍ଥିତ ନୁହେଁ"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ଲୋକେସନ୍ ଟାଇମ୍ ଜୋନ୍ ଚିହ୍ନଟକରଣ ପରିବର୍ତ୍ତନଗୁଡ଼ିକୁ ଅନୁମତି ଦିଆଯାଇନାହିଁ"</string>
     <string name="location_network_based" msgid="5247042890080021887">"ୱାଇ-ଫାଇ ଓ ମୋବାଇଲ୍‌ ନେଟ୍‌ୱର୍କ ଲୋକେସନ୍‌"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"ଆପଣଙ୍କର ଲୋକେସନ୍‌କୁ ଶୀଘ୍ର ଜାଣିବା ପାଇଁ, ଆପ୍‌ଗୁଡ଼ିକୁ Googleର ଲୋକେସନ୍‌ ସେବାର ବ୍ୟବହାର କରିବାକୁ ଦିଅନ୍ତୁ। ଅଜଣା ଲୋକେସନ୍‌ର ତଥ୍ୟ ସଂଗ୍ରହ କରାଯାଇ Googleକୁ ପଠାଯିବ।"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"ୱାଇ-ଫାଇ ଦ୍ୱାରା ନିର୍ଦ୍ଧାରିତ ଲୋକେସନ୍‌"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ଫେସ୍ ଅନ୍‌ଲକ୍ ବ୍ୟବହାର କରିବା ପାଇଁ, ପାସ୍‌ୱାର୍ଡ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ଫେସ୍ ଅନ୍‌ଲକ୍ ବ୍ୟବହାର କରିବା ପାଇଁ, ପାଟର୍ନ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ଫେସ୍ ଅନ୍‍ଲକ୍ ବ୍ୟବହାର କରିବା ପାଇଁ, ପିନ୍ ସେଟ୍ କରନ୍ତୁ"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ବାୟୋମେଟ୍ରିକ ବ୍ୟବହାର ପାଇଁ ବ୍ୟାକଅପ ସେଟ୍ କର"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ବାୟୋମେଟ୍ରିକ ବ୍ୟବହାର ପାଇଁ ପାଟର୍ନ ସେଟ୍ କର"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ବାୟୋମେଟ୍ରିକ ବ୍ୟବହାର ପାଇଁ PIN ସେଟ୍ କର"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"ଆପଣଙ୍କ ପାସୱାର୍ଡ ଭୁଲି ଯାଇଛନ୍ତି କି?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ପାଟର୍ନ ଭୁଲି ଯାଇଛନ୍ତି କି?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN ଭୁଲି ଯାଇଛନ୍ତି କି?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"କ୍ୟାପସନ୍ ପସନ୍ଦଗୁଡ଼ିକ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ମ୍ୟାଗ୍ନିଫିକେସନ୍"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ମାଗ୍ନିଫିକେସନ୍ ଅଞ୍ଚଳ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ମ୍ୟାଗ୍ନିଫିକେସନ୍ ସକ୍ଷମ ମୋଡ୍"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ସ୍କ୍ରିନ୍ ମାଗ୍ନିଫାଏ କରିବା ବେଳେ ଆପଣ ବ୍ୟବହାର କରିବାକୁ ଚାହୁଁଥିବା ମାଗ୍ନିଫିକେସନ୍ ଅଞ୍ଚଳ(ଗୁଡ଼ିକୁ) ବାଛନ୍ତୁ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ୍"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ସ୍କ୍ରିନ୍‌‌ର କିଛି ଅଂଶ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ପୂର୍ଣ୍ଣ ସ୍କ୍ରିନ୍ ଏବଂ ସ୍କ୍ରିନ୍‌ର ଅଂଶ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ସମ୍ପୁର୍ଣ୍ଣ ସ୍କ୍ରିନ୍ ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ସ୍କ୍ରିନ୍‌‌ର କିଛି ଅଂଶ ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ଆକ୍ସେସିବିଲିଟୀ ବଟନକୁ ସ୍ୱିଚ୍ କରିବେ କି?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ସ୍କ୍ରିନର ଏକ ଅଂଶକୁ ମାଗ୍ନିଫାଏ କରିବା ପାଇଁ ତିନିଥର ଟାପ୍ ବ୍ୟବହାର କରିବା ଦ୍ୱାରା ଟାଇପିଂ ଏବଂ ଅନ୍ୟ କାର୍ଯ୍ୟଗୁଡ଼ିକ ବିଳମ୍ବ ହୋଇଯିବ।\n\nଆପଣ ମାଗ୍ନିଫାଏ କରିବା ପାଇଁ ଆକ୍ସେସିବିଲିଟୀ ବଟନ୍ ବ୍ୟବହାର କରିବା ନିମନ୍ତେ ସ୍ୱିଚ୍ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ଆକ୍ସେସିବିଲିଟୀ ବଟନକୁ ସ୍ୱିଚ୍ କରନ୍ତୁ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ମାଗ୍ନିଫାଏ କରିବାକୁ ତିନିଥର ଟାପ୍ ଜାରି ରଖନ୍ତୁ"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ମାଗ୍ନିଫିକେସନ୍ ସେଟିଂସ୍"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ଟ୍ରିପଲ୍‌-ଟାପ୍‌ ଦ୍ୱାରା ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ସର୍ଟକଟ୍ ସାହାଯ୍ୟରେ ମାଗ୍ନିଫାଏ କରନ୍ତୁ"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ପାୱର୍‌ ବଟନ୍‌ କଲ୍‌ ସମାପ୍ତ କରେ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ବହୁତ ବଡ଼ ମାଉସ୍‌ ପଏଣ୍ଟର୍"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ଆନିମେସନ୍‌ଗୁଡ଼ିକୁ କାଢ଼ିଦିଅନ୍ତୁ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ମୋନୋ ଅଡିଓ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ଅଡିଓ ଚାଲୁଥିବା ସମ‍ୟରେ ଚାନେଲ୍‌ଗୁଡ଼ିକୁ ଯୋଡ଼ନ୍ତୁ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ଅଡିଓ ବ୍ୟାଲେନ୍ସ"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ବାମ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ଡାହାଣ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ମୋନୋ ଅଡିଓ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ଅଡିଓ ଚାଲୁଥିବା ସମୟରେ ଚ୍ୟାନେଲଗୁଡ଼ିକୁ ଯୋଡ଼ନ୍ତୁ"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ଅଡିଓ ବାଲାନ୍ସ"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ବାମ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ଡାହାଣ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ଡିଫଲ୍ଟ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ସେକେଣ୍ଡ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ସେକେଣ୍ଡ"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"ବିଜ୍ଞପ୍ତି ଭାଇବ୍ରେସନ୍"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ରିଙ୍ଗ ଭାଇବ୍ରେସନ୍"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ଟଚ୍ ଫିଡବ୍ୟାକ୍"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ଖୋଲନ୍ତୁ"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ରଙ୍ଗ ସଂଶୋଧନକୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"କ୍ୟାପ୍ସନ୍ ଦେଖାନ୍ତୁ"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"କେବଳ ସମର୍ଥିତ ଆପ୍ ପାଇଁ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ଖୋଲନ୍ତୁ"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ରଙ୍ଗ ସଂଶୋଧନ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"କ୍ୟାପ୍ସନଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"କେବଳ ସମର୍ଥିତ ଆପ୍ ପାଇଁ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"କ୍ୟାପସନ୍ ଆକାର ଏବଂ ଷ୍ଟାଇଲ୍"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ଟେକ୍ସଟ୍ ଆକାର"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ଅଧିକ ବିକଳ୍ପ"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ଡ୍ୟୁଟେରାନୋମାଲି"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ପ୍ରୋଟାନୋମାଲି"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ଟ୍ରିଟାନୋମାଲି"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ଗ୍ରେସ୍କେଲ୍"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ଲାଲ୍-ସବୁଜ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ଲାଲ୍-ସବୁଜ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ନୀଳ-ହଳଦିଆ"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ବ୍ୟାକଗ୍ରାଉଣ୍ଡ ରେଷ୍ଟ୍ରିକସନ୍"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ଆପ୍‌ଟିକୁ ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡରେ ଚାଲିବାକୁ ଦିଅନ୍ତୁ"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡରେ ଚାଲିବା ପାଇଁ ଆପ୍‌ ପାଖରେ ଅନୁମତି ନାହିଁ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ବ୍ୟାକଗ୍ରାଉଣ୍ଡରେ ବ୍ୟବହାରକୁ ପ୍ରତିବନ୍ଧିତ କରିହେବ ନାହିଁ"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ପୃଷ୍ଠପଟ ବ୍ୟବହାରକୁ ପ୍ରତିବନ୍ଧିତ କରାଯାଇପାରିବ ନାହିଁ"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପ ସୀମିତ କରିବେ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ଯଦି ଆପଣ ଗୋଟିଏ ଆପ୍‌ର ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ କାର୍ଯ୍ୟକଳାପକୁ ସୀମିତ କରିବେ, ଏହା ଠିକ୍‍ ଭାବରେ କାମ କରିନପାରେ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ବ୍ୟାଟେରୀକୁ ଅପ୍ଟିମାଇଜ୍ କରିବା ପାଇଁ ଯେହେତୁ ଏହି ଆପ୍‍କୁ ସେଟ୍ କରାଯାଇନାହିଁ, ତେଣୁ ଆପଣ ଏହାକୁ ସୀମାବଦ୍ଧ କରିପାରିବେ ନାହିଁ। \n\nଆପ୍‍କୁ ସୀମାବଦ୍ଧ କରିବା ପାଇଁ ପ୍ରଥମେ ବ୍ୟାଟେରୀ ଅପ୍ଟିମାଇଜେସନ୍‍କୁ ଚାଲୁ କରନ୍ତୁ।"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ଟାବଲେଟ୍‌ ସାଧାରଣ ତୁଳନାରେ ଅଧିକ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ଡିଭାଇସ୍‌ ସାଧାରଣ ତୁଳନାରେ ଅଧିକ ବ୍ୟବହାର କରାଯାଇଛି"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ଅନୁମାନ କରାଯାଉଥିବା ସମୟର ପୂର୍ବରୁ ବ୍ୟାଟେରୀ ସରିଯାଇପାରେ"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"ବ୍ୟାଟେରୀ ହେଲ୍ଥ ପାଇଁ ଅପ୍ଟିମାଇଜ୍ ହେଉଛି"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ବ୍ୟାଟେରୀ ଅସ୍ଥାୟୀ ଭାବେ ସୀମିତ ଅଛି। ଅଧିକ ଜାଣିବାକୁ ଟାପ୍ କରନ୍ତୁ।"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"ଆପଣଙ୍କ ଫୋନ୍ ସାଧାରଣ ତୁଳନାରେ ଅଧିକ ବ୍ୟବହାର କରାଯାଇଛି। ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ହୁଏତ ଆଶା କରାଯାଉଥିବା ସମୟ ଠାରୁ ଶୀଘ୍ର ସରି ଯାଇପାରେ।\n\n ବ୍ୟାଟେରୀର ବ୍ୟବହାର ଦ୍ୱାରା ଶ୍ରେଷ୍ଠ ଆପ୍ସ:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"ଆପଣଙ୍କର ଟାବ୍‍‍ଲେଟ୍ ସାଧାରଣ ତୁଳନାରେ ଅଧିକ ବ୍ୟବହାର କରାଯାଇଛି। ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ହୁଏତ ଆଶା କରାଯାଉଥିବା ସମୟ ଠାରୁ ଶୀଘ୍ର ସରି ଯାଇପାରେ।\n\n ବ୍ୟାଟେରୀର ବ୍ୟବହାର ଦ୍ୱାରା ଶ୍ରେଷ୍ଠ ଆପ୍ସ:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"ଆପଣଙ୍କ ଡିଭାଇସ୍ ସାଧାରଣ ତୁଳନାରେ ଅଧିକ ବ୍ୟବହାର କରାଯାଇଛି। ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ହୁଏତ ଆଶା କରାଯାଉଥିବା ସମୟ ଠାରୁ ଶୀଘ୍ର ସରି ଯାଇପାରେ।\n\n ବ୍ୟାଟେରୀର ବ୍ୟବହାର ଦ୍ୱାରା ଶ୍ରେଷ୍ଠ ଆପ୍ସ:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$dଟି ଆପ୍‌କୁ ଅବରୋଧ କରାଯାଇଛି</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ମିଟର୍ ପଢ଼ିବାରେ ସମସ୍ୟା ହେଉଛି"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"ଆପଣଙ୍କ ବ୍ୟାଟେରୀ ମିଟର୍ ପଢ଼ିବାରେ ସମସ୍ୟା ହେଉଛି। "<annotation id="url">"ଅଧିକ ଜାଣିବାକୁ"</annotation>"ରେ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ଆପ୍‌କୁ ବନ୍ଦ କରିବେ?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"ଆପଣଙ୍କ ଫୋନ୍‌ ସାମାନ୍ୟ ଭାବେ ବ୍ୟାଟେରୀ ପରିଚାଳନା କରିପାରିବ ନାହିଁ କାରଣ, ଆପଣ ଆ‌ପ୍‌ ବ୍ୟବହାର ନକରୁଥିବାବେଳେ <xliff:g id="APP">%1$s</xliff:g> ଆପଣଙ୍କ ଫୋନ୍‌କୁ ଜାଗ୍ରତ କରି ରଖୁଛି।\n\nଏହାର ସମାଧାନସ୍ୱରୂପ, ଏହି ଆପ୍‌କୁ ଆପଣ ବନ୍ଦ କରିଦେଇପାରିବେ।\n\nଯଦି ଏହିପରି ଲାଗିରୁହେ, ତେବେ ବ୍ୟାଟେରୀର ଗତିବିଧି ବଢ଼ାଇବା ପାଇଁ ଆପଣଙ୍କୁ ଏହି ଆପ୍‌କୁ ଅନଇନଷ୍ଟଲ୍‌ କରିବାକୁ ପଡ଼ିପାରେ।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌ ବ୍ୟାଟେରୀକୁ ସାଧାରଣ ଭାବେ ପରିଚାଳନା କରିପାରୁନାହିଁ କାରଣ <xliff:g id="APP">%1$s</xliff:g> ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌କୁ ଜାଗ୍ରତ କରି ରଖିଛି।\n\nଏହି ସମସ୍ୟାର ସମାଧାନ କରିବା ପାଇଁ ଆପଣ ଆପ୍‌କୁ ବନ୍ଦ କରିପାରିବେ।\n\nଯଦି ଏହିପରି ଲାଗିରୁହେ, ତେବେ ବ୍ୟାଟେରୀର କାର୍ଯ୍ୟଦକ୍ଷତାରେ ଉନ୍ନତି ଆଣିବା ପାଇଁ ଆପଣଙ୍କୁ ଆପ୍‌ଟିକୁ ଅନ୍‌ଇନ୍‌ଷ୍ଟଲ୍‌ କରିବାକୁ ପଡ଼ିବ।"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ଗୋଟିଏ ସିଡୁଲ୍ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ବ୍ୟାଟେରୀର ଜୀବନକାଳ ବଢ଼ାନ୍ତୁ"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ଚାର୍ଜ ହୋଇଗଲେ ବନ୍ଦ କରନ୍ତୁ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ଆପଣଙ୍କ ଫୋନ୍ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ଆପଣଙ୍କ ଟାବ୍‌ଲେଟ୍‌ର ଚାର୍ଜ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ଆପଣଙ୍କ ଡିଭାଇସ୍ <xliff:g id="PERCENT">%1$s</xliff:g> ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ଆପଣଙ୍କ ଫୋନର ଚାର୍ଜ <xliff:g id="PERCENT">%1$s</xliff:g>ରୁ ଅଧିକ ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ଆପଣଙ୍କ ଟାବଲେଟର ଚାର୍ଜ <xliff:g id="PERCENT">%1$s</xliff:g>ରୁ ଅଧିକ ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ଆପଣଙ୍କ ଡିଭାଇସର ଚାର୍ଜ <xliff:g id="PERCENT">%1$s</xliff:g>ରୁ ଅଧିକ ହେଲେ ବ୍ୟାଟେରୀ ସେଭର୍ ବନ୍ଦ ହୁଏ"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ଚାଲୁ କରନ୍ତୁ"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ରିସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="tts_play" msgid="2945513377250757221">"ଚଲାନ୍ତୁ"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ଆଡପ୍ଟିଭ୍ କନେକ୍ଟିଭିଟି"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ଆପଣଙ୍କ ନେଟୱାର୍କ ସଂଯୋଗଗୁଡ଼ିକୁ ସ୍ୱଚାଳିତ ଭାବେ ପରିଚାଳନା କରି ବ୍ୟାଟେରୀ ଲାଇଫ୍ ବଢ଼ାଏ ଏବଂ ଡିଭାଇସର କାର୍ଯ୍ୟଦକ୍ଷତାକୁ ଉନ୍ନତ କରେ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"କ୍ରେଡେନ୍ସିଆଲ୍ ଷ୍ଟୋରେଜ୍"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ଏକ ସାର୍ଟିଫିକେଟ୍ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ଷ୍ଟୋରେଜ୍‌ରୁ ସାର୍ଟିଫିକେଟ୍‌ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ଉପଯୋଗକର୍ତ୍ତା କ୍ରେଡେନସିଆଲ୍"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ସେଭ୍‌ ହୋଇଥିବା କ୍ରେଡେନସିଆଲ୍ ଦେଖନ୍ତୁ ଓ ବଦଳାନ୍ତୁ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ଉନ୍ନତ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ଷ୍ଟୋରେଜ୍‌ ପ୍ରକାର"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ହାର୍ଡୱେର୍‌-ସମର୍ଥିତ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ସଫ୍ଟୱେୟାର କେବଳ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ଏହି ଉପଯୋଗକର୍ତ୍ତାଙ୍କର ତଥ୍ୟ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ଏବଂ ଆପସ୍‌ ପାଇଁ ସଂସ୍ଥାପିତ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ୱାଇ-ଫାଇ ପାଇଁ ଇନ୍‌ଷ୍ଟଲ୍‌ ହୋଇଛି"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"ଇନ୍‌ଷ୍ଟଲ୍ କରନ୍ତୁ ନାହିଁ"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"ଯେ କୌଣସି ମତେ ଇନଷ୍ଟଲ୍ କରନ୍ତୁ"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"ସାର୍ଟିଫିକେଟ୍ ଇନ୍‌ଷ୍ଟଲ୍ କରାଯାଇ ନାହିଁ"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"ଏହି ଡିଭାଇସରେ ସାର୍ଟିଫିକେଟଗୁଡ଼ିକୁ ଇନଷ୍ଟଲ୍ କରିବା ପାଇଁ <xliff:g id="APP_NAME">%s</xliff:g>କୁ ଅନୁମତି ଦେବେ କି?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"ଏହି ସାର୍ଟିଫିକେଟଗୁଡ଼ିକ ନିମ୍ନରେ ଥିବା ଆପ୍ ଏବଂ URLଗୁଡ଼ିକ ପାଇଁ ଆପଣଙ୍କୁ ଚିହ୍ନଟ କରିବ"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"ଅନୁମତି ଦିଅନ୍ତୁ ନାହିଁ"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"ଅନୁମତି ଦିଅନ୍ତୁ"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"ଅଧିକ ଦେଖାନ୍ତୁ"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"ସାର୍ଟିଫିକେଟ୍ ମ୍ୟାନେଜମେଣ୍ଟ ଆପ୍"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"କିଛି ନାହିଁ"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"ଏହି ଆପ୍ ଦ୍ୱାରା ଇନଷ୍ଟଲ୍ କରାଯାଇଥିବା ସାର୍ଟିଫିକେଟଗୁଡ଼ିକ ନିମ୍ନରେ ଥିବା ଆପ୍ ଏବଂ URLଗୁଡ଼ିକ ପାଇଁ ଆପଣଙ୍କୁ ଚିହ୍ନଟ କରିବ"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"କାଢ଼ି ଦିଅନ୍ତୁ"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"ଆପାତକାଳୀନ ଡାଏଲିଙ୍ଗ ସିଗ୍ନାଲ୍"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"ଏକ ଜରୁରୀକାଳୀନ କଲ୍ କରୁଥିବାବେଳେ ଗତିବିଧି ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"ବ୍ୟାକଅପ୍‌"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ସେଟ୍‌ ଅପ୍‌ ହୋଇନାହିଁ - କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲ୍‌"</string>
     <string name="user_admin" msgid="4024553191395768119">"ଆଡ୍‌ମିନ୍‌"</string>
     <string name="user_you" msgid="3070562015202859996">"ଆପଣ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ଡାକନାମ"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"ଆପଣ <xliff:g id="USER_COUNT">%1$d</xliff:g> ଜଣ ପର୍ଯ୍ୟନ୍ତ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ଯୋଡ଼ିପାରିବେ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"କେବଳ ଟାବ୍‌ଲେଟ୍‌ର ମାଲିକ ହିଁ ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ପରିଚାଳନା କରିପାରିବେ।"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"କେବଳ ଫୋନ୍‌ର ମାଲିକ ଉପଯୋଗକର୍ତ୍ତାଙ୍କୁ ପରିଚାଳନା କରିପାରିବେ।"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ଟର୍ମିନାଲ୍‌‌ରେ ଦେୟ ଦେବା"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ଏକ ପେମେଣ୍ଟ ଆପ୍‌ ସେଟ୍‌ଅପ୍‌ କରନ୍ତୁ। କଣ୍ଟାକ୍ଟଲେସ୍‌ ସଙ୍କେତ ଥିବା ଯେକୌଣସି ଟର୍ମିନାଲ୍‌ରେ ଆପଣଙ୍କ ଫୋନ୍‌ର ପଛ ପାଖ କେବଳ ଧରି ରଖନ୍ତୁ।"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ବୁଝିଲି"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ଅଧିକ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ଅଧିକ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ଡିଫଲ୍ଟ ପେମେଣ୍ଟ ଆପ୍ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ଡିଫଲ୍ଟ ପେମେଣ୍ଟ ଆପ୍ ଅପଡେଟ୍ କରନ୍ତୁ"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ଏକ କଣ୍ଟାକ୍ଟଲେସ୍ ଟର୍ମିନାଲରେ, <xliff:g id="APP">%1$s</xliff:g> ମାଧ୍ୟମରେ ପେ କରନ୍ତୁ"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ପଶ୍ଚାତ୍"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ପରବର୍ତ୍ତୀ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ସମାପ୍ତ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ଗୋଟିଏ ଫଟୋ ଉଠାନ୍ତୁ"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ଗୋଟିଏ ଛବି ବାଛନ୍ତୁ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ଫଟୋ ବାଛନ୍ତୁ:"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM କାର୍ଡ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ସିମ୍‌ କାର୍ଡଗୁଡ଼ିକ"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"କଲ୍‌ ପାଇଁ ଏହାକୁ ସର୍ବଦା ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"ଡାଟା ପାଇଁ ଏକ SIM ଚୟନ କରନ୍ତୁ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS ପାଇଁ ଏକ SIM ବାଛନ୍ତୁ"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"ଡାଟା ପାଇଁ ସିମ୍‌ ବଦଳାଉଛି, ଏଥିରେ କିଛି ସମୟ ଲାଗିପାରେ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ଡାଟା SIM ସ୍ୱିଚ୍ କରାଯାଉଛି, ଏଥିରେ କିଛି ସମୟ ଲାଗିପାରେ…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ଏହାଙ୍କ ସହ କଲ୍‌"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ଏକ SIM କାର୍ଡ ବାଛି ନିଅନ୍ତୁ"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ରୁଟିନ୍, ସମୟ ସୂଚୀ, ବ୍ୟାଟେରୀ ସେଭର୍, ପାୱର୍ ସେଭର୍, ବ୍ୟାଟେରୀ, ସ୍ୱତଃ, ଶତକଡ଼ା"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ଉନ୍ନତ କଲିଂ, 4g କଲିଂ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ଭାଷା ଯୋଗ କରନ୍ତୁ, ଏକ ଭାଷା ଯୋଗ କରନ୍ତୁ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ଅକ୍ଷର ଆକାର"</string>
     <string name="default_sound" msgid="6604374495015245195">"ପୂର୍ବ-ନିର୍ଦ୍ଧାରିତ ଶବ୍ଦ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ରିଙ୍ଗ ଏବଂ ବିଜ୍ଞପ୍ତି ଭଲ୍ୟୁମ୍ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ଭଲ୍ୟୁମ୍, ଭାଇବ୍ରେସନ୍, ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ଚାଲୁ ହେବାର ଶବ୍ଦ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"ଲାଇଭ୍ କ୍ୟାପ୍ସନ୍"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ସ୍ବଚାଳିତ କ୍ୟାପ୍ସନ୍ ମିଡିଆ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"କିଛି ନାହିଁ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି</item>
-      <item quantity="one">1ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{କିଛି ନାହିଁ}=1{1ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି}other{#ଟି ସିଡୁଲ୍ ସେଟ୍ ହୋଇଛି}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"କେବଳ ଗୁରୁତ୍ଵପୂର୍ଣ୍ଣ ଲୋକ ଏବଂ ଆପ୍ସ ଦ୍ୱାରା ସୂଚନା ପାଆନ୍ତୁ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ବ୍ୟାଘାତଗୁଡ଼ିକୁ ସୀମିତ କରନ୍ତୁ"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"କେବଳ ପ୍ରାଥମିକତା"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ଅନ୍/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ଅଫ୍/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ବନ୍ଦ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ଚାଲୁ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ପ୍ରତ୍ୟେକ ଥର ପଚାରନ୍ତୁ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ଯେପର୍ଯ୍ୟନ୍ତ ଆପଣ ବନ୍ଦ କରି ନାହାଁନ୍ତି"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ଘଣ୍ଟା</item>
-      <item quantity="one">1 ଘଣ୍ଟା</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> ମିନିଟ୍"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ସିଡୁଲ୍ ସ୍ଵଚାଳିତ ଭାବେ ଚାଲୁ କରାଯାଇପାରେ</item>
-      <item quantity="one">1 ସିଡୁଲ୍ ସ୍ଵଚାଳିତ ଭାବେ ଚାଲୁ କରାଯାଇପାରେ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ଘଣ୍ଟା}other{# ଘଣ୍ଟା}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 ମିନିଟ୍}other{# ମିନିଟ୍}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ବନ୍ଦ ଅଛି}=1{ବନ୍ଦ ଅଛି / 1ଟି ସିଡୁଲ୍ ସ୍ୱଚାଳିତ ଭାବରେ ଚାଲୁ ହୋଇପାରିବ}other{ବନ୍ଦ ଅଛି / #ଟି ସିଡୁଲ୍ ସ୍ୱଚାଳିତ ଭାବରେ ଚାଲୁ ହୋଇପାରିବ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\' ମୋଡକୁ କଣ ବାଧା ଦେଇପାରେ"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ଲୋକମାନେ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ଆପ୍ସ"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ସ୍ୱଚାଳିତ ଭାବେ କମ୍ ପ୍ରାଥମିକତା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଜେଣ୍ଟଲ୍‌ରେ ସେଟ୍ କରନ୍ତୁ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ଆଡେପ୍ଟିଭ୍ ବିଜ୍ଞପ୍ତି ରେଙ୍କିଂ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ପ୍ରାସଙ୍ଗିକତା ହିସାବରେ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ସ୍ୱଚାଳିତ ଭାବେ ରାଙ୍କ୍ ଦେଇଥାଏ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ଆଡେପ୍ଟିଭ୍ ବିଜ୍ଞପ୍ତିର ମତାମତ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ଏହା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକରେ କରାଯାଇଥିବା ଆଡଜଷ୍ଟମେଣ୍ଟଗୁଡ଼ିକୁ ସୂଚିତ କରେ ଏବଂ ସିଷ୍ଟମକୁ ମତାମତ ଦେବାର ବିକଳ୍ପ ଦେଖାଏ"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"ବିଜ୍ଞପ୍ତି ଗୁରୁତ୍ୱ ରିସେଟ୍ କରନ୍ତୁ"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"ଉପଯୋଗକର୍ତ୍ତାଙ୍କ ଦ୍ୱାରା ବଦଳାଯାଇଥିବା ଗୁରୁତ୍ଵପୂର୍ଣ୍ଣ ସେଟିଂସକୁ ରିସେଟ୍ କରନ୍ତୁ ଓ ବିଜ୍ଞପ୍ତି ଆସିଷ୍ଟାଣ୍ଟକୁ ପ୍ରାଥମିକତା ଦେବା ପାଇଁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ପ୍ରସ୍ତାବିତ କାର୍ଯ୍ୟ ଏବଂ ପ୍ରତ୍ୟୁତ୍ତରଗୁଡ଼ିକ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ସ୍ୱଚାଳିତ ଭାବେ ପରାମର୍ଶ କରାଯାଇଥିବା କାର୍ଯ୍ୟ ଏବଂ ଉତ୍ତରଗୁଡ଼ିକ ଦେଖାନ୍ତୁ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ବର୍ତ୍ତମାନର ଏବଂ ସ୍ନୁଜ୍ କରାଯାଇଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"ପ୍ରାଥମିକତା ଦିଆଯାଇଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"ବାର୍ତ୍ତାଳାପ ବିଭାଗର ଶୀର୍ଷରେ ଏବଂ ଫ୍ଲୋଟିଂ ବବଲଗୁଡ଼ିକ ଭାବେ ଦେଖାନ୍ତୁ"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"ବାର୍ତ୍ତାଳାପ ବିଭାଗର ଶୀର୍ଷରେ ଦେଖାନ୍ତୁ"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"ଅନ୍ୟ ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
+    <string name="other_conversations" msgid="551178916855139870">"ପ୍ରାଥମିକତା ନଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକରେ ଆପଣ କରିଥିବା ପରିବର୍ତ୍ତନଗୁଡ଼ିକ"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"ବର୍ତ୍ତମାନର ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ବର୍ତ୍ତମାନର ଖାଲି କର"</string>
+    <string name="clear" msgid="5092178335409471100">"ଖାଲି କରନ୍ତୁ"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ପ୍ରାଥମିକତା ଦିଆଯାଉଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକୁ ବବଲ୍ କରନ୍ତୁ"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ପ୍ରାଥମିକତା ଦିଆଯାଉଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ପୁଲ୍-ଡାଉନ୍ ସେଡର ଶୀର୍ଷରେ ଦେଖାନ୍ତୁ। ଆପଣ ସେଗୁଡ଼ିକୁ ବବଲ୍ ଭାବେ ମଧ୍ୟ ସେଟ୍ କରିପାରିବେ ଏବଂ \'ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\' ମୋଡକୁ ବାଧା ଦେଇପାରିବେ।"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ପ୍ରାଥମିକତା ଦିଆଯାଇଥିବା ଏବଂ ପରିବର୍ତ୍ତିତ ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ ଏଠାରେ ଦେଖାଯିବ"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\" ଆକ୍ସେସ୍"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\"ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ\"କୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ବ୍ୟସ୍ତ କରନ୍ତୁ ନାହିଁ ଆକ୍ସେସ୍‌ କୌଣସି ସଂସ୍ଥାପିତ ଆପ୍‌ଗୁଡ଼ିକ ଅନୁରୋଧ କରିନାହାଁନ୍ତି"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ଆପ୍‌ଗୁଡ଼ିକୁ ଲୋଡ୍‌ କରାଯାଉଛି..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ଆପଗୁଡ଼ିକ ଲୋଡ୍ ହେଉଛି…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"ଆପଣଙ୍କ ଅନୁରୋଧରେ Android, ଏହି ଆପ୍‌ର ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ, ଏହି ଡିଭାଇସ୍‌ରେ ଦେଖାଉନାହିଁ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"ଆପଣଙ୍କ ଅନୁରୋଧରେ, Android, ବିଜ୍ଞପ୍ତିଗୁଡିର ଏହି ବର୍ଗକୁ ଏହି ଡିଭାଇସରେ ଦେଖାଦେବାରେ ଅବରୋଧ କରୁଛି"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"ଆପଣଙ୍କ ଅନୁରୋଧରେ, Android, ବିଜ୍ଞପ୍ତିଗୁଡିର ଏହି ଗୋଷ୍ଠୀକୁ ଏହି ଡିଭାଇସରେ ଦେଖାଦେବାରେ ଅବରୋଧ କରୁଛି"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ସମସ୍ତ ବାର୍ତ୍ତାଳାପ"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ପ୍ରାଥମିକତା ଦିଆଯାଇଥିବା ବାର୍ତ୍ତାଳାପଗୁଡ଼ିକ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"କିଛି ନାହିଁ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g>ଟି ବାର୍ତ୍ତାଳାପ</item>
-      <item quantity="one">1ଟି ବାର୍ତ୍ତାଳାପ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"କିଛି ନାହିଁ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{କିଛି ନାହିଁ}=1{1ଟି ବାର୍ତ୍ତାଳାପ}other{#ଟି ବାର୍ତ୍ତାଳାପ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"କିଏ ବାଧା ସୃଷ୍ଟି କରିପାରିବ"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"କଲ୍‌"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"କଲ୍‌ଗୁଡ଼ିକ"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ଅନୁମତି ପ୍ରାପ୍ତ କଲଗୁଡ଼ିକ ଆସିଲେ ସାଉଣ୍ଡ ହେବାକୁ ସୁନିଶ୍ଚିତ କରିବା ପାଇଁ ଡିଭାଇସଟି ରିଂ ହେବା ମୋଡରେ ସେଟ୍ କରାଯାଇଛି ବୋଲି ଯାଞ୍ଚ କରନ୍ତୁ"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ ଇନକମିଂ କଲ୍‍‍‍‍‍‍‍‍ଗୁଡ଼ିକ ବ୍ଲକ୍ କରାଯାଇଛି। ସାଙ୍ଗ,ପରିବାର ଲୋକେ କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଂସ୍‍କୁ ଆଡ୍‌ଜଷ୍ଟ କରିପାରିବେ।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ତାରାଙ୍କିତ ଯୋଗାଯୋଗ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g>ଟି ଅନ୍ୟ</item>
-      <item quantity="one">1ଟି ଅନ୍ୟ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"କିଛି ନାହିଁ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{କିଛି ନାହିଁ}=1{{contact_1}}=2{{contact_1} ଏବଂ {contact_2}}=3{{contact_1}, {contact_2} ଏବଂ {contact_3}}other{{contact_1}, {contact_2} ଏବଂ ଅନ୍ୟ #ଟି ଯୋଗାଯୋଗ}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(କୌଣସି ନାମ ନାହିଁ)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ମେସେଜଗୁଡ଼ିକ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ପାଇଁ ଇନକମିଂ ମେସେଜ୍‌ଗୁଡ଼ିକ ବ୍ଲକ୍ କରାଯାଇଛି। ଆପଣଙ୍କ ବନ୍ଧୁ, ପରିବାର ବର୍ଗ କିମ୍ବା ଅନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଂସ୍‍କୁ ଆଡ୍‌ଜଷ୍ଟ କରିପାରିବେ।"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"ସମସ୍ତ ମେସେଜ୍ ଆପଣଙ୍କ ପାଖରେ ପହଞ୍ଚିପାରିବ"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ସମସ୍ତ କଲ୍ ଆପଣଙ୍କ ପାଖରେ ପହଞ୍ଚିପାରିବ"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"କିଛି ନାହିଁ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g>ଟି ଯୋଗାଯୋଗ</item>
-      <item quantity="one">1ଟି ଯୋଗାଯୋଗ</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{କିଛି ନାହିଁ}=1{1ଟି ଯୋଗାଯୋଗ}other{#ଟି ଯୋଗାଯୋଗ}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ଯେ କୌଣସି ବ୍ୟକ୍ତି"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ଯୋଗାଯୋଗଗୁଡ଼ିକ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ତାରାଙ୍କିତ ଯୋଗାଯୋଗଗୁଡ଼ିକ"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ସମସ୍ତ ବିଜ୍ଞପ୍ତି"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"କିଛି ବିଜ୍ଞପ୍ତି"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ଆପଣ ଆପଗୁଡ଼ିକୁ ବାଧା ସୃଷ୍ଟି କରିବାକୁ ଅନୁମତି ନଦେଲେ ମଧ୍ୟ ଆପଣଙ୍କ ପାଖରେ ଚୟନିତ ଲୋକମାନେ ପହଞ୍ଚି ପାରିବେ"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ବାଧା ଉପୁଯାଇପାରେ</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> ବାଧା ଉପୁଯାଇପାରେ</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g>ଟି ଅଧିକ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{କୌଣସି ଆପ୍ ବାଧା ସୃଷ୍ଟି କରିପାରିବ ନାହିଁ}=1{{app_1} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}=2{{app_1} ଏବଂ {app_2} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}=3{{app_1}, {app_2} ଏବଂ {app_3} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}other{{app_1}, {app_2}, ଏବଂ ଆହୁରି #ଟି ଆପ୍ ବାଧା ସୃଷ୍ଟି କରିପାରିବ}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ଆପଗୁଡ଼ିକ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ସମସ୍ତ ବିଜ୍ଞପ୍ତି"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"କିଛି ବିଜ୍ଞପ୍ତି"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ବାଧା ସୃଷ୍ଟି କରିପାରୁଥିବା ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ସମସ୍ତ ବିଜ୍ଞପ୍ତିକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ବାଧା ଉପୁଯାଇପାରେ</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> ବାଧା ଉପୁଯାଇପାରେ</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"କିଛି ବାଧା ଉପୁଯାଇପାରିବ ନାହିଁ"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g>ଟି ଅଧିକ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{କିଛି ବି ବାଧା ସୃଷ୍ଟି କରିପାରିବ ନାହିଁ}=1{{sound_category_1} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}=2{{sound_category_1} ଏବଂ {sound_category_2} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}=3{{sound_category_1}, {sound_category_2}, ଏବଂ {sound_category_3} ବାଧା ସୃଷ୍ଟି କରିପାରିବ}other{{sound_category_1}, {sound_category_2}, ଏବଂ ଆହୁରି #ଟି ଆପ୍ ବାଧା ସୃଷ୍ଟି କରିପାରିବ}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"କିଛି ବି ବାଧା ସୃଷ୍ଟି କରିପାରିବ ନାହିଁ"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"କେହି ବି ବାଧା ଉପୁଯାଇପାରିବେ ନାହିଁ"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"କିଛି ଲୋକ ବାଧା ଦେଇପାରନ୍ତି"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ସବୁ ଲୋକ ବାଧା ଉପୁଯାଇପାରିବେ"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ଚାଲୁ"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"ବନ୍ଦ"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"ଆପ୍ ପିନିଂ"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"ବର୍ତ୍ତମାନର ଆପକୁ ଆପଣ ଅନପିନ୍ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ଏହାକୁ ସ୍କ୍ରିନରେ ଦେଖାଇବା ପାଇଁ ଆପ୍ ପିନିଂ ସୁବିଧା ଆପଣଙ୍କୁ ଅନୁମତି ଦିଏ। ଏହି ଫିଚର୍ ଅନେକ କ୍ଷେତ୍ରରେ ବ୍ୟବହୃତ ହୋଇପାରେ, ଉଦାହରଣ ସ୍ଵରୂପ, ଜଣେ ବିଶ୍ୱସ୍ତ ସାଙ୍ଗକୁ ଏକ ନିର୍ଦ୍ଦିଷ୍ଟ ଗେମ୍ ଖେଳିବାକୁ ଦେବା। \n\nକୌଣସି ଆପ୍ ପିନ୍ କରାଗଲେ, ପିନ୍ ହୋଇଥିବା ଆପଟି ଅନ୍ୟ ଆପଗୁଡ଼ିକୁ ଖୋଲିପାରେ ଏବଂ ବ୍ୟକ୍ତିଗତ ଡାଟାକୁ ଆକ୍ସେସ୍ କରାଯାଇପାରେ। \n\nଆପ୍ ପିନିଂ ବ୍ୟବହାର କରିବାକୁ: 	\n1.	ଆପ୍ ପିନିଂ ଚାଲୁ କରନ୍ତୁ 	\n2.	ଓଭରଭିଉ ଖୋଲନ୍ତୁ 	\n3.	ସ୍କ୍ରିନର ଶୀର୍ଷରେ ଥିବା ଆପ୍ ଆଇକନରେ ଟାପ୍ କରନ୍ତୁ, ତା\'ପରେ ପିନରେ ଟାପ୍ କରନ୍ତୁ"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"ବର୍ତ୍ତମାନର ଆପକୁ ଆପଣ ଅନପିନ୍ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ଏହାକୁ ସ୍କ୍ରିନରେ ଦେଖାଇବା ପାଇଁ ଆପ୍ ପିନିଂ ସୁବିଧା ଆପଣଙ୍କୁ ଅନୁମତି ଦିଏ। ଏହି ଫିଚର୍ ଅନେକ କ୍ଷେତ୍ରରେ ବ୍ୟବହୃତ ହୋଇପାରେ, ଉଦାହରଣ ସ୍ଵରୂପ, ଜଣେ ବିଶ୍ୱସ୍ତ ସାଙ୍ଗକୁ ଏକ ନିର୍ଦ୍ଦିଷ୍ଟ ଗେମ୍ ଖେଳିବାକୁ ଦେବା। \n\nକୌଣସି ଆପ୍ ପିନ୍ କରାଗଲେ, ପିନ୍ ହୋଇଥିବା ଆପଟି ଅନ୍ୟ ଆପଗୁଡ଼ିକୁ ଖୋଲିପାରେ ଏବଂ ବ୍ୟକ୍ତିଗତ ଡାଟାକୁ ଆକ୍ସେସ୍ କରାଯାଇପାରେ। \n\nଯଦି ଆପଣ କୌଣସି ବ୍ୟକ୍ତିଙ୍କ ସହ ଆପଣଙ୍କ ଡିଭାଇସ୍ ସୁରକ୍ଷିତ ଭାବେ ସେୟାର୍ କରିବାକୁ ଚାହୁଁଛନ୍ତି, ତେବେ ଏହା ପରିବର୍ତ୍ତେ ଏକ ଅତିଥି ଉପଯୋଗକର୍ତ୍ତା ବ୍ୟବହାର କରି ଦେଖନ୍ତୁ। \n\nଆପ୍ ପିନିଂ ବ୍ୟବହାର କରିବାକୁ:\n1.	ଆପ୍ ପିନିଂ ଚାଲୁ କରନ୍ତୁ\n2.	ଓଭରଭିଉ ଖୋଲନ୍ତୁ\n3.	ସ୍କ୍ରିନର ଶୀର୍ଷରେ ଥିବା ଆପ୍ ଆଇକନରେ ଟାପ୍ କରି ତାପରେ ପିନରେ ଟାପ୍ କରନ୍ତୁ"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"ବର୍ତ୍ତମାନର ଆପକୁ ଆପଣ ଅନପିନ୍ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ଏହାକୁ ସ୍କ୍ରିନରେ ଦେଖାଇବା ପାଇଁ ଆପ୍ ପିନିଂ ଆପଣଙ୍କୁ ଅନୁମତି ଦିଏ। ଏହି ଫିଚର୍ ଏହି କ୍ଷେତ୍ରରେ ବ୍ୟବହୃତ ହୋଇପାରେ, ଉଦାହରଣ ସ୍ଵରୂପ, ଜଣେ ବିଶ୍ୱସ୍ତ ସାଙ୍ଗକୁ ଏକ ନିର୍ଦ୍ଦିଷ୍ଟ ଗେମ୍ ଖେଳିବାକୁ ଦେବା।"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"କୌଣସି ଆପ୍ ପିନ୍ କରାଗଲେ, ପିନ୍ ହୋଇଥିବା ଆପଟି ଅନ୍ୟ ଆପଗୁଡ଼ିକୁ ଖୋଲିପାରେ ଏବଂ ବ୍ୟକ୍ତିଗତ ଡାଟାକୁ ଆକ୍ସେସ୍ କରାଯାଇପାରେ। \n\nଆପ୍ ପିନିଂ ବ୍ୟବହାର କରିବାକୁ: 	\n1.	ଆପ୍ ପିନିଂ ଚାଲୁ କରନ୍ତୁ 	\n2.	ଓଭରଭିଉ ଖୋଲନ୍ତୁ 	\n3.	ସ୍କ୍ରିନର ଶୀର୍ଷରେ ଥିବା ଆପ୍ ଆଇକନରେ ଟାପ୍ କରି ତା\'ପରେ ପିନରେ ଟାପ୍ କରନ୍ତୁ"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"କୌଣସି ଆପ୍ ପିନ୍ କରାଗଲେ, ପିନ୍ ହୋଇଥିବା ଆପଟି ଅନ୍ୟ ଆପଗୁଡ଼ିକୁ ଖୋଲିପାରେ ଏବଂ ବ୍ୟକ୍ତିଗତ ଡାଟାକୁ ଆକ୍ସେସ୍ କରାଯାଇପାରେ। \n\nଯଦି ଆପଣ କୌଣସି ବ୍ୟକ୍ତିଙ୍କ ସହ ଆପଣଙ୍କ ଡିଭାଇସ୍ ସୁରକ୍ଷିତ ଭାବେ ସେୟାର୍ କରିବାକୁ ଚାହୁଁଛନ୍ତି, ତେବେ ଏହା ପରିବର୍ତ୍ତେ ଜଣେ ଅତିଥି ଉପଯୋଗକର୍ତ୍ତା ବ୍ୟବହାର କରି ଦେଖନ୍ତୁ। \n\nଆପ୍ ପିନିଂ ବ୍ୟବହାର କରିବାକୁ: 	\n1.	ଆପ୍ ପିନିଂ ଚାଲୁ କରନ୍ତୁ 	\n2.	ଓଭରଭିଉ ଖୋଲନ୍ତୁ 	\n3.	ସ୍କ୍ରିନର ଶୀର୍ଷରେ ଥିବା ଆପ୍ ଆଇକନରେ ଟାପ୍ କରି ତା\'ପରେ ପିନରେ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"ଆପ୍ ପିନ୍ କରାଗଲେ: \n\n•		ବ୍ୟକ୍ତିଗତ ଡାଟାକୁ ଆକ୍ସେସ୍ କରାଯାଇପାରେ \n		(ଯେପରିକି ଯୋଗାଯୋଗଗୁଡ଼ିକ ଏବଂ ଇମେଲ୍ ବିଷୟବସ୍ତୁ) \n•		ପିନ୍ ହୋଇଥିବା ଆପ ଅନ୍ୟ ଆପଗୁଡ଼ିକୁ ଖୋଲିପାରେ \n\nକେବଳ ଆପଣ ବିଶ୍ୱାସ କରୁଥିବା ଲୋକମାନଙ୍କ ସହ ଆପ୍ ପିନିଂ ବ୍ୟବହାର କରନ୍ତୁ।"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"ଅନ୍‌ପିନ୍‌ କରିବା ପୂର୍ବରୁ ଅନ୍‌ଲକ୍ ପାଟର୍ନ ପାଇଁ ପଚାରନ୍ତୁ"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"ଅନ୍‌ପିନ୍‌ କରିବା ପୂର୍ବରୁ PIN ମାଗନ୍ତୁ"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"ନିଜର ଡିଭାଇସ୍‌କୁ ଅନଲକ୍‌ କରିବାକୁ ନିଜର ଫେସ୍‌ ବ୍ୟବହାର କରିବା ବ୍ୟତୀତ, ଏହାକୁ ଚାଲୁ କରିବା ପୂର୍ବରୁ ଆପଣ ପିନ୍‌ ଦେଇ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଏହି ଡିଭାଇସ୍‌ଟି ଚାଲୁ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏଥିରେ କଲ୍‌, ମେସେଜ୍‌‍ କିମ୍ବା ଆଲାରାମ୍ ସହିତ କୌଣସି ପ୍ରକାରର ବିଜ୍ଞପ୍ତି ଆସିବ ନାହିଁ। \n\nଏହା ଫଳରେ ଡିଭାଇସ୍‌ଟି ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ ମଧ୍ୟ ଆପଣଙ୍କ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରିଥାଏ। ଡିଭାଇସ୍‌ ଚାଲୁ କରିବା ପାଇଁ ଆପଣ ପିନ୍‌ ଦେବାକୁ ଚାହିଁବେ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"ନିଜର ଡିଭାଇସ୍‌କୁ ଅନଲକ୍‌ କରିବାକୁ ନିଜର ଫେସ୍‌ ବ୍ୟବହାର କରିବା ବ୍ୟତୀତ, ଏହାକୁ ଚାଲୁ କରିବା ପୂର୍ବରୁ ଆପଣ ପାଟର୍ନ ଦେଇ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଏହି ଡିଭାଇସ୍‌ଟି ଚାଲୁ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏଥିରେ କଲ୍‌, ମେସେଜ୍‌‍ କିମ୍ବା ଆଲାରାମ ସହିତ କୌଣସି ପ୍ରକାରର ବିଜ୍ଞପ୍ତି ଆସିବ ନାହିଁ। \n\nଏହା ଫଳରେ ଡିଭାଇସ୍‌ଟି ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ ମଧ୍ୟ ଆପଣଙ୍କ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରିଥାଏ। ଡିଭାଇସ୍‌ ଚାଲୁ କରିବା ପାଇଁ ଆପଣ ପାଟର୍ନ ଦେବାକୁ ଚାହିଁବେ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"ନିଜର ଡିଭାଇସ୍‌କୁ ଅନଲକ୍‌ କରିବାକୁ ନିଜର ଫେସ୍‌ ବ୍ୟବହାର କରିବା ବ୍ୟତୀତ, ଏହାକୁ ଚାଲୁ କରିବା ପୂର୍ବରୁ ଆପଣ ପାସ୍‌ୱାର୍ଡ ଦେଇ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଏହି ଡିଭାଇସ୍‌ଟି ଚାଲୁ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏଥିରେ କଲ୍‌, ମେସେଜ୍‌‍ କିମ୍ବା ଆଲାରାମ ସହିତ କୌଣସି ପ୍ରକାରର ବିଜ୍ଞପ୍ତି ଆସିବ ନାହିଁ। \n\nଏହା ଫଳରେ ଡିଭାଇସ୍‌ଟି ହଜିଗଲେ କିମ୍ବା ଚୋରି ହୋଇଗଲେ ମଧ୍ୟ ଆପଣଙ୍କ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରିଥାଏ। ଡିଭାଇସ୍‌ ଚାଲୁ କରିବା ପାଇଁ ଆପଣ ପାସ୍‌ୱାର୍ଡ ଦେବାକୁ ଚାହିଁବେ?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ଆପଣଙ୍କ ଡିଭାଇସ୍ ଅନଲକ୍ କରିବାକୁ ଆପଣଙ୍କ ବାୟୋମେଟ୍ରିକ୍ସ ବ୍ୟବହାର କରିବା ସହ, ଏହି ଡିଭାଇସ୍ ଆରମ୍ଭ ହେବା ପୂର୍ବରୁ ଆପଣ ଆପଣଙ୍କ PIN ଦେଇ ଏହାକୁ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଡିଭାଇସଟି ଆରମ୍ଭ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏହା ଆଲାରାମ୍ ସମେତ କଲ୍, ମେସେଜ୍ କିମ୍ୱା ବିଜ୍ଞପ୍ତି ପ୍ରାପ୍ତ କରିପାରିବ ନାହିଁ।\n\nଏହା ହଜି ଯାଇଥିବା କିମ୍ବା ଚୋରି ହୋଇଯାଇଥିବା ଡିଭାଇସରେ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରେ। ଆପଣଙ୍କ ଡିଭାଇସ୍ ଆରମ୍ଭ କରିବାକୁ PIN ଆବଶ୍ୟକ କରନ୍ତି କି?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ଆପଣଙ୍କ ଡିଭାଇସକୁ ଅନଲକ୍ କରିବା ପାଇଁ ଆପଣଙ୍କର ବାୟୋମେଟ୍ରିକ୍ସ ବ୍ୟବହାର କରିବା ସହିତ, ଏହି ଡିଭାଇସ୍ ଆରମ୍ଭ ହେବା ପୂର୍ବରୁ ଆପଣ ଆପଣଙ୍କ ପାଟର୍ନ ଦେଇ ଏହାକୁ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଡିଭାଇସଟି ଆରମ୍ଭ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏହା ଆଲାରାମ୍ ସମେତ କଲ୍, ମେସେଜ୍ କିମ୍ୱା ବିଜ୍ଞପ୍ତି ପ୍ରାପ୍ତ କରିପାରିବ ନାହିଁ।\n\nଏହା ହଜିଯାଇଥିବା କିମ୍ବା ଚୋରି ହୋଇଯାଇଥିବା ଡିଭାଇସରେ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରେ। ଆପଣଙ୍କ ଡିଭାଇସ୍ ଆରମ୍ଭ କରିବାକୁ ପାଟର୍ନ ଆବଶ୍ୟକ କରନ୍ତି କି?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ଆପଣଙ୍କ ଡିଭାଇସ୍ ଅନଲକ୍ କରିବାକୁ ଆପଣଙ୍କ ବାୟୋମେଟ୍ରିକ୍ସ ବ୍ୟବହାର କରିବା ସହିତ, ଏହି ଡିଭାଇସ୍ ଆରମ୍ଭ ହେବା ପୂର୍ବରୁ ଆପଣ ଆପଣଙ୍କ ପାସୱାର୍ଡ ଦେଇ ଏହାକୁ ଆହୁରି ସୁରକ୍ଷିତ କରିପାରିବେ। ଡିଭାଇସଟି ଆରମ୍ଭ ନହେବା ପର୍ଯ୍ୟନ୍ତ, ଏହା ଆଲାରାମ୍ ସମେତ କଲ୍, ମେସେଜ୍ କିମ୍ୱା ବିଜ୍ଞପ୍ତି ପ୍ରାପ୍ତ କରିପାରିବ ନାହିଁ।\n\nଏହା ହଜି ଯାଇଥିବା କିମ୍ବା ଚୋରି ହୋଇଯାଇଥିବା ଡିଭାଇସରେ ଡାଟା ସୁରକ୍ଷିତ ରଖିବାରେ ସାହାଯ୍ୟ କରେ। ଆପଣଙ୍କ ଡିଭାଇସ୍ ଆରମ୍ଭ କରିବାକୁ ପାସୱାର୍ଡ ଆବଶ୍ୟକ କରନ୍ତି କି?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ହଁ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ନାଁ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ଅବରୋଧ କରାଯାଇଛି"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ଏହା ଦ୍ୱାରା ନିୟନ୍ତ୍ରିତ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"ସଂଯୁକ୍ତ ଡିଭାଇସ୍"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ଏହି ଡିଭାଇସ୍‍"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"ବଦଳାଯାଉଛି..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"ସ୍ୱିଚ୍ କରାଯାଉଛି…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"ବଦଳ କରିହେଲା ନାହିଁ"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ଏହି ଡିଭାଇସ୍‌ ଚାର୍ଜ ହେଉଛି"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"କନେକ୍ଟ ହୋଇଥିବା ଡିଭାଇସ୍‍ ଚାର୍ଜ ହେଉଛି"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"ମୋବାଇଲ୍‌ ଡାଟା ବ୍ୟବହାର"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"ଆପ୍‌ ଦ୍ୱାରା ଡାଟା ବ୍ୟବହାର"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"ୱାଇ-ଫାଇ ଡାଟା ବ୍ୟବହାର"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"ନନ୍-କ୍ୟାରିଅର୍ ଡାଟା ବ୍ୟବହାର"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ଇଥରନେଟ୍‌ ଦ୍ୱାରା ବ୍ୟବହୃତ ଡାଟା"</string>
     <string name="wifi" msgid="2932584495223243842">"ୱାଇ-ଫାଇ"</string>
     <string name="ethernet" msgid="4665162609974492983">"ଇଥରନେଟ୍‌"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">୧ଟି ପ୍ରତିବନ୍ଧକ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ଡିଭାଇସ୍‌ର ଗଣନାଠାରୁ କେରିଅର୍‌ର ଡାଟା ଗଣନା ଭିନ୍ନ ହୋଇପାରେ।"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"କ୍ୟାରିଅର୍ ନେଟୱାର୍କଗୁଡ଼ିକ ଦ୍ୱାରା ବ୍ୟବହୃତ ଡାଟା ଅନ୍ତର୍ଭୁକ୍ତ ନୁହେଁ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ବ୍ୟବହୃତ"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ଡାଟା ଚେତାବନୀ ସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ଡାଟା ଚେତାବନୀ"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ବିବରଣୀ ଦେଖନ୍ତୁ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ଡାଟା ସେଭର୍‍"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ଅପ୍ରତିବନ୍ଧିତ ଡାଟା"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ବ୍ୟାକ୍‌ଗ୍ରାଉଣ୍ଡ ଡାଟା ବନ୍ଦ‌ ଅଛି"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ପୃଷ୍ଠପଟ ଡାଟା ବନ୍ଦ କରାଯାଇଛି"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ଚାଲୁ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ବନ୍ଦ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ଡାଟା ସେଭର୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ଯଦି ଡିଭାଇସ୍‌ ଲକ୍‌ ହୋଇଥାଏ, ବିଜ୍ଞପ୍ତିରେ ପ୍ରତ୍ୟୁତ୍ତର କିମ୍ବା ଅନ୍ୟାନ୍ୟ ଟେକ୍ସଟ୍‌ ଟାଇପ କରିବା ପ୍ରତିରୋଧ କରେ"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ଡିଫଲ୍ଟ ବନାନ ଯାଞ୍ଚକାରୀ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ବନାନ ଯାଞ୍ଚକାରୀ ବାଛନ୍ତୁ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ବନାନ୍ ଯାଞ୍ଚ କରୁଥିବା ଟୂଲ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ବନାନ ଯାଞ୍ଚକାରୀ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ଚୟନ କରାଯାଇନାହିଁ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(କିଛି ନାହିଁ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ଷ୍ଟୋରେଜ୍‌ ସ୍ପେସ୍‌ ଖାଲି କରିବା ପାଇଁ, ଷ୍ଟୋରେଜ୍‌ ମ୍ୟାନେଜର୍‌ ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରୁ ବ୍ୟାକ୍‌ଅପ୍‌ ନିଆଯାଇଥିବା ଫୋଟୋ ଏବଂ ଭିଡିଓଗୁଡ଼ିକ କାଢ଼ିଦେଇଥାଏ।"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ଫୋଟୋ ଓ ଭିଡିଓଗୁଡ଼ିକ କାଢ଼ିଦିଅନ୍ତୁ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ଷ୍ଟୋରେଜ୍‌ ମ୍ୟାନେଜର୍"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ଷ୍ଟୋରେଜ୍ ମ୍ୟାନେଜର୍‌କୁ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ଷ୍ଟୋରେଜ୍ ମ୍ୟାନେଜର୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ଅଟୋମେଟିକ୍‌"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ମାନୁଆଲ୍‌"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ବର୍ତ୍ତମାନ ସ୍ପେସ୍‌ ଖାଲି କରନ୍ତୁ"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ଫୋନ୍‌ ଚେକ୍ କରିବାକୁ ଦୁଇଥର-ଟାପ୍‌ କରନ୍ତୁ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ଟାବ୍‌ଲେଟ୍‌ ଯାଞ୍ଚ କରିବାକୁ ଡବଲ୍‌-ଟାପ୍‌ କରନ୍ତୁ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ଡିଭାଇସ୍‌ ଯାଞ୍ଚ କରିବାକୁ ଡବଲ୍‌-ଟାପ୍‌ କରନ୍ତୁ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"ବିଜ୍ଞପ୍ତି ପାଇଁ ସ୍ୱାଇପ୍ କର"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ଆପଣଙ୍କ ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକ ଦେଖାଇବାକୁ ସ୍କ୍ରିନର ତଳ ପାର୍ଶ୍ୱରେ ତଳକୁ ସ୍ୱାଇପ୍ କରନ୍ତୁ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ଏକ-ହାତ ମୋଡ୍"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ଏକ-ହାତ ମୋଡ୍ ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ଆପ୍ସ ସ୍ୱିଚ୍ କରିବା ବେଳେ ବାହାରି ଯାଆନ୍ତୁ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ସମୟ ସମାପ୍ତ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ସେକେଣ୍ଡ"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ସେକେଣ୍ଡ"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ସେକେଣ୍ଡ"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ରିଚେବିଲିଟୀ"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ସମୟ, ବିଜ୍ଞପ୍ତି, ଏବଂ ଅନ୍ୟ ସୂଚନା ଦେଖିବାକୁ, ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‌କୁ ଦୁଇଥର ଟାପ୍‌ କରନ୍ତୁ।"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ଫୋନ୍‌ ଚେକ୍ କରିବା ପାଇଁ ଉଠାନ୍ତୁ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ଟାବଲେଟ୍‌ ଯାଞ୍ଚ କରିବାକୁ ଉଠାନ୍ତୁ"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ଟାବ୍‍‍ଲେଟ୍ ଯାଞ୍ଚ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ଡିଭାଇସ୍ ଯାଞ୍ଚ କରିବାକୁ ଟାପ୍ କରନ୍ତୁ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ସମୟ, ବିଜ୍ଞପ୍ତି, ଏବଂ ଅନ୍ୟ ସୂଚନାର ଯାଞ୍ଚ କରିବା ପାଇଁ, ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‌କୁ ଟାପ୍ କରନ୍ତୁ।"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ଜରୁରୀକାଳୀନ SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"ଜରୁରୀକାଳୀନ SOS ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> ଦ୍ୱାରା ପରିଚାଳିତ"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"ଶୀଘ୍ର 5 କିମ୍ବା ଅଧିକ ଥର ପାୱାର ବଟନକୁ ଦବାଇ ନିମ୍ନ କାର୍ଯ୍ୟଗୁଡ଼ିକୁ ଆରମ୍ଭ କରନ୍ତୁ"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"କାଉଣ୍ଟଡାଉନ୍ ଆଲାରାମ୍ ଚଲାନ୍ତୁ"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"ସାହାଯ୍ୟ ପାଇଁ ସୂଚିତ କରିବା ପୂର୍ବରୁ କୌଣସି ଉଚ୍ଚ ସାଉଣ୍ଡ ଚଲାନ୍ତୁ"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"ସାହାଯ୍ୟ ପାଇଁ କଲ୍ କରନ୍ତୁ"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"ସାହାଯ୍ୟ ପାଇଁ କଲ୍ କରିବାକୁ ନମ୍ବର"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>। ବଦଳାଇବାକୁ ଟାପ୍ କରନ୍ତୁ"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"ଯଦି ଆପଣ ଏକ ଅଣ-ଜରୁରୀକାଳୀନ ନମ୍ବର ଲେଖନ୍ତି ତେବେ:\n • ଜରୁରୀକାଳୀନ SOS ବ୍ୟବହାର କରିବାକୁ ଆପଣଙ୍କ ଡିଭାଇସ୍ ଅନଲକ୍ କରାଯିବା ଆବଶ୍ୟକ\n • ଆପଣଙ୍କ କଲର ଉତ୍ତର ଦିଆଯାଇନପାରେ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ବିଜ୍ଞପ୍ତି ପାଇଁ ଟିପଚିହ୍ନ ସ୍ୱାଇପ୍‌ କରନ୍ତୁ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ଟିପଚିହ୍ନ ସ୍ୱାଇପ୍‌ କରନ୍ତୁ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ବିଜ୍ଞପ୍ତିଗୁଡ଼ିକୁ ଦେଖିବା ପାଇଁ, ନିଜ ଫୋନ୍‌ ପଛପଟେ ଥିବା ଫିଙ୍ଗରପ୍ରିଣ୍ଟ ସେନ୍ସର୍‌ ଉପରେ ଆଙ୍ଗୁଠି ରଖି ତଳକୁ ସ୍ୱାଇପ୍‌ କରନ୍ତୁ।"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"ସର୍ବାଧିକ ଦେଖାଯାଉଥିବା ଡାଟାସେଟ୍‍ଗୁଡିକ"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ଡିଫଲ୍ଟ ମୂଲ୍ୟକୁ ରିସେଟ୍‌ କରନ୍ତୁ"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"ଅଟୋଫିଲ୍‌ ଡେଭଲପର୍‍ ବିକଳ୍ପଗୁଡିକ ରିସେଟ୍ ହୋଇଛି"</string>
+    <string name="location_category" msgid="3496759112306219062">"ଲୋକେସନ୍"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"ଷ୍ଟାଟସ୍ ବାରରେ ଲୋକେସନ୍ ସୂଚକ"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"ନେଟୱାର୍କ ଏବଂ ସଂଯୋଗ ସମେତ, ସମସ୍ତ ଲୋକେସନ୍ ଦେଖାନ୍ତୁ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"ପୂର୍ଣ୍ଣ GNSS ପରିମାପ ବାଧ୍ୟ କରନ୍ତୁ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ଡ୍ୟୁଟି ସାଇକିଲିଂ ନଥାଇ ସମସ୍ତ GNSS ତାରାମଣ୍ଡଳ ଓ ଫ୍ରିକ୍ୱେନ୍ସୀକୁ ଟ୍ରାକ୍‌ କରନ୍ତୁ"</string>
     <string name="device_theme" msgid="5027604586494772471">"ଡିଭାଇସ୍‌ ଥିମ୍‌"</string>
     <string name="default_theme" msgid="4815428567082263639">"ପ୍ରାକ୍‌-ନିର୍ଦ୍ଧାରିତ"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"ନେଟୱାର୍କ ନାମ"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"ଫୋକସ୍ ରହିବା ପାଇଁ ବିଜ୍ଞପ୍ତି ବିରତି କରନ୍ତୁ"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ଫିଚର୍‍ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"ଏହି ଫିଚର୍‍ ଆପଣଙ୍କ ଫୋନ୍‍କୁ ଧିମା କରୁଥିବାରୁ ଏହାକୁ ବନ୍ଦ କରିଦିଆଯାଇଛି"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"ପୂର୍ଣ୍ଣ GNSS ପରିମାପ ବାଧ୍ୟ କରନ୍ତୁ"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ଡ୍ୟୁଟି ସାଇକିଲିଂ ନଥାଇ ସମସ୍ତ GNSS ତାରାମଣ୍ଡଳ ଓ ଫ୍ରିକ୍ୱେନ୍ସୀକୁ ଟ୍ରାକ୍‌ କରନ୍ତୁ"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"କ୍ରାଶ୍ ହୋଇଥିବା ଡାୟଲଗ୍‌କୁ ସର୍ବଦା ଦେଖାନ୍ତୁ"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"ପ୍ରତ୍ୟେକ ଥର ଗୋଟିଏ ଆପ୍ କ୍ରାଶ୍ ହେବାପରେ ଡାୟଲଗ୍ ଦେଖାନ୍ତୁ"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE ସକ୍ଷମ ଥିବା ଆପ୍ ଚୟନ କରନ୍ତୁ"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ସମସ୍ତ ଆପ୍ ପାଇଁ ସକ୍ଷମ କରନ୍ତୁ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍ ଚୟନ କରନ୍ତୁ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ଡିଫଲ୍ଟ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ଗେମ୍ ଡ୍ରାଇଭର୍"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ଗେମ୍ ଡ୍ରାଇଭର୍"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ଡେଭଲପର୍ ଡ୍ରାଇଭର୍"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ସିଷ୍ଟମ୍ ଗ୍ରାଫିକ୍ସ ଡ୍ରାଇଭର୍"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"ଚାଲୁ (ମ୍ୟୁଟ୍)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ବନ୍ଦ"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"ନେଟୱାର୍କ୍‌ ବିବରଣୀ"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"ଆପଣଙ୍କ ଡିଭାଇସ୍‌ରେ ଥିବା ଆପ୍‌ଗୁଡ଼ିକୁ ଆପଣଙ୍କର ଡିଭାଇସ୍‍ ନାମ ଦେଖାଯାଉଛି। ବ୍ଲୁଟୂଥ୍‍ ଡିଭାଇସ୍‍ ସହ ଯୋଡ଼ି ହେବାବେଳେ କିମ୍ୱା ଏକ ୱାଇ-ଫାଇ ହଟସ୍ପଟ୍ ସେଟ୍ କରିବା ସମୟରେ, ଏହା ଅନ୍ୟ ଲୋକମାନଙ୍କୁ ମଧ୍ୟ ଦେଖାଦେଇପାରେ।"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"ଆପଣଙ୍କ ଫୋନରେ ଥିବା ଆପଗୁଡ଼ିକୁ ଆପଣଙ୍କ ଡିଭାଇସ୍ ନାମ ଦୃଶ୍ୟମାନ ହୋଇଥାଏ। ଯେତେବେଳେ ଆପଣ ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସଗୁଡ଼ିକ ସହ ସଂଯୋଗ କରନ୍ତି, ଏକ ୱାଇ-ଫାଇ ନେଟୱାର୍କ ସହ ସଂଯୋଗ କରନ୍ତି କିମ୍ବା ଏକ ୱାଇ-ଫାଇ ହଟସ୍ପଟ୍ ସେଟ୍ ଅପ୍ କରନ୍ତି, ସେତେବେଳେ ଏହା ଅନ୍ୟ ଲୋକମାନଙ୍କୁ ମଧ୍ୟ ଦେଖାଯାଇପାରେ।"</string>
     <string name="devices_title" msgid="649715719278562515">"ଡିଭାଇସ୍‌"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"ସମସ୍ତ ସେଟିଂସ୍‌"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"ପରାମର୍ଶ"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ନେଟ୍‌ୱର୍କ ମିଳୁନାହିଁ। ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ଅନୁମତିପ୍ରାପ୍ତ ନୁହେଁ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM କାର୍ଡ ନାହିଁ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"କୌଣସି SIM ନାହିଁ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"କିଛି ନାହିଁ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ସଂଯୋଗ କରିବା ପାଇଁ SIM ଆବଶ୍ୟକ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ସଂଯୋଗ କରିବା ପାଇଁ <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM ଆବଶ୍ୟକ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ମନପସନ୍ଦର ନେଟ୍‌ୱର୍କ ମୋଡ୍: WCDMAକୁ ପସନ୍ଦ କରାଯାଇଛି"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ମନପସନ୍ଦର ନେଟ୍‌ୱର୍କ ମୋଡ୍: GSM କେବଳ"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ମନପସନ୍ଦର ନେଟ୍‌ୱର୍କ ମୋଡ୍: କେବଳ WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ମୋବାଇଲ୍ ଡାଟା"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ମୋବାଇଲ୍ ନେଟ୍‌ୱର୍କକୁ ବ୍ୟବହାର କରି ଡାଟା ଆକ୍ସେସ୍ କରନ୍ତୁ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ରେଞ୍ଜରେ ରହିଲେ ଫୋନ୍ ସ୍ୱଚାଳିତ ଭାବେ ଏହି ବାହକକୁ ସ୍ବିଚ୍ ହୋଇଯିବ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"କୌଣସି SIM କାର୍ଡ ଉପଲବ୍ଧ ନାହିଁ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"କଲ୍‌ ପାଇଁ ଅଗ୍ରାଧିକାର"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ଅଗ୍ରାଧିକାର"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ପ୍ରତ୍ୟେକ ଥର ପଚାରନ୍ତୁ"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>କୁ ସଂଯୁକ୍ତ ହୋଇଥିବା ସମୟରେ ଉପଲବ୍ଧ ନଥାଏ"</string>
     <string name="see_more" msgid="7499355691042812723">"ଅଧିକ ଦେଖନ୍ତୁ"</string>
     <string name="see_less" msgid="2642392725363552793">"କମ୍ ଦେଖନ୍ତୁ"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ଚାଲୁ କରିବେ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIMକୁ ଚାଲୁ କରିବେ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରିବେ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM କାର୍ଡ ବ୍ୟବହାର କରିବାକୁ ସ୍ୱିଚ୍ କରିବେ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ଥରକେ କେବଳ ଗୋଟିଏ SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ।\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କର <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ଥରକେ କେବଳ ଗୋଟିଏ ଡାଉନଲୋଡ୍ କରାଯାଇଥିବା SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ।\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କର <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ଥରକେ କେବଳ ଗୋଟିଏ SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ।\n\nସ୍ୱିଚ୍ କରିବା ଦ୍ୱାରା ଆପଣଙ୍କର <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରନ୍ତୁ"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ନେଟୱାର୍କ ସହ ସଂଯୋଗ କରାଯାଉଛି…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>କୁ ସ୍ୱିଚ୍ କରାଯାଉଛି"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"କ୍ୟାରିଅରକୁ ସ୍ୱିଚ୍ କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ଏକ ତ୍ରୁଟି ଯୋଗୁଁ କ୍ୟାରିଅରକୁ ସ୍ୱିଚ୍ କରାଯାଇପାରିବ ନାହିଁ।"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ବନ୍ଦ କରିବେ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM ବନ୍ଦ କରିବେ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM ବନ୍ଦ କରାଯାଉଛି<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"କ୍ୟାରିଅରକୁ ଅକ୍ଷମ କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"କିଛି ତ୍ରୁଟି ହୋଇଥିବାରୁ ଆପଣଙ୍କ ମୋବାଇଲ କମ୍ପାନୀକୁ ଅକ୍ଷମ କରାଯାଇପାରିଲା ନାହିଁ।"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2ଟି SIM ବ୍ୟବହାର କରିବେ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ଏହି ଡିଭାଇସରେ ଏକ ସମୟରେ 2ଟି SIM ସକ୍ରିୟ ରହିପାରିବ। ଥରକେ 1ଟି SIM ବ୍ୟବହାର କରିବା ଜାରି ରଖିବାକୁ, \"ନା, ଧନ୍ୟବାଦ\"ରେ ଟାପ୍ କରନ୍ତୁ।"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରିବେ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ଆରମ୍ଭ କରିବାକୁ, ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ। ତା\'ପରେ ଆପଣ ଅନ୍ୟ ଏକ SIM ଯୋଗ କରିପାରିବେ।"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ଜାରି ରଖନ୍ତୁ"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"ନା, ଧନ୍ୟବାଦ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"ସ୍ୱିଚ୍ କରନ୍ତୁ"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIMକୁ ସକ୍ରିୟ କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMକୁ କାଢ଼ି ପୁଣି ଭର୍ତ୍ତି କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରହେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIMକୁ ପୁଣି ଚାଲୁ କରିବାକୁ ଚେଷ୍ଟା କରନ୍ତୁ। ଯଦି ସମସ୍ୟା ଜାରି ରହେ, ତେବେ ଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରନ୍ତୁ।"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"ନେଟୱାର୍କ ସକ୍ରିୟକରଣ"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ସକ୍ରିୟ ଅଛି"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ସେଟିଂସକୁ ଅପଡେଟ୍ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM କାର୍ଡ"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଏହି SIMକୁ ଖାଲି କରିବେ?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ଏହି SIMକୁ ଖାଲି କରିବା ଦ୍ୱାରା, ଏହି ଡିଭାଇସରୁ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ସେବାକୁ କାଢ଼ି ଦିଆଯିବ।\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ପାଇଁ ସେବା ବାତିଲ୍ ହେବ ନାହିଁ।"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"ଖାଲି କରନ୍ତୁ"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIMକୁ ଖାଲି କରାଯାଉଛି…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIMକୁ ଖାଲି କରାଯାଇପାରିବ ନାହିଁ"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"ଏକ ତ୍ରୁଟି କାରଣରୁ ଏହି SIMକୁ ଖାଲି କରାଯାଇପାରିଲା ନାହିଁ।\n\nଆପଣଙ୍କ ଡିଭାଇସକୁ ରିଷ୍ଟାର୍ଟ କରି ପୁଣି ଚେଷ୍ଟା କରନ୍ତୁ।"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ଡିଭାଇସକୁୁ ସଂଯୋଗ କରନ୍ତୁ"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"ଆପଣଙ୍କ ଡିଭାଇସକୁ ସଂଯୋଗ କରିବା ପାଇଁ <xliff:g id="APPNAME">%1$s</xliff:g> ଆପ୍ ଏକ ଅସ୍ଥାୟୀ ୱାଇ-ଫାଇ ନେଟୱାର୍କ ବ୍ୟବହାର କରିବାକୁ ଚାହୁଁଛି"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"କୌଣସି ଡିଭାଇସ୍ ମିଳିଲା ନାହିଁ। ସୁନିଶ୍ଚିତ ହୁଅନ୍ତୁ ଯେ ଡିଭାଇସ୍‍ ଚାଲୁ ହୋଇଛି ଏବଂ ସଂଯୋଗ କରିବା ପାଇଁ ଉପଲବ୍ଧ ଅଛି।"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"ଜରୁରୀକାଳୀନ କଲ୍"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"ଆପଣଙ୍କ ବାହକ ଦ୍ୱାରା ୱାଇ-ଫାଇ କଲିଂରେ ଜରୁରୀକାଳୀନ କଲ୍ ଉପଲବ୍ଧ ନାହିଁ।\nଏକ ଜରୁରୀକାଳୀନ କଲ୍ କରିବାକୁ ଡିଭାଇସ୍ ସ୍ୱଚାଳିତ ଭାବେ ମୋବାଇଲ୍ ନେଟ୍‌ୱାର୍କକୁ ପରିବର୍ତ୍ତନ ହୋଇଥାଏ।\nଜରୁରୀକାଳୀନ କଲ୍ କେବଳ ମୋବାଇଲ୍ ନେଟ୍‌ୱାର୍କ ଥିବା ସ୍ଥାନଗୁଡ଼ିକରେ ସମ୍ଭବ।"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"କଲ୍‌ର ମାନରେ ଉନ୍ନତି ପାଇଁ ପାଇଁ ୱାଇ-ଫାଇର ବ୍ୟବହାର କରନ୍ତୁ"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"କ୍ରସ୍ SIM କଲିଂ"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"ଏହି SIMରେ ଅନ୍ୟ ଏକ SIMର କଲ୍ ଏବଂ SMSଗୁଡ଼ିକୁ ଅନୁମତି ଦିଅନ୍ତୁ।"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"କ୍ରସ୍ SIM କଲିଂ"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"ଇନକମିଂ MMS ମେସେଜ୍"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS ମେସେଜ୍ ପଠାଯାଇ ପାରିଲାନାହିଁ"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"ମୋବାଇଲ୍ ଡାଟା ବନ୍ଦ ଥିବା ବେଳେ <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>ରେ MMS ମେସେଜିଂ ଅନୁମତି ଦେବାକୁ ଟାପ୍ କରନ୍ତୁ"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"ସେଟିଂସରେ ସ୍କ୍ରିନ୍ ଓଭରଲେକୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ସେଟିଂସ୍ ସ୍କ୍ରିନଗୁଡ଼ିକୁ ଓଭରଲେ କରିବାକୁ ସେହି ଆପ୍ସକୁ ଅନୁମତି ଦିଅନ୍ତୁ ଯାହା ଅନ୍ୟ ଆପ୍ସ ଉପରେ ଡିସପ୍ଲେ ହୋଇପାରିବ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"ମିଡିଆ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"ମିଡିଆ ସେସନ୍ ଶେଷ ହେବା ପରେ ପ୍ଲେୟାରକୁ ଲୁଚାନ୍ତୁ"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"ପ୍ଲେୟାର୍ ଆପଣଙ୍କୁ ବିସ୍ତାରିତ ଦ୍ରୁତ ସେଟିଂସ୍ ପ୍ୟାନେଲରୁ କୌଣସି ସେସନ୍ ପୁଣି ଆରମ୍ଭ କରିବାକୁ ଅନୁମତି ଦିଏ।"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ଦ୍ରୁତ ସେଟିଂସରେ ମିଡିଆ ପ୍ଲେୟାର୍"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"ସହଜରେ ପ୍ଲେବ୍ୟାକ୍ ପୁଣି ଆରମ୍ଭ କରିବାକୁ ଏକ ସମ୍ପ୍ରସାରିତ ଅବଧି ପାଇଁ ମିଡିଆ ପ୍ଲେୟାର୍ ଦେଖାନ୍ତୁ"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ପ୍ଲେୟାରକୁ ଲୁଚାନ୍ତୁ"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ପ୍ଲେୟାର୍ ଦେଖାନ୍ତୁ"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"କୌଣସି ପ୍ଲେୟାର୍ ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ଅନୁମତିପ୍ରାପ୍ତ ଆପଗୁଡ଼ିକ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"ମିଡିଆ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ବ୍ଲୁଟୁଥ୍ ଚାଲୁ ହେବ"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ଚାଲୁ ଅଛି"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"ବନ୍ଦ ଅଛି"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"ଇଣ୍ଟରନେଟ୍"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMଗୁଡ଼ିକ"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"ଏୟାରପ୍ଲେନ୍-ସେଫ୍ ନେଟୱାର୍କଗୁଡ଼ିକ"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ଏୟାରପ୍ଲେନ୍-ସେଫ୍ ନେଟୱାର୍କଗୁଡ଼ିକୁ ଖୋଜି ତାହା ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ଏୟାରପ୍ଲେନ୍, ଏୟାରପ୍ଲେନ୍-ସେଫ୍"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"କଲ୍ ଓ SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"ୱାଇ-ଫାଇ କଲିଂ"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ୱାଇ‑ଫାଇ ପରି ନନ୍‑କ୍ୟାରିଅର୍ ନେଟୱାର୍କରେ କଲ୍ କରନ୍ତୁ ଓ ପ୍ରାପ୍ତ କରନ୍ତୁ"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"ୱାଇ‑ଫାଇ କଲିଂ ଆପଣଙ୍କୁ କେତେକ ୱାଇ‑ଫାଇ ନେଟୱାର୍କ ପରି ନନ୍‑କ୍ୟାରିଅର୍ ନେଟୱାର୍କରେ କଲ୍ କରିବା ଓ ପ୍ରାପ୍ତ କରିବାକୁ ଅନୁମତି ଦେଇଥାଏ।"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"କଲଗୁଡ଼ିକ"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"ପସନ୍ଦ କରାଯାଇଛି"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"କଲଗୁଡ଼ିକୁ ପସନ୍ଦ କରାଯାଇଛି"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS ପସନ୍ଦ କରାଯାଇଛି"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"କୌଣସି SIM ନାହିଁ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ପସନ୍ଦଗୁଡ଼ିକ"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ସାର୍ବଜନୀନ ନେଟୱାର୍କଗୁଡ଼ିକ ସହ ସଂଯୋଗ କରନ୍ତୁ"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ନେଟୱାର୍କ ସଂଯୋଗ, ଇଣ୍ଟରନେଟ୍, ୱାୟାରଲେସ୍, ଡାଟା, ୱାଇଫାଇ, ୱାଇ-ଫାଇ, ୱାଇ ଫାଇ, ସେଲ୍ୟୁଲାର୍, ମୋବାଇଲ, ସେଲ୍ କ୍ୟାରିଅର୍, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ଏୟାରପ୍ଲେନ୍-ସେଫ୍ ନେଟୱାର୍କଗୁଡ଼ିକୁ ଦେଖନ୍ତୁ"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ଏୟାରପ୍ଲେନ୍ ମୋଡକୁ ବନ୍ଦ କରନ୍ତୁ"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ଶୋଇବା ସମୟ ମୋଡ୍ ଚାଲୁ ଥିବା ଯୋଗୁଁ ଉପଲବ୍ଧ ନାହିଁ"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"ବିଜ୍ଞପ୍ତିର ପ୍ରାଥମିକତା ରିସେଟ୍ କରିବା ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି।"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"ଆପଗୁଡ଼ିକ"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"ଅବିଶ୍ୱସ୍ତ ଡିଭାଇସଟି ଆପଣଙ୍କ ମେସେଜଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିବାକୁ ଚାହୁଁଛି। ବିବରଣୀ ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"ମେସେଜଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଅନୁମତି ଦେବେ?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"ଏକ ଅବିଶ୍ୱସ୍ତ ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସ୍, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ଆପଣଙ୍କ ମେସେଜଗୁଡ଼ିକୁ ଆକ୍ସେସ୍ କରିବାକୁ ଚାହେଁ।\n\nଆପଣ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ସହ ପୂର୍ବରୁ ସଂଯୁକ୍ତ ହୋଇନାହାଁନ୍ତି।"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"ଅବିଶ୍ୱସ୍ତ ଡିଭାଇସଟି ଆପଣଙ୍କ ଯୋଗାଯୋଗ ଏବଂ କଲ୍ ଲଗକୁ ଆକ୍ସେସ୍ କରିବାକୁ ଚାହେଁ। ବିବରଣୀ ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"ଯୋଗାଯୋଗ ଏବଂ କଲ୍ ଲଗକୁ ଆକ୍ସେସ୍ କରିବା ପାଇଁ ଅନୁମତି ଦେବେ?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"ଏକ ଅବିଶ୍ୱସ୍ତ ବ୍ଲୁଟୁଥ୍ ଡିଭାଇସ୍, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ଆପଣଙ୍କ ଯୋଗାଯୋଗ ଏବଂ କଲ୍ ଲଗକୁ ଆକ୍ସେସ୍ କରିବାକୁ ଚାହେଁ। ଏଥିରେ ଇନକମିଂ ଏବଂ ଆଉଟଗୋଇଂ କଲଗୁଡ଼ିକ ବିଷୟରେ ଡାଟା ଅନ୍ତର୍ଭୁକ୍ତ ଅଛି।\n\nଆପଣ ପୂର୍ବରୁ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ସହ ସଂଯୁକ୍ତ ହୋଇନାହାଁନ୍ତି।"</string>
 </resources>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 8ae37b2..81cb0fc 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ਔਸਤਨ"</item>
     <item msgid="6740026006576843477">"ਜ਼ਿਆਦਾ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"ਘੱਟ ਸਮੇਂ ਲਈ"</item>
+    <item msgid="7397961711906421599">"ਔਸਤ"</item>
+    <item msgid="4079132024502041928">"ਲੰਬੇ ਸਮੇਂ ਲਈ"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ਗਲੋਬਲ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"ਸਿਰਫ਼ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ਗਲੋਬਲ"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index d3bba83..d3bc5e4 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"ਤਾਰੀਖ ਅਤੇ ਸਮਾਂ ਸੈੱਟ ਕਰੋ"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"ਤਾਰੀਖ, ਸਮਾਂ, ਸਮਾਂ ਜ਼ੋਨ, &amp; ਫੌਰਮੈਟ ਸੈੱਟ ਕਰੋ"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"ਨੈੱਟਵਰਕ ਵੱਲੋਂ ਮੁਹੱਈਆ ਸਮਾਂ ਵਰਤੋ"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"ਨੈੱਟਵਰਕ ਵੱਲੋਂ ਮੁਹੱਈਆ ਸਮਾਂ ਜ਼ੋਨ ਵਰਤੋ"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਾਂ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸਮਾਂ ਖੇਤਰ ਸੈੱਟ ਕਰੋ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸਥਾਨਕ ਸਮਾਂ ਵਰਤੋ"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑ਘੰਟੇ ਫੌਰਮੈਟ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-ਘੰਟੇ ਵਾਲਾ ਫਾਰਮੈਟ ਵਰਤੋ"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">" ਲਾਕ  ਸਕ੍ਰੀਨ ਤੇ ਪ੍ਰੋਫਾਈਲ ਜਾਣਕਾਰੀ ਦਿਖਾਓ"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ਖਾਤੇ"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ਟਿਕਾਣਾ"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ਟਿਕਾਣੇ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ਟਿਕਾਣਾ ਵਰਤੋ"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ਬੰਦ"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">ਚਾਲੂ - <xliff:g id="COUNT_1">%1$d</xliff:g> ਐਪ ਕੋਲ ਟਿਕਾਣੇ ਤੱਕ ਪਹੁੰਚ ਹੈ</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ਸਕ੍ਰੀਨ ਲਾਕ, ਚਿਹਰਾ ਅਣਲਾਕ"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ਸਕ੍ਰੀਨ ਲਾਕ, ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ਸਕ੍ਰੀਨ ਲਾਕ"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ਆਪਣੇ ਚਿਹਰੇ ਅਤੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਅਣਲਾਕ ਕਰੋ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"ਤੁਸੀਂ ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਕੇ ਭੁਗਤਾਨਾਂ ਦੀ ਪੁਸ਼ਟੀ ਵੀ ਕਰ ਸਕਦੇ ਹੋ"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ਇਸ ਦੇ ਨਾਲ ਅਣਲਾਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰੋ:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ਚਿਹਰਾ ਅਣਲਾਕ"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨਾ ਸੌਖਾ ਬਣਾਓ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ਫਿੰਗਰਪ੍ਰਿੰਟ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ਆਪਣੀ ਜੇਬ ਵਿੱਚ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਕੇ ਸਮਾਂ ਬਚਾਓ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ਛੱਡੋ"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ਅੱਗੇ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ਚਿਹਰਾ ਸ਼ਾਮਲ ਕੀਤਾ ਗਿਆ"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"ਚਿਹਰਾ ਅਣਲਾਕ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ਚਿਹਰਾ ਅਣਲਾਕ"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ਪ੍ਰਮਾਣਿਤ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ਸ਼ੁਰੂ ਕਰੋ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ਜੇ ਪਹੁੰਚਯੋਗਤਾ ਵਾਲੀ ਚਿਹਰਾ ਅਣਲਾਕ ਵਿਸ਼ੇਸ਼ਤਾ ਬੰਦ ਹੈ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਕਿ ਸੈੱਟਅੱਪ ਦੇ ਕੁਝ ਪੜਾਅ TalkBack ਨਾਲ ਸਹੀ ਢੰਗ ਨਾਲ ਕੰਮ ਨਾ ਕਰਨ।"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ਵਾਪਸ ਜਾਓ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ਸੈੱਟਅੱਪ ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ਪਹੁੰਚਯੋਗਤਾ ਦਾ ਸੈੱਟਅੱਪ ਵਰਤੋ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ਐਪਾਂ ਲਈ ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤਣ ਵੇਲੇ ਪੁਸ਼ਟੀਕਰਨ ਪੜਾਅ ਹਮੇਸ਼ਾਂ ਲੋੜੀਂਦਾ ਹੈ"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ਚਿਹਰੇ ਦਾ ਡਾਟਾ ਮਿਟਾਓ"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ਚਿਹਰਾ ਅਣਲਾਕ ਸੈੱਟਅੱਪ ਕਰੋ"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ਆਪਣਾ ਡੀਵਾਈਸ ਅਣਲਾਕ ਕਰਨ, ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਅਤੇ ਭੁਗਤਾਨਾਂ ਦੀ ਤਸਦੀਕ ਕਰਨ ਲਈ ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤੋ।\n\nਧਿਆਨ ਵਿੱਚ ਰੱਖੋ:\nਫ਼ੋਨ ਵੱਲ ਦੇਖਦੇ ਸਾਰ ਹੀ ਇਹ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ ਭਾਵੇਂ ਇੰਝ ਕਰਨ ਦਾ ਤੁਹਾਡਾ ਇਰਾਦਾ ਵੀ ਨਾ ਹੋਵੇ।\n\nਕਿਸੇ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੇ ਮੂਹਰੇ ਕਰਨ \'ਤੇ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ।\n\nਤੁਹਾਡੇ ਵਰਗੇ ਦਿਸਣ ਵਾਲੇ ਕਿਸੇ ਵਿਅਕਤੀ ਵੱਲੋਂ ਵੀ ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜਿਵੇਂ ਇੱਕੋ ਜਿਹੇ ਦਿਸਣ ਵਾਲੇ ਭੈਣ-ਭਰਾ।"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ਆਪਣਾ ਡੀਵਾਈਸ ਅਣਲਾਕ ਕਰਨ ਲਈ ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤੋ, ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰੋ ਅਤੇ ਭੁਗਤਾਨਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ।\n\nਧਿਆਨ ਵਿੱਚ ਰੱਖੋ:\nਫ਼ੋਨ ਨੂੰ ਦੇਖਣ ਸਾਰ ਹੀ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਇੰਝ ਕਰਨ ਦਾ ਤੁਹਾਡਾ ਇਰਾਦਾ ਨਾ ਹੋਵੇ।\n\nਕਿਸੇ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੇ ਮੂਹਰੇ ਕਰਨ \'ਤੇ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਤੁਹਾਡੀਆਂ ਅੱਖਾਂ ਬੰਦ ਹੋਣ।\n\nਤੁਹਾਡੇ ਵਰਗੇ ਦਿਸਣ ਵਾਲੇ ਕਿਸੇ ਵਿਅਕਤੀ ਵੱਲੋਂ ਵੀ ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜਿਵੇਂ ਇੱਕੋ ਜਿਹੇ ਦਿਸਣ ਵਾਲੇ ਭੈਣ-ਭਰਾ।"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ, ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਅਤੇ ਭੁਗਤਾਨਾਂ ਦੀ ਤਸਦੀਕ ਕਰਨ ਲਈ ਚਿਹਰਾ ਅਣਲਾਕ ਦੀ ਵਰਤੋਂ ਕਰੋ।"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"ਧਿਆਨ ਵਿੱਚ ਰੱਖੋ:\nਫ਼ੋਨ ਨੂੰ ਦੇਖਣ ਸਾਰ ਹੀ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਇੰਝ ਕਰਨ ਦਾ ਤੁਹਾਡਾ ਇਰਾਦਾ ਨਾ ਹੋਵੇ।\n\nਕਿਸੇ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੇ ਮੂਹਰੇ ਕਰਨ \'ਤੇ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ।\n\nਤੁਹਾਡੇ ਨਾਲ ਬਹੁਤ ਜ਼ਿਆਦਾ ਮਿਲਦੇ-ਜੁਲਦੇ ਚਿਹਰੇ ਵਾਲੇ ਕਿਸੇ ਵਿਅਕਤੀ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜਿਵੇਂ ਕਿ ਤੁਹਾਡੇ ਵਰਗੇ ਦਿਸਣ ਵਾਲੇ ਭੈਣ-ਭਰਾ।"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"ਧਿਆਨ ਵਿੱਚ ਰੱਖੋ:\nਫ਼ੋਨ ਨੂੰ ਦੇਖਣ ਸਾਰ ਹੀ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਇੰਝ ਕਰਨ ਦਾ ਤੁਹਾਡਾ ਇਰਾਦਾ ਨਾ ਹੋਵੇ।\n\nਕਿਸੇ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਤੁਹਾਡੇ ਮੂਹਰੇ ਕਰਨ \'ਤੇ ਫ਼ੋਨ ਅਣਲਾਕ ਹੋ ਸਕਦਾ ਹੈ, ਭਾਵੇਂ ਤੁਹਾਡੀਆਂ ਅੱਖਾਂ ਬੰਦ ਹੋਣ।\n\nਤੁਹਾਡੇ ਨਾਲ ਬਹੁਤ ਜ਼ਿਆਦਾ ਮਿਲਦੇ-ਜੁਲਦੇ ਚਿਹਰੇ ਵਾਲੇ ਕਿਸੇ ਵਿਅਕਤੀ ਵੱਲੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ, ਜਿਵੇਂ ਕਿ ਤੁਹਾਡੇ ਵਰਗੇ ਦਿਸਣ ਵਾਲੇ ਭੈਣ-ਭਰਾ।"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ਕੀ ਚਿਹਰੇ ਦਾ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ਚਿਹਰਾ ਅਣਲਾਕ ਰਾਹੀਂ ਵਰਤਿਆ ਗਿਆ ਚਿਹਰਾ ਡਾਟਾ ਪੱਕੇ ਤੌਰ \'ਤੇ ਅਤੇ ਸੁਰੱਖਿਅਤ ਤਰੀਕੇ ਨਾਲ ਮਿਟਾਇਆ ਜਾਵੇਗਾ। ਮਿਟਾਉਣ ਤੋਂ ਬਾਅਦ, ਤੁਹਾਨੂੰ ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ, ਐਪਾਂ ਵਿੱਚ ਸਾਈਨ-ਇਨ ਕਰਨ ਅਤੇ ਭੁਗਤਾਨਾਂ ਦੀ ਪੁਸ਼ਟੀ ਕਰਨ ਲਈ ਆਪਣੇ ਪਿੰਨ, ਪੈਟਰਨ ਜਾਂ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੋਵੇਗੀ।"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"ਆਪਣਾ ਫ਼ੋਨ ਅਣਲਾਕ ਕਰਨ ਲਈ ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤੋ"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\nਨੋਟ ਕਰੋ: ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਨਹੀਂ ਕਰ ਸਕਦੇ। ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ, ਆਪਣੇ ਸੰਗਠਨ ਦੇ ਪ੍ਰਸ਼ਾਸਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਜਾਂ ਖਰੀਦਾਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰੋ। \n\n ਨੋਟ ਕਰੋ: ਤੁਹਾਡਾ ਫਿੰਗਰਪ੍ਰਿੰਟ ਇੱਕ ਮਜ਼ਬੂਤ ਪੈਟਰਨ ਜਾਂ ਪਿੰਨ ਤੋਂ ਘੱਟ ਸੁਰੱਖਿਅਤ ਹੋ ਸਕਦਾ ਹੈ।"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ਰੱਦ ਕਰੋ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ਛੱਡੋ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ਅੱਗੇ"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਚਿਹਰਾ ਅਣਲਾਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਚਿਹਰਾ ਅਣਲਾਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਚਿਹਰਾ ਅਣਲਾਕ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਵੀ ਲੋੜ ਹੈ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ਆਪਣੇ ਟੈਬਲੈੱਟ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਬਾਇਓਮੈਟ੍ਰਿਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਵੀ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਬਾਇਓਮੈਟ੍ਰਿਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਵੀ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਨਾਲ ਸੁਰੱਖਿਅਤ ਰੱਖਣ ਨਾਲ, ਇਸਦੇ ਗੁੰਮ ਜਾਂ ਚੋਰੀ ਹੋ ਜਾਣ \'ਤੇ ਕੋਈ ਇਸਨੂੰ ਵਰਤ ਨਹੀਂ ਸਕੇਗਾ। ਬਾਇਓਮੈਟ੍ਰਿਕ ਦਾ ਸੈੱਟਅੱਪ ਕਰਨ ਲਈ ਵੀ ਤੁਹਾਨੂੰ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ ਦੀ ਲੋੜ ਹੋਵੇਗੀ। ਵਾਪਸ ਜਾਣ ਲਈ, \'ਰੱਦ ਕਰੋ\' \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ਕੀ ਪਿੰਨ ਸੈੱਟਅੱਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"ਕੀ ਪਾਸਵਰਡ ਸੈੱਟਅੱਪ ਛੱਡਣਾ ਹੈ?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ਕੀ ਪੈਟਰਨ ਸੈੱਟਅੱਪ ਛੱਡਣਾ ਹੈ?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲਾਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਸਰਗਰਮ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲਾਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ਡੀਵਾਈਸ ਸੁਰੱਖਿਆ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕਰਨ ਦੁਆਰਾ ਹੋਰਾਂ ਨੂੰ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਦੇ ਬਿਨਾਂ ਇਸ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਰੋਕੋ। ਉਸ ਸਕ੍ਰੀਨ ਲਾਕ ਨੂੰ ਚੁਣੋ ਜਿਸ ਦੀ ਤੁਸੀਂ ਵਰਤੋਂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"ਆਪਣੀ ਬੈੱਕਅੱਪ ਸਕ੍ਰੀਨ  ਲਾਕ  ਵਿਧੀ ਚੁਣੋ"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"ਆਪਣੀ ਬੈੱਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਧੀ ਚੁਣੋ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ਆਪਣੀ ਬੈੱਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਧੀ ਚੁਣੋ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ਸਕ੍ਰੀਨ ਲਾਕ ਵਿਕਲਪ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ਸਕ੍ਰੀਨ ਲਾਕ"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ਚਿਹਰਾ ਅਣਲਾਕ + ਪਾਸਵਰਡ"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ਚਿਹਰਾ ਅਣਲਾਕ ਤੋਂ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"ਤੁਸੀਂ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਨਾਲ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ਬਾਇਓਮੈਟ੍ਰਿਕ + ਪੈਟਰਨ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ਬਾਇਓਮੈਟ੍ਰਿਕ + ਪਿੰਨ"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ਬਾਇਓਮੈਟ੍ਰਿਕ + ਪਾਸਵਰਡ"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ਬਾਇਓਮੈਟ੍ਰਿਕ ਦੇ ਬਿਨਾਂ ਜਾਰੀ ਰੱਖੋ"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ਤੁਸੀਂ ਆਪਣੇ ਬਾਇਓਮੈਟ੍ਰਿਕ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਅਣਲਾਕ ਕਰ ਸਕਦੇ ਹੋ। ਸੁਰੱਖਿਆ ਲਈ, ਇਸ ਵਿਕਲਪ ਨੂੰ ਇੱਕ ਬੈਕਅੱਪ ਸਕ੍ਰੀਨ ਲਾਕ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ਪ੍ਰਸ਼ਾਸਕ, ਇਨਕ੍ਰਿਪਸ਼ਨ ਨੀਤੀ ਜਾਂ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਵੱਲੋਂ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ਕੋਈ ਨਹੀਂ"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ਸਵਾਈਪ ਕਰੋ"</string>
@@ -619,7 +640,6 @@
       <item quantity="other"><xliff:g id="NUMBER_1">%d</xliff:g> ਤੋਂ ਵਧੇਰੇ ਘੱਟ ਅੰਕ ਹੋਣੇ ਚਾਹੀਦੇ ਹਨ</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਇੱਕ ਹਾਲੀਆ ਪਿੰਨ ਵਰਤਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੰਦਾ ਹੈ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ਆਮ ਪਿੰਨ ਤੁਹਾਡੇ IT ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਬਲਾਕ ਕੀਤੇ ਗਏ ਹਨ। ਕੋਈ ਵੱਖਰਾ ਪਿੰਨ ਵਰਤੋ।"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ਇਸ ਵਿੱਚ ਇੱਕ ਅਵੈਧ ਅੱਖਰ-ਚਿੰਨ੍ਹ ਸ਼ਾਮਲ ਨਹੀਂ ਹੋ ਸਕਦਾ"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ਘੱਟੋ-ਘੱਟ ਇੱਕ ਅੱਖਰ ਸ਼ਾਮਲ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ਘੱਟੋ-ਘੱਟ ਇੱਕ ਅੰਕ ਸ਼ਾਮਲ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">ਘੱਟੋ-ਘੱਟ <xliff:g id="COUNT">%d</xliff:g> ਗੈਰ-ਸੰਖਿਆਵਾਚੀ ਅੱਖਰ-ਚਿੰਨ੍ਹ ਸ਼ਾਮਲ ਕਰਨੇ ਲਾਜ਼ਮੀ ਹਨ</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਇੱਕ ਹਾਲੀਆ ਪਾਸਵਰਡ ਵਰਤਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਦਿੰਦਾ ਹੈ।"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ਆਮ ਪਾਸਵਰਡ ਤੁਹਾਡੇ IT ਪ੍ਰਸ਼ਾਸਕ ਵੱਲੋਂ ਬਲਾਕ ਕੀਤੇ ਗਏ ਹਨ। ਕੋਈ ਵੱਖਰਾ ਪਾਸਵਰਡ ਵਰਤੋ।"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ਅੰਕਾਂ ਦਾ ਵਧਦਾ ਕ੍ਰਮ, ਘਟਦਾ ਕ੍ਰਮ, ਜਾਂ ਦੁਹਰਾਈ ਗਈ ਲੜੀ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ ਹੈ"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ਪੁਸ਼ਟੀ ਕਰੋ"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ਰੱਦ ਕਰੋ"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"ਵਾਈ‑ਫਾਈ"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕਰੋ"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"ਵਾਈ‑ਫਾਈ"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ਵਾਈ-ਫਾਈ ਵਰਤੋ"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ਵਾਈ-ਫਾਈ ਵਰਤੋ"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"ਵਾਈ-ਫਾਈ ਸੈਟਿੰਗਾਂ"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"ਵਾਈ‑ਫਾਈ"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ਵਾਇਰਲੈਸ ਐਕਸੈੱਸ ਪੁਆਇੰਟ ਸੈੱਟ ਅੱਪ &amp; ਵਿਵਸਥਿਤ ਕਰੋ"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ QR ਕੋਡ ਨੂੰ ਹੇਠਾਂ ਵਿਚਾਲੇ ਰੱਖੋ"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR ਕੋਡ ਸਕੈਨ ਕਰਕੇ ਵਾਈ-ਫਾਈ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਵੋ"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"ਵਾਈ-ਫਾਈ ਸਾਂਝਾ ਕਰੋ"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਇਹ QR ਕੋਡ ਸਕੈਨ ਕਰਕੇ ਪਾਸਵਰਡ ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਕਿਸੇ ਹੋਰ ਡੀਵਾਈਸ ਨਾਲ ਇਹ QR ਕੋਡ ਸਕੈਨ ਕਰੋ"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਇਹ QR ਕੋਡ ਸਕੈਨ ਕਰੋ"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਡੀਵਾਈਸ ਉਤਪਾਦਕ ਨੂੰ ਸੰਪਰਕ ਕਰੋ"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"ਕੋਈ ਗੜਬੜ ਹੋਈ"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"ਵਾਈ-ਫਾਈ ਪਾਸਵਰਡ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ਹੌਟਸਪੌਟ ਪਾਸਵਰਡ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ਸਵੈ-ਕਨੈਕਟ ਕਰੋ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ਫ਼ੋਨ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਇਸ ਨੈੱਟਵਰਕ ਦੇ ਨੇੜੇ ਹੋਣ \'ਤੇ ਕਨੈਕਟ ਹੋਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ਟੈਬਲੈੱਟ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਇਸ ਨੈੱਟਵਰਕ ਦੇ ਨੇੜੇ ਕਨੈਕਟ ਹੋਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"ਰੇਂਜ ਵਿੱਚ ਹੋਣ \'ਤੇ ਇਸ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਹੋਣ ਦਿਓ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ਇਸ ਨੈੱਟਵਰਕ \'ਤੇ ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰਨ ਲਈ QR ਕੋਡ ਵਰਤੋ"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR ਕੋਡ ਵੈਧ ਫਾਰਮੈਟ ਨਹੀਂ ਹੈ"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ਸਿਸਟਮ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ਮੁਹੱਈਆ ਨਾ ਕਰੋ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ਪ੍ਰਮਾਣਿਤ ਨਾ ਕਰੋ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"ਕੋਈ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਨਿਰਧਾਰਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ। ਤੁਹਾਡਾ ਕਨੈਕਸ਼ਨ ਨਿੱਜੀ ਨਹੀਂ ਰਹੇਗਾ।"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ਨੈੱਟਵਰਕ ਦਾ ਨਾਮ ਬਹੁਤ ਹੀ ਵੱਡਾ ਹੈ।"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ਇੱਕ ਡੋਮੇਨ ਨਿਰਧਾਰਤ ਕਰਨਾ ਲਾਜ਼ਮੀ ਹੈ।"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਲੋੜੀਂਦਾ ਹੈ।"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"ਵਾਈ‑ਫਾਈ ਚਾਲੂ ਕੀਤਾ ਗਿਆ"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੈ"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"ਕਨੈਕਟ ਹੋ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ਨੈੱਟਵਰਕ ਕਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਫਲ"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ਨੈੱਟਵਰਕ ਰੇਂਜ ਵਿੱਚ ਨਹੀਂ ਹੈ"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ਡੀਵਾਈਸ MAC ਪਤਾ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ਬੇਤਰਤੀਬਵਾਰ MAC ਪਤਾ"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"ਬੇਤਰਤੀਬਾ MAC ਪਤਾ (ਪਿਛਲੀ ਵਾਰ ਵਰਤਿਆ ਗਿਆ)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ਪਤਾ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ਨੈੱਟਵਰਕ ਵੇਰਵੇ"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ਸਬਨੈੱਟ ਮਾਸਕ"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 ਪਤੇ"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"ਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕ"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"ਗਾਹਕੀਆਂ"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"ਹੋਰ ਨੈੱਟਵਰਕ"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP ਸੈਟਿੰਗਾਂ"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"ਵਾਈ-ਫਾਈ ਉੱਨਤ ਸੈਟਿੰਗਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"ਰੱਖਿਅਤ ਕਰੋ"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ਇੱਕ ਪ੍ਰਮਾਣਿਕ ਗੇਟਵੇ ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"ਇੱਕ ਪ੍ਰਮਾਣਿਕ DNS ਪਤਾ ਟਾਈਪ ਕਰੋ।"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 ਅਤੇ 32 ਦੇ ਵਿਚਕਾਰ ਇੱਕ ਨੈੱਟਵਰਕ ਅਗੇਤਰ ਲੰਮਾਈ ਟਾਈਪ ਕਰੋ।"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ਜਦੋਂ ਤੱਕ ਨਿੱਜੀ DNS ਵੱਲੋਂ ਓਵਰਰਾਈਡ ਨਾ ਕੀਤਾ ਗਿਆ ਹੋਵੇ)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ਜਦੋਂ ਤੱਕ ਨਿੱਜੀ DNS ਵੱਲੋਂ ਓਵਰਰਾਈਡ ਨਾ ਕੀਤਾ ਗਿਆ ਹੋਵੇ)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"ਗੇਟਵੇ"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ਨੈੱਟਵਰਕ ਅਗੇਤਰ ਲੰਮਾਈ"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"ਵਾਈ‑ਫਾਈ ਡਾਇਰੈਕਟ"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ਐਪ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰ ਰਹੀ ਹੈ। ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਹੌਟਸਪੌਟ ਨੂੰ ਬੰਦ ਕਰਕੇ ਫਿਰ ਚਾਲੂ ਕਰੋ"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"ਕੋਈ ਪਾਸਵਰਡ ਸੈੱਟ ਨਹੀਂ ਹੈ"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ਹੌਟਸਪੌਟ ਦਾ ਨਾਮ"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ਹੋਰ ਡੀਵਾਈਸਾਂ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋ ਸਕਦੀਆਂ ਹਨ"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ਹੌਟਸਪੌਟ ਪਾਸਵਰਡ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP ਬੈਂਡ"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"ਸਮੂਥ ਡਿਸਪਲੇ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਕੁਝ ਸਮੱਗਰੀਆਂ ਲਈ ਰਿਫ੍ਰੈਸ਼ ਦਰ ਨੂੰ 60 ਤੋਂ ਵਧਾ ਕੇ 90 Hz ਕਰ ਦਿੰਦਾ ਹੈ। ਬੈਟਰੀ ਵਰਤੋਂ ਵੱਧ ਜਾਂਦੀ ਹੈ।"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ਸਮੂਥ ਡਿਸਪਲੇ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz ਰਿਫ੍ਰੈਸ਼ ਦਰ ਸੈੱਟ ਕਰੋ"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"ਬਿਹਤਰ ਸਪਰਸ਼ ਪ੍ਰਤੀਕਿਰਿਆ ਅਤੇ ਐਨੀਮੇਸ਼ਨ ਕੁਆਲਿਟੀ ਲਈ ਉੱਚਤਮ ਰਿਫ੍ਰੈਸ਼ ਦਰ। ਬੈਟਰੀ ਵਰਤੋਂ ਵੱਧ ਜਾਂਦੀ ਹੈ।"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"ਸਕ੍ਰੀਨ ਦਾ ਚੌਕੰਨਾਪਣ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ਚਾਲੂ / ਸਕ੍ਰੀਨ ਬੰਦ ਨਹੀਂ ਹੋਵੇਗੀ ਜੇ ਤੁਸੀਂ ਉਸ ਵੱਲ ਦੇਖ ਰਹੇ ਹੋ"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ਜਦੋਂ ਸਕ੍ਰੀਨ ਗੂੜ੍ਹੀ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਇਹ ਨਵੀਂਆਂ ਸੂਚਨਾਵਾਂ ਲਈ ਚਾਲੂ ਹੋ ਜਾਂਦੀ ਹੈ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ਸਮਾਂ ਅਤੇ ਜਾਣਕਾਰੀ ਹਮੇਸ਼ਾਂ ਦਿਖਾਓ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"ਬੈਟਰੀ ਵਰਤੋਂ ਵਧ ਜਾਵੇਗੀ"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"ਗੂੜ੍ਹੀ ਲਿਖਤ"</string>
     <string name="title_font_size" msgid="570613010306330622">"ਫੌਂਟ ਦਾ ਆਕਾਰ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ਲਿਖਤ ਨੂੰ ਵੱਡਾ ਜਾਂ ਛੋਟਾ ਕਰੋ"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"ਸਿਮ ਕਾਰਡ ਲਾਕ ਸੈਟਿੰਗਾਂ"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android ਵਰਜਨ"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android ਸੁਰੱਖਿਆ ਅੱਪਡੇਟ"</string>
     <string name="model_info" msgid="8997566254717810904">"ਮਾਡਲ"</string>
-    <string name="model_summary" msgid="2246651782442466213">"ਮਾਡਲ: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ਮਾਡਲ ਅਤੇ ਹਾਰਡਵੇਅਰ"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ਹਾਰਡਵੇਅਰ ਵਰਜਨ"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ਉਪਕਰਨ ਆਈ.ਡੀ."</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN ਮਿਟਾਓ"</string>
     <string name="menu_new" msgid="6571230342655509006">"ਨਵਾਂ APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"ਰੱਖਿਅਤ ਕਰੋ"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"ਰੱਦ ਕਰੋ"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"ਰੱਦ ਕਰੋ"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"ਨਾਮ ਖੇਤਰ ਨੂੰ ਖਾਲੀ ਨਹੀਂ ਛੱਡਿਆ ਜਾ ਸਕਦਾ।"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN ਨੂੰ ਖਾਲੀ ਨਹੀਂ ਛੱਡਿਆ ਜਾ ਸਕਦਾ।"</string>
@@ -1593,8 +1611,11 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ਐਪਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"ਵਾਈ-ਫਾਈ, ਮੋਬਾਈਲ ਅਤੇ ਬਲੂਟੁੱਥ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"ਇਹ ਨੈੱਟਵਰਕ ਦੀਆਂ ਸਾਰੀਆਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰੇਗਾ, ਜਿਸ ਵਿੱਚ ਇਹ ਸ਼ਾਮਲ ਹਨ:\n\n"<li>"ਵਾਈ-ਫਾਈ"</li>\n<li>"ਮੋਬਾਈਲ ਡਾਟਾ"</li>\n<li>"ਬਲੂਟੁੱਥ"</li></string>
+    <!-- no translation found for erase_euicc_data_button (728078969563311737) -->
+    <skip />
     <string name="reset_esim_title" msgid="6152167073280852849">"ਡਾਊਨਲੋਡ ਕੀਤੇ ਸਿਮ ਮਿਟਾਓ"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"ਵਟਾਵੇਂ ਸਿਮ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ, ਆਪਣੇ ਕੈਰੀਅਰ ਨਾਲ ਸੰਪਰਕ ਕਰੋ। ਇੰਝ ਕਰਨ ਨਾਲ ਕੋਈ ਵੀ ਮੋਬਾਈਲ ਸੇਵਾ ਪਲਾਨ ਰੱਦ ਨਹੀਂ ਹੋਣਗੇ।"</string>
+    <!-- no translation found for reset_esim_desc (3662444090563399131) -->
+    <skip />
     <string name="reset_network_button_text" msgid="2281476496459610071">"ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"ਕੀ ਸਾਰੀਆਂ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਨੀਆਂ ਹਨ? ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"ਕੀ ਸਾਰੀਆਂ ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕਰਕੇ ਡਾਊਨਲੋਡ ਕੀਤੇ ਸਿਮ ਮਿਟਾਉਣੇ ਹਨ? ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
@@ -1604,31 +1625,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ਨੈੱਟਵਰਕ ਸੈਟਿੰਗਾਂ ਰੀਸੈੱਟ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ਸਿਮ ਮਿਟਾਏ ਨਹੀਂ ਜਾ ਸਕਦੇ"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ਡਾਊਨਲੋਡ ਕੀਤੇ ਸਿਮ ਕਿਸੇ ਗੜਬੜ ਕਰਕੇ ਮਿਟਾਏ ਨਹੀਂ ਜਾ ਸਕਦੇ।\n\nਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ਸਭ ਡਾਟਾ ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ਇਹ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ਤੁਸੀਂ ਇਸ ਵੇਲੇ ਇਹਨਾਂ ਖਾਤਿਆਂ \'ਤੇ ਸਾਈਨ-ਇਨ ਹੋ:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ਇਸ ਡੀਵਾਈਸ ਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਮੌਜੂਦ ਨਹੀਂ ਹਨ।\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"ਸੰਗੀਤ"</li>\n<li>"ਫੋਟੋਆਂ"</li>\n<li>"ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"ਈ-ਸਿਮ"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ਇਸ ਨਾਲ ਤੁਹਾਡਾ ਮੋਬਾਈਲ ਸੇਵਾ ਪਲਾਨ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗਾ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਸਾਫ਼ ਕਰਨ ਲਈ, "<b>"USB ਸਟੋਰੇਜ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਉਪਭੋਗਤਾ  ਡਾਟਾ  ਹਟਾਉਣ ਲਈ, "<b>"SD ਕਾਰਡ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ (ਫੈਕਟਰੀ ਰੀਸੈੱਟ)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ਇਹ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ "<b>"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</b>" ਦਾ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾ ਦੇਵੇਗਾ, ਜਿਸ ਵਿੱਚ ਸ਼ਾਮਲ ਹੈ:\n\n"<li>"ਤੁਹਾਡਾ Google ਖਾਤਾ"</li>\n<li>"ਸਿਸਟਮ ਅਤੇ ਐਪ ਡਾਟਾ ਅਤੇ ਸੈਟਿੰਗਾਂ"</li>\n<li>"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ਤੁਸੀਂ ਇਸ ਵੇਲੇ ਇਹਨਾਂ ਖਾਤਿਆਂ \'ਤੇ ਸਾਈਨ-ਇਨ ਹੋ:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਮੌਜੂਦ ਹਨ।\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"ਸੰਗੀਤ"</li>\n<li>"ਫ਼ੋਟੋਆਂ"</li>\n<li>"ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"ਈ-ਸਿਮ"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ਇਸ ਨਾਲ ਤੁਹਾਡਾ ਮੋਬਾਈਲ ਸੇਵਾ ਪਲਾਨ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗਾ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਕਲੀਅਰ ਕਰਨ ਲਈ, "<b>"USB ਸਟੋਰੇਜ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"ਸੰਗੀਤ, ਤਸਵੀਰਾਂ ਅਤੇ ਹੋਰ ਵਰਤੋਂਕਾਰ ਡਾਟਾ ਕਲੀਅਰ ਕਰਨ ਲਈ, "<b>"SD ਕਾਰਡ"</b>" ਨੂੰ ਮਿਟਾਉਣ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB ਸਟੋਰੇਜ ਮਿਟਾਓ"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD ਕਾਰਡ ਮਿਟਾਓ"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ਅੰਦਰੂਨੀ USB ਸਟੋਰੇਜ ਤੇ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD ਕਾਰਡ ਦਾ ਸਾਰਾ  ਡਾਟਾ  ਮਿਟਾਓ, ਜਿਵੇਂ ਸੰਗੀਤ ਜਾਂ ਫ਼ੋਟੋਆਂ"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ਤੁਹਾਡੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਅਤੇ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ ਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ ਅਤੇ ਸਿਮਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਮਿਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ਸਭ ਕੁਝ ਮਿਟਾਓ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ਕੋਈ ਰੀਸੈੱਟ ਪਰਫੌਰਮ ਨਹੀਂ ਕੀਤਾ ਗਿਆ ਸੀ ਕਿਉਂਕਿ ਸਿਸਟਮ ਕਲੀਅਰ ਸੇਵਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ।"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ਕੀ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ਇਸ ਉਪਭੋਗਤਾ ਲਈ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ਮਿਟਾ ਰਿਹਾ ਹੈ"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"ਕਿਰਪਾ ਕਰਕੇ ਠਹਿਰੋ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਓ"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ਤੁਹਾਡੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਅਤੇ ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ ਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ਡਾਊਨਲੋਡ ਕੀਤੀਆਂ ਐਪਾਂ ਅਤੇ ਸਿਮਾਂ ਸਮੇਤ ਤੁਹਾਡੀ ਸਾਰੀ ਨਿੱਜੀ ਜਾਣਕਾਰੀ ਮਿਟਾ ਦਿੱਤੀ ਜਾਵੇਗੀ। ਤੁਸੀਂ ਇਸ ਕਾਰਵਾਈ ਨੂੰ ਅਣਕੀਤਾ ਨਹੀਂ ਕਰ ਸਕਦੇ।"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ਕੀ ਸਾਰਾ ਡਾਟਾ ਮਿਟਾਉਣਾ ਹੈ?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"ਮਿਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"ਕਾਲ ਸੈਟਿੰਗਾਂ"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ਵੌਇਸਮੇਲ, ਕਾਲ ਫਾਰਵਰਡਿੰਗ, ਕਾਲ ਵੇਟਿੰਗ, ਕਾਲਰ ਆਈ.ਡੀ. ਸੈੱਟ ਅੱਪ ਕਰੋ"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ਟੈਦਰਿੰਗ"</string>
@@ -1676,7 +1695,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> ਤੋਂ ਵੱਧ ਡਿਵਾਈਸਾਂ ਨਾਲ ਟੀਥਰ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਅਨਟੀਥਰ ਹੋ ਜਾਏਗਾ।"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ਈਥਰਨੈੱਟ ਟੈਦਰਿੰਗ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ USB ਈਥਰਨੈੱਟ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ਫ਼ੋਨ ਦੇ ਇੰਟਰਨੈੱਟ ਕਨੈਕਸ਼ਨ ਨੂੰ ਈਥਰਨੈੱਟ ਰਾਹੀਂ ਸਾਂਝਾ ਕਰੋ"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ਆਪਣੇ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਦੇ ਰਾਹੀਂ ਦੂਜਿਆਂ ਡੀਵਾਈਸਾਂ ਨੂੰ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ ਦੀ ਵਰਤੋਂ ਕਰੋ। ਨੇੜਲੇ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸਮੱਗਰੀ ਨੂੰ ਸਾਂਝਾ ਕਰਨ ਲਈ ਐਪਾਂ ਵੀ ਇੱਕ ਹੌਟਸਪੌਟ ਬਣਾ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ਹੋਰਾਂ ਡੀਵਾਈਸਾਂ ਨੂੰ ਆਪਣੇ ਵਾਈ-ਫਾਈ ਜਾਂ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਰਾਹੀਂ ਇੰਟਰਨੈੱਟ ਮੁਹੱਈਆ ਕਰਵਾਉਣ ਲਈ ਹੌਟਸਪੌਟ ਅਤੇ ਟੈਦਰਿੰਗ ਵਰਤੋ। ਐਪਾਂ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਨਾਲ ਸਮੱਗਰੀ ਸਾਂਝਾ ਕਰਨ ਲਈ ਇੱਕ ਹੌਟਸਪੌਟ ਵੀ ਬਣਾ ਸਕਦੀਆਂ ਹਨ।"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ਮਦਦ"</string>
@@ -1718,6 +1737,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"ਬਲੂਟੁੱਥ ਸਕੈਨਿੰਗ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"ਬਲੁਟੂੱਥ ਬੰਦ ਹੋਣ \'ਤੇ ਵੀ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਵੇਲੇ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸਾਂ ਲਈ ਸਕੈਨ ਕਰਨ ਦਿਓ। ਇਸਦੀ ਵਰਤੋਂ ਕਰਕੇ ਟਿਕਾਣਾ-ਆਧਾਰਿਤ ਵਿਸ਼ੇਸ਼ਤਾਵਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਵਰਗੀਆਂ ਚੀਜ਼ਾਂ ਨੂੰ ਬਿਹਤਰ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਲਈ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"ਮੌਜੂਦਾ ਸਮਾਂ ਖੇਤਰ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ ਡੀਵਾਈਸ ਦੇ ਟਿਕਾਣੇ ਨੂੰ ਵਰਤਣ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ। ਵਾਈ-ਫਾਈ ਸਕੈਨਿੰਗ ਵਰਗੀਆਂ ਹੋਰ ਟਿਕਾਣਾ ਸੈਟਿੰਗਾਂ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ ਦੀ ਸਟੀਕਤਾ ਨੂੰ ਪ੍ਰਭਾਵਿਤ ਕਰ ਸਕਦੀਆਂ ਹਨ।"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ਚਾਲੂ ਹੈ"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ਬੰਦ ਹੈ"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ਸਮਾਂ ਖੇਤਰ ਦੀ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਪਛਾਣ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਬੰਦ ਹੈ"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਬੰਦ ਹੈ"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਸਮਰਥਿਤ ਨਹੀਂ ਹੈ"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ਟਿਕਾਣਾ ਦੇ ਸਮਾਂ ਖੇਤਰ ਦੀ ਪਛਾਣ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਵਿੱਚ ਤਬਦੀਲੀਆਂ ਕਰਨ ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ"</string>
     <string name="location_network_based" msgid="5247042890080021887">"ਵਾਈ‑ਫਾਈ &amp; ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਟਿਕਾਣਾ"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"ਐਪਸ ਨੂੰ ਤੁਹਾਡੇ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਤੇਜ਼ ਅਨੁਮਾਨ ਲਗਾਉਣ ਲਈ Google ਦੀ ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸੇਵਾ ਵਰਤਣ ਦਿਓ। ਅਨਾਮ ਨਿਰਧਾਰਿਤ ਸਥਾਨ  ਡਾਟਾ  ਇਕੱਤਰ ਕੀਤਾ ਜਾਏਗਾ ਅਤੇ Google ਨੂੰ ਭੇਜਿਆ ਜਾਏਗਾ।"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"ਵਾਈ‑ਫਾਈ ਵੱਲੋਂ ਪਤਾ ਲਗਾਇਆ ਟਿਕਾਣਾ"</string>
@@ -1781,6 +1809,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤਣ ਲਈ, ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤਣ ਲਈ, ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ਚਿਹਰਾ ਅਣਲਾਕ ਵਰਤਣ ਲਈ, ਪਿੰਨ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ਬਾਇਓਮੈਟ੍ਰਿਕ ਵਰਤਣ ਲਈ, ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ਬਾਇਓਮੈਟ੍ਰਿਕ ਵਰਤਣ ਲਈ, ਪੈਟਰਨ ਸੈੱਟ ਕਰੋ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ਬਾਇਓਮੈਟ੍ਰਿਕ ਵਰਤਣ ਲਈ, ਪਿੰਨ ਸੈੱਟ ਕਰੋ"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"ਕੀ ਆਪਣਾ ਪਾਸਵਰਡ ਭੁੱਲ ਗਏ?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ਕੀ ਆਪਣਾ ਪੈਟਰਨ ਭੁੱਲ ਗਏ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ਕੀ ਆਪਣਾ ਪਿੰਨ ਭੁੱਲ ਗਏ?"</string>
@@ -2117,13 +2148,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ਸੁਰਖੀ ਤਰਜੀਹਾਂ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"ਵੱਡਦਰਸ਼ੀਕਰਨ"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਖੇਤਰ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਚਾਲੂ ਕਰੋ"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"ਉਹਨਾਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਖੇਤਰ(ਰਾਂ) ਨੂੰ ਚੁਣੋ ਜਿਹਨਾਂ ਨੂੰ ਤੁਸੀਂ ਸਕ੍ਰੀਨ ਨੂੰ ਵੱਡਾ ਕਰਨ ਦੌਰਾਨ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ਪੂਰੀ ਸਕ੍ਰੀਨ"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"ਸਕ੍ਰੀਨ ਦਾ ਹਿੱਸਾ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ਪੂਰੀ ਸਕ੍ਰੀਨ &amp; ਸਕ੍ਰੀਨ ਦਾ ਹਿੱਸਾ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ਸਾਰੀ ਸਕ੍ਰੀਨ ਨੂੰ ਵੱਡਾ ਕਰੋ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ਸਕ੍ਰੀਨ ਦੇ ਹਿੱਸੇ ਨੂੰ ਵੱਡਾ ਕਰੋ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ਕੀ ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਜਾਣਾ ਹੈ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"ਸਕ੍ਰੀਨ ਦੇ ਕਿਸੇ ਹਿੱਸੇ ਦਾ ਵੱਡਦਰਸ਼ੀਕਰਨ ਕਰਨ ਲਈ ਟ੍ਰਿਪਲ ਟੈਪ ਨੂੰ ਵਰਤਣ ਨਾਲ, ਟਾਇਪਿੰਗ ਅਤੇ ਹੋਰ ਕਾਰਵਾਈਆਂ ਧੀਮੀਆਂ ਹੋ ਜਾਣਗੀਆਂ।\n\nਕੀ ਤੁਸੀਂ ਵੱਡਦਰਸ਼ੀਕਰਨ ਕਰਨ ਲਈ ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ ਨੂੰ ਵਰਤਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ਪਹੁੰਚਯੋਗਤਾ ਬਟਨ \'ਤੇ ਜਾਓ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਕਰਨ ਲਈ ਟ੍ਰਿਪਲ ਟੈਪ ਨੂੰ ਜਾਰੀ ਰੱਖੋ"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"ਵੱਡਦਰਸ਼ੀਕਰਨ ਸੈਟਿੰਗਾਂ"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ਤਿੰਨ-ਟੈਪਾਂ ਨਾਲ ਵੱਡਾ ਕਰੋ"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ਸ਼ਾਰਟਕੱਟ ਨਾਲ ਵੱਡਾ ਕਰੋ"</string>
@@ -2177,11 +2211,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"ਪਾਵਰ ਬਟਨ ਨਾਲ ਕਾਲ ਕੱਟਣਾ"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ਵੱਡਾ ਮਾਊਸ ਪੁਆਇੰਟਰ"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"ਐਨੀਮੇਸ਼ਨਾਂ ਹਟਾਓ"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ਮੋਨੋ ਆਡੀਓ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ਆਡੀਓ ਚਲਾਉਣ ਦੌਰਾਨ ਚੈਨਲਾਂ ਨੂੰ ਇਕੱਠਾ ਕਰੋ"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ਆਡੀਓ ਸੰਤੁਲਨ"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ਖੱਬਾ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ਸੱਜਾ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ਮੋਨੋ ਆਡੀਓ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ਆਡੀਓ ਚਲਾਉਣ ਦੌਰਾਨ ਚੈਨਲਾਂ ਨੂੰ ਇਕੱਠਾ ਕਰੋ"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ਆਡੀਓ ਸੰਤੁਲਨ"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ਖੱਬਾ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ਸੱਜਾ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 ਸਕਿੰਟ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 ਸਕਿੰਟ"</string>
@@ -2211,11 +2245,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"ਸੂਚਨਾ ਦੀ ਥਰਥਰਾਹਟ"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ਘੰਟੀ ਦੀ ਥਰਥਰਾਹਟ"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ਸਪਰਸ਼ ਸੰਬੰਧੀ ਪ੍ਰਤੀਕਰਮ"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ਵਰਤੋ"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ਖੋਲ੍ਹੋ"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ਰੰਗ ਸੁਧਾਈ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"ਸੁਰਖੀਆਂ ਦਿਖਾਓ"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ਸਿਰਫ਼ ਸਮਰਥਿਤ ਐਪ ਲਈ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ਵਰਤੋ"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ਖੋਲ੍ਹੋ"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ਰੰਗ ਸੁਧਾਈ ਵਰਤੋ"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"ਸੁਰਖੀਆਂ ਦਿਖਾਓ"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ਸਿਰਫ਼ ਸਮਰਥਿਤ ਐਪ ਲਈ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"ਸੁਰਖੀ ਦਾ ਆਕਾਰ ਅਤੇ ਸ਼ੈਲੀ"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ਲਿਖਤ ਆਕਾਰ"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ਹੋਰ ਵਿਕਲਪ"</string>
@@ -2245,6 +2279,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ਡਿਊਟ੍ਰੈਨੋਮਲੀ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ਪ੍ਰੋਟੈਨੋਮਲੀ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ਰੰਗ ਅਸਪਸ਼ਟਤਾ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"ਗ੍ਰੇਸਕੇਲ"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ਲਾਲ-ਹਰਾ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ਲਾਲ-ਹਰਾ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"ਨੀਲਾ-ਪੀਲਾ"</string>
@@ -2374,7 +2409,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"ਬੈਕਗ੍ਰਾਊਂਡ ਪਾਬੰਦੀ"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ਐਪ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ਐਪ ਨੂੰ ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚੱਲਣ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਰਤੋਂ \'ਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲਗਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"ਬੈਕਗ੍ਰਾਊਂਡ ਵਰਤੋਂ \'ਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲਗਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"ਕੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਸੀਮਿਤ ਕਰਨੀ ਹੈ?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ਜੇਕਰ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਦੀ ਬੈਕਗ੍ਰਾਊਂਡ ਸਰਗਰਮੀ ਨੂੰ ਸੀਮਿਤ ਕਰਦੇ ਹੋ, ਤਾਂ ਉਹ ਅਜੀਬ ਢੰਗ ਨਾਲ ਵਰਤਾਅ ਕਰ ਸਕਦੀ ਹੈ"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ਇਹ ਐਪ ਬੈਟਰੀ ਨੂੰ ਸੁਯੋਗ ਕਰੋ \'ਤੇ ਸੈੱਟ ਨਾ ਕੀਤੀ ਹੋਣ ਕਰਕੇ, ਤੁਸੀਂ ਇਸ \'ਤੇ ਪਾਬੰਧੀ ਨਹੀਂ ਲਗਾ ਸਕਦੇ।\n\nਐਪ \'ਤੇ ਪਾਬੰਧੀ ਲਗਾਉਣ ਲਈ, ਪਹਿਲਾਂ ਬੈਟਰੀ ਸੁਯੋਗਕਰਨ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string>
@@ -2423,6 +2458,9 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਹੋਈ ਹੈ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਹੋਈ ਹੈ"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"ਬੈਟਰੀ ਆਮ ਨਾਲੋਂ ਪਹਿਲਾਂ ਖਤਮ ਹੋ ਸਕਦੀ ਹੈ"</string>
+    <!-- no translation found for battery_tip_limited_temporarily_title (7152799456221596915) -->
+    <skip />
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"ਬੈਟਰੀ ਕੁਝ ਸਮੇਂ ਲਈ ਸੀਮਤ। ਹੋਰ ਜਾਣਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"ਤੁਹਾਡੇ ਫ਼ੋਨ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਸ਼ਾਇਦ ਉਮੀਦ ਨਾਲੋਂ ਛੇਤੀ ਮੁੱਕ ਜਾਵੇ।\n\nਬੈਟਰੀ ਵਰਤੋਂ ਮੁਤਾਬਕ ਪ੍ਰਮੁੱਖ ਐਪਾਂ:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਸ਼ਾਇਦ ਉਮੀਦ ਨਾਲੋਂ ਛੇਤੀ ਮੁੱਕ ਜਾਵੇ।\n\nਬੈਟਰੀ ਵਰਤੋਂ ਮੁਤਾਬਕ ਪ੍ਰਮੁੱਖ ਐਪਾਂ:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦੀ ਵਰਤੋਂ ਆਮ ਨਾਲੋਂ ਜ਼ਿਆਦਾ ਕੀਤੀ ਗਈ ਹੈ। ਤੁਹਾਡੀ ਬੈਟਰੀ ਸ਼ਾਇਦ ਉਮੀਦ ਨਾਲੋਂ ਛੇਤੀ ਮੁੱਕ ਜਾਵੇ।\n\nਬੈਟਰੀ ਵਰਤੋਂ ਮੁਤਾਬਕ ਪ੍ਰਮੁੱਖ ਐਪਾਂ:"</string>
@@ -2478,6 +2516,8 @@
       <item quantity="other">%1$d ਐਪਾਂ ਪ੍ਰਤੀਬੰਧਿਤ</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"ਤੁਹਾਡੇ ਬੈਟਰੀ ਮੀਟਰ ਨੂੰ ਪੜ੍ਹਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੋ ਰਹੀ ਹੈ"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"ਤੁਹਾਡੇ ਬੈਟਰੀ ਮੀਟਰ ਨੂੰ ਪੜ੍ਹਨ ਵਿੱਚ ਸਮੱਸਿਆ ਹੋ ਰਹੀ ਹੈ। "<annotation id="url">"ਹੋਰ ਜਾਣਨ"</annotation>" ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ਕੀ ਐਪ ਬੰਦ ਕਰੀਏ?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"ਤੁਹਾਡਾ ਫ਼ੋਨ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਹੱਲ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ ਬੈਟਰੀ ਦਾ ਪ੍ਰਬੰਧਨ ਆਮ ਵਾਂਗ ਨਹੀਂ ਕਰ ਸਕਦਾ ਕਿਉਂਕਿ <xliff:g id="APP">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਟੈਬਲੈੱਟ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਰੱਖ ਰਹੀ ਹੈ।\n\nਇਸ ਸਮੱਸਿਆ ਨੂੰ ਠੀਕ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਨ ਲਈ, ਤੁਸੀਂ ਐਪ ਨੂੰ ਬੰਦ ਕਰ ਸਕਦੇ ਹੋ।\n\nਜੇਕਰ ਇੰਝ ਹੋਣਾ ਜਾਰੀ ਰਹਿੰਦਾ ਹੈ, ਤਾਂ ਤੁਹਾਨੂੰ ਬੈਟਰੀ ਪ੍ਰਦਰਸ਼ਨ ਬਿਹਤਰ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਅਣਸਥਾਪਤ ਕਰਨ ਦੀ ਲੋੜ ਪੈ ਸਕਦੀ ਹੈ।"</string>
@@ -2591,9 +2631,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ਕੋਈ ਸਮਾਂ-ਸੂਚੀ ਸੈੱਟ ਕਰੋ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ਬੈਟਰੀ ਲਾਈਫ਼ ਵਧਾਓ"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ਚਾਰਜ ਹੋਣ \'ਤੇ ਬੰਦ ਕਰੋ"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ਤੁਹਾਡਾ ਫ਼ੋਨ <xliff:g id="PERCENT">%1$s</xliff:g> \'ਤੇ ਹੋਣ ਉਪਰੰਤ ਬੈਟਰੀ ਸੇਵਰ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ <xliff:g id="PERCENT">%1$s</xliff:g> \'ਤੇ ਹੋਣ ਉਪਰੰਤ ਬੈਟਰੀ ਸੇਵਰ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ਤੁਹਾਡਾ ਡੀਵਾਈਸ <xliff:g id="PERCENT">%1$s</xliff:g> \'ਤੇ ਹੋਣ ਉਪਰੰਤ ਬੈਟਰੀ ਸੇਵਰ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ਜਦੋਂ ਤੁਹਾਡਾ ਫ਼ੋਨ <xliff:g id="PERCENT">%1$s</xliff:g> ਤੋਂ ਵੱਧ ਚਾਰਜ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਬੈਟਰੀ ਸੇਵਰ ਮੋਡ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ਜਦੋਂ ਤੁਹਾਡਾ ਟੈਬਲੈੱਟ <xliff:g id="PERCENT">%1$s</xliff:g> ਤੋਂ ਵੱਧ ਚਾਰਜ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਬੈਟਰੀ ਸੇਵਰ ਮੋਡ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ਜਦੋਂ ਤੁਹਾਡਾ ਡੀਵਾਈਸ <xliff:g id="PERCENT">%1$s</xliff:g> ਤੋਂ ਵੱਧ ਚਾਰਜ ਹੋ ਜਾਂਦਾ ਹੈ ਤਾਂ ਬੈਟਰੀ ਸੇਵਰ ਮੋਡ ਬੰਦ ਹੋ ਜਾਂਦਾ ਹੈ"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ਚਾਲੂ ਕਰੋ"</string>
@@ -2658,6 +2698,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="tts_play" msgid="2945513377250757221">"ਚਲਾਓ"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"ਅਡੈਪਟਿਵ ਕਨੈਕਟੀਵਿਟੀ"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ਇਹ ਤੁਹਾਡੇ ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨਾਂ ਦਾ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਪ੍ਰਬੰਧਨ ਕਰਕੇ, ਬੈਟਰੀ ਲਾਈਫ਼ ਨੂੰ ਵਧਾਉਂਦੀ ਹੈ ਅਤੇ ਡੀਵਾਈਸ ਦੀ ਕਾਰਗੁਜ਼ਾਰੀ ਵਿੱਚ ਸੁਧਾਰ ਕਰਦੀ ਹੈ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ਸਟੋਰੇਜ ਤੋਂ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਕਰੋ"</string>
@@ -2669,9 +2711,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ਵਰਤੋਂਕਾਰ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ਸਟੋਰ ਕੀਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਦੇਖੋ ਅਤੇ ਸੋਧੋ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ਵਿਕਸਿਤ"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ਸਟੋਰੇਜ ਦੀ ਕਿਸਮ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ਹਾਰਡਵੇਅਰ-ਸਮਰਥਿਤ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ਕੇਵਲ ਸਾਫਟਵੇਅਰ"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ਅਤੇ ਐਪਾਂ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ਵਾਈ-ਫਾਈ ਲਈ ਸਥਾਪਤ ਕੀਤਾ ਗਿਆ"</string>
@@ -2687,6 +2726,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"ਸਥਾਪਤ ਨਾ ਕਰੋ"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"ਫੇਰ ਵੀ ਸਥਾਪਤ ਕਰੋ"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"ਕੀ <xliff:g id="APP_NAME">%s</xliff:g> ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਪ੍ਰਮਾਣ-ਪੱਤਰਾਂ ਦੀ ਸਥਾਪਨਾ ਕਰਨ ਦੇਣੀ ਹੈ?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"ਇਹ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਹੇਠਾਂ ਦਿੱਤੀਆਂ ਐਪਾਂ ਅਤੇ URL ਵਿੱਚ ਤੁਹਾਡੀ ਪਛਾਣ ਕਰਨਗੇ"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"ਇਜਾਜ਼ਤ ਨਾ ਦਿਓ"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"ਹੋਰ ਦਿਖਾਓ"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"ਪ੍ਰਮਾਣ-ਪੱਤਰ ਪ੍ਰਬੰਧਨ ਐਪ"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"ਇਸ ਐਪ ਵੱਲੋਂ ਸਥਾਪਤ ਕੀਤੇ ਗਏ ਪ੍ਰਮਾਣ-ਪੱਤਰ ਹੇਠਾਂ ਦਿੱਤੀਆਂ ਐਪਾਂ ਅਤੇ URL ਵਿੱਚ ਤੁਹਾਡੀ ਪਛਾਣ ਕਰਨਗੇ"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"ਹਟਾਓ"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"ਸੰਕਟਕਾਲੀਨ ਡਾਇਲਿੰਗ ਸਿਗਨਲ"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"ਜਦੋਂ ਇੱਕ ਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕੀਤੀ ਜਾਂਦੀ ਹੈ ਤਾਂ ਵਿਵਹਾਰ ਸੈੱਟ ਕਰੋ"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"ਬੈਕਅੱਪ"</string>
@@ -3010,7 +3058,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ਸੈੱਟ ਅੱਪ ਨਹੀਂ ਕੀਤਾ - ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ"</string>
     <string name="user_admin" msgid="4024553191395768119">"ਪ੍ਰਸ਼ਾਸਕ"</string>
     <string name="user_you" msgid="3070562015202859996">"ਤੁਸੀਂ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ਉਪਨਾਮ"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"ਤੁਸੀਂ <xliff:g id="USER_COUNT">%1$d</xliff:g> ਵਰਤੋਂਕਾਰ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ਕੇਵਲ ਟੈਬਲੈੱਟ ਦਾ ਮਾਲਕ ਹੀ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਪ੍ਰਬੰਧਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ਕੇਵਲ ਫ਼ੋਨ ਦਾ ਮਾਲਕ ਹੀ ਵਰਤੋਂਕਾਰਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦਾ ਹੈ।"</string>
@@ -3060,7 +3107,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ਟਰਮੀਨਲ \'ਤੇ ਭੁਗਤਾਨ ਕਰਨਾ"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ਇੱਕ ਭੁਗਤਾਨ ਐਪ ਸੈੱਟ ਅੱਪ ਕਰੋ। ਫਿਰ ਸੰਪਰਕ-ਰਹਿਤ ਚਿੰਨ੍ਹ ਵਾਲੇ ਕਿਸੇ ਵੀ ਟਰਮੀਨਲ ਵੱਲ ਨੂੰ ਆਪਣੇ ਫ਼ੋਨ ਦਾ ਪਿਛਲਾ ਪਾਸਾ ਸਿਰਫ਼ ਫੜ੍ਹ ਕੇ ਰੱਖੋ।"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ਸਮਝ ਲਿਆ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"ਹੋਰ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"ਹੋਰ…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਭੁਗਤਾਨ ਐਪ ਸੈੱਟ ਕਰੋ"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਭੁਗਤਾਨ ਐਪ ਨੂੰ ਅੱਪਡੇਟ ਕਰੋ"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ਸੰਪਰਕ-ਰਹਿਤ ਟਰਮੀਨਲ ਵਿਖੇ, <xliff:g id="APP">%1$s</xliff:g> ਨਾਲ ਭੁਗਤਾਨ ਕਰੋ"</string>
@@ -3130,9 +3177,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ਪਿੱਛੇ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ਅੱਗੇ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ਸਮਾਪਤ ਕਰੋ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ਫ਼ੋਟੋ ਖਿੱਚੋ"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ਚਿੱਤਰ ਚੁਣੋ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ਫ਼ੋਟੋ ਚੁਣੋ"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM ਕਾਰਡ"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM ਕਾਰਡ"</string>
@@ -3144,7 +3188,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ਕਾਲਾਂ ਲਈ ਹਮੇਸ਼ਾਂ ਇਹ ਵਰਤੋ"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">" ਡਾਟਾ  ਲਈ ਇੱਕ SIM ਚੁਣੋ"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS ਲਈ ਕੋਈ ਸਿਮ ਚੁਣੋ"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">" ਡਾਟਾ  SIM ਸਵਿਚ ਕਰਦੇ ਹੋਏ, ਇਸ ਵਿੱਚ ਇੱਕ ਮਿੰਟ ਲੱਗ ਸਕਦਾ ਹੈ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"ਡਾਟਾ ਸਿਮ ਬਦਲਣ ਵਿੱਚ ਕੁਝ ਸਮਾਂ ਲੱਗ ਸਕਦਾ ਹੈ…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"ਇਸਦੇ ਨਾਲ ਕਾਲ ਕਰੋ"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"ਇੱਕ SIM ਕਾਰਡ ਚੁਣੋ"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3331,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"ਨਿਯਮਬੱਧ ਕੰਮ, ਸਮਾਂ-ਸੂਚੀ, ਬੈਟਰੀ ਸੇਵਰ, ਪਾਵਰ ਸੇਵਰ, ਬੈਟਰੀ, ਸਵੈਚਲਿਤ, ਫ਼ੀਸਦ"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, ਉੱਨਤ ਕਾਲਿੰਗ, 4g ਕਾਲਿੰਗ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ਭਾਸ਼ਾ ਸ਼ਾਮਲ ਕਰੋ, ਕੋਈ ਭਾਸ਼ਾ ਸ਼ਾਮਲ ਕਰੋ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ਲਿਖਤ ਦਾ ਆਕਾਰ"</string>
     <string name="default_sound" msgid="6604374495015245195">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਧੁਨੀ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ਘੰਟੀ ਅਤੇ ਸੂਚਨਾ ਦੀ ਅਵਾਜ਼ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ਹੈ"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ਅਵਾਜ਼, ਥਰਥਰਾਹਟ, ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string>
@@ -3326,11 +3371,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ਚਾਲੂ ਹੋਣ \'ਤੇ ਵੱਜਣ ਵਾਲੀਆਂ ਧੁਨੀਆਂ"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"ਲਾਈਵ ਸੁਰਖੀਆਂ"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"ਸਵੈਚਲਿਤ ਸੁਰਖੀ ਮੀਡੀਆ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ਕੋਈ ਨਹੀਂ"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਮਾਂ-ਸੂਚੀ ਸੈੱਟ ਕੀਤੀ ਗਈ</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਮਾਂ-ਸੂਚੀਆਂ ਸੈੱਟ ਕੀਤੀਆਂ ਗਈਆਂ</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ਕੋਈ ਨਹੀਂ}=1{1 ਸਮਾਂ-ਸੂਚੀ ਸੈੱਟ ਕੀਤੀ ਗਈ}other{# ਸਮਾਂ-ਸੂਚੀਆਂ ਸੈੱਟ ਕੀਤੀਆਂ ਗਈਆਂ}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ਸਿਰਫ਼ ਮਹੱਤਵਪੂਰਨ ਲੋਕਾਂ ਅਤੇ ਐਪਾਂ ਵੱਲੋਂ ਸੂਚਨਾ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"ਰੁਕਾਵਟਾਂ ਸੀਮਤ ਕਰੋ"</string>
@@ -3398,20 +3439,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ਸਿਰਫ਼ ਤਰਜੀਹੀ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>। <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ਚਾਲੂ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ਬੰਦ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ਬੰਦ"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ਚਾਲੂ"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ਹਰ ਵਾਰ ਪੁੱਛੋ"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਬੰਦ ਨਹੀਂ ਕਰਦੇ"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ਘੰਟਾ</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ਘੰਟੇ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> ਮਿੰਟ"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਮਾਂ-ਸੂਚੀ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੀ ਹੈ</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ਸਮਾਂ-ਸੂਚੀਆਂ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੀਆਂ ਹਨ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ਘੰਟਾ}one{# ਘੰਟਾ}other{# ਘੰਟੇ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 ਮਿੰਟ}one{# ਮਿੰਟ}other{# ਮਿੰਟ}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ਬੰਦ}=1{ਬੰਦ / 1 ਸਮਾਂ-ਸੂਚੀ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੀ ਹੈ}other{ਬੰਦ / # ਸਮਾਂ-ਸੂਚੀਆਂ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚਾਲੂ ਹੋ ਸਕਦੀਆਂ ਹਨ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਵਿੱਚ ਕਿਹੜੀਆਂ ਚੀਜ਼ਾਂ ਵਿਘਨ ਪਾ ਸਕਦੀਆਂ ਹਨ"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ਲੋਕ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ਐਪਾਂ"</string>
@@ -3457,6 +3490,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ਘੱਟ ਤਰਜੀਹ ਵਾਲੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ \'ਸਰਲ\' \'ਤੇ ਸੈੱਟ ਕਰੋ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"ਅਨੁਕੂਲ ਸੂਚਨਾ ਦਰਜਾ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ਢੁਕਵੇਂਪਣ ਮੁਤਾਬਕ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਦਰਜਾਬੰਦ ਕੀਤੀਆਂ ਸੂਚਨਾਵਾਂ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ਅਨੁਕੂਲ ਸੂਚਨਾ ਸੰਬੰਧੀ ਵਿਚਾਰ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ਸੂਚਨਾ ਵਿੱਚ ਕੀਤੀਆਂ ਗਈਆਂ ਵਿਵਸਥਾਵਾਂ ਬਾਰੇ ਸੂਚਿਤ ਕਰੋ ਅਤੇ ਸਿਸਟਮ ਨੂੰ ਵਿਚਾਰ ਮੁਹੱਈਆ ਕਰਨ ਦਾ ਵਿਕਲਪ ਦਿਖਾਓ"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"ਸੂਚਨਾ ਦੀ ਮਹੱਤਤਾ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"ਵਰਤੋਂਕਾਰਾਂ ਵੱਲੋਂ ਬਦਲੀਆਂ ਗਈਆਂ ਮਹੱਤਤਾ ਵਾਲੀਆਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰੋ ਅਤੇ ਸੂਚਨਾ ਸਹਾਇਕ ਨੂੰ ਤਰਜੀਹ ਦੇਣ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"ਸੁਝਾਈਆਂ ਗਈਆਂ ਕਾਰਵਾਈਆਂ ਅਤੇ ਜਵਾਬ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੁਝਾਈਆਂ ਗਈਆਂ ਕਾਰਵਾਈਆਂ ਅਤੇ ਜਵਾਬਾਂ ਨੂੰ ਦਿਖਾਓ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ਹਾਲੀਆਂ ਅਤੇ ਸਨੂਜ਼ ਕੀਤੀਆਂ ਸੂਚਨਾਵਾਂ ਦਿਖਾਓ"</string>
@@ -3554,8 +3591,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"ਗੱਲਬਾਤ ਸੈਕਸ਼ਨ ਦੇ ਸਿਖਰ \'ਤੇ ਤੈਰਦੇ ਹੋਏ ਬਬਲ ਵਜੋਂ ਦਿਖਾਓ"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"ਗੱਲਬਾਤ ਸੈਕਸ਼ਨ ਦੇ ਸਿਖਰ \'ਤੇ ਦਿਖਾਓ"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"ਹੋਰ ਗੱਲਾਂਬਾਤਾਂ"</string>
+    <string name="other_conversations" msgid="551178916855139870">"ਗੈਰ-ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ਜਿਨ੍ਹਾਂ ਗੱਲਾਂਬਾਤਾਂ ਵਿੱਚ ਤੁਸੀਂ ਤਬਦੀਲੀਆਂ ਕੀਤੀਆਂ ਹਨ"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"ਹਾਲੀਆ ਗੱਲਾਂਬਾਤਾਂ"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ਹਾਲੀਆ ਗੱਲਬਾਤ ਕਲੀਅਰ ਕਰੋ"</string>
+    <string name="clear" msgid="5092178335409471100">"ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ ਨੂੰ ਬਬਲ ਵਜੋਂ ਦਿਖਾਓ"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ ਹੇਠਾਂ ਖਿੱਚੀ ਜਾਣ ਵਾਲੀ ਸੂਚੀ ਦੇ ਸਿਖਰ \'ਤੇ ਦਿਸਦੀਆਂ ਹਨ। ਤੁਸੀਂ ਇਹਨਾਂ ਨੂੰ ਬਬਲ \'ਤੇ ਵੀ ਸੈੱਟ ਕਰਕੇ \'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਮੋਡ ਨੂੰ ਰੋਕ ਸਕਦੇ ਹੋ।"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ਤਰਜੀਹੀ ਅਤੇ ਸੋਧੀਆਂ ਗਈਆਂ ਗੱਲਾਂਬਾਤਾਂ ਇੱਥੇ ਦਿਸਣਗੀਆਂ"</string>
@@ -3653,7 +3693,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਤੱਕ ਪਹੁੰਚ"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ\' ਨੂੰ ਚਾਲੂ ਕਰਨ ਦਿਓ"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ਕਿਸੇ ਵੀ ਸਥਾਪਤ ਐਪਾਂ ਨੇ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਪਹੁੰਚ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ਐਪਸ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ਐਪਾਂ ਨੂੰ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"ਤੁਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"ਤੁਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੀ ਇਸ ਸ਼੍ਰੇਣੀ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"ਤੁਹਾਡੀ ਬੇਨਤੀ ਕਾਰਨ, Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੇ ਇਸ ਗਰੁੱਪ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਦਿਖਾਏ ਜਾਣ ਤੋਂ ਬਲਾਕ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
@@ -3745,11 +3785,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"ਸਾਰੀਆਂ ਗੱਲਾਂਬਾਤਾਂ"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ਤਰਜੀਹੀ ਗੱਲਾਂਬਾਤਾਂ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ਕੋਈ ਨਹੀਂ"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> ਗੱਲਬਾਤ</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> ਗੱਲਾਂਬਾਤਾਂ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ਕੋਈ ਨਹੀਂ}=1{1 ਗੱਲਬਾਤ}other{# ਗੱਲਾਂਬਾਤਾਂ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ਕੌਣ ਵਿਘਨ ਪਾ ਸਕਦਾ ਹੈ"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ਕਾਲਾਂ"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ਕਾਲਾਂ"</string>
@@ -3758,11 +3794,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ਇਹ ਪੱਕਾ ਕਰਨ ਲਈ ਕਿ ਮਨਜ਼ੂਰਸ਼ੁਦਾ ਕਾਲਾਂ ਲਈ ਧੁਨੀ ਵਜਦੀ ਹੈ, ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਘੰਟੀ \'ਤੇ ਸੈੱਟ ਹੈ"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ਲਈ ਆਉਣ ਵਾਲੀਆਂ ਕਾਲਾਂ ਬਲਾਕ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਮੈਂਬਰਾਂ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਨੂੰ ਤੁਹਾਨੂੰ ਸੰਪਰਕ ਕਰਨ ਦੇਣ ਲਈ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ਤਾਰਾਬੱਧ ਸੰਪਰਕ"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ਹੋਰ</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ਹੋਰ</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ਕੋਈ ਨਹੀਂ}=1{{contact_1}}=2{{contact_1} ਅਤੇ {contact_2}}=3{{contact_1}, {contact_2}, ਅਤੇ {contact_3}}other{{contact_1}, {contact_2}, ਅਤੇ # ਹੋਰ}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(ਕੋਈ ਨਾਮ ਨਹੀਂ)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ਸੁਨੇਹੇ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"ਸੁਨੇਹੇ"</string>
@@ -3771,11 +3804,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ਲਈ ਇਨਕਮਿੰਗ ਸੁਨੇਹੇ ਬਲਾਕ ਕੀਤੇ ਗਏ ਹਨ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਮੈਂਬਰਾਂ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਨੂੰ ਤੁਹਾਨੂੰ ਸੰਪਰਕ ਕਰਨ ਦੇਣ ਲਈ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"ਸਾਰੇ ਸੁਨੇਹੇ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੇ ਹਨ"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"ਸਾਰੀਆਂ ਕਾਲਾਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੀਆਂ ਹਨ"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ਕੋਈ ਨਹੀਂ"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ਸੰਪਰਕ</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ਸੰਪਰਕ</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ਕੋਈ ਨਹੀਂ}=1{1 ਸੰਪਰਕ}other{# ਸੰਪਰਕ}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ਕੋਈ ਵੀ"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"ਸੰਪਰਕ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ਤਾਰਾਬੱਧ ਸੰਪਰਕ"</string>
@@ -3813,22 +3842,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"ਸਭ ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"ਕੁਝ ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ਚੁਣੇ ਗਏ ਲੋਕ ਹਾਲੇ ਵੀ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੇ ਹਨ, ਭਾਵੇਂ ਤੁਸੀਂ ਐਪਾਂ ਨੂੰ ਵਿਘਨ ਪਾਉਣ ਦੀ ਆਗਿਆ ਨਹੀਂ ਦਿੰਦੇ"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> ਹੋਰ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ਕੋਈ ਵੀ ਐਪ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦੀ}=1{{app_1} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}=2{{app_1} ਅਤੇ {app_2} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}=3{{app_1}, {app_2}, ਅਤੇ {app_3} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}other{{app_1}, {app_2}, ਅਤੇ # ਹੋਰ ਐਪਾਂ ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ਐਪਾਂ"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"ਸਭ ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"ਕੁਝ ਸੂਚਨਾਵਾਂ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"ਸੂਚਨਾਵਾਂ ਜੋ ਵਿਘਨ ਪਾ ਸਕਦੀਆਂ ਹਨ"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"ਸਭ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ਕੋਈ ਵੀ ਚੀਜ਼ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦੀ"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> ਹੋਰ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ਕੋਈ ਵੀ ਚੀਜ਼ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦੀ}=1{{sound_category_1} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}=2{{sound_category_1} ਅਤੇ {sound_category_2} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}=3{{sound_category_1}, {sound_category_2}, ਅਤੇ{sound_category_3} ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}other{{sound_category_1}, {sound_category_2}, ਅਤੇ # ਹੋਰ ਚੀਜ਼ਾਂ ਕਰਕੇ ਵਿਘਨ ਪੈ ਸਕਦਾ ਹੈ}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ਕੋਈ ਵੀ ਚੀਜ਼ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦੀ"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ਕੋਈ ਵੀ ਵਿਘਨ ਨਹੀਂ ਪਾ ਸਕਦਾ"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"ਕੁਝ ਲੋਕ ਵਿਘਨ ਪਾ ਸਕਦੇ ਹਨ"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ਸਾਰੇ ਲੋਕ ਵਿਘਨ ਪਾ ਸਕਦੇ ਹਨ"</string>
@@ -3874,8 +3895,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ਚਾਲੂ"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"ਬੰਦ"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"ਐਪ ਪਿਨਿੰਗ"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"ਐਪ ਪਿਨਿੰਗ ਵਿਸ਼ੇਸ਼ਤਾ ਤੁਹਾਨੂੰ ਮੌਜੂਦਾ ਐਪ ਉਦੋਂ ਤੱਕ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਰੱਖਣ ਦਿੰਦੀ ਹੈ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਨੂੰ ਅਨਪਿੰਨ ਨਹੀਂ ਕਰਦੇ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਇੰਝ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ, ਉਦਾਹਰਨ ਲਈ, ਜਿਵੇਂ ਕਿਸੇ ਭਰੋਸੇਮੰਦ ਦੋਸਤ ਨੂੰ ਕੋਈ ਖਾਸ ਗੇਮ ਖੇਡਣ ਲਈ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ। \n\nਜਦੋਂ ਕੋਈ ਐਪ ਪਿੰਨ ਕੀਤੀ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਪਿੰਨ ਕੀਤੀ ਐਪ ਹੋਰ ਐਪਾਂ ਨੂੰ ਖੋਲ੍ਹ ਸਕਦੀ ਹੈ ਅਤੇ ਨਿੱਜੀ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ। \n\nਐਪ ਪਿਨਿੰਗ ਨੂੰ ਵਰਤਣ ਲਈ: \n1.	ਐਪ ਪਿਨਿੰਗ ਨੂੰ ਚਾਲੂ ਕਰੋ \n2.	ਰੂਪ-ਰੇਖਾ ਨੂੰ ਖੋਲ੍ਹੋ \n3.	ਸਕ੍ਰੀਨ ਦੇ ਸਿਖਰ \'ਤੇ ਐਪ ਪ੍ਰਤੀਕ \'ਤੇ ਟੈਪ ਕਰਕੇ ਪਿੰਨ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"ਐਪ ਪਿਨਿੰਗ ਵਿਸ਼ੇਸ਼ਤਾ ਤੁਹਾਨੂੰ ਮੌਜੂਦਾ ਐਪ ਉਦੋਂ ਤੱਕ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਰੱਖਣ ਦਿੰਦੀ ਹੈ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਨੂੰ ਅਨਪਿੰਨ ਨਹੀਂ ਕਰਦੇ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਇੰਝ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ, ਉਦਾਹਰਨ ਲਈ, ਜਿਵੇਂ ਕਿਸੇ ਭਰੋਸੇਮੰਦ ਦੋਸਤ ਨੂੰ ਕੋਈ ਖਾਸ ਗੇਮ ਖੇਡਣ ਲਈ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ। \n\nਜਦੋਂ ਕੋਈ ਐਪ ਪਿੰਨ ਕੀਤੀ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਪਿੰਨ ਕੀਤੀ ਐਪ ਹੋਰ ਐਪਾਂ ਨੂੰ ਖੋਲ੍ਹ ਸਕਦੀ ਹੈ ਅਤੇ ਨਿੱਜੀ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ। \n\nਜੇ ਤੁਸੀਂ ਕਿਸੇ ਵਿਅਕਤੀ ਨਾਲ ਆਪਣਾ ਡੀਵਾਈਸ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਸਾਂਝਾ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਇਸ ਦੀ ਬਜਾਏ ਮਹਿਮਾਨ ਵਰਤੋਂਕਾਰ ਨੂੰ ਵਰਤ ਕੇ ਦੇਖੋ। \n\nਐਪ ਪਿਨਿੰਗ ਨੂੰ ਵਰਤਣ ਲਈ: 	\n1.	ਐਪ ਪਿਨਿੰਗ ਨੂੰ ਚਾਲੂ ਕਰੋ 	\n2.	ਰੂਪ-ਰੇਖਾ ਨੂੰ ਖੋਲ੍ਹੋ 	\n3.	ਸਕ੍ਰੀਨ ਦੇ ਸਿਖਰ \'ਤੇ ਐਪ ਪ੍ਰਤੀਕ \'ਤੇ ਟੈਪ ਕਰਕੇ ਪਿੰਨ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"ਐਪ ਪਿਨਿੰਗ ਵਿਸ਼ੇਸ਼ਤਾ ਤੁਹਾਨੂੰ ਮੌਜੂਦਾ ਐਪ ਉਦੋਂ ਤੱਕ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਰੱਖਣ ਦਿੰਦੀ ਹੈ ਜਦੋਂ ਤੱਕ ਤੁਸੀਂ ਇਸਨੂੰ ਅਨਪਿੰਨ ਨਹੀਂ ਕਰਦੇ। ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਇੰਝ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ, ਉਦਾਹਰਨ ਲਈ, ਕਿਸੇ ਭਰੋਸੇਮੰਦ ਦੋਸਤ ਨੂੰ ਕੋਈ ਖਾਸ ਗੇਮ ਖੇਡਣ ਲਈ ਦਿੱਤੀ ਜਾਂਦੀ ਹੈ।"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"ਜਦੋਂ ਕੋਈ ਐਪ ਪਿੰਨ ਕੀਤੀ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਪਿੰਨ ਕੀਤੀ ਐਪ ਹੋਰ ਐਪਾਂ ਨੂੰ ਖੋਲ੍ਹ ਸਕਦੀ ਹੈ ਅਤੇ ਨਿੱਜੀ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ। \n\nਐਪ ਪਿਨਿੰਗ ਨੂੰ ਵਰਤਣ ਲਈ: 	\n1.	ਐਪ ਪਿਨਿੰਗ ਨੂੰ ਚਾਲੂ ਕਰੋ 	\n2.	ਰੂਪ-ਰੇਖਾ ਨੂੰ ਖੋਲ੍ਹੋ 	\n3.	ਸਕ੍ਰੀਨ ਦੇ ਸਿਖਰ \'ਤੇ ਐਪ ਪ੍ਰਤੀਕ \'ਤੇ ਟੈਪ ਕਰਕੇ ਪਿੰਨ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"ਜਦੋਂ ਕੋਈ ਐਪ ਪਿੰਨ ਕੀਤੀ ਹੁੰਦੀ ਹੈ, ਤਾਂ ਪਿੰਨ ਕੀਤੀ ਐਪ ਹੋਰ ਐਪਾਂ ਨੂੰ ਖੋਲ੍ਹ ਸਕਦੀ ਹੈ ਅਤੇ ਨਿੱਜੀ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ। \n\nਜੇ ਤੁਸੀਂ ਕਿਸੇ ਵਿਅਕਤੀ ਨਾਲ ਆਪਣਾ ਡੀਵਾਈਸ ਸੁਰੱਖਿਅਤ ਢੰਗ ਨਾਲ ਸਾਂਝਾ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ, ਤਾਂ ਇਸ ਦੀ ਬਜਾਏ ਮਹਿਮਾਨ ਵਰਤੋਂਕਾਰ ਨੂੰ ਵਰਤ ਕੇ ਦੇਖੋ। \n\nਐਪ ਪਿਨਿੰਗ ਨੂੰ ਵਰਤਣ ਲਈ: 	\n1.	ਐਪ ਪਿਨਿੰਗ ਨੂੰ ਚਾਲੂ ਕਰੋ 	\n2.	ਰੂਪ-ਰੇਖਾ ਨੂੰ ਖੋਲ੍ਹੋ 	\n3.	ਸਕ੍ਰੀਨ ਦੇ ਸਿਖਰ \'ਤੇ ਐਪ ਪ੍ਰਤੀਕ \'ਤੇ ਟੈਪ ਕਰਕੇ ਪਿੰਨ \'ਤੇ ਟੈਪ ਕਰੋ"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"ਜਦੋਂ ਐਪ ਪਿੰਨ ਕੀਤੀ ਹੁੰਦੀ ਹੈ: \n\n• ਨਿੱਜੀ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਕੀਤੀ ਜਾ ਸਕਦੀ ਹੈ \n (ਜਿਵੇਂ ਕਿ ਸੰਪਰਕ ਅਤੇ ਈਮੇਲ ਸਮੱਗਰੀ) \n• ਪਿੰਨ ਕੀਤੀ ਐਪ ਹੋਰ ਐਪਾਂ ਨੂੰ ਖੋਲ੍ਹ ਸਕਦੀ ਹੈ \n\nਐਪ ਪਿਨਿੰਗ ਵਿਸ਼ੇਸ਼ਤਾ ਦੀ ਵਰਤੋਂ ਸਿਰਫ਼ ਆਪਣੇ ਭਰੋਸੇਯੋਗ ਲੋਕਾਂ ਨਾਲ ਹੀ ਕਰੋ।"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"ਅਨਪਿੰਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਅਣਲਾਕ ਪੈਟਰਨ ਵਾਸਤੇ ਪੁੱਛੋ"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"ਅਨਪਿੰਨ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਿੰਨ ਮੰਗੋ"</string>
@@ -3897,6 +3919,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡਾ ਪਿੰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਿੰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾ ਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਚਿਹਰੇ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾ ਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਬਾਇਓਮੈਟ੍ਰਿਕ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਿੰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾ ਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਮਦਦ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਿੰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਬਾਇਓਮੈਟ੍ਰਿਕ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾ ਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਮਦਦ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕਰਨ ਲਈ ਆਪਣੇ ਬਾਇਓਮੈਟ੍ਰਿਕ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾ ਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦਾ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦਾ।\n\nਇਹ ਗੁਆਚੇ ਜਾਂ ਚੋਰੀ ਹੋਏ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡਾਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਮਦਦ ਕਰਦਾ ਹੈ। ਕੀ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਉਣਾ ਹੈ?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ਹਾਂ"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ਨਹੀਂ"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ਪ੍ਰਤਿਬੰਧਿਤ"</string>
@@ -4072,7 +4097,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"ਇਸ ਵੱਲੋਂ USB ਨੂੰ ਕੰਟਰੋਲ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"ਕਨੈਕਟ ਕੀਤਾ ਡੀਵਾਈਸ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ਇਹ ਡੀਵਾਈਸ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"ਬਦਲਿਆ ਜਾ ਰਿਹਾ ਹੈ…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"ਕਨੈਕਟ ਕੀਤੇ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕਰਨਾ"</string>
@@ -4266,6 +4291,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"ਮੋਬਾਈਲ ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"ਐਪ ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"ਵਾਈ-ਫਾਈ ਡਾਟਾ ਵਰਤੋਂ"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"ਨਾਨ-ਕੈਰੀਅਰ ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ਈਥਰਨੈੱਟ ਡਾਟਾ ਵਰਤੋਂ"</string>
     <string name="wifi" msgid="2932584495223243842">"ਵਾਈ-ਫਾਈ"</string>
     <string name="ethernet" msgid="4665162609974492983">"ਈਥਰਨੈੱਟ"</string>
@@ -4284,6 +4310,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ਪ੍ਰਤਿਬੰਧ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"ਕੈਰੀਅਰ ਵੱਲੋਂ ਡਾਟੇ ਦਾ ਹਿਸਾਬ ਡੀਵਾਈਸ ਦੇ ਹਿਸਾਬ ਨਾਲੋਂ ਵੱਖਰਾ ਹੋ ਸਕਦਾ ਹੈ"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ਕੈਰੀਅਰ ਨੈੱਟਵਰਕਾਂ ਵੱਲੋਂ ਵਰਤਿਆ ਜਾਣ ਵਾਲਾ ਡਾਟਾ ਸ਼ਾਮਲ ਨਹੀਂ ਹੈ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ਵਰਤਿਆ"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ਡਾਟਾ ਚਿਤਾਵਨੀ ਸੈੱਟ ਕਰੋ"</string>
     <string name="data_warning" msgid="2925054658166062884">"ਡਾਟਾ ਚਿਤਾਵਨੀ"</string>
@@ -4319,7 +4346,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ਵੇਰਵੇ ਦੇਖੋ"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ਡਾਟਾ ਸੇਵਰ"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ਅਣ-ਪ੍ਰਤੀਬੰਧਿਤ ਡਾਟਾ ਤੱਕ ਪਹੁੰਚ"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ਪਿਛੋਕੜ  ਡਾਟਾ  ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ਬੈਕਗ੍ਰਾਊਂਡ ਡਾਟਾ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ਚਾਲੂ"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ਬੰਦ"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ਡਾਟਾ ਸੇਵਰ ਵਰਤੋ"</string>
@@ -4342,7 +4369,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"ਜੇਕਰ ਡੀਵਾਈਸ ਲਾਕ ਹੈ, ਤਾਂ ਸੂਚਨਾਵਾਂ ਵਿੱਚ ਜਵਾਬਾਂ ਜਾਂ ਹੋਰ ਲਿਖਤੀ ਸੁਨੇਹਿਆਂ ਨੂੰ ਟਾਈਪ ਕਰਨ ਤੋਂ ਰੋਕੋ"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸਪੈੱਲ-ਚੈਕਰ"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"ਸਪੈੱਲ ਚੈਕਰ ਚੁਣੋ"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ਸਪੈੱਲ-ਚੈਕਰ ਵਰਤੋ"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ਸਪੈੱਲ-ਚੈਕਰ ਵਰਤੋ"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ਚੁਣਿਆ ਨਹੀਂ ਗਿਆ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ਕੋਈ ਨਹੀਂ)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4459,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ਸਟੋਰੇਜ ਦੀ ਜਗ੍ਹਾ ਖਾਲੀ ਕਰਨ ਵਿੱਚ ਮਦਦ ਲਈ, ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਤੋਂ ਬੈਕਅੱਪ ਲਈਆਂ ਗਈਆਂ ਫ਼ੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਉਂਦਾ ਹੈ।"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ਫੋਟੋਆਂ ਅਤੇ ਵੀਡੀਓ ਹਟਾਓ"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ ਵਰਤੋ"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ਸਵੈਚਾਲਿਤ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"ਦਸਤੀ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ਹੁਣੇ ਜਗ੍ਹਾ ਖਾਲੀ ਕਰੋ"</string>
@@ -4470,6 +4497,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ਫ਼ੋਨ ਚੈੱਕ ਕਰਨ ਲਈ ਡਬਲ ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਟੈਬਲੈੱਟ \'ਤੇ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਡੀਵਾਈਸ \'ਤੇ ਦੋ ਵਾਰ ਟੈਪ ਕਰੋ"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"ਸੂਚਨਾਵਾਂ ਲਈ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦਿਖਾਉਣ ਲਈ ਸਕ੍ਰੀਨ ਦੇ ਹੇਠਲੇ ਕਿਨਾਰੇ \'ਤੇ ਸਵਾਈਪ ਕਰੋ"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ਇੱਕ ਹੱਥ ਮੋਡ"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ਇੱਕ ਹੱਥ ਮੋਡ ਵਰਤੋ"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ਐਪਾਂ ਵਿਚਾਲੇ ਅਦਲਾ-ਬਦਲੀ ਕਰਨ ਵੇਲੇ ਇੱਕ ਹੱਥ ਮੋਡ ਤੋਂ ਬਾਹਰ ਜਾਓ"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ਸਮਾਂ ਸਮਾਪਤ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 ਸਕਿੰਟ"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 ਸਕਿੰਟ"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 ਸਕਿੰਟ"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ਅੱਪੜਨਯੋਗਤਾ"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"ਸਮਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਡਬਲ ਟੈਪ ਕਰੋ।"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ਫ਼ੋਨ ਦੇਖਣ ਲਈ ਚੁੱਕੋ"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ ਟੈਬਲੈੱਟ ਨੂੰ ਚੁੱਕੋ"</string>
@@ -4482,6 +4519,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ਟੈਬਲੈੱਟ ਦੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"ਡੀਵਾਈਸ ਦੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"ਸਮਾਂ, ਸੂਚਨਾਵਾਂ ਅਤੇ ਹੋਰ ਜਾਣਕਾਰੀ ਦੇਖਣ ਲਈ ਆਪਣੀ ਸਕ੍ਰੀਨ \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ਸੰਕਟਕਾਲੀਨ SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"ਸੰਕਟਕਾਲੀਨ SOS ਵਰਤੋ"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਪ੍ਰਬੰਧਿਤ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"ਪਾਵਰ ਬਟਨ ਨੂੰ ਤੇਜ਼ੀ ਨਾਲ 5 ਜਾਂ ਜ਼ਿਆਦਾ ਵਾਰ ਦੱਬ ਕੇ ਹੇਠਾਂ ਦਿੱਤੀਆਂ ਕਾਰਵਾਈਆਂ ਸ਼ੁਰੂ ਕਰੋ"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"ਉਲਟੀ ਗਿਣਤੀ ਵਾਲਾ ਅਲਾਰਮ ਚਲਾਓ"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"ਮਦਦ ਲਈ ਸੂਚਿਤ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ, ਉੱਚੀ ਧੁਨੀ ਚਲਾਓ"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"ਮਦਦ ਲਈ ਕਾਲ ਕਰੋ"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"ਮਦਦ ਲਈ ਕਾਲ ਕਰਨ ਵਾਸਤੇ ਨੰਬਰ"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. ਬਦਲਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"ਜੇ ਤੁਸੀਂ ਗਈ-ਸੰਕਟਕਾਲੀਨ ਨੰਬਰ ਦਾਖਲ ਕੀਤਾ ਹੈ:\n • ਸੰਕਟਕਾਲੀਨ SOS ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਅਣਲਾਕ ਕੀਤਾ ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ\n • ਸ਼ਾਇਦ ਤੁਹਾਡੀ ਕਾਲ ਦਾ ਜਵਾਬ ਨਾ ਦਿੱਤਾ ਜਾ ਸਕੇ"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ਸੂਚਨਾਵਾਂ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ਫਿੰਗਰਪ੍ਰਿੰਟ ਨੂੰ ਸਵਾਈਪ ਕਰੋ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ਆਪਣੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇਖਣ ਲਈ, ਆਪਣੇ ਫ਼ੋਨ ਦੇ ਪਿਛਲੇ ਪਾਸੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਸੈਂਸਰ \'ਤੇ ਹੇਠਾਂ ਨੂੰ ਸਵਾਈਪ ਕਰੋ।"</string>
@@ -4607,6 +4654,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"ਵੱਧ-ਤੋਂ-ਵੱਧ ਦਿਖਣਯੋਗ ਡਾਟਾਸੈੱਟ"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਮੁੱਲਾਂ \'ਤੇ ਰੀਸੈੱਟ ਕਰੋ"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"ਆਟੋਫਿਲ ਵਿਕਾਸਕਾਰ ਵਿਕਲਪਾਂ ਨੂੰ ਰੀਸੈੱਟ ਕਰ ਦਿੱਤਾ ਹੈ"</string>
+    <string name="location_category" msgid="3496759112306219062">"ਟਿਕਾਣਾ"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"ਸਥਿਤੀ ਪੱਟੀ ਟਿਕਾਣਾ ਸੂਚਕ"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"ਨੈੱਟਵਰਕ ਅਤੇ ਕਨੈਕਟੀਵਿਟੀ ਸਮੇਤ ਸਾਰੇ ਟਿਕਾਣਿਆਂ ਲਈ ਦਿਖਾਓ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS ਮਾਪ ਨੂੰ ਜ਼ਬਰਦਰਸਤੀ ਲਾਗੂ ਕਰੋ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ਡਿਊਟੀ ਸਾਈਕਲਿੰਗ ਤੋਂ ਬਿਨਾਂ ਸਾਰੇ GNSS ਉਪਗ੍ਰਹਿ ਗਰੁੱਪਾਂ ਅਤੇ ਵਾਰਵਾਰਤਾਵਾਂ ਨੂੰ ਟਰੈਕ ਕਰੋ"</string>
     <string name="device_theme" msgid="5027604586494772471">"ਡੀਵਾਈਸ ਥੀਮ"</string>
     <string name="default_theme" msgid="4815428567082263639">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"ਨੈੱਟਵਰਕ ਦਾ ਨਾਮ"</string>
@@ -4623,8 +4675,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"ਧਿਆਨ ਕੇਂਦਰਿਤ ਰੱਖਣ ਲਈ ਸੂਚਨਾਵਾਂ ਰੋਕੋ"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ਵਿਸ਼ੇਸ਼ਤਾ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"ਇਸ ਵਿਸ਼ੇਸ਼ਤਾ ਨੂੰ ਬੰਦ ਕਰ ਦਿੱਤਾ ਗਿਆ ਹੈ ਕਿਉਂਕਿ ਇਹ ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਹੌਲੀ ਕਰ ਦਿੰਦੀ ਹੈ"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"GNSS ਮਾਪ ਨੂੰ ਜ਼ਬਰਦਰਸਤੀ ਲਾਗੂ ਕਰੋ"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ਡਿਊਟੀ ਸਾਈਕਲਿੰਗ ਤੋਂ ਬਿਨਾਂ ਸਾਰੇ GNSS ਉਪਗ੍ਰਹਿ ਗਰੁੱਪਾਂ ਅਤੇ ਵਾਰਵਾਰਤਾਵਾਂ ਨੂੰ ਟਰੈਕ ਕਰੋ"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"ਹਮੇਸ਼ਾਂ ਕ੍ਰੈਸ਼ ਵਿੰਡੋ ਦਿਖਾਓ"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"ਕਿਸੇ ਐਪ ਦੇ ਕ੍ਰੈਸ਼ ਹੋਣ \'ਤੇ ਹਰ ਵਾਰ ਵਿੰਡੋ ਦਿਖਾਓ"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE ਸਮਰਥਿਤ ਐਪ ਚੁਣੋ"</string>
@@ -4636,7 +4686,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"ਸਾਰੀਆਂ ਐਪਾਂ ਲਈ ਚਾਲੂ ਕਰੋ"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ਗ੍ਰਾਫ਼ਿਕ ਡਰਾਈਵਰ ਚੁਣੋ"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ਗੇਮ ਡਰਾਈਵਰ"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ਗੇਮ ਡਰਾਈਵਰ"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ਵਿਕਾਸਕਾਰ ਡਰਾਈਵਰ"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ਸਿਸਟਮ ਗ੍ਰਾਫ਼ਿਕ ਡਰਾਈਵਰ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4742,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"ਚਾਲੂ (ਮਿਊਟ)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ਬੰਦ"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"ਨੈੱਟਵਰਕ ਵੇਰਵੇ"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦਾ ਨਾਮ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਐਪਾਂ ਨੂੰ ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ। ਇਹ ਤੁਹਾਡੇ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਜਾਂ ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ ਸੈੱਟਅੱਪ ਕਰਨ \'ਤੇ ਹੋਰ ਲੋਕਾਂ ਵੱਲੋਂ ਵੀ ਦੇਖਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਦਾ ਨਾਮ ਤੁਹਾਡੇ ਫ਼ੋਨ \'ਤੇ ਐਪਾਂ ਨੂੰ ਦਿਖਾਈ ਦਿੰਦਾ ਹੈ। ਇਸਨੂੰ ਤੁਹਾਡੇ ਬਲੂਟੁੱਥ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰਨ, ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਜਾਂ ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ ਸੈੱਟਅੱਪ ਕਰਨ \'ਤੇ ਹੋਰ ਲੋਕਾਂ ਵੱਲੋਂ ਵੀ ਦੇਖਿਆ ਜਾ ਸਕਦਾ ਹੈ।"</string>
     <string name="devices_title" msgid="649715719278562515">"ਡੀਵਾਈਸਾਂ"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"ਸਾਰੀਆਂ ਸੈਟਿੰਗਾਂ"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"ਸੁਝਾਅ"</string>
@@ -4705,6 +4755,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ਨੈੱਟਵਰਕ ਨਹੀਂ ਮਿਲ ਸਕੇ। ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ਵਰਜਿਤ)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ਕੋਈ ਸਿਮ ਕਾਰਡ ਨਹੀਂ"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ਸਿਮ"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ਸਿਮ ਨਹੀਂ ਹੈ"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ਕਨੈਕਟ ਕਰਨ ਲਈ ਸਿਮ ਲੋੜੀਂਦਾ ਹੈ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ਕਨੈਕਟ ਕਰਨ ਲਈ <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ਸਿਮ ਲੋੜੀਂਦਾ ਹੈ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਤਰਜੀਹੀ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਸਿਰਫ਼ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ਤਰਜੀਹੀ ਨੈੱਟਵਰਕ ਮੋਡ: ਸਿਰਫ਼ WCDMA"</string>
@@ -4758,6 +4813,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ਮੋਬਾਈਲ ਡਾਟਾ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਡਾਟੇ ਤੱਕ ਪਹੁੰਚ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ਰੇਂਜ ਵਿੱਚ ਹੋਣ \'ਤੇ ਫ਼ੋਨ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਇਸ ਕੈਰੀਅਰ \'ਤੇ ਜਾਵੇਗਾ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ਕੋਈ ਸਿਮ ਕਾਰਡ ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ਕਾਲਾਂ ਦੀ ਤਰਜੀਹ"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ਦੀ ਤਰਜੀਹ"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ਹਰ ਵਾਰ ਪੁੱਛੋ"</string>
@@ -4818,6 +4874,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਹੋਣ \'ਤੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
     <string name="see_more" msgid="7499355691042812723">"ਹੋਰ ਦੇਖੋ"</string>
     <string name="see_less" msgid="2642392725363552793">"ਘੱਟ ਵੇਖੋ"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"ਕੀ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ਕੀ ਸਿਮ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ਹੈ?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"ਕੀ ਤੁਸੀਂ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"ਕੀ ਸਿਮ ਕਾਰਡ ਦੀ ਵਰਤੋਂ ਕਰਨੀ ਹੈ?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ਇੱਕੋ ਵੇਲੇ ਸਿਰਫ਼ ਇੱਕ ਸਿਮ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ਇੱਕੋ ਵੇਲੇ ਸਿਰਫ਼ ਇੱਕ ਡਾਊਨਲੋਡ ਕੀਤਾ ਸਿਮ ਕਿਰਿਆਸ਼ੀਲ ਹੋ ਸਕਦਾ ਹੈ।\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ਇੱਕੋ ਵੇਲੇ ਸਿਰਫ਼ ਇੱਕ ਸਿਮ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ।\n\nਸਵਿੱਚ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਹੋਵੇਗੀ।"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕਰੋ"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> \'ਤੇ ਸਵਿੱਚ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"ਕੈਰੀਅਰ ਨੂੰ ਸਵਿੱਚ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ਕਿਸੇ ਗੜਬੜ ਕਰਕੇ ਕੈਰੀਅਰ ਨੂੰ ਸਵਿੱਚ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"ਕੀ <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ਕੀ ਸਿਮ ਨੂੰ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"ਸਿਮ ਨੂੰ ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ਕੈਰੀਅਰ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ਕੋਈ ਗੜਬੜ ਹੋ ਗਈ ਅਤੇ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਨੂੰ ਬੰਦ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"ਕੀ 2 ਸਿਮ ਵਰਤਣੇ ਹਨ?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ਇਸ ਡੀਵਾਈਸ ਵਿੱਚ ਇੱਕੋ ਵੇਲੇ 2 ਸਿਮ ਕਿਰਿਆਸ਼ੀਲ ਹੋ ਸਕਦੇ ਹਨ। ਇੱਕੋ ਵੇਲੇ 1 ਸਿਮ ਵਰਤਣਾ ਜਾਰੀ ਰੱਖਣ ਲਈ \"ਨਹੀਂ ਧੰਨਵਾਦ\" \'ਤੇ ਟੈਪ ਕਰੋ।"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"ਕੀ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ਸ਼ੁਰੂਆਤ ਕਰਨ ਲਈ, ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ। ਫਿਰ ਤੁਸੀਂ ਕੋਈ ਹੋਰ ਸਿਮ ਸ਼ਾਮਲ ਕਰ ਸਕਦੇ ਹੋ।"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ਜਾਰੀ ਰੱਖੋ"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"ਸਵਿੱਚ ਕਰੋ"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"ਸਿਮ ਨੂੰ ਕਿਰਿਆਸ਼ੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ਸਿਮ ਹਟਾ ਕੇ ਦੁਬਾਰਾ ਪਾਓ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ਸਿਮ ਨੂੰ ਦੁਬਾਰਾ ਚਾਲੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ। ਜੇ ਸਮੱਸਿਆ ਜਾਰੀ ਰਹਿੰਦੀ ਹੈ, ਤਾਂ ਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰੋ।"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"ਨੈੱਟਵਰਕ ਕਿਰਿਆਸ਼ੀਲਤਾ"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ਕਿਰਿਆਸ਼ੀਲ ਹੈ"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ਸੈਟਿੰਗਾਂ ਨੂੰ ਅੱਪਡੇਟ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"ਸਿਮ ਕਾਰਡ"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"ਕੀ ਇਹ ਡਾਊਨਲੋਡ ਕੀਤਾ ਸਿਮ ਮਿਟਾਉਣਾ ਹੈ?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ਇਹ ਸਿਮ ਮਿਟਾਉਣ ਨਾਲ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ਸੇਵਾ ਇਸ ਡੀਵਾਈਸ ਤੋਂ ਹਟ ਜਾਂਦੀ ਹੈ।\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ਲਈ ਸੇਵਾ ਰੱਦ ਨਹੀਂ ਕੀਤੀ ਜਾਵੇਗੀ।"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"ਮਿਟਾਓ"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"ਸਿਮ ਮਿਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"ਸਿਮ ਮਿਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"ਕਿਸੇ ਗੜਬੜ ਕਰਕੇ ਇਹ ਸਿਮ ਮਿਟਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।\n\nਆਪਣੇ ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਸ਼ੁਰੂ ਕਰਕੇ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ।"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> ਐਪ ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਹੋਣ ਲਈ ਕਿਸੇ ਅਸਥਾਈ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨੂੰ ਵਰਤਣਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ਕੋਈ ਡੀਵਾਈਸ ਨਹੀਂ ਮਿਲੇ। ਪੱਕਾ ਕਰੋ ਕਿ ਡੀਵਾਈਸ ਚਾਲੂ ਹਨ ਅਤੇ ਕਨੈਕਟ ਹੋਣ ਲਈ ਉਪਲਬਧ ਹਨ।"</string>
@@ -4889,6 +4983,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਰਾਹੀਂ ਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਕਰਨ ਦੀ ਸੁਵਿਧਾ ਤੁਹਾਡੇ ਕੈਰੀਅਰ ਵਿੱਚ ਨਹੀਂ ਹੈ।\nਸੰਕਟਕਾਲੀਨ ਕਾਲ ਕਰਨ ਲਈ ਤੁਹਾਡਾ ਡੀਵਾਈਸ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਸੈਲਿਊਲਰ ਨੈੱਟਵਰਕ \'ਤੇ ਬਦਲ ਜਾਂਦਾ ਹੈ।\nਸੰਕਟਕਾਲੀਨ ਕਾਲਾਂ ਸਿਰਫ਼ ਸੈਲਿਊਲਰ ਕਵਰੇਜ ਵਾਲੇ ਖੇਤਰਾਂ ਵਿੱਚ ਸੰਭਵ ਹਨ।"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"ਕੁਆਲਿਟੀ ਬਿਹਤਰ ਬਣਾਉਣ ਵਾਸਤੇ ਕਾਲਾਂ ਲਈ ਵਾਈ-ਫਾਈ ਵਰਤੋ"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"ਕ੍ਰਾਸ ਸਿਮ ਕਾਲਿੰਗ"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"ਇਸ ਸਿਮ \'ਤੇ ਹੋਰ ਸਿਮ ਕਾਲਾਂ ਅਤੇ SMS ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ।"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"ਕ੍ਰਾਸ ਸਿਮ ਕਾਲਿੰਗ"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"ਆਉਣ ਵਾਲਾ MMS ਸੁਨੇਹਾ"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"ਮੋਬਾਈਲ ਡਾਟਾ ਬੰਦ ਹੋਣ \'ਤੇ <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> \'ਤੇ MMS ਸੁਨੇਹੇ ਭੇਜਣ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਦੇਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
@@ -4940,10 +5037,50 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"\'ਸੈਟਿੰਗਾਂ\' \'ਤੇ ਸਕ੍ਰੀਨ ਓਵਰਲੇ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ਉਹਨਾਂ ਐਪਾਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ ਜੋ \'ਸੈਟਿੰਗਾਂ\' ਸਕ੍ਰੀਨਾਂ ਨੂੰ ਓਵਰਲੇ ਕਰਨ ਲਈ ਦੂਜੀਆਂ ਐਪਾਂ ਦੇ ਉੱਪਰ ਪ੍ਰਦਰਸ਼ਿਤ ਹੋ ਸਕਦੀਆਂ ਹਨ"</string>
     <string name="media_controls_title" msgid="403271085636252597">"ਮੀਡੀਆ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"ਮੀਡੀਆ ਸੈਸ਼ਨ ਸਮਾਪਤ ਹੋਣ \'ਤੇ ਪਲੇਅਰ ਨੂੰ ਲੁਕਾਓ"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"ਪਲੇਅਰ ਤੁਹਾਨੂੰ ਵਿਸਤ੍ਰਿਤ ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਪੈਨਲ ਤੋਂ ਸੈਸ਼ਨ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਦਿੰਦਾ ਹੈ।"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ਤਤਕਾਲ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਮੀਡੀਆ ਪਲੇਅਰ"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"ਆਸਾਨੀ ਨਾਲ ਪਲੇਬੈਕ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਕਰਨ ਲਈ ਮੀਡੀਆ ਪਲੇਅਰ ਨੂੰ ਲੰਮੇ ਸਮੇਂ ਲਈ ਦਿਖਾਓ"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ਪਲੇਅਰ ਲੁਕਾਓ"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ਪਲੇਅਰ ਦਿਖਾਓ"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ਕੋਈ ਪਲੇਅਰ ਉਪਲਬਧ ਨਹੀਂ"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ਮਨਜ਼ੂਰਸ਼ੁਦਾ ਐਪਾਂ"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"ਮੀਡੀਆ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"ਬਲੂਟੁੱਥ ਚਾਲੂ ਹੋਵੇਗਾ"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ਚਾਲੂ"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"ਬੰਦ"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"ਇੰਟਰਨੈੱਟ"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"ਸਿਮ"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"ਹਵਾਈ-ਜਹਾਜ਼ ਸੁਰੱਖਿਅਤ ਮੋਡ ਨੈੱਟਵਰਕ"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ਹਵਾਈ-ਜਹਾਜ਼ ਸੁਰੱਖਿਅਤ ਮੋਡ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਲੱਭੋ ਅਤੇ ਉਹਨਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ, ਹਵਾਈ-ਜਹਾਜ਼ ਸੁਰੱਖਿਅਤ ਮੋਡ"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"ਕਾਲਾਂ ਅਤੇ SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"ਵਾਈ-ਫਾਈ ਵਰਗੇ ਨਾਨ-ਕੈਰੀਅਰ ਨੈੱਟਵਰਕਾਂ \'ਤੇ ਕਾਲਾਂ ਕਰੋ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰੋ"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"ਵਾਈ-ਫਾਈ ਕਾਲਿੰਗ ਤੁਹਾਨੂੰ ਨਾਨ-ਕੈਰੀਅਰ ਨੈੱਟਵਰਕਾਂ, ਜਿਵੇਂ ਕਿ ਕੁਝ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕਾਂ, \'ਤੇ ਕਾਲਾਂ ਕਰਨ ਅਤੇ ਪ੍ਰਾਪਤ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿੰਦੀ ਹੈ।"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"ਕਾਲਾਂ"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"ਤਰਜੀਹੀ"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"ਕਾਲਾਂ ਲਈ ਤਰਜੀਹ"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS ਲਈ ਤਰਜੀਹ"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ਉਪਲਬਧ ਨਹੀਂ"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"ਕੋਈ ਸਿਮ ਨਹੀਂ"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ਤਰਜੀਹਾਂ"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"ਜਨਤਕ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਕਨੈਕਟ ਕਰੋ"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ਨੈੱਟਵਰਕ ਕਨੈਕਸ਼ਨ, ਇੰਟਰਨੈੱਟ, ਵਾਇਰਲੈੱਸ, ਡਾਟਾ, ਵਾਈ-ਫਾਈ, ਸੈਲਿਊਲਰ, ਮੋਬਾਈਲ, ਸੈੱਲ ਕੈਰੀਅਰ, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ਹਵਾਈ-ਜਹਾਜ਼ ਸੁਰੱਖਿਅਤ ਨੈੱਟਵਰਕ ਦੇਖੋ"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ਹਵਾਈ-ਜਹਾਜ਼ ਮੋਡ ਬੰਦ ਕਰੋ"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ਬੈੱਡਟਾਈਮ ਮੋਡ ਚਾਲੂ ਹੋਣ ਕਰਕੇ ਉਪਲਬਧ ਨਹੀਂ ਹੈ"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"ਸੂਚਨਾ ਦੀ ਮਹੱਤਤਾ ਨੂੰ ਪੂਰੀ ਤਰ੍ਹਾਂ ਰੀਸੈੱਟ ਕਰੋ।"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"ਐਪਾਂ"</string>
+    <!-- no translation found for bluetooth_message_access_notification_content (2986108412562309009) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_title (9009836130395061579) -->
+    <skip />
+    <!-- no translation found for bluetooth_message_access_dialog_content (6004506637437582983) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_notification_content (4280361621526852063) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_title (7624607995928968721) -->
+    <skip />
+    <!-- no translation found for bluetooth_phonebook_access_dialog_content (2235876209172857819) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index c2c4ed0..9f14c8f 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Średni"</item>
     <item msgid="6740026006576843477">"Długi"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Krótko"</item>
+    <item msgid="7397961711906421599">"Średnio"</item>
+    <item msgid="4079132024502041928">"Długo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Domyślna"</item>
     <item msgid="4234707448428002595">"Bezszeryfowa"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalny"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Tylko TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalne"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index a1dc07f..e63bb6d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -258,8 +258,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Data i godzina"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Ustaw datę i godzinę"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Ustaw datę, godzinę, strefę czasową i formaty."</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Użyj czasu podanego przez sieć"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Użyj strefy czasowej podanej przez sieć"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Ustaw godzinę automatycznie"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Ustaw strefę czasową automatycznie"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Użyj ustawień domyślnych dla regionu"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Format 24-godzinny"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Format 24-godzinny"</string>
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Pokaż informacje o profilu na ekranie blokady"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Konta"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokalizacja"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Włącz lokalizację"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Użyj lokalizacji"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Wyłączono"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="few">Włączono – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacje mają dostęp do lokalizacji</item>
@@ -326,6 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Blokada ekranu, rozpoznawanie twarzy"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Blokada ekranu, odcisk palca"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Blokada ekranu"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Bezpieczne odblokowywanie telefonu skanem twarzy i odciskiem palca"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Możesz też logować się do aplikacji i potwierdzać płatności"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Skonfiguruj metodę odblokowywania:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Rozpoznawanie twarzy"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Ułatw sobie odblokowywanie telefonu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Odcisk palca"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Szybko odblokowuj telefon w kieszeni"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Pomiń"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Dalej"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Dodano twarz"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Skonfiguruj rozpoznawanie twarzy"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Rozpoznawanie twarzy"</string>
@@ -335,6 +344,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Użyj własnej twarzy do uwierzytelniania"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Rozpocznij"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Jeśli rozpoznawanie twarzy w ułatwieniach dostępu jest wyłączone, niektóre kroki konfiguracji mogą nie działać prawidłowo w przypadku TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Wstecz"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Kontynuuj"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Użyj konfiguracji ułatwień dostępu"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -379,8 +391,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Zawsze wymagaj potwierdzenia, gdy używasz rozpoznawania twarzy w aplikacjach"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Usuń dane twarzy"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Skonfiguruj rozpoznawanie twarzy"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Rozpoznawanie twarzy umożliwia odblokowywanie urządzenia, logowanie się w aplikacjach i zatwierdzanie płatności.\n\nPamiętaj:\nPatrząc na telefon, możesz go niechcący odblokować.\n\nInna osoba może odblokować Twój telefon, zbliżając go do Twojej twarzy.\n\nIstnieje możliwość, że Twój telefon odblokuje ktoś bardzo podobny do Ciebie (np. rodzeństwo)."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Rozpoznawanie twarzy umożliwia odblokowywanie urządzenia, logowanie się do aplikacji i zatwierdzanie płatności.\n\nPamiętaj:\nPatrząc na telefon, możesz go mimowolnie odblokować.\n\nInna osoba może odblokować Twój telefon, zbliżając go do Twojej twarzy – nawet wtedy, gdy masz zamknięte oczy.\n\nIstnieje możliwość, że Twój telefon odblokuje ktoś bardzo podobny do Ciebie (np. rodzeństwo)."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Rozpoznawanie twarzy pozwala odblokowywać urządzenie, logować się w aplikacjach i potwierdzać płatności."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Pamiętaj:\nPatrząc na telefon, możesz go przypadkowo odblokować.\n\nInna osoba może odblokować Twój telefon, zbliżając go do Twojej twarzy.\n\nIstnieje możliwość, że Twój telefon odblokuje ktoś bardzo podobny do Ciebie (np. rodzeństwo)."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Pamiętaj:\nPatrząc na telefon, możesz go przypadkowo odblokować.\n\nInna osoba może odblokować Twój telefon, zbliżając go do Twojej twarzy, nawet jeśli będziesz mieć zamknięte oczy.\n\nIstnieje możliwość, że Twój telefon odblokuje ktoś bardzo podobny do Ciebie (np. rodzeństwo)."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Usunąć dane twarzy?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Dane twarzy używane przez rozpoznawanie twarzy zostaną trwale i bezpiecznie usunięte. Po usunięciu danych do odblokowywania telefonu, logowania się w aplikacjach i potwierdzania płatności będziesz potrzebować kodu PIN, wzoru lub hasła."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Rozpoznawanie twarzy odblokuje telefon"</string>
@@ -402,6 +415,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Odblokowuj telefon i zatwierdzaj zakupy odciskiem palca.\n\nUwaga: nie możesz odblokowywać tego urządzenia odciskiem palca. Więcej informacji uzyskasz od administratora swojej organizacji."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Odblokowuj telefon i zatwierdzaj zakupy odciskiem palca.\n\nUwaga: odcisk palca może być mniej bezpieczny niż skomplikowany wzór lub złożony kod PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Anuluj"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nie, dziękuję"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Dalej"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Pomiń"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Dalej"</string>
@@ -439,6 +453,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Jeśli zabezpieczysz tablet blokadą ekranu i go zgubisz lub utracisz, nikt nie będzie mógł go użyć. Blokada ekranu jest również konieczna, by skonfigurować rozpoznawanie twarzy. Aby wrócić, kliknij Anuluj."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Jeśli zabezpieczysz urządzenie blokadą ekranu i je zgubisz lub utracisz, nikt nie będzie mógł go użyć. Blokada ekranu jest również konieczna, by skonfigurować rozpoznawanie twarzy. Aby wrócić, kliknij Anuluj."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Jeśli zabezpieczysz telefon blokadą ekranu i go zgubisz lub utracisz, nikt nie będzie mógł go użyć. Blokada ekranu jest również konieczna, by skonfigurować rozpoznawanie twarzy. Aby wrócić, kliknij Anuluj."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Jeśli zabezpieczysz tablet blokadą ekranu i go zgubisz lub utracisz, nikt nie będzie mógł go użyć. Aby używać systemu biometrycznego, musisz również skonfigurować opcję blokady ekranu. Aby wrócić, kliknij Anuluj."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Jeśli zabezpieczysz urządzenie blokadą ekranu i je zgubisz lub utracisz, nikt nie będzie mógł go użyć. Aby używać systemu biometrycznego, musisz również skonfigurować opcję blokady ekranu. Aby wrócić, kliknij Anuluj."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Jeśli zabezpieczysz telefon blokadą ekranu i go zgubisz lub utracisz, nikt nie będzie mógł go użyć. Aby używać systemu biometrycznego, musisz również skonfigurować opcję blokady ekranu. Aby wrócić, kliknij Anuluj."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Pominąć konfigurację kodu PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pominąć konfigurację hasła?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Pominąć konfigurację wzoru?"</string>
@@ -511,8 +528,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego tabletu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego urządzenia bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Włącz funkcje ochrony urządzenia, by zablokować innym możliwość używania tego telefonu bez Twojej zgody. Wybierz rodzaj blokady ekranu."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Wybierz dodatkową metodę blokowania ekranu"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Wybierz dodatkową metodę blokowania ekranu"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Wybierz dodatkową metodę blokowania ekranu"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opcje blokady ekranu"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opcje blokady ekranu"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Blokada ekranu"</string>
@@ -544,6 +560,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Rozpoznawanie twarzy + hasło"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Kontynuuj bez rozpoznawania twarzy"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Możesz odblokować telefon za pomocą skanu twarzy. Ze względów bezpieczeństwa ta opcja wymaga dodatkowej blokady ekranu."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria i wzór"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria i kod PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria i hasło"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Kontynuuj bez biometrii"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Możesz odblokować telefon, korzystając z systemu biometrycznego. Ze względów bezpieczeństwa ta opcja wymaga dodatkowej blokady ekranu."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Wyłączone przez administratora lub ze względu na zasady szyfrowania albo magazyn danych logowania"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Brak"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Przesuń palcem"</string>
@@ -635,7 +656,6 @@
       <item quantity="one">Musi mieć mniej niż <xliff:g id="NUMBER_0">%d</xliff:g> cyfrę</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administrator urządzenia nie zezwala na ustawianie niedawno używanego kodu PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Popularne kody PIN zostały zablokowane przez administratora. Spróbuj użyć innego kodu PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Nie może zawierać nieprawidłowego znaku"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Musi zawierać co najmniej jedną literę"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Musi zawierać co najmniej jedną cyfrę"</string>
@@ -683,7 +703,6 @@
       <item quantity="one">Musi zawierać co najmniej 1 znak niebędący cyfrą</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administrator urządzenia nie zezwala na ustawianie niedawno używanego hasła"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Popularne hasła zostały zablokowane przez administratora. Spróbuj użyć innego hasła."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ciąg cyfr rosnących, malejących lub powtarzających się jest niedozwolony"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potwierdź"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Anuluj"</string>
@@ -829,7 +848,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Włącz Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Użyj Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Użyj Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Ustawienia Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Konfiguruj punkty dostępowe sieci bezprzewodowej i zarządzaj nimi"</string>
@@ -937,7 +956,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Wyśrodkuj kod QR poniżej, by połączyć się z siecią „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Zeskanuj kod QR i połącz się z siecią Wi-Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Udostępnij Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Zeskanuj ten kod QR, by połączyć się z siecią „<xliff:g id="SSID">%1$s</xliff:g>” i skorzystać z udostępnionego hasła"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Zeskanuj ten kod QR przy użyciu innego urządzenia, by połączyć się z siecią „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Zeskanuj ten kod QR, by połączyć się z siecią „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Spróbuj ponownie. Jeśli problem się powtórzy, skontaktuj się z producentem urządzenia"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Coś poszło nie tak"</string>
@@ -963,8 +982,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Hasło do Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hasło do hotspota: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Łącz automatycznie"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Pozwól telefonowi automatycznie łączyć się w pobliżu tej sieci"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Pozwól tabletowi automatycznie łączyć się w pobliżu tej sieci"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Zezwalaj na połączenie z tą siecią, gdy będziesz w jej zasięgu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Dodaj urządzenie"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Dodaj urządzenie do tej sieci, używając kodu QR"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Nieprawidłowy format kodu QR"</string>
@@ -976,7 +994,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Użyj certyfikatów systemowych"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Nie podawaj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Nie sprawdzaj poprawności"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nie określono certyfikatu. Twoje połączenie nie będzie prywatne."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Nazwa sieci jest zbyt długa."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Musisz określić domenę."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Wymagany certyfikat."</string>
@@ -1003,6 +1020,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Połącz"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi włączone"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Połączono z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Łączę z: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Łączę…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Nie można nawiązać połączenia z siecią"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Poza zasięgiem sieci"</string>
@@ -1036,6 +1054,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adres MAC urządzenia"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomizowany adres MAC"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Randomizowany adres MAC (ostatni używany)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adres IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Szczegóły sieci"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podsieci"</string>
@@ -1043,8 +1062,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Adresy IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Zapisane sieci"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Subskrypcje"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Inne sieci"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Ustawienia adresu IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Zaawansowane ustawienia Wi‑Fi są niedostępne dla tego użytkownika"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Zapisz"</string>
@@ -1053,8 +1071,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Wpisz prawidłowy adres bramy."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Wpisz prawidłowy adres DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Wpisz długość przedrostka sieci z zakresu 0-32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (chyba że zastąpiony przez prywatny DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (chyba że zastąpiony przez prywatny DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Brama"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Długość przedrostka sieci"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1080,7 +1098,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacja udostępnia treści. Aby udostępnić połączenie z internetem, wyłącz i ponownie włącz hostpot"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nie ustawiono hasła"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nazwa hotspota"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Włączam: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Włączam <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Inne urządzenia mogą łączyć się z: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hasło do hotspota"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Pasmo punktu dostępu"</string>
@@ -1230,7 +1248,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Płynne wyświetlanie"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"W przypadku niektórych treści automatycznie podwyższa częstotliwość odświeżania z 60 na 90 Hz. Zwiększa zużycie baterii."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Płynne wyświetlanie"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Wymuś częstotliwość odświeżania na poziomie 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Najszybsza częstotliwość odświeżania zapewnia szybszą reakcję na dotyk i wyższą jakość animacji. Zwiększa zużycie baterii."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Aktywność ekranu"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Włączone / Ekran nie wyłączy się, jeśli na niego patrzysz"</string>
@@ -1321,6 +1339,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Gdy ekran jest ciemny, włącza się po otrzymaniu nowego powiadomienia"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Zawsze pokazuj czas i dane"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Zwiększone wykorzystanie baterii"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Włącz pogrubienie tekstu"</string>
     <string name="title_font_size" msgid="570613010306330622">"Rozmiar czcionki"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Powiększ lub pomniejsz tekst"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Ustawienia blokady karty SIM"</string>
@@ -1371,7 +1390,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Wersja Androida"</string>
     <string name="security_patch" msgid="4071756145347865382">"Aktualizacja zabezpieczeń Androida"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model i sprzęt"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Wersja sprzętu"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Identyfikator sprzętu"</string>
@@ -1620,7 +1638,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Usuń APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nowy APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Zapisz"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Odrzuć"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Anuluj"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Nazwa nie może być pusta."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Nazwa APN nie może być pusta."</string>
@@ -1635,8 +1653,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Aplikacje można zresetować"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Resetuj Wi-Fi, transmisję i Bluetootha"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Spowoduje to usunięcie wszystkich ustawień sieciowych, w tym:\n\n"<li>"Wi‑Fi"</li>\n<li>"mobilnej transmisji danych"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Wykasuj"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Usuń pobrane karty SIM"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Aby pobrać zastępczą kartę SIM, skontaktuj się z operatorem. Nie anuluje to Twoich abonamentów."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Nie spowoduje to anulowania Twoich abonamentów. Aby pobrać zastępcze karty SIM, skontaktuj się z operatorem."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Zresetuj ustawienia"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Zresetować wszystkie ustawienia sieci? Nie można cofnąć tej czynności."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Zresetować wszystkie ustawienia sieci i usunąć dane z pobranych kart SIM? Nie można cofnąć tej czynności."</string>
@@ -1646,31 +1665,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Ustawienia sieciowe zostały zresetowane"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nie można usunąć danych z kart SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Z powodu błędu nie można usunąć pobranych kart SIM.\n\nUruchom urządzenie ponownie i spróbuj jeszcze raz."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Zostaną usunięte wszystkie dane z "<b>"pamięci wewnętrznej"</b>" tabletu, w tym:\n\n"<li>"dane konta Google,"</li>\n<li>"dane i ustawienia systemu oraz aplikacji,"</li>\n<li>"pobrane aplikacje."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Zostaną usunięte wszystkie dane z "<b>"pamięci wewnętrznej"</b>" telefonu, w tym:\n\n"<li>"dane konta Google"</li>\n<li>"dane i ustawienia systemu oraz aplikacji"</li>\n<li>"pobrane aplikacje"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"W tej chwili używasz kont:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Z tego urządzenia korzystają inni użytkownicy.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"muzyka"</li>\n<li>"zdjęcia"</li>\n<li>"inne dane użytkownika"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"karty eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Nie spowoduje to anulowania Twojego abonamentu w sieci komórkowej."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"kartę SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Wykasuj wszystkie dane (przywróć dane fabryczne)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Zostaną usunięte wszystkie dane z "<b>"pamięci wewnętrznej"</b>" tabletu, w tym:\n\n"<li>"dane konta Google,"</li>\n<li>"dane i ustawienia systemu oraz aplikacji,"</li>\n<li>"pobrane aplikacje."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Zostaną usunięte wszystkie dane z "<b>"pamięci wewnętrznej"</b>" telefonu, w tym:\n\n"<li>"dane konta Google"</li>\n<li>"dane i ustawienia systemu oraz aplikacji"</li>\n<li>"pobrane aplikacje"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"W tej chwili używasz kont:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Z tego urządzenia korzystają inni użytkownicy.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"muzyka"</li>\n<li>"zdjęcia"</li>\n<li>"inne dane użytkownika"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"karty eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Nie spowoduje to anulowania Twojego abonamentu w sieci komórkowej."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"nośnik USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Aby usunąć muzykę, zdjęcia i inne dane użytkownika, należy wymazać "<b>"kartę SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Wyczyść nośnik USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Wymaż kartę SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Usuń z wewnętrznego nośnika USB wszystkie dane, takie jak pliki muzyczne i zdjęcia"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Usuń z karty SD wszystkie dane, takie jak pliki muzyczne i zdjęcia"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Usuń wszystkie dane"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Usuń wszystkie dane"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Wszystkie Twoje dane osobowe oraz pobrane aplikacje zostaną usunięte. Nie można cofnąć tej czynności."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Wszystkie Twoje dane osobowe, w tym pobrane aplikacje i karty SIM, zostaną usunięte. Nie można cofnąć tej czynności."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Wymaż wszystko"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nie wykonano resetowania, ponieważ usługa czyszczenia systemu jest niedostępna."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Usunąć wszystkie dane?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Przywracanie ustawień fabrycznych nie jest dostępne dla tego użytkownika"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Wymazuję"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Zaczekaj..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Usuń wszystkie dane"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Usuń wszystkie dane"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Wszystkie Twoje dane osobowe oraz pobrane aplikacje zostaną usunięte. Nie można cofnąć tej czynności."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Wszystkie Twoje dane osobowe, w tym pobrane aplikacje i karty SIM, zostaną usunięte. Nie można cofnąć tej czynności."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Usunąć wszystkie dane?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Przywracanie ustawień fabrycznych nie jest dostępne dla tego użytkownika"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Kasuję"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Zaczekaj…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Ustawienia połączeń"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Poczta głosowa, przekierowanie połączeń, poł. oczekujące, ID rozmówcy"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering przez USB"</string>
@@ -1718,7 +1735,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Nie można powiązać więcej niż <xliff:g id="MAXCONNECTION">%1$d</xliff:g> urządzeń."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Powiązanie z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie anulowane."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet - tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Udostępniaj połączenie telefonu z internetem przez Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Udostępniaj połączenie telefonu z internetem przez Ethernet USB"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Funkcje hotspotu i tetheringu pozwalają zapewnić połączenie z internetem innym urządzeniom z wykorzystaniem komórkowego połączenia do transmisji danych. Aplikacje mogą też utworzyć hotspot, by udostępniać treści urządzeniom w pobliżu."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Funkcje hotspotu i tetheringu pozwalają zapewnić połączenie z internetem innym urządzeniom za pomocą Wi-Fi lub komórkowego połączenia transmisji danych. Aplikacje mogą też utworzyć hotspot, by udostępniać treści urządzeniom w pobliżu."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomoc"</string>
@@ -1762,6 +1779,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skanowanie Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Zezwól na wyszukiwanie urządzeń w pobliżu przez aplikacje i usługi w dowolnym momencie, nawet gdy Bluetooth jest wyłączony. Może to np. pomóc usprawnić działanie funkcji i usług opartych na lokalizacji."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Usługi lokalizacyjne do pracy"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Wykrywanie strefy czasowej lokalizacji"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Wykrywanie strefy czasowej lokalizacji"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Zezwala na używanie lokalizacji urządzenia do wykrywania bieżącej strefy czasowej. Inne ustawienia lokalizacji, takie jak skanowanie Wi‑Fi, mogą wpływać na dokładność wykrywania strefy czasowej."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Włączono"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Wyłączono"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatyczne wykrywanie strefy czasowej jest wyłączone"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Wykrywanie strefy czasowej lokalizacji jest wyłączone"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Wykrywanie strefy czasowej lokalizacji nie jest obsługiwane"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Wprowadzanie zmian dotyczących wykrywania strefy czasowej lokalizacji nie jest dozwolone"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Przez Wi-Fi i sieć komórkową"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Zezwalaj aplikacjom na używanie usługi lokalizacji Google do szybszego określania Twojego położenia. Anonimowe dane o lokalizacji będą zbierane i przesyłane do Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Lokalizacja określona na podstawie Wi-Fi"</string>
@@ -1825,6 +1851,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Aby używać rozpoznawania twarzy, ustaw hasło"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Aby używać rozpoznawania twarzy, ustaw wzór"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Aby używać rozpoznawania twarzy, ustaw kod PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Aby korzystać z biometrii, ustaw hasło"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Aby korzystać z biometrii, ustaw wzór"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Aby korzystać z biometrii, ustaw kod PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Nie pamiętasz hasła?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Nie pamiętasz wzoru?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Nie pamiętasz kodu PIN?"</string>
@@ -2165,13 +2194,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Ustawienia napisów"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Powiększenie"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Obszar powiększenia"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Włączanie powiększenia"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Wybierz obszar ekranu, który chcesz powiększyć"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Pełny ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Część ekranu"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Pełny ekran i część ekranu"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Powiększ cały ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Powiększ część ekranu"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Zmienić na przycisk ułatwień dostępu?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Trzykrotne klikanie, by powiększyć część ekranu, opóźnia pisanie i inne działania.\n\nCzy chcesz używać przycisku ułatwień dostępu do powiększania?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Zmień na przycisk ułatwień dostępu"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Pozostaw trzykrotnie klikanie, by powiększyć"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Ustawienia powiększenia"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Powiększ 3-krotnym kliknięciem"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Powiększanie skrótem"</string>
@@ -2225,11 +2257,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Przycisk zasilania rozłącza"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Duży wskaźnik myszy"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Usuń animacje"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Dźwięk mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Połącz kanały podczas odtwarzania dźwięku"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balans dźwięku"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Lewa"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Prawa"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Dźwięk mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Połącz kanały podczas odtwarzania dźwięku"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balans dźwięku"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Lewy"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Prawy"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Domyślny"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekund"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekund"</string>
@@ -2259,11 +2291,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Wibracja przy powiadomieniu"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Wibracja przy dzwonku"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Reakcja na dotyk"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Używanie aplikacji <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otwórz aplikację <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Użyj korekcji kolorów"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Pokaż napisy"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Tylko w obsługiwanych aplikacjach"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Użyj usługi <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otwórz <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Użyj korekcji kolorów"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Pokaż napisy"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Tylko w obsługiwanych aplikacjach"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Rozmiar i styl napisów"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> rozmiar tekstu"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Więcej opcji"</string>
@@ -2295,6 +2327,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Tryb szarości"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Czerwony-zielony"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Czerwony-zielony"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Niebieski-żółty"</string>
@@ -2436,7 +2469,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ograniczenie działania w tle"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Pozwól aplikacji działać w tle"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikacja nie może działać w tle"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Nie można ograniczyć działania w tle"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Nie można ograniczyć działania w tle"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ograniczyć aktywność w tle?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Jeśli ograniczysz aktywność aplikacji w tle, może ona działać nieprawidłowo"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Ta aplikacja nie jest skonfigurowana do optymalnego wykorzystywania baterii, więc nie możesz wprowadzić dla niej ograniczeń.\n\nAby wprowadzić ograniczenia dla aplikacji, najpierw włącz optymalizację baterii."</string>
@@ -2485,6 +2518,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet używany intensywniej niż zwykle"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Urządzenie używane intensywniej niż zwykle"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Bateria może wyczerpać się szybciej niż zwykle"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optymalizuję, by utrzymać baterię w dobrym stanie"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Bateria tymczasowo ograniczona. Kliknij, by dowiedzieć się więcej."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefon był używany intensywniej niż zwykle. Bateria może rozładować się szybciej.\n\nAplikacje najbardziej wyczerpujące baterię:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablet był używany intensywniej niż zwykle. Bateria może rozładować się szybciej.\n\nAplikacje najbardziej wyczerpujące baterię:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Urządzenie było używane intensywniej niż zwykle. Bateria może rozładować się szybciej.\n\nAplikacje najbardziej wyczerpujące baterię:"</string>
@@ -2554,6 +2589,8 @@
       <item quantity="one">Dla %1$d aplikacji wprowadzono ograniczenia</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small></string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problem z odczytaniem pomiaru użycia baterii"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problem z odczytaniem pomiaru użycia baterii. "<annotation id="url">"Kliknij, by uzyskać więcej informacji"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Zatrzymać aplikację?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Twój telefon nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nie pozwala na jego uśpienie.\n\nAby spróbować rozwiązać ten problem, możesz zatrzymać aplikację.\n\nJeśli to nie pomoże, wydłużenie czasu działania na baterii może wymagać odinstalowania aplikacji."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Twój tablet nie może normalnie zarządzać baterią, bo aplikacja <xliff:g id="APP">%1$s</xliff:g> nie pozwala na jego uśpienie.\n\nAby spróbować rozwiązać ten problem, możesz zatrzymać aplikację.\n\nJeśli to nie pomoże, wydłużenie czasu działania na baterii może wymagać odinstalowania aplikacji."</string>
@@ -2667,9 +2704,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ustaw harmonogram"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Wydłużanie czasu pracy na baterii"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Wyłącz po naładowaniu"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania telefonu wyniesie <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania tabletu wyniesie <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania urządzenia wyniesie <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania telefonu przekroczy <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania tabletu przekroczy <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Oszczędzanie baterii wyłączy się, gdy poziom naładowania urządzenia przekroczy <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Włącz"</string>
@@ -2734,6 +2771,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Resetuj"</string>
     <string name="tts_play" msgid="2945513377250757221">"Odtwórz"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Łączność adaptacyjna"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Wydłuża czas pracy na baterii i poprawia wydajność urządzenia dzięki automatycznemu zarządzaniu połączeniami sieciowymi"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Magazyn danych logowania"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Zainstaluj certyfikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Zainstaluj certyfikaty z nośnika"</string>
@@ -2745,9 +2784,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Dane logowania użytkownika"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Wyświetl i zmień zapisane dane logowania"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Zaawansowane"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Typ pamięci"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Wspomagana sprzętowo"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Tylko programowa"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Ten użytkownik nie ma dostępu do poświadczeń"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Zainstalowane dla VPN i aplikacji"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Zainstalowane dla Wi-Fi"</string>
@@ -2763,6 +2799,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Nie instaluj"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Zainstaluj mimo to"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Nie zainstalowano certyfikatu"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Zezwolić aplikacji <xliff:g id="APP_NAME">%s</xliff:g> na instalowanie certyfikatów na tym urządzeniu?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Te certyfikaty identyfikują Cię w aplikacjach i pod adresami URL podanymi poniżej"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Nie zezwalaj"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Zezwól"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Pokaż więcej"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Aplikacja do zarządzania certyfikatami"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Brak"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certyfikaty zainstalowane przez tę aplikację identyfikują Cię w aplikacjach i pod adresami URL podanymi poniżej"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Usuń"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Sygnał wybierania numeru alarmowego"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Skonfiguruj sposób działania w przypadku połączenia alarmowego"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Kopia zapasowa"</string>
@@ -3096,7 +3141,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nieskonfigurowany – profil służbowy"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Ty (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudonim"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Możesz dodać maksymalnie <xliff:g id="USER_COUNT">%1$d</xliff:g> użytkowników"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Użytkownikami może zarządzać tylko właściciel tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Użytkownikami może zarządzać tylko właściciel telefonu."</string>
@@ -3146,7 +3190,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Płacenie na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Skonfiguruj aplikację płatniczą, a później przyłóż tylną część telefonu do terminala z symbolem płatności zbliżeniowej."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Więcej..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Więcej…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Ustaw domyślną aplikację do obsługi płatności"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Zmień domyślną aplikację do obsługi płatności"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na terminalu zbliżeniowym płać przy użyciu: <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3216,9 +3260,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Wróć"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Dalej"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Zakończ"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Zrób zdjęcie"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Wybierz obraz"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Wybierz zdjęcie"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Karty SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Karty SIM"</string>
@@ -3230,7 +3271,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Zawsze używaj do połączeń"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Wybierz kartę SIM do transmisji danych"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Wybierz kartę SIM do SMS-ów"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Przełączanie karty SIM do transmisji danych. Może to potrwać do minuty..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Przełączanie karty SIM do transmisji danych. Może to potrwać do minuty…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Zadzwoń, używając karty:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Wybierz kartę SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Karta SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3416,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutyna, harmonogram, oszczędzanie baterii, oszczędzanie energii, bateria, automatycznie, procent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, połączenia zaawansowane, połączenia 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dodaj język, dodawanie języka"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"rozmiar tekstu"</string>
     <string name="default_sound" msgid="6604374495015245195">"Dźwięk domyślny"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Głośność dzwonka i powiadomień na poziomie <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Głośność, wibracje, Nie przeszkadzać"</string>
@@ -3414,13 +3456,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Włącz dźwięki"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Napisy na żywo"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatycznie wyświetlaj napisy do multimediów"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Brak"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="few">Ustawiono <xliff:g id="ON_COUNT">%d</xliff:g> harmonogramy</item>
-      <item quantity="many">Ustawiono <xliff:g id="ON_COUNT">%d</xliff:g> harmonogramów</item>
-      <item quantity="other">Ustawiono <xliff:g id="ON_COUNT">%d</xliff:g> harmonogramu</item>
-      <item quantity="one">Ustawiono 1 harmonogram</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Brak}=1{Ustawiono 1 harmonogram}few{Ustawiono # harmonogramy}many{Ustawiono # harmonogramów}other{Ustawiono # harmonogramu}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Nie przeszkadzać"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Otrzymuj powiadomienia tylko od ważnych osób i z kluczowych aplikacji"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ograniczanie powiadomień"</string>
@@ -3488,24 +3524,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Tylko priorytet"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Wł. / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Wyłączono / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Wyłączone"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Wł."</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Zawsze pytaj"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dopóki nie wyłączysz"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> godziny</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> godzin</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> godziny</item>
-      <item quantity="one">1 godzina</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> harmonogramy mogą włączać się automatycznie</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> harmonogramów może włączać się automatycznie</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> harmonogramu może włączać się automatycznie</item>
-      <item quantity="one">1 harmonogram może włączać się automatycznie</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 godzina}few{# godziny}many{# godzin}other{# godziny}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuta}few{# minuty}many{# minut}other{# minuty}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Wyłączono}=1{Wyłączono / 1 harmonogram może włączać się automatycznie}few{Wyłączono / # harmonogramy mogą włączać się automatycznie}many{Wyłączono / # harmonogramów może włączać się automatycznie}other{Wyłączono / # harmonogramu może włączać się automatycznie}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ignorowanie trybu Nie przeszkadzać"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Osoby"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacje"</string>
@@ -3551,6 +3575,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automatycznie kategoryzuj powiadomienia o niższym priorytecie jako subtelne"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Adaptacyjne porządkowanie powiadomień"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automatycznie porządkuj powiadomienia według trafności"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Opinia na temat powiadomień adaptacyjnych"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Pokaż zmiany w ustawieniach powiadomień oraz wyświetl opcję przesyłania opinii do systemu"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Resetuj ważność powiadomień"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Zresetuj zmienione przez użytkownika ustawienia ważności i zezwól na ustalenie priorytetów przez asystenta powiadomień"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Sugerowane działania i odpowiedzi"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automatycznie pokazuj sugerowane działania i odpowiedzi"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Pokaż ostatnie i odłożone powiadomienia"</string>
@@ -3650,8 +3678,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Rozmowy priorytetowe"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Wyświetlają się u góry sekcji rozmów jako pływające dymki"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Wyświetlają się u góry sekcji rozmów"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Inne rozmowy"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Rozmowy inne niż priorytetowe"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Rozmowy z Twoimi zmianami"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Ostatnie rozmowy"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Wyczyść ostatnie"</string>
+    <string name="clear" msgid="5092178335409471100">"Wyczyść"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Wyświetlaj rozmowy priorytetowe w dymkach"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Rozmowy priorytetowe są wyświetlane u góry obszaru powiadomień. Możesz też skonfigurować je tak, by wyświetlały się jako dymki i przerywały działanie trybu Nie przeszkadzać."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"W tym miejscu pojawią się rozmowy priorytetowe i zmodyfikowane"</string>
@@ -3757,7 +3788,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Dostęp do „Nie przeszkadzać”"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Zezwól na dostęp do trybu Nie przeszkadzać"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Żadne zainstalowane aplikacje nie prosiły o dostęp do funkcji „Nie przeszkadzać”."</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Wczytuję aplikacje..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Ładuję aplikacje…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android na żądanie blokuje powiadomienia z tej aplikacji na urządzeniu"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android na żądanie blokuje tę kategorię powiadomień na urządzeniu"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android na żądanie blokuje tę grupę powiadomień na urządzeniu"</string>
@@ -3855,13 +3886,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Wszystkie rozmowy"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Rozmowy priorytetowe"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Brak"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> rozmowy</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> rozmów</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> rozmowy</item>
-      <item quantity="one">1 rozmowa</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Brak"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Brak}=1{1 rozmowa}few{# rozmowy}many{# rozmów}other{# rozmowy}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Osoby, które mogą ignorować tryb Nie przeszkadzać"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Połączenia"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Połączenia"</string>
@@ -3870,13 +3895,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Aby mieć pewność, że dopuszczone połączenia będą sygnalizowane dźwiękowo, sprawdź, czy urządzenie ma włączony dzwonek"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"W harmonogramie „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” połączenia przychodzące są zablokowane. Możesz dostosować ustawienia, tak by znajomi, rodzina i inne osoby z kontaktów mogły do Ciebie pisać."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakty oznaczone gwiazdką"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="few"><xliff:g id="NUM_PEOPLE">%d</xliff:g> inne osoby</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> innych osób</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> innej osoby</item>
-      <item quantity="one">1 inna osoba.</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Brak"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Brak}=1{{contact_1}}=2{{contact_1} i {contact_2}}=3{{contact_1}, {contact_2} i {contact_3}}few{{contact_1}, {contact_2}i jeszcze # inne}many{{contact_1}, {contact_2}i jeszcze # innych}other{{contact_1}, {contact_2}i jeszcze # innego}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Bez nazwy)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Wiadomości"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"wiadomości"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Wiadomości"</string>
@@ -3885,13 +3905,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"W harmonogramie „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” powiadomienia o SMS-ach przychodzących są zablokowane. Możesz dostosować ustawienia, tak by znajomi, rodzina i inne osoby z kontaktów mogły się z Tobą skontaktować."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Dotrą do Ciebie wszystkie wiadomości"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Dotrą do Ciebie wszystkie połączenia"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Brak"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakty</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktów</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktu</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Brak}=1{1 kontakt}few{# kontakty}many{# kontaktów}other{# kontaktu}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Wszyscy"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakty"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakty oznaczone gwiazdką"</string>
@@ -3929,26 +3943,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Wszystkie powiadomienia"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Kilka powiadomień"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Wybrane osoby mogą nadal się z Tobą kontaktować, nawet jeśli nie zezwolisz aplikacjom na ignorowanie trybu Nie przeszkadzać"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="few">Aplikacje <xliff:g id="APP_NAMES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="many">Aplikacje <xliff:g id="APP_NAMES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="other">Aplikacje <xliff:g id="APP_NAMES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="one">Aplikacja <xliff:g id="APP_NAME_0">%s</xliff:g> może ignorować tryb Nie przeszkadzać</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Jeszcze <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Żadna aplikacja nie może ignorować trybu Nie przeszkadzać}=1{Aplikacja {app_1} może ignorować tryb Nie przeszkadzać}=2{Aplikacje {app_1} i {app_2} mogą ignorować tryb Nie przeszkadzać}=3{{app_1}, {app_2} i {app_3} mogą ignorować tryb Nie przeszkadzać}few{Aplikacje {app_1}, {app_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}many{Aplikacje {app_1}, {app_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}other{Aplikacje {app_1}, {app_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacje"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Wszystkie powiadomienia"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Kilka powiadomień"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Które powiadomienia mogą ignorować tryb Nie przeszkadzać"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Zezwalaj na wszystkie powiadomienia"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="few">Dźwięki z kategorii <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="many">Dźwięki z kategorii <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="other">Dźwięki z kategorii <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-      <item quantity="one">Dźwięki z kategorii <xliff:g id="SOUND_CATEGORY">%s</xliff:g> mogą ignorować tryb Nie przeszkadzać</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nic nie może ignorować trybu Nie przeszkadzać"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Jeszcze <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nic nie może ignorować trybu Nie przeszkadzać}=1{Dźwięki z kategorii {sound_category_1} mogą ignorować tryb Nie przeszkadzać}=2{Dźwięki z kategorii {sound_category_1} i {sound_category_2} mogą ignorować tryb Nie przeszkadzać}=3{Dźwięki z kategorii {sound_category_1}, {sound_category_2} i {sound_category_3} mogą ignorować tryb Nie przeszkadzać}few{Dźwięki z kategorii {sound_category_1}, {sound_category_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}many{Dźwięki z kategorii {sound_category_1}, {sound_category_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}other{Dźwięki z kategorii {sound_category_1}, {sound_category_2} i jeszcze # mogą ignorować tryb Nie przeszkadzać}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nic nie może ignorować trybu Nie przeszkadzać"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nikt nie może ignorować trybu Nie przeszkadzać"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Niektóre osoby mogą ignorować tryb Nie przeszkadzać"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Wszyscy mogą ignorować tryb Nie przeszkadzać"</string>
@@ -3998,8 +4000,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Wł."</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Wył."</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Przypinanie aplikacji"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Przypinanie aplikacji pozwala Ci na przypięcie ekranu aplikacji, by był widoczny do czasu, aż go odepniesz. Można używać tej funkcji np. do poinformowania zaufanych znajomych, aby zagrali w określoną grę. \n\nPrzypięta aplikacja może otwierać inne aplikacje i mieć dostęp do danych osobowych. \n\nAby używać przypinania aplikacji: 	\n1.	Włącz przypinanie aplikacji 	\n2.	Otwórz Przegląd 	\n3.	Kliknij ikonę aplikacji u góry ekranu, a następnie kliknij Przypnij"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Przypinanie aplikacji pozwala wyświetlać bieżącą aplikację nad innymi, by była widoczna, dopóki jej nie odepniesz. Możesz użyć tej funkcji, np. by pozwolić zaufanemu znajomemu zagrać w wybraną grę. \n\nPrzypięta aplikacja może otwierać inne aplikacje, a dane osobowe mogą być dostępne. \n\nJeśli chcesz przekazać komuś swoje urządzenie w bezpieczny sposób, skorzystaj raczej z profilu gościa. \n\nAby użyć przypinania aplikacji: 	\n1.	Włącz przypinanie aplikacji 	\n2.	Otwórz Przegląd 	\n3.	Kliknij ikonę aplikacji u góry ekranu, a następnie kliknij Przypnij"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Przypinanie aplikacji pozwala wyświetlać bieżącą aplikację nad innymi, by była widoczna, aż ją odepniesz. Możesz użyć tej funkcji, np. by pozwolić zaufanemu znajomemu zagrać w wybraną grę."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Przypięta aplikacja może otwierać inne aplikacje, a dane osobowe mogą być dostępne. \n\nAby używać przypinania aplikacji: 	\n1.	Włącz przypinanie aplikacji. 	\n2.	Otwórz Przegląd. 	\n3.	Kliknij ikonę aplikacji u góry ekranu, a następnie kliknij Przypnij."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Przypięta aplikacja może otwierać inne aplikacje, a dane osobowe mogą być dostępne. \n\nJeśli chcesz przekazać komuś swoje urządzenie w bezpieczny sposób, skorzystaj raczej z profilu gościa. \n\nAby używać przypinania aplikacji: 	\n1.	Włącz przypinanie aplikacji. 	\n2.	Otwórz Przegląd. 	\n3.	Kliknij ikonę aplikacji u góry ekranu, a następnie kliknij Przypnij."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Przypięta aplikacja: \n\n•	 ma dostęp do danych osobowych \n		(takich jak kontakty i treść e-maili); \n•	 może otwierać inne aplikacje. \n\nUżywaj przypinania aplikacji tylko z zaufanymi osobami."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Aby odpiąć, poproś o wzór odblokowania"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Podaj PIN, aby odpiąć"</string>
@@ -4021,6 +4024,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Jeśli korzystasz z funkcji odblokowywania po zeskanowaniu twarzy, dla większego bezpieczeństwa możesz wymagać podania kodu PIN przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach. Wymagać kodu PIN do uruchomienia urządzenia?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Jeśli korzystasz z funkcji odblokowywania po zeskanowaniu twarzy, dla większego bezpieczeństwa możesz wymagać narysowania wzoru przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach. Wymagać wzoru do uruchomienia urządzenia?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Jeśli korzystasz z funkcji odblokowywania po zeskanowaniu twarzy, dla większego bezpieczeństwa możesz wymagać podania hasła przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Jeśli korzystasz z funkcji odblokowywania biometrycznego, dla większego bezpieczeństwa możesz wymagać podania kodu PIN przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych i skradzionych urządzeniach. Wymagać kodu PIN do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Jeśli korzystasz z funkcji odblokowywania biometrycznego, dla większego bezpieczeństwa możesz wymagać narysowania wzoru przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych i skradzionych urządzeniach. Wymagać wzoru do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Jeśli korzystasz z funkcji odblokowywania biometrycznego, dla większego bezpieczeństwa możesz wymagać podania hasła przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych i skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Tak"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nie"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Z ograniczeniami"</string>
@@ -4212,7 +4218,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB sterowane przez"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Połączone urządzenie"</string>
     <string name="usb_control_device" msgid="527916783743021577">"To urządzenie"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Przełączam..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Przełączam…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nie udało się przełączyć"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Ładowanie tego urządzenia"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Ładowanie podłączonego urządzenia"</string>
@@ -4414,6 +4420,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Zużycie danych"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Użycie danych przez aplikację"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Użycie danych (Wi-Fi)"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Użycie danych poza siecią operatora"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Użycie danych w sieci Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4434,6 +4441,7 @@
       <item quantity="one">1 ograniczenie</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operator komórkowy może obliczać ilość przesłanych danych inaczej niż urządzenie"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Użycie danych w sieciach operatorów nie jest uwzględniane"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Wykorzystano <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ustaw ostrzeżenie dotyczące danych"</string>
     <string name="data_warning" msgid="2925054658166062884">"Ostrzeżenie dotyczące danych"</string>
@@ -4473,7 +4481,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Wyświetl szczegóły"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Oszczędzanie danych"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dane bez limitu"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Dane w tle są wyłączone"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Dane w tle są wyłączone"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Wł."</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Wyłączone"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Użyj Oszczędzania danych"</string>
@@ -4496,7 +4504,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Uniemożliwiaj wpisywanie tekstu w obszarze powiadomień, gdy urządzenie jest zablokowane"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Domyślne sprawdzanie pisowni"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Wybierz sprawdzanie pisowni"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Sprawdzaj pisownię"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Sprawdzaj pisownię"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nie wybrano"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(brak)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4602,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Aby pomóc zwolnić miejsce, Menedżer miejsca usuwa z urządzenia kopie zapasowe zdjęć i filmów."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Usuń zdjęcia i filmy"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Menedżer miejsca"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Użyj Menedżera miejsca"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Użyj Menedżera miejsca"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatyczne"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Instrukcja"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Zwolnij miejsce teraz"</string>
@@ -4632,6 +4640,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Kliknij dwukrotnie, by sprawdzić telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Kliknij dwukrotnie, by sprawdzić tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Kliknij dwukrotnie, by sprawdzić urządzenie"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Wyświetlanie powiadomień"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Przewiń w dół w dolnej części ekranu, by wyświetlić powiadomienia"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Tryb jednej ręki"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Korzystaj z trybu jednej ręki"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Zamknij przy przełączaniu aplikacji"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Limit czasu"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekundy"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekund"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekund"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"osiągalność"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Aby sprawdzić godzinę, powiadomienia i inne informacje, kliknij ekran dwukrotnie."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Podnieś, by sprawdzić telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Podnieś, by sprawdzić tablet"</string>
@@ -4644,6 +4662,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Kliknij, by sprawdzić tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Kliknij, by sprawdzić urządzenie"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Aby sprawdzić godzinę, powiadomienia i inne informacje, kliknij ekran."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Sygnał SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Wezwij pomoc"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Zarządzane przez: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Aby uruchomić te działania, naciśnij szybko przycisk zasilania co najmniej 5 razy"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Odtwórz alarm z odliczaniem"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Zanim wyślesz prośbę o pomoc, odtwórz głośny dźwięk"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Wezwij pomoc"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Numer, pod którym można uzyskać pomoc"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Kliknij, by zmienić."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Jeśli wpiszesz numer inny niż alarmowy:\n • Aby można było wezwać pomoc, urządzenie musi być odblokowane\n • Połączenie może nie zostać odebrane"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Sprawdzanie powiadomień odciskiem palca"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Przesuwanie po czytniku"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Aby sprawdzić powiadomienia, przesuń palcem w dół po czytniku linii papilarnych z tyłu telefonu."</string>
@@ -4783,6 +4811,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maksymalna liczba widocznych zbiorów danych"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Przywróć wartości domyślne"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Zresetowano opcje programisty dotyczące autouzupełniania"</string>
+    <string name="location_category" msgid="3496759112306219062">"Lokalizacja"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Wskaźnik lokalizacji na pasku stanu"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Pokazuj w przypadku wszystkich lokalizacji, w tym określonych na podstawie sieci i połączeń"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Wymuś pełną procedurę pomiarów GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Śledź wszystkie konstelacje GNSS i częstotliwości bez uwzględniania współczynnika impulsu"</string>
     <string name="device_theme" msgid="5027604586494772471">"Motyw urządzenia"</string>
     <string name="default_theme" msgid="4815428567082263639">"Wartość domyślna"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nazwa sieci"</string>
@@ -4799,8 +4832,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Wstrzymaj powiadomienia, by Cię nie rozpraszały"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funkcja niedostępna"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Ta funkcja została wyłączona, bo spowalnia działanie telefonu"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Wymuś pełną procedurę pomiarów GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Śledź wszystkie konstelacje GNSS i częstotliwości bez uwzględniania współczynnika impulsu"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Zawsze pokazuj okno dialogowe z raportem o błędzie"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Pokazuj okno dialogowe przy każdym poważnym błędzie w aplikacji"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Wybierz aplikację obsługującą ANGLE"</string>
@@ -4812,7 +4843,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Włącz dla wszystkich aplikacji"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Wybierz sterownik grafiki"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Domyślny"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Sterownik gry"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Sterownik gry"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Sterownik dewelopera"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Systemowy sterownik grafiki"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4868,7 +4899,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Wł. (wyciszenie)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Wył."</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Szczegóły sieci"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Nazwa urządzenia jest widoczna dla aplikacji na telefonie. Mogą ją też zobaczyć inne osoby, gdy łączysz się z urządzeniami przez Bluetooth lub konfigurujesz hotspot Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Nazwa urządzenia jest widoczna dla aplikacji na telefonie. Mogą ją też zobaczyć inne osoby, gdy łączysz się z urządzeniami przez Bluetooth, łączysz się z siecią Wi-Fi lub konfigurujesz hotspot Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Urządzenia"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Wszystkie ustawienia"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Sugestie"</string>
@@ -4881,6 +4912,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nie udało się znaleźć sieci. Spróbuj ponownie."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(dostęp zabroniony)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Brak karty SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"Karta SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Brak karty SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Brak"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Połączenie wymaga karty SIM"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Połączenie wymaga karty SIM operatora <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferowany tryb sieci: preferowany WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferowany tryb sieci: tylko GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferowany tryb sieci: tylko WCDMA"</string>
@@ -4934,6 +4970,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilna transmisja danych"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Korzystaj z danych przez sieć komórkową"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon automatycznie przełączy się na tego operatora, gdy będziesz w zasięgu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Brak dostępnej karty SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Ustawienie połączeń"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Ustawienia SMS-ów"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Zawsze pytaj"</string>
@@ -4996,6 +5033,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Niedostępne po połączeniu z siecią <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Pokaż więcej"</string>
     <string name="see_less" msgid="2642392725363552793">"Pokaż mniej"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Włączyć usługę <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Włączyć kartę SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Przełączyć na usługę <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Przełączyć na korzystanie z karty SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Tylko 1 karta SIM może być aktywna w danym momencie.\n\nPrzełączenie na usługę <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nie spowoduje rezygnacji z usługi <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Tylko 1 pobrana karta SIM może być aktywna w danym momencie.\n\nPrzełączenie na usługę <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nie spowoduje rezygnacji z usługi <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Tylko 1 karta SIM może być aktywna w danym momencie.\n\nPrzełączenie usługi nie spowoduje rezygnacji z usługi <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Przełącz na usługę <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Łączę się z siecią…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Przełączam na usługę <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nie można przełączyć operatora"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Nie można przełączyć operatora z powodu błędu."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Wyłączyć usługę <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Wyłączyć kartę SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Wyłączam kartę SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nie można wyłączyć operatora"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Coś poszło nie tak i nie udało się wyłączyć operatora."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Używać 2 kart SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Na tym urządzeniu mogą być jednocześnie aktywne 2 karty SIM. Aby nadal używać 1 karty SIM, kliknij „Nie”."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Uruchomić urządzenie ponownie?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Aby rozpocząć, uruchom ponownie urządzenie. Potem możesz dodać kolejną kartę SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Dalej"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Uruchom ponownie"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nie"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Przełącz"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nie można aktywować karty SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Wyjmij kartę SIM i włóż ją ponownie. Jeśli problem nie ustąpi, uruchom urządzenie ponownie."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Spróbuj ponownie włączyć kartę SIM. Jeśli problem nie ustąpi, uruchom urządzenie ponownie."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktywacja sieci"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Sieć <xliff:g id="CARRIER_NAME">%1$s</xliff:g> jest aktywna"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Kliknij, by zaktualizować ustawienia karty SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Karta SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Wykasować dane z tej pobranej karty SIM?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Wykasowanie danych z tej karty SIM spowoduje usunięcie usługi <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> z tego urządzenia.\n\nUsługa dostarczana przez operatora <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> nie zostanie anulowana."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Skasuj"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Kasuję dane z karty SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Nie można wykasować danych z karty SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Nie można wykasować danych z tej karty SIM z powodu błędu.\n\nUruchom urządzenie ponownie i spróbuj jeszcze raz."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Połącz z urządzeniem"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacja <xliff:g id="APPNAME">%1$s</xliff:g> chce użyć tymczasowej sieci Wi‑Fi, by połączyć się z Twoim urządzeniem"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nie znaleziono urządzeń. Upewnij się, że urządzenia są włączone i mogą się połączyć."</string>
@@ -5071,6 +5146,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Połączenia alarmowe"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Twój operator nie obsługuje połączeń alarmowych w Połączeniach przez Wi‑Fi.\nUrządzenie automatycznie przełącza się na sieć komórkową, by nawiązać połączenie alarmowe.\nPołączenia alarmowe są możliwe tylko na terenie objętym zasięgiem sieci komórkowej."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Dzwoń przez Wi‑Fi, by poprawić jakość połączeń"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Połączenia przez różne karty SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Zezwalaj na realizowanie połączeń i SMS-ów z innej karty SIM przez tę kartę SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"połączenia przez różne karty SIM"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Przychodzący MMS"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Nie można wysłać MMS-a"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Kliknij, by zezwolić na komunikację MMS przez operatora <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> przy wyłączonej mobilnej transmisji danych."</string>
@@ -5122,10 +5200,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Zezwól na nakładki ekranowe w ustawieniach"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Zezwól aplikacjom, które mogą wyświetlać się nad innymi, aby nakładały ekrany ustawień"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimedia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ukryj odtwarzacz po zakończeniu sesji multimediów"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Odtwarzacz umożliwia wznowienie sesji w rozwiniętym panelu Szybkich ustawień."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Odtwarzacz w Szybkich ustawieniach"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Pokazuj Odtwarzacz przez dłuższy czas, by łatwo wznowić odtwarzanie"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ukryj odtwarzacz"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Pokaż odtwarzacz"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Brak dostępnych graczy"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplikacje dozwolone"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multimedia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Zostanie włączony Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Włączony"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Wyłączony"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Karty SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Sieci bezpieczne w trybie samolotowym"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Znajdź sieci bezpieczne w trybie samolotowym i połącz się z nimi"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"samolot, bezpieczny w trybie samolotowym"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Połączenia i SMS-y"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Połączenia przez Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Nawiązywanie i odbieranie połączeń w sieciach innych niż należące do operatorów, np. w sieciach Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Połączenia przez Wi-Fi umożliwiają nawiązywanie i odbieranie połączeń w sieciach innych niż należące do operatorów, np. w niektórych sieciach Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Połączenia"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS-y"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferowane"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"preferowane połączenia"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"preferowane SMS-y"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"niedostępne"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Brak karty SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Ustawienia"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Łącz się z sieciami publicznymi"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"połączenie sieciowe, internet, bezprzewodowy, dane, Wi-Fi, wi-fi, wi fi, komórka, telefon, operator komórkowy, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Wyświetl sieci dostępne w trybie samolotowym"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Wyłącz tryb samolotowy"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Niedostępne, ponieważ włączony jest tryb snu"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Ukończono resetowanie ważności powiadomień."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacje"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Niezaufane urządzenie chce uzyskać dostęp do Twoich wiadomości. Kliknij, by wyświetlić szczegóły."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Zezwolić na dostęp do wiadomości?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Niezaufane urządzenie Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], chce uzyskać dostęp do Twoich wiadomości.\n\nTwoje urządzenie nie łączyło się wcześniej z urządzeniem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Niezaufane urządzenie chce uzyskać dostęp do Twoich kontaktów i rejestru połączeń. Kliknij, by wyświetlić szczegóły."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Zezwolić na dostęp do kontaktów i rejestru połączeń?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Niezaufane urządzenie Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], chce uzyskać dostęp do Twoich kontaktów i rejestru połączeń. Chodzi między innymi o dane o połączeniach przychodzących i wychodzących.\n\nTwoje urządzenie nie łączyło się wcześniej z urządzeniem [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 389a7d8..3881d46 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Médio"</item>
     <item msgid="6740026006576843477">"Longo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Curto"</item>
+    <item msgid="7397961711906421599">"Médio"</item>
+    <item msgid="4079132024502041928">"Longo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Padrão"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Somente TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 779b5ef..0721848 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Data e hora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Configurar data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Definir data, hora, fuso horário e formatos"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Usar horário fornecido pela rede"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Usar fuso horário fornecido pela rede"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Definir hora automaticamente"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Definir fuso horário automaticamente"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar o padrão do local"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Formato de 24 horas"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar informações do perfil na tela de bloqueio"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Contas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Localização"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usar local"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usar local"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Configuração desativada"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Ativado: <xliff:g id="COUNT_1">%1$d</xliff:g> app tem acesso à localização</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueio de tela, desbloqueio facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueio de tela, impressão digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueio de tela"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloqueie o smartphone com seu rosto ou impressão digital"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Você também pode fazer login em apps e confirmar pagamentos"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurar o desbloqueio com:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueio facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Facilite o desbloqueio do smartphone"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Impressão digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Desbloqueie o smartphone no seu bolso"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Pular"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Próxima"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Rosto adicionado"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurar desbloqueio facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueio facial"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Usar seu rosto para autenticar"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Iniciar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Se o desbloqueio facial de acessibilidade estiver desativado, algumas etapas da configuração poderão não funcionar com o TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Voltar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuar config."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Usar config. de Acessibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Sempre exigir etapa de confirmação ao usar desbloqueio facial em apps"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Excluir dados faciais"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurar desbloqueio facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone pode desbloqueá-lo mesmo que essa não seja sua intenção.\n\nO smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto.\n\nO smartphone pode ser desbloqueado por alguém que se pareça muito com você, por exemplo, um gêmeo idêntico."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone poderá desbloqueá-lo mesmo que essa não seja sua intenção.\n\nSeu smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto, mesmo com seus olhos fechados.\n\nPode acontecer de o smartphone ser desbloqueado por alguém que se pareça muito com você, por exemplo, um gêmeo idêntico."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Lembre-se:\nOlhar para o smartphone pode desbloqueá-lo acidentalmente.\n\nO smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto.\n\nO smartphone poderá ser desbloqueado por uma pessoa muito parecida com você, como um irmão gêmeo."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Lembre-se:\nOlhar para o smartphone pode desbloqueá-lo acidentalmente.\n\nO smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto mesmo de olhos fechados.\n\nO smartphone poderá ser desbloqueado por uma pessoa muito parecida com você, como um irmão gêmeo."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Excluir dados faciais?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Os dados faciais usados pelo desbloqueio facial serão excluídos permanentemente e de maneira segura. Depois da remoção, você precisará do PIN, padrão ou senha para desbloquear o smartphone, fazer login em apps e confirmar pagamentos."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Use o desbloqueio facial para acessar o smartphone"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nNota: não é possível usar sua impressão digital para desbloquear este dispositivo. Para mais informações, entre em contato com o administrador da organização."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nObservação: usar um padrão ou um PIN forte pode ser mais seguro que sua impressão digital."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Agora não"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Pular"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Próxima"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Proteger seu tablet com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Proteger seu dispositivo com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Proteger seu smartphone com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Proteger seu tablet com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Proteger seu dispositivo com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Proteger seu smartphone com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Pular configuração do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pular configuração de senha?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Pular configuração de padrão?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Escolha seu método de bloqueio de tela alternativo"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Escolha seu método de bloqueio de tela alternativo"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Escolha seu método de bloqueio de tela alternativo"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opções de bloqueio de tela"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opções de bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueio de tela"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueio facial + senha"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuar sem desbloqueio facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"É possível desbloquear seu smartphone usando seu rosto. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria + Padrão"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria + Senha"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuar sem a biometria"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"É possível desbloquear o smartphone usando a biometria. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desativada pelo admin, política de criptografia ou armazenamento de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nenhuma"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">Precisa ter menos de <xliff:g id="NUMBER_1">%d</xliff:g> dígitos</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"O administrador do dispositivo não permite o uso de um PIN recente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"PINs comuns foram bloqueados pelo seu administrador de TI. Tente um PIN diferente."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Não pode incluir um caractere inválido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Deve conter pelo menos uma letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Deve conter pelo menos um dígito"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">Precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> caracteres não numéricos</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"O administrador do dispositivo não permite usar uma senha recente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Senhas comuns foram bloqueadas pelo seu administrador de TI. Tente uma senha diferente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Não é permitido usar uma sequência de dígitos em ordem crescente, decrescente ou repetidos"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ativar o Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Usar Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Usar Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Configurações de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurar e gerenciar pontos de acesso sem fio"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centralize o código QR abaixo para conectar a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Para entrar na rede Wi-Fi, faça a leitura de um código QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartilhar Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>” e compartilhar a senha"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Faça a leitura deste código QR com outro dispositivo para entrar na rede “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Tente novamente. Se o problema persistir, entre em contato com o fabricante do dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Algo deu errado"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Senha do Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Senha do ponto de acesso: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conexão automática"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permitir que o smartphone conecte automaticamente a essa rede quando estiver perto dela"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permita que o tablet se conecte automaticamente quando estiver perto dessa rede"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permitir conexão com esta rede quando ela estiver ao alcance"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Adicionar dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use um código QR para adicionar um dispositivo a esta rede"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"O código QR não está em um formato válido"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Usar certificados do sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Não fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Não validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nenhum certificado especificado. Sua conexão não será particular."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"O nome da rede é muito longo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"É necessário especificar um domínio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificado obrigatório."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ativado"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Conectando a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Conectando…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Falha ao conectar à rede"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rede fora do alcance"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Endereço MAC do dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Endereço MAC randomizado"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Endereço MAC randomizado (último uso)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Endereço IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalhes da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de sub-rede"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Endereços IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Redes salvas"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Assinaturas"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Outras redes"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Configurações de IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"As configurações avançadas de Wi-Fi não estão disponíveis para esse usuário"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Salvar"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Digite um endereço de gateway válido."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Digite um endereço de DNS válido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Digite um tamanho do prefixo de rede entre 0 e 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a menos que substituído por um DNS particular)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a menos que substituído por um DNS particular)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Tamanho do pref. de rede"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"O app está compartilhando conteúdo. Para compartilhar a conexão com a Internet, desative e ative o ponto de acesso"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nenhuma senha definida"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nome do ponto de acesso"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Outros dispositivos podem se conectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Senha do ponto de acesso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda do ponto de acesso"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automaticamente a taxa de atualização de 60 para 90 Hz para alguns conteúdos. Maior uso da bateria"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forçar a taxa de atualização de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Maior taxa de atualização para melhoria na resposta tátil e na qualidade das animações. Maior uso da bateria."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Reconhecimento de tela em uso"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ativado / A tela não será desativada se você estiver olhando para ela"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Quando a tela está escura, ela é ativada quando chegam notificações"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Sempre mostrar hora e informações"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Maior uso da bateria"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Negrito"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Bloqueio do chip"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versão do Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Atualização de segurança do Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo e hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versão do hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID do equipamento"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Excluir APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Novo APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Salvar"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Descartar"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Cancelar"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"O campo Nome não pode ficar vazio."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"O APN não pode estar vazio."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Os apps podem ser redefinidos"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Redefinir Wi-Fi, rede móvel e Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Esta ação redefinirá todas as configurações de rede, inclusive:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dados móveis"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Limpar"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Limpar chips salvos"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Para fazer o download de chips substitutos, entre em contato com a operadora. Isso não cancelará nenhum plano de serviços móveis."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Isso não cancelará nenhum plano de serviços móveis. Para fazer o download de chips substitutos, entre em contato com a operadora."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Redefinir configurações"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Redefinir todas as configurações de rede? Não é possível desfazer essa ação."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Redefinir todas as configurações de rede e limpar chips salvos? Não é possível desfazer essa ação."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"As configurações de rede foram redefinidas"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Não é possível limpar chips"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Os chips transferidos por download não podem ser limpos devido a um erro.\n\nReinicie o dispositivo e tente novamente."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Limpar todos os dados (redefinir para a configuração original)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Limpar todos os dados"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"No momento você está conectado às seguintes contas:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Esta ação não cancelará seu plano de serviços móveis."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Limpar todos os dados (redefinir para a configuração original)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Limpar todos os dados"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos por download."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu smartphone, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos por download."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"No momento, as seguintes contas estão conectadas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Essa ação não cancelará seu plano de serviços móveis."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para limpar músicas, imagens e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Apagar armazenamento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Apagar cartão SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Apagar todos os dados do armazenamento USB interno, como músicas e fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Apagar todos os dados do cartão SD, como músicas e fotos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Limpar todos os dados"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Limpar todos os dados"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Todas as informações pessoais e apps transferidos por download serão excluídos. Não é possível desfazer essa ação."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Todas as suas informações pessoais, inclusive apps e chips transferidos por download, serão excluídas. Não é possível desfazer essa ação."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Apagar tudo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Limpar todos os dados?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"A configuração original não está disponível para esse usuário"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Apagando"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Aguarde..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Limpar todos os dados"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Limpar todos os dados"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Todas as informações pessoais e os apps transferidos por download serão excluídos. Não é possível desfazer essa ação."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Todas as suas informações pessoais, inclusive apps e chips transferidos por download, serão excluídas. Não é possível desfazer essa ação."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Limpar todos os dados?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"A redefinição para a configuração original não está disponível para este usuário"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Limpando"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Aguarde…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Conf. de chamada"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configurar correio voz, encaminhamento, espera etc."</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Não é possível vincular a mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será vinculado."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Tethering Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Compartilhar a conexão de Internet do smartphone via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Compartilhar a conexão de Internet do smartphone via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use o ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão de dados móveis. Os apps também podem criar um ponto de acesso para compartilhar conteúdo com dispositivos por perto."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use o ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão Wi-Fi ou de dados móveis. Os apps também podem criar um ponto de acesso para compartilhar conteúdo com dispositivos próximos."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ajuda"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que apps e serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detecção do fuso horário do local"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detecção do fuso horário do local"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite que o local do dispositivo seja usado para detectar o fuso horário atual. Outras configurações de localização, como busca por Wi-Fi, podem afetar a precisão da detecção de fuso horário."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Ativada"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desativada"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"A detecção automática de fuso horário está desativada"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"A detecção de fuso horário do local está desativada"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"A detecção de fuso horário do local está indisponível"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Não são permitidas mudanças na detecção de fuso horário do local"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Local de rede móvel e Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Permitir que apps usem o serviço de localização do Google para determinar seu local mais rapidamente. Dados de localização anônimos serão coletados e enviados ao Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Localização determinada por Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Defina uma senha p/ usar o desb. facial"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Defina um padrão para usar o desb. facial"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Defina um PIN p/ usar o desb. facial"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Para usar a biometria, defina uma senha"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Para usar a biometria, defina um padrão"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Para usar a biometria, defina um PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Esqueceu sua senha?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Esqueceu seu padrão?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Esqueceu seu PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferências de legenda"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliação"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliação"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ampliação ativada"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Escolha a área de ampliação que você quer usar ao ampliar a tela"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Tela cheia"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte da tela"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Tela cheia e parte da tela"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar toda a tela"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte da tela"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Mudar para o botão de acessibilidade?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"O uso do toque triplo para ampliar parte da tela fará com que a digitação e outras ações fiquem mais lentas.\n\nQuer passar a usar o botão de acessibilidade para ampliar a tela?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Mudar para o botão de acessibilidade"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Manter o toque triplo para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configurações de ampliação"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar com toque triplo"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ampliar com atalho"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Botão liga/desliga encerra chamadas"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Cursor do mouse grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remover animações"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Áudio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combinar canais ao reproduzir áudio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balanço de áudio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Esquerda"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Direita"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Áudio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combinar canais ao tocar áudio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balanço de áudio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Esquerdo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Direito"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Padrão"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibração de notificação"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibração do toque"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback por toque"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usar correção de cor"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar legendas"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Apenas para apps compatíveis"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usar correção de cor"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar legendas"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Apenas para apps compatíveis"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tamanho e estilo das legendas"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamanho do texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Mais opções"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de cinza"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restrição em segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permitir que o app seja executado em segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Execução do app em segundo plano não permitida"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Não é possível restringir o uso em segundo plano"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Não é possível restringir o uso em segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitar atividade em segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se você limitar as atividades em segundo plano de um app, ele poderá apresentar mau funcionamento"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Como o app não está configurado para otimizar bateria, não é possível restringi-lo.\n\nPara restringir, ative a otimização."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet usado além do normal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Dispositivo usado além do normal"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"A bateria pode acabar antes do esperado"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Otimizando para integridade da bateria"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Bateria limitada temporariamente. Toque para saber mais."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"O smartphone foi usado além do normal. A bateria pode acabar antes do esperado.\n\nApps que mais usam bateria:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"O tablet foi usado além do normal. A bateria pode acabar antes do esperado.\n\nApps que mais usam bateria:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"O dispositivo foi usado além do normal. A bateria pode acabar antes do esperado.\n\nApps que mais usam bateria:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">%1$d apps restritos</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problema para ler seu medidor de bateria"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problema para ler seu medidor de bateria. Toque para "<annotation id="url">"saber mais"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Parar o app?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Definir uma programação"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolongar a duração da bateria"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desativar quando estiver carregado"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"A Economia de bateria é desativada quando a carga do smartphone chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"A Economia de bateria é desativada quando a carga do tablet chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"A Economia de bateria é desativada quando a carga da bateria do dispositivo chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"A Economia de bateria é desativada quando a carga do smartphone chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"A Economia de bateria é desativada quando a carga do tablet chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"A Economia de bateria é desativada quando a carga do dispositivo chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ativar"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Redefinir"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproduzir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividade adaptável"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Aumenta a duração da bateria e melhora o desempenho do dispositivo ao gerenciar suas conexões de rede automaticamente"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Armazenamento de credenciais"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalar um certificado"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalar certificados do armazenamento"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuário"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar as credenciais armazenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avançado"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"No hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Somente software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este usuário"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Não instalar"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instalar assim mesmo"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificado não instalado"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Permitir que <xliff:g id="APP_NAME">%s</xliff:g> instale certificados neste dispositivo?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Estes certificados confirmarão sua identidade para os apps e URLs abaixo"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Não permitir"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Permitir"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Mostrar mais"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App de gerenc. de certificados"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Nenhum"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Os certificados instalados por este app identificam você para os apps e URLs abaixo"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Remover"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Sinal de discagem de emergência"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Definir comportamento durante uma chamada de emergência"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Backup"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Não configurado - perfil de trabalho"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Você (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Apelido"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"É possível adicionar até <xliff:g id="USER_COUNT">%1$d</xliff:g> usuários"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Somente o proprietário do tablet pode gerenciar os usuários."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Somente o proprietário do telefone pode gerenciar os usuários."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Como pagar no terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configure um app de pagamento. Em seguida, basta segurar a parte traseira do seu smartphone em direção a qualquer terminal com o símbolo indicando pagamento por aproximação."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entendi"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mais..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mais…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Definir app de pagamento padrão"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Atualizar app de pagamento padrão"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Em um terminal por aproximação, pagar com <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Voltar"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Próxima"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Concluir"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tirar uma foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Escolher uma imagem"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Selecionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Chips"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Chips"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Sempre usar esta opção para chamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecionar um chip de dados"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecione um chip para SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Trocando chip de dados. Isso pode demorar um pouco..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Trocando chip de dados. Isso pode demorar um minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Ligar com"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selecionar um chip"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Chip <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rotina, agenda, economia de bateria, economia de energia, bateria, automático, percentagem"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, chamada avançada, chamadas por 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"adicionar idioma, adicionar um idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamanho do texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Som padrão"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume de toque e notificação em <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibração, Não perturbe"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ativar sons"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Legenda Instantânea"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Legendar mídias automaticamente"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nenhuma"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> programação definida</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programações definidas</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhum}=1{1 programação definida}one{# programação definida}other{# programações definidas}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Não perturbe"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Receber notificações apenas de pessoas e apps importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar interrupções"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Somente prioridade"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desativado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ativado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Perguntar sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Até você desativar"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> hora</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> programação pode ser ativada automaticamente</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programações podem ser ativadas automaticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}one{# hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desativado}=1{Desativado / 1 programação pode ser ativada automaticamente}one{Desativado / # programação pode ser ativada automaticamente}other{Desativado / # programações podem ser ativadas automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"O que pode interromper o \"Não perturbe\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Pessoas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Definir automaticamente as notificações de prioridade baixa como \"Discretas\""</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classificação adaptativa de notificações"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classificar notificações automaticamente por relevância"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback de notificação adaptável"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicar os ajustes feitos nas notificações e mostrar a opção de enviar feedback ao sistema"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Redefinir importância de notificações"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Redefina as configurações de importância mudadas pelo usuário e permita que o assistente de notificação decida a prioridade"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respostas e ações sugeridas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostrar automaticamente as respostas e ações sugeridas"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Mostrar notificações recentes e adiadas"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Conversas prioritárias"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Aparecem na parte superior da seção de conversa, na forma de balões"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Aparecem na parte superior da seção de conversa"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Outras conversas"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Conversas sem prioridade"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversas que você modificou"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Conversas recentes"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Limpar recentes"</string>
+    <string name="clear" msgid="5092178335409471100">"Limpar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Mostrar conversas prioritárias em balões"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Conversas prioritárias são mostradas na parte superior da aba suspensa. Você também pode configurá-las para que sejam mostradas em balões e interrompam o modo \"Não perturbe\"."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"As conversas prioritárias e modificadas aparecerão aqui"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acesso ao Não perturbe"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir o Não perturbe"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Carregando apps…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Carregando apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"O Android está bloqueando as notificações desse app neste dispositivo, conforme você pediu"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"O Android está bloqueando essa categoria de notificações neste dispositivo, conforme você pediu"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"O Android está bloqueando esse grupo de notificações neste dispositivo, conforme seu pedido"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas as conversas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversas prioritárias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nenhuma"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversa</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversas</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nenhuma"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhum}=1{1 conversa}one{# conversa}other{# conversas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quem pode interromper"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chamadas"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para garantir que as chamadas permitidas emitam sons, verifique se o dispositivo está configurado para tocar"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Durante a programação \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as chamadas recebidas são bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contatos marcados com estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nenhum"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nenhum}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}one{{contact_1}, {contact_2} e mais #}other{{contact_1}, {contact_2} e mais #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sem nome)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensagens"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensagens"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensagens"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Durante \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as mensagens recebidas são bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Você pode receber todas as mensagens"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Você pode receber todas as chamadas"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nenhum"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contato</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contatos</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nenhum}=1{1 contato}one{# contato}other{# contatos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contatos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contatos marcados com estrela"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Algumas pessoas ainda podem entrar em contato com você, mesmo que você não permita a interrupção por apps"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> pode interromper</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> podem interromper</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"mais <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nenhum app pode interromper}=1{{app_1} pode interromper}=2{{app_1} e {app_2} podem interromper}=3{{app_1}, {app_2} e {app_3} podem interromper}one{{app_1}, {app_2} e mais # podem interromper}other{{app_1}, {app_2} e mais # podem interromper}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificações que podem interromper"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas as notificações"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> pode interromper</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> podem interromper</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada pode interromper"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"mais <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper}=1{{sound_category_1} pode interromper}=2{{sound_category_1} e {sound_category_2} podem interromper}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} podem interromper}one{{sound_category_1}, {sound_category_2} e mais # podem interromper}other{{sound_category_1}, {sound_category_2} e mais # podem interromper}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguém pode interromper"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algumas pessoas podem interromper"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Todas as pessoas podem interromper"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Ativado"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Desativado"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Fixação de apps"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"A fixação de apps permite manter o app atual em exibição até você liberá-lo. Esse recurso pode ser usado, por exemplo, para permitir que um amigo confiável abra um jogo específico. \n\nQuando um app está fixado, ele pode abrir outros apps e acessar dados pessoais. \n\nPara usar a fixação de apps: 	\n1.	Ative a fixação de apps 	\n2.	Abra a opção \"Visão geral\" 	\n3.	Na parte superior da tela, toque no ícone do app e depois em \"Fixar\""</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"A fixação de apps permite manter o app atual em exibição até você liberá-lo. Esse recurso pode ser usado, por exemplo, para permitir que um amigo confiável abra um jogo específico. \n\nQuando um app está fixado, ele pode abrir outros apps e acessar dados pessoais. \n\nSe você quiser compartilhar seu dispositivo com alguém de forma segura, tente usar um usuário convidado. \n\nPara usar a fixação de apps: 	\n1.	Ative a fixação de apps 	\n2.	Abra a opção \"Visão geral\" 	\n3.	Na parte superior da tela, toque no ícone do app e depois em \"Fixar\""</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"A fixação de apps permite manter o app atual em exibição até você liberá-lo. Esse recurso pode ser usado, por exemplo, para permitir que um amigo confiável abra um jogo específico."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Quando um app está fixado, ele pode abrir outros apps e os dados pessoais podem ficar acessíveis. \n\nPara usar a fixação de apps, faça o seguinte: 	\n1.	Ative a fixação de apps 	\n2.	Abra a opção \"Visão geral\" 	\n3.	Na parte superior da tela, toque no ícone do app e depois em \"Fixar\""</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Quando um app está fixado, ele pode abrir outros apps e os dados pessoais podem ficar acessíveis. \n\nSe você quiser compartilhar seu dispositivo com alguém de forma segura, tente fazer isso com um usuário convidado. \n\nPara usar a fixação de apps, faça o seguinte: 	\n1.	Ative a fixação de apps 	\n2.	Abra a opção \"Visão geral\" 	\n3.	Na parte superior da tela, toque no ícone do app e depois em \"Fixar\""</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Quando o app está fixado, ele pode: \n\n•		acessar dados pessoais \n		(como contatos e conteúdo de e-mail); \n•		abrir outros apps. \n\nUse a fixação de apps apenas com pessoas em quem você confia."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Pedir padrão de desbloqueio antes de desafixar"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Pedir PIN antes de desafixar"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar um PIN para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando seu padrão antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajudar a proteger os dados em dispositivos perdidos ou roubados. Solicitar um padrão para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo sua senha antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar senha para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo um PIN antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir um PIN para inicializar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo um padrão antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir um padrão para inicializar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo uma senha antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir uma senha para inicializar o dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sim"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Não"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restrito"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo conectado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Alternando..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Alternando…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Não foi possível alternar"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Para carregamento do dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Carregando dispositivo conectado"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Uso de dados móveis"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Uso de dados do app"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Uso de dados Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Uso de dados de redes que não sejam da operadora"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Uso de dados ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"O cálculo de dados da operadora pode ser diferente daquele realizado pelo seu dispostivo"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excluir dados usados por redes de operadoras"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir alerta de uso de dados"</string>
     <string name="data_warning" msgid="2925054658166062884">"Alerta de uso de dados"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalhes"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Economia de dados"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dados ilimitados"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Os dados em segundo plano estão desativados"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Os dados em segundo plano estão desativados"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Ativada"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desativada"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usar o recurso Economia de dados"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Se o dispositivo estiver bloqueado, impedir a digitação de respostas ou outros textos nas notificações"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corretor ortográfico padrão"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Escolher corretor ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Usar o corretor ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usar o corretor ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Não selecionado"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nenhum)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Remover fotos e vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gerenciador de armazenamento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Usar gerenciador de armazenamento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usar gerenciador de armazenamento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Modo automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Modo manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liberar espaço agora"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tocar duas vezes na tela para verificar o smartphone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tocar duas vezes na tela para verificar o tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tocar duas vezes na tela para verificar o dispositivo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Deslizar para ver notif."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Deslize para baixo no canto inferior da tela para mostrar as notificações"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo para uma mão"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usar o \"modo para uma mão\""</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Sair ao alternar entre apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tempo limite"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"acesso com uma mão"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para verificar a hora, as notificações e outras informações, toque duas vezes na tela."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar o smartphone para verificá-lo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levantar o tablet para verificá-lo"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tocar para verificar o tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocar para verificar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para verificar a hora, as notificações e outras informações, toque na tela."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergência"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Usar as opções de emergência"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gerenciado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Pressione o botão liga/desliga rapidamente cinco vezes ou mais para iniciar as ações abaixo"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Tocar alarme de contagem regressiva"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Emitir um som alto antes de enviar um pedido de ajuda"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Pedir ajuda"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Número para ligar para pedir ajuda"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Toque para mudar"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Se você inserir um número que não seja de emergência:\n • seu dispositivo precisará estar desbloqueado para usar as opções de emergência;\n • sua ligação poderá não ser atendida."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar para baixo no sensor de impressão digital para ver as notificações"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usar impressão digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Máximo de conjuntos de dados visíveis"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Redefinir para valores padrão"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"As opções do desenvolvedor de preenchimento automático foram redefinidas"</string>
+    <string name="location_category" msgid="3496759112306219062">"Local"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicador de local na barra de status"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Mostrar para todos os locais, incluindo rede e conectividade"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forçar medições completas de GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Rastrear todas as constelações e frequências do GNSS sem nenhum ciclo de trabalho"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema do dispositivo"</string>
     <string name="default_theme" msgid="4815428567082263639">"Padrão"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nome da rede"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pausar notificações para manter o foco"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Recurso não disponível"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Esse recurso foi desativado porque causa lentidão no seu smartphone"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forçar medições completas de GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Rastrear todas as constelações e frequências do GNSS sem nenhum ciclo de trabalho"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Sempre mostrar a caixa de diálogo de falha"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Mostrar a caixa de diálogo sempre que um app falha"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Selecionar app ativado para ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ativar para todos os apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecionar driver gráfico"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Padrão"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver de jogo"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver de jogo"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver gráfico do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Ativado (silencioso)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Desativado"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detalhes da rede"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"O nome do seu dispositivo está visível para os apps no seu smartphone. Ele também pode ser visto por outras pessoas quando você se conecta a dispositivos Bluetooth ou configura um ponto de acesso Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"O nome do seu dispositivo está visível para os apps no smartphone. Ele também pode ser visto por outras pessoas quando você se conecta a dispositivos Bluetooth ou a uma rede Wi-Fi ou quando configura um ponto de acesso Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Dispositivos"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Todas as configurações"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Sugestões"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Não foi possível encontrar redes. Tente novamente."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(proibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Sem chip"</string>
+    <string name="sim_card" msgid="6381158752066377709">"Chip"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Sem chip"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nenhuma"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Chip necessário para se conectar"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Chip da <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> necessário para se conectar"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modo de rede preferencial: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modo de rede preferencial: somente GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modo de rede preferencial: somente WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dados móveis"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acessar os dados pela rede móvel"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O smartphone mudará automaticamente para esta operadora quando estiver dentro do alcance"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nenhum chip disponível"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferência de chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferência de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Perguntar sempre"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando conectado à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ver mais"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Ativar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Ativar o chip?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Mudar para a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Começar a usar o chip?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Somente um chip pode estar ativo por vez.\n\nMudar para a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancelará o serviço da <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Somente um chip transferido por download pode estar ativo por vez.\n\nMudar para a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancelará o serviço da <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Somente um chip pode estar ativo por vez.\n\nMudar de operadora não cancelará o serviço da <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Mudar para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Conectando à rede…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Mudando para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Não foi possível mudar a operadora"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Devido a um erro, não foi possível mudar a operadora."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Desativar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Desativar chip?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desativando o chip<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Não foi possível desativar a operadora"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Algo deu errado, e não foi possível desativar sua operadora."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Usar dois chips?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo pode ter dois chips ativos ao mesmo tempo. Para continuar usando um chip por vez, toque em \"Agora não\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Reiniciar dispositivo?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Para começar, reinicie seu dispositivo. Depois, você pode adicionar outro chip."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Agora não"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Mudar"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Não foi possível ativar o chip"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o chip e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tente ativar o chip novamente. Se o problema continuar, reinicie o dispositivo."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ativação de rede"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"A operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g> está ativa"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toque para atualizar as configurações do chip"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Chip"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Limpar este chip transferido por download?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"A limpeza do chip remove o serviço da <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> deste dispositivo.\n\nO serviço da <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> não será cancelado."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Limpar"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Limpando chip…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Não é possível limpar o chip"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Não é possível limpar este chip devido a um erro.\n\nReinicie o dispositivo e tente novamente."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectar ao dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"O app <xliff:g id="APPNAME">%1$s</xliff:g> quer usar uma rede Wi-Fi temporária para se conectar ao seu dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nenhum dispositivo foi encontrado. Os dispositivos precisam estar ligados e disponíveis para conexão."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Chamadas de emergência"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"As chamadas de emergência feitas com o recurso \"Chamada no Wi-Fi\" não são compatíveis com sua operadora.\nO dispositivo alterna automaticamente para uma rede celular para fazer uma chamada de emergência.\nAs chamadas de emergência são possíveis apenas em áreas com cobertura de celular."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Usar Wi-Fi nas chamadas para melhorar a qualidade"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Chamadas entre chips"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Permitir chamadas e mensagens SMS de outro chip por este."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"chamadas entre chips"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Mensagem MMS recebida"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Não é possível enviar mensagens MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Toque para permitir mensagens MMS pela <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> quando os dados móveis estiverem desativados"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir sobreposições de tela no app Config."</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permita que apps que podem ser sobrepostos a outros sejam abertos sobre telas de configuração"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Mídia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ocultar player quando a sessão de mídia terminar"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"O player permite que você retome uma sessão do painel \"Configurações rápidas\" expandido."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Player de mídia nas Configurações rápidas"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostrar player de mídia por um longo período para retomar a reprodução com facilidade"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nenhum player disponível"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Apps permitidos"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"mídia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"O Bluetooth será ativado"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Ativar"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desativar"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Chips"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para aviões"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Encontre redes seguras para aviões e se conecte a elas"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, segura para aviões"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamada no Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Faça e receba chamadas por redes sem operadora, como Wi-Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"A chamada no Wi-Fi permite que você faça e receba chamadas por redes sem operadora, como algumas redes Wi-Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferido"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"preferido para chamadas"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"preferido para SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponível"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sem chip"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectar-se a redes públicas"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"conexão de rede, internet, sem fio, dados, wifi, wi-fi, wi fi, celular, rede móvel, operadora de celular, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver redes seguras para aviões"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desativar o modo avião"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Indisponível durante o Modo noite"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Redefinição da importância de notificações concluída."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Um dispositivo não confiável quer acessar suas mensagens. Toque para ver detalhes."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Conceder acesso às mensagens?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Um dispositivo Bluetooth não confiável, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quer acessar suas mensagens.\n\nVocê não se conectou a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Um dispositivo não confiável quer acessar seus contatos e seu registro de chamadas. Toque para ver detalhes."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Conceder acesso aos contatos e ao registro de chamadas?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Um dispositivo Bluetooth não confiável, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quer acessar seus contatos e seu registro de chamadas. Isso inclui dados sobre chamadas recebidas e realizadas.\n\nVocê não se conectou a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
 </resources>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 319ef23..dd28b3f 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Médio"</item>
     <item msgid="6740026006576843477">"Longa"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Curto"</item>
+    <item msgid="7397961711906421599">"Médio"</item>
+    <item msgid="4079132024502041928">"Longo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predefinição"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Apenas TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3f9cc8a..f79fc43 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Data e hora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Definir data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Definir data, hora, fuso horário e formatos"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Usar hora fornecida pela rede"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Utilizar fuso horário fornecido pela rede"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Definir a hora automaticamente"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Definir o fuso horário automaticamente"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Utilizar local predefinido"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Utilizar formato de 24 horas"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar informação do perfil no ecrã de bloqueio"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Contas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Localização"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Utilizar a localização"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Utilizar a localização"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Desativada"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Ativada – <xliff:g id="COUNT_1">%1$d</xliff:g> apps têm acesso à localização</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueio de ecrã, Desbloqueio facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueio de ecrã, impressão digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueio de ecrã"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloqueie o telemóvel em segurança com o rosto e impressão digital."</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Também pode iniciar sessão em apps e confirmar pagamentos."</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configure o desbloqueio com:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueio facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Simplifique o desbloqueio do telemóvel."</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Impressão digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Poupe tempo, desbloqueie o tlm no bolso."</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Ignorar"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Seguinte"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Rosto adicionado."</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configure o Desbloqueio facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueio facial"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Utilize o rosto para autenticação"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Iniciar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Se o desbloqueio facial da acessibilidade estiver desativado, alguns passos de configuração podem não funcionar corretamente com o TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Voltar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuar config."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Utiliz. config. acessibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Ao utilizar Desbloqueio facial em apl., solicitar sempre confirmação"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Elim. dados faciais"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configure o Desbloqueio facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Utilize o Desbloqueio facial para desbloquear o dispositivo, iniciar sessão em apps e confirmar pagamentos.\n\nTenha em atenção:\nPode desbloquear o telemóvel involuntariamente ao olhar para o mesmo.\n\nAlguém pode desbloquear o telemóvel se o segurar junto ao seu rosto.\n\nAlguém muito parecido consigo, como um irmão com traços semelhantes, pode desbloquear o telemóvel."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Utilize o Desbloqueio facial para desbloquear o dispositivo, iniciar sessão em aplicações e confirmar pagamentos.\n\nTenha em atenção:\nPode desbloquear o telemóvel involuntariamente ao olhar para o mesmo.\n\nAlguém pode desbloquear o telemóvel se o segurar junto ao seu rosto, mesmo com os olhos fechados.\n\nAlguém muito parecido consigo, como um irmão com traços semelhantes, pode desbloquear o telemóvel."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Utilize o desbloqueio facial para desbloquear o dispositivo, iniciar sessão em apps e confirmar pagamentos."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Tenha em atenção o seguinte:\nPode desbloquear o telemóvel involuntariamente ao olhar para o mesmo.\n\nAlguém pode desbloquear o telemóvel se o segurar junto ao seu rosto.\n\nAlguém muito parecido consigo, como um irmão com traços semelhantes, pode desbloquear o telemóvel."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Tenha em atenção o seguinte:\nPode desbloquear o telemóvel involuntariamente ao olhar para o mesmo.\n\nAlguém pode desbloquear o telemóvel se o segurar junto ao seu rosto, mesmo com os olhos fechados.\n\nAlguém muito parecido consigo, como um irmão com traços semelhantes, pode desbloquear o telemóvel."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Eliminar os dados do rosto?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Os dados do rosto utilizados pelo Desbloqueio facial serão eliminados permanentemente e em segurança. Após a remoção, precisará do PIN, do padrão ou da palavra-passe para desbloquear o telemóvel, iniciar sessão nas aplicações e confirmar pagamentos."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Utilize o Desbloqueio facial para desbloquear o telemóvel"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Utilize a sua impressão digital para desbloquear o telemóvel ou para autorizar compras.\n\nNota: não pode utilizar a sua impressão digital para desbloquear este dispositivo. Para mais informações, contacte o gestor da sua entidade."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Utilize a sua impressão digital para desbloquear o telemóvel ou para autorizar compras.\n\nNota: a impressão digital pode ser menos segura do que um padrão ou um PIN fortes."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Não, obrigado"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ignorar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Seguinte"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Se proteger o seu tablet com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar o Desbloqueio facial. Para retroceder, toque em Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Se proteger o seu dispositivo com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar o Desbloqueio facial. Para retroceder, toque em Cancelar."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Se proteger o seu telemóvel com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar o Desbloqueio facial. Para retroceder, toque em Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Se proteger o seu tablet com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a biometria. Para retroceder, toque em Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Se proteger o seu dispositivo com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a biometria. Para retroceder, toque em Cancelar."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Se proteger o seu telemóvel com uma opção de bloqueio de ecrã, ninguém o conseguirá utilizar se for roubado ou se o perder. Também precisa de uma opção de bloqueio de ecrã para configurar a biometria. Para retroceder, toque em Cancelar."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Pretende ignorar a configuração do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pretende ignorar configuração da palavra-passe?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Pretende ignorar a configuração do padrão?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Impeça terceiros de utilizar este tablet sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Impeça terceiros de utilizar este dispositivo sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Impeça terceiros de utilizar este telemóvel sem a sua autorização ao ativar as funcionalidades de proteção do dispositivo. Escolha o bloqueio de ecrã que pretende utilizar."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Escolha o método de bloqueio de ecrã de segurança"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Escolha o método de bloqueio de ecrã de segurança."</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Escolha o método de bloqueio de ecrã de segurança."</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opções de bloqueio de ecrã"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opções de bloqueio de ecrã"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueio de ecrã"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueio facial + palavra-passe"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continue sem o Desbloqueio facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Pode desbloquear o telemóvel através do seu rosto. Por motivos de segurança, esta opção requer um bloqueio de ecrã de segurança."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria + padrão"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria + palavra-passe"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuar sem biometria"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Pode desbloquear o seu telemóvel através da sua biometria. Por motivos de segurança, esta opção requer um bloqueio de ecrã de segurança."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desativada pelo gestor, política de encriptação ou armazenamento de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nenhum"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar rapidamente"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Tem de ter menos de <xliff:g id="NUMBER_0">%d</xliff:g> dígito.</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"O gestor do dispositivo não permite utilizar um PIN recente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Os PINs comuns estão bloqueados pelo seu gestor de TI. Experimente outro PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Não pode incluir um caráter inválido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Tem de incluir, pelo menos, uma letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Tem de incluir, pelo menos, um dígito"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Tem de incluir, pelo menos, 1 caráter que não seja um número.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"O admin. do disp. não permite a utilização de uma palavra-passe recente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"As palavras-passe comuns estão bloqueadas pelo seu gestor de TI. Experimente outra palavra-passe."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Não é permitida uma sequência de dígitos ascendente, descendente ou repetida"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ativar Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utilizar o Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Utilizar o Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Definições de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurar e gerir pontos de acesso sem fios"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centre o código QR abaixo para estabelecer ligação a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Estabeleça ligação ao Wi-Fi ao ler um código QR."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Partilhar Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Leia este código QR para se ligar a \"<xliff:g id="SSID">%1$s</xliff:g>\" e partilhar a palavra-passe"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Leia este código QR com outro dispositivo para estabelecer ligação a “<xliff:g id="SSID">%1$s</xliff:g>”."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Leia este código QR para se ligar a \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Tente novamente. Se o problema persistir, contacte o fabricante do dispositivo."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Ocorreu um erro."</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Palavra-passe de Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Palavra-passe da zona Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Ligação automática"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permitir que o telemóvel estabeleça ligação automaticamente quando estiver perto desta rede"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permitir que o tablet estabeleça ligação automaticamente quando estiver perto desta rede"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permita a ligação a esta rede quando estiver ao alcance."</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Adicionar dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Utilize um código QR para adicionar um dispositivo a esta rede"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"O código QR não é um formato válido."</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Utilizar certificados do sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Não fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Não validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nenhum certificado especificado. A sua ligação não será privada."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"O nome da rede é demasiado longo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"É necessário especificar um domínio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificado obrigatório."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Ligar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ativado"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Ligado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"A ligar a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"A ligar…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Não foi possível estabelecer ligação à rede"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"A rede não está ao alcance"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Endereço MAC do dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Endereço MAC aleatório"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Endereço MAC aleatório (última utilização)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Endereço IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalhes da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de sub-rede"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Endereços IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Redes guardadas"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Subscrições"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Outras redes"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Definições de IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"As definições avançadas de Wi-Fi não estão disponíveis para este utilizador"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Guardar"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Introduza um endereço de gateway válido."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Introduza um endereço DNS válido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Introduza um prefixo de rede com 0-32 caracteres."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (exceto se substituído por DNS privado)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (exceto se substituído por DNS privado)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Compr. do prefixo de rede"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"A aplicação está a partilhar conteúdo. Para partilhar a ligação à Internet, desative e volte a ativar a zona Wi-Fi."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nenhuma palavra-passe definida."</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nome da zona Wi-Fi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"A ativar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"A ativar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Podem ser ligados outros dispositivos a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Palavra-passe da zona Wi-Fi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda do PA"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automaticamente a taxa de atualização de 60 para 90 Hz para algum conteúdo. Aumenta a utilização da bateria."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forçar taxa de atualização de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"A taxa de atualização mais elevada para uma capacidade de resposta tátil e uma qualidade de animação melhoradas. Aumenta a utilização da bateria."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atenção ao ecrã"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ativada/O ecrã não se desliga se estiver a olhar para o mesmo"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Quando o ecrã está escuro, acende-se se surgirem novas notificações"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Mostrar sempre hora e informações"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Maior utilização da bateria"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Texto em negrito"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamanho do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Aumentar ou diminuir o texto"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Bloqueio do cartão SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versão do Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Atualização de segurança do Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo e hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versão do hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID do Equipamento"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Eliminar APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Novo APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Guardar"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Rejeitar"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Cancelar"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"O campo Nome não pode estar vazio."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"O APN não pode estar vazio."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"É possível repor as apps."</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Repor Wi-Fi, dados e Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Esta ação repõe todas as definições de rede, incluindo:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dados móveis"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Apagar"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Apagar SIMs transferidos"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Para transferir SIMs de substituição, contacte o seu operador. Esta ação não cancela qualquer plano de serviços móveis."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Esta ação não cancela qualquer plano de serviços móveis. Para transferir SIMs de substituição, contacte o seu operador."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Repor definições"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Pretende repor todas as definições de rede? Não é possível anular esta ação."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Pretende repor todas as definições de rede e apagar os SIMs transferidos? Não é possível anular esta ação."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"As definições de rede foram repostas"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Não é possível apagar os SIMs"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Não é possível apagar os SIMs transferidos devido a um erro.\n\nReinicie o dispositivo e tente novamente."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Apagar todos os dados (reposição de dados de fábrica)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Apagar todos os dados (repor)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Serão apagados todos os dados da "<b>"memória de armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Serão apagados todos os dados do "<b>"armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A Conta Google"</li>\n<li>"Dados e definições do sistema e da aplicação"</li>\n<li>"Aplicações transferidas"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Actualmente, tem sessão iniciada nas seguintes contas:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Existem outros utilizadores presentes neste dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do utilizador"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Esta ação não cancela o seu plano de serviços móveis."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para limpar músicas, imagens e outros dados do utilizador, é necessário apagar a "<b>"memória de armazenamento USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para limpar também músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Apagar todos os dados (repor)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Apagar todos os dados (repor)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Esta ação vai apagar todos os dados da "<b>"memória de armazenamento interno"</b>" do tablet, incluindo:\n\n"<li>"A sua Conta Google"</li>\n<li>"Dados e definições do sistema e de apps"</li>\n<li>"Apps transferidas"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Esta ação vai apagar todos os dados da "<b>"memória de armazenamento interno"</b>" do telemóvel, incluindo:\n\n"<li>"A sua Conta Google"</li>\n<li>"Dados e definições do sistema e de apps"</li>\n<li>"Apps transferidas"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Atualmente, tem sessão iniciada nas seguintes contas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Existem outros utilizadores presentes neste dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Música"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do utilizador"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Esta ação não cancela o seu plano de serviços móveis."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para limpar músicas, imagens e outros dados do utilizador, é necessário apagar a "<b>"memória USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para limpar músicas, imagens e outros dados do utilizador, é necessário apagar o "<b>"cartão SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Apagar armazenamento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Apagar cartão SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Apagar todos os dados da memória de armazenamento USB interna, como músicas ou fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Apagar todos os dados do cartão SD, como músicas ou fotos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Apagar todos os dados"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Apagar todos os dados"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Serão eliminadas todas as informações pessoais e as aplicações transferidas. Não é possível anular esta ação."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Todas as suas informações pessoais, incluindo aplicações e SIMs transferidos, serão eliminadas. Não é possível anular esta ação."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Apagar tudo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Não foi efetuada nenhuma reposição porque o serviço System Clear não está disponível."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Apagar todos os dados?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"A reposição de fábrica não está disponível para este utilizador"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"A apagar"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Aguarde..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Apagar todos os dados"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Apagar todos os dados"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Serão eliminadas todas as informações pessoais e apps transferidas. Não é possível anular esta ação."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Todas as suas informações pessoais, incluindo apps e SIMs transferidos, serão eliminadas. Não é possível anular esta ação."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Pretende apagar todos os dados?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"A reposição de fábrica não está disponível para este utilizador."</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"A apagar…"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Aguarde…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Definições de chamadas"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configurar correio de voz, encaminhamento de chamadas, chamada em espera, ID do autor da chamada"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Ligação USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Não é possível ligar mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> aparelhos."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será desligado."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ligação Ethernet via telemóvel"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Partilhar a ligação à Internet do telemóvel através de Ethernet USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Partilhar a ligação à Internet do telemóvel através de Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Utilize uma zona Wi-Fi e uma ligação via telemóvel para disponibilizar Internet a outros dispositivos através da sua ligação móvel de dados. As aplicações podem igualmente criar uma zona Wi-Fi para partilhar conteúdo com dispositivos próximos."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Utilize uma zona Wi-Fi e uma ligação (à Internet) via telemóvel para disponibilizar Internet a outros dispositivos através de Wi-Fi ou da sua ligação móvel de dados. As apps também podem criar uma zona Wi-Fi para partilhar conteúdo com dispositivos próximos."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ajuda"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Procurar por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permita que as aplicações e os serviços procurem dispositivos próximos em qualquer altura, mesmo quando o Bluetooth estiver desativado. Isto pode ser utilizado, por exemplo, para melhorar as funcionalidades e os serviços baseados na localização."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Deteção do fuso horário da localização"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Deteção do fuso horário da localização"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite a utilização da localização do dispositivo para detetar o fuso horário atual. Outras definições de localização, como a procura de Wi-Fi, podem afetar a precisão da deteção do fuso horário."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Ativada."</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desativada."</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"A deteção automática do fuso horário está desativada."</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"A deteção do fuso horário da localização está desativada."</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"A deteção do fuso horário da localização não é suportada."</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Não são permitidas alterações à deteção do fuso horário da localização."</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi e localização de rede de telemóvel"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Permitir que app usem o serv. localiz. Google p/ calcular mais rapida/ a sua localização. Dados localização recolhidos e enviados à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Localização determinada por Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Defina pal.-pas. p/ Desbl. através Rosto"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Defina padrão p/ utilizar Desbl. Rosto"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Defina PIN para utilizar Desbloq. Rosto"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Defina a palavra-passe"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Defina o padrão"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Defina o PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Esqueceu-se da sua palavra-passe?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Esqueceu-se do seu padrão?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Esqueceu-se do seu PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferências de legendas"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliação"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliação"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ativar ampliação"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Escolha a(s) área(s) de ampliação que pretende utilizar ao ampliar o ecrã."</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Ecrã inteiro"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte do ecrã"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Ecrã inteiro e parte do ecrã"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar o ecrã inteiro"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte do ecrã"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Pretende mudar para o botão Acessibilidade?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Utilizar a ação de tocar três vezes para ampliar parte do ecrã fará com que a escrita e outras ações fiquem mais lentas.\n\nPretende passar a utilizar o botão Acessibilidade para ampliar?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Mudar para o botão Acessibilidade"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Manter a ação de tocar três vezes para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Definições de ampliação"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar com três toques"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Amplie com um atalho"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Botão de ligar termina chamada"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Ponteiro do rato grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remover animações"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Áudio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combine canais ao reproduzir áudio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Equilíbrio de áudio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Esquerda"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Direita"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Áudio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combine canais ao reproduzir áudio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Equilíbrio de áudio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Lado esquerdo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Lado direito"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predefinição"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibração de notificações"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibração do toque"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Respostas por toque"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Utilizar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abra a app <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Utilizar a correção da cor"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar legendas"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Apenas para a app suportada."</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Utilizar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Utilizar a correção da cor"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar legendas"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Apenas para a app suportada."</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tamanho e estilo das legendas"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamanho do texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Mais opções"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de cinzentos"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restrição de execução em segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permitir que a aplicação seja executada em segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"A aplicação não tem autorização para ser executada em segundo plano"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"A utilização em segundo plano não pode ser restringida."</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"A utilização em segundo plano não pode ser restringida."</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Pretende limitar a atividade em segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se limitar a atividade em segundo plano de uma aplicação, esta pode apresentar um comportamento anormal."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"A app não está def. p/ otimizar a bateria, não a pode restringir.\n\nP/ restringir a app, ative a otimiz. da bateria."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet utilizado mais do que o habitual"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Dispositivo utilizado mais do que o habitual"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Pode ficar sem bateria mais cedo do que o habitual."</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"A otimizar o estado da bateria"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Bateria limitada temporariamente. Toque para saber mais."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"O seu telemóvel tem sido utilizado com mais frequência do que o habitual. A bateria pode esgotar-se mais cedo do que o esperado.\n\nPrincipais aplicações por utilização da bateria:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"O seu tablet tem sido utilizado com mais frequência do que o habitual. A bateria pode esgotar-se mais cedo do que o esperado.\n\nPrincipais aplicações por utilização da bateria:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"O seu dispositivo tem sido utilizado com mais frequência do que o habitual. A bateria pode esgotar-se mais cedo do que o esperado.\n\nPrincipais aplicações por utilização da bateria:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d aplicação restrita</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small><font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Ocorreu um problema ao ler o medidor da bateria."</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Ocorreu um problema ao ler o medidor da bateria. Toque para "<annotation id="url">"saber mais"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Parar a aplicação?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Definir um horário"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolongue a autonomia da bateria"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desativar após o carregamento"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"A Poupança de bateria é desativada quando o telemóvel estiver com <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"A Poupança de bateria é desativada quando o tablet estiver com <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"A Poupança de bateria é desativada quando o dispositivo estiver com <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"A Poupança de bateria é desativada quando o telemóvel estiver com mais de <xliff:g id="PERCENT">%1$s</xliff:g> de bateria."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"A Poupança de bateria é desativada quando o tablet estiver com mais de <xliff:g id="PERCENT">%1$s</xliff:g> de bateria."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"A Poupança de bateria é desativada quando o dispositivo estiver com mais de <xliff:g id="PERCENT">%1$s</xliff:g> de bateria."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ativar"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Repor"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproduzir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conetividade adaptável"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Prolonga a autonomia da bateria e melhora o desempenho do dispositivo ao gerir as suas ligações de rede automaticamente."</string>
     <string name="credentials_title" msgid="7535942196886123656">"Armazenamento de credenciais"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalar um certificado"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalar certificados a partir do armazenamento"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais de utilizador"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar credenciais de utilizador"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avançadas"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Suportado por hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Apenas software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este utilizador"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e aplicações"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Não instalar"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instalar mesmo assim"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificado não instalado."</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Pretende permitir que a app <xliff:g id="APP_NAME">%s</xliff:g> instale certificados neste dispositivo?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Estes certificados vão validar a sua identidade juntos das apps e URLs abaixo"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Não permitir"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Permitir"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Mostrar mais"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App de gestão de certificados"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Nenhuma"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Os certificados instalados por esta app fazem a sua identificação juntos dos seguintes URLs e apps"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Remover"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Sinal para marcação de emergência"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Definir o comportamento quando é efetuada uma chamada de emergência"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Cópia de segurança"</string>
@@ -2985,12 +3030,12 @@
       <item quantity="one">Confiar ou remover o certificado</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="2788832560436163252">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o gestor.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o gestor.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação no seu dispositivo que podem permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca destes certificados, contacte o gestor.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação no seu dispositivo que pode permitir monitorizar a atividade na rede do dispositivo, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca deste certificado, contacte o gestor.</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="3989916958347169622">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca destes certificados, contacte o gestor.</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara obter mais informações acerca deste certificado, contacte o gestor.</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> instalou autoridades de certificação para o seu perfil de trabalho que podem permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca destes certificados, contacte o gestor.</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> instalou uma autoridade de certificação para o seu perfil de trabalho que pode permitir monitorizar a atividade na rede de trabalho, incluindo emails, aplicações e Websites seguros.\n\nPara mais informações acerca deste certificado, contacte o gestor.</item>
     </plurals>
     <string name="ssl_ca_cert_warning_message" msgid="4374052724815563051">"A sua atividade de rede, incluindo emails, aplicações e Sites seguros, pode ser monitorizada por terceiros.\n\nIsto é possível através de uma credencial fidedigna instalada no seu dispositivo."</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="125941406175485894">
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Não configurado – Perfil de trabalho"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"O utilizador (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudónimo"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"É possível adicionar até <xliff:g id="USER_COUNT">%1$d</xliff:g> utilizadores"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"A gestão dos utilizadores só pode ser feita pelo proprietário do tablet."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"A gestão dos utilizadores só pode ser feita pelo proprietário do telemóvel."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Como pagar num terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configure uma aplicação de pagamento. Em seguida, basta aproximar a parte de trás do telemóvel a um terminal com o símbolo de pagamento sem contacto."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mais..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mais…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Predefina a app de pagamento"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Atualize a app de pagamento predefinida"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Num terminal sem contacto, pague com a app <xliff:g id="APP">%1$s</xliff:g>."</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Anterior"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Seguinte"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Terminar"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tirar uma foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Escolher uma imagem"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Selecionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Cartões SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Cartões SIM"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Utilizar sempre este para chamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecionar um SIM para dados"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecione um SIM para SMS."</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"A mudar o SIM de dados. Esta ação pode demorar, no máximo, 1 minuto..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"A mudar o SIM de dados. Esta ação pode demorar, no máximo, 1 minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Telefonar com"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selecionar um cartão SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rotina, horário, poupança de bateria, poupança de energia, bateria, automática, percentagem"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, chamadas avançadas, chamadas 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"adicionar idioma, adicionar um idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamanho do texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Som predefinido"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume de notificação e de toque a <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibração, Não incomodar"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ativar sons"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Legendas instantâneas"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Multimédia com legendas automáticas"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nenhum"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horários definidos</item>
-      <item quantity="one">1 horário definido</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhum}=1{1 horário definido}other{# horários definidos}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Não incomodar"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Receber notificações apenas de pessoas e apps importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limite as interrupções"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Apenas prioridade"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Ativado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desativado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desativado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ativado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Perguntar sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Até desativar"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-      <item quantity="one">1 hora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> horários podem ser ativados automaticamente</item>
-      <item quantity="one">1 horário pode ser ativado automaticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desativado}=1{Desativado/1 horário pode ser ativado automaticamente}other{Desativado/# horários podem ser ativados automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"O que pode interromper o modo Não incomodar"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Pessoas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Defina automaticamente as notificações de prioridade mais baixa como discretas."</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classificação das notificações adaptável"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classifique as notificações por relevância automaticamente."</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback sobre as notificações adaptáveis"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicar ajustes efetuados às notificações e mostrar a opção para fornecer feedback ao sistema"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Repor a importância das notificações"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Reponha as definições de importância alteradas pelo utilizador e permita que o assistente de notificações defina prioridades."</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respostas e ações sugeridas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"São apresentadas automaticamente respostas e ações sugeridas."</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Apresentar notificações recentes e suspensas"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Conversas com prioridade"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Aparecem na parte superior da secção de conversas e surgem como balões flutuantes."</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Aparecer na parte superior da secção de conversas."</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Outras conversas"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Conversas não prioritárias"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversas às quais efetuou alterações."</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Conversas recentes"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Limpar recentes"</string>
+    <string name="clear" msgid="5092178335409471100">"Limpar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Apresentar conversas com prioridade como balão"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"As conversas com prioridade são apresentadas na parte superior do painel pendente. Também pode defini-las como balões e para interromperem o modo Não incomodar."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"As conversas com prioridade e modificadas são apresentadas aqui"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acesso Não incomodar"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir o modo Não incomodar"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nenhuma app instalada solicitou acesso Não incomodar"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"A carregar aplicações..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"A carregar apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"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="6202042207121633488">"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="9096417708500595424">"A seu pedido, o Android está a bloquear a apresentação deste grupo de notificações neste dispositivo."</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas as conversas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversas com prioridade"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nenhuma"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversas</item>
-      <item quantity="one">1 conversa</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nenhuma"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhuma}=1{1 conversa}other{# conversas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quem pode interromper"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chamadas"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para garantir que as chamadas permitidas emitem som, verifique se o dispositivo está definido para tocar."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"As chamadas recebidas são bloqueadas no horário \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Pode ajustar as definições para permitir que os seus amigos, a sua família ou outras pessoas o contactem."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contactos com estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Mais <xliff:g id="NUM_PEOPLE">%d</xliff:g> pessoas</item>
-      <item quantity="one">Mais 1 pessoa</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nenhum"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nenhum}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}other{{contact_1}, {contact_2} e mais #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sem nome)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensagens"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensagens"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensagens"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Para \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as mensagens recebidas estão bloqueadas. Pode ajustar as definições para permitir que os seus amigos, família ou outras pessoas o contactem."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Recebe todas as mensagens"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Recebe todas as chamadas"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nenhum"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contactos</item>
-      <item quantity="one">1 contacto</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nenhum}=1{1 contacto}other{# contactos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contactos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contactos marcados com estrela"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"As pessoas selecionadas podem continuar a entrar em contacto consigo, mesmo que não permita que as apps interrompam."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">As apps <xliff:g id="APP_NAMES">%s</xliff:g> podem interromper.</item>
-      <item quantity="one">A app <xliff:g id="APP_NAME_0">%s</xliff:g> pode interromper.</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Mais <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nenhuma app pode interromper}=1{A app {app_1} pode interromper}=2{As apps {app_1} e {app_2} podem interromper}=3{As apps {app_1}, {app_2} e {app_3} podem interromper}other{As apps {app_1}, {app_2} e mais # podem interromper}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificações que podem interromper"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas as notificações"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">Os sons <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> podem interromper.</item>
-      <item quantity="one">O som de <xliff:g id="SOUND_CATEGORY">%s</xliff:g> pode interromper.</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada pode interromper."</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Mais <xliff:g id="NUMBER">%d</xliff:g>."</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper}=1{O som de {sound_category_1} pode interromper}=2{Os sons de {sound_category_1} e {sound_category_2} podem interromper}=3{Os sons de {sound_category_1}, {sound_category_2} e {sound_category_3} podem interromper}other{Os sons de {sound_category_1}, {sound_category_2} e mais # podem interromper}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguém pode interromper"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algumas pessoas podem interromper"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Todas as pessoas podem interromper"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Ativado"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Desativado"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Fixação de apps"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"A afixação de apps permite-lhe manter a app atual visível até a soltar. Esta funcionalidade pode ser utilizada, por exemplo, para permitir que um amigo fidedigno jogue um jogo específico. \n\nQuando uma app está afixada, a mesma poderá abrir outras apps e os dados pessoais poderão ficar acessíveis. \n\nPara utilizar a afixação de apps: 	\n1.	Ative a afixação de apps 	\n2.	Abra a Vista geral 	\n3.	Toque no ícone da app na parte superior do ecrã e, em seguida, toque em Afixar."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"A afixação de apps permite-lhe manter a app atual visível até a soltar. Esta funcionalidade pode ser utilizada, por exemplo, para permitir que um amigo fidedigno jogue um jogo específico. \n\nQuando uma app está afixada, a mesma poderá abrir outras apps e os dados pessoais poderão ficar acessíveis. \n\nSe pretender partilhar o seu dispositivo com alguém de forma segura, opte por um utilizador convidado como alternativa. \n\nPara utilizar a afixação de apps: 	\n1.	Ative a afixação de apps 	\n2.	Abra a Vista geral 	\n3.	Toque no ícone da app na parte superior do ecrã e, em seguida, toque em Afixar."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"A fixação de apps permite-lhe manter a app atual visível até a soltar. Esta funcionalidade pode ser utilizada, por exemplo, para permitir que um amigo fidedigno jogue um jogo específico."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Quando uma app está fixada, a mesma pode abrir outras apps e os dados pessoais podem ficar acessíveis. \n\nPara utilizar a fixação de apps: 	\n1.	Ative a fixação de apps. 	\n2.	Abra a Vista geral. 	\n3.	Toque no ícone da app na parte superior do ecrã e, em seguida, toque em Fixar."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Quando uma app está fixada, a mesma pode abrir outras apps e os dados pessoais podem ficar acessíveis. \n\nSe pretender partilhar o seu dispositivo com alguém de forma segura, opte por um utilizador convidado como alternativa. \n\nPara utilizar a fixação de apps: 	\n1.	Ative a fixação de apps. 	\n2.	Abra a Vista geral. 	\n3.	Toque no ícone da app na parte superior do ecrã e, em seguida, toque em Fixar."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Quando uma app está afixada: \n\n•		Os dados pessoais poderão ficar acessíveis \n		(como contactos e conteúdo do email) \n•		A app afixada poderá abrir outras apps \n\nUtilize a afixação de apps apenas com pessoas em quem confia."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Pedir padrão de desbloqueio antes de soltar"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Pedir PIN antes de soltar"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Além de utilizar o seu rosto para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar o seu PIN antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou de roubo. Pretende que o PIN seja solicitado para o arranque do dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Além de utilizar o seu rosto para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar o seu padrão antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou de roubo. Pretende que o padrão seja solicitado para o arranque do dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Além de utilizar o seu rosto para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar a sua palavra-passe antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou de roubo. Pretende que a palavra-passe seja solicitada para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Além de utilizar a sua biometria para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar o seu PIN antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou roubo. Pretende que o PIN seja solicitado para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Para além de utilizar a sua biometria para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar o seu padrão antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou roubo. Pretende que o padrão seja solicitado para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Além de utilizar a sua biometria para desbloquear o dispositivo, pode protegê-lo ainda mais ao solicitar a sua palavra-passe antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados do dispositivo em caso de perda ou roubo. Pretende que a palavra-passe seja solicitada para o arranque do dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sim"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Não"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restrita"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo ligado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"A mudar..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"A mudar…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Não foi possível mudar."</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"A carregar o dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Carregar o dispositivo ligado"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Utilização de dados móveis"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Utilização de dados da aplicação"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Uso de dados Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Utilização de dados sem operador móvel"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Utilização de dados de Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 restrição</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"A contagem de dados do operador pode ser diferente da contagem do dispositivo"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Exclui os dados utilizados por redes de operadores."</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> utilizado(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir aviso de dados"</string>
     <string name="data_warning" msgid="2925054658166062884">"Aviso de dados"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalhes"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Poupança de dados"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dados sem restrições"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Os dados de segundo plano estão desativados"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Os dados de segundo plano estão desativados"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Ativada"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desativada"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Utilizar Poupança de dados"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Se o dispositivo estiver bloqueado, impedir a introdução de respostas ou de outro texto nas notificações"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corretor ortográfico predefinido"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Escolher corretor ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utilizar o corretor ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Utilize o corretor ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Não selecionado"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nenhum)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Remover fotos e vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gestor de armazenamento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utilizar o Gestor de armazenamento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Utilizar o gestor de armazenamento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Libertar espaço agora"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tocar duas vezes para verificar o telemóvel"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tocar duas vezes para verificar o tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tocar duas vezes para verificar o dispositivo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Deslize para notificações"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Deslize para baixo na parte inferior do ecrã para ver as notificações."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo para uma mão"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Utilizar o modo para uma mão"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Sair ao mudar de app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Limite de tempo"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"acessibilidade"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para consultar a hora, as notificações e outras informações, toque duas vezes no ecrã."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar para verificar o telemóvel"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levantar para verificar o tablet"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Toque para verificar o tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Toque para verificar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para consultar a hora, as notificações e outras informações, toque no ecrã."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS de emergência"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Utilizar SOS de emergência"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gerido por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Inicie as ações abaixo ao premir o botão ligar/desligar rapidamente 5 vezes ou mais."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Reproduza o alarme de contagem decrescente"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Reproduza um som alto antes de pedir ajuda."</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Ligue para obter ajuda"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Número a ligar para obter ajuda"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Toque para alterar."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Se introduzir um número que não é de emergência:\n • O dispositivo tem de estar desbloqueado para utilizar o SOS de emergência.\n • A sua chamada pode não ser atendida."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Utilizar impressão digital para ver as notificações"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usar impressão digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para verificar as suas notificações, deslize rapidamente para baixo no sensor de impressões digitais situado na parte posterior do telemóvel."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Número máx. de conjuntos de dados visíveis"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Repor os valores predefinidos"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"As opções de preenchimento automático do programador foram repostas."</string>
+    <string name="location_category" msgid="3496759112306219062">"Localização"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicador da localização da barra de estado"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Apresente para todas as localizações, incluindo a rede e a conetividade."</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forçar medições de GNSS completas"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Monitorizar todas as constelações e frequências de GNSS sem ciclos"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema do dispositivo"</string>
     <string name="default_theme" msgid="4815428567082263639">"Predefinição"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nome da rede"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Coloque as notificações em pausa para se manter concentrado."</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funcionalidade não disponível."</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Esta funcionalidade foi desativada porque torna o seu telemóvel lento."</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forçar medições de GNSS completas"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Monitorizar todas as constelações e frequências de GNSS sem ciclos"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Mostrar sempre a caixa de diálogo de falhas"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Mostrar a caixa de diálogo sempre que uma aplicação falhar"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Selecionar aplicação compatível com o ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ative para todas as apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecione a placa gráfica"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predefinição"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Controlador de jogos"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Controlador de jogos"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Placa gráfica para programadores"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Controlador da placa gráfica do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Ativar (desativar som)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Desativar"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detalhes da rede"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"O nome do seu dispositivo é visível para as aplicações do telemóvel. Também pode ser visto por outras pessoas quando se liga a dispositivos Bluetooth ou configura uma zona Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"O nome do seu dispositivo é visível para as apps do telemóvel. Também pode ser visto por outras pessoas quando se liga a dispositivos Bluetooth ou a uma rede Wi-Fi, assim como quando configura uma zona Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Dispositivos"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Todas as definições"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Sugestões"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Não foi possível encontrar qualquer rede. Tente novamente."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(proibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nenhum cartão SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nenhum cartão SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nenhum"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Requer o SIM para estabelecer ligação"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Requer o SIM do operador <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> para estabelecer ligação"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modo de rede preferido: apenas WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modo de rede preferido: apenas GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modo de rede preferido: apenas WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dados móveis"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Aceder aos dados através de rede móvel"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O telemóvel irá mudar automaticamente para este operador quando estiver ao alcance."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nenhum cartão SIM disponível."</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferência de chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferência de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Perguntar sempre"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando ligado a <xliff:g id="CARRIER">%1$s</xliff:g>."</string>
     <string name="see_more" msgid="7499355691042812723">"Ver mais"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Pretende ativar o operador <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Pretende ativar o SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Pretende mudar para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Pretende mudar para a utilização do cartão SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Só pode ter um SIM ativo de cada vez.\n\nMudar para o operador <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancela o seu serviço no operador <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Só pode ter um SIM transferido ativo de cada vez.\n\nMudar para o operador <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancela o seu serviço no operador <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Só pode ter um SIM ativo de cada vez.\n\nMudar não cancela o seu serviço no operador <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Mudar para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"A estabelecer ligação à rede…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"A mudar para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>…"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Não é possível mudar de operador"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Não é possível mudar de operador devido a um erro."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Pretende desativar o operador <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Pretende desativar o SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"A desativar o SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Não é possível desativar o operador"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Ocorreu um erro e não foi possível desativar o operador."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Pretende utilizar 2 SIMs?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo pode ter 2 SIMs ativos em simultâneo. Para continuar a utilizar 1 SIM de cada vez, toque em \"Não, obrigado\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Pretende reiniciar o dispositivo?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Para começar, reinicie o dispositivo. Em seguida, pode adicionar outro SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Não, obrigado"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Mudar"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Não é possível ativar o SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o SIM e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Experimente ativar o SIM novamente. Se o problema continuar, reinicie o dispositivo."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ativação da rede"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"O operador <xliff:g id="CARRIER_NAME">%1$s</xliff:g> está ativo"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toque para atualizar as definições do SIM."</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Cartão SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Pretende apagar este SIM transferido?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Se apagar este SIM, o serviço do operador <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> será removido deste dispositivo.\n\nO serviço do operador <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> não é cancelado."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Apagar"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"A apagar SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Não é possível apagar o SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Não é possível apagar este SIM devido a um erro.\n\nReinicie o dispositivo e tente novamente."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Estabeleça ligação ao dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"A app <xliff:g id="APPNAME">%1$s</xliff:g> pretende utilizar uma rede Wi-Fi temporária para estabelecer ligação ao seu dispositivo."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nenhum dispositivo encontrado. Certifique-se de que os dispositivos estão ativados e disponíveis para ligação."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Chamadas de emergência"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"As chamadas de emergência através da funcionalidade Chamadas Wi-Fi não são suportadas pelo seu operador.\nO dispositivo muda automaticamente para uma rede móvel para efetuar uma chamada de emergência.\nApenas é possível efetuar chamadas de emergência em áreas com cobertura de rede."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Utilize o Wi‑Fi nas chamadas para melhorar a qualidade."</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Chamadas com vários cartões SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Permita outras chamadas e SMS do SIM através deste SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"chamadas com vários cartões sim"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Mensagem MMS recebida"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Não é possível enviar a mensagem MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Toque para permitir mensagens MMS no operador <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> quando os dados móveis estão desativados."</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir sobreposições de ecrãs nas Definições"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permita que as apps que se podem sobrepor a outras apps se sobreponham a ecrãs de Definições."</string>
     <string name="media_controls_title" msgid="403271085636252597">"Multimédia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Oculte o leitor quando sessão multimédia terminar"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"O leitor permite-lhe retomar uma sessão a partir do painel Definições rápidas expandido."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Leitor de Multimédia nas Definições rápidas"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostre o Leitor de Multimédia por um período alargado para retomar facilmente a reprodução"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar leitor"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar leitor"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nenhum leitor disponível."</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Apps permitidas"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"multimédia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"O Bluetooth será ativado"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Ligado"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desligado"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para aviões"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Procure e ligue-se a redes seguras para aviões."</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, seguro para aviões"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamadas Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Fazer e receber chamadas através de redes sem operador móvel como as redes Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"As Chamadas Wi-Fi permitem-lhe fazer e receber chamadas através de redes sem operador móvel, tais como algumas redes Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferidas"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"chamadas preferidas"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"mensagens SMS preferidas"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponíveis"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"sem cartão SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ligar a redes públicas"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ligação de rede, internet, sem fios, dados, wifi, wi-fi, wi fi, telemóvel, dispositivo móvel, operador de telemóvel, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver as redes seguras para aviões"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desativar o modo de avião"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Não disponível porque o modo de hora de dormir está ativado."</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Reposição da importância das notificações concluída."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Um dispositivo não fidedigno pretende aceder às suas mensagens. Toque para obter detalhes."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Pretende permitir o acesso às mensagens?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Um dispositivo Bluetooth não fidedigno, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], pretende aceder às suas mensagens.\n\nNão estabeleceu ligação ao dispositivo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] anteriormente."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Um dispositivo não fidedigno pretende aceder aos seus contactos e registo de chamadas. Toque para obter detalhes."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Pretende permitir o acesso aos contactos e registo de chamadas?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Um dispositivo Bluetooth não fidedigno, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], pretende aceder aos seus contactos e registo de chamadas. Isto inclui dados acerca de chamadas recebidas e efetuadas.\n\nNão estabeleceu ligação ao dispositivo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] anteriormente."</string>
 </resources>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 389a7d8..3881d46 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Médio"</item>
     <item msgid="6740026006576843477">"Longo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Curto"</item>
+    <item msgid="7397961711906421599">"Médio"</item>
+    <item msgid="4079132024502041928">"Longo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Padrão"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Somente TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 779b5ef..0721848 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Data e hora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Configurar data e hora"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Definir data, hora, fuso horário e formatos"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Usar horário fornecido pela rede"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Usar fuso horário fornecido pela rede"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Definir hora automaticamente"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Definir fuso horário automaticamente"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Usar o padrão do local"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Formato de 24 horas"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Formato de 24 horas"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Mostrar informações do perfil na tela de bloqueio"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Contas"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Localização"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Usar local"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Usar local"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Configuração desativada"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Ativado: <xliff:g id="COUNT_1">%1$d</xliff:g> app tem acesso à localização</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Bloqueio de tela, desbloqueio facial"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Bloqueio de tela, impressão digital"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Bloqueio de tela"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Desbloqueie o smartphone com seu rosto ou impressão digital"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Você também pode fazer login em apps e confirmar pagamentos"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurar o desbloqueio com:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Desbloqueio facial"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Facilite o desbloqueio do smartphone"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Impressão digital"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Desbloqueie o smartphone no seu bolso"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Pular"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Próxima"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Rosto adicionado"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurar desbloqueio facial"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Desbloqueio facial"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Usar seu rosto para autenticar"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Iniciar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Se o desbloqueio facial de acessibilidade estiver desativado, algumas etapas da configuração poderão não funcionar com o TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Voltar"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuar config."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Usar config. de Acessibilidade"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Sempre exigir etapa de confirmação ao usar desbloqueio facial em apps"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Excluir dados faciais"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurar desbloqueio facial"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone pode desbloqueá-lo mesmo que essa não seja sua intenção.\n\nO smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto.\n\nO smartphone pode ser desbloqueado por alguém que se pareça muito com você, por exemplo, um gêmeo idêntico."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos.\n\nObservações importantes:\nOlhar para o smartphone poderá desbloqueá-lo mesmo que essa não seja sua intenção.\n\nSeu smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto, mesmo com seus olhos fechados.\n\nPode acontecer de o smartphone ser desbloqueado por alguém que se pareça muito com você, por exemplo, um gêmeo idêntico."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Use o desbloqueio facial para desbloquear o dispositivo, fazer login em apps e confirmar pagamentos."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Lembre-se:\nOlhar para o smartphone pode desbloqueá-lo acidentalmente.\n\nO smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto.\n\nO smartphone poderá ser desbloqueado por uma pessoa muito parecida com você, como um irmão gêmeo."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Lembre-se:\nOlhar para o smartphone pode desbloqueá-lo acidentalmente.\n\nO smartphone poderá ser desbloqueado por outra pessoa se for direcionado para seu rosto mesmo de olhos fechados.\n\nO smartphone poderá ser desbloqueado por uma pessoa muito parecida com você, como um irmão gêmeo."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Excluir dados faciais?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Os dados faciais usados pelo desbloqueio facial serão excluídos permanentemente e de maneira segura. Depois da remoção, você precisará do PIN, padrão ou senha para desbloquear o smartphone, fazer login em apps e confirmar pagamentos."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Use o desbloqueio facial para acessar o smartphone"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nNota: não é possível usar sua impressão digital para desbloquear este dispositivo. Para mais informações, entre em contato com o administrador da organização."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Use sua impressão digital para desbloquear o smartphone ou aprovar compras.\n\nObservação: usar um padrão ou um PIN forte pode ser mais seguro que sua impressão digital."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Cancelar"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Agora não"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Pular"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Próxima"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Proteger seu tablet com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Proteger seu dispositivo com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Proteger seu smartphone com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. A opção de bloqueio de tela também é necessária para configurar o desbloqueio facial. Para voltar, toque em \"Cancelar\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Proteger seu tablet com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Proteger seu dispositivo com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Proteger seu smartphone com uma opção de bloqueio de tela evita que alguém o utilize caso seja perdido ou roubado. Essa opção também é necessária para configurar a biometria. Para voltar, toque em \"Cancelar\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Pular configuração do PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Pular configuração de senha?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Pular configuração de padrão?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Para impedir que outras pessoas usem este tablet sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Para impedir que outras pessoas usem este dispositivo sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Para impedir que outras pessoas usem este smartphone sem sua autorização, ative os recursos de proteção de dispositivo. Escolha o bloqueio de tela que você quer usar."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Escolha seu método de bloqueio de tela alternativo"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Escolha seu método de bloqueio de tela alternativo"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Escolha seu método de bloqueio de tela alternativo"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opções de bloqueio de tela"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opções de bloqueio de tela"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Bloqueio de tela"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Desbloqueio facial + senha"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuar sem desbloqueio facial"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"É possível desbloquear seu smartphone usando seu rosto. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria + Padrão"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria + Senha"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuar sem a biometria"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"É possível desbloquear o smartphone usando a biometria. Por motivos de segurança, essa opção exige um bloqueio de tela alternativo."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Desativada pelo admin, política de criptografia ou armazenamento de credenciais"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Nenhuma"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Deslizar"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">Precisa ter menos de <xliff:g id="NUMBER_1">%d</xliff:g> dígitos</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"O administrador do dispositivo não permite o uso de um PIN recente"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"PINs comuns foram bloqueados pelo seu administrador de TI. Tente um PIN diferente."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Não pode incluir um caractere inválido"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Deve conter pelo menos uma letra"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Deve conter pelo menos um dígito"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">Precisa ter pelo menos <xliff:g id="COUNT">%d</xliff:g> caracteres não numéricos</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"O administrador do dispositivo não permite usar uma senha recente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Senhas comuns foram bloqueadas pelo seu administrador de TI. Tente uma senha diferente."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Não é permitido usar uma sequência de dígitos em ordem crescente, decrescente ou repetidos"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmar"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Cancelar"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Ativar o Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Usar Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Usar Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Configurações de Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurar e gerenciar pontos de acesso sem fio"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centralize o código QR abaixo para conectar a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Para entrar na rede Wi-Fi, faça a leitura de um código QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Compartilhar Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>” e compartilhar a senha"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Faça a leitura deste código QR com outro dispositivo para entrar na rede “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Faça a leitura deste código QR para conectar-se a “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Tente novamente. Se o problema persistir, entre em contato com o fabricante do dispositivo"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Algo deu errado"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Senha do Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Senha do ponto de acesso: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conexão automática"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permitir que o smartphone conecte automaticamente a essa rede quando estiver perto dela"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permita que o tablet se conecte automaticamente quando estiver perto dessa rede"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permitir conexão com esta rede quando ela estiver ao alcance"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Adicionar dispositivo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Use um código QR para adicionar um dispositivo a esta rede"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"O código QR não está em um formato válido"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Usar certificados do sistema"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Não fornecer"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Não validar"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nenhum certificado especificado. Sua conexão não será particular."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"O nome da rede é muito longo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"É necessário especificar um domínio."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certificado obrigatório."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectar"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi ativado"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Conectando a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Conectando…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Falha ao conectar à rede"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rede fora do alcance"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Endereço MAC do dispositivo"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Endereço MAC randomizado"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Endereço MAC randomizado (último uso)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Endereço IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalhes da rede"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Máscara de sub-rede"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Endereços IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Redes salvas"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Assinaturas"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Outras redes"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Configurações de IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"As configurações avançadas de Wi-Fi não estão disponíveis para esse usuário"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Salvar"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Digite um endereço de gateway válido."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Digite um endereço de DNS válido."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Digite um tamanho do prefixo de rede entre 0 e 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (a menos que substituído por um DNS particular)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (a menos que substituído por um DNS particular)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Tamanho do pref. de rede"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"O app está compartilhando conteúdo. Para compartilhar a conexão com a Internet, desative e ative o ponto de acesso"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nenhuma senha definida"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nome do ponto de acesso"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Ativando <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Outros dispositivos podem se conectar a <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Senha do ponto de acesso"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda do ponto de acesso"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Aumenta automaticamente a taxa de atualização de 60 para 90 Hz para alguns conteúdos. Maior uso da bateria"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forçar a taxa de atualização de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Maior taxa de atualização para melhoria na resposta tátil e na qualidade das animações. Maior uso da bateria."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Reconhecimento de tela em uso"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ativado / A tela não será desativada se você estiver olhando para ela"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Quando a tela está escura, ela é ativada quando chegam notificações"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Sempre mostrar hora e informações"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Maior uso da bateria"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Negrito"</string>
     <string name="title_font_size" msgid="570613010306330622">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Tornar o texto maior ou menor"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Bloqueio do chip"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versão do Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Atualização de segurança do Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo e hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versão do hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID do equipamento"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Excluir APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Novo APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Salvar"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Descartar"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Cancelar"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"O campo Nome não pode ficar vazio."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"O APN não pode estar vazio."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Os apps podem ser redefinidos"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Redefinir Wi-Fi, rede móvel e Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Esta ação redefinirá todas as configurações de rede, inclusive:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dados móveis"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Limpar"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Limpar chips salvos"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Para fazer o download de chips substitutos, entre em contato com a operadora. Isso não cancelará nenhum plano de serviços móveis."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Isso não cancelará nenhum plano de serviços móveis. Para fazer o download de chips substitutos, entre em contato com a operadora."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Redefinir configurações"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Redefinir todas as configurações de rede? Não é possível desfazer essa ação."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Redefinir todas as configurações de rede e limpar chips salvos? Não é possível desfazer essa ação."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"As configurações de rede foram redefinidas"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Não é possível limpar chips"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Os chips transferidos por download não podem ser limpos devido a um erro.\n\nReinicie o dispositivo e tente novamente."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Limpar todos os dados (redefinir para a configuração original)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Limpar todos os dados"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu smartphone, incluindo:\n\n"<li>"Sua Conta do Google"</li>\n<li>"Configurações e dados do sistema e dos apps"</li>\n<li>"Apps transferidos"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"No momento você está conectado às seguintes contas:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Esta ação não cancelará seu plano de serviços móveis."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Para limpar músicas, fotos e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Limpar todos os dados (redefinir para a configuração original)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Limpar todos os dados"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu tablet, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos por download."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Essa ação limpará todos os dados do "<b>"armazenamento interno"</b>" do seu smartphone, incluindo:\n\n"<li>"sua Conta do Google;"</li>\n<li>"configurações e dados do sistema e dos apps;"</li>\n<li>"apps transferidos por download."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"No momento, as seguintes contas estão conectadas:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Há outros usuários presentes neste dispositivo.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Músicas"</li>\n<li>"Fotos"</li>\n<li>"Outros dados do usuário"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Essa ação não cancelará seu plano de serviços móveis."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para limpar músicas, imagens e outros dados de usuário, o "<b>"armazenamento USB"</b>" precisa ser apagado."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para limpar músicas, imagens e outros dados de usuário, o conteúdo do "<b>"cartão SD"</b>" precisa ser apagado."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Apagar armazenamento USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Apagar cartão SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Apagar todos os dados do armazenamento USB interno, como músicas e fotos"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Apagar todos os dados do cartão SD, como músicas e fotos"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Limpar todos os dados"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Limpar todos os dados"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Todas as informações pessoais e apps transferidos por download serão excluídos. Não é possível desfazer essa ação."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Todas as suas informações pessoais, inclusive apps e chips transferidos por download, serão excluídas. Não é possível desfazer essa ação."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Apagar tudo"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nenhuma redefinição foi realizada porque o serviço de Limpeza do sistema não está disponível."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Limpar todos os dados?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"A configuração original não está disponível para esse usuário"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Apagando"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Aguarde..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Limpar todos os dados"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Limpar todos os dados"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Todas as informações pessoais e os apps transferidos por download serão excluídos. Não é possível desfazer essa ação."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Todas as suas informações pessoais, inclusive apps e chips transferidos por download, serão excluídas. Não é possível desfazer essa ação."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Limpar todos os dados?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"A redefinição para a configuração original não está disponível para este usuário"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Limpando"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Aguarde…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Conf. de chamada"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Configurar correio voz, encaminhamento, espera etc."</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Não é possível vincular a mais de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> será vinculado."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Tethering Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Compartilhar a conexão de Internet do smartphone via USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Compartilhar a conexão de Internet do smartphone via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Use o ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão de dados móveis. Os apps também podem criar um ponto de acesso para compartilhar conteúdo com dispositivos por perto."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Use o ponto de acesso e tethering para fornecer Internet a outros dispositivos por meio da sua conexão Wi-Fi ou de dados móveis. Os apps também podem criar um ponto de acesso para compartilhar conteúdo com dispositivos próximos."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ajuda"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Busca por Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permite que apps e serviços procurem dispositivos próximos a qualquer momento, mesmo quando o Bluetooth está desativado. Essa configuração pode ser usada, por exemplo, para melhorar recursos e serviços baseados na localização."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Serviços de localização para o trabalho"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detecção do fuso horário do local"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detecção do fuso horário do local"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite que o local do dispositivo seja usado para detectar o fuso horário atual. Outras configurações de localização, como busca por Wi-Fi, podem afetar a precisão da detecção de fuso horário."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Ativada"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Desativada"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"A detecção automática de fuso horário está desativada"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"A detecção de fuso horário do local está desativada"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"A detecção de fuso horário do local está indisponível"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Não são permitidas mudanças na detecção de fuso horário do local"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Local de rede móvel e Wi-Fi"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Permitir que apps usem o serviço de localização do Google para determinar seu local mais rapidamente. Dados de localização anônimos serão coletados e enviados ao Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Localização determinada por Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Defina uma senha p/ usar o desb. facial"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Defina um padrão para usar o desb. facial"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Defina um PIN p/ usar o desb. facial"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Para usar a biometria, defina uma senha"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Para usar a biometria, defina um padrão"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Para usar a biometria, defina um PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Esqueceu sua senha?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Esqueceu seu padrão?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Esqueceu seu PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferências de legenda"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ampliação"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Área de ampliação"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ampliação ativada"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Escolha a área de ampliação que você quer usar ao ampliar a tela"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Tela cheia"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Parte da tela"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Tela cheia e parte da tela"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ampliar toda a tela"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ampliar parte da tela"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Mudar para o botão de acessibilidade?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"O uso do toque triplo para ampliar parte da tela fará com que a digitação e outras ações fiquem mais lentas.\n\nQuer passar a usar o botão de acessibilidade para ampliar a tela?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Mudar para o botão de acessibilidade"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Manter o toque triplo para ampliar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Configurações de ampliação"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Ampliar com toque triplo"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Ampliar com atalho"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Botão liga/desliga encerra chamadas"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Cursor do mouse grande"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Remover animações"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Áudio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combinar canais ao reproduzir áudio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balanço de áudio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Esquerda"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Direita"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Áudio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combinar canais ao tocar áudio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balanço de áudio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Esquerdo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Direito"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Padrão"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundos"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundos"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibração de notificação"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibração do toque"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback por toque"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Usar correção de cor"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Mostrar legendas"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Apenas para apps compatíveis"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Usar <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Abrir <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Usar correção de cor"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Mostrar legendas"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Apenas para apps compatíveis"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Tamanho e estilo das legendas"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Tamanho do texto: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Mais opções"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalia"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalia"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalia"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Escala de cinza"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Vermelho-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Vermelho-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Azul-amarelo"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restrição em segundo plano"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permitir que o app seja executado em segundo plano"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Execução do app em segundo plano não permitida"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Não é possível restringir o uso em segundo plano"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Não é possível restringir o uso em segundo plano"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitar atividade em segundo plano?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Se você limitar as atividades em segundo plano de um app, ele poderá apresentar mau funcionamento"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Como o app não está configurado para otimizar bateria, não é possível restringi-lo.\n\nPara restringir, ative a otimização."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet usado além do normal"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Dispositivo usado além do normal"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"A bateria pode acabar antes do esperado"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Otimizando para integridade da bateria"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Bateria limitada temporariamente. Toque para saber mais."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"O smartphone foi usado além do normal. A bateria pode acabar antes do esperado.\n\nApps que mais usam bateria:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"O tablet foi usado além do normal. A bateria pode acabar antes do esperado.\n\nApps que mais usam bateria:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"O dispositivo foi usado além do normal. A bateria pode acabar antes do esperado.\n\nApps que mais usam bateria:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">%1$d apps restritos</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problema para ler seu medidor de bateria"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problema para ler seu medidor de bateria. Toque para "<annotation id="url">"saber mais"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Parar o app?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Definir uma programação"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prolongar a duração da bateria"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Desativar quando estiver carregado"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"A Economia de bateria é desativada quando a carga do smartphone chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"A Economia de bateria é desativada quando a carga do tablet chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"A Economia de bateria é desativada quando a carga da bateria do dispositivo chega a <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"A Economia de bateria é desativada quando a carga do smartphone chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"A Economia de bateria é desativada quando a carga do tablet chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"A Economia de bateria é desativada quando a carga do dispositivo chega a mais de <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Ativar"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Redefinir"</string>
     <string name="tts_play" msgid="2945513377250757221">"Reproduzir"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectividade adaptável"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Aumenta a duração da bateria e melhora o desempenho do dispositivo ao gerenciar suas conexões de rede automaticamente"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Armazenamento de credenciais"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalar um certificado"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalar certificados do armazenamento"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Credenciais do usuário"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ver e modificar as credenciais armazenadas"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avançado"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tipo de armazenamento"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"No hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Somente software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"As credenciais não estão disponíveis para este usuário"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalada para VPN e apps"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalada para Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Não instalar"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instalar assim mesmo"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificado não instalado"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Permitir que <xliff:g id="APP_NAME">%s</xliff:g> instale certificados neste dispositivo?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Estes certificados confirmarão sua identidade para os apps e URLs abaixo"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Não permitir"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Permitir"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Mostrar mais"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App de gerenc. de certificados"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Nenhum"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Os certificados instalados por este app identificam você para os apps e URLs abaixo"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Remover"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Sinal de discagem de emergência"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Definir comportamento durante uma chamada de emergência"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Backup"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Não configurado - perfil de trabalho"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrador"</string>
     <string name="user_you" msgid="3070562015202859996">"Você (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Apelido"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"É possível adicionar até <xliff:g id="USER_COUNT">%1$d</xliff:g> usuários"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Somente o proprietário do tablet pode gerenciar os usuários."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Somente o proprietário do telefone pode gerenciar os usuários."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Como pagar no terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configure um app de pagamento. Em seguida, basta segurar a parte traseira do seu smartphone em direção a qualquer terminal com o símbolo indicando pagamento por aproximação."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Entendi"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mais..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mais…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Definir app de pagamento padrão"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Atualizar app de pagamento padrão"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Em um terminal por aproximação, pagar com <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Voltar"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Próxima"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Concluir"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Tirar uma foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Escolher uma imagem"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Selecionar foto"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Chips"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Chips"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Sempre usar esta opção para chamadas"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selecionar um chip de dados"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selecione um chip para SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Trocando chip de dados. Isso pode demorar um pouco..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Trocando chip de dados. Isso pode demorar um minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Ligar com"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selecionar um chip"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"Chip <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rotina, agenda, economia de bateria, economia de energia, bateria, automático, percentagem"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, chamada avançada, chamadas por 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"adicionar idioma, adicionar um idioma"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"tamanho do texto"</string>
     <string name="default_sound" msgid="6604374495015245195">"Som padrão"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volume de toque e notificação em <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, vibração, Não perturbe"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ativar sons"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Legenda Instantânea"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Legendar mídias automaticamente"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nenhuma"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> programação definida</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programações definidas</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Nenhum}=1{1 programação definida}one{# programação definida}other{# programações definidas}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Não perturbe"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Receber notificações apenas de pessoas e apps importantes"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitar interrupções"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Somente prioridade"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Ativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Desativado / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Desativado"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Ativado"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Perguntar sempre"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Até você desativar"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> hora</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> horas</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minutos"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> programação pode ser ativada automaticamente</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> programações podem ser ativadas automaticamente</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hora}one{# hora}other{# horas}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuto}other{# minutos}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Desativado}=1{Desativado / 1 programação pode ser ativada automaticamente}one{Desativado / # programação pode ser ativada automaticamente}other{Desativado / # programações podem ser ativadas automaticamente}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"O que pode interromper o \"Não perturbe\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Pessoas"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Apps"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Definir automaticamente as notificações de prioridade baixa como \"Discretas\""</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Classificação adaptativa de notificações"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Classificar notificações automaticamente por relevância"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback de notificação adaptável"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicar os ajustes feitos nas notificações e mostrar a opção de enviar feedback ao sistema"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Redefinir importância de notificações"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Redefina as configurações de importância mudadas pelo usuário e permita que o assistente de notificação decida a prioridade"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Respostas e ações sugeridas"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Mostrar automaticamente as respostas e ações sugeridas"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Mostrar notificações recentes e adiadas"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Conversas prioritárias"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Aparecem na parte superior da seção de conversa, na forma de balões"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Aparecem na parte superior da seção de conversa"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Outras conversas"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Conversas sem prioridade"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversas que você modificou"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Conversas recentes"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Limpar recentes"</string>
+    <string name="clear" msgid="5092178335409471100">"Limpar"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Mostrar conversas prioritárias em balões"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Conversas prioritárias são mostradas na parte superior da aba suspensa. Você também pode configurá-las para que sejam mostradas em balões e interrompam o modo \"Não perturbe\"."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"As conversas prioritárias e modificadas aparecerão aqui"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acesso ao Não perturbe"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permitir o Não perturbe"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nenhum app instalado solicitou o acesso \"Não perturbe\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Carregando apps…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Carregando apps…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"O Android está bloqueando as notificações desse app neste dispositivo, conforme você pediu"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"O Android está bloqueando essa categoria de notificações neste dispositivo, conforme você pediu"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"O Android está bloqueando esse grupo de notificações neste dispositivo, conforme seu pedido"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Todas as conversas"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversas prioritárias"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Nenhuma"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversa</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversas</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Nenhuma"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Nenhum}=1{1 conversa}one{# conversa}other{# conversas}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Quem pode interromper"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chamadas"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chamadas"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para garantir que as chamadas permitidas emitam sons, verifique se o dispositivo está configurado para tocar"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Durante a programação \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as chamadas recebidas são bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Contatos marcados com estrela"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">mais <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Nenhum"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Nenhum}=1{{contact_1}}=2{{contact_1} e {contact_2}}=3{{contact_1}, {contact_2} e {contact_3}}one{{contact_1}, {contact_2} e mais #}other{{contact_1}, {contact_2} e mais #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Sem nome)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mensagens"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mensagens"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mensagens"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Durante \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", as mensagens recebidas são bloqueadas. Você pode ajustar as configurações para permitir que seus amigos, familiares ou outros contatos falem com você."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Você pode receber todas as mensagens"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Você pode receber todas as chamadas"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Nenhum"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contato</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contatos</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Nenhum}=1{1 contato}one{# contato}other{# contatos}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Qualquer pessoa"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Contatos"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Contatos marcados com estrela"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Algumas pessoas ainda podem entrar em contato com você, mesmo que você não permita a interrupção por apps"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> pode interromper</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> podem interromper</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"mais <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nenhum app pode interromper}=1{{app_1} pode interromper}=2{{app_1} e {app_2} podem interromper}=3{{app_1}, {app_2} e {app_3} podem interromper}one{{app_1}, {app_2} e mais # podem interromper}other{{app_1}, {app_2} e mais # podem interromper}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Apps"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Todas as notificações"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Algumas notificações"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificações que podem interromper"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permitir todas as notificações"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> pode interromper</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> podem interromper</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nada pode interromper"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"mais <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nada pode interromper}=1{{sound_category_1} pode interromper}=2{{sound_category_1} e {sound_category_2} podem interromper}=3{{sound_category_1}, {sound_category_2} e {sound_category_3} podem interromper}one{{sound_category_1}, {sound_category_2} e mais # podem interromper}other{{sound_category_1}, {sound_category_2} e mais # podem interromper}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nada pode interromper"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ninguém pode interromper"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Algumas pessoas podem interromper"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Todas as pessoas podem interromper"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Ativado"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Desativado"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Fixação de apps"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"A fixação de apps permite manter o app atual em exibição até você liberá-lo. Esse recurso pode ser usado, por exemplo, para permitir que um amigo confiável abra um jogo específico. \n\nQuando um app está fixado, ele pode abrir outros apps e acessar dados pessoais. \n\nPara usar a fixação de apps: 	\n1.	Ative a fixação de apps 	\n2.	Abra a opção \"Visão geral\" 	\n3.	Na parte superior da tela, toque no ícone do app e depois em \"Fixar\""</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"A fixação de apps permite manter o app atual em exibição até você liberá-lo. Esse recurso pode ser usado, por exemplo, para permitir que um amigo confiável abra um jogo específico. \n\nQuando um app está fixado, ele pode abrir outros apps e acessar dados pessoais. \n\nSe você quiser compartilhar seu dispositivo com alguém de forma segura, tente usar um usuário convidado. \n\nPara usar a fixação de apps: 	\n1.	Ative a fixação de apps 	\n2.	Abra a opção \"Visão geral\" 	\n3.	Na parte superior da tela, toque no ícone do app e depois em \"Fixar\""</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"A fixação de apps permite manter o app atual em exibição até você liberá-lo. Esse recurso pode ser usado, por exemplo, para permitir que um amigo confiável abra um jogo específico."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Quando um app está fixado, ele pode abrir outros apps e os dados pessoais podem ficar acessíveis. \n\nPara usar a fixação de apps, faça o seguinte: 	\n1.	Ative a fixação de apps 	\n2.	Abra a opção \"Visão geral\" 	\n3.	Na parte superior da tela, toque no ícone do app e depois em \"Fixar\""</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Quando um app está fixado, ele pode abrir outros apps e os dados pessoais podem ficar acessíveis. \n\nSe você quiser compartilhar seu dispositivo com alguém de forma segura, tente fazer isso com um usuário convidado. \n\nPara usar a fixação de apps, faça o seguinte: 	\n1.	Ative a fixação de apps 	\n2.	Abra a opção \"Visão geral\" 	\n3.	Na parte superior da tela, toque no ícone do app e depois em \"Fixar\""</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Quando o app está fixado, ele pode: \n\n•		acessar dados pessoais \n		(como contatos e conteúdo de e-mail); \n•		abrir outros apps. \n\nUse a fixação de apps apenas com pessoas em quem você confia."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Pedir padrão de desbloqueio antes de desafixar"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Pedir PIN antes de desafixar"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar um PIN para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando seu padrão antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajudar a proteger os dados em dispositivos perdidos ou roubados. Solicitar um padrão para ligar o dispositivo?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Além de usar seu rosto para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo sua senha antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Solicitar senha para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo um PIN antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir um PIN para inicializar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo um padrão antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir um padrão para inicializar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Além de usar a biometria para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo uma senha antes da inicialização. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Exigir uma senha para inicializar o dispositivo?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Sim"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Não"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restrito"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlado por"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispositivo conectado"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Este dispositivo"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Alternando..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Alternando…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Não foi possível alternar"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Para carregamento do dispositivo"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Carregando dispositivo conectado"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Uso de dados móveis"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Uso de dados do app"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Uso de dados Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Uso de dados de redes que não sejam da operadora"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Uso de dados ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrições</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"O cálculo de dados da operadora pode ser diferente daquele realizado pelo seu dispostivo"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Excluir dados usados por redes de operadoras"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> usado(s)"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Definir alerta de uso de dados"</string>
     <string name="data_warning" msgid="2925054658166062884">"Alerta de uso de dados"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ver detalhes"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Economia de dados"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dados ilimitados"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Os dados em segundo plano estão desativados"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Os dados em segundo plano estão desativados"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Ativada"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Desativada"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Usar o recurso Economia de dados"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Se o dispositivo estiver bloqueado, impedir a digitação de respostas ou outros textos nas notificações"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Corretor ortográfico padrão"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Escolher corretor ortográfico"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Usar o corretor ortográfico"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Usar o corretor ortográfico"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Não selecionado"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(nenhum)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Remover fotos e vídeos"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Gerenciador de armazenamento"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Usar gerenciador de armazenamento"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Usar gerenciador de armazenamento"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Modo automático"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Modo manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liberar espaço agora"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tocar duas vezes na tela para verificar o smartphone"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tocar duas vezes na tela para verificar o tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tocar duas vezes na tela para verificar o dispositivo"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Deslizar para ver notif."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Deslize para baixo no canto inferior da tela para mostrar as notificações"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modo para uma mão"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Usar o \"modo para uma mão\""</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Sair ao alternar entre apps"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tempo limite"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 segundos"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundos"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundos"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"acesso com uma mão"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para verificar a hora, as notificações e outras informações, toque duas vezes na tela."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Levantar o smartphone para verificá-lo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Levantar o tablet para verificá-lo"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tocar para verificar o tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tocar para verificar o dispositivo"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para verificar a hora, as notificações e outras informações, toque na tela."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Emergência"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Usar as opções de emergência"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gerenciado por <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Pressione o botão liga/desliga rapidamente cinco vezes ou mais para iniciar as ações abaixo"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Tocar alarme de contagem regressiva"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Emitir um som alto antes de enviar um pedido de ajuda"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Pedir ajuda"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Número para ligar para pedir ajuda"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Toque para mudar"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Se você inserir um número que não seja de emergência:\n • seu dispositivo precisará estar desbloqueado para usar as opções de emergência;\n • sua ligação poderá não ser atendida."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Deslizar para baixo no sensor de impressão digital para ver as notificações"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Usar impressão digital"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para ver suas notificações, deslize o dedo indicador para baixo no sensor de impressão digital localizado na parte traseira do smartphone."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Máximo de conjuntos de dados visíveis"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Redefinir para valores padrão"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"As opções do desenvolvedor de preenchimento automático foram redefinidas"</string>
+    <string name="location_category" msgid="3496759112306219062">"Local"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicador de local na barra de status"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Mostrar para todos os locais, incluindo rede e conectividade"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forçar medições completas de GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Rastrear todas as constelações e frequências do GNSS sem nenhum ciclo de trabalho"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema do dispositivo"</string>
     <string name="default_theme" msgid="4815428567082263639">"Padrão"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nome da rede"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pausar notificações para manter o foco"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Recurso não disponível"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Esse recurso foi desativado porque causa lentidão no seu smartphone"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forçar medições completas de GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Rastrear todas as constelações e frequências do GNSS sem nenhum ciclo de trabalho"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Sempre mostrar a caixa de diálogo de falha"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Mostrar a caixa de diálogo sempre que um app falha"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Selecionar app ativado para ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Ativar para todos os apps"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selecionar driver gráfico"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Padrão"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driver de jogo"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driver de jogo"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driver gráfico do sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Ativado (silencioso)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Desativado"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detalhes da rede"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"O nome do seu dispositivo está visível para os apps no seu smartphone. Ele também pode ser visto por outras pessoas quando você se conecta a dispositivos Bluetooth ou configura um ponto de acesso Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"O nome do seu dispositivo está visível para os apps no smartphone. Ele também pode ser visto por outras pessoas quando você se conecta a dispositivos Bluetooth ou a uma rede Wi-Fi ou quando configura um ponto de acesso Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Dispositivos"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Todas as configurações"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Sugestões"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Não foi possível encontrar redes. Tente novamente."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(proibida)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Sem chip"</string>
+    <string name="sim_card" msgid="6381158752066377709">"Chip"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Sem chip"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Nenhuma"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Chip necessário para se conectar"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Chip da <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> necessário para se conectar"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modo de rede preferencial: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modo de rede preferencial: somente GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modo de rede preferencial: somente WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dados móveis"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Acessar os dados pela rede móvel"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"O smartphone mudará automaticamente para esta operadora quando estiver dentro do alcance"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nenhum chip disponível"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferência de chamadas"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferência de SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Perguntar sempre"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponível quando conectado à <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ver mais"</string>
     <string name="see_less" msgid="2642392725363552793">"Ver menos"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Ativar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Ativar o chip?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Mudar para a <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Começar a usar o chip?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Somente um chip pode estar ativo por vez.\n\nMudar para a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancelará o serviço da <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Somente um chip transferido por download pode estar ativo por vez.\n\nMudar para a <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> não cancelará o serviço da <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Somente um chip pode estar ativo por vez.\n\nMudar de operadora não cancelará o serviço da <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Mudar para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Conectando à rede…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Mudando para <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Não foi possível mudar a operadora"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Devido a um erro, não foi possível mudar a operadora."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Desativar <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Desativar chip?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Desativando o chip<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Não foi possível desativar a operadora"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Algo deu errado, e não foi possível desativar sua operadora."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Usar dois chips?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Este dispositivo pode ter dois chips ativos ao mesmo tempo. Para continuar usando um chip por vez, toque em \"Agora não\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Reiniciar dispositivo?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Para começar, reinicie seu dispositivo. Depois, você pode adicionar outro chip."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continuar"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Reiniciar"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Agora não"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Mudar"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Não foi possível ativar o chip"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Remova o chip e insira-o novamente. Se o problema continuar, reinicie o dispositivo."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Tente ativar o chip novamente. Se o problema continuar, reinicie o dispositivo."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ativação de rede"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"A operadora <xliff:g id="CARRIER_NAME">%1$s</xliff:g> está ativa"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Toque para atualizar as configurações do chip"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Chip"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Limpar este chip transferido por download?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"A limpeza do chip remove o serviço da <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> deste dispositivo.\n\nO serviço da <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> não será cancelado."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Limpar"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Limpando chip…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Não é possível limpar o chip"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Não é possível limpar este chip devido a um erro.\n\nReinicie o dispositivo e tente novamente."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectar ao dispositivo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"O app <xliff:g id="APPNAME">%1$s</xliff:g> quer usar uma rede Wi-Fi temporária para se conectar ao seu dispositivo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nenhum dispositivo foi encontrado. Os dispositivos precisam estar ligados e disponíveis para conexão."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Chamadas de emergência"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"As chamadas de emergência feitas com o recurso \"Chamada no Wi-Fi\" não são compatíveis com sua operadora.\nO dispositivo alterna automaticamente para uma rede celular para fazer uma chamada de emergência.\nAs chamadas de emergência são possíveis apenas em áreas com cobertura de celular."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Usar Wi-Fi nas chamadas para melhorar a qualidade"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Chamadas entre chips"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Permitir chamadas e mensagens SMS de outro chip por este."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"chamadas entre chips"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Mensagem MMS recebida"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Não é possível enviar mensagens MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Toque para permitir mensagens MMS pela <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> quando os dados móveis estiverem desativados"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permitir sobreposições de tela no app Config."</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permita que apps que podem ser sobrepostos a outros sejam abertos sobre telas de configuração"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Mídia"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ocultar player quando a sessão de mídia terminar"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"O player permite que você retome uma sessão do painel \"Configurações rápidas\" expandido."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Player de mídia nas Configurações rápidas"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Mostrar player de mídia por um longo período para retomar a reprodução com facilidade"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ocultar player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Mostrar player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nenhum player disponível"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Apps permitidos"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"mídia"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"O Bluetooth será ativado"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Ativar"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Desativar"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Chips"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Redes seguras para aviões"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Encontre redes seguras para aviões e se conecte a elas"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avião, segura para aviões"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Chamadas e SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Chamada no Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Faça e receba chamadas por redes sem operadora, como Wi-Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"A chamada no Wi-Fi permite que você faça e receba chamadas por redes sem operadora, como algumas redes Wi-Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Chamadas"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferido"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"preferido para chamadas"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"preferido para SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponível"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Sem chip"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferências"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectar-se a redes públicas"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"conexão de rede, internet, sem fio, dados, wifi, wi-fi, wi fi, celular, rede móvel, operadora de celular, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Ver redes seguras para aviões"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Desativar o modo avião"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Indisponível durante o Modo noite"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Redefinição da importância de notificações concluída."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Apps"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Um dispositivo não confiável quer acessar suas mensagens. Toque para ver detalhes."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Conceder acesso às mensagens?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Um dispositivo Bluetooth não confiável, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quer acessar suas mensagens.\n\nVocê não se conectou a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Um dispositivo não confiável quer acessar seus contatos e seu registro de chamadas. Toque para ver detalhes."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Conceder acesso aos contatos e ao registro de chamadas?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Um dispositivo Bluetooth não confiável, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], quer acessar seus contatos e seu registro de chamadas. Isso inclui dados sobre chamadas recebidas e realizadas.\n\nVocê não se conectou a [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] antes."</string>
 </resources>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index e069752..620b637 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Medie"</item>
     <item msgid="6740026006576843477">"Lungă"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Scurt"</item>
+    <item msgid="7397961711906421599">"Mediu"</item>
+    <item msgid="4079132024502041928">"Lung"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Prestabilit"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Numai TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a37c1f2..82e6e7c 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -256,8 +256,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Data și ora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Setați data și ora"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Setați data, ora, fusul orar și formatele."</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Folosiți ora dată de rețea"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Folosește fusul orar din rețea"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Setați ora automat"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Setați fusul orar automat"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Folosiți codul local prestabilit"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Format de 24 de ore"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Utilizați formatul de 24 de ore"</string>
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Afișați informații profil la blocarea ecranului"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Conturi"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Locație"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Utilizați locația"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Folosiți locația"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Dezactivat"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="few">Pornită - <xliff:g id="COUNT_1">%1$d</xliff:g> aplicații au acces la locație</item>
@@ -323,6 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Blocarea ecranului, deblocare facială"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Blocarea ecranului, amprentă"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Blocarea ecranului"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Deblocați în siguranță telefonul folosind fața și amprenta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Puteți să vă conectați la aplicații și să confirmați plăți"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Configurați deblocarea cu:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Deblocare facială"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Simplificați deblocarea telefonului"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Amprentă"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Deblocați rapid telefonul din buzunar"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Omiteți"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Înainte"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Chip adăugat"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Configurați deblocarea facială"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Deblocare facială"</string>
@@ -332,6 +341,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Folosiți-vă chipul pentru autentificare"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Începeți"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Dacă deblocarea facială pentru accesibilitate este dezactivată, este posibil ca unii pași de configurare să nu funcționeze corect cu TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Înapoi"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Continuați configurarea"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Folosiți configurarea accesibilității"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -376,8 +388,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Când folosiți deblocarea facială în aplicații, solicitați întotdeauna confirmarea"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Ștergeți datele faciale"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Configurați deblocarea facială"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Folosiți deblocarea facială ca să deblocați dispozitivul, să vă conectați la aplicații și să confirmați plăți.\n\nRețineți:\ndacă priviți spre telefon, îl puteți debloca și când nu doriți.\n\nTelefonul poate fi deblocat de altcineva dacă este ținut în dreptul feței dvs.\n\nTelefonul poate fi deblocat de cineva care seamănă mult cu dvs., cum ar fi un frate sau o soră geamănă."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Folosiți deblocarea facială ca să deblocați dispozitivul, să vă conectați la aplicații și să confirmați plăți.\n\nRețineți:\ndacă vă uitați la telefon, îl puteți debloca când nu doriți.\n\nTelefonul poate fi deblocat de altcineva dacă este ținut în dreptul feței dvs., chiar dacă aveți ochii închiși.\n\nTelefonul poate fi deblocat de cineva are seamănă mult cu dvs., cum ar fi un frate sau o soră geamănă."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Folosiți deblocarea facială ca să deblocați dispozitivul, să vă conectați la aplicații și să confirmați plăți."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Rețineți:\ndacă priviți spre telefon, îl puteți debloca și când nu doriți;\n\ntelefonul poate fi deblocat de altcineva dacă este ținut în dreptul feței dvs.;\n\ntelefonul poate fi deblocat de cineva care seamănă mult cu dvs., cum ar fi un frate sau o soră geamănă."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Rețineți:\ndacă priviți spre telefon, îl puteți debloca și când nu doriți;\n\ntelefonul poate fi deblocat de altcineva dacă este ținut în dreptul feței dvs., chiar dacă aveți ochii închiși;\n\ntelefonul poate fi deblocat de cineva care seamănă mult cu dvs., cum ar fi un frate sau o soră geamănă."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Ștergeți datele faciale?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Datele faciale folosite de deblocarea facială vor fi șterse definitiv și în siguranță. După eliminare, veți avea nevoie de codul PIN, de model sau de parolă ca să deblocați telefonul, să vă conectați la aplicații și să confirmați plățile."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Folosiți deblocarea facială ca să vă deblocați telefonul"</string>
@@ -398,6 +411,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Folosiți amprenta ca să deblocați telefonul sau să aprobați achizițiile.\n\nNotă: nu vă puteți folosi amprenta ca să deblocați acest dispozitiv. Pentru informații suplimentare, contactați administratorul organizației."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Folosiți amprenta ca să deblocați telefonul sau să aprobați achizițiile.\n\nNotă: este posibil ca amprenta să fie mai puțin sigură decât un model sau un cod PIN complex."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Anulați"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nu, mulțumesc"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Continuați"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Omiteți"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Înainte"</string>
@@ -435,6 +449,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Protejând tableta cu o opțiune de blocare a ecranului, nimeni nu va putea să o folosească dacă o pierdeți sau este furată. Aveți nevoie și de o opțiune de blocare a ecranului pentru a configura deblocarea facială. Pentru a reveni, atingeți Anulați."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Protejând dispozitivul cu o opțiune de blocare a ecranului, nimeni nu va putea să îl folosească dacă îl pierdeți sau este furat. Aveți nevoie și de o opțiune de blocare a ecranului pentru a configura deblocarea facială. Pentru a reveni, atingeți Anulați."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Protejând telefonul cu o opțiune de blocare a ecranului, nimeni nu va putea să îl folosească dacă îl pierdeți sau este furat. Aveți nevoie și de o opțiune de blocare a ecranului pentru a configura deblocarea facială. Pentru a reveni, atingeți Anulați."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Dacă protejați tableta cu o opțiune de blocare a ecranului, nimeni nu va putea să o folosească dacă o pierdeți sau este furată. Aveți nevoie și de o opțiune de blocare a ecranului ca să configurați sisteme biometrice. Pentru a reveni, atingeți Anulați."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Dacă protejați dispozitivul cu o opțiune de blocare a ecranului, nimeni nu va putea să îl folosească dacă îl pierdeți sau este furat. Aveți nevoie și de o opțiune de blocare a ecranului ca să configurați sisteme biometrice. Pentru a reveni, atingeți Anulați."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Dacă protejați telefonul cu o opțiune de blocare a ecranului, nimeni nu va putea să îl folosească dacă îl pierdeți sau este furat. Aveți nevoie și de o opțiune de blocare a ecranului ca să configurați sisteme biometrice. Pentru a reveni, atingeți Anulați."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Omiteți configurarea PIN-ului?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Omiteți configurarea parolei?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Omiteți configurarea modelului?"</string>
@@ -507,8 +524,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească această tabletă fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest dispozitiv fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Activați funcțiile de protecție a dispozitivului pentru a împiedica alte persoane să folosească acest telefon fără permisiunea dvs. Alegeți blocarea ecranului pe care doriți să o folosiți."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Alegeți metoda de rezervă de blocare a ecranului"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Alegeți metoda de blocare a ecranului de backup"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Alegeți metoda de blocare a ecranului de backup"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opțiuni de blocare a ecranului"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opțiuni de blocare a ecranului"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Blocarea ecranului"</string>
@@ -540,6 +556,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Deblocare facială + parolă"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Continuați fără deblocarea facială"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Puteți debloca telefonul folosind chipul. Din motive de securitate, această opțiune necesită o blocare a ecranului de rezervă."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Sisteme biometrice + Model"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Sisteme biometrice + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Sisteme biometrice + Parolă"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Continuați fără sisteme biometrice"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Puteți debloca telefonul folosind sistemele biometrice. Pentru securitate, această opțiune necesită o blocare a ecranului de rezervă."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Dezactivat de administrator, politica de criptare sau spațiul de stocare a certificatelor"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Fără"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Glisare"</string>
@@ -627,7 +648,6 @@
       <item quantity="one">Trebuie să conțină mai puțin de <xliff:g id="NUMBER_0">%d</xliff:g> cifră</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administratorul dispozitivului nu permite utilizarea unui PIN recent"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Codurile PIN sunt blocate de administratorul dvs. IT. Încercați alt cod PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Aceasta nu poate include un caracter nevalid"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Trebuie să conțină cel puțin o literă"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Trebuie să conțină cel puțin o cifră"</string>
@@ -668,7 +688,6 @@
       <item quantity="one">Trebuie să conțină cel puțin un caracter care să nu fie cifră</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administratorul dispozitivului nu permite utilizarea unei parole recente"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Parolele obișnuite sunt blocate de administratorul dvs. IT. Încercați altă parolă."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Șirurile de cifre ascendente, descendente sau repetate nu sunt permise"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Confirmați"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Anulați"</string>
@@ -812,7 +831,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Activați conexiunea Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Utilizați Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Folosiți Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Setări Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Configurați și gestionați punctele de acces wireless"</string>
@@ -920,7 +939,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Centrați codul QR de mai jos pentru a vă conecta la „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Conectați-vă la Wi‑Fi scanând un cod QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Distribuiți Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Scanați acest cod QR ca să vă conectați la „<xliff:g id="SSID">%1$s</xliff:g>” și să trimiteți parola"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Scanați acest cod QR cu alt dispozitiv pentru a vă conecta la „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Scanați acest cod QR pentru a vă conecta la „<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Încercați din nou. Dacă problema persistă, contactați producătorul dispozitivului"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"A apărut o eroare"</string>
@@ -946,8 +965,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Parola rețelei Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Parolă hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Conectare automată"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Permiteți ca telefonul să se conecteze automat în apropiere de această rețea"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Permiteți ca tableta să se conecteze automat în apropiere de această rețea"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Permiteți conectarea la această rețea când se află în aria de acoperire"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Adăugați un dispozitiv"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Folosiți un cod QR pentru a adăuga un dispozitiv la această rețea"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Codul QR nu are un format valid"</string>
@@ -959,7 +977,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Folosiți certificate de sistem"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Nu se furnizează"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Nu se validează"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nu s-a specificat niciun certificat. Conexiunea nu va fi privată."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Numele rețelei este prea lung."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Trebuie să specificați un domeniu."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Este obligatoriu un certificat."</string>
@@ -986,6 +1003,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Conectați-vă"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Conexiunea prin Wi-Fi este activată"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"V-ați conectat la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Se conectează la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Se conectează…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Nu s-a putut stabili conexiunea la rețea"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rețeaua este în afara ariei de acoperire"</string>
@@ -1016,6 +1034,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresa MAC a dispozitivului"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Adresă MAC aleatorie"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Adresă MAC randomizată (ultima folosită)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adresă IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detalii rețea"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Mască de subrețea"</string>
@@ -1023,8 +1042,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Adrese IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Rețele salvate"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abonamente"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Alte rețele"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Setări IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Setările avansate de Wi‑Fi nu sunt disponibile pentru acest utilizator"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Salvați"</string>
@@ -1033,8 +1051,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Introduceți o adresă gateway validă."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Introduceți o adresă DNS validă."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Introduceți prefix rețea din 0 – 32 caractere."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (dacă nu este înlocuit de un DNS privat)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (dacă nu este înlocuit de un DNS privat)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Lungime prefix rețea"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1060,7 +1078,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplicația trimite conținut. Pentru a permite accesul la conexiunea de internet, dezactivați hotspotul, apoi activați-l"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nu s-a setat nicio parolă"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Nume hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Se activează <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Se activează <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Alte dispozitive se pot conecta la <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Parolă hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda AP"</string>
@@ -1210,7 +1228,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Ridică automat rata de actualizare de la 60 la 90 Hz pentru unele tipuri de conținut. Mărește utilizarea bateriei."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Forțați rata de actualizare de 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Cea mai ridicată rată de actualizare, pentru receptivitate la atingere îmbunătățită și animații de calitate. Mărește utilizarea bateriei."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atenție la ecran"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Activat/Ecranul nu se va închide dacă vă uitați la el"</string>
@@ -1301,6 +1319,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Când ecranul este întunecat, el se activează pentru notificări noi"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Afișează mereu ora și informațiile"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Utilizare ridicată a bateriei"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Text cu caractere aldine"</string>
     <string name="title_font_size" msgid="570613010306330622">"Dimensiunea fontului"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Măriți sau micșorați textul"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Setări de blocare a cardului SIM"</string>
@@ -1350,7 +1369,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versiune Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Actualizare de securitate Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model și hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versiune de hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID echipament"</string>
@@ -1599,7 +1617,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Ștergeți APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN nou"</string>
     <string name="menu_save" msgid="6611465355127483100">"Salvați"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Renunțați"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Anulați"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Câmpul Nume nu poate fi necompletat."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Numele APN nu poate fi necompletat."</string>
@@ -1614,8 +1632,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Aplicațiile pot fi resetate"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Resetați Wi-Fi, date mobile și Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Astfel, toate setările pentru rețea vor fi reinițializate, inclusiv:\n\n"<li>"Wi‑Fi,"</li>\n<li>"date mobile,"</li>\n<li>"Bluetooth."</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Ștergeți"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Ștergeți SIM-urile descărcate"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Pentru a descărca SIM-urile de înlocuire, contactați operatorul. Nu se va anula niciun abonament de servicii mobile."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Acest lucru nu va anula niciun abonament de servicii mobile. Pentru a descărca SIM-uri de înlocuire, contactați operatorul."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Resetați setările"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Restabiliți toate setările pentru rețea? Nu puteți anula această acțiune."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Resetați toate setările pentru rețea și ștergeți SIM-urile descărcate? Nu puteți anula această acțiune."</string>
@@ -1625,31 +1644,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Setările pentru rețea au fost reinițializate"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Nu se pot șterge SIM-urile"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"SIM-urile descărcate nu pot fi șterse din cauza unei erori.\n\nReporniți dispozitivul și încercați din nou."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Ștergeți toate datele (reveniți la setările din fabrică)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Ștergeți toate datele (reveniți la setările din fabrică)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a tabletei dvs., inclusiv:\n\n"<li>"Contul dvs. Google,"</li>\n<li>"datele și setările sistemului și ale aplicațiilor,"</li>\n<li>"aplicațiile descărcate."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Această acțiune va șterge toate datele din "<b>"stocarea internă"</b>" a telefonului dvs., inclusiv:\n\n"<li>"Contul dvs. Google;"</li>\n<li>"Datele și setările sistemului și ale aplicațiilor;"</li>\n<li>"Aplicațiile descărcate;"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"În prezent sunteți conectat(ă) la următoarele conturi:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Pe acest dispozitiv sunt prezenți și alți utilizatori.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muzică;"</li>\n<li>"Fotografii;"</li>\n<li>"Alte date ale utilizatorului."</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"Carduri eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Planul dvs. de servicii mobile nu va fi anulat astfel."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ștearsă."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie șters."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Ștergeți datele (reveniți la setările din fabrică)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Ștergeți datele (reveniți la setările din fabrică)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Această acțiune va șterge toate datele din "<b>"memoria internă"</b>" a tabletei, inclusiv:\n\n"<li>"Contul dvs. Google,"</li>\n<li>"datele și setările sistemului și ale aplicațiilor,"</li>\n<li>"aplicațiile descărcate."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Această acțiune va șterge toate datele din "<b>"memoria internă"</b>" a telefonului, inclusiv:\n\n"<li>"Contul dvs. Google,"</li>\n<li>"datele și setările sistemului și ale aplicațiilor,"</li>\n<li>"aplicațiile descărcate."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"V-ați conectat la următoarele conturi:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Pe acest dispozitiv sunt prezenți și alți utilizatori.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"muzică;"</li>\n<li>"fotografii;"</li>\n<li>"alte date ale utilizatorului."</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"carduri eSIM,"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Planul dvs. de servicii mobile nu va fi anulat astfel."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"stocarea USB"</b>" trebuie să fie ștearsă."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Pentru a șterge muzică, imagini și alte date ale utilizatorului, "<b>"cardul SD"</b>" trebuie să fie șters."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Ștergeți stocarea USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Ștergeți cardul SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ștergeți toate datele din stocarea USB internă, cum ar fi muzica sau fotografiile"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Ștergeți toate datele de pe cardul SD, cum ar fi muzica sau fotografiile"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Ștergeți toate datele"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Ștergeți toate datele"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Toate informațiile cu caracter personal și aplicațiile descărcate vor fi șterse. Nu puteți anula această acțiune."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Toate informațiile cu caracter personal, inclusiv aplicațiile și SIM-urile descărcate, vor fi șterse. Nu puteți anula această acțiune."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Ștergeți tot"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nu a fost efectuată nicio resetare, deoarece serviciul Golire sistem nu este disponibil."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Ștergeți toate datele?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Revenirea la setările din fabrică nu este disponibilă pentru acest utilizator"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Se șterge"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Așteptați..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Ștergeți toate datele"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Ștergeți toate datele"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Toate informațiile cu caracter personal și aplicațiile descărcate vor fi șterse. Nu puteți anula această acțiune."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Toate informațiile cu caracter personal, inclusiv aplicațiile și SIM-urile descărcate, vor fi șterse. Nu puteți anula această acțiune."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Ștergeți toate datele?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Revenirea la setările din fabrică nu este disponibilă pentru acest utilizator"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Se șterge"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Așteptați…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Setări pentru apeluri"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Activați mesageria vocală, redirecționarea apelurilor, apelul în așteptare, ID apelant"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Tethering prin USB"</string>
@@ -1697,7 +1714,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Este imposibil tethering cu peste <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispozitive."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> va fi deconectat."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Tethering Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Permiteți accesul la conexiunea de internet a telefonului prin USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Permiteți accesul la conexiunea de internet a telefonului prin Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Folosiți hotspotul și tetheringul pentru a oferi o conexiune de internet altor dispozitive prin conexiunea dvs. de date mobile. Și aplicațiile pot crea un hotspot pentru a trimite conținut dispozitivelor din apropiere."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Folosiți hotspotul și tetheringul pentru a oferi o conexiune de internet altor dispozitive prin conexiunea dvs. Wi-Fi sau de date mobile. Aplicațiile pot crea și un hotspot pentru a trimite conținut dispozitivelor din apropiere."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ajutor"</string>
@@ -1740,6 +1757,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Căutare Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Permiteți aplicațiilor și serviciilor să caute permanent dispozitive din apropiere, chiar și atunci când setarea Bluetooth este dezactivată. Această permisiune poate fi folosită, de exemplu, pentru a îmbunătăți funcțiile și serviciile bazate pe locație."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Servicii de localizare pentru serviciu"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Detectarea fusului orar al locației"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Detectarea fusului orar al locației"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Permite folosirea locației dispozitivului pentru a detecta fusul orar actual. Alte setări privind locația, cum ar fi căutarea de rețele Wi-Fi, pot afecta precizia detectării fusului orar."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Activată"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Dezactivată"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Detectarea automată a fusului orar este dezactivată"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Detectarea fusului orar al locației este dezactivată"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Detectarea fusului orar al locației nu este acceptată"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Modificările detectării fusului orar al locației nu sunt permise"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Localizare prin Wi-Fi și mobil"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Aplicațiile estimează mai rapid locația cu serviciul de localizare Google. Se colectează/trimit la Google date anonime de localizare."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Locație stabilită prin Wi-Fi"</string>
@@ -1803,6 +1829,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Setați parola pentru deblocarea facială"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Setați modelul pentru deblocarea facială"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Setați parola pentru deblocarea facială"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Setați backupul de deblocare biometrică"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Setați backupul de deblocare biometrică"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Setați backupul de deblocare biometrică"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Ați uitat parola?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Ați uitat modelul?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Ați uitat codul PIN?"</string>
@@ -2141,13 +2170,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferințe pentru subtitrări"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Mărire"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Zona de mărire"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Mărire activată"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Alegeți zonele pe care doriți să le măriți atunci când măriți ecranul"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Ecran complet"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"O parte a ecranului"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Ecran complet și o parte a ecranului"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Măriți întregul ecran"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Măriți o parte a ecranului"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Comutați la butonul de accesibilitate?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Dacă folosiți tripla atingere pentru a mări o parte a ecranului, veți întârzia tastarea și alte acțiuni.\n\nComutați la folosirea butonului de accesibilitate pentru a mări?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Comutați la butonul de accesibilitate"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mențineți tripla atingere pentru a mări"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Setări pentru mărire"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Măriți atingând de trei ori"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Măriți folosind scurtătura"</string>
@@ -2201,11 +2233,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Butonul de pornire închide"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Cursor mare pentru mouse"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Eliminați animațiile"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Combinați canalele când redați conținutul audio"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balans audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Stânga"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Dreapta"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audio mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Combinați canalele când redați conținutul audio"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balans audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Stânga"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Dreapta"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Prestabilit"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 secunde"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 de secunde"</string>
@@ -2235,11 +2267,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibrații la notificare"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibrațiile soneriei"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback la atingere"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Folosiți <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Deschideți <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Utilizați corecție de culoare"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Afișează subtitrările"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Numai pentru aplicațiile compatibile"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Folosiți <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Deschideți <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Folosiți corecția culorii"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Afișează subtitrările"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Numai pentru aplicațiile compatibile"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Dimensiunea și stilul subtitrărilor"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Dimensiunea textului: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Mai multe opțiuni"</string>
@@ -2270,6 +2302,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomalie"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalie"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalie"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Tonuri de gri"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Roșu-verde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Roșu-verde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Albastru-galben"</string>
@@ -2405,7 +2438,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Restricție de fundal"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Permiteți aplicației să ruleze în fundal"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplicației nu i se permite să ruleze în fundal"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Utilizarea în fundal nu poate fi restricționată"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Utilizarea în fundal nu poate fi restricționată"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitați activitatea de fundal?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Dacă limitați activitatea de fundal pentru o aplicație, aceasta se poate comporta necorespunzător"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplicația nu optimizează bateria, deci nu o puteți restricționa.\n\nPentru a o restricționa, activați optimizarea bateriei."</string>
@@ -2454,6 +2487,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tabletă folosită mai mult decât de obicei"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Dispozitiv folosit mai mult decât de obicei"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Bateria se poate descărca mai repede decât de obicei"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Se fac optimizări pentru buna funcționare a bateriei"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Baterie limitată temporar. Atingeți ca să aflați mai multe."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefonul dvs. a fost folosit mai mult decât de obicei. Este posibil ca bateria să se descarce mai repede decât vă așteptați.\n\nAplicațiile care folosesc bateria cel mai mult:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tableta a fost folosită mai mult decât de obicei. Este posibil ca bateria să se descarce mai repede decât vă așteptați.\n\nAplicațiile care folosesc bateria cel mai mult:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Dispozitivul dvs. a fost folosit mai mult decât de obicei. Este posibil ca bateria să se descarce mai repede decât vă așteptați.\n\nAplicațiile care folosesc bateria cel mai mult:"</string>
@@ -2516,6 +2551,8 @@
       <item quantity="one">%1$d aplicație restricționată</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problemă la citirea măsurării bateriei"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problemă la citirea măsurării bateriei Atingeți "<annotation id="url">"ca să aflați mai multe"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Opriți aplicația?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2629,9 +2666,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Setați un program"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Prelungiți autonomia bateriei"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Dezactivează când este încărcat complet"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Economisirea bateriei se dezactivează când telefonul este la <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Economisirea bateriei se dezactivează când tableta este la <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Economisirea bateriei se dezactivează când dispozitivul este la <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Economisirea bateriei se dezactivează când telefonul se încarcă peste <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Economisirea bateriei se dezactivează când tableta se încarcă peste <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Economisirea bateriei se dezactivează când dispozitivul se încarcă peste <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Activați"</string>
@@ -2696,6 +2733,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Resetați"</string>
     <string name="tts_play" msgid="2945513377250757221">"Redați"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Conectivitate adaptabilă"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Extinde autonomia bateriei și îmbunătățește performanța dispozitivului, gestionând automat conexiunile la rețea"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Stocarea certificatelor"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalați un certificat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalați certificate de pe stocare"</string>
@@ -2707,9 +2746,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Date de conectare utilizator"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Vedeți și modificați datele de conectare stocate"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avansate"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Tip de stocare"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Stocare hardware"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Stocare software"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Datele de conectare nu sunt disponibile pentru acest utilizator"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instalate pentru VPN și aplicații"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instalate pentru Wi-Fi"</string>
@@ -2725,6 +2761,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Nu instalați"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instalați oricum"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certificatul nu a fost instalat"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Permiteți ca <xliff:g id="APP_NAME">%s</xliff:g> să instaleze certificate pe acest dispozitiv?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Aceste certificate vă vor identifica pentru aplicațiile și adresele URL de mai jos"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Nu permiteți"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Permiteți"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Afișați mai multe"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Aplicație de gestionare a certificatelor"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Niciuna"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certificatele instalate de această aplicație vă vor identifica pentru aplicațiile și adresele URL de mai jos"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Eliminați"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Semnal pentru apel de urgență"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Setați comportamentul la efectuarea unui apel de urgență"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Backup"</string>
@@ -3053,7 +3098,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Neconfigurat – Profil de serviciu"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Dvs. (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudonim"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Puteți adăuga până la <xliff:g id="USER_COUNT">%1$d</xliff:g>   utilizatori"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Numai proprietarul tabletei poate gestiona utilizatorii."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Numai proprietarul telefonului poate gestiona utilizatorii."</string>
@@ -3103,7 +3147,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Plata la terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Configurați o aplicație de plată. Apoi, apropiați spatele telefonului de orice terminal pe care apare simbolul de plată fără contact."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Am înțeles"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mai multe..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mai multe…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Setați aplicația de plată prestabilită"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Actualizați aplicația de plată prestabilită"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"La un terminal contactless, plătiți cu <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3173,9 +3217,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Înapoi"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Înainte"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Finalizați"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Faceți o fotografie"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Alegeți o imagine"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Selectați o fotografie"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Carduri SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Carduri SIM"</string>
@@ -3187,7 +3228,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Utilizați întotdeauna pentru apeluri"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Selectați o cartelă SIM pentru date"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Selectați un card SIM pentru SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Se comută cardul SIM pentru date. Poate dura până la un minut..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Se comută cardul SIM pentru date. Poate dura până la un minut…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Apelați de pe"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Selectați un card SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3372,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutină, program, economisirea bateriei, economisirea energiei, baterie, automat, procent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, apelare avansată, apelare 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"adăugare limbă, adăugați o limbă"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"dimensiunea textului"</string>
     <string name="default_sound" msgid="6604374495015245195">"Sunet prestabilit"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volumul pentru sonerie și notificări la <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volum, vibrații, Nu deranja"</string>
@@ -3370,12 +3412,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Sunete la pornire"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Subtitrări live"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Adăugați subtitrări automate la fișierele media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Nicio regulă"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> programe setate</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> de programe setate</item>
-      <item quantity="one">Un program setat</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Niciunul}=1{Un program setat}few{# programe setate}other{# de programe setate}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Nu deranja"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Primiți doar notificări de la persoane și aplicații importante"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitați întreruperile"</string>
@@ -3443,22 +3480,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Numai cu prioritate"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Activat/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Dezactivat/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Dezactivat"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Activat"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Întreabă de fiecare dată"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Până când dezactivați"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> ore</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> de ore</item>
-      <item quantity="one">O oră</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minute"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> programe se pot activa automat</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> de programe se pot activa automat</item>
-      <item quantity="one">Un program se poate activa automat</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{O oră}few{# ore}other{# de ore}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{Un minut}few{# minute}other{# de minute}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Dezactivat}=1{Dezactivat/Un program se poate activa automat}few{Dezactivat/# programe se pot activa automat}other{Dezactivat/# de programe se pot activa automat}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ce poate întrerupe modul Nu deranja"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Persoane"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplicații"</string>
@@ -3504,6 +3531,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Setați automat ca Discrete notificările cu prioritate redusă"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Poziționare adaptivă a notificărilor"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Poziționați automat notificările după relevanță"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback pentru notificările adaptabile"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Indicați ajustările notificărilor și afișați opțiunea de a oferi feedback pentru sistem"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Resetați importanța notificărilor"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Resetați setările de importanță schimbate de utilizator și permiteți-i asistentului de notificări să stabilească priorități"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Acțiuni și răspunsuri sugerate"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Afișați automat acțiunile și răspunsurile sugerate"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Afișați notificările recente și pe cele amânate"</string>
@@ -3602,8 +3633,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Conversații cu prioritate"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Se afișează în partea de sus a secțiunii de conversație și apar în baloane flotante"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Se afișează în partea de sus a secțiunii de conversație"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Alte conversații"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Conversații fără prioritate"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Conversații pe care le-ați modificat"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Conversații recente"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Ștergeți conversațiile recente"</string>
+    <string name="clear" msgid="5092178335409471100">"Ștergeți"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Afișează în balon conversațiile cu prioritate"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Conversațiile cu prioritate apar în partea de sus a panoului de notificări tras în jos. Le puteți seta să se afișeze în baloane și să întrerupă funcția Nu deranja."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Conversațiile cu prioritate și cele modificate vor apărea aici"</string>
@@ -3705,7 +3739,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Acces la funcția Nu deranja"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Permiteți modul Nu deranja"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nicio aplicație instalată nu a solicitat accesul Nu deranja"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Se încarcă aplicațiile..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Se încarcă aplicații…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"La solicitarea dvs., Android blochează notificările acestei aplicații pe dispozitiv"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"La solicitarea dvs., Android blochează această categorie de notificări pe dispozitiv"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"La solicitarea dvs., Android blochează acest grup de notificări pe dispozitiv"</string>
@@ -3800,12 +3834,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Toate conversațiile"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Conversații cu prioritate"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Niciuna"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversații</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> de conversații</item>
-      <item quantity="one">O conversație</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Niciuna"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Niciuna}=1{O conversație}few{# conversații}other{# de conversații}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Cine îl poate întrerupe"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Apeluri"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Apeluri"</string>
@@ -3814,12 +3843,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Pentru a vă asigura că apelurile permise emit sunete, verificați dacă dispozitivul este setat să sune"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Pentru „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>”, apelurile primite sunt blocate. Puteți să modificați setările ca să le permiteți prietenilor, familiei sau altor persoane de contact să vă contacteze."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Persoane din agendă marcate cu stea"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="few">încă <xliff:g id="NUM_PEOPLE">%d</xliff:g> persoane</item>
-      <item quantity="other">încă <xliff:g id="NUM_PEOPLE">%d</xliff:g> de persoane</item>
-      <item quantity="one">încă o persoană</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Niciuna"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Niciuna}=1{{contact_1}}=2{{contact_1} și {contact_2}}=3{{contact_1}, {contact_2} și {contact_3}}few{{contact_1}, {contact_2} și încă #}other{{contact_1}, {contact_2} și încă #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Fără nume)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mesaje"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mesaje"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mesaje"</string>
@@ -3828,12 +3853,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Pentru „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>”, mesajele primite sunt blocate. Puteți să modificați setările ca să le permiteți prietenilor, familiei sau altor persoane de contact să ia legătura cu dumneavoastră."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Toate mesajele ajung la dvs."</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Toate apelurile ajung la dvs."</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Niciuna"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> persoane de contact</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> de persoane de contact</item>
-      <item quantity="one">O persoană de contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Niciuna}=1{O persoană de contact}few{# persoane de contact}other{# de persoane de contact}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Oricine"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Agendă"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Persoane din agendă marcate cu stea"</string>
@@ -3871,24 +3891,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Toate notificările"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Anumite notificări"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Persoanele selectate vă pot contacta chiar dacă nu permiteți ca aplicațiile să îl întrerupă"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="few"><xliff:g id="APP_NAMES">%s</xliff:g> îl pot întrerupe</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> îl pot întrerupe</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> îl poate întrerupe</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Încă <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nicio aplicație nu îl poate întrerupe}=1{{app_1} îl poate întrerupe}=2{{app_1} și {app_2} îl pot întrerupe}=3{{app_1}, {app_2} și {app_3} îl pot întrerupe}few{{app_1}, {app_2} și încă # îl pot întrerupe}other{{app_1}, {app_2} și încă # îl pot întrerupe}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplicații"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Toate notificările"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Anumite notificări"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Notificări care îl pot întrerupe"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Permiteți toate notificările"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> îl pot întrerupe</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> îl pot întrerupe</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> îl poate întrerupe</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nimic nu îl poate întrerupe"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Încă <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nimic nu îl poate întrerupe}=1{{sound_category_1} îl poate întrerupe}=2{{sound_category_1} și {sound_category_2} îl pot întrerupe}=3{{sound_category_1}, {sound_category_2} și {sound_category_3} îl pot întrerupe}few{{sound_category_1}, {sound_category_2} și încă # îl pot întrerupe}other{{sound_category_1}, {sound_category_2} și încă # îl pot întrerupe}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nimic nu îl poate întrerupe"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nimeni nu îl poate întrerupe"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Anumite persoane îl pot întrerupe"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Oricine îl poate întrerupe"</string>
@@ -3936,8 +3946,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Activat"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Dezactivat"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Fixarea aplicației"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Cu ajutorul fixării aplicației, puteți fixa aplicația actuală pentru a rămâne vizibilă până la anularea fixării. Această funcție poate fi folosită, de exemplu, pentru a-i permite unui prieten de încredere să joace un anumit joc. \n\nAtunci când o aplicație este fixată, aceasta poate deschide alte aplicații și pot fi accesate date cu caracter personal. \n\nPentru a folosi fixarea aplicației: 	\n1.	activați fixarea aplicației; 	\n2.	deschideți Recente; 	\n3.	atingeți pictograma aplicației din partea de sus a ecranului, apoi atingeți Fixați."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Cu ajutorul fixării aplicației, puteți fixa aplicația actuală pentru a rămâne vizibilă până la anularea fixării. Această funcție poate fi folosită, de exemplu, pentru a-i permite unui prieten de încredere să joace un anumit joc. \n\nAtunci când o aplicație este fixată, aceasta poate deschide alte aplicații și pot fi accesate date cu caracter personal. \n\nDacă doriți să permiteți în siguranță accesul cuiva la dispozitivul dvs., folosiți un utilizator invitat. \n\nPentru a folosi fixarea aplicației: 	\n1.	activați fixarea aplicației; 	\n2.	deschideți Recente; 	\n3.	atingeți pictograma aplicației din partea de sus a ecranului, apoi atingeți Fixați."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Cu ajutorul fixării aplicației, puteți fixa aplicația actuală pentru a rămâne vizibilă până la anularea fixării. Această funcție poate fi folosită, de exemplu, pentru a-i permite unui prieten de încredere să joace un anumit joc."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Atunci când o aplicație este fixată, aceasta poate deschide alte aplicații și pot fi accesate date cu caracter personal. \n\nPentru a folosi fixarea aplicației: 	\n1.	activați fixarea aplicației; 	\n2.	deschideți Recente; 	\n3.	atingeți pictograma aplicației din partea de sus a ecranului, apoi atingeți Fixați."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Atunci când o aplicație este fixată, aceasta poate deschide alte aplicații și pot fi accesate date cu caracter personal. \n\nDacă doriți să permiteți în siguranță accesul cuiva la dispozitivul dvs., folosiți un utilizator invitat. \n\nPentru a folosi fixarea aplicației: 	\n1.	activați fixarea aplicației; 	\n2.	deschideți Recente; 	\n3.	atingeți pictograma aplicației din partea de sus a ecranului, apoi atingeți Fixați."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Atunci când o aplicație este fixată: \n\n•		pot fi accesate date cu caracter personal \n		(cum ar fi agenda și conținutul e-mailurilor); \n•		aplicația fixată poate deschide alte aplicații. \n\nFolosiți fixarea aplicației numai cu persoane în care aveți încredere."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Solicită mai întâi modelul pentru deblocare"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Solicită codul PIN înainte de a anula fixarea"</string>
@@ -3959,6 +3970,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"În plus față de folosirea chipului pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând codul PIN înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați un cod PIN pentru a vă porni dispozitivul?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"În plus față de folosirea chipului pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând modelul înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să se solicite un model pentru a vă porni dispozitivul?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"În plus față de folosirea chipului pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând parola înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări, inclusiv alarme, până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să se solicite o parolă pentru a vă porni dispozitivul?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"În plus față de folosirea sistemelor biometrice pentru deblocarea dispozitivului, puteți să protejați și mai bine dispozitivul setând solicitarea codului PIN înainte de pornire. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să folosiți codul PIN pentru a porni dispozitivul?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"În plus față de folosirea sistemelor biometrice pentru deblocarea dispozitivului, puteți să protejați și mai bine dispozitivul setând solicitarea modelului înainte de pornire. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să folosiți modelul pentru a porni dispozitivul?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"În plus față de folosirea sistemelor biometrice pentru deblocarea dispozitivului, puteți să protejați și mai bine dispozitivul setând solicitarea parolei înainte de pornire. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să folosiți parola pentru a porni dispozitivul?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Da"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nu"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Restricționată"</string>
@@ -4142,7 +4156,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB controlat de"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Dispozitiv conectat"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Acest dispozitiv"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Se comută..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Se comută…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nu s-a putut comuta"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Încărcarea acestui dispozitiv"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Se încarcă dispozitivul conectat"</string>
@@ -4340,6 +4354,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Utilizarea datelor mobile"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Date utilizate de aplicații"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Utilizarea datelor Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Utilizarea datelor în rețele diferite de cele de operator"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Utilizarea datelor ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4359,6 +4374,7 @@
       <item quantity="one">1 restricție</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Cuantificarea datelor de către operator poate fi diferită de cea de pe dispozitiv"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Sunt excluse datele folosite în rețele de operator"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Date utilizate: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Setați avertisment pentru date"</string>
     <string name="data_warning" msgid="2925054658166062884">"Avertisment pentru date"</string>
@@ -4396,7 +4412,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Vedeți detaliile"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Economizor de date"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Date nerestricționate"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Datele de fundal sunt dezactivate"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Datele de fundal sunt dezactivate"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Activat"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Dezactivat"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Utilizați economizorul de date"</string>
@@ -4419,7 +4435,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Dacă dispozitivul este blocat, nu permiteți scrierea răspunsurilor sau a altui text în notificări"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Verificator ortografic prestabilit"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Alegeți verificatorul ortografic"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Utilizați verificatorul ortografic"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Folosiți verificatorul ortografic"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Neselectat"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(niciunul)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4529,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Eliminați fotografii și videoclipuri"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Managerul spațiului de stocare"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Utilizați Managerul spațiului de stocare"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Folosiți Managerul stocării"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automat"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuale"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Eliberați spațiu acum"</string>
@@ -4551,6 +4567,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Atingeți de două ori pentru a verifica telefonul"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Atingeți de două ori pentru a verifica tableta"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Atingeți de două ori pentru a verifica dispozitivul"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Glisați pentru notificări"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Glisați spre marginea de jos a ecranului ca să afișați notificările"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modul cu o mână"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Folosiți modul cu o mână"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Părăsiți la comutarea aplicațiilor"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timp limită"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 secunde"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 secunde"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 secunde"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"accesibilitate"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ca să verificați ora, notificările și alte informații, atingeți ecranul de două ori."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Ridicați pentru a verifica telefonul"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Ridicați pentru a verifica tableta"</string>
@@ -4563,6 +4589,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Atingeți pentru a verifica tableta"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Atingeți pentru a verifica dispozitivul"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ca să verificați ora, notificările și alte informații, atingeți ecranul."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS urgențe"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Folosiți funcția SOS urgențe"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Gestionat de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Inițiați acțiunile de mai jos apăsând rapid butonul de pornire de cel puțin cinci ori"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Se redă alarma cu numărătoare inversă"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Se redă un semnal sonor puternic înainte de a cere ajutor"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Apelați pentru ajutor"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Numărul de apelat pentru ajutor"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Atingeți pentru a modifica"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Dacă introduceți un număr care nu este de urgență:\n • dispozitivul trebuie să fie deblocat pentru a folosi SOS-ul de urgențe\n • Este posibil să nu vi se răspundă la apel"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Glisați amprenta pentru notificări"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Glisați amprenta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Pentru a verifica notificările, glisați în jos pe senzorul de amprentă de pe spatele telefonului."</string>
@@ -4695,6 +4731,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Seturi de date cu vizibilitate maximă"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Resetați la valorile prestabilite"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Opțiunile dezvoltatorului de completare automată au fost resetate"</string>
+    <string name="location_category" msgid="3496759112306219062">"Locație"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicator de locația pentru bara de stare"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Afișați pentru toate locațiile, inclusiv rețeaua și conectivitatea"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forțați măsurători GNSS complete"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Urmăriți toate constelațiile și frecvențele GNSS fără ciclu de funcționare"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema dispozitivului"</string>
     <string name="default_theme" msgid="4815428567082263639">"Prestabilită"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Numele rețelei"</string>
@@ -4711,8 +4752,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Întrerupeți notificările pentru a vă păstra concentrarea"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funcție indisponibilă"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Această funcție a fost dezactivată deoarece vă încetinește telefonul"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Forțați măsurători GNSS complete"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Urmăriți toate constelațiile și frecvențele GNSS fără ciclu de funcționare"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Afișați întotdeauna caseta de dialog pentru blocări"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Afișați caseta de dialog de fiecare dată când se blochează o aplicație"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Selectați aplicația compatibilă cu ANGLE"</string>
@@ -4724,7 +4763,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Activați pentru toate aplicațiile"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Selectați driverul plăcii grafice"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Prestabilit"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Driverul jocului"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Driverul jocului"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Driverul plăcii grafice de sistem"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4780,7 +4819,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Activată (sunet dezactivat)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Dezactivată"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detalii despre rețea"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Numele dispozitivului este vizibil aplicațiilor de pe telefon. Poate fi văzut și de alte persoane când vă conectați la dispozitivele Bluetooth sau configurați un hotspot Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Numele dispozitivului este vizibil pentru aplicațiile de pe telefon. Poate fi văzut și de alte persoane când vă conectați la dispozitivele Bluetooth sau la o rețea Wi-Fi sau când configurați un hotspot Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Dispozitive"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Toate setările"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Sugestii"</string>
@@ -4793,6 +4832,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nu s-au găsit rețele. Încercați din nou."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(interzisă)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Niciun card SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Niciun card SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Fără"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Necesită un card SIM pentru a se conecta"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Necesită un card SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> pentru a se conecta"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mod de rețea preferat: de preferat WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mod de rețea preferat: numai GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mod de rețea preferat: numai WCDMA"</string>
@@ -4846,6 +4890,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Date mobile"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Accesați datele folosind rețeaua mobilă"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefonul va comuta automat la acest operator când se află în aria de acoperire"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nu este disponibil niciun card SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferință pentru apeluri"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferințe pentru SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Întreabă mereu"</string>
@@ -4907,6 +4952,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Indisponibil când este conectat la <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Vedeți mai multe"</string>
     <string name="see_less" msgid="2642392725363552793">"Afișați mai puține"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Activați <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Activați SIM-ul?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Treceți la <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Folosiți cardul SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Doar un SIM poate fi activ odată.\n\nCând comutați la <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nu anulați serviciul <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Doar un SIM descărcat poate fi activ odată.\n\nCând comutați la <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nu anulați serviciul <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Doar un SIM poate fi activ odată.\n\nCând comutați, nu anulați serviciul <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Treceți la <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Se conectează la rețea…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Se trece la <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Nu puteți schimba operatorul"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Nu puteți schimba operatorul din cauza unei erori."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Dezactivați <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Dezactivați SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Se dezactivează cardul SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Nu se poate dezactiva operatorul"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"A apărut o eroare și operatorul dvs. nu a putut fi dezactivat."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Folosiți două carduri SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Acest dispozitiv poate avea două carduri SIM active simultan. Pentru a folosi în continuare câte un card SIM odată, atingeți „Nu, mulțumesc”."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Reporniți dispozitivul?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Pentru a începe, reporniți dispozitivul. Apoi puteți adăuga un alt SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Continuați"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Reporniți"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nu, mulțumesc"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Schimbați"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Nu se poate activa SIM-ul"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Scoateți SIM-ul și introduceți-l din nou. Dacă problema persistă, reporniți dispozitivul."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Încercați din nou să activați SIM-ul. Dacă problema persistă, reporniți dispozitivul."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Activarea rețelei"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> este activ"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Atingeți pentru a actualiza setările SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Card SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Ștergeți acest SIM descărcat?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Dacă ștergeți acest SIM, veți elimina serviciul <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> de pe acest dispozitiv.\n\nServiciile <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> nu vor fi anulate."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Ștergeți"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Se șterge SIM-ul…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Nu se poate șterge SIM-ul"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Acest SIM nu poate fi șters din cauza unei erori.\n\nReporniți dispozitivul și încercați din nou."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Conectați la dispozitiv"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplicația <xliff:g id="APPNAME">%1$s</xliff:g> vrea să folosească o rețea Wi-Fi temporară pentru a se conecta la dispozitiv"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nu s-au găsit dispozitive. Asigurați-vă că dispozitivele sunt pornite și gata de conectare."</string>
@@ -4980,6 +5063,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Apeluri de urgență"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Apelurile de urgență prin Apelare prin Wi-Fi nu sunt acceptate de operator.\nDispozitivul comută automat la o rețea mobilă pentru a face un apel de urgență.\nApelurile de urgență sunt posibile numai în zonele cu acoperire a rețelelor de telefonie mobilă."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Folosiți Wi-Fi pentru apeluri ca să îmbunătățiți calitatea"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Apelare pe mai multe carduri SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Acceptați apeluri și SMS-uri de pe alt SIM în locul celor de pe acest SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"apelare pe mai multe carduri SIM"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Mesaj MMS primit"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Nu se poate trimite mesajul MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Atingeți pentru a permite mesageria MMS pentru <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> când datele mobile sunt dezactivate"</string>
@@ -5031,10 +5117,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Permiteți suprapunerile pe ecrane din Setări"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Permiteți aplicații care se pot afișa deasupra altora prin suprapunerea pe ecranele de Setări"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ascunde playerul după încheierea sesiunii media"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Cu ajutorul playerului, puteți relua o sesiune din panoul extins Setări rapide."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Playerul media din Setările rapide"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Afișați playerul media pentru o perioadă extinsă ca să reluați ușor redarea"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ascunde playerul"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Afișează playerul"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Niciun player disponibil"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplicații permise"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth se va activa"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Activat"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Dezactivat"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Carduri SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Rețele sigure pentru avioane"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Găsiți rețele sigure pentru avioane și conectați-vă la ele"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"avion, sigure pentru avion"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Apeluri și SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Apelare prin Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Inițiați și primiți apeluri prin rețele diferite de cele de operator, cum ar rețelele Wi-Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Cu ajutorul apelării prin Wi-Fi, puteți să inițiați și să primiți apeluri prin rețele diferite de cele de operator, cum ar fi rețelele Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Apeluri"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferate"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"apeluri preferate"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS-uri preferate"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"indisponibile"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Niciun card SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferințe"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Conectați-vă la rețele publice"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"conexiune la rețea, internet, wireless, date, wifi, wi-fi, wi fi, celular, mobil, operator servicii mobile, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Vedeți rețelele sigure pentru avioane"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Dezactivați modul Avion"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Indisponibil deoarece modul ora de culcare este activat"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"S-a finalizat resetarea importanței notificărilor."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplicații"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Un dispozitiv care nu prezintă încredere solicită acces la mesajele dvs. Atingeți pentru detalii."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Permiteți accesul la mesaje?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Un dispozitiv Bluetooth care nu prezintă încredere, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], solicită acces la mesajele dvs.\n\nNu v-ați mai conectat la [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Un dispozitiv care nu prezintă încredere solicită acces la agenda și jurnalul dvs. de apeluri. Atingeți pentru detalii."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Permiteți accesul la agendă și la jurnalul de apeluri?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Un dispozitiv Bluetooth care nu prezintă încredere, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], solicită acces la agenda și jurnalul dvs. de apeluri. Aici sunt incluse date despre apelurile primite și efectuate.\n\nNu v-ați mai conectat la [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index c78d052..a3953aa 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Средняя"</item>
     <item msgid="6740026006576843477">"Большая"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Короткая задержка"</item>
+    <item msgid="7397961711906421599">"Средняя задержка"</item>
+    <item msgid="4079132024502041928">"Длительная задержка"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"По умолчанию"</item>
     <item msgid="4234707448428002595">"Без засечек"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA и LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Весь мир"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Только TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Весь мир"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 9c55b9d..7259f55 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -258,8 +258,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Дата и время"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Установить дату и время"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Установка даты, времени, часового пояса и формата"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Использовать время сети"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Использовать часовой пояс сети"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Настраивать время автоматически"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Настраивать часовой пояс автоматически"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Региональные настройки по умолчанию"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-часовой формат"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-часовой формат"</string>
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Показывать информацию профиля на заблокированном экране"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Аккаунты"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Местоположение"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Определять местоположение"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Определять местоположение"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Откл."</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Включено (доступ к данным о местоположении есть у <xliff:g id="COUNT_1">%1$d</xliff:g> приложения)</item>
@@ -326,6 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Блокировка экрана, Фейсконтроль"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Блокировка экрана, отпечаток пальца"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Блокировка экрана"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Разблокировка с помощью фейсконтроля и отпечатков пальцев"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Вы также сможете входить в приложения и подтверждать оплату."</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Выберите способ разблокировки:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Фейсконтроль"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Разблокировать телефон без лишних усилий"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Сканер отпечатков пальцев"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Разблокировать телефон не глядя"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Пропустить"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Далее"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Изображение добавлено"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Настройте фейсконтроль"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Фейсконтроль"</string>
@@ -335,6 +344,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Используйте распознавание лица для аутентификации"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Начать"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Если упрощенная настройка фейсконтроля отключена, некоторые действия при работе с TalkBack могут выполняться некорректно."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Продолжить настройку"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Использовать специальные возможности"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -379,8 +391,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Всегда запрашивать подтверждение фейсконтроля в приложениях"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Удалить данные"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Настроить фейсконтроль"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Используйте фейсконтроль, чтобы разблокировать устройство, входить в приложения и подтверждать платежи.\n\nОбратите внимание!\nПосмотрев на телефон, вы можете случайно разблокировать его.\n\nТелефон может быть разблокирован, если кто-то поднесет его к вашему лицу.\n\nТелефон также может разблокировать человек, очень похожий на вас (например, ваш близнец)."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Используйте фейсконтроль, чтобы разблокировать устройство, входить в приложения и подтверждать платежи.\n\nОбратите внимание!\nПосмотрев на телефон, вы можете случайно разблокировать его.\n\nТелефон может быть разблокирован, если кто-то поднесет его к вашему лицу, даже когда у вас закрыты глаза.\n\nТелефон может разблокировать человек, очень похожий на вас (например, ваш близнец)."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Используйте фейсконтроль, чтобы разблокировать устройство, входить в приложения и подтверждать платежи."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Обратите внимание!\nПосмотрев на телефон, вы можете случайно разблокировать его.\n\nТелефон может быть разблокирован, если кто-то поднесет его к вашему лицу.\n\nТелефон также может разблокировать человек, очень похожий на вас (например, ваш близнец)."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Обратите внимание!\nПосмотрев на телефон, вы можете случайно разблокировать его.\n\nТелефон может быть разблокирован, если кто-то поднесет его к вашему лицу, даже когда у вас закрыты глаза.\n\nТелефон также может разблокировать человек, очень похожий на вас (например, ваш близнец)."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Удалить данные?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Данные, которые используются фейсконтролем для распознавания, будут удалены навсегда и нигде не сохранятся. В дальнейшем для разблокировки телефона, входа в приложения и подтверждения платежей устройство будет запрашивать PIN-код, пароль или графический ключ."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Используйте распознавание лица для разблокировки телефона"</string>
@@ -402,6 +415,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Разблокируйте телефон и подтверждайте покупки, используя отпечатки пальцев.\n\nВнимание! Для разблокировки этого устройства сканер отпечатков использовать нельзя. За подробной информацией обратитесь к администратору."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Разблокируйте телефон и подтверждайте покупки, используя отпечатки пальцев.\n\nПомните, что защита с помощью отпечатков менее надежна, чем графический ключ или PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Отмена"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Нет"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Продолжить"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Пропустить"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Далее"</string>
@@ -439,6 +453,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Для настройки фейсконтроля необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи планшета. Чтобы вернуться назад, нажмите \"Отмена\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Для настройки фейсконтроля необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи устройства. Чтобы вернуться назад, нажмите \"Отмена\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Для настройки фейсконтроля необходимо установить блокировку экрана. Это поможет защитить ваши данные в случае потери или кражи телефона. Чтобы вернуться назад, нажмите \"Отмена\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Для защиты своих данных в случае потери или кражи планшета выберите способ блокировки экрана. Не сделав этого, вы не сможете настроить биометрию. Чтобы вернуться, нажмите \"Отмена\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Для защиты своих данных в случае потери или кражи устройства выберите способ блокировки экрана. Не сделав этого, вы не сможете настроить биометрию. Чтобы вернуться, нажмите \"Отмена\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Для защиты своих данных в случае потери или кражи телефона выберите способ блокировки экрана. Не сделав этого, вы не сможете настроить биометрию. Чтобы вернуться, нажмите \"Отмена\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Не устанавливать PIN-код?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Не устанавливать пароль?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Не устанавливать графический ключ?"</string>
@@ -511,8 +528,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Чтобы никто не мог пользоваться этим устройством без вашего разрешения, активируйте его защиту. Выберите подходящий для вас способ блокировки экрана."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Выберите дополнительный способ блокировки экрана."</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Выберите дополнительный способ блокировки экрана."</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Выберите запасной способ разблокировки экрана."</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Варианты блокировки экрана"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Варианты блокировки экрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Блокировка экрана"</string>
@@ -544,6 +560,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Фейсконтроль + пароль"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Продолжить без использования функции \"Фейсконтроль\""</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Вы можете настроить разблокировку телефона с помощью распознавания лица. В целях безопасности вам нужно будет также установить дополнительный способ блокировки."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрия и графический ключ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрия и PIN-код"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрия и пароль"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Продолжить без биометрии"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Вы можете настроить разблокировку телефона с помощью биометрии. В целях безопасности вам потребуется установить запасной способ разблокировки."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Запрещено администратором или иными правилами"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Нет"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Провести по экрану"</string>
@@ -635,7 +656,6 @@
       <item quantity="other">PIN-код должен содержать менее <xliff:g id="NUMBER_1">%d</xliff:g> цифры</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Использовать недавний PIN-код запрещено"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ИТ-администратор заблокировал простые PIN-коды. Выберите более сложную комбинацию."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Недопустимые символы"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Используйте хотя бы одну букву"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Используйте хотя бы одну цифру"</string>
@@ -683,7 +703,6 @@
       <item quantity="other">Пароль должен содержать хотя бы <xliff:g id="COUNT">%d</xliff:g> нечислового символа.</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Использовать недавний пароль запрещено"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ИТ-администратор заблокировал простые пароли. Выберите более сложную комбинацию."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Нельзя использовать последовательности из идущих подряд или повторяющихся цифр"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Подтвердить"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Отмена"</string>
@@ -829,7 +848,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Включить Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Использовать Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Использовать Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Настройки Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Настройка и управление точками доступа беспроводной сети"</string>
@@ -937,7 +956,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Чтобы подключиться к сети \"<xliff:g id="SSID">%1$s</xliff:g>\", наведите камеру на QR-код ниже."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Чтобы подключиться к сети Wi‑Fi, отсканируйте QR-код."</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Предоставить доступ к Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Чтобы подключиться к сети \"<xliff:g id="SSID">%1$s</xliff:g>\" и поделиться паролем, отсканируйте этот QR-код."</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Чтобы подключиться к сети <xliff:g id="SSID">%1$s</xliff:g>, отсканируйте этот QR-код на другом устройстве."</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Чтобы подключиться к сети \"<xliff:g id="SSID">%1$s</xliff:g>\", отсканируйте этот QR-код."</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Повторите попытку. Если это не поможет, свяжитесь с производителем устройства."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Произошла ошибка."</string>
@@ -963,8 +982,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Пароль сети Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Пароль точки доступа: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Автоматическое подключение"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Разрешить автоматическое подключение в зоне действия этой сети"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Разрешить автоматическое подключение в зоне действия этой сети"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Разрешите подключение к этой сети в зоне ее действия."</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Добавить устройство"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Использовать QR-код, чтобы добавить устройство к этой сети"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Недопустимый формат QR-кода"</string>
@@ -976,7 +994,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Системные сертификаты"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Не указывать"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Не проверять"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Сертификат не указан. Будет установлено незащищенное соединение."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Слишком длинное имя сети."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Укажите домен."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Требуется сертификат."</string>
@@ -1003,6 +1020,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Подключить"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi включен"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Подключено: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Подключение к сети \"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>\"…"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Подключение…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Не удалось подключиться к сети."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Вы не находитесь в зоне действия сети."</string>
@@ -1036,6 +1054,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-адрес устройства"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Случайный MAC-адрес"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Случайный MAC-адрес (последний)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-адрес"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Сведения о сети"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Маска подсети"</string>
@@ -1043,8 +1062,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-адреса"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Сохраненные сети"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Подписки"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Другие сети"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Настройки IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Расширенные настройки Wi‑Fi недоступны для этого пользователя"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Сохранить"</string>
@@ -1053,8 +1071,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Введите действительный адрес шлюза."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Введите действительный DNS-адрес."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Укажите длину префикса сети (от 0 до 32)."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (если не переопределен частным DNS-сервером)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (если не переопределен частным DNS-сервером)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Длина префикса сети"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1080,7 +1098,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Открыт доступ к контенту приложения. Чтобы разрешить другим устройствам использовать ваше интернет-соединение, отключите и снова включите точку доступа."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Пароль не задан"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Название точки доступа"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Подключение к точке доступа \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Включение точки доступа <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Другие устройства могут подключаться к точке доступа \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Пароль точки доступа"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Диапазон частот Wi-Fi"</string>
@@ -1230,7 +1248,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Плавный экран"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Автоматически изменять частоту обновления экрана с 60 до 90 Гц для некоторых типов контента (при этом батарея разряжается быстрее)"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Плавный экран"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Установить частоту обновления экрана 90 Гц"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Высокая частота обновления экрана улучшает ответ на касания и делает анимацию более плавной. При этом батарея разряжается быстрее."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Адаптивный спящий режим"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Включено (экран не будет отключаться, если вы смотрите на него)"</string>
@@ -1321,6 +1339,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Экран включается при появлении новых уведомлений"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Всегда показывать время и информацию"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Батарея разряжается быстрее"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Текст с полужирным шрифтом"</string>
     <string name="title_font_size" msgid="570613010306330622">"Размер шрифта"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Увеличение или уменьшение размера шрифта"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Настройки блокировки SIM-карты"</string>
@@ -1371,7 +1390,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Версия Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Обновление системы безопасности Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Модель"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Модель: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Модель и аппаратное обеспечение"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Версия аппаратного обеспечения"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Идентификатор оборудования"</string>
@@ -1620,7 +1638,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Удалить APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Новая точка доступа"</string>
     <string name="menu_save" msgid="6611465355127483100">"Сохранить"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Отменить"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Отмена"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Необходимо указать имя."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Необходимо указать APN."</string>
@@ -1635,8 +1653,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Вы можете сбросить настройки приложений"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Сбросить настройки Wi-Fi, мобильного Интернета и Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"На устройстве будут сброшены все сетевые настройки, в том числе:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобильный Интернет"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Удалить"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Удалить скачанные SIM-карты"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Чтобы скачать новую SIM-карту, свяжитесь с оператором. Это действие не повлияет на ваши тарифные планы."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Это действие не повлияет на ваши тарифные планы. Чтобы скачать новый профиль eSIM, свяжитесь с оператором связи."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Сбросить настройки"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Сбросить все настройки сети? Это действие нельзя отменить."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Сбросить все сетевые настройки и удалить скачанные SIM-карты? Это действие нельзя отменить."</string>
@@ -1646,31 +1665,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Сетевые настройки сброшены"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Не удалось стереть данные SIM-карт"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Не удалось стереть данные скачанных SIM-карт из-за ошибки.\n\nПерезагрузите устройство и повторите попытку."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Удалить все данные (сброс к заводским настройкам)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Удалить все данные"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Будут удалены все данные из "<b>"внутренней памяти"</b>" планшета, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Установленные приложения"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Будут удалены все данные из "<b>"внутренней памяти"</b>" телефона, в том числе:\n\n"<li>"Ваш аккаунт Google"</li>\n<li>"Настройки/данные системы и приложений"</li>\n<li>"Установленные приложения"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Аккаунты на этом устройстве:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"На этом устройстве есть другие аккаунты пользователей.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Вы не потеряете доступ к услугам оператора связи."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"USB-накопитель"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Чтобы удалить музыку, фотографии и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Удалить все данные"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Удалить все данные"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Будут удалены все сведения из "<b>"внутреннего хранилища"</b>" планшета, в том числе:\n\n"<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"скачанные приложения."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Будут удалены все данные из "<b>"внутренней памяти"</b>" телефона, в том числе:\n\n"<li>"ваш аккаунт Google;"</li>\n<li>"данные и настройки системы и приложений;"</li>\n<li>"скачанные приложения."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Аккаунты на этом устройстве:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"На этом устройстве есть другие аккаунты пользователей.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Музыка"</li>\n<li>"Фото"</li>\n<li>"Другие данные"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Вы не потеряете доступ к услугам оператора связи."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Чтобы удалить музыку, изображения и другие пользовательские данные, необходимо очистить "<b>"USB-накопитель"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Чтобы удалить музыку, фотографии и другие пользовательские данные, необходимо очистить "<b>"SD-карту"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Очистить USB-накопитель"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Очистить SD-карту"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Удалить с USB-накопителя музыку, фотографии и все остальные данные."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Удалить с SD-карты все данные, в том числе музыку и фотографии"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Удалить все данные"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Удалить все данные"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Вся личная информация и загруженные приложения будут удалены. Это действие нельзя отменить."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Вся личная информация, в том числе данные SIM-карт и загруженные приложения, будут удалены. Это действие нельзя отменить."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Стереть все"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Сброс не выполнен, поскольку служба System Clear недоступна."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Удалить все данные?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Этот пользователь не может выполнять сброс настроек"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Удаление…"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Подождите..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Удалить"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Удалить"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Вся личная информация и скачанные приложения будут удалены. Это действие нельзя отменить."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Вся личная информация, в том числе данные SIM-карт и скачанные приложения, будут удалены. Это действие нельзя отменить."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Удалить все данные?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Этот пользователь не может выполнять сброс настроек"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Удаление…"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Подождите…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Вызовы"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Голосовая почта, АОН, переадресация, параллельный вызов"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-модем"</string>
@@ -1718,7 +1735,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Макс. число подключаемых устройств: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Подключение к <xliff:g id="DEVICE_NAME">%1$s</xliff:g> будет прервано."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-модем"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Открыть доступ к интернет-подключению телефона через USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Открыть доступ к интернет-подключению телефона через Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Используйте точку доступа и режим модема, чтобы подключать другие устройства к Интернету, в том числе мобильному. Приложения также могут создавать точки доступа, чтобы делиться контентом с устройствами поблизости."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Используйте точку доступа и режим модема, чтобы подключать другие устройства к Интернету через Wi-Fi или мобильную сеть. Приложения также могут создавать точки доступа, чтобы делиться контентом с устройствами поблизости."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Справка"</string>
@@ -1762,6 +1779,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Поиск Bluetooth-устройств"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Разрешить приложениям и сервисам искать устройства поблизости, даже когда Bluetooth отключен. Это может улучшить работу функций и сервисов, использующих данные о местоположении."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Геолокация для работы"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Определение часового пояса с помощью геолокации"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Определение часового пояса с помощью геолокации"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Позволяет использовать местоположение устройства для того, чтобы определять текущий часовой пояс. На точность могут влиять другие настройки геолокации (например, поиск сетей Wi‑Fi)."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Включено"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Отключено"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Автоматическое определение часовых поясов отключено"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Определение часового пояса с помощью геолокации отключено."</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Определение часового пояса с помощью геолокации не поддерживается."</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Вы не можете изменить настройки определения часового пояса с помощью геолокации."</string>
     <string name="location_network_based" msgid="5247042890080021887">"По координатам сети"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Разрешить отправлять анонимные геоданные и позволить приложениям определять ваше местоположение с помощью Wi-Fi и мобильных сетей"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"С помощью Wi-Fi"</string>
@@ -1825,6 +1851,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Задайте пароль"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Задайте графический ключ"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Задайте PIN-код"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Настройте запасной способ разблокировки"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Настройте запасной способ разблокировки"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Настройте запасной способ разблокировки"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Забыли пароль?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Забыли графический ключ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Забыли PIN-код?"</string>
@@ -2165,13 +2194,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Настройки субтитров"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Увеличение"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Область увеличения"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Включение увеличения"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Выберите область увеличения экрана."</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Весь экран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Часть экрана"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Весь экран или его часть"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Увеличить весь экран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Увеличить часть экрана"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Использовать кнопку специальных возможностей?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Увеличение части экрана тройным нажатием приведет к задержкам при вводе текста и выполнении других действий.\n\nИспользовать для увеличения кнопку специальных возможностей?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Использовать кнопку специальных возможностей"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Увеличивать экран тройным нажатием"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Настройки увеличения"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Увеличение по тройному нажатию"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Увеличение с помощью кнопки"</string>
@@ -2225,11 +2257,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Кн. питания завершает вызов"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Крупный указатель мыши"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Удалить анимации"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Монофонический звук"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Объединять каналы при воспроизведении аудио"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс звука"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Левый канал"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Правый канал"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Монофонический звук"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Объединять каналы при воспроизведении аудио"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс звука"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Левый канал"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Правый канал"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"По умолчанию"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2259,11 +2291,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вибрация при уведомлении"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вибрация при звонке"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Вибрация при касании"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Использовать <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Открыть приложение \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Использовать коррекцию цвета"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Показывать субтитры"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Только для приложения, в котором поддерживается эта функция"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Использовать приложение \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Открыть <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Использовать коррекцию цвета"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Показывать субтитры"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Только для приложения, в котором поддерживается эта функция"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Размер и стиль субтитров"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Размер шрифта: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Ещё"</string>
@@ -2295,6 +2327,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дейтераномалия"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалия"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалия"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Оттенки серого"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Красный и зеленый"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Красный и зеленый"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синий и желтый"</string>
@@ -2436,7 +2469,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ограничение работы в фоновом режиме"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Разрешить приложению работать в фоновом режиме"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Приложению запрещено работать в фоновом режиме"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Невозможно ограничить работу в фоновом режиме"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Невозможно ограничить работу в фоновом режиме"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ограничить работу в фоновом режиме?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Это действие может привести к неправильной работе приложения."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Оптимизация расхода заряда батареи для этого приложения не настроена.\n\nВключите ее, чтобы установить ограничения."</string>
@@ -2485,6 +2518,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Планшет используется больше, чем обычно"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Устройство используется больше, чем обычно"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Заряд батареи расходуется быстрее, чем обычно"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Оптимизация для увеличения срока службы батареи"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Уровень заряда временно ограничен. Нажмите, чтобы узнать подробности."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Телефон используется интенсивнее, чем обычно. Из-за этого батарея может разрядиться быстрее.\n\nПриложения с самым высоким энергопотреблением:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Планшет используется интенсивнее, чем обычно. Из-за этого батарея может разрядиться быстрее.\n\nПриложения с самым высоким энергопотреблением:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Устройство используется интенсивнее, чем обычно. Из-за этого батарея может разрядиться быстрее.\n\nПриложения с самым высоким энергопотреблением:"</string>
@@ -2554,6 +2589,8 @@
       <item quantity="other">%1$d приложения с ограниченным доступом</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Не удается получить данные о заряде батареи"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Не удается получить данные о заряде батареи. "<annotation id="url">"Подробнее…"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Остановить приложение?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" не позволяет телефону перейти в спящий режим.\n\nЧтобы устранить эту проблему, остановите приложение.\n\nЕсли это не поможет, удалите его."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Заряд батареи расходуется слишком быстро, так как приложение \"<xliff:g id="APP">%1$s</xliff:g>\" не позволяет планшету перейти в спящий режим.\n\nЧтобы устранить эту проблему, остановите приложение.\n\nЕсли это не поможет, удалите его."</string>
@@ -2667,9 +2704,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Задать расписание"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Продление времени работы от батареи"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Выключать при полном заряде"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Отключать режим энергосбережения, когда уровень заряда достигает <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Режим энергосбережения отключается, когда уровень заряда достигает <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Режим энергосбережения отключается, когда уровень заряда достигает <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Режим энергосбережения отключается, когда уровень заряда телефона выше <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Режим энергосбережения отключается, когда уровень заряда планшета выше <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Режим энергосбережения отключается, когда уровень заряда устройства выше <xliff:g id="PERCENT">%1$s</xliff:g>."</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Включить"</string>
@@ -2734,6 +2771,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Сбросить"</string>
     <string name="tts_play" msgid="2945513377250757221">"Воспроизвести"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Адаптивное подключение"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Продлевает время работы от батареи и повышает производительность устройства за счет автоматического управления сетевыми подключениями"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Хранилище учетных данных"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Установка сертификатов"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Установить сертификаты"</string>
@@ -2745,9 +2784,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Учетные данные пользователя"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Посмотреть/изменить сохраненные учетные данные"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Дополнительные настройки"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип хранилища"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Аппаратное"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Только программное"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Этот пользователь не может изменять учетные данные"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Установлено для VPN и приложений"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Установлено для Wi-Fi"</string>
@@ -2763,6 +2799,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Не устанавливать"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Все равно установить"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Сертификат не установлен."</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Разрешить приложению \"<xliff:g id="APP_NAME">%s</xliff:g>\" устанавливать сертификаты на этом устройстве?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"С помощью этих сертификатов перечисленные ниже приложения и веб-страницы будут идентифицировать вас."</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Запретить"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Разрешить"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Показать больше"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Приложение для управления сертификатами"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Нет"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Сертификаты, установленные с помощью этого приложения, позволят перечисленным ниже приложениям и веб-страницам идентифицировать вас"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Удалить"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Сигнал набора номера при экстренных вызовах"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Настроить режим работы при экстренном вызове"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Резервное копирование"</string>
@@ -3096,7 +3141,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Рабочий профиль не настроен"</string>
     <string name="user_admin" msgid="4024553191395768119">"Администратор"</string>
     <string name="user_you" msgid="3070562015202859996">"Вы (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Псевдоним"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Вы можете добавить до <xliff:g id="USER_COUNT">%1$d</xliff:g> пользователей"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Только владелец может настроить устройство для других пользователей."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Только владелец может настроить устройство для других пользователей."</string>
@@ -3146,7 +3190,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Как оплатить"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Настройте платежное приложение, а затем приложите телефон задней панелью к терминалу со значком бесконтактной оплаты."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"ОК"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Ещё…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Ещё…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Установите основное платежное приложение"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Обновите основное платежное приложение"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"При бесконтактной оплате будет использоваться приложение \"<xliff:g id="APP">%1$s</xliff:g>\"."</string>
@@ -3216,9 +3260,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Далее"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Готово"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Сделать снимок"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Выбрать фото"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Выбрать фото."</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-карты"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-карты"</string>
@@ -3230,7 +3271,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Всегда использовать для звонков"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"SIM-карта для передачи данных"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Выберите SIM-карту для SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Смена SIM-карты… Подождите минуту."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Смена SIM-карты. Подождите минуту…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Выберите SIM-карту"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Выберите SIM-карту"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-карта <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3416,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"программа, расписание, режим энергосбережения, экономия заряда, батарея, автоматически, процент"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, расширенный вызов, звонки по сети 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"добавить язык, добавление языка"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"размер шрифта"</string>
     <string name="default_sound" msgid="6604374495015245195">"Мелодия по умолчанию"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Громкость сигналов при входящих вызовах и уведомлениях: <xliff:g id="PERCENTAGE">%1$s</xliff:g>."</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Громкость, вибрация, режим \"Не беспокоить\""</string>
@@ -3414,13 +3456,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Звуки при включении устройства"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Автоматические субтитры"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Автоматически добавлять субтитры"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Правила не заданы"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Настроено <xliff:g id="ON_COUNT">%d</xliff:g> расписание</item>
-      <item quantity="few">Настроено <xliff:g id="ON_COUNT">%d</xliff:g> расписания</item>
-      <item quantity="many">Настроено <xliff:g id="ON_COUNT">%d</xliff:g> расписаний</item>
-      <item quantity="other">Настроено <xliff:g id="ON_COUNT">%d</xliff:g> расписания</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Нет настроенных расписаний}=1{Настроено 1 расписание}one{Настроено # расписание}few{Настроено # расписания}many{Настроено # расписаний}other{Настроено # расписания}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не беспокоить"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Получать уведомления только от важных людей и приложений"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Отключение уведомлений"</string>
@@ -3488,24 +3524,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Только важные"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>."</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Включено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Отключено/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Отключено"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Включено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Всегда спрашивать"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Пока вы не отключите"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> час</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> часа</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> часов</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> часа</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> мин."</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one">Может автоматически включиться <xliff:g id="ON_COUNT">%d</xliff:g> расписание.</item>
-      <item quantity="few">Могут автоматически включиться <xliff:g id="ON_COUNT">%d</xliff:g> расписания.</item>
-      <item quantity="many">Могут автоматически включиться <xliff:g id="ON_COUNT">%d</xliff:g> расписаний.</item>
-      <item quantity="other">Может автоматически включиться <xliff:g id="ON_COUNT">%d</xliff:g> расписания.</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 час}one{# час}few{# часа}many{# часов}other{# часа}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минута}one{# минута}few{# минуты}many{# минут}other{# минуты}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Выключено}=1{Выключено/Автоматическое включение по 1 расписанию}one{Выключено/Автоматическое включение по # расписанию}few{Выключено/Автоматическое включение по # расписаниям}many{Выключено/Автоматическое включение по # расписаниям}other{Выключено/Автоматическое включение по # расписания}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Исключения для режима \"Не беспокоить\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Пользователи"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Приложения"</string>
@@ -3551,6 +3575,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Автоматически назначать беззвучный режим для уведомлений с низким приоритетом"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Автоматическая приоритизация"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматически присваивать важность уведомлениям по релевантности"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Отзывы об адаптивных уведомлениях"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Показывает, какой статус назначен уведомлению, и предлагает оставить отзыв"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Сбросить настройки важности"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Сбросить настройки важности, измененные пользователем, и разрешить определять приоритет приложению для уведомлений"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Рекомендуемые действия и ответы"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматически показывать рекомендуемые действия и ответы"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Показывать недавние и отложенные уведомления"</string>
@@ -3650,8 +3678,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Важные разговоры"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Показывать в верхней части списка разговоров и в виде всплывающих чатов"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Показывать в верхней части списка разговоров"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Другие разговоры"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Неприоритетные разговоры"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Разговоры, в которые вы вносили изменения:"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Недавние разговоры"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Удалить недавние"</string>
+    <string name="clear" msgid="5092178335409471100">"Очистить"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Показывать всплывающие чаты для важных разговоров"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Важные разговоры появляются в верхней части панели уведомлений. Для них можно включить всплывающие чаты, а также разрешить показ сообщений в режиме \"Не беспокоить\"."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Здесь будут появляться важные и измененные разговоры"</string>
@@ -3757,7 +3788,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Доступ к функции \"Не беспокоить\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Разрешить доступ к режиму \"Не беспокоить\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Установленные приложения не запрашивали доступ к функции \"Не беспокоить\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Загрузка..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Загрузка приложений…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Вы отключили уведомления от этого приложения."</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Вы отключили уведомления этой категории."</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Вы отключили эту группу уведомлений"</string>
@@ -3855,13 +3886,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Все разговоры"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Важные разговоры"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Нет"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговор</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговора</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговоров</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> разговора</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Нет"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ни одного}=1{1 чат}one{# чат}few{# чата}many{# чатов}other{# чата}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Для кого не действует режим \"Не беспокоить\""</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Вызовы"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Вызовы"</string>
@@ -3870,13 +3895,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Чтобы не пропустить важные звонки, убедитесь, что на устройстве включен звук."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Входящие вызовы заблокированы правилом \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Вы можете изменить настройки, чтобы принимать звонки от друзей, членов семьи и других контактов."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Помеченные контакты"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> контакт</item>
-      <item quantity="few">ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> контакта</item>
-      <item quantity="many">ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> контактов</item>
-      <item quantity="other">ещё <xliff:g id="NUM_PEOPLE">%d</xliff:g> контакта</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Нет"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Контактов нет}=1{{contact_1}}=2{{contact_1} и {contact_2}}=3{{contact_1}, {contact_2} и {contact_3}}one{{contact_1}, {contact_2} и ещё #}few{{contact_1}, {contact_2} и ещё #}many{{contact_1}, {contact_2} и ещё #}other{{contact_1}, {contact_2} и ещё #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"Имя не указано"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Сообщения"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"сообщений"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Сообщения"</string>
@@ -3885,13 +3905,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Когда действует правило \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", входящие сообщения блокируются. Вы можете изменить настройки, чтобы принимать сообщения от друзей, членов семьи и других контактов."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Режим \"Не беспокоить\" не действует для всех сообщений"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Режим \"Не беспокоить\" не действует для всех вызовов"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Нет"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакт</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакта</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контактов</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакта</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Никто}=1{1 контакт}one{# контакт}few{# контакта}many{# контактов}other{# контакта}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Все"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакты"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Помеченные контакты"</string>
@@ -3929,26 +3943,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Все уведомления"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Некоторые уведомления"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Выбранные пользователи смогут связаться с вами, даже если для приложений действует режим \"Не беспокоить\"."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Режим \"Не беспокоить\" не действует для следующих приложений: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="few">Режим \"Не беспокоить\" не действует для следующих приложений: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="many">Режим \"Не беспокоить\" не действует для следующих приложений: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="other">Режим \"Не беспокоить\" не действует для следующих приложений: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ещё <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Режим \"Не беспокоить\" действует для всех приложений}=1{Режим \"Не беспокоить\" не действует для приложения \"{app_1}\"}=2{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\" и \"{app_2}\"}=3{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\", \"{app_2}\" и \"{app_3}\"}one{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\", \"{app_2}\" и ещё #}few{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\", \"{app_2}\" и ещё #}many{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\", \"{app_2}\" и ещё #}other{Режим \"Не беспокоить\" не действует для приложений \"{app_1}\", \"{app_2}\" и ещё #}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Приложения"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Все уведомления"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Некоторые уведомления"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Уведомления, для которых не действует режим \"Не беспокоить\""</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Разрешить все уведомления"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Режим \"Не беспокоить\" не действует для звуков следующих категорий: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="few">Режим \"Не беспокоить\" не действует для звуков следующих категорий: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="many">Режим \"Не беспокоить\" не действует для звуков следующих категорий: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="other">Режим \"Не беспокоить\" не действует для звуков следующих категорий: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Режим \"Не беспокоить\" действует для всех звуков"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ещё <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Все звуки запрещены}=1{Разрешен звук \"{sound_category_1}\"}=2{Разрешены звуки \"{sound_category_1}\" и \"{sound_category_2}\"}=3{Разрешены звуки \"{sound_category_1}\", \"{sound_category_2}\" и \"{sound_category_3}\"}one{Разрешены звуки \"{sound_category_1}\", \"{sound_category_2}\" и ещё #}few{Разрешены звуки \"{sound_category_1}\", \"{sound_category_2}\" и ещё #}many{Разрешены звуки \"{sound_category_1}\", \"{sound_category_2}\" и ещё #}other{Разрешены звуки \"{sound_category_1}\", \"{sound_category_2}\" и ещё #}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Все звуки запрещены"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Режим \"Не беспокоить\" действует для всех звонков и сообщений"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Режим \"Не беспокоить\" не действует для звонков и сообщений от некоторых пользователей"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Режим \"Не беспокоить\" не действует для звонков и сообщений от любых пользователей"</string>
@@ -3998,8 +4000,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Включено"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Отключено"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Закрепление приложения"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Эта функция позволяет закрепить окно определенного приложения на экране. Ее можно использовать, например, если вы хотите дать другу поиграть в игру на вашем устройстве.\n\nЗакрепленное приложение может открывать другие приложения и получать доступ к персональным данным.\n\nЧтобы использовать эту функцию, выполните следующие действия: 	\n1.	Включите функцию в настройках. 	\n2.	Нажмите \"Обзор\". 	\n3.	Нажмите на значок приложения вверху экрана и выберите \"Закрепить\"."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Эта функция позволяет закрепить окно определенного приложения на экране. Ее можно использовать, например, если вы хотите дать другу поиграть в игру на вашем устройстве.\n\nЗакрепленное приложение может открывать другие приложения и получать доступ к персональным данным.\n\nПоэтому, если вы хотите дать устройство другому человеку и не беспокоиться о безопасности данных, рекомендуем включить гостевой режим. \n\nЧтобы закрепить приложение: 	\n1.	Включите функцию в настройках. 	\n2.	Нажмите \"Обзор\". 	\n3.	Нажмите на значок приложения вверху экрана и выберите \"Закрепить\"."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Эта функция позволяет закрепить экран определенного приложения, закрыв доступ к другим программам на телефоне. Ее можно использовать, например, если вы хотите дать другу поиграть в игру на вашем устройстве."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Закрепленное приложение может открывать другие приложения и получать доступ к персональным данным. \n\nЧтобы закрепить приложение: 	\n1.	Включите функцию в настройках. 	\n2.	Нажмите \"Обзор\". 	\n3.	Нажмите на значок приложения вверху экрана и выберите \"Закрепить\"."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Закрепленное приложение может открывать другие приложения и получать доступ к персональным данным. \n\nПоэтому, если вы хотите дать устройство другому человеку и не беспокоиться о безопасности данных, рекомендуем включить гостевой режим. \n\nЧтобы закрепить приложение: 	\n1.	Включите функцию в настройках. 	\n2.	Нажмите \"Обзор\". 	\n3.	Нажмите на значок приложения вверху экрана и выберите \"Закрепить\"."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Закрепленное приложение может:\n\n• получать доступ к персональным данным (например, контактам и содержимому писем);\n• открывать другие приложения.\n\n\nИспользуйте эту функцию, только с теми людьми, которым вы доверяете."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Запрашивать графический ключ"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Запрашивать PIN-код"</string>
@@ -4021,6 +4024,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"На случай потери или кражи устройство можно дополнительно защитить PIN-кодом. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗапрашивать PIN-код при запуске?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"На случай потери или кражи устройство можно дополнительно защитить графическим ключом. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗапрашивать графический ключ при запуске?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"На случай потери или кражи устройство можно дополнительно защитить паролем. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗапрашивать пароль при запуске?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"В дополнение к разблокировке с помощью биометрии вы также можете настроить запрос PIN-кода при включении устройства. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЭто поможет защитить ваши данные в случае потери или кражи устройства. Запрашивать PIN-код при запуске?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"В дополнение к разблокировке с помощью биометрии вы также можете настроить запрос графического ключа при включении устройства. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЭто поможет защитить ваши данные в случае потери или кражи устройства. Запрашивать графический ключ при запуске?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"В дополнение к разблокировке с помощью биометрии вы также можете настроить запрос пароля при включении устройства. Пока оно не запущено, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЭто поможет защитить ваши данные в случае потери или кражи устройства. Запрашивать пароль при запуске?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Да"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Нет"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ограничено"</string>
@@ -4212,7 +4218,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Устройство, управляющее USB"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Подключенное устройство"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Это устройство"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Подождите…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Подождите…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Не удалось переключиться"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Зарядка этого устройства"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Зарядка подключенного устройства"</string>
@@ -4414,6 +4420,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Мобильный трафик"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Трафик приложений"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Трафик Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Передача данных не через оператора связи"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Передача данных Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4434,6 +4441,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничения</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Данные оператора связи могут отличаться от данных на устройстве."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Исключить данные, переданные через сети оператора связи"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Расход: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Установить предупреждение"</string>
     <string name="data_warning" msgid="2925054658166062884">"Предупреждение"</string>
@@ -4473,7 +4481,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Подробнее"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Экономия трафика"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Неограниченный мобильный Интернет"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Фоновый режим выключен"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Фоновый режим выключен"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Включено"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Отключено"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Экономия трафика"</string>
@@ -4496,7 +4504,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Запретить набор текста в уведомлениях, если устройство заблокировано"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Правописание по умолчанию"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Проверка правописания"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Включить проверку правописания"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Включить проверку правописания"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Не выбрано"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(нет)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4602,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Чтобы освободить место, менеджер хранилища удаляет с устройства фото и видео, для которых есть резервные копии."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Удалять фото и видео"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Менеджер хранилища"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Использовать менеджер хранилища"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Использовать менеджер хранилища"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автоматически"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Вручную"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Очистить хранилище"</string>
@@ -4632,6 +4640,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Дважды нажать, чтобы проверить уведомления"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Дважды нажать, чтобы проверить уведомления"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Дважды нажать, чтобы проверить уведомления"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Жест для уведомлений"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Чтобы увидеть уведомления, проведите вниз по нижней части экрана."</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Режим управления одной рукой"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Использовать режим управления одной рукой"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Выходить из режима при переключении между приложениями"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Время ожидания"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунды"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"управление одной рукой"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Чтобы увидеть время, уведомления и другую информацию, дважды коснитесь экрана"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Поднять, чтобы проверить телефон"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Просмотр уведомлений в вертикальном положении планшета"</string>
@@ -4644,6 +4662,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Нажмите, чтобы проверить планшет"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Нажмите, чтобы проверить устройство"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Чтобы увидеть время, уведомления и другую информацию, коснитесь экрана."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Экстренный вызов"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Использовать функцию \"Экстренный вызов\""</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Под управлением приложения \"<xliff:g id="APP_NAME">%1$s</xliff:g>\""</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Чтобы запустить действия ниже, быстро нажмите кнопку питания не менее пяти раз"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Звуковой сигнал с обратным отсчетом"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Включать громкий звуковой сигнал, прежде чем звонить в экстренные службы"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Звонок в экстренную службу"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Номер экстренной службы"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Нажмите, чтобы изменить."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Если вместо номера экстренной службы вы ввели другой номер:\n • Чтобы совершить экстренный вызов, необходимо разблокировать устройство.\n • Ваш звонок может остаться без ответа."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Использовать сканер отпечатков для просмотра уведомлений"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Сканер отпечатков"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Чтобы увидеть уведомления, проведите вниз по сканеру отпечатков пальцев на задней панели телефона"</string>
@@ -4783,6 +4811,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Максимальное количество видимых наборов данных"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Восстановить значения по умолчанию"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Настройки автозаполнения для разработчиков сброшены"</string>
+    <string name="location_category" msgid="3496759112306219062">"Местоположение"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Индикатор местоположения в строке состояния"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Показывать для всех местоположений, включая определяемые через сеть и подключение"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Полные измерения GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Отслеживать все группировки GNSS и частоты без рабочего цикла"</string>
     <string name="device_theme" msgid="5027604586494772471">"Тема устройства"</string>
     <string name="default_theme" msgid="4815428567082263639">"По умолчанию"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Название сети"</string>
@@ -4799,8 +4832,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Заблокируйте отвлекающие уведомления"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Функция недоступна"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Эта функция отключена, поскольку она замедляет работу телефона."</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Полные измерения GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Отслеживать все группировки GNSS и частоты без рабочего цикла"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Всегда показывать сообщение об ошибке"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Показывать диалог при каждом сбое приложения"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Выбрать приложение с поддержкой ANGLE"</string>
@@ -4812,7 +4843,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Включить для всех приложений"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Выбор графического драйвера"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"По умолчанию"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Игровой драйвер"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Игровой драйвер"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Версия драйвера для разработчиков"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системный графический драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4868,7 +4899,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Включено (без звука)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Выключено"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Сведения о сети"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"У приложений на телефоне есть доступ к названию устройства. Его могут видеть другие пользователи, когда вы подключаетесь к устройствам по Bluetooth или настраиваете точку доступа Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"У приложений на телефоне есть доступ к названию устройства. Его могут видеть другие пользователи, когда вы подключаетесь к устройствам по Bluetooth или настраиваете точку доступа Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Устройства"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Все настройки"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Подсказки"</string>
@@ -4881,6 +4912,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Сети не найдены. Повторите попытку."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(доступ запрещен)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Нет SIM-карты."</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-карта"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Нет SIM-карты"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Нет"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Для подключения требуется SIM-карта"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Для подключения требуется SIM-карта оператора \"<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>\""</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Предпочтительный режим: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Предпочтительный режим: только GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Предпочтительный режим: только WCDMA"</string>
@@ -4934,6 +4970,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобильный Интернет"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ к Интернету по мобильной сети"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон автоматически подключится к сети этого оператора, когда вы окажетесь в зоне ее действия."</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Нет SIM-карты"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Настройки звонков"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Настройки SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Всегда спрашивать"</string>
@@ -4996,6 +5033,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступны при подключении к <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Ещё"</string>
     <string name="see_less" msgid="2642392725363552793">"Скрыть"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Включить <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Включить SIM-карту?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Переключиться на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Переключиться на SIM-карту?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Нельзя использовать несколько SIM-карт одновременно.\n\nВы можете переключиться на SIM-карту \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\". Это действие не повлияет на ваш тарифный план у оператора \"<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>\"."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Нельзя использовать несколько скачанных SIM-карт одновременно.\n\nВы можете переключиться на SIM-карту \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\". Это действие не повлияет на ваш тарифный план у оператора \"<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>\"."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Нельзя использовать несколько SIM-карт одновременно.\n\nПереключение между SIM-картами не повлияет на ваш тарифный план у оператора \"<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>\"."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Переключиться на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Подключение к сети…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Переключение на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>…"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Произошла ошибка"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Не удалось сменить оператора."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Отключить оператора \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Отключить SIM-карту?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Отключение SIM-карты<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Произошла ошибка"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Не удалось отключить оператора."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Использовать две SIM-карты?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"На этом устройстве можно использовать сразу две SIM-карты. Если вам достаточно одной, нажмите \"Нет, спасибо\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Перезапустить устройство?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Чтобы начать, перезапустите устройство. После этого вы сможете добавить ещё одну SIM-карту."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Продолжить"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Перезапустить"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Нет, спасибо"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Переключиться"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не удалось активировать SIM-карту"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Извлеките и снова вставьте SIM-карту. Если проблема не исчезнет, перезапустите устройство."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Попробуйте включить SIM-карту ещё раз. Если проблема не исчезнет, перезапустите устройство."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активация сети"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Сеть \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\" активна"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Нажмите, чтобы обновить настройки SIM-карты."</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-карта"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Удалить данные скачанной SIM-карты?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Если вы удалите данные этой SIM-карты, оператор \"<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>\" перестанет обслуживать устройство.\n\nЭто не повлияет на тарифный план оператора \"<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>\"."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Удалить"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Удаление данных SIM-карты…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Не удалось стереть данные SIM-карты"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Не удалось стереть данные этой SIM-карты из-за ошибки.\n\nПерезагрузите устройство и повторите попытку."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Подключение к устройству"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Приложение \"<xliff:g id="APPNAME">%1$s</xliff:g>\" хочет использовать временную сеть Wi‑Fi для подключения к устройству."</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Устройства не найдены. Убедитесь, что они включены и доступны для подключения."</string>
@@ -5071,6 +5146,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Экстренные вызовы"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Ваш оператор не поддерживает экстренные вызовы по Wi-Fi.\nПри звонках в экстренные службы устройство автоматически переключается на мобильную сеть.\nЭкстренные вызовы можно совершать только в радиусе действия сотовой связи."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Используйте Wi‑Fi для звонков, чтобы повысить качество связи."</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Звонки между разными SIM-картами"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Переадресовывать звонки и SMS с другой SIM-карты на эту"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"звонки между разными SIM-картами"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Входящее MMS-сообщение"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Не удалось отправить MMS-сообщение"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Нажмите, чтобы разрешить MMS-сообщения в сети оператора \"<xliff:g id="OPERATOR_NAME">%1$s</xliff:g>\", когда мобильный Интернет отключен"</string>
@@ -5122,10 +5200,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Разрешить экранный оверлей в настройках"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Разрешить приложениям, которые могут показываться поверх других, накладываться на экраны настроек"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Медиа"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Скрывать проигрыватель по окончании мультимедийного сеанса"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"С помощью проигрывателя вы можете восстанавливать мультимедийный сеанс на панели быстрых настроек"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Медиапроигрыватель в быстрых настройках"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Показывать медиапроигрыватель в течение длительного времени, чтобы можно было быстро возобновлять воспроизведение"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Проигрыватель скрыт"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Проигрыватель показан"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Нет доступных проигрывателей"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Разрешенные приложения"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"Медиа"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Будет включен модуль Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Включено"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Отключено"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-карты"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Сети, безопасные в самолете"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Найти и подключиться к сети, безопасной в самолете"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"самолет, безопасность для самолета"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Звонки и SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Звонки по Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Совершать и принимать вызовы через такие сети, как Wi-Fi, а не операторов связи"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Благодаря функции \"Звонки по Wi-Fi\" вы можете совершать и принимать вызовы через некоторые сети Wi-Fi, а не операторов связи."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Звонки"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"Предпочтительно"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"Предпочтительно звонки"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"Предпочтительно SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"Недоступно"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нет SIM-карты"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Настройки"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Подключаться к общедоступным сетям"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"сетевое подключение, Интернет, беспроводная сеть, передача данных, Wi-Fi, wifi, wi fi, сотовая сеть, мобильный Интернет, сотовый оператор, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Показать сети, безопасные в самолете"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Отключить режим полета"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Недоступно в ночном режиме"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Сброс настроек важности выполнен."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Приложения"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Неизвестное устройство запрашивает доступ к вашим сообщениям. Нажмите, чтобы узнать больше."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Предоставить доступ к сообщениям?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Неизвестное устройство Bluetooth ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) запрашивает доступ к вашим сообщениям.\n\nЭто ваше первое подключение к устройству [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Неизвестное устройство запрашивает доступ к вашим контактам и списку вызовов. Нажмите, чтобы узнать больше."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Предоставить доступ к контактам и списку вызовов?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Неизвестное устройство Bluetooth ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) запрашивает доступ к вашим контактам и списку вызовов, включая данные о входящих и исходящих звонках.\n\nЭто ваше первое подключение к устройству [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index e67cd3c..a10dc04 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"මධ්‍යම"</item>
     <item msgid="6740026006576843477">"දීර්ඝ"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"කෙටි"</item>
+    <item msgid="7397961711906421599">"මධ්‍යම"</item>
+    <item msgid="4079132024502041928">"දිගු"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"සුපුරුදු"</item>
     <item msgid="4234707448428002595">"සෑන්ස්-සේරිෆ්"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ගෝලීය"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA පමණි"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ගෝලීය"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index e796a26..d2d8b52 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"දිනය සහ වේලාව"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"දිනය සහ වේලාව සකසන්න"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"දිනය, වේලාව, වේලා කලාපය, සහ ආකෘති සකසන්න"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"ජාලය සැපයූ වේලාව භාවිත කරන්න"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"ජාලය සැපයූ වේලා කලාපය භාවිත කරන්න"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"ස්වයංක්‍රියව වේලාව සකසන්න"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"ස්වයංක්‍රියව වේලා කලාපය සකසන්න"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"පෙදෙසි පෙරනිමි භාවිත කරන්න"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"පැය 24 ආකාරය"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"පැය 24 ආකාරය භාවිත කරන්න"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"අගුළු තිරයෙහි පැතිකඩේ තොරතුරු පෙන්වන්න"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ගිණුම්"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ස්ථානය"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ස්ථානය භාවිත කරන්න"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ස්ථානය භාවිත කරන්න"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ක්‍රියාවිරහිතයි"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">ක්‍රියාත්මකයි - යෙදුම් <xliff:g id="COUNT_1">%1$d</xliff:g>කට ස්ථානයට ප්‍රවේශය ඇත</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"තිර අගුල, මුහුණු අගුලු හැරීම"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"තිර අගුල, ඇඟිලි සලකුණ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"තිර අගුල"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ඔබගේ මුහුණ සහ ඇඟිලි සලකුණු සමඟ දුරකථනය ආරක්ෂිතව අගුලු හරින්න"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"ඔබට යෙදුම්වලට පිරීමට සහ ගෙවීම් තහවුරු කිරීමටද හැකිය"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"මේ සමග අගුලු හැරීම පිහිටුවන්න:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"මුහුණෙන් අගුලු හැරීම"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ඔබගේ දුරකථනය අගුලු හැරීම ඉතා පහසු කරන්න"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ඇඟිලි සලකුණ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"සාක්කුවේ දුරකථනය අගුලු හැර කාලය ඉතිරි ක."</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"මඟ හරින්න"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ඊළඟ"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"මුහුණ එකතු කරන ලදි"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"මුහුණු අඟුලු ඇරීම සකසන්න"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"මුහුණු අඟුලු ඇරීම"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"සත්‍යාපන කිරීමට ඔබේ මුහුණ භාවිත කරන්න"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"අරඹන්න"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"ප්‍රවේශ්‍යතා මුහුණු අගුලු හැරීම ක්‍රියාවිරහිත කර ඇත්නම්, සමහර පිහිටුවීම් පියවර TalkBack සමඟ නිසියාකාරව ක්‍රියා නොකරනු ඇත."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ආපසු යන්න"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"පිහිටුවීම දිගටම කර."</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ප්‍රවේශ්‍යතා පිහිටුවීම භාවිතය"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"යෙදුම් තුළ මුහුණු අඟුලු ඇරීම භාවිත කරන විට, සැම විටම තහවුරු කිරීමේ පියවර අවශ්‍ය කරන්න"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"මුහුණු දත්ත මකන්න"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"මුහුණු අඟුලු ඇරීම සකසන්න"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ඔබේ උපාංගය අගුලු ඇරීමට, යෙදුම්වලට පිරීමට සහ ගෙවීම් තහවුරු කිරීමට මුහුණෙන් අගුලු ඇරීම භාවිත කරන්න.\n\nමතක තබා ගන්න:\nදුරකථනය දෙස බැලීම ඔබ අදහස් නොකරන විට එය අගුලු ඇරිය හැකිය.\n\nඔබේ දුරකථනය එය ඔබේ මුහුණ දක්වා ඔසවන්නේ නම් වෙනයම් කෙනෙකු විසින් අගුලු ඇරිය හැකිය.\n\nඔබේ දුරකථනය බොහෝ දුරට ඔබ මෙන් පෙනෙන, එනම් සර්වසම සහෝදර සහෝදරියක් වැනි කෙනෙකු විසින් අගුලු ඇරිය හැකිය."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ඔබේ උපාංගය අගුලු හැරීමට, යෙදුම්වලට පිරීමට, සහ ගෙවීම් තහවුරු කිරීමට මුහුණෙන් අගුලු ඇරීම භාවිත කරන්න.\n\nමතක තබා ගන්න:\n\n\nඔබේ දුරකථනය ඔබේ ඇස් වසා තිබියදී පවා ඔබේ මුහුණට සමීපව අල්ලා ගනු ලබන්නේ නම් වෙනත් කෙනෙකු විසින් එහි අගුලු හරිනු ලැබිය හැකිය.\n\nබොහෝ දුරට ඔබට සමානව පෙනෙන, සර්වසම සහෝදර සහෝදරියක් වැනි කෙනෙකු විසින් අගුලු හරිනු ලැබීමට ඉඩ ඇත."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"ඔබේ උපාංගය අගුලු හැරීමට, යෙදුම්වලට පිරීමට සහ ගෙවීම් තහවුරු කිරීමට මුහුණෙන් අගුලු හැරීම භාවිත කරන්න."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"සිතෙහි තබා ගන්න:\nදුරකථනය දෙස බැලීම ඔබ එය අගුලු හැරීමට අදහස් නොකරන විට අගුලු හැරිය හැකිය.\n\nඔබේ දුරකථනය ඔබේ මුහුණට ඇල්ලුවහොත් වෙනත් කෙනෙකු විසින් අගුලු හරිනු ලැබිය හැකිය.\n\nඔබේ දුරකථනය බොහෝ දුරට ඔබ මෙන් පෙනෙන, එනම් සර්වසම සහෝදර සහෝදරියක් වැනි කෙනෙකු විසින් අගුලු හැරිය හැකිය."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"සිතෙහි තබා ගන්න:\nදුරකථනය දෙස බැලීම ඔබ එය අගුලු හැරීමට අදහස් නොකරන විට අගුලු හැරිය හැකිය.\n\nඔබේ දුරකථනය ඔබේ මුහුණට ඇල්ලුවහොත්, ඔබේ ඇස් වසා ඇති විට පවා වෙනත් කෙනෙකු විසින් අගුලු හරිනු ලැබිය හැකිය.\n\nඔබේ දුරකථනය බොහෝ දුරට ඔබ මෙන් පෙනෙන, එනම් සර්වසම සහෝදර සහෝදරියක් වැනි කෙනෙකු විසින් අගුලු හැරිය හැකිය."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"මුහුණු දත්ත මකන්නේද?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"මුහුණෙන් අගුලු හැරීම මගින් භාවිත කරන මුහුණු දත්ත ස්ථීරව සහ ආරක්ෂිතව මැකෙනු ඇත. ඉවත් කළ පසු, ඔබේ දුරකථනය අගුලු හැරීමට, යෙදුම්වලට පිරීමට, සහ ගෙවීම් තහවුරු කිරීමට ඔබට ඔබේ PIN අංකය, රටාව, හෝ මුරපදය අවශ්‍යයි."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"ඔබේ දුරකථනය අගුලු හැරීමට මුහුණු අගුලු හැරීම භාවිත කරන්න."</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ඔබේ දුරකථනය අගුලු හැරීමට, හෝ මිලදී ගැනීම් අනුමත කිරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කරන්න.\n\nසටහන: ඔබට ඔබේ ඇඟිලි සලකුණ මෙම උපාංගය අගුලු හැරීමට භාවිත කළ නොහැකිය. තව තොරතුරු සඳහා, ඔබේ සංවිධානයෙහි පරිපාලක අමතන්න."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ඔබේ දුරකථනය අගුලු හැරීමට, හෝ මිලදී ගැනීම් අනුමත කිරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කරන්න.\n\nසටහන: ඔබේ ඇඟිලි සලකුණ ප්‍රබල රටාවකට හෝ PIN අංකයකට වඩා ආරක්ෂාකාරී බව අඩු විය හැකිය."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"අවලංගු කරන්න"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"එපා, ස්තුතියි"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"දිගටම කර ගෙන යන්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"මඟ හරින්න"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ඊළඟ"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"තිර අඟුලු විකල්පයක් සමඟ ආරක්‍ෂා කිරීමෙන්, ඔබේ ටැබ්ලටය අහිමි වූ හෝ සොරකම් කරනු ලැබූ විට කිසිවෙකුට එය භාවිත කළ නොහැක. ඔබට මුහුණු අඟුලු ඇරීම සැකසීමට තිර අඟුලු විකල්පයකුත් අවශ්‍යයි. ආපසු යාමට, අවලංගු කරන්න තට්ටු කරන්න."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"තිර අඟුලු විකල්පයක් සමඟ ආරක්‍ෂා කිරීමෙන්, ඔබේ උපාංගය අහිමි වූ හෝ සොරකම් කරනු ලැබූ විට කිසිවෙකුට එය භාවිත කළ නොහැක. ඔබට මුහුණු අඟුලු ඇරීම සැකසීමට තිර අඟුලු විකල්පයකුත් අවශ්‍යයි. ආපසු යාමට, අවලංගු කරන්න තට්ටු කරන්න."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"තිර අඟුලු විකල්පයක් සමඟ ආරක්‍ෂා කිරීමෙන්, ඔබේ දුරකථනය අහිමි වූ හෝ සොරකම් කරනු ලැබූ විට කිසිවෙකුට එය භාවිත කළ නොහැක. ඔබට මුහුණු අඟුලු ඇරීම සැකසීමට තිර අඟුලු විකල්පයකුත් අවශ්‍යයි. ආපසු යාමට, අවලංගු කරන්න තට්ටු කරන්න."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ඔබගේ ටැබ්ලටය තිර අගුලු විකල්පයක් සමග ආරක්ෂා කිරීමෙන්, එය නැති වූ විට හෝ සොරකම් කරනු ලැබූ විට කිසිවෙකුට භාවිත කළ නොහැකි වනු ඇත. ජෛවමිතික පිහිටුවීමට ඔබට තිර අගුලු විකල්පයක්ද අවශ්‍ය වේ. ආපසු යාමට, අවලංගු කරන්න තට්ටු කරන්න."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"තිර අගුලු විකල්පයක් සමග ආරක්ෂා කිරීමෙන්, ඔබේ උපාංගය නැති වූ විට හෝ සොරකම් කරනු ලැබූ විට කිසිවෙකුට භාවිත කළ නොහැකි වනු ඇත. ජෛවමිතික පිහිටුවීමට ඔබට තිර අගුලු විකල්පයක්ද අවශ්‍ය වේ. ආපසු යාමට, අවලංගු කරන්න තට්ටු කරන්න."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ඔබගේ දුරකථනය තිර අගුලු විකල්පයක් සමග ආරක්ෂා කිරීමෙන්, එය නැති වූ විට හෝ සොරකම් කරනු ලැබූ විට කිසිවෙකුට භාවිත කළ නොහැකි වනු ඇත. ජෛවමිතික පිහිටුවීමට ඔබට තිර අගුලු විකල්පයක්ද අවශ්‍ය වේ. ආපසු යාමට, අවලංගු කරන්න තට්ටු කරන්න."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"රහස් අංකය සැකසීම මඟ හරින්නේද?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"මුරපදය සැකසීම මඟ හරින්නේද?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"රටාව සැකසීම මඟ හරින්නේද?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම ටැබ්ලට උපාංගය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම උපාංගය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"උපාංග ආරක්ෂණ විශේෂාංග සක්‍රිය කිරීමෙන්, ඔබගේ අවසරය නොමැතිව වෙනත් අය මෙම දුරකථනය භාවිත කිරීම වළක්වන්න. ඔබට භාවිත කිරීමට අවශ්‍ය තිර අගුල තෝරන්න."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"ඔබේ උපස්ථ කිර අගුලු ක්‍රමය තෝරන්න"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"ඔබේ උපස්ථ කිර අගුලු ක්‍රමය තෝරන්න"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"ඔබේ උපස්ථ තිර අගුලු ක්‍රමය තෝරන්න"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"තිරයේ අගුලු විකල්ප"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"තිර අගුලු විකල්ප"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"තිර අගුල"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"මුහුණු අඟුලු ඇරීම + මුරපදය"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"මුහුණු අඟුලු ඇරීම නොමැතිව ඉදිරියට යන්න"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"ඔබට ඔබගේ මුහුණ භාවිතයෙන් ඔබගේ දුරකථනය අගුලු හැරීමට හැකිය. ආරක්ෂාව සඳහා, මෙම විකල්පයට උපස්ථ තිර අගුලක් අවශ්‍යය."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ජෛවමිතික + රටාව"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ජෛවමිතික + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ජෛවමිතික + මුරපදය"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ජෛවමිතික රහිතව ඉදිරියට යන්න"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"ඔබට ඔබගේ ජෛවමිතික භාවිතයෙන් ඔබගේ දුරකථනය අගුලු හැරීමට හැකිය. ආරක්ෂාව සඳහා, මෙම විකල්පයට උපස්ථ තිර අගුලක් අවශ්‍යය."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"පරිපාලකයා, සංකේතන ප්‍රතිපත්තිය, හෝ අක්තපත්‍ර ආචයනය මඟින් අබල කර ඇත"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"කිසිවක් නැත"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ස්වයිප් කරන්න"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">ඉලක්කම් <xliff:g id="NUMBER_1">%d</xliff:g>කට වඩා අඩු විය යුතුය</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"උපාංග පරිපාලක මෑත PIN එකක් භාවිතා කිරීමට අවසර නොදේ"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ඔබගේ IT පරිපාලක විසින් සුලබ PIN අවහිර කරනු ලැබේ. වෙනත් PIN එකක් උත්සාහ කරන්න."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"මෙහි වලංගු නොවන අනුලකුණක් ඇතුළත් විය නොහැකිය"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"අඩු තරමින් එක් අකුරක් තිබිය යුතුය"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"අඩු තරමින් එක් ඉලක්කමක් තිබිය යුතුය"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">අඩු තරමින් සංඛ්‍යාත්මක-නොවන අනුලකුණු <xliff:g id="COUNT">%d</xliff:g>ක් අඩංගු විය යුතුය</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"උපාංග පරිපාලක මෑත මුරපදයක් භාවිතා කිරීමට අවසර නොදේ."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ඔබගේ IT පරිපාලක විසින් සුලබ මුරපද අවහිර කරනු ලැබේ. වෙනත් මුරපදයක් උත්සාහ කරන්න."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ආරෝහණ, අවරෝහණ හෝ ප්‍රනරාවර්ත අනුක්‍රමයේ අංක වෙත අවසර නැත"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"තහවුරු කරන්න"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"අවලංගු කරන්න"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi-Fi සක්‍රිය කරන්න"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi භාවිත කරන්න"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi භාවිත කරන්න"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi සැකසුම්"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"රැහැන් රහිත ප්‍රවේශ තැන් සකසන්න සහ කළමනාකරණය කරන්න"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” වෙත සම්බන්ධ කිරීමට පහත සඳහන් QR කේතය කේන්‍ද්‍රගත කරන්න"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR කේතයක් ස්කෑන් කිරීමෙන් Wi‑Fi වෙත එකතු වන්න"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi බෙදා ගන්න"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” වෙත සම්බන්ධ කිරීමටත් මුරපදය බෙදා ගැනීමටත් මෙම QR කේතය ස්කෑන් කරන්න"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"මෙම QR කේතය “<xliff:g id="SSID">%1$s</xliff:g>” සමග එක් වීමට වෙනත් උපාංගයක් සමඟ ස්කෑන් කරන්න"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” වෙත සම්බන්ධ කිරීමට මෙම QR කේතය ස්කෑන් කරන්න"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"නැවත උත්සාහ කරන්න. ගැටලුව පවතින්නේ නම්, උපාංග නිෂ්පාදකය සම්බන්ධ කර ගන්න"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"යමක් වැරදිණි"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi මුරපදය: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"හොට්ස්පොට් මුරපදය: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ස්වයං‑සම්බන්ධ වීම"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"දුරකථනයට මෙම ජාලය අසල ස්වයංක්‍රියව සම්බන්ධ වීමට ඉඩ දෙන්න"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ටැබ්ලට් පරිගණකයට මෙම ජාලය අසල ස්වයංක්‍රියව සම්බන්ධ වීමට ඉඩ දෙන්න"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"පරාසය තුළ සිටින විට මෙම ජාලයට සම්බන්ධතාව ඉඩ දෙන්න"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"උපාංගය එක් කරන්න"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"මෙම ජාලයට උපාංගයක් එක් කිරීමට QR කේතයක් භාවිතා කරන්න"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR කේතය වලංගු ආකෘතියක් නොවේ"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"පද්ධති සහතික භාවිත කරන්න"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"නොසපයන්න"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"වලංගු නොකරන්න"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"සහතිකයක් දක්වා නැත. ඔබේ සබැඳුම පුද්ගලික නොවනු ඇත."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ජාල නම දිග වැඩියි."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"වසමක් නියම කළ යුතුය."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"සහතිකය අවශ්‍යයි."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"සම්බන්ධ කරන්න"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wifi සක්‍රීයයි"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> වෙත සබැඳිණි"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> වෙත සබැඳෙමින්"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"සබැඳෙමින්…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ජාලය වෙත සම්බන්ධ වීම අසාර්ථක විය"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"ජාලය පරාසය තුළ නැත"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"උපාංග MAC ලිපිනය"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"සසම්භාවී MAC ලිපිනය"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"සසම්භාවීකරණය කළ MAC ලිපිනය (අවසන් වරට භාවිත කළ)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP ලිපිනය"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"ජාල විස්තර"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"සබ්නෙට් මාස්ක්"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 ලිපින"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"සුරකින ලද ජාල"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"දායකත්ව"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"වෙනත් ජාල"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP සැකසීම්"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"මෙම පරිශීලකයා සඳහා Wi‑Fi උසස් සැකසීම් නැත"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"සුරකින්න"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"වලංගු වාහල ලිපිනයක් ටයිප් කරන්න."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"වලංගු DNS ලිපිනයක් ටයිප් කරන්න."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 ත් 32 අතර දිගින් යුත් ජාල උපසර්ගයක් ටයිප් කරන්න."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (පුද්ගලික DNS මගින් ප්‍රතික්ෂේප කරන්නේ නම් මිස)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (පුද්ගලික DNS මගින් ප්‍රතික්ෂේප කරන්නේ නම් මිස)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"වාහල"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ජාල උපසර්ගයේ දිග"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"යෙදුම අන්තර්ගතය බෙදා ගනිමින් සිටී. අන්තර්ජාල සබැඳුමක් බෙදා ගැනීමට, හොට්ස්පොට් ක්‍රියාවිරහිත කර, අනතුරුව ක්‍රියාත්මක කරන්න"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"මුරපදයක් සකසා නැත"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"හොට්ස්පොට් නම"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ක්‍රියාත්මක කරමින්..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ක්‍රියාත්මක කරමින්…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"වෙනත් උපාංගවලට <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> වෙත සම්බන්ධ විය හැකිය"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"හොට්ස්පොට් මුරපදය"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP කලාපය"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"සුමට සංදර්ශකය"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"සමහර අන්තර්ගත සඳහා නැවුම් කිරීමේ අනුපාතය හර්ට්ස් 60 සිට 90 දක්වා ස්වයංක්‍රියව ඉහළ නංවයි. බැටරි භාවිතය වැඩි කරයි."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"සුමට සංදර්ශකය"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz යළි නැවුම් කිරීමේ අනුපාතය බල කරන්න"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"වැඩි දියුණු කළ ස්පර්ශ ප්‍රතිචාර සඳහා ඉහළම යළි නැවුම් කිරීමේ අනුපාතය සහ සජීවිකරණ ගුණාත්මකභාවය. බැටරි භාවිතය වැඩි කරයි."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"තිර අවධානය"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"සක්‍රීයයි / ඔබ එය දිහා බලා සිටින්නේ නම් තිරය අක්‍රිය නොවේ"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"තිරය අඳුරු විට, එය නව දැනුම් දීම් සඳහා ක්‍රියාත්මක වේ"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"සැමවිට වේලාව සහ තතු පෙන්වන්න"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"වැඩි බැටරි භාවිතය"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"තද අකුරු"</string>
     <string name="title_font_size" msgid="570613010306330622">"අකුරු ප්‍රමාණය"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"පෙළ වඩාත් විශාල හෝ කුඩා කරන්න"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM කාඩ් පතෙහි අඟුළු සැකසුම්"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android අනුවාදය"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android ආරක්ෂක යාවත්කාලීනය"</string>
     <string name="model_info" msgid="8997566254717810904">"මාදිලිය"</string>
-    <string name="model_summary" msgid="2246651782442466213">"මාදිලිය: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"මාදිලිය සහ දෘඨාංග"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"දෘඨාංග අනුවාදය"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"උපකරණ ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN මකන්න"</string>
     <string name="menu_new" msgid="6571230342655509006">"නව APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"සුරකින්න"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"ඉවත ලන්න"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"අවලංගු කරන්න"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"නම ක්ෂේත්‍රය හිස් විය නොහැක."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN හිස් විය නොහැක."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"යෙදුම් යළි සැකසිය නොහැකිය"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi, ජංගම, බ්ලූටූත් යළි සකසන්න"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"මෙය, පහත ඒවා ඇතුළුව සියලු ජාල සැකසීම් යළි සකසනු ඇත:\n\n"<li>"Wi‑Fi"</li>\n<li>"ජංගම දත්ත"</li>\n<li>"බ්ලූටූත්"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"මකන්න"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"බාගත් SIM පත් මකන්න"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"ප්‍රතිස්ථාපන SIM පත් බාගැනීමට, ඔබේ වාහකයා සම්බන්ධ කර ගන්න. මෙය ජංගම සේවා සැලසුම් කිසිවක් අවලංගු නොකරයි."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"මෙය ජංගම සේවා සැලසුම් කිසිවක් අවලංගු නොකරනු ඇත. ප්‍රතිස්ථාපන SIM බාගැනීමට, ඔබගේ වාහකය අමතන්න."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"සැකසීම් යළි පිහිටුවන ලදි"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"සියලු ජාල සැකසීම් යළි සකසන්නේද? ඔබට මෙම ක්‍රියාව අස් කළ නොහැක."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"සියලු ජාල සැකසීම් යළි සකසන අතර බාගත් SIM මකන්නේද? ඔබට මෙම ක්‍රියාව අස් කළ නොහැක."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"ජාල සැකසීම් යළි පිහිටුවන ලදි"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM මැකිය නොහැක"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"දෝෂයක් හේතුවෙන් බාගත් SIM මැකිය නොහැක.\n\nඔබේ උපාංගය යළි අරඹා නැවත උත්සාහ කරන්න."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">\n\n<li>"ඔබේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත් යෙදුම්"</li>" ඇතුළුව මෙය ඔබේ ටැබ්ලටයේ "<b>"අභ්‍යන්තර ආචයනයෙන්"</b>" සියලුම දත්ත මකා දමයි"</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">\n\n<li>"ඔබේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත් යෙදුම්"</li>" ඇතුළුව මෙය ඔබේ දුරකථනයේ "<b>"අභ්‍යන්තර ආචයනයෙන්"</b>" සියලුම දත්ත මකා දමයි"</string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ඔබ දැනට පහත ගිණුම් වෙත පුරනය වී සිටියි:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"මෙම උපාංගයේ වෙනත් පරිශීලකයින් සිටි.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"සංගීතය"</li>\n<li>"ඡායාරූප"</li>\n<li>"වෙනත් පරිශීලක දත්ත"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"සංගීත, පින්තූර, සහ වෙනත් පරිශීලක දත්ත මැකීමට, "<b>"USB ආචයනය"</b>" මැකීමට අවශ්‍යය."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"සංගීතය, පින්තූර, සහ වෙනත් පරිශීලක දත්ත ඉවත් කිරීමට, "<b>"SD කාඩ් පත"</b>" මැකිය යුතුවේ."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"සියලු දත්ත මකන්න (කර්මාන්තශාලා යළි සැකසීම)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"මෙය ඔබගේ ටැබ්ලටයේ "<b>"අභ්‍යන්තර ගබඩාව"</b>" වෙතින්, පහත දේවල් ඇතුළුව සියලු දත්ත මකනු ඇත:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත් යෙදුම්"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"මෙය ඔබගේ දුරකථනයේ "<b>"අභ්‍යන්තර ගබඩාව"</b>" වෙතින්, පහත දේවල් ඇතුළුව සියලු දත්ත මකනු ඇත:\n\n"<li>"ඔබගේ Google ගිණුම"</li>\n<li>"පද්ධති සහ යෙදුම් දත්ත සහ සැකසීම්"</li>\n<li>"බාගත් යෙදුම්"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ඔබ දැනට පහත ගිණුම් වෙත පුරා සිටියි:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"මෙම උපාංගයේ වෙනත් පරිශීලකයින් සිටි.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"සංගීතය"</li>\n<li>"ඡායාරූප"</li>\n<li>"වෙනත් පරිශීලක දත්ත"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"මෙය ඔබගේ ජංගම සේවා සැලසුම අවලංගු නොකරනු ඇත."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"සංගීතය, පින්තූර, සහ වෙනත් පරිශීලක දත්ත මැකීමට, "<b>"USB ගබඩාව"</b>" මැකීමට අවශ්‍යය."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"සංගීතය, පින්තූර, සහ වෙනත් පරිශීලක දත්ත ඉවත් කිරීමට, "<b>"SD කාඩ් පත"</b>" මැකීමට අවශ්‍යය."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB ආචයනය මකන්න"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD කාඩ් පත මකන්න"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"සංගීත හෝ ජායාරුප ආදී අභ්‍යන්තර USB ආචයනයේ සියලු දත්ත මකන්න"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"සංගීත හෝ ඡායාරූප ආදී SD කාඩ් පතේ සියලු දත්ත මකන්න"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"සියලු දත්ත මකන්න"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"සියලු දත්ත මකන්න"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ඔබේ පුද්ගලික තොරතුරු සහ බාගත් යෙදුම් සියල්ල මකනු ලැබේ. ඔබට මෙම ක්‍රියාව අස් කළ නොහැක."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"බාගත් යෙදුම් සහ SIM ඇතුළුව ඔබේ පුද්ගලික තොරතුරු මකනු ලැබේ. ඔබට මෙම ක්‍රියාව අස් කළ නොහැක."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"සියලු දේම මකන්න"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"පද්ධති ඉවත් කෙරුම් සේවාව නොමැති නිසා නැවත සැකසුමක් සිදු නොකෙරුණි"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"සියලු දත්ත මකන්නද?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"මෙම පරිශීලකයා වෙතට කර්මාන්තශාලා යළි පිහිටුවීම නොමැත"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"මකමින්"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"කරුණාකර රැඳී සිටින්න..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"සියලු දත්ත මකන්න"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"සියලු දත්ත මකන්න"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ඔබේ පුද්ගලික තොරතුරු සහ බාගත් යෙදුම් සියල්ල මකනු ලැබේ. ඔබට මෙම ක්‍රියාව පසුගමනය කළ නොහැකිය."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"බාගත් යෙදුම් &amp; SIM ඇතුළුව ඔබේ සියලු පුද්ගලික තොරතුරු මකනු ලැබේ. ඔබට මෙම ක්‍රියාව පසුගමනය කළ නොහැකිය."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"සියලු දත්ත මකන්නද?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"මෙම පරිශීලකයා සඳහා කර්මාන්තශාලා යළි සැකසීම ලබා ගත නොහැකිය"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"මකමින්"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"කරුණාකර රැඳී සිටින්න…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"ඇමතුම් සැකසීම්"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"කටහඬ තැපැල්, ඇමතුම් ඉදිරියට ගෙන යෑම, ඇමතුම් රැඳීම්, ඇමතුම්කරුගේ ID සකසන්න"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB ටෙදරින්"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"උපාංග <xliff:g id="MAXCONNECTION">%1$d</xliff:g> කට වඩා ටෙදර් කළ නොහැක."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ටෙදර් නොකරනු ඇත."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ඊතර්නෙට් ටෙදරින්"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ඊතර්නෙට් හරහා දුරකථනයේ අන්තර්ජාල සබැඳුම බෙදා ගන්න"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ඊතර්නෙට් හරහා දුරකථනයේ අන්තර්ජාල සබැඳුම බෙදා ගන්න"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ඔබගේ ජංගම දත්ත සබැඳුම හරහා වෙනත් උපාංග සඳහා අන්තර්ජාලය සැපයීමට හොට්ස්පොට් හා ටෙදරින් භාවිත කරන්න. යෙදුම් අවට උපාංග සමග අන්තර්ගතය බෙදා ගැනීමට හොට්ස්පොට් එකක්ද සෑදිය හැකිය."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ඔබේ Wi-Fi හෝ ජංගම දත්ත සම්බන්ධතාව හරහා අනෙක් උපාංගවලට අන්තර්ජාලය ලබා දීමට හොට්ස්පොට් සහ ටෙදරින් භාවිත කරන්න. අවට උපාංග සමඟ අන්තර්ගත බෙදා ගැනීමට හොට්ස්පොට් එකක් තැනීමට ද යෙදුම්වලට හැකිය."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"උදවු"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"බ්ලූටූත් පරිලෝකනය"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"බ්ලූටූත් ක්‍රියාවිරහිත විට පවා, ඕනෑම අවස්ථාවක අවට උපාංග සඳහා ස්කෑන් කිරීමට යෙදුම් සහ සේවාවලට ඉඩ දෙන්න. උදාහරණයක් ලෙස, ස්ථානය-පදනම් වූ විශේෂාංග සහ සේවා වැඩි දියුණු කිරීම සඳහා මෙය භාවිත කළ හැකිය."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"වැඩ සඳහා ස්ථානීය සේවා"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීම"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීම"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"වත්මන් වේලා කලාපය අනාවරණය කර ගැනීමට උපාංගයේ ස්ථානය භාවිත කිරීමට ඉඩ දෙයි. Wi‑Fi ස්කෑන් කිරීම වැනි වෙනත් ස්ථාන සැකසීම් වේලා කලාපය අනාවරණය කර ගැනීමේ නිරවද්‍යතාවට බලපෑ හැකිය."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ක්‍රියාත්මකයි"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ක්‍රියාවිරහිතයි"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ස්වයංක්‍රිය වේලා කලාපය අනාවරණය කර ගැනීම අබලයි"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීම අබලයි"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීම සහාය නොදක්වයි"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ස්ථාන වේලා කලාපය අනාවරණය කර ගැනීමේ වෙනස් කිරීම් ඉඩ නොදේ"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi සහ ජංගම ජාල ස්ථාන"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"ඔබගේ ස්ථානය ඉක්මනින් තීරණය කිරීමට යෙදුම් හට Google හි ස්ථාන සේවා භාවිතා කිරීමට ඉඩ දෙන්න. නිර්නාමික ස්ථාන දත්ත එකතු කර Google වෙත යැවෙනු ඇත."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Wi‑Fi මඟින් ස්ථානය හඳුනාගන්නා ලදි"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"මුහුණු අඟුලු ඇරීම භාවිත කිරීමට, මුරපදය සකසන්න"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"මුහුණු අඟුලු ඇරීම භාවිත කිරීමට, රටාව සකසන්න"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"මුහුණු අඟුලු ඇරීම භාවිත කිරීමට, රහස් අංකයක් සකසන්න"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"ජෛවමිතික භාවිත කිරීමට, මුරපදයක් සකසන්න"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"ජෛවමිතික භාවිත කිරීමට, රටාවක් සකසන්න"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"ජෛවමිතික භාවිත කිරීමට, PIN අංකයක් සකසන්න"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"ඔබේ මුරපදය අමතකද?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"ඔබේ රටාව අමතකද?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"ඔබේ PIN අමතකද?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"සිරස්තල මනාප"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"විශාලනය"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"විශාලනය කිරීමේ ප්‍රදේශය"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"විශාලනය සබල"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"තිරය විශාලනය කරන විට ඔබට භාවිත කිරීමට අවශ්‍ය විශාලනය කිරීමේ ප්‍රදේශය(ප්‍රදේශ) තෝරා ගන්න"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"පූර්ණ තිරය"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"තිරයේ කොටස"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"පූර්ණ තිරය &amp; තිරයේ කොටස"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"සම්පූර්ණ තිරය විශාලනය කරන්න"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"තිරයේ කොටස විශාලනය කරන්න"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ප්‍රවේශ්‍යතා බොත්තමට මාරු වන්නද?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"තිරයේ කොටසක් විශාලනය කිරීම සඳහා තුන්වරක් තට්ටු කිරීම භාවිතා කිරීම ටයිප් කිරීම සහ වෙනත් ක්‍රියා ප්‍රමාද වීමට හේතු වේ.\n\nවිශාලනය කිරීම සඳහා ප්‍රවේශ්‍යතා බොත්තම භාවිතා කිරීමට මාරු වීමට ඔබට අවශ්‍යද?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ප්‍රවේශ්‍යතා බොත්තමට මාරු වන්න"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"විශාලනය කිරීමට තුන්වරක් තට්ටු කිරීම තබා ගන්න"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"විශාලන සැකසීම්"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"තට්ටු-තුනක් සමඟ විශාලනය කරන්න"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"කෙටිමඟ සමඟ විශාලන කරන්න"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"බල බොත්තම ඇමතුම අවසන් කරයි"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"විශාල මූසික දර්ශකය"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"සජීවීකරණ ඉවත් කරන්න"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"ඒකල ශ්‍රව්‍යය"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ශ්‍රව්‍ය ධාවනය කරන විට නාලිකා ඒකාබද්ධ කරන්න"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ශ්‍රව්‍ය තුලනය"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"වම"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"දකුණ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"ඒකල ශ්‍රව්‍යය"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ශ්‍රව්‍ය ධාවනය කරන විට නාලිකා ඒකාබද්ධ කරන්න"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ශ්‍රව්‍ය තුලනය"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"වම"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"දකුණ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"පෙරනිමි"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"තත්පර 10"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"තත්පර 30"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"දැනුම්දීම් කම්පනය"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"නාද කම්පනය"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ප්‍රතිපෝෂණය ස්පර්ශ කරන්න"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> භාවිත කරන්න"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> විවෘත කරන්න"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"වර්ණ නිවැරදි කිරීම භාවිත කරන්න"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"සිරස්තල පෙන්වන්න"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"සහාය දක්වන යෙදුම සඳහා පමණයි"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> භාවිත කරන්න"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> විවෘත කරන්න"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"වර්ණ නිවැරදි කිරීම භාවිත කරන්න"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"සිරස්තල පෙන්වන්න"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"සහාය දක්වන යෙදුම සඳහා පමණයි"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"සිරස්තල තරම සහ විලාසය"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> පෙළ තරම"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"තව විකල්ප"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"වර්ණ අන්ධතාව"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"වර්ණ දුර්වලතාව"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"වර්ණ අන්ධතාව"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"රතු-කොළ"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"රතු-කොළ"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"නිල්-කහ"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"පසුබිම සීමා කිරීම"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"පසුබිමේ ධාවනය කිරීමට යෙදුමට අවසර දෙන්න"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"යෙදුම වෙත පසුබිමේ ධාවනය කිරීමට අවසර නැත"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"පසුබිම් භාවිතය සීමා කළ නොහැකිය"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"පසුබිම් භාවිතය සීමා කළ නොහැකිය"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"පසුබිම් ක්‍රියාකාරිත්වය සීමා කරන්නද?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ඔබ යෙදුමක පසුබිම් ක්‍රියාකාරිත්වය සීමා කළහොත්, එය වැරදි ලෙස ක්‍රියා කරනු ඇත"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"මෙම යෙදුම බැටරිය ප්‍රශස්ත කිරීමට සකසා නැති නිසා, ඔබට එය සීමා කළ නොහැකිය. \n\nයෙදුම සීමා කිරීම සඳහා, පළමුව බැටරි ප්‍රශස්තකරණය ක්‍රියාත්මක කරන්න."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ටැබ්ලට් උපාංගය සාමාන්‍යයට වඩා වැඩියෙන් භාවිත කර ඇත"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"උපාංගය සාමාන්‍යයට වඩා වැඩියෙන් භාවිත කර ඇත"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"බැටරිය සාමාන්‍යයට වඩා කලින් අවසන් විය හැක"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"බැටරි සෞඛ්‍යය සඳහා ප්‍රශස්ත කරමින්"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"බැටරිය තාවකාලිකව සීමිතයි. තව දැන ගැනීමට තට්ටු කරන්න."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"ඔබේ දුරකථනය සාමාන්‍යයට වඩා වැඩිපුර භාවිත කර ඇත. ඔබගේ බැටරිය බලාපොරොත්තු වූවාට වඩා ඉක්මනින් අවසන් විය හැක.\n\nබැටරි භාවිතයට අනුව ඉහළම යෙදුම්:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"ඔබේ ටැබ්ලටය සාමාන්‍යයට වඩා වැඩිපුර භාවිත කර ඇත. ඔබගේ බැටරිය බලාපොරොත්තු වූවාට වඩා ඉක්මනින් අවසන් විය හැක.\n\nබැටරි භාවිතයට අනුව ඉහළම යෙදුම්:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"ඔබේ උපාංගය සාමාන්‍යයට වඩා වැඩිපුර භාවිත කර ඇත. ඔබගේ බැටරිය බලාපොරොත්තු වූවාට වඩා ඉක්මනින් අවසන් විය හැක.\n\nබැටරි භාවිතයට අනුව ඉහළම යෙදුම්:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">යෙදුම් %1$dක් සීමා කර ඇත</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"ඔබගේ බැටරි මනුව කියවීමේ දෝෂයකි"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"ඔබගේ බැටරි මනුව කියවීමේ දෝෂයකි. "<annotation id="url">"තව දැන ගැනීමට"</annotation>" තට්ටු කරන්න"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"යෙදුම නවත්වන්නද?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ දුරකථනය අවදියෙන් තබා ගන්නා නිසා ඔබේ දුරකථනයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට යෙදුම නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> ඔබේ ටැබ්ලටය අවදියෙන් තබා ගන්නා නිසා ඔබේ ටැබ්ලටයට සාමාන්‍ය පරිදි බැටරිය කළමනාකරණය කළ නොහැකිය.\n\nමෙම ගැටලුව විසඳීමට උත්සාහ කිරීමට, ඔබට යෙදුම නැවැත්විය හැකිය.\n\nමෙය දිගටම සිදු වන්නේ නම්, බැටරි කාර්ය සාධනය වැඩි දියුණු කිරීමට ඔබ යෙදුම අස්ථාපනය කිරීම අවශ්‍ය විය හැකිය."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"කාලසටහනක් සකසන්න"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"බැටරි ආයු කාලය දීර්ඝ කරන්න"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ආරෝපණය වූ විට ක්‍රියාවිරහිත කරන්න"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"ඔබේ දුරකථනය <xliff:g id="PERCENT">%1$s</xliff:g> හි තිබෙන විට බැටරි සුරැකුම අක්‍රිය වෙයි"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"ඔබේ ටැබ්ලටය <xliff:g id="PERCENT">%1$s</xliff:g> හි තිබෙන විට බැටරි සුරැකුම අක්‍රිය වෙයි"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"ඔබේ උපාංගය <xliff:g id="PERCENT">%1$s</xliff:g> හි තිබෙන විට බැටරි සුරැකුම අක්‍රිය වෙයි"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"ඔබේ දුරකථනය <xliff:g id="PERCENT">%1$s</xliff:g>ට වඩා වැඩියෙන් ආරෝපණය වූ විට බැටරි සුරැකුම ක්‍රියාවිරහිත වෙයි"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ඔබේ ටැබ්ලටය <xliff:g id="PERCENT">%1$s</xliff:g>ට වඩා වැඩියෙන් ආරෝපණය වූ විට බැටරි සුරැකුම ක්‍රියාවිරහිත වෙයි"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"ඔබේ උපාංගය <xliff:g id="PERCENT">%1$s</xliff:g>ට වඩා වැඩියෙන් ආරෝපණය වූ විට බැටරි සුරැකුම ක්‍රියාවිරහිත වෙයි"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ක්‍රියාත්මක කරන්න"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"යළි පිහිටුවන්න"</string>
     <string name="tts_play" msgid="2945513377250757221">"ධාවනය කරන්න"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"අනුවර්තී සබැඳුම් හැකියාව"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"ඔබගේ ජාල සම්බන්ධතා ස්වයංක්‍රීයව කළමනාකරණය කිරීමෙන් බැටරි ආයු කාලය දිගු කරන අතර උපාංගයේ ක්‍රියාකාරිත්වය වැඩි දියුණු කරයි"</string>
     <string name="credentials_title" msgid="7535942196886123656">"අක්තපත්‍ර ආචයනය"</string>
     <string name="credentials_install" msgid="3933218407598415827">"සහතිකයක් ස්ථාපනය කරන්න"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"සහතික ආචයනයෙන් ස්ථාපනය කරන්න"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"පරිශීලක අක්තපත්‍ර"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ගබඩා කළ අක්තපත්‍ර බලන්න සහ විකරණය කරන්න"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"උසස්"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ආචයන වර්ගය"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"දෘඩාංග රක්ෂිත"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"මෘදුකාංග පමණි"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"මෙම පරිශීලකයාට අක්තපත්‍ර නොතිබේ"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN සහ යෙදුම් සඳහා ස්ථාපිත"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi සඳහා ස්ථාපිත"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"ස්ථාපනය නොකරන්න"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"කෙසේ වෙතත් ස්ථාපනය කරන්න"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"සහතිකය ස්ථාපනය කර නැත"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g> හට මෙම උපාංගයේ සහතික ස්ථාපනය කිරීමට ඉඩ දෙන්නද?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"මෙම සහතික ඔබව පහත යෙදුම් සහ URL වෙත හඳුනා ගනු ඇත"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"ඉඩ දෙන්න එපා"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"ඉඩ දෙන්න"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"තව පෙන්වන්න"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"සහතික කළමනාකරණ යෙදුම"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"කිසිවක් නැත"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"මෙම යෙදුම මඟින් ස්ථාපනය කර ඇති සහතික පහත යෙදුම් සහ URL සඳහා ඔබව හඳුනා ගනී"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"ඉවත් කරන්න"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"හදිසි අවස්ථා ඩයල් කිරීමේ සංඥාව"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"හදිසි ඇමතුමක් ලැබුණ විට හැසිරීම සකසන්න"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"උපස්ථය"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"සකස් කර නොමැත - වැඩකරන පැතිකඩ"</string>
     <string name="user_admin" msgid="4024553191395768119">"පරිපාලක"</string>
     <string name="user_you" msgid="3070562015202859996">"ඔබ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"අපනාමය"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"ඔබට පරිශීලකයන් <xliff:g id="USER_COUNT">%1$d</xliff:g> ක් දක්වා එක් කළ හැකිය"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"ටැබ්ලටයේ හිමිකරුට පමණක් පරිශීලකයින් කළමනාකරණය කළ හැක."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"දුරකථනයේ හිමිකරුට පමණක් පරිශීලකයින් කළමනාකරණය කළ හැක."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"පර්යන්තයේදී ගෙවීම"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ගෙවීම් යෙදුමක් පිහිටුවන්න. අනතුරුව ඔබේ දුරකථනයේ පසුපස contactless සංකේතය සහිත ඕනෑම ටර්මිනලයකට අල්ලන්න."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"තේරුණා"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"තව..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"තව…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"පෙරනිමි ගෙවීම් යෙදුම සකසන්න"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"පෙරනිමි ගෙවීම් යෙදුම යාවත්කාලීන කරන්න"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"සම්බන්ධතාවක් නැති පර්යන්තයකදී, <xliff:g id="APP">%1$s</xliff:g> සමගින් ගෙවන්න"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ආපසු"</string>
     <string name="wizard_next" msgid="3884832431439072471">"මීලඟ"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"අවසන් කරන්න"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ඡායාරූපයක් ගන්න"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"රූපයක් තෝරන්න"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ඡායාරූපය තෝරන්න"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM කාඩ් පත්"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM කාඩ් පත්"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ඇමතුම් සඳහා මෙම එක සැමවිටම භාවිතා කරන්න"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"දත්ත සඳහා SIM එක තෝරන්න"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"කෙටිපණිවුඩ සඳහා SIM තෝරන්න"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"දත්ත SIM මාරු කරමින්, මෙය මිනිත්තුවක් දක්වා ගත හැකිය..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"දත්ත SIM මාරු කරමින්, මෙය මිනිත්තුවක් දක්වා ගත හැකිය…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"සමඟ අමතන්න"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM කාඩ් පත තෝරන්න"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"චර්යානුගත, කාල සටහන, බැටරි සුරැකුම, බල සුරැකුම, බැටරිය, ස්වයංක්‍රීය, ප්‍රතිශතය"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, උසස් ඇමතුම්, 4g ඇමතුම්"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"භාෂාව එක් කරන්න, භාෂාවක් එක් කරන්න"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"පෙළ තරම"</string>
     <string name="default_sound" msgid="6604374495015245195">"සුපුරුදු හඬ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"නාද සහ දැනුම්දීම හඬ පරිමාව <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"හඬ පරිමාව, කම්පනය, බාධා නොකරන්න"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ශබ්ද බල ගන්වන්න"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"සජීවී සිරස්තලය"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"මාධ්‍ය ස්වයංක්‍රීයව සිරස්තල"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"කිසිවක් නැත"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">කාලසටහන් <xliff:g id="ON_COUNT">%d</xliff:g>ක් සකසන ලදී</item>
-      <item quantity="other">කාලසටහන් <xliff:g id="ON_COUNT">%d</xliff:g>ක් සකසන ලදී</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{කිසිත් නැත}=1{කාලසටහන් 1ක් සකසන ලදී}one{කාලසටහන් #ක් සකසන ලදී}other{කාලසටහන් #ක් සකසන ලදී}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"බාධා නොකරන්න"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"වැදගත් පුද්ගලයන් සහ යෙදුම් විසින් පමණක් දැනුම් දෙනු ලැබේ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"බාධා සීමා කරන්න"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ප්‍රමුඛතා පමණි"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ක්‍රියාත්මකයි / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ක්‍රියාවිරහිතයි / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ක්‍රියාවිරහිතයි"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ක්‍රියාත්මකයි"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"සැම විටම අසන්න"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ඔබ ක්‍රියාවිරහිත කරන තුරු"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one">පැය <xliff:g id="NUM_HOURS">%d</xliff:g></item>
-      <item quantity="other">පැය <xliff:g id="NUM_HOURS">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"විනාඩි <xliff:g id="NUM_MINUTES">%d</xliff:g>"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one">කාල සටහන් <xliff:g id="ON_COUNT">%d</xliff:g>ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය</item>
-      <item quantity="other">කාල සටහන් <xliff:g id="ON_COUNT">%d</xliff:g>ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{පැය 1}one{පැය #}other{පැය #}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{මිනිත්තු 1}one{මිනිත්තු #}other{මිනිත්තු #}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ක්‍රියාවිරහිතයි}=1{ක්‍රියාවිරහිතයි / කාල සටහන් 1ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය}one{ක්‍රියාවිරහිතයි / කාල සටහන් #ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය}other{ක්‍රියාවිරහිතයි / කාල සටහන් #ක් ස්වයංක්‍රියව ක්‍රියාත්මක කළ හැකිය}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"බාධා නොකරන්න වෙත බාධා කළ හැකි දේවල්"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"පුද්ගලයන්"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"යෙදුම්"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ප්‍රමුඛත්වය අඩු දැනුම්දීම් ස්වයංක්‍රීයව සියුම් ලෙස සකසන්න"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"අනුවර්තී දැනුම් දීම් ශ්‍රේණිගත කිරීම"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"අදාළත්වය අනුව ස්වයංක්‍රියව දැනුම් දීම් ශ්‍රේණිගත කරන්න"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"අනුවර්තී දැනුම් දීම් ප්‍රතිපෝෂණය"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"දැනුම් දීම් වෙත කළ ගැළපීම් දක්වා පද්ධතිය වෙත ප්‍රතිපෝෂණ ලබා දීමට විකල්පය පෙන්වන්න"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"දැනුම්දීම් වැදගත්කම යළි සකසන්න"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"පරිශීලක වෙනස් කළ වැදගත් සැකසීම් යළි සකසන්න සහ ප්‍රමුඛතාව සැකසීමට දැනුම්දීම් සහායකට ඉඩ දෙන්න"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"යෝජිත ක්‍රියා සහ පිළිතුරු"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"යෝජිත ක්‍රියා සහ පිළිතුරු ස්වයංක්‍රීයව පෙන්වන්න"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"මෑත සහ මඳක් නිද්‍රාවට පත් කළ දැනුම් දීම් පෙන්වන්න"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"ප්‍රමුඛතා සංවාද"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"සංවාද කොටසේ ඉහළම පෙන්වන අතර පාවෙන බුබුලු ලෙස දිස් වේ."</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"සංවාද කොටසේ ඉහළ දී පෙන්වන්න"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"වෙනත් සංවාද"</string>
+    <string name="other_conversations" msgid="551178916855139870">"ප්‍රමුඛතා නොවන සංවාද"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"ඔබ වෙනස් කිරීම් කර ඇති සංවාද"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"මෑත සංවාද"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"මෑත ඒවා හිස් කරන්න"</string>
+    <string name="clear" msgid="5092178335409471100">"හිස් කරන්න"</string>
     <string name="important_bubble" msgid="7911698275408390846">"ප්‍රමුඛතා සංවාද බුබුලු දමන්න"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ප්‍රමුඛතා සංවාද පහළට-ඇදීමේ වැස්ම ඉහළින් පෙන්වයි. ඔබට ඒවා බුබුලු නැගීමට සැකසීමට සහ බාධා නොකරන්න බාධා කිරීමටද හැකිය."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ප්‍රමුඛතා සහ වෙනස් කළ සංවාද මෙහි දිස් වනු ඇත"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"ප්‍රවේශය බාධා නොකරන්න"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'බාධා නොකරන්න\' හට ඉඩ දෙන්න"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ස්ථාපිත යෙදුම් කිසිවක් ප්‍රවේශය බාධා නොකරන්න ඉල්ලා නැත"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"යෙදුම් පූරණය වේ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"යෙදුම් පූරණය කරමින්…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"ඔබගේ ඉල්ලීම මත, Android මෙම යෙදුමෙහි දැනුම්දීම් මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"ඔබගේ ඉල්ලීම මත, Android මෙම දැනුම්දීම් ප්‍රවර්ගය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"ඔබගේ ඉල්ලීම මත, Android මෙම දැනුම්දීම් සමූහය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"සියලු සංවාද"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ප්‍රමුඛතා සංවාද"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"කිසිවක් නැත"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one">සංවාද <xliff:g id="CONVERSATIONS">%d</xliff:g></item>
-      <item quantity="other">සංවාද <xliff:g id="CONVERSATIONS">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"කිසිවක් නැත"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{කිසිත් නැත}=1{සංවාද 1}one{සංවාද #}other{සංවාද #}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"බාධා කළ හැකි අය"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"ඇමතුම්"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"ඇමතුම්"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"අවසර ලත් ඇමතුම් මගින් හඬ ඇති කරන බව තහවුරු කර ගැනීමට, උපාංගය නාද වීමට සකසා ඇතිදැයි පරීක්ෂා කරන්න"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ සඳහා එන ඇමතුම් අවහිර වේ. ඔබට ඔබේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ කරා ළඟා වීමට ඉඩ දීමට සැකසීම් සීරුමාරු කළ හැකිය."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"තරු ලකුණු යෙදූ සම්බන්ධතා"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">තවත් <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">තවත් <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"කිසිවක් නැත"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{කිසිත් නැත}=1{{contact_1}}=2{{contact_1} සහ {contact_2}}=3{{contact_1}, {contact_2} සහ {contact_3}}one{{contact_1}, {contact_2} සහ තවත් # දෙනෙක්}other{{contact_1}, {contact_2} සහ තවත් # දෙනෙක්}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(නමක් නොමැත)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"පණිවිඩ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"පණිවිඩ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"පණිවිඩ"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ සඳහා එන පණිවිඩ අවහිර වේ. ඔබට ඔබේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ කරා ළඟා වීමට ඉඩ දීමට සැකසීම් සීරුමාරු කළ හැකිය."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"සියලු පණිවිඩවලට ඔබ වෙත ළඟා විය හැකිය"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"සියලු ඇමතුම්වලට ඔබ වෙත ළඟා විය හැකිය"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"කිසිවක් නැත"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one">සම්බන්ධතා <xliff:g id="NUM_CONTACTS">%d</xliff:g></item>
-      <item quantity="other">සම්බන්ධතා <xliff:g id="NUM_CONTACTS">%d</xliff:g></item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{කිසිත් නැත}=1{සම්බන්ධතා 1}one{සම්බන්ධතා #}other{සම්බන්ධතා #}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ඕනෑම කෙනෙක්"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"සම්බන්ධතා"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"තරු ලකුණු යෙදූ සම්බන්ධතා"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"සියලු දැනුම් දීම්"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"සමහර දැනුම් දීම්"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ඔබ යෙදුම්වලට බාධා කිරීමට ඉඩ නොදුන් විට පවා තෝරා ගත් පුද්ගලයන්ට තවමත් ඔබ වෙත ළඟා විය හැකිය"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g>වලට බාධා කළ හැකිය</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g>වලට බාධා කළ හැකිය</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"තව <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{යෙදුම් කිසිවකට බාධා කළ නොහැකිය}=1{{app_1} හට බාධා කළ හැකිය}=2{{app_1} සහ {app_2} හට බාධා කළ හැකිය}=3{{app_1}, {app_2}, සහ {app_3} හට බාධා කළ හැකිය}one{{app_1}, {app_2}, සහ තවත් #ක් හට බාධා කළ හැකිය}other{{app_1}, {app_2}, සහ තවත් #ක් හට බාධා කළ හැකිය}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"යෙදුම්"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"සියලු දැනුම් දීම්"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"සමහර දැනුම් දීම්"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"බාධා කළ නොහැකි දැනුම් දීම්"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"සියලු දැනුම් දීම්වලට ඉඩ දෙන්න"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>වලට බාධා කළ හැකිය</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>වලට බාධා කළ හැකිය</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"කිසිවකට බාධා කළ නොහැකිය"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"තව <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{කිසිවකට බාධා කළ නොහැකිය}=1{{sound_category_1} හට බාධා කළ හැකිය}=2{{sound_category_1} සහ {sound_category_2} හට බාධා කළ හැකිය}=3{{sound_category_1}, {sound_category_2}, සහ {sound_category_3} හට බාධා කළ හැකිය}one{{sound_category_1}, {sound_category_2}, සහ තවත් #ක් හට බාධා කළ හැකිය}other{{sound_category_1}, {sound_category_2}, සහ තවත් #ක් හට බාධා කළ හැකිය}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"කිසිවකට බාධා කළ නොහැකිය"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"කිසි කෙනෙකුට බාධා කළ නොහැකිය"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"සමහර පුද්ගලයන්ට බාධා කළ හැකිය"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"සියලු පුද්ගලයන්ට බාධා කළ හැකිය"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ක්‍රියාත්මකයි"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"අක්‍රියයි"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"යෙදුම ඇමිණීම"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"යෙදුම ඇමිණීම ඔබ එය ඇමිණීමෙන් ඉවත් කරන තෙක් වත්මන් යෙදුම තබා ගැනීමට ඉඩ දේ. උදාහරණයක් වශයෙන් විශ්වාසි මිතුරෙකුට විශේෂිත ගේම් එකක් ක්‍රීඩා කිරීමට ඉඩ දීමට මෙම විශේෂාංගය භාවිත කළ හැකිය. \n\nයෙදුමක් ඇමුණු විට, ඇමුණූ යෙදුම වෙනත් යෙදුම් විවෘත කළ හැකි අතර පෞද්ගලික දත්ත ප්‍රවේශ විය හැකිය. \n\nයෙදුම ඇමිණීම භාවිත කිරීමට: 	\n1.	යෙදුම ඇමිණීම ක්‍රියාත්මක කරන්න 	\n2.	දළ විශ්ලේෂණය විවෘත කරන්න 	\n3.	තිරයේ ඉහළින් ඇති යෙදුම් අයිකනය තට්ටු කර අනතුරුව ඇමුණුම තට්ටු කරන්න"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"යෙදුම ඇමිණීම ඔබ එය ඇමිණීමෙන් ඉවත් කරන තෙක් වත්මන් යෙදුම තබා ගැනීමට ඉඩ දේ. උදාහරණයක් වශයෙන් විශ්වාසි මිතුරෙකුට විශේෂිත ගේම් එකක් ක්‍රීඩා කිරීමට ඉඩ දීමට මෙම විශේෂාංගය භාවිත කළ හැකිය. \n\nයෙදුමක් ඇමුණු විට, ඇමුණූ යෙදුම වෙනත් යෙදුම් විවෘත කළ හැකි අතර පෞද්ගලික දත්ත ප්‍රවේශ විය හැකිය. \n\nඔබට ඔබේ උපාංගය යම් කෙනෙකු සමග ආරක්ෂිතව බෙදා ගැනීමට අවශ්‍ය නම්, ඒ වෙනුවට ආරාධිත පරිශීලකයකු භාවිත කිරීමට උත්සාහ කරන්න. \n\nයෙදුම ඇමිණීම භාවිත කිරීමට: 	\n1.	යෙදුම ඇමිණීම ක්‍රියාත්මක කරන්න 	\n2.	දළ විශ්ලේෂණය විවෘත කරන්න 	\n3.	තිරයේ ඉහළින් ඇති යෙදුම් අයිකනය තට්ටු කර අනතුරුව ඇමුණුම තට්ටු කරන්න"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"යෙදුම ඇමිණීම ඔබ එය ඇමිණීමෙන් ඉවත් කරන තෙක් වත්මන් යෙදුම තබා ගැනීමට ඉඩ දේ. උදාහරණයක් වශයෙන් විශ්වාසි මිතුරෙකුට විශේෂිත ගේම් එකක් ක්‍රීඩා කිරීමට ඉඩ දීමට මෙම විශේෂාංගය භාවිත කළ හැකිය."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"යෙදුමක් ඇමිණූ විට, ඇමිණූ යෙදුම වෙනත් යෙදුම් විවෘත කළ හැකි අතර පෞද්ගලික දත්තවලට ප්‍රවේශ විය හැකිය. \n\nයෙදුම ඇමිණීම භාවිත කිරීමට: 	\n1.	යෙදුම ඇමිණීම ක්‍රියාත්මක කරන්න 	\n2.	දළ විශ්ලේෂණය විවෘත කරන්න 	\n3.	තිරයේ ඉහළින් ඇති යෙදුම් නිරූපකය තට්ටු කර අනතුරුව අමුණන්න තට්ටු කරන්න"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"යෙදුමක් ඇමිණූ විට, ඇමිණූ යෙදුම වෙනත් යෙදුම් විවෘත කළ හැකි අතර පෞද්ගලික දත්තවලට ප්‍රවේශ විය හැකිය. \n\nඔබට ඔබේ උපාංගය යම් කෙනෙකු සමග ආරක්ෂිතව බෙදා ගැනීමට අවශ්‍ය නම්, ඒ වෙනුවට ආගන්තුක පරිශීලකයකු භාවිත කිරීමට උත්සාහ කරන්න. \n\nයෙදුම ඇමිණීම භාවිත කිරීමට: 	\n1.	යෙදුම ඇමිණීම ක්‍රියාත්මක කරන්න 	\n2.	දළ විශ්ලේෂණය විවෘත කරන්න 	\n3.	තිරයේ ඉහළින් ඇති යෙදුම් නිරූපකය තට්ටු කර අනතුරුව අමුණන්න තට්ටු කරන්න"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"යෙදුම අමුණා ඇති විට: \n\n•		පෞද්ගලික දත්ත ප්‍රවේශ විය හැකිය \n		(සම්බන්ධතා සහ ඉ-තැපැල් අන්තර්ගත යනාදි) \n•	ඇමුණූ යෙදුම වෙනත් යෙදුම් විවෘත කළ හැකිය \n\nඔබ විශ්වාස කරන පුද්ගලයන් සමග පමණක් යෙදුම ඇමිණීම භාවිත කරන්න."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"ගැලවීමට පෙර අගුළු අරින රටාව සඳහා අසන්න"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"ගැලවීමට පෙර PIN විමසන්න"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ මුහුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ PIN අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට PIN එක අවශ්‍යද?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ මුහුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ රටාව අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට රටාවක් අවශ්‍යද?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ මුහුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ මුරපදය අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට මුරපදය එක අවශ්‍යද?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ජෛවමිතික භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ PIN ඉල්ලා සිටීම මඟින් ඔබට එය තවදුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළුව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි. ඔබගේ උපාංගය ආරම්භ කිරීමට PIN අවශ්‍යද?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ජෛවමිතික භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ රටාව ඉල්ලා සිටීම මඟින් ඔබට එය තවදුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළුව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි. ඔබගේ උපාංගය ආරම්භ කිරීමට රටාව අවශ්‍යද?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ජෛවමිතික භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ මුරපදය ඉල්ලා සිටීම මඟින් ඔබට එය තවදුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළුව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි. ඔබගේ උපාංගය ආරම්භ කිරීමට මුරපදය අවශ්‍යද?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ඔව්"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"නැත"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"සීමා කළ"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB පාලනය වන්නේ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"සම්බන්ධ කළ උපාංගය"</string>
     <string name="usb_control_device" msgid="527916783743021577">"මෙම උපාංගය"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"මාරු කරමින්..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"මාරු කරමින්…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"මාරු කළ නොහැකි විය"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"මෙම උපාංගය ආරෝපණය කරමින්"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"සම්බන්ධිත උපාංගය ආරෝපණය කරමින්"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"ජංගම දත්ත භාවිතය"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"යෙදුම් දත්ත භාවිතය"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi දත්ත භාවිතය"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"වාහක නොවන දත්ත භාවිතය"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ඊතර්නෙට් දත්ත භාවිතය"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"ඊතර්නෙට්"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other">සීමා <xliff:g id="COUNT">%1$d</xliff:g>ක්</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"උපාංග ගිණුම්ගත කිරීමෙන් වාහක දත්ත ගිණුම්ගත කිරීම වෙනස් විය හැකිය"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"වාහක ජාල මගින් භාවිත කරන දත්ත බැහැර කරයි"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> භාවිත විය"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"දත්ත අනතුරු ඇඟවීම සකසන්න"</string>
     <string name="data_warning" msgid="2925054658166062884">"දත්ත අනතුරු ඇඟවීම"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"විස්තර බලන්න"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"දත්ත සුරැකුම"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"සීමා නොකළ දත්ත"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"පසුබිම් දත්ත ක්‍රියාවිරහිතයි"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"පසුබිම් දත්ත ක්‍රියාවිරහිතයි"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ක්‍රියාත්මකයි"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ක්‍රියාවිරහිතයි"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"දත්ත සුරැකුම භාවිත කරන්න"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"උපාංගය අගුලු දමා ඇති නම්, දැනුම්දීම් තුළ පිළිතුරු හෝ වෙනත් පෙළ ටයිප් කිරීම වළක්වන්න"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"පෙරනිමි අක්ෂර වින්‍යාස පරීක්ෂක"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"අක්ෂර වින්‍යාස පරීක්ෂක තෝරන්න"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"අක්ෂර වින්‍යාස පරීක්ෂාව භාවිත කරන්න"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"අක්ෂර වින්‍යාස පරීක්ෂාව භාවිත කරන්න"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"තෝරා නොමැත"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(කිසිවක් නැත)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ගබඩා ඉඩ නිදහස් කර ගැනීමට උදවු වීමට, ගබඩා කළමනාකරු ඔබේ උපාංගය වෙතින් උපස්ථ කළ ඡායාරූප සහ වීඩියෝ ඉවත් කරයි."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ඡායාරූප සහ වීඩියෝ ඉවත් කරන්න"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ගබඩා කළමනාකරු"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ගබඩා කළමනාකරු භාවිත කරන්න"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ගබඩා කළමනාකරු භාවිත කරන්න"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ස්වයංක්‍රිය"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"අත්පොත"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"දැන් ඉඩ නිදහස් කර ගන්න"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"දුරකථනය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ටැබ්ලට් පරිගණකය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"උපාංගය පරීක්ෂා කිරීමට දෙවරක් තට්ටු කරන්න"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"දැනුම්දීම්වලට ස්වයිප් කර."</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"ඔබගේ දැනුම්දීම් පෙන්වීමට තිරයේ පහළ දාරයෙහි සිට පහළට ස්වයිප් කරන්න"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"තනි අත් ප්‍රකාරය"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"තනි අත් ප්‍රකාරය භාවිත කරන්න"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"යෙදුම් මාරු කරන විට පිටවන්න"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"කාල නිමාව"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"තත්පර 4"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"තත්පර 8"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"තත්පර 12"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ළඟා විය හැකි බව"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"වේලාව, දැනුම්දීම් සහ වෙනත් තොරතුරු පරීක්ෂා කිරීමට, ඔබේ තිරය දෙවරක් තට්ටු කරන්න."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"දුරකථනය පරීක්ෂාවට ඔසවන්න"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ටැබ්ලට් පරිගණකය පරීක්ෂා කිරීමට ඔසවන්න"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ටැබ්ලටය පරීක්‍ෂා කිරීමට තට්ටු කරන්න"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"උපාංගය පරීක්‍ෂා කිරීමට තට්ටු කරන්න"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"වේලාව, දැනුම්දීම් සහ වෙනත් තොරතුරු පරීක්‍ෂා කිරීමට, ඔබේ තිරයට දෙවරක් තට්ටු කරන්න."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"හදිසි SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"හදිසි SOS භාවිත කරන්න"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> මගින් කළමනාකරණය කෙරේ"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"බල බොත්තම 5 වතාවක් හෝ ඊට වැඩි වතාවක් ඉක්මනින් එබීමෙන් පහත ක්‍රියා ආරම්භ කරන්න"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"පහළට ගණන් කිරීමේ එලාමය වාදනය කරන්න"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"උදවු සඳහා දැනුම්දීමට පෙර ශබ්දය වැඩි හඬක් වාදනය කරන්න"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"උදවු සඳහා අමතන්න"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"උදවු සඳහා ඇමතීමට අංකය"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. වෙනස් කිරීමට තට්ටු කරන්න"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"ඔබ හදිසි ඇමතුම් අංකයක් නොවන අංකයක් ඇතුළු කළේ නම්:\n • ඔබගේ උපාංගය හදිසි අවස්ථා SOS භාවිත කිරීමට අගුලු හැරිය යුතුය\n • ඔබගේ ඇමතුමට පිළිතුරු නොදිය හැකිය"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"දැනුම්දීම් සඳහා ඇඟිලි සලකුණ ස්වයිප් කරන්න"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"ඇඟිලි සලකුණ ස්වයිප් කරන්න"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ඔබේ දැනුම්දීම් පරීක්ෂා කිරීමට, ඔබේ දුරකථනයේ පිටුපස පැත්තේ ඇති ඇඟිලි සලකුණු සංවේදකය මත පහළට ස්වයිප් කරන්න."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"උපරිම දෘශ්‍යමාන දත්ත කට්ටල"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"පෙරනිමි අගයන්ට යළි සකසන්න"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"ස්වයං පිරවුම් සංවර්ධක විකල්ප යළි සකසා ඇත"</string>
+    <string name="location_category" msgid="3496759112306219062">"ස්ථානය"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"තත්ත්ව තීරු ස්ථාන දර්ශකය"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"ජාලය සහ සබැඳුම් හැකියාව ඇතුළුව, සියලු ස්ථාන සඳහා පෙන්වන්න"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"සම්පූර්ණ GNSS මිනුම් බලාත්මක කරන්න"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"කාර්ය චක්‍රය රහිත සියලු GNSS සබැඳි තාරකා ගෝල සහ සංඛ්‍යාත"</string>
     <string name="device_theme" msgid="5027604586494772471">"උපාංග තේමාව"</string>
     <string name="default_theme" msgid="4815428567082263639">"පෙරනිමි"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"ජාල නම"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"අවධානය යොමු කිරීම සඳහා දැනුම්දීම් විරාම කරන්න"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"විශේෂාංගය නොලැබේ"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"මෙම විශේෂාංගය ඔබේ දුරකථනය මන්දගාමී කරන බැවින් මෙය අක්‍රිය කර ඇත"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"සම්පූර්ණ GNSS මිනුම් බලාත්මක කරන්න"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"කාර්ය චක්‍රය රහිත සියලු GNSS සබැඳි තාරකා ගෝල සහ සංඛ්‍යාත"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"බිඳ වැටීම් සංවාදය සැම විට පෙන්වන්න"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"යෙදුමක් බිඳ වැටෙන සෑම විටම සංවාදය පෙන්වන්න"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE සබල යෙදුමක් තෝරන්න"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"සියලුම යෙදුම් සඳහා සබල කරන්න"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"ග්‍රැෆික් ධාවකය තෝරන්න"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"පෙරනිමි"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ක්‍රීඩා ධාවකය"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ක්‍රීඩා ධාවකය"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"සංවර්ධක ධාවකය"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"පද්ධති ග්‍රැෆික් ධාවකය"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"ක්‍රියාත්මකයි (නිහඬ)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ක්‍රියාවිරහිතයි"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"ජාල විස්තර"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"ඔබගේ උපාංගයේ නම ඔබගේ දුරකථනයේ යෙදුම්වලට දෘශ්‍යමානය. ඔබ බ්ලූටූත්වලට සම්බන්ධ වූ විට හෝ Wi-Fi හොට්ස්පොට් එකක් පිහිට වූ විට වෙනත් පුද්ගලයන්ද එය දැකිය හැකිය."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"ඔබගේ උපාංගයේ නම ඔබගේ දුරකථනයේ යෙදුම්වලට දෘශ්‍යමානය. ඔබ බ්ලූටූත්වලට සම්බන්ධ වූ විට හෝ Wi-Fi හොට්ස්පොට් එකක් පිහිටු වූ විට වෙනත් පුද්ගලයන්ද එය දැකිය හැකිය."</string>
     <string name="devices_title" msgid="649715719278562515">"උපාංග"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"සියලු සැකසීම්"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"යෝජනා"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ජාල සොයා ගත නොහැකි විය. නැවත උත්සාහ කරන්න."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(තහනම්)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM කාඩ්පතක් නැත"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM නැත"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"කිසිවක් නැත"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"සබැඳි වීමට SIM අවශ්‍යයි"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"සබැඳි වීමට <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM අවශ්‍යයි"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ප්‍රිය ජාල ආකාරය: WCDMA කැමතියි"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ප්‍රිය ජාල ආකාරය: GSM පමණි"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ප්‍රිය ජාල ආකාරය: WCDMA පමණි"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"ජංගම දත්ත"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"ජංගම ජාලය භාවිතයෙන් දත්ත වෙත ප්‍රවේශ වන්න"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"දුරකථනය පරාසය තුළ තිබෙන විට ස්වයංක්‍රීයව වාහකය වෙත මාරු වෙයි"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM කාඩ්පත් කිසිවක් ලබා ගත නොහැකිය"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ඇමතුම් මනාපය"</string>
     <string name="sms_preference" msgid="7742964962568219351">"කෙටි පණිවුඩ මනාප"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"සැම විටම අසන්න"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> වෙත සම්බන්ධ වූ විට නොමැත"</string>
     <string name="see_more" msgid="7499355691042812723">"තව බලන්න"</string>
     <string name="see_less" msgid="2642392725363552793">"අඩුවෙන් බලන්න"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ක්‍රියාත්මක කරන්නද?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM ක්‍රියාත්මක කරන්නද?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> වෙත මාරු වන්නද?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM කාඩ්පත භාවිතයට මාරු වන්නද?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"වරකට SIM එකක් පමණක් සක්‍රිය කළ හැකිය.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> වෙත මාරු වීම ඔබේ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> සේවය අවලංගු නොකරනු ඇත."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"වරකට බාගත් SIM එකක් පමණක් සක්‍රිය විය හැකිය.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> වෙත මාරු වීම ඔබේ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> සේවය අවසන් නොකරනු ඇත."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"වරකට SIM එකක් පමණක් සක්‍රිය කළ හැකිය.\n\nමාරු වීම ඔබේ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> සේවය අවලංගු නොකරනු ඇත."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> වෙත මාරු වන්න"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"ජාලයට සම්බන්ධ වෙමින්…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> වෙත මාරු වෙමින්"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"වාහකය මාරු කළ නොහැකිය"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"දෝෂයක් හේතුවෙන් වාහකය මාරු කළ නොහැකිය."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ක්‍රියාවිරහිත කරන්නද?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM ක්‍රියාවිරහිත කරන්නද?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM ක්‍රියාවිරහිත කරමින්<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"වාහකය අබල කළ නොහැකිය"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"යම් දෙයක් වැරදී ගිය අතර ඔබේ වාහකය අබල කළ නොහැකි විය."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"SIM 2ක් භාවිත කරන්නද?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"මෙම උපාංගයට එකවර SIM 2ක් ක්‍රියාත්මකව තිබිය හැකිය. දිගටම වරකට 1 SIM එකක් භාවිත කිරීමට, \"එපා, ස්තුතියි\" තට්ටු කරන්න."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"උපාංගය යළි අරඹන්නද?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ආරම්භ කිරීමට, ඔබේ උපාංගය යළි අරඹන්න. පසුව ඔබට වෙනත් SIM එකක් එක් කළ හැකිය."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ඉදිරියට යන්න"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"යළි අරඹන්න"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"එපා, ස්තුතියි"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"මාරු වන්න"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM එක සක්‍රිය කිරීමට නොහැකිය"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM එක ඉවත් කර එය නැවත ඇතුළු කරන්න. ප්‍රශ්නය දිගටම පැවතුණහොත්, ඔබේ උපාංගය යළි ආරම්භ කරන්න."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"නැවත SIM එක ක්‍රියාත්මක කිරීමට උත්සාහ කරන්න. ප්‍රශ්නය දිගටම පැවතුණහොත්, ඔබේ උපාංගය යළි ආරම්භ කරන්න."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"ජාල සක්‍රිය කිරීම"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> සක්‍රියයි"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM සැකසීම් යාවත්කාලීන කිරීමට තට්ටු කරන්න"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM කාඩ්පත"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"මෙම බාගත් SIM මකන්නද?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"මෙම SIM මැකීමෙන් මෙම උපාංගයෙන් <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> සේවාව ඉවත් කරයි.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> සඳහා වන සේවාව අවලංගු නොකෙරේ."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"මකන්න"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM මකමින්…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM මැකිය නොහැක"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"දෝෂයක් හේතුවෙන් මෙම SIM මැකිය නොහැක.\n\nඔබේ උපාංගය යළි අරඹා නැවත උත්සාහ කරන්න."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"උපාංගයට සම්බන්ධ වන්න"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> යෙදුමට ඔබේ උපාංගයට සම්බන්ධ වීමට තාවකාලික Wi‑Fi ජාලයක් භාවිත කිරීමට අවශ්‍යය"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"උපාංග කිසිවක් හමු නොවිය. උපාංග සක්‍රීය කර තිබෙන අතර සම්බන්ධ කිරීමට ලද හැකි බව තහවුරු කර ගන්න."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"හදිසි ඇමතූම්"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Wi‑Fi ඇමතුම ඔස්සේ හදිසි ඇමතුම්වලට ඔබේ වාහකයා සහය නොදක්වයි.\nඋපාංගය හදිසි ඇමතුමක් කිරීමට ස්වයංක්‍රීයව සෙලියුලර් ජාලයකට මාරු වෙයි.\nහදිසි ඇමතුම් හැකි වන්නේ සෙලියුලර් ආවරණය සහිත ප්‍රදේශවල පමණයි."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"තත්ත්‍වය වැඩිදියුණු කිරීමට ඇමතුම් සඳහා Wi‑Fi භාවිත කරන්න"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"හරස් SIM ඇමතුම"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"මෙම SIM එක හරහා තවත් SIM ඇමතුම් සහ කෙටි පණිවුඩ ඉඩ දෙන්න."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"හරස් SIM ඇමතුම"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"එන MMS පණිවුඩය"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS පණිවුඩය යැවිය නොහැක"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"ජංගම දත්ත අක්‍රියව තිබෙන විට <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> මත MMS පණිවුඩයට අවසර දීමට තට්ටු කරන්න"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"සැකසීම්වලට තිර උඩැතිරි ඉඩ දෙන්න"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"වෙනත් යෙදුම් ඉහළින් සංදර්ශනය කළ හැකි යෙදුම්වලට සැකසීම් තිර වසාලීමට ඉඩ දෙන්න"</string>
     <string name="media_controls_title" msgid="403271085636252597">"මාධ්‍ය"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"මාධ්‍ය සැසිය අවසන් කර ඇති විට වාදකය සඟවන්න"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"විදැහූ ඉක්මන් සැකසීම් පුවරුවෙන් සැසියක් නැවත පටන් ගැනීමට වාදකය ඔබට ඉඩ දෙයි."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"ඉක්මන් සැකසීම් තුළ මාධ්‍ය වාදකය"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"පහසුවෙන් පසුධාවනය ආරම්භ කිරීම සඳහා දිගු කාලයක් සඳහා මාධ්‍ය වාදකය පෙන්වන්න"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"වාදකය සඟවන්න"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"වාදකය පෙන්වන්න"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ලබා ගත හැකි වාදක නැත"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"ඉඩ දුන් යෙදුම්"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"මාධ්‍ය"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"බ්ලූටූත් ක්‍රියාත්මක වනු ඇත"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ක්‍රියාත්මකයි"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"ක්‍රියාවිරහිතයි"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"අන්තර්ජාලය"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"ගුවන් යානා ආරක්ෂිත ජාල"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ගුවන් යානා ආරක්ෂිත ජාල සොයන්න සහ සම්බන්ධ වන්න"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ගුවන් යානා, ගුවන් යානා ආරක්ෂිත"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"ඇමතුම් &amp; SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi ඇමතීම"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi‑Fi වැනි වාහක නොවන ජාල හරහා ඇමතුම් සිදු කරන්න සහ ලබන්න"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"සමහර Wi-Fi ජාල වැනි වාහක නොවන ජාල හරහා ඇමතුම් ලබා ගැනීමට සහ ලැබීමට Wi-Fi ඇමතීම ඔබට ඉඩ දෙයි."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"ඇමතුම්"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"වඩා කැමති"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"වඩා කැමති ඇමතුම්"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"වඩා කැමති SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ලබා ගත නොහැකිය"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM නැත"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"මනාප"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"පොදු ජාලයකට සම්බන්ධ වන්න"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ජාල සම්බන්ධතාව, අන්තර්ජාලය, රැහැන් රහිත, දත්ත, wifi, wi-fi, wi fi, සෙලියුලර්, ජංගම, සෙල් වාහක, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ගුවන් යානා-ආරක්ෂිත ජාල බලන්න"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ගුවන් යානා ප්‍රකාරය ක්‍රියාවිරහිත කරන්න"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"නිද්‍රා කාල ප්‍රකාරය ක්‍රියාත්මක නිසා ලබා ගත නොහැකිය"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"දැනුම්දීම්වල වැදගත්කම යළි සැකසීම සම්පූර්ණ කරන ලදි."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"යෙදුම්"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"විශ්වාසදායී නොවන උපාංගයකට ඔබගේ පණිවිඩ වෙත ප්‍රවේශ විමට අවශ්‍යයි. විස්තර සඳහා තට්ටු කරන්න."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"පණිවිඩවලට ප්‍රවේශ වීමට ඉඩ දෙන්නද?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"විශ්වාසදායී නොවන බ්ලූටූත් උපාංගයකට, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ඔබගේ පණිවිඩවලට ප්‍රවේශ වීමට අවශ්‍යයි.\n\nඔබ මීට පෙර [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] වෙත සබැඳී නැත."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"විශ්වාසදායී නොවන බ්ලූටූත් උපාංගයකට, ඔබගේ සම්බන්ධතාවලට සහ ඇමතුම් ලොගයට ප්‍රවේශ වීමට අවශ්‍යයි. විස්තර සඳහා තට්ටු කරන්න."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"සම්බන්ධතා සහ ඇමතුම් ලොගය වෙත ප්‍රවේශය ඉඩ දෙන්නද?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"විශ්වාසදායී නොවන බ්ලූටූත් උපාංගයකට, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ඔබගේ සම්බන්ධතාවලට සහ ඇමතුම් ලොගයට ප්‍රවේශ වීමට අවශ්‍යයි. පැමිණෙන සහ පිටතට යන ඇමතුම් පිළිබඳ දත්ත මෙයට ඇතුළත් වේ.\n\nඔබ මීට පෙර [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] වෙත සබැඳී නැත."</string>
 </resources>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 3c68c33..6349261 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Stredné"</item>
     <item msgid="6740026006576843477">"Dlhé"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Krátky"</item>
+    <item msgid="7397961711906421599">"Stredný"</item>
+    <item msgid="4079132024502041928">"Dlhý"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Predvolené"</item>
     <item msgid="4234707448428002595">"Bezpätkové"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globálne"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Iba TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globálne"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index bc4f86e..e1b6ea5 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -258,8 +258,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Dátum a čas"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Nastaviť dátum a čas"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Nastaviť dátum, čas, časové pásmo a formáty"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Používať čas zo siete"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Používať časové pásmo zo siete"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Nastaviť čas automaticky"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Nastaviť časové pásmo automaticky"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Používať miestny predvolený formát"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-hodinový formát"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Používať 24-hodinový formát"</string>
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Zobraziť inform. o profile na uzamknutej obrazovke"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Účty"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Poloha"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Používať polohu"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Používať polohu"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Vypnuté"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="few">Zapnuté – <xliff:g id="COUNT_1">%1$d</xliff:g> aplikácie majú prístup k polohe</item>
@@ -326,6 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zámka obrazovky, odomknutie tvárou"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zámka obrazovky, odtlačok prsta"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zámka obrazovky"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Bezpečné odomykanie telefónu tvárou a odtlačkom prsta"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Môžete sa aj prihlasovať v aplikáciách a potvrdzovať platby"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Nastaviť odomykanie pomocou:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Odomknutie tvárou"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Zjednodušte si odomykanie telefónu"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Odtlačok prsta"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Šetrite čas odomknutím telefónu vo vrecku"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Preskočiť"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Ďalej"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Pridaná tvár"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Nastaviť odomknutie tvárou"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Odomknutie tvárou"</string>
@@ -335,6 +344,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Overenie totožnosti pomocou tváre"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Začať"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ak je zjednodušené odomknutie tvárou vypnuté, niektoré kroky nastavenia nemusia v čítačke TalkBack fungovať správne."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Späť"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Pokračovať v nastavení"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Použiť nastavenie dostupnosti"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -379,8 +391,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Pri používaní odomknutia tvárou v aplikáciách požadovať potvrdenie"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Odstrániť údaje o tvári"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Nastaviť odomknutie tvárou"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Odomknutím tvárou môžete odomykať zariadenie, prihlasovať sa do aplikácií a potvrdzovať platby.\n\nDôležité upozornenie:\nTelefón môžete náhodne odomknúť pohľadom, aj keď ste to nechceli urobiť.\n\nMôže ho odomknúť aj niekto iný, keď telefón namieri na vašu tvár.\n\nMôže ho odomknúť aj osoba, ktorá sa na vás veľmi podobá, napríklad vaše dvojča."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Odomknutím tvárou môžete odomykať zariadenie, prihlasovať sa do aplikácií a potvrdzovať platby.\n\nDôležité upozornenie:\nTelefón môžete náhodne odomknúť pohľadom, aj keď ste to nechceli urobiť.\n\nMôže ho odomknúť aj niekto iný, keď telefón namieri na vašu tvár, a to dokonca aj vtedy, keď budete mať zatvorené oči.\n\nMôže ho odomknúť aj osoba, ktorá sa na vás veľmi podobá, napríklad vaše dvojča."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Odomykajte svoje zariadenie, prihlasujte sa do aplikácií a potvrdzujte platby pomocou odomknutia tvárou."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Dôležité upozornenie:\nTelefón môžete náhodne odomknúť pohľadom, aj keď ste to nechceli urobiť.\n\nMôže ho odomknúť aj niekto iný, keď telefón namieri na vašu tvár.\n\nMôže ho odomknúť aj osoba, ktorá sa na vás veľmi podobá, napríklad vaše jednovaječné dvojča."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Dôležité upozornenie:\nTelefón môžete náhodne odomknúť pohľadom, aj keď ste to nechceli urobiť.\n\nMôže ho odomknúť aj niekto iný, keď telefón namieri na vašu tvár, a to dokonca aj vtedy, keď budete mať zatvorené oči.\n\nMôže ho odomknúť aj osoba, ktorá sa na vás veľmi podobá, napríklad vaše jednovaječné dvojča."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Chcete odstrániť údaje o tvári?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Údaje o tvári používané na odomknutie tvárou budú natrvalo a bezpečne odstránené. Po ich odstránení budete na odomykanie telefónu, prihlasovanie do aplikácií a potvrdzovanie platieb potrebovať svoj kód PIN, vzor alebo heslo."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Odomykajte telefón tvárou"</string>
@@ -402,6 +415,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Odomykajte svoj telefón a schvaľujte nákupy pomocou odtlačku prsta.\n\nUpozornenie: Toto zariadenie nemôžete odomykať pomocou odtlačku prsta. Ďalšie informácie vám poskytne správca organizácie."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Odomykajte svoj telefón a schvaľujte nákupy pomocou odtlačku prsta.\n\nUpozornenie: Odtlačok prsta môže byť menej bezpečný ako silný vzor alebo kód PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Zrušiť"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nie, vďaka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Pokračovať"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskočiť"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Ďalej"</string>
@@ -439,6 +453,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Keď zabezpečíte svoj tablet pomocou možnosti zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie odomknutia tvárou. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Keď zabezpečíte svoje zariadenie pomocou možnosti zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie odomknutia tvárou. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Keď zabezpečíte svoj telefón pomocou možnosti zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Možnosť zámky obrazovky potrebujete aj na nastavenie odomknutia tvárou. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Keď zabezpečíte svoj tablet pomocou zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Zámka obrazovky sa vyžaduje aj pri nastavení biometrie. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Keď zabezpečíte svoje zariadenie pomocou zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Zámka obrazovky sa vyžaduje aj pri nastavení biometrie. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Keď zabezpečíte svoj telefón pomocou zámky obrazovky, v prípade krádeže alebo straty ho nebude môcť nikto použiť. Zámka obrazovky sa vyžaduje aj pri nastavení biometrie. Ak chcete prejsť späť, klepnite na Zrušiť."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Chcete preskočiť nastavenie kódu PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Chcete preskočiť nastavenie hesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Chcete preskočiť nastavenie vzoru?"</string>
@@ -511,8 +528,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto tabletu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto zariadenia bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Aktivujte funkcie ochrany zariadenia a zabráňte tak ostatným v používaní tohto telefónu bez vášho povolenia. Vyberte zámku obrazovky, ktorú chcete používať."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Zvoľte si záložný spôsob zámky obrazovky"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Zvoľte si záložný spôsob zámky obrazovky"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Zvoľte spôsob aktivovania dodatočnej zámky obrazovky"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Možnosti zámky obrazovky"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Možnosti zámky obrazovky"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zámka obrazovky"</string>
@@ -544,6 +560,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Odomknutie tvárou a heslo"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Pokračovať bez odomknutia tvárou"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefón môžete odomknúť pomocou tváre. Táto možnosť vyžaduje z bezpečnostných dôvodov dodatočnú zámku obrazovky."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometria a vzor"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometria a PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometria a heslo"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Pokračovať bez biometrie"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefón môžete odomknúť pomocou biometrie. Táto možnosť vyžaduje z bezpečnostných dôvodov dodatočnú zámku obrazovky."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Zakázané správcom, pravidlom šifrovania alebo úložiskom poverení"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Žiadna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Potiahnutie"</string>
@@ -635,7 +656,6 @@
       <item quantity="one">Musí mať menej ako <xliff:g id="NUMBER_0">%d</xliff:g> číslicu</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Správca zariadenia neumožňuje používať nedávny kód PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Bežné kódy PIN zablokoval váš správca IT. Skúste iný PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Musí obsahovať iba platné znaky"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Musí obsahovať aspoň jedno písmeno"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Musí obsahovať aspoň jednu číslicu"</string>
@@ -683,7 +703,6 @@
       <item quantity="one">Musí obsahovať aspoň jeden znak, ktorý nie je číslica</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Správca zariadenia neumožňuje používať nedávne heslo"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Bežné heslá zablokoval váš správca IT. Skúste iné heslo."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Vzostupná, zostupná alebo opakovaná sekvencia čísiel nie je povolená"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potvrdiť"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Zrušiť"</string>
@@ -829,7 +848,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Zapnúť Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Používať Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Používať Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Nastavenia Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Umožňuje nastaviť a spravovať prístupové body bezdrôtovej siete"</string>
@@ -937,7 +956,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Ak sa chcete pripojiť k sieti <xliff:g id="SSID">%1$s</xliff:g>, vycentrujte QR kód nižšie"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Pripojte sa k sieti Wi‑Fi naskenovaním QR kódu"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Zdieľať Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Ak sa chcete pripojiť k sieti <xliff:g id="SSID">%1$s</xliff:g> a zdieľať heslo, naskenujte tento QR kód"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Ak sa chcete pripojiť k sieti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód iným zariadením"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Ak sa chcete pripojiť k sieti <xliff:g id="SSID">%1$s</xliff:g>, naskenujte tento QR kód"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Skúste to znova. Ak problém pretrváva, kontaktujte výrobcu zariadenia."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Vyskytol sa problém"</string>
@@ -963,8 +982,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Heslo siete Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Heslo hotspotu: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automaticky pripájať"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Povoľte automatické pripájanie telefónu v blízkosti tejto siete"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Povoľte automatické pripájanie tabletu v blízkosti tejto siete"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Povoľte pripojenie k tejto sieti, keď je v dosahu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Pridať zariadenie"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Pridajte zariadenie do tejto siete pomocou QR kódu"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kód nie je platný formát"</string>
@@ -976,7 +994,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Použiť certifikáty systému"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Neposkytovať"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Neoverovať"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nebol určený žiadny certifikát. Vaše pripojenie nebude súkromné."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Názov siete je príliš dlhý."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Je potrebné zadať doménu."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Vyžaduje sa certifikát."</string>
@@ -1003,6 +1020,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Pripojiť"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Pripojenie Wi‑Fi je zapnuté"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Pripojené k sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Pripája sa k sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Pripája sa…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Nepodarilo sa pripojiť k sieti"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Sieť nie je v dosahu"</string>
@@ -1036,6 +1054,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresa MAC zariadenia"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Randomizovaná adresa MAC"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Randomizovaná adresa MAC (naposledy použitá)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adresa IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Podrobnosti siete"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podsiete"</string>
@@ -1043,8 +1062,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Adresy IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Uložené siete"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Odbery"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Ostatné siete"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Nastavenia adresy IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Rozšírené nastavenia Wi‑Fi nie sú pre tohto používateľa dostupné"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Uložiť"</string>
@@ -1053,8 +1071,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Zadajte platnú adresu brány."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Zadajte platnú adresu DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Zadajte dĺžku sieťovej predpony v rozsahu 0 až 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"Server DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"Server DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"1. systém DNS (pokiaľ nie je prepísaný súkromným)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"2. systém DNS (pokiaľ nie je prepísaný súkromným)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Brána"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Dĺžka sieťovej predpony"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1080,7 +1098,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikácia zdieľa obsah. Ak chcete zdieľať internetové pripojenie, vypnite hotspot a potom ho zapnite."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nie je nastavené žiadne heslo"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Názov hotspotu"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Zapína sa hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Zapína sa hotspot <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Iné zariadenia sa môžu pripojiť k hotspotu <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Heslo hotspotu"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Pásmo prístup. bodu"</string>
@@ -1230,7 +1248,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Plynulý obraz"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Automaticky zvyšuje frekvenciu obnovenia zo 60 na 90 Hz pre určitý obsah. Zvýši sa spotreba batérie."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Plynulý obraz"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Vynútiť frekvenciu obnovenia 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Najvyššia frekvencia obnovenia zlepšujúca dotykovú odozvu a kvalitu animácií. Zvýši sa spotreba batérie."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Vnímavá obrazovka"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Zapnuté, obrazovka sa nevypne, keď sa na ňu budete pozerať"</string>
@@ -1321,6 +1339,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Keď je obrazovka tmavá, zapne sa v prípade nových upozornení"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vždy zobrazovať čas a údaje"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Zvýšená spotreba batérie"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Tučný text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Veľkosť písma"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Zväčšite alebo zmenšite text"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Zámka SIM karty"</string>
@@ -1371,7 +1390,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Verzia systému Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Aktualizácia zabezpečenia Androidu"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model a hardvér"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Hardvérová verzia"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID zariadenia"</string>
@@ -1460,8 +1478,8 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="3887768438615563697">"Ak odpojíte SD kartu, niektoré používané aplikácie môžu byť zastavené a nebudú k dispozícii, kým SD kartu znova nepripojíte."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="2205587942165199845"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="2205587942165199845"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"Úložisko USB sa nepodarilo odpojiť. Skúste to znova neskôr."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"SD kartu sa nepodarilo odpojiť. Skúste to znova neskôr."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="7876201891724279436">"Úložisko USB sa nepodarilo odpojiť. Skúste to neskôr."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="2185659901137961711">"SD kartu sa nepodarilo odpojiť. Skúste to neskôr."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="5932607205977999175">"Ukladací priestor USB bude odpojený."</string>
     <string name="unmount_inform_text" product="default" msgid="716578785262713312">"SD karta bude odpojená."</string>
     <string name="sd_ejecting_title" msgid="1641122369013595273">"Odpájanie"</string>
@@ -1620,7 +1638,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Odstrániť názov prístupového bodu (APN)"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nový prístupový bod"</string>
     <string name="menu_save" msgid="6611465355127483100">"Uložiť"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Zahodiť"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Zrušiť"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Pole Meno nemôže byť prázdne."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Názov prístupového bodu (APN) nemôže byť prázdny."</string>
@@ -1635,8 +1653,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Aplikácie sa dajú resetovať"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Resetovať Wi‑Fi, dáta a Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Touto akciou obnovíte nastavenia všetkých sietí vrátane\n\n"<li>"Wi‑Fi"</li>\n<li>"mobilnej siete"</li>\n<li>"siete Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Vymazať"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Vymazať stiahnuté SIM karty"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Ak chcete stiahnuť náhradné SIM karty, kontaktujte operátora. Nezrušíte tým žiadne tarify mobilných služieb."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Nezrušíte tým žiadne tarify mobilných služieb. Ak si chcete stiahnuť náhradné SIM karty, kontaktujte operátora."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Resetovať nastavenia"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Chcete resetovať všetky nastavenia sietí? Túto akciu nie je možné vrátiť späť."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Chcete resetovať všetky nastavenia sietí a vymazať stiahnuté SIM karty? Túto akciu nie je možné vrátiť späť."</string>
@@ -1646,31 +1665,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Sieťové nastavenia boli obnovené"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM karty sa nedajú vymazať"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Stiahnuté SIM karty sa nedajú vymazať z dôvodu chyby.\n\nReštartujte zariadenie a skúste to znova."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Vymazať dáta (obnova výr. nastavení)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Vymazať dáta (obn. výr. nast.)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Týmto vymažete všetky dáta z "<b>"interného úložiska"</b>" tabletu, ako napríklad:\n\n"<li>"Účet Google"</li>\n<li>"Dáta aj nastavenia systému a aplikácií"</li>\n<li>"Stiahnuté aplikácie"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Táto operácia vymaže všetky dáta v "<b>"internom úložisku"</b>" telefónu:\n\n"<li>"Účet Google"</li>\n<li>"Dáta aj nastavenia systému a aplikácií"</li>\n<li>"Stiahnuté aplikácie"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Aktuálne ste prihlásený/-á do nasledujúcich účtov:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Na tomto zariadení sú prítomní ďalší používatelia.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Hudba"</li>\n<li>"Fotografie"</li>\n<li>"Iné používateľské údaje"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM karty"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Nezruší sa tým vaša tarifa mobilných služieb."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské dáta, je treba vymazať "<b>"úložisko USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie používateľské dáta, je treba vymazať "<b>"SD kartu"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Vymazať dáta (obn. výr. nast.)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Vymazať dáta (obn. výr. nast.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Týmto vymažete všetky dáta v "<b>"internom úložisku"</b>" tabletu:\n\n"<li>"účet Google;"</li>\n<li>"dáta aj nastavenia systému a aplikácií;"</li>\n<li>"stiahnuté aplikácie."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Týmto vymažete všetky dáta v "<b>"internom úložisku"</b>" telefónu:\n\n"<li>"účet Google;"</li>\n<li>"dáta aj nastavenia systému a aplikácií;"</li>\n<li>"stiahnuté aplikácie."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Momentálne ste prihlásený/-á do nasledujúcich účtov:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"V tomto zariadení sa nachádzajú ďalší používatelia.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Hudba"</li>\n<li>"Fotky"</li>\n<li>"Iné údaje používateľa"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM karty"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Nezruší sa tým vaša tarifa mobilných služieb."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie údaje používateľa, je treba vymazať "<b>"úložisko USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Ak chcete vymazať hudbu, obrázky a ďalšie údaje používateľa, je treba vymazať "<b>"SD kartu"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Vymazať ukladací priestor USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Vymazať SD kartu"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Vymazať všetky dáta v internom úložisku USB, napríklad hudbu a fotky"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Vymazať všetky dáta na SD karte, napríklad hudbu a fotky"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Vymazať všetky údaje"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Vymazať všetky údaje"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Všetky vaše osobné údaje a stiahnuté aplikácie budú odstránené. Túto akciu nie je možné vrátiť späť."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Všetky vaše osobné údaje vrátane stiahnutých aplikácií a SIM kariet budú odstránené. Túto akciu nie je možné vrátiť späť."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Vymazať všetko"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Pokus o obnovenie sa neuskutočnil, pretože služba System Clear nie je k dispozícii."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vymazať všetky údaje?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Obnovenie výrobných nastavení nie je dostupné pre tohto používateľa"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Prebieha vymazávanie"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Čakajte..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Vymazať všetky dáta"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Vymazať všetky dáta"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Všetky vaše osobné údaje a stiahnuté aplikácie budú odstránené. Túto akciu nie je možné vrátiť späť."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Všetky vaše osobné údaje vrátane stiahnutých aplikácií a SIM kariet budú odstránené. Túto akciu nie je možné vrátiť späť."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Chcete vymazať všetky dáta?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Obnovenie výrobných nastavení nie je pre tohto používateľa k dispozícii"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Maže sa"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Čakajte…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Nastavenia hovorov"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Nastavenie hlasovej schránky, presmerovania hovorov, čakajúcich hovorov a identifikácie volajúceho"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Pripojenie cez USB"</string>
@@ -1718,7 +1735,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Maximálny počet zariadení na zdieľanie dátového pripojenia: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Ukončí sa zdieľané dát. pripojenie zariad. <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Pripojenie cez ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Zdieľať internetové pripojenie telefónu cez USB s ethernetom"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Zdieľať internetové pripojenie telefónu cez ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Hotspot a tethering umožňujú poskytovať internet iným zariadeniam prostredníctvom vášho mobilného dátového pripojenia. Aplikácie tiež môžu vytvárať hostpot na zdieľanie obsahu so zariadeniami v okolí."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Hotspot a tethering umožňujú poskytovať internet iným zariadeniam prostredníctvom vášho pripojenia Wi‑Fi alebo mobilného dátového pripojenia. Aplikácie tiež môžu vytvárať hostpot na zdieľanie obsahu so zariadeniami v okolí."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomocník"</string>
@@ -1762,6 +1779,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Vyhľadávanie zariadení Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Povoľte aplikáciám a službám kedykoľvek vyhľadávať zariadenia v okolí, a to aj vtedy, keď je rozhranie Bluetooth vypnuté. Môžete to využiť napríklad na zlepšenie funkcií a služieb podmienených polohou."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Služby určovania polohy pre prácu"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zisťovanie časového pásma podľa polohy"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zisťovanie časového pásma podľa polohy"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Umožňuje zisťovať aktuálne časové pásmo podľa polohy zariadenia. Presnosť zisťovania časového pásma môžu ovplyvniť iné nastavenia polohy, napríklad vyhľadávanie sietí Wi‑Fi"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Zapnuté"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Vypnuté"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatické zisťovanie časového pásma je deaktivované"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Zisťovanie časového pásma podľa polohy je deaktivované"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Zisťovanie časového pásma podľa polohy nie je podporované"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Zmeny zisťovania časového pásma podľa polohy nie sú povolené"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Poloha Wi‑Fi a mobilnej siete"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Povoliť apl. používať službu urč. polohy Google a rýchl. odhad. vašu polohu. Anonym. údaje o polohe sa budú odosielať spol. Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Poloha je určená podľa siete Wi‑Fi"</string>
@@ -1825,6 +1851,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Ak chcete použiť odomknutie tvárou, nastavte heslo"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Ak chcete použiť odomknutie tvárou, nastavte vzor"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Ak chcete použiť odomknutie tvárou, nastavte PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biometria vyžaduje nastavenie hesla"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biometria vyžaduje nastavenie vzoru"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biometria vyžaduje nastavenie kódu PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Zabudli ste heslo?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Zabudli ste vzor?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Zabudli ste PIN?"</string>
@@ -2165,13 +2194,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Nastavenia titulkov"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Zväčšenie"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Oblasť zväčšenia"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Aktivácia priblíženia"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Vyberte oblasti zväčšenia, ktoré chcete pri zväčšení obrazovky používať"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Celá obrazovka"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Časť obrazovky"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Celá obrazovka a časť obrazovky"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Zväčšiť celú obrazovku"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Zväčšiť časť obrazovky"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Chcete prepnúť na tlačidlo dostupnosti?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Zväčšovanie častí obrazovky trojitým klepnutím môže oneskoriť zadávanie textu a ďalšie akcie.\n\nChcete prepnúť na zväčšenie tlačidlom dostupnosti?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Prepnúť na tlačidlo dostupnosti"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Ponechať zväčšenie trojitým klepnutím"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nastavenia priblíženia"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Priblíženie trojitým klepnutím"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Priblíženie skratkou"</string>
@@ -2225,11 +2257,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Ukončiť hovor vypínačom"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Veľký kurzor myši"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Odstrániť animácie"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Zvuk mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Pri prehrávaní zvuku zlúčiť kanály"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Vyváženie zvuku"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vľavo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Vpravo"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Zvuk mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Pri prehrávaní zvuku skombinovať kanály"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Vyváženie zvuku"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Ľavé"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Pravé"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Predvolené"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekúnd"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekúnd"</string>
@@ -2259,11 +2291,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibrovanie pri upozornení"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibrovanie pri zvonení"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Odozva pri klepnutí"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Používať službu <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Otvoriť <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Použiť úpravu farieb"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Zobrazenie titulkov"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Iba pre podporovanú aplikáciu"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Použiť aplikáciu <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Otvoriť <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Používať úpravu farieb"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Zobrazenie titulkov"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Iba pre podporovanú aplikáciu"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Veľkosť a štýl titulkov"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Veľkosť textu: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Ďalšie možnosti"</string>
@@ -2295,6 +2327,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomália"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomália"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomália"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Odfarbenie"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Červená a zelená"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Červená a zelená"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modrá a žltá"</string>
@@ -2436,7 +2469,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Obmedzenie využívania na pozadí"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Povoliť aplikácii spúšťať sa na pozadí"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikácia nemá povolené spustenie na pozadí"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Využívanie na pozadí sa nedá obmedziť"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Používanie na pozadí sa nedá obmedziť"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Obmedziť aktivitu na pozadí?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ak obmedzíte aktivitu aplikácie na pozadí, nemusí fungovať správne"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Aplikácia nemá nastavenú optimalizáciu batérie, preto ju nemôžete obmedziť.\n\nAk ju chcete obmedziť, zapnite optimalizáciu."</string>
@@ -2485,6 +2518,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet bol používaný viac ako obvykle"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Zariadenie bolo používané viac ako obvykle"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Batéria sa môže vybiť skôr ako obvykle"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimalizácia na zaistenie dobrého stavu batérie"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batéria je dočasne obmedzená. Viac sa dozviete po klepnutí."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefón sa používa viac ako obvykle. Batéria sa možno vybije skôr, ako sa očakávalo.\n\nAplikácie s najväčšou spotrebou batérie:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablet sa používa viac ako obvykle. Batéria sa možno vybije skôr, ako sa očakávalo.\n\nAplikácie s najväčšou spotrebou batérie:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Zariadenie sa používa viac ako obvykle. Batéria sa možno vybije skôr, ako sa očakávalo.\n\nAplikácie s najväčšou spotrebou batérie:"</string>
@@ -2554,6 +2589,8 @@
       <item quantity="one">%1$d obmedzená aplikácia</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Pri čítaní meradla batérie sa vyskytol problém"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Pri čítaní meradla batérie sa vyskytol problém. "<annotation id="url">"Viac sa dozviete"</annotation>" po klepnutí."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Zastaviť aplikáciu?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Telefón nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> ho udržuje prebudený.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikáciu zastavíte.\n\nAk sa to zopakuje, zrejme budete musieť aplikáciu odinštalovať, aby ste zlepšili výkonnosť batérie."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Tablet nemôže normálne spravovať batériu, pretože aplikácia <xliff:g id="APP">%1$s</xliff:g> ho udržuje prebudený.\n\nTento problém môžete skúsiť vyriešiť tak, že aplikáciu zastavíte.\n\nAk sa to zopakuje, zrejme budete musieť aplikáciu odinštalovať, aby ste zlepšili výkonnosť batérie."</string>
@@ -2667,9 +2704,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Nastavenie plánu"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Predĺženie výdrže batérie"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Vypnúť pri nabití"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Šetrič batérie sa vypne, keď bude telefón nabitý na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Šetrič batérie sa vypne, keď bude tablet nabitý na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Šetrič batérie sa vypne, keď bude zariadenie nabité na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Šetrič batérie sa vypne, keď sa telefón nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Šetrič batérie sa vypne, keď sa tablet nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Šetrič batérie sa vypne, keď sa zariadenie nabije nad <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Zapnúť"</string>
@@ -2734,6 +2771,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Resetovať"</string>
     <string name="tts_play" msgid="2945513377250757221">"Prehrať"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptácia pripojenia"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Predĺži výdrž batérie a zvýši výkonnosť zariadenia automatickým spravovaním pripojení k sieti"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Úložisko poverení"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Inštalovať certifikát"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Inštalovať certifikáty z úložiska"</string>
@@ -2745,9 +2784,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Poverenia používateľa"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Zobraziť a zmeniť uložené poverenia"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Rozšírené"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Typ úložiska"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardvérové"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Iba softvérové"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Poverenia nie sú pre tohto používateľa k dispozícii"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nainštalované pre sieť VPN a aplikácie"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Nainštalované pre sieť Wi‑Fi"</string>
@@ -2763,6 +2799,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Neinštalovať"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Inštalovať aj tak"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certifikát nie je nainštalovaný"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Chcete aplikácii <xliff:g id="APP_NAME">%s</xliff:g> povoliť inštalovať certifikáty v tomto zariadení?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Tieto certifikáty vás identifikujú aplikáciám a webovým adresám uvedeným nižšie"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Nepovoliť"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Povoliť"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Zobraziť viac"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Aplik. na správu certifikátov"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Žiadne"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certifikáty nainštalované touto aplikáciou vás identifikujú pre aplikácie a webové adresy uvedené nižšie"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Odstrániť"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Signál núdzového vytáčania"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Nastaviť správanie pri tiesňovom volaní"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Zálohovanie"</string>
@@ -3027,7 +3072,7 @@
     <string name="vpn_lockdown_summary" msgid="4700625960550559029">"Vyberte profil VPN, ku ktorému chcete mať vždy pripojenie. Sieťová premávka bude povolená len v prípade pripojenia k tejto sieti VPN."</string>
     <string name="vpn_lockdown_none" msgid="455915403560910517">"Žiadna"</string>
     <string name="vpn_lockdown_config_error" msgid="1992071316416371316">"Vždy zapnutá sieť VPN vyžaduje adresu IP pre server aj DNS."</string>
-    <string name="vpn_no_network" msgid="7187593680049843763">"Nie je k dispozícii žiadne sieťové pripojenie. Skúste to znova neskôr."</string>
+    <string name="vpn_no_network" msgid="7187593680049843763">"Nie je k dispozícii žiadne sieťové pripojenie. Skúste to neskôr."</string>
     <string name="vpn_disconnected" msgid="7694522069957717501">"Odpojiť od siete VPN"</string>
     <string name="vpn_disconnected_summary" msgid="721699709491697712">"Žiadne"</string>
     <string name="vpn_missing_cert" msgid="5397309964971068272">"Chýba certifikát. Skúste upraviť profil."</string>
@@ -3096,7 +3141,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Pracovný profil (nie je nastavený)"</string>
     <string name="user_admin" msgid="4024553191395768119">"Správca"</string>
     <string name="user_you" msgid="3070562015202859996">"Vy (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Prezývka"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Môžete pridať až <xliff:g id="USER_COUNT">%1$d</xliff:g> používateľov"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Používateľov môže spravovať iba vlastník tabletu."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Používateľov môže spravovať iba vlastník telefónu."</string>
@@ -3146,7 +3190,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Platenie pri termináli"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Nastavte si platobnú aplikáciu. Potom iba priložte zadnú časť vášho telefónu k akémukoľvek terminálu so symbolom pre bezkontaktné platby."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Dobre"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Ďalšie…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Viac…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Nastavenie predvolenej platobnej aplikácie"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Aktualizácia predvolenej platobnej aplikácie"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Pri bezkontaktnom termináli zaplaťte pomocou aplikácie <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3216,9 +3260,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Späť"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Ďalej"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Dokončiť"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Odfotiť"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Vybrať obrázok"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Vybrať fotku"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM karty"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM karty"</string>
@@ -3230,7 +3271,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Vždy používať pre hovory"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Vyberte SIM kartu pre údaje"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Vybrať SIM kartu pre SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Prepínajú sa dátové SIM karty, môže to chvíľu trvať..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Prepínajú sa dátové SIM karty, môže to chvíľu trvať…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Volať pomocou služby"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Výber SIM karty"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM karta <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3416,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"postup, plán, šetrič batérie, šetrič energie, batéria, automaticky, percento"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, rozšírené hovory, volanie cez 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"pridať jazyk, pridať určitý jazyk"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"veľkosť textu"</string>
     <string name="default_sound" msgid="6604374495015245195">"Predvolený zvuk"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Hlasitosť zvonenia a upozornení je na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Hlasitosť, vibrovanie, režim bez vyrušení"</string>
@@ -3414,13 +3456,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Zvuky pri spustení"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Živý prepis"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Automatické titulkovanie médií"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Žiadne"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="few">Boli nastavené <xliff:g id="ON_COUNT">%d</xliff:g> plány</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> schedules set</item>
-      <item quantity="other">Bolo nastavených <xliff:g id="ON_COUNT">%d</xliff:g> plánov</item>
-      <item quantity="one">Bol nastavený 1 plán</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Žiadne}=1{Bol nastavený 1 plán}few{Boli nastavené # plány}many{# schedules set}other{Bolo nastavených # plánov}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Režim bez vyrušení"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Prijímajte upozornenia iba od dôležitých ľudí a z dôležitých aplikácií"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Obmedzenie vyrušení"</string>
@@ -3488,24 +3524,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Iba prioritné"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Zapnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Vypnuté / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Vypnuté"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Zapnuté"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Vždy sa opýtať"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dokým funkciu nevypnete"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> hodiny</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> hodiny</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> hodín</item>
-      <item quantity="one">1 hodina</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> plány sa môžu automaticky zapnúť</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> schedules can turn on automatically</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> plánov sa môže automaticky zapnúť</item>
-      <item quantity="one">1 plán sa môže automaticky zapnúť</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 hodina}few{# hodiny}many{# hodiny}other{# hodín}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minúta}few{# minúty}many{# minúty}other{# minút}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Vypnuté}=1{Vypnuté / 1 plán sa môže automaticky zapnúť}few{Vypnuté / # plány sa môžu automaticky zapnúť}many{Off / # schedules can turn on automatically}other{Vypnuté / # plánov sa môže automaticky zapnúť}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Čo môže prerušiť režim bez vyrušení"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Ľudia"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikácie"</string>
@@ -3551,6 +3575,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Automaticky nastaviť upozornenia s nižšou prioritou ako nenápadné"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Pozícia prispôsobivých upozornení"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Automaticky zoradiť upozornenia podľa relevancie"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Spätná väzba k prispôsobivým upozorneniam"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Uveďte úpravy upozornení a zobrazujte možnosť poskytnúť spätnú väzbu k systému"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Resetovanie dôležitosti upozornenia"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Resetovanie nastavení dôležitosti zmenených používateľom a povolenie priorizácie v asistentovi upozornení"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Navrhované akcie a odpovede"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Automaticky zobrazovať navrhované akcie a odpovede"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Zobrazovanie nedávnych a stlmených upozornení"</string>
@@ -3650,8 +3678,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioritné konverzácie"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Zobrazovať hore v sekcii konverzácií ako plávajúce bubliny"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Zobrazovať hore v sekcii konverzácií"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Ďalšie konverzácie"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Konverzácie bez priority"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Konverzácie, ktoré ste zmenili"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Nedávne konverzácie"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Vymazať nedávne"</string>
+    <string name="clear" msgid="5092178335409471100">"Vymazať"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Zobrazovať prioritné konverzácie v bublinách"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioritné konverzácie sa zobrazujú v hornej časti panela upozornení. Môžete tiež nastaviť, aby sa zobrazovali v bubline a prerušili režim bez vyrušení."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Tu sa budú zobrazovať prioritné a zmenené konverzácie"</string>
@@ -3757,7 +3788,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Prístup k režimu bez vyrušení"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Povoliť režim bez vyrušení"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Prístup k režimu bez vyrušení si nevyžiadali žiadne nainštalované aplikácie"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Načítavajú sa aplikácie..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Načítavajú sa aplikácie…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Upozornenia z tejto aplikácie sú v zariadení na vašu žiadosť blokované Androidom"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Táto kategória upozornení je v zariadení na vašu žiadosť blokovaná Androidom"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Táto skupina upozornení je v zariadení na vašu žiadosť blokovaná Androidom"</string>
@@ -3855,13 +3886,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Všetky konverzácie"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioritné konverzácie"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Žiadne"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzácie</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> conversations</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> konverzácií</item>
-      <item quantity="one">1 konverzácia</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Žiadne"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Žiadne}=1{1 konverzácia}few{# konverzácie}many{# conversations}other{# konverzácií}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kto môže vyrušiť"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Hovory"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Hovory"</string>
@@ -3870,13 +3895,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Skontrolujte, či je v zariadení zapnuté zvonenie, aby povolené hovory vyzváňali"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"V rámci plánu <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> sú blokované prichádzajúce hovory. Môžete upraviť nastavenia a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontakty s hviezdičkou"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="few"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ďalší</item>
-      <item quantity="many"><xliff:g id="NUM_PEOPLE">%d</xliff:g> others</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> ďalších</item>
-      <item quantity="one">1 ďalší</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Žiadne"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Žiadne}=1{{contact_1}}=2{{contact_1} a {contact_2}}=3{{contact_1}, {contact_2} a {contact_3}}few{{contact_1}, {contact_2} a # ďalšie kontakty}many{{contact_1}, {contact_2}, and # others}other{{contact_1}, {contact_2} a # ďalších kontaktov}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Bez mena)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Správy"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"správy"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Správy"</string>
@@ -3885,13 +3905,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Prichádzajúce správy sú v rámci plánu <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g> blokované. Môžete upraviť nastavenia a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Dostanete všetky správy"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Dostanete všetky hovory"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Žiadne"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakty</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contacts</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontaktov</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Žiadne}=1{1 kontakt}few{# kontakty}many{# contacts}other{# kontaktov}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Ktokoľvek"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakty"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontakty s hviezdičkou"</string>
@@ -3929,26 +3943,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Všetky upozornenia"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Niektoré upozornenia"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Vybraní ľudia vás stále môžu kontaktovať, aj keď nepovoľujete aplikáciám vyrušovať"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="few"><xliff:g id="APP_NAMES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="many"><xliff:g id="APP_NAMES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="one">Aplikácia <xliff:g id="APP_NAME_0">%s</xliff:g> môže vyrušiť</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"ďalšie (<xliff:g id="NUMBER">%d</xliff:g>)"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Žiadne aplikácie nemôžu vyrušiť}=1{{app_1} môže vyrušiť}=2{{app_1} a {app_2} môžu vyrušiť}=3{{app_1}, {app_2} a {app_3} môžu vyrušiť}few{{app_1}, {app_2} a # ďalšie aplikácie môžu vyrušiť}many{{app_1}, {app_2}, and # more can interrupt}other{{app_1}, {app_2} a # ďalších aplikácií môže vyrušiť}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikácie"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Všetky upozornenia"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Niektoré upozornenia"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Upozornenia, ktoré môžu vyrušiť"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Povoliť všetky upozornenia"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="many"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> môžu vyrušiť</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> môže vyrušiť</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Žiadne položky nemôžu vyrušiť"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"ďalšie (<xliff:g id="NUMBER">%d</xliff:g>)"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Žiadne zvuky nemôžu vyrušiť}=1{{sound_category_1} môže vyrušiť}=2{{sound_category_1} a {sound_category_2} môžu vyrušiť}=3{{sound_category_1}, {sound_category_2} a {sound_category_3} môžu vyrušiť}few{{sound_category_1}, {sound_category_2} a # ďalšie zvuky môžu vyrušiť}many{{sound_category_1}, {sound_category_2}, and # more can interrupt}other{{sound_category_1}, {sound_category_2} a # ďalších zvukov môže vyrušiť}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Žiadne zvuky nemôžu vyrušiť"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nikto nemôže vyrušiť"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Niektorí ľudia môžu vyrušiť"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Všetci ľudia môžu vyrušiť"</string>
@@ -3998,8 +4000,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Zapnuté"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Vypnuté"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Pripnutie aplikácie"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Pripnutie aplikácie umožňuje ponechať aktuálnu aplikáciu zobrazenú, než ju odopnete. Pomocou tejto funkcie môžete napríklad dôveryhodnému priateľovi umožniť hrať konkrétnu hru. \n\nPripnutá aplikácia môže otvárať ďalšie aplikácie a sprístupniť osobné údaje. \n\nAk chcete pripnúť aplikáciu, postupujte takto: 	\n1.	Zapnite pripnutie aplikácie. 	\n2.	Otvorte Prehľad. 	\n3.	Klepnite na ikonu aplikácie v hornej časti obrazovky a potom na Pripnúť."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Pripnutie aplikácie umožňuje ponechať aktuálnu aplikáciu zobrazenú, než ju odopnete. Pomocou tejto funkcie môžete napríklad dôveryhodnému priateľovi umožniť hrať konkrétnu hru. \n\nPripnutá aplikácia môže otvárať ďalšie aplikácie a sprístupniť osobné údaje. \n\nAk chcete zariadenie s niekým zdieľať bezpečne, skúste namiesto toho použiť hosťa. \n\nAk chcete pripnúť aplikáciu, postupujte takto: 	\n1.	Zapnite pripnutie aplikácie. 	\n2.	Otvorte Prehľad. 	\n3.	Klepnite na ikonu aplikácie v hornej časti obrazovky a potom na Pripnúť."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Pripnutie aplikácie umožňuje ponechať aktuálnu aplikáciu zobrazenú, než ju odopnete. Pomocou tejto funkcie môžete napríklad dôveryhodnému priateľovi umožniť hrať konkrétnu hru."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Pripnutá aplikácia môže otvárať ďalšie aplikácie a sprístupniť osobné údaje. \n\nAk chcete pripnúť aplikáciu, postupujte takto: 	\n1.	Zapnite pripnutie aplikácie. 	\n2.	Otvorte Prehľad. 	\n3.	Klepnite na ikonu aplikácie v hornej časti obrazovky a potom na Pripnúť."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Pripnutá aplikácia môže otvárať ďalšie aplikácie a sprístupniť osobné údaje. \n\nAk chcete zariadenie s niekým zdieľať bezpečne, skúste namiesto toho použiť hosťa. \n\nAk chcete pripnúť aplikáciu, postupujte takto: 	\n1.	Zapnite pripnutie aplikácie. 	\n2.	Otvorte Prehľad. 	\n3.	Klepnite na ikonu aplikácie v hornej časti obrazovky a potom na Pripnúť."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Keď je aplikácia pripnutá: \n\n•		Môžu byť sprístupnené osobné údaje \n		(napríklad kontakty a obsah správ) \n•		Pripnutá aplikácia môže otvárať ďalšie aplikácie \n\nPripnutie aplikácie používajte iba s ľuďmi, ktorým dôverujete."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Pred uvoľnením žiadať bezpečnostný vzor"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Pred odopnutím požiadať o PIN"</string>
@@ -4021,6 +4024,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Okrem odomknutia pomocou odtlačku prsta môžete toto zariadenie ochrániť aj vyžadovaním kódu PIN pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať kód PIN na spustenie zariadenia?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Okrem odomknutia pomocou odtlačku prsta môžete svoje zariadenie ochrániť aj vyžadovaním bezpečnostného vzoru pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať vzor na spustenie zariadenia?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Okrem odomknutia pomocou odtlačku prsta môžete svoje zariadenie ochrániť aj vyžadovaním hesla pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať heslo na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Okrem odomknutia pomocou biometrie môžete toto zariadenie ochrániť aj vyžadovaním kódu PIN pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť údaje v stratených alebo ukradnutých zariadeniach. Vyžadovať kód PIN na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Okrem odomknutia pomocou biometrie môžete svoje zariadenie ochrániť aj vyžadovaním bezpečnostného vzoru pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť údaje v stratených alebo ukradnutých zariadeniach. Vyžadovať vzor na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Okrem odomknutia pomocou biometrie môžete svoje zariadenie ochrániť aj vyžadovaním hesla pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť údaje v stratených alebo ukradnutých zariadeniach. Vyžadovať heslo na spustenie zariadenia?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Áno"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nie"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Obmedzené"</string>
@@ -4212,7 +4218,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB ovláda"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Pripojené zariadenie"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Toto zariadenie"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Prepína sa…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Prepína sa…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nepodarilo sa prepnúť"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Nabíjanie zariadenia"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Nabíja sa pripojené zariadenie"</string>
@@ -4414,6 +4420,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Spotreba mobilných dát"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Spotreba dát aplikáciami"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Spotreba dát cez Wi‑Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Spotreba dát mimo operátora"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Spotreba dát prostredníctvom ethernetu"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi‑Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4434,6 +4441,7 @@
       <item quantity="one">1 obmedzenie</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Účtovanie dát operátorom sa môže líšiť od účtovania na zariadení"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Vylučuje dáta spotrebované sieťami operátora"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Spotreba <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nastaviť dátové upozornenie"</string>
     <string name="data_warning" msgid="2925054658166062884">"Dátové upozornenie"</string>
@@ -4473,7 +4481,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Zobraziť podrobnosti"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Šetrič dát"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neobmedzené dáta"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Dátové prenosy na pozadí sú vypnuté"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Dáta na pozadí sú vypnuté"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Zapnutý"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Vypnutý"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Používať šetrič dát"</string>
@@ -4496,7 +4504,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Pri uzamknutom zariadení zakázať v upozorneniach písať odpovede či iný text"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Predvolená kontrola pravopisu"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Výber kontroly pravopisu"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Používať kontrolu pravopisu"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Používať kontrolu pravopisu"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Nie je vybraté"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(žiadny)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4602,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Správca úložiska odstraňuje zálohované fotky a videá z vášho zariadenia, čím pomáha uvoľniť miesto v úložisku."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Odstrániť fotky a videá"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Správca úložiska"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Používať Správcu úložiska"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Používať správcu priestoru"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automaticky"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ručne"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Uvoľniť miesto"</string>
@@ -4632,6 +4640,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Kontrola telefónu dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tablet skontrolujete dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Zariadenie skontrolujete dvojitým klepnutím"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Upozornenia prejd. prstom"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Upozornenia zobrazíte potiahnutím pri dolnom okraji obrazovky smerom nadol"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Režim jednej ruky"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Použiť režim jednej ruky"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Ukončiť pri prepínaní aplikácií"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Časový limit"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekundy"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekúnd"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekúnd"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"dosiahnuteľnosť"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ak chcete zistiť čas, skontrolovať upozornenia a získať ďalšie informácie, klepnite dvakrát na obrazovku."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Kontrola telefónu zdvihnutím"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tablet skontrolujete tak, že ho zodvihnete"</string>
@@ -4644,6 +4662,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Klepnutím skontrolujete tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Klepnutím skontrolujete zariadenie"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ak chcete zistiť čas, skontrolovať upozornenia a získať ďalšie informácie, klepnite na obrazovku."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Tiesňové SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Používať tiesňové SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Spravované aplikáciou <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Akcie nižšie spustíte tak, že aspoň päťkrát rýchlo stlačíte vypínač"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Prehrať upozornenie na odpočítavanie"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Pred zavolaním pomoci prehrať hlasitý zvuk"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Volanie o pomoc"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Číslo, na ktoré môžete volať o pomoc"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Zmeníte klepnutím."</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Keď zadáte linku, ktorá nie je tiesňová:\n • vaše zariadenie musí byť odomknuté, aby ste mohli použiť tiesňovú funkciu SOS;\n • váš hovor nemusí byť prijatý."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Upozornenia odtlačkom prsta"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Potiahnutie prstom"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Upozornenia zobrazíte potiahnutím nadol po senzore odtlačkov prstov na zadnej strane telefónu."</string>
@@ -4783,6 +4811,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Max. viditeľných množín dát"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Resetovať na predvolené hodnoty"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Možnosti automatického dopĺňania pre vývojárov boli obnovené"</string>
+    <string name="location_category" msgid="3496759112306219062">"Miesto"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indikátor umiestnenia stavového riadka"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Zobrazí všetky miesta vrátane siete a pripojenia"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Vynútiť úplné meranie GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Sledovať všetky konštelácie a frekvencie GNSS bez cyklického vypínania a zapínania"</string>
     <string name="device_theme" msgid="5027604586494772471">"Motív zariadenia"</string>
     <string name="default_theme" msgid="4815428567082263639">"Predvolený"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Názov siete"</string>
@@ -4799,8 +4832,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pozastavte upozornenia, aby ste sa mohli sústrediť"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funkcia nie je k dispozícii"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Táto funkcia bola vypnutá, pretože spomaľuje telefón"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Vynútiť úplné meranie GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Sledovať všetky konštelácie a frekvencie GNSS bez cyklického vypínania a zapínania"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Vždy zobrazovať dialógové okno zlyhania"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Zobraziť dialógové okno pri každom zlyhaní aplikácie"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Vybrať aplikáciu podporujúcu ANGLE"</string>
@@ -4812,7 +4843,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Povoliť pre všetky aplikácie"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Vybrať grafický ovládač"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Predvolené"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Ovládač hry"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Ovládač hry"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ovládač vývojára"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafický ovládač systému"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4868,7 +4899,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Zapnuté (stlmené)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Vypnuté"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Podrobnosti siete"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Názov zariadenia je viditeľný pre aplikácie v telefóne. Môže sa zobrazovať aj ostatným používateľom po pripojení k zariadeniu Bluetooth alebo nastavení hotspotu Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Názov zariadenia uvidia aplikácie v telefóne. Keď sa pripojíte k zariadeniam s rozhraním Bluetooth alebo sieti Wi‑Fi, prípadne ak nastavíte hotspot Wi‑Fi, môžu ho uvidieť aj ostatní ľudia."</string>
     <string name="devices_title" msgid="649715719278562515">"Zariadenia"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Všetky nastavenia"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Návrhy"</string>
@@ -4881,6 +4912,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Nepodarilo sa nájsť siete. Skúste to znova."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(zakázané)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Žiadna SIM karta"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Žiadna SIM karta"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Žiadne"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Na pripojenie sa vyžaduje SIM karta"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Na pripojenie sa vyžaduje SIM karta <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Preferovaný režim siete: preferované WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Preferovaný režim siete: iba GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Preferovaný režim siete: iba WCDMA"</string>
@@ -4926,7 +4962,7 @@
     <string name="load_networks_progress" msgid="4717874401621250401">"Hľadá sa…"</string>
     <string name="register_on_network" msgid="2169662800750709709">"Prebieha registrácia v sieti <xliff:g id="NETWORK">%s</xliff:g>…"</string>
     <string name="not_allowed" msgid="5756935665192962915">"Vaša SIM karta nepovoľuje pripojenie k tejto sieti."</string>
-    <string name="connect_later" msgid="2330538069949281352">"V tejto chvíli sa nedá pripojiť k sieti. Skúste to znova neskôr."</string>
+    <string name="connect_later" msgid="2330538069949281352">"V tejto chvíli sa nedá pripojiť k sieti. Skúste to neskôr."</string>
     <string name="registration_done" msgid="1750434215698850123">"Prihlásenie k sieti prebehlo úspešne."</string>
     <string name="select_automatically" msgid="2419752566747259155">"Vybrať sieť automaticky"</string>
     <string name="carrier_settings_title" msgid="6959295328730560529">"Nastavenia operátora"</string>
@@ -4934,6 +4970,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobilné dáta"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Prístup k dátam pomocou mobilnej siete"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefón sa automaticky prepne na tohto operátora, keď bude v dosahu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nie je k dispozícii žiadna SIM karta"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Predvolená služba pre hovory"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Predvolená služba pre SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vždy sa opýtať"</string>
@@ -4996,6 +5033,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nie je k dispozícii pri pripojení k operátorovi <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Zobraziť viac"</string>
     <string name="see_less" msgid="2642392725363552793">"Zobraziť menej"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Chcete zapnúť operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Chcete zapnúť SIM kartu?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Chcete prepnúť na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Chcete používať SIM kartu?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"V jednej chvíli môže byť aktívna iba jedna stiahnutá SIM karta.\n\nPrepnutím na operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nezrušíte službu operátora <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"V jednej chvíli môže byť aktívna iba jedna stiahnutá SIM karta.\n\nPrepnutím na operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nezrušíte službu operátora <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"V jednej chvíli môže byť aktívna iba jedna stiahnutá SIM karta.\n\nPoužitím inej možnosti nezrušíte službu operátora <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Prepnúť na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Pripája sa k sieti…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Prepína sa na operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operátora sa nepodarilo prepnúť"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operátora sa nepodarilo prepnúť, pretože sa vyskytla chyba."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Chcete vypnúť operátora <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Chcete vypnúť SIM kartu?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Vypína sa SIM karta<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operátora sa nepodarilo deaktivovať"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Vyskytol sa problém a operátora sa nepodarilo deaktivovať."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Chcete používať dve SIM karty?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"V tomto zariadení môžu byť naraz aktívne dve SIM karty. Ak chcete ďalej používať len jednu, klepnite na Nie, ďakujem."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Chcete reštartovať zariadenie?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Začnite reštartovaním zariadenia. Potom môžete pridať ďalšiu SIM kartu."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Pokračovať"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Reštartovať"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nie, vďaka"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Prepnúť"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM kartu sa nepodarilo aktivovať"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Vyberte SIM kartu a znova ju vložte. Ak bude problém pretrvávať, reštartujte zariadenie."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Skúste SIM kartu znova zapnúť. Ak bude problém pretrvávať, reštartujte zariadenie."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivácia siete"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operátor <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktívny"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Klepnutím aktualizujete nastavenia SIM karty"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM karta"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Chcete vymazať túto stiahnutú SIM kartu?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Vymazaním tejto SIM karty odstránite službu operátora <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> z tohto zariadenia.\n\nSlužba operátora <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> sa nezruší."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Vymazať"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Odstraňuje sa SIM karta…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM karta sa nedá vymazať"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"SIM karta sa nedá vymazať, pretože došlo k chybe.\n\nReštartujte zariadenie a skúste to znova."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Pripojenie k zariadeniu"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> chce použiť dočasnú sieť Wi‑Fi na pripojenie k vášmu zariadeniu"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nenašli sa žiadne zariadenia. Skontrolujte, či sú zariadenia zapnuté a dostupné na pripojenie."</string>
@@ -5071,6 +5146,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Tiesňové volania"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Váš operátor nepodporuje tiesňové volania pomocou volania cez Wi‑Fi.\nZariadenie sa na tiesňové volanie automaticky prepne na mobilnú sieť.\nTiesňové volania sú možné iba v oblastiach s mobilným signálom."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Volajte cez Wi‑Fi a zlepšite tak kvalitu"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Volanie naprieč SIM kartami"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Povoliť hovory a správy z druhej SIM karty cez túto."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"volanie naprieč SIM kartami"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Prichádzajúca správa MMS"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Správu MMS sa nepodarilo odoslať"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Klepnutím povolíte správy MMS cez operátora <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> pri vypnutých mobilných dátach"</string>
@@ -5122,10 +5200,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Povolenie prekrývajúcich prvkov v Nastaveniach"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Povoľte aplikácie, ktoré sa môžu zobraziť cez iné aplikácie, aby mohli prekryť obrazovky Nastavení"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Médiá"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Skryť prehrávač po ukončení relácie média"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Prehrávač umožňuje pokračovať v relácii na rozbalenom paneli rýchlych nastavení."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Prehrávač médií v rýchlych nastaveniach"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Zobrazovať prehrávač médií dlhšie, aby bolo možné ľahko obnoviť prehrávanie"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Skryť prehrávač"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Zobraziť prehrávač"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"K dispozícii nie sú žiadne prehrávače"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Povolené aplikácie"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"médiá"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Zapne sa Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Zapnuté"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Vypnuté"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM karty"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Siete, ktoré je možné používať v lietadle"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Nájdite siete, ktoré je možné používať v lietadle, a pripojte sa k nim"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"lietadlo, možné používať v lietadle"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Hovory a SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Volanie cez Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Volajte a prijímajte hovory cez siete bez operátorov, ako je Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Volanie cez Wi‑Fi vám umožňuje volať a prijímať hovory cez siete bez operátora, ako sú niektoré siete Wi-Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Hovory"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferované"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"preferujú sa hovory"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"preferujú sa správy SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"nie je k dispozícii"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Žiadna SIM karta"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Predvoľby"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Pripájať k verejným sieťam"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"pripojenie k sieti, internet, bezdrôtové, dátové, wifi, wi-fi, wi fi, mobilné, mobilný operátor, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Zobraziť siete bezpečné v lietadle"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Vypnúť režim v lietadle"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nedostupné, pretože je zapnutý režim večierky"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Resetovanie dôležitosti upozornenia je dokončené."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikácie"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Nedôveryhodné zariadenie vyžaduje prístup k vašim správam. Klepnutím zobrazíte podrobnosti."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Chcete povoliť prístup k správam?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Nedôveryhodné zariadenie s rozhraním Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] vyžaduje prístup k vašim správam.\n\nK zariadeniu [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ste sa predtým nikdy nepripojili."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Nedôveryhodné zariadenie vyžaduje prístup k vašim kontaktom a zoznamu hovorov. Klepnutím zobrazíte podrobnosti."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Chcete povoliť prístup ku kontaktom a zoznamu hovorov?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Nedôveryhodné zariadenie s rozhraním Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] vyžaduje prístup k vašim kontaktom a zoznamu hovorov. Zahŕňa to údaje o prichádzajúcich a odchádzajúcich hovoroch.\n\nK zariadeniu [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ste sa predtým nikdy nepripojili."</string>
 </resources>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 635df4d..c3f018d 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Srednje"</item>
     <item msgid="6740026006576843477">"Dolgo"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kratko"</item>
+    <item msgid="7397961711906421599">"Srednje"</item>
+    <item msgid="4079132024502041928">"Dolgo"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Privzeto"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalno"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Samo TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalno"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index a5c4bbc..5433ff1 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -258,8 +258,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Datum in ura"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Nastavitev datuma in ure"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Nastavi datum, uro, časovni pas in oblike"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Uporabi čas omrežja"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Uporabi časovni pas omrežja"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Samodejna nastavitev ure"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Samodejna nastavitev časovnega pasu"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Uporabi privzete območne nastavitve"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-urna oblika"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Uporabljaj 24-urno obliko"</string>
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Pokaži podatke o profilu na zaklenjenem zaslonu"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Računi"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokacija"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Uporabi lokacijo"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Uporaba lokacije"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Izklopljeno"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Vklopljeno – dostop do lokacije ima <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacija</item>
@@ -326,6 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Zaklepanje zaslona, odklepanje z obrazom"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Zaklepanje zaslona, prstni odtis"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Zaklepanje zaslona"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Varno odklepanje telefona z obrazom in prstnim odtisom"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Lahko se tudi prijavite v aplikacije in potrjujete plačila"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Nastavitev odklepanja na ta način:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Odklepanje z obrazom"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Omogočite hitrejše odklepanje telefona"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Prstni odtis"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Prihranite čas z odklepanjem telefona v žepu"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Preskoči"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Naprej"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Obraz je dodan"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Nastavite odklepanje z obrazom"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Odklepanje z obrazom"</string>
@@ -335,6 +344,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Preverjanje pristnosti z obrazom"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Začni"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Če je odklepanje z obrazom za ljudi s posebnimi potrebami izklopljeno, nekateri koraki nastavitve morda ne bodo dobro delovali s funkcijo TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Nazaj"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Nadaljuj nastavitev"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Uporabi nastavitev dostopnosti"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -379,8 +391,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Pri odklepanju z obrazom v aplikacijah vedno zahtevaj potrditev"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Izbriši obraz"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Nastavite odklepanje z obrazom"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Odklepanje z obrazom omogoča, da odklenete napravo, se prijavite v aplikacije in potrdite plačila.\n\nUpoštevajte:\nČe pogledate proti telefonu, ga boste morda nenamerno odklenili.\n\nVaš telefon lahko odklene tudi nekdo drug, če ga podrži pred vašim obrazom.\n\nPrav tako lahko telefon odklene nekdo, ki vam je zelo podoben, na primer vaš enojajčni dvojček."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Odklepanje z obrazom omogoča, da odklenete napravo, se prijavite v aplikacije in potrdite plačila.\n\nUpoštevajte:\ntelefon se lahko nenamerno odklene, če ga pogledate.\n\nTelefon lahko odklene tudi nekdo drug, če ga podrži pred vašim obrazom – celo kadar imate oči zaprte.\n\nPrav tako lahko telefon odklene nekdo, ki vam je zelo podoben, na primer vaš enojajčni dvojček."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Odklepanje z obrazom uporabite za odklepanje naprave, prijavo v aplikacije in potrjevanje plačil."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Upoštevajte:\nČe pogledate proti telefonu, ga boste morda nenamerno odklenili.\n\nVaš telefon lahko odklene tudi nekdo drug, če ga podrži pred vašim obrazom.\n\nPrav tako lahko telefon odklene nekdo, ki vam je zelo podoben, na primer vaš enojajčni dvojček."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Upoštevajte:\nČe pogledate proti telefonu, ga boste morda nenamerno odklenili.\n\nTelefon lahko odklene tudi nekdo drug, če ga podrži pred vašim obrazom – celo kadar imate oči zaprte.\n\nPrav tako lahko telefon odklene nekdo, ki vam je zelo podoben, na primer vaš enojajčni dvojček."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Želite izbrisati podatke o obrazu?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Podatki o obrazu, ki se uporabljajo za odklepanje z obrazom, bodo trajno in varno izbrisani. Po odstranitvi boste za odklepanje telefona, prijavo v aplikacije in potrjevanje plačil potrebovali kodo PIN, vzorec ali geslo."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Za odklepanje telefona uporabite obraz"</string>
@@ -402,6 +415,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"S prstnim odtisom odklenite telefon ali odobrite nakupe.\n\nOpomba: prstnega odtisa ne morete uporabiti za odklepanje te naprave. Za več informacij se obrnite na skrbnika v organizaciji."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"S prstnim odtisom odklenite telefon ali odobrite nakupe.\n\nOpomba: Prstni odtis bo morda manj varen kot zapleten vzorec ali koda PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Prekliči"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ne, hvala"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Naprej"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Naprej"</string>
@@ -439,6 +453,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Če tablični računalnik zaščitite z možnostjo zaklepanja zaslona, ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev odklepanja z obrazom. Za vrnitev se dotaknite »Prekliči«."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Če napravo zaščitite z možnostjo zaklepanja zaslona, je ne bo mogel uporabljati nihče drug, če jo izgubite ali vam jo ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev odklepanja z obrazom. Za vrnitev se dotaknite »Prekliči«."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Če telefon zaščitite z zaklepanjem zaslona, ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Zaklepanje zaslona potrebujete tudi za nastavitev odklepanja z obrazom. Za vrnitev se dotaknite »Prekliči«."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Če tablični računalnik zaščitite z možnostjo zaklepanja zaslona, ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Možnost zaklepanja zaslona potrebujete tudi za nastavitev biometrike. Za vrnitev se dotaknite »Prekliči«."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Če napravo zaščitite z možnostjo zaklepanja zaslona, je ne bo mogel uporabljati nihče drug, če jo izgubite ali vam jo ukradejo. Možnost zaklepanja zaslona potrebujete tudi za nastavitev biometrike. Za vrnitev se dotaknite »Prekliči«."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Če telefon zaščitite z možnostjo zaklepanja zaslona, ga ne bo mogel uporabljati nihče drug, če ga izgubite ali vam ga ukradejo. Možnost zaklepanja zaslona potrebujete tudi za nastavitev biometrike. Za vrnitev se dotaknite »Prekliči«."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Ne želite nastaviti kode PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Ne želite nastaviti gesla?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Ne želite nastaviti vzorca?"</string>
@@ -511,8 +528,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega tabličnega računalnika brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Vklopite zaščitne funkcije naprave, da drugim preprečite njeno uporabo brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Vklopite zaščitne funkcije naprave, da drugim preprečite uporabo tega telefona brez vašega dovoljenja. Izberite zaklepanje zaslona, ki ga želite uporabljati."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Izberite nadomestni način zaklepanja zaslona"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Izberite nadomestni način zaklepanja zaslona"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Izberite nadomestni način zaklepanja zaslona"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Možnosti zaklepanja zaslona"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Možnosti zaklepanja zaslona"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Zaklepanje zaslona"</string>
@@ -544,6 +560,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Odklepanje z obrazom + geslo"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Nadaljevanje brez odklepanja z obrazom"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefon lahko odklenete z obrazom. Zaradi varnosti ta možnost zahteva uporabo nadomestnega načina zaklepanja zaslona."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrika + vzorec"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrika + koda PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrika + geslo"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Nadaljevanje brez biometrike"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefon lahko odklenete z biometričnimi podatki. Zaradi varnosti ta možnost zahteva uporabo nadomestnega načina zaklepanja zaslona."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Onemogočil skrbnik, pravilnik za šifriranje ali shramba poverilnic"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Brez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Vlečenje"</string>
@@ -635,7 +656,6 @@
       <item quantity="other">Vsebovati mora manj kot <xliff:g id="NUMBER_1">%d</xliff:g> števk</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Skrbnik naprave ne dovoli uporabe nedavne kode PIN."</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Skrbnik za IT je blokiral pogoste kode PIN. Poskusite z drugo kodo PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Ne sme vsebovati neveljavnih znakov."</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Vsebovati mora vsaj eno črko."</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Vsebovati mora vsaj eno števko."</string>
@@ -683,7 +703,6 @@
       <item quantity="other">Vsebovati mora vsaj <xliff:g id="COUNT">%d</xliff:g> neštevilskih znakov</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Skrbnik naprave ne dovoli uporabe nedavnega gesla."</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Skrbnik za IT je blokiral pogosta gesla. Poskusite z drugim geslom."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Naraščajoč, padajoč ali ponavljajoč se niz števk je prepovedan."</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Potrdi"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Prekliči"</string>
@@ -829,7 +848,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Vklopi Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Uporabi Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Uporabi Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Nastavitve za Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Nastavi in upravljaj brezžične dostopne točke"</string>
@@ -937,7 +956,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Kodo QR spodaj nastavite na sredino, da vzpostavite povezavo z omrežjem »<xliff:g id="SSID">%1$s</xliff:g>«."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Če se želite pridružiti omrežju Wi‑Fi, preberite kodo QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Deljenje omrežja Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Če želite vzpostaviti povezavo z omrežjem »<xliff:g id="SSID">%1$s</xliff:g>« in deliti geslo z drugimi, preberite to kodo QR"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Če se želite pridružiti omrežju »<xliff:g id="SSID">%1$s</xliff:g>«, kodo QR preberite z drugo napravo"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Če želite vzpostaviti povezavo z omrežjem »<xliff:g id="SSID">%1$s</xliff:g>«, preberite to kodo QR"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Poskusite znova. Če se težava ponavlja, se obrnite na proizvajalca naprave."</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Prišlo je do težave"</string>
@@ -963,8 +982,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Geslo za Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Geslo za dostopno točko: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Samodejna povezava"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Dovoli telefonu, da se samodejno poveže v bližini tega omrežja"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Dovoli tabličnemu računalniku, da se samodejno poveže v bližini tega omrežja"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Dovolite povezavo s tem omrežjem, ko je v dosegu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Dodajte napravo"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Če želite dodati napravo v to omrežje, uporabite kodo QR"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Koda QR nima pravilne oblike zapisa"</string>
@@ -976,7 +994,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Uporabi sistemska potrdila"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Ne posreduj"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ne preverjaj"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Ni navedenih potrdil. Povezava ne bo zasebna."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Ime omrežja je predolgo."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Določiti morate domeno."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Potrdilo je obvezno."</string>
@@ -1003,6 +1020,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Vzpostavi povezavo"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi je vklopljen"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Povezano z omrežjem <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Vzpostavljanje povezave z omrežjem <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Povezovanje …"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Vzpostavljanje povezave z omrežjem ni uspelo"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Omrežje ni v dosegu"</string>
@@ -1036,6 +1054,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Naslov MAC naprave"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Naključno izbran naslov MAC"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Naključen naslov MAC (nazadnje uporabljen)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Naslov IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"O omrežju"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska podomrežja"</string>
@@ -1043,8 +1062,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Naslovi IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Shranjena omrežja"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Naročnine"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Druga omrežja"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Nastavitve nasl. IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Dodatne nastavitve za Wi-Fi temu uporabniku niso na voljo"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Shrani"</string>
@@ -1053,8 +1071,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Vnesite veljaven naslov prehoda."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Vnesite veljaven naslov DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Vnesite predpono omrežja, dolgo med 0 in 32 znaki."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (razen v primeru preglasitve z zasebnim strežnikom DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (razen v primeru preglasitve z zasebnim strežnikom DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Prehod"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Dolžina predpone omrežja"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1080,7 +1098,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacija daje vsebino v skupno rabo. Če želite omogočiti skupno rabo internetne povezave, dostopno točko izklopite in znova vklopite."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Geslo ni nastavljeno"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Ime dostopne točke"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Vklapljanje dostopne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Vklapljanje dostopne točke <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Druge naprave se lahko povežejo z dostopno točko <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Geslo za dostopno točko"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Pas dostopne točke"</string>
@@ -1230,7 +1248,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Tekoč prikaz"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Samodejno povečanje hitrosti osveževanja s 60 na 90 Hz za nekatere vsebine. Poveča porabo energije baterije."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Tekoč prikaz"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Vsili hitrost osveževanja 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Višja hitrost osveževanja za izboljšano odzivnost na dotik in kakovost animacij. Povečana poraba energije baterije."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Zaznavanje pogleda na zaslon"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Vklopljeno / zaslon se ne bo izklopil, če ga gledate"</string>
@@ -1321,6 +1339,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Ko zaslon ni osvetljen, se vklopi ob novih obvestilih"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vedno pokaži uro in informacije"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Povečana poraba baterije"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Krepko besedilo"</string>
     <string name="title_font_size" msgid="570613010306330622">"Velikost pisave"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Pomanjšava ali povečava besedila"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Nastavitve zaklepanja SIM"</string>
@@ -1371,7 +1390,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Različica sistema Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Varnostna posodobitev za Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model in strojna oprema"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Različica strojne opreme"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID opreme"</string>
@@ -1620,7 +1638,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Izbriši APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nov APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Shrani"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Zavrzi"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Prekliči"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Polje z imenom ne sme biti prazno."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN ne sme biti prazen."</string>
@@ -1635,8 +1653,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Aplikacije je mogoče ponastaviti"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Ponastavi Wi-Fi, mob. podatke in Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"S tem boste ponastavili vse omrežne nastavitve, vključno s temi:\n\n"<li>"Wi‑Fi"</li>\n<li>"Prenos podatkov v mobilnih omrežjih"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Izbriši"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Brisanje prenesenih kartic SIM"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Če želite prenesti nadomestne kartice SIM, se obrnite na operaterja. S tem ne boste prekinili nobenega naročniškega paketa za mobilno telefonijo."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"S tem ne boste prekinili nobenega naročniškega paketa za mobilno telefonijo. Če želite prenesti nadomestne kartice SIM, se obrnite na operaterja."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Ponastavi nastavitve"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Želite ponastaviti vse omrežne nastavitve? Tega dejanja ni mogoče razveljaviti."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Želite ponastaviti vse omrežne nastavitve in izbrisati prenesene kartice SIM? Tega dejanja ni mogoče razveljaviti."</string>
@@ -1646,31 +1665,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Omrežne nastavitve so ponastavljene"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Kartic SIM ni mogoče izbrisati"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Prenesenih kartic SIM ni mogoče izbrisati zaradi napake.\n\nZnova zaženite napravo in poskusite znova."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Izbriši vse podatke (tovarniška ponastavitev)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Izbriši vse podatke"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"S tem boste iz "<b>"notranje shrambe"</b>" tabličnega računalnika izbrisali vse podatke:\n\n"<li>"Račun Google "</li>\n<li>"Podatki in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"S tem boste iz "<b>"notranje shrambe"</b>" telefona izbrisali vse podatke:\n\n"<li>"Račun Google"</li>\n<li>"Podatki in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"V napravi so prisotni drugi uporabniki.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"Digitalne kartice e-SIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"S tem ne boste prekinili naročniškega paketa za mobilno telefonijo."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Izbriši vse podatke (tovarniška ponastavitev)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Izbriši vse podatke (tov. po.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"S tem boste iz "<b>"notranje shrambe"</b>" tabličnega računalnika izbrisali vse podatke:\n\n"<li>"Račun Google "</li>\n<li>"Podatki in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"S tem boste iz "<b>"notranje shrambe"</b>" telefona izbrisali vse podatke:\n\n"<li>"Račun Google"</li>\n<li>"Podatki in nastavitve sistema in aplikacij"</li>\n<li>"Prenesene aplikacije"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Trenutno ste prijavljeni v te račune:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"V napravi so prisotni drugi uporabniki.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Glasba"</li>\n<li>"Fotografije"</li>\n<li>"Drugi uporabniški podatki"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"Digitalne kartice e-SIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"S tem ne boste prekinili naročniškega paketa za mobilno telefonijo."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"pomnilnik USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Če želite izbrisati glasbo, slike in druge uporabniške podatke, morate izbrisati "<b>"kartico SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Izbriši pomnilnik USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Izbriši kartico SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Izbriši vse podatke v notranjem pomnilniku USB, na primer glasbo ali fotografije."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Izbriši vse podatke na kartici SD, na primer glasbo ali fotografije."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Izbriši vse podatke"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Izbriši vse podatke"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Vsi osebni podatki in prenesene aplikacije bodo izbrisani. Tega dejanja ni mogoče razveljaviti."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Izbrisani bodo vsi osebni podatki, vključno s prenesenimi aplikacijami in karticami SIM. Tega dejanja ni mogoče razveljaviti."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Izbriši vse"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Ponastavitev ni opravljena, ker storitev System Clear ni na voljo."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Želite izbrisati vse podatke?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Ponastavitev na tovarniške nastavitve ni na voljo za tega uporabnika"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Brisanje"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Počakajte ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Brisanje vseh podatkov"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Brisanje vseh podatkov"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Vsi osebni podatki in prenesene aplikacije bodo izbrisani. Tega dejanja ni mogoče razveljaviti."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Izbrisani bodo vsi osebni podatki, vključno s prenesenimi aplikacijami in karticami SIM. Tega dejanja ni mogoče razveljaviti."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Želite izbrisati vse podatke?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Ponastavitev na tovarniške nastavitve ni na voljo za tega uporabnika"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Brisanje"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Počakajte …"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Nastavitve klicanja"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Nastavite telefonski predal, preusmeritev klicev, čakajoči klic, ID klicatelja"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Internet prek USB-ja"</string>
@@ -1718,7 +1735,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Internetna povezava ni mogoča z več kot <xliff:g id="MAXCONNECTION">%1$d</xliff:g> naprav."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Internetna povezava z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bo prekinjena."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Internet prek etherneta"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Deljenje internetne povezave telefona prek povezave USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Deljenje internetne povezave telefona prek etherneta"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Uporabite dostopno točko in povezavo z internetom prek mobilnega telefona, da zagotovite internet drugim napravam prek svoje mobilne podatkovne povezave. Tudi aplikacije lahko ustvarijo dostopno točko za skupno rabo vsebin z napravami v bližini."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Uporabite dostopno točko in povezavo z internetom prek mobilnega telefona, da zagotovite internet drugim napravam prek Wi-Fi-ja ali mobilne podatkovne povezave. Tudi aplikacije lahko ustvarijo dostopno točko za deljenje vsebin z napravami v bližini."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Pomoč"</string>
@@ -1762,6 +1779,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Iskanje naprav Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Aplikacijam in storitvam omogoči, da kadar koli iščejo naprave v bližini, tudi ko je Bluetooth izklopljen. To funkcijo lahko na primer uporabite, če želite izboljšati funkcije in storitve, ki pri delovanju uporabljajo lokacijo."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Lokacijske storitve za službo"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Uporaba lokacije za zaznavanje časovnega pasu"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Uporaba lokacije za zaznavanje časovnega pasu"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Dovoli uporabo lokacije naprave za zaznavanje trenutnega časovnega pasu. Druge nastavitve lokacije, na primer iskanje omrežij Wi‑Fi, lahko vplivajo na natančnost zaznavanja časovnega pasu."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Vklopljeno"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Izklopljeno"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Samodejno zaznavanje časovnega pasu je onemogočeno"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Uporaba lokacije za zaznavanje časovnega pasu je onemogočeno"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Uporaba lokacije za zaznavanje časovnega pasu ni podprta"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Spremembe uporabe lokacije za zaznavanje časovnega pasu niso dovoljene"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Lokacija Wi-Fi-ja in mob. omr."</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Aplikacijam omogočite hitrejše določanje lokacije z Googlovo storitvijo za določanje lokacije. Anonimni podatki o lokaciji bodo zbrani in poslani Googlu."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Določanje lokacije z Wi‑Fi-jem"</string>
@@ -1825,6 +1851,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Za odklepanje z obrazom nastavite geslo"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Za odklepanje z obrazom nastavite vzorec"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Za odklepanje z obrazom nastavite PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Za uporabo biometrike nastavite geslo"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Za uporabo biometrike nastavite vzorec"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Za uporabo biometrike nastavite kodo PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Ste pozabili geslo?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Ste pozabili vzorec?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Ste pozabili svoj PIN?"</string>
@@ -2165,13 +2194,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Nastavitve podnapisov"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Povečava"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Območje povečave"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Omogočanje povečave"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Izberite eno ali več območij povečave, na katerih naj se izvede povečava zaslona"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Celotni zaslon"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Del zaslona"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Celotni zaslon in del zaslona"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Povečava celotnega zaslona"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Povečava dela zaslona"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Želite preklopiti na gumb za funkcije?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Uporaba trikratnega dotika za povečavo dela zaslona bo povzročala zakasnitve pri vnašanju in drugih dejanjih.\n\nAli želite za povečavo raje uporabljati gumb za funkcije za ljudi s posebnimi potrebami?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Preklopi na gumb za funkcije"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Ohrani povečavo s trikratnim dotikom"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Nastavitve povečave"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Povečevanje s trikratnim dotikom"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Povečanje z bližnjico"</string>
@@ -2225,11 +2257,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Gumb za vklop konča klic"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Velik kazalec miške"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Odstranjevanje animacij"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono zvok"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Združevanje kanalov pri predvajanju zvoka"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Ravnovesje zvoka"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Levo"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Desno"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono zvok"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Združevanje kanalov pri predvajanju zvoka"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Ravnovesje zvoka"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Levo"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Desno"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Privzeto"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekund"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekund"</string>
@@ -2259,11 +2291,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibriranje pri obvestilih"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibriranje pri zvonjenju"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Odziv na dotik"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Uporabi storitev <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Odpiranje aplikacije <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Uporabi popravljanje barv"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Pokaži podnapise"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Samo pri podprtih aplikacijah"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Uporabi storitev <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Odpiranje aplikacije <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Uporaba popravljanja barv"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Prikaz podnapisov"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Samo pri podprtih aplikacijah"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Velikost in slog podnapisov"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Velikost besedila: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Več možnosti"</string>
@@ -2295,6 +2327,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Devteranomalija"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomalija"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomalija"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Sivine"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Rdeča – zelena"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Rdeča – zelena"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Modra – rumena"</string>
@@ -2436,7 +2469,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Omejitev dejavnosti v ozadju"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Dovoli, da se aplikacija izvaja v ozadju"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Aplikaciji ni dovoljeno izvajanje v ozadju"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Dejavnosti v ozadju ni mogoče omejiti"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Dejavnosti v ozadju ni mogoče omejiti"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Želite omejiti dejavnost v ozadju?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Če boste omejili dejavnost aplikacije v ozadju, morda ne bo pravilno delovala"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Ker za to aplikacijo ni izbrana nastavitev optimiziranja porabe baterije, je ni mogoče omejiti.\n\nČe želite omejiti aplikacijo, najprej vklopite optimizacijo baterije."</string>
@@ -2485,6 +2518,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablični računalnik uporabljate več kot običajno"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Napravo uporabljate več kot običajno"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Baterija se bo morda izpraznila prej kot običajno"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimizacija za ohranjanje zmogljivosti baterije"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Baterija je začasno omejena. Za več informacij se dotaknite."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefon ste uporabljali več kot običajno. Baterija se bo morda izpraznila prej, kot ste pričakovali.\n\nAplikacije, ki porabijo največ energije baterije:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tablični računalnik ste uporabljali več kot običajno. Baterija se bo morda izpraznila prej, kot ste pričakovali.\n\nAplikacije, ki porabijo največ energije baterije:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Napravo ste uporabljali več kot običajno. Baterija se bo morda izpraznila prej, kot ste pričakovali.\n\nAplikacije, ki porabijo največ energije baterije:"</string>
@@ -2554,6 +2589,8 @@
       <item quantity="other">%1$d aplikacij je omejenih</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Težava z branjem indikatorja stanja napolnjenosti baterije"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Težava z branjem indikatorja stanja napolnjenosti baterije. Dotaknite se "<annotation id="url">"za več informacij"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Želite ustaviti aplikacijo?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Telefon ne more ustrezno upravljati porabe energije baterije, 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 baterije morda morali aplikacijo odstraniti."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Tablični računalnik ne more ustrezno upravljati porabe energije baterije, 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 baterije morda morali aplikacijo odstraniti."</string>
@@ -2667,9 +2704,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Nastavitev razporeda"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Podaljšanje časa delovanja baterije"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Izklop ob polni napolnjenosti"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Varčevanje z energijo baterije se izklopi, ko je telefon napolnjen na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Varčevanje z energijo baterije se izklopi, ko je tablični računalnik napolnjen na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Varčevanje z energijo baterije se izklopi, ko je naprava napolnjena na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Varčevanje z energijo baterije se izklopi, ko je telefon napolnjen več kot <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Varčevanje z energijo baterije se izklopi, ko je tablični računalnik napolnjen več kot <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Varčevanje z energijo baterije se izklopi, ko je naprava napolnjena več kot <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Vklop"</string>
@@ -2734,6 +2771,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Ponastavi"</string>
     <string name="tts_play" msgid="2945513377250757221">"Predvajaj"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Prilagajanje povezav"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Podaljša čas delovanja baterije in izboljša učinkovitost delovanja naprave s samodejnim upravljanjem omrežnih povezav"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Shramba poverilnic"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Namestitev potrdila"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Namestitev potrdil iz shrambe"</string>
@@ -2745,9 +2784,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Uporabniške poverilnice"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Ogled in spreminjanje shranjenih poverilnic"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Dodatno"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Vrsta shrambe"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Strojna"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Samo programska"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Za tega uporabnika niso na voljo poverilnice"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Nameščeno za VPN in aplikacije"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Nameščeno za Wi-Fi"</string>
@@ -2763,6 +2799,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ne namesti"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Kljub temu namesti"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Potrdilo ni nameščeno"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Ali aplikaciji <xliff:g id="APP_NAME">%s</xliff:g> dovolite nameščanje potrdil v to napravo?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Ta potrdila bodo uporabljena za vašo identifikacijo v aplikacijah in na naslovih URL, ki so navedeni spodaj"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Ne dovoli"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Dovoli"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Pokaži več"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Aplik. za upravljanje potrdil"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Ni aplikacije"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Potrdila, ki jih namesti ta aplikacija, bodo uporabljena za vašo identifikacijo v aplikacijah in naslovih URL, ki so navedeni spodaj"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Odstrani"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Signal za klice v sili"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Nastavi način delovanja ob klicanju v sili"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Varnostno kopiranje"</string>
@@ -3096,7 +3141,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ni nastavljeno – delovni profil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Skrbnik"</string>
     <string name="user_you" msgid="3070562015202859996">"Vi (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Vzdevek"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Dodate lahko do toliko uporabnikov: <xliff:g id="USER_COUNT">%1$d</xliff:g>"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Uporabnike lahko upravlja samo lastnik tabličnega računalnika."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Uporabnike lahko upravlja samo lastnik telefona."</string>
@@ -3146,7 +3190,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Plačevanje na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Nastavite aplikacijo za plačevanje. Nato prislonite hrbtno stran telefona h kateremu koli terminalu s simbolom za brezstično plačevanje."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Razumem"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Več ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Več …"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Nastavite privzeto aplikacijo za plačevanje"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Posodobite privzeto aplikacijo za plačevanje"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Na brezstičnem terminalu plačaj z aplikacijo <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3216,9 +3260,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Nazaj"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Naprej"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Dokončaj"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Fotografiranje"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Izbira slike"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Izberite fotografijo"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Kartici SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Kartice SIM"</string>
@@ -3230,7 +3271,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Vedno uporabi to možnost za klice"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Izbira kartice SIM za prenos podatkov"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Izberite kartico SIM za sporočila SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Preklop podatkovne kartice SIM. Lahko traja kakšno minuto …"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Preklop podatkovne kartice SIM. Lahko traja kakšno minuto …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Klicanje z …"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Izberite kartico SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3416,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, vsakodnevni opravek, razpored, urnik, varčevanje z energijo baterije, varčevanje z energijo, baterija, samodejno, odstotek, delež"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, napredno klicanje, klicanje 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dodajanje jezika, dodajte jezik"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"velikost besedila"</string>
     <string name="default_sound" msgid="6604374495015245195">"Privzeti zvok"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Glasnost zvonjenja in obvestil na <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Glasnost, vibriranje, ne moti"</string>
@@ -3414,13 +3456,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Zvoki ob zagonu"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Samodejni podnapisi"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Samodejni podnapisi predstavnosti"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Brez"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Nastavljen je <xliff:g id="ON_COUNT">%d</xliff:g> razpored</item>
-      <item quantity="two">Nastavljena sta <xliff:g id="ON_COUNT">%d</xliff:g> razporeda</item>
-      <item quantity="few">Nastavljeni so <xliff:g id="ON_COUNT">%d</xliff:g> razporedi</item>
-      <item quantity="other">Nastavljenih je <xliff:g id="ON_COUNT">%d</xliff:g> razporedov</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Noben}=1{Nastavljen je 1 razpored}one{Nastavljen je # razpored}two{Nastavljena sta # razporeda}few{Nastavljeni so # razporedi}other{Nastavljenih je # razporedov}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ne moti"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Prejemajte samo obvestila pomembnih oseb in aplikacij"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Omejitev prekinitev"</string>
@@ -3488,24 +3524,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Samo prednostno"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Vklopljeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Izklopljeno/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Izklopljeno"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Vklopljeno"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Vedno vprašaj"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Dokler ne izklopite"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> ura</item>
-      <item quantity="two"><xliff:g id="NUM_HOURS">%d</xliff:g> uri</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> ure</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ur</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> min"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> razpored se lahko samodejno vklopi</item>
-      <item quantity="two"><xliff:g id="ON_COUNT">%d</xliff:g> razporeda se lahko samodejno vklopita</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> razporedi se lahko samodejno vklopijo</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> razporedov se lahko samodejno vklopi</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 uro}one{# uro}two{# uri}few{# ure}other{# ur}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuto}two{# minuti}few{# minute}other{# minut}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Izklopljeno}=1{Izklopljeno / 1 razpored se lahko samodejno vklopi}one{Izklopljeno / # razpored se lahko samodejno vklopi}two{Izklopljeno / # razporeda se lahko samodejno vklopita}few{Izklopljeno / # razporedi se lahko samodejno vklopijo}other{Izklopljeno / # razporedov se lahko samodejno vklopi}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Kaj lahko preglasi način »ne moti«"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Osebe"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacije"</string>
@@ -3551,6 +3575,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Samodejna nastavitev manj pomembnih obvestil na »Brez zvočnega opozorila«"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Prilagodljivo razvrščanje obvestil"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Samodejna razvrstitev obvestil glede na ustreznost"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Povratne informacije o prilagodljivih obvestilih"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Pokaži spremembe nastavitev obvestil in možnost posredovanja povratnih informacij sistemu"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Ponastavitev pomembnosti obvestil"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Ponastavitev uporabniško spremenjenih nastavitev pomembnosti in omogočanje prednostne obravnave Pomočniku za obvestila"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Predlagana dejanja in odgovori"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Samodejen prikaz predlaganih dejanj in odgovorov"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Prikaži nedavna in preložena obvestila"</string>
@@ -3650,8 +3678,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prednostni pogovori"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Prikaz na vrhu razdelka s pogovorom in v plavajočih oblačkih"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Prikaz na vrhu razdelka s pogovorom"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Drugi pogovori"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Neprednostni pogovori"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Pogovori, v katere ste vnesli spremembe"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Nedavni pogovori"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Počisti nedavne"</string>
+    <string name="clear" msgid="5092178335409471100">"Počisti"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Prikaz prednostnih pogovorov v oblačkih"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prednostni pogovori so prikazani na vrhu poteznega zaslona z obvestili. Nastavite lahko tudi, naj bodo prikazani v oblačkih in naj preglasijo način »ne moti«."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Prednostni in spremenjeni pogovori bodo prikazani tukaj"</string>
@@ -3757,7 +3788,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Dostop do načina »ne moti«"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Dovoli način »ne moti«"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Nobena nameščena aplikacija ni zahtevala dostopa do načina »ne moti«"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Nalaganje aplikacij ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Nalaganje aplikacij …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Na vašo zahtevo je prikazovanje obvestil te aplikacije blokirano v tej napravi Android"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Na vašo zahtevo je prikazovanje te kategorije obvestil blokirano v tej napravi Android"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Na vašo zahtevo je prikazovanje te skupine obvestil blokirano v tej napravi Android"</string>
@@ -3855,13 +3886,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Vsi pogovori"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prednostni pogovori"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Noben"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> pogovor</item>
-      <item quantity="two"><xliff:g id="CONVERSATIONS">%d</xliff:g> pogovora</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> pogovori</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> pogovorov</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Noben"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Noben}=1{1 pogovor}one{# pogovor}two{# pogovora}few{# pogovori}other{# pogovorov}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kdo lahko preglasi"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Klici"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Klici"</string>
@@ -3870,13 +3895,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Če se želite prepričati, da bo telefon zvonil, ko prejmete dovoljene klice, preverite, ali je naprava nastavljena na zvonjenje"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Dohodni klici za »<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>« so blokirani. Nastavitve lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Stiki z zvezdico"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">še <xliff:g id="NUM_PEOPLE">%d</xliff:g> druga oseba</item>
-      <item quantity="two">še <xliff:g id="NUM_PEOPLE">%d</xliff:g> drugi osebi</item>
-      <item quantity="few">še <xliff:g id="NUM_PEOPLE">%d</xliff:g> druge osebe</item>
-      <item quantity="other">še <xliff:g id="NUM_PEOPLE">%d</xliff:g> drugih oseb</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Noben stik z zvezdico"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Noben}=1{{contact_1}}=2{{contact_1} in {contact_2}}=3{{contact_1}, {contact_2} in {contact_3}}one{{contact_1}, {contact_2} in še # drug}two{{contact_1}, {contact_2} in še # druga}few{{contact_1}, {contact_2} in še # drugi}other{{contact_1}, {contact_2} in še # drugih}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Ni imena)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Sporočila"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"sporočila"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Sporočila"</string>
@@ -3885,13 +3905,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Dohodna sporočila za »<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>« so blokirana. Nastavitve lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Vsa sporočila vas lahko dosežejo"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Vsi klici vas lahko dosežejo"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Noben stik"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> stik</item>
-      <item quantity="two"><xliff:g id="NUM_CONTACTS">%d</xliff:g> stika</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> stiki</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> stikov</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Noben}=1{1 stik}one{# stik}two{# stika}few{# stiki}other{# stikov}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Vsi"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Stiki"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Stiki z zvezdico"</string>
@@ -3929,26 +3943,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Vsa obvestila"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Nekatera obvestila"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Izbrane osebe vas lahko še vedno dosežejo, tudi če aplikacijam ne dovolite preglasitve."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Preglasitev dovoljena za: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="two">Preglasitev dovoljena za: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="few">Preglasitev dovoljena za: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="other">Preglasitev dovoljena za: <xliff:g id="APP_NAMES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Še <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Nobena aplikacija ne sme preglasiti}=1{Aplikacija {app_1} lahko preglasi}=2{Aplikaciji {app_1} in {app_2} lahko preglasita}=3{Aplikacije {app_1}, {app_2}in {app_3} lahko preglasijo}one{Aplikaciji {app_1} in {app_2} ter še # druga lahko preglasijo}two{Aplikaciji {app_1} in {app_2} ter še # drugi lahko preglasijo}few{Aplikaciji {app_1} in {app_2} ter še # druge lahko preglasijo}other{Aplikaciji {app_1} in {app_2} ter še # drugih lahko preglasijo}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacije"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Vsa obvestila"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Nekatera obvestila"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Obvestila, ki lahko preglasijo"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Dovoli vsa obvestila"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Preglasitev dovoljena za: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="two">Preglasitev dovoljena za: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="few">Preglasitev dovoljena za: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="other">Preglasitev dovoljena za: <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Nič ne sme preglasiti"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Še <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Nič ne sme preglasiti}=1{Preglasitev dovoljena za: {sound_category_1}}=2{Preglasitev dovoljena za: {sound_category_1} in {sound_category_2}}=3{Preglasitev dovoljena za: {sound_category_1}, {sound_category_2} in {sound_category_3}}one{Preglasitev dovoljena za: {sound_category_1}, {sound_category_2} in še # drugo vrsto zvoka}two{Preglasitev dovoljena za: {sound_category_1}, {sound_category_2} in še # drugi vrsti zvoka}few{Preglasitev dovoljena za: {sound_category_1}, {sound_category_2} in še # druge vrste zvoka}other{Preglasitev dovoljena za: {sound_category_1}, {sound_category_2} in še # drugih vrst zvoka}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Nič ne sme preglasiti"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Nihče ne sme preglasiti"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Nekatere osebe lahko preglasijo"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Vsakdo lahko preglasi"</string>
@@ -3998,8 +4000,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Vklopljeno"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Izklopljeno"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Pripenjanje aplikacije"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Pripenjanje aplikacije omogoča, da trenutna aplikacija ostane vidna, dokler je ne odpnete. To funkcijo lahko na primer uporabite, če želite prijatelju, ki mu zaupate, dovoliti igranje določene igre. \n\nKo je aplikacija pripeta, lahko ta odpre druge aplikacije, prav tako pa so lahko dostopni osebni podatki. \n\nČe želite uporabiti pripenjanje aplikacije: 	\n1.	Vklopite pripenjanje aplikacije. 	\n2.	Odprite »Pregled«. 	\n3.	Dotaknite se ikone aplikacije na vrhu zaslona, nato pa se dotaknite »Pripni«."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Pripenjanje aplikacije omogoča, da trenutna aplikacija ostane vidna, dokler je ne odpnete. To funkcijo lahko na primer uporabite, če želite prijatelju, ki mu zaupate, dovoliti igranje določene igre. \n\nKo je aplikacija pripeta, lahko ta odpre druge aplikacije, prav tako pa so lahko dostopni osebni podatki. \n\nČe želite varno deliti svojo napravo z drugimi, namesto tega uporabite gosta. \n\nČe želite uporabiti pripenjanje aplikacije: 	\n1.	Vklopite pripenjanje aplikacije. 	\n2.	Odprite »Pregled«. 	\n3.	Dotaknite se ikone aplikacije na vrhu zaslona, nato pa se dotaknite »Pripni«."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Pripenjanje aplikacije omogoča, da trenutna aplikacija ostane vidna, dokler je ne odpnete. To funkcijo lahko na primer uporabite, če želite prijatelju, ki mu zaupate, dovoliti igranje določene igre."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Ko je aplikacija pripeta, lahko ta odpre druge aplikacije, prav tako pa so lahko dostopni osebni podatki. \n\nČe želite uporabiti pripenjanje aplikacije, storite to: 	\n1.	Vklopite pripenjanje aplikacije. 	\n2.	Odprite »Pregled«. 	\n3.	Dotaknite se ikone aplikacije na vrhu zaslona, nato pa se dotaknite »Pripni«."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Ko je aplikacija pripeta, lahko ta odpre druge aplikacije, prav tako pa so lahko dostopni osebni podatki. \n\nČe želite varno deliti svojo napravo z drugimi, namesto tega uporabite gosta. \n\nČe želite uporabiti pripenjanje aplikacije, storite to: 	\n1.	Vklopite pripenjanje aplikacije. 	\n2.	Odprite »Pregled«. 	\n3.	Dotaknite se ikone aplikacije na vrhu zaslona, nato pa se dotaknite »Pripni«."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Ko je aplikacija pripeta: \n\n• Dostopni so lahko osebni podatki \n (na primer stiki in vsebina e-poštnih sporočil). \n• Pripeta aplikacija lahko odpre druge aplikacije. \n\nPripenjanje aplikacij uporabite le za osebe, ki jim zaupate."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Pred odpenjanjem vprašaj za vzorec za odklepanje"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Zahtevaj PIN pred odpenjanjem"</string>
@@ -4021,6 +4024,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Poleg tega, da napravo odklepate z obrazom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos kode PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos kode PIN ob zagonu naprave?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Poleg tega, da napravo odklepate z obrazom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos vzorca. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos vzorca ob zagonu naprave?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Poleg tega, da napravo odklepate z obrazom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos gesla. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos gesla ob zagonu naprave?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Poleg tega, da napravo odklepate z biometričnimi podatki, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos kode PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos kode PIN ob zagonu naprave?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Poleg tega, da napravo odklepate z biometričnimi podatki, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos vzorca. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos vzorca ob zagonu naprave?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Poleg tega, da napravo odklepate z biometričnimi podatki, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vnos gesla. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti obvezen vnos gesla ob zagonu naprave?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Da"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ne"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Omejeno"</string>
@@ -4212,7 +4218,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Povezavo USB upravlja"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Povezana naprava"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ta naprava"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Preklapljanje …"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Preklapljanje …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Preklop ni uspel"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Polnjenje te naprave"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Polnjenje akumulatorja v povezani napravi"</string>
@@ -4414,6 +4420,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Prenos mobilnih podatkov"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Prenos podatkov aplikacij"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Preneseni podatki (Wi-Fi)"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Prenesena količina podatkov zunaj omrežij operaterjev"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Preneseni podatki (ethernet)"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4434,6 +4441,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> omejitev</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operaterjeve meritve prenosa podatkov so morda drugačne kot v napravi"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ne vključuje podatkov, prenesenih v omrežjih operaterjev"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Preneseno: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Nastavi opozorilo za prenos podatkov"</string>
     <string name="data_warning" msgid="2925054658166062884">"Opozorilo za prenos podatkov"</string>
@@ -4473,7 +4481,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ogled podrobnosti"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Varčevanje s podatki"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Neomejen prenos podatkov"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Prenos podatkov v ozadju je izklopljen"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Prenos podatkov v ozadju je izklopljen"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Vklopljeno"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Izklopljeno"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Uporabi varčevanje s podatki"</string>
@@ -4496,7 +4504,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Če je naprava zaklenjena, prepreči vnašanje odgovorov ali drugega besedila v obvestilih"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Privzeti črkovalnik"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Izbira črkovalnika"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Uporabi črkovalnik"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Uporaba črkovalnika"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ni izbrano"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(brez)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4602,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Odstranjevanje fotografij in videoposnetkov"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Upravitelj shrambe"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Uporaba upravitelja shrambe"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Uporaba upravitelja shrambe"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Samodejno"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ročno"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Sprostitev prostora"</string>
@@ -4632,6 +4640,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Dvojni dotik za preverjanje telefona"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Dvakratni dotik za preverjanje tabličnega računalnika"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Dvakratni dotik za preverjanje naprave"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Vlečenje za obvestila"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Za prikaz obvestil povlecite navzdol po spodnjem robu zaslona"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Enoročni način"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Uporaba enoročnega načina"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Izhod ob preklopu med aplikacijami"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Časovna omejitev"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunde"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekund"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekund"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"dosegljivost"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Če želite preveriti uro, obvestila in druge informacije, se dvakrat dotaknite zaslona."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Preverjanje telefona s prijemom"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Primite tablični računalnik, da ga preverite"</string>
@@ -4644,6 +4662,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Dotik za preverjanje tabličnega računalnika"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Dotik za preverjanje naprave"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Če želite preveriti uro, obvestila in druge informacije, se dotaknite zaslona."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Nujni primer"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Klicanje na pomoč v nujnem primeru"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Upravlja <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Spodnja dejanja zaženete tako, da najmanj petkrat hitro pritisnete gumb za vklop."</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Predvajanje alarma z odštevanjem"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Predvajanje glasnega zvoka pred obveščanjem, da potrebujete pomoč"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Klic za pomoč"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Številka za klic za pomoč"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Dotaknite se, da spremenite"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Če vnesete številko, ki ni za klic v sili:\n • naprava mora biti odklenjena, če želite uporabiti klic za pomoč v nujnem primeru;\n • na vaš klic morda nihče ne bo odgovoril."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Poteg s prstom po tipalu prstnih odtisov za prikaz obvestil"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Poteg po prstnem tipalu"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Če želite preveriti obvestila, povlecite navzdol po tipalu prstnih odtisov na hrbtni strani telefona."</string>
@@ -4783,6 +4811,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Največje število prikazanih naborov podatkov"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Ponastavi na privzete vrednosti"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Možnosti samodejnega izpolnjevanja za razvijalce so bile ponastavljene"</string>
+    <string name="location_category" msgid="3496759112306219062">"Lokacija"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indikator lokacije v vrstici stanja"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Prikaži za vse lokacije, tudi za zaznane na podlagi omrežja in povezav"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Vsili popolne meritve GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Spremljaj vse razmestitve in frekvence GNSS brez ciklov"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema naprave"</string>
     <string name="default_theme" msgid="4815428567082263639">"Privzeto"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Ime omrežja"</string>
@@ -4799,8 +4832,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Začasno zaustavite prikazovanje obvestil, da ostanete osredotočeni"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funkcija ni na voljo"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Ta funkcija je bila izklopljena, ker upočasnjuje vaš telefon"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Vsili popolne meritve GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Spremljaj vse razmestitve in frekvence GNSS brez ciklov"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Vedno pokaži pogovorno okno zrušitve"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Pokaži pogovorno okno ob vsaki zrušitvi aplikacije"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Izbira aplikacije, ki podpira ANGLE"</string>
@@ -4812,7 +4843,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Omogočanje za vse aplikacije"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Izbira grafičnega gonilnika"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Privzeto"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Gonilnik za igre"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Gonilnik za igre"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Gonilnik za razvijalce"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Grafični gonilnik sistema"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4868,7 +4899,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Vklopljeno (utišano)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Izklopljeno"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"O omrežju"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Ime naprave je vidno aplikacijam v telefonu. Ko vzpostavite povezavo z napravami Bluetooth ali nastavite dostopno točko Wi-Fi, ga bodo morda videle tudi druge osebe."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Ime naprave je vidno aplikacijam v telefonu. Ko vzpostavite povezavo z napravami Bluetooth ali omrežjem Wi-Fi ali nastavite dostopno točko Wi-Fi, ga bodo morda videle tudi druge osebe."</string>
     <string name="devices_title" msgid="649715719278562515">"Naprave"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Vse nastavitve"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Predlogi"</string>
@@ -4881,6 +4912,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Omrežij ni bilo mogoče najti. Poskusite znova."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(prepovedano)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Ni kartice SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ni kartice SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Ni podatkov"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Za povezavo je potrebna kartica SIM"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Za povezavo je potrebna kartica SIM operaterja <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Prednostni način omrežja: prednostno WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Prednostni način omrežja: samo GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Prednostni način omrežja: samo WCDMA"</string>
@@ -4934,6 +4970,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Prenos podatkov v mobilnem omrežju"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Dostop do prenosa podatkov prek mobilnega omrežja"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Ko bo ta operater v dosegu, bo telefon samodejno preklopil nanj"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nobena kartica SIM ni na voljo"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Nastavitev za klice"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Nastavitev za sporočila SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Vedno vprašaj"</string>
@@ -4996,6 +5033,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ni na voljo ob vzpostavljeni povezavi z operaterjem <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Pokaži več"</string>
     <string name="see_less" msgid="2642392725363552793">"Pokaži manj"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Želite vklopiti storitev operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Želite vklopiti kartico SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Želite preklopiti na operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Želite preklopiti na uporabo kartice SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Hkrati je lahko aktivna samo ena kartica SIM.\n\nČe preklopite na operaterja <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, ne boste preklicali storitve operaterja <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Hkrati je lahko aktivna samo ena prenesena kartica SIM.\n\nČe preklopite na operaterja <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, ne boste preklicali storitve operaterja <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Hkrati je lahko aktivna samo ena kartica SIM.\n\nČe preklopite, ne boste preklicali storitve operaterja <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Preklopi na operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Povezovanje z omrežjem …"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Preklapljanje na operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operaterja ni mogoče preklopiti"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operaterja ni mogoče preklopiti zaradi napake."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Želite izklopiti storitev operaterja <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Želite izklopiti kartico SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Izklapljanje kartice SIM <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operaterja ni mogoče onemogočiti"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Prišlo je do napake, operaterja ni bilo mogoče onemogočiti."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Želite uporabljati dve kartici SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"V tej napravi sta lahko hkrati aktivni dve kartici SIM. Če želite še naprej uporabljati samo eno kartico SIM, se dotaknite »Ne, hvala«."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Želite znova zagnati napravo?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Če želite začeti, znova zaženite napravo. Nato boste lahko dodali še eno kartico SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Naprej"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Znova zaženi"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ne, hvala"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Preklopi"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Kartice SIM ni mogoče aktivirati"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Kartico SIM odstranite in jo znova vstavite. Če s tem ne odpravite težave, znova zaženite napravo."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Poskusite znova vklopiti kartico SIM. Če s tem ne odpravite težave, znova zaženite napravo."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivacija omrežja"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Operater <xliff:g id="CARRIER_NAME">%1$s</xliff:g> je aktiven"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Dotaknite se, če želite posodobiti nastavitve kartice SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Kartica SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Želite izbrisati preneseno kartico SIM?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Če izbrišete to kartico SIM, boste iz te naprave odstranili storitev operaterja <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>.\n\nStoritev operaterja <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ne bo preklicana."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Izbriši"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Brisanje kartice SIM …"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Kartice SIM ni mogoče izbrisati"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Te kartice SIM ni mogoče izbrisati zaradi napake.\n\nZnova zaženite napravo in poskusite znova."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Vzpostavitev povezave z napravo"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacija <xliff:g id="APPNAME">%1$s</xliff:g> želi uporabiti začasno omrežje Wi-Fi za vzpostavitev povezave z napravo"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Ni naprav. Preverite, ali so naprave vklopljene in na voljo za vzpostavitev povezave."</string>
@@ -5071,6 +5146,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Klici v sili"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Vaš operater ne podpira klicev v sili, opravljenih s funkcijo Klicanje prek Wi-Fi-ja.\nNaprava samodejno preklopi na mobilno omrežje, da opravi klic v sili.\nKlici v sili so mogoči samo na območjih, ki so pokrita z mobilnim signalom."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Uporabljajte omrežje Wi‑Fi za izboljšanje kakovosti klicev"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Klicanje ne glede na kartico SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Dovoli klice prek druge kartice SIM in sporočila SMS prek te kartice SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"klicanje, klici, kartica SIM, ne glede na"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Dohodno sporočilo MMS"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Sporočila MMS ni mogoče poslati"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Dotaknite se za uporabo sporočil MMS v omrežju <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>, ko je prenos podatkov v mobilnem omrežju izklopljen"</string>
@@ -5122,10 +5200,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Dovoli prekrivanje zaslonov z nastavitvami"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Dovoli aplikacijam, ki lahko prekrivajo druge aplikacije, prekrivanje zaslonov v aplikaciji Nastavitve"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Predstavnost"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Skrije predvajalnik po končani seji predstavnosti"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Predvajalnik vam omogoča nadaljevanje seje prek razširjenega podokna s hitrimi nastavitvami."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Predvajalnik predstavnosti v hitrih nastavitvah"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Prikaz predvajalnika predstavnosti dalj časa za preprosto nadaljevanje predvajanja"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Skrij predvajalnik"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Prikaži predvajalnik"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Na voljo ni noben predvajalnik"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Dovoljene aplikacije"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"predstavnost"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth se bo vklopil"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Vklopljeno"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Izklopljeno"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Kartice SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Omrežja, varna za uporabo v letalu"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Iskanje omrežij, varnih za uporabo v letalu, in povezovanje z njimi"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"letalo, varno za uporabo v letalu"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Klici in sporočila SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Klicanje prek Wi‑Fi-ja"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Opravljanje in prejemanje klicev v omrežjih, ki niso operaterjeva, na primer v omrežjih Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Klicanje prek Wi-Fi-ja omogoča opravljanje in prejemanje klicev v omrežjih, ki niso operaterjeva, na primer v nekaterih omrežjih Wi-Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Klici"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"Sporočila SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"prednostno"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"prednostno: klici"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"prednostno: sporočila SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ni na voljo"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ni kartice SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Nastavitve"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Povezovanje z javnimi omrežji"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"omrežna povezava, internet, brezžično, podatki, wifi, wi-fi, wi fi, mobilno omrežje, mobilno, mobilni operater, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Prikaži varna omrežja za uporabo v letalu"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Izklopi način za letalo"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Ni na voljo, ker je vklopljen način za spanje"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Ponastavitev pomembnosti obvestil je dokončana."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacije"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Naprava, ki ni vredna zaupanja, želi dostopati do vaših sporočil. Dotaknite se za podrobnosti."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Želite dovoliti dostop do sporočil?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Naprava Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ki ni vredna zaupanja, želi dostopati do vaših sporočil.\n\nŠe nikoli niste vzpostavili povezave z napravo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Naprava, ki ni vredna zaupanja, želi dostopati do vaših stikov in dnevnika klicev. Dotaknite se za podrobnosti."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Želite dovoliti dostop do stikov in dnevnika klicev?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Naprava Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ki ni vredna zaupanja, želi dostopati do vaših stikov in dnevnika klicev. To vključuje podatke o dohodnih in odhodnih klicih.\n\nŠe nikoli niste vzpostavili povezave z napravo [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 305b072..4dff8aa 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Mesatare"</item>
     <item msgid="6740026006576843477">"E gjatë"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"E shkurtër"</item>
+    <item msgid="7397961711906421599">"Mesatare"</item>
+    <item msgid="4079132024502041928">"E gjatë"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"E parazgjedhur"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globale"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"Vetëm TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globale"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1cb9dca..c1dd2c2 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Data dhe ora"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Vendos datën dhe orën"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Vendos datën, orën, brezin orar dhe formatet"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Përdor orën e ofruar nga rrjeti"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Përdor brezin orar të ofruar nga rrjeti"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Cakto automatikisht orën"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Cakto automatikisht brezin orar"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Përdor parazgjedhjen e lokalitetit"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Formati \"24 orë\""</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Përdor formatin 24 orë"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Shfaq informacionin e profilit në ekranin e kyçjes"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Llogaritë"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Vendndodhja"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Përdor vendndodhjen"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Përdor vendndodhjen"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Joaktiv"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Aktiv - <xliff:g id="COUNT_1">%1$d</xliff:g> aplikacione kanë qasje te vendndodhja</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kyçja e ekranit, shkyçja me fytyrë"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kyçja e ekranit, gjurma e gishtit"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Kyçja e ekranit"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Shkyçe telefonin në mënyrë të sigurt me fytyrën tënde dhe gjurmën e gishtit"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Mund të identifikohesh po ashtu në aplikacione dhe të konfirmosh pagesat"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Konfiguro shkyçjen me:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Shkyçja me fytyrë"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Bëje shkyçjen e telefonit të lehtë"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Gjurma e gishtit"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Kurse kohë duke shkyçur telefonin në xhep"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Kapërce"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Para"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Fytyra u shtua"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Konfiguro shkyçjen me fytyrë"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Shkyçja me fytyrë"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Përdor fytyrën për të vërtetuar"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Nis"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Nëse shkyçja e fytyrës me qasshmëri është e çaktivizuar, disa hapa konfigurimi mund të mos funksionojnë mirë me TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Kthehu pas"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Vazhdo konfigurimin"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Përdor konfigurimin e qasshmërisë"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Kërko gjithmonë hapin e konfirmimit kur përdor shkyçjen me fytyrë në aplikacione"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Fshi të dhënat e fytyrës"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Konfiguro shkyçjen me fytyrë"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Përdor \"Shkyçjen me fytyrë\" për të shkyçur pajisjen, për t\'u identifikuar tek aplikacionet dhe për të konfirmuar pagesat.\n\nKi parasysh:\nShikimi te telefoni mund ta shkyçë atë edhe nëse nuk ke për qëllim ta bësh.\n\nTelefoni yt mund të shkyçet nga dikush tjetër nëse ai mbahet te fytyra jote.\n\nTelefoni yt mund të shkyçet nga dikush që ngjan shumë me ty, p.sh. nga një binjak."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Përdor \"Shkyçjen me fytyrë\" për të shkyçur pajisjen, për t\'u identifikuar tek aplikacionet dhe për të konfirmuar pagesat.\n\nKi parasysh:\nShikimi te telefoni mund ta shkyçë atë kur nuk planifikon këtë.\n\nTelefoni yt mund të shkyçet nga dikush tjetër nëse ai mbahet te fytyra jote, edhe nëse sytë i ke të mbyllur.\n\nTelefoni yt mund të shkyçet nga dikush që ngjan shumë me ty, p.sh. nga një binjak."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Përdore shkyçjen me fytyrë për shkyçjen e pajisjes, identifikimin në aplikacione dhe konfirmimin e pagesave."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Ki parasysh:\nNëse e shikon telefonin mund ta shkyçësh pa dashje.\n\nTelefoni yt mund të shkyçet nga dikush tjetër nëse ta mbajnë bri fytyrës.\n\nTelefoni yt mund të shkyçet nga dikush tjetër që të ngjan shumë, p.sh. binjaku yt."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Ki parasysh:\nNëse e shikon telefonin mund ta shkyçësh pa dashje.\n\nTelefoni yt mund të shkyçet nga dikush tjetër nëse ta mbajnë bri fytyrës edhe nëse i ke të mbyllur sytë.\n\nTelefoni yt mund të shkyçet nga dikush tjetër që të ngjan shumë, p.sh. binjaku yt."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Do t\'i fshish të dhënat e fytyrës?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Të dhënat e fytyrës që përdoren nga shkyçja me fytyrë do të fshihen përgjithmonë dhe në mënyrë të sigurt. Pas heqjes, do të të duhet kodi PIN, motivi ose fjalëkalimi për ta shkyçur telefonin, për t\'u identifikuar në aplikacione dhe për të konfirmuar pagesat."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Përdor shkyçjen me fytyrë për të shkyçur telefonin tënd"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Përdor gjurmën e gishtit për të shkyçur telefonin ose për të miratuar blerjet.\n\nShënim. Nuk mund ta përdorësh gjurmën tënde të gishtit për ta shkyçur këtë pajisje. Për më shumë informacione, kontakto me administratorin e organizatës tënde."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Përdor gjurmën e gishtit për të shkyçur telefonin ose për të miratuar blerjet.\n\nShënim. Gjurma e gishtit mund të jetë më pak e sigurt se sa një kod PIN ose motiv i fortë."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Anulo"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Jo, faleminderit"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Vazhdo"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Kapërce"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Përpara"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Duke mbrojtur tabletin tënd me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar shkyçjen me fytyrë. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Duke mbrojtur pajisjen tënde me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar shkyçjen me fytyrë. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Duke mbrojtur telefonin tënd me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu edhe një opsion për kyçjen e ekranit për të konfiguruar shkyçjen me fytyrë. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Duke mbrojtur tabletin tënd me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu një opsion për kyçjen e ekranit për të konfiguruar sistemet biometrike. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Duke mbrojtur pajisjen tënde me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu një opsion për kyçjen e ekranit për të konfiguruar sistemet biometrike. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Duke mbrojtur telefonin tënd me një opsion për kyçjen e ekranit, askush nuk do të jetë në gjendje ta përdorë nëse të humb ose vidhet. Të duhet gjithashtu një opsion për kyçjen e ekranit për të konfiguruar sistemet biometrike. Për t\'u kthyer, trokit tek \"Anulo\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Do ta kapërcesh konfigurimin e kodit PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Do ta kapërcesh konfigurimin e fjalëkalimit?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Do ta kapërcesh konfigurimin e motivit?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Parandalo që të tjerët ta përdorin këtë tablet pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Parandalo që të tjerët ta përdorin këtë pajisje pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Parandalo që të tjerët ta përdorin këtë telefon pa lejen tënde duke aktivizuar funksionet e mbrojtjes së pajisjes. Zgjidh kyçjen e ekranit që dëshiron të përdorësh."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Zgjidh mënyrën rezervë të kyçjes së ekranit"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Zgjidh mënyrën rezervë të kyçjes së ekranit"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Zgjidh mënyrën rezervë të kyçjes së ekranit"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Opsionet e kyçjes së ekranit"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Opsionet e kyçjes së ekranit"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Kyçja e ekranit"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Shkyçja me fytyrë + Fjalëkalimi"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Vazhdo pa shkyçjen me fytyrë"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Mund ta shkyçësh telefonin duke përdorur fytyrën. Për siguri, ky opsion kërkon një kyçje rezervë të ekranit."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Sistemet biometrike + Motivi"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Sistemet biometrike + Kodi PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Sistemet biometrike + Fjalëkalimi"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Vazhdo pa sistemet biometrike"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Mund ta shkyçësh telefonin duke përdorur sistemet biometrike. Për siguri, ky opsion kërkon një kyçje rezervë të ekranit."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Çaktivizuar nga administratori, politika e enkriptimit ose hapësira ruajtëse e kredencialeve"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Asnjë"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Me rrëshqitje"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Duhet të ketë më pak se <xliff:g id="NUMBER_0">%d</xliff:g> shifër</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Administratori i pajisjes nuk e lejon përdorimin e një kodi PIN të përdorur së fundi"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Kodet e zakonshme PIN janë bllokuar nga administratori i TI-së. Provo një kod tjetër PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Kjo nuk mund të përfshijë një karakter të pavlefshëm"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Duhet të përmbajë të paktën një germë"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Duhet të përmbajë të paktën një shifër"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Duhet të përmbajë të paktën 1 karakter jonumerik</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Administratori i pajisjes nuk e lejon përdorimin e një fjalëkalimi të përdorur së fundi"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Fjalëkalimet e zakonshme janë bllokuar nga administratori i TI-së. Provo një fjalëkalim tjetër."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Nuk lejohet një sekuencë shifrash në rritje, në zbritje ose me përsëritje"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Konfirmo"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Anulo"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Aktivizo Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Përdor Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Përdor Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Cilësimet e Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Cakto dhe menaxho zonat e qasjes të rrjetit me valë"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Vendos në qendër kodin QR më poshtë për t\'u lidhur me “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Bashkohu me Wi-Fi duke skanuar një kod QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Ndaj Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skano këtë kod QR për t\'u lidhur me “<xliff:g id="SSID">%1$s</xliff:g>” dhe ndaj fjalëkalimin"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skano këtë kod QR me një pajisje tjetër për t\'u bashkuar me “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skano këtë kod QR për t\'u lidhur me “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Provo sërish. Nëse problemi vazhdon, kontakto me prodhuesin e pajisjes"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Ndodhi një gabim"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Fjalëkalimi i Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Fjalëkalimi i zonës së qasjes për internet: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Lidh automatikisht"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Lejo që telefoni të lidhet automatikisht në afërsi të këtij rrjeti"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Lejo që tableti të lidhet automatikisht në afërsi të këtij rrjeti"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Lejo lidhjen me këtë rrjet kur të jetë brenda rrezes"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Shto pajisje"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Përdor një kod QR për të shtuar një pajisje në këtë rrjet"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Kodi QR nuk është në format të vlefshëm"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Përdor certifikatat e sistemit"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Mos e ofro"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Mos e mirato"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Nuk u specifikua asnjë certifikatë. Lidhja jote nuk do të jetë private."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Emri i rrjetit është shumë i gjatë."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Duhet të specifikohet një domen."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Kërkohet certifikimi."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Lidh"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi është i aktivizuar"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Lidhur me <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Po lidhet me <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Po lidhet…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Lidhja me rrjetin dështoi"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Rrjeti nuk është brenda rrezes"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Adresa MAC e pajisjes"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Adresa MAC e rastësishme"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Adresa e rastësishme MAC (përdorur së fundi)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Adresa e IP-së"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Detajet e rrjetit"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Maska e nënrrjetit"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Adresat IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Rrjetet e ruajtura"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abonimet"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Rrjetet e tjera"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Cilësimet e IP-së"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Cilësimet e Wi-Fi nuk disponohen për këtë përdorues"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Ruaj"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Shkruaj një adresë të vlefshme porte kalimi."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Shkruaj një adresë të vlefshme DNS-je."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Shkruaj një gjatësi prefiksi rrjeti mes 0 dhe 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (përveçse nëse është anuluar nga DNS-ja private)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (përveçse nëse është anuluar nga DNS-ja private)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Porta e kalimit"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Gjatësia e prefiksit të rrjetit"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Aplikacioni po ndan përmbajtje. Për të ndarë lidhjen e internetit, çaktivizo zonën e qasjes së internetit dhe më pas aktivizoje përsëri."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Nuk është caktuar fjalëkalim"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Emri i zonës së qasjes për internet"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> po aktivizohet..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> po aktivizohet…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Pajisjet e tjera mund të lidhen me <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Fjalëkalimi i zonës së qasjes për internet"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Banda AP"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Ekrani me butësi"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Rrit automatikisht shpejtësinë e rifreskimit nga 60 në 90 Hz për disa përmbajtje. Rrit përdorimin e baterisë."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Detyro shpejtësinë e rifreskimit 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Shpejtësia më e lartë e rifreskimit për përmirësimin e reagueshmërisë së prekjes dhe cilësisë së animacioneve. Rrit përdorimin e baterisë."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Vëmendja ndaj ekranit"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Aktiv / Ekrani nuk do të fiket nëse shikon tek ai"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kur ekrani është i errët, ai aktivizohet për njoftimet e reja"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Shfaq gjithmonë kohën dhe informacionin"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Përdorimi i rritur i baterisë"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Tekst i trashë"</string>
     <string name="title_font_size" msgid="570613010306330622">"Madhësia e shkrimit"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Bëje tekstin më të madh ose më të vogël"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Kyçja e kartës SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Versioni i Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Përditësim sigurie për Android:"</string>
     <string name="model_info" msgid="8997566254717810904">"Modeli"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modeli: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modeli dhe hardueri"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Versioni i harduerit"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID-ja e pajsjes"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Fshi APN-në"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN e re"</string>
     <string name="menu_save" msgid="6611465355127483100">"Ruaj"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Hiq"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Anulo"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Fusha Emri nuk mund të jetë bosh."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Rrjeti APN nuk mund të jetë bosh."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Aplikacionet mund të rivendosen"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Rivendos Wi-Fi, lidhjen celulare dhe Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Kjo do të rivendosë të gjitha cilësimet e rrjetit, duke përfshirë:\n\n"<li>"Wi‑Fi"</li>\n<li>"Të dhënat celulare"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Spastro"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Spastro kartat SIM të shkarkuara"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Për të shkarkuar karta SIM zëvendësuese, kontakto me operatorin celular. Kjo nuk do të anulojë asnjë plan të shërbimit celular."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Kjo nuk do të anulojë planet e shërbimit celular. Për të shkarkuar karta zëvendësuese SIM, kontakto me operatorin celular."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Rivendos cilësimet"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Të rivendosen të gjitha cilësimet e rrjetit? Ky veprim nuk mund të zhbëhet."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Do t\'i rivendosësh të gjitha cilësimet dhe t\'i spastrosh kartat SIM të shkarkuara? Nuk mund ta zhbësh këtë veprim."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Cilësimet e rrjetit janë rivendosur"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Kartat SIM nuk mund të spastrohen"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Kartat SIM të shkarkuara nuk mund të spastrohen për shkak të një gabimi.\n\nRinise pajisjen dhe provo përsëri."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Kjo do të spastrojë të gjitha të dhënat nga "<b>"hapësira ruajtëse e brendshme"</b>" e tabletit, duke përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Kjo do të spastrojë të gjitha të dhënat nga "<b>"hapësira ruajtëse e brendshme"</b>" e telefonit, duke përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Je i identifikuar aktualisht në llogaritë e mëposhtme:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Ka përdorues të tjerë të pranishëm në këtë pajisje.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muzika"</li>\n<li>"Fotografitë"</li>\n<li>"Të dhëna të tjera të përdoruesit"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"Kartat eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Kjo nuk do ta anulojë planin tënd të shërbimit celular."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"hapësira ruajtëse e USB-së"</b>" duhet të spastrohet."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"karta SD"</b>" duhet të spastrohet."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Spastro të gjitha të dhënat (rivendosja e fabrikës)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Kjo do të spastrojë të gjitha të dhënat nga "<b>"hapësira ruajtëse e brendshme"</b>" e tabletit, duke përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Kjo do të spastrojë të gjitha të dhënat nga "<b>"hapësira ruajtëse e brendshme"</b>" e telefonit, duke përfshirë:\n\n"<li>"Llogarinë e Google"</li>\n<li>"Të dhënat e sistemit dhe aplikacioneve si dhe cilësimet"</li>\n<li>"Aplikacionet e shkarkuara"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Je i identifikuar aktualisht në llogaritë e mëposhtme:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Ka përdorues të tjerë të pranishëm në këtë pajisje.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muzika"</li>\n<li>"Fotografitë"</li>\n<li>"Të dhëna të tjera të përdoruesit"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"Kartat eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Kjo nuk do ta anulojë planin tënd të shërbimit celular."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"hapësira ruajtëse e USB-së"</b>" duhet të spastrohet."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Për të hequr muzikën, fotografitë dhe të dhëna të tjera të përdoruesit, "<b>"karta SD"</b>" duhet të spastrohet."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Fshi hapësirën ruajtëse të USB-së"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Spastroje kartën SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Spastro të gjitha të dhënat në hapësirën ruajtëse të brendshme të USB-së, si muzikën ose fotografitë"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Spastro të gjitha të dhënat në kartën SD, si muzikën ose fotografitë"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Spastro të gjitha të dhënat"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Spastro të gjitha të dhënat"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Të gjitha informacionet e tua personale dhe aplikacionet e shkarkuara do të fshihen. Nuk mund ta zhbësh këtë veprim."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Të gjitha informacionet e tua personale, duke përfshirë aplikacionet e shkarkuara dhe kartat SIM, do të fshihen. Nuk mund ta zhbësh këtë veprim."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Spastroji të gjitha"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Nuk u krye një rivendosje sepse shërbimi Pastrimi i sistemit nuk është i disponueshëm."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Të spastrohen të gjitha të dhënat?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Rivendosja në gjendjen e fabrikës nuk ofrohet për këtë përdorues"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Po spastron"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Qëndro në pritje..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Spastro të gjitha të dhënat"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Spastro të gjitha të dhënat"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Të gjitha informacionet e tua personale dhe aplikacionet e shkarkuara do të fshihen. Nuk mund ta zhbësh këtë veprim."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Të gjitha informacionet e tua personale, duke përfshirë aplikacionet e shkarkuara dhe kartat SIM, do të fshihen. Nuk mund ta zhbësh këtë veprim."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Të spastrohen të gjitha të dhënat?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Rivendosja në gjendjen e fabrikës nuk ofrohet për këtë përdorues"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Po spastron"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Qëndro në pritje…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Cilësimet e telefonatave"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Konfiguro postën zanore, transferimin e telefonatave, telefonatat në pritje dhe ID-në e telefonuesit"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Ndarje përmes USB-së"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Ndarja e internetit nuk mund të bëhet për më shumë se <xliff:g id="MAXCONNECTION">%1$d</xliff:g> pajisje."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Ndarja e internetit do të çaktivizohet për <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ndarja e eternetit"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Ndaj lidhjen e internetit të telefonit nëpërmjet eternetit me USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Ndaj lidhjen e internetit të telefonit nëpërmjet eternetit"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Përdor zonën e qasjes dhe ndarjen e internetit për t\'u ofruar internet pajisjeve të tjera nëpërmjet lidhjes tënde të të dhënave celulare. Aplikacionet mund të krijojnë po ashtu një zonë qasjeje të internetit për të ndarë përmbajtje me pajisjet në afërsi."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Përdor zonën e qasjes dhe ndarjen e internetit për t\'u ofruar internet pajisjeve të tjera nëpërmjet lidhjes tënde Wi-Fi ose të të dhënave celulare. Aplikacionet mund të krijojnë po ashtu një zonë qasjeje të internetit për të ndarë përmbajtje me pajisjet në afërsi."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Ndihma"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Skanimi i Bluetooth-it"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Lejo që aplikacionet dhe shërbimet të skanojnë për pajisje në afërsi në çdo moment, edhe kur Bluetooth është joaktiv. Kjo mund të përdoret, për shembull, për të përmirësuar funksionet dhe shërbimet e bazuara te vendndodhja."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Shërbimet e vendndodhjes për punë"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Zbulimi i brezit orar të vendndodhjes"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Zbulimi i brezit orar të vendndodhjes"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Lejon vendndodhjen e pajisjes që të përdoret për të zbuluar brezin orar aktual. Cilësimet e tjera të vendndodhjes si skanimi për Wi‑Fi mund të ndikojnë në saktësinë e zbulimit të brezit orar."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Aktiv"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Joaktiv"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Zbulimi automatik i brezit orar është çaktivizuar"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Zbulimi i brezit orar të vendndodhjes është çaktivizuar"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Zbulimi i brezit orar të vendndodhjes nuk mbështetet"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Nuk lejohen ndryshimet në zbulimin e brezit orar të vendndodhjes"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Vend. rrjetit Wi‑Fi e celular"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Lejo aplikacionet të përdorin shërbimin e vendndodhjes së Google për të llogaritur më shpejt vendndodhjen tënde. Të dhënat e vendndodhjes do të jenë anonime dhe do të mblidhen e do t\'i dërgohen Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Vendndodhja u përcaktua nga Wi‑Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Për të përdorur shkyçjen me fytyrë, cakto fjalëkalimin"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Për të përdorur shkyçjen me fytyrë, cakto motivin"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Për të përdorur kyçjen me fytyrë, cakto kodin PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Vendos fjalëkalimin"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Vendos motivin"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Vendos kodin PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Harrove fjalëkalimin?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Harrove motivin?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Harrove kodin PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Preferencat e titrave"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Zmadhimi"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Zona e zmadhimit"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Aktivizimi i zmadhimit"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Zgjidh zonën(at) e zmadhimit që dëshiron të përdorësh kur zmadhon ekranin"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Ekrani i plotë"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Një pjesë e ekranit"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Ekrani i plotë dhe një pjesë e ekranit"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Zmadho të gjithë ekranin"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Zmadho një pjesë të ekranit"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Të kalohet te butoni i qasshmërisë?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Përdorimi i trokitjes së trefishtë për të zmadhuar një pjesë të ekranit do të shkaktojë vonesa gjatë shkrimit dhe veprimeve të tjera.\n\nDëshiron të kalosh te përdorimi i butonit të qasshmërisë për të zmadhuar?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Kalo te butoni i qasshmërisë"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Mbaj trokitjen e trefishtë për të zmadhuar"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Cilësimet e \"Zmadhimit\""</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Zmadho me tre trokitje"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Zmadho me shkurtore"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Butoni i fikjes mbyll telefonatën"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Kursor i madh miu"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Hiq animacionet"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Audioja mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Ndërthur kanalet kur luan audion"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balanca e audios"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Majtas"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Djathtas"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Audioja mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Ndërthur kanalet kur luan audion"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balanca e audios"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Majtas"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Djathtas"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"E parazgjedhur"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekonda"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekonda"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Dridhjet e njoftimeve"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Dridhjet e ziles"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Reagimi me prekje"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Përdor <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Hap <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Përdor korrigjimin e ngjyrave"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Shfaq titrat"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Vetëm për aplikacionet e mbështetura"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Përdor <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Hap <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Përdor korrigjimin e ngjyrave"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Shfaq titrat"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Vetëm për aplikacionet e mbështetura"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Madhësia dhe stili i titrave"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Madhësia e tekstit <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Opsione të tjera"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Nuancat e grisë"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"E kuqe - e gjelbër"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"E kuqe - e gjelbër"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"E kaltër - e verdhë"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Kufizimi i përdorimit në sfond"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Lejo që aplikacioni të ekzekutohet në sfond"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Nuk lejohet që aplikacioni të ekzekutohet në sfond"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Përdorimi në sfond nuk mund të kufizohet"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Përdorimi në sfond nuk mund të kufizohet"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Të kufizohet aktiviteti në sfond?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Nëse e kufizon aktivitetin në sfond për një aplikacion, mund të ketë çrregullime në funksionimin e tij"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Duke qenë se ky aplikacion nuk është caktuar për të optimizuar baterinë, nuk mund ta kufizosh atë.\n\nPër të kufizuar aplikacionin, në fillim aktivizo optimizimin e baterisë."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tableti është përdorur më shumë se zakonisht"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Pajisja është përdorur më shumë se zakonisht"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Bateria mund të mbarojë më herët se zakonisht"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Po optimizohet për integritetin e baterisë"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Bateria e kufizuar përkohësisht. Trokit për të mësuar më shumë."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefoni yt është përdorur më shumë se zakonisht. Bateria mund të mbarojë më shpejt nga sa pritet.\n\nAplikacionet kryesore sipas përdorimit të baterisë:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tableti yt është përdorur më shumë se zakonisht. Bateria mund të mbarojë më shpejt nga sa pritet.\n\nAplikacionet kryesore sipas përdorimit të baterisë:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Pajisja jote është përdorur më shumë se zakonisht. Bateria mund të mbarojë më shpejt nga sa pritet.\n\nAplikacionet kryesore sipas përdorimit të baterisë:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d aplikacion i kufizuar</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Problem me leximin e matësit të baterisë"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Problem me leximin e matësit të baterisë. Trokit "<annotation id="url">"për të mësuar më shumë"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Të ndalohet aplikacioni?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Telefoni yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> po e mban zgjuar telefonin.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh aplikacionin.\n\nNëse kjo vazhdon të ndodhë, mund të jetë e nevojshme ta çinstalosh aplikacionin për të përmirësuar cilësinë e funksionimit të baterisë."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Tableti yt nuk mund ta menaxhojë baterinë në mënyrë normale pasi aplikacioni <xliff:g id="APP">%1$s</xliff:g> po e mban zgjuar tabletin.\n\nPër t\'u përpjekur të zgjidhësh këtë problem, mund ta ndalosh aplikacionin.\n\nNëse kjo vazhdon të ndodhë, mund të jetë e nevojshme ta çinstalosh aplikacionin për të përmirësuar cilësinë e funksionimit të baterisë."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Cakto një orar"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Rrit kohëzgjatjen e baterisë"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Çaktivizo kur të karikohet"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"\"Kursyesi i baterisë\" çaktivizohet kur telefoni yt është në <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"\"Kursyesi i baterisë\" çaktivizohet kur tableti yt është në <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"\"Kursyesi i baterisë\" çaktivizohet kur pajisja jote është në <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"\"Kursyesi i baterisë\" çaktivizohet kur telefoni yt karikohet mbi <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"\"Kursyesi i baterisë\" çaktivizohet kur tableti yt karikohet mbi <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"\"Kursyesi i baterisë\" çaktivizohet kur pajisja jote karikohet mbi <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktivizo"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Rivendos"</string>
     <string name="tts_play" msgid="2945513377250757221">"Luaj"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Lidhshmëria me përshtatje"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Rrit kohëzgjatjen e baterisë dhe përmirëson cilësinë e funksionimit të pajisjes duke menaxhuar automatikisht lidhjet e rrjetit"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Ruajtja e kredencialeve"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Instalo një certifikatë"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Instalo certifikatat nga hapësira ruajtëse"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kredencialet e përdoruesit"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Shiko dhe modifiko kredencialet e ruajtura"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Të përparuara"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lloji i hapësirës ruajtëse"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"E mbështetur nga hardueri"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Vetëm ajo e softuerit"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kredencialet nuk ofrohen për këtë përdorues"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Instaluar për VPN dhe aplikacione"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Instaluar për Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Mos e instalo"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Instalo gjithsesi"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certifikata nuk u instalua"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Të lejohet që <xliff:g id="APP_NAME">%s</xliff:g> t\'i instalojë certifikatat në këtë pajisje?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Këto certifikata do të të identifikojnë në aplikacionet dhe URL-të më poshtë"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Mos lejo"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Lejo"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Shfaq më shumë"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Aplikacioni i menaxhimit të certifikatave"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Asnjë"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certifikatat e instaluara nga ky aplikacion të identifikojnë në aplikacionet dhe URL-të më poshtë"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Hiq"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Sinjali i telefonimit të urgjencës"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Cakto sjelljen kur kryhet një telefonatë urgjence"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Rezervimi"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Nuk është konfiguruar - profili i punës"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Ti (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Pseudonimi"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Mund të shtosh deri në <xliff:g id="USER_COUNT">%1$d</xliff:g> përdorues"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Vetëm zotëruesi i tabletit mund t\'i menaxhojë përdoruesit."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Vetëm zotëruesi i telefonit mund t\'i menaxhojë përdoruesit."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pagesa në terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfiguro një aplikacion pagese. Më pas thjesht mbaje pjesën e pasme të telefonit te një terminal me simbolin e pagesave pa kontakt."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"E kuptova"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Më shumë..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Më shumë…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Cakto aplikacionin e parazgjedhur të pagesave"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Përditëso aplikacionin e parazgjedhur të pagesave"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Te një terminal pa kontakte, paguaj me <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Prapa"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Përpara"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Përfundo"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Bëj një fotografi"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Zgjidh një imazh"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Zgjidh një fotografi"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Kartat SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Kartat SIM"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Përdor gjithmonë këtë për telefonatat"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Përzgjidh një kartë SIM për të dhënat"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Zgjidh një kartë SIM për mesazhet SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Po ndërron SIM-in e të dhënave. Kjo mund të zgjasë deri në një minutë..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Po ndërron kartën SIM të të dhënave. Kjo mund të zgjasë deri në një minutë…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Telefono me"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Zgjidh një kartë SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutina, planifikimi, kursyesi i baterisë, kursyesi i energjisë, bateria, automatike, përqind"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, telefonatë e përparuar, telefonatë me 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"shto gjuhën, shto një gjuhë"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"madhësia e tekstit"</string>
     <string name="default_sound" msgid="6604374495015245195">"Tingulli i parazgjedhur"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volumi i ziles dhe njoftimeve në <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volum, dridhje, \"Mos shqetëso\""</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Aktivizo tingujt"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Titra në çast"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Media me titra automatike"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Asnjë"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> orare të caktuara</item>
-      <item quantity="one">1 orar i caktuar</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Asnjë}=1{1 orar i caktuar}other{# orare të caktuara}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Mos shqetëso"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Merr njoftime vetëm nga aplikacionet dhe personat e rëndësishëm"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Kufizo ndërprerjet"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Vetëm me prioritet"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Aktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Joaktiv / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Joaktiv"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aktiv"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Pyet çdo herë"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Derisa ta çaktivizosh"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> orë</item>
-      <item quantity="one">1 orë</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuta"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> orare mund të aktivizohen automatikisht</item>
-      <item quantity="one">1 orar mund të aktivizohet automatikisht</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 orë}other{# orë}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minutë}other{# minuta}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Joaktiv}=1{Joaktiv / 1 orar mund të aktivizohet automatikisht}other{Joaktiv / # orare mund të aktivizohen automatikisht}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Çfarë mund ta ndërpresë \"Mos shqetëso\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personat"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Aplikacionet"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Caktoji automatikisht njoftimet me prioritet më të ulët te \"Me rëndësi të ulët\""</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Renditja e njoftimeve me përshtatje"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Rendit automatikisht njoftimet sipas përshtatshmërisë"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Komentet e njoftimeve me përshtatje"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Trego rregullimet që u bëhen njoftimeve dhe shfaq opsionin për t\'i dhënë komente sistemit"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Rivendos rëndësinë e njoftimeve"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Rivendos cilësimet e rëndësisë që janë ndryshuar nga përdoruesi dhe lejo që asistenti i njoftimeve të caktojë përparësinë"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Veprimet dhe përgjigjet e sugjeruara"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Shfaq automatikisht veprimet dhe përgjigjet e sugjeruara"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Shfaq njoftimet e fundit dhe ato të shtyra"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Bisedat me përparësi"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Shfaq në krye të seksionit të bisedës dhe shfaq si flluska pluskuese"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Shfaq në krye të seksionit të bisedës"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Biseda të tjera"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Bisedat pa përparësi"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Bisedat ku ke bërë ndryshime"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Bisedat e fundit"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Pastro të fundit"</string>
+    <string name="clear" msgid="5092178335409471100">"Pastro"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Shfaq flluskën për bisedat me përparësi"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Bisedat me përparësi shfaqen në krye të strehës me tërheqje poshtë. Mund t\'i caktosh po ashtu që të shfaqen si flluskë dhe të ndërpresin \"Mos shqetëso\"."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Bisedat me përparësi dhe të modifikuara do të shfaqen këtu"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Qasja te \"Mos shqetëso\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Lejo modalitetin \"Mos shqetëso\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Asnjë aplikacion i instaluar nuk ka kërkuar qasje te \"Mos shqetëso\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Po ngarkon aplikacionet..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Po ngarkon aplikacionet…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Me kërkesën tënde, Android po bllokon shfaqjen e njoftimeve të këtij aplikacioni në këtë pajisje"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Me kërkesën tënde, Android po bllokon shfaqjen e kësaj kategorie njoftimesh në këtë pajisje"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Me kërkesën tënde, Android po bllokon shfaqjen e këtij grupi njoftimesh në këtë pajisje"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Të gjitha bisedat"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Bisedat me përparësi"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Asnjë"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> biseda</item>
-      <item quantity="one">1 bisedë</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Asnjë"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Asnjë}=1{1 bisedë}other{# biseda}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kush mund të ndërpresë"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Telefonata"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Telefonatat"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Për t\'u siguruar që telefonatat e lejuara lëshojnë tingull, kontrollo nëse pajisja jote është caktuar me zile"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Për \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" telefonatat hyrëse janë të bllokuara. Mund t\'i rregullosh cilësimet për të lejuar shokët, familjen ose kontakte të tjera të lidhen me ty."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Kontaktet me yll"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> të tjerë</item>
-      <item quantity="one">1 tjetër</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Asnjë"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Asnjë}=1{{contact_1}}=2{{contact_1} dhe {contact_2}}=3{{contact_1}, {contact_2} dhe {contact_3}}other{{contact_1}, {contact_2} dhe # kontakte të tjera}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Pa emër)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mesazhet"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mesazhet"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mesazhet"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Për \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\", mesazhet hyrëse janë të bllokuara. Mund t\'i rregullosh cilësimet për të lejuar shokët, familjen ose kontakte të tjera të lidhen me ty."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Të gjithë mesazhet mund të vijnë te ti"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Të gjitha telefonatat mund të lidhen me ty"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Asnjë"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakte</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Asnjë}=1{1 kontakt}other{# kontakte}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Çdo person"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktet"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Kontaktet me yll"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Të gjitha njoftimet"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Disa njoftime"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Persona të zgjedhur mund të të kontaktojnë ende, edhe nëse nuk i lejon aplikacionet të të ndërpresin"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> mund ta ndërpresin</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> mund ta ndërpresë</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> të tjera"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Asnjë aplikacion nuk mund të ndërpresë}=1{{app_1} mund të ndërpresë}=2{{app_1} dhe {app_2} mund të ndërpresin}=3{{app_1}, {app_2} dhe {app_3} mund të ndërpresin}other{{app_1}, {app_2} dhe # aplikacione të tjera mund të ndërpresin}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Aplikacionet"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Të gjitha njoftimet"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Disa njoftime"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Njoftimet që mund ta ndërpresin"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Lejo të gjitha njoftimet"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> mund ta ndërpresin</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> mund ta ndërpresë</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Asgjë nuk mund të ndërpresë"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> të tjera"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Asgjë nuk mund të ndërpresë}=1{{sound_category_1} mund të ndërpresë}=2{{sound_category_1} dhe {sound_category_2} mund të ndërpresin}=3{{sound_category_1}, {sound_category_2} dhe {sound_category_3} mund të ndërpresin}other{{sound_category_1}, {sound_category_2} dhe # tinguj të tjerë mund të ndërpresin}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Asgjë nuk mund të ndërpresë"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Askush nuk mund të ndërpresë"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Disa persona mund ta ndërpresin"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Të gjithë kontaktet mund ta ndërpresin"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Aktivizuar"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Joaktiv"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Gozhdimi i aplikacionit"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Gozhdimi i aplikacionit të lejon ta mbash aplikacionin aktual në pamje derisa ta zhgozhdosh. Kjo veçori mund të përdoret, për shembull, për të lejuar një shok të besuar që të luajë një lojë specifike. \n\nKur një aplikacion është i gozhduar, aplikacioni i gozhduar mund të hapë aplikacione të tjera dhe të dhënat personale mund të jenë të qasshme. \n\nPër të përdorur gozhdimin e aplikacionit: 	\n1.	Aktivizo gozhdimin e aplikacionit 	\n2.	Hap \"Përmbledhja\" 	\n3.	Trokit ikonën në krye të ekranit, më pas trokit \"Gozhdo\""</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Gozhdimi i aplikacionit të lejon ta mbash aplikacionin aktual në pamje derisa ta zhgozhdosh. Kjo veçori mund të përdoret, për shembull, për të lejuar një shok të besuar që të luajë një lojë specifike. \n\nKur një aplikacion është i gozhduar, aplikacioni i gozhduar mund të hapë aplikacione të tjera dhe të dhënat personale mund të jenë të qasshme. \n\nNëse do që të ndash në mënyrë të sigurt pajisjen tënde me dikë, provo të përdorësh më mirë një përdorues vizitor. \n\nPër të përdorur gozhdimin e aplikacionit: \n1.	Aktivizo gozhdimin e aplikacionit \n2.	Hap \"Përmbledhja\" \n3.	Trokit ikonën në krye të ekranit, më pas trokit \"Gozhdo\""</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Gozhdimi i aplikacionit të lejon ta mbash aplikacionin aktual në pamje derisa ta zhgozhdosh. Kjo veçori mund të përdoret, për shembull, për të lejuar një shok të besuar që të luajë një lojë specifike."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Kur një aplikacion është i gozhduar, aplikacioni i gozhduar mund të hapë aplikacione të tjera dhe të dhënat personale mund të jenë të qasshme. \n\nPër të përdorur gozhdimin e aplikacionit: 	\n1.	Aktivizo gozhdimin e aplikacionit 	\n2.	Hap \"Përmbledhja\" 	\n3.	Trokit ikonën në krye të ekranit, më pas trokit \"Gozhdo\""</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Kur një aplikacion është i gozhduar, aplikacioni i gozhduar mund të hapë aplikacione të tjera dhe të dhënat personale mund të jenë të qasshme. \n\nNëse do që të ndash në mënyrë të sigurt pajisjen tënde me dikë, provo të përdorësh më mirë një përdorues vizitor. \n\nPër të përdorur gozhdimin e aplikacionit: 	\n1.	Aktivizo gozhdimin e aplikacionit 	\n2.	Hap \"Përmbledhja\" 	\n3.	Trokit ikonën në krye të ekranit, më pas trokit \"Gozhdo\""</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Kur aplikacioni është i gozhduar: \n\n•		Të dhënat personale mund të jenë të qasshme \n		(si kontaktet dhe përmbajtja e email-eve) \n•		Aplikacioni i gozhduar mund të hapë aplikacione të tjera \n\nPërdore gozhdimin e aplikacionit vetëm me personat te të cilët ke besim."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Kërko motivin e shkyçjes para anulimit të mbërthimit"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Zhgozhdimi kërkon PIN-in"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Përveç përdorimit të fytyrës për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar fjalëkalimin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet kodi PIN për të nisur pajisjen?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Përveç përdorimit të fytyrës për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar fjalëkalimin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet motivi për të nisur pajisjen?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Përveç përdorimit të fytyrës për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar fjalëkalimin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet fjalëkalimi për të nisur pajisjen?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Përveç përdorimit të sistemeve biometrike për ta shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar kodin tënd PIN para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet kodi PIN për të nisur pajisjen?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Përveç përdorimit të sistemeve biometrike për ta shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar motivin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet motivi për të nisur pajisjen?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Përveç përdorimit të sistemeve biometrike për ta shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar fjalëkalimin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet fjalëkalimi për të nisur pajisjen?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Po"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Jo"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"I kufizuar"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB-ja kontrollohet nga"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Pajisja e lidhur"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Kjo pajisje"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Po ndërrohet..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Po ndërrohet…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Nuk mund të ndërrohej"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Karikimi i kësaj pajisjeje"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Pajisja e lidhur po karikohet"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Përdorimi i të dhënave celulare"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Përdorimi i të dhënave të aplikacionit"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Përdorimi i të dhënave me Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Përdorimi i të dhënave jo të operatorit celular"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Përdorimi i të dhënave me eternet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Eterneti"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 kufizim</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Llogaritja e të dhënave nga operatori mund të ndryshojë nga llogaritja e pajisjes"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Përjashton të dhënat që përdoren nga rrjetet e operatorit celular"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> të përdorura"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Cakto paralajm. për të dhënat"</string>
     <string name="data_warning" msgid="2925054658166062884">"Paralajmërimi i të dhënave"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Shiko detajet"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Kursyesi i të dhënave"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Të dhënat e pakufizuara"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Të dhënat e sfondit janë të çaktivizuara"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Të dhënat e sfondit janë të çaktivizuara"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aktiv"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Joaktiv"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Përdor \"Kursyesin e të dhënave\""</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Nëse pajisja është e kyçur, parandalo shkrimin e përgjigjeve ose teksteve të tjera te njoftimet"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Kontrolluesi drejtshkrimor i parazgjedhur"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Zgjidh kontrolluesin drejtshkrimor"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Përdor kontrolluesin drejtshkrimor"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Përdor kontrolluesin drejtshkrimor"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"I pazgjedhur"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(asnjë)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Për të ndihmuar në lirimin e hapësirës ruajtëse, menaxheri i hapësirës ruajtëse i heq fotografitë dhe videot e rezervuara nga pajisja jote."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Hiq fotografitë dhe videot"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Menaxheri i hapësirës ruajtëse"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Përdor \"Menaxherin e hapësirës ruajtëse\""</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Përdor \"Menaxherin e hapësirës ruajtëse\""</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatike"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Liro hapësirën tani"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Trokit dy herë për të kontrolluar telefonin"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Trokit dy herë për të kontrolluar tabletin"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Trokit dy herë për të kontrolluar pajisjen"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Rrëshqit shpejt për njoftimet"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Rrëshqit shpejt poshtë në skajin fundor të ekranit për të shfaqur njoftimet"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Modaliteti i përdorimit me një dorë"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Përdor modalitetin e përdorimit me një dorë"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Dil kur ndërron aplikacionet"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Koha e pritjes"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekonda"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekonda"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekonda"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"arritshmëria"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Për të kontrolluar orën, njoftimet dhe informacione të tjera, trokit dy herë tek ekrani."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Ngrije për ta kontrolluar telefonin"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Ngrije për ta kontrolluar tabletin"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Trokit për të kontrolluar tabletin"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Trokit për të kontrolluar pajisjen"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Për të kontrolluar orën, njoftimet dhe informacione të tjera, trokit tek ekrani."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS i urgjencës"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Përdor shërbimin SOS të urgjencës"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Menaxhohet nga <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Nis veprimet më poshtë duke shtypur 5 herë me shpejtësi butonin e energjisë"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Luaj alarmin me numërim mbrapsht"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Luaj një tingull të lartë përpara se të njoftosh për ndihmë"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Telefono për ndihmë"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Numri për të telefonuar për ndihmë"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Trokit për ta ndryshuar"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Nëse fut një numër jourgjence:\n • Pajisja mund të të shkyçet për të përdorur SOS e urgjencës\n • Telefonatës mund të mos i përgjigjen"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Rrëshqit gjurmën e gishtit për njoftimet"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Rrëshqit gjurmën e gishtit"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Për të kontrolluar njoftimet, rrëshqit poshtë në sensorin e gjurmës së gishtit në pjesën e pasme të telefonit."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Setet maksimale të dukshme të të dhënave"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Rivendos në vlerat e parazgjedhura"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Opsionet e plotësimit automatik të zhvilluesit janë rivendosur"</string>
+    <string name="location_category" msgid="3496759112306219062">"Vendndodhja"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Treguesi i vendndodhjes së shiritit të statusit"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Shfaqe për të gjitha vendndodhjet, duke përfshirë rrjetin dhe lidhshmërinë"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Matjet GNSS me fuqi të plotë"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Gjurmo të gjitha koleksionet dhe frekuencat e GNSS pa ciklim të detyruar"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema e pajisjes"</string>
     <string name="default_theme" msgid="4815428567082263639">"I parazgjedhur"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Emri i rrjetit"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Vendos njoftimet në pauzë për të qëndruar i fokusuar"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Veçoria nuk ofrohet"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Kjo veçori është çaktivizuar sepse ngadalëson telefonin tënd"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Matjet GNSS me fuqi të plotë"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Gjurmo të gjitha koleksionet dhe frekuencat e GNSS pa ciklim të detyruar"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Gjithmonë shfaq dialogun e ndërprerjes aksidentale"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Shfaq dialogun sa herë që një aplikacion pëson ndërprerje aksidentale"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Zgjidh aplikacionin e aktivizuar për ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktivizo për të gjitha aplikacionet"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Zgjidh drejtuesin e grafikës"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"E parazgjedhur"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Drejtuesi i lojës"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Drejtuesi i lojës"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Drejtuesi i zhvilluesit"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Drejtuesi i grafikës së sistemit"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Aktiv (i heshtur)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Joaktiv"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Detajet e rrjetit"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Emri i pajisjes sate është i dukshëm për aplikacionet në telefonin tënd. Ai mund të shikohet po ashtu nga persona të tjerë kur lidhesh me pajisje me Bluetooth ose kur konfiguron një zonë të qasjes për internet me Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Emri i pajisjes sate është i dukshëm për aplikacionet në telefonin tënd. Ai mund të shikohet po ashtu nga persona të tjerë kur lidhesh me pajisje me Bluetooth, kur lidhesh me një rrjet Wi-Fi ose kur konfiguron një zonë të qasjes për internet me Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Pajisjet"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Të gjitha cilësimet"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Sugjerime"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Rrjetet nuk mund të gjendeshin. Provo përsëri."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ndalohet)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Nuk ka kartë SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Nuk ka kartë SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Asnjë"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Kërkon kartë SIM për t\'u lidhur"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Kërkon kartë SIM nga <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> për t\'u lidhur"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Modaliteti i rrjetit të preferuar: preferohet WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Modaliteti i rrjetit të preferuar: vetëm GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Modaliteti i rrjetit të preferuar: vetëm WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Të dhënat celulare"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Qasu te të dhënat duke përdorur rrjetin celular"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefoni do të kalojë automatikisht te ky operator celular kur të jetë brenda rrezes"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Nuk ka kartë SIM"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Preferencat e telefonatave"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Preferenca për SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Pyet çdo herë"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Nuk ofrohet kur është e lidhur me <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Shiko më shumë"</string>
     <string name="see_less" msgid="2642392725363552793">"Shiko më pak"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Të aktivizohet <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Të aktivizohet SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Do të kalosh te <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Dëshiron të kalosh te përdorimi i kartës SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Vetëm një kartë SIM mund të jetë aktive në të njëjtën kohë.\n\nKalimi te <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nuk do ta anulojë shërbimin e <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Vetëm një kartë SIM e shkarkuar mund të jetë aktive në të njëjtën kohë.\n\nKalimi te <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> nuk do ta anulojë shërbimin e <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Vetëm një kartë SIM mund të jetë aktive në të njëjtën kohë.\n\nKalimi nuk do ta anulojë shërbimin e <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Kalo te <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Po lidhet me rrjetin…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Po kalon te <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operatori nuk mund të ndërrohet"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Operatori nuk mund të ndërrohet për shkak të një gabimi."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Të çaktivizohet <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Të çaktivizohet karta SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Po çaktivizohet karta SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operatori celular nuk mund të çaktivizohet"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Ndodhi një gabim dhe operatori celular nuk mund të çaktivizohet."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Dëshiron të përdorësh 2 karta SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Kjo pajisje mund të ketë 2 karta SIM aktive në të njëjtën kohë. Që të vazhdosh të përdorësh 1 kartë SIM në të njëjtën kohë, trokit te \"Jo, faleminderit\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Të riniset pajisja?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Për të filluar, rinise pajisjen tënde. Më pas mund të shtosh një kartë tjetër SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Vazhdo"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Rinis"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Jo, faleminderit"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Ndërro"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Karta SIM nuk mund të aktivizohet"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Hiq kartën SIM dhe fute përsëri. Nëse problemi vazhdon, rinise pajisjen."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Provo të aktivizosh kartën SIM përsëri. Nëse problemi vazhdon, rinise pajisjen."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Aktivizimi i rrjetit"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> është aktiv"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Trokit për të përditësuar cilësimet e kartës SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Karta SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Dëshiron ta pastrosh këtë kartë SIM të shkarkuar?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Spastrimi i kësaj karte SIM e heq shërbimin e <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> nga kjo pajisje.\n\nShërbimi për <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> nuk do të anulohet."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Spastro"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Karta SIM po spastrohet…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Karta SIM nuk mund të spastrohet"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Kjo kartë SIM nuk mund të spastrohet për shkak të një gabimi.\n\nRinise pajisjen dhe provo përsëri."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Lidhu me pajisjen"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Aplikacioni <xliff:g id="APPNAME">%1$s</xliff:g> dëshiron të përdorë një rrjet të përkohshëm Wi-Fi për t\'u lidhur me pajisjen tënde"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Nuk u gjet asnjë pajisje. Sigurohu që pajisjet të jenë të ndezura dhe të gatshme për t\'u lidhur."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Telefonata urgjence"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Telefonatat e urgjencës me \"Telefonata me Wi‑Fi\" nuk mbështeten nga operatori yt celular.\nPajisja kalon automatikisht në një rrjet celular për të kryer një telefonatë urgjence.\nTelefonatat e urgjencës janë të mundshme vetëm në zonat me mbulim celular."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Përdor Wi‑Fi për telefonatat për të përmirësuar cilësinë"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Telefonatat e kryqëzuara të kartës SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Lejo telefonatat dhe mesazhet SMS të një karte tjetër SIM nëpërmjet kësaj karte SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"telefonatat e kryqëzuara të kartës SIM"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Mesazh MMS në ardhje"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Mesazhi MMS nuk mund të dërgohet"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Trokit për të lejuar mesazhet MMS në <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> kur të dhënat celulare janë të çaktivizuara"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Lejo mbivendosjet e ekranit te \"Cilësimet\""</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Lejo aplikacionet të cilat mund të shfaqen mbi aplikacione të tjera të mbivendosen mbi ekranet e \"Cilësimeve\""</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Fshihe luajtësin kur sesioni i medias të ketë përfunduar"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Luajtësi të lejon ta vazhdosh më vonë një sesion nga paneli i zgjeruar i \"Cilësimeve të shpejta\"."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Luajtësi i medias te \"Cilësimet e shpejta\""</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Shfaqe luajtësin e medias për një periudhë më të gjatë për të vazhduar me lehtësi luajtjen"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Fshih luajtësin"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Shfaq luajtësin"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Nuk ofrohet asnjë luajtës"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Aplikacionet e lejuara"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth-i do të aktivizohet"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Aktiv"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Joaktiv"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Interneti"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Kartat SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Rrjetet e sigurta për në aeroplan"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Gjej dhe lidhu me rrjete të sigurta për në aeroplan"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"aeroplan, të sigurta për në aeroplan"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Telefonatat dhe SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Telefonatë me Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Kryej dhe merr telefonata përmes rrjeteve jo të operatorëve celularë, si p.sh. Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Telefonata me Wi-Fi të lejon të bësh dhe të marrësh telefonata përmes rrjeteve jo të operatorëve celularë, si p.sh. disa rrjete Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Telefonatat"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"preferohet"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"preferohen telefonatat"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"preferohet SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"e padisponueshme"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Nuk ka kartë SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Preferencat"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Lidhu me rrjetet publike"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"lidhja e rrjetit, internet, pa tel, të dhëna, wifi, wi-fi, wi fi, rrjeti celular, celular, operatori celular, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Shiko rrjetet e sigurta për në aeroplan"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Çaktivizo \"Modalitetin e aeroplanit\""</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Nuk ofrohet sepse modaliteti i orarit të gjumit është aktiv"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Rivendosja e rëndësisë së njoftimit përfundoi."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Aplikacionet"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Një pajisje jo e besuar kërkon të ketë qasje te mesazhet e tua. Trokit për detaje."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Të lejohet qasja te mesazhet?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Një pajisje jo e besuar me Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kërkon të ketë qasje te mesazhet e tua.\n\nNuk je lidhur me [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] më parë."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Një pajisje jo e besuar kërkon të ketë qasje te kontaktet dhe evidenca e telefonatave. Trokit për detaje."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Të lejohet qasja te kontaktet dhe evidenca e telefonatave?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Një pajisje jo e besuar me Bluetooth, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kërkon të ketë qasje te kontaktet dhe evidenca e telefonatave. Kjo përfshin të dhënat në lidhje me telefonatat hyrëse dhe dalëse.\n\nNuk je lidhur me [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] më parë."</string>
 </resources>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 5a3c340..57807df 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Средње"</item>
     <item msgid="6740026006576843477">"Дугачко"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Кратко"</item>
+    <item msgid="7397961711906421599">"Средње"</item>
+    <item msgid="4079132024502041928">"Дуго"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Подразумевано"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Глобална"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Само TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Глобално"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index fa2615d..600929b 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -256,8 +256,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Датум и време"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Подешавање датума и времена"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Подешавање датума, времена, временске зоне и формата"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Користи време мреже"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Користи временску зону мреже"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Подесите време аутоматски"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Подесите временску зону аутоматски"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Користи подразумевану вредност за локалитет"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-часовни формат"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Користи 24-часовни формат"</string>
@@ -298,7 +298,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Прикажи податке о профилу на закључаном екрану"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Налози"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Локација"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Користи локацију"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Користите локацију"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Искључена"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Укључено – <xliff:g id="COUNT_1">%1$d</xliff:g> апликација има приступ локацији</item>
@@ -323,6 +323,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Закључавање екрана, откључавање лицем"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Закључавање екрана, отисак прста"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Закључавање екрана"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Откључајте телефон безбедно помоћу лица и отиска прста"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Могуће је и пријављивање у апликације и потврђивање плаћања"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Подесите откључавање помоћу:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Откључавање лицем"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Поједноставите откључавање телефона"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Отисак прста"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Уштедите на времену и откључајте телефон у џепу"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Прескочи"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Даље"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Лице је додато"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Подесите откључавање лицем"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Откључавање лицем"</string>
@@ -332,6 +341,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Потврдите идентитет лицем"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Започните"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ако је откључавање лицем са функцијом приступачности искључено, неки кораци за подешавање можда неће исправно радити са TalkBack-ом."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Наставите подешавање"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Користите подеш. за приступачн."</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -376,8 +388,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Увек захтевај потврду при коришћењу откључавања лицем у апликацијама"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Бриши податке о лицу"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Подесите откључавање лицем"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Откључајте уређај, пријавите се у апликацију и потврдите плаћање помоћу откључавања лицем.\n\nИмајте у виду:\nАко погледате телефон, можете нехотице да га откључате.\n\nТелефон може да откључа неко други ако га приближи вашем лицу.\n\nТелефон може да откључа неко ко много личи на вас, на пример, идентични близанац."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Откључајте уређај, пријавите се у апликацију и потврдите плаћање помоћу откључавања лицем.\n\nИмајте у виду:\nАко погледате телефон, можете нехотице да га откључате.\n\nТелефон може да откључа неко други ако га приближи вашем лицу чак и ако су вам очи затворене.\n\nТелефон може да откључа неко ко много личи на вас, на пример, идентични близанац."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Откључавање лицем користите да бисте откључали телефон, пријављивали се у апликације и потврђивали плаћања."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Имајте на уму:\nАко погледате телефон, можете и нехотице да га откључате.\n\nТелефон може да откључа неко други ако га приближи вашем лицу.\n\nТелефон може да откључа неко ко много личи на вас, на пример, идентични близанац."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Имајте на уму:\nАко погледате телефон, можете и нехотице да га откључате.\n\nТелефон може да откључа неко други ако га приближи вашем лицу, чак и ако су вам очи затворене.\n\nТелефон може да откључа неко ко много личи на вас, на пример, идентични близанац."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Бришете податке о лицу?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Подаци о лицу које користи откључавање лицем биће трајно и безбедно избрисани. После уклањања требаће вам PIN, образац или лозинка да бисте откључали телефон, пријављивали се у апликације и потврђивали плаћања."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Откључајте телефон лицем"</string>
@@ -398,6 +411,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Откључавајте телефон или одобравајте куповине помоћу отиска прста.\n\nНапомена: Не можете да откључавате овај уређај помоћу отиска прста. Више информација затражите од администратора организације."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Откључавајте телефон или одобравајте куповине помоћу отиска прста.\n\nНапомена: Отисак прста може да буде мање безбедан од јаког шаблона или PIN-а."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Откажи"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Не, хвала"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Настави"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Прескочи"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Даље"</string>
@@ -435,6 +449,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Заштитите таблет помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили откључавање лицем. Додирните Откажи да бисте се вратили."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Заштитите уређај помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили откључавање лицем. Додирните Откажи да бисте се вратили."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Заштитите телефон помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили откључавање лицем. Додирните Откажи да бисте се вратили."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Заштитите таблет помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили биометрију. Додирните Откажи да бисте се вратили."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Заштитите уређај помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили биометрију. Додирните Откажи да бисте се вратили."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Заштитите телефон помоћу опције закључавања екрана да нико не би могао да га користи ако га изгубите или вам га украду. Опција закључавања екрана вам треба и да бисте подесили биометрију. Додирните Откажи да бисте се вратили."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Желите ли да прескочите подешавање PIN-а?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Желите ли да прескочите подешавање лозинке?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Желите ли да прескочите подешавање шаблона?"</string>
@@ -507,8 +524,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Спречите друге да користе овај таблет без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Спречите друге да користе овај уређај без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Спречите друге да користе овај телефон без дозволе тако што ћете активирати функције заштите уређаја. Изаберите закључавање екрана које желите да користите."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Изаберите резервни начин за закључавање екрана"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Изаберите резервни начин за закључавање екрана"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Одаберите резервни начин за закључавање екрана"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Опције закључавања екрана"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Опције закључавања екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Закључавање екрана"</string>
@@ -540,6 +556,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Откључавање лицем + лозинка"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Наставите без откључавања лицем"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Можете да откључате телефон помоћу лица. Ова опција захтева резервни метод закључавања екрана из безбедносних разлога."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Биометрија + шаблон"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Биометрија + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Биометрија + лозинка"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Наставите без биометрије"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Можете да откључате телефон помоћу биометрије. Ова опција захтева резервни метод закључавања екрана из безбедносних разлога."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Онемогућио администратор, смернице за шифровање или складиште акредитива"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Ништа"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Превуците"</string>
@@ -627,7 +648,6 @@
       <item quantity="other">Мора да садржи мање од <xliff:g id="NUMBER_1">%d</xliff:g> цифара</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Администратор уређаја не дозвољава употребу недавно коришћеног PIN-а"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ИТ администратор блокира честе PIN-ове. Изаберите други PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Не сме да обухвата неважећи знак"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Мора да садржи најмање једно слово"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Мора да садржи најмање једну цифру"</string>
@@ -668,7 +688,6 @@
       <item quantity="other">Мора да садржи најмање <xliff:g id="COUNT">%d</xliff:g> знакова који нису бројеви</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Администратор уређаја не дозвољава употребу недавно коришћене лозинке"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ИТ администратор блокира честе лозинке. Изаберите другу лозинку."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Растући, опадајући или поновљени низ цифара није дозвољен"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Потврди"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Откажи"</string>
@@ -812,7 +831,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Укључивање WiFi-а"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Користи WiFi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Користи WiFi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"WiFi подешавања"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Подешавање и управљање бежичним приступним тачкама"</string>
@@ -920,7 +939,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Поставите QR кôд у наставку да бисте додали уређај на мрежу „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Повежите се на Wi‑Fi мрежу тако што ћете скенирати QR кôд"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Дели Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Скенирајте овај QR кôд да бисте се повезали са „<xliff:g id="SSID">%1$s</xliff:g>“ и делили лозинку"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Скенирајте овај QR кôд помоћу другог уређаја да бисте се придружили мрежи <xliff:g id="SSID">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Скенирајте овај QR кôд да бисте се придружили мрежи „<xliff:g id="SSID">%1$s</xliff:g>“"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Пробајте поново. Ако се проблем настави, контактирајте произвођача уређаја"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Дошло је до грешке"</string>
@@ -946,8 +965,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Лозинка за WiFi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Лозинка хотспота: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Аутоматско повезивање"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Дозволите телефону да се аутоматски повезује у близини ове мреже"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Дозволите таблету да се аутоматски повезује у близини ове мреже"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Дозволите повезивање са овом мрежом када је уређај у домету"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Додај уређај"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Користите QR кôд да бисте додали уређај на ову мрежу"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR кôд није у важећем формату"</string>
@@ -959,7 +977,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Користи сертификате система"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Не пружај"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Не проверавај"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Није наведен никакав сертификат. Веза неће бити приватна."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Назив мреже је предугачак."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Морате да наведете домен."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Сертификат је обавезан."</string>
@@ -986,6 +1003,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Повежи"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"WiFi је укључен"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Повезано је на мрежу <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Повезујете се на <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Повезује се…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Повезивање са мрежом није успело"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Мрежа није у домету"</string>
@@ -1016,6 +1034,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC адреса уређаја"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Насумична MAC адреса"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Насумична MAC адреса (последњи пут коришћена)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP адреса"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Детаљи о мрежи"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Маска подмреже"</string>
@@ -1023,8 +1042,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 адресе"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Сачуване мреже"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Претплате"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Остале мреже"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP подешавања"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Напредна подешавања Wi‑Fi мреже нису доступна за овог корисника"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Сачувај"</string>
@@ -1033,8 +1051,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Унесите важећу адресу мрежног пролаза."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Унесите важећу DNS адресу."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Унесите префикс мреже дужине између 0 и 32 знака."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (осим ако га не замени приватни DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (осим ако га не замени приватни DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Мрежни пролаз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Дужина префикса мреже"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1060,7 +1078,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Апликација дели садржај. Да бисте делили интернет везу, искључите, па укључите хотспот"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Нисте подесили лозинку"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Назив хотспота"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> се укључује..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Укључује се WiFi хотспот <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Други уређаји могу да се повежу са хотспотом <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Лозинка хотспота"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Опсег приступне тачке"</string>
@@ -1210,7 +1228,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Течни приказ"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Аутоматски подиже учесталост освежавања са 60 на 90 Hz за одређени садржај. Повећава потрошњу батерије."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Течни приказ"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Наметни учесталост освежавања од 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Највећа учесталост освежавања за побољшан одзив на додир и квалитет анимације. Повећава потрошњу батерије."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Пажња екрана"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Укључено/екран се неће искључити ако гледате у њега"</string>
@@ -1301,6 +1319,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Када је екран таман, укључује се амбијентални екран за нова обавештења"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Увек приказуј време и податке"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Потрошња батерије је повећана"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Подебљани текст"</string>
     <string name="title_font_size" msgid="570613010306330622">"Величина фонта"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Омогућава да текст буде већи или мањи"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Закључавање SIM картице"</string>
@@ -1350,7 +1369,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android верзија"</string>
     <string name="security_patch" msgid="4071756145347865382">"Безбедносно ажурирање за Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Модел"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Модел: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Модел и хардвер"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Верзија хардвера"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ИД опреме"</string>
@@ -1371,7 +1389,7 @@
     <string name="storage_settings_summary" product="default" msgid="267557695753980969">"Ослобађање SD картице, приказ доступног складишта"</string>
     <string name="imei_multi_sim" msgid="71477088017585479">"IMEI (отвор за SIM: %1$d)"</string>
     <string name="view_saved_network" msgid="1232387673095080910">"Да бисте видели, одаберите сачувану мрежу"</string>
-    <string name="status_number" product="tablet" msgid="3597945414666253183">"Број мобилног директоријума"</string>
+    <string name="status_number" product="tablet" msgid="3597945414666253183">"Број мобилног фолдера"</string>
     <string name="status_number" product="default" msgid="8407999629121682207">"Број телефона"</string>
     <string name="status_number_sim_slot" product="tablet" msgid="6582203988975619529">"MDN (отвор за SIM: %1$d)"</string>
     <string name="status_number_sim_slot" product="default" msgid="5724823197745786398">"Бр. тел. (отвор за SIM: %1$d)"</string>
@@ -1599,7 +1617,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Избриши назив приступне тачке"</string>
     <string name="menu_new" msgid="6571230342655509006">"Нов назив приступне тачке"</string>
     <string name="menu_save" msgid="6611465355127483100">"Сачувај"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Одбаци"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Откажи"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Поље Назив не сме да буде празно."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Поље Назив приступне тачке не сме да буде празно."</string>
@@ -1614,8 +1632,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Апликације могу да се ресетују"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Ресетуј WiFi, мобилну мрежу и Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Овим ресетујете сва подешавања мреже, укључујући:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилне податке"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Обриши"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Обриши преузете SIM картице"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Да бисте преузели заменске SIM картице, контактирајте мобилног оператера. Тиме се неће отказати ниједан тарифни пакет."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Овим не отказујете ниједан тарифни пакет. Да бисте преузимали резервне SIM картице, обратите се мобилном оператеру."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Ресетуј подешавања"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Желите ли да ресетујете сва подешавања мреже? Ова радња не може да се опозове."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Желите ли да ресетујете подешавања мреже и обришете преузете SIM картице? Ова радња не може да се опозове."</string>
@@ -1625,31 +1644,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Подешавања мреже су ресетована"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Брисање SIM картица није успело"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Преузете SIM картице не могу да се обришу због грешке.\n\nРестартујте уређај и пробајте поново."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Избриши све податке (врати на фабричка подешавања)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Избриши све податке (врати на фабричка подешавања)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"податке и подешавања система и апликација"</li>\n<li>"преузете апликације"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:\n\n"<li>"Google налог"</li>\n<li>"Подаци и подешавања система и апликација"</li>\n<li>"Преузете апликације"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"На овом уређају су присутни и други корисници.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Музика"</li>\n<li>"Фотографије"</li>\n<li>"Други кориснички подаци"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-ови"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"На тај начин нећете отказати мобилни тарифни пакет."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете "<b>"USB меморију"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Да бисте обрисали музику, слике и друге корисничке податке, треба да избришете садржај "<b>"SD картице"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Обриши све податке (фабричка подешавања)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Обриши све податке (фабричка подешавања)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Овим бришете све податке из "<b>"интерне меморије"</b>" таблета, укључујући:\n\n"<li>"Google налог"</li>\n<li>"податке и подешавања система и апликација"</li>\n<li>"преузете апликације"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Овим бришете све податке из "<b>"интерне меморије"</b>" телефона, укључујући:\n\n"<li>"Google налог"</li>\n<li>"податке и подешавања система и апликација"</li>\n<li>"преузете апликације"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Тренутно сте пријављени на следеће налоге:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"На овом уређају су присутни и други корисници.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Музика"</li>\n<li>"Слике"</li>\n<li>"Други подаци корисника"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-ови"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"На тај начин нећете отказати мобилни тарифни пакет."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Да бисте обрисали музику, слике и друге податке корисника, треба да обришете "<b>"USB меморију"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Да бисте обрисали музику, слике и друге податке корисника, треба да обришете садржај "<b>"SD картице"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Избриши USB меморију"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Избриши SD картицу"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Обриши све податке из интерне USB меморије, као што су музика и фотографије."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Избриши све податке са SD картице, као што су музика или фотографије"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Избриши све податке"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Избриши све податке"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Избрисаћете све личне информације и преузете апликације. Ова радња не може да се опозове."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Све личне информације, укључујући преузете апликације и SIM картице, биће избрисане. Ова радња не може да се опозове."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Избриши све"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Није обављено враћање на почетне вредности зато што услуга брисања система није доступна."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Избрисати све податке?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Ресетовање на фабричка подешавања није доступно за овог корисника"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Брисање"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Сачекајте..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Обриши све податке"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Обриши све податке"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Избрисаћете све личне податке и преузете апликације. Ова радња не може да се опозове."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Сви лични подаци, укључујући преузете апликације и SIM картице, биће избрисани. Ова радња не може да се опозове."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Желите да обришете све податке?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Ресетовање на фабричка подешавања није доступно за овог корисника"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Брише се"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Сачекајте…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Подешавања позива"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Подешавање гласовне поште, преусмеравања позива, стављања позива на чекање, ИД-а позиваоца"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB привезивање"</string>
@@ -1697,7 +1714,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Привезивање на више од <xliff:g id="MAXCONNECTION">%1$d</xliff:g> уређаја није могуће."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Интернет веза са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ће бити прекинута."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Привезивање етернета"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Дељење интернет везе телефона преко USB етернета"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Дељење интернет везе телефона преко етернета"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Користите хотспот и привезивање да бисте обезбедили интернет другим уређајима помоћу везе за мобилне податке. Апликације могу да праве хотспотове и за дељење садржаја са уређајима у близини."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Користите хотспот и привезивање да бисте омогућили интернет на другим уређајима помоћу Wi‑Fi везе или везе за пренос података преко мобилног оператера. Апликације могу и да праве хотспотове за дељење садржаја са уређајима у близини."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Помоћ"</string>
@@ -1740,6 +1757,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth скенирање"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволите апликацијама и услугама да траже уређаје у близини у сваком тренутку, чак и када је Bluetooth искључен. Ово може да се користи, на пример, за побољшање функција и услуга заснованих на локацији."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Услуге локације за посао"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Откривање временске зоне локације"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Откривање временске зоне локације"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Омогућава да се локација уређаја користи за откривање актуелне временске зоне. Друга подешавања локације, попут Wi‑Fi скенирања, могу да утичу на прецизност откривања временске зоне."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Укључено"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Искључено"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Аутоматско откривање временске зоне је онемогућено"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Откривање временске зоне локације је онемогућено"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Откривање временске зоне локације није подржано"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Промене откривања временске зоне локације нису дозвољене"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Локац. на основу WiFi и моб. мреже"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Нека апл. користе Google-ову услугу лоцирања за брже одређивање локације. Анонимни подаци о локацији прикупљаће се и слати Google-у."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Локација се одређује помоћу WiFi-а"</string>
@@ -1803,6 +1829,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Откључавање лицем захтева лозинку"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Откључавање лицем захтева шаблон"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Откључавање лицем захтева PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Подесите лозинку за коришћење биометрије"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Подесите шаблон за коришћење биометрије"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Подесите PIN за коришћење биометрије"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Заборавили сте лозинку?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Заборавили сте шаблон?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Заборавили сте PIN?"</string>
@@ -2141,13 +2170,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Подешавања титла"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Увећање"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Област за увећање"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Омогућите увећање"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Одаберите области за увећање које желите да користите када увећавате екран"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Цео екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Део екрана"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Цео екран и део екрана"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Увећајте цео екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Увећајте део екрана"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Желите ли да пређете на дугме Приступачност?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ако увећате део екрана помоћу троструког додира, унос текста и друге радње се одлажу.\n\nЖелите ли да пређете на увеличавање помоћу дугмета Приступачност?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Пређи на дугме Приступачност"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Задржи увеличавање помоћу троструког додира"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Подешавања увећања"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Увећање помоћу троструког додира"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Увећавајте помоћу пречице"</string>
@@ -2201,11 +2233,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Дугме укључи/искључи прекида позив"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Велики показивач миша"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Уклони анимације"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Моно звук"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Комбинуј канале при пуштању аудио садржаја"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс звука"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Лево"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Десно"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Моно звук"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Комбинујте канале при пуштању аудио садржаја"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс звука"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Лево"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Десно"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Подразумевано"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунди"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунди"</string>
@@ -2235,11 +2267,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вибрирање обавештења"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вибрирање звона"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Додирне повратне информације"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Користите апликацију <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Отворите апликацију <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Користи корекцију боја"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Прикажи титл"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Само за подржане апликације"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Користите апликацију <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Отворите апликацију <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Користите корекцију боја"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Прикажите титл"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Само за подржане апликације"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Величина и стил титла"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Величина текста: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Још опција"</string>
@@ -2270,6 +2302,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Деутераномалија"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалија"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалија"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Сивило"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Црвено-зелено"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Црвено-зелено"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Плаво-жуто"</string>
@@ -2405,7 +2438,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ограничење апликација у позадини"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Дозволите апликацији да се покреће у позадини"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Апликације којима није дозвољено покретање у позадини"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Апликације у позадини не можете да ограничите"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Коришћење у позадини не можете да ограничите"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Желите ли да ограничите активности у позадини?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ако ограничите активности апликације у позадини, можда ће се понашати неочекивано."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Апл. није подешена за оптимизацију батерије, па не можете да је ограничите. \n\nЗа огр. апл. укључите оптимизацију батерије."</string>
@@ -2454,6 +2487,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Таблет сте користили дуже него обично"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Уређај сте користили дуже него обично"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Батерија може да се испразни раније него обично"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Оптимизује се ради доброг стања батерије"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Батерија је тренутно ограничена. Додирните да бисте сазнали више."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Уређај сте користили дуже него обично. Батерија може да се испразни раније од очекиваног.\n\nАпликације са највећом потрошњом батерије:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Таблет сте користили дуже него обично. Батерија може да се испразни раније од очекиваног.\n\nАпликације са највећом потрошњом батерије:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Уређај сте користили дуже него обично. Батерија може да се испразни раније од очекиваног.\n\nАпликације са највећом потрошњом батерије:"</string>
@@ -2516,6 +2551,8 @@
       <item quantity="other">%1$d апликација је ограничено</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Проблем са очитавањем мерача батерије"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Проблем са очитавањем мерача батерије. Додирните да бисте "<annotation id="url">"сазнали више"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Заустављате апликацију?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Телефон не може да управља батеријом на уобичајен начин јер му <xliff:g id="APP">%1$s</xliff:g> не дозвољава да пређе у стање спавања.\n\nДа бисте решили овај проблем, можете да зауставите ту апликацију.\n\nАко се ово дешава и даље, можда треба да деинсталирате апликацију да бисте побољшали перформансе батерије."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Таблет не може да управља батеријом на уобичајен начин јер му <xliff:g id="APP">%1$s</xliff:g> не дозвољава да пређе у стање спавања.\n\nДа бисте решили овај проблем, можете да зауставите ту апликацију.\n\nАко се ово дешава и даље, можда треба да деинсталирате апликацију да бисте побољшали перформансе батерије."</string>
@@ -2629,9 +2666,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Подесите распоред"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Продужите трајање батерије"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Искључи када се напуни"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Уштеда батерије се искључује када је телефон на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Уштеда батерије се искључује када је таблет на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Уштеда батерије се искључује када је уређај на <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Уштеда енергије се искључује када је телефон напуњен више од <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Уштеда енергије се искључује када је таблет напуњен више од <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Уштеда енергије се искључује када је уређај напуњен више од <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Укључи"</string>
@@ -2696,6 +2733,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Ресетуј"</string>
     <string name="tts_play" msgid="2945513377250757221">"Пусти"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Прилагодљиво повезивање"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Продужује трајање батерије и побољшава учинак уређаја тако што аутоматски управља мрежним везама"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Складиште акредитива"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Инсталирај сертификат"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Инсталирај сертификате из меморије"</string>
@@ -2707,9 +2746,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Кориснички акредитиви"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Прегледајте и мењајте сачуване акредитиве"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Напредна"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип меморијског простора"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Подржан хардвером"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Само софтверски"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Акредитиви нису доступни за овог корисника"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Инсталирано за VPN и апликације"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Инсталирано за WiFi"</string>
@@ -2725,6 +2761,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Не инсталирај"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Ипак инсталирај"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Сертификат није инсталиран"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Желите да дозволите да <xliff:g id="APP_NAME">%s</xliff:g> инсталира сертификате на овом уређају?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Ови сертификати ће потврдити ваш идентитет за апликације и URL-ове у наставку"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Не дозволи"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Дозволи"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Прикажи више"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Управљање сертификатима"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Нема"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Сертификати које ова апликација инсталира идентификују вас апликацијама и URL-овима у наставку"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Уклони"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Сигнал за хитне позиве"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Подешавање понашања када се успоставља хитан позив"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Резервне копије"</string>
@@ -3053,7 +3098,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Није подешено – пословни профил"</string>
     <string name="user_admin" msgid="4024553191395768119">"Администратор"</string>
     <string name="user_you" msgid="3070562015202859996">"Ви (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Надимак"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Можете да додате највише <xliff:g id="USER_COUNT">%1$d</xliff:g> корисника"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Само власник таблета може да управља корисницима."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Само власник телефона може да управља корисницима."</string>
@@ -3103,7 +3147,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Плаћање на терминалу"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Подесите апликацију за плаћање. Затим само задржите задњи део телефона поред било ког терминала са симболом за повезивање без контакта."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Важи"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Још..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Још…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Подесите подразумевану апликацију за плаћање"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Ажурирајте подразумевану апликацију за плаћање"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"На терминалу за бесконтактно плаћање користиће се <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3173,9 +3217,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Даље"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Заврши"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Сликајте"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Одаберите слику"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Изаберите слику"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM картице"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM картице"</string>
@@ -3187,7 +3228,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Увек користи ово за позиве"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Изаберите SIM картицу за податке"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Изаберите SIM за SMS-ове"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Пребацује се SIM за податке. То може да потраје до један минут..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Пребацује се SIM за податке. То може да потраје до један минут…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Позови помоћу"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Избор SIM картице"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM картица <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3331,6 +3372,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"рутина, распоред, уштеда батерије, уштеда енергије, батерија, аутоматско, проценат"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, напредно позивање, 4g позивање"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"додај језик, додајте језик"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"величина текста"</string>
     <string name="default_sound" msgid="6604374495015245195">"Подразумевани звук"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Јачина звука за звоно и обавештења је на <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Јачина звука, вибрација, Не узнемиравај"</string>
@@ -3370,12 +3412,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Звукови при укључивању"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Титл уживо"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Аутоматски титл за медије"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Ништа"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> распоред је подешен</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> распореда су подешена</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> распореда је подешено</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Ниједан}=1{1 распоред је подешен}one{# распоред је подешен}few{# распореда су подешена}other{# распореда је подешено}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не узнемиравај"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Добијајте обавештења само од важних особа и апликација"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Ограничите прекиде"</string>
@@ -3443,22 +3480,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Само приоритетни прекиди"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Укључено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Искључено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Искључено"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Укључено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Питај сваки пут"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Док не искључите"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> сат</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> сата</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> сати</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> мин"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> распоред може да се укључује аутоматски</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> распореда могу да се укључују аутоматски</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> распореда може да се укључује аутоматски</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 сат}one{# сат}few{# сата}other{# сати}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 минут}one{# минут}few{# минута}other{# минута}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Искључено}=1{Искључено/1 распоред може да се укључује аутоматски}one{Искључено/# распоред може да се укључује аутоматски}few{Искључено/# распореда могу да се укључују аутоматски}other{Искључено/# распореда може да се укључује аутоматски}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Шта може да прекине режим Не узнемиравај"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Људи"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Апликације"</string>
@@ -3491,7 +3518,7 @@
     <string name="work_sync_dialog_yes" msgid="9161415252411868574">"Замени"</string>
     <string name="work_sync_dialog_message" msgid="1328692374812258546">"Звукови са личног профила ће се користити за пословни профил"</string>
     <string name="ringtones_install_custom_sound_title" msgid="3885712267015760638">"Додати прилагођени звук?"</string>
-    <string name="ringtones_install_custom_sound_content" msgid="5844996763705884979">"Ова датотека ће бити копирана у директоријум <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
+    <string name="ringtones_install_custom_sound_content" msgid="5844996763705884979">"Ова датотека ће бити копирана у фолдер <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="26680768777533727">"Мелодије звона"</string>
     <string name="other_sound_category_preference_title" msgid="8182757473602586634">"Други звукови и вибрације"</string>
     <string name="configure_notification_settings" msgid="1492820231694314376">"Обавештења"</string>
@@ -3504,6 +3531,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Аутоматски подешава обавештења нижег приоритета на Дискретно"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Прилагодљиво рангирање обавештења"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Аутоматски рангира обавештења према релевантности"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Повратне информације о прилагодљивим обавештењима"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Означите подешавања обавештења и прикажите опцију за слање повратних информација систему"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Ресетујте важност обавештења"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Ресетујте подешавања важности која је променио корисник и омогућите помоћнику за обавештења да одређује приоритет"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Предложене радње и одговори"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Аутоматски приказује предложене радње и одговоре"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Погледајте недавна и одложена обавештења"</string>
@@ -3602,8 +3633,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Приоритетне конверзације"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Приказују се у врху одељка за конверзације и у облику облачића"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Приказују се у врху одељка за конверзације"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Остале конверзације"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Конверзације које нису приоритетне"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Конверзације које сте мењали"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Недавне конверзације"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Обриши недавно"</string>
+    <string name="clear" msgid="5092178335409471100">"Обриши"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Прикажи приоритетне конверзације у облачићима"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Приоритетне конверзације се приказују у врху клизног панела. Можете и да их подесите тако да имају облачиће и да прекидају режим Не узнемиравај."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Приоритетне и измењене конверзације се приказују овде"</string>
@@ -3705,7 +3739,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Приступ опцији Не узнемиравај"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Дозволи режим Не узнемиравај"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Ниједна инсталирана апликација није захтевала приступ опцији Не узнемиравај"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Учитавају се апликације..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Апликације се учитавају…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"На ваш захтев, Android блокира приказивање обавештења ове апликације на овом уређају"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"На ваш захтев, Android блокира приказивање ове категорије обавештења на овом уређају"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"На ваш захтев, Android блокира приказивање ове групе обавештења на овом уређају"</string>
@@ -3800,12 +3834,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Све конверзације"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Приоритетне конверзације"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Ништа"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> конверзација</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> конверзације</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> конверзација</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Ништа"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Ниједна}=1{1 конверзација}one{# конверзација}few{# конверзације}other{# конверзација}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Ко може да прекида"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Позиви"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Позиви"</string>
@@ -3814,12 +3843,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Да бисте били сигурни да ће се дозвољени позиви чути, проверите да ли је уређај подешен да звони"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Долазни позиви су блокирани за „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Можете да прилагодите подешавања и дозволите пријатељима, члановима породице или другим контактима да допру до вас."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Контакти са звездицом"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">Још <xliff:g id="NUM_PEOPLE">%d</xliff:g> особа</item>
-      <item quantity="few">Још <xliff:g id="NUM_PEOPLE">%d</xliff:g> особе</item>
-      <item quantity="other">Још <xliff:g id="NUM_PEOPLE">%d</xliff:g> особа</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Ништа"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Ниједан}=1{{contact_1}}=2{{contact_1} и {contact_2}}=3{{contact_1}, {contact_2} и {contact_3}}one{{contact_1}, {contact_2} и још #}few{{contact_1}, {contact_2} и још #}other{{contact_1}, {contact_2} и још #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Без имена)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Поруке"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"поруке"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Поруке"</string>
@@ -3828,12 +3853,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Долазне поруке су блокиране за „<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>“. Можете да прилагодите подешавања и дозволите пријатељима, члановима породице или другим контактима да допру до вас."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Доступни сте за све поруке"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Доступни сте за све позиве"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Ништа"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакт</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакта</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контаката</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Ниједан}=1{1 контакт}one{# контакт}few{# контакта}other{# контаката}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Сви"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти са звездицом"</string>
@@ -3871,24 +3891,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Сва обавештења"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Нека обавештења"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Изабрани људи и даље допиру до вас чак и ако не омогућите апликацијама да вас прекидају"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one"><xliff:g id="APP_NAMES">%s</xliff:g> могу да прекину</item>
-      <item quantity="few"><xliff:g id="APP_NAMES">%s</xliff:g> могу да прекину</item>
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> могу да прекину</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Још <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Ниједна апликација не може да прекине}=1{{app_1} може да прекине}=2{{app_1} и {app_2} могу да прекину}=3{{app_1}, {app_2} и {app_3} могу да прекину}one{Апликације {app_1}, {app_2} и још # могу да прекину}few{Апликације {app_1}, {app_2} и још # могу да прекину}other{Апликације {app_1}, {app_2} и још # могу да прекину}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Апликације"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Сва обавештења"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Нека обавештења"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Обавештења која могу да прекидају"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Омогући сва обавештења"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> могу да прекину</item>
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> могу да прекину</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> могу да прекину</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ништа не може да прекине"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Још <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ништа не може да прекине}=1{{sound_category_1} може да прекине}=2{{sound_category_1} и {sound_category_2} могу да прекину}=3{{sound_category_1}, {sound_category_2} и {sound_category_3} могу да прекину}one{Звукови {sound_category_1}, {sound_category_2} и још # могу да прекину}few{Звукови {sound_category_1}, {sound_category_2} и још # могу да прекину}other{Звукови {sound_category_1}, {sound_category_2} и још # могу да прекину}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ништа не може да прекине"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Нико не може да прекине"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Неки људи могу да прекину"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Сви људи могу да прекину"</string>
@@ -3936,8 +3946,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Укључено"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Искључено"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Качење апликација"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Качење апликација вам омогућава да задржите приказ апликације док је не откачите. Помоћу ове функције можете, на пример, да дозволите поузданом пријатељу да игра одређену игру. \n\nКада је апликација закачена, може да отвара друге апликације и лични подаци могу да буду доступни. \n\nДа бисте користили качење апликација: 	\n1.	Укључите качење апликација 	\n2.	Отворите Преглед 	\n3.	Додирните икону апликације у врху екрана, па додирните Закачи"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Качење апликација вам омогућава да задржите приказ актуелне апликације док је не откачите. Помоћу ове функције можете, на пример, да дозволите поузданом пријатељу да игра одређену игру. \n\nКада је апликација закачена, може да отвара друге апликације и лични подаци могу да буду доступни. \n\nАко желите да безбедно делите уређај са неким, боље користите профил госта. \n\nДа бисте користили качење апликација: 	\n1.	Укључите качење апликација 	\n2.	Отворите Преглед 	\n3.	Додирните икону апликације у врху екрана, па додирните Закачи"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Качење апликација вам омогућава да задржите приказ актуелне апликације док је не откачите. Помоћу ове функције можете, на пример, да дозволите поузданом пријатељу да игра одређену игру."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Када је апликација закачена, може да отвара друге апликације и лични подаци могу да буду доступни. \n\nДа бисте користили качење апликација: 	\n1.	Укључите качење апликација 	\n2.	Отворите Преглед 	\n3.	Додирните икону апликације у врху екрана, па додирните Закачи"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Када је апликација закачена, може да отвара друге апликације и лични подаци могу да буду доступни. \n\nАко желите да безбедно делите уређај са неким, боље користите профил госта. \n\nДа бисте користили качење апликација: 	\n1.	Укључите качење апликација 	\n2.	Отворите Преглед 	\n3.	Додирните икону апликације у врху екрана, па додирните Закачи"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Када је апликација закачена: \n\n•	 Могу да буду доступни лични подаци \n		(на пример, контакти и садржај имејлова) \n•	 Закачена апликација може да отвара друге апликације \n\nКористите качење апликација само са људима којима верујете."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Тражи шаблон за откључавање пре откачињања"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Тражи PIN пре откачињања"</string>
@@ -3959,6 +3970,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Поред тога што можете да откључавате уређај помоћу лица, можете додатно да га заштитите тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева унос PIN-а при покретању уређаја?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Поред тога што можете да откључавате уређај помоћу лица, можете додатно да га заштитите тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева унос шаблона при покретању уређаја?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Поред тога што можете да откључавате уређај помоћу лица, можете додатно да га заштитите тако што ћете га подесити да тражи лозинке пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева унос лозинке при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Поред тога што можете да откључавате уређај помоћу биометрије, можете додатно да га заштитите тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева унос PIN-а при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Поред тога што можете да откључавате уређај помоћу биометрије, можете додатно да га заштитите тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева шаблон при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Поред тога што можете да откључавате уређај помоћу биометрије, можете додатно да га заштитите тако што ћете га подесити да тражи лозинку пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Желите ли да се захтева унос лозинке при покретању уређаја?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Да"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Не"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Ограничено"</string>
@@ -4142,7 +4156,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB контролише:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Повезани уређај"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Овај уређај"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Мења се..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Мења се…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Промена није успела"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Пуњење уређаја"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Пуњење повезаног уређаја"</string>
@@ -4340,6 +4354,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Потрошња мобил. података"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Коришћење података апликације"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Потрошња WiFi података"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Потрошња података који не припадају мобилном оператеру"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Потрошња података на етернету"</string>
     <string name="wifi" msgid="2932584495223243842">"WiFi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Етернет"</string>
@@ -4359,6 +4374,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> ограничења</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Обрачун података код мобилног оператера се можда разликује од обрачуна уређаја."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Не обухвата податке које користе мреже мобилних оператера"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Потрошили сте <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Подеси упозорење о подацима"</string>
     <string name="data_warning" msgid="2925054658166062884">"Упозорење за потрошњу података"</string>
@@ -4396,7 +4412,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Прикажи детаље"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Уштеда података"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Неограничен приступ подацима"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Пренос података у позадини је искључен"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Позадински подаци су искључени"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Укључено"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Искључено"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Користи Уштеду података"</string>
@@ -4419,7 +4435,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ако је уређај закључан, спречи унос одговора или другог текста у обавештења"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Подразумевана провера правописа"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Изаберите проверу правописа"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Користи проверу правописа"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Користите проверу правописа"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Није изабрано"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ниједно)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4513,7 +4529,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Да би ослободио меморијски простор, менаџер меморијског простора уклања резервне копије слика и видео снимака са уређаја."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Уклоните слике и видео"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Менаџер меморијског простора"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Користи Менаџер меморијског простора"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Користите менаџер меморијског простора"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Аутоматска"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Ручна"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Ослободи простор"</string>
@@ -4551,6 +4567,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Двапут додирните телефон да бисте га проверили"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Двапут додирните таблет да бисте га проверили"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Двапут додирните уређај да бисте га проверили"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Превуците за обавештења"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Превуците надоле на доњој ивици екрана ради приказивања обавештења"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Режим једном руком"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Користи режим једном руком"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Изађи при преласку са једне апликације на другу"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Временско ограничење"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунде"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунди"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунди"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"доступност"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Да бисте проверили време, обавештења и друге информације, двапут додирните екран."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Подигните телефон да бисте га проверили"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Подигните таблет да бисте га проверили"</string>
@@ -4563,6 +4589,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Додирните да бисте проверили таблет"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Додирните да бисте проверили уређај"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Да бисте проверили време, обавештења и друге информације, додирните екран."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Хитни случајеви"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Користи хитне случајеве"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Управља <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Покрените радње у наставку тако што ћете брзо притиснути дугме за укључивање најмање 5 пута"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Пусти аларм за одбројавање"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Пустите гласан звук пре него што затражите помоћ"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Позовите да бисте добили помоћ"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Број телефона за помоћ"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Додирните да бисте променили"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Ако унесете број који није за хитне случајеве:\n • Уређај мора да буде откључан ради коришћења хитних случајева\n • Можда се нико неће јавити на позив"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Превуците прстом за обавештења"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Превуците прстом"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Да бисте проверили обавештења, превуците прстом надоле по сензору за отисак прста на задњој страни телефона."</string>
@@ -4695,6 +4731,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Максималан број видљивих скупова података"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Ресетуј на подразумеване вредности"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Опције за програмера за аутоматско попуњавање су ресетоване"</string>
+    <string name="location_category" msgid="3496759112306219062">"Локација"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Индикатор локације статусне траке"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Прикажи све локације, укључујући мрежу и повезивање"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Принудно покрени пуна GNSS мерења"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Прати све GNSS консталације и фреквенције без циклуса рада"</string>
     <string name="device_theme" msgid="5027604586494772471">"Тема уређаја"</string>
     <string name="default_theme" msgid="4815428567082263639">"Подразумевана"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Назив мреже"</string>
@@ -4711,8 +4752,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Паузирајте обавештења ради боље концентрације"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Функција није доступна"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Ова функција је искључена јер успорава телефон"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Принудно покрени пуна GNSS мерења"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Прати све GNSS консталације и фреквенције без циклуса рада"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Увек приказуј дијалог о отказивању"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Прикажи дијалог сваки пут када апликација откаже"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Изабери апликацију омогућену за ANGLE"</string>
@@ -4724,7 +4763,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Омогући за све апликације"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Изаберите управљачки програм за графику"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Подразумевано"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Управљачки програм за игре"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Управљачки програм за игре"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Управљачки програм за програмере"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системски управљачки програм за графику"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4780,7 +4819,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Укључено (звук је искључен)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Искључено"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Детаљи о мрежи"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Име уређаја виде апликације на телефону. Могу да га виде и други људи кад се повежете са Bluetooth уређајима или подесите WiFi хотспот."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Апликације на телефону могу да виде назив уређаја. И други људи могу да виде назив уређаја могу када се повежете са Bluetooth уређајима или WiFi мрежом или подесите WiFi хотспот."</string>
     <string name="devices_title" msgid="649715719278562515">"Уређаји"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Сва подешавања"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Предлози"</string>
@@ -4793,6 +4832,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Нисмо успели да пронађемо мреже. Пробајте поново."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(забрањено)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Нема SIM картице"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Нема SIM картице"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Нема"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Неопходан је SIM ради повезивања"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Неопходан је <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM ради повезивања"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Жељени режим мреже: WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Жељени режим мреже: само GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Жељени режим мреже: само WCDMA"</string>
@@ -4846,6 +4890,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобилни подаци"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Користи податке преко мобилне мреже"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон ће аутоматски прећи на овог оператера када буде у домету"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM картица није доступна"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Подешавање позива"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Жељена подешавања за SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Питај сваки пут"</string>
@@ -4907,6 +4952,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступно када је успостављена веза са оператером <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Прикажи још"</string>
     <string name="see_less" msgid="2642392725363552793">"Прикажи мање"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Желите ли да укључите услугу <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Желите ли да укључите SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Желите ли да пређете на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Желите ли да пређете на SIM картицу?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"У датом тренутку може да буде активна само једна SIM картица.\n\nПребацивањем на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> нећете отказати услугу <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"У датом тренутку може да буде активна само једна преузета SIM картица.\n\nПребацивањем на <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> нећете отказати услугу <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"У датом тренутку може да буде активна само једна SIM картица.\n\nПребацивањем нећете отказати услугу <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Пређи на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Повезује се са мрежом…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Прелази се на <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Промена мобилног оператера није успела"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Промена мобилног оператера није успела због грешке."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Желите ли да искључите услугу <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Желите ли да искључите SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM се искључује<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Онемогућавање мобилног оператера није успело"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Дошло је до грешке и онемогућавање мобилног оператера није успело."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Желите ли да користите 2 SIM картице?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"На овом уређају 2 SIM картице могу да буду активне истовремено. Да бисте наставили да користите само 1 SIM картицу, додирните „Не, хвала“."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Желите ли да рестартујете уређај?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Да бисте започели, рестартујте уређај. Затим можете да додате још једну SIM картицу."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Настави"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Рестартуј"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Не, хвала"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Пређи"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Активирање SIM картице није успело"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Уклоните SIM картицу, па је ставите поново. Ако се проблем и даље јавља, рестартујте уређај."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Пробајте поново да укључите SIM картицу. Ако се проблем и даље јавља, рестартујте уређај."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активација мреже"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Мобилни оператер <xliff:g id="CARRIER_NAME">%1$s</xliff:g> је активан"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Додирните да бисте ажурирали подешавања SIM-а"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM картица"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Желите ли да обришете овај преузети SIM?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Брисањем ове SIM картице уклонићете <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> услугу са овог уређаја.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> услуга неће бити отказана."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Обриши"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM се брише…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Брисање SIM-а није успело"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Овај SIM не може да се обрише због грешке.\n\nРестартујте уређај и пробајте поново."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Повежите се са уређајем"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Апликација <xliff:g id="APPNAME">%1$s</xliff:g> жели да користи привремену Wi‑Fi мрежу да би се повезала са уређајем"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Није пронађен ниједан уређај Проверите да ли је уређај укључен и доступан за повезивање."</string>
@@ -4980,6 +5063,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Хитни позиви"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Мобилни оператер не подржава хитне позиве помоћу функције Позивање преко WiFi-а.\nУређај аутоматски прелази на мобилну мрежу да би упутио хитан позив.\nХитни позиви су могући само у областима покривеним мобилном мрежом."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Користите Wi‑Fi за позиве да бисте побољшали квалитет"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Позиви са више SIM картица"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Дозволите позиве и SMS-ове са друге SIM картице уместо ове."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"позиви са више SIM картица"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Долазна MMS порука"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Слање MMS порука није могуће"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Додирните да бисте омогућили слање MMS порука на уређају <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> када су мобилни подаци искључени"</string>
@@ -5031,10 +5117,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дозволи прекривање садржаја екрана Подешавања"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дозолите апликацијама које могу да се приказују преко других апликација да прекривају садржај екрана Подешавања"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Медији"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Сакријте плејер када се сесија медија заврши"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Плејер вам дозвољава да наставите сесију из проширеног окна за брза подешавања."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Медија плејер у Брзим подешавањима"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Приказује медија плејер у дужем периоду да би се лако наставила репродукција"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Сакриј плејер"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Прикажи плејер"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Није доступан ниједан плејер"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Дозвољене апликације"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"медији"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth ће се укључити"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Укључено"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Искључено"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Интернет"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM картице"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Мреже које су безбедне по авион"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Пронађите мреже које су безбедне по авион и повежите се на њих"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"авион, безбедно по авион"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Позиви и SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Позивање преко WiFi-а"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Упућујте и примајте позиве преко мрежа које не припадају мобилном оператеру, на пример, WiFi-ја"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Позивање преко WiFi-ја вам омогућава да примате и упућујете позиве преко мрежа које не припадају мобилном оператеру, на пример, неких WiFi мрежа."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Позиви"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"предност"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"предност имају позиви"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"предност има SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"недоступно"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Нема SIM картице"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Подешавања"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Повежите се са јавним мрежама"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"мрежна веза, интернет, бежично, подаци, wifi, wi-fi, wi fi, мобилни телефон, мобилни, мобилни оператер, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Прикажи мреже безбедне за авион"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Искључи режим рада у авиону"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Недоступно је јер је ноћни режим укључен"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Ресетовање важности обавештења је довршено."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Апликације"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Непоуздани уређај жели да приступа порукама. Додирните за детаље."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Желите ли да дозволите приступ порукама?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Непоуздани Bluetooth уређај, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], жели да приступа порукама.\n\nРаније се нисте повезивали са уређајем [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Непоуздани уређај жели да приступа контактима и евиденцији позива. Додирните за детаље."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Желите ли да дозволите приступ контактима и евиденцији позива?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Непоуздани Bluetooth уређај, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], жели да приступа контактима и евиденцији позива. То обухвата податке о долазним и одлазним позивима.\n\nРаније се нисте повезивали са уређајем [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index ef7ebca..3214704 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Mellan"</item>
     <item msgid="6740026006576843477">"Lång"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kort"</item>
+    <item msgid="7397961711906421599">"Medel"</item>
+    <item msgid="4079132024502041928">"Lång"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standard"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Globalt"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Endast TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Globalt"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index c70e693..b79358a 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Datum och tid"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Ange datum och tid"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Ange datum, tidszon och format"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Använd nätverkets tid"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Använd nätverkets tidszon"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Ange tiden automatiskt"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Ange tidszon automatiskt"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Använd lokal standard"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-timmarsformat"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Använd 24-timmarsformat"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Visa profilinfo på den låsta skärmen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Konton"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Plats"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Använd plats"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Använd plats"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Av"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">På – <xliff:g id="COUNT_1">%1$d</xliff:g> appar har platsåtkomst</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Skärmlås, ansiktslås"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Skärmlås, fingeravtryck"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Skärmlås"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Lås upp telefonen säkert med ditt ansikte och fingeravtryck"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Du kan även logga in i appar och bekräfta betalningar"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Konfigurera upplåsning med:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Ansiktslås"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Lås upp telefonen utan problem"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingeravtryck"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Lås upp telefonen i fickan och spara tid"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Hoppa över"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Nästa"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Ansikte har lagts till"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Konfigurera ansiktslås"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Ansiktslås"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Autentisera med hjälp av ditt ansikte"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Börja"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Om ansiktslås för tillgänglighet har inaktiverats fungerar inte vissa konfigureringssteg korrekt med TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Tillbaka"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Fortsätt"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Tillgänglighetskonfiguration"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Ansiktslås i appar måste alltid bekräftas"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Radera ansiktsdata"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Konfigurera ansiktslås"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Med hjälp av ansiktslås kan du låsa upp enheten, logga in i appar och bekräfta betalningar.\n\nTänk på detta:\nOm du tittar på telefonen kan du oavsiktligt låsa upp den.\n\nAndra kan låsa upp din telefon om de håller upp den mot ditt ansikte.\n\nTelefonen kan låsas upp av någon som är mycket lik dig, till exempel ett syskon."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Med hjälp av ansiktslås kan du låsa upp enheten, logga in i appar och bekräfta betalningar.\n\nTänk på detta:\nOm du tittar på mobilen kan du oavsiktligt låsa upp den.\n\nAndra kan låsa upp din mobil om de håller upp den mot ditt ansikte, även om du inte har ögonen öppna.\n\nMobilen kan låsas upp av någon som är mycket lik dig, till exempel ett syskon."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Använd ansiktslås för att låsa upp enheten, logga in i appar och bekräfta betalningar."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Kom ihåg:\nOm du tittar på telefonen kan den oavsiktligt låsas upp.\n\nAndra kan låsa upp telefonen om de håller upp den mot ditt ansikte.\n\nTelefonen kan låsas upp av någon som är mycket lik dig, till exempel ett syskon."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Kom ihåg:\nOm du tittar på telefonen kan den oavsiktligt låsas upp.\n\nÄven om dina ögon är stängda kan andra låsa upp telefonen om de håller upp den mot ditt ansikte.\n\nTelefonen kan låsas upp av någon som är mycket lik dig, till exempel ett syskon."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Vill du radera ansiktsdata?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Ansiktsdatan som används för ansiktslåset tas bort permanent på ett säkert sätt. Efter borttagningen använder du pinkoden, det grafiska lösenordet eller lösenordet för att låsa upp telefonen, logga in i appar och bekräfta betalningar ."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Lås upp telefonen med Ansiktslås"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Använd fingeravtrycket för att låsa upp mobilen eller godkänna köp.\n\nObs! Du kan inte använda fingeravtrycket för att låsa upp den här enheten. Kontakta organisationens administratör om du vill veta mer."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Använd fingeravtrycket för att låsa upp mobilen eller godkänna köp.\n\nObs! Fingeravtrycket kan vara mindre säkert än ett starkt grafiskt lösenord eller en bra pinkod."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Avbryt"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Nej tack"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Fortsätt"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Hoppa över"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Nästa"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Om du skyddar surfplattan med ett skärmlåsalternativ kan ingen använda den om den tappas bort eller blir stulen. Du måste även använda ett skärmlåsalternativ om du vill konfigurera ansiktslås. Återgå genom att trycka på Avbryt."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Om du skyddar enheten med ett skärmlåsalternativ kan ingen använda den om den tappas bort eller blir stulen. Du måste även använda ett skärmlåsalternativ om du vill konfigurera ansiktslås. Återgå genom att trycka på Avbryt."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Om du skyddar mobilen med ett skärmlåsalternativ kan ingen använda den om den tappas bort eller blir stulen. Du måste även använda ett skärmlåsalternativ om du vill konfigurera ansiktslås. Återgå genom att trycka på Avbryt."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Om du skyddar surfplattan med ett skärmlåsalternativ kan ingen använda den om den tappas bort eller blir stulen. Du måste dessutom ha ett skärmlåsalternativ om du vill konfigurera biometri. Återgå genom att trycka på Avbryt."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Om du skyddar enheten med ett skärmlåsalternativ kan ingen använda den om den tappas bort eller blir stulen. Du måste dessutom ha ett skärmlåsalternativ om du vill konfigurera biometri. Återgå genom att trycka på Avbryt."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Om du skyddar telefonen med ett skärmlåsalternativ kan ingen använda den om den tappas bort eller blir stulen. Du måste dessutom ha ett skärmlåsalternativ om du vill konfigurera biometri. Återgå genom att trycka på Avbryt."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Vill du hoppa över pinkod?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Vill du hoppa över lösenord?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Vill du hoppa över grafiskt lösenord?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Hindra andra från att använda surfplattan utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Hindra andra från att använda enheten utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Hindra andra från att använda mobilen utan ditt medgivande genom att aktivera funktioner för enhetsskydd. Välj vilket skärmlås du vill använda."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Välj en reservmetod för skärmlås"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Välj en reservmetod för skärmlås"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Välj en reservmetod för skärmlås"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Alternativ för skärmlås"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Alternativ för skärmlås"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Skärmlås"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Ansiktslås + lösenord"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Fortsätt utan ansiktslås"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Du kan låsa upp mobilen med hjälp av ditt ansikte. Av säkerhetsskäl krävs ett alternativt skärmlås."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometri + Grafiskt lösenord"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometri + Pinkod"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometri + Lösenord"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Fortsätt utan biometri"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Du kan låsa upp telefonen med hjälp av biometri. Av säkerhetsskäl krävs ett alternativt skärmlås."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Inaktiverad p.g.a. admin., kryptering eller uppgiftslagring"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Inget"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Svep"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Får inte innehålla fler än <xliff:g id="NUMBER_0">%d</xliff:g> siffra</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Enhetsadministratören tillåter inte att en pinkod som använts nyligen används igen"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT-adminstratören har blockerat de vanligaste pinkoderna. Testa en annan pinkod."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Får inte innehålla ogiltiga tecken"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Måste innehålla minst en bokstav"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Måste innehålla minst en siffra"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Lösenordet måste innehålla minst ett tecken som inte är en siffra</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Enhetsadministratören tillåter inte att ett lösenord som använts nyligen används igen"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT-adminstratören har blockerat de vanligaste lösenorden. Testa ett annat lösenord."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"En stigande, fallande eller upprepad siffersekvens är inte tillåten"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Bekräfta"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Avbryt"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Aktivera Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Använd Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Använd Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi-inställningar"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Ställ in och hantera trådlösa åtkomstpunkter"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Anslut till <xliff:g id="SSID">%1$s</xliff:g> genom att centrera QR-koden i fönstret nedan"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Anslut till Wi-Fi genom att skanna QR-koden"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Dela Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Anslut till <xliff:g id="SSID">%1$s</xliff:g> och dela lösenordet genom att skanna QR-koden"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Anslut till <xliff:g id="SSID">%1$s</xliff:g> genom att skanna QR-koden med en annan enhet"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Anslut till <xliff:g id="SSID">%1$s</xliff:g> genom att skanna QR-koden"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Försök igen. Om problemet kvarstår kontaktar du enhetens tillverkare"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Något gick fel"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi-lösenord: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Lösenord till surfzon: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Automatisk anslutning"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Tillåt att telefonen ansluter automatiskt i närheten av det här nätverket"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Tillåt att surfplattan ansluter automatiskt i närheten av det här nätverket"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Tillåt anslutning till det här nätverket när det är inom räckvidd."</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Lägg till enhet"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Lägg till en enhet på nätverket med hjälp av en QR-kod"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR-kodens format är ogiltigt"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Använd systemcertifikat"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Tillhandahåll inte"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Validera inte"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Inget certifikat är specificerat. Anslutningen blir inte privat."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Nätverkets namn är för långt."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domän måste specificeras."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Certifikat krävs."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Anslut"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi har aktiverats"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Ansluten till <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Ansluter till <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Ansluter …"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Det gick inte att ansluta till nätverket."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Nätverket är inte inom räckvidd"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Enhetens MAC-adress"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Slumpgenererad MAC-adress"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Slumpgenererad MAC-adress (senast använd)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP-adress"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Nätverksinformation"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Nätmask"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6-adresser"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Sparade nätverk"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Prenumerationer"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Andra nätverk"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP-inställningar"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Den här användaren har inte tillgång till avancerade Wi‑Fi-inställningar"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Spara"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Ange en giltig gateway-adress."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Ange en giltig DNS-adress."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Ange en nätverksprefixlängd mellan 0 och 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (om det inte åsidosätts av Privat DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (om det inte åsidosätts av Privat DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Nätverksprefixets längd"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Appen delar innehåll. Om du vill dela internetanslutningen inaktiverar du surfzonen och aktiverar den igen."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Inget lösenord har angetts"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Namn på surfzon"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Aktiverar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Aktiverar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> …"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Andra enheter kan ansluta till <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Lösenord för surfzon"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP-band"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Höjer uppdateringsfrekvensen dynamiskt från 60 till 90 Hz för visst innehåll. Ökar batteriförbrukningen."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Tvinga fram 90 Hz i uppdateringsfrekvens"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Den högsta uppdateringsfrekvensen ger bättre tryckkänslighet och animationskvalitet. Ökar batteriförbrukningen."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Blickavkänning"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"På/Skärmen stängs inte av om du tittar på den"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Skärmen väcks vid nya aviseringar"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Visa alltid klocka och info"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Batterianvändningen ökar"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Fetstil"</string>
     <string name="title_font_size" msgid="570613010306330622">"Teckenstorlek"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Gör texten större eller mindre."</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Låsinställningar för SIM-kort"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android-version"</string>
     <string name="security_patch" msgid="4071756145347865382">"Säkerhetsuppdatering för Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modell"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modell: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modell och maskinvara"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Maskinvaruversion"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Utrustnings-ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Ta bort APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Nytt APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Spara"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Släng"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Avbryt"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Fältet Namn får inte vara tomt."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN får inte vara tomt."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Appar kan återställas"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Återställ Wi-Fi, mobildata och Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Alla nätverksinställningar återställs, till exempel \n\n"<li>"Wi‑Fi"</li>\n<li>"Mobildata"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Rensa"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Rensa nedladdade SIM-kort"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Kontakta operatören om du vill ladda ned SIM-kort som ersätter de gamla. Eventuella serviceavtal för mobilen gäller fortfarande."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Det här avbryter inte något serviceavtal för telefonen. Om du vill ladda ned SIM-kort som ersätter de gamla kontaktar du operatören."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Återställ inställningar"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Vill du återställa alla nätverksinställningar? Det går inte att ångra den här åtgärden."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Vill du återställa alla nätverksinställningar och rensa nedladdade SIM-kort? Det går inte att ångra den här åtgärden."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Nätverksinställningarna har återställts"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Det gick inte att rensa SIM-kortet"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Det går inte att rensa nedladdade SIM-kort på grund av ett fel.\n\nStarta om enheten och försök igen."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Rensa all data (återställ standardinställningar)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Rensa all data (återställ standardinställningar)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Detta raderar all data från surfplattans "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Nedladdade appar"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat:\n\n"<li>"Ditt Google-konto"</li>\n<li>"System- och appdata och inställningar"</li>\n<li>"Nedladdade appar"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Du är inloggad på följande konton:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Det finns andra användare på enheten.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musik"</li>\n<li>"Foton"</li>\n<li>"Andra användardata"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-kort"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Detta innebär inte att serviceavtalet avslutas."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du radera "<b>"USB-lagringsenheten"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du radera "<b>"SD-kortet"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Rensa all data (återställ standardinst.)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Rensa all data (återställ standardinst.)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Detta raderar all data från surfplattans "<b>"interna lagringsutrymme"</b>", bland annat följande:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"nedladdade appar"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Detta raderar all data från enhetens "<b>"interna lagringsutrymme"</b>", bland annat följande:\n\n"<li>"ditt Google-konto"</li>\n<li>"system- och appdata och inställningar"</li>\n<li>"nedladdade appar"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Du är inloggad på följande konton:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Det finns andra användare på enheten.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musik"</li>\n<li>"Foton"</li>\n<li>"Annan användardata"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-kort"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Detta innebär inte att serviceavtalet avslutas."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du rensa "<b>"USB-lagringsenheten"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Om du vill ta bort musik, bilder och annan användardata måste du rensa "<b>"SD-kortet"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Radera USB-lagring"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Radera SD-kort"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Radera alla data på den interna USB-lagringsenheten, som musik och foton."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Radera all data på SD-kortet, som musik och foton."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Radera all data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Radera all data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Alla personliga uppgifter och alla nedladdade appar raderas. Det går inte att ångra den här åtgärden."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Alla personliga uppgifter raderas, inklusive nedladdade appar och SIM-kort. Det går inte att ångra den här åtgärden."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Radera allt"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Återställningen utfördes inte eftersom tjänsten för systemrensning inte är tillgänglig."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Vill du radera all data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Den här användaren kan inte återställa till standardinställningarna"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Rensar"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Vänta ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Radera all data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Radera all data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Alla personliga uppgifter och alla nedladdade appar raderas. Det går inte att ångra den här åtgärden."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Alla personliga uppgifter raderas, inklusive nedladdade appar och SIM-kort. Det går inte att ångra den här åtgärden."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Vill du radera all data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Den här användaren kan inte återställa till standardinställningarna"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Rensar"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Vänta …"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Samtalsinställningar"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Ställ in röstbrevlåda, vidarekoppla samtal, samtal väntar, nummerpres."</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Internetdelning via USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Det går inte att dela med mer än <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheter."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kopplas från."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet-internetdelning"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Dela telefonens internetanslutning via USB-Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Dela telefonens internetanslutning via Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Med hjälp av surfzoner och internetdelning kan andra enheter anslutas till internet via mobildataanslutningen. Surfzoner kan också skapas i appar för att dela innehåll med enheter i närheten."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Med hjälp av surfzoner och internetdelning kan andra enheter anslutas till internet via den här enhetens Wi-Fi- eller mobildataanslutning. Surfzoner kan även skapas i appar för att dela innehåll med enheter i närheten."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Hjälp"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth-sökning"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Tillåt att appar och tjänster söker efter enheter i närheten när som helst, även när Bluetooth är inaktiverat. Funktionen kan till exempel användas till att förbättra platsbaserade funktioner och tjänster."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Platstjänster för jobbet"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Identifiering av tidszon utifrån plats"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Identifiering av tidszon utifrån plats"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Tillåter att enhetens plats används för att identifiera aktuell tidszon. Andra platsinställningar, till exempel Wi‑Fi-sökning, kan påverka exaktheten för identifieringen av tidszon."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"På"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Av"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Automatisk identifiering av tidzon har inaktiverats"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Identifiering av tidzon utifrån plats har inaktiverats"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Identifiering av tidzon utifrån plats stöds inte"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Det är inte tillåtet med ändringar i samband med identifiering av tidszon utifrån plats"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Plats från Wi-Fi/mobilnätverk"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Ge appar möjlighet att snabbare se var du är med Googles platstjänst. Anonym platsinformation samlas in och skickas till Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Platsen fastställs via Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Ange lösenord för ansiktslås"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Ange grafiskt lösenord för ansiktslås"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Ange pinkod för ansiktslås"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Lösenord krävs för biometri"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Grafiskt lösenord krävs för biometri"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Pinkod krävs för biometri"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Har du glömt lösenordet?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Har du glömt det grafiska lösenordet?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Har du glömt pinkoden?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Inställningar för textning"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Förstoring"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Förstoringsområde"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Magnification enable"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Välj vilket förstoringsområde du vill använda när du förstorar skärmen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Hela skärmen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Del av skärmen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Hela skärmen och en del av skärmen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Förstora hela skärmen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Förstora en del av skärmen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Vill du byta till tillgänglighetsknappen?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Om du förstorar delar av skärmen genom att trycka snabbt tre gånger uppstår en viss fördröjning när du skriver och vid andra åtgärder.\n\nVill du byta till att använda tillgänglighetsknappen för förstoring?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Byt till tillgänglighetsknappen"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Fortsätt trycka snabbt tre gånger för att förstora"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Inställningar för förstoring"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Tryck tre gånger för att förstora"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Förstora med genväg"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Avsluta samtal med av/på-knapp"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Stor muspekarikon"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Ta bort animationer"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Monoljud"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kombinera kanaler när du spelar upp ljud"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balans"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Vänster"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Höger"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Monoljud"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kombinera kanaler när du spelar upp ljud"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balans"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Vänster"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Höger"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Standard"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 sekunder"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 sekunder"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Vibration för aviseringar"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Vibration för ringsignal"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Tryckåterkoppling"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Använd <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Öppna <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Använd färgkorrigering"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Visa textning"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Endast för app som stöds"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Använd <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Öppna <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Använd färgkorrigering"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Visa textning"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Endast för app som stöds"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Textstorlek och stil"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Textstorlek <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Fler alternativ"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranopi"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanopi"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanopi"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Gråskala"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Röd–grön"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Röd–grön"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Gul–blå"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Bakgrundsbegränsning"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Tillåt att appen körs i bakgrunden"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Appen får inte köras i bakgrunden"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Bakgrundsanvändningen kan inte begränsas"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Bakgrundsanvändningen kan inte begränsas"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Vill du begränsa bakgrundsaktivitet?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Om du begränsar bakgrundaktiviteten för en app kanske den inte fungerar som den ska"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Appen kan inte begränsas eftersom batterioptimering inte har angetts.\n\nAktivera batterioptimering för att begränsa appen."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Surfplattan används mer än vanligt"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Enheten används mer än vanligt"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Batteriet kan ta slut snabbare än vanligt"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Optimerar batteriets livslängd"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batteriet är tillfälligt begränsat. Tryck för att läsa mer."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Mobilen har använts mer än vanligt. Batteriet kan ta slut snabbare än beräknat.\n\nDe mest krävande apparna efter batteriförbrukning:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Surfplattan har använts mer än vanligt. Batteriet kan ta slut snabbare än beräknat.\n\nDe mest krävande apparna efter batteriförbrukning:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Enheten har använts mer än vanligt. Batteriet kan ta slut snabbare än beräknat.\n\nDe mest krävande apparna efter batteriförbrukning:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d app begränsas</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Batteriindikatorn visas inte."</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Batteriindikatorn visas inte. Tryck för att "<annotation id="url">"läsa mer"</annotation>"."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Vill du stoppa appen?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Batterihanteringen på mobilen fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> håller mobilen aktiv.\n\nDu kan testa att lösa problemet genom att stänga av appen.\n\nOm problemet kvarstår kan det hända att du måste avinstallera appen för att förbättra batteritiden."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Batterihanteringen på surfplattan fungerar inte som den ska eftersom <xliff:g id="APP">%1$s</xliff:g> håller surfplattan aktiv.\n\nDu kan testa att lösa problemet genom att stänga av appen.\n\nOm problemet kvarstår kan det hända att du måste avinstallera appen för att förbättra batteritiden."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Ställ in ett schema"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Utöka batteritiden"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Stäng av när enheten är laddad"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Batterisparläget inaktiveras när telefonen når <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Batterisparläget inaktiveras när surfplattan når <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Batterisparläget inaktiveras när enheten når <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Batterisparläget inaktiveras när telefonen laddas över <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Batterisparläget inaktiveras när surfplattan laddas över <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Batterisparläget inaktiveras när enheten laddas över <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aktivera"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Återställ"</string>
     <string name="tts_play" msgid="2945513377250757221">"Spela upp"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive Connectivity"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Får batteriet att räcka längre och ger enheten bättre prestanda genom att nätverksanslutningar hanteras automatiskt"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Uppgiftslagring"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Installera ett certifikat"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Installera certifikat från lagringsenhet"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Användaruppgifter"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Visa och hantera lagrade användaruppgifter"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Avancerat"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Lagringstyp"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Maskinvarustöd"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Endast programvara"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Användaruppgifter är inte tillgängliga för den här användaren"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Har installerats för VPN och appar"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Har installerats för Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Installera inte"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Installera ändå"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Certifikatet installerades inte"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Vill du tillåta att <xliff:g id="APP_NAME">%s</xliff:g> installerar certifikat på den här enheten?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Du identifieras med de här certifikaten för apparna och webbadresserna nedan"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Tillåt inte"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Tillåt"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Visa mer"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App för certifikathantering"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Inga"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Certifikat som installeras av denna app låter apparna och webbadresserna nedan identifiera dig"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Ta bort"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Ringsignal vid nödsituationer"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Ange beteende vid nödsamtal"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Säkerhetskopiering"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Inte konfigurerad – jobbprofil"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administratör"</string>
     <string name="user_you" msgid="3070562015202859996">"Du (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Smeknamn"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Du kan lägga till upp till <xliff:g id="USER_COUNT">%1$d</xliff:g> användare"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Det är bara surfplattans ägare som kan hantera användare."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Det är bara mobilens ägare som kan hantera användare."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Betala vid en kassaterminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Konfigurera en betalningsapp. Sedan behöver du bara hålla telefonens baksida mot terminaler med symbolen för kontaktlös överföring."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Mer ..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Mer …"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Ställ in standardapp för betalning"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Uppdatera standardapp för betalning"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Vid en kontaktlös terminal betalar du med <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Föregående"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Nästa"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Slutför"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Ta ett foto"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Välj en bild"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Välj en bild"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-kort"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-kort"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Använd alltid för samtal"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Välj ett SIM-kort för data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Välj ett SIM-kort för sms"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Byter data-SIM-kort. Det kan ta upp till en minut ..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Byter SIM-kort för data. Det kan ta upp till en minut …"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Ring med"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Välj ett SIM-kort"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-kort <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutin, schema, batterisparläge, energisparläge, batteri, automatiskt, procent"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, avancerade samtal, 4g-samtal"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"lägg till språk, lägg till ett språk"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"textstorlek"</string>
     <string name="default_sound" msgid="6604374495015245195">"Standardsignal"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Volymen för samtal och aviseringar är inställd på <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volym, vibrera, stör ej"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ljud vid uppstart"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Live Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Texta media automatiskt"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Inga"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> scheman har ställts in</item>
-      <item quantity="one">1 schema har ställts in</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Inga}=1{1 schema har ställts in}other{# scheman har ställts in}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Stör ej"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Få bara aviseringar från viktiga personer och appar"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Begränsa antalet avbrott"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Endast prioriterade"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"På/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Av/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Av"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"På"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Fråga varje gång"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Tills du stänger av"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> timmar</item>
-      <item quantity="one">1 timme</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> minuter"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> scheman kan aktiveras automatiskt</item>
-      <item quantity="one">1 schema kan aktiveras automatiskt</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 timme}other{# timmar}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minut}other{# minuter}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Av}=1{Av / 1 schema kan aktiveras automatiskt}other{Av / # scheman kan aktiveras automatiskt}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Vad får avbryta Stör ej"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Personer"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Appar"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Ställ automatiskt in aviseringar av lägre prioritet på Utan avbrott"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Smart rankning av aviseringar"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Rangordna automatiskt aviseringar efter relevans"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback om anpassad avisering"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Ange justeringar av aviseringar och visa möjligheten att ge feedback till systemet"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Återställ aviseringarnas relevans"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Återställ relevansinställningarna som användaren har ändrat och tillåt att aviseringsassistenten prioriterar"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Föreslagna åtgärder och svar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Visa föreslagna åtgärder och svar automatiskt"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Visa de senaste aviseringarna och uppskjutna aviseringar"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Prioriterade konversationer"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Visa högst upp bland konversationerna och som flytande bubblor"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Visa högst upp bland konversationerna"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Övriga konversationer"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Icke-prioriterade konversationer"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Konversationer som du har ändrat"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Aktuella konversationer"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Rensa de senaste"</string>
+    <string name="clear" msgid="5092178335409471100">"Rensa"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Visa prioriterade konversationer i bubblor"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Prioriterade konversationer visas högst upp i aviseringspanelen. Du kan även ställa in så att de visas i bubblor och kringgår Stör ej."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Prioriterade och ändrade konversationer visas här"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Stör ej-åtkomst"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Tillåt Stör ej"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Inga installerade appar har begärt Stör ej-åtkomst"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Läser in appar ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Läser in appar …"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"På din begäran blockeras appens aviseringar av Android och visas inte på enheten"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"På din begäran blockeras denna aviseringskategori av Android och visas inte på enheten"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"På din begäran blockeras denna aviseringsgrupp av Android och visas inte på enheten"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Alla konversationer"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Prioriterade konversationer"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Inga"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> konversationer</item>
-      <item quantity="one">1 konversation</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Inga"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Inga}=1{1 konversation}other{# konversationer}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Vem får störa dig"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Samtal"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Samtal"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Kontrollera att enheten är inställd på att ringa, så att du vet att tillåtna samtal hörs"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Inkommande samtal blockeras med <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Du kan anpassa inställningarna så att vänner, familj eller andra kontakter ändå kan nå dig."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Stjärnmärkta kontakter"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> till</item>
-      <item quantity="one">1 till</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Inga"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Inga}=1{{contact_1}}=2{{contact_1} och {contact_2}}=3{{contact_1}, {contact_2} och {contact_3}}other{{contact_1}, {contact_2} och # andra}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Inget namn)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Meddelanden"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"meddelanden"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Meddelanden"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Inkommande meddelanden blockeras med <xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>. Du kan anpassa inställningarna så att vänner, familj eller andra kontakter ändå kan nå dig."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Alla meddelanden kan nå dig"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Alla samtal kan nå dig"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Inga"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kontakter</item>
-      <item quantity="one">1 kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Inga}=1{1 kontakt}other{# kontakter}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Alla"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontakter"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Stjärnmärkta kontakter"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Alla aviseringar"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Vissa aviseringar"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Utvalda personer kan fortfarande nå dig, även om du inte tillåter att appar stör"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> får avbryta</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> får avbryta</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> till"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Inga appar får avbryta}=1{{app_1} får avbryta}=2{{app_1} och {app_2} får avbryta}=3{{app_1}, {app_2} och {app_3} får avbryta}other{{app_1}, {app_2} och # till får avbryta}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Appar"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Alla aviseringar"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Vissa aviseringar"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Aviseringar som får störa dig"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Tillåt alla aviseringar"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> får avbryta</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> får avbryta</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Inget får avbryta"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> till"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Inget får avbryta}=1{{sound_category_1} får avbryta}=2{{sound_category_1} och {sound_category_2} får avbryta}=3{{sound_category_1}, {sound_category_2} och {sound_category_3} får avbryta}other{{sound_category_1}, {sound_category_2} och # till får avbryta}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Inget får avbryta"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ingen får avbryta"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Vissa får avbryta"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Alla får avbryta"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"På"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Av"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Fästa appar"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Genom att fästa en app kan du se till att den alltid är överst tills du lossar den igen. Du kan använda funktionen t.ex. om du vill låta någon du litar på prova på ett spel. \n\nDet kan gå att öppna andra appar med appen du har fäst och personliga uppgifter kan bli tillgängliga. \n\nSå här fäster du appar: 	\n1.	Aktivera Fästa appar 	\n2.	Öppna översikten 	\n3.	Tryck på appikonen högst upp på skärmen och sedan på Fäst"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Genom att fästa en app kan du se till att den alltid är överst tills du lossar den igen. Du kan använda funktionen t.ex. om du vill låta någon du litar på prova på ett spel. \n\nDet kan gå att öppna andra appar med appen du har fäst och personliga uppgifter kan bli tillgängliga. \n\nOm du vill dela enheten med någon på ett säkert sätt kan du använda en gästanvändare i stället. \n\nSå här fäster du appar: 	\n1.	Aktivera Fästa appar 	\n2.	Öppna översikten 	\n3.	Tryck på appikonen högst upp på skärmen och sedan på Fäst"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Genom att fästa en app kan du se till att den alltid är överst tills du lossar den igen. Du kan använda funktionen t.ex. om du vill låta någon du litar på prova på ett spel."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Det kan gå att öppna andra appar med appen du har fäst och personliga uppgifter kan bli tillgängliga. \n\nSå här fäster du appar: 	\n1.	Aktivera Fästa appar 	\n2.	Öppna översikten 	\n3.	Tryck på appikonen högst upp på skärmen och sedan på Fäst"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Det kan gå att öppna andra appar med appen du har fäst och personliga uppgifter kan bli tillgängliga. \n\nOm du vill dela enheten med någon på ett säkert sätt kan du använda en gästanvändare i stället. \n\nSå här fäster du appar: 	\n1.	Aktivera Fästa appar 	\n2.	Öppna översikten 	\n3.	Tryck på appikonen högst upp på skärmen och sedan på Fäst"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Följande gäller när du fäster appar: \n\n•	 Personliga uppgifter kan bli tillgängliga\n		(t.ex. kontakter och innehåll i e-post) \n•	 Det kan gå att öppna andra appar med appen som har fästs \n\nLåt bara personer du litar på använda fästa appar."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Kräv grafiskt lösenordet innan skärmen lossas"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Be om pinkod innan appen lossas"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Förutom att låsa upp enheten med ditt ansikte kan du skydda enheten ytterligare genom att kräva att pinkoden måste anges när den startas. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startats.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att pinkoden ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Förutom att låsa upp enheten med ditt ansikte kan du skydda enheten ytterligare genom att kräva att det grafiska lösenordet måste anges när den startas. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startats.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att det grafiska lösenordet ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Förutom att låsa upp enheten med ditt ansikte kan du skydda enheten ytterligare genom att kräva att lösenordet måste anges när den startas. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startats.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att lösenordet ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Förutom att låsa upp enheten med biometri kan du skydda den med pinkoden som måste anges vid start. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att pinkoden ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Förutom att låsa upp enheten med biometri kan du skydda den med ett grafiskt lösenord som måste anges vid start. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att det grafiska lösenordet ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Förutom att låsa upp enheten med biometri kan du skydda den med ett lösenord som måste anges vid start. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att lösenordet ska krävas när enheten startar?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ja"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Nej"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Begränsad"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB styrs av"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Ansluten enhet"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Den här enheten"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Byter …"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Byter …"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Det gick inte att byta"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Enheten laddas"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Laddning av ansluten enhet"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Användning av mobildata"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Appars dataanvändning"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Dataanvändning via Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Dataanvändning via nätverk som inte tillhör operatörer"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Användning av ethernetdata"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 begränsning</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatörens dataredovisning kan skilja sig från enhetens dataredovisning."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Data som används via operatörer utesluts"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> har använts"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Ställ in en datavarning"</string>
     <string name="data_warning" msgid="2925054658166062884">"Datavarning"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Visa detaljer"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Databesparing"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Obegränsad data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Bakgrundsdata har inaktiverats"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Bakgrundsdata har inaktiverats"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Aktiverat"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Inaktiverat"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Använd databesparing"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Gör aviseringar skrivskyddade när enheten är låst så att det inte går att skriva svar eller liknande"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Standardstavningskontroll"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Välj stavningskontroll"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Använd stavningskontroll"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Använd stavningskontroll"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Ingen har valts"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ingen)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Lagringshanteraren tar bort säkerhetskopior av foton och videor från enheten för att frigöra lagringsutrymme."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Ta bort foton och videor"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Lagringshanteraren"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Använd lagringshanteraren"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Använd lagringshanteraren"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Automatiskt"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuellt"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Frigör utrymme nu"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Tryck snabbt två gånger för att kolla telefonen"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tryck snabbt två gånger för att kolla surfplattan"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Tryck snabbt två gånger för att kolla enheten"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Svep för aviseringar"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Svep nedåt på skärmens nederkant för att visa aviseringarna"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Enhandsläge"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Använd enhandsläge"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Avsluta när du byter app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Tidsgräns"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 sekunder"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 sekunder"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 sekunder"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"nåbarhet"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Visa tid, aviseringar och annan information genom att trycka snabbt två gånger på skärmen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Lyft för att kolla telefonen"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Plocka upp för att kolla surfplattan"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tryck för att kolla surfplattan"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Tryck för att kolla enheten"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Visa tid, aviseringar och annan information genom att trycka på skärmen."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS för nödsituationer"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Använd SOS för nödsituationer"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Hanteras av <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Starta åtgärderna nedan genom att trycka på strömbrytaren snabbt minst fem gånger"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Spela nedräkningsalarm"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Spela upp ett högt ljud före nödsamtal"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Ring och be om hjälp"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Nummer att ringa för att be om hjälp"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g> – tryck om du vill ändra"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Om du ringer ett vanligt samtal:\n • Enheten måste vara olåst för att använda SOS för nödsituationer\n • Samtalet kanske inte besvaras"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Svep över fingeravtryckssensorn för aviseringar"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Svep över fingeravtryckssensorn"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Visa aviseringar genom att svepa nedåt på fingeravtryckssensorn på baksidan av telefonen."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Högsta antal synliga datamängder"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Återställ standardvärdena"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Utvecklaralternativen för Autofyll har återställts"</string>
+    <string name="location_category" msgid="3496759112306219062">"Plats"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indikator i statusfältet för platsanvändning"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Visa alltid indikatorn för platsanvändning, även för nätverk och anslutningar"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Framtvinga fullständiga GNSS-mätningar"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Spåra alla konstellationer och frekvenser för GNSS utan arbetscykel"</string>
     <string name="device_theme" msgid="5027604586494772471">"Enhetstema"</string>
     <string name="default_theme" msgid="4815428567082263639">"Standard"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Nätverksnamn"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Pausa aviseringar så du kan behålla ditt fokus"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Funktionen är inte tillgänglig"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Denna funktion har inaktiverats eftersom den gör mobilen långsammare"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Framtvinga fullständiga GNSS-mätningar"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Spåra alla konstellationer och frekvenser för GNSS utan arbetscykel"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Visa alltid en dialogruta vid krascher"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Visa alltid en dialogruta när en app kraschar"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Välj en ANGLE-kompatibel app"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Aktivera för alla appar"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Välj grafikdrivrutin"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Standard"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System för grafikdrivrutin"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"På (ljud av)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Av"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Nätverksinformation"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Enhetens namn är synligt för appar i mobilen. Det kan också vara synligt för andra personer när du ansluter till Bluetooth-enheter eller om du skapar en Wi-Fi-surfzon."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Enhetens namn är synligt för appar i mobilen. Det kan också vara synligt för andra personer när du ansluter till Bluetooth-enheter eller ett Wi-Fi-nätverk, eller om du skapar en Wi-Fi-surfzon."</string>
     <string name="devices_title" msgid="649715719278562515">"Enheter"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Alla inställningar"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Förslag"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Det gick inte att hitta nätverk. Försök igen."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(förbjudet)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Inget SIM-kort"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Inget SIM-kort"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Inget"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"SIM-kort krävs för att ansluta"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"SIM-kort från <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> krävs för att ansluta"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Föredraget nätverksläge: Föredrar WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Föredraget nätverksläge: Endast GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Föredraget nätverksläge: Endast WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobildata"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Få åtkomst till data via mobilt nätverk"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Mobilen byter automatiskt till den här operatören när den är inom räckvidd"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Inget SIM-kort tillgängligt"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Angiven för samtal"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Angiven för sms"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Fråga varje gång"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Inte tillgänglig vid anslutning till <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Visa mer"</string>
     <string name="see_less" msgid="2642392725363552793">"Visa färre"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vill du aktivera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vill du aktivera SIM-kortet?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Vill du byta till <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Vill du byta till SIM-kort?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Du kan bara ha ett aktivt SIM-kort åt gången.\n\nOm du byter till <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> avslutas inte tjänsten hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Du kan bara ha ett aktivt SIM-kort åt gången.\n\nOm du byter till <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> avslutas inte tjänsten hos <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Du kan bara ha ett aktivt SIM-kort åt gången.\n\nTjänsten hos <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> avslutas inte för att du byter SIM-kort."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Byt till <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Ansluter till nätverket …"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Byter till <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Det gick inte att byta operatör"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Det gick inte att byta operatör på grund av ett fel."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vill du inaktivera <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vill du inaktivera SIM-kortet?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM-kortet inaktiveras <xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Det gick inte att inaktivera operatören"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Något gick fel och operatören gick inte att inaktivera."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Vill du använda två SIM-kort?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Du kan ha två SIM-kort aktiverade samtidigt på enheten. Om du vill fortsätta att använda ett SIM-kort åt gången trycker du på Nej tack."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Vill du starta om enheten?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Starta först om enheten. Sedan kan du lägga till ett SIM-kort."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Fortsätt"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Starta om"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Nej tack"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Byt"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Det gick inte att aktivera SIM-kortet"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Ta ut SIM-kortet och sätt i det igen. Starta om enheten om problemet kvarstår."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Testa att aktivera SIM-kortet igen. Starta om enheten om problemet kvarstår."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Nätverksaktivering"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> är aktiv"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Tryck för att uppdatera SIM-inställningarna"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-kort"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Vill du rensa det här nedladdade SIM-kortet?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Om du rensar det här SIM-kortet tas tjänsten hos <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> bort från enheten.\n\nTjänsten hos <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> avslutas inte."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Rensa"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Rensar SIM-kort …"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Det gick inte att rensa SIM-kortet"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Det gick inte att rensa SIM-kortet på grund av ett fel.\n\nStarta om enheten och försök igen."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Anslut till enhet"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Appen <xliff:g id="APPNAME">%1$s</xliff:g> vill ansluta till enheten via ett tillfälligt Wi-Fi-nätverk"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Inga enheter hittades. Kontrollera att enheterna är på och går att ansluta till."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Nödsamtal"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Nödsamtal via Wi-Fi stöds inte av din operatör.\nEnheten byter automatiskt till ett mobilnätverk vid nödsamtal.\nNödsamtal fungerar endast i områden där mobilnätverket har täckning."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Använd Wi-Fi vid samtal så att kvaliteten blir bättre"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Samtal mellan SIM-kort"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Tillåt att ett annat SIM-kort ringer och skickar sms via det här SIM-kortet."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"samtal mellan SIM-kort"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Inkommande mms"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Det går inte att skicka mms"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Tryck för att tillåta mms via <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> när mobildata är inaktiverat"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Tillåt skärmöverlagring på Inställningar"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Tillåt att appar som får visas ovanpå andra appar överlagras på skärmar med inställningar"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Dölj spelare när mediesessionen har avslutats"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Med spelaren kan du återuppta en session från den utökade panelen Snabbinställningar."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Mediespelare i Snabbinställningar"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Visa mediespelaren under en längre tid så att du lättare kan återuppta uppspelningen"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Dölj spelare"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Visa spelare"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Det finns inga tillgängliga spelare"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Tillåtna appar"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth aktiveras"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"På"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Av"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-kort"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Nätverk som är flygplanssäkra"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Hitta och ansluta till nätverk som är flygplanssäkra"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"flygplan, flygplanssäker"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Samtal och sms"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi-samtal"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Ringa och ta emot samtal via nätverk som inte tillhör operatörer, till exempel Wi‑Fi-nätverk"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Med Wi-Fi-samtal kan du ringa och ta emot samtal via nätverk som inte tillhör operatörer, till exempel vissa Wi‑Fi-nätverk."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Samtal"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"Sms"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"föredras"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"samtal föredras"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"sms föredras"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"otillgängligt"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Inget SIM-kort"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Inställningar"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Anslut till offentliga nätverk"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"nätverksanslutning, internet, trådlös, data, wifi, wi-fi, wi fi, mobil, telefon, mobiloperatör, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Visa nätverk som är flygplanssäkra"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Inaktivera flygplansläge"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Inte tillgängligt eftersom sovläget är på"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Aviseringarnas relevans har återställts."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Appar"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"En enhet som inte är betrodd vill få åtkomst till dina meddelanden. Tryck här för mer information."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vill du tillåta åtkomst till meddelanden?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"En Bluetooth-enhet som inte är betrodd, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vill få åtkomst till dina meddelanden.\n\nDu har inte anslutit till [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] tidigare."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"En enhet som inte är betrodd vill få åtkomst till dina kontakter och samtalshistoriken. Tryck här för mer information."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vill du tillåta åtkomst till kontakter och samtalshistorik?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"En Bluetooth-enhet som inte är betrodd, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], vill få åtkomst till dina kontakter och samtalshistoriken. Detta inkluderar data om inkommande och utgående samtal.\n\nDu har inte anslutit till [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] tidigare."</string>
 </resources>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 53006c7..073afc1 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Wastani"</item>
     <item msgid="6740026006576843477">"Muda mrefu"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Mfupi"</item>
+    <item msgid="7397961711906421599">"Wastani"</item>
+    <item msgid="4079132024502041928">"Mrefu"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Chaguomsingi"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Jumla"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA pekee"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Mitandao Yote"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index a4fa4d3..3813459 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Tarehe na saa"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Weka tarehe na saa"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Weka tarehe, saa, saa za eneo na fomati"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Tumia saa ya mtandao"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Tumia saa za eneo kutoka kwenye mtandao"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Weka saa kiotomatiki"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Weka saa za eneo kiotomatiki"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Tumia chaguomsingi la eneo"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Mfumo wa saa 24"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Tumia mpangilio wa saa 24"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Onyesha maelezo ya wasifu kwenye skrini iliyofungwa"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Akaunti"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Kutambua Mahali"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Tumia mahali"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Tumia kipengele cha mahali"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Umezima"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Imewashwa - programu <xliff:g id="COUNT_1">%1$d</xliff:g> zinaweza kufikia maelezo ya mahali</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Kufunga skrini, kufungua kwa uso"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Kufunga skrini, alama ya kidole"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Kufunga skrini"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Fungua simu kwa usalama ukitumia alama ya kidole na uso wako"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Unaweza pia kuingia katika programu na uthibitishe malipo"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Weka mipangilio ya kufungua ukitumia:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Kufungua kwa uso"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Fanya iwe rahisi kufungua simu yako"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Alama ya kidole"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Okoa muda ukifungua simu ikiwa mfukoni"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Ruka"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Endelea"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Utambuzi wa uso umeongezwa"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Weka mipangilio ya kufungua kwa uso"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Kufungua kwa uso"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Tumia uso wako kuthibitisha"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Anza"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Ikiwa kipengele cha ufikivu cha kufungua kwa uso kimezimwa, huenda baadhi ya hatua za kuweka mipangilio zisifanye kazi vizuri pamoja na TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Rudi nyuma"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Endelea kuweka mipangilio"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Tumia mipangilio ya ufikivu"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Iombe uthibitishaji kila wakati unapofungua kwa uso katika programu"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Futa data ya uso"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Weka mipangilio ya kufungua kwa uso"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Tumia kipengele cha kufungua kwa uso ili ufungue kifaa chako, uingie katika akaunti za programu na uthibitishe malipo.\n\nKumbuka:\n Kuangalia simu kunaweza kuifungua hata ikiwa huna lengo la kufanya hivyo.\n\n Simu yako inaweza kufunguliwa na mtu mwingine akiiweka mbele ya uso wako.\n\nSimu yako inaweza kufunguliwa na mtu mnayefanana, kama vile ndugu mnayefanana sana."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Tumia kipengele cha kufungua kwa uso ili ufungue kifaa chako, uingie katika akaunti za programu na uthibitishe malipo.\n\nKumbuka:\nKuangalia simu kunaweza kuifungua wakati hujakusudia.\n\nSimu yako inaweza kufunguliwa na mtu mwingine akiiweka mbele ya uso wako, hata ukiwa umefunga macho.\n\nSimu yako inaweza kufunguliwa na mtu mnayefanana, kama vile ndugu mnayefanana sana."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Tumia kipengele cha kufungua kwa uso ili ufungue kifaa chako, uingie katika akaunti za programu na uthibitishe malipo."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Kumbuka:\nKuangalia simu kunaweza kuifungua wakati hujakusudia.\n\nSimu yako inaweza kufunguliwa na mtu mwingine akiiweka mbele ya uso wako.\n\nSimu yako inaweza kufunguliwa na mtu mnayefanana, kama vile ndugu mnayefanana sana."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Kumbuka:\nKuangalia simu kunaweza kuifungua wakati hujakusudia.\n\nSimu yako inaweza kufunguliwa na mtu mwingine akiiweka mbele ya uso wako, hata ukiwa umefunga macho.\n\nSimu yako inaweza kufunguliwa na mtu mnayefanana, kama vile ndugu mnayefanana sana."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Ungependa kufuta data ya uso?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Data ya uso ya kipengele cha kufungua kwa uso itafutwa kabisa kwa njia salama. Ikishafutwa, utahitaji PIN, mchoro au nenosiri lako ili kufungua simu yako, kuingia kwenye akaunti za programu na kuthibitisha malipo."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Tumia kipengele cha kufungua kwa uso ili ufungue simu yako"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Tumia alama ya kidole chako kufungua simu yako au kuidhinisha ununuzi.\n\nKumbuka: Huwezi kutumia alama ya kidole chako kufungua kifaa hiki. Kwa maelezo zaidi, wasiliana na msimamizi wa shirika lako."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Tumia alama ya kidole chako kufungua simu yako au kuidhinisha ununuzi.\n\nKumbuka: Usalama wa alama ya kidole chako unaweza kuwa wa chini ukilinganishwa na wa mchoro au PIN thabiti."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Ghairi"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Hapana"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Endelea"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Ruka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Endelea"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Kwa kulinda kompyuta yako kibao ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kuitumia ikiwa itapotea au kuibwa. Pia unahitaji mbinu ya kufunga skrini ili uweke mipangilio ya kufungua kwa uso. Ili urudi nyuma, gusa Ghairi."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Kwa kulinda kifaa chako ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kukitumia ikiwa kitapotea au kuibwa. Pia unahitaji mbinu ya kufunga skrini ili uweke mipangilio ya kufungua kwa uso. Ili urudi nyuma, gusa Ghairi."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Kwa kulinda simu yako ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kuitumia ikiwa itapotea au kuibwa. Pia unahitaji mbinu ya kufunga skrini ili uweke mipangilio ya kufungua kwa uso. Ili urudi nyuma, gusa Ghairi."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Kwa kulinda kompyuta yako kibao ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kuitumia ikiwa itapotea au kuibwa. Unahitaji pia chaguo la kufunga skrini ili uweke mipangilio ya bayometriki. Ili urudi nyuma, gusa Ghairi."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Kwa kulinda kifaa chako ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kukitumia ikiwa kitapotea au kuibwa. Unahitaji pia chaguo la kufunga skrini ili uweke mipangilio ya bayometriki. Ili urudi nyuma, gusa Ghairi."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Kwa kulinda simu yako ukitumia chaguo la kufunga skrini, hakuna mtu yeyote atakayeweza kuitumia ikiwa itapotea au kuibwa. Unahitaji pia chaguo la kufunga skrini ili uweke mipangilio ya bayometriki. Ili urudi nyuma, gusa Ghairi."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Ungependa kuruka Kuweka PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Ungependa kuruka Kuweka Nenosiri?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Ungependa kuruka Kuweka Mchoro?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Wazuie watu wengine kutumia kompyuta kibao hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Wazuie watu wengine kutumia kifaa hiki bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Wazuie watu wengine kutumia simu hii bila ruhusa yako kwa kuwasha vipengele vya ulinzi wa kifaa. Chagua skrini iliyofungwa unayotaka kutumia."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Chagua njia mbadala ya kufunga skrini yako"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Chagua njia mbadala ya kufunga skrini yako"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Chagua njia mbadala ya kufunga skrini yako"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Chaguo za kufunga skrini"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Chaguo za kufunga skrini"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Kufunga skrini"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Kufungua kwa uso + Nenosiri"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Endelea bila kipengele cha kufungua kwa uso"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Unaweza kufungua simu yako kwa kutumia uso wako. Kwa ajili ya usalama, chaguo hili linahitaji mbinu mbadala ya kufunga skrini."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Bayometriki + Mchoro"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Bayometriki + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Bayometriki + Nenosiri"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Endelea bila kutumia bayometriki"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Unaweza kufungua simu yako ukitumia bayometriki zako. Kwa ajili ya usalama, chaguo hili linahitaji mbinu mbadala ya kufunga skrini."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Imezimwa na msimamizi, sera ya usimbaji fiche, au hifadhi ya hati"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Hamna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Telezesha kidole"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Lazima iwe na chini ya tarakimu <xliff:g id="NUMBER_0">%d</xliff:g></item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Msimamizi wa kifaa haruhusu utumie PIN uliyotumia hivi majuzi"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"PIN zinazotumika zaidi zimezuiwa na msimamizi wako wa Tehama. Jaribu PIN tofauti."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Hali hii haiwezi kujumuisha kibambo kisichoruhusiwa"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Ni lazima liwe na angalau herufi moja"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Ni lazima liwe na angalau tarakimu moja"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Ni lazima liwe na angalau herufi moja ambayo si tarakimu</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Msimamizi wa kifaa haruhusu kutumia nenosiri ulilotumia hivi majuzi"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Manenosiri yanayotumika sana yamezuiwa na msimamizi wako wa Tehama. Jaribu nenosiri tofauti."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Haturuhusi mpangilio wa kupanda, kushuka au kujirudia kwa tarakimu"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Thibitisha"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Ghairi"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Washa Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Tumia Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Tumia Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Mipangilio ya Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Weka na udhibiti vituo vya kufikia mitandao-hewa"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Weka katikati msimbo wa QR ulio hapa chini ili uunganishe kwenye “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Unganisha kwenye Wi-Fi kwa kuchanganua msimbo wa QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Shiriki Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Changanua msimbo huu wa QR ili uunganishe kwenye “<xliff:g id="SSID">%1$s</xliff:g>” na ushiriki nenosiri"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Changanua msimbo huu wa QR kwa kutumia kifaa kingine ili uunganishe “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Changanua msimbo huu wa QR ili uunganishe kwenye “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Jaribu tena. Tatizo hili likiendelea, wasiliana na kampuni iliyotengeneza kifaa"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Hitilafu fulani imetokea"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Nenosiri la Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Nenosiri la mtandaopepe: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Unganisha kiotomatiki"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Ruhusu simu iunganishe kiotomatiki ikiwa karibu na mtandao huu"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Ruhusu kompyuta kibao iunganishe kiotomatiki karibu na mtandao huu"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Ruhusu iunganishe kwenye mtandao huu unapokuwa karibu"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Ongeza kifaa"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Tumia msimbo wa QR ili uongeze kifaa kwenye mtandao huu"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Msimbo wa QR si muundo sahihi"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Tumia vyeti vya mfumo"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Usitoe"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Usithibitishe"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Hakuna cheti kilichobainishwa. Muunganisho wako hautakuwa wa faragha."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Jina la mtandao ni refu sana."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Lazima ubainishe kikoa."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Inahitaji cheti."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Unganisha"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Umewasha Wi‑Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Imeunganishwa kwenye <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Inaunganisha kwenye <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Inaunganisha…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Imeshindwa kuunganisha kwa mtandao"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Mtandao hauko karibu"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Anwani ya MAC ya kifaa"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Anwani ya MAC kwa nasibu"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Anwani ya MAC kwa nasibu (mara ya mwisho kutumika)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Anwani ya IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Maelezo ya mtandao"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Mfano wa kijimtandao"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Anwani za IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Mitandao iliyohifadhiwa"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Usajili"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Mitandao mingine"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Mipangilio ya IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Mtumiaji huyu haruhusiwi kubadilisha mipangilio ya kina ya Wi-Fi"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Hifadhi"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Tafadhali charaza anwani halali ya lango."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Tafadhali charaza anwani halali ya DNS."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Andika urefu wa kiambishi awali cha mtandao kati ya 0 na 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS ya kwanza (isipokuwa ikibatilishwa na DNS ya Faragha)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS ya pili (isipokuwa ikibatilishwa na DNS ya Faragha)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Lango"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Urefu wa kiambishi awali cha mtandao"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Moja kwa moja"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Programu inashiriki maudhui. Ili ushiriki muunganisho wa intaneti, zima mtandao pepe, kisha uuwashe"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Hujaweka nenosiri lolote"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Jina la mtandaopepe"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Inawasha <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Inawasha <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Vifaa vingine vinaweza kuunganisha kwenye <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Nenosiri la mtandaopepe"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Bendi ya AP"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Onyesho Laini"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Huinua kiotomatiki kiwango cha kuonyesha upya kutoka Hz 60 hadi 90 kwa baadhi ya maudhui. Huongeza matumizi ya betri."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Onyesho Laini"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Lazimisha kiwango cha kuonyesha upya cha Hz 90"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Kiwango cha juu kabisa cha kuonyesha upya kwa utendakazi wa mguso ulioboreshwa na ubora wa uhuishaji. Huongeza matumizi ya betri."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Utashi wa skrini"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Umewashwa / Skrini haitazima ikiwa unaiangalia"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Skrini ikiwa nyeusi, huwa inawaka arifa zinapoingia"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Onyesha saa na maelezo kila wakati"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Inatumia chaji nyingi"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Tumia Herufi Nzito"</string>
     <string name="title_font_size" msgid="570613010306330622">"Ukubwa wa fonti"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Ongeza au upunguze ukubwa wa maandishi"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Mipangilio ya kufunga SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Toleo la Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Sasisho la usalama la Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Muundo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Muundo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Muundo na maunzi"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Toleo la maunzi"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Kitambulisho cha Kifaa"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Futa APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN Mpya"</string>
     <string name="menu_save" msgid="6611465355127483100">"Hifadhi"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Tupa"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Ghairi"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Huwezi kuacha sehemu hii ikiwa haijajazwa."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Lazima APN ijazwe."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Programu zinaweza kuwekwa upya"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Badilisha mipangilio ya Wi-Fi, data ya simu na Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Hatua hii itabadilisha mipangilio yote ya mtandao ikiwa ni pamoja na:\n\n"<li>"Wi‑Fi"</li>\n<li>"Data ya simu"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Futa data yote"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Futa SIM zilizopakuliwa"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Ili upakue SIM za kubadilisha, wasiliana na mtoa huduma wako. Hatua hii haitaghairi mipango yoyote ya huduma za simu."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Hatua hii haitaghairi mipango yoyote ya huduma za simu. Ili upakue SIM za kubadilisha, wasiliana na mtoa huduma wako."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Badilisha mipangilio"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Je, ungependa kubadilisha mipangilio yote ya mtandao? Huwezi kutendua kitendo hiki."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Je, ungependa kubadilisha mipangilio yote ya mtandao na ufute SIMs zilizopakuliwa? Huwezi kutendua kitendo hiki."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Mipangilio ya mtandao imewekwa upya"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Imeshindwa kufuta data yote kwenye SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Hitilafu imetokea wakati wa kufuta data iliyopakuliwa kwenye SIM.\n\nZima na uwashe kifaa chako na ujaribu tena."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Futa data yote (rejesha mipangilio ambayo kifaa kilitoka nayo kiwandani)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Futa data yote (rejesha mipangilio ya kiwandani)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Hatua hii itafuta data yote kwenye hifadhi yako iliyo "<b>"ndani ya kompyuta kibao"</b>", ikiwa pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Hatua hii itafuta data yote kwenye hifadhi yako iliyo "<b>"ndani ya simu"</b>", ikiwa pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Kwa sasa umeingia kwenye akaunti zifuatazo:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Kuna watumiaji wengine waliopo kwenye kifaa hiki.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Hatua hii haitaghairi mpango wako wa huduma ya simu ya mkononi."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Ili kufuta pia muziki, picha, na data zingine za mtumiaji, "<b>" hifadhi ya "</b>" inahitaji kufutwa."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Ili kufuta muziki, picha, na data zingine za mtumiaji, "<b>"kadi ya"</b>" inahitaji kufutwa."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Futa data yote (rejesha mipangilio Iliyotoka nayo kiwandani)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Futa data yote (rejesha mipangilio Iliyotoka nayo kiwandani)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Hatua hii itafuta data yote kwenye "<b>"hifadhi ya mfumo"</b>" ya kompyuta yako kibao, ikiwa ni pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Hatua hii itafuta data yote kwenye "<b>"hifadhi ya mfumo"</b>" ya simu yako, ikiwa ni pamoja na:\n \n"<li>"Akaunti yako ya Google"</li>\n<li>"Data na mipangilio ya mfumo na programu"</li>\n<li>"Programu zilizopakuliwa"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Kwa sasa umeingia katika akaunti zifuatazo:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Kuna watumiaji wengine waliopo kwenye kifaa hiki.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Muziki"</li>\n<li>"Picha"</li>\n<li>"data nyingine ya mtumiaji"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Hatua hii haitaghairi mpango wako wa huduma ya simu ya mkononi."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Ili kufuta muziki, picha na data nyingine ya mtumiaji, data iliyo kwenye "<b>"hifadhi ya USB"</b>" inahitaji kufutwa."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Ili kufuta muziki, picha na data nyingine ya mtumiaji, data iliyo kwenye "<b>"kadi ya SD"</b>" inahitaji kufutwa."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Futa hifadhi ya USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Futa kadi ya SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Futa data zote kwenye hifadhi ya ndani ya USB, kama vile muziki au picha"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Futa data zote kwenye kadi ya SD, kama vile muziki au picha."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Futa data yote"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Futa data yote"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Ungependa kufuta taarifa binafsi na programu zilizopakuliwa. Huwezi kutendua kitendo hiki."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Taarifa yako yote ya binafsi, zikiwemo programu zilizopakuliwa na SIM zitafutwa Huwezi kutendua kitendo hiki."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Futa kila kitu"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Hakuna mpangilio mpya uliofanywa kwa sababu huduma ya Mfumo wa Kufuta haipatikani."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Je, unataka kufuta data yote?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Urejeshaji wa mipangilio ya kiwandani haupatikani kwa mtumiaji huyu"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Inafuta"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Tafadhali subiri..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Futa data yote"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Futa data yote"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Taarifa binafsi na programu zako zote zilizopakuliwa zitafutwa. Huwezi kutendua kitendo hiki."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Taarifa yako yote ya binafsi, ikiwa ni pamoja na programu zilizopakuliwa na SIM, zitafutwa Huwezi kutendua kitendo hiki."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Ungependa kufuta data yote?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Urejeshaji wa mipangilio ya kiwandani haupatikani kwa mtumiaji huyu"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Inafuta"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Tafadhali subiri…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Mipangilio ya simu"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Weka mipangilio ya ujumbe wa sauti, kupitisha simu, kusubiri simu, kitambulisho cha mteja"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Sambaza mtandao kwa USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Haiwezi kuzuia kwa zaidi kuliko vifaa <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>itazuiwa"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Sambaza mtandao kwa Ethaneti"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Shiriki muunganisho wa intaneti ya simu kupitia Ethaneti ya USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Shiriki muunganisho wa intaneti ya simu kupitia Ethaneti"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Tumia mtandao pepe na kipengele cha kusambaza mtandao ili ushiriki intaneti na vifaa vingine kupitia muunganisho wa data wa simu za mkononi. Programu pia zinaweza kuunda mtandao pepe ili kushiriki maudhui na vifaa vilivyo karibu."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Tumia mtandaopepe na huduma ya kusambaza mtandao ili uvisambazie vifaa vingine intaneti kupitia muunganisho wa data kwa simu za mkononi au Wi-Fi. Programu pia zinaweza kuunda mtandaopepe ili kushiriki maudhui na vifaa vilivyo karibu."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Usaidizi"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Kutafuta Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Ruhusu programu na huduma zitafute vifaa vilivyo karibu wakati wowote, hata wakati umezima Bluetooth. Hali hii inaweza kutumika, kwa mfano, kuboresha huduma na vipengele vinavyohusiana na mahali."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Huduma za Mahali za kazini"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Utambuzi wa saa za eneo"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Utambuzi wa saa za eneo"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Huruhusu hali ya kutumia maelezo ya mahali kifaa kilipo ili kutambua saa za sasa za eneo. Mipangilio mingine ya mahali kama vile kutafuta Wi-Fi inaweza kuathiri usahihi wa utambuzi wa saa za eneo."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Umewashwa"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Umezimwa"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Utambuzi wa kiotomatiki wa saa za eneo umezimwa"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Utambuzi wa saa za eneo umezimwa"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Utambuzi wa saa za eneo hautumiki"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Huruhusiwi kufanya mabadiliko kwenye utambuzi wa saa za eneo"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Eneo la mtandao wa Wi-Fi na wa simu"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Ruhusu programu zitumie huduma ya Google ya mahali ili kukadiria ulipo kwa haraka. Data ya mahali isiyokutambulisha itakusanywa na kutumwa kwa Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Eneo limethibitishwa na Wi-Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Weka nenosiri ili utumie kufungua kwa uso"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Ili utumie kufungua kwa uso, weka mchoro"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Weka PIN ili utumie kufungua kwa uso"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Weka nenosiri ili utumie bayometriki"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Weka mchoro ili utumie bayometriki"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Weka PIN ili utumie bayometriki"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Je, umesahau nenosiri lako?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Je, umesahau mchoro wako?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Je, umesahau PIN yako?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Mapendeleo ya manukuu"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ukuzaji"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Eneo la ukuzaji"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Kuwasha hali ya ukuzaji"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Chagua maeneo ya ukuzaji ambayo ungependa kutumia unapokuza skrini"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Skrini nzima"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Sehemu ya skrini"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Skrini nzima na sehemu ya skrini"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Kuza skrini yote"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Kuza sehemu ya skrini"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Utabadili ili utumie kitufe cha zana za ufikivu?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Hatua ya kugusa mara tatu ili kukuza sehemu ya skrini itachelewesha kuandika na vitendo vingine.\n\nJe, ungependa kubadilisha ili utumie kitufe cha zana za ufikivu kukuza?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Badilisha utumie kitufe cha zana za ufikivu"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Endelea kutumia \"kugusa mara tatu ili kukuza\""</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Mipangilio ya ukuzaji"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Kuza kwa kugusa mara tatu"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Kuza kwa njia ya mkato"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Kata simu kwa kitufe cha kuwasha/kuzima"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Kielekezi kikubwa cha kipanya"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Ondoa uhuishaji"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Sauti ya mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Changanya vituo wakati wa kucheza sauti"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Usawazishaji wa sauti"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Kushoto"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Kulia"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Sauti ya mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Unganisha vituo unapocheza sauti"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Usawazishaji wa sauti"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kushoto"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Kulia"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Chaguomsingi"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"Sekunde 10"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"Sekunde 30"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Mtetemo wa arifa"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Mtetemo wa mlio"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Mtetemo kifaa kinapoguswa"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Tumia <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Fungua <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Tumia usahihishaji wa rangi"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Onyesha manukuu"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Kwa ajili ya programu zinazotumika pekee"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Tumia <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Fungua <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Tumia kipengele cha usahihishaji wa rangi"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Onyesha manukuu"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Kwa ajili ya programu zinazotumika pekee"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Muundo na ukubwa wa manukuu"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Maandishi <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Chaguo zaidi"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Upofu rangi wa kutokuona rangi ya kijani"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Upofu rangi wa kutokuona rangi nyekundu"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Upofu rangi wa kutokuona rangi ya bluu"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Kijivu"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Nyekundu-kijani"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Nyekundu-kijani"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Bluu-manjano"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Udhibiti wa matumizi ya chinichini"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Iruhusu programu kutumika chini chini"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Programu hairuhusiwi kutumika chini chini"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Huwezi kudhibiti matumizi ya chinichini"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Huwezi kudhibiti matumizi ya chinichini"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Ungependa kudhibiti shughuli za chini chini?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Ikiwa utadhibiti shughuli za chini chini za programu, huenda isifanye kazi vizuri"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Kwa kuwa programu hii haiboreshi matumizi ya betri, huwezi kuizuia.\n\nIli uizuie, washa kuboresha matumizi ya betri."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Kompyuta kibao imetumika sana kuliko kawaida"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Kifaa kimetumika sana kuliko kawaida"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Huenda chaji ikaisha haraka zaidi"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Inaboresha muda wa kutumia betri"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Betri imedhibitiwa kwa muda. Gusa ili upate maelezo zaidi."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Simu yako imetumika kuliko kawaida. Huenda chaji ikaisha haraka zaidi ya inavyotarajiwa.\n\nProgramu ambazo zimetumia betri zaidi:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Kompyuta yako kibao imetumika kuliko kawaida. Huenda chaji ikaisha haraka zaidi ya inavyotarajiwa.\n\nProgramu ambazo zimetumia betri zaidi:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Kifaa chako kimetumika kuliko kawaida. Huenda chaji ikaisha haraka zaidi ya inavyotarajiwa.\n\nProgramu ambazo zimetumia betri zaidi:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">Imezuia programu %1$d</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Tatizo la kusoma mita ya betri yako"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Tatizo la kusoma mita ya betri yako. Gusa ili "<annotation id="url">"upate maelezo zaidi"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Unataka kusimamisha programu?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Simu yako haiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inazuia skrini ya simu kuzimika.\n\nIli kujaribu kurekebisha tatizo hili, unaweza kuzima programu.\n\nIkiwa tatizo hili litaendelea, huenda ukahitaji kuondoa programu hii ili kuboresha utendaji wa betri."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Kompyuta kibao yako haiwezi kudhibiti matumizi ya chaji ipasavyo kwa sababu <xliff:g id="APP">%1$s</xliff:g> inazuia skrini ya kompyuta kibao kuzimika.\n\nIli kujaribu kurekebisha tatizo hili, unaweza kuzima programu.\n\nIkiwa tatizo hili litaendelea, huenda ukahitaji kuondoa programu hii ili kuboresha utendaji wa betri."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Weka ratiba"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Ongeza muda wa matumizi ya betri"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Zima kiokoa betri simu ikipata chaji"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Kiokoa betri hujizima simu yako inapofika <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Kiokoa betri hujizima kompyuta yako kibao inapokuwa na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Kiokoa betri hujizima kifaa chako kinapokuwa na <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Kiokoa betri hujizima chaji ya simu yako inapokuwa zaidi ya <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Kiokoa betri hujizima chaji ya kompyuta yako kibao inapokuwa zaidi ya <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Kiokoa betri hujizima chaji ya kifaa chako inapokuwa zaidi ya <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Washa"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Weka upya"</string>
     <string name="tts_play" msgid="2945513377250757221">"Cheza"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Muunganisho unaojirekebisha"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Huboresha muda wa matumizi ya betri na kuboresha utendaji wa kifaa kwa kudhibiti kiotomatiki miunganisho yako ya mtandao"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Hifadhi ya hati-tambulishi"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sakinisha cheti"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sakinisha vyeti kutoka kwenye hifadhi"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kitambulisho cha mtumiaji"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Angalia na urekebishe vitambulisho vilivyohifadhiwa"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Mipangilio Ya Kina"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Aina ya hifadhi"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Inaweza kutumiwa na maunzi"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Programu pekee"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Kitambulisho hakipatikani kwa mtumiaji huyu"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Imesakinishwa kwa ajili ya VPN na programu"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Imesakinishwa kwa ajili ya Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Usisakinishe"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Sakinisha"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Cheti hakijasakinishwa"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Ungependa kuruhusu <xliff:g id="APP_NAME">%s</xliff:g> isakinishe vyeti kwenye kifaa hiki?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Vyeti hivi vitakutambulisha kwenye programu na URL zilizo hapa chini"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Usiruhusu"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Ruhusu"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Onyesha zaidi"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Programu ya kudhibiti vyeti"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Hamna"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Vyeti unavyosakinisha kwenye programu hii vinakutambulisha kwenye programu na URL zilizo hapa chini"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Ondoa"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Ishara ya simu ya dharura"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Weka tabia wakati simu ya dharura imepigwa"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Hifadhi nakala"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Haujasanidiwa - Wasifu wa kazini"</string>
     <string name="user_admin" msgid="4024553191395768119">"Msimamizi"</string>
     <string name="user_you" msgid="3070562015202859996">"Wewe (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Jina la utani"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Unaweza kuongeza hadi watumiaji <xliff:g id="USER_COUNT">%1$d</xliff:g>"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Mmiliki wa kompyuta kibao pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Mmiliki wa simu pekee ndiye anayeweza kudhibiti watumiaji."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Kulipa katika kituo"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Sanidi programu ya malipo. Kisha elekeza upande wa nyuma wa simu yako kwenye kituo chochote cha malipo chenye alama ya kulipa kwa njia za kielektroniki."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Nimeelewa"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Zaidi..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Zaidi…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Weka programu chaguomssingi ya kulipa"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Sasisha programu chaguomsingi ya kulipa"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kwenye kituo cha kielektroniki, lipa ukitumia <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Nyuma"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Endelea"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Kamilisha"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Piga picha"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Chagua picha"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Chagua picha"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kadi"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kadi"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Tumia hii kwa simu wakati wote"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Chagua SIM ya data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Chagua SIM kwa ajili ya SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Inabadili SIM ya data, hii inaweza kuchukua hadi dakika moja..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Inabadili SIM ya data, hii inaweza kuchukua hadi dakika moja…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Piga simu ukitumia"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Chagua SIM kadi"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"mpangilio, ratiba, kiokoa betri, kuokoa umeme, betri, otomatiki, asilimia"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, upigaji simu ulioimarishwa, upigaji simu kupitia 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"ongeza lugha, ongeza lugha"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ukubwa wa maandishi"</string>
     <string name="default_sound" msgid="6604374495015245195">"Sauti chaguomsingi"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Kiwango cha sauti ya arifa na mlio wa simu ni <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Kiwango cha sauti, mtetemo, Usinisumbue"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Washa sauti"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Manukuu Papo Hapo"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Wekea maudhui manukuu kiotomatiki"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Hamna"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Umeweka ratiba <xliff:g id="ON_COUNT">%d</xliff:g></item>
-      <item quantity="one">Umeweka ratiba moja</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Hamna}=1{Umeweka ratiba moja}other{Umeweka ratiba #}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Usinisumbue"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Pata arifa za watu na programu muhimu pekee"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Punguza usumbufu"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Kipaumbele tu"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Imewashwa / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Imezimwa. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Imezimwa"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Imewashwa"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Uliza kila wakati"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Hadi utakapoizima"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other">Saa <xliff:g id="NUM_HOURS">%d</xliff:g></item>
-      <item quantity="one">Saa 1</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"Dakika <xliff:g id="NUM_MINUTES">%d</xliff:g>"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">Ratiba <xliff:g id="ON_COUNT">%d</xliff:g> zinaweza kuwashwa kiotomatiki</item>
-      <item quantity="one">Ratiba 1 inaweza kuwashwa kiotomatiki</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{Saa moja}other{Saa #}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{Dakika moja}other{Dakika #}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Imezimwa}=1{Imezimwa / Ratiba 1 inaweza kuwashwa kiotomatiki}other{Zimezimwa / Ratiba # zinaweza kuwashwa kiotomatiki}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Kinachoweza kukatiza kipengele cha Usinisumbue"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Watu"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Programu"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Weka kiotomatiki arifa za kipaumbele cha chini ili Zisitoe sauti"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Nafasi ya arifa zinazojirekebisha"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Panga arifa kiotomatiki kulingana na uhusiano"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Maoni kuhusu arifa zinazojirekebisha"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Onyesha marekebisho yaliyofanywa kwenye arifa na uonyeshe chaguo la kutoa maoni kwenye mfumo"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Badilisha umuhimu wa arifa"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Badilisha mipangilio ya umuhimu iliyobadilishwa na mtumiaji na uruhusu mratibu wa arifa kuweka vipaumbele"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Vitendo na majibu yanayopendekezwa"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Onyesha kiotomatiki vitendo na majibu yanayopendekezwa"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Onyesha arifa za hivi majuzi na zile ulizoahirisha"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Mazungumzo ya kipaumbele"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Onyesha kwenye sehemu ya juu ya mazungumzo na yaonekane kama viputo vinavyoelea"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Onyesha kwenye sehemu ya juu ya mazungumzo"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Mazungumzo mengine"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Mazungumzo yasiyopewa kipaumbele"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Mazungumzo uliyofanyia mabadiliko"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Mazungumzo ya hivi majuzi"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Futa ya hivi majuzi"</string>
+    <string name="clear" msgid="5092178335409471100">"Futa"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Yafanye mazungumzo ya kipaumbele yatoe viputo"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Mazungumzo ya kipaumbele huonekana juu ya menyu inayovutwa chini. Unaweza pia kuyafanya yatoe viputo na kukatiza kipengele cha Usinisumbue."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Mazungumzo ya kipaumbele na yaliyobadilishwa yataonekana hapa"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Kufikia kipengele cha Usinisumbue"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Ruhusu kipengele cha Usinisumbue"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Hakuna programu zilizosakinishwa ambazo zimeomba kufikia kipengele cha Usinisumbue"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Inapakia programu ..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Inapakia programu…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Kutokana na ombi lako, Android inazuia arifa za programu hii ili zisionekane kwenye kifaa hiki"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Kutokana na ombi lako, Android inazuia aina hizi za arifa ili zisionekane kwenye kifaa hiki"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Kutokana na ombi lako, Android inazuia kikundi hiki cha arifa ili zisionekane kwenye kifaa hiki"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Mazungumzo yote"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Mazungumzo ya kipaumbele"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Hamna"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">Mazungumzo <xliff:g id="CONVERSATIONS">%d</xliff:g></item>
-      <item quantity="one">Mazungumzo 1</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Hamna"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Hamna}=1{Mazungumzo 1}other{Mazungumzo #}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Anayeweza kukatiza"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Simu"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Simu zilizopigwa"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Ili uhakikishe kuwa simu zinazoruhusiwa zinatoa sauti, hakikisha umeweka mipangilio ya kifaa kulia"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Kwa ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ simu zinazoingia zimezuiwa. Unaweza kubadilisha mipangilio ili uwaruhusu marafiki, familia na watu wengine wawasiliane nawe."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Anwani zenye nyota"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Wengine <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="one">Mwingine 1</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Hamna"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Hamna}=1{{contact_1}}=2{{contact_1} na {contact_2}}=3{{contact_1}, {contact_2} na {contact_3}}other{{contact_1}, {contact_2} na zingine #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Hakuna jina)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Ujumbe"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ujumbe"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Ujumbe"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Katika hali ya ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ ujumbe unaoingia umezuiwa. Unaweza kubadilisha mipangilio ili uwaruhusu marafiki, familia na watu wengine wawasiliane nawe."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Ujumbe wote unaweza kukufikia"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Simu zote zinaweza kukufikia"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Hamna"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">Anwani <xliff:g id="NUM_CONTACTS">%d</xliff:g></item>
-      <item quantity="one">Anwani 1</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Hamna}=1{Anwani moja}other{Anwani #}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Mtu yeyote"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Anwani"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Anwani zenye nyota"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Arifa zote"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Baadhi ya arifa"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Watu uliochagua bado wanaweza kuwasiliana nawe, hata usiporuhusu programu zikatize"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> zinaweza kukatiza</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> inaweza kukatiza</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Nyingine <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Hakuna programu zinazoweza kukatiza}=1{{app_1} inaweza kukatiza}=2{{app_1} na {app_2} zinaweza kukatiza}=3{{app_1}, {app_2} na {app_3} zinaweza kukatiza}other{{app_1}, {app_2} na zingine # zinaweza kukatiza}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Programu"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Arifa zote"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Baadhi ya arifa"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Arifa zinazoweza kukatiza"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Ruhusu arifa zote"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> zinaweza kukatiza</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> inaweza kukatiza</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Hakuna kinachoweza kukatiza"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Nyingine <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Hakuna kinachoweza kukatiza}=1{{sound_category_1} inaweza kukatiza}=2{{sound_category_1} na {sound_category_2} zinaweza kukatiza}=3{{sound_category_1}, {sound_category_2} na{sound_category_3} zinaweza kukatiza}other{{sound_category_1}, {sound_category_2} na nyingine # zinaweza kukatiza}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Hakuna kinachoweza kukatiza"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Hakuna mtu anayeweza kukatiza"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Baadhi ya watu wanaweza kukatiza"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Watu wote wanaweza kukatiza"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Imewashwa"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Imezimwa"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Kubandika programu"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Huduma ya kubandika programu hukuruhusu kuendelea kuonyesha programu ya sasa hadi utakapoibandua. Kipengele hiki kinaweza kutumika, kwa mfano, kumruhusu rafiki unayemwamini kucheza mchezo mahususi. \n\nWakati programu imebandikwa, inaweza kufungua programu zingine na data binafsi inaweza kufikiwa. \n\nIli utumie huduma ya kubandika programu: \n1.	Washa huduma ya kubandika programu	\n2.	Fungua Muhtasari \n3.	Gusa aikoni ya programu katika sehemu ya juu ya skrini, kisha uguse Bandika"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Huduma ya kubandika programu hukuruhusu kuendelea kuonyesha programu ya sasa hadi utakapoibandua. Kipengele hiki kinaweza kutumika, kwa mfano, kumruhusu rafiki unayemwamini kucheza mchezo mahususi. \n\nWakati programu imebandikwa, inaweza kufungua programu zingine na data binafsi inaweza kufikiwa. \n\nIkiwa unataka kushiriki kwa usalama programu yako na mtu, jaribu kutumia mtumiaji mgeni badala yake. \n\nIli utumie huduma ya kubandika programu: \n1.	Washa huduma ya kubandika programu	\n2.	Fungua Muhtasari \n3.	Gusa aikoni ya programu katika sehemu ya juu ya skrini, kisha uguse Bandika"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Huduma ya kubandika programu hukuruhusu kuendelea kuonyesha programu ya sasa hadi utakapoibandua. Kipengele hiki kinaweza kutumika, kwa mfano, kumruhusu rafiki unayemwamini kucheza mchezo mahususi."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Wakati programu imebandikwa, inaweza kufungua programu zingine na data binafsi inaweza kufikiwa. \n\nIli utumie kipengele cha kubandika programu: \n1.	Washa kipengele cha kubandika programu \n2.	Fungua Muhtasari \n3.	Gusa aikoni ya programu katika sehemu ya juu ya skrini, kisha uguse Bandika"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Wakati programu imebandikwa, inaweza kufungua programu zingine na data binafsi inaweza kufikiwa. \n\nIkiwa unataka kushiriki kwa usalama programu yako na mtu, jaribu kutumia mtumiaji mgeni badala yake. \n\nIli utumie kipengele cha kubandika programu: \n1.	Washa kipengele cha kubandika programu \n2.	Fungua Muhtasari \n3.	Gusa aikoni ya programu katika sehemu ya juu ya skrini, kisha uguse Bandika"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Wakati programu imebandikwa: \n\n• Data binafsi inaweza kufikiwa \n (kama vile maudhui ya barua pepe na anwani) \n•Programu iliyobandikwa inaweza kufungua programu zingine \n\nTumia huduma ya kubandika programu na watu unaowaamini pekee."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Omba mchoro wa kufungua kabla hujabandua"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Itisha PIN kabla hujabandua"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Mbali na kutumia uso wako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka PIN yako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe PIN kabla ya kuanza kukitumia?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Mbali na kutumia uso wako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka mchoro wako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe mchoro kabla ya kuanza kukitumia?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Mbali na kutumia uso wako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka nenosiri lako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe nenosiri kabla ya kuanza kukitumia?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Mbali na kutumia bayometriki zako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka PIN yako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe PIN kabla ya kuanza kukitumia?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Mbali na kutumia bayometriki zako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka mchoro wako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe mchoro kabla ya kuanza kukitumia?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Mbali na kutumia bayometriki zako kufungua kifaa chako, unaweza kulinda kifaa hiki zaidi kwa kuweka nenosiri lako kabla ya kukifungua. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi utakapokifungua.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au vilivyoibwa. Ungependa kifaa kiombe nenosiri kabla ya kuanza kukitumia?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ndiyo"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Hapana"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Inazuiwa"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB inadhibitiwa na"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Kifaa kilichounganishwa"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Kifaa hiki"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Unabadilisha..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Inabadilisha…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Imeshindwa kubadilisha"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Inachaji kifaa hiki"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Inachaji kifaa kilichounganishwa"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Matumizi ya data ya mtandao wa simu"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Matumizi ya data ya programu"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Matumizi ya data ya Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Matumizi ya data isiyo ya mtoa huduma"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Matumizi ya data ya ethaneti"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethaneti"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">Kizuizi 1</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Huenda hesabu ya data ya mtoa huduma ikawa tofauti na ya kifaa chako"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Haijumuishi data inayotumiwa na mitandao ya mtoa huduma"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> zimetumika"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Weka onyo la matumizi ya data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Onyo kuhusu data"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Angalia maelezo"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Kiokoa Data"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Data bila kipimo"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Data ya chini chini imezimwa"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Data ya chini chini imezimwa"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Kimewashwa"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Kimezimwa"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Tumia Kiokoa Data"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Ikiwa kifaa kimefungwa, usiruhusu uchapaji wa majibu au maandishi mengine kwenye arifa"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Kikagua tahajia chaguomsingi"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Chagua kikagua tahajia"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Tumia kikagua tahajia"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Tumia kikagua maendelezo"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Hakijachaguliwa"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(hamna)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Ili kuongeza nafasi ya hifadhi, kidhibiti cha hifadhi huondoa picha na video zilizohifadhiwa nakala kwenye kifaa chako."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Ondoa picha na video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Kidhibiti cha hifadhi"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Tumia Kidhibiti cha hifadhi"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Tumia Kidhibiti cha hifadhi"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Otomatiki"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Mwongozo"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Futa ili uongeze nafasi sasa"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Gusa mara mbili ili uangalie simu"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Gusa mara mbili ili uangalie kompyuta kibao"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Gusa mara mbili ili uangalie kifaa"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Telezesha kidole ili upate arifa"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Telezesha kidole chini kwenye ukingo wa chini wa skrini ili kuonyesha arifa zako"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Hali ya kutumia kwa mkono mmoja"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Tumia hali ya kutumia kwa mkono mmoja"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Funga unapobadilisha programu"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Muda umekwisha"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"Sekunde 4"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"Sekunde 8"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"Sekunde 12"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"uwezo wa kufikia"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ili uangalie saa, arifa na maelezo mengine, gusa skrini yako mara mbili."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Inua ili uangalie simu"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Inua ili uangalie kompyuta kibao"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Gusa ili uangalie kompyuta kibao"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Gusa ili uangalie kifaa"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ili uangalie saa, arifa na maelezo mengine, gusa skrini yako."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Ujumbe wa Dharura"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Tumia ujumbe wa dharura"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Inadhibitiwa na <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Anzisha vitendo vilivyo hapa chini kwa kubonyeza kitufe cha kuwasha/kuzima haraka mara tano au zaidi"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Cheza kengele ya muda uliosalia"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Cheza sauti ya kiwango cha juu kabla ya kuarifu huduma za dharura"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Piga simu ili upate usaidizi"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Nambari ya kupigia ili upate usaidizi"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Gusa ili ubadilishe"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Ukiweka nambari isiyo ya dharura:\n • Ni sharti kifaa chako kifunguliwe ili utumie ujumbe wa dharura\n • Huenda simu yako isijibiwe"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Telezesha kidole ili upate arifa"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Telezesha kidole"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole kilicho upande wa nyuma wa simu yako."</string>
@@ -4608,6 +4652,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Idadi ya juu zaidi ya makundi ya data yanayoonekana"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Rejesha thamani chaguomsingi"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Imebadilisha chaguo za wasanidi programu za kujaza kiotomatiki"</string>
+    <string name="location_category" msgid="3496759112306219062">"Mahali"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Kiashirio cha sehemu ya arifa"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Onyesha kwa maeneo yote, ikiwa ni pamoja na mtandao na muunganisho"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Lazimisha vipimo vya GNSS kamili"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Fuatilia mikusanyiko na mawimbi yote yasiyo na utendakazi wa GNSS"</string>
     <string name="device_theme" msgid="5027604586494772471">"Mandhari ya kifaa"</string>
     <string name="default_theme" msgid="4815428567082263639">"Chaguomsingi"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Jina la mtandao"</string>
@@ -4624,8 +4673,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Sitisha arifa ili uendelee kumakinika"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Kipengele hakipatikani"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Kipengele hiki kimezimwa kwa sababu kinapunguza kasi ya simu yako"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Lazimisha vipimo vya GNSS kamili"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Fuatilia mikusanyiko na mawimbi yote yasiyo na utendakazi wa GNSS"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Onyesha kidirisha cha programu kuacha kufanya kazi kila wakati"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Onyesha kisanduku kila wakati programu inapoacha kufanya kazi"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Chagua programu inayoweza kutumia ANGLE"</string>
@@ -4637,7 +4684,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Washa katika programu zote"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Chagua Kiendeshaji cha Michoro"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Chaguomsingi"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Kiendeshaji cha Michezo"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Kiendeshaji cha Michezo"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Kiendeshaji cha Msanidi Programu"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Kiendeshaji cha Michoro cha Mfumo"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4693,7 +4740,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Imewashwa (zima sauti)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Imezimwa"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Maelezo ya mtandao"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Jina la kifaa chako litaonekana kwenye programu zilizo katika simu yako. Pia linaweza kuonekana kwa watu wengine wakati unaunganisha vifaa vya Bluetooth au kuweka mtandaopepe wa Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Jina la kifaa chako litaonekana kwa programu zilizo kwenye simu yako. Pia, watu wengine wanaweza kuliona unapounganisha kwenye vifaa vya Bluetooth, unapounganisha kwenye mtandao wa Wi-Fi au kuweka mipangilio ya mtandao pepe wa Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Vifaa"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Mipangilio Yote"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Mapendekezo"</string>
@@ -4706,6 +4753,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Imeshindwa kupata mitandao. Jaribu tena."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(hairuhusiwi)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Hakuna SIM kadi"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Hakuna SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Hamna"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Inahitaji SIM ili uunganishe"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Inahitaji SIM ya <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ili uunganishe"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Hali ya mtandao inayopendelewa: WCDMA pendekezwa"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Hali ya mtandao inayopendelewa: GSM pekee"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Hali ya mtandao inayopendelewa: WCDMA pekee"</string>
@@ -4759,6 +4811,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Data ya mtandao wa simu"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Tumia data ya mtandao wa simu"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Simu itabadili kiotomatiki itumie mtoa huduma huyu inapokuwa karibu"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Hakuna SIM kadi inayopatikana"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Mapendeleo ya simu"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Mapendeleo ya SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Iulize kila wakati"</string>
@@ -4819,6 +4872,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Haipatikani inapounganishwa kwenye <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Angalia zaidi"</string>
     <string name="see_less" msgid="2642392725363552793">"Angalia chache"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Ungependa kuwasha <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Ungependa kuwasha SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Ungependa kubadili utumie <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Ungependa kubadili ili utumie SIM kadi?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Unaweza kutumia SIM moja tu kwa wakati mmoja.\n\nKubadili na kutumia <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> hakutaghairi huduma yako ya <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Unaweza kutumia SIM moja tu iliyopakuliwa kwa wakati mmoja.\n\nKubadili na kutumia <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> hakutaghairi huduma yako ya <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Unaweza kutumia SIM moja tu kwa wakati mmoja.\n\nKubadili SIM hakutaghairi huduma yako ya <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Badili utumie <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Inaunganisha kwenye mtandao…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Inabadili ili kutumia <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Imeshindwa kubadilisha mtandao wa mtoa huduma"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Imeshindwa kubadilisha mtandao wa mtoa huduma kutokana na hitilafu."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Ungependa kuzima <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Ungependa kuzima SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Inazima SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Imeshindwa kuzima mtandao wa mtoa huduma"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Hitilafu imetokea na mtandao wa mtoa huduma wako haukuweza kuzimwa."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Ungependa kutumia SIM 2?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Kifaa hiki kinaweza kutumia SIM 2 kwa wakati mmoja. Ili uendelee kutumia SIM 1 kwa wakati, gusa \"Hapana\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Ungependa kuzima kisha uwashe kifaa?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Ili uanze, zima kisha uwashe kifaa chako. Kisha unaweza kuongeza SIM nyingine."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Endelea"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Zima kisha uwashe"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Hapana"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Badilisha"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Imeshindwa kuanza kutumia SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Ondoa SIM na uiweke tena. Iwapo tatizo litaendelea, zima kisha uwashe kifaa chako."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Jaribu kuwasha SIM tena. Iwapo tatizo litaendelea, zima kisha uwashe kifaa chako."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Kuwasha mtandao"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Unatumia <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Gusa ili usasishe mipangilio ya SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM kadi"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Je, ungependa kufuta data yote kwenye SIM hii iliyopakuliwa?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Kufuta data yote kwenye SIM hii huondoa huduma ya <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> kwenye kifaa hiki.\n\nHuduma ya <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> haitaghairiwa."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Futa data yote"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Inafuta data yote kwenye SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Imeshindwa kufuta data yote kwenye SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Hitilafu imetokea wakati wa kufuta data kwenye SIM.\n\nZima kisha uwashe kifaa chako na ujaribu tena."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Unganisha kwenye kifaa"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> yako inataka kutumia mtandao wa muda wa Wi‑Fi kuunganisha kwenye kifaa chako"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Hakuna vifaa vilivyopatikana. Hakikisha kuwa umewasha vifaa na vinaweza kuunganishwa."</string>
@@ -4890,6 +4981,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Simu za dharura"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Mtoa huduma wako hakuruhusu kupiga simu za dharura kupitia Wi-Fi.\nKifaa hubadili kiotomatiki na kutumia mtandao wa simu ya mkononi ili kupiga simu ya dharura.\nUnaweza kupiga simu za dharura katika maeneo yaliyo na mtandao wa simu ya mkononi pekee."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Tumia Wi-Fi kupiga na kupokea simu ili kuboresha hali ya mawasiliano"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Kipengele cha kupiga simu kupitia SIM tofauti"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Ruhusu simu na SMS za SIM nyingine kupitia SIM hii."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"kipengele cha kupiga simu kupitia sim tofauti"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Ujumbe wa MMS unaoingia"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Huwezi kutuma ujumbe wa MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Gusa ili uruhusu ujumbe wa MMS kwenye <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> wakati data ya mtandao wa simu imezimwa"</string>
@@ -4941,10 +5035,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Ruhusu programu zinazowekelewa juu ya nyingine kwenye Mipangilio"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Ruhusu programu zinazoweza kuonyeshwa juu ya programu nyingine ziwekelewe juu ya skrini za Mipangilio"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Maudhui"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ficha kichezaji kipindi cha maudhui kikiisha"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Kichezaji hukuruhusu kuendelea kucheza kipindi kwenye kidirisha kilichopanuliwa cha Mipangilio ya Haraka."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Kichezaji Faili za Sauti na Video katika Mipangilio ya Haraka"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Onyesha kichezaji faili za sauti na video kwa muda mrefu ili uendelee kucheza kwa urahisi"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ficha kichezaji"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Onyesha kichezaji"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Hakuna vichezaji vinavyopatikana"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Programu zinazoruhusiwa"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"maudhui"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth itawaka"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Kimewashwa"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Kimezimwa"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Intaneti"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Mitandao salama ya ndegeni"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Tafuta na uunganishe kwenye mitandao salama ya ndegeni"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ndegeni, salama ya ndegeni"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Simu na SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Kupiga simu kupitia Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Piga na upokee simu kwa kutumia mitandao isiyo ya mtoa huduma kama vile Wi-Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Kipengele cha kupiga simu kupitia Wi-Fi kinakuruhusu upige na kupokea simu kupitia mitandao isiyo ya watoa huduma kama vile baadhi ya mitandao ya Wi-Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Simu"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"mtoa huduma unayempendelea"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"mtoa huduma wa simu unayempendelea"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"mtoa huduma wa SMS unayempendelea"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"haipatikani"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Hakuna SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Mapendeleo"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Unganisha kwenye mitandao ya umma"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"muunganisho wa mtandao, intaneti, isiyotumia waya, data, wifi, wi-fi, wi fi, mtandao wa simu, vifaa vya mkononi, mtoa huduma za vifaa vya mkononi, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Angalia mitandao salama ya ndegeni"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Zima Hali ya Ndegeni"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Haipatikani kwa sababu umewasha hali ya wakati umelala"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Imemaliza kubadilisha mipangilio ya umuhimu wa arifa."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Programu"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Kifaa kisichoaminika kinataka kufikia ujumbe wako. Gusa ili upate maelezo."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Ungependa kuruhusu kifaa kifikie ujumbe?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Kifaa cha Bluetooth kisichoaminika, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kinataka kufikia ujumbe wako.\n\nHujawahi kuunganisha kwenye [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Kifaa kisichoaminika kinataka kufikia anwani na rekodi yako ya nambari za simu. Gusa ili upate maelezo."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Ungependa kuruhusu kifaa kifikie anwani na rekodi ya nambari za simu?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Kifaa cha Bluetooth kisichoaminika, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], kinataka kufikia anwani na rekodi yako ya nambari za simu. Hii ni pamoja na data kuhusu simu unazopigiwa na unazopiga.\n\nHujawahi kuunganisha kwenye [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index 737d835..37e476e 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"நடுத்தரம்"</item>
     <item msgid="6740026006576843477">"நீளமானது"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"குறுகியது"</item>
+    <item msgid="7397961711906421599">"நடுத்தரமானது"</item>
+    <item msgid="4079132024502041928">"நீண்டது"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"இயல்புநிலை"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"குளோபல்"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA மட்டும்"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"குளோபல்"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index cf0e400..7521958 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"தேதி &amp; நேரம்"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"தேதி மற்றும் நேரத்தை அமை"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"தேதி, நேரம், நேரமண்டலம் &amp; வடிவமைப்புகளை அமை"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"மொபைல் நெட்வொர்க் நேரம்"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"மொபைல் நெட்வொர்க் வழங்கும் நேர மண்டலத்தைப் பயன்படுத்து"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"தானாக நேரத்தை அமை"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"தானாக நேர மண்டலத்தை அமை"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"இயல்பாகத் தேர்ந்தெடுத்துள்ள மொழியைப் பயன்படுத்தவும்"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 மணிநேர வடிவம்"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-மணிநேர வடிவமைப்பில்"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"லாக் ஸ்கிரீனில் சுயவிவரத் தகவலைக் காட்டு"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"கணக்குகள்"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"இருப்பிடம்"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"இருப்பிடத்தைப் பயன்படுத்து"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"இருப்பிடத்தைப் பயன்படுத்து"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ஆஃப்"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ஆப்ஸிற்கு இருப்பிட அனுமதி ஆன் செய்யப்பட்டுள்ளது</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"திரைப் பூட்டு, முகம் காட்டித் திறத்தல்"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ஸ்கிரீன் லாக், கைரேகை"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"திரைப் பூட்டு"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"உங்கள் முகம், கைரேகை மூலம் மொபைலைப் பாதுகாப்பாகத் திறக்கலாம்"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"ஆப்ஸில் உள்நுழைந்தும் பேமெண்ட்டுகளை உறுதிப்படுத்தலாம்"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"அன்லாக் செய்யும் முறையை அமையுங்கள்:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"முகம் காட்டித் திறத்தல்"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"உங்கள் மொபைலை எளிதாக அன்லாக் செய்யும்"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"கைரேகை"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"மொபைல் அன்லாக்கின் நேரத்தைச் சேமிக்கும்"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"தவிர்"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"அடுத்து"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"முகம் சேர்க்கப்பட்டது"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"\'முகம் காட்டித் திறத்தலை’ அமைக்கவும்"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"முகம் காட்டித் திறத்தல்"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"அங்கீகரிக்க, முகத்தைப் பயன்படுத்தலாம்"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"தொடங்கு"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"அணுகல்தன்மை முகம் காட்டித் திறத்தல் ஆஃப் செய்யப்பட்டிருந்தால் சில அமைவுப் படிகள் TalkBack அம்சத்துடன் சரியாக இயங்காமல் போகலாம்."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"பின்செல்"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"அமைவைத் தொடர்க"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"அணுகல்தன்மை அமைவைப் பயன்படுத்து"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ஆப்ஸை முகம் காட்டித் திறக்கும்போதெல்லாம் உறுதிப்படுத்துவது அவசியம்"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"முகங்களை நீக்குக"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"\'முகம் காட்டித் திறத்தலை’ அமை"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"உங்கள் சாதனத்தைத் திறக்கவும் ஆப்ஸில் உள்நுழையவும் பேமெண்ட்டுகளை உறுதிப்படுத்தவும் \'முகம் காட்டித் திறத்தலைப்\' பயன்படுத்தலாம்.\n\nகவனத்திற்கு:\nநீங்கள் தற்செயலாக மொபைலைப் பார்க்கும் போதும் அது திறக்கக்கூடும்.\n\nஉங்கள் முகத்திற்கு முன் மொபைலைக் காட்டி வேறொருவர் அதைத் திறக்கலாம்.\n\nபிள்ளைகள், உடன் பிறந்தவர்கள் போன்று உங்களின் சாயலில் இருப்பவர்களும் மொபைலைத் திறக்க முடியும்."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"உங்கள் சாதனத்தைத் திறக்கவும் ஆப்ஸில் உள்நுழையவும் பேமெண்ட்டுகளை உறுதிப்படுத்தவும் \'முகம் காட்டித் திறத்தலைப்\' பயன்படுத்தலாம்.\n\nகவனத்திற்கு:\nநீங்கள் தற்செயலாக மொபைலைப் பார்க்கும் போதும் அது திறக்கக்கூடும்.\n\nஉங்கள் கண்கள் மூடியிருந்தாலும்கூட முகத்திற்கு முன் மொபைலைக் காட்டி வேறொருவர் அதைத் திறக்கலாம்.\n\nபிள்ளைகள், உடன் பிறந்தவர்கள் போன்று உங்களின் சாயலில் இருப்பவர்களும் மொபைலைத் திறக்க முடியும்."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"உங்கள் சாதனத்தைத் திறப்பதற்கும் ஆப்ஸில் உள்நுழைவதற்கும் பேமெண்ட்டுகளை உறுதிசெய்வதற்கும் ‘முகம் காட்டித் திறத்தல்’ அம்சத்தைப் பயன்படுத்தலாம்."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"கவனத்திற்கு:\nநீங்கள் தற்செயலாக மொபைலைப் பார்க்கும் போதும் அது திறக்கக்கூடும்.\n\nஉங்கள் முகத்திற்கு முன் மொபைலைக் காட்டி வேறொருவர் அதைத் திறக்கலாம்.\n\n கிட்டத்தட்ட உங்கள் சாயலிலேயே இருக்கும் இன்னொருவராலும் உங்கள் மொபைலைத் திறக்க முடியும், உதாரணமாக, ஒரே தோற்றமுடைய உடன்பிறந்தவர்."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"கவனத்திற்கு:\nநீங்கள் தற்செயலாக மொபைலைப் பார்க்கும் போதும் அது திறக்கக்கூடும்.\n\nஉங்கள் கண்கள் மூடியிருந்தாலும்கூட உங்கள் முகத்திற்கு முன் மொபைலைக் காட்டி வேறொருவர் அதைத் திறக்கலாம்.\n\nகிட்டத்தட்ட உங்கள் சாயலிலேயே இருக்கும் இன்னொருவராலும் உங்கள் மொபைலைத் திறக்க முடியும், உதாரணமாக, ஒரே தோற்றமுடைய உடன்பிறந்தவர்."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"முகத்திற்கான தரவை அகற்றவா?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"\'முகம் காட்டித் திறத்தல்\' அம்சத்தால் பயன்படுத்தப்படும் முகங்கள் நிரந்தரமாகவும் பாதுகாப்பாகவும் நீக்கப்படும். அவ்வாறு அகற்றப்பட்ட பிறகு மொபைலைத் திறக்கவும், ஆப்ஸில் உள்நுழையவும், பேமெண்ட்டுகளை உறுதிப்படுத்தவும் உங்கள் பின், பேட்டர்ன் அல்லது கடவுச்சொல்லைப் பயன்படுத்தவும்."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"உங்கள் மொபைலை அன்லாக் செய்ய \'முகம் காட்டித் திறத்தல்\' அம்சத்தைப் பயன்படுத்தலாம்."</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"மொபைலைத் திறக்க அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்.\n\n குறிப்பு: இந்தச் சாதனத்தைத் திறக்க, கைரேகையைப் பயன்படுத்த முடியாது. மேலும் தகவலுக்கு, உங்கள் நிறுவனத்தின் நிர்வாகியைத் தொடர்புகொள்ளவும்."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"மொபைலைத் திறக்க அல்லது வாங்குவதை அங்கீகரிக்க, உங்கள் கைரேகையைப் பயன்படுத்தவும்.\nகுறிப்பு: எளிதில் ஊகிக்க முடியாத பேட்டர்ன் அல்லது பின்னைப் பயன்படுத்தும் போது கிடைக்கும் பாதுகாப்பை விட, கைரேகையைப் பயன்படுத்தும் போது குறைவான பாதுகாப்பே கிடைக்கும்.\n"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ரத்துசெய்"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"வேண்டாம்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"தொடரவும்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"தவிர்"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"அடுத்து"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் டேப்லெட் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். ’முகம் காட்டித் திறத்தலை’ அமைப்பதற்கும் இது தேவைப்படும். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். ’முகம் காட்டித் திறத்தலை’ அமைப்பதற்கும் இது தேவைப்படும். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் மொபைல் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். ’முகம் காட்டித் திறத்தலை’ அமைப்பதற்கும் இது தேவைப்படும். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் டேப்லெட் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். பயோமெட்ரிக்ஸை அமைக்க நீங்கள் திரைப் பூட்டையும் அமைக்க வேண்டியது அவசியம். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். பயோமெட்ரிக்ஸை அமைக்க நீங்கள் திரைப் பூட்டையும் அமைக்க வேண்டியது அவசியம். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"திரைப் பூட்டை அமைப்பதன் மூலம் உங்கள் மொபைல் தொலைந்து போனாலோ திருடு போனாலோ வேறு யாரும் பயன்படுத்தாமல் பாதுகாக்கலாம். பயோமெட்ரிக்ஸை அமைக்க நீங்கள் திரைப் பூட்டையும் அமைக்க வேண்டியது அவசியம். பின்செல்ல \'ரத்துசெய்\' என்பதைத் தட்டவும்."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"பின் அமைவைத் தவிர்க்கவா?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"கடவுச்சொல் அமைவைத் தவிர்க்கவா?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"பேட்டர்ன் அமைவைத் தவிர்க்கவா?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் இந்த டேப்லெட்டைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் இந்தச் சாதனத்தைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"சாதனப் பாதுகாப்பு அம்சங்களைச் செயல்படுத்தினால், உங்கள் அனுமதியின்றி பிறர் உங்கள் ஃபோனைப் பயன்படுத்த முடியாது. பயன்படுத்த விரும்பும் திரைப் பூட்டைத் தேர்வுசெய்யவும்."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"மாற்றுத் திரைப் பூட்டு முறையைத் தேர்வுசெய்க"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"மாற்றுத் திரைப் பூட்டு முறையைத் தேர்வுசெய்க"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"மாற்றுத் திரைப் பூட்டு முறையைத் தேர்வுசெய்க"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"திரைப் பூட்டு விருப்பங்கள்"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"திரைப் பூட்டு விருப்பங்கள்"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"திரைப் பூட்டு"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"முகம் காட்டித் திறத்தல் + கடவுச்சொல்"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"\'முகம் காட்டித் திறத்தல்’ இல்லாமல் தொடரவும்"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"முகத்தைப் பயன்படுத்தி மொபைலைத் திறக்கலாம். இந்த வசதியை உபயோகிக்கும்போது, பாதுகாப்பிற்காகத் திரைப் பூட்டையும் அமைத்திருப்பது அவசியம்."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"பயோமெட்ரிக்ஸும் பேட்டர்னும்"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"பயோமெட்ரிக்ஸும் பின்னும்"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"பயோமெட்ரிக்ஸும் கடவுச்சொல்லும்"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"பயோமெட்ரிக்ஸ் இல்லாமல் தொடர்க"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"பயோமெட்ரிக்ஸைப் பயன்படுத்தி உங்கள் மொபைலைத் திறக்கலாம். பாதுகாப்பிற்காக மாற்றுத் திரைப் பூட்டையும் அமைப்பது அவசியம்."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"நிர்வாகி, என்கிரிப்ஷன் பாலிசி/நற்சான்று சேமிப்பகம் காரணமாக முடக்கப்பட்டது"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ஏதுமில்லை"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"ஸ்வைப்"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> இலக்கத்தை விடக் குறைவாக இருக்க வேண்டும்</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"சாதன நிர்வாகி சமீபத்திய பின்னை பயன்படுத்துவதை அனுமதிக்கவில்லை"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT நிர்வாகியால், பொதுவான பின்கள் தடை செய்யப்பட்டுள்ளன. வேறொரு பின்னை முயலவும்."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"இதில் தவறான எழுத்துக்குறி இருக்கக்கூடாது"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"குறைந்தது ஒரு எழுத்து இருக்க வேண்டும்"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"குறைந்தது ஒரு இலக்கம் இருக்க வேண்டும்"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">எண் அல்லாத 1 எழுத்தாவது இருக்க வேண்டும்</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"சாதன நிர்வாகி சமீபத்திய கடவுச்சொல்லைப் பயன்படுத்துவதை அனுமதிக்கவில்லை"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT நிர்வாகியால், பொதுவான கடவுச்சொற்கள் தடை செய்யப்பட்டுள்ளன. வேறொரு கடவுச்சொல்லை முயலவும்."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"இலக்கங்கள் ஏறுவரிசையில், இறங்குவரிசையில் அல்லது ஒரே இலக்கத்தைப் பயன்படுத்துவது அனுமதிக்கப்படவில்லை"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"உறுதிப்படுத்து"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ரத்துசெய்"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"வைஃபை"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"வைஃபையை இயக்கு"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"வைஃபை"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"வைஃபையைப் பயன்படுத்து"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"வைஃபையைப் பயன்படுத்து"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"வைஃபை அமைப்பு"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"வைஃபை"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"வயர்லெஸ் ஆக்சஸ் பாயிண்ட்களை அமைத்து &amp; நிர்வகிக்கவும்"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” இல் சாதனத்தை இணைப்பதற்குக் கீழேயுள்ள QR குறியீட்டை மையப்படுத்திக் காட்டவும்"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR குறியீட்டை ஸ்கேன் செய்வதன் மூலம் வைஃபையுடன் இணையலாம்"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"வைஃபையைப் பகிர்தல்"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” உடன் இணைக்க இந்த QR குறியீட்டை ஸ்கேன் செய்து கடவுச்சொல்லைப் பகிரவும்"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"மற்றொரு சாதனத்தை “<xliff:g id="SSID">%1$s</xliff:g>” உடன் இணைக்க இந்த QR குறியீட்டை ஸ்கேன் செய்யவும்"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” உடன் இணைக்க இந்த QR குறியீட்டை ஸ்கேன் செய்யவும்"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"மீண்டும் முயலவும். சிக்கல் தொடர்ந்தால் சாதன உற்பத்தியாளரைத் தொடர்புகொள்ளவும்"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"ஏதோ தவறாகிவிட்டது"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"வைஃபை கடவுச்சொல்: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ஹாட்ஸ்பாட் கடவுச்சொல்: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"தானாக இணைத்தல்"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"இந்த நெட்வொர்க்கின் அருகில் இருக்கும்போது மொபைலைத் தானாக இணைவதற்கு அனுமதிக்கும்"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"இந்த நெட்வொர்க்கின் அருகில் இருக்கும்போது டேப்லெட்டைத் தானாக இணைவதற்கு அனுமதிக்கும்"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"தொடர்பு எல்லையில் இருக்கும்போது இந்த நெட்வொர்க்கிற்கு இணைப்பை அனுமதிக்கவும்"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"சாதனத்தைச் சேர்க்கவும்"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"நெட்வொர்க்கில் சாதனத்தைச் சேர்க்க QR குறியீட்டைப் பயன்படுத்தவும்"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR குறியீடு சரியான வடிவமில்லை"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"முறைமைச் சான்றிதழ்களைப் பயன்படுத்து"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"வழங்காதே"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"சரிபார்க்காதே"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"சான்றிதழ் எதுவும் குறிப்பிடப்படவில்லை. உங்கள் இணைப்பு தனிப்பட்டதாக இருக்காது."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"நெட்வொர்க்கின் பெயர் மிகவும் நீளமாக உள்ளது."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"டொமைனைக் குறிப்பிட வேண்டும்."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"சான்றிதழ் தேவை."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"இணை"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"வைஃபை ஆன் செய்யப்பட்டது"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> உடன் இணைக்கப்பட்டது"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> உடன் இணைக்கிறது"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"இணைக்கிறது…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"நெட்வொர்க்குடன் இணைக்க முடியவில்லை"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"நெட்வொர்க் தொடர்பு எல்லையில் இல்லை"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"சாதனத்தின் MAC முகவரி"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ரேண்டம் ஆக்கப்பட்ட MAC முகவரி"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"ரேண்டம் ஆக்கப்பட்ட MAC முகவரி (கடைசியாகப் பயன்படுத்தப்பட்டது)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP முகவரி"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"நெட்வொர்க் விவரங்கள்"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"சப்நெட் மாஸ்க்"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 முகவரிகள்"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"சேமித்த நெட்வொர்க்குகள்"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"சந்தா செலுத்தியவை"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"பிற நெட்வொர்க்குகள்"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP அமைப்பு"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"இந்தப் பயனருக்கு வைஃபை மேம்பட்ட அமைப்புகள் இல்லை"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"சேமி"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"சரியான கேட்வே முகவரியை உள்ளிடவும்."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"சரியான DNS முகவரியை உள்ளிடவும்."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 மற்றும் 32 க்கு இடையிலான நெட்வொர்க் முன் நீளத்தை உள்ளிடவும்."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (தனிப்பட்ட DNS மீறிச் செயல்படாத வரை)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (தனிப்பட்ட DNS மீறிச் செயல்படாத வரை)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"கேட்வே"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"நெட்வொர்க் முன்னொட்டு நீளம்"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"வைஃபை டைரக்ட்"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ஆப்ஸ், உள்ளடக்கத்தைப் பகிர்கிறது. இண்டர்நெட்டைப் பகிர, ஹாட்ஸ்பாட்டை ஆஃப் செய்து, ஆன் செய்யவும்"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"கடவுச்சொல் எதுவும் அமைக்கப்படவில்லை"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ஹாட்ஸ்பாட் பெயர்"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ஐ இயக்குகிறது..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> ஐ ஆன் செய்கிறது…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> உடன் பிற சாதனங்களை இணைக்கலாம்"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ஹாட்ஸ்பாட் கடவுச்சொல்"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP அலைவரிசை"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"சீரான காட்சி"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"சில உள்ளடக்கத்திற்குப் புதுப்பிக்கும் விகிதத்தை 60லிருந்து 90 Hzக்குத் தானாகவே உயர்த்தும். இதனால் பேட்டரி உபயோகம் அதிகரிக்கும்."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"சீரான காட்சி"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ரெஃப்ரெஷ் விகிதம்: Force 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"மேம்பட்ட தொடு இயக்கத்திறனுக்கும் அனிமேஷன் தரத்திற்குமான அதிவேக ரெஃப்ரெஷ் விகிதம். இதனால் பேட்டரி உபயோகம் அதிகரிக்கும்."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"திரை மீது கவனம்"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ஆன் / திரையைப் பார்த்துக் கொண்டிருக்கையில் அது ஆஃப் ஆகாது"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"திரை டார்க்காக இருக்கும்போது புதிய அறிவிப்புகளுக்கு இது ஆன் ஆகும்"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"நேரம் &amp; தகவலை எப்போதும் காட்டு"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"பேட்டரியை அதிகமாகப் பயன்படுத்தும்"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"தடிமனான உரை"</string>
     <string name="title_font_size" msgid="570613010306330622">"எழுத்துரு அளவு"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"உரையைப் பெரிதாக்கும் அல்லது சிறிதாக்கும்"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"சிம் கார்டின் பூட்டு அமைப்பு"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android பதிப்பு"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android பாதுகாப்புப் புதுப்பிப்பு"</string>
     <string name="model_info" msgid="8997566254717810904">"மாடல்"</string>
-    <string name="model_summary" msgid="2246651782442466213">"மாடல்: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"மாடல் &amp; வன்பொருள்"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"வன்பொருள் பதிப்பு"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"உபகரணத்தின் ஐடி"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN ஐ நீக்கு"</string>
     <string name="menu_new" msgid="6571230342655509006">"புதிய APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"சேமி"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"நிராகரி"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"ரத்துசெய்"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"பெயர் புலம் வெறுமையாக இருக்கக்கூடாது."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN வெறுமையாக இருக்கக்கூடாது."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ஆப்ஸை ரீசெட் செய்யலாம்"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"வைஃபை, மொபைல் &amp; புளூடூத்தை மீட்டமை"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"பின்வருபவை உட்பட, எல்லா நெட்வொர்க் அமைப்புகளையும் இது மீட்டமைக்கும்:\n\n"<li>"வைஃபை"</li>\n<li>"மொபைல் தரவு"</li>\n<li>"புளூடூத்"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"அழி"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"பதிவிறக்கிய சிம்களை அழி"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"மாற்று சிம்களைப் பதிவிறக்க மொபைல் நிறுவனத்தைத் தொடர்புகொள்ளவும். இதனால் உங்கள் மொபைல் திட்டங்கள் எவையும் ரத்துசெய்யப்படாது."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"மொபைல் சேவைத் திட்டங்கள் எவையும் இதனால் ரத்துசெய்யப்படாது. மாற்று சிம்களைப் பதிவிறக்க, உங்கள் மொபைல் நிறுவனத்தைத் தொடர்புகொள்ளவும்."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"அமைப்புகளை மீட்டமை"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"அனைத்து நெட்வொர்க் அமைப்புகளையும் மீட்டமைக்கவா? இதைச் செயல்தவிர்க்க இயலாது."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"அனைத்து நெட்வொர்க் அமைப்புகளையும் மீட்டமைத்து, பதிவிறக்கிய சிம்களை அழிக்கவா? இதைச் செயல்தவிர்க்க இயலாது."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"நெட்வொர்க் அமைப்புகள் மீட்டமைக்கப்பட்டன"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"சிம்களை அழிக்க இயலாது"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"பிழை ஏற்பட்டதால் பதிவிறக்கிய சிம்களை அழிக்க இயலாது.\n\nசாதனத்தை மீண்டும் தொடங்கி மறுபடியும் முயலவும்."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"எல்லா டேட்டாவையும் அழி (ஆரம்பநிலை மீட்டமைவு)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"எல்லாம் அழி (ஆரம்பநிலை ரீசெட்)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"இது உங்கள் டேப்லெட்டின் "<b>"அகச் சேமிப்பகத்தில்"</b>" உள்ள அனைத்துத் தரவையும் அழித்துவிடும். இவற்றில் \n\n"<li>"உங்களின் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் தரவுகள் மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட ஆப்ஸ்"</li>" ஆகியவை உள்ளடங்கும்"</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"இது உங்கள் மொபைலின் "<b>"அகச் சேமிப்பகத்தில்"</b>" உள்ள அனைத்து டேட்டாவையும் அழித்துவிடும். இவற்றில்\n\n"<li>"உங்களின் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் டேட்டா மற்றும் அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட ஆப்ஸ்"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"தற்போது, பின்வரும் கணக்குகளில் உள்நுழைந்துள்ளீர்கள்:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"இந்தச் சாதனத்தில் பிற பயனர்கள் உள்ளனர்.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"இசை"</li>\n<li>"படங்கள்"</li>\n<li>"பிற பயனர் தரவு"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMகள்"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"இதைச் செய்வதால், உங்கள் மொபைல் சேவைத் திட்டம் ரத்துசெய்யப்படாது."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிப்பதற்கு, "<b>"USB சேமிப்பிடத்தை"</b>" அழிக்க வேண்டியிருக்கும்."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிக்க "<b>"SD கார்டு"</b>" அழிக்கப்பட வேண்டும்."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"எல்லாத் தரவையும் அழி (ஆரம்பநிலை ரீசெட்)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"எல்லாத் தரவையும் அழி (ஆரம்பநிலை ரீசெட்)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"இது உங்கள் டேப்லெட்டின் "<b>"அகச் சேமிப்பகத்தில்"</b>" உள்ள எல்லாத் தரவையும் அழித்துவிடும். இவற்றில் \n\n"<li>"உங்களின் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் தரவு அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட ஆப்ஸ்"</li>" ஆகியவை உள்ளடங்கும்"</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"இது உங்கள் மொபைலின் "<b>"அகச் சேமிப்பகத்தில்"</b>" உள்ள எல்லாத் தரவையும் அழித்துவிடும். இவற்றில்\n\n"<li>"உங்களின் Google கணக்கு"</li>\n<li>"சிஸ்டம் மற்றும் ஆப்ஸ் தரவு அமைப்புகள்"</li>\n<li>"பதிவிறக்கப்பட்ட ஆப்ஸ்"</li>" ஆகியவை உள்ளடங்கும்"</string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"தற்போது பின்வரும் கணக்குகளில் உள்நுழைந்துள்ளீர்கள்:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"இந்தச் சாதனத்தில் பிற பயனர்கள் உள்ளனர்.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"இசை"</li>\n<li>"படங்கள்"</li>\n<li>"பிற பயனர் தரவு"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMகள்"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"இதைச் செய்வதால் உங்கள் மொபைல் சேவைத் திட்டம் ரத்துசெய்யப்படாது."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிக்க "<b>"USB சேமிப்பகத்தில்"</b>" உள்ளவை அழிக்கப்பட வேண்டும்."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"இசை, படங்கள் மற்றும் பிற பயனர் தரவை அழிக்க "<b>"SD கார்டில்"</b>" உள்ளவை அழிக்கப்பட வேண்டும்."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB சேமிப்பிடத்தை அழி"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD கார்டை அழி"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"இசை அல்லது படங்கள் போன்று அக USB சேமிப்பிடத்தில் உள்ள எல்லா தரவையும் அழி"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"இசை அல்லது படங்கள் போன்று SD கார்டில் உள்ள எல்லா தரவையும் அழி"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"அனைத்து டேட்டாவையும் அழி"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"அனைத்து டேட்டாவையும் அழி"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"உங்களின் அனைத்துத் தனிப்பட்ட தகவல்களும் பதிவிறக்கிய ஆப்ஸும் நீக்கப்படும். இதைச் செயல்தவிர்க்க இயலாது."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"பதிவிறக்கிய ஆப்ஸ் &amp; சிம்கள் உட்பட உங்களின் அனைத்துத் தனிப்பட்ட தகவல்களும் நீக்கப்படும். இதைச் செயல்தவிர்க்க இயலாது."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"எல்லாவற்றையும் அழி"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"System Clear சேவை இல்லை என்பதால் மீட்டமைவைச் செயற்படுத்தப்படவில்லை."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"அனைத்து டேட்டாவையும் அழிக்கவா?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"இவருக்கு ஆரம்பநிலை மீட்டமைவு இல்லை"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"அழிக்கிறது"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"காத்திருக்கவும்..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"எல்லாத் தரவையும் அழி"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"எல்லாத் தரவையும் அழி"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"உங்களின் அனைத்துத் தனிப்பட்ட தகவல்களும் பதிவிறக்கிய ஆப்ஸும் நீக்கப்படும். இதைச் செயல்தவிர்க்க இயலாது."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"பதிவிறக்கிய ஆப்ஸ், சிம்கள் ஆகியவை உட்பட உங்களின் அனைத்துத் தனிப்பட்ட தகவல்களும் நீக்கப்படும். இதைச் செயல்தவிர்க்க இயலாது."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"எல்லாத் தரவையும் அழிக்கவா?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"இவருக்கு ஆரம்பநிலை மீட்டமைவு இல்லை"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"அழிக்கிறது"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"காத்திருக்கவும்…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"அழைப்பு அமைப்பு"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"குரல் அஞ்சல், அழைப்புப் பகிர்வு, அழைப்பு காத்திருப்பு, அழைப்பாளர் ஐடி போன்றவற்றை அமைக்கவும்"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB டெதெரிங்"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> சாதனங்களுக்கு மேல் இணைக்க முடியாது."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இன் இணைப்புமுறை நீக்கப்படும்."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ஈத்தர்நெட் இணைப்புமுறை"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ஈத்தர்நெட் மூலம் மொபைலின் இணைய இணைப்பைப் பகிருங்கள்"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ஈத்தர்நெட் மூலம் மொபைலின் இணைய இணைப்பைப் பகிரும்"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"மொபைல் டேட்டா இணைப்பு வழியாக, மற்ற சாதனங்களுக்கு இண்டர்நெட்டை வழங்க, ஹாட்ஸ்பாட் மற்றும் டெதெரிங் முறையை பயன்படுத்தவும். அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, ஆப்ஸும் ஹாட்ஸ்பாட்டை உருவாக்கலாம்."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"உங்கள் வைஃபை அல்லது மொபைல் டேட்டா மூலம் வேறு சாதனங்களுக்கு இணைய இணைப்பை வழங்க ஹாட்ஸ்பாட்டையும் இணைப்பு முறையையும் பயன்படுத்தும். மேலும், அருகிலுள்ள சாதனங்களுடன் உள்ளடக்கத்தைப் பகிர, தனியாக ஒரு ஹாட்ஸ்பாட்டையும் ஆப்ஸ் உருவாக்கலாம்."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"உதவி"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"புளூடூத் ஸ்கேன் செய்தல்"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"புளூடூத் ஆஃப் செய்யப்பட்டிருந்தாலும்கூட, எந்தநேரத்திலும் அருகிலுள்ள சாதனங்களைத் தேட, ஆப்ஸையும் சேவைகளையும் அனுமதிக்கும். உதாரணத்திற்கு, இருப்பிடம் சார்ந்த அம்சங்கள் மற்றும் சேவைகளை மேம்படுத்துவதற்கும் இதைப் பயன்படுத்தலாம்."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"பணிக் கணக்கிற்கான இருப்பிடச் சேவைகள்"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல்"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல்"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"தற்போதைய நேர மண்டலத்தைக் கண்டறிய சாதனத்தின் இருப்பிடம் உபயோகிக்கப்படுவதை அனுமதிக்கும். நேர மண்டலத்தைக் கண்டறிதலின் துல்லியத்தன்மையை வைஃபை ஸ்கேனிங் போன்ற பிற இருப்பிட அமைப்புகள் பாதிக்கக்கூடும்."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ஆன்"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ஆஃப்"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"தானியங்கு நேர மண்டலத்தைக் கண்டறிதல் முடக்கப்பட்டுள்ளது"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல் முடக்கப்பட்டுள்ளது"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல் ஆதரிக்கப்படவில்லை"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"இருப்பிட நேர மண்டலத்தைக் கண்டறிதல் தொடர்பான மாற்றங்கள் அனுமதிக்கப்படவில்லை"</string>
     <string name="location_network_based" msgid="5247042890080021887">"வைஃபை &amp; மொபைல் நெட்வொர்க்கின் இருப்பிடம்"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"உங்கள் இருப்பிடத்தை விரைவாகக் கணிக்கும் வகையில் ஆப்ஸ், Google இன் இருப்பிடச் சேவையைப் பயன்படுத்தலாம். அநாமதேய இருப்பிடத் தரவு சேகரிக்கப்பட்டு Google க்கு அனுப்பப்படும்."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"வைஃபை மூலம் இருப்பிடம் கண்டறியப்பட்டது"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"முகம் காட்டித் திறக்க பின்னை அமைக்கவும்"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"முகம் காட்டி திறக்க பேட்டர்னை அமைக்கவும்"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"முகம் காட்டித் திறக்க பின்னை அமைக்கவும்"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"பயோமெட்ரிக்ஸுக்கான கடவுச்சொல்லை அமை"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"பயோமெட்ரிக்ஸுக்கான பேட்டர்னை அமை"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"பயோமெட்ரிக்ஸுக்கான பின் குறியீட்டை அமை"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"கடவுச்சொல்லை மறந்துவிட்டீர்களா?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"பேட்டர்னை மறந்துவிட்டீர்களா?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"பின்னை மறந்துவிட்டீர்களா?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"வசன விருப்பத்தேர்வுகள்"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"பெரிதாக்கல்"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"பெரிதாக்கும் பகுதி"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"பெரிதாக்கலை இயக்குதல்"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"திரையைப் பெரிதாக்கும்போது நீங்கள் பயன்படுத்த விரும்பும் பெரிதாக்கும் பகுதிகளைத் தேர்ந்தெடுக்கவும்"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"முழுத்திரை"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"திரையின் ஒரு பகுதி"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"முழுத்திரை &amp; திரையின் ஒரு பகுதி"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"முழுத்திரையைப் பெரிதாக்கும்"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"திரையின் ஒரு பகுதியைப் பெரிதாக்கும்"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"அணுகல்தன்மை பட்டனுக்கு மாற்றவா?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"திரையின் ஒரு பகுதியைப் பெரிதாக்க மூன்று முறை தட்டலைப் பயன்படுத்துவது தட்டச்சு மற்றும் பிற செயல்களைத் தாமதப்படுத்தும்.\n\nபெரிதாக்க அணுகல்தன்மை பட்டனைப் பயன்படுத்துவதற்கு மாற விரும்புகிறீர்களா?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"அணுகல்தன்மை பட்டனுக்கு மாறு"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"மூன்று முறைத் தட்டிப் பெரிதாக்கும் முறையே தொடர்தல்"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"பெரிதாக்கல் அமைப்புகள்"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"மூன்றுமுறை தட்டிப் பெரிதாக்குதல்"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ஷார்ட்கட் மூலம் பெரிதாக்குதல்"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"பவர் பட்டன் அழைப்பை நிறுத்தும்"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"பெரிய மவுஸ் பாயிண்டர்"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"அனிமேஷன்களை அகற்று"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"மோனோ ஆடியோ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ஆடியோ இயக்கத்தில் இருக்கும் போது சேனல்களை ஒன்றிணைக்கலாம்"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ஆடியோ பேலன்ஸ்"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"இடது"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"வலது"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"மோனோ ஆடியோ"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ஆடியோ இயங்கும்போது சேனல்களை ஒன்றிணைக்கலாம்"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ஆடியோ பேலன்ஸ்"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"இடது"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"வலது"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"இயல்பு"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 விநாடிகள்"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 விநாடிகள்"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"அறிவிப்பு அதிர்வுகள்"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"ரிங் அதிர்வுகள்"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"தொட்டு கருத்து தெரிவித்தல்"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ஐப் பயன்படுத்து"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ஆப்ஸைத் திற"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"வண்ணத் திருத்தத்தைப் பயன்படுத்து"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"தலைப்புகளைக் காண்பி"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"ஆதரிக்கப்படும் ஆப்ஸுக்கு மட்டும்"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ஐப் பயன்படுத்து"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ஆப்ஸைத் திற"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"கலர் கரெக்‌ஷனைப் பயன்படுத்து"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"தலைப்புகளைக் காண்பி"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"ஆதரிக்கப்படும் ஆப்ஸுக்கு மட்டும்"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"தலைப்பின் அளவும் நடையும்"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> உரை அளவு"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"மேலும் விருப்பங்கள்"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"டியூட்டரானோமலி"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"பிரோடனோமலி"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ட்ரைடானோமலி"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"கிரே ஸ்கேல்"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"சிவப்பு-பச்சை"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"சிவப்பு-பச்சை"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"நீலம்-மஞ்சள்"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"பின்னணி உபயோகத்தைக் கட்டுப்படுத்துதல்"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"பின்னணியில் இயங்குவதற்குப் ஆப்ஸை அனுமதிக்கும்"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"பின்னணியில் இயங்குவதற்குப் ஆப்ஸ் அனுமதிக்கப்படவில்லை"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"பின்னணி உபயோகத்தைக் கட்டுப்படுத்த முடியவில்லை"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"பின்னணி உபயோகத்தைக் கட்டுப்படுத்த முடியவில்லை"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"பின்னணி செயல்பாட்டைக் கட்டுப்படுத்தவா?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"ஆப்ஸின் பின்னணி செயல்பாட்டைக் கட்டுப்படுத்தினால், சரியாக வேலை செய்யாது."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"பேட்டரியை மேம்படுத்த அமைக்கப்படவில்லை, எனவே கட்டுப்படுத்த முடியாது.\n\nஆப்ஸை கட்டுப்படுத்த, பேட்டரி மேம்படுத்தலை ஆன் செய்க."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"டேப்லெட் வழக்கத்தைவிட அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"சாதனம் வழக்கத்தைவிட அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"பேட்டரி வழக்கத்தைவிட வேகமாகத் தீர்ந்துவிடக்கூடும்"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"பேட்டரியின் ஆயுளை மேம்படுத்துகிறது"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"பேட்டரி சார்ஜ் செய்வது தற்காலிகமாகக் கட்டுப்படுத்தப்பட்டுள்ளது. மேலும் அறிய தட்டவும்."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"உங்கள் சாதனம் வழக்கத்தைவிட அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது. எதிர்பார்த்ததைவிட வேகமாக பேட்டரி தீர்ந்துவிடக்கூடும்.\n\nஅதிகளவு பேட்டரியைப் பயன்படுத்திய ஆப்ஸ்:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"உங்கள் டேப்லெட்டை வழக்கத்தைவிட அதிகமாகப் பயன்படுத்தியுள்ளீர்கள். எதிர்பார்த்ததைவிட வேகமாக பேட்டரி தீர்ந்துவிடக்கூடும்.\n\nஅதிகளவு பேட்டரியைப் பயன்படுத்திய ஆப்ஸ்:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"உங்கள் சாதனம் வழக்கத்தைவிட அதிகமாகப் பயன்படுத்தப்பட்டுள்ளது. எதிர்பார்த்ததைவிட வேகமாக பேட்டரி தீர்ந்துவிடக்கூடும்.\n\nஅதிகளவு பேட்டரியைப் பயன்படுத்திய ஆப்ஸ்:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d ஆப்ஸ் கட்டுப்படுத்தப்பட்டது</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"பேட்டரி அளவை அறிவதில் சிக்கல்"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"பேட்டரி அளவை அறிவதில் சிக்கல். "<annotation id="url">"மேலும் அறிய"</annotation>" தட்டவும்"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ஆப்ஸை நிறுத்தவா?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> உங்கள் மொபைலைத் தொடர்ந்து செயல்பாட்டில் வைப்பதால், எப்போதும் போல் மொபைலால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, ஆப்ஸை நிறுத்தலாம்.\n\nதொடர்ந்து சிக்கல் ஏற்பட்டால், பேட்டரிச் செயல்திறனை மேம்படுத்த, ஆப்ஸை நிறுவல்நீக்க வேண்டியிருக்கும்."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> உங்கள் டேப்லெட்டைத் தொடர்ந்து செயல்பாட்டில் வைப்பதால், எப்போதும் போல் டேப்லெட்டால் பேட்டரியை நிர்வகிக்க முடியாது.\n\nஇந்தச் சிக்கலைத் தீர்க்க, ஆப்ஸை நிறுத்தலாம்.\n\nதொடர்ந்து சிக்கல் ஏற்பட்டால், பேட்டரிச் செயல்திறனை மேம்படுத்த, ஆப்ஸை நிறுவல்நீக்க வேண்டியிருக்கும்."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"பேட்டரி சேமிப்பு திட்டமிடல்"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"பேட்டரி நிலையை நீட்டிக்கும்"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"சார்ஜ் ஆகும்போது ஆஃப் செய்"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"உங்கள் மொபைலின் பேட்டரி <xliff:g id="PERCENT">%1$s</xliff:g> சார்ஜ் ஆகியிருக்கையில் பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"உங்கள் டேப்லெட்டின் பேட்டரி <xliff:g id="PERCENT">%1$s</xliff:g> சார்ஜ் ஆகியிருக்கையில் பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"உங்கள் சாதனத்தின் பேட்டரி <xliff:g id="PERCENT">%1$s</xliff:g> சார்ஜ் ஆகியிருக்கையில் பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"<xliff:g id="PERCENT">%1$s</xliff:g> மேல் மொபைலின் பேட்டரி சார்ஜ் ஆகும்போது பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"<xliff:g id="PERCENT">%1$s</xliff:g> மேல் டேப்லெட்டின் பேட்டரி சார்ஜ் ஆகும்போது பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"<xliff:g id="PERCENT">%1$s</xliff:g> மேல் சாதனத்தின் பேட்டரி சார்ஜ் ஆகும்போது பேட்டரி சேமிப்பான் ஆஃப் ஆகிவிடும்"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ஆன் செய்"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"மீட்டமை"</string>
     <string name="tts_play" msgid="2945513377250757221">"இயக்கு"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"சூழல்சார் இணைப்புநிலை"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"உங்கள் நெட்வொர்க் இணைப்புகளைத் தானாக நிர்வகிப்பதன் மூலம் பேட்டரி நிலையை நீட்டிப்பதோடு சாதனச் செயல்திறனையும் மேம்படுத்தும்"</string>
     <string name="credentials_title" msgid="7535942196886123656">"அனுமதிச் சான்று சேமிப்பிடம்"</string>
     <string name="credentials_install" msgid="3933218407598415827">"சான்றிதழை நிறுவுதல்"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"சேமிப்பிடத்திலிருந்து சான்றிதழ்களை நிறுவு"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"பயனரின் அனுமதிச் சான்றுகள்"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"சேமித்த அனுமதிச் சான்றுகளைப் பார்க்கும், திருத்தும்"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"மேம்பட்டது"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"சேமிப்பிடத்தின் வகை"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"வன்பொருள்-காப்புப் பிரதியெடுக்கப்பட்டது"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"மென்பொருள் மட்டும்"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"இவருக்கு நற்சான்றுகளை அணுக அனுமதியில்லை"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN மற்றும் பயன்பாடுகளுக்காக நிறுவியது"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"வைஃபைக்காக நிறுவியது"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"நிறுவ வேண்டாம்"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"பரவாயில்லை, நிறுவு"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"சான்றிதழ் நிறுவப்படவில்லை"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"இந்தச் சாதனத்தில் சான்றிதழ்களை நிறுவ <xliff:g id="APP_NAME">%s</xliff:g> ஆப்ஸை அனுமதிக்கவா?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"இந்தச் சான்றிதழ்கள் கீழே உள்ள ஆப்ஸுக்கும் URLகளுக்கும் உங்களை அடையாளப்படுத்தும்"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"அனுமதிக்க வேண்டாம்"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"அனுமதி"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"மேலும் காட்டு"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Certificate management ஆப்ஸ்"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"ஏதுமில்லை"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"இந்த ஆப்ஸால் நிறுவப்பட்ட சான்றிதழ்கள் பின்வரும் ஆப்ஸுக்கும் URLகளுக்கும் உங்களை அடையாளப்படுத்தும்"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"அகற்று"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"அவசரகால டயலிங் சிக்னல்"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"அவசர அழைப்பு இயக்கப்பட்டிருக்கும்போது நடத்தையை அமை"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"காப்புப்பிரதி"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"பணிக் கணக்கு அமைக்கப்படவில்லை"</string>
     <string name="user_admin" msgid="4024553191395768119">"நிர்வாகி"</string>
     <string name="user_you" msgid="3070562015202859996">"நீங்கள் (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"செல்லப்பெயர்"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> பயனர்கள் வரை சேர்க்கலாம்"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"டேப்லெட்டின் உரிமையாளர் மட்டுமே பயனர்களை நிர்வகிக்க முடியும்."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"தொலைபேசியின் உரிமையாளர் மட்டுமே பயனர்களை நிர்வகிக்க முடியும்."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"டெர்மினலில் பணம் செலுத்துதல்"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"பேமெண்ட் ஆப்ஸை அமைக்கவும். கான்டாக்ட்லெஸ் சின்னம் கொண்ட எந்த டெர்மினலிலும் உங்கள் மொபைலின் பின்பகுதியைக் காட்டவும்."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"சரி"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"மேலும்..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"மேலும்…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"இயல்புநிலை பேமெண்ட் ஆப்ஸாக அமைத்தல்"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"இயல்புநிலை பேமெண்ட் ஆப்ஸை மாற்றுதல்"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"காண்டாக்ட்லெஸ் டெர்மினலில் <xliff:g id="APP">%1$s</xliff:g> மூலம் பணம் செலுத்தவும்"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"பின் செல்"</string>
     <string name="wizard_next" msgid="3884832431439072471">"அடுத்து"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"முடி"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"படமெடு"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"படத்தைத் தேர்வுசெய்க"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"படத்தைத் தேர்வுசெய்க"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"சிம் கார்டுகள்"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"சிம் கார்டுகள்"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"அழைப்புகளுக்கு எப்போதும் இதை பயன்படுத்து"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"தரவுக்கான SIMஐத் தேர்ந்தெடுக்கவும்"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"மெசேஜூக்கான சிம்மைத் தேர்வுசெய்க"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"தரவு சிம் மாறுகிறது, இதற்கு ஒரு நிமிடம் வரை ஆகலாம்..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"டேட்டா சிம்மை மாற்றுகிறது, இதற்கு ஒரு நிமிடம் வரை ஆகலாம்…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"இந்த SIM வழியாக அழை"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"சிம் கார்டைத் தேர்வுசெய்யவும்"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"சிம் <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"வழக்கமான செயல்பாடு, கால அட்டவணை, பேட்டரி சேமிப்பான், மின்சக்தி சேமிப்பான், பேட்டரி, தானியங்கு, சதவீதம்"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, மேம்பட்ட அழைப்பு, 4g அழைப்பு"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"மொழியைச் சேர்க்கவும், ஒரு மொழியைச் சேர்க்கவும்"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"உரை அளவு"</string>
     <string name="default_sound" msgid="6604374495015245195">"இயல்பு ஒலி"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ஒலி &amp; அறிவிப்பு ஒலியளவு: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ஒலியளவு, அதிர்வு, தொந்தரவு செய்யாதே"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"ஒலிகளை இயக்கு"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"உடனடி வசன உரை"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"வசன உரைகளைத் தானாக எழுதும்"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ஏதுமில்லை"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> திட்டமிடல்கள் அமைக்கப்பட்டன</item>
-      <item quantity="one">1 திட்டமிடல் அமைக்கப்பட்டது</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{எதுவுமில்லை}=1{1 திட்டமிடல் அமைக்கப்பட்டது}other{# திட்டமிடல்கள் அமைக்கப்பட்டன}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"தொந்தரவு செய்யாதே"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"முக்கியமான நபர்கள் மற்றும் ஆப்ஸிலிருந்து மட்டும் அறிவிப்புகளைப் பெறு"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"குறுக்கீடுகளைக் குறைத்தல்"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"முக்கியமானவை மட்டும்"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ஆன் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ஆஃப் / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ஆஃப்"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ஆன்"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ஒவ்வொரு முறையும் கேள்"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"ஆஃப் செய்யும் வரை"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> மணிநேரம்</item>
-      <item quantity="one">1 மணிநேரம்</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> நிமிடங்கள்"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> கால அட்டவணைகள் தானாகவே ஆன் செய்யப்படலாம்</item>
-      <item quantity="one">1 கால அட்டவணை தானாகவே ஆன் செய்யப்படலாம்</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{ஒரு மணிநேரம்}other{# மணிநேரம்}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 நிமிடம்}other{# நிமிடங்கள்}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ஆஃப்}=1{ஆஃப் / 1 திட்டமிடல் தானாகவே ஆன் செய்யப்படலாம்}other{ஆஃப் / # திட்டமிடல்கள் தானாகவே ஆன் செய்யப்படலாம்}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'தொந்தரவு செய்ய வேண்டாம்\' அம்சத்தை எவையெல்லாம் குறுக்கிடும்?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"நபர்கள்"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ஆப்ஸ்"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"\'ஜென்டிலில்\' குறைந்த முன்னுரிமை அறிவிப்புகளைத் தானாக அமைக்கும்"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"சூழலுக்கேற்ற அறிவிப்புக்கான ரேங்க்"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"தொடர்பின் அடிப்படையில் அறிவிப்புக்களைத் தானாக வரிசைப்படுத்தும்"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"சூழலுக்கேற்ற அறிவிப்புக்கான கருத்து"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"அறிவிப்புகளில் செய்யப்பட்ட மாற்றங்களைக் குறிக்கும் மற்றும் சிஸ்டத்திற்குக் கருத்தை வழங்குவதற்கான விருப்பத்தைக் காட்டும்"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"அறிவிப்பு முக்கியத்துவத்தை மீட்டமைத்தல்"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"பயனரால் மாற்றப்பட்ட முக்கிய அமைப்புகளை மீட்டமைத்து முன்னுரிமை அளிக்க அறிவிப்பு உதவிக்கு அனுமதி வழங்கவும்"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"பரிந்துரைக்கப்படும் செயல்களும் பதில்களும்"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"பரிந்துரைக்கப்படும் செயல்கள் &amp; பதில்களைத் தானாகவே காட்டு"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"சமீபத்திய மற்றும் ஒத்திவைத்த அறிவிப்புகளைக் காட்டும்"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"முன்னுரிமை அளிக்கப்பட்ட உரையாடல்கள்"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"உரையாடல் பிரிவின் மேற்பகுதியில் மிதக்கும் குமிழ்களாகக் காட்டும்"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"உரையாடல் பிரிவின் மேற்பகுதியில் காட்டும்"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"பிற உரையாடல்கள்"</string>
+    <string name="other_conversations" msgid="551178916855139870">"முன்னுரிமை அளிக்கப்படாத உரையாடல்கள்"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"நீங்கள் மாற்றங்களைச் செய்த உரையாடல்கள்"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"சமீபத்திய உரையாடல்கள்"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"சமீபத்தியவற்றை அழி"</string>
+    <string name="clear" msgid="5092178335409471100">"அழி"</string>
     <string name="important_bubble" msgid="7911698275408390846">"முக்கியமான உரையாடல்களைக் குமிழாக்கு"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"அறிவிப்பு விபரத்தின் மேற்பகுதியில் முக்கியமான உரையாடல்களைக் காட்டும். அவற்றைக் குமிழாகவும் ‘தொந்தரவு செய்ய வேண்டாம்’ குறுக்கீடு செய்யும் வகையிலும் அமைக்கலாம்."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"முக்கியமான மற்றும் மாற்றியமைக்கப்பட்ட உரையாடல்கள் இங்கே தோன்றும்"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"\'தொந்தரவு செய்யாதே\' அணுகல்"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"’தொந்தரவு செய்ய வேண்டாம்’ அம்சத்தை அனுமதி"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"\'தொந்தரவு செய்யாதே\' அணுகலை நிறுவப்பட்ட ஆப்ஸ் எதுவும் கோரவில்லை"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ஆப்ஸை ஏற்றுகிறது..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ஆப்ஸை ஏற்றுகிறது…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"உங்கள் கோரிக்கையின் படி, சாதனத்தில் இந்த ஆப்ஸின் அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"உங்கள் கோரிக்கையின் படி, இந்தச் சாதனத்தில், இந்த வகை அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"உங்கள் கோரிக்கையின் படி, இந்தச் சாதனத்தில், இந்தக் குழு அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"அனைத்து உரையாடல்களும்"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"முன்னுரிமை அளிக்கப்பட்ட உரையாடல்கள்"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ஏதுமில்லை"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> உரையாடல்கள்</item>
-      <item quantity="one">1 உரையாடல்</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ஏதுமில்லை"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{எதுவுமில்லை}=1{1 உரையாடல்}other{# உரையாடல்கள்}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"யாரால் குறுக்கிட முடியும்?"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"அழைப்புகள்"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"அழைப்புகள்"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"அனுமதிக்கப்படும் அழைப்புகள் ஒலி எழுப்புமா என்பதை உறுதிப்படுத்த உங்கள் சாதனம் ஒலி எழுப்பும்படி உள்ளதா என்பதைச் சரிபார்க்கவும்"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’க்கு வரும் அழைப்புகள் தடுக்கப்பட்டுள்ளன. உங்களை நண்பர்களோ, குடும்பத்தினரோ, வேறு தொடர்புகளோ தொடர்புகொள்வதற்கு அனுமதிக்க நீங்கள் அமைப்புகளை மாற்றிக்கொள்ளலாம்."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"நட்சத்திரமிட்ட தொடர்புகள்"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> பேர்</item>
-      <item quantity="one">ஒருவர்</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ஏதுமில்லை"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{எதுவுமில்லை}=1{{contact_1}}=2{{contact_1} &amp; {contact_2}}=3{{contact_1}, {contact_2}, {contact_3} ஆகியோர்}other{{contact_1}, {contact_2} மற்றும் # பேர்}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(பெயர் இல்லை)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"மெசேஜ்கள்"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ என்பதற்கு உள்வரும் மெசேஜ்கள் தடுக்கப்பட்டுள்ளன. உங்களைத் தொடர்புகொள்ள நண்பர்களையோ குடும்பத்தினரையோ வேறு தொடர்புகளையோ அனுமதிக்குமாறு அமைப்புகளை மாற்றிக்கொள்ளலாம்."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"மேசெஜ்கள் அனைத்தையும் பெற முடியும்"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"அழைப்புகள் அனைத்தையும் பெற முடியும்"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ஏதுமில்லை"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> தொடர்புகள்</item>
-      <item quantity="one">1 தொடர்பு</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{எதுவுமில்லை}=1{1 தொடர்பு}other{# தொடர்புகள்}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"எவரிடம் இருந்தும்"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"தொடர்புகள்"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"நட்சத்திரமிட்ட தொடர்புகள்"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"அனைத்து அறிவிப்புகளும்"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"சில அறிவிப்புகள்"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"ஆப்ஸ் குறுக்கிடுவதை நீங்கள் அனுமதிக்காவிட்டாலும் தேர்ந்தெடுக்கப்பட்ட நபர்களால் உங்களைத் தொடர்பு கொள்ள முடியும்"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> ஆகிய ஆப்ஸால் குறுக்கிட முடியும்</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> ஆப்ஸால் குறுக்கிட முடியும்</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"மேலும் <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{எந்த ஆப்ஸும் குறுக்கிட முடியாது}=1{{app_1} குறுக்கிட முடியும்}=2{{app_1} மற்றும் {app_2} குறுக்கிட முடியும்}=3{{app_1}, {app_2}, {app_3} ஆகியவைக் குறுக்கிட முடியும்}other{{app_1}, {app_2} மற்றும் கூடுதலாக # ஆப்ஸால் குறுக்கிட முடியும்}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ஆப்ஸ்"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"அனைத்து அறிவிப்புகளும்"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"சில அறிவிப்புகள்"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"குறுக்கிட முடிகின்ற அறிவிப்புகள்"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"அறிவிப்புகள் அனைத்தையும் அனுமதி"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> ஆகிய ஒலிகளால் குறுக்கிட முடியும்</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> குறுக்கிட முடியும்</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"எதுவும் குறுக்கிட முடியாது"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"மேலும் <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{எதுவும் குறுக்கிட முடியாது}=1{{sound_category_1} குறுக்கிட முடியும்}=2{{sound_category_1} மற்றும் {sound_category_2} குறுக்கிட முடியும்}=3{{sound_category_1}, {sound_category_2},{sound_category_3} ஆகியவைக் குறுக்கிட முடியும்}other{{sound_category_1}, {sound_category_2}, மற்றும் கூடுதலாக # குறுக்கிட முடியும்}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"எதுவும் குறுக்கிட முடியாது"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"யாரும் குறுக்கிட முடியாது"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"சிலரால் குறுக்கிட முடியும்"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"அனைவரும் குறுக்கிட முடியும்"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ஆன்"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"ஆஃப்"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"ஆப்ஸைப் பின் செய்தல்"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"அகற்றப்படும்வரை ஆப்ஸ் ஒன்றைத் திரையில் காட்டுவதற்கு ஆப்ஸைப் பின் செய்தல் அம்சம் அனுமதிக்கிறது. உதாரணமாக, இந்த அம்சத்தைப் பயன்படுத்தி குறிப்பிட்ட கேமை விளையாட நம்பிக்கைக்குரிய நண்பரை அனுமதிக்கலாம். \n\nஆப்ஸ் பின் செய்யப்பட்டிருக்கும்போது அது பிற ஆப்ஸைத் திறக்கக்கூடும், இதனால் தனிப்பட்ட தரவு அணுகப்படக்கூடும். \n\nஆப்ஸைப் பின் செய்ய: 	\n1.	ஆப்ஸைப் பின் செய்தல் அம்சத்தை ஆன் செய்யவும் 	\n2.	மேலோட்டப் பார்வையைத் திறக்கவும் 	\n3.	திரையின் மேற்பகுதியில் உள்ள ஆப்ஸ் ஐகானைத் தட்டி ‘பின் செய்’ என்பதைத் தட்டவும்"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"அகற்றப்படும்வரை ஆப்ஸ் ஒன்றைத் திரையில் காட்டுவதற்கு ஆப்ஸைப் பின் செய்தல் அம்சம் அனுமதிக்கிறது. உதாரணமாக, இந்த அம்சத்தைப் பயன்படுத்தி குறிப்பிட்ட கேமை விளையாட நம்பிக்கைக்குரிய நண்பரை அனுமதிக்கலாம். \n\nஆப்ஸ் பின் செய்யப்பட்டிருக்கும்போது அது பிற ஆப்ஸைத் திறக்கக்கூடும், இதனால் தனிப்பட்ட தரவு அணுகப்படக்கூடும். \n\nசாதனத்தை வேறொருவருடன் பாதுகாப்பாகப் பகிர விரும்பினால் கெஸ்ட் பயனர் அம்சத்தைப் பயன்படுத்தவும். \n\nஆப்ஸைப் பின் செய்ய: 	\n1.	ஆப்ஸைப் பின் செய்தல் அம்சத்தை ஆன் செய்யவும் 	\n2.	மேலோட்டப் பார்வையைத் திறக்கவும் 	\n3.	திரையின் மேற்பகுதியில் உள்ள ஆப்ஸ் ஐகானைத் தட்டி ‘பின் செய்’ என்பதைத் தட்டவும்"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"அகற்றப்படும்வரை ஆப்ஸ் ஒன்றைத் திரையில் காட்டுவதற்கு ஆப்ஸைப் பின் செய்தல் அம்சம் அனுமதிக்கிறது. உதாரணமாக, இந்த அம்சத்தைப் பயன்படுத்தி குறிப்பிட்ட கேமை விளையாட நம்பிக்கைக்குரிய நண்பரை அனுமதிக்கலாம்."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"ஆப்ஸ் பின் செய்யப்பட்டிருக்கும்போது அது பிற ஆப்ஸைத் திறக்கக்கூடும், இதனால் தனிப்பட்ட தரவு அணுகப்படக்கூடும். \n\nஆப்ஸைப் பின் செய்தல் அம்சத்தைப் பயன்படுத்த: 	\n1.	ஆப்ஸைப் பின் செய்தல் அம்சத்தை ஆன் செய்யவும் 	\n2.	மேலோட்டப் பார்வையைத் திறக்கவும் 	\n3.	திரையின் மேற்பகுதியில் உள்ள ஆப்ஸ் ஐகானைத் தட்டி ‘பின் செய்’ என்பதைத் தட்டவும்"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"ஆப்ஸ் பின் செய்யப்பட்டிருக்கும்போது அது பிற ஆப்ஸைத் திறக்கக்கூடும், இதனால் தனிப்பட்ட தரவு அணுகப்படக்கூடும். \n\nசாதனத்தை வேறொருவருடன் பாதுகாப்பாகப் பகிர விரும்பினால் கெஸ்ட் பயனர் அம்சத்தைப் பயன்படுத்திப் பார்க்கவும். \n\nஆப்ஸைப் பின் செய்தல் அம்சத்தைப் பயன்படுத்த: 	\n1.	ஆப்ஸைப் பின் செய்தல் அம்சத்தை ஆன் செய்யவும் 	\n2.	மேலோட்டப் பார்வையைத் திறக்கவும் 	\n3.	திரையின் மேற்பகுதியில் உள்ள ஆப்ஸ் ஐகானைத் தட்டி ‘பின் செய்’ என்பதைத் தட்டவும்"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"ஆப்ஸ் பின் செய்யப்படும்போது: \n\n•	தனிப்பட்ட தரவுக்கு அணுகல்தன்மை இருக்கக்கூடும் \n		(தொடர்புகள், மின்னஞ்சல் உள்ளடக்கம் போன்றவை) \n•	பின் செய்யப்பட்ட ஆப்ஸ் பிற ஆப்ஸைத் திறக்கக்கூடும் \n\nஉங்கள் நம்பிக்கைக்குரிய நபர்களுடன் மட்டுமே ஆப்ஸைப் பின்செய்தல் அம்சத்தைப் பயன்படுத்தவும்."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"அகற்றும் முன் திறத்தல் வடிவத்தைக் கேள்"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"அகற்றும் முன் பின்னைக் கேள்"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"சாதனத்தைத் திறப்பதற்கு உங்கள் முகத்தைப் பயன்படுத்துவது மட்டுமல்லாமல், சாதனம் தொடங்கும் முன்பாக, பின்னை உள்ளிடும்படி அமைத்து, கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும்வரை, அழைப்புகள், மெசேஜ்கள், அலாரங்கள் உள்ளிட்ட எவற்றையும் சாதனத்தால் பெற இயலாது.\n\nசாதனம் தொலைந்துவிட்டாலோ திருடப்பட்டாலோ, அதிலுள்ள தரவைப் பாதுகாக்க இது உதவும். சாதனத்தைத் தொடங்கும்போது கடவுச்சொல்லைக் கேட்குமாறு அமைக்கவா?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"சாதனத்தைத் திறப்பதற்கு உங்கள் முகத்தைப் பயன்படுத்துவது மட்டுமல்லாமல், சாதனம் தொடங்கும் முன்பாக, பேட்டர்னை உள்ளிடும்படி அமைத்து, கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும்வரை, அழைப்புகள், மெசேஜ்கள், அலாரங்கள் உள்ளிட்ட எவற்றையும் சாதனத்தால் பெற இயலாது. \n\nசாதனம் தொலைந்துவிட்டாலோ திருடப்பட்டாலோ, அதிலுள்ள தரவைப் பாதுகாக்க இது உதவும். சாதனத்தைத் தொடங்கும்போது கடவுச்சொல்லைக் கேட்குமாறு அமைக்கவா?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"சாதனத்தைத் திறப்பதற்கு உங்கள் முகத்தைப் பயன்படுத்துவது மட்டுமல்லாமல், சாதனம் தொடங்கும் முன்பாக, கடவுச்சொல்லை உள்ளிடும்படி அமைத்து, கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும்வரை, அழைப்புகள், மெசேஜ்கள், அலாரங்கள் உள்ளிட்ட எவற்றையும் சாதனத்தால் பெற இயலாது. \n\nசாதனம் தொலைந்துவிட்டாலோ திருடப்பட்டாலோ, அதிலுள்ள தரவைப் பாதுகாக்க இது உதவும். சாதனத்தைத் தொடங்கும்போது கடவுச்சொல்லைக் கேட்குமாறு அமைக்கவா?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"உங்கள் சாதனத்தைத் திறக்க பயோமெட்ரிக்ஸைப் பயன்படுத்துவதுடன் பின் குறியீடு (PIN) தேவைப்படுமாறும் அமைத்து இந்தச் சாதனத்திற்குக் கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும் வரை அழைப்புகள், மெசேஜ்கள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது.\n\nஉங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ அதில் உள்ள தரவைப் பாதுகாக்க இதைக் கடைப்பிடிக்கலாம். உங்கள் சாதனத்தைத் தொடங்க, பின் குறியீடு (PIN) தேவைப்படுமாறு அமைக்கவா?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"உங்கள் சாதனத்தைத் திறக்க பயோமெட்ரிக்ஸைப் பயன்படுத்துவதுடன் பேட்டர்ன் தேவைப்படுமாறும் அமைத்து இந்தச் சாதனத்திற்குக் கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும் வரை அழைப்புகள், மெசேஜ்கள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது.\n\nஉங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ அதில் உள்ள தரவைப் பாதுகாக்க இதைக் கடைப்பிடிக்கலாம். உங்கள் சாதனத்தைத் தொடங்க, பேட்டர்ன் தேவைப்படுமாறு அமைக்கவா?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"உங்கள் சாதனத்தைத் திறக்க பயோமெட்ரிக்ஸைப் பயன்படுத்துவதுடன் கடவுச்சொல் தேவைப்படுமாறும் அமைத்து இந்தச் சாதனத்திற்குக் கூடுதல் பாதுகாப்பை வழங்கலாம். சாதனம் தொடங்கும் வரை அழைப்புகள், மெசேஜ்கள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது.\n\nஉங்கள் சாதனம் தொலைந்து போனாலோ திருடு போனாலோ அதில் உள்ள தரவைப் பாதுகாக்க இதைக் கடைப்பிடிக்கலாம். உங்கள் சாதனத்தைத் தொடங்க, கடவுச்சொல் தேவைப்படுமாறு அமைக்கவா?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ஆம்"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"வேண்டாம்"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"கட்டுப்படுத்தியது"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USBயை இதன்மூலம் கட்டுப்படுத்து:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"இணைக்கப்பட்ட சாதனம்"</string>
     <string name="usb_control_device" msgid="527916783743021577">"இந்தச் சாதனம்"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"மாறுகிறீர்கள்..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"மாற்றுகிறது…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"மாற முடியவில்லை"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"இந்தச் சாதனத்தைச் சார்ஜ் செய்வதற்கு"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"இணைக்கப்பட்ட சாதனத்தைச் சார்ஜ் செய்தல்"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"மொபைல் டேட்டா உபயோகம்"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"ஆப்ஸ் டேட்டா உபயோகம்"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"வைஃபை டேட்டா உபயோகம்"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"மொபைல் நிறுவனம் அல்லாத டேட்டா பயன்பாடு"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ஈதர்நெட் டேட்டா உபயோகம்"</string>
     <string name="wifi" msgid="2932584495223243842">"வைஃபை"</string>
     <string name="ethernet" msgid="4665162609974492983">"ஈதர்நெட்"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 கட்டுப்பாடு</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"மொபைல் நிறுவனம் கணக்கிடும் டேட்டா அளவும், சாதனம் கணக்கிடும் டேட்டா அளவும் மாறுபடலாம்"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"மொபைல் நிறுவன நெட்வொர்க்குகள் மூலம் பயன்படுத்திய டேட்டா தவிர்த்து"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> பயன்படுத்தப்பட்டது"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"டேட்டா பயன்பாட்டு எச்சரிக்கையை அமை"</string>
     <string name="data_warning" msgid="2925054658166062884">"டேட்டா பயன்பாட்டு எச்சரிக்கை"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"விவரங்களைக் காட்டு"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"டேட்டா சேமிப்பான்"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"வரம்பற்ற டேட்டா"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"பின்புல டேட்டா உபயோகம் முடக்கப்பட்டது"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"பின்புலத் தரவு ஆஃப் செய்யப்பட்டது"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ஆன்"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ஆஃப்"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"டேட்டா சேமிப்பானைப் பயன்படுத்து"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"சாதனம் பூட்டப்பட்டிருந்தால், அறிவிப்புகளில் பதில்கள் அல்லது பிற உரையை உள்ளிடுவதைத் தடு"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"இயல்பு பிழைத்திருத்தி"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"பிழைத்திருத்தியைத் தேர்வுசெய்க"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"பிழைதிருத்தியைப் பயன்படுத்துதல்"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"பிழைதிருத்தியைப் பயன்படுத்து"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"தேர்ந்தெடுக்கவில்லை"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(எதுவுமில்லை)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"சேமிப்பக இடத்தைக் காலியாக்க உதவ, காப்புப் பிரதி எடுக்கப்பட்ட படங்களையும் வீடியோக்களையும் உங்கள் சாதனத்திலிருந்து சேமிப்பக நிர்வாகி அகற்றும்."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"படங்கள் &amp; வீடியோக்களை அகற்று"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"சேமிப்பக நிர்வாகி"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"சேமிப்பக நிர்வாகியைப் பயன்படுத்து"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"சேமிப்பக நிர்வாகியைப் பயன்படுத்து"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"தானியங்கு"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"கைமுறை"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"இப்போதே இடத்தைக் காலியாக்கு"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"மொபைல் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"டேப்லெட் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"சாதனத் திரையில் அறிவிப்புகளைப் பார்க்க, இருமுறை தட்டவும்"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"அறிவிப்புகளுக்கு ஸ்வைப் செய்க"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"அறிவிப்புகளைக் காட்ட, திரையின் கீழ் விளிம்பில் கீழ்நோக்கி ஸ்வைப் செய்யவும்"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ஒற்றைக் கைப் பயன்முறை"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ஒற்றைக் கைப் பயன்முறையைப் பயன்படுத்து"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ஆப்ஸிற்கிடையில் மாறும்போது இதிலிருந்து வெளியேறு"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"நேரம் முடிந்தது"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 வினாடிகள்"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 வினாடிகள்"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 வினாடிகள்"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ஒற்றைக் கை அணுகல்"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"நேரம், அறிவிப்புகள் மற்றும் பிற தகவலைப் பார்க்கத் திரையை இருமுறை தட்டவும்."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"திரையில் அறிவிப்புகளைப் பார்க்க, மொபைலைக் கையில் எடுக்கவும்"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"திரையில் அறிவிப்புகளை பார்க்க, டேப்லெட்டை கையில் எடுக்கவும்"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"டேப்லெட் திரையில் அறிவிப்புகளைப் பார்க்கத் தட்டவும்"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"சாதனத் திரையில் அறிவிப்புகளைப் பார்க்கத் தட்டவும்"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"நேரம், அறிவிப்புகள் மற்றும் பிற தகவலைப் பார்க்கத் திரையைத் தட்டவும்."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"அவசரகால SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"அவசரகால SOSஸைப் பயன்படுத்துதல்"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"நிர்வகிப்பது: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"பவர் பட்டனை விரைவாக 5 முறையோ அதைவிட அதிகமாகவோ அழுத்துவதன் மூலம் கீழேயுள்ள செயல்களைத் தொடங்கலாம்"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"கவுண்ட்டவுன் அலாரத்தைப் பிளே செய்தல்"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"அவசரகாலச் சேவைகளை அழைக்கும் முன் சத்தமான ஒலியைப் பிளே செய்யும்"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"உதவிக்கு அழைத்தல்"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"உதவிக்கு அழைப்பதற்கான எண்"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. மாற்ற தட்டவும்"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"அவசர உதவி எண் அல்லாத பிற எண்ணை உள்ளிட்டால்:\n • அவசரகால SOSஸைப் பயன்படுத்த, சாதனம் அன்லாக் செய்யப்பட்டிருக்க வேண்டும்\n • உங்கள் அழைப்புக்குப் பதிலளிக்கப்படாமல் போகலாம்"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"அறிவிப்புகளைப் பெற சென்சாரில் ஸ்வைப் செய்தல்"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"கைரேகை ஸ்வைப்"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"அறிவிப்புகளைப் பார்க்க, மொபைலின் பின்புறத்தில் உள்ள கைரேகை சென்சாரில் கீழ் நோக்கி ஸ்வைப் செய்தல்."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"அதிகபட்சத் தெரியக்கூடிய தரவுத் தொகுப்புகள்"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"இயல்புநிலை மதிப்புகளுக்கு மீட்டமை"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"தன்னிரப்பி டெவெலப்பர் விருப்பங்கள் மீட்டமைக்கப்பட்டன"</string>
+    <string name="location_category" msgid="3496759112306219062">"இருப்பிடம்"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"நிலைப் பட்டியின் இருப்பிட இண்டிக்கேட்டர்"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"நெட்வொர்க், இணைப்புநிலை உட்பட அனைத்து இருப்பிடங்களுக்கும் காட்டும்"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"முழுமையான GNSS அளவீடுகளை அமலாக்கு"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"பணி சுழற்சியை முடக்கி, GNSS வழிசெலுத்துதல்கள் மற்றும் அதிர்வெண்கள் அனைத்தையும் கண்காணித்தல்."</string>
     <string name="device_theme" msgid="5027604586494772471">"சாதனத்தின் தீம்"</string>
     <string name="default_theme" msgid="4815428567082263639">"இயல்பு"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"நெட்வொர்க் பெயர்"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"கவனம் சிதறாமல் இருக்க, அறிவிப்புகளை இடைநிறுத்தவும்"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"அம்சம் இல்லை"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"மொபைலின் வேகத்தைப் பாதிப்பதால் இந்த அம்சம் ஆஃப் செய்யப்பட்டுள்ளது"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"முழுமையான GNSS அளவீடுகளை அமலாக்கு"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"பணி சுழற்சியை முடக்கி, GNSS வழிசெலுத்துதல்கள் மற்றும் அதிர்வெண்கள் அனைத்தையும் கண்காணித்தல்."</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"சிதைவு அறிவிப்பை எப்போதும் காட்டு"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"ஆப்ஸ் செயலிழக்கும் போதெல்லாம் சிதைவு அறிவிப்பைக் காட்டும்"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE இயக்கப்பட்ட ஆப்ஸைத் தேர்வுசெய்க"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"அனைத்து ஆப்ஸிற்கும் இயக்குதல்"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Graphics Driverரைத் தேர்ந்தெடுத்தல்"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"இயல்பு"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"கேம் டிரைவர்"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"டெவெலப்பர் டிரைவர்"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"System Graphics Driver"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"ஆன் (ஒலி முடக்கம்)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ஆஃப்"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"நெட்வொர்க் விவரங்கள்"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"உங்களது மொபைலில் உள்ள ஆப்ஸிற்கு, உங்கள் சாதனத்தின் பெயர் தெரியும். புளூடூத் சாதனங்களுடன் இணைக்கும்போது அல்லது வைஃபை ஹாட்ஸ்பாட்டை அமைக்கும்போது, அப்பெயர் பிறருக்குக் காட்டப்படலாம்."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"உங்கள் மொபைலில் உள்ள ஆப்ஸால் உங்கள் சாதனத்தின் பெயரைப் பார்க்க முடியும். புளூடூத் சாதனங்கள், வைஃபை நெட்வொர்க் ஆகியவற்றுடன் இணைக்கும்போதோ வைஃபை ஹாட்ஸ்பாட்டை அமைக்கும்போதோ அப்பெயர் பிறருக்கும் காட்டப்படக்கூடும்."</string>
     <string name="devices_title" msgid="649715719278562515">"சாதனங்கள்"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"அனைத்து அமைப்புகளும்"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"பரிந்துரைகள்"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"நெட்வொர்க்குகளைக் கண்டறிய முடியவில்லை. மீண்டும் முயலவும்."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(தடுக்கப்பட்டது)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"சிம் கார்டு இல்லை"</string>
+    <string name="sim_card" msgid="6381158752066377709">"சிம்"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"சிம் இல்லை"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ஏதுமில்லை"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"இணைப்பதற்கு சிம் தேவைப்படுகிறது"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"இணைப்பதற்கு <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> சிம் தேவைப்படுகிறது"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"விருப்பமான நெட்வொர்க் பயன்முறை: WCDMAக்கு முன்னுரிமை"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"விருப்பமான நெட்வொர்க் பயன்முறை: GSM மட்டும்"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"விருப்பமான நெட்வொர்க் பயன்முறை: WCDMA மட்டும்"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"மொபைல் டேட்டா"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"மொபைல் நெட்வொர்க் மூலம் டேட்டாவைப் பயன்படுத்துதல்"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"தொடர்பு எல்லையில் இருக்கும்போது மொபைல் தானாகவே இந்த மொபைல் நிறுவனத்தின் சேவைக்கு மாறிவிடும்"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"சிம் கார்டு எதுவும் இல்லை"</string>
     <string name="calls_preference" msgid="2166481296066890129">"அழைப்புகளின் விருப்பம்"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS விருப்பம்"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ஒவ்வொரு முறையும் கேள்"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> உடன் இணைந்திருக்கும்போது கிடைக்காது"</string>
     <string name="see_more" msgid="7499355691042812723">"மேலும் காட்டு"</string>
     <string name="see_less" msgid="2642392725363552793">"குறைவாகக் காட்டு"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ஐ ஆன் செய்யவா?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"சிம்மை ஆன் செய்யவா?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>க்கு மாற்றவா?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"சிம் கார்டைப் பயன்படுத்தவா?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ஒரு நேரத்தில் ஒரு சிம் மட்டுமே செயலில் இருக்கும்.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> சேவைக்கு மாற்றுவதனால் <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> சேவை ரத்துசெய்யப்படாது."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ஒரு நேரத்தில் ஒரு பதிவிறக்கிய சிம் மட்டுமே செயலில் இருக்கும்.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> சேவைக்கு மாற்றுவதனால் <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> சேவை ரத்துசெய்யப்படாது."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ஒரு நேரத்தில் ஒரு சிம் மட்டுமே செயலில் இருக்கும்.\n\nமாற்றுவதனால் <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> சேவை ரத்துசெய்யப்படாது."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>க்கு மாற்று"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"நெட்வொர்க்குடன் இணைக்கிறது…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>க்கு மாற்றுகிறது"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"மொபைல் நிறுவனத்தை மாற்ற முடியவில்லை"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"பிழை காரணமாக மொபைல் நிறுவனத்தை மாற்ற முடியவில்லை."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ஐ ஆஃப் செய்யவா?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"சிம்மை ஆஃப் செய்யவா?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"சிம்மை ஆஃப் செய்கிறது<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"மொபைல் நிறுவனத்தை முடக்க முடியவில்லை"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ஏதோ தவறாகிவிட்டதால் தொலைத்தொடர்பு நிறுவனத்தை முடக்க முடியவில்லை."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 சிம்களைப் பயன்படுத்தவா?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"இந்த மொபைலில் ஒரே சமயத்தில் 2 சிம்களைப் பயன்படுத்தலாம். ஒரு சமயத்தில் 1 சிம்மை மட்டும் பயன்படுத்த, \"வேண்டாம்\" என்பதைத் தட்டவும்."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"சாதனத்தை மீண்டும் தொடங்கவா?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"இயக்குவதற்கு மொபைலை மீண்டும் தொடங்கவும். பிறகு மற்றொரு சிம்மை நீங்கள் சேர்க்கலாம்."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"தொடர்க"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"மீண்டும் தொடங்கு"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"வேண்டாம்"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"மாற்று"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"சிம்மை இயக்க முடியவில்லை"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"சிம்மை அகற்றிவிட்டு மீண்டும் செருகவும். சிக்கல் தொடரும்பட்சத்தில் சாதனத்தை மீண்டும் தொடங்கவும்."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"சிம்மை மீண்டும் ஆன் செய்து பார்க்கவும். சிக்கல் தொடரும்பட்சத்தில் சாதனத்தை மீண்டும் தொடங்கவும்."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"மொபைல் நெட்வொர்க்கை இயக்குதல்"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> செயல்பாட்டில் உள்ளது"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM அமைப்புகளை மாற்ற தட்டவும்"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM கார்டு"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"இந்தப் பதிவிறக்கிய சிம்மை அழிக்கவா?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"சிம்மை அழிப்பது இந்தச் சாதனத்தில் இருந்து <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> சேவையை அகற்றிவிடும்.\n\nஇதனால் <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> சேவை ரத்துசெய்யப்படாது."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"அழி"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"சிம்மை அழிக்கிறது…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"சிம்மை அழிக்க இயலவில்லை"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"பிழை ஏற்பட்டதால் இந்த சிம்மை அழிக்க இயலாது.\n\nசாதனத்தை மீண்டும் தொடங்கி முயலவும்."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"சாதனத்துடன் இணைத்தல்"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"உங்கள் சாதனத்துடன் இணைக்க <xliff:g id="APPNAME">%1$s</xliff:g> ஆப்ஸ் தற்காலிகமான வைஃபை நெட்வொர்க்கைப் பயன்படுத்த விரும்புகிறது"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"சாதனங்கள் எதுவும் இல்லை. சாதனங்கள் ஆன் செய்யப்பட்டு இணைப்பதற்குத் தயாராக உள்ளனவா என்பதை உறுதிப்படுத்தவும்."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"அவசர அழைப்புகள்"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"வைஃபை அழைப்பு மூலம் அவசர அழைப்பு செய்வதை உங்கள் மொபைல் நிறுவனம் ஆதரிக்கவில்லை.\nஅவசர அழைப்பைச் செய்வதற்குச் சாதனம் தானாகச் செல்லுலார் நெட்வொர்க்கிற்கு மாறி விடும்.\nசெல்லுலார் கவரேஜ் உள்ள இடங்களில் மட்டுமே அவசர அழைப்புகள் சாத்தியமாகும்."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"வைஃபையைப் பயன்படுத்தி அழைப்புகளின் தரத்தை மேம்படுத்தலாம்"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"கிராஸ் சிம் அழைப்பு"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"வேறு சிம்மின் அழைப்புகளையும் SMSகளையும் இந்த சிம்மில் அனுமதிக்கும்."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"கிராஸ் சிம் அழைப்பு"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"உள்வரும் MMS மெசேஜ்"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS மெசேஜை அனுப்ப இயலவில்லை"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"மொபைல் டேட்டா ஆஃப் செய்யப்பட்டிருக்கும்போது <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> இல் MMS மெசேஜிங்கை அனுமதிக்கத் தட்டவும்."</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"அமைப்புகளில் திரை மேலடுக்கை அனுமதித்தல்"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"அமைப்புகள் திரைகளுக்கு மேலாகக் காட்டுவதற்கு மற்ற ஆப்ஸில் டிஸ்ப்ளே செய்யப்படக்கூடிய ஆப்ஸை அனுமதிக்கும்"</string>
     <string name="media_controls_title" msgid="403271085636252597">"மீடியா"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"மீடியா அமர்வு முடிந்தபிறகு பிளேயரை மறை"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"விரிவாக்கப்பட்ட விரைவு அமைப்புகள் பேனலிலிருந்து அமர்வு ஒன்றை மீண்டும் தொடங்க இந்தப் பிளேயர் அனுமதிக்கும்."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"விரைவு அமைப்புகளில் மீடியா பிளேயர்"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"பிளேபேக்கை எளிதாக மீண்டும் தொடங்க மீடியா பிளேயரை கூடுதல் நேரத்துக்குக் காண்பிக்கும்"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"பிளேயர் மறை"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"பிளேயரைக் காட்டு"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"பிளேயர்கள் எதுவுமில்லை"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"அனுமதிக்கப்படும் ஆப்ஸ்"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"மீடியா"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"புளூடூத் ஆன் செய்யப்படும்"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ஆன்"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"ஆஃப்"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"இணையம்"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"சிம்கள்"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"விமானப்-பாதுகாப்பு நெட்வொர்க்குகள்"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"விமானப்-பாதுகாப்பு நெட்வொர்க்குகளைத் தேடி இணைக்கவும்"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"விமானம், விமானப்-பாதுகாப்பு"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"அழைப்புகள் &amp; மெசேஜ்"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"வைஃபை அழைப்பு"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"வைஃபை போன்ற மொபைல் நிறுவனம் அல்லாத நெட்வொர்க்குகளைப் பயன்படுத்தி அழைக்கலாம், அழைப்புகளைப் பெறலாம்"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"வைஃபை அழைப்பு அம்சம் மூலம் சில வைஃபை நெட்வொர்க்குகள் போன்ற மொபைல் நிறுவனம் அல்லாத நெட்வொர்க்குகளைப் பயன்படுத்தி அழைக்கலாம் அழைப்புகளைப் பெறலாம்."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"அழைப்புகள்"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"மெசேஜ்"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"விருப்பம்"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"அழைப்புகளை மேற்கொள்ளலாம்"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"மெசேஜ் அனுப்பலாம்"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"அழைப்புகள்/மெசேஜ் செய்ய முடியாது"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"சிம் இல்லை"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"விருப்பத்தேர்வுகள்"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"பொது நெட்வொர்க்குகளுடன் இணைக்கலாம்"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"நெட்வொர்க் இணைப்பு, இணையம், வயர்லெஸ், டேட்டா, வைஃபை, வை-ஃபை, வை ஃபை, செல்லுலார், மொபைல், செல் கேரியர், 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"விமான-பாதுகாப்பு நெட்வொர்க்குகளை காட்டு"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"விமானப் பயன்முறையை ஆஃப் செய்"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"உறக்கநேரப் பயன்முறை ஆன் செய்யப்பட்டுள்ளதால் கிடைக்காது"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"அறிவிப்பு முக்கியத்துவம் மீட்டமைக்கப்பட்டது."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"ஆப்ஸ்"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"நம்பகமற்ற சாதனம் ஒன்று உங்கள் மெசேஜ்களை அணுக விரும்புகிறது. விவரங்களைப் பார்க்க தட்டவும்."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"மெசேஜ்களை அணுக அனுமதிக்கவா?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"[<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] எனும் நம்பகமற்ற புளூடூத் சாதனம் ஒன்று உங்கள் மெசேஜ்களை அணுக விரும்புகிறது.\n\nநீங்கள் இதற்குமுன் [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] சாதனத்துடன் இணைத்ததில்லை."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"நம்பகமற்ற சாதனம் ஒன்று உங்கள் தொடர்புகளையும் அழைப்புப் பதிவையும் அணுக விரும்புகிறது. விவரங்களைப் பார்க்க தட்டவும்."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"தொடர்புகளையும் அழைப்புப் பதிவையும் அணுக அனுமதிக்கவா?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"[<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] எனும் நம்பகமற்ற புளூடூத் சாதனம் ஒன்று உங்கள் தொடர்புகளையும் அழைப்புப் பதிவையும் அணுக விரும்புகிறது. உள்வரும், வெளிச்செல்லும் அழைப்புகளைப் பற்றிய தரவும் இதில் அடங்கும்.\n\nநீங்கள் இதற்குமுன் [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] சாதனத்துடன் இணைத்ததில்லை."</string>
 </resources>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index a9a21fc..0e509cc 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"మధ్యస్థం"</item>
     <item msgid="6740026006576843477">"ఎక్కువ సేపు"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"చిన్నగా"</item>
+    <item msgid="7397961711906421599">"మధ్యస్థంగా"</item>
+    <item msgid="4079132024502041928">"ఎక్కువగా"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ఆటోమేటిక్"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"అంతర్జాతీయ"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA మాత్రమే"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"గ్లోబల్"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 16ca57a..3165c4b 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"తేదీ &amp; సమయం"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"తేదీ మరియు సమయాన్ని సెట్ చేయండి"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"తేదీ, సమయం, సమయ మండలి &amp; ఆకృతులను సెట్ చేయి"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"నెట్‌వర్క్-అందించిన సమయాన్ని ఉపయోగిస్తుంది"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"నెట్‌వర్క్ అందించిన సమయ మండలిని ఉపయోగిస్తుంది"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"ఆటోమేటిక్‌గా టైమ్‌ను సెట్ చేయండి"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"ఆటోమేటిక్‌గా టైమ్ జోన్‌ను సెట్ చేయండి"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ఆ భాష‌లో వాడే ఫార్మాట్‌ను ఉప‌యోగించు"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑గంటల ఆకృతి"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-గంటల ఫార్మాట్‌ను ఉప‌యోగించు"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"లాక్ స్క్రీన్‌లో ప్రొఫైల్ సమాచారాన్ని చూపు"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"ఖాతాలు"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"లొకేషన్"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"లొకేషన్‌ను ఉపయోగించండి"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"లొకేషన్‌ను ఉపయోగించండి"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ఆఫ్"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">లొకేషన్ ఆన్‌లో ఉన్నప్పుడు - <xliff:g id="COUNT_1">%1$d</xliff:g> యాప్‌లకు లొకేషన్ యాక్సెస్ ఉంటుంది</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"స్క్రీన్ లాక్, ముఖం అన్‌లాక్"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"స్క్రీన్ లాక్, వేలిముద్ర"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"స్క్రీన్ లాక్"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ముఖం అలాగే వేలిముద్రతో ఫోన్‌ను సురక్షితంగా అన్‌లాక్ చేయండి"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"మీరు యాప్‌లలో కూడా సైన్ ఇన్ చేసి, పేమెంట్‌లు నిర్ధారించవచ్చు"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"దీనితో అన్‌లాక్ సెటప్ చేయండి:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ఫేస్ అన్‌లాక్"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"మీ ఫోన్‌ను అన్‌లాక్ చేయడం సులభతరం చేయండి"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"వేలిముద్ర"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"మీ జేబులో ఫోన్‌ను అన్‌లాక్ చేసి సమయం ఆదా చేయండి"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"స్కిప్ చేయి"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"తర్వాత"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"ముఖం జోడించబడింది"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"\'ఫేస్ అన్‌లాక్\'ను సెటప్ చేయండి"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ఫేస్ అన్‌లాక్"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ప్రామాణీకరించడానికి మీ ముఖం ఉపయోగించండి"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"ప్రారంభం"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"యాక్సెసిబిలిటీ ఫేస్ అన్‌లాక్ ఆఫ్ చేయబడితే, కొన్ని సెటప్ దశలు TalkBackతో సరిగా పని చేయకపోవచ్చు."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"వెనుకకు"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"సెటప్‌ను కొనసాగించు"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"యాక్సెసిబిలిటీ సెటప్‌ని ఉపయోగించు"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"యాప్‌లలో ఫేస్ అన్‌లాక్ ఉపయోగించేటప్పుడల్లా, నిర్ధారణ దశ అవసరమవుతుంది"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ముఖ డేటాను తొలగించు"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"\'ఫేస్ అన్‌లాక్\'‌ను సెటప్ చేయి"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి, యాప్‌లకు సైన్ ఇన్ చేయడానికి, చెల్లింపులను నిర్ధారించడానికి ఫేస్ అన్‌లాక్‌ను ఉపయోగించండి.\n\nఅలాగే, వీటిని గుర్తుంచుకోండి:\nమీకు అన్‌లాక్ చేసే ఉద్దేశ్యం లేనప్పటికీ, కేవలం ఫోన్ వైపు చూసినా కూడా అది అన్‌లాక్ అవుతుంది.\n\nమీ ముఖాన్ని స్క్రీన్ వైపు చూపితే, ఇత‌రులు కూడా మీ ఫోన్‌ను అన్‌లాక్ చేయగలుగుతారు.\n\nమీలాంటి రూపం ఉన్న వ్యక్తులు, ఉదాహ‌ర‌ణ‌కు, మీ క‌వ‌ల తోబుట్టువు మీ ఫోన్‌ను అన్‌లాక్ చేయ‌గ‌లిగే అవకాశం ఉంది."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి, యాప్‌లకు సైన్ ఇన్ చేయడానికి, చెల్లింపులను నిర్ధారించడానికి ఫేస్ అన్‌లాక్‌ను ఉపయోగించండి.\n\nఅలాగే, వీటిని గుర్తుంచుకోండి:\nమీరు అనుకోకుండా ఫోన్ వైపు చూసినా కూడా అన్‌లాక్ అయ్యే అవకాశం ఉంది.\n\nమీ కళ్లు మూసి ఉన్నా కూడా, మీ ముఖాన్ని స్క్రీన్ వైపు చూపితే, ఇత‌రులు కూడా మీ ఫోన్‌ను అన్‌లాక్ చేయగలుగుతారు.\n\nమీలాంటి రూపం ఉన్న వ్యక్తులు, ఉదాహ‌ర‌ణ‌కు, మీ క‌వ‌ల తోబుట్టువు మీ ఫోన్‌ను అన్‌లాక్ చేయ‌గ‌లిగే అవకాశం ఉంది."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి, యాప్‌లకు సైన్ ఇన్ చేయడానికి, పేమెంట్‌లను నిర్ధారించడానికి ఫేస్ అన్‌లాక్‌ను ఉపయోగించండి."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"గుర్తుంచుకోండి:\nమీరు అనుకోకుండా ఫోన్ వైపు చూసినా కూడా అన్‌లాక్ అయ్యే అవకాశం ఉంది.\n\nమీ ముఖాన్ని స్క్రీన్ వైపు చూపితే, ఇతరులు కూడా మీ ఫోన్‌ను అన్‌లాక్ చేయగలుగుతారు.\n\nమీలాంటి రూపం ఉన్న వ్యక్తులు, ఉదాహరణకు, మీ కవల తోబుట్టువు మీ ఫోన్‌ను అన్‌లాక్ చేయగలిగే అవకాశం ఉంది."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"గుర్తుంచుకోండి:\nమీరు అనుకోకుండా ఫోన్ వైపు చూసినా కూడా అన్‌లాక్ అయ్యే అవకాశం ఉంది.\n\nమీ కళ్లు మూసి ఉన్నా కూడా, మీ ముఖాన్ని స్క్రీన్ వైపు చూపితే, ఇతరులు కూడా మీ ఫోన్‌ను అన్‌లాక్ చేయగలుగుతారు.\n\nమీలాంటి రూపం ఉన్న వ్యక్తులు, ఉదాహరణకు, మీ కవల తోబుట్టువు మీ ఫోన్‌ను అన్‌లాక్ చేయగలిగే అవకాశం ఉంది."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ముఖ డేటాను తొలగించాలా?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ఫేస్ అన్‌లాక్ కోసం ఉపయోగించబడే ముఖానికి సంబంధించిన డేటా శాశ్వతంగా, సురక్షితంగా తొలగించబడుతుంది. తీసివేసిన తర్వాత, మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి, యాప్‌లకు సైన్ ఇన్ చేయడానికి, అలాగే చెల్లింపులను నిర్ధారించడానికి మీకు మీ PIN, ఆకృతి లేదా పాస్‌వర్డ్ అవసరం అవుతాయి."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"మీ ఫోన్‌ను అన్‌లాక్ చేయడానికి ఫేస్ అన్‌లాక్‌ను ఉపయోగించండి"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"మీ ఫోన్‌ని అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ వేలిముద్రను ఉపయోగించండి.\n\nగమనించండి: మీరు మీ వేలిముద్రను ఉపయోగించి ఈ డివైజ్‌ను అన్‌లాక్ చేయలేరు. మరింత సమాచారం కావాలంటే మీ నిర్వాహకులను సంప్రదించండి."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"మీ ఫోన్‌ను అన్‌లాక్ చేయడం లేదా కొనుగోళ్లను ఆమోదించడం కోసం మీ వేలిముద్రను ఉపయోగించండి.\n\nగమనిక: నమూనా లేదా పిన్ కంటే మీ వేలిముద్ర తక్కువ సురక్షితం కావచ్చు."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"రద్దు చేయి"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"వద్దు"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"కొనసాగించు"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"దాటవేయి"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"తర్వాత"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"మీ టాబ్లెట్‌కు స్క్రీన్ లాక్ రక్షణను జోడించారంటే ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు ముఖంతో అన్‌లాక్‌ను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. వెనుకకు వెళ్లడానికి, \"రద్దు చేయి\" ఎంపికను నొక్కండి."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"మీ పరికరానికి స్క్రీన్ లాక్ రక్షణను జోడించారంటే ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు \"ముఖంతో అన్‌లాక్\"ను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. వెనుకకు వెళ్లడానికి, \"రద్దు చేయి\" ఎంపికను నొక్కండి."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"మీ ఫోన్‌కు స్క్రీన్ లాక్ రక్షణను జోడించారంటే ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. మీరు ముఖంతో అన్‌లాక్‌ను సెటప్ చేయడానికి స్క్రీన్ లాక్ ఎంపికను కూడా కలిగి ఉండాలి. వెనుకకు వెళ్లడానికి, \"రద్దు చేయి\" ఎంపికను నొక్కండి."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"మీ టాబ్లెట్‌కు స్క్రీన్ లాక్ రక్షణను జోడించారంటే ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. బయోమెట్రిక్స్‌ను సెటప్ చేయడానికి కూడా మీకు స్క్రీన్ లాక్ ఆప్షన్ అవసరమవుతుంది. వెనుకకు వెళ్లడానికి, \'రద్దు చేయి\' ఆప్షన్‌ను ట్యాప్ చేయండి."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"మీ పరికరానికి స్క్రీన్ లాక్ రక్షణను జోడించారంటే, ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. బయోమెట్రిక్స్‌ను సెటప్ చేయడానికి కూడా మీకు స్క్రీన్ లాక్ ఆప్షన్ అవసరమవుతుంది. వెనుకకు వెళ్లడానికి, \'రద్దు చేయి\' ఆప్షన్‌ను ట్యాప్ చేయండి."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"మీ ఫోన్‌కు స్క్రీన్ లాక్ రక్షణను జోడించారంటే ఒకవేళ అది పోయినా లేదా దొంగిలించబడినా దాన్ని ఎవ్వరూ ఉపయోగించలేరు. బయోమెట్రిక్స్‌ను సెటప్ చేయడానికి కూడా మీకు స్క్రీన్ లాక్ ఆప్షన్ అవసరమవుతుంది. వెనుకకు వెళ్లడానికి, \'రద్దు చేయి\' ఆప్షన్‌ను ట్యాప్ చేయండి."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"పిన్ సెటప్‌ను దాటవేయాలా?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"పాస్‌వర్డ్‌ సెటప్‌‌ను దాటవేయాలా?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ఆకృతి సెటప్‌ను దాటవేయాలా?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ టాబ్లెట్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ పరికరాన్ని ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"పరికర సంరక్షణ లక్షణాలను సక్రియం చేయడం ద్వారా మీ అనుమతి లేకుండా ఈ ఫోన్‌ను ఉపయోగించనీయకుండా ఇతరులను నిరోధించండి. మీరు ఉపయోగించాలనుకుంటున్న స్క్రీన్ లాక్‌ను ఎంచుకోండి."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"మీ బ్యాకప్ స్క్రీన్ లాక్ పద్ధతిని ఎంచుకోండి"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"మీ బ్యాకప్ స్క్రీన్ లాక్ పద్ధతిని ఎంచుకోండి"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"మీ బ్యాకప్ స్క్రీన్ లాక్ పద్ధతిని ఎంచుకోండి"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"స్క్రీన్ లాక్ ఎంపికలు"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"స్క్రీన్ లాక్ ఎంపికలు"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"స్క్రీన్ లాక్"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ముఖంతో అన్‌లాక్ + పాస్‌వర్డ్"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ముఖంతో అన్‌లాక్ లేకుండానే కొనసాగించండి"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"మీరు మీ ముఖాన్ని ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. భద్రత కోసం, ఈ ఎంపికకు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"బయోమెట్రిక్స్ + ఆకృతి"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"బయోమెట్రిక్స్ + పిన్"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"బయోమెట్రిక్స్ + పాస్‌వర్డ్"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"బయోమెట్రిక్స్ లేకుండా కొనసాగించండి"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"మీరు బయోమెట్రిక్స్‌ను ఉపయోగించి మీ ఫోన్‌ను అన్‌లాక్ చేయవచ్చు. భద్రత కోసం, ఈ ఆప్షన్‌కు బ్యాకప్ స్క్రీన్ లాక్ అవసరం."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"నిర్వాహకులు, ఎన్‌క్రిప్షన్ విధానం లేదా ఆధారాల నిల్వ ద్వారా నిలిపివేయబడింది"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ఏదీ వద్దు"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"స్వైప్"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> కంటే తక్కువ అంకె తప్పక ఉండాలి</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ఇటీవలి పిన్‌ని ఉపయోగించడానికి డివైజ్ నిర్వాహకులు అనుమతించరు"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"సాధారణ PINలను మా IT నిర్వాహకుడు బ్లాక్ చేసారు. వేరే PINని ప్రయత్నించండి."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ఇందులో చెల్లని అక్షరం ఉండకూడదు"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"తప్పనిసరిగా కనీసం ఒక అక్షరాన్ని కలిగి ఉండాలి"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"తప్పనిసరిగా కనీసం ఒక అంకెను కలిగి ఉండాలి"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">తప్పనిసరిగా కనీసం 1 అసంఖ్యాత్మక అక్షరాన్ని కలిగి ఉండాలి</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ఇటీవలి పాస్‌వర్డ్‌ను ఉపయోగించడానికి పరికర నిర్వాహకులు అనుమతించరు"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"సాధారణ పాస్‌వర్డ్‌లను మా IT నిర్వాహకుడు బ్లాక్ చేసారు. వేరే పాస్‌వర్డ్‌ని ప్రయత్నించండి."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"అంకెలను ఆరోహణ, అవరోహణ క్రమంలో లేదా ఒకే అంకెను వరుసగా పునరావృతంగా ఉపయోగించకూడదు"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"నిర్ధారించండి"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"రద్దు చేయి"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fiని ప్రారంభించండి"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fiని ఉపయోగించండి"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fiని ఉపయోగించండి"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi సెట్టింగ్‌లు"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"వైర్‌లెస్ యాక్సెస్ స్థానాలను సెటప్ చేయండి &amp; నిర్వహించండి"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>”కి కనెక్ట్ అవ్వడానికి ఈ కింద QR కోడ్ నమోదు చేయండి"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR కోడ్‌ని స్కాన్ చేయడం ద్వారా Wi‑Fiలో చేరండి"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi షేర్ చేయి"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>”కు కనెక్ట్ చేయడానికి, అలాగే షేర్ చేయడానికి ఈ QR కోడ్‌ను స్కాన్ చేయండి"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>”లో చేరడానికి వేరొక పరికరంతో ఈ QR కోడ్‌ను స్కాన్ చేయండి"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>”కు కనెక్ట్ చేయడానికి ఈ QR కోడ్‌ను స్కాన్ చేయండి"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"మళ్లీ ప్రయత్నించండి. సమస్య ఇంకా కొనసాగితే, పరికరం తయారీదారుని సంప్రదించండి"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"ఏదో తప్పు జరిగింది"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi‑Fi పాస్‌వర్డ్: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"హాట్‌స్పాట్ పాస్‌వర్డ్: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"ఆటోమేటిక్-కనెక్ట్"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"ఫోన్ ఈ నెట్‌వర్క్ సమీపంలోకి రాగానే, ఆటోమేటిక్‌గా కనెక్ట్ అయ్యేలా అనుమతించండి"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ఈ నెట్‌వర్క్ సమీపంలో ఆటోమేటిక్‌గా కనెక్ట్ అవ్వడానికి టాబ్లెట్‌ను అనుమతించండి"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"పరిధిలో ఉన్నప్పుడు ఈ నెట్‌వర్క్‌కు కనెక్షన్‌ని అనుమతించండి"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"పరికరాన్ని జోడించండి"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ఈ నెట్‌వర్క్‌కు పరికరాన్ని జోడించడానికి QR కోడ్‌ను ఉపయోగించండి"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR కోడ్ చెల్లుబాటు అయ్యే ఫార్మాట్‌లో లేదు"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"సిస్టమ్ సర్టిఫికెట్‌లను ఉపయోగించు"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"అందించవద్దు"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ప్రామాణీకరించవద్దు"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"సర్టిఫికెట్ ఏదీ పేర్కొనబడలేదు. మీ కనెక్షన్ ప్రైవేట్‌గా ఉండదు."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"నెట్‌వర్క్ పేరు చాలా పొడవుగా ఉంది."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"తప్పనిసరిగా డొమైన్‌ను పేర్కొనాలి."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"సర్టిఫికెట్ అవసరం."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"కనెక్ట్ చేయి"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi ఆన్ చేయబడింది"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>కు కనెక్ట్ అయ్యింది"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>కు కనెక్ట్ చేయబడుతోంది"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"కనెక్ట్ అవుతోంది…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"నెట్‌వర్క్‌కు కనెక్ట్ చేయడం విఫలమైంది"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"నెట్‌వర్క్ పరిధిలో లేదు"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"డివైజ్ యొక్క MAC చిరునామా"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ర్యాండ‌మ్‌గా రూపొందించిన MAC అడ్రస్‌"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"యాదృచ్ఛిక MAC అడ్రస్ (చివరిగా ఉపయోగించినది)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP చిరునామా"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"నెట్‌వర్క్ వివరాలు"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"సబ్‌నెట్ మాస్క్"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 చిరునామాలు"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"సేవ్ చేసిన నెట్‌వర్క్‌లు"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"సభ్యత్వాలు"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"ఇతర నెట్‌వర్క్‌లు"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP సెట్టింగ్‌లు"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"ఈ వినియోగదారుకి Wi‑Fi అధునాతన సెట్టింగ్‌లు అందుబాటులో లేవు"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"సేవ్ చేయి"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"చెల్లుబాటు అయ్యే గేట్‌వే చిరునామాను టైప్ చేయండి."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"చెల్లుబాటు అయ్యే DNS చిరునామాను టైప్ చేయండి."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"నెట్‌వర్క్ ఆదిప్రత్యయ పొడవు 0 మరియు 32 మధ్య ఉండేలా టైప్ చేయండి."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ప్రైవేట్ DNS ద్వారా ఓవర్‌రైడ్ చేయబడనంతవరకు)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ప్రైవేట్ DNS ద్వారా ఓవర్‌రైడ్ చేయబడనంతవరకు)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"గేట్‌వే"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"నెట్‌వర్క్ ప్రిఫిక్స్ పొడవు"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"యాప్ కంటెంట్‌ని షేర్ చేస్తోంది. ఇంటర్నెట్ కనెక్షన్‌ని షేర్ చేయాలంటే, హాట్‌స్పాట్‌ని ఆఫ్ చేసి, ఆన్ చేయండి"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"పాస్‌వర్డ్‌ సెట్ చేయలేదు"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"హాట్‌స్పాట్ పేరు"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ని ఆన్ చేస్తోంది..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>ను ఆన్ చేస్తోంది…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"ఇతర పరికరాలు <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>కు కనెక్ట్ కావచ్చు"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"హాట్‌స్పాట్ పాస్‌వర్డ్‌"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP బ్యాండ్"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"స్మూత్ డిస్‌ప్లే"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"కొంత కంటెంట్ కోసం రిఫ్రెష్ రేటును ఆటోమేటిక్‌గా 60 నుండి 90 Hz వరకు పెంచుతుంది. బ్యాటరీ వినియోగం పెరుగుతుంది."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"స్మూత్ డిస్‌ప్లే"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"ఫోర్స్ 90 Hz రిఫ్రెష్ రేటు"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"మెరుగైన స్పర్శ ప్రతిస్పందన &amp; యానిమేషన్ నాణ్యత కోసం అత్యధిక రిఫ్రెష్ రేటు. ఇది బ్యాటరీ వినియోగం పెరిగేలా చేస్తుంది."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"స్క్రీన్ అటెన్ష‌న్‌"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"ఆన్ / మీరు స్క్రీన్ వేపే చూస్తూ ఉంటే అది ఆఫ్ కాదు"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"స్క్రీన్ చీకటిగా ఉన్నప్పుడు, కొన్ని నోటిఫికేషన్‌ల కోసం ఇది ఆన్ అవుతుంది"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"టైమ్, సమాచారం ఎల్లప్పుడూ చూపు"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"బ్యాటరీ వినియోగం పెరుగుతుంది"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"బోల్డ్ టెక్స్ట్"</string>
     <string name="title_font_size" msgid="570613010306330622">"ఫాంట్ పరిమాణం"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"వచనాన్ని పెద్దదిగా లేదా చిన్నదిగా చేస్తుంది"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"సిమ్ కార్డు లాక్ సెట్టింగ్‌లు"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android వెర్షన్"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android భద్రతా అప్‌డేట్"</string>
     <string name="model_info" msgid="8997566254717810904">"మోడల్"</string>
-    <string name="model_summary" msgid="2246651782442466213">"మోడల్: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"మోడల్ &amp; హార్డ్‌వేర్"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"హార్డ్‌వేర్ వెర్షన్"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ఉపకరణం ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APNను తొలగించు"</string>
     <string name="menu_new" msgid="6571230342655509006">"కొత్త APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"సేవ్ చేయి"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"విస్మరించు"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"రద్దు చేయి"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"పేరు ఫీల్డ్ ఖాళీగా ఉండకూడదు."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN ఖాళీగా ఉండకూడదు."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"యాప్‌లను రీసెట్ చేయవచ్చు"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi, మొబైల్ డేటా &amp; బ్లూటూత్‌లను రీసెట్ చేయండి"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"ఇది అన్ని నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేస్తుంది, వీటితో సహా:\n\n"<li>"Wi‑Fi"</li>\n<li>"మొబైల్ డేటా"</li>\n<li>"బ్లూటూత్"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"తొలగించు"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"డౌన్‌లోడ్ చేసిన SIMలు తొలగించు"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"భర్తీ చేయాల్సిన SIMలను డౌన్‌లోడ్ చేయడానికి, మీ క్యారియర్‌ను సంప్రదించండి. ఇది మొబైల్ సేవా ప్లాన్‌లు వేటినీ రద్దు చేయదు."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"ఇది ఏవిధమైన మొబైల్ సర్వీస్ ప్లాన్‌లను రద్దు చేయదు. రీప్లేస్‌మెంట్ SIMలను డౌన్‌లోడ్ చేయడానికి మీ క్యారియర్‌ను సంప్రదించండి."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"సెట్టింగ్‌లను రీసెట్ చేయి"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"అన్ని నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేయాలా? మీరు ఈ చర్యను తిరిగి రద్దు చేయలేరు."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"అన్ని నెట్‌వర్క్ సెట్టింగ్‌లను రీసెట్ చేసి, డౌన్‌లోడ్ చేసిన SIMలను తొలగించాలా? మీరు ఈ చర్యను తిరిగి ఉపసంహరించలేరు."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"నెట్‌వర్క్ సెట్టింగ్‌లు రీసెట్ చేయబడ్డాయి"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIMల డేటాను తొలగించలేకపోయింది"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ఎర్రర్ కారణంగా డౌన్‌లోడ్ చేసిన SIMలను తొలగించలేకపోయింది.\n\nమీ పరికరాన్ని పునఃప్రారంభించి, ఆపై మళ్లీ ప్రయత్నించండి."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"మొత్తం డేటాను తొలగించండి (ఫ్యాక్టరీ రీసెట్)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"మొత్తం డేటాను తొలగించండి (ఫ్యాక్టరీ రీసెట్)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"ఇందువలన మీ టాబ్లెట్ యొక్క "<b>"అంతర్గత నిల్వ"</b>", నుండి వీటితో సహా, మొత్తం డేటా సమూలంగా తొలగించబడుతుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు యాప్ డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేసిన యాప్‌లు"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"ఇందువలన మీ ఫోన్ యొక్క "<b>"అంతర్గత నిల్వ"</b>" నుండి వీటితో సహా, మొత్తం డేటా తొలగించబడుతుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్ మరియు యాప్ డేటా మరియు సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేసిన యాప్‌లు"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"మీరు ప్రస్తుతం క్రింది ఖాతాలకు సైన్ ఇన్ చేసారు:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"ఈ పరికరంలో ఇతర వినియోగదారులు ఉన్నారు.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"సంగీతం"</li>\n<li>"ఫోటోలు"</li>\n<li>"ఇతర వినియోగదారు డేటా"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMలు"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"ఇది మొబైల్ సేవా ప్లాన్‌ని రద్దు చేయదు."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"USB నిల్వ"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"సంగీతం, చిత్రాలు మరియు ఇతర వినియోగదారు డేటాను క్లియర్ చేయడానికి, "<b>"SD కార్డు"</b>"ను ఎరేజ్ చేయాల్సి ఉంటుంది."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"మొత్తం డేటాను తొలగించు (ఫ్యాక్టరీ రీసెట్)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"మొత్తం డేటాను తొలగించు (ఫ్యాక్టరీ రీసెట్)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"ఇది మీ టాబ్లెట్ యొక్క "<b>"అంతర్గత స్టోరేజ్"</b>" నుండి ఇక్కడున్న వాటితో సహా, మొత్తం డేటాను తొలగిస్తుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్‌తో పాటు యాప్ డేటా, అలాగే సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన యాప్‌లు"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"ఇది మీ ఫోన్ యొక్క "<b>"అంతర్గత స్టోరేజ్"</b>" నుండి ఇక్కడున్న వాటితో సహా, మొత్తం డేటాను తొలగిస్తుంది:\n\n"<li>"మీ Google ఖాతా"</li>\n<li>"సిస్టమ్‌తో పాటు యాప్ డేటా, అలాగే సెట్టింగ్‌లు"</li>\n<li>"డౌన్‌లోడ్ చేయబడిన యాప్‌లు"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"మీరు ప్రస్తుతం కింది ఖాతాలకు సైన్ ఇన్ చేశారు:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"ఈ పరికరంలో ఇతర యూజర్‌లు ఉన్నారు.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"సంగీతం"</li>\n<li>"ఫోటోలు"</li>\n<li>"ఇతర యూజర్ డేటా"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMలు"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"ఇది మీ మొబైల్ సర్వీస్ ప్లాన్‌ను రద్దు చేయదు."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"సంగీతం, ఫోటోలు, ఇతర యూజర్ డేటాను క్లియర్ చేయడానికి, "<b>"USB స్టోరేజ్"</b>"ను తొలగించాల్సి ఉంటుంది."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"సంగీతం, ఫోటోలు, ఇతర యూజర్ డేటాను క్లియర్ చేయడానికి, "<b>"SD కార్డు"</b>" డేటాను తొలగించాల్సి ఉంటుంది."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB నిల్వను ఎరేజ్ చేయి"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD కార్డుని ఎరేజ్ చేయి"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"అంతర్గత USB నిల్వలోని డేటా అంతటినీ అనగా సంగీతం లేదా ఫోటోల వంటివి ఎరేజ్ చేయి"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD కార్డు‌లో సంగీతం లేదా ఫోటోల వంటి మొత్తం డేటాను ఎరేజ్ చేయి"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"డేటా మొత్తాన్ని తొలగించు"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"డేటా మొత్తాన్ని తొలగించు"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"మీ మొత్తం వ్యక్తిగత సమాచారంతో పాటు డౌన్‌లోడ్ చేసిన యాప్‌లు అన్నీ సమూలంగా తొలగించబడతాయి. మీరు ఈ చర్యను తిరిగి ఉపసంహరించలేరు."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"మీ మొత్తం వ్యక్తిగత సమాచారంతో పాటు డౌన్‌లోడ్ చేసిన యాప్‌లు, SIMలు అన్నీ సమూలంగా తొలగించబడతాయి. మీరు ఈ చర్యను తిరిగి ఉపసంహరించలేరు."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ప్రతిదాన్ని ఎరేజ్ చేయి"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"సిస్టమ్ క్లియర్ సేవ అందుబాటులో లేనందున రీసెట్ చేయడం అమలు కాలేదు."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"మొత్తం డేటాను తొలగించాలా?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"ఈ వినియోగదారుకి ఫ్యాక్టరీ రీసెట్ అందుబాటులో లేదు"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"ఎరేజ్ చేస్తోంది"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"దయచేసి వేచి ఉండండి..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"డేటా మొత్తాన్ని తొలగించు"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"డేటా మొత్తాన్ని తొలగించు"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"మీ మొత్తం వ్యక్తిగత సమాచారంతో పాటు డౌన్‌లోడ్ చేసిన యాప్‌లు అన్నీ సమూలంగా తొలగించబడతాయి. ఒక్కసారి డేటాను తొలగిస్తే మళ్లీ వెనక్కు తెచ్చుకోలేరు."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"మీ మొత్తం వ్యక్తిగత సమాచారంతో పాటు డౌన్‌లోడ్ చేసిన యాప్‌లు, SIMలు అన్నీ సమూలంగా తొలగించబడతాయి. ఒక్కసారి డేటాను తొలగిస్తే మళ్లీ వెనక్కు తెచ్చుకోలేరు."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"మొత్తం డేటాను తొలగించాలా?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"ఈ యూజర్‌కు ఫ్యాక్టరీ రీసెట్ అందుబాటులో లేదు"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"తొలగిస్తోంది"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"దయచేసి వేచి ఉండండి…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"కాల్ సెట్టింగ్‌లు"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"వాయిస్ మెయిల్‌ను, కాల్ ఫార్వార్డింగ్‌ను, కాల్ వెయిటింగ్‌ను, కాలర్ IDని సెటప్ చేయండి"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB టీథరింగ్"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> కంటే ఎక్కువ పరికరాలకు టీథర్ చేయబడవు."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> అన్‌టీథెర్ చేయబడుతుంది."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ఈథర్‌నెట్ టెథరింగ్"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"USB ఈథర్‌నెట్ ద్వారా ఫోన్ ఇంటర్నెట్ కనెక్షన్‌ను షేర్ చేయండి"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"ఈథర్‌నెట్ ద్వారా ఫోన్ ఇంటర్నెట్ కనెక్షన్‌ను షేర్ చేయండి"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"మీ మొబైల్ డేటా కనెక్షన్ ద్వారా ఇతర పరికరాలకు ఇంటర్నెట్‌ని అందించడం కోసం హాట్‌స్పాట్ మరియు టెథెరింగ్‌ని ఉపయోగించండి. ఇంకా, యాప్‌లు సమీప పరికరాలతో కంటెంట్‌ని షేర్ చేయడం కోసం హాట్‌స్పాట్‌ని సృష్టించవచ్చు."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"మీ Wi‑Fi లేదా మొబైల్ డేటా కనెక్షన్ ద్వారా ఇతర పరికరాలకు ఇంటర్నెట్‌ను అందించడం కోసం హాట్‌స్పాట్ మరియు టెథరింగ్‌ను ఉపయోగించండి. సమీప పరికరాలతో కంటెంట్‌ను షేర్ చేయడం కోసం యాప్‌లు కూడా హాట్‌స్పాట్‌ను రూపొందించవచ్చు."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"సహాయం"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"బ్లూటూత్ స్కానింగ్"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"బ్లూటూత్ ఆఫ్‌లో ఉన్నప్పుడు కూడా, ఏ సమయంలోనైనా సమీపంలోని పరికరాలను స్కాన్ చేయడానికి యాప్‌లను, సేవలను అనుమతించండి. ఉదాహరణకు, లొకేషన్ ఆధారిత ఫీచర్‌లు, సేవలను మెరుగుపరచడానికి దీనిని ఉపయోగించవచ్చు."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"ఆఫీస్ కోసం స్థాన సేవలు"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"లొకేషన్ టైమ్ జోన్ గుర్తింపు"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"లొకేషన్ టైమ్ జోన్ గుర్తింపు"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"ప్రస్తుత టైమ్ జోన్‌ను గుర్తించడానికి పరికరం‌ యొక్క లొకేషన్‌ను ఉపయోగించడానికి అనుమతిస్తుంది. Wi‑Fi స్కానింగ్ వంటి ఇతర లొకేషన్ సెట్టింగ్‌లు టైమ్ జోన్ గుర్తింపు యొక్క ఖచ్చితత్వాన్ని ప్రభావితం చేస్తాయి."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"ఆన్‌లో ఉంది"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ఆఫ్‌లో ఉంది"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"ఆటోమేటిక్ టైమ్ జోన్ గుర్తింపు డిజేబుల్ చేయబడింది"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"లొకేషన్ టైమ్ జోన్ గుర్తింపు డిజేబుల్ చేయబడింది"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"లొకేషన్ టైమ్ జోన్ గుర్తింపుకు మద్దతు లేదు"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"లొకేషన్ టైమ్ జోన్ గుర్తింపు మార్పులు అనుమతించబడవు"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi &amp; మొబైల్ నెట్‌వర్క్ స్థానం"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"మీ స్థానాన్ని వేగవంతంగా అంచనా వేయడం కోసం Google స్థాన సేవను ఉపయోగించడానికి అనువర్తనాలను అనుమతించండి. అనామక స్థాన డేటా సేకరించబడుతుంది మరియు Googleకు పంపబడుతుంది."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"స్థానం Wi‑Fi ద్వారా గుర్తించబడింది"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ముఖంతో అన్‌లాక్ కోసం పాస్‌వర్డ్ పెట్టండి"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ముఖంతో అన్‌లాక్ కోసం, ఆకృతి సెట్ చేయండి"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ముఖంతో అన్‌లాక్ కోసం, పిన్ సెట్ చేయండి"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"బయోమెట్రిక్స్ అన్‌లాక్ బ్యాకప్ సెట్ చేయి"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"బయోమెట్రిక్స్ అన్‌లాక్ బ్యాకప్ సెట్ చేయి"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"బయోమెట్రిక్స్ అన్‌లాక్ బ్యాకప్ సెట్ చేయి"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"మీ పాస్‌వర్డ్‌ను మరచిపోయారా?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"మీ ఆకృతిని మర్చిపోయారా?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"మీ పిన్‌ను మర్చిపోయారా?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"క్యాప్షన్ ప్రాధాన్యతలు"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"మాగ్నిఫికేషన్"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"మాగ్నిఫికేషన్ ప్రాంతం"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"మాగ్నిఫికేషన్ ఎనేబుల్"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"స్క్రీన్‌ను మాగ్నిఫై చేస్తున్నప్పుడు మీరు ఉపయోగించాలనుకుంటున్న మాగ్నిఫికేషన్ ప్రాంతము(ల)ను ఎంచుకోండి"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"ఫుల్ స్క్రీన్"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"స్క్రీన్‌లో భాగం"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"ఫుల్ స్క్రీన్ &amp; స్క్రీన్‌లో భాగం"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"స్క్రీన్ మొత్తాన్ని మాగ్నిఫై చేయండి"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"స్క్రీన్‌లో భాగాన్ని మాగ్నిఫై చేయండి"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"యాక్సెసిబిలిటీ బటన్‌కు స్విచ్ చేయాలా?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"స్క్రీన్‌లోని కొంత భాగాన్ని మాగ్నిఫై చేయడానికి మూడు సార్లు ట్యాప్ చేయడం వల్ల టైప్ చేయడం, అలాగే ఇతర చర్యలు ఆలస్యమవుతాయి.\n\nమీరు మాగ్నిఫై చేయడానికి యాక్సెసిబిలిటీ బటన్‌ను ఉపయోగించేలా స్విచ్ చేయాలనుకుంటున్నారా?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"యాక్సెసిబిలిటీ బటన్‌కు స్విచ్ చేయి"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"మాగ్నిఫై చేయడానికి మూడు సార్లు ట్యాప్‌ ఎంపికను ఉంచండి"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"మాగ్నిఫికేషన్ సెట్టింగ్‌లు"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"మూడుసార్లు నొక్కడంతో మాగ్నిఫై చేయండి"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"షార్ట్‌కట్‌తో మాగ్నిఫై చేయండి"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"పవర్ బటన్ కాల్‌ను ముగిస్తుంది"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"పెద్ద మౌస్ పాయింటర్"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"యానిమేషన్‌లను తీసివేయండి"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"మోనో ఆడియో"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"ఆడియో ప్లే చేసేటప్పుడు ఛానెల్‌లను మిళితం చేస్తుంది"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"ఆడియో బ్యాలెన్స్"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ఎడమ"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"కుడి"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"మోనో ఆడియో"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"ఆడియో ప్లే చేసేటప్పుడు ఛానెల్‌లను మిళితం చేస్తుంది"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"ఆడియో బ్యాలెన్స్"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ఎడమ"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"కుడి"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"డిఫాల్ట్"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 సెకన్లు"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 సెకన్లు"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"నోటిఫికేషన్ వైబ్రేషన్"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"రింగ్ వైబ్రేషన్"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"స్పర్శ ప్రతిస్పందన"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‌ను ఉపయోగించు"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‌ను తెరువు"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"\'కలర్‌ను సరిచేయడం\' అనే ఫీచర్‌ను ఉపయోగించు"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"క్యాప్షన్‌లను చూపించు"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"మద్దతు ఉన్న యాప్ కోసం మాత్రమే"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>ను ఉపయోగించు"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>‌ను తెరవండి"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"\'కలర్-సరిచేయడం\' ఫీచర్‌ను ఉపయోగించండి"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"క్యాప్షన్‌లను చూపించు"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"సపోర్ట్ ఉన్న యాప్ కోసం మాత్రమే"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"క్యాప్షన్ సైజు, శైలి"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> టెక్స్ట్ సైజ్"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"మరిన్ని ఎంపికలు"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"డ్యూటెరానోమలీ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ప్రొటానోమలీ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ట్రైటనోమలీ"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"గ్రేస్కేల్"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"ఎరుపు-ఆకుపచ్చ రంగు"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"ఎరుపు-ఆకుపచ్చ రంగు"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"నీలం-పసుపు"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"బ్యాక్‌గ్రౌండ్ ప‌రిమితి"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"నేపథ్యంలో అమలు కావడానికి అనువర్తనాన్ని అనుమతించండి"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"నేపథ్యంలో అమలు కావడానికి యాప్ అనుమతించబడలేదు"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"నేపథ్య వినియోగం పరిమితం చేయబడదు"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"బ్యాక్‌గ్రౌండ్ వినియోగం పరిమితం చేయబడదు"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"నేపథ్య కార్యకలాపాన్ని పరిమితం చేయాలా?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"మీరు యాప్ నేపథ్య కార్యకలాపాన్ని పరిమితం చేస్తే, అది సరిగ్గా పని చేయకపోవచ్చు."</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"ఈ యాప్ బ్యాటరీని ఆప్టిమైజ్ చేయికి సెట్ చేయబడలేదు కనుక, దీన్ని మీరు పరిమితం చేయలేరు.\n\nయాప్‌ను పరిమితం చేయడానికి, మొదట బ్యాటరీ ఆప్టిమైజేషన్‌ను ఆన్ చేయండి."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"టాబ్లెట్ సాధారణం కంటే ఎక్కువగా వినియోగించింది"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"పరికరం సాధారణం కంటే ఎక్కువగా వినియోగించింది"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"బ్యాటరీ సాధారణం కంటే తక్కువ సమయం రావచ్చు"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"బ్యాటరీ జీవితకాలాన్ని ఆప్టిమైజ్ చేయడం కోసం"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"బ్యాటరీ తాత్కాలికంగా పరిమితం చేయబడింది. మరింత తెలుసుకోవడానికి ట్యాప్ చేయండి."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"మీ ఫోన్ సాధారణం కంటే అధికంగా వినియోగించబడింది. కనుక, మీ బ్యాటరీ, అంచ‌నా వేసిన దాని కంటే తక్కువ సమయంలోనే ఖాళీ అవ్వొచ్చు.\n\nబ్యాటరీని అధికంగా వినియోగిస్తోన్న ప్రధాన యాప్‌లు:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"మీ టాబ్లెట్ సాధారణం కంటే అధికంగా వినియోగించబడింది. కనుక, మీ బ్యాటరీ, అంచ‌నా వేసిన దాని కంటే తక్కువ సమయంలోనే ఖాళీ అవ్వొచ్చు.\n\nబ్యాటరీని అధికంగా వినియోగిస్తోన్న ప్రధాన యాప్‌లు:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"మీ పరికరం సాధారణం కంటే అధికంగా వినియోగించబడింది. కనుక, మీ బ్యాటరీ, అంచ‌నా వేసిన దాని కంటే తక్కువ సమయంలోనే ఖాళీ అవ్వొచ్చు.\n\nబ్యాటరీని అధికంగా వినియోగిస్తోన్న ప్రధాన యాప్‌లు:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d యాప్ పరిమితం చేయబడింది</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"మీ బ్యాటరీ మీటర్‌ను చదవడంలో సమస్య"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"మీ బ్యాటరీ మీటర్‌ను చదవడంలో సమస్య. "<annotation id="url">"మరింత తెలుసుకోవడానికి"</annotation>" ట్యాప్ చేయండి"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"యాప్‌ని ఆపివేయాలా?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> మీ ఫోన్‌ని మేల్కొల్పి ఉంచుతోంది, కనుక బ్యాటరీని మీ ఫోన్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు అనువర్తనాన్ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> మీ టాబ్లెట్‌ని మేల్కొల్పి ఉంచుతుంది, కనుక బ్యాటరీని మీ టాబ్లెట్ సాధారణ రీతిలో నిర్వహించడం సాధ్యం కాదు.\n\nఈ సమస్యను పరిష్కరించేందుకు ప్రయత్నించడానికి, మీరు అనువర్తనాన్ని ఆపివేయవచ్చు.\n\nఈ సమస్య కొనసాగితే, బ్యాటరీ పనితీరును మెరుగుపరచడం కోసం మీరు అనువర్తనాన్ని అన్ఇన్‌స్టాల్ చేయాల్సి రావచ్చు."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"షెడ్యూల్ సెట్ చేయండి"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"బ్యాటరీ జీవితకాలాన్ని పెంచుకోండి"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ఛార్జ్ అయ్యాక ఆఫ్ చేయండి"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"మీ ఫోన్ ఛార్జింగ్ <xliff:g id="PERCENT">%1$s</xliff:g> వద్దకు చేరినప్పుడు బ్యాటరీ సేవర్ ఆఫ్ అవుతుంది"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"మీ టాబ్లెట్ ఛార్జింగ్ <xliff:g id="PERCENT">%1$s</xliff:g> వద్దకు చేరినప్పుడు బ్యాటరీ సేవర్ ఆఫ్ అవుతుంది"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"మీ పరికరంలో బ్యాటరీ స్థాయి <xliff:g id="PERCENT">%1$s</xliff:g> వద్ద ఉన్నప్పుడు బ్యాటర్ సేవర్ ఆఫ్ అవుతుంది"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"మీ ఫోన్ <xliff:g id="PERCENT">%1$s</xliff:g> కంటే ఎక్కువగా ఛార్జ్ అయినప్పుడు బ్యాటరీ సేవర్ ఆఫ్ అవుతుంది"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"మీ టాబ్లెట్ <xliff:g id="PERCENT">%1$s</xliff:g> కంటే ఎక్కువగా ఛార్జ్ అయినప్పుడు బ్యాటరీ సేవర్ ఆఫ్ అవుతుంది"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"మీ పరికరం <xliff:g id="PERCENT">%1$s</xliff:g> కంటే ఎక్కువగా ఛార్జ్ అయినప్పుడు బ్యాటరీ సేవర్ ఆఫ్ అవుతుంది"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"ఆన్ చేయి"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"రీసెట్ చేయి"</string>
     <string name="tts_play" msgid="2945513377250757221">"ప్లే చేయి"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"అనుకూల కనెక్టివిటీ"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"మీ నెట్‌వర్క్ కనెక్షన్‌లను ఆటోమేటిక్‌గా మేనేజ్ చేయడం ద్వారా బ్యాటరీ జీవితకాలాన్ని పొడిగిస్తుంది, అలాగే పరికర పనితీరును మెరుగుపరుస్తుంది"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ఆధారాల నిల్వ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"సర్టిఫికెట్ ఇన్‌స్టాల్ చేయండి"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"నిల్వ నుండి స‌ర్టిఫికెట్‌ల‌ను ఇన్‌స్టాల్ చేయండి"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"యూజర్ ఆధారాలు"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"నిల్వ ఉన్న ఆధారాలను చూడండి, వాటిని సవరించండి"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"అధునాతన సెట్టింగ్‌లు"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"నిల్వ రకం"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"హార్డ్‌వేర్ మద్దతు"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"సాప్ట్‌వేర్ మాత్రమే"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ఈ వినియోగదారు కోసం ఆధారాలు అందుబాటులో లేవు"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN మరియు అనువర్తనాల కోసం ఇన్‌స్టాల్ చేయబడింది"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi కోసం ఇన్‌స్టాల్ చేయబడింది"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"ఇన్‌స్టాల్ చేయవద్దు"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"ఏదేమైనా ఇన్‌స్టాల్ చేయి"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"సర్టిఫికెట్ ఇన్‌స్టాల్ చేయబడలేదు"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"ఈ పరికరంలో సర్టిఫికెట్‌లను ఇన్‌స్టాల్ చేయడానికి <xliff:g id="APP_NAME">%s</xliff:g>ని అనుమతించాలా?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"ఈ సర్టిఫికెట్‌ల ద్వారా, మీ గుర్తింపు ఆధారాలు దిగువున ఉన్న యాప్‌లు, URLలకు తెలియజేయబడతాయి"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"అనుమతించవద్దు"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"అనుమతించు"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"మరిన్ని చూపించు"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"సర్టిఫికెట్ మేనేజ్‌మెంట్ యాప్"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"ఏదీ లేదు"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"ఈ యాప్ ద్వారా ఇన్‌స్టాల్ చేయబడిన సర్టిఫికెట్‌లు మీ గుర్తింపును దిగువున ఉన్న యాప్‌లకు, URLలకు తెలియజేస్తాయి"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"తీసివేయి"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"అత్యవసర డయలింగ్ సిగ్నల్"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"అత్యవసర కాల్ వచ్చినప్పుడు చేయాల్సిన విధిని సెట్ చేయండి"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"బ్యాకప్"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"సెటప్ చేయలేదు - కార్యాలయ ప్రొఫైల్"</string>
     <string name="user_admin" msgid="4024553191395768119">"నిర్వాహకుడు"</string>
     <string name="user_you" msgid="3070562015202859996">"మీరు (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"మారుపేరు"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"మీరు గరిష్టంగా <xliff:g id="USER_COUNT">%1$d</xliff:g> మంది వినియోగదారులను జోడించవచ్చు"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"టాబ్లెట్ యజమాని మాత్రమే వినియోగదారులను నిర్వహించగలరు."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"ఫోన్ యజమాని మాత్రమే వినియోగదారులను నిర్వహించగలరు."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"టెర్మినల్ వద్ద చెల్లించడం"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"చెల్లింపు యాప్ సెటప్ చేయండి. ఆపై తాకకూడదనే చిహ్నం ఉండే ఏదైనా టెర్మినల్ వద్ద మీ ఫోన్ వెనుక భాగం పైకి ఉండేలా పట్టుకోండి."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"అర్థమైంది"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"మరిన్ని..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"మరిన్ని…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"డిఫాల్ట్ చెల్లింపు యాప్‌ను సెట్ చెయ్యండి"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"డిఫాల్ట్ చెల్లింపు యాప్‌ను అప్‌డేట్ చెయ్యండి"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"స్పర్శరహిత టెర్మినల్ వద్ద, <xliff:g id="APP">%1$s</xliff:g> ద్వారా చెల్లించండి"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"వెనుకకు"</string>
     <string name="wizard_next" msgid="3884832431439072471">"తర్వాత"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"ముగించు"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ఫోటోను తీయి"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"చిత్రాన్ని ఎంచుకోండి"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"ఫోటోను ఎంచుకోండి"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"సిమ్ కార్డులు"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"సిమ్ కార్డులు"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"కాల్‌ల కోసం దీన్ని ఎల్లప్పుడూ ఉపయోగించు"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"డేటా కోసం SIMను ఎంచుకోండి"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS కోసం SIM కార్డ్‌ను ఎంచుకోండి"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"డేటా SIMని మార్చుతోంది, ఇందుకు ఒక నిమిషం పట్టవచ్చు..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"డేటా SIMను మార్చుతోంది, ఇందుకు ఒక నిమిషం పట్టవచ్చు…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"దీనితో కాల్ చేయండి"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"సిమ్ కార్డును ఎంచుకోండి"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"సిమ్ <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"సాధారణ సమయం, షెడ్యూల్, బ్యాటరీ సేవర్, పవర్ సేవర్, బ్యాటరీ, ఆటోమేటిక్, శాతం"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, అధునాతన కాలింగ్, 4g కాలింగ్"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"భాషను జోడించు, ఒక భాషను జోడించు"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"టెక్స్ట్ సైజ్"</string>
     <string name="default_sound" msgid="6604374495015245195">"డిఫాల్ట్ ధ్వని"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"రింగ్ &amp; నోటిఫికేషన్ వాల్యూమ్ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"వాల్యూమ్, వైబ్రేషన్, అంతరాయం కలిగించవద్దు"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"పవర్ ఆన్ చేసేటప్పుడు ధ్వనులు"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"లైవ్ క్యాప్షన్"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"మీడియాకు ఆటోమేటిక్ శీర్షికలు"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ఏవీ లేవు"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> షెడ్యూల్‌లు సెట్ చేయబడ్డాయి</item>
-      <item quantity="one">1 షెడ్యూల్ సెట్ చేయబడింది</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ఏవీ లేవు}=1{1 షెడ్యూల్ సెట్ చేయబడింది}other{# షెడ్యూల్‌లు సెట్ చేయబడ్డాయి}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"అంతరాయం కలిగించవద్దు"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"ముఖ్యమైన వ్యక్తులు, యాప్‌ల నుంచి వచ్చే నోటిఫికేషన్‌లను మాత్రమే అందించు"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"అంతరాయాలను పరిమితం చేయండి"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"ప్రాధాన్యత మాత్రమే"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"ఆన్‌ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ఆఫ్ / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ఆఫ్"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"ఆన్"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ప్రతిసారి అడుగు"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"మీరు ఆఫ్ చేసే వరకు"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> గంటలు</item>
-      <item quantity="one">1 గంట</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> నిమిషాలు"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> షెడ్యూల్‌లు ఆటోమేటిక్‌గా ఆన్ అవుతాయి</item>
-      <item quantity="one">1 షెడ్యూల్ ఆటోమేటిక్‌గా ఆన్ అవుతుంది</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 గంట}other{# గంటలు}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 నిమిషం}other{# నిమిషాలు}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ఆఫ్‌లో ఉంది}=1{ఆఫ్ / 1 షెడ్యూల్ ఆటోమేటిక్‌గా ఆన్ అవుతుంది}other{ఆఫ్ / # షెడ్యూల్ ఆటోమేటిక్‌గా ఆన్ అవుతుంది}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"\'అంతరాయం కలిగించవద్దు\'కు ఏది ఆటంకం కలిగించగలదు"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"వ్యక్తులు"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"యాప్‌లు"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"తక్కువ ప్రాధాన్యత నోటిఫికేషన్‌లను ఆటోమేటిక్‌గా సాధారణానికి సెట్ చేసి ఉంచుతుంది"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"అనుకూల నోటిఫికేషన్ ర్యాంకింగ్"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"ఇది నోటిఫికేషన్‌లను ఔచిత్యాన్ని బట్టి ఆటోమేటిక్‌గా ర్యాంక్ చేస్తుంది"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"అనుకూల నోటిఫికేషన్ ఫీడ్‌బ్యాక్"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"నోటిఫికేషన్‌లకు చేసిన సర్దుబాట్లను సూచిస్తుంది, అలాగే సిస్టమ్‌కు ఫీడ్‌బ్యాక్‌ను అందించే ఆప్షన్‌ను చూపుతుంది"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"నోటిఫికేషన్ ప్రాముఖ్యతను రీసెట్ చేయండి"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"యూజర్ మార్చిన ప్రాముఖ్యత సెట్టింగ్‌లను రీసెట్ చేయండి, నోటిఫికేషన్ అసిస్టెంట్‌ను ప్రాధాన్యత ఇవ్వడానికి అనుమతించండి"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"సూచించబడిన చర్యలు, రిప్లయిలు"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"సూచనాత్మక చర్యలను &amp; రిప్లయిలను ఆటోమేటిక్‌గా చూపుతుంది"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"ఇటీవలి మరియు స్నూజ్ చేయబడిన నోటిఫికేషన్‌లను చూపించు"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"ప్రాధాన్య సంభాషణలు"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"సంభాషణల విభాగంలో ఎగువున చూపబడుతుంది, తేలుతున్న బబుల్స్‌లా కనిపిస్తుంది"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"సంభాషణ విభాగంలో ఎగువున చూపబడుతుంది"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"ఇతర సంభాషణలు"</string>
+    <string name="other_conversations" msgid="551178916855139870">"ప్రాధాన్యత లేని సంభాషణలు"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"మీరు మార్పులు చేసిన సంభాషణలు"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"ఇటీవలి సంభాషణలు"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ఇటీవలివి క్లియర్"</string>
+    <string name="clear" msgid="5092178335409471100">"క్లియర్ చేయండి"</string>
     <string name="important_bubble" msgid="7911698275408390846">"బబుల్ ప్రముఖ సంభాషణ"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"కిందకు-లాగే షేడ్ ఎగువ భాగంలో ప్రాముఖ్యమైన సంభాషణలు కనిపిస్తాయి. అవి ఒక బబుల్ రూపంలో వచ్చి \'అంతరాయం కలిగించవద్దు\' మోడ్‌ను అధిగమించేలా కూడా మీరు సెట్ చేయవచ్చు."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ప్రముఖమైన, మార్పులు చేసిన సంభాషణలు ఇక్కడ కనిపిస్తాయి"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"అంతరాయం కలిగించవద్దు యాక్సెస్"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'అంతరాయం కలిగించవద్దు\' ఫీచర్‌ను అనుమతించు"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ఇన్‌స్టాల్ చేసిన యాప్‌లేవీ అంతరాయం కలిగించవద్దు యాక్సెస్ అభ్యర్థించలేదు"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"అనువర్తనాలను లోడ్ చేస్తోంది..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"అప్లికేషన్‌లను లోడ్ చేస్తోంది…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ యాప్ యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ వర్గం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"మీ అభ్యర్ధన మేరకు Android, ఈ పరికరంలో ఈ సమూహం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"అన్ని సంభాషణలు"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ప్రాధాన్య సంభాషణలు"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ఏదీ లేదు"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> సంభాషణలు</item>
-      <item quantity="one">1 సంభాషణ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ఏదీ లేదు"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ఏవీ లేవు}=1{1 సంభాషణ}other{# సంభాషణలు}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ఎవరు అంతరాయం కలిగించగలరు"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"కాల్‌లు"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"కాల్‌లు"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"అనుమతించిన కాల్‌లు వచ్చినప్పుడు శబ్దం వస్తుందని నిర్ధారించుకోవడానికి, పరికరం రింగ్ మోడ్‌లో ఉందో లేదో చెక్ చేయండి"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ సంబంధిత‌ ఇన్‌కమింగ్ కాల్‌లు బ్లాక్ చేయబడ్డాయి. మీ స్నేహితులు, కుటుంబ సభ్యులు లేదా ఇతర పరిచయాలు మిమ్మల్ని సంప్రదించగలిగేలా మీరు సెట్టింగ్‌లను సర్దుబాటు చేయవచ్చు."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"నక్షత్రం గుర్తు ఉన్న పరిచయాలు"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">మరో <xliff:g id="NUM_PEOPLE">%d</xliff:g> మంది</item>
-      <item quantity="one">మరో 1 వ్యక్తి</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ఏవీ లేవు"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ఏవీ లేవు}=1{{contact_1}}=2{{contact_1}, {contact_2}}=3{{contact_1}, {contact_2}, {contact_3}}other{{contact_1}, {contact_2}, # మంది ఇతరులు}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(పేరు లేదు)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Messages"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"మెసేజ్‌లు"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’కి సంబంధించిన ఇన్‌కమింగ్ కాల్‌లు బ్లాక్ చేయబడ్డాయి. మీ స్నేహితులు, కుటుంబ సభ్యులు లేదా ఇతర పరిచయాలు మిమ్మల్ని సంప్రదించగలిగేలా మీరు సెట్టింగ్‌లను సర్దుబాటు చేయవచ్చు."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"అన్ని మెసేజ్‌లు మిమ్మల్ని చేరుతాయి"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"అన్ని కాల్‌లు మిమ్మల్ని చేరుతాయి"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ఏవీ లేవు"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> కాంటాక్ట్‌లు</item>
-      <item quantity="one">1 కాంటాక్ట్</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ఏవీ లేవు}=1{1 కాంటాక్ట్}other{# కాంటాక్ట్‌లు}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ఎవరైనా"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"కాంటాక్ట్‌లు"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"నక్షత్రం గుర్తు ఉన్న కాంటాక్ట్‌లు"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"అన్ని నోటిఫికేషన్‌లు"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"కొన్ని నోటిఫికేషన్‌లు"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"యాప్‌లను అంతరాయం కలిగించడానికి మీరు అనుమతించకపోయినప్పటికీ, ఎంచుకున్న వ్యక్తులు ఇప్పటికీ మిమ్మల్ని సంప్రదించగలరు"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> అంతరాయం కలిగించవచ్చు</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> అంతరాయం కలిగించవచ్చు</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"మరో <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{యాప్‌లు ఏవీ అంతరాయాన్ని కలిగించలేవు}=1{{app_1} అంతరాయాన్ని కలిగించగలదు}=2{{app_1}, {app_2}లు అంతరాయాన్ని కలిగించగలవు}=3{{app_1}, {app_2}, అలాగే {app_3}లు అంతరాయాన్ని కలిగించగలవు}other{{app_1}, {app_2}, మరో # అంతరాయాన్ని కలిగించగలవు}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"యాప్‌లు"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"అన్ని నోటిఫికేషన్‌లు"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"కొన్ని నోటిఫికేషన్‌లు"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"అంతరాయం కలిగించ గల నోటిఫికేషన్‌లు"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"అన్ని నోటిఫికేషన్‌లను అనుమతించు"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> అంతరాయం కలిగించవచ్చు</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> అంతరాయం కలిగించవచ్చు</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ఏదీ అంతరాయాన్ని కలిగించలేదు"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"మరో <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ఏదీ అంతరాయాన్ని కలిగించలేదు}=1{{sound_category_1} అంతరాయాన్ని కలిగించగలదు}=2{{sound_category_1}, {sound_category_2}లు అంతరాయాన్ని కలిగించగలవు}=3{{sound_category_1}, {sound_category_2}, అలాగే {sound_category_3}లు అంతరాయాన్ని కలిగించగలవు}other{{sound_category_1}, {sound_category_2}, మరో # అంతరాయాన్ని కలిగించగలవు}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ఏదీ అంతరాయాన్ని కలిగించలేదు"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ఎవ్వరూ అంతరాయాన్ని కలిగించలేరు"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"కొంతమంది వ్యక్తులు అంతరాయాన్ని కలిగించగలరు"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"వ్యక్తులందరూ అంతరాయం కలిగించగలరు"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"ఆన్‌లో ఉంది"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"ఆఫ్‌‌లో ఉంది"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"యాప్‌ను పిన్ చేయడం"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"యాప్‌ను పిన్ చేశాక, ఆ యాప్‌ను మీరు మళ్లీ అన్‌పిన్ చేసేంత వరకూ అది వీక్షణలోనే ఉంటుంది. ఈ ఫీచర్‌ను ఉపయోగించుకునే విధానానికి ఒక ఉదాహరణ, నిర్దిష్ట గేమ్‌ను ఆడడానికి విశ్వసనీయులైన స్నేహితుని అనుమతించడం. \n\nఒక యాప్‌ను పిన్ చేసినప్పుడు, అది వేరే యాప్‌లను తెరవవచ్చు. అలాగే వ్యక్తిగత డేటా‌ను యాక్సెస్ చేయవచ్చు. \n\nయాప్‌ను పిన్ చేయడం కోసం: 	\n1.	\'యాప్‌ను పిన్ చేయడం\'ను ఆన్ చేయండి 	\n2.	ఓవర్‌వ్యూను తెరవండి 	\n3.	స్క్రీన్ ఎగువున యాప్ చిహ్నాన్ని ట్యాప్ చేయండి, తర్వాత పిన్‌ను ట్యాప్ చేయండి"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"యాప్‌ను పిన్ చేశాక, ఆ యాప్‌ను మీరు మళ్లీ అన్‌పిన్ చేసేంత వరకూ అది వీక్షణలోనే ఉంటుంది. ఒక నిర్దిష్ట గేమ్‌ను ఆడటానికి నమ్మకమైన ఫ్రెండ్‌ను అనుమతించడం అనేది ఈ ఫీచర్ వినియోగానికి ఒక ఉదాహరణ. \n\nఒక యాప్‌ను పిన్ చేసినప్పుడు, అది వేరే యాప్‌లను తెరవవచ్చు. అలాగే వ్యక్తిగత డేటా‌ను యాక్సెస్ చేయవచ్చు. \n\nమీరు మీ పరికరాన్ని మరొకరితో సురక్షితంగా షేర్ చేసుకోవాలంటే, దాని బదులు గెస్ట్ యూజర్‌గా ట్రై చేయండి. \n\nయాప్‌ను పిన్ చేయడానికి: 	\n1.	\'యాప్‌ను పిన్ చేయడం\'ను ఆన్ చేయండి 	\n2.	ఓవర్‌వ్యూను తెరవండి 	\n3.	స్క్రీన్ ఎగువున ఉన్న యాప్ చిహ్నాన్ని ట్యాప్ చేసి, తర్వాత పిన్‌ను ట్యాప్ చేయండి"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"యాప్‌ను పిన్ చేయడం వలన, ప్రస్తుతం ఉన్న యాప్‌ను మీరు మళ్లీ అన్‌పిన్ చేసేంత వరకూ అది వీక్షణలోనే ఉంటుంది. ఒక నిర్దిష్ట గేమ్‌ను ఆడటానికి నమ్మకమైన ఫ్రెండ్‌ను అనుమతించడం అనేది ఈ ఫీచర్ వినియోగానికి ఒక ఉదాహరణ."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"ఒక యాప్‌ను పిన్ చేసినప్పుడు, పిన్ చేసిన యాప్ వేరే యాప్‌లను తెరవవచ్చు, అలాగే వ్యక్తిగత డేటా‌ను యాక్సెస్ చేయవచ్చు. \n\nఈ విధంగా యాప్‌ను పిన్ చేయండి: 	\n1.	\'యాప్‌ను పిన్ చేయడం\'ను ఆన్ చేయండి 	\n2.	ఓవర్‌వ్యూను తెరవండి 	\n3.	స్క్రీన్ ఎగువున యాప్ చిహ్నాన్ని ట్యాప్ చేయండి, తర్వాత పిన్‌ను ట్యాప్ చేయండి"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"ఒక యాప్‌ను పిన్ చేసినప్పుడు, పిన్ చేసిన యాప్ వేరే యాప్‌లను తెరవవచ్చు, అలాగే వ్యక్తిగత డేటా‌ను యాక్సెస్ చేయవచ్చు. \n\nమీ పరికరాన్ని మీరు మరొకరితో సురక్షితంగా షేర్ చేసుకోవాలంటే, అలా చేయడానికి బదులు గెస్ట్ యూజర్‌ను ఉపయోగించి చూడండి. \n\nఈ విధంగా యాప్‌ను పిన్ చేయండి: 	\n1.	\'యాప్‌ను పిన్ చేయడం\'ను ఆన్ చేయండి 	\n2.	ఓవర్‌వ్యూను తెరవండి 	\n3.	స్క్రీన్ ఎగువున యాప్ చిహ్నాన్ని ట్యాప్ చేయండి, తర్వాత పిన్‌ను ట్యాప్ చేయండి"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"యాప్‌ను పిన్ చేసినప్పుడు: \n\n•		వ్యక్తిగత డేటాను యాక్సెస్ చేయడం వీలు కావచ్చు \n		(కాంటాక్ట్‌లు ఇంకా ఇమెయిల్ కంటెంట్ లాంటివి) \n•	  పిన్ చేయబడిన యాప్ ఇతర యాప్‌లను తెరవవచ్చు \n\nయాప్‌ను పిన్ చేయడాన్ని విశ్వసనీయ వ్యక్తులతోనే ఉపయోగించండి."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"అన్‌పిన్ చేయడానికి ముందు అన్‌లాక్ ఆకృతి కోసం అడుగు"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"అన్‌పిన్ చేయడానికి ముందు పిన్‌ను అడుగు"</string>
@@ -3899,6 +3918,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ ముఖాన్ని ఉపయోగించడంతో పాటు, మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందే మీ పిన్‌ను అడిగేలా చేసి దాన్ని మరింత కాపాడుకోవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అలారాలతో సహా ,కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు.\n\nఇది కోల్పోయిన లేదా దొంగలించబడిన పరికరాల డేటాను రక్షించడంలో సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడానికి పిన్ అవసరమా?&amp;gt;"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ ముఖాన్ని ఉపయోగించడంతో పాటు, మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందే మీ నమూనాను అడిగేలా చేసి దాన్ని మరింత కాపాడుకోవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అలారాలతో సహా ,కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు.\n\nఇది కోల్పోయిన లేదా దొంగలించబడిన పరికరాల డేటాను రక్షించడంలో సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడానికి నమూనా అవసరమా?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ ముఖాన్ని ఉపయోగించడంతో పాటు, మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందే మీ పాస్‌వర్డ్‌ను అడిగేలా చేసి దాన్ని మరింత కాపాడుకోవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అలారాలతో సహా ,కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు.\n\nఇది కోల్పోయిన లేదా దొంగలించబడిన పరికరాల డేటాను రక్షించడంలో సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడానికి పాస్‌వర్డ్‌ అవసరమా?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ బయోమెట్రిక్స్‌ను ఉపయోగించడంతో పాటు, స్టార్ట్ కావడానికి ముందే ఈ పరికరం మీ పిన్‌ను అడిగేలా చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరం స్టార్ట్ అయ్యే వరకు, అలారాలతో సహా కాల్‌లు, మెసేజ్‌లు, నోటిఫికేషన్‌లను అందుకోలేదు.\n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలోని డేటాను రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని స్టార్ట్ చేయడానికి పిన్‌ను అడగాలా?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ బయోమెట్రిక్స్‌ను ఉపయోగించడంతో పాటు, స్టార్ట్ కావడానికి ముందే ఈ పరికరం మీ ఆకృతిని అడిగేలా చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరం స్టార్ట్ అయ్యే వరకు, అలారాలతో సహా కాల్‌లు, మెసేజ్‌లు, నోటిఫికేషన్‌లను అందుకోలేదు.\n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలోని డేటాను రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని స్టార్ట్ చేయడానికి ఆకృతిని అడగాలా?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ బయోమెట్రిక్స్‌ను ఉపయోగించడంతో పాటు, స్టార్ట్ కావడానికి ముందే ఈ పరికరం మీ పాస్‌వర్డ్‌ను అడిగేలా చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరం స్టార్ట్ అయ్యే వరకు, అలారాలతో సహా కాల్‌లు, మెసేజ్‌లు, నోటిఫికేషన్‌లను అందుకోలేదు.\n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలోని డేటాను రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని స్టార్ట్ చేయడానికి పాస్‌వర్డ్‌ను అడగాలా?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"అవును"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"వద్దు"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"నియంత్రించబడింది"</string>
@@ -4074,7 +4096,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USBని ఏది నియంత్రించాలి"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"కనెక్ట్ చేసిన పరికరం"</string>
     <string name="usb_control_device" msgid="527916783743021577">"ఈ పరికరం"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"మారుస్తున్నారు..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"స్విచ్ అవుతోంది…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"మార్చడం సాధ్యపడలేదు"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ఈ పరికరాన్ని ఛార్జ్ చేస్తోంది"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"కనెక్ట్ చేయబడిన పరికరాన్ని ఛార్జ్ చేస్తోంది"</string>
@@ -4268,6 +4290,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"మొబైల్ డేటా వినియోగం"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"యాప్ డేటా వినియోగం"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi డేటా వినియోగం"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"నాన్-క్యారియర్ డేటా వినియోగం"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ఈథర్‌నెట్ డేటా వినియోగం"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"ఈథర్‌నెట్"</string>
@@ -4286,6 +4309,7 @@
       <item quantity="one">1 పరిమితి</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"క్యారియర్ డేటా గణన మరియు పరికర డేటా గణన మధ్య తేడా ఉండవచ్చు"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"క్యారియర్ నెట్‌వర్క్‌ల ద్వారా వినియోగించబడిన డేటా మినహాయించబడుతుంది"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> వినియోగించబడింది"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"డేటా హెచ్చరికను సెట్ చేయండి"</string>
     <string name="data_warning" msgid="2925054658166062884">"డేటా హెచ్చరిక"</string>
@@ -4321,7 +4345,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"వివరాలను చూడండి"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"డేటా సేవర్"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"అనియంత్రిత డేటా"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"నేపథ్య డేటా ఆఫ్ చేయబడింది"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"బ్యాక్‌గ్రౌండ్ డేటా ఆఫ్ చేయబడింది"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"ఆన్‌లో ఉంది"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ఆఫ్‌లో ఉంది"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"డేటా సేవర్‌ని ఉపయోగించు"</string>
@@ -4344,7 +4368,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"పరికరం లాక్ చేయబడితే, నోటిఫికేషన్‌ల్లో ప్రత్యుత్తరాలు లేదా ఇతర వచనాన్ని టైప్ చేయకుండా నిరోధించు"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"డిఫాల్ట్ స్పెల్‌ చెక‌ర్‌"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"స్పెల్‌ చెక‌ర్‌ను ఎంచుకోండి"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"స్పెల్‌ చెక‌ర్‌ను ఉప‌యోగించు"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"స్పెల్-చెకర్‌ను ఉపయోగించండి"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ఎంచుకోబడలేదు"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ఏదీ లేదు)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4434,7 +4458,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"నిల్వ స్థలాన్ని ఖాళీ చేయడంలో సహాయపడటానికి, నిల్వ నిర్వాహికి మీ పరికరం నుండి బ్యాకప్ చేసిన ఫోటోలు మరియు వీడియోలను తీసివేస్తుంది."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"ఫోటోలు &amp; వీడియోలను తీసివేయి"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"నిల్వ నిర్వాహికి"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"నిల్వ మేనేజర్‌ని ఉపయోగించండి"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"స్టోరేజ్ మేనేజర్‌ను ఉపయోగించండి"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"ఆటోమేటిక్‌"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"మాన్యువల్"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"ఇప్పుడు స్థలాన్ని ఖాళీ చేయి"</string>
@@ -4472,6 +4496,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"ఫోన్ చెక్ చేయ‌డానికి 2 సార్లు నొక్కడం"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"టాబ్లెట్‌ను తరచి చూడటానికి రెండుసార్లు నొక్కండి"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"పరికరాన్ని తరచి చూడటానికి రెండుసార్లు నొక్కండి"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"నోటిఫికేషన్‌ల కోసం స్వైప్"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"మీ నోటిఫికేషన్‌లను చూపించడానికి స్క్రీన్ దిగువ అంచు వరకు కిందికి స్వైప్ చేయండి"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"వన్-హ్యాండెడ్ మోడ్"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"వన్-హ్యాండెడ్ మోడ్‌ను ఉపయోగించండి"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"యాప్‌ల మధ్య స్విచ్ అయినప్పుడు నిష్క్రమించండి"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"గడువు ముగింపు"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 సెకన్లు"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 సెకన్లు"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 సెకన్లు"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"చేరుకోగలిగే బటన్"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"సమయం, నోటిఫికేషన్‌లు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడం కోసం, మీ స్క్రీన్‌ని రెండుసార్లు నొక్కండి."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ఫోన్‌ను తరచి చూడటానికి పైకి ఎత్తండి"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"టాబ్లెట్‌ను తరచి చూడటానికి పైకి ఎత్తండి"</string>
@@ -4484,6 +4518,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"టాబ్లెట్‌ను తనిఖీ చేయడానికి నొక్కండి"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"పరికరాన్ని తనిఖీ చేయడానికి నొక్కండి"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"సమయం, నోటిఫికేషన్‌లు మరియు ఇతర సమాచారాన్ని తనిఖీ చేయడానికి నొక్కండి."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ఎమర్జెన్సీ SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"ఎమర్జెన్సీ SOSను ఉపయోగించండి"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> ద్వారా మేనేజ్ చేయబడింది"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"పవర్ బటన్‌ను త్వరత్వరగా 5 సార్లు లేదా అంతకంటే ఎక్కువ సార్లు నొక్కడం ద్వారా కింది చర్యలను ప్రారంభించండి"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"కౌంట్‌డౌన్ అలారం ప్లే చేయి"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"సహాయం కోసం కాల్ చేయడానికి ముందు గట్టి శబ్దాన్ని ప్లే చేయి"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"సహాయం కోసం కాల్ చేయండి"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"సహాయం కోసం కాల్ చేయాల్సిన నంబర్"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. మార్చడానికి ట్యాప్ చేయండి"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"ఎమర్జెన్సీ నంబర్‌ను కాకుండా మీరు మరేదైనా నంబర్‌ను ఎంటర్ చేస్తే:\n • ఎమర్జెన్సీ SOSను ఉపయోగించడానికి మీ పరికరాన్ని తప్పనిసరిగా అన్‌లాక్ చేయాలి\n • మీ కాల్‌కు సమాధానం లభించకపోవచ్చు"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"నోటిఫికేషన్‌ల కోసం వేలిముద్రతో స్వైప్ చేయండి"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"వేలిముద్రతో స్వైప్ చేయి"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"మీ నోటిఫికేషన్‌లను తనిఖీ చేయడానికి, మీ ఫోన్ వెనుకవైపు ఉన్న వేలిముద్ర సెన్సార్‌పై కిందికి స్వైప్ చేయండి."</string>
@@ -4609,6 +4653,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"కనిపించగల గరిష్ఠ డేటాసమితులు"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"డిఫాల్ట్ విలువలకు రీసెట్ చేయి"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"స్వీయ పూరింపు డెవలపర్ ఎంపికలు రీసెట్ చేయబడ్డాయి"</string>
+    <string name="location_category" msgid="3496759112306219062">"లొకేషన్"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"స్టేటస్ బార్ లొకేషన్ సూచీ"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"నెట్‌వర్క్, కనెక్టివిటీతో పాటు లొకేషన్‌లు అన్నింటినీ చూపిస్తుంది"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"శక్తివంతమైన GNSS కొలతలు"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"డ్యూటీ సైక్లింగ్ లేకుండా అన్ని GNSS నక్షత్రరాశులను మరియు ఫ్రీక్వెన్సీలను ట్రాక్ చేయండి"</string>
     <string name="device_theme" msgid="5027604586494772471">"పరికర రూపం"</string>
     <string name="default_theme" msgid="4815428567082263639">"డిఫాల్ట్"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"నెట్‌వర్క్ పేరు"</string>
@@ -4625,8 +4674,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"ఇతర వ్యాపకాలపై దృష్టి మరలకుండా ఉండడానికి నోటిఫికేషన్‌లను పాజ్ చేయండి"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ఫీచర్ అందుబాటులో లేదు"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"మీ ఫోన్ పనితీరును నెమ్మ‌దించేలా చేస్తున్నందున ఈ ఫీచర్ ఆఫ్ చేయబడింది"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"శక్తివంతమైన GNSS కొలతలు"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"డ్యూటీ సైక్లింగ్ లేకుండా అన్ని GNSS నక్షత్రరాశులను మరియు ఫ్రీక్వెన్సీలను ట్రాక్ చేయండి"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"ఎల్లప్పుడూ క్రాష్ డైలాగ్‌ని చూపు"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"యాప్ క్రాష్ అయిన ప్రతిసారి డైలాగ్‌ని చూపు"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"కోణం ప్రారంభించబడిన యాప్‌ను ఎంచుకోండి"</string>
@@ -4638,7 +4685,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"అన్ని యాప్‌లకు ఎనేబుల్ చేయండి"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"గ్రాఫిక్స్ డ్రైవర్‌ను ఎంచుకోండి"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"డిఫాల్ట్"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"గేమ్ డ్రైవర్"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"గేమ్ డ్రైవర్"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"డెవలపర్ డ్రైవర్"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"సిస్టమ్ గ్రాఫిక్స్ డ్రైవర్"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4694,7 +4741,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"ఆన్ చేయి (మ్యూట్)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ఆఫ్"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"నెట్‌వర్క్ వివరాలు"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"మీ ఫోన్‌లోని యాప్‌లకు మీ పరికరం పేరు కనిపిస్తుంది. మీరు బ్లూటూత్ పరికరాలకు కనెక్ట్ చేసినప్పుడు లేదా Wi-Fi హాట్‌స్పాట్‌ని సెటప్ చేసినప్పుడు ఇతర వ్యక్తులకు కూడా ఇది కనిపించవచ్చు."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"మీ పరికరంలోని పేరు మీ ఫోన్‌లోని యాప్‌లకు కనిపిస్తుంది. మీరు బ్లూటూత్ పరికరాలకు కనెక్ట్ చేసినప్పుడు, Wi-Fi నెట్‌వర్క్‌కు కనెక్ట్ చేసినప్పుడు లేదా Wi-Fi హాట్‌స్పాట్‌ను సెటప్ చేసినప్పుడు ఇతర వ్యక్తులకు కూడా ఇది కనిపించవచ్చు."</string>
     <string name="devices_title" msgid="649715719278562515">"పరికరాలు"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"అన్ని సెట్టింగ్‌లు"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"సూచనలు"</string>
@@ -4707,6 +4754,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"నెట్‌వర్క్‌లను కనుగొనడం సాధ్యపడలేదు. మళ్లీ ప్రయత్నించండి."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(నిషేధించబడింది)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM కార్డ్ లేదు"</string>
+    <string name="sim_card" msgid="6381158752066377709">"సిమ్"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"సిమ్ లేదు"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ఏదీ కాదు"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"కనెక్ట్ కావడానికి సిమ్ కావాలి"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"కనెక్ట్ కావడానికి <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> సిమ్ కావాలి"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"ప్రాధాన్యత గల నెట్‌వర్క్ మోడ్: WCDMAకు ప్రాధాన్యత"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"ప్రాధాన్యత గల నెట్‌వర్క్ మోడ్: GSM మాత్రమే"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"ప్రాధాన్యత గల నెట్‌వర్క్ మోడ్: WCDMA మాత్రమే"</string>
@@ -4760,6 +4812,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"మొబైల్ డేటా"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"మొబైల్ నెట్‌వర్క్‌ను ఉపయోగించి డేటాను యాక్సెస్ చేయండి"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"ఈ కార్యియర్ పరిధిలోకి వచ్చినప్పుడు ఈ ఫోన్ ఆటోమేటిక్‌గా ఈ కార్యియర్ కనెక్షన్‌కు మారుతుంది"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM కార్డ్ అందుబాటులో లేదు"</string>
     <string name="calls_preference" msgid="2166481296066890129">"కాల్‌ల ప్రాధాన్యత"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS ప్రాధాన్యత"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ప్రతిసారి అడుగు"</string>
@@ -4820,6 +4873,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g>కి కనెక్ట్ చేసినప్పుడు అందుబాటులో ఉండదు"</string>
     <string name="see_more" msgid="7499355691042812723">"మరిన్నింటిని చూడండి"</string>
     <string name="see_less" msgid="2642392725363552793">"తక్కువ చూడండి"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ను ఆన్ చేయాలా?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIMను ఆన్ చేయాలా?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వాలా?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"సిమ్ కార్డ్‌ను ఉపయోగించడానికి స్విచ్ చేయాలనుకుంటున్నారా?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ఒకసారి ఒక SIM మాత్రమే యాక్టివ్‌గా ఉంటుంది.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వడం వలన మీ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ఒకసారి ఒక డౌన్‌లోడ్ చేయబడిన SIM మాత్రమే యాక్టివ్‌గా ఉంటుంది.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వడం వలన మీ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ఒకసారి ఒక SIM మాత్రమే యాక్టివ్‌గా ఉంటుంది.\n\nస్విచ్ అవ్వడం వలన మీ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవ్వండి"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"నెట్‌వర్క్‌కు కనెక్ట్ చేస్తోంది…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>కు స్విచ్ అవుతోంది"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"క్యారియర్‌ను స్విచ్ చేయడం సాధ్యం కాదు"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ఎర్రర్ కారణంగా క్యారియర్‌ను స్విచ్ చేయడం సాధ్యం కాదు."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>ను ఆఫ్ చేయాలా?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"సిమ్‌ను ఆఫ్ చేయాలా?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"సిమ్‌ను ఆఫ్ చేస్తోంది<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"క్యారియర్‌ను డిజేబుల్ చేయడం సాధ్యం కాదు"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"ఏదో తప్పు జరిగింది, మీ క్యారియర్‌ను డిజేబుల్ చేయడం సాధ్యం కాలేదు."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIMలు ఉపయోగిస్తారా?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"ఈ పరికరంలో ఒకే సమయంలో 2 SIMలు యాక్టివ్‌గా ఉండే సౌకర్యం ఉంది. ఒక సమయంలో ఒక్క SIMనే ఉపయోగించాలనుకుంటే, \"వద్దు, ధన్యవాదాలు\"ను ట్యాప్ చేయండి."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"పరికరాన్ని రీస్టార్ట్ చేయాలా?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"ఈ మోడ్‌ను ప్రారంభించడానికి, మీ పరికరాన్ని రీస్టార్ట్ చేయండి. ఆపై, మీరు మరొక SIMను జోడించవచ్చు."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"కొనసాగించు"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"రీస్టార్ట్ చేయి"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"వద్దు, ధన్యవాదాలు"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"స్విచ్ చేయి"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIMను యాక్టివేట్ చేయడం సాధ్యం కాదు"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIMను తీసివేసి, తిరిగి ఇన్‌సర్ట్ చేయండి. సమస్య ఇంకా కొనసాగితే, మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIMను తిరిగి ఆన్ చేయడానికి ట్రై చేయండి. సమస్య ఇంకా కొనసాగితే, మీ పరికరాన్ని రీస్టార్ట్ చేయండి."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"నెట్‌వర్క్ యాక్టివేషన్"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> యాక్టివ్‌గా ఉంది"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM సెట్టింగ్‌లను అప్‌డేట్ చేయడానికి ట్యాప్ చేయండి"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM కార్డ్"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"డౌన్‌లోడ్ చేయబడిన ఈ SIMను తొలగించాలా?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"ఈ SIMను తొలగించడం వలన ఈ పరికరం నుండి <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> సర్వీస్ తీసివేయబడుతోంది.\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> సర్వీస్ రద్దు చేయబడదు."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"తొలగించు"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIMను తొలగిస్తోంది…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIMను తొలగించలేకపోయింది"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"ఎర్రర్ కారణంగా ఈ SIMను తొలగించడం సాధ్యం కాలేదు.\n\nమీ పరికరాన్ని రీస్టార్ట్ చేసి మళ్లీ ట్రై చేయండి."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"పరికరానికి కనెక్ట్ చేయండి"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"మీ పరికరానికి కనెక్ట్ కావడానికి <xliff:g id="APPNAME">%1$s</xliff:g> యాప్ తాత్కాలిక Wi‑Fi నెట్‌వర్క్‌ను ఉపయోగించాలనుకుంటుంది"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"పరికరాలు ఏవీ కనుగొనబడలేదు. పరికరాలు ఆన్‌లో ఉన్నాయని మరియు కనెక్ట్ చేయడానికి అందుబాటులో ఉన్నాయని నిర్ధారించుకోండి."</string>
@@ -4891,6 +4982,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"అత్యవసర కాల్‌లు"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Wi‑Fi కాలింగ్‌ను ఉపయోగించి అత్యవసర కాల్‌లను చేయడానికి మీ క్యారియర్‌కు మద్దతు లేదు.\nఅత్యవసర కాల్‌ను చేయాల్సినప్పుడు పరికరం ఆటోమేటిక్‌గా సెల్యులార్ నెట్‌వర్క్‌‌కు మారుతుంది.\nసెల్యులార్ కవరేజీ ఉన్న ప్రాంతాలలో మాత్రమే అత్యవసర కాల్‌లను చేయడానికి సాధ్యమవుతుంది."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"కాల్‌ల నాణ్యతను మెరుగుపరచడానికి Wi‑Fiని ఉపయోగించు"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"క్రాస్ సిమ్ కాలింగ్"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"ఈ సిమ్ గుండా ఇతర సిమ్ కాల్స్, టెక్ట్స్ మెసేజ్‌‌లను అనుమతించండి"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"క్రాస్ సిమ్ కాలింగ్"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"ఇన్‌కమింగ్ MMS సందేశం"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS సందేశాన్ని పంపించడం సాధ్యం కాదు"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"మొబైల్ డేటా ఆఫ్‌లో ఉన్నప్పుడు <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>లో MMS సందేశ సేవను అనుమతించడానికి నొక్కండి"</string>
@@ -4942,10 +5036,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"సెట్టింగ్‌లలో స్క్రీన్ ఓవర్‌లేలను అనుమతించండి"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"సెట్టింగ్‌లలోకి వెళ్లి, ఇతర యాప్‌లపై స్క్రీన్ ఓవర్‌లే పద్ధతిలో కనిపించదగ్గ యాప్‌లకు అనుమతినివ్వండి"</string>
     <string name="media_controls_title" msgid="403271085636252597">"మీడియా"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"మీడియా సెషన్ ముగిసినప్పుడు, ప్లేయర్‌ను దాచు"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"విస్తరించిన త్వరిత సెట్టింగ్‌ల ప్యానెల్ నుండి సెషన్‌ను కొనసాగించడానికి ప్లేయర్ మిమ్మల్ని అనుమతిస్తుంది."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"త్వరిత సెట్టింగ్‌లలో మీడియా ప్లేయర్"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"ప్లేబ్యాక్‌ను సులభంగా తిరిగి కొనసాగించడానికి, మీడియా ప్లేయర్‌ను ఎక్కువ సేపు చూపించండి"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ప్లేయర్‌ను దాచు"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"ప్లేయర్‌ను చూపించు"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ప్లేయర్‌లు ఏవీ అందుబాటులో లేవు"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"అనుమతించబడిన యాప్‌లు"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"మీడియా"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"బ్లూటూత్ ఆన్ చేయబడుతుంది"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"ఆన్"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"ఆఫ్"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"ఇంటర్నెట్"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMలు"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"విమానం-సురక్షిత నెట్‌వర్క్‌లు"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"విమానం‑సురక్షిత నెట్‌వర్క్‌లను కనుగొని కనెక్ట్ చేయండి"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"విమానం, విమానం-సురక్షిత"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"కాల్స్ &amp; SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi కాలింగ్"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Wi-Fi వంటి క్యారియర్ కాని నెట్‌వర్క్‌ల ద్వారా కాల్‌లను చేయండి, స్వీకరించండి"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"క్యారియర్ కాని కొన్ని Wi-Fi నెట్‌వర్క్‌ల వంటి వాటి ద్వారా కాల్‌లను చేయడానికి, స్వీకరించడానికి Wi-Fi కాలింగ్ మిమ్మల్ని అనుమతిస్తుంది."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"కాల్స్"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"ప్రాధాన్యతనిస్తుంది"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"కాల్స్‌కు ప్రాధాన్యతనిస్తుంది"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMSకు ప్రాధాన్యతనిస్తుంది"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"అందుబాటులో లేదు"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"సిమ్ లేదు"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ప్రాధాన్యతలు"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"పబ్లిక్ నెట్‌వర్క్‌లకు కనెక్ట్ అవ్వండి"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"నెట్‌వర్క్ కనెక్షన్, ఇంటర్‌నెట్, వైర్‌లెస్, డేటా, Wi-Fi, Wi-Fi, Wi-Fi, సెల్యూలార్, మొబైల్, సెల్ క్యారియర్, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"విమానం‑సురక్షిత నెట్‌వర్క్‌లను చూడండి"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"విమానం మోడ్‌ను ఆఫ్ చేయండి"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"బెడ్ టైమ్ మోడ్ ఆన్‌లో ఉండడం వల్ల అందుబాటులో లేదు"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"రీసెట్ నోటిఫికేషన్ ప్రాముఖ్యత పూర్తయింది."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"యాప్‌లు"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"విశ్వసనీయం కానటువంటి పరికరం మీ మెసేజ్‌లను యాక్సెస్ చేయాలని కోరుకుంటోంది. వివరాల కోసం ట్యాప్ చేయండి."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"మెసేజ్‌లకు యాక్సెస్‌ను అనుమతించాలా?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"విశ్వసనీయం కానటువంటి బ్లూటూత్ పరికరం, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], మీ మెసేజ్‌లను యాక్సెస్ చేయాలనుకుంటోంది.\n\nమీరు ఇంతకు ముందెన్నడూ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]కు కనెక్ట్ కాలేదు."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"విశ్వసనీయం కాని పరికరం మీ కాంటాక్ట్‌లు, కాల్ లాగ్‌ను యాక్సెస్ చేయాలనుకుంటోంది. వివరాల కోసం ట్యాప్ చేయండి."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"కాంటాక్ట్‌లకు, కాల్ లాగ్‌కు యాక్సెస్‌ను అనుమతించాలా?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"విశ్వసనీయం కానటువంటి బ్లూటూత్ పరికరం, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], మీ కాంటాక్ట్‌లను, కాల్ లాగ్‌ను యాక్సెస్ చేయాలనుకుంటోంది. ఇది ఇన్‌కమింగ్, అవుట్‌గోయింగ్ కాల్‌ల డేటాతో కూడి ఉంటుంది.\n\nమీరు ఇంతకు ముందెన్నడూ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]కు కనెక్ట్ కాలేదు."</string>
 </resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index e7549a6..3b533bb 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -233,8 +233,8 @@
     <item msgid="50701215019227883">"สั่น"</item>
     <item msgid="2690144000353492014">"อ่านรายชื่อติดต่อ"</item>
     <item msgid="3858029424955955625">"แก้ไขรายชื่อติดต่อ"</item>
-    <item msgid="3439658954936709507">"อ่านประวัติการโทร"</item>
-    <item msgid="1908944516631132130">"แก้ไขประวัติการโทร"</item>
+    <item msgid="3439658954936709507">"อ่านบันทึกการโทร"</item>
+    <item msgid="1908944516631132130">"แก้ไขบันทึกการโทร"</item>
     <item msgid="9066115715905100138">"อ่านปฏิทิน"</item>
     <item msgid="1664720478157892566">"แก้ไขปฏิทิน"</item>
     <item msgid="5478277451617814822">"ค้นหา WiFi"</item>
@@ -300,8 +300,8 @@
     <item msgid="4104617224667554750">"สั่น"</item>
     <item msgid="1623646715189708947">"อ่านรายชื่อติดต่อ"</item>
     <item msgid="5060760609109972207">"แก้ไขรายชื่อติดต่อ"</item>
-    <item msgid="7451260062940797278">"อ่านประวัติการโทร"</item>
-    <item msgid="2348589304974534308">"แก้ไขประวัติการโทร"</item>
+    <item msgid="7451260062940797278">"อ่านบันทึกการโทร"</item>
+    <item msgid="2348589304974534308">"แก้ไขบันทึกการโทร"</item>
     <item msgid="4089146706115315300">"อ่านปฏิทิน"</item>
     <item msgid="1305780729690198918">"แก้ไขปฏิทิน"</item>
     <item msgid="3461096740171440592">"ตำแหน่ง"</item>
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"ปานกลาง"</item>
     <item msgid="6740026006576843477">"ยาว"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"สั้น"</item>
+    <item msgid="7397961711906421599">"ปานกลาง"</item>
+    <item msgid="4079132024502041928">"ยาว"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ค่าเริ่มต้น"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -490,7 +495,7 @@
   </string-array>
   <string-array name="wifi_metered_entries">
     <item msgid="3237321077949659241">"ตรวจหาโดยอัตโนมัติ"</item>
-    <item msgid="3779092145391320375">"ถือว่ามีการวัดปริมาณอินเทอร์เน็ต"</item>
+    <item msgid="3779092145391320375">"ถือว่ามีการจำกัดปริมาณอินเทอร์เน็ต"</item>
     <item msgid="2047166446768045816">"ถือว่าไม่มีการวัดปริมาณอินเทอร์เน็ต"</item>
   </string-array>
   <string-array name="wifi_privacy_entries">
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"ทั่วโลก"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA เท่านั้น"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"ทั่วโลก"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 72bec33..a700379 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"เวลาและวันที่"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"ตั้งวันที่และเวลา"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"ตั้งวันที่ เวลา เขตเวลาและรูปแบบ"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"ใช้เวลาที่ระบุโดยเครือข่าย"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"ใช้เขตเวลาที่ระบุโดยเครือข่าย"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"ตั้งเวลาอัตโนมัติ"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"ตั้งเขตเวลาอัตโนมัติ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"ใช้เวลาเริ่มต้นในท้องถิ่น"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"รูปแบบ 24 ชั่วโมง"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"ใช้รูปแบบ 24 ชั่วโมง"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"แสดงข้อมูลโปรไฟล์บนหน้าจอล็อก"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"บัญชี"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"ตำแหน่ง"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"ใช้ตำแหน่ง"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"ใช้ตำแหน่ง"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"ปิด"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">เปิดอยู่ - แอป <xliff:g id="COUNT_1">%1$d</xliff:g> แอปมีสิทธิ์เข้าถึงตำแหน่ง</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"ล็อกหน้าจอ, การปลดล็อกด้วยใบหน้า"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"ล็อกหน้าจอ ลายนิ้วมือ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"ล็อกหน้าจอ"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"ปลดล็อกโทรศัพท์ได้อย่างปลอดภัยด้วยใบหน้าและลายนิ้วมือของคุณ"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"คุณยังลงชื่อเข้าใช้แอปและยืนยันการชำระเงินได้อีกด้วย"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"ตั้งค่าการปลดล็อกด้วยสิ่งต่อไปนี้"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"ปลดล็อกด้วยใบหน้า"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"ปลดล็อกโทรศัพท์ได้ง่ายๆ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"ลายนิ้วมือ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"ปลดล็อกโทรศัพท์ฉับไว พร้อมใช้เมื่อหยิบ"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"ข้าม"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"ถัดไป"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"เพิ่มใบหน้าแล้ว"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"ตั้งค่าปลดล็อกด้วยใบหน้า"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"ปลดล็อกด้วยใบหน้า"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"ใช้ใบหน้าในการตรวจสอบสิทธิ์"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"เริ่ม"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"หากการปลดล็อกด้วยใบหน้าในการช่วยเหลือพิเศษปิดอยู่ ขั้นตอนการตั้งค่าบางรายการอาจทำงานกับ TalkBack ไม่ถูกต้อง"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"ย้อนกลับ"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"ตั้งค่าต่อ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ใช้การตั้งค่าการช่วยเหลือพิเศษ"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ต้องมีขั้นตอนการยืนยันทุกครั้งเมื่อใช้การปลดล็อกด้วยใบหน้าในแอป"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"ลบข้อมูลใบหน้า"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"ตั้งค่าปลดล็อกด้วยใบหน้า"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"ใช้ฟีเจอร์ปลดล็อกด้วยใบหน้าเพื่อปลดล็อกอุปกรณ์ ลงชื่อเข้าใช้แอป และยืนยันการชำระเงิน\n\nโปรดทราบว่า\nการดูโทรศัพท์อาจปลดล็อกเครื่องโดยไม่ได้ตั้งใจ\n\nคนอื่นอาจปลดล็อกโทรศัพท์ได้หากถือโทรศัพท์ไว้ตรงหน้าของคุณ\n\nคนที่หน้าคล้ายคุณมากๆ เช่น แฝดของคุณอาจปลดล็อกโทรศัพท์ได้"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"ใช้ฟีเจอร์ปลดล็อกด้วยใบหน้าเพื่อปลดล็อกอุปกรณ์ ลงชื่อเข้าใช้แอป และยืนยันการชำระเงิน\n\nโปรดทราบว่า\nการดูโทรศัพท์อาจปลดล็อกเครื่องโดยไม่ได้ตั้งใจ\n\nคนอื่นอาจปลดล็อกโทรศัพท์ได้หากถือโทรศัพท์ไว้ตรงหน้าของคุณ แม้ว่าคุณจะหลับตาอยู่ก็ตาม\n\nคนที่หน้าคล้ายคุณมากๆ เช่น แฝดของคุณอาจปลดล็อกโทรศัพท์ได้"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"ใช้การปลดล็อกด้วยใบหน้าเพื่อปลดล็อกอุปกรณ์ ลงชื่อเข้าใช้แอป และยืนยันการชำระเงิน"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"โปรดทราบว่า\nการดูโทรศัพท์อาจปลดล็อกเครื่องโดยไม่ได้ตั้งใจ\n\nคนอื่นอาจปลดล็อกโทรศัพท์ได้หากถือโทรศัพท์ไว้ที่หน้าของคุณ\n\nคนที่หน้าคล้ายคุณมากๆ เช่น แฝดของคุณอาจปลดล็อกโทรศัพท์ได้"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"โปรดทราบว่า\nการดูโทรศัพท์อาจปลดล็อกเครื่องโดยไม่ได้ตั้งใจ\n\nคนอื่นอาจปลดล็อกโทรศัพท์ได้หากถือโทรศัพท์ไว้ที่หน้าของคุณ แม้ว่าคุณจะหลับตาอยู่ก็ตาม\n\nคนที่หน้าคล้ายคุณมากๆ เช่น แฝดของคุณอาจปลดล็อกโทรศัพท์ได้"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"ลบข้อมูลใบหน้าไหม"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"ข้อมูลใบหน้าที่ใช้ในการปลดล็อกด้วยใบหน้าจะถูกลบออกอย่างถาวรและปลอดภัย หลังจากที่นำออกแล้ว คุณจะต้องใช้ PIN, รูปแบบ หรือรหัสผ่าน เพื่อปลดล็อกโทรศัพท์ ลงชื่อเข้าใช้แอป และยืนยันการชำระเงิน"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"ปลดล็อกโทรศัพท์ด้วยฟีเจอร์ปลดล็อกด้วยใบหน้า"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"ใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์หรืออนุมัติการซื้อ\n\nหมายเหตุ: คุณไม่สามารถใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์นี้ โปรดติดต่อผู้ดูแลระบบขององค์กรสำหรับข้อมูลเพิ่มเติม"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"ใช้ลายนิ้วมือเพื่อปลดล็อกโทรศัพท์หรืออนุมัติการซื้อ\n\nหมายเหตุ: ลายนิ้วมืออาจปลอดภัยน้อยกว่า PIN หรือรูปแบบที่เดายาก"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"ยกเลิก"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"ไม่เป็นไร"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"ต่อไป"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"ข้าม"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"ถัดไป"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตได้เวลาที่สูญหายหรือถูกขโมย และคุณต้องใช้ฟีเจอร์นี้เพื่อตั้งค่าการปลดล็อกด้วยใบหน้าด้วย แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้อุปกรณ์ได้เวลาที่สูญหายหรือถูกขโมย และคุณต้องใช้ฟีเจอร์นี้เพื่อตั้งค่าการปลดล็อกด้วยใบหน้าด้วย แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์ได้เวลาที่สูญหายหรือถูกขโมย และคุณต้องใช้ฟีเจอร์นี้เพื่อตั้งค่าการปลดล็อกด้วยใบหน้าด้วย แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตได้ ในกรณีที่สูญหายหรือถูกขโมย คุณต้องมีตัวเลือกล็อกหน้าจอด้วย จึงจะตั้งค่าข้อมูลไบโอเมตริกได้ แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้อุปกรณ์ได้ ในกรณีที่สูญหายหรือถูกขโมย คุณต้องมีตัวเลือกล็อกหน้าจอด้วย จึงจะตั้งค่าข้อมูลไบโอเมตริกได้ แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"ฟีเจอร์ล็อกหน้าจอจะช่วยป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์ได้ ในกรณีที่สูญหายหรือถูกขโมย คุณต้องมีตัวเลือกล็อกหน้าจอด้วย จึงจะตั้งค่าข้อมูลไบโอเมตริกได้ แตะ \"ยกเลิก\" เพื่อย้อนกลับ"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"ข้ามการตั้ง PIN ไหม"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"ข้ามการตั้งรหัสผ่านไหม"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"ข้ามการตั้งค่ารูปแบบไหม"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"ป้องกันไม่ให้ผู้อื่นใช้แท็บเล็ตเครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"ป้องกันไม่ให้ผู้ใช้อื่นใช้อุปกรณ์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"ป้องกันไม่ให้ผู้อื่นใช้โทรศัพท์เครื่องนี้โดยไม่ได้รับอนุญาตจากคุณด้วยการเปิดใช้งานฟีเจอร์การปกป้องอุปกรณ์ เลือกล็อกหน้าจอที่คุณต้องการใช้"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"เลือกวิธีสำรองในการล็อกหน้าจอ"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"เลือกวิธีสำรองในการล็อกหน้าจอ"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"เลือกวิธีสำรองในการล็อกหน้าจอ"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"ตัวเลือกการล็อกหน้าจอ"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"ตัวเลือกการล็อกหน้าจอ"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"ล็อกหน้าจอ"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"ปลดล็อกด้วยใบหน้าและรหัสผ่าน"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"ดำเนินการต่อโดยไม่ใช้การปลดล็อกด้วยใบหน้า"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"คุณปลดล็อกโทรศัพท์โดยใช้ใบหน้าได้ ตัวเลือกนี้ต้องใช้การล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"ข้อมูลไบโอเมตริก + รูปแบบ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"ข้อมูลไบโอเมตริก + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"ข้อมูลไบโอเมตริก + รหัสผ่าน"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"ดำเนินการต่อโดยไม่ใช้ข้อมูลไบโอเมตริก"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"คุณปลดล็อกโทรศัพท์ได้โดยใช้ข้อมูลไบโอเมตริก ตัวเลือกนี้ต้องใช้การล็อกหน้าจอสำรองเพื่อความปลอดภัย"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"ปิดใช้โดยผู้ดูแลระบบ นโยบายการเข้ารหัสลับ หรือที่เก็บข้อมูลที่เชื่อถือได้"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"ไม่มี"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"เลื่อน"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">ต้องมีตัวเลขไม่เกิน <xliff:g id="NUMBER_0">%d</xliff:g> ตัว</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"ผู้ดูแลระบบอุปกรณ์ไม่อนุญาตให้ใช้ PIN ที่เพิ่งใช้ไป"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"ผู้ดูแลระบบไอทีบล็อก PIN ที่ไม่รัดกุม ลอง PIN อื่น"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"ต้องใช้อักขระที่ใช้ได้ทั้งหมด"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"ต้องมีตัวอักษรอย่างน้อย 1 ตัว"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"ต้องมีตัวเลขอย่างน้อย 1 ตัว"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">ต้องมีอักขระที่ไม่ใช่ตัวเลขอย่างน้อย 1 ตัว</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"ผู้ดูแลระบบอุปกรณ์ไม่อนุญาตให้ใช้รหัสผ่านที่เพิ่งใช้ไป"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"ผู้ดูแลระบบไอทีบล็อกรหัสผ่านที่ไม่รัดกุม ลองรหัสผ่านอื่น"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ไม่อนุญาตให้เรียงจากน้อยไปมาก จากมากไปน้อย หรือเรียงลำดับตัวเลขที่ซ้ำกัน"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"ยืนยัน"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"ยกเลิก"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"เปิด WiFi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"ใช้ Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"ใช้ Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"การตั้งค่า WiFi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"ตั้งค่าและจัดการจุดเข้าใช้งานระบบไร้สาย"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"ให้คิวอาร์โค้ดอยู่กลางช่องด้านล่างเพื่อเชื่อมต่อไปยัง “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"ร่วมใช้ Wi‑Fi โดยการสแกนคิวอาร์โค้ด"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"แชร์ Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"สแกนคิวอาร์โค้ดนี้เพื่อเชื่อมต่อกับ “<xliff:g id="SSID">%1$s</xliff:g>” และแชร์รหัสผ่าน"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"ใช้อุปกรณ์เครื่องอื่นสแกนคิวอาร์โค้ดนี้เพื่อเข้าร่วม “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"สแกนคิวอาร์โค้ดนี้เพื่อเชื่อมต่อกับ “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"ลองอีกครั้ง หากยังแก้ปัญหาไม่ได้ ให้ติดต่อผู้ผลิตอุปกรณ์"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"มีข้อผิดพลาดเกิดขึ้น"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"รหัสผ่าน Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"รหัสผ่านฮอตสปอต: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"เชื่อมต่ออัตโนมัติ"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"อนุญาตให้โทรศัพท์เชื่อมต่อโดยอัตโนมัติเมื่ออยู่ใกล้เครือข่ายนี้"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"อนุญาตให้แท็บเล็ตเชื่อมต่อโดยอัตโนมัติเมื่ออยู่ใกล้เครือข่ายนี้"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"อนุญาตให้เชื่อมต่อกับเครือข่ายนี้เมื่ออยู่ในพื้นที่ให้บริการ"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"เพิ่มอุปกรณ์"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"ใช้คิวอาร์โค้ดเพื่อเพิ่มอุปกรณ์ในเครือข่ายนี้"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"คิวอาร์โค้ดมีรูปแบบไม่ถูกต้อง"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"ใช้ใบรับรองของระบบ"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"ไม่ต้องระบุ"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"ไม่ต้องตรวจสอบ"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"ไม่ได้ระบุใบรับรอง การเชื่อมต่อของคุณจะไม่เป็นส่วนตัว"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"ชื่อเครือข่ายยาวเกินไป"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"ต้องระบุโดเมน"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"ต้องมีใบรับรอง"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"เชื่อมต่อ"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"เปิด Wi-Fi แล้ว"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"เชื่อมต่อกับ <xliff:g id="NETWORK_NAME">%1$s</xliff:g> แล้ว"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"กำลังเชื่อมต่อกับ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"กำลังเชื่อมต่อ…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"ไม่สามารถเชื่อมต่อกับเครือข่าย"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"เครือข่ายไม่อยู่ในพื้นที่ให้บริการ"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"ที่อยู่ MAC ของอุปกรณ์"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"ที่อยู่ MAC แบบสุ่ม"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"ที่อยู่ MAC แบบสุ่ม (ใช้ล่าสุด)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"ที่อยู่ IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"รายละเอียดเครือข่าย"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"ซับเน็ตมาสก์"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"ที่อยู่ IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"เครือข่ายที่บันทึก"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"การสมัครใช้บริการ"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"เครือข่ายอื่น"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"การตั้งค่า IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"การตั้งค่า Wi‑Fi ขั้นสูงไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"บันทึก"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"พิมพ์ที่อยู่เกตเวย์ที่ถูกต้อง"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"พิมพ์ที่อยู่ DNS ที่ถูกต้อง"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"พิมพ์รหัสนำหน้าเครือข่ายซึ่งยาว 0 ถึง 32 อักขระ"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (หาก DNS ส่วนตัวไม่ลบล้าง)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (หาก DNS ส่วนตัวไม่ลบล้าง)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"เกตเวย์"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"ความยาวรหัสนำเครือข่าย"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"แอปไม่ได้แชร์เนื้อหา หากต้องการแชร์การเชื่อมต่ออินเทอร์เน็ต ให้ปิดฮอตสปอตแล้วเปิดใหม่"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"ไม่ได้ตั้งค่ารหัสผ่าน"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ชื่อฮอตสปอต"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"กำลังเปิด <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"กำลังเปิด <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"อุปกรณ์อื่นๆ สามารถเชื่อมต่อกับ <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"รหัสผ่านฮอตสปอต"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"ย่านความถี่ AP"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"เพิ่มอัตราการรีเฟรชจาก 60 เป็น 90 Hz โดยอัตโนมัติสำหรับเนื้อหาบางรายการ เพิ่มการใช้งานแบตเตอรี่"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"บังคับอัตราการรีเฟรชเป็น 90 เฮิร์ตซ์"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"อัตราการรีเฟรชสูงสุดสำหรับการตอบสนองต่อการแตะและคุณภาพของภาพเคลื่อนไหวที่ดียิ่งขึ้น เพิ่มการใช้งานแบตเตอรี่"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"การจดจ่อที่หน้าจอ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"เปิด/หน้าจอจะไม่ปิดหากคุณกำลังดูอยู่"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"ขณะที่หน้าจอมืดอยู่ ฟีเจอร์นี้จะเปิดขึ้นเมื่อมีการแจ้งเตือนเข้ามาใหม่"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"แสดงเวลาและข้อมูลเสมอ"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"การใช้งานแบตเตอรี่เพิ่มขึ้น"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"ทำข้อความเป็นตัวหนา"</string>
     <string name="title_font_size" msgid="570613010306330622">"ขนาดอักษร"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"ทำให้ข้อความมีขนาดใหญ่ขึ้นหรือเล็กลง"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"การตั้งค่าการล็อกซิมการ์ด"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"เวอร์ชันของ Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"การอัปเดตความปลอดภัยของ Android"</string>
     <string name="model_info" msgid="8997566254717810904">"โมเดล"</string>
-    <string name="model_summary" msgid="2246651782442466213">"รุ่น: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"โมเดลและฮาร์ดแวร์"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"เวอร์ชันฮาร์ดแวร์"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"รหัสอุปกรณ์"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"ลบ APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN ใหม่"</string>
     <string name="menu_save" msgid="6611465355127483100">"บันทึก"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"ทิ้ง"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"ยกเลิก"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"ต้องใส่ข้อมูลในช่องชื่อ"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"ต้องใส่ข้อมูล APN"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"รีเซ็ตแอปได้"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"รีเซ็ต Wi-Fi เน็ตมือถือ และบลูทูธ"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"การดำเนินการนี้จะรีเซ็ตการตั้งค่าเครือข่ายทั้งหมด ได้แก่\n\n"<li>"Wi‑Fi"</li>\n<li>"อินเทอร์เน็ตมือถือ"</li>\n<li>"บลูทูธ"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"ลบ"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"ลบซิมที่ดาวน์โหลด"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"โปรดติดต่อผู้ให้บริการเพื่อดาวน์โหลดซิมทดแทน การดำเนินการนี้จะไม่ยกเลิกแพ็กเกจอินเทอร์เน็ตมือถือของคุณ"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"การดำเนินการนี้จะไม่ยกเลิกแพ็กเกจอินเทอร์เน็ตมือถือ หากต้องการดาวน์โหลดซิมสำหรับใช้แทน โปรดติดต่อผู้ให้บริการ"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"รีเซ็ตการตั้งค่า"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"รีเซ็ตการตั้งค่าเครือข่ายทั้งหมดใช่ไหม คุณจะยกเลิกการดำเนินการนี้ไม่ได้"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"รีเซ็ตการตั้งค่าเครือข่ายทั้งหมดและลบซิมที่ดาวน์โหลดไหม คุณจะยกเลิกการดำเนินการนี้ไม่ได้"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"รีเซ็ตการตั้งค่าเครือข่ายแล้ว"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"ลบซิมไม่ได้"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"ลบซิมที่ดาวน์โหลดไม่ได้เนื่องจากมีข้อผิดพลาด\n\nรีสตาร์ทอุปกรณ์แล้วลองอีกครั้ง"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"ลบข้อมูลทั้งหมด (รีเซ็ตเป็นค่าเริ่มต้น)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"ลบข้อมูล (รีเซ็ตเป็นค่าเริ่มต้น)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"ของแท็บเล็ตของคุณ ซึ่งประกอบด้วย\n\n"<li>"บัญชี Google ของคุณ"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอป"</li>\n<li>"แอปที่ดาวน์โหลด"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"พื้นที่เก็บข้อมูลภายใน"</b>"โทรศัพท์ ได้แก่\n\n"<li>"บัญชี Google"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอป"</li>\n<li>"แอปที่ดาวน์โหลด"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"ขณะนี้คุณได้ลงชื่อเข้าใช้บัญชีต่อไปนี้แล้ว:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"มีผู้ใช้รายอื่นอยู่บนอุปกรณ์เครื่องนี้\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"เพลง"</li>\n<li>"รูปภาพ"</li>\n<li>"ข้อมูลผู้ใช้อื่นๆ"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"การดำเนินการนี้จะไม่ยกเลิกแพ็กเกจอินเทอร์เน็ตมือถือของคุณ"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ จะต้องลบ"<b>"ที่จัดเก็บข้อมูล USB"</b></string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ คุณต้องลบ"<b>"การ์ด SD"</b></string>
+    <string name="main_clear_title" msgid="277664302144837723">"ลบข้อมูลทั้งหมด (รีเซ็ตเป็นค่าเริ่มต้น)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"ลบข้อมูลทั้งหมด (รีเซ็ตเป็นค่าเริ่มต้น)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"แท็บเล็ต ได้แก่\n\n"<li>"บัญชี Google"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอป"</li>\n<li>"แอปที่ดาวน์โหลด"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"การดำเนินการนี้จะลบข้อมูลทั้งหมดออกจาก"<b>"ที่จัดเก็บข้อมูลภายใน"</b>"โทรศัพท์ ได้แก่\n\n"<li>"บัญชี Google"</li>\n<li>"ข้อมูลและการตั้งค่าของระบบและแอป"</li>\n<li>"แอปที่ดาวน์โหลด"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"ขณะนี้คุณลงชื่อเข้าใช้บัญชีต่อไปนี้อยู่\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"มีผู้ใช้รายอื่นอยู่ในอุปกรณ์เครื่องนี้\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"เพลง"</li>\n<li>"รูปภาพ"</li>\n<li>"ข้อมูลผู้ใช้อื่นๆ"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"การดำเนินการนี้จะไม่ยกเลิกแพ็กเกจอินเทอร์เน็ตมือถือของคุณ"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ จะต้องลบ"<b>"ที่จัดเก็บข้อมูล USB"</b></string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"หากต้องการล้างข้อมูลเพลง รูปภาพ และข้อมูลผู้ใช้อื่นๆ จะต้องลบ"<b>"การ์ด SD"</b></string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"ลบที่เก็บข้อมูล USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"ลบการ์ด SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"ลบข้อมูลทั้งหมดในที่จัดเก็บข้อมูล USB ภายใน เช่น เพลงหรือรูปภาพ"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"ลบข้อมูลทั้งหมดในการ์ด SD เช่น เพลงหรือรูปภาพ"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"ลบข้อมูลทั้งหมด"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"ลบข้อมูลทั้งหมด"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"ระบบจะลบข้อมูลส่วนบุคคลและแอปที่ดาวน์โหลดทั้งหมด คุณจะยกเลิกการดำเนินการนี้ไม่ได้"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"ระบบจะลบข้อมูลส่วนบุคคล รวมถึงแอปและซิมที่ดาวน์โหลดมาทั้งหมด คุณจะยกเลิกการดำเนินการนี้ไม่ได้"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ลบทุกอย่าง"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"ไม่มีการรีเซ็ตเนื่องจากบริการล้างข้อมูลระบบไม่พร้อมใช้งาน"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"ลบข้อมูลทั้งหมดใช่ไหม"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"การรีเซ็ตเป็นค่าจากโรงงานไม่สามารถใช้ได้สำหรับผู้ใช้รายนี้"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"กำลังลบ"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"โปรดรอสักครู่..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"ลบข้อมูลทั้งหมด"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"ลบข้อมูลทั้งหมด"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"ระบบจะลบข้อมูลส่วนบุคคลและแอปที่ดาวน์โหลดทั้งหมด คุณจะยกเลิกการดำเนินการนี้ไม่ได้"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"ระบบจะลบข้อมูลส่วนบุคคล รวมถึงแอปและซิมที่ดาวน์โหลดมาทั้งหมด คุณจะยกเลิกการดำเนินการนี้ไม่ได้"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"ลบข้อมูลทั้งหมดใช่ไหม"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"การรีเซ็ตเป็นค่าเริ่มต้นไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"กำลังลบ"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"โปรดรอสักครู่…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"การตั้งค่าการโทร"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"ตั้งค่าข้อความเสียง การโอนสาย สายเรียกซ้อน หมายเลขผู้โทร"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"เชื่อมต่อเน็ตผ่าน USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"ไม่สามารถปล่อยการเชื่อมต่อมากกว่า <xliff:g id="MAXCONNECTION">%1$d</xliff:g> อุปกรณ์"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> จะถูกยกเลิกการปล่อยสัญญาณ"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"เชื่อมต่อผ่านอีเทอร์เน็ต"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์ผ่านอีเทอร์เน็ต USB"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"แชร์การเชื่อมต่ออินเทอร์เน็ตของโทรศัพท์ผ่านอีเทอร์เน็ต"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือ เพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจากการเชื่อมต่อเน็ตมือถือได้ และแอปยังสามารถสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"ใช้ฮอตสปอตและการเชื่อมต่ออินเทอร์เน็ตผ่านมือถือเพื่อให้อุปกรณ์อื่นๆ ใช้อินเทอร์เน็ตจาก Wi-Fi หรือการเชื่อมต่ออินเทอร์เน็ตมือถือของคุณได้ แอปยังสร้างฮอตสปอตเพื่อแชร์เนื้อหากับอุปกรณ์ที่อยู่ใกล้เคียงได้อีกด้วย"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"ความช่วยเหลือ"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"การสแกนหาบลูทูธ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"อนุญาตให้แอปและบริการต่างๆ สแกนหาอุปกรณ์ใกล้เคียงตลอดเวลา แม้บลูทูธจะปิดอยู่ การตั้งค่านี้ใช้เพื่อปรับปรุงสิ่งต่างๆ เช่น ฟีเจอร์และบริการตามสถานที่"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"บริการตำแหน่งสำหรับการทำงาน"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"การตรวจหาเขตเวลาของสถานที่"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"การตรวจหาเขตเวลาของสถานที่"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"อนุญาตให้ใช้ตำแหน่งของอุปกรณ์ในการตรวจหาเขตเวลาปัจจุบัน การตั้งค่าตำแหน่งอื่นๆ เช่น การสแกนหา Wi-Fi อาจส่งผลต่อความแม่นยำในการตรวจหาเขตเวลา"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"เปิด"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"ปิด"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"การตรวจหาเขตเวลาอัตโนมัติปิดอยู่"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"การตรวจหาเขตเวลาของสถานที่ปิดอยู่"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"ไม่รองรับการตรวจหาเขตเวลาของสถานที่"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"ไม่อนุญาตให้เปลี่ยนแปลงการตรวจหาเขตเวลาของสถานที่"</string>
     <string name="location_network_based" msgid="5247042890080021887">"ตำแหน่ง WiFi และเครือข่าย"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"ให้แอปต่างๆ ใช้บริการระบุตำแหน่งของ Google เพื่อระบุตำแหน่งโดยประมาณของคุณรวดเร็วยิ่งขึ้น โดยจะมีการรวบรวมและส่งข้อมูลตำแหน่งที่ไม่ระบุชื่อให้ Google"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"ตำแหน่งที่กำหนดโดย WiFi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"ตั้งรหัสผ่านเพื่อใช้การปลดล็อกด้วยใบหน้า"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"ตั้งรูปแบบเพื่อใช้การปลดล็อกด้วยใบหน้า"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"ตั้ง PIN เพื่อใช้การปลดล็อกด้วยใบหน้า"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"หากจะใช้ข้อมูลไบโอเมตริก ให้ตั้งรหัสผ่าน"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"หากจะใช้ข้อมูลไบโอเมตริก ให้ตั้งรูปแบบ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"หากจะใช้ข้อมูลไบโอเมตริก ให้ตั้ง PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"หากลืมรหัสผ่าน"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"หากลืมรูปแบบ"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"หากลืม PIN"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"ค่ากำหนดคำบรรยายวิดีโอ"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"การขยาย"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"พื้นที่ในการขยาย"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"เปิดใช้การขยาย"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"เลือกพื้นที่ในการขยายที่ต้องการใช้เมื่อขยายหน้าจอ"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"เต็มหน้าจอ"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"บางส่วนของหน้าจอ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"เต็มหน้าจอและบางส่วนของหน้าจอ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"ขยายทั้งหน้าจอ"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"ขยายบางส่วนของหน้าจอ"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"เปลี่ยนไปใช้ปุ่มการช่วยเหลือพิเศษใช่ไหม"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"การใช้การแตะ 3 ครั้งเพื่อขยายหน้าจอบางส่วนจะทำให้การพิมพ์และการดำเนินการอื่นๆ ล่าช้า\n\nคุณต้องการเปลี่ยนไปใช้ปุ่มการช่วยเหลือพิเศษเพื่อขยายไหม"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"เปลี่ยนไปใช้ปุ่มการช่วยเหลือพิเศษ"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"ใช้การแตะ 3 ครั้งเพื่อขยายต่อไป"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"การตั้งค่าการขยาย"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"ขยายด้วยการแตะ 3 ครั้ง"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"ขยายโดยใช้ทางลัด"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"กดปุ่มเปิด/ปิดเพื่อวางสาย"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"ตัวชี้เมาส์ขนาดใหญ่"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"นำภาพเคลื่อนไหวออก"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"เสียงแบบโมโน"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"รวมช่องเสียงเมื่อเล่นไฟล์เสียง"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"สมดุลเสียง"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"ซ้าย"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"ขวา"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"เสียงแบบโมโน"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"รวมช่องเสียงเมื่อเล่นไฟล์เสียง"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"สมดุลเสียง"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"ซ้าย"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"ขวา"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ค่าเริ่มต้น"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 วินาที"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 วินาที"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"การสั่นเมื่อมีการแจ้งเตือน"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"การสั่นเมื่อมีเสียงเรียกเข้า"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"การตอบสนองการสัมผัส"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"ใช้ \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"เปิด \"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>\""</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"ใช้การแก้สี"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"แสดงคำบรรยาย"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"สำหรับแอปที่รองรับเท่านั้น"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"ใช้ <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"เปิด <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"ใช้การแก้สี"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"แสดงคำบรรยาย"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"สำหรับแอปที่รองรับเท่านั้น"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"ขนาดและรูปแบบของคำบรรยาย"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"ขนาดข้อความ <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"ตัวเลือกเพิ่มเติม"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"ตาบอดสีเขียว"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"ตาบอดสีแดง"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"ตาบอดสีน้ำเงิน"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"โทนสีเทา"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"สีแดง/เขียว"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"สีแดง/เขียว"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"สีน้ำเงิน/เหลือง"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"การจำกัดการทำงานในเบื้องหลัง"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"อนุญาตให้แอปทำงานในเบื้องหลัง"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ไม่อนุญาตให้แอปทำงานในพื้นหลัง"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"จำกัดการใช้งานในพื้นหลังไม่ได้"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"จำกัดการใช้งานในเบื้องหลังไม่ได้"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"จำกัดกิจกรรมในพื้นหลังใช่ไหม"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"แอปอาจทำงานผิดพลาดหากคุณจำกัดกิจกรรมในพื้นหลัง"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"เนื่องจากแอปนี้ไม่ได้ตั้งค่าให้เพิ่มประสิทธิภาพแบตเตอรี่ คุณจึงจำกัดการใช้งานไม่ได้\n\nหากต้องการจำกัด ให้เปิดการเพิ่มประสิทธิภาพแบตเตอรี่ก่อน"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ใช้งานแท็บเล็ตมากกว่าปกติ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"ใช้งานอุปกรณ์มากกว่าปกติ"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"แบตเตอรี่อาจหมดเร็วกว่าปกติ"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"การเพิ่มประสิทธิภาพแบตเตอรี่"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"การชาร์จแบตเตอรี่จำกัดชั่วคราว แตะเพื่อดูข้อมูลเพิ่มเติม"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"มีการใช้งานโทรศัพท์มากกว่าปกติ แบตเตอรี่อาจหมดเร็วกว่าที่คาดไว้\n\nแอปที่ใช้แบตเตอรี่มากสุดมีลำดับดังนี้"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"มีการใช้งานแท็บเล็ตมากกว่าปกติ แบตเตอรี่อาจหมดเร็วกว่าที่คาดไว้\n\nแอปที่ใช้แบตเตอรี่มากสุดมีลำดับดังนี้"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"มีการใช้งานอุปกรณ์มากกว่าปกติ แบตเตอรี่อาจหมดเร็วกว่าที่คาดไว้\n\nแอปที่ใช้แบตเตอรี่มากสุดมีลำดับดังนี้"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">จำกัดแอป %1$d แอป</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"พบปัญหาในการอ่านเครื่องวัดแบตเตอรี่"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"พบปัญหาในการอ่านเครื่องวัดแบตเตอรี่ แตะเพื่อ"<annotation id="url">"ดูข้อมูลเพิ่มเติม"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"หยุดแอปไหม"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"โทรศัพท์ไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ปลุกให้โทรศัพท์ตื่นอยู่ตลอด\n\nคุณสามารถหยุดแอปเพื่อลองแก้ปัญหานี้\n\nหากปัญหายังคงอยู่ คุณอาจต้องถอนการติดตั้งแอปเพื่อปรับปรุงประสิทธิภาพของแบตเตอรี่"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"แท็บเล็ตไม่สามารถจัดการแบตเตอรี่ได้ตามปกติเนื่องจาก <xliff:g id="APP">%1$s</xliff:g> ปลุกให้แท็บเล็ตตื่นอยู่ตลอด\n\nคุณสามารถหยุดแอปเพื่อลองแก้ปัญหานี้\n\nหากปัญหายังคงอยู่ คุณอาจต้องถอนการติดตั้งแอปเพื่อปรับปรุงประสิทธิภาพของแบตเตอรี่"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"ตั้งกำหนดการ"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"ยืดอายุใช้งานแบตเตอรี่"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"ปิดเมื่อชาร์จเต็มแล้ว"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"โหมดประหยัดแบตเตอรี่จะปิดเมื่อมีแบตเตอรี่โทรศัพท์อยู่ที่ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"โหมดประหยัดแบตเตอรี่จะปิดเมื่อแบตเตอรี่แท็บเล็ตอยู่ที่ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"โหมดประหยัดแบตเตอรี่จะปิดเมื่อแบตเตอรี่อุปกรณ์อยู่ที่ <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"โหมดประหยัดแบตเตอรี่จะปิดเมื่อโทรศัพท์ชาร์จเกิน <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"โหมดประหยัดแบตเตอรี่จะปิดเมื่อแท็บเล็ตชาร์จเกิน <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"โหมดประหยัดแบตเตอรี่จะปิดเมื่ออุปกรณ์ชาร์จเกิน <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"เปิด"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"รีเซ็ต"</string>
     <string name="tts_play" msgid="2945513377250757221">"เล่น"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"การเชื่อมต่อแบบปรับอัตโนมัติ"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"เพิ่มอายุการใช้งานแบตเตอรี่และปรับปรุงประสิทธิภาพของอุปกรณ์ด้วยการจัดการการเชื่อมต่อเครือข่ายโดยอัตโนมัติ"</string>
     <string name="credentials_title" msgid="7535942196886123656">"ที่เก็บข้อมูลเข้าสู่ระบบ"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ติดตั้งใบรับรอง"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"ติดตั้งใบรับรองจากพื้นที่เก็บข้อมูล"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"ข้อมูลเข้าสู่ระบบของผู้ใช้"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"ดูและแก้ไขข้อมูลเข้าสู่ระบบที่เก็บไว้"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"ขั้นสูง"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"ประเภทพื้นที่เก็บข้อมูล"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ใช้ฮาร์ดแวร์"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"ซอฟต์แวร์เท่านั้น"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"ข้อมูลรับรองไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"ติดตั้งแล้วสำหรับ VPN และแอป"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"ติดตั้งแล้วสำหรับ Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"ไม่ติดตั้ง"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"ยืนยันว่าจะติดตั้ง"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"ไม่ได้ติดตั้งใบรับรอง"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"อนุญาตให้ <xliff:g id="APP_NAME">%s</xliff:g> ติดตั้งใบรับรองบนอุปกรณ์นี้หรือไม่"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"ใบรับรองเหล่านี้จะระบุตัวตนของคุณให้กับแอปและ URL ด้านล่าง"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"ไม่อนุญาต"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"อนุญาต"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"แสดงเพิ่ม"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"แอปการจัดการใบรับรอง"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"ไม่มี"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"ใบรับรองที่แอปนี้ติดตั้งจะระบุตัวตนของคุณให้แอปและ URL ด้านล่างทราบ"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"นำออก"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"สัญญาณการโทรฉุกเฉิน"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"ตั้งค่าการทำงานเมื่อมีการโทรหาหมายเลขฉุกเฉิน"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"การสำรองข้อมูล"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ไม่ได้ตั้งค่า - โปรไฟล์งาน"</string>
     <string name="user_admin" msgid="4024553191395768119">"ผู้ดูแลระบบ"</string>
     <string name="user_you" msgid="3070562015202859996">"คุณ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"ชื่อเล่น"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"คุณสามารถเพิ่มผู้ใช้ได้สูงสุดถึง <xliff:g id="USER_COUNT">%1$d</xliff:g> คน"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"เฉพาะเจ้าของแท็บเล็ตเท่านั้นที่สามารถจัดการผู้ใช้ได้"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"เฉพาะเจ้าของโทรศัพท์เท่านั้นที่สามารถจัดการผู้ใช้ได้"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"การชำระเงินที่เครื่องชำระเงิน"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ตั้งค่าแอปการชำระเงิน แล้วแตะด้านหลังของโทรศัพท์กับเครื่องชำระเงินเครื่องใดก็ได้ที่มีสัญลักษณ์ \"ไม่ต้องสัมผัส\""</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"รับทราบ"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"เพิ่มเติม..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"เพิ่มเติม…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ตั้งค่าแอปการชำระเงินเริ่มต้น"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"อัปเดตแอปการชำระเงินเริ่มต้น"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"ใช้ <xliff:g id="APP">%1$s</xliff:g> เพื่อจ่ายเงินที่เครื่องชำระเงินแบบไม่ต้องสัมผัส"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"ย้อนกลับ"</string>
     <string name="wizard_next" msgid="3884832431439072471">"ถัดไป"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"เสร็จสิ้น"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ถ่ายรูป"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"เลือกรูปภาพ"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"เลือกรูปภาพ"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"ซิมการ์ด"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"ซิมการ์ด"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"ใช้ในการโทรทุกครั้ง"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"เลือกซิมสำหรับข้อมูล"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"เลือกซิมสำหรับ SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"กำลังสลับซิมข้อมูล การดำเนินการนี้อาจใช้เวลาถึง 1 นาที..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"กำลังสลับซิมข้อมูล การดำเนินการนี้อาจใช้เวลาถึง 1 นาที…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"โทรด้วย"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"เลือกซิมการ์ด"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"ซิมหมายเลข <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"กิจวัตร, ตั้งเวลา, โหมดประหยัดแบตเตอรี่, โหมดประหยัดพลังงาน, แบตเตอรี่, อัตโนมัติ, เปอร์เซ็นต์"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, การโทรขั้นสูง, การโทรผ่าน 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"เพิ่มภาษา"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"ขนาดข้อความ"</string>
     <string name="default_sound" msgid="6604374495015245195">"เสียงเริ่มต้น"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"ระดับเสียงเรียกเข้าและการแจ้งเตือนอยู่ที่ <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"ระดับเสียง การสั่น ห้ามรบกวน"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"เสียงเปิดเครื่อง"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"คำบรรยายสด"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"แสดงคำบรรยายสื่อโดยอัตโนมัติ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"ไม่มี"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">ตั้งกำหนดการแล้ว <xliff:g id="ON_COUNT">%d</xliff:g> รายการ</item>
-      <item quantity="one">ตั้งกำหนดการแล้ว 1 รายการ</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{ไม่มี}=1{ตั้งกำหนดการแล้ว 1 รายการ}other{ตั้งกำหนดการแล้ว # รายการ}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ห้ามรบกวน"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"รับเฉพาะการแจ้งเตือนจากผู้คนและแอปที่สำคัญ"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"จำกัดการรบกวน"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"เฉพาะเรื่องสำคัญ"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g> <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"เปิด / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"ปิด / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"ปิด"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"เปิด"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ถามทุกครั้ง"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"จนกว่าคุณจะปิด"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> ชั่วโมง</item>
-      <item quantity="one">1 ชั่วโมง</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> นาที"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> กำหนดการเปิดได้โดยอัตโนมัติ</item>
-      <item quantity="one">1 กำหนดการเปิดได้โดยอัตโนมัติ</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 ชั่วโมง}other{# ชั่วโมง}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 นาที}other{# นาที}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{ปิด}=1{ปิด / 1 กำหนดการเปิดได้โดยอัตโนมัติ}other{ปิด / # กำหนดการเปิดได้โดยอัตโนมัติ}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"สิ่งที่ให้รบกวนได้ในโหมดห้ามรบกวน"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"ผู้คน"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"แอป"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"ตั้งค่าการแจ้งเตือนที่มีลำดับความสำคัญน้อยเป็นแจ้งเตือนเบาๆ โดยอัตโนมัติ"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"การจัดอันดับการแจ้งเตือนแบบปรับอัตโนมัติ"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"จัดอันดับการแจ้งเตือนตามความเกี่ยวข้องโดยอัตโนมัติ"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"ความคิดเห็นเกี่ยวกับการแจ้งเตือนแบบปรับอัตโนมัติ"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"ระบุการปรับเปลี่ยนที่เกิดขึ้นกับการแจ้งเตือนและแสดงตัวเลือกในการแสดงความคิดเห็นให้กับระบบ"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"รีเซ็ตความสำคัญในการแจ้งเตือน"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"รีเซ็ตการตั้งค่าความสำคัญที่ผู้ใช้เปลี่ยน และอนุญาตให้ผู้ช่วยการแจ้งเตือนจัดลำดับความสำคัญ"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"การดำเนินการและการตอบที่แนะนำ"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"แสดงการดำเนินการและการตอบที่แนะนำโดยอัตโนมัติ"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"แสดงการแจ้งเตือนล่าสุดและการแจ้งเตือนที่มีการเลื่อนเวลา"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"การสนทนาสำคัญ"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"แสดงที่ด้านบนของส่วนการสนทนาและปรากฏเป็นบับเบิลแบบลอย"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"แสดงที่ด้านบนของส่วนการสนทนา"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"การสนทนาอื่น"</string>
+    <string name="other_conversations" msgid="551178916855139870">"การสนทนาที่ไม่สำคัญ"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"การสนทนาที่คุณได้ทำการแก้ไข"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"การสนทนาล่าสุด"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"ล้างรายการล่าสุด"</string>
+    <string name="clear" msgid="5092178335409471100">"ล้าง"</string>
     <string name="important_bubble" msgid="7911698275408390846">"แสดงการสนทนาที่สำคัญเป็นบับเบิล"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"การสนทนาที่สำคัญจะแสดงที่ด้านบนของหน้าต่างแจ้งเตือนแบบดึงลง และคุณยังตั้งค่าให้แสดงเป็นบับเบิลและข้ามโหมดห้ามรบกวนได้ด้วย"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"การสนทนาที่สำคัญและการสนทนาที่มีการเปลี่ยนแปลงจะปรากฏที่นี่"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"การเข้าถึง \"ห้ามรบกวน\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"อนุญาตโหมดห้ามรบกวน"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"ไม่มีแอปที่ติดตั้งใดๆ ส่งคำขอสิทธิ์เข้าถึง \"ห้ามรบกวน\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"กำลังโหลดแอป..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"กำลังโหลดแอป…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android กำลังบล็อกไม่ให้การแจ้งเตือนของแอปนี้ปรากฏในอุปกรณ์นี้ตามที่คุณขอ"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android กำลังบล็อกไม่ให้การแจ้งเตือนหมวดหมู่นี้ปรากฏในอุปกรณ์นี้ตามที่คุณขอ"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android กำลังบล็อกไม่ให้การแจ้งเตือนกลุ่มนี้ปรากฏในอุปกรณ์นี้ตามที่คุณขอ"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"การสนทนาทั้งหมด"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"การสนทนาสำคัญ"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"ไม่มี"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other">การสนทนา <xliff:g id="CONVERSATIONS">%d</xliff:g> รายการ</item>
-      <item quantity="one">การสนทนา 1 รายการ</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"ไม่มี"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{ไม่มี}=1{การสนทนา 1 รายการ}other{การสนทนา # รายการ}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"ผู้ที่รบกวนคุณได้"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"การโทร"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"การโทร"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"ตรวจสอบว่าคุณตั้งค่าอุปกรณ์ให้ส่งเสียง เพื่อให้แน่ใจว่าอุปกรณ์จะส่งเสียงเมื่อมีสายเรียกเข้าที่อนุญาต"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"บล็อกสายเรียกเข้าสำหรับ \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" เอาไว้ คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"รายชื่อติดต่อที่ติดดาว"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">อีก <xliff:g id="NUM_PEOPLE">%d</xliff:g> คน</item>
-      <item quantity="one">อีก 1 คน</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"ไม่มี"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{ไม่มี}=1{{contact_1}}=2{{contact_1} และ {contact_2}}=3{{contact_1}, {contact_2} และ {contact_3}}other{{contact_1}, {contact_2} และคนอื่นๆ อีก # ราย}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(ไม่มีชื่อ)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"ข้อความ"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"ข้อความ"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"ข้อความ"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"บล็อกข้อความเข้าสำหรับ \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" เอาไว้ คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"คุณจะได้รับทุกข้อความ"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"คุณจะได้รับทุกสาย"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"ไม่มี"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other">รายชื่อติดต่อ <xliff:g id="NUM_CONTACTS">%d</xliff:g> ราย</item>
-      <item quantity="one">รายชื่อติดต่อ 1 ราย</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{ไม่มี}=1{รายชื่อติดต่อ 1 ราย}other{รายชื่อติดต่อ # ราย}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"ทุกคน"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"รายชื่อติดต่อ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"รายชื่อติดต่อที่ติดดาว"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"การแจ้งเตือนทั้งหมด"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"การแจ้งเตือนบางรายการ"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"บุคคลที่เลือกไว้จะยังคงติดต่อคุณได้ แม้ว่าคุณจะไม่ได้อนุญาตแอปให้รบกวนก็ตาม"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g>รบกวนได้</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g>รบกวนได้</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"อีก <xliff:g id="NUMBER">%d</xliff:g> รายการ"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{ไม่ให้แอปใดรบกวนเลย}=1{{app_1} รบกวนได้}=2{{app_1} และ {app_2} รบกวนได้}=3{{app_1}, {app_2} และ {app_3} รบกวนได้}other{{app_1}, {app_2} และอีก # แอปรบกวนได้}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"แอป"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"การแจ้งเตือนทั้งหมด"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"การแจ้งเตือนบางรายการ"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"การแจ้งเตือนที่รบกวนคุณได้"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"อนุญาตการแจ้งเตือนทั้งหมด"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>รบกวนได้</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g>รบกวนได้</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"ไม่ให้อะไรรบกวนเลย"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"อีก <xliff:g id="NUMBER">%d</xliff:g> รายการ"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{ไม่ให้อะไรรบกวนเลย}=1{{sound_category_1} รบกวนได้}=2{{sound_category_1} และ {sound_category_2} รบกวนได้}=3{{sound_category_1}, {sound_category_2} และ {sound_category_3} รบกวนได้}other{{sound_category_1}, {sound_category_2} และอีก # เสียงรบกวนได้}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"ไม่ให้อะไรรบกวนเลย"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"ไม่ให้ใครรบกวนเลย"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"ให้รบกวนได้แค่บางคน"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"ให้ทุกคนรบกวนได้"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"เปิด"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"ปิด"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"การตรึงแอป"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"การตรึงแอปจะทำให้คุณเห็นแอปปัจจุบันได้ตลอดจนกว่าจะเลิกตรึง ตัวอย่างการใช้ฟีเจอร์นี้ เช่น อนุญาตให้เพื่อนที่เชื่อถือได้เล่นเกมหนึ่งๆ \n\nเมื่อตรึงแอป แอปที่ตรึงอาจเปิดแอปอื่นๆ และอาจมีการเข้าถึงข้อมูลส่วนตัว \n\nวิธีใช้การตรึงแอป 	\n1.	เปิดการตรึงแอป 	\n2.	เปิด \"ภาพรวม\" 	\n3.	แตะไอคอนแอปที่ด้านบนหน้าจอ จากนั้นแตะ \"ตรึง\""</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"การตรึงแอปจะทำให้คุณเห็นแอปปัจจุบันได้ตลอดจนกว่าจะเลิกตรึง ตัวอย่างการใช้ฟีเจอร์นี้ เช่น อนุญาตให้เพื่อนที่เชื่อถือได้เล่นเกมหนึ่งๆ \n\nเมื่อตรึงแอป แอปที่ตรึงอาจเปิดแอปอื่นๆ และอาจมีการเข้าถึงข้อมูลส่วนตัว \n\nหากต้องการใช้อุปกรณ์ร่วมกับคนอื่นอย่างปลอดภัย ให้ลองใช้ผู้ใช้ชั่วคราวแทน \n\nวิธีใช้การตรึงแอป 	\n1.	เปิดการตรึงแอป 	\n2.	เปิด \"ภาพรวม\" 	\n3.	แตะไอคอนแอปที่ด้านบนของหน้าจอ จากนั้นแตะ \"ตรึง\""</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"การตรึงแอปจะทำให้คุณเห็นแอปปัจจุบันได้ตลอดจนกว่าจะเลิกตรึง ตัวอย่างการใช้ฟีเจอร์นี้ เช่น อนุญาตให้เพื่อนที่เชื่อถือได้เล่นเกมหนึ่งๆ"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"เมื่อตรึงแอป แอปที่ตรึงอาจเปิดแอปอื่นๆ และอาจมีการเข้าถึงข้อมูลส่วนตัว \n\nวิธีใช้การตรึงแอป 	\n1.	เปิดการตรึงแอป 	\n2.	เปิด \"ภาพรวม\" 	\n3.	แตะไอคอนแอปที่ด้านบนหน้าจอ จากนั้นแตะ \"ตรึง\""</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"เมื่อตรึงแอป แอปที่ตรึงอาจเปิดแอปอื่นๆ และอาจมีการเข้าถึงข้อมูลส่วนตัว \n\nหากต้องการใช้อุปกรณ์ร่วมกับคนอื่นอย่างปลอดภัย ให้ลองใช้ผู้ใช้ชั่วคราวแทน \n\nวิธีใช้การตรึงแอป 	\n1.	เปิดการตรึงแอป 	\n2.	เปิด \"ภาพรวม\" 	\n3.	แตะไอคอนแอปที่ด้านบนหน้าจอ จากนั้นแตะ \"ตรึง\""</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"เมื่อมีการตรึงแอป \n\n•	 อาจมีการเข้าถึงข้อมูลส่วนตัว (เช่น รายชื่อติดต่อและเนื้อหาในอีเมล)\n•	 แอปที่ตรึงอาจเปิดแอปอื่นๆ \n\nใช้การตรึงแอปกับคนที่คุณไว้ใจเท่านั้น\n"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"ขอรูปแบบการปลดล็อกก่อนเลิกตรึง"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"ขอ PIN ก่อนเลิกตรึง"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"นอกเหนือจากการใช้ใบหน้าเพื่อปลดล็อกอุปกรณ์แล้ว คุณยังปกป้องอุปกรณ์นี้ให้รัดกุมยิ่งขึ้นได้โดยการกำหนดให้ป้อน PIN ก่อนเริ่มต้นระบบ อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้จะช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย กำหนดให้ป้อน PIN เพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"นอกเหนือจากการใช้ใบหน้าเพื่อปลดล็อกอุปกรณ์แล้ว คุณยังปกป้องอุปกรณ์นี้ให้รัดกุมยิ่งขึ้นได้โดยการกำหนดให้ใช้รูปแบบก่อนเริ่มต้นระบบ อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้จะช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย กำหนดให้ใช้รูปแบบเพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"นอกเหนือจากการใช้ใบหน้าเพื่อปลดล็อกอุปกรณ์แล้ว คุณยังปกป้องอุปกรณ์นี้ให้รัดกุมยิ่งขึ้นได้โดยการกำหนดให้ขอรหัสผ่านก่อนเริ่มต้นระบบ อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้จะช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย กำหนดให้ขอรหัสผ่านเพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"นอกเหนือจากการใช้ข้อมูลไบโอเมตริกเพื่อปลดล็อกอุปกรณ์ คุณยังปกป้องอุปกรณ์นี้เพิ่มเติมได้โดยกำหนดให้ป้อน PIN ก่อนที่อุปกรณ์จะเริ่มทำงาน อุปกรณ์จะรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกไม่ได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้ช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย ต้องการกำหนดให้ป้อน PIN เพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"นอกเหนือจากการใช้ข้อมูลไบโอเมตริกเพื่อปลดล็อกอุปกรณ์ คุณยังปกป้องอุปกรณ์นี้เพิ่มเติมได้โดยกำหนดให้ป้อนรูปแบบก่อนที่อุปกรณ์จะเริ่มทำงาน อุปกรณ์จะรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกไม่ได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้จะช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย ต้องการกำหนดให้ป้อนรูปแบบเพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"นอกเหนือจากการใช้ข้อมูลไบโอเมตริกเพื่อปลดล็อกอุปกรณ์แล้ว คุณยังปกป้องอุปกรณ์นี้เพิ่มเติมได้โดยกำหนดให้ป้อนรหัสผ่านก่อนเริ่มต้นระบบ อุปกรณ์จะรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงการปลุกไม่ได้จนกว่าจะเริ่มต้นระบบ\n\nวิธีนี้จะช่วยปกป้องข้อมูลในกรณีที่อุปกรณ์สูญหายหรือถูกขโมย ต้องการกำหนดให้ป้อนรหัสผ่านเพื่อเริ่มต้นระบบอุปกรณ์ไหม"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ใช่"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"ไม่"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"ถูกจำกัด"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"ควบคุม USB โดย"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"อุปกรณ์ที่เชื่อมต่อ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"อุปกรณ์นี้"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"กำลังเปลี่ยน..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"กำลังเปลี่ยน…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"เปลี่ยนไม่ได้"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"ชาร์จอุปกรณ์นี้"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"การชาร์จอุปกรณ์ที่เชื่อมต่อ"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"ปริมาณการใช้อินเทอร์เน็ตมือถือ"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"การใช้อินเทอร์เน็ตของแอป"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"ปริมาณการใช้อินเทอร์เน็ตผ่าน Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"ปริมาณการใช้อินเทอร์เน็ตที่ไม่ได้เป็นของผู้ให้บริการ"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ปริมาณการใช้อีเทอร์เน็ต"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"อีเทอร์เน็ต"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">ข้อจำกัด 1 ข้อ</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"การบันทึกการใช้อินเทอร์เน็ตของผู้ให้บริการอาจแตกต่างไปจากการบันทึกในอุปกรณ์"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"ไม่รวมอินเทอร์เน็ตที่ใช้โดยเครือข่ายผู้ให้บริการ"</string>
     <string name="data_used_template" msgid="8229342096562327646">"ใช้ไป <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ตั้งค่าเตือนการใช้อินเทอร์เน็ต"</string>
     <string name="data_warning" msgid="2925054658166062884">"เตือนปริมาณอินเทอร์เน็ต"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"ดูรายละเอียด"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"การประหยัดอินเทอร์เน็ต"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"ไม่จำกัดการใช้อินเทอร์เน็ต"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"ปิดใช้อินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"ปิดใช้อินเทอร์เน็ตที่ใช้งานอยู่เบื้องหลัง"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"เปิด"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"ปิด"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ใช้โปรแกรมประหยัดอินเทอร์เน็ต"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"หากอุปกรณ์ล็อกอยู่ จะป้องกันไม่ให้มีการพิมพ์คำตอบหรือข้อความอื่นๆ ในการแจ้งเตือน"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"โปรแกรมตรวจตัวสะกดเริ่มต้น"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"เลือกโปรแกรมตรวจตัวสะกด"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"ใช้โปรแกรมตรวจตัวสะกด"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"ใช้โปรแกรมตรวจตัวสะกด"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"ไม่ได้เลือก"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(ไม่มี)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"ตัวจัดการพื้นที่เก็บข้อมูลจะนำรูปภาพและวิดีโอที่สำรองไว้ออกจากอุปกรณ์ของคุณ เพื่อช่วยเพิ่มพื้นที่เก็บข้อมูล"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"นำรูปภาพและวิดีโอออก"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"ตัวจัดการพื้นที่เก็บข้อมูล"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"ใช้ตัวจัดการพื้นที่เก็บข้อมูล"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"ใช้ตัวจัดการพื้นที่เก็บข้อมูล"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"อัตโนมัติ"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"คู่มือ"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"เพิ่มพื้นที่ว่างเลย"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"แตะสองครั้งเพื่อดูโทรศัพท์"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"แตะ 2 ครั้งเพื่อตรวจสอบแท็บเล็ต"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"แตะ 2 ครั้งเพื่อตรวจสอบอุปกรณ์"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"เลื่อนเพื่อดูการแจ้งเตือน"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"เลื่อนลงไปที่ขอบด้านล่างของหน้าจอเพื่อแสดงการแจ้งเตือน"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"โหมดมือเดียว"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ใช้โหมดมือเดียว"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ออกเมื่อสลับแอป"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"หมดเวลา"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 วินาที"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 วินาที"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 วินาที"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ความสามารถในการเข้าถึง"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"หากต้องการดูเวลา การแจ้งเตือน และข้อมูลอื่นๆ ให้แตะหน้าจอสองครั้ง"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"ยกขึ้นเพื่อดูโทรศัพท์"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"ยกขึ้นเพื่อตรวจสอบแท็บเล็ต"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"แตะเพื่อดูแท็บเล็ต"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"แตะเพื่อดูอุปกรณ์"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"หากต้องการดูเวลา การแจ้งเตือน และข้อมูลอื่นๆ ให้แตะหน้าจอ"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"ขอความช่วยเหลือฉุกเฉิน"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"ใช้การขอความช่วยเหลือฉุกเฉิน"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"จัดการโดย <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"เริ่มการดำเนินการที่ระบุไว้ด้านล่างนี้โดยกดปุ่มเปิด/ปิดเร็วๆ อย่างน้อย 5 ครั้ง"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"เล่นสัญญาณเตือนนับถอยหลัง"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"เล่นเสียงดังก่อนแจ้งเตือนขอความช่วยเหลือ"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"โทรขอความช่วยเหลือ"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"หมายเลขสำหรับโทรขอความช่วยเหลือ"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g> แตะเพื่อเปลี่ยน"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"หากคุณป้อนหมายเลขที่ไม่ใช่หมายเลขฉุกเฉิน:\n • ต้องปลดล็อกอุปกรณ์เพื่อขอความช่วยเหลือฉุกเฉิน\n • อาจไม่มีผู้รับสาย"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"ใช้ลายนิ้วมือแสดงการแจ้งเตือน"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"เลื่อนนิ้วสแกนลายนิ้วมือ"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"ในการตรวจสอบการแจ้งเตือน ให้เลื่อนนิ้วลงผ่านเซ็นเซอร์ลายนิ้วมือที่ด้านหลังโทรศัพท์"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"ชุดข้อมูลที่ปรากฏสูงสุด"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"รีเซ็ตเป็นค่าเริ่มต้น"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"ตัวเลือกการป้อนอัตโนมัติสำหรับนักพัฒนาซอฟต์แวร์ได้รับการรีเซ็ตแล้ว"</string>
+    <string name="location_category" msgid="3496759112306219062">"ตำแหน่ง"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"สัญญาณบอกสถานะตำแหน่งของแถบสถานะ"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"แสดงตำแหน่งทั้งหมด รวมถึงเครือข่ายและการเชื่อมต่อ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"บังคับใช้การวัด GNSS เต็มรูปแบบ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ติดตามระบบดาวเทียมและความถี่สัญญาณ GNSS ทั้งหมดโดยไม่มีการปิดพักเพื่อประหยัดพลังงาน"</string>
     <string name="device_theme" msgid="5027604586494772471">"ธีมอุปกรณ์"</string>
     <string name="default_theme" msgid="4815428567082263639">"ค่าเริ่มต้น"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"ชื่อเครือข่าย"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"หยุดการแจ้งเตือนชั่วคราวเพื่อไม่ให้มีสิ่งรบกวน"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"ใช้งานฟีเจอร์ไม่ได้"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"ฟีเจอร์นี้ถูกปิดไปเพราะทำให้โทรศัพท์ช้า"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"บังคับใช้การวัด GNSS เต็มรูปแบบ"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"ติดตามระบบดาวเทียมและความถี่สัญญาณ GNSS ทั้งหมดโดยไม่มีการปิดพักเพื่อประหยัดพลังงาน"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"แสดงปัญหาที่ขัดข้องเสมอ"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"แสดงกล่องโต้ตอบทุกครั้งที่แอปขัดข้อง"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"เลือกแอปที่พร้อมใช้งาน ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"เปิดใช้สำหรับแอปทั้งหมด"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"เลือกไดรเวอร์กราฟิก"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ค่าเริ่มต้น"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"ไดรเวอร์เกม"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"ไดรเวอร์เกม"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ไดรเวอร์ของนักพัฒนาซอฟต์แวร์"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"ไดรเวอร์กราฟิกของระบบ"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"เปิด (ปิดเสียง)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"ปิด"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"รายละเอียดเครือข่าย"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"แอปในโทรศัพท์จะเห็นชื่อของอุปกรณ์ และคนอื่นก็อาจเห็นเช่นกันหากคุณเชื่อมต่อกับอุปกรณ์บลูทูธหรือตั้งค่าฮอตสปอต Wi-Fi"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"แอปในโทรศัพท์จะเห็นชื่อของอุปกรณ์ และคนอื่นก็อาจเห็นเช่นกันหากคุณเชื่อมต่อกับอุปกรณ์บลูทูธหรือเครือข่าย Wi-Fi หรือตั้งค่าฮอตสปอต Wi-Fi"</string>
     <string name="devices_title" msgid="649715719278562515">"อุปกรณ์"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"การตั้งค่าทั้งหมด"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"คำแนะนำ"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"ไม่พบเครือข่าย โปรดลองอีกครั้ง"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ห้ามใช้)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"ไม่มีซิมการ์ด"</string>
+    <string name="sim_card" msgid="6381158752066377709">"ซิม"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"ไม่มีซิม"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"ไม่มี"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"ต้องใช้ซิมเพื่อเชื่อมต่อ"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"ต้องใช้ซิม <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> เพื่อเชื่อมต่อ"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"โหมดเครือข่ายที่ต้องการ: ต้องการ WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"โหมดเครือข่ายที่ต้องการ: GSM เท่านั้น"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"โหมดเครือข่ายที่ต้องการ: WCDMA เท่านั้น"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"เน็ตมือถือ"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"เข้าถึงอินเทอร์เน็ตโดยใช้เครือข่ายมือถือ"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"โทรศัพท์จะเปลี่ยนไปใช้ผู้ให้บริการรายนี้โดยอัตโนมัติเมื่ออยู่ในพื้นที่ให้บริการ"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"ไม่มีซิมการ์ดพร้อมใช้งาน"</string>
     <string name="calls_preference" msgid="2166481296066890129">"ค่ากำหนดการโทร"</string>
     <string name="sms_preference" msgid="7742964962568219351">"ค่ากำหนด SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ถามทุกครั้ง"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"ใช้ไม่ได้เมื่อเชื่อมต่อกับ <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"ดูเพิ่ม"</string>
     <string name="see_less" msgid="2642392725363552793">"ดูน้อยลง"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"ต้องการเปิด <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ใช่ไหม"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"ต้องการเปิดซิมใช่ไหม"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"เปลี่ยนเป็น <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ใช่ไหม"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"เปลี่ยนไปใช้ซิมการ์ดใช่ไหม"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"ใช้งานซิมได้ทีละ 1 อันเท่านั้น\n\nการเปลี่ยนเป็น <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> จะไม่ยกเลิกบริการของ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"ใช้งานซิมที่ดาวน์โหลดมาได้ทีละ 1 อันเท่านั้น\n\nการเปลี่ยนเป็น <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> จะไม่ยกเลิกบริการของ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"ใช้งานซิมได้ทีละ 1 อันเท่านั้น\n\nการเปลี่ยนจะไม่ยกเลิกบริการของ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"เปลี่ยนเป็น <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"กำลังเชื่อมต่อกับเครือข่าย…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"กำลังเปลี่ยนเป็น <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"เปลี่ยนผู้ให้บริการไม่ได้"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"เปลี่ยนผู้ให้บริการไม่ได้เนื่องจากมีข้อผิดพลาด"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"ต้องการปิด <xliff:g id="CARRIER_NAME">%1$s</xliff:g> ใช่ไหม"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"ปิดซิมใช่ไหม"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"กำลังปิดซิม<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"ปิดใช้ผู้ให้บริการไม่ได้"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"เกิดข้อผิดพลาดที่ทำให้ปิดใช้ผู้ให้บริการไม่ได้"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"ใช้ 2 ซิมไหม"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"อุปกรณ์นี้ใช้ 2 ซิมพร้อมกันได้ หากต้องการใช้ครั้งละ 1 ซิมต่อไป ให้แตะ \"ไม่เป็นไร\""</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"รีสตาร์ทอุปกรณ์ไหม"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"รีสตาร์ทอุปกรณ์เพื่อเริ่มต้นใช้งาน จากนั้นคุณจะเพิ่มซิมได้"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"ดำเนินการต่อ"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"รีสตาร์ท"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"ไม่เป็นไร"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"เปลี่ยน"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"เปิดใช้งานซิมไม่ได้"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"ถอดซิมออกแล้วใส่กลับเข้าไปอีกครั้ง หากยังพบปัญหาอยู่ ให้รีสตาร์ทอุปกรณ์"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"ลองเปิดใช้ซิมอีกครั้ง หากยังพบปัญหาอยู่ ให้รีสตาร์ทอุปกรณ์"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"การเปิดใช้งานเครือข่าย"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> ใช้งานอยู่"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"แตะเพื่ออัปเดตการตั้งค่าซิม"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"ซิมการ์ด"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"ลบซิมที่ดาวน์โหลดมานี้ใช่ไหม"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"การลบซิมนี้จะนำบริการ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> ออกจากอุปกรณ์นี้\n\nแต่จะไม่ยกเลิกบริการของ <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"ลบ"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"กำลังลบซิม…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"ลบซิมไม่ได้"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"ลบซิมนี้ไม่ได้เนื่องจากมีข้อผิดพลาด\n\nรีสตาร์ทอุปกรณ์แล้วลองอีกครั้ง"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"เชื่อมต่อกับอุปกรณ์"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"แอป <xliff:g id="APPNAME">%1$s</xliff:g> ต้องการใช้เครือข่าย Wi‑Fi ชั่วคราวเพื่อเชื่อมต่อไปยังอุปกรณ์"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"ไม่พบอุปกรณ์ ตรวจสอบว่าอุปกรณ์เปิดอยู่และพร้อมเชื่อมต่อ"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"หมายเลขฉุกเฉิน"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"ผู้ให้บริการของคุณไม่รองรับการโทรหาหมายเลขฉุกเฉินผ่าน Wi‑Fi\nอุปกรณ์จะเปลี่ยนไปใช้เครือข่ายมือถือโดยอัตโนมัติเพื่อโทรหาหมายเลขฉุกเฉิน\nคุณจะโทรหาหมายเลขฉุกเฉินได้ในพื้นที่ที่มีสัญญาณมือถือครอบคลุมเท่านั้น"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"ใช้ Wi‑Fi สำหรับการโทรเพื่อคุณภาพที่ดีขึ้น"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"การโทรข้ามซิม"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"อนุญาตให้ซิมอื่นโทรและส่ง SMS ผ่านซิมนี้"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"การโทรข้ามซิม"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"ข้อความ MMS ขาเข้า"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"ส่งข้อความ MMS ไม่สำเร็จ"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"แตะเพื่ออนุญาตให้ใช้การรับส่ง MMS ใน <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> ขณะอินเทอร์เน็ตมือถือปิดอยู่"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"อนุญาตการซ้อนทับบนหน้าจอในการตั้งค่า"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"อนุญาตแอปที่แสดงเหนือแอปอื่นๆ ได้เพื่อวางซ้อนหน้าจอการตั้งค่า"</string>
     <string name="media_controls_title" msgid="403271085636252597">"สื่อ"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"ซ่อนโปรแกรมเล่นเมื่อเซสชันสื่อสิ้นสุดลง"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"โปรแกรมเล่นให้คุณดำเนินเซสชันต่อได้จากแผงการตั้งค่าด่วนที่ขยายออกมา"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"โปรแกรมเล่นสื่อในการตั้งค่าด่วน"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"แสดงโปรแกรมเล่นสื่อนานขึ้นเพื่อให้กลับมาเล่นอีกครั้งได้โดยง่าย"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"ซ่อนโปรแกรมเล่น"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"แสดงโปรแกรมเล่น"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"ไม่มีโปรแกรมเล่น"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"แอปที่อนุญาต"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"สื่อ"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"บลูทูธจะเปิด"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"เปิด"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"ปิด"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"อินเทอร์เน็ต"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"ซิม"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"เครือข่ายที่ใช้บนเครื่องบินได้อย่างปลอดภัย"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ค้นหาและเชื่อมต่อเครือข่ายที่ใช้บนเครื่องบินได้อย่างปลอดภัย"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"เครื่องบิน, ใช้บนเครื่องบินได้อย่างปลอดภัย"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"การโทรและ SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"การโทรผ่าน Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"โทรออกและรับสายผ่านเครือข่ายที่ไม่ได้เป็นของผู้ให้บริการ เช่น Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"การโทรผ่าน Wi-Fi ให้คุณโทรออกและรับสายผ่านเครือข่ายที่ไม่ได้เป็นของผู้ให้บริการ เช่น เครือข่าย Wi-Fi บางเครือข่ายได้"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"การโทร"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"ต้องการ"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"สายสนทนาที่ต้องการ"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS ที่ต้องการ"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ไม่ว่าง"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"ไม่มีซิม"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ค่ากำหนด"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"เชื่อมต่อเครือข่ายสาธารณะ"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"การเชื่อมต่อเครือข่าย, อินเทอร์เน็ต, ไร้สาย, อินเทอร์เน็ตมือถือ, wifi, wi-fi, wi fi, เครือข่ายมือถือ, อุปกรณ์เคลื่อนที่, ผู้ให้บริการเครือข่ายมือถือ, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ดูเครือข่ายที่ใช้บนเครื่องบินได้ปลอดภัย"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ปิดโหมดบนเครื่องบิน"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"ใช้ไม่ได้เนื่องจากโหมดเวลาเข้านอนเปิดอยู่"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"รีเซ็ตความสำคัญในการแจ้งเตือนแล้ว"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"แอป"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"อุปกรณ์ที่ไม่น่าเชื่อถือต้องการเข้าถึงข้อความของคุณ แตะเพื่อดูรายละเอียด"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"อนุญาตให้เข้าถึงข้อความไหม"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"อุปกรณ์บลูทูธที่ไม่น่าเชื่อถือ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] ต้องการเข้าถึงข้อความของคุณ\n\nคุณไม่เคยเชื่อมต่อกับ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] มาก่อน"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"อุปกรณ์ที่ไม่น่าเชื่อถือต้องการเข้าถึงรายชื่อติดต่อและบันทึกการโทร แตะเพื่อดูรายละเอียด"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"อนุญาตให้เข้าถึงรายชื่อติดต่อและบันทึกการโทรไหม"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"อุปกรณ์บลูทูธที่ไม่น่าเชื่อถือ [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] ต้องการเข้าถึงรายชื่อติดต่อและบันทึกการโทร ซึ่งรวมถึงข้อมูลเกี่ยวกับสายเรียกเข้าและโทรออก\n\nคุณไม่เคยเชื่อมต่อกับ [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] มาก่อน"</string>
 </resources>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index a8cef12..de3096d 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Katamtaman"</item>
     <item msgid="6740026006576843477">"Mahaba"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Maikli"</item>
+    <item msgid="7397961711906421599">"Katamtaman"</item>
+    <item msgid="4079132024502041928">"Mahaba"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Default"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Pangkalahatan"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"TDSCDMA lang"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Pandaigdigan"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 6a549b4..5f47977 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Petsa &amp; oras"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"I-set ang petsa at oras"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Itakda ang petsa, oras, time zone, &amp; mga format"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Gamitin ang oras ng network"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Gamitin ang time zone na mula sa network"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Awtomatikong itakda ang oras"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Awtomatikong itakda ang time zone"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Gamitin ang lokal na default"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-oras na format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Gamitin ang format na 24-oras"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Ipakita ang impormasyon ng profile sa lock screen"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Mga Account"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Lokasyon"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Gumamit ng lokasyon"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Gumamit ng lokasyon"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Naka-off"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Naka-on - <xliff:g id="COUNT_1">%1$d</xliff:g> app ang may access sa lokasyon</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Lock ng screen, face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Lock ng screen, fingerprint"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Lock ng screen"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Secure na i-unlock ang phone mo gamit ang mukha at fingerprint mo"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Puwede kang mag-sign in sa mga app at magkumpirma ng bayad"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"I-set up ang pag-unlock sa:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Face unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Padaliin ang pag-unlock sa telepono mo"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Fingerprint"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Padaliing mag-unlock ng phone sa bulsa"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Laktawan"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Susunod"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Naidagdag ang mukha"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"I-set up ang face unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Face unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Gamitin ang mukha mo sa pag-authenticate"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Simula"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Kung naka-off ang face unlock sa accessibility, posibleng hindi gumana nang maayos sa TalkBack ang ilang hakbang ng setup."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Bumalik"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Ituloy ang pag-set up"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Gamitin ang accessibility setup"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Kapag gumagamit ng face unlock sa app, laging humiling ng kumpirmasyon"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"I-delete: face data"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"I-set up ang face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Gamitin ang face unlock para i-unlock ang iyong device, mag-sign in sa mga app, at magkumpirma ng mga pagbabayad.\n\nTandaan:\nPuwedeng hindi sinasadyang ma-unlock ang telepono kapag tumingin ka rito.\n\nPuwedeng ma-unlock ng ibang tao ang iyong telepono kung itatapat ito sa mukha mo.\n\nPuwedeng ma-unlock ang iyong telepono ng isang taong kamukhang-kamukha mo, halimbawa, ng iyong kapatid."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Gamitin ang face unlock para i-unlock ang iyong device, mag-sign in sa mga app, at magkumpirma ng mga pagbabayad.\n\nTandaan:\nPuwedeng hindi sinasadyang ma-unlock ang telepono kapag tumingin ka rito.\n\nPuwedeng ma-unlock ng ibang tao ang iyong telepono kung itatapat ito sa mukha mo, kahit na nakapikit ka.\n\nPuwedeng ma-unlock ang iyong telepono ng isang taong kamukhang-kamukha mo, halimbawa, ng iyong kapatid."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Gamitin ang face unlock para i-unlock ang iyong device, mag-sign in sa mga app, at magkumpirma ng mga pagbabayad."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Tandaan:\nKapag tiningnan ang telepono, puwedeng ma-unlock ito kahit hindi mo sinasadya.\n\nPuwedeng ma-unlock ng ibang tao ang iyong telepono kung itatapat ito sa mukha mo.\n\nPuwedeng ma-unlock ang iyong telepono ng isang taong kamukhang-kamukha mo, halimbawa, ng iyong kapatid."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Tandaan:\nKapag tiningnan ang telepono, puwedeng ma-unlock ito kahit hindi mo sinasadya.\n\nPuwedeng ma-unlock ng ibang tao ang iyong telepono kung itatapat ito sa mukha mo, kahit na nakapikit ka.\n\nPuwedeng ma-unlock ang iyong telepono ng isang taong kamukhang-kamukha mo, halimbawa, ng iyong kapatid."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"I-delete ang data ng mukha?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Permanente at secure na made-delete ang face data na ginagamit ng face unlock. Pagkatapos nitong maalis, kakailanganin mo ang iyong PIN, pattern, o password para i-unlock ang telepono mo, mag-sign in sa mga app, at kumpirmahin ang mga pagbabayad."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Gamitin ang face unlock para i-unlock ang iyong telepono"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Gamitin ang iyong fingerprint upang i-unlock ang telepono mo o aprubahan ang mga pagbili.\n\nTandaan: Hindi mo maaaring gamitin ang iyong fingerprint upang i-unlock ang device na ito. Para sa higit pang impormasyon, makipag-ugnayan sa admin ng iyong organisasyon."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Gamitin ang iyong fingerprint para i-unlock ang telepono mo o aprubahan ang mga pagbili.\n\nTandaan: Posibleng hindi gaanong secure ang iyong fingerprint kaysa sa mahirap hulaang pattern o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Kanselahin"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Huwag na lang"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Magpatuloy"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Laktawan"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Susunod"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Sa pamamagitan ng pagprotekta sa iyong tablet gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang face unlock. Para bumaik, i-tap ang Kanselahin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Sa pamamagitan ng pagprotekta sa iyong device gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang face unlock. Para bumaik, i-tap ang Kanselahin."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Sa pamamagitan ng pagprotekta sa iyong telepono gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para i-set up ang face unlock. Para bumaik, i-tap ang Kanselahin."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Sa pamamagitan ng pagprotekta sa iyong tablet gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para mag-set up ng biometrics. Para bumalik, i-tap ang Kanselahin."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Sa pamamagitan ng pagprotekta sa iyong device gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para mag-set up ng biometrics. Para bumalik, i-tap ang Kanselahin."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Sa pamamagitan ng pagprotekta sa iyong telepono gamit ang opsyon sa lock ng screen, walang makakagamit dito kung nawala o nanakaw ito. Kailangan mo rin ng opsyon sa lock ng screen para mag-set up ng biometrics. Para bumalik, i-tap ang Kanselahin."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Laktawan ang pag-set up ng PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Laktawan ang pag-set up ng password?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Laktawan ang pag-set up ng pattern?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Pigilan ang ibang taong magamit ang tablet na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Pigilan ang ibang taong magamit ang device na ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Pigilan ang ibang taong magamit ang teleponong ito sa pamamagitan ng pag-a-activate sa mga feature ng proteksyon ng device. Piliin ang screen lock na gusto mong gamitin."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Piliin ang iyong backup na paraan ng pag-screen lock"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Piliin ang iyong backup na paraan ng pag-lock ng screen"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Piliin ang iyong backup na paraan ng pag-lock ng screen"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Mga opsyon sa lock ng screen"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Mga opsyon sa lock ng screen"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Screen lock"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Face unlock + Password"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Magpatuloy nang walang face unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Maa-unlock mo ang iyong telepono gamit ang mukha mo. Para sa seguridad, nangangailangan ang opsyong ito ng backup na lock ng screen."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometrics + Pattern"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometrics + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometrics + Password"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Magpatuloy nang walang biometrics"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Puwede mong i-unlock ang iyong phone gamit ang biometrics mo. Para sa seguridad, kinakailangan ng opsyong ito ng backup na lock ng screen."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Na-disable ng admin, patakaran sa pag-encrypt, o storage ng kredensyal"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Wala"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Mag-swipe"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">Dapat ay wala pang <xliff:g id="NUMBER_1">%d</xliff:g> na digit</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Hindi pinapayagan ng admin ng device ang paggamit ng kamakailang PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Bina-block ng iyong IT admin ang mga pangkaraniwang PIN. Sumubok ng ibang PIN."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Hindi ito maaaring magsama ng di-wastong character"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Dapat maglaman ng kahit isang titik lang"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Dapat maglaman ng kahit isang digit lang"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">Dapat ay may kahit <xliff:g id="COUNT">%d</xliff:g> na hindi numerong character</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Hindi pinapayagan ng admin ng device ang paggamit ng kamakailang password"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Bina-block ng iyong IT admin ang mga pangkaraniwang password. Sumubok ng ibang password."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Hindi pinapayagan ang pataas, pababa, o paulit-ulit na pagkakasunod-sunod ng mga digit"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Kumpirmahin"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Kanselahin"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"I-on ang Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Gumamit ng Wi‑Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Gumamit ng Wi‑Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Mga setting ng Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Mag-set up &amp; mamahala ng mga wireless na access point"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Igitna ang QR code sa ibaba para makakonekta sa “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Sumali sa Wi‑Fi sa pamamagitan ng pag-scan ng QR code"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Ibahagi ang Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"I-scan ang QR code na ito para kumonekta sa “<xliff:g id="SSID">%1$s</xliff:g>” at ibahagi ang password"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"I-scan ang QR code na ito gamit ang isa pang device para makasali sa “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"I-scan ang QR code na ito para kumonekta sa “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Subukang muli. Kung magpatuloy ang isyu, makipag-ugnayan sa manufacturer ng device"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Nagkaproblema"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Password ng Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Password ng hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Auto‑connect"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Payagan ang telepono na awtomatikong kumonekta malapit sa network na ito"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Payagan ang tablet na awtomatikong kumonekta malapit sa network na ito"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Payagan ang pagkonekta sa network na ito kapag may signal ito"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Magdagdag ng device"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Gumamit ng QR code para makapagdagdag ng device sa network na ito"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Hindi valid na format ang QR code"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Gamitin ang mga certificate ng system"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Huwag ibigay"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Huwag patotohanan"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Walang natukoy na certificate. Hindi magiging pribado ang iyong koneksyon."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Masyadong mahaba ang pangalan ng network."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Dapat tumukoy ng domain."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Kinakailangan ang certificate."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Kumonekta"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Na-on ang Wi‑Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Nakakonekta sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Kumokonekta sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Kumokonekta…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Nabigong kumonekta sa network."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Walang signal ang network"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Device MAC address"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Naka-randomize na MAC address"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Na-randomize na MAC address (huling ginamit)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP address"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Mga detalye ng network"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Subnet mask"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Mga IPv6 address"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Naka-save na network"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Mga Subscription"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Iba pang network"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Mga setting ng IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Hindi available para sa user na ito ang mga advanced na setting ng Wi‑Fi"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"I-save"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Mag-type ng isang wastong gateway address."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Mag-type ng wastong DNS address."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Mag-type haba ng network prefix pagitan 0 at 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (maliban na lang kung mao-override ng Pribadong DNS)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (maliban na lang kung mao-override ng Pribadong DNS)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Gateway"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Haba ng prefix ng network"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Nagbabahagi ng content ang app. Upang magbahagi ng koneksyon sa internet, i-off ang hotspot, pagkatapos ay i-on"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Walang naitakdang password"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Pangalan ng hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ino-on ang <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Ino-on ang <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Maaaring kumonekta ang iba pang device sa <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Password ng hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP Band"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth na Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Awtomatikong itinataas sa 90 Hz mula sa 60 Hz ang refresh rate para sa ilang content. Mas lumalakas ang paggamit ng baterya."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Pilitin ang 90 Hz na rate ng pag-refresh"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Pinakamataas na rate ng pag-refresh para sa pinahusay na pagiging responsive ng pagpindot at kalidad ng animation. Pinapalakas ang paggamit ng baterya."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Atensyon sa screen"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Naka-on / Hindi mag-o-off ang screen kung tinitingnan mo ito"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Kapag naka-off ang screen, mag-o-on ito para sa mga bagong notification"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Palaging ipakita ang oras at impormasyon"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Mas malakas na paggamit ng baterya"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Bold na Text"</string>
     <string name="title_font_size" msgid="570613010306330622">"Laki ng font"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Palakihin o paliitin ang text"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Setting ng lock ng SIM card"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Bersyon ng Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Update sa seguridad ng Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Modelo"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Modelo: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Modelo at hardware"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Bersyon ng hardware"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID ng Kagamitan"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"I-delete ang APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Bagong APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"I-save"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Itapon"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Kanselahin"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Hindi maaaring walang laman ang field ng Pangalan."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Hindi maaaring walang laman ang APN."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Puwedeng i-reset ang mga app"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"I-reset ang Wi-Fi, mobile, at Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Ire-reset nito ang lahat ng setting ng network, kasama ang:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobile data"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Burahin"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Burahin ang na-download na SIM"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Para mag-download ng mga pamalit na SIM, makipag-ugnayan sa iyong carrier. Hindi nito kakanselahin ang anumang service plan sa mobile."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Hindi nito kakanselahin ang anumang plan ng serbisyo sa mobile. Para mag-download ng mga kapalit na SIM, makipag-ugnayan sa iyong carrier."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"I-reset ang mga setting"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"I-reset ang lahat ng network setting? Hindi mo maa-undo ang pagkilos na ito."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"I-reset ang lahat ng network setting at burahin ang mga na-download na SIM? Hindi mo maa-undo ang pagkilos na ito."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Na-reset na ang mga network setting"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Hindi mabura ang mga SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Hindi mabura ang mga na-download na SIM dahil sa isang error.\n\nI-restart ang iyong device at subukang muli."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Burahin ang lahat ng data (factory reset)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Burahin lahat (factory reset)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Buburahin nito ang lahat ng data sa "<b>"internal storage"</b>" ng iyong tablet, kasama ang:\n\n"<li>"Google Account mo"</li>\n<li>"Mga data at setting ng system at app"</li>\n<li>"Mga na-download na app"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Buburahin nito ang lahat ng data sa "<b>"internal storage"</b>" ng iyong telepono, kasama ang:\n\n"<li>"Google Account mo"</li>\n<li>"Data at mga setting ng system at app"</li>\n<li>"Mga na-download na app"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"May iba pang mga user sa device na ito.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"mga eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Hindi nito kakanselahin ang iyong plano ng serbisyo sa mobile."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Upang i-clear ang musika, mga larawan at iba pang data ng user, kailangang mabura ang "<b>"USB storage"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Upang i-clear ang musika, mga larawan at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Burahin lahat (factory reset)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Burahin lahat (factory reset)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Buburahin nito ang lahat ng data sa "<b>"internal storage"</b>" ng iyong tablet, kasama ang:\n\n"<li>"Google Account mo"</li>\n<li>"Mga data at setting ng system at app"</li>\n<li>"Mga na-download na app"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Buburahin nito ang lahat ng data sa "<b>"internal storage"</b>" ng iyong telepono, kasama ang:\n\n"<li>"Google Account mo"</li>\n<li>"Data at mga setting ng system at app"</li>\n<li>"Mga na-download na app"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Kasalukuyan kang naka-sign in sa mga sumusunod na account:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"May iba pang user sa device na ito.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"mga eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Hindi nito kakanselahin ang iyong plano ng serbisyo sa mobile."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Para i-clear ang musika, mga larawan at iba pang data ng user, kailangang mabura ang "<b>"USB storage"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Para i-clear ang musika, mga larawan at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Burahin ang storage na USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Burahin ang SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Burahin ang lahat ng data sa panloob na USB storage, gaya ng musika o mga larawan"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Burahin ang lahat ng data sa SD card, gaya ng musika o mga larawan"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Burahin ang lahat ng data"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Burahin ang lahat ng data"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Made-delete ang lahat ng iyong personal na impormasyon at na-download na app. Hindi mo maa-undo ang pagkilos na ito."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Made-delete ang lahat ng iyong personal na impormasyon, kasama ang mga na-download na app at SIM. Hindi mo maa-undo ang pagkilos na ito."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Burahin lahat"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Walang isinagawang pag-reset dahil hindi available ang serbisyong System Clear."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Burahin ang lahat ng data?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Hindi available ang factory reset para sa user na ito"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Binubura"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Mangyaring maghintay..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Burahin ang lahat ng data"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Burahin ang lahat ng data"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Made-delete ang lahat ng iyong personal na impormasyon at na-download na app. Hindi mo maa-undo ang pagkilos na ito."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Made-delete ang lahat ng iyong personal na impormasyon, kasama ang mga na-download na app at SIM. Hindi mo maa-undo ang pagkilos na ito."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Burahin ang lahat ng data?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Hindi available ang factory reset para sa user na ito"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Binubura"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Pakihintay…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Mga setting ng tawag"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"I-set up ang voicemail, pagpasa ng tawag, call waiting, caller ID"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Pag-tether sa USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Hindi ma-tether sa higit sa <xliff:g id="MAXCONNECTION">%1$d</xliff:g> (na) device."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Maa-untether ang <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Pag-tether ng Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Ibahagi ang koneksyon sa internet ng telepono gamit ang USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Ibahagi ang koneksyon sa internet ng telepono gamit ang Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Gamitin ang hotspot at pag-tether upang makapagbigay ng internet sa iba pang device sa pamamagitan ng iyong koneksyon ng mobile data. Maaari ding gumawa ang mga app ng hotspot upang magbahagi ng content sa mga kalapit na device."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Gamitin ang hotspot at pag-tether para magbigay ng internet sa iba pang device sa pamamagitan ng iyong koneksyon sa Wi‑Fi o mobile data. Puwede ring gumawa ng hotspot ang mga app para magbahagi ng content sa mga kalapit na device."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Tulong"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Pag-scan ng Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Payagan ang mga app at serbisyo na mag-scan ng mga kalapit na device anumang oras, kahit na naka-off ang Bluetooth. Magagamit ito, halimbawa, para pahusayin ang mga feature at serbisyong batay sa lokasyon."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Mga serbisyo ng lokasyon para sa trabaho"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Pag-detect ng time zone gamit ang lokasyon"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Pag-detect ng time zone gamit ang lokasyon"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Nagbibigay-daan sa paggamit ng lokasyon ng device para sa pag-detect ng kasalukuyang time zone. Puwedeng makaapekto ang iba pang setting ng lokasyon gaya ng pag-scan ng Wi‑Fi sa katumpakan ng pag-detect ng time zone."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Naka-on"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Naka-off"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Naka-disable ang awtomatikong pag-detect ng time zone"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Naka-disable ang pag-detect ng time zone gamit ang lokasyon"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Hindi sinusuportahan ang pag-detect ng time zone gamit ang lokasyon"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Hindi pinapayagan ang mga pagbabago sa pag-detect ng time zone gamit ang lokasyon"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Lokasyon ng Wi-Fi, mobile network"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Ipagamit sa apps ang serbisyo ng lok. ng Google para mabilis na itantya ang iyong lok.  Kokolektahin at ipapadala sa Google ang mga di alam na data ng lok."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Natukoy ng Wi-Fi ang lokasyon"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Para sa face unlock, mag-set ng password"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Para sa face unlock, mag-set ng pattern"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Para sa face unlock, mag-set ng PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Para sa biometrics, magtakda ng password"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Para sa biometrics, magtakda ng pattern"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Para sa biometrics, magtakda ng PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Nakalimutan ang iyong password?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Nakalimutan ang iyong pattern?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Nakalimutan ang iyong PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Mga kagustuhan sa caption"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Pag-magnify"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Bahaging ima-magnify"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"I-enable ang pag-magnify"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Piliin ang (mga) bahaging ima-magnify na gusto mong gamitin kapag mina-magnify ang screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Full screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Bahagi ng screen"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Full screen at bahagi ng screen"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"I-magnify ang buong screen"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"I-magnify ang bahagi ng screen"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Lumipat sa button ng pagiging accessible?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Kapag gumamit ng triple tap para i-magnify ang isang bahagi ng screen, maaantala ang pag-type at iba pang pagkilos.\n\nGusto mo bang lumipat sa paggamit ng button ng pagiging accessible para mag-magnify?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Lumipat sa button ng pagiging accessible"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Gamitin pa rin ang triple tap para mag-magnify"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Mga setting ng pag-magnify"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Mag-magnify gamit ang triple-tap"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Mag-magnify gamit ang shortcut"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Tatapusin ng power button ang tawag"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Malaking pointer ng mouse"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Alisin ang mga animation"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Pagsamahin ang mga channel kapag nagpapatugtog"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Balanse ng audio"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Kaliwa"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Kanan"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Pagsamahin ang mga channel kapag nagpapatugtog"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Balanse ng audio"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kaliwa"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Kanan"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Default"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 segundo"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 segundo"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Pag-vibrate kapag may notification"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Pag-vibrate kapag nag-ring"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Feedback sa pagpindot"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Gamitin ang <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Buksan ang <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Gumamit ng pagtatama ng kulay"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Ipakita ang mga caption"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Para sa sinusuportahang app lang"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Gamitin ang <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Buksan ang <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Gumamit ng pagtatama ng kulay"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Ipakita ang mga caption"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Para sa sinusuportahang app lang"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Laki at istilo ng caption"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> (na) sukat ng text"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Higit pang opsyon"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Pula-berde"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Pula-berde"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Asul-dilaw"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Paghihigpit sa background"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Pahintulutan ang app na tumakbo sa background"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Hindi pinapahintulutan ang app na tumakbo sa background"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Hindi maaaring paghigpitan ang paggamit sa background"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Hindi puwedeng paghigpitan ang paggamit sa background"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Limitahan ang aktibidad sa background?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Kung lilimitahan mo ang aktibidad sa background ng app, maaari itong gumana nang hindi tama"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Hindi nakatakda ang app na mag-optimize ng baterya kaya hindi ito malilimitahan.\n\nPara malimitahan, i-on ang battery optimization."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Nagamit ang tablet nang higit sa karaniwan"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Nagamit ang device nang higit sa karaniwan"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Baka mas maagang maubos ang baterya kaysa sa karaniwan"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Ino-optimize para sa tagal ng baterya"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Pansamantalang limitado ang baterya. Mag-tap para matuto pa."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Nagamit ang iyong telepono nang mas madalas kaysa sa karaniwan. Puwedeng maubos ang iyong baterya nang mas mabilis kaysa sa inaasahan.\n\nMga nangungunang app ayon sa paggamit ng baterya:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Nagamit ang iyong tablet nang mas madalas kaysa sa karaniwan. Puwedeng maubos ang iyong baterya nang mas mabilis kaysa sa inaasahan.\n\nMga nangungunang app ayon sa paggamit ng baterya:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Nagamit ang iyong device nang mas madalas kaysa sa karaniwan. Puwedeng maubos ang iyong baterya nang mas mabilis kaysa sa inaasahan.\n\nMga nangungunang app ayon sa paggamit ng baterya:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="other">%1$d na pinaghihigpitang app</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Nagkaproblema sa pagbabasa ng iyong battery meter"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Nagkaproblema sa pagbabasa ng iyong battery meter. Mag-tap para "<annotation id="url">"matuto pa"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Ihinto ang app?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Hindi magawa ng iyong teleponong pamahalaan nang normal ang baterya dahil pinapanatiling bukas ng <xliff:g id="APP">%1$s</xliff:g> ang telepono mo.\n\nUpang subukang ayusin ang isyung ito, maaari mong ihinto ang app.\n\nKung patuloy na mangyayari ito, maaaring kailanganin mong i-uninstall ang app upang mapahusay ang performance ng baterya."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Hindi magawa ng iyong tablet na pamahalaan nang normal ang baterya dahil pinapanatiling bukas ng <xliff:g id="APP">%1$s</xliff:g> ang tablet mo.\n\nUpang subukang ayusin ang isyung ito, maaari mong ihinto ang app.\n\nKung patuloy na mangyayari ito, maaaring kailanganin mong i-uninstall ang app upang mapahusay ang performance ng baterya."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Magtakda ng iskedyul"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Patagalin ang baterya"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"I-off kapag naka-charge"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Mao-off ang Pantipid ng Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong telepono"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Mao-off ang Pantipid ng Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong tablet"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Mao-off ang Pantipid ng Baterya kapag nasa <xliff:g id="PERCENT">%1$s</xliff:g> na ang iyong device"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Mag-o-off ang Pantipid ng Baterya kapag lampas <xliff:g id="PERCENT">%1$s</xliff:g> na ang charge ng iyong telepono"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Mag-o-off ang Pantipid ng Baterya kapag lampas <xliff:g id="PERCENT">%1$s</xliff:g> na ang charge ng iyong tablet"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Mag-o-off ang Pantipid ng Baterya kapag lampas <xliff:g id="PERCENT">%1$s</xliff:g> na ang charge ng iyong device"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"I-on"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"I-reset"</string>
     <string name="tts_play" msgid="2945513377250757221">"I-play"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptive na pagkakonekta"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Pinapatagal ang baterya at pinapahusay ang performance ng device sa pamamagitan ng awtomatikong pamamahala sa iyong mga koneksyon ng network"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Storage ng kredensyal"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Mag-install ng certificate"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Mag-install ng mga certificate mula sa storage"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Mga kredensyal ng user"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Tingnan at baguhin ang mga naka-store na kredensyal"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Advanced"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Uri ng storage"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Hardware-backed"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Software lang"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Hindi available ang mga kredensyal para sa user na ito"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Na-install para sa VPN at mga app"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Na-install para sa Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Huwag i-install"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"I-install pa rin"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Hindi na-install ang certificate"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Payagan ang <xliff:g id="APP_NAME">%s</xliff:g> na mag-install ng mga certificate sa device na ito?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Tutukuyin ka ng mga certificate na ito sa mga app at URL sa ibaba"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Huwag payagan"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Payagan"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Magpakita pa"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"App ng certificate management"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Wala"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Makikilala ka ng mga app at URL na nasa ibaba dahil sa mga certificate na ii-install ng app na ito"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Alisin"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Signal sa pang-emergency na pag-dial"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Itakda ang pag-uugali kapag naganap ang isang pang-emergency na tawag"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Pag-back Up"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Hindi naka-set up - Profile sa trabaho"</string>
     <string name="user_admin" msgid="4024553191395768119">"Admin"</string>
     <string name="user_you" msgid="3070562015202859996">"Ikaw (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Palayaw"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Maaari kang magdagdag ng hanggang <xliff:g id="USER_COUNT">%1$d</xliff:g> (na) user"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Ang may-ari lang ng tablet ang maaaring mamahala ng mga user."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Ang may-ari lang ng telepono ang maaaring mamahala ng mga user."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Pagbabayad sa terminal"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Mag-set up ng app sa pagbabayad. Pagkatapos ay idikit ang iyong telepono sa anumang terminal na may simbolong walang pakikipag-ugnayan."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Nakuha ko"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Higit pa..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Higit pa…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Itakda ang default na app sa pagbabayad"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"I-update ang default na app sa pagbabayad"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Sa contactless terminal, magbayad gamit ang <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Bumalik"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Susunod"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Tapusin"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Kumuha ng larawan"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Pumili ng larawan"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Pumili ng larawan"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Mga SIM card"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Mga SIM card"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Palaging gamitin ito para sa mga tawag"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Pumili ng SIM para sa data"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Pumili ng SIM para sa SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Lumilipat ng data SIM, maaari itong magtagal nang hanggang isang minuto..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Lumilipat ng data SIM, puwede itong magtagal nang hanggang isang minuto…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Tumawag gamit ang"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Pumili ng SIM card"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"routine, iskedyul, pantipid ng baterya, pangtipid ng power, baterya, awtomatiko, porsyento"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, advanced na pagtawag, pagtawag gamit ang 4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"idagdag ang wika, magdagdag ng wika"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"laki ng text"</string>
     <string name="default_sound" msgid="6604374495015245195">"Default na tunog"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Nasa <xliff:g id="PERCENTAGE">%1$s</xliff:g> ang volume ng pag-ring at notification"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Volume, pag-vibrate, Huwag Istorbohin"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"I-on ang mga tunog"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Instant Caption"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"I-autocaption ang media"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Wala"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Naitakda ang <xliff:g id="ON_COUNT">%d</xliff:g> iskedyul</item>
-      <item quantity="other">Naitakda ang <xliff:g id="ON_COUNT">%d</xliff:g> na iskedyul</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Wala}=1{Naitakda ang 1 iskedyul}one{Naitakda ang # iskedyul}other{Naitakda ang # na iskedyul}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Huwag Istorbohin"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Makakuha lang ng notification mula sa mahahalagang tao at app"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Limitahan ang mga pagkaantala"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Priyoridad lang"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Naka-on / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Naka-off / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Naka-off"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Naka-on"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Itanong palagi"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Hanggang sa i-off mo"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> oras</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> na oras</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> (na) minuto"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> (na) iskedyul ang maaaring awtomatikong mag-on</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> (na) iskedyul ang maaaring awtomatikong mag-on</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 oras}one{# oras}other{# na oras}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 minuto}one{# minuto}other{# na minuto}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Naka-off}=1{Naka-off / 1 iskedyul ang puwedeng awtomatikong mag-on}one{Naka-off / # iskedyul ang puwedeng awtomatikong mag-on}other{Naka-off / # na iskedyul ang puwedeng awtomatikong mag-on}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Ang puwedeng makaabala sa Huwag Istorbohin"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Mga Tao"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Mga App"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Awtomatikong itakda sa Malumanay ang mga notification na may mababang priyoridad"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Pag-rank ng adaptive na notification"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Awtomatikong i-rank ang mga notification ayon sa kaugnayan nito"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Feedback sa adaptive na notification"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Isaad ang mga pagsasaayos na ginawa sa mga notification at ipakita ang opsyon para makapagbigay ng feedback sa system"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"I-reset ang kahalagahan ng notification"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"I-reset ang mga setting sa kahalagahan na binago ng user at payagang magbigay ng priyoridad ang assistant ng notification"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Mga iminumungkahing pagkilos at tugon"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Awtomatikong ipakita ang mga iminumungkahing pagkilos at tugon"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Ipakita ang mga kamakailan at na-snooze na notification"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Mga priyoridad na pag-uusap"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Ipakita sa itaas ng seksyon ng pag-uusap at lalabas bilang mga nakalutang na bubble"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Ipakita sa itaas ng seksyon ng pag-uusap"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Iba pang pag-uusap"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Mga hindi priyoridad na pag-uusap"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Mga pag-uusap na ginawan mo ng mga pagbabago"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Mga kamakailang pag-uusap"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"I-clear ang recents"</string>
+    <string name="clear" msgid="5092178335409471100">"I-clear"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Mga bubble ng mga priyoridad na pag-uusap"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Lalabas ang mga priyoridad na pag-uusap sa itaas ng pull-down shade. Puwede mo ring itakda ang mga ito na maging bubble at gambalain ang Huwag Istorbohin."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Lalabas dito ang mga priyoridad at binagong pag-uusap"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Access na Huwag Istorbohin"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Payagan ang Huwag Istorbohin"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Walang mga naka-install na app ang humiling ng access na Huwag Istorbohin"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Naglo-load ng mga app..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Naglo-load ng mga app…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Bilang tugon sa iyong kahilingan, pinipigilan ng Android na lumabas sa device na ito ang mga notification ng app na ito"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Bilang tugon sa iyong kahilingan, pinipigilan ng Android na lumabas sa device na ito ang ganitong kategorya ng mga notification"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Bilang tugon sa iyong kahilingan, pinipigilan ng Android na lumabas sa device na ito ang ganitong grupo ng mga notification"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Lahat ng pag-uusap"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Mga priyoridad na pag-uusap"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Wala"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> pag-uusap</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> na pag-uusap</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Wala"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Wala}=1{1 pag-uusap}one{# pag-uusap}other{# na pag-uusap}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Sino ang puwedeng umabala"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Mga Tawag"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Mga Tawag"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Para matiyak na tumunog ang mga pinapayagang tawag, tiyaking nakatakda ang device na mag-ring"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Para sa ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>,’ naka-block ang mga papasok na tawag. Maaari mong isaayos ang mga setting para mabigyang-daan ang iyong mga kaibigan, kapamilya, o iba pang contact na makaugnayan ka."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Mga naka-star na contact"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> iba pa</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> na iba pa</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Wala"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Wala}=1{{contact_1}}=2{{contact_1} at {contact_2}}=3{{contact_1}, {contact_2}, at {contact_3}}one{{contact_1}, {contact_2}, at # pa}other{{contact_1}, {contact_2}, at # pa}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Walang pangalan)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Mga Mensahe"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mga mensahe"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Messages"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Para sa ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>,’ naka-block ang mga papasok na mensahe. Puwede mong isaayos ang mga setting para payagan ang iyong mga kaibigan, kapamilya, o iba pang contact na makipag-ugnayan sa iyo."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Makakapasok ang lahat ng mensahe"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Makakapasok ang lahat ng tawag"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Wala"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> contact</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> na contact</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Wala}=1{1 contact}one{# contact}other{# na contact}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Sinuman"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Mga Contact"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Mga naka-star na contact"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Lahat ng notification"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Ilang notification"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Magagawa pa rin ng mga napiling tao na makipag-ugnayan sa iyo, kahit na hindi mo pinapayagan ang mga app na umabala"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Puwedeng makaabala ang <xliff:g id="APP_NAMES">%s</xliff:g></item>
-      <item quantity="other">Puwedeng makaabala ang <xliff:g id="APP_NAMES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> pa"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Walang app ang puwedeng makaabala}=1{Puwedeng makaabala ang {app_1}}=2{Puwedeng makaabala ang {app_1} at {app_2}}=3{Puwedeng makaabala ang {app_1}, {app_2}, at {app_3}}one{Puwedeng makaabala ang {app_1}, {app_2}, at # pa}other{Puwedeng makaabala ang {app_1}, {app_2}, at # pa}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Mga App"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Lahat ng notification"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Ilang notification"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Mga notification na puwedeng umabala"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Payagan ang lahat ng notification"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Puwedeng makaabala ang <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-      <item quantity="other">Puwedeng makaabala ang <xliff:g id="SOUND_CATEGORIES">%s</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Walang puwedeng makaabala"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> pa"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Walang puwedeng makaabala}=1{Puwedeng makaabala ang {sound_category_1}}=2{Puwedeng makaabala ang {sound_category_1} at {sound_category_2}}=3{Puwedeng makaabala ang {sound_category_1}, {sound_category_2}, at {sound_category_3}}one{Puwedeng makaabala ang {sound_category_1}, {sound_category_2}, at # pa}other{Puwedeng makaabala ang {sound_category_1}, {sound_category_2}, at # pa}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Walang puwedeng makaabala"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Walang taong puwedeng makaabala"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Puwedeng makaabala ang ilang tao"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Puwedeng makaabala ang lahat ng tao"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Naka-on"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Naka-off"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Pag-pin ng app"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Sa pamamagitan ng pag-pin ng app, puwede mong panatilihing nakikita ang kasalukuyang app hanggang sa i-unpin mo ito. Puwedeng gamitin ang feature na ito, halimbawa, para bigyang-daan ang isang pinagkakatiwalaang kaibigan na gumamit ng isang partikular na laro. \n\nKapag naka-pin ang isang app, puwedeng magbukas ng ibang app ang naka-pin na app at puwedeng ma-access ang personal na data. \n\nPara gamitin ang pag-pin ng app: 	\n1.	I-on ang pag-pin ng app 	\n2.	Buksan ang Pangkalahatang-ideya 	\n3.	I-tap ang icon ng app sa itaas ng screen, pagkatapos ay i-tap ang I-pin"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Sa pamamagitan ng pag-pin ng app, patuloy mong makikita ang kasalukuyang app hangga\'t hindi mo ito ina-unpin. Puwedeng gamitin ang feature na ito, halimbawa, para bigyang-daan ang isang pinagkakatiwalaang kaibigan na gumamit ng isang partikular na laro. \n\nKapag naka-pin ang isang app, puwedeng magbukas ng iba pang app ang naka-pin na app at puwedeng ma-access ang personal na data. \n\nKung gusto mong secure na ipagamit ang iyong device sa ibang tao, subukang gumamit na lang ng profile ng bisita. \n\nPara gamitin ang pag-pin ng app: 	\n1.	I-on ang pag-pin ng app 	\n2.	Buksan ang Pangkalahatang-ideya 	\n3.	I-tap ang icon ng app sa itaas ng screen, pagkatapos ay i-tap ang I-pin"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Sa pamamagitan ng pag-pin ng app, puwede mong panatilihing nakikita ang kasalukuyang app hanggang sa i-unpin mo ito. Puwedeng gamitin ang feature na ito, halimbawa, para mapalaro sa pinagkakatiwalaang kaibigan ang isang partikular na laro."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Kapag naka-pin ang isang app, puwedeng magbukas ng iba pang app ang naka-pin na app at puwedeng ma-access ang personal na data. \n\nPara gamitin ang pag-pin ng app: 	\n1.	I-on ang pag-pin ng app 	\n2.	Buksan ang Pangkalahatang-ideya 	\n3.	I-tap ang icon ng app sa itaas ng screen, pagkatapos ay i-tap ang I-pin"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Kapag naka-pin ang isang app, puwedeng magbukas ng iba pang app ang naka-pin na app at puwedeng ma-access ang personal na data. \n\nKung gusto mong secure na ipagamit ang iyong device sa ibang tao, subukang gumamit na lang ng profile ng bisita. \n\nPara gamitin ang pag-pin ng app: 	\n1.	I-on ang pag-pin ng app 	\n2.	Buksan ang Pangkalahatang-ideya 	\n3.	I-tap ang icon ng app sa itaas ng screen, pagkatapos ay i-tap ang I-pin"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Kapag naka-pin ang isang app: \n\n•		Puwedeng ma-access ang personal data \n		(gaya ng mga contact at content ng email) \n•	 Puwedeng magbukas ng ibang app ang naka-pin na app \n\nGamitin lang ang pag-pin ng app sa mga taong pinagkakatiwalaan mo."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Humingi ng pattern sa pag-unlock bago mag-unpin"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Humingi ng PIN bago mag-unpin"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Bukod pa sa paggamit ng iyong mukha sa pag-unlock ng device mo, maaari mong paigtingin ang proteksyon sa device na ito sa pamamagitan ng paghingi ng iyong PIN bago ito magbukas. Hangga\'t hindi nagbubukas ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito sa pagprotekta ng data sa mga nawawala o nanakaw na device. Humingi ng PIN para buksan ang iyong device?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Bukod pa sa paggamit ng iyong mukha sa pag-unlock ng device mo, maaari mong paigtingin ang proteksyon sa device na ito sa pamamagitan ng paghingi ng iyong pattern bago ito magbukas. Hangga\'t hindi nagbubukas ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito sa pagprotekta ng data sa mga nawawala o nanakaw na device. Humingi ng pattern para buksan ang iyong device?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Bukod pa sa paggamit ng iyong mukha sa pag-unlock ng device mo, maaari mong paigtingin ang proteksyon sa device na ito sa pamamagitan ng paghingi ng iyong password bago ito magbukas. Hangga\'t hindi nagbubukas ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito sa pagprotekta ng data sa mga nawawala o nanakaw na device. Humingi ng password para buksan ang iyong device?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Bukod pa sa paggamit sa iyong biometrics para i-unlock ang iyong device, puwede mo pang maprotektahan ang device na ito sa pamamagitan ng paghingi ng PIN bago ito mag-start up Hanggang sa mag-start up ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kasama na ang mga alarm.\n\nMakakatulong ito sa pagprotekta sa data na nasa mga nawala o nanakaw na device. Hingin ang pattern para buksan ang iyong device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Bukod pa sa paggamit sa iyong biometrics para i-unlock ang iyong device, puwede mo pang maprotektahan ang device na ito sa pamamagitan ng paghingi ng pattern bago ito mag-start up Hanggang sa mag-start up ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kasama na ang mga alarm.\n\nMakakatulong ito sa pagprotekta sa data na nasa mga nawala o nanakaw na device. Hingin ang pattern para buksan ang iyong device?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Bukod pa sa paggamit sa iyong biometrics para i-unlock ang iyong device, puwede mo pang maprotektahan ang device na ito sa pamamagitan ng paghingi ng password bago ito mag-start up Hanggang sa mag-start up ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kasama na ang mga alarm.\n\nMakakatulong ito sa pagprotekta sa data na nasa mga nawala o nanakaw na device. Hingin ang password para buksan ang iyong device?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Oo"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Huwag"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Pinaghihigpitan"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Kinokontrol ang USB ng"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Nakakonektang device"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Ang device na ito"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Lumilipat..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Lumilipat…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Hindi mailipat"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Pag-charge sa device na ito"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Pag-charge ng nakakonektang device"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Paggamit ng mobile data"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Paggamit ng data ng app"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Paggamit ng Wi‑Fi data"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Paggamit ng data na hindi sa carrier network"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Paggamit ng ethernet data"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> na paghihigpit</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Maaaring iba ang accounting ng data ng carrier kumpara sa accounting ng device"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Hindi kasama ang data na ginagamit ng mga carrier network"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> ang nagamit"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Magtakda ng babala sa data"</string>
     <string name="data_warning" msgid="2925054658166062884">"Babala sa paggamit ng data"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Tingnan ang mga detalye"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Data Saver"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Hindi pinaghihigpitang data"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Naka-off ang data ng background"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Naka-off ang data sa background"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Naka-on"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Naka-off"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Gumamit ng Data Saver"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Kung naka-lock ang device, iwasang mag-type ng mga tugon o iba pang text sa mga notification"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Default na spell checker"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Pumili ng spell checker"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Gamitin ang spell checker"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Gamitin ang spell checker"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Hindi napili"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(wala)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Upang tumulong na magbakante ng space sa storage, inaalis ng storage manager ang mga naka-back up na larawan at video mula sa iyong device."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Alisin ang mga larawan at video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Storage manager"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Gumamit ng Storage manager"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Gumamit ng Storage manager"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Awtomatiko"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manual"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Magbakante ng espasyo ngayon"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Mag-double tap para tingnan ang telepono"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Mag-double tap upang suriin ang tablet"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Mag-double tap upang suriin ang device"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Mag-swipe para sa notif"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Mag-swipe sa pinakababa ng screen para ipakita ang iyong mga notification"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"One-Handed mode"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Gumamit ng one-handed mode"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Lumabas kapag nagpapalit ng mga app"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Timeout"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 na segundo"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 segundo"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 segundo"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"reachability"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Para tingnan ang oras, mga notification, at iba pang impormasyon, i-double tap ang iyong screen."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Kunin para tingnan ang telepono"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Kunin upang suriin ang tablet"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"I-tap para suriin ang tablet"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"I-tap para suriin ang device"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Para tingnan ang oras, mga notification, at iba pang impormasyon, i-tap ang iyong screen."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Pang-emergency na SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Gumamit ng pang-emergency na SOS"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Pinapamahalaan ng <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Simulan ang mga pagkilos sa ibaba sa pamamagitan ng mabilis na pagpindot sa power button nang 5 beses o higit pa"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"I-play ang countdown alarm"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Mag-play ng malakas na tunog bago mag-abiso para sa tulong"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Tawagan para sa tulong"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Numerong tatawagan para sa tulong"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. I-tap para baguhin"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Kung maglalagay ka ng hindi pang-emergency na numero:\n • Dapat ay naka-unlock ang iyong device para magamit ang pang-emergency na SOS\n • Posibleng hindi masagot ang tawag mo"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"I-swipe ang fingerprint para sa mga notification"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"I-swipe ang fingerprint"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Para makita ang iyong mga notification, mag-swipe pababa sa sensor para sa fingerprint sa likod ng telepono mo."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Max ng mga nakikitang dataset"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"I-reset sa mga default na value"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Na-reset ang mga autofill na opsyon ng developer"</string>
+    <string name="location_category" msgid="3496759112306219062">"Lokasyon"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Indicator ng lokasyon sa status bar"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Ipakita para sa lahat ng lokasyon, kasama na ang network at pagkakonekta"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Ipatupad ang kumpletong sukat ng GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Sinusubaybayan ang lahat ng constellation at dalas ng GNSS nang walang duty cycling"</string>
     <string name="device_theme" msgid="5027604586494772471">"Tema ng device"</string>
     <string name="default_theme" msgid="4815428567082263639">"Default"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Pangalan ng network"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"I-pause ang mga notification para manatiling nakatuon ang pansin"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Hindi available ang feature"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Na-off ang feature na ito dahil pinapabagal nito ang iyong telepono"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Ipatupad ang kumpletong sukat ng GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Sinusubaybayan ang lahat ng constellation at dalas ng GNSS nang walang duty cycling"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Palaging ipakita ang dialog ng pag-crash"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Magpakita ng dialog sa tuwing magka-crash ang isang app"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Pumili ng app na may naka-enable na ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"I-enable para sa lahat ng app"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Pumili ng Graphics Driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Default"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Developer Driver"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Graphics Driver ng System"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Naka-on (naka-mute)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Naka-off"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Mga detalye ng network"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Nakikita ang pangalan ng iyong device sa mga app sa iyong telepono. Maaari rin itong makita ng ibang tao kapag kumonekta ka sa mga Bluetooth device o nag-set up ka ng Wi-Fi hotspot."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Nakikita ng mga app sa iyong telepono ang pangalan ng device mo. Puwede rin itong makita ng ibang tao kapag ikaw ay kumonekta sa mga Bluetooth device, kumonekta sa Wi-Fi network, o nag-set up ng Wi-Fi hotspot."</string>
     <string name="devices_title" msgid="649715719278562515">"Mga Device"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Lahat ng Setting"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Mga Mungkahi"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Hindi makahanap ng mga network. Subukang muli."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ipinagbabawal)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Walang SIM card"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Walang SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Wala"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Kailangan ng SIM para makakonekta"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Kailangan ng SIM ng <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> para makakonekta"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Mas gustong network mode: WCDMA ang mas gusto"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Mas gustong network mode: GSM lang"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Mas gustong network mode: WCDMA lang"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobile data"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"I-access ang data gamit ang mobile network"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Awtomatikong lilipat sa carrier na ito ang telepono kapag may signal ito"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Walang available na SIM card"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Kagustuhan sa mga tawag"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Kagustuhan sa SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Itanong palagi"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Hindi available kapag nakakonekta sa <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Tumingin pa"</string>
     <string name="see_less" msgid="2642392725363552793">"Tumingin nang kaunti"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"I-on ang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"I-on ang SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Lumipat sa <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Lumipat sa paggamit ng SIM card?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Isang SIM lang ang puwedeng maging aktibo sa isang pagkakataon.\n\nHindi makakansela ang iyong serbisyo mula sa <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> kung lilipat ka sa <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Isang na-download na SIM lang ang puwedeng maging aktibo sa isang pagkakataon.\n\nHindi makakansela ang iyong serbisyo mula sa <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> kung lilipat ka sa <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Isang SIM lang ang puwedeng maging aktibo sa isang pagkakataon.\n\nHindi makakansela ang iyong serbisyo mula sa <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> kung lilipat ka."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Lumipat sa <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Kumokonekta sa network…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Lumilipat sa <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Hindi makalipat ng carrier"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Hindi makalipat ng carrier dahil nagkaroon ng error."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"I-off ang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"I-off ang SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Ino-off ang SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Hindi ma-disable ang carrier"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Nagkaproblema at hindi ma-disable ang iyong carrier."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Gumamit ng 2 SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Puwedeng magkaroon ang device na ito ng 2 aktibong SIM nang sabay. Para patuloy na gumamit ng 1 SIM sa isang pagkakataon, i-tap ang \"Hindi, salamat na lang.\""</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"I-restart ang device?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Para magsimula, i-restart ang iyong device. Pagkatapos, puwede kang magdagdag ng isa pang SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Magpatuloy"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"I-restart"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Huwag na lang"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Lumipat"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Hindi ma-activate ang SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Alisin ang SIM at ilagay ito ulit. Kung magpapatuloy ang problema, i-restart ang iyong device."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Subukang i-on ulit ang SIM. Kung magpapatuloy ang problema, i-restart ang iyong device."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Pag-activate ng network"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"Aktibo ang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"I-tap para i-update ang mga setting ng SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM card"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Burahin ang na-download na SIM na ito?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Kapag binura ang SIM na ito, maaalis ang serbisyo ng <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> sa device na ito.\n\nHindi makakansela ang serbisyo para sa <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Burahin"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Binubura ang SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Hindi mabura ang SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Hindi mabura ang SIM na ito dahil sa isang error.\n\nI-restart ang iyong device at subukan ulit."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Kumonekta sa device"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Gustong gumamit ng <xliff:g id="APPNAME">%1$s</xliff:g> app ng pansamantalang Wi‑Fi network para kumonekta sa iyong device"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Walang nahanap na device. Tiyaking naka-on ang mga device at available para kumonekta."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Mga emergency na tawag"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Hindi sinusuportahan ng iyong carrier ang mga emergency na tawag sa Pagtawag gamit ang Wi‑Fi.\nAwtomatikong lumilipat ang device sa isang cellular network para gumawa ng emergency na tawag.\nPosible lang ang mga emergency na tawag sa mga lugar na may cellular signal."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Gumamit ng Wi-Fi para sa mga tawag para mapahusay ang kalidad"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Cross SIM na pagtawag"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Payagan ang tawag at SMS ng ibang SIM bago ang SIM na ito."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"cross sim na pagtawag"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Papasok na MMS message"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Hindi maipadala ang MMS message"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"I-tap para payagan ang pagmemensahe ng MMS sa <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> kapag naka-off ang mobile data"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Payagan ang pag-overlay sa screen sa Mga Setting"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Payagang mag-overlay sa mga screen ng Mga Setting ang mga app na puwedeng lumabas sa ibabaw ng ibang app"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Itago ang player kapag tapos na ang session ng media"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Nagbibigay-daan sa iyo ang player na magtuloy ng session mula sa pinalawak na panel ng Mga Mabilisang Setting."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Media player sa Mga Mabilisang Setting"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Ipakita ang media player nang mas matagal para madaling ituloy ang pag-playback"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Itago ang player"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Ipakita ang player"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Walang available na player"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Mga pinapayagang app"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Mag-o-on ang Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Naka-on"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Naka-off"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Mga SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Mga network na ligtas gamitin sa eroplano"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Maghanap at kumonekta sa mga network na ligtas gamitin sa eroplano"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"eroplano, ligtas gamitin sa eroplano"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Mga Taawag at SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Pagtawag sa Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Tumawag at makatanggap ng mga tawag sa mga non-carrier network tulad ng Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Nagbibigay-daan sa iyo ang pagtawag gamit ang Wi-Fi na tumawag at makatanggap ng mga tawag sa mga non-carrier network gaya ng ilang Wi‑Fi network."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Mga Tawag"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"mas gusto"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"mas gusto ang mga tawag"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"mas gusto ang SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"hindi available"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Walang SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Mga Kagustuhan"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Kumonekta sa mga pampublikong network"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"koneksyon ng network, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Tingnan ang mga airplane-safe na network"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"I-off ang Airplane Mode"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Hindi available dahil naka-on ang bedtime mode"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Tapos na ang pag-reset sa kahalagahan ng notification."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Mga App"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Gustong i-access ng hindi pinagkakatiwalaang device ang iyong mga mensahe. I-tap para sa mga detalye."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Payagan ang access sa mga mensahe?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Gustong i-access ng hindi pinagkakatiwalaang Bluetooth device, ang [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ang iyong mensahe.\n\nHindi ka pa nakakakonekta dati sa [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Gustong i-access ng hindi pinagkakatiwalaang device ang iyong mga contact at log ng tawag. I-tap para sa mga detalye."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Payagan ang access sa mga contact at log ng tawag?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Gustong i-access ng hindi pinagkakatiwalaang Bluetooth device, ang [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ang iyong mga contact at log ng tawag. Kasama rito ang data tungkol sa mga papasok at papalabas na tawag.\n\nHindi ka pa nakakakonekta dati sa [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index e193a59..8ea8ebc 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Orta"</item>
     <item msgid="6740026006576843477">"Uzun"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kısa"</item>
+    <item msgid="7397961711906421599">"Orta uzunlukta"</item>
+    <item msgid="4079132024502041928">"Uzun"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Varsayılan"</item>
     <item msgid="4234707448428002595">"Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Genel"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Yalnızca TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Genel"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 161a2df..5eb6356 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Tarih ve saat"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Tarih ve saati ayarlayın"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Tarihi, saati, saat dilimini ve biçimleri ayarlayın"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Ağın sağladığı saati kullan"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Ağın sağladığı saat dilimini kullan"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Saati otomatik olarak ayarla"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Saat dilimini otomatik olarak ayarla"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Yerel ayar varsayılan değerini kullan"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 saat biçimi"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 saat biçimini kullan"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Kilit ekranında profil bilgisini göster"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Hesaplar"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Konum"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Konumu kullan"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Konumu kullan"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Kapalı"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Açık - <xliff:g id="COUNT_1">%1$d</xliff:g> uygulamanın konuma erişimi var</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekran kilidi, yüz tanıma kilidi"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekran kilidi, parmak izi"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekran kilidi"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Yüzünüz ve parmak izinizle telefonun kilidini güvenle açın"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Uygulamalarda oturum açarak da ödemeleri onaylayabilirsiniz"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Kilit açmayı şununla kur:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Yüz tanıma kilidi"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Telefonunuzun kilidini kolayca açın"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Parmak izi"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Telefonunuzun kilidini cebinizde açıp zaman kazanın"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Atla"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"İleri"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Yüz eklendi"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Yüz tanıma kilidini kurun"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Yüz tanıma kilidi"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Kimlik doğrulama için yüzünüzü kullanın"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Başla"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Erişilebilirlik yüz tanıma kilidi kapalıysa kurulum adımlarından bazıları TalkBack ile düzgün çalışmayabilir."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Geri dön"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Kuruluma devam et"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Erişilebilirlik kurulumunu kullan"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Uygulamalarda yüz tanıma kilidi kullanırken daima onay adımı gerektir."</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Yüz verilerini sil"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Yüz tanıma kilidini kur"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Cihazınızın kilidini açmak, uygulamalarda oturum açmak ve ödemeleri onaylamak için yüz tanıma kilidini kullanın.\n\nDikkat edilecek noktalar:\nTelefona baktığınızda, istemediğiniz zamanlarda da telefonunuzun kilidi açılabilir.\n\nTelefonunuz başka birisi tarafından yüzünüze tutulduğunda kilidi açılabilir.\n\nTelefonunuzun kilidi, ikiziniz gibi size çok benzeyen başka biri tarafından da açılabilir."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Cihazınızın kilidini açmak, uygulamalarda oturum açmak ve ödemeleri onaylamak için yüz tanıma kilidini kullanın.\n\nDikkat edilecek noktalar:\nTelefona bakarsanız, istemediğiniz zamanlarda da telefonunuzun kilidi açılabilir.\n\nGözleriniz kapalıyken bile yüzünüzün hizasına tutulduğunda, telefonunuzun kilidi başka biri tarafından açılabilir.\n\nTelefonunuzun kilidi, ikiziniz gibi size çok benzeyen başka biri tarafından da açılabilir."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Telefonunuzun kilidini açmak, oturumlarda oturum açmak ve ödemeleri onaylamak için yüz tanıma kilidini kullanın."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Dikkat edilecek noktalar:\nTelefona baktığınızda, istemediğiniz zamanlarda da telefonunuzun kilidi açılabilir.\n\nTelefonunuz başka birisi tarafından yüzünüze tutulduğunda kilidi açılabilir.\n\nTelefonunuzun kilidi, ikiziniz gibi size çok benzeyen başka biri tarafından da açılabilir."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Dikkat edilecek noktalar:\nTelefona baktığınızda, istemediğiniz zamanlarda da telefonunuzun kilidi açılabilir.\n\nGözleriniz kapalı olsa bile, telefonunuz başka birisi tarafından yüzünüze tutulduğunda, kilidi açılabilir.\n\nTelefonunuzun kilidi, ikiziniz gibi size çok benzeyen başka biri tarafından da açılabilir."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Yüz verileri silinsin mi?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Yüz tanıma kilidi tarafından kullanılan yüz verileri kalıcı ve güvenli bir şekilde silinecek. Kaldırma işleminden sonra, telefonunuzun kilidini açmak, uygulamalarda oturum açmak ve ödemeleri onaylamak için PIN, desen veya şifrenize ihtiyacınız olur."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Kilidi açmak için yüz tanıma kilidini kullanın"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Telefonunuzun kilidini açmak veya bir satın alma işlemini onaylamak için parmak izinizi kullanın.\n\nNot: Bu cihazın kilidini açmak için parmak izinizi kullanamazsınız. Daha fazla bilgi için kuruluşunuzun yöneticisine başvurun."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Telefonunuzun kilidini açmak veya bir satın alma işlemini onaylamak için parmak izinizi kullanın.\n\nNot: Parmak iziniz, güçlü bir desen veya PIN\'e oranla daha az güvenli olabilir."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"İptal"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Hayır, teşekkürler"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Devam"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Atla"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"İleri"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Tabletinizi ekran kilidi seçeneğiyle koruyarak kaybolması veya çalınması durumunda başkalarının kullanmasını engellersiniz. Yüz tanıma kilidini ayarlamak için ayrıca bir ekran kilidi seçeneğine ihtiyacınız var. Geri gitmek için İptal\'e dokunun."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Cihazınızı ekran kilidi seçeneğiyle koruyarak kaybolması veya çalınması durumunda başkalarının kullanmasını engellersiniz. Yüz tanıma kilidini ayarlamak için ayrıca bir ekran kilidi seçeneğine ihtiyacınız var. Geri gitmek için İptal\'e dokunun."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Telefonunuzu ekran kilidi seçeneğiyle koruyarak, kaybolması veya çalınması durumunda başkaları tarafından kullanılmasını engelleyebilirsiniz. Yüz tanıma kilidini ayarlamak için de bir ekran kilidi seçeneğine ihtiyacınız vardır. Geri gitmek için İptal\'e dokunun."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Tabletinizi ekran kilidi seçeneğiyle koruyarak kaybolması veya çalınması durumunda başkalarının kullanmasını engellersiniz. Biyometrik kilit açma sistemi kurmak için ayrıca ekran kilidi seçeneğine ihtiyacınız var. Geri gitmek için İptal\'e dokunun."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Cihazınızı ekran kilidi seçeneğiyle koruyarak kaybolması veya çalınması durumunda başkalarının kullanmasını engellersiniz. Biyometrik kilit açma sistemi kurmak için ayrıca ekran kilidi seçeneğine ihtiyacınız var. Geri gitmek için İptal\'e dokunun."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Telefonunuzu ekran kilidi seçeneğiyle koruyarak kaybolması veya çalınması durumunda başkalarının kullanmasını engellersiniz. Biyometrik kilit açma sistemi kurmak için ayrıca ekran kilidi seçeneğine ihtiyacınız var. Geri gitmek için İptal\'e dokunun."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN kurulumu atlansın mı?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Şifre kurulumu atlansın mı?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Desen kurulumu atlansın mı?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu tableti kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu cihazı kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Cihaz koruma özelliklerini etkinleştirerek, izniniz olmadan başkalarının bu telefonu kullanmasını engelleyin. Kullanmak istediğiniz ekran kilidini seçin."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Yedek ekran kilitleme yönteminizi seçin"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Yedek ekran kilitleme yönteminizi seçin"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Yedek ekran kilitleme yönteminizi seçin"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Ekran kilidi seçenekleri"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Ekran kilidi seçenekleri"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Ekran kilidi"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Yüz tanıma kilidi + Şifre"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Yüz tanıma kilidi olmadan devam et"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefonunuzun kilidini yüzünüzü kullanarak açabilirsiniz. Güvenlik amacıyla, bu seçenek için yedek bir ekran kilidi gerekir."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biyometri + Desen"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biyometri + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biyometri + Şifre"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Biyometrik kilit açma sistemi kurmadan devam edin"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefonunuzun kilidini biyometri kullanarak açabilirsiniz. Güvenlik amacıyla, bu seçenek için yedek bir ekran kilidi gerekir."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Yönetici, şifreleme politikası veya kimlik bilgileri deposu tarafından devre dışı bırakıldı"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Yok"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Hızlıca kaydırma"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> basamaktan az olmalıdır</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Cihaz yöneticisi yakın zamanda kullanılan bir PIN\'e izin vermiyor"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Yaygın olarak kullanılan PIN\'ler BT yöneticiniz tarafından engellendi. Farklı bir PIN deneyin."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Burada geçersiz bir karakter kullanılamaz"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"En az bir harf içermelidir"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"En az bir rakam içermelidir"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">En az 1 rakam olmayan karakter içermelidir</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Cihaz yöneticisi yakın zamanda kullanılan bir şifreye izin vermiyor"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Yaygın olarak kullanılan şifreler BT yöneticiniz tarafından engellendi. Farklı bir şifre deneyin."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Artan, azalan veya tekrar eden rakam dizisine izin verilmiyor"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Onayla"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"İptal"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Kablosuz"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Kablosuz\'u aç"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Kablosuz"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Kablosuz bağlantıyı kullan"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Kablosuz bağlantıyı kullan"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Kablosuz ayarları"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Kablosuz"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Kablosuz erişim noktalarını kur ve yönet"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"“<xliff:g id="SSID">%1$s</xliff:g>” ile bağlantı kurmak için aşağıdaki QR kodunu ortalayın."</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"QR kodu tarayarak kablosuz ağa katılın"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Kablosuz ağı paylaşın"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"\"<xliff:g id="SSID">%1$s</xliff:g>\" ağına bağlanmak ve şifreyi paylaşmak için bu QR kodunu tarayın"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” ağına katılmak için bu QR kodunu başka bir cihazla tarayın"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"\"<xliff:g id="SSID">%1$s</xliff:g>\" ağına bağlanmak için bu QR kodunu tarayın"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Tekrar deneyin. Sorun devam ederse cihaz üreticisiyle iletişime geçin"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Bir hata oluştu"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Kablosuz ağ şifresi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot şifresi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Otomatik bağlan"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Bu ağın yakınındayken telefonun otomatik olarak bağlanmasına izin verin"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Bu ağın yakınındayken tabletin otomatik olarak bağlanmasına izin verin"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Kapsama alanındayken bu ağa bağlanmaya izin verin"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Cihaz ekle"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Bu ağa cihaz eklemek için QR kodu kullanın"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR kodu geçerli bir biçim değil"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Sistem sertifikalarını kullan"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Sağlama"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Doğrulama yapma"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Sertifika belirtilmedi. Bağlantınız gizli olmayacak."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Ağ adı çok uzun."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Alan adı belirtilmelidir."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifika zorunlu."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Bağlan"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Kablosuz bağlantı açık"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağına bağlandı"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> cihazına bağlanıyor"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Bağlanıyor…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Ağa bağlanılamadı"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Ağ, kapsama alanında değil"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Cihaz MAC adresi"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Rastgele MAC adresi"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Rastgele hale getirilmiş MAC adresi (son kullanılan)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP adresi"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Ağ ayrıntıları"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Alt ağ maskesi"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 adresleri"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Kayıtlı ağlar"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Abonelikler"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Diğer ağlar"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP ayarları"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Bu kullanıcı, gelişmiş Kablosuz ayarlarını kullanamaz"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Kaydet"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Geçerli bir ağ geçidi adresi yazın."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Geçerli bir DNS adresi yazın."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 ile 32 arasında bir ağ önek uzunluğu yazın."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (Gizli DNS tarafından geçersiz kılınmadığı sürece)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (Gizli DNS tarafından geçersiz kılınmadığı sürece)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Ağ geçidi"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Ağ önek uzunluğu"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Kablosuz Doğrudan Bağlantı"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Uygulama içerik paylaşıyor. İnternet bağlantısını paylaşmak için hotspot\'u kapatıp tekrar açın"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Şifre ayarlanmadı"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot adı"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> etkinleştiriliyor..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> açılıyor…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Diğer cihazlar şuna bağlanabilir: <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot şifresi"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Erişim Noktası Bandı"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Bazı içerikler için yenileme hızını otomatik olarak 60 Hz\'den 90 Hz\'e yükseltir. Pil kullanımını artırır."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"90 Hz yenileme hızına zorla"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Geliştirilmiş dokunma duyarlılığı ve animasyon kalitesi için en yüksek yenileme hızı. Pil kullanımını artırır."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ekrana dikkat verme"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Açık / Bakıyorsanız ekran kapanmaz"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Ekran karanlıkken yeni bildirimler için açılır"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Saati ve bilgiyi daima göster"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Daha fazla pil kullanımı"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Kalın Metin"</string>
     <string name="title_font_size" msgid="570613010306330622">"Yazı tipi boyutu"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Metni daha büyük veya daha küçük yapın"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM kart kilit ayarları"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android sürümü"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android güvenlik güncellemesi"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model ve donanım"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Donanım sürümü"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Cihaz Kimliği"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APN\'yi sil"</string>
     <string name="menu_new" msgid="6571230342655509006">"Yeni APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Kaydet"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Sil"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"İptal"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Ad alanı boş olamaz."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN boş olamaz."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Uygulamalar sıfırlanabilir"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Kablosuz, mobil, Bluetooth\'u sıfırla"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Bu sıfırlama işlemi, aşağıdakiler de dahil olmak üzere tüm ağ ayarlarınızı sıfırlayacaktır:\n\n"<li>"Kablosuz ağ"</li>\n<li>"Mobil veri"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Sil"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"İndirilen SIM\'leri sil"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Yedek SIM\'leri indirmek için operatörünüzle iletişime geçin. Bu işlem, mobil hizmet planlarını iptal etmeyecektir."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Bu işlem, mobil hizmet planlarını iptal etmeyecektir. Yedek SIM\'leri indirmek için operatörünüzle iletişime geçin."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Ayarları sıfırla"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Tüm ağ ayarları sıfırlansın mı? Bu işlemi geri alamazsınız."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Tüm ağ ayarları sıfırlansın ve indirilen SIM\'ler silinsin mi? Bu işlemi geri alamazsınız."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Ağ ayarları sıfırlandı"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM\'ler silinemiyor"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"İndirilen SIM\'ler bir hata nedeniyle silinemiyor.\n\nCihazınızı yeniden başlatın ve tekrar deneyin."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Tüm verileri sil (fabrika ayarlarına sıfırla)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Tüm verileri sil (sıfırla)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Bu işlem, tabletinizin "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Bu cihazda başka kullanıcılar da var.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM\'ler"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Bu işlem mobil hizmet planınızı iptal etmeyecektir."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"USB belleğin"</b>" silinmesi gerekir."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"SD kartın"</b>" silinmesi gerekir."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Tüm verileri sil (fabrika ayarlarına sıfırla)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Tüm verileri sil (fabrika ayarlarına sıfırla)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Bu işlem, tabletinizin "<b>"dahili depolama alanından"</b>"şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Bu işlem, telefonunuzun "<b>"dahili depolama alanından"</b>" şu verilerin tümünü siler:\n\n"<li>"Google hesabınız"</li>\n<li>"Sistem ve uygulama verileri ile ayarları"</li>\n<li>"İndirilen uygulamalar"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Şu anda aşağıdaki hesaplarda oturum açmış durumdasınız:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Bu cihazda başka kullanıcılar da var.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Müzik"</li>\n<li>"Fotoğraflar"</li>\n<li>"Diğer kullanıcı verileri"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM\'ler"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Bu işlem mobil hizmet planınızı iptal etmeyecektir."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"USB belleğin"</b>" silinmesi gerekir."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Müzik, resimler ve diğer kullanıcı verilerinin temizlenmesi için "<b>"SD kartın"</b>" silinmesi gerekir."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB belleği sil"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD kartı sil"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Dahili USB bellekteki müzik veya fotoğraf gibi tüm verileri sil"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD kartındaki müzik ve fotoğraf gibi tüm verileri sil"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Tüm verileri sil"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Tüm verileri sil"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Tüm kişisel bilgileriniz ve indirilen uygulamalar silinir. Bu işlemi geri alamazsınız."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"İndirilen uygulamalar ve SIM\'ler dahil olmak üzere tüm kişisel bilgileriniz silinecek. Bu işlemi geri alamazsınız."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Her şeyi sil"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Sistem Temizleme hizmeti kullanılamadığından sıfırlama yapılmadı."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Tüm veriler silinsin mi?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Bu kullanıcı için fabrika ayarlarına sıfırlama işlevi kullanılamıyor"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Siliniyor"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Lütfen bekleyin..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Tüm verileri sil"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Tüm verileri sil"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Tüm kişisel bilgileriniz ve indirilen uygulamalar silinir. Bu işlemi geri alamazsınız."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"İndirilen uygulamalar ve SIM\'ler dahil olmak üzere tüm kişisel bilgileriniz silinecek. Bu işlemi geri alamazsınız."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Tüm veriler silinsin mi?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Bu kullanıcı için fabrika ayarlarına sıfırlama işlevi kullanılamıyor"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Siliniyor"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Lütfen bekleyin…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Çağrı ayarları"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Sesli mesaj, çağrı yönlendirme ve bekletme, arayan kimliğini ayarla"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB tethering"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"En çok <xliff:g id="MAXCONNECTION">%1$d</xliff:g> cihaz için tethering yapılabilir."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> internet paylaşımı kesilecek."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet tethering"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Telefonun internet bağlantısını USB üzerinden paylaşın"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Telefonun internet bağlantısını Ethernet üzerinden paylaşın"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Mobil veri bağlantınızdan başka cihazlara internet bağlantısı sağlamak için hotspot ve tethering\'i kullanın. Yakınlardaki cihazlarla içerik paylaşmak için uygulamalar da hotspot oluşturabilir."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Kablosuz veya mobil veri bağlantınızdan başka cihazlara internet bağlantısı sağlamak için hotspot ve tethering\'i kullanın. Yakınlardaki cihazlarla içerik paylaşmak için uygulamalar da hotspot oluşturabilir."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Yardım"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth taraması"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Uygulamaların ve hizmetlerin etrafınızdaki cihazları Bluetooth kapalıyken bile her zaman taramasına izin verin. Bu özellik, örneğin, konuma dayalı özellikleri ve hizmetleri iyileştirmek için kullanılabilir."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"İş için konum hizmetleri"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Konum saat dilimini algılama"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Konum saat dilimini algılama"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Mevcut saat dilimini algılamak için cihazın konumunun kullanılmasına izin verir. Kablosuz ağ taraması gibi diğer konum ayarları, saat dilimi algılamanın doğruluğunu etkileyebilir."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Açık"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Kapalı"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Otomatik saat dilimi algılama özelliği devre dışı"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Konum saat dilimini algılama devre dışı bırakıldı"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Konum saat dilimini algılama desteklenmiyor"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Konum saat dilimini algılama değişikliğine izin verilmez"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Kablosuz ve mobil ağ konumu"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Uygulamalar konumunuzu daha hızlı tahmin edebilmek için Google\'ın konum bilgilerini kullanabilsin. Anonim konum bilgileri toplanıp Google\'a gönderilir."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Konum, Kablosuz tarafından belirlendi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Yüz tanıma kilidini kullanmak için şifre belirleyin"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Yüz tanıma kilidini kullanmak için desen ayarlayın"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Yüz tanıma kilidini kullanmak için PIN belirleyin"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biyometri kullanmak için şifre ayarlayın"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biyometri kullanmak için desen ayarlayın"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biyometri kullanmak için PIN ayarlayın"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Şifrenizi mi unuttunuz?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Deseninizi mi unuttunuz?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN\'inizi mi unuttunuz?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Altyazı tercihleri"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Büyütme"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Büyütme alanı"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Büyütmeyi etkinleştirme"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Ekranı büyütürken kullanmak istediğiniz büyütme alanlarını seçin"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Tam ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ekranın bir parçası"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Tam ekran ve ekranın bir parçası"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Ekranın tamamını büyütün"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ekranın bir parçasını büyütün"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Erişilebilirlik düğmesine geçilsin mi?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ekranın bir bölümünü büyütmek için üç kez dokunma kullanılması yazma ve diğer işlemlerin gecikmesine neden olur.\n\nBüyütmek için erişilebilirlik düğmesini kullanmaya geçmek ister misiniz?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Erişilebilirlik düğmesine geç"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Büyütmek için üç kez dokunmaya devam et"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Büyütme ayarları"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Üç kez dokunarak büyütme"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Kısayolla büyütme"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Güç düğmesi çağrıyı sonlandırır"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Geniş fare işaretçisi"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animasyonları kaldır"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono ses"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Ses çalınırken kanalları birleştir"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Ses dengesi"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Sol"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Sağ"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono ses"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Ses çalınırken kanalları birleştir"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Ses dengesi"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Sol"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Sağ"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Varsayılan"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 saniye"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 saniye"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Bildirim titreşimi"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Zili çaldırma titreşimi"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Dokunma geri bildirimi"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> uygulamasını kullan"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> uygulamasını aç"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Renk düzeltme işlevini kullan"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Altyazıları göster"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Yalnızca desteklenen uygulamalar için"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> özelliğini kullan"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> sayfasını aç"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Renk düzeltme işlevini kullan"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Altyazıları göster"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Yalnızca desteklenen uygulamalar için"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Altyazı boyutu ve stili"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> metin boyutu"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Diğer seçenekler"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Döteranomali"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomali"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomali"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Gri tonlama"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Kırmızı-yeşil"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Kırmızı-yeşil"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Mavi-sarı"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Arka plan kısıtlaması"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Uygulamanın arka planda çalışmasına izin verin"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Uygulamanın arka planda çalıştırılmasına izin verilmiyor"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Arka plan kullanımı kısıtlanamıyor"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Arka plan kullanımı kısıtlanamıyor"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Arka plan etkinliği sınırlansın mı?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Uygulama için arka plan etkinliğini sınırlarsanız hatalı davranabilir"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Uygulama, pili optimize etmek için ayarlanmadığından kısıtlanamaz.\n\nUygulamayı kısıtlamak için önce pil optimizasyonunu açın."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Tablet normalden daha fazla kullanıldı"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Cihaz normalden daha fazla kullanıldı"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Pil normalden daha erken bitebilir"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Pil sağlığı için optimize ediliyor"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Pil geçici olarak sınırlı. Daha fazla bilgi için dokunun."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefonunuz normalden daha fazla kullanıldı. Piliniz beklenenden daha erken bitebilir.\n\nEn çok pil kullanan uygulamalar:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Tabletiniz normalden daha fazla kullanıldı. Piliniz beklenenden daha erken bitebilir.\n\nEn çok pil kullanan uygulamalar:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Cihazınız normalden daha fazla kullanıldı. Piliniz beklenenden daha erken bitebilir.\n\nEn çok pil kullanan uygulamalar:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d uygulama kısıtlandı</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659"><small><font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>"<xliff:g id="NUMBER">^1</xliff:g>"</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Pil ölçeriniz okunurken sorun oluştu"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Pil ölçeriniz okunurken sorun oluştu. "<annotation id="url">"Daha fazla bilgi"</annotation>" için dokunun"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Uygulama durdurulsun mu?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"<xliff:g id="APP">%1$s</xliff:g> uygulaması telefonunuzu sürekli uyanık tuttuğu için telefonunuz pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için uygulamayı durdurabilirsiniz.\n\nBu durum sürekli meydana geliyorsa pil performansını iyileştirmek için uygulamanın yüklemesini kaldırmanız gerekebilir."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"<xliff:g id="APP">%1$s</xliff:g> uygulaması tabletinizi sürekli uyanık tuttuğu için tabletiniz pili normal şekilde yönetemiyor.\n\nBu sorunu çözmek için uygulamayı durdurabilirsiniz.\n\nBu durum sürekli meydana geliyorsa pil performansını iyileştirmek için uygulamanın yüklemesini kaldırmanız gerekebilir."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Bir plan belirleyin"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Pil ömrünü uzatın"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Şarj olduğunda kapat"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Pil Tasarrufu, telefonunuzun gücü <xliff:g id="PERCENT">%1$s</xliff:g> olduğunda kapanır"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Tabletinizin şarjı <xliff:g id="PERCENT">%1$s</xliff:g> olduğunda Pil Tasarrufu kapanır"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Pil Tasarrufu, cihazınızın gücü <xliff:g id="PERCENT">%1$s</xliff:g> olduğunda kapanır"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Pil Tasarrufu, telefonunuz <xliff:g id="PERCENT">%1$s</xliff:g> seviyesinin üzerinde şarj olduğunda kapanır"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Pil Tasarrufu, tabletiniz <xliff:g id="PERCENT">%1$s</xliff:g> seviyesinin üzerinde şarj olduğunda kapanır"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Pil Tasarrufu, cihazınız <xliff:g id="PERCENT">%1$s</xliff:g> seviyesinin üzerinde şarj olduğunda kapanır"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Aç"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Sıfırla"</string>
     <string name="tts_play" msgid="2945513377250757221">"Çal"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Adaptif bağlantı"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Ağ bağlantılarınızı otomatik olarak yöneterek pil ömrünü uzatır ve cihaz performansını iyileştirir"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Kimlik bilgileri deposu"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sertifika yükleme"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikaları depolama biriminden yükleyin"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Kullanıcı kimlik bilgileri"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Depolanmış kimlik bilgilerini görüntüleyin ve değiştirin"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Gelişmiş"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Depolama türü"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Donanım destekli"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Yalnızca yazılım"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Bu kullanıcı için kimlik bilgileri kullanılamıyor"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN ve uygulamalar için yüklendi"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Kablosuz bağlantı için yüklendi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Yükleme"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Yine de yükle"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sertifika yüklenmedi"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g> uygulamasının bu cihazda sertifika yüklemesine izin verilsin mi?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Bu sertifikalar sizi aşağıdaki uygulamalara ve URL\'lere tanıtacaktır"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"İzin verme"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"İzin ver"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Daha fazla göster"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Sertifika yönetim uygulaması"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Yok"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Bu uygulama tarafından yüklenen sertifikalar, sizi aşağıdaki uygulamalara ve URL\'lere tanıtır"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Kaldır"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Acil durum arama sinyali"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Acil çağrı yapıldığında nasıl işlev göreceğini ayarlayın"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Yedekleme"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Yapılandrılmadı - İş profili"</string>
     <string name="user_admin" msgid="4024553191395768119">"Yönetici"</string>
     <string name="user_you" msgid="3070562015202859996">"Siz (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Takma Ad"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> kişiye kadar kullanıcı ekleyebilirsiniz"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Yalnızca tabletin sahibi kullanıcıları yönetebilir."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Yalnızca telefonun sahibi kullanıcıları yönetebilir."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Kasada ödeme"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Ödeme uygulaması kurun. Ardından, telefonunuzun arka tarafını temassız işlem sembolünün olduğu herhangi bir ödeme noktasına doğru tutmanız yeterli olacaktır."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Anladım"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Diğer..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Diğer…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Varsayılan ödeme uygulamasını ayarla"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Varsayılan ödeme uygulamasını güncelle"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Temassız bir terminalde <xliff:g id="APP">%1$s</xliff:g> uygulamasıyla ödeyin"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Geri"</string>
     <string name="wizard_next" msgid="3884832431439072471">"İleri"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Son"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Fotoğraf çek"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Resim seç"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Fotoğraf seçin"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartlar"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartlar"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Çağrılar için her zaman bunu kullan"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Veri için bir SIM kart seçin"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS için bir SIM kart seçin"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Veri için kullanılan SIM kart değiştiriliyor. Bu işlem bir dakika kadar sürebilir..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Veri için kullanılan SIM kart değiştiriliyor. Bu işlem bir dakika kadar sürebilir…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Telefon etmek için şu SIM kartı kullan:"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Bir SIM kart seçin"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM: <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"rutin, program, pil tasarrufu, güç tasarrufu, pil, otomatik, yüzde"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, Gelişmiş Arama, 4G Arama"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"dil ekle, bir dil ekle"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"metin boyutu"</string>
     <string name="default_sound" msgid="6604374495015245195">"Varsayılan ses"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Zil ve bildirim sesi <xliff:g id="PERCENTAGE">%1$s</xliff:g> düzeyinde"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Ses düzeyi, titreşim, Rahatsız Etmeyin"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Açılış sesleri"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Canlı Altyazı"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Otomatik medya altyazısı"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Yok"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> program ayarlandı</item>
-      <item quantity="one">1 program ayarlandı</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Yok}=1{1 program ayarlandı}other{# program ayarlandı}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Rahatsız Etmeyin"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Yalnızca önemli kişiler ve uygulamalardan gelen bildirimleri alın"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Kesintileri sınırlayın"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Yalnızca öncelikliler"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Açık / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Kapalı / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Kapalı"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Aç"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Her zaman sor"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Siz kapatana kadar"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> saat</item>
-      <item quantity="one">1 saat</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> dakika"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> program otomatik olarak açılabilir</item>
-      <item quantity="one">1 program otomatik olarak açılabilir</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 saat}other{# saat}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 dakika}other{# dakika}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Kapalı}=1{Kapalı / 1 program otomatik olarak açılabilir}other{Kapalı / # program otomatik olarak açılabilir}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Rahatsız Etmeyin modunda neler kesintiye neden olabilir?"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Kişiler"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Uygulamalar"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Düşük öncelikli bildirimleri otomatik olarak Sessiz moda ayarla"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Uyarlamalı bildirim sıralama"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Bildirimleri alaka düzeyine göre otomatik olarak sırala"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Uyarlamalı bildirimlerle ilgili geri bildirim"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bildirimlerde yapılan düzenlemeleri belirtin ve sisteme geri bildirim sağlama seçeneğini gösterin"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Bildirimlerin önemini sıfırla"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Kullanıcı tarafından değiştirilen önem ayarlarını sıfırlar ve bildirim yardımcısının öncelik belirlemesine izin verir"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Önerilen işlemler ve yanıtlar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Önerilen işlemleri ve yanıtları otomatik olarak göster"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Son ve ertelenen bildirimleri göster"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Öncelikli görüşmeler"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Görüşme bölümünün üstünde gösterilir ve kayan baloncuklar olarak görünür"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Görüşme bölümünün üstünde gösterilir"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Diğer görüşmeler"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Öncelikli olmayan görüşmeler"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Değişiklik yaptığınız görüşmeler"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Son görüşmeler"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Son görüşmeleri sil"</string>
+    <string name="clear" msgid="5092178335409471100">"Sil"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Öncelikli görüşmeleri balon olarak göster"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Öncelikli görüşmeler aşağı indirilen gölgenin üst kısmında gösterilir. Bunları ayrıca baloncuk olarak gösterilecek ve Rahatsız Etmeyin özelliğini dikkate almayacak şekilde ayarlayabilirsiniz."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Öncelikli ve değiştirilmiş görüşmeler burada görünür"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Rahatsız Etmeyin erişimi"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Rahatsız Etmeyin\'e izin ver"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Yüklü hiçbir uygulama Rahatsız Etmeyin erişimi isteğinde bulunmadı"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Uygulamalar yükleniyor..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Uygulamalar yükleniyor…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"İsteğiniz üzerine Android, bu uygulamanın bildirimlerinin bu cihazda görünmesini engelliyor"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"İsteğiniz üzerine Android, bu kategorideki bildirimlerin bu cihazda görünmesini engelliyor"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"İsteğiniz üzerine Android, bu bildirim grubunun bu cihazda görünmesini engelliyor"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Tüm görüşmeler"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Öncelikli görüşmeler"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Yok"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> görüşme</item>
-      <item quantity="one">1 görüşme</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Yok"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Yok}=1{1 görüşme}other{# görüşme}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Kimler kesintiye neden olabilir?"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Aramalar"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Çağrılar"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"İzin verilen aramaların ses çıkardığından emin olmak için cihazınızın çalmaya ayarlı olduğundan emin olun"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" boyunca gelen aramalar engelleniyor. Arkadaşlarınız, aileniz veya diğer kişilerinizin size ulaşmasına izin vermek için ayarlarınızı düzenleyebilirsiniz."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Yıldızlı kişiler"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> kişi daha</item>
-      <item quantity="one">1 kişi daha</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Yok"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Yok}=1{{contact_1}}=2{{contact_1} ve {contact_2}}=3{{contact_1}, {contact_2} ve {contact_3}}other{{contact_1}, {contact_2} ve # kişi daha}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Adsız)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"İletiler"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"mesajlar"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Mesajlar"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"\"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\" için gelen mesajlar engelleniyor. Arkadaşlarınız, aileniz veya diğer kişilerin size ulaşmasına izin vermek için ayarları düzenleyebilirsiniz."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Tüm mesajlar size ulaşabilir"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Tüm aramalar size ulaşabilir"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Yok"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> kişi</item>
-      <item quantity="one">1 kişi</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Yok}=1{1 kişi}other{# kişi}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Herkes"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kişiler"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Yıldızlı kişiler"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Tüm bildirimler"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Bazı bildirimler"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Uygulamaların kesintiye neden olmasına izin vermeseniz bile seçtiğiniz kişiler size ulaşmaya devam edebilir."</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> kesintiye neden olabilir</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> kesintiye neden olabilir</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> tane daha"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Hiçbir uygulama kesintiye neden olamaz}=1{{app_1} kesintiye neden olabilir}=2{{app_1} ve {app_2} kesintiye neden olabilir}=3{{app_1}, {app_2} ve {app_3} kesintiye neden olabilir}other{{app_1}, {app_2} ve # uygulama daha kesintiye neden olabilir}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Uygulamalar"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Tüm bildirimler"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Bazı bildirimler"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Kesintiye neden olabilecek bildirimler"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Tüm bildirimlere izin ver"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> kesintiye neden olabilir</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> kesintiye neden olabilir</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Hiçbir şey kesintiye neden olamaz"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> tane daha"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Hiçbir şey kesintiye neden olamaz}=1{{sound_category_1} kesintiye neden olabilir}=2{{sound_category_1} ve {sound_category_2} kesintiye neden olabilir}=3{{sound_category_1}, {sound_category_2} ve {sound_category_3} kesintiye neden olabilir}other{{sound_category_1}, {sound_category_2} ve # uygulama daha kesintiye neden olabilir}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Hiçbir şey kesintiye neden olamaz"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Hiç kimse kesintiye neden olamaz"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Bazı kişiler kesintiye neden olabilir"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Tüm kişiler kesintiye neden olabilir"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Açık"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Kapalı"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Uygulama sabitleme"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Uygulama sabitleme, geçerli uygulamayı sabitleme kaldırılana kadar görünür durumda tutmanıza olanak tanır. Bu özellik, örneğin, güvendiğiniz bir arkadaşınızın belli bir oyunu oynamasını sağlamak için kullanılabilir. \n\nSabitlenen uygulama diğer uygulamaları açabilir, kişisel verilere erişilebilir. \n\nUygulama sabitlemeyi kullanmak için: 	\n1.	Uygulama sabitlemeyi açın 	\n2.	Genel Bakış\'ı açın 	\n3.	Ekranın üst tarafındaki uygulama simgesine dokunup ardından Sabitle\'ye dokunun"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Uygulama sabitleme özelliği, geçerli uygulamayı sabitleme kaldırılana kadar görünür durumda tutmanıza olanak tanır. Bu özellik, örneğin, güvendiğiniz bir arkadaşınızın belli bir oyunu oynamasını sağlamak için kullanılabilir. \n\nBir uygulama sabitlendiğinde diğer uygulamaları açabilir. Kişisel verilere erişilebilir. \n\nCihazınızı güvenli bir şekilde başka biriyle paylaşmak isterseniz bunun yerine misafir kullanıcı özelliğini kullanın. \n\nUygulama sabitlemeyi kullanmak için: 	\n1.	Uygulama sabitlemeyi açın 	\n2.	Genel Bakış\'ı açın 	\n3.	Ekranın üst tarafındaki uygulama simgesine dokunup ardından Sabitle\'ye dokunun"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Uygulama sabitleme, geçerli uygulamayı sabitleme kaldırılana kadar görünür durumda tutmanıza olanak tanır. Bu özellik, örneğin, güvendiğiniz bir arkadaşınızın belli bir oyunu oynamasını sağlamak için kullanılabilir."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Bir uygulama sabitlendiğinde diğer uygulamaları açabilir ve kişisel verilere erişilebilir. \n\nUygulama sabitlemeyi kullanmak için: 	\n1.	Uygulama sabitlemeyi açın 	\n2.	Genel Bakış\'ı açın 	\n3.	Ekranın üst tarafındaki uygulama simgesine dokunup ardından Sabitle\'ye dokunun"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Bir uygulama sabitlendiğinde diğer uygulamaları açabilir ve kişisel verilere erişilebilir. \n\nCihazınızı güvenli bir şekilde başka biriyle paylaşmak isterseniz bunun yerine misafir kullanıcı özelliğini kullanın. \n\nUygulama sabitlemeyi kullanmak için: 	\n1.	Uygulama sabitlemeyi açın 	\n2.	Genel Bakış\'ı açın 	\n3.	Ekranın üst tarafındaki uygulama simgesine dokunup ardından Sabitle\'ye dokunun"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Uygulama sabitlendiğinde: \n\n•	 Kişisel verilere erişilebilir \n		(ör. kişiler ve e-posta içerikleri) \n•		Sabitlenen uygulama diğer uygulamaları açabilir \n\nUygulama sabitlemeyi yalnızca güvendiğiniz kişilerle kullanın."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Sabitlemeyi kaldırmadan önce kilit açma desenini sor"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Sabitlemeyi kaldırmadan önce PIN\'i sor"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Cihazınızın kilidini açmak için parmak izinizi kullanmaya ek olarak, başlatılmadan önce PIN\'inizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için PIN girilmesi zorunlu kılınsın mı?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Cihazınızın kilidini açmak için parmak izinizi kullanmanın yanı sıra, başlatılması için deseninizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz, başlatılana kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirimleri almaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur. Cihazınızı başlatmak için desen girilmesi zorunlu kılınsın mı?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Cihazınızın kilidini açmak için parmak izinizi kullanmanın yanı sıra, başlatılması için şifrenizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz, başlatılana kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirimleri almaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur. Cihazınızı başlatmak için şifre girilmesi zorunlu kılınsın mı?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Cihazınızın kilidini açmak için biyometri kullanmaya ek olarak, başlatılmadan önce PIN\'inizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz, başlatılana kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirimleri alamaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur. Cihazınızı başlatmak için PIN\'in girilmesi zorunlu kılınsın mı?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Cihazınızın kilidini açmak için biyometri kullanmaya ek olarak, başlatılmadan önce deseninizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz, başlatılana kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirimleri alamaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur. Cihazınızı başlatmak için desen girilmesi zorunlu kılınsın mı?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Cihazınızın kilidini açmak için biyometri kullanmanın yanı sıra, başlatılmadan önce şifrenizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz, başlatılana kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirimleri alamaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur. Cihazınızı başlatmak için şifre girilmesi zorunlu kılınsın mı?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Evet"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Hayır"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Kısıtlı"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB\'yi kontrol eden:"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Bağlı cihaz"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Bu cihaz"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Geçiş yapılıyor..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Geçiş yapılıyor…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Geçiş yapılamadı"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Bu cihazı şarj ediyor"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Bağlı cihazı şarj etme"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobil veri kullanımı"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Uygulama veri kullanımı"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Kablosuz ağ veri kullanımı"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Operatör harici veri kullanımı"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet veri kullanımı"</string>
     <string name="wifi" msgid="2932584495223243842">"Kablosuz"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 kısıtlama</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Operatörünüzün veri kullanımı hesaplaması, cihazdaki hesaplamadan farklı olabilir"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Operatör ağları tarafından kullanılan verileri hariç tutar"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> kullanıldı"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Veri uyarısı oluştur"</string>
     <string name="data_warning" msgid="2925054658166062884">"Veri uyarısı"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Ayrıntıları göster"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Veri Tasarrufu"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Kısıtlanmamış veri"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Arka plan verisi kapalı"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Arka plan verisi kapalı"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Açık"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Kapalı"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Veri Tasarrufu\'nu kullan"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Cihaz kilitliyse, bildirimlerde yanıt yazmayı veya diğer metin girişlerini önle"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Varsayılan yazım denetleyici"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Yazım denetleyiciyi seçin"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Yazım denetleyici kullan"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Yazım denetleyiciyi kullan"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Seçili değil"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(yok)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Depolama alanında yer açmaya yardımcı olmak için depolama yöneticisi, yedeklenen fotoğrafları ve videoları cihazınızdan kaldırır."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Fotoğrafları ve videoları kaldır"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Depolama yöneticisi"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Depolama yöneticisini kullan"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Depolama yöneticisini kullan"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Otomatik"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Manuel"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Şimdi yer boşalt"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Bakmak için telefona iki kez dokun"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Tableti kontrol etmek için iki kez dokunun"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Cihazı kontrol etmek için iki kez dokunun"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Bildirimler için kaydırın"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Bildirimlerinizi görüntülemek için ekranın alt kenarında aşağı doğru kaydırın"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Tek El modu"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Tek el modunu kullan"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Uygulama değiştirirken çık"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Zaman aşımı"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 saniye"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 saniye"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 saniye"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"erişilebilirlik"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için ekranınıza iki kez dokunun."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Bakmak için telefonu kaldır"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Tableti kontrol etmek için kaldırın"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Tableti kontrol etmek için dokunun"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Cihazı kontrol etmek için dokunun"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Saati, bildirimleri ve diğer bilgileri kontrol etmek için ekranınıza dokunun."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Acil Durum SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Acil durum SOS özelliğini kullan"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> tarafından yönetiliyor"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Güç düğmesine hızlı bir şekilde 5 veya daha fazla kez basarak aşağıdaki işlemleri başlatın"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Geri sayım alarmı çal"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Yardım için bildirmeden önce yüksek ses çal"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Yardım için aranacak telefon numarası"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Yardım için aranacak numara"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Değiştirmek için dokunun"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Acil durum için olmayan numara girerseniz:\n • Acil Durum SOS özelliğini kullanmak için cihazınızın kilidi açık olmalıdır\n • Çağrınız yanıtlanmayabilir"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Bildirimler için parmak izini kaydırın"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Parmak izini kaydırın"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Bildirimlerinizi kontrol etmek için telefonunuzun arkasındaki parmak izi sensöründe parmağınızı hızlıca aşağı kaydırın."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maksimum görünür veri kümesi"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Varsayılan değerlere sıfırla"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Otomatik doldurma geliştirici seçenekleri sıfırlandı"</string>
+    <string name="location_category" msgid="3496759112306219062">"Yer"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Durum çubuğu konum göstergesi"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Ağ ve bağlantı dahil olmak üzere tüm konumlar için göster"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Tam GNSS ölçümlerini zorla"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Tüm GNSS takımyıldızlarını ve görev döngüsü olmayan frekansları takip et"</string>
     <string name="device_theme" msgid="5027604586494772471">"Cihaz teması"</string>
     <string name="default_theme" msgid="4815428567082263639">"Varsayılan"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Ağ adı"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Konsantrasyonunuzu bozmamak için bildirimleri duraklatın"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Özellik kullanılamıyor"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Bu özellik, telefonunuzu yavaşlattığı için kapatıldı."</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Tam GNSS ölçümlerini zorla"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Tüm GNSS takımyıldızlarını ve görev döngüsü olmayan frekansları takip et"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Kilitlenme iletişim kutusunu her zaman göster"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Her uygulama kilitlendiğinde iletişim kutusunu göster"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE özellikli uygulamayı seçin"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Tüm uygulamalar için etkinleştir"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafik Sürücüsünü Seçin"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Varsayılan"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Oyun Sürücüsü"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Oyun Sürücüsü"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Geliştirici Sürücüsü"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Sistem Grafik Sürücüsü"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Açık (sessiz)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Kapalı"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Ağ ayrıntıları"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Telefonunuzdaki uygulamalar cihazınızın adını görür. Bluetooth cihazlarına bağlandığınızda veya bir kablosuz hotspot ayarladığınızda başka kişiler de bu adı görebilir."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Telefonunuzdaki uygulamalar, cihazınızın adını görebilecek. Cihazınızın adı ayrıca Blueetoth cihazlara bağlandığınızda, kablosuz ağa bağlandığınızda veya kablosuz hotspot oluşturduğunuzda diğer kişiler tarafından görülecektir."</string>
     <string name="devices_title" msgid="649715719278562515">"Cihazlar"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Tüm Ayarlar"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Öneriler"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Ağ bulunamadı. Tekrar deneyin."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(yasak)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM kart yok"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM kart yok"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Yok"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Bağlanmak için SIM gerektirir"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Bağlanmak için <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> operatörünün SIM\'ini gerektirir"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Tercih edilen ağ modu: WCDMA tercih edilir"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Tercih edilen ağ modu: Yalnızca GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Tercih edilen ağ modu: Yalnızca WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobil veri"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Verilere mobil ağ üzerinden erişim"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon, kapsama alanında olduğunda otomatik olarak bu operatöre geçer"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"SIM kart yok"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Çağrı tercihi"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS tercihi"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Her zaman sor"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> operatörüne bağlıyken kullanılamaz"</string>
     <string name="see_more" msgid="7499355691042812723">"Daha fazla"</string>
     <string name="see_less" msgid="2642392725363552793">"Daha az göster"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> etkinleştirilsin mi?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM açılsın mı?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatörüne geçilsin mi?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM kart kullanmaya geçilsin mi?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Aynı anda yalnızca indirilmiş tek bir SIM etkin olabilir.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operatörüne geçtiğinizde <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> hizmetiniz iptal edilmez."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Aynı anda yalnızca bir indirilmiş SIM etkin olabilir.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> operatörüne geçtiğinizde <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> hizmetiniz iptal edilmez."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Aynı anda yalnızca tek bir SIM etkin olabilir.\n\nGeçiş yaptığınızda <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> hizmetiniz iptal edilmez."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatörüne geç"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Ağa bağlanıyor…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> operatörüne geçiliyor"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Operatöre geçiş yapılamıyor"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Bir hata nedeniyle operatöre geçiş yapılamıyor."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> kapatılsın mı?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM kapatılsın mı?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM kapatılıyor<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Operatör devre dışı bırakılamıyor"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Bir hata oluştu ve operatörünüz devre dışı bırakılamadı."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 SIM kullanılsın mı?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Bu cihazda aynı anda 2 SIM etkin durumda olabilir. Tek seferde 1 SIM kullanmaya devam etmek için \"Hayır, teşekkürler\" seçeneğine dokunun."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Cihaz yeniden başlatılsın mı?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Öncelikle cihazınızı yeniden başlatın. Daha sonra başka bir SIM ekleyebilirsiniz."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Devam"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Yeniden başlat"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Hayır, teşekkürler"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Geçilsin"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM etkinleştirilemiyor"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM\'i çıkarıp tekrar yerleştirmeyi deneyin. Sorun devam ederse cihazınızı yeniden başlatın."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM\'i tekrar açmayı deneyin. Sorun devam ederse cihazınızı yeniden başlatın."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ağ etkinleştirme"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> etkin durumda"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM ayarlarını güncellemek için dokunun"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM kart"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"İndirilen bu SIM silinsin mi?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Bu SIM silindiğinde, <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> hizmeti bu cihazdan kaldırılır.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> hizmeti iptal edilmez."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Sil"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM siliniyor…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM silinemiyor"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Bu SIM bir hata nedeniyle silinemiyor.\n\nCihazınızı yeniden başlatıp tekrar deneyin."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Cihaza bağlanın"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> uygulaması cihazınıza bağlanmak için geçici bir kablosuz ağ kullanmak istiyor"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Hiçbir cihaz bulunamadı. Cihazların açık ve bağlanmaya hazır olduğundan emin olun."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Acil durum aramaları"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Operatörünüz, kablosuz çağrı üzerinden yapılan acil durum aramalarını desteklememektedir.\nAcil durum araması yapmak için cihaz otomatik olarak hücresel ağa geçer.\nAcil durum aramaları sadece hücresel ağ kapsamında olan yerlerde yapılabilir."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Kaliteyi iyileştirmek için çağrılarda kablosuz ağ kullanın"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Çapraz SIM araması"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Bu SIM üzerinden yapılan diğer SIM aramaları ve SMS\'lere izin ver"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"çapraz sim araması"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Gelen MMS mesajı"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS mesajı gönderilemiyor"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Mobil veri kapalıyken MMS mesajının <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> üzerinden gönderilip alınmasına izin vermek için dokunun"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Ayarların üzerinde ekran yer paylaşımına izin ver"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Diğer uygulamaların üzerinde görüntülenebilecek uygulamaların Ayarlar ekranlarıyla yer paylaşımlı olarak gösterilmesine izin verir"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Medya"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Medya oturumu sona erdiğinde oynatıcıyı gizle"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Oynatıcı, genişletilmiş Hızl Ayarlar panelinden bir oturumu devam ettirmenize olanak sağlar."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Hızlı Ayarlar\'da Medya oynatıcı"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Oynatmayı kolayca devam ettirmek için medya oynatıcıyı uzun süre göster"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Oynatıcıyı gizle"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Oynatıcıyı göster"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Kullanılabilir oynatıcı yok"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"İzin verilen uygulamalar"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"medya"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth açılacak"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Aç"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Kapalı"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"İnternet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM\'ler"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Uçakta kullanımı güvenli ağlar"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Uçakta kullanımı güvenli ağları bulup bağlanın"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"uçak, uçakta kullanımı güvenli"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Aramalar ve SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Kablosuz Çağrı"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Bazı kablosuz ağlar gibi operatör olmayan ağlar üzerinden arama yapın ve gelen aramaları yanıtlayın"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Kablosuz çağrı, bazı kablosuz ağlar gibi operatör olmayan ağlar üzerinden arama yapmanıza ve almanıza olanak tanır."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Çağrılar"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"tercih edilen"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"arama tercih edildi"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"SMS tercih edildi"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"kullanılamıyor"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM kart yok"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Tercihler"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Herkese açık ağlara bağlan"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"ağ bağlantısı, internet, kablosuz, veri, wifi, wi-fi, wi fi, hücresel, mobil, hücresel operatör, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Uçakta kullanımı güvenli ağları göster"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Uçak Modu\'nu kapat"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Uyku vakti modu açık olduğundan kullanılamıyor"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Bildirimlerin önemini sıfırlama işlemi tamamlandı."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Uygulamalar"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Güvenilmeyen bir cihaz mesajlarınıza erişmek istiyor. Ayrıntılar için dokunun."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Mesajlara erişime izin verilsin mi?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Güvenilmeyen bir Bluetooth cihazı [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] mesajlarınıza erişmek istiyor.\n\n[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] adlı cihaza daha önce bağlanmadınız."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Güvenilmeyen bir cihaz kişilerinize ve arama kaydınıza erişmek istiyor. Ayrıntılar için dokunun."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Kişilerinize ve arama kaydınıza erişime izin verilsin mi?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Güvenilmeyen bir Bluetooth cihazı [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] kişilerinize ve arama kaydınıza erişmek istiyor. Bu hem gelen hem giden aramalarınıza ait verileri içerir.\n\n [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] adlı cihaza daha önce bağlanmadınız."</string>
 </resources>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 04f31d6..0d32e6e 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Середня"</item>
     <item msgid="6740026006576843477">"Довга"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Короткий"</item>
+    <item msgid="7397961711906421599">"Середній"</item>
+    <item msgid="4079132024502041928">"Довгий"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"За умовчанням"</item>
     <item msgid="4234707448428002595">"Sans-Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Загальний"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Лише TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Загальні"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index c01ff24..280bf91 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -258,8 +258,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Дата та час"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Установити дату та час"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Установити дату, час, часовий пояс і формати"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Використовувати час мережі"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Використовувати часовий пояс мережі"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Установити час автоматично"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Установити часовий пояс автоматично"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Використовувати місцеві налаштування за умовчанням"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24-годинний формат"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24-годинний формат"</string>
@@ -300,7 +300,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Показувати інформацію профілю на заблокованому екрані"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Облікові записи"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Місцезнаходження"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Використовувати геодані"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Використовувати геодані"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Вимкнено"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Увімкнено: <xliff:g id="COUNT_1">%1$d</xliff:g> додаток має доступ до геоданих</item>
@@ -326,6 +326,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Блокування екрана, фейсконтроль"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Блокування екрана, відбиток пальця"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Блокування екрана"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Розблоковуйте телефон за рисами обличчя чи відбитком пальця"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Ви також можете входити в додатки й підтверджувати платежі"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Виберіть спосіб розблокування"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Фейсконтроль"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Розблоковуйте телефон без зайвих рухів"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Відбиток пальця"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Розблоковуйте телефон ще в кишені"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Пропустити"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Далі"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Обличчя додано"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Налаштуйте Фейсконтроль"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Фейсконтроль"</string>
@@ -335,6 +344,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Використовуйте обличчя для автентифікації"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Почати"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Якщо спеціальні можливості функції \"Фейсконтроль\" вимкнено, деякі налаштування можуть працювати з TalkBack неналежним чином."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Назад"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Продовжити налаштування"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Показати параметри доступності"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -379,8 +391,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Просити підтвердження під час використання Фейсконтролю в додатках"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Видалити дані про обличчя"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Налаштувати Фейсконтроль"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Використовуйте фейсконтроль, щоб розблоковувати пристрій, входити в додатки й підтверджувати платежі.\n\nУвага!\nВи можете випадково розблокувати телефон у недоречний момент, ненароком поглянувши на нього.\n\nБудь-хто може розблокувати телефон, якщо піднесе його до вашого обличчя.\n\nТелефон може розблокувати людина, схожа на вас, наприклад ваш близнюк."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"З функцією фейсконтролю можна розблоковувати пристрій, входити в додатки й підтверджувати платежі.\n\nЗверніть увагу:\nпоглянувши на телефон, ви можете випадково розблокувати його в недоречний момент.\n\nБудь-хто може розблокувати телефон, якщо піднесе його до вашого обличчя, навіть коли у вас закриті очі.\n\nТелефон може розблокувати людина, схожа на вас, наприклад, ваш близнюк."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"За допомогою фейсконтролю ви можете розблоковувати пристрій, входити в додатки та підтверджувати платежі."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Важливо!\nВи можете випадково розблокувати телефон у недоречний момент, ненароком поглянувши на нього.\n\nБудь-хто може розблокувати телефон, якщо піднесе його до вашого обличчя.\n\nТелефон може розблокувати людина, схожа на вас, наприклад ваш близнюк."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Важливо!\nВи можете випадково розблокувати телефон у недоречний момент, ненароком поглянувши на нього.\n\nБудь-хто може розблокувати телефон, якщо піднесе його до вашого обличчя, навіть коли у вас заплющені очі.\n\nТелефон може розблокувати людина, схожа на вас, наприклад ваш близнюк."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Видалити дані про обличчя?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Дані про обличчя, потрібні для фейсконтролю, буде остаточно видалено без можливості відновлення. Після цього потрібно буде вводити PIN-код, ключ або пароль, щоб розблоковувати телефон, входити в додатки й підтверджувати платежі."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Розблоковуйте телефон за допомогою фейсконтролю"</string>
@@ -402,6 +415,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Розблоковуйте телефон або схвалюйте покупки відбитком пальця.\n\nПримітка. Цей пристрій не можна розблоковувати відбитком пальця. Щоб дізнатися більше, зв’яжіться з адміністратором своєї організації."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Розблоковуйте телефон або схвалюйте покупки відбитком пальця.\n\nПримітка. Відбиток пальця може бути менш надійним, ніж ключ чи PIN-код."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Скасувати"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Ні, дякую"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Далі"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Пропустити"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Далі"</string>
@@ -439,6 +453,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Блокування екрана захистить ваш планшет, якщо він загубиться чи його викрадуть. Воно також потрібне, щоб налаштувати Фейсконтроль. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Блокування екрана захистить ваш пристрій, якщо він загубиться чи його викрадуть. Воно також потрібне, щоб налаштувати Фейсконтроль. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Блокування екрана захистить ваш телефон, якщо він загубиться чи його викрадуть. Воно також потрібне, щоб налаштувати Фейсконтроль. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Блокування екрана захистить ваш планшет, якщо він загубиться чи його викрадуть. Ця опція також потрібна, щоб налаштувати біометричне розблокування. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Блокування екрана захистить ваш пристрій, якщо він загубиться чи його викрадуть. Ця опція також потрібна, щоб налаштувати біометричне розблокування. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Блокування екрана захистить ваш телефон, якщо він загубиться чи його викрадуть. Ця опція також потрібна, щоб налаштувати біометричне розблокування. Щоб повернутися назад, натисніть \"Скасувати\"."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Не налаштовувати PIN-код?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Не налаштовувати пароль?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Не налаштовувати ключ?"</string>
@@ -511,8 +528,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Активуйте функції захисту планшета, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Активуйте функції захисту пристрою, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Активуйте функції захисту телефона, щоб інші люди не могли ним користуватися без вашого дозволу. Виберіть спосіб блокування екрана."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Виберіть резервний спосіб блокування екрана"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Виберіть резервний спосіб блокування екрана"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Виберіть резервний спосіб блокування екрана"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Способи блокування екрана"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Способи блокування екрана"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Блокування екрана"</string>
@@ -544,6 +560,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Фейсконтроль + пароль"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Продовжити без Фейсконтролю"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Ви можете розблоковувати свій телефон за допомогою розпізнавання облич. З міркувань безпеки для цього методу потрібно налаштувати резервний спосіб блокування екрана."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Біометричні дані та ключ"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Біометричні дані й PIN-код"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Біометричні дані й пароль"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Не використовувати біометрію"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Ви можете розблоковувати свій телефон за допомогою біометричних даних. З міркувань безпеки для цього методу потрібно налаштувати резервний спосіб блокування екрана."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Вимкнено адміністратором, правилом шифрування або сховищем облікових даних"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Немає"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Проведіть по екрану"</string>
@@ -635,7 +656,6 @@
       <item quantity="other">Може містити до <xliff:g id="NUMBER_1">%d</xliff:g> цифри</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Адміністратор пристрою не дозволяє використовувати останній PIN-код"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"IT-адміністратор заблокував загальні PIN-коди. Введіть інший PIN-код."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Не може містити недійсних символів"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Має містити принаймні одну літеру"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Має містити принаймні одну цифру"</string>
@@ -683,7 +703,6 @@
       <item quantity="other">Має містити принаймні <xliff:g id="COUNT">%d</xliff:g> символу, які не є цифрами</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Адміністратор пристрою не дозволяє використовувати останній пароль"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"IT-адміністратор заблокував загальні паролі. Введіть інший пароль."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Цифри в порядку зростання чи спадання та повторювані цифри заборонені"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Підтвердити"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Скасувати"</string>
@@ -829,7 +848,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Увімкнути Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Використовувати Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Використовувати Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Налаштування Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Налашт. і керуйте бездрот. точками доступу"</string>
@@ -937,7 +956,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Щоб підключитися до мережі \"<xliff:g id="SSID">%1$s</xliff:g>\", наведіть камеру на QR-код нижче"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Щоб під’єднатися до мережі Wi‑Fi, відскануйте QR-код"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Поділитися мережею Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Відскануйте QR-код, щоб підключитися до мережі \"<xliff:g id="SSID">%1$s</xliff:g>\" і поділитися паролем"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Відскануйте цей QR-код за допомогою іншого пристрою, щоб підключитися до мережі \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Відскануйте QR-код, щоб підключитися до мережі \"<xliff:g id="SSID">%1$s</xliff:g>\""</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Повторіть спробу. Якщо проблема не зникне, зверніться до виробника пристрою"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Сталася помилка"</string>
@@ -963,8 +982,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Пароль Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Пароль точки доступу: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Автоматичне підключення"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Надати телефону дозвіл на автоматичне з\'єднання з цією мережею"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Надайте планшету дозвіл на автоматичне з\'єднання з цією мережею"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Дозволити підключатися до цієї мережі в зоні її покриття"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Додати пристрій"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Зіскануйте QR-код, щоб додати пристрій до цієї мережі"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Недійсний формат QR-коду"</string>
@@ -976,7 +994,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Використовувати сертифікати системи"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Не надавати"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Не перевіряти"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Сертифікат не вказано. З’єднання не буде конфіденційним."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Назва мережі задовга."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Укажіть домен."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Потрібен сертифікат."</string>
@@ -1003,6 +1020,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Підключити"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi увімкнено"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Підключено до мережі \"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>\""</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Підключення до мережі \"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>\""</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Підключення…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Помилка під’єднання до мережі."</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Ви знаходитеся поза зоною покриття мережі"</string>
@@ -1036,6 +1054,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"MAC-адреса пристрою"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Довільна MAC-адреса"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Довільна MAC-адреса (остання використана)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"ІР-адреса"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Деталі мережі"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Маска підмережі"</string>
@@ -1043,8 +1062,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Адреси IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Збережені мережі"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Підписки"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Інші мережі"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Налаштування IP-адр."</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Розширені налаштування Wi-Fi недоступні для цього користувача"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Зберегти"</string>
@@ -1053,8 +1071,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Введіть дійсну адресу шлюзу."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Введіть дійсну DNS-адресу."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Введіть довжину префікса мережі від 0 до 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (якщо не замінено приватним DNS-сервером)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (якщо не замінено приватним DNS-сервером)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Довжина префіксу мережі"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1080,7 +1098,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Додаток ділиться вмістом. Щоб надати доступ до Інтернету, вимкніть і знову ввімкніть точку доступу"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Пароль не налаштовано"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Назва точки доступу"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Увімкнення точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Увімкнення точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\"…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Інші пристрої можуть підключитися до точки доступу \"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>\""</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Пароль точки доступу"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Діапазон частот точки доступу"</string>
@@ -1230,7 +1248,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Плавне відображення"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Автоматично збільшує частоту оновлення певного вмісту з 60 до 90 Гц. Підвищує використання заряду акумулятора."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Плавне відображення"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Примусова частота оновлення: 90 Гц"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Найвища частота оновлення для кращого реагування на дотики й вищої якості анімації. Підвищує використання заряду акумулятора."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Адаптивний сплячий режим"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Ввімкнено: екран не вимикатиметься, доки ви на нього дивитесь"</string>
@@ -1321,6 +1339,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Коли екран темний, він вмикається, щоб показати нові сповіщення"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Завжди показувати час і дані"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Підвищене використання заряду акумулятора"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Текст жирним шрифтом"</string>
     <string name="title_font_size" msgid="570613010306330622">"Розмір шрифту"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Збільшуйте або зменшуйте текст"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Налаштування блокування SIM-карти"</string>
@@ -1371,7 +1390,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Версія Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Оновлення системи безпеки Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Модель"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Модель: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Модель і апаратне забезпечення"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Версія апаратного забезпечення"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Ідентифікатор обладнання"</string>
@@ -1620,7 +1638,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Видалити APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"Нова точка доступу APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Зберегти"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Відхилити"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Скасувати"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Поле \"Назва\" не може бути порожнім."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"Поле APN не може бути порожнім."</string>
@@ -1635,8 +1653,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Додатки може бути скинуто"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Скинути параметри Wi-Fi, мобільного передавання даних і Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Буде скинуто всі налаштування мережі, зокрема \n\n"<li>"Wi‑Fi"</li>\n<li>"мобільний трафік"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Видалити"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Видалити завантажені SIM-карти"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Щоб завантажити нові SIM-карти, зв’яжіться з оператором. Мобільні тарифні плани не буде скасовано."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Мобільні тарифні плани не буде скасовано. Щоб завантажити нові SIM-карти, зв\'яжіться з оператором."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Скинути налаштування"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Скинути налаштування мереж? Цю дію неможливо відмінити."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Скинути налаштування всіх мереж і видалити завантажені SIM-карти? Цю дію неможливо відмінити."</string>
@@ -1646,31 +1665,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Налаштування мереж скинуто"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Не вдалося видалити SIM-карти"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Під час видалення завантажених SIM-карт сталася помилка.\n\nПерезапустіть пристрій і повторіть спробу."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Стерти всі дані (відновити заводські налаштування)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Стерти всі дані (скинути налаштування)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Буде видалено всі дані з "<b>"внутрішньої пам’яті"</b>" вашого планшета, зокрема:\n\n"<li>"обліковий запис Google;"</li>\n<li>"дані й налаштування системи та додатків;"</li>\n<li>"завантажені додатки."</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Буде видалено всі дані з "<b>"внутрішньої пам\'яті"</b>" вашого телефона, зокрема:\n\n"<li>"обліковий запис Google"</li>\n<li>"дані й налаштування системи та додатків"</li>\n<li>"завантажені додатки"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Наразі ви ввійшли в такі облікові записи:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"На цьому пристрої є інші користувачі.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"музику"</li>\n<li>"фото"</li>\n<li>"інші дані користувача"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM-карти"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Ваш тарифний план не буде скасовано."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"носій USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"карту SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Стерти всі дані (скинути налаштування)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Стерти всі дані (скинути налаштування)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Буде видалено всі дані з "<b>"внутрішньої пам\'яті"</b>" вашого планшета, зокрема:\n\n"<li>"обліковий запис Google;"</li>\n<li>"дані й налаштування системи та додатків;"</li>\n<li>"завантажені додатки."</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Буде видалено всі дані з "<b>"внутрішньої пам\'яті"</b>" вашого телефона, зокрема:\n\n"<li>"обліковий запис Google;"</li>\n<li>"дані й налаштування системи та додатків;"</li>\n<li>"завантажені додатки."</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Наразі ви ввійшли в такі облікові записи:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"На цьому пристрої є інші користувачі.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"музику"</li>\n<li>"фото"</li>\n<li>"інші дані користувача"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM-карти"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Ваш тарифний план не буде скасовано."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"носій USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Щоб видалити музику, зображення й інші дані користувача, треба стерти "<b>"карту SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Очистити носій USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Очистити карту SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Стерти всі дані на внутрішньому носії USB, як-от музику чи фото"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Стерти всі дані на карті SD, такі як музика чи фото."</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Стерти всі дані"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Стерти всі дані"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Усю особисту інформацію та завантажені додатки буде видалено. Цю дію неможливо відмінити."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Усю особисту інформацію, зокрема завантажені додатки й SIM-карти, буде видалено. Цю дію неможливо відмінити."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Видалити все"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Скидання не виконано, оскільки служба очищення системи не доступна."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Стерти всі дані?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Цей користувач не може відновити заводські налаштування"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Стирання"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Зачекайте…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Стерти всі дані"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Стерти всі дані"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Усю особисту інформацію та завантажені додатки буде видалено. Цю дію неможливо відмінити."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Усю особисту інформацію, зокрема завантажені додатки й SIM-карти, буде видалено. Цю дію неможливо відмінити."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Стерти всі дані?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Цей користувач не може скинути налаштування"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Стирання"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Зачекайте…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Виклики"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Налашт. гол.пошту, переадр.викл., парал.викл., ідент.абонента"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB-модем"</string>
@@ -1718,7 +1735,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Режим модема можливий для макс. стількох пристр.: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"Прив\'язку <xliff:g id="DEVICE_NAME">%1$s</xliff:g> буде скасовано."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Телефон як модем Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Надавати доступ до Інтернету через телефон за допомогою USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Надавати доступ до Інтернету через телефон за допомогою Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Надавайте іншим пристроям доступ до Інтернету через мобільне передавання даних за допомогою точки доступу та телефона в режимі модема. Додатки також можуть створювати точку доступу, щоб ділитися вмістом із пристроями поруч."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Надавайте іншим пристроям доступ до Інтернету через Wi-Fi або мобільне передавання даних за допомогою точки доступу й режиму модема. Додатки також можуть створювати точку доступу, щоб ділитися контентом із пристроями поруч."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Довідка"</string>
@@ -1762,6 +1779,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Шукати пристрої Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Дозволити додаткам і сервісам будь-коли шукати пристрої поруч, навіть якщо Bluetooth вимкнено. Це може покращити роботу функцій і сервісів, які використовують геодані."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Служби локації для роботи"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Визначення часового поясу за допомогою геолокації"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Визначення часового поясу за допомогою геолокації"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Дає змогу визначати часовий пояс за геоданими пристрою. На точність можуть впливати інші налаштування геоданих (наприклад, пошук мереж Wi-Fi)."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Увімкнено"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Вимкнено"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Автоматичне визначення часового поясу вимкнено"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Визначення часового поясу за допомогою геолокації вимкнено"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Визначення часового поясу за допомогою геолокації не підтримується"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Ви не можете змінити налаштування визначення часового поясу за допомогою геолокації"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Місцезнах. Wi-Fi і моб. мережі"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Дозвольте програмам користуватися службою визначення місцезнаходження Google, щоб швидше оцінювати ваше місцезнаходження. Анонімна інформація про місцезнаходження збиратиметься та надсилатиметься в Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Місцезнаходження, визначене Wi-Fi"</string>
@@ -1825,6 +1851,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Налаштуйте пароль для Фейсконтроля"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Налаштуйте ключ для Фейсконтролю"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Налаштуйте PIN-код для Фейсконтролю"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Щоб увімкнути біометрію, задайте пароль"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Щоб увімкнути біометрію, задайте ключ"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Щоб увімкнути біометрію, задайте PIN-код"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Забули пароль?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Забули ключ?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Забули PIN-код?"</string>
@@ -2165,13 +2194,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Налаштування субтитрів"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Збільшення"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Область збільшення"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Збільшення ввімкнено"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Виберіть області для збільшення масштабу екрана"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"На весь екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Частина екрана"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Повноекранний і напівекранний режим"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Збільшити весь екран"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Збільшити частину екрана"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Назначити на кнопку спеціальних можливостей?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Збільшення частини екрана потрійним дотиком спричинить затримки під час введення тексту й виконання інших дій.\n\nВикористовувати кнопку спеціальних можливостей для збільшення?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Назначити на кнопку спеціальних можливостей"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Збільшувати потрійним дотиком"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Налаштування збільшення"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Збільшувати потрійним торканням"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Збільшувати кнопкою/жестом"</string>
@@ -2225,11 +2257,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Кнопка живлення закінчує виклик"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Великий курсор"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Вимкнути анімацію"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Монофонічне аудіо"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Об’єднувати канали під час відтворення аудіо"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Баланс аудіо"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Зліва"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Справа"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Монофонічне аудіо"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Об\'єднувати канали під час відтворення аудіо"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Баланс аудіо"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Лівий"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Правий"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"За умовчанням"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 секунд"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 секунд"</string>
@@ -2259,11 +2291,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Вібрація під час сповіщень"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Вібрація під час дзвінків"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Реакція на дотик"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Використовувати <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Відкрити додаток <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Використовувати корекцію кольорів"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Показувати субтитри"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Лише для підтримуваних додатків"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Використовувати <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Відкрити додаток <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Використовувати корекцію кольорів"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Показувати субтитри"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Лише для підтримуваних додатків"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Розмір і стиль субтитрів"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Розмір шрифту: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Інші параметри"</string>
@@ -2295,6 +2327,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Дейтераномалія"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Протаномалія"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Тританомалія"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Відтінки сірого"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Червоний – зелений"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Червоний – зелений"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Синій – жовтий"</string>
@@ -2436,7 +2469,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Обмеження у фоновому режимі"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Дозволити додаткам працювати у фоновому режимі"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Додатку заборонено працювати у фоновому режимі"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Не можна обмежити споживання заряду у фоновому режимі"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Не можна обмежити споживання заряду у фоновому режимі"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Обмежити фонову активність?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Якщо обмежити фонову активність, додаток може працювати неналежним чином"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Оскільки в додатку не передбачено економію заряду акумулятора, його не можна обмежити.\n\nУвімкніть оптимізацію споживання заряду."</string>
@@ -2477,14 +2510,16 @@
     <string name="battery_tip_smart_battery_title" product="tablet" msgid="6813017377960004819">"Подовжте час роботи акумулятора планшета"</string>
     <string name="battery_tip_smart_battery_title" product="device" msgid="4805599360437606335">"Подовжте час роботи акумулятора пристрою"</string>
     <string name="battery_tip_smart_battery_summary" msgid="3592965553502362965">"Увімкніть диспетчер заряду акумулятора"</string>
-    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Увімкніть режим економії заряду акумулятора"</string>
+    <string name="battery_tip_early_heads_up_title" msgid="4411387863476629452">"Увімкніть режим енергозбереження"</string>
     <string name="battery_tip_early_heads_up_summary" msgid="578523794827443977">"Акумулятор може розрядитися швидше, ніж зазвичай"</string>
-    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Режим економії заряду акумулятора ввімкнено"</string>
+    <string name="battery_tip_early_heads_up_done_title" msgid="4413270905575486715">"Режим енергозбереження ввімкнено"</string>
     <string name="battery_tip_early_heads_up_done_summary" msgid="7858923105760361208">"Деякі функції можуть не працювати"</string>
     <string name="battery_tip_high_usage_title" product="default" msgid="2375953293196088319">"Телефон використовується більше, ніж зазвичай"</string>
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Планшет використовується більше, ніж зазвичай"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Пристрій використовується більше, ніж зазвичай"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Акумулятор може розрядитися швидше, ніж зазвичай"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Оптимізація для збереження заряду акумулятора"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Потужність акумулятора тимчасово обмежена. Натисніть, щоб дізнатися більше."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Ваш телефон використовується більше, ніж зазвичай. Акумулятор може розрядитися швидше.\n\nДодатки, які використовують найбільше заряду:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Ваш планшет використовується більше, ніж зазвичай. Акумулятор може розрядитися швидше.\n\nДодатки, які використовують найбільше заряду:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Ваш пристрій використовується більше, ніж зазвичай. Акумулятор може розрядитися швидше.\n\nДодатки, які використовують найбільше заряду:"</string>
@@ -2554,6 +2589,8 @@
       <item quantity="other">%1$d додатка обмежено</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Проблема з лічильником акумулятора"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Не вдалось отримати дані лічильника акумулятора. Натисніть, щоб "<annotation id="url">"дізнатися більше"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Припинити роботу додатка?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Телефон не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб продовжити роботу акумулятора."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Планшет не може нормально керувати зарядом акумулятора, оскільки додаток <xliff:g id="APP">%1$s</xliff:g> утримує його в активному стані.\n\nЩоб вирішити цю проблему, спробуйте припинити роботу додатка.\n\nЯкщо проблема не зникне, можливо, потрібно буде видалити додаток, щоб продовжити роботу акумулятора."</string>
@@ -2626,7 +2663,7 @@
     <string name="battery_sugg_bluetooth_headset" msgid="6495519793211758353">"Спробуйте з’єднатися з іншим пристроєм Bluetooth"</string>
     <string name="battery_desc_apps" msgid="4187483940383266017">"Як програма використовує акумулятор"</string>
     <string name="battery_sugg_apps_info" msgid="4796917242296658454">"Зупиніть або видаліть цю програму"</string>
-    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"Виберіть режим економії заряду акумулятора"</string>
+    <string name="battery_sugg_apps_gps" msgid="7221335088647925110">"Виберіть режим енергозбереження"</string>
     <string name="battery_sugg_apps_settings" msgid="6527223370162382166">"У програмі можуть бути налаштування режиму енергозбереження"</string>
     <string name="battery_desc_users" msgid="1959428568888686847">"Використання акумулятора користувачем"</string>
     <string name="battery_desc_unaccounted" msgid="1649497860893660763">"Невраховане споживання заряду акумулятора"</string>
@@ -2657,7 +2694,7 @@
     <string name="menu_stats_refresh" msgid="6727628139586938835">"Оновити"</string>
     <string name="process_mediaserver_label" msgid="6135260215912215092">"Медіа-сервер"</string>
     <string name="process_dex2oat_label" msgid="1190208677726583153">"Оптимізація додатка"</string>
-    <string name="battery_saver" msgid="7737147344510595864">"Режим економії заряду акумулятора"</string>
+    <string name="battery_saver" msgid="7737147344510595864">"Режим енергозбереження"</string>
     <string name="battery_saver_auto_title" msgid="6789753787070176144">"Вмикати автоматично"</string>
     <string name="battery_saver_auto_no_schedule" msgid="5123639867350138893">"Немає розкладу"</string>
     <string name="battery_saver_auto_routine" msgid="4656495097900848608">"На основі звичного часу заряджання"</string>
@@ -2667,13 +2704,13 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Налаштувати розклад"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Подовжте час роботи акумулятора"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Вимикати, коли заряджено"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Режим економії заряду акумулятора вимкнеться, коли рівень заряду телефона досягне <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Режим енергозбереження буде вимкнено, коли рівень заряду планшета досягне <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Режим енергозбереження буде вимкнено, коли рівень заряду пристрою досягне <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Режим енергозбереження вимкнеться, коли ваш телефон досягне <xliff:g id="PERCENT">%1$s</xliff:g> заряду"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Режим енергозбереження вимкнеться, коли ваш планшет досягне <xliff:g id="PERCENT">%1$s</xliff:g> заряду"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Режим енергозбереження вимкнеться, коли ваш пристрій досягне <xliff:g id="PERCENT">%1$s</xliff:g> заряду"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Увімкнути"</string>
-    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Використовувати режим економії заряду акумулятора"</string>
+    <string name="battery_saver_master_switch_title" msgid="3474312070095834915">"Використовувати режим енергозбереження"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="7857393318205740864">"Вмикати автоматично"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6194649389871448663">"Ніколи"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="4294335680892392449">"коли рівень заряду акумулятора – <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2734,6 +2771,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Скинути"</string>
     <string name="tts_play" msgid="2945513377250757221">"Відтворити"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Адаптивне підключення"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Подовжує час роботи акумулятора й покращує продуктивність пристрою завдяки автоматичному керуванню з\'єднанням із мережею"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Сховище облікових даних"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Установити сертифікат"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Установити сертифікати з носія"</string>
@@ -2745,9 +2784,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Облікові дані користувача"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Переглянути та змінити збережені облікові дані"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Додатково"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Тип сховища"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Апаратне забезпечення"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Лише програмне забезпечення"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Облікові дані недоступні для цього користувача"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Установлено для мережі VPN і додатків"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Установлено для мережі Wi-Fi"</string>
@@ -2763,6 +2799,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Не встановлювати"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Усе одно встановити"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Сертифікат не встановлено"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Дозволити додатку <xliff:g id="APP_NAME">%s</xliff:g> встановлювати сертифікати на цьому пристрої?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"За допомогою цих сертифікатів перелічені нижче додатки та веб-сторінки визначатимуть вашу особу"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Не дозволяти"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Дозволити"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Показати більше"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Додаток для керування сертифікатами"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Немає"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"За допомогою сертифікатів, установлених цим додатком, наведені нижче додатки й веб-сторінки впізнають вас"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Вилучити"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Сигнал екстреного виклику"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Устан. поведінку при розміщ. аварійного виклику"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Резервне копіювання"</string>
@@ -3096,7 +3141,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Робочий профіль не налаштовано"</string>
     <string name="user_admin" msgid="4024553191395768119">"Адміністратор"</string>
     <string name="user_you" msgid="3070562015202859996">"Ви (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Псевдонім"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Можна додати максимум стільки користувачів: <xliff:g id="USER_COUNT">%1$d</xliff:g>"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Лише власник планшетного ПК може керувати користувачами."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Лише власник телефону може керувати користувачами."</string>
@@ -3146,7 +3190,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Оплата через термінал"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Виберіть додаток для платежів. Тоді просто прикладіть телефон тильною стороною до будь-якого термінала зі значком безконтактної оплати."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Більше…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Більше…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Установити платіжний додаток за умовчанням"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Змінити платіжний додаток за умовчанням"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"У терміналі для безконтактного платежу використовувати додаток <xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3216,9 +3260,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Назад"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Далі"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Завершити"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Зробити фото"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Вибрати зображення"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Вибрати фото"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM-карти"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM-карти"</string>
@@ -3230,7 +3271,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Завжди телефонувати через цю SIM-карту"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"SIM-карта для Інтернету"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Виберіть SIM-карту для SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Змінення SIM-карти для мобільного Інтернету. Це може зайняти до хвилини…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Змінення SIM-карти для мобільного Інтернету. Це може зайняти до хвилини…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Телефонувати за допомогою"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Виберіть SIM-карту"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM-карта <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3375,6 +3416,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"послідовність дій, розклад, режим енергозбереження, економія заряду, акумулятор, автоматично, відсоток"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, виклики з розширеними можливостями, виклики в режимі 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"додати мову, додавання мови"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"розмір шрифту"</string>
     <string name="default_sound" msgid="6604374495015245195">"Звук за умовчанням"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Гучність дзвінків і сповіщень: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Гучність, вібросигнал і режим \"Не турбувати\""</string>
@@ -3414,13 +3456,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Увімкнути звуки"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Живі субтитри"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Автоматичні субтитри (медіа)"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Немає"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one">Налаштовано <xliff:g id="ON_COUNT">%d</xliff:g> розклад</item>
-      <item quantity="few">Налаштовано <xliff:g id="ON_COUNT">%d</xliff:g> розклади</item>
-      <item quantity="many">Налаштовано <xliff:g id="ON_COUNT">%d</xliff:g> розкладів</item>
-      <item quantity="other">Налаштовано <xliff:g id="ON_COUNT">%d</xliff:g> розкладу</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Немає}=1{Налаштовано 1 розклад}one{Налаштовано # розклад}few{Налаштовано # розклади}many{Налаштовано # розкладів}other{Налаштовано # розкладу}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Не турбувати"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Отримуйте сповіщення лише від важливих людей і додатків"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Обмеження сповіщень"</string>
@@ -3488,24 +3524,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Лише пріоритетні"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Увімкнено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Вимкнено / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Вимкнено"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Увімкнено"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Запитувати щоразу"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Доки не вимкнути"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> година</item>
-      <item quantity="few"><xliff:g id="NUM_HOURS">%d</xliff:g> години</item>
-      <item quantity="many"><xliff:g id="NUM_HOURS">%d</xliff:g> годин</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> години</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> хв"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> розклад може вмикатись автоматично</item>
-      <item quantity="few"><xliff:g id="ON_COUNT">%d</xliff:g> розклади можуть вмикатись автоматично</item>
-      <item quantity="many"><xliff:g id="ON_COUNT">%d</xliff:g> розкладів можуть вмикатись автоматично</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> розкладу можуть вмикатись автоматично</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 година}one{# година}few{# години}many{# годин}other{# години}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 хвилина}one{# хвилина}few{# хвилини}many{# хвилин}other{# хвилини}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Вимкнено}=1{Вимкнено / 1 розклад може вмикатись автоматично}one{Вимкнено / # розклад може вмикатись автоматично}few{Вимкнено / # розклади можуть вмикатись автоматично}many{Вимкнено / # розкладів можуть вмикатись автоматично}other{Вимкнено / # розкладу може вмикатись автоматично}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Що може переривати режим \"Не турбувати\""</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Люди"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Додатки"</string>
@@ -3551,6 +3575,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Автоматично робити тихими сповіщення з низьким пріоритетом"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Адаптивне сортування сповіщень"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Автоматичне сортування сповіщень за релевантністю"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Відгук про адаптивні сповіщення"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Указує зміни, внесені в сповіщення, і показує опцію для надсилання відгуку в систему"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Скинути важливість сповіщень"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Скинути налаштування важливості, змінені користувачем, і дозволити диспетчеру сповіщень визначати пріоритет"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Пропоновані дії та відповіді"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Автоматично показувати пропоновані дії та відповіді"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Показувати нещодавні й відкладені сповіщення"</string>
@@ -3650,8 +3678,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Важливі розмови"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Показувати вгорі розділу розмов і в спливаючих чатах"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Показувати вгорі розділу розмов"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Інші розмови"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Непріоритетні розмови"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Розмови, у які ви вносили зміни"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Нещодавні розмови"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Очистити нещодавні"</string>
+    <string name="clear" msgid="5092178335409471100">"Очистити"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Показувати важливі чати в спливаючих сповіщеннях"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Важливі чати показуються у верхній частині розкривної панелі. Ви можете налаштувати надсилання спливаючих сповіщень про них, навіть коли ввімкнено режим \"Не турбувати\"."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Тут з\'являтимуться важливі та змінені чати"</string>
@@ -3757,7 +3788,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Доступ у режимі \"Не турбувати\""</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Дозволити доступ у режимі \"Не турбувати\""</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Установлені додатки не запитували доступу до функції \"Не турбувати\""</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Завантаження додатків…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Завантаження додатків…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android блокує сповіщення з цього додатка на цьому пристрої"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"На ваш запит Android блокує цю категорію сповіщень на пристрої"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"На ваш запит Android блокує цю групу сповіщень на пристрої"</string>
@@ -3855,13 +3886,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Усі розмови"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Важливі розмови"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Не дозволено"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> розмова</item>
-      <item quantity="few"><xliff:g id="CONVERSATIONS">%d</xliff:g> розмови</item>
-      <item quantity="many"><xliff:g id="CONVERSATIONS">%d</xliff:g> розмов</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> розмови</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Не дозволено"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Немає}=1{1 чат}one{# чат}few{# чати}many{# чатів}other{# чату}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Хто може переривати"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Дзвінки"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Дзвінки"</string>
@@ -3870,13 +3895,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Щоб напевне дізнаватися про дозволені виклики, переконайтеся, що на телефоні налаштовано режим дзвінка"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Вхідні виклики блокуються, коли активовано розклад \"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\". Ви можете змінити налаштування, щоб потрібні люди могли зв’язатися з вами."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Позначені контакти"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one">Ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="few">Ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="many">Ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-      <item quantity="other">Ще <xliff:g id="NUM_PEOPLE">%d</xliff:g></item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Немає"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Немає}=1{{contact_1}}=2{{contact_1} і {contact_2}}=3{{contact_1}, {contact_2} і {contact_3}}one{{contact_1}, {contact_2} і ще #}few{{contact_1}, {contact_2} і ще #}many{{contact_1}, {contact_2} і ще #}other{{contact_1}, {contact_2} і ще #}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Без імені)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Повідомлення"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"повідомлення"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Повідомлення"</string>
@@ -3885,13 +3905,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>: вхідні повідомлення блокуються. Ви можете змінити налаштування, щоб друзі, члени сім’ї й інші контакти зв’язувалися з вами."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Отримувати всі повідомлення"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Отримувати всі виклики"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Немає"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакт</item>
-      <item quantity="few"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакти</item>
-      <item quantity="many"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контактів</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> контакта</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Немає}=1{1 контакт}one{# контакт}few{# контакти}many{# контактів}other{# контакта}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Усі"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Контакти"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Контакти із зірочками"</string>
@@ -3929,26 +3943,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Усі сповіщення"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Деякі сповіщення"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Вибрані користувачі й надалі зможуть зв\'язуватися з вами, навіть якщо ви ввімкнете для додатків режим \"Не турбувати\""</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Додатки <xliff:g id="APP_NAMES">%s</xliff:g> можуть переривати</item>
-      <item quantity="few">Додатки <xliff:g id="APP_NAMES">%s</xliff:g> можуть переривати</item>
-      <item quantity="many">Додатки <xliff:g id="APP_NAMES">%s</xliff:g> можуть переривати</item>
-      <item quantity="other">Додатки <xliff:g id="APP_NAMES">%s</xliff:g> можуть переривати</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Ще <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Додатки не можуть переривати}=1{Додаток {app_1} може переривати}=2{Додатки {app_1} і {app_2} можуть переривати}=3{Додатки {app_1}, {app_2} і {app_3} можуть переривати}one{Додатки {app_1}, {app_2} і ще # можуть переривати}few{Додатки {app_1}, {app_2} і ще # можуть переривати}many{Додатки {app_1}, {app_2} і ще # можуть переривати}other{Додатки {app_1}, {app_2} і ще # можуть переривати}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Додатки"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Усі сповіщення"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Деякі сповіщення"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Сповіщення, які можуть переривати"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Дозволити всі сповіщення"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> можуть переривати</item>
-      <item quantity="few"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> можуть переривати</item>
-      <item quantity="many"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> можуть переривати</item>
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> можуть переривати</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Ніщо не може переривати"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Ще <xliff:g id="NUMBER">%d</xliff:g>"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Ніщо не може переривати}=1{Звук \"{sound_category_1}\" може переривати}=2{Звуки \"{sound_category_1}\" і \"{sound_category_2}\" можуть переривати}=3{Звуки \"{sound_category_1}\", \"{sound_category_2}\" і \"{sound_category_3}\" можуть переривати}one{Звуки \"{sound_category_1}\", \"{sound_category_2}\" і ще # можуть переривати}few{Звуки \"{sound_category_1}\", \"{sound_category_2}\" і ще # можуть переривати}many{Звуки \"{sound_category_1}\", \"{sound_category_2}\" і ще # можуть переривати}other{Звуки \"{sound_category_1}\", \"{sound_category_2}\" і ще # можуть переривати}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Ніщо не може переривати"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Ніхто не може переривати"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Деякі люди можуть переривати"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Усі люди можуть переривати"</string>
@@ -3998,8 +4000,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Увімкнено"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Вимкнено"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Закріплення додатка"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Закріплення додатка дає змогу залишити поточний додаток на екрані, доки ви його не відкріпите. Цю функцію можна використовувати, наприклад, щоб дозволити другові зіграти лише в певну гру. \n\nЗакріплений додаток матиме змогу відкривати інші додатки й отримувати доступ до персональних даних. \n\nЩоб використовувати закріплення додатка: 	\n1.	Увімкніть закріплення додатка 	\n2.	Відкрийте \"Огляд\" 	\n3.	Натисніть значок додатка вгорі екрана й виберіть \"Закріпити\""</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Закріплення додатка дає змогу залишити поточний додаток на екрані, доки ви його не відкріпите. Цю функцію можна використовувати, наприклад, щоб дозволити другові зіграти лише в певну гру. \n\nЗакріплений додаток матиме змогу відкривати інші додатки й отримувати доступ до персональних даних. \n\nЯкщо ви хочете без ризику використовувати пристрій разом з іншим користувачем, натомість використовуйте режим гостя. \n\nЩоб використовувати закріплення додатка: 	\n1.	Увімкніть закріплення додатка 	\n2.	Відкрийте \"Огляд\" 	\n3.	Натисніть значок додатка вгорі екрана й виберіть \"Закріпити\""</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Ви бачитимете закріплений додаток на екрані, поки не відкрипите його. Цю функцію можна використовувати, наприклад, щоб дозволити другові зіграти в певну гру."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Закріплений додаток матиме змогу відкривати інші додатки й отримувати доступ до персональних даних. \n\nЩоб використовувати закріплення додатка: 	\n1.	Увімкніть закріплення додатка 	\n2.	Відкрийте \"Огляд\" 	\n3.	Натисніть значок додатка вгорі екрана й виберіть \"Закріпити\""</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Закріплений додаток матиме змогу відкривати інші додатки й отримувати доступ до персональних даних. \n\nЯкщо ви хочете без ризику надавати іншому користувачу доступ до пристрою, натомість використовуйте режим гостя. \n\nЩоб використовувати закріплення додатка: 	\n1.	Увімкніть закріплення додатка 	\n2.	Відкрийте \"Огляд\" 	\n3.	Натисніть значок додатка вгорі екрана й виберіть \"Закріпити\""</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Якщо додаток закріплено, він може: \n\n•		отримувати доступ до персональних даних \n		(наприклад, до контактів або електронних листів); \n•		відкривати інші додатки. \n\nВикористовуйте закріплення додатка лише спільно з людьми, яким довіряєте."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Ключ розблокування перед відкріпленням"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"PIN-код для відкріплення"</string>
@@ -4021,6 +4024,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Якщо ви розблоковуєте пристрій за допомогою розпізнавання обличчя, можна додатково захистити його, увімкнувши запит PIN-коду перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати PIN-код перед запуском?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Якщо ви розблоковуєте пристрій за допомогою розпізнавання обличчя, можна додатково захистити його, увімкнувши запит ключа перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати ключ перед запуском?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Якщо ви розблоковуєте пристрій за допомогою розпізнавання обличчя, можна додатково захистити його паролем перед запуском. Доки пристрій не запуститься, він не прийматиме виклики, повідомлення чи сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи вкрадених пристроях. Запитувати пароль перед запуском пристрою?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Якщо ви розблоковуєте пристрій за допомогою біометричних даних, можна додатково захистити його, увімкнувши запит PIN-коду перед запуском. Доки пристрій не запуститься, дзвінки, повідомлення, сповіщення й будильники будуть недоступні.\n\nЦе допомагає захистити дані на загублених чи вкрадених пристроях. Запитувати PIN-код перед запуском пристрою?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Якщо ви розблоковуєте пристрій за допомогою біометричних даних, можна додатково захистити його, увімкнувши запит ключа перед запуском. Доки пристрій не запуститься, дзвінки, повідомлення, сповіщення й будильники будуть недоступні.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати ключ перед запуском?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Якщо ви розблоковуєте пристрій за допомогою біометричних даних, можна додатково захистити його, увімкнувши запит пароля перед запуском. Доки пристрій не запуститься, дзвінки, повідомлення, сповіщення й будильники будуть недоступні.\n\nЦе допомагає захистити дані на загублених чи вкрадених пристроях. Запитувати пароль перед запуском пристрою?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Так"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Ні"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Обмежено"</string>
@@ -4212,7 +4218,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB керує"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Підключений пристрій"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Цей пристрій"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Змінюється…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Переключення…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Не вдалося змінити"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Заряджання пристрою"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Заряджання під’єднаного пристрою"</string>
@@ -4414,6 +4420,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Мобільний трафік"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Використання трафіку додатками"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Трафік Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Використання трафіку не через мобільний Інтернет"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Використання трафіку Ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4434,6 +4441,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> обмеження</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Оператор може по-іншому вимірювати статистику використання трафіку"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Не включає дані, що використовуються в мережах операторів мобільного зв\'язку"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Використано <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Сповіщення щодо трафіку"</string>
     <string name="data_warning" msgid="2925054658166062884">"Застереження про трафік"</string>
@@ -4473,7 +4481,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Докладніше"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Заощадження трафіку"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Необмежені дані"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Фоновий режим вимкнено"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Фоновий режим вимкнено"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Увімкнено"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Вимкнено"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Увімкнути Заощадження трафіку"</string>
@@ -4496,7 +4504,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Заборонити введення відповідей чи іншого тексту в сповіщеннях, якщо пристрій заблоковано"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Стандартна перевірка правопису"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Вибрати перевірку правопису"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Використовувати перевірку правопису"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Використовувати перевірку правопису"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Не вибрано"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(немає)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4594,7 +4602,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Щоб звільнити місце, менеджер сховища видаляє з пристрою фото й відео, для яких є резервні копії."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Видалити фото й відео"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Менеджер сховища"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Використовувати менеджер сховища"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Використовувати менеджер сховища"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Автоматично"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Вручну"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Звільнити місце"</string>
@@ -4632,6 +4640,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Двічі торкнутися, щоб перевірити сповіщення"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Двічі торкніться, щоб перевірити планшет"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Двічі торкніться, щоб перевірити пристрій"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Як переглянути сповіщення"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Щоб переглянути сповіщення, проведіть пальцем до нижнього краю екрана"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Режим керування однією рукою"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Використовувати режим керування однією рукою"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Вимикати після зміни додатка"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Час очікування"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 секунди"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 секунд"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 секунд"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"доступність"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Щоб перевірити час, сповіщення та іншу інформацію, двічі торкніться екрана."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Підняти, щоб перевірити телефон"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Підніміть планшет, щоб перевірити його"</string>
@@ -4644,6 +4662,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Торкніться, щоб перевірити планшет"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Торкніться, щоб перевірити пристрій"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Щоб перевірити час, сповіщення та іншу інформацію, торкніться екрана."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Екстрене сповіщення"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Використовувати екстрене сповіщення"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Керує <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Щоб розпочати вказані нижче дії, швидко натисніть кнопку живлення принаймні 5 разів"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Відтворювати сигнал зворотного відліку"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Відтворювати гучний сигнал перед зверненням по допомогу"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Виклик служби екстреної допомоги"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Номер телефону екстреної служби"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Натисніть, щоб змінити"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Якщо введений номер не належить екстреній службі:\n • Щоб викликати службу допомоги, потрібно розблокувати телефон\n • Ви можете не отримати відповіді"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Використовувати відбиток пальця для перегляду сповіщень"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Сканер відбитків"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Щоб переглянути сповіщення, проведіть пальцем униз по сканеру відбитків на задній панелі телефона."</string>
@@ -4783,6 +4811,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Максимальні видимі набори даних"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Відновити значення за умовчанням"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Скинуто параметри автозаповнення, які вказав розробник"</string>
+    <string name="location_category" msgid="3496759112306219062">"Місцезнаходження"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Індикатор місцезнаходження в рядку стану"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Показати всі місцезнаходження, зокрема отримані з даних про мережі й підключення"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Увімкнути повне вимірювання GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Відстежувати всі фотосхеми й частоти GNSS без застосування циклічного режиму"</string>
     <string name="device_theme" msgid="5027604586494772471">"Тема пристрою"</string>
     <string name="default_theme" msgid="4815428567082263639">"За умовчанням"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Назва мережі"</string>
@@ -4799,8 +4832,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Призупинити сповіщення, щоб не відволікатися"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Функція недоступна"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Цю функцію вимкнено, оскільки вона сповільнює роботу телефона"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Увімкнути повне вимірювання GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Відстежувати всі фотосхеми й частоти GNSS без застосування циклічного режиму"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Завжди показувати вікно збоїв"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Показувати вікно під час кожного збою додатка"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Виберіть додаток із підтримкою ANGLE"</string>
@@ -4812,7 +4843,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Увімкнути для всіх додатків"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Вибрати графічний драйвер"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"За умовчанням"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Ігровий драйвер"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Графічний драйвер для ігор"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Драйвер для розробників"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Системний графічний драйвер"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4868,7 +4899,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Увімкнено (вимкнено звук)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Вимкнено"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Дані мережі"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Додатки на телефоні бачать назву пристрою. Її також можуть бачити інші люди, коли ви під’єднуєтеся до пристроїв Bluetooth або налаштовуєте точку доступу Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Назва пристрою відображається в додатках на телефоні. Її також можуть бачити інші люди, коли ви підключаєтеся до пристроїв Bluetooth або налаштовуєте точку доступу Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Пристрої"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Усі налаштування"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Пропозиції"</string>
@@ -4881,6 +4912,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Не вдалося знайти мережу. Повторіть спробу."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(заборонено)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Немає SIM-карти"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM-карта"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Немає SIM-карти"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Не вказано"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Щоб підключитись, вставте SIM-карту"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Щоб підключитись, вставте SIM-карту <xliff:g id="WIRELESS_CARRIER">%s</xliff:g>"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Рекомендований режим мережі: бажано WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Рекомендований режим мережі: лише GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Рекомендований режим мережі: лише WCDMA"</string>
@@ -4934,6 +4970,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Мобільне передавання даних"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Доступ до Інтернету через мобільну мережу"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Телефон автоматично перемикатиметься на цього оператора в зоні його покриття"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Немає SIM-карти"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Параметри викликів"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Налаштування SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Запитувати щоразу"</string>
@@ -4996,6 +5033,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Недоступно, коли підключено до оператора <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Докладніше"</string>
     <string name="see_less" msgid="2642392725363552793">"Показати менше"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Увімкнути оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Увімкнути SIM-карту?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Вибрати оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Вибрати SIM-карту?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Активною може бути лише одна SIM-карта.\n\nЯкщо ви виберете оператора <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, сервіс оператора <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> не буде скасовано."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Активною може бути лише одна завантажена SIM-карта.\n\nЯкщо ви виберете оператора <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, сервіс оператора <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> не буде скасовано."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Активною може бути лише одна SIM-карта.\n\nЯкщо ви виберете іншого оператора, сервіс оператора <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> не буде скасовано."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Вибрати оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Підключення до мережі…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Активується сервіс оператора <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Не вдається змінити оператора"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Не вдалося змінити оператора через помилку."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Вимкнути оператора \"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>\"?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Вимкнути SIM-карту?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Вимкнення SIM-карти<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Не вдається вимкнути оператора"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Сталася помилка. Не вдалося вимкнути оператора."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Використовувати дві SIM-карти?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"На цьому пристрої можна водночас використовувати дві активні SIM-карти. Щоб і надалі використовувати лише одну SIM-карту, виберіть \"Ні, дякую\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Перезапустити пристрій?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Щоб почати роботу, перезапустіть пристрій. Тоді ви зможете додати ще одну SIM-карту."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Продовжити"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Перезапустити"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Ні, дякую"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Вибрати"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Не вдається активувати SIM-карту"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Вийміть SIM-карту та вставте її знову. Якщо проблема не зникне, перезапустіть пристрій."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Спробуйте знову ввімкнути SIM-карту. Якщо проблема не зникне, перезапустіть пристрій."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Активація мережі"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> активовано"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Натисніть, щоб оновити налаштування SIM-карти"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM-карта"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Видалити цю завантажену SIM-карту?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Якщо ви видалите цю SIM-карту, послугу оператора \"<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>\" буде скасовано на цьому пристрої.\n\nПослугу оператора \"<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>\" не буде скасовано."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Видалити"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Видалення SIM-карти…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Не вдалося видалити SIM-карту"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Під час видалення SIM-карти сталася помилка.\n\nПерезапустіть пристрій і повторіть спробу."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Підключитися до пристрою"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Додаток <xliff:g id="APPNAME">%1$s</xliff:g> запитує дозвіл підключитися до пристрою через тимчасову мережу Wi‑Fi"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Немає пристроїв. Переконайтеся, що пристрої ввімкнені й готові до з’єднання."</string>
@@ -5071,6 +5146,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Екстрені виклики"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Ваш оператор не підтримує екстрені виклики через Wi-Fi.\nПід час таких викликів пристрій автоматично перемикається на мобільну мережу.\nЕкстрені виклики можна здійснювати лише в зонах покриття мобільної мережі."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Телефонувати через Wi-Fi для якісніших викликів"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Виклики між SIM-картами"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Дозвольте виклики й SMS для іншої SIM-карти через цю SIM-карту."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"виклики між SIM-картами"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Вхідне MMS-повідомлення"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Не вдається надіслати MMS-повідомлення"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Торкніться, щоб увімкнути MMS-повідомлення для оператора <xliff:g id="OPERATOR_NAME">%1$s</xliff:g>, коли мобільне передавання даних вимкнено"</string>
@@ -5122,10 +5200,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Дозволити показ поверх інших вікон у налаштуваннях"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Дозволити додаткам, що можуть показуватися поверх інших додатків, накладатися на екрани налаштувань"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Медіа"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Приховати програвач після завершення медіасеансу"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Програвач дає змогу відновлювати сеанси з розгорнутої панелі Швидких налаштувань."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Медіапрогравач в \"Швидких налаштуваннях\""</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Показувати медіапрогравач протягом тривалого часу, щоб швидко відновлювати відтворення"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Приховати програвач"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Показати програвач"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Немає доступних програвачів"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Дозволені додатки"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"медіа"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Увімкнеться Bluetooth"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Увімкнено"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Вимкнено"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Інтернет"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM-карти"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Безпечні мережі в літаку"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Знаходьте безпечні мережі в літаку й підключайтеся до них"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"літак, безпечний у літаку"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Дзвінки та SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Дзвінки через Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Здійснюйте й отримуйте дзвінки через мережі Wi‑Fi, а не операторів мобільного зв\'язку"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Завдяки функції \"Дзвінки через Wi-Fi\" ви можете здійснювати та отримувати дзвінки не лише через мережі операторів мобільного зв\'язку, а й через Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Дзвінки"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"пріоритетні"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"пріоритетні дзвінки"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"пріоритетні SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"недоступно"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Немає SIM-карти"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Параметри"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Підключатися до загальнодоступних мереж"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"з\'єднання з мережею, Інтернет, бездротове, дані, Wi-Fi, wi-fi, wi fi, мобільний, стільниковий, оператор мобільного зв\'язку, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Показати безпечні в літаку мережі"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Вимкнути режим польоту"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Недоступно в нічному режимі"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Пріоритет сповіщень скинуто."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Додатки"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Ненадійний пристрій хоче отримати доступ до ваших повідомлень. Натисніть, щоб дізнатися більше."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Дозволити доступ до повідомлень?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Ненадійний пристрій із Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] хоче отримати доступ до ваших повідомлень.\n\nВи ще не підключалися до пристрою [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Ненадійний пристрій хоче отримати доступ до ваших контактів і журналу викликів. Натисніть, щоб дізнатися більше."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Дозволити доступ до контактів і журналу викликів?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Ненадійний пристрій із Bluetooth [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] хоче отримати доступ до ваших контактів і журналу викликів, зокрема даних про вхідні й вихідні виклики.\n\nВи ще не підключалися до пристрою [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index cee2d51..b793f63 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"متوسط"</item>
     <item msgid="6740026006576843477">"طویل"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"مختصر"</item>
+    <item msgid="7397961711906421599">"متوسط"</item>
+    <item msgid="4079132024502041928">"طویل"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"ڈیفالٹ"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"عالمی"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"‏صرف TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"عالمی"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 77b576a..77318ba 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"تاریخ اور وقت"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"تاریخ اور وقت سیٹ کریں"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"تاریخ، وقت، ٹائم زون اور فارمیٹس کو سیٹ کریں"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"نیٹ ورک کے ذریعے فراہم کردہ وقت استعمال کریں"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"نیٹ ورک کی جانب سے فراہم کردہ ٹائم زون استعمال کریں"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"خودکار طور پر وقت سیٹ کریں"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"خودکار طور پر ٹائم زون سیٹ کریں"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"مقامی ڈیفالٹ کا استعمال کریں"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 گھنٹے کا فارمیٹ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 گھنٹے کا فارمیٹ استعمال کریں"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"مقفل سکرین پر پروفائل کی معلومات دکھائیں"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"اکاؤنٹس"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"مقام"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"مقام استعمال کریں"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"مقام استعمال کریں"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"آف ہے"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other"> - <xliff:g id="COUNT_1">%1$d</xliff:g> ایپس کو مقام تک رسائی حاصل ہے</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"اسکرین لاک، چہرے کے ذریعے غیر مقفل کرنا"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"اسکرین لاک، فنگر پرنٹ"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"اسکرین لاک"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"اپنے فون کو اپنے چہرے اور فنگر پرنٹ کے ساتھ محفوظ طریقے سے غیر مقفل کریں"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"آپ ایپس میں بھی سائن ان اور ادائیگیوں کی تصدیق کرسکتے ہیں"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"اس کے ذریعے غیر مقفل کو سیٹ کریں:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"چہرے کے ذریعے غیر مقفل کریں"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"اپنا فون غیر مقفل کرنا آسان بنائیں"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"فنگر پرنٹ"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"اپنی جیب میں فون کو غیر مقفل کر کے وقت کی بچت کریں"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"نظر انداز کریں"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"آگے"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"چہرہ شامل کر دیا گیا"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"چہرے کے ذریعے غیر مقفل کرنا سیٹ اپ کریں"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"چہرے کے ذریعے غیر مقفل کریں"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"تصدیق کرنے کے لیے اپنا چہرہ استعمال کریں"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"شروع کریں"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"‏اگر ایکسیسبیلٹی چہرے کے ذریعے غیر مقفل آف ہو، تو ہو سکتا ہے کہ کچھ سیٹ اپ اقدامات TalkBack کے ساتھ صحیح طریقے سے کام نہ کرے۔"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"واپس جائیں"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"سیٹ اپ جاری رکھیں"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"ایکسیسبیلٹی سیٹ اپ استعمال کریں"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"ایپس میں چہرے کے ذریعے غیر مقفل استعمال کرتے وقت، ہمیشہ تصدیق طلب کریں"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"چہرے کا ڈیٹا حذف کریں"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"چہرے کے ذریعے غیر مقفل کرنا سیٹ اپ کریں"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"اپنے آلہ کو غیر مقفل، ایپس میں سائن ان اور ادائیگیوں کی تصدیق کرنے کے لیے چہرے کے ذریعے غیر مقفل کرنے کا استعمال کریں۔\n\nذہن میں رکھیں:\nجب آپ کا ارادہ نہ ہو تو فون کو دیکھنا اسے غیر مقفل کر سکتا ہے۔\n\nکوئی اور شخص فون کو آپ کے چہرے کے سامنے رکھ کر آپ کے فون کو غیر مقفل کر سکتا ہے۔\n\nآپ کی طرح بہت زيادہ نظر آنے والے کسی بھی شخص، جیسے، آپ کے بھائی بہن کے ذریعے آپ کا فون غیر مقفل کیا جا سکتا ہے۔"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"اپنے آلہ کو غیر مقفل، ایپس میں سائن ان اور ادائیگیوں کی تصدیق کرنے کیلئے \'چہرے کے ذریعے غیر مقفل کرنے\' کا استعمال کریں۔\n\nیاد رکھیں:\nجب آپ کا ارادہ نہ بھی ہو تب بھی فون پر دیکھنے سے وہ غیر مقفل ہو سکتا ہے۔\n\nآپ کی آنکھیں بند ہونے پر بھی، کوئی اور شخص فون کو آپ کے چہرے کے سامنے رکھ کر آپ کے فون کو غیر مقفل کر سکتا ہے۔\n\nآپ سے بہت زیادہ مشابہ کوئی بھی شخص، جیسے کوئی ہم شکل بھائی بہن، آپ کے فون کو غیر مقفل کر سکتا ہے۔"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"اپنے آلہ کو غیر مقفل، ایپس میں سائن ان اور ادائیگیوں کی تصدیق کرنے کے لیے چہرے کے ذریعے غیر مقفل کرنے کا استعمال کریں۔"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"ذہن میں رکھیں:\nجب آپ کا ارادہ نہ ہو تو فون کو دیکھنا اسے غیر مقفل کر سکتا ہے۔\n\nکوئی اور شخص فون کو آپ کے چہرے کے سامنے رکھ کر آپ کے فون کو غیر مقفل کر سکتا ہے۔\n\nآپ کی طرح بہت زيادہ نظر آنے والے کسی بھی شخص، جیسے، آپ کے بھائی بہن کے ذریعے آپ کا فون غیر مقفل کیا جا سکتا ہے۔"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"ذہن میں رکھیں:\nجب آپ کا ارادہ نہ ہو تو فون کو دیکھنا اسے غیر مقفل کر سکتا ہے۔\n\nکوئی اور شخص فون کو آپ کے چہرے کے سامنے رکھ کر آپ کے فون کو غیر مقفل کر سکتا ہے اگر چہ آپ کی آنکھیں بند ہوں۔\n\nآپ کی طرح بہت زيادہ نظر آنے والے کسی بھی شخص، جیسے، آپ کے بھائی بہن کے ذریعے آپ کا فون غیر مقفل کیا جا سکتا ہے۔"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"چہرے کا ڈیٹا حذف کریں؟"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"‏چہرے کے ذریعے غیر مقفل کرنے کی خصوصیت کے ذریعے استعمال کردہ چہرے کے ڈیٹا کو مکمل طور پر اور محفوظ طریقے سے حذف کر دیا جائے گا۔ ہٹانے کے بعد، آپ کو اپنا فون غیر مقفل کرنے، ایپس میں سائن ان کرنے اور ادائیگیوں کی تصدیق کرنے کے لیے اپنا PIN، پیٹرن یا پاس ورڈ درکار ہوگا۔"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"اپنے فون کو غیر مقفل کرنے کے لیے \'چہرے کے ذریعے غیر مقفل کریں\' کا استعمال کریں"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"اپنا فون غیرمقفل کرنے یا خریداریاں منظور کرنے کے لیے اپنے فنگر پرنٹ کا استعمال کریں۔\n\nنوٹ: آپ اس آلہ کو غیرمقفل کرنے کے لیے اپنا فنگر پرنٹ استعمال نہیں کر سکتے۔ مزید معلومات کے لیے، اپنی تنظیم کے منتظم سے رابطہ کریں۔"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"‏اپنا فون غیرمقفل کرنے یا خریداریاں منظور کرنے کے لیے اپنے فنگر پرنٹ کا استعمال کریں۔\n\nنوٹ: ایک طاقتور پیٹرن یا PIN کی بنسبت آپ کا فنگر پرنٹ شاید کم محفوظ ہو۔"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"منسوخ کریں"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"نہیں شکریہ"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"جاری رکھیں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"نظر انداز کریں"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"آگے جائیں"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"اگر آپ اپنے ٹیبلیٹ کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں، تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ چہرے کے ذریعے غیر مقفل کرنے کو سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"اگر آپ اپنے آلہ کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں، تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ چہرے کے ذریعے غیر مقفل کرنے کو سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"اگر آپ اپنے فون کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں، تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ چہرے کے ذریعے غیر مقفل کرنے کو سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"اگر آپ اپنے ٹیبلیٹ کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ بایو میٹرکس سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"اگر آپ اپنے آلے کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ بایو میٹرکس سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"اگر آپ اپنے فون کو اسکرین لاک کے اختیار سے محفوظ رکھتے ہیں تو گم یا چوری ہونے پر بھی کوئی اس کا استعمال نہیں کر پائے گا۔ بایو میٹرکس سیٹ اپ کرنے کے لیے آپ کو اسکرین لاک اختیار کی بھی ضرورت ہے۔ پیچھے جانے کے لیے، منسوخ کريں پر تھپتھپائیں۔"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"‏PIN سیٹ اپ کو نظر انداز کریں؟"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"پاس ورڈ کے سیٹ اپ نظر انداز کریں؟"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"پیٹرن کے سیٹ اپ نظر انداز کریں؟"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ ٹیبلیٹ استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ آلہ استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"آلہ کے تحفظ کی خصوصیات فعال کر کے اپنی اجازت کے بغیر دوسروں کو یہ فون استعمال کرنے سے روکیں۔ وہ اسکرین قفل منتخب کریں جو آپ استعمال کرنا چاہتے ہیں۔"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"اسکرین مقفل کرنے کا اپنا بیک اپ طریقہ کار منتخب کریں"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"اسکرین مقفل کرنے کا اپنا بیک اپ طریقہ منتخب کریں"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"اسکرین مقفل کرنے کا اپنا بیک اپ طریقہ منتخب کریں"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"اسکرین لاک کے اختیارات"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"اسکرین لاک کے اختیارات"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"اسکرین لاک"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"چہرے کے ذریعے غیر مقفل کرنا + پاس ورڈ"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"چہرے کے ذریعے غیر مقفل کیے بغیر جاری رکھیں"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"آپ اپنے فون کو اپنا چہرہ استعمال کر کے غیر مقفل کر سکتے ہیں۔ سیکیورٹی کے مد نظر، اس اختیار کو ایک بیک اپ اسکرین لاک درکار ہے۔"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"بایو میٹرکس + پیٹرن"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"‏بایو میٹرکس + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"بایو میٹرکس + پاس ورڈ"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"بایو میٹرکس کے بغیر جاری رکھیں"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"آپ اپنے بایو میٹرکس کا استعمال کر کے اپنے فون کو غیر مقفل کر سکتے ہیں۔ سیکیورٹی کے مد نظر، اس اختیار کو ایک بیک اپ اسکرین لاک درکار ہے۔"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"منتظم، مرموز کاری کی پالیسی یا اسناد اسٹوریج کے ذریعے غیر فعال کردہ"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"کوئی نہیں"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"سوائپ"</string>
@@ -619,7 +640,6 @@
       <item quantity="one"><xliff:g id="NUMBER_0">%d</xliff:g> ہندسے سے کم ہونا چاہیے</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"‏آلہ کا منتظم ایک حالیہ PIN استعمال کرنے کی اجازت نہیں دیتا ہے"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"‏آپ کے IT منتظم نے عمومی PINs کو مسدود کر دیا ہے۔ کوئی دوسرا PIN آزمائیں۔"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"اس میں غلط کریکٹر شامل نہیں ہو سکتا"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"کم از کم ایک حرف پر مشتمل ہونا چاہیئے"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"کم از کم ایک ہندسہ پر مشتمل ہونا چاہیے"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">کم از کم 1 غیر عددی حرف ہونا چاہیے</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"آلے کا منتظم ایک حالیہ پاس ورڈ کا استعمال کرنے کی اجازت نہیں دیتا ہے"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"‏آپ کے IT منتظم نے عمومی پاس ورڈز کو مسدود کر دیا ہے۔ کوئی دوسرا پاس ورڈ آزمائیں۔"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"ہندسوں کی صعودی، نزولی یا مکرر ترتیب کی اجازت نہیں ہے"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"تصدیق کریں"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"منسوخ کریں"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"‏Wi‑Fi آن کریں"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"‏Wi-Fi استعمال کریں"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"‏Wi-Fi کا استعمال کریں"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"‏Wi‑Fi ترتیبات"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"وائرلیس رسائی پوائنٹس کو ترتیب دیں اور ان کا نظم کریں"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"‏\"<xliff:g id="SSID">%1$s</xliff:g>\" سے منسلک کرنے کے لیے مندرجہ ذیل QR کوڈ کو مرکز میں رکھیں"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"‏QR کوڈ اسکین کر کے Wi-Fi میں شامل ہوں"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"‏Wi-Fi کا اشتراک کریں"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"‏”<xliff:g id="SSID">%1$s</xliff:g>“ سے منسلک ہونے کے لیے اس QR کوڈ کو اسکین کریں اور پاس ورڈ کا اشتراک کریں"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"‏“<xliff:g id="SSID">%1$s</xliff:g>” میں شامل ہونے کے لیے QR کوڈ کو دوسرے آلہ کے ذریعے اسکین کریں"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"‏”<xliff:g id="SSID">%1$s</xliff:g>“ سے منسلک ہونے کے لیے یہ QR کوڈ اسکین کریں"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"دوبارہ کوشش کریں۔ اگر مسئلہ جاری رہتا ہے تو آلہ کے صنعت کار سے رابطہ کریں"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"کچھ غلط ہو گیا"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"‏Wi-Fi کا پاس ورڈ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"ہاٹ اسپاٹ کا پاس ورڈ: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"خود کار طور پر منسلک کریں"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"فون کو خود کار طور پر اس نیٹ ورک کے قریب منسلک ہونے کی اجازت دیں"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"ٹیبلیٹ کو خود کار طور پر اس نیٹ ورک کے قریب منسلک ہونے کی اجازت دیں"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"رینج میں ہونے پر اس نیٹ ورک سے کنکشن کی اجازت دیں"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"آلہ شامل کریں"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"‏اس نیٹ ورک میں کوئی آلہ شامل کرنے کے لیے QR کوڈ استعمال کریں"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"‏QR کوڈ درست فارمیٹ نہیں ہے"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"سسٹم سرٹیفکیٹس استعمال کریں"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"فراہم نہ کریں"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"توثیق نہ کریں"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"کوئی سرٹیفیکیٹ متعین نہیں کیا گیا۔ آپ کا کنکشن نجی نہیں ہو گا۔"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"نیٹ ورک کا نام کافی بڑا ہے۔"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"کوئی ڈومین مختص کرنا لازمی ہے۔"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"سرٹیفکیٹ درکار ہے۔"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"مربوط کریں"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"‏Wi‑Fi کو آن کر دیا گیا"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> سے منسلک کردہ"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> سے منسلک ہو رہا ہے"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"منسلک ہو رہا ہے…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"نیٹ ورک سے مربوط ہونے میں ناکام رہا"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"نیٹ ورک رینج میں نہیں ہے"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"‏آلہ کا MAC پتہ"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"‏بے ترتیب MAC پتہ"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"‏بے ترتیب MAC پتہ (آخری بار استعمال کیا گيا)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"‏IP پتہ"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"نیٹ ورک کی تفصیلات"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"سب نیٹ ماسک"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"‏IPv6  پتے"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"محفوظ کردہ نیٹ ورکس"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"سبسکرپشنز"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"دیگر نیٹ ورکس"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"‏IP ترتیبات"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"‏اس صارف کیلئے Wi‑Fi کی اعلی ترتیبات دستیاب نہیں ہیں"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"محفوظ کریں"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"ایک درست گیٹ وے پتہ ٹائپ کریں۔"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"‏ایک درست DNS پتہ ٹائپ کریں۔"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"0 اور 32 کے طوالت کے درمیان ایک نیٹ ورک سابقہ ٹائپ کریں۔"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"‏DNS ‫1 (جب تک نجی DNS نے اوور رائیڈ نہ کیا ہو)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"‏DNS ‫2 (جب تک نجی DNS نے اوور رائیڈ نہ کیا ہو)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"گیٹ وے"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"نیٹ ورک کے سابقہ کی لمبائی"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"‏Wi-Fi ڈائریکٹ"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"ایپ مواد کا اشتراک کر رہی ہے۔ انٹرنیٹ کنکشن کا اشتراک کرنے کیلئے، ہاٹ اسپاٹ آف کر کے پھر آن کریں"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"کوئی پاس ورڈ سیٹ نہیں ہے"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"ہاٹ اسپاٹ کا نام"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> آن ہو رہا ہے..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> آن ہو رہا ہے…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"دیگر آلات <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> سے منسلک ہو سکتی ہیں"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"ہاٹ اسپاٹ کا پاس ورڈ"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"‏AP بینڈ"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"ہموار ڈسپلے"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"‏کچھ مواد کے لیے 60 سے 90 Hz تک ریفریش کی شرح خودکار طور پر بڑھ جاتی ہے۔ بیٹری کے استعمال میں اضافہ کرتا ہے۔"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"ہموار ڈسپلے"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"‏زبردستی 90 Hz ریفریش کی شرح"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"اعلی ترین ریفریش کرنے کی بہتر شرح کے ليے ٹچ کی کارکردگی اور اینیمیشن کوالٹی۔ بیٹری کے استعمال میں اضافہ کرتا ہے۔"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"اسکرین پر توجہ"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"اگر آپ آن اسکرین دیکھ رہے ہیں تو یہ آف نہیں ہوگی"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"اسکرین گہری ہونے پر، یہ نئی اطلاعات کے لیے آن ہو جاتی ہے"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"ہمیشہ وقت اور معلومات دکھائیں"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"اضافی بیٹری کا استعمال"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"بولڈ ٹیکسٹ"</string>
     <string name="title_font_size" msgid="570613010306330622">"فونٹ سائز"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"متن کو چھوٹا یا بڑا کریں"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"‏SIM کارڈ لاک کی ترتیبات"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"‏Android ورژن"</string>
     <string name="security_patch" msgid="4071756145347865382">"‏Android سیکیورٹی اپ ڈیٹ"</string>
     <string name="model_info" msgid="8997566254717810904">"ماڈل"</string>
-    <string name="model_summary" msgid="2246651782442466213">"‏ماڈل: ‎%1$s‎‎"</string>
     <string name="hardware_info" msgid="7035211991066637019">"ماڈل اور ہارڈ ویئر"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"ہارڈ ویئر کا ورژن"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"‏آلہ ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"‏APN کو حذف کریں"</string>
     <string name="menu_new" msgid="6571230342655509006">"‏نیا APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"محفوظ کریں"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"مسترد کریں"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"منسوخ کریں"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"نام فیلڈ خالی نہیں رہ سکتی۔"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"‏APN خالی نہيں رہ سکتا۔"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"ایپس کو ری سیٹ کیا جا سکتا ہے"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"‏Wi-Fi، موبائل اور بلوٹوتھ ری سیٹ کریں"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"‏اس سے نیٹ ورک کی سبھی ترتیبات ری سیٹ ہو جائیں گی، بشمول:\n\n"<li>"Wi‑Fi"</li>\n<li>"موبائل ڈیٹا"</li>\n<li>"بلوٹوتھ"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"مٹائیں"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"‏ڈاؤن لوڈ کردہ SIMs کو مٹائیں"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"‏متبادل SIMs کو ڈاؤن لوڈ کرنے کے لیے، اپنے کیریئر سے رابطہ کریں۔ اس سے موبائل سروس کا کوئی بھی پلان منسوخ نہیں ہوگا۔"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"‏اس سے موبائل سروس کا کوئی بھی پلان منسوخ نہیں ہوگا۔ متبادل SIMs کو ڈاؤن لوڈ کرنے کے لیے، اپنے کیریئر سے رابطہ کریں۔"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"ترتیبات ری سیٹ کریں"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"نیٹ ورک کی سبھی ترتیبات کو دوبارہ ترتیب دیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"‏نیٹ ورک کی سبھی ترتیبات کو ری سیٹ کریں اور ڈاؤن لوڈ کردہ SIMs کو مٹائیں؟ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"نیٹ ورک کی ترتیبات کو دوبارہ ترتیب دیا گیا ہے"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"‏SIMs کو نہیں مٹا سکتے"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"‏کسی خرابی کی وجہ سے ڈاؤن لوڈ کردہ SIMs کو مٹایا نہیں جا سکتا ہے۔\n\nاپنا آلہ دوبارہ شروع کریں اور دوبارہ کوشش کریں۔"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"تمام ڈیٹا حذف کریں (فیکٹری ری سیٹ)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"سبھی ڈیٹا کو حذف کریں (فیکٹری ری سیٹ)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"‏یہ آپ کے ٹیبلیٹ کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو صاف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"‏یہ آپ کے فون کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو صاف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"آپ فی الحال مندرجہ ذیل اکاؤنٹس میں سائن ان ہیں:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"اس آلہ پر دوسرے صارفین موجود ہیں۔\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"موسیقی"</li>\n<li>"تصاویر"</li>\n<li>"صارف کا دیگر ڈیٹا"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIMs"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"اس سے آپ کے موبائل سروس کا پلان منسوخ نہیں ہوگا۔"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا، "<b>"USB اسٹوریج"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا صاف کرنے کیلئے، "<b>"SD کارڈ"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"سبھی ڈیٹا کو حذف کریں (فیکٹری ری سیٹ)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"سبھی ڈیٹا کو حذف کریں (فیکٹری ری سیٹ)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"‏یہ آپ کے ٹیبلیٹ کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو صاف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"‏یہ آپ کے فون کے "<b>"داخلی اسٹوریج"</b>" سے سبھی ڈیٹا کو صاف کر دے گا، بشمول:\n\n"<li>"آپ کا Google اکاؤنٹ"</li>\n<li>"سسٹم اور ایپ ڈیٹا اور ترتیبات"</li>\n<li>"ڈاؤن لوڈ کردہ ایپس"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"آپ فی الحال مندرجہ ذیل اکاؤنٹس میں سائن ان ہیں:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"اس آلہ پر دوسرے صارفین موجود ہیں۔\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"موسیقی"</li>\n<li>"تصاویر"</li>\n<li>"صارف کا دیگر ڈیٹا"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIMs"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"اس سے آپ کے موبائل سروس کا پلان منسوخ نہیں ہوگا۔"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا، "<b>"USB اسٹوریج"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">"‏\n\nموسیقی، تصاویر اور صارف کا دیگر ڈیٹا صاف کرنے کیلئے، "<b>"SD کارڈ"</b>" کو حذف کیے جانے کی ضرورت ہے۔"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"‏USB اسٹوریج کو حذف کریں"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"‏SD کارڈ حذف کریں"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"‏داخلی USB اسٹوریج پر موجود سبھی ڈیٹا، جیسے موسیقی یا تصاویر کو حذف کریں"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"‏SD کارڈ پر موجود سبھی ڈیٹا حذف کریں، جیسے موسیقی یا تصاویر"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"سبھی ڈیٹا صاف کریں"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"سبھی ڈیٹا صاف کریں"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"آپ کی سبھی ذاتی معلومات اور ڈاؤن لوڈ کردہ ایپس کو حذف کر دیا جائے گا۔ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"‏ڈاؤن لوڈ کردہ ایپس اور SIMs سمیت آپ کی سبھی ذاتی معلومات کو حذف کر دیا جائے گا۔ آپ اس کارروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"ہر چیز کو حذف کریں"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"کوئی ری سیٹ انجام نہیں دیا گیا کیونکہ سسٹم صاف کریں سروس دستیاب نہیں ہے۔"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"سبھی ڈیٹا صاف کریں؟"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"اس صارف کیلئے فیکٹری ری سیٹ دستیاب نہیں ہے"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"صاف کیا جا رہا ہے"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"براہ کرم انتظار کریں…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"سبھی ڈیٹا صاف کریں"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"سبھی ڈیٹا صاف کریں"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"آپ کی سبھی ذاتی معلومات اور ڈاؤن لوڈ کردہ ایپس کو حذف کر دیا جائے گا۔ آپ اس کاروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"‏ڈاؤن لوڈ کردہ ایپس اور SIMs سمیت آپ کی سبھی ذاتی معلومات کو حذف کر دیا جائے گا۔ آپ اس کاروائی کو کالعدم نہیں کر سکتے ہیں۔"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"سبھی ڈیٹا صاف کریں؟"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"اس صارف کیلئے فیکٹری ری سیٹ دستیاب نہیں ہے"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"صاف ہو رہا ہے"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"براہ کرم انتظار کریں…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"کال کی ترتیبات"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"‏صوتی میل، کال فاورڈنگ، کال ویٹنگ، کالر ID کو ترتیب دیں"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"‏USB ٹیدرنگ"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g> سے زیادہ آلات کو مربوط نہیں کر سکتے۔"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کا ربط ختم کر دیا جائے گا۔"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"ایتھرنیٹ ٹیدرنگ"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"‏USB ایتھرنیٹ کے ذریعے فون کے انٹرنیٹ کنیکشن کا اشتراک کریں"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"‏Ethernet ایتھرنیٹ کے ذریعے فون کے انٹرنیٹ کنیکشن کا اشتراک کریں"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"اپنے موبائل ڈیٹا کنکشن کے ذریعے دیگر آلات کو انٹرنیٹ فراہم کرنے کیلئے ہاٹ اسپاٹ اور ٹیدرنگ کا استعمال کریں۔ ایپس بھی قریبی آلات کے ساتھ مواد کا اشتراک کرنے کیلئے ایک ہاٹ اسپاٹ تخلیق کر سکتی ہیں۔"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"‏اپنے Wi‑Fi یا موبائل ڈیٹا کنکشن کے ذریعے دیگر آلات کو انٹرنیٹ فراہم کرنے کے لیے ہاٹ اسپاٹ اور ٹیدرنگ کا استعمال کریں۔ ایپس بھی قریبی آلات کے ساتھ مواد کا اشتراک کرنے کے لیے ایک ہاٹ اسپاٹ تخلیق کر سکتی ہیں۔"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"مدد"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"بلوٹوتھ اسکیننگ"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"بلوٹوتھ کے آف ہونے پر بھی ایپس اور سروسز کو کسی بھی وقت قریبی آلات اسکین کرنے کی اجازت دیں۔ مثال کے طور، اسے مقام پر مبنی خصوصیات اور سروسز کو بہتر بنانے کے لیے استعمال کیا جا سکتا ہے۔"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"دفتر کے لیے مقام کی سروسز"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"مقام کے ٹائم زون کی شناخت"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"مقام کے ٹائم زون کی شناخت"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"‏موجودہ ٹائم زون کا پتہ لگانے کے لئے آلے کے مقام کو استعمال کرنے کی اجازت دیتا ہے۔ Wi‑Fi اسکیننگ جیسی دیگر مقام کی ترتیبات ٹائم زون کی شناخت کی درستگی کو متاثر کر سکتی ہیں۔"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"آن"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"آف"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"خودکار ٹائم زون کی شناخت غیر فعال ہے"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"مقام کے ٹائم زون کی شناخت غیر فعال ہے"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"مقام کے ٹائم زون کی شناخت تعاون یافتہ نہیں ہے"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"مقام کے ٹائم زون کی شناخت کی تبدیلیوں کی اجازت نہیں ہے"</string>
     <string name="location_network_based" msgid="5247042890080021887">"‏Wi‑Fi اور‎ موبائل نیٹ ورک مقام"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"‏اپنے مقام کا تیزی سے اندازہ لگانے کیلئے ایپس کو Google کی مقام کی سروس کا استعمال کرنے دیں۔ گمنام مقام کا ڈیٹا جمع کیا جائے گا اور Google کو بھیجا جائے گا۔"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"‏Wi‑Fi کے ذریعہ مقام کا تعین کیا گیا"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"فیس انلاک کے لیے، پاس ورڈ سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"فیس انلاک استعمال کیلئے، پیٹرن سیٹ کریں"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"‏فیس انلاک کے استعمال کے لیے PIN سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"پاس ورڈ سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"پیٹرن سیٹ کریں"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"‏PIN سیٹ کریں"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"اپنا پاس ورڈ بھول گئے؟"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"اپنا پیٹرن بھول گئے؟"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"‏اپنا PIN بھول گئے؟"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"کیپشن کی ترجیحات"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"میگنیفکیشن"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"میگنیفکیشن کی جگہ"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"میگنیفکیشن انیبل"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"اسکرین بڑا کرتے وقت آپ جس میگنیفکیشن جگہ(جگہیں) استعمال کرنا چاہتے ہیں وہ منتخب کریں"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"پوری اسکرین"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"اسکرین کا حصہ"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"مکمل اسکرین اور اسکرین کا حصہ"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"پوری اسکرین کو بڑا کریں"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"اسکرین کا حصہ بڑا کریں"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"ایکسیسبیلٹی بٹن پر سوئچ کریں؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"اسکرین کے حصے کو بڑا کرنے کیلئے تین بار تھپتھپائیں کے استعمال سے ٹائپنگ اور دیگر کارروائیاں میں تاخیر ہوگی\n\nکیا آپ بڑا کرنے کیلئے ایکسیسبیلٹی بٹن کا استعمال کرتے ہوئے سوئچ کرنا چاہتے ہیں؟"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"ایکسیسبیلٹی بٹن پر سوئچ کریں"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"بڑا کرنے ليے تین بار تھپتھپاتے رہیں"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"میگنیفکیشن کی ترتیبات"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"تین بار تھپتھپا کر بڑا کریں"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"شارٹ کٹ سے بڑا کریں"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"پاور بٹن سے کال ختم ہو جاتی ہے"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"بڑا ماؤس پوائنٹر"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"اینیمیشنز ہٹائیں"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"مونو آڈیو"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"آڈیو چلاتے وقت چینلز یکجا کریں"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"آڈیو بیلنس"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"بائیں"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"دائیں"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"مونو آڈیو"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"آڈیو چلاتے وقت چینلز یکجا کریں"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"آڈیو بیلنس"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"بائیں"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"دائیں"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"ڈیفالٹ"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 سیکنڈ"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 سیکنڈ"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"اطلاع وائبریشن"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"رنگ وائبریشن"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"ٹچ تاثرات"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> استعمال کریں"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> کھوليں"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"رنگ کی اصلاح استعمال کریں"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"کیپشنز دکھائیں"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"صرف تعاون یافتہ ایپ کے لیے"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> استعمال کریں"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> کھولیں"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"رنگ کی اصلاح استعمال کریں"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"کیپشنز دکھائیں"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"صرف تعاون یافتہ ایپ کے لیے"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"کیپشن کا سائز اور طرز"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> ٹیکسٹ کا سائز"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"مزید اختیارات"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"سرخ اور سبز رنگ دیکھنے کی صلاحیت میں کمی"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"سرخ اور سبز کی بے قاعدہ رنگ بینی"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"نیلے پیلے رنگ کی شناخت کرنے میں دشواری"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"خاکستری"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"سرخ-سبز"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"سرخ-سبز"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"نیلا-پیلا"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"پس منظر کی پابندی"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"ایپ کو پس منظر میں چلنے کی اجازت دیں"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"ایپ کو پس منظر میں چلنے کی اجازت نہیں ہے"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"پس منظر کے استعمال کو محدود نہیں کیا جا سکتا"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"پس منظر کے استعمال کو محدود نہیں کیا جا سکتا"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"پس منظر کی سرگرمی کو محدود کریں؟"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"اگر آپ کسی ایپ کی پس منظر کی سرگرمی کو محدود کرتے ہیں تو یہ غلط برتاؤ کر سکتی ہے"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"چونکہ یہ ایپ بیٹری کی کارکردگی کو بہتر بنانے کیلئے نہیں ہے، لہذا آپ اسے محدود نہیں کر سکتے ہیں۔\n\nایپ کو محدود کرنے کیلئے، پہلے بیٹری کی کارکردگی کو بہتر بنانے کو آن کریں۔"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"ٹیبلیٹ معمول سے زیادہ استعمال کیا گیا ہے"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"آلہ معمول سے زیادہ استعمال کیا گیا ہے"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"بیٹری معمول سے پہلے ختم ہو سکتی ہے"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"بیٹری کی صحت کے لیے بہتر بنایا جا رہا ہے"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"بیٹری عارضی طور پر محدود ہے۔ مزید جاننے کے لیے تھپتھپائیں۔"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"آپ کا فون معمول سے زیادہ استعمال کیا گيا ہے۔ آپ کی بیٹری توقع سے پہلے ختم ہو سکتی ہے۔\n\nبیٹری کے استعمال کے لحاظ سے سب سے زيادہ استعمال کردہ ایپس:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"آپ کا ٹیبلیٹ معمول سے زیادہ استعمال کیا گيا ہے۔ آپ کی بیٹری توقع سے پہلے ختم ہو سکتی ہے۔\n\nبیٹری کے استعمال کے لحاظ سے سب سے زيادہ استعمال کردہ ایپس:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"آپ کا آلہ معمول سے زیادہ استعمال کیا گيا ہے۔ آپ کی بیٹری توقع سے پہلے ختم ہو سکتی ہے۔\n\nبیٹری کے استعمال کے لحاظ سے سب سے زيادہ استعمال کردہ ایپس:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">‏%1$d ایپ پر پابندی لگائی گئی</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"آپ کے بیٹری میٹر کو پڑھنے میں دشواری"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"آپ کے بیٹری میٹر کو پڑھنے میں دشواری۔ "<annotation id="url">"مزید جاننے"</annotation>" کیلئے تھپتھپائیں"</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"ایپ بند کریں؟"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"آپ کا فون نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP">%1$s</xliff:g> آپ کے فون کو بیدار رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ ایپ کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"آپ کا ٹیبلیٹ نارمل طریقے سے بیٹری کا نظم نہیں کر سکتا کیوںکہ <xliff:g id="APP">%1$s</xliff:g> آپ کے ٹیبلیٹ کو بیدار رکھ رہی ہے۔\n\nاس مسئلے کو حل کرنے کیلئے آپ ایپ کو روک سکتے ہیں۔\n\nاگر یہ سلسلہ جاری رہتا ہے تو آپ کو بیٹری کی کارکردگی کو بہتر بنانے کیلئے ایپ کو اَن انسٹال کرنا پڑ سکتا ہے۔"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"شیڈیول سیٹ کریں"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"بیٹری لائف میں توسیع کریں"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"چارج ہونے پر آف کریں"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"جب آپ کا فون <xliff:g id="PERCENT">%1$s</xliff:g> ہو جاتا ہے تو بیٹری سیور آف ہو جاتی ہے"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"جب آپ کا ٹیبلیٹ <xliff:g id="PERCENT">%1$s</xliff:g> پر ہوتا ہے تو بیٹری سیور آف ہو جاتی ہے"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"جب آپ کا آلہ <xliff:g id="PERCENT">%1$s</xliff:g> پر ہوتا ہے تو بیٹری سیور آف جاتی ہے"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"فون <xliff:g id="PERCENT">%1$s</xliff:g> سے اوپر چارج ہونے پر بیٹری سیور آف ہو جاتا ہے"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"ٹیبلیٹ <xliff:g id="PERCENT">%1$s</xliff:g> سے اوپر چارج ہونے پر بیٹری سیور آف ہو جاتا ہے"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"آلہ <xliff:g id="PERCENT">%1$s</xliff:g> سے اوپر چارج ہونے پر بیٹری سیور آف ہو جاتا ہے"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"آن کریں"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"ری سیٹ کریں"</string>
     <string name="tts_play" msgid="2945513377250757221">"چلائیں"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"اڈاپٹیو کنیکٹوٹی"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"خودکار طور پر آپ کے نیٹ ورک کنکشنز کا نظم کر کے کارکردگی میں بہتری اور بیٹری لائف میں اضافہ کرتا ہے"</string>
     <string name="credentials_title" msgid="7535942196886123656">"اسناد کی اسٹوریج"</string>
     <string name="credentials_install" msgid="3933218407598415827">"ایک سرٹیفکیٹ انسٹال کریں"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"اسٹوریج سے سرٹیفیکیٹس انسٹال کریں"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"صارف کی اسناد"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"اسٹور کردہ اسناد دیکھیں اور ان میں ترمیم کریں"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"جدید ترین"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"اسٹوریج کی قسم"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"ہارڈ ویئر کے ذریعے تعاون یافتہ"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"صرف سافٹ ویئر"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"اس صارف کیلئے اسنادات دستیاب نہیں ہیں"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"‏VPN اور ایپس کیلئے انسٹال کردہ"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"‏Wi-Fi کیلئے انسٹال کردہ"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"انسٹال نہ کریں"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"بہر حال انسٹال کریں"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"سرٹیفکیٹ انسٹال نہیں ہے"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g> کو اس آلے پر سرٹیفکیٹس انسٹال کرنے کی اجازت دیں؟"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"‏یہ سرٹیفکیٹس مندرجہ ذیل ایپس اور URL سے آپ کی شناخت کریں گے"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"اجازت نہ دیں"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"اجازت دیں"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"مزید دکھائیں"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"سرٹیفکیٹ مینجمنٹ ایپ"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"کوئی نہیں"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"‏اس ایپ کے ذریعے انسٹال کردہ سرٹیفکیٹس آپ کی شناخت نیچے کی ایپس اور URLs میں کرتے ہیں"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"ہٹائیں"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"ایمرجنسی ڈائلنگ سگنل"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"ہنگامی کال کرتے وقت برتاؤ سیٹ کریں"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"بیک اپ"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"ترتیب نہیں دیا گیا - دفتری پروفائل"</string>
     <string name="user_admin" msgid="4024553191395768119">"منتظم"</string>
     <string name="user_you" msgid="3070562015202859996">"آپ (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"عرفی نام"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"آپ <xliff:g id="USER_COUNT">%1$d</xliff:g> تک صارفین شامل کر سکتے ہیں"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"صرف ٹیبلٹ کا مالک صارفین کا نظم کر سکتا ہے۔"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"صرف فون کا مالک صارفین کا نظم کر سکتا ہے۔"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"ٹرمینل پر ادا کرنا"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"ادائیگی کی ایپ سیٹ اپ کریں۔ پھر بس اپنے فون کے پچھلے حصے کو کسی بھی بغیر رابطے والی علامت کے ٹرمینل کے پاس پکڑ کر رکھیں۔"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"سمجھ آ گئی"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"مزید…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"مزید…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"ادائیگی کی ڈیفالٹ ایپ سیٹ کریں"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"ادائیگی کی ڈیفالٹ ایپ اپ ڈیٹ کریں"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"کنٹیکٹ لیس ٹرمینل پر، <xliff:g id="APP">%1$s</xliff:g> کے ساتھ ادائیگی کریں"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"واپس جائیں"</string>
     <string name="wizard_next" msgid="3884832431439072471">"اگلا"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"مکمل کریں"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"ایک تصویر لیں"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"ایک تصویر منتخب کریں"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"تصویر منتخب کریں"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"‏SIM کارڈز"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"‏SIM کارڈز"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"کالز کیلئے ہمیشہ اس کا استعمال کریں"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"‏ڈیٹا کیلئے ایک SIM منتخب کریں"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"‏SMS کے لیے SIM منتخب کریں"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"‏ڈیٹا SIM کو سوئچ کیا جا رہا ہے، اس میں ایک منٹ تک کا وقت لگ سکتا ہے…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"‏ڈیٹا SIM کو سوئچ کیا جا رہا ہے، اس میں ایک منٹ تک کا وقت لگ سکتا ہے…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"کال کریں مع"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"‏ایک SIM کارڈ منتخب کریں"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"روٹین، شیڈول، بیٹری سیور، پاور سیور، بیٹری، خودکار طور پر، فیصد"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"‏volte، اعلی درجے کی کالنگ، 4G کالنگ"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"زبان شامل کریں، ایک زبان شامل کریں"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"متن کا سائز"</string>
     <string name="default_sound" msgid="6604374495015245195">"ڈیفالٹ ساؤنڈ"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"گھنٹی بجنے اور اطلاعات کا والیوم <xliff:g id="PERCENTAGE">%1$s</xliff:g> پر ہے"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"والیوم، ارتعاش، ڈسٹرب نہ کریں"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"آوازیں آن کریں"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"لائیو کیپشن"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"خودکار طور پر میڈیا پر کیپشن لگائیں"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"کوئی نہیں"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> شیڈول سیٹ کریں</item>
-      <item quantity="one">1 شیڈول سیٹ کریں</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{کوئی نہیں}=1{1 شیڈول سیٹ کریں}other{# شیڈول سیٹ کریں}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"ڈسٹرب نہ کریں"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"صرف اہم لوگوں اور ایپس کی جانب سے اطلاعات حاصل کریں"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"مداخلتوں کی حد مقرر کریں"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"صرف ترجیحی"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"آن / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"آف / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"آف"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"آن"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"ہر بار پوچھیں"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"یہاں تک کہ آپ آف کر دیں"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> گھنٹے</item>
-      <item quantity="one">1 گھنٹہ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> منٹس"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> شیڈولز خود بخود آن ہو سکتے ہیں</item>
-      <item quantity="one">1 شیڈول خود بخود آن ہو سکتا ہے</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 گھنٹہ}other{# گھنٹے}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 منٹ}other{# منٹ}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{آف}=1{آف / 1 شیڈول خودکار طور پر آن ہو سکتا ہے}other{بند / # شیڈولز خودکار طور پر آن ہو سکتے ہیں}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"کیا \'ڈسٹرب نہ کریں\' میں رکاوٹ کا باعث بن سکتا ہے"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"لوگ"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"ایپس"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"کم ترجیحی اطلاعات کو لطیف پر خودکار طور پر سیٹ کریں"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"تغیر پذیر اطلاع کی درجہ بندی"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"مطابقت کے لحاظ سے خودکار طور پر درجہ کی اطلاعات"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"تغیر پذیر اطلاع کے تاثرات"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"اطلاعات میں کی جانے والی ایڈجسٹمنٹس کی نشاندہی کریں اور سسٹم کو تاثرات فراہم کرنے کا اختیار دکھائیں"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"اطلاع کی اہمیت کو ری سیٹ کریں"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"صارف کی تبدیل کردہ اہمیت کی ترتیبات کو ری سیٹ کریں اور اطلاع کے اسسٹنٹ کو ترجیح دینے کی اجازت دیں"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"تجویز کردہ کارروائیاں اور جوابات"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"تجویز کردہ کارروائیوں اور جوابات کو خودکار طور پر دکھائیں"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"حالیہ اور اسنوز کردہ اطلاعات دکھائیں"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"ترجیحی گفتگوئیں"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"گفتگو کے سیکشن میں سب سے اوپر دکھائیں اور فلوٹنگ بلبلے کے طور پر ظاہر ہوں"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"گفتگو کے سیکشن میں سب سے اوپر دکھائیں"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"دیگر گفتگوئیں"</string>
+    <string name="other_conversations" msgid="551178916855139870">"غیر ترجیحی گفتگوئیں"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"گفتگوئیں جن میں آپ نے تبدیلیاں کی ہیں"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"حالیہ گفتگوئیں"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"حالیہ کو صاف کریں"</string>
+    <string name="clear" msgid="5092178335409471100">"صاف کریں"</string>
     <string name="important_bubble" msgid="7911698275408390846">"بلبلہ ترجیحی گفتگوئیں"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"ترجیحی گفتگوئیں پُل ڈاؤن شیڈ کے اوپری حصے میں دکھائی دیتی ہیں۔ آپ انہیں بلبلہ اور \'ڈسٹرب نہ کریں\' مداخلت پر بھی سیٹ کر سکتے ہیں۔"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"ترجیحی اور ترمیم شدہ گفتگوئیں یہاں ظاہر ہوں گی"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"ڈسٹرب نہ کریں تک رسائی"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"\'ڈسٹرب نہ کریں\' کو اجازت دیں"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"کسی انسٹال کردہ ایپس نے ڈسٹرب نہ کریں تک رسائی کی درخواست نہیں کی ہے"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"ایپس لوڈ ہو رہی ہیں…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"ایپس لوڈ کی جا رہی ہیں…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"‏آپ کی درخواست پر، Android اس ایپ کی اطلاعات کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"‏آپ کی درخواست پر، Android اطلاعات کے اس زمرے کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"‏آپ کی درخواست پر، Android اطلاعات کے اس گروپ کو اس آلہ پر ظاہر ہونے سے مسدود کر رہا ہے"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"سبھی گفتگوئيں"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"ترجیحی گفتگوئیں"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"کوئی نہیں"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> گفتگوئیں</item>
-      <item quantity="one">1 گفتگو</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"کوئی نہیں"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{کوئی نہیں}=1{1 گفتگو}other{# گفتگوئیں}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"کون رکاوٹ ڈال سکتا ہے"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"کالز"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"کالز"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"اجازت یافتہ کالز کے آواز کرنے کو یقینی بنانے کیلئے، چیک کریں کہ آلہ رِنگ پر سیٹ ہے"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ کے لیے موصول ہونے والی کالز کو مسدود کر دیا جاتا ہے۔ اپنے دوستوں، فیملی اور دیگر رابطوں کو آپ سے رابطہ کرنے کی اجازت دینے کے لیے، آپ ترتیبات کو ایڈجسٹ کر سکتے ہیں۔"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"ستارہ کا نشان لگے ہوئے رابطے"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> دیگر</item>
-      <item quantity="one">1 دیگر</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"کوئی نہیں"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{کوئی نہیں}=1{{contact_1}}=2{{contact_1} اور {contact_2}}=3{{contact_1}، {contact_2}، اور {contact_3}}other{{contact_1}، {contact_2} اور # دیگر}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(کوئی نام نہیں)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"پیغامات"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"پیغامات"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"پیغامات"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ کے لیے آنے والے پیغامات مسدود ہیں۔ اپنے دوستوں، فیملی اور دیگر رابطوں کو آپ سے رابطہ کرنے کی اجازت دینے کے لیے، آپ ترتیبات کو ایڈجسٹ کر سکتے ہیں۔"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"سبھی پیغامات آپ سے رابطہ کر سکتے ہیں"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"سبھی کالز آپ سے رابطہ کر سکتی ہیں"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"کوئی نہیں"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> رابطے</item>
-      <item quantity="one">1 رابطہ</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{کوئی نہیں}=1{1 رابطہ}other{# رابطے}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"کوئی بھی"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"رابطے"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"ستارہ کا نشان لگے ہوئے رابطے"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"سبھی اطلاعات"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"کچھ اطلاعات"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"منتخب کردہ لوگ اب بھی آپ تک پہنچ سکتے ہیں ، یہاں تک کہ اگر آپ ایپس کو مداخلت کرنے کی اجازت نہیں دیتے ہیں"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g> رکاوٹ ڈال سکتی ہے</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g> رکاوٹ ڈال سکتی ہے</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> مزید"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{کوئی ایپ رکاوٹ نہیں ڈال سکتی}=1{{app_1} رکاوٹ ڈال سکتی ہے}=2{{app_1} او {app_2} رکاوٹ ڈال سکتی ہیں}=3{{app_1}، {app_2} اور {app_3} رکاوٹ ڈال سکتی ہیں}other{{app_1}، {app_2} اور # مزید رکاوٹ ڈال سکتی ہیں}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"ایپس"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"سبھی اطلاعات"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"کچھ اطلاعات"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"اطلاعات جو رکاوٹ ڈال سکتی ہیں"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"سبھی اطلاعات کو اجازت دیں"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> رکاوٹ ڈال سکتی ہے</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> رکاوٹ ڈال سکتی ہے</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"کوئی چیز رکاوٹ نہیں ڈال سکتی"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> مزید"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{کوئی چیز رکاوٹ نہیں ڈال سکتی}=1{{sound_category_1} رکاوٹ ڈال سکتی ہے}=2{{sound_category_1} اور{sound_category_2} رکاوٹ ڈال سکتی ہیں}=3{{sound_category_1}، {sound_category_2}، اور{sound_category_3} رکاوٹ ڈال سکتی ہیں}other{{sound_category_1}، {sound_category_2} اور # مزید رکاوٹ ڈال سکتی ہیں}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"کوئی چیز رکاوٹ نہیں ڈال سکتی"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"کوئی بھی رکاوٹ نہیں ڈال سکتا"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"کچھ لوگ رکاوٹ ڈال سکتے ہیں"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"سبھی لوگ رکاوٹ ڈال سکتے ہیں"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"آن"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"آف"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"ایپ کو پن کرنا"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"ایپ کو پن کرنے سے آپ حالیہ ایپ کو اس وقت تک مد نظر رکھنے کی اجازت دیتے ہے جب تک آپ اس سے پن نہیں ہٹا دیتے۔ مثال کے طور پر، اس خصوصیت کا استعمال کسی بھروسہ مند دوست کو ایک مخصوص گیم کھیلنے دینے کے ليے استعمال کیا جا سکتا ہے۔ \n\nجب ایک ایپ کو پن کر دیا گیا ہے، تو پن کردہ ایپ دیگر ایپس کو کھول سکتی ہے اور ذاتی ڈیٹا قابل رسائی ہوسکتا ہے۔ \n\nایپ کو پن کرنا استعمال کرنے کے ليے: ←\n1۔	ایپ کو پن کرنا آن کریں ←\n2۔	مجموعی جائزہ کھولیں ←\n3۔	اسکرین کے اوپری حصے پر ایپ آئیکن پر تھپتھپائیں، پھر \'پن کریں\' پر تھپتھپائیں"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"ایپ کو پن کرنے سے آپ حالیہ ایپ کو اس وقت تک مد نظر رکھنے کی اجازت دیتے ہے جب تک آپ اس سے پن نہیں ہٹا دیتے۔ مثال کے طور پر، اس خصوصیت کا استعمال کسی بھروسہ مند دوست کو ایک مخصوص گیم کھیلنے دینے کے ليے استعمال کیا جا سکتا ہے۔ \n\nجب ایک ایپ کو پن کر دیا گیا ہے، تو پن کردہ ایپ دیگر ایپس کو کھول سکتی ہے اور ذاتی ڈیٹا قابل رسائی ہوسکتا ہے۔ \n\nاگر آپ اپنے آلہ کو کسی کے ساتھ محفوظ طریقے سے اشتراک کرنا چاہتے ہیں تو، اس کے بجائے مہمان صارف استعمال کرنے کی کوشش کریں۔ \n\nایپ کو پن کرنا استعمال کرنے کے ليے: ←\n1۔	ایپ کو پن کرنا آن کریں ←\n2۔	مجموعی جائزہ کھولیں ←\n3۔	اسکرین کے اوپری حصے پر ایپ آئیکن پر تھپتھپائیں، پھر \'پن کریں\' پر تھپتھپائیں"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"ایپ کو پن کرنے سے آپ کو حالیہ ایپ سے پن ہٹانے تک اسے منظر میں رکھنے کی اجازت ہوتی ہیں۔ اس خصوصیت کا استعمال کیا جا سکتا ہے مثال کے طور پر، کسی بھروسے مند دوست کو ایک مخصوص گیم کھیلنے کی اجازت دینا۔"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"کسی ایپ کو پن کرنے پر پن کردہ ایپ دیگر ایپس کو کھول سکتی ہے اور ذاتی ڈیٹا قابل رسائی ہو سکتا ہے۔ \n\nایپ کو پن کرنا استعمال کرنے کے لیے: ←\n1۔	ایپ کو پن کرنا آن کریں ←\n2۔	مجموعی جائزہ کھولیں ←\n3۔	اسکرین کے اوپری حصے پر ایپ آئیکن پر تھپتھپائیں پھر \'پن کریں\' پر تھپتھپائیں"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"کسی ایپ کو پن کرنے پر پن کردہ ایپ دیگر ایپس کو کھول سکتی ہے اور ذاتی ڈیٹا قابل رسائی ہو سکتا ہے۔ \n\nاگر آپ محفوظ طریقے سے اپنے آلے کا کسی کے ساتھ اشتراک کرنا چاہتے ہیں تو اس کے بجائے مہمان صارف استعمال کر کے آزمائیں۔ \n\nایپ کو پن کرنا استعمال کرنے کے ليے: ←\n1۔	ایپ کو پن کرنا آن کریں ←\n2۔	مجموعی جائزہ کھولیں ←\n3۔	اسکرین کے اوپری حصے پر ایپ آئیکن پر تھپتھپائیں پھر \'پن کریں\' پر تھپتھپائیں"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"جب ایپ کو پن کر دیا گیا ہے: \n\n•←← ذاتی ڈیٹا قابل رسائی ہوسکتا ہے \n←←(جیسے رابطے اور ای میل کا مواد) \n•←←پن کردہ ایپ دیگر ایپس کو کھول سکتی ہے \n\nصرف ان لوگوں کے ساتھ ایپ کو پن کرنا استعمال کریں جس پر بھروسہ کرتے ہیں۔"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"پن ہٹانے سے پہلے غیر مقفل کرنے کا پیٹرن طلب کریں"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"‏پن ہٹانے سے پہلے PIN طلب کریں"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"‏اپنے آلہ کو غیر مقفل کرنے کیلئے اپنا چہرہ استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کو طلب کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع ہونے سے پہلے PIN طلب کریں؟"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنے چہرے کا استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنا پیٹرن طلب کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پیٹرن طلب کریں؟"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنے چہرے کو استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پاس ورڈ طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"‏اپنے آلے کو غیر مقفل کرنے کے لیے اپنے بایو میٹرکس کا استعمال کرنے کے علاوہ، آپ یہ آلہ سٹارٹ ہونے سے پہلے اپنے PIN کو طلب کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ سٹارٹ نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ سٹارٹ ہونے سے پہلے PIN طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"اپنے آلے کو غیر مقفل کرنے کے لیے اپنے بایو میٹرکس کا استعمال کرنے کے علاوہ، آپ یہ آلہ سٹارٹ ہونے سے پہلے اپنا پیٹرن طلب کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ سٹارٹ نہیں ہو جاتا ہے، یہ الارمز سمیت، کالز، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ سٹارٹ کرنے سے پہلے پیٹرن طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"اپنے آلے کو غیر مقفل کرنے کے لیے اپنے بایو میٹرکس کا استعمال کرنے کے علاوہ، آپ یہ آلہ سٹارٹ ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ سٹارٹ نہیں ہو جاتا ہے، یہ الارمز سمیت، کالز، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہونے والے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ سٹارٹ کرنے سے پہلے پاس ورڈ طلب کریں؟"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"ہاں"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"نہیں"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"محدود کردہ ہے"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"‏USB کنٹرول کردہ بذریعہ"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"منسلک آلہ"</string>
     <string name="usb_control_device" msgid="527916783743021577">"یہ آلہ"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"سوئچ کیا جا رہا ہے..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"سوئچ کیا جا رہا ہے…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"سوئچ نہیں کیا جا سکا"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"اس آلہ کو چارج کر رہی ہے"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"منسلک آلہ چارج ہو رہا ہے"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"موبائل ڈیٹا کا استعمال"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"ایپ ڈیٹا کا استعمال"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"‏Wi-Fi ڈیٹا کا استعمال"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"غیر کیریئر ڈیٹا کا استعمال"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"ایتھرنیٹ ڈیٹا کا استعمال"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"ایتھرنیٹ"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 پابندی</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"کیریئر ڈیٹا کا حساب آپ کے آلہ کے حساب سے مختلف ہو سکتا ہے"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"کیریئر نیٹ ورکس کے ذریعے استعمال کردہ ڈیٹا کو خارج کرتا ہے"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> استعمال ہوا"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"ڈیٹا وارننگ سیٹ کریں"</string>
     <string name="data_warning" msgid="2925054658166062884">"ڈیٹا وارننگ"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"تفاصیل دیکھیں"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"ڈیٹا سیور"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"غیر محدود ڈیٹا"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"پس منظر کا ڈیٹا آف ہے"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"پس منظر کا ڈیٹا آف ہے"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"آن"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"آف"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"ڈیٹا سیور استعمال کریں"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"اگر آلہ مقفل ہو تو اطلاعات میں جوابات یا دیگر متن ٹائپ کرنا ممنوع کریں"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"ڈیفالٹ سپیل چیکر"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"سپیل چیکر چنیں"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"سپیل چیکر استعمال کریں"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"سپیل چیکر استعمال کریں"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"غیر منتخب کردہ"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(کوئی نہیں)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"اسٹوریج کی جگہ خالی کرنے میں مدد کیلئے، اسٹوریج مینیجر آپ کے آلہ سے بیک اپ شدہ تصاویر اور ویڈیوز ہٹا دیتا ہے۔"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"تصاویر اور ویڈیوز ہٹائیں"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"اسٹوریج مینیجر"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"اسٹوریج مینیجر استعمال کریں"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"اسٹوریج مینیجر استعمال کریں"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"خودکار"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"مینوئل"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"اب جگہ خالی کریں"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"فون کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"ٹیبلیٹ کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"آلہ کو چیک کرنے کیلئے دو بار تھپتھپائیں"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"اطلاعات کیلئے سوائپ کریں"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"اپنی اطلاعات ظاہر کرنے کیلئے اسکرین کے نچلے کنارے پر سوائپ کریں"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"ایک ہاتھ کی وضع"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"ایک ہاتھ کی وضع استعمال کریں"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"ایپس کو سوئچ کرتے وقت باہر نکلیں"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"ٹائم آؤٹ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 سیکنڈز"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 سیکنڈز"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 سیکنڈز"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"رسائی"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"وقت، اطلاعات، اور دیگر معلومات چیک کرنے کے لیے اپنی اسکرین کو دو بار تھپتھپائیں۔"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"چیک کرنے کیلئے فون کو اٹھائیں"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"چیک کرنے کیلئے ٹیبلیٹ کو اٹھائیں"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"ٹیبلیٹ چیک کرنے کے لیے تھپتھپائیں"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"آلہ چیک کرنے کے لیے تھپتھپائیں"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"وقت، اطلاعات، اور دیگر معلومات چیک کرنے کے لیے اپنی اسکرین کو دو بار تھپتھپائیں۔"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"‏ہنگامی SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"‏ایمرجنسی SOS کا استعمال کریں"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> کے زیر انتظام ہے"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"پاور بٹن کو تیزی سے 5 بار یا اس سے زیادہ بار دبا کر نیچے کاروائیاں شروع کریں"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"الٹی گنتی کا الارم چلائیں"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"مدد کیلئے مطلع کرنے سے پہلے تیز آواز چلائیں"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"مدد کیلئے کال کریں"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"مدد کیلئے کال کرنے کا نمبر"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>۔ تبدیل کرنے کیلئے تھپتھپائیں"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"‏اگر آپ غیر ایمرجنسی نمبر درج کرتے ہیں:\n • آپ کے آلے کا ایمرجنسی SOS استعمال کرنے کیلئے غیر مقفل ہونا ضروری ہے\n • ممکن ہے آپ کی کال کا جواب نہ دیا جائے"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"اطلاعات کیلئے فنگر پرنٹ سوائپ"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"فنگر پرنٹ سوائپ کریں"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"اپنی اطلاعات چیک کرنے کیلئے اپنے فون کی پشت پر فنگر پرنٹ سینسر پر نیچے سوائپ کریں۔"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"زیادہ سے زیادہ مرئی ڈیٹا سیٹس"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"ڈیفالٹ اقدار پر دوبارہ ری سیٹ کریں"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"آٹو فل ڈویلپر کے اختیارات کو دوبارہ ترتیب دے دیا گیا ہے"</string>
+    <string name="location_category" msgid="3496759112306219062">"مقام"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"اسٹیٹس بار کے مقام کا انڈیکیٹر"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"نیٹ ورک اور کنیکٹوٹی سمیت، سبھی مقامات کے لیے دکھائیں"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"‏مکمل GNSS پیمائشوں کو زبردستی لاگو کریں"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"‏ڈیوٹی سائیکلنگ کے بغیر سبھی GNSS مجموعوں اور کثرتوں کو ٹریک کریں"</string>
     <string name="device_theme" msgid="5027604586494772471">"آلہ کا تھیم"</string>
     <string name="default_theme" msgid="4815428567082263639">"ڈیفالٹ"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"نیٹ ورک کا نام"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"متوجہ رہنے کے لیے اطلاعات موقوف کریں"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"خصوصیت دستیاب نہیں ہے"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"اس خصوصیت کو آف کر دیا گیا کیونکہ یہ آپ کے فون کو سست کر دیتی ہے"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"‏مکمل GNSS پیمائشوں کو زبردستی لاگو کریں"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"‏ڈیوٹی سائیکلنگ کے بغیر سبھی GNSS مجموعوں اور کثرتوں کو ٹریک کریں"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"ہمیشہ ناکامی کا ڈائیلاگ دکھائیں"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"جب بھی ایپ ناکام ہو تو ڈائیلاگ دکھائیں"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"‏ANGLE کے لیے فعال ایپ منتخب کریں"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"سبھی ایپس کے لیے فعال کریں"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"گرافکس ڈرائیور منتخب کریں"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"ڈیفالٹ"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"گیم ڈرائیور"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"گیم ڈرائیور"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"ڈویلپر ڈرائیور"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"سسٹم کا گرافکس ڈرائیور"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"آن (خاموش کریں)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"آف"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"نیٹ ورک کی تفصیلات"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"‏آپ کے آلہ کا نام آپ کے فون پر موجود ایپس میں مرئی ہوتا ہے۔ جب آپ بلوٹوتھ آلات سے منسلک ہوتے ہیں یا Wi-Fi ہاٹ اسپاٹ سیٹ اپ کرتے ہیں تو دوسرے لوگ بھی اسے دیکھ سکتے ہیں۔"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"‏آپ کے آلے کا نام آپ کے فون پر موجود ایپس میں دکھائی دیتا ہے۔ آپ کے بلوٹوتھ آلات سے منسلک ہونے، Wi-Fi نیٹ ورک سے منسلک ہونے یا Wi-Fi ہاٹ اسپاٹ کو سیٹ اپ کرنے پر دوسرے لوگ بھی اسے دیکھ سکتے ہیں۔"</string>
     <string name="devices_title" msgid="649715719278562515">"آلات"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"تمام ترتیبات"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"تجاویز"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"نیٹ ورکس نہیں مل سکے۔ دوبارہ کوشش کریں۔"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(ممنوع)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"‏کوئی SIM کارڈ نہیں ہے"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"‏کوئی SIM نہیں ہے"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"کوئی نہیں"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"‏منسلک کرنے کے لیے SIM درکار ہے"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"‏منسلک کرنے کے لیے SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> درکار ہے"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"‏ترجیحی نیٹ ورک کی وضع: WCDMA ترجیحی"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"‏ترجیحی نیٹ ورک کی وضع: صرف GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"‏ترجیحی نیٹ ورک کی وضع: صرف WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"موبائل ڈیٹا"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"موبائل نیٹ ورک استعمال کر کے ڈیٹا تک رسائی حاصل کریں"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"رینج میں ہونے پر فون خودکار طور پر اس کیریئر پر سوئچ ہو جائے گا"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"‏کوئی SIM کارڈ دستیاب نہيں ہے"</string>
     <string name="calls_preference" msgid="2166481296066890129">"کالز کی ترجیح"</string>
     <string name="sms_preference" msgid="7742964962568219351">"‏SMS کی ترجیح"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"ہر بار پوچھیں"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> سے منسلک ہونے پر دستیاب نہیں ہے"</string>
     <string name="see_more" msgid="7499355691042812723">"مزید دیکھیں"</string>
     <string name="see_less" msgid="2642392725363552793">"کم دیکھیں"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> آن کریں؟"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"‏SIM آن کریں؟"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> پر سوئچ کریں؟"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"‏SIM کارڈ استعمال کرنے کے لیے سوئچ کریں؟"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"‏ایک وقت میں صرف ایک SIM فعال ہو سکتا ہے۔\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> پر سوئچ کرنا آپ کے <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> کی سروس کو منسوخ نہیں کرے گا۔"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"‏ایک وقت میں صرف ایک ڈاؤن لوڈ کردہ SIM فعال ہو سکتا ہے۔\n\n <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> پر سوئچ کرنا آپ کے <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> کی سروس کو منسوخ نہیں کرے گا۔"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"‏ایک وقت میں صرف ایک SIM فعال ہو سکتا ہے۔\n\nسوئچ کرنے سے آپ کے <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> کی سروس منسوخ نہیں ہوگی۔"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> پر سوئچ کریں"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"نیٹ ورک سے منسلک ہو رہا ہے…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> پر سوئچ ہو رہا ہے"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"کیریئر کو سوئچ نہیں کیا جا سکتا"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"ایک خرابی کی وجہ سے کیریئر کو سوئچ نہیں کیا جا سکتا۔"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> آف کریں؟"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"‏SIM آف کریں؟"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"‏<xliff:g id="ELLIPSIS">…</xliff:g>SIM کو آف کیا جا رہا ہے"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"کیریئر کو غیر فعال نہیں کیا جا سکتا"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"کچھ غلط ہوگیا اور آپ کے کیریئر کو غیر فعال نہیں کیا سکا۔"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"‏2 SIMs استعمال کریں؟"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"‏اس آلے میں ایک ہی وقت میں 2 فعال SIMs ہو سکتے ہے۔ ایک وقت میں 1 SIM کے استعمال کو جاری رکھنے کے لیے \"نہیں شکریہ\" پر تھپتھپائیں۔"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"آلہ ری اسٹارٹ کریں؟"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"‏شروع کرنے کے لیے اپنے آلے کو ری اسٹارٹ کریں۔ اس کے بعد آپ دوسرا SIM شامل کر سکتے ہیں۔"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"جاری رکھیں"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"ری سٹارٹ کریں"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"نہیں شکریہ"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"سوئچ کریں"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"‏SIM کو فعال نہیں کیا جا سکتا"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"‏SIM نکال کر دوبارہ داخل کریں۔ مسئلے کے برقرار رہنے پر اپنا آلہ ری اسٹارٹ کریں۔"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"‏SIM کو دوبارہ آن کرنے کی کوشش کریں۔ مسئلے کے برقرار رہنے پر اپنا آلہ ری اسٹارٹ کریں۔"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"نیٹ ورک کی فعالیت"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> فعال ہے"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"‏SIM کی ترتیبات کو اپ ڈیٹ کرنے کے ليے تھپتھپائیں"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"‏SIM کارڈ"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"‏ڈاؤن لوڈ کردہ اس SIM کو مٹائیں؟"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"‏اس SIM کو مٹانے سے اس آلہ سے <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> سروس ہٹ جاتی ہے۔\n\n <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> کی سروس منسوخ نہیں ہوگی۔"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"مٹائیں"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"‏SIM کو مٹایا جا رہا ہے…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"‏SIM کو نہیں مٹا سکتے"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"‏ایک خرابی کی وجہ سے اس SIM کو مٹایا نہیں جا سکتا ہے۔\n\nاپنا آلہ دوبارہ شروع کریں اور دوبارہ کوشش کریں۔"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"آلے سے منسلک کریں"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"‏<xliff:g id="APPNAME">%1$s</xliff:g> ایپ آپ کے آلے سے منسلک ہونے کے لیے عارضی Wi-Fi نیٹ ورک استعمال کرنا چاہتی ہے"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"کوئی آلہ نہیں ملا۔ یقینی بنائیں کہ آلات آن ہیں اور منسلک کرنے کے لیے دستیاب ہیں۔"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"ہنگامی کالز"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"‏آپ کے کیریئر کی جانب سے Wi-Fi پر ہنگامی کالز تعاون یافتہ نہیں ہیں۔\nہنگامی کال کرنے کے لیے آلہ خود کار طور پر سیلولر نیٹ ورک پر سوئچ ہو جاتا ہے۔\nہنگامی کالز صرف سیلولر کوریج والے علاقے میں ممکن ہیں۔"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"‏معیار کو بہتر بنانے کے لیے کالز کے لیے Wi-Fi کا استعمال کریں"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"‏کراس SIM کالنگ"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"‏اس SIM پر کسی اور SIM کی کالز اور SMSs کی اجازت دیں۔"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"‏کراس sim کالنگ"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"‏آنے والا MMS پیغام"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"‏MMS پیغام نہیں بھیجا جا سکا"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"‏موبائل ڈیٹا آف ہونے پر <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> پر MMS پیغام رسانی کی اجازت دینے کے لیے تھپتھپائیں"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"ترتیبات پر اسکرین اوورلیز کو اجازت دیتا ہے"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"ایسی ایپس کو اجازت دیں جو ترتیبات کی اسکرینز کو ایک دوسرے پر چڑھانے کے لیے دوسرے ایپس پر ڈسپلے کر سکتی ہیں"</string>
     <string name="media_controls_title" msgid="403271085636252597">"میڈیا"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"میڈیا سیشن کے ختم ہونے پر کھلاڑی کو چھپائیں"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"کھلاڑی آپ کو پھیلانے کی فوری ترتیبات پینل سے سیشن کو دوبارہ شروع کرنے دیتا ہے۔"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"فوری ترتیبات میں میڈیا پلیئر"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"پلے بیک کو آسانی سے دوبارہ شروع کرنے کے لئے توسیعی مدت کے لئے میڈیا پلیئر دکھائیں"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"کھلاڑی کو چھپائیں"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"کھلاڑی کو دکھائیں"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"کوئی کھلاڑی دستیاب نہیں"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"اجازت یافتہ ایپس"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"میڈیا"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"بلوٹوتھ آن ہو جائے گا"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"آن"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"آف"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"انٹرنیٹ"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIMs"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"ہوائی جہاز کیلئے محفوظ نیٹ ورکس"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"ہوائی جہاز کیلئے محفوظ نیٹ ورکس کو تلاش کریں اور ان سے منسلک ہوں"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"ہوائی جہاز، ہوائی جہاز کیلئے محفوظ"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"‏کالز اور SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"‏Wi‑Fi کالنگ"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"‏Wi-Fi جیسے غیر کیریئر نیٹ ورکس پر کالز کریں اور موصول کریں"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"‏Wi-Fi کالنگ آپ کو کچھ Wi-Fi نیٹ ورک جیسے غیر کیریئر نیٹ ورکس پر کالز کرنے اور موصول کرنے کی اجازت دیتی ہے۔"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"کالز"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"ترجیحی"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"ترجیحی کالز"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"‏SMS ترجیحی"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"دستیاب نہیں"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"‏کوئی SIM نہیں ہے"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"ترجیحات"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"عوامی نیٹ ورکس سے منسلک ہوں"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"‏نیٹ ورک کنکشن، انٹرنیٹ، وائرلیس، ڈیٹا، wifi، wi-fi، wi fi، سیلولر، موبائل، سیل کیریئر، 4g، 3g، 2g، ‏lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"ہوائی جہاز کے لیے محفوظ نیٹ ورکس دیکھیں"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"ہوائی جہاز وضع آف کریں"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"دستیاب نہیں ہے کیونکہ بیڈ ٹائم موڈ آن ہے"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"اطلاع کی اہمیت کو ری سیٹ کرنے کا عمل مکمل ہو گیا۔"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"ایپس"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"غیر بھروسہ مند آلہ آپ کے پیغامات تک رسائی حاصل کرنا چاہتا ہے۔ تفصیلات کے ليے تھپتھپائيں۔"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"پیغامات تک رسائی کی اجازت دیں؟"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"ایک غیر بھروسہ مند بلوٹوتھ آلہ، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، آپ کے پیغامات تک رسائی حاصل کرنا چاہتا ہے۔\n\nآپ پہلے کبھی بھی [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] سے منسلک نہیں ہوئے ہیں۔"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"غیر بھروسہ مند آلہ آپ کے رابطوں اور کال لاگ تک رسائی حاصل کرنا چاہتا ہے۔ تفصیلات کے ليے تھپتھپائيں۔"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"رابطوں اور کال لاگ تک رسائی کی اجازت دیں؟"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"ایک غیر بھروسہ مند بلوٹوتھ آلہ، [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]، آپ کے رابطوں اور کال لاگ تک رسائی حاصل کرنا چاہتا ہے۔ اس میں آنے اور جانے والی کالز کے بارے میں ڈیٹا شامل ہے۔\n\nآپ پہلے کبھی بھی [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] سے منسلک نہیں ہوئے ہیں۔"</string>
 </resources>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 7b0af94..9d885b2 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -73,7 +73,7 @@
     <item msgid="7388036070768806193">"Qidiruv…"</item>
     <item msgid="1656176059757237036">"Ulanmoqda…"</item>
     <item msgid="3249903732481917388">"Tasdiqdan o‘tilmoqda…"</item>
-    <item msgid="7789156794775399931">"IP manzil o‘zlashtirilmoqda…"</item>
+    <item msgid="7789156794775399931">"IP manzil olinmoqda…"</item>
     <item msgid="492518447401534767">"Ulangan"</item>
     <item msgid="4322989558568666518">"Muzlatildi"</item>
     <item msgid="286164147080824297">"Uzilmoqda…"</item>
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"O‘rtacha"</item>
     <item msgid="6740026006576843477">"Uzoq"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Qisqa"</item>
+    <item msgid="7397961711906421599">"Oʻrtacha"</item>
+    <item msgid="4079132024502041928">"Uzun"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Standart"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -494,8 +499,8 @@
     <item msgid="2047166446768045816">"Bu – bepul tarmoq"</item>
   </string-array>
   <string-array name="wifi_privacy_entries">
-    <item msgid="3485945604919292489">"Ixtiyoriy MAC manzil (standart)"</item>
-    <item msgid="741680937828608749">"Ixtiyoriy MAC manzil"</item>
+    <item msgid="3485945604919292489">"Tasodifiy MAC manzil (standart)"</item>
+    <item msgid="741680937828608749">"Qurilmaning MAC manzili"</item>
   </string-array>
   <string-array name="wifi_hidden_entries">
     <item msgid="342232116597649254">"Yo‘q"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA va LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Global"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Faqat TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Global"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index cd208e3..1b6ad87 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -98,7 +98,7 @@
     <string name="bluetooth_show_received_files" msgid="685424727760622632">"Qabul qilingan fayllar"</string>
     <string name="bluetooth_show_files_received_via_bluetooth" msgid="7097860463458492953">"Bluetooth orqali olingan fayllar"</string>
     <string name="bluetooth_devices_card_off_title" msgid="1320149821945129127">"Bluetooth yoqilmagan"</string>
-    <string name="bluetooth_devices_card_off_summary" msgid="2276527382891105858">"Yoqish uchun ustiga bosing"</string>
+    <string name="bluetooth_devices_card_off_summary" msgid="2276527382891105858">"Yoqish uchun bosing"</string>
     <string name="device_picker" msgid="2427027896389445414">"Bluetooth qurilmani tanlang"</string>
     <string name="bluetooth_ask_enablement" msgid="1529030199895339199">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi Bluetooth xizmatini yoqmoqchi"</string>
     <string name="bluetooth_ask_disablement" msgid="1879788777942714761">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasi Bluetooth xizmatini o‘chirib qo‘ymoqchi"</string>
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Sana va vaqt"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Sana va vaqt o‘rnatish"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Sana, vaqt, vaqt zonasi, &amp; formatlarini o‘rnatish"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Tarmoq vaqtidan foydalanish"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Tarmoq vaqt mintaqasidan foydalanish"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Vaqt avtomatik belgilansin"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Vaqt mintaqasi avtomatik belgilansin"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Birlamchi hududiy sozlamalar"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 soatlik format"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"24 soatlik format"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Profil ma‘lumotini qulflangan ekranda ko‘rsatish"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Hisoblar"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Joylashuv"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Joylashuv axborotidan foydalanish"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Joylashuvni aniqlash"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Yoqilmagan"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta ilovada joylashuvga ruxsat bor</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ekran qulfi, qulfni yuzni tanitib ochish"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ekran qulfi, barmoq izi"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Ekran qulfi"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Telefon qulfini yuz va barmoq bilan ochish ham mumkin"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Ilovalarga kirish va toʻlovlarni tasdiqlash ham mumkin"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Qulfni ochish usulini sozlang:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Yuz bilan ochish"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Telefonni qulfdan osongina chiqaring"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Barmoq izi"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Telefonni barmoq bilan qulfdan chiqaring"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Tashlab ketish"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Keyingisi"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Yuz kiritilgan"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Yuz bilan ochishni sozlang"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Yuz bilan ochish"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Qurilma qulfini yuzingiz bilan oching"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Boshlash"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Yuz bilan ochish funksiyasi faolsizlantirilgan boʻlsa, ayrim sozlash bosqichlari TalkBack bilan yaxshi ishlamasligi mumkin."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Orqaga"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Sozlashda davom etish"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Maxsus imkoniyatlarni sozlash"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Ilovalar yuz bilan ochilishida har doim tasdiqlanishi kerak"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Yuz unutilsinmi?"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Yuz bilan ochishni sozlang"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Qulfni ochishda, ilovalarga kirishda va xaridlarni tasdiqlashda Yuz bilan ochish funksiyasidan foydalaning.\n\nDiqqat qiling:\nTelefon qulfi unga tasodifan qaralganda yechilishi mumkin.\n\nBegonalar telefoningizni yuzingizga qaratib ham qulfdan chiqarishi mumkin.\n\nTelefon sizga oʻxshagan yaqinlaringiz tomonidan ham qulfdan chiqarilishi mumkin."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Qulfni ochishda, ilovalarga kirishda va xaridlarni tasdiqlashda Yuz bilan ochish funksiyasidan foydalaning.\n\nDiqqat qiling:\nTelefon qulfi unga tasodifan qaralganda yechilishi mumkin.\n\nKoʻzlaringiz yumilganda ham begonalar telefoningizni yuzingizga qaratish orqali qulfdan chiqarishi mumkin.\n\nTelefon sizga oʻxshagan yaqinlaringiz tomonidan ham qulfdan chiqarilishi mumkin."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Qurilmangizni ochish, ilovalarga kirish va toʻlovlarni tasdiqlash uchun yuz bilan oching."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Diqqat qiling:\nTelefon qulfi unga tasodifan qaralganda yechilishi mumkin.\n\nBegonalar telefoningizni yuzingizga qaratish orqali qulfdan chiqarishi mumkin.\n\nTelefon sizga oʻxshagan yaqinlaringiz tomonidan ham qulfdan chiqarilishi mumkin."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Diqqat qiling:\nTelefon qulfi unga tasodifan qaralganda yechilishi mumkin.\n\nBegonalar telefoningizni yumilgan koʻzlaringizga qaratish orqali ham qulfdan chiqarishi mumkin.\n\nTelefon sizga oʻxshagan yaqinlaringiz tomonidan ham qulfdan chiqarilishi mumkin."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Yuzga oid axborot oʻchirib tashlansinmi?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Yuz bilan ochish funksiyasi tomonidan yozib olingan yuz axboroti butunlay va xavfsiz tarzda olib tashlanadi. Tozalanganidan keyin telefonni ochish, ilovalarga kirish va toʻlovlarni tasdiqlash uchun PIN kod, grafik kalit yoki parol zarur."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Telefon qulfini yuz bilan oching"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Telefonni qulfdan chiqarish yoki xaridlarni tasdiqlash uchun barmoq izingizdan foydalaning.\n\nEslatma: barmoq izi orqali bu qurilmani qulfdan chiqara olmaysiz. Batafsil axborot olish uchun tashkilot administratori bilan bog‘laning."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Telefonni qulfdan chiqarish yoki xaridlarni tasdiqlash uchun barmoq izingizdan foydalaning.\n\nEslatma: Barmoq izining himoya darajasi grafik kalit yoki PIN kodnikidek emas."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Bekor qilish"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Kerak emas"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Davom etish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Tashlab ketish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Keyingisi"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Planshet ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishining oldini oladi. Ekran qulfi yuz bilan ochish parametri bilan sozlanishi kerak. Ortga qaytish uchun Bekor qiling."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Qurilma ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishining oldini oladi. Ekran qulfi yuz bilan ochish parametri bilan sozlanishi kerak. Ortga qaytish uchun Bekor qiling."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Telefon ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishining oldini oladi. Ekran qulfi yuz bilan ochish parametri bilan sozlanishi kerak. Ortga qaytish uchun Bekor qiling."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Planshet ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishining oldini oladi. Biometrikani sozlash uchun ekran qulfi ham sozlanishi kerak. Ortga qaytish uchun Bekor qiling."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Qurilma ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishining oldini oladi. Biometrikani sozlash uchun ekran qulfi ham sozlanishi kerak. Ortga qaytish uchun Bekor qiling."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Telefon ekran qulfi parametrlari bilan himoyalansa, bu uning yoʻqolishi yoki birov tomonidan ishlatilishining oldini oladi. Biometrikani sozlash uchun ekran qulfi ham sozlanishi kerak. Ortga qaytish uchun Bekor qiling."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"PIN kod kerak emasmi?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Parol kerak emasmi?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Grafik kalit kerak emasmi?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu planshetdan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu qurilmadan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Qurilmani himoyalash funksiyalarini faollashtirish orqali boshqalarning ushbu telefondan sizning ruxsatingizsiz foydalanishining oldini oling. Ekran qulfini tanlang."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Ekran qulfi uchun muqobil usulni tanlang"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Ekran qulfi uchun muqobil usulni tanlang"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Ekran qulfi uchun muqobil usulni tanlang"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Ekran qulfi parametrlari"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Ekran qulfi parametrlari"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Ekran qulfi"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Yuz bilan ochish + parol"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Yuz bilan ochish funksiyasisiz davom etish"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Telefonni yuz orqali qulfdan chiqarish mumkin. Xavfsizlik maqsadida bu parametr uchun zaxiraviy usul sifatida ekran qulfini sozlash kerak."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Biometriya + Grafik kalit"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Biometriya + PIN kod"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Biometriya + Parol"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Biometrik tekshiruvsiz davom etish"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Telefonni biometrik tekshiruv orqali qulfdan chiqarish mumkin. Xavfsizlik maqsadida bu parametr uchun zaxiraviy usul sifatida ekran qulfini sozlash kerak."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Administrator, shifrlash siyosati, yoki hisob ma’lumotlari ombori tomonidan o‘chirib qo‘yilgan"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Hech qanday"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Ekranni surish"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Maksimum <xliff:g id="NUMBER_0">%d</xliff:g> ta raqam</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Qurilma administratori oxirgi PIN koddan yana foydalanishga ruxsat bermaydi"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Oddiy PIN kodlar AT admini tomonidan bloklangan. Murakkabroq PIN kod tanlang."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Parol yaroqsiz belgidan iborat bo‘lmasligi lozim"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Parol kamida bitta harfdan iborat bo‘lishi lozim"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Parol kamida bitta raqamdan iborat bo‘lishi lozim"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Kamida 1 ta raqamsiz belgi boʻlishi lozim</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Qurilma administratori yaqinda foydalanilgan paroldan yana foydalanishga ruxsat bermaydi"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Oddiy parollar AT admini tomonidan bloklangan. Murakkabroq parol tanlang."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Oshib boruvchi, kamayib boruvchi yoki qaytarilgan ketma-ket raqamlarga ruxsat berilmaydi"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Tasdiqlash"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Bekor qilish"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Wi‑Fi‘ni yoqish"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Wi-Fi ishlatish"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Wi-Fi orqali"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi‑Fi sozlamalari"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Ulanish nuqtalarini sozlash &amp; boshqarish"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Qurilmani “<xliff:g id="SSID">%1$s</xliff:g>” nomli tarmoqqa ulash uchun quyidagi QR kodni kameraga qarating"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Wi-Fi tarmoqqa QR kodni skanerlab ulanish"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Wi‑Fi tarmoqni ulashish"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"“<xliff:g id="SSID">%1$s</xliff:g>” nomli tarmoqqa ulanish va parolni ulashish uchun mazkur QR kodni skanerlang"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"“<xliff:g id="SSID">%1$s</xliff:g>” nomli tarmoqqa ulanish uchun boshqa qurilmada bu QR kodni skanerlang"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"“<xliff:g id="SSID">%1$s</xliff:g>” nomli tarmoqqa ulanish uchun mazkur QR kodni skanerlang"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Qayta urining. Muammo qaytarilsa, qurilma ishlab chiqaruvchisiga murojaat qiling"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Xatolik yuz berdi"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi paroli: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Hotspot paroli: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Avtoulanish"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Bu tarmoq doirasida avtomatik ulanishga ruxsat berish"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Bu tarmoq doirasida avtomatik ulanishga ruxsat berish"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Xizmat doirasida bu tarmoqqa ulanishga ruxsat bering"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Qurilma kiritish"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Qurilmani bu tarmoqqa kiritish uchun QR kodni skanlang"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR xato formatda"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Tizim sertifikatlaridan foydalanish"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Taklif etilmasin"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Tasdiqlanmasin"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Birorta ham sertifikat ko‘rsatilmagan. Aloqangiz ochiq bo‘ladi."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Tarmoq nomi juda uzun."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Domenni kiriting."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Sertifikat talab etiladi."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Ulanish"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi-Fi yoqildi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ilovasiga ulandi"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Ulanmoqda: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Ulanmoqda…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Tarmoqqa ulanmadi"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Tarmoq xizmat doirasidan tashqarida"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"Tarmoq nomi (SSID)"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Qurilmaning MAC manzili"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Tasodifiy MAC manzil"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Tasodifiy MAC manzil (oxirgi ishlatilgan)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP manzil"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Tarmoq tafsilotlari"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Quyi tarmoq niqobi"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 manzillar"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Saqlangan tarmoqlar"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Obunalar"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Boshqa tarmoqlar"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP sozlamalari"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Ushbu foydalanuvchi Wi-Fi kengaytirilgan sozlamalaridan foydalana olmaydi"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Saqlash"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Shlyuz manzilini to‘g‘ri kiriting."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"DNS manzilini to‘g‘ri kiriting."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Tarmoq raqamlari sig‘imini 0 va 32 oralig‘ida tering."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (shaxsiy DNS server bilan almashtirilmasa)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (shaxsiy DNS server bilan almashtirilmasa)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Shlyuz"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Tarmoq prefiksi uzunligi"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Ilova kontent ulashmoqda. Internet tarqatish uchun hotspotni o‘chirib, keyin qayta yoqing."</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Parollanmagan"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Hotspot nomi"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> yoqilmoqda…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> yoqilmoqda…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Boshqa qurilmalar <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g> tarmog‘iga ulanishi mumkin"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Hotspot paroli"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Wi-Fi diapazoni"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Smooth Display"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Ayrim kontent uchun ekranning yangilanish chastotasi 60-90 Gs orasida almashib turadi. Batareya tezroq sarflanadi."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Smooth Display"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Majburiy yangilanish chastotasi: 90 Gs"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Ekran sensorining javob qaytarishi va animatsiyalar sifati uchun eng yuqori yangilanish chastotasi Batareya tezroq sarflanadi."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Moslashuvchan kutish rejimi"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Yoniq / Ekranga qarab turganingizda u yoniq holatda qoladi"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Yangi bildirishnomalar kelganda ekran yonadi"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Vaqt va axborot doim chiqsin"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Batareya sarfi oshadi"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Qalin matn"</string>
     <string name="title_font_size" msgid="570613010306330622">"Shrift o‘lchami"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Matnni kattalashtirish yoki kichiklashtirish"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM karta qulfi sozlamalari"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android versiyasi"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android xavfsizlik yangilanishi"</string>
     <string name="model_info" msgid="8997566254717810904">"Model"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Model: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Model va qurilma"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Apparat versiyasi"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"Jihozning nomi"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"APNni o‘chirish"</string>
     <string name="menu_new" msgid="6571230342655509006">"Yangi APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"Saqlash"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Bekor qilish"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Bekor qilish"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Nom to‘ldirilmagan bo‘lolmaydi."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN kiritilishi shart"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Ilovalarni asliga qaytarish mumkin"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Wi-Fi, mobil internet va Bluetooth parametrlarini tiklash"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Bu barcha tarmoq sozlamalarini, jumladan, mazkur sozlamalarni asliga qaytaradi:\n\n"<li>"Wi‑Fi"</li>\n<li>"Mobil internet"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Tozalash"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Yuklab olingan SIM kartalar axborotini tozalash"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Almashtiriladigan SIM kartalar yuklab olish uchun aloqa operatoringizga murojaat qiling. Bunda mobil xizmatning hech qaysi tarif rejasi bekor qilinmaydi."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Bunda mobil xizmatning hech qaysi tarif rejasi bekor qilinmaydi. Yangi eSIM profilini yuklab olish uchun aloqa operatoriga murojaat qiling"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Asliga qaytarish"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Barcha tarmoq sozlamalari qayta tiklansinmi? Bu amalni ortga qaytarish imkonsiz."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Barcha tarmoq sozlamalari tiklasinmi va yuklab olingan SIM kartalar axboroti tozalansinmi? Bu amalni ortga qaytara olmaysiz."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Tarmoq sozlamalari qayta tiklandi"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"SIM kartalar axboroti tozalanmadi"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Xato sababli yuklab olingan SIM kartalar axboroti tozalanmadi.\n\nQurilmani qayta ishga tushirib, qaytadan urining."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Hamma narsani tozalash (zavod sozlamalarini tiklash)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Hamma narsani tozalash (zavod sozlamalarini tiklash)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Bu planshetning "<b>"ichki xotirasidagi"</b>" barcha maʼlumotlarni tozalab tashlaydi, jumladan:\n\n"<li>"Sizning Google hisobingiz"</li>\n<li>"Tizim va ilovalar axborotlari va sozlamalari"</li>\n<li>"Yuklab olingan olingan ilovalar"</li>"ni."</string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Telefonning "<b>"ichki xotirasidagi"</b>" hamma narsa tozalab tashlanadi, jumladan:\n\n"<li>"Google hisobingiz"</li>\n<li>"Tizim va ilovalar sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Bu qurilmada boshqa foydalanuvchilar ham bor.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Musiqa"</li>\n<li>"Rasmlar"</li>\n<li>"Foydalanuvchining boshqa ma\'lumotlari"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM kartalar"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Bunda, mobil aloqa xizmatiga hech narsa qilinmaydi."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Musiqa, rasm va boshqa ma’lumotlarni o\'chirish uchun "<b>"USB xotirani"</b>" ham tozalash kerak."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Musiqa, rasm va boshqa ma’lumotlarni o‘chirish uchun "<b>"SD kartani"</b>" ham tozalash kerak."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Barcha maʼlumotlarni tozalash (zavod sozlamalarini tiklash)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Barcha maʼlumotlarni tozalash (zavod sozlamalarini tiklash)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Planshetning "<b>"ichki xotirasidagi"</b>" hamma narsa tozalab tashlanadi, jumladan:\n\n"<li>"Google hisobingiz"</li>\n<li>"Tizim va ilovalar sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li>"."</string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Telefonning "<b>"ichki xotirasidagi"</b>" hamma narsa tozalab tashlanadi, jumladan:\n\n"<li>"Google hisobingiz"</li>\n<li>"Tizim va ilovalar sozlamalari"</li>\n<li>"Yuklab olingan ilovalar"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Siz hozir tizimga quyidagi hisoblardan kirgansiz:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Bu qurilmada boshqa foydalanuvchilar ham bor.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Musiqalar"</li>\n<li>"Rasmlar"</li>\n<li>"Foydalanuvchining boshqa ma\'lumotlari"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM kartalar"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Bunda, mobil aloqa xizmatiga hech narsa qilinmaydi."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Musiqa, rasm va boshqa maʼlumotlarni tozalash uchun "<b>"USB xotirani"</b>" tozalash kerak."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Musiqa, rasm va boshqa maʼlumotlarni tozalash uchun "<b>"SD kartani"</b>" tozalash kerak."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"USB xotirani tozalash"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"SD-kartani tozalash"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Ichki USB xotiradan musiqa va rasmlar kabi barcha ma‘lumotlarni tozalash"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"SD-kartadagi barcha ma’lumotlar, jumladan, musiqa va rasmlarni o‘chirib tashlash"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Hamma narsani tozalash"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Hamma narsani tozalash"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Barcha shaxsiy maʼlumotlaringiz va yuklab olingan ilovalar tozalab tashlanadi. Bu amalni ortga qaytara olmaysiz."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Barcha shaxsiy maʼlumotlaringiz, jumladan, yuklab olingan ilovalar va SIM kartalar axboroti tozalab tashlanadi. Bu amalni ortga qaytara olmaysiz."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Hammasini tozalash"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Dastlabki sozlamalarni qaytarib bo\'lmadi, chunki Tizimni tozalash xizmati javob bermayapti."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Hamma narsa tozalansinmi?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Ushbu foydalanuvchiga sozlamalarni zavod holatiga qaytarishga ruxsat berilmagan"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"O‘chirilmoqda"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Iltimos, kuting…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Hamma narsani tozalash"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Hamma narsani tozalash"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Barcha shaxsiy maʼlumotlaringiz va yuklab olingan ilovalar tozalab tashlanadi. Bu amalni ortga qaytara olmaysiz."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Barcha shaxsiy maʼlumotlaringiz, jumladan, yuklab olingan ilovalar va SIM kartalar axboroti tozalab tashlanadi. Bu amalni ortga qaytara olmaysiz."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Hamma narsa tozalansinmi?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Bu foydalanuvchiga sozlamalarni zavod holatiga qaytarishga ruxsat berilmagan"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Tozalanmoqda"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Kutib turing…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Chaqiruv sozlamalari"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Ovozli pochta, qo‘ng‘iroqni yo‘naltirish, qo‘ng‘roqni kutish va chaqiruvchi IDsi sozlamalari"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB modem"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>dan ortiq qurilmalarga bog‘lanib bo‘lmaydi."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ulashilmaydi."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ethernet modem rejimi"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Telefondagi internetni USB Ethernet orqali tarqatish"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Telefondagi internetni Ethernet orqali tarqatish"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Boshqa qurilmalarga mobil internetni tarqatish uchun hotspot va modem rejimidan foydalaning. Ilovalar ham yaqin-atrofdagi qurilmalarga kontent ulashish uchun hotspot yarata oladi."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Boshqa qurilmalarga Wi-Fi yoki mobil internet orqali internetni tarqatish uchun hotspot va modem rejimlaridan foydalaning. Ilovalar ham yaqin-atrofdagi qurilmalarga kontent ulashish uchun hotspot yarata oladi."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Yordam"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Bluetooth qurilmalarni qidirish"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Bluetooth yoniq emasligida ham ilovalar va xizmatlarga yaqin-atrofdagi qurilmalarni qidirish uchun ruxsat. Shunda joylashuv axborotiga asoslangan funksiya va xizmatlarning ishlashi yanada yaxshilanadi."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Ish uchun joylashuv xizmatlari"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Vaqt mintaqasini joylashuv asosida aniqlash"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Vaqt mintaqasini joylashuv asosida aniqlash"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Vaqt mintaqasini qurilma joylashuvi yordamida avtomatik aniqlashga ruxsat beradi. Wi‑Fi tarmoqni skanerlash kabi boshqa joylashuv sozlamalari vaqt mintaqasini aniqlash sifatiga taʼsir qiladi."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Yoniq"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Yoqilmagan"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Vaqt mintaqasini avtomatik aniqlash yoqilmagan"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Vaqt mintaqasini joylashuv asosida aniqlash yoqilmagan"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Vaqt mintaqasini joylashuv asosida aniqlash imkonsiz"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Vaqt mintaqasini joylashuv asosida aniqlash mumkin emas"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi‑Fi &amp; uyali tarmoq joylashuvi"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Joylashuvingizni tezroq aniqlash uchun ilovalarga Google joylashuv xizmatlaridan foydalanishga ruxsat berish. Joylashuv haqida anonim ma’lumot to‘planib, Google‘ga yuboriladi."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Wi‑Fi orqali aniqlangan joylashuv"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Yuz bilan ochish uchun parolni sozlang"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Yuz bilan ochish uchun grafik parolni sozlang"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Yuz bilan ochish uchun PIN kodni sozlang"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Biometriya uchun avval parol belgilang"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Biometriya uchun grafik kalit belgilang"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Biometriya uchun avval PIN kod belgilang"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Parolni unutdingizmi?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Chizmali kalitni unutdingizmi?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"PIN kodni unutdingizmi?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Taglavha sozlamalari"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Kattalashtirish"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Kattalashtiriladigan hudud"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Kattalashtirish sozlamasini yoqish"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Kattalashtiriladigan ekran hududini tanlang"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Butun ekran"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ekran qismi"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Butun ekran va ekran qismi"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Butun ekranni kattalashtirish"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Ekran qismini kattalashtirish"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Maxsus imkoniyatlar tugmasidan foydalanasizmi?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ekranning ayrim qismini kattalashtirish uchun uch marta bosishdan foydalansangiz, yozish va boshqa amallar kechikishi mumkin.\n\nKattalashtirish uchun Maxsus imkoniyatlar tugmasidan foydalanishni istaysizmi?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Maxsus imkoniyatlar tugmasidan foydalanaman"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Kattalashtirish uchun uch marta bosishdan foydalanaman"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Kattalashtirish sozlamalari"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Uch marta bosib kattalashtirish"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Tugma yordamida kattalashtirish"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Quvvat tugmasi chaqiruvni tugatadi"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Yirik sichqoncha kursori"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Animatsiyalarni olib tashlash"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Ovoz ijro qilinayotganda kanallarni birlashtirish"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Tovush muvozanati"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Chap"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Oʻng"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Mono audio"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Audio ijro qilinayotganda kanallarni birlashtirish"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Audio muvozanati"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Chap"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Oʻng"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Asosiy"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 soniya"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 soniya"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Bildirishnomada tebranish"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Jiringlaganda tebranish"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Teginganda tebranish"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ishlatish"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ilovasini ochish"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Rangni tuzatishdan foydalanish"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Taglavhalarni chiqarish"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Faqat bu funksiya ishlaydigan ilova uchun"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g> ishlatish"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Ochish: <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Rangni tuzatish funksiyasidan foydalanish"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Taglavhalarni chiqarish"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Faqat bu funksiya ishlaydigan ilova uchun"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Taglavha hajmi va uslubi"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Matn hajmi: <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Boshqa parametrlar"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Deyteranomaliya"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Protanomaliya"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Tritanomaliya"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Kulrang tus"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Qizil va yashil"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Qizil va yashil"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Koʻk va sariq"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Fonda ishlashini cheklash"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Ilovaga fonda ishlashiga ruxsat berish"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Ilovaga fonda ishlashiga ruxsat berilmagan"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Fonda ishlashini cheklash imkonsiz"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Fonda ishlashini cheklash imkonsiz"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Fonda ishlashi cheklansinmi?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Bu ilovaning ishlashiga ta’sir ko‘rsatishi mumkin"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Bu ilova batareya sarfini optimallashtirish uchun sozlanmagani sababli uni cheklash imkonsiz.\n\nIlovani cheklash uchun avval batareya sarfini optimallashtirish funksiyasini yoqing."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Planshet odatdagidan ko‘proq ishlatildi"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Qurilma odatdagidan ko‘proq ishlatildi"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Batareya quvvati odatdagiga nisbatan tezroq tugashi mumkin"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Batareya quvvati muvozanatlanmoqda"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Batareya quvvati darajasi vaqtincha cheklangan. Batafsil axborot olish uchun bosing."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Telefoningiz odatdagidan koʻproq ishlatildi. Batareya quvvati kutilgandan tezroq tugashi mumkin.\n\nBatareyani eng koʻp sarflagan ilovalar:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Planshetingiz odatdagidan koʻproq ishlatildi. Batareya quvvati kutilgandan tezroq tugashi mumkin.\n\nBatareyani eng koʻp sarflagan ilovalar:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Qurilmangiz odatdagidan koʻproq ishlatildi. Batareya quvvati kutilgandan tezroq tugashi mumkin.\n\nBatareyani eng koʻp sarflagan ilovalar:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d ta ilova cheklandi</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Batareya quvvati aniqlanmadi"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Batareya quvvati aniqlanmadi. "<annotation id="url">"Batafsil axborot"</annotation>" olish uchun bosing."</string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Ilova yopilsinmi?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2564,7 +2601,7 @@
     <string name="battery_overall_usage" msgid="8940140259734182014">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya quvvati"</string>
     <string name="battery_detail_since_full_charge" msgid="5650946565524184582">"100%% quvvatlanganidan beri batareya sarfi"</string>
     <string name="battery_last_full_charge" msgid="8308424441475063956">"Oxirgi toʻliq quvvatlanish"</string>
-    <string name="battery_full_charge_last" msgid="465146408601016923">"100%% quvvat bilan ishlash vaqti"</string>
+    <string name="battery_full_charge_last" msgid="465146408601016923">"Toʻliq quvvat qancha vaqtga yetishi"</string>
     <string name="battery_footer_summary" msgid="9125397752380281832">"Batareyaning qolgan vaqti taxminiy va u foydalanish intensivligiga qarab farq qilishi mumkin"</string>
     <string name="battery_detail_foreground" msgid="3312280147931093967">"Faol rejimda"</string>
     <string name="battery_detail_background" msgid="3333915023706228000">"Fon rejimida"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Jadval tuzish"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Batareya quvvati sarfini uzaytirish"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Quvvatlanayotganda faolsizlantirish"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Telefon quvvati <xliff:g id="PERCENT">%1$s</xliff:g> ga yetganda Quvvat tejash rejimi faolsizlantiriladi"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Planshet quvvati <xliff:g id="PERCENT">%1$s</xliff:g> ga yetganda Quvvat tejash rejimi faolsizlantiriladi"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Qurilma quvvati <xliff:g id="PERCENT">%1$s</xliff:g> ga yetganda Quvvat tejash rejimi faolsizlantiriladi"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Telefon quvvati <xliff:g id="PERCENT">%1$s</xliff:g> dan oshganda Quvvat tejash rejimi faolsizlantiriladi"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Planshet quvvati <xliff:g id="PERCENT">%1$s</xliff:g> dan oshganda Quvvat tejash rejimi faolsizlantiriladi"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Qurilma quvvati <xliff:g id="PERCENT">%1$s</xliff:g> dan oshganda Quvvat tejash rejimi faolsizlantiriladi"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Yoqish"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Asliga qaytarish"</string>
     <string name="tts_play" msgid="2945513377250757221">"Ijro"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Moslashuvchan ulanish"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Tarmoq ulanishlarini avtomatik boshqarish orqali batareya quvvatini uzoq saqlaydi va qurilma unumdorligini oshiradi"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Hisob axboroti ombori"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Sertifikat oʻrnatish"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Sertifikatlarni xotira kartasidan o‘rnatish"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Foydalanuvchining hisob axboroti"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Saqlab olingan hisob ma’lumotlarini ko‘rish va o‘zgartirish"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Kengaytirilgan sozlamalar"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Ombor turi"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Apparatli"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Faqat dasturiy"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Ushbu foydalanuvchi uchun hisob ma’lumotlari mavjud emas"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"VPN va ilovalar uchun o‘rnatilgan"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Wi-Fi uchun o‘rnatilgan"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Oʻrnatilmasin"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Baribir oʻrnatilsin"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Sertifikat oʻrnatilmadi"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"<xliff:g id="APP_NAME">%s</xliff:g> ilovasiga bu qurilmada sertifikatlarni oʻrnatishga ruxsat berilsinmi?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Bu sertifikatlar sizni quyidagi ilovalar va URL manzillarga tanishtiradi"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Ruxsat berilmasin"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Ruxsat berish"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Yana"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Sertifikat boshqaruvi ilovasi"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Hech qanday"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Bu ilova tomonidan oʻrnatilgan sertifikatlar quyidagi ilova va URL manzillarda shaxsingiz tasdiqlaydi"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Olib tashlash"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Favqulodda chaqiruv signali"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Favqulodda qo‘ng‘iroq uchun xususiyat o‘rnatish"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Zaxiralash"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ish profili – sozlanmagan"</string>
     <string name="user_admin" msgid="4024553191395768119">"Administrator"</string>
     <string name="user_you" msgid="3070562015202859996">"Siz (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Nik nomi"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"<xliff:g id="USER_COUNT">%1$d</xliff:g> tagacha foydalanuvchi qo‘shish mumkin"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Faqat planshetning egasi foydalanuvchilarni boshqara oladi."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Faqat telefonning egasi foydalanuvchilarni boshqara oladi."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Qanday toʻlanadi"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Avval to‘lov ilovasini sozlang. Keyin telefoningiz orqa tomonini kontaktsiz to‘lov belgisi tushirilgan terminalga yaqinlashtiring."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"OK"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Yana…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Yana…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Birlamchi toʻlov ilovasini belgilash"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Birlamchi toʻlov ilovasini yangilash"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kontaktsiz terminalda <xliff:g id="APP">%1$s</xliff:g> bilan toʻlansin"</string>
@@ -3070,7 +3114,7 @@
     <string name="restriction_settings_title" msgid="4293731103465972557">"Cheklovlar"</string>
     <string name="restriction_menu_reset" msgid="92859464456364092">"Cheklovlarni olib tashlash"</string>
     <string name="restriction_menu_change_pin" msgid="2505923323199003718">"PIN kodni o‘zgartirish"</string>
-    <string name="help_label" msgid="2896538416436125883">"Yordam va fikr-mulohaza"</string>
+    <string name="help_label" msgid="2896538416436125883">"Yordam/fikr-mulohaza"</string>
     <string name="support_summary" msgid="1034146931237148885">"Yordam maqolalari, telefon va chat, ishni boshlash"</string>
     <string name="user_account_title" msgid="6389636876210834864">"Kontent uchun hisob"</string>
     <string name="user_picture_title" msgid="7176437495107563321">"Suratli hujjat"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Orqaga"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Keyingisi"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Yakunlash"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Suratga olish"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Rasm tanlash"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Surat tanlash"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM kartalar"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM kartalar"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Bundan doim qo‘ng‘iroqlar uchun foyd-sin"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Internet uchun SIM kartani tanlang"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"SMS lar uchun SIM kartani tanlang"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Mobil internet uchun SIM karta almashtirilmoqda. Bu bir necha daqiqa vaqt olishi mumkin..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Mobil internet uchun SIM karta almashtirilmoqda. Bu bir necha daqiqa vaqt olishi mumkin…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Quyidagi bilan qo‘ng‘iroq qilish"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"SIM kartani tanlang"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"<xliff:g id="CARD_NUMBER">%1$d</xliff:g>-SIM"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"amallar ketma-ketligi, jadval, batareya tejagich, quvvat tejagich, batareya, avtomatik, foiz"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, kengaytirilgan chaqiruv, 4g chaqiruv"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"til kiritish, tilni kiritish"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"shrift hajmi"</string>
     <string name="default_sound" msgid="6604374495015245195">"Birlamchi ovoz"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Rington va bildirishnoma balandligi: 80<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Tovush balandligi, tebranish, Bezovta qilinmasin rejimi"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Ovozni yoqish"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Jonli izoh"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Avtomatik taglavha yaratish"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Qoida berilmagan"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ta reja sozlandi</item>
-      <item quantity="one">1 ta reja sozlandi</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Hech qanday}=1{1 ta reja sozlandi}other{# ta reja sozlandi}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Bezovta qilinmasin"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Faqat ishonchli odamlar va ilovalardan bildirishnoma kelsin"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Bildirishnomalarni kamaytirish"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Faqat muhimlari"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Yoniq / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Yoqilmagan / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Yoqilmagan"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Yoniq"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Har safar soʻralsin"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Rejimdan chiqilgunicha"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> soat</item>
-      <item quantity="one">1 soat</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> daqiqa"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ta rejani avtomatik tarzda yoqish mumkin</item>
-      <item quantity="one">1 ta rejani avtomatik tarzda yoqish mumkin</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 soat}other{# soat}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 daqiqa}other{# daqiqa}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Yoqilmagan}=1{Yoqilmagan / 1 ta rejani avtomatik tarzda yoqish mumkin}other{Yoqilmagan / # ta rejani avtomatik tarzda yoqish mumkin}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Bezovta qilinmasin rejimi uchun istisno"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Odamlar"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Ilovalar"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Muhimligi past bildirishnomalar avtomatik ravishda tovushsiz qilinsin"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Moslashuvchan bildirishnomalar tartiblanishi"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Bildirishnomalarni moslik asosida avtomatik tartiblash"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Moslashuvchan bildirishnoma amalini tanlash"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bildirishnomalarga kiritilgan oʻzgartirishlar va tizim amalini tanlash oynasi"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Bildirishnoma muhimligi sozlamalarini tiklash"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Foydalanuvchi oʻzgartirgan muhim sozlamalarni tiklang va ilovalarga bildirishnomalar muhimligini aniqlashga ruxsat bering"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Tavsiya etiladigan amallar va javoblar"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Tavsiya etiladigan amallar va javoblarni avtomatik chiqarish"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Oxirgi va keyinga qoldirilgan bildirishnomalar"</string>
@@ -3554,14 +3588,17 @@
     <string name="important_conversations" msgid="1233893707189659401">"Muhim suhbatlar"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Suhbatlar ruknining tepasida erkin bulutcha sifatida chiqarish"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Suhbatlar ruknining tepasida chiqarish"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Boshqa suhbatlar"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Quyi darajali suhbatlar"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Siz oʻzgartirish kiritgan suhbatlar"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Oxirgi suhbatlar"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Oxirgilarni tozalash"</string>
+    <string name="clear" msgid="5092178335409471100">"Tozalash"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Muhim suhbatlar pufakchali chiqsin"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Muhim suhbatlar bildirishnomalar panelining tepasida chiqadi. Siz ularni qalqib chiqadigan va Bezovta qilinmasin rejimida ham bildirishnoma chiqadigan qilishingiz mumkin."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Muhim va oʻzgargan suhbatlar shu yerda chiqadi"</string>
     <string name="conversation_onboarding_summary" msgid="2484845363368486941">"Muhim deb belgilangan yoki oʻzgartirish kiritilgan xabarlar shu yerda chiqadi. \n\nSuhbat sozlamalarini oʻzgartirish uchun: \nEkran tepasini bosib pastga torting, keyin suhbat ustiga biroz bosib turing."</string>
     <string name="notification_importance_min" msgid="4609688642942787774">"Tovushsiz chiqarish va kichraytirish"</string>
-    <string name="notification_importance_low" msgid="7562535765919565273">"Tovushsiz"</string>
+    <string name="notification_importance_low" msgid="7562535765919565273">"Sokin"</string>
     <string name="notification_importance_default" msgid="7483906490369073043">"Tovush bilan"</string>
     <string name="notification_importance_high" msgid="8453789143477210550">"Tovush va qalqib chiquvchi oyna"</string>
     <string name="notification_importance_high_silent" msgid="8977232884004607985">"Ekranga qalqib chiqish"</string>
@@ -3570,7 +3607,7 @@
     <string name="notification_importance_default_title" msgid="8875198696330289686">"Yuqori"</string>
     <string name="notification_importance_high_title" msgid="394129291760607808">"Ekranga qalqib chiqish"</string>
     <string name="notification_block_title" msgid="7392909527700971673">"Bloklash"</string>
-    <string name="notification_silence_title" msgid="4085829874452944989">"Tovushsiz"</string>
+    <string name="notification_silence_title" msgid="4085829874452944989">"Sokin"</string>
     <string name="notification_alert_title" msgid="1632401211722199217">"Standart"</string>
     <string name="allow_interruption" msgid="5237201780159482716">"Bildirishnomalarga ruxsat berish"</string>
     <string name="allow_interruption_summary" msgid="9044131663518112543">"Ilovaga ovozli signal va tebranishni yoqishi hamda ekranga bildirishnomalarni chiqarishiga imkon beradi"</string>
@@ -3641,7 +3678,7 @@
     <string name="interact_across_profiles_consent_dialog_app_data_title" msgid="8436318876213958940">"Ilovaga tegishli maʼlumotlar"</string>
     <string name="interact_across_profiles_consent_dialog_app_data_summary" msgid="6057019384328088311">"Bu ilova <xliff:g id="NAME">%1$s</xliff:g> ilovasidagi maʼlumotlarga kira oladi."</string>
     <string name="interact_across_profiles_consent_dialog_permissions_title" msgid="2316852600280487055">"Ruxsatlar"</string>
-    <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"Bu ilova shaxsiy <xliff:g id="NAME">%1$s</xliff:g> ilovangizning ruxsatlaridan foydalana oladi. Masalan, joylashuv axborotingizni bilish, xotira yoki kontaktlardan foydalanish kabi."</string>
+    <string name="interact_across_profiles_consent_dialog_permissions_summary" msgid="995051542847604039">"Bu ilova shaxsiy <xliff:g id="NAME">%1$s</xliff:g> ilovangiz uchun berilgan ruxsatlardan foydalana oladi. Masalan, joylashuvingiz haqidagi axborotni bilish, xotira yoki kontaktlardan foydalanish."</string>
     <string name="interact_across_profiles_number_of_connected_apps_none" msgid="8573289199942092964">"Hech qanday ilova ulanmagan"</string>
     <plurals name="interact_across_profiles_number_of_connected_apps" formatted="false" msgid="6991750455661974772">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ta ilova ulandi</item>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Bezovta qilinmasin rejimi"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Bezovta qilinmasin ruxsatini berish"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Hech qanday ilova “Bezovta qilinmasin” funksiyasiga ruxsat so‘ramagan"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Ilovalar yuklanmoqda…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Ilovalar yuklanmoqda…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android ushbu ilova bildirishnomalarini ekranga chiqarmaydi"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android bu turkumdagi bildirishnomalarni bloklamoqda"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android bunday bildirishnomalar guruhini bloklaydi"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Barcha suhbatlar"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Muhim suhbatlar"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Hech qanday"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> ta suhbat</item>
-      <item quantity="one">1 ta suhbat</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Hech qanday"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Hech qanday}=1{1 ta suhbat}other{# ta suhbat}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Bezovta qilinmasin rejimi kimlarda ishlamaydi"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Chaqiruvlar"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Chaqiruvlar"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Muhim chaqiruvlarni oʻtkazib yubormaslik uchun qurilmangizda tovushli signal yoqilganini tekshiring."</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Kiruvchi chaqiruvlar “<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” qoidasi bilan bloklangan. Bezovta qilinmasin rejimida kiruvchi chaqiruvlar bloklanadi. Tanishlar, qarindoshlaringizdan chaqiruvlarni qabul qila olishingiz uchun sozlamalarni tahrirlang."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Yulduzchali kontaktlar"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">Yana <xliff:g id="NUM_PEOPLE">%d</xliff:g> ta kontakt</item>
-      <item quantity="one">Yana 1 ta kontakt</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Hech qanday"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Hech qanday}=1{{contact_1}}=2{{contact_1} va {contact_2}}=3{{contact_1}, {contact_2} va {contact_3}}other{{contact_1}, {contact_2} va yana # kishi}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Ismi koʻrsatilmagan)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Xabarlar"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"xabarlar"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Xabarlar"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>” uchun kiruvchi xabarlar bloklandi. Tanishlar, qarindoshlaringizdan SMS xabarlarni tovushli signal bilan qabul qila olishingiz uchun sozlamalarni tahrirlang."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Barcha xabarlar yetkaziladi"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Barcha chaqiruvlar chalinadi"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Hech qanday"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> ta kontakt</item>
-      <item quantity="one">1 ta kontakt</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Hech qanday}=1{1 ta kontakt}other{# ta kontakt}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Har kim"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Kontaktlar"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Yulduzchali kontaktlar"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Barcha bildirishnomalar"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Ayrim bildirishnomalar"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Tanlangan odamlar xabarlari hatto bezovta qilinmasin rejimida ham keladi"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">Bezovta qilinmasin rejimi <xliff:g id="APP_NAMES">%s</xliff:g> uchun ishlamaydi</item>
-      <item quantity="one">Bezovta qilinmasin rejimi <xliff:g id="APP_NAME_0">%s</xliff:g> uchun ishlamaydi</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"Yana <xliff:g id="NUMBER">%d</xliff:g> ta"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Bezovta qilinmasin rejimi barcha ilovalar uchun ishlaydi}=1{Bezovta qilinmasin rejimi {app_1} uchun ishlamaydi}=2{Bezovta qilinmasin rejimi {app_1} va {app_2} uchun ishlamaydi}=3{Bezovta qilinmasin rejimi {app_1}, {app_2} va {app_3} uchun ishlamaydi}other{Bezovta qilinmasin rejimi {app_1}, {app_2} va yana # ta ilova uchun ishlamaydi}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Ilovalar"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Barcha bildirishnomalar"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Ayrim bildirishnomalar"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Bezovta qila oladigan bildirishnomalar"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Barcha bildirishnomalarga ruxsat berish"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">Bezovta qilinmasin rejimi <xliff:g id="SOUND_CATEGORIES">%s</xliff:g> turkumidagi tovushlar uchun ishlamaydi</item>
-      <item quantity="one">Bezovta qilinmasin rejimi <xliff:g id="SOUND_CATEGORY">%s</xliff:g> turkumidagi tovushlar uchun ishlamaydi</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Bezovta qilinmasin rejimi barcha tovushlar uchun ishlaydi"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"Yana <xliff:g id="NUMBER">%d</xliff:g> ta"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Bezovta qilinmasin rejimi barcha tovushlar uchun ishlaydi}=1{Bezovta qilinmasin rejimi {sound_category_1} uchun ishlamaydi}=2{Bezovta qilinmasin rejimi {sound_category_1} va {sound_category_2} uchun ishlamaydi}=3{Bezovta qilinmasin rejimi {sound_category_1}, {sound_category_2} va {sound_category_3} uchun ishlamaydi}other{Bezovta qilinmasin rejimi {sound_category_1}, {sound_category_2} va yana # ta tovushlar uchun ishlamaydi}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Bezovta qilinmasin rejimi barcha tovushlar uchun ishlaydi"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Bezovta qilinmasin rejimi barcha xabar va chaqiruvlar uchun ishlaydi"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Bezovta qilinmasin rejimi ayrim foydalanuvchilardan keladigan xabar va chaqiruvlar uchun ishlamaydi"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Bezovta qilinmasin rejimi foydalanuvchilardan keladigan xabar va chaqiruvlar uchun ishlamaydi"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"YONIQ"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Yoqilmagan"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Ilovani mahkamlash"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Bu funksiya muayyan ilovaning ekranini telefonda boshqa ilovalarga kirishni yopgan holda mahkamlaydi. Undan tanishlar bilan oʻyin oʻynash uchun foydalanish mumkin. \n\nMahkamlangan ilova boshqa ilovalarni ochishi va shaxsiy maʼlumotlarga kirishi mumkin. \n\nBu funksiyadan foydalanish uchun quyidagilarni bajaring: 	\n1.	Sozlamalar orqali funksiyani yoqing 	\n2.	Umumiy menyusini oching 	\n3.	Ekranning yuqori qismidagi ilova belgisini bosib, keyin Mahkamlash tugmasini bosing."</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Bu funksiya muayyan ilovaning ekranini telefonda boshqa ilovalarga kirishni yopgan holda mahkamlaydi. Undan tanishlar bilan oʻyin oʻynash uchun foydalanish mumkin. \n\nMahkamlangan ilova boshqa ilovalarni ochishi va shaxsiy maʼlumotlarga kirishi mumkin. \n\nAgar qurilmangizdan boshqalar foydalanadigan boʻlsa, ular uchun mehmon foydalanuvchini yoqing. \n\nBu funksiyadan foydalanish uchun quyidagilarni bajaring: 	\n1.	Sozlamalar orqali funksiyani yoqing 	\n2.	Umumiy menyusini oching 	\n3.	Ekranning yuqori qismidagi ilova belgisini bosib, keyin Mahkamlash tugmasini bosing."</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Bu funksiya muayyan ilovaning ekranini telefonda boshqa ilovalarga kirishni yopgan holda mahkamlaydi. Undan tanishlar bilan oʻyin oʻynash uchun foydalanish mumkin."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Mahkamlangan ilova boshqa ilovalarni ochishi va shaxsiy maʼlumotlarga kirishi mumkin. \n\nBu funksiyadan foydalanish uchun quyidagilarni bajaring: 	\n1.	Sozlamalar orqali funksiyani yoqing 	\n2.	Umumiy menyusini oching 	\n3.	Ekranning yuqori qismidagi ilova belgisini bosib, keyin Mahkamlash tugmasini bosing."</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Mahkamlangan ilova boshqa ilovalarni ochishi va shaxsiy maʼlumotlarga kirishi mumkin. \n\nAgar qurilmangizdan boshqalar foydalanadigan boʻlsa, ular uchun mehmon foydalanuvchini yoqing. \n\nBu funksiyadan foydalanish uchun quyidagilarni bajaring: 	\n1.	Sozlamalar orqali funksiyani yoqing 	\n2.	Umumiy menyusini oching 	\n3.	Ekranning yuqori qismidagi ilova belgisini bosib, keyin Mahkamlash tugmasini bosing."</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Ilova mahkamlanganda: \n\n•		Shaxsiy maʼlumotlarga kira oladi \n		(masalan, kontaktlar va email kontenti) \n•		Boshqa ilovalarni ocha oladi \n\nBu funksiyadan faqat ishonchli odamlaringiz bilan foydalaning."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Yechishdan oldin grafik kalit so‘ralsin"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Yechishda PIN kod talab qilinsin"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Qurilmani qulfdan chiqarish uchun siz nafaqat yuzdan foydalanish, balki unga qo‘shimcha tarzda PIN kod kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun PIN kod talab qilinsinmi?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Qurilmani qulfdan chiqarish uchun siz nafaqat yuzdan foydalanish, balki unga qo‘shimcha tarzda chizmali kalit kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun grafik kalit talab qilinsinmi?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Qurilmani qulfini ochish uchun siz nafaqat yuzdan foydalanish, balki unga qo‘shimcha tarzda parol kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, chaqiruvlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun parol talab qilinsinmi?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Qurilmani qulfdan chiqarish uchun siz nafaqat biometrik tekshiruv foydalanish, balki unga qoʻshimcha tarzda PIN kod kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha chaqiruvlar, xabarlar yoki bildirishnomalar, jumladan, signallar ishlamaydi.\n\nBu xususiyat yoʻqolgan yoki oʻgʻirlangan qurilmadagi maʼlumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun PIN kod talab qilinsinmi?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Qurilmani qulfdan chiqarish uchun siz nafaqat biometrik tekshiruvdan foydalanish, balki unga qoʻshimcha tarzda chizmali kalit kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha chaqiruvlar, xabarlar yoki bildirishnomalar, jumladan, signallar ishlamaydi.\n\nBu xususiyat yoʻqolgan yoki oʻgʻirlangan qurilmadagi maʼlumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun grafik kalit talab qilinsinmi?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Qurilmani qulfini ochish uchun siz nafaqat biometrik tekshiruvdan foydalanish, balki unga qoʻshimcha tarzda parol kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, chaqiruvlar, xabarlar yoki bildirishnomalar, jumladan, uygʻotkich signallari ishlamaydi.\n\nBu xususiyat yoʻqolgan yoki oʻgʻirlangan qurilmadagi maʼlumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun parol talab qilinsinmi?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Ha"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Yo‘q"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Cheklangan"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB nazoratchisi"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Ulangan qurilma"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Shu qurilma"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Almashtirilmoqda…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Almashtirilmoqda…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Almashtirilmadi"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Shu qurilmani quvvatlash"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Ulangan qurilma quvvatlanmoqda"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mobil internet sarfi"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Ilovalar sarflagan trafik"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi trafik sarfi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Mobil tarmoqdan boshqa trafik sarfi"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ethernet ma’lumotlari sarfi"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 ta cheklov</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Aloqa operatorining hisob-kitobi qurilmanikidan farq qilishi mumkin"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Mobil tarmoq trafik sarfidan boshqa"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> sarflandi"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Trafik sarfiga oid ogohlantirish"</string>
     <string name="data_warning" msgid="2925054658166062884">"Ogohlantirish"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Tafsilotlar"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Trafik tejash"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Cheklanmagan mobil internet"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Fondagi internet o‘chiq"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Fondagi internet yoqilmagan"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Yoniq"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Yoqilmagan"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Trafik tejash funksiyasini yoqish"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Qurilma qulflangan bo‘lsa, bildirishnomalarda matn kiritish taqiqlansin"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Birlamchi imlo tekshiruvi vositasi"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Imlo tekshiruvi"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Imlo tekshiruvini yoqish"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Imlo tekshiruvini yoqish"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Tanlanmagan"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(hech qanday)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"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="5077286114860539367">"Rasm va videolarni o‘chirib tashlash"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Xotira boshqaruvi"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Xotira boshqaruvidan foydalanish"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Xotira boshqaruvidan foydalanish"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Avtomatik"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Qo‘llanma"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Joy ochish"</string>
@@ -4452,9 +4476,9 @@
     <string name="swipe_up_to_switch_apps_suggestion_title" msgid="5754081720589900007">"Yangi asosiy tugmani sinang"</string>
     <string name="swipe_up_to_switch_apps_suggestion_summary" msgid="8885866570559435110">"Ilovalarni almashtirish uchun yangi ishorani yoqing"</string>
     <string name="edge_to_edge_navigation_title" msgid="714427081306043819">"Ishorali navigatsiya"</string>
-    <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"Bosh ekranga qaytish uchun ekranning pastidan tepaga qarab suring. Bir ilovadan boshqasiga oʻtish uchun pastdan tepaga surib, bosib turing va qoʻyib yuboring. Orqaga qaytish uchun chap yoki oʻng burchakdan teskari tomonga suring."</string>
+    <string name="edge_to_edge_navigation_summary" msgid="8497033810637690561">"Bosh ekranga qaytish uchun ekranning pastidan tepaga qarab suring. Bir ilovadan boshqasiga almashish uchun pastdan tepaga surib, biroz ushlab turing va qoʻyib yuboring. Orqaga qaytish uchun ekranning chap yoki oʻng chetidan markazga qarab suring."</string>
     <string name="legacy_navigation_title" msgid="7877402855994423727">"3 tugmali navigatsiya"</string>
-    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Orqaga, Boshiga va bir ilovadan boshqasiga oʻtish tugmalari ekranning pastida joylashgan."</string>
+    <string name="legacy_navigation_summary" msgid="5905301067778326433">"Orqaga qaytish, bosh ekranga chiqish va ilovalar orasida almashish uchun ekran pastida chiqadigan tugmalardan foydalaning."</string>
     <string name="keywords_system_navigation" msgid="3131782378486554934">"tizim navigatsiyasi, 2 tugmali navigatsiya, 3 tugmali navigatsiya, ishorali navigatsiya"</string>
     <string name="gesture_not_supported_dialog_message" msgid="5316512246119347889">"Bu funksiya bosh ekran ilovasida (<xliff:g id="DEFAULT_HOME_APP">%s</xliff:g>) ishlamaydi"</string>
     <string name="gesture_not_supported_positive_button" msgid="7909969459977021893">"Bosh ekran ilovasini almashtirish"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Ekranga ikki marta bosib tekshirish"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Ekranga ikki marta bosib tekshirish"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Ekranga ikki marta bosib tekshirish"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Bild-shnomalar u-n suring"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Bildirishnomalarni ochish uchun ekranning pastki qismidan pastga suring"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Ixcham rejim"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Ixcham rejimni yoqish"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Ilovalarni almashtirish vaqtida chiqish"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Vaqt tugadi"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 soniya"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 soniya"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 soniya"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ixchamlik"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Vaqt, bildirishnoma va boshqa axborotlarni tekshirish uchun ekranga ikki marta bosing."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Telefonni olib tekshirish"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Planshetni olib tekshirish"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Planshetni tekshirish uchun bosing"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Qurilmani tekshirish uchun bosing"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Vaqt, bildirishnoma va boshqa axborotni tekshirish uchun ekranni bosing."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS Favqulodda holat"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"SOS Favqulodda holat funksiyasidan foydalaning"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"<xliff:g id="APP_NAME">%1$s</xliff:g> tomonidan boshqariladi"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Oʻchirib-yoqish tugmasini tez-tez 5 marta yoki koʻproq bosish orqali quyidagi amallarni boshlang"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Teskari sanoqli tovushli signal"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Yordam olishdan oldin baland tovushni yoqing"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Yordam olish uchun telefon qiling"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Yordam olish uchun telefon raqami"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Oʻzgartirish uchun bosing"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Favqulodda xizmat raqamidan boshqa raqamni kiritsangiz:\n • Favqulodda chaqiruvdan foydalanish uchun qurilmangiz qulfdan chiqarilishi lozim\n • Chaqiruvga javob berilmasligi mumkin"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Bildirishnomalarni barmoq izi bilan ochish"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Barmoq izi skaneri"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Bildirishnomalarni tekshirish uchun telefon orqasidagi barmoq izi skaneri ustida pastga suring"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Maksimum ochiq axborot bazalari"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Birlamchi qiymatlariga tiklash"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Avtomatik kiritishning dasturchi parametrlari asliga qaytarildi"</string>
+    <string name="location_category" msgid="3496759112306219062">"Joylashuv"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Holat qatoridagi joylashuv indikatori"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Barcha joylashuvlar, jumladan, tarmoq va ulanish orqali aniqlanadigan, uchun chiqarish"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Butun GNSS statistikasini yuklash"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Siklsiz barcha GNSS sxema va davriyliklarini kuzatish"</string>
     <string name="device_theme" msgid="5027604586494772471">"Qurilma mavzusi"</string>
     <string name="default_theme" msgid="4815428567082263639">"Standart"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Tarmoq nomi"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Bezovta qiluvchi bildirishnomalarni pauza qiling"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Bu funksiya ishlamaydi"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Bu funksiya telefoningizni sekinlashtirgani sababli u faolsizlantirildi"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Butun GNSS statistikasini yuklash"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Siklsiz barcha GNSS sxema va davriyliklarini kuzatish"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Buzilish oynasi doim ko‘rsatilsin"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Ilova ishdan chiqqanda har safar muloqot oynasi ko‘rsatilsin"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"ANGLE yoqilgan ilovani tanlang"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Barcha ilovalar uchun yoqish"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Grafik drayverni tanlang"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Asosiy"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Game Driver"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Game Driver"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Ishlab chiquvchilar uchun drayver versiyasi"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Tizim grafik drayveri"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Yoniq (ovozsiz)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Yoqilmagan"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Tarmoq tafsilotlari"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Telefoningizdagi barcha ilovalarga qurilma nomi ko‘rinadi. Qurilmalarga Bluetooth orqali ulanganingizda yoki Wi-Fi hotspot sozlaganingizda boshqa foydalanuvchilarni ularni ko‘rishi mumkin."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Telefoningizdagi barcha ilovalarga qurilma nomi koʻrinadi. Qurilmalarga Bluetooth yoki Wi-Fi tarmoq orqali ulanganingizda, Wi-Fi hotspot sozlaganingizda boshqa foydalanuvchilarni ularni koʻrishi mumkin."</string>
     <string name="devices_title" msgid="649715719278562515">"Qurilmalar"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Barcha sozlamalar"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Takliflar"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Hech qanday tarmoq topilmadi. Qaytadan urining."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(taqiqlangan)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"SIM karta solinmagan"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"SIM kartasiz"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Hech qanday"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Ulanish uchun SIM karta kerak"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Ulanish uchun <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM kartasi kerak"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Tanlangan tarmoq rejimi: WCDMA tanlangan"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Tanlangan tarmoq rejimi: faqat GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Tanlangan tarmoq rejimi: faqat WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Mobil internet"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Mobil tarmoq orqali internetdan foydalanish"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Telefon xizmat doirasida avtomatik ravishda bu aloqa operatoriga almashtiriladi"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Hech qanday SIM karta mavjud emas"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Chaqiruv parametrlari"</string>
     <string name="sms_preference" msgid="7742964962568219351">"SMS parametrlari"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Har safar soʻralsin"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"<xliff:g id="CARRIER">%1$s</xliff:g> bilan ishlamaydi"</string>
     <string name="see_more" msgid="7499355691042812723">"Yana"</string>
     <string name="see_less" msgid="2642392725363552793">"Kamroq"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> yoqilsinmi?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"SIM karta yoqilsinmi?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> tanlansinmi?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"SIM kartadagi internetga almashsinmi?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Faqat bitta SIM kartani faollashtirish mumkin.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> yoqilganda <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> xizmati bekor qilinmaydi."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Faqat bitta yuklab olingan SIM kartani faollashtirish mumkin.\n\n<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> yoqilganda <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> xizmati bekor qilinmaydi."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Faqat bitta SIM kartani faollashtirish mumkin.\n\nAlmashganda <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> aloqasini bekor qilmaydi."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Bunga almashish: <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Tarmoqqa ulanmoqda…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> faollashtirilmoqda"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Aloqa operatori almashtirilmadi"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Xatolik tufayli aloqa operatori almashtirilmadi."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> faolsizlantirilsinmi?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"SIM karta faolsizlantirilsinmi?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"SIM karta faolsizlantirmoqda<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Aloqa operatori faolsizlantirilmadi"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Xatolik yuz berdi va aloqa operatoringiz faolsizlantirilmadi."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"2 ta SIM kartadan foydalanasizmi?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Bu qurilmada birdaniga 2 ta raqam faol boʻlishi mumkin. Hozircha 1 ta SIM kartadan foydalanishda davom etish uchun “Kerak emas” ustiga bosing"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Qurilma qayta ishga tushirilsinmi?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Ishga tushirish uchun qurilmani qayta ishga tushiring. Keyin esa boshqa SIM kartani kiritishingiz mumkin."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Davom etish"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Qayta yoqish"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Kerak emas"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Almashtirish"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"SIM karta faollashmadi"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"SIM kartani chiqarib olib, qaytadan soling. Agar muammo davom etsa, qurilmangizni qayta ishga tushiring."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"SIM kartani qaytadan yoqing. Agar muammo davom etsa, qurilmangizni qayta ishga tushiring."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Tarmoqni faollashtirish"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> faol"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"SIM karta sozlamalarini yangilash uchun bosing"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM karta"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Mazkur yuklab olingan SIM karta axboroti tozalansinmi?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Bu SIM karta axboroti tozalanganda bu qurilmadan <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> xizmati ham tozalab tashlanadi.\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> xizmati bekor qilinmaydi."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Tozalash"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"SIM karta axboroti tozalanmoqda…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"SIM karta axboroti tozalanmadi"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Bu SIM karta axboroti xatolik sabab tozalanmadi.\n\nQurilmani qayta ishga tushirib, yana urining."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Qurilmaga ulanish"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"<xliff:g id="APPNAME">%1$s</xliff:g> ilovasi qurilmangizga ulanish uchun vaqtinchalik Wi‑Fi tarmoqdan foydalanmoqchi"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Qurilmalar topilmadi. Qurilmalar yoniq va tarmoqda ekanligi tekshiring."</string>
@@ -4875,7 +4966,7 @@
     <string name="wfc_disclaimer_agree_button_text" msgid="4082872292910770344">"DAVOM ETISH"</string>
     <string name="wfc_disclaimer_disagree_text" msgid="8424457394700137703">"KERAK EMAS"</string>
     <string name="wfc_disclaimer_location_title_text" msgid="7913919887475418423">"Joylashuv"</string>
-    <string name="wfc_disclaimer_location_desc_text" msgid="2799241640320172899">"Xizmat taʼminotchingiz bu xizmatni taqdim etish uchun joylashuv axborotingizni toʻplashi mumkin.\n\nXizmat taʼminotchingiz maxfiylik siyosati bilan tanishib chiqing."</string>
+    <string name="wfc_disclaimer_location_desc_text" msgid="2799241640320172899">"Mobil operatoringiz bu xizmatni taqdim etish uchun joylashuvingiz haqidagi axborotni olishi mumkin.\n\nUning maxfiylik siyosati bilan tanishib chiqing."</string>
     <string name="forget_passpoint_dialog_message" msgid="2433875063907365760">"Qolgan vaqt yoki axborotga ruxsatni yoʻqotishingiz mumkin. Olib tashlashdan oldin provayderingiz bilan tekshiring."</string>
     <string name="keywords_content_capture" msgid="7802155522681936956">"kontentni yozib olish, ilova kontenti"</string>
     <string name="content_capture" msgid="868372905432812238">"Ilova kontenti"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Favqulodda qoʻngʻiroqlar"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Aloqa operatoringiz Wi-Fi chaqiruvlar orqali Favqulodda qoʻngʻiroqlar uchun mos emas.\nQurilma favqulodda qoʻngʻiroq bajarish uchun avtomatik ravishda mobil tarmoqdan foydalanadi.\nFavqulodda qoʻngʻiroqlar faqatgina mobil aloqa qamrovi ichida ishlaydi."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Chaqiruvlar sifatini oshirish uchun Wi-Fi tarmoqdan foydalaning"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Umumiy SIM chaqiruvlar"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Boshqa SIM chaqiruv va SMS xabarlari shu SIM karta orqali bajarilishiga ruxsat."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"umumiy sim chaqiruvlar"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"MMS xabar keldi"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"MMS xabar yuborilmadi"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Mobil internet nofaolligida <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> orqali MMS xabarlashuvga ruxsat berish uchun bosing"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Sozlamalar orqali ustki ilovalarga ruxsat berish"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Boshqa ilovalar ustidan ochiladigan ilovalarga ruxsat berish"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Media"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Media seansi tamomlanganda pleyer berkitilsin"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Pleyer ochiq turgan Tezkor sozlamalar paneli orqali seansni davom ettirish imkonini beradi."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Tezkor sozlamalardagi multimedia pleyeri"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Ijroni osongina davom ettirish maqsadida kengaytirilgan davr uchun multimedia pleyerini chiqarish"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Pleyerni berkitish"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Pleyerni chiqarish"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Hech qanday pleyer mavjud emas"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Ruxsat berilgan ilovalar"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"media"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth yoqiladi"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Yoniq"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Oʻchiq"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM kartalar"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Samolyotda xavfsiz tarmoqlar"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Samolyotda xavfsiz tarmoqlarni topish va ulanish"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"samolyot, samolyot uchun xavfsiz"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Chaqiruvlar va SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi chaqiruv"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Chaqiruvlarni mobil tarmoq orqali emas, Wi-Fi tarmoqlar orqali amalga oshirish va qabul qilish"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi chaqiruv funksiyasi mobil tarmoq ishlatmasdan Wi‑Fi tarmoqlar orqali chaqiruv qilish va chaqiruvlarni qabul qilish imkonini beradi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Chaqiruvlar"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"maqbul"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"maqbul chaqiruvlar"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"Maqbul SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"mavjud emas"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"SIM kartasiz"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Sozlamalar"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Ochiq tarmoqlarga ulanish"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"tarmoq aloqasi, internet, simsiz, aloqa, wifi, wi-fi, wi fi, mobil, mobile, mobil tarmoq operatori, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Samolyotdagi xavfsiz tarmoqlar"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Parvoz rejimini oʻchirish"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Uyqu vaqti rejimi yoniqligi sababli ishlamaydi"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Muhim bildirishnomalar sozlamalari tiklandi."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Ilovalar"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Notanish qurilma xabarlaringizga kirmoqchi. Batafsil."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Xabarlarga kirishga ruxsat berilsinmi?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Notanish Bluetooth qurilmasi ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) xabarlaringizga kirmoqchi.\n\nSiz ilgari [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] qurilmasiga ulanmagansiz."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Notanish qurilma kontakt va chaqiruvlar jurnaliga kirmoqchi. Batafsil."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Chaqiruvlar va chaqiruvlar jurnaliga kirishga ruxsat berilsinmi?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Notanish Bluetooth qurilmasi ([<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>]) kontakt va chaqiruvlaringiz tarixiga kirmoqchi. Bunga kiruvchi va chiquvchi chaqiruvlar ham kiradi.\n\nSiz ilgari [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] qurilmasiga ulanmagansiz."</string>
 </resources>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index ced3b5a..8ac7b7d 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Trung bình"</item>
     <item msgid="6740026006576843477">"Dài"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Ngắn"</item>
+    <item msgid="7397961711906421599">"Trung bình"</item>
+    <item msgid="4079132024502041928">"Dài"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Mặc định"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Toàn cầu"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"Chỉ TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Toàn cầu"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 8dbca1c..bf510f8 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Ngày &amp; giờ"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Đặt ngày giờ"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Đặt ngày, giờ, múi giờ &amp; định dạng"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Sử dụng ngày và giờ do mạng cung cấp"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Sử dụng múi giờ do mạng cung cấp"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Tự động đặt giờ"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Tự động đặt múi giờ"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Sử dụng định dạng của địa phương"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"Định dạng 24 giờ"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Sử dụng định dạng 24 giờ"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Hiển thị thông tin tiểu sử trên màn hình khóa"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Tài khoản"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Vị trí"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Sử dụng vị trí"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Sử dụng vị trí"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Đang tắt"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">Đang bật - <xliff:g id="COUNT_1">%1$d</xliff:g> ứng dụng có quyền truy cập vào vị trí</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Phương thức khóa màn hình, mở khóa bằng khuôn mặt"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Phương thức khóa màn hình, vân tay"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Phương thức khóa màn hình"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Mở khóa điện thoại an toàn bằng khuôn mặt và vân tay"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Bạn cũng có thể đăng nhập vào ứng dụng và xác nhận thanh toán"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Thiết lập phương thức mở khóa bằng:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"Mở khóa bằng khuôn mặt"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Giúp bạn mở khóa điện thoại dễ dàng"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Vân tay"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Tiết kiệm thời gian khi mở khóa ngay trong túi"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Bỏ qua"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Tiếp theo"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Đã thêm khuôn mặt"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Thiết lập tính năng mở khóa bằng khuôn mặt"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"Mở khóa bằng khuôn mặt"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Sử dụng khuôn mặt của bạn để xác thực"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Bắt đầu"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Nếu tính năng mở khóa bằng khuôn mặt qua dịch vụ hỗ trợ tiếp cận đang tắt, thì một số bước thiết lập có thể hoạt động không đúng cách với TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Quay lại"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Tiếp tục thiết lập"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Sử dụng thiết lập hỗ trợ tiếp cận"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Luôn yêu cầu xác nhận khi dùng mở khóa bằng khuôn mặt trong ứng dụng"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Xóa dữ liệu khuôn mặt"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Thiết lập tính năng mở khóa bằng khuôn mặt"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Sử dụng tính năng mở khóa bằng khuôn mặt để mở khóa thiết bị, đăng nhập vào ứng dụng và xác nhận thanh toán.\n\nLưu ý:\nViệc nhìn vào điện thoại có thể khiến điện thoại mở khóa ngay cả khi bạn không định làm vậy.\n\nNgười khác có thể mở khóa điện thoại khi họ giơ điện thoại lên trước mặt bạn.\n\nNhững người có khuôn mặt rất giống bạn, chẳng hạn như anh chị em ruột giống hệt bạn, đều có thể mở khóa điện thoại này."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Sử dụng tính năng mở khóa bằng khuôn mặt để mở khóa thiết bị, đăng nhập vào ứng dụng và xác nhận thanh toán.\n\nLưu ý:\nViệc nhìn vào điện thoại có thể khiến điện thoại mở khóa ngay cả khi bạn không định làm vậy.\n\nNgười khác có thể mở khóa bằng cách giơ điện thoại lên trước mặt bạn, kể cả khi bạn đang nhắm mắt.\n\nNhững người có diện mạo giống bạn, chẳng hạn như anh chị em ruột giống hệt bạn, đều có thể mở khóa điện thoại."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Sử dụng tính năng mở khóa bằng khuôn mặt để mở khóa thiết bị, đăng nhập vào ứng dụng và xác nhận việc thanh toán."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Lưu ý:\nViệc nhìn vào điện thoại có thể khiến điện thoại mở khóa ngoài ý muốn.\n\nNgười khác có thể mở khóa bằng cách giơ điện thoại lên trước mặt bạn.\n\nNhững người có diện mạo giống bạn, chẳng hạn như anh chị em ruột giống hệt bạn, đều có thể mở khóa điện thoại."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Lưu ý:\nViệc nhìn vào điện thoại có thể khiến điện thoại mở khóa ngoài ý muốn.\n\nNgười khác có thể mở khóa bằng cách giơ điện thoại lên trước mặt bạn, kể cả khi bạn đang nhắm mắt.\n\nNhững người có diện mạo giống bạn, chẳng hạn như anh chị em ruột giống hệt bạn, đều có thể mở khóa điện thoại."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Bạn muốn xóa dữ liệu khuôn mặt?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Dữ liệu khuôn mặt mà tính năng mở khóa bằng khuôn mặt sử dụng sẽ bị xóa vĩnh viễn một cách an toàn. Sau khi xóa, bạn phải có mã PIN, hình mở khóa hoặc mật khẩu để mở khóa điện thoại, đăng nhập vào ứng dụng và xác nhận thanh toán."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Dùng khuôn mặt để mở khóa điện thoại"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Dùng vân tay để mở khóa điện thoại hoặc phê duyệt các giao dịch mua.\n\nLưu ý: Bạn không thể sử dụng vân tay để mở khóa thiết bị này. Để biết thêm thông tin, hãy liên hệ với quản trị viên của tổ chức bạn."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Dùng vân tay để mở khóa điện thoại hoặc phê duyệt các giao dịch mua.\n\nLưu ý: Vân tay có thể kém an toàn hơn hình mở khóa hoặc mã PIN mạnh."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Hủy"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Không, cảm ơn"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Tiếp tục"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Bỏ qua"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Tiếp theo"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Bảo vệ máy tính bảng của bạn bằng tùy chọn khóa màn hình để không ai khác sử dụng được nếu máy tính bảng này bị mất hoặc bị đánh cắp. Bạn cũng cần có tùy chọn khóa màn hình để thiết lập tính năng mở khóa bằng khuôn mặt. Để quay lại, hãy nhấn vào Hủy."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Bảo vệ thiết bị của bạn bằng tùy chọn khóa màn hình để không ai khác sử dụng được nếu thiết bị này bị mất hoặc bị đánh cắp. Bạn cũng cần có tùy chọn khóa màn hình để thiết lập tính năng mở khóa bằng khuôn mặt. Để quay lại, hãy nhấn vào Hủy."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Bằng cách bảo vệ điện thoại của bạn bằng một phương thức khóa màn hình, không ai có thể sử dụng được điện thoại này nếu điện thoại bị mất hoặc bị đánh cắp. Bạn cũng cần có một phương thức khóa màn hình để thiết lập tính năng mở khóa bằng khuôn mặt. Để quay lại, hãy nhấn vào Hủy."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Bảo vệ máy tính bảng của bạn bằng một phương thức khóa màn hình để không ai khác có thể sử dụng máy tính bảng này trong trường hợp máy tính bảng bị mất hoặc bị đánh cắp. Ngoài ra, bạn cũng cần có một phương thức khóa màn hình để thiết lập tính năng nhận dạng sinh trắc học. Để quay lại, hãy nhấn vào Hủy."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Bảo vệ thiết bị của bạn bằng một phương thức khóa màn hình để không ai khác có thể sử dụng thiết bị này trong trường hợp thiết bị bị mất hoặc bị đánh cắp. Ngoài ra, bạn cũng cần có một phương thức khóa màn hình để thiết lập tính năng nhận dạng sinh trắc học. Để quay lại, hãy nhấn vào Hủy."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Bảo vệ điện thoại của bạn bằng một phương thức khóa màn hình để không ai khác có thể sử dụng điện thoại này trong trường hợp thiết bị bị mất hoặc bị đánh cắp. Ngoài ra, bạn cũng cần có một phương thức khóa màn hình để thiết lập tính năng nhận dạng sinh trắc học. Để quay lại, hãy nhấn vào Hủy."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Bỏ qua bước thiết lập mã PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Bỏ qua bước thiết lập mật khẩu?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Bỏ qua bước thiết lập hình mở khóa?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Ngăn người khác sử dụng máy tính bảng này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Ngăn người khác sử dụng thiết bị này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Ngăn người khác sử dụng điện thoại này mà không có sự cho phép của bạn bằng cách kích hoạt tính năng bảo vệ thiết bị. Chọn khóa màn hình bạn muốn sử dụng."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Chọn phương thức khóa màn hình sao lưu"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Chọn phương thức khóa màn hình dự phòng"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Chọn phương thức khóa màn hình dự phòng"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Tùy chọn phương thức khóa màn hình"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Tùy chọn phương thức khóa màn hình"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Phương thức khóa màn hình"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"Mở khóa bằng khuôn mặt + Mật khẩu"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Tiếp tục mà không thiết lập tính năng mở khóa bằng khuôn mặt"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Bạn có thể mở khóa điện thoại bằng khuôn mặt của mình. Để bảo mật, tùy chọn này yêu cầu một khóa màn hình dự phòng."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"Nhận dạng sinh trắc học + Hình mở khóa"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"Nhận dạng sinh trắc học + Mã PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"Nhận dạng sinh trắc học + Mật khẩu"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Tiếp tục mà không thiết lập tính năng nhận dạng sinh trắc học"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Bạn có thể mở khóa điện thoại bằng tính năng nhận dạng sinh trắc học. Để bảo mật, tính năng này yêu cầu bạn phải có một phương thức khóa màn hình dự phòng."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Do quản trị viên tắt, c.sách mã hóa hay vùng l.trữ t.tin xác thực"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Không"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Vuốt"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">Phải có ít hơn <xliff:g id="NUMBER_0">%d</xliff:g> chữ số</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Quản trị viên thiết bị không cho phép dùng mã PIN gần đây"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Quản vị viên CNTT đã chặn những mã PIN phổ biến. Hãy thử mã PIN khác."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Mật khẩu này không được bao gồm ký tự không hợp lệ"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Phải chứa ít nhất 1 chữ cái"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Phải chứa ít nhất 1 chữ số"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">Phải có ít nhất 1 ký tự không phải là số</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Quản trị viên thiết bị không cho phép sử dụng mật khẩu gần đây"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Quản vị viên CNTT đã chặn những mật khẩu phổ biến. Hãy thử mật khẩu khác."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Không cho phép thứ tự chữ số tăng dần, giảm dần hoặc lặp lại"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Xác nhận"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Hủy"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Bật Wi‑Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Sử dụng Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Sử dụng Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Cài đặt Wi‑Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Thiết lập &amp; quản lý điểm truy cập mạng"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Căn giữa mã QR dưới đây để kết nối với “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Kết nối với Wi‑Fi bằng cách quét mã QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Chia sẻ Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Quét mã QR này để kết nối với “<xliff:g id="SSID">%1$s</xliff:g>” và chia sẻ mật khẩu"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Quét mã QR này bằng thiết bị khác để kết nối với “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Quét mã QR này để kết nối với “<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Hãy thử lại. Nếu sự cố vẫn tiếp diễn, hãy liên hệ với nhà sản xuất thiết bị"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Đã xảy ra lỗi"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Mật khẩu Wi-Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Mật khẩu điểm phát sóng: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Tự động kết nối"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Cho phép điện thoại tự động kết nối khi ở gần mạng này"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Cho phép máy tính bảng tự động kết nối khi ở gần mạng này"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Cho phép kết nối với mạng này khi nằm trong vùng phủ sóng"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Thêm thiết bị"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Sử dụng mã QR để thêm thiết bị vào mạng này"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Mã QR không phải là định dạng hợp lệ"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Sử dụng chứng chỉ hệ thống"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Không cung cấp"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Không xác thực"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Không có chứng chỉ nào được chỉ định. Kết nối của bạn sẽ không phải là riêng tư."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Tên mạng quá dài."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Phải chỉ định một miền."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Bạn cần có chứng chỉ."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Kết nối"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Đã bật Wi-Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Đã kết nối với <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Đang kết nối với <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Đang kết nối…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Không thể kết nối với mạng"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Đang nằm ngoài vùng phủ sóng của mạng"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Địa chỉ MAC của thiết bị"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Địa chỉ MAC ngẫu nhiên"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Địa chỉ MAC được sắp xếp ngẫu nhiên (sử dụng lần gần đây nhất)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Địa chỉ IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Chi tiết mạng"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Mặt nạ mạng con"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Địa chỉ IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Mạng đã lưu"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Gói đăng ký"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Các mạng khác"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Cài đặt IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Cài đặt nâng cao Wi‑Fi không khả dụng cho người dùng này"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Lưu"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Hãy nhập địa chỉ cổng hợp lệ."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Hãy nhập địa chỉ DNS hợp lệ."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Hãy nhập độ dài tiền tố mạng từ 0 đến 32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (nếu không bị DNS riêng ghi đè)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (nếu không bị DNS riêng ghi đè)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Cổng"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Độ dài tiền tố mạng"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi‑Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Ứng dụng đang chia sẻ nội dung. Để chia sẻ kết nối Internet, hãy tắt điểm phát sóng, sau đó bật lại"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Chưa đặt mật khẩu"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Tên điểm phát sóng"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Đang bật <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Đang bật <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Các thiết bị khác có thể kết nối với <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Mật khẩu điểm phát sóng"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"Băng tần AP"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Hình ảnh mượt"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Tự động tăng tốc độ làm mới từ 60 lên 90 Hz đối với một số nội dung. Làm tăng mức sử dụng pin."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Hình ảnh mượt"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Buộc làm mới ở tốc độ 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Tốc độ làm mới cao nhất giúp cải thiện khả năng phản hồi khi chạm và chất lượng ảnh động. Làm tăng mức sử dụng pin."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Chú ý đến màn hình"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Bật / Màn hình sẽ không tắt nếu bạn đang nhìn vào màn hình"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Khi có thông báo mới, màn hình tối sẽ bật sáng"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Luôn hiển thị giờ và thông tin"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Làm tăng mức sử dụng pin"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Văn bản in đậm"</string>
     <string name="title_font_size" msgid="570613010306330622">"Kích thước phông chữ"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Phóng to hoặc thu nhỏ văn bản"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Cài đặt khóa thẻ SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Phiên bản Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Bản cập nhật bảo mật Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Kiểu máy"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Kiểu máy: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Kiểu máy và phần cứng"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Phiên bản phần cứng"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"ID thiết bị"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Xóa APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"APN mới"</string>
     <string name="menu_save" msgid="6611465355127483100">"Lưu"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Hủy"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Hủy"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Không được để trống trường Tên."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN không được để trống."</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Có thể đặt lại các ứng dụng"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Đặt lại Wi-Fi, di động và Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Thao tác này sẽ đặt lại tất cả các tùy chọn cài đặt mạng, bao gồm:\n\n"<li>"Wi‑Fi"</li>\n<li>"Dữ liệu di động"</li>\n<li>"Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Xóa"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Xóa SIM đã tải xuống"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Nếu bạn muốn tải SIM thay thế xuống, hãy liên hệ với nhà mạng. Thao tác này sẽ không hủy bất kỳ gói dịch vụ di động nào."</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Thao tác này sẽ không hủy gói dịch vụ di động nào. Để tải SIM thay thế xuống, hãy liên hệ với nhà mạng của bạn."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Đặt lại các tùy chọn cài đặt"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Bạn muốn đặt lại tất cả tùy chọn cài đặt mạng? Bạn không thể hủy hành động này."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Bạn muốn đặt lại tất cả tùy chọn cài đặt mạng và xóa các SIM đã tải xuống? Bạn không thể hủy hành động này sau khi đã thực hiện."</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Cài đặt mạng đã được đặt lại"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Không thể xóa SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Không thể xóa SIM đã tải xuống do lỗi.\n\nHãy khởi động lại thiết bị của bạn rồi thử lại."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Xóa mọi dữ liệu (đặt lại thiết bị)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Xóa mọi dữ liệu (đặt lại thiết bị)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Thao tác này sẽ xóa tất cả dữ liệu trong "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu cũng như các tùy chọn cài đặt của hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Thao tác này sẽ xóa tất cả dữ liệu trong "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu cũng như các tùy chọn cài đặt của hệ thống và ứng dụng"</li>\n<li>"Ứng dụng đã tải xuống"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Có người dùng khác trên thiết bị này.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Nhạc"</li>\n<li>"Ảnh"</li>\n<li>"Dữ liệu người dùng khác"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Việc này sẽ không hủy gói dịch vụ di động của bạn."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"bộ lưu trữ USB"</b>"."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Đồng thời, để xóa nhạc, hình ảnh và dữ liệu người dùng khác, cần xóa "<b>"thẻ SD"</b>"."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Xóa mọi dữ liệu (đặt lại về trạng thái ban đầu)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Xóa mọi dữ liệu (đặt lại về trạng thái ban đầu)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Thao tác này sẽ xóa mọi dữ liệu khỏi "<b>"bộ nhớ trong"</b>" của máy tính bảng, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu cũng như các tùy chọn cài đặt của hệ thống và ứng dụng"</li>\n<li>"Các ứng dụng đã tải xuống"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Thao tác này sẽ xóa mọi dữ liệu khỏi "<b>"bộ nhớ trong"</b>" của điện thoại, bao gồm:\n\n"<li>"Tài khoản Google của bạn"</li>\n<li>"Dữ liệu cũng như các tùy chọn cài đặt của hệ thống và ứng dụng"</li>\n<li>"Các ứng dụng đã tải xuống"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"Bạn hiện đã đăng nhập vào các tài khoản sau đây:\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Có người dùng khác trên thiết bị này.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Nhạc"</li>\n<li>"Ảnh"</li>\n<li>"Dữ liệu khác của người dùng"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Thao tác này sẽ không hủy gói dịch vụ di động của bạn."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Để xóa nhạc, ảnh và dữ liệu khác của người dùng, thì cần phải xóa "<b>"bộ lưu trữ USB"</b>"."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Để xóa nhạc, ảnh và dữ liệu khác của người dùng, thì cần phải xóa "<b>"thẻ SD"</b>"."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Xóa bộ nhớ USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Xóa thẻ SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Xóa tất cả dữ liệu trên bộ nhớ trong USB, chẳng hạn như nhạc hoặc ảnh"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Xóa tất cả dữ liệu trên thẻ SD, chẳng hạn như nhạc hoặc ảnh"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Xóa tất cả dữ liệu"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Xóa tất cả dữ liệu"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn sẽ bị xóa. Bạn không thể hủy hành động này."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Tất cả thông tin cá nhân của bạn, kể cả ứng dụng và SIM đã tải xuống, đều sẽ bị xóa. Bạn không thể hủy hành động này."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Xóa mọi thứ"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Không có tác vụ đặt lại nào được thực hiện vì dịch vụ Xóa hệ thống không khả dụng."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Xóa tất cả dữ liệu?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Khôi phục cài đặt gốc không khả dụng cho người dùng này"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Đang xóa"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Vui lòng chờ..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Xóa mọi dữ liệu"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Xóa mọi dữ liệu"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Tất cả thông tin cá nhân và ứng dụng đã tải xuống của bạn đều bị xóa. Bạn không thể hủy thao tác này sau khi thực hiện."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Tất cả thông tin cá nhân của bạn, kể cả SIM và ứng dụng đã tải xuống, đều bị xóa. Bạn không thể hủy thao tác này sau khi thực hiện."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Xóa mọi dữ liệu?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Người dùng này không thể thực hiện thao tác đặt lại về trạng thái ban đầu"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Đang xóa"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Vui lòng chờ…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Cài đặt cuộc gọi"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Thiết lập thư thoại, chuyển tiếp cuộc gọi, chờ cuộc gọi, Số gọi đến"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Chia sẻ Internet qua USB"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Không thể dùng làm điểm truy cập Internet cho hơn <xliff:g id="MAXCONNECTION">%1$d</xliff:g> thiết bị."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> sẽ được tháo."</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Chia sẻ Internet qua Ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Chia sẻ kết nối Internet của điện thoại qua USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Chia sẻ kết nối Internet của điện thoại qua Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Sử dụng tính năng điểm phát sóng và chia sẻ Internet để cho phép các thiết bị khác kết nối với Internet thông qua dữ liệu di động của bạn. Các ứng dụng cũng có thể tạo điểm phát sóng để chia sẻ nội dung với thiết bị ở gần."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Dùng tính năng điểm phát sóng và chia sẻ Internet để cho phép các thiết bị khác kết nối với Internet thông qua dữ liệu di động hoặc Wi-Fi của bạn. Các ứng dụng cũng có thể tạo điểm phát sóng để chia sẻ nội dung với thiết bị ở gần."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Trợ giúp"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Quét tìm Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Cho phép các ứng dụng và dịch vụ quét tìm thiết bị lân cận bất kỳ lúc nào, ngay cả khi Bluetooth đang tắt. Chẳng hạn như bạn có thể sử dụng tùy chọn cài đặt này để cải thiện các tính năng và dịch vụ dựa trên vị trí."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Dịch vụ vị trí cho công việc"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Phát hiện múi giờ theo vị trí"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Phát hiện múi giờ theo vị trí"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Cho phép sử dụng thông tin vị trí của thiết bị để phát hiện múi giờ hiện tại. Các tùy chọn cài đặt vị trí khác như quét tìm Wi-Fi có thể ảnh hưởng đến độ chính xác của tùy chọn phát hiện múi giờ."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Đang bật"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Đang tắt"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Tùy chọn Tự động phát hiện múi giờ bị tắt"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Tùy chọn Phát hiện múi giờ theo vị trí bị tắt"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Tùy chọn Phát hiện múi giờ theo vị trí không được hỗ trợ"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Không được phép thay đổi tùy chọn Phát hiện múi giờ theo vị trí"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Vị trí Wi‑Fi và mạng di động"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Cho phép ứng dụng dùng DV vị trí của Google để ước đoán vị trí nhanh hơn. Dữ liệu vị trí ẩn danh sẽ được thu thập và gửi tới Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Vị trí được xác định bằng Wi‑Fi"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Đặt mật khẩu để dùng tính năng mở khóa bằng khuôn mặt"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Đặt hình mở khóa để dùng tính năng mở khóa bằng khuôn mặt"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Đặt mã PIN để dùng tính năng mở khóa bằng khuôn mặt"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Đặt mật khẩu để dùng tính năng nhận dạng sinh trắc học"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Đặt hình mở khóa để dùng tính năng nhận dạng sinh trắc học"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Đặt mã PIN để dùng tính năng nhận dạng sinh trắc học"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Bạn quên mật khẩu?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Bạn quên hình mở khóa?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Bạn quên mã PIN?"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Tùy chọn phụ đề"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Phóng to"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Khu vực phóng to"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Bật tính năng phóng to"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Chọn (các) khu vực phóng to mà bạn muốn dùng khi phóng to màn hình"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Toàn màn hình"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Một phần màn hình"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Toàn màn hình và một phần màn hình"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Phóng to toàn bộ màn hình"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Phóng to một phần màn hình"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Chuyển sang dùng nút hỗ trợ tiếp cận?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Nếu bạn phóng to một phần màn hình bằng cách nhấn 3 lần, thì thao tác nhập và các hành động khác sẽ bị trễ.\n\nBạn có muốn phóng to bằng nút hỗ trợ tiếp cận không?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Chuyển sang dùng nút hỗ trợ tiếp cận"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Vẫn phóng to bằng cách nhấn 3 lần"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Cài đặt phóng to"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Phóng to bằng cách nhấn 3 lần"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Phóng to bằng phím tắt"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Kết thúc cuộc gọi bằng nút nguồn"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Con trỏ chuột lớn"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Xóa hiệu ứng động"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Âm thanh đơn âm"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Kết hợp các kênh khi phát âm thanh"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Cân bằng âm thanh"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Trái"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Phải"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Âm thanh đơn âm"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Kết hợp các kênh khi phát âm thanh"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Cân bằng âm thanh"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Trái"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Phải"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Mặc định"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 giây"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 giây"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Rung khi có thông báo"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Rung khi đổ chuông"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Phản hồi chạm"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Sử dụng <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Mở <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Sử dụng tính năng chỉnh màu"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Hiển thị phụ đề"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Chỉ dành cho ứng dụng được hỗ trợ"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Sử dụng <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Mở <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Sử dụng tính năng chỉnh màu"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Hiển thị phụ đề"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Chỉ dành cho ứng dụng được hỗ trợ"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Kích thước và kiểu phụ đề"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"Kích thước văn bản <xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Tùy chọn khác"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"Mù màu xanh lục nhẹ"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"Mù màu đỏ nhẹ"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"Mù màu lam vàng"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"Thang màu xám"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Đỏ – xanh lục"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Đỏ – xanh lục"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Xanh lam – vàng"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Hạn chế chạy trong nền"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Cho phép ứng dụng chạy trong nền"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Ứng dụng không được phép chạy trong nền"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Không thể hạn chế sử dụng trong nền"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Không thể hạn chế sử dụng trong nền"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Giới hạn hoạt động nền?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Nếu bạn giới hạn hoạt động nền cho một ứng dụng, ứng dụng đó có thể hoạt động không đúng cách"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Không thể hạn chế ứng dụng này vì bạn chưa đặt để tối ưu hóa pin.\n\nĐể hạn chế ứng dụng, trước tiên hãy bật tối ưu hóa pin."</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Máy tính bảng được sử dụng nhiều hơn thường lệ"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Thiết bị được sử dụng nhiều hơn thường lệ"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Pin có thể hết sớm hơn thường lệ"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Tối ưu hóa để cải thiện độ bền của pin"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Thời lượng pin bị hạn chế tạm thời. Nhấn để tìm hiểu thêm."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Bạn sử dụng điện thoại nhiều hơn mức bình thường. Pin điện thoại có thể hết sớm hơn dự kiến.\n\nCác ứng dụng dùng nhiều pin nhất:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Bạn dùng máy tính bảng nhiều hơn mức bình thường. Pin của bạn có thể hết sớm hơn dự kiến.\n\nCác ứng dụng dùng nhiều pin nhất:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Bạn dùng thiết bị nhiều hơn mức bình thường. Pin của bạn có thể hết sớm hơn dự kiến.\n\nCác ứng dụng dùng nhiều pin nhất:"</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">Đã hạn chế %1$d ứng dụng</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Đã xảy ra vấn đề khi đọc dung lượng pin của bạn"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Đã xảy ra vấn đề khi đọc dung lượng pin của bạn. Nhấn để "<annotation id="url">"tìm hiểu thêm"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Dừng ứng dụng?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"Điện thoại của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> liên tục để điện thoại ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"Máy tính bảng của bạn không thể quản lý pin bình thường vì <xliff:g id="APP">%1$s</xliff:g> liên tục để máy tính bảng ở chế độ bật.\n\nĐể khắc phục sự cố này, bạn có thể dừng ứng dụng.\n\nNếu sự cố này vẫn tiếp diễn, có thể bạn cần phải gỡ cài đặt ứng dụng để cải thiện hiệu suất pin."</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Đặt lịch biểu"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Kéo dài thời lượng pin"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Tắt khi sạc đầy"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Trình tiết kiệm pin sẽ tắt khi pin của điện thoại ở mức <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Trình tiết kiệm pin sẽ tắt khi pin của máy tính bảng ở mức <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Trình tiết kiệm pin sẽ tắt khi pin của thiết bị ở mức <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Trình tiết kiệm pin sẽ tắt khi điện thoại sạc được hơn <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Trình tiết kiệm pin sẽ tắt khi máy tính bảng sạc được hơn <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Trình tiết kiệm pin sẽ tắt khi thiết bị sạc được hơn <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Bật"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Đặt lại"</string>
     <string name="tts_play" msgid="2945513377250757221">"Phát"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Kết nối thích ứng"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Tăng thời lượng pin và cải thiện hiệu suất thiết bị bằng cách tự động quản lý các kết nối mạng"</string>
     <string name="credentials_title" msgid="7535942196886123656">"Lưu thông tin xác thực"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Cài đặt chứng chỉ"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Cài đặt chứng chỉ từ bộ nhớ"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Thông tin xác thực người dùng"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Xem và sửa đổi thông tin xác thực đã lưu trữ"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Nâng cao"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Loại lưu trữ"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Dựa trên phần cứng"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Chỉ phần mềm"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Không có thông tin đăng nhập cho người dùng này"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Đã cài đặt cho VPN và ứng dụng"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Đã cài đặt cho Wi-Fi"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Không cài đặt"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Vẫn cài đặt"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Chưa cài đặt chứng chỉ"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Cho phép <xliff:g id="APP_NAME">%s</xliff:g> cài đặt chứng chỉ trên thiết bị này?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Những chứng chỉ này sẽ giúp các ứng dụng và URL dưới đây xác định danh tính của bạn"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Không cho phép"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Cho phép"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Hiển thị thêm"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Ứng dụng quản lý chứng chỉ"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Không"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Những chứng chỉ do ứng dụng này cài đặt sẽ giúp các ứng dụng và URL dưới đây xác định danh tính của bạn"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Xóa"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Tín hiệu quay số khẩn cấp"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Đặt chế độ khi cuộc gọi khẩn cấp được thực hiện"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Sao lưu"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Chưa thiết lập - Hồ sơ công việc"</string>
     <string name="user_admin" msgid="4024553191395768119">"Quản trị viên"</string>
     <string name="user_you" msgid="3070562015202859996">"Bạn (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Biệt hiệu"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Bạn có thể thêm tối đa <xliff:g id="USER_COUNT">%1$d</xliff:g> người dùng"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Chỉ chủ sở hữu máy tính bảng mới có thể quản lý người dùng."</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Chỉ chủ sở hữu điện thoại mới có thể quản lý người dùng."</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Thanh toán trên thiết bị thanh toán"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Thiết lập ứng dụng thanh toán. Sau đó chỉ cần hướng mặt sau của điện thoại vào thiết bị thanh toán có biểu tượng không tiếp xúc."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Đã hiểu"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Thêm..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Thêm…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Đặt ứng dụng thanh toán mặc định"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Cập nhật ứng dụng thanh toán mặc định"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Sử dụng <xliff:g id="APP">%1$s</xliff:g> để thanh toán trên thiết bị thanh toán không tiếp xúc"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Quay lại"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Tiếp theo"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Hoàn tất"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Chụp ảnh"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Chọn hình ảnh"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Chọn ảnh"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Thẻ SIM"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Thẻ SIM"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Luôn sử dụng SIM này để gọi"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Chọn SIM cho dữ liệu"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Chọn thẻ SIM cho tin nhắn SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Đang chuyển SIM dữ liệu, quá trình này có thể mất tới một phút..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Đang chuyển đổi SIM dữ liệu, quá trình này có thể mất tối đa một phút…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Gọi bằng"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Chọn thẻ SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"quy trình, lịch biểu, trình tiết kiệm pin, trình tiết kiệm điện, pin, tự động, phần trăm"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"volte, gọi nâng cao, gọi qua mạng 4G"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"thêm ngôn ngữ, thêm một ngôn ngữ"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"cỡ chữ"</string>
     <string name="default_sound" msgid="6604374495015245195">"Âm thanh mặc định"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Âm lượng chuông và thông báo ở mức <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Âm lượng, rung, Không làm phiền"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Âm thanh bật nguồn"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Phụ đề trực tiếp"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Tự động tạo phụ đề cho nội dung nghe nhìn"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Không có"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">Đã đặt <xliff:g id="ON_COUNT">%d</xliff:g> lịch biểu</item>
-      <item quantity="one">Đã đặt 1 lịch biểu</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Không có}=1{Đã đặt 1 lịch biểu}other{Đã đặt # lịch biểu}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Không làm phiền"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Chỉ nhận thông báo về những người và ứng dụng quan trọng"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Hạn chế bị gián đoạn"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Chỉ cho các mục ưu tiên"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Đang bật / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Đang tắt / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Đang tắt"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Đang bật"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Luôn hỏi"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Cho đến khi bạn tắt"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> giờ</item>
-      <item quantity="one">1 giờ</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> phút"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> lịch biểu có thể tự động bật</item>
-      <item quantity="one">1 lịch biểu có thể tự động bật</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 giờ}other{# giờ}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 phút}other{# phút}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Đang tắt}=1{Đang tắt/1 lịch biểu có thể tự động bật}other{Đang tắt/# lịch biểu có thể tự động bật}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Những điều có thể làm gián đoạn chế độ Không làm phiền"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Người"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Ứng dụng"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Tự động đặt thông báo có mức ưu tiên thấp thành Nhẹ nhàng"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Thứ tự thông báo thích ứng"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Tự động sắp xếp các thông báo theo mức độ liên quan"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Phản hồi về tính năng thông báo thích ứng"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Cho biết những điều chỉnh được thực hiện đối với thông báo và hiển thị tùy chọn gửi ý kiến phản hồi cho hệ thống"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Đặt lại mức độ quan trọng của thông báo"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Đặt lại các tùy chọn cài đặt về mức độ quan trọng mà người dùng đã thay đổi và cho phép Trợ lý thông báo thiết lập mức độ ưu tiên"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Câu trả lời và hành động đề xuất"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Tự động hiển thị câu trả lời và hành động đề xuất"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Hiển thị các thông báo gần đây và thông báo đã tạm ẩn"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Cuộc trò chuyện ưu tiên"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Hiển thị dưới dạng bong bóng nổi ở đầu phần cuộc trò chuyện"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Hiển thị ở đầu phần cuộc trò chuyện"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Cuộc trò chuyện khác"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Cuộc trò chuyện không ưu tiên"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Cuộc trò chuyện mà bạn đã thay đổi"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Cuộc trò chuyện gần đây"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Xóa cuộc trò chuyện gần đây"</string>
+    <string name="clear" msgid="5092178335409471100">"Xóa"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Hiển thị các cuộc trò chuyện ưu tiên ở dạng bong bóng"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Các cuộc trò chuyện ưu tiên sẽ hiển thị ở đầu ngăn kéo xuống. Bạn cũng có thể chuyển các cuộc trò chuyện này sang dạng bong bóng và tạm thời dừng chế độ Không làm phiền."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Các cuộc trò chuyện ưu tiên và đã sửa đổi sẽ xuất hiện ở đây"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Truy cập Không làm phiền"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Cho phép tính năng Không làm phiền"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Không có ứng dụng được cài đặt nào yêu cầu quyền truy cập Không làm phiền"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Đang tải ứng dụng..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Đang tải ứng dụng…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Theo yêu cầu của bạn, Android đang chặn hiển thị thông báo của ứng dụng này trên thiết bị này"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Theo yêu cầu của bạn, Android đang chặn hiển thị danh mục thông báo này trên thiết bị này"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Theo yêu cầu của bạn, Android đang chặn hiển thị nhóm thông báo này trên thiết bị này"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Tất cả các cuộc trò chuyện"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Cuộc trò chuyện ưu tiên"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Không có"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> cuộc trò chuyện</item>
-      <item quantity="one">1 cuộc trò chuyện</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Không có"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Không có}=1{1 cuộc trò chuyện}other{# cuộc trò chuyện}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Những người liên hệ bạn vẫn liên lạc được"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Cuộc gọi"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Cuộc gọi"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Để các cuộc gọi đã cho phép phát ra âm thanh, hãy đặt thiết bị ở chế độ đổ chuông"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Đối với ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’, các cuộc gọi đến đều bị chặn. Bạn có thể điều chỉnh các tùy chọn cài đặt để cho phép bạn bè, gia đình hoặc những người liên hệ khác liên lạc với bạn."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Người liên hệ có gắn dấu sao"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> người khác</item>
-      <item quantity="one">1 người khác</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Không có"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Không có}=1{{contact_1}}=2{{contact_1} và {contact_2}}=3{{contact_1}, {contact_2} và {contact_3}}other{{contact_1}, {contact_2} và # người liên hệ khác}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Không có tên)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Tin nhắn"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"tin nhắn"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Tin nhắn"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Các tin nhắn đến sẽ bị chặn khi áp dụng ‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’. Bạn có thể điều chỉnh các tùy chọn cài đặt để cho phép bạn bè, gia đình hoặc những người liên hệ khác liên lạc với bạn."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Bạn sẽ được thông báo về tất cả tin nhắn"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Bạn sẽ được thông báo về tất cả cuộc gọi"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Không có"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> người liên hệ</item>
-      <item quantity="one">1 người liên hệ</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Không có}=1{1 người liên hệ}other{# người liên hệ}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Bất kỳ ai"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Danh bạ"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Người liên hệ có gắn dấu sao"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Tất cả thông báo"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Một số thông báo"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Những người được chọn vẫn có thể liên hệ với bạn, ngay cả khi bạn không cho phép các ứng dụng làm phiền"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">Ứng dụng <xliff:g id="APP_NAMES">%s</xliff:g> có thể gián đoạn</item>
-      <item quantity="one">Ứng dụng <xliff:g id="APP_NAME_0">%s</xliff:g> có thể gián đoạn</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> ứng dụng khác"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Không ứng dụng nào có thể gây gián đoạn}=1{{app_1} có thể gây gián đoạn}=2{{app_1} và {app_2} có thể gây gián đoạn}=3{{app_1}, {app_2} và {app_3} có thể gây gián đoạn}other{{app_1}, {app_2} và # ứng dụng khác có thể gây gián đoạn}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Ứng dụng"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Tất cả thông báo"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Một số thông báo"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Các thông báo bạn vẫn nhận được"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Cho phép tất cả thông báo"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g> có thể gián đoạn</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g> có thể gián đoạn</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Không âm thanh nào có thể gián đoạn"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> âm thanh khác"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Không âm thanh nào có thể gây gián đoạn}=1{{sound_category_1} có thể gây gián đoạn}=2{{sound_category_1} và {sound_category_2} có thể gây gián đoạn}=3{{sound_category_1}, {sound_category_2} và {sound_category_3} có thể gây gián đoạn}other{{sound_category_1}, {sound_category_2} và # âm thanh khác có thể gây gián đoạn}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Không âm thanh nào có thể gây gián đoạn"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Không ai có thể gián đoạn"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Một số người có thể gián đoạn"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Tất cả mọi người có thể gián đoạn"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Đang bật"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Tắt"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Ghim ứng dụng"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Tính năng ghim ứng dụng cho phép bạn tiếp tục hiển thị ứng dụng hiện tại cho tới khi bỏ ghim. Chẳng hạn như bạn có thể sử dụng tính năng này để cho phép người bạn tin cậy chơi một trò chơi cụ thể. \n\nKhi bạn ghim ứng dụng, ứng dụng đã ghim có thể mở các ứng dụng khác và truy cập dữ liệu cá nhân. \n\nĐể dùng tính năng ghim ứng dụng, hãy làm như sau: 	\n1.	Bật tính năng ghim ứng dụng 	\n2.	Mở phần Tổng quan 	\n3.	Nhấn vào biểu tượng ứng dụng ở đầu màn hình, sau đó nhấn vào Ghim"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Tính năng ghim ứng dụng cho phép bạn tiếp tục hiển thị ứng dụng hiện tại cho tới khi bỏ ghim. Chẳng hạn như bạn có thể sử dụng tính năng này để cho phép người bạn tin cậy chơi một trò chơi cụ thể. \n\nKhi bạn ghim ứng dụng, ứng dụng đã ghim có thể mở các ứng dụng khác và truy cập dữ liệu cá nhân. \n\nNếu bạn muốn chia sẻ thiết bị của mình với người khác một cách an toàn, hãy thử sử dụng chế độ khách. \n\nĐể dùng tính năng ghim ứng dụng, hãy làm như sau: 	\n1.	Bật tính năng ghim ứng dụng 	\n2.	Mở phần Tổng quan 	\n3.	Nhấn vào biểu tượng ứng dụng ở đầu màn hình, sau đó nhấn vào Ghim"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Nhờ tính năng ghim ứng dụng, bạn có thể tiếp tục hiển thị ứng dụng hiện tại cho tới khi bỏ ghim. Bạn có thể sử dụng tính năng này để cho phép người bạn tin cậy chơi một trò chơi cụ thể chẳng hạn."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Khi bạn ghim ứng dụng, ứng dụng đã ghim có thể mở các ứng dụng khác và truy cập vào dữ liệu cá nhân. \n\nĐể dùng tính năng ghim ứng dụng, hãy làm như sau: 	\n1.	Bật tính năng ghim ứng dụng 	\n2.	Mở phần Tổng quan 	\n3.	Nhấn vào biểu tượng ứng dụng ở đầu màn hình, sau đó nhấn vào Ghim"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Khi bạn ghim ứng dụng, ứng dụng đã ghim có thể mở các ứng dụng khác và truy cập vào dữ liệu cá nhân. \n\nNếu bạn muốn chia sẻ thiết bị của mình với người khác một cách an toàn, hãy thử sử dụng chế độ khách. \n\nĐể dùng tính năng ghim ứng dụng, hãy làm như sau: 	\n1.	Bật tính năng ghim ứng dụng 	\n2.	Mở phần Tổng quan 	\n3.	Nhấn vào biểu tượng ứng dụng ở đầu màn hình, sau đó nhấn vào Ghim"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Khi ghim ứng dụng: \n\n•	 Ứng dụng đã ghim có thể truy cập dữ liệu cá nhân \n		(chẳng hạn như danh bạ và nội dung email) \n•	 Ứng dụng đã ghim có thể mở các ứng dụng khác \n\nChỉ sử dụng tính năng ghim ứng dụng với những người bạn tin tưởng."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Hỏi hình mở khóa trước khi bỏ ghim"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Hỏi mã PIN trước khi bỏ ghim"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Ngoài việc sử dụng khuôn mặt để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo bao gồm cả báo thức cho đến khi khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Bạn có muốn yêu cầu mã PIN để khởi động thiết bị của mình không?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Ngoài việc sử dụng khuôn mặt để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo bao gồm cả báo thức cho đến khi khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Bạn có muốn yêu cầu hình mở khóa để khởi động thiết bị của mình không?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Ngoài việc sử dụng khuôn mặt để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo bao gồm cả báo thức cho đến khi khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Bạn có muốn yêu cầu mật khẩu để khởi động thiết bị của mình không?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Ngoài việc sử dụng tính năng nhận dạng sinh trắc học để mở khóa thiết bị, bạn có thể tăng cường bảo vệ thiết bị này bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Khi chưa khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, kể cả chuông báo.\n\nĐiều này giúp bảo vệ dữ liệu của bạn trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mã PIN để khởi động thiết bị của bạn?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Ngoài việc sử dụng tính năng nhận dạng sinh trắc học để mở khóa thiết bị, bạn có thể tăng cường bảo vệ thiết bị này bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Khi chưa khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, kể cả chuông báo.\n\nĐiều này giúp bảo vệ dữ liệu của bạn trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu hình mở khóa để khởi động thiết bị của bạn?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Ngoài việc sử dụng tính năng nhận dạng sinh trắc học để mở khóa thiết bị, bạn có thể tăng cường bảo vệ thiết bị này bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Khi chưa khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, kể cả chuông báo.\n\nĐiều này giúp bảo vệ dữ liệu của bạn trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Có"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Không"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Bị hạn chế"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"Thiết bị kiểm soát USB"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Thiết bị đã kết nối"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Thiết bị này"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Đang chuyển đổi..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Đang chuyển đổi…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Không thể chuyển đổi"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Đang sạc thiết bị này"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Sạc thiết bị được kết nối"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Mức sử dụng dữ liệu di động"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Mức sử dụng dữ liệu của ứng dụng"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Mức sử dụng dữ liệu Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Mức sử dụng dữ liệu không phải của nhà mạng"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Sử dụng dữ liệu ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"Ethernet"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 hạn chế</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Cách tính dữ liệu của nhà mạng có thể khác với thiết bị của bạn."</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ngoại trừ dữ liệu được dùng trong mạng của nhà mạng"</string>
     <string name="data_used_template" msgid="8229342096562327646">"Đã sử dụng <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Đặt cảnh báo dữ liệu"</string>
     <string name="data_warning" msgid="2925054658166062884">"Cảnh báo dữ liệu"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Xem chi tiết"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Trình tiết kiệm dữ liệu"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Dữ liệu không hạn chế"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Dữ liệu nền bị tắt"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Dữ liệu nền đang tắt"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Đang bật"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Đang tắt"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Sử dụng Trình tiết kiệm dữ liệu"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Nếu thiết bị bị khóa, ngăn nhập câu trả lời hoặc văn bản khác trong thông báo"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Trình kiểm tra chính tả mặc định"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Chọn trình kiểm tra chính tả"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Sử dụng trình kiểm tra chính tả"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Sử dụng trình kiểm tra chính tả"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Chưa được chọn"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(không có)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Để giúp giải phóng dung lượng lưu trữ, trình quản lý bộ nhớ sẽ xóa ảnh và video đã sao lưu khỏi thiết bị của bạn."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Xóa ảnh và video"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Trình quản lý bộ nhớ"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Sử dụng Trình quản lý bộ nhớ"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Sử dụng Trình quản lý bộ nhớ"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Tự động"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Hướng dẫn sử dụng"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Giải phóng dung lượng ngay"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Nhấn đúp để kiểm tra điện thoại"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Nhấn đúp để kiểm tra máy tính bảng"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Nhấn đúp để kiểm tra thiết bị"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Vuốt để xem thông báo"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Để hiển thị thông báo, hãy vuốt xuống cuối màn hình"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Chế độ một tay"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Sử dụng chế độ một tay"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Thoát khi chuyển đổi ứng dụng"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Thời gian chờ"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 giây"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 giây"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 giây"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"tầm với"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Để xem thời gian, thông báo và thông tin khác, hãy nhấn đúp vào màn hình."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Nhấc để kiểm tra điện thoại"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Nhấc để kiểm tra máy tính bảng"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Nhấn để kiểm tra máy tính bảng"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Nhấn để kiểm tra thiết bị"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Để xem thời gian, thông báo và thông tin khác, hãy nhấn vào màn hình."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"SOS khẩn cấp"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Sử dụng SOS khẩn cấp"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Do <xliff:g id="APP_NAME">%1$s</xliff:g> quản lý"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Bắt đầu các hành động đã chọn bằng cách nhấn nhanh nút nguồn 5 lần trở lên"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Phát cảnh báo đếm ngược"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Phát một âm thanh lớn trước khi thông báo cần trợ giúp"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Hãy gọi để được trợ giúp"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Số điện thoại để gọi khi cần trợ giúp"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Nhấn để thay đổi"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Nếu bạn nhập một số điện thoại không khẩn cấp:\n • Bạn phải mở khóa thiết bị để dùng tính năng SOS khẩn cấp\n • Cuộc gọi của bạn có thể sẽ không được trả lời"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Vuốt cảm biến vân tay để xem thông báo"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Vuốt vân tay"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau điện thoại."</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Số tập dữ liệu hiển thị tối đa"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Đặt lại về giá trị mặc định"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Đã đặt lại tùy chọn tự động điền dành cho nhà phát triển"</string>
+    <string name="location_category" msgid="3496759112306219062">"Vị trí"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Chỉ báo vị trí trên thanh trạng thái"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Hiển thị cho tất cả vị trí, bao gồm cả mạng và khả năng kết nối"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Thực thi số đo GNSS đầy đủ"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Theo dõi tất cả chòm sao và tần suất GNSS mà không có chu kỳ làm việc"</string>
     <string name="device_theme" msgid="5027604586494772471">"Giao diện thiết bị"</string>
     <string name="default_theme" msgid="4815428567082263639">"Mặc định"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Tên mạng"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Tạm dừng thông báo để tập trung"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Tính năng không hoạt động"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Tính năng này đã bị tắt vì sẽ khiến điện thoại chạy chậm"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Thực thi số đo GNSS đầy đủ"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Theo dõi tất cả chòm sao và tần suất GNSS mà không có chu kỳ làm việc"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Luôn hiển thị hộp thoại sự cố"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Hiển thị hộp thoại mỗi khi ứng dụng gặp sự cố"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Chọn ứng dụng hỗ trợ ANGLE"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Bật cho tất cả các ứng dụng"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Chọn trình điều khiển đồ họa"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Mặc định"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Trình điều khiển trò chơi"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Trình điều khiển trò chơi"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Trình điều khiển dành cho nhà phát triển"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Trình điều khiển đồ họa hệ thống"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Bật (tắt tiếng)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Tắt"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Chi tiết mạng"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Tên thiết bị của bạn sẽ hiển thị với các ứng dụng trên điện thoại. Những người khác cũng có thể thấy tên thiết bị này khi bạn kết nối với thiết bị Bluetooth hoặc thiết lập điểm phát sóng Wi-Fi."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Tên thiết bị của bạn sẽ hiển thị với các ứng dụng trên điện thoại. Những người khác cũng có thể thấy tên thiết bị này khi bạn kết nối với thiết bị Bluetooth, mạng Wi-Fi hoặc thiết lập một điểm phát sóng Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Thiết bị"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Tất cả tùy chọn cài đặt"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Đề xuất"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Không tìm thấy mạng. Hãy thử lại."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(cấm)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Không có thẻ SIM"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Không có SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Không có"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Cần có SIM để kết nối"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Cần có SIM <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> để kết nối"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Chế độ mạng ưa thích: ưu tiên WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Chế độ mạng ưa thích: chỉ GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Chế độ mạng ưa thích: chỉ WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Dữ liệu di động"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Sử dụng dữ liệu qua mạng di động"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Điện thoại sẽ tự động chuyển sang nhà mạng này khi nằm trong vùng phủ sóng"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Không có thẻ SIM nào"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Tùy chọn cuộc gọi"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Tùy chọn cho SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Luôn hỏi"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Không sử dụng được khi kết nối với <xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Xem thêm"</string>
     <string name="see_less" msgid="2642392725363552793">"Xem bớt"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Bật <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Bật SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Chuyển sang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Chuyển sang dùng thẻ SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"Chỉ một SIM có thể hoạt động mỗi lần.\n\nKhi chuyển sang <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, dịch vụ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> của bạn sẽ không bị hủy."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"Chỉ một SIM đã tải xuống có thể hoạt động mỗi lần.\n\nKhi chuyển sang <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>, dịch vụ <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> của bạn sẽ không bị hủy."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"Chỉ một SIM có thể hoạt động mỗi lần.\n\nKhi chuyển đổi SIM, dịch vụ <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> của bạn sẽ không bị hủy."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Chuyển sang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Đang kết nối mạng…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Đang chuyển sang <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Không thể chuyển đổi nhà mạng"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Không thể chuyển đổi nhà mạng do lỗi."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Tắt <xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Tắt SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Đang tắt SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Không thể tắt nhà mạng"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Đã xảy ra lỗi nên bạn không thể tắt nhà mạng."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Dùng 2 SIM?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Thiết bị này có thể dùng 2 SIM cùng lúc. Để tiếp tục dùng 1 SIM mỗi lần, hãy nhấn vào \"Không, cảm ơn\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Khởi động lại thiết bị?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Để bắt đầu, hãy khởi động lại thiết bị. Sau đó, bạn có thể thêm một SIM khác."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Tiếp tục"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Khởi động lại"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Không, cảm ơn"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Chuyển"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Không thể kích hoạt SIM"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Hãy tháo SIM rồi lắp lại. Nếu vấn đề vẫn xảy ra, vui lòng khởi động lại thiết bị."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Hãy thử bật lại SIM. Nếu vấn đề vẫn xảy ra, vui lòng khởi động lại thiết bị."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Kích hoạt mạng"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g> đang hoạt động"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Nhấn để cập nhật tùy chọn cài đặt SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"Thẻ SIM"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Xóa SIM đã tải xuống này?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Khi bạn xóa SIM, dịch vụ <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> sẽ bị xóa khỏi thiết bị này.\n\nDịch vụ của <xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> sẽ không bị hủy."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Xóa"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Đang xóa SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Không thể xóa SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Không thể xóa SIM này do lỗi.\n\nHãy khởi động lại thiết bị rồi thử lần nữa."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Kết nối với thiết bị"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Ứng dụng <xliff:g id="APPNAME">%1$s</xliff:g> muốn dùng mạng Wi-Fi tạm thời để kết nối với thiết bị của bạn"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Không tìm thấy thiết bị nào. Đảm bảo rằng các thiết bị đang bật và sẵn sàng kết nối."</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Cuộc gọi khẩn cấp"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Nhà mạng của bạn không hỗ trợ các cuộc gọi khẩn cấp qua tính năng Gọi qua Wi‑Fi.\nKhi cần thực hiện cuộc gọi khẩn cấp, thiết bị sẽ tự động chuyển sang mạng di động.\nBạn chỉ có thể thực hiện cuộc gọi khẩn cấp ở các khu vực có mạng di động."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Sử dụng Wi‑Fi cho cuộc gọi để cải thiện chất lượng"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Gọi bằng nhiều SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Cho phép SMS và cuộc gọi trên SIM khác thông qua SIM này."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"gọi bằng nhiều sim"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Tin nhắn MMS đến"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Không thể gửi tin nhắn MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Nhấn để cho phép nhắn tin MMS qua <xliff:g id="OPERATOR_NAME">%1$s</xliff:g> khi dữ liệu di động đang tắt"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Cho phép phủ lên màn hình Cài đặt"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Những ứng dụng có thể hiển thị bên trên các ứng dụng khác sẽ được phép phủ lên màn hình Cài đặt"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Nội dung nghe nhìn"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Ẩn trình phát khi phiên phát nội dung nghe nhìn đã kết thúc"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Trình phát cho phép bạn tiếp tục một phiên từ bảng Cài đặt nhanh mở rộng."</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"Trình phát nội dung nghe nhìn trong phần Cài đặt nhanh"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Hiển thị trình phát nội dung nghe nhìn trong thời gian dài để dễ dàng tiếp tục phát"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Ẩn trình phát"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Hiện trình phát"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Không có trình phát nào"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Ứng dụng được phép"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"nội dung nghe nhìn"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"Bluetooth sẽ bật"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Đang bật"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Đang tắt"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"Internet"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Mạng an toàn trên máy bay"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Tìm và kết nối mạng an toàn trên máy bay"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"máy bay, an toàn trên máy bay"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Cuộc gọi và tin nhắn SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Gọi qua Wi-Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Gọi và nhận cuộc gọi qua các mạng không phải do nhà mạng cung cấp, chẳng hạn như mạng Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Với tính năng gọi qua Wi‑Fi, bạn có thể gọi và nhận cuộc gọi qua các mạng không phải do nhà mạng cung cấp, chẳng hạn như một số mạng Wi‑Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Cuộc gọi"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"Tin nhắn SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"ưu tiên"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"ưu tiên cuộc gọi"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"ưu tiên SMS"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"không có sẵn"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Không có SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Lựa chọn ưu tiên"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Kết nối với mạng công cộng"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"kết nối mạng, Internet, không dây, dữ liệu, wifi, wi-fi, wi fi, di động, nhà mạng di động, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Xem các mạng an toàn với máy bay"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Tắt Chế độ trên máy bay"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Không dùng được vì chế độ giờ đi ngủ đang bật"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Đã hoàn tất việc đặt lại mức độ quan trọng của thông báo."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Ứng dụng"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Thiết bị không tin cậy muốn truy cập vào tin nhắn của bạn. Hãy nhấn để biết thông tin chi tiết."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Cho phép truy cập vào tin nhắn?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Một thiết bị Bluetooth không tin cậy [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] muốn truy cập vào tin nhắn của bạn.\n\nBạn chưa từng kết nối với [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Thiết bị không tin cậy muốn truy cập vào danh bạ và nhật ký cuộc gọi của bạn. Hãy nhấn để biết thông tin chi tiết."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Cho phép truy cập vào danh bạ và nhật ký cuộc gọi?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Một thiết bị Bluetooth không tin cậy [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] muốn truy cập vào danh bạ và nhật ký cuộc gọi của bạn. Trong đó có cả dữ liệu về cuộc gọi đi và cuộc gọi đến.\n\nBạn chưa từng kết nối với [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]."</string>
 </resources>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index bb96438..0538159 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"中"</item>
     <item msgid="6740026006576843477">"长"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"短"</item>
+    <item msgid="7397961711906421599">"中"</item>
+    <item msgid="4079132024502041928">"长"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"默认"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"通用"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"仅限 TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"全球"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index cdc19b9..2c6deca 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"日期和时间"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"设置日期和时间"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"设置日期、时间、时区和格式"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"使用网络提供的时间"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"使用网络提供的时区"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"自动设置时间"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"自动设置时区"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"使用默认语言区域"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 小时制"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"使用 24 小时制"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"在锁定屏幕上显示个人资料信息"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"帐号"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"位置信息"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"使用位置信息"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"使用位置信息"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"关闭"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">已开启 - <xliff:g id="COUNT_1">%1$d</xliff:g> 个应用有权使用位置信息</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"屏幕锁定、人脸解锁"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"屏幕锁定、指纹"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"屏幕锁定"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"使用您的面孔和指纹安全地解锁手机"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"您还可以登录应用和确认付款"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"设置解锁方式："</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"人脸解锁"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"轻松解锁手机"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"指纹"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"快速解锁口袋中的手机"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"跳过"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"下一步"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"已添加面孔"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"设置人脸解锁"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"人脸解锁"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"使用您的面孔进行身份验证"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"开始"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"如果人脸解锁无障碍功能处于关闭状态，某些设置步骤可能无法与 TalkBack 正常搭配运行。"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"返回"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"继续设置"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"使用无障碍设置"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"在应用中使用人脸解锁时，一律需确认"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"删除人脸数据"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"设置人脸解锁"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"您可以使用人脸解锁功能来解锁设备、登录应用以及确认付款。\n\n注意：\n目视手机可能会让手机意外解锁。\n\n如果有人将手机对着您的脸，手机可能会因此解锁。\n\n长相与您十分相似的人（例如同胞兄弟姐妹）可能也能解锁您的手机。"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"您可以使用人脸解锁功能来解锁设备、登录应用以及确认付款。\n\n注意：\n目视手机可能会让手机意外解锁。\n\n如果有人将手机对着您的脸，也可能会解锁您的手机（即使您闭上眼睛）。\n\n此外，长相与您相似的人（例如与您具有相同特征的兄弟姐妹）可能也能解锁您的手机。"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"您可以使用人脸解锁功能解锁设备、登录应用和确认付款。"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"注意：\n目视手机可能会让手机意外解锁。\n\n如果有人将手机对着您的脸，手机可能会因此解锁。\n\n长相与您十分相似的人（例如同胞兄弟姐妹）可能也能解锁您的手机。"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"注意：\n目视手机可能会让手机意外解锁。\n\n如果有人将手机对着您的脸，手机可能会因此解锁（即使您闭上眼睛）。\n\n长相与您十分相似的人（例如同胞兄弟姐妹）可能也能解锁您的手机。"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"要删除人脸数据吗？"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"系统会安全地将人脸解锁功能所用的脸部数据永久删除。移除数据后，您将需要使用 PIN 码、图案或密码来解锁手机、登录应用和确认付款。"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"使用人脸解锁功能将手机解锁"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"使用指纹解锁手机或批准购买交易。\n\n请注意：您无法使用指纹来解锁此设备。要了解详情，请与贵单位的管理员联系。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"使用指纹解锁手机或批准购买交易。\n\n请注意：指纹的安全性可能不及安全系数高的图案或 PIN 码。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"取消"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"不用了"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"继续"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"跳过"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"下一步"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"通过屏幕锁定选项来保护您的平板电脑，这样一来，即使平板电脑丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定方式才能设置人脸解锁。要返回上一屏幕，请点按“取消”。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"通过屏幕锁定选项来保护您的设备，这样一来，即使设备丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定方式才能设置人脸解锁。要返回上一屏幕，请点按“取消”。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"通过屏幕锁定选项来保护您的手机，这样一来，即使手机丢失或被盗，其他人也无法使用。此外，您还需要启用一种屏幕锁定方式才能设置人脸解锁。要返回上一屏幕，请点按“取消”。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"设置屏幕锁定选项可保护您的平板电脑，这样一来，即使平板电脑丢失或被盗，其他人也无法使用。此外，您需要启用一种屏幕锁定选项才能设置生物识别。如需返回上一屏幕，请点按“取消”。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"设置屏幕锁定选项可保护您的设备，这样一来，即使设备丢失或被盗，其他人也无法使用。此外，您需要启用一种屏幕锁定选项才能设置生物识别。如需返回上一屏幕，请点按“取消”。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"设置屏幕锁定选项可保护您的手机，这样一来，即使手机丢失或被盗，其他人也无法使用。此外，您需要启用一种屏幕锁定选项才能设置生物识别。如需返回上一屏幕，请点按“取消”。"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"要跳过 PIN 码设置吗？"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"要跳过密码设置吗？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"要跳过图案设置吗？"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"启用设备保护功能可防止他人在未经您允许的情况下使用此平板电脑。请选择您要使用的屏幕锁定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"启用设备保护功能可防止他人在未经您允许的情况下使用此设备。请选择您要使用的屏幕锁定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"启用设备保护功能可防止他人在未经您允许的情况下使用此手机。请选择您要使用的屏幕锁定方式。"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"选择您的备用屏幕锁定方式"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"选择您的备用屏幕锁定方式"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"选择您的备用屏幕锁定方式"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"屏幕锁定选项"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"屏幕锁定选项"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"屏幕锁定"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"人脸解锁 + 密码"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"不设置人脸解锁并继续"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"您可以使用自己的面孔将手机解锁。为了安全起见，要使用此选项，您必须设置备用屏幕锁定方式。"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"生物识别 + 解锁图案"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"生物识别 + PIN 码"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"生物识别 + 密码"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"不使用生物识别并继续操作"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"您可以使用生物识别解锁手机。为了安全起见，您必须设置备用屏幕锁定方式才能使用此选项。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"由于管理员、加密策略或凭据存储的要求，您无法使用此选项"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"无"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"滑动"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">必须少于 <xliff:g id="NUMBER_0">%d</xliff:g> 位数</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"设备管理员不允许使用最近用过的 PIN 码"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"常用 PIN 码已被您的 IT 管理员屏蔽。请尝试一个不同的 PIN 码。"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"密码不得包含无效字符"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"必须包含至少 1 个字母"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"必须包含至少 1 个数字"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">必须包含至少 1 个非数字字符</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"设备管理员不允许使用最近用过的密码"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"常用密码已被您的 IT 管理员屏蔽。请尝试一个不同的密码。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"不允许使用以升序、降序或重复序列进行排列的一串数字"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"确认"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"取消"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"打开WLAN"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"WLAN"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"使用 WLAN"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"使用 WLAN"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"WLAN设置"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"WLAN"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"设置和管理无线接入点"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"将二维码对准下方中间位置即可连接到“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"扫描二维码即可加入 WLAN"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"分享 WLAN"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"扫描此二维码即可连接到“<xliff:g id="SSID">%1$s</xliff:g>”并分享密码"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"使用其他设备扫描此二维码即可加入“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"扫描此二维码即可连接到“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"请重试。如果问题依然存在，请与设备制造商联系"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"出了点问题"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"WLAN 密码：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"热点密码：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"自动连接"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"允许手机在此网络附近时自动连接"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"允许平板电脑在此网络附近时自动连接"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"允许在进入此网络的覆盖范围时连接到此网络"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"添加设备"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"使用二维码将设备添加到此网络"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"二维码的格式无效"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"使用系统证书"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"不验证"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"未指定任何证书。您的网络连接将不是私密连接。"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"网络名称太长。"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"必须指定域名。"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"需要指定证书。"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"连接"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"WLAN 已开启"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"已连接到“<xliff:g id="NETWORK_NAME">%1$s</xliff:g>”"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"正在连接到“<xliff:g id="NETWORK_NAME">%1$s</xliff:g>”"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"正在连接…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"无法连接网络"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"网络不在范围内"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"设备 MAC 地址"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"随机生成的 MAC 地址"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"随机生成的 MAC 地址（上次使用）"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP 地址"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"网络详情"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"子网掩码"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 地址"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"已保存的网络"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"订阅"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"其他网络"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP 设置"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"此用户无法查看或修改 WLAN 网络高级设置"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"保存"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"请键入有效的网关地址。"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"请输入有效的DNS地址。"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"键入长度在 0 到 32 之间的网络前缀。"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1（除非已被专用 DNS 替换）"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2（除非已被专用 DNS 替换）"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"网关"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"网络前缀长度"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"WLAN 直连"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"应用正在共享内容。要共享互联网连接，请先关闭热点，然后重新打开"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"未设置密码"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"热点名称"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"正在打开<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"正在开启“<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>”…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"其他设备可以连接到<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"热点密码"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP 频段"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"流畅画面"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"自动将某些内容的刷新频率从 60 Hz 调高到 90 Hz。这么做会增加耗电量。"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"流畅画面"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"强制使用 90 Hz 刷新频率"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"使用最高刷新频率可提升按触操作响应和动画质量，但会增加耗电量。"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"屏幕感知"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"开启 / 您看着屏幕时，它将不会关闭"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"收到新通知时，变暗的屏幕会自动亮起"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"始终显示时间和信息"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"这会增加耗电量"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"粗体文字"</string>
     <string name="title_font_size" msgid="570613010306330622">"字体大小"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"放大或缩小文字"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM 卡锁定设置"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android 版本"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android 安全更新"</string>
     <string name="model_info" msgid="8997566254717810904">"型号"</string>
-    <string name="model_summary" msgid="2246651782442466213">"型号：%1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"型号和硬件"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"硬件版本"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"设备 ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"删除 APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"新建 APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"保存"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"放弃"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"取消"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"“名称”字段不能为空。"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN 不能为空。"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"应用可以重置"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"重置 WLAN、移动数据网络和蓝牙设置"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"此操作会重置所有网络设置，包括：\n\n"<li>"WLAN"</li>\n<li>"移动数据网络"</li>\n<li>"蓝牙"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"清空"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"清除已下载的 SIM 卡"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"要下载备用 SIM 卡，请与您的运营商联系。此操作不会取消任何移动服务套餐。"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"此操作并不会取消任何移动服务套餐。如要下载备用 SIM 卡，请与您的运营商联系。"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"重置设置"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"要重置所有网络设置吗？此操作无法撤消。"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"要重置所有网络设置并清除已下载的 SIM 卡吗？此操作无法撤消。"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"网络设置已重置"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"无法清除 SIM 卡"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"发生错误，因此无法清除已下载的 SIM 卡。\n\n请重启设备，然后重试。"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"清除所有数据（恢复出厂设置）"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"清除所有数据（恢复出厂设置）"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"此操作会清除您平板电脑"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"此操作会清除您手机"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"目前，您已登录以下帐号：\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"此设备上目前还有其他用户。\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他的用户数据"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM 卡"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"这样并不会取消您的移动服务套餐。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"要清除音乐、照片和其他用户数据，请清空该 "<b>"USB存储设备"</b>"。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"要清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD卡"</b>"。"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"清除所有数据（恢复出厂设置）"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"清除所有数据（恢复出厂设置）"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"此操作会清除您平板电脑"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"此操作会清除您手机"<b>"内部存储空间"</b>"中的所有数据，包括：\n\n"<li>"您的 Google 帐号"</li>\n<li>"系统和应用的数据和设置"</li>\n<li>"已下载的应用"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"您目前已登录以下帐号：\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"此设备上目前还有其他用户。\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"音乐"</li>\n<li>"照片"</li>\n<li>"其他用户数据"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM 卡"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"这样并不会取消您的移动服务套餐。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"如需清除音乐、照片和其他用户数据，您需要清空该 "<b>"USB 存储设备"</b>"。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"如需清除音乐、图片和其他用户数据，您需要清空该 "<b>"SD 卡"</b>"。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"格式化USB存储设备"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"格式化SD卡"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"清除该内部USB存储设备中的全部数据，例如音乐或照片"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"清除SD卡中的全部数据，例如音乐或照片"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"清除所有数据"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"清除所有数据"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"系统将删除您所有的个人信息和已下载的应用。此操作无法撤消。"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"系统将删除您所有的个人信息（包括已下载的应用和 SIM 卡）。此操作无法撤消。"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"清除全部内容"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"“系统清除”服务不可用，因此未执行恢复出厂设置操作。"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"要清除所有数据吗？"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"此用户无权恢复出厂设置"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"正在清除"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"请稍候…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"清除所有数据"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"清除所有数据"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"系统将删除您所有的个人信息和已下载的应用。此操作无法撤消。"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"系统将删除您所有的个人信息（包括已下载的应用和 SIM 卡）。此操作无法撤消。"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"要清除所有数据吗？"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"此用户无权恢复出厂设置"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"正在清除"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"请稍候…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"通话设置"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"设置语音信箱、来电转接、来电等待和本机号码显示"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB 网络共享"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"无法与 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 台以上的设备共享网络。"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"即将断开与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>的网络共享。"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"以太网络共享"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"通过 USB 以太网共享手机的互联网连接"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"通过以太网共享手机的互联网连接"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"使用热点和网络共享功能，让其他设备能通过您的移动数据网络连接到互联网。应用还可以通过创建热点，与附近的设备共享内容。"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"使用热点和网络共享功能，让其他设备能通过您的 WLAN 或移动数据网络连接到互联网。应用还可以通过创建热点，与附近的设备共享内容。"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"帮助"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"蓝牙扫描"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允许应用和服务随时扫描附近的设备（即使蓝牙已关闭）。这可用于改进基于位置的功能和服务。"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用位置信息服务"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置信息时区检测"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置信息时区检测"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"允许使用设备的位置信息检测当前时区。WLAN 扫描等其他位置信息设置可能会影响时区检测的准确性。"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"开启"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"关闭"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"已停用自动检测时区的功能"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"位置信息时区检测已停用"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"不支持位置信息时区检测"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"不允许更改位置信息时区检测"</string>
     <string name="location_network_based" msgid="5247042890080021887">"WLAN和移动网络位置信息"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"允许应用使用Google位置信息服务更快地大致了解您所在的位置。系统将收集匿名位置数据并将其发送给Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"通过WLAN确定位置"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"要使用人脸解锁，请设置密码"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"要使用人脸解锁，请设置图案"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"要使用人脸解锁，请设置 PIN 码"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"如需使用生物识别，请设置密码"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"如需使用生物识别，请设置解锁图案"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"如需使用生物识别，请设置 PIN 码"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"忘记了密码？"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"忘记了图案？"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"忘记了 PIN 码？"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕偏好设置"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"放大功能"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"放大区域"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"放大功能启用"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"选择您在放大屏幕时想要使用的放大区域"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"全屏"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"部分屏幕"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"全屏与部分屏幕"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"放大整个屏幕"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"放大部分屏幕"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"要改用“无障碍”按钮吗？"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"如果使用点按三次即可放大屏幕上部分内容的功能，输入和其他操作会出现延迟。\n\n要改用“无障碍”按钮放大画面吗？"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"改用“无障碍”按钮"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"继续使用点按三次即可放大画面功能"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"放大设置"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"点按屏幕三次进行放大"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"使用快捷手势进行放大"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"按电源按钮结束通话"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"大号鼠标指针"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"移除动画"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"单声道音频"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"播放音频时合并声道"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"音频均衡"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"左"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"右"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"单声道音频"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"播放音频时合并声道"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"音频均衡"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"左"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"右"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"默认"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 秒"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 秒"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"通知振动"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"响铃振动"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"按触反馈"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"使用<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"打开<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"使用色彩校正"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"显示字幕"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"仅限支持的应用"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"使用<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"打开 <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"使用色彩校正"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"显示字幕"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"仅限支持的应用"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"字幕文字大小和样式"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"文字大小：<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"更多选项"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"绿色弱视"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"红色弱视"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"蓝色弱视"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"灰度模式"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"红绿不分"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"红绿不分"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"蓝黄不分"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"后台限制"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"允许应用在后台运行"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"不允许应用在后台运行"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"无法限制后台使用"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"无法限制后台使用"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"要限制后台活动吗？"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"如果您限制某个应用的后台活动，可能会导致该应用出现异常"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"由于此应用未设置为优化电池用量，因此您无法对其加以限制。\n\n要限制该应用，请先开启电池优化功能。"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"平板电脑的使用强度比平时高"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"设备的使用强度比平时高"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"电池电量可能会比平时更快耗尽"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"针对电池状况进行优化"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"暂时限用电池。点按即可了解详情。"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"您使用的手机的频率比平时高。电池电量可能会比预期更快耗尽。\n\n耗电量较高的几个应用："</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"您使用平板电脑的频率比平时高。电池电量可能会比预期更快耗尽。\n\n耗电量较高的几个应用："</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"您使用设备的频率比平时高。电池电量可能会比预期更快耗尽。\n\n耗电量较高的几个应用："</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">%1$d 个应用受到限制</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"读取电池计量器时出现问题"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"读取电池计量器时出现问题。点按即可"<annotation id="url">"了解详情"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"要停止该应用吗？"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"由于<xliff:g id="APP">%1$s</xliff:g>一直让手机保持唤醒状态，因此您的手机无法正常管理电池。\n\n要尝试解决此问题，您可以停止该应用。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"由于<xliff:g id="APP">%1$s</xliff:g>一直让平板电脑保持唤醒状态，因此您的平板电脑无法正常管理电池。\n\n要尝试解决此问题，您可以停止该应用。\n\n如果问题仍然存在，您可能需要卸载此应用，以改善电池性能。"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"设置时间表"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"延长电池续航时间"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"充电时关闭"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"在手机电量达到 <xliff:g id="PERCENT">%1$s</xliff:g> 时关闭省电模式"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"在平板电脑电量为 <xliff:g id="PERCENT">%1$s</xliff:g> 时关闭省电模式"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"在设备电量为 <xliff:g id="PERCENT">%1$s</xliff:g> 时关闭省电模式"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"在手机电量充到 <xliff:g id="PERCENT">%1$s</xliff:g> 以上时关闭省电模式"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"在平板电脑电量充到 <xliff:g id="PERCENT">%1$s</xliff:g> 以上时关闭省电模式"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"在设备电量充到 <xliff:g id="PERCENT">%1$s</xliff:g> 以上时关闭省电模式"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"开启"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"重置"</string>
     <string name="tts_play" msgid="2945513377250757221">"播放"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"自适应网络连接"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"自动管理您的网络连接，从而延长电池续航时间并提升设备性能"</string>
     <string name="credentials_title" msgid="7535942196886123656">"凭据存储"</string>
     <string name="credentials_install" msgid="3933218407598415827">"安装证书"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"从存储设备安装证书"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"用户凭据"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"查看和修改存储的凭据"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"高级"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"存储类型"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬件支持"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"仅限软件"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"此用户无法查看或修改凭据"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已安装（用于 VPN 和应用）"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"已安装（用于 WLAN）"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"不安装"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"仍然安装"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"未安装证书"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"要允许<xliff:g id="APP_NAME">%s</xliff:g>在此设备上安装证书吗？"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"当您访问以下应用和网址时，系统将通过这些证书识别您的身份"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"不允许"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"允许"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"显示更多"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"证书管理应用"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"无"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"当您访问以下应用和网址时，系统会通过此应用安装的证书识别您的身份"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"移除"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"紧急拨号信号"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"设置进行紧急呼救时的行为"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"备份"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"未设置 - 工作资料"</string>
     <string name="user_admin" msgid="4024553191395768119">"管理员"</string>
     <string name="user_you" msgid="3070562015202859996">"您（<xliff:g id="NAME">%s</xliff:g>）"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"昵称"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"您最多可添加 <xliff:g id="USER_COUNT">%1$d</xliff:g> 位用户"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"只有平板电脑的机主可以管理用户。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"只有手机的机主可以管理用户。"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"通过支付终端付款"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"设置付款应用，然后只需将手机背面靠近任何带有感应式标志的终端即可。"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"知道了"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"更多…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"更多…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"设置默认付款应用"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"更新默认付款应用"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"通过感应式终端进行付款时使用<xliff:g id="APP">%1$s</xliff:g>应用"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"返回"</string>
     <string name="wizard_next" msgid="3884832431439072471">"下一步"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"完成"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"拍照"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"选择图片"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"选择照片"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM 卡"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM 卡"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"一律使用这张卡进行通话"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"选择用于数据网络的 SIM 卡"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"选择要用于收发短信的 SIM 卡"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"正在切换用于连接数据网络的 SIM 卡，这最多可能需要 1 分钟的时间…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"正在切换用于连接数据网络的 SIM 卡，这最多可能需要 1 分钟的时间…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"选择用于通话的 SIM 卡"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"选择 SIM 卡"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM 卡 <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常安排, 日程, 省电模式, 节省电量, 电池, 自动, 百分比"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, 高级通话, 4G 通话"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"添加语言, 添加一种语言"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"文字大小"</string>
     <string name="default_sound" msgid="6604374495015245195">"默认铃声"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"铃声和通知音量为 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"音量、振动、勿扰"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"开机音效"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"实时字幕"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"自动生成媒体字幕"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"无"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">已设置 <xliff:g id="ON_COUNT">%d</xliff:g> 个时间表</item>
-      <item quantity="one">已设置 1 个时间表</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{无}=1{已设置 1 个时间表}other{已设置 # 个时间表}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"勿扰模式"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"仅接收来自重要联系人和重要应用的通知"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"限制打扰"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"仅限优先事项"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"开启 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"关闭 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"关闭"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"开启"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"每次都询问"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"直到您将其关闭"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> 小时</item>
-      <item quantity="one">1 小时</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> 分钟"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> 个时间表可以自动开启</item>
-      <item quantity="one">1 个时间表可以自动开启</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 小时}other{# 小时}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 分钟}other{# 分钟}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{关闭}=1{关闭/1 个时间表可以自动开启}other{关闭/# 个时间表可以自动开启}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"不受勿扰模式限制的例外项"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"联系人"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"应用"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"自动将优先级较低的通知设为无声通知"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"自适应通知排序"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"按相关性自动排列通知"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"自适应通知反馈"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"显示对通知所做的调整以及用于向系统提供反馈的选项"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"重置通知的重要性级别"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"重置用户更改的重要性级别设置，允许通知助手排定优先级"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"建议的操作和回复"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"自动显示建议的操作和回复"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"显示近期通知和延后的通知"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"优先对话"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"以悬浮对话泡形式显示在对话部分顶部"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"显示在对话部分顶部"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"其他对话"</string>
+    <string name="other_conversations" msgid="551178916855139870">"非优先对话"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"您已更改的对话"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"近期对话"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除近期项"</string>
+    <string name="clear" msgid="5092178335409471100">"清除"</string>
     <string name="important_bubble" msgid="7911698275408390846">"以对话泡形式显示优先对话"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"优先对话会显示在下拉通知栏顶部。您也可将优先对话设置为以对话泡形式显示，并允许系统在“勿扰”模式下显示此类对话泡。"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"优先对话和经过修改的对话会显示在这里"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"“勿扰”权限"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"允许勿扰模式"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"没有任何已安装应用申请“勿扰”权限"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"正在加载应用…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"正在加载应用…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"根据您的要求，Android 会阻止此应用的通知显示在此设备上"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"根据您的要求，Android 会阻止这类通知显示在此设备上"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"根据您的要求，Android 会阻止这组通知显示在此设备上"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"所有对话"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"优先对话"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"无"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> 个对话</item>
-      <item quantity="one">1 个对话</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"无"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{无}=1{1 个对话}other{# 个对话}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"例外的对象"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通话"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"来电"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"为了让设备在允许的来电呼入时发出提示音，请检查并确保设备已设为响铃"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"系统会在“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>”启用时屏蔽来电。您可以调整设置，方便亲朋好友或其他联系人与您联系。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"已加星标的联系人"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
-      <item quantity="one">另外 1 人</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"无"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{无}=1{{contact_1}}=2{{contact_1}和{contact_2}}=3{{contact_1}、{contact_2}和{contact_3}}other{{contact_1}、{contact_2}及另外 # 人}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"（无姓名）"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"消息"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"消息"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"消息"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"系统会在“<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>”排程进行时屏蔽收到的消息。您可以调整相应设置，以便允许您的好友、家人或其他联系人与您联系。"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"您会收到所有消息的通知"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"您会收到所有来电的通知"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"无"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> 位联系人</item>
-      <item quantity="one">1 位联系人</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{无}=1{1 位联系人}other{# 位联系人}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"任何人"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"联系人"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"已加星标的联系人"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"部分通知"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"所选人员仍能联系到您，即使您屏蔽了相应的应用也是如此"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">“<xliff:g id="APP_NAMES">%s</xliff:g>”例外</item>
-      <item quantity="one">“<xliff:g id="APP_NAME_0">%s</xliff:g>”例外</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"另外 <xliff:g id="NUMBER">%d</xliff:g> 个应用"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{任何应用均不能例外}=1{“{app_1}”例外}=2{“{app_1}”和“{app_2}”例外}=3{“{app_1}”“{app_2}”和“{app_3}”例外}other{“{app_1}”“{app_2}”及另外 # 个应用例外}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"应用"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"部分通知"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"例外的通知"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"允许所有通知"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>例外</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g>例外</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"任何音效均不能例外"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"另外 <xliff:g id="NUMBER">%d</xliff:g> 个音效"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{任何音效均不能例外}=1{{sound_category_1}例外}=2{{sound_category_1}和{sound_category_2}例外}=3{{sound_category_1}、{sound_category_2}和{sound_category_3}例外}other{{sound_category_1}、{sound_category_2}及另外 # 种音效例外}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"任何音效均不能例外"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"任何人均不能例外"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"某些人例外"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"所有人都例外"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"开启"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"关闭"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"固定应用"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"通过固定应用功能，您可以固定显示当前应用，直到取消固定该应用为止。例如，您可以利用此功能让信任的好友玩某款游戏。\n\n固定某个应用后，该应用可打开其他应用，也能访问您的个人数据。\n\n如需使用固定应用功能，请按以下步骤操作：	\n1.	开启固定应用功能 \n2.	打开“概览” \n3.	点按屏幕顶部的应用图标，然后点按“固定”"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"通过固定应用功能，您可以固定显示当前应用，直到取消固定该应用为止。例如，您可以利用此功能让信任的好友玩某款游戏。\n\n固定某个应用后，该应用可打开其他应用，也能访问您的个人数据。\n\n如果您想安全地与他人共用您的设备，请尝试改用访客用户个人资料。\n\n如需使用固定应用功能，请按以下步骤操作：	\n1.	开启固定应用功能 \n2.	打开“概览” \n3.	点按屏幕顶部的应用图标，然后点按“固定”"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"通过固定应用功能，您可以固定显示当前应用，直到取消固定该应用为止。例如，您可以利用此功能让信任的好友玩某款游戏。"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"固定某个应用后，该应用可打开其他应用，也能访问个人数据。\n\n如需使用固定应用功能，请按以下步骤操作：	\n1.	开启固定应用功能	\n2.	打开“概览”	\n3.	点按屏幕顶部的应用图标，然后点按“固定”"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"固定某个应用后，该应用可打开其他应用，也能访问个人数据。\n\n如果您想安全地与他人共用您的设备，请尝试改用访客用户个人资料。\n\n如需使用固定应用功能，请按以下步骤操作：	\n1.	开启固定应用功能	\n2.	打开“概览”	\n3.	点按屏幕顶部的应用图标，然后点按“固定”"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"固定应用后：\n\n•		该应用可访问您的个人数据\n		（例如通讯录和电子邮件内容）\n•		已固定的应用可打开其他应用\n\n请务必只为您非常信任的人开启固定应用功能。"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"取消固定屏幕前要求绘制解锁图案"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"取消固定前要求输入 PIN 码"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"为了进一步保护此设备的安全，除了使用您的面孔解锁设备之外，您还可以将设备设为需要输入 PIN 码才能启动。设备必须成功启动才能接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入 PIN 码才能启动吗？"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"为了进一步保护此设备的安全，除了使用您的面孔解锁设备之外，您还可以将设备设为需要绘制解锁图案才能启动。设备必须成功启动才能接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要绘制解锁图案才能启动吗？"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"为了进一步保护此设备的安全，除了使用您的面孔解锁设备之外，您还可以将设备设为需要输入密码才能启动。设备必须成功启动才能接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入密码才能启动吗？"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"为了进一步保护此设备的安全，除了使用生物识别解锁设备之外，您还可以将设备设为需要输入 PIN 码才能启动。在设备启动之前，您无法接听来电及接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入 PIN 码才能启动吗？"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"为了进一步保护此设备的安全，除了使用生物识别解锁设备之外，您还可以将设备设为需要绘制解锁图案才能启动。在设备启动之前，您无法接听来电及接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要绘制解锁图案才能启动吗？"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"为了进一步保护此设备的安全，除了使用生物识别解锁设备之外，您还可以将设备设为需要输入密码才能启动。在设备启动之前，您无法接听来电及接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入密码才能启动吗？"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"是"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"否"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"受限"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB 受控于："</string>
     <string name="usb_control_host" msgid="7404215921555021871">"连接的设备"</string>
     <string name="usb_control_device" msgid="527916783743021577">"此设备"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"正在切换…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"正在切换…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"无法切换"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"为此设备充电"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"为连接的设备充电"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"移动数据用量"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"应用的流量使用情况"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"WLAN 流量用量"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"非运营商流量消耗"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"以太网流量用量"</string>
     <string name="wifi" msgid="2932584495223243842">"WLAN"</string>
     <string name="ethernet" msgid="4665162609974492983">"以太网"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 项限制</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"运营商的流量计算方式可能与您设备的计算方式不同"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"不包括运营商网络的流量消耗"</string>
     <string name="data_used_template" msgid="8229342096562327646">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"设置数据流量警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"数据流量警告"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"查看详情"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"流量节省程序"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"不受流量限制"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"后台数据已关闭"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"后台数据已关闭"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"开启"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"关闭"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"使用流量节省程序"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"设备处于锁定状态时，禁止在通知中输入回复内容或其他文字"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"默认拼写检查工具"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"选择拼写检查工具"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"使用拼写检查工具"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"使用拼写检查工具"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"未选择"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"（无）"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"： "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"存储空间管理器会从您的设备中移除已备份的照片和视频，从而释放存储空间。"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"移除照片和视频"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"存储空间管理器"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"使用存储空间管理器"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"使用存储空间管理器"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"自动"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"手动"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"立即释放空间"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"点按两次即显示"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"点按两次即可查看平板电脑"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"点按两次即可查看设备"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"滑动即可查看通知"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"在屏幕的底部边缘向下滑动，即可查看通知"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"单手模式"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"使用单手模式"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"切换应用时退出"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"超时"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 秒"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 秒"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 秒"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"可单手操作"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"点按两次屏幕即可查看时间、通知和其他信息。"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"拿起手机即显示"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"拿起平板电脑即可查看"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"点按即可查看平板电脑相关信息"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"点按即可查看设备相关信息"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"要查看时间、通知和其他信息，请点按您的屏幕。"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"紧急求救"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"使用紧急求救功能"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"由<xliff:g id="APP_NAME">%1$s</xliff:g>管理"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"快速按电源按钮 5 次或更多次即可启动以下操作"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"播放倒计时警报"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"先播放响亮的声音，再发出求助通知"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"打电话寻求帮助"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"求助电话号码"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>。点按即可更改"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"如果您输入的不是紧急电话号码：\n • 您必须解锁设备才能使用紧急求救服务\n • 您的电话可能不会有人接听"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"滑动指纹即可查看通知"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"滑动指纹"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"要查看通知，请在手机背面的指纹传感器上向下滑动手指。"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"可见数据集最大数量"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"重置为默认值"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"已重置自动填充开发者选项"</string>
+    <string name="location_category" msgid="3496759112306219062">"位置"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"状态栏位置指示器"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"对所有位置均显示，包括通过网络和连接方式获取的位置信息"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"强制启用 GNSS 测量结果全面跟踪"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"在停用工作周期的情况下跟踪所有 GNSS 星座和频率"</string>
     <string name="device_theme" msgid="5027604586494772471">"设备主题背景"</string>
     <string name="default_theme" msgid="4815428567082263639">"默认"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"网络名称"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"暂停通知即可保持专注"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"无法使用此功能"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"由于此功能会导致您的手机速度变慢，因此系统已关闭此功能"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"强制启用 GNSS 测量结果全面跟踪"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"在停用工作周期的情况下跟踪所有 GNSS 星座和频率"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"一律显示崩溃对话框"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"在每次应用崩溃时显示对话框"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"选择已启用 ANGLE 的应用"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"针对所有应用启用"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"选择图形驱动程序"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"默认"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"游戏驱动程序"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"游戏驱动程序"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"开发者驱动程序"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"系统图形驱动程序"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"开启（静音）"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"关闭"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"网络详情"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"您的设备名称会显示在手机上的应用中。此外，当您连接到蓝牙设备或设置 WLAN 热点时，其他人可能也会看到您的设备名称。"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"您的设备名称会显示在手机上的应用中。此外，当您连接到蓝牙设备、连接到 WLAN 网络或设置 WLAN 热点时，其他人可能也会看到您的设备名称。"</string>
     <string name="devices_title" msgid="649715719278562515">"设备"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"所有设置"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"建议"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"找不到网络，请重试。"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"（禁止）"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"没有 SIM 卡"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM 卡"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"没有 SIM 卡"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"无"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"需要 SIM 卡才能连接"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"需要<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> SIM 卡才能连接"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"首选网络模式：首选 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"首选网络模式：仅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"首选网络模式：仅限 WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"移动数据"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"通过移动网络访问数据"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"手机会在进入有效范围时自动切换到此运营商"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"没有可用的 SIM 卡"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通话偏好设置"</string>
     <string name="sms_preference" msgid="7742964962568219351">"短信偏好设置"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"每次都询问"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"连接到<xliff:g id="CARRIER">%1$s</xliff:g>时无法使用"</string>
     <string name="see_more" msgid="7499355691042812723">"查看更多"</string>
     <string name="see_less" msgid="2642392725363552793">"隐藏部分"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"要启用<xliff:g id="CARRIER_NAME">%1$s</xliff:g>吗？"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"要启用 SIM 卡吗？"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"要切换到<xliff:g id="CARRIER_NAME">%1$s</xliff:g>吗？"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"要切换为使用 SIM 卡吗？"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"一次只能启用一个 SIM 卡。\n\n切换到<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>不会取消<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>服务。"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"一次只能启用一个已下载的 SIM 卡。\n\n切换到<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>不会取消<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>服务。"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"一次只能启用一个 SIM 卡。\n\n进行切换并不会取消<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>服务。"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"切换到<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"正在连接到网络…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"正在切换到<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"无法切换运营商"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"发生错误，因此无法切换运营商。"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"要停用<xliff:g id="CARRIER_NAME">%1$s</xliff:g>吗？"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"要停用 SIM 卡吗？"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"正在停用 SIM 卡<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"无法停用运营商"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"出了点问题，无法停用您的运营商。"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"要使用 2 个 SIM 卡吗？"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"此设备可以同时激活 2 个 SIM 卡。如要继续一次只使用 1 个 SIM 卡，请点按“不用了”。"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"要重启设备吗？"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"如要开始使用，请重启您的设备。重启后即可添加其他 SIM 卡。"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"继续"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"重启"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"不用了"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"切换"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"无法激活 SIM 卡"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"请取出 SIM 卡，然后重新插入。如果问题仍然存在，请重启您的设备。"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"请尝试重新启用 SIM 卡。如果问题仍然存在，请重启您的设备。"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"网络激活"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"<xliff:g id="CARRIER_NAME">%1$s</xliff:g>已启用"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"点按即可更新 SIM 卡设置"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM 卡"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"要清空这个已下载的 SIM 卡吗？"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"清空此 SIM 卡将从此设备中移除<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>服务。\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>的服务不会因此被取消。"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"清空"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"正在清空 SIM 卡…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"无法清空 SIM 卡"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"发生错误，因此无法清空此 SIM 卡。\n\n请重启设备，然后重试。"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"连接到设备"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"“<xliff:g id="APPNAME">%1$s</xliff:g>”应用要使用临时 WLAN 网络连接到您的设备"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"找不到设备。请确保设备已开启并可连接到网络。"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"紧急呼叫"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"您的运营商不支持通过 WLAN 通话进行紧急呼叫。\n设备会自动切换到移动网络，以拨打紧急呼叫电话。\n只能在移动网络覆盖区域内进行紧急呼叫。"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"使用 WLAN 通话以提升通话质量"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"跨 SIM 卡通话"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"使用这张 SIM 卡时，允许通过另一张 SIM 卡进行通话和收发短信。"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"跨 SIM 卡通话"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"接收彩信"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"无法发送彩信"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"点按即可在移动数据网络关闭时通过<xliff:g id="OPERATOR_NAME">%1$s</xliff:g>收发彩信"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"允许在“设置”上重叠显示"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"允许可在其他应用上层显示的应用重叠显示在“设置”屏幕上"</string>
     <string name="media_controls_title" msgid="403271085636252597">"媒体"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"在媒体会话结束后隐藏播放器"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"播放器允许您通过展开的快捷设置面板恢复会话。"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"快捷设置中的媒体播放器"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"延长媒体播放器在显示在屏幕上的时间，让您轻松继续播放"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"隐藏播放器"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"显示播放器"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"没有可用的播放器"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"允许的应用"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"媒体"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"蓝牙将开启"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"开启"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"关闭"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"互联网"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM 卡"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"可在飞机上安全使用的网络"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"查找并连接到可在飞机上安全使用的网络"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飞机，可在飞机上安全使用"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"通话和短信"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"WLAN 通话"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"通过 WLAN 等非运营商网络接打电话"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"WLAN 通话功能支持您通过非运营商网络（例如某些 WLAN 网络）接打电话。"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"通话"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"短信"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"首选"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"首选通话"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"首选短信"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"不可用"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"没有 SIM 卡"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好设置"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"连接到公共网络"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"网络连接, 互联网, 无线, 数据, WiFi, Wi-Fi, Wi Fi, WLAN, 移动网络, 移动, 手机运营商, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"查看可在飞机上安全使用的网络"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"关闭飞行模式"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"就寝模式开启时无法使用"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"通知重要性重置完成。"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"应用"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"不受信任的设备想要查看您的消息。点按可了解详情。"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"要允许查看消息吗？"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"不受信任的蓝牙设备 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 想要查看您的消息。\n\n您之前没有连接过 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"不受信任的设备想要查看您的通讯录和通话记录。点按可了解详情。"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"要允许查看通讯录和通话记录吗？"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"不受信任的蓝牙设备 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 想要查看您的通讯录和通话记录，包括有关来电和去电的数据。\n\n您之前没有连接过 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
 </resources>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index c4ed3db..f940c41 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"中"</item>
     <item msgid="6740026006576843477">"長"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"短"</item>
+    <item msgid="7397961711906421599">"中"</item>
+    <item msgid="4079132024502041928">"長"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"預設"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"全球"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"只限 TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"全球"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f61c985..eda46c6 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"日期和時間"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"設定日期及時間"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"設定日期、時間、時區和格式"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"使用網絡提供的時間"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"使用網絡提供的時區"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"自動設定時間"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"自動設定時區"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"使用地區設定預設值"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 小時格式"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"使用 24 小時格式"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"在上鎖畫面上顯示個人檔案資料"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"帳戶"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"位置"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"使用位置資訊"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"使用位置"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"關閉"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">開 - <xliff:g id="COUNT_1">%1$d</xliff:g> 個應用程式可存取位置資訊</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"螢幕鎖定, 臉孔解鎖"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"螢幕鎖定、指紋"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"螢幕鎖定"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"使用臉孔和指紋安全解鎖手機"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"您亦可登入應用程式並確認付款"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"設定解鎖方式："</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"面孔解鎖"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"輕鬆解鎖手機"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"指紋"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"快速解鎖口袋中的手機"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"略過"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"繼續"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"已加入臉孔"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"設定「臉孔解鎖」"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"臉孔解鎖"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"使用臉孔驗證"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"開始"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"如無障礙版「臉孔解鎖」已關閉，部分設定步驟可能無法配合 TalkBack 正常執行。"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"返回"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"繼續設定"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"使用無障礙功能設定"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"在應用程式內使用「臉孔解鎖」時，每次都要確認"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"刪除臉孔資料"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"設定「臉孔解鎖」"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"使用「面孔解鎖」即可解鎖裝置、登入應用程式及確認付款。\n\n注意事項：\n即使您不想解鎖手機，但查看手機仍會解鎖。\n\n如果其他人將手機舉到您面前，將可解鎖您的手機。\n\n跟您樣貌很相似的人 (例如您的孿生兄弟姊妹) 能夠解鎖您的手機。"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"使用「臉孔解鎖」即可解鎖裝置、登入應用程式及確認付款。\n\n注意事項：\n即使您不想解鎖，看著手機亦會解鎖。\n\n如果其他人將手機舉到您面前，即使您閉上雙眼，手機亦會解鎖。\n\n跟您樣貌很相似的人 (例如您的孿生兄弟姊妹) 能夠解鎖您的手機。"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"使用臉孔解鎖功能解鎖裝置、登入應用程式及確認付款。"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"請緊記：\n即使您不想解鎖手機，但查看手機仍會解鎖。\n\n如果其他人將手機舉到您面前，將可解鎖您的手機。\n\n跟您樣貌很相似的人 (例如您的孿生兄弟姊妹) 能夠解鎖您的手機。"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"請緊記：\n即使您不想解鎖手機，但查看手機仍會解鎖。\n\n如果其他人將手機舉到您面前，即使您閉上雙眼，手機亦會解鎖。\n\n跟您樣貌很相似的人 (例如您的孿生兄弟姊妹) 能夠解鎖您的手機。"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"是否刪除臉孔資料？"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"系統會妥善地將「臉孔解鎖」功能使用的臉孔資料永久刪除。資料移除後，您便需要使用 PIN、圖案或密碼來解鎖手機、登入應用程式及確認付款。"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"使用臉孔解鎖功能解鎖手機"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"使用指紋解鎖手機或核准購物交易。\n\n請注意：您無法使用指紋解鎖此裝置。如需瞭解詳情，請聯絡您機構的管理員。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"使用指紋解鎖手機或核准購物交易。\n\n請注意：相對於複雜的上鎖圖案或 PIN，指紋識別的安全性較低。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"取消"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"不用了，謝謝"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"繼續"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"略過"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"繼續"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"使用「螢幕鎖定」選項保護您的平板電腦，這樣即使平板電腦遺失或被盜竊，其他人亦無法使用。您亦需要「螢幕鎖定」選項來設定「臉孔解鎖」。如要返回，請輕按 [取消]。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"使用「螢幕鎖定」選項保護您的裝置，這樣即使裝置遺失或被盜竊，其他人亦無法使用。您亦需要「螢幕鎖定」選項來設定「臉孔解鎖」。如要返回，請輕按 [取消]。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"使用「螢幕鎖定」選項保護您的手機，這樣即使手機遺失或被盜竊，其他人亦無法使用。您亦需要「螢幕鎖定」選項來設定「臉孔解鎖」。如要返回，請輕按 [取消]。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"使用「螢幕鎖定」選項保護您的平板電腦，這樣即使平板電腦遺失或被盜竊，其他人亦無法使用。您亦需要使用螢幕鎖定選項來設定生物識別功能。如要返回，請輕按 [取消]。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"使用「螢幕鎖定」選項保護您的裝置，這樣即使裝置遺失或被盜竊，其他人亦無法使用。您亦需要使用螢幕鎖定選項來設定生物識別功能。如要返回，請輕按 [取消]。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"使用「螢幕鎖定」選項保護您的手機，這樣即使手機遺失或被盜竊，其他人亦無法使用。您亦需要使用螢幕鎖定選項來設定生物識別功能。如要返回，請輕按 [取消]。"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"要略過 PIN 設定嗎？"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"要略過密碼設定嗎？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"要略過圖案設定嗎？"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此平板電腦。請選擇您想使用的螢幕鎖定功能。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此裝置。請選擇您想使用的螢幕鎖定功能。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"只要啟用裝置保護功能，即可阻止他人在未經您准許下使用此手機。請選擇您想使用的螢幕鎖定功能。"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"選擇您的後備螢幕鎖定方式"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"選擇您的後備螢幕鎖定方式"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"選擇您的後備螢幕鎖定方式"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"螢幕鎖定選項"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"螢幕鎖定選項"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"螢幕鎖定"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"臉孔解鎖 + 密碼"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"不使用「臉孔解鎖」並繼續"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"您可以使用臉孔解鎖手機。為安全起見，此選項需要設定後備螢幕鎖定方式。"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"生物識別 + 圖案"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"生物識別 + PIN"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"生物識別 + 密碼"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"不設定生物識別功能並繼續操作"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"您可以使用生物識別功能解鎖手機。為安全起見，此選項需要設定後備螢幕鎖定方式。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"滑動"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">必須少於 <xliff:g id="NUMBER_0">%d</xliff:g> 個數字</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"裝置管理員不允許使用最近用過的 PIN 碼"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"您的 IT 管理員已禁止使用常用的 PIN 碼，請嘗試輸入另一個 PIN 碼。"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"您不可使用無效字元"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"必須包含最少 1 個字母"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"必須包含最少 1 個數字"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">必須包含至少 1 個非數字字元</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"裝置管理員不允許使用最近用過的密碼"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"您的 IT 管理員已禁止使用常用的密碼，請嘗試輸入另一個密碼。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"不可使用依遞增或遞減順序排列或重複的連續數字"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"確認"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"取消"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"開啟 Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"使用 Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"使用 Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi 設定"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"設定和管理無線網絡接入點"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"將二維條碼置於下方中間，即可連接至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"掃瞄二維條碼以加入 Wi-Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"分享 Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"掃瞄此二維條碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」並分享密碼"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"使用其他裝置掃瞄此二維條碼以加入「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"掃描此二維條碼，即可連接「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"請再試一次。如果仍有問題，請聯絡裝置製造商"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"發生問題"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi 密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"熱點密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"自動連線"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"允許手機在此網絡附近時自動連線"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"允許平板電腦在此網絡附近時自動連線"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"當進入覆蓋範圍內時，允許連接此網絡"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"新增裝置"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"使用二維條碼，在此網絡中加入裝置"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"二維條碼格式無效"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"使用系統憑證"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"不驗證"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"您未指定任何憑證，因此將無法設定私人連線。"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"網絡名稱太長。"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"必須指定網域。"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"需要認證。"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"連線"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"已開啟 Wi-Fi"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"已連線至「<xliff:g id="NETWORK_NAME">%1$s</xliff:g>」"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"正在連接至「<xliff:g id="NETWORK_NAME">%1$s</xliff:g>」"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"連接中…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"無法連接網絡"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"網絡不在覆蓋範圍內"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"裝置 MAC 位址"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"隨機 MAC 位址"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"隨機處理的 MAC 位址 (上次用過)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP 位址"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"網絡詳細資料"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"子網絡遮罩"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 位址"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"已儲存的網絡"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"訂閱"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"其他網絡"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP 設定"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"這位使用者無法查看或變更 Wi-Fi 進階設定"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"儲存"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"請輸入有效的閘道位址。"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"請輸入有效的 DNS 位址。"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"請輸入介乎 0 至 32 之間的網絡首碼長度。"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (除非由私人 DNS 覆寫)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (除非由私人 DNS 覆寫)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"閘道"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"網絡前置字元長度"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"應用程式正在分享內容。如要分享互聯網連線，請關閉熱點並重新開啟"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"未設定密碼"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"熱點名稱"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"正在開啟 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"正在開啟「<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>」…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"其他裝置可以連線至 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"熱點密碼"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"存取點頻段"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"流暢顯示"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"自動將部分內容的重新整理頻率，從 60 Hz 提升到 90 Hz。此功能會增加耗電量。"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"流暢畫面"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"提升重新整理頻率至 90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"最高的重新整理頻率，帶來更靈敏的觸控反應和更高畫質的動畫。這會增加電池用量。"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"螢幕感知"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"啟用 / 假如正您望向螢幕，螢幕將不會關閉"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"收到新通知時，關閉的螢幕會亮起"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"一律顯示時間和資料"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"此功能會增加耗電量"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"粗體文字"</string>
     <string name="title_font_size" msgid="570613010306330622">"字型大小"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"放大或縮小文字"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM 卡鎖定設定"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android 版本"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android 安全性更新"</string>
     <string name="model_info" msgid="8997566254717810904">"型號"</string>
-    <string name="model_summary" msgid="2246651782442466213">"型號：%1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"型號和硬件"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"硬件版本"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"設備編號"</string>
@@ -1579,7 +1597,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"刪除 APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"新增 APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"儲存"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"捨棄"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"取消"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"[名稱] 欄位不得留空。"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN 不可留空。"</string>
@@ -1594,8 +1612,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"應用程式可以重設"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"重設 Wi-Fi、流動數據和藍牙"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"此操作會重設所有網絡設定，包括：\n\n"<li>"Wi‑Fi"</li>\n<li>"流動數據"</li>\n<li>"藍牙"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"清除"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"清除已下載的 SIM 卡"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"如要下載 SIM 替換卡，請聯絡流動網絡供應商。此動作不會取消任何流動服務計劃。"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"此操作不會取消任何流動服務計劃。如要下載替換用的 SIM，請聯絡流動網絡供應商。"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"重設設定"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"您要重設所有網絡設定嗎？您將無法復原這項動作。"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"您要重設所有網絡設定並清除已下載的 SIM 卡嗎？您無法復原這個動作。"</string>
@@ -1605,31 +1624,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"網絡設定已重設"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"無法清除 SIM 卡"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"由於發生錯誤，因此無法清除已下載的 SIM 卡。\n\n請重新開機，然後再試一次。"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"清除所有資料 (回復原廠設定)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"清除所有資料 (回復原廠設定)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"此操作會清除平板電腦"<b>"內部儲存空間"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"此操作會清除手機"<b>"內部儲存空間"</b>"的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"您目前已登入下列帳戶：\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"這部裝置上還有其他使用者。\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM 卡"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"此操作不會取消您的流動服務計劃。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"SD 記憶卡"</b>"資料。"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"清除所有資料 (回復原廠設定)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"清除所有資料 (回復原廠設定)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"此操作將會清除您平板電腦"<b>"內部儲存空間"</b>"中的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"此操作將會清除您手機"<b>"內部儲存空間"</b>"的所有資料，包括：\n\n"<li>"您的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"您目前已登入以下帳戶：\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"這部裝置上還有其他使用者。\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM 卡"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"此操作不會取消您的流動服務計劃。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"如要一併清除音樂、圖片及其他使用者資料，則需清除 "<b>"SD 記憶卡"</b>"資料。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"清除 USB 儲存裝置資料"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"清除 SD 記憶卡資料"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"清除內部 USB 儲存裝置中的所有資料，例如音樂或相片"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"清除 SD 記憶卡中的所有資料，例如音樂或相片"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"清除所有資料"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"清除所有資料"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"系統會刪除您所有的個人資料和已下載的應用程式。您無法復原這個動作。"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"系統會刪除您所有的個人資料，包括已下載的應用程式和 SIM 卡。您無法復原這個動作。"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"全部清除"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"System Clear 服務暫停，因此無法重設。"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"要清除所有資料嗎？"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"這位使用者無法將裝置恢復原廠設定"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"正在清除"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"請稍候…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"清除所有資料"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"清除所有資料"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"系統會刪除您所有的個人資料和已下載的應用程式。您無法復原這個動作。"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"系統會刪除您所有的個人資料，包括已下載的應用程式和 SIM 卡。您無法復原這個動作。"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"要清除所有資料嗎？"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"這位使用者無法將裝置恢復原廠設定"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"正在清除"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"請稍候…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"通話設定"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"設定留言信箱、來電轉駁、來電等候和來電顯示"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB 網絡共享"</string>
@@ -1677,7 +1694,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"不可與超過 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 部裝置分享網絡。"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網絡共享即將中斷。"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"以太網網絡共享"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"透過 USB 以太網分享手機的互聯網連線"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"透過以太網分享手機的互聯網連線"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"使用熱點和網絡共享功能，透過您的流動數據連線提供互聯網服務給其他裝置。應用程式可以建立熱點，與附近的裝置分享內容。"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"使用熱點和網絡共享功能，讓其他裝置透過 Wi‑Fi 或流動數據連接到互聯網。應用程式亦可以建立熱點，與附近的裝置分享內容。"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"說明"</string>
@@ -1719,6 +1736,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"藍牙掃瞄"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允許應用程式和服務隨時掃瞄附近的裝置 (即使藍牙功能已關閉)。此操作可用來改善適地性功能和服務。"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用定位服務"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置時區偵測"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置時區偵測"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"允許使用裝置位置偵測目前時區。其他的位置設定 (例如掃瞄 Wi-Fi 功能) 可能會影響時區偵測結果準確性。"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"已開啟"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"已關閉"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"自動偵測時區功能已停用"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"位置時區偵測已停用"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"不支援位置時區偵測"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"不允許變更位置時區偵測"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi 和流動網絡位置"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"允許應用程式使用 Google 的定位服務，藉此更快確定您的約略位置。系統會收集匿名的位置資料傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"根據 Wi-Fi 確定位置"</string>
@@ -1782,6 +1808,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"要使用「臉孔解鎖」，請設定密碼"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"要使用「臉孔解鎖」，請設定圖案"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"要使用「臉孔解鎖」，請設定 PIN"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"如要使用生物識別功能，請設定密碼"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"如要使用生物識別功能，請設定圖案"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"如要使用生物識別功能，請設定 PIN"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"忘記密碼嗎？"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"忘記圖案嗎？"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"忘記 PIN 嗎？"</string>
@@ -2118,13 +2147,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕偏好設定"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"放大"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"放大範圍"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"放大啟用"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"選擇在放大螢幕時要使用的放大範圍"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"全螢幕"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"部分螢幕畫面"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"全螢幕及部分螢幕"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"放大整個螢幕畫面"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"放大部分螢幕畫面"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"要改用無障礙功能按鈕嗎？"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"使用「輕按三下放大」功能放大部分畫面，輸入內容及執行其他操作時會出現延遲。\n\n要改用無障礙功能按鈕放大畫面嗎？"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"改用無障礙功能按鈕"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"繼續使用「輕按三下放大」功能"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"放大設定"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"輕按三下來放大"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"使用快速鍵來放大"</string>
@@ -2178,11 +2210,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"按開關按鈕結束通話"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"大型滑鼠游標"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"移除動畫"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"單聲道音訊"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"播放音訊時合併聲道"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"音效平衡"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"左"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"右"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"單聲道音訊"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"播放音訊時合併聲道"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"音訊平衡"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"左"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"右"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"預設"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 秒"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 秒"</string>
@@ -2212,11 +2244,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"通知震動"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"鈴聲震動"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"輕觸反應"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"使用「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"開啟「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"使用色彩校正"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"顯示字幕"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"僅限支援的應用程式"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"使用「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"開 <xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"使用色彩校正"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"顯示字幕"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"僅限支援的應用程式"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"字幕大小和樣式"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>文字尺寸"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"更多選項"</string>
@@ -2246,6 +2278,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"綠色弱視"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"紅色弱視"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"藍色弱視"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"灰階螢幕"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"紅綠不分"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"紅綠不分"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"藍黃不分"</string>
@@ -2375,7 +2408,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"背景限制"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"允許應用程式在背景中執行"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"不允許應用程式在背景中執行"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"無法限制背景使用方式"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"無法限制背景使用方式"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"要限制背景活動嗎？"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"如果您限制應用程式的背景活動，應用程式可能無法正常運作"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"由於此應用程式並未設定為優化電池，您無法限制其使用。\n\n如要限制應用程式，請先開啟電池優化功能。"</string>
@@ -2424,6 +2457,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"平板電腦使用率比平常高"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"裝置使用率比平常高"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"電池電量可能會比平常更快耗盡"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"正在優化電池狀態"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"暫時限制電池充電。輕按即可瞭解詳情。"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"您的手機使用率比平常高，電池電量可能會比預期更快耗盡。\n\n電池用量最高的應用程式："</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"您的平板電腦使用率比平常高，電池電量可能會比預期更快耗盡。\n\n電池用量最高的應用程式："</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"您的裝置使用率比平常高，電池電量可能會比預期更快耗盡。\n\n電池用量最高的應用程式："</string>
@@ -2479,6 +2514,8 @@
       <item quantity="one">%1$d 個應用程式受限制</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"讀取電池計量器時發生問題"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"讀取電池計量器時發生問題。輕按即可"<annotation id="url">"瞭解詳情"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"要停止應用程式嗎？"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓您的手機處於喚醒狀態，因此手機無法正常管理電池。\n\n如要解決此問題，您可以停止該應用程式。\n\n如果問題持續，您可能需要解除安裝應用程式，才能改善電池效能。"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓您的平板電腦處於喚醒狀態，因此平板電腦無法正常管理電池。\n\n如要解決此問題，您可以停止該應用程式。\n\n如果問題持續，您可能需要解除安裝應用程式，才能改善電池效能。"</string>
@@ -2592,9 +2629,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"設定時間表"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"延長電池壽命"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"充電時關閉"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"當您的手機電量達到 <xliff:g id="PERCENT">%1$s</xliff:g> 時，省電模式會關閉"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"當您的平板電腦電量達到 <xliff:g id="PERCENT">%1$s</xliff:g> 時，省電模式會關閉"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"當您的裝置電量達到 <xliff:g id="PERCENT">%1$s</xliff:g> 時，省電模式會關閉"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"當裝置電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉「省電模式」"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"當平板電腦電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉「省電模式」"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"當裝置電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉「省電模式」"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"開啟"</string>
@@ -2659,6 +2696,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"重設"</string>
     <string name="tts_play" msgid="2945513377250757221">"播放"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"自動調節連線"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"自動管理網路連線，藉此延長電池壽命並提升裝置效能"</string>
     <string name="credentials_title" msgid="7535942196886123656">"憑證儲存空間"</string>
     <string name="credentials_install" msgid="3933218407598415827">"安裝憑證"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"從儲存裝置安裝憑證"</string>
@@ -2670,9 +2709,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"使用者憑證"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"查看和修改已儲存的憑證"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"進階"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"儲存空間類型"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬件支援"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"只限軟件"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"這位使用者無法存取憑證"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已針對 VPN 和應用程式安裝憑證"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"已針對 Wi-Fi 安裝憑證"</string>
@@ -2688,6 +2724,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"不要安裝"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"仍要安裝"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"未安裝憑證"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"是否允許「<xliff:g id="APP_NAME">%s</xliff:g>」在此裝置上安裝憑證？"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"以下應用程式和網址將可透過這些憑證識別您的身分。"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"不允許"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"允許"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"顯示更多"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"憑證管理應用程式"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"無"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"以下應用程式和網址將可透過此應用程式安裝的憑證識別您的身分。"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"移除"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"緊急撥號訊號"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"備份"</string>
@@ -3011,7 +3056,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"尚未設定 - 公司檔案"</string>
     <string name="user_admin" msgid="4024553191395768119">"管理員"</string>
     <string name="user_you" msgid="3070562015202859996">"您 (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"暱稱"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"您可以加入多達 <xliff:g id="USER_COUNT">%1$d</xliff:g> 個用戶"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"只有平板電腦的擁有者可以管理使用者。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"只有手機的擁有者可以管理使用者。"</string>
@@ -3061,7 +3105,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"在收款機付款"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"設定付款應用程式，然後將機背對準任何終端機的非接觸式符號。"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"知道了"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"更多…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"更多…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"設定預設付款應用程式"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"更新預設付款應用程式"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"於感應式終端機使用「<xliff:g id="APP">%1$s</xliff:g>」付款"</string>
@@ -3131,9 +3175,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"返回"</string>
     <string name="wizard_next" msgid="3884832431439072471">"下一步"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"完成"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"拍攝相片"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"選擇圖片"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"選取相片"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM 卡"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM 卡"</string>
@@ -3145,7 +3186,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"永遠使用這張 SIM 卡通話"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"選取用於流動數據的 SIM 卡"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"選取用於短訊的 SIM 卡"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"正在切換數據 SIM，過程最多可能需要 1 分鐘…"</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"正在切換數據 SIM，這可能需時一分鐘…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"選取用於撥號的 SIM 卡："</string>
     <string name="sim_select_card" msgid="1226182454109919045">"選取 SIM 卡"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3288,6 +3329,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常用電情況, 用電安排, 省電模式, 節能模式, 電池, 自動, 百分比"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE、進階通話、4G 通話"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"新增語言、加入語言"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"文字大小"</string>
     <string name="default_sound" msgid="6604374495015245195">"預設音效"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"鈴聲和通知音量已設為 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"音量、震動、請勿騷擾"</string>
@@ -3327,11 +3369,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"開機聲音"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"即時字幕"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"自動為媒體加入字幕"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"無"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">已設定 <xliff:g id="ON_COUNT">%d</xliff:g> 個時間表</item>
-      <item quantity="one">已設定 1 個時間表</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{無}=1{已設定 1 個時間表}other{已設定 # 個時間表}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"請勿騷擾"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"只接收重要聯絡人和應用程式的通知"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"減少干擾"</string>
@@ -3399,20 +3437,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"只限優先"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"開啟/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"關閉/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"關閉"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"開啟"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"每次都詢問"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"直至您關閉為止"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> 小時</item>
-      <item quantity="one">1 小時</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> 分鐘"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">系統已自動啟用 <xliff:g id="ON_COUNT">%d</xliff:g> 個日程表</item>
-      <item quantity="one">系統已自動啟用 1 個日程表</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 小時}other{# 小時}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 分鐘}other{# 分鐘}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{關閉}=1{關閉/系統可自動啟用 1 個時間表}other{關閉/系統可自動開啟 # 個時間表}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"可中斷「請勿騷擾」的項目類別"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"人物"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"應用程式"</string>
@@ -3458,6 +3488,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"自動將優先度較低的通知設為低重要性"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"自動調整通知排序"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"自動按相關性為通知排序"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"對自動調整通知的意見"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"顯示系統對通知作出的調整和提供意見的選項"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"重設通知重要性"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"重設使用者變更的重要設定，並允許通知助理優先處理"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"建議操作和回覆"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"自動顯示建議操作和回覆"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"顯示近期和已延後的通知"</string>
@@ -3555,8 +3589,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"優先對話"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"以浮動對話泡顯示在對話部分的頂部"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"在對話部分的頂部顯示"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"其他對話"</string>
+    <string name="other_conversations" msgid="551178916855139870">"非優先對話"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"已變更的對話"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"最近的對話"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除最近的聊天"</string>
+    <string name="clear" msgid="5092178335409471100">"清除"</string>
     <string name="important_bubble" msgid="7911698275408390846">"優先對話用對話氣泡顯示"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"優先對話會在下拉式面板頂部顯示。您亦可設定用對話氣泡並在「請勿騷擾」模式中顯示優先對話。"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"優先對話和已修改的對話會顯示在這裡"</string>
@@ -3654,7 +3691,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"「請勿騷擾」權限"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"允許請勿騷擾權限"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"沒有已安裝的應用程式要求存取「請勿騷擾」。"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"正在載入應用程式…"</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"正在載入應用程式…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android 目前按您的要求防止這個應用程式的通知在此裝置上顯示"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android 目前按您的要求防止這類通知在此裝置上顯示"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android 目前按您的要求防止這類通知在此裝置上顯示"</string>
@@ -3746,11 +3783,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"所有對話"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"優先對話"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"無"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> 個對話</item>
-      <item quantity="one">1 個對話</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"無"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{無}=1{1 個對話}other{# 個對話}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"誰可以中斷"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通話"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"通話"</string>
@@ -3759,11 +3792,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"如要讓允許的通話發出音效，請確保裝置已設定為發出鈴聲。"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"系統會封鎖「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」時段接收的來電。您可以調整設定，讓好友、家人或其他聯絡人聯絡您。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"已加星號的聯絡人"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
-      <item quantity="one">另外 1 人</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"無"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{無}=1{{contact_1}}=2{{contact_1}和{contact_2}}=3{{contact_1}、{contact_2}和{contact_3}}other{{contact_1}、{contact_2}和另外 # 個}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(沒有名稱)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"訊息"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"訊息"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"訊息"</string>
@@ -3772,11 +3802,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"在「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」中，收到的訊息會被封鎖。您可以調整設定，讓好友、家人或其他聯絡人聯絡您。"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"接收所有訊息"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"接收所有來電"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"無"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> 位聯絡人</item>
-      <item quantity="one">1 位聯絡人</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{無}=1{1 位聯絡人}other{# 位聯絡人}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"所有人"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"聯絡人"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"已加星號的聯絡人"</string>
@@ -3814,22 +3840,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"部分通知"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"即使您不允許應用程式打擾，所選使用者仍可聯絡您"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other">「<xliff:g id="APP_NAMES">%s</xliff:g>」可中斷</item>
-      <item quantity="one">「<xliff:g id="APP_NAME_0">%s</xliff:g>」可中斷</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"還有 <xliff:g id="NUMBER">%d</xliff:g> 個"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{沒有應用程式可中斷}=1{「{app_1}」可中斷}=2{「{app_1}」和「{app_2}」可中斷}=3{「{app_1}」、「{app_2}」和「{app_3}」可中斷}other{「{app_1}」、「{app_2}」和另外 # 個應用程式可中斷}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"應用程式"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"部分通知"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"可中斷的通知"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"允許所有通知"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other">「<xliff:g id="SOUND_CATEGORIES">%s</xliff:g>」可中斷</item>
-      <item quantity="one">「<xliff:g id="SOUND_CATEGORY">%s</xliff:g>」可中斷</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"全部均不可中斷"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"還有 <xliff:g id="NUMBER">%d</xliff:g> 個"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{全部均不可中斷}=1{「{sound_category_1}」可中斷}=2{「{sound_category_1}」和「{sound_category_2}」可中斷}=3{「{sound_category_1}」、「{sound_category_2}」和「{sound_category_3}」可中斷}other{「{sound_category_1}」、「{sound_category_2}」和另外 # 個音效可中斷}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"全部均不可中斷"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"沒有使用者可中斷"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"部分使用者可中斷"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"所有使用者均可中斷"</string>
@@ -3875,8 +3893,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"開啟"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"關閉"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"應用程式固定"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"應用程式固定功能可讓目前使用的應用程式持續在畫面上顯示，直到您取消固定為止。此功能可讓信任的朋友玩特定遊戲。\n\n固定應用程式後，該應用程式可開啟其他應用程式，亦能存取個人資料。\n\n使用應用程式固定功能的步驟如下：	\n1.	開啟應用程式固定功能 \n2.	開啟「概覽」 \n3.	輕按畫面頂部的應用程式圖示，然後輕按 [固定]"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"應用程式固定功能可讓目前使用的應用程式持續在畫面上顯示，直到您取消固定為止。此功能可讓信任的朋友玩特定遊戲。\n\n固定應用程式後，該應用程式可開啟其他應用程式，亦能存取個人資料。\n\n如要安全地與他人共用裝置，建議您改用訪客使用者。\n\n使用應用程式固定功能的步驟如下：	\n1.	開啟應用程式固定功能 \n2.	開啟「概覽」 \n3.	輕按畫面頂部的應用程式圖示，然後輕按 [固定]"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"應用程式固定功能可讓目前使用的應用程式持續在畫面上顯示，直到您取消固定為止。此功能可讓信任的朋友玩特定遊戲。"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"固定應用程式後，該應用程式可開啟其他應用程式，亦能存取個人資料。\n\n使用應用程式固定功能的步驟如下：	\n1.	開啟應用程式固定功能	\n2.	開啟 [概覽]	\n3.	輕按畫面頂部的應用程式圖示，然後輕按 [固定]"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"固定應用程式後，該應用程式可開啟其他應用程式，亦能存取個人資料。\n\n如要安全地與他人共用裝置，建議您改用訪客使用者。\n\n使用應用程式固定功能的步驟如下：	\n1.	開啟應用程式固定功能 \n2.	開啟 [概覽]	\n3.	輕按畫面頂部的應用程式圖示，然後輕按 [固定]"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"固定應用程式後：\n\n•	 該應用程式可存取個人資料\n		(例如聯絡人和電郵內容)\n•	 固定的應用程式可開啟其他應用程式\n\n僅與您信任的人使用應用程式固定功能。"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"取消固定時必須提供解鎖圖形"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"取消固定時必須輸入 PIN"</string>
@@ -3898,6 +3917,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"除了使用臉孔解鎖裝置外，您亦可以設定裝置必需 PIN 才能啟動，再加一重保護。裝置必須成功啟動才能接收來電、訊息或通知 (包括鬧鐘)。\n\n即使裝置遺失或遭竊，資料仍會安全無虞。要設定裝置必需 PIN 才能啟動嗎？"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"除了使用臉孔解鎖裝置外，您亦可以設定裝置必需圖案才能啟動，再加一重保護。裝置必須成功啟動才能接收來電、訊息或通知 (包括鬧鐘)。\n\n即使裝置遺失或遭竊，資料仍會安全無虞。要設定裝置必需圖案才能啟動嗎？"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"除了使用臉孔解鎖外，您亦可以設定裝置必需密碼才能啟動，再加一重保護。裝置必須成功啟動才能接收來電、訊息或通知 (包括鬧鐘)。\n\n即使裝置遺失或遭竊，資料仍會安全無虞。要設定裝置必需密碼才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"除了使用生物識別功能解鎖裝置外，您亦可將裝置設定為需要輸入 PIN 才能啟動，增添多一重保護。裝置啟動前，您將無法接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要將裝置設定為需要輸入 PIN 才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"除了使用生物識別功能解鎖裝置外，您亦可將裝置設定為需要畫出圖案才能啟動，增添多一重保護。裝置啟動前，您將無法接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要將裝置設定為需要畫出圖案才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"除了使用生物識別功能解鎖裝置外，您亦可將裝置設定為需要輸入密碼才能啟動，增添多一重保護。裝置啟動前，您將無法接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要將裝置設定為需要輸入密碼才能啟動嗎？"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"是"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"否"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"受限制"</string>
@@ -4073,7 +4095,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB 由以下裝置控制"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"已連接的裝置"</string>
     <string name="usb_control_device" msgid="527916783743021577">"此裝置"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"正在切換…"</string>
+    <string name="usb_switching" msgid="3654709188596609354">"正在切換…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"無法切換"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"為此裝置充電"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"正在為連接的裝置充電"</string>
@@ -4267,6 +4289,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"流動數據用量"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"應用程式數據用量"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi 數據用量"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"非流動網絡供應商數據用量"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"以太網數據用量"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"以太網"</string>
@@ -4285,6 +4308,7 @@
       <item quantity="one">1 個限制</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"流動網絡供應商的數據計算方式可能與裝置有所不同"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"不包括流動網絡供應商網絡使用的數據"</string>
     <string name="data_used_template" msgid="8229342096562327646">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"設定數據用量警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"數據用量警告"</string>
@@ -4320,7 +4344,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"查看詳情"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"數據節省模式"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"不限制數據用量"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"背景數據已關閉"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"背景數據已關閉"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"開啟"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"關閉"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"使用數據節省模式"</string>
@@ -4343,7 +4367,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"裝置處於上鎖狀態時，禁止在通知中輸入回覆內容或其他文字"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"預設拼字檢查工具"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"選擇「拼字檢查工具」"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"使用拼字檢查工具"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"使用拼字檢查工具"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"未選取"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(無)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">"： "</string>
@@ -4433,7 +4457,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"儲存空間管理員會從您的裝置移除備份相片和影片，以釋放儲存空間。"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"移除相片和影片"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"存儲空間管理員"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"使用儲存空間管理員"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"使用儲存空間管理工具"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"自動"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"手動"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"立即釋放空間"</string>
@@ -4471,6 +4495,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"輕按兩下顯示畫面"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"輕按兩下即可查看平板電腦"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"輕按兩下即可查看裝置"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"滑動即可查看通知"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"在畫面底部向下滑動即可顯示通知"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"單手模式"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"使用單手模式"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"切換應用程式時退出"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"逾時"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 秒"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 秒"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 秒"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"單手操控"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"輕按螢幕兩下即可查看時間、通知和其他資訊。"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"拿起手機顯示畫面"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"拿起即可查看平板電腦"</string>
@@ -4483,6 +4517,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"輕按即可查看平板電腦"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"輕按即可查看裝置"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"輕按螢幕即可查看時間、通知和其他資訊。"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"緊急求救"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"使用緊急求救功能"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"由<xliff:g id="APP_NAME">%1$s</xliff:g>管理"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"快速連按電源按鈕 5 次或以上即可啟動操作"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"播放倒數警報"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"通知緊急服務之前播放響亮音效"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"撥打求救電話"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"求救電話號碼"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>。輕按即可變更"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"如果您輸入非緊急電話號碼：\n • 您必須解鎖裝置才可使用緊急求救功能\n • 電話可能無人接聽"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"在指紋感應器上滑動以查看通知"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"滑動指紋"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"如要查看通知，請在手機背面的指紋感應器上向下滑動。"</string>
@@ -4608,6 +4652,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"數據集顯示上限"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"重設為預設值"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"自動填入開發人員選項已重設"</string>
+    <string name="location_category" msgid="3496759112306219062">"位置"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"狀態列位置指標"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"顯示所有位置，包括透過網絡和各種連線方式取得的位置資訊"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"強制啟用完整的 GNSS 測量資料"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"在停用工作週期的情況下追蹤所有 GNSS 星座圖和頻率"</string>
     <string name="device_theme" msgid="5027604586494772471">"裝置主題"</string>
     <string name="default_theme" msgid="4815428567082263639">"預設"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"網絡名稱"</string>
@@ -4624,8 +4673,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"暫停通知，助您保持專注"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"功能無法使用"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"由於這項功能會降低手機運行速度，因此已關閉"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"強制啟用完整的 GNSS 測量資料"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"在停用工作週期的情況下追蹤所有 GNSS 星座圖和頻率"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"一律顯示當機對話框"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"在每次應用程式當機時顯示對話框"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"選取支援 ANGLE 的應用程式"</string>
@@ -4637,7 +4684,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"為所有應用程式啟用此設定"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"選取顯示卡驅動程式"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"預設"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"遊戲驅動程式"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"遊戲驅動程式"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"開發人員驅動程式"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"系統顯示卡驅動程式"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4693,7 +4740,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"開啟 (靜音)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"關閉"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"網絡詳細資料"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"您的裝置名稱會在手機的應用程式上顯示。當您連接藍牙裝置或設定 Wi-Fi 熱點時，其他人亦可能會看到您的裝置名稱。"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"您在手機上的應用程式可以取得您的裝置名稱。當您連接藍牙裝置或 Wi-Fi 網絡，或設定 Wi-Fi 熱點時，其他人亦可能會看到您的裝置名稱。"</string>
     <string name="devices_title" msgid="649715719278562515">"裝置"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"所有設定"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"建議"</string>
@@ -4706,6 +4753,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"找不到網絡，請再試一次。"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(禁止)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"沒有 SIM 卡"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM 卡"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"沒有 SIM 卡"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"無"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"需要 SIM 卡才能連接網絡"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"需要 <xliff:g id="WIRELESS_CARRIER">%s</xliff:g> 的 SIM 卡才能連接網絡"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"首選網絡模式：首選 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"首選網絡模式：僅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"首選網絡模式：僅限 WCDMA"</string>
@@ -4759,6 +4811,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"流動數據"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"使用流動網絡存取數據"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"當進入覆蓋範圍內時，手機便會自動切換至此流動網絡供應商"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"沒有可用的 SIM 卡"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通話偏好設定"</string>
     <string name="sms_preference" msgid="7742964962568219351">"短訊偏好設定"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"每次都詢問"</string>
@@ -4819,6 +4872,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"無法在連接至<xliff:g id="CARRIER">%1$s</xliff:g>時使用"</string>
     <string name="see_more" msgid="7499355691042812723">"查看更多"</string>
     <string name="see_less" msgid="2642392725363552793">"顯示較少"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"要啟用 <xliff:g id="CARRIER_NAME">%1$s</xliff:g> 嗎？"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"要啟用 SIM 卡嗎？"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"要切換至 <xliff:g id="CARRIER_NAME">%1$s</xliff:g> 嗎？"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"要改用 SIM 卡嗎？"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"每次只可啟用一張 SIM 卡。\n\n切換至 <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 將不會取消您的 <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> 服務。"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"每次只可啟用一張已下載的 SIM 卡。\n\n切換至 <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 將不會取消您的 <xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g> 服務。"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"每次只可啟用一張 SIM 卡。\n\n改用其他服務將不會取消您的 <xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> 服務。"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"切換至 <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"正在連接至網絡…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"正在切換至 <xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"無法切換流動網絡供應商"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"發生錯誤，無法切換流動網絡供應商。"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"要停用 <xliff:g id="CARRIER_NAME">%1$s</xliff:g> 嗎？"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"要停用 SIM 卡嗎？"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"正在停用 SIM 卡<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"無法停用流動網絡供應商"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"發生問題，無法停用您的流動網絡供應商。"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"要使用 2 張 SIM 卡嗎？"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"此裝置可以同時使用 2 張 SIM 卡。如要繼續每次使用一張 SIM 卡，請輕按 [不用了，謝謝]。"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"要重新啟動裝置嗎？"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"如要開始使用，請重新啟動您的裝置。然後您就可以新增其他 SIM 卡。"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"繼續"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"重新開始"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"不用了，謝謝"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"切換"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"無法啟用 SIM 卡"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"請移除 SIM 卡再重新插入。如果問題持續發生，請重新啟動裝置。"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"請嘗試再次啟用 SIM 卡。如果問題持續發生，請重新啟動裝置。"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"網絡啟用"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"已啟用<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"輕按以更新 SIM 卡設定"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM 卡"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"要清除這張已下載的 SIM 卡嗎？"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"清除此 SIM 卡即會從此裝置中移除 <xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> 服務。\n\n<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> 的服務將不會被取消。"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"清除"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"正在清除 SIM 卡…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"無法清除 SIM 卡"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"由於發生錯誤，因此無法清除此 SIM 卡。\n\n請重新啟動裝置，然後再試一次。"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"連接裝置"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"「<xliff:g id="APPNAME">%1$s</xliff:g>」應用程式要求使用臨時 Wi-Fi 網絡連接您的裝置"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"找不到任何裝置。請確保裝置已開啟，並可連接網絡。"</string>
@@ -4890,6 +4981,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"緊急通話"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"您的電訊商目前不支援透過 Wi-Fi 通話撥打緊急電話。\n裝置會自動切換至流動網絡以撥打緊急電話。\n您只可在流動網絡覆蓋的區域撥打緊急電話。"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"使用 Wi‑Fi 撥打電話，以提升通話質素"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"跨 SIM 卡通話"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"允許透過此 SIM 卡接收另一張 SIM 卡的通話和短訊。"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"跨 SIM 卡通話"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"收到的 MMS 訊息"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"無法傳送 MMS 訊息"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"輕按即可在流動數據關閉的情況下透過<xliff:g id="OPERATOR_NAME">%1$s</xliff:g>傳送 MMS 訊息"</string>
@@ -4941,10 +5035,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"允許在「設定」上顯示重疊式畫面"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"允許可以在其他應用程式上顯示内容的應用程式重疊「設定」畫面"</string>
     <string name="media_controls_title" msgid="403271085636252597">"媒體"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"媒體工作階段結束後隱藏播放器"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"播放器讓您在展開的「快速設定」面板中恢復工作階段。"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"「快速設定」中的媒體播放器"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"延長媒體播放器的顯示時間，讓您輕鬆繼續播放"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"隱藏播放器"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"顯示播放器"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"沒有可用的播放器"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"允許的應用程式"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"媒體"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"系統將開啟藍牙"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"開啟"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"關閉"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"互聯網"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM 卡"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"飛行安全網絡"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"尋找並連接飛行安全網絡"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飛行, 飛行安全"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"通話和短訊"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi-Fi 通話"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"透過非流動網絡供應商網絡 (例如 Wi-Fi) 撥打和接聽電話"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi 通話可讓您透過非流動網絡供應商網絡 (例如 Wi-Fi 網絡) 撥打和接聽電話。"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"通話"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"短訊"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"偏好"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"偏好的通話"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"偏好的短訊"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"無法使用"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"沒有 SIM 卡"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好設定"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"連線至公共網絡"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"網絡連線, 互聯網, 無線, 數據, Wi-Fi, 流動網絡, 流動裝置, 流動網絡供應商, 4G, 3G, 2G, LTE"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"查看飛行安全網絡"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"關閉飛行模式"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"睡眠模式開啟時無法使用"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"通知重要性重設完成。"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"應用程式"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"不信任的裝置想存取您的訊息。輕按即可瞭解詳情。"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"要允許存取訊息嗎？"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"不信任的藍牙裝置 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 想存取您的訊息。\n\n請注意，您從未連接 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"不信任的裝置要求存取您的聯絡人和通話記錄。輕按即可瞭解詳情。"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"要允許存取聯絡人和通話記錄嗎？"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"不信任的藍牙裝置 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 要求存取您的聯絡人和通話記錄，包括來電和撥出電話的資料。\n\n您從未連接 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
 </resources>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index ecfa5e6..fd10597 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"中"</item>
     <item msgid="6740026006576843477">"長"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"短"</item>
+    <item msgid="7397961711906421599">"中"</item>
+    <item msgid="4079132024502041928">"長"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"預設"</item>
     <item msgid="4234707448428002595">"Sans-serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"通用"</item>
+    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"LTE"</item>
     <item msgid="2947411877551747693">"LTE/WCDMA"</item>
     <item msgid="7723670142495874534">"僅限 TDSCDMA"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"NR/LTE"</item>
     <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"全域"</item>
     <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 933dccc..beed3f6 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"日期與時間"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"設定日期和時間"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"設定日期、時間、時區及時間格式"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"使用網路提供的時間"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"使用網路提供的時區"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"自動設定時間"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"自動設定時區"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"使用地區設定預設值"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24 小時制"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"使用 24 小時格式"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"在鎖定畫面上顯示個人資料資訊"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"帳戶"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"位置"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"使用位置資訊"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"使用位置資訊"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"關閉"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="other">已開啟 - <xliff:g id="COUNT_1">%1$d</xliff:g> 個應用程式已取得位置資訊存取權</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"螢幕鎖定, 人臉解鎖"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"螢幕鎖定、指紋"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"螢幕鎖定"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"使用你的臉孔和指紋安全解鎖手機"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"你也可以登入應用程式及確認付款"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"設定解鎖方式："</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"人臉解鎖"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"輕鬆解鎖手機"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"指紋"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"快速解鎖口袋中的手機"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"略過"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"繼續"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"已新增臉孔"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"設定人臉解鎖功能"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"人臉解鎖"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"使用你的臉孔進行驗證"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"開始"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"如果關閉人臉解鎖無障礙功能，某些設定步驟可能無法與 TalkBack 搭配運作。"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"返回"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"繼續設定"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"使用無障礙設定"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"在應用程式中使用人臉解鎖時，一律必須經過確認"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"刪除臉孔資料"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"設定人臉解鎖功能"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"你可以使用人臉解鎖功能將裝置解鎖、登入應用程式，以及確認付款。\n\n注意事項：\n只要看著手機，就可能會讓手機意外解鎖。\n\n如果有人將手機對著你的臉，手機可能就會解鎖。\n\n長相與你十分相似的人 (例如你的孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"你可以使用人臉解鎖功能將裝置解鎖、登入應用程式及確認付款。\n\n注意事項：\n只要看著手機，就可能造成意外解鎖。\n\n如果有人將手機對著你的臉 (無論你是否有睜開雙眼)，手機可能會因此解鎖。\n\n長相與你相似的人（例如你的孿生兄弟姐妹）可能可以解鎖你的手機。"</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"你可以使用人臉解鎖功能將裝置解鎖、登入應用程式，以及確認付款。"</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"注意事項：\n只要看著手機，就可能會讓手機意外解鎖。\n\n如果有人將手機對著你的臉，手機可能就會解鎖。\n\n長相與你十分相似的人 (例如你的孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"注意事項：\n只要看著手機，就可能會讓手機意外解鎖。\n\n如果有人將手機對著你的臉 (無論你是否睜開雙眼)，手機可能就會解鎖。\n\n長相與你十分相似的人 (例如你的孿生兄弟姐妹) 或許可以解鎖你的手機。"</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"要刪除臉孔資料嗎？"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"系統會安全地將人臉解鎖功能使用的臉部資料永久刪除。資料移除後，當你解鎖手機、登入應用程式及確認付款時，都必須使用 PIN 碼、解鎖圖案或密碼。"</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"使用人臉解鎖功能將手機解鎖"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"使用你的指紋將手機解鎖或核准購物交易。\n\n注意：你無法使用指紋將這個裝置解鎖，詳情請洽貴機構的管理員。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"使用你的指紋將手機解鎖或核准購物交易。\n\n注意：使用複雜的圖案或 PIN 碼會比感應指紋來得安全。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"取消"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"不用了，謝謝"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"繼續"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"略過"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"繼續"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"建議你設定螢幕鎖定選項保護你的平板電腦。這樣一來，即使平板電腦遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定人臉解鎖功能。如要返回，請輕觸 [取消]。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"建議你設定螢幕鎖定選項保護你的裝置。這樣一來，即使裝置遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定人臉解鎖功能。如要返回，請輕觸 [取消]。"</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"建議你設定螢幕鎖定選項保護你的手機。這樣一來，即使手機遺失或遭竊，其他人也無法使用。此外，你也必須設定螢幕鎖定選項，才能設定人臉解鎖功能。如要返回，請輕觸 [取消]。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"建議你設定螢幕鎖定選項來保護平板電腦。這樣一來，即使平板電腦遺失或遭竊，其他人也無法使用。設定生物特徵辨識功能時，也需要使用螢幕鎖定選項。如要返回，請輕觸 [取消]。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"建議你設定螢幕鎖定選項來保護裝置。這樣一來，即使裝置遺失或遭竊，其他人也無法使用。設定生物特徵辨識功能時，也需要使用螢幕鎖定選項。如要返回，請輕觸 [取消]。"</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"建議你設定螢幕鎖定選項來保護手機。這樣一來，即使手機遺失或遭竊，其他人也無法使用。設定生物特徵辨識功能時，也需要使用螢幕鎖定選項。如要返回，請輕觸 [取消]。"</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"要略過 PIN 碼設定程序嗎？"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"要略過密碼設定程序嗎？"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"要略過解鎖圖案設定程序嗎？"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"只要啟用裝置保護功能，即可防止他人在未獲你授權的情況下使用這台平板電腦。請選擇你要使用的螢幕鎖定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"只要啟用裝置保護功能，即可防止他人在未獲你授權的情況下使用這個裝置。請選擇你要使用的螢幕鎖定方式。"</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"只要啟用裝置保護功能，即可防止他人在未獲你授權的情況下使用這支手機。請選擇你要使用的螢幕鎖定方式。"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"選擇你的備用螢幕鎖定方法"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"選擇你的備用螢幕鎖定方式"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"選擇備用的螢幕鎖定方法"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"螢幕鎖定選項"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"螢幕鎖定選項"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"螢幕鎖定"</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"人臉解鎖 + 密碼"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"繼續但不設定人臉解鎖功能"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"你可以使用自己的臉孔將手機解鎖。為了安全起見，必須先設定備用螢幕鎖定方式，才能使用這個選項。"</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"生物特徵辨識 + 解鎖圖案"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"生物特徵辨識 + PIN 碼"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"生物特徵辨識 + 密碼"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"不設定生物特徵辨識功能並繼續操作"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"你可以使用生物特徵辨識功能將手機解鎖。為了安全起見，你必須設定備用的螢幕鎖定方式，才能使用這個選項。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"滑動"</string>
@@ -619,7 +640,6 @@
       <item quantity="one">長度必須少於 <xliff:g id="NUMBER_0">%d</xliff:g> 個數字</item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"裝置管理員不允許使用最近用過的 PIN"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"你的 IT 管理員已封鎖常見 PIN 碼，請改用其他 PIN 碼。"</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"密碼不得包含無效字元"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"必須包含至少 1 個字母"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"必須包含至少 1 個數字"</string>
@@ -653,7 +673,6 @@
       <item quantity="one">至少必須包含 1 個非數值字元</item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"裝置管理員不允許使用最近用過的密碼"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"你的 IT 管理員已封鎖常見密碼，請改用其他密碼。"</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"不允許使用依遞增或遞減順序排列或是重複的一串數字"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"確認"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"取消"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"開啟 Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"Wi‑Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"使用 Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"使用 Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Wi-Fi 設定"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"Wi‑Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"設定、管理無線網路存取點"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"將 QR 圖碼置於相機正下方即可連線到「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"掃描 QR 圖碼即可加入 Wi‑Fi"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"分享 Wi-Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"掃描這個 QR 圖碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」並分享密碼"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"使用其他裝置掃描這個 QR 圖碼即可加入「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"掃描這個 QR 圖碼即可連線至「<xliff:g id="SSID">%1$s</xliff:g>」"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"請再試一次，如果問題持續發生，請與裝置製造商聯絡"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"發生錯誤"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Wi-Fi 密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"無線基地台密碼：<xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"自動連線"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"允許手機在進入連線範圍內時自動連上這個網路"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"允許平板電腦在進入連線範圍內時自動連上這個網路"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"允許裝置在進入有效範圍時連線至這個網路"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"新增裝置"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"使用 QR 圖碼將裝置新增至這個網路"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"QR 圖碼格式無效"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"使用系統憑證"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"不提供"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"不進行驗證"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"你未指定任何憑證，因此無法為你設定私人連線。"</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"網路名稱太長。"</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"必須指定網域。"</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"需要憑證。"</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"連線"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"Wi‑Fi 已開啟"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"已連線到「<xliff:g id="NETWORK_NAME">%1$s</xliff:g>」"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"正在連線到「<xliff:g id="NETWORK_NAME">%1$s</xliff:g>」"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"連線中…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"無法連線至網路"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"不在網路有效範圍內"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"裝置的 MAC 位址"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"隨機化 MAC 位址"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"隨機 MAC 位址 (上次使用)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"IP 位址"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"網路詳細資料"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"子網路遮罩"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"IPv6 位址"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"已儲存的網路"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"訂閱"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"其他網路"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"IP 設定"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"這位使用者無法使用 Wi‑Fi 網路進階設定"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"儲存"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"輸入有效的閘道位址。"</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"請輸入有效的 DNS 位址。"</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"輸入長度介於 0 到 32 之間的網路前置碼。"</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (除非由私人 DNS 覆寫)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (除非由私人 DNS 覆寫)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"閘道"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"網路前置碼長度"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"Wi-Fi Direct"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"應用程式正在分享內容。如要分享網際網路連線，請關閉無線基地台並重新開啟"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"未設定密碼"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"無線基地台名稱"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"正在開啟 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"正在開啟「<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>」…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"其他裝置可連線至 <xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"無線基地台密碼"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"AP 頻帶"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"流暢顯示"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"自動將某些內容的重新整理頻率從 60 調高到 90 赫茲 (Hz)。請注意，開啟這項設定會增加電池用量。"</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"流暢顯示"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"強制使用 90 Hz 重新整理頻率"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"強制使用最高重新整理頻率可提升觸控回應和動畫品質。請注意，開啟這項設定會增加電池用量。"</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"螢幕感知"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"啟用/螢幕不會在你注視時關閉"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"收到新通知時，關閉的螢幕就會亮起"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"一律顯示時間和資訊"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"開啟這項功能會增加電池用量"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"粗體文字"</string>
     <string name="title_font_size" msgid="570613010306330622">"字型大小"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"縮小或放大文字"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"SIM 卡鎖定設定"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Android 版本"</string>
     <string name="security_patch" msgid="4071756145347865382">"Android 安全性更新"</string>
     <string name="model_info" msgid="8997566254717810904">"型號"</string>
-    <string name="model_summary" msgid="2246651782442466213">"型號：%1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"型號與硬體"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"硬體版本"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"設備 ID"</string>
@@ -1578,7 +1596,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"刪除 APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"新增 APN"</string>
     <string name="menu_save" msgid="6611465355127483100">"儲存"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"捨棄"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"取消"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"[名稱] 欄位不得留空。"</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"APN 不可留空。"</string>
@@ -1593,8 +1611,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"可重設應用程式"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"重設 Wi-Fi、行動網路和藍牙"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"這項操作會重設所有網路設定，包括：\n\n"<li>"Wi‑Fi"</li>\n<li>"行動數據"</li>\n<li>"藍牙"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"清除"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"清除已下載的 SIM 卡"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"如要下載替換用的 SIM 卡，請與你的電信業者聯絡。這個動作不會取消任何電信資費方案。"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"這項操作不會取消任何電信資費方案。如要下載替換用的 SIM 卡，請與你的電信業者聯絡。"</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"重設設定"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"要重設所有網路設定嗎？請注意，這個動作無法復原。"</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"要重設所有網路設定並清除已下載的 SIM 卡嗎？請注意，這個動作無法復原。"</string>
@@ -1604,31 +1623,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"已重設網路設定"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"無法清除 SIM 卡"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"發生錯誤，因此無法清除已下載的 SIM 卡。\n\n請重新啟動你的裝置，然後再試一次。"</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"清除所有資料 (恢復原廠設定)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"清除所有資料 (恢復原廠設定)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"這會清除你平板電腦"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"這會清除你手機"<b>"內部儲存裝置"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n\n"你目前已登入下列帳戶：\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"這個裝置上還有其他使用者。\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727"><li>"eSIM 卡"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"你目前的電信資費方案並不會因此受到任何影響。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"如要一併清除音樂、圖片及其他用戶資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"如要清除音樂、圖片及其他使用者資料，必須先清除 "<b>"SD 卡"</b>"。"</string>
+    <string name="main_clear_title" msgid="277664302144837723">"清除所有資料 (恢復原廠設定)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"清除所有資料 (恢復原廠設定)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"這會清除平板電腦"<b>"內部儲存空間"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"這會清除手機"<b>"內部儲存空間"</b>"中的所有資料，包括：\n\n"<li>"你的 Google 帳戶"</li>\n<li>"系統和應用程式資料及設定"</li>\n<li>"已下載的應用程式"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n\n"你目前已登入以下帳戶：\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"這部裝置上還有其他使用者。\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729"><li>"eSIM 卡"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"你目前的電信資費方案並不會因此受到任何影響。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"如要清除音樂、圖片及其他使用者資料，就必須清除 "<b>"USB 儲存空間"</b>"的資料。"</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"如要清除音樂、圖片和其他使用者資料，就必須清除 "<b>"SD 卡"</b>"的資料。"</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"清除 USB 儲存裝置"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"清除 SD 卡"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"清除內部 USB 儲存裝置中的所有資料，例如音樂或相片"</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"清除 SD 卡中的所有資料，例如音樂或相片。"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"清除所有資料"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"清除所有資料"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"系統將刪除你的所有個人資訊和已下載的應用程式。請注意，這個動作無法復原。"</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"系統將刪除你所有的個人資訊 (包括已下載的應用程式和 SIM 卡)。請注意，這個動作無法復原。"</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"全部清除"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"無法使用 System Clear 服務，因此未執行任何重設。"</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"要清除所有資料嗎？"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"這位使用者無法將裝置恢復原廠設定"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"清除中"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"請稍候…"</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"清除所有資料"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"清除所有資料"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"系統將刪除你的所有個人資訊和已下載的應用程式。請注意，這項操作無法復原。"</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"系統將刪除你所有的個人資訊，包括已下載的應用程式和 SIM 卡。請注意，這項操作無法復原。"</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"要清除所有資料嗎？"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"這位使用者無法將裝置恢復原廠設定"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"清除中"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"請稍候…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"通話設定"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"設定語音信箱、來電轉接、來電待接及來電顯示"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"USB 網路共用"</string>
@@ -1676,7 +1693,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"最多只能有 <xliff:g id="MAXCONNECTION">%1$d</xliff:g> 個裝置共用網路。"</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"將中斷 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 的網路共用。"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"乙太網路網路共用"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"透過 USB 乙太網路分享手機的網際網路連線"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"透過乙太網路分享手機的網際網路連線"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"使用無線基地台和網路共用功能，透過你的行動數據連線提供網際網路給其他裝置。應用程式也可以建立無線基地台來和鄰近的裝置分享內容。"</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"使用無線基地台和網路共用功能，讓其他裝置能夠透過你的 Wi-Fi 或行動數據連線連上網際網路。應用程式也可以建立無線基地台，以便與鄰近的裝置分享內容。"</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"說明"</string>
@@ -1718,6 +1735,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"藍牙掃描"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"允許應用程式和服務隨時掃描附近裝置 (即使藍牙功能處於關閉狀態)。這麼做可以改善適地性功能和服務等等。"</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"工作用定位服務"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"位置時區偵測"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"位置時區偵測"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"允許使用裝置位置偵測目前時區。其他的位置資訊設定 (例如掃描 Wi-Fi 功能) 可能會影響時區偵測結果準確性。"</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"已開啟"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"已關閉"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"自動偵測時區功能已停用"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"位置時區偵測已停用"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"不支援位置時區偵測"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"不允許變更位置時區偵測"</string>
     <string name="location_network_based" msgid="5247042890080021887">"Wi-Fi 和行動網路位置"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"允許應用程式使用 Google 的定位服務加速判斷你的約略位置。系統會收集匿名的位置資料並傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"根據 Wi-Fi 判定位置"</string>
@@ -1781,6 +1807,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"如要使用人臉解鎖功能，請設定密碼"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"如要使用人臉解鎖功能，請設定解鎖圖案"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"如要使用人臉解鎖功能，請設定 PIN 碼"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"如要使用生物特徵辨識功能，請設定密碼"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"如要使用生物特徵辨識功能，請設定解鎖圖案"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"如要使用生物特徵辨識功能，請設定 PIN 碼"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"忘記密碼了嗎？"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"忘記解鎖圖案了嗎？"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"忘記 PIN 碼了嗎？"</string>
@@ -2117,13 +2146,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"字幕偏好設定"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"放大"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"放大區域"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"啟用放大功能"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"選擇你要放大的螢幕區域"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"整個螢幕"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"部分螢幕區域"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"整個螢幕和部分螢幕區域"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"放大整個螢幕"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"放大部分螢幕區域"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"要改用無障礙工具按鈕嗎？"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"如果使用「輕觸三下放大」功能放大部分畫面，輸入內容及執行其他操作時會出現延遲。\n\n要改用無障礙工具按鈕放大畫面嗎？"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"改用無障礙工具按鈕"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"繼續使用「輕觸三下放大」功能"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"放大功能設定"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"輕觸螢幕三下進行放大"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"使用快速手勢放大畫面"</string>
@@ -2177,11 +2209,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"按電源鍵結束通話"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"大型滑鼠游標"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"移除動畫"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"單聲道音訊"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"播放音訊時合併聲道"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"音訊平衡"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"左"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"右"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"單聲道音訊"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"播放音訊時合併聲道"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"音訊平衡"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"左"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"右"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"預設"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"10 秒"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 秒"</string>
@@ -2211,11 +2243,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"通知震動"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"響鈴震動"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"觸覺回饋"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"使用「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"開啟「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"使用色彩校正"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"顯示字幕"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"僅限支援的應用程式"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"使用「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"開啟「<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>」"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"使用色彩校正"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"顯示字幕"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"僅限支援的應用程式"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"字幕大小和樣式"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"文字大小：<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g>"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"更多選項"</string>
@@ -2245,6 +2277,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"綠色弱視"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"紅色弱視"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"藍色弱視"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"灰階"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"紅 - 綠"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"紅 - 綠"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"藍 - 黃"</string>
@@ -2374,7 +2407,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"背景活動限制"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"允許應用程式在背景執行"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"應用程式無法在背景執行"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"無法限制背景活動"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"無法限制背景活動"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"要限制背景活動嗎？"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"如果你限制應用程式的背景活動，應用程式可能無法正常運作"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"由於這個應用程式並未設為最佳化電池用量，因此你無法加以限制。\n\n如要限制應用程式，請先開啟電池效能最佳化功能。"</string>
@@ -2423,6 +2456,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"平板電腦使用率比平常高"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"裝置使用率比平常高"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"電池電量可能會比平常更快耗盡"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"針對電池狀態進行最佳化調整"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"系統已暫時限制電池用量。輕觸即可瞭解詳情。"</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"你的手機使用率比平常高，電池電量可能比預期更快耗盡。\n\n你常用的應用程式如下 (按照電池用量由高到低排序)："</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"你的平板電腦使用率比平常高，電池電量可能比預期更快耗盡。\n\n你常用的應用程式如下 (按照電池用量由高到低排序)："</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"你的裝置使用率比平常高，電池電量可能比預期更快耗盡。\n\n你常用的應用程式如下 (按照電池用量由高到低排序)："</string>
@@ -2478,6 +2513,8 @@
       <item quantity="one">有 %1$d 個應用程式受到限制</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"讀取電池計量器時發生問題"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"讀取電池計量器時發生問題。輕觸即可"<annotation id="url">"瞭解詳情"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"要停止應用程式嗎？"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓你的手機保持喚醒狀態，因此手機無法正常管理電池。\n\n你可以停止這個應用程式來解決此問題。\n\n如果問題持續發生，你可能需要解除安裝該應用程式，才能改善電池效能。"</string>
     <string name="dialog_stop_message" product="tablet" msgid="426862716783569739">"由於「<xliff:g id="APP">%1$s</xliff:g>」一直讓你的平板電腦保持喚醒狀態，因此平板電腦無法正常管理電池。\n\n你可以停止這個應用程式來解決此問題。\n\n如果問題持續發生，你可能需要解除安裝該應用程式，才能改善電池效能。"</string>
@@ -2591,9 +2628,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"設定時間表"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"延長電池續航力"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"充電時關閉"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"在你手機的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"在你平板電腦的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"在你裝置的電池電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉省電模式"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"在手機電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"在平板電腦電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"在裝置電量達 <xliff:g id="PERCENT">%1$s</xliff:g> 時關閉節約耗電量模式"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"開啟"</string>
@@ -2658,6 +2695,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"重設"</string>
     <string name="tts_play" msgid="2945513377250757221">"播放"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"自動調整連線"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"自動管理網路連線，藉此延長電池續航力並提升裝置效能"</string>
     <string name="credentials_title" msgid="7535942196886123656">"憑證儲存空間"</string>
     <string name="credentials_install" msgid="3933218407598415827">"安裝憑證"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"從裝置的儲存空間安裝憑證"</string>
@@ -2669,9 +2708,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"使用者憑證"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"查看及修改已儲存的憑證"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"進階"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"儲存空間類型"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"硬體備份"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"僅限軟體"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"這位使用者無法存取憑證"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"已為 VPN 和應用程式安裝"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"已為 Wi-Fi 安裝"</string>
@@ -2687,6 +2723,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"不要安裝"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"仍要安裝"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"未安裝憑證"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"要允許「<xliff:g id="APP_NAME">%s</xliff:g>」在這部裝置上安裝憑證嗎？"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"當你存取下方應用程式和網址時，系統就會透過這些憑證辨識你的身分"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"不允許"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"允許"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"顯示更多"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"憑證管理應用程式"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"無"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"當你存取下方的應用程式和網址時，系統就會透過這個應用程式安裝的憑證辨識你的身分"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"移除"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"緊急撥號信號"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"備份"</string>
@@ -3010,7 +3055,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"尚未設定 - 工作設定檔"</string>
     <string name="user_admin" msgid="4024553191395768119">"管理員"</string>
     <string name="user_you" msgid="3070562015202859996">"你 (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"暱稱"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"你最多可新增 <xliff:g id="USER_COUNT">%1$d</xliff:g> 位使用者"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"只有平板電腦的擁有者可以管理使用者。"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"只有手機的擁有者可以管理使用者。"</string>
@@ -3060,7 +3104,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"用感應式刷卡機付款"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"設定付款應用程式，然後將手機背面靠近標有免碰觸符號的感應式刷卡機即可。"</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"知道了"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"更多…"</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"更多…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"設定預設的付款應用程式"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"更新預設的付款應用程式"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"透過感應式刷卡機付款時使用「<xliff:g id="APP">%1$s</xliff:g>」應用程式"</string>
@@ -3130,9 +3174,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"返回"</string>
     <string name="wizard_next" msgid="3884832431439072471">"下一步"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"完成"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"拍照"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"選擇圖片"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"選取相片"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"SIM 卡"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"SIM 卡"</string>
@@ -3144,7 +3185,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"一律使用這張 SIM 卡通話"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"選擇數據連線 SIM 卡"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"選取要用於收發簡訊的 SIM 卡"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"正在切換行動數據連線 SIM 卡，這可能需要一點時間..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"正在切換行動數據連線 SIM 卡，這項作業最多可能需要一分鐘才能完成…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"選擇通話 SIM 卡"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"選取 SIM 卡"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3287,6 +3328,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"日常安排, 時間表, 省電, 節約電量, 電池, 自動, 百分比"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"VoLTE, 進階通話功能, 4G 通話功能"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"新增語言, 新增一種語言"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"文字大小"</string>
     <string name="default_sound" msgid="6604374495015245195">"預設音效"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"鈴聲和通知音量為 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"音量、震動、零打擾"</string>
@@ -3326,11 +3368,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"啟動音效"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"即時字幕"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"自動產生媒體字幕"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"無"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="other">已設定 <xliff:g id="ON_COUNT">%d</xliff:g> 個排程</item>
-      <item quantity="one">已設定 1 個排程</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{無}=1{已設定 1 個時間表}other{已設定 # 個時間表}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"零打擾"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"僅接收重要聯絡人和應用程式的通知"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"降低干擾"</string>
@@ -3398,20 +3436,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"僅限優先通知"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"開啟 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"關閉 / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"關閉"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"開啟"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"每次都詢問"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"直到你關閉為止"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> 小時</item>
-      <item quantity="one">1 小時</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> 分"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="other">系統可以自動啟用 <xliff:g id="ON_COUNT">%d</xliff:g> 項排程</item>
-      <item quantity="one">系統可以自動啟用 1 項排程</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{1 小時}other{# 小時}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{1 分鐘}other{# 分鐘}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{關閉}=1{關閉/系統可以自動啟用 1 個時間表}other{關閉/系統可以自動啟用 # 個時間表}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"「零打擾」模式的例外項目"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"聯絡人"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"應用程式"</string>
@@ -3457,6 +3487,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"自動將優先順序較低的通知設為無聲通知"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"自動調整通知排序"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"依關聯性自動將通知排序"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"提供對自動調整通知優先順序功能的意見"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"顯示對通知設定所做的調整和提供意見回饋的選項"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"重設通知重要性"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"重設使用者變更的重要設定，並允許通知助理優先處理"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"建議採取的動作和回覆"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"自動顯示建議採取的動作和回覆"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"顯示近期通知和已延後的通知"</string>
@@ -3554,8 +3588,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"優先對話"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"調整排序到其他對話的上方，並以浮動對話框的形式顯示"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"顯示在對話部分的頂端"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"其他對話"</string>
+    <string name="other_conversations" msgid="551178916855139870">"非優先對話"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"你已變更的對話"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"最近的對話"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"清除最近的項目"</string>
+    <string name="clear" msgid="5092178335409471100">"清除"</string>
     <string name="important_bubble" msgid="7911698275408390846">"以泡泡形式顯示優先對話"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"優先對話會顯示在下拉式通知欄的頂端。你也可以設定讓優先對話以泡泡的形式顯示，並允許系統在「零打擾」模式下顯示這類泡泡。"</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"優先對話和經過修改的對話會顯示在這裡"</string>
@@ -3653,7 +3690,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"零打擾存取權"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"允許「零打擾」模式"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"最近沒有已安裝的應用程式要求「零打擾」存取權"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"正在載入應用程式..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"正在載入應用程式…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Android 已根據你的要求啟用封鎖設定，不讓這個應用程式的通知顯示在這個裝置上"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Android 已根據你的要求啟用封鎖設定，不讓這個類別的通知顯示在這個裝置上"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Android 已根據你的要求啟用封鎖設定，不讓這個群組的通知顯示在這個裝置上"</string>
@@ -3745,11 +3782,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"所有對話"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"優先對話"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"無"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> 個對話</item>
-      <item quantity="one">1 個對話</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"無"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{無}=1{1 個對話}other{# 個對話}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"例外的對象"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"通話"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"來電"</string>
@@ -3758,11 +3791,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"如要確認允許的通話是否會發出音效，請檢查裝置目前是否已設為響鈴"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"系統會在「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」啟用時封鎖來電。你可以調整設定，讓好友、家人或其他聯絡人能聯絡你。"</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"已加星號的聯絡人"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="other">另外 <xliff:g id="NUM_PEOPLE">%d</xliff:g> 人</item>
-      <item quantity="one">另外 1 人</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"無"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{無}=1{{contact_1}}=2{{contact_1}和{contact_2}}=3{{contact_1}、{contact_2}和{contact_3}}other{{contact_1}、{contact_2}和另外 # 人}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(無顯示名稱)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"訊息"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"訊息"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"訊息"</string>
@@ -3771,11 +3801,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"系統會在「<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>」排程進行時封鎖訊息。你可以調整設定，讓好友、家人或其他聯絡人可以聯絡你。"</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"你會收到所有訊息的通知"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"你會收到所有來電的通知"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"無"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> 位聯絡人</item>
-      <item quantity="one">1 位聯絡人</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{無}=1{1 位聯絡人}other{# 位聯絡人}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"所有人"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"聯絡人"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"已加星號的聯絡人"</string>
@@ -3813,22 +3839,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"部分通知"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"即使未將應用程式設為例外，指定的使用者仍可與你聯絡"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="other"><xliff:g id="APP_NAMES">%s</xliff:g>例外</item>
-      <item quantity="one"><xliff:g id="APP_NAME_0">%s</xliff:g>例外</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"以及另外 <xliff:g id="NUMBER">%d</xliff:g> 個應用程式"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{沒有應用程式例外}=1{「{app_1}」例外}=2{「{app_1}」和「{app_2}」例外}=3{「{app_1}」、「{app_2}」和「{app_3}」例外}other{「{app_1}」、「{app_2}」和另外 # 個應用程式例外}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"應用程式"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"所有通知"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"部分通知"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"例外的通知"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"允許所有通知"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="other"><xliff:g id="SOUND_CATEGORIES">%s</xliff:g>例外</item>
-      <item quantity="one"><xliff:g id="SOUND_CATEGORY">%s</xliff:g>例外</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"沒有音效例外"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"以及另外 <xliff:g id="NUMBER">%d</xliff:g> 個音效"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{沒有音效例外}=1{{sound_category_1}例外}=2{{sound_category_1}和{sound_category_2}例外}=3{{sound_category_1}、{sound_category_2}和{sound_category_3}例外}other{{sound_category_1}、{sound_category_2}和另外 # 種類別例外}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"沒有音效例外"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"沒有人例外"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"某些人例外"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"所有人都例外"</string>
@@ -3874,8 +3892,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"開啟"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"關閉"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"應用程式固定"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"你可以使用應用程式固定功能，讓目前使用的應用程式持續顯示在螢幕上，直到你取消固定為止。請務必只針對你信任的人使用這項功能，例如讓信任的好友遊玩特定遊戲。\n\n固定應用程式後，該應用程式可以開啟其他應用程式，也能存取個人資料。\n\n使用應用程式固定功能的步驟如下：\n1.	開啟應用程式固定功能\n2.	開啟總覽\n3.	輕觸畫面頂端的應用程式圖示，然後輕觸 [固定]"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"你可以使用應用程式固定功能，將目前使用的應用程式固定在螢幕上，直到你取消固定為止。如果想讓信任的好友用你的手機玩遊戲，就可以使用這個功能。\n\n固定應用程式後，該應用程式可以開啟其他應用程式，也能存取個人資料。\n\n如要安全地與他人共用裝置，建議改用訪客使用者設定檔。\n\n使用應用程式固定功能的步驟如下：\n1.	開啟應用程式固定功能 	\n2.	開啟「總覽」 \n3.	輕觸畫面頂端的應用程式圖示，然後輕觸 [固定]"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"你可以使用應用程式固定功能，將目前使用的應用程式固定在螢幕上，直到你取消固定為止。如果想讓信任的好友用你的手機玩遊戲，就可以使用這個功能。"</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"固定應用程式後，該應用程式可以開啟其他應用程式，也能存取個人資料。\n\n如何使用應用程式固定功能：	\n1.	開啟應用程式固定功能 	\n2.	開啟 [總覽] 	\n3.	輕觸畫面頂端的應用程式圖示，然後輕觸 [固定]"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"固定應用程式後，該應用程式可以開啟其他應用程式，也能存取個人資料。\n\n如要安全地與他人共用裝置，建議你改用訪客使用者設定檔。\n\n如何使用應用程式固定功能：	\n1.	開啟應用程式固定功能 	\n2.	開啟 [總覽] 	\n3.	輕觸畫面頂端的應用程式圖示，然後輕觸 [固定]"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"固定應用程式後：\n\n•	 該應用程式可存取個人資料\n		(例如聯絡人和電子郵件內容)\n•		固定的應用程式可開啟其他應用程式\n\n請務必只針對你信任的人使用應用程式固定功能。"</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"取消固定時必須畫出解鎖圖案"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"取消固定時必須輸入 PIN 碼"</string>
@@ -3897,6 +3916,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"除了啟用裝置的人臉解鎖功能，你還可以將裝置設為需要輸入 PIN 碼才能啟動，增添多一道防護。裝置必須成功啟動才能接聽電話及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入 PIN 碼才能啟動嗎？"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"除了啟用裝置的人臉解鎖功能，你還可以將裝置設為需要畫出解鎖圖案才能啟動，增添多一道防護。裝置必須成功啟動才能接聽電話及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要畫出解鎖圖案才能啟動嗎？"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"除了啟用裝置的人臉解鎖功能，你還可以將裝置設為需要輸入密碼才能啟動，增添多一道防護。裝置必須成功啟動才能接聽電話及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入密碼才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"除了使用生物特徵辨識功能將裝置解鎖，你還可以將裝置設為需要輸入 PIN 碼才能啟動，增添多一道防護。裝置必須成功啟動才能接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入 PIN 碼才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"除了使用生物特徵辨識功能將裝置解鎖，你還可以將裝置設為需要畫出解鎖圖案才能啟動，增添多一道防護。裝置必須成功啟動才能接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要畫出解鎖圖案才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"除了使用生物特徵辨識功能將裝置解鎖，你還可以將裝置設為需要輸入密碼才能啟動，增添多一道防護。裝置必須成功啟動才能接聽來電及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入密碼才能啟動嗎？"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"是"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"否"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"受到限制"</string>
@@ -4072,7 +4094,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"USB 由以下模式控管"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"已連接的裝置"</string>
     <string name="usb_control_device" msgid="527916783743021577">"這個裝置"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"切換中..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"切換中…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"無法切換"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"為這個裝置充電"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"正在為連接的裝置充電"</string>
@@ -4266,6 +4288,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"行動數據用量"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"應用程式數據用量"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Wi-Fi 數據用量"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"不屬於電信業者的數據用量"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"乙太網路數據用量"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"乙太網路"</string>
@@ -4284,6 +4307,7 @@
       <item quantity="one">1 項限制</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"電信業者與裝置的數據計算方式可能有所不同"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"排除電信業者網路的數據用量"</string>
     <string name="data_used_template" msgid="8229342096562327646">"已使用 <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"設定數據用量警告"</string>
     <string name="data_warning" msgid="2925054658166062884">"數據用量警告"</string>
@@ -4319,7 +4343,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"查看詳細資料"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"數據節省模式"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"數據用量不受限"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"背景資料功能已關閉"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"背景資料功能已關閉"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"已開啟"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"已關閉"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"使用數據節省模式"</string>
@@ -4342,7 +4366,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"裝置處於鎖定狀態時，禁止在通知中輸入回覆內容或其他文字"</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"預設拼字檢查工具"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"選擇拼字檢查工具"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"使用拼字檢查工具"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"使用拼字檢查工具"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"未選取"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(無)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4432,7 +4456,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"儲存空間管理工具會將已備份的相片和影片從裝置中移除，藉此釋出儲存空間。"</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"移除相片和影片"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"儲存空間管理工具"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"使用儲存空間管理工具"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"使用儲存空間管理工具"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"自動"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"手動"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"立即釋出空間"</string>
@@ -4470,6 +4494,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"輕觸兩下以查看手機"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"輕觸兩下平板電腦即可查看"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"輕觸兩下裝置即可查看"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"滑動查看通知"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"在畫面底部向下滑動即可顯示通知"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"單手模式"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"使用單手模式"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"切換應用程式時結束單手模式"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"逾時"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"4 秒"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"8 秒"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"12 秒"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"可單手操作"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"輕觸兩下螢幕即可查看時間、通知和其他資訊。"</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"拿起以查看手機"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"拿起平板電腦即可查看"</string>
@@ -4482,6 +4516,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"輕觸以查看平板電腦"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"輕觸以查看裝置"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"如要查看時間、通知和其他資訊，請輕觸螢幕。"</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"緊急求救"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"使用緊急求救功能"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"由「<xliff:g id="APP_NAME">%1$s</xliff:g>」管理"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"快速連按電源按鈕 5 次以上即可觸發動作"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"播放倒數計時警報"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"先播放高分貝的音效，再發出求救通知"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"撥打求救電話"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"求救電話號碼"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>。輕觸即可變更"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"如果你輸入的不是緊急電話號碼：\n • 你必須解鎖裝置，才能使用緊急求救功能\n • 電話可能沒有回應"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"滑動指紋感應器以查看通知"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"滑動手指"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"將手指放在手機背面的指紋感應器上並向下滑動，即可查看通知。"</string>
@@ -4607,6 +4651,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"可見資料集數量上限"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"重設為預設值"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"已重設自動填入開發人員選項"</string>
+    <string name="location_category" msgid="3496759112306219062">"位置"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"狀態列位置指標"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"顯示所有位置，包括透過網路和各種連線方式取得的位置資訊"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"強制啟用完整的 GNSS 測量資料"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"在停用工作週期的情況下追蹤所有 GNSS 星座圖和頻率"</string>
     <string name="device_theme" msgid="5027604586494772471">"裝置主題"</string>
     <string name="default_theme" msgid="4815428567082263639">"預設"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"網路名稱"</string>
@@ -4623,8 +4672,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"暫停通知以保持專注"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"無法使用此功能"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"這項功能會降低你的手機速度，因此已由系統停用"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"強制啟用完整的 GNSS 測量資料"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"在停用工作週期的情況下追蹤所有 GNSS 星座圖和頻率"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"一律顯示當機對話方塊"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"在每次應用程式當機時顯示對話方塊"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"選取已啟用 ANGLE 的應用程式"</string>
@@ -4636,7 +4683,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"為所有應用程式啟用這項設定"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"選取繪圖驅動程式"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"預設"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"遊戲驅動程式"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"遊戲驅動程式"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"開發人員驅動程式"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"系統繪圖驅動程式"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4692,7 +4739,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"開啟 (靜音)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"關閉"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"網路詳細資料"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"你的裝置名稱會顯示在手機的應用程式上。此外，當你連上藍牙裝置或設定 Wi-Fi 無線基地台時，其他人可能也會看到你的裝置名稱。"</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"你在手機上的應用程式會取得手機的裝置名稱。此外，當你連上藍牙裝置、Wi-Fi 網路或者設定 Wi-Fi 無線基地台時，其他人可能也會看到這個裝置名稱。"</string>
     <string name="devices_title" msgid="649715719278562515">"裝置"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"所有設定"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"建議"</string>
@@ -4705,6 +4752,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"找不到網路，請再試一次。"</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(已禁止)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"沒有 SIM 卡"</string>
+    <string name="sim_card" msgid="6381158752066377709">"SIM 卡"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"沒有 SIM 卡"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"無"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"必須要有 SIM 卡才能連上網路"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"必須要有「<xliff:g id="WIRELESS_CARRIER">%s</xliff:g>」的 SIM 卡才能連上網路"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"首選網路模式：首選 WCDMA"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"首選網路模式：僅限 GSM"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"首選網路模式：僅限 WCDMA"</string>
@@ -4758,6 +4810,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"行動數據"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"使用行動網路存取數據"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"手機會在進入有效範圍時，自動切換至這個電信業者"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"沒有可用的 SIM 卡"</string>
     <string name="calls_preference" msgid="2166481296066890129">"通話偏好設定"</string>
     <string name="sms_preference" msgid="7742964962568219351">"簡訊偏好設定"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"每次都詢問"</string>
@@ -4818,6 +4871,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"無法在連線到「<xliff:g id="CARRIER">%1$s</xliff:g>」時使用"</string>
     <string name="see_more" msgid="7499355691042812723">"顯示更多"</string>
     <string name="see_less" msgid="2642392725363552793">"顯示較少"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"要啟用「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」嗎？"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"要啟用 SIM 卡嗎？"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"要切換至「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」嗎？"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"要改為使用 SIM 卡嗎？"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"一次只能啟用一張 SIM 卡。\n\n切換至「<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>」並不會取消「<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>」的服務。"</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"一次只能啟用一張已下載的 SIM 卡。\n\n切換至「<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>」不會取消「<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>」的服務。"</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"一次只能啟用一張 SIM 卡。\n\n切換電信業者並不會取消「<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>」的服務。"</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"切換至「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"正在連線到網路…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"正在切換至「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"無法切換電信業者"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"發生錯誤，因此無法切換電信業者。"</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"要停用「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」嗎？"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"要停用 SIM 卡嗎？"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"正在停用 SIM 卡<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"無法停用電信業者"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"發生錯誤，無法停用你的電信業者。"</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"要使用 2 張 SIM 卡嗎？"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"這部裝置可以同時啟用 2 張 SIM 卡。如要繼續使用 1 張 SIM 卡，請輕觸 [不用了，謝謝]。"</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"要重新啟動裝置嗎？"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"如要開始使用，請重新啟動你的裝置。重新啟動後即可新增其他 SIM 卡。"</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"繼續"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"重新啟動"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"不用了，謝謝"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"切換"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"無法啟用 SIM 卡"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"請移除 SIM 卡再重新插入，如果問題持續發生，請重新啟動裝置。"</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"請試著再次啟用 SIM 卡，如果問題持續發生，請重新啟動裝置。"</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"啟用網路"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"「<xliff:g id="CARRIER_NAME">%1$s</xliff:g>」已啟用"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"輕觸即可更新 SIM 卡設定"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"SIM 卡"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"要清除這張已下載的 SIM 卡嗎？"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"如果清除這張 SIM 卡，「<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g>」服務會從這部裝置中移除。\n\n請放心，「<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g>」的服務不會因此取消。"</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"清除"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"正在清除 SIM 卡…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"無法清除 SIM 卡"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"發生錯誤，因此無法清除這張 SIM 卡。\n\n請重新啟動裝置，然後再試一次。"</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"連線至裝置"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"「<xliff:g id="APPNAME">%1$s</xliff:g>」應用程式想透過臨時的 Wi-Fi 網路連線至你的裝置"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"找不到裝置。請確認裝置已經開啟並可進行連線。"</string>
@@ -4889,6 +4980,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"緊急電話"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"你的電信業者目前不支援透過 Wi-Fi 通話撥打緊急電話。\n這個裝置會在撥打緊急電話時自動切換到行動數據網路。\n你只能在有行動網路訊號的地區撥打緊急電話。"</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"使用 Wi-Fi 進行通話以改善通話品質"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"跨 SIM 卡通話"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"使用這張 SIM 卡時允許透過另一張 SIM 卡進行通話和收發簡訊。"</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"跨 SIM 卡通話"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"收到多媒體訊息"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"無法傳送多媒體訊息"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"如要在行動數據關閉時透過「<xliff:g id="OPERATOR_NAME">%1$s</xliff:g>」收發多媒體訊息，請輕觸這裡"</string>
@@ -4940,10 +5034,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"允許應用程式可重疊顯示在「設定」畫面上"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"允許可顯示在其他應用程式上的應用程式重疊顯示在「設定」畫面上"</string>
     <string name="media_controls_title" msgid="403271085636252597">"媒體"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"在媒體工作階段結束後隱藏播放器"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"這個播放器可讓你透過展開的快速設定面板繼續執行工作階段。"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"快速設定中的媒體播放器"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"延長媒體播放器的顯示時間，讓你輕鬆繼續播放"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"隱藏播放器"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"顯示播放器"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"沒有可用的播放器"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"允許的應用程式"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"媒體"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"系統將開啟藍牙"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"開啟"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"關閉"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"網際網路"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"SIM 卡"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"飛航安全網路"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"尋找並連線到飛航安全網路"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"飛航, 飛航安全"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"通話和簡訊"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Wi‑Fi 通話"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"透過諸如 Wi‑Fi 這類非電信業者提供的網路撥打電話及接聽來電"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Wi-Fi 通話功能可讓你透過非電信業者網路 (例如某些 Wi-Fi 網路) 撥打電話及接聽來電。"</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"通話"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"簡訊"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"偏好"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"偏好通話"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"偏好簡訊"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"無法使用"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"沒有 SIM 卡"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"偏好設定"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"連線至公用網路"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"網路連線, 網際網路, 無線, 行動數據, wifi, wi-fi, wi fi, 行動網路, 行動, 電信業者, 4g, 3g, 2g, lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"查看飛航安全網路"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"關閉飛航模式"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"就寢時間模式開啟時無法使用"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"通知重要性重設完成。"</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"應用程式"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"不受信任的裝置想要存取你的訊息。輕觸即可瞭解詳情。"</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"要允許存取訊息嗎？"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"不受信任的藍牙裝置 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 想要存取你的訊息。\n\n請注意，你從未連結到 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"不受信任的裝置想要存取你的聯絡人和通話記錄。輕觸即可瞭解詳情。"</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"要允許存取聯絡人和通話記錄嗎？"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"不受信任的藍牙裝置 [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>] 想要存取你的聯絡人和通話記錄，包括你接聽及撥打的電話。\n\n請注意，你從未連結到 [<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>]。"</string>
 </resources>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 81a602b..f6f0fcf 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -365,6 +365,11 @@
     <item msgid="5118829513010894576">"Okulingene"</item>
     <item msgid="6740026006576843477">"Kude"</item>
   </string-array>
+  <string-array name="long_press_timeout_selector_list_titles">
+    <item msgid="8908021508913038488">"Kufushane"</item>
+    <item msgid="7397961711906421599">"Okulingene"</item>
+    <item msgid="4079132024502041928">"Kude"</item>
+  </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="2166553138528640250">"Okuzenzakalelayo"</item>
     <item msgid="4234707448428002595">"I-Sans Serif"</item>
@@ -525,7 +530,7 @@
     <item msgid="30756226617172695">"I-CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2847125869624632806">"I-CDMA + LTE/EvDo"</item>
     <item msgid="2247906254631766720">"I-GSM/WCDMA/LTE"</item>
-    <item msgid="1091258946200124345">"Okomhlaba jikelele"</item>
+    <item msgid="4147872615520331421">"I-LTE/CDMA/EvDo/GSM/WCDMA"</item>
     <item msgid="2908834445708457736">"I-LTE"</item>
     <item msgid="2947411877551747693">"I-LTE / WCDMA"</item>
     <item msgid="7723670142495874534">"I-TDSCDMA kuphela"</item>
@@ -542,7 +547,7 @@
     <item msgid="8150548370973671395">"I-NR/LTE"</item>
     <item msgid="5237423971422723128">"I-NR/LTE/CDMA/EvDo"</item>
     <item msgid="6856991565745877075">"I-NR/LTE/GSM/WCDMA"</item>
-    <item msgid="473436147270962091">"I-NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>
+    <item msgid="8908263949185004366">"Emhlabeni jikelele"</item>
     <item msgid="6692179237956480280">"I-NR/LTE/WCDMA"</item>
     <item msgid="8160757136163231885">"I-NR/LTE/TDSCDMA"</item>
     <item msgid="2207530656708814396">"I-NR/LTE/TDSCDMA/GSM"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f782789..dc84b5d 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -254,8 +254,8 @@
     <string name="date_and_time_settings_title" msgid="2305454529709812364">"Idethi nesikhathi"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="1841717199409629742">"Setha idethi nesikhathi"</string>
     <string name="date_and_time_settings_summary" msgid="334967758944498010">"Setha idethi, isikhathi, umkhwawulo wesikhathi; namafomethi"</string>
-    <string name="date_time_auto" msgid="8227898528525208628">"Sebenzisa isikhathi esinikeziwe senethiwekhi"</string>
-    <string name="zone_auto_title" msgid="4715775349468228598">"Sebenzisa umkhawulo wesikhathi esinikeziwe senethiwekhi"</string>
+    <string name="date_time_auto" msgid="4239202185055225869">"Setha isikhathi ngokuzenzekelayo"</string>
+    <string name="zone_auto_title" msgid="3993580453604839924">"Setha izoni yesikhathi ngokuzenzekelayo"</string>
     <string name="date_time_24hour_auto" msgid="6583078135067804252">"Sebenzisa okuzenzakalelayo kwasendaweni"</string>
     <string name="date_time_24hour_title" msgid="1445056824481243600">"24‑ihora ngefomethi"</string>
     <string name="date_time_24hour" msgid="286679379105653406">"Sebenzisa ifomethi ye-24 amahora"</string>
@@ -296,7 +296,7 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="5734739022887933365">"Bonisa ulwazi lwephrofayela ekukhiyeni isikrini"</string>
     <string name="Accounts_settings_title" msgid="8434263183710375412">"Ama-akhawunti"</string>
     <string name="location_settings_title" msgid="8375074508036087178">"Indawo"</string>
-    <string name="location_settings_master_switch_title" msgid="4232810467362584112">"Sebenzisa indawo"</string>
+    <string name="location_settings_primary_switch_title" msgid="8849081766644685127">"Sebenzisa indawo"</string>
     <string name="location_settings_summary_location_off" msgid="4797932754681162262">"Valiwe"</string>
     <plurals name="location_settings_summary_location_on" formatted="false" msgid="1019959038518185676">
       <item quantity="one">Vuliwe - <xliff:g id="COUNT_1">%1$d</xliff:g> izinhlelo zokusebenza ezinokufinyelela kundawo</item>
@@ -320,6 +320,15 @@
     <string name="security_dashboard_summary_face" msgid="4198949293847206382">"Ukukhiya isikrini, i-face unlock"</string>
     <string name="security_dashboard_summary" msgid="8750183806533140464">"Ukukhiywa kwesikrini, izigxivizo zeminwe"</string>
     <string name="security_dashboard_summary_no_fingerprint" msgid="1044589595710115123">"Isikrini sivaliwe"</string>
+    <string name="multi_biometric_enroll_title" msgid="3007607723604088374">"Vula ifoni yakho ngokuphepha ngobuso bakho nangezigxivizo zomunwe"</string>
+    <string name="multi_biometric_enroll_subtitle" msgid="8357072842904027301">"Ungangena nangemvume kuzinhlelo zokusebenza futhi uqinisekise inkokhelo"</string>
+    <string name="multi_biometric_enroll_setup_with" msgid="421375792889910150">"Setha ukuvula nge:"</string>
+    <string name="multi_biometric_enroll_face_unlock_title" msgid="7627564065626355692">"I-face unlock"</string>
+    <string name="multi_biometric_enroll_face_unlock_description" msgid="7626442550602926682">"Yenza ukuvula iphoni yakho kube lula"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_title" msgid="3839935495273854171">"Izigxivizo zeminwe"</string>
+    <string name="multi_biometric_enroll_fingerprint_unlock_description" msgid="116938134430420778">"Yonga isikhathi ngokuvula ifoni ephaketheni lakho"</string>
+    <string name="multi_biometric_enroll_skip" msgid="7301215196571580858">"Yeqa"</string>
+    <string name="multi_biometric_enroll_next" msgid="6220680618102151619">"Okulandelayo"</string>
     <string name="security_settings_face_preference_summary" msgid="6675126437396914838">"Ubuso bungeziwe"</string>
     <string name="security_settings_face_preference_summary_none" msgid="3758209126322559995">"Setha i-face unlock"</string>
     <string name="security_settings_face_preference_title" msgid="821557938243856757">"I-Face unlock"</string>
@@ -329,6 +338,9 @@
     <string name="security_settings_face_enroll_education_title_unlock_disabled" msgid="8810954233979716906">"Sebenzisa ubuso bakho ukuze ufakazele ubuqiniso"</string>
     <string name="security_settings_face_enroll_education_message" msgid="4308030157487176799"></string>
     <string name="security_settings_face_enroll_education_start" msgid="8830924400907195590">"Qala"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message" msgid="4681495507974718824">"Uma i-face unlock yokufinyelela ivaliwe, ezinye izinyathelo zokusetha zingase zingasebenzi kahle nge-TalkBack."</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative" msgid="7872647360361245461">"Iya emuva"</string>
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive" msgid="3148077647572203458">"Qhubeka nokusetha"</string>
     <string name="security_settings_face_enroll_introduction_accessibility" msgid="5748221179069430975">"Sebenzisa ukusetha kokufinyelela"</string>
     <string name="security_settings_face_enroll_introduction_accessibility_expanded" msgid="6763509014732769185"></string>
     <string name="security_settings_face_enroll_introduction_accessibility_diversity" msgid="2774962371839179206"></string>
@@ -373,8 +385,9 @@
     <string name="security_settings_face_settings_require_confirmation_details" msgid="6454776517804994007">"Uma usebenzisa i-face unlock kuzinhlelo zokusebenza, hlala udinga isinyathelo sokuqinisekisa"</string>
     <string name="security_settings_face_settings_remove_face_data" msgid="6491161841504747384">"Susa idatha yobuso"</string>
     <string name="security_settings_face_settings_enroll" msgid="4656842124181309056">"Setha i-face unlock"</string>
-    <string name="security_settings_face_settings_footer" msgid="5545455769328594736">"Sebenzisa i-face unlock ukuze uvule idivayisi yakho, ungene ngemvume kuzinhlelo zokusebenza, uphinde uqinisekise izinkokhelo.\n\nKhumbula:\nUkubheka ifoni kungayivula uma ungahlosile ukwenza njalo.\n\nIfoni yakho ingavulwa omunye umuntu uma iphethwe ngasebusweni bakho.\n\nIfoni yakho ingavulwa omunye umuntu ofana kakhulu nawe, asithi isihlobo esifana nawe."</string>
-    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="4460565590744451205">"Sebenzisa i-face unlock ukuze uvule idivayisi yakho, ungene ngemvume kuzinhlelo zokusebenza, uphinde uqinisekise izinkokhelo.\n\nKhumbula:\nUkubheka ifoni kungayivula uma ungahlosile ukwenza njalo.\n\nIfoni yakho ingavulwa omunye umuntu uma iphakanyiselwe ebusweni bakho, nanoma amehlo akho avaliwe.\n\nIfoni yakho ingavulwa umuntu obukeka kakhulu njengawe, asithi, isihlobo esifanayo."</string>
+    <string name="security_settings_face_settings_top_intro" msgid="4199311264578653665">"Sebenzisa i-face unlock ukuvula idivayisi yakho, ukungena ngemvume kuzinhlelo zokusebenza, kanye nokuqinisekisa izinkokhelo."</string>
+    <string name="security_settings_face_settings_footer" msgid="4378074697208244539">"Khumbula:\nUkubheka ifoni kungayivula uma ungahlosile.\n\nIfoni yakho ingavulwa ngomunye umuntu uma ibanjelwe ebusweni bakho.\n\nIfoni yakho ingavulwa ngomunye umuntu obukeka njengawe, njengokuthi, owakini ofana nawe."</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported" msgid="5051230351151761265">"Khumbula:\nUkubheka ifoni kungayivula uma ungahlosile.\n\nIfoni yakho ingavulwa ngomunye umuntu uma ibanjelwe ebusweni bakho.\n\nIfoni yakho ingavulwa ngomunye umuntu obukeka njengawe, njengokuthi, owakini ofana nawe."</string>
     <string name="security_settings_face_settings_remove_dialog_title" msgid="2596803378375165362">"Susa idatha yobuso?"</string>
     <string name="security_settings_face_settings_remove_dialog_details" msgid="3458998128212675289">"Idatha yobuso esetshenziswe i-face unlock izosuswa unaphakade futhi ngokuphephile. Ngemuva kokususwa, uzodinga iphinikhodi, iphethini, noma iphasiwedi ukuze uvule ifoni yakho, ungene ngemvume kuzinhlelo zokusebenza, uphinde uqinisekise izinkokhelo."</string>
     <string name="security_settings_face_settings_context_subtitle" msgid="9197485417007952865">"Sebenzisa i-face unlock ukuze uvule ifoni yakho"</string>
@@ -394,6 +407,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="8957789840251747092">"Sebenzisa isigxivizo zomunwe zakho ukuze uvule ifoni yakho noma uvume ukuthenga.\n\nInothi: Awukwazi ukusebenzisa isigxivizo somunwe ukuvula le divayisi. Ngolwazi olubanzi, xhumana nomlawuli wenhlangano yakho."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="5979556434735281585">"Sebenzisa izigxivizo zeminwe zakho ukuvula ifoni yakho noma uvume ukuthenga.\n\nInothi: Isigxivizo sakho somunwe singaphepha kancane kunephethini eqinile nomai-PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="6086532316718920562">"Khansela"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks" msgid="6104718999323591180">"Cha ngiyabonga"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="5683573189775460816">"Qhubeka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="370010932190960403">"Yeqa"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="7155412679784724630">"Okulandelayo"</string>
@@ -431,6 +445,9 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="tablet" msgid="7387535629289108475">"Ngokuvikela ithebulethi yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ilahleka noma intshontshwa. Futhi udinga inketho yokukhiya isikrini ukuze usethe i-face unlock. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="device" msgid="4995287019957131123">"Ngokuvikela idivayisi yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ingalahleka noma intshontshwe. Futhi udinga inketho yokukhiya isikrini ukuze usethe i-face unlock. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
     <string name="face_lock_screen_setup_skip_dialog_text" product="default" msgid="7086796722966738156">"Ngokuvikela ifoni yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ilahlekile noma intshontshiwe. Futhi udinga inketho yokukhiya isikrini ukuze usethe i-face unlock. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet" msgid="3943278149639587227">"Ngokuvikela ithebulethi yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ilahleka noma intshontshwa. Usadinga nenketho yokukhiya isikrini ukuze usethe i-biometrics. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device" msgid="5424064454068220988">"Ngokuvikela idivayisi yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ingalahleka noma intshontshwe. Usadinga nenketho yokukhiya isikrini ukuze usethe i-biometrics. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default" msgid="5668256546179188638">"Ngokuvikela ifoni yakho ngenketho yokukhiya isikrini, akekho ozokwazi ukuyisebenzisa uma ilahlekile noma intshontshiwe. Usadinga nenketho yokukhiya isikrini ukuze usethe i-biometrics. Ukuze ubuyele emuva, thepha okuthi Khansela."</string>
     <string name="lock_screen_pin_skip_title" msgid="6853866579893458111">"Yeqa ukusetha i-PIN?"</string>
     <string name="lock_screen_password_skip_title" msgid="8891463713793185768">"Yeqa ukusetha iphasiwedi?"</string>
     <string name="lock_screen_pattern_skip_title" msgid="7214938393640060932">"Yeqa ukusetha iphethini?"</string>
@@ -503,8 +520,7 @@
     <string name="setup_lock_settings_picker_message" product="tablet" msgid="4870877800737248926">"Vimbela abanye kusukela ekusebenziseni le thebulethi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukusisebenzisa."</string>
     <string name="setup_lock_settings_picker_message" product="device" msgid="8961855222808442301">"Vimbela abanye kusukela ekusebenziseni le divayisi ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
     <string name="setup_lock_settings_picker_message" product="default" msgid="8867435145945818970">"Vimbela abanye kusukela ekusebenziseni le foni ngaphandle kwemvume yakho ngokwenza kusebenze izici zokuvikela idivayisi. Khetha ukukhiya isikrini ofuna ukukusebenzisa."</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="6414674538453498900">"Khetha indlela yokukhiya isikrini yakho yokwenza isipele"</string>
-    <string name="lock_settings_picker_face_message" msgid="2044129433641084149">"Khetha indlela yokukhiya isikrini yakho yokwenza isipele"</string>
+    <string name="lock_settings_picker_biometric_message" msgid="2609666443527262781">"Khetha indlela yokukhiya isikrini yakho eyikhophi yasenqolobaneni"</string>
     <string name="setup_lock_settings_options_button_label" msgid="6098297461618298505">"Izinketho zokukhiya isikrini"</string>
     <string name="setup_lock_settings_options_dialog_title" msgid="7985107300517468569">"Izinketho zokukhiya isikrini"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="4981063601772605609">"Isikrini sivaliwe."</string>
@@ -536,6 +552,11 @@
     <string name="face_unlock_set_unlock_password" msgid="8612535943511761549">"I-Face unlock + Iphasiwedi"</string>
     <string name="face_unlock_skip_face" msgid="7117201898540606846">"Qhubeka ngaphandle kwe-face unlock"</string>
     <string name="face_unlock_title" msgid="7344830351598247267">"Ungavula ifoni yakho usebenzisa ubuso bakho. Ngokuvikeleka, le nketho idinga isikrini sokukhiya esenziwe isipele."</string>
+    <string name="biometrics_unlock_set_unlock_pattern" msgid="8871485472202659">"I-Biometrics + Iphethini"</string>
+    <string name="biometrics_unlock_set_unlock_pin" msgid="1729940978662427512">"I-Biometrics + Iphinikhodi"</string>
+    <string name="biometrics_unlock_set_unlock_password" msgid="5368133215008755916">"I-Biometrics + Iphasiwedi"</string>
+    <string name="biometrics_unlock_skip_biometrics" msgid="8260715582785687329">"Qhubeka ngaphandle kwe-biometrics"</string>
+    <string name="biometrics_unlock_title" msgid="7769374223959937435">"Ungavula ifoni yakho usebenzisa i-biometrics yakho. Ngokuphepha, le nketho idinga ukukhiya kwesikrini kwekhophi yasenqolobaneni."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="4022867760387966129">"Kukhutshazwe umlawuli, inqubomgomo yokubethela, noma isitoreji sezitifiketi"</string>
     <string name="unlock_set_unlock_mode_off" msgid="4632139864722236359">"Lutho"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5596049938457028214">"Swayipha"</string>
@@ -619,7 +640,6 @@
       <item quantity="other">Kufanele kube amadijithi angaphansi kuka-<xliff:g id="NUMBER_1">%d</xliff:g></item>
     </plurals>
     <string name="lockpassword_pin_recently_used" msgid="6650277060998923465">"Umlawuli wedivayisi akavumeli ukusebenzisa iphinikhodi yakamuva"</string>
-    <string name="lockpassword_pin_blacklisted_by_admin" msgid="115994274880232984">"Ama-PIN avamile avinjelwe umlawuli wakho we-IT. Zama i-PIN ehlukile."</string>
     <string name="lockpassword_illegal_character" msgid="3434031212215886433">"Lokhu akukwazi ukufana uhlamvu olungavumelekile"</string>
     <string name="lockpassword_password_requires_alpha" msgid="721084100957669018">"Kumele iqukathe okungenani uhlamvu olulodwa"</string>
     <string name="lockpassword_password_requires_digit" msgid="312518567592683795">"Kumele iqukathe okungenani idijithi eyodwa"</string>
@@ -653,7 +673,6 @@
       <item quantity="other">Kumele iqukathe okungenani izinhlamvu ezingasizo izinombolo ezingu-<xliff:g id="COUNT">%d</xliff:g></item>
     </plurals>
     <string name="lockpassword_password_recently_used" msgid="5341218079730167191">"Umlawuli wedivayisi akavumeli ukusebenzisa iphasiwedi yakamuva"</string>
-    <string name="lockpassword_password_blacklisted_by_admin" msgid="8956110268546396737">"Amaphasiwedi avamile avinjelwe umlawuli wakho we-IT. Zama iphasiwedi ehlukile."</string>
     <string name="lockpassword_pin_no_sequential_digits" msgid="5843639256988031272">"Ukwenyuka, ukwehla, noma uchungechunge olwehlayo lamadijithi alivunyewe"</string>
     <string name="lockpassword_confirm_label" msgid="560897521093566777">"Qinisekisa"</string>
     <string name="lockpassword_cancel_label" msgid="6711112212489992112">"Khansela"</string>
@@ -795,7 +814,7 @@
     <string name="wifi_quick_toggle_title" msgid="2737097538432862807">"I-Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="4957267477820468553">"Vula i-Wi-Fi"</string>
     <string name="wifi_settings" msgid="8313301946393559700">"I-Wi-Fi"</string>
-    <string name="wifi_settings_master_switch_title" msgid="6043556596728888">"Sebenzisa i-Wi-Fi"</string>
+    <string name="wifi_settings_primary_switch_title" msgid="628360786662947258">"Sebenzisa i-Wi-Fi"</string>
     <string name="wifi_settings_category" msgid="3523464780563778321">"Izilungiselelo ze-Wi-Fi"</string>
     <string name="wifi_settings_title" msgid="3879649725059512799">"I-Wi-Fi"</string>
     <string name="wifi_settings_summary" msgid="784074686763572811">"Hlela, uphathe izindawo zokungena ezingenantambo"</string>
@@ -903,7 +922,7 @@
     <string name="wifi_dpp_scan_qr_code_join_network" msgid="969985020363459133">"Misa phakathi nendawo ikhodi ye-QR ngaphansi ukuze uxhumeke ku-“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_qr_code_join_unknown_network" msgid="3180020429793614145">"Joyina i-Wi‑Fi ngokuskena ikhodi ye-QR"</string>
     <string name="wifi_dpp_share_wifi" msgid="2431744447544057866">"Yaba i-Wi‑Fi"</string>
-    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="4405316188694088689">"Skena le khodi ye-QR ukuze uxhumeke ku-“<xliff:g id="SSID">%1$s</xliff:g>” uphinde wabelane ngephasiwedi"</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device" msgid="6967364080214325016">"Skena le khodi ye-QR ngenye idivayisi ukuze ujoyine i-“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device" msgid="5398619697898444311">"Skena le khodi ye-QR ukuze ixhumeke ku-“<xliff:g id="SSID">%1$s</xliff:g>”"</string>
     <string name="wifi_dpp_failure_authentication_or_configuration" msgid="847551626830740204">"Zama futhi. Uma inkinga iqhubeka, xhumana nomkhiqizi wedivayisi"</string>
     <string name="wifi_dpp_failure_not_compatible" msgid="4453775826337805825">"Okuthile akuhambanga kahle"</string>
@@ -929,8 +948,7 @@
     <string name="wifi_dpp_wifi_password" msgid="4992986319806934381">"Iphasiwedi ye-Wi‑Fi: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_dpp_hotspot_password" msgid="688464342650820420">"Iphasiwedi ye-hotspot: <xliff:g id="PASSWORD">%1$s</xliff:g>"</string>
     <string name="wifi_auto_connect_title" msgid="1890342051674657892">"Ukuxhumeka okuzenzakalelayo"</string>
-    <string name="wifi_auto_connect_summary" product="default" msgid="5383749408911542382">"Vumela ifoni ukuba ixhume ngokuzenzakalelayo eduze nale nethiwekhi"</string>
-    <string name="wifi_auto_connect_summary" product="tablet" msgid="5209799194164396401">"Vumela ithebulethi ukuba ixhume ngokuzenzakalelayo eduze nale nethiwekhi"</string>
+    <string name="wifi_auto_connect_summary" msgid="1707702705345670370">"Vumela ukuxhumeka kule nethiwekhi uma ikubanga"</string>
     <string name="wifi_dpp_add_device" msgid="8695656122114721335">"Engeza idivayisi"</string>
     <string name="wifi_dpp_connect_network_using_qr_code" msgid="6975258007798254937">"Sebenzisa ikhodi ye-QR ukuze ungeze idivayisi kule nethiwekhi"</string>
     <string name="wifi_dpp_qr_code_is_not_valid_format" msgid="5190689503019328279">"Ikhodi ye-QR ayiyona ifomethi evumelekile"</string>
@@ -942,7 +960,6 @@
     <string name="wifi_use_system_certs" msgid="5587866698144996931">"Sebenzisa izitifiketi zesistimu"</string>
     <string name="wifi_do_not_provide_eap_user_cert" msgid="6336636553673065145">"Unganikezeli"</string>
     <string name="wifi_do_not_validate_eap_server" msgid="4673867078988209732">"Ungaqinisekisi"</string>
-    <string name="wifi_do_not_validate_eap_server_warning" msgid="5741728006175181647">"Asikho isitifiketi esicacisiwe. Ukuxhumeka kwakho ngeke kube yimfihlo."</string>
     <string name="wifi_ssid_too_long" msgid="5961719058705013875">"Igama lenethiwekhi lide kakhulu."</string>
     <string name="wifi_no_domain_warning" msgid="1452133316532366772">"Kumele icacise isizinda."</string>
     <string name="wifi_no_user_cert_warning" msgid="8466376918835248956">"Isitifiketi siyadingeka."</string>
@@ -969,6 +986,7 @@
     <string name="wifi_connect" msgid="2481467560349907397">"Xhuma kwi-inthanethi"</string>
     <string name="wifi_turned_on_message" msgid="8069855406962662881">"I-Wi-Fi ivuliwe"</string>
     <string name="wifi_connected_to_message" msgid="8976048616505112896">"Ixhumeke ku-<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
+    <string name="wifi_connecting_to_message" msgid="3153205024060064551">"Ixhuma ku-<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_connecting" msgid="7450277833386859724">"Iyaxhuma…"</string>
     <string name="wifi_failed_connect_message" msgid="8538000546604347894">"Yehlulekile ukuxhuma kunethiwekhi"</string>
     <string name="wifi_not_in_range_message" msgid="3885327464037574739">"Inethiwekhi ayikho kubanga"</string>
@@ -996,6 +1014,7 @@
     <string name="wifi_advanced_ssid_title" msgid="1561437650193980185">"I-SSID"</string>
     <string name="wifi_advanced_device_mac_address_title" msgid="6155800851233164411">"Ikheli le-MAC ledivayisi"</string>
     <string name="wifi_advanced_randomized_mac_address_title" msgid="3930671320234553088">"Ikheli le-MAC elingahleliwe"</string>
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title" msgid="2755843130417523727">"Ikheli le-MAC elingahleliwe (ligcine ukusetshenziswa)"</string>
     <string name="wifi_advanced_ip_address_title" msgid="4265355419782184514">"Ikheli le-IP"</string>
     <string name="wifi_details_title" msgid="222735438574597493">"Imininingwane yenethiwekhi"</string>
     <string name="wifi_details_subnet_mask" msgid="1619151769276260512">"Imaski ye-subnet"</string>
@@ -1003,8 +1022,7 @@
     <string name="wifi_details_ipv6_address_header" msgid="1913151339341722443">"Amakheli e-IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="5691340724310548151">"Amanethiwekhi alondoloziwe"</string>
     <string name="wifi_subscribed_access_points_tab" msgid="7224061396195667208">"Okubhalisiwe"</string>
-    <!-- no translation found for wifi_saved_access_points_tab (2075914709522121708) -->
-    <skip />
+    <string name="wifi_saved_other_networks_tab" msgid="7942647415716557293">"Amanye amanethiwekhi"</string>
     <string name="wifi_advanced_settings_label" msgid="5880605751602184383">"Izilungiselelo ze-IP"</string>
     <string name="wifi_advanced_not_available" msgid="8701003884367299092">"Izilungiselelo ezithuthukisiwe ze-Wi‑Fi azitholakaleli lo msebenzisi"</string>
     <string name="wifi_ip_settings_menu_save" msgid="5190481040428567106">"Londoloza"</string>
@@ -1013,8 +1031,8 @@
     <string name="wifi_ip_settings_invalid_gateway" msgid="1174931247370931239">"Sicela uthayiphe ikheli le-IP elilungile."</string>
     <string name="wifi_ip_settings_invalid_dns" msgid="1757402215999845975">"Sicela uthayiphe ikheli le-IP elilungile."</string>
     <string name="wifi_ip_settings_invalid_network_prefix_length" msgid="5980808986926987299">"Sicela uthayiphe ubude bephrifiksi yenethiwekhi phakathi kuka-0 no-32."</string>
-    <string name="wifi_dns1" msgid="6462967242512284778">"DNS 1"</string>
-    <string name="wifi_dns2" msgid="8494337355389723965">"DNS 2"</string>
+    <string name="wifi_dns1" msgid="6764769531843748514">"DNS 1 (ngaphandle kwalapho uma ikhishwe yi-DNS Eyimfihlo)"</string>
+    <string name="wifi_dns2" msgid="7273133202625326148">"DNS 2 (ngaphandle kwalapho uma ikhishwe yi-DNS Eyimfihlo)"</string>
     <string name="wifi_gateway" msgid="3699227808616416759">"Indlela yokuphuma"</string>
     <string name="wifi_network_prefix_length" msgid="1003365439352276622">"Ubude begama eliqalayo lenethiwekhi"</string>
     <string name="wifi_p2p_settings_title" msgid="1689918226469221870">"I-Wi-Fi eqondile"</string>
@@ -1040,7 +1058,7 @@
     <string name="wifi_hotspot_on_local_only_subtext" msgid="965051079784031636">"Uhlelo lokusebenza labelana ngokuqukethwe. Ukuze wabelane ngoxhumo lwe-inthanethi, vala i-hotspot, bese uyivule"</string>
     <string name="wifi_hotspot_no_password_subtext" msgid="3685689196772398783">"Ayikho iphasiwedi esethiwe"</string>
     <string name="wifi_hotspot_name_title" msgid="6633480190014369846">"Igama le-Hotspot"</string>
-    <string name="wifi_hotspot_name_summary_connecting" msgid="6178719924661022928">"Ivula i-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>..."</string>
+    <string name="wifi_hotspot_name_summary_connecting" msgid="2094754115215428892">"Ivula i-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>…"</string>
     <string name="wifi_hotspot_name_summary_connected" msgid="6935457127884928249">"Amanye amadivayisi angaxhuma ku-<xliff:g id="WIFI_HOTSPOT_NAME">%1$s</xliff:g>"</string>
     <string name="wifi_hotspot_password_title" msgid="9096340919454296786">"Iphasiwedi ye-Hotspot"</string>
     <string name="wifi_hotspot_ap_band_title" msgid="560262446129195042">"I-AP Band"</string>
@@ -1190,7 +1208,7 @@
     <string name="display_white_balance_summary" msgid="7625456704950209050"></string>
     <string name="peak_refresh_rate_title" msgid="1878771412897140903">"Isibonisi esibushelelezi"</string>
     <string name="peak_refresh_rate_summary" msgid="1527087897198455042">"Iphakamisa ngokuzenzakalela isilinganiso sokuvuselela kusukela kokungu-60 ukuya kokungu-90 Hz kokunye okuqukethwe. Ikhuphula ukusetshenziswa kwebhethri."</string>
-    <string name="force_high_refresh_rate_toggle" msgid="7458268305727889355">"Isibonisi esibushelelezi"</string>
+    <string name="force_high_refresh_rate_toggle" msgid="5861514655252832828">"Phoqa inani lokuvuselela elingu-90 Hz"</string>
     <string name="force_high_refresh_rate_desc" msgid="7794566420873814875">"Inani lokuvuselela eliphezulu kakhulu lokuphendula kokuthinta okuthuthukisiwe nekhwalithi yokugqwayiza. Ikhuphula ukusetshenziswa kwebhethri."</string>
     <string name="adaptive_sleep_title" msgid="2987961991423539233">"Ukunaka isikrini"</string>
     <string name="adaptive_sleep_summary_on" msgid="313187971631243800">"Kuvuliwe / Isikrini ngeke size sivaleke uma usibhekile"</string>
@@ -1281,6 +1299,7 @@
     <string name="doze_summary" msgid="8252867381522942804">"Uma isikrini simnyama, sizokhanya ngokuqondene nesaziso ezintsha"</string>
     <string name="doze_always_on_title" msgid="7326245192352868477">"Bonisa njalo isikhathi nolwazi"</string>
     <string name="doze_always_on_summary" msgid="509097829739647852">"Ukusebenza kwebhethri kukhulisiwe"</string>
+    <string name="force_bold_text" msgid="3636373986786504634">"Umbhalo Ogqamile"</string>
     <string name="title_font_size" msgid="570613010306330622">"Usayizi wefonti"</string>
     <string name="short_summary_font_size" msgid="184712645848458143">"Yenza umbhalo ube mkhulu noma ube mncane"</string>
     <string name="sim_lock_settings" msgid="4493069398250139205">"Izilungiselelo zokuvala ikhadi le-SIM"</string>
@@ -1329,7 +1348,6 @@
     <string name="firmware_version" msgid="1606901586501447275">"Inguqulo ye-Android"</string>
     <string name="security_patch" msgid="4071756145347865382">"Isibuyekezo sokuvikela kwe-Android"</string>
     <string name="model_info" msgid="8997566254717810904">"Imodeli"</string>
-    <string name="model_summary" msgid="2246651782442466213">"Imodeli: %1$s"</string>
     <string name="hardware_info" msgid="7035211991066637019">"Imodeli nezingxenyekazi zekhompuyutha"</string>
     <string name="hardware_revision" msgid="3454709180861965025">"Inguqulo yezingxenyekazi zekhompuyutha"</string>
     <string name="fcc_equipment_id" msgid="6596668314025646129">"I-ID yempahla"</string>
@@ -1579,7 +1597,7 @@
     <string name="menu_delete" msgid="9199740901584348273">"Susa i-APN"</string>
     <string name="menu_new" msgid="6571230342655509006">"I-APN Entsha"</string>
     <string name="menu_save" msgid="6611465355127483100">"Londoloza"</string>
-    <string name="menu_cancel" msgid="4526003389139913077">"Lahla"</string>
+    <string name="menu_cancel" msgid="1197826697950745335">"Khansela"</string>
     <string name="error_title" msgid="7158648377702417716"></string>
     <string name="error_name_empty" msgid="1258275899283079142">"Igama lenkundla akumelwe lingabi nalutho."</string>
     <string name="error_apn_empty" msgid="7657491065443746915">"I-APN akumelwe ingabi nalutho."</string>
@@ -1594,8 +1612,9 @@
     <string name="reset_dashboard_summary_onlyApps" msgid="3304252260039419584">"Izinhlelo zokusebenza zingasethwa kabusha"</string>
     <string name="reset_network_title" msgid="1395494440355807616">"Setha kabusha i-Wi-Fi, iselula ne-Bluetooth"</string>
     <string name="reset_network_desc" msgid="1112523764899788246">"Lokhu kuzosetha kabusha zonke izilungiselelo zenethiwekhi ezifaka:\n\n"<li>"i-Wi‑Fi"</li>\n<li>"Idatha yeselula"</li>\n<li>"ne-Bluetooth"</li></string>
+    <string name="erase_euicc_data_button" msgid="728078969563311737">"Sula"</string>
     <string name="reset_esim_title" msgid="6152167073280852849">"Sula ama-SIM alandiwe"</string>
-    <string name="reset_esim_desc" msgid="4256518544336245086">"Ukuze ulande ama-SIM okubekwa, xhumana nenkampani yakho yenethiwekhi. Lokhu ngeke kukhansele noma iziphi izinhlelo zesevisi yeselula"</string>
+    <string name="reset_esim_desc" msgid="3662444090563399131">"Lokhu ngeke kukhansele noma yiziphi izinhlelo zesevisi yeselula. Ukuze ulande okokumisela ama-SIM, xhumana nenkampani yakho yenethiwekhi."</string>
     <string name="reset_network_button_text" msgid="2281476496459610071">"Setha kabusha izilungiselelo"</string>
     <string name="reset_network_final_desc" msgid="5304365082065278425">"Setha kabusha zonke izilungiselelo zenethiwekhi? Awukwazi ukuhlehlisa lesi senzo."</string>
     <string name="reset_network_final_desc_esim" msgid="8342882682282693844">"Setha kabusha zonke izilungiselelo zenethiwekhi uphinde usule ama-SMS alandiwe? Awukwazi ukuhlehlisa lesi senzo."</string>
@@ -1605,31 +1624,29 @@
     <string name="reset_network_complete_toast" msgid="1367872474130621115">"Izilungiselelo zenethiwekhi zisethwe kabusha"</string>
     <string name="reset_esim_error_title" msgid="4670073610967959597">"Ayikwazi ukusula ama-SIM"</string>
     <string name="reset_esim_error_msg" msgid="4441504470684307370">"Ama-SIM alandiwe awakwazi ukusulwa ngenxa yephutha.\n\nQala kabusha idivayisi yakho uphinde uzame futhi."</string>
-    <string name="master_clear_title" msgid="5309249309235959383">"Sula yonke idatha (ukusethwa kabusha kwasekuqaleni)"</string>
-    <string name="master_clear_short_title" msgid="5331449583601739360">"Sula yonke idatha (ukusethwa kabusha kwasekuqaleni)"</string>
-    <string name="master_clear_desc" product="tablet" msgid="3114467865487750525">"Lokhu kuzosusa yonke idatha kusukela "<b>"kusitoreji sangaphakathi"</b>" sethebulethi yakho, okufaka:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Idatha yesistimu neyohlelo lokusebenza neyezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilandiwe"</li></string>
-    <string name="master_clear_desc" product="default" msgid="8447637796694856323">"Lokhu kuzosusa yonke idatha kusukela "<b>"kusitoreji  sangaphakathi"</b>" sefoni yakho, okufaka:\n\n"<li>"I-akhawunti yakho ye-Google"</li>\n<li>"Idatha yesistimu neyohlelo lokusebenza nezilungiselelo"</li>\n<li>"Izinhlelo zokusebenza ezilandiwe"</li></string>
-    <string name="master_clear_accounts" product="default" msgid="142220980039357651">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:\n\n"</string>
-    <string name="master_clear_other_users_present" product="default" msgid="7492338002408466023">\n\n"Kukhona abanye abasebenzisi abakhona kule divayisi.\n"</string>
-    <string name="master_clear_desc_also_erases_external" msgid="4738661805356792736"><li>"Umculo"</li>\n<li>"Izithombe"</li>\n<li>"Enye idatha yomsebenzisi"</li></string>
-    <string name="master_clear_desc_also_erases_esim" msgid="6418163562288667727">"Ama"<li>"eSIM"</li></string>
-    <string name="master_clear_desc_no_cancel_mobile_plan" msgid="3112614935795369143">\n\n"Lokhu ngeke kukhansele uhlelo lwakho lwesevisi yefoni."</string>
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7088655731755912201">\n\n"Ukusula futhi umculo, izithombe, nenye idatha yomsebenzisi, "<b>" indawo yokugcina ye-USB"</b>"idinga ukusulwa."</string>
-    <string name="master_clear_desc_erase_external_storage" product="default" msgid="4145566517710675883">\n\n"Ukusula umculo, izithombe, nenye imininingo yomsebenzisi, "<b>"ikhadi le-SD"</b>"kumele lisuswe."</string>
+    <string name="main_clear_title" msgid="277664302144837723">"Sula yonke idatha (ukusethwa kabusha njengasekuqaleni)"</string>
+    <string name="main_clear_short_title" msgid="4752094765533020696">"Sula yonke idatha (ukusethwa kabusha njengasekuqaleni)"</string>
+    <string name="main_clear_desc" product="tablet" msgid="1651178880680056849">"Lokhu kuzosusa yonke idatha "<b>"ekusitoreji sangaphakathi"</b>" sethebulethi yakho, kuhlanganise:\n\n"<li>"I-Akhawunti yakho ye-Google"</li>\n<li>"Idatha yesistimu neyohlelo lokusebenza namasethingi"</li>\n<li>"Izinhlelo zokusebenza ezilandiwe"</li></string>
+    <string name="main_clear_desc" product="default" msgid="6984348811887162647">"Lokhu kuzosusa yonke idatha "<b>"ekusitoreji sangaphakathi"</b>" sefoni yakho, kuhlanganise:\n\n"<li>"I-Akhawunti yakho ye-Google"</li>\n<li>"Idatha yesistimu neyohlelo lokusebenza namasethingi"</li>\n<li>"Izinhlelo zokusebenza ezilandiwe"</li></string>
+    <string name="main_clear_accounts" product="default" msgid="7675859115108318537">\n"Okwamanje ungene ngemvume kuma-akhawunti alandelayo:\n\n"</string>
+    <string name="main_clear_other_users_present" product="default" msgid="2672976674798019077">\n\n"Kukhona abanye abasebenzisi abakhona kule divayisi.\n"</string>
+    <string name="main_clear_desc_also_erases_external" msgid="3687911419628956693"><li>"Umculo"</li>\n<li>"Izithombe"</li>\n<li>"Idatha yomunye umsebenzisi"</li></string>
+    <string name="main_clear_desc_also_erases_esim" msgid="4553469876411831729">"Ama-"<li>"eSIM"</li></string>
+    <string name="main_clear_desc_no_cancel_mobile_plan" msgid="369883568059127035">\n\n"Lokhu ngeke kukhansele uhlelo lwakho lwesevisi yefoni."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard" msgid="4441604184663452046">\n\n"Ukuze usule umculo, izithombe, nedatha yomunye umsebenzisi, "<b>"isitoreji se-USB"</b>"kudingeka sisulwe."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default" msgid="1498514970618215728">\n\n"Ukuze usule umculo, izithombe, nedatha yomunye umsebenzisi, "<b>"ikhadi le-SD"</b>"kudingeka isuswe."</string>
     <string name="erase_external_storage" product="nosdcard" msgid="2182181846128639635">"Susa isitoreji se-USB"</string>
     <string name="erase_external_storage" product="default" msgid="2610056855012660451">"Sula ikhadi le-SD"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="6358699244894944843">"Sula yonke idatha ekusitoreji se-USB , njengomculo noma izithombe."</string>
     <string name="erase_external_storage_description" product="default" msgid="3367779850546310380">"Sula yonke idatha ekhadini le-SD, njengomculo noma izithombe"</string>
-    <string name="master_clear_button_text" product="tablet" msgid="3554085992851027633">"Sula yonke idatha"</string>
-    <string name="master_clear_button_text" product="default" msgid="3554085992851027633">"Sula yonke idatha"</string>
-    <string name="master_clear_final_desc" msgid="5218005891800878932">"Lonke ulwazi lwakho lomuntu siqu nezinhlelo zokusebenza ezilandiwe zizosuswa. Awukwazi ukuhlehlisa lesi senzo."</string>
-    <string name="master_clear_final_desc_esim" msgid="3570139379312933326">"Lonke ulwazi lwakho lomuntu siqu, olufaka izinhlelo zokusebenza ezilandiwe nama-SIM, luzosuswa. Awukwazi ukuhlehlisa lesi senzo."</string>
-    <string name="master_clear_final_button_text" msgid="1721164700940719292">"Sula yonke into"</string>
-    <string name="master_clear_failed" msgid="6458678864313618526">"Akukho ukusetha kabusha okwenziwe ngoba isevisi Yokwesula Isistimu ayitholakali."</string>
-    <string name="master_clear_confirm_title" msgid="632482173088680058">"Sula yonke idatha?"</string>
-    <string name="master_clear_not_available" msgid="3419345724070828273">"Ukusetha kabusha kwasekuqaleni akutholakaleli lo msebenzisi"</string>
-    <string name="master_clear_progress_title" msgid="480032747847804624">"Iyasula"</string>
-    <string name="master_clear_progress_text" msgid="8891964820486632180">"Sicela ulinde..."</string>
+    <string name="main_clear_button_text" product="tablet" msgid="6246087475569640671">"Sula yonke idatha"</string>
+    <string name="main_clear_button_text" product="default" msgid="6246087475569640671">"Sula yonke idatha"</string>
+    <string name="main_clear_final_desc" msgid="5800877928569039580">"Lonke ulwazi lwakho lomuntu siqu nezinhlelo zokusebenza ezilandiwe zizosuswa. Awukwazi ukuhlehlisa lesi senzo."</string>
+    <string name="main_clear_final_desc_esim" msgid="440406836793824969">"Lonke ulwazi lwakho lomuntu siqu, kuhlanganise nezinhlelo zokusebenza ezilandiwe nama-SIM, kuzosuswa. Awukwazi ukuhlehlisa lesi senzo."</string>
+    <string name="main_clear_confirm_title" msgid="6577071819657853713">"Sula yonke idatha?"</string>
+    <string name="main_clear_not_available" msgid="3433795327146684827">"Ukusetha kabusha kwasekuqaleni akutholakaleli lo msebenzisi"</string>
+    <string name="main_clear_progress_title" msgid="7239741132015617719">"Iyasula"</string>
+    <string name="main_clear_progress_text" msgid="4636695115176327972">"Sicela ulinde…"</string>
     <string name="call_settings_title" msgid="2531072044177194164">"Izilungiselelo zekholi"</string>
     <string name="call_settings_summary" msgid="8244293779053318053">"Hlela ivoyisimeyili, ukudlulisa ikholi, ikholi elindile, i-ID yomshayeli"</string>
     <string name="tether_settings_title_usb" msgid="5926474044238409099">"Imodemu nge-USB"</string>
@@ -1677,7 +1694,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="5292358672240161566">"Ayikwazi ukusebenzisa amadivaysi adlula angu-<xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="5087548945727762308">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngeke kusebenziswe ifoni njengemodemu"</string>
     <string name="ethernet_tether_checkbox_text" msgid="959743110824197356">"Ukusebenzisa ifoni njengemodemu kwe-ethernet"</string>
-    <string name="ethernet_tethering_subtext" product="default" msgid="7573587396552412231">"Yabelana ngokuxhumeka kwe-inthanethi kwefoni nge-USB Ethernet"</string>
+    <string name="ethernet_tethering_subtext" product="default" msgid="5998100693350351694">"Yabelana ngokuxhumeka kwe-inthanethi kwefoni nge-Ethernet"</string>
     <string name="tethering_footer_info" msgid="6782375845587483281">"Sebenzisa i-hotspot nefoni njengemodemu ukuze unikeze i-inthanethi kumanye amadivayisi ngokuxhumeka kwakho kwedatha yeselula. Izinhlelo zokusebenza nazo zingadala i-hotspot ukwabelana nokuqukethwe namadivayisi aseduze."</string>
     <string name="tethering_footer_info_sta_ap_concurrency" msgid="2079039077487477676">"Sebenzisa i-hotspot nokusebenzisa ifoni njengemodemu ukuze unikeze i-inthanethi kumanye amadivayisi nge-Wi-Fi yakho noma ukuxhumeka kwedatha kweselula. Izinhlelo zokusebenza zingaphinda zidale i-hotspot ukuze zabelane ngokuqukethwe namadivayisi aseduze."</string>
     <string name="tethering_help_button_text" msgid="2823655011510912001">"Usizo"</string>
@@ -1719,6 +1736,15 @@
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="1809309545730215891">"Ukuskena kwe-Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="5362988856388462841">"Vumela izinhlelo zokusebenza namasevisi ukuthi askenele amadivayisi aseduze noma kunini, nanoma i-Bluetooth ivaliwe. Lokhu kungasetshenziselwa, njengesibonelo, ukuthuthukisa izici ezisuselwa endaweni namasevisi."</string>
     <string name="managed_profile_location_services" msgid="8172092734138341880">"Amasevisi endawo omsebenzi"</string>
+    <string name="location_time_zone_detection_screen_title" msgid="8396625087466311625">"Ukutholwa kwendawo yezoni yesikhathi"</string>
+    <string name="location_time_zone_detection_enabled_title" msgid="1195178875042989835">"Ukutholwa kwendawo yezoni yesikhathi"</string>
+    <string name="location_time_zone_detection_enabled_description" msgid="1064716900984397624">"Kuvumela indawo yedivayisi ukuba isetshenziselwe ukuthola izoni yesikhathi samanje. Amanye amasethingi endawo njengokuskena kwe-Wi-Fi angathinta ukunemba kokutholwa kwezoni yesikhathi."</string>
+    <string name="location_time_zone_detection_on" msgid="5514817179120761597">"Vuliwe"</string>
+    <string name="location_time_zone_detection_off" msgid="192427076195667079">"Valiwe"</string>
+    <string name="location_time_zone_detection_auto_is_off" msgid="8067073548483627695">"Ukutholwa okuzenzakalelayo kwendawo yesikhathi kukhutshaziwe"</string>
+    <string name="location_time_zone_detection_not_applicable" msgid="6757964612836952714">"Ukutholwa kwendawo yezoni yesikhathi kukhutshaziwe"</string>
+    <string name="location_time_zone_detection_not_supported" msgid="3251181656388306501">"Ukutholwa kwendawo yezoni yesikhathi akusekelwe"</string>
+    <string name="location_time_zone_detection_not_allowed" msgid="8264525161514617051">"Izinguquko zokutholwa kwendayo yezoni yesikhathi azivunyelwe"</string>
     <string name="location_network_based" msgid="5247042890080021887">"I-Wi-Fi nendawo yenethiwekhi yeselula"</string>
     <string name="location_neighborhood_level" msgid="3668890550358558267">"Vumela izinhlelo zokusebenza zisebenzise isevisi yendawo yakwa-Google ukucabangela indawo yakho ngokushesha. Idatha yendawo engaziwa izoqoqwa futhi ithunyelwe kwa-Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="6227393490651891977">"Indawo etholwe i-Wi-Fi"</string>
@@ -1782,6 +1808,9 @@
     <string name="lockpassword_choose_your_password_header_for_face" msgid="5359649947642749079">"Ukuze usebenzise i-face unlock, setha iphasiwedi"</string>
     <string name="lockpassword_choose_your_pattern_header_for_face" msgid="9220480399170764760">"Ukuze usebenzise i-face unlock, setha iphethini"</string>
     <string name="lockpassword_choose_your_pin_header_for_face" msgid="2285401208117502869">"Ukuze usebenzise i-face unlock, setha iphinikhodi"</string>
+    <string name="lockpassword_choose_your_password_header_for_biometrics" msgid="9091792721166354172">"Ukuze usebenzise i-biometrics, setha iphasiwedi"</string>
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics" msgid="4949972592985176347">"Ukuze usebenzise i-biometrics, setha iphethini"</string>
+    <string name="lockpassword_choose_your_pin_header_for_biometrics" msgid="4215367936503271941">"Ukuze usebenzise i-biometrics, setha Iphinikhodi"</string>
     <string name="lockpassword_forgot_password" msgid="5730587692489737223">"Ukhohlwe iphasiwedi yakho?"</string>
     <string name="lockpassword_forgot_pattern" msgid="1196116549051927516">"Ukhohlwe iphethini yakho?"</string>
     <string name="lockpassword_forgot_pin" msgid="7164232234705747672">"Ukhohlwe iphinikhodi yakho?"</string>
@@ -2118,13 +2147,16 @@
     <string name="accessibility_captioning_title" msgid="4561871958958925225">"Okuncanyelwayo kwamagama-ngcazo"</string>
     <string name="accessibility_screen_magnification_title" msgid="1211169976144629087">"Ukukhuliswa"</string>
     <string name="accessibility_magnification_mode_title" msgid="879250866604403721">"Indawo yokukhulisa"</string>
-    <string name="accessibility_magnification_enable_mode_title" msgid="4390488034396824276">"Ukukhuliswa kunikwe amandla"</string>
     <string name="accessibility_magnification_area_settings_message" msgid="4821458740248772054">"Khetha izindawo zokukhulisa ofuna ukuzisebenzisa uma ukhulisa isikrini"</string>
     <string name="accessibility_magnification_area_settings_full_screen_summary" msgid="2728962784113713010">"Iskrini esigcwele"</string>
     <string name="accessibility_magnification_area_settings_window_screen_summary" msgid="5630032596384610913">"Ingxenye yesikrini"</string>
     <string name="accessibility_magnification_area_settings_all_summary" msgid="5139954486886669293">"Isikrini esigcwele nengxenye yesikrini"</string>
     <string name="accessibility_magnification_area_settings_full_screen" msgid="4189574224079433280">"Khulisa sonke isikrini"</string>
     <string name="accessibility_magnification_area_settings_window_screen" msgid="7431401975447232976">"Khulisa ingxenye eyesikrini"</string>
+    <string name="accessibility_magnification_switch_shortcut_title" msgid="3671432048806533079">"Ushintshela kunkinobho yokufinyelela?"</string>
+    <string name="accessibility_magnification_switch_shortcut_message" msgid="5291166101273060742">"Ukusebenzisa ukuthepha kathathu ukuze ukhulise ingxenye yesikrini kuzobangela ukuzama nezinye izenzo ukuba zibambezeleke.\n\nIngabe ufuna ukushintshela ekusebenziseni inkinobho yokufinyelela ukuze ukhulise?"</string>
+    <string name="accessibility_magnification_switch_shortcut_positive_button" msgid="2446942190957296957">"Shintshela kunkinobho yokufinyelela"</string>
+    <string name="accessibility_magnification_switch_shortcut_negative_button" msgid="5750910789717343646">"Qhubeka uthepha kathathu ukuze ukhulise"</string>
     <string name="accessibility_magnification_service_settings_title" msgid="3531350704632316017">"Izilungiselelo zokukhuliswa"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3121714118381882167">"Shintsha ngokuthepha kathathu"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="480853328665484528">"Khulisa ngesinqamuleli"</string>
@@ -2178,11 +2210,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="8187306131979612144">"Inkinobho yamandla ivala ikholi"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="5508351959249876801">"Isikhombi esikhulu segundane"</string>
     <string name="accessibility_disable_animations" msgid="2993529829457179058">"Susa ukugqwayiza"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="6692439394171709557">"Umsindo we-Mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="6043673439531673935">"Hlanganisa iziteshi uma udlala umsindo"</string>
-    <string name="accessibility_toggle_master_balance_title" msgid="895584329613310279">"Ukubhalansa umsindo"</string>
-    <string name="accessibility_toggle_master_balance_left_label" msgid="147010366022601825">"Ngakwesokunxele"</string>
-    <string name="accessibility_toggle_master_balance_right_label" msgid="5028519887058073990">"Okungakwesokudla"</string>
+    <string name="accessibility_toggle_primary_mono_title" msgid="7587152099472946571">"Umsindo we-Mono"</string>
+    <string name="accessibility_toggle_primary_mono_summary" msgid="1935283927319407303">"Hlanganisa iziteshi uma udlala umsindo"</string>
+    <string name="accessibility_toggle_primary_balance_title" msgid="7332275200153366714">"Ukubhalansa umsindo"</string>
+    <string name="accessibility_toggle_primary_balance_left_label" msgid="6415750010517682014">"Kwesokunxele"</string>
+    <string name="accessibility_toggle_primary_balance_right_label" msgid="2987443495390104935">"Kwesokudla"</string>
     <string name="accessibility_timeout_default" msgid="1033702739376842824">"Okuzenzakalelayo"</string>
     <string name="accessibility_timeout_10secs" msgid="5072577454521239794">"imizuzwana eyi-10"</string>
     <string name="accessibility_timeout_30secs" msgid="7814673496724760684">"30 amasekhondi"</string>
@@ -2212,11 +2244,11 @@
     <string name="accessibility_notification_vibration_title" msgid="6205679908785776478">"Ukudlidliza kwesaziso"</string>
     <string name="accessibility_ring_vibration_title" msgid="4689811297654320885">"Ukudlidliza kokukhala"</string>
     <string name="accessibility_touch_vibration_title" msgid="533931451319110741">"Impendulo yokuthinta"</string>
-    <string name="accessibility_service_master_switch_title" msgid="3001666897585097640">"Sebenzisa i-<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_service_master_open_title" msgid="7437956750557583681">"Vula i-<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
-    <string name="accessibility_daltonizer_master_switch_title" msgid="3580563017377754890">"Sebenzisa ukulungisa kombala"</string>
-    <string name="accessibility_caption_master_switch_title" msgid="3821125170899547375">"Bonisa amagama-ncazo"</string>
-    <string name="accessibility_caption_master_switch_summary" msgid="4908774362453838764">"Okohlelo lokusebenza olusekelwe kuphela"</string>
+    <string name="accessibility_service_primary_switch_title" msgid="437610853412159406">"Sebenzisa i-<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_service_primary_open_title" msgid="8655108684769091154">"Vula i-<xliff:g id="ACCESSIBILITY_APP_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_daltonizer_primary_switch_title" msgid="32064721588910540">"Sebenzisa ukulungisa kombala"</string>
+    <string name="accessibility_caption_primary_switch_title" msgid="8901149325574757370">"Bonisa amagama-ncazo"</string>
+    <string name="accessibility_caption_primary_switch_summary" msgid="2754071646412717674">"Okohlelo lokusebenza olusekelwe kuphela"</string>
     <string name="captioning_caption_appearance_title" msgid="4501313548541670063">"Usayizi wegama-ngcazo nesitayela"</string>
     <string name="captioning_caption_appearance_summary" msgid="7340741178479381312">"<xliff:g id="ACCESSIBILITY_FONT_SIZE">%1$s</xliff:g> usayizi wombhalo"</string>
     <string name="captioning_more_options_title" msgid="3484496882942539652">"Ezinye izinketho"</string>
@@ -2246,6 +2278,7 @@
     <string name="daltonizer_mode_deuteranomaly_title" msgid="3811397143576433035">"I-Deuteranomaly"</string>
     <string name="daltonizer_mode_protanomaly_title" msgid="6787594316700223938">"I-Protanomaly"</string>
     <string name="daltonizer_mode_tritanomaly_title" msgid="1869867447813349033">"I-Tritanomaly"</string>
+    <string name="daltonizer_mode_grayscale_title" msgid="152005391387952588">"I-grayscale"</string>
     <string name="daltonizer_mode_deuteranomaly_summary" msgid="791173297742998942">"Okubomvu-okuluhlaza okotshani"</string>
     <string name="daltonizer_mode_protanomaly_summary" msgid="482834207025141433">"Okubomvu-okuluhlaza okotshani"</string>
     <string name="daltonizer_mode_tritanomaly_summary" msgid="2837137091067433059">"Okuluhlaza okwesibhakabhaka-okuphuzi"</string>
@@ -2375,7 +2408,7 @@
     <string name="background_activity_title" msgid="8214332017349791380">"Ukukhawulelwa okungemuva"</string>
     <string name="background_activity_summary" msgid="3817376868497046016">"Vumela uhlelo lokusebenza ukuthi lusebenze ngemuva"</string>
     <string name="background_activity_summary_disabled" msgid="32459916080651444">"Uhlelo lokusebenza alivunyelwe ukubuyela ngasemuva"</string>
-    <string name="background_activity_summary_whitelisted" msgid="6808917852577742965">"Ukusetshenziswa kwangemuva akukwazi ukukhawulelwa"</string>
+    <string name="background_activity_summary_allowlisted" msgid="6240154358657454651">"Ukusetshenziswa kwangemuva akukwazi ukukhawulelwa"</string>
     <string name="background_activity_warning_dialog_title" msgid="3449566823290744823">"Khawulela umsebenzi wasemuva?"</string>
     <string name="background_activity_warning_dialog_text" msgid="8202776985767701095">"Uma ukhawulela umsebenzi wangasemuva wohlelo lokusebenza, lungahle lungasebenzi kahle"</string>
     <string name="background_activity_disabled_dialog_text" msgid="4053170297325882494">"Njengoba lolu hlelo lokusebenza lungasethiwe ukuze kulungiselelwe ibhethri, awukwazi ukulikhawulela.\n\nUkuze ukhawulele uhlelo lokusebenza, qala uvule ukulungiselelwa kwebhethri."</string>
@@ -2424,6 +2457,8 @@
     <string name="battery_tip_high_usage_title" product="tablet" msgid="8515903411746145740">"Ithebulethi isetshenziswa ngaphezulu kunokujwayelekile"</string>
     <string name="battery_tip_high_usage_title" product="device" msgid="6577086402173910457">"Idivayisi isetshenziswa ngaphezulu kunokujwayelekile"</string>
     <string name="battery_tip_high_usage_summary" msgid="5356399389711499862">"Ibhethri lingaphela ngaphambi kwesikhathi kunokujwayelekile"</string>
+    <string name="battery_tip_limited_temporarily_title" msgid="7152799456221596915">"Ilungiselela impilo yebhethri"</string>
+    <string name="battery_tip_limited_temporarily_summary" msgid="6837061824463128857">"Ibhethri ikhawulelwe okwesikhashana. Thepha ukuze ufunde kabanzi."</string>
     <string name="battery_tip_dialog_message" product="default" msgid="4681734836472195966">"Ifoni yakho isetshenziswe ngaphezulu kokujwayelekile. Ibhethri lakho lingaphela ngokushesha kunokulindeleke ngakhona.\n\nIzinhlelo zokusebenza eziphezulu ngokusetshenziswa kwebhethri:"</string>
     <string name="battery_tip_dialog_message" product="tablet" msgid="3934298305232120382">"Ithebulethi yakho isetshenziswe ngaphezulu kunokujwayelekile. Ibhethri lakho lingaphela ngokushesha kunokulindeleke ngakhona.\n\nIzinhlelo zokusebenza eziphezulu ngokusetshenziswa kwebhethri:"</string>
     <string name="battery_tip_dialog_message" product="device" msgid="2620789680336796054">"Idivayisi yakho isetshenziswe kakhulu kunokujwayelekile. Ibhethri lakho lingaphela ngokushesha kunokulindeleke ngakhona.\n\nIzinhlelo zokusebenza eziphezulu ngokusetshenziswa kwebhethri:"</string>
@@ -2479,6 +2514,8 @@
       <item quantity="other">%1$d izinhlelo zokusebenza ezikhawulelwe</item>
     </plurals>
     <string name="battery_header_title_alternate" msgid="8371821625994616659">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" "<font size="20">"<xliff:g id="UNIT">%</xliff:g>"</font></small>""</string>
+    <string name="battery_missing_message" msgid="5202575301365811053">"Kube khona inkinga ngokufunda imitha yakho yebhethri"</string>
+    <string name="battery_missing_help_message" msgid="4583322687535428926">"Kube khona inkinga ngokufunda imitha yakho yebhethri. Thepha "<annotation id="url">"ukuze ufunde kabanzi"</annotation></string>
     <string name="dialog_stop_title" msgid="5972757101865665655">"Misa uhlelo lokusebenza?"</string>
     <string name="dialog_stop_message" product="default" msgid="2063536418875183799">"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="426862716783569739">"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>
@@ -2592,9 +2629,9 @@
     <string name="battery_saver_schedule_settings_title" msgid="3688019979950082237">"Setha ishejuli"</string>
     <string name="battery_saver_turn_on_summary" msgid="1433919417587171160">"Khulisa impilo yebhethri"</string>
     <string name="battery_saver_sticky_title_new" msgid="5942813274115684599">"Vala lapho ishajiwe"</string>
-    <string name="battery_saver_sticky_description_new" product="default" msgid="6862168106613838677">"Isilondolozi sebhethri sivalwa uma ifoni yakho iku-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6740553373344759992">"Isilondolozi sebhethri siyavalwa uma ithebulethi yakho iku-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_saver_sticky_description_new" product="device" msgid="8512106347424406909">"Isilondolozi sebhethri siyavalwa uma idivayisi yakho iku-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="default" msgid="4969508893424116609">"Isilondolozi sebhethri sivala lapho ifoni yakho ishaja ngaphezu kuka-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="tablet" msgid="6613068787945311001">"Isilondolozi sebhethri sivala lapho ithebulethi yakho ishaja ngaphezu kuka-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_saver_sticky_description_new" product="device" msgid="8707774542183385479">"Isilondolozi sebhethri sivala lapho idivayisi yakho ishaja ngaphezu kuka-<xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <!-- no translation found for battery_saver_seekbar_title (3712266470054006641) -->
     <skip />
     <string name="battery_saver_seekbar_title_placeholder" msgid="7141264642540687540">"Vula"</string>
@@ -2659,6 +2696,8 @@
     <string name="tts_reset" msgid="9047681050813970031">"Setha kabusha"</string>
     <string name="tts_play" msgid="2945513377250757221">"Dlala"</string>
     <string name="vpn_settings_title" msgid="9131315656202257272">"I-VPN"</string>
+    <string name="adaptive_connectivity_title" msgid="7464959640138428192">"Uxhumo lwe-adaptive"</string>
+    <string name="adaptive_connectivity_summary" msgid="3648731530666326885">"Kunweba impilo yebhethri kuphinde kuthuthukise ukusebenza kwedivayisi ngokuphatha uxhumo lenethiwekhi yakho ngokuzenzakalelayo"</string>
     <string name="credentials_title" msgid="7535942196886123656">" Isitoreji sokuqinisekisa"</string>
     <string name="credentials_install" msgid="3933218407598415827">"Faka isitifiketi"</string>
     <string name="credentials_install_summary" product="nosdcard" msgid="6644116499934553975">"Faka izitifiketi kusuka ekugcineni"</string>
@@ -2670,9 +2709,6 @@
     <string name="user_credentials" msgid="4044405430790970775">"Ukuqinisekisa komsebenzisi"</string>
     <string name="user_credentials_summary" msgid="686471637627271856">"Buka uphinde ulungise ukuqinisekisa okugciniwe"</string>
     <string name="advanced_security_title" msgid="7117581975877192652">"Ithuthukisiwe"</string>
-    <string name="credential_storage_type" msgid="930861336971619888">"Uhlobo lwesitoreji"</string>
-    <string name="credential_storage_type_hardware" msgid="2630040425119817220">"Izingxenyekazi zekhompyutha zisekelwe ngokulondoloza"</string>
-    <string name="credential_storage_type_software" msgid="4786996040468294626">"Isofthiwe kuphela"</string>
     <string name="credentials_settings_not_available" msgid="7433088409177429600">"Izifakazo azitholakaleli lo msebenzisi"</string>
     <string name="credential_for_vpn_and_apps" msgid="2208229692860871136">"Kufakelwe i-VPN nezinhlelo zokusebenza"</string>
     <string name="credential_for_wifi" msgid="1963335263280604998">"Kufakelwe i-Wi-Fi"</string>
@@ -2688,6 +2724,15 @@
     <string name="certificate_warning_dont_install" msgid="3794366420884560605">"Ungafaki"</string>
     <string name="certificate_warning_install_anyway" msgid="4633118283407228740">"Faka noma kunjalo"</string>
     <string name="cert_not_installed" msgid="6725137773549974522">"Isitifiketi asifakiwe"</string>
+    <string name="request_manage_credentials_title" msgid="4524504926699928916">"Uvumela i-<xliff:g id="APP_NAME">%s</xliff:g> ukuba ifake izitifiketi kule divayisi?"</string>
+    <string name="request_manage_credentials_description" msgid="4969609158022551952">"Lezi zitifiketi zizokuveza kuzinhlelo zokusebenza nakuma-URL angezansi"</string>
+    <string name="request_manage_credentials_dont_allow" msgid="3630610197644877809">"Ungavumeli"</string>
+    <string name="request_manage_credentials_allow" msgid="4910940118408348245">"Vumela"</string>
+    <string name="request_manage_credentials_more" msgid="6101210283534101582">"Bonisa okuningi"</string>
+    <string name="certificate_management_app" msgid="8086699498358080826">"Uhlelo lokusebenza lokuphatha isitifiketi"</string>
+    <string name="no_certificate_management_app" msgid="3025739370424406717">"Lutho"</string>
+    <string name="certificate_management_app_description" msgid="7257420502179110164">"Izitifiketi ezifakwe yilolu hlelo lokusebenza ziyakukhomba kuzinhlelo zokusebenza nama-URL angezansi"</string>
+    <string name="remove_credential_management_app" msgid="6879631067380232928">"Susa"</string>
     <string name="emergency_tone_title" msgid="6673118505206685168">"Isignali yokudayela isimo esiphuthumayo"</string>
     <string name="emergency_tone_summary" msgid="2519776254708767388">"Hlela ukuziphatha lapho ikholi oluphuthumayo lwenziwa"</string>
     <string name="privacy_settings_title" msgid="6437057228255974577">"Sekela ngokulondoloza"</string>
@@ -3011,7 +3056,6 @@
     <string name="user_summary_managed_profile_not_set_up" msgid="5739207307082458746">"Ayisethiwe - Iphrofayela yomsebenzi"</string>
     <string name="user_admin" msgid="4024553191395768119">"Mqondisi"</string>
     <string name="user_you" msgid="3070562015202859996">"Wena (<xliff:g id="NAME">%s</xliff:g>)"</string>
-    <string name="user_nickname" msgid="3763630194459958977">"Isidlaliso"</string>
     <string name="user_add_max_count" msgid="5739771048517070983">"Ungangeza kufikela kubasebenzisi abangu-<xliff:g id="USER_COUNT">%1$d</xliff:g>"</string>
     <string name="user_cannot_manage_message" product="tablet" msgid="3405022988077682357">"Umnikazi wethebhulethi kuphela ongaphatha abasebenzisi"</string>
     <string name="user_cannot_manage_message" product="default" msgid="6434662649769855494">"Umnikazi wefoni kuphela ongaphatha abasebenzisi."</string>
@@ -3061,7 +3105,7 @@
     <string name="nfc_how_it_works_title" msgid="1363791241625771084">"Ukukhokha kutheminali"</string>
     <string name="nfc_how_it_works_content" msgid="1141382684788210772">"Setha uhlelo lokusebenza lokhukhokha. Bese vele ubambe ingemuva lefoni yakho kuya kunoma iyiphi itheminali enophawu elingenabo oxhumana nabo."</string>
     <string name="nfc_how_it_works_got_it" msgid="4717868843368296630">"Ngiyitholile"</string>
-    <string name="nfc_more_title" msgid="4202405349433865488">"Okuningi..."</string>
+    <string name="nfc_more_title" msgid="1041094244767216498">"Okuningi…"</string>
     <string name="nfc_payment_set_default_label" msgid="7395939287766230293">"Setha uhlelo lokusebenza olukhokhelwayo oluzenzakalelayo"</string>
     <string name="nfc_payment_update_default_label" msgid="8201975914337221246">"Buyekeza uhlelo lokusebenza olukhokhelwayo oluzenzakalelayo"</string>
     <string name="nfc_payment_set_default" msgid="4101484767872365195">"Kutheminali yangaphandle kokuthinta, khokha nge-<xliff:g id="APP">%1$s</xliff:g>"</string>
@@ -3131,9 +3175,6 @@
     <string name="wizard_back" msgid="8257697435061870191">"Phindela emuva"</string>
     <string name="wizard_next" msgid="3884832431439072471">"Okulandelayo"</string>
     <string name="wizard_finish" msgid="4220258401946825946">"Qeda"</string>
-    <string name="user_image_take_photo" msgid="2601691481533190924">"Thatha isithombe"</string>
-    <string name="user_image_choose_photo" msgid="5904586923236027350">"Khetha isithombe"</string>
-    <string name="user_image_photo_selector" msgid="7727851029781491727">"Khetha isithombe"</string>
     <string name="regulatory_info_text" msgid="1154461023369976667"></string>
     <string name="sim_setup_wizard_title" msgid="3945520353564138219">"Imodi yokuthula"</string>
     <string name="sim_settings_title" msgid="8392862852842113531">"Amakhadi we-SIM"</string>
@@ -3145,7 +3186,7 @@
     <string name="sim_calls_always_use" msgid="967857230039768111">"Njalo sebenzisa lokhu kumakholi"</string>
     <string name="select_sim_for_data" msgid="1577092784244587369">"Khetha i-SIM yedatha"</string>
     <string name="select_sim_for_sms" msgid="5335510076282673497">"Khetha i-SIM ye-SMS"</string>
-    <string name="data_switch_started" msgid="6205259094233452188">"Ishintsha i-SIM yedatha, lokhu kungathatha kufikela kuminithi..."</string>
+    <string name="data_switch_started" msgid="6292759843974720112">"Ishintsha i-SIM yedatha, lokhu kungathatha kufikela kuminithi…"</string>
     <string name="select_sim_for_calls" msgid="7843107015635189868">"Shaya nge"</string>
     <string name="sim_select_card" msgid="1226182454109919045">"Khetha ikhadi le-SIM"</string>
     <string name="sim_card_number_title" msgid="4728780444646439845">"I-SIM <xliff:g id="CARD_NUMBER">%1$d</xliff:g>"</string>
@@ -3288,6 +3329,7 @@
     <string name="keywords_battery_saver_schedule" msgid="8240483934368455930">"umzila, ishejuli, isilondolozi sebhethri, isilondolozi samandla, ibhethri, ukuzenzakalela, iphesenti"</string>
     <string name="keywords_enhance_4g_lte" msgid="658889360486800978">"i-volte, ukushaya okuthuthukile, ukushaya kwe-4g"</string>
     <string name="keywords_add_language" msgid="1882751300359939436">"engeza ulimi, engeza ulimi"</string>
+    <string name="keywords_font_size" msgid="336803136451166298">"usayizi wombhalo"</string>
     <string name="default_sound" msgid="6604374495015245195">"Umsindo owufica ukhona"</string>
     <string name="sound_settings_summary" msgid="944761906531715109">"Ivolumu yokukhala neyesaziso ku-<xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
     <string name="sound_dashboard_summary" msgid="6574444810552643312">"Ivolomu, ukudlidliza, ungaphazamisi"</string>
@@ -3327,11 +3369,7 @@
     <string name="boot_sounds_title" msgid="5033062848948884111">"Amandla kumisindo"</string>
     <string name="live_caption_title" msgid="8617086825712756983">"Amagama-ncazo abukhoma"</string>
     <string name="live_caption_summary" msgid="2898451867595161809">"Yenza amagama-ngcazo ngokuzenzakalela emidiya"</string>
-    <string name="zen_mode_settings_summary_off" msgid="3604559081434571933">"Lutho"</string>
-    <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1460413335725340350">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> amashejuli asethiwe</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> amashejuli asethiwe</item>
-    </plurals>
+    <string name="zen_mode_settings_schedules_summary" msgid="2047688589286811617">"{count,plural, =0{Lutho}=1{ishejuli esethiwe e-1}one{amashejuli asethiwe angu-#}other{amashejuli asethiwe angu-#}}"</string>
     <string name="zen_mode_settings_title" msgid="682676757791334259">"Ungaphazamisi"</string>
     <string name="zen_mode_settings_summary" msgid="6040862775514495191">"Yaziswa kuphela abantu ababalulekile nezinhlelo zokusebenza"</string>
     <string name="zen_mode_slice_subtitle" msgid="6849372107272604160">"Khawulela ukuphazamisa"</string>
@@ -3399,20 +3437,12 @@
     <string name="zen_interruption_level_priority" msgid="4854123502362861192">"Okubalulekile kuphela"</string>
     <string name="zen_mode_and_condition" msgid="8580896862841920031">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_sound_summary_on_with_info" msgid="4803606180235742003">"Kuvuliwe / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off_with_info" msgid="2032265904095185048">"Kuvaliwe / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="zen_mode_sound_summary_off" msgid="2102424480808968673">"Kuvaliwe"</string>
     <string name="zen_mode_sound_summary_on" msgid="9077659040104989899">"Vuliwe"</string>
     <string name="zen_mode_duration_summary_always_prompt" msgid="7658172853423383037">"Buza njalo"</string>
     <string name="zen_mode_duration_summary_forever" msgid="5551992961329998606">"Uze uvale isikrini"</string>
-    <plurals name="zen_mode_duration_summary_time_hours" formatted="false" msgid="3601160794696489864">
-      <item quantity="one"><xliff:g id="NUM_HOURS">%d</xliff:g> amahora</item>
-      <item quantity="other"><xliff:g id="NUM_HOURS">%d</xliff:g> amahora</item>
-    </plurals>
-    <string name="zen_mode_duration_summary_time_minutes" msgid="3187122993179039992">"<xliff:g id="NUM_MINUTES">%d</xliff:g> amaminithi"</string>
-    <plurals name="zen_mode_sound_summary_summary_off_info" formatted="false" msgid="3812633366476034740">
-      <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> amashejuli angavula ngokuzenzakalelayo</item>
-      <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> amashejuli angavula ngokuzenzakalelayo</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours" msgid="2602655749780428308">"{count,plural, =1{ihora eli-1}one{amahora #}other{amahora #}}"</string>
+    <string name="zen_mode_duration_summary_time_minutes" msgid="5755536844016835693">"{count,plural, =1{umzuzu 1}one{imizuzu #}other{imizuzu #}}"</string>
+    <string name="zen_mode_sound_summary_off" msgid="7350437977839985836">"{count,plural, =0{Kuvaliwe}=1{Kuvaliwe ? ishejuli e-1 ingavula ngokuzenzakalelayo}one{Kuvaliwe / amashejuli angu-# angavula ngokuzenzakalelayo}other{Kuvaliwe / amashejuli angu-# angavula ngokuzenzakalelayo}}"</string>
     <string name="zen_category_behavior" msgid="3214056473947178507">"Yini engaphazamisa okuthi Ungaphazamisi"</string>
     <string name="zen_category_people" msgid="8252926021894933047">"Abantu"</string>
     <string name="zen_category_apps" msgid="1167374545618451925">"Izinhlelo zokusebenza"</string>
@@ -3458,6 +3488,10 @@
     <string name="asst_capability_prioritizer_summary" msgid="954988212366568737">"Setha ngokuzenzakalela izaziso zokubaluleka okuncane zibe Mnene"</string>
     <string name="asst_capability_ranking_title" msgid="312998580233257581">"Ukulinganisa kwesaziso sokujwayela"</string>
     <string name="asst_capability_ranking_summary" msgid="2293524677144599450">"Linganisa ngokuzenzakalelayo izaziso ngokuhlobana"</string>
+    <string name="asst_feedback_indicator_title" msgid="5169801869752395354">"Impendulo yesaziso sokujwayela"</string>
+    <string name="asst_feedback_indicator_summary" msgid="5862082842073307900">"Bonisa ukulungiswa okwenziwe kuzaziso bese ubonisa inketho yokuhlinzeka ngempendulo kusistimu"</string>
+    <string name="asst_importance_reset_title" msgid="6191265591976440115">"Setha kabusha ukubaluleka kwesaziso"</string>
+    <string name="asst_importance_reset_summary" msgid="684794589254282667">"Setha kabusha amasethingi abalulekile ashintshiwe womsebenzisi bese uvumela umsizi wesaziso abe okubalulekile"</string>
     <string name="asst_capabilities_actions_replies_title" msgid="4392470465646394289">"Izenzo eziphakanyisiwe nezimpendulo"</string>
     <string name="asst_capabilities_actions_replies_summary" msgid="416234323365645871">"Bonisa ngokuzenzakalela izenzo eziphakanyisiwe nezimpendulo"</string>
     <string name="notification_history_summary" msgid="5434741516307706892">"Bona izaziso zakamuva nezisnuziwe"</string>
@@ -3555,8 +3589,11 @@
     <string name="important_conversations" msgid="1233893707189659401">"Izingxoxo ezibalulekile"</string>
     <string name="important_conversations_summary_bubbles" msgid="614327166808117644">"Zibonakala ngaphezulu kwesigaba sengxoxo futhi zivela njengamabhamuza antantayo"</string>
     <string name="important_conversations_summary" msgid="3184022761562676418">"Kubonakala esigabeni esiphezulu sengxoxo"</string>
-    <string name="other_conversations" msgid="7218658664423361043">"Ezinye izingxoxo"</string>
+    <string name="other_conversations" msgid="551178916855139870">"Akuzona izingxoxo ezibalulekile"</string>
     <string name="other_conversations_summary" msgid="3487426787901236273">"Izingxoxo owenze izinguquko kuzo"</string>
+    <string name="recent_conversations" msgid="471678228756995274">"Izingxoxo zakamuva"</string>
+    <string name="conversation_settings_clear_recents" msgid="7502738708058226585">"Sula okwakamuva"</string>
+    <string name="clear" msgid="5092178335409471100">"Sula"</string>
     <string name="important_bubble" msgid="7911698275408390846">"Izingxoxo ezibalulekile zebhamuza"</string>
     <string name="important_conversation_behavior_summary" msgid="1845064084071107732">"Izingxoxo ezibalulekile ziboniswa phezulu komthunzi wokudonsela phansi. Futhi ungazisethela kubhamuza uphinde uphazamise Ukungaphazamisi."</string>
     <string name="conversation_onboarding_title" msgid="5194559958353468484">"Izingxoxo ezibalulekile neziguquliwe zizovela lapha"</string>
@@ -3654,7 +3691,7 @@
     <string name="manage_zen_access_title" msgid="1562322900340107269">"Ukufinyelela kokungaphazamisi"</string>
     <string name="zen_access_detail_switch" msgid="4183681772666138993">"Vumela ukungaphazamisi"</string>
     <string name="zen_access_empty_text" msgid="3779921853282293080">"Azikho izinhlelo zokusebenza ezifakiwe ezicele ukufinyelela kokungaphazamisi"</string>
-    <string name="loading_notification_apps" msgid="1458413761470945269">"Ilayisha izinhlelo zokusebenza..."</string>
+    <string name="loading_notification_apps" msgid="5139471829295287945">"Ilayisha izinhlelo zokusebenza…"</string>
     <string name="app_notifications_off_desc" msgid="6691342160980435901">"Ngokwesicelo sakho, i-Android ivimbela izaziso zalolu hlelo lokusebenza kusukela ekuveleni kule divayisi"</string>
     <string name="channel_notifications_off_desc" msgid="6202042207121633488">"Ngokwesicelo sakho i-Android ivimbela lesi sigaba sezaziso kusukela ekuveleni kule divayisi"</string>
     <string name="channel_group_notifications_off_desc" msgid="9096417708500595424">"Ngokwesicelo sakho i-Android ivimbela leli qembu lezaziso kusukela ekuveleni kule divayisi"</string>
@@ -3746,11 +3783,7 @@
     <string name="zen_mode_from_all_conversations" msgid="3447000451361857061">"Zonke izingxoxo"</string>
     <string name="zen_mode_from_important_conversations" msgid="528050873364229253">"Izingxoxo ezibalulekile"</string>
     <string name="zen_mode_from_no_conversations" msgid="3924593219855567165">"Lutho"</string>
-    <plurals name="zen_mode_conversations_count" formatted="false" msgid="8348944826762075457">
-      <item quantity="one"><xliff:g id="CONVERSATIONS">%d</xliff:g> izingxoxo</item>
-      <item quantity="other"><xliff:g id="CONVERSATIONS">%d</xliff:g> izingxoxo</item>
-    </plurals>
-    <string name="zen_mode_conversations_count_none" msgid="4745022470794983983">"Lutho"</string>
+    <string name="zen_mode_conversations_count" msgid="3199310723073707153">"{count,plural, =0{Lutho}=1{ingxoxo e-1}one{izingxoxo ezingu-#}other{izingxoxo ezingu-#}}"</string>
     <string name="zen_mode_people_calls_messages_section_title" msgid="6815202112413762206">"Labo abangaphazamisa"</string>
     <string name="zen_mode_calls_title" msgid="2078578043677037740">"Amakholi"</string>
     <string name="zen_mode_calls" msgid="7653245854493631095">"Amakholi"</string>
@@ -3759,11 +3792,8 @@
     <string name="zen_mode_calls_footer" msgid="2008079711083701243">"Ukuqinisekisa ukuthi amakholi avunyelwe enza umsindo, hlola ukuthi idivayisi isethelwe ukukhalisa"</string>
     <string name="zen_mode_custom_calls_footer" msgid="6521283204577441053">"Okwe-‘<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>’ kwamakholi angenayo kuvinjelwe. Ungalungisa izilungiselelo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo ukuthi bafinyelele kuwe."</string>
     <string name="zen_mode_starred_contacts_title" msgid="630299631659575589">"Oxhumana nabo abafakwe inkanyezi"</string>
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts" formatted="false" msgid="7001724653833724925">
-      <item quantity="one"><xliff:g id="NUM_PEOPLE">%d</xliff:g> okunye</item>
-      <item quantity="other"><xliff:g id="NUM_PEOPLE">%d</xliff:g> okunye</item>
-    </plurals>
-    <string name="zen_mode_starred_contacts_summary_none" msgid="6320777044373994482">"Lutho"</string>
+    <string name="zen_mode_starred_contacts_summary_contacts" msgid="1629467178444895094">"{count,plural,offset:2 =0{Lutho}=1{{contact_1}}=2{U-{contact_1} no-{contact_2}}=3{U-{contact_1}, {contact_2}, no-{contact_3}}one{U-{contact_1}, {contact_2}, nabanye abangu-#}other{U-{contact_1}, {contact_2}, nabanye abangu-#}}"</string>
+    <string name="zen_mode_starred_contacts_empty_name" msgid="2906404745550293688">"(Alikho igama)"</string>
     <string name="zen_mode_messages" msgid="7315084748885170585">"Imilayezo"</string>
     <string name="zen_mode_messages_list" msgid="5431014101342361882">"imilayezo"</string>
     <string name="zen_mode_messages_title" msgid="1777598523485334405">"Imilayezo"</string>
@@ -3772,11 +3802,7 @@
     <string name="zen_mode_custom_messages_footer" msgid="7545180036949550830">"Okwemilayezo engenayo ye-\'<xliff:g id="SCHEDULE_NAME">%1$s</xliff:g>\' evinjiwe. Ungalungisa izilungiselelo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo ukuthi bafinyelele kuwe."</string>
     <string name="zen_mode_all_messages_summary" msgid="3756267858343104554">"Yonke imilayezo ingafinyelela kuwe"</string>
     <string name="zen_mode_all_calls_summary" msgid="7337907849083824698">"Wonke amakholi angafinyelela kuwe"</string>
-    <string name="zen_mode_contacts_count_none" msgid="7928563147160462589">"Lutho"</string>
-    <plurals name="zen_mode_contacts_count" formatted="false" msgid="3434092344686708445">
-      <item quantity="one"><xliff:g id="NUM_CONTACTS">%d</xliff:g> oxhumana nabo</item>
-      <item quantity="other"><xliff:g id="NUM_CONTACTS">%d</xliff:g> oxhumana nabo</item>
-    </plurals>
+    <string name="zen_mode_contacts_count" msgid="6568631261119795799">"{count,plural, =0{Lutho}=1{oxhumana naye o-1}one{oxhumana nabo abangu-#}other{oxhumana nabo abangu-#}}"</string>
     <string name="zen_mode_from_anyone" msgid="6027004263046694174">"Noma ubani"</string>
     <string name="zen_mode_from_contacts" msgid="2989933306317064818">"Oxhumana nabo"</string>
     <string name="zen_mode_from_starred" msgid="8616516644241652287">"Oxhumana nabo abafakwe inkanyezi"</string>
@@ -3814,22 +3840,14 @@
     <string name="zen_mode_bypassing_apps_summary_all" msgid="4684544706511555744">"Zonke izaziso"</string>
     <string name="zen_mode_bypassing_apps_summary_some" msgid="5315750826830358230">"Ezinye izaziso"</string>
     <string name="zen_mode_bypassing_apps_footer" msgid="1454862989340760124">"Abantu abakhethiwe basengakuthola, ngisho noma ungavumeli izinhlelo zokusebenza ukuphazamisa"</string>
-    <plurals name="zen_mode_bypassing_apps_subtext" formatted="false" msgid="7781990918323204156">
-      <item quantity="one">Ama-<xliff:g id="APP_NAMES">%s</xliff:g> angaphazamisa</item>
-      <item quantity="other">Ama-<xliff:g id="APP_NAMES">%s</xliff:g> angaphazamisa</item>
-    </plurals>
-    <string name="zen_mode_apps_bypassing_list_count" msgid="1581384924379825405">"<xliff:g id="NUMBER">%d</xliff:g> okuningi"</string>
+    <string name="zen_mode_bypassing_apps_subtext" msgid="5258652366929842710">"{count,plural,offset:2 =0{Azikho izinhlelo zokusebenza ezingaphazamisa}=1{I-{app_1} ingaphazamisa}=2{I-{app_1} ne-{app_2} zingaphazamisa}=3{I-{app_1}, i-{app_2}, ne-{app_3} zingaphazamisa}one{I-{app_1}, i-{app_2}, kanye nezingu-# ezengeziwe zingaphazamisa}other{I-{app_1}, i-{app_2}, kanye nezingu-# ezengeziwe zingaphazamisa}}"</string>
     <string name="zen_mode_bypassing_apps_title" msgid="371050263563164059">"Izinhlelo zokusebenza"</string>
     <string name="zen_mode_bypassing_apps_all_summary" msgid="5197566190120503132">"Zonke izaziso"</string>
     <string name="zen_mode_bypassing_apps_some_summary" msgid="1514572070650411509">"Ezinye izaziso"</string>
     <string name="zen_mode_bypassing_app_channels_header" msgid="4011017798712587373">"Izaziso ezingaphazamisa"</string>
     <string name="zen_mode_bypassing_app_channels_toggle_all" msgid="1449462656358219116">"Vumela zonke izaziso"</string>
-    <plurals name="zen_mode_other_sounds_summary" formatted="false" msgid="945147615383565311">
-      <item quantity="one">Ama-<xliff:g id="SOUND_CATEGORIES">%s</xliff:g> angaphazamisa</item>
-      <item quantity="other">Ama-<xliff:g id="SOUND_CATEGORIES">%s</xliff:g> angaphazamisa</item>
-    </plurals>
-    <string name="zen_mode_other_sounds_none" msgid="6219663385759635854">"Akukho okungaphazamisa"</string>
-    <string name="zen_mode_other_sounds_list_count" msgid="1443126333853419582">"<xliff:g id="NUMBER">%d</xliff:g> okuningi"</string>
+    <string name="zen_mode_other_sounds_summary" msgid="8784400697494837032">"{count,plural,offset:2 =0{Akukho okungaphazamisa}=1{I-{sound_category_1} ingaphazamisa}=2{I-{sound_category_1} ne-{sound_category_2} zingaphazamisa}=3{I-{sound_category_1}, i-{sound_category_2}, ne-{sound_category_3} zingaphazamisa}one{I-{sound_category_1}, i-{sound_category_2}, kanye nezingu-# ezengeziwe zingaphazamisa}other{I-{sound_category_1}, i-{sound_category_2}, kanye nezingu-# ezengeziwe zingaphazamisa}}"</string>
+    <string name="zen_mode_sounds_none" msgid="6557474361948269420">"Akukho okungaphazamisa"</string>
     <string name="zen_mode_people_none" msgid="4613147461974255046">"Akekho ongaphazamisa"</string>
     <string name="zen_mode_people_some" msgid="9101872681298810281">"Abantu abathile bangaphazamisa"</string>
     <string name="zen_mode_people_all" msgid="311036110283015205">"Bonke abantu bangaphazamisa"</string>
@@ -3875,8 +3893,9 @@
     <string name="switch_on_text" msgid="5664542327776075105">"Vuliwe"</string>
     <string name="switch_off_text" msgid="1315547447393646667">"Valiwe"</string>
     <string name="screen_pinning_title" msgid="6927227272780208966">"Ukuphina Uhlelo Lokusebenza"</string>
-    <string name="screen_pinning_description" msgid="6927147836599784578">"Ukuphina uhlelo lokusebenza kukuvumela ukuba ugcine uhlelo lokusebenza lwamanje lubhekiwe kuze kube yilapho ususa ukuphina kulo. Lesi sici singasetshenziswa, njengesibonelo, ukuvumela umngani othenjiwe ukuthi adlale igeyimu ethile. \n\nUma uhlelo lokusebenza luphiniwe, uhlelo lokusebenza oluphiniwe lungavula ezinye izinhlelo zokusebenza futhi nedatha yomuntu siqu ingafinyeleleka. \n\nUkuze usebenzise ukuphina uhlelo lokusebenza: 	\n1.	Vula ukuphina uhlelo lokusebenza 	\n2.	Vula Ukubuka Konke 	\n3.	Thepha isithonjana sohlelo lokusebenza phezulu esikrinini, bese uthepha okuthi Phina"</string>
-    <string name="screen_pinning_guest_user_description" msgid="4772752097527490014">"Ukuphina uhlelo lokusebenza kukuvumela ukuba ugcine uhlelo lokusebenza lwamanje lubhekiwe kuze kube yilapho ususa ukuphina kulo. Lesi sici singasetshenziswa, njengesibonelo, ukuvumela umngani othenjiwe ukuthi adlale igeyimu ethile. \n\nUma uhlelo lokusebenza luphiniwe, uhlelo lokusebenza oluphiniwe lungavula ezinye izinhlelo zokusebenza futhi nedatha yomuntu siqu ingafinyeleleka. \n\nUma ufuna ukwabelana nothile ngokuphephile ngedivayisi yakho, kunalokho zama ukusebenzisa umsebenzisi wesimenywa. \n\nUkuze usebenzise ukuphina uhlelo lokusebenza: 	\n1.	Vula ukuphina uhlelo lokusebenza 	\n2.	Vula Ukubuka Konke 	\n3.	Thepha isithonjana sohlelo lokusebenza phezulu esikrinini, bese uthepha okuthi Phina"</string>
+    <string name="app_pinning_intro" msgid="6409063008733004245">"Ukuphina uhlelo lokusebenza kukuvumela ukuba ugcine uhlelo lokusebenza lwamanje lubhekiwe kuze kube yilapho ususa ukuphina kulo. Lesi sici singasetshenziswa, njengesibonelo, ukuvumela umngani othenjiwe ukuthi adlale igeyimu ethile."</string>
+    <string name="screen_pinning_description" msgid="7289730998890213708">"Uma uhlelo lokusebenza luphiniwe, uhlelo lokusebenza oluphiniwe lungavula ezinye izinhlelo zokusebenza futhi nedatha yomuntu siqu ingafinyeleleka. \n\nUkuze usebenzise ukuphina uhlelo lokusebenza: 	\n1.	Vula ukuphina uhlelo lokusebenza 	\n2.	Vula Ukubuka Konke 	\n3.	Thepha isithonjana sohlelo lokusebenza phezulu esikrinini, bese uthepha okuthi Phina"</string>
+    <string name="screen_pinning_guest_user_description" msgid="5826264265872938958">"Uma uhlelo lokusebenza luphiniwe, uhlelo lokusebenza oluphiniwe lungavula ezinye izinhlelo zokusebenza futhi nedatha yomuntu siqu ingafinyeleleka. \n\nUma ufuna ukwabelana nothile ngokuphephile ngedivayisi yakho, kunalokho zama ukusebenzisa umsebenzisi wesimenywa. \n\nUkuze usebenzise ukuphina uhlelo lokusebenza: 	\n1.	Vula ukuphina uhlelo lokusebenza 	\n2.	Vula Ukubuka Konke 	\n3.	Thepha isithonjana sohlelo lokusebenza phezulu esikrinini, bese uthepha okuthi Phina"</string>
     <string name="screen_pinning_dialog_message" msgid="8144925258679476654">"Uma uhlelo lokusebenza luphiniwe: \n\n•		Idatha yomuntu siqu ingafinyeleleka \n		(njengoxhumana nabo kanye nokuqukethwe ku-imeyili) \n•		Uhlelo lokusebenza oluphiniwe lungavula ezinye izinhlelo zokusebenza \n\nSebenzisa ukuphina uhlelo lokusebenza nabantu obathembayo kuphela."</string>
     <string name="screen_pinning_unlock_pattern" msgid="1345877794180829153">"Cela iphethini yokuvula ngaphambi kokususa ukuphina"</string>
     <string name="screen_pinning_unlock_pin" msgid="8716638956097417023">"Cela iphinikhodi ngaphambi kokuphina"</string>
@@ -3898,6 +3917,9 @@
     <string name="encryption_interstitial_message_pin_for_face" msgid="8577135499926738241">"Ngokungeziwe ekusebenziseni ubuso bakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokufuna i-PIN yakho ngaphambi kokuthi iqale. Ize iqale idivayisi, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso, ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe. Funa i-PIN ukuze uqale idivayisi yakho?"</string>
     <string name="encryption_interstitial_message_pattern_for_face" msgid="5851725964283239644">"Ngokungeziwe ekusebenziseni ubuso bakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokufuna iphethini yakho ngaphambi kokuthi iqale. Idivayisi ize iqale, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe. Funa iphethini ukuze uqale idivayisi yakho?"</string>
     <string name="encryption_interstitial_message_password_for_face" msgid="3553329272456428461">"Ngokungeziwe ekusebenziseni ubuso bakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokufuna iphasiwedi yakho ngaphambi kokuthi iqale. Kuze kuqale idivayisi, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe. Funa iphasiwedi ukuze uqale idivayisi yakho?"</string>
+    <string name="encryption_interstitial_message_pin_for_biometrics" msgid="4590004045791674901">"Ngaphezu kokusebenzisa i-biometrics yakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokufuna Iphinikhodi yakho ngaphambi kokuthi iqale. Kuze kube yilapho idivayisi iqala, ingathola amakholi, imilayezo noma izaziso, ezihlanganisa nama-alamu. \n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma atshontshiwe. Ingabe udinga Iphinikhodi ukuze uqale idivayisi yakho?"</string>
+    <string name="encryption_interstitial_message_pattern_for_biometrics" msgid="2697768285995352576">"Ngaphezu kokusebenzisa i-biometrics yakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokufuna iphethini yakho ngaphambi kokuthi iqale. Kuze kube yilapho idivayisi iqala, ingathola amakholi, imilayezo noma izaziso, ezihlanganisa nama-alamu. \n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma atshontshiwe. Ingabe udinga iphethini ukuze uqale idivayisi yakho?"</string>
+    <string name="encryption_interstitial_message_password_for_biometrics" msgid="1895561539964730123">"Ngokungeziwe ekusebenziseni i-biometrics yakho ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokucela iphinikhodi yakho ngaphambi kokuthi iqale. Kuze kube yilapho idivayisi iqala, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso kuhlanganise nama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe. Ingabe udinga iphasiwedi ukuze uqalise idivayisi yakho?"</string>
     <string name="encryption_interstitial_yes" msgid="1948016725089728181">"Yebo"</string>
     <string name="encryption_interstitial_no" msgid="3352331535473118487">"Cha"</string>
     <string name="restricted_true_label" msgid="612852292488747564">"Kuvinjelwe"</string>
@@ -4073,7 +4095,7 @@
     <string name="usb_control_title" msgid="1946791559052157693">"I-USB ilawulwa nge-"</string>
     <string name="usb_control_host" msgid="7404215921555021871">"Idivayisi exhunyiwe"</string>
     <string name="usb_control_device" msgid="527916783743021577">"Le divayisi"</string>
-    <string name="usb_switching" msgid="3713602881103295766">"Iyashintsha..."</string>
+    <string name="usb_switching" msgid="3654709188596609354">"Iyashintsha…"</string>
     <string name="usb_switching_failed" msgid="5721262697715454137">"Ayikwazanga ukushintsha"</string>
     <string name="usb_summary_charging_only" msgid="678095599403565146">"Ishaja le divayisi"</string>
     <string name="usb_summary_power_only" msgid="4901734938857822887">"Ishaja idivayisi exhunyiwe"</string>
@@ -4267,6 +4289,7 @@
     <string name="cellular_data_usage" msgid="5874156338825285334">"Ukusetshenziswa kwedatha yeselula"</string>
     <string name="app_cellular_data_usage" msgid="7603292978956033926">"Ukusetshenziswa kwedatha yohlelo lokusebenza"</string>
     <string name="wifi_data_usage" msgid="6868503699134605707">"Ukusetshenziswa kwedatha ye-Wi-Fi"</string>
+    <string name="non_carrier_data_usage" msgid="6494603202578414755">"Ukusetshenziswa kwedatha engeyona eyenkampani yenethiwekhi"</string>
     <string name="ethernet_data_usage" msgid="4552227880905679761">"Ukusetshenziswa kwedatha kwe-ethernet"</string>
     <string name="wifi" msgid="2932584495223243842">"Wi-Fi"</string>
     <string name="ethernet" msgid="4665162609974492983">"I-Ethernet"</string>
@@ -4285,6 +4308,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> imikhawulo</item>
     </plurals>
     <string name="operator_warning" msgid="5672761970087591211">"Ukubalwa kwedatha yenkampani yenethiwekhi kungahluka kusuka ekubaleni kwedivayisi"</string>
+    <string name="non_carrier_data_usage_warning" msgid="7361998122602474430">"Ngaphandle kwedatha esetshenziswa amanethiwekhi wenkampani yenethiwekhi"</string>
     <string name="data_used_template" msgid="8229342096562327646">"<xliff:g id="ID_1">%1$s</xliff:g> okusetshenzisiwe"</string>
     <string name="set_data_warning" msgid="1685771882794205462">"Setha isexwayiso sedatha"</string>
     <string name="data_warning" msgid="2925054658166062884">"Isexwayiso sedatha"</string>
@@ -4320,7 +4344,7 @@
     <string name="launch_wifi_text" msgid="976421974332512894">"Buka imininingwane"</string>
     <string name="data_saver_title" msgid="2593804270788863815">"Iseva yedatha"</string>
     <string name="unrestricted_data_saver" msgid="7922563266857367495">"Idatha engakhawulelwe"</string>
-    <string name="restrict_background_blacklisted" msgid="7953049316098373715">"Idatha yangemuva ivaliwe"</string>
+    <string name="restrict_background_blocklisted" msgid="2308345280442438232">"Idatha yangemuva ivaliwe"</string>
     <string name="data_saver_on" msgid="7848893946018448793">"Vuliwe"</string>
     <string name="data_saver_off" msgid="5891210864117269045">"Valiwe"</string>
     <string name="data_saver_switch_title" msgid="7111538580123722959">"Sebenzisa iseva yedatha"</string>
@@ -4343,7 +4367,7 @@
     <string name="lockscreen_remote_input" msgid="6030274311185811503">"Uma idivayisi ikhiyiwe, vimbela ukuthayipha izimpendulo noma omunye umbhalo kuzaziso."</string>
     <string name="default_spell_checker" msgid="7108373288347014351">"Isihloli sokupela esizenzakalelayo"</string>
     <string name="choose_spell_checker" msgid="7402513404783243675">"Khetha isihloli sokupela"</string>
-    <string name="spell_checker_master_switch_title" msgid="1233180004430328851">"Sebenzisa isihloli sokupela"</string>
+    <string name="spell_checker_primary_switch_title" msgid="529240542284039243">"Sebenzisa isihloli sokupela"</string>
     <string name="spell_checker_not_selected" msgid="8818618543474481451">"Abangakhethiwe"</string>
     <string name="notification_log_no_title" msgid="2343315128609978203">"(lutho)"</string>
     <string name="notification_log_details_delimiter" msgid="2475986465985309821">": "</string>
@@ -4433,7 +4457,7 @@
     <string name="automatic_storage_manager_text" msgid="6900593059927987273">"Ukuze kusizwe kukhululwe isikhala sesitoreji, isiphathi sesitoreji sisusa izithombe ezenziwe isipele namavidiyo kusukela kudivayisi yakho."</string>
     <string name="automatic_storage_manager_days_title" msgid="5077286114860539367">"Susa izithombe namavidiyo"</string>
     <string name="automatic_storage_manager_preference_title" msgid="3483357910142595444">"Isiphathi sesitoreji"</string>
-    <string name="automatic_storage_manager_master_switch_title" msgid="8492707479615609185">"Sebenzisa isiphathi sesitoreji"</string>
+    <string name="automatic_storage_manager_primary_switch_title" msgid="9131959126462101994">"Sebenzisa isiphathi sesitoreji"</string>
     <string name="deletion_helper_automatic_title" msgid="597196990024769472">"Okuzenzakalelayo"</string>
     <string name="deletion_helper_manual_title" msgid="1068812971600327101">"Okwenziwa ngesandla"</string>
     <string name="deletion_helper_preference_title" msgid="6364023246849161274">"Khulula isikhala manje"</string>
@@ -4471,6 +4495,16 @@
     <string name="ambient_display_title" product="default" msgid="5885136049497127396">"Thepha kabili ukuze uhlole ifoni"</string>
     <string name="ambient_display_title" product="tablet" msgid="205744440641466921">"Thepha kabili ukuze uhlole ithebulethi"</string>
     <string name="ambient_display_title" product="device" msgid="4164103424628824786">"Thepha kabili ukuze uhlole idivayisi"</string>
+    <string name="swipe_bottom_to_notifications_title" msgid="7631744948948666524">"Swayiphela izaziso"</string>
+    <string name="swipe_bottom_to_notifications_summary" msgid="8073261995155440308">"Swayiphela phansi kunqenqema oluphansi lwesikrini ukuze ubonise izaziso zakho"</string>
+    <string name="one_handed_title" msgid="1741600445540072513">"Imodi yesandla esisodwa"</string>
+    <string name="one_handed_mode_enabled" msgid="3396864848786359651">"Sebenzisa imodi yesandla esisodwa"</string>
+    <string name="one_handed_app_taps_to_exit" msgid="1496702498286387879">"Phuma uma ushintsha izinhlelo zokusebenza"</string>
+    <string name="one_handed_timeout_title" msgid="8851767822595789976">"Isikhathi sokuvala"</string>
+    <string name="one_handed_timeout_short" msgid="304069319841702995">"Amasekhondi ama-4"</string>
+    <string name="one_handed_timeout_medium" msgid="6723411319911799018">"Amasekhondi ayisi-8"</string>
+    <string name="one_handed_timeout_long" msgid="6537332654662635890">"Amasekhondi ayi-12"</string>
+    <string name="keywords_one_handed" msgid="969440592493034101">"ukufinyeleleka"</string>
     <string name="ambient_display_summary" msgid="2650326740502690434">"Ukuze uhlole isikhathi, izaziso, nolunye ulwazi, thepha kabili isikrini sakho."</string>
     <string name="ambient_display_pickup_title" product="default" msgid="4418310591912877548">"Phakamisa ukuze uhlole ifoni"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="8055486872070888377">"Phakamisa ukuze uhlole ithebulethi"</string>
@@ -4483,6 +4517,16 @@
     <string name="ambient_display_tap_screen_title" product="tablet" msgid="6461531447715370632">"Thepha ukuze uhlole ithebulethi"</string>
     <string name="ambient_display_tap_screen_title" product="device" msgid="4423803387551153840">"Thepha ukuze uhlole idivayisi"</string>
     <string name="ambient_display_tap_screen_summary" msgid="4480489179996521405">"Ukuze uhlole isikhathi, izaziso, nolunye ulwazi, thepha isikrini sakho."</string>
+    <string name="emergency_gesture_screen_title" msgid="3280543310204360902">"Isimo esiphuthumayo se-SOS"</string>
+    <string name="emergency_gesture_switchbar_title" msgid="7494629420708117232">"Sebenzisa i-SOS ephuthumayo"</string>
+    <string name="emergency_gesture_entrypoint_summary" msgid="4730874229911208834">"Iphethwe yi-<xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="emergency_gesture_screen_summary" msgid="458991229689082120">"Qalisa izenzo ezingezansi ngokucindezela inkinobho yamandla ngokushesha izikhathi ezi-5 noma ngaphezulu"</string>
+    <string name="emergency_gesture_sound_setting_title" msgid="7153948164862156536">"Dlala i-alamu yokubala wehla"</string>
+    <string name="emergency_gesture_sound_setting_summary" msgid="9215504009890604179">"Dlala umsindo ophezulu ngaphambi kokwazisa ngosizo"</string>
+    <string name="emergency_gesture_call_for_help_title" msgid="4969340870836239982">"Shaya ikholi ukuze uthole usizo"</string>
+    <string name="emergency_gesture_call_for_help_dialog_title" msgid="8901271205171421201">"Inombolo yokushayela usizo"</string>
+    <string name="emergency_gesture_call_for_help_summary" msgid="6552830427932669221">"<xliff:g id="PHONE_NUMBER">%1$s</xliff:g>. Thepha ukuze ushintshe"</string>
+    <string name="emergency_gesture_number_override_notes" msgid="7270300987756837957">"Uma ufaka inombolo engeyona ephuthumayo:\n • Idivayisi yakho kufanele ivulwe ukuze ukwazi ukusebenzisa i-SOS yesimo esiphuthumayo\n • Ikholi yakho ingase ingaphendulwa"</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="2271217256447175017">"Swayipha izigxivizo zeminwe ukuze uthole izaziso"</string>
     <string name="fingerprint_gesture_screen_title" msgid="9086261338232806522">"Swayipha izigxivizo zeminwe"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="286662791588779673">"Ukuze uhlole izaziso zakho, swayiphela phansi kunzwa yezigxivizo zeminwe ngemuva kwefoni yakho."</string>
@@ -4608,6 +4652,11 @@
     <string name="autofill_max_visible_datasets" msgid="4970201981694392229">"Amadathasethi amakhulu abonakalayo"</string>
     <string name="autofill_reset_developer_options" msgid="6425613608979498608">"Setha kabusha kuye kumanani azenzakalelayo"</string>
     <string name="autofill_reset_developer_options_complete" msgid="1276741935956594965">"Izinketho zokugcwalisa ngokuzenzakalela zonjiniyela zisethwe kabusha"</string>
+    <string name="location_category" msgid="3496759112306219062">"Indawo"</string>
+    <string name="location_indicator_settings_title" msgid="6655916258720093451">"Isikhombi sendawo yebha yesimo"</string>
+    <string name="location_indicator_settings_description" msgid="2888022085372804021">"Bonisa kuzo zonke izindawo, okufaka phakathi inethiwekhi nokuxhumeka"</string>
+    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Phoqa izikali ezigcwele ze-GNSS"</string>
+    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Landelela onke ama-constellation nezimvamisa ngomjikelezo ongenawo umsebenzi"</string>
     <string name="device_theme" msgid="5027604586494772471">"Itimu yedivayisi"</string>
     <string name="default_theme" msgid="4815428567082263639">"Okuzenzakalelayo"</string>
     <string name="show_operator_name_title" msgid="3355910331531144028">"Igama lenethiwekhi"</string>
@@ -4624,8 +4673,6 @@
     <string name="zen_suggestion_summary" msgid="1984990920503217">"Misa isikhashana izikhangiso ukuze uhlale ugxilile"</string>
     <string name="disabled_feature" msgid="7151433782819744211">"Isici asitholakali"</string>
     <string name="disabled_feature_reason_slow_down_phone" msgid="5743569256308510404">"Lesi sici sivaliwe ngoba sibambezela ifoni yakho"</string>
-    <string name="enable_gnss_raw_meas_full_tracking" msgid="1206679951510243341">"Phoqa izikali ezigcwele ze-GNSS"</string>
-    <string name="enable_gnss_raw_meas_full_tracking_summary" msgid="3841463141138247167">"Landelela onke ama-constellation nezimvamisa ngomjikelezo ongenawo umsebenzi"</string>
     <string name="show_first_crash_dialog" msgid="1696584857732637389">"Njalo bonisa ibhokisi lokusaphazeka"</string>
     <string name="show_first_crash_dialog_summary" msgid="4692334286984681111">"Bonisa ibhokisi njalo izinhlelo zokusebenza zisaphazeka"</string>
     <string name="angle_enabled_app" msgid="6044941043384239076">"Khetha uhlelo lokusebenza olunikwe amandla lwe-ANGLE"</string>
@@ -4637,7 +4684,7 @@
     <string name="graphics_driver_all_apps_preference_title" msgid="1343065382898127360">"Nikela amandla zonke izinhlelo zokusebenza"</string>
     <string name="graphics_driver_app_preference_title" msgid="3133255818657706857">"Khetha i-Graphics Driver"</string>
     <string name="graphics_driver_app_preference_default" msgid="764432460281859855">"Okuzenzekelayo"</string>
-    <string name="graphics_driver_app_preference_game_driver" msgid="3115277644656023504">"Umshayeli wegeyimu"</string>
+    <string name="graphics_driver_app_preference_production_driver" msgid="1515874802568434915">"Umshayeli Wegeyimu"</string>
     <string name="graphics_driver_app_preference_prerelease_driver" msgid="7355929161805829480">"Isishayeli Sikanjiniyela"</string>
     <string name="graphics_driver_app_preference_system" msgid="3754748149113184126">"Umshayeli wemifanekiso yesistimu"</string>
     <!-- no translation found for graphics_driver_all_apps_preference_values:0 (8039644515855740879) -->
@@ -4693,7 +4740,7 @@
     <string name="prevent_ringing_option_mute_summary" msgid="4885288334872920616">"Kuvuliwe (thulisa)"</string>
     <string name="prevent_ringing_option_none_summary" msgid="7004926708584574224">"Valiwe"</string>
     <string name="pref_title_network_details" msgid="7329759534269363308">"Imininingwane yenethiwekhi"</string>
-    <string name="about_phone_device_name_warning" msgid="764557372426153827">"Igama ledivayisi yakho liyabonakala kuzinhlelo zokusebenza efonini yakho. Futhi lingabonwa ngabanye abantu uma uxhuma kumadivayisi e-Bluetooth noma usetha i-Wi-Fi hotspot."</string>
+    <string name="about_phone_device_name_warning" msgid="1938930553285875166">"Igama ledivayisi yakho libonakala kwizinhlelo zokusebenza kufoni yakho. Lingase futhi libonwe abanye abantu lapho uxhuma kumadivayisi we-Bluetooth, uxhuma kunethiwekhi ye-Wi-Fi noma usetha i-hotspot ye-Wi-Fi."</string>
     <string name="devices_title" msgid="649715719278562515">"Amadivayisi"</string>
     <string name="homepage_all_settings" msgid="1877827279189801035">"Zonke izilungiselelo"</string>
     <string name="homepage_personal_settings" msgid="8312279476519359656">"Iziphakamiso"</string>
@@ -4706,6 +4753,11 @@
     <string name="network_query_error" msgid="6406348372070035274">"Ayikwazanga ukuthola amanethiwekhi. Zama futhi."</string>
     <string name="forbidden_network" msgid="7404863971282262991">"(kunqatshelwe)"</string>
     <string name="no_sim_card" msgid="1497407489810953863">"Alikho ikhadi le-SIM."</string>
+    <string name="sim_card" msgid="6381158752066377709">"I-SIM"</string>
+    <string name="wifi_no_sim_card" msgid="7144290066491585672">"Ayikho i-SIM"</string>
+    <string name="wifi_no_related_sim_card" msgid="3568255415415630510">"Lutho"</string>
+    <string name="wifi_require_sim_card_to_connect" msgid="1524984445750423666">"Idinga i-SIM ukuze ixhume"</string>
+    <string name="wifi_require_specific_sim_card_to_connect" msgid="8136020469861668506">"Idinga i-SIM ye-<xliff:g id="WIRELESS_CARRIER">%s</xliff:g> ukuze ixhume"</string>
     <string name="preferred_network_mode_wcdma_perf_summary" msgid="230527592752934655">"Imodi yenethiwekhi ekhethwayo: i-WCDMA ekhethwayo"</string>
     <string name="preferred_network_mode_gsm_only_summary" msgid="2936969642076535162">"Imodi yenethiwekhi ekhethwayo: i-GSM kuphela"</string>
     <string name="preferred_network_mode_wcdma_only_summary" msgid="632816273979433076">"Imodi yenethiwekhi ekhethwayo: i-WCDMA kuphela"</string>
@@ -4759,6 +4811,7 @@
     <string name="mobile_data_settings_title" msgid="3927524078598009792">"Idatha yeselula"</string>
     <string name="mobile_data_settings_summary" msgid="7323978798199919063">"Finyelela kudatha usebenzisa inethiwekhi yeselula"</string>
     <string name="mobile_data_settings_summary_auto_switch" msgid="7851549787645698945">"Ifoni izoshintshela ngokuzenzakalela kule nkampani yenethiwekhi uma iseduze"</string>
+    <string name="mobile_data_settings_summary_unavailable" msgid="3309106501029928951">"Akukho SIM etholakalayo"</string>
     <string name="calls_preference" msgid="2166481296066890129">"Okuncamelayo kwamakholi"</string>
     <string name="sms_preference" msgid="7742964962568219351">"Okuncanyelwayo kwe-SMS"</string>
     <string name="calls_and_sms_ask_every_time" msgid="3178743088737726677">"Hlala ubuza njalo"</string>
@@ -4819,6 +4872,44 @@
     <string name="manual_mode_disallowed_summary" msgid="4243142645520152175">"Ayitholakali uma ixhumeke ku-<xliff:g id="CARRIER">%1$s</xliff:g>"</string>
     <string name="see_more" msgid="7499355691042812723">"Bona okuningi"</string>
     <string name="see_less" msgid="2642392725363552793">"Buka okuncane"</string>
+    <string name="sim_action_enable_sub_dialog_title" msgid="4003377033815971802">"Vula i-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name" msgid="4842051610633654278">"Vula i-SIM?"</string>
+    <string name="sim_action_switch_sub_dialog_title" msgid="9180969453358718635">"Shintshela ku-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="sim_action_switch_psim_dialog_title" msgid="5613177333235213024">"Shintshela ekusebenziseni iSIM card lakho?"</string>
+    <string name="sim_action_switch_sub_dialog_text" msgid="2091834911153293004">"I-SIM eyodwa kuphela engeziwa isebenze ngesikhathi esithile.\n\nUkushintshela ku-<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ngeke kuze kukhansele isevisi yakho ye-<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_downloaded" msgid="1396320209544698027">"I-SIM eyodwa kuphela elandiwe engeziwa isebenze ngesikhathi esithile.\n\nUkushintshela ku-<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g> ngeke kuze kukhansele isevisi yakho ye-<xliff:g id="FROM_CARRIER_NAME">%2$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_text_single_sim" msgid="6188750682431170845">"I-SIM eyodwa kuphela engenziwa isebenze ngesikhathi.\n\nUkushintsha ngeke kukhansele isevisi yakho ye-<xliff:g id="TO_CARRIER_NAME">%1$s</xliff:g>."</string>
+    <string name="sim_action_switch_sub_dialog_confirm" msgid="1901181581944638961">"Shintshela ku-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enabling_sim_without_carrier_name" msgid="2706862823501979981">"Ixhumeka kunethiwekhi…"</string>
+    <string name="sim_action_switch_sub_dialog_progress" msgid="8341013572582875574">"Shintshela ku-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>"</string>
+    <string name="sim_action_enable_sim_fail_title" msgid="1765646238941015899">"Ayikwazi ukushintsha inkampani yenethiwekhi"</string>
+    <string name="sim_action_enable_sim_fail_text" msgid="4781863235721417544">"Inkampani yenethiwekhi ayikwazi ukushintshwa ngenxa yephutha."</string>
+    <string name="privileged_action_disable_sub_dialog_title" msgid="3298942357601334418">"Vala i-<xliff:g id="CARRIER_NAME">%1$s</xliff:g>?"</string>
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier" msgid="6518373229436331608">"Vala i-SIM?"</string>
+    <string name="privileged_action_disable_sub_dialog_progress" msgid="5900243067681478102">"Ivala i-SIM<xliff:g id="ELLIPSIS">…</xliff:g>"</string>
+    <string name="privileged_action_disable_fail_title" msgid="6689494935697043555">"Ayikwazi ukukhubaza inkampani yenethiwekhi"</string>
+    <string name="privileged_action_disable_fail_text" msgid="8404023523406091819">"Kukhona okungahambanga kahle futhi inkampani yakho yenethiwekhi ayikwazanga ukukhutshazwa."</string>
+    <string name="sim_action_enable_dsds_title" msgid="226508711751577169">"Sebenzisa ama-SIM angu-2?"</string>
+    <string name="sim_action_enable_dsds_text" msgid="970986559326263949">"Le divayisi ingaba nama-SIM angu-2 ngesikhathi esisodwa. Ukuze uqhubeke nokusebenzisa i-SIM engu-1 ngesikhathi, thepha okuthi \"Cha ngiyabonga\"."</string>
+    <string name="sim_action_restart_title" msgid="7054617569121993825">"Qalisa kabusha idivayisi?"</string>
+    <string name="sim_action_restart_text" msgid="8019300474703571013">"Ukuze qalise, qalisa kabusha idivayisi yakho. Bese ungangeza enye i-SIM."</string>
+    <string name="sim_action_continue" msgid="1688813133152389943">"Qhubeka"</string>
+    <string name="sim_action_reboot" msgid="3508948833333441538">"Qala kabusha"</string>
+    <string name="sim_action_no_thanks" msgid="435717748384544195">"Cha ngiyabonga"</string>
+    <string name="sim_switch_button" msgid="1405772571706095387">"Shintsha"</string>
+    <string name="dsds_activation_failure_title" msgid="4467364110584914794">"Akukwazi ukwenza i-SIM isebenze"</string>
+    <string name="dsds_activation_failure_body_msg1" msgid="6303921196869256391">"Khipha i-SIM yakho bese uyifake futhi. Inkinga iyaqhubeka, qala kabusha idivayisi yakho."</string>
+    <string name="dsds_activation_failure_body_msg2" msgid="73044349546544410">"Zama ukuvula i-SIM futhi. Inkinga iyaqhubeka, qala kabusha idivayisi yakho."</string>
+    <string name="sim_setup_channel_id" msgid="8797972565087458515">"Ukwenziwa kusebenze kwenethiwekhi"</string>
+    <string name="post_dsds_reboot_notification_title_with_carrier" msgid="3308827462185135307">"I-<xliff:g id="CARRIER_NAME">%1$s</xliff:g> iyasebenza"</string>
+    <string name="post_dsds_reboot_notification_text" msgid="7533428378211541410">"Thepha ukuze ubuyekeze izilungiselelo ze-SIM"</string>
+    <string name="sim_card_label" msgid="5632157635124050923">"I-SIM card"</string>
+    <string name="erase_sim_dialog_title" msgid="881253002169177016">"Sula le SIM elandiwe?"</string>
+    <string name="erase_sim_dialog_text" msgid="753031064269699885">"Ukusula le-SIM kususa isevisi ye-<xliff:g id="CARRIER_NAME_A">%1$s</xliff:g> kusukela kule divayisi.\n\nIsevisi ye-<xliff:g id="CARRIER_NAME_B">%1$s</xliff:g> ngeke ize ikhanselwe."</string>
+    <string name="erase_sim_confirm_button" msgid="8309115684335320541">"Sula"</string>
+    <string name="erasing_sim" msgid="7877703231075699139">"Isula i-SIM…"</string>
+    <string name="erase_sim_fail_title" msgid="2024446702985862427">"Ayikwazi ukusula i-SIM"</string>
+    <string name="erase_sim_fail_text" msgid="7870804401227483131">"Le SIM ayikwazi ukusulwa ngenxa yephutha.\n\nQala kabusha idivayisi yakho uphinde uzame futhi."</string>
     <string name="network_connection_request_dialog_title" msgid="1896186380874289434">"Xhuma kudivayisi"</string>
     <string name="network_connection_request_dialog_summary" msgid="7693038309792726170">"Uhlelo lokusebenza le-<xliff:g id="APPNAME">%1$s</xliff:g> lifuna ukusebenzisa inethiwekhi ye-Wi‑Fi ukuxhuma kudivayisi yakho"</string>
     <string name="network_connection_timeout_dialog_message" msgid="598509083077743772">"Awekho amadivayisi atholiwe. Yenza isiqinisekiso sokuthi amadivayisi avuliwe futhi ayatholakala ukuze axhumeke."</string>
@@ -4890,6 +4981,9 @@
     <string name="wfc_disclaimer_emergency_limitation_title_text" msgid="8276287227589397162">"Amakholi aphuthumayo"</string>
     <string name="wfc_disclaimer_emergency_limitation_desc_text" msgid="5503902001191552196">"Amakholi aphuthumayo ngokushaya kwe-Wi-Fi awasekelwe inkampani yakho yenethiwekhi.\nIdivayisi ishintsha ngokuzenzakalela iye kunethiwekhi yeselula ukuze yenze ikholi ephuthumayo.\nAmakholi aphuthumayo akhonakala kuphela ezindaweni ezinokufakwa kweselula."</string>
     <string name="wifi_calling_summary" msgid="8566648389959032967">"Sebenzisa i-Wi‑Fi ngamakholi ukuthuthukisa ikhwalithi"</string>
+    <string name="cross_sim_calling_settings_title" msgid="1179406214047299816">"Ukushaya ikholi kwe-Cross SIM"</string>
+    <string name="cross_sim_calling_setting_summary" msgid="7960473304104701519">"Vumela amanye amakholi we-SIM kanye nama-SMS kule SIM."</string>
+    <string name="keywords_cross_sim_calling" msgid="1702104511020507778">"ukushaya ikholi kwe-cross sim"</string>
     <string name="enable_receiving_mms_notification_title" msgid="6465218559386990248">"Umlayezo ongenayo we-MMS"</string>
     <string name="enable_sending_mms_notification_title" msgid="7120641300854953375">"Ayikwazi ukuthumela umlayezo we-MMS"</string>
     <string name="enable_mms_notification_summary" msgid="6432752438276672500">"Thepha ukuze uvumele ukulayeza kwe-MMS ku-<xliff:g id="OPERATOR_NAME">%1$s</xliff:g> uma idatha yeselula ivaliwe"</string>
@@ -4941,10 +5035,44 @@
     <string name="overlay_settings_title" msgid="1032863083496396365">"Vumela ukumbozwa kwesikrini kokuthi Amasethingi"</string>
     <string name="overlay_settings_summary" msgid="2745336273786148166">"Vumela izinhlelo zokusebenza ezingabonisa ngaphezulu kwezinye izinhlelo zokusebenza ukumboza izikrini zokuthi Amasethingi"</string>
     <string name="media_controls_title" msgid="403271085636252597">"Imidiya"</string>
-    <string name="media_controls_summary" msgid="5032071475867165587">"Fihla umdlali lapho iseshini yemidiya isiphelile"</string>
-    <string name="media_controls_resume_description" msgid="2333689676163363582">"Umdlali ukuvumela ukuthi uqalise kabusha iseshini kusuka kuphaneli Yamasethingi asheshayo enwetshiwe"</string>
+    <string name="media_controls_summary" msgid="3573121049460596520">"I-Media player kokuthi Amasethingi asheshayo"</string>
+    <string name="media_controls_resume_description" msgid="7702723104730495227">"Bonisa i-media player isikhathi esandisiwe ukuze uqalise kabusha kalula ukudlala"</string>
     <string name="media_controls_hide_player" msgid="2751439192580884015">"Fihla umdlali"</string>
     <string name="media_controls_show_player" msgid="8504571042365814021">"Bonisa umdlali"</string>
     <string name="media_controls_no_players" msgid="3493023121892175946">"Abekho abadlali abatholakalayo"</string>
+    <string name="media_controls_apps_title" msgid="9129092193224838008">"Izinhlelo zokusebenza ezivunyelwe"</string>
     <string name="keywords_media_controls" msgid="8345490568291778638">"imidiya"</string>
+    <string name="connected_device_see_all_summary" msgid="2056010318537268108">"I-Bluetooth izovuleka"</string>
+    <string name="bluetooth_setting_on" msgid="4808458394436224124">"Vuliwe"</string>
+    <string name="bluetooth_setting_off" msgid="4965493913199554789">"Valiwe"</string>
+    <string name="provider_internet_settings" msgid="3831259474776313323">"I-inthanethi"</string>
+    <string name="provider_network_settings_title" msgid="2624756136016346774">"Ama-SIM"</string>
+    <string name="airplane_safe_networks" msgid="8689587134664565669">"Amanethiwekhi aphephile wendiza"</string>
+    <string name="airplane_safe_networks_summary" msgid="8352420324632195912">"Thola futhi xhuma kumanethiwekhi aphephile wendiza"</string>
+    <string name="keywords_airplane_safe_networks" msgid="5902708537892978245">"indiza, kuphephile kwindiza"</string>
+    <string name="calls_and_sms" msgid="1931855083959003306">"Amakholi ne-SMS"</string>
+    <string name="calls_and_sms_category" msgid="2021321997884906046">"Ukushaya kwe-Wi‑Fi"</string>
+    <string name="calls_sms_wfc_summary" msgid="4930471357980272294">"Yenza futhi thola amakholi ngamanethiwekhi angewona awenkampani yenethiwekhi njenge-Wi‑Fi"</string>
+    <string name="calls_sms_footnote" msgid="7002461875954024216">"Ukushaya kwe-Wi‑Fi kukuvumela ukuthi wenze futhi uthole amakholi ngamanethiwekhi angewona awenkampani yenethiwekhi njengamanye amanethiwekhi we-Wi-Fi."</string>
+    <string name="calls_preference_title" msgid="7536882032182563800">"Amakholi"</string>
+    <string name="sms_preference_title" msgid="8392745501754864395">"I-SMS"</string>
+    <string name="calls_sms_preferred" msgid="6016477652522583496">"okuncanyelwayo"</string>
+    <string name="calls_sms_calls_preferred" msgid="252913858812799809">"amakholi ancanyelwayo"</string>
+    <string name="calls_sms_sms_preferred" msgid="5826706870873784062">"I-SMS encanyelwayo"</string>
+    <string name="calls_sms_unavailable" msgid="4055729705246556529">"ayitholakali"</string>
+    <string name="calls_sms_no_sim" msgid="2336377399761819718">"Ayikho i-SIM"</string>
+    <string name="network_and_internet_preferences_title" msgid="8038469368705591439">"Okuncamelayo"</string>
+    <string name="network_and_internet_preferences_summary" msgid="613207494152304537">"Xhuma kumanethiwekhi asesidlangalaleni"</string>
+    <string name="keywords_internet" msgid="7674082764898690310">"uxhumano lenethiwekhi, i-inthanethi, okungenantambo, idatha, i-wifi, i-wi-fi, i-wi fi, iselula, iselula, inkampani yekholi, i-4g, i-3g, i-2g, i-lte"</string>
+    <string name="view_airplane_safe_networks" msgid="7390511371040078514">"Buka amanethiwekhi wendiza aphephile"</string>
+    <string name="turn_off_airplane_mode" msgid="1334192337050190071">"Vala imodi yendiza"</string>
+    <string name="aware_summary_when_bedtime_on" msgid="2063856008597376344">"Akutholakali ngoba imodi yesikhathi sokulala ivuliwe"</string>
+    <string name="reset_importance_completed" msgid="3595536767426097205">"Ukusetha kabusha ukubaluleka kwesaziso kuqediwe."</string>
+    <string name="apps_dashboard_title" msgid="3269953499954393706">"Izinhlelo zokusebenza"</string>
+    <string name="bluetooth_message_access_notification_content" msgid="2986108412562309009">"Idivayisi engathenjwa ifuna ukufinyelela imilayezo yakho. Thepha ukuze uthole imininingwane."</string>
+    <string name="bluetooth_message_access_dialog_title" msgid="9009836130395061579">"Vumela ukufinyelela kumilayezo?"</string>
+    <string name="bluetooth_message_access_dialog_content" msgid="6004506637437582983">"Idivayisi ye-Bluetooth engathenjwa, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ifuna ukufinyelela imilayezo yakho.\n\nAwukaze uxhume ku-[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ngaphambili."</string>
+    <string name="bluetooth_phonebook_access_notification_content" msgid="4280361621526852063">"Idivayisi engathenjwa ifuna ukufinyelela koxhumana nabo nakurekhodi lamakholi. Thepha ukuze uthole imininingwane."</string>
+    <string name="bluetooth_phonebook_access_dialog_title" msgid="7624607995928968721">"Vumela ukufinyelela koxhumana nabo nakurekhodi lamakholi?"</string>
+    <string name="bluetooth_phonebook_access_dialog_content" msgid="2235876209172857819">"Idivayisi ye-Bluetooth engathenjwa, [<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>], ifuna ukufinyelela koxhumana nabo nakurekhodi lamakholi. Lokhu kufaka phakathi nedatha emayelana namakholi angenayo naphumayo.\n\nAwukaze uxhume ku-[<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>] ngaphambili."</string>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1ad3cc3..f8df920 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -749,6 +749,17 @@
         <item>Long</item>
     </string-array>
 
+    <!-- Avoid the gender issue, create the new fork of the string long_press_timeout_selector_titles -->
+    <!-- Titles for the list of long press timeout options in preference. -->
+    <string-array name="long_press_timeout_selector_list_titles">
+        <!-- A title for the option for short long-press timeout [CHAR LIMIT=25] -->
+        <item>Short</item>
+        <!-- A title for the option for medium long-press timeout [CHAR LIMIT=25] -->
+        <item>Medium</item>
+        <!-- A title for the option for long long-press timeout [CHAR LIMIT=25] -->
+        <item>Long</item>
+    </string-array>
+
     <!-- Values for the list of long press timeout options. -->
     <string-array name="long_press_timeout_selector_values" translatable="false">
         <item>400</item>
@@ -1071,6 +1082,7 @@
         <item>daltonizer_mode_deuteranomaly</item>
         <item>daltonizer_mode_protanomaly</item>
         <item>daltonizer_mode_tritanomaly</item>
+        <item>daltonizer_mode_grayscale</item>
     </string-array>
 
     <!-- Values for display color space adjustment modes for accessibility -->
@@ -1078,6 +1090,7 @@
         <item>12</item>
         <item>11</item>
         <item>13</item>
+        <item>0</item>
     </integer-array>
 
     <!-- Battery saver mode: allowable trigger threshold levels. -->
@@ -1352,7 +1365,7 @@
         <item>CDMA/EvDo/GSM/WCDMA</item>
         <item>CDMA + LTE/EvDo</item>
         <item>GSM/WCDMA/LTE</item>
-        <item>Global</item>
+        <item>LTE/CDMA/EvDo/GSM/WCDMA</item>
         <item>LTE</item>
         <item>LTE / WCDMA</item>
         <item>TDSCDMA only</item>
@@ -1369,7 +1382,8 @@
         <item>NR/LTE</item>
         <item>NR/LTE/CDMA/EvDo</item>
         <item>NR/LTE/GSM/WCDMA</item>
-        <item>NR/LTE/CDMA/EvDo/GSM/WCDMA</item>
+        <!-- Global includes NR/LTE/CDMA/EvDo/GSM/WCDMA -->
+        <item>Global</item>
         <item>NR/LTE/WCDMA</item>
         <item>NR/LTE/TDSCDMA</item>
         <item>NR/LTE/TDSCDMA/GSM</item>
@@ -1461,14 +1475,14 @@
         <item>@string/enhanced_4g_lte_mode_summary_4g_calling</item>
     </string-array>
 
-    <!-- A whitelist which packages won't show summary in battery usage screen.  [CHAR LIMIT=NONE] -->
-    <string-array name="whitelist_hide_summary_in_battery_usage" translatable="false">
+    <!-- An allowlist which packages won't show summary in battery usage screen.  [CHAR LIMIT=NONE] -->
+    <string-array name="allowlist_hide_summary_in_battery_usage" translatable="false">
         <!-- Google -->
         <item>"com.google.android.googlequicksearchbox"</item>
     </string-array>
 
     <!-- Array of titles palette list for accessibility. -->
-    <string-array name="setting_palette_colors" translatable="false" >
+    <string-array name="setting_palette_data" translatable="false" >
         <item>@string/color_red</item>
         <item>@string/color_orange</item>
         <item>@string/color_yellow</item>
@@ -1476,10 +1490,11 @@
         <item>@string/color_cyan</item>
         <item>@string/color_blue</item>
         <item>@string/color_purple</item>
+        <item>@string/color_gray</item>
     </string-array>
 
     <!-- Values for palette list view preference. -->
-    <array name="setting_palette_data" translatable="false" >
+    <array name="setting_palette_colors" translatable="false" >
         <item>@color/palette_list_color_red</item>
         <item>@color/palette_list_color_orange</item>
         <item>@color/palette_list_color_yellow</item>
@@ -1487,6 +1502,7 @@
         <item>@color/palette_list_color_cyan</item>
         <item>@color/palette_list_color_blue</item>
         <item>@color/palette_list_color_purple</item>
+        <item>@color/palette_list_color_gray</item>
     </array>
 
     <!--String arrays for showing the rtt settings options -->
@@ -1501,4 +1517,19 @@
         <item>@string/rtt_settings_always_visible</item>
     </string-array>
 
+    <!-- Array of titles list for one-handed timeout options. [DO NOT TRANSLATE] -->
+    <string-array name="one_handed_timeout_title" translatable="false">
+        <item>@string/screensaver_settings_summary_never</item>
+        <item>@string/one_handed_timeout_short</item>
+        <item>@string/one_handed_timeout_medium</item>
+        <item>@string/one_handed_timeout_long</item>
+    </string-array>
+
+    <!-- Values of list for one-handed timeout options. [DO NOT TRANSLATE] -->
+    <string-array name="one_handed_timeout_values" translatable="false">
+        <item>0</item>
+        <item>4</item>
+        <item>8</item>
+        <item>12</item>
+    </string-array>
 </resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index ee47124..f78120c 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -148,6 +148,13 @@
         <attr name="thickness" format="dimension" />
     </declare-styleable>
 
+    <!-- For biometric enroll checkboxes -->
+    <declare-styleable name="BiometricEnrollCheckbox">
+        <attr name="icon" format="reference" />
+        <attr name="title" format="reference" />
+        <attr name="description" format="reference" />
+    </declare-styleable>
+
     <!-- For Face enroll accessibility toggle -->
     <declare-styleable name="FaceEnrollAccessibilityToggle">
         <attr name="messageText" format="reference" />
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 06f135f..58b8aa4 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -129,6 +129,7 @@
     <color name="notification_importance_button_unselected">#DADCE0</color>
     <color name="notification_importance_button_selected">#1967D2</color> <!-- material blue 700 -->
     <color name="notification_importance_selection_bg">#FFFFFF</color>
+    <color name="notification_history_background">?android:attr/colorBackgroundFloating</color>
 
     <!-- launcher icon color -->
     <color name="icon_launcher_setting_color">@*android:color/accent_device_default_light</color>
@@ -158,6 +159,7 @@
     <color name="palette_list_color_cyan">#12b5cb</color> <!-- Material Cyan 600 -->
     <color name="palette_list_color_blue">#1a73e8</color> <!-- Material Blue 600 -->
     <color name="palette_list_color_purple">#9334e6</color> <!-- Material Purple 600 -->
+    <color name="palette_list_color_gray">#80868b</color> <!-- Material Gray 600 -->
 
     <!-- Palette list preference dark mode colors. -->
     <color name="palette_list_dark_mode_color_red">#f28b82</color> <!-- Material Red 300 -->
@@ -167,5 +169,21 @@
     <color name="palette_list_dark_mode_color_cyan">#78d9ec</color> <!-- Material Cyan 300 -->
     <color name="palette_list_dark_mode_color_blue">#8AB4F8</color> <!-- Material Blue 300 -->
     <color name="palette_list_dark_mode_color_purple">#c58af9</color> <!-- Material Purple 300 -->
+    <color name="palette_list_dark_mode_color_gray">#dadce0</color> <!-- Material Gray 300 -->
 
+    <!-- SIM colors -->
+    <color name="SIM_color_teal">#ff00796b</color> <!-- Material Teal 700 -->
+    <color name="SIM_color_blue">#ff3367d6</color> <!-- Material Blue 700 -->
+    <color name="SIM_color_indigo">#ff303f9f</color> <!-- Material Indigo 700 -->
+    <color name="SIM_color_purple">#ff7b1fa2</color> <!-- Material Purple 700 -->
+    <color name="SIM_color_pink">#ffc2185b</color> <!-- Material Pink 700 -->
+    <color name="SIM_color_red">#ffd32f2f</color> <!-- Material Red 700 -->
+
+    <!-- Dark mode SIM colors -->
+    <color name="SIM_dark_mode_color_teal">#ff80cbc4</color> <!-- Material Teal 200 -->
+    <color name="SIM_dark_mode_color_blue">#ff90caf9</color> <!-- Material Blue 200 -->
+    <color name="SIM_dark_mode_color_indigo">#ffc5cae9</color> <!-- Material Indigo 100 -->
+    <color name="SIM_dark_mode_color_purple">#ffe1bee7</color> <!-- Material Purple 100 -->
+    <color name="SIM_dark_mode_color_pink">#fff48fb1</color> <!-- Material Pink 200 -->
+    <color name="SIM_dark_mode_color_red">#ffef9a9a</color> <!-- Material Red 200 -->
 </resources>
\ No newline at end of file
diff --git a/res/values/config.xml b/res/values/config.xml
index 746d3e7..9a6e486 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -49,6 +49,8 @@
     <string name="config_wallpaper_picker_class" translatable="false">com.android.settings.Settings$WallpaperSettingsActivity</string>
     <!-- Fully-qualified class name for the styles & wallpaper picker activity. -->
     <string name="config_styles_and_wallpaper_picker_class" translatable="false"></string>
+    <!-- Intent extra for wallpaper picker activity. -->
+    <string name="config_wallpaper_picker_launch_extra" translatable="false">com.android.wallpaper.LAUNCH_SOURCE</string>
 
     <!-- Manufacturer backup settings to launch -->
     <string name="config_backup_settings_intent" translatable="false"></string>
@@ -120,8 +122,8 @@
         <!--
         <item>com.example.package.first/com.example.class.FirstService</item>
         <item>com.example.package.second/com.example.class.SecondService</item>
-        <item>toggle_master_mono</item>
-        <item>seekbar_master_balance</item>
+        <item>toggle_primary_mono</item>
+        <item>seekbar_primary_balance</item>
         <item>...</item>
         -->
     </string-array>
@@ -152,8 +154,8 @@
         -->
     </string-array>
 
-    <!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
-    <string-array name="slice_whitelist_package_names" translatable="false"/>
+    <!-- List of packages that should be allowlisted for slice uri access. Do not translate -->
+    <string-array name="slice_allowlist_package_names" translatable="false"/>
 
     <!-- Whether or not App & Notification screen should display recently used apps -->
     <bool name="config_display_recent_apps">true</bool>
@@ -457,9 +459,18 @@
     <!-- Whether nfc detection point preview image is available or not. -->
     <bool name="config_nfc_detection_point">false</bool>
 
-    <!-- Whether to show Enhanced Connectivity switch in Developer Options -->
-    <bool name="config_show_enhanced_connectivity">false</bool>
-
     <!-- Whether to show Smooth Display feature in Settings Options -->
     <bool name="config_show_smooth_display">false</bool>
+
+    <!-- Whether to show emergency gesture in Settings -->
+    <bool name="config_show_emergency_gesture_settings">true</bool>
+
+    <!-- Optional package name if another 1p app wants to take over the emergency gesture settings UI -->
+    <string name="emergency_gesture_settings_package"></string>
+
+    <!-- Whether to show the Preference for Adaptive connectivity -->
+    <bool name="config_show_adaptive_connectivity">false</bool>
+
+    <!-- Authority of advanced device battery prediction -->
+    <string name="config_battery_prediction_authority" translatable="false"></string>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index dc23c3d..bc01d59 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,9 +51,6 @@
     <dimen name="pager_tabs_title_padding">16dp</dimen>
     <dimen name="pager_tabs_selected_indicator_height">3dp</dimen>
 
-    <!-- Minimum width for the popup for updating a user's photo. -->
-    <dimen name="update_user_photo_popup_min_width">300dip</dimen>
-
     <dimen name="captioning_preview_height">200dp</dimen>
 
     <dimen name="autoclick_preview_height">200dp</dimen>
@@ -126,18 +123,20 @@
     <dimen name="switchbar_subsettings_margin_start">72dp</dimen>
     <dimen name="switchbar_subsettings_margin_end">16dp</dimen>
 
-    <dimen name="search_bar_margin">16dp</dimen>
-
+    <!-- Search bar and avatar -->
+    <dimen name="search_bar_margin">24dp</dimen>
     <dimen name="search_bar_height">48dp</dimen>
-    <dimen name="search_bar_corner_radius">2dp</dimen>
-    <dimen name="search_bar_text_size">16dp</dimen>
+    <dimen name="search_bar_text_size">16sp</dimen>
     <dimen name="search_bar_card_elevation">2dp</dimen>
     <dimen name="search_bar_content_inset">64dp</dimen>
-    <dimen name="search_bar_avatar_end_padding">16dp</dimen>
-    <!-- 32dp (avatar size) + 16 dp (search_bar_avatar_end_padding) -->
-    <dimen name="search_bar_avatar_width">48dp</dimen>
-    <!-- (search_bar_height 48dp - avatar size 32dp) / 2  -->
-    <dimen name="search_bar_avatar_top_bottom_padding">8dp</dimen>
+    <dimen name="avatar_length">@dimen/search_bar_height</dimen>
+
+    <!-- Contextual suggestions -->
+    <dimen name="suggestion_height">224dp</dimen>
+    <dimen name="suggestion_padding_horizontal">24dp</dimen>
+    <dimen name="suggestion_padding_bottom">8dp</dimen>
+    <dimen name="suggestion_button_margin_top">16dp</dimen>
+    <dimen name="suggestion_button_padding_horizontal">24dp</dimen>
 
     <!-- Dimensions for Wifi Assistant Card -->
     <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
@@ -326,8 +325,9 @@
     <!-- Margin for the reset screens -->
     <dimen name="reset_network_margin_start">72dp</dimen>
     <dimen name="reset_network_margin_end">12dp</dimen>
-    <dimen name="reset_master_clear_margin_start">32dp</dimen>
-    <dimen name="reset_master_clear_margin_end">12dp</dimen>
+    <dimen name="reset_main_clear_margin_start">32dp</dimen>
+    <dimen name="reset_main_clear_margin_end">12dp</dimen>
+    <dimen name="reset_button_margin_end">20dp</dimen>
 
     <!-- Padding for the reset screens -->
     <dimen name="reset_checkbox_padding_end">8dp</dimen>
diff --git a/res/values/integers.xml b/res/values/integers.xml
index 7a6e0aa..3d73f64 100644
--- a/res/values/integers.xml
+++ b/res/values/integers.xml
@@ -20,4 +20,5 @@
     <integer name="job_anomaly_config_update">101</integer>
     <integer name="job_anomaly_detection">102</integer>
     <integer name="device_index_update">103</integer>
+    <integer name="sim_notification_send">104</integer>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5652c01..ebc8fc5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -571,11 +571,10 @@
     <string name="date_and_time_settings_title_setup_wizard">Set date and time</string>
     <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
     <string name="date_and_time_settings_summary">Set date, time, time zone, &amp; formats</string>
-    <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=100] -->
-    <string name="date_time_auto">Use network-provided time</string>
-    <!-- Date & time setting screen setting option text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
-        [CHAR LIMIT=100]  -->
-    <string name="zone_auto_title">Use network-provided time zone</string>
+    <!-- Date & time setting screen setting switch title: whether the system clock (UTC time) should be determined automatically [CHAR LIMIT=100] -->
+    <string name="date_time_auto">Set time automatically</string>
+    <!-- Date & time setting screen setting switch title: whether the time zone should be determined automatically [CHAR LIMIT=100]  -->
+    <string name="zone_auto_title">Set time zone automatically</string>
     <!-- Date & time setting screen setting option summary text for the automatic 24 hour setting checkbox [CHAR LIMIT=100] -->
     <string name="date_time_24hour_auto">Use locale default</string>
     <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
@@ -666,8 +665,8 @@
     <string name="Accounts_settings_title">Accounts</string>
     <!-- Main Settings screen setting option title for the item to take you to the location screen -->
     <string name="location_settings_title">Location</string>
-    <!-- Used in the location settings to control turning on/off the feature entirely -->
-    <string name="location_settings_master_switch_title">Use location</string>
+    <!-- Used in the location settings to control turning on/off the feature entirely [CHAR LIMIT=60] -->
+    <string name="location_settings_primary_switch_title">Use location</string>
     <!-- Summary for Location settings when location is off [CHAR LIMIT=NONE] -->
     <string name="location_settings_summary_location_off">Off</string>
     <!-- Summary for Location settings when location is on, explaining how many apps have location permission [CHAR LIMIT=NONE]-->
@@ -711,6 +710,26 @@
     <!-- Summary for Security settings when fingerprint is not supported [CHAR LIMIT=NONE]-->
     <string name="security_dashboard_summary_no_fingerprint">Screen lock</string>
 
+    <!-- Biometric enrollment for devices with multiple sensors --><skip />
+    <!-- Introduction title shown in biometric enrollment screen for devices that have both fingerprint and face. [CHAR LIMIT=60] -->
+    <string name="multi_biometric_enroll_title">Unlock your phone securely with your face and fingerprint</string>
+    <!-- Introduction subtitle shown in the biometric enrollment screen. [CHAR LIMIT=60] -->
+    <string name="multi_biometric_enroll_subtitle">You can also sign in to apps and confirm payments</string>
+    <!-- Section description preceding the biometric sensors available for the user to select for enrollment. [CHAR LIMIT=40] -->
+    <string name="multi_biometric_enroll_setup_with">Set up unlock with:</string>
+    <!-- Title for a preference containing a checkbox which if selected will allow the user to proceed to set up face unlock. [CHAR LIMIT=32] -->
+    <string name="multi_biometric_enroll_face_unlock_title">Face unlock</string>
+    <!-- Description for a preference containing a checkbox which if selected will allow the user to set up face unlock. [CHAR LIMIT=40] -->
+    <string name="multi_biometric_enroll_face_unlock_description">Make unlocking your phone a breeze</string>
+    <!-- Title for a preference containing a checkbox which if selected will allow the user to proceed to set up fingerprint unlock. [CHAR LIMIT=32] -->
+    <string name="multi_biometric_enroll_fingerprint_unlock_title">Fingerprint</string>
+    <!-- Description for a preference containing a checkbox which if selected will allow the user to set up fingerprint unlock. [CHAR LIMIT=40] -->
+    <string name="multi_biometric_enroll_fingerprint_unlock_description">Save time unlocking phone in your pocket</string>
+    <!-- Button for skipping biometric enrollment. [CHAR LIMIT=30] -->
+    <string name="multi_biometric_enroll_skip">Skip</string>
+    <!-- Button for starting biometric enrollment. [CHAR LIMIT=30] -->
+    <string name="multi_biometric_enroll_next">Next</string>
+
     <!-- Face enrollment and settings --><skip />
     <!-- Message shown in summary field when face unlock is set up. [CHAR LIMIT=40] -->
     <string name="security_settings_face_preference_summary">Face added</string>
@@ -730,6 +749,12 @@
     <string name="security_settings_face_enroll_education_message"></string>
     <!-- Button that takes the user to the enrollment activity [CHAR LIMIT=20] -->
     <string name="security_settings_face_enroll_education_start">Start</string>
+    <!-- Confirmation dialog message shown when users with system accessibility features enabled try to start the non-accessibility version of enrollment [CHAR LIMIT=150] -->
+    <string name="security_settings_face_enroll_education_accessibility_dialog_message">If accessibility face unlock is turned off, some setup steps may not work properly with TalkBack.</string>
+    <!-- Negative button text for users who were shown the accessibility dialog [CHAR LIMIT=10] -->
+    <string name="security_settings_face_enroll_education_accessibility_dialog_negative">Go back</string>
+    <!-- Positive button text for users who were shown the accessibility dialog [CHAR LIMIT=20] -->
+    <string name="security_settings_face_enroll_education_accessibility_dialog_positive">Continue setup</string>
     <!-- Button shown which shows accessibility toggles for face enrollment when clicked. [CHAR LIMIT=32] -->
     <string name="security_settings_face_enroll_introduction_accessibility">Use accessibility setup</string>
     <!-- Additional details shown when the accessibility toggle is expanded. [CHAR LIMIT=NONE]-->
@@ -819,9 +844,11 @@
     <!-- Button text in face settings which lets the user enroll their face [CHAR LIMIT=40] -->
     <string name="security_settings_face_settings_enroll">Set up face unlock</string>
     <!-- Text shown in face settings explaining what your face can be used for. [CHAR LIMIT=NONE] -->
-    <string name="security_settings_face_settings_footer">Use face unlock to unlock your device, sign in to apps, and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don\u2019t intend to.\n\nYour phone can be unlocked by someone else if it\u2019s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling.</string>
+    <string name="security_settings_face_settings_top_intro">Use face unlock to unlock your device, sign in to apps, and confirm payments.</string>
+    <!-- Text shown in face settings explaining what your face can be used for. [CHAR LIMIT=NONE] -->
+    <string name="security_settings_face_settings_footer">Keep in mind:\nLooking at the phone can unlock it when you don\u2019t intend to.\n\nYour phone can be unlocked by someone else if it\u2019s held up to your face.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling.</string>
     <!-- Text shown in face settings explaining what your face can be used for. Used when attention checking is not supported. [CHAR LIMIT=NONE] -->
-    <string name="security_settings_face_settings_footer_attention_not_supported">Use face unlock to unlock your device, sign in to apps, and confirm payments.\n\nKeep in mind:\nLooking at the phone can unlock it when you don\u2019t intend to.\n\nYour phone can be unlocked by someone else if it\u2019s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling.</string>
+    <string name="security_settings_face_settings_footer_attention_not_supported">Keep in mind:\nLooking at the phone can unlock it when you don\u2019t intend to.\n\nYour phone can be unlocked by someone else if it\u2019s held up to your face, even if your eyes are closed.\n\nYour phone can be unlocked by someone who looks a lot like you, say, an identical sibling.</string>
     <!-- Dialog title shown when the user removes an enrollment [CHAR LIMIT=35] -->
     <string name="security_settings_face_settings_remove_dialog_title">Delete face data?</string>
     <!-- Dialog contents shown when the user removes an enrollment [CHAR LIMIT=NONE] -->
@@ -859,6 +886,8 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_setup">Use your fingerprint to unlock your phone or approve purchases.\n\nNote: Your fingerprint may be less secure than a strong pattern or PIN.</string>
     <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_cancel">Cancel</string>
+    <!-- Button text to cancel enrollment [CHAR LIMIT=30] -->
+    <string name="security_settings_fingerprint_enroll_introduction_no_thanks">No thanks</string>
     <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
     <string name="security_settings_fingerprint_enroll_introduction_continue">Continue</string>
     <!-- Button text to cancel enrollment from the introduction (this string variant is used while in setup wizard) [CHAR LIMIT=22] -->
@@ -933,6 +962,12 @@
     <string name="face_lock_screen_setup_skip_dialog_text" product="device">By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel. </string>
     <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set face unlock. (default) [CHAR LIMIT=NONE] -->
     <string name="face_lock_screen_setup_skip_dialog_text" product="default">By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up face unlock. To go back, tap Cancel.</string>
+    <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set biometric unlock. (tablet) [CHAR LIMIT=NONE] -->
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="tablet">By protecting your tablet with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel. </string>
+    <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set biometric unlock. (device) [CHAR LIMIT=NONE] -->
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="device">By protecting your device with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel. </string>
+    <!-- Dialog text shown when the user tries to skip setting up a screen lock, warning that they can't continue to set biometric unlock. (default) [CHAR LIMIT=NONE] -->
+    <string name="biometrics_lock_screen_setup_skip_dialog_text" product="default">By protecting your phone with a screen lock option, no one will be able to use it if it is lost or stolen. You also need a screen lock option to set up biometrics. To go back, tap Cancel.</string>
     <!-- Title of dialog shown when the user tries to skip setting up a PIN, warning them of potential consequences of not doing so [CHAR LIMIT=48]-->
     <string name="lock_screen_pin_skip_title">Skip PIN setup?</string>
     <!-- Title of dialog shown when the user tries to skip setting up a password, warning them of potential consequences of not doing so [CHAR LIMIT=48]-->
@@ -1173,11 +1208,8 @@
     <!-- Description text for screen in setup wizard asking user to set up screen lock, explaining to the user how setting up a screen lock protect them from losing data. (phone) [CHAR LIMIT=NONE] -->
     <string name="setup_lock_settings_picker_message" product="default">Prevent others from using this phone without your permission by activating device protection features. Choose the screen lock you want to use.</string>
 
-    <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
-    <string name="lock_settings_picker_fingerprint_message">Choose your backup screen lock method</string>
-
-    <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for face unlock. Users can choose to use this method to unlock the screen instead of face unlock, or when face unlock is not accepted. [CHAR LIMIT=80] -->
-    <string name="lock_settings_picker_face_message">Choose your backup screen lock method</string>
+    <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for biometrics. Users can choose to use this method to unlock the screen instead of biometrics, or when biometrics are not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
+    <string name="lock_settings_picker_biometric_message">Choose your backup screen lock method</string>
 
     <!-- Label for button in screen lock settings, allowing users to choose other types of screen locks. [CHAR LIMIT=40] -->
     <string name="setup_lock_settings_options_button_label">Screen lock options</string>
@@ -1241,34 +1273,37 @@
 
     <!-- Title for preference that guides the user through creating a backup unlock pattern for fingerprint [CHAR LIMIT=45]-->
     <string name="fingerprint_unlock_set_unlock_pattern">Fingerprint + Pattern</string>
-
     <!-- Title for preference that guides the user through creating a backup unlock PIN for fingerprint [CHAR LIMIT=45]-->
     <string name="fingerprint_unlock_set_unlock_pin">Fingerprint + PIN</string>
-
     <!-- Title for preference that guides the user through creating a backup unlock password for fingerprint [CHAR LIMIT=45]-->
     <string name="fingerprint_unlock_set_unlock_password">Fingerprint + Password</string>
-
     <!-- Title for preference that guides the user to skip fingerprint setup [CHAR LIMIT=60]-->
     <string name="fingerprint_unlock_skip_fingerprint">Continue without fingerprint</string>
-
     <!-- Message shown in screen lock picker while setting up the new screen lock with fingerprint option. [CHAR LIMIT=NONE]-->
     <string name="fingerprint_unlock_title">You can unlock your phone using your fingerprint. For security, this option requires a backup screen lock.</string>
 
     <!-- Title for preference that guides the user through creating a backup unlock pattern for face unlock [CHAR LIMIT=45]-->
     <string name="face_unlock_set_unlock_pattern">Face unlock + Pattern</string>
-
     <!-- Title for preference that guides the user through creating a backup unlock PIN for face unlock [CHAR LIMIT=45]-->
     <string name="face_unlock_set_unlock_pin">Face unlock + PIN</string>
-
     <!-- Title for preference that guides the user through creating a backup unlock password for face unlock [CHAR LIMIT=45]-->
     <string name="face_unlock_set_unlock_password">Face unlock + Password</string>
-
     <!-- Title for preference that guides the user to skip face unlock setup [CHAR LIMIT=60]-->
     <string name="face_unlock_skip_face">Continue without face unlock</string>
-
     <!-- Message shown in screen lock picker while setting up the new screen lock with face unlock option. [CHAR LIMIT=NONE] -->
     <string name="face_unlock_title">You can unlock your phone using your face. For security, this option requires a backup screen lock.</string>
 
+    <!-- Title for preference that guides the user through creating a backup unlock pattern for biometrics unlock [CHAR LIMIT=45]-->
+    <string name="biometrics_unlock_set_unlock_pattern">Biometrics + Pattern</string>
+    <!-- Title for preference that guides the user through creating a backup unlock PIN for biometrics unlock [CHAR LIMIT=45]-->
+    <string name="biometrics_unlock_set_unlock_pin">Biometrics + PIN</string>
+    <!-- Title for preference that guides the user through creating a backup unlock password for biometrics unlock [CHAR LIMIT=45]-->
+    <string name="biometrics_unlock_set_unlock_password">Biometrics + Password</string>
+    <!-- Title for preference that guides the user to skip face unlock setup [CHAR LIMIT=60]-->
+    <string name="biometrics_unlock_skip_biometrics">Continue without biometrics</string>
+    <!-- Message shown in screen lock picker while setting up the new screen lock with biometrics option. [CHAR LIMIT=NONE] -->
+    <string name="biometrics_unlock_title">You can unlock your phone using your biometrics. For security, this option requires a backup screen lock.</string>
+
     <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
     <string name="unlock_set_unlock_disabled_summary">Disabled by admin, encryption policy, or
         credential storage</string>
@@ -1412,9 +1447,6 @@
     <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
     <string name="lockpassword_pin_recently_used">Device admin doesn\'t allow using a recent PIN</string>
 
-    <!-- Error shown when a user is choosing a PIN for their work phone, but what they suggest is blocked by their company's IT administrator. The user should try another PIN that's less common and more complicated. -->
-    <string name="lockpassword_pin_blacklisted_by_admin">Common PINs are blocked by your IT admin. Try a different PIN.</string>
-
     <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
     <string name="lockpassword_illegal_character">This can\'t include an invalid character</string>
 
@@ -1472,9 +1504,6 @@
     <string name="lockpassword_password_recently_used">Device admin doesn\'t allow using a recent
         password</string>
 
-    <!-- Error shown when a user is choosing a PASSWORD for their work phone, but what they suggest is blocked by their company's IT administrator. The user should try another PASSWORD that's less common and more complicated. -->
-    <string name="lockpassword_password_blacklisted_by_admin">Common passwords are blocked by your IT admin. Try a different password.</string>
-
     <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
     <string name="lockpassword_pin_no_sequential_digits">Ascending, descending, or repeated sequence
         of digits isn\'t allowed</string>
@@ -1664,7 +1693,7 @@
     <!--  Bluetooth device details. In the confirmation dialog for unpairing a paired device, this is the label on the button that will complete the unpairing action. -->
     <string name="bluetooth_unpair_dialog_forget_confirm_button">Forget device</string>
 
-    <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
+    <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the users to choose which one they want to connect to. -->
     <string name="bluetooth_connect_specific_profiles_title">Connect to\u2026</string>
 
     <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
@@ -1834,7 +1863,7 @@
     <string name="wifi_settings">Wi\u2011Fi</string>
 
     <!-- Used in the Wi-Fi settings screen to control turning on/off Wi-Fi entirely [CHAR LIMIT=30]-->
-    <string name="wifi_settings_master_switch_title">Use Wi\u2011Fi</string>
+    <string name="wifi_settings_primary_switch_title">Use Wi\u2011Fi</string>
     <!-- Title of the Wi-fi settings screen -->
     <string name="wifi_settings_category">Wi\u2011Fi settings</string>
     <!-- Title of the Wi-fi settings entry in the left top level menu -->
@@ -2059,7 +2088,7 @@
     <!-- Title for the fragment to share Wi-Fi [CHAR LIMIT=50]  -->
     <string name="wifi_dpp_share_wifi">Share Wi\u2011Fi</string>
     <!-- Hint for the user to use another device to scan QR code on screen to join Wi-Fi [CHAR LIMIT=NONE] -->
-    <string name="wifi_dpp_scan_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d and share the password</string>
+    <string name="wifi_dpp_scan_qr_code_with_another_device">Scan this QR code with another device to join \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>
     <!-- Hint for the user to use another device to scan QR code on screen to join a open Wi-Fi [CHAR LIMIT=NONE] -->
     <string name="wifi_dpp_scan_open_network_qr_code_with_another_device">Scan this QR code to connect to \u201c<xliff:g id="ssid" example="OfficeWifi">%1$s</xliff:g>\u201d</string>
     <!-- Hint for Wi-Fi DPP handshake failure [CHAR LIMIT=NONE]  -->
@@ -2112,9 +2141,7 @@
          when signal of the Wi-Fi network is reachable [CHAR LIMIT=50]  -->
     <string name="wifi_auto_connect_title">Auto\u2011connect</string>
     <!-- Hint for Wi-Fi Auto-connect [CHAR LIMIT=NONE]  -->
-    <string name="wifi_auto_connect_summary" product="default">Allow phone to automatically connect near this network</string>
-    <!-- Hint for Wi-Fi Auto-connect [CHAR LIMIT=NONE]  -->
-    <string name="wifi_auto_connect_summary" product="tablet">Allow tablet to automatically connect near this network</string>
+    <string name="wifi_auto_connect_summary">Allow connection to this network when in range</string>
     <!-- Label for "Use a QR code to add a device to this network" [CHAR LIMIT=50]  -->
     <string name="wifi_dpp_add_device">Add device</string>
     <!-- Hint for "Add device" [CHAR LIMIT=NONE]  -->
@@ -2137,8 +2164,6 @@
     <string name="wifi_do_not_provide_eap_user_cert">Do not provide</string>
     <!-- Menu option for not validating the EAP server -->
     <string name="wifi_do_not_validate_eap_server">Do not validate</string>
-    <!-- Warning message displayed if user choses not to validate the EAP server -->
-    <string name="wifi_do_not_validate_eap_server_warning">No certificate specified. Your connection will not be private.</string>
     <!-- Warning message displayed if network name (ssid) is too long -->
     <string name="wifi_ssid_too_long">Network name is too long.</string>
     <!-- Warning message displayed if user does not specify a domain for the CA certificate.
@@ -2195,6 +2220,8 @@
     <string name="wifi_turned_on_message">Wi\u2011Fi turned on</string>
     <!-- A notification for connected to a Wi-Fi network [CHAR LIMIT=NONE] -->
     <string name="wifi_connected_to_message">Connected to <xliff:g id="network_name" example="MyNetwork">%1$s</xliff:g></string>
+    <!-- A notification for connecting to a Wi-Fi network [CHAR LIMIT=NONE] -->
+    <string name="wifi_connecting_to_message">Connecting to <xliff:g id="network_name" example="MyNetwork">%1$s</xliff:g></string>
     <!-- Button label to connecting progress to a Wi-Fi network [CHAR LIMIT=20] -->
     <string name="wifi_connecting">Connecting\u2026</string>
     <!-- Failured notification for connect -->
@@ -2242,6 +2269,8 @@
     <string name="wifi_advanced_device_mac_address_title">Device MAC address</string>
     <!-- Wi-Fi settings screen, advanced, title of the item to show the randomized Wi-Fi MAC address. [CHAR LIMIT=50] -->
     <string name="wifi_advanced_randomized_mac_address_title">Randomized MAC address</string>
+    <!-- Wi-Fi settings screen, advanced, title of the item to show the randomized Wi-Fi MAC address when disconnected. [CHAR LIMIT=69] -->
+    <string name="wifi_advanced_randomized_mac_address_disconnected_title">Randomized MAC address (last used)</string>
     <!-- Title of the screen to adjust IP settings -->
     <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. -->
     <string name="wifi_advanced_ip_address_title">IP address</string>
@@ -2260,8 +2289,8 @@
     <string name="wifi_saved_access_points_label">Saved networks</string>
     <!-- Tab title for showing subscribed WiFi access points. [CHAR LIMIT=20] -->
     <string name="wifi_subscribed_access_points_tab">Subscriptions</string>
-    <!-- Tab title for showing saved WiFi access points. -->
-    <string name="wifi_saved_access_points_tab">@string/wifi_access_points</string>
+    <!-- Tab title for showing saved other networks. -->
+    <string name="wifi_saved_other_networks_tab">Other networks</string>
     <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
     <string name="wifi_advanced_settings_label">IP settings</string>
     <!-- Error message for users that aren't allowed to see or modify WiFi advanced settings [CHAR LIMIT=NONE] -->
@@ -2279,9 +2308,9 @@
     <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
     <string name="wifi_ip_settings_invalid_network_prefix_length">Type a network prefix length between 0 and 32.</string>
     <!-- Label for the DNS (first one) -->
-    <string name="wifi_dns1">DNS 1</string>
+    <string name="wifi_dns1">DNS 1 (unless overridden by Private DNS)</string>
     <!-- Label for the DNS (second one)-->
-    <string name="wifi_dns2">DNS 2</string>
+    <string name="wifi_dns2">DNS 2 (unless overridden by Private DNS)</string>
     <!-- Label for the gateway of the network -->
     <string name="wifi_gateway">Gateway</string>
     <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
@@ -2337,7 +2366,7 @@
     <!-- Label for Wifi hotspot name. -->
     <string name="wifi_hotspot_name_title">Hotspot name</string>
     <!-- Summary for Wifi hotspot name when connection is in progress. -->
-    <string name="wifi_hotspot_name_summary_connecting">Turning on <xliff:g id="wifi_hotspot_name">%1$s</xliff:g>...</string>
+    <string name="wifi_hotspot_name_summary_connecting">Turning on <xliff:g id="wifi_hotspot_name">%1$s</xliff:g>\u2026</string>
     <!-- Summary for Wifi hotspot name when connected. -->
     <string name="wifi_hotspot_name_summary_connected">Other devices can connect to <xliff:g id="wifi_hotspot_name">%1$s</xliff:g></string>
     <!-- Label for Wifi hotspot password. -->
@@ -2753,7 +2782,7 @@
     <!-- Display settings screen, peak refresh rate settings summary [CHAR LIMIT=NONE] -->
     <string name="peak_refresh_rate_summary">Automatically raises the refresh rate from 60 to 90 Hz for some content. Increases battery usage.</string>
     <!-- Display developer settings: Force to the highest refresh rate [CHAR LIMIT=NONE] -->
-    <string name="force_high_refresh_rate_toggle">Smooth Display</string>
+    <string name="force_high_refresh_rate_toggle">Force 90 Hz refresh rate</string>
     <!-- Display developer settings: Force to the highest refresh rate description [CHAR LIMIT=NONE]-->
     <string name="force_high_refresh_rate_desc">Highest refresh rate for improved touch responsiveness &amp; animation quality. Increases battery usage.</string>
     <!-- Display settings screen, setting option name to enable adaptive sleep [CHAR LIMIT=30] -->
@@ -2942,6 +2971,8 @@
     <string name="doze_always_on_title">Always show time and info</string>
     <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the always-on ambient display feature. -->
     <string name="doze_always_on_summary">Increased battery usage</string>
+    <!-- [CHAR LIMIT=30] Display and accessibility settings screens, setting option name to force bold text. -->
+    <string name="force_bold_text">Bold Text</string>
     <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
     <string name="title_font_size">Font size</string>
     <!-- Summary for Font size. Lets the user know that this will make text larger or smaller. Appears in the accessibility portion of setup wizard. [CHAR LIMIT=NONE] -->
@@ -3054,8 +3085,6 @@
     <string name="security_patch">Android security update</string>
     <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
     <string name="model_info">Model</string>
-    <!-- About phone screen, status item summary  [CHAR LIMIT=40] -->
-    <string name="model_summary">Model&#58; %1$s</string>
     <!-- About phone screen, dialog title for showing hardware information such as model, serial number, etc.[CHAR LIMIT=60] -->
     <string name="hardware_info">Model &amp; hardware</string>
     <!-- Label for device's hardware revision value [CHAR LIMIT=40] -->
@@ -3654,7 +3683,7 @@
     <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
     <string name="menu_save">Save</string>
     <!-- Edit access point screen menu option to discard the user's changes for this APN -->
-    <string name="menu_cancel">Discard</string>
+    <string name="menu_cancel">Cancel</string>
     <!-- APN error dialog title -->
     <string name="error_title"></string>
     <!-- APN error dialog messages: -->
@@ -3689,10 +3718,13 @@
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
     <string name="reset_network_desc">This will reset all network settings, including:\n\n<li>Wi\u2011Fi</li>\n<li>Mobile data</li>\n<li>Bluetooth</li>"</string>
 
-    <!-- SD card & phone storage settings screen, title for the checkbox to let user decide whether erase eSIM data together [CHAR LIMIT=50] -->
+    <!-- Erase Euicc -->
+    <!-- Confirmation button of dialog to confirm resetting user's app preferences [CHAR LIMIT=NONE] -->
+    <string name="erase_euicc_data_button">Erase</string>
+    <!-- Erase Euicc dialog and SD card & phone storage settings screen, title for the menu option and checkbox to let user decide whether erase eSIM data together [CHAR LIMIT=50] -->
     <string name="reset_esim_title">Erase downloaded SIMs</string>
-    <!-- SD card & phone storage settings screen, message for the checkbox to let user decide whether erase eSIM data together [CHAR LIMIT=NONE] -->
-    <string name="reset_esim_desc">To download replacement SIMs, contact your carrier. This won\u2019t cancel any mobile service plans.</string>
+    <!-- Erase Euicc dialog and SD card & phone storage settings screen, message for the checkbox to let user decide whether erase eSIM data together [CHAR LIMIT=NONE] -->
+    <string name="reset_esim_desc">This won’t cancel any mobile service plans. To download replacement SIMs, contact your carrier.</string>
 
     <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
     <string name="reset_network_button_text">Reset settings</string>
@@ -3713,29 +3745,29 @@
     <!-- Message of the error message shown when error happens during erase eSIM data [CHAR LIMIT=NONE] -->
     <string name="reset_esim_error_msg">Downloaded SIMs can\u2019t be erased due to an error.\n\nRestart your device and try again.</string>
 
-    <!-- Master Clear -->
-    <!-- Button title to factory data reset the entire device -->
-    <string name="master_clear_title">Erase all data (factory reset)</string>
+    <!-- Main Clear -->
+    <!-- Button title to factory data reset the entire device [CHAR LIMIT=NONE] -->
+    <string name="main_clear_title">Erase all data (factory reset)</string>
     <!-- Button title to factory data reset the entire device. The "(factory reset)" part is optional for translation. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=3531267871084279512]-->
-    <string name="master_clear_short_title">Erase all data (factory reset)</string>
+    <string name="main_clear_short_title">Erase all data (factory reset)</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc" product="tablet">"This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
+    <string name="main_clear_desc" product="tablet">"This will erase all data from your tablet\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc" product="default">"This will erase all data from your phone\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
+    <string name="main_clear_desc" product="default">"This will erase all data from your phone\u2019s <b>internal storage</b>, including:\n\n<li>Your Google Account</li>\n<li>System and app data and settings</li>\n<li>Downloaded apps</li>"</string>
     <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
-    <string name="master_clear_accounts" product="default">"\n\nYou are currently signed into the following accounts:\n"</string>
+    <string name="main_clear_accounts" product="default">"\n\nYou are currently signed into the following accounts:\n"</string>
     <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
-    <string name="master_clear_other_users_present" product="default">"\n\nThere are other users present on this device.\n"</string>
+    <string name="main_clear_other_users_present" product="default">"\n\nThere are other users present on this device.\n"</string>
     <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc_also_erases_external">"<li>Music</li>\n<li>Photos</li>\n<li>Other user data</li>"</string>
+    <string name="main_clear_desc_also_erases_external">"<li>Music</li>\n<li>Photos</li>\n<li>Other user data</li>"</string>
     <!-- SD card & phone storage settings screen, list of items on an eSIM (embedded SIM) that will be erased during this operation [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc_also_erases_esim">"<li>eSIMs</li>"</string>
+    <string name="main_clear_desc_also_erases_esim">"<li>eSIMs</li>"</string>
     <!-- SD card & phone storage settings screen, notification if there are eSIM (embedded SIM) profiles present that the user's mobile service plan will not be canceled [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc_no_cancel_mobile_plan">"\n\nThis will not cancel your mobile service plan.</string>
+    <string name="main_clear_desc_no_cancel_mobile_plan">"\n\nThis will not cancel your mobile service plan.</string>
     <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc_erase_external_storage" product="nosdcard">"\n\nTo clear music, pictures, and other user data, the <b>USB storage</b> needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="nosdcard">"\n\nTo clear music, pictures, and other user data, the <b>USB storage</b> needs to be erased."</string>
     <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
-    <string name="master_clear_desc_erase_external_storage" product="default">"\n\nTo clear music, pictures, and other user data, the <b>SD card</b> needs to be erased."</string>
+    <string name="main_clear_desc_erase_external_storage" product="default">"\n\nTo clear music, pictures, and other user data, the <b>SD card</b> needs to be erased."</string>
     <!-- SD card & phone storage settings screen, label for check box to erase USB storage [CHAR LIMIT=30] -->
     <string name="erase_external_storage" product="nosdcard">Erase USB storage</string>
     <!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
@@ -3744,26 +3776,22 @@
     <string name="erase_external_storage_description" product="nosdcard">Erase all the data on the internal USB storage, such as music or photos</string>
     <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
     <string name="erase_external_storage_description" product="default">Erase all the data on the SD card, such as music or photos</string>
-    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
-    <string name="master_clear_button_text" product="tablet">Erase all data</string>
-    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
-    <string name="master_clear_button_text" product="default">Erase all data</string>
-    <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
-    <string name="master_clear_final_desc">All of your personal information and downloaded apps will be deleted. You can\u2019t undo this action.</string>
+    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+    <string name="main_clear_button_text" product="tablet">Erase all data</string>
+    <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+    <string name="main_clear_button_text" product="default">Erase all data</string>
     <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button [CHAR LIMIT=NONE] -->
-    <string name="master_clear_final_desc_esim">All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can\u2019t undo this action.</string>
-    <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
-    <string name="master_clear_final_button_text">Erase everything</string>
-    <!-- Master clear failed message -->
-    <string name="master_clear_failed">No reset was performed because the System Clear service isn\u2019t available.</string>
-    <!-- Master clear confirmation screen title [CHAR LIMIT=33] -->
-    <string name="master_clear_confirm_title">Erase all data?</string>
+    <string name="main_clear_final_desc">All of your personal information and downloaded apps will be deleted. You can\u2019t undo this action.</string>
+    <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button [CHAR LIMIT=NONE] -->
+    <string name="main_clear_final_desc_esim">All of your personal information, including downloaded apps &amp; SIMs, will be deleted. You can\u2019t undo this action.</string>
+    <!-- Main clear confirmation screen title [CHAR LIMIT=33] -->
+    <string name="main_clear_confirm_title">Erase all data?</string>
     <!-- Error message for users that aren't allowed to factory reset [CHAR LIMIT=none] -->
-    <string name="master_clear_not_available">Factory reset is not available for this user</string>
-    <!-- Master clear progress screen title [CHAR LIMIT=30] -->
-    <string name="master_clear_progress_title" >Erasing</string>
-    <!-- Master clear progress screen text [CHAR LIMIT=75] -->
-    <string name="master_clear_progress_text">Please wait...</string>
+    <string name="main_clear_not_available">Factory reset is not available for this user</string>
+    <!-- Main clear progress screen title [CHAR LIMIT=30] -->
+    <string name="main_clear_progress_title" >Erasing</string>
+    <!-- Main clear progress screen text [CHAR LIMIT=75] -->
+    <string name="main_clear_progress_text">Please wait\u2026</string>
 
     <!-- Main settings screen, Call settings title for item to go into the call settings -->
     <string name="call_settings_title">Call settings</string>
@@ -3870,7 +3898,7 @@
     <!-- Label for ethernet tether checkbox [CHAR LIMIT=NONE]-->
     <string name="ethernet_tether_checkbox_text">Ethernet tethering</string>
     <!-- Ethernet Tethering subtext [CHAR LIMIT=NONE]-->
-    <string name="ethernet_tethering_subtext" product="default">Share phone\u2019s internet connection via USB Ethernet</string>
+    <string name="ethernet_tethering_subtext" product="default">Share phone\u2019s internet connection via Ethernet</string>
 
     <!-- Tethering footer info [CHAR LIMIT=NONE]-->
     <string name="tethering_footer_info">Use hotspot and tethering to provide internet to other devices through your mobile data connection. Apps can also create a hotspot to share content with nearby devices.</string>
@@ -3979,6 +4007,32 @@
     <!-- [CHAR LIMIT=50] Location settings screen, sub category for location services for managed profile -->
     <string name="managed_profile_location_services">Location services for work</string>
 
+    <!-- [CHAR LIMIT=60] Location settings screen, screen title -->
+    <string name="location_time_zone_detection_screen_title">Location time zone detection</string>
+    <!-- [CHAR LIMIT=50] Location settings screen, title for the setting that control whether the
+         device can use its location for time zone detection. -->
+    <string name="location_time_zone_detection_enabled_title">Location time zone detection</string>
+    <!-- [CHAR LIMIT=NONE] Preference description text for location time zone detection -->
+    <string name="location_time_zone_detection_enabled_description">Allows the device\u2019s location to be used to detect the current time zone. Other location settings such as Wi\u2011Fi scanning can affect the accuracy of time zone detection.</string>
+
+    <!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is on -->
+    <string name="location_time_zone_detection_on">On</string>
+    <!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is off -->
+    <string name="location_time_zone_detection_off">Off</string>
+    <!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is not
+         applicable due to other settings like the "automatic time zone detection enabled" setting
+         being set to "off". -->
+    <string name="location_time_zone_detection_auto_is_off">Automatic time zone detection is disabled</string>
+    <!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is not
+         applicable for the user for unspecified reasons. More specific messages are used when there
+         is a clear reason. -->
+    <string name="location_time_zone_detection_not_applicable">Location time zone detection is disabled</string>
+    <!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is not supported -->
+    <string name="location_time_zone_detection_not_supported">Location time zone detection is not supported</string>
+    <!-- [CHAR LIMIT=NONE] Location settings screen, summary when location time zone detection is not
+         allowed for the user, e.g. because of device policy -->
+    <string name="location_time_zone_detection_not_allowed">Location time zone detection changes are not allowed</string>
+
     <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
     <string name="location_network_based">Wi\u2011Fi &amp; mobile network location</string>
     <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
@@ -4118,6 +4172,15 @@
     <string name="lockpassword_choose_your_pattern_header_for_face">To use face unlock, set pattern</string>
     <!-- Header on first screen of choose password/PIN as backup for face unlock flow. If this string cannot be translated in under 40 characters, please translate "Set face unlock backup" [CHAR LIMIT=40] -->
     <string name="lockpassword_choose_your_pin_header_for_face">To use face unlock, set PIN</string>
+
+    <!-- Header on first screen of choose password/PIN as backup for biometric unlock flow. If this string cannot be translated in under 40 characters, please translate "Set biometric unlock backup" [CHAR LIMIT=40] -->
+    <string name="lockpassword_choose_your_password_header_for_biometrics">To use biometrics, set password</string>
+    <!-- Header on first screen of choose pattern as backup for biometric unlock flow. If this string cannot be translated in under 40 characters, please translate "Set biometric unlock backup" [CHAR LIMIT=40] -->
+    <string name="lockpassword_choose_your_pattern_header_for_biometrics">To use biometrics, set pattern</string>
+    <!-- Header on first screen of choose password/PIN as backup for biometric unlock flow. If this string cannot be translated in under 40 characters, please translate "Set biometric unlock backup" [CHAR LIMIT=40] -->
+    <string name="lockpassword_choose_your_pin_header_for_biometrics">To use biometrics, set PIN</string>
+
+
     <!-- Text for button that the user should tap when they forgot their work profile password [CHAR LIMIT=40] -->
     <string name="lockpassword_forgot_password">Forgot your password?</string>
     <!-- Text for button that the user should tap when they forgot their work profile pattern [CHAR LIMIT=40] -->
@@ -4125,22 +4188,22 @@
     <!-- Text for button that the user should tap when they forgot their work profile PIN [CHAR LIMIT=40] -->
     <string name="lockpassword_forgot_pin">Forgot your PIN?</string>
 
-    <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
+    <!-- Message to be used to explain the users that they need to enter their pattern to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_pattern_generic">Use your device pattern to continue</string>
-    <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
+    <!-- Message to be used to explain the users that they need to enter their PIN to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_pin_generic">Enter your device PIN to continue</string>
-    <!-- Message to be used to explain the user that he needs to enter his password to continue a
+    <!-- Message to be used to explain the users that they need to enter their password to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_password_generic">Enter your device password to continue</string>
-    <!-- Message to be used to explain the user that he needs to enter his work pattern to continue a
+    <!-- Message to be used to explain the users that they need to enter their work pattern to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_pattern_generic_profile">Use your work pattern to continue</string>
-    <!-- Message to be used to explain the user that he needs to enter his work PIN to continue a
+    <!-- Message to be used to explain the users that they need to enter their work PIN to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_pin_generic_profile">Enter your work PIN to continue</string>
-    <!-- Message to be used to explain the user that he needs to enter his work password to continue a
+    <!-- Message to be used to explain the users that they need to enter their work password to continue a
          particular operation. [CHAR LIMIT=70]-->
     <string name="lockpassword_confirm_your_password_generic_profile">Enter your work password to continue</string>
 
@@ -4231,9 +4294,9 @@
     <string name="lockpattern_settings_enable_title">Require pattern</string>
     <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
     <string name="lockpattern_settings_enable_summary">Must draw pattern to unlock screen</string>
-    <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
+    <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the users move their finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the users do not reveal their pattern while they unlock the phone.-->
     <string name="lockpattern_settings_enable_visible_pattern_title">Make pattern visible</string>
-    <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the profile unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the profile.-->
+    <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the users move their finger around while drawing the profile unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the users do not reveal their pattern while they unlock the profile.-->
     <string name="lockpattern_settings_enable_visible_pattern_title_profile">Make profile pattern visible</string>
     <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
     <string name="lockpattern_settings_enable_tactile_feedback_title">Vibrate on tap</string>
@@ -4674,7 +4737,7 @@
     <string name="auto_replace">Auto-replace</string>
     <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
     <string name="auto_replace_summary">Correct mistyped words</string>
-    <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. [CHAR LIMIT=25] -->
+    <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  For example, after the users finish a sentence, the next letter they type will automatically be capitalized. [CHAR LIMIT=25] -->
     <string name="auto_caps">Auto-capitalization</string>
     <!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. [CHAR LIMIT=100]-->
     <string name="auto_caps_summary">Capitalize first letter in sentences</string>
@@ -4889,6 +4952,8 @@
     <string name="audio_and_captions_category_title">Audio &amp; on-screen text</string>
     <!-- Title for the accessibility preference category of display services and settings. [CHAR LIMIT=50] -->
     <string name="display_category_title">Display</string>
+    <!-- Title for the accessibility text options page. [CHAR LIMIT=50] -->
+    <string name="accessibility_text_and_display_title">Text and display</string>
     <!-- Title for the accessibility preference category of interaction control services and settings. [CHAR LIMIT=50] -->
     <string name="interaction_control_category_title">Interaction controls</string>
     <!-- Title for the accessibility preference category of services downloaded by the user. [CHAR LIMIT=50] -->
@@ -4909,8 +4974,6 @@
     <string name="accessibility_screen_magnification_title">Magnification</string>
     <!-- Title for the accessibility preference screen to edit magnification area. [CHAR LIMIT=35] -->
     <string name="accessibility_magnification_mode_title">Magnification area</string>
-    <!-- Title for the accessibility preference screen to edit magnification enable mode. [CHAR LIMIT=35] -->
-    <string name="accessibility_magnification_enable_mode_title">Magnification enable</string>
     <!-- Message for the accessibility preference screen to edit magnification area dialog. [CHAR LIMIT=none] -->
     <string name="accessibility_magnification_area_settings_message">Choose the magnification area(s) you want to use when magnifying the screen</string>
     <!-- Summary for the accessibility preference screen to edit full screen. [CHAR LIMIT=none] -->
@@ -4923,6 +4986,14 @@
     <string name="accessibility_magnification_area_settings_full_screen">Magnify entire screen</string>
     <!-- Message for the accessibility preference screen to edit part of screen. [CHAR LIMIT=none] -->
     <string name="accessibility_magnification_area_settings_window_screen">Magnify part of screen</string>
+    <!-- Title for the accessibility magnification switch shortcut dialog. [CHAR LIMIT=48] -->
+    <string name="accessibility_magnification_switch_shortcut_title">Switch to accessibility button?</string>
+    <!-- Message for the accessibility magnification switch shortcut dialog. [CHAR LIMIT=none] -->
+    <string name="accessibility_magnification_switch_shortcut_message">Using triple tap to magnify part of the screen will cause typing and other actions to be delayed.\n\nDo you want to switch to using accessibility button to magnify?</string>
+    <!-- Title for the switch shortcut button in accessibility switch shortcut dialog to change the config shortcut value. [CHAR LIMIT=45] -->
+    <string name="accessibility_magnification_switch_shortcut_positive_button">Switch to accessibility button</string>
+    <!-- Title for the cancel button in accessibility switch shortcut dialog to keep the config shortcut value. [CHAR LIMIT=54] -->
+    <string name="accessibility_magnification_switch_shortcut_negative_button">Keep triple tap to magnify</string>
     <!-- Title for the accessibility preference screen to enable screen magnification settings. [CHAR LIMIT=35] -->
     <string name="accessibility_magnification_service_settings_title">Magnification settings</string>
     <!-- Title for the accessibility preference screen to enable triple-tap gesture screen magnification. [CHAR LIMIT=35] -->
@@ -5045,16 +5116,16 @@
     <string name="accessibility_toggle_large_pointer_icon_title">Large mouse pointer</string>
     <!-- Title for the accessibility preference for disabling animations. [CHAR LIMIT=35] -->
     <string name="accessibility_disable_animations">Remove animations</string>
-    <!-- Title for the accessibility preference for master mono. [CHAR LIMIT=35] -->
-    <string name="accessibility_toggle_master_mono_title">Mono audio</string>
-    <!-- Summary for the accessibility preference for master mono. [CHAR LIMIT=50] -->
-    <string name="accessibility_toggle_master_mono_summary">Combine channels when playing audio</string>
-    <!-- Title for the accessibility preference for master balance. [CHAR LIMIT=35] -->
-    <string name="accessibility_toggle_master_balance_title">Audio balance</string>
-    <!-- 'Left' balance text for the accessibility preference for master balance. [CHAR LIMIT=20] -->
-    <string name="accessibility_toggle_master_balance_left_label">Left</string>
-    <!-- 'Right' balance text for the accessibility preference for master balance. [CHAR LIMIT=20] -->
-    <string name="accessibility_toggle_master_balance_right_label">Right</string>
+    <!-- Title for the accessibility preference for primary mono. [CHAR LIMIT=35] -->
+    <string name="accessibility_toggle_primary_mono_title">Mono audio</string>
+    <!-- Summary for the accessibility preference for primary mono. [CHAR LIMIT=50] -->
+    <string name="accessibility_toggle_primary_mono_summary">Combine channels when playing audio</string>
+    <!-- Title for the accessibility preference for primary balance. [CHAR LIMIT=35] -->
+    <string name="accessibility_toggle_primary_balance_title">Audio balance</string>
+    <!-- 'Left' balance text for the accessibility preference for primary balance. [CHAR LIMIT=20] -->
+    <string name="accessibility_toggle_primary_balance_left_label">Left</string>
+    <!-- 'Right' balance text for the accessibility preference for primary balance. [CHAR LIMIT=20] -->
+    <string name="accessibility_toggle_primary_balance_right_label">Right</string>
 
     <!-- Option heading to leave the timeout requirement for accessibility users at its default level. [CHAR LIMIT=35] -->
     <string name="accessibility_timeout_default">Default</string>
@@ -5124,16 +5195,16 @@
     <string name="accessibility_ring_vibration_title">Ring vibration</string>
     <!-- Title for accessibility preference for configuring touch feedback vibrations. -->
     <string name="accessibility_touch_vibration_title">Touch feedback</string>
-    <!-- Used in the accessibility service settings to control turning on/off the service entirely -->
-    <string name="accessibility_service_master_switch_title">Use <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
+    <!-- Used in the accessibility service settings to control turning on/off the service entirely [CHAR LIMIT=60] -->
+    <string name="accessibility_service_primary_switch_title">Use <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
     <!-- Used in the accessibility service settings to open the activity. [CHAR LIMIT=NONE] -->
-    <string name="accessibility_service_master_open_title">Open <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
-    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely -->
-    <string name="accessibility_daltonizer_master_switch_title">Use color correction</string>
-    <!-- Title for Captions settings screen to control turning on/off the feature entirely -->
-    <string name="accessibility_caption_master_switch_title">Show captions</string>
+    <string name="accessibility_service_primary_open_title">Open <xliff:g id="accessibility_app_name" example="TalkBack">%1$s</xliff:g></string>
+    <!-- Used in the Color correction settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->
+    <string name="accessibility_daltonizer_primary_switch_title">Use color correction</string>
+    <!-- Title for Captions settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->
+    <string name="accessibility_caption_primary_switch_title">Show captions</string>
     <!-- Summary for Captions settings screen to control turning on/off the feature entirely [CHAR LIMIT=NONE] -->
-    <string name="accessibility_caption_master_switch_summary">For supported app only</string>
+    <string name="accessibility_caption_primary_switch_summary">For supported app only</string>
     <!-- Title for Caption preference settings screen for configuring font style. [CHAR LIMIT=NONE] -->
     <string name="captioning_caption_appearance_title">Caption size and style</string>
     <!-- Summary for Captions settings, explaining important settings under it. [CHAR LIMIT=NONE] -->
@@ -5192,6 +5263,8 @@
     <string name="daltonizer_mode_protanomaly_title">Protanomaly</string>
     <!-- Title shown for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
     <string name="daltonizer_mode_tritanomaly_title">Tritanomaly</string>
+    <!-- Title shown for grayscale [CHAR LIMIT=45] -->
+    <string name="daltonizer_mode_grayscale_title">Grayscale</string>
     <!-- Summary shown for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
     <string name="daltonizer_mode_deuteranomaly_summary">Red-green</string>
     <!-- Summary shown for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
@@ -5199,6 +5272,18 @@
     <!-- Summary shown for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
     <string name="daltonizer_mode_tritanomaly_summary">Blue-yellow</string>
 
+    <!-- TODO(b/170970602): remove translatable=false when RBC has official name and strings -->
+    <!-- Title for the accessibility preference to configure Reduce Bright Colors feature. [CHAR LIMIT=NONE] -->
+    <string name="reduce_bright_colors_preference_title" translatable="false">Reduce Bright Colors</string>
+    <!-- Used in the accessibility service settings to control switching Reduce Bright Colors on/off. [CHAR LIMIT=NONE] -->
+    <string name="reduce_bright_colors_switch_title" translatable="false">Use Reduce Bright Colors</string>
+    <!-- Subtitle that describes Reduce Bright Colors. [CHAR LIMIT=NONE] -->
+    <string name="reduce_bright_colors_preference_subtitle" translatable="false">Reduce Bright Colors reduces screen brightness.</string>
+    <!-- Title for setting the brightness intensity of the display using Reduce Bright Colors. [CHAR LIMIT=NONE] -->
+    <string name="reduce_bright_colors_intensity_preference_title" translatable="false">Intensity</string>
+    <!-- Title for setting whether the Reduce Bright Colors activation state persists across reboots. [CHAR LIMIT=NONE] -->
+    <string name="reduce_bright_colors_persist_preference_title" translatable="false">Keeps feature on after a restart</string>
+
     <!-- Subtitle for the accessibility preference to configure feature that performs click action soon after mouse/trackpad pointer stops moving, in case delay before click is extremely short. Placeholder will be set to the number of milliseconds to which the delay amounts. [CHAR LIMIT=NONE] -->
     <plurals name="accessibilty_autoclick_preference_subtitle_short_delay">
         <item quantity="one">Short (<xliff:g id="click_delay_label" example="200">%1$s</xliff:g> second)</item>
@@ -5345,17 +5430,17 @@
     <string name="secure_lock_encryption_warning">Because you\u2019ve turned on an accessibility service,
         your device won’t use your screen lock to enhance data encryption.</string>
 
-    <!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+    <!-- Message to the users to enter their pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
     <string name="enable_service_pattern_reason">Because turning on <xliff:g id="service"
         example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your pattern.
     </string>
 
-    <!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+    <!-- Message to the users to enter their PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
     <string name="enable_service_pin_reason">Because turning on <xliff:g id="service"
         example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your PIN.
     </string>
 
-    <!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+    <!-- Message to the users to enter their password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
     <string name="enable_service_password_reason">Because turning on <xliff:g id="service"
         example="TalkBack">%1$s</xliff:g> affects data encryption, you need to confirm your password.
     </string>
@@ -5535,8 +5620,8 @@
     <string name="background_activity_summary">Allow the app to run in the background</string>
     <!-- Summary for the background activity when it is disabled [CHAR_LIMIT=120] -->
     <string name="background_activity_summary_disabled">App not allowed to run in background</string>
-    <!-- TODO: Pending UX review. Summary for the background activity when it is whitlisted [CHAR_LIMIT=120] -->
-    <string name="background_activity_summary_whitelisted">Background usage can\u2019t be restricted</string>
+    <!-- TODO: Pending UX review. Summary for the background activity when it is allowlisted [CHAR_LIMIT=120] -->
+    <string name="background_activity_summary_allowlisted">Background usage can\u2019t be restricted</string>
     <!-- TODO: Pending UX review. Title for the warning dialog to show to the user when limiting background activity for an app -->
     <string name="background_activity_warning_dialog_title">Limit background activity?</string>
     <!-- TODO: Pending UX review. Text for the warning dialog to show to the user when limiting background activity for an app -->
@@ -5639,6 +5724,10 @@
     <string name="battery_tip_high_usage_title" product="device">Device used more than usual</string>
     <!-- Summary for the battery high usage tip, which presents battery may run out earlier [CHAR LIMIT=NONE] -->
     <string name="battery_tip_high_usage_summary">Battery may run out earlier than usual</string>
+    <!-- Title for the battery limited temporarily tip [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_limited_temporarily_title">Optimizing for battery health</string>
+    <!-- Summary for the battery limited temporarily tip [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_limited_temporarily_summary">Battery limited temporarily. Tap to learn more.</string>
     <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
     <string name="battery_tip_dialog_message" product="default">Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop apps by battery usage:</string>
     <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
@@ -5738,6 +5827,11 @@
     <!-- Title to display the battery percentage. [CHAR LIMIT=24] -->
     <string name="battery_header_title_alternate"><xliff:g id="number" example="88">^1</xliff:g><small> <font size="20"><xliff:g id="unit" example="%">%</xliff:g></font></small></string>
 
+    <!-- Summary for top level battery tile if battery is not present. [CHAR LIMIT=NONE] -->
+    <string name="battery_missing_message">Problem reading your battery meter</string>
+    <!-- Summary to battery page if battery is not present. [CHAR LIMIT=NONE] -->
+    <string name="battery_missing_help_message">Problem reading your battery meter. Tap to <annotation id="url">learn more</annotation></string>
+
     <!-- Title for force stop dialog [CHAR LIMIT=30] -->
     <string name="dialog_stop_title">Stop app?</string>
     <!-- Message body for force stop dialog [CHAR LIMIT=NONE] -->
@@ -6005,11 +6099,11 @@
     <string name="battery_saver_sticky_title_new">Turn off when charged</string>
 
     <!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->
-    <string name="battery_saver_sticky_description_new" product="default">Battery Saver turns off when your phone is at <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
+    <string name="battery_saver_sticky_description_new" product="default">Battery Saver turns off when your phone charges above <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
     <!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->
-    <string name="battery_saver_sticky_description_new" product="tablet">Battery Saver turns off when your tablet is at <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
+    <string name="battery_saver_sticky_description_new" product="tablet">Battery Saver turns off when your tablet charges above <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
     <!-- Battery Saver: Description for sticky battery saver preference [CHAR_LIMIT=NONE] -->
-    <string name="battery_saver_sticky_description_new" product="device">Battery Saver turns off when your device is at <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
+    <string name="battery_saver_sticky_description_new" product="device">Battery Saver turns off when your device charges above <xliff:g id="percent" example="90%">%1$s</xliff:g></string>
 
     <!-- Battery saver: Label for seekbar to change battery saver threshold [CHAR_LIMIT=40] -->
     <string name="battery_saver_seekbar_title"><xliff:g id="percent">%1$s</xliff:g></string>
@@ -6178,6 +6272,11 @@
     <!-- Title of preference to enter the VPN settings activity -->
     <string name="vpn_settings_title">VPN</string>
 
+    <!-- Title of Adaptive connectivity. Adaptive connectivity is a feature which automatically manages network connections for better battery life and performance. [CHAR LIMIT=60] -->
+    <string name="adaptive_connectivity_title">Adaptive connectivity</string>
+    <!-- Summary of Adaptive connectivity preference. [CHAR LIMIT=NONE] -->
+    <string name="adaptive_connectivity_summary">Extends battery life and improves device performance by automatically managing your network connections</string>
+
     <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
     <string name="credentials_title">Credential storage</string>
     <!-- Title of preference to install certificates [CHAR LIMIT=30] -->
@@ -6200,12 +6299,6 @@
     <string name="user_credentials_summary">View and modify stored credentials</string>
     <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
     <string name="advanced_security_title">Advanced</string>
-    <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
-    <string name="credential_storage_type">Storage type</string>
-    <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
-    <string name="credential_storage_type_hardware">Hardware-backed</string>
-    <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
-    <string name="credential_storage_type_software">Software only</string>
     <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
     <string name="credentials_settings_not_available">Credentials are not available for this user</string>
     <!-- Sub-heading for a user credential installed to be used by apps and as part of VPN configurations. [CHAR LIMIT=NONE] -->
@@ -6237,6 +6330,25 @@
     <!-- Toast message that a certificate was not installed -->
     <string name="cert_not_installed">Certificate not installed</string>
 
+    <!-- Title of screen shown to the user when an app requests to manage the user's KeyChain credentials [CHAR LIMIT=NONE] -->
+    <string name="request_manage_credentials_title">Allow <xliff:g id="app_name" example="Ping">%s</xliff:g> to install certificates on this device?</string>
+    <!-- Description of screen shown to the user when an app requests to manage the user's KeyChain credentials [CHAR LIMIT=NONE] -->
+    <string name="request_manage_credentials_description">These certificates will identify you to the apps and URLs below</string>
+    <!-- Label for button to not allow an app to manage the user's KeyChain credentials [CHAR_LIMIT=50] -->
+    <string name="request_manage_credentials_dont_allow">Don\u2019t allow</string>
+    <!-- Label for button to allow an app to manage the user's KeyChain credentials [CHAR_LIMIT=50] -->
+    <string name="request_manage_credentials_allow">Allow</string>
+    <!-- Label for floating action button to scroll to the end of the authentication policy list [CHAR LIMIT=30] -->
+    <string name="request_manage_credentials_more">Show more</string>
+    <!-- Title of preference for the certificate management app [CHAR LIMIT=30] -->
+    <string name="certificate_management_app">Certificate management app</string>
+    <!-- Summary if there is no certificate management app [CHAR_LIMIT=NONE] -->
+    <string name="no_certificate_management_app">None</string>
+    <!-- Summary of preference if there is a certificate management app [CHAR LIMIT=NONE] -->
+    <string name="certificate_management_app_description">Certificates installed by this app identify you to the apps and URLs below</string>
+    <!-- Label for button to remove the credential management app [CHAR LIMIT=30] -->
+    <string name="remove_credential_management_app">Remove</string>
+
     <!-- Sound settings screen, setting check box label -->
     <string name="emergency_tone_title">Emergency dialing signal</string>
     <!-- Sound settings screen, setting option summary text -->
@@ -6954,8 +7066,6 @@
     <string name="user_admin">Admin</string>
     <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
     <string name="user_you">You (<xliff:g id="name" example="Name">%s</xliff:g>)</string>
-    <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
-    <string name="user_nickname">Nickname</string>
 
     <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
     <string name="user_add_max_count">You can add up to <xliff:g id="user_count">%1$d</xliff:g> users</string>
@@ -7003,13 +7113,15 @@
     <!-- Title for Guest user [CHAR LIMIT=35] -->
     <string name="user_guest">Guest</string>
     <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
-    <string name="user_exit_guest_title">Remove guest</string>
+    <string name="user_clear_guest_menu">Clear guest data</string>
+    <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
+    <string name="user_exit_guest_menu">End guest session</string>
     <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
-    <string name="user_exit_guest_confirm_title">Remove guest?</string>
+    <string name="user_exit_guest_confirm_title">End guest session?</string>
     <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
     <string name="user_exit_guest_confirm_message">All apps and data in this session will be deleted.</string>
     <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
-    <string name="user_exit_guest_dialog_remove">Remove</string>
+    <string name="user_exit_guest_dialog_remove">End session</string>
 
     <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
     <string name="user_enable_calling">Turn on phone calls</string>
@@ -7061,10 +7173,10 @@
     <string name="nfc_how_it_works_title">Paying at the terminal</string>
     <!-- Content for text explaning how to pay at a payment terminal in a store -->
     <string name="nfc_how_it_works_content">Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol.</string>
-    <!-- Button the user can click to indicate he understood and dismiss the screen -->
+    <!-- Button the users can click to indicate they understood and dismiss the screen -->
     <string name="nfc_how_it_works_got_it">Got it</string>
     <!-- NFC More... title.  [CHAR LIMIT=40] -->
-    <string name="nfc_more_title">More...</string>
+    <string name="nfc_more_title">More\u2026</string>
     <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
     <string name="nfc_payment_set_default_label">Set default payment app</string>
@@ -7165,6 +7277,8 @@
     <string name="help_url_sound" translatable="false"></string>
     <!-- Help URL, Battery [DO NOT TRANSLATE] -->
     <string name="help_url_battery" translatable="false"></string>
+    <!-- Help URL, Battery Defender [DO NOT TRANSLATE] -->
+    <string name="help_url_battery_defender" translatable="false"></string>
     <!-- Help URL, Accounts [DO NOT TRANSLATE] -->
     <string name="help_url_accounts" translatable="false"></string>
     <!-- Help URL, Choose lockscreen [DO NOT TRANSLATE] -->
@@ -7253,6 +7367,8 @@
     <string name="help_uri_sim_combination_warning" translatable="false"></string>
     <!-- url for the NFC and payment settings page -->
     <string name="help_uri_nfc_and_payment_settings" translatable="false"></string>
+    <!-- url for battery page if battery is not present -->
+    <string name="help_url_battery_missing" translatable="false"></string>
 
     <!-- User account title [CHAR LIMIT=30] -->
     <string name="user_account_title">Account for content</string>
@@ -7393,13 +7509,6 @@
     <!-- Wizard finish button label [CHAR LIMIT=25] -->
     <string name="wizard_finish">Finish</string>
 
-    <!-- An option in a photo selection dialog to take a new photo [CHAR LIMIT=50] -->
-    <string name="user_image_take_photo" msgid="7496128293167402354">Take a photo</string>
-    <!-- An option in a photo selection dialog to choose a pre-existing image [CHAR LIMIT=50] -->
-    <string name="user_image_choose_photo" msgid="3746334626214970837">Choose an image</string>
-    <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
-    <string name="user_image_photo_selector">Select photo</string>
-
     <!-- Text to display in regulatory info screen (from device overlay). -->
     <string name="regulatory_info_text"></string>
 
@@ -7424,7 +7533,7 @@
     <!-- Message for selecting sim for SMS in settings.  [CHAR LIMIT=40] -->
     <string name="select_sim_for_sms">Select a SIM for SMS</string>
     <!-- Message for switching data SIM; switching takes a while -->
-    <string name="data_switch_started">Switching data SIM, this may take up to a minute...</string>
+    <string name="data_switch_started">Switching data SIM, this may take up to a minute\u2026</string>
     <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
     <string name="select_sim_for_calls">Call with</string>
     <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
@@ -7700,6 +7809,9 @@
     <!-- List of synonyms for add language, used to match in settings search [CHAR LIMIT=NONE] -->
     <string name="keywords_add_language">add language, add a language</string>
 
+    <!-- List of synonyms for the font size, used to match in settings search [CHAR LIMIT=NONE] -->
+    <string name="keywords_font_size">text size</string>
+
     <!-- Option title for the default sound, context based on screen -->
     <string name="default_sound">Default sound</string>
 
@@ -7824,14 +7936,14 @@
     <!-- Setting summary for controlling how caption text display in real time [CHAR LIMIT=NONE]-->
     <string name="live_caption_summary">Automatically caption media</string>
 
-    <!-- Sound: Summary for the Do not Disturb option when there are no automatic rules enabled. [CHAR LIMIT=NONE]-->
-    <string name="zen_mode_settings_summary_off">None</string>
-
-    <!-- Sound: Summary for the Do not Disturb option when at least one automatic rule is enabled. [CHAR LIMIT=NONE]-->
-    <plurals name="zen_mode_settings_summary_on">
-        <item quantity="one">1 schedule set</item>
-        <item quantity="other"><xliff:g id="on_count" example="10">%d</xliff:g> schedules set</item>
-    </plurals>
+    <!-- Sound: Summary for the Do not Disturb option that describes how many automatic rules (schedules) are enabled [CHAR LIMIT=NONE]-->
+    <string name="zen_mode_settings_schedules_summary">
+        {count, plural,
+            =0    {None}
+            =1    {1 schedule set}
+            other {# schedules set}
+        }
+    </string>
 
     <!-- Sound: Title for the Do not Disturb option and associated settings page. [CHAR LIMIT=50]-->
     <string name="zen_mode_settings_title">Do Not Disturb</string>
@@ -8004,12 +8116,6 @@
     <!-- Sound settings screen, summary format of do not disturb when on with extra info. [CHAR LIMIT=NONE] -->
     <string name="zen_mode_sound_summary_on_with_info">On / <xliff:g name="dnd_summary" example="No sound except alarms and media">%1$s</xliff:g></string>
 
-    <!-- Sound settings screen, summary format of do not disturb when off with extra information. [CHAR LIMIT=NONE] -->
-    <string name="zen_mode_sound_summary_off_with_info">Off / <xliff:g name="dnd_summary" example="1 schedule can turn on automatically">%1$s</xliff:g></string>
-
-    <!-- Sound settings screen, summary format of do not disturb when off with no extra information. [CHAR LIMIT=NONE] -->
-    <string name="zen_mode_sound_summary_off">Off</string>
-
     <!-- Sound settings screen, summary format of do not disturb when on with no extra information. [CHAR LIMIT=NONE] -->
     <string name="zen_mode_sound_summary_on">On</string>
 
@@ -8020,19 +8126,29 @@
     <string name="zen_mode_duration_summary_forever">Until you turn off</string>
 
     <!--  Do not disturb: Summary for zen mode duration setting indicating how long dnd will last when dnd is manually toggled on [CHAR LIMIT=NONE] -->
-    <plurals name="zen_mode_duration_summary_time_hours">
-        <item quantity="one">1 hour</item>
-        <item quantity="other"><xliff:g id="num_hours" example="3">%d</xliff:g> hours</item>
-    </plurals>
+    <string name="zen_mode_duration_summary_time_hours">
+        {count, plural,
+            =1    {1 hour}
+            other {# hours}
+        }
+    </string>
 
     <!--  Do not disturb: Summary for zen mode duration setting indicating how long dnd will last when toggled on -->
-    <string name="zen_mode_duration_summary_time_minutes"><xliff:g id="num_minutes" example="5">%d</xliff:g> minutes</string>
+    <string name="zen_mode_duration_summary_time_minutes">
+        {count, plural,
+            =1    {1 minute}
+            other {# minutes}
+        }
+    </string>
 
-    <!-- Summary for the Sound Do not Disturb option when at least one automatic rules is enabled. [CHAR LIMIT=NONE]-->
-    <plurals name="zen_mode_sound_summary_summary_off_info">
-        <item quantity="one">1 schedule can turn on automatically</item>
-        <item quantity="other"><xliff:g id="on_count" example="3">%d</xliff:g> schedules can turn on automatically</item>
-    </plurals>
+    <!-- Summary for the Sound Do not Disturb option when DND isn't currently on. [CHAR LIMIT=NONE]-->
+    <string name="zen_mode_sound_summary_off">
+        {count, plural,
+            =0    {Off}
+            =1    {Off / 1 schedule can turn on automatically}
+            other {Off / # schedules can turn on automatically}
+        }
+    </string>
 
     <!-- Do not disturb settings, main screen, category header [CHAR LIMIT=120]-->
     <string name="zen_category_behavior">What can interrupt Do Not Disturb</string>
@@ -8169,6 +8285,18 @@
     <!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->
     <string name="asst_capability_ranking_summary">Automatically rank notifications by relevance</string>
 
+    <!-- Configure Notifications: setting title [CHAR LIMIT=80 BACKUP_MESSAGE_ID=6691908606916292167] -->
+    <string name="asst_feedback_indicator_title">Adaptive notification feedback</string>
+
+    <!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->
+    <string name="asst_feedback_indicator_summary">Indicate adjustments made to notifications and show the option to provide feedback to the system</string>
+
+    <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
+    <string name="asst_importance_reset_title">Reset notification importance</string>
+
+    <!-- Configure Notifications: setting summary [CHAR LIMIT=200] -->
+    <string name="asst_importance_reset_summary">Reset user changed importance settings and allow notification assistant to prioritize</string>
+
     <!-- Configure Notifications: setting title [CHAR LIMIT=80] -->
     <string name="asst_capabilities_actions_replies_title">Suggested actions and replies</string>
 
@@ -8211,7 +8339,7 @@
     <!-- Configure Notifications: setting summary [CHAR LIMIT=NONE] -->
     <string name="hide_silent_icons_summary">Icons from gentle notifications aren\'t shown in the status bar</string>
 
-    <!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=30 BACKUP_MESSAGE_ID=5125022693565388760] -->
+    <!-- Configure Notifications: Title for the notification badging option. [CHAR LIMIT=50 BACKUP_MESSAGE_ID=5125022693565388760] -->
     <string name="notification_badging_title">Notification dot on app icon</string>
 
     <!-- Configure Notifications: Title for the people notification strip option. [CHAR LIMIT=60] -->
@@ -8304,7 +8432,7 @@
     <!-- Configure Notifications: Title for the pulse notification light option. [CHAR LIMIT=30] -->
     <string name="notification_pulse_title">Blink light</string>
 
-    <!-- Configure Notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
+    <!-- Configure Notifications: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=60] -->
     <string name="lock_screen_notifications_title">Notifications on lock screen</string>
 
     <!-- Configure lock screen: Title for the option of unlocking directly to home. [CHAR LIMIT=30] -->
@@ -8454,11 +8582,20 @@
     <string name="important_conversations_summary">Show at top of conversation section</string>
 
     <!-- [CHAR LIMIT=100] preference category title -->
-    <string name="other_conversations">Other conversations</string>
+    <string name="other_conversations">Non-priority conversations</string>
 
     <!-- summary for other conversations list -->
     <string name="other_conversations_summary">Conversations you\u2019ve made changes to</string>
 
+    <!-- [CHAR LIMIT=100] preference category title -->
+    <string name="recent_conversations">Recent conversations</string>
+
+    <!-- [CHAR LIMIT=20] button title -->
+    <string name="conversation_settings_clear_recents">Clear all of the recent ones</string>
+
+    <!-- a11y string -->
+    <string name="clear">Clear</string>
+
     <!-- [CHAR LIMIT=100] Setting to automatically bubble all notifications from favorite conversations -->
     <string name="important_bubble">Bubble priority conversations</string>
 
@@ -8777,7 +8914,7 @@
     <string name="zen_access_empty_text">No installed apps have requested Do Not Disturb access</string>
 
     <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
-    <string name="loading_notification_apps">Loading apps...</string>
+    <string name="loading_notification_apps">Loading apps\u2026</string>
 
     <!-- [CHAR LIMIT=NONE] Text appearing when app notifications are off -->
     <string name="app_notifications_off_desc">At your request, Android is blocking this app\'s notifications from appearing on this device</string>
@@ -9025,12 +9162,14 @@
     <string name="zen_mode_from_all_conversations">All conversations</string>
     <string name="zen_mode_from_important_conversations">Priority conversations</string>
     <string name="zen_mode_from_no_conversations">None</string>
-    <plurals name="zen_mode_conversations_count">
-        <item quantity="one">1 conversation</item>
-        <item quantity="other"><xliff:g id="conversations" example="3">%d</xliff:g> conversations</item>
-    </plurals>
-    <!-- [CHAR LIMIT=40] Zen mode settings: No conversations are allowed to bypass DND -->
-    <string name="zen_mode_conversations_count_none">None</string>
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: Number of conversations allowed to bypass DND -->
+    <string name="zen_mode_conversations_count">
+        {count, plural,
+            =0    {None}
+            =1    {1 conversation}
+            other {# conversations}
+        }
+    </string>
     <!-- [CHAR LIMIT=120] Zen mode settings: Header for calls and messages section of conversations
     setting page -->
     <string name="zen_mode_people_calls_messages_section_title">Who can interrupt</string>
@@ -9051,12 +9190,18 @@
     <!-- [CHAR LIMIT=50] Zen mode settings: Starred contacts preference title -->
     <string name="zen_mode_starred_contacts_title">Starred contacts</string>
     <!-- Zen mode settings: Starred contacts summary [CHAR LIMIT=NONE] -->
-    <plurals name="zen_mode_starred_contacts_summary_additional_contacts">
-        <item quantity="one">1 other</item>
-        <item quantity="other"><xliff:g id="num_people" example="3">%d</xliff:g> others</item>
-    </plurals>
-    <!-- [CHAR LIMIT=40] Zen mode settings: Starred contacts summary when there are no starred contacts -->
-    <string name="zen_mode_starred_contacts_summary_none">None</string>
+    <string name="zen_mode_starred_contacts_summary_contacts">
+        {count, plural, offset:2
+            =0    {None}
+            =1    {{contact_1}}
+            =2    {{contact_1} and {contact_2}}
+            =3    {{contact_1}, {contact_2}, and {contact_3}}
+            other {{contact_1}, {contact_2}, and # others}
+        }
+    </string>
+
+    <!-- [CHAR LIMIT=50] Zen mode settings: placeholder for a Contact name when the name is empty -->
+    <string name="zen_mode_starred_contacts_empty_name">(No name)</string>
 
     <!-- [CHAR LIMIT=40] Zen mode settings: Messages option -->
     <string name="zen_mode_messages">Messages</string>
@@ -9075,15 +9220,14 @@
     <string name="zen_mode_all_messages_summary">All messages can reach you</string>
     <!-- Zen mode settings: All calls can bypass DND summary [CHAR LIMIT=NONE -->
     <string name="zen_mode_all_calls_summary">All calls can reach you</string>
-
-    <!-- Zen mode settings: There are no contacts on the device [CHAR LIMIT=NONE] -->
-    <string name="zen_mode_contacts_count_none">None</string>
     <!-- Zen mode settings: Senders in contacts can bypass DND summary summary [CHAR LIMIT=NONE] -->
-    <plurals name="zen_mode_contacts_count">
-        <item quantity="one">1 contact</item>
-        <item quantity="other"><xliff:g id="num_contacts" example="120">%d</xliff:g> contacts</item>
-    </plurals>
-
+    <string name="zen_mode_contacts_count">
+        {count, plural,
+            =0    {None}
+            =1    {1 contact}
+            other {# contacts}
+        }
+    </string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
     <string name="zen_mode_from_anyone">Anyone</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
@@ -9168,14 +9312,16 @@
     <string name="zen_mode_bypassing_apps_summary_some">Some notifications</string>
     <!-- [CHAR LIMIT=NONE] Zen mode settings: Footer for DND bypassing apps settings -->
     <string name="zen_mode_bypassing_apps_footer">Selected people can still reach you, even if you don\u2019t allow apps to interrupt</string>
-    <!-- [CHAR LIMIT=120] Zen mode settings: Allow apps to bypass DND -->
-    <plurals name="zen_mode_bypassing_apps_subtext">
-        <item quantity="one"><xliff:g id="app_name" example="Nest">%s</xliff:g> can interrupt</item>
-        <item quantity="other"><xliff:g id="app_names" example="Nest and Google Play Store">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <!-- [CHAR LIMIT=30] Zen mode settings: List item in a summary indicating additional apps are
-     allowed to bypass Do Not Disturb. For example, "Nest, Messages, and 2 more can interrupt". -->
-    <string name="zen_mode_apps_bypassing_list_count"><xliff:g id="number" example="2">%d</xliff:g> more</string>
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: Lists apps that can bypass DND. For example, "Nest, Messages, and 2 more can interrupt". -->
+    <string name="zen_mode_bypassing_apps_subtext">
+        {count, plural, offset:2
+            =0    {No apps can interrupt}
+            =1    {{app_1} can interrupt}
+            =2    {{app_1} and {app_2} can interrupt}
+            =3    {{app_1}, {app_2}, and {app_3} can interrupt}
+            other {{app_1}, {app_2}, and # more can interrupt}
+        }
+    </string>
     <!-- [CHAR LIMIT=100] Zen mode settings: Allow apps to bypass DND title-->
     <string name="zen_mode_bypassing_apps_title">Apps</string>
     <!-- [CHAR LIMIT=100] Zen mode settings: App that can bypass DND's secondary text describing which notification channels from the app can bypass DND-->
@@ -9188,18 +9334,18 @@
     toggle title -->
     <string name="zen_mode_bypassing_app_channels_toggle_all">Allow all notifications</string>
 
-    <!-- [CHAR LIMIT=120] Zen mode settings: Summary for sound interruption settings -->
-    <plurals name="zen_mode_other_sounds_summary">
-        <item quantity="one"><xliff:g id="sound_category">%s</xliff:g> can interrupt</item>
-        <item quantity="other"><xliff:g id="sound_categories" example="Alarms, media sounds, and 2 more">%s</xliff:g> can interrupt</item>
-    </plurals>
-    <!-- [CHAR LIMIT=120] Zen mode settings: No other sounds are allowed to bypass DND -->
-    <string name="zen_mode_other_sounds_none">Nothing can interrupt</string>
-    <!-- [CHAR LIMIT=30] Zen mode settings: List item in a summary indicating additional sounds
-    are allowed to bypass Do Not Disturb. For example, "Alarms, media sounds, and 2 more can
-    interrupt". -->
-    <string name="zen_mode_other_sounds_list_count"><xliff:g id="number" example="2">%d</xliff:g> more</string>
-
+    <!-- [CHAR LIMIT=NONE] Zen mode settings: Summary for sound interruption settings -->
+    <string name="zen_mode_other_sounds_summary">
+        {count, plural, offset:2
+            =0    {Nothing can interrupt}
+            =1    {{sound_category_1} can interrupt}
+            =2    {{sound_category_1} and {sound_category_2} can interrupt}
+            =3    {{sound_category_1}, {sound_category_2}, and {sound_category_3} can interrupt}
+            other {{sound_category_1}, {sound_category_2}, and # more can interrupt}
+        }
+    </string>
+    <!-- [CHAR LIMIT=120] Zen mode settings: No sounds are allowed to bypass DND -->
+    <string name="zen_mode_sounds_none">Nothing can interrupt</string>
     <!-- [CHAR LIMIT=120] Zen mode settings: Summary for people category -->
     <string name="zen_mode_people_none">No one can interrupt</string>
     <!-- [CHAR LIMIT=120] Zen mode settings: Summary for people category -->
@@ -9297,10 +9443,11 @@
 
     <!-- [CHAR LIMIT=28] Screen pinning title -->
     <string name="screen_pinning_title">App pinning</string>
+    <!-- [CHAR LIMIT=none] Screen pinning introduction -->
+    <string name="app_pinning_intro">App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game.</string>
     <!-- [CHAR LIMIT=none] Screen pinning description -->
     <string name="screen_pinning_description">
-        App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game.
-        \n\nWhen an app is pinned, the pinned app may open other apps and personal data may be accessible.
+        When an app is pinned, the pinned app may open other apps and personal data may be accessible.
         \n\nTo use app pinning:
         \t\n1.\tTurn on app pinning
         \t\n2.\tOpen Overview
@@ -9308,8 +9455,7 @@
     </string>
     <!-- [CHAR LIMIT=none] Screen pinning description -->
     <string name="screen_pinning_guest_user_description">
-        App pinning allows you to keep the current app in view until you unpin it. This feature can be used, for example, to let a trusted friend play a specific game.
-        \n\nWhen an app is pinned, the pinned app may open other apps and personal data may be accessible.
+        When an app is pinned, the pinned app may open other apps and personal data may be accessible.
         \n\nIf you want to securely share your device with someone, try using a guest user instead.
         \n\nTo use app pinning:
         \t\n1.\tTurn on app pinning
@@ -9382,6 +9528,14 @@
     <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up face unlock. [CHAR LIMIT=NONE] -->
     <string name="encryption_interstitial_message_password_for_face">In addition to using your face to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?</string>
 
+    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up biometric unlock. [CHAR LIMIT=NONE] -->
+    <string name="encryption_interstitial_message_pin_for_biometrics">In addition to using your biometrics to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?</string>
+    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up biometric unlock. [CHAR LIMIT=NONE] -->
+    <string name="encryption_interstitial_message_pattern_for_biometrics">In addition to using your biometrics to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?</string>
+    <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up biometric unlock. [CHAR LIMIT=NONE] -->
+    <string name="encryption_interstitial_message_password_for_biometrics">In addition to using your biometrics to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can\u2019t receive calls, messages, or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device?</string>
+
+
     <!-- Button label to say yes to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->
     <string name="encryption_interstitial_yes">Yes</string>
     <!-- Button label to say no to the question of whether to require PIN/password/pattern to start your device. [CHAR LIMIT=20] -->
@@ -9836,7 +9990,7 @@
     <string name="usb_control_device">This device</string>
     <!-- The summary text that appears under a USB control option while it is in the process of
          switching control or power. -->
-    <string name="usb_switching">Switching...</string>
+    <string name="usb_switching">Switching\u2026</string>
     <!-- The summary text that appears under a USB control option when switching control or power has
          failed. -->
     <string name="usb_switching_failed">Couldn\'t switch</string>
@@ -10352,6 +10506,9 @@
     <!-- Label for wifi data usage in data usage screen [CHAR LIMIT=60] -->
     <string name="wifi_data_usage">Wi\u2011Fi data usage</string>
 
+    <!-- Label for non-carrier data usage in data usage screen [CHAR LIMIT=60] -->
+    <string name="non_carrier_data_usage">Non-carrier data usage</string>
+
     <!-- Label for ethernet data usage in data usage screen [CHAR LIMIT=60] -->
     <string name="ethernet_data_usage">Ethernet data usage</string>
 
@@ -10400,6 +10557,9 @@
     <!-- A summary shown on data usage screens to indicate inaccuracy of data tracking [CHAR LIMIT=NONE] -->
     <string name="operator_warning">Carrier data accounting may differ from device accounting</string>
 
+    <!-- A summary shown on data usage screens to indicate data tracking excluded from carrier networks [CHAR LIMIT=NONE] -->
+    <string name="non_carrier_data_usage_warning">Excludes data that is used by carrier networks</string>
+
     <!-- Format string describing how much data has been used [CHAR LIMIT=20] -->
     <string name="data_used_template"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> used</string>
 
@@ -10494,8 +10654,8 @@
     <!-- Button that leads to list of apps with unrestricted data access [CHAR LIMIT=60] -->
     <string name="unrestricted_data_saver">Unrestricted data</string>
 
-    <!-- Description of message shown when app is blacklisted for background data access [CHAR LIMIT=NONE] -->
-    <string name="restrict_background_blacklisted">Background data is turned off</string>
+    <!-- Description of message shown when app is blocklisted for background data access [CHAR LIMIT=NONE] -->
+    <string name="restrict_background_blocklisted">Background data is turned off</string>
 
     <!-- Summary for the Data Saver feature being on [CHAR LIMIT=NONE] -->
     <string name="data_saver_on">On</string>
@@ -10568,8 +10728,8 @@
     <!-- [CHAR LIMIT=30] Title for dialog for setting to control the default spell checker -->
     <string name="choose_spell_checker">Choose spell checker</string>
 
-    <!-- [CHAR LIMIT=45] Title for the master switch for spell checker, turning off will disable entire spell check feature. -->
-    <string name="spell_checker_master_switch_title">Use spell checker</string>
+    <!-- [CHAR LIMIT=45] Title for the primary switch for spell checker, turning off will disable entire spell check feature. -->
+    <string name="spell_checker_primary_switch_title">Use spell checker</string>
 
     <!-- [CHAR LIMIT=30] Label for the placeholder of the current spell checker name.  Used when no spell checker is currently selected. -->
     <string name="spell_checker_not_selected">Not selected</string>
@@ -10782,8 +10942,8 @@
     <!-- Preference title for the automatic storage manager toggle. [CHAR LIMIT=60]-->
     <string name="automatic_storage_manager_preference_title">Storage manager</string>
 
-    <!-- Used in the storage manager settings screen to control turning on/off the feature entirely -->
-    <string name="automatic_storage_manager_master_switch_title">Use Storage manager</string>
+    <!-- Used in the storage manager settings screen to control turning on/off the feature entirely [CHAR LIMIT=60] -->
+    <string name="automatic_storage_manager_primary_switch_title">Use Storage manager</string>
 
     <!-- Category title for the automatic settings in the storage manager settings. [CHAR LIMIT=40] -->
     <string name="deletion_helper_automatic_title">Automatic</string>
@@ -10885,6 +11045,28 @@
     <!-- Preference and settings suggestion title text for ambient display double tap (device) [CHAR LIMIT=60]-->
     <string name="ambient_display_title" product="device">Double-tap to check device</string>
 
+    <!-- Title text for swiping downwards on the bottom of the screen for notifications [CHAR LIMIT=60]-->
+    <string name="swipe_bottom_to_notifications_title">Swipe for notifications</string>
+    <!-- Summary text for swiping downwards on the bottom of the screen for notifications [CHAR LIMIT=80]-->
+    <string name="swipe_bottom_to_notifications_summary">Swipe down on the bottom edge of the screen to show your notifications</string>
+
+    <!-- Preference and settings suggestion title text for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_title">One-Handed mode</string>
+    <!-- Preference Switch for enabling one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_mode_enabled">Use one-handed mode</string>
+    <!-- Preference Switch for app taps to exit one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_app_taps_to_exit">Exit when switching apps</string>
+    <!-- Timeout(Never) title for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_timeout_title">Timeout</string>
+    <!-- Timeout(Short) title for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_timeout_short">4 seconds</string>
+    <!-- Timeout(Medium) title for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_timeout_medium">8 seconds</string>
+    <!-- Timeout(Long) title for one handed [CHAR LIMIT=60] -->
+    <string name="one_handed_timeout_long">12 seconds</string>
+    <!-- Search keywords for "One-Handed" settings [CHAR_LIMIT=NONE] -->
+    <string name="keywords_one_handed">reachability</string>
+
     <!-- Summary text for ambient display double tap [CHAR LIMIT=NONE]-->
     <string name="ambient_display_summary">To check time, notifications, and other info, double-tap your screen.</string>
 
@@ -10915,6 +11097,40 @@
     <!-- Summary text for ambient display tap [CHAR LIMIT=NONE]-->
     <string name="ambient_display_tap_screen_summary">To check time, notifications, and other info, tap your screen.</string>
 
+    <!-- Preference title to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
+    <string name="emergency_gesture_screen_title">Emergency SOS</string>
+
+    <!-- Preference title to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
+    <string name="emergency_gesture_switchbar_title">Use emergency SOS</string>
+
+    <!-- Preference summary to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
+    <string name="emergency_gesture_entrypoint_summary">Managed by <xliff:g id="app_name" example="Emergency Info">%1$s</xliff:g></string>
+
+    <!-- Preference summary to enable feature for calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
+    <string name="emergency_gesture_screen_summary">Start the actions below by pressing the power button quickly 5 times or more</string>
+
+    <!-- Preference title to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=60]-->
+    <string name="emergency_gesture_sound_setting_title">Play countdown alarm</string>
+
+    <!-- Preference summary to enable generating noisy sound before calling emergency services at panic/distress moments[CHAR_LIMIT=NONE]-->
+    <string name="emergency_gesture_sound_setting_summary">Play a loud sound before notifying for help</string>
+
+    <!-- Preference title listing a phone number to call during emergency gesture [CHAR_LIMIT=60]-->
+    <string name="emergency_gesture_call_for_help_title">Call for help</string>
+
+    <!-- Preference title listing a phone number to call during emergency gesture [CHAR_LIMIT=NONE]-->
+    <string name="emergency_gesture_call_for_help_dialog_title">Number to call for help</string>
+
+    <!-- Preference summary listing a phone number to call during emergency gesture, and clicking the perference will show a dialog to change this number [CHAR_LIMIT=NONE]-->
+    <string name="emergency_gesture_call_for_help_summary"><xliff:g id="phone_number" example="911">%1$s</xliff:g>. Tap to change</string>
+
+    <!-- Notes explaining limitations for emergency gesture number override [CHAR_LIMIT=NONE]-->
+    <string name="emergency_gesture_number_override_notes">
+        If you enter a non-emergency number:\n
+        • Your device must be unlocked to use emergency SOS\n
+        • Your call may not be answered
+    </string>
+
     <!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
     <string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
     <!-- Title text for fingerprint gesture preference screen [CHAR LIMIT=25] -->
@@ -11194,6 +11410,19 @@
     <!-- Toast message shown when autofill_reset_developer_options has been performed. [CHAR_LIMIT=none] -->
     <string name="autofill_reset_developer_options_complete">Autofill developer options have been reset</string>
 
+    <!-- Developer options location category strings -->
+    <!-- Title for privacy category [CHAR LIMIT=30]-->
+    <string name="location_category">Location</string>
+    <!-- [CHAR LIMIT=130] Title for location indicator settings -->
+    <string name="location_indicator_settings_title">Status bar location indicator</string>
+    <!-- [CHAR LIMIT=130] Description for location indicator settings -->
+    <string name="location_indicator_settings_description">Show for all locations, including network and connectivity</string>
+
+    <!-- Location setting: preference title - enforce full raw GNSS satellite measurements [CHAR LIMIT=60] -->
+    <string name="enable_gnss_raw_meas_full_tracking">Force full GNSS measurements</string>
+    <!-- Location 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>
+
     <!-- Name of setting for switching device theme [CHAR LIMIT=60] -->
     <string name="device_theme">Device theme</string>
     <!-- Name of default device theme [CHAR LIMIT=60] -->
@@ -11261,11 +11490,6 @@
     <!-- Part of a message for an empty state screen. A user will see this message if they try to use a certain feature, but the feature was turned off so it won't slow down their phone. [CHAR LIMIT=NONE] -->
     <string name="disabled_feature_reason_slow_down_phone">This feature has been turned off because it slows down your phone</string>
 
-    <!-- UI debug setting: preference title - enforce full raw GNSS satellite measurements [CHAR LIMIT=60] -->
-    <string name="enable_gnss_raw_meas_full_tracking">Force full GNSS measurements</string>
-    <!-- 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] -->
@@ -11290,23 +11514,23 @@
     <string name="graphics_driver_app_preference_title">Select Graphics Driver</string>
     <!-- The default value of graphics driver preference for app [CHAR LIMIT=50] -->
     <string name="graphics_driver_app_preference_default">Default</string>
-    <!-- The game driver value for Game Driver app preference [CHAR LIMIT=50] -->
-    <string name="graphics_driver_app_preference_game_driver">Game Driver</string>
-    <!-- The prerelase driver value for Developer Driver app preference [CHAR LIMIT=50] -->
+    <!-- The value for updatable production driver app preference [CHAR LIMIT=50] -->
+    <string name="graphics_driver_app_preference_production_driver">Game Driver</string>
+    <!-- The value for updatable developer driver app preference [CHAR LIMIT=50] -->
     <string name="graphics_driver_app_preference_prerelease_driver">Developer Driver</string>
     <!-- The system driver value for system graphics driver app preference [CHAR LIMIT=50] -->
     <string name="graphics_driver_app_preference_system">System Graphics Driver</string>
     <!-- All the graphics driver preference values for all apps globally [CHAR LIMIT=50] -->
     <string-array name="graphics_driver_all_apps_preference_values">
         <item>@string/graphics_driver_app_preference_default</item>
-        <item>@string/graphics_driver_app_preference_game_driver</item>
+        <item>@string/graphics_driver_app_preference_production_driver</item>
         <item>@string/graphics_driver_app_preference_prerelease_driver</item>
     </string-array>
     <!-- All the values of graphics driver for app preference [CHAR LIMIT=50] -->
     <string-array name="graphics_driver_app_preference_values">
         <item>@string/graphics_driver_app_preference_default</item>
         <item>@string/graphics_driver_app_preference_prerelease_driver</item>
-        <item>@string/graphics_driver_app_preference_game_driver</item>
+        <item>@string/graphics_driver_app_preference_production_driver</item>
         <item>@string/graphics_driver_app_preference_system</item>
     </string-array>
 
@@ -11321,7 +11545,7 @@
     <!-- Title for default disabled app compat changes category [CHAR LIMIT=50] -->
     <string name="platform_compat_default_disabled_title">Default disabled changes</string>
     <!-- Title for target SDK gated app compat changes category (do not translate 'targetSdkVersion') [CHAR LIMIT=50] -->
-    <string name="platform_compat_target_sdk_title">Enabled for targetSdkVersion &gt; <xliff:g id="number" example="29">%d</xliff:g></string>
+    <string name="platform_compat_target_sdk_title">Enabled for targetSdkVersion &gt;= <xliff:g id="number" example="29">%d</xliff:g></string>
     <!-- Title for the dialog shown when no debuggable apps are available [CHAR LIMIT=30] -->
     <string name="platform_compat_dialog_title_no_apps">No apps available</string>
     <!-- Explanatory text shown when no debuggable apps are available [CHAR LIMIT=NONE] -->
@@ -11450,7 +11674,7 @@
     <string name="pref_title_network_details">Network details</string>
 
     <!--  Warning text about the visibility of device name. [CHAR LIMIT=NONE] -->
-    <string name="about_phone_device_name_warning">Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices or set up a Wi-Fi hotspot.</string>
+    <string name="about_phone_device_name_warning">Your device name is visible to apps on your phone. It may also be seen by other people when you connect to Bluetooth devices, connect to a Wi-Fi network or set up a Wi-Fi hotspot.</string>
 
     <!-- Title for Connected device shortcut [CHAR LIMIT=30] -->
     <string name="devices_title">Devices</string>
@@ -11481,6 +11705,17 @@
     <!-- Message informs the user that has no SIM card in personalized Settings [CHAR LIMIT=30] -->
     <string name="no_sim_card">No SIM card</string>
 
+    <!-- A title for a SIM card spinner UI component which users can choose a SIM card. [CHAR LIMIT=NONE] -->
+    <string name="sim_card">SIM</string>
+    <!-- A label when there is no SIM card to choose. [CHAR LIMIT=NONE] -->
+    <string name="wifi_no_sim_card">No SIM</string>
+    <!-- A label when there is no SIM card information of a Wi-Fi network. [CHAR LIMIT=NONE] -->
+    <string name="wifi_no_related_sim_card">None</string>
+    <!-- A label wen a user needs a SIM to connect to the Wi-Fi network. [CHAR LIMIT=NONE] -->
+    <string name="wifi_require_sim_card_to_connect">Requires SIM to connect</string>
+    <!-- A label wen a user needs a specific SIM to connect to the Wi-Fi network. [CHAR LIMIT=NONE] -->
+    <string name="wifi_require_specific_sim_card_to_connect">Requires <xliff:g id="wireless_carrier" example="Verizon">%s</xliff:g> SIM to connect</string>
+
     <!-- The following strings are summaries for preferred network modes in Mobile network settings,
      and have a character limit of 100 -->
     <!-- WCDMA preferred [CHAR LIMIT=NONE] -->
@@ -11615,6 +11850,9 @@
     <string name="mobile_data_settings_summary_auto_switch">
         Phone will automatically switch to this carrier when in range
     </string>
+    <!-- Mobile network setting screen, summary of Mobile data switch preference when the network
+         is unavailable, the preference selection will be disabled. [CHAR LIMIT=NONE] -->
+    <string name="mobile_data_settings_summary_unavailable">No SIM card available</string>
 
     <!-- Mobile network settings screen, title of item showing the name of the default subscription
      that will be used for calls. This only appears in multi-SIM mode. [CHAR LIMIT=NONE] -->
@@ -11812,6 +12050,89 @@
     <!-- See less items in contextual homepage [CHAR LIMIT=30]-->
     <string name="see_less">See less</string>
 
+    <!-- Strings for toggling subscriptions dialog activity -->
+    <!-- Title of confirmation dialog asking the user if they want to enable subscription. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_enable_sub_dialog_title">Turn on <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
+    <!-- Title of confirmation dialog asking the user if they want to enable subscription without the subscription name. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_enable_sub_dialog_title_without_carrier_name">Turn on SIM?</string>
+    <!-- Title of confirmation dialog asking the user if they want to switch subscription. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_title">Switch to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
+    <!-- Title of confirmation dialog asking the user if they want to switch to the SIM card. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_psim_dialog_title">Switch to using SIM card?</string>
+    <!-- Body text of confirmation dialog for switching subscription that involves switching SIM slots. Indicates that only one SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_text">Only one SIM can be active at a time.\n\nSwitching to <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> won\u2019t cancel your <xliff:g id="from_carrier_name" example="Sprint">%2$s</xliff:g> service.</string>
+    <!-- Body text of confirmation dialog for switching subscription between two eSIM profiles. Indicates that only one downloaded SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_text_downloaded">Only one downloaded SIM can be active at a time.\n\nSwitching to <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> won\u2019t cancel your <xliff:g id="from_carrier_name" example="Sprint">%2$s</xliff:g> service.</string>
+    <!-- Body text of confirmation dialog for switching subscription between two eSIM profiles. Indicates that only one SIM can be active at a time. Also that switching will not cancel the user's mobile service plan. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_text_single_sim">Only one SIM can be active at a time.\n\nSwitching won\u2019t cancel your <xliff:g id="to_carrier_name" example="Google Fi">%1$s</xliff:g> service.</string>
+    <!-- Text of confirm button in the confirmation dialog asking the user if they want to switch subscription. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_confirm">Switch to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g></string>
+    <!-- Status message indicating the device is in the process of disconnecting from one mobile network and immediately connecting to another. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_enabling_sim_without_carrier_name">Connecting to network&#8230;</string>
+    <!-- Text of progress dialog indicating the subscription switch is in progress. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_switch_sub_dialog_progress">Switching to <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g></string>
+    <!-- Title of error message indicating that the device could not disconnect from one mobile network and immediately connect to another. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_enable_sim_fail_title">Can\u2019t switch carrier</string>
+    <!-- Body text of error message indicating the device could not disconnect from one mobile network and immediately connect to another, due to an unspecified issue. [CHAR_LIMIT=NONE] -->
+    <string name="sim_action_enable_sim_fail_text">The carrier can\u2019t be switched due to an error.</string>
+    <!-- Title of confirmation dialog asking the user if they want to disable subscription. [CHAR_LIMIT=NONE] -->
+    <string name="privileged_action_disable_sub_dialog_title">Turn off <xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g>?</string>
+    <!-- Title of confirmation dialog asking the user if they want to disable subscription. [CHAR_LIMIT=NONE] -->
+    <string name="privileged_action_disable_sub_dialog_title_without_carrier">Turn off SIM?</string>
+    <!-- Disabling SIMs progress dialog message [CHAR LIMIT=NONE] -->
+    <string name="privileged_action_disable_sub_dialog_progress">Turning off SIM<xliff:g id="ellipsis" example="...">&#8230;</xliff:g></string>
+    <!-- Title of error messaging indicating the device could not disable the mobile network. [CHAR LIMIT=NONE] -->
+    <string name="privileged_action_disable_fail_title">Can\u2019t disable carrier</string>
+    <!-- Body text of error message indicating the device could not disable the mobile network, due to an unknown issue. [CHAR LIMIT=NONE] -->
+    <string name="privileged_action_disable_fail_text">Something went wrong and your carrier could not be disabled.</string>
+    <!-- Title on a dialog asking the users whether they want to enable DSDS mode. [CHAR LIMIT=NONE] -->
+    <string name="sim_action_enable_dsds_title">Use 2 SIMs?</string>
+    <!-- Message in a dialog indicating the user can enable DSDS mode. [CHAR LIMIT=NONE] -->
+    <string name="sim_action_enable_dsds_text">This device can have 2 SIMs active at once. To continue using 1 SIM at a time, tap \"No thanks\".</string>
+    <!-- Ask the user whether to restart device. [CHAR LIMIT=NONE] -->
+    <string name="sim_action_restart_title">Restart device?</string>
+    <!-- Tell the user that in order to enable DSDS mode, the phone needs to restart. [CHAR LIMIT=NONE] -->
+    <string name="sim_action_restart_text">To get started, restart your device. Then you can add another SIM.</string>
+    <!-- Button on a dialog to confirm SIM operations. [CHAR LIMIT=30] -->
+    <string name="sim_action_continue">Continue</string>
+    <!-- User confirms reboot the phone. [CHAR LIMIT=30] -->
+    <string name="sim_action_reboot">Restart</string>
+    <!-- Button on a dialog to reject SIM operations. [CHAR LIMIT=30] -->
+    <string name="sim_action_no_thanks">No thanks</string>
+    <!-- Button which will disconnect the user from one mobile network and immediately connect to another. [CHAR LIMIT=30] -->
+    <string name="sim_switch_button">Switch</string>
+    <!-- Title of DSDS activation failure dialog [CHAR LIMIT=40] -->
+    <string name="dsds_activation_failure_title">Can\u2019t activate SIM</string>
+    <!-- Body text of DSDS activation failure dialog. Users could reinsert the SIM card or reboot to recover. [CHAR LIMIT=NONE] -->
+    <string name="dsds_activation_failure_body_msg1">Remove the SIM and insert it again. If the problem continues, restart your device.</string>
+    <!-- Body text of DSDS activation failure dialog. Users could toggle the selected SIM again or reboot to recover. [CHAR LIMIT=NONE] -->
+    <string name="dsds_activation_failure_body_msg2">Try turning on the SIM again. If the problem continues, restart your device.</string>
+
+    <!--  Strings for SIM push notifications  -->
+    <!-- Category name of the notifications related to SIM setup. [CHAR LIMIT=NONE] -->
+    <string name="sim_setup_channel_id">Network activation</string>
+    <!--  The title of post DSDS reboot notification. The title includes carrier's name. [CHAR LIMIT=NONE] -->
+    <string name="post_dsds_reboot_notification_title_with_carrier"><xliff:g id="carrier_name" example="Google Fi">%1$s</xliff:g> is active</string>
+    <!--  The body text of post DSDS reboot notification. [CHAR LIMIT=NONE] -->
+    <string name="post_dsds_reboot_notification_text">Tap to update SIM settings</string>
+
+    <!-- Button label of the removable sim card. [CHAR LIMIT=NONE] -->
+    <string name="sim_card_label">SIM card</string>
+
+    <!-- Strings for deleting eUICC subscriptions dialog activity -->
+    <!-- Title on confirmation dialog asking the user if they want to erase the downloaded SIM from the device. [CHAR_LIMIT=NONE] -->
+    <string name="erase_sim_dialog_title">Erase this downloaded SIM?</string>
+    <!-- Body text in confirmation dialog indicating what erasing a SIM entails. [CHAR_LIMIT=NONE] -->
+    <string name="erase_sim_dialog_text">Erasing this SIM removes <xliff:g id="carrier_name_a" example="Google Fi">%1$s</xliff:g> service from this device.\n\nService for <xliff:g id="carrier_name_b" example="Google Fi">%1$s</xliff:g> won\'t be canceled.</string>
+    <!-- Button label to erase the eSIM [CHAR_LIMIT=20] -->
+    <string name="erase_sim_confirm_button">Erase</string>
+    <!-- Status message indicating the device is in the process of erasing the SIM. [CHAR_LIMIT=NONE] -->
+    <string name="erasing_sim">Erasing SIM&#8230;</string>
+    <!-- Title of error message indicating the device could not erase the SIM. [CHAR_LIMIT=NONE] -->
+    <string name="erase_sim_fail_title">Can\'t erase SIM</string>
+    <!-- Body text of error message indicating the device could not erase the SIM due to an error. [CHAR_LIMIT=NONE] -->
+    <string name="erase_sim_fail_text">This SIM can\'t be erased due to an error.\n\nRestart your device and try again.</string>
+
     <!-- Title for Network connection request Dialog [CHAR LIMIT=60] -->
     <string name="network_connection_request_dialog_title">Connect to device</string>
     <!-- Summary for Network connection request Dialog [CHAR LIMIT=NONE] -->
@@ -11859,7 +12180,7 @@
     <string name="force_desktop_mode">Force desktop mode</string>
     <!-- UI debug setting: force desktop mode summary [CHAR LIMIT=NONE] -->
     <string name="force_desktop_mode_summary">Force experimental desktop mode on secondary displays</string>
-    <!-- UI debug setting: enable non-resizables in freeform [CHAR LIMIT=50] -->
+    <!-- UI debug setting: enable non-resizables in freeform [CHAR LIMIT=60] -->
     <string name="enable_sizecompat_freeform">Enable freeform sizecompat</string>
     <!-- UI debug setting: enable non-resizables in freeform summary [CHAR LIMIT=NONE] -->
     <string name="enable_sizecompat_freeform_summary">Allows sizecompat apps to be in freeform</string>
@@ -11984,6 +12305,15 @@
     <!-- Summary for Wi-Fi calling to explain this feature [CHAR LIMIT=NONE] -->
     <string name="wifi_calling_summary">Use Wi\u2011Fi for calls to improve quality</string>
 
+    <!-- Mobile network settings screen, title of Cross SIM calling setting.  [CHAR LIMIT=NONE] -->
+    <string name="cross_sim_calling_settings_title">Cross SIM calling</string>
+
+    <!-- Cross SIM calling summary.  [CHAR LIMIT=100] -->
+    <string name="cross_sim_calling_setting_summary">Allow another SIM calls and SMSs over this SIM.</string>
+
+    <!-- List of synonyms for the cross SIM calling titles, used to match in settings search [CHAR LIMIT=NONE] -->
+    <string name="keywords_cross_sim_calling">cross sim calling</string>
+
     <!-- Title for enable MMS notification when trying to receive MMS.  [CHAR LIMIT=40] -->
     <string name="enable_receiving_mms_notification_title">Incoming MMS message</string>
     <!-- Title for enable MMS notification when trying to send MMS.  [CHAR LIMIT=40] -->
@@ -12015,7 +12345,7 @@
     <!-- DSU Loader Description. Do not translate. -->
     <string name="dsu_loader_description" translatable="false">Load a Dynamic System Update Image</string>
     <!-- DSU Loader Loading. Do not translate. -->
-    <string name="dsu_loader_loading" translatable="false">Loading...</string>
+    <string name="dsu_loader_loading" translatable="false">Loading\u2026</string>
     <!-- DSU Loader. Do not translate. -->
     <string name="dsu_is_running" translatable="false">DSU is running</string>
 
@@ -12135,19 +12465,95 @@
 
     <!-- Title for media control settings [CHAR LIMIT=50]-->
     <string name="media_controls_title">Media</string>
-    <!-- Summary for media control settings [CHAR LIMIT=60]-->
-    <string name="media_controls_summary">Hide player when the media session has ended</string>
+    <!-- Summary for media control settings [CHAR LIMIT=NONE]-->
+    <string name="media_controls_summary">Media player in Quick Settings</string>
     <!-- Description of toggle to enable or disable the media resumption feature in quick settings [CHAR LIMIT=NONE]-->
-    <string name="media_controls_resume_description">The player allows you to resume a session from the expanded Quick Settings panel.</string>
+    <string name="media_controls_resume_description">Show media player for an extended period to easily resume playback</string>
     <!-- Subtext for media settings when the player will be hidden [CHAR LIMIT=50] -->
     <string name="media_controls_hide_player">Hide player</string>
     <!-- Subtext for media settings when the player will be shown [CHAR LIMIT=50] -->
     <string name="media_controls_show_player">Show player</string>
     <!-- Subtext for media settings when no players can be shown [CHAR LIMIT=50] -->
     <string name="media_controls_no_players">No players available</string>
+    <!-- Subtitle for section of media control settings that shows which apps are allowed [CHAR LIMIT=50] -->
+    <string name="media_controls_apps_title">Allowed apps</string>
     <!-- Keywords for the media controls setting [CHAR LIMIT=NONE]-->
     <string name="keywords_media_controls">media</string>
 
+    <!-- Summary for see all preference when bluetooth is disable [CHAR LIMIT=none]-->
+    <string name="connected_device_see_all_summary">Bluetooth will turn on</string>
+
+    <!-- Switch text for bluetooth feature being on [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_setting_on">On</string>
+    <!-- Switch text for bluetooth feature being off [CHAR LIMIT=NONE] -->
+    <string name="bluetooth_setting_off">Off</string>
+
+    <!-- Provider Model: Internet controls settings screen, item title to go into the networks settings -->
+    <string name="provider_internet_settings">Internet</string>
+    <!-- Provider Model: SIMs controls settings screen, item title to go into the SIMs settings -->
+    <string name="provider_network_settings_title">SIMs</string>
+    <!-- Provider Model: Airplane-safe networks controls settings screen -->
+    <string name="airplane_safe_networks">Airplane-safe networks</string>
+    <!-- Provider Model: Summary for airplane-safe networks -->
+    <string name="airplane_safe_networks_summary">Find and connect to airplane\u2011safe networks</string>
+    <!-- Provider Model: List of synonyms for the airplane-safe networks, used to match in settings search [CHAR LIMIT=NONE] -->
+    <string name="keywords_airplane_safe_networks">airplane, airplane-safe</string>
+    <!-- Provider Model: Calls and SMS controllers settings screen, item title to go into the Calls and SMS settings -->
+    <string name="calls_and_sms">Calls &amp; SMS</string>
+    <!-- Provider Model: Name for call settings category [CHAR LIMIT=NONE] -->
+    <string name="calls_and_sms_category">Wi\u2011Fi Calling</string>
+    <!-- Provider Model: Summary for calling preference -->
+    <string name="calls_sms_wfc_summary">Make and receive calls over non\u2011carrier networks like Wi\u2011Fi</string>
+    <!-- Provider Model: Label for footnote on calling preference -->
+    <string name="calls_sms_footnote">Wi\u2011Fi calling allows you to make and receive calls over non\u2011carrier networks such as some Wi\u2011Fi networks.</string>
+    <!-- Provider Model: Calls preference title -->
+    <string name="calls_preference_title">Calls</string>
+    <!-- Provider Model: SMS preference title -->
+    <string name="sms_preference_title">SMS</string>
+    <!-- Provider Model: Preferred status in summary for Calls & SMS -->
+    <string name="calls_sms_preferred">preferred</string>
+    <!-- Provider Model: Calls Preferred status in summary for Calls & SMS -->
+    <string name="calls_sms_calls_preferred">calls preferred</string>
+    <!-- Provider Model: SMS Preferred status in summary for Calls & SMS -->
+    <string name="calls_sms_sms_preferred">SMS preferred</string>
+    <!-- Provider Model: Unavailable status in summary for Calls & SMS -->
+    <string name="calls_sms_unavailable">unavailable</string>
+    <!-- Provider Model: No SIM status in summary for Calls & SMS -->
+    <string name="calls_sms_no_sim">No SIM</string>
+    <!-- Network & internet preferences title [CHAR LIMIT=NONE] -->
+    <string name="network_and_internet_preferences_title">Preferences</string>
+    <!-- Network & internet preferences summary [CHAR LIMIT=NONE] -->
+    <string name="network_and_internet_preferences_summary">Connect to public networks</string>
+    <!-- Search keywords for "Internet" settings [CHAR_LIMIT=NONE] -->
+    <string name="keywords_internet">network connection, internet, wireless, data, wifi, wi-fi, wi fi, cellular, mobile, cell carrier, 4g, 3g, 2g, lte</string>
+    <!-- Label text to view airplane-safe networks. [CHAR LIMIT=40] -->
+    <string name="view_airplane_safe_networks">View airplane mode networks</string>
+    <!-- Label text to turn off airplane mode. [CHAR LIMIT=40] -->
+    <string name="turn_off_airplane_mode">Turn off airplane mode</string>
+
+    <!-- Summary text separator for preferences including a short description
+         (eg. "Connected / 5G"). [CHAR LIMIT=50] -->
+    <string name="preference_summary_default_combination"><xliff:g id="state" example="Connected">%1$s</xliff:g> / <xliff:g id="networkMode" example="LTE">%2$s</xliff:g></string>
+    <!-- Provider Model:
+         Summary indicating that a SIM has an active mobile data connection [CHAR LIMIT=50] -->
+    <string name="mobile_data_connection_active">Connected</string>
+    <!-- Provider Model:
+         Summary indicating that a SIM has no mobile data connection [CHAR LIMIT=50] -->
+    <string name="mobile_data_off_summary">Internet won\u0027t auto\u2011connect</string>
+    <!-- Provider Model: Summary indicating that no other networks available [CHAR LIMIT=50] -->
+    <string name="non_carrier_network_unavailable">No other networks available</string>
+    <!-- Provider Model: Summary indicating that no networks available [CHAR LIMIT=50] -->
+    <string name="all_network_unavailable">No networks available</string>
+
+    <!-- Summary for preference when Bedtime mode is on [CHAR LIMIT=NONE] -->
+    <string name="aware_summary_when_bedtime_on">Unavailable because bedtime mode is on</string>
+
+    <!-- Toast message to inform reset notification importance is completed [CHAR LIMIT=NONE] -->
+    <string name="reset_importance_completed">Reset notification importance completed.</string>
+
+    <!-- Title for setting tile leading to Apps settings [CHAR LIMIT=40]-->
+    <string name="apps_dashboard_title">Apps</string>
+
     <!-- Bluetooth message permission alert for notification content [CHAR LIMIT=none] -->
     <string name="bluetooth_message_access_notification_content">Untrusted device wants to access your messages. Tap for details.</string>
     <!-- Bluetooth message permission alert for dialog title [CHAR LIMIT=none] -->
@@ -12160,4 +12566,15 @@
     <string name="bluetooth_phonebook_access_dialog_title">Allow access to contacts and call log?</string>
     <!-- Bluetooth phonebook permission alert for dialog content [CHAR LIMIT=none] -->
     <string name="bluetooth_phonebook_access_dialog_content">An untrusted Bluetooth device, <xliff:g id="device_name" example="My device">%1$s</xliff:g>, wants to access your contacts and call log. This includes data about incoming and outgoing calls.\n\nYou haven\u2019t connected to <xliff:g id="device_name" example="My device">%2$s</xliff:g> before.</string>
+
+    <!-- Brightness category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_brightness">Brightness</string>
+    <!-- Lock screen category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_lock_display">Lock Display</string>
+    <!-- Visibility category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_visibility">Visibility</string>
+    <!-- Color category name in Display Settings [CHAR LIMIT=none] -->
+    <string name="category_name_color">Color</string>
+    <!-- Others category name [CHAR LIMIT=none] -->
+    <string name="category_name_others">Others</string>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c74a1a2..ce6b095 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -396,13 +396,7 @@
         <item name="android:gravity">center_vertical</item>
     </style>
 
-    <style name="FingerprintHeaderStyle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
-        <item name="android:paddingTop">16dp</item>
-        <item name="android:textColor">@color/primary_dark_material_light</item>
-        <item name="android:lineSpacingMultiplier">1.2</item>
-    </style>
-
-    <style name="FaceHeaderStyle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
+    <style name="BiometricHeaderStyle" parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
         <item name="android:paddingTop">16dp</item>
         <item name="android:textColor">@color/primary_dark_material_light</item>
         <item name="android:lineSpacingMultiplier">1.2</item>
@@ -480,8 +474,8 @@
     </style>
 
     <style name="SearchBarStyle">
-        <item name="android:layout_margin">@dimen/search_bar_margin</item>
-        <item name="cardCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
+        <item name="android:layout_marginEnd">@dimen/search_bar_margin</item>
+        <item name="cardCornerRadius">34dp</item>
         <item name="enforceMaterialTheme">true</item>
         <item name="cardElevation">3dp</item>
         <item name="shapeAppearance">@null</item>
@@ -585,8 +579,8 @@
     <style name="SliceRow.Slider.LargeIcon">
         <!-- 10dp start padding for the start icon -->
         <item name="titleItemStartPadding">10dp</item>
-        <!-- Layout is 48dp and actual icon size is 48-(iconSize/2) -->
-        <item name="iconSize">12dp</item>
+        <!-- Title icon size -->
+        <item name="iconSize">36dp</item>
         <!-- RecycleView item animator -->
         <item name="disableRecyclerViewItemAnimator">true</item>
     </style>
@@ -618,7 +612,7 @@
 
     <style name="TextAppearance.NotificationImportanceButton">
         <item name="android:textSize">@dimen/notification_importance_button_text</item>
-        <item name="android:fontFamily">@*android:string/config_bodyFontFamilyMedium</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
         <item name="android:gravity">center</item>
     </style>
 
@@ -787,4 +781,97 @@
            parent="@*android:style/TextAppearance.DeviceDefault.Subhead">
         <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
     </style>
+
+    <style name="ContextualSuggestionText" parent="@android:style/TextAppearance.DeviceDefault">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:textSize">32sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
+    </style>
+
+    <style name="RequestManageCredentialsButtonPanel">
+        <item name="android:paddingStart">12dp</item>
+        <item name="android:paddingEnd">12dp</item>
+        <item name="android:paddingTop">8dp</item>
+        <item name="android:paddingBottom">8dp</item>
+        <item name="android:orientation">horizontal</item>
+        <item name="android:layout_alignParentBottom">true</item>
+    </style>
+
+    <style name="RequestManageCredentialsAllowButton" parent="@style/ActionPrimaryButton">
+        <item name="android:fontFamily">google-sans-medium</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+
+    <style name="RequestManageCredentialsDontAllowButton"
+           parent="@style/Widget.AppCompat.Button.Borderless">
+        <item name="android:fontFamily">google-sans-medium</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">?android:attr/colorAccent</item>
+    </style>
+
+    <style name="RequestManageCredentialsFab">
+        <item name="android:textSize">14sp</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:textColor">?android:attr/colorAccent</item>
+        <item name="android:layout_marginBottom">12dp</item>
+    </style>
+
+    <style name="RequestManageCredentialsHeader">
+        <item name="android:paddingStart">40dp</item>
+        <item name="android:paddingEnd">24dp</item>
+        <item name="android:paddingTop">58dp</item>
+        <item name="android:paddingBottom">24dp</item>
+        <item name="android:orientation">vertical</item>
+    </style>
+
+    <style name="RequestManageCredentialsTitle">
+        <item name="android:layout_marginTop">24dp</item>
+        <item name="android:textSize">36sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
+    <style name="RequestManageCredentialsDescription">
+        <item name="android:layout_marginTop">24dp</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
+    <style name="AppAuthenticationPolicyItem">
+        <item name="android:paddingStart">40dp</item>
+        <item name="android:paddingEnd">24dp</item>
+    </style>
+
+    <style name="AppAuthenticationPolicyIcon">
+        <item name="android:layout_marginTop">30dp</item>
+        <item name="android:layout_marginEnd">20dp</item>
+    </style>
+
+    <style name="AppAuthenticationPolicyText">
+        <item name="android:maxLines">1</item>
+        <item name="android:textSize">20sp</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+    </style>
+
+    <style name="AppAuthenticationPolicyNumberOfUrisText">
+        <item name="android:layout_marginTop">4dp</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+        <item name="android:alpha">0.7</item>
+    </style>
+
+    <style name="AppAuthenticationExpander">
+        <item name="android:layout_marginTop">24dp</item>
+        <item name="android:layout_alignParentEnd">true</item>
+        <item name="android:scaleType">fitEnd</item>
+    </style>
+
+    <style name="AppUriAuthenticationPolicyText">
+        <item name="android:maxLines">1</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 172a89a..01ea103 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -165,6 +165,21 @@
         <item name="android:colorAccent">@*android:color/white</item>
     </style>
 
+    <style name="Theme.RequestManageCredentials" parent="@style/Theme.MaterialComponents.Light">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+
+        <item name="colorPrimary">@*android:color/primary_device_default_settings_light</item>
+        <item name="colorAccent">@*android:color/accent_device_default_light</item>
+        <item name="colorPrimaryDark">@*android:color/primary_dark_device_default_settings_light</item>
+
+        <item name="android:windowBackground">@android:color/white</item>
+        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:navigationBarColor">@android:color/white</item>
+    </style>
+
     <style name="FallbackHome" parent="@android:style/Theme.DeviceDefault.NoActionBar">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
diff --git a/res/values/themes_suw.xml b/res/values/themes_suw.xml
index 3c171a1..959ffb3 100644
--- a/res/values/themes_suw.xml
+++ b/res/values/themes_suw.xml
@@ -197,8 +197,8 @@
         <item name="android:textAllCaps">false</item>
 
         <item name="android:windowSoftInputMode">adjustResize</item>
-        <!-- copied from Theme.DeviceDefault.Light.Dialog.Alert -->
-        <item name="colorAccent">@*android:color/accent_device_default_light</item>
+        <!-- copied from Theme.DeviceDefault.Dialog.Alert -->
+        <item name="colorAccent">@*android:color/accent_device_default_dark</item>
         <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
     </style>
 
@@ -211,4 +211,13 @@
         <item name="colorAccent">@*android:color/accent_device_default_light</item>
         <item name="dialogCornerRadius">@*android:dimen/config_dialogCornerRadius</item>
     </style>
-</resources>
+
+    <!-- DayNight themes -->
+    <style name="GlifTheme.DayNight" parent="GlifTheme.Light" />
+    <style name="GlifV2Theme.DayNight" parent="GlifV2Theme.Light" />
+    <style name="GlifV3Theme.DayNight" parent="GlifV3Theme.Light" />
+    <style name="GlifV2Theme.DayNight.Transparent" parent="GlifV2Theme.Light.Transparent" />
+    <style name="GlifV3Theme.DayNight.Transparent" parent="GlifV3Theme.Light.Transparent" />
+    <style name="SetupWizardTheme.DayNight.Transparent" parent="SetupWizardTheme.Light.Transparent" />
+    <style name="SuwAlertDialogThemeCompat.DayNight" parent="SuwAlertDialogThemeCompat.Light" />
+</resources>
\ No newline at end of file
diff --git a/res/xml/accessibility_daltonizer_settings.xml b/res/xml/accessibility_daltonizer_settings.xml
index c98736b..d638b94 100644
--- a/res/xml/accessibility_daltonizer_settings.xml
+++ b/res/xml/accessibility_daltonizer_settings.xml
@@ -49,6 +49,10 @@
             android:persistent="false"
             android:summary="@string/daltonizer_mode_tritanomaly_summary"
             android:title="@string/daltonizer_mode_tritanomaly_title" />
+        <com.android.settingslib.widget.RadioButtonPreference
+            android:key="daltonizer_mode_grayscale"
+            android:persistent="false"
+            android:title="@string/daltonizer_mode_grayscale_title" />
 
     </PreferenceCategory>
 
diff --git a/res/xml/accessibility_magnification_service_settings.xml b/res/xml/accessibility_magnification_service_settings.xml
index 0548e5e..e80d936 100644
--- a/res/xml/accessibility_magnification_service_settings.xml
+++ b/res/xml/accessibility_magnification_service_settings.xml
@@ -29,13 +29,4 @@
         settings:searchable="false"
         settings:controller="com.android.settings.accessibility.MagnificationModePreferenceController" />
 
-    <SwitchPreference
-        android:key="magnification_enable"
-        android:persistent="false"
-        android:title="@string/accessibility_magnification_enable_mode_title"
-        android:summaryOn="@string/accessibility_magnification_area_settings_full_screen_summary"
-        android:summaryOff="@string/accessibility_magnification_area_settings_window_screen_summary"
-        settings:searchable="false"
-        settings:controller="com.android.settings.accessibility.MagnificationEnablePreferenceController" />
-
 </PreferenceScreen>
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index cea8eb3..6efd884 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -45,47 +45,19 @@
         android:title="@string/display_category_title">
 
         <Preference
-            android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
-            android:key="font_size_preference_screen"
+            android:fragment="com.android.settings.accessibility.TextAndDisplayFragment"
+            android:key="text_and_display_preference_screen"
             android:persistent="false"
-            android:title="@string/title_font_size"
-            settings:controller="com.android.settings.display.FontSizePreferenceController"
-            settings:searchable="false"/>
+            android:title="@string/accessibility_text_and_display_title"
+            settings:searchable="true"/>
 
-     <com.android.settings.display.ScreenZoomPreference
-            android:fragment="com.android.settings.display.ScreenZoomSettings"
-            android:key="accessibility_settings_screen_zoom"
-            android:persistent="false"
-            android:title="@string/screen_zoom_title"
-            settings:searchable="false"/>
-
-       <SwitchPreference
-            android:key="dark_ui_mode_accessibility"
-            android:persistent="false"
-            android:title="@string/dark_ui_mode"
-            settings:controller="com.android.settings.display.DarkUIPreferenceController"
-            settings:searchable="false"/>
-
-       <Preference
+        <Preference
             android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
             android:icon="@drawable/ic_accessibility_magnification"
             android:key="magnification_preference_screen"
             android:persistent="false"
             android:title="@string/accessibility_screen_magnification_title"
             settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>
-
-        <SwitchPreference
-            android:key="toggle_large_pointer_icon"
-            android:persistent="false"
-            android:title="@string/accessibility_toggle_large_pointer_icon_title"
-            settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>
-
-        <SwitchPreference
-            android:key="toggle_disable_animations"
-            android:persistent="false"
-            android:title="@string/accessibility_disable_animations"
-            settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/>
-
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -113,7 +85,7 @@
             settings:controller="com.android.settings.accessibility.LockScreenRotationPreferenceController"/>
 
         <ListPreference
-            android:entries="@array/long_press_timeout_selector_titles"
+            android:entries="@array/long_press_timeout_selector_list_titles"
             android:entryValues="@array/long_press_timeout_selector_values"
             android:key="select_long_press_timeout_preference"
             android:persistent="false"
@@ -158,16 +130,16 @@
             settings:controller="com.android.settings.accessibility.LiveCaptionPreferenceController"/>
 
         <SwitchPreference
-            android:key="toggle_master_mono"
+            android:key="toggle_primary_mono"
             android:persistent="false"
-            android:summary="@string/accessibility_toggle_master_mono_summary"
-            android:title="@string/accessibility_toggle_master_mono_title"
-            settings:controller="com.android.settings.accessibility.MasterMonoPreferenceController"/>
+            android:summary="@string/accessibility_toggle_primary_mono_summary"
+            android:title="@string/accessibility_toggle_primary_mono_title"
+            settings:controller="com.android.settings.accessibility.PrimaryMonoPreferenceController"/>
 
         <com.android.settings.accessibility.BalanceSeekBarPreference
-            android:key="seekbar_master_balance"
+            android:key="seekbar_primary_balance"
             android:persistent="false"
-            android:title="@string/accessibility_toggle_master_balance_title"/>
+            android:title="@string/accessibility_toggle_primary_balance_title"/>
 
         <Preference
             android:key="hearing_aid_preference"
@@ -198,28 +170,6 @@
         settings:initialExpandedChildrenCount="1">
 
         <SwitchPreference
-            android:key="toggle_high_text_contrast_preference"
-            android:persistent="false"
-            android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
-            settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
-
-        <Preference
-            android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
-            android:icon="@drawable/ic_daltonizer"
-            android:key="daltonizer_preference"
-            android:persistent="false"
-            android:title="@string/accessibility_display_daltonizer_preference_title"
-            settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>
-
-        <Preference
-            android:fragment="com.android.settings.accessibility.ToggleColorInversionPreferenceFragment"
-            android:icon="@drawable/ic_color_inversion"
-            android:key="toggle_inversion_preference"
-            android:persistent="false"
-            android:title="@string/accessibility_display_inversion_preference_title"
-            settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
-
-        <SwitchPreference
             android:key="accessibility_shortcut_preference"
             android:persistent="false"
             android:title="@string/accessibility_shortcut_service_on_lock_screen_title"
diff --git a/res/xml/accessibility_text_and_display.xml b/res/xml/accessibility_text_and_display.xml
new file mode 100644
index 0000000..7dce826
--- /dev/null
+++ b/res/xml/accessibility_text_and_display.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="accessibility_text_and_display"
+    android:persistent="false"
+    android:title="@string/accessibility_text_and_display_title">
+
+    <SwitchPreference
+        android:key="toggle_high_text_contrast_preference"
+        android:persistent="false"
+        android:title="@string/accessibility_toggle_high_text_contrast_preference_title"
+        settings:controller="com.android.settings.accessibility.HighTextContrastPreferenceController"/>
+
+    <SwitchPreference
+        android:key="dark_ui_mode_accessibility"
+        android:persistent="false"
+        android:title="@string/dark_ui_mode"
+        settings:controller="com.android.settings.display.DarkUIPreferenceController"
+        settings:searchable="false"/>
+
+    <Preference
+        android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"
+        android:icon="@drawable/ic_daltonizer"
+        android:key="daltonizer_preference"
+        android:persistent="false"
+        android:title="@string/accessibility_display_daltonizer_preference_title"
+        settings:controller="com.android.settings.accessibility.DaltonizerPreferenceController"/>
+
+    <Preference
+        android:fragment="com.android.settings.accessibility.ToggleColorInversionPreferenceFragment"
+        android:icon="@drawable/ic_color_inversion"
+        android:key="toggle_inversion_preference"
+        android:persistent="false"
+        android:title="@string/accessibility_display_inversion_preference_title"
+        settings:controller="com.android.settings.accessibility.ColorInversionPreferenceController"/>
+
+    <!--TODO(b/170973645): Get icon-->
+    <Preference
+        android:fragment="com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment"
+        android:key="reduce_bright_colors_preference"
+        android:persistent="false"
+        android:title="@string/reduce_bright_colors_preference_title"
+        settings:controller="com.android.settings.accessibility.ReduceBrightColorsPreferenceController"/>
+
+    <SwitchPreference
+        android:key="toggle_disable_animations"
+        android:persistent="false"
+        android:title="@string/accessibility_disable_animations"
+        settings:controller="com.android.settings.accessibility.DisableAnimationsPreferenceController"/>
+
+    <com.android.settings.display.ScreenZoomPreference
+        android:fragment="com.android.settings.display.ScreenZoomSettings"
+        android:key="accessibility_settings_screen_zoom"
+        android:persistent="false"
+        android:title="@string/screen_zoom_title"
+        settings:searchable="false"/>
+
+    <Preference
+        android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
+        android:key="font_size_preference_screen"
+        android:persistent="false"
+        android:title="@string/title_font_size"
+        settings:controller="com.android.settings.display.FontSizePreferenceController"
+        settings:searchable="false"/>
+
+    <SwitchPreference
+        android:key="toggle_force_bold_text"
+        android:persistent="false"
+        android:title="@string/force_bold_text"
+        settings:controller="com.android.settings.accessibility.FontWeightAdjustmentPreferenceController"/>
+
+    <SwitchPreference
+        android:key="toggle_large_pointer_icon"
+        android:persistent="false"
+        android:title="@string/accessibility_toggle_large_pointer_icon_title"
+        settings:controller="com.android.settings.accessibility.LargePointerIconPreferenceController"/>
+
+    <PreferenceCategory
+        android:key="experimental_category"
+        android:persistent="false"
+        android:title="@string/experimental_category_title"
+        settings:initialExpandedChildrenCount="1">
+    </PreferenceCategory>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/adaptive_connectivity_settings.xml b/res/xml/adaptive_connectivity_settings.xml
new file mode 100644
index 0000000..ff9bdb0
--- /dev/null
+++ b/res/xml/adaptive_connectivity_settings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/adaptive_connectivity_title">
+
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="adaptive_connectivity_header"
+        android:layout="@layout/adaptive_connectivity_header"
+        android:persistent="false"
+        android:selectable="false"
+        android:title="@string/summary_placeholder"
+        settings:allowDividerBelow="true"
+        settings:searchable="false"/>
+
+    <SwitchPreference
+        android:key="adaptive_connectivity"
+        android:title="@string/adaptive_connectivity_title"
+        android:summary="@string/adaptive_connectivity_summary"
+        settings:allowDividerAbove="true"
+        settings:controller="com.android.settings.network.AdaptiveConnectivityTogglePreferenceController"/>
+
+</PreferenceScreen>
diff --git a/res/xml/adaptive_sleep_detail.xml b/res/xml/adaptive_sleep_detail.xml
deleted file mode 100644
index 0ea31ff..0000000
--- a/res/xml/adaptive_sleep_detail.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2019 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title="@string/adaptive_sleep_title">
-
-    <com.android.settings.widget.VideoPreference
-        android:key="adaptive_sleep_video"
-        android:title="@string/summary_placeholder"
-        settings:animation="@raw/adaptive_sleep"
-        settings:preview="@drawable/adaptive_sleep"
-        settings:controller="com.android.settings.widget.VideoPreferenceController"/>
-
-    <Preference
-        android:key="adaptive_sleep_permission"
-        android:title="@string/adaptive_sleep_title_no_permission"
-        android:summary="@string/adaptive_sleep_summary_no_permission"
-        android:icon="@drawable/ic_info_outline_24"
-        settings:controller="com.android.settings.display.AdaptiveSleepPermissionPreferenceController"
-    />
-
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="adaptive_sleep"
-        android:title="@string/adaptive_sleep_title"
-        android:summary="@string/adaptive_sleep_description"
-        settings:keywords="@string/keywords_display_adaptive_sleep"
-        settings:controller="com.android.settings.display.AdaptiveSleepDetailPreferenceController"
-        settings:useAdminDisabledSummary="true"
-        settings:allowDividerAbove="true" />
-
-    <com.android.settingslib.widget.FooterPreference
-        android:key="adaptive_sleep_footer"
-        android:title="@string/adaptive_sleep_privacy"
-        android:icon="@drawable/ic_privacy_shield_24dp"
-        android:selectable="false"
-        settings:searchable="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/adb_wireless_settings.xml b/res/xml/adb_wireless_settings.xml
index 945611e..8a9cfe6 100644
--- a/res/xml/adb_wireless_settings.xml
+++ b/res/xml/adb_wireless_settings.xml
@@ -35,7 +35,8 @@
             android:key="adb_ip_addr_pref"
             android:title="@string/adb_wireless_ip_addr_preference_title"
             android:summary="@string/summary_placeholder"
-            android:selectable="false"/>
+            android:selectable="false"
+            settings:enableCopying="true"/>
     </PreferenceCategory>
 
     <!-- Pairing methods category -->
diff --git a/res/xml/apps.xml b/res/xml/apps.xml
new file mode 100644
index 0000000..3ec4a29
--- /dev/null
+++ b/res/xml/apps.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="apps_and_notification_screen"
+    android:title="@string/app_and_notification_dashboard_title"
+    settings:initialExpandedChildrenCount="4">
+    <!-- the initial count should include the dynamic tiles -->
+
+    <Preference
+        android:key="all_app_info"
+        android:title="@string/applications_settings"
+        android:order="-999"
+        android:fragment="com.android.settings.applications.manageapplications.ManageApplications"
+        settings:controller="com.android.settings.applications.AllAppsInfoPreferenceController"
+        settings:keywords="@string/keywords_applications_settings"/>
+
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="recent_open_apps"
+        android:title="@string/recent_app_category_title"
+        android:layout="@layout/app_entities_header"
+        android:selectable="false"
+        android:order="-998"
+        settings:allowDividerBelow="true"
+        settings:controller="com.android.settings.applications.RecentAppsPreferenceController"/>
+
+    <!-- Empty category to draw divider -->
+    <PreferenceCategory
+        android:key="recent_apps_divider"
+        android:layout="@layout/preference_category_no_label"
+        android:order="-997"/>
+
+    <Preference
+        android:key="conversations"
+        android:title="@string/conversations_category_title"
+        android:order="-550"
+        settings:controller="com.android.settings.notification.ConversationListSummaryPreferenceController"
+        android:fragment="com.android.settings.notification.app.ConversationListSettings"
+    />
+
+    <!-- Notifications (appears before manage_perms), default apps (appears after) -->
+    <PreferenceCategory
+        android:key="dashboard_tile_placeholder"
+        android:order="10"/>
+
+    <Preference
+        android:key="default_apps"
+        android:title="@string/app_default_dashboard_title"
+        android:order="11"
+        settings:controller="com.android.settings.applications.DefaultAppsPreferenceController">
+        <intent android:action="android.settings.MANAGE_DEFAULT_APPS_SETTINGS"/>
+    </Preference>
+
+    <Preference
+        android:key="manage_perms"
+        android:title="@string/app_permissions"
+        android:summary="@string/runtime_permissions_summary_control_app_access"
+        android:order="12"
+        settings:keywords="@string/keywords_app_permissions">
+        <intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
+    </Preference>
+
+    <com.android.settingslib.RestrictedPreference
+        android:key="app_and_notif_cell_broadcast_settings"
+        android:title="@string/cell_broadcast_settings"
+        android:order="15"
+        settings:useAdminDisabledSummary="true">
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="@string/cell_broadcast_receiver_package"
+            android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings"/>
+    </com.android.settingslib.RestrictedPreference>
+
+    <Preference
+        android:key="special_access"
+        android:fragment="com.android.settings.applications.specialaccess.SpecialAccessSettings"
+        android:title="@string/special_access"
+        android:order="20"
+        settings:controller="com.android.settings.applications.SpecialAppAccessPreferenceController"/>
+
+</PreferenceScreen>
diff --git a/res/xml/assist_gesture_settings.xml b/res/xml/assist_gesture_settings.xml
index 5f7918f..2426516 100644
--- a/res/xml/assist_gesture_settings.xml
+++ b/res/xml/assist_gesture_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_assist_video"
         app:animation="@raw/gesture_assist"
-        app:preview="@drawable/gesture_assist" />
+        app:preview="@drawable/gesture_assist"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_assist"
diff --git a/res/xml/battery_saver_settings.xml b/res/xml/battery_saver_settings.xml
index 966034e..29b82ef 100644
--- a/res/xml/battery_saver_settings.xml
+++ b/res/xml/battery_saver_settings.xml
@@ -34,7 +34,7 @@
         settings:controller="com.android.settings.fuelgauge.batterysaver.BatterySaverStickyPreferenceController"/>
 
     <com.android.settings.widget.TwoStateButtonPreference
-        android:key="battery_saver_button"
+        android:key="battery_saver"
         android:title="@string/battery_saver"
         android:selectable="false"
         android:summary="@string/battery_saver_turn_on_summary"
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index 7ae93b9..6bd3763 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -33,8 +33,8 @@
     <SwitchPreference
         android:key="captioning_preference_switch"
         android:persistent="false"
-        android:summary="@string/accessibility_caption_master_switch_summary"
-        android:title="@string/accessibility_caption_master_switch_title"
+        android:summary="@string/accessibility_caption_primary_switch_summary"
+        android:title="@string/accessibility_caption_primary_switch_title"
         settings:allowDividerAbove="true" />
 
     <Preference
diff --git a/res/xml/conversation_list_settings.xml b/res/xml/conversation_list_settings.xml
index d528bd7..86b4f81 100644
--- a/res/xml/conversation_list_settings.xml
+++ b/res/xml/conversation_list_settings.xml
@@ -43,12 +43,18 @@
         </PreferenceCategory>
     </PreferenceCategory>
 
-
-    <!--Other conversations added here -->
+    <!-- Non-priority modified conversations added here -->
     <PreferenceCategory
         android:title="@string/other_conversations"
         android:key="other_conversations"
         settings:allowDividerAbove="true"
         settings:allowDividerBelow="false" />
 
+    <!-- Recent conversations added here -->
+    <PreferenceCategory
+        android:title="@string/recent_conversations"
+        android:key="recent_conversations"
+        settings:allowDividerAbove="true"
+        settings:allowDividerBelow="false" />
+
 </PreferenceScreen>
diff --git a/res/xml/credential_management_app_fragment.xml b/res/xml/credential_management_app_fragment.xml
new file mode 100644
index 0000000..9392414
--- /dev/null
+++ b/res/xml/credential_management_app_fragment.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/certificate_management_app">
+
+    <!-- Header -->
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="header"
+        android:layout="@layout/settings_entity_header"
+        android:selectable="false"
+        android:order="-10000"
+        settings:allowDividerBelow="true"
+        settings:controller="com.android.settings.security.CredentialManagementAppHeaderController"/>
+
+    <!-- Buttons -->
+    <com.android.settingslib.widget.ActionButtonsPreference
+        android:key="buttons"
+        android:selectable="true"
+        android:order="-9999"
+        settings:allowDividerAbove="true"
+        settings:allowDividerBelow="true"
+        settings:controller="com.android.settings.security.CredentialManagementAppButtonsController"/>
+
+    <!-- Authentication Policy -->
+    <PreferenceCategory
+        android:key="authentication_policy"
+        android:layout="@layout/preference_category_no_label"
+        android:title="@string/summary_placeholder"
+        settings:controller="com.android.settings.security.CredentialManagementAppPolicyController"/>
+
+</PreferenceScreen>
diff --git a/res/xml/dark_mode_settings.xml b/res/xml/dark_mode_settings.xml
index 0ebc044..19279e0 100644
--- a/res/xml/dark_mode_settings.xml
+++ b/res/xml/dark_mode_settings.xml
@@ -20,13 +20,16 @@
     android:title="@string/dark_ui_mode"
     settings:keywords="@string/keywords_dark_ui_mode">
 
-    <com.android.settingslib.widget.LayoutPreference
+    <com.android.settingslib.widget.BannerMessagePreference
         android:key="dark_ui_location_off"
-        android:selectable="false"
-        android:layout="@layout/twilight_mode_location_off"
-        settings:allowDividerBelow="true"
+        android:title="@string/twilight_mode_location_off_dialog_message"
         settings:controller="com.android.settings.display.TwilightLocationPreferenceController"/>
 
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="dark_ui_top_intro"
+        android:title="@string/dark_ui_text"
+        settings:searchable="false"/>
+
     <DropDownPreference
         android:key="dark_ui_auto_mode"
         android:title="@string/dark_ui_auto_mode_title"
@@ -55,11 +58,4 @@
         settings:allowDividerBelow="true"
         settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"/>
 
-    <com.android.settingslib.widget.FooterPreference
-            android:key="dark_ui_footer"
-            android:title="@string/dark_ui_text"
-            android:selectable="false"
-            settings:searchable="false"
-            settings:allowDividerAbove="true"/>
-
 </PreferenceScreen>
diff --git a/res/xml/data_usage_list.xml b/res/xml/data_usage_list.xml
index 41fbff8..9ea6a91 100644
--- a/res/xml/data_usage_list.xml
+++ b/res/xml/data_usage_list.xml
@@ -23,9 +23,15 @@
             android:key="chart_data" />
 
         <Preference
+            android:key="operator_warning"
             android:summary="@string/operator_warning"
             android:selectable="false" />
 
+        <Preference
+            android:key="non_carrier_data_usage_warning"
+            android:summary="@string/non_carrier_data_usage_warning"
+            android:selectable="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
diff --git a/res/xml/date_time_prefs.xml b/res/xml/date_time_prefs.xml
index 20fac45..43a797a 100644
--- a/res/xml/date_time_prefs.xml
+++ b/res/xml/date_time_prefs.xml
@@ -52,6 +52,14 @@
         settings:userRestriction="no_config_date_time"
         settings:keywords="@string/keywords_time_zone"/>
 
+    <!-- This preference gets removed if location-based time zone detection is not supported -->
+    <com.android.settingslib.RestrictedPreference
+        android:key="location_time_zone_detection"
+        android:title="@string/location_time_zone_detection_screen_title"
+        settings:controller="com.android.settings.datetime.LocationTimeZoneDetectionPreferenceController"
+        android:fragment="com.android.settings.datetime.locationtimezone.TimeZoneDetectionSettings"
+        settings:userRestriction="no_config_date_time"/>
+
     <PreferenceCategory
         android:key="time_format_preference_category"
         android:title="@string/time_format_category_title"
diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml
index 746a51c..f5549f9 100644
--- a/res/xml/development_settings.xml
+++ b/res/xml/development_settings.xml
@@ -143,7 +143,7 @@
         <Preference android:key="clear_adb_keys"
                     android:title="@string/clear_adb_keys" />
 
-        <com.android.settings.widget.MasterSwitchPreference
+        <com.android.settings.widget.PrimarySwitchPreference
             android:fragment="com.android.settings.development.WirelessDebuggingFragment"
             android:key="toggle_adb_wireless"
             android:title="@string/enable_adb_wireless"
@@ -175,14 +175,6 @@
             android:title="@string/automatic_system_heap_dump_title"
             android:summary="@string/automatic_system_heap_dump_summary" />
 
-        <Preference android:key="mock_location_app"
-                    android:title="@string/mock_location_app" />
-
-        <SwitchPreference
-            android:key="enable_gnss_raw_meas_full_tracking"
-            android:title="@string/enable_gnss_raw_meas_full_tracking"
-            android:summary="@string/enable_gnss_raw_meas_full_tracking_summary" />
-
         <SwitchPreference
             android:key="debug_view_attributes"
             android:title="@string/debug_view_attributes" />
@@ -298,11 +290,6 @@
             android:summary="@string/mobile_data_always_on_summary" />
 
         <SwitchPreference
-            android:key="enhanced_connectivity"
-            android:title="@string/enhanced_connectivity"
-            android:summary="@string/enhanced_connectivity_summary" />
-
-        <SwitchPreference
             android:key="tethering_hardware_offload"
             android:title="@string/tethering_hardware_offload"
             android:summary="@string/tethering_hardware_offload_summary" />
@@ -537,6 +524,11 @@
             android:title="@string/usb_audio_disable_routing"
             android:summary="@string/usb_audio_disable_routing_summary" />
 
+        <Preference
+            android:key="transcode_settings"
+            android:title="@string/transcode_settings_title"
+            android:fragment="com.android.settings.development.transcode.TranscodeSettingsFragment" />
+
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -610,6 +602,18 @@
             android:title="@string/asst_capability_ranking_title"
             settings:controller="com.android.settings.notification.AssistantCapabilityPreferenceController" />
 
+        <SwitchPreference
+            android:key="asst_feedback_indicator"
+            android:title="@string/asst_feedback_indicator_title"
+            settings:controller="com.android.settings.notification.AssistantFeedbackPreferenceController" />
+
+        <com.android.settingslib.widget.LayoutPreference
+            android:key="asst_importance_reset"
+            android:title="@string/asst_importance_reset_title"
+            android:selectable="false"
+            android:layout="@layout/reset_importance_button"
+            settings:controller="com.android.settings.notification.ImportanceResetPreferenceController" />
+
         <Preference
             android:key="inactive_apps"
             android:title="@string/inactive_apps_title"
@@ -684,4 +688,25 @@
                 android:targetClass="com.android.settings.development.storage.BlobInfoListView" />
         </Preference>
     </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="location_category"
+        android:title="@string/location_category"
+        android:order="1300">
+
+        <Preference android:key="mock_location_app"
+                    android:title="@string/mock_location_app" />
+
+        <SwitchPreference
+            android:key="enable_gnss_raw_meas_full_tracking"
+            android:title="@string/enable_gnss_raw_meas_full_tracking"
+            android:summary="@string/enable_gnss_raw_meas_full_tracking_summary" />
+
+        <SwitchPreference
+            android:title="@string/location_indicator_settings_title"
+            android:summary="@string/location_indicator_settings_description"
+            android:defaultValue="true"
+            android:key="location_indicator_settings"
+            settings:controller="com.android.settings.location.LocationIndicatorsPreferenceController"/>
+    </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/device_controls_settings.xml b/res/xml/device_controls_settings.xml
index da6cdc0..c22cd4a 100644
--- a/res/xml/device_controls_settings.xml
+++ b/res/xml/device_controls_settings.xml
@@ -22,7 +22,8 @@
 
     <com.android.settings.widget.VideoPreference
         android:key="device_controls_video"
-        app:animation="@raw/gesture_device_controls"/>
+        app:animation="@raw/gesture_device_controls"
+        app:controller="com.android.settings.widget.VideoPreferenceController"/>
 
     <SwitchPreference
         android:key="gesture_device_controls_switch"
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 30dad01..8df5696 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -40,12 +40,12 @@
         settings:controller="com.android.settings.display.DarkUIPreferenceController"
         settings:keywords="@string/keywords_dark_ui_mode"/>
 
-    <com.android.settings.display.NightDisplayPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:key="night_display"
         android:title="@string/night_display_title"
         android:fragment="com.android.settings.display.NightDisplaySettings"
-        android:widgetLayout="@null"
-        settings:widgetLayout="@null"/>
+        settings:controller="com.android.settings.display.NightDisplayPreferenceController"
+        settings:keywords="@string/keywords_display_night_display"/>
 
     <Preference
         android:key="auto_brightness_entry"
@@ -63,20 +63,12 @@
     </com.android.settingslib.RestrictedPreference>
 
     <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
-    <com.android.settings.display.TimeoutListPreference
+    <com.android.settingslib.RestrictedPreference
         android:key="screen_timeout"
         android:title="@string/screen_timeout"
         android:summary="@string/summary_placeholder"
-        android:entries="@array/screen_timeout_entries"
-        android:entryValues="@array/screen_timeout_values"
-        settings:keywords="@string/keywords_screen_timeout" />
-
-    <Preference
-        android:key="adaptive_sleep_entry"
-        android:title="@string/adaptive_sleep_title"
-        android:summary="@string/summary_placeholder"
-        android:fragment="com.android.settings.display.AdaptiveSleepSettings"
-        settings:controller="com.android.settings.display.AdaptiveSleepPreferenceController" />
+        android:fragment="com.android.settings.display.ScreenTimeoutSettings"
+        settings:controller="com.android.settings.display.ScreenTimeoutPreferenceController" />
 
     <SwitchPreference
         android:key="auto_rotate"
@@ -107,7 +99,8 @@
         android:key="font_size"
         android:title="@string/title_font_size"
         android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
-        settings:controller="com.android.settings.display.FontSizePreferenceController" />
+        settings:controller="com.android.settings.display.FontSizePreferenceController"
+        settings:keywords="@string/keywords_font_size" />
 
     <com.android.settings.display.ScreenZoomPreference
         android:key="display_settings_screen_zoom"
diff --git a/res/xml/display_settings_v2.xml b/res/xml/display_settings_v2.xml
new file mode 100644
index 0000000..4edc335
--- /dev/null
+++ b/res/xml/display_settings_v2.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="display_settings_screen"
+    android:title="@string/display_settings"
+    settings:keywords="@string/keywords_display">
+
+    <PreferenceCategory
+        android:title="@string/category_name_brightness">
+
+        <com.android.settingslib.RestrictedPreference
+            android:key="brightness"
+            android:title="@string/brightness"
+            settings:keywords="@string/keywords_display_brightness_level"
+            settings:useAdminDisabledSummary="true"
+            settings:userRestriction="no_config_brightness">
+            <intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG"/>
+        </com.android.settingslib.RestrictedPreference>
+
+        <Preference
+            android:key="auto_brightness_entry"
+            android:title="@string/auto_brightness_title"
+            android:summary="@string/summary_placeholder"
+            android:fragment="com.android.settings.display.AutoBrightnessSettings"
+            settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/category_name_lock_display">
+
+        <Preference
+            android:key="lockscreen_from_display_settings"
+            android:title="@string/lockscreen_settings_title"
+            android:fragment="com.android.settings.security.LockscreenDashboardFragment"
+            settings:keywords="@string/keywords_ambient_display_screen"
+            settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"/>
+
+        <com.android.settingslib.RestrictedPreference
+            android:key="screen_timeout"
+            android:title="@string/screen_timeout"
+            android:summary="@string/summary_placeholder"
+            android:fragment="com.android.settings.display.ScreenTimeoutSettings"
+            settings:controller="com.android.settings.display.ScreenTimeoutPreferenceController"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/category_name_visibility">
+
+        <com.android.settings.display.darkmode.DarkModePreference
+            android:key="dark_ui_mode"
+            android:title="@string/dark_ui_mode"
+            android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
+            android:widgetLayout="@null"
+            settings:widgetLayout="@null"
+            settings:controller="com.android.settings.display.DarkUIPreferenceController"
+            settings:keywords="@string/keywords_dark_ui_mode"/>
+
+        <Preference
+            android:key="font_size"
+            android:title="@string/title_font_size"
+            android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
+            settings:controller="com.android.settings.display.FontSizePreferenceController"
+            settings:keywords="@string/keywords_font_size"/>
+
+        <com.android.settings.display.ScreenZoomPreference
+            android:key="display_settings_screen_zoom"
+            android:title="@string/screen_zoom_title"
+            android:fragment="com.android.settings.display.ScreenZoomSettings"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/category_name_color">
+
+        <com.android.settings.widget.PrimarySwitchPreference
+            android:key="night_display"
+            android:title="@string/night_display_title"
+            android:fragment="com.android.settings.display.NightDisplaySettings"
+            settings:controller="com.android.settings.display.NightDisplayPreferenceController"
+            settings:keywords="@string/keywords_display_night_display"/>
+
+        <Preference
+            android:key="color_mode"
+            android:title="@string/color_mode_title"
+            android:fragment="com.android.settings.display.ColorModePreferenceFragment"
+            settings:controller="com.android.settings.display.ColorModePreferenceController"
+            settings:keywords="@string/keywords_color_mode"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/category_name_others">
+
+        <SwitchPreference
+            android:key="auto_rotate"
+            android:title="@string/accelerometer_title"
+            settings:keywords="@string/keywords_auto_rotate"
+            settings:controller="com.android.settings.display.AutoRotatePreferenceController"/>
+
+        <SwitchPreference
+            android:key="display_white_balance"
+            android:title="@string/display_white_balance_title"
+            android:summary="@string/display_white_balance_summary"
+            settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController"/>
+
+        <SwitchPreference
+            android:key="peak_refresh_rate"
+            android:title="@string/peak_refresh_rate_title"
+            android:summary="@string/peak_refresh_rate_summary"
+            settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController"/>
+
+        <SwitchPreference
+            android:key="show_operator_name"
+            android:title="@string/show_operator_name_title"
+            android:summary="@string/show_operator_name_summary"/>
+
+        <Preference
+            android:key="screensaver"
+            android:title="@string/screensaver_settings_title"
+            android:fragment="com.android.settings.dream.DreamSettings"/>
+
+        <SwitchPreference
+            android:key="camera_gesture"
+            android:title="@string/camera_gesture_title"
+            android:summary="@string/camera_gesture_desc"/>
+
+        <SwitchPreference
+            android:key="lift_to_wake"
+            android:title="@string/lift_to_wake_title"/>
+
+        <SwitchPreference
+            android:key="tap_to_wake"
+            android:title="@string/tap_to_wake"
+            android:summary="@string/tap_to_wake_summary"/>
+
+        <ListPreference
+            android:key="theme"
+            android:title="@string/device_theme"
+            android:summary="@string/summary_placeholder"/>
+
+        <Preference
+            android:key="vr_display_pref"
+            android:title="@string/display_vr_pref_title"
+            android:fragment="com.android.settings.display.VrDisplayPreferencePicker"/>
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/res/xml/double_tap_power_settings.xml b/res/xml/double_tap_power_settings.xml
index cb7bcbe..6dba86f 100644
--- a/res/xml/double_tap_power_settings.xml
+++ b/res/xml/double_tap_power_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_double_tap_power_video"
         app:animation="@raw/gesture_double_tap"
-        app:preview="@drawable/gesture_double_tap" />
+        app:preview="@drawable/gesture_double_tap"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_double_tap_power"
diff --git a/res/xml/double_tap_screen_settings.xml b/res/xml/double_tap_screen_settings.xml
index e9eeb3a..1a277c3 100644
--- a/res/xml/double_tap_screen_settings.xml
+++ b/res/xml/double_tap_screen_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_double_tap_screen_video"
         app:animation="@raw/gesture_ambient_tap"
-        app:preview="@drawable/gesture_ambient_tap" />
+        app:preview="@drawable/gesture_ambient_tap"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_double_tap_screen"
diff --git a/res/xml/double_twist_gesture_settings.xml b/res/xml/double_twist_gesture_settings.xml
index ad82df3..cbe7f38 100644
--- a/res/xml/double_twist_gesture_settings.xml
+++ b/res/xml/double_twist_gesture_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_double_twist_video"
         app:animation="@raw/gesture_twist"
-        app:preview="@drawable/gesture_twist" />
+        app:preview="@drawable/gesture_twist"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_double_twist"
diff --git a/res/xml/emergency_gesture_settings.xml b/res/xml/emergency_gesture_settings.xml
new file mode 100644
index 0000000..2e1a259
--- /dev/null
+++ b/res/xml/emergency_gesture_settings.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:title="@string/emergency_gesture_screen_title">
+
+    <com.android.settings.widget.VideoPreference
+        android:key="emergency_gesture_screen_video"
+        app:animation="@raw/gesture_double_tap"
+        app:preview="@drawable/gesture_double_tap"/>
+
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="gesture_emergency_button_switch_bar"
+        android:layout="@layout/emergency_gesture_switch_bar"
+        app:controller="com.android.settings.gestures.EmergencyGesturePreferenceController"
+        app:allowDividerBelow="true"/>
+
+    <SwitchPreference
+        android:key="emergency_gesture_sound"
+        android:icon="@drawable/ic_hearing"
+        android:title="@string/emergency_gesture_sound_setting_title"
+        android:summary="@string/emergency_gesture_sound_setting_summary"
+        app:keywords="@string/keywords_gesture"
+        app:controller="com.android.settings.gestures.EmergencyGestureSoundPreferenceController"
+        app:allowDividerAbove="true"/>
+
+    <com.android.settings.gestures.EmergencyGestureNumberOverridePreference
+        android:key="emregency_gesture_number_override"
+        android:title="@string/emergency_gesture_call_for_help_title"
+        android:summary="@string/summary_placeholder"
+        android:icon="@drawable/ic_call_grey_24dp"
+        android:dialogTitle="@string/emergency_gesture_call_for_help_dialog_title"
+        android:dialogLayout="@layout/emergency_gesture_number_override_dialog"
+        android:positiveButtonText="@string/save"
+        app:allowDividerAbove="true"
+        app:controller="com.android.settings.gestures.EmergencyGestureNumberOverridePreferenceController"/>
+</PreferenceScreen>
diff --git a/res/xml/encryption_and_credential.xml b/res/xml/encryption_and_credential.xml
index b0906c1..f107b58 100644
--- a/res/xml/encryption_and_credential.xml
+++ b/res/xml/encryption_and_credential.xml
@@ -37,12 +37,6 @@
         android:persistent="false"
         android:order="100">
 
-        <com.android.settingslib.RestrictedPreference
-            android:key="credential_storage_type"
-            android:title="@string/credential_storage_type"
-            android:summary="@string/summary_placeholder"
-            settings:userRestriction="no_config_credentials" />
-
         <Preference
             android:key="trusted_credentials"
             android:title="@string/trusted_credentials"
@@ -75,6 +69,13 @@
 
         </com.android.settingslib.RestrictedPreference>
 
+        <Preference
+            android:key="certificate_management_app"
+            android:title="@string/certificate_management_app"
+            android:summary="@string/summary_placeholder"
+            android:fragment="com.android.settings.security.CredentialManagementAppFragment"
+            settings:controller="com.android.settings.security.CredentialManagementAppPreferenceController"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/gesture_navigation_settings.xml b/res/xml/gesture_navigation_settings.xml
index 6230054..b509542 100644
--- a/res/xml/gesture_navigation_settings.xml
+++ b/res/xml/gesture_navigation_settings.xml
@@ -31,7 +31,7 @@
         <com.android.settings.widget.LabeledSeekBarPreference
             android:key="gesture_left_back_sensitivity"
             android:title="@string/left_edge"
-            android:max="3"
+            android:max="2"
             android:selectable="true"
             settings:textStart="@string/low_label"
             settings:textEnd="@string/high_label"/>
@@ -39,7 +39,7 @@
         <com.android.settings.widget.LabeledSeekBarPreference
             android:key="gesture_right_back_sensitivity"
             android:title="@string/right_edge"
-            android:max="3"
+            android:max="2"
             android:selectable="true"
             settings:textStart="@string/low_label"
             settings:textEnd="@string/high_label"/>
diff --git a/res/xml/gestures.xml b/res/xml/gestures.xml
index 0f407f4..32dad20 100644
--- a/res/xml/gestures.xml
+++ b/res/xml/gestures.xml
@@ -21,6 +21,12 @@
     android:title="@string/gesture_preference_title">
 
     <Preference
+        android:key="gesture_emergency_summary"
+        android:title="@string/emergency_gesture_screen_title"
+        android:fragment="com.android.settings.gestures.EmergencyGestureSettings"
+        settings:controller="com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController" />
+
+    <Preference
         android:key="gesture_assist_input_summary"
         android:title="@string/assist_gesture_title"
         android:fragment="com.android.settings.gestures.AssistGestureSettings"
@@ -34,6 +40,13 @@
         settings:controller="com.android.settings.gestures.SwipeToNotificationPreferenceController" />
 
     <Preference
+        android:key="gesture_swipe_bottom_to_notification"
+        android:title="@string/swipe_bottom_to_notifications_title"
+        android:fragment="com.android.settings.gestures.SwipeBottomToNotificationSettings"
+        settings:searchable="false"
+        settings:controller="com.android.settings.gestures.SwipeBottomToNotificationPreferenceController" />
+
+    <Preference
         android:key="gesture_double_tap_power_input_summary"
         android:title="@string/double_tap_power_for_camera_title"
         android:fragment="com.android.settings.gestures.DoubleTapPowerSettings"
@@ -55,6 +68,12 @@
         settings:keywords="@string/keywords_system_navigation" />
 
     <Preference
+        android:key="gesture_one_handed"
+        android:title="@string/one_handed_title"
+        android:fragment="com.android.settings.gestures.OneHandedSettings"
+        settings:controller="com.android.settings.gestures.OneHandedEnablePreferenceController" />
+
+    <Preference
         android:key="gesture_tap_screen_input_summary"
         android:title="@string/ambient_display_tap_screen_title"
         android:fragment="com.android.settings.gestures.TapScreenGestureSettings"
diff --git a/res/xml/global_actions_panel_settings.xml b/res/xml/global_actions_panel_settings.xml
index 980c756..e49c0d2 100644
--- a/res/xml/global_actions_panel_settings.xml
+++ b/res/xml/global_actions_panel_settings.xml
@@ -22,7 +22,8 @@
 
     <com.android.settings.widget.VideoPreference
         android:key="global_actions_panel_video"
-        app:animation="@raw/gesture_global_actions_panel" />
+        app:animation="@raw/gesture_global_actions_panel"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_global_actions_panel_switch"
diff --git a/res/xml/graphics_driver_settings.xml b/res/xml/graphics_driver_settings.xml
index a1fa78c..26c3193 100644
--- a/res/xml/graphics_driver_settings.xml
+++ b/res/xml/graphics_driver_settings.xml
@@ -20,12 +20,17 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/graphics_driver_dashboard_title">
 
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="top_info_graphics_driver"
+        android:title="@string/graphics_driver_footer_text"
+        settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverTopIntroPreferenceController"/>
+
     <ListPreference
         android:key="graphics_driver_all_apps_preference"
         android:title="@string/graphics_driver_all_apps_preference_title"
         android:dialogTitle="@string/graphics_driver_all_apps_preference_title"
-        settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController">
-    </ListPreference>
+        settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController"
+        settings:allowDividerAbove="true"/>
 
     <PreferenceCategory
         android:key="graphics_driver_category"
@@ -33,11 +38,4 @@
         settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverAppPreferenceController">
     </PreferenceCategory>
 
-    <com.android.settingslib.widget.FooterPreference
-        android:key="graphics_driver_footer"
-        android:title="@string/graphics_driver_footer_text"
-        android:selectable="false"
-        settings:controller="com.android.settings.development.graphicsdriver.GraphicsDriverFooterPreferenceController">
-    </com.android.settingslib.widget.FooterPreference>
-
 </PreferenceScreen>
diff --git a/res/xml/location_time_zone_detection.xml b/res/xml/location_time_zone_detection.xml
new file mode 100644
index 0000000..9f5e775
--- /dev/null
+++ b/res/xml/location_time_zone_detection.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/location_time_zone_detection_screen_title">
+
+    <SwitchPreference
+        android:title="@string/location_time_zone_detection_enabled_title"
+        android:summary="@string/location_time_zone_detection_enabled_description"
+        settings:controller="com.android.settings.datetime.locationtimezone.TimeZoneDetectionTogglePreferenceController"
+        android:key="location_time_zone_detection_enabled" />
+
+</PreferenceScreen>
diff --git a/res/xml/media_controls_settings.xml b/res/xml/media_controls_settings.xml
index 3f0483f..3ace6a0 100644
--- a/res/xml/media_controls_settings.xml
+++ b/res/xml/media_controls_settings.xml
@@ -28,4 +28,9 @@
         app:controller="com.android.settings.sound.MediaControlsPreferenceController"
         app:allowDividerAbove="true" />
 
+    <PreferenceCategory
+        android:key="media_controls_resumable_apps"
+        android:title="@string/media_controls_apps_title"
+        app:controller="com.android.settings.sound.ResumableMediaAppsController" />
+
 </PreferenceScreen>
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index f025f70..bcdd4f8 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -173,6 +173,14 @@
                 android:persistent="true"
                 settings:controller="com.android.settings.network.telephony.VideoCallingPreferenceController"/>
 
+            <SwitchPreference
+                android:key="cross_sim_calling_key"
+                android:title="@string/cross_sim_calling_settings_title"
+                android:persistent="false"
+                android:summary="@string/cross_sim_calling_setting_summary"
+                settings:keywords="@string/keywords_cross_sim_calling"
+                settings:controller="com.android.settings.network.telephony.CrossSimCallingPreferenceController"/>
+
         </PreferenceCategory>
 
         <com.android.settings.network.telephony.cdma.CdmaListPreference
diff --git a/res/xml/my_device_info.xml b/res/xml/my_device_info.xml
index 5e5fab3..eb9ceb4 100644
--- a/res/xml/my_device_info.xml
+++ b/res/xml/my_device_info.xml
@@ -43,6 +43,7 @@
         android:order="2"
         android:title="@string/my_device_info_account_preference_title"
         android:summary="@string/summary_placeholder"
+        settings:enableCopying="true"
         settings:controller="com.android.settings.deviceinfo.BrandedAccountPreferenceController"/>
 
     <!-- Phone number -->
@@ -100,7 +101,7 @@
     <Preference
         android:key="device_model"
         android:order="31"
-        android:title="@string/hardware_info"
+        android:title="@string/model_info"
         android:summary="@string/summary_placeholder"
         android:fragment="com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFragment"
         settings:enableCopying="true"
@@ -142,7 +143,7 @@
         android:order="45"
         android:title="@string/status_wifi_mac_address"
         android:summary="@string/view_saved_network"
-        android:fragment="com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings"
+        android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"
         settings:enableCopying="false"/>
 
     <!-- Factory Wi-Fi MAC address -->
diff --git a/res/xml/network_and_internet.xml b/res/xml/network_and_internet.xml
index eaa7808..c92ce94 100644
--- a/res/xml/network_and_internet.xml
+++ b/res/xml/network_and_internet.xml
@@ -29,7 +29,7 @@
         android:order="-40"
         settings:controller="com.android.settings.network.MultiNetworkHeaderController"/>
 
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:fragment="com.android.settings.wifi.WifiSettings"
         android:key="main_toggle_wifi"
         android:title="@string/wifi_settings"
@@ -40,7 +40,7 @@
         <intent
             android:action="android.settings.WIFI_SETTINGS"
             android:targetClass="Settings$WifiSettingsActivity" />
-    </com.android.settings.widget.MasterSwitchPreference>
+    </com.android.settings.widget.PrimarySwitchPreference>
 
     <com.android.settings.widget.AddPreference
         android:key="mobile_network_list"
@@ -80,7 +80,7 @@
         settings:userRestriction="no_config_tethering"
         settings:useAdminDisabledSummary="true" />
 
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:fragment="com.android.settings.AllInOneTetherSettings"
         android:key="all_tether_settings"
         android:title="@string/tether_settings_title_all"
@@ -118,4 +118,11 @@
         android:positiveButtonText="@string/save"
         android:negativeButtonText="@android:string/cancel" />
 
+    <Preference
+        android:fragment="com.android.settings.network.AdaptiveConnectivitySettings"
+        android:key="adaptive_connectivity"
+        android:title="@string/adaptive_connectivity_title"
+        android:summary="@string/summary_placeholder"
+        android:order="25"
+        settings:controller="com.android.settings.network.AdaptiveConnectivityPreferenceController"/>
 </PreferenceScreen>
diff --git a/res/xml/network_provider_calls_sms.xml b/res/xml/network_provider_calls_sms.xml
new file mode 100644
index 0000000..2fa2eb7
--- /dev/null
+++ b/res/xml/network_provider_calls_sms.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="provider_model_calls_and_sms_screen"
+    android:title="@string/calls_and_sms">
+
+    <ListPreference
+        android:key="provider_model_calls_preference"
+        android:title="@string/calls_preference_title"
+        settings:controller="com.android.settings.network.telephony.CallsDefaultSubscriptionController"
+        android:order="10"
+        android:icon="@drawable/ic_phone"
+        />
+
+    <ListPreference
+        android:key="provider_model_sms_preference"
+        android:title="@string/sms_preference_title"
+        settings:controller="com.android.settings.network.telephony.SmsDefaultSubscriptionController"
+        android:order="15"
+        android:icon="@drawable/ic_sms"
+        />
+
+    <PreferenceCategory
+        android:key="provider_model_calling_category"
+        android:title="@string/calls_and_sms_category"
+        android:order="20"
+        settings:controller="com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController"
+        settings:allowDividerAbove="true"
+        />
+
+    <com.android.settingslib.widget.FooterPreference
+        android:key="provider_model_calls_sms_footer"
+        android:title="@string/calls_sms_footnote"
+        android:selectable="false"
+        settings:searchable="false"
+        />
+</PreferenceScreen>
diff --git a/res/xml/network_provider_internet.xml b/res/xml/network_provider_internet.xml
new file mode 100644
index 0000000..52ade65
--- /dev/null
+++ b/res/xml/network_provider_internet.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="network_provider_and_internet_screen"
+    android:title="@string/network_dashboard_title"
+    settings:initialExpandedChildrenCount="5">
+
+    <com.android.settingslib.RestrictedPreference
+        android:fragment="com.android.settings.network.NetworkProviderSettings"
+        android:key="internet_settings"
+        android:title="@string/provider_internet_settings"
+        android:summary="@string/summary_placeholder"
+        android:icon="@drawable/ic_settings_wireless"
+        android:order="-30"
+        settings:allowDividerAbove="true"
+        settings:keywords="@string/keywords_internet"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settingslib.RestrictedPreference
+        android:key="calls_and_sms"
+        android:title="@string/calls_and_sms"
+        android:icon="@drawable/ic_network_cell"
+        android:order="-20"
+        android:summary="@string/summary_placeholder"
+        settings:allowDividerBelow="true"
+        settings:keywords="@string/calls_and_sms"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settings.widget.AddPreference
+        android:key="mobile_network_list"
+        android:title="@string/provider_network_settings_title"
+        android:summary="@string/summary_placeholder"
+        android:icon="@drawable/ic_sim_card"
+        android:order="-15"
+        settings:keywords="@string/keywords_more_mobile_networks"
+        settings:userRestriction="no_config_mobile_networks"
+        settings:allowDividerAbove="true"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="airplane_mode"
+        android:title="@string/airplane_mode"
+        android:icon="@drawable/ic_airplanemode_active"
+        android:order="-5"
+        settings:controller="com.android.settings.network.AirplaneModePreferenceController"
+        settings:userRestriction="no_airplane_mode"/>
+
+    <com.android.settingslib.RestrictedSwitchPreference
+        android:key="airplane_safe_networks"
+        android:title="@string/airplane_safe_networks"
+        android:icon="@drawable/ic_airplane_safe_networks_24dp"
+        android:summary="@string/airplane_safe_networks_summary"
+        android:order="-4"
+        settings:userRestriction="no_airplane_mode"
+        settings:keywords="@string/keywords_airplane_safe_networks" />
+
+    <com.android.settingslib.RestrictedPreference
+        android:key="manage_mobile_plan"
+        android:title="@string/manage_mobile_plan_title"
+        android:persistent="false"
+        android:order="0"
+        settings:userRestriction="no_config_mobile_networks"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settingslib.RestrictedPreference
+        android:fragment="com.android.settings.TetherSettings"
+        android:key="tether_settings"
+        android:title="@string/tether_settings_title_all"
+        android:icon="@drawable/ic_wifi_tethering"
+        android:order="5"
+        android:summary="@string/summary_placeholder"
+        settings:keywords="@string/keywords_hotspot_tethering"
+        settings:userRestriction="no_config_tethering"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settings.widget.PrimarySwitchPreference
+        android:fragment="com.android.settings.AllInOneTetherSettings"
+        android:key="all_tether_settings"
+        android:title="@string/tether_settings_title_all"
+        android:icon="@drawable/ic_wifi_tethering"
+        android:order="6"
+        android:summary="@string/summary_placeholder"
+        settings:controller="com.android.settings.network.AllInOneTetherPreferenceController"
+        settings:keywords="@string/keywords_hotspot_tethering"
+        settings:userRestriction="no_config_tethering"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settings.datausage.DataSaverPreference
+        android:key="restrict_background_parent_entry"
+        android:title="@string/data_saver_title"
+        android:icon="@drawable/ic_settings_data_usage"
+        android:order="10"
+        android:fragment="com.android.settings.datausage.DataSaverSummary"/>
+
+    <com.android.settingslib.RestrictedPreference
+        android:fragment="com.android.settings.vpn2.VpnSettings"
+        android:key="vpn_settings"
+        android:title="@string/vpn_settings_title"
+        android:icon="@drawable/ic_vpn_key"
+        android:order="15"
+        android:summary="@string/summary_placeholder"
+        settings:userRestriction="no_config_vpn"
+        settings:useAdminDisabledSummary="true" />
+
+    <com.android.settings.network.PrivateDnsModeDialogPreference
+        android:key="private_dns_settings"
+        android:title="@string/select_private_dns_configuration_title"
+        android:order="20"
+        android:dialogTitle="@string/select_private_dns_configuration_dialog_title"
+        android:dialogLayout="@layout/private_dns_mode_dialog"
+        android:positiveButtonText="@string/save"
+        android:negativeButtonText="@android:string/cancel" />
+
+    <Preference
+        android:fragment="com.android.settings.network.AdaptiveConnectivitySettings"
+        android:key="adaptive_connectivity"
+        android:title="@string/adaptive_connectivity_title"
+        android:summary="@string/summary_placeholder"
+        android:order="25"
+        settings:controller="com.android.settings.network.AdaptiveConnectivityPreferenceController"/>
+</PreferenceScreen>
diff --git a/res/xml/network_provider_settings.xml b/res/xml/network_provider_settings.xml
new file mode 100644
index 0000000..c374469
--- /dev/null
+++ b/res/xml/network_provider_settings.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
+        android:title="@string/provider_internet_settings"
+        settings:keywords="@string/keywords_wifi">
+
+    <com.android.settings.wifi.LinkablePreference
+        android:key="wifi_status_message"/>
+
+    <PreferenceCategory
+        android:key="connected_access_point"
+        android:layout="@layout/preference_category_no_label"/>
+
+    <PreferenceCategory
+        android:key="provider_model_mobile_network"
+        android:title="@string/summary_placeholder"
+        android:layout="@layout/preference_category_no_label"
+        settings:controller="com.android.settings.network.NetworkMobileProviderController"/>
+
+    <PreferenceCategory
+        android:key="access_points"
+        android:layout="@layout/preference_category_no_label"/>
+
+    <Preference
+        android:key="configure_wifi_settings"
+        android:title="@string/network_and_internet_preferences_title"
+        android:summary="@string/network_and_internet_preferences_summary"
+        settings:allowDividerAbove="true"
+        android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>
+
+    <Preference
+        android:key="saved_networks"
+        android:title="@string/wifi_saved_access_points_label"
+        android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"/>
+
+    <com.android.settings.datausage.DataUsagePreference
+        android:key="non_carrier_data_usage"
+        android:title="@string/non_carrier_data_usage"/>
+</PreferenceScreen>
diff --git a/res/xml/night_display_settings.xml b/res/xml/night_display_settings.xml
index 8b7e41a..97f5dd2 100644
--- a/res/xml/night_display_settings.xml
+++ b/res/xml/night_display_settings.xml
@@ -20,17 +20,21 @@
     android:title="@string/night_display_title"
     settings:keywords="@string/keywords_display_night_display">
 
-    <com.android.settingslib.widget.LayoutPreference
+    <com.android.settingslib.widget.BannerMessagePreference
         android:key="dark_ui_location_off"
-        android:selectable="false"
-        android:layout="@layout/twilight_mode_location_off"
-        settings:controller="com.android.settings.display.TwilightLocationPreferenceController"
-        settings:allowDividerBelow="true"/>
+        android:title="@string/twilight_mode_location_off_dialog_message"
+        settings:controller="com.android.settings.display.TwilightLocationPreferenceController"/>
+
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="night_display_top_intro"
+        android:title="@string/night_display_text"
+        settings:controller="com.android.settings.display.NightDisplayTopIntroPreferenceController"/>
 
     <DropDownPreference
         android:key="night_display_auto_mode"
         android:title="@string/night_display_auto_mode_title"
         android:summary="%s"
+        settings:allowDividerAbove="true"
         settings:controller="com.android.settings.display.NightDisplayAutoModePreferenceController"/>
 
     <Preference
@@ -59,11 +63,4 @@
         settings:keywords="@string/keywords_display_night_display"
         settings:controller="com.android.settings.display.NightDisplayActivationPreferenceController"/>
 
-    <com.android.settingslib.widget.FooterPreference
-        android:key="night_display_footer"
-        android:title="@string/night_display_text"
-        android:selectable="false"
-        settings:allowDividerAbove="true"
-        settings:controller="com.android.settings.display.NightDisplayFooterPreferenceController"/>
-
 </PreferenceScreen>
diff --git a/res/xml/notification_access_permission_details.xml b/res/xml/notification_access_permission_details.xml
index d956ce9..e0c7c1a 100644
--- a/res/xml/notification_access_permission_details.xml
+++ b/res/xml/notification_access_permission_details.xml
@@ -17,11 +17,18 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="notification_access_permission_detail_settings"
     android:title="@string/manage_notification_access_title">
 
+    <com.android.settingslib.widget.LayoutPreference
+        android:key="pref_app_header"
+        android:layout="@layout/settings_entity_header"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.HeaderPreferenceController"/>
+
     <com.android.settings.widget.FilterTouchesSwitchPreference
         android:key="notification_access_switch"
-        android:title="@string/notification_access_detail_switch"/>
+        android:title="@string/notification_access_detail_switch"
+        settings:controller="com.android.settings.applications.specialaccess.notificationaccess.ApprovalPreferenceController"/>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/one_handed_settings.xml b/res/xml/one_handed_settings.xml
new file mode 100644
index 0000000..3508d8a
--- /dev/null
+++ b/res/xml/one_handed_settings.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:persistent="false"
+    android:title="@string/one_handed_title">
+
+    <SwitchPreference
+        android:key="gesture_one_handed_mode_enabled"
+        android:title="@string/one_handed_mode_enabled"
+        settings:keywords="@string/keywords_one_handed"
+        settings:controller="com.android.settings.gestures.OneHandedEnablePreferenceController"/>
+
+    <SwitchPreference
+        android:key="gesture_app_taps_to_exit"
+        android:title="@string/one_handed_app_taps_to_exit"
+        settings:controller="com.android.settings.gestures.OneHandedAppTapsExitPreferenceController"/>
+
+    <ListPreference
+        android:entries="@array/one_handed_timeout_title"
+        android:entryValues="@array/one_handed_timeout_values"
+        android:key="one_handed_timeout_preference"
+        android:persistent="false"
+        android:title="@string/one_handed_timeout_title"
+        settings:controller="com.android.settings.gestures.OneHandedTimeoutPreferenceController"/>
+</PreferenceScreen>
diff --git a/res/xml/pick_up_gesture_settings.xml b/res/xml/pick_up_gesture_settings.xml
index 178ddf5..f19824f 100644
--- a/res/xml/pick_up_gesture_settings.xml
+++ b/res/xml/pick_up_gesture_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_pick_up_video"
         app:animation="@raw/gesture_ambient_lift"
-        app:preview="@drawable/gesture_ambient_lift" />
+        app:preview="@drawable/gesture_ambient_lift"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_pick_up"
diff --git a/res/xml/dummy_preference_screen.xml b/res/xml/placeholder_preference_screen.xml
similarity index 100%
rename from res/xml/dummy_preference_screen.xml
rename to res/xml/placeholder_preference_screen.xml
diff --git a/res/xml/prevent_ringing_gesture_settings.xml b/res/xml/prevent_ringing_gesture_settings.xml
index cc2f234..67a9c9b 100644
--- a/res/xml/prevent_ringing_gesture_settings.xml
+++ b/res/xml/prevent_ringing_gesture_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_prevent_ringing_video"
         app:animation="@raw/gesture_prevent_ringing"
-        app:preview="@drawable/gesture_prevent_ringing" />
+        app:preview="@drawable/gesture_prevent_ringing"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <com.android.settingslib.widget.LayoutPreference
         android:key="gesture_prevent_ringing_switch"
diff --git a/res/xml/privacy_dashboard_settings.xml b/res/xml/privacy_dashboard_settings.xml
index c18a236..f79da61 100644
--- a/res/xml/privacy_dashboard_settings.xml
+++ b/res/xml/privacy_dashboard_settings.xml
@@ -109,11 +109,11 @@
         android:summary="@string/content_capture_summary"
         settings:controller="com.android.settings.privacy.EnableContentCapturePreferenceController"/>
 
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:key="content_capture_custom_settings"
         android:title="@string/content_capture"
         android:summary="@string/content_capture_summary"
         settings:controller="com.android.settings.privacy.EnableContentCaptureWithServiceSettingsPreferenceController">
-    </com.android.settings.widget.MasterSwitchPreference>
+    </com.android.settings.widget.PrimarySwitchPreference>
 
 </PreferenceScreen>
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 2fc3ca4..8eb689c 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -33,7 +33,7 @@
         android:persistent="false"
         settings:controller="com.android.settings.backup.ConfigureAccountPreferenceController">
         <!-- the Intent declared here is always overwritten by a real one -->
-        <intent android:action="dummy" />
+        <intent android:action="placeholder" />
     </Preference>
 
     <Preference
diff --git a/res/xml/reduce_bright_colors_settings.xml b/res/xml/reduce_bright_colors_settings.xml
new file mode 100644
index 0000000..b9ca854
--- /dev/null
+++ b/res/xml/reduce_bright_colors_settings.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:persistent="false"
+    android:title="@string/reduce_bright_colors_preference_title">
+
+    <com.android.settings.widget.SeekBarPreference
+        android:key="rbc_intensity"
+        android:persistent="false"
+        android:title="@string/reduce_bright_colors_intensity_preference_title"/>
+
+    <SwitchPreference
+        android:key="rbc_persist"
+        android:persistent="false"
+        android:title="@string/reduce_bright_colors_persist_preference_title" />
+</PreferenceScreen>
diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml
index ac4ccb5..9497c8f 100644
--- a/res/xml/reset_dashboard_fragment.xml
+++ b/res/xml/reset_dashboard_fragment.xml
@@ -33,12 +33,18 @@
         android:key="reset_app_prefs"
         android:title="@string/reset_app_preferences" />
 
+    <!-- Erase Euicc data -->
+    <Preference
+        android:key="erase_euicc_data"
+        android:title="@string/reset_esim_title"
+        settings:controller="com.android.settings.network.EraseEuiccDataController" />
+
     <!-- Factory reset -->
     <com.android.settingslib.RestrictedPreference
         android:key="factory_reset"
-        android:title="@string/master_clear_title"
+        android:title="@string/main_clear_title"
         settings:keywords="@string/keywords_factory_data_reset"
         settings:userRestriction="no_factory_reset"
         settings:useAdminDisabledSummary="true"
-        android:fragment="com.android.settings.MasterClear" />
+        android:fragment="com.android.settings.MainClear" />
 </PreferenceScreen>
diff --git a/res/xml/screen_pinning_settings.xml b/res/xml/screen_pinning_settings.xml
index 04e5377..7689043 100644
--- a/res/xml/screen_pinning_settings.xml
+++ b/res/xml/screen_pinning_settings.xml
@@ -19,14 +19,18 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/screen_pinning_title">
 
+    <com.android.settingslib.widget.TopIntroPreference
+        android:title="@string/app_pinning_intro"
+        settings:searchable="false"/>
+
     <SwitchPreference
         android:key="use_screen_lock"
-        android:title="@string/screen_pinning_unlock_none" />
+        android:title="@string/screen_pinning_unlock_none"
+        settings:allowDividerAbove="true"/>
 
     <com.android.settingslib.widget.FooterPreference
         android:key="screen_pinning_settings_screen_footer"
         android:title="@string/screen_pinning_description"
-        android:selectable="false"
         settings:searchable="false" />
 
 </PreferenceScreen>
diff --git a/res/xml/screen_timeout_settings.xml b/res/xml/screen_timeout_settings.xml
new file mode 100644
index 0000000..0a6f9ee
--- /dev/null
+++ b/res/xml/screen_timeout_settings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2020 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/screen_timeout"/>
\ No newline at end of file
diff --git a/res/xml/security_settings_face.xml b/res/xml/security_settings_face.xml
index d450fef..1fc1ca8 100644
--- a/res/xml/security_settings_face.xml
+++ b/res/xml/security_settings_face.xml
@@ -16,15 +16,18 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/security_settings_face_preference_title">
 
     <com.android.settings.widget.VideoPreference
         android:key="security_settings_face_video"
         android:title="@string/summary_placeholder"
-        app:animation="@raw/face_settings"
-        app:controller="com.android.settings.widget.VideoPreferenceController"/>
+        settings:animation="@raw/face_settings"
+        settings:controller="com.android.settings.widget.VideoPreferenceController"/>
+
+    <com.android.settingslib.widget.TopIntroPreference
+        android:title="@string/security_settings_face_settings_top_intro"
+        settings:searchable="false"/>
 
     <PreferenceCategory
         android:key="security_settings_face_unlock_category"
@@ -32,13 +35,13 @@
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="security_settings_face_keyguard"
             android:title="@string/security_settings_face_settings_use_face_unlock_phone"
-            app:keywords="@string/keywords_face_unlock"
-            app:controller="com.android.settings.biometrics.face.FaceSettingsKeyguardPreferenceController"/>
+            settings:keywords="@string/keywords_face_unlock"
+            settings:controller="com.android.settings.biometrics.face.FaceSettingsKeyguardPreferenceController"/>
         <SwitchPreference
             android:key="security_settings_face_app"
             android:title="@string/security_settings_face_settings_use_face_for_apps"
-            app:keywords="@string/keywords_face_unlock"
-            app:controller="com.android.settings.biometrics.face.FaceSettingsAppPreferenceController"/>
+            settings:keywords="@string/keywords_face_unlock"
+            settings:controller="com.android.settings.biometrics.face.FaceSettingsAppPreferenceController"/>
         <com.android.settingslib.RestrictedSwitchPreference
             android:key="security_lockscreen_bypass"
             android:title="@string/lockscreen_bypass_title"
@@ -54,15 +57,15 @@
             android:key="security_settings_face_require_attention"
             android:title="@string/security_settings_face_settings_require_attention"
             android:summary="@string/security_settings_face_settings_require_attention_details"
-            app:keywords="@string/keywords_face_unlock"
-            app:controller="com.android.settings.biometrics.face.FaceSettingsAttentionPreferenceController"/>
+            settings:keywords="@string/keywords_face_unlock"
+            settings:controller="com.android.settings.biometrics.face.FaceSettingsAttentionPreferenceController"/>
 
         <SwitchPreference
             android:key="security_settings_face_require_confirmation"
             android:title="@string/security_settings_face_settings_require_confirmation"
             android:summary="@string/security_settings_face_settings_require_confirmation_details"
-            app:keywords="@string/keywords_face_unlock"
-            app:controller="com.android.settings.biometrics.face.FaceSettingsConfirmPreferenceController"/>
+            settings:keywords="@string/keywords_face_unlock"
+            settings:controller="com.android.settings.biometrics.face.FaceSettingsConfirmPreferenceController"/>
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -84,5 +87,7 @@
     </PreferenceCategory>
 
     <com.android.settingslib.widget.FooterPreference
-        settings:allowDividerAbove="true"/>
+        android:key="security_face_footer"
+        settings:allowDividerAbove="true"
+        settings:controller="com.android.settings.biometrics.face.FaceSettingsFooterPreferenceController" />
 </PreferenceScreen>
diff --git a/res/xml/security_settings_picker.xml b/res/xml/security_settings_picker.xml
index e772c38..8ce0d62 100644
--- a/res/xml/security_settings_picker.xml
+++ b/res/xml/security_settings_picker.xml
@@ -58,6 +58,11 @@
             android:title="@string/face_unlock_skip_face"
             android:persistent="false"/>
 
+    <com.android.settingslib.RestrictedPreference
+        android:key="unlock_skip_biometrics"
+        android:title="@string/biometrics_unlock_skip_biometrics"
+        android:persistent="false"/>
+
     <com.android.settingslib.widget.FooterPreference
             android:key="lock_settings_footer"
             android:selectable="false"
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index 91634fc..bc58d7e 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -24,7 +24,7 @@
         android:order="0"
         settings:searchable="false"
         settings:controller="com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController"/>
-    <com.android.settings.widget.MasterSwitchPreference
+    <com.android.settings.widget.PrimarySwitchPreference
         android:fragment="com.android.settings.deletionhelper.AutomaticStorageManagerSettings"
         android:key="toggle_asm"
         android:title="@string/automatic_storage_manager_preference_title"
diff --git a/res/xml/swipe_bottom_to_notification_settings.xml b/res/xml/swipe_bottom_to_notification_settings.xml
new file mode 100644
index 0000000..bec774b
--- /dev/null
+++ b/res/xml/swipe_bottom_to_notification_settings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/swipe_bottom_to_notifications_title">
+
+    <com.android.settings.widget.VideoPreference
+        android:title="@string/swipe_bottom_to_notifications_title"
+        settings:animation="@raw/gesture_fingerprint_swipe"
+        settings:preview="@drawable/gesture_fingerprint_swipe"
+        settings:controller="com.android.settings.widget.VideoPreferenceController"/>
+
+    <SwitchPreference
+        android:key="gesture_swipe_bottom_to_notification"
+        android:title="@string/swipe_bottom_to_notifications_title"
+        android:summary="@string/swipe_bottom_to_notifications_summary"
+        settings:controller="com.android.settings.gestures.SwipeBottomToNotificationPreferenceController"
+        settings:allowDividerAbove="true" />
+
+</PreferenceScreen>
diff --git a/res/xml/swipe_to_notification_settings.xml b/res/xml/swipe_to_notification_settings.xml
index b126170..15d9eaf 100644
--- a/res/xml/swipe_to_notification_settings.xml
+++ b/res/xml/swipe_to_notification_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_swipe_down_fingerprint_video"
         app:animation="@raw/gesture_fingerprint_swipe"
-        app:preview="@drawable/gesture_fingerprint_swipe" />
+        app:preview="@drawable/gesture_fingerprint_swipe"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_swipe_down_fingerprint"
diff --git a/res/xml/tap_screen_gesture_settings.xml b/res/xml/tap_screen_gesture_settings.xml
index fe31225..3d78b03 100644
--- a/res/xml/tap_screen_gesture_settings.xml
+++ b/res/xml/tap_screen_gesture_settings.xml
@@ -23,7 +23,8 @@
     <com.android.settings.widget.VideoPreference
         android:key="gesture_tap_screen_video"
         app:animation="@raw/gesture_ambient_tap_screen"
-        app:preview="@drawable/gesture_ambient_tap_screen" />
+        app:preview="@drawable/gesture_ambient_tap_screen"
+        app:controller="com.android.settings.widget.VideoPreferenceController" />
 
     <SwitchPreference
         android:key="gesture_tap"
diff --git a/res/xml/tether_prefs.xml b/res/xml/tether_prefs.xml
index 9367a9b..cca4e5f 100644
--- a/res/xml/tether_prefs.xml
+++ b/res/xml/tether_prefs.xml
@@ -19,12 +19,17 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="@string/tether_settings_title_all">
 
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="tether_prefs_top_intro"
+        settings:searchable="false"/>
+
     <com.android.settings.widget.FixedLineSummaryPreference
         android:key="wifi_tether"
         android:title="@string/wifi_hotspot_checkbox_text"
         android:summary="@string/summary_placeholder"
         android:fragment="com.android.settings.wifi.tether.WifiTetherSettings"
-        settings:summaryLineCount="2" />
+        settings:allowDividerAbove="true"
+        settings:summaryLineCount="2"/>
 
     <SwitchPreference
         android:key="usb_tether_settings"
@@ -49,9 +54,4 @@
         android:summary="@string/tether_settings_disabled_on_data_saver"
         android:selectable="false"
         settings:allowDividerAbove="true" />
-
-    <com.android.settingslib.widget.FooterPreference
-        android:key="tether_prefs_footer"
-        android:selectable="false"
-        settings:searchable="false"/>
 </PreferenceScreen>
diff --git a/res/xml/top_level_settings_grouped.xml b/res/xml/top_level_settings_grouped.xml
new file mode 100644
index 0000000..baee7b3
--- /dev/null
+++ b/res/xml/top_level_settings_grouped.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright (C) 2020 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:key="top_level_settings_grouped">
+
+    <Preference
+        android:fragment="com.android.settings.network.NetworkDashboardFragment"
+        android:icon="@drawable/ic_homepage_network"
+        android:key="top_level_network"
+        android:order="-140"
+        android:title="@string/network_dashboard_title"
+        settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
+
+    <Preference
+        android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
+        android:icon="@drawable/ic_homepage_connected_device"
+        android:key="top_level_connected_devices"
+        android:order="-130"
+        android:title="@string/connected_devices_dashboard_title"
+        settings:controller="com.android.settings.connecteddevice.TopLevelConnectedDevicesPreferenceController"/>
+
+    <PreferenceCategory
+        android:key="apps"
+        android:order="-120"
+        settings:allowDividerAbove="false">
+        <Preference
+            android:fragment="com.android.settings.applications.AppAndNotificationDashboardFragment"
+            android:icon="@drawable/ic_homepage_apps"
+            android:key="top_level_apps_and_notifs"
+            android:order="-120"
+            android:title="@string/apps_dashboard_title"/>
+
+        <Preference
+            android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
+            android:icon="@drawable/ic_homepage_notification"
+            android:key="top_level_notification"
+            android:order="-110"
+            android:title="@string/configure_notification_settings"/>
+
+
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="phone_essential"
+        android:order="-100"
+        settings:allowDividerAbove="false">
+        <Preference
+            android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
+            android:icon="@drawable/ic_homepage_battery"
+            android:key="top_level_battery"
+            android:order="-100"
+            android:title="@string/power_usage_summary_title"
+            settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
+
+        <Preference
+            android:fragment="com.android.settings.deviceinfo.StorageSettings"
+            android:icon="@drawable/ic_homepage_storage"
+            android:key="top_level_storage"
+            android:order="-90"
+            android:title="@string/storage_settings"
+            settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
+
+        <Preference
+            android:fragment="com.android.settings.notification.SoundSettings"
+            android:icon="@drawable/ic_homepage_sound"
+            android:key="top_level_sound"
+            android:order="-80"
+            android:title="@string/sound_settings"/>
+
+        <Preference
+            android:fragment="com.android.settings.DisplaySettings"
+            android:icon="@drawable/ic_homepage_display"
+            android:key="top_level_display"
+            android:order="-70"
+            android:title="@string/display_settings"
+            settings:controller="com.android.settings.display.TopLevelDisplayPreferenceController"/>
+
+        <com.android.settingslib.RestrictedTopLevelPreference
+            android:icon="@drawable/ic_homepage_display"
+            android:key="top_level_wallpaper"
+            android:order="-60"
+            android:title="@string/wallpaper_settings_title"
+            settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
+
+        <Preference
+            android:fragment="com.android.settings.accessibility.AccessibilitySettings"
+            android:icon="@drawable/ic_homepage_accessibility"
+            android:key="top_level_accessibility"
+            android:order="-50"
+            android:title="@string/accessibility_settings"
+            settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="privacy_and_security"
+        android:order="-40"
+        settings:allowDividerAbove="false">
+        <Preference
+            android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
+            android:icon="@drawable/ic_homepage_privacy"
+            android:key="top_level_privacy"
+            android:order="-40"
+            android:title="@string/privacy_dashboard_title"/>
+
+        <Preference
+            android:fragment="com.android.settings.location.LocationSettings"
+            android:icon="@drawable/ic_homepage_location"
+            android:key="top_level_location"
+            android:order="-30"
+            android:title="@string/location_settings_title"
+            settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
+
+        <Preference
+            android:fragment="com.android.settings.security.SecuritySettings"
+            android:icon="@drawable/ic_homepage_security"
+            android:key="top_level_security"
+            android:order="-20"
+            android:title="@string/security_settings_title"
+            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="accounts"
+        android:order="-10"
+        settings:allowDividerAbove="false">
+        <Preference
+            android:fragment="com.android.settings.accounts.AccountDashboardFragment"
+            android:icon="@drawable/ic_homepage_accounts"
+            android:key="top_level_accounts"
+            android:order="-10"
+            android:title="@string/account_dashboard_title"
+            settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="system"
+        android:order="10"
+        settings:allowDividerAbove="false">
+        <Preference
+            android:fragment="com.android.settings.system.SystemDashboardFragment"
+            android:icon="@drawable/ic_homepage_system_dashboard"
+            android:key="top_level_system"
+            android:order="10"
+            android:title="@string/header_category_system"/>
+
+        <Preference
+            android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
+            android:icon="@drawable/ic_homepage_about"
+            android:key="top_level_about_device"
+            android:order="20"
+            android:title="@string/about_settings"
+            settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
+
+        <Preference
+            android:icon="@drawable/ic_homepage_support"
+            android:key="top_level_support"
+            android:order="100"
+            android:title="@string/page_tab_title_support"
+            settings:controller="com.android.settings.support.SupportPreferenceController"/>
+    </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/transcode_settings.xml b/res/xml/transcode_settings.xml
new file mode 100644
index 0000000..b142d31
--- /dev/null
+++ b/res/xml/transcode_settings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
+    android:title="@string/transcode_settings_title"
+    settings:searchable="false">
+
+    <SwitchPreference
+        android:key="transcode_user_control"
+        android:title="@string/transcode_user_control"
+        settings:controller="com.android.settings.development.transcode.TranscodeUserControlPreferenceController" />
+
+    <SwitchPreference
+        android:key="transcode_enable_all"
+        android:title="@string/transcode_enable_all"
+        settings:controller="com.android.settings.development.transcode.TranscodeGlobalTogglePreferenceController" />
+
+    <SwitchPreference
+        android:key="transcode_default"
+        android:title="@string/transcode_default"
+        settings:controller="com.android.settings.development.transcode.TranscodeDefaultOptionPreferenceController" />
+</PreferenceScreen>
diff --git a/res/xml/user_settings.xml b/res/xml/user_settings.xml
index 7726a18..5cafa1a 100644
--- a/res/xml/user_settings.xml
+++ b/res/xml/user_settings.xml
@@ -20,6 +20,11 @@
     android:key="user_settings_screen"
     android:title="@string/user_settings_title">
 
+    <com.android.settingslib.widget.TopIntroPreference
+        android:key="multiuser_top_intro"
+        android:title="@string/user_settings_footer_text"
+        settings:controller="com.android.settings.users.MultiUserTopIntroPreferenceController"/>
+
     <PreferenceCategory
         android:key="user_list"
         android:title="@string/user_list_title"
@@ -45,11 +50,4 @@
         android:order="105"
         settings:allowDividerAbove="true"/>
 
-    <com.android.settingslib.widget.FooterPreference
-        android:key="multiuser_footer"
-        android:title="@string/user_settings_footer_text"
-        android:selectable="false"
-        settings:searchable="false"
-        settings:controller="com.android.settings.users.MultiUserFooterPreferenceController"/>
-
 </PreferenceScreen>
diff --git a/res/xml/wifi_display_saved_access_points.xml b/res/xml/wifi_display_saved_access_points.xml
deleted file mode 100644
index b3a8d55..0000000
--- a/res/xml/wifi_display_saved_access_points.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:key="saved_access_points"
-    android:title="@string/wifi_saved_access_points_label">
-
-    <PreferenceCategory
-        android:key="subscribed_access_points_category"
-        android:title="@string/wifi_subscribed_access_points_tab"
-        settings:controller="com.android.settings.wifi.savedaccesspoints.SubscribedAccessPointsPreferenceController"/>
-
-    <PreferenceCategory
-        android:key="saved_access_points_category"
-        android:title="@string/wifi_saved_access_points_tab"
-        settings:controller="com.android.settings.wifi.savedaccesspoints.SavedAccessPointsPreferenceController"/>
-
-</PreferenceScreen>
diff --git a/res/xml/wifi_display_saved_access_points2.xml b/res/xml/wifi_display_saved_access_points2.xml
index 02c732a..8cbea66 100644
--- a/res/xml/wifi_display_saved_access_points2.xml
+++ b/res/xml/wifi_display_saved_access_points2.xml
@@ -27,7 +27,7 @@
 
     <PreferenceCategory
         android:key="saved_access_points_category"
-        android:title="@string/wifi_saved_access_points_tab"
+        android:title="@string/wifi_saved_other_networks_tab"
         settings:controller="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsPreferenceController2"/>
 
 </PreferenceScreen>
diff --git a/res/xml/wifi_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
deleted file mode 100644
index 7ec1f0e..0000000
--- a/res/xml/wifi_network_details_fragment.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    settings:initialExpandedChildrenCount="5">
-
-    <com.android.settingslib.widget.LayoutPreference
-        android:key="connection_header"
-        android:layout="@layout/settings_entity_header"
-        android:selectable="false"
-        android:order="-10000"
-        settings:allowDividerBelow="true"/>
-
-    <com.android.settings.datausage.DataUsageSummaryPreference
-        android:key="status_header"
-        android:selectable="false"
-        settings:isPreferenceVisible="false"/>
-
-    <!-- Buttons -->
-    <com.android.settingslib.widget.ActionButtonsPreference
-        android:key="buttons"
-        android:selectable="false" />
-
-    <!-- General Details Preferences -->
-    <Preference
-        android:key="signal_strength"
-        android:title="@string/wifi_signal"
-        android:selectable="false"
-        settings:allowDividerAbove="true"/>
-
-    <Preference
-        android:key="frequency"
-        android:icon="@drawable/ic_frequency_antenna"
-        android:title="@string/wifi_frequency"
-        android:selectable="false"/>
-
-    <Preference
-        android:key="security"
-        android:icon="@drawable/ic_security_lock_24dp"
-        android:title="@string/wifi_security"
-        android:selectable="false"/>
-
-    <DropDownPreference
-        android:key="metered"
-        android:icon="@drawable/ic_attach_money_black_24dp"
-        android:title="@string/wifi_metered_title"
-        android:entries="@array/wifi_metered_entries"
-        android:entryValues="@array/wifi_metered_values"/>
-
-    <DropDownPreference
-        android:key="privacy"
-        android:icon="@drawable/ic_wifi_privacy_24dp"
-        android:title="@string/wifi_privacy_settings"
-        android:entries="@array/wifi_privacy_entries"
-        android:entryValues="@array/wifi_privacy_values"/>
-
-    <!-- Add device Preference -->
-    <Preference
-        android:key="add_device_to_network"
-        android:title="@string/wifi_dpp_add_device"
-        android:summary="@string/wifi_dpp_connect_network_using_qr_code"
-        settings:allowDividerAbove="true"/>
-
-    <!-- Network Details -->
-    <PreferenceCategory
-            android:key="ip_details_category"
-            android:title="@string/wifi_setup_detail">
-        <Preference
-                android:key="ssid"
-                android:title="@string/wifi_advanced_ssid_title"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="mac_address"
-                android:title="@string/wifi_advanced_randomized_mac_address_title"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="ip_address"
-                android:title="@string/wifi_ip_address"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="gateway"
-                android:title="@string/wifi_gateway"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="subnet_mask"
-                android:title="@string/wifi_details_subnet_mask"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="dns"
-                android:title="@string/wifi_details_dns"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="tx_link_speed"
-                android:title="@string/tx_wifi_speed"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-        <Preference
-                android:key="rx_link_speed"
-                android:title="@string/rx_wifi_speed"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-    </PreferenceCategory>
-
-    <!-- IPv6 Details -->
-    <PreferenceCategory
-            android:key="ipv6_category"
-            android:title="@string/wifi_details_ipv6_address_header"
-            android:selectable="false">
-        <Preference
-                android:key="ipv6_addresses"
-                android:selectable="false"
-                settings:enableCopying="true"/>
-    </PreferenceCategory>
-</PreferenceScreen>
diff --git a/res/xml/wifi_network_details_fragment2.xml b/res/xml/wifi_network_details_fragment2.xml
index 92f68cc..181b799 100644
--- a/res/xml/wifi_network_details_fragment2.xml
+++ b/res/xml/wifi_network_details_fragment2.xml
@@ -106,6 +106,11 @@
                 android:selectable="false"
                 settings:enableCopying="true"/>
         <Preference
+                android:key="eap_sim_subscription"
+                android:title="@string/sim_card"
+                android:selectable="false"
+                settings:enableCopying="true"/>
+        <Preference
                 android:key="mac_address"
                 android:title="@string/wifi_advanced_randomized_mac_address_title"
                 android:selectable="false"
diff --git a/res/xml/wifi_settings.xml b/res/xml/wifi_settings.xml
index a7f5a20..eadea68 100644
--- a/res/xml/wifi_settings.xml
+++ b/res/xml/wifi_settings.xml
@@ -17,21 +17,19 @@
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res-auto"
-        android:title="@string/wifi_settings">
+        android:title="@string/wifi_settings"
+        settings:keywords="@string/keywords_wifi">
 
     <com.android.settings.wifi.LinkablePreference
-        android:key="wifi_status_message"
-        settings:searchable="false"/>
+        android:key="wifi_status_message"/>
 
     <PreferenceCategory
         android:key="connected_access_point"
-        android:layout="@layout/preference_category_no_label"
-        settings:searchable="false"/>
+        android:layout="@layout/preference_category_no_label"/>
 
     <PreferenceCategory
         android:key="access_points"
-        android:layout="@layout/preference_category_no_label"
-        settings:searchable="false"/>
+        android:layout="@layout/preference_category_no_label"/>
 
     <Preference
         android:key="configure_wifi_settings"
@@ -42,10 +40,9 @@
     <Preference
         android:key="saved_networks"
         android:title="@string/wifi_saved_access_points_label"
-        android:fragment="com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings"/>
+        android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"/>
 
     <com.android.settings.datausage.DataUsagePreference
         android:key="wifi_data_usage"
-        android:title="@string/wifi_data_usage"
-        settings:keywords="@string/keywords_wifi_data_usage"/>
+        android:title="@string/wifi_data_usage"/>
 </PreferenceScreen>
diff --git a/res/xml/wifi_settings2.xml b/res/xml/wifi_settings2.xml
deleted file mode 100644
index 2bf39dbe..0000000
--- a/res/xml/wifi_settings2.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res-auto"
-        android:title="@string/wifi_settings"
-        settings:keywords="@string/keywords_wifi">
-
-    <com.android.settings.wifi.LinkablePreference
-        android:key="wifi_status_message"/>
-
-    <PreferenceCategory
-        android:key="connected_access_point"
-        android:layout="@layout/preference_category_no_label"/>
-
-    <PreferenceCategory
-        android:key="access_points"
-        android:layout="@layout/preference_category_no_label"/>
-
-    <Preference
-        android:key="configure_wifi_settings"
-        android:title="@string/wifi_configure_settings_preference_title"
-        settings:allowDividerAbove="true"
-        android:fragment="com.android.settings.wifi.ConfigureWifiSettings"/>
-
-    <Preference
-        android:key="saved_networks"
-        android:title="@string/wifi_saved_access_points_label"
-        android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"/>
-
-    <com.android.settings.datausage.DataUsagePreference
-        android:key="wifi_data_usage"
-        android:title="@string/wifi_data_usage"/>
-</PreferenceScreen>
diff --git a/res/xml/zen_mode_custom_rule_settings.xml b/res/xml/zen_mode_custom_rule_settings.xml
index 169a94f..8f360b9 100644
--- a/res/xml/zen_mode_custom_rule_settings.xml
+++ b/res/xml/zen_mode_custom_rule_settings.xml
@@ -22,11 +22,11 @@
 
     <PreferenceCategory
         android:key="zen_custom_rule_category">
-        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
+        <com.android.settingslib.widget.RadioButtonPreference
             android:key="zen_custom_rule_setting_default"
             android:title="@string/zen_mode_custom_behavior_summary_default"/>
 
-        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
+        <com.android.settingslib.widget.RadioButtonPreference
             android:key="zen_custom_rule_setting"
             android:title="@string/zen_mode_custom_behavior_summary" />
     </PreferenceCategory>
diff --git a/res/xml/zen_mode_restrict_notifications_settings.xml b/res/xml/zen_mode_restrict_notifications_settings.xml
index f5e7615..051c208 100644
--- a/res/xml/zen_mode_restrict_notifications_settings.xml
+++ b/res/xml/zen_mode_restrict_notifications_settings.xml
@@ -23,19 +23,19 @@
     <PreferenceCategory
         android:key="restrict_category"
         android:title="@string/zen_mode_restrict_notifications_category">
-        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
+        <com.android.settingslib.widget.RadioButtonPreference
             android:key="zen_mute_notifications"
             android:title="@string/zen_mode_restrict_notifications_mute"
             android:summary="@string/zen_mode_restrict_notifications_mute_summary"
             settings:searchable="false"/>
 
-        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
+        <com.android.settingslib.widget.RadioButtonPreference
             android:key="zen_hide_notifications"
             android:title="@string/zen_mode_restrict_notifications_hide"
             android:summary="@string/zen_mode_restrict_notifications_hide_summary"
             settings:searchable="false"/>
 
-        <com.android.settings.notification.zen.ZenCustomRadioButtonPreference
+        <com.android.settingslib.widget.RadioButtonPreference
             android:key="zen_custom"
             android:title="@string/zen_mode_restrict_notifications_custom"
             settings:searchable="false"/>
diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java
index ed3b5b0..82e3206 100644
--- a/src/com/android/settings/AllInOneTetherSettings.java
+++ b/src/com/android/settings/AllInOneTetherSettings.java
@@ -304,12 +304,12 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
         // Do nothing
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
         // Do nothing
     }
 
diff --git a/src/com/android/settings/AsyncTaskSidecar.java b/src/com/android/settings/AsyncTaskSidecar.java
new file mode 100644
index 0000000..31c8298
--- /dev/null
+++ b/src/com/android/settings/AsyncTaskSidecar.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2020 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;
+
+import android.os.AsyncTask;
+
+import androidx.annotation.Nullable;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.util.concurrent.Future;
+
+/** A {@link SidecarFragment} which uses an {@link AsyncTask} to perform background work. */
+public abstract class AsyncTaskSidecar<Param, Result> extends SidecarFragment {
+
+    private Future<Result> mAsyncTask;
+
+    @Override
+    public void onDestroy() {
+        if (mAsyncTask != null) {
+            mAsyncTask.cancel(true /* mayInterruptIfRunning */);
+        }
+
+        super.onDestroy();
+    }
+
+    /**
+     * Executes the background task.
+     *
+     * @param param parameters passed in from {@link #run}
+     */
+    protected abstract Result doInBackground(@Nullable Param param);
+
+    /** Handles the background task's result. */
+    protected void onPostExecute(Result result) {}
+
+    /** Runs the sidecar and sets the state to RUNNING. */
+    public void run(@Nullable final Param param) {
+        setState(State.RUNNING, Substate.UNUSED);
+
+        if (mAsyncTask != null) {
+            mAsyncTask.cancel(true /* mayInterruptIfRunning */);
+        }
+
+        mAsyncTask =
+                ThreadUtils.postOnBackgroundThread(
+                        () -> {
+                            Result result = doInBackground(param);
+                            ThreadUtils.postOnMainThread(() -> onPostExecute(result));
+                        });
+    }
+}
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 6b23b29..1cb9ade 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -19,18 +19,18 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
+import android.util.FeatureFlagUtils;
 
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.display.BrightnessLevelPreferenceController;
 import com.android.settings.display.CameraGesturePreferenceController;
 import com.android.settings.display.LiftToWakePreferenceController;
-import com.android.settings.display.NightDisplayPreferenceController;
-import com.android.settings.display.NightModePreferenceController;
 import com.android.settings.display.ScreenSaverPreferenceController;
 import com.android.settings.display.ShowOperatorNamePreferenceController;
 import com.android.settings.display.TapToWakePreferenceController;
 import com.android.settings.display.ThemePreferenceController;
-import com.android.settings.display.TimeoutPreferenceController;
 import com.android.settings.display.VrDisplayPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -38,14 +38,13 @@
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class DisplaySettings extends DashboardFragment {
     private static final String TAG = "DisplaySettings";
 
-    private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
-
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.DISPLAY;
@@ -58,6 +57,9 @@
 
     @Override
     protected int getPreferenceScreenResId() {
+        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
+            return R.xml.display_settings_v2;
+        }
         return R.xml.display_settings;
     }
 
@@ -81,11 +83,8 @@
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
         controllers.add(new CameraGesturePreferenceController(context));
         controllers.add(new LiftToWakePreferenceController(context));
-        controllers.add(new NightDisplayPreferenceController(context));
-        controllers.add(new NightModePreferenceController(context));
         controllers.add(new ScreenSaverPreferenceController(context));
         controllers.add(new TapToWakePreferenceController(context));
-        controllers.add(new TimeoutPreferenceController(context, KEY_SCREEN_TIMEOUT));
         controllers.add(new VrDisplayPreferenceController(context));
         controllers.add(new ShowOperatorNamePreferenceController(context));
         controllers.add(new ThemePreferenceController(context));
@@ -94,7 +93,16 @@
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.display_settings) {
+            new BaseSearchIndexProvider() {
+
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)
+                            ? R.xml.display_settings_v2 : R.xml.display_settings;
+                    return Arrays.asList(sir);
+                }
 
                 @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(
diff --git a/src/com/android/settings/EncryptionInterstitial.java b/src/com/android/settings/EncryptionInterstitial.java
index 7a11053..4ab197d 100644
--- a/src/com/android/settings/EncryptionInterstitial.java
+++ b/src/com/android/settings/EncryptionInterstitial.java
@@ -62,8 +62,8 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     @Override
@@ -111,6 +111,8 @@
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
             final boolean forFace = getActivity().getIntent()
                     .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false);
+            final boolean forBiometrics = getActivity().getIntent()
+                    .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, false);
             Intent intent = getActivity().getIntent();
             mRequestedPasswordQuality = intent.getIntExtra(EXTRA_PASSWORD_QUALITY, 0);
             mUnlockMethodIntent = intent.getParcelableExtra(EXTRA_UNLOCK_METHOD_INTENT);
@@ -121,6 +123,8 @@
                             R.string.encryption_interstitial_message_pattern_for_fingerprint :
                             forFace ?
                             R.string.encryption_interstitial_message_pattern_for_face :
+                            forBiometrics ?
+                            R.string.encryption_interstitial_message_pattern_for_biometrics :
                             R.string.encryption_interstitial_message_pattern;
                     break;
                 case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
@@ -129,6 +133,8 @@
                             R.string.encryption_interstitial_message_pin_for_fingerprint :
                             forFace ?
                             R.string.encryption_interstitial_message_pin_for_face :
+                            forBiometrics ?
+                            R.string.encryption_interstitial_message_pin_for_biometrics :
                             R.string.encryption_interstitial_message_pin;
                     break;
                 default:
@@ -136,6 +142,8 @@
                             R.string.encryption_interstitial_message_password_for_fingerprint :
                             forFace ?
                             R.string.encryption_interstitial_message_password_for_face :
+                            forBiometrics ?
+                            R.string.encryption_interstitial_message_password_for_biometrics :
                             R.string.encryption_interstitial_message_password;
                     break;
             }
diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index 77cc03e..a9b5b31 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -30,6 +30,7 @@
 import android.os.Message;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
+import android.telephony.PinResult;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -532,30 +533,25 @@
         mPinToggle.setEnabled(false);
     }
 
-    private class SetIccLockEnabled extends AsyncTask<Void, Void, Void> {
+    private class SetIccLockEnabled extends AsyncTask<Void, Void, PinResult> {
         private final boolean mState;
-        private final String mPassword;
-        private int mAttemptsRemaining;
+        private final String mPin;
 
         private SetIccLockEnabled(boolean state, String pin) {
             mState = state;
-            mPassword = pin;
+            mPin = pin;
         }
 
         @Override
-        protected Void doInBackground(Void... params) {
+        protected PinResult doInBackground(Void... params) {
             mTelephonyManager =  mTelephonyManager.createForSubscriptionId(mSubId);
-            mAttemptsRemaining = mTelephonyManager.setIccLockEnabled(mState, mPassword);
-            return null;
+            return mTelephonyManager.setIccLockEnabled(mState, mPin);
         }
 
         @Override
-        protected void onPostExecute(Void aVoid) {
-            if (mAttemptsRemaining == TelephonyManager.CHANGE_ICC_LOCK_SUCCESS) {
-                iccLockChanged(true, mAttemptsRemaining);
-            } else {
-                iccLockChanged(false, mAttemptsRemaining);
-            }
+        protected void onPostExecute(PinResult pinResult) {
+            iccLockChanged(pinResult.getResult() == PinResult.PIN_RESULT_TYPE_SUCCESS /* success */,
+                    pinResult.getAttemptsRemaining() /* attemptsRemaining */);
         }
     }
 
@@ -641,33 +637,28 @@
     }
 
     private void tryChangePin() {
-        new ChangeIccLockPassword(mOldPin, mNewPin).execute();
+        new ChangeIccLockPin(mOldPin, mNewPin).execute();
     }
 
-    private class ChangeIccLockPassword extends AsyncTask<Void, Void, Void> {
-        private final String mOldPwd;
-        private final String mNewPwd;
-        private int mAttemptsRemaining;
+    private class ChangeIccLockPin extends AsyncTask<Void, Void, PinResult> {
+        private final String mOldPin;
+        private final String mNewPin;
 
-        private ChangeIccLockPassword(String oldPin, String newPin) {
-            mOldPwd = oldPin;
-            mNewPwd = newPin;
+        private ChangeIccLockPin(String oldPin, String newPin) {
+            mOldPin = oldPin;
+            mNewPin = newPin;
         }
 
         @Override
-        protected Void doInBackground(Void... params) {
+        protected PinResult doInBackground(Void... params) {
             mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
-            mAttemptsRemaining = mTelephonyManager.changeIccLockPassword(mOldPwd, mNewPwd);
-            return null;
+            return mTelephonyManager.changeIccLockPin(mOldPin, mNewPin);
         }
 
         @Override
-        protected void onPostExecute(Void aVoid) {
-            if (mAttemptsRemaining == TelephonyManager.CHANGE_ICC_LOCK_SUCCESS) {
-                iccPinChanged(true, mAttemptsRemaining);
-            } else {
-                iccPinChanged(false, mAttemptsRemaining);
-            }
+        protected void onPostExecute(PinResult pinResult) {
+            iccPinChanged(pinResult.getResult() == PinResult.PIN_RESULT_TYPE_SUCCESS /* success */,
+                    pinResult.getAttemptsRemaining() /* attemptsRemaining */);
         }
     }
 
diff --git a/src/com/android/settings/MainClear.java b/src/com/android/settings/MainClear.java
new file mode 100644
index 0000000..326aeef
--- /dev/null
+++ b/src/com/android/settings/MainClear.java
@@ -0,0 +1,574 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.AuthenticatorDescription;
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.settings.SettingsEnums;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.Environment;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.sysprop.VoldProperties;
+import android.telephony.euicc.EuiccManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnScrollChangeListener;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+import android.widget.TextView;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.ConfirmLockPattern;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
+
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
+import com.google.android.setupcompat.template.FooterButton.ButtonType;
+import com.google.android.setupdesign.GlifLayout;
+
+import java.util.List;
+
+/**
+ * Confirm and execute a reset of the device to a clean "just out of the box"
+ * state.  Multiple confirmations are required: first, a general "are you sure
+ * you want to do this?" prompt, followed by a keyguard pattern trace if the user
+ * has defined one, followed by a final strongly-worded "THIS WILL ERASE EVERYTHING
+ * ON THE PHONE" prompt.  If at any time the phone is allowed to go to sleep, is
+ * locked, et cetera, then the confirmation sequence is abandoned.
+ *
+ * This is the initial screen.
+ */
+public class MainClear extends InstrumentedFragment implements OnGlobalLayoutListener {
+    private static final String TAG = "MainClear";
+
+    @VisibleForTesting
+    static final int KEYGUARD_REQUEST = 55;
+    @VisibleForTesting
+    static final int CREDENTIAL_CONFIRM_REQUEST = 56;
+
+    private static final String KEY_SHOW_ESIM_RESET_CHECKBOX =
+            "masterclear.allow_retain_esim_profiles_after_fdr";
+
+    static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
+    static final String ERASE_ESIMS_EXTRA = "erase_esim";
+
+    private View mContentView;
+    @VisibleForTesting
+    FooterButton mInitiateButton;
+    private View mExternalStorageContainer;
+    @VisibleForTesting
+    CheckBox mExternalStorage;
+    @VisibleForTesting
+    View mEsimStorageContainer;
+    @VisibleForTesting
+    CheckBox mEsimStorage;
+    @VisibleForTesting
+    ScrollView mScrollView;
+
+    @Override
+    public void onGlobalLayout() {
+        mInitiateButton.setEnabled(hasReachedBottom(mScrollView));
+    }
+
+    private void setUpActionBarAndTitle() {
+        final Activity activity = getActivity();
+        if (activity == null) {
+            Log.e(TAG, "No activity attached, skipping setUpActionBarAndTitle");
+            return;
+        }
+        final ActionBar actionBar = activity.getActionBar();
+        if (actionBar == null) {
+            Log.e(TAG, "No actionbar, skipping setUpActionBarAndTitle");
+            return;
+        }
+        actionBar.hide();
+        activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
+    }
+
+    /**
+     * Keyguard validation is run using the standard {@link ConfirmLockPattern}
+     * component as a subactivity
+     *
+     * @param request the request code to be returned once confirmation finishes
+     * @return true if confirmation launched
+     */
+    private boolean runKeyguardConfirmation(int request) {
+        Resources res = getActivity().getResources();
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(getActivity(), this);
+        return builder.setRequestCode(request)
+                .setTitle(res.getText(R.string.main_clear_short_title))
+                .show();
+    }
+
+    @VisibleForTesting
+    boolean isValidRequestCode(int requestCode) {
+        return !((requestCode != KEYGUARD_REQUEST) && (requestCode != CREDENTIAL_CONFIRM_REQUEST));
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        onActivityResultInternal(requestCode, resultCode, data);
+    }
+
+    /*
+     * Internal method that allows easy testing without dealing with super references.
+     */
+    @VisibleForTesting
+    void onActivityResultInternal(int requestCode, int resultCode, Intent data) {
+        if (!isValidRequestCode(requestCode)) {
+            return;
+        }
+
+        if (resultCode != Activity.RESULT_OK) {
+            establishInitialState();
+            return;
+        }
+
+        Intent intent = null;
+        // If returning from a Keyguard request, try to show an account confirmation request if
+        // applciable.
+        if (CREDENTIAL_CONFIRM_REQUEST != requestCode
+                && (intent = getAccountConfirmationIntent()) != null) {
+            showAccountCredentialConfirmation(intent);
+        } else {
+            showFinalConfirmation();
+        }
+    }
+
+    @VisibleForTesting
+    void showFinalConfirmation() {
+        final Bundle args = new Bundle();
+        args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
+        args.putBoolean(ERASE_ESIMS_EXTRA, mEsimStorage.isChecked());
+        new SubSettingLauncher(getContext())
+                .setDestination(MainClearConfirm.class.getName())
+                .setArguments(args)
+                .setTitleRes(R.string.main_clear_confirm_title)
+                .setSourceMetricsCategory(getMetricsCategory())
+                .launch();
+    }
+
+    @VisibleForTesting
+    void showAccountCredentialConfirmation(Intent intent) {
+        startActivityForResult(intent, CREDENTIAL_CONFIRM_REQUEST);
+    }
+
+    @VisibleForTesting
+    Intent getAccountConfirmationIntent() {
+        final Context context = getActivity();
+        final String accountType = context.getString(R.string.account_type);
+        final String packageName = context.getString(R.string.account_confirmation_package);
+        final String className = context.getString(R.string.account_confirmation_class);
+        if (TextUtils.isEmpty(accountType)
+                || TextUtils.isEmpty(packageName)
+                || TextUtils.isEmpty(className)) {
+            Log.i(TAG, "Resources not set for account confirmation.");
+            return null;
+        }
+        final AccountManager am = AccountManager.get(context);
+        Account[] accounts = am.getAccountsByType(accountType);
+        if (accounts != null && accounts.length > 0) {
+            final Intent requestAccountConfirmation = new Intent()
+                    .setPackage(packageName)
+                    .setComponent(new ComponentName(packageName, className));
+            // Check to make sure that the intent is supported.
+            final PackageManager pm = context.getPackageManager();
+            final ResolveInfo resolution = pm.resolveActivity(requestAccountConfirmation, 0);
+            if (resolution != null
+                    && resolution.activityInfo != null
+                    && packageName.equals(resolution.activityInfo.packageName)) {
+                // Note that we need to check the packagename to make sure that an Activity resolver
+                // wasn't returned.
+                return requestAccountConfirmation;
+            } else {
+                Log.i(TAG, "Unable to resolve Activity: " + packageName + "/" + className);
+            }
+        } else {
+            Log.d(TAG, "No " + accountType + " accounts installed!");
+        }
+        return null;
+    }
+
+    /**
+     * If the user clicks to begin the reset sequence, we next require a
+     * keyguard confirmation if the user has currently enabled one.  If there
+     * is no keyguard available, we simply go to the final confirmation prompt.
+     *
+     * If the user is in demo mode, route to the demo mode app for confirmation.
+     */
+    @VisibleForTesting
+    protected final Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
+
+        public void onClick(View view) {
+            final Context context = view.getContext();
+            if (Utils.isDemoUser(context)) {
+                final ComponentName componentName = Utils.getDeviceOwnerComponent(context);
+                if (componentName != null) {
+                    final Intent requestFactoryReset = new Intent()
+                            .setPackage(componentName.getPackageName())
+                            .setAction(Intent.ACTION_FACTORY_RESET);
+                    context.startActivity(requestFactoryReset);
+                }
+                return;
+            }
+
+            if (runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+                return;
+            }
+
+            Intent intent = getAccountConfirmationIntent();
+            if (intent != null) {
+                showAccountCredentialConfirmation(intent);
+            } else {
+                showFinalConfirmation();
+            }
+        }
+    };
+
+    /**
+     * In its initial state, the activity presents a button for the user to
+     * click in order to initiate a confirmation sequence.  This method is
+     * called from various other points in the code to reset the activity to
+     * this base state.
+     *
+     * <p>Reinflating views from resources is expensive and prevents us from
+     * caching widget pointers, so we use a single-inflate pattern:  we lazy-
+     * inflate each view, caching all of the widget pointers we'll need at the
+     * time, then simply reuse the inflated views directly whenever we need
+     * to change contents.
+     */
+    @VisibleForTesting
+    void establishInitialState() {
+        setUpActionBarAndTitle();
+        setUpInitiateButton();
+
+        mExternalStorageContainer = mContentView.findViewById(R.id.erase_external_container);
+        mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+        if (mScrollView != null) {
+            mScrollView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+        }
+        mScrollView = mContentView.findViewById(R.id.main_clear_scrollview);
+
+        /*
+         * If the external storage is emulated, it will be erased with a factory
+         * reset at any rate. There is no need to have a separate option until
+         * we have a factory reset that only erases some directories and not
+         * others. Likewise, if it's non-removable storage, it could potentially have been
+         * encrypted, and will also need to be wiped.
+         */
+        boolean isExtStorageEmulated = Environment.isExternalStorageEmulated();
+        if (isExtStorageEmulated
+                || (!Environment.isExternalStorageRemovable() && isExtStorageEncrypted())) {
+            mExternalStorageContainer.setVisibility(View.GONE);
+
+            final View externalOption = mContentView.findViewById(R.id.erase_external_option_text);
+            externalOption.setVisibility(View.GONE);
+
+            final View externalAlsoErased = mContentView.findViewById(R.id.also_erases_external);
+            externalAlsoErased.setVisibility(View.VISIBLE);
+
+            // If it's not emulated, it is on a separate partition but it means we're doing
+            // a force wipe due to encryption.
+            mExternalStorage.setChecked(!isExtStorageEmulated);
+        } else {
+            mExternalStorageContainer.setOnClickListener(new View.OnClickListener() {
+
+                @Override
+                public void onClick(View v) {
+                    mExternalStorage.toggle();
+                }
+            });
+        }
+
+        if (showWipeEuicc()) {
+            if (showWipeEuiccCheckbox()) {
+                mEsimStorageContainer.setVisibility(View.VISIBLE);
+                mEsimStorageContainer.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mEsimStorage.toggle();
+                    }
+                });
+            } else {
+                final View esimAlsoErased = mContentView.findViewById(R.id.also_erases_esim);
+                esimAlsoErased.setVisibility(View.VISIBLE);
+
+                final View noCancelMobilePlan = mContentView.findViewById(
+                        R.id.no_cancel_mobile_plan);
+                noCancelMobilePlan.setVisibility(View.VISIBLE);
+                mEsimStorage.setChecked(true /* checked */);
+            }
+        } else {
+            mEsimStorage.setChecked(false /* checked */);
+        }
+
+        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
+        loadAccountList(um);
+        final StringBuffer contentDescription = new StringBuffer();
+        final View mainClearContainer = mContentView.findViewById(R.id.main_clear_container);
+        getContentDescription(mainClearContainer, contentDescription);
+        mainClearContainer.setContentDescription(contentDescription);
+
+        // Set the status of initiateButton based on scrollview
+        mScrollView.setOnScrollChangeListener(new OnScrollChangeListener() {
+            @Override
+            public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX,
+                    int oldScrollY) {
+                if (v instanceof ScrollView && hasReachedBottom((ScrollView) v)) {
+                    mInitiateButton.setEnabled(true);
+                    mScrollView.setOnScrollChangeListener(null);
+                }
+            }
+        });
+
+        // Set the initial state of the initiateButton
+        mScrollView.getViewTreeObserver().addOnGlobalLayoutListener(this);
+    }
+
+    /**
+     * Whether to show strings indicating that the eUICC will be wiped.
+     *
+     * <p>We show the strings on any device which supports eUICC as long as the eUICC was ever
+     * provisioned (that is, at least one profile was ever downloaded onto it).
+     */
+    @VisibleForTesting
+    boolean showWipeEuicc() {
+        Context context = getContext();
+        if (!isEuiccEnabled(context)) {
+            return false;
+        }
+        ContentResolver cr = context.getContentResolver();
+        return Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0
+                || DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
+    }
+
+    @VisibleForTesting
+    boolean showWipeEuiccCheckbox() {
+        return SystemProperties
+                .getBoolean(KEY_SHOW_ESIM_RESET_CHECKBOX, false /* def */);
+    }
+
+    @VisibleForTesting
+    protected boolean isEuiccEnabled(Context context) {
+        EuiccManager euiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
+        return euiccManager.isEnabled();
+    }
+
+    @VisibleForTesting
+    boolean hasReachedBottom(final ScrollView scrollView) {
+        if (scrollView.getChildCount() < 1) {
+            return true;
+        }
+
+        final View view = scrollView.getChildAt(0);
+        final int diff = view.getBottom() - (scrollView.getHeight() + scrollView.getScrollY());
+
+        return diff <= 0;
+    }
+
+    private void setUpInitiateButton() {
+        if (mInitiateButton != null) {
+            return;
+        }
+
+        final GlifLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
+        final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
+        mixin.setPrimaryButton(
+                new FooterButton.Builder(getActivity())
+                        .setText(R.string.main_clear_button_text)
+                        .setListener(mInitiateListener)
+                        .setButtonType(ButtonType.OTHER)
+                        .setTheme(R.style.SudGlifButton_Primary)
+                        .build()
+        );
+        mInitiateButton = mixin.getPrimaryButton();
+    }
+
+    private void getContentDescription(View v, StringBuffer description) {
+        if (v.getVisibility() != View.VISIBLE) {
+            return;
+        }
+        if (v instanceof ViewGroup) {
+            ViewGroup vGroup = (ViewGroup) v;
+            for (int i = 0; i < vGroup.getChildCount(); i++) {
+                View nextChild = vGroup.getChildAt(i);
+                getContentDescription(nextChild, description);
+            }
+        } else if (v instanceof TextView) {
+            TextView vText = (TextView) v;
+            description.append(vText.getText());
+            description.append(","); // Allow Talkback to pause between sections.
+        }
+    }
+
+    private boolean isExtStorageEncrypted() {
+        String state = VoldProperties.decrypt().orElse("");
+        return !"".equals(state);
+    }
+
+    private void loadAccountList(final UserManager um) {
+        View accountsLabel = mContentView.findViewById(R.id.accounts_label);
+        LinearLayout contents = (LinearLayout) mContentView.findViewById(R.id.accounts);
+        contents.removeAllViews();
+
+        Context context = getActivity();
+        final List<UserInfo> profiles = um.getProfiles(UserHandle.myUserId());
+        final int profilesSize = profiles.size();
+
+        AccountManager mgr = AccountManager.get(context);
+
+        LayoutInflater inflater = (LayoutInflater) context.getSystemService(
+                Context.LAYOUT_INFLATER_SERVICE);
+
+        int accountsCount = 0;
+        for (int profileIndex = 0; profileIndex < profilesSize; profileIndex++) {
+            final UserInfo userInfo = profiles.get(profileIndex);
+            final int profileId = userInfo.id;
+            final UserHandle userHandle = new UserHandle(profileId);
+            Account[] accounts = mgr.getAccountsAsUser(profileId);
+            final int accountLength = accounts.length;
+            if (accountLength == 0) {
+                continue;
+            }
+            accountsCount += accountLength;
+
+            AuthenticatorDescription[] descs = AccountManager.get(context)
+                    .getAuthenticatorTypesAsUser(profileId);
+            final int descLength = descs.length;
+
+            if (profilesSize > 1) {
+                View titleView = Utils.inflateCategoryHeader(inflater, contents);
+                final TextView titleText = (TextView) titleView.findViewById(android.R.id.title);
+                titleText.setText(userInfo.isManagedProfile() ? R.string.category_work
+                        : R.string.category_personal);
+                contents.addView(titleView);
+            }
+
+            for (int i = 0; i < accountLength; i++) {
+                Account account = accounts[i];
+                AuthenticatorDescription desc = null;
+                for (int j = 0; j < descLength; j++) {
+                    if (account.type.equals(descs[j].type)) {
+                        desc = descs[j];
+                        break;
+                    }
+                }
+                if (desc == null) {
+                    Log.w(TAG, "No descriptor for account name=" + account.name
+                            + " type=" + account.type);
+                    continue;
+                }
+                Drawable icon = null;
+                try {
+                    if (desc.iconId != 0) {
+                        Context authContext = context.createPackageContextAsUser(desc.packageName,
+                                0, userHandle);
+                        icon = context.getPackageManager().getUserBadgedIcon(
+                                authContext.getDrawable(desc.iconId), userHandle);
+                    }
+                } catch (PackageManager.NameNotFoundException e) {
+                    Log.w(TAG, "Bad package name for account type " + desc.type);
+                } catch (Resources.NotFoundException e) {
+                    Log.w(TAG, "Invalid icon id for account type " + desc.type, e);
+                }
+                if (icon == null) {
+                    icon = context.getPackageManager().getDefaultActivityIcon();
+                }
+
+                View child = inflater.inflate(R.layout.main_clear_account, contents, false);
+                ((ImageView) child.findViewById(android.R.id.icon)).setImageDrawable(icon);
+                ((TextView) child.findViewById(android.R.id.title)).setText(account.name);
+                contents.addView(child);
+            }
+        }
+
+        if (accountsCount > 0) {
+            accountsLabel.setVisibility(View.VISIBLE);
+            contents.setVisibility(View.VISIBLE);
+        }
+        // Checking for all other users and their profiles if any.
+        View otherUsers = mContentView.findViewById(R.id.other_users_present);
+        final boolean hasOtherUsers = (um.getUserCount() - profilesSize) > 0;
+        otherUsers.setVisibility(hasOtherUsers ? View.VISIBLE : View.GONE);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final Context context = getContext();
+        final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
+                UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
+        final UserManager um = UserManager.get(context);
+        final boolean disallow = !um.isAdminUser() || RestrictedLockUtilsInternal
+                .hasBaseUserRestriction(context, UserManager.DISALLOW_FACTORY_RESET,
+                        UserHandle.myUserId());
+        if (disallow && !Utils.isDemoUser(context)) {
+            return inflater.inflate(R.layout.main_clear_disallowed_screen, null);
+        } else if (admin != null) {
+            new ActionDisabledByAdminDialogHelper(getActivity())
+                    .prepareDialogBuilder(UserManager.DISALLOW_FACTORY_RESET, admin)
+                    .setOnDismissListener(__ -> getActivity().finish())
+                    .show();
+            return new View(getContext());
+        }
+
+        mContentView = inflater.inflate(R.layout.main_clear, null);
+
+        establishInitialState();
+        return mContentView;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.MASTER_CLEAR;
+    }
+}
diff --git a/src/com/android/settings/MainClearConfirm.java b/src/com/android/settings/MainClearConfirm.java
new file mode 100644
index 0000000..c45a907
--- /dev/null
+++ b/src/com/android/settings/MainClearConfirm.java
@@ -0,0 +1,282 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+
+import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import android.app.ActionBar;
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.app.admin.DevicePolicyManager;
+import android.app.admin.FactoryResetProtectionPolicy;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.graphics.Color;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.service.oemlock.OemLockManager;
+import android.service.persistentdata.PersistentDataBlockManager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.TextView;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
+import com.google.android.setupcompat.template.FooterButton.ButtonType;
+import com.google.android.setupcompat.util.WizardManagerHelper;
+import com.google.android.setupdesign.GlifLayout;
+
+/**
+ * Confirm and execute a reset of the device to a clean "just out of the box"
+ * state.  Multiple confirmations are required: first, a general "are you sure
+ * you want to do this?" prompt, followed by a keyguard pattern trace if the user
+ * has defined one, followed by a final strongly-worded "THIS WILL ERASE EVERYTHING
+ * ON THE PHONE" prompt.  If at any time the phone is allowed to go to sleep, is
+ * locked, et cetera, then the confirmation sequence is abandoned.
+ *
+ * This is the confirmation screen.
+ */
+public class MainClearConfirm extends InstrumentedFragment {
+    private static final String TAG = "MainClearConfirm";
+
+    @VisibleForTesting View mContentView;
+    private boolean mEraseSdCard;
+    @VisibleForTesting boolean mEraseEsims;
+
+    /**
+     * The user has gone through the multiple confirmation, so now we go ahead
+     * and invoke the Checkin Service to reset the device to its factory-default
+     * state (rebooting in the process).
+     */
+    private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
+
+        public void onClick(View v) {
+            if (Utils.isMonkeyRunning()) {
+                return;
+            }
+
+            final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)
+                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
+
+            if (shouldWipePersistentDataBlock(pdbManager)) {
+
+                new AsyncTask<Void, Void, Void>() {
+                    int mOldOrientation;
+                    ProgressDialog mProgressDialog;
+
+                    @Override
+                    protected Void doInBackground(Void... params) {
+                        pdbManager.wipe();
+                        return null;
+                    }
+
+                    @Override
+                    protected void onPostExecute(Void aVoid) {
+                        mProgressDialog.hide();
+                        if (getActivity() != null) {
+                            getActivity().setRequestedOrientation(mOldOrientation);
+                            doMainClear();
+                        }
+                    }
+
+                    @Override
+                    protected void onPreExecute() {
+                        mProgressDialog = getProgressDialog();
+                        mProgressDialog.show();
+
+                        // need to prevent orientation changes as we're about to go into
+                        // a long IO request, so we won't be able to access inflate resources on
+                        // flash
+                        mOldOrientation = getActivity().getRequestedOrientation();
+                        getActivity().setRequestedOrientation(
+                                ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+                    }
+                }.execute();
+            } else {
+                doMainClear();
+            }
+        }
+
+        private ProgressDialog getProgressDialog() {
+            final ProgressDialog progressDialog = new ProgressDialog(getActivity());
+            progressDialog.setIndeterminate(true);
+            progressDialog.setCancelable(false);
+            progressDialog.setTitle(
+                    getActivity().getString(R.string.main_clear_progress_title));
+            progressDialog.setMessage(
+                    getActivity().getString(R.string.main_clear_progress_text));
+            return progressDialog;
+        }
+    };
+
+    @VisibleForTesting
+    boolean shouldWipePersistentDataBlock(PersistentDataBlockManager pdbManager) {
+        if (pdbManager == null) {
+            return false;
+        }
+        // The persistent data block will persist if the device is still being provisioned.
+        if (isDeviceStillBeingProvisioned()) {
+            return false;
+        }
+        // If OEM unlock is allowed, the persistent data block will be wiped during FR
+        // process. If disabled, it will be wiped here instead.
+        if (isOemUnlockedAllowed()) {
+            return false;
+        }
+        final DevicePolicyManager dpm = (DevicePolicyManager) getActivity()
+                .getSystemService(Context.DEVICE_POLICY_SERVICE);
+        // Do not erase the factory reset protection data (from Settings) if factory reset
+        // protection policy is not supported on the device.
+        if (!dpm.isFactoryResetProtectionPolicySupported()) {
+            return false;
+        }
+        // Do not erase the factory reset protection data (from Settings) if the
+        // device is an organization-owned managed profile device and a factory
+        // reset protection policy has been set.
+        FactoryResetProtectionPolicy frpPolicy = dpm.getFactoryResetProtectionPolicy(null);
+        if (dpm.isOrganizationOwnedDeviceWithManagedProfile() && frpPolicy != null
+                && frpPolicy.isNotEmpty()) {
+            return false;
+        }
+        return true;
+    }
+
+    @VisibleForTesting
+    boolean isOemUnlockedAllowed() {
+        return ((OemLockManager) getActivity().getSystemService(
+                Context.OEM_LOCK_SERVICE)).isOemUnlockAllowed();
+    }
+
+    @VisibleForTesting
+    boolean isDeviceStillBeingProvisioned() {
+        return !WizardManagerHelper.isDeviceProvisioned(getActivity());
+    }
+
+    private void doMainClear() {
+        Intent intent = new Intent(Intent.ACTION_FACTORY_RESET);
+        intent.setPackage("android");
+        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        intent.putExtra(Intent.EXTRA_REASON, "MainClearConfirm");
+        intent.putExtra(Intent.EXTRA_WIPE_EXTERNAL_STORAGE, mEraseSdCard);
+        intent.putExtra(Intent.EXTRA_WIPE_ESIMS, mEraseEsims);
+        getActivity().sendBroadcast(intent);
+        // Intent handling is asynchronous -- assume it will happen soon.
+    }
+
+    /**
+     * Configure the UI for the final confirmation interaction
+     */
+    private void establishFinalConfirmationState() {
+        final GlifLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
+
+        final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
+        mixin.setPrimaryButton(
+                new FooterButton.Builder(getActivity())
+                        .setText(R.string.main_clear_button_text)
+                        .setListener(mFinalClickListener)
+                        .setButtonType(ButtonType.OTHER)
+                        .setTheme(R.style.SudGlifButton_Primary)
+                        .build()
+        );
+    }
+
+    private void setUpActionBarAndTitle() {
+        final Activity activity = getActivity();
+        if (activity == null) {
+            Log.e(TAG, "No activity attached, skipping setUpActionBarAndTitle");
+            return;
+        }
+        final ActionBar actionBar = activity.getActionBar();
+        if (actionBar == null) {
+            Log.e(TAG, "No actionbar, skipping setUpActionBarAndTitle");
+            return;
+        }
+        actionBar.hide();
+        activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+                getActivity(), UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
+        if (RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
+                UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
+            return inflater.inflate(R.layout.main_clear_disallowed_screen, null);
+        } else if (admin != null) {
+            new ActionDisabledByAdminDialogHelper(getActivity())
+                    .prepareDialogBuilder(UserManager.DISALLOW_FACTORY_RESET, admin)
+                    .setOnDismissListener(__ -> getActivity().finish())
+                    .show();
+            return new View(getActivity());
+        }
+        mContentView = inflater.inflate(R.layout.main_clear_confirm, null);
+        setUpActionBarAndTitle();
+        establishFinalConfirmationState();
+        setAccessibilityTitle();
+        setSubtitle();
+        return mContentView;
+    }
+
+    private void setAccessibilityTitle() {
+        CharSequence currentTitle = getActivity().getTitle();
+        TextView confirmationMessage = mContentView.findViewById(R.id.sud_layout_description);
+        if (confirmationMessage != null) {
+            String accessibleText = new StringBuilder(currentTitle).append(",").append(
+                    confirmationMessage.getText()).toString();
+            getActivity().setTitle(Utils.createAccessibleSequence(currentTitle, accessibleText));
+        }
+    }
+
+    @VisibleForTesting
+    void setSubtitle() {
+        if (mEraseEsims) {
+            ((TextView) mContentView.findViewById(R.id.sud_layout_description))
+                .setText(R.string.main_clear_final_desc_esim);
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Bundle args = getArguments();
+        mEraseSdCard = args != null
+                && args.getBoolean(MainClear.ERASE_EXTERNAL_EXTRA);
+        mEraseEsims = args != null
+                && args.getBoolean(MainClear.ERASE_ESIMS_EXTRA);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.MASTER_CLEAR_CONFIRM;
+    }
+}
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
deleted file mode 100644
index 57dfd1b..0000000
--- a/src/com/android/settings/MasterClear.java
+++ /dev/null
@@ -1,571 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.accounts.AuthenticatorDescription;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.settings.SettingsEnums;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.pm.UserInfo;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.Environment;
-import android.os.SystemProperties;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.sysprop.VoldProperties;
-import android.telephony.euicc.EuiccManager;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnScrollChangeListener;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
-import com.android.settings.password.ChooseLockSettingsHelper;
-import com.android.settings.password.ConfirmLockPattern;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.development.DevelopmentSettingsEnabler;
-
-import com.google.android.setupcompat.template.FooterBarMixin;
-import com.google.android.setupcompat.template.FooterButton;
-import com.google.android.setupcompat.template.FooterButton.ButtonType;
-import com.google.android.setupdesign.GlifLayout;
-
-import java.util.List;
-
-/**
- * Confirm and execute a reset of the device to a clean "just out of the box"
- * state.  Multiple confirmations are required: first, a general "are you sure
- * you want to do this?" prompt, followed by a keyguard pattern trace if the user
- * has defined one, followed by a final strongly-worded "THIS WILL ERASE EVERYTHING
- * ON THE PHONE" prompt.  If at any time the phone is allowed to go to sleep, is
- * locked, et cetera, then the confirmation sequence is abandoned.
- *
- * This is the initial screen.
- */
-public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutListener {
-    private static final String TAG = "MasterClear";
-
-    @VisibleForTesting
-    static final int KEYGUARD_REQUEST = 55;
-    @VisibleForTesting
-    static final int CREDENTIAL_CONFIRM_REQUEST = 56;
-
-    private static final String KEY_SHOW_ESIM_RESET_CHECKBOX
-            = "masterclear.allow_retain_esim_profiles_after_fdr";
-
-    static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
-    static final String ERASE_ESIMS_EXTRA = "erase_esim";
-
-    private View mContentView;
-    @VisibleForTesting
-    FooterButton mInitiateButton;
-    private View mExternalStorageContainer;
-    @VisibleForTesting
-    CheckBox mExternalStorage;
-    @VisibleForTesting
-    View mEsimStorageContainer;
-    @VisibleForTesting
-    CheckBox mEsimStorage;
-    @VisibleForTesting
-    ScrollView mScrollView;
-
-    @Override
-    public void onGlobalLayout() {
-        mInitiateButton.setEnabled(hasReachedBottom(mScrollView));
-    }
-
-    private void setUpActionBarAndTitle() {
-        final Activity activity = getActivity();
-        if (activity == null) {
-            Log.e(TAG, "No activity attached, skipping setUpActionBarAndTitle");
-            return;
-        }
-        final ActionBar actionBar = activity.getActionBar();
-        if (actionBar == null) {
-            Log.e(TAG, "No actionbar, skipping setUpActionBarAndTitle");
-            return;
-        }
-        actionBar.hide();
-        activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
-    }
-
-    /**
-     * Keyguard validation is run using the standard {@link ConfirmLockPattern}
-     * component as a subactivity
-     *
-     * @param request the request code to be returned once confirmation finishes
-     * @return true if confirmation launched
-     */
-    private boolean runKeyguardConfirmation(int request) {
-        Resources res = getActivity().getResources();
-        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
-                request, res.getText(R.string.master_clear_short_title));
-    }
-
-    @VisibleForTesting
-    boolean isValidRequestCode(int requestCode) {
-        return !((requestCode != KEYGUARD_REQUEST) && (requestCode != CREDENTIAL_CONFIRM_REQUEST));
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        onActivityResultInternal(requestCode, resultCode, data);
-    }
-
-    /*
-     * Internal method that allows easy testing without dealing with super references.
-     */
-    @VisibleForTesting
-    void onActivityResultInternal(int requestCode, int resultCode, Intent data) {
-        if (!isValidRequestCode(requestCode)) {
-            return;
-        }
-
-        if (resultCode != Activity.RESULT_OK) {
-            establishInitialState();
-            return;
-        }
-
-        Intent intent = null;
-        // If returning from a Keyguard request, try to show an account confirmation request if
-        // applciable.
-        if (CREDENTIAL_CONFIRM_REQUEST != requestCode
-                && (intent = getAccountConfirmationIntent()) != null) {
-            showAccountCredentialConfirmation(intent);
-        } else {
-            showFinalConfirmation();
-        }
-    }
-
-    @VisibleForTesting
-    void showFinalConfirmation() {
-        final Bundle args = new Bundle();
-        args.putBoolean(ERASE_EXTERNAL_EXTRA, mExternalStorage.isChecked());
-        args.putBoolean(ERASE_ESIMS_EXTRA, mEsimStorage.isChecked());
-        new SubSettingLauncher(getContext())
-                .setDestination(MasterClearConfirm.class.getName())
-                .setArguments(args)
-                .setTitleRes(R.string.master_clear_confirm_title)
-                .setSourceMetricsCategory(getMetricsCategory())
-                .launch();
-    }
-
-    @VisibleForTesting
-    void showAccountCredentialConfirmation(Intent intent) {
-        startActivityForResult(intent, CREDENTIAL_CONFIRM_REQUEST);
-    }
-
-    @VisibleForTesting
-    Intent getAccountConfirmationIntent() {
-        final Context context = getActivity();
-        final String accountType = context.getString(R.string.account_type);
-        final String packageName = context.getString(R.string.account_confirmation_package);
-        final String className = context.getString(R.string.account_confirmation_class);
-        if (TextUtils.isEmpty(accountType)
-                || TextUtils.isEmpty(packageName)
-                || TextUtils.isEmpty(className)) {
-            Log.i(TAG, "Resources not set for account confirmation.");
-            return null;
-        }
-        final AccountManager am = AccountManager.get(context);
-        Account[] accounts = am.getAccountsByType(accountType);
-        if (accounts != null && accounts.length > 0) {
-            final Intent requestAccountConfirmation = new Intent()
-                    .setPackage(packageName)
-                    .setComponent(new ComponentName(packageName, className));
-            // Check to make sure that the intent is supported.
-            final PackageManager pm = context.getPackageManager();
-            final ResolveInfo resolution = pm.resolveActivity(requestAccountConfirmation, 0);
-            if (resolution != null
-                    && resolution.activityInfo != null
-                    && packageName.equals(resolution.activityInfo.packageName)) {
-                // Note that we need to check the packagename to make sure that an Activity resolver
-                // wasn't returned.
-                return requestAccountConfirmation;
-            } else {
-                Log.i(TAG, "Unable to resolve Activity: " + packageName + "/" + className);
-            }
-        } else {
-            Log.d(TAG, "No " + accountType + " accounts installed!");
-        }
-        return null;
-    }
-
-    /**
-     * If the user clicks to begin the reset sequence, we next require a
-     * keyguard confirmation if the user has currently enabled one.  If there
-     * is no keyguard available, we simply go to the final confirmation prompt.
-     *
-     * If the user is in demo mode, route to the demo mode app for confirmation.
-     */
-    @VisibleForTesting
-    protected final Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
-
-        public void onClick(View view) {
-            final Context context = view.getContext();
-            if (Utils.isDemoUser(context)) {
-                final ComponentName componentName = Utils.getDeviceOwnerComponent(context);
-                if (componentName != null) {
-                    final Intent requestFactoryReset = new Intent()
-                            .setPackage(componentName.getPackageName())
-                            .setAction(Intent.ACTION_FACTORY_RESET);
-                    context.startActivity(requestFactoryReset);
-                }
-                return;
-            }
-
-            if (runKeyguardConfirmation(KEYGUARD_REQUEST)) {
-                return;
-            }
-
-            Intent intent = getAccountConfirmationIntent();
-            if (intent != null) {
-                showAccountCredentialConfirmation(intent);
-            } else {
-                showFinalConfirmation();
-            }
-        }
-    };
-
-    /**
-     * In its initial state, the activity presents a button for the user to
-     * click in order to initiate a confirmation sequence.  This method is
-     * called from various other points in the code to reset the activity to
-     * this base state.
-     *
-     * <p>Reinflating views from resources is expensive and prevents us from
-     * caching widget pointers, so we use a single-inflate pattern:  we lazy-
-     * inflate each view, caching all of the widget pointers we'll need at the
-     * time, then simply reuse the inflated views directly whenever we need
-     * to change contents.
-     */
-    @VisibleForTesting
-    void establishInitialState() {
-        setUpActionBarAndTitle();
-        setUpInitiateButton();
-
-        mExternalStorageContainer = mContentView.findViewById(R.id.erase_external_container);
-        mExternalStorage = mContentView.findViewById(R.id.erase_external);
-        mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
-        mEsimStorage = mContentView.findViewById(R.id.erase_esim);
-        if (mScrollView != null) {
-            mScrollView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-        }
-        mScrollView = mContentView.findViewById(R.id.master_clear_scrollview);
-
-        /*
-         * If the external storage is emulated, it will be erased with a factory
-         * reset at any rate. There is no need to have a separate option until
-         * we have a factory reset that only erases some directories and not
-         * others. Likewise, if it's non-removable storage, it could potentially have been
-         * encrypted, and will also need to be wiped.
-         */
-        boolean isExtStorageEmulated = Environment.isExternalStorageEmulated();
-        if (isExtStorageEmulated
-                || (!Environment.isExternalStorageRemovable() && isExtStorageEncrypted())) {
-            mExternalStorageContainer.setVisibility(View.GONE);
-
-            final View externalOption = mContentView.findViewById(R.id.erase_external_option_text);
-            externalOption.setVisibility(View.GONE);
-
-            final View externalAlsoErased = mContentView.findViewById(R.id.also_erases_external);
-            externalAlsoErased.setVisibility(View.VISIBLE);
-
-            // If it's not emulated, it is on a separate partition but it means we're doing
-            // a force wipe due to encryption.
-            mExternalStorage.setChecked(!isExtStorageEmulated);
-        } else {
-            mExternalStorageContainer.setOnClickListener(new View.OnClickListener() {
-
-                @Override
-                public void onClick(View v) {
-                    mExternalStorage.toggle();
-                }
-            });
-        }
-
-        if (showWipeEuicc()) {
-            if (showWipeEuiccCheckbox()) {
-                mEsimStorageContainer.setVisibility(View.VISIBLE);
-                mEsimStorageContainer.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        mEsimStorage.toggle();
-                    }
-                });
-            } else {
-                final View esimAlsoErased = mContentView.findViewById(R.id.also_erases_esim);
-                esimAlsoErased.setVisibility(View.VISIBLE);
-
-                final View noCancelMobilePlan = mContentView.findViewById(
-                        R.id.no_cancel_mobile_plan);
-                noCancelMobilePlan.setVisibility(View.VISIBLE);
-                mEsimStorage.setChecked(true /* checked */);
-            }
-        } else {
-            mEsimStorage.setChecked(false /* checked */);
-        }
-
-        final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-        loadAccountList(um);
-        final StringBuffer contentDescription = new StringBuffer();
-        final View masterClearContainer = mContentView.findViewById(R.id.master_clear_container);
-        getContentDescription(masterClearContainer, contentDescription);
-        masterClearContainer.setContentDescription(contentDescription);
-
-        // Set the status of initiateButton based on scrollview
-        mScrollView.setOnScrollChangeListener(new OnScrollChangeListener() {
-            @Override
-            public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX,
-                    int oldScrollY) {
-                if (v instanceof ScrollView && hasReachedBottom((ScrollView) v)) {
-                    mInitiateButton.setEnabled(true);
-                    mScrollView.setOnScrollChangeListener(null);
-                }
-            }
-        });
-
-        // Set the initial state of the initiateButton
-        mScrollView.getViewTreeObserver().addOnGlobalLayoutListener(this);
-    }
-
-    /**
-     * Whether to show strings indicating that the eUICC will be wiped.
-     *
-     * <p>We show the strings on any device which supports eUICC as long as the eUICC was ever
-     * provisioned (that is, at least one profile was ever downloaded onto it).
-     */
-    @VisibleForTesting
-    boolean showWipeEuicc() {
-        Context context = getContext();
-        if (!isEuiccEnabled(context)) {
-            return false;
-        }
-        ContentResolver cr = context.getContentResolver();
-        return Settings.Global.getInt(cr, Settings.Global.EUICC_PROVISIONED, 0) != 0
-                || DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
-    }
-
-    @VisibleForTesting
-    boolean showWipeEuiccCheckbox() {
-        return SystemProperties
-                .getBoolean(KEY_SHOW_ESIM_RESET_CHECKBOX, false /* def */);
-    }
-
-    @VisibleForTesting
-    protected boolean isEuiccEnabled(Context context) {
-        EuiccManager euiccManager = (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
-        return euiccManager.isEnabled();
-    }
-
-    @VisibleForTesting
-    boolean hasReachedBottom(final ScrollView scrollView) {
-        if (scrollView.getChildCount() < 1) {
-            return true;
-        }
-
-        final View view = scrollView.getChildAt(0);
-        final int diff = view.getBottom() - (scrollView.getHeight() + scrollView.getScrollY());
-
-        return diff <= 0;
-    }
-
-    private void setUpInitiateButton() {
-        if (mInitiateButton != null) {
-            return;
-        }
-
-        final GlifLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
-        final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
-        mixin.setPrimaryButton(
-                new FooterButton.Builder(getActivity())
-                        .setText(R.string.master_clear_button_text)
-                        .setListener(mInitiateListener)
-                        .setButtonType(ButtonType.OTHER)
-                        .setTheme(R.style.SudGlifButton_Primary)
-                        .build()
-        );
-        mInitiateButton = mixin.getPrimaryButton();
-    }
-
-    private void getContentDescription(View v, StringBuffer description) {
-        if (v.getVisibility() != View.VISIBLE) {
-            return;
-        }
-        if (v instanceof ViewGroup) {
-            ViewGroup vGroup = (ViewGroup) v;
-            for (int i = 0; i < vGroup.getChildCount(); i++) {
-                View nextChild = vGroup.getChildAt(i);
-                getContentDescription(nextChild, description);
-            }
-        } else if (v instanceof TextView) {
-            TextView vText = (TextView) v;
-            description.append(vText.getText());
-            description.append(","); // Allow Talkback to pause between sections.
-        }
-    }
-
-    private boolean isExtStorageEncrypted() {
-        String state = VoldProperties.decrypt().orElse("");
-        return !"".equals(state);
-    }
-
-    private void loadAccountList(final UserManager um) {
-        View accountsLabel = mContentView.findViewById(R.id.accounts_label);
-        LinearLayout contents = (LinearLayout) mContentView.findViewById(R.id.accounts);
-        contents.removeAllViews();
-
-        Context context = getActivity();
-        final List<UserInfo> profiles = um.getProfiles(UserHandle.myUserId());
-        final int profilesSize = profiles.size();
-
-        AccountManager mgr = AccountManager.get(context);
-
-        LayoutInflater inflater = (LayoutInflater) context.getSystemService(
-                Context.LAYOUT_INFLATER_SERVICE);
-
-        int accountsCount = 0;
-        for (int profileIndex = 0; profileIndex < profilesSize; profileIndex++) {
-            final UserInfo userInfo = profiles.get(profileIndex);
-            final int profileId = userInfo.id;
-            final UserHandle userHandle = new UserHandle(profileId);
-            Account[] accounts = mgr.getAccountsAsUser(profileId);
-            final int N = accounts.length;
-            if (N == 0) {
-                continue;
-            }
-            accountsCount += N;
-
-            AuthenticatorDescription[] descs = AccountManager.get(context)
-                    .getAuthenticatorTypesAsUser(profileId);
-            final int M = descs.length;
-
-            if (profilesSize > 1) {
-                View titleView = Utils.inflateCategoryHeader(inflater, contents);
-                final TextView titleText = (TextView) titleView.findViewById(android.R.id.title);
-                titleText.setText(userInfo.isManagedProfile() ? R.string.category_work
-                        : R.string.category_personal);
-                contents.addView(titleView);
-            }
-
-            for (int i = 0; i < N; i++) {
-                Account account = accounts[i];
-                AuthenticatorDescription desc = null;
-                for (int j = 0; j < M; j++) {
-                    if (account.type.equals(descs[j].type)) {
-                        desc = descs[j];
-                        break;
-                    }
-                }
-                if (desc == null) {
-                    Log.w(TAG, "No descriptor for account name=" + account.name
-                            + " type=" + account.type);
-                    continue;
-                }
-                Drawable icon = null;
-                try {
-                    if (desc.iconId != 0) {
-                        Context authContext = context.createPackageContextAsUser(desc.packageName,
-                                0, userHandle);
-                        icon = context.getPackageManager().getUserBadgedIcon(
-                                authContext.getDrawable(desc.iconId), userHandle);
-                    }
-                } catch (PackageManager.NameNotFoundException e) {
-                    Log.w(TAG, "Bad package name for account type " + desc.type);
-                } catch (Resources.NotFoundException e) {
-                    Log.w(TAG, "Invalid icon id for account type " + desc.type, e);
-                }
-                if (icon == null) {
-                    icon = context.getPackageManager().getDefaultActivityIcon();
-                }
-
-                View child = inflater.inflate(R.layout.master_clear_account, contents, false);
-                ((ImageView) child.findViewById(android.R.id.icon)).setImageDrawable(icon);
-                ((TextView) child.findViewById(android.R.id.title)).setText(account.name);
-                contents.addView(child);
-            }
-        }
-
-        if (accountsCount > 0) {
-            accountsLabel.setVisibility(View.VISIBLE);
-            contents.setVisibility(View.VISIBLE);
-        }
-        // Checking for all other users and their profiles if any.
-        View otherUsers = mContentView.findViewById(R.id.other_users_present);
-        final boolean hasOtherUsers = (um.getUserCount() - profilesSize) > 0;
-        otherUsers.setVisibility(hasOtherUsers ? View.VISIBLE : View.GONE);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        final Context context = getContext();
-        final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
-                UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
-        final UserManager um = UserManager.get(context);
-        final boolean disallow = !um.isAdminUser() || RestrictedLockUtilsInternal
-                .hasBaseUserRestriction(context, UserManager.DISALLOW_FACTORY_RESET,
-                        UserHandle.myUserId());
-        if (disallow && !Utils.isDemoUser(context)) {
-            return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
-        } else if (admin != null) {
-            new ActionDisabledByAdminDialogHelper(getActivity())
-                    .prepareDialogBuilder(UserManager.DISALLOW_FACTORY_RESET, admin)
-                    .setOnDismissListener(__ -> getActivity().finish())
-                    .show();
-            return new View(getContext());
-        }
-
-        mContentView = inflater.inflate(R.layout.master_clear, null);
-
-        establishInitialState();
-        return mContentView;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.MASTER_CLEAR;
-    }
-}
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
deleted file mode 100644
index 3ace436..0000000
--- a/src/com/android/settings/MasterClearConfirm.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings;
-
-
-import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.ProgressDialog;
-import android.app.admin.DevicePolicyManager;
-import android.app.admin.FactoryResetProtectionPolicy;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.graphics.Color;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.service.oemlock.OemLockManager;
-import android.service.persistentdata.PersistentDataBlockManager;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-
-import com.google.android.setupcompat.template.FooterBarMixin;
-import com.google.android.setupcompat.template.FooterButton;
-import com.google.android.setupcompat.template.FooterButton.ButtonType;
-import com.google.android.setupcompat.util.WizardManagerHelper;
-import com.google.android.setupdesign.GlifLayout;
-
-/**
- * Confirm and execute a reset of the device to a clean "just out of the box"
- * state.  Multiple confirmations are required: first, a general "are you sure
- * you want to do this?" prompt, followed by a keyguard pattern trace if the user
- * has defined one, followed by a final strongly-worded "THIS WILL ERASE EVERYTHING
- * ON THE PHONE" prompt.  If at any time the phone is allowed to go to sleep, is
- * locked, et cetera, then the confirmation sequence is abandoned.
- *
- * This is the confirmation screen.
- */
-public class MasterClearConfirm extends InstrumentedFragment {
-    private final static String TAG = "MasterClearConfirm";
-
-    @VisibleForTesting View mContentView;
-    private boolean mEraseSdCard;
-    @VisibleForTesting boolean mEraseEsims;
-
-    /**
-     * The user has gone through the multiple confirmation, so now we go ahead
-     * and invoke the Checkin Service to reset the device to its factory-default
-     * state (rebooting in the process).
-     */
-    private Button.OnClickListener mFinalClickListener = new Button.OnClickListener() {
-
-        public void onClick(View v) {
-            if (Utils.isMonkeyRunning()) {
-                return;
-            }
-
-            final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)
-                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
-
-            if (shouldWipePersistentDataBlock(pdbManager)) {
-
-                new AsyncTask<Void, Void, Void>() {
-                    int mOldOrientation;
-                    ProgressDialog mProgressDialog;
-
-                    @Override
-                    protected Void doInBackground(Void... params) {
-                        pdbManager.wipe();
-                        return null;
-                    }
-
-                    @Override
-                    protected void onPostExecute(Void aVoid) {
-                        mProgressDialog.hide();
-                        if (getActivity() != null) {
-                            getActivity().setRequestedOrientation(mOldOrientation);
-                            doMasterClear();
-                        }
-                    }
-
-                    @Override
-                    protected void onPreExecute() {
-                        mProgressDialog = getProgressDialog();
-                        mProgressDialog.show();
-
-                        // need to prevent orientation changes as we're about to go into
-                        // a long IO request, so we won't be able to access inflate resources on
-                        // flash
-                        mOldOrientation = getActivity().getRequestedOrientation();
-                        getActivity().setRequestedOrientation(
-                                ActivityInfo.SCREEN_ORIENTATION_LOCKED);
-                    }
-                }.execute();
-            } else {
-                doMasterClear();
-            }
-        }
-
-        private ProgressDialog getProgressDialog() {
-            final ProgressDialog progressDialog = new ProgressDialog(getActivity());
-            progressDialog.setIndeterminate(true);
-            progressDialog.setCancelable(false);
-            progressDialog.setTitle(
-                    getActivity().getString(R.string.master_clear_progress_title));
-            progressDialog.setMessage(
-                    getActivity().getString(R.string.master_clear_progress_text));
-            return progressDialog;
-        }
-    };
-
-    @VisibleForTesting
-    boolean shouldWipePersistentDataBlock(PersistentDataBlockManager pdbManager) {
-        if (pdbManager == null) {
-            return false;
-        }
-        // The persistent data block will persist if the device is still being provisioned.
-        if (isDeviceStillBeingProvisioned()) {
-            return false;
-        }
-        // If OEM unlock is allowed, the persistent data block will be wiped during FR
-        // process. If disabled, it will be wiped here instead.
-        if (isOemUnlockedAllowed()) {
-            return false;
-        }
-        final DevicePolicyManager dpm = (DevicePolicyManager) getActivity()
-                .getSystemService(Context.DEVICE_POLICY_SERVICE);
-        // Do not erase the factory reset protection data (from Settings) if factory reset
-        // protection policy is not supported on the device.
-        if (!dpm.isFactoryResetProtectionPolicySupported()) {
-            return false;
-        }
-        // Do not erase the factory reset protection data (from Settings) if the
-        // device is an organization-owned managed profile device and a factory
-        // reset protection policy has been set.
-        FactoryResetProtectionPolicy frpPolicy = dpm.getFactoryResetProtectionPolicy(null);
-        if (dpm.isOrganizationOwnedDeviceWithManagedProfile() && frpPolicy != null
-                && frpPolicy.isNotEmpty()) {
-            return false;
-        }
-        return true;
-    }
-
-    @VisibleForTesting
-    boolean isOemUnlockedAllowed() {
-        return ((OemLockManager) getActivity().getSystemService(
-                Context.OEM_LOCK_SERVICE)).isOemUnlockAllowed();
-    }
-
-    @VisibleForTesting
-    boolean isDeviceStillBeingProvisioned() {
-        return !WizardManagerHelper.isDeviceProvisioned(getActivity());
-    }
-
-    private void doMasterClear() {
-        Intent intent = new Intent(Intent.ACTION_FACTORY_RESET);
-        intent.setPackage("android");
-        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        intent.putExtra(Intent.EXTRA_REASON, "MasterClearConfirm");
-        intent.putExtra(Intent.EXTRA_WIPE_EXTERNAL_STORAGE, mEraseSdCard);
-        intent.putExtra(Intent.EXTRA_WIPE_ESIMS, mEraseEsims);
-        getActivity().sendBroadcast(intent);
-        // Intent handling is asynchronous -- assume it will happen soon.
-    }
-
-    /**
-     * Configure the UI for the final confirmation interaction
-     */
-    private void establishFinalConfirmationState() {
-        final GlifLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
-
-        final FooterBarMixin mixin = layout.getMixin(FooterBarMixin.class);
-        mixin.setPrimaryButton(
-                new FooterButton.Builder(getActivity())
-                        .setText(R.string.master_clear_button_text)
-                        .setListener(mFinalClickListener)
-                        .setButtonType(ButtonType.OTHER)
-                        .setTheme(R.style.SudGlifButton_Primary)
-                        .build()
-        );
-    }
-
-    private void setUpActionBarAndTitle() {
-        final Activity activity = getActivity();
-        if (activity == null) {
-            Log.e(TAG, "No activity attached, skipping setUpActionBarAndTitle");
-            return;
-        }
-        final ActionBar actionBar = activity.getActionBar();
-        if (actionBar == null) {
-            Log.e(TAG, "No actionbar, skipping setUpActionBarAndTitle");
-            return;
-        }
-        actionBar.hide();
-        activity.getWindow().setStatusBarColor(Color.TRANSPARENT);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
-                getActivity(), UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId());
-        if (RestrictedLockUtilsInternal.hasBaseUserRestriction(getActivity(),
-                UserManager.DISALLOW_FACTORY_RESET, UserHandle.myUserId())) {
-            return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
-        } else if (admin != null) {
-            new ActionDisabledByAdminDialogHelper(getActivity())
-                    .prepareDialogBuilder(UserManager.DISALLOW_FACTORY_RESET, admin)
-                    .setOnDismissListener(__ -> getActivity().finish())
-                    .show();
-            return new View(getActivity());
-        }
-        mContentView = inflater.inflate(R.layout.master_clear_confirm, null);
-        setUpActionBarAndTitle();
-        establishFinalConfirmationState();
-        setAccessibilityTitle();
-        setSubtitle();
-        return mContentView;
-    }
-
-    private void setAccessibilityTitle() {
-        CharSequence currentTitle = getActivity().getTitle();
-        TextView confirmationMessage = mContentView.findViewById(R.id.sud_layout_description);
-        if (confirmationMessage != null) {
-            String accessibleText = new StringBuilder(currentTitle).append(",").append(
-                    confirmationMessage.getText()).toString();
-            getActivity().setTitle(Utils.createAccessibleSequence(currentTitle, accessibleText));
-        }
-    }
-
-    @VisibleForTesting
-    void setSubtitle() {
-        if (mEraseEsims) {
-            ((TextView) mContentView.findViewById(R.id.sud_layout_description))
-                .setText(R.string.master_clear_final_desc_esim);
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Bundle args = getArguments();
-        mEraseSdCard = args != null
-                && args.getBoolean(MasterClear.ERASE_EXTERNAL_EXTRA);
-        mEraseEsims = args != null
-                && args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.MASTER_CLEAR_CONFIRM;
-    }
-}
diff --git a/src/com/android/settings/PointerSpeedPreference.java b/src/com/android/settings/PointerSpeedPreference.java
index d06a374..d48d26c 100644
--- a/src/com/android/settings/PointerSpeedPreference.java
+++ b/src/com/android/settings/PointerSpeedPreference.java
@@ -16,6 +16,8 @@
 
 package com.android.settings;
 
+import static android.view.HapticFeedbackConstants.CLOCK_TICK;
+
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.ContentObserver;
@@ -37,6 +39,7 @@
     private boolean mRestoredOldState;
 
     private boolean mTouchInProgress;
+    private int mLastProgress = -1;
 
     private ContentObserver mSpeedObserver = new ContentObserver(new Handler()) {
         @Override
@@ -76,6 +79,10 @@
         if (!mTouchInProgress) {
             mIm.tryPointerSpeed(progress + InputManager.MIN_POINTER_SPEED);
         }
+        if (progress != mLastProgress) {
+            seekBar.performHapticFeedback(CLOCK_TICK);
+            mLastProgress = progress;
+        }
     }
 
     public void onStartTrackingTouch(SeekBar seekBar) {
diff --git a/src/com/android/settings/ResetNetwork.java b/src/com/android/settings/ResetNetwork.java
index 733d7fe..c4fa90d 100644
--- a/src/com/android/settings/ResetNetwork.java
+++ b/src/com/android/settings/ResetNetwork.java
@@ -32,6 +32,7 @@
 import android.telephony.SubscriptionManager;
 import android.telephony.euicc.EuiccManager;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -53,7 +54,9 @@
 import com.android.settingslib.development.DevelopmentSettingsEnabler;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * Confirm and execute a reset of the device's network settings to a clean "just out of the box"
@@ -92,8 +95,11 @@
      */
     private boolean runKeyguardConfirmation(int request) {
         Resources res = getActivity().getResources();
-        return new ChooseLockSettingsHelper(getActivity(), this).launchConfirmationActivity(
-                request, res.getText(R.string.reset_network_title));
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(getActivity(), this);
+        return builder.setRequestCode(request)
+                .setTitle(res.getText(R.string.reset_network_title))
+                .show();
     }
 
     @Override
@@ -109,7 +115,7 @@
         if (resultCode == Activity.RESULT_OK) {
             showFinalConfirmation();
         } else {
-            establishInitialState();
+            establishInitialState(getActiveSubscriptionInfoList());
         }
     }
 
@@ -122,7 +128,7 @@
             args.putInt(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
                     subscription.getSubscriptionId());
         }
-        args.putBoolean(MasterClear.ERASE_ESIMS_EXTRA,
+        args.putBoolean(MainClear.ERASE_ESIMS_EXTRA,
                 mEsimContainer.getVisibility() == View.VISIBLE && mEsimCheckbox.isChecked());
         new SubSettingLauncher(getContext())
                 .setDestination(ResetNetworkConfirm.class.getName())
@@ -158,14 +164,15 @@
      * inflate each view, caching all of the widget pointers we'll need at the
      * time, then simply reuse the inflated views directly whenever we need
      * to change contents.
+     *
+     * @param subscriptionsList is a list of SubscriptionInfo(s) which allow user to select from
      */
-    private void establishInitialState() {
+    private void establishInitialState(List<SubscriptionInfo> subscriptionsList) {
         mSubscriptionSpinner = (Spinner) mContentView.findViewById(R.id.reset_network_subscription);
         mEsimContainer = mContentView.findViewById(R.id.erase_esim_container);
         mEsimCheckbox = mContentView.findViewById(R.id.erase_esim);
 
-        mSubscriptions = SubscriptionManager.from(getActivity())
-                .getActiveSubscriptionInfoList();
+        mSubscriptions = subscriptionsList;
         if (mSubscriptions != null && mSubscriptions.size() > 0) {
             // Get the default subscription in the order of data, voice, sms, first up.
             int defaultSubscription = SubscriptionManager.getDefaultDataSubscriptionId();
@@ -228,6 +235,31 @@
         }
     }
 
+    private List<SubscriptionInfo> getActiveSubscriptionInfoList() {
+        SubscriptionManager mgr = getActivity().getSystemService(SubscriptionManager.class);
+        if (mgr == null) {
+            Log.w(TAG, "No SubscriptionManager");
+            return Collections.emptyList();
+        }
+        return Optional.ofNullable(mgr.getActiveSubscriptionInfoList())
+                .orElse(Collections.emptyList());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        // update options if subcription has been changed
+        List<SubscriptionInfo> updatedSubscriptions = getActiveSubscriptionInfoList();
+        if ((mSubscriptions != null)
+                && (mSubscriptions.size() == updatedSubscriptions.size())
+                && mSubscriptions.containsAll(updatedSubscriptions)) {
+            return;
+        }
+        Log.d(TAG, "subcription list changed");
+        establishInitialState(updatedSubscriptions);
+    }
+
     private boolean showEuiccSettings(Context context) {
         EuiccManager euiccManager =
                 (EuiccManager) context.getSystemService(Context.EUICC_SERVICE);
@@ -258,7 +290,7 @@
 
         mContentView = inflater.inflate(R.layout.reset_network, null);
 
-        establishInitialState();
+        establishInitialState(getActiveSubscriptionInfoList());
         return mContentView;
     }
 
diff --git a/src/com/android/settings/ResetNetworkConfirm.java b/src/com/android/settings/ResetNetworkConfirm.java
index 6856a5a..43f35a6 100644
--- a/src/com/android/settings/ResetNetworkConfirm.java
+++ b/src/com/android/settings/ResetNetworkConfirm.java
@@ -32,11 +32,14 @@
 import android.net.wifi.p2p.WifiP2pManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Looper;
 import android.os.RecoverySystem;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.telephony.SubscriptionManager;
+import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;
 import android.telephony.TelephonyManager;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -49,7 +52,7 @@
 
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
-import com.android.settings.network.ApnSettings;
+import com.android.settings.network.apn.ApnSettings;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
 /**
@@ -63,6 +66,7 @@
  * This is the confirmation screen.
  */
 public class ResetNetworkConfirm extends InstrumentedFragment {
+    private static final String TAG = "ResetNetworkConfirm";
 
     @VisibleForTesting View mContentView;
     @VisibleForTesting boolean mEraseEsim;
@@ -71,12 +75,15 @@
     private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
     private ProgressDialog mProgressDialog;
     private AlertDialog mAlertDialog;
+    private OnSubscriptionsChangedListener mSubscriptionsChangedListener;
 
     /**
      * Async task used to do all reset task. If error happens during
      * erasing eSIM profiles or timeout, an error msg is shown.
      */
     private class ResetNetworkTask extends AsyncTask<Void, Void, Boolean> {
+        private static final String TAG = "ResetNetworkTask";
+
         private final Context mContext;
         private final String mPackageName;
 
@@ -87,6 +94,7 @@
 
         @Override
         protected Boolean doInBackground(Void... params) {
+            boolean isResetSucceed = true;
             ConnectivityManager connectivityManager = (ConnectivityManager)
                     mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
             if (connectivityManager != null) {
@@ -101,6 +109,10 @@
 
             p2pFactoryReset(mContext);
 
+            if (mEraseEsim) {
+                isResetSucceed = RecoverySystem.wipeEuiccData(mContext, mPackageName);
+            }
+
             TelephonyManager telephonyManager = (TelephonyManager)
                     mContext.getSystemService(TelephonyManager.class)
                             .createForSubscriptionId(mSubId);
@@ -125,11 +137,9 @@
             }
 
             restoreDefaultApn(mContext);
-            if (mEraseEsim) {
-                return RecoverySystem.wipeEuiccData(mContext, mPackageName);
-            } else {
-                return true;
-            }
+            Log.d(TAG, "network factoryReset complete. succeeded: "
+                    + String.valueOf(isResetSucceed));
+            return isResetSucceed;
         }
 
         @Override
@@ -161,6 +171,18 @@
                 return;
             }
 
+            // abandon execution if subscription no longer active
+            if (mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+                SubscriptionManager mgr = getSubscriptionManager();
+                // always remove listener
+                stopMonitorSubscriptionChange(mgr);
+                if (!isSubscriptionRemainActive(mgr, mSubId)) {
+                    Log.w(TAG, "subId " + mSubId + " disappear when confirm");
+                    mActivity.finish();
+                    return;
+                }
+            }
+
             mProgressDialog = getProgressDialog(mActivity);
             mProgressDialog.show();
 
@@ -188,7 +210,7 @@
         progressDialog.setIndeterminate(true);
         progressDialog.setCancelable(false);
         progressDialog.setMessage(
-                context.getString(R.string.master_clear_progress_text));
+                context.getString(R.string.main_clear_progress_text));
         return progressDialog;
     }
 
@@ -251,10 +273,60 @@
         if (args != null) {
             mSubId = args.getInt(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
                     SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-            mEraseEsim = args.getBoolean(MasterClear.ERASE_ESIMS_EXTRA);
+            mEraseEsim = args.getBoolean(MainClear.ERASE_ESIMS_EXTRA);
         }
 
         mActivity = getActivity();
+
+        if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            return;
+        }
+        // close confirmation dialog when reset specific subscription
+        // but removed priori to the confirmation button been pressed
+        startMonitorSubscriptionChange(getSubscriptionManager());
+    }
+
+    private SubscriptionManager getSubscriptionManager() {
+        SubscriptionManager mgr = mActivity.getSystemService(SubscriptionManager.class);
+        if (mgr == null) {
+            Log.w(TAG, "No SubscriptionManager");
+        }
+        return mgr;
+    }
+
+    private void startMonitorSubscriptionChange(SubscriptionManager mgr) {
+        if (mgr == null) {
+            return;
+        }
+        // update monitor listener
+        mSubscriptionsChangedListener = new OnSubscriptionsChangedListener(
+                Looper.getMainLooper()) {
+            @Override
+            public void onSubscriptionsChanged() {
+                SubscriptionManager mgr = getSubscriptionManager();
+                if (isSubscriptionRemainActive(mgr, mSubId)) {
+                    return;
+                }
+                // close UI if subscription no longer active
+                Log.w(TAG, "subId " + mSubId + " no longer active.");
+                stopMonitorSubscriptionChange(mgr);
+                mActivity.finish();
+            }
+        };
+        mgr.addOnSubscriptionsChangedListener(
+                mActivity.getMainExecutor(), mSubscriptionsChangedListener);
+    }
+
+    private boolean isSubscriptionRemainActive(SubscriptionManager mgr, int subscriptionId) {
+        return (mgr == null) ? false : (mgr.getActiveSubscriptionInfo(subscriptionId) != null);
+    }
+
+    private void stopMonitorSubscriptionChange(SubscriptionManager mgr) {
+        if ((mgr == null) || (mSubscriptionsChangedListener == null)) {
+            return;
+        }
+        mgr.removeOnSubscriptionsChangedListener(mSubscriptionsChangedListener);
+        mSubscriptionsChangedListener = null;
     }
 
     @Override
@@ -269,6 +341,7 @@
         if (mAlertDialog != null) {
             mAlertDialog.dismiss();
         }
+        stopMonitorSubscriptionChange(getSubscriptionManager());
         super.onDestroy();
     }
 
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 2f23c84..8389d84 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -23,6 +23,7 @@
 
 import com.android.settings.core.FeatureFlags;
 import com.android.settings.enterprise.EnterprisePrivacySettings;
+import com.android.settings.overlay.FeatureFactory;
 
 /**
  * Top-level Settings activity
@@ -82,6 +83,7 @@
     public static class PublicVolumeSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiSettings2Activity extends SettingsActivity { /* empty */ }
+    public static class NetworkProviderSettingsActivity extends SettingsActivity { /* empty */ }
     public static class WifiP2pSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AvailableVirtualKeyboardActivity extends SettingsActivity { /* empty */ }
     public static class KeyboardLayoutPickerActivity extends SettingsActivity { /* empty */ }
@@ -110,6 +112,10 @@
     public static class AccessibilityInversionSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccessibilityContrastSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AccessibilityDaltonizerSettingsActivity extends SettingsActivity { /* empty */ }
+    /**
+     * Activity for Reduce Bright Colors.
+     */
+    public static class ReduceBrightColorsSettingsActivity extends SettingsActivity { /* empty */ }
     public static class SecurityDashboardActivity extends SettingsActivity { /* empty */ }
     public static class UsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AppUsageAccessSettingsActivity extends SettingsActivity { /* empty */ }
@@ -138,6 +144,7 @@
     public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationAccessDetailsActivity extends SettingsActivity { /* empty */ }
     public static class VrListenersSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class PremiumSmsAccessActivity extends SettingsActivity { /* empty */ }
     public static class PictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AppPictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }
     public static class ZenAccessSettingsActivity extends SettingsActivity { /* empty */ }
@@ -208,7 +215,11 @@
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            if (!EnterprisePrivacySettings.isPageEnabled(this)) {
+            if (FeatureFactory.getFactory(this)
+                    .getEnterprisePrivacyFeatureProvider(this)
+                    .showParentalControls()) {
+                finish();
+            } else if (!EnterprisePrivacySettings.isPageEnabled(this)) {
                 finish();
             }
         }
diff --git a/src/com/android/settings/SetupWizardUtils.java b/src/com/android/settings/SetupWizardUtils.java
index bce6f3f..e0292ef 100644
--- a/src/com/android/settings/SetupWizardUtils.java
+++ b/src/com/android/settings/SetupWizardUtils.java
@@ -19,6 +19,7 @@
 import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_FIRST_RUN;
 import static com.google.android.setupcompat.util.WizardManagerHelper.EXTRA_IS_SETUP_FLOW;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.sysprop.SetupWizardProperties;
@@ -39,25 +40,39 @@
         return theme;
     }
 
-    public static int getTheme(Intent intent) {
+    public static int getTheme(Context context, Intent intent) {
         String theme = getThemeString(intent);
         // TODO(yukl): Move to ThemeResolver and add any additional required attributes in
         // onApplyThemeResource using Theme overlays
         if (theme != null) {
             if (WizardManagerHelper.isAnySetupWizard(intent)) {
-                switch (theme) {
-                    case ThemeHelper.THEME_GLIF_V3_LIGHT:
-                        return R.style.GlifV3Theme_Light;
-                    case ThemeHelper.THEME_GLIF_V3:
-                        return R.style.GlifV3Theme;
-                    case ThemeHelper.THEME_GLIF_V2_LIGHT:
-                        return R.style.GlifV2Theme_Light;
-                    case ThemeHelper.THEME_GLIF_V2:
-                        return R.style.GlifV2Theme;
-                    case ThemeHelper.THEME_GLIF_LIGHT:
-                        return R.style.GlifTheme_Light;
-                    case ThemeHelper.THEME_GLIF:
-                        return R.style.GlifTheme;
+                if (ThemeHelper.isSetupWizardDayNightEnabled(context)) {
+                    switch (theme) {
+                        case ThemeHelper.THEME_GLIF_V3_LIGHT:
+                        case ThemeHelper.THEME_GLIF_V3:
+                            return R.style.GlifV3Theme_DayNight;
+                        case ThemeHelper.THEME_GLIF_V2_LIGHT:
+                        case ThemeHelper.THEME_GLIF_V2:
+                            return R.style.GlifV2Theme_DayNight;
+                        case ThemeHelper.THEME_GLIF_LIGHT:
+                        case ThemeHelper.THEME_GLIF:
+                            return R.style.GlifTheme_DayNight;
+                    }
+                } else {
+                    switch (theme) {
+                        case ThemeHelper.THEME_GLIF_V3_LIGHT:
+                            return R.style.GlifV3Theme_Light;
+                        case ThemeHelper.THEME_GLIF_V3:
+                            return R.style.GlifV3Theme;
+                        case ThemeHelper.THEME_GLIF_V2_LIGHT:
+                            return R.style.GlifV2Theme_Light;
+                        case ThemeHelper.THEME_GLIF_V2:
+                            return R.style.GlifV2Theme;
+                        case ThemeHelper.THEME_GLIF_LIGHT:
+                            return R.style.GlifTheme_Light;
+                        case ThemeHelper.THEME_GLIF:
+                            return R.style.GlifTheme;
+                    }
                 }
             } else {
                 switch (theme) {
@@ -76,17 +91,30 @@
         return R.style.GlifTheme;
     }
 
-    public static int getTransparentTheme(Intent intent) {
-        final int suwTheme = getTheme(intent);
-        int transparentTheme = R.style.GlifV2Theme_Light_Transparent;
-        if (suwTheme == R.style.GlifV3Theme) {
-            transparentTheme = R.style.GlifV3Theme_Transparent;
+    public static int getTransparentTheme(Context context, Intent intent) {
+        int transparentTheme;
+        final int suwTheme = getTheme(context, intent);
+        if (ThemeHelper.isSetupWizardDayNightEnabled(context)) {
+            transparentTheme = R.style.GlifV2Theme_DayNight_Transparent;
+        } else {
+            transparentTheme = R.style.GlifV2Theme_Light_Transparent;
+        }
+        if (suwTheme == R.style.GlifV3Theme_DayNight) {
+            transparentTheme = R.style.GlifV3Theme_DayNight_Transparent;
         } else if (suwTheme == R.style.GlifV3Theme_Light) {
             transparentTheme = R.style.GlifV3Theme_Light_Transparent;
-        } else if (suwTheme == R.style.GlifV2Theme) {
-            transparentTheme = R.style.GlifV2Theme_Transparent;
+        } else if (suwTheme == R.style.GlifV2Theme_DayNight) {
+            transparentTheme = R.style.GlifV2Theme_DayNight_Transparent;
+        } else if (suwTheme == R.style.GlifV2Theme_Light) {
+            transparentTheme = R.style.GlifV2Theme_Light_Transparent;
+        } else if (suwTheme == R.style.GlifTheme_DayNight) {
+            transparentTheme = R.style.SetupWizardTheme_DayNight_Transparent;
         } else if (suwTheme == R.style.GlifTheme_Light) {
             transparentTheme = R.style.SetupWizardTheme_Light_Transparent;
+        } else if (suwTheme == R.style.GlifV3Theme) {
+            transparentTheme = R.style.GlifV3Theme_Transparent;
+        } else if (suwTheme == R.style.GlifV2Theme) {
+            transparentTheme = R.style.GlifV2Theme_Transparent;
         } else if (suwTheme == R.style.GlifTheme) {
             transparentTheme = R.style.SetupWizardTheme_Transparent;
         }
diff --git a/src/com/android/settings/SidecarFragment.java b/src/com/android/settings/SidecarFragment.java
new file mode 100644
index 0000000..1a69c03
--- /dev/null
+++ b/src/com/android/settings/SidecarFragment.java
@@ -0,0 +1,364 @@
+/*
+ * Copyright (C) 2020 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;
+
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.util.Log;
+
+import androidx.annotation.CallSuper;
+import androidx.annotation.IntDef;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Locale;
+import java.util.Set;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+/**
+ * A headless fragment encapsulating a long-running action such as a network RPC surviving rotation.
+ *
+ * <p>Subclasses should implement their own state machine, updating the state on each state change
+ * via {@link #setState(int, int)}. They can define their own states, however, it is suggested that
+ * the pre-defined {@link @State} constants are used and customizations are implemented via
+ * substates. Custom states must be outside the range of pre-defined states.
+ *
+ * <p>It is safe to update the state at any time, but state updates must originate from the main
+ * thread.
+ *
+ * <p>A listener can be attached that receives state updates while it's registered. Note that state
+ * change events can occur at any point in time and hence a registered listener should unregister if
+ * it cannot act upon the state change (typically a non-resumed fragment).
+ *
+ * <p>Listeners can receive state changes for the same state/substate combination, so listeners
+ * should make sure to be idempotent during state change events.
+ *
+ * <p>If a SidecarFragment is only relevant during the lifetime of another fragment (for example, a
+ * sidecar performing a details request for a DetailsFragment), that fragment needs to become the
+ * managing fragment of the sidecar.
+ *
+ * <h2>Managing fragment responsibilities</h2>
+ *
+ * <ol>
+ *   <li>Instantiates the sidecar fragment when necessary, preferably in {@link #onStart}.
+ *   <li>Removes the sidecar fragment when it's no longer used or when itself is removed. Removal of
+ *       the managing fragment can be detected by checking {@link #isRemoving} in {@link #onStop}.
+ *       <br>
+ *   <li>Registers as a listener in {@link #onResume()}, unregisters in {@link #onPause()}.
+ *   <li>Starts the long-running operation by calling into the sidecar.
+ *   <li>Receives state updates via {@link Listener#onStateChange(SidecarFragment)} and updates the
+ *       UI accordingly.
+ * </ol>
+ *
+ * <h2>Managing fragment example</h2>
+ *
+ * <pre>
+ *     public class MainFragment implements SidecarFragment.Listener {
+ *         private static final String TAG_SOME_SIDECAR = ...;
+ *         private static final String KEY_SOME_SIDECAR_STATE = ...;
+ *
+ *         private SomeSidecarFragment mSidecar;
+ *
+ *         &#064;Override
+ *         public void onStart() {
+ *             super.onStart();
+ *             Bundle args = ...; // optional args
+ *             mSidecar = SidecarFragment.get(getFragmentManager(), TAG_SOME_SIDECAR,
+ *                     SidecarFragment.class, args);
+ *         }
+ *
+ *         &#064;Override
+ *         public void onResume() {
+ *             mSomeSidecar.addListener(this);
+ *         }
+ *
+ *         &#064;Override
+ *         public void onPause() {
+ *             mSomeSidecar.removeListener(this):
+ *         }
+ *     }
+ * </pre>
+ */
+public class SidecarFragment extends Fragment {
+
+    private static final String TAG = "SidecarFragment";
+
+    /**
+     * Get an instance of this sidecar.
+     *
+     * <p>Will return the existing instance if one is already present. Note that the args will not
+     * be used in this situation, so args must be constant for any particular fragment manager and
+     * tag.
+     */
+    @SuppressWarnings("unchecked")
+    protected static <T extends SidecarFragment> T get(
+            FragmentManager fm, String tag, Class<T> clazz, Bundle args) {
+        T fragment = (T) fm.findFragmentByTag(tag);
+        if (fragment == null) {
+            try {
+                fragment = clazz.newInstance();
+            } catch (java.lang.InstantiationException e) {
+                throw new InstantiationException("Unable to create fragment", e);
+            } catch (IllegalAccessException e) {
+                throw new IllegalArgumentException("Unable to create fragment", e);
+            }
+            if (args != null) {
+                fragment.setArguments(args);
+            }
+            fm.beginTransaction().add(fragment, tag).commit();
+            // No real harm in doing this here - get() should generally only be called from onCreate
+            // which is on the main thread - and it allows us to start running the sidecar on this
+            // instance immediately rather than having to wait until the transaction commits.
+            fm.executePendingTransactions();
+        }
+
+        return fragment;
+    }
+
+    /** State definitions. @see {@link #getState} */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({State.INIT, State.RUNNING, State.SUCCESS, State.ERROR})
+    public @interface State {
+        /** Initial idling state. */
+        int INIT = 0;
+
+        /** The long-running operation is in progress. */
+        int RUNNING = 1;
+
+        /** The long-running operation has succeeded. */
+        int SUCCESS = 2;
+
+        /** The long-running operation has failed. */
+        int ERROR = 3;
+    }
+
+    /** Substate definitions. @see {@link #getSubstate} */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({
+        Substate.UNUSED,
+        Substate.RUNNING_BIND_SERVICE,
+        Substate.RUNNING_GET_ACTIVATION_CODE,
+    })
+    public @interface Substate {
+        // Unknown/unused substate.
+        int UNUSED = 0;
+        int RUNNING_BIND_SERVICE = 1;
+        int RUNNING_GET_ACTIVATION_CODE = 2;
+
+        // Future tags: 3+
+    }
+
+    /** **************************************** */
+    private Set<Listener> mListeners = new CopyOnWriteArraySet<>();
+
+    // Used to track whether onCreate has been called yet.
+    private boolean mCreated;
+
+    @State private int mState;
+    @Substate private int mSubstate;
+
+    /** A listener receiving state change events. */
+    public interface Listener {
+
+        /**
+         * Called upon any state or substate change.
+         *
+         * <p>The new state can be queried through {@link #getState} and {@link #getSubstate}.
+         *
+         * <p>Called from the main thread.
+         *
+         * @param fragment the SidecarFragment that changed its state
+         */
+        void onStateChange(SidecarFragment fragment);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setRetainInstance(true);
+        mCreated = true;
+        setState(State.INIT, Substate.UNUSED);
+    }
+
+    @Override
+    public void onDestroy() {
+        mCreated = false;
+        super.onDestroy();
+    }
+
+    /**
+     * Registers a listener that will receive subsequent state changes.
+     *
+     * <p>A {@link Listener#onStateChange(SidecarFragment)} event is fired as part of this call
+     * unless {@link #onCreate} has not yet been called (which means that it's unsafe to access this
+     * fragment as it has not been setup or restored completely). In that case, the future call to
+     * onCreate will trigger onStateChange on registered listener.
+     *
+     * <p>Must be called from the main thread.
+     *
+     * @param listener a listener, or null for unregistering the current listener
+     */
+    public void addListener(Listener listener) {
+        ThreadUtils.ensureMainThread();
+        mListeners.add(listener);
+        if (mCreated) {
+            notifyListener(listener);
+        }
+    }
+
+    /**
+     * Removes a previously registered listener.
+     *
+     * @return {@code true} if the listener was removed, {@code false} if there was no such listener
+     *     registered.
+     */
+    public boolean removeListener(Listener listener) {
+        ThreadUtils.ensureMainThread();
+        return mListeners.remove(listener);
+    }
+
+    /** Returns the current state. */
+    @State
+    public int getState() {
+        return mState;
+    }
+
+    /** Returns the current substate. */
+    @Substate
+    public int getSubstate() {
+        return mSubstate;
+    }
+
+    /**
+     * Resets the sidecar to its initial state.
+     *
+     * <p>Implementers can override this method to perform additional reset tasks, but must call the
+     * super method.
+     */
+    @CallSuper
+    public void reset() {
+        setState(State.INIT, Substate.UNUSED);
+    }
+
+    /**
+     * Updates the state and substate and notifies the registered listener.
+     *
+     * <p>Must be called from the main thread.
+     *
+     * @param state the state to transition to
+     * @param substate the substate to transition to
+     */
+    protected void setState(@State int state, @Substate int substate) {
+        ThreadUtils.ensureMainThread();
+
+        mState = state;
+        mSubstate = substate;
+        notifyAllListeners();
+        printState();
+    }
+
+    private void notifyAllListeners() {
+        for (Listener listener : mListeners) {
+            notifyListener(listener);
+        }
+    }
+
+    private void notifyListener(Listener listener) {
+        listener.onStateChange(this);
+    }
+
+    /** Prints the state of the sidecar. */
+    public void printState() {
+        StringBuilder sb =
+                new StringBuilder("SidecarFragment.setState(): Sidecar Class: ")
+                        .append(getClass().getCanonicalName());
+        sb.append(", State: ");
+        switch (mState) {
+            case SidecarFragment.State.INIT:
+                sb.append("State.INIT");
+                break;
+            case SidecarFragment.State.RUNNING:
+                sb.append("State.RUNNING");
+                break;
+            case SidecarFragment.State.SUCCESS:
+                sb.append("State.SUCCESS");
+                break;
+            case SidecarFragment.State.ERROR:
+                sb.append("State.ERROR");
+                break;
+            default:
+                sb.append(mState);
+                break;
+        }
+        switch (mSubstate) {
+            case SidecarFragment.Substate.UNUSED:
+                sb.append(", Substate.UNUSED");
+                break;
+            default:
+                sb.append(", ").append(mSubstate);
+                break;
+        }
+
+        Log.v(TAG, sb.toString());
+    }
+
+    @Override
+    public String toString() {
+        return String.format(
+                Locale.US,
+                "SidecarFragment[mState=%d, mSubstate=%d]: %s",
+                mState,
+                mSubstate,
+                super.toString());
+    }
+
+    /** The State of the sidecar status. */
+    public static final class States {
+        public static final States SUCCESS = States.create(State.SUCCESS, Substate.UNUSED);
+        public static final States ERROR = States.create(State.ERROR, Substate.UNUSED);
+
+        @State public final int state;
+        @Substate public final int substate;
+
+        /** Creates a new sidecar state. */
+        public static States create(@State int state, @Substate int substate) {
+            return new States(state, substate);
+        }
+
+        public States(@State int state, @Substate int substate) {
+            this.state = state;
+            this.substate = substate;
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof States)) {
+                return false;
+            }
+            States other = (States) o;
+            return this.state == other.state && this.substate == other.substate;
+        }
+
+        @Override
+        public int hashCode() {
+            return state * 31 + substate;
+        }
+    }
+}
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 0325842..c33f7db 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -78,7 +78,7 @@
     private static final String KEY_ENABLE_ETHERNET_TETHERING = "enable_ethernet_tethering";
     private static final String KEY_DATA_SAVER_FOOTER = "disabled_on_data_saver";
     @VisibleForTesting
-    static final String KEY_TETHER_PREFS_FOOTER = "tether_prefs_footer";
+    static final String KEY_TETHER_PREFS_TOP_INTRO = "tether_prefs_top_intro";
 
     private static final String TAG = "TetheringSettings";
 
@@ -154,10 +154,8 @@
                     BluetoothProfile.PAN);
         }
 
-        mUsbTether = (SwitchPreference) findPreference(KEY_USB_TETHER_SETTINGS);
-        mBluetoothTether = (SwitchPreference) findPreference(KEY_ENABLE_BLUETOOTH_TETHERING);
-        mEthernetTether = (SwitchPreference) findPreference(KEY_ENABLE_ETHERNET_TETHERING);
-        setFooterPreferenceTitle();
+        setupTetherPreference();
+        setTopIntroPreferenceTitle();
 
         mDataSaverBackend.addListener(this);
 
@@ -208,6 +206,13 @@
         super.onDestroy();
     }
 
+    @VisibleForTesting
+    void setupTetherPreference() {
+        mUsbTether = (SwitchPreference) findPreference(KEY_USB_TETHER_SETTINGS);
+        mBluetoothTether = (SwitchPreference) findPreference(KEY_ENABLE_BLUETOOTH_TETHERING);
+        mEthernetTether = (SwitchPreference) findPreference(KEY_ENABLE_ETHERNET_TETHERING);
+    }
+
     @Override
     public void onDataSaverChanged(boolean isDataSaving) {
         mDataSaverEnabled = isDataSaving;
@@ -218,22 +223,22 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted)  {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted)  {
     }
 
     @VisibleForTesting
-    void setFooterPreferenceTitle() {
-        final Preference footerPreference = findPreference(KEY_TETHER_PREFS_FOOTER);
+    void setTopIntroPreferenceTitle() {
+        final Preference topIntroPreference = findPreference(KEY_TETHER_PREFS_TOP_INTRO);
         final WifiManager wifiManager =
                 (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
         if (wifiManager.isStaApConcurrencySupported()) {
-            footerPreference.setTitle(R.string.tethering_footer_info_sta_ap_concurrency);
+            topIntroPreference.setTitle(R.string.tethering_footer_info_sta_ap_concurrency);
         } else {
-            footerPreference.setTitle(R.string.tethering_footer_info);
+            topIntroPreference.setTitle(R.string.tethering_footer_info);
         }
     }
 
@@ -281,6 +286,8 @@
                     }
                 }
                 updateState();
+            } else if (action.equals(BluetoothPan.ACTION_TETHERING_STATE_CHANGED)) {
+                updateState();
             }
         }
     }
@@ -297,32 +304,13 @@
             return;
         }
 
-        final Activity activity = getActivity();
 
         mStartTetheringCallback = new OnStartTetheringCallback(this);
         mTetheringEventCallback = new TetheringEventCallback();
         mTm.registerTetheringEventCallback(new HandlerExecutor(mHandler), mTetheringEventCallback);
 
         mMassStorageActive = Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());
-        mTetherChangeReceiver = new TetherChangeReceiver();
-        IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
-        Intent intent = activity.registerReceiver(mTetherChangeReceiver, filter);
-
-        filter = new IntentFilter();
-        filter.addAction(UsbManager.ACTION_USB_STATE);
-        activity.registerReceiver(mTetherChangeReceiver, filter);
-
-        filter = new IntentFilter();
-        filter.addAction(Intent.ACTION_MEDIA_SHARED);
-        filter.addAction(Intent.ACTION_MEDIA_UNSHARED);
-        filter.addDataScheme("file");
-        activity.registerReceiver(mTetherChangeReceiver, filter);
-
-        filter = new IntentFilter();
-        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
-        activity.registerReceiver(mTetherChangeReceiver, filter);
-
-        if (intent != null) mTetherChangeReceiver.onReceive(activity, intent);
+        registerReceiver();
 
         mEthernetListener = new EthernetListener();
         if (mEm != null)
@@ -348,10 +336,38 @@
         mEthernetListener = null;
     }
 
+    @VisibleForTesting
+    void registerReceiver() {
+        final Activity activity = getActivity();
+
+        mTetherChangeReceiver = new TetherChangeReceiver();
+        IntentFilter filter = new IntentFilter(ConnectivityManager.ACTION_TETHER_STATE_CHANGED);
+        final Intent intent = activity.registerReceiver(mTetherChangeReceiver, filter);
+
+        filter = new IntentFilter();
+        filter.addAction(UsbManager.ACTION_USB_STATE);
+        activity.registerReceiver(mTetherChangeReceiver, filter);
+
+        filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_MEDIA_SHARED);
+        filter.addAction(Intent.ACTION_MEDIA_UNSHARED);
+        filter.addDataScheme("file");
+        activity.registerReceiver(mTetherChangeReceiver, filter);
+
+        filter = new IntentFilter();
+        filter.addAction(BluetoothAdapter.ACTION_STATE_CHANGED);
+        filter.addAction(BluetoothPan.ACTION_TETHERING_STATE_CHANGED);
+        activity.registerReceiver(mTetherChangeReceiver, filter);
+
+        if (intent != null) mTetherChangeReceiver.onReceive(activity, intent);
+    }
+
     private void updateState() {
-        String[] available = mCm.getTetherableIfaces();
-        String[] tethered = mCm.getTetheredIfaces();
-        String[] errored = mCm.getTetheringErroredIfaces();
+        final ConnectivityManager cm =
+                (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+        final String[] available = cm.getTetherableIfaces();
+        final String[] tethered = cm.getTetheredIfaces();
+        final String[] errored = cm.getTetheringErroredIfaces();
         updateState(available, tethered, errored);
     }
 
@@ -362,7 +378,8 @@
         updateEthernetState(available, tethered);
     }
 
-    private void updateUsbState(String[] available, String[] tethered,
+    @VisibleForTesting
+    void updateUsbState(String[] available, String[] tethered,
             String[] errored) {
         boolean usbAvailable = mUsbConnected && !mMassStorageActive;
         int usbError = ConnectivityManager.TETHER_ERROR_NO_ERROR;
@@ -400,20 +417,33 @@
         }
     }
 
-    private void updateBluetoothState() {
+    @VisibleForTesting
+    int getBluetoothState() {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
         if (adapter == null) {
+            return BluetoothAdapter.ERROR;
+        }
+        return adapter.getState();
+    }
+
+    @VisibleForTesting
+    boolean isBluetoothTetheringOn() {
+        final BluetoothPan bluetoothPan = mBluetoothPan.get();
+        return bluetoothPan != null && bluetoothPan.isTetheringOn();
+    }
+
+    private void updateBluetoothState() {
+        final int btState = getBluetoothState();
+        if (btState == BluetoothAdapter.ERROR) {
             return;
         }
-        int btState = adapter.getState();
+
         if (btState == BluetoothAdapter.STATE_TURNING_OFF) {
             mBluetoothTether.setEnabled(false);
         } else if (btState == BluetoothAdapter.STATE_TURNING_ON) {
             mBluetoothTether.setEnabled(false);
         } else {
-            BluetoothPan bluetoothPan = mBluetoothPan.get();
-            if (btState == BluetoothAdapter.STATE_ON && bluetoothPan != null
-                    && bluetoothPan.isTetheringOn()) {
+            if (btState == BluetoothAdapter.STATE_ON && isBluetoothTetheringOn()) {
                 mBluetoothTether.setChecked(true);
                 mBluetoothTether.setEnabled(!mDataSaverEnabled);
             } else {
@@ -423,7 +453,8 @@
         }
     }
 
-    private void updateEthernetState(String[] available, String[] tethered) {
+    @VisibleForTesting
+    void updateEthernetState(String[] available, String[] tethered) {
 
         boolean isAvailable = false;
         boolean isTethered = false;
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 64919d9..eca3869 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -83,6 +83,7 @@
 import android.text.format.DateUtils;
 import android.text.style.TtsSpan;
 import android.util.ArraySet;
+import android.util.FeatureFlagUtils;
 import android.util.IconDrawableFactory;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -142,6 +143,11 @@
     public static final String PROPERTY_PERMISSIONS_HUB_ENABLED = "permissions_hub_enabled";
 
     /**
+     * Whether to show location indicators.
+     */
+    public static final String PROPERTY_LOCATION_INDICATORS_ENABLED = "location_indicators_enabled";
+
+    /**
      * Finds a matching activity for a preference's intent. If a matching
      * activity is not found, it will remove the preference.
      *
@@ -267,6 +273,15 @@
         return batteryChangedIntent.getBooleanExtra(BatteryManager.EXTRA_PRESENT, true);
     }
 
+    /**
+     * Return true if battery is present.
+     */
+    public static boolean isBatteryPresent(Context context) {
+        Intent batteryBroadcast = context.registerReceiver(null /* receiver */,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        return isBatteryPresent(batteryBroadcast);
+    }
+
     public static String getBatteryPercentage(Intent batteryChangedIntent) {
         return formatPercentage(getBatteryLevel(batteryChangedIntent));
     }
@@ -525,7 +540,7 @@
      * @return UserInfo of the user or null for non-existent user.
      */
     public static UserInfo getExistingUser(UserManager userManager, UserHandle checkUser) {
-        final List<UserInfo> users = userManager.getUsers(true /* excludeDying */);
+        final List<UserInfo> users = userManager.getAliveUsers();
         final int checkUserId = checkUser.getIdentifier();
         for (UserInfo user : users) {
             if (user.id == checkUserId) {
@@ -634,7 +649,7 @@
      *
      * @param isInternal indicating if the caller is "internal" to the system,
      *            meaning we're willing to trust extras like
-     *            {@link ChooseLockSettingsHelper#EXTRA_ALLOW_ANY_USER}.
+     *            {@link ChooseLockSettingsHelper#EXTRA_KEY_ALLOW_ANY_USER}.
      * @throws SecurityException if the given userId does not belong to the
      *             current user group.
      */
@@ -643,7 +658,7 @@
             return getCredentialOwnerUserId(context);
         }
         final boolean allowAnyUser = isInternal
-                && bundle.getBoolean(ChooseLockSettingsHelper.EXTRA_ALLOW_ANY_USER, false);
+                && bundle.getBoolean(ChooseLockSettingsHelper.EXTRA_KEY_ALLOW_ANY_USER, false);
         final int userId = bundle.getInt(Intent.EXTRA_USER_ID, UserHandle.myUserId());
         if (userId == LockPatternUtils.USER_FRP) {
             return allowAnyUser ? userId : enforceSystemUser(context, userId);
@@ -1137,4 +1152,8 @@
         drawable.draw(canvas);
         return roundedBitmap;
     }
+
+    public static boolean isProviderModelEnabled(Context context) {
+        return FeatureFlagUtils.isEnabled(context, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL);
+    }
 }
diff --git a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
index e91f2a2..58cdb72 100644
--- a/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragment.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.accessibility;
 
+import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;
+
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
@@ -30,6 +32,9 @@
 import android.util.Log;
 import android.view.accessibility.AccessibilityManager;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
@@ -37,6 +42,7 @@
 import com.android.settingslib.accessibility.AccessibilityUtils;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 public class AccessibilityDetailsSettingsFragment extends InstrumentedFragment {
@@ -61,44 +67,77 @@
             return;
         }
 
-        // In case the A11yServiceInfo doesn't exist, go to ally services list.
         final ComponentName componentName = ComponentName.unflattenFromString(extraComponentName);
+        if (openSystemAccessibilitySettingsAndFinish(componentName)) {
+            return;
+        }
+
+        if (openAccessibilityDetailsSettingsAndFinish(componentName)) {
+            return;
+        }
+        // Fall back to open accessibility services list.
+        openAccessibilitySettingsAndFinish();
+    }
+
+    private boolean openSystemAccessibilitySettingsAndFinish(
+            @Nullable ComponentName componentName) {
+        final LaunchFragmentArguments launchArguments =
+                getSystemAccessibilitySettingsLaunchArguments(componentName);
+        if (launchArguments == null) {
+            return false;
+        }
+        openSubSettings(launchArguments.mDestination, launchArguments.mArguments);
+        finish();
+        return true;
+    }
+
+    @Nullable
+    private LaunchFragmentArguments getSystemAccessibilitySettingsLaunchArguments(
+            @Nullable ComponentName componentName) {
+        if (MAGNIFICATION_COMPONENT_NAME.equals(componentName)) {
+            final String destination = ToggleScreenMagnificationPreferenceFragment.class.getName();
+            final Bundle arguments = new Bundle();
+            MagnificationGesturesPreferenceController.populateMagnificationGesturesPreferenceExtras(
+                    arguments, getContext());
+            return new LaunchFragmentArguments(destination, arguments);
+        }
+        return null;
+    }
+
+
+    private void openAccessibilitySettingsAndFinish() {
+        openSubSettings(AccessibilitySettings.class.getName(), /* arguments= */ null);
+        finish();
+    }
+
+    private boolean openAccessibilityDetailsSettingsAndFinish(
+            @Nullable ComponentName componentName) {
+        // In case the A11yServiceInfo doesn't exist, go to ally services list.
         final AccessibilityServiceInfo info = getAccessibilityServiceInfo(componentName);
         if (info == null) {
-            Log.w(TAG, "Open accessibility services list due to invalid component name.");
-            openAccessibilitySettingsAndFinish();
-            return;
+            Log.w(TAG, "openAccessibilityDetailsSettingsAndFinish : invalid component name.");
+            return false;
         }
 
         // In case this accessibility service isn't permitted, go to a11y services list.
         if (!isServiceAllowed(componentName.getPackageName())) {
             Log.w(TAG,
-                    "Open accessibility services list due to target accessibility service is "
+                    "openAccessibilityDetailsSettingsAndFinish: target accessibility service is"
                             + "prohibited by Device Admin.");
-            openAccessibilitySettingsAndFinish();
-            return;
+            return false;
         }
-
-        openAccessibilityDetailsSettingsAndFinish(buildArguments(info));
-    }
-
-    @VisibleForTesting
-    void openAccessibilitySettingsAndFinish() {
-        new SubSettingLauncher(getActivity())
-                .setDestination(AccessibilitySettings.class.getName())
-                .setSourceMetricsCategory(getMetricsCategory())
-                .launch();
+        openSubSettings(ToggleAccessibilityServicePreferenceFragment.class.getName(),
+                buildArguments(info));
         finish();
+        return true;
     }
 
-    @VisibleForTesting
-    void openAccessibilityDetailsSettingsAndFinish(Bundle arguments) {
+    private void openSubSettings(@NonNull String destination, @Nullable Bundle arguments) {
         new SubSettingLauncher(getActivity())
-                .setDestination(ToggleAccessibilityServicePreferenceFragment.class.getName())
+                .setDestination(destination)
                 .setSourceMetricsCategory(getMetricsCategory())
                 .setArguments(arguments)
                 .launch();
-        finish();
     }
 
     @VisibleForTesting
@@ -175,4 +214,13 @@
         }
         activity.finish();
     }
+
+    private static class LaunchFragmentArguments {
+        final String mDestination;
+        final Bundle mArguments;
+        LaunchFragmentArguments(@NonNull String destination, @Nullable Bundle arguments) {
+            mDestination = Objects.requireNonNull(destination);
+            mArguments = arguments;
+        }
+    }
 }
diff --git a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
index 3930581..f349a12 100644
--- a/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
+++ b/src/com/android/settings/accessibility/AccessibilityEditDialogUtils.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accessibility;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.TypedArray;
@@ -26,6 +27,7 @@
 import android.text.style.ImageSpan;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -56,12 +58,14 @@
          DialogType.EDIT_SHORTCUT_GENERIC,
          DialogType.EDIT_SHORTCUT_MAGNIFICATION,
          DialogType.EDIT_MAGNIFICATION_MODE,
+         DialogType.EDIT_MAGNIFICATION_SWITCH_SHORTCUT,
     })
 
     private @interface DialogType {
         int EDIT_SHORTCUT_GENERIC = 0;
         int EDIT_SHORTCUT_MAGNIFICATION = 1;
         int EDIT_MAGNIFICATION_MODE = 2;
+        int EDIT_MAGNIFICATION_SWITCH_SHORTCUT = 3;
     }
 
     /**
@@ -115,6 +119,26 @@
         return alertDialog;
     }
 
+    /**
+     * Method to show the magnification edit shortcut dialog in Magnification.
+     *
+     * @param context A valid context
+     * @param dialogTitle The title of magnify edit shortcut dialog
+     * @param listener The listener to determine the action of magnify edit shortcut dialog
+     * @return A magnification edit shortcut dialog in Magnification
+     */
+    public static Dialog showMagnificationSwitchShortcutDialog(Context context,
+            CharSequence dialogTitle, View.OnClickListener listener) {
+        final AlertDialog alertDialog = new AlertDialog.Builder(context)
+                .setView(createSwitchShortcutDialogContentView(context))
+                .setTitle(dialogTitle)
+                .create();
+        alertDialog.show();
+        setEditShortcutButtonsListener(alertDialog, listener);
+        setScrollIndicators(alertDialog);
+        return alertDialog;
+    }
+
     private static AlertDialog createDialog(Context context, int dialogType,
             CharSequence dialogTitle, DialogInterface.OnClickListener listener) {
 
@@ -140,6 +164,22 @@
                 View.SCROLL_INDICATOR_TOP | View.SCROLL_INDICATOR_BOTTOM);
     }
 
+    private static void setEditShortcutButtonsListener(AlertDialog dialog,
+            View.OnClickListener listener) {
+        final View contentView = dialog.findViewById(R.id.container_layout);
+        final Button positiveButton = contentView.findViewById(
+                R.id.switch_shortcut_positive_button);
+        final Button negativeButton = contentView.findViewById(
+                R.id.switch_shortcut_negative_button);
+
+        positiveButton.setOnClickListener(listener);
+        negativeButton.setOnClickListener(v -> dialog.dismiss());
+    }
+
+    private static View createSwitchShortcutDialogContentView(Context context) {
+        return createEditDialogContentView(context, DialogType.EDIT_MAGNIFICATION_SWITCH_SHORTCUT);
+    }
+
     /**
      * Get a content View for the edit shortcut dialog.
      *
@@ -174,6 +214,10 @@
                 initMagnifyFullScreen(context, contentView);
                 initMagnifyWindowScreen(context, contentView);
                 break;
+            case DialogType.EDIT_MAGNIFICATION_SWITCH_SHORTCUT:
+                contentView = inflater.inflate(
+                        R.layout.accessibility_edit_magnification_shortcut, null);
+                break;
             default:
                 throw new IllegalArgumentException();
         }
@@ -185,7 +229,6 @@
         final View dialogView = view.findViewById(R.id.magnify_full_screen);
         final CharSequence title = context.getText(
                 R.string.accessibility_magnification_area_settings_full_screen);
-        // TODO(b/146019459): Use vector drawable instead of temporal png file to avoid distorted.
         setupShortcutWidget(dialogView, title, R.drawable.accessibility_magnification_full_screen);
     }
 
@@ -193,7 +236,6 @@
         final View dialogView = view.findViewById(R.id.magnify_window_screen);
         final CharSequence title = context.getText(
                 R.string.accessibility_magnification_area_settings_window_screen);
-        // TODO(b/146019459): Use vector drawable instead of temporal png file to avoid distorted.
         setupShortcutWidget(dialogView, title,
                 R.drawable.accessibility_magnification_window_screen);
     }
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index f918046..4709c66 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -29,7 +29,6 @@
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
 import android.graphics.drawable.Drawable;
-import android.hardware.display.ColorDisplayManager;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -43,7 +42,6 @@
 import androidx.core.content.ContextCompat;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
-import androidx.preference.SwitchPreference;
 
 import com.android.internal.accessibility.AccessibilityShortcutController;
 import com.android.internal.content.PackageMonitor;
@@ -51,7 +49,6 @@
 import com.android.settings.Utils;
 import com.android.settings.accessibility.AccessibilityUtil.AccessibilityServiceFragmentType;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.display.DarkUIPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -82,21 +79,14 @@
     private static final String CATEGORY_EXPERIMENTAL = "experimental_category";
     private static final String CATEGORY_DOWNLOADED_SERVICES = "user_installed_services_category";
 
-    private static final String[] CATEGORIES = new String[] {
+    private static final String[] CATEGORIES = new String[]{
             CATEGORY_SCREEN_READER, CATEGORY_AUDIO_AND_CAPTIONS, CATEGORY_DISPLAY,
             CATEGORY_INTERACTION_CONTROL, CATEGORY_EXPERIMENTAL, CATEGORY_DOWNLOADED_SERVICES
     };
 
     // Preferences
-    private static final String TOGGLE_INVERSION_PREFERENCE =
-            "toggle_inversion_preference";
-    private static final String TOGGLE_LARGE_POINTER_ICON =
-            "toggle_large_pointer_icon";
-    private static final String TOGGLE_DISABLE_ANIMATIONS = "toggle_disable_animations";
     private static final String DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN =
             "magnification_preference_screen";
-    private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN =
-            "daltonizer_preference";
 
     // Extras passed to sub-fragments.
     static final String EXTRA_PREFERENCE_KEY = "preference_key";
@@ -165,11 +155,7 @@
     private final Map<ComponentName, PreferenceCategory> mPreBundledServiceComponentToCategoryMap =
             new ArrayMap<>();
 
-    private SwitchPreference mToggleLargePointerIconPreference;
-    private SwitchPreference mToggleDisableAnimationsPreference;
     private Preference mDisplayMagnificationPreferenceScreen;
-    private Preference mDisplayDaltonizerPreferenceScreen;
-    private Preference mToggleInversionPreference;
 
     /**
      * Check if the color transforms are color accelerated. Some transforms are experimental only
@@ -216,12 +202,12 @@
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
         initializeAllPreferences();
+        updateAllPreferences();
     }
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        use(DarkUIPreferenceController.class).setParentFragment(this);
         use(AccessibilityHearingAidPreferenceController.class)
                 .setFragmentManager(getFragmentManager());
     }
@@ -229,7 +215,6 @@
     @Override
     public void onStart() {
         super.onStart();
-        updateAllPreferences();
 
         mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
         mSettingsContentObserver.register(getContentResolver());
@@ -255,8 +240,8 @@
     /**
      * Returns the summary for the current state of this accessibilityService.
      *
-     * @param context A valid context
-     * @param info The accessibilityService's info
+     * @param context        A valid context
+     * @param info           The accessibilityService's info
      * @param serviceEnabled Whether the accessibility service is enabled.
      * @return The service summary
      */
@@ -295,8 +280,8 @@
     /**
      * Returns the description for the current state of this accessibilityService.
      *
-     * @param context A valid context
-     * @param info The accessibilityService's info
+     * @param context        A valid context
+     * @param info           The accessibilityService's info
      * @param serviceEnabled Whether the accessibility service is enabled.
      * @return The service description
      */
@@ -321,20 +306,9 @@
             mCategoryToPrefCategoryMap.put(CATEGORIES[i], prefCategory);
         }
 
-        // Display inversion.
-        mToggleInversionPreference = findPreference(TOGGLE_INVERSION_PREFERENCE);
-
-        // Large pointer icon.
-        mToggleLargePointerIconPreference = findPreference(TOGGLE_LARGE_POINTER_ICON);
-
-        mToggleDisableAnimationsPreference = findPreference(TOGGLE_DISABLE_ANIMATIONS);
-
         // Display magnification.
         mDisplayMagnificationPreferenceScreen = findPreference(
                 DISPLAY_MAGNIFICATION_PREFERENCE_SCREEN);
-
-        // Display color adjustments.
-        mDisplayDaltonizerPreferenceScreen = findPreference(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
     }
 
     private void updateAllPreferences() {
@@ -384,13 +358,13 @@
 
         // Update the order of all the category according to the order defined in xml file.
         updateCategoryOrderFromArray(CATEGORY_SCREEN_READER,
-            R.array.config_order_screen_reader_services);
+                R.array.config_order_screen_reader_services);
         updateCategoryOrderFromArray(CATEGORY_AUDIO_AND_CAPTIONS,
-            R.array.config_order_audio_and_caption_services);
+                R.array.config_order_audio_and_caption_services);
         updateCategoryOrderFromArray(CATEGORY_INTERACTION_CONTROL,
-            R.array.config_order_interaction_control_services);
+                R.array.config_order_interaction_control_services);
         updateCategoryOrderFromArray(CATEGORY_DISPLAY,
-            R.array.config_order_display_services);
+                R.array.config_order_display_services);
 
         // Need to check each time when updateServicePreferences() called.
         if (downloadedServicesCategory.getPreferenceCount() == 0) {
@@ -460,7 +434,7 @@
      * key with the string array of preference order which is defined in the xml.
      *
      * @param categoryKey The key of the category need to update the order
-     * @param key The key of the string array which defines the order of category
+     * @param key         The key of the string array which defines the order of category
      */
     private void updateCategoryOrderFromArray(String categoryKey, int key) {
         String[] services = getResources().getStringArray(key);
@@ -478,33 +452,11 @@
         }
     }
 
+    /**
+     * Updates preferences related to system configurations.
+     */
     protected void updateSystemPreferences() {
-        // Move color inversion and color correction preferences to Display category if device
-        // supports HWC hardware-accelerated color transform.
-        if (ColorDisplayManager.isColorTransformAccelerated(getContext())) {
-            PreferenceCategory experimentalCategory =
-                    mCategoryToPrefCategoryMap.get(CATEGORY_EXPERIMENTAL);
-            PreferenceCategory displayCategory =
-                    mCategoryToPrefCategoryMap.get(CATEGORY_DISPLAY);
-            experimentalCategory.removePreference(mToggleInversionPreference);
-            experimentalCategory.removePreference(mDisplayDaltonizerPreferenceScreen);
-            mDisplayMagnificationPreferenceScreen.setSummary(
-                    ToggleScreenMagnificationPreferenceFragment.getServiceSummary(getContext()));
-            mDisplayDaltonizerPreferenceScreen.setOrder(
-                    mDisplayMagnificationPreferenceScreen.getOrder() + 1);
-            mDisplayDaltonizerPreferenceScreen.setSummary(AccessibilityUtil.getSummary(
-                    getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED));
-            mToggleInversionPreference.setOrder(
-                    mDisplayDaltonizerPreferenceScreen.getOrder() + 1);
-            mToggleLargePointerIconPreference.setOrder(
-                    mToggleInversionPreference.getOrder() + 1);
-            mToggleDisableAnimationsPreference.setOrder(
-                    mToggleLargePointerIconPreference.getOrder() + 1);
-            mToggleInversionPreference.setSummary(AccessibilityUtil.getSummary(
-                    getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED));
-            displayCategory.addPreference(mToggleInversionPreference);
-            displayCategory.addPreference(mDisplayDaltonizerPreferenceScreen);
-        }
+        // Do nothing.
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
diff --git a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
index 1a6c8e8..2b9ca48 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
@@ -17,6 +17,7 @@
 package com.android.settings.accessibility;
 
 import android.content.ComponentName;
+import android.content.res.Resources;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.Menu;
@@ -122,4 +123,11 @@
             finish();
         }
     }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        theme.applyStyle(R.style.SetupWizardPartnerResource, true);
+        super.onApplyThemeResource(theme, new_resid, first);
+    }
 }
diff --git a/src/com/android/settings/accessibility/BalanceSeekBar.java b/src/com/android/settings/accessibility/BalanceSeekBar.java
index ecc226b..8a88d6c 100644
--- a/src/com/android/settings/accessibility/BalanceSeekBar.java
+++ b/src/com/android/settings/accessibility/BalanceSeekBar.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.accessibility;
 
+import static android.view.HapticFeedbackConstants.CLOCK_TICK;
 import static com.android.settings.Utils.isNightMode;
 
 import android.content.Context;
@@ -44,6 +45,7 @@
     private final Context mContext;
     private final Object mListenerLock = new Object();
     private OnSeekBarChangeListener mOnSeekBarChangeListener;
+    private int mLastProgress = -1;
     private final OnSeekBarChangeListener mProxySeekBarListener = new OnSeekBarChangeListener() {
         @Override
         public void onStopTrackingTouch(SeekBar seekBar) {
@@ -73,6 +75,12 @@
                     progress = mCenter;
                     seekBar.setProgress(progress); // direct update (fromUser becomes false)
                 }
+                if (progress != mLastProgress) {
+                    if (progress == mCenter || progress == getMin() || progress == getMax()) {
+                        seekBar.performHapticFeedback(CLOCK_TICK);
+                    }
+                    mLastProgress = progress;
+                }
                 final float balance = (progress - mCenter) * 0.01f;
                 Settings.System.putFloatForUser(mContext.getContentResolver(),
                         Settings.System.MASTER_BALANCE, balance, UserHandle.USER_CURRENT);
@@ -115,6 +123,7 @@
                 res.getDimensionPixelSize(R.dimen.balance_seekbar_center_marker_width),
                 res.getDimensionPixelSize(R.dimen.balance_seekbar_center_marker_height));
         mCenterMarkerPaint = new Paint();
+        // TODO use a more suitable colour?
         mCenterMarkerPaint.setColor(isNightMode(context) ? Color.WHITE : Color.BLACK);
         mCenterMarkerPaint.setStyle(Paint.Style.FILL);
         // Remove the progress colour
@@ -151,10 +160,5 @@
         canvas.restore();
         super.onDraw(canvas);
     }
-
-    @VisibleForTesting
-    OnSeekBarChangeListener getProxySeekBarListener() {
-        return mProxySeekBarListener;
-    }
 }
 
diff --git a/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java b/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
new file mode 100644
index 0000000..97f96a4
--- /dev/null
+++ b/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceController.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.graphics.fonts.FontStyle;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/** PreferenceController for displaying all text in bold. */
+public class FontWeightAdjustmentPreferenceController extends TogglePreferenceController {
+    static final int BOLD_TEXT_ADJUSTMENT =
+            FontStyle.FONT_WEIGHT_BOLD - FontStyle.FONT_WEIGHT_NORMAL;
+
+    public FontWeightAdjustmentPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.FONT_WEIGHT_ADJUSTMENT, 0) == BOLD_TEXT_ADJUSTMENT;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.FONT_WEIGHT_ADJUSTMENT, (isChecked ? BOLD_TEXT_ADJUSTMENT : 0));
+    }
+}
diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index 23c0c57..b2c3c4d 100644
--- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -98,12 +98,6 @@
     }
 
     @Override
-    public void onSettingsClicked(ShortcutPreference preference) {
-        super.onSettingsClicked(preference);
-        showDialog(DialogEnums.EDIT_SHORTCUT);
-    }
-
-    @Override
     int getUserShortcutTypes() {
         return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
                 mComponentName);
@@ -120,7 +114,7 @@
     protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
         final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo();
         final String switchBarText = (info == null) ? EMPTY_STRING : getString(
-                R.string.accessibility_service_master_open_title,
+                R.string.accessibility_service_primary_open_title,
                 info.getActivityInfo().loadLabel(getPackageManager()));
 
         switchPreference.setTitle(switchBarText);
diff --git a/src/com/android/settings/accessibility/MagnificationCapabilities.java b/src/com/android/settings/accessibility/MagnificationCapabilities.java
new file mode 100644
index 0000000..079b06c
--- /dev/null
+++ b/src/com/android/settings/accessibility/MagnificationCapabilities.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.IntDef;
+
+import com.android.settings.R;
+
+import com.google.common.primitives.Ints;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/** Class to provide magnification capabilities. */
+public final class MagnificationCapabilities {
+
+    private static final String KEY_CAPABILITY =
+            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY;
+
+    /**
+     * Annotation for supported magnification mode.
+     *
+     * @see Settings.Secure#ACCESSIBILITY_MAGNIFICATION_CAPABILITY
+     */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({
+            MagnificationMode.FULLSCREEN,
+            MagnificationMode.WINDOW,
+            MagnificationMode.ALL,
+    })
+
+    public @interface MagnificationMode {
+        int FULLSCREEN = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN;
+        int WINDOW = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW;
+        int ALL = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL;
+    }
+
+    /**
+     * Gets the summary for the given {@code capabilities}.
+     *
+     * @param context A {@link Context}.
+     * @param capabilities Magnification capabilities {@link MagnificationMode}
+     * @return The summary text represents the given capabilities
+     */
+    public static String getSummary(Context context, @MagnificationMode int capabilities) {
+        final String[] summaries = context.getResources().getStringArray(
+                R.array.magnification_mode_summaries);
+        final int[] values = context.getResources().getIntArray(
+                R.array.magnification_mode_values);
+
+        final int idx = Ints.indexOf(values, capabilities);
+        return summaries[idx == /* no index exist */ -1 ? 0 : idx];
+    }
+
+    /**
+     * Sets the magnification capabilities {@link MagnificationMode} to settings key. This
+     * overwrites any existing capabilities.
+     *
+     * @param context      A {@link Context}.
+     * @param capabilities Magnification capabilities {@link MagnificationMode}
+     */
+    public static void setCapabilities(Context context, @MagnificationMode int capabilities) {
+        final ContentResolver contentResolver = context.getContentResolver();
+
+        Settings.Secure.putIntForUser(contentResolver, KEY_CAPABILITY, capabilities,
+                contentResolver.getUserId());
+    }
+
+    /**
+     * Returns the magnification capabilities {@link MagnificationMode} from setting's key. May be
+     * default value {@link MagnificationMode#FULLSCREEN} if not set.
+     *
+     * @param context A {@link Context}.
+     * @return The magnification capabilities {@link MagnificationMode}
+     */
+    @MagnificationMode
+    public static int getCapabilities(Context context) {
+        final ContentResolver contentResolver = context.getContentResolver();
+
+        return Settings.Secure.getIntForUser(contentResolver, KEY_CAPABILITY,
+                MagnificationMode.FULLSCREEN, contentResolver.getUserId());
+    }
+
+    private MagnificationCapabilities() {}
+}
diff --git a/src/com/android/settings/accessibility/MagnificationEnablePreferenceController.java b/src/com/android/settings/accessibility/MagnificationEnablePreferenceController.java
deleted file mode 100644
index 57a2962..0000000
--- a/src/com/android/settings/accessibility/MagnificationEnablePreferenceController.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import com.android.settings.core.TogglePreferenceController;
-
-/** Controller that shows the magnification enable mode summary. */
-public class MagnificationEnablePreferenceController extends TogglePreferenceController {
-
-    private static final String KEY_ENABLE = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE;
-
-    public MagnificationEnablePreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public boolean isChecked() {
-        final int enableMode = Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                KEY_ENABLE,
-                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
-                UserHandle.USER_CURRENT);
-        return enableMode == Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN;
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        final int value = isChecked ? Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN
-                : Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW;
-        return Settings.Secure.putIntForUser(mContext.getContentResolver(), KEY_ENABLE, value,
-                UserHandle.USER_CURRENT);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
-    }
-}
diff --git a/src/com/android/settings/accessibility/MagnificationModePreferenceController.java b/src/com/android/settings/accessibility/MagnificationModePreferenceController.java
index b45ad88..5dc93b1 100644
--- a/src/com/android/settings/accessibility/MagnificationModePreferenceController.java
+++ b/src/com/android/settings/accessibility/MagnificationModePreferenceController.java
@@ -35,7 +35,7 @@
 
     @Override
     public CharSequence getSummary() {
-        return MagnificationSettingsFragment.getMagnificationCapabilitiesSummary(
-                mContext);
+        final int capabilities = MagnificationCapabilities.getCapabilities(mContext);
+        return MagnificationCapabilities.getSummary(mContext, capabilities);
     }
 }
diff --git a/src/com/android/settings/accessibility/MagnificationSettingsFragment.java b/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
index 04e8036..6ea6366 100644
--- a/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
+++ b/src/com/android/settings/accessibility/MagnificationSettingsFragment.java
@@ -16,17 +16,20 @@
 
 package com.android.settings.accessibility;
 
+import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_CONTROLLER_NAME;
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.CheckBox;
 
-import androidx.annotation.IntDef;
-import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 
 import com.android.settings.R;
@@ -34,10 +37,7 @@
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 
-import com.google.common.primitives.Ints;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
+import java.util.StringJoiner;
 
 /** Settings page for magnification. */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
@@ -45,36 +45,16 @@
 
     private static final String TAG = "MagnificationSettingsFragment";
     private static final String PREF_KEY_MODE = "magnification_mode";
-    // TODO(b/146019459): Use magnification_capability.
-    private static final String KEY_CAPABILITY = Settings.System.MASTER_MONO;
     private static final int DIALOG_MAGNIFICATION_CAPABILITY = 1;
+    private static final int DIALOG_MAGNIFICATION_SWITCH_SHORTCUT = 2;
     private static final String EXTRA_CAPABILITY = "capability";
+    private static final int NONE = 0;
+    private static final char COMPONENT_NAME_SEPARATOR = ':';
     private Preference mModePreference;
-    private int mCapabilities = MagnifyMode.NONE;
+    private int mCapabilities = NONE;
     private CheckBox mMagnifyFullScreenCheckBox;
     private CheckBox mMagnifyWindowCheckBox;
-
-    static String getMagnificationCapabilitiesSummary(Context context) {
-        final String[] magnificationModeSummaries = context.getResources().getStringArray(
-                R.array.magnification_mode_summaries);
-        final int[] magnificationModeValues = context.getResources().getIntArray(
-                R.array.magnification_mode_values);
-        final int capabilities = MagnificationSettingsFragment.getMagnificationCapabilities(
-                context);
-
-        final int idx = Ints.indexOf(magnificationModeValues, capabilities);
-        return magnificationModeSummaries[idx == -1 ? 0 : idx];
-    }
-
-    private static int getMagnificationCapabilities(Context context) {
-        return getSecureIntValue(context, KEY_CAPABILITY, MagnifyMode.FULLSCREEN);
-    }
-
-    private static int getSecureIntValue(Context context, String key, int defaultValue) {
-        return Settings.Secure.getIntForUser(
-                context.getContentResolver(),
-                key, defaultValue, context.getContentResolver().getUserId());
-    }
+    private Dialog mDialog;
 
     @Override
     public int getMetricsCategory() {
@@ -91,10 +71,10 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         if (savedInstanceState != null) {
-            mCapabilities = savedInstanceState.getInt(EXTRA_CAPABILITY, MagnifyMode.NONE);
+            mCapabilities = savedInstanceState.getInt(EXTRA_CAPABILITY, NONE);
         }
-        if (mCapabilities == MagnifyMode.NONE) {
-            mCapabilities = getMagnificationCapabilities(getPrefContext());
+        if (mCapabilities == NONE) {
+            mCapabilities = MagnificationCapabilities.getCapabilities(getPrefContext());
         }
     }
 
@@ -103,6 +83,8 @@
         switch (dialogId) {
             case DIALOG_MAGNIFICATION_CAPABILITY:
                 return SettingsEnums.DIALOG_MAGNIFICATION_CAPABILITY;
+            case DIALOG_MAGNIFICATION_SWITCH_SHORTCUT:
+                return SettingsEnums.DIALOG_MAGNIFICATION_SWITCH_SHORTCUT;
             default:
                 return 0;
         }
@@ -118,7 +100,7 @@
         super.onCreate(icicle);
         mModePreference = findPreference(PREF_KEY_MODE);
         mModePreference.setOnPreferenceClickListener(preference -> {
-            mCapabilities = getMagnificationCapabilities(getPrefContext());
+            mCapabilities = MagnificationCapabilities.getCapabilities(getPrefContext());
             showDialog(DIALOG_MAGNIFICATION_CAPABILITY);
             return true;
         });
@@ -131,102 +113,157 @@
 
     @Override
     public Dialog onCreateDialog(int dialogId) {
-        if (dialogId == DIALOG_MAGNIFICATION_CAPABILITY) {
-            final String title = getPrefContext().getString(
-                    R.string.accessibility_magnification_mode_title);
-            AlertDialog alertDialog = AccessibilityEditDialogUtils
-                    .showMagnificationModeDialog(getPrefContext(), title,
-                            this::callOnAlertDialogCheckboxClicked);
-            initializeDialogCheckBox(alertDialog);
-            return alertDialog;
+        final CharSequence title;
+        switch (dialogId) {
+            case DIALOG_MAGNIFICATION_CAPABILITY:
+                title = getPrefContext().getString(
+                        R.string.accessibility_magnification_mode_title);
+                mDialog = AccessibilityEditDialogUtils.showMagnificationModeDialog(getPrefContext(),
+                        title, this::callOnAlertDialogCheckboxClicked);
+                initializeDialogCheckBox(mDialog);
+                return mDialog;
+            case DIALOG_MAGNIFICATION_SWITCH_SHORTCUT:
+                title = getPrefContext().getString(
+                        R.string.accessibility_magnification_switch_shortcut_title);
+                mDialog = AccessibilityEditDialogUtils.showMagnificationSwitchShortcutDialog(
+                        getPrefContext(), title, this::onSwitchShortcutDialogPositiveButtonClicked);
+                return mDialog;
         }
+
         throw new IllegalArgumentException("Unsupported dialogId " + dialogId);
     }
 
     private void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
         updateCapabilities(true);
         mModePreference.setSummary(
-                getMagnificationCapabilitiesSummary(getPrefContext()));
+                MagnificationCapabilities.getSummary(getPrefContext(), mCapabilities));
     }
 
-    private void initializeDialogCheckBox(AlertDialog dialog) {
+    private void onSwitchShortcutDialogPositiveButtonClicked(View view) {
+        //TODO(b/147990389): Merge this function into util until magnification change format to
+        // Component.
+        optOutMagnificationFromTripleTap();
+        optInMagnificationToAccessibilityButton();
+
+        mDialog.dismiss();
+    }
+
+    private void optOutMagnificationFromTripleTap() {
+        Settings.Secure.putInt(getPrefContext().getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF);
+    }
+
+    private void optInMagnificationToAccessibilityButton() {
+        final String targetKey = Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
+        final String targetString = Settings.Secure.getString(getPrefContext().getContentResolver(),
+                targetKey);
+        if (targetString.contains(MAGNIFICATION_CONTROLLER_NAME)) {
+            return;
+        }
+
+        final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
+
+        if (!TextUtils.isEmpty(targetString)) {
+            joiner.add(targetString);
+        }
+        joiner.add(MAGNIFICATION_CONTROLLER_NAME);
+
+        Settings.Secure.putString(getPrefContext().getContentResolver(), targetKey,
+                joiner.toString());
+    }
+
+    private void initializeDialogCheckBox(Dialog dialog) {
         final View dialogFullScreenView = dialog.findViewById(R.id.magnify_full_screen);
+        final View dialogFullScreenTextArea = dialogFullScreenView.findViewById(R.id.container);
         mMagnifyFullScreenCheckBox = dialogFullScreenView.findViewById(R.id.checkbox);
 
         final View dialogWidowView = dialog.findViewById(R.id.magnify_window_screen);
+        final View dialogWindowTextArea = dialogWidowView.findViewById(R.id.container);
         mMagnifyWindowCheckBox = dialogWidowView.findViewById(R.id.checkbox);
 
+        setTextAreasClickListener(dialogFullScreenTextArea, mMagnifyFullScreenCheckBox,
+                dialogWindowTextArea, mMagnifyWindowCheckBox);
+
         updateAlertDialogCheckState();
-        updateAlertDialogEnableState();
+        updateAlertDialogEnableState(dialogFullScreenTextArea, dialogWindowTextArea);
+    }
+
+    private void setTextAreasClickListener(View fullScreenTextArea, CheckBox fullScreenCheckBox,
+            View windowTextArea, CheckBox windowCheckBox) {
+        fullScreenTextArea.setOnClickListener(v -> {
+            fullScreenCheckBox.toggle();
+            updateCapabilities(false);
+            updateAlertDialogEnableState(fullScreenTextArea, windowTextArea);
+        });
+
+        windowTextArea.setOnClickListener(v -> {
+            windowCheckBox.toggle();
+            updateCapabilities(false);
+            updateAlertDialogEnableState(fullScreenTextArea, windowTextArea);
+
+            if (isTripleTapEnabled() && windowCheckBox.isChecked()) {
+                showDialog(DIALOG_MAGNIFICATION_SWITCH_SHORTCUT);
+            }
+        });
     }
 
     private void updateAlertDialogCheckState() {
-        updateCheckStatus(mMagnifyWindowCheckBox, MagnifyMode.WINDOW);
-        updateCheckStatus(mMagnifyFullScreenCheckBox, MagnifyMode.FULLSCREEN);
+        updateCheckStatus(mMagnifyWindowCheckBox,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);
+        updateCheckStatus(mMagnifyFullScreenCheckBox,
+                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
 
     }
 
     private void updateCheckStatus(CheckBox checkBox, int mode) {
         checkBox.setChecked((mode & mCapabilities) != 0);
-        checkBox.setOnClickListener(v -> {
-            updateCapabilities(false);
-            updateAlertDialogEnableState();
-        });
     }
 
-    private void updateAlertDialogEnableState() {
-        if (mCapabilities != MagnifyMode.ALL) {
-            disableEnabledMagnificationModePreference();
-        } else {
-            enableAllPreference();
+    private void updateAlertDialogEnableState(View fullScreenTextArea, View windowTextArea) {
+        switch (mCapabilities) {
+            case Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN:
+                setViewAndChildrenEnabled(fullScreenTextArea, false);
+                break;
+            case Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW:
+                setViewAndChildrenEnabled(windowTextArea, false);
+                break;
+            case Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_ALL:
+                setViewAndChildrenEnabled(fullScreenTextArea, true);
+                setViewAndChildrenEnabled(windowTextArea, true);
+                break;
+            default:
+                throw new IllegalArgumentException(
+                        "Unsupported ACCESSIBILITY_MAGNIFICATION_CAPABILITY " + mCapabilities);
         }
     }
 
-    private void enableAllPreference() {
-        mMagnifyFullScreenCheckBox.setEnabled(true);
-        mMagnifyWindowCheckBox.setEnabled(true);
-    }
-
-    private void disableEnabledMagnificationModePreference() {
-        if (!mMagnifyFullScreenCheckBox.isChecked()) {
-            mMagnifyWindowCheckBox.setEnabled(false);
-        } else if (!mMagnifyWindowCheckBox.isChecked()) {
-            mMagnifyFullScreenCheckBox.setEnabled(false);
+    private void setViewAndChildrenEnabled(View view, boolean enabled) {
+        view.setEnabled(enabled);
+        if (view instanceof ViewGroup) {
+            final ViewGroup viewGroup = (ViewGroup) view;
+            for (int i = 0; i < viewGroup.getChildCount(); i++) {
+                View child = viewGroup.getChildAt(i);
+                setViewAndChildrenEnabled(child, enabled);
+            }
         }
     }
 
     private void updateCapabilities(boolean saveToDB) {
         int capabilities = 0;
         capabilities |=
-                mMagnifyFullScreenCheckBox.isChecked() ? MagnifyMode.FULLSCREEN : 0;
-        capabilities |= mMagnifyWindowCheckBox.isChecked() ? MagnifyMode.WINDOW : 0;
+                mMagnifyFullScreenCheckBox.isChecked()
+                        ? Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN : 0;
+        capabilities |= mMagnifyWindowCheckBox.isChecked()
+                ? Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW : 0;
         mCapabilities = capabilities;
         if (saveToDB) {
-            setMagnificationCapabilities(capabilities);
+            MagnificationCapabilities.setCapabilities(getPrefContext(), mCapabilities);
         }
     }
 
-    private void setSecureIntValue(String key, int value) {
-        Settings.Secure.putIntForUser(getPrefContext().getContentResolver(),
-                key, value, getPrefContext().getContentResolver().getUserId());
-    }
-
-    private void setMagnificationCapabilities(int capabilities) {
-        setSecureIntValue(KEY_CAPABILITY, capabilities);
-    }
-
-    @Retention(RetentionPolicy.SOURCE)
-    @IntDef({
-            MagnifyMode.NONE,
-            MagnifyMode.FULLSCREEN,
-            MagnifyMode.WINDOW,
-            MagnifyMode.ALL,
-    })
-    private @interface MagnifyMode {
-        int NONE = 0;
-        int FULLSCREEN = 1;
-        int WINDOW = 2;
-        int ALL = 3;
+    private boolean isTripleTapEnabled() {
+        return Settings.Secure.getInt(getPrefContext().getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF) == ON;
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
diff --git a/src/com/android/settings/accessibility/MasterMonoPreferenceController.java b/src/com/android/settings/accessibility/MasterMonoPreferenceController.java
deleted file mode 100644
index 6082f14..0000000
--- a/src/com/android/settings/accessibility/MasterMonoPreferenceController.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import com.android.settings.core.TogglePreferenceController;
-
-public class MasterMonoPreferenceController extends TogglePreferenceController {
-
-    public MasterMonoPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    public boolean isChecked() {
-        return Settings.System.getIntForUser(mContext.getContentResolver(),
-                Settings.System.MASTER_MONO, 0 /* default */, UserHandle.USER_CURRENT) == 1;
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        return Settings.System.putIntForUser(mContext.getContentResolver(),
-                Settings.System.MASTER_MONO, isChecked ? 1 : 0, UserHandle.USER_CURRENT);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
-    }
-}
diff --git a/src/com/android/settings/accessibility/PaletteListPreference.java b/src/com/android/settings/accessibility/PaletteListPreference.java
index c5c4205..ac552eb 100644
--- a/src/com/android/settings/accessibility/PaletteListPreference.java
+++ b/src/com/android/settings/accessibility/PaletteListPreference.java
@@ -16,23 +16,58 @@
 
 package com.android.settings.accessibility;
 
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.widget.FrameLayout;
-import android.widget.ListView;
+import static android.graphics.drawable.GradientDrawable.Orientation;
 
+import static com.android.settings.accessibility.AccessibilityUtil.getScreenHeightPixels;
+import static com.android.settings.accessibility.AccessibilityUtil.getScreenWidthPixels;
+
+import static com.google.common.primitives.Ints.max;
+
+import android.content.Context;
+import android.graphics.Paint.FontMetrics;
+import android.graphics.drawable.GradientDrawable;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.IntDef;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceViewHolder;
 
 import com.android.settings.R;
 
-/** Preference that easier preview by matching name to color. */
-public class PaletteListPreference extends Preference {
+import com.google.common.primitives.Floats;
+import com.google.common.primitives.Ints;
 
-    private ListView mListView;
-    private ViewTreeObserver.OnPreDrawListener mPreDrawListener;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/** Preference that easier preview by matching name to color. */
+public final class PaletteListPreference extends Preference {
+
+    private final List<Integer> mGradientColors = new ArrayList<>();
+    private final List<Float> mGradientOffsets = new ArrayList<>();
+
+    @IntDef({
+            Position.START,
+            Position.CENTER,
+            Position.END,
+    })
+    @Retention(RetentionPolicy.SOURCE)
+    @interface Position {
+        int START = 0;
+        int CENTER = 1;
+        int END = 2;
+    }
 
     /**
      * Constructs a new PaletteListPreference with the given context's theme and the supplied
@@ -61,47 +96,94 @@
     public PaletteListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         setLayoutResource(R.layout.daltonizer_preview);
-        initPreDrawListener();
     }
 
     @Override
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
 
-        final View rootView = holder.itemView;
-        mListView = rootView.findViewById(R.id.palette_listView);
-        if (mPreDrawListener != null) {
-            mListView.getViewTreeObserver().addOnPreDrawListener(mPreDrawListener);
+        final ViewGroup paletteView = holder.itemView.findViewById(R.id.palette_view);
+        initPaletteAttributes(getContext());
+        initPaletteView(getContext(), paletteView);
+    }
+
+    private void initPaletteAttributes(Context context) {
+        final int defaultColor = context.getColor(R.color.palette_list_gradient_background);
+        mGradientColors.add(Position.START, defaultColor);
+        mGradientColors.add(Position.CENTER, defaultColor);
+        mGradientColors.add(Position.END, defaultColor);
+
+        mGradientOffsets.add(Position.START, /* element= */ 0.0f);
+        mGradientOffsets.add(Position.CENTER, /* element= */ 0.5f);
+        mGradientOffsets.add(Position.END, /* element= */ 1.0f);
+    }
+
+    private void initPaletteView(Context context, ViewGroup rootView) {
+        if (rootView.getChildCount() > 0) {
+            rootView.removeAllViews();
+        }
+
+        final List<Integer> paletteColors = getPaletteColors(context);
+        final List<String> paletteData = getPaletteData(context);
+
+        final float textPadding =
+                context.getResources().getDimension(R.dimen.accessibility_layout_margin_start_end);
+        final String maxLengthData =
+                Collections.max(paletteData, Comparator.comparing(String::length));
+        final int textWidth = getTextWidth(context, maxLengthData);
+        final float textBound = (textWidth + textPadding) / getScreenWidthPixels(context);
+        mGradientOffsets.set(Position.CENTER, textBound);
+
+        final int screenHalfHeight = getScreenHeightPixels(context) / 2;
+        final int paletteItemHeight =
+                max(screenHalfHeight / paletteData.size(), getTextLineHeight(context));
+
+        for (int i = 0; i < paletteData.size(); ++i) {
+            final TextView textView = new TextView(context);
+            textView.setText(paletteData.get(i));
+            textView.setHeight(paletteItemHeight);
+            textView.setPaddingRelative(Math.round(textPadding), 0, 0, 0);
+            textView.setGravity(Gravity.CENTER_VERTICAL);
+            textView.setBackground(createGradientDrawable(rootView, paletteColors.get(i)));
+
+            rootView.addView(textView);
         }
     }
 
-    private void initPreDrawListener() {
-        mPreDrawListener = new ViewTreeObserver.OnPreDrawListener() {
-            @Override
-            public boolean onPreDraw() {
-                if (mListView == null) {
-                    return false;
-                }
+    private GradientDrawable createGradientDrawable(ViewGroup rootView, @ColorInt int color) {
+        mGradientColors.set(Position.END, color);
 
-                final int listViewHeight = mListView.getMeasuredHeight();
-                final int listViewWidth = mListView.getMeasuredWidth();
+        final GradientDrawable gradientDrawable = new GradientDrawable();
+        final Orientation orientation =
+                rootView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL
+                        ? Orientation.RIGHT_LEFT
+                        : Orientation.LEFT_RIGHT;
+        gradientDrawable.setOrientation(orientation);
+        gradientDrawable.setColors(Ints.toArray(mGradientColors), Floats.toArray(mGradientOffsets));
 
-                // Removes the callback after get result of measure view.
-                final ViewTreeObserver viewTreeObserver = mListView.getViewTreeObserver();
-                if (viewTreeObserver.isAlive()) {
-                    viewTreeObserver.removeOnPreDrawListener(this);
-                }
-                mPreDrawListener = null;
+        return gradientDrawable;
+    }
 
-                // Resets layout parameters to display whole items from listView.
-                final FrameLayout.LayoutParams layoutParams =
-                        (FrameLayout.LayoutParams) mListView.getLayoutParams();
-                layoutParams.height = listViewHeight * mListView.getAdapter().getCount();
-                layoutParams.width = listViewWidth;
-                mListView.setLayoutParams(layoutParams);
+    private List<Integer> getPaletteColors(Context context) {
+        final int[] paletteResources =
+                context.getResources().getIntArray(R.array.setting_palette_colors);
+        return Arrays.stream(paletteResources).boxed().collect(Collectors.toList());
+    }
 
-                return true;
-            }
-        };
+    private List<String> getPaletteData(Context context) {
+        final String[] paletteResources =
+                context.getResources().getStringArray(R.array.setting_palette_data);
+        return Arrays.asList(paletteResources);
+    }
+
+    private int getTextWidth(Context context, String text) {
+        final TextView tempView = new TextView(context);
+        return Math.round(tempView.getPaint().measureText(text));
+    }
+
+    private int getTextLineHeight(Context context) {
+        final TextView tempView = new TextView(context);
+        final FontMetrics fontMetrics = tempView.getPaint().getFontMetrics();
+        return Math.round(fontMetrics.bottom - fontMetrics.top);
     }
 }
diff --git a/src/com/android/settings/accessibility/PaletteListView.java b/src/com/android/settings/accessibility/PaletteListView.java
deleted file mode 100644
index ef010e2..0000000
--- a/src/com/android/settings/accessibility/PaletteListView.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.annotation.NonNull;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Color;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.GradientDrawable.Orientation;
-import android.util.AttributeSet;
-import android.util.DisplayMetrics;
-import android.view.Display;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.widget.BaseAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.R;
-
-import com.google.common.collect.Iterables;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * Custom ListView {@link ListView} which displays palette to deploy the color code preview.
- *
- * <p>The preview shows gradient from color white to specific color code on each list view item, in
- * addition, text view adjusts the attribute of width for adapting the text length.
- *
- * <p>The text cannot fills the whole view for ensuring the gradient color preview can purely
- * display also the view background shows the color beside the text variable end point.
- */
-public class PaletteListView extends ListView {
-    private final Context mContext;
-    private final DisplayAdapter mDisplayAdapter;
-    private final LayoutInflater mLayoutInflater;
-    private final String mDefaultGradientColorCodeString;
-    private final int mDefaultGradientColor;
-    private float mTextBound;
-    private static final float LANDSCAPE_MAX_WIDTH_PERCENTAGE = 100f;
-
-    public PaletteListView(Context context) {
-        this(context, null);
-    }
-
-    public PaletteListView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public PaletteListView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        mContext = context;
-        mDisplayAdapter = new DisplayAdapter();
-        mLayoutInflater = LayoutInflater.from(context);
-        mDefaultGradientColorCodeString =
-                getResources().getString(R.color.palette_list_gradient_background);
-        mDefaultGradientColor =
-                getResources().getColor(R.color.palette_list_gradient_background, null);
-        mTextBound = 0.0f;
-        init();
-    }
-
-    private static int getScreenWidth(WindowManager windowManager) {
-        final Display display = windowManager.getDefaultDisplay();
-        final DisplayMetrics displayMetrics = new DisplayMetrics();
-        display.getMetrics(displayMetrics);
-        return displayMetrics.widthPixels;
-    }
-
-    private void init() {
-        final TypedArray colorNameArray = getResources().obtainTypedArray(
-                R.array.setting_palette_colors);
-        final TypedArray colorCodeArray = getResources().obtainTypedArray(
-                R.array.setting_palette_data);
-        final int colorNameArrayLength = colorNameArray.length();
-        final List<ColorAttributes> colorList = new ArrayList<>();
-        computeTextWidthBounds(colorNameArray);
-
-        for (int index = 0; index < colorNameArrayLength; index++) {
-            colorList.add(
-                    new ColorAttributes(
-                            /* colorName= */ colorNameArray.getString(index),
-                            /* colorCode= */ colorCodeArray.getColor(index, mDefaultGradientColor),
-                            /* textBound= */ mTextBound,
-                            /* gradientDrawable= */
-                            new GradientDrawable(Orientation.LEFT_RIGHT, null)));
-        }
-
-        mDisplayAdapter.setColorList(colorList);
-        setAdapter(mDisplayAdapter);
-        setDividerHeight(/* height= */ 0);
-    }
-
-    /**
-     * Sets string array that required the color name and color code for deploy the new color
-     * preview.
-     *
-     * <p>The parameters not allow null define but two array length inconsistent are acceptable, in
-     * addition, to prevent IndexOutOfBoundsException the algorithm will check array data, and base
-     * on the array size to display data, or fills color code array if length less than other.
-     *
-     * @param colorNames a string array of color name
-     * @param colorCodes a string array of color code
-     * @return true if new array data apply successful
-     */
-    @VisibleForTesting
-    boolean setPaletteListColors(@NonNull String[] colorNames, @NonNull String[] colorCodes) {
-        if (colorNames == null || colorCodes == null) {
-            return false;
-        }
-
-        final int colorNameArrayLength = colorNames.length;
-        final int colorCodeArrayLength = colorCodes.length;
-        final List<ColorAttributes> colorList = new ArrayList<>();
-        final String[] colorCodeArray = fillColorCodeArray(colorCodes, colorNameArrayLength,
-                colorCodeArrayLength);
-        computeTextWidthBounds(colorNames);
-
-        for (int index = 0; index < colorNameArrayLength; index++) {
-            colorList.add(
-                    new ColorAttributes(
-                            /* colorName= */ colorNames[index],
-                            /* colorCode= */ Color.parseColor(colorCodeArray[index]),
-                            /* textBound= */ mTextBound,
-                            /* gradientDrawable= */
-                            new GradientDrawable(Orientation.LEFT_RIGHT, null)));
-        }
-
-        mDisplayAdapter.setColorList(colorList);
-        mDisplayAdapter.notifyDataSetChanged();
-        return true;
-    }
-
-    private String[] fillColorCodeArray(String[] colorCodes, int colorNameArrayLength,
-            int colorCodeArrayLength) {
-        if (colorNameArrayLength == colorCodeArrayLength
-                || colorNameArrayLength < colorCodeArrayLength) {
-            return colorCodes;
-        }
-
-        final String[] colorCodeArray = new String[colorNameArrayLength];
-        for (int index = 0; index < colorNameArrayLength; index++) {
-            if (index < colorCodeArrayLength) {
-                colorCodeArray[index] = colorCodes[index];
-            } else {
-                colorCodeArray[index] = mDefaultGradientColorCodeString;
-            }
-        }
-        return colorCodeArray;
-    }
-
-    private void computeTextWidthBounds(TypedArray colorNameTypedArray) {
-        final int colorNameArrayLength = colorNameTypedArray.length();
-        final String[] colorNames = new String[colorNameArrayLength];
-        for (int index = 0; index < colorNameArrayLength; index++) {
-            colorNames[index] = colorNameTypedArray.getString(index);
-        }
-
-        measureBound(colorNames);
-    }
-
-    private void computeTextWidthBounds(String[] colorNameArray) {
-        final int colorNameArrayLength = colorNameArray.length;
-        final String[] colorNames = new String[colorNameArrayLength];
-        for (int index = 0; index < colorNameArrayLength; index++) {
-            colorNames[index] = colorNameArray[index];
-        }
-
-        measureBound(colorNames);
-    }
-
-    private void measureBound(String[] dataArray) {
-        final WindowManager windowManager = (WindowManager) mContext.getSystemService(
-                Context.WINDOW_SERVICE);
-        final View view = mLayoutInflater.inflate(R.layout.palette_listview_item, null);
-        final TextView textView = view.findViewById(R.id.item_textview);
-        final List<String> colorNameList = new ArrayList<>(Arrays.asList(dataArray));
-        Collections.sort(colorNameList, Comparator.comparing(String::length));
-        // Gets the last index of list which sort by text length.
-        textView.setText(Iterables.getLast(colorNameList));
-
-        final float textWidth = textView.getPaint().measureText(textView.getText().toString());
-        // Computes rate of text width compare to screen width, and measures the round the double
-        // to two decimal places manually.
-        final float textBound = Math.round(
-                textWidth / getScreenWidth(windowManager) * LANDSCAPE_MAX_WIDTH_PERCENTAGE)
-                / LANDSCAPE_MAX_WIDTH_PERCENTAGE;
-
-        // Left padding and right padding with color preview.
-        final float paddingPixel = getResources().getDimension(
-                R.dimen.accessibility_layout_margin_start_end);
-        final float paddingWidth =
-                Math.round(paddingPixel / getScreenWidth(windowManager)
-                        * LANDSCAPE_MAX_WIDTH_PERCENTAGE) / LANDSCAPE_MAX_WIDTH_PERCENTAGE;
-        mTextBound = textBound + paddingWidth + paddingWidth;
-    }
-
-    private static class ViewHolder {
-        public TextView textView;
-    }
-
-    /** An adapter that converts color text title and color code to text views. */
-    private final class DisplayAdapter extends BaseAdapter {
-
-        private List<ColorAttributes> mColorList;
-
-        @Override
-        public int getCount() {
-            return mColorList.size();
-        }
-
-        @Override
-        public Object getItem(int position) {
-            return mColorList.get(position);
-        }
-
-        @Override
-        public long getItemId(int position) {
-            return position;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            final ViewHolder viewHolder;
-            final ColorAttributes paletteAttribute = mColorList.get(position);
-            final String colorName = paletteAttribute.getColorName();
-            final GradientDrawable gradientDrawable = paletteAttribute.getGradientDrawable();
-
-            if (convertView == null) {
-                convertView = mLayoutInflater.inflate(R.layout.palette_listview_item, null);
-                viewHolder = new ViewHolder();
-                viewHolder.textView = convertView.findViewById(R.id.item_textview);
-                convertView.setTag(viewHolder);
-            } else {
-                viewHolder = (ViewHolder) convertView.getTag();
-            }
-
-            viewHolder.textView.setText(colorName);
-            viewHolder.textView.setBackground(gradientDrawable);
-            return convertView;
-        }
-
-        protected void setColorList(List<ColorAttributes> colorList) {
-            mColorList = colorList;
-        }
-    }
-
-    private final class ColorAttributes {
-        private final int mColorIndex = 2; // index for inject color.
-        private final int mColorOffsetIndex = 1; // index for offset effect.
-        private final String mColorName;
-        private final GradientDrawable mGradientDrawable;
-        private final int[] mGradientColors =
-                {/* startColor=*/ mDefaultGradientColor, /* centerColor=*/ mDefaultGradientColor,
-                        /* endCode= */ 0};
-        private final float[] mGradientOffsets =
-                {/* starOffset= */ 0.0f, /* centerOffset= */ 0.5f, /* endOffset= */ 1.0f};
-
-        ColorAttributes(
-                String colorName, int colorCode, float textBound,
-                GradientDrawable gradientDrawable) {
-            mGradientColors[mColorIndex] = colorCode;
-            mGradientOffsets[mColorOffsetIndex] = textBound;
-            gradientDrawable.setColors(mGradientColors, mGradientOffsets);
-            mColorName = colorName;
-            mGradientDrawable = gradientDrawable;
-        }
-
-        public String getColorName() {
-            return mColorName;
-        }
-
-        public GradientDrawable getGradientDrawable() {
-            return mGradientDrawable;
-        }
-    }
-}
diff --git a/src/com/android/settings/accessibility/PreferredShortcut.java b/src/com/android/settings/accessibility/PreferredShortcut.java
new file mode 100644
index 0000000..1654992
--- /dev/null
+++ b/src/com/android/settings/accessibility/PreferredShortcut.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ComponentName;
+import android.text.TextUtils;
+
+import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+
+import com.google.common.base.Objects;
+
+/**
+ * A data class for containing {@link ComponentName#flattenToString()} and
+ * {@link UserShortcutType}. Represents the preferred shortcuts of the service or activity.
+ */
+public class PreferredShortcut {
+
+    private static final char COMPONENT_NAME_SEPARATOR = ':';
+    private static final TextUtils.SimpleStringSplitter sStringColonSplitter =
+            new TextUtils.SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
+
+    /**
+     * Creates a {@link PreferredShortcut} from a encoded string described in {@link #toString()}.
+     *
+     * @param preferredShortcutString A string conform to the format described in {@link
+     *                                #toString()}
+     * @return A {@link PreferredShortcut} with the specified value
+     * @throws IllegalArgumentException If preferredShortcutString does not conform to the format
+     *                                  described in {@link #toString()}
+     */
+    public static PreferredShortcut fromString(String preferredShortcutString) {
+        sStringColonSplitter.setString(preferredShortcutString);
+        if (sStringColonSplitter.hasNext()) {
+            final String componentName = sStringColonSplitter.next();
+            final int type = Integer.parseInt(sStringColonSplitter.next());
+            return new PreferredShortcut(componentName, type);
+        }
+
+        throw new IllegalArgumentException(
+                "Invalid PreferredShortcut string: " + preferredShortcutString);
+    }
+
+    /** The format of {@link ComponentName#flattenToString()} */
+    private String mComponentName;
+    /** The format of {@link UserShortcutType} */
+    private int mType;
+
+    public PreferredShortcut(String componentName, int type) {
+        mComponentName = componentName;
+        mType = type;
+    }
+
+    public String getComponentName() {
+        return mComponentName;
+    }
+
+    public int getType() {
+        return mType;
+    }
+
+    @Override
+    public String toString() {
+        return mComponentName + COMPONENT_NAME_SEPARATOR + mType;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        PreferredShortcut that = (PreferredShortcut) o;
+        return mType == that.mType && Objects.equal(mComponentName, that.mComponentName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(mComponentName, mType);
+    }
+}
diff --git a/src/com/android/settings/accessibility/PreferredShortcuts.java b/src/com/android/settings/accessibility/PreferredShortcuts.java
new file mode 100644
index 0000000..2c9840d
--- /dev/null
+++ b/src/com/android/settings/accessibility/PreferredShortcuts.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/** Static utility methods relating to {@link PreferredShortcut} */
+public final class PreferredShortcuts {
+
+    private static final String ACCESSIBILITY_PERF = "accessibility_prefs";
+    private static final String USER_SHORTCUT_TYPE = "user_shortcut_type";
+
+    /**
+     * Retrieves {@link UserShortcutType} for the given {@code componentName} from
+     * SharedPreferences.
+     *
+     * @param context       {@link Context} to access the {@link SharedPreferences}
+     * @param componentName Name of the service or activity, should be the format of {@link
+     *                      ComponentName#flattenToString()}.
+     * @param defaultType   See {@link UserShortcutType}
+     * @return {@link UserShortcutType}
+     */
+    public static int retrieveUserShortcutType(Context context, String componentName,
+            int defaultType) {
+        if (componentName == null) {
+            return defaultType;
+        }
+
+        // Create a mutable set to modify
+        final Set<String> info = new HashSet<>(getFromSharedPreferences(context));
+        info.removeIf(str -> !str.contains(componentName));
+
+        if (info.isEmpty()) {
+            return defaultType;
+        }
+
+        final String str = info.stream().findFirst().get();
+        final PreferredShortcut shortcut = PreferredShortcut.fromString(str);
+        return shortcut.getType();
+    }
+
+    /**
+     * Saves a {@link PreferredShortcut} which containing {@link ComponentName#flattenToString()}
+     * and {@link UserShortcutType} in SharedPreferences.
+     *
+     * @param context  {@link Context} to access the {@link SharedPreferences}
+     * @param shortcut Contains {@link ComponentName#flattenToString()} and {@link UserShortcutType}
+     */
+    public static void saveUserShortcutType(Context context, PreferredShortcut shortcut) {
+        final String componentName = shortcut.getComponentName();
+        if (componentName == null) {
+            return;
+        }
+
+        // Create a mutable set to modify
+        final Set<String> info = new HashSet<>(getFromSharedPreferences(context));
+        info.removeIf(str -> str.contains(componentName));
+        info.add(shortcut.toString());
+        saveToSharedPreferences(context, info);
+    }
+
+    /**
+     * Returns a immutable set of {@link PreferredShortcut#toString()} list from
+     * SharedPreferences.
+     */
+    private static Set<String> getFromSharedPreferences(Context context) {
+        return getSharedPreferences(context).getStringSet(USER_SHORTCUT_TYPE, Set.of());
+    }
+
+    /** Sets a set of {@link PreferredShortcut#toString()} list into SharedPreferences. */
+    private static void saveToSharedPreferences(Context context, Set<String> data) {
+        SharedPreferences.Editor editor = getSharedPreferences(context).edit();
+        editor.putStringSet(USER_SHORTCUT_TYPE, data).apply();
+    }
+
+    private static SharedPreferences getSharedPreferences(Context context) {
+        return context.getSharedPreferences(ACCESSIBILITY_PERF, Context.MODE_PRIVATE);
+    }
+
+    private PreferredShortcuts() {}
+}
diff --git a/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java b/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
new file mode 100644
index 0000000..bf12bde
--- /dev/null
+++ b/src/com/android/settings/accessibility/PrimaryMonoPreferenceController.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * A toggle preference controller for Primary Mono
+ */
+public class PrimaryMonoPreferenceController extends TogglePreferenceController {
+
+    public PrimaryMonoPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.MASTER_MONO, 0 /* default */, UserHandle.USER_CURRENT) == 1;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.System.putIntForUser(mContext.getContentResolver(),
+                Settings.System.MASTER_MONO, isChecked ? 1 : 0, UserHandle.USER_CURRENT);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/accessibility/RTTSettingPreferenceController.java b/src/com/android/settings/accessibility/RTTSettingPreferenceController.java
index 3b5915d..22c3047 100644
--- a/src/com/android/settings/accessibility/RTTSettingPreferenceController.java
+++ b/src/com/android/settings/accessibility/RTTSettingPreferenceController.java
@@ -20,8 +20,12 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.PersistableBundle;
 import android.provider.Settings;
 import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
 import androidx.annotation.VisibleForTesting;
@@ -37,7 +41,6 @@
 public class RTTSettingPreferenceController extends BasePreferenceController {
 
     private static final String DIALER_RTT_CONFIGURATION = "dialer_rtt_configuration";
-
     private final Context mContext;
     private final PackageManager mPackageManager;
     private final TelecomManager mTelecomManager;
@@ -81,8 +84,41 @@
         return mModes[option];
     }
 
-    @VisibleForTesting
-    boolean isDialerSupportRTTSetting() {
-        return TextUtils.equals(mTelecomManager.getDefaultDialerPackage(), mDialerPackage);
+    private boolean isDialerSupportRTTSetting() {
+        final TelephonyManager telephonyManager = createTelephonyManagerFromSubId();
+        final boolean isCarrierAndRttSupported = telephonyManager.isRttSupported()
+                && getBooleanCarrierConfig(CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL);
+
+        return isCarrierAndRttSupported
+                && TextUtils.equals(mTelecomManager.getDefaultDialerPackage(), mDialerPackage);
+    }
+
+    /**
+     * Gets the boolean config from carrier config manager.
+     *
+     * @param key config key defined in CarrierConfigManager.
+     * @return boolean value of corresponding key.
+     */
+    private boolean getBooleanCarrierConfig(String key) {
+        final CarrierConfigManager configManager =
+                mContext.getSystemService(CarrierConfigManager.class);
+        if (configManager == null) {
+            // Return static default defined in CarrierConfigManager.
+            return CarrierConfigManager.getDefaultConfig().getBoolean(key);
+        }
+
+        // If an invalid subId is used, this bundle will contain default values.
+        final int subId = SubscriptionManager.getDefaultVoiceSubscriptionId();
+        final PersistableBundle bundle = configManager.getConfigForSubId(subId);
+
+        return bundle != null
+                ? bundle.getBoolean(key)
+                : CarrierConfigManager.getDefaultConfig().getBoolean(key);
+    }
+
+    private TelephonyManager createTelephonyManagerFromSubId() {
+        final TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
+        final int subId = SubscriptionManager.getDefaultVoiceSubscriptionId();
+        return telephonyManager.createForSubscriptionId(subId);
     }
 }
diff --git a/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceController.java b/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceController.java
new file mode 100644
index 0000000..ea7fb7c
--- /dev/null
+++ b/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceController.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.hardware.display.ColorDisplayManager;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.SliderPreferenceController;
+import com.android.settings.widget.SeekBarPreference;
+
+/** PreferenceController for feature intensity. */
+public class ReduceBrightColorsIntensityPreferenceController extends SliderPreferenceController {
+
+    public ReduceBrightColorsIntensityPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (!ColorDisplayManager.isColorTransformAccelerated(mContext)) {
+            return UNSUPPORTED_ON_DEVICE;
+        } else if (Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED, 0) != 1) {
+            return DISABLED_DEPENDENT_SETTING;
+        }
+        return AVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final SeekBarPreference preference = screen.findPreference(getPreferenceKey());
+        preference.setContinuousUpdates(true);
+        preference.setMax(getMax());
+        preference.setMin(getMin());
+        preference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);
+        updateState(preference);
+    }
+
+
+    @Override
+    public final void updateState(Preference preference) {
+        super.updateState(preference);
+        preference.setEnabled(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED, 0) == 1);
+    }
+
+    @Override
+    public int getSliderPosition() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL, 0);
+    }
+
+    @Override
+    public boolean setSliderPosition(int position) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL, position);
+    }
+
+    @Override
+    public int getMax() {
+        // TODO(b/170970675): Call into CDS to get config max intensity
+        return 100;
+    }
+
+    @Override
+    public int getMin() {
+        // TODO(b/170970675): Call into CDS to get config min intensity
+        return 0;
+    }
+}
diff --git a/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceController.java b/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceController.java
new file mode 100644
index 0000000..bf8cda7
--- /dev/null
+++ b/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceController.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/** PreferenceController for persisting feature activation state after a restart. */
+public class ReduceBrightColorsPersistencePreferenceController extends TogglePreferenceController {
+
+    public ReduceBrightColorsPersistencePreferenceController(
+            Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        // TODO(b/170970675): call into CDS to get availability/config status
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS, 0) == 1;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS, (isChecked ? 1 : 0));
+    }
+}
diff --git a/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
new file mode 100644
index 0000000..82b3a64
--- /dev/null
+++ b/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceController.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.content.Context;
+import android.hardware.display.ColorDisplayManager;
+import android.provider.Settings;
+
+import com.android.settings.core.BasePreferenceController;
+
+/** PreferenceController that shows the Reduce Bright Colors summary */
+public class ReduceBrightColorsPreferenceController extends BasePreferenceController {
+
+    public ReduceBrightColorsPreferenceController(Context context,
+            String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return AccessibilityUtil.getSummary(mContext,
+                Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return ColorDisplayManager.isColorTransformAccelerated(mContext) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+}
diff --git a/src/com/android/settings/accessibility/SharedPreferenceUtils.java b/src/com/android/settings/accessibility/SharedPreferenceUtils.java
deleted file mode 100644
index e997291..0000000
--- a/src/com/android/settings/accessibility/SharedPreferenceUtils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import com.google.common.collect.ImmutableSet;
-
-import java.util.Set;
-
-/** Utility class for SharedPreferences. */
-public final class SharedPreferenceUtils {
-
-    private static final String ACCESSIBILITY_PERF = "accessibility_prefs";
-    private static final String USER_SHORTCUT_TYPE = "user_shortcut_type";
-    private SharedPreferenceUtils() { }
-
-    private static SharedPreferences getSharedPreferences(Context context, String fileName) {
-        return context.getSharedPreferences(fileName, Context.MODE_PRIVATE);
-    }
-
-    /** Returns a set of user shortcuts list to determine user preferred service shortcut. */
-    public static Set<String> getUserShortcutTypes(Context context) {
-        return getSharedPreferences(context, ACCESSIBILITY_PERF)
-                .getStringSet(USER_SHORTCUT_TYPE, ImmutableSet.of());
-    }
-
-    /** Sets a set of user shortcuts list to determine user preferred service shortcut. */
-    public static void setUserShortcutType(Context context, Set<String> data) {
-        SharedPreferences.Editor editor = getSharedPreferences(context, ACCESSIBILITY_PERF).edit();
-        editor.remove(USER_SHORTCUT_TYPE).apply();
-        editor.putStringSet(USER_SHORTCUT_TYPE, data).apply();
-    }
-}
diff --git a/src/com/android/settings/accessibility/ShortcutPreference.java b/src/com/android/settings/accessibility/ShortcutPreference.java
index 05c8a15..a9b542a 100644
--- a/src/com/android/settings/accessibility/ShortcutPreference.java
+++ b/src/com/android/settings/accessibility/ShortcutPreference.java
@@ -62,7 +62,7 @@
     ShortcutPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         setLayoutResource(R.layout.accessibility_shortcut_secondary_action);
-        setWidgetLayoutResource(R.layout.preference_widget_master_switch);
+        setWidgetLayoutResource(R.layout.preference_widget_primary_switch);
         setIconSpaceReserved(true);
     }
 
diff --git a/src/com/android/settings/accessibility/TextAndDisplayFragment.java b/src/com/android/settings/accessibility/TextAndDisplayFragment.java
new file mode 100644
index 0000000..b496e3d
--- /dev/null
+++ b/src/com/android/settings/accessibility/TextAndDisplayFragment.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.hardware.display.ColorDisplayManager;
+import android.os.Bundle;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.display.DarkUIPreferenceController;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/** Accessibility settings for text and display. */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class TextAndDisplayFragment extends DashboardFragment {
+
+    private static final String TAG = "TextAndDisplayFragment";
+
+    private static final String CATEGORY_EXPERIMENTAL = "experimental_category";
+
+    // Preferences
+    private static final String DISPLAY_DALTONIZER_PREFERENCE_SCREEN = "daltonizer_preference";
+    private static final String TOGGLE_INVERSION_PREFERENCE = "toggle_inversion_preference";
+    private static final String DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN =
+            "reduce_bright_colors_preference";
+    private static final String TOGGLE_DISABLE_ANIMATIONS = "toggle_disable_animations";
+    private static final String TOGGLE_LARGE_POINTER_ICON = "toggle_large_pointer_icon";
+
+    private Preference mDisplayDaltonizerPreferenceScreen;
+    private Preference mToggleInversionPreference;
+    private Preference mReduceBrightColorsPreference;
+    private SwitchPreference mToggleDisableAnimationsPreference;
+    private SwitchPreference mToggleLargePointerIconPreference;
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.ACCESSIBILITY_TEXT_AND_DISPLAY;
+    }
+
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        initializeAllPreferences();
+        updateSystemPreferences();
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        use(DarkUIPreferenceController.class).setParentFragment(this);
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.accessibility_text_and_display;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    private void initializeAllPreferences() {
+        // Display color adjustments.
+        mDisplayDaltonizerPreferenceScreen = findPreference(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
+
+        // Display inversion.
+        mToggleInversionPreference = findPreference(TOGGLE_INVERSION_PREFERENCE);
+
+        // Reduce brightness.
+        mReduceBrightColorsPreference =
+                findPreference(DISPLAY_REDUCE_BRIGHT_COLORS_PREFERENCE_SCREEN);
+
+        // Disable animation.
+        mToggleDisableAnimationsPreference = findPreference(TOGGLE_DISABLE_ANIMATIONS);
+
+        // Large pointer icon.
+        mToggleLargePointerIconPreference = findPreference(TOGGLE_LARGE_POINTER_ICON);
+    }
+
+    /**
+     * Updates preferences related to system configurations.
+     */
+    private void updateSystemPreferences() {
+        final PreferenceCategory experimentalCategory = getPreferenceScreen().findPreference(
+                CATEGORY_EXPERIMENTAL);
+        if (ColorDisplayManager.isColorTransformAccelerated(getContext())) {
+            mDisplayDaltonizerPreferenceScreen.setSummary(AccessibilityUtil.getSummary(
+                    getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED));
+            mToggleInversionPreference.setSummary(AccessibilityUtil.getSummary(
+                    getContext(), Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED));
+            mReduceBrightColorsPreference.setSummary(AccessibilityUtil.getSummary(
+                    getContext(), Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED));
+            getPreferenceScreen().removePreference(experimentalCategory);
+        } else {
+            // Move following preferences to experimental category if device don't supports HWC
+            // hardware-accelerated color transform.
+            getPreferenceScreen().removePreference(mDisplayDaltonizerPreferenceScreen);
+            getPreferenceScreen().removePreference(mToggleInversionPreference);
+            getPreferenceScreen().removePreference(mReduceBrightColorsPreference);
+            getPreferenceScreen().removePreference(mToggleDisableAnimationsPreference);
+            getPreferenceScreen().removePreference(mToggleLargePointerIconPreference);
+            experimentalCategory.addPreference(mDisplayDaltonizerPreferenceScreen);
+            experimentalCategory.addPreference(mToggleInversionPreference);
+            experimentalCategory.addPreference(mReduceBrightColorsPreference);
+            experimentalCategory.addPreference(mToggleDisableAnimationsPreference);
+            experimentalCategory.addPreference(mToggleLargePointerIconPreference);
+        }
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.accessibility_text_and_display);
+}
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index 05147a8..04491cc 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -17,6 +17,7 @@
 package com.android.settings.accessibility;
 
 import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;
+import static com.android.settings.accessibility.PreferredShortcuts.retrieveUserShortcutType;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Activity;
@@ -200,7 +201,7 @@
     protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
         final AccessibilityServiceInfo info = getAccessibilityServiceInfo();
         final String switchBarText = (info == null) ? "" :
-                getString(R.string.accessibility_service_master_switch_title,
+                getString(R.string.accessibility_service_primary_switch_title,
                         info.getResolveInfo().loadLabel(getPackageManager()));
         switchPreference.setTitle(switchBarText);
     }
@@ -292,7 +293,8 @@
 
     @Override
     public void onToggleClicked(ShortcutPreference preference) {
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+                mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         if (preference.isChecked()) {
             if (!mToggleServiceDividerSwitchPreference.isChecked()) {
                 preference.setChecked(false);
@@ -311,7 +313,6 @@
 
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
-        super.onSettingsClicked(preference);
         final boolean isServiceOnOrShortcutAdded = mShortcutPreference.isChecked()
                 || mToggleServiceDividerSwitchPreference.isChecked();
         showPopupDialog(isServiceOnOrShortcutAdded ? DialogEnums.EDIT_SHORTCUT
@@ -411,7 +412,8 @@
     private void onAllowButtonFromShortcutToggleClicked() {
         mShortcutPreference.setChecked(true);
 
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = retrieveUserShortcutType(getPrefContext(),
+                mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), shortcutTypes, mComponentName);
 
         mIsDialogShown.set(false);
diff --git a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java
index b9af7ce..78f31df 100644
--- a/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java
+++ b/src/com/android/settings/accessibility/ToggleAutoclickPreferenceController.java
@@ -25,6 +25,7 @@
 import android.provider.Settings;
 import android.util.ArrayMap;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
@@ -44,16 +45,23 @@
 public class ToggleAutoclickPreferenceController extends BasePreferenceController implements
         LifecycleObserver, RadioButtonPreference.OnClickListener, PreferenceControllerMixin {
 
-    private static final String CONTROL_AUTOCLICK_DELAY_SECURE =
+    @VisibleForTesting
+    static final String CONTROL_AUTOCLICK_DELAY_SECURE =
             Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY;
-    private static final String KEY_AUTOCLICK_CUSTOM_SEEKBAR = "autoclick_custom_seekbar";
+
+    @VisibleForTesting
+    static final String KEY_AUTOCLICK_CUSTOM_SEEKBAR = "autoclick_custom_seekbar";
     static final String KEY_DELAY_MODE = "delay_mode";
 
-    private static final int AUTOCLICK_OFF_MODE = 0;
-    private static final int AUTOCLICK_CUSTOM_MODE = 2000;
+    @VisibleForTesting
+    static final int AUTOCLICK_OFF_MODE = 0;
+
+    @VisibleForTesting
+    static final int AUTOCLICK_CUSTOM_MODE = 2000;
 
     // Pair the preference key and autoclick mode value.
-    private final Map<String, Integer> mAccessibilityAutoclickKeyToValueMap = new ArrayMap<>();
+    @VisibleForTesting
+    Map<String, Integer> mAccessibilityAutoclickKeyToValueMap = new ArrayMap<>();
 
     private SharedPreferences mSharedPreferences;
     private final ContentResolver mContentResolver;
@@ -70,13 +78,7 @@
     private int mCurrentUiAutoClickMode;
 
     public ToggleAutoclickPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-
-        mSharedPreferences = context.getSharedPreferences(context.getPackageName(), MODE_PRIVATE);
-        mContentResolver = context.getContentResolver();
-        mResources = context.getResources();
-
-        setAutoclickModeToKeyMap();
+        this(context, /* lifecycle= */ null, preferenceKey);
     }
 
     public ToggleAutoclickPreferenceController(Context context, Lifecycle lifecycle,
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index dfdcd9e..a45cd49 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -123,12 +123,6 @@
     }
 
     @Override
-    public void onSettingsClicked(ShortcutPreference preference) {
-        super.onSettingsClicked(preference);
-        showDialog(DialogEnums.EDIT_SHORTCUT);
-    }
-
-    @Override
     int getUserShortcutTypes() {
         return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
                 mComponentName);
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 8a4b7f8..3fb9b38 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -180,7 +180,7 @@
 
     @Override
     protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
-        switchPreference.setTitle(R.string.accessibility_daltonizer_master_switch_title);
+        switchPreference.setTitle(R.string.accessibility_daltonizer_primary_switch_title);
     }
 
     @Override
@@ -195,12 +195,6 @@
     }
 
     @Override
-    public void onSettingsClicked(ShortcutPreference preference) {
-        super.onSettingsClicked(preference);
-        showDialog(DialogEnums.EDIT_SHORTCUT);
-    }
-
-    @Override
     int getUserShortcutTypes() {
         return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
                 mComponentName);
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index d0b83b6..0f4b762 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.accessibility;
 
-import static com.android.settings.accessibility.AccessibilityUtil.getScreenHeightPixels;
-import static com.android.settings.accessibility.AccessibilityUtil.getScreenWidthPixels;
-
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
@@ -44,6 +41,7 @@
 import android.widget.CheckBox;
 import android.widget.ImageView;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
@@ -60,12 +58,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
 
 /**
  * Base class for accessibility fragments with toggle, shortcut, some helper functions
@@ -87,19 +81,23 @@
     protected Uri mImageUri;
     private CharSequence mDescription;
     protected CharSequence mHtmlDescription;
-    // Used to restore the edit dialog status.
-    protected int mUserShortcutTypesCache = UserShortcutType.EMPTY;
+
     private static final String DRAWABLE_FOLDER = "drawable";
     protected static final String KEY_USE_SERVICE_PREFERENCE = "use_service";
     protected static final String KEY_GENERAL_CATEGORY = "general_categories";
     protected static final String KEY_INTRODUCTION_CATEGORY = "introduction_categories";
     private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
-    private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
+    protected static final String KEY_SAVED_USER_SHORTCUT_TYPE = "shortcut_type";
+
     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
-    private int mUserShortcutTypes = UserShortcutType.EMPTY;
+    private SettingsContentObserver mSettingsContentObserver;
+
     private CheckBox mSoftwareTypeCheckBox;
     private CheckBox mHardwareTypeCheckBox;
-    private SettingsContentObserver mSettingsContentObserver;
+
+    public static final int NOT_SET = -1;
+    // Save user's shortcutType value when savedInstance has value (e.g. device rotated).
+    protected int mSavedCheckBoxValue = NOT_SET;
 
     // For html description of accessibility service, must follow the rule, such as
     // <img src="R.drawable.fileName"/>, a11y settings will get the resources successfully.
@@ -121,6 +119,13 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        // Restore the user shortcut type.
+        if (savedInstanceState != null && savedInstanceState.containsKey(
+                KEY_SAVED_USER_SHORTCUT_TYPE)) {
+            mSavedCheckBoxValue = savedInstanceState.getInt(KEY_SAVED_USER_SHORTCUT_TYPE, NOT_SET);
+        }
+
         setupDefaultShortcutIfNecessary(getPrefContext());
         final int resId = getPreferenceScreenResId();
         if (resId <= 0) {
@@ -144,6 +149,21 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
+        // Need to be called as early as possible. Protected variables will be assigned here.
+        onProcessArguments(getArguments());
+
+        initAnimatedImagePreference();
+        initToggleServiceDividerSwitchPreference();
+        initGeneralCategory();
+        initShortcutPreference();
+        initSettingsPreference();
+        initHtmlTextPreference();
+        initFooterPreference();
+
+        installActionBarToggleSwitch();
+
+        updateToggleServiceTitle(mToggleServiceDividerSwitchPreference);
+
         mTouchExplorationStateChangeListener = isTouchExplorationEnabled -> {
             removeDialog(DialogEnums.EDIT_SHORTCUT);
             mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
@@ -158,89 +178,12 @@
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SwitchBar switchBar = activity.getSwitchBar();
         switchBar.hide();
-
-        // Need to be called as early as possible. Protected variables will be assigned here.
-        onProcessArguments(getArguments());
-
-        PreferenceScreen preferenceScreen = getPreferenceScreen();
-        if (mImageUri != null) {
-            final int screenHalfHeight = getScreenHeightPixels(getPrefContext()) / /* half */ 2;
-            final AnimatedImagePreference animatedImagePreference = new AnimatedImagePreference(
-                    getPrefContext());
-            animatedImagePreference.setImageUri(mImageUri);
-            animatedImagePreference.setSelectable(false);
-            animatedImagePreference.setMaxHeight(screenHalfHeight);
-            preferenceScreen.addPreference(animatedImagePreference);
-        }
-
-        mToggleServiceDividerSwitchPreference = new DividerSwitchPreference(getPrefContext());
-        mToggleServiceDividerSwitchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
-        if (getArguments().containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
-            final boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);
-            mToggleServiceDividerSwitchPreference.setChecked(enabled);
-        }
-
-        preferenceScreen.addPreference(mToggleServiceDividerSwitchPreference);
-
-        updateToggleServiceTitle(mToggleServiceDividerSwitchPreference);
-
-        final PreferenceCategory groupCategory = new PreferenceCategory(getPrefContext());
-        groupCategory.setKey(KEY_GENERAL_CATEGORY);
-        groupCategory.setTitle(R.string.accessibility_screen_option);
-        preferenceScreen.addPreference(groupCategory);
-
-        initShortcutPreference(savedInstanceState);
-        groupCategory.addPreference(mShortcutPreference);
-
-        // Show the "Settings" menu as if it were a preference screen.
-        if (mSettingsTitle != null && mSettingsIntent != null) {
-            mSettingsPreference = new Preference(getPrefContext());
-            mSettingsPreference.setTitle(mSettingsTitle);
-            mSettingsPreference.setIconSpaceReserved(true);
-            mSettingsPreference.setIntent(mSettingsIntent);
-        }
-
-        // The downloaded app may not show Settings. The framework app has Settings.
-        if (mSettingsPreference != null) {
-            groupCategory.addPreference(mSettingsPreference);
-        }
-
-        if (!TextUtils.isEmpty(mHtmlDescription)) {
-            final PreferenceCategory introductionCategory = new PreferenceCategory(
-                    getPrefContext());
-            final CharSequence title = getString(R.string.accessibility_introduction_title,
-                    mPackageName);
-            introductionCategory.setKey(KEY_INTRODUCTION_CATEGORY);
-            introductionCategory.setTitle(title);
-            preferenceScreen.addPreference(introductionCategory);
-
-            final HtmlTextPreference htmlTextPreference = new HtmlTextPreference(getPrefContext());
-            htmlTextPreference.setSummary(mHtmlDescription);
-            htmlTextPreference.setImageGetter(mImageGetter);
-            htmlTextPreference.setSelectable(false);
-            introductionCategory.addPreference(htmlTextPreference);
-        }
-
-        if (!TextUtils.isEmpty(mDescription)) {
-            createFooterPreference(mDescription);
-        }
-
-        if (TextUtils.isEmpty(mHtmlDescription) && TextUtils.isEmpty(mDescription)) {
-            final CharSequence defaultDescription = getText(
-                    R.string.accessibility_service_default_description);
-            createFooterPreference(defaultDescription);
-        }
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        installActionBarToggleSwitch();
     }
 
     @Override
     public void onResume() {
         super.onResume();
+
         final AccessibilityManager am = getPrefContext().getSystemService(
                 AccessibilityManager.class);
         am.addTouchExplorationStateChangeListener(mTouchExplorationStateChangeListener);
@@ -260,7 +203,10 @@
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(EXTRA_SHORTCUT_TYPE, mUserShortcutTypesCache);
+        final int value = getShortcutTypeCheckBoxValue();
+        if (value != NOT_SET) {
+            outState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE, value);
+        }
         super.onSaveInstanceState(outState);
     }
 
@@ -273,7 +219,7 @@
                         R.string.accessibility_shortcut_title, mPackageName);
                 dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
                         getPrefContext(), dialogTitle, this::callOnAlertDialogCheckboxClicked);
-                initializeDialogCheckBox(dialog);
+                setupEditShortcutDialog(dialog);
                 return dialog;
             case DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL:
                 dialog = AccessibilityGestureNavigationTutorial
@@ -365,7 +311,7 @@
     abstract int getUserShortcutTypes();
 
     protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
-        switchPreference.setTitle(R.string.accessibility_service_master_switch_title);
+        switchPreference.setTitle(R.string.accessibility_service_primary_switch_title);
     }
 
     protected abstract void onPreferenceToggled(String preferenceKey, boolean enabled);
@@ -432,8 +378,8 @@
         mImageGetterCacheView.setImageURI(null);
         final int imageWidth = drawable.getIntrinsicWidth();
         final int imageHeight = drawable.getIntrinsicHeight();
-        final int screenHalfHeight = getScreenHeightPixels(getPrefContext()) / /* half */ 2;
-        if ((imageWidth > getScreenWidthPixels(getPrefContext()))
+        final int screenHalfHeight = AccessibilityUtil.getScreenHeightPixels(getPrefContext()) / 2;
+        if ((imageWidth > AccessibilityUtil.getScreenWidthPixels(getPrefContext()))
                 || (imageHeight > screenHalfHeight)) {
             return null;
         }
@@ -444,60 +390,109 @@
         return drawable;
     }
 
-    static final class AccessibilityUserShortcutType {
-        private static final char COMPONENT_NAME_SEPARATOR = ':';
-        private static final TextUtils.SimpleStringSplitter sStringColonSplitter =
-                new TextUtils.SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
-
-        private String mComponentName;
-        private int mType;
-
-        AccessibilityUserShortcutType(String componentName, int type) {
-            this.mComponentName = componentName;
-            this.mType = type;
+    private void initAnimatedImagePreference() {
+        if (mImageUri == null) {
+            return;
         }
 
-        AccessibilityUserShortcutType(String flattenedString) {
-            sStringColonSplitter.setString(flattenedString);
-            if (sStringColonSplitter.hasNext()) {
-                this.mComponentName = sStringColonSplitter.next();
-                this.mType = Integer.parseInt(sStringColonSplitter.next());
-            }
+        final int screenHalfHeight = AccessibilityUtil.getScreenHeightPixels(getPrefContext()) / 2;
+        final AnimatedImagePreference animatedImagePreference =
+                new AnimatedImagePreference(getPrefContext());
+        animatedImagePreference.setImageUri(mImageUri);
+        animatedImagePreference.setSelectable(false);
+        animatedImagePreference.setMaxHeight(screenHalfHeight);
+
+        getPreferenceScreen().addPreference(animatedImagePreference);
+    }
+
+    private void initToggleServiceDividerSwitchPreference() {
+        mToggleServiceDividerSwitchPreference = new DividerSwitchPreference(getPrefContext());
+        mToggleServiceDividerSwitchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
+        if (getArguments().containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
+            final boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);
+            mToggleServiceDividerSwitchPreference.setChecked(enabled);
         }
 
-        String getComponentName() {
-            return mComponentName;
+        getPreferenceScreen().addPreference(mToggleServiceDividerSwitchPreference);
+    }
+
+    private void initGeneralCategory() {
+        final PreferenceCategory generalCategory = new PreferenceCategory(getPrefContext());
+        generalCategory.setKey(KEY_GENERAL_CATEGORY);
+        generalCategory.setTitle(R.string.accessibility_screen_option);
+
+        getPreferenceScreen().addPreference(generalCategory);
+    }
+
+    protected void initShortcutPreference() {
+        // Initial the shortcut preference.
+        mShortcutPreference = new ShortcutPreference(getPrefContext(), /* attrs= */ null);
+        mShortcutPreference.setPersistent(false);
+        mShortcutPreference.setKey(getShortcutPreferenceKey());
+        mShortcutPreference.setOnClickCallback(this);
+
+        final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
+        mShortcutPreference.setTitle(title);
+
+        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
+        generalCategory.addPreference(mShortcutPreference);
+    }
+
+    protected void initSettingsPreference() {
+        if (mSettingsTitle == null || mSettingsIntent == null) {
+            return;
         }
 
-        void setComponentName(String componentName) {
-            this.mComponentName = componentName;
+        // Show the "Settings" menu as if it were a preference screen.
+        mSettingsPreference = new Preference(getPrefContext());
+        mSettingsPreference.setTitle(mSettingsTitle);
+        mSettingsPreference.setIconSpaceReserved(true);
+        mSettingsPreference.setIntent(mSettingsIntent);
+
+        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
+        generalCategory.addPreference(mSettingsPreference);
+    }
+
+    private void initIntroductionCategory() {
+        final PreferenceCategory introductionCategory = new PreferenceCategory(getPrefContext());
+        final CharSequence title =
+                getString(R.string.accessibility_introduction_title, mPackageName);
+        introductionCategory.setKey(KEY_INTRODUCTION_CATEGORY);
+        introductionCategory.setTitle(title);
+
+        getPreferenceScreen().addPreference(introductionCategory);
+    }
+
+    private void initHtmlTextPreference() {
+        if (TextUtils.isEmpty(mHtmlDescription)) {
+            return;
         }
 
-        int getType() {
-            return mType;
+        initIntroductionCategory();
+
+        final HtmlTextPreference htmlTextPreference = new HtmlTextPreference(getPrefContext());
+        htmlTextPreference.setSummary(mHtmlDescription);
+        htmlTextPreference.setImageGetter(mImageGetter);
+        htmlTextPreference.setSelectable(false);
+
+        final PreferenceCategory introductionCategory = findPreference(KEY_INTRODUCTION_CATEGORY);
+        introductionCategory.addPreference(htmlTextPreference);
+    }
+
+    private void initFooterPreference() {
+        if (!TextUtils.isEmpty(mDescription)) {
+            createFooterPreference(mDescription);
         }
 
-        void setType(int type) {
-            this.mType = type;
-        }
-
-        String flattenToString() {
-            final StringJoiner joiner = new StringJoiner(String.valueOf(COMPONENT_NAME_SEPARATOR));
-            joiner.add(mComponentName);
-            joiner.add(String.valueOf(mType));
-            return joiner.toString();
+        if (TextUtils.isEmpty(mHtmlDescription) && TextUtils.isEmpty(mDescription)) {
+            final CharSequence defaultDescription =
+                    getText(R.string.accessibility_service_default_description);
+            createFooterPreference(defaultDescription);
         }
     }
 
-    private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
-        final View dialogTextArea = dialogView.findViewById(R.id.container);
-        dialogTextArea.setOnClickListener(v -> {
-            checkBox.toggle();
-            updateUserShortcutType(/* saveChanges= */ false);
-        });
-    }
-
-    private void initializeDialogCheckBox(Dialog dialog) {
+    @VisibleForTesting
+    void setupEditShortcutDialog(Dialog dialog) {
         final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
         mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
         setDialogTextAreaClickListener(dialogSoftwareView, mSoftwareTypeCheckBox);
@@ -506,57 +501,58 @@
         mHardwareTypeCheckBox = dialogHardwareView.findViewById(R.id.checkbox);
         setDialogTextAreaClickListener(dialogHardwareView, mHardwareTypeCheckBox);
 
-        updateAlertDialogCheckState();
+        updateEditShortcutDialogCheckBox();
     }
 
-    private void updateAlertDialogCheckState() {
-        if (mUserShortcutTypesCache != UserShortcutType.EMPTY) {
-            updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);
-            updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);
+    private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
+        final View dialogTextArea = dialogView.findViewById(R.id.container);
+        dialogTextArea.setOnClickListener(v -> checkBox.toggle());
+    }
+
+    private void updateEditShortcutDialogCheckBox() {
+        // If it is during onConfigChanged process then restore the value, or get the saved value
+        // when shortcutPreference is checked.
+        int value = restoreOnConfigChangedValue();
+        if (value == NOT_SET) {
+            final int lastNonEmptyUserShortcutType = PreferredShortcuts.retrieveUserShortcutType(
+                    getPrefContext(), mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+            value = mShortcutPreference.isChecked() ? lastNonEmptyUserShortcutType
+                    : UserShortcutType.EMPTY;
         }
+
+        mSoftwareTypeCheckBox.setChecked(
+                hasShortcutType(value, UserShortcutType.SOFTWARE));
+        mHardwareTypeCheckBox.setChecked(
+                hasShortcutType(value, UserShortcutType.HARDWARE));
     }
 
-    private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {
-        checkBox.setChecked((mUserShortcutTypesCache & type) == type);
+    private int restoreOnConfigChangedValue() {
+        final int savedValue = mSavedCheckBoxValue;
+        mSavedCheckBoxValue = NOT_SET;
+        return savedValue;
     }
 
-    private void updateUserShortcutType(boolean saveChanges) {
-        mUserShortcutTypesCache = UserShortcutType.EMPTY;
+    private boolean hasShortcutType(int value, @UserShortcutType int type) {
+        return (value & type) == type;
+    }
+
+    /**
+     * Returns accumulated {@link UserShortcutType} checkbox value or {@code NOT_SET} if checkboxes
+     * did not exist.
+     */
+    protected int getShortcutTypeCheckBoxValue() {
+        if (mSoftwareTypeCheckBox == null || mHardwareTypeCheckBox == null) {
+            return NOT_SET;
+        }
+
+        int value = UserShortcutType.EMPTY;
         if (mSoftwareTypeCheckBox.isChecked()) {
-            mUserShortcutTypesCache |= UserShortcutType.SOFTWARE;
+            value |= UserShortcutType.SOFTWARE;
         }
         if (mHardwareTypeCheckBox.isChecked()) {
-            mUserShortcutTypesCache |= UserShortcutType.HARDWARE;
+            value |= UserShortcutType.HARDWARE;
         }
-
-        if (saveChanges) {
-            final boolean isChanged = (mUserShortcutTypesCache != UserShortcutType.EMPTY);
-            if (isChanged) {
-                setUserShortcutType(getPrefContext(), mUserShortcutTypesCache);
-            }
-            mUserShortcutTypes = mUserShortcutTypesCache;
-        }
-    }
-
-    private void setUserShortcutType(Context context, int type) {
-        if (mComponentName == null) {
-            return;
-        }
-
-        Set<String> info = SharedPreferenceUtils.getUserShortcutTypes(context);
-        final String componentName = mComponentName.flattenToString();
-        if (info.isEmpty()) {
-            info = new HashSet<>();
-        } else {
-            final Set<String> filtered = info.stream()
-                    .filter(str -> str.contains(componentName))
-                    .collect(Collectors.toSet());
-            info.removeAll(filtered);
-        }
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
-                componentName, type);
-        info.add(shortcut.flattenToString());
-        SharedPreferenceUtils.setUserShortcutType(context, info);
+        return value;
     }
 
     protected CharSequence getShortcutTypeSummary(Context context) {
@@ -568,7 +564,8 @@
             return context.getText(R.string.switch_off_text);
         }
 
-        final int shortcutTypes = getUserShortcutTypes(context, UserShortcutType.SOFTWARE);
+        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(context,
+                mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         int resId = R.string.accessibility_shortcut_edit_summary_software;
         if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
             resId = AccessibilityUtil.isTouchExploreEnabled(context)
@@ -597,25 +594,6 @@
                 null, joinStrings);
     }
 
-    protected int getUserShortcutTypes(Context context, @UserShortcutType int defaultValue) {
-        if (mComponentName == null) {
-            return defaultValue;
-        }
-
-        final Set<String> info = SharedPreferenceUtils.getUserShortcutTypes(context);
-        final String componentName = mComponentName.flattenToString();
-        final Set<String> filtered = info.stream()
-                .filter(str -> str.contains(componentName))
-                .collect(Collectors.toSet());
-        if (filtered.isEmpty()) {
-            return defaultValue;
-        }
-
-        final String str = (String) filtered.toArray()[0];
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(str);
-        return shortcut.getType();
-    }
-
     /**
      * This method will be invoked when a button in the edit shortcut dialog is clicked.
      *
@@ -627,14 +605,13 @@
             return;
         }
 
-        updateUserShortcutType(/* saveChanges= */ true);
-        AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), mUserShortcutTypes,
-                mComponentName);
-        AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), ~mUserShortcutTypes,
-                mComponentName);
-        mShortcutPreference.setChecked(mUserShortcutTypes != UserShortcutType.EMPTY);
-        mShortcutPreference.setSummary(
-                getShortcutTypeSummary(getPrefContext()));
+        final int value = getShortcutTypeCheckBoxValue();
+
+        saveNonEmptyUserShortcutType(value);
+        AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), value, mComponentName);
+        AccessibilityUtil.optOutAllValuesFromSettings(getPrefContext(), ~value, mComponentName);
+        mShortcutPreference.setChecked(value != UserShortcutType.EMPTY);
+        mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
     }
 
     protected void updateShortcutPreferenceData() {
@@ -642,47 +619,29 @@
             return;
         }
 
-        // Get the user shortcut type from settings provider.
-        mUserShortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
-                mComponentName);
-        if (mUserShortcutTypes != UserShortcutType.EMPTY) {
-            setUserShortcutType(getPrefContext(), mUserShortcutTypes);
-        } else {
-            //  Get the user shortcut type from shared_prefs if cannot get from settings provider.
-            mUserShortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = AccessibilityUtil.getUserShortcutTypesFromSettings(
+                getPrefContext(), mComponentName);
+        if (shortcutTypes != UserShortcutType.EMPTY) {
+            final PreferredShortcut shortcut = new PreferredShortcut(
+                    mComponentName.flattenToString(), shortcutTypes);
+            PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
         }
     }
 
-    private void initShortcutPreference(Bundle savedInstanceState) {
-        // Restore the user shortcut type.
-        if (savedInstanceState != null && savedInstanceState.containsKey(EXTRA_SHORTCUT_TYPE)) {
-            mUserShortcutTypesCache = savedInstanceState.getInt(EXTRA_SHORTCUT_TYPE,
-                    UserShortcutType.EMPTY);
-        }
-
-        // Initial the shortcut preference.
-        mShortcutPreference = new ShortcutPreference(getPrefContext(), null);
-        mShortcutPreference.setPersistent(false);
-        mShortcutPreference.setKey(getShortcutPreferenceKey());
-        mShortcutPreference.setOnClickCallback(this);
-
-        final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
-        mShortcutPreference.setTitle(title);
-    }
-
     protected void updateShortcutPreference() {
         if (mComponentName == null) {
             return;
         }
 
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
+                mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         mShortcutPreference.setChecked(
-                    AccessibilityUtil.hasValuesInSettings(getPrefContext(), shortcutTypes,
-                            mComponentName));
+                AccessibilityUtil.hasValuesInSettings(getPrefContext(), shortcutTypes,
+                        mComponentName));
         mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
     }
 
-    private String getShortcutPreferenceKey() {
+    protected String getShortcutPreferenceKey() {
         return KEY_SHORTCUT_PREFERENCE;
     }
 
@@ -692,7 +651,8 @@
             return;
         }
 
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
+                mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
         if (preference.isChecked()) {
             AccessibilityUtil.optInAllValuesToSettings(getPrefContext(), shortcutTypes,
                     mComponentName);
@@ -706,10 +666,7 @@
 
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
-        // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.
-        mUserShortcutTypesCache = mShortcutPreference.isChecked()
-                ? getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE)
-                : UserShortcutType.EMPTY;
+        showDialog(DialogEnums.EDIT_SHORTCUT);
     }
 
     private void createFooterPreference(CharSequence title) {
@@ -745,4 +702,15 @@
                     shortcutName.flattenToString());
         }
     }
+
+    @VisibleForTesting
+    void saveNonEmptyUserShortcutType(int type) {
+        if (type == UserShortcutType.EMPTY) {
+            return;
+        }
+
+        final PreferredShortcut shortcut = new PreferredShortcut(
+                mComponentName.flattenToString(), type);
+        PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
+    }
 }
diff --git a/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
new file mode 100644
index 0000000..5562795
--- /dev/null
+++ b/src/com/android/settings/accessibility/ToggleReduceBrightColorsPreferenceFragment.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.provider.Settings;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.internal.accessibility.AccessibilityShortcutController;
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** Settings for reducing brightness. */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class ToggleReduceBrightColorsPreferenceFragment extends ToggleFeaturePreferenceFragment {
+    private static final String REDUCE_BRIGHT_COLORS_ACTIVATED_KEY =
+            Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED;
+    private static final String KEY_INTENSITY = "rbc_intensity";
+    private static final String KEY_PERSIST = "rbc_persist";
+
+    private final Handler mHandler = new Handler();
+    private SettingsContentObserver mSettingsContentObserver;
+    private ReduceBrightColorsIntensityPreferenceController mRbcIntensityPreferenceController;
+    private ReduceBrightColorsPersistencePreferenceController mRbcPersistencePreferenceController;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+
+        // TODO(b/170973645): Add banner
+        mComponentName = AccessibilityShortcutController.REDUCE_BRIGHT_COLORS_COMPONENT_NAME;
+        mPackageName = getText(R.string.reduce_bright_colors_preference_title);
+        mHtmlDescription = getText(R.string.reduce_bright_colors_preference_subtitle);
+        final List<String> enableServiceFeatureKeys = new ArrayList<>(/* initialCapacity= */ 1);
+        enableServiceFeatureKeys.add(REDUCE_BRIGHT_COLORS_ACTIVATED_KEY);
+        mRbcIntensityPreferenceController =
+                new ReduceBrightColorsIntensityPreferenceController(getContext(), KEY_INTENSITY);
+        mRbcPersistencePreferenceController =
+                new ReduceBrightColorsPersistencePreferenceController(getContext(), KEY_PERSIST);
+        mRbcIntensityPreferenceController.displayPreference(getPreferenceScreen());
+        mRbcPersistencePreferenceController.displayPreference(getPreferenceScreen());
+        mSettingsContentObserver = new SettingsContentObserver(mHandler, enableServiceFeatureKeys) {
+            @Override
+            public void onChange(boolean selfChange, Uri uri) {
+                    updateSwitchBarToggleSwitch();
+            }
+        };
+
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        updatePreferenceOrder();
+    }
+
+    /** Customizes the order by preference key. */
+    private List<String> getPreferenceOrderList() {
+        final List<String> lists = new ArrayList<>();
+        lists.add(KEY_USE_SERVICE_PREFERENCE);
+        lists.add(KEY_INTENSITY);
+        lists.add(KEY_GENERAL_CATEGORY);
+        lists.add(KEY_PERSIST);
+        lists.add(KEY_INTRODUCTION_CATEGORY);
+        return lists;
+    }
+
+    private void updatePreferenceOrder() {
+        final List<String> lists = getPreferenceOrderList();
+        final PreferenceScreen preferenceScreen = getPreferenceScreen();
+        preferenceScreen.setOrderingAsAdded(false);
+
+        final int size = lists.size();
+        for (int i = 0; i < size; i++) {
+            final Preference preference = preferenceScreen.findPreference(lists.get(i));
+            if (preference != null) {
+                preference.setOrder(i);
+            }
+        }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateSwitchBarToggleSwitch();
+        mSettingsContentObserver.register(getContentResolver());
+    }
+
+    @Override
+    public void onPause() {
+        mSettingsContentObserver.unregister(getContentResolver());
+        super.onPause();
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.REDUCE_BRIGHT_COLORS_SETTINGS;
+    }
+
+    @Override
+    public int getHelpResource() {
+        // TODO(170973645): Link to help support page
+        return 0;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.reduce_bright_colors_settings;
+    }
+
+
+    @Override
+    protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        AccessibilityStatsLogUtils.logAccessibilityServiceEnabled(mComponentName, enabled);
+        Settings.Secure.putInt(getContentResolver(),
+                REDUCE_BRIGHT_COLORS_ACTIVATED_KEY, enabled ? ON : OFF);
+    }
+
+    @Override
+    protected void onRemoveSwitchPreferenceToggleSwitch() {
+        super.onRemoveSwitchPreferenceToggleSwitch();
+        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener(
+                /* onPreferenceClickListener= */ null);
+    }
+
+    @Override
+    protected void updateToggleServiceTitle(SwitchPreference switchPreference) {
+        switchPreference.setTitle(R.string.reduce_bright_colors_switch_title);
+    }
+
+    @Override
+    protected void onInstallSwitchPreferenceToggleSwitch() {
+        super.onInstallSwitchPreferenceToggleSwitch();
+        updateSwitchBarToggleSwitch();
+        mToggleServiceDividerSwitchPreference.setOnPreferenceClickListener((preference) -> {
+            boolean checked = ((SwitchPreference) preference).isChecked();
+            onPreferenceToggled(mPreferenceKey, checked);
+            return false;
+        });
+    }
+
+    @Override
+    int getUserShortcutTypes() {
+        return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
+                mComponentName);
+    }
+
+    private void updateSwitchBarToggleSwitch() {
+        final boolean checked = Settings.Secure.getInt(getContentResolver(),
+                REDUCE_BRIGHT_COLORS_ACTIVATED_KEY, OFF) == ON;
+        mRbcIntensityPreferenceController.updateState(getPreferenceScreen()
+                .findPreference(KEY_INTENSITY));
+        mRbcPersistencePreferenceController.updateState(getPreferenceScreen()
+                .findPreference(KEY_PERSIST));
+        if (mToggleServiceDividerSwitchPreference.isChecked() != checked) {
+            mToggleServiceDividerSwitchPreference.setChecked(checked);
+        }
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.reduce_bright_colors_settings) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    // TODO(b/170970675): call into CDS to get availability/config status
+                    return true;
+                }
+            };
+}
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 0b221e5..8e14e5a 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -38,18 +38,17 @@
 import android.widget.CheckBox;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Set;
 import java.util.StringJoiner;
-import java.util.stream.Collectors;
 
 /**
  * Fragment that shows the actual UI for providing basic magnification accessibility service setup
@@ -57,18 +56,13 @@
  */
 public class ToggleScreenMagnificationPreferenceFragment extends
         ToggleFeaturePreferenceFragment {
-
-    private static final String EXTRA_SHORTCUT_TYPE = "shortcut_type";
-    private static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
+    // TODO(b/147021230): Move duplicated functions with android/internal/accessibility into util.
     private TouchExplorationStateChangeListener mTouchExplorationStateChangeListener;
-    private int mUserShortcutType = UserShortcutType.EMPTY;
+
     private CheckBox mSoftwareTypeCheckBox;
     private CheckBox mHardwareTypeCheckBox;
     private CheckBox mTripleTapTypeCheckBox;
 
-    // TODO(b/147021230): Will move common functions and variables to
-    //  android/internal/accessibility folder. For now, magnification need to be treated
-    //  individually.
     private static final char COMPONENT_NAME_SEPARATOR = ':';
     private static final TextUtils.SimpleStringSplitter sStringColonSplitter =
             new TextUtils.SimpleStringSplitter(COMPONENT_NAME_SEPARATOR);
@@ -95,28 +89,12 @@
     }
 
     @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        initShortcutPreference();
-
-        super.onViewCreated(view, savedInstanceState);
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        outState.putInt(EXTRA_SHORTCUT_TYPE, mUserShortcutTypesCache);
-        super.onSaveInstanceState(outState);
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
 
         final AccessibilityManager am = getPrefContext().getSystemService(
                 AccessibilityManager.class);
         am.addTouchExplorationStateChangeListener(mTouchExplorationStateChangeListener);
-
-        updateShortcutPreferenceData();
-        updateShortcutPreference();
     }
 
     @Override
@@ -141,22 +119,45 @@
                 dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
                                 getPrefContext(), dialogTitle,
                                 this::callOnAlertDialogCheckboxClicked);
-                initializeDialogCheckBox(dialog);
+                setupMagnificationEditShortcutDialog(dialog);
                 return dialog;
             default:
                 return super.onCreateDialog(dialogId);
         }
     }
 
-    private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
-        final View dialogTextArea = dialogView.findViewById(R.id.container);
-        dialogTextArea.setOnClickListener(v -> {
-            checkBox.toggle();
-            updateUserShortcutType(/* saveChanges= */ false);
-        });
+    @Override
+    protected void initSettingsPreference() {
+        mSettingsPreference = new Preference(getPrefContext());
+        mSettingsPreference.setTitle(R.string.accessibility_menu_item_settings);
+        mSettingsPreference.setFragment(MagnificationSettingsFragment.class.getName());
+        mSettingsPreference.setPersistent(false);
+
+        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
+        generalCategory.addPreference(mSettingsPreference);
     }
 
-    private void initializeDialogCheckBox(AlertDialog dialog) {
+    @Override
+    protected int getShortcutTypeCheckBoxValue() {
+        if (mSoftwareTypeCheckBox == null || mHardwareTypeCheckBox == null) {
+            return NOT_SET;
+        }
+
+        int value = UserShortcutType.EMPTY;
+        if (mSoftwareTypeCheckBox.isChecked()) {
+            value |= UserShortcutType.SOFTWARE;
+        }
+        if (mHardwareTypeCheckBox.isChecked()) {
+            value |= UserShortcutType.HARDWARE;
+        }
+        if (mTripleTapTypeCheckBox.isChecked()) {
+            value |= UserShortcutType.TRIPLETAP;
+        }
+        return value;
+    }
+
+    @VisibleForTesting
+    void setupMagnificationEditShortcutDialog(AlertDialog dialog) {
         final View dialogSoftwareView = dialog.findViewById(R.id.software_shortcut);
         mSoftwareTypeCheckBox = dialogSoftwareView.findViewById(R.id.checkbox);
         setDialogTextAreaClickListener(dialogSoftwareView, mSoftwareTypeCheckBox);
@@ -170,67 +171,46 @@
         setDialogTextAreaClickListener(dialogTripleTapView, mTripleTapTypeCheckBox);
 
         final View advancedView = dialog.findViewById(R.id.advanced_shortcut);
-        updateAlertDialogCheckState();
-
-        // Window magnification mode doesn't support advancedView.
-        if (isWindowMagnification(getPrefContext())) {
-            advancedView.setVisibility(View.GONE);
-            return;
-        }
-        // Shows the triple tap checkbox directly if clicked.
         if (mTripleTapTypeCheckBox.isChecked()) {
             advancedView.setVisibility(View.GONE);
             dialogTripleTapView.setVisibility(View.VISIBLE);
         }
+
+        updateMagnificationEditShortcutDialogCheckBox();
     }
 
-    private void updateAlertDialogCheckState() {
-        if (mUserShortcutTypesCache != UserShortcutType.EMPTY) {
-            updateCheckStatus(mSoftwareTypeCheckBox, UserShortcutType.SOFTWARE);
-            updateCheckStatus(mHardwareTypeCheckBox, UserShortcutType.HARDWARE);
-            updateCheckStatus(mTripleTapTypeCheckBox, UserShortcutType.TRIPLETAP);
-        }
+    private void setDialogTextAreaClickListener(View dialogView, CheckBox checkBox) {
+        final View dialogTextArea = dialogView.findViewById(R.id.container);
+        dialogTextArea.setOnClickListener(v -> checkBox.toggle());
     }
 
-    private void updateCheckStatus(CheckBox checkBox, @UserShortcutType int type) {
-        checkBox.setChecked((mUserShortcutTypesCache & type) == type);
+    private void updateMagnificationEditShortcutDialogCheckBox() {
+        // If it is during onConfigChanged process then restore the value, or get the saved value
+        // when shortcutPreference is checked.
+        int value = restoreOnConfigChangedValue();
+        if (value == NOT_SET) {
+            final int lastNonEmptyUserShortcutType = PreferredShortcuts.retrieveUserShortcutType(
+                    getPrefContext(), MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+            value = mShortcutPreference.isChecked() ? lastNonEmptyUserShortcutType
+                    : UserShortcutType.EMPTY;
+        }
+
+        mSoftwareTypeCheckBox.setChecked(
+                hasShortcutType(value, UserShortcutType.SOFTWARE));
+        mHardwareTypeCheckBox.setChecked(
+                hasShortcutType(value, UserShortcutType.HARDWARE));
+        mTripleTapTypeCheckBox.setChecked(
+                hasShortcutType(value, UserShortcutType.TRIPLETAP));
     }
 
-    private void updateUserShortcutType(boolean saveChanges) {
-        mUserShortcutTypesCache = UserShortcutType.EMPTY;
-        if (mSoftwareTypeCheckBox.isChecked()) {
-            mUserShortcutTypesCache |= UserShortcutType.SOFTWARE;
-        }
-        if (mHardwareTypeCheckBox.isChecked()) {
-            mUserShortcutTypesCache |= UserShortcutType.HARDWARE;
-        }
-        if (mTripleTapTypeCheckBox.isChecked()) {
-            mUserShortcutTypesCache |= UserShortcutType.TRIPLETAP;
-        }
-
-        if (saveChanges) {
-            final boolean isChanged = (mUserShortcutTypesCache != UserShortcutType.EMPTY);
-            if (isChanged) {
-                setUserShortcutType(getPrefContext(), mUserShortcutTypesCache);
-            }
-            mUserShortcutType = mUserShortcutTypesCache;
-        }
+    private int restoreOnConfigChangedValue() {
+        final int savedValue = mSavedCheckBoxValue;
+        mSavedCheckBoxValue = NOT_SET;
+        return savedValue;
     }
 
-    private void setUserShortcutType(Context context, int type) {
-        Set<String> info = SharedPreferenceUtils.getUserShortcutTypes(context);
-        if (info.isEmpty()) {
-            info = new HashSet<>();
-        } else {
-            final Set<String> filtered = info.stream().filter(
-                    str -> str.contains(MAGNIFICATION_CONTROLLER_NAME)).collect(
-                    Collectors.toSet());
-            info.removeAll(filtered);
-        }
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
-                MAGNIFICATION_CONTROLLER_NAME, type);
-        info.add(shortcut.flattenToString());
-        SharedPreferenceUtils.setUserShortcutType(context, info);
+    private boolean hasShortcutType(int value, @UserShortcutType int type) {
+        return (value & type) == type;
     }
 
     @Override
@@ -239,7 +219,8 @@
             return context.getText(R.string.switch_off_text);
         }
 
-        final int shortcutType = getUserShortcutTypes(context, UserShortcutType.EMPTY);
+        final int shortcutType = PreferredShortcuts.retrieveUserShortcutType(context,
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
         int resId = R.string.accessibility_shortcut_edit_summary_software;
         if (AccessibilityUtil.isGestureNavigateEnabled(context)) {
             resId = AccessibilityUtil.isTouchExploreEnabled(context)
@@ -275,26 +256,13 @@
     }
 
     @Override
-    protected int getUserShortcutTypes(Context context, @UserShortcutType int defaultValue) {
-        final Set<String> info = SharedPreferenceUtils.getUserShortcutTypes(context);
-        final Set<String> filtered = info.stream().filter(
-                str -> str.contains(MAGNIFICATION_CONTROLLER_NAME)).collect(
-                Collectors.toSet());
-        if (filtered.isEmpty()) {
-            return defaultValue;
-        }
-
-        final String str = (String) filtered.toArray()[0];
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(str);
-        return shortcut.getType();
-    }
-
-    @Override
     protected void callOnAlertDialogCheckboxClicked(DialogInterface dialog, int which) {
-        updateUserShortcutType(/* saveChanges= */ true);
-        optInAllMagnificationValuesToSettings(getPrefContext(), mUserShortcutType);
-        optOutAllMagnificationValuesFromSettings(getPrefContext(), ~mUserShortcutType);
-        mShortcutPreference.setChecked(mUserShortcutType != UserShortcutType.EMPTY);
+        final int value = getShortcutTypeCheckBoxValue();
+
+        saveNonEmptyUserShortcutType(value);
+        optInAllMagnificationValuesToSettings(getPrefContext(), value);
+        optOutAllMagnificationValuesFromSettings(getPrefContext(), ~value);
+        mShortcutPreference.setChecked(value != UserShortcutType.EMPTY);
         mShortcutPreference.setSummary(
                 getShortcutTypeSummary(getPrefContext()));
     }
@@ -342,7 +310,8 @@
 
     @Override
     public void onToggleClicked(ShortcutPreference preference) {
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
         if (preference.isChecked()) {
             optInAllMagnificationValuesToSettings(getPrefContext(), shortcutTypes);
             showDialog(DialogEnums.LAUNCH_ACCESSIBILITY_TUTORIAL);
@@ -354,45 +323,55 @@
 
     @Override
     public void onSettingsClicked(ShortcutPreference preference) {
-        // Do not restore shortcut in shortcut chooser dialog when shortcutPreference is turned off.
-        mUserShortcutTypesCache = mShortcutPreference.isChecked()
-                ? getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE)
-                : UserShortcutType.EMPTY;
         showDialog(DialogEnums.MAGNIFICATION_EDIT_SHORTCUT);
     }
 
     @Override
     protected void updateShortcutPreferenceData() {
-        // Get the user shortcut type from settings provider.
-        mUserShortcutType = getUserShortcutTypeFromSettings(getPrefContext());
-        if (mUserShortcutType != UserShortcutType.EMPTY) {
-            setUserShortcutType(getPrefContext(), mUserShortcutType);
-        } else {
-            //  Get the user shortcut type from shared_prefs if cannot get from settings provider.
-            mUserShortcutType = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = getUserShortcutTypeFromSettings(getPrefContext());
+        if (shortcutTypes != UserShortcutType.EMPTY) {
+            final PreferredShortcut shortcut = new PreferredShortcut(
+                    MAGNIFICATION_CONTROLLER_NAME, shortcutTypes);
+            PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
         }
     }
 
-    private void initShortcutPreference() {
+    @Override
+    protected void initShortcutPreference() {
         mShortcutPreference = new ShortcutPreference(getPrefContext(), null);
         mShortcutPreference.setPersistent(false);
-        mShortcutPreference.setKey(KEY_SHORTCUT_PREFERENCE);
+        mShortcutPreference.setKey(getShortcutPreferenceKey());
         mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
         mShortcutPreference.setOnClickCallback(this);
 
         final CharSequence title = getString(R.string.accessibility_shortcut_title, mPackageName);
         mShortcutPreference.setTitle(title);
+
+        final PreferenceCategory generalCategory = findPreference(KEY_GENERAL_CATEGORY);
+        generalCategory.addPreference(mShortcutPreference);
     }
 
     @Override
     protected void updateShortcutPreference() {
-        final int shortcutTypes = getUserShortcutTypes(getPrefContext(), UserShortcutType.SOFTWARE);
+        final int shortcutTypes = PreferredShortcuts.retrieveUserShortcutType(getPrefContext(),
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
         mShortcutPreference.setChecked(
                 hasMagnificationValuesInSettings(getPrefContext(), shortcutTypes));
         mShortcutPreference.setSummary(getShortcutTypeSummary(getPrefContext()));
     }
 
     @VisibleForTesting
+    void saveNonEmptyUserShortcutType(int type) {
+        if (type == UserShortcutType.EMPTY) {
+            return;
+        }
+
+        final PreferredShortcut shortcut = new PreferredShortcut(
+                MAGNIFICATION_CONTROLLER_NAME, type);
+        PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
+    }
+
+    @VisibleForTesting
     static void optInAllMagnificationValuesToSettings(Context context, int shortcutTypes) {
         if ((shortcutTypes & UserShortcutType.SOFTWARE) == UserShortcutType.SOFTWARE) {
             optInMagnificationValueToSettings(context, UserShortcutType.SOFTWARE);
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
index 3b786ff..bea528a 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentForSetupWizard.java
@@ -18,6 +18,7 @@
 
 import android.app.settings.SettingsEnums;
 import android.os.Bundle;
+import android.view.View;
 
 public class ToggleScreenMagnificationPreferenceFragmentForSetupWizard
         extends ToggleScreenMagnificationPreferenceFragment {
@@ -42,4 +43,12 @@
         }
         super.onStop();
     }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+
+        // Hide the setting from the vision settings.
+        mSettingsPreference.setVisible(false);
+    }
 }
diff --git a/src/com/android/settings/accessibility/VideoPlayer.java b/src/com/android/settings/accessibility/VideoPlayer.java
index 8f94b76..d4aa6a6 100644
--- a/src/com/android/settings/accessibility/VideoPlayer.java
+++ b/src/com/android/settings/accessibility/VideoPlayer.java
@@ -25,6 +25,7 @@
 
 import androidx.annotation.GuardedBy;
 import androidx.annotation.RawRes;
+import androidx.annotation.VisibleForTesting;
 
 /**
  * Plays the video by {@link MediaPlayer} on {@link TextureView}, calls {@link #create(Context, int,
@@ -32,19 +33,25 @@
  * is no longer used, call {@link #release()} so that MediaPlayer object can be released.
  */
 public class VideoPlayer implements SurfaceTextureListener {
-    private final Context context;
-    private final Object mediaPlayerLock = new Object();
+    private final Context mContext;
+    private final Object mMediaPlayerLock = new Object();
     // Media player object can't be used after it has been released, so it will be set to null. But
     // VideoPlayer is asynchronized, media player object might be paused or resumed again before
     // released media player is set to null. Therefore, lock mediaPlayer and mediaPlayerState by
     // mediaPlayerLock keep their states consistent.
+    @VisibleForTesting
     @GuardedBy("mediaPlayerLock")
-    private MediaPlayer mediaPlayer;
+    MediaPlayer mMediaPlayer;
+
+    @VisibleForTesting
     @GuardedBy("mediaPlayerLock")
-    private State mediaPlayerState = State.NONE;
+    State mMediaPlayerState = State.NONE;
+
     @RawRes
-    private final int videoRes;
-    private Surface animationSurface;
+    private final int mVideoRes;
+
+    @VisibleForTesting
+    Surface mAnimationSurface;
 
 
     /**
@@ -58,54 +65,54 @@
     }
 
     private VideoPlayer(Context context, @RawRes int videoRes, TextureView textureView) {
-        this.context = context;
-        this.videoRes = videoRes;
+        this.mContext = context;
+        this.mVideoRes = videoRes;
         textureView.setSurfaceTextureListener(this);
     }
 
     public void pause() {
-        synchronized (mediaPlayerLock) {
-            if (mediaPlayerState == State.STARTED) {
-                mediaPlayerState = State.PAUSED;
-                mediaPlayer.pause();
+        synchronized (mMediaPlayerLock) {
+            if (mMediaPlayerState == State.STARTED) {
+                mMediaPlayerState = State.PAUSED;
+                mMediaPlayer.pause();
             }
         }
     }
 
     public void resume() {
-        synchronized (mediaPlayerLock) {
-            if (mediaPlayerState == State.PAUSED) {
-                mediaPlayer.start();
-                mediaPlayerState = State.STARTED;
+        synchronized (mMediaPlayerLock) {
+            if (mMediaPlayerState == State.PAUSED) {
+                mMediaPlayer.start();
+                mMediaPlayerState = State.STARTED;
             }
         }
     }
 
     /** Release media player when it's no longer needed. */
     public void release() {
-        synchronized (mediaPlayerLock) {
-            if (mediaPlayerState != State.NONE && mediaPlayerState != State.END) {
-                mediaPlayerState = State.END;
-                mediaPlayer.release();
-                mediaPlayer = null;
+        synchronized (mMediaPlayerLock) {
+            if (mMediaPlayerState != State.NONE && mMediaPlayerState != State.END) {
+                mMediaPlayerState = State.END;
+                mMediaPlayer.release();
+                mMediaPlayer = null;
             }
         }
-        if (animationSurface != null) {
-            animationSurface.release();
-            animationSurface = null;
+        if (mAnimationSurface != null) {
+            mAnimationSurface.release();
+            mAnimationSurface = null;
         }
     }
 
     @Override
     public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {
-        animationSurface = new Surface(surface);
-        synchronized (mediaPlayerLock) {
-            mediaPlayer = MediaPlayer.create(context, videoRes);
-            mediaPlayerState = State.PREPARED;
-            mediaPlayer.setSurface(animationSurface);
-            mediaPlayer.setLooping(true);
-            mediaPlayer.start();
-            mediaPlayerState = State.STARTED;
+        mAnimationSurface = new Surface(surface);
+        synchronized (mMediaPlayerLock) {
+            mMediaPlayer = MediaPlayer.create(mContext, mVideoRes);
+            mMediaPlayerState = State.PREPARED;
+            mMediaPlayer.setSurface(mAnimationSurface);
+            mMediaPlayer.setLooping(true);
+            mMediaPlayer.start();
+            mMediaPlayerState = State.STARTED;
         }
     }
 
diff --git a/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
index 31f97a8..eccfbce 100644
--- a/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/VolumeShortcutToggleAccessibilityServicePreferenceFragment.java
@@ -24,8 +24,6 @@
 
 import com.android.settings.R;
 
-import com.google.common.collect.ImmutableSet;
-
 /**
  * Fragment that only allowed hardware {@link UserShortcutType} for shortcut to open.
  *
@@ -67,10 +65,9 @@
     }
 
     private void setAllowedPreferredShortcutType(int type) {
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
-                mComponentName.flattenToString(), type);
+        final String componentNameString = mComponentName.flattenToString();
+        final PreferredShortcut shortcut = new PreferredShortcut(componentNameString, type);
 
-        SharedPreferenceUtils.setUserShortcutType(getPrefContext(),
-                ImmutableSet.of(shortcut.flattenToString()));
+        PreferredShortcuts.saveUserShortcutType(getPrefContext(), shortcut);
     }
 }
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index a56dc94..23b6157 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -294,7 +294,7 @@
                     }
                     // if we're enabling sync, this will request a sync as well
                     ContentResolver.setSyncAutomaticallyAsUser(account, authority, syncOn, userId);
-                    // if the master sync switch is off, the request above will
+                    // if the primary sync switch is off, the request above will
                     // get dropped.  when the user clicks on this toggle,
                     // we want to force the sync, however.
                     if (!ContentResolver.getMasterSyncAutomaticallyAsUser(userId) || !syncOn) {
diff --git a/src/com/android/settings/accounts/AddAccountSettings.java b/src/com/android/settings/accounts/AddAccountSettings.java
index d4d93dd..81db4df 100644
--- a/src/com/android/settings/accounts/AddAccountSettings.java
+++ b/src/com/android/settings/accounts/AddAccountSettings.java
@@ -163,11 +163,13 @@
         } else {
             // If the user is locked by fbe: we couldn't start the authenticator. So we must ask the
             // user to unlock it first.
-            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
-            if (!helper.launchConfirmationActivity(UNLOCK_WORK_PROFILE_REQUEST,
-                    getString(R.string.unlock_set_unlock_launch_picker_title),
-                    false,
-                    mUserHandle.getIdentifier())) {
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(this);
+            final boolean launched = builder.setRequestCode(UNLOCK_WORK_PROFILE_REQUEST)
+                    .setTitle(getString(R.string.unlock_set_unlock_launch_picker_title))
+                    .setUserId(mUserHandle.getIdentifier())
+                    .show();
+            if (!launched) {
                 requestChooseAccount();
             }
         }
@@ -237,7 +239,7 @@
          * or broadcasts.
          *
          * Unfortunately for legacy reasons we still need to support this. But
-         * we can cripple the intent so that 3rd party authenticators can't
+         * we can disable the intent so that 3rd party authenticators can't
          * fill in addressing information and launch arbitrary actions.
          */
         Intent identityIntent = new Intent();
@@ -245,7 +247,8 @@
         identityIntent.setAction(SHOULD_NOT_RESOLVE);
         identityIntent.addCategory(SHOULD_NOT_RESOLVE);
 
-        mPendingIntent = PendingIntent.getBroadcast(this, 0, identityIntent, 0);
+        mPendingIntent = PendingIntent.getBroadcast(this, 0, identityIntent,
+                PendingIntent.FLAG_IMMUTABLE);
         addAccountOptions.putParcelable(KEY_CALLER_IDENTITY, mPendingIntent);
         addAccountOptions.putBoolean(EXTRA_HAS_MULTIPLE_USERS, Utils.hasMultipleUsers(this));
         AccountManager.get(this).addAccountAsUser(
diff --git a/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java b/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java
index e4e32e5..7cd746f 100644
--- a/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java
+++ b/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java
@@ -21,9 +21,11 @@
 import android.os.UserHandle;
 import android.text.BidiFormatter;
 import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
 import com.android.settingslib.accounts.AuthenticatorHelper;
 
 import java.util.ArrayList;
@@ -41,6 +43,11 @@
 
     @Override
     public CharSequence getSummary() {
+        // Remove homepage summaries for silky home.
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            return null;
+        }
+
         final AuthenticatorHelper authHelper = new AuthenticatorHelper(mContext,
                 UserHandle.of(UserHandle.myUserId()), null /* OnAccountsUpdateListener */);
         final String[] types = authHelper.getEnabledAccountTypes();
diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
index 8b0f851..84e7bf7 100644
--- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
+++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
@@ -21,12 +21,14 @@
 import android.content.Context;
 import android.os.Bundle;
 import android.provider.SearchIndexableResource;
+import android.util.FeatureFlagUtils;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.notification.EmergencyBroadcastPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -65,6 +67,10 @@
 
     @Override
     protected int getPreferenceScreenResId() {
+        // TODO(b/168166015): Remove this when the new Apps page ready.
+        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
+            return R.xml.apps;
+        }
         return R.xml.app_and_notification;
     }
 
diff --git a/src/com/android/settings/applications/AppStatePowerBridge.java b/src/com/android/settings/applications/AppStatePowerBridge.java
index 31412a7..e5236f0 100644
--- a/src/com/android/settings/applications/AppStatePowerBridge.java
+++ b/src/com/android/settings/applications/AppStatePowerBridge.java
@@ -21,20 +21,20 @@
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
 import com.android.settingslib.applications.ApplicationsState.AppFilter;
 import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import java.util.ArrayList;
 
 /**
- * Connects data from the PowerWhitelistBackend to ApplicationsState.
+ * Connects data from the PowerAllowlistBackend to ApplicationsState.
  */
 public class AppStatePowerBridge extends AppStateBaseBridge {
 
-    private final PowerWhitelistBackend mBackend;
+    private final PowerAllowlistBackend mBackend;
 
     public AppStatePowerBridge(Context context, ApplicationsState appState, Callback callback) {
         super(appState, callback);
-        mBackend = PowerWhitelistBackend.getInstance(context);
+        mBackend = PowerAllowlistBackend.getInstance(context);
     }
 
     @Override
@@ -43,17 +43,17 @@
         final int N = apps.size();
         for (int i = 0; i < N; i++) {
             AppEntry app = apps.get(i);
-            app.extraInfo = mBackend.isWhitelisted(app.info.packageName)
+            app.extraInfo = mBackend.isAllowlisted(app.info.packageName)
                     ? Boolean.TRUE : Boolean.FALSE;
         }
     }
 
     @Override
     protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
-        app.extraInfo = mBackend.isWhitelisted(pkg) ? Boolean.TRUE : Boolean.FALSE;
+        app.extraInfo = mBackend.isAllowlisted(pkg) ? Boolean.TRUE : Boolean.FALSE;
     }
 
-    public static final AppFilter FILTER_POWER_WHITELISTED = new CompoundFilter(
+    public static final AppFilter FILTER_POWER_ALLOWLISTED = new CompoundFilter(
             ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED, new AppFilter() {
         @Override
         public void init() {
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 8a54c73..d095e37 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -312,13 +312,9 @@
             if (appHasSpaceManagementUI) {
                 mButtonsPref.setButton1Text(R.string.manage_space_text);
             } else {
-                mButtonsPref
-                        .setButton1Text(R.string.clear_user_data_text)
-                        .setButton1Icon(R.drawable.ic_settings_delete);
+                mButtonsPref.setButton1Text(R.string.clear_user_data_text);
             }
-            mButtonsPref
-                    .setButton1Text(R.string.clear_user_data_text)
-                    .setButton1Icon(R.drawable.ic_settings_delete)
+            mButtonsPref.setButton1Icon(R.drawable.ic_settings_delete)
                     .setButton1OnClickListener(v -> handleClearDataClick());
         }
 
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index ac8146a..52b1a8d 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -159,7 +159,7 @@
             keepEnabledPackages.add(euicc.packageName);
         }
 
-        keepEnabledPackages.addAll(getEnabledPackageWhitelist());
+        keepEnabledPackages.addAll(getEnabledPackageAllowlist());
 
         final LocationManager locationManager =
                 (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE);
@@ -170,7 +170,7 @@
         return keepEnabledPackages;
     }
 
-    private Set<String> getEnabledPackageWhitelist() {
+    private Set<String> getEnabledPackageAllowlist() {
         final Set<String> keepEnabledPackages = new ArraySet<>();
 
         // Keep Settings intelligence enabled, otherwise search feature will be disabled.
diff --git a/src/com/android/settings/applications/ConvertToFbe.java b/src/com/android/settings/applications/ConvertToFbe.java
index 2a6bdaf..d470011 100644
--- a/src/com/android/settings/applications/ConvertToFbe.java
+++ b/src/com/android/settings/applications/ConvertToFbe.java
@@ -39,9 +39,11 @@
 
     private boolean runKeyguardConfirmation(int request) {
         Resources res = getActivity().getResources();
-        return new ChooseLockSettingsHelper(getActivity(), this)
-                .launchConfirmationActivity(request,
-                        res.getText(R.string.convert_to_file_encryption));
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(getActivity(), this);
+        return builder.setRequestCode(request)
+                .setTitle(res.getText(R.string.convert_to_file_encryption))
+                .show();
     }
 
     @Override
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index d4abe6c..5429b05 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -92,27 +92,27 @@
     // entry.
     final SparseArray<HashMap<String, ProcessItem>> mServiceProcessesByName
             = new SparseArray<HashMap<String, ProcessItem>>();
-    
+
     // Processes that are hosting a service we are interested in, organized
     // by their pid.  These disappear and re-appear as services are restarted.
     final SparseArray<ProcessItem> mServiceProcessesByPid
             = new SparseArray<ProcessItem>();
-    
+
     // Used to sort the interesting processes.
     final ServiceProcessComparator mServiceProcessComparator
             = new ServiceProcessComparator();
-    
+
     // Additional interesting processes to be shown to the user, even if
     // there is no service running in them.
     final ArrayList<ProcessItem> mInterestingProcesses = new ArrayList<ProcessItem>();
-    
+
     // All currently running processes, for finding dependencies etc.
     final SparseArray<ProcessItem> mRunningProcesses
             = new SparseArray<ProcessItem>();
-    
+
     // The processes associated with services, in sorted order.
     final ArrayList<ProcessItem> mProcessItems = new ArrayList<ProcessItem>();
-    
+
     // All processes, used for retrieving memory information.
     final ArrayList<ProcessItem> mAllProcessItems = new ArrayList<ProcessItem>();
 
@@ -139,69 +139,74 @@
 
     int mSequence = 0;
 
-    final Comparator<RunningState.MergedItem> mBackgroundComparator
-        = new Comparator<RunningState.MergedItem>() {
-            @Override
-            public int compare(MergedItem lhs, MergedItem rhs) {
-                if (DEBUG_COMPARE) {
-                    Log.i(TAG, "Comparing " + lhs + " with " + rhs);
-                    Log.i(TAG, "     Proc " + lhs.mProcess + " with " + rhs.mProcess);
-                    Log.i(TAG, "   UserId " + lhs.mUserId + " with " + rhs.mUserId);
-                }
-                if (lhs.mUserId != rhs.mUserId) {
-                    if (lhs.mUserId == mMyUserId) return -1;
-                    if (rhs.mUserId == mMyUserId) return 1;
-                    return lhs.mUserId < rhs.mUserId ? -1 : 1;
-                }
-                if (lhs.mProcess == rhs.mProcess) {
-                    if (lhs.mLabel == rhs.mLabel) {
+    final Comparator<RunningState.MergedItem> mBackgroundComparator =
+            new Comparator<RunningState.MergedItem>() {
+                @Override
+                public int compare(MergedItem lhs, MergedItem rhs) {
+                    if (DEBUG_COMPARE) {
+                        Log.i(TAG, "Comparing " + lhs + " with " + rhs);
+                        Log.i(TAG, "     Proc " + lhs.mProcess + " with " + rhs.mProcess);
+                        Log.i(TAG, "   UserId " + lhs.mUserId + " with " + rhs.mUserId);
+                    }
+                    if (lhs.mUserId != rhs.mUserId) {
+                        if (lhs.mUserId == mMyUserId) return -1;
+                        if (rhs.mUserId == mMyUserId) return 1;
+                        return lhs.mUserId < rhs.mUserId ? -1 : 1;
+                    }
+                    if (lhs.mProcess == rhs.mProcess) {
+                        if (lhs.mLabel == rhs.mLabel) {
+                            return 0;
+                        }
+                        return lhs.mLabel != null ? lhs.mLabel.compareTo(rhs.mLabel) : -1;
+                    }
+                    if (lhs.mProcess == null) return -1;
+                    if (rhs.mProcess == null) return 1;
+                    if (DEBUG_COMPARE) {
+                        Log.i(TAG, "    Label " + lhs.mProcess.mLabel
+                                + " with " + rhs.mProcess.mLabel);
+                    }
+                    final ActivityManager.RunningAppProcessInfo lhsInfo =
+                            lhs.mProcess.mRunningProcessInfo;
+                    final ActivityManager.RunningAppProcessInfo rhsInfo =
+                            rhs.mProcess.mRunningProcessInfo;
+                    final boolean lhsBg = lhsInfo.importance
+                            >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
+                    final boolean rhsBg = rhsInfo.importance
+                            >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
+                    if (DEBUG_COMPARE) Log.i(TAG, "       Bg " + lhsBg + " with " + rhsBg);
+                    if (lhsBg != rhsBg) {
+                        return lhsBg ? 1 : -1;
+                    }
+                    final boolean lhsA = (lhsInfo.flags
+                            & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
+                    final boolean rhsA = (rhsInfo.flags
+                            & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
+                    if (DEBUG_COMPARE) Log.i(TAG, "      Act " + lhsA + " with " + rhsA);
+                    if (lhsA != rhsA) {
+                        return lhsA ? -1 : 1;
+                    }
+                    if (DEBUG_COMPARE) {
+                        Log.i(TAG,
+                                "      Lru " + lhsInfo.lru + " with " + rhsInfo.lru);
+                    }
+                    if (lhsInfo.lru != rhsInfo.lru) {
+                        return lhsInfo.lru < rhsInfo.lru ? -1 : 1;
+                    }
+                    if (lhs.mProcess.mLabel == rhs.mProcess.mLabel) {
                         return 0;
                     }
-                    return lhs.mLabel != null ? lhs.mLabel.compareTo(rhs.mLabel) : -1;
+                    if (lhs.mProcess.mLabel == null) return 1;
+                    if (rhs.mProcess.mLabel == null) return -1;
+                    return lhs.mProcess.mLabel.compareTo(rhs.mProcess.mLabel);
                 }
-                if (lhs.mProcess == null) return -1;
-                if (rhs.mProcess == null) return 1;
-                if (DEBUG_COMPARE) Log.i(TAG, "    Label " + lhs.mProcess.mLabel
-                        + " with " + rhs.mProcess.mLabel);
-                final ActivityManager.RunningAppProcessInfo lhsInfo
-                        = lhs.mProcess.mRunningProcessInfo;
-                final ActivityManager.RunningAppProcessInfo rhsInfo
-                        = rhs.mProcess.mRunningProcessInfo;
-                final boolean lhsBg = lhsInfo.importance
-                        >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
-                final boolean rhsBg = rhsInfo.importance
-                        >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_BACKGROUND;
-                        if (DEBUG_COMPARE) Log.i(TAG, "       Bg " + lhsBg + " with " + rhsBg);
-                if (lhsBg != rhsBg) {
-                    return lhsBg ? 1 : -1;
-                }
-                final boolean lhsA = (lhsInfo.flags
-                        & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
-                final boolean rhsA = (rhsInfo.flags
-                        & ActivityManager.RunningAppProcessInfo.FLAG_HAS_ACTIVITIES) != 0;
-                if (DEBUG_COMPARE) Log.i(TAG, "      Act " + lhsA + " with " + rhsA);
-                if (lhsA != rhsA) {
-                    return lhsA ? -1 : 1;
-                }
-                if (DEBUG_COMPARE) Log.i(TAG, "      Lru " + lhsInfo.lru + " with " + rhsInfo.lru);
-                if (lhsInfo.lru != rhsInfo.lru) {
-                    return lhsInfo.lru < rhsInfo.lru ? -1 : 1;
-                }
-                if (lhs.mProcess.mLabel == rhs.mProcess.mLabel) {
-                    return 0;
-                }
-                if (lhs.mProcess.mLabel == null) return 1;
-                if (rhs.mProcess.mLabel == null) return -1;
-                return lhs.mProcess.mLabel.compareTo(rhs.mProcess.mLabel);
-            }
-    };
+            };
 
     // ----- following protected by mLock -----
-    
+
     // Lock for protecting the state that will be shared between the
     // background update thread and the UI thread.
     final Object mLock = new Object();
-    
+
     boolean mResumed;
     boolean mHaveData;
     boolean mWatchingBackgroundItems;
@@ -210,7 +215,7 @@
     ArrayList<MergedItem> mMergedItems = new ArrayList<MergedItem>();
     ArrayList<MergedItem> mBackgroundItems = new ArrayList<MergedItem>();
     ArrayList<MergedItem> mUserBackgroundItems = new ArrayList<MergedItem>();
-    
+
     int mNumBackgroundProcesses;
     long mBackgroundProcessMemory;
     int mNumForegroundProcesses;
@@ -221,6 +226,7 @@
     // ----- BACKGROUND MONITORING THREAD -----
 
     final HandlerThread mBackgroundThread;
+
     final class BackgroundHandler extends Handler {
         public BackgroundHandler(Looper looper) {
             super(looper);
@@ -372,9 +378,9 @@
         ActivityManager.RunningServiceInfo mRunningService;
         ServiceInfo mServiceInfo;
         boolean mShownAsStarted;
-        
+
         MergedItem mMergedItem;
-        
+
         public ServiceItem(int userId) {
             super(false, userId);
         }
@@ -385,17 +391,17 @@
                 = new HashMap<ComponentName, ServiceItem>();
         final SparseArray<ProcessItem> mDependentProcesses
                 = new SparseArray<ProcessItem>();
-        
+
         final int mUid;
         final String mProcessName;
         int mPid;
-        
+
         ProcessItem mClient;
         int mLastNumDependentProcesses;
-        
+
         int mRunningSeq;
         ActivityManager.RunningAppProcessInfo mRunningProcessInfo;
-        
+
         MergedItem mMergedItem;
 
         boolean mInteresting;
@@ -404,7 +410,7 @@
         boolean mIsSystem;
         boolean mIsStarted;
         long mActiveSince;
-        
+
         public ProcessItem(Context context, int uid, String processName) {
             super(true, UserHandle.getUserId(uid));
             mDescription = context.getResources().getString(
@@ -412,12 +418,12 @@
             mUid = uid;
             mProcessName = processName;
         }
-        
+
         void ensureLabel(PackageManager pm) {
             if (mLabel != null) {
                 return;
             }
-            
+
             try {
                 ApplicationInfo ai = pm.getApplicationInfo(mProcessName,
                         PackageManager.MATCH_ANY_USER);
@@ -429,11 +435,11 @@
                 }
             } catch (PackageManager.NameNotFoundException e) {
             }
-            
+
             // If we couldn't get information about the overall
             // process, try to find something about the uid.
             String[] pkgs = pm.getPackagesForUid(mUid);
-            
+
             // If there is one package with this uid, that is what we want.
             if (pkgs.length == 1) {
                 try {
@@ -446,7 +452,7 @@
                 } catch (PackageManager.NameNotFoundException e) {
                 }
             }
-            
+
             // If there are multiple, see if one gives us the official name
             // for this uid.
             for (String name : pkgs) {
@@ -465,7 +471,7 @@
                 } catch (PackageManager.NameNotFoundException e) {
                 }
             }
-            
+
             // If still don't have anything to display, just use the
             // service info.
             if (mServices.size() > 0) {
@@ -476,7 +482,7 @@
                 mLabel = mDisplayLabel.toString();
                 return;
             }
-            
+
             // Finally... whatever, just pick the first package's name.
             try {
                 ApplicationInfo ai = pm.getApplicationInfo(pkgs[0],
@@ -544,16 +550,16 @@
                 si.mDescription = context.getResources().getString(
                         R.string.service_started_by_app);
             }
-            
+
             return changed;
         }
-        
+
         boolean updateSize(Context context, long pss, int curSeq) {
             mSize = pss * 1024;
             if (mCurSeq == curSeq) {
                 String sizeStr = Formatter.formatShortFileSize(
                         context, mSize);
-                if (!sizeStr.equals(mSizeStr)){
+                if (!sizeStr.equals(mSizeStr)) {
                     mSizeStr = sizeStr;
                     // We update this on the second tick where we update just
                     // the text in the current items, so no need to say we
@@ -563,11 +569,11 @@
             }
             return false;
         }
-        
+
         boolean buildDependencyChain(Context context, PackageManager pm, int curSeq) {
             final int NP = mDependentProcesses.size();
             boolean changed = false;
-            for (int i=0; i<NP; i++) {
+            for (int i = 0; i < NP; i++) {
                 ProcessItem proc = mDependentProcesses.valueAt(i);
                 if (proc.mClient != this) {
                     changed = true;
@@ -577,19 +583,19 @@
                 proc.ensureLabel(pm);
                 changed |= proc.buildDependencyChain(context, pm, curSeq);
             }
-            
+
             if (mLastNumDependentProcesses != mDependentProcesses.size()) {
                 changed = true;
                 mLastNumDependentProcesses = mDependentProcesses.size();
             }
-            
+
             return changed;
         }
-        
+
         void addDependentProcesses(ArrayList<BaseItem> dest,
                 ArrayList<ProcessItem> destProc) {
             final int NP = mDependentProcesses.size();
-            for (int i=0; i<NP; i++) {
+            for (int i = 0; i < NP; i++) {
                 ProcessItem proc = mDependentProcesses.valueAt(i);
                 proc.addDependentProcesses(dest, destProc);
                 dest.add(proc);
@@ -606,7 +612,7 @@
         final ArrayList<ProcessItem> mOtherProcesses = new ArrayList<ProcessItem>();
         final ArrayList<ServiceItem> mServices = new ArrayList<ServiceItem>();
         final ArrayList<MergedItem> mChildren = new ArrayList<MergedItem>();
-        
+
         private int mLastNumProcesses = -1, mLastNumServices = -1;
 
         MergedItem(int userId) {
@@ -646,7 +652,7 @@
                 int numProcesses = 0;
                 int numServices = 0;
                 mActiveSince = -1;
-                for (int i=0; i<mChildren.size(); i++) {
+                for (int i = 0; i < mChildren.size(); i++) {
                     MergedItem child = mChildren.get(i);
                     numProcesses += child.mLastNumProcesses;
                     numServices += child.mLastNumServices;
@@ -661,14 +667,14 @@
                 mPackageInfo = mProcess.mPackageInfo;
                 mDisplayLabel = mProcess.mDisplayLabel;
                 mLabel = mProcess.mLabel;
-                
+
                 if (!mBackground) {
                     setDescription(context, (mProcess.mPid > 0 ? 1 : 0) + mOtherProcesses.size(),
                             mServices.size());
                 }
-                
+
                 mActiveSince = -1;
-                for (int i=0; i<mServices.size(); i++) {
+                for (int i = 0; i < mServices.size(); i++) {
                     ServiceItem si = mServices.get(i);
                     if (si.mActiveSince >= 0 && mActiveSince < si.mActiveSince) {
                         mActiveSince = si.mActiveSince;
@@ -678,25 +684,25 @@
 
             return false;
         }
-        
+
         boolean updateSize(Context context) {
             if (mUser != null) {
                 mSize = 0;
-                for (int i=0; i<mChildren.size(); i++) {
+                for (int i = 0; i < mChildren.size(); i++) {
                     MergedItem child = mChildren.get(i);
                     child.updateSize(context);
                     mSize += child.mSize;
                 }
             } else {
                 mSize = mProcess.mSize;
-                for (int i=0; i<mOtherProcesses.size(); i++) {
+                for (int i = 0; i < mOtherProcesses.size(); i++) {
                     mSize += mOtherProcesses.get(i).mSize;
                 }
             }
-            
+
             String sizeStr = Formatter.formatShortFileSize(
                     context, mSize);
-            if (!sizeStr.equals(mSizeStr)){
+            if (!sizeStr.equals(mSizeStr)) {
                 mSizeStr = sizeStr;
                 // We update this on the second tick where we update just
                 // the text in the current items, so no need to say we
@@ -746,7 +752,7 @@
             return 0;
         }
     }
-    
+
     static CharSequence makeLabel(PackageManager pm,
             String className, PackageItemInfo item) {
         if (item != null && (item.labelRes != 0
@@ -756,15 +762,15 @@
                 return label;
             }
         }
-        
+
         String label = className;
         int tail = label.lastIndexOf('.');
         if (tail >= 0) {
-            label = label.substring(tail+1, label.length());
+            label = label.substring(tail + 1, label.length());
         }
         return label;
     }
-    
+
     static RunningState getInstance(Context context) {
         synchronized (sGlobalLock) {
             if (sInstance == null) {
@@ -776,9 +782,9 @@
 
     private RunningState(Context context) {
         mApplicationContext = context.getApplicationContext();
-        mAm = (ActivityManager)mApplicationContext.getSystemService(Context.ACTIVITY_SERVICE);
+        mAm = mApplicationContext.getSystemService(ActivityManager.class);
         mPm = mApplicationContext.getPackageManager();
-        mUm = (UserManager)mApplicationContext.getSystemService(Context.USER_SERVICE);
+        mUm = mApplicationContext.getSystemService(UserManager.class);
         mMyUserId = UserHandle.myUserId();
         UserInfo userInfo = mUm.getUserInfo(mMyUserId);
         mHideManagedProfiles = userInfo == null || !userInfo.canHaveProfile();
@@ -842,14 +848,14 @@
     }
 
     private boolean isInterestingProcess(ActivityManager.RunningAppProcessInfo pi) {
-        if ((pi.flags&ActivityManager.RunningAppProcessInfo.FLAG_CANT_SAVE_STATE) != 0) {
+        if ((pi.flags & ActivityManager.RunningAppProcessInfo.FLAG_CANT_SAVE_STATE) != 0) {
             return true;
         }
-        if ((pi.flags&ActivityManager.RunningAppProcessInfo.FLAG_PERSISTENT) == 0
+        if ((pi.flags & ActivityManager.RunningAppProcessInfo.FLAG_PERSISTENT) == 0
                 && pi.importance >= ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
                 && pi.importance < ActivityManager.RunningAppProcessInfo.IMPORTANCE_CANT_SAVE_STATE
                 && pi.importanceReasonCode
-                        == ActivityManager.RunningAppProcessInfo.REASON_UNKNOWN) {
+                == ActivityManager.RunningAppProcessInfo.REASON_UNKNOWN) {
             return true;
         }
         return false;
@@ -897,15 +903,15 @@
         final PackageManager pm = context.getPackageManager();
 
         mSequence++;
-        
+
         boolean changed = false;
 
         // Retrieve list of services, filtering out anything that definitely
         // won't be shown in the UI.
-        List<ActivityManager.RunningServiceInfo> services 
+        List<ActivityManager.RunningServiceInfo> services
                 = am.getRunningServices(MAX_SERVICES);
         int NS = services != null ? services.size() : 0;
-        for (int i=0; i<NS; i++) {
+        for (int i = 0; i < NS; i++) {
             ActivityManager.RunningServiceInfo si = services.get(i);
             // We are not interested in services that have not been started
             // and don't have a known client, because
@@ -918,7 +924,7 @@
             }
             // We likewise don't care about services running in a
             // persistent process like the system or phone.
-            if ((si.flags&ActivityManager.RunningServiceInfo.FLAG_PERSISTENT_PROCESS)
+            if ((si.flags & ActivityManager.RunningServiceInfo.FLAG_PERSISTENT_PROCESS)
                     != 0) {
                 services.remove(i);
                 i--;
@@ -933,14 +939,14 @@
                 = am.getRunningAppProcesses();
         final int NP = processes != null ? processes.size() : 0;
         mTmpAppProcesses.clear();
-        for (int i=0; i<NP; i++) {
+        for (int i = 0; i < NP; i++) {
             ActivityManager.RunningAppProcessInfo pi = processes.get(i);
             mTmpAppProcesses.put(pi.pid, new AppProcessInfo(pi));
         }
 
         // Initial iteration through running services to collect per-process
         // info about them.
-        for (int i=0; i<NS; i++) {
+        for (int i = 0; i < NS; i++) {
             ActivityManager.RunningServiceInfo si = services.get(i);
             if (si.restarting == 0 && si.pid > 0) {
                 AppProcessInfo ainfo = mTmpAppProcesses.get(si.pid);
@@ -954,7 +960,7 @@
         }
 
         // Update state we are maintaining about process that are running services.
-        for (int i=0; i<NS; i++) {
+        for (int i = 0; i < NS; i++) {
             ActivityManager.RunningServiceInfo si = services.get(i);
 
             // If this service's process is in use at a higher importance
@@ -1001,7 +1007,7 @@
                 proc = new ProcessItem(context, si.uid, si.process);
                 procs.put(si.process, proc);
             }
-            
+
             if (proc.mCurSeq != mSequence) {
                 int pid = si.restarting == 0 ? si.pid : 0;
                 if (pid != proc.mPid) {
@@ -1021,10 +1027,10 @@
             }
             changed |= proc.updateService(context, si);
         }
-        
+
         // Now update the map of other processes that are running (but
         // don't have services actively running inside them).
-        for (int i=0; i<NP; i++) {
+        for (int i = 0; i < NP; i++) {
             ActivityManager.RunningAppProcessInfo pi = processes.get(i);
             ProcessItem proc = mServiceProcessesByPid.get(pi.pid);
             if (proc == null) {
@@ -1040,7 +1046,7 @@
                 }
                 proc.mDependentProcesses.clear();
             }
-            
+
             if (isInterestingProcess(pi)) {
                 if (!mInterestingProcesses.contains(proc)) {
                     changed = true;
@@ -1052,7 +1058,7 @@
             } else {
                 proc.mInteresting = false;
             }
-            
+
             proc.mRunningSeq = mSequence;
             proc.mRunningProcessInfo = pi;
         }
@@ -1060,7 +1066,7 @@
         // Build the chains from client processes to the process they are
         // dependent on; also remove any old running processes.
         int NRP = mRunningProcesses.size();
-        for (int i = 0; i < NRP;) {
+        for (int i = 0; i < NRP; ) {
             ProcessItem proc = mRunningProcesses.valueAt(i);
             if (proc.mRunningSeq == mSequence) {
                 int clientPid = proc.mRunningProcessInfo.importanceReasonPid;
@@ -1085,10 +1091,10 @@
                 NRP--;
             }
         }
-        
+
         // Remove any old interesting processes.
         int NHP = mInterestingProcesses.size();
-        for (int i=0; i<NHP; i++) {
+        for (int i = 0; i < NHP; i++) {
             ProcessItem proc = mInterestingProcesses.get(i);
             if (!proc.mInteresting || mRunningProcesses.get(proc.mPid) == null) {
                 changed = true;
@@ -1097,21 +1103,21 @@
                 NHP--;
             }
         }
-        
+
         // Follow the tree from all primary service processes to all
         // processes they are dependent on, marking these processes as
         // still being active and determining if anything has changed.
         final int NAP = mServiceProcessesByPid.size();
-        for (int i=0; i<NAP; i++) {
+        for (int i = 0; i < NAP; i++) {
             ProcessItem proc = mServiceProcessesByPid.valueAt(i);
             if (proc.mCurSeq == mSequence) {
                 changed |= proc.buildDependencyChain(context, pm, mSequence);
             }
         }
-        
+
         // Look for services and their primary processes that no longer exist...
         ArrayList<Integer> uidToDelete = null;
-        for (int i=0; i<mServiceProcessesByName.size(); i++) {
+        for (int i = 0; i < mServiceProcessesByName.size(); i++) {
             HashMap<String, ProcessItem> procs = mServiceProcessesByName.valueAt(i);
             Iterator<ProcessItem> pit = procs.values().iterator();
             while (pit.hasNext()) {
@@ -1119,8 +1125,7 @@
                 if (pi.mCurSeq == mSequence) {
                     pi.ensureLabel(pm);
                     if (pi.mPid == 0) {
-                        // Sanity: a non-process can't be dependent on
-                        // anything.
+                        // Validation: a non-process can't be dependent on anything.
                         pi.mDependentProcesses.clear();
                     }
                 } else {
@@ -1147,7 +1152,7 @@
                 }
             }
         }
-        
+
         if (uidToDelete != null) {
             for (int i = 0; i < uidToDelete.size(); i++) {
                 int uid = uidToDelete.get(i);
@@ -1158,7 +1163,7 @@
         if (changed) {
             // First determine an order for the services.
             ArrayList<ProcessItem> sortedProcesses = new ArrayList<ProcessItem>();
-            for (int i=0; i<mServiceProcessesByName.size(); i++) {
+            for (int i = 0; i < mServiceProcessesByName.size(); i++) {
                 for (ProcessItem pi : mServiceProcessesByName.valueAt(i).values()) {
                     pi.mIsSystem = false;
                     pi.mIsStarted = true;
@@ -1166,7 +1171,7 @@
                     for (ServiceItem si : pi.mServices.values()) {
                         if (si.mServiceInfo != null
                                 && (si.mServiceInfo.applicationInfo.flags
-                                        & ApplicationInfo.FLAG_SYSTEM) != 0) {
+                                & ApplicationInfo.FLAG_SYSTEM) != 0) {
                             pi.mIsSystem = true;
                         }
                         if (si.mRunningService != null
@@ -1180,16 +1185,16 @@
                     sortedProcesses.add(pi);
                 }
             }
-            
+
             Collections.sort(sortedProcesses, mServiceProcessComparator);
-            
+
             ArrayList<BaseItem> newItems = new ArrayList<BaseItem>();
             ArrayList<MergedItem> newMergedItems = new ArrayList<MergedItem>();
             mProcessItems.clear();
-            for (int i=0; i<sortedProcesses.size(); i++) {
+            for (int i = 0; i < sortedProcesses.size(); i++) {
                 ProcessItem pi = sortedProcesses.get(i);
                 pi.mNeedDivider = false;
-                
+
                 int firstProc = mProcessItems.size();
                 // First add processes we are dependent on.
                 pi.addDependentProcesses(newItems, mProcessItems);
@@ -1198,7 +1203,7 @@
                 if (pi.mPid > 0) {
                     mProcessItems.add(pi);
                 }
-                
+
                 // Now add the services running in it.
                 MergedItem mergedItem = null;
                 boolean haveAllMerged = false;
@@ -1216,7 +1221,7 @@
                         haveAllMerged = false;
                     }
                 }
-                
+
                 if (!haveAllMerged || mergedItem == null
                         || mergedItem.mServices.size() != pi.mServices.size()) {
                     // Whoops, we need to build a new MergedItem!
@@ -1227,11 +1232,11 @@
                     }
                     mergedItem.mProcess = pi;
                     mergedItem.mOtherProcesses.clear();
-                    for (int mpi=firstProc; mpi<(mProcessItems.size()-1); mpi++) {
+                    for (int mpi = firstProc; mpi < (mProcessItems.size() - 1); mpi++) {
                         mergedItem.mOtherProcesses.add(mProcessItems.get(mpi));
                     }
                 }
-                
+
                 mergedItem.update(context, false);
                 if (mergedItem.mUserId != mMyUserId) {
                     addOtherUserItem(context, newMergedItems, mOtherUserMergedItems, mergedItem);
@@ -1243,7 +1248,7 @@
             // Finally, interesting processes need to be shown and will
             // go at the top.
             NHP = mInterestingProcesses.size();
-            for (int i=0; i<NHP; i++) {
+            for (int i = 0; i < NHP; i++) {
                 ProcessItem proc = mInterestingProcesses.get(i);
                 if (proc.mClient == null && proc.mServices.size() <= 0) {
                     if (proc.mMergedItem == null) {
@@ -1264,7 +1269,7 @@
             // Finally finally, user aggregated merged items need to be
             // updated now that they have all of their children.
             final int NU = mOtherUserMergedItems.size();
-            for (int i=0; i<NU; i++) {
+            for (int i = 0; i < NU; i++) {
                 MergedItem user = mOtherUserMergedItems.valueAt(i);
                 if (user.mCurSeq == mSequence) {
                     user.update(context, false);
@@ -1276,7 +1281,7 @@
                 mMergedItems = newMergedItems;
             }
         }
-        
+
         // Count number of interesting other (non-active) processes, and
         // build a list of all processes we will retrieve memory for.
         mAllProcessItems.clear();
@@ -1285,7 +1290,7 @@
         int numForegroundProcesses = 0;
         int numServiceProcesses = 0;
         NRP = mRunningProcesses.size();
-        for (int i=0; i<NRP; i++) {
+        for (int i = 0; i < NRP; i++) {
             ProcessItem proc = mRunningProcesses.valueAt(i);
             if (proc.mCurSeq != mSequence) {
                 // We didn't hit this process as a dependency on one
@@ -1306,7 +1311,7 @@
                 numServiceProcesses++;
             }
         }
-        
+
         long backgroundProcessMemory = 0;
         long foregroundProcessMemory = 0;
         long serviceProcessMemory = 0;
@@ -1316,13 +1321,13 @@
         try {
             final int numProc = mAllProcessItems.size();
             int[] pids = new int[numProc];
-            for (int i=0; i<numProc; i++) {
+            for (int i = 0; i < numProc; i++) {
                 pids[i] = mAllProcessItems.get(i).mPid;
             }
             long[] pss = ActivityManager.getService()
                     .getProcessPss(pids);
             int bgIndex = 0;
-            for (int i=0; i<pids.length; i++) {
+            for (int i = 0; i < pids.length; i++) {
                 ProcessItem proc = mAllProcessItems.get(i);
                 changed |= proc.updateSize(context, pss[i], mSequence);
                 if (proc.mCurSeq == mSequence) {
@@ -1340,7 +1345,7 @@
                         if (bgIndex >= mBackgroundItems.size()
                                 || mBackgroundItems.get(bgIndex).mProcess != proc) {
                             newBackgroundItems = new ArrayList<MergedItem>(numBackgroundProcesses);
-                            for (int bgi=0; bgi<bgIndex; bgi++) {
+                            for (int bgi = 0; bgi < bgIndex; bgi++) {
                                 mergedItem = mBackgroundItems.get(bgi);
                                 diffUsers |= mergedItem.mUserId != mMyUserId;
                                 newBackgroundItems.add(mergedItem);
@@ -1363,12 +1368,12 @@
             }
         } catch (RemoteException e) {
         }
-        
+
         if (newBackgroundItems == null) {
             // One or more at the bottom may no longer exist.
             if (mBackgroundItems.size() > numBackgroundProcesses) {
                 newBackgroundItems = new ArrayList<MergedItem>(numBackgroundProcesses);
-                for (int bgi=0; bgi<numBackgroundProcesses; bgi++) {
+                for (int bgi = 0; bgi < numBackgroundProcesses; bgi++) {
                     MergedItem mergedItem = mBackgroundItems.get(bgi);
                     diffUsers |= mergedItem.mUserId != mMyUserId;
                     newBackgroundItems.add(mergedItem);
@@ -1387,7 +1392,7 @@
                 // items for users are collapsed together.
                 newUserBackgroundItems = new ArrayList<MergedItem>();
                 final int NB = newBackgroundItems.size();
-                for (int i=0; i<NB; i++) {
+                for (int i = 0; i < NB; i++) {
                     MergedItem mergedItem = newBackgroundItems.get(i);
                     if (mergedItem.mUserId != mMyUserId) {
                         addOtherUserItem(context, newUserBackgroundItems,
@@ -1399,7 +1404,7 @@
                 // And user aggregated merged items need to be
                 // updated now that they have all of their children.
                 final int NU = mOtherUserBackgroundItems.size();
-                for (int i=0; i<NU; i++) {
+                for (int i = 0; i < NU; i++) {
                     MergedItem user = mOtherUserBackgroundItems.valueAt(i);
                     if (user.mCurSeq == mSequence) {
                         user.update(context, true);
@@ -1409,10 +1414,10 @@
             }
         }
 
-        for (int i=0; i<mMergedItems.size(); i++) {
+        for (int i = 0; i < mMergedItems.size(); i++) {
             mMergedItems.get(i).updateSize(context);
         }
-        
+
         synchronized (mLock) {
             mNumBackgroundProcesses = numBackgroundProcesses;
             mNumForegroundProcesses = numForegroundProcesses;
@@ -1432,10 +1437,10 @@
                 mLock.notifyAll();
             }
         }
-        
+
         return changed;
     }
-    
+
     void setWatchingBackgroundItems(boolean watching) {
         synchronized (mLock) {
             mWatchingBackgroundItems = watching;
diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
index 752c6ce..19b8f50 100644
--- a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
+++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
@@ -110,7 +110,7 @@
                 continue;
             }
             if (entry.extraInfo instanceof DataUsageState
-                    && ((DataUsageState) entry.extraInfo).isDataSaverWhitelisted) {
+                    && ((DataUsageState) entry.extraInfo).isDataSaverAllowlisted) {
                 count++;
             }
         }
diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
index 7aad245..6817bd6 100755
--- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
+++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
@@ -526,7 +526,7 @@
 
     @VisibleForTesting
     int getNumberOfUserWithPackageInstalled(String packageName) {
-        final List<UserInfo> userInfos = mUserManager.getUsers(true);
+        final List<UserInfo> userInfos = mUserManager.getAliveUsers();
         int count = 0;
 
         for (final UserInfo userInfo : userInfos) {
diff --git a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
index eab9a56..bc87b44 100644
--- a/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppNotificationPreferenceController.java
@@ -72,6 +72,9 @@
 
     private CharSequence getNotificationSummary(ApplicationsState.AppEntry appEntry,
             Context context, NotificationBackend backend) {
+        if (appEntry == null) {
+            return "";
+        }
         NotificationBackend.AppRow appRow =
                 backend.loadAppRow(context, context.getPackageManager(), appEntry.info);
         return getNotificationSummary(appRow, context);
diff --git a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
index fe1d81c..b723274 100644
--- a/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
+++ b/src/com/android/settings/applications/appinfo/ExternalSourcesDetails.java
@@ -18,7 +18,6 @@
 import static android.app.Activity.RESULT_CANCELED;
 import static android.app.Activity.RESULT_OK;
 
-import android.app.ActivityManager;
 import android.app.AppOpsManager;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -30,7 +29,6 @@
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
 import com.android.settings.Settings;
 import com.android.settings.applications.AppInfoWithHeader;
@@ -46,7 +44,6 @@
 
     private AppStateInstallAppsBridge mAppBridge;
     private AppOpsManager mAppOpsManager;
-    private ActivityManager mActivityManager;
     private UserManager mUserManager;
     private RestrictedSwitchPreference mSwitchPref;
     private InstallAppsState mInstallAppsState;
@@ -58,7 +55,6 @@
         final Context context = getActivity();
         mAppBridge = new AppStateInstallAppsBridge(context, mState, null);
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
-        mActivityManager = context.getSystemService(ActivityManager.class);
         mUserManager = UserManager.get(context);
 
         addPreferencesFromResource(R.xml.external_sources_details);
@@ -103,21 +99,10 @@
                 : R.string.app_permission_summary_not_allowed);
     }
 
-    @VisibleForTesting
-    void setCanInstallApps(boolean newState) {
+    private void setCanInstallApps(boolean newState) {
         mAppOpsManager.setMode(AppOpsManager.OP_REQUEST_INSTALL_PACKAGES,
                 mPackageInfo.applicationInfo.uid, mPackageName,
                 newState ? AppOpsManager.MODE_ALLOWED : AppOpsManager.MODE_ERRORED);
-        if (!newState) {
-            killApp(mPackageInfo.applicationInfo.uid);
-        }
-    }
-
-    private void killApp(int uid) {
-        if (UserHandle.isCore(uid)) {
-            return;
-        }
-        mActivityManager.killUid(uid, "User denied OP_REQUEST_INSTALL_PACKAGES");
     }
 
     @Override
diff --git a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
index 34c67f1..86b9fcf 100644
--- a/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/InstantAppDomainsPreferenceController.java
@@ -51,7 +51,7 @@
         final String[] handledDomains =
                 handledDomainSet.toArray(new String[handledDomainSet.size()]);
         instantAppDomainsPreference.setTitles(handledDomains);
-        // Dummy values, unused in the implementation
+        // placeholder values, unused in the implementation
         instantAppDomainsPreference.setValues(new int[handledDomains.length]);
     }
 
diff --git a/src/com/android/settings/applications/appops/AppOpsState.java b/src/com/android/settings/applications/appops/AppOpsState.java
index cbffe47..eab3dda 100644
--- a/src/com/android/settings/applications/appops/AppOpsState.java
+++ b/src/com/android/settings/applications/appops/AppOpsState.java
@@ -588,7 +588,7 @@
             if (appEntry == null) {
                 continue;
             }
-            List<AppOpsManager.OpEntry> dummyOps = null;
+            List<AppOpsManager.OpEntry> stubOps = null;
             AppOpsManager.PackageOps pkgOps = null;
             if (appInfo.requestedPermissions != null) {
                 for (int j=0; j<appInfo.requestedPermissions.length; j++) {
@@ -611,15 +611,15 @@
                         if (appEntry.hasOp(permOps.get(k))) {
                             continue;
                         }
-                        if (dummyOps == null) {
-                            dummyOps = new ArrayList<AppOpsManager.OpEntry>();
+                        if (stubOps == null) {
+                            stubOps = new ArrayList<AppOpsManager.OpEntry>();
                             pkgOps = new AppOpsManager.PackageOps(
-                                    appInfo.packageName, appInfo.applicationInfo.uid, dummyOps);
+                                    appInfo.packageName, appInfo.applicationInfo.uid, stubOps);
 
                         }
                         AppOpsManager.OpEntry opEntry = new AppOpsManager.OpEntry(
                                 permOps.get(k), AppOpsManager.MODE_ALLOWED, Collections.emptyMap());
-                        dummyOps.add(opEntry);
+                        stubOps.add(opEntry);
                         addOp(entries, pkgOps, appEntry, opEntry, packageName == null,
                                 packageName == null ? 0 : opToOrder[opEntry.getOp()]);
                     }
diff --git a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
index 58907a7..b370ad2 100644
--- a/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
+++ b/src/com/android/settings/applications/manageapplications/AppFilterRegistry.java
@@ -35,8 +35,8 @@
 public class AppFilterRegistry {
 
     @IntDef(value = {
-            FILTER_APPS_POWER_WHITELIST,
-            FILTER_APPS_POWER_WHITELIST_ALL,
+            FILTER_APPS_POWER_ALLOWLIST,
+            FILTER_APPS_POWER_ALLOWLIST_ALL,
             FILTER_APPS_ALL,
             FILTER_APPS_ENABLED,
             FILTER_APPS_INSTANT,
@@ -56,14 +56,14 @@
 
     // Filter options used for displayed list of applications
     // Filters will appear sorted based on their value defined here.
-    public static final int FILTER_APPS_POWER_WHITELIST = 0;
-    public static final int FILTER_APPS_POWER_WHITELIST_ALL = 1;
-    public static final int FILTER_APPS_ALL = 2;
-    public static final int FILTER_APPS_ENABLED = 3;
-    public static final int FILTER_APPS_INSTANT = 4;
-    public static final int FILTER_APPS_DISABLED = 5;
-    public static final int FILTER_APPS_RECENT = 6;
-    public static final int FILTER_APPS_FREQUENT = 7;
+    public static final int FILTER_APPS_POWER_ALLOWLIST = 0;
+    public static final int FILTER_APPS_POWER_ALLOWLIST_ALL = 1;
+    public static final int FILTER_APPS_RECENT = 2;
+    public static final int FILTER_APPS_FREQUENT = 3;
+    public static final int FILTER_APPS_ALL = 4;
+    public static final int FILTER_APPS_ENABLED = 5;
+    public static final int FILTER_APPS_INSTANT = 6;
+    public static final int FILTER_APPS_DISABLED = 7;
     public static final int FILTER_APPS_PERSONAL = 8;
     public static final int FILTER_APPS_WORK = 9;
     public static final int FILTER_APPS_USAGE_ACCESS = 10;
@@ -82,20 +82,20 @@
     private AppFilterRegistry() {
         mFilters = new AppFilterItem[18];
 
-        // High power whitelist, on
-        mFilters[FILTER_APPS_POWER_WHITELIST] = new AppFilterItem(
+        // High power allowlist, on
+        mFilters[FILTER_APPS_POWER_ALLOWLIST] = new AppFilterItem(
                 new ApplicationsState.CompoundFilter(
-                        AppStatePowerBridge.FILTER_POWER_WHITELISTED,
+                        AppStatePowerBridge.FILTER_POWER_ALLOWLISTED,
                         ApplicationsState.FILTER_ALL_ENABLED),
-                FILTER_APPS_POWER_WHITELIST,
+                FILTER_APPS_POWER_ALLOWLIST,
                 R.string.high_power_filter_on);
 
         // Without disabled until used
-        mFilters[FILTER_APPS_POWER_WHITELIST_ALL] = new AppFilterItem(
+        mFilters[FILTER_APPS_POWER_ALLOWLIST_ALL] = new AppFilterItem(
                 new ApplicationsState.CompoundFilter(
                         ApplicationsState.FILTER_WITHOUT_DISABLED_UNTIL_USED,
                         ApplicationsState.FILTER_ALL_ENABLED),
-                FILTER_APPS_POWER_WHITELIST_ALL,
+                FILTER_APPS_POWER_ALLOWLIST_ALL,
                 R.string.filter_all_apps);
 
         // All apps
@@ -200,7 +200,7 @@
             case ManageApplications.LIST_TYPE_USAGE_ACCESS:
                 return FILTER_APPS_USAGE_ACCESS;
             case ManageApplications.LIST_TYPE_HIGH_POWER:
-                return FILTER_APPS_POWER_WHITELIST;
+                return FILTER_APPS_POWER_ALLOWLIST;
             case ManageApplications.LIST_TYPE_OVERLAY:
                 return FILTER_APPS_WITH_OVERLAY;
             case ManageApplications.LIST_TYPE_WRITE_SETTINGS:
diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
index bd08236..b072047 100644
--- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
+++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
@@ -70,7 +70,7 @@
         if (twoTarget) {
             if (widgetFrame != null) {
                 LayoutInflater.from(parent.getContext())
-                        .inflate(R.layout.preference_widget_master_switch, widgetFrame, true);
+                        .inflate(R.layout.preference_widget_primary_switch, widgetFrame, true);
 
                 View divider = LayoutInflater.from(parent.getContext()).inflate(
                         R.layout.preference_two_target_divider, view, false);
diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java
index 5ef1232..d41864e 100644
--- a/src/com/android/settings/applications/manageapplications/ManageApplications.java
+++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java
@@ -25,8 +25,8 @@
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_FREQUENT;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTANT;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_PERSONAL;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_WHITELIST_ALL;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_ALLOWLIST;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_ALLOWLIST_ALL;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_RECENT;
 import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WORK;
 import static com.android.settings.search.actionbar.SearchMenuController.MENU_SEARCH;
@@ -125,7 +125,7 @@
 import com.android.settingslib.applications.ApplicationsState.CompoundFilter;
 import com.android.settingslib.applications.ApplicationsState.VolumeFilter;
 import com.android.settingslib.applications.StorageStatsSource;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.settingsspinner.SettingsSpinnerAdapter;
 
@@ -476,10 +476,10 @@
             mFilterAdapter.enableFilter(FILTER_APPS_RECENT);
             mFilterAdapter.enableFilter(FILTER_APPS_FREQUENT);
             mFilterAdapter.enableFilter(FILTER_APPS_BLOCKED);
-            mFilterAdapter.disableFilter(FILTER_APPS_ALL);
+            mFilterAdapter.enableFilter(FILTER_APPS_ALL);
         }
         if (mListType == LIST_TYPE_HIGH_POWER) {
-            mFilterAdapter.enableFilter(FILTER_APPS_POWER_WHITELIST_ALL);
+            mFilterAdapter.enableFilter(FILTER_APPS_POWER_ALLOWLIST_ALL);
         }
 
         setCompositeFilter();
@@ -1011,7 +1011,7 @@
         private boolean mHasReceivedBridgeCallback;
         private FileViewHolderController mExtraViewController;
         private SearchFilter mSearchFilter;
-        private PowerWhitelistBackend mBackend;
+        private PowerAllowlistBackend mBackend;
 
         // This is to remember and restore the last scroll position when this
         // fragment is paused. We need this special handling because app entries are added gradually
@@ -1036,7 +1036,7 @@
             mContext = manageApplications.getActivity();
             mIconDrawableFactory = IconDrawableFactory.newInstance(mContext);
             mAppFilter = appFilter;
-            mBackend = PowerWhitelistBackend.getInstance(mContext);
+            mBackend = PowerAllowlistBackend.getInstance(mContext);
             if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
                 mExtraInfoBridge = new AppStateNotificationBridge(mContext, mState, this,
                         manageApplications.mUsageStatsManager,
@@ -1089,12 +1089,16 @@
             mAppFilter = appFilter;
 
             // Notification filters require resorting the list
-            if (FILTER_APPS_FREQUENT == appFilter.getFilterType()) {
-                rebuild(R.id.sort_order_frequent_notification);
-            } else if (FILTER_APPS_RECENT == appFilter.getFilterType()) {
-                rebuild(R.id.sort_order_recent_notification);
-            } else if (FILTER_APPS_BLOCKED == appFilter.getFilterType()) {
-                rebuild(R.id.sort_order_alpha);
+            if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) {
+                if (FILTER_APPS_FREQUENT == appFilter.getFilterType()) {
+                    rebuild(R.id.sort_order_frequent_notification);
+                } else if (FILTER_APPS_RECENT == appFilter.getFilterType()) {
+                    rebuild(R.id.sort_order_recent_notification);
+                } else if (FILTER_APPS_BLOCKED == appFilter.getFilterType()) {
+                    rebuild(R.id.sort_order_alpha);
+                } else {
+                    rebuild(R.id.sort_order_alpha);
+                }
             } else {
                 rebuild();
             }
@@ -1288,8 +1292,8 @@
                 Log.d(TAG, "onRebuildComplete size=" + entries.size());
             }
             final int filterType = mAppFilter.getFilterType();
-            if (filterType == FILTER_APPS_POWER_WHITELIST ||
-                    filterType == FILTER_APPS_POWER_WHITELIST_ALL) {
+            if (filterType == FILTER_APPS_POWER_ALLOWLIST
+                    || filterType == FILTER_APPS_POWER_ALLOWLIST_ALL) {
                 entries = removeDuplicateIgnoringUser(entries);
             }
             mEntries = entries;
@@ -1447,7 +1451,7 @@
             }
             ApplicationsState.AppEntry entry = mEntries.get(position);
 
-            return !mBackend.isSysWhitelisted(entry.info.packageName)
+            return !mBackend.isSysAllowlisted(entry.info.packageName)
                     && !mBackend.isDefaultActiveApp(entry.info.packageName);
         }
 
diff --git a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
index 270a5c8..670b5a8 100644
--- a/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
+++ b/src/com/android/settings/applications/manageapplications/ResetAppsHelper.java
@@ -112,13 +112,13 @@
             public void run() {
                 final List<ApplicationInfo> apps = mPm.getInstalledApplications(
                         PackageManager.GET_DISABLED_COMPONENTS);
-                final List<String> whiteList = Arrays.asList(
+                final List<String> allowList = Arrays.asList(
                         mContext.getResources().getStringArray(
                                 R.array.config_skip_reset_apps_package_name));
 
                 for (int i = 0; i < apps.size(); i++) {
                     ApplicationInfo app = apps.get(i);
-                    if (whiteList.contains(app.packageName)) {
+                    if (allowList.contains(app.packageName)) {
                         continue;
                     }
                     try {
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
index 9afb2b4..7c8b96f 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminAdd.java
@@ -288,7 +288,7 @@
             // setup.
             final String supervisor = getString(
                     com.android.internal.R.string.config_defaultSupervisionProfileOwnerComponent);
-            if (supervisor == null) {
+            if (TextUtils.isEmpty(supervisor)) {
                 Log.w(TAG, "Unable to set profile owner post-setup, no default supervisor"
                         + "profile owner defined");
                 finish();
@@ -297,7 +297,7 @@
 
             final ComponentName supervisorComponent = ComponentName.unflattenFromString(
                     supervisor);
-            if (who.compareTo(supervisorComponent) != 0) {
+            if (supervisorComponent == null || who.compareTo(supervisorComponent) != 0) {
                 Log.w(TAG, "Unable to set non-default profile owner post-setup " + who);
                 finish();
                 return;
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
index e25bb1e..2126109 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
@@ -46,7 +46,7 @@
 
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.FilterTouchesSwitchPreference;
+import com.android.settings.widget.AppSwitchPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -168,32 +168,32 @@
         if (mFooterPreference != null) {
             mFooterPreference.setVisible(mAdmins.isEmpty());
         }
-        final Map<String, FilterTouchesSwitchPreference> preferenceCache = new ArrayMap<>();
+        final Map<String, AppSwitchPreference> preferenceCache = new ArrayMap<>();
         final Context prefContext = mPreferenceGroup.getContext();
         final int childrenCount = mPreferenceGroup.getPreferenceCount();
         for (int i = 0; i < childrenCount; i++) {
             final Preference pref = mPreferenceGroup.getPreference(i);
-            if (!(pref instanceof FilterTouchesSwitchPreference)) {
+            if (!(pref instanceof AppSwitchPreference)) {
                 continue;
             }
-            final FilterTouchesSwitchPreference appSwitch = (FilterTouchesSwitchPreference) pref;
+            final AppSwitchPreference appSwitch = (AppSwitchPreference) pref;
             preferenceCache.put(appSwitch.getKey(), appSwitch);
         }
         for (DeviceAdminListItem item : mAdmins) {
             final String key = item.getKey();
-            FilterTouchesSwitchPreference pref = preferenceCache.remove(key);
+            AppSwitchPreference pref = preferenceCache.remove(key);
             if (pref == null) {
-                pref = new FilterTouchesSwitchPreference(prefContext);
+                pref = new AppSwitchPreference(prefContext);
                 mPreferenceGroup.addPreference(pref);
             }
             bindPreference(item, pref);
         }
-        for (FilterTouchesSwitchPreference unusedCacheItem : preferenceCache.values()) {
+        for (AppSwitchPreference unusedCacheItem : preferenceCache.values()) {
             mPreferenceGroup.removePreference(unusedCacheItem);
         }
     }
 
-    private void bindPreference(DeviceAdminListItem item, FilterTouchesSwitchPreference pref) {
+    private void bindPreference(DeviceAdminListItem item, AppSwitchPreference pref) {
         pref.setKey(item.getKey());
         pref.setTitle(item.getName());
         pref.setIcon(item.getIcon());
diff --git a/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java b/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
index 71d9d13..61af4f6 100644
--- a/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
+++ b/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java
@@ -142,7 +142,7 @@
     }
 
     private void logNonConfigurableAppMetrics() {
-        if (!isCrossProfilePackageWhitelisted(mPackageName)) {
+        if (!isCrossProfilePackageAllowlisted(mPackageName)) {
             logEvent(DevicePolicyEnums.CROSS_PROFILE_SETTINGS_PAGE_ADMIN_RESTRICTED);
             return;
         }
@@ -382,7 +382,7 @@
     private boolean refreshUiForNonConfigurableApps() {
         mSwitchPref.setChecked(false);
         mSwitchPref.setTitle(R.string.interact_across_profiles_switch_disabled);
-        if (!isCrossProfilePackageWhitelisted(mPackageName)) {
+        if (!isCrossProfilePackageAllowlisted(mPackageName)) {
             mInstallBanner.setVisible(false);
             mSwitchPref.setDisabledByAdmin(RestrictedLockUtils.getProfileOrDeviceOwner(
                     mContext, mWorkProfile));
@@ -417,7 +417,7 @@
         return false;
     }
 
-    private boolean isCrossProfilePackageWhitelisted(String packageName) {
+    private boolean isCrossProfilePackageAllowlisted(String packageName) {
         return mContext.getSystemService(DevicePolicyManager.class)
                 .getAllCrossProfilePackages().contains(packageName);
     }
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java
new file mode 100644
index 0000000..a43b9fd
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceController.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2020 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.specialaccess.notificationaccess;
+
+import android.app.NotificationManager;
+import android.app.settings.SettingsEnums;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.AsyncTask;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.overlay.FeatureFactory;
+
+public class ApprovalPreferenceController extends BasePreferenceController {
+
+    private static final String TAG = "ApprovalPrefController";
+
+    private PackageInfo mPkgInfo;
+    private ComponentName mCn;
+    private PreferenceFragmentCompat mParent;
+    private NotificationManager mNm;
+    private PackageManager mPm;
+
+    public ApprovalPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    public ApprovalPreferenceController setPkgInfo(PackageInfo pkgInfo) {
+        mPkgInfo = pkgInfo;
+        return this;
+    }
+
+    public ApprovalPreferenceController setCn(ComponentName cn) {
+        mCn = cn;
+        return this;
+    }
+
+    public ApprovalPreferenceController setParent(PreferenceFragmentCompat parent) {
+        mParent = parent;
+        return this;
+    }
+
+    public ApprovalPreferenceController setNm(NotificationManager nm) {
+        mNm = nm;
+        return this;
+    }
+
+    public ApprovalPreferenceController setPm(PackageManager pm) {
+        mPm = pm;
+        return this;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void updateState(Preference pref) {
+        final SwitchPreference preference = (SwitchPreference) pref;
+        final CharSequence label = mPkgInfo.applicationInfo.loadLabel(mPm);
+        preference.setChecked(isServiceEnabled(mCn));
+        preference.setOnPreferenceChangeListener((p, newValue) -> {
+            final boolean access = (Boolean) newValue;
+            if (!access) {
+                if (!isServiceEnabled(mCn)) {
+                    return true; // already disabled
+                }
+                // show a friendly dialog
+                new FriendlyWarningDialogFragment()
+                        .setServiceInfo(mCn, label, mParent)
+                        .show(mParent.getFragmentManager(), "friendlydialog");
+                return false;
+            } else {
+                if (isServiceEnabled(mCn)) {
+                    return true; // already enabled
+                }
+                // show a scary dialog
+                new ScaryWarningDialogFragment()
+                        .setServiceInfo(mCn, label, mParent)
+                        .show(mParent.getFragmentManager(), "dialog");
+                return false;
+            }
+        });
+    }
+
+    public void disable(final ComponentName cn) {
+        logSpecialPermissionChange(true, cn.getPackageName());
+        mNm.setNotificationListenerAccessGranted(cn, false);
+        AsyncTask.execute(() -> {
+            if (!mNm.isNotificationPolicyAccessGrantedForPackage(
+                    cn.getPackageName())) {
+                mNm.removeAutomaticZenRules(cn.getPackageName());
+            }
+        });
+    }
+
+    protected void enable(ComponentName cn) {
+        logSpecialPermissionChange(true, cn.getPackageName());
+        mNm.setNotificationListenerAccessGranted(cn, true);
+    }
+
+    protected boolean isServiceEnabled(ComponentName cn) {
+        return mNm.isNotificationListenerAccessGranted(cn);
+    }
+
+    @VisibleForTesting
+    void logSpecialPermissionChange(boolean enable, String packageName) {
+        final int logCategory = enable ? SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW
+                : SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY;
+        FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext,
+                logCategory, packageName);
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java b/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java
new file mode 100644
index 0000000..94736e4
--- /dev/null
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/HeaderPreferenceController.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2020 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.specialaccess.notificationaccess;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.util.IconDrawableFactory;
+import android.view.View;
+
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.applications.AppUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.LayoutPreference;
+
+public class HeaderPreferenceController extends BasePreferenceController
+        implements PreferenceControllerMixin, LifecycleObserver {
+
+    private DashboardFragment mFragment;
+    private EntityHeaderController mHeaderController;
+    private PackageInfo mPackageInfo;
+    private PackageManager mPm;
+    private CharSequence mServiceName;
+
+    public HeaderPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    public HeaderPreferenceController setFragment(DashboardFragment fragment) {
+        mFragment = fragment;
+        return this;
+    }
+
+    public HeaderPreferenceController setPackageInfo(PackageInfo packageInfo) {
+        mPackageInfo = packageInfo;
+        return this;
+    }
+
+    public HeaderPreferenceController setPm(PackageManager pm) {
+        mPm = pm;
+        return this;
+    }
+
+    public HeaderPreferenceController setServiceName(CharSequence serviceName) {
+        mServiceName = serviceName;
+        return this;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        if (mFragment == null) {
+            return;
+        }
+        LayoutPreference pref = screen.findPreference(getPreferenceKey());
+        mHeaderController = EntityHeaderController.newInstance(
+                mFragment.getActivity(), mFragment, pref.findViewById(R.id.entity_header));
+        pref = mHeaderController
+                .setRecyclerView(mFragment.getListView(), mFragment.getSettingsLifecycle())
+                .setIcon(IconDrawableFactory.newInstance(mFragment.getActivity())
+                        .getBadgedIcon(mPackageInfo.applicationInfo))
+                .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
+                .setSummary(mServiceName)
+                .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
+                .setPackageName(mPackageInfo.packageName)
+                .setUid(mPackageInfo.applicationInfo.uid)
+                .setHasAppInfoLink(true)
+                .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
+                        EntityHeaderController.ActionType.ACTION_NONE)
+                .done(mFragment.getActivity(), mContext);
+        pref.findViewById(R.id.entity_header).setVisibility(View.VISIBLE);
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_START)
+    public void onStart() {
+        if (mHeaderController != null) {
+            mHeaderController.styleActionBar(mFragment.getActivity());
+        }
+    }
+}
diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
index 58a6d7f..c0416a3 100644
--- a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
+++ b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java
@@ -16,52 +16,56 @@
 
 package com.android.settings.applications.specialaccess.notificationaccess;
 
+import static com.android.settings.applications.AppInfoBase.ARG_PACKAGE_NAME;
+
 import android.app.Activity;
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
-import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.service.notification.NotificationListenerService;
-import android.util.IconDrawableFactory;
 import android.util.Log;
 import android.util.Slog;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
+import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.applications.AppInfoBase;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.applications.AppUtils;
+import com.android.settings.SettingsActivity;
+import com.android.settings.applications.manageapplications.ManageApplications;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.applications.ApplicationsState;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-public class NotificationAccessDetails extends AppInfoBase {
+public class NotificationAccessDetails extends DashboardFragment {
     private static final String TAG = "NotifAccessDetails";
-    private static final String SWITCH_PREF_KEY = "notification_access_switch";
 
-    private boolean mCreated;
     private ComponentName mComponentName;
     private CharSequence mServiceName;
+    protected PackageInfo mPackageInfo;
+    protected int mUserId;
+    protected String mPackageName;
+    protected RestrictedLockUtils.EnforcedAdmin mAppsControlDisallowedAdmin;
+    protected boolean mAppsControlDisallowedBySystem;
     private boolean mIsNls;
-
-    private NotificationManager mNm;
     private PackageManager mPm;
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onAttach(Context context) {
+        super.onAttach(context);
         final Intent intent = getIntent();
         if (mComponentName == null && intent != null) {
             String cn = intent.getStringExtra(Settings.EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME);
@@ -73,38 +77,20 @@
                 }
             }
         }
-        super.onCreate(savedInstanceState);
-        mNm = getContext().getSystemService(NotificationManager.class);
         mPm = getPackageManager();
-        addPreferencesFromResource(R.xml.notification_access_permission_details);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        if (mCreated) {
-            Log.w(TAG, "onActivityCreated: ignoring duplicate call");
-            return;
-        }
-        mCreated = true;
-        if (mPackageInfo == null) return;
+        retrieveAppEntry();
         loadNotificationListenerService();
-        final Activity activity = getActivity();
-        final Preference pref = EntityHeaderController
-                .newInstance(activity, this, null /* header */)
-                .setRecyclerView(getListView(), getSettingsLifecycle())
-                .setIcon(IconDrawableFactory.newInstance(getContext())
-                        .getBadgedIcon(mPackageInfo.applicationInfo))
-                .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
-                .setSummary(mServiceName)
-                .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))
-                .setPackageName(mPackageName)
-                .setUid(mPackageInfo.applicationInfo.uid)
-                .setHasAppInfoLink(true)
-                .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,
-                        EntityHeaderController.ActionType.ACTION_NONE)
-                .done(activity, getPrefContext());
-        getPreferenceScreen().addPreference(pref);
+        use(ApprovalPreferenceController.class)
+                .setPkgInfo(mPackageInfo)
+                .setCn(mComponentName)
+                .setNm(context.getSystemService(NotificationManager.class))
+                .setPm(context.getPackageManager())
+                .setParent(this);
+        use(HeaderPreferenceController.class)
+                .setFragment(this)
+                .setPackageInfo(mPackageInfo)
+                .setPm(context.getPackageManager())
+                .setServiceName(mServiceName);
     }
 
     @Override
@@ -112,9 +98,7 @@
         return SettingsEnums.NOTIFICATION_ACCESS_DETAIL;
     }
 
-    @Override
     protected boolean refreshUi() {
-        final Context context = getContext();
         if (mComponentName == null) {
             // No service given
             Slog.d(TAG, "No component name provided");
@@ -130,72 +114,74 @@
             Slog.d(TAG, "NLSes aren't allowed in work profiles");
             return false;
         }
-        updatePreference(findPreference(SWITCH_PREF_KEY));
         return true;
     }
 
     @Override
-    protected AlertDialog createDialog(int id, int errorCode) {
-        return null;
+    public void onResume() {
+        super.onResume();
+        mAppsControlDisallowedAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+                getActivity(), UserManager.DISALLOW_APPS_CONTROL, mUserId);
+        mAppsControlDisallowedBySystem = RestrictedLockUtilsInternal.hasBaseUserRestriction(
+                getActivity(), UserManager.DISALLOW_APPS_CONTROL, mUserId);
+
+        if (!refreshUi()) {
+            setIntentAndFinish(true /* appChanged */);
+        }
     }
 
-    public void updatePreference(SwitchPreference preference) {
-        final CharSequence label = mPackageInfo.applicationInfo.loadLabel(mPm);
-        preference.setChecked(isServiceEnabled(mComponentName));
-        preference.setOnPreferenceChangeListener((p, newValue) -> {
-            final boolean access = (Boolean) newValue;
-            if (!access) {
-                if (!isServiceEnabled(mComponentName)) {
-                    return true; // already disabled
-                }
-                // show a friendly dialog
-                new FriendlyWarningDialogFragment()
-                        .setServiceInfo(mComponentName, label, this)
-                        .show(getFragmentManager(), "friendlydialog");
-                return false;
-            } else {
-                if (isServiceEnabled(mComponentName)) {
-                    return true; // already enabled
-                }
-                // show a scary dialog
-                new ScaryWarningDialogFragment()
-                        .setServiceInfo(mComponentName, label, this)
-                        .show(getFragmentManager(), "dialog");
-                return false;
+    protected void setIntentAndFinish(boolean appChanged) {
+        Log.i(TAG, "appChanged=" + appChanged);
+        Intent intent = new Intent();
+        intent.putExtra(ManageApplications.APP_CHG, appChanged);
+        SettingsActivity sa = (SettingsActivity) getActivity();
+        sa.finishPreferencePanel(Activity.RESULT_OK, intent);
+    }
+
+    protected void retrieveAppEntry() {
+        final Bundle args = getArguments();
+        mPackageName = (args != null) ? args.getString(ARG_PACKAGE_NAME) : null;
+        Intent intent = (args == null) ?
+                getIntent() : (Intent) args.getParcelable("intent");
+        if (mPackageName == null) {
+            if (intent != null && intent.getData() != null) {
+                mPackageName = intent.getData().getSchemeSpecificPart();
             }
-        });
+        }
+        if (intent != null && intent.hasExtra(Intent.EXTRA_USER_HANDLE)) {
+            mUserId = ((UserHandle) intent.getParcelableExtra(
+                    Intent.EXTRA_USER_HANDLE)).getIdentifier();
+        } else {
+            mUserId = UserHandle.myUserId();
+        }
+
+        try {
+            mPackageInfo = mPm.getPackageInfoAsUser(mPackageName,
+                    PackageManager.MATCH_DISABLED_COMPONENTS |
+                            PackageManager.GET_SIGNING_CERTIFICATES |
+                            PackageManager.GET_PERMISSIONS, mUserId);
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Exception when retrieving package:" + mPackageName, e);
+        }
     }
 
-    @VisibleForTesting
-    void logSpecialPermissionChange(boolean enable, String packageName) {
-        int logCategory = enable ? SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW
-                : SettingsEnums.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY;
-        FeatureFactory.getFactory(getContext()).getMetricsFeatureProvider().action(getContext(),
-                logCategory, packageName);
-    }
-
+    // Dialogs only have access to the parent fragment, not the controller, so pass the information
+    // along to keep business logic out of this file
     public void disable(final ComponentName cn) {
-        logSpecialPermissionChange(true, cn.getPackageName());
-        mNm.setNotificationListenerAccessGranted(cn, false);
-        AsyncTask.execute(() -> {
-            if (!mNm.isNotificationPolicyAccessGrantedForPackage(
-                    cn.getPackageName())) {
-                mNm.removeAutomaticZenRules(cn.getPackageName());
-            }
-        });
-        refreshUi();
+        final PreferenceScreen screen = getPreferenceScreen();
+        ApprovalPreferenceController controller = use(ApprovalPreferenceController.class);
+        controller.disable(cn);
+        controller.updateState(screen.findPreference(controller.getPreferenceKey()));
     }
 
     protected void enable(ComponentName cn) {
-        logSpecialPermissionChange(true, cn.getPackageName());
-        mNm.setNotificationListenerAccessGranted(cn, true);
-        refreshUi();
+        final PreferenceScreen screen = getPreferenceScreen();
+        ApprovalPreferenceController controller = use(ApprovalPreferenceController.class);
+        controller.enable(cn);
+        controller.updateState(screen.findPreference(controller.getPreferenceKey()));
     }
 
-    protected boolean isServiceEnabled(ComponentName cn) {
-        return mNm.isNotificationListenerAccessGranted(cn);
-    }
-
+    // To save binder calls, load this in the fragment rather than each preference controller
     protected void loadNotificationListenerService() {
         mIsNls = false;
 
@@ -218,4 +204,14 @@
             }
         }
     }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.notification_access_permission_details;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/FriendlyWarningDialogFragment.java b/src/com/android/settings/applications/specialaccess/zenaccess/FriendlyWarningDialogFragment.java
index fc85f7d..5da2990 100644
--- a/src/com/android/settings/applications/specialaccess/zenaccess/FriendlyWarningDialogFragment.java
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/FriendlyWarningDialogFragment.java
@@ -22,6 +22,7 @@
 import android.text.TextUtils;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -39,10 +40,12 @@
         return SettingsEnums.DIALOG_ZEN_ACCESS_REVOKE;
     }
 
-    public FriendlyWarningDialogFragment setPkgInfo(String pkg, CharSequence label) {
+    public FriendlyWarningDialogFragment setPkgInfo(String pkg, CharSequence label,
+            Fragment target) {
         Bundle args = new Bundle();
         args.putString(KEY_PKG, pkg);
         args.putString(KEY_LABEL, TextUtils.isEmpty(label) ? pkg : label.toString());
+        setTargetFragment(target, 0);
         setArguments(args);
         return this;
     }
@@ -58,6 +61,8 @@
                 R.string.zen_access_revoke_warning_dialog_title, label);
         final String summary = getResources()
                 .getString(R.string.zen_access_revoke_warning_dialog_summary);
+
+        ZenAccessDetails parent = (ZenAccessDetails) getTargetFragment();
         return new AlertDialog.Builder(getContext())
                 .setMessage(summary)
                 .setTitle(title)
@@ -66,6 +71,7 @@
                         (dialog, id) -> {
                             ZenAccessController.deleteRules(getContext(), pkg);
                             ZenAccessController.setAccess(getContext(), pkg, false);
+                            parent.refreshUi();
                         })
                 .setNegativeButton(R.string.cancel,
                         (dialog, id) -> {
diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java b/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java
index 778206b..e4ef48b 100644
--- a/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/ScaryWarningDialogFragment.java
@@ -22,6 +22,7 @@
 import android.text.TextUtils;
 
 import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
@@ -38,10 +39,11 @@
         return SettingsEnums.DIALOG_ZEN_ACCESS_GRANT;
     }
 
-    public ScaryWarningDialogFragment setPkgInfo(String pkg, CharSequence label) {
+    public ScaryWarningDialogFragment setPkgInfo(String pkg, CharSequence label, Fragment target) {
         Bundle args = new Bundle();
         args.putString(KEY_PKG, pkg);
         args.putString(KEY_LABEL, TextUtils.isEmpty(label) ? pkg : label.toString());
+        setTargetFragment(target, 0);
         setArguments(args);
         return this;
     }
@@ -57,12 +59,18 @@
                 label);
         final String summary = getResources()
                 .getString(R.string.zen_access_warning_dialog_summary);
+
+        ZenAccessDetails parent = (ZenAccessDetails) getTargetFragment();
+
         return new AlertDialog.Builder(getContext())
                 .setMessage(summary)
                 .setTitle(title)
                 .setCancelable(true)
                 .setPositiveButton(R.string.allow,
-                        (dialog, id) -> ZenAccessController.setAccess(getContext(), pkg, true))
+                        (dialog, id) -> {
+                            ZenAccessController.setAccess(getContext(), pkg, true);
+                            parent.refreshUi();
+                        })
                 .setNegativeButton(R.string.deny,
                         (dialog, id) -> {
                             // pass
diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
index 727870c..e6b389a 100644
--- a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessController.java
@@ -40,20 +40,13 @@
 
     private static final String TAG = "ZenAccessController";
 
-    private final ActivityManager mActivityManager;
-
     public ZenAccessController(Context context, String preferenceKey) {
         super(context, preferenceKey);
-        mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
     }
 
     @Override
     public int getAvailabilityStatus() {
-        return isSupported(mActivityManager) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
-    }
-
-    public static boolean isSupported(ActivityManager activityManager) {
-        return !activityManager.isLowRamDevice();
+        return AVAILABLE;
     }
 
     public static Set<String> getPackagesRequestingNotificationPolicyAccess() {
diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
index a18e7d6..c608b5b 100644
--- a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessDetails.java
@@ -50,9 +50,6 @@
     @Override
     protected boolean refreshUi() {
         final Context context = getContext();
-        if (!ZenAccessController.isSupported(context.getSystemService(ActivityManager.class))) {
-            return false;
-        }
         // If this app didn't declare this permission in their manifest, don't bother showing UI.
         final Set<String> needAccessApps =
                 ZenAccessController.getPackagesRequestingNotificationPolicyAccess();
@@ -82,11 +79,11 @@
             final boolean access = (Boolean) newValue;
             if (access) {
                 new ScaryWarningDialogFragment()
-                        .setPkgInfo(mPackageName, label)
+                        .setPkgInfo(mPackageName, label, ZenAccessDetails.this)
                         .show(getFragmentManager(), "dialog");
             } else {
                 new FriendlyWarningDialogFragment()
-                        .setPkgInfo(mPackageName, label)
+                        .setPkgInfo(mPackageName, label, ZenAccessDetails.this)
                         .show(getFragmentManager(), "dialog");
             }
             return false;
diff --git a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixin.java b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixin.java
index 30507ef..f378e7b 100644
--- a/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixin.java
+++ b/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixin.java
@@ -53,14 +53,6 @@
 
     @Override
     public void onStart() {
-        if (!ZenAccessController.isSupported(mContext.getSystemService(ActivityManager.class))) {
-            return;
-        }
-        mContext.getContentResolver().registerContentObserver(
-                Settings.Secure.getUriFor(
-                        Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES),
-                false /* notifyForDescendants */,
-                this /* observer */);
         mContext.getContentResolver().registerContentObserver(
                 Settings.Secure.getUriFor(Settings.Secure.ENABLED_NOTIFICATION_LISTENERS),
                 false /* notifyForDescendants */,
@@ -69,9 +61,6 @@
 
     @Override
     public void onStop() {
-        if (!ZenAccessController.isSupported(mContext.getSystemService(ActivityManager.class))) {
-            return;
-        }
         mContext.getContentResolver().unregisterContentObserver(this /* observer */);
     }
 }
diff --git a/src/com/android/settings/backup/OWNERS b/src/com/android/settings/backup/OWNERS
index d5a95be..0f88811 100644
--- a/src/com/android/settings/backup/OWNERS
+++ b/src/com/android/settings/backup/OWNERS
@@ -1,14 +1,4 @@
-# Use this reviewer by default.
-br-framework-team+reviews@google.com
+# Bug component: 656484
 
-# People who can approve changes for submission.
-alsutton@google.com
-anniemeng@google.com
-nathch@google.com
-rthakohov@google.com
+include platform/frameworks/base:/services/backup/OWNERS
 
-# Others (in case above are not available).
-bryanmawhinney@google.com
-jorlow@google.com
-philippov@google.com
-stefanot@google.com
diff --git a/src/com/android/settings/backup/SettingsBackupHelper.java b/src/com/android/settings/backup/SettingsBackupHelper.java
index 92612b0..6437b78 100644
--- a/src/com/android/settings/backup/SettingsBackupHelper.java
+++ b/src/com/android/settings/backup/SettingsBackupHelper.java
@@ -59,7 +59,7 @@
 
             try (FileOutputStream out = new FileOutputStream(newState.getFileDescriptor())) {
                 if (getVersionCode(oldState) != VERSION_CODE) {
-                    data.writeEntityHeader("dummy", 1);
+                    data.writeEntityHeader("placeholder", 1);
                     data.writeEntityData(new byte[1], 1);
                 }
 
diff --git a/src/com/android/settings/biometrics/BiometricEnrollActivity.java b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
index 4179ea3..2985a9d 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollActivity.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollActivity.java
@@ -16,27 +16,41 @@
 
 package com.android.settings.biometrics;
 
+import android.annotation.NonNull;
 import android.app.admin.DevicePolicyManager;
 import android.app.settings.SettingsEnums;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.hardware.biometrics.BiometricManager;
 import android.hardware.biometrics.BiometricManager.Authenticators;
+import android.hardware.face.FaceManager;
+import android.hardware.face.FaceSensorPropertiesInternal;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.provider.Settings;
 import android.util.Log;
+import android.view.View;
 
+import androidx.annotation.Nullable;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
-import com.android.settings.biometrics.face.FaceEnrollIntroduction;
-import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;
-import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
-import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction;
 import com.android.settings.core.InstrumentedActivity;
 import com.android.settings.password.ChooseLockGeneric;
+import com.android.settings.password.ChooseLockPattern;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
+import com.google.android.setupcompat.template.FooterBarMixin;
+import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupcompat.util.WizardManagerHelper;
+import com.google.android.setupdesign.GlifLayout;
+
+import java.util.List;
 
 /**
  * Trampoline activity launched by the {@code android.settings.BIOMETRIC_ENROLL} action which
@@ -48,95 +62,340 @@
 
     private static final String TAG = "BiometricEnrollActivity";
 
+    private static final int REQUEST_CHOOSE_LOCK = 1;
+    private static final int REQUEST_CONFIRM_LOCK = 2;
+
+    public static final int RESULT_SKIP = BiometricEnrollBase.RESULT_SKIP;
+
+    // Intent extra. If true, biometric enrollment should skip introductory screens. Currently
+    // this only applies to fingerprint.
     public static final String EXTRA_SKIP_INTRO = "skip_intro";
 
+    private static final String SAVED_STATE_CONFIRMING_CREDENTIALS = "confirming_credentials";
+    private static final String SAVED_STATE_GK_PW_HANDLE = "gk_pw_handle";
+
     public static final class InternalActivity extends BiometricEnrollActivity {}
 
+    private int mUserId = UserHandle.myUserId();
+    private boolean mConfirmingCredentials;
+    @Nullable private Long mGkPwHandle;
+    private BiometricEnrollCheckbox mCheckboxFace;
+    private BiometricEnrollCheckbox mCheckboxFingerprint;
+    @Nullable private MultiBiometricEnrollHelper mMultiBiometricEnrollHelper;
+
     @Override
-    public void onCreate(Bundle savedInstanceState) {
+    public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (this instanceof InternalActivity) {
+            mUserId = getIntent().getIntExtra(Intent.EXTRA_USER_ID, UserHandle.myUserId());
+            if (BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
+                mGkPwHandle = BiometricUtils.getGatekeeperPasswordHandle(getIntent());
+            }
+        }
+
+        if (savedInstanceState != null) {
+            mConfirmingCredentials = savedInstanceState
+                    .getBoolean(SAVED_STATE_CONFIRMING_CREDENTIALS, false);
+            if (savedInstanceState.containsKey(SAVED_STATE_GK_PW_HANDLE)) {
+                mGkPwHandle = savedInstanceState.getLong(SAVED_STATE_GK_PW_HANDLE);
+            }
+        }
+
+        // Put the theme in the intent so it gets propagated to other activities in the flow
+        final Intent intent = getIntent();
+        if (intent.getStringExtra(WizardManagerHelper.EXTRA_THEME) == null) {
+            intent.putExtra(
+                    WizardManagerHelper.EXTRA_THEME,
+                    SetupWizardUtils.getThemeString(intent));
+        }
+
         // Default behavior is to enroll BIOMETRIC_WEAK or above. See ACTION_BIOMETRIC_ENROLL.
-        final int authenticators = getIntent().getIntExtra(
+        final int authenticators = intent.getIntExtra(
                 Settings.EXTRA_BIOMETRIC_AUTHENTICATORS_ALLOWED, Authenticators.BIOMETRIC_WEAK);
 
         Log.d(TAG, "Authenticators: " + authenticators);
 
-        final BiometricManager bm = getSystemService(BiometricManager.class);
         final PackageManager pm = getApplicationContext().getPackageManager();
-        Intent intent = null;
+        final boolean hasFeatureFingerprint =
+                pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
+        final boolean hasFeatureFace = pm.hasSystemFeature(PackageManager.FEATURE_FACE);
+        final boolean isSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
 
-        final int result = bm.canAuthenticate(authenticators);
-
-        if (!WizardManagerHelper.isAnySetupWizard(getIntent())) {
-            if (result == BiometricManager.BIOMETRIC_SUCCESS
-                    || result == BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE) {
+        if (isSetupWizard) {
+            if (hasFeatureFace && hasFeatureFingerprint) {
+                setupForMultiBiometricEnroll();
+            } else if (hasFeatureFace) {
+                launchFaceOnlyEnroll();
+            } else if (hasFeatureFingerprint) {
+                launchFingerprintOnlyEnroll();
+            } else {
+                Log.e(TAG, "No biometrics but started by SUW?");
+                finish();
+            }
+        } else {
+            // If the caller is not setup wizard, and the user has something enrolled, finish.
+            final BiometricManager bm = getSystemService(BiometricManager.class);
+            final @BiometricManager.BiometricError int result = bm.canAuthenticate(authenticators);
+            if (result != BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED) {
                 Log.e(TAG, "Unexpected result: " + result);
                 finish();
                 return;
             }
-        }
 
-        if (authenticators == BiometricManager.Authenticators.DEVICE_CREDENTIAL) {
-            // If only device credential was specified, ask the user to only set that up.
-            intent = new Intent(this, ChooseLockGeneric.class);
-            intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
-                    DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-        } else if (pm.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) {
-            // This logic may have to be modified on devices with multiple biometrics.
-            // ChooseLockGeneric can request to start fingerprint enroll bypassing the intro screen.
-            if (getIntent().getBooleanExtra(EXTRA_SKIP_INTRO, false)
-                    && this instanceof InternalActivity) {
-                intent = getFingerprintFindSensorIntent();
+            // This will need to be updated if the device has sensors other than BIOMETRIC_STRONG
+            if (authenticators == BiometricManager.Authenticators.DEVICE_CREDENTIAL) {
+                launchCredentialOnlyEnroll();
+            } else if (hasFeatureFace && hasFeatureFingerprint) {
+                setupForMultiBiometricEnroll();
+            } else if (hasFeatureFingerprint) {
+                launchFingerprintOnlyEnroll();
+            } else if (hasFeatureFace) {
+                launchFaceOnlyEnroll();
             } else {
-                intent = getFingerprintIntroIntent();
+                Log.e(TAG, "Unknown state, finishing");
+                finish();
             }
-        } else if (pm.hasSystemFeature(PackageManager.FEATURE_FACE)) {
-            intent = getFaceIntroIntent();
+        }
+    }
+
+    @Override
+    protected void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(SAVED_STATE_CONFIRMING_CREDENTIALS, mConfirmingCredentials);
+        if (mGkPwHandle != null) {
+            outState.putLong(SAVED_STATE_GK_PW_HANDLE, mGkPwHandle);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (mMultiBiometricEnrollHelper == null) {
+            overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
+
+            switch (requestCode) {
+                case REQUEST_CHOOSE_LOCK:
+                    mConfirmingCredentials = false;
+                    if (resultCode == ChooseLockPattern.RESULT_FINISHED) {
+                        mGkPwHandle = BiometricUtils.getGatekeeperPasswordHandle(data);
+                    } else {
+                        Log.d(TAG, "Unknown result for chooseLock: " + resultCode);
+                        setResult(resultCode);
+                        finish();
+                    }
+                    break;
+                case REQUEST_CONFIRM_LOCK:
+                    mConfirmingCredentials = false;
+                    if (resultCode == RESULT_OK) {
+                        mGkPwHandle = BiometricUtils.getGatekeeperPasswordHandle(data);
+                    } else {
+                        Log.d(TAG, "Unknown result for confirmLock: " + resultCode);
+                        finish();
+                    }
+                    break;
+                default:
+                    Log.d(TAG, "Unknown requestCode: " + requestCode + ", finishing");
+                    finish();
+            }
+        } else {
+            mMultiBiometricEnrollHelper.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    @Override
+    protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        theme.applyStyle(R.style.SetupWizardPartnerResource, true);
+        super.onApplyThemeResource(theme, new_resid, first);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+
+        if (mConfirmingCredentials || mMultiBiometricEnrollHelper != null) {
+            return;
         }
 
-        if (intent != null) {
-            intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-
-            if (this instanceof InternalActivity) {
-                // Propagate challenge and user Id from ChooseLockGeneric.
-                final byte[] token = getIntent()
-                        .getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
-                final int userId = getIntent()
-                        .getIntExtra(Intent.EXTRA_USER_ID, UserHandle.USER_NULL);
-
-                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
-                intent.putExtra(Intent.EXTRA_USER_ID, userId);
-            }
-
-            startActivity(intent);
-            finish();
-        } else {
-            Log.e(TAG, "Intent was null, finishing");
+        if (!isChangingConfigurations()) {
+            Log.d(TAG, "Finishing in onStop");
             finish();
         }
     }
 
-    private Intent getFingerprintFindSensorIntent() {
-        Intent intent = new Intent(this, FingerprintEnrollFindSensor.class);
-        SetupWizardUtils.copySetupExtras(getIntent(), intent);
-        return intent;
-    }
+    private void setupForMultiBiometricEnroll() {
+        setContentView(R.layout.biometric_enroll_layout);
 
-    private Intent getFingerprintIntroIntent() {
-        if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
-            Intent intent = new Intent(this, SetupFingerprintEnrollIntroduction.class);
-            WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);
-            return intent;
-        } else {
-            return new Intent(this, FingerprintEnrollIntroduction.class);
+        mCheckboxFace = findViewById(R.id.checkbox_face);
+        mCheckboxFingerprint = findViewById(R.id.checkbox_fingerprint);
+
+        mCheckboxFace.setListener(this::updateNextButton);
+        mCheckboxFingerprint.setListener(this::updateNextButton);
+
+        final FingerprintManager fingerprintManager = getSystemService(FingerprintManager.class);
+        final FaceManager faceManager = getSystemService(FaceManager.class);
+        final List<FingerprintSensorPropertiesInternal> fpProperties =
+                fingerprintManager.getSensorPropertiesInternal();
+        final List<FaceSensorPropertiesInternal> faceProperties =
+                faceManager.getSensorPropertiesInternal();
+
+        // This would need to be updated for devices with multiple sensors of the same modality
+        final boolean maxFacesEnrolled = faceManager.getEnrolledFaces(mUserId).size()
+                >= faceProperties.get(0).maxEnrollmentsPerUser;
+        final boolean maxFingerprintsEnrolled = fingerprintManager.getEnrolledFingerprints(mUserId)
+                .size() >= fpProperties.get(0).maxEnrollmentsPerUser;
+
+        if (maxFacesEnrolled) {
+            mCheckboxFace.setEnabled(false);
+            mCheckboxFace.setDescription(R.string.face_intro_error_max);
+        }
+
+        if (maxFingerprintsEnrolled) {
+            mCheckboxFingerprint.setEnabled(false);
+            mCheckboxFingerprint.setDescription(R.string.fingerprint_intro_error_max);
+        }
+
+        final FooterBarMixin footerBarMixin = ((GlifLayout) findViewById(R.id.setup_wizard_layout))
+                .getMixin(FooterBarMixin.class);
+        footerBarMixin.setSecondaryButton(new FooterButton.Builder(this)
+                .setText(R.string.multi_biometric_enroll_skip)
+                .setListener(this::onButtonNegative)
+                .setButtonType(FooterButton.ButtonType.SKIP)
+                .setTheme(R.style.SudGlifButton_Secondary)
+                .build());
+
+        footerBarMixin.setPrimaryButton(new FooterButton.Builder(this)
+                .setText(R.string.multi_biometric_enroll_next)
+                .setListener(this::onButtonPositive)
+                .setButtonType(FooterButton.ButtonType.NEXT)
+                .setTheme(R.style.SudGlifButton_Primary)
+                .build());
+
+        footerBarMixin.getSecondaryButton().setVisibility(View.VISIBLE);
+        footerBarMixin.getPrimaryButton().setVisibility(View.VISIBLE);
+
+        if (!mConfirmingCredentials && mGkPwHandle == null) {
+            mConfirmingCredentials = true;
+            if (!userHasPassword(mUserId)) {
+                launchChooseLock();
+            } else {
+                launchConfirmLock();
+            }
         }
     }
 
-    private Intent getFaceIntroIntent() {
-        Intent intent = new Intent(this, FaceEnrollIntroduction.class);
-        WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);
-        return intent;
+    private void updateNextButton(View view) {
+        final boolean canEnrollAny = canEnrollFace() || canEnrollFingerprint();
+
+        final FooterBarMixin footerBarMixin = ((GlifLayout) findViewById(R.id.setup_wizard_layout))
+                .getMixin(FooterBarMixin.class);
+        footerBarMixin.getPrimaryButton().setEnabled(canEnrollAny);
+    }
+
+    private void onButtonPositive(View view) {
+        // Start the state machine according to checkboxes, taking max enrolled into account
+        mMultiBiometricEnrollHelper = new MultiBiometricEnrollHelper(this, mUserId,
+                canEnrollFace(), canEnrollFingerprint(), mGkPwHandle);
+        mMultiBiometricEnrollHelper.startNextStep();
+    }
+
+    private void onButtonNegative(View view) {
+        setResult(RESULT_SKIP);
+        finish();
+    }
+
+    private boolean canEnrollFace() {
+        return mCheckboxFace.isEnabled() && mCheckboxFace.isChecked();
+    }
+
+    private boolean canEnrollFingerprint() {
+        return mCheckboxFingerprint.isEnabled() && mCheckboxFingerprint.isChecked();
+    }
+
+    private boolean userHasPassword(int userId) {
+        final UserManager userManager = getSystemService(UserManager.class);
+        final int passwordQuality = new LockPatternUtils(this)
+                .getActivePasswordQuality(userManager.getCredentialOwnerProfile(userId));
+        return passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
+    }
+
+    private void launchChooseLock() {
+        Log.d(TAG, "launchChooseLock");
+        Intent intent = BiometricUtils.getChooseLockIntent(this, getIntent());
+        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, true);
+
+        if (mUserId != UserHandle.USER_NULL) {
+            intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
+        }
+        startActivityForResult(intent, REQUEST_CHOOSE_LOCK);
+    }
+
+    private void launchConfirmLock() {
+        Log.d(TAG, "launchConfirmLock");
+        final ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(this);
+        builder.setRequestCode(REQUEST_CONFIRM_LOCK)
+                .setRequestGatekeeperPasswordHandle(true)
+                .setForegroundOnly(true)
+                .setReturnCredentials(true);
+        if (mUserId != UserHandle.USER_NULL) {
+            builder.setUserId(mUserId);
+        }
+        final boolean launched = builder.show();
+        if (!launched) {
+            // This shouldn't happen, as we should only end up at this step if a lock thingy is
+            // already set.
+            finish();
+        }
+    }
+
+    /**
+     * This should only be used to launch enrollment for single-sensor devices, which use
+     * FLAG_ACTIVITY_FORWARD_RESULT path.
+     *
+     * @param intent Enrollment activity that should be started (e.g. FaceEnrollIntroduction.class,
+     *               etc).
+     */
+    private void launchEnrollActivity(@NonNull Intent intent) {
+        intent.setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+        byte[] hardwareAuthToken = null;
+        if (this instanceof InternalActivity) {
+            hardwareAuthToken = getIntent().getByteArrayExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+        }
+        BiometricUtils.launchEnrollForResult(this, intent, 0 /* requestCode */, hardwareAuthToken,
+                mGkPwHandle, mUserId);
+    }
+
+    private void launchCredentialOnlyEnroll() {
+        final Intent intent;
+        // If only device credential was specified, ask the user to only set that up.
+        intent = new Intent(this, ChooseLockGeneric.class);
+        intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+        launchEnrollActivity(intent);
+    }
+
+    private void launchFingerprintOnlyEnroll() {
+        final Intent intent;
+        // ChooseLockGeneric can request to start fingerprint enroll bypassing the intro screen.
+        if (getIntent().getBooleanExtra(EXTRA_SKIP_INTRO, false)
+                && this instanceof InternalActivity) {
+            intent = BiometricUtils.getFingerprintFindSensorIntent(this, getIntent());
+        } else {
+            intent = BiometricUtils.getFingerprintIntroIntent(this, getIntent());
+        }
+        launchEnrollActivity(intent);
+    }
+
+    private void launchFaceOnlyEnroll() {
+        final Intent intent = BiometricUtils.getFaceIntroIntent(this, getIntent());
+        launchEnrollActivity(intent);
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/BiometricEnrollBase.java b/src/com/android/settings/biometrics/BiometricEnrollBase.java
index 308878f..7936f66 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollBase.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollBase.java
@@ -57,6 +57,9 @@
      * starting the next activity. However, this leads to broken 'Back'
      * behavior. So, now an activity does not finish itself until it gets this
      * result.
+     *
+     * This must be the same as
+     * {@link com.android.settings.password.ChooseLockPattern#RESULT_FINISHED}
      */
     public static final int RESULT_FINISHED = RESULT_FIRST_USER;
 
@@ -78,6 +81,11 @@
     public static final int LEARN_MORE_REQUEST = 3;
     public static final int CONFIRM_REQUEST = 4;
     public static final int ENROLL_REQUEST = 5;
+    /**
+     * Request code when starting another biometric enrollment from within a biometric flow. For
+     * example, when starting fingerprint enroll after face enroll.
+     */
+    public static final int ENROLL_NEXT_BIOMETRIC_REQUEST = 6;
 
     protected boolean mLaunchedConfirmLock;
     protected byte[] mToken;
@@ -88,7 +96,13 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mToken = getIntent().getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+        // Don't need to retrieve the HAT if it already exists. In some cases, the extras do not
+        // contain EXTRA_KEY_CHALLENGE_TOKEN but contain EXTRA_KEY_GK_PW, in which case enrollment
+        // classes may request a HAT to be created (as opposed to being passed in)
+        if (mToken == null) {
+            mToken = getIntent().getByteArrayExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+        }
         mFromSettingsSummary = getIntent().getBooleanExtra(EXTRA_FROM_SETTINGS_SUMMARY, false);
         if (savedInstanceState != null && mToken == null) {
             mLaunchedConfirmLock = savedInstanceState.getBoolean(EXTRA_KEY_LAUNCHED_CONFIRM);
@@ -102,9 +116,9 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
         theme.applyStyle(R.style.SetupWizardPartnerResource, true);
-        super.onApplyThemeResource(theme, resid, first);
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     @Override
@@ -180,19 +194,20 @@
         return intent;
     }
 
-    protected void launchConfirmLock(int titleResId, long challenge) {
-        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(this);
-        boolean launchedConfirmationActivity;
-        if (mUserId == UserHandle.USER_NULL) {
-            launchedConfirmationActivity = helper.launchConfirmationActivity(CONFIRM_REQUEST,
-                    getString(titleResId),
-                    null, null, challenge, true /* foregroundOnly */);
-        } else {
-            launchedConfirmationActivity = helper.launchConfirmationActivity(CONFIRM_REQUEST,
-                    getString(titleResId),
-                    null, null, challenge, mUserId, true /* foregroundOnly */);
+    protected void launchConfirmLock(int titleResId) {
+        final ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(this);
+        builder.setRequestCode(CONFIRM_REQUEST)
+                .setTitle(getString(titleResId))
+                .setRequestGatekeeperPasswordHandle(true)
+                .setForegroundOnly(true)
+                .setReturnCredentials(true);
+
+        if (mUserId != UserHandle.USER_NULL) {
+            builder.setUserId(mUserId);
         }
-        if (!launchedConfirmationActivity) {
+
+        final boolean launched = builder.show();
+        if (!launched) {
             // This shouldn't happen, as we should only end up at this step if a lock thingy is
             // already set.
             finish();
diff --git a/src/com/android/settings/biometrics/BiometricEnrollCheckbox.java b/src/com/android/settings/biometrics/BiometricEnrollCheckbox.java
new file mode 100644
index 0000000..d2ff634
--- /dev/null
+++ b/src/com/android/settings/biometrics/BiometricEnrollCheckbox.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2020 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.biometrics;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+
+import com.android.settings.R;
+
+/**
+ * Widget contain space for an icon, title, description, and checkbox. On devices with multiple
+ * biometric sensors, allows users to choose sensors during {@link BiometricEnrollActivity}.
+ */
+public class BiometricEnrollCheckbox extends LinearLayout {
+
+    @NonNull private final CheckBox mCheckBox;
+    @NonNull private final TextView mDescriptionView;
+    @Nullable private View.OnClickListener mListener;
+
+    public BiometricEnrollCheckbox(Context context) {
+        this(context, null /* attrs */);
+    }
+
+    public BiometricEnrollCheckbox(Context context,
+            @Nullable AttributeSet attrs) {
+        this(context, attrs, 0 /* defStyleAttr */);
+    }
+
+    public BiometricEnrollCheckbox(Context context, @Nullable AttributeSet attrs,
+            int defStyleAttr) {
+        this(context, attrs, defStyleAttr, 0 /* defStyleRes */);
+    }
+
+    public BiometricEnrollCheckbox(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+
+        LayoutInflater.from(context).inflate(R.layout.biometric_enroll_checkbox,
+                this, true /* attachToRoot */);
+
+        mCheckBox = findViewById(R.id.checkbox);
+        final ImageView iconView = findViewById(R.id.icon);
+        final TextView titleView = findViewById(R.id.title);
+        mDescriptionView = findViewById(R.id.description);
+
+        setOnClickListener(view -> {
+            if (isEnabled()) {
+                mCheckBox.toggle();
+            }
+            if (mListener != null) {
+                mListener.onClick(view);
+            }
+        });
+
+        final TypedArray a = context
+                .obtainStyledAttributes(attrs, R.styleable.BiometricEnrollCheckbox);
+        try {
+            final Drawable icon =
+                    a.getDrawable(R.styleable.BiometricEnrollCheckbox_icon);
+            final CharSequence title =
+                    a.getText(R.styleable.BiometricEnrollCheckbox_title);
+            final CharSequence description =
+                    a.getText(R.styleable.BiometricEnrollCheckbox_description);
+            iconView.setImageDrawable(icon);
+            titleView.setText(title);
+            mDescriptionView.setText(description);
+        } finally {
+            a.recycle();
+        }
+    }
+
+    public void setListener(View.OnClickListener listener) {
+        mListener = listener;
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        mCheckBox.setEnabled(enabled);
+    }
+
+    public boolean isChecked() {
+        return mCheckBox.isChecked();
+    }
+
+    public void setDescription(@StringRes int resId) {
+        mDescriptionView.setText(resId);
+    }
+}
diff --git a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
index d815f57..26df474 100644
--- a/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/BiometricEnrollIntroduction.java
@@ -21,7 +21,7 @@
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.os.storage.StorageManager;
+import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 
@@ -29,9 +29,7 @@
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
 import com.android.settings.password.ChooseLockGeneric;
-import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
 import com.android.settings.password.ChooseLockSettingsHelper;
-import com.android.settings.password.SetupChooseLockGeneric;
 
 import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -43,6 +41,10 @@
 public abstract class BiometricEnrollIntroduction extends BiometricEnrollBase
         implements LinkSpan.OnClickListener {
 
+    private static final String TAG = "BiometricEnrollIntroduction";
+
+    private static final String KEY_CONFIRMING_CREDENTIALS = "confirming_credentials";
+
     private UserManager mUserManager;
     private boolean mHasPassword;
     private boolean mBiometricUnlockDisabledByAdmin;
@@ -99,7 +101,7 @@
     /**
      * @return the challenge generated by the biometric hardware
      */
-    protected abstract long getChallenge();
+    protected abstract void getChallenge(GenerateChallengeCallback callback);
 
     /**
      * @return one of the ChooseLockSettingsHelper#EXTRA_KEY_FOR_* constants
@@ -123,10 +125,18 @@
      */
     public abstract void onClick(LinkSpan span);
 
+    protected interface GenerateChallengeCallback {
+        void onChallengeGenerated(int sensorId, long challenge);
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if (savedInstanceState != null) {
+            mConfirmingCredentials = savedInstanceState.getBoolean(KEY_CONFIRMING_CREDENTIALS);
+        }
+
         Intent intent = getIntent();
         if (intent.getStringExtra(WizardManagerHelper.EXTRA_THEME) == null) {
             // Put the theme in the intent so it gets propagated to other activities in the flow
@@ -149,15 +159,18 @@
         mUserManager = UserManager.get(this);
         updatePasswordQuality();
 
-        if (!mHasPassword) {
-            // No password registered, launch into enrollment wizard.
-            mConfirmingCredentials = true;
-            launchChooseLock();
-        } else if (mToken == null) {
-            // It's possible to have a token but mLaunchedConfirmLock == false, since
-            // ChooseLockGeneric can pass us a token.
-            mConfirmingCredentials = true;
-            launchConfirmLock(getConfirmLockTitleResId(), getChallenge());
+        if (!mConfirmingCredentials) {
+            if (!mHasPassword) {
+                // No password registered, launch into enrollment wizard.
+                mConfirmingCredentials = true;
+                launchChooseLock();
+            } else if (!BiometricUtils.containsGatekeeperPasswordHandle(getIntent())
+                    && mToken == null) {
+                // It's possible to have a token but mLaunchedConfirmLock == false, since
+                // ChooseLockGeneric can pass us a token.
+                mConfirmingCredentials = true;
+                launchConfirmLock(getConfirmLockTitleResId());
+            }
         }
     }
 
@@ -179,12 +192,18 @@
     }
 
     @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(KEY_CONFIRMING_CREDENTIALS, mConfirmingCredentials);
+    }
+
+    @Override
     protected boolean shouldFinishWhenBackgrounded() {
         return super.shouldFinishWhenBackgrounded() && !mConfirmingCredentials && !mNextClicked;
     }
 
     private void updatePasswordQuality() {
-        final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
+        final int passwordQuality = new LockPatternUtils(this)
                 .getActivePasswordQuality(mUserManager.getCredentialOwnerProfile(mUserId));
         mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
     }
@@ -202,13 +221,11 @@
     }
 
     private void launchChooseLock() {
-        Intent intent = getChooseLockIntent();
-        long challenge = getChallenge();
+        Intent intent = BiometricUtils.getChooseLockIntent(this, getIntent());
         intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
                 DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
         intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
         intent.putExtra(getExtraKeyForBiometric(), true);
         if (mUserId != UserHandle.USER_NULL) {
             intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
@@ -224,27 +241,11 @@
         if (mUserId != UserHandle.USER_NULL) {
             intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
         }
+        BiometricUtils.copyMultiBiometricExtras(getIntent(), intent);
         intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
         startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
     }
 
-    protected Intent getChooseLockIntent() {
-        if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
-            // Default to PIN lock in setup wizard
-            Intent intent = new Intent(this, SetupChooseLockGeneric.class);
-            if (StorageManager.isFileEncryptedNativeOrEmulated()) {
-                intent.putExtra(
-                        LockPatternUtils.PASSWORD_TYPE_KEY,
-                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
-                intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
-            }
-            WizardManagerHelper.copyWizardManagerExtras(getIntent(), intent);
-            return intent;
-        } else {
-            return new Intent(this, ChooseLockGeneric.class);
-        }
-    }
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == BIOMETRIC_FIND_SENSOR_REQUEST) {
@@ -255,13 +256,16 @@
                 return;
             }
         } else if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST) {
+            mConfirmingCredentials = false;
             if (resultCode == RESULT_FINISHED) {
                 updatePasswordQuality();
-                mToken = data.getByteArrayExtra(
-                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
                 overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
-                mConfirmingCredentials = false;
-                return;
+                getNextButton().setEnabled(false);
+                getChallenge(((sensorId, challenge) -> {
+                    mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
+                    BiometricUtils.removeGatekeeperPasswordHandle(this, data);
+                    getNextButton().setEnabled(true);
+                }));
             } else {
                 setResult(resultCode, data);
                 finish();
@@ -269,14 +273,25 @@
         } else if (requestCode == CONFIRM_REQUEST) {
             mConfirmingCredentials = false;
             if (resultCode == RESULT_OK && data != null) {
-                mToken = data.getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
                 overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
+                getNextButton().setEnabled(false);
+                getChallenge(((sensorId, challenge) -> {
+                    mToken = BiometricUtils.requestGatekeeperHat(this, data, mUserId, challenge);
+                    BiometricUtils.removeGatekeeperPasswordHandle(this, data);
+                    getNextButton().setEnabled(true);
+                }));
             } else {
                 setResult(resultCode, data);
                 finish();
             }
         } else if (requestCode == LEARN_MORE_REQUEST) {
             overridePendingTransition(R.anim.sud_slide_back_in, R.anim.sud_slide_back_out);
+        } else if (requestCode == ENROLL_NEXT_BIOMETRIC_REQUEST) {
+            Log.d(TAG, "ENROLL_NEXT_BIOMETRIC_REQUEST, result: " + resultCode);
+            if (resultCode != RESULT_CANCELED) {
+                setResult(resultCode, data);
+                finish();
+            }
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
diff --git a/src/com/android/settings/biometrics/BiometricUtils.java b/src/com/android/settings/biometrics/BiometricUtils.java
new file mode 100644
index 0000000..d93a321
--- /dev/null
+++ b/src/com/android/settings/biometrics/BiometricUtils.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright (C) 2020 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.biometrics;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentSender;
+import android.os.storage.StorageManager;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.SetupWizardUtils;
+import com.android.settings.biometrics.face.FaceEnrollIntroduction;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollFindSensor;
+import com.android.settings.biometrics.fingerprint.FingerprintEnrollIntroduction;
+import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollIntroduction;
+import com.android.settings.password.ChooseLockGeneric;
+import com.android.settings.password.ChooseLockSettingsHelper;
+import com.android.settings.password.SetupChooseLockGeneric;
+
+import com.google.android.setupcompat.util.WizardManagerHelper;
+
+/**
+ * Common biometric utilities.
+ */
+public class BiometricUtils {
+    private static final String TAG = "BiometricUtils";
+    /**
+     * Given the result from confirming or choosing a credential, request Gatekeeper to generate
+     * a HardwareAuthToken with the Gatekeeper Password together with a biometric challenge.
+     *
+     * @param context Caller's context
+     * @param result The onActivityResult intent from ChooseLock* or ConfirmLock*
+     * @param userId User ID that the credential/biometric operation applies to
+     * @param challenge Unique biometric challenge from FingerprintManager/FaceManager
+     * @return
+     */
+    public static byte[] requestGatekeeperHat(@NonNull Context context, @NonNull Intent result,
+            int userId, long challenge) {
+        if (!containsGatekeeperPasswordHandle(result)) {
+            throw new IllegalStateException("Gatekeeper Password is missing!!");
+        }
+        final long gatekeeperPasswordHandle = result.getLongExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, 0L);
+        return requestGatekeeperHat(context, gatekeeperPasswordHandle, userId, challenge);
+    }
+
+    public static byte[] requestGatekeeperHat(@NonNull Context context, long gkPwHandle, int userId,
+            long challenge) {
+        final LockPatternUtils utils = new LockPatternUtils(context);
+        return utils.verifyGatekeeperPasswordHandle(gkPwHandle, challenge, userId)
+                .getGatekeeperHAT();
+    }
+
+    public static boolean containsGatekeeperPasswordHandle(@Nullable Intent data) {
+        return data != null && data.hasExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE);
+    }
+
+    public static long getGatekeeperPasswordHandle(@NonNull Intent data) {
+        return data.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, 0L);
+    }
+
+    /**
+     * Requests {@link com.android.server.locksettings.LockSettingsService} to remove the
+     * gatekeeper password associated with a previous
+     * {@link ChooseLockSettingsHelper.Builder#setRequestGatekeeperPasswordHandle(boolean)}
+     *
+     * @param context Caller's context
+     * @param data The onActivityResult intent from ChooseLock* or ConfirmLock*
+     */
+    public static void removeGatekeeperPasswordHandle(@NonNull Context context,
+            @Nullable Intent data) {
+        if (data == null) {
+            return;
+        }
+        if (!containsGatekeeperPasswordHandle(data)) {
+            return;
+        }
+        removeGatekeeperPasswordHandle(context, getGatekeeperPasswordHandle(data));
+    }
+
+    public static void removeGatekeeperPasswordHandle(@NonNull Context context, long handle) {
+        final LockPatternUtils utils = new LockPatternUtils(context);
+        utils.removeGatekeeperPasswordHandle(handle);
+        Log.d(TAG, "Removed handle");
+    }
+
+    /**
+     * @param context caller's context
+     * @param activityIntent The intent that started the caller's activity
+     * @return Intent for starting ChooseLock*
+     */
+    public static Intent getChooseLockIntent(@NonNull Context context,
+            @NonNull Intent activityIntent) {
+        if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {
+            // Default to PIN lock in setup wizard
+            Intent intent = new Intent(context, SetupChooseLockGeneric.class);
+            if (StorageManager.isFileEncryptedNativeOrEmulated()) {
+                intent.putExtra(
+                        LockPatternUtils.PASSWORD_TYPE_KEY,
+                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
+                intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment
+                        .EXTRA_SHOW_OPTIONS_BUTTON, true);
+            }
+            WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
+            return intent;
+        } else {
+            return new Intent(context, ChooseLockGeneric.class);
+        }
+    }
+
+    /**
+     * @param context caller's context
+     * @param activityIntent The intent that started the caller's activity
+     * @return Intent for starting FingerprintEnrollFindSensor
+     */
+    public static Intent getFingerprintFindSensorIntent(@NonNull Context context,
+            @NonNull Intent activityIntent) {
+        Intent intent = new Intent(context, FingerprintEnrollFindSensor.class);
+        SetupWizardUtils.copySetupExtras(activityIntent, intent);
+        return intent;
+    }
+
+    /**
+     * @param context caller's context
+     * @param activityIntent The intent that started the caller's activity
+     * @return Intent for starting FingerprintEnrollIntroduction
+     */
+    public static Intent getFingerprintIntroIntent(@NonNull Context context,
+            @NonNull Intent activityIntent) {
+        if (WizardManagerHelper.isAnySetupWizard(activityIntent)) {
+            Intent intent = new Intent(context, SetupFingerprintEnrollIntroduction.class);
+            WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
+            return intent;
+        } else {
+            return new Intent(context, FingerprintEnrollIntroduction.class);
+        }
+    }
+
+    /**
+     * @param context caller's context
+     * @param activityIntent The intent that started the caller's activity
+     * @return Intent for starting FaceEnrollIntroduction
+     */
+    public static Intent getFaceIntroIntent(@NonNull Context context,
+            @NonNull Intent activityIntent) {
+        Intent intent = new Intent(context, FaceEnrollIntroduction.class);
+        WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
+        return intent;
+    }
+
+    /**
+     * @param activity Reference to the calling activity, used to startActivity
+     * @param intent Intent pointing to the enrollment activity
+     * @param requestCode If non-zero, will invoke startActivityForResult instead of startActivity
+     * @param hardwareAuthToken HardwareAuthToken from Gatekeeper
+     * @param userId User to request enrollment for
+     */
+    public static void launchEnrollForResult(@NonNull BiometricEnrollActivity activity,
+            @NonNull Intent intent, int requestCode,
+            @Nullable byte[] hardwareAuthToken, @Nullable Long gkPwHandle, int userId) {
+        if (hardwareAuthToken != null) {
+            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
+                    hardwareAuthToken);
+        }
+        if (gkPwHandle != null) {
+            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, gkPwHandle);
+        }
+
+        if (activity instanceof BiometricEnrollActivity.InternalActivity) {
+            intent.putExtra(Intent.EXTRA_USER_ID, userId);
+        }
+
+        if (requestCode != 0) {
+            activity.startActivityForResult(intent, requestCode);
+        } else {
+            activity.startActivity(intent);
+            activity.finish();
+        }
+    }
+
+    /**
+     * @param activity Activity that we want to check
+     * @return True if the activity is going through a multi-biometric enrollment flow.
+     */
+    public static boolean isMultiBiometricEnrollmentFlow(@NonNull Activity activity) {
+        return activity.getIntent().hasExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE);
+    }
+
+    public static void copyMultiBiometricExtras(@NonNull Intent fromIntent,
+            @NonNull Intent toIntent) {
+        final PendingIntent pendingIntent = (PendingIntent) fromIntent.getExtra(
+                MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE, null);
+        if (pendingIntent != null) {
+            toIntent.putExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE, pendingIntent);
+        }
+    }
+
+    /**
+     * If the current biometric enrollment (e.g. face) should be followed by another one (e.g.
+     * fingerprint) (see {@link #isMultiBiometricEnrollmentFlow(Activity)}), retrieves the
+     * PendingIntent pointing to the next enrollment and starts it. The caller will receive the
+     * result in onActivityResult.
+     * @return true if the next enrollment was started
+     */
+    public static boolean tryStartingNextBiometricEnroll(@NonNull Activity activity,
+            int requestCode) {
+        final PendingIntent pendingIntent = (PendingIntent) activity.getIntent()
+                .getExtra(MultiBiometricEnrollHelper.EXTRA_ENROLL_AFTER_FACE);
+        if (pendingIntent != null) {
+            try {
+                Log.d(TAG, "Starting pendingIntent: " + pendingIntent);
+                IntentSender intentSender = pendingIntent.getIntentSender();
+                activity.startIntentSenderForResult(intentSender, requestCode,
+                        null /* fillInIntent */, 0 /* flagMask */, 0 /* flagValues */,
+                        0 /* extraFlags */);
+                return true;
+            } catch (IntentSender.SendIntentException e) {
+                Log.e(TAG, "Pending intent canceled: " + e);
+            }
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java b/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
index f131e35..9b86e78 100644
--- a/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/BiometricsEnrollEnrolling.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.biometrics;
 
+import android.annotation.Nullable;
 import android.content.Intent;
 import android.os.UserHandle;
 import android.view.View;
@@ -33,6 +34,7 @@
 
     private static final String TAG_SIDECAR = "sidecar";
 
+    @Nullable
     protected BiometricEnrollSidecar mSidecar;
 
     /**
diff --git a/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
new file mode 100644
index 0000000..1ea6b08
--- /dev/null
+++ b/src/com/android/settings/biometrics/MultiBiometricEnrollHelper.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2020 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.biometrics;
+
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.hardware.face.FaceManager;
+import android.hardware.fingerprint.FingerprintManager;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+import com.android.settings.password.ChooseLockSettingsHelper;
+
+/**
+ * Helper for {@link BiometricEnrollActivity} when multiple sensors exist on a device.
+ */
+public class MultiBiometricEnrollHelper {
+
+    private static final String TAG = "MultiBiometricEnrollHelper";
+
+    private static final int REQUEST_FACE_ENROLL = 3000;
+    private static final int REQUEST_FINGERPRINT_ENROLL = 3001;
+
+    public static final String EXTRA_ENROLL_AFTER_FACE = "enroll_after_face";
+
+    @NonNull private final BiometricEnrollActivity mActivity;
+    private final long mGkPwHandle;
+    private final int mUserId;
+    private final boolean mRequestEnrollFace;
+    private final boolean mRequestEnrollFingerprint;
+
+    MultiBiometricEnrollHelper(@NonNull BiometricEnrollActivity activity, int userId,
+            boolean enrollFace, boolean enrollFingerprint, long gkPwHandle) {
+        mActivity = activity;
+        mUserId = userId;
+        mGkPwHandle = gkPwHandle;
+        mRequestEnrollFace = enrollFace;
+        mRequestEnrollFingerprint = enrollFingerprint;
+    }
+
+    void startNextStep() {
+        if (mRequestEnrollFace) {
+            launchFaceEnroll();
+        } else if (mRequestEnrollFingerprint) {
+            launchFingerprintEnroll();
+        } else {
+            mActivity.setResult(BiometricEnrollIntroduction.RESULT_SKIP);
+            mActivity.finish();
+        }
+    }
+
+    private void launchFaceEnroll() {
+        final FaceManager faceManager = mActivity.getSystemService(FaceManager.class);
+        faceManager.generateChallenge((sensorId, challenge) -> {
+            final byte[] hardwareAuthToken = BiometricUtils.requestGatekeeperHat(mActivity,
+                    mGkPwHandle, mUserId, challenge);
+            final Intent faceIntent = BiometricUtils.getFaceIntroIntent(mActivity,
+                    mActivity.getIntent());
+
+            if (mRequestEnrollFingerprint) {
+                // Give FaceEnroll a pendingIntent pointing to fingerprint enrollment, so that it
+                // can be started when user skips or finishes face enrollment.
+                final Intent fpIntent = BiometricUtils.getFingerprintIntroIntent(mActivity,
+                        mActivity.getIntent());
+                fpIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE, mGkPwHandle);
+                final PendingIntent fpAfterFaceIntent = PendingIntent.getActivity(mActivity,
+                        0 /* requestCode */, fpIntent, PendingIntent.FLAG_IMMUTABLE);
+                faceIntent.putExtra(EXTRA_ENROLL_AFTER_FACE, fpAfterFaceIntent);
+            }
+
+            BiometricUtils.launchEnrollForResult(mActivity, faceIntent, REQUEST_FACE_ENROLL,
+                    hardwareAuthToken, mGkPwHandle, mUserId);
+        });
+    }
+
+    private void launchFingerprintEnroll() {
+        final FingerprintManager fingerprintManager = mActivity
+                .getSystemService(FingerprintManager.class);
+        fingerprintManager.generateChallenge(mUserId, ((sensorId, challenge) -> {
+            final byte[] hardwareAuthToken = BiometricUtils.requestGatekeeperHat(mActivity,
+                    mGkPwHandle, mUserId, challenge);
+            final Intent intent = BiometricUtils.getFingerprintIntroIntent(mActivity,
+                    mActivity.getIntent());
+            BiometricUtils.launchEnrollForResult(mActivity, intent, REQUEST_FINGERPRINT_ENROLL,
+                    hardwareAuthToken, mGkPwHandle, mUserId);
+        }));
+    }
+
+    void onActivityResult(int requestCode, int resultCode, Intent data) {
+        Log.d(TAG, "RequestCode: " + requestCode + " resultCode: " + resultCode);
+        if (resultCode != Activity.RESULT_CANCELED) {
+            BiometricUtils.removeGatekeeperPasswordHandle(mActivity, mGkPwHandle);
+            mActivity.setResult(resultCode);
+            mActivity.finish();
+        }
+    }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityDialog.java b/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityDialog.java
new file mode 100644
index 0000000..7042870
--- /dev/null
+++ b/src/com/android/settings/biometrics/face/FaceEnrollAccessibilityDialog.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2020 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.biometrics.face;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.settings.SettingsEnums;
+import android.os.Bundle;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+
+/**
+ * Confirmation dialog shown to users with accessibility enabled who are trying to start the
+ * non-accessibility enrollment flow.
+ */
+public class FaceEnrollAccessibilityDialog extends InstrumentedDialogFragment {
+    private AlertDialog.OnClickListener mPositiveButtonListener;
+
+    /**
+     * @return new instance of the dialog
+     */
+    public static FaceEnrollAccessibilityDialog newInstance() {
+        return new FaceEnrollAccessibilityDialog();
+    }
+
+    public void setPositiveButtonListener(AlertDialog.OnClickListener listener) {
+        mPositiveButtonListener = listener;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+
+        final int titleResId =
+                R.string.security_settings_face_enroll_education_accessibility_dialog_message;
+        final int negativeButtonResId =
+                R.string.security_settings_face_enroll_education_accessibility_dialog_negative;
+        final int positiveButtonResId =
+                R.string.security_settings_face_enroll_education_accessibility_dialog_positive;
+
+        builder.setMessage(titleResId)
+                .setNegativeButton(negativeButtonResId, (dialog, which) -> {
+                    dialog.cancel();
+                })
+                .setPositiveButton(positiveButtonResId, (dialog, which) -> {
+                    mPositiveButtonListener.onClick(dialog, which);
+                });
+
+        return builder.create();
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.FACE_ENROLL_INTRO;
+    }
+}
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 3b84c35..3e9fba2 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -33,6 +33,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricEnrollBase;
+import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
 import com.google.android.setupcompat.template.FooterBarMixin;
@@ -55,6 +56,7 @@
     private Intent mResultIntent;
     private TextView mDescriptionText;
     private boolean mNextClicked;
+    private boolean mAccessibilityEnabled;
 
     private CompoundButton.OnCheckedChangeListener mSwitchDiversityListener =
             new CompoundButton.OnCheckedChangeListener() {
@@ -123,13 +125,12 @@
                 .setTheme(R.style.SudGlifButton_Primary)
                 .build();
 
-        boolean accessibilityEnabled = false;
         final AccessibilityManager accessibilityManager = getApplicationContext().getSystemService(
                 AccessibilityManager.class);
         if (accessibilityManager != null) {
             // Add additional check for touch exploration. This prevents other accessibility
             // features such as Live Transcribe from defaulting to the accessibility setup.
-            accessibilityEnabled = accessibilityManager.isEnabled()
+            mAccessibilityEnabled = accessibilityManager.isEnabled()
                     && accessibilityManager.isTouchExplorationEnabled();
         }
         mFooterBarMixin.setPrimaryButton(footerButton);
@@ -147,7 +148,7 @@
             mSwitchDiversity.getSwitch().toggle();
         });
 
-        if (accessibilityEnabled) {
+        if (mAccessibilityEnabled) {
             accessibilityButton.callOnClick();
         }
     }
@@ -183,6 +184,7 @@
             intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
         }
         intent.putExtra(EXTRA_FROM_SETTINGS_SUMMARY, mFromSettingsSummary);
+        BiometricUtils.copyMultiBiometricExtras(getIntent(), intent);
         final String flattenedString = getString(R.string.config_face_enroll);
         if (!TextUtils.isEmpty(flattenedString)) {
             ComponentName componentName = ComponentName.unflattenFromString(flattenedString);
@@ -194,9 +196,20 @@
         if (mResultIntent != null) {
             intent.putExtras(mResultIntent);
         }
-        mNextClicked = true;
+
         intent.putExtra(EXTRA_KEY_REQUIRE_DIVERSITY, !mSwitchDiversity.isChecked());
-        startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
+
+        if (!mSwitchDiversity.isChecked() && mAccessibilityEnabled) {
+            FaceEnrollAccessibilityDialog dialog = FaceEnrollAccessibilityDialog.newInstance();
+            dialog.setPositiveButtonListener((dialog1, which) -> {
+                startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
+                mNextClicked = true;
+            });
+            dialog.show(getSupportFragmentManager(), FaceEnrollAccessibilityDialog.class.getName());
+        } else {
+            startActivityForResult(intent, BIOMETRIC_FIND_SENSOR_REQUEST);
+            mNextClicked = true;
+        }
     }
 
     protected void onSkipButtonClick(View view) {
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
index 6709a6a..3bffbbf 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollIntroduction.java
@@ -20,12 +20,15 @@
 import android.app.settings.SettingsEnums;
 import android.content.Intent;
 import android.hardware.face.FaceManager;
+import android.hardware.face.FaceSensorPropertiesInternal;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.TextView;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricEnrollIntroduction;
+import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -36,14 +39,30 @@
 import com.google.android.setupdesign.span.LinkSpan;
 import com.google.android.setupdesign.template.RequireScrollMixin;
 
+import java.util.List;
+
 public class FaceEnrollIntroduction extends BiometricEnrollIntroduction {
 
-    private static final String TAG = "FaceIntro";
+    private static final String TAG = "FaceEnrollIntroduction";
 
     private FaceManager mFaceManager;
     private FaceFeatureProvider mFaceFeatureProvider;
 
     @Override
+    protected void onCancelButtonClick(View view) {
+        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST)) {
+            super.onCancelButtonClick(view);
+        }
+    }
+
+    @Override
+    protected void onSkipButtonClick(View view) {
+        if (!BiometricUtils.tryStartingNextBiometricEnroll(this, ENROLL_NEXT_BIOMETRIC_REQUEST)) {
+            super.onSkipButtonClick(view);
+        }
+    }
+
+    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
@@ -52,25 +71,14 @@
                 .getFaceFeatureProvider();
 
         mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
-        if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
-            mFooterBarMixin.setSecondaryButton(
-                    new FooterButton.Builder(this)
-                            .setText(R.string.security_settings_face_enroll_introduction_no_thanks)
-                            .setListener(this::onSkipButtonClick)
-                            .setButtonType(FooterButton.ButtonType.SKIP)
-                            .setTheme(R.style.SudGlifButton_Secondary)
-                            .build()
-            );
-        } else {
-            mFooterBarMixin.setSecondaryButton(
-                    new FooterButton.Builder(this)
-                            .setText(R.string.security_settings_face_enroll_introduction_no_thanks)
-                            .setListener(this::onCancelButtonClick)
-                            .setButtonType(FooterButton.ButtonType.CANCEL)
-                            .setTheme(R.style.SudGlifButton_Secondary)
-                            .build()
-            );
-        }
+        mFooterBarMixin.setSecondaryButton(
+                new FooterButton.Builder(this)
+                        .setText(R.string.security_settings_face_enroll_introduction_no_thanks)
+                        .setListener(this::onSkipButtonClick)
+                        .setButtonType(FooterButton.ButtonType.SKIP)
+                        .setTheme(R.style.SudGlifButton_Secondary)
+                        .build()
+        );
 
         FooterButton.Builder nextButtonBuilder = new FooterButton.Builder(this)
                 .setText(R.string.security_settings_face_enroll_introduction_agree)
@@ -86,9 +94,7 @@
                     RequireScrollMixin.class);
             requireScrollMixin.requireScrollWithButton(this, agreeButton,
                     R.string.security_settings_face_enroll_introduction_more,
-                    button -> {
-                        onNextButtonClick(button);
-                    });
+                    this::onNextButtonClick);
         }
 
         final TextView footer2 = findViewById(R.id.face_enroll_introduction_footer_part_2);
@@ -97,6 +103,21 @@
                         ? R.string.security_settings_face_enroll_introduction_footer_part_2
                         : R.string.security_settings_face_settings_footer_attention_not_supported;
         footer2.setText(footer2TextResource);
+
+        // This path is an entry point for SetNewPasswordController, e.g.
+        // adb shell am start -a android.app.action.SET_NEW_PASSWORD
+        if (mToken == null && BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
+            mFooterBarMixin.getPrimaryButton().setEnabled(false);
+            // We either block on generateChallenge, or need to gray out the "next" button until
+            // the challenge is ready. Let's just do this for now.
+            mFaceManager.generateChallenge((sensorId, challenge) -> {
+                mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
+                if (BiometricUtils.isMultiBiometricEnrollmentFlow(this)) {
+                    BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent());
+                }
+                mFooterBarMixin.getPrimaryButton().setEnabled(true);
+            });
+        }
     }
 
     @Override
@@ -148,8 +169,10 @@
 
     private boolean maxFacesEnrolled() {
         if (mFaceManager != null) {
-            final int max = getResources().getInteger(
-                    com.android.internal.R.integer.config_faceMaxTemplatesPerUser);
+            final List<FaceSensorPropertiesInternal> props =
+                    mFaceManager.getSensorPropertiesInternal();
+            // This will need to be updated for devices with multiple face sensors.
+            final int max = props.get(0).maxEnrollmentsPerUser;
             final int numEnrolledFaces = mFaceManager.getEnrolledFaces(mUserId).size();
             return numEnrolledFaces >= max;
         } else {
@@ -171,12 +194,13 @@
     }
 
     @Override
-    protected long getChallenge() {
+    protected void getChallenge(GenerateChallengeCallback callback) {
         mFaceManager = Utils.getFaceManagerOrNull(this);
         if (mFaceManager == null) {
-            return 0;
+            callback.onChallengeGenerated(0, 0L);
+            return;
         }
-        return mFaceManager.generateChallenge();
+        mFaceManager.generateChallenge(callback::onChallengeGenerated);
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
index 512d8fe..6d2c301 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollSidecar.java
@@ -48,10 +48,6 @@
     @Override
     public void startEnrollment() {
         super.startEnrollment();
-        if (mUserId != UserHandle.USER_NULL) {
-            mFaceManager.setActiveUser(mUserId);
-        }
-
         mFaceManager.enroll(mUserId, mToken, mEnrollmentCancel,
                 mEnrollmentCallback, mDisabledFeatures);
     }
diff --git a/src/com/android/settings/biometrics/face/FaceSettings.java b/src/com/android/settings/biometrics/face/FaceSettings.java
index 04df11a..7751485 100644
--- a/src/com/android/settings/biometrics/face/FaceSettings.java
+++ b/src/com/android/settings/biometrics/face/FaceSettings.java
@@ -37,6 +37,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.password.ChooseLockSettingsHelper;
@@ -202,16 +203,18 @@
         super.onResume();
 
         if (mToken == null && !mConfirmingPassword) {
-            // Generate challenge in onResume instead of onCreate, since FaceSettings can be
-            // created while Keyguard is showing, in which case the resetLockout revokeChallenge
-            // will invalidate the too-early created challenge here.
-            final long challenge = mFaceManager.generateChallenge();
-            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(getActivity(), this);
+            final boolean launched = builder.setRequestCode(CONFIRM_REQUEST)
+                    .setTitle(getString(R.string.security_settings_face_preference_title))
+                    .setRequestGatekeeperPasswordHandle(true)
+                    .setUserId(mUserId)
+                    .setForegroundOnly(true)
+                    .setReturnCredentials(true)
+                    .show();
 
             mConfirmingPassword = true;
-            if (!helper.launchConfirmationActivity(CONFIRM_REQUEST,
-                    getString(R.string.security_settings_face_preference_title),
-                    null, null, challenge, mUserId, true /* foregroundOnly */)) {
+            if (!launched) {
                 Log.e(TAG, "Password not set");
                 finish();
             }
@@ -232,19 +235,23 @@
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
+
+        if (mToken == null && !BiometricUtils.containsGatekeeperPasswordHandle(data)) {
+            Log.e(TAG, "No credential");
+            finish();
+        }
+
         if (requestCode == CONFIRM_REQUEST) {
-            mConfirmingPassword = false;
             if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
-                mFaceManager.setActiveUser(mUserId);
                 // The pin/pattern/password was set.
-                if (data != null) {
-                    mToken = data.getByteArrayExtra(
-                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
-                    if (mToken != null) {
-                        mAttentionController.setToken(mToken);
-                        mEnrollController.setToken(mToken);
-                    }
-                }
+                mFaceManager.generateChallenge((sensorId, challenge) -> {
+                    mToken = BiometricUtils.requestGatekeeperHat(getPrefContext(), data, mUserId,
+                            challenge);
+                    BiometricUtils.removeGatekeeperPasswordHandle(getPrefContext(), data);
+                    mAttentionController.setToken(mToken);
+                    mEnrollController.setToken(mToken);
+                    mConfirmingPassword = false;
+                });
             }
         } else if (requestCode == ENROLL_REQUEST) {
             if (resultCode == RESULT_TIMEOUT) {
@@ -252,11 +259,6 @@
                 finish();
             }
         }
-
-        if (mToken == null) {
-            // Didn't get an authentication, finishing
-            finish();
-        }
     }
 
     @Override
@@ -267,10 +269,7 @@
                 && !mConfirmingPassword) {
             // Revoke challenge and finish
             if (mToken != null) {
-                final int result = mFaceManager.revokeChallenge();
-                if (result < 0) {
-                    Log.w(TAG, "revokeChallenge failed, result: " + result);
-                }
+                mFaceManager.revokeChallenge();
                 mToken = null;
             }
             finish();
@@ -313,7 +312,6 @@
         controllers.add(new FaceSettingsAppPreferenceController(context));
         controllers.add(new FaceSettingsAttentionPreferenceController(context));
         controllers.add(new FaceSettingsRemoveButtonPreferenceController(context));
-        controllers.add(new FaceSettingsFooterPreferenceController(context));
         controllers.add(new FaceSettingsConfirmPreferenceController(context));
         controllers.add(new FaceSettingsEnrollButtonPreferenceController(context));
         return controllers;
diff --git a/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java b/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
index c665467..ba1047b 100644
--- a/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
+++ b/src/com/android/settings/biometrics/face/FaceSettingsFooterPreferenceController.java
@@ -26,7 +26,6 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.utils.AnnotationSpan;
 import com.android.settingslib.HelpUtils;
-import com.android.settingslib.widget.FooterPreference;
 
 /**
  * Footer for face settings showing the help text and help link.
@@ -42,13 +41,9 @@
         mProvider = FeatureFactory.getFactory(context).getFaceFeatureProvider();
     }
 
-    public FaceSettingsFooterPreferenceController(Context context) {
-        this(context, FooterPreference.KEY_FOOTER);
-    }
-
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        return AVAILABLE_UNSEARCHABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
index f5aae12..4264056 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintAuthenticateSidecar.java
@@ -103,8 +103,8 @@
 
     public void startAuthentication(int userId) {
         mCancellationSignal = new CancellationSignal();
-        mFingerprintManager.authenticate(null, mCancellationSignal, 0 /* flags */,
-                mAuthenticationCallback, null, userId);
+        mFingerprintManager.authenticate(null /* crypto */, mCancellationSignal,
+                mAuthenticationCallback, null /* handler */, userId);
     }
 
     public void stopAuthentication() {
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index 3831b07..b33113b 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -27,11 +27,13 @@
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.media.AudioAttributes;
 import android.os.Bundle;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.text.TextUtils;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.AnimationUtils;
@@ -51,19 +53,22 @@
 import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.util.DescriptionStyler;
 
+import java.util.List;
+
 /**
  * Activity which handles the actual enrolling for fingerprint.
  */
 public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling {
 
+    private static final String TAG = "FingerprintEnrollEnrolling";
     static final String TAG_SIDECAR = "sidecar";
 
     private static final int PROGRESS_BAR_MAX = 10000;
     private static final int FINISH_DELAY = 250;
 
     /**
-     * If we don't see progress during this time, we show an error message to remind the user that
-     * he needs to lift the finger and touch again.
+     * If we don't see progress during this time, we show an error message to remind the users that
+     * they need to lift the finger and touch again.
      */
     private static final int HINT_TIMEOUT_DURATION = 2500;
 
@@ -86,6 +91,7 @@
                     .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
                     .build();
 
+    private boolean mCanAssumeUdfps;
     private ProgressBar mProgressBar;
     private ObjectAnimator mProgressAnim;
     private TextView mStartMessage;
@@ -130,16 +136,39 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.fingerprint_enroll_enrolling);
+
+        final FingerprintManager fingerprintManager = getSystemService(FingerprintManager.class);
+        final List<FingerprintSensorPropertiesInternal> props =
+                fingerprintManager.getSensorPropertiesInternal();
+        mCanAssumeUdfps = props.size() == 1 && props.get(0).isAnyUdfpsType();
+
+        if (mCanAssumeUdfps) {
+            // Use a custom layout since animations, etc must be based off of the sensor's physical
+            // location.
+            setContentView(R.layout.udfps_enroll_enrolling);
+            final UdfpsEnrollLayout udfpsEnrollLayout = (UdfpsEnrollLayout) getLayoutInflater()
+                    .inflate(R.layout.udfps_enroll_layout, null /* root */);
+            getLayout().addView(udfpsEnrollLayout);
+        } else {
+            setContentView(R.layout.fingerprint_enroll_enrolling);
+        }
+
         setHeaderText(R.string.security_settings_fingerprint_enroll_repeat_title);
-        mStartMessage = (TextView) findViewById(R.id.sud_layout_description);
-        mRepeatMessage = (TextView) findViewById(R.id.repeat_message);
-        mErrorText = (TextView) findViewById(R.id.error_text);
-        mProgressBar = (ProgressBar) findViewById(R.id.fingerprint_progress_bar);
+
+        mStartMessage = findViewById(R.id.sud_layout_description);
+        mRepeatMessage = findViewById(R.id.repeat_message);
+        mErrorText = findViewById(R.id.error_text);
+        mProgressBar = findViewById(R.id.fingerprint_progress_bar);
         mVibrator = getSystemService(Vibrator.class);
 
+        if (mCanAssumeUdfps) {
+            mProgressBar.setVisibility(View.INVISIBLE);
+        }
+
         if (getLayout().shouldApplyPartnerHeavyThemeResource()) {
-            DescriptionStyler.applyPartnerCustomizationStyle(mRepeatMessage);
+            DescriptionStyler.applyPartnerCustomizationHeavyStyle(mRepeatMessage);
+        } else if (getLayout().shouldApplyPartnerResource()) {
+            DescriptionStyler.applyPartnerCustomizationLightStyle(mRepeatMessage);
         }
         mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
         mFooterBarMixin.setSecondaryButton(
@@ -191,7 +220,7 @@
 
     @Override
     protected boolean shouldStartAutomatically() {
-        return true;
+        return !mCanAssumeUdfps;
     }
 
     @Override
@@ -207,6 +236,12 @@
     @Override
     public void onEnterAnimationComplete() {
         super.onEnterAnimationComplete();
+
+        if (mCanAssumeUdfps) {
+            startEnrollment();
+            mProgressBar.setVisibility(View.VISIBLE);
+        }
+
         mAnimationCancelled = false;
         startIconAnimation();
     }
@@ -250,7 +285,7 @@
     }
 
     private void updateDescription() {
-        if (mSidecar.getEnrollmentSteps() == -1) {
+        if (mSidecar == null || mSidecar.getEnrollmentSteps() == -1) {
             mStartMessage.setVisibility(View.VISIBLE);
             mRepeatMessage.setVisibility(View.INVISIBLE);
         } else {
@@ -297,6 +332,11 @@
     }
 
     private void updateProgress(boolean animate) {
+        if (mSidecar == null || !mSidecar.isEnrolling()) {
+            Log.d(TAG, "Enrollment not started yet");
+            return;
+        }
+
         int progress = getProgress(
                 mSidecar.getEnrollmentSteps(), mSidecar.getEnrollmentRemaining());
         if (animate) {
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
index dbedb4a..234666f 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensor.java
@@ -28,6 +28,7 @@
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricEnrollBase;
 import com.android.settings.biometrics.BiometricEnrollSidecar.Listener;
+import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.password.ChooseLockSettingsHelper;
 
 import com.google.android.setupcompat.template.FooterBarMixin;
@@ -60,8 +61,28 @@
 
         setHeaderText(R.string.security_settings_fingerprint_enroll_find_sensor_title);
 
+        // This is an entry point for SetNewPasswordController, e.g.
+        // adb shell am start -a android.app.action.SET_NEW_PASSWORD
+        if (mToken == null && BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
+            final FingerprintManager fpm = getSystemService(FingerprintManager.class);
+            fpm.generateChallenge(mUserId, (sensorId, challenge) -> {
+                mToken = BiometricUtils.requestGatekeeperHat(this, getIntent(), mUserId, challenge);
+                BiometricUtils.removeGatekeeperPasswordHandle(this, getIntent());
 
-        startLookingForFingerprint(); // already confirmed, so start looking for fingerprint
+                // Put this into the intent. This is really just to work around the fact that the
+                // enrollment sidecar gets the HAT from the activity's intent, rather than having
+                // it passed in.
+                getIntent().putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
+
+                startLookingForFingerprint();
+            });
+        } else if (mToken != null) {
+            // HAT passed in from somewhere else, such as FingerprintEnrollIntroduction
+            startLookingForFingerprint();
+        } else {
+            // There's something wrong with the enrollment flow, this should never happen.
+            throw new IllegalStateException("HAT and GkPwHandle both missing...");
+        }
 
         View animationView = findViewById(R.id.fingerprint_sensor_location_animation);
         if (animationView instanceof FingerprintFindSensorAnimation) {
@@ -160,10 +181,13 @@
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == CONFIRM_REQUEST) {
             if (resultCode == RESULT_OK && data != null) {
+                throw new IllegalStateException("Pretty sure this is dead code");
+                /*
                 mToken = data.getByteArrayExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
                 overridePendingTransition(R.anim.sud_slide_next_in, R.anim.sud_slide_next_out);
                 getIntent().putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, mToken);
                 startLookingForFingerprint();
+                */
             } else {
                 finish();
             }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
index 179de67..3adbd0d 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinish.java
@@ -140,10 +140,7 @@
     private void postEnroll() {
         final FingerprintManager fpm = Utils.getFingerprintManagerOrNull(this);
         if (fpm != null) {
-            int result = fpm.postEnroll();
-            if (result < 0) {
-                Log.w(TAG, "postEnroll failed: result = " + result);
-            }
+            fpm.revokeChallenge(mUserId);
         }
     }
 
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
index d3618db..23a1133 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroduction.java
@@ -21,6 +21,7 @@
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.os.Bundle;
 import android.util.Log;
 import android.widget.TextView;
@@ -28,6 +29,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricEnrollIntroduction;
+import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
@@ -36,6 +38,8 @@
 import com.google.android.setupcompat.template.FooterButton;
 import com.google.android.setupdesign.span.LinkSpan;
 
+import java.util.List;
+
 public class FingerprintEnrollIntroduction extends BiometricEnrollIntroduction {
 
     private static final String TAG = "FingerprintIntro";
@@ -44,14 +48,20 @@
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
         mFingerprintManager = Utils.getFingerprintManagerOrNull(this);
+        if (mFingerprintManager == null) {
+            Log.e(TAG, "Null FingerprintManager");
+            finish();
+            return;
+        }
+
+        super.onCreate(savedInstanceState);
 
         mFooterBarMixin = getLayout().getMixin(FooterBarMixin.class);
         mFooterBarMixin.setSecondaryButton(
                 new FooterButton.Builder(this)
-                        .setText(R.string.security_settings_face_enroll_introduction_cancel)
-                        .setListener(this::onCancelButtonClick)
+                        .setText(getNegativeButtonTextId())
+                        .setListener(this::onSkipButtonClick)
                         .setButtonType(FooterButton.ButtonType.SKIP)
                         .setTheme(R.style.SudGlifButton_Secondary)
                         .build()
@@ -67,6 +77,10 @@
         );
     }
 
+    int getNegativeButtonTextId() {
+        return R.string.security_settings_fingerprint_enroll_introduction_no_thanks;
+    }
+
     @Override
     protected boolean isDisabledByAdmin() {
         return RestrictedLockUtilsInternal.checkIfKeyguardFeaturesDisabled(
@@ -117,8 +131,10 @@
     @Override
     protected int checkMaxEnrolled() {
         if (mFingerprintManager != null) {
-            final int max = getResources().getInteger(
-                    com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
+            final List<FingerprintSensorPropertiesInternal> props =
+                    mFingerprintManager.getSensorPropertiesInternal();
+            // This will need to be updated for devices with multiple fingerprint sensors
+            final int max = props.get(0).maxEnrollmentsPerUser;
             final int numEnrolledFingerprints =
                     mFingerprintManager.getEnrolledFingerprints(mUserId).size();
             if (numEnrolledFingerprints >= max) {
@@ -131,12 +147,13 @@
     }
 
     @Override
-    protected long getChallenge() {
+    protected void getChallenge(GenerateChallengeCallback callback) {
         mFingerprintManager = Utils.getFingerprintManagerOrNull(this);
         if (mFingerprintManager == null) {
-            return 0;
+            callback.onChallengeGenerated(0, 0L);
+            return;
         }
-        return mFingerprintManager.preEnroll();
+        mFingerprintManager.generateChallenge(mUserId, callback::onChallengeGenerated);
     }
 
     @Override
@@ -146,7 +163,12 @@
 
     @Override
     protected Intent getEnrollingIntent() {
-        return new Intent(this, FingerprintEnrollFindSensor.class);
+        final Intent intent = new Intent(this, FingerprintEnrollFindSensor.class);
+        if (BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
+            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
+                    BiometricUtils.getGatekeeperPasswordHandle(getIntent()));
+        }
+        return intent;
     }
 
     @Override
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
index b72a802..cbd9d4d 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollSidecar.java
@@ -40,11 +40,7 @@
     @Override
     protected void startEnrollment() {
         super.startEnrollment();
-        if (mUserId != UserHandle.USER_NULL) {
-            mFingerprintManager.setActiveUser(mUserId);
-        }
-        mFingerprintManager.enroll(mToken, mEnrollmentCancel,
-                0 /* flags */, mUserId, mEnrollmentCallback);
+        mFingerprintManager.enroll(mToken, mEnrollmentCancel, mUserId, mEnrollmentCallback);
     }
 
     private FingerprintManager.EnrollmentCallback mEnrollmentCallback
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
index 19d0518..b356103 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintRemoveSidecar.java
@@ -79,9 +79,6 @@
             Log.e(TAG, "Remove already in progress");
             return;
         }
-        if (userId != UserHandle.USER_NULL) {
-            mFingerprintManager.setActiveUser(userId);
-        }
         mFingerprintRemoving = fingerprint;
         mFingerprintManager.remove(fingerprint, userId, mRemoveCallback);;
     }
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 8b16aee..88920ad 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -33,6 +33,8 @@
 import android.os.Handler;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.text.InputFilter;
+import android.text.Spanned;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -52,6 +54,7 @@
 import com.android.settings.SubSettings;
 import com.android.settings.Utils;
 import com.android.settings.biometrics.BiometricEnrollBase;
+import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.password.ChooseLockGeneric;
 import com.android.settings.password.ChooseLockSettingsHelper;
@@ -408,6 +411,8 @@
         private void updateAddPreference() {
             if (getActivity() == null) return; // Activity went away
 
+            final Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);
+
             /* Disable preference if too many fingerprints added */
             final int max = getContext().getResources().getInteger(
                     com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
@@ -417,9 +422,8 @@
             final boolean removalInProgress = mRemovalSidecar.inProgress();
             CharSequence maxSummary = tooMany ?
                     getContext().getString(R.string.fingerprint_add_max, max) : "";
-            Preference addPreference = findPreference(KEY_FINGERPRINT_ADD);
             addPreference.setSummary(maxSummary);
-            addPreference.setEnabled(!tooMany && !removalInProgress);
+            addPreference.setEnabled(!tooMany && !removalInProgress && mToken != null);
         }
 
         private void createFooterPreference(PreferenceGroup root) {
@@ -563,15 +567,23 @@
         @Override
         public void onActivityResult(int requestCode, int resultCode, Intent data) {
             super.onActivityResult(requestCode, resultCode, data);
-            if (requestCode == CHOOSE_LOCK_GENERIC_REQUEST
-                    || requestCode == CONFIRM_REQUEST) {
+            if (requestCode == CONFIRM_REQUEST || requestCode == CHOOSE_LOCK_GENERIC_REQUEST) {
                 mLaunchedConfirm = false;
                 if (resultCode == RESULT_FINISHED || resultCode == RESULT_OK) {
-                    // The lock pin/pattern/password was set. Start enrolling!
-                    if (data != null) {
-                        mToken = data.getByteArrayExtra(
-                                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN);
+                    if (data != null && BiometricUtils.containsGatekeeperPasswordHandle(data)) {
+                        mFingerprintManager.generateChallenge(mUserId, (sensorId, challenge) -> {
+                            mToken = BiometricUtils.requestGatekeeperHat(getActivity(), data,
+                                    mUserId, challenge);
+                            BiometricUtils.removeGatekeeperPasswordHandle(getActivity(), data);
+                            updateAddPreference();
+                        });
+                    } else {
+                        Log.d(TAG, "Data null or GK PW missing");
+                        finish();
                     }
+                } else {
+                    Log.d(TAG, "Password not confirmed");
+                    finish();
                 }
             } else if (requestCode == ADD_FINGERPRINT_REQUEST) {
                 mEnrollClicked = false;
@@ -581,21 +593,13 @@
                     activity.finish();
                 }
             }
-
-            if (mToken == null) {
-                // Didn't get an authentication, finishing
-                getActivity().finish();
-            }
         }
 
         @Override
         public void onDestroy() {
             super.onDestroy();
             if (getActivity().isFinishing()) {
-                int result = mFingerprintManager.postEnroll();
-                if (result < 0) {
-                    Log.w(TAG, "postEnroll failed: result = " + result);
-                }
+                mFingerprintManager.revokeChallenge(mUserId);
             }
         }
 
@@ -635,20 +639,27 @@
         }
 
         private void launchChooseOrConfirmLock() {
-            Intent intent = new Intent();
-            long challenge = mFingerprintManager.preEnroll();
-            ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
-            if (!helper.launchConfirmationActivity(CONFIRM_REQUEST,
-                    getString(R.string.security_settings_fingerprint_preference_title),
-                    null, null, challenge, mUserId, true /* foregroundOnly */)) {
+            final Intent intent = new Intent();
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(getActivity(), this);
+            final boolean launched = builder.setRequestCode(CONFIRM_REQUEST)
+                    .setTitle(getString(R.string.security_settings_fingerprint_preference_title))
+                    .setRequestGatekeeperPasswordHandle(true)
+                    .setUserId(mUserId)
+                    .setForegroundOnly(true)
+                    .setReturnCredentials(true)
+                    .show();
+
+            if (!launched) {
+                // TODO: This should be cleaned up. ChooseLockGeneric should provide a way of
+                //  specifying arguments/requests, instead of relying on callers setting extras.
                 intent.setClassName(SETTINGS_PACKAGE_NAME, ChooseLockGeneric.class.getName());
                 intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
                         DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
                 intent.putExtra(ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS,
                         true);
-                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
                 intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
-                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
                 intent.putExtra(Intent.EXTRA_USER_ID, mUserId);
                 startActivityForResult(intent, CHOOSE_LOCK_GENERIC_REQUEST);
             }
@@ -659,7 +670,9 @@
             mRemovalSidecar.startRemove(fingerPrint, mUserId);
             String name = genKey(fingerPrint.getBiometricId());
             Preference prefToRemove = findPreference(name);
-            prefToRemove.setEnabled(false);
+            if (prefToRemove != null) {
+                prefToRemove.setEnabled(false);
+            }
             updateAddPreference();
         }
 
@@ -732,6 +745,25 @@
             }
         }
 
+        private static InputFilter[] getFilters() {
+            InputFilter filter = new InputFilter() {
+                @Override
+                public CharSequence filter(CharSequence source, int start, int end,
+                        Spanned dest, int dstart, int dend) {
+                    for (int index = start; index < end; index++) {
+                        final char c = source.charAt(index);
+                        // KXMLSerializer does not allow these characters,
+                        // see KXmlSerializer.java:162.
+                        if (c < 0x20) {
+                            return "";
+                        }
+                    }
+                    return null;
+                }
+            };
+            return new InputFilter[]{filter};
+        }
+
         public static class RenameDialog extends InstrumentedDialogFragment {
 
             private Fingerprint mFp;
@@ -788,6 +820,7 @@
                         mDialogTextField = mAlertDialog.findViewById(R.id.fingerprint_rename_field);
                         CharSequence name = fingerName == null ? mFp.getName() : fingerName;
                         mDialogTextField.setText(name);
+                        mDialogTextField.setFilters(getFilters());
                         if (textSelectionStart != -1 && textSelectionEnd != -1) {
                             mDialogTextField.setSelection(textSelectionStart, textSelectionEnd);
                         } else {
diff --git a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
index 7df66b7..c8a4c05 100644
--- a/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroduction.java
@@ -32,7 +32,9 @@
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
 import com.android.settings.Utils;
+import com.android.settings.biometrics.BiometricUtils;
 import com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment;
+import com.android.settings.password.ChooseLockSettingsHelper;
 import com.android.settings.password.SetupChooseLockGeneric;
 import com.android.settings.password.SetupSkipDialog;
 
@@ -59,28 +61,23 @@
     }
 
     @Override
+    int getNegativeButtonTextId() {
+        return R.string.security_settings_face_enroll_introduction_cancel;
+    }
+
+    @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putBoolean(KEY_LOCK_SCREEN_PRESENT, mAlreadyHadLockScreenSetup);
     }
 
     @Override
-    protected Intent getChooseLockIntent() {
-        Intent intent = new Intent(this, SetupChooseLockGeneric.class);
-
-        if (StorageManager.isFileEncryptedNativeOrEmulated()) {
-            intent.putExtra(
-                    LockPatternUtils.PASSWORD_TYPE_KEY,
-                    DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
-            intent.putExtra(ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, true);
-        }
-        SetupWizardUtils.copySetupExtras(getIntent(), intent);
-        return intent;
-    }
-
-    @Override
     protected Intent getEnrollingIntent() {
         final Intent intent = new Intent(this, SetupFingerprintEnrollFindSensor.class);
+        if (BiometricUtils.containsGatekeeperPasswordHandle(getIntent())) {
+            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
+                    BiometricUtils.getGatekeeperPasswordHandle(getIntent()));
+        }
         SetupWizardUtils.copySetupExtras(getIntent(), intent);
         return intent;
     }
@@ -157,6 +154,11 @@
         }
     }
 
+    @Override
+    protected void onSkipButtonClick(View view) {
+        onCancelButtonClick(view);
+    }
+
     /**
      * Propagate lock screen metrics if the user goes back from the fingerprint setup screen
      * after having added lock screen to his device.
diff --git a/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java
new file mode 100644
index 0000000..ca27e84
--- /dev/null
+++ b/src/com/android/settings/biometrics/fingerprint/UdfpsEnrollLayout.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020 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.biometrics.fingerprint;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.WindowManager;
+import android.widget.LinearLayout;
+
+import com.android.settings.R;
+
+public class UdfpsEnrollLayout extends LinearLayout {
+
+    private static final String TAG = "UdfpsEnrollLayout";
+
+    private final FingerprintSensorPropertiesInternal mSensorProps;
+
+    public UdfpsEnrollLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mSensorProps = context.getSystemService(FingerprintManager.class)
+                .getSensorPropertiesInternal().get(0);
+    }
+
+    @Override
+    public void onLayout(boolean changed, int left, int top, int right, int bottom) {
+        super.onLayout(changed, left, top, right, bottom);
+
+        final View animation = findViewById(R.id.fingerprint_progress_bar);
+        final WindowManager wm = getContext().getSystemService(WindowManager.class);
+        final int statusbarHeight = Math.abs(wm.getCurrentWindowMetrics().getWindowInsets()
+                .getInsets(WindowInsets.Type.statusBars()).toRect().height());
+
+        // Calculate the amount of translation required. This is just re-arranged from
+        // animation.setY(mSensorProps.sensorLocationY-statusbarHeight-mSensorProps.sensorRadius)
+        // The translationY is the amount of extra height that should be added to the spacer
+        // above the animation
+        final int spaceHeight = mSensorProps.sensorLocationY - statusbarHeight
+                - mSensorProps.sensorRadius - animation.getTop();
+         animation.setTranslationY(spaceHeight);
+    }
+
+
+
+    @Override
+    public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+
+        final View animation = findViewById(R.id.fingerprint_progress_bar);
+        final int sensorDiameter = mSensorProps.sensorRadius * 2;
+        // Multiply it slightly so that the progress bar is outside the UDFPS affordance, and that
+        // the animation is within the UDFPS affordance.
+        final int animationDiameter = (int) (sensorDiameter * 1);
+        animation.measure(MeasureSpec.makeMeasureSpec(animationDiameter, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(animationDiameter, MeasureSpec.EXACTLY));
+    }
+}
diff --git a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
index a147656..7f8ade1 100644
--- a/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
+++ b/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderController.java
@@ -18,8 +18,10 @@
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
@@ -49,12 +51,14 @@
 import com.android.settingslib.core.lifecycle.events.OnDestroy;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.utils.StringUtil;
 import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.LayoutPreference;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 /**
  * This class adds a header with device name and status (connected/disconnected, etc.).
@@ -64,7 +68,22 @@
     private static final String TAG = "AdvancedBtHeaderCtrl";
     private static final int LOW_BATTERY_LEVEL = 15;
     private static final int CASE_LOW_BATTERY_LEVEL = 19;
-    private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    private static final String PATH = "time_remaining";
+    private static final String QUERY_PARAMETER_ADDRESS = "address";
+    private static final String QUERY_PARAMETER_BATTERY_ID = "battery_id";
+    private static final String QUERY_PARAMETER_BATTERY_LEVEL = "battery_level";
+    private static final String QUERY_PARAMETER_TIMESTAMP = "timestamp";
+    private static final String BATTERY_ESTIMATE = "battery_estimate";
+    private static final String ESTIMATE_READY = "estimate_ready";
+    private static final String DATABASE_ID = "id";
+    private static final String DATABASE_BLUETOOTH = "Bluetooth";
+    private static final long TIME_OF_HOUR = TimeUnit.SECONDS.toMillis(3600);
+    private static final long TIME_OF_MINUTE = TimeUnit.SECONDS.toMillis(60);
+    private static final int LEFT_DEVICE_ID = 1;
+    private static final int RIGHT_DEVICE_ID = 2;
+    private static final int CASE_DEVICE_ID = 3;
 
     @VisibleForTesting
     LayoutPreference mLayoutPreference;
@@ -110,8 +129,6 @@
         super.displayPreference(screen);
         mLayoutPreference = screen.findPreference(getPreferenceKey());
         mLayoutPreference.setVisible(isAvailable());
-
-        refresh();
     }
 
     @Override
@@ -123,6 +140,8 @@
         mCachedDevice.registerCallback(this);
         mBluetoothAdapter.addOnMetadataChangedListener(mCachedDevice.getDevice(),
                 mContext.getMainExecutor(), mMetadataListener);
+
+        refresh();
     }
 
     @Override
@@ -168,19 +187,22 @@
                     BluetoothDevice.METADATA_UNTETHERED_LEFT_ICON,
                     BluetoothDevice.METADATA_UNTETHERED_LEFT_BATTERY,
                     BluetoothDevice.METADATA_UNTETHERED_LEFT_CHARGING,
-                    R.string.bluetooth_left_name);
+                    R.string.bluetooth_left_name,
+                    LEFT_DEVICE_ID);
 
             updateSubLayout(mLayoutPreference.findViewById(R.id.layout_middle),
                     BluetoothDevice.METADATA_UNTETHERED_CASE_ICON,
                     BluetoothDevice.METADATA_UNTETHERED_CASE_BATTERY,
                     BluetoothDevice.METADATA_UNTETHERED_CASE_CHARGING,
-                    R.string.bluetooth_middle_name);
+                    R.string.bluetooth_middle_name,
+                    CASE_DEVICE_ID);
 
             updateSubLayout(mLayoutPreference.findViewById(R.id.layout_right),
                     BluetoothDevice.METADATA_UNTETHERED_RIGHT_ICON,
                     BluetoothDevice.METADATA_UNTETHERED_RIGHT_BATTERY,
                     BluetoothDevice.METADATA_UNTETHERED_RIGHT_CHARGING,
-                    R.string.bluetooth_right_name);
+                    R.string.bluetooth_right_name,
+                    RIGHT_DEVICE_ID);
         }
     }
 
@@ -204,7 +226,7 @@
     }
 
     private void updateSubLayout(LinearLayout linearLayout, int iconMetaKey, int batteryMetaKey,
-            int chargeMetaKey, int titleResId) {
+            int chargeMetaKey, int titleResId, int batteryId) {
         if (linearLayout == null) {
             return;
         }
@@ -217,11 +239,15 @@
 
         final int batteryLevel = BluetoothUtils.getIntMetaData(bluetoothDevice, batteryMetaKey);
         final boolean charging = BluetoothUtils.getBooleanMetaData(bluetoothDevice, chargeMetaKey);
-        if (DBG) {
+        if (DEBUG) {
             Log.d(TAG, "updateSubLayout() icon : " + iconMetaKey + ", battery : " + batteryMetaKey
                     + ", charge : " + chargeMetaKey + ", batteryLevel : " + batteryLevel
                     + ", charging : " + charging + ", iconUri : " + iconUri);
         }
+
+        if (batteryId != CASE_DEVICE_ID) {
+            showBatteryPredictionIfNecessary(linearLayout, batteryId, batteryLevel);
+        }
         if (batteryLevel != BluetoothUtils.META_INT_ERROR) {
             linearLayout.setVisibility(View.VISIBLE);
             final TextView textView = linearLayout.findViewById(R.id.bt_battery_summary);
@@ -238,6 +264,64 @@
         textView.setVisibility(View.VISIBLE);
     }
 
+    private void showBatteryPredictionIfNecessary(LinearLayout linearLayout, int batteryId,
+            int batteryLevel) {
+        ThreadUtils.postOnBackgroundThread(() -> {
+            final Uri contentUri = new Uri.Builder()
+                    .scheme(ContentResolver.SCHEME_CONTENT)
+                    .authority(mContext.getString(R.string.config_battery_prediction_authority))
+                    .appendPath(PATH)
+                    .appendPath(DATABASE_ID)
+                    .appendPath(DATABASE_BLUETOOTH)
+                    .appendQueryParameter(QUERY_PARAMETER_ADDRESS, mCachedDevice.getAddress())
+                    .appendQueryParameter(QUERY_PARAMETER_BATTERY_ID, String.valueOf(batteryId))
+                    .appendQueryParameter(QUERY_PARAMETER_BATTERY_LEVEL,
+                            String.valueOf(batteryLevel))
+                    .appendQueryParameter(QUERY_PARAMETER_TIMESTAMP,
+                            String.valueOf(System.currentTimeMillis()))
+                    .build();
+
+            final String[] columns = new String[] {BATTERY_ESTIMATE, ESTIMATE_READY};
+            final Cursor cursor =
+                    mContext.getContentResolver().query(contentUri, columns, null, null, null);
+            if (cursor == null) {
+                Log.w(TAG, "showBatteryPredictionIfNecessary() cursor is null!");
+                return;
+            }
+            try {
+                for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) {
+                    final int estimateReady =
+                            cursor.getInt(cursor.getColumnIndex(ESTIMATE_READY));
+                    final long batteryEstimate =
+                            cursor.getLong(cursor.getColumnIndex(BATTERY_ESTIMATE));
+                    if (DEBUG) {
+                        Log.d(TAG, "showBatteryTimeIfNecessary() batteryId : " + batteryId
+                                + ", ESTIMATE_READY : " + estimateReady
+                                + ", BATTERY_ESTIMATE : " + batteryEstimate);
+                    }
+                    showBatteryPredictionIfNecessary(estimateReady, batteryEstimate,
+                            linearLayout);
+                }
+            } finally {
+                cursor.close();
+            }
+        });
+    }
+
+    @VisibleForTesting
+    void showBatteryPredictionIfNecessary(int estimateReady, long batteryEstimate,
+            LinearLayout linearLayout) {
+        ThreadUtils.postOnMainThread(() -> {
+            final TextView textView = linearLayout.findViewById(R.id.bt_battery_prediction);
+            if (estimateReady == 1) {
+                textView.setVisibility(View.VISIBLE);
+                textView.setText(StringUtil.formatElapsedTime(mContext, batteryEstimate, false));
+            } else {
+                textView.setVisibility(View.GONE);
+            }
+        });
+    }
+
     private void showBatteryIcon(LinearLayout linearLayout, int level, boolean charging,
             int batteryMetaKey) {
         final int lowBatteryLevel =
@@ -279,7 +363,7 @@
         final BluetoothDevice bluetoothDevice = mCachedDevice.getDevice();
         final String iconUri = BluetoothUtils.getStringMetaData(bluetoothDevice,
                 BluetoothDevice.METADATA_MAIN_ICON);
-        if (DBG) {
+        if (DEBUG) {
             Log.d(TAG, "updateDisconnectLayout() iconUri : " + iconUri);
         }
         if (iconUri != null) {
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 86b72ec..f895032 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -44,6 +44,7 @@
 import com.android.settingslib.bluetooth.BluetoothUtils;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.utils.ThreadUtils;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -52,8 +53,7 @@
  * BluetoothDevicePreference is the preference type used to display each remote
  * Bluetooth device in the Bluetooth Settings screen.
  */
-public final class BluetoothDevicePreference extends GearPreference implements
-        CachedBluetoothDevice.Callback {
+public final class BluetoothDevicePreference extends GearPreference {
     private static final String TAG = "BluetoothDevicePref";
 
     private static int sDimAlpha = Integer.MIN_VALUE;
@@ -77,10 +77,20 @@
     private AlertDialog mDisconnectDialog;
     private String contentDescription = null;
     private boolean mHideSecondTarget = false;
+    private boolean mIsCallbackRemoved = false;
     @VisibleForTesting
     boolean mNeedNotifyHierarchyChanged = false;
     /* Talk-back descriptions for various BT icons */
     Resources mResources;
+    final BluetoothDevicePreferenceCallback mCallback;
+
+    private class BluetoothDevicePreferenceCallback implements CachedBluetoothDevice.Callback {
+
+        @Override
+        public void onDeviceAttributesChanged() {
+            onPreferenceAttributesChanged();
+        }
+    }
 
     public BluetoothDevicePreference(Context context, CachedBluetoothDevice cachedDevice,
             boolean showDeviceWithoutNames, @SortType int type) {
@@ -96,11 +106,12 @@
         }
 
         mCachedDevice = cachedDevice;
-        mCachedDevice.registerCallback(this);
+        mCallback = new BluetoothDevicePreferenceCallback();
+        mCachedDevice.registerCallback(mCallback);
         mCurrentTime = System.currentTimeMillis();
         mType = type;
 
-        onDeviceAttributesChanged();
+        onPreferenceAttributesChanged();
     }
 
     public void setNeedNotifyHierarchyChanged(boolean needNotifyHierarchyChanged) {
@@ -127,13 +138,35 @@
     @Override
     protected void onPrepareForRemoval() {
         super.onPrepareForRemoval();
-        mCachedDevice.unregisterCallback(this);
+        if (!mIsCallbackRemoved) {
+            mCachedDevice.unregisterCallback(mCallback);
+            mIsCallbackRemoved = true;
+        }
         if (mDisconnectDialog != null) {
             mDisconnectDialog.dismiss();
             mDisconnectDialog = null;
         }
     }
 
+    @Override
+    public void onAttached() {
+        super.onAttached();
+        if (mIsCallbackRemoved) {
+            mCachedDevice.registerCallback(mCallback);
+            mIsCallbackRemoved = false;
+        }
+        onPreferenceAttributesChanged();
+    }
+
+    @Override
+    public void onDetached() {
+        super.onDetached();
+        if (!mIsCallbackRemoved) {
+            mCachedDevice.unregisterCallback(mCallback);
+            mIsCallbackRemoved = true;
+        }
+    }
+
     public CachedBluetoothDevice getBluetoothDevice() {
         return mCachedDevice;
     }
@@ -142,7 +175,19 @@
         mHideSecondTarget = hideSecondTarget;
     }
 
-    public void onDeviceAttributesChanged() {
+    private void onPreferenceAttributesChanged() {
+        ThreadUtils.postOnBackgroundThread(() -> {
+            final Pair<Drawable, String> pair =
+                    BluetoothUtils.getBtRainbowDrawableWithDescription(getContext(), mCachedDevice);
+
+            ThreadUtils.postOnMainThread(() -> {
+                if (pair.first != null) {
+                    setIcon(pair.first);
+                    contentDescription = pair.second;
+                }
+            });
+        });
+
         /*
          * The preference framework takes care of making sure the value has
          * changed before proceeding. It will also call notifyChanged() if
@@ -152,13 +197,6 @@
         // Null check is done at the framework
         setSummary(mCachedDevice.getConnectionSummary());
 
-        final Pair<Drawable, String> pair =
-                BluetoothUtils.getBtRainbowDrawableWithDescription(getContext(), mCachedDevice);
-        if (pair.first != null) {
-            setIcon(pair.first);
-            contentDescription = pair.second;
-        }
-
         // Used to gray out the item
         setEnabled(!mCachedDevice.isBusy());
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingController.java b/src/com/android/settings/bluetooth/BluetoothPairingController.java
index a1d86be..ca3dda6 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingController.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingController.java
@@ -60,6 +60,7 @@
     private String mUserInput;
     private String mPasskeyFormatted;
     private int mPasskey;
+    private int mInitiator;
     private String mDeviceName;
     private LocalBluetoothProfile mPbapClientProfile;
     private boolean mPbapAllowed;
@@ -84,6 +85,8 @@
 
         mType = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT, BluetoothDevice.ERROR);
         mPasskey = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY, BluetoothDevice.ERROR);
+        mInitiator =
+                intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_INITIATOR, BluetoothDevice.ERROR);
         mDeviceName = mBluetoothManager.getCachedDeviceManager().getName(mDevice);
         mPbapClientProfile = mBluetoothManager.getProfileManager().getPbapClientProfile();
         mPasskeyFormatted = formatKey(mPasskey);
@@ -177,7 +180,7 @@
             default:
                 if (mDevice.getBluetoothClass().getDeviceClass()
                         == BluetoothClass.Device.AUDIO_VIDEO_HANDSFREE) {
-                    return true;
+                    return BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND == mInitiator;
                 }
                 return false;
         }
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 7da6342..0e4ed74 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -34,12 +34,9 @@
   @Override
   public void onReceive(Context context, Intent intent) {
     String action = intent.getAction();
-    if (!action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
+    if (action == null || !action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
       return;
     }
-    // convert broadcast intent into activity intent (same action string)
-    Intent pairingIntent = BluetoothPairingService.getPairingDialogIntent(context, intent);
-
     PowerManager powerManager =
         (PowerManager)context.getSystemService(Context.POWER_SERVICE);
     BluetoothDevice device =
@@ -51,6 +48,10 @@
     if (powerManager.isInteractive() && shouldShowDialog) {
       // Since the screen is on and the BT-related activity is in the foreground,
       // just open the dialog
+      // convert broadcast intent into activity intent (same action string)
+      Intent pairingIntent = BluetoothPairingService.getPairingDialogIntent(context, intent,
+              BluetoothDevice.EXTRA_PAIRING_INITIATOR_FOREGROUND);
+
       context.startActivityAsUser(pairingIntent, UserHandle.CURRENT);
     } else {
       // Put up a notification that leads to the dialog
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingService.java b/src/com/android/settings/bluetooth/BluetoothPairingService.java
index 53e93d9..c411b0c 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingService.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingService.java
@@ -51,7 +51,7 @@
 
     private BluetoothDevice mDevice;
 
-    public static Intent getPairingDialogIntent(Context context, Intent intent) {
+    public static Intent getPairingDialogIntent(Context context, Intent intent, int initiator) {
         BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
         int type = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_VARIANT,
                 BluetoothDevice.ERROR);
@@ -65,6 +65,7 @@
             int pairingKey = intent.getIntExtra(BluetoothDevice.EXTRA_PAIRING_KEY,
                     BluetoothDevice.ERROR);
             pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_KEY, pairingKey);
+            pairingIntent.putExtra(BluetoothDevice.EXTRA_PAIRING_INITIATOR, initiator);
         }
         pairingIntent.setAction(BluetoothDevice.ACTION_PAIRING_REQUEST);
         pairingIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -124,11 +125,14 @@
                 .setLocalOnly(true);
 
         PendingIntent pairIntent = PendingIntent.getActivity(this, 0,
-                getPairingDialogIntent(this, intent),
-                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT);
+                getPairingDialogIntent(this, intent,
+                        BluetoothDevice.EXTRA_PAIRING_INITIATOR_BACKGROUND),
+                PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_UPDATE_CURRENT
+                        | PendingIntent.FLAG_IMMUTABLE);
 
         PendingIntent dismissIntent = PendingIntent.getBroadcast(this, 0,
-                new Intent(ACTION_DISMISS_PAIRING), PendingIntent.FLAG_ONE_SHOT);
+                new Intent(ACTION_DISMISS_PAIRING), PendingIntent.FLAG_ONE_SHOT
+                        | PendingIntent.FLAG_IMMUTABLE);
 
         mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
 
diff --git a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
index 177bd89..7fac4991c 100644
--- a/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
@@ -179,8 +179,9 @@
                         .setOnlyAlertOnce(false)
                         .setDefaults(Notification.DEFAULT_ALL)
                         .setContentIntent(PendingIntent.getActivity(context, 0,
-                                connectionAccessIntent, 0))
-                        .setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent, 0))
+                                connectionAccessIntent, PendingIntent.FLAG_IMMUTABLE))
+                        .setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent,
+                                PendingIntent.FLAG_IMMUTABLE))
                         .setColor(context.getColor(
                                 com.android.internal.R.color.system_notification_accent_color))
                         .setLocalOnly(true)
diff --git a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
index 5a4ee1f..67c3650 100644
--- a/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
+++ b/src/com/android/settings/bluetooth/BluetoothSliceBuilder.java
@@ -129,13 +129,13 @@
     private static PendingIntent getPrimaryAction(Context context) {
         final Intent intent = getIntent(context);
         return PendingIntent.getActivity(context, 0 /* requestCode */,
-                intent, 0 /* flags */);
+                intent, PendingIntent.FLAG_IMMUTABLE);
     }
 
     private static PendingIntent getBroadcastIntent(Context context) {
         final Intent intent = new Intent(ACTION_BLUETOOTH_SLICE_CHANGED)
                 .setClass(context, SliceBroadcastReceiver.class);
         return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 }
diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java
index 02625bb..ab8eea5 100644
--- a/src/com/android/settings/bluetooth/DevicePickerFragment.java
+++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java
@@ -18,6 +18,7 @@
 
 import static android.os.UserManager.DISALLOW_CONFIG_BLUETOOTH;
 
+import android.Manifest;
 import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
@@ -192,6 +193,6 @@
         if (mLaunchPackage != null && mLaunchClass != null) {
             intent.setClassName(mLaunchPackage, mLaunchClass);
         }
-        getActivity().sendBroadcast(intent);
+        getActivity().sendBroadcast(intent, Manifest.permission.BLUETOOTH_ADMIN);
     }
 }
diff --git a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
index 466d60e..dab4f23 100644
--- a/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdater.java
@@ -24,6 +24,7 @@
 import androidx.preference.Preference;
 
 import com.android.settings.connecteddevice.DevicePreferenceCallback;
+import com.android.settings.connecteddevice.PreviouslyConnectedDeviceDashboardFragment;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
@@ -42,13 +43,15 @@
 
     private static final String PREF_KEY = "saved_bt";
 
+    private final boolean mDisplayConnected;
+
     @VisibleForTesting
     BluetoothAdapter mBluetoothAdapter;
 
     public SavedBluetoothDeviceUpdater(Context context, DashboardFragment fragment,
             DevicePreferenceCallback devicePreferenceCallback) {
         super(context, fragment, devicePreferenceCallback);
-
+        mDisplayConnected = (fragment instanceof PreviouslyConnectedDeviceDashboardFragment);
         mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
     }
 
@@ -101,7 +104,8 @@
                     ", is connected : " + device.isConnected() + ", is profile connected : "
                     + cachedDevice.isConnected());
         }
-        return device.getBondState() == BluetoothDevice.BOND_BONDED && !device.isConnected();
+        return device.getBondState() == BluetoothDevice.BOND_BONDED
+                && (mDisplayConnected || !device.isConnected());
     }
 
     @Override
@@ -109,6 +113,9 @@
         mMetricsFeatureProvider.logClickedPreference(preference, mFragment.getMetricsCategory());
         final CachedBluetoothDevice device = ((BluetoothDevicePreference) preference)
                 .getBluetoothDevice();
+        if (device.isConnected()) {
+            return device.setActive();
+        }
         device.connect();
         return true;
     }
diff --git a/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java b/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java
index f4acc7d..266a449 100644
--- a/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java
+++ b/src/com/android/settings/bugreporthandler/BugReportHandlerUtil.java
@@ -76,14 +76,14 @@
         int handlerUser = getCustomBugReportHandlerUser(context);
 
         boolean needToResetOutdatedSettings = false;
-        if (!isBugreportWhitelistedApp(handlerApp)) {
+        if (!isBugreportAllowlistedApp(handlerApp)) {
             handlerApp = getDefaultBugReportHandlerApp(context);
             handlerUser = UserHandle.USER_SYSTEM;
         } else if (getBugReportHandlerAppReceivers(context, handlerApp, handlerUser).isEmpty()) {
             // It looks like the settings are outdated, need to reset outdated settings.
             //
             // i.e.
-            // If user chooses which profile and which bugreport-whitelisted app in that
+            // If user chooses which profile and which bugreport-allowlisted app in that
             // profile to handle a bugreport, then user remove the profile.
             // === RESULT ===
             // The chosen bugreport handler app is outdated because the profile is removed,
@@ -93,7 +93,7 @@
             needToResetOutdatedSettings = true;
         }
 
-        if (!isBugreportWhitelistedApp(handlerApp)
+        if (!isBugreportAllowlistedApp(handlerApp)
                 || getBugReportHandlerAppReceivers(context, handlerApp, handlerUser).isEmpty()) {
             // It looks like current handler app may be too old and doesn't support to handle a
             // bugreport, so change to let shell to handle a bugreport and need to reset
@@ -136,7 +136,7 @@
      */
     public boolean setCurrentBugReportHandlerAppAndUser(Context context, String handlerApp,
             int handlerUser) {
-        if (!isBugreportWhitelistedApp(handlerApp)) {
+        if (!isBugreportAllowlistedApp(handlerApp)) {
             return false;
         } else if (getBugReportHandlerAppReceivers(context, handlerApp, handlerUser).isEmpty()) {
             return false;
@@ -155,17 +155,17 @@
     public List<Pair<ApplicationInfo, Integer>> getValidBugReportHandlerInfos(Context context) {
         final List<Pair<ApplicationInfo, Integer>> validBugReportHandlerApplicationInfos =
                 new ArrayList<>();
-        List<String> bugreportWhitelistedPackages;
+        List<String> bugreportAllowlistedPackages;
         try {
-            bugreportWhitelistedPackages =
+            bugreportAllowlistedPackages =
                     ActivityManager.getService().getBugreportWhitelistedPackages();
         } catch (RemoteException e) {
-            Log.e(TAG, "Failed to get bugreportWhitelistedPackages:", e);
+            Log.e(TAG, "Failed to get bugreportAllowlistedPackages:", e);
             return validBugReportHandlerApplicationInfos;
         }
 
         // Add "Shell with system user" as System default preference on top of screen
-        if (bugreportWhitelistedPackages.contains(SHELL_APP_PACKAGE)
+        if (bugreportAllowlistedPackages.contains(SHELL_APP_PACKAGE)
                 && !getBugReportHandlerAppReceivers(context, SHELL_APP_PACKAGE,
                 UserHandle.USER_SYSTEM).isEmpty()) {
             try {
@@ -181,7 +181,7 @@
         final UserManager userManager = context.getSystemService(UserManager.class);
         final List<UserInfo> profileList = userManager.getProfiles(UserHandle.getCallingUserId());
         // Only add non-Shell app as normal preference
-        final List<String> nonShellPackageList = bugreportWhitelistedPackages.stream()
+        final List<String> nonShellPackageList = bugreportAllowlistedPackages.stream()
                 .filter(pkg -> !SHELL_APP_PACKAGE.equals(pkg)).collect(Collectors.toList());
         Collections.sort(nonShellPackageList);
         for (String pkg : nonShellPackageList) {
@@ -202,15 +202,15 @@
         return validBugReportHandlerApplicationInfos;
     }
 
-    private boolean isBugreportWhitelistedApp(String app) {
-        // Verify the app is bugreport-whitelisted
+    private boolean isBugreportAllowlistedApp(String app) {
+        // Verify the app is bugreport-allowlisted
         if (TextUtils.isEmpty(app)) {
             return false;
         }
         try {
             return ActivityManager.getService().getBugreportWhitelistedPackages().contains(app);
         } catch (RemoteException e) {
-            Log.e(TAG, "Failed to get bugreportWhitelistedPackages:", e);
+            Log.e(TAG, "Failed to get bugreportAllowlistedPackages:", e);
             return false;
         }
     }
diff --git a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
index 3e64de5..2f61452 100644
--- a/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/BluetoothDashboardFragment.java
@@ -83,6 +83,7 @@
 
         SettingsActivity activity = (SettingsActivity) getActivity();
         mSwitchBar = activity.getSwitchBar();
+        mSwitchBar.setSwitchBarText(R.string.bluetooth_setting_on, R.string.bluetooth_setting_off);
         mController = new BluetoothSwitchPreferenceController(activity,
                 new SwitchBarController(mSwitchBar), mFooterPreference);
         Lifecycle lifecycle = getSettingsLifecycle();
diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java
index d3f5c28..05a17cc 100644
--- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragment.java
@@ -16,7 +16,11 @@
 package com.android.settings.connecteddevice;
 
 import android.app.settings.SettingsEnums;
+import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
+import android.os.Bundle;
+
+import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
@@ -32,6 +36,9 @@
     private static final String TAG = "PreConnectedDeviceFrag";
     static final String KEY_PREVIOUSLY_CONNECTED_DEVICES = "saved_device_list";
 
+    @VisibleForTesting
+    BluetoothAdapter mBluetoothAdapter;
+
     @Override
     public int getHelpResource() {
         return R.string.help_url_previously_connected_devices;
@@ -53,11 +60,31 @@
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+    }
+
+    @Override
     public void onAttach(Context context) {
         super.onAttach(context);
         use(SavedDeviceGroupController.class).init(this);
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        enableBluetoothIfNecessary();
+    }
+
+    @VisibleForTesting
+    void enableBluetoothIfNecessary() {
+        if (mBluetoothAdapter != null && !mBluetoothAdapter.isEnabled()) {
+            mBluetoothAdapter.enable();
+        }
+    }
+
     /**
      * For Search.
      */
diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
index 5b23d69..a7bae3b 100644
--- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java
@@ -15,14 +15,22 @@
  */
 package com.android.settings.connecteddevice;
 
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.R;
+import com.android.settings.bluetooth.BluetoothDevicePreference;
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
 import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
 import com.android.settings.connecteddevice.dock.DockUpdater;
@@ -33,21 +41,47 @@
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController
         implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback {
 
+    private static final String TAG = "PreviouslyDevicePreController";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
     private static final int MAX_DEVICE_NUM = 3;
+    private static final int DOCK_DEVICE_INDEX = 9;
+    private static final String KEY_SEE_ALL = "previously_connected_devices_see_all";
+
+    private final List<Preference> mDevicesList = new ArrayList<>();
+    private final List<Preference> mDockDevicesList = new ArrayList<>();
 
     private PreferenceGroup mPreferenceGroup;
     private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
     private DockUpdater mSavedDockUpdater;
-    private int mPreferenceSize;
+    private BluetoothAdapter mBluetoothAdapter;
+
+    @VisibleForTesting
+    Preference mSeeAllPreference;
+    @VisibleForTesting
+    IntentFilter mIntentFilter;
+
+    @VisibleForTesting
+    BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            updatePreferenceVisibility();
+        }
+    };
 
     public PreviouslyConnectedDevicePreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
 
         mSavedDockUpdater = FeatureFactory.getFactory(
                 context).getDockUpdaterFeatureProvider().getSavedDockUpdater(context, this);
+        mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
     }
 
     @Override
@@ -62,7 +96,8 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPreferenceGroup = screen.findPreference(getPreferenceKey());
-        mPreferenceGroup.setVisible(false);
+        mSeeAllPreference = mPreferenceGroup.findPreference(KEY_SEE_ALL);
+        updatePreferenceVisibility();
 
         if (isAvailable()) {
             final Context context = screen.getContext();
@@ -75,12 +110,14 @@
     public void onStart() {
         mBluetoothDeviceUpdater.registerCallback();
         mSavedDockUpdater.registerCallback();
+        mContext.registerReceiver(mReceiver, mIntentFilter);
     }
 
     @Override
     public void onStop() {
         mBluetoothDeviceUpdater.unregisterCallback();
         mSavedDockUpdater.unregisterCallback();
+        mContext.unregisterReceiver(mReceiver);
     }
 
     public void init(DashboardFragment fragment) {
@@ -90,18 +127,77 @@
 
     @Override
     public void onDeviceAdded(Preference preference) {
-        mPreferenceSize++;
-        if (mPreferenceSize <= MAX_DEVICE_NUM) {
-            mPreferenceGroup.addPreference(preference);
+        final List<BluetoothDevice> bluetoothDevices =
+                mBluetoothAdapter.getMostRecentlyConnectedDevices();
+        final int index = preference instanceof BluetoothDevicePreference
+                ? bluetoothDevices.indexOf(((BluetoothDevicePreference) preference)
+                .getBluetoothDevice().getDevice()) : DOCK_DEVICE_INDEX;
+        if (DEBUG) {
+            Log.d(TAG, "onDeviceAdded() " + preference.getTitle() + ", index of : " + index);
+            for (BluetoothDevice device : bluetoothDevices) {
+                Log.d(TAG, "onDeviceAdded() most recently device : " + device.getName());
+            }
         }
-        updatePreferenceVisiblity();
+        addPreference(index, preference);
+        updatePreferenceVisibility();
+    }
+
+    private void addPreference(int index, Preference preference) {
+        if (preference instanceof BluetoothDevicePreference) {
+            if (index >= 0 && mDevicesList.size() >= index) {
+                mDevicesList.add(index, preference);
+            } else {
+                mDevicesList.add(preference);
+            }
+        } else {
+            mDockDevicesList.add(preference);
+        }
+        addPreference();
+    }
+
+    private void addPreference() {
+        mPreferenceGroup.removeAll();
+        mPreferenceGroup.addPreference(mSeeAllPreference);
+        final int size = getDeviceListSize();
+        for (int i = 0; i < size; i++) {
+            if (DEBUG) {
+                Log.d(TAG, "addPreference() add device : " + mDevicesList.get(i).getTitle());
+            }
+            mDevicesList.get(i).setOrder(i);
+            mPreferenceGroup.addPreference(mDevicesList.get(i));
+        }
+        if (mDockDevicesList.size() > 0) {
+            for (int i = 0; i < getDockDeviceListSize(MAX_DEVICE_NUM - size); i++) {
+                if (DEBUG) {
+                    Log.d(TAG, "addPreference() add dock device : "
+                            + mDockDevicesList.get(i).getTitle());
+                }
+                mDockDevicesList.get(i).setOrder(DOCK_DEVICE_INDEX);
+                mPreferenceGroup.addPreference(mDockDevicesList.get(i));
+            }
+        }
+    }
+
+    private int getDeviceListSize() {
+        return mDevicesList.size() >= MAX_DEVICE_NUM
+                ? MAX_DEVICE_NUM : mDevicesList.size();
+    }
+
+    private int getDockDeviceListSize(int availableSize) {
+        return mDockDevicesList.size() >= availableSize
+                ? availableSize : mDockDevicesList.size();
     }
 
     @Override
     public void onDeviceRemoved(Preference preference) {
-        mPreferenceSize--;
-        mPreferenceGroup.removePreference(preference);
-        updatePreferenceVisiblity();
+        if (preference instanceof BluetoothDevicePreference) {
+            mDevicesList.remove(preference);
+        } else {
+            mDockDevicesList.remove(preference);
+        }
+
+        addPreference();
+        updatePreferenceVisibility();
     }
 
     @VisibleForTesting
@@ -120,7 +216,12 @@
     }
 
     @VisibleForTesting
-    void updatePreferenceVisiblity() {
-        mPreferenceGroup.setVisible(mPreferenceSize > 0);
+    void updatePreferenceVisibility() {
+        if (mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()) {
+            mSeeAllPreference.setSummary("");
+        } else {
+            mSeeAllPreference.setSummary(
+                    mContext.getString(R.string.connected_device_see_all_summary));
+        }
     }
 }
diff --git a/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java b/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
index fd36bca..fac3201 100644
--- a/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
+++ b/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java
@@ -17,9 +17,11 @@
 package com.android.settings.connecteddevice;
 
 import android.content.Context;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
 
 public class TopLevelConnectedDevicesPreferenceController extends BasePreferenceController {
 
@@ -36,6 +38,11 @@
 
     @Override
     public CharSequence getSummary() {
+        // Remove homepage summaries for silky home.
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            return null;
+        }
+
         return mContext.getText(
                 AdvancedConnectedDeviceController.getConnectedDevicesSummaryResourceId(mContext));
     }
diff --git a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
index 1078a21..6a13a96 100644
--- a/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
@@ -97,7 +97,7 @@
             // New version - uses a separate screen.
             new SubSettingLauncher(mFragment.getContext())
                     .setDestination(UsbDetailsFragment.class.getName())
-                    .setTitleRes(R.string.device_details_title)
+                    .setTitleRes(R.string.usb_preference)
                     .setSourceMetricsCategory(mFragment.getMetricsCategory())
                     .launch();
             return true;
diff --git a/src/com/android/settings/connecteddevice/usb/UsbBackend.java b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
index 556f76d..4773aca 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbBackend.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbBackend.java
@@ -50,6 +50,7 @@
     private final boolean mTetheringRestrictedBySystem;
     private final boolean mMidiSupported;
     private final boolean mTetheringSupported;
+    private final boolean mIsAdminUser;
 
     private UsbManager mUsbManager;
 
@@ -70,6 +71,7 @@
         mFileTransferRestrictedBySystem = isUsbFileTransferRestrictedBySystem(userManager);
         mTetheringRestricted = isUsbTetheringRestricted(userManager);
         mTetheringRestrictedBySystem = isUsbTetheringRestrictedBySystem(userManager);
+        mIsAdminUser = userManager.isAdminUser();
 
         mMidiSupported = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_MIDI);
         ConnectivityManager cm =
@@ -100,7 +102,8 @@
                 || (!mTetheringSupported && (functions & UsbManager.FUNCTION_RNDIS) != 0)) {
             return false;
         }
-        return !(areFunctionDisallowed(functions) || areFunctionsDisallowedBySystem(functions));
+        return !(areFunctionDisallowed(functions) || areFunctionsDisallowedBySystem(functions)
+                || areFunctionsDisallowedByNonAdminUser(functions));
     }
 
     public int getPowerRole() {
@@ -207,6 +210,11 @@
                 || (mTetheringRestrictedBySystem && ((functions & UsbManager.FUNCTION_RNDIS) != 0));
     }
 
+    @VisibleForTesting
+    boolean areFunctionsDisallowedByNonAdminUser(long functions) {
+        return !mIsAdminUser && (functions & UsbManager.FUNCTION_RNDIS) != 0;
+    }
+
     private void updatePorts() {
         mPort = null;
         mPortStatus = null;
diff --git a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
index e557847..a203534 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
@@ -72,6 +72,9 @@
             if (intent.getExtras().getBoolean(UsbManager.USB_FUNCTION_RNDIS)) {
                 functions |= UsbManager.FUNCTION_RNDIS;
             }
+            if (intent.getExtras().getBoolean(UsbManager.USB_FUNCTION_ACCESSORY)) {
+                functions |= UsbManager.FUNCTION_ACCESSORY;
+            }
             mFunctions = functions;
             mDataRole = mUsbBackend.getDataRole();
             mPowerRole = mUsbBackend.getPowerRole();
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
index 31bca12..99e9d50 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsController.java
@@ -22,6 +22,7 @@
 import android.content.Context;
 import android.hardware.usb.UsbManager;
 import android.net.ConnectivityManager;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceCategory;
@@ -40,6 +41,9 @@
 public class UsbDetailsFunctionsController extends UsbDetailsController
         implements RadioButtonPreference.OnClickListener {
 
+    private static final String TAG = "UsbFunctionsCtrl";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
     static final Map<Long, Integer> FUNCTIONS_MAP = new LinkedHashMap<>();
 
     static {
@@ -88,6 +92,10 @@
 
     @Override
     protected void refresh(boolean connected, long functions, int powerRole, int dataRole) {
+        if (DEBUG) {
+            Log.d(TAG, "refresh() connected : " + connected + ", functions : " + functions
+                    + ", powerRole : " + powerRole + ", dataRole : " + dataRole);
+        }
         if (!connected || dataRole != DATA_ROLE_DEVICE) {
             mProfilesContainer.setEnabled(false);
         } else {
@@ -100,7 +108,11 @@
             pref = getProfilePreference(UsbBackend.usbFunctionsToString(option), title);
             // Only show supported options
             if (mUsbBackend.areFunctionsSupported(option)) {
-                pref.setChecked(functions == option);
+                if (isAccessoryMode(functions)) {
+                    pref.setChecked(UsbManager.FUNCTION_MTP == option);
+                } else {
+                    pref.setChecked(functions == option);
+                }
             } else {
                 mProfilesContainer.removePreference(pref);
             }
@@ -111,7 +123,14 @@
     public void onRadioButtonClicked(RadioButtonPreference preference) {
         final long function = UsbBackend.usbFunctionsFromString(preference.getKey());
         final long previousFunction = mUsbBackend.getCurrentFunctions();
-        if (function != previousFunction && !Utils.isMonkeyRunning()) {
+        if (DEBUG) {
+            Log.d(TAG, "onRadioButtonClicked() function : " + function + ", toString() : "
+                    + UsbManager.usbFunctionsToString(function) + ", previousFunction : "
+                    + previousFunction + ", toString() : "
+                    + UsbManager.usbFunctionsToString(previousFunction));
+        }
+        if (function != previousFunction && !Utils.isMonkeyRunning()
+                && !shouldIgnoreClickEvent(function, previousFunction)) {
             mPreviousFunction = previousFunction;
 
             //Update the UI in advance to make it looks smooth
@@ -134,6 +153,14 @@
         }
     }
 
+    private boolean shouldIgnoreClickEvent(long function, long previousFunction) {
+        return isAccessoryMode(previousFunction) && function == UsbManager.FUNCTION_MTP;
+    }
+
+    private boolean isAccessoryMode(long function) {
+        return (function & UsbManager.FUNCTION_ACCESSORY) != 0;
+    }
+
     @Override
     public boolean isAvailable() {
         return !Utils.isMonkeyRunning();
diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java
index d2ad30d..6bfd01a 100644
--- a/src/com/android/settings/core/FeatureFlags.java
+++ b/src/com/android/settings/core/FeatureFlags.java
@@ -23,10 +23,11 @@
     public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher";
     public static final String DYNAMIC_SYSTEM = "settings_dynamic_system";
     public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid";
-    public static final String SETTINGS_FUSE_FLAG = "settings_fuse";
     public static final String WIFI_DETAILS_DATAUSAGE_HEADER =
             "settings_wifi_details_datausage_header";
     public static final String CONTROLLER_ENHANCEMENT = "settings_controller_loading_enhancement";
     public static final String CONDITIONAL_CARDS = "settings_conditionals";
     public static final String TETHER_ALL_IN_ONE = "settings_tether_all_in_one";
+    public static final String SILKY_HOME = "settings_silky_home";
+    public static final String CONTEXTUAL_HOME = "settings_contextual_home";
 }
diff --git a/src/com/android/settings/core/SettingsBaseActivity.java b/src/com/android/settings/core/SettingsBaseActivity.java
index 57697a6..d160dc5 100644
--- a/src/com/android/settings/core/SettingsBaseActivity.java
+++ b/src/com/android/settings/core/SettingsBaseActivity.java
@@ -41,11 +41,14 @@
 import com.android.settings.R;
 import com.android.settings.SubSettings;
 import com.android.settings.dashboard.CategoryManager;
+import com.android.settingslib.drawer.Tile;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class SettingsBaseActivity extends FragmentActivity {
 
@@ -55,10 +58,11 @@
 
     // Serves as a temporary list of tiles to ignore until we heard back from the PM that they
     // are disabled.
-    private static ArraySet<ComponentName> sTileBlacklist = new ArraySet<>();
+    private static ArraySet<ComponentName> sTileDenylist = new ArraySet<>();
 
     private final PackageReceiver mPackageReceiver = new PackageReceiver();
     private final List<CategoryListener> mCategoryListeners = new ArrayList<>();
+    private int mCategoriesUpdateTaskCount;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -147,10 +151,10 @@
         ((ViewGroup) findViewById(R.id.content_frame)).addView(view, params);
     }
 
-    private void onCategoriesChanged() {
+    private void onCategoriesChanged(Set<String> categories) {
         final int N = mCategoryListeners.size();
         for (int i = 0; i < N; i++) {
-            mCategoryListeners.get(i).onCategoriesChanged();
+            mCategoryListeners.get(i).onCategoriesChanged(categories);
         }
     }
 
@@ -177,9 +181,9 @@
         boolean isEnabled = state == PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
         if (isEnabled != enabled || state == PackageManager.COMPONENT_ENABLED_STATE_DEFAULT) {
             if (enabled) {
-                sTileBlacklist.remove(component);
+                sTileDenylist.remove(component);
             } else {
-                sTileBlacklist.add(component);
+                sTileDenylist.add(component);
             }
             pm.setComponentEnabledSetting(component, enabled
                             ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
@@ -194,38 +198,100 @@
      * Updates dashboard categories. Only necessary to call this after setTileEnabled
      */
     public void updateCategories() {
-        new CategoriesUpdateTask().execute();
+        updateCategories(false /* fromBroadcast */);
+    }
+
+    private void updateCategories(boolean fromBroadcast) {
+        // Only allow at most 2 tasks existing at the same time since when the first one is
+        // executing, there may be new data from the second update request.
+        // Ignore the third update request because the second task is still waiting for the first
+        // task to complete in a serial thread, which will get the latest data.
+        if (mCategoriesUpdateTaskCount < 2) {
+            new CategoriesUpdateTask().execute(fromBroadcast);
+        }
     }
 
     public interface CategoryListener {
-        void onCategoriesChanged();
+        /**
+         * @param categories the changed categories that have to be refreshed, or null to force
+         * refreshing all.
+         */
+        void onCategoriesChanged(@Nullable Set<String> categories);
     }
 
-    private class CategoriesUpdateTask extends AsyncTask<Void, Void, Void> {
+    private class CategoriesUpdateTask extends AsyncTask<Boolean, Void, Set<String>> {
 
+        private final Context mContext;
         private final CategoryManager mCategoryManager;
+        private Map<ComponentName, Tile> mPreviousTileMap;
 
         public CategoriesUpdateTask() {
-            mCategoryManager = CategoryManager.get(SettingsBaseActivity.this);
+            mCategoriesUpdateTaskCount++;
+            mContext = SettingsBaseActivity.this;
+            mCategoryManager = CategoryManager.get(mContext);
         }
 
         @Override
-        protected Void doInBackground(Void... params) {
-            mCategoryManager.reloadAllCategories(SettingsBaseActivity.this);
-            return null;
+        protected Set<String> doInBackground(Boolean... params) {
+            mPreviousTileMap = mCategoryManager.getTileByComponentMap();
+            mCategoryManager.reloadAllCategories(mContext);
+            mCategoryManager.updateCategoryFromDenylist(sTileDenylist);
+            return getChangedCategories(params[0]);
         }
 
         @Override
-        protected void onPostExecute(Void result) {
-            mCategoryManager.updateCategoryFromBlacklist(sTileBlacklist);
-            onCategoriesChanged();
+        protected void onPostExecute(Set<String> categories) {
+            if (categories == null || !categories.isEmpty()) {
+                onCategoriesChanged(categories);
+            }
+            mCategoriesUpdateTaskCount--;
+        }
+
+        // Return the changed categories that have to be refreshed, or null to force refreshing all.
+        private Set<String> getChangedCategories(boolean fromBroadcast) {
+            if (!fromBroadcast) {
+                // Always refresh for non-broadcast case.
+                return null;
+            }
+
+            final Set<String> changedCategories = new ArraySet<>();
+            final Map<ComponentName, Tile> currentTileMap =
+                    mCategoryManager.getTileByComponentMap();
+            currentTileMap.forEach((component, currentTile) -> {
+                final Tile previousTile = mPreviousTileMap.get(component);
+                // Check if the tile is newly added.
+                if (previousTile == null) {
+                    Log.i(TAG, "Tile added: " + component.flattenToShortString());
+                    changedCategories.add(currentTile.getCategory());
+                    return;
+                }
+
+                // Check if the title or summary has changed.
+                if (!TextUtils.equals(currentTile.getTitle(mContext),
+                        previousTile.getTitle(mContext))
+                        || !TextUtils.equals(currentTile.getSummary(mContext),
+                        previousTile.getSummary(mContext))) {
+                    Log.i(TAG, "Tile changed: " + component.flattenToShortString());
+                    changedCategories.add(currentTile.getCategory());
+                }
+            });
+
+            // Check if any previous tile is removed.
+            final Set<ComponentName> removal = new ArraySet(mPreviousTileMap.keySet());
+            removal.removeAll(currentTileMap.keySet());
+            removal.forEach(component -> {
+                Log.i(TAG, "Tile removed: " + component.flattenToShortString());
+                changedCategories.add(mPreviousTileMap.get(component).getCategory());
+            });
+
+            return changedCategories;
         }
     }
 
     private class PackageReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
-            updateCategories();
+            updateCategories(true /* fromBroadcast */);
         }
     }
 }
diff --git a/src/com/android/settings/core/TogglePreferenceController.java b/src/com/android/settings/core/TogglePreferenceController.java
index 5a2a8b7..c958a93 100644
--- a/src/com/android/settings/core/TogglePreferenceController.java
+++ b/src/com/android/settings/core/TogglePreferenceController.java
@@ -20,7 +20,7 @@
 
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.slices.SliceData;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settings.widget.TwoStateButtonPreference;
 
 /**
@@ -54,8 +54,8 @@
     public void updateState(Preference preference) {
         if (preference instanceof TwoStatePreference) {
             ((TwoStatePreference) preference).setChecked(isChecked());
-        } else if (preference instanceof MasterSwitchPreference) {
-            ((MasterSwitchPreference) preference).setChecked(isChecked());
+        } else if (preference instanceof PrimarySwitchPreference) {
+            ((PrimarySwitchPreference) preference).setChecked(isChecked());
         } else if (preference instanceof TwoStateButtonPreference) {
             ((TwoStateButtonPreference) preference).setChecked(isChecked());
         } else {
@@ -66,7 +66,7 @@
     @Override
     public final boolean onPreferenceChange(Preference preference, Object newValue) {
         // TwoStatePreference is a regular preference and can be handled by DashboardFragment
-        if (preference instanceof MasterSwitchPreference
+        if (preference instanceof PrimarySwitchPreference
                 || preference instanceof TwoStateButtonPreference) {
             FeatureFactory.getFactory(mContext).getMetricsFeatureProvider()
                     .logClickedPreference(preference, getMetricsCategory());
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
index ad4da08..2c21771 100644
--- a/src/com/android/settings/core/gateway/SettingsGateway.java
+++ b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -19,7 +19,7 @@
 import com.android.settings.AllInOneTetherSettings;
 import com.android.settings.DisplaySettings;
 import com.android.settings.IccLockSettings;
-import com.android.settings.MasterClear;
+import com.android.settings.MainClear;
 import com.android.settings.Settings;
 import com.android.settings.TestingSettings;
 import com.android.settings.TetherSettings;
@@ -29,6 +29,7 @@
 import com.android.settings.accessibility.AccessibilitySettingsForSetupWizard;
 import com.android.settings.accessibility.CaptionPropertiesFragment;
 import com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment;
+import com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment;
 import com.android.settings.accounts.AccountDashboardFragment;
 import com.android.settings.accounts.AccountSyncSettings;
 import com.android.settings.accounts.ChooseAccountFragment;
@@ -52,6 +53,7 @@
 import com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessDetails;
 import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails;
 import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureSettings;
+import com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess;
 import com.android.settings.applications.specialaccess.vrlistener.VrListenerSettings;
 import com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails;
 import com.android.settings.backup.PrivacySettings;
@@ -108,10 +110,11 @@
 import com.android.settings.localepicker.LocaleListEditor;
 import com.android.settings.location.LocationSettings;
 import com.android.settings.location.ScanningSettings;
-import com.android.settings.network.ApnEditor;
-import com.android.settings.network.ApnSettings;
 import com.android.settings.network.MobileNetworkListFragment;
 import com.android.settings.network.NetworkDashboardFragment;
+import com.android.settings.network.NetworkProviderSettings;
+import com.android.settings.network.apn.ApnEditor;
+import com.android.settings.network.apn.ApnSettings;
 import com.android.settings.nfc.AndroidBeam;
 import com.android.settings.nfc.PaymentSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
@@ -152,11 +155,9 @@
 import com.android.settings.wifi.WifiAPITest;
 import com.android.settings.wifi.WifiInfo;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.wifi.WifiSettings2;
 import com.android.settings.wifi.calling.WifiCallingDisclaimerFragment;
 import com.android.settings.wifi.calling.WifiCallingSettings;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
-import com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2;
 import com.android.settings.wifi.tether.WifiTetherSettings;
 
@@ -170,9 +171,7 @@
             AdvancedConnectedDeviceDashboardFragment.class.getName(),
             CreateShortcut.class.getName(),
             WifiSettings.class.getName(),
-            WifiSettings2.class.getName(),
             ConfigureWifiSettings.class.getName(),
-            SavedAccessPointsWifiSettings.class.getName(),
             SavedAccessPointsWifiSettings2.class.getName(),
             AllInOneTetherSettings.class.getName(),
             TetherSettings.class.getName(),
@@ -208,6 +207,7 @@
             AccessibilitySettingsForSetupWizard.class.getName(),
             CaptionPropertiesFragment.class.getName(),
             ToggleDaltonizerPreferenceFragment.class.getName(),
+            ToggleReduceBrightColorsPreferenceFragment.class.getName(),
             TextToSpeechSettings.class.getName(),
             StorageSettings.class.getName(),
             PrivateVolumeForget.class.getName(),
@@ -271,13 +271,14 @@
             VrListenerSettings.class.getName(),
             PictureInPictureSettings.class.getName(),
             PictureInPictureDetails.class.getName(),
+            PremiumSmsAccess.class.getName(),
             ManagedProfileSettings.class.getName(),
             ChooseAccountFragment.class.getName(),
             IccLockSettings.class.getName(),
             TestingSettings.class.getName(),
             WifiAPITest.class.getName(),
             WifiInfo.class.getName(),
-            MasterClear.class.getName(),
+            MainClear.class.getName(),
             ResetDashboardFragment.class.getName(),
             NightDisplaySettings.class.getName(),
             ManageDomainUrls.class.getName(),
@@ -307,7 +308,8 @@
             GestureNavigationSettingsFragment.class.getName(),
             InteractAcrossProfilesSettings.class.getName(),
             InteractAcrossProfilesDetails.class.getName(),
-            MediaControlsSettings.class.getName()
+            MediaControlsSettings.class.getName(),
+            NetworkProviderSettings.class.getName()
     };
 
     public static final String[] SETTINGS_FOR_RESTRICTED = {
@@ -327,8 +329,8 @@
             SupportDashboardActivity.class.getName(),
             // Home page > Network & Internet
             Settings.WifiSettingsActivity.class.getName(),
-            Settings.WifiSettings2Activity.class.getName(),
             Settings.DataUsageSummaryActivity.class.getName(),
+            Settings.NetworkProviderSettingsActivity.class.getName(),
             // Home page > Connected devices
             Settings.BluetoothSettingsActivity.class.getName(),
             Settings.WifiDisplaySettingsActivity.class.getName(),
diff --git a/src/com/android/settings/dashboard/CategoryManager.java b/src/com/android/settings/dashboard/CategoryManager.java
index 525b6f8..2a82abe 100644
--- a/src/com/android/settings/dashboard/CategoryManager.java
+++ b/src/com/android/settings/dashboard/CategoryManager.java
@@ -41,6 +41,7 @@
 public class CategoryManager {
 
     private static final String TAG = "CategoryManager";
+    private static final boolean DEBUG = false;
 
     private static CategoryManager sInstance;
     private final InterestingConfigChanges mInterestingConfigChanges;
@@ -85,21 +86,51 @@
         tryInitCategories(context, forceClearCache);
     }
 
-    public synchronized void updateCategoryFromBlacklist(Set<ComponentName> tileBlacklist) {
+    /**
+     * Update category from deny list
+     * @param tileDenylist
+     */
+    public synchronized void updateCategoryFromDenylist(Set<ComponentName> tileDenylist) {
         if (mCategories == null) {
-            Log.w(TAG, "Category is null, skipping blacklist update");
+            Log.w(TAG, "Category is null, skipping denylist update");
+            return;
         }
         for (int i = 0; i < mCategories.size(); i++) {
             DashboardCategory category = mCategories.get(i);
             for (int j = 0; j < category.getTilesCount(); j++) {
                 Tile tile = category.getTile(j);
-                if (tileBlacklist.contains(tile.getIntent().getComponent())) {
+                if (tileDenylist.contains(tile.getIntent().getComponent())) {
                     category.removeTile(j--);
                 }
             }
         }
     }
 
+    /** Return the current tile map */
+    public synchronized Map<ComponentName, Tile> getTileByComponentMap() {
+        final Map<ComponentName, Tile> result = new ArrayMap<>();
+        if (mCategories == null) {
+            Log.w(TAG, "Category is null, no tiles");
+            return result;
+        }
+        mCategories.forEach(category -> {
+            for (int i = 0; i < category.getTilesCount(); i++) {
+                final Tile tile = category.getTile(i);
+                result.put(tile.getIntent().getComponent(), tile);
+            }
+        });
+        return result;
+    }
+
+    private void logTiles(Context context) {
+        if (DEBUG) {
+            getTileByComponentMap().forEach((component, tile) -> {
+                Log.d(TAG, "Tile: " + tile.getCategory().replace("com.android.settings.", "")
+                        + ": " + tile.getTitle(context) + ", " + component.flattenToShortString());
+            });
+        }
+    }
+
     private synchronized void tryInitCategories(Context context) {
         // Keep cached tiles by default. The cache is only invalidated when InterestingConfigChange
         // happens.
@@ -108,6 +139,7 @@
 
     private synchronized void tryInitCategories(Context context, boolean forceClearCache) {
         if (mCategories == null) {
+            final boolean firstLoading = mCategoryByKeyMap.isEmpty();
             if (forceClearCache) {
                 mTileByComponentCache.clear();
             }
@@ -119,6 +151,9 @@
             backwardCompatCleanupForCategory(mTileByComponentCache, mCategoryByKeyMap);
             sortCategories(context, mCategoryByKeyMap);
             filterDuplicateTiles(mCategoryByKeyMap);
+            if (firstLoading) {
+                logTiles(context);
+            }
         }
     }
 
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 7640079..0243b8a 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -47,6 +47,7 @@
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.ArrayMap;
+import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.util.Pair;
 import android.widget.Toast;
@@ -58,11 +59,13 @@
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.dashboard.profileselector.ProfileSelectDialog;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.drawer.ActivityTile;
+import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.DashboardCategory;
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.drawer.TileUtils;
@@ -248,11 +251,19 @@
             final Map<String, IContentProvider> providerMap = new ArrayMap<>();
             final String titleFromUri = TileUtils.getTextFromUri(
                     mContext, uri, providerMap, META_DATA_PREFERENCE_TITLE);
-            ThreadUtils.postOnMainThread(() -> preference.setTitle(titleFromUri));
+            if (!TextUtils.equals(titleFromUri, preference.getTitle())) {
+                ThreadUtils.postOnMainThread(() -> preference.setTitle(titleFromUri));
+            }
         });
     }
 
     private DynamicDataObserver bindSummaryAndGetObserver(Preference preference, Tile tile) {
+        // Skip binding homepage tile summaries for silky home.
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)
+                && TextUtils.equals(tile.getCategory(), CategoryKey.CATEGORY_HOMEPAGE)) {
+            return null;
+        }
+
         final CharSequence summary = tile.getSummary(mContext);
         if (summary != null) {
             preference.setSummary(summary);
@@ -277,7 +288,9 @@
             final Map<String, IContentProvider> providerMap = new ArrayMap<>();
             final String summaryFromUri = TileUtils.getTextFromUri(
                     mContext, uri, providerMap, META_DATA_PREFERENCE_SUMMARY);
-            ThreadUtils.postOnMainThread(() -> preference.setSummary(summaryFromUri));
+            if (!TextUtils.equals(summaryFromUri, preference.getSummary())) {
+                ThreadUtils.postOnMainThread(() -> preference.setSummary(summaryFromUri));
+            }
         });
     }
 
@@ -336,16 +349,16 @@
     }
 
     private void setSwitchChecked(Preference pref, boolean checked) {
-        if (pref instanceof MasterSwitchPreference) {
-            ((MasterSwitchPreference) pref).setChecked(checked);
+        if (pref instanceof PrimarySwitchPreference) {
+            ((PrimarySwitchPreference) pref).setChecked(checked);
         } else if (pref instanceof SwitchPreference) {
             ((SwitchPreference) pref).setChecked(checked);
         }
     }
 
     private void setSwitchEnabled(Preference pref, boolean enabled) {
-        if (pref instanceof MasterSwitchPreference) {
-            ((MasterSwitchPreference) pref).setSwitchEnabled(enabled);
+        if (pref instanceof PrimarySwitchPreference) {
+            ((PrimarySwitchPreference) pref).setSwitchEnabled(enabled);
         } else {
             pref.setEnabled(enabled);
         }
@@ -353,18 +366,8 @@
 
     @VisibleForTesting
     void bindIcon(Preference preference, Tile tile, boolean forceRoundedIcon) {
-        // Use preference context instead here when get icon from Tile, as we are using the context
-        // to get the style to tint the icon. Using mContext here won't get the correct style.
-        final Icon tileIcon = tile.getIcon(preference.getContext());
-        if (tileIcon != null) {
-            Drawable iconDrawable = tileIcon.loadDrawable(preference.getContext());
-            if (forceRoundedIcon
-                    && !TextUtils.equals(mContext.getPackageName(), tile.getPackageName())) {
-                iconDrawable = new AdaptiveIcon(mContext, iconDrawable);
-                ((AdaptiveIcon) iconDrawable).setBackgroundColor(mContext, tile);
-            }
-            preference.setIcon(iconDrawable);
-        } else if (tile.getMetaData() != null
+        // Icon provided by the content provider overrides any static icon.
+        if (tile.getMetaData() != null
                 && tile.getMetaData().containsKey(META_DATA_PREFERENCE_ICON_URI)) {
             ThreadUtils.postOnBackgroundThread(() -> {
                 final Intent intent = tile.getIntent();
@@ -384,11 +387,30 @@
                     return;
                 }
                 final Icon icon = Icon.createWithResource(iconInfo.first, iconInfo.second);
-                ThreadUtils.postOnMainThread(() ->
-                        preference.setIcon(icon.loadDrawable(preference.getContext()))
-                );
+                ThreadUtils.postOnMainThread(() -> {
+                    setPreferenceIcon(preference, tile, forceRoundedIcon, iconInfo.first, icon);
+                });
             });
+            return;
         }
+
+        // Use preference context instead here when get icon from Tile, as we are using the context
+        // to get the style to tint the icon. Using mContext here won't get the correct style.
+        final Icon tileIcon = tile.getIcon(preference.getContext());
+        if (tileIcon == null) {
+            return;
+        }
+        setPreferenceIcon(preference, tile, forceRoundedIcon, tile.getPackageName(), tileIcon);
+    }
+
+    private void setPreferenceIcon(Preference preference, Tile tile, boolean forceRoundedIcon,
+            String iconPackage, Icon icon) {
+        Drawable iconDrawable = icon.loadDrawable(preference.getContext());
+        if (forceRoundedIcon && !TextUtils.equals(mContext.getPackageName(), iconPackage)) {
+            iconDrawable = new AdaptiveIcon(mContext, iconDrawable);
+            ((AdaptiveIcon) iconDrawable).setBackgroundColor(mContext, tile);
+        }
+        preference.setIcon(iconDrawable);
     }
 
     private void launchIntentOrSelectProfile(FragmentActivity activity, Tile tile, Intent intent,
@@ -398,26 +420,41 @@
             return;
         }
         ProfileSelectDialog.updateUserHandlesIfNeeded(mContext, tile);
+        mMetricsFeatureProvider.logStartedIntent(intent, sourceMetricCategory);
 
         if (tile.userHandle == null || tile.isPrimaryProfileOnly()) {
-            mMetricsFeatureProvider.logStartedIntent(intent, sourceMetricCategory);
             activity.startActivityForResult(intent, 0);
         } else if (tile.userHandle.size() == 1) {
-            mMetricsFeatureProvider.logStartedIntent(intent, sourceMetricCategory);
             activity.startActivityForResultAsUser(intent, 0, tile.userHandle.get(0));
         } else {
-            mMetricsFeatureProvider.logStartedIntent(intent, sourceMetricCategory);
             final UserHandle userHandle = intent.getParcelableExtra(EXTRA_USER);
             if (userHandle != null && tile.userHandle.contains(userHandle)) {
                 activity.startActivityForResultAsUser(intent, 0, userHandle);
-            } else {
-                ProfileSelectDialog.show(activity.getSupportFragmentManager(), tile,
-                        sourceMetricCategory);
+                return;
             }
+
+            final List<UserHandle> resolvableUsers = getResolvableUsers(intent, tile);
+            if (resolvableUsers.size() == 1) {
+                activity.startActivityForResultAsUser(intent, 0, resolvableUsers.get(0));
+                return;
+            }
+
+            ProfileSelectDialog.show(activity.getSupportFragmentManager(), tile,
+                    sourceMetricCategory);
         }
     }
 
     private boolean isIntentResolvable(Intent intent) {
         return mPackageManager.resolveActivity(intent, 0) != null;
     }
+
+    private List<UserHandle> getResolvableUsers(Intent intent, Tile tile) {
+        final ArrayList<UserHandle> eligibleUsers = new ArrayList<>();
+        for (UserHandle user : tile.userHandle) {
+            if (mPackageManager.resolveActivityAsUser(intent, 0, user.getIdentifier()) != null) {
+                eligibleUsers.add(user);
+            }
+        }
+        return eligibleUsers;
+    }
 }
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index 8084038..e0c9820 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -40,7 +40,7 @@
 import com.android.settings.core.PreferenceControllerListHelper;
 import com.android.settings.core.SettingsBaseActivity;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -56,6 +56,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.ExecutionException;
 
 /**
@@ -160,13 +161,21 @@
     }
 
     @Override
-    public void onCategoriesChanged() {
-        final DashboardCategory category =
-                mDashboardFeatureProvider.getTilesForCategory(getCategoryKey());
-        if (category == null) {
+    public void onCategoriesChanged(Set<String> categories) {
+        final String categoryKey = getCategoryKey();
+        final DashboardCategory dashboardCategory =
+                mDashboardFeatureProvider.getTilesForCategory(categoryKey);
+        if (dashboardCategory == null) {
             return;
         }
-        refreshDashboardTiles(getLogTag());
+
+        if (categories == null) {
+            // force refreshing
+            refreshDashboardTiles(getLogTag());
+        } else if (categories.contains(categoryKey)) {
+            Log.i(TAG, "refresh tiles for " + categoryKey);
+            refreshDashboardTiles(getLogTag());
+        }
     }
 
     @Override
@@ -530,7 +539,7 @@
         return tile instanceof ProviderTile
                 ? new SwitchPreference(getPrefContext())
                 : tile.hasSwitch()
-                        ? new MasterSwitchPreference(getPrefContext())
+                        ? new PrimarySwitchPreference(getPrefContext())
                         : new Preference(getPrefContext());
     }
 
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
index 594e553..1e0a8dd 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectFragment.java
@@ -142,7 +142,7 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.dummy_preference_screen;
+        return R.xml.placeholder_preference_screen;
     }
 
     @Override
diff --git a/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java b/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
index 0d7c4d0..a3f73fb 100644
--- a/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
+++ b/src/com/android/settings/dashboard/profileselector/ProfileSelectLocationFragment.java
@@ -37,8 +37,8 @@
         super.onActivityCreated(savedInstanceState);
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SwitchBar switchBar = activity.getSwitchBar();
-        switchBar.setSwitchBarText(R.string.location_settings_master_switch_title,
-                R.string.location_settings_master_switch_title);
+        switchBar.setSwitchBarText(R.string.location_settings_primary_switch_title,
+                R.string.location_settings_primary_switch_title);
         final LocationSwitchBarController switchBarController = new LocationSwitchBarController(
                 activity, switchBar, getSettingsLifecycle());
         switchBar.show();
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
index b755ba7..fe97759 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java
@@ -21,6 +21,7 @@
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 
 /** Interface should be implemented if you have added new suggestions */
 public interface SuggestionFeatureProvider {
@@ -42,4 +43,9 @@
      * Returns the {@link SharedPreferences} that holds metadata for suggestions.
      */
     SharedPreferences getSharedPrefs(Context context);
+
+    /**
+     * Returns the class of {@link Fragment} that supports contextual suggestion.
+     */
+    Class<? extends Fragment> getContextualSuggestionFragment();
 }
diff --git a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
index 60a8c54..deb1c7e 100644
--- a/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
@@ -22,6 +22,7 @@
 import android.content.SharedPreferences;
 
 import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 
 import com.android.settings.Settings.NightDisplaySuggestionActivity;
 import com.android.settings.biometrics.fingerprint.FingerprintEnrollSuggestionActivity;
@@ -86,6 +87,11 @@
         return context.getSharedPreferences(SHARED_PREF_FILENAME, Context.MODE_PRIVATE);
     }
 
+    @Override
+    public Class<? extends Fragment> getContextualSuggestionFragment() {
+        return null;
+    }
+
     public SuggestionFeatureProviderImpl(Context context) {
         final Context appContext = context.getApplicationContext();
         mMetricsFeatureProvider = FeatureFactory.getFactory(appContext)
diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index a86459e..460f390 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -235,11 +235,11 @@
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mRestrictBackground) {
-            mDataSaverBackend.setIsBlacklisted(mAppItem.key, mPackageName, !(Boolean) newValue);
+            mDataSaverBackend.setIsDenylisted(mAppItem.key, mPackageName, !(Boolean) newValue);
             updatePrefs();
             return true;
         } else if (preference == mUnrestrictedData) {
-            mDataSaverBackend.setIsWhitelisted(mAppItem.key, mPackageName, (Boolean) newValue);
+            mDataSaverBackend.setIsAllowlisted(mAppItem.key, mPackageName, (Boolean) newValue);
             return true;
         }
         return false;
@@ -330,7 +330,7 @@
 
     private boolean getUnrestrictData() {
         if (mDataSaverBackend != null) {
-            return mDataSaverBackend.isWhitelisted(mAppItem.key);
+            return mDataSaverBackend.isAllowlisted(mAppItem.key);
         }
         return false;
     }
@@ -464,16 +464,16 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
         if (mAppItem.uids.get(uid, false)) {
-            updatePrefs(getAppRestrictBackground(), isWhitelisted);
+            updatePrefs(getAppRestrictBackground(), isAllowlisted);
         }
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
         if (mAppItem.uids.get(uid, false)) {
-            updatePrefs(isBlacklisted, getUnrestrictData());
+            updatePrefs(isDenylisted, getUnrestrictData());
         }
     }
 }
diff --git a/src/com/android/settings/datausage/AppStateDataUsageBridge.java b/src/com/android/settings/datausage/AppStateDataUsageBridge.java
index 0b535d0..b71953e 100644
--- a/src/com/android/settings/datausage/AppStateDataUsageBridge.java
+++ b/src/com/android/settings/datausage/AppStateDataUsageBridge.java
@@ -37,24 +37,24 @@
         final int N = apps.size();
         for (int i = 0; i < N; i++) {
             AppEntry app = apps.get(i);
-            app.extraInfo = new DataUsageState(mDataSaverBackend.isWhitelisted(app.info.uid),
-                    mDataSaverBackend.isBlacklisted(app.info.uid));
+            app.extraInfo = new DataUsageState(mDataSaverBackend.isAllowlisted(app.info.uid),
+                    mDataSaverBackend.isDenylisted(app.info.uid));
         }
     }
 
     @Override
     protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
-        app.extraInfo = new DataUsageState(mDataSaverBackend.isWhitelisted(uid),
-                mDataSaverBackend.isBlacklisted(uid));
+        app.extraInfo = new DataUsageState(mDataSaverBackend.isAllowlisted(uid),
+                mDataSaverBackend.isDenylisted(uid));
     }
 
     public static class DataUsageState {
-        public boolean isDataSaverWhitelisted;
-        public boolean isDataSaverBlacklisted;
+        public boolean isDataSaverAllowlisted;
+        public boolean isDataSaverDenylisted;
 
-        public DataUsageState(boolean isDataSaverWhitelisted, boolean isDataSaverBlacklisted) {
-            this.isDataSaverWhitelisted = isDataSaverWhitelisted;
-            this.isDataSaverBlacklisted = isDataSaverBlacklisted;
+        public DataUsageState(boolean isDataSaverAllowlisted, boolean isDataSaverDenylisted) {
+            this.isDataSaverAllowlisted = isDataSaverAllowlisted;
+            this.isDataSaverDenylisted = isDataSaverDenylisted;
         }
     }
 }
diff --git a/src/com/android/settings/datausage/DataSaverBackend.java b/src/com/android/settings/datausage/DataSaverBackend.java
index 92b2ef9..b9931e0 100644
--- a/src/com/android/settings/datausage/DataSaverBackend.java
+++ b/src/com/android/settings/datausage/DataSaverBackend.java
@@ -42,8 +42,8 @@
     private final NetworkPolicyManager mPolicyManager;
     private final ArrayList<Listener> mListeners = new ArrayList<>();
     private SparseIntArray mUidPolicies = new SparseIntArray();
-    private boolean mWhitelistInitialized;
-    private boolean mBlacklistInitialized;
+    private boolean mAllowlistInitialized;
+    private boolean mDenylistInitialized;
 
     // TODO: Staticize into only one.
     public DataSaverBackend(Context context) {
@@ -77,63 +77,63 @@
                 mContext, SettingsEnums.ACTION_DATA_SAVER_MODE, enabled ? 1 : 0);
     }
 
-    public void refreshWhitelist() {
-        loadWhitelist();
+    public void refreshAllowlist() {
+        loadAllowlist();
     }
 
-    public void setIsWhitelisted(int uid, String packageName, boolean whitelisted) {
-        final int policy = whitelisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE;
+    public void setIsAllowlisted(int uid, String packageName, boolean allowlisted) {
+        final int policy = allowlisted ? POLICY_ALLOW_METERED_BACKGROUND : POLICY_NONE;
         mPolicyManager.setUidPolicy(uid, policy);
         mUidPolicies.put(uid, policy);
-        if (whitelisted) {
+        if (allowlisted) {
             mMetricsFeatureProvider.action(
                     mContext, SettingsEnums.ACTION_DATA_SAVER_WHITELIST, packageName);
         }
     }
 
-    public boolean isWhitelisted(int uid) {
-        loadWhitelist();
+    public boolean isAllowlisted(int uid) {
+        loadAllowlist();
         return mUidPolicies.get(uid, POLICY_NONE) == POLICY_ALLOW_METERED_BACKGROUND;
     }
 
-    private void loadWhitelist() {
-        if (mWhitelistInitialized) {
+    private void loadAllowlist() {
+        if (mAllowlistInitialized) {
             return;
         }
 
         for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_ALLOW_METERED_BACKGROUND)) {
             mUidPolicies.put(uid, POLICY_ALLOW_METERED_BACKGROUND);
         }
-        mWhitelistInitialized = true;
+        mAllowlistInitialized = true;
     }
 
-    public void refreshBlacklist() {
-        loadBlacklist();
+    public void refreshDenylist() {
+        loadDenylist();
     }
 
-    public void setIsBlacklisted(int uid, String packageName, boolean blacklisted) {
-        final int policy = blacklisted ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE;
+    public void setIsDenylisted(int uid, String packageName, boolean denylisted) {
+        final int policy = denylisted ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE;
         mPolicyManager.setUidPolicy(uid, policy);
         mUidPolicies.put(uid, policy);
-        if (blacklisted) {
+        if (denylisted) {
             mMetricsFeatureProvider.action(
                     mContext, SettingsEnums.ACTION_DATA_SAVER_BLACKLIST, packageName);
         }
     }
 
-    public boolean isBlacklisted(int uid) {
-        loadBlacklist();
+    public boolean isDenylisted(int uid) {
+        loadDenylist();
         return mUidPolicies.get(uid, POLICY_NONE) == POLICY_REJECT_METERED_BACKGROUND;
     }
 
-    private void loadBlacklist() {
-        if (mBlacklistInitialized) {
+    private void loadDenylist() {
+        if (mDenylistInitialized) {
             return;
         }
         for (int uid : mPolicyManager.getUidsWithPolicy(POLICY_REJECT_METERED_BACKGROUND)) {
             mUidPolicies.put(uid, POLICY_REJECT_METERED_BACKGROUND);
         }
-        mBlacklistInitialized = true;
+        mDenylistInitialized = true;
     }
 
     private void handleRestrictBackgroundChanged(boolean isDataSaving) {
@@ -142,21 +142,21 @@
         }
     }
 
-    private void handleWhitelistChanged(int uid, boolean isWhitelisted) {
+    private void handleAllowlistChanged(int uid, boolean isAllowlisted) {
         for (int i = 0; i < mListeners.size(); i++) {
-            mListeners.get(i).onWhitelistStatusChanged(uid, isWhitelisted);
+            mListeners.get(i).onAllowlistStatusChanged(uid, isAllowlisted);
         }
     }
 
-    private void handleBlacklistChanged(int uid, boolean isBlacklisted) {
+    private void handleDenylistChanged(int uid, boolean isDenylisted) {
         for (int i = 0; i < mListeners.size(); i++) {
-            mListeners.get(i).onBlacklistStatusChanged(uid, isBlacklisted);
+            mListeners.get(i).onDenylistStatusChanged(uid, isDenylisted);
         }
     }
 
     private void handleUidPoliciesChanged(int uid, int newPolicy) {
-        loadWhitelist();
-        loadBlacklist();
+        loadAllowlist();
+        loadDenylist();
 
         final int oldPolicy = mUidPolicies.get(uid, POLICY_NONE);
         if (newPolicy == POLICY_NONE) {
@@ -165,17 +165,17 @@
             mUidPolicies.put(uid, newPolicy);
         }
 
-        final boolean wasWhitelisted = oldPolicy == POLICY_ALLOW_METERED_BACKGROUND;
-        final boolean wasBlacklisted = oldPolicy == POLICY_REJECT_METERED_BACKGROUND;
-        final boolean isWhitelisted = newPolicy == POLICY_ALLOW_METERED_BACKGROUND;
-        final boolean isBlacklisted = newPolicy == POLICY_REJECT_METERED_BACKGROUND;
+        final boolean wasAllowlisted = oldPolicy == POLICY_ALLOW_METERED_BACKGROUND;
+        final boolean wasDenylisted = oldPolicy == POLICY_REJECT_METERED_BACKGROUND;
+        final boolean isAllowlisted = newPolicy == POLICY_ALLOW_METERED_BACKGROUND;
+        final boolean isDenylisted = newPolicy == POLICY_REJECT_METERED_BACKGROUND;
 
-        if (wasWhitelisted != isWhitelisted) {
-            handleWhitelistChanged(uid, isWhitelisted);
+        if (wasAllowlisted != isAllowlisted) {
+            handleAllowlistChanged(uid, isAllowlisted);
         }
 
-        if (wasBlacklisted != isBlacklisted) {
-            handleBlacklistChanged(uid, isBlacklisted);
+        if (wasDenylisted != isDenylisted) {
+            handleDenylistChanged(uid, isDenylisted);
         }
 
     }
@@ -211,8 +211,8 @@
     public interface Listener {
         void onDataSaverChanged(boolean isDataSaving);
 
-        void onWhitelistStatusChanged(int uid, boolean isWhitelisted);
+        void onAllowlistStatusChanged(int uid, boolean isAllowlisted);
 
-        void onBlacklistStatusChanged(int uid, boolean isBlacklisted);
+        void onDenylistStatusChanged(int uid, boolean isDenylisted);
     }
 }
diff --git a/src/com/android/settings/datausage/DataSaverPreference.java b/src/com/android/settings/datausage/DataSaverPreference.java
index 79e4c13..305d061 100644
--- a/src/com/android/settings/datausage/DataSaverPreference.java
+++ b/src/com/android/settings/datausage/DataSaverPreference.java
@@ -48,10 +48,10 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
     }
 }
diff --git a/src/com/android/settings/datausage/DataSaverSummary.java b/src/com/android/settings/datausage/DataSaverSummary.java
index 0e32bfd..7017fe1 100644
--- a/src/com/android/settings/datausage/DataSaverSummary.java
+++ b/src/com/android/settings/datausage/DataSaverSummary.java
@@ -82,8 +82,8 @@
     @Override
     public void onResume() {
         super.onResume();
-        mDataSaverBackend.refreshWhitelist();
-        mDataSaverBackend.refreshBlacklist();
+        mDataSaverBackend.refreshAllowlist();
+        mDataSaverBackend.refreshDenylist();
         mDataSaverBackend.addListener(this);
         mDataUsageBridge.resume();
     }
@@ -125,11 +125,11 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
     }
 
     @Override
@@ -146,7 +146,7 @@
                 continue;
             }
             if (entry.extraInfo != null && ((AppStateDataUsageBridge.DataUsageState)
-                    entry.extraInfo).isDataSaverWhitelisted) {
+                    entry.extraInfo).isDataSaverAllowlisted) {
                 count++;
             }
         }
diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java
index 7f1a0d8..f72a006 100644
--- a/src/com/android/settings/datausage/DataUsageList.java
+++ b/src/com/android/settings/datausage/DataUsageList.java
@@ -39,6 +39,7 @@
 import android.provider.Settings;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
+import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.View;
@@ -140,6 +141,17 @@
         mUsageAmount = findPreference(KEY_USAGE_AMOUNT);
         mChart = findPreference(KEY_CHART_DATA);
         mApps = findPreference(KEY_APPS_GROUP);
+
+        // TODO(b/167474581): This is a temporary solution to hide unnecessary warning
+        //  preference, when the provider model is completed, the following code should be removed.
+        final Preference unnecessaryWarningPreference =
+                FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)
+                        ? findPreference("operator_warning")
+                        : findPreference("non_carrier_data_usage_warning");
+        if (unnecessaryWarningPreference != null) {
+            unnecessaryWarningPreference.setVisible(false);
+        }
+
         processArgument();
         mDataStateListener = new MobileDataEnabledListener(activity, this);
     }
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreference.java b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
index 93df2f1..9cbb921 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreference.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreference.java
@@ -32,6 +32,7 @@
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
@@ -156,24 +157,24 @@
     public void onBindViewHolder(PreferenceViewHolder holder) {
         super.onBindViewHolder(holder);
 
-        ProgressBar bar = (ProgressBar) holder.findViewById(R.id.determinateBar);
+        ProgressBar bar = getProgressBar(holder);
         if (mChartEnabled && (!TextUtils.isEmpty(mStartLabel) || !TextUtils.isEmpty(mEndLabel))) {
             bar.setVisibility(View.VISIBLE);
-            holder.findViewById(R.id.label_bar).setVisibility(View.VISIBLE);
+            getLabelBar(holder).setVisibility(View.VISIBLE);
             bar.setProgress((int) (mProgress * 100));
-            ((TextView) holder.findViewById(android.R.id.text1)).setText(mStartLabel);
-            ((TextView) holder.findViewById(android.R.id.text2)).setText(mEndLabel);
+            (getLabel1(holder)).setText(mStartLabel);
+            (getLabel2(holder)).setText(mEndLabel);
         } else {
             bar.setVisibility(View.GONE);
-            holder.findViewById(R.id.label_bar).setVisibility(View.GONE);
+            getLabelBar(holder).setVisibility(View.GONE);
         }
 
         updateDataUsageLabels(holder);
 
-        TextView usageTitle = (TextView) holder.findViewById(R.id.usage_title);
-        TextView carrierInfo = (TextView) holder.findViewById(R.id.carrier_and_update);
-        Button launchButton = (Button) holder.findViewById(R.id.launch_mdp_app_button);
-        TextView limitInfo = (TextView) holder.findViewById(R.id.data_limits);
+        TextView usageTitle = getUsageTitle(holder);
+        TextView carrierInfo = getCarrierInfo(holder);
+        Button launchButton = getLaunchButton(holder);
+        TextView limitInfo = getDataLimits(holder);
 
         if (mWifiMode && mSingleWifi) {
             updateCycleTimeText(holder);
@@ -187,7 +188,7 @@
         } else if (mWifiMode) {
             usageTitle.setText(R.string.data_usage_wifi_title);
             usageTitle.setVisibility(View.VISIBLE);
-            TextView cycleTime = (TextView) holder.findViewById(R.id.cycle_left_time);
+            TextView cycleTime = getCycleTime(holder);
             cycleTime.setText(mUsagePeriod);
             carrierInfo.setVisibility(View.GONE);
             limitInfo.setVisibility(View.GONE);
@@ -235,7 +236,7 @@
     }
 
     private void updateDataUsageLabels(PreferenceViewHolder holder) {
-        TextView usageNumberField = (TextView) holder.findViewById(R.id.data_usage_view);
+        TextView usageNumberField = getDataUsed(holder);
 
         final Formatter.BytesResult usedResult = Formatter.formatBytes(getContext().getResources(),
                 mDataplanUse, Formatter.FLAG_CALCULATE_ROUNDED | Formatter.FLAG_IEC_UNITS);
@@ -250,11 +251,10 @@
                 TextUtils.expandTemplate(template, usageNumberText, usedResult.units);
         usageNumberField.setText(usageText);
 
-        final MeasurableLinearLayout layout =
-                (MeasurableLinearLayout) holder.findViewById(R.id.usage_layout);
+        final MeasurableLinearLayout layout = getLayout(holder);
 
         if (mHasMobileData && mNumPlans >= 0 && mDataplanSize > 0L) {
-            TextView usageRemainingField = (TextView) holder.findViewById(R.id.data_remaining_view);
+            TextView usageRemainingField = getDataRemaining(holder);
             long dataRemaining = mDataplanSize - mDataplanUse;
             if (dataRemaining >= 0) {
                 usageRemainingField.setText(
@@ -276,7 +276,7 @@
     }
 
     private void updateCycleTimeText(PreferenceViewHolder holder) {
-        TextView cycleTime = (TextView) holder.findViewById(R.id.cycle_left_time);
+        TextView cycleTime = getCycleTime(holder);
 
         // Takes zero as a special case which value is never set.
         if (mCycleEndTimeMs == CYCLE_TIME_UNINITIAL_VALUE) {
@@ -362,9 +362,68 @@
     }
 
     @VisibleForTesting
-    long getHistoricalUsageLevel() {
+    protected long getHistoricalUsageLevel() {
         final DataUsageController controller = new DataUsageController(getContext());
         return controller.getHistoricalUsageLevel(NetworkTemplate.buildTemplateWifiWildcard());
     }
 
+    @VisibleForTesting
+    protected TextView getUsageTitle(PreferenceViewHolder holder) {
+        return (TextView) holder.findViewById(R.id.usage_title);
+    }
+
+    @VisibleForTesting
+    protected TextView getCycleTime(PreferenceViewHolder holder) {
+        return (TextView) holder.findViewById(R.id.cycle_left_time);
+    }
+
+    @VisibleForTesting
+    protected TextView getCarrierInfo(PreferenceViewHolder holder) {
+        return (TextView) holder.findViewById(R.id.carrier_and_update);
+    }
+
+    @VisibleForTesting
+    protected TextView getDataLimits(PreferenceViewHolder holder) {
+        return (TextView) holder.findViewById(R.id.data_limits);
+    }
+
+    @VisibleForTesting
+    protected TextView getDataUsed(PreferenceViewHolder holder) {
+        return (TextView) holder.findViewById(R.id.data_usage_view);
+    }
+
+    @VisibleForTesting
+    protected TextView getDataRemaining(PreferenceViewHolder holder) {
+        return (TextView) holder.findViewById(R.id.data_remaining_view);
+    }
+
+    @VisibleForTesting
+    protected Button getLaunchButton(PreferenceViewHolder holder) {
+        return (Button) holder.findViewById(R.id.launch_mdp_app_button);
+    }
+
+    @VisibleForTesting
+    protected LinearLayout getLabelBar(PreferenceViewHolder holder) {
+        return (LinearLayout) holder.findViewById(R.id.label_bar);
+    }
+
+    @VisibleForTesting
+    protected TextView getLabel1(PreferenceViewHolder holder) {
+        return (TextView) holder.findViewById(android.R.id.text1);
+    }
+
+    @VisibleForTesting
+    protected TextView getLabel2(PreferenceViewHolder holder) {
+        return (TextView) holder.findViewById(android.R.id.text2);
+    }
+
+    @VisibleForTesting
+    protected ProgressBar getProgressBar(PreferenceViewHolder holder) {
+        return (ProgressBar) holder.findViewById(R.id.determinateBar);
+    }
+
+    @VisibleForTesting
+    protected MeasurableLinearLayout getLayout(PreferenceViewHolder holder) {
+        return (MeasurableLinearLayout) holder.findViewById(R.id.usage_layout);
+    }
 }
diff --git a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
index 97cf599..73f8f45 100644
--- a/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
+++ b/src/com/android/settings/datausage/DataUsageSummaryPreferenceController.java
@@ -325,7 +325,10 @@
                 mSnapshotTime = primaryPlan.getDataUsageTime();
             }
         }
-        mManageSubscriptionIntent = createManageSubscriptionIntent(mSubId);
+        // Temporarily return null, since no current users of SubscriptionPlan have this intent set.
+        // TODO (b/170330084): Remove after refactoring 5G SubscriptionPlan logic.
+        // mManageSubscriptionIntent = createManageSubscriptionIntent(mSubId);
+        mManageSubscriptionIntent = null;
         Log.i(TAG, "Have " + mDataplanCount + " plans, dflt sub-id " + mSubId
                 + ", intent " + mManageSubscriptionIntent);
     }
@@ -378,11 +381,11 @@
         // First plan in the list is the primary plan
         SubscriptionPlan plan = plans.get(0);
         return plan.getDataLimitBytes() > 0
-                && saneSize(plan.getDataUsageBytes())
+                && validSize(plan.getDataUsageBytes())
                 && plan.getCycleRule() != null ? plan : null;
     }
 
-    private static boolean saneSize(long value) {
+    private static boolean validSize(long value) {
         return value >= 0L && value < PETA;
     }
 
diff --git a/src/com/android/settings/datausage/OWNERS b/src/com/android/settings/datausage/OWNERS
new file mode 100644
index 0000000..49449ec
--- /dev/null
+++ b/src/com/android/settings/datausage/OWNERS
@@ -0,0 +1,5 @@
+# Default reviewers for this and subdirectories.
+andychou@google.com
+goldmanj@google.com
+bonianchen@google.com
+wengsu@google.com
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
index 97ed5ac..ebd8894 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreference.java
@@ -79,15 +79,15 @@
 
     @Override
     protected void onClick() {
-        if (mDataUsageState.isDataSaverBlacklisted) {
-            // app is blacklisted, launch App Data Usage screen
+        if (mDataUsageState.isDataSaverDenylisted) {
+            // app is denylisted, launch App Data Usage screen
             AppInfoDashboardFragment.startAppInfoFragment(AppDataUsage.class,
                     R.string.data_usage_app_summary_title,
                     null /* arguments */,
                     mParentFragment,
                     mEntry);
         } else {
-            // app is not blacklisted, let superclass handle toggle switch
+            // app is not denylisted, let superclass handle toggle switch
             super.onClick();
         }
     }
@@ -119,7 +119,7 @@
             widgetFrame.setVisibility(View.VISIBLE);
         } else {
             widgetFrame.setVisibility(
-                    mDataUsageState != null && mDataUsageState.isDataSaverBlacklisted
+                    mDataUsageState != null && mDataUsageState.isDataSaverDenylisted
                             ? View.INVISIBLE : View.VISIBLE);
         }
         super.onBindViewHolder(holder);
@@ -136,17 +136,17 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
         if (mDataUsageState != null && mEntry.info.uid == uid) {
-            mDataUsageState.isDataSaverWhitelisted = isWhitelisted;
+            mDataUsageState.isDataSaverAllowlisted = isAllowlisted;
             updateState();
         }
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
         if (mDataUsageState != null && mEntry.info.uid == uid) {
-            mDataUsageState.isDataSaverBlacklisted = isBlacklisted;
+            mDataUsageState.isDataSaverDenylisted = isDenylisted;
             updateState();
         }
     }
@@ -167,15 +167,15 @@
         mHelper.setDisabledByAdmin(admin);
     }
 
-    // Sets UI state based on whitelist/blacklist status.
+    // Sets UI state based on allowlist/denylist status.
     public void updateState() {
         setTitle(mEntry.label);
         if (mDataUsageState != null) {
-            setChecked(mDataUsageState.isDataSaverWhitelisted);
+            setChecked(mDataUsageState.isDataSaverAllowlisted);
             if (isDisabledByAdmin()) {
                 setSummary(R.string.disabled_by_admin);
-            } else if (mDataUsageState.isDataSaverBlacklisted) {
-                setSummary(R.string.restrict_background_blacklisted);
+            } else if (mDataUsageState.isDataSaverDenylisted) {
+                setSummary(R.string.restrict_background_blocklisted);
             } else {
                 setSummary("");
             }
diff --git a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
index d8656ca..00f4a7b 100644
--- a/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
+++ b/src/com/android/settings/datausage/UnrestrictedDataAccessPreferenceController.java
@@ -186,11 +186,11 @@
         if (preference instanceof UnrestrictedDataAccessPreference) {
             final UnrestrictedDataAccessPreference
                     accessPreference = (UnrestrictedDataAccessPreference) preference;
-            boolean whitelisted = newValue == Boolean.TRUE;
-            logSpecialPermissionChange(whitelisted, accessPreference.getEntry().info.packageName);
-            mDataSaverBackend.setIsWhitelisted(accessPreference.getEntry().info.uid,
-                    accessPreference.getEntry().info.packageName, whitelisted);
-            accessPreference.getDataUsageState().isDataSaverWhitelisted = whitelisted;
+            boolean allowlisted = newValue == Boolean.TRUE;
+            logSpecialPermissionChange(allowlisted, accessPreference.getEntry().info.packageName);
+            mDataSaverBackend.setIsAllowlisted(accessPreference.getEntry().info.uid,
+                    accessPreference.getEntry().info.packageName, allowlisted);
+            accessPreference.getDataUsageState().isDataSaverAllowlisted = allowlisted;
             return true;
         }
         return false;
@@ -224,8 +224,8 @@
     }
 
     @VisibleForTesting
-    void logSpecialPermissionChange(boolean whitelisted, String packageName) {
-        final int logCategory = whitelisted ? SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW
+    void logSpecialPermissionChange(boolean allowlisted, String packageName) {
+        final int logCategory = allowlisted ? SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_ALLOW
                 : SettingsEnums.APP_SPECIAL_PERMISSION_UNL_DATA_DENY;
         FeatureFactory.getFactory(mContext).getMetricsFeatureProvider().action(mContext,
                 logCategory, packageName);
diff --git a/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
new file mode 100644
index 0000000..bbfbb19
--- /dev/null
+++ b/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceController.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2020 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.datetime;
+
+import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_ALLOWED;
+import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;
+import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED;
+import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;
+
+import android.app.time.TimeManager;
+import android.app.time.TimeZoneCapabilities;
+import android.app.time.TimeZoneCapabilitiesAndConfig;
+import android.app.time.TimeZoneConfiguration;
+import android.content.Context;
+import android.location.LocationManager;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+import java.util.concurrent.Executor;
+
+/**
+ * The controller for the "location time zone detection" entry in the Location settings
+ * screen.
+ */
+public class LocationTimeZoneDetectionPreferenceController
+        extends BasePreferenceController
+        implements LifecycleObserver, OnStart, OnStop, TimeManager.TimeZoneDetectorListener {
+
+    private final TimeManager mTimeManager;
+    private final LocationManager mLocationManager;
+    private TimeZoneCapabilitiesAndConfig mTimeZoneCapabilitiesAndConfig;
+    private Preference mPreference;
+
+    public LocationTimeZoneDetectionPreferenceController(Context context, String key) {
+        super(context, key);
+        mTimeManager = context.getSystemService(TimeManager.class);
+        mLocationManager = context.getSystemService(LocationManager.class);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void onStart() {
+        // Register for updates to the user's time zone capabilities or configuration which could
+        // require UI changes.
+        Executor mainExecutor = mContext.getMainExecutor();
+        mTimeManager.addTimeZoneDetectorListener(mainExecutor, this);
+        // Setup the initial state of the summary.
+        refreshUi();
+    }
+
+    @Override
+    public void onStop() {
+        mTimeManager.removeTimeZoneDetectorListener(this);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        TimeZoneCapabilities timeZoneCapabilities =
+                getTimeZoneCapabilitiesAndConfig(/* forceRefresh= */ false).getCapabilities();
+        int capability = timeZoneCapabilities.getConfigureGeoDetectionEnabledCapability();
+
+        // The preference only has two states: present and not present. The preference is never
+        // present but disabled.
+        if (capability == CAPABILITY_NOT_SUPPORTED || capability == CAPABILITY_NOT_ALLOWED) {
+            return UNSUPPORTED_ON_DEVICE;
+        } else if (capability == CAPABILITY_NOT_APPLICABLE || capability == CAPABILITY_POSSESSED) {
+            return AVAILABLE;
+        } else {
+            throw new IllegalStateException("Unknown capability=" + capability);
+        }
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        TimeZoneCapabilitiesAndConfig timeZoneCapabilitiesAndConfig =
+                getTimeZoneCapabilitiesAndConfig(/* forceRefresh= */ false);
+        TimeZoneCapabilities capabilities = timeZoneCapabilitiesAndConfig.getCapabilities();
+        int configureGeoDetectionEnabledCapability =
+                capabilities.getConfigureGeoDetectionEnabledCapability();
+        TimeZoneConfiguration configuration = timeZoneCapabilitiesAndConfig.getConfiguration();
+
+        int summaryResId;
+        if (configureGeoDetectionEnabledCapability == CAPABILITY_NOT_SUPPORTED) {
+            // The preference should not be visible, but text is referenced in case this changes.
+            summaryResId = R.string.location_time_zone_detection_not_supported;
+        } else if (configureGeoDetectionEnabledCapability == CAPABILITY_NOT_ALLOWED) {
+            // The preference should not be visible, but text is referenced in case this changes.
+            summaryResId = R.string.location_time_zone_detection_not_allowed;
+        } else if (configureGeoDetectionEnabledCapability == CAPABILITY_NOT_APPLICABLE) {
+            // The TimeZoneCapabilities deliberately doesn't provide information about why the user
+            // doesn't have the capability, but the user's "location enabled" being off and the
+            // global automatic detection setting will always be considered overriding reasons why
+            // location time zone detection cannot be used.
+            if (!mLocationManager.isLocationEnabled()) {
+                summaryResId = R.string.location_app_permission_summary_location_off;
+            } else if (!configuration.isAutoDetectionEnabled()) {
+                summaryResId = R.string.location_time_zone_detection_auto_is_off;
+            } else {
+                // This is in case there are other reasons in future why location time zone
+                // detection is not applicable.
+                summaryResId = R.string.location_time_zone_detection_not_applicable;
+            }
+        } else if (configureGeoDetectionEnabledCapability == CAPABILITY_POSSESSED) {
+            boolean isGeoDetectionEnabled = configuration.isGeoDetectionEnabled();
+            summaryResId = isGeoDetectionEnabled
+                    ? R.string.location_time_zone_detection_on
+                    : R.string.location_time_zone_detection_off;
+        } else {
+            // This is unexpected: getAvailabilityStatus() should ensure that the UI element isn't
+            // even shown for known cases, or the capability is unknown.
+            throw new IllegalStateException("Unexpected configureGeoDetectionEnabledCapability="
+                    + configureGeoDetectionEnabledCapability);
+        }
+        return mContext.getString(summaryResId);
+    }
+
+    @Override
+    public void onChange() {
+        refreshUi();
+    }
+
+    private void refreshUi() {
+        // Force a refresh of cached user capabilities and config before refreshing the summary.
+        getTimeZoneCapabilitiesAndConfig(/* forceRefresh= */ true);
+        refreshSummary(mPreference);
+    }
+
+    /**
+     * Returns the current user capabilities and configuration. {@code forceRefresh} can be {@code
+     * true} to discard any cached copy.
+     */
+    private TimeZoneCapabilitiesAndConfig getTimeZoneCapabilitiesAndConfig(boolean forceRefresh) {
+        if (forceRefresh || mTimeZoneCapabilitiesAndConfig == null) {
+            mTimeZoneCapabilitiesAndConfig = mTimeManager.getTimeZoneCapabilitiesAndConfig();
+        }
+        return mTimeZoneCapabilitiesAndConfig;
+    }
+}
diff --git a/src/com/android/settings/datetime/TimeFormatPreferenceController.java b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
index 3ad879a..900ec7a 100644
--- a/src/com/android/settings/datetime/TimeFormatPreferenceController.java
+++ b/src/com/android/settings/datetime/TimeFormatPreferenceController.java
@@ -41,7 +41,7 @@
     private static final String KEY_TIME_FORMAT = "24 hour";
 
     // Used for showing the current date format, which looks like "12/31/2010", "2010/12/13", etc.
-    // The date value is dummy (independent of actual date).
+    // The date value is stubs (independent of actual date).
     private final Calendar mDummyDate;
     private final boolean mIsFromSUW;
     private final UpdateTimeAndDateCallback mUpdateTimeAndDateCallback;
diff --git a/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java
new file mode 100644
index 0000000..db6ffc4
--- /dev/null
+++ b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettings.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 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.datetime.locationtimezone;
+
+import android.app.settings.SettingsEnums;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * The controller for the "location time zone detection" screen.
+ */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class TimeZoneDetectionSettings extends DashboardFragment {
+    private static final String TAG = "LTZDetectionSettings";
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.LOCATION_TIME_ZONE_DETECTION;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.location_time_zone_detection;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    /**
+     * For Search.
+     */
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.location_time_zone_detection);
+}
diff --git a/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java
new file mode 100644
index 0000000..c91be7f
--- /dev/null
+++ b/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceController.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2020 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.datetime.locationtimezone;
+
+import android.app.time.TimeManager;
+import android.app.time.TimeZoneCapabilitiesAndConfig;
+import android.app.time.TimeZoneConfiguration;
+import android.content.Context;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * The controller for the "location time zone detection" switch on the location time zone detection
+ * screen.
+ */
+public class TimeZoneDetectionTogglePreferenceController extends TogglePreferenceController {
+
+    private final TimeManager mTimeManager;
+
+    public TimeZoneDetectionTogglePreferenceController(Context context, String key) {
+        super(context, key);
+        mTimeManager = context.getSystemService(TimeManager.class);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
+                mTimeManager.getTimeZoneCapabilitiesAndConfig();
+        TimeZoneConfiguration configuration = capabilitiesAndConfig.getConfiguration();
+        return configuration.isGeoDetectionEnabled();
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        TimeZoneConfiguration configuration = new TimeZoneConfiguration.Builder()
+                .setGeoDetectionEnabled(isChecked)
+                .build();
+        return mTimeManager.updateTimeZoneConfiguration(configuration);
+    }
+}
diff --git a/src/com/android/settings/datetime/timezone/OWNERS b/src/com/android/settings/datetime/timezone/OWNERS
index 02cf23c..7ad770a 100644
--- a/src/com/android/settings/datetime/timezone/OWNERS
+++ b/src/com/android/settings/datetime/timezone/OWNERS
@@ -1,6 +1,5 @@
 # Default reviewers for this and subdirectories.
 vichang@google.com
-tobiast@google.com
 nfuller@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java b/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java
index 92e9e96..7a38853 100644
--- a/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java
+++ b/src/com/android/settings/datetime/timezone/model/FilteredCountryTimeZones.java
@@ -16,7 +16,7 @@
 
 package com.android.settings.datetime.timezone.model;
 
-import libcore.timezone.CountryTimeZones;
+import com.android.i18n.timezone.CountryTimeZones;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
index 61244f2..335e6e2 100644
--- a/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
+++ b/src/com/android/settings/datetime/timezone/model/TimeZoneData.java
@@ -18,9 +18,9 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.collection.ArraySet;
 
-import libcore.timezone.CountryTimeZones;
-import libcore.timezone.CountryZonesFinder;
-import libcore.timezone.TimeZoneFinder;
+import com.android.i18n.timezone.CountryTimeZones;
+import com.android.i18n.timezone.CountryZonesFinder;
+import com.android.i18n.timezone.TimeZoneFinder;
 
 import java.lang.ref.WeakReference;
 import java.util.Collections;
diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
index 0de9f67..495764b 100644
--- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
+++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java
@@ -83,8 +83,8 @@
     private void initializeSwitchBar() {
         final SettingsActivity activity = (SettingsActivity) getActivity();
         mSwitchBar = activity.getSwitchBar();
-        mSwitchBar.setSwitchBarText(R.string.automatic_storage_manager_master_switch_title,
-                R.string.automatic_storage_manager_master_switch_title);
+        mSwitchBar.setSwitchBarText(R.string.automatic_storage_manager_primary_switch_title,
+                R.string.automatic_storage_manager_primary_switch_title);
         mSwitchBar.show();
         mSwitchController =
                 new AutomaticStorageManagerSwitchBarController(
diff --git a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
index 136ddad..8c307a6 100644
--- a/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
+++ b/src/com/android/settings/development/BluetoothAvrcpVersionPreferenceController.java
@@ -63,7 +63,7 @@
     public void updateState(Preference preference) {
         final ListPreference listPreference = (ListPreference) preference;
         final String currentValue = SystemProperties.get(BLUETOOTH_AVRCP_VERSION_PROPERTY);
-        int index = 0; // Defaults to AVRCP 1.4
+        int index = 0; // Defaults to AVRCP 1.5
         for (int i = 0; i < mListValues.length; i++) {
             if (TextUtils.equals(currentValue, mListValues[i])) {
                 index = i;
diff --git a/src/com/android/settings/development/DefaultLaunchPreferenceController.java b/src/com/android/settings/development/DefaultLaunchPreferenceController.java
index e76dbeb..c0dcb7a 100644
--- a/src/com/android/settings/development/DefaultLaunchPreferenceController.java
+++ b/src/com/android/settings/development/DefaultLaunchPreferenceController.java
@@ -24,7 +24,7 @@
 /**
  * This controller is used for preference that has fragment or launch intent defined in the
  * preference xml, and do not need any handling to update the preference state, except when the
- * master developer options switch is turned on/off, the preference needs to be enabled/disabled.
+ * primary developer options switch is turned on/off, the preference needs to be enabled/disabled.
  *
  */
 public class DefaultLaunchPreferenceController extends DeveloperOptionsPreferenceController
diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
index 945970e..acd6bab 100644
--- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
+++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.development;
 
+import static android.service.quicksettings.TileService.ACTION_QS_TILE_PREFERENCES;
+
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothA2dp;
@@ -23,12 +25,14 @@
 import android.bluetooth.BluetoothCodecStatus;
 import android.bluetooth.BluetoothProfile;
 import android.content.BroadcastReceiver;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.SystemProperties;
 import android.os.UserManager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -41,6 +45,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
+import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.RestrictedDashboardFragment;
 import com.android.settings.development.autofill.AutofillLoggingLevelPreferenceController;
 import com.android.settings.development.autofill.AutofillResetOptionsPreferenceController;
@@ -52,6 +57,7 @@
 import com.android.settings.development.bluetooth.BluetoothHDAudioPreferenceController;
 import com.android.settings.development.bluetooth.BluetoothQualityDialogPreferenceController;
 import com.android.settings.development.bluetooth.BluetoothSampleRateDialogPreferenceController;
+import com.android.settings.development.qstile.DevelopmentTiles;
 import com.android.settings.development.storage.SharedDataPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.SwitchBar;
@@ -189,7 +195,7 @@
             getPreferenceScreen().removeAll();
             return;
         }
-        // Set up master switch
+        // Set up primary switch
         mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
         mSwitchBarController = new DevelopmentSwitchBarController(
                 this /* DevelopmentSettings */, mSwitchBar, mIsAvailable,
@@ -199,11 +205,42 @@
         // Restore UI state based on whether developer options is enabled
         if (DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(getContext())) {
             enableDeveloperOptions();
+            handleQsTileLongPressActionIfAny();
         } else {
             disableDeveloperOptions();
         }
     }
 
+    /**
+     * Long-pressing a developer options quick settings tile will by default (see
+     * QS_TILE_PREFERENCES in the manifest) take you to the developer options page.
+     * Some tiles may want to go into their own page within the developer options.
+     */
+    private void handleQsTileLongPressActionIfAny() {
+        Intent intent = getActivity().getIntent();
+        if (intent == null || !TextUtils.equals(ACTION_QS_TILE_PREFERENCES, intent.getAction())) {
+            return;
+        }
+
+        Log.d(TAG, "Developer options started from qstile long-press");
+        final ComponentName componentName = (ComponentName) intent.getParcelableExtra(
+                Intent.EXTRA_COMPONENT_NAME);
+        if (componentName == null) {
+            return;
+        }
+
+        if (DevelopmentTiles.WirelessDebugging.class.getName().equals(
+                componentName.getClassName()) && getDevelopmentOptionsController(
+                    WirelessDebuggingPreferenceController.class).isAvailable()) {
+            Log.d(TAG, "Long press from wireless debugging qstile");
+            new SubSettingLauncher(getContext())
+                    .setDestination(WirelessDebuggingFragment.class.getName())
+                    .setSourceMetricsCategory(SettingsEnums.SETTINGS_ADB_WIRELESS)
+                    .launch();
+        }
+        // Add other qstiles here
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
@@ -479,7 +516,6 @@
         controllers.add(new BluetoothMapVersionPreferenceController(context));
         controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
         controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
-        controllers.add(new EnhancedConnectivityPreferenceController(context));
         controllers.add(new ShowTapsPreferenceController(context));
         controllers.add(new PointerLocationPreferenceController(context));
         controllers.add(new ShowSurfaceUpdatesPreferenceController(context));
diff --git a/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java b/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
deleted file mode 100644
index 54cfdc6..0000000
--- a/src/com/android/settings/development/EnhancedConnectivityPreferenceController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.Preference;
-import androidx.preference.SwitchPreference;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.development.DeveloperOptionsPreferenceController;
-
-/**
- * Preference controller for Enhanced Connectivity feature
- */
-public class EnhancedConnectivityPreferenceController extends
-        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
-        PreferenceControllerMixin {
-
-    private static final String ENHANCED_CONNECTIVITY_KEY = "enhanced_connectivity";
-
-    @VisibleForTesting
-    static final int ENHANCED_CONNECTIVITY_ON = 1;
-    // default is enhanced connectivity enabled.
-    @VisibleForTesting
-    static final int ENHANCED_CONNECTIVITY_OFF = 0;
-
-    public EnhancedConnectivityPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object o) {
-        final boolean isEnabled = (Boolean) o;
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                isEnabled
-                        ? ENHANCED_CONNECTIVITY_ON
-                        : ENHANCED_CONNECTIVITY_OFF);
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return ENHANCED_CONNECTIVITY_KEY;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final int enhancedConnectivityEnabled = Settings.Global.getInt(
-                mContext.getContentResolver(), Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                ENHANCED_CONNECTIVITY_ON);
-        ((SwitchPreference) mPreference).setChecked(
-                enhancedConnectivityEnabled == ENHANCED_CONNECTIVITY_ON);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity);
-    }
-
-    @Override
-    protected void onDeveloperOptionsSwitchDisabled() {
-        super.onDeveloperOptionsSwitchDisabled();
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                ENHANCED_CONNECTIVITY_ON);
-        ((SwitchPreference) mPreference).setChecked(true);
-    }
-}
diff --git a/src/com/android/settings/development/OemUnlockPreferenceController.java b/src/com/android/settings/development/OemUnlockPreferenceController.java
index f8a245f..118312a 100644
--- a/src/com/android/settings/development/OemUnlockPreferenceController.java
+++ b/src/com/android/settings/development/OemUnlockPreferenceController.java
@@ -52,8 +52,8 @@
     private final OemLockManager mOemLockManager;
     private final UserManager mUserManager;
     private final TelephonyManager mTelephonyManager;
+    private final Activity mActivity;
     private final DevelopmentSettingsDashboardFragment mFragment;
-    private final ChooseLockSettingsHelper mChooseLockSettingsHelper;
     private RestrictedSwitchPreference mPreference;
 
     public OemUnlockPreferenceController(Context context, Activity activity,
@@ -69,12 +69,8 @@
         }
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+        mActivity = activity;
         mFragment = fragment;
-        if (activity != null || mFragment != null) {
-            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(activity, mFragment);
-        } else {
-            mChooseLockSettingsHelper = null;
-        }
     }
 
     @Override
@@ -204,8 +200,11 @@
 
     @VisibleForTesting
     boolean showKeyguardConfirmation(Resources resources, int requestCode) {
-        return mChooseLockSettingsHelper.launchConfirmationActivity(
-                requestCode, resources.getString(R.string.oem_unlock_enable));
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(mActivity, mFragment);
+        return builder.setRequestCode(requestCode)
+                .setTitle(resources.getString(R.string.oem_unlock_enable))
+                .show();
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/development/SelectDSUPreferenceController.java b/src/com/android/settings/development/SelectDSUPreferenceController.java
index 6498ae7..425cdb3 100644
--- a/src/com/android/settings/development/SelectDSUPreferenceController.java
+++ b/src/com/android/settings/development/SelectDSUPreferenceController.java
@@ -23,9 +23,11 @@
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
-class SelectDSUPreferenceController extends DeveloperOptionsPreferenceController {
+class SelectDSUPreferenceController extends DeveloperOptionsPreferenceController implements
+        PreferenceControllerMixin {
 
     private static final String DSU_LOADER_KEY = "dsu_loader";
 
diff --git a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java b/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
index a3daede..2d4e889 100644
--- a/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
+++ b/src/com/android/settings/development/WirelessDebuggingPreferenceController.java
@@ -20,7 +20,8 @@
 import android.database.ContentObserver;
 import android.debug.IAdbManager;
 import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
+import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.Looper;
@@ -35,7 +36,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnPause;
@@ -43,7 +44,7 @@
 import com.android.settingslib.development.DeveloperOptionsPreferenceController;
 
 /**
- * This controls the master switch controller in the developer options page for
+ * This controls the primary switch controller in the developer options page for
  * "Wireless debugging".
  */
 public class WirelessDebuggingPreferenceController extends DeveloperOptionsPreferenceController
@@ -132,7 +133,7 @@
         boolean enabled = Settings.Global.getInt(mContentResolver,
                 Settings.Global.ADB_WIFI_ENABLED, AdbPreferenceController.ADB_SETTING_OFF)
                     != AdbPreferenceController.ADB_SETTING_OFF;
-        ((MasterSwitchPreference) preference).setChecked(enabled);
+        ((PrimarySwitchPreference) preference).setChecked(enabled);
     }
 
     /**
@@ -141,10 +142,16 @@
     public static boolean isWifiConnected(Context context) {
         ConnectivityManager cm = (ConnectivityManager) context.getSystemService(
                 Context.CONNECTIVITY_SERVICE);
-        if (cm != null) {
-            NetworkInfo info = cm.getActiveNetworkInfo();
-            if (info != null && info.isConnected()) {
-                return info.getType() == ConnectivityManager.TYPE_WIFI;
+        if (cm == null) {
+            return false;
+        }
+        for (Network network : cm.getAllNetworks()) {
+            final NetworkCapabilities nc = cm.getNetworkCapabilities(network);
+            if (nc == null) {
+                continue;
+            }
+            if (nc.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)) {
+                return true;
             }
         }
         return false;
diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
index 6bc9175..d66b8d8 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceController.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.development.bluetooth;
 
+import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+
 import android.bluetooth.BluetoothA2dp;
 import android.bluetooth.BluetoothCodecConfig;
 import android.bluetooth.BluetoothCodecStatus;
@@ -113,7 +115,7 @@
         mBluetoothA2dpConfigStore.setSampleRate(config.getSampleRate());
         mBluetoothA2dpConfigStore.setBitsPerSample(config.getBitsPerSample());
         mBluetoothA2dpConfigStore.setChannelMode(config.getChannelMode());
-        mBluetoothA2dpConfigStore.setCodecPriority(config.getCodecPriority());
+        mBluetoothA2dpConfigStore.setCodecPriority(CODEC_PRIORITY_HIGHEST);
         mBluetoothA2dpConfigStore.setCodecSpecific1Value(config.getCodecSpecific1());
     }
 
diff --git a/src/com/android/settings/development/compat/PlatformCompatDashboard.java b/src/com/android/settings/development/compat/PlatformCompatDashboard.java
index fe64948..c617e17 100644
--- a/src/com/android/settings/development/compat/PlatformCompatDashboard.java
+++ b/src/com/android/settings/development/compat/PlatformCompatDashboard.java
@@ -149,13 +149,13 @@
         final List<CompatibilityChangeInfo> disabledChanges = new ArrayList<>();
         final Map<Integer, List<CompatibilityChangeInfo>> targetSdkChanges = new TreeMap<>();
         for (CompatibilityChangeInfo change : mChanges) {
-            if (change.getEnableAfterTargetSdk() != 0) {
+            if (change.getEnableSinceTargetSdk() > 0) {
                 List<CompatibilityChangeInfo> sdkChanges;
-                if (!targetSdkChanges.containsKey(change.getEnableAfterTargetSdk())) {
+                if (!targetSdkChanges.containsKey(change.getEnableSinceTargetSdk())) {
                     sdkChanges = new ArrayList<>();
-                    targetSdkChanges.put(change.getEnableAfterTargetSdk(), sdkChanges);
+                    targetSdkChanges.put(change.getEnableSinceTargetSdk(), sdkChanges);
                 } else {
-                    sdkChanges = targetSdkChanges.get(change.getEnableAfterTargetSdk());
+                    sdkChanges = targetSdkChanges.get(change.getEnableSinceTargetSdk());
                 }
                 sdkChanges.add(change);
             } else if (change.getDisabled()) {
diff --git a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
index fb84a72..d89df79 100644
--- a/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
+++ b/src/com/android/settings/development/featureflags/FeatureFlagPersistent.java
@@ -36,7 +36,6 @@
         PERSISTENT_FLAGS = new HashSet<>();
         PERSISTENT_FLAGS.add(FeatureFlags.HEARING_AID_SETTINGS);
         PERSISTENT_FLAGS.add(FeatureFlags.DYNAMIC_SYSTEM);
-        PERSISTENT_FLAGS.add(FeatureFlags.SETTINGS_FUSE_FLAG);
     }
 
     public static boolean isEnabled(Context context, String feature) {
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
index b1a31fb..46a3082 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceController.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.development.graphicsdriver;
 
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -62,7 +62,7 @@
     private final ContentResolver mContentResolver;
     private final String mPreferenceTitle;
     private final String mPreferenceDefault;
-    private final String mPreferenceGameDriver;
+    private final String mPreferenceProductionDriver;
     private final String mPreferencePrereleaseDriver;
     private final String mPreferenceSystem;
     @VisibleForTesting
@@ -88,8 +88,8 @@
         final Resources resources = context.getResources();
         mPreferenceTitle = resources.getString(R.string.graphics_driver_app_preference_title);
         mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
-        mPreferenceGameDriver =
-                resources.getString(R.string.graphics_driver_app_preference_game_driver);
+        mPreferenceProductionDriver =
+                resources.getString(R.string.graphics_driver_app_preference_production_driver);
         mPreferencePrereleaseDriver =
                 resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
         mPreferenceSystem = resources.getString(R.string.graphics_driver_app_preference_system);
@@ -101,19 +101,21 @@
         mAppInfos = getAppInfos(context);
 
         mDevOptInApps =
-                getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS);
+                getGlobalSettingsString(mContentResolver,
+                                        Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS);
         mDevPrereleaseOptInApps = getGlobalSettingsString(
-                mContentResolver, Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS);
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS);
         mDevOptOutApps =
-                getGlobalSettingsString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS);
+                getGlobalSettingsString(mContentResolver,
+                                        Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS);
     }
 
     @Override
     public int getAvailabilityStatus() {
         return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
                 && (Settings.Global.getInt(mContentResolver,
-                Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                != GAME_DRIVER_OFF)
+                Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT)
+                != UPDATABLE_DRIVER_OFF)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
@@ -157,7 +159,7 @@
             mDevOptInApps.remove(packageName);
             mDevPrereleaseOptInApps.remove(packageName);
             mDevOptOutApps.add(packageName);
-        } else if (value.equals(mPreferenceGameDriver)) {
+        } else if (value.equals(mPreferenceProductionDriver)) {
             mDevOptInApps.add(packageName);
             mDevPrereleaseOptInApps.remove(packageName);
             mDevOptOutApps.remove(packageName);
@@ -174,13 +176,15 @@
         listPref.setSummary(value);
 
         // Push the updated Sets for stable/prerelease opt-in and opt-out apps to
-        // corresponding Settings.Global.GAME_DRIVER(_PRERELEASE)?_OPT_(IN|OUT)_APPS
-        Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS,
+        // corresponding Settings.Global.UPDATABLE_DRIVER_[PRODUCTION|PRERELEASE]_OPT_(IN|OUT)_APPS
+        Settings.Global.putString(mContentResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS,
                 String.join(",", mDevOptInApps));
         Settings.Global.putString(mContentResolver,
-                Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS,
+                Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS,
                 String.join(",", mDevPrereleaseOptInApps));
-        Settings.Global.putString(mContentResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS,
+        Settings.Global.putString(mContentResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS,
                 String.join(",", mDevOptOutApps));
 
         return true;
@@ -251,7 +255,7 @@
         listPreference.setEntryValues(mEntryList);
 
         // Initialize preference default and summary with the opt in/out choices
-        // from Settings.Global.GAME_DRIVER(_PRERELEASE)?_OPT_(IN|OUT)_APPS
+        // from Settings.Global.UPDATABLE_DRIVER_[PRODUCTION|PRERELEASE]_OPT_[IN|OUT]_APPS
         if (mDevOptOutApps.contains(packageName)) {
             listPreference.setValue(mPreferenceSystem);
             listPreference.setSummary(mPreferenceSystem);
@@ -259,8 +263,8 @@
             listPreference.setValue(mPreferencePrereleaseDriver);
             listPreference.setSummary(mPreferencePrereleaseDriver);
         } else if (mDevOptInApps.contains(packageName)) {
-            listPreference.setValue(mPreferenceGameDriver);
-            listPreference.setSummary(mPreferenceGameDriver);
+            listPreference.setValue(mPreferenceProductionDriver);
+            listPreference.setSummary(mPreferenceProductionDriver);
         } else {
             listPreference.setValue(mPreferenceDefault);
             listPreference.setSummary(mPreferenceDefault);
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java
index 8317800..dbad099 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserver.java
@@ -52,7 +52,7 @@
      */
     public void register(ContentResolver contentResolver) {
         contentResolver.registerContentObserver(
-                Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false, this);
+                Settings.Global.getUriFor(Settings.Global.UPDATABLE_DRIVER_ALL_APPS), false, this);
     }
 
     /**
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
index 2801689..9275a31 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboard.java
@@ -30,7 +30,7 @@
 import com.android.settingslib.search.SearchIndexable;
 
 /**
- * Dashboard for Game Driver preferences.
+ * Dashboard for Graphics Driver preferences.
  */
 @SearchIndexable
 public class GraphicsDriverDashboard extends DashboardFragment {
@@ -39,7 +39,7 @@
 
     @Override
     public int getMetricsCategory() {
-        return SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD;
+        return SettingsEnums.SETTINGS_GRAPHICS_DRIVER_DASHBOARD;
     }
 
     @Override
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
index 29f1014..5106a78 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceController.java
@@ -46,24 +46,24 @@
 import java.util.List;
 
 /**
- * Controller of global switch to enable Game Driver for all Apps.
+ * Controller of global switch to enable updatable driver for all Apps.
  */
 public class GraphicsDriverEnableForAllAppsPreferenceController extends BasePreferenceController
         implements Preference.OnPreferenceChangeListener,
                    GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener,
                    LifecycleObserver, OnStart, OnStop {
 
-    public static final int GAME_DRIVER_DEFAULT = 0;
-    public static final int GAME_DRIVER_ALL_APPS = 1;
-    public static final int GAME_DRIVER_PRERELEASE_ALL_APPS = 2;
-    public static final int GAME_DRIVER_OFF = 3;
-    public static final String PROPERTY_GFX_DRIVER_GAME = "ro.gfx.driver.0";
+    public static final int UPDATABLE_DRIVER_DEFAULT = 0;
+    public static final int UPDATABLE_DRIVER_PRODUCTION_ALL_APPS = 1;
+    public static final int UPDATABLE_DRIVER_PRERELEASE_ALL_APPS = 2;
+    public static final int UPDATABLE_DRIVER_OFF = 3;
+    public static final String PROPERTY_GFX_DRIVER_PRODUCTION = "ro.gfx.driver.0";
     public static final String PROPERTY_GFX_DRIVER_PRERELEASE = "ro.gfx.driver.1";
 
     private final Context mContext;
     private final ContentResolver mContentResolver;
     private final String mPreferenceDefault;
-    private final String mPreferenceGameDriver;
+    private final String mPreferenceProductionDriver;
     private final String mPreferencePrereleaseDriver;
     @VisibleForTesting
     CharSequence[] mEntryList;
@@ -79,8 +79,8 @@
 
         final Resources resources = context.getResources();
         mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
-        mPreferenceGameDriver =
-                resources.getString(R.string.graphics_driver_app_preference_game_driver);
+        mPreferenceProductionDriver =
+                resources.getString(R.string.graphics_driver_app_preference_production_driver);
         mPreferencePrereleaseDriver =
                 resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
         mEntryList = constructEntryList(mContext, false);
@@ -92,8 +92,9 @@
     public int getAvailabilityStatus() {
         return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(mContext)
                         && (Settings.Global.getInt(mContentResolver,
-                                    Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                                != GAME_DRIVER_OFF)
+                                    Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                                    UPDATABLE_DRIVER_DEFAULT)
+                                != UPDATABLE_DRIVER_OFF)
                 ? AVAILABLE
                 : CONDITIONALLY_UNAVAILABLE;
     }
@@ -122,11 +123,12 @@
         final ListPreference listPref = (ListPreference) preference;
         listPref.setVisible(isAvailable());
         final int currentChoice = Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
-        if (currentChoice == GAME_DRIVER_ALL_APPS) {
-            listPref.setValue(mPreferenceGameDriver);
-            listPref.setSummary(mPreferenceGameDriver);
-        } else if (currentChoice == GAME_DRIVER_PRERELEASE_ALL_APPS) {
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT);
+        if (currentChoice == UPDATABLE_DRIVER_PRODUCTION_ALL_APPS) {
+            listPref.setValue(mPreferenceProductionDriver);
+            listPref.setSummary(mPreferenceProductionDriver);
+        } else if (currentChoice == UPDATABLE_DRIVER_PRERELEASE_ALL_APPS) {
             listPref.setValue(mPreferencePrereleaseDriver);
             listPref.setSummary(mPreferencePrereleaseDriver);
         } else {
@@ -140,21 +142,22 @@
         final ListPreference listPref = (ListPreference) preference;
         final String value = newValue.toString();
         final int currentChoice = Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT);
         final int userChoice;
-        if (value.equals(mPreferenceGameDriver)) {
-            userChoice = GAME_DRIVER_ALL_APPS;
+        if (value.equals(mPreferenceProductionDriver)) {
+            userChoice = UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
         } else if (value.equals(mPreferencePrereleaseDriver)) {
-            userChoice = GAME_DRIVER_PRERELEASE_ALL_APPS;
+            userChoice = UPDATABLE_DRIVER_PRERELEASE_ALL_APPS;
         } else {
-            userChoice = GAME_DRIVER_DEFAULT;
+            userChoice = UPDATABLE_DRIVER_DEFAULT;
         }
         listPref.setValue(value);
         listPref.setSummary(value);
 
         if (userChoice != currentChoice) {
             Settings.Global.putInt(
-                    mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, userChoice);
+                    mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, userChoice);
         }
 
         return true;
@@ -172,7 +175,8 @@
         final Resources resources = context.getResources();
         final String prereleaseDriverPackageName =
                 SystemProperties.get(PROPERTY_GFX_DRIVER_PRERELEASE);
-        final String gameDriverPackageName = SystemProperties.get(PROPERTY_GFX_DRIVER_GAME);
+        final String productionDriverPackageName =
+                SystemProperties.get(PROPERTY_GFX_DRIVER_PRODUCTION);
 
         List<CharSequence> entryList = new ArrayList<>();
         entryList.add(resources.getString(R.string.graphics_driver_app_preference_default));
@@ -182,9 +186,10 @@
             entryList.add(resources.getString(
                     R.string.graphics_driver_app_preference_prerelease_driver));
         }
-        if (!TextUtils.isEmpty(gameDriverPackageName)
-                && hasDriverPackage(pm, gameDriverPackageName)) {
-            entryList.add(resources.getString(R.string.graphics_driver_app_preference_game_driver));
+        if (!TextUtils.isEmpty(productionDriverPackageName)
+                && hasDriverPackage(pm, productionDriverPackageName)) {
+            entryList.add(resources.getString(
+                    R.string.graphics_driver_app_preference_production_driver));
         }
         if (withSystem) {
             entryList.add(resources.getString(R.string.graphics_driver_app_preference_system));
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java
deleted file mode 100644
index 4862cfe..0000000
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2019 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.graphicsdriver;
-
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
-import android.provider.Settings;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.core.lifecycle.events.OnStop;
-import com.android.settingslib.widget.FooterPreference;
-
-/**
- * Controller of footer preference for Graphics Driver Preferences dashboard.
- */
-public class GraphicsDriverFooterPreferenceController extends BasePreferenceController
-        implements GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener,
-        LifecycleObserver, OnStart, OnStop {
-
-    private final ContentResolver mContentResolver;
-    @VisibleForTesting
-    GraphicsDriverContentObserver mGraphicsDriverContentObserver;
-
-    private FooterPreference mPreference;
-
-    public GraphicsDriverFooterPreferenceController(Context context, String key) {
-        super(context, key);
-        mContentResolver = context.getContentResolver();
-        mGraphicsDriverContentObserver =
-                new GraphicsDriverContentObserver(new Handler(Looper.getMainLooper()), this);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                == GAME_DRIVER_OFF
-                ? AVAILABLE_UNSEARCHABLE
-                : CONDITIONALLY_UNAVAILABLE;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
-    public void onStart() {
-        mGraphicsDriverContentObserver.register(mContentResolver);
-    }
-
-    @Override
-    public void onStop() {
-        mGraphicsDriverContentObserver.unregister(mContentResolver);
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final FooterPreference footerPref = (FooterPreference) preference;
-        footerPref.setVisible(isAvailable());
-    }
-
-    @Override
-    public void onGraphicsDriverContentChanged() {
-        updateState(mPreference);
-    }
-}
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java
index 86c56b7..b1faefa 100644
--- a/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarController.java
@@ -16,10 +16,10 @@
 
 package com.android.settings.development.graphicsdriver;
 
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -36,7 +36,7 @@
 import com.android.settingslib.development.DevelopmentSettingsEnabler;
 
 /**
- * Controller of global switch bar used to fully turn off Game Driver.
+ * Controller of global switch bar used to fully turn off updatable driver.
  */
 public class GraphicsDriverGlobalSwitchBarController
         implements SwitchWidgetController.OnSwitchChangeListener,
@@ -61,8 +61,9 @@
                 DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context));
         mSwitchWidgetController.setChecked(
                 Settings.Global.getInt(
-                        mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                != GAME_DRIVER_OFF);
+                        mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                        UPDATABLE_DRIVER_DEFAULT)
+                != UPDATABLE_DRIVER_OFF);
         mSwitchWidgetController.setListener(this);
     }
 
@@ -81,21 +82,22 @@
     @Override
     public boolean onSwitchToggled(boolean isChecked) {
         final int graphicsDriverGlobalOption = Settings.Global.getInt(
-                mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT);
 
         if (isChecked
-                && (graphicsDriverGlobalOption == GAME_DRIVER_DEFAULT
-                        || graphicsDriverGlobalOption == GAME_DRIVER_ALL_APPS
-                        || graphicsDriverGlobalOption == GAME_DRIVER_PRERELEASE_ALL_APPS)) {
+                && (graphicsDriverGlobalOption == UPDATABLE_DRIVER_DEFAULT
+                        || graphicsDriverGlobalOption == UPDATABLE_DRIVER_PRODUCTION_ALL_APPS
+                        || graphicsDriverGlobalOption == UPDATABLE_DRIVER_PRERELEASE_ALL_APPS)) {
             return true;
         }
 
-        if (!isChecked && graphicsDriverGlobalOption == GAME_DRIVER_OFF) {
+        if (!isChecked && graphicsDriverGlobalOption == UPDATABLE_DRIVER_OFF) {
             return true;
         }
 
-        Settings.Global.putInt(mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS,
-                isChecked ? GAME_DRIVER_DEFAULT : GAME_DRIVER_OFF);
+        Settings.Global.putInt(mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                isChecked ? UPDATABLE_DRIVER_DEFAULT : UPDATABLE_DRIVER_OFF);
 
         return true;
     }
@@ -104,7 +106,8 @@
     public void onGraphicsDriverContentChanged() {
         mSwitchWidgetController.setChecked(
                 Settings.Global.getInt(
-                        mContentResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT)
-                != GAME_DRIVER_OFF);
+                        mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                        UPDATABLE_DRIVER_DEFAULT)
+                != UPDATABLE_DRIVER_OFF);
     }
 }
diff --git a/src/com/android/settings/development/graphicsdriver/GraphicsDriverTopIntroPreferenceController.java b/src/com/android/settings/development/graphicsdriver/GraphicsDriverTopIntroPreferenceController.java
new file mode 100644
index 0000000..3d449d9
--- /dev/null
+++ b/src/com/android/settings/development/graphicsdriver/GraphicsDriverTopIntroPreferenceController.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2019 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.graphicsdriver;
+
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.widget.TopIntroPreference;
+
+/**
+ * Controller of top info preference for Graphics Driver Preferences dashboard.
+ */
+public class GraphicsDriverTopIntroPreferenceController extends BasePreferenceController
+        implements GraphicsDriverContentObserver.OnGraphicsDriverContentChangedListener,
+        LifecycleObserver, OnStart, OnStop {
+
+    private final ContentResolver mContentResolver;
+    @VisibleForTesting
+    GraphicsDriverContentObserver mGraphicsDriverContentObserver;
+
+    private TopIntroPreference mPreference;
+
+    public GraphicsDriverTopIntroPreferenceController(Context context, String key) {
+        super(context, key);
+        mContentResolver = context.getContentResolver();
+        mGraphicsDriverContentObserver =
+                new GraphicsDriverContentObserver(new Handler(Looper.getMainLooper()), this);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return Settings.Global.getInt(
+                mContentResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT)
+                == UPDATABLE_DRIVER_OFF
+                ? AVAILABLE_UNSEARCHABLE
+                : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void onStart() {
+        mGraphicsDriverContentObserver.register(mContentResolver);
+    }
+
+    @Override
+    public void onStop() {
+        mGraphicsDriverContentObserver.unregister(mContentResolver);
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final TopIntroPreference topIntroPref = (TopIntroPreference) preference;
+        topIntroPref.setVisible(isAvailable());
+    }
+
+    @Override
+    public void onGraphicsDriverContentChanged() {
+        updateState(mPreference);
+    }
+}
diff --git a/src/com/android/settings/development/qstile/DevelopmentTiles.java b/src/com/android/settings/development/qstile/DevelopmentTiles.java
index 916c6c9..203a688 100644
--- a/src/com/android/settings/development/qstile/DevelopmentTiles.java
+++ b/src/com/android/settings/development/qstile/DevelopmentTiles.java
@@ -48,7 +48,10 @@
 import androidx.annotation.VisibleForTesting;
 
 import com.android.internal.app.LocalePicker;
+import com.android.internal.inputmethod.Completable;
+import com.android.internal.inputmethod.ResultCallbacks;
 import com.android.internal.statusbar.IStatusBarService;
+import com.android.internal.view.IInputMethodManager;
 import com.android.settings.R;
 import com.android.settings.development.WirelessDebuggingPreferenceController;
 import com.android.settings.overlay.FeatureFactory;
@@ -197,6 +200,7 @@
         static final int SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE = 1026;
         private IBinder mSurfaceFlinger;
         private IWindowManager mWindowManager;
+        private IInputMethodManager mInputMethodManager;
         private Toast mToast;
 
         @Override
@@ -204,6 +208,8 @@
             super.onCreate();
             mWindowManager = WindowManagerGlobal.getWindowManagerService();
             mSurfaceFlinger = ServiceManager.getService("SurfaceFlinger");
+            mInputMethodManager = IInputMethodManager.Stub.asInterface(
+                    ServiceManager.getService("input_method"));
             Context context = getApplicationContext();
             CharSequence text = "Trace files written to /data/misc/wmtrace";
             mToast = Toast.makeText(context, text, Toast.LENGTH_LONG);
@@ -256,9 +262,22 @@
             return false;
         }
 
+        @VisibleForTesting
+        boolean isImeTraceEnabled() {
+            try {
+                final Completable.Boolean value = Completable.createBoolean();
+                mInputMethodManager.isImeTraceEnabled(ResultCallbacks.of(value));
+                return Completable.getResult(value);
+            } catch (RemoteException e) {
+                Log.e(TAG, "Could not get ime trace status, defaulting to false.", e);
+            }
+            return false;
+        }
+
         @Override
         protected boolean isEnabled() {
-            return isWindowTraceEnabled() || isLayerTraceEnabled() || isSystemUiTracingEnabled();
+            return isWindowTraceEnabled() || isLayerTraceEnabled() || isSystemUiTracingEnabled()
+                    || isImeTraceEnabled();
         }
 
         private void setWindowTraceEnabled(boolean isEnabled) {
@@ -308,11 +327,24 @@
             }
         }
 
+        private void setImeTraceEnabled(boolean isEnabled) {
+            try {
+                if (isEnabled) {
+                    mInputMethodManager.startImeTrace();
+                } else {
+                    mInputMethodManager.stopImeTrace();
+                }
+            } catch (RemoteException e) {
+                Log.e(TAG, "Could not set ime trace status." + e.toString());
+            }
+        }
+
         @Override
         protected void setIsEnabled(boolean isEnabled) {
             setWindowTraceEnabled(isEnabled);
             setLayerTraceEnabled(isEnabled);
             setSystemUiTracing(isEnabled);
+            setImeTraceEnabled(isEnabled);
             if (!isEnabled) {
                 mToast.show();
             }
@@ -432,4 +464,31 @@
                     enabled ? ADB_SETTING_ON : ADB_SETTING_OFF);
         }
     }
+
+    /**
+     * Tile to control the "Show taps" developer setting
+     */
+    public static class ShowTaps extends DevelopmentTiles {
+        private static final int SETTING_VALUE_ON = 1;
+        private static final int SETTING_VALUE_OFF = 0;
+        private Context mContext;
+
+        @Override
+        public void onCreate() {
+            super.onCreate();
+            mContext = getApplicationContext();
+        }
+
+        @Override
+        protected boolean isEnabled() {
+            return Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.SHOW_TOUCHES, SETTING_VALUE_OFF) == SETTING_VALUE_ON;
+        }
+
+        @Override
+        protected void setIsEnabled(boolean isEnabled) {
+            Settings.System.putInt(mContext.getContentResolver(),
+                Settings.System.SHOW_TOUCHES, isEnabled ? SETTING_VALUE_ON : SETTING_VALUE_OFF);
+        }
+    }
 }
diff --git a/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java b/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java
new file mode 100644
index 0000000..f14953c
--- /dev/null
+++ b/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceController.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2020 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.transcode;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * The controller (on the transcode settings screen) indicating that by default we assume that apps
+ * support modern formats.
+ */
+public class TranscodeDefaultOptionPreferenceController extends TogglePreferenceController {
+    private static final String TRANSCODE_DEFAULT_SYS_PROP_KEY =
+            "persist.sys.fuse.transcode_default";
+
+    public TranscodeDefaultOptionPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return !SystemProperties.getBoolean(TRANSCODE_DEFAULT_SYS_PROP_KEY, true);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        SystemProperties.set(TRANSCODE_DEFAULT_SYS_PROP_KEY, String.valueOf(!isChecked));
+        return true;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java b/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
new file mode 100644
index 0000000..c15806d
--- /dev/null
+++ b/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceController.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 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.transcode;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * The controller for the "Enabling transcoding for all apps" switch on the transcode settings
+ * screen.
+ */
+public class TranscodeGlobalTogglePreferenceController extends TogglePreferenceController {
+
+    private static final String TRANSCODE_ENABLED_PROP_KEY = "persist.sys.fuse.transcode_enabled";
+
+    public TranscodeGlobalTogglePreferenceController(Context context,
+            String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return SystemProperties.getBoolean(TRANSCODE_ENABLED_PROP_KEY, true);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        SystemProperties.set(TRANSCODE_ENABLED_PROP_KEY, String.valueOf(isChecked));
+        return true;
+    }
+}
diff --git a/src/com/android/settings/development/transcode/TranscodeSettingsFragment.java b/src/com/android/settings/development/transcode/TranscodeSettingsFragment.java
new file mode 100644
index 0000000..e3dc9bf
--- /dev/null
+++ b/src/com/android/settings/development/transcode/TranscodeSettingsFragment.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2020 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.transcode;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * Fragment for native transcode settings in Developer options.
+ */
+@SearchIndexable
+public class TranscodeSettingsFragment extends DashboardFragment {
+    private static final String TAG = "TranscodeSettings";
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.transcode_settings;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.TRANSCODE_SETTINGS;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.transcode_settings) {
+
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(context);
+                }
+            };
+}
diff --git a/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java b/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java
new file mode 100644
index 0000000..49456ff
--- /dev/null
+++ b/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceController.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2020 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.transcode;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * The controller for the User's control (over other transcoding preferences) preference switch on
+ * the transcode settings screen.
+ */
+public class TranscodeUserControlPreferenceController extends TogglePreferenceController {
+    private static final String TRANSCODE_USER_CONTROL_SYS_PROP_KEY =
+            "persist.sys.fuse.transcode_user_control";
+
+    public TranscodeUserControlPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return SystemProperties.getBoolean(TRANSCODE_USER_CONTROL_SYS_PROP_KEY, false);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        SystemProperties.set(TRANSCODE_USER_CONTROL_SYS_PROP_KEY, String.valueOf(isChecked));
+        return true;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
index 185c8ea..c09ea02 100644
--- a/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/BuildNumberPreferenceController.java
@@ -160,11 +160,16 @@
             if (mDevHitCountdown == 0 && !mProcessingLastDevHit) {
                 // Add 1 count back, then start password confirmation flow.
                 mDevHitCountdown++;
-                final ChooseLockSettingsHelper helper =
-                        new ChooseLockSettingsHelper(mActivity, mFragment);
-                mProcessingLastDevHit = helper.launchConfirmationActivity(
-                        REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF,
-                        mContext.getString(R.string.unlock_set_unlock_launch_picker_title));
+
+                final String title = mContext
+                        .getString(R.string.unlock_set_unlock_launch_picker_title);
+                final ChooseLockSettingsHelper.Builder builder =
+                        new ChooseLockSettingsHelper.Builder(mActivity, mFragment);
+                mProcessingLastDevHit = builder
+                        .setRequestCode(REQUEST_CONFIRM_PASSWORD_FOR_DEV_PREF)
+                        .setTitle(title)
+                        .show();
+
                 if (!mProcessingLastDevHit) {
                     enableDevelopmentSettings();
                 }
diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
index 6ada11b..e6d9dfd 100644
--- a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
@@ -25,6 +25,7 @@
 import android.provider.Settings;
 import android.text.SpannedString;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
@@ -44,6 +45,8 @@
         OnSaveInstanceState,
         OnCreate {
     private static final String KEY_PENDING_DEVICE_NAME = "key_pending_device_name";
+    @VisibleForTesting
+    static final int RES_SHOW_DEVICE_NAME_BOOL = R.bool.config_show_device_name;
     private String mDeviceName;
     protected WifiManager mWifiManager;
     private final BluetoothAdapter mBluetoothAdapter;
diff --git a/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java b/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java
index 7ee6f89..5f760bf 100644
--- a/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/HardwareInfoPreferenceController.java
@@ -49,7 +49,7 @@
 
     @Override
     public CharSequence getSummary() {
-        return mContext.getResources().getString(R.string.model_summary, getDeviceModel());
+        return getDeviceModel();
     }
 
     public static String getDeviceModel() {
diff --git a/src/com/android/settings/deviceinfo/OWNERS b/src/com/android/settings/deviceinfo/OWNERS
index bedbe16..e6569f4 100644
--- a/src/com/android/settings/deviceinfo/OWNERS
+++ b/src/com/android/settings/deviceinfo/OWNERS
@@ -1,6 +1,7 @@
 # Default reviewers for this and subdirectories.
 andychou@google.com
 bonianchen@google.com
+goldmanj@google.com
 allenwtsu@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
index 1cae22e..7d20aa7 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMigrateConfirm.java
@@ -103,8 +103,14 @@
                     Log.d(TAG, "User " + user.id + " is currently locked; requesting unlock");
                     final CharSequence description = TextUtils.expandTemplate(
                             getText(R.string.storage_wizard_move_unlock), user.name);
-                    new ChooseLockSettingsHelper(this).launchConfirmationActivityForAnyUser(
-                            REQUEST_CREDENTIAL, null, null, description, user.id);
+                    final ChooseLockSettingsHelper.Builder builder =
+                            new ChooseLockSettingsHelper.Builder(this);
+                    builder.setRequestCode(REQUEST_CREDENTIAL)
+                            .setDescription(description)
+                            .setUserId(user.id)
+                            .setAllowAnyUserId(true)
+                            .setForceVerifyPath(true)
+                            .show();
                     return;
                 }
             }
diff --git a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
index 8dc878e..034eb079 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardMoveConfirm.java
@@ -61,7 +61,7 @@
             return;
         }
 
-        // Sanity check that target volume is candidate
+        // Check that target volume is candidate
         Preconditions.checkState(
                 getPackageManager().getPackageCandidateVolumes(mApp).contains(mVolume));
 
@@ -85,8 +85,14 @@
                     Log.d(TAG, "User " + user.id + " is currently locked; requesting unlock");
                     final CharSequence description = TextUtils.expandTemplate(
                             getText(R.string.storage_wizard_move_unlock), user.name);
-                    new ChooseLockSettingsHelper(this).launchConfirmationActivityForAnyUser(
-                            REQUEST_CREDENTIAL, null, null, description, user.id);
+                    final ChooseLockSettingsHelper.Builder builder =
+                            new ChooseLockSettingsHelper.Builder(this);
+                    builder.setRequestCode(REQUEST_CREDENTIAL)
+                            .setDescription(description)
+                            .setUserId(user.id)
+                            .setForceVerifyPath(true)
+                            .setAllowAnyUserId(true)
+                            .show();
                     return;
                 }
             }
diff --git a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
index 8a2d3ba..dcc581c 100644
--- a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java
@@ -19,11 +19,13 @@
 import android.content.Context;
 import android.os.storage.StorageManager;
 import android.text.format.Formatter;
+import android.util.FeatureFlagUtils;
 
 import androidx.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
 import com.android.settingslib.deviceinfo.PrivateStorageInfo;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
 import com.android.settingslib.utils.ThreadUtils;
@@ -48,6 +50,11 @@
 
     @Override
     protected void refreshSummary(Preference preference) {
+        // Remove homepage summaries for silky home.
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            return;
+        }
+
         if (preference == null) {
             return;
         }
diff --git a/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java b/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
index dbee443..3bda7b9 100644
--- a/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java
@@ -17,8 +17,10 @@
 package com.android.settings.deviceinfo.aboutphone;
 
 import android.content.Context;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.deviceinfo.DeviceNamePreferenceController;
 
 public class TopLevelAboutDevicePreferenceController extends BasePreferenceController {
@@ -34,8 +36,13 @@
 
     @Override
     public CharSequence getSummary() {
+        // Remove homepage summaries for silky home.
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            return null;
+        }
+
         final DeviceNamePreferenceController deviceNamePreferenceController =
-                new DeviceNamePreferenceController(mContext, "dummy_key");
+                new DeviceNamePreferenceController(mContext, "unused_key");
         return deviceNamePreferenceController.getSummary();
     }
 }
diff --git a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
index 955c60c..e5fd3da 100644
--- a/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/hardwareinfo/HardwareRevisionPreferenceController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.os.SystemProperties;
+import android.text.TextUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
@@ -31,8 +32,8 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return mContext.getResources().getBoolean(R.bool.config_show_device_model)
-                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        return mContext.getResources().getBoolean(R.bool.config_show_device_model) &&
+                !TextUtils.isEmpty(getSummary()) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
     @Override
diff --git a/src/com/android/settings/deviceinfo/legal/ModuleLicenseProvider.java b/src/com/android/settings/deviceinfo/legal/ModuleLicenseProvider.java
index 6731c69..5f72945 100644
--- a/src/com/android/settings/deviceinfo/legal/ModuleLicenseProvider.java
+++ b/src/com/android/settings/deviceinfo/legal/ModuleLicenseProvider.java
@@ -62,7 +62,7 @@
 
     @Override
     public String getType(Uri uri) {
-        checkUri(getContext(), uri);
+        checkUri(getModuleContext(), uri);
         return LICENSE_FILE_MIME_TYPE;
     }
 
@@ -83,7 +83,7 @@
 
     @Override
     public ParcelFileDescriptor openFile(Uri uri, String mode) {
-        final Context context = getContext();
+        final Context context = getModuleContext();
         checkUri(context, uri);
         Preconditions.checkArgument("r".equals(mode), "Read is the only supported mode");
 
@@ -191,4 +191,10 @@
     private static SharedPreferences getPrefs(Context context) {
         return context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
     }
+
+    // Method to allow context injection for testing purposes.
+    @VisibleForTesting
+    protected Context getModuleContext() {
+        return getContext();
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
index 370bdfb..414039b 100644
--- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
+++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.deviceinfo.simstatus;
 
+import static androidx.lifecycle.Lifecycle.Event;
+
 import android.annotation.Nullable;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -54,21 +56,23 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
 
 import com.android.settings.R;
 import com.android.settingslib.DeviceInfoUtils;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
 import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
-public class SimStatusDialogController implements LifecycleObserver, OnResume, OnPause {
+/**
+ * Controller for Sim Status information within the About Phone Settings page.
+ */
+public class SimStatusDialogController implements LifecycleObserver {
 
     private final static String TAG = "SimStatusDialogCtrl";
 
@@ -140,6 +144,7 @@
 
     private SubscriptionInfo mSubscriptionInfo;
     private TelephonyDisplayInfo mTelephonyDisplayInfo;
+    private ServiceState mPreviousServiceState;
 
     private final int mSlotIndex;
     private TelephonyManager mTelephonyManager;
@@ -152,6 +157,7 @@
     private final Context mContext;
 
     private boolean mShowLatestAreaInfo;
+    private boolean mIsRegisteredListener = false;
 
     private final BroadcastReceiver mAreaInfoReceiver = new BroadcastReceiver() {
         @Override
@@ -261,7 +267,10 @@
         }
     }
 
-    @Override
+    /**
+     * OnResume lifecycle event, resume listening for phone state or subscription changes.
+     */
+    @OnLifecycleEvent(Event.ON_RESUME)
     public void onResume() {
         if (mSubscriptionInfo == null) {
             return;
@@ -282,11 +291,25 @@
             mContext.registerReceiver(mAreaInfoReceiver,
                     new IntentFilter(CellBroadcastIntents.ACTION_AREA_INFO_UPDATED));
         }
+
+        mIsRegisteredListener = true;
     }
 
-    @Override
+    /**
+     * onPause lifecycle event, no longer listen for phone state or subscription changes.
+     */
+    @OnLifecycleEvent(Event.ON_PAUSE)
     public void onPause() {
         if (mSubscriptionInfo == null) {
+            if (mIsRegisteredListener) {
+                mSubscriptionManager.removeOnSubscriptionsChangedListener(
+                        mOnSubscriptionsChangedListener);
+                mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+                if (mShowLatestAreaInfo) {
+                    mContext.unregisterReceiver(mAreaInfoReceiver);
+                }
+                mIsRegisteredListener = false;
+            }
             return;
         }
 
@@ -305,7 +328,8 @@
         mDialog.setText(NETWORK_PROVIDER_VALUE_ID, carrierName);
     }
 
-    private void updatePhoneNumber() {
+    @VisibleForTesting
+    protected void updatePhoneNumber() {
         // If formattedNumber is null or empty, it'll display as "Unknown".
         mDialog.setText(PHONE_NUMBER_VALUE_ID,
                 DeviceInfoUtils.getBidiFormattedPhoneNumber(mContext, mSubscriptionInfo));
@@ -425,6 +449,9 @@
         final int state = Utils.getCombinedServiceState(serviceState);
         if (!Utils.isInService(serviceState)) {
             resetSignalStrength();
+        } else if (!Utils.isInService(mPreviousServiceState)) {
+            // If ServiceState changed from out of service -> in service, update signal strength.
+            updateSignalStrength(mTelephonyManager.getSignalStrength());
         }
 
         String serviceStateValue;
@@ -472,7 +499,7 @@
         }
 
         ServiceState serviceState = mTelephonyManager.getServiceState();
-        if (serviceState == null || !Utils.isInService(serviceState)) {
+        if (!Utils.isInService(serviceState)) {
             return;
         }
 
@@ -576,7 +603,7 @@
     }
 
     @VisibleForTesting
-    void requestForUpdateEid() {
+    protected void requestForUpdateEid() {
         ThreadUtils.postOnBackgroundThread(() -> {
             final AtomicReference<String> eid = getEid(mSlotIndex);
             ThreadUtils.postOnMainThread(() -> updateEid(eid));
@@ -584,7 +611,7 @@
     }
 
     @VisibleForTesting
-    AtomicReference<String> getEid(int slotIndex) {
+    protected AtomicReference<String> getEid(int slotIndex) {
         boolean shouldHaveEid = false;
         String eid = null;
         if (mTelephonyManager.getActiveModemCount() > MAX_PHONE_COUNT_SINGLE_SIM) {
@@ -622,7 +649,7 @@
     }
 
     @VisibleForTesting
-    void updateEid(AtomicReference<String> eid) {
+    protected void updateEid(AtomicReference<String> eid) {
         if (eid == null) {
             mDialog.removeSettingFromScreen(EID_INFO_LABEL_ID);
             mDialog.removeSettingFromScreen(EID_INFO_VALUE_ID);
@@ -737,7 +764,7 @@
     }
 
     @VisibleForTesting
-    PhoneStateListener getPhoneStateListener() {
+    protected PhoneStateListener getPhoneStateListener() {
         return new PhoneStateListener() {
             @Override
             public void onDataConnectionStateChanged(int state) {
@@ -755,6 +782,7 @@
                 updateNetworkProvider();
                 updateServiceState(serviceState);
                 updateRoamingStatus(serviceState);
+                mPreviousServiceState = serviceState;
             }
 
             @Override
diff --git a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
index 50027f2..f733c72 100644
--- a/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
@@ -29,8 +29,8 @@
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.deletionhelper.ActivationWarningFragment;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.widget.MasterSwitchController;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.GenericSwitchController;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settings.widget.SwitchWidgetController;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -43,8 +43,8 @@
     @VisibleForTesting
     static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY = "ro.storage_manager.enabled";
     private final MetricsFeatureProvider mMetricsFeatureProvider;
-    private MasterSwitchPreference mSwitch;
-    private MasterSwitchController mSwitchController;
+    private PrimarySwitchPreference mSwitch;
+    private GenericSwitchController mSwitchController;
     private FragmentManager mFragmentManager;
 
     public AutomaticStorageManagementSwitchPreferenceController(Context context, String key) {
@@ -77,7 +77,7 @@
         mSwitch.setChecked(Utils.isStorageManagerEnabled(mContext));
 
         if (mSwitch != null) {
-            mSwitchController = new MasterSwitchController(mSwitch);
+            mSwitchController = new GenericSwitchController(mSwitch);
             mSwitchController.setListener(this);
             mSwitchController.startListening();
         }
diff --git a/src/com/android/settings/display/AdaptiveSleepDetailPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepDetailPreferenceController.java
deleted file mode 100644
index d6eabec..0000000
--- a/src/com/android/settings/display/AdaptiveSleepDetailPreferenceController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.display;
-
-import android.content.Context;
-
-import androidx.preference.Preference;
-
-public class AdaptiveSleepDetailPreferenceController extends AdaptiveSleepPreferenceController {
-
-    public AdaptiveSleepDetailPreferenceController(Context context, String key) {
-        super(context, key);
-    }
-
-    @Override
-    @AvailabilityStatus
-    public int getAvailabilityStatus() {
-        return mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_adaptive_sleep_available)
-                ? AVAILABLE
-                : UNSUPPORTED_ON_DEVICE;
-    }
-
-    @Override
-    public boolean isPublicSlice() {
-        return true;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        super.updateState(preference);
-        preference.setEnabled(hasSufficientPermission(mContext.getPackageManager()));
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java
index 9e6bca4..1110ad2 100644
--- a/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java
+++ b/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceController.java
@@ -11,7 +11,7 @@
  * 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
+ * limitations under the License.
  */
 
 package com.android.settings.display;
@@ -20,44 +20,53 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.text.TextUtils;
 
 import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
-import com.android.settings.core.BasePreferenceController;
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
 
-public class AdaptiveSleepPermissionPreferenceController extends BasePreferenceController {
-    final static String PREF_NAME = "adaptive_sleep_permission";
-    private final Intent mIntent;
+/**
+ * The controller of Screen attention's permission warning preference. The preference appears when
+ * the camera permission is missing for Screen Attention feature.
+ */
+public class AdaptiveSleepPermissionPreferenceController {
+    @VisibleForTesting
+    Preference mPreference;
+    private PackageManager mPackageManager;
 
-    public AdaptiveSleepPermissionPreferenceController(Context context, String key) {
-        super(context, key);
+    public AdaptiveSleepPermissionPreferenceController(Context context) {
         final String packageName = context.getPackageManager().getAttentionServicePackageName();
-        mIntent = new Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
-        mIntent.setData(Uri.parse("package:" + packageName));
-    }
-
-    @Override
-    @AvailabilityStatus
-    public int getAvailabilityStatus() {
-        return AVAILABLE_UNSEARCHABLE;
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (TextUtils.equals(getPreferenceKey(), preference.getKey())) {
-            mContext.startActivity(mIntent);
+        mPackageManager = context.getPackageManager();
+        final Intent intent = new Intent(
+                android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+        intent.setData(Uri.parse("package:" + packageName));
+        mPreference = new Preference(context);
+        mPreference.setTitle(R.string.adaptive_sleep_title_no_permission);
+        mPreference.setSummary(R.string.adaptive_sleep_summary_no_permission);
+        mPreference.setIcon(R.drawable.ic_info_outline_24);
+        mPreference.setOnPreferenceClickListener(p -> {
+            context.startActivity(intent);
             return true;
-        }
-        return super.handlePreferenceTreeClick(preference);
+        });
     }
 
-    @Override
-    public void updateState(Preference preference) {
-        super.updateState(preference);
-        if (TextUtils.equals(getPreferenceKey(), preference.getKey())) {
-            preference.setVisible(!hasSufficientPermission(mContext.getPackageManager()));
+    /**
+     * Adds the controlled preference to the provided preference screen.
+     */
+    public void addToScreen(PreferenceScreen screen) {
+        if (!hasSufficientPermission(mPackageManager)) {
+            screen.addPreference(mPreference);
         }
     }
+
+    /**
+     * Refreshes the visibility of the preference.
+     */
+    public void updateVisibility() {
+        mPreference.setVisible(!hasSufficientPermission(mPackageManager));
+    }
 }
diff --git a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
index 9f5b49e..c0c5e63 100644
--- a/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
+++ b/src/com/android/settings/display/AdaptiveSleepPreferenceController.java
@@ -1,66 +1,102 @@
 /*
  * Copyright (C) 2019 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package com.android.settings.display;
 
-import static android.provider.Settings.Secure.ADAPTIVE_SLEEP;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 import android.Manifest;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.os.UserManager;
 import android.provider.Settings;
 import android.service.attention.AttentionService;
 import android.text.TextUtils;
 
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
-import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.bluetooth.RestrictionUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedSwitchPreference;
 
+import com.google.common.annotations.VisibleForTesting;
 
-public class AdaptiveSleepPreferenceController extends TogglePreferenceController {
-    public static final String PREF_NAME = "adaptive_sleep";
-    private static final String SYSTEM_KEY = ADAPTIVE_SLEEP;
+/** The controller for Screen attention switch preference. */
+public class AdaptiveSleepPreferenceController {
+    public static final String PREFERENCE_KEY = "adaptive_sleep";
     private static final int DEFAULT_VALUE = 0;
+    private RestrictionUtils mRestrictionUtils;
+    private PackageManager mPackageManager;
+    private Context mContext;
 
-    public AdaptiveSleepPreferenceController(Context context, String key) {
-        super(context, key);
+    @VisibleForTesting
+    RestrictedSwitchPreference mPreference;
+
+    public AdaptiveSleepPreferenceController(Context context, RestrictionUtils restrictionUtils) {
+        mContext = context;
+        mRestrictionUtils = restrictionUtils;
+        mPreference = new RestrictedSwitchPreference(context);
+        mPreference.setTitle(R.string.adaptive_sleep_title);
+        mPreference.setSummary(R.string.adaptive_sleep_description);
+        mPreference.setIcon(R.drawable.empty_icon);
+        mPreference.setChecked(isChecked());
+        mPreference.setKey(PREFERENCE_KEY);
+        mPreference.setOnPreferenceClickListener(preference -> {
+            final boolean isChecked = ((RestrictedSwitchPreference) preference).isChecked();
+            Settings.Secure.putInt(context.getContentResolver(),
+                    Settings.Secure.ADAPTIVE_SLEEP, isChecked ? 1 : DEFAULT_VALUE);
+            return true;
+        });
+        mPackageManager = context.getPackageManager();
     }
 
-    @Override
-    public boolean isChecked() {
+    public AdaptiveSleepPreferenceController(Context context) {
+        this(context, new RestrictionUtils());
+    }
+
+    /**
+     * Adds the controlled preference to the provided preference screen.
+     */
+    public void addToScreen(PreferenceScreen screen) {
+        updatePreference();
+        screen.addPreference(mPreference);
+    }
+
+    /**
+     *  Updates the appearance of the preference.
+     */
+    public void updatePreference() {
+        final EnforcedAdmin enforcedAdmin = mRestrictionUtils.checkIfRestrictionEnforced(mContext,
+                UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT);
+        if (enforcedAdmin != null) {
+            mPreference.setDisabledByAdmin(enforcedAdmin);
+        } else {
+            mPreference.setEnabled(hasSufficientPermission(mPackageManager));
+        }
+    }
+
+    @VisibleForTesting
+    boolean isChecked() {
         return hasSufficientPermission(mContext.getPackageManager()) && Settings.Secure.getInt(
-                mContext.getContentResolver(), SYSTEM_KEY, DEFAULT_VALUE) != DEFAULT_VALUE;
-    }
-
-    @Override
-    public boolean setChecked(boolean isChecked) {
-        Settings.Secure.putInt(mContext.getContentResolver(), SYSTEM_KEY,
-                isChecked ? 1 : DEFAULT_VALUE);
-        return true;
-    }
-
-    @Override
-    @AvailabilityStatus
-    public int getAvailabilityStatus() {
-        return isControllerAvailable(mContext);
-    }
-
-    @Override
-    public CharSequence getSummary() {
-        return mContext.getText(isChecked()
-                ? R.string.adaptive_sleep_summary_on
-                : R.string.adaptive_sleep_summary_off);
+                mContext.getContentResolver(), Settings.Secure.ADAPTIVE_SLEEP, DEFAULT_VALUE)
+                != DEFAULT_VALUE;
     }
 
     public static int isControllerAvailable(Context context) {
@@ -89,4 +125,4 @@
         return attentionPackage != null && packageManager.checkPermission(
                 Manifest.permission.CAMERA, attentionPackage) == PackageManager.PERMISSION_GRANTED;
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/android/settings/display/AdaptiveSleepSettings.java b/src/com/android/settings/display/AdaptiveSleepSettings.java
deleted file mode 100644
index 52ded6a..0000000
--- a/src/com/android/settings/display/AdaptiveSleepSettings.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import static com.android.settings.homepage.contextualcards.slices.ContextualAdaptiveSleepSlice.PREF;
-import static com.android.settings.homepage.contextualcards.slices.ContextualAdaptiveSleepSlice.PREF_KEY_INTERACTED;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.search.SearchIndexable;
-
-@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
-public class AdaptiveSleepSettings extends DashboardFragment {
-
-    private static final String TAG = "AdaptiveSleepSettings";
-    private Context mContext;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        mContext = getContext();
-        Preference permissionPreference = findPreference(
-                AdaptiveSleepPermissionPreferenceController.PREF_NAME);
-        if (permissionPreference != null) {
-            permissionPreference.setVisible(false);
-        }
-
-        mContext.getSharedPreferences(PREF, Context.MODE_PRIVATE)
-                .edit()
-                .putBoolean(PREF_KEY_INTERACTED, true)
-                .apply();
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.adaptive_sleep_detail;
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.SETTINGS_ADAPTIVE_SLEEP;
-    }
-
-    @Override
-    public int getHelpResource() {
-        return R.string.help_url_adaptive_sleep;
-    }
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.adaptive_sleep_detail);
-}
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index 6dee5d2..7749c8f 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -16,12 +16,17 @@
 package com.android.settings.display;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.hardware.display.AmbientDisplayConfiguration;
+import android.os.PowerManager;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.provider.Settings;
 import android.text.TextUtils;
 
+import androidx.preference.Preference;
+
+import com.android.settings.R;
 import com.android.settings.core.TogglePreferenceController;
 
 public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreferenceController {
@@ -31,13 +36,9 @@
 
     private static final int MY_USER = UserHandle.myUserId();
     private static final String PROP_AWARE_AVAILABLE = "ro.vendor.aware_available";
+    private static final String AOD_SUPPRESSED_TOKEN = "winddown";
 
     private AmbientDisplayConfiguration mConfig;
-    private OnPreferenceChangedCallback mCallback;
-
-    public interface OnPreferenceChangedCallback {
-        void onPreferenceChanged();
-    }
 
     public AmbientDisplayAlwaysOnPreferenceController(Context context, String key) {
         super(context, key);
@@ -51,6 +52,12 @@
     }
 
     @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        refreshSummary(preference);
+    }
+
+    @Override
     public boolean isSliceable() {
         return TextUtils.equals(getPreferenceKey(), "ambient_display_always_on");
     }
@@ -70,24 +77,22 @@
         int enabled = isChecked ? ON : OFF;
         Settings.Secure.putInt(
                 mContext.getContentResolver(), Settings.Secure.DOZE_ALWAYS_ON, enabled);
-        if (mCallback != null) {
-            mCallback.onPreferenceChanged();
-        }
         return true;
     }
 
+    @Override
+    public CharSequence getSummary() {
+        return mContext.getText(
+                isAodSuppressedByBedtime(mContext) ? R.string.aware_summary_when_bedtime_on
+                        : R.string.doze_always_on_summary);
+    }
+
     public AmbientDisplayAlwaysOnPreferenceController setConfig(
             AmbientDisplayConfiguration config) {
         mConfig = config;
         return this;
     }
 
-    public AmbientDisplayAlwaysOnPreferenceController setCallback(
-            OnPreferenceChangedCallback callback) {
-        mCallback = callback;
-        return this;
-    }
-
     public static boolean isAvailable(AmbientDisplayConfiguration config) {
         return config.alwaysOnAvailableForUser(MY_USER);
     }
@@ -98,4 +103,25 @@
         }
         return mConfig;
     }
+
+    /**
+     * Returns whether AOD is suppressed by Bedtime mode, a feature of Digital Wellbeing.
+     *
+     * We know that Bedtime mode suppresses AOD using {@link AOD_SUPPRESSED_TOKEN}. If the Digital
+     * Wellbeing app is suppressing AOD with {@link AOD_SUPPRESSED_TOKEN}, then we can infer that
+     * AOD is being suppressed by Bedtime mode.
+     */
+    public static boolean isAodSuppressedByBedtime(Context context) {
+        int uid;
+        final PowerManager powerManager = context.getSystemService(PowerManager.class);
+        final PackageManager packageManager = context.getPackageManager();
+        final String packageName = context.getString(
+                com.android.internal.R.string.config_defaultWellbeingPackage);
+        try {
+            uid = packageManager.getApplicationInfo(packageName, /* flags= */ 0).uid;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+        return powerManager.isAmbientDisplaySuppressedForTokenByApp(AOD_SUPPRESSED_TOKEN, uid);
+    }
 }
diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java
index e1bbbfc..945ce47 100644
--- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java
+++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java
@@ -21,9 +21,11 @@
 import android.provider.Settings;
 
 import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 import androidx.preference.SwitchPreference;
 
 import com.android.internal.R;
+import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
 
@@ -34,12 +36,27 @@
 public class BatteryPercentagePreferenceController extends BasePreferenceController implements
         PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
 
+    private Preference mPreference;
+
     public BatteryPercentagePreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
     }
 
     @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+        if (!Utils.isBatteryPresent(mContext)) {
+            // Disable battery percentage
+            onPreferenceChange(mPreference, false /* newValue */);
+        }
+    }
+
+    @Override
     public int getAvailabilityStatus() {
+        if (!Utils.isBatteryPresent(mContext)) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
         return mContext.getResources().getBoolean(
                 R.bool.config_battery_percentage_setting_available) ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
diff --git a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java b/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
deleted file mode 100644
index 14fe25e..0000000
--- a/src/com/android/settings/display/NightDisplayFooterPreferenceController.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.display;
-
-import android.content.Context;
-import android.hardware.display.ColorDisplayManager;
-
-import com.android.settings.core.BasePreferenceController;
-
-public class NightDisplayFooterPreferenceController extends BasePreferenceController {
-
-    public NightDisplayFooterPreferenceController(Context context, String key) {
-        super(context, key);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return ColorDisplayManager.isNightDisplayAvailable(mContext)
-                ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
-    }
-}
diff --git a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
index 02dde40..0f8ecc5 100644
--- a/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayIntensityPreferenceController.java
@@ -62,6 +62,7 @@
         preference.setContinuousUpdates(true);
         preference.setMax(getMax());
         preference.setMin(getMin());
+        preference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);
     }
 
     @Override
diff --git a/src/com/android/settings/display/NightDisplayPreference.java b/src/com/android/settings/display/NightDisplayPreference.java
deleted file mode 100644
index 7020c49..0000000
--- a/src/com/android/settings/display/NightDisplayPreference.java
+++ /dev/null
@@ -1,83 +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.display;
-
-import android.content.Context;
-import android.hardware.display.ColorDisplayManager;
-import android.hardware.display.NightDisplayListener;
-import android.util.AttributeSet;
-
-import androidx.preference.SwitchPreference;
-
-import java.time.LocalTime;
-
-public class NightDisplayPreference extends SwitchPreference
-        implements NightDisplayListener.Callback {
-
-    private ColorDisplayManager mColorDisplayManager;
-    private NightDisplayListener mNightDisplayListener;
-    private NightDisplayTimeFormatter mTimeFormatter;
-
-    public NightDisplayPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        mColorDisplayManager = context.getSystemService(ColorDisplayManager.class);
-        mNightDisplayListener = new NightDisplayListener(context);
-        mTimeFormatter = new NightDisplayTimeFormatter(context);
-    }
-
-    @Override
-    public void onAttached() {
-        super.onAttached();
-
-        // Listen for changes only while attached.
-        mNightDisplayListener.setCallback(this);
-
-        // Update the summary since the state may have changed while not attached.
-        updateSummary();
-    }
-
-    @Override
-    public void onDetached() {
-        super.onDetached();
-
-        // Stop listening for state changes.
-        mNightDisplayListener.setCallback(null);
-    }
-
-    @Override
-    public void onActivated(boolean activated) {
-        updateSummary();
-    }
-
-    @Override
-    public void onAutoModeChanged(int autoMode) {
-        updateSummary();
-    }
-
-    @Override
-    public void onCustomStartTimeChanged(LocalTime startTime) {
-        updateSummary();
-    }
-
-    @Override
-    public void onCustomEndTimeChanged(LocalTime endTime) {
-        updateSummary();
-    }
-
-    private void updateSummary() {
-        setSummary(mTimeFormatter.getAutoModeTimeSummary(getContext(), mColorDisplayManager));
-    }
-}
diff --git a/src/com/android/settings/display/NightDisplayPreferenceController.java b/src/com/android/settings/display/NightDisplayPreferenceController.java
index 6891d65..0198007 100644
--- a/src/com/android/settings/display/NightDisplayPreferenceController.java
+++ b/src/com/android/settings/display/NightDisplayPreferenceController.java
@@ -15,18 +15,30 @@
 
 import android.content.Context;
 import android.hardware.display.ColorDisplayManager;
+import android.hardware.display.NightDisplayListener;
+
+import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.widget.PrimarySwitchPreference;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
 
-public class NightDisplayPreferenceController extends AbstractPreferenceController implements
-        PreferenceControllerMixin {
+/** A controller can control the behavior of night display setting. */
+public class NightDisplayPreferenceController extends TogglePreferenceController
+        implements NightDisplayListener.Callback, LifecycleObserver, OnStart, OnStop {
 
-    private static final String KEY_NIGHT_DISPLAY = "night_display";
+    private final ColorDisplayManager mColorDisplayManager;
+    private final NightDisplayListener mNightDisplayListener;
+    private PrimarySwitchPreference mPreference;
 
-    public NightDisplayPreferenceController(Context context) {
-        super(context);
+    public NightDisplayPreferenceController(Context context, String key) {
+        super(context, key);
+
+        mColorDisplayManager = context.getSystemService(ColorDisplayManager.class);
+        mNightDisplayListener = new NightDisplayListener(context);
     }
 
     public static boolean isSuggestionComplete(Context context) {
@@ -41,12 +53,41 @@
     }
 
     @Override
-    public boolean isAvailable() {
-        return ColorDisplayManager.isNightDisplayAvailable(mContext);
+    public void onStart() {
+        // Listen for changes only while attached.
+        mNightDisplayListener.setCallback(this);
     }
 
     @Override
-    public String getPreferenceKey() {
-        return KEY_NIGHT_DISPLAY;
+    public void onStop() {
+        // Stop listening for state changes.
+        mNightDisplayListener.setCallback(null);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return ColorDisplayManager.isNightDisplayAvailable(mContext)
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return mColorDisplayManager.isNightDisplayActivated();
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return mColorDisplayManager.setNightDisplayActivated(isChecked);
+    }
+
+    @Override
+    public void onActivated(boolean activated) {
+        updateState(mPreference);
     }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/display/NightDisplayTopIntroPreferenceController.java b/src/com/android/settings/display/NightDisplayTopIntroPreferenceController.java
new file mode 100644
index 0000000..a40044b
--- /dev/null
+++ b/src/com/android/settings/display/NightDisplayTopIntroPreferenceController.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import android.content.Context;
+import android.hardware.display.ColorDisplayManager;
+
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * NightDisplayTopIntroPreferenceController can control the visibility of night display top info
+ * preference.
+ */
+public class NightDisplayTopIntroPreferenceController extends BasePreferenceController {
+
+    public NightDisplayTopIntroPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return ColorDisplayManager.isNightDisplayAvailable(mContext)
+                ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
+    }
+}
diff --git a/src/com/android/settings/display/ScreenTimeoutPreferenceController.java b/src/com/android/settings/display/ScreenTimeoutPreferenceController.java
new file mode 100644
index 0000000..c44376c
--- /dev/null
+++ b/src/com/android/settings/display/ScreenTimeoutPreferenceController.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+
+import static com.android.settings.display.ScreenTimeoutSettings.FALLBACK_SCREEN_TIMEOUT_VALUE;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedPreference;
+
+/**
+ * The controller of {@link ScreenTimeoutSettings}.
+ */
+public class ScreenTimeoutPreferenceController extends BasePreferenceController {
+    public static String PREF_NAME = "screen_timeout";
+
+    public ScreenTimeoutPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final RestrictedLockUtils.EnforcedAdmin admin = getEnforcedAdmin();
+        if (admin != null) {
+            preference.setEnabled(false);
+            ((RestrictedPreference) preference).setDisabledByAdmin(admin);
+        }
+        preference.setSummary(getTimeoutSummary());
+    }
+
+    private CharSequence getTimeoutSummary() {
+        final long currentTimeout = getCurrentScreenTimeout();
+        final CharSequence[] timeoutEntries = mContext.getResources().getStringArray(
+                R.array.screen_timeout_entries);
+        final CharSequence[] timeoutValues = mContext.getResources().getStringArray(
+                R.array.screen_timeout_values);
+        final CharSequence description = getTimeoutDescription(
+                currentTimeout, timeoutEntries, timeoutValues);
+        return mContext.getString(R.string.screen_timeout_summary, description);
+    }
+
+    private RestrictedLockUtils.EnforcedAdmin getEnforcedAdmin() {
+        final DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class);
+        if (dpm != null) {
+            return RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
+                    mContext, UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT,
+                    UserHandle.myUserId());
+        }
+        return null;
+    }
+
+    private long getCurrentScreenTimeout() {
+        return Settings.System.getLong(mContext.getContentResolver(),
+                SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE);
+    }
+
+    private static CharSequence getTimeoutDescription(
+            long currentTimeout, CharSequence[] entries, CharSequence[] values) {
+        if (currentTimeout < 0 || entries == null || values == null
+                || values.length != entries.length) {
+            return null;
+        }
+
+        for (int i = 0; i < values.length; i++) {
+            long timeout = Long.parseLong(values[i].toString());
+            if (currentTimeout == timeout) {
+                return entries[i];
+            }
+        }
+        return null;
+    }
+}
diff --git a/src/com/android/settings/display/ScreenTimeoutSettings.java b/src/com/android/settings/display/ScreenTimeoutSettings.java
new file mode 100644
index 0000000..a90c886
--- /dev/null
+++ b/src/com/android/settings/display/ScreenTimeoutSettings.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+
+import android.app.admin.DevicePolicyManager;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Log;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.actionbar.SearchMenuController;
+import com.android.settings.support.actionbar.HelpMenuController;
+import com.android.settings.support.actionbar.HelpResourceProvider;
+import com.android.settings.widget.RadioButtonPickerFragment;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.search.SearchIndexableRaw;
+import com.android.settingslib.widget.CandidateInfo;
+import com.android.settingslib.widget.FooterPreference;
+import com.android.settingslib.widget.RadioButtonPreference;
+
+import com.google.common.annotations.VisibleForTesting;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Fragment that is used to control screen timeout.
+ */
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class ScreenTimeoutSettings extends RadioButtonPickerFragment implements
+        HelpResourceProvider {
+    private static final String TAG = "ScreenTimeout";
+    /** If there is no setting in the provider, use this. */
+    public static final int FALLBACK_SCREEN_TIMEOUT_VALUE = 30000;
+
+    private static final int DEFAULT_ORDER_OF_LOWEST_PREFERENCE = Integer.MAX_VALUE - 1;
+
+    private CharSequence[] mInitialEntries;
+    private CharSequence[] mInitialValues;
+    private FooterPreference mPrivacyPreference;
+
+    @VisibleForTesting
+    RestrictedLockUtils.EnforcedAdmin mAdmin;
+    @VisibleForTesting
+    Preference mDisableOptionsPreference;
+
+    @VisibleForTesting
+    AdaptiveSleepPermissionPreferenceController mAdaptiveSleepPermissionController;
+
+    @VisibleForTesting
+    AdaptiveSleepPreferenceController mAdaptiveSleepController;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        SearchMenuController.init(this /* host */);
+        HelpMenuController.init(this /* host */);
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        mInitialEntries = getResources().getStringArray(R.array.screen_timeout_entries);
+        mInitialValues = getResources().getStringArray(R.array.screen_timeout_values);
+        mAdaptiveSleepController = new AdaptiveSleepPreferenceController(context);
+        mAdaptiveSleepPermissionController = new AdaptiveSleepPermissionPreferenceController(
+                context);
+        mPrivacyPreference = new FooterPreference(context);
+        mPrivacyPreference.setIcon(R.drawable.ic_privacy_shield_24dp);
+        mPrivacyPreference.setTitle(R.string.adaptive_sleep_privacy);
+        mPrivacyPreference.setSelectable(false);
+        mPrivacyPreference.setLayoutResource(R.layout.preference_footer);
+
+        mDisableOptionsPreference = new FooterPreference(context);
+        mDisableOptionsPreference.setLayoutResource(R.layout.preference_footer);
+        mDisableOptionsPreference.setTitle(R.string.admin_disabled_other_options);
+        mDisableOptionsPreference.setIcon(R.drawable.ic_info_outline_24dp);
+
+        // The 'disabled by admin' preference should always be at the end of the setting page.
+        mDisableOptionsPreference.setOrder(DEFAULT_ORDER_OF_LOWEST_PREFERENCE);
+        mPrivacyPreference.setOrder(DEFAULT_ORDER_OF_LOWEST_PREFERENCE - 1);
+    }
+
+    @Override
+    protected List<? extends CandidateInfo> getCandidates() {
+        final List<CandidateInfo> candidates = new ArrayList<>();
+        final long maxTimeout = getMaxScreenTimeout(getContext());
+        if (mInitialValues != null) {
+            for (int i = 0; i < mInitialValues.length; ++i) {
+                if (Long.parseLong(mInitialValues[i].toString()) <= maxTimeout) {
+                    candidates.add(new TimeoutCandidateInfo(mInitialEntries[i],
+                            mInitialValues[i].toString(), true));
+                }
+            }
+        } else {
+            Log.e(TAG, "Screen timeout options do not exist.");
+        }
+        return candidates;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        mAdaptiveSleepPermissionController.updateVisibility();
+        mAdaptiveSleepController.updatePreference();
+    }
+
+    @Override
+    public void updateCandidates() {
+        final String defaultKey = getDefaultKey();
+        final PreferenceScreen screen = getPreferenceScreen();
+        screen.removeAll();
+
+        if (mAdmin != null) {
+            mDisableOptionsPreference.setOnPreferenceClickListener(p -> {
+                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), mAdmin);
+                return true;
+            });
+            screen.addPreference(mDisableOptionsPreference);
+        }
+
+        final List<? extends CandidateInfo> candidateList = getCandidates();
+        if (candidateList == null) {
+            return;
+        }
+
+        for (CandidateInfo info : candidateList) {
+            RadioButtonPreference pref =
+                    new RadioButtonPreference(getPrefContext());
+            bindPreference(pref, info.getKey(), info, defaultKey);
+            screen.addPreference(pref);
+        }
+
+        if (isScreenAttentionAvailable()) {
+            mAdaptiveSleepPermissionController.addToScreen(screen);
+            mAdaptiveSleepController.addToScreen(screen);
+            screen.addPreference(mPrivacyPreference);
+        }
+
+        if (mAdmin != null) {
+            mDisableOptionsPreference.setOnPreferenceClickListener(p -> {
+                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(), mAdmin);
+                return true;
+            });
+            screen.addPreference(mDisableOptionsPreference);
+        }
+    }
+
+    @Override
+    protected String getDefaultKey() {
+        return getCurrentSystemScreenTimeout(getContext());
+    }
+
+    @Override
+    protected boolean setDefaultKey(String key) {
+        setCurrentSystemScreenTimeout(getContext(), key);
+        return true;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.SCREEN_TIMEOUT;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.screen_timeout_settings;
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_adaptive_sleep;
+    }
+
+    private boolean isScreenAttentionAvailable() {
+        return getResources().getBoolean(
+                com.android.internal.R.bool.config_adaptive_sleep_available);
+    }
+
+    private Long getMaxScreenTimeout(Context context) {
+        if (context == null) {
+            return Long.MAX_VALUE;
+        }
+        final DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
+        if (dpm == null) {
+            return Long.MAX_VALUE;
+        }
+        mAdmin = RestrictedLockUtilsInternal.checkIfMaximumTimeToLockIsSet(context);
+        if (mAdmin != null) {
+            return dpm.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
+        }
+        return Long.MAX_VALUE;
+    }
+
+    private String getCurrentSystemScreenTimeout(Context context) {
+        if (context == null) {
+            return Long.toString(FALLBACK_SCREEN_TIMEOUT_VALUE);
+        } else {
+            return Long.toString(Settings.System.getLong(context.getContentResolver(),
+                    SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE));
+        }
+    }
+
+    private void setCurrentSystemScreenTimeout(Context context, String key) {
+        try {
+            if (context != null) {
+                final long value = Long.parseLong(key);
+                Settings.System.putLong(context.getContentResolver(), SCREEN_OFF_TIMEOUT, value);
+            }
+        } catch (NumberFormatException e) {
+            Log.e(TAG, "could not persist screen timeout setting", e);
+        }
+    }
+
+    private static class TimeoutCandidateInfo extends CandidateInfo {
+        private final CharSequence mLabel;
+        private final String mKey;
+
+        TimeoutCandidateInfo(CharSequence label, String key, boolean enabled) {
+            super(enabled);
+            mLabel = label;
+            mKey = key;
+        }
+
+        @Override
+        public CharSequence loadLabel() {
+            return mLabel;
+        }
+
+        @Override
+        public Drawable loadIcon() {
+            return null;
+        }
+
+        @Override
+        public String getKey() {
+            return mKey;
+        }
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.screen_timeout_settings) {
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+                    final Resources res = context.getResources();
+                    final SearchIndexableRaw data = new SearchIndexableRaw(context);
+                    data.title = res.getString(R.string.adaptive_sleep_title);
+                    data.key = AdaptiveSleepPreferenceController.PREFERENCE_KEY;
+                    data.screenTitle = res.getString(R.string.screen_timeout_title);
+                    data.keywords = res.getString(R.string.adaptive_sleep_title);
+
+                    final List<SearchIndexableRaw> result = new ArrayList<>(1);
+                    result.add(data);
+                    return result;
+                }
+            };
+}
diff --git a/src/com/android/settings/display/TimeoutPreferenceController.java b/src/com/android/settings/display/TimeoutPreferenceController.java
deleted file mode 100644
index 60b7e24..0000000
--- a/src/com/android/settings/display/TimeoutPreferenceController.java
+++ /dev/null
@@ -1,130 +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.display;
-
-import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.util.Log;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-public class TimeoutPreferenceController extends AbstractPreferenceController implements
-        PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
-
-    private static final String TAG = "TimeoutPrefContr";
-
-    /** If there is no setting in the provider, use this. */
-    public static final int FALLBACK_SCREEN_TIMEOUT_VALUE = 30000;
-
-    private final String mScreenTimeoutKey;
-
-    public TimeoutPreferenceController(Context context, String key) {
-        super(context);
-        mScreenTimeoutKey = key;
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return mScreenTimeoutKey;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final TimeoutListPreference timeoutListPreference = (TimeoutListPreference) preference;
-        final long currentTimeout = Settings.System.getLong(mContext.getContentResolver(),
-                SCREEN_OFF_TIMEOUT, FALLBACK_SCREEN_TIMEOUT_VALUE);
-        timeoutListPreference.setValue(String.valueOf(currentTimeout));
-        final DevicePolicyManager dpm =
-                (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        if (dpm != null) {
-            final RestrictedLockUtils.EnforcedAdmin admin =
-                    RestrictedLockUtilsInternal.checkIfMaximumTimeToLockIsSet(mContext);
-            final long maxTimeout =
-                    dpm.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
-            timeoutListPreference.removeUnusableTimeouts(maxTimeout, admin);
-        }
-        updateTimeoutPreferenceDescription(timeoutListPreference,
-                Long.parseLong(timeoutListPreference.getValue()));
-
-        final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(
-                mContext, UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT,
-                UserHandle.myUserId());
-        if (admin != null) {
-            timeoutListPreference.removeUnusableTimeouts(0/* disable all*/, admin);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        try {
-            int value = Integer.parseInt((String) newValue);
-            Settings.System.putInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, value);
-            updateTimeoutPreferenceDescription((TimeoutListPreference) preference, value);
-        } catch (NumberFormatException e) {
-            Log.e(TAG, "could not persist screen timeout setting", e);
-        }
-        return true;
-    }
-
-    public static CharSequence getTimeoutDescription(
-            long currentTimeout, CharSequence[] entries, CharSequence[] values) {
-        if (currentTimeout < 0 || entries == null || values == null
-                || values.length != entries.length) {
-            return null;
-        }
-
-        for (int i = 0; i < values.length; i++) {
-            long timeout = Long.parseLong(values[i].toString());
-            if (currentTimeout == timeout) {
-                return entries[i];
-            }
-        }
-        return null;
-    }
-
-    private void updateTimeoutPreferenceDescription(TimeoutListPreference preference,
-            long currentTimeout) {
-        final CharSequence[] entries = preference.getEntries();
-        final CharSequence[] values = preference.getEntryValues();
-        final String summary;
-        if (preference.isDisabledByAdmin()) {
-            summary = mContext.getString(com.android.settings.R.string.disabled_by_policy_title);
-        } else {
-            final CharSequence timeoutDescription = getTimeoutDescription(
-                    currentTimeout, entries, values);
-            summary = timeoutDescription == null
-                    ? ""
-                    : mContext.getString(R.string.screen_timeout_summary, timeoutDescription);
-        }
-        preference.setSummary(summary);
-    }
-
-}
diff --git a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
index fbaea93..cd2dd13 100644
--- a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
+++ b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java
@@ -17,9 +17,11 @@
 package com.android.settings.display;
 
 import android.content.Context;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
 
 public class TopLevelDisplayPreferenceController extends BasePreferenceController {
 
@@ -36,8 +38,13 @@
 
     @Override
     public CharSequence getSummary() {
+        // Remove homepage summaries for silky home.
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            return null;
+        }
+
         final WallpaperPreferenceController controller =
-                new WallpaperPreferenceController(mContext, "dummy_key");
+                new WallpaperPreferenceController(mContext, "unused_key");
         if (controller.isAvailable()) {
             return mContext.getText(
                     controller.areStylesAvailable()
diff --git a/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java b/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java
new file mode 100644
index 0000000..beef4f3
--- /dev/null
+++ b/src/com/android/settings/display/TopLevelWallpaperPreferenceController.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static android.os.UserManager.DISALLOW_SET_WALLPAPER;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.UserHandle;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.RestrictedTopLevelPreference;
+
+import java.util.List;
+
+/** This controller manages the wallpaper preference of the top level page. */
+public class TopLevelWallpaperPreferenceController extends BasePreferenceController {
+    private static final String TAG = "TopLevelWallpaperPreferenceController";
+    private static final String LAUNCHED_SETTINGS = "app_launched_settings";
+
+    private final String mWallpaperPackage;
+    private final String mWallpaperClass;
+    private final String mStylesAndWallpaperClass;
+    private final String mWallpaperLaunchExtra;
+
+    public TopLevelWallpaperPreferenceController(Context context, String key) {
+        super(context, key);
+        mWallpaperPackage = mContext.getString(R.string.config_wallpaper_picker_package);
+        mWallpaperClass = mContext.getString(R.string.config_wallpaper_picker_class);
+        mStylesAndWallpaperClass =
+                mContext.getString(R.string.config_styles_and_wallpaper_picker_class);
+        mWallpaperLaunchExtra = mContext.getString(R.string.config_wallpaper_picker_launch_extra);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        Preference preference = screen.findPreference(getPreferenceKey());
+        preference.setTitle(getTitle());
+    }
+
+    public String getTitle() {
+        return mContext.getString(areStylesAvailable()
+                ? R.string.style_and_wallpaper_settings_title : R.string.wallpaper_settings_title);
+    }
+
+    public ComponentName getComponentName() {
+        return new ComponentName(mWallpaperPackage, getComponentClassString());
+    }
+
+    public String getComponentClassString() {
+        return areStylesAvailable() ? mStylesAndWallpaperClass : mWallpaperClass;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if ((TextUtils.isEmpty(mWallpaperClass) && TextUtils.isEmpty(mStylesAndWallpaperClass))
+                || TextUtils.isEmpty(mWallpaperPackage)) {
+            Log.e(TAG, "No Wallpaper picker specified!");
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return canResolveWallpaperComponent(getComponentClassString())
+                ? AVAILABLE_UNSEARCHABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        disablePreferenceIfManaged((RestrictedTopLevelPreference) preference);
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (getPreferenceKey().equals(preference.getKey())) {
+            final Intent intent = new Intent().setComponent(
+                    getComponentName()).putExtra(mWallpaperLaunchExtra, LAUNCHED_SETTINGS);
+            if (areStylesAvailable()) {
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
+            preference.getContext().startActivity(intent);
+            return true;
+        }
+        return super.handlePreferenceTreeClick(preference);
+    }
+
+    /** Returns whether Styles & Wallpaper is enabled and available. */
+    public boolean areStylesAvailable() {
+        return !TextUtils.isEmpty(mStylesAndWallpaperClass)
+                && canResolveWallpaperComponent(mStylesAndWallpaperClass);
+    }
+
+    private boolean canResolveWallpaperComponent(String className) {
+        final ComponentName componentName = new ComponentName(mWallpaperPackage, className);
+        final PackageManager pm = mContext.getPackageManager();
+        final Intent intent = new Intent().setComponent(componentName);
+        final List<ResolveInfo> resolveInfos = pm.queryIntentActivities(intent, 0 /* flags */);
+        return resolveInfos != null && !resolveInfos.isEmpty();
+    }
+
+    private void disablePreferenceIfManaged(RestrictedTopLevelPreference pref) {
+        final String restriction = DISALLOW_SET_WALLPAPER;
+        if (pref != null) {
+            pref.setDisabledByAdmin(null);
+            if (RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
+                    restriction, UserHandle.myUserId())) {
+                // Do not show the admin dialog for system restriction.
+                pref.setEnabled(false);
+            } else {
+                pref.checkRestrictionAndSetDisabled(restriction);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/display/TwilightLocationPreferenceController.java b/src/com/android/settings/display/TwilightLocationPreferenceController.java
index 31845c0..af93047 100644
--- a/src/com/android/settings/display/TwilightLocationPreferenceController.java
+++ b/src/com/android/settings/display/TwilightLocationPreferenceController.java
@@ -19,7 +19,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.location.LocationManager;
-import android.view.View;
 
 import androidx.preference.PreferenceScreen;
 
@@ -28,7 +27,7 @@
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.BannerMessagePreference;
 
 /**
  * Controller to take the user to location settings page
@@ -46,14 +45,14 @@
     @Override
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
-        final LayoutPreference preference = screen.findPreference(getPreferenceKey());
-        final View button = preference.findViewById(R.id.go_to_location_setting);
-        button.setOnClickListener(v -> {
-            mMetricsFeatureProvider.logClickedPreference(preference, getMetricsCategory());
-            final Intent intent = new Intent();
-            intent.setClass(mContext, Settings.LocationSettingsActivity.class);
-            mContext.startActivity(intent);
-        });
+        final BannerMessagePreference preference =
+                (BannerMessagePreference) screen.findPreference(getPreferenceKey());
+        preference
+                .setPositiveButtonText(R.string.twilight_mode_launch_location)
+                .setPositiveButtonOnClickListener(v -> {
+                    mMetricsFeatureProvider.logClickedPreference(preference, getMetricsCategory());
+                    launchLocationSettings();
+                });
     }
 
     @Override
@@ -61,4 +60,10 @@
         return mLocationManager.isLocationEnabled() ? CONDITIONALLY_UNAVAILABLE
                 : AVAILABLE_UNSEARCHABLE;
     }
+
+    private void launchLocationSettings() {
+        final Intent intent = new Intent();
+        intent.setClass(mContext, Settings.LocationSettingsActivity.class);
+        mContext.startActivity(intent);
+    }
 }
diff --git a/src/com/android/settings/display/WallpaperPreferenceController.java b/src/com/android/settings/display/WallpaperPreferenceController.java
index b6af9bc..00687b2 100644
--- a/src/com/android/settings/display/WallpaperPreferenceController.java
+++ b/src/com/android/settings/display/WallpaperPreferenceController.java
@@ -36,10 +36,12 @@
 
 public class WallpaperPreferenceController extends BasePreferenceController {
     private static final String TAG = "WallpaperPrefController";
+    private static final String LAUNCHED_SETTINGS = "app_launched_settings";
 
     private final String mWallpaperPackage;
     private final String mWallpaperClass;
     private final String mStylesAndWallpaperClass;
+    private final String mWallpaperLaunchExtra;
 
     public WallpaperPreferenceController(Context context, String key) {
         super(context, key);
@@ -47,6 +49,7 @@
         mWallpaperClass = mContext.getString(R.string.config_wallpaper_picker_class);
         mStylesAndWallpaperClass =
                 mContext.getString(R.string.config_styles_and_wallpaper_picker_class);
+        mWallpaperLaunchExtra = mContext.getString(R.string.config_wallpaper_picker_launch_extra);
     }
 
     @Override
@@ -62,8 +65,11 @@
     }
 
     public ComponentName getComponentName() {
-        return new ComponentName(mWallpaperPackage,
-                areStylesAvailable() ? mStylesAndWallpaperClass : mWallpaperClass);
+        return new ComponentName(mWallpaperPackage, getComponentClassString());
+    }
+
+    public String getComponentClassString() {
+        return areStylesAvailable() ? mStylesAndWallpaperClass : mWallpaperClass;
     }
 
     public String getKeywords() {
@@ -76,11 +82,12 @@
 
     @Override
     public int getAvailabilityStatus() {
-        if (TextUtils.isEmpty(mWallpaperPackage) || TextUtils.isEmpty(mWallpaperClass)) {
+        if ((TextUtils.isEmpty(mWallpaperClass) && TextUtils.isEmpty(mStylesAndWallpaperClass))
+                || TextUtils.isEmpty(mWallpaperPackage)) {
             Log.e(TAG, "No Wallpaper picker specified!");
             return UNSUPPORTED_ON_DEVICE;
         }
-        return canResolveWallpaperComponent(mWallpaperClass)
+        return canResolveWallpaperComponent(getComponentClassString())
                 ? AVAILABLE_UNSEARCHABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
@@ -92,7 +99,12 @@
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (getPreferenceKey().equals(preference.getKey())) {
-            preference.getContext().startActivity(new Intent().setComponent(getComponentName()));
+            final Intent intent = new Intent().setComponent(
+                getComponentName()).putExtra(mWallpaperLaunchExtra, LAUNCHED_SETTINGS);
+            if (areStylesAvailable()) {
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            }
+            preference.getContext().startActivity(intent);
             return true;
         }
         return super.handlePreferenceTreeClick(preference);
diff --git a/src/com/android/settings/display/darkmode/DarkModePreference.java b/src/com/android/settings/display/darkmode/DarkModePreference.java
index 7fb8023..baaa1f7 100644
--- a/src/com/android/settings/display/darkmode/DarkModePreference.java
+++ b/src/com/android/settings/display/darkmode/DarkModePreference.java
@@ -19,14 +19,16 @@
 import android.content.res.Configuration;
 import android.os.PowerManager;
 import android.util.AttributeSet;
+
 import com.android.settings.R;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 
 import java.time.LocalTime;
 
 /**
- * component for the display settings dark ui summary*/
-public class DarkModePreference extends MasterSwitchPreference {
+ * component for the display settings dark ui summary
+ */
+public class DarkModePreference extends PrimarySwitchPreference {
 
     private UiModeManager mUiModeManager;
     private DarkModeObserver mDarkModeObserver;
diff --git a/src/com/android/settings/display/darkmode/TimeFormatter.java b/src/com/android/settings/display/darkmode/TimeFormatter.java
index 1032fe1..32ff026 100644
--- a/src/com/android/settings/display/darkmode/TimeFormatter.java
+++ b/src/com/android/settings/display/darkmode/TimeFormatter.java
@@ -18,26 +18,29 @@
 import android.content.Context;
 
 import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
-import java.util.Locale;
+import java.util.Calendar;
+import java.util.TimeZone;
 
 /**
  * Formats LocalTime to the locale time string format
 */
 public class TimeFormatter {
     private final Context mContext;
-    private final DateTimeFormatter mFormatter;
+    private final java.text.DateFormat mFormatter;
     public TimeFormatter(Context context) {
         mContext = context;
-        Locale locale = mContext.getResources().getConfiguration().locale;
-        if (locale == null) {
-            locale = Locale.getDefault();
-        }
-        mFormatter = DateTimeFormatter.ofPattern("hh:mm a", locale);
+        mFormatter = android.text.format.DateFormat.getTimeFormat(context);
+        mFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 
     public String of(LocalTime time) {
-        return mFormatter.format(time);
+        final Calendar c = Calendar.getInstance();
+        c.setTimeZone(mFormatter.getTimeZone());
+        c.set(Calendar.HOUR_OF_DAY, time.getHour());
+        c.set(Calendar.MINUTE, time.getMinute());
+        c.set(Calendar.SECOND, 0);
+        c.set(Calendar.MILLISECOND, 0);
+        return mFormatter.format(c.getTime());
     }
 
     public boolean is24HourFormat() {
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
index 46f9b71..62f15b9 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProvider.java
@@ -137,4 +137,10 @@
      * info" page. Returns {@code true} if the activity has indeed been launched.
      */
     boolean showWorkPolicyInfo();
+
+    /**
+     * Launches the parental controls settings page. Returns {@code true} if the activity has
+     * been launched.
+     */
+    boolean showParentalControls();
 }
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 429c537..7a5b489 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -40,6 +40,9 @@
 
 public class EnterprisePrivacyFeatureProviderImpl implements EnterprisePrivacyFeatureProvider {
 
+    public static final String ACTION_PARENTAL_CONTROLS =
+            "android.settings.SHOW_PARENTAL_CONTROLS";
+
     private final Context mContext;
     private final DevicePolicyManager mDpm;
     private final PackageManager mPm;
@@ -246,6 +249,34 @@
         return false;
     }
 
+    @Override
+    public boolean showParentalControls() {
+        Intent intent = getParentalControlsIntent();
+        if (intent != null) {
+            mContext.startActivity(intent);
+            return true;
+        }
+
+        return false;
+    }
+
+    private Intent getParentalControlsIntent() {
+        final ComponentName componentName =
+                mDpm.getProfileOwnerOrDeviceOwnerSupervisionComponent(new UserHandle(MY_USER_ID));
+        if (componentName == null) {
+            return null;
+        }
+
+        final Intent intent = new Intent(ACTION_PARENTAL_CONTROLS)
+                .setPackage(componentName.getPackageName())
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        final List<ResolveInfo> activities = mPm.queryIntentActivitiesAsUser(intent, 0, MY_USER_ID);
+        if (activities.size() != 0) {
+            return intent;
+        }
+        return null;
+    }
+
     private ComponentName getDeviceOwnerComponent() {
         if (!mPm.hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN)) {
             return null;
diff --git a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
index 4a5ce7d..fad3456 100644
--- a/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceController.java
@@ -33,7 +33,7 @@
 import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 /**
  * Controller to control whether an app can run in the background
@@ -54,18 +54,18 @@
     BatteryUtils mBatteryUtils;
     private InstrumentedPreferenceFragment mFragment;
     private String mTargetPackage;
-    private PowerWhitelistBackend mPowerWhitelistBackend;
+    private PowerAllowlistBackend mPowerAllowlistBackend;
 
     public BackgroundActivityPreferenceController(Context context,
             InstrumentedPreferenceFragment fragment, int uid, String packageName) {
-        this(context, fragment, uid, packageName, PowerWhitelistBackend.getInstance(context));
+        this(context, fragment, uid, packageName, PowerAllowlistBackend.getInstance(context));
     }
 
     @VisibleForTesting
     BackgroundActivityPreferenceController(Context context, InstrumentedPreferenceFragment fragment,
-            int uid, String packageName, PowerWhitelistBackend backend) {
+            int uid, String packageName, PowerAllowlistBackend backend) {
         super(context);
-        mPowerWhitelistBackend = backend;
+        mPowerAllowlistBackend = backend;
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         mDpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
@@ -84,8 +84,8 @@
         }
         final int mode = mAppOpsManager
                 .checkOpNoThrow(AppOpsManager.OP_RUN_ANY_IN_BACKGROUND, mUid, mTargetPackage);
-        final boolean whitelisted = mPowerWhitelistBackend.isWhitelisted(mTargetPackage);
-        if (whitelisted || mode == AppOpsManager.MODE_ERRORED
+        final boolean allowlisted = mPowerAllowlistBackend.isAllowlisted(mTargetPackage);
+        if (allowlisted || mode == AppOpsManager.MODE_ERRORED
                 || Utils.isProfileOrDeviceOwner(mUserManager, mDpm, mTargetPackage)) {
             preference.setEnabled(false);
         } else {
@@ -117,8 +117,8 @@
     }
 
     public void updateSummary(Preference preference) {
-        if (mPowerWhitelistBackend.isWhitelisted(mTargetPackage)) {
-            preference.setSummary(R.string.background_activity_summary_whitelisted);
+        if (mPowerAllowlistBackend.isAllowlisted(mTargetPackage)) {
+            preference.setSummary(R.string.background_activity_summary_allowlisted);
             return;
         }
         final int mode = mAppOpsManager
diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
index 4667e16..8d7bcd9 100644
--- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java
@@ -391,11 +391,11 @@
     }
 
     private boolean shouldShowSummary(BatterySipper sipper) {
-        final CharSequence[] whitelistPackages = mContext.getResources()
-                .getTextArray(R.array.whitelist_hide_summary_in_battery_usage);
+        final CharSequence[] allowlistPackages = mContext.getResources()
+                .getTextArray(R.array.allowlist_hide_summary_in_battery_usage);
         final String target = sipper.packageWithHighestDrain;
 
-        for (CharSequence packageName: whitelistPackages) {
+        for (CharSequence packageName: allowlistPackages) {
             if (TextUtils.equals(target, packageName)) {
                 return false;
             }
diff --git a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
index 99510a2..71e65bf 100644
--- a/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
+++ b/src/com/android/settings/fuelgauge/BatteryBroadcastReceiver.java
@@ -20,7 +20,9 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.os.BatteryManager;
 import android.os.PowerManager;
+import android.util.Log;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.VisibleForTesting;
@@ -38,15 +40,18 @@
  * 1. Battery level(e.g. 100%->99%)
  * 2. Battery status(e.g. plugged->unplugged)
  * 3. Battery saver(e.g. off->on)
+ * 4. Battery health(e.g. good->overheat)
  */
 public class BatteryBroadcastReceiver extends BroadcastReceiver {
 
+    private static final String TAG = "BatteryBroadcastRcvr";
     /**
      * Callback when the following has been changed:
      *
      * Battery level(e.g. 100%->99%)
      * Battery status(e.g. plugged->unplugged)
      * Battery saver(e.g. off->on)
+     * Battery health(e.g. good->overheat)
      */
     public interface OnBatteryChangedListener {
         void onBatteryChanged(@BatteryUpdateType int type);
@@ -56,18 +61,24 @@
     @IntDef({BatteryUpdateType.MANUAL,
             BatteryUpdateType.BATTERY_LEVEL,
             BatteryUpdateType.BATTERY_SAVER,
-            BatteryUpdateType.BATTERY_STATUS})
+            BatteryUpdateType.BATTERY_STATUS,
+            BatteryUpdateType.BATTERY_HEALTH,
+            BatteryUpdateType.BATTERY_NOT_PRESENT})
     public @interface BatteryUpdateType {
         int MANUAL = 0;
         int BATTERY_LEVEL = 1;
         int BATTERY_SAVER = 2;
         int BATTERY_STATUS = 3;
+        int BATTERY_HEALTH = 4;
+        int BATTERY_NOT_PRESENT = 5;
     }
 
     @VisibleForTesting
     String mBatteryLevel;
     @VisibleForTesting
     String mBatteryStatus;
+    @VisibleForTesting
+    int mBatteryHealth;
     private OnBatteryChangedListener mBatteryListener;
     private Context mContext;
 
@@ -101,10 +112,16 @@
         if (intent != null && mBatteryListener != null) {
             if (Intent.ACTION_BATTERY_CHANGED.equals(intent.getAction())) {
                 final String batteryLevel = Utils.getBatteryPercentage(intent);
-                final String batteryStatus = Utils.getBatteryStatus(
-                        mContext, intent);
-                if (forceUpdate) {
+                final String batteryStatus = Utils.getBatteryStatus(mContext, intent);
+                final int batteryHealth = intent.getIntExtra(
+                        BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_UNKNOWN);
+                if (!Utils.isBatteryPresent(intent)) {
+                    Log.w(TAG, "Problem reading the battery meter.");
+                    mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_NOT_PRESENT);
+                } else if (forceUpdate) {
                     mBatteryListener.onBatteryChanged(BatteryUpdateType.MANUAL);
+                } else if (batteryHealth != mBatteryHealth) {
+                    mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_HEALTH);
                 } else if(!batteryLevel.equals(mBatteryLevel)) {
                     mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_LEVEL);
                 } else if (!batteryStatus.equals(mBatteryStatus)) {
@@ -112,6 +129,7 @@
                 }
                 mBatteryLevel = batteryLevel;
                 mBatteryStatus = batteryStatus;
+                mBatteryHealth = batteryHealth;
             } else if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGED.equals(intent.getAction())) {
                 mBatteryListener.onBatteryChanged(BatteryUpdateType.BATTERY_SAVER);
             }
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index bfa43d1..11d7564 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -25,6 +25,10 @@
 import android.os.BatteryManager;
 import android.os.PowerManager;
 import android.text.TextUtils;
+import android.text.method.LinkMovementMethod;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.VisibleForTesting;
@@ -34,7 +38,10 @@
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.utils.AnnotationSpan;
 import com.android.settings.widget.EntityHeaderController;
+import com.android.settingslib.HelpUtils;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
@@ -45,11 +52,15 @@
  * Controller that update the battery header view
  */
 public class BatteryHeaderPreferenceController extends BasePreferenceController
-        implements PreferenceControllerMixin, LifecycleObserver, OnStart {
+        implements PreferenceControllerMixin, LifecycleObserver, OnStart,
+        BatteryPreferenceController {
     @VisibleForTesting
     static final String KEY_BATTERY_HEADER = "battery_header";
+    private static final String ANNOTATION_URL = "url";
 
     @VisibleForTesting
+    BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
+    @VisibleForTesting
     BatteryMeterView mBatteryMeterView;
     @VisibleForTesting
     TextView mBatteryPercentText;
@@ -66,6 +77,8 @@
     public BatteryHeaderPreferenceController(Context context, String key) {
         super(context, key);
         mPowerManager = context.getSystemService(PowerManager.class);
+        mBatteryStatusFeatureProvider = FeatureFactory.getFactory(context)
+                .getBatteryStatusFeatureProvider(context);
     }
 
     public void setActivity(Activity activity) {
@@ -89,7 +102,11 @@
         mBatteryPercentText = mBatteryLayoutPref.findViewById(R.id.battery_percent);
         mSummary1 = mBatteryLayoutPref.findViewById(R.id.summary1);
 
-        quickUpdateHeaderPreference();
+        if (com.android.settings.Utils.isBatteryPresent(mContext)) {
+            quickUpdateHeaderPreference();
+        } else {
+            showHelpMessage();
+        }
     }
 
     @Override
@@ -105,12 +122,20 @@
                 .styleActionBar(mActivity);
     }
 
+    private CharSequence generateLabel(BatteryInfo info) {
+        if (BatteryUtils.isBatteryDefenderOn(info)) {
+            return null;
+        } else if (info.remainingLabel == null) {
+            return info.statusLabel;
+        } else {
+            return info.remainingLabel;
+        }
+    }
+
     public void updateHeaderPreference(BatteryInfo info) {
         mBatteryPercentText.setText(formatBatteryPercentageText(info.batteryLevel));
-        if (info.remainingLabel == null) {
-            mSummary1.setText(info.statusLabel);
-        } else {
-            mSummary1.setText(info.remainingLabel);
+        if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
+            mSummary1.setText(generateLabel(info));
         }
 
         mBatteryMeterView.setBatteryLevel(info.batteryLevel);
@@ -118,6 +143,13 @@
         mBatteryMeterView.setPowerSave(mPowerManager.isPowerSaveMode());
     }
 
+    /**
+     * Callback which receives text for the summary line.
+     */
+    public void updateBatteryStatus(String label, BatteryInfo info) {
+        mSummary1.setText(label != null ? label : generateLabel(info));
+    }
+
     public void quickUpdateHeaderPreference() {
         Intent batteryBroadcast = mContext.registerReceiver(null,
                 new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
@@ -132,6 +164,32 @@
         mBatteryPercentText.setText(formatBatteryPercentageText(batteryLevel));
     }
 
+    @VisibleForTesting
+    void showHelpMessage() {
+        final LinearLayout batteryInfoLayout =
+                mBatteryLayoutPref.findViewById(R.id.battery_info_layout);
+        // Remove battery meter icon
+        mBatteryMeterView.setVisibility(View.GONE);
+        // Update the width of battery info layout
+        final ViewGroup.LayoutParams params = batteryInfoLayout.getLayoutParams();
+        params.width = LinearLayout.LayoutParams.WRAP_CONTENT;
+        batteryInfoLayout.setLayoutParams(params);
+        mBatteryPercentText.setText(mContext.getText(R.string.unknown));
+        // Add linkable text for learn more
+        final Intent helpIntent = HelpUtils.getHelpIntent(mContext,
+                mContext.getString(R.string.help_url_battery_missing),
+                mContext.getClass().getName());
+        final AnnotationSpan.LinkInfo linkInfo = new AnnotationSpan
+                .LinkInfo(mContext, ANNOTATION_URL, helpIntent);
+        if (linkInfo.isActionable()) {
+            mSummary1.setMovementMethod(LinkMovementMethod.getInstance());
+            mSummary1.setText(AnnotationSpan
+                    .linkify(mContext.getText(R.string.battery_missing_help_message), linkInfo));
+        } else {
+            mSummary1.setText(mContext.getText(R.string.battery_missing_message));
+        }
+    }
+
     private CharSequence formatBatteryPercentageText(int batteryLevel) {
         return TextUtils.expandTemplate(mContext.getText(R.string.battery_header_title_alternate),
                 NumberFormat.getIntegerInstance().format(batteryLevel));
diff --git a/src/com/android/settings/fuelgauge/BatteryInfo.java b/src/com/android/settings/fuelgauge/BatteryInfo.java
index 1935c35..5d7b325 100644
--- a/src/com/android/settings/fuelgauge/BatteryInfo.java
+++ b/src/com/android/settings/fuelgauge/BatteryInfo.java
@@ -45,6 +45,7 @@
     public CharSequence remainingLabel;
     public int batteryLevel;
     public boolean discharging = true;
+    public boolean isOverheated;
     public long remainingTimeUs = 0;
     public long averageTimeToDischarge = EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN;
     public String batteryPercentString;
@@ -232,6 +233,9 @@
         info.batteryPercentString = Utils.formatPercentage(info.batteryLevel);
         info.mCharging = batteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) != 0;
         info.averageTimeToDischarge = estimate.getAverageDischargeTime();
+        info.isOverheated = batteryBroadcast.getIntExtra(
+                BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_UNKNOWN)
+                == BatteryManager.BATTERY_HEALTH_OVERHEAT;
 
         info.statusLabel = Utils.getBatteryStatus(context, batteryBroadcast);
         if (!info.mCharging) {
@@ -251,7 +255,12 @@
                 BatteryManager.BATTERY_STATUS_UNKNOWN);
         info.discharging = false;
         info.suggestionLabel = null;
-        if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
+        if (info.isOverheated && status != BatteryManager.BATTERY_STATUS_FULL) {
+            info.remainingLabel = null;
+            int chargingLimitedResId = R.string.power_charging_limited;
+            info.chargeLabel =
+                context.getString(chargingLimitedResId, info.batteryPercentString);
+        } else if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
             info.remainingTimeUs = chargeTime;
             CharSequence timeString = StringUtil.formatElapsedTime(context,
                     PowerUtil.convertUsToMs(info.remainingTimeUs), false /* withSeconds */);
diff --git a/src/com/android/settings/fuelgauge/BatteryMeterView.java b/src/com/android/settings/fuelgauge/BatteryMeterView.java
index d54f5a4..4a0dc1d 100644
--- a/src/com/android/settings/fuelgauge/BatteryMeterView.java
+++ b/src/com/android/settings/fuelgauge/BatteryMeterView.java
@@ -19,8 +19,6 @@
 import android.annotation.Nullable;
 import android.content.Context;
 import android.graphics.ColorFilter;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
@@ -52,14 +50,12 @@
         super(context, attrs, defStyleAttr);
 
         final int frameColor = context.getColor(R.color.meter_background_color);
-        mAccentColorFilter = new PorterDuffColorFilter(
-                Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent),
-                PorterDuff.Mode.SRC);
-        mErrorColorFilter = new PorterDuffColorFilter(
-                context.getColor(R.color.battery_icon_color_error), PorterDuff.Mode.SRC_IN);
-        mForegroundColorFilter =new PorterDuffColorFilter(
-                Utils.getColorAttrDefaultColor(context, android.R.attr.colorForeground),
-                PorterDuff.Mode.SRC);
+        mAccentColorFilter = Utils.getAlphaInvariantColorFilterForColor(
+                Utils.getColorAttrDefaultColor(context, android.R.attr.colorAccent));
+        mErrorColorFilter = Utils.getAlphaInvariantColorFilterForColor(
+                context.getColor(R.color.battery_icon_color_error));
+        mForegroundColorFilter = Utils.getAlphaInvariantColorFilterForColor(
+                Utils.getColorAttrDefaultColor(context, android.R.attr.colorForeground));
         mDrawable = new BatteryMeterDrawable(context, frameColor);
         mDrawable.setColorFilter(mAccentColorFilter);
         setImageDrawable(mDrawable);
diff --git a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
index 7e00307..7c041e9 100644
--- a/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
@@ -27,7 +27,7 @@
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 /**
  * Controller that jumps to high power optimization fragment
@@ -38,7 +38,7 @@
     private static final String KEY_BACKGROUND_ACTIVITY = "battery_optimization";
 
 
-    private PowerWhitelistBackend mBackend;
+    private PowerAllowlistBackend mBackend;
     private DashboardFragment mFragment;
     private SettingsActivity mSettingsActivity;
     private String mPackageName;
@@ -49,12 +49,12 @@
         mFragment = fragment;
         mSettingsActivity = settingsActivity;
         mPackageName = packageName;
-        mBackend = PowerWhitelistBackend.getInstance(mSettingsActivity);
+        mBackend = PowerAllowlistBackend.getInstance(mSettingsActivity);
     }
 
     @VisibleForTesting
     BatteryOptimizationPreferenceController(SettingsActivity settingsActivity,
-            DashboardFragment fragment, String packageName, PowerWhitelistBackend backend) {
+            DashboardFragment fragment, String packageName, PowerAllowlistBackend backend) {
         super(settingsActivity);
         mFragment = fragment;
         mSettingsActivity = settingsActivity;
@@ -69,8 +69,8 @@
 
     @Override
     public void updateState(Preference preference) {
-        final boolean isWhitelisted = mBackend.isWhitelisted(mPackageName);
-        preference.setSummary(isWhitelisted ? R.string.high_power_on : R.string.high_power_off);
+        final boolean isAllowlisted = mBackend.isAllowlisted(mPackageName);
+        preference.setSummary(isAllowlisted ? R.string.high_power_on : R.string.high_power_off);
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/BatteryPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryPreferenceController.java
new file mode 100644
index 0000000..badf5c8
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryPreferenceController.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2020 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;
+
+/**
+ * Common interface for a preference controller that updates battery status
+ */
+public interface BatteryPreferenceController {
+
+    /**
+     * Updates the label for the preference controller. If the label is null, the
+     * implementation should revert back to the original label based on the
+     * battery info.
+     */
+    void updateBatteryStatus(String label, BatteryInfo info);
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
new file mode 100644
index 0000000..46f00c7
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProvider.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2020 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;
+
+/**
+ * Feature Provider used to retrieve battery status
+ */
+public interface BatteryStatusFeatureProvider {
+
+    /**
+     * Trigger a battery status update; return false if built-in status should be used.
+     */
+    boolean triggerBatteryStatusUpdate(
+            BatteryPreferenceController controller, BatteryInfo info);
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
new file mode 100644
index 0000000..dc4b5db
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/BatteryStatusFeatureProviderImpl.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2020 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;
+
+import android.content.Context;
+
+/**
+ * Used to override battery status string in Battery Header.
+ */
+public class BatteryStatusFeatureProviderImpl implements BatteryStatusFeatureProvider {
+
+    protected Context mContext;
+
+    public BatteryStatusFeatureProviderImpl(Context context) {
+        mContext = context.getApplicationContext();
+    }
+
+    @Override
+    public boolean triggerBatteryStatusUpdate(
+            BatteryPreferenceController controller, BatteryInfo info) {
+        return false;
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index 03387f9..5b1f096 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -50,7 +50,7 @@
 import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.fuelgauge.Estimate;
 import com.android.settingslib.fuelgauge.EstimateKt;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 import com.android.settingslib.utils.PowerUtil;
 import com.android.settingslib.utils.ThreadUtils;
 
@@ -404,6 +404,13 @@
     }
 
     /**
+     * Return {@code true} if battery is overheated and charging.
+     */
+    public static boolean isBatteryDefenderOn(BatteryInfo batteryInfo) {
+        return batteryInfo.isOverheated && !batteryInfo.discharging;
+    }
+
+    /**
      * Find package uid from package name
      *
      * @param packageName used to find the uid
@@ -578,7 +585,7 @@
     /**
      * Return {@code true} if we should hide anomaly app represented by {@code uid}
      */
-    public boolean shouldHideAnomaly(PowerWhitelistBackend powerWhitelistBackend, int uid,
+    public boolean shouldHideAnomaly(PowerAllowlistBackend powerAllowlistBackend, int uid,
             AnomalyInfo anomalyInfo) {
         final String[] packageNames = mPackageManager.getPackagesForUid(uid);
         if (ArrayUtils.isEmpty(packageNames)) {
@@ -586,7 +593,7 @@
             return true;
         }
 
-        return isSystemUid(uid) || powerWhitelistBackend.isWhitelisted(packageNames)
+        return isSystemUid(uid) || powerAllowlistBackend.isAllowlisted(packageNames)
                 || (isSystemApp(mPackageManager, packageNames) && !hasLauncherEntry(packageNames))
                 || (isExcessiveBackgroundAnomaly(anomalyInfo) && !isPreOApp(packageNames));
     }
diff --git a/src/com/android/settings/fuelgauge/FakeUid.java b/src/com/android/settings/fuelgauge/FakeUid.java
index 0e5fde1..309f259 100644
--- a/src/com/android/settings/fuelgauge/FakeUid.java
+++ b/src/com/android/settings/fuelgauge/FakeUid.java
@@ -356,6 +356,11 @@
     }
 
     @Override
+    public long getScreenOnEnergy() {
+        return 0;
+    }
+
+    @Override
     public long getMobileRadioApWakeupCount(int which) {
         return 0;
     }
@@ -389,4 +394,9 @@
     public long[] getScreenOffCpuFreqTimes(int procState, int which) {
         return null;
     }
+
+    @Override
+    public double getProportionalSystemServiceUsage() {
+        return 0;
+    }
 }
diff --git a/src/com/android/settings/fuelgauge/HighPowerDetail.java b/src/com/android/settings/fuelgauge/HighPowerDetail.java
index 6448d9a..4ddbf8d 100644
--- a/src/com/android/settings/fuelgauge/HighPowerDetail.java
+++ b/src/com/android/settings/fuelgauge/HighPowerDetail.java
@@ -38,7 +38,7 @@
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.applications.ApplicationsState.AppEntry;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 public class HighPowerDetail extends InstrumentedDialogFragment implements OnClickListener,
         View.OnClickListener {
@@ -46,7 +46,7 @@
     private static final String ARG_DEFAULT_ON = "default_on";
 
     @VisibleForTesting
-    PowerWhitelistBackend mBackend;
+    PowerAllowlistBackend mBackend;
     @VisibleForTesting
     BatteryUtils mBatteryUtils;
     @VisibleForTesting
@@ -70,7 +70,7 @@
         super.onCreate(savedInstanceState);
         final Context context = getContext();
         mBatteryUtils = BatteryUtils.getInstance(context);
-        mBackend = PowerWhitelistBackend.getInstance(context);
+        mBackend = PowerAllowlistBackend.getInstance(context);
 
         mPackageName = getArguments().getString(AppInfoBase.ARG_PACKAGE_NAME);
         mPackageUid = getArguments().getInt(AppInfoBase.ARG_PACKAGE_UID);
@@ -81,7 +81,7 @@
             mLabel = mPackageName;
         }
         mDefaultOn = getArguments().getBoolean(ARG_DEFAULT_ON);
-        mIsEnabled = mDefaultOn || mBackend.isWhitelisted(mPackageName);
+        mIsEnabled = mDefaultOn || mBackend.isAllowlisted(mPackageName);
     }
 
     public Checkable setup(View view, boolean on) {
@@ -91,7 +91,7 @@
                 ? R.string.ignore_optimizations_on_desc : R.string.ignore_optimizations_off_desc);
         view.setClickable(true);
         view.setOnClickListener(this);
-        if (!on && mBackend.isSysWhitelisted(mPackageName)) {
+        if (!on && mBackend.isSysAllowlisted(mPackageName)) {
             view.setEnabled(false);
         }
         return (Checkable) view;
@@ -103,7 +103,7 @@
                 .setTitle(mLabel)
                 .setNegativeButton(R.string.cancel, null)
                 .setView(R.layout.ignore_optimizations_content);
-        if (!mBackend.isSysWhitelisted(mPackageName)) {
+        if (!mBackend.isSysAllowlisted(mPackageName)) {
             b.setPositiveButton(R.string.done, this);
         }
         return b.create();
@@ -137,7 +137,7 @@
     public void onClick(DialogInterface dialog, int which) {
         if (which == DialogInterface.BUTTON_POSITIVE) {
             boolean newValue = mIsEnabled;
-            boolean oldValue = mBackend.isWhitelisted(mPackageName);
+            boolean oldValue = mBackend.isAllowlisted(mPackageName);
             if (newValue != oldValue) {
                 logSpecialPermissionChange(newValue, mPackageName, getContext());
                 if (newValue) {
@@ -152,8 +152,8 @@
     }
 
     @VisibleForTesting
-    static void logSpecialPermissionChange(boolean whitelist, String packageName, Context context) {
-        int logCategory = whitelist ? SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_DENY
+    static void logSpecialPermissionChange(boolean allowlist, String packageName, Context context) {
+        int logCategory = allowlist ? SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_DENY
                 : SettingsEnums.APP_SPECIAL_PERMISSION_BATTERY_ALLOW;
         FeatureFactory.getFactory(context).getMetricsFeatureProvider().action(context, logCategory,
                 packageName);
@@ -173,16 +173,16 @@
     }
 
     public static CharSequence getSummary(Context context, String pkg) {
-        return getSummary(context, PowerWhitelistBackend.getInstance(context), pkg);
+        return getSummary(context, PowerAllowlistBackend.getInstance(context), pkg);
     }
 
     @VisibleForTesting
-    static CharSequence getSummary(Context context, PowerWhitelistBackend powerWhitelist,
+    static CharSequence getSummary(Context context, PowerAllowlistBackend powerAllowlist,
             String pkg) {
         return context.getString(
-                powerWhitelist.isSysWhitelisted(pkg) || powerWhitelist.isDefaultActiveApp(pkg)
+                powerAllowlist.isSysAllowlisted(pkg) || powerAllowlist.isDefaultActiveApp(pkg)
                         ? R.string.high_power_system
-                        : powerWhitelist.isWhitelisted(pkg)
+                        : powerAllowlist.isAllowlisted(pkg)
                                 ? R.string.high_power_on
                                 : R.string.high_power_off);
     }
diff --git a/src/com/android/settings/fuelgauge/InactiveApps.java b/src/com/android/settings/fuelgauge/InactiveApps.java
index aaee2b3..36a9734 100644
--- a/src/com/android/settings/fuelgauge/InactiveApps.java
+++ b/src/com/android/settings/fuelgauge/InactiveApps.java
@@ -77,7 +77,7 @@
         super.onCreate(icicle);
 
         mUsageStats = getActivity().getSystemService(UsageStatsManager.class);
-        addPreferencesFromResource(R.xml.dummy_preference_screen);
+        addPreferencesFromResource(R.xml.placeholder_preference_screen);
         getActivity().setTitle(R.string.inactive_apps_title);
     }
 
diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java
index 98b62d9..3a5ed6c 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageBase.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java
@@ -44,6 +44,7 @@
     protected BatteryStatsHelper mStatsHelper;
     protected UserManager mUm;
     private BatteryBroadcastReceiver mBatteryBroadcastReceiver;
+    protected boolean mIsBatteryPresent = true;
 
     @Override
     public void onAttach(Activity activity) {
@@ -60,6 +61,9 @@
 
         mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(getContext());
         mBatteryBroadcastReceiver.setBatteryChangedListener(type -> {
+            if (type == BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_NOT_PRESENT) {
+                mIsBatteryPresent = false;
+            }
             restartBatteryStatsLoader(type);
         });
     }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 3a5f0ba..57949db 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -56,8 +56,8 @@
 import java.util.List;
 
 /**
- * Displays a list of apps and subsystems that consume power, ordered by how much power was
- * consumed since the last time it was unplugged.
+ * Displays a list of apps and subsystems that consume power, ordered by how much power was consumed
+ * since the last time it was unplugged.
  */
 @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
 public class PowerUsageSummary extends PowerUsageBase implements OnLongClickListener,
@@ -220,7 +220,9 @@
                 KEY_TIME_SINCE_LAST_FULL_CHARGE);
         mBatteryUtils = BatteryUtils.getInstance(getContext());
 
-        restartBatteryInfoLoader();
+        if (Utils.isBatteryPresent(getContext())) {
+            restartBatteryInfoLoader();
+        }
         mBatteryTipPreferenceController.restoreInstanceState(icicle);
         updateBatteryTipFlag(icicle);
     }
@@ -287,6 +289,10 @@
         if (context == null) {
             return;
         }
+        // Skip refreshing UI if battery is not present.
+        if (!mIsBatteryPresent) {
+            return;
+        }
 
         // Skip BatteryTipLoader if device is rotated or only battery level change
         if (mNeedUpdateBatteryTip
@@ -295,7 +301,6 @@
         } else {
             mNeedUpdateBatteryTip = true;
         }
-
         // reload BatteryInfo and updateUI
         restartBatteryInfoLoader();
         updateLastFullChargePreference();
@@ -354,6 +359,10 @@
         if (getContext() == null) {
             return;
         }
+        // Skip restartBatteryInfoLoader if battery is not present.
+        if (!mIsBatteryPresent) {
+            return;
+        }
         getLoaderManager().restartLoader(BATTERY_INFO_LOADER, Bundle.EMPTY,
                 mBatteryInfoLoaderCallbacks);
         if (mPowerFeatureProvider.isEstimateDebugEnabled()) {
@@ -378,7 +387,10 @@
     @Override
     protected void restartBatteryStatsLoader(@BatteryUpdateType int refreshType) {
         super.restartBatteryStatsLoader(refreshType);
-        mBatteryHeaderPreferenceController.quickUpdateHeaderPreference();
+        // Update battery header if battery is present.
+        if (mIsBatteryPresent) {
+            mBatteryHeaderPreferenceController.quickUpdateHeaderPreference();
+        }
     }
 
     @Override
@@ -392,7 +404,6 @@
         restartBatteryTipLoader();
     }
 
-
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.power_usage_summary);
 }
diff --git a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
index 27bd889..c06a4ff 100644
--- a/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
+++ b/src/com/android/settings/fuelgauge/RequestIgnoreBatteryOptimizations.java
@@ -22,10 +22,8 @@
 import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.IDeviceIdleController;
 import android.os.PowerManager;
-import android.os.RemoteException;
-import android.os.ServiceManager;
+import android.os.PowerWhitelistManager;
 import android.util.Log;
 
 import com.android.internal.app.AlertActivity;
@@ -36,17 +34,14 @@
         DialogInterface.OnClickListener {
     static final String TAG = "RequestIgnoreBatteryOptimizations";
 
-    private static final String DEVICE_IDLE_SERVICE = "deviceidle";
-
-    IDeviceIdleController mDeviceIdleService;
+    private PowerWhitelistManager mPowerWhitelistManager;
     String mPackageName;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mDeviceIdleService = IDeviceIdleController.Stub.asInterface(
-                ServiceManager.getService(DEVICE_IDLE_SERVICE));
+        mPowerWhitelistManager = getSystemService(PowerWhitelistManager.class);
 
         Uri data = getIntent().getData();
         if (data == null) {
@@ -102,11 +97,7 @@
     public void onClick(DialogInterface dialog, int which) {
         switch (which) {
             case BUTTON_POSITIVE:
-                try {
-                    mDeviceIdleService.addPowerSaveWhitelistApp(mPackageName);
-                } catch (RemoteException e) {
-                    Log.w(TAG, "Unable to reach IDeviceIdleController", e);
-                }
+                mPowerWhitelistManager.addToWhitelist(mPackageName);
                 setResult(RESULT_OK);
                 break;
             case BUTTON_NEGATIVE:
diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
index 88fd1ce..1912c2f 100644
--- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java
@@ -17,32 +17,46 @@
 package com.android.settings.fuelgauge;
 
 import android.content.Context;
+import android.util.FeatureFlagUtils;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
 
 public class TopLevelBatteryPreferenceController extends BasePreferenceController implements
-        LifecycleObserver, OnStart, OnStop {
+        LifecycleObserver, OnStart, OnStop, BatteryPreferenceController {
 
+    @VisibleForTesting
+    protected boolean mIsBatteryPresent = true;
     private final BatteryBroadcastReceiver mBatteryBroadcastReceiver;
     private Preference mPreference;
     private BatteryInfo mBatteryInfo;
+    private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
+    private String mBatteryStatusLabel;
 
     public TopLevelBatteryPreferenceController(Context context, String preferenceKey) {
         super(context, preferenceKey);
         mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(mContext);
         mBatteryBroadcastReceiver.setBatteryChangedListener(type -> {
+            if (type == BatteryBroadcastReceiver.BatteryUpdateType.BATTERY_NOT_PRESENT) {
+                mIsBatteryPresent = false;
+            }
             BatteryInfo.getBatteryInfo(mContext, info -> {
                 mBatteryInfo = info;
                 updateState(mPreference);
             }, true /* shortString */);
         });
+
+        mBatteryStatusFeatureProvider = FeatureFactory.getFactory(context)
+                .getBatteryStatusFeatureProvider(context);
     }
 
     @Override
@@ -69,23 +83,60 @@
 
     @Override
     public CharSequence getSummary() {
-        return getDashboardLabel(mContext, mBatteryInfo);
+        return getSummary(true /* batteryStatusUpdate */);
     }
 
-    static CharSequence getDashboardLabel(Context context, BatteryInfo info) {
+    private CharSequence getSummary(boolean batteryStatusUpdate) {
+        // Remove homepage summaries for silky home.
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            return null;
+        }
+        // Display help message if battery is not present.
+        if (!mIsBatteryPresent) {
+            return mContext.getText(R.string.battery_missing_message);
+        }
+        return getDashboardLabel(mContext, mBatteryInfo, batteryStatusUpdate);
+    }
+
+    protected CharSequence getDashboardLabel(Context context, BatteryInfo info,
+            boolean batteryStatusUpdate) {
         if (info == null || context == null) {
             return null;
         }
-        CharSequence label;
+
+        if (batteryStatusUpdate) {
+            if (!mBatteryStatusFeatureProvider.triggerBatteryStatusUpdate(this, info)) {
+                mBatteryStatusLabel = null; // will generateLabel()
+            }
+        }
+
+        return (mBatteryStatusLabel == null) ? generateLabel(info) : mBatteryStatusLabel;
+    }
+
+    private CharSequence generateLabel(BatteryInfo info) {
         if (!info.discharging && info.chargeLabel != null) {
-            label = info.chargeLabel;
+            return info.chargeLabel;
         } else if (info.remainingLabel == null) {
-            label = info.batteryPercentString;
+            return info.batteryPercentString;
         } else {
-            label = context.getString(R.string.power_remaining_settings_home_page,
+            return mContext.getString(R.string.power_remaining_settings_home_page,
                     info.batteryPercentString,
                     info.remainingLabel);
         }
-        return label;
+    }
+
+    /**
+     * Callback which receives text for the label.
+     */
+    public void updateBatteryStatus(String label, BatteryInfo info) {
+        mBatteryStatusLabel = label; // Null if adaptive charging is not active
+
+        if (mPreference != null) {
+            // Do not triggerBatteryStatusUpdate(), otherwise there will be an infinite loop
+            final CharSequence summary = getSummary(false /* batteryStatusUpdate */);
+            if (summary != null) {
+                mPreference.setSummary(summary);
+            }
+        }
     }
 }
diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
index 5442e7d..fc9de07 100644
--- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
+++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleSeekBarController.java
@@ -60,6 +60,7 @@
         mSeekBarPreference.setMax(MAX_SEEKBAR_VALUE);
         mSeekBarPreference.setMin(MIN_SEEKBAR_VALUE);
         mSeekBarPreference.setKey(KEY_BATTERY_SAVER_SEEK_BAR);
+        mSeekBarPreference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_TICKS);
         updateSeekBar();
     }
 
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
index 8b57234..93a95f3 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobService.java
@@ -46,7 +46,7 @@
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 import com.android.settingslib.utils.ThreadUtils;
 
 import java.util.ArrayList;
@@ -96,8 +96,8 @@
             final BatteryUtils batteryUtils = BatteryUtils.getInstance(this);
             final ContentResolver contentResolver = getContentResolver();
             final UserManager userManager = getSystemService(UserManager.class);
-            final PowerWhitelistBackend powerWhitelistBackend =
-                    PowerWhitelistBackend.getInstance(context);
+            final PowerAllowlistBackend powerAllowlistBackend =
+                    PowerAllowlistBackend.getInstance(context);
             final PowerUsageFeatureProvider powerUsageFeatureProvider = FeatureFactory
                     .getFactory(this).getPowerUsageFeatureProvider(this);
             final MetricsFeatureProvider metricsFeatureProvider = FeatureFactory
@@ -105,7 +105,7 @@
 
             for (JobWorkItem item = dequeueWork(params); item != null; item = dequeueWork(params)) {
                 saveAnomalyToDatabase(context, userManager,
-                        batteryDatabaseManager, batteryUtils, policy, powerWhitelistBackend,
+                        batteryDatabaseManager, batteryUtils, policy, powerAllowlistBackend,
                         contentResolver, powerUsageFeatureProvider, metricsFeatureProvider,
                         item.getIntent().getExtras());
 
@@ -127,7 +127,7 @@
     @VisibleForTesting
     void saveAnomalyToDatabase(Context context, UserManager userManager,
             BatteryDatabaseManager databaseManager, BatteryUtils batteryUtils,
-            BatteryTipPolicy policy, PowerWhitelistBackend powerWhitelistBackend,
+            BatteryTipPolicy policy, PowerAllowlistBackend powerAllowlistBackend,
             ContentResolver contentResolver, PowerUsageFeatureProvider powerUsageFeatureProvider,
             MetricsFeatureProvider metricsFeatureProvider, Bundle bundle) {
         // The Example of intentDimsValue is: 35:{1:{1:{1:10013|}|}|}
@@ -151,7 +151,7 @@
             final String packageName = batteryUtils.getPackageName(uid);
             final long versionCode = batteryUtils.getAppLongVersionCode(packageName);
             final String versionedPackage = packageName + "/" + versionCode;
-            if (batteryUtils.shouldHideAnomaly(powerWhitelistBackend, uid, anomalyInfo)) {
+            if (batteryUtils.shouldHideAnomaly(powerAllowlistBackend, uid, anomalyInfo)) {
                 metricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
                         SettingsEnums.ACTION_ANOMALY_IGNORED,
                         SettingsEnums.PAGE_UNKNOWN,
diff --git a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionReceiver.java b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionReceiver.java
index 4f21e11..b1bb73a 100644
--- a/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionReceiver.java
+++ b/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionReceiver.java
@@ -41,6 +41,9 @@
                 + configKey + " subscriptionId = " + subscriptionId);
 
         final Bundle bundle = intent.getExtras();
+        if (bundle == null) {
+            return;
+        }
         bundle.putLong(KEY_ANOMALY_TIMESTAMP, System.currentTimeMillis());
 
         AnomalyDetectionJobService.scheduleAnomalyDetection(context, intent);
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
index 8d6e07d..0c916b2 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java
@@ -23,6 +23,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.BatteryDefenderDetector;
 import com.android.settings.fuelgauge.batterytip.detectors.EarlyWarningDetector;
 import com.android.settings.fuelgauge.batterytip.detectors.HighUsageDetector;
 import com.android.settings.fuelgauge.batterytip.detectors.LowBatteryDetector;
@@ -72,6 +73,7 @@
                 batteryInfo.discharging).detect());
         tips.add(new SmartBatteryDetector(policy, context.getContentResolver()).detect());
         tips.add(new EarlyWarningDetector(policy, context).detect());
+        tips.add(new BatteryDefenderDetector(batteryInfo).detect());
         tips.add(new SummaryDetector(policy, batteryInfo.averageTimeToDischarge).detect());
         // Disable this feature now since it introduces false positive cases. We will try to improve
         // it in the future.
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
index d615db6..4317bff 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceController.java
@@ -112,7 +112,7 @@
 
         for (int i = 0, size = batteryTips.size(); i < size; i++) {
             final BatteryTip batteryTip = mBatteryTips.get(i);
-            batteryTip.sanityCheck(mContext);
+            batteryTip.validateCheck(mContext);
             if (batteryTip.getState() != BatteryTip.StateType.INVISIBLE) {
                 batteryTip.updatePreference(mCardPreference);
                 mBatteryTipMap.put(mCardPreference.getKey(), batteryTip);
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
index ed06cce..e88a494 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtils.java
@@ -29,6 +29,7 @@
 import com.android.internal.util.CollectionUtils;
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.fuelgauge.batterytip.actions.BatteryDefenderAction;
 import com.android.settings.fuelgauge.batterytip.actions.BatterySaverAction;
 import com.android.settings.fuelgauge.batterytip.actions.BatteryTipAction;
 import com.android.settings.fuelgauge.batterytip.actions.OpenBatterySaverAction;
@@ -111,6 +112,8 @@
                 }
             case BatteryTip.TipType.REMOVE_APP_RESTRICTION:
                 return new UnrestrictAppAction(settingsActivity, (UnrestrictAppTip) batteryTip);
+            case BatteryTip.TipType.BATTERY_DEFENDER:
+                return new BatteryDefenderAction(settingsActivity);
             default:
                 return null;
         }
@@ -124,7 +127,7 @@
             throws StatsManager.StatsUnavailableException {
         final Intent extraIntent = new Intent(context, AnomalyDetectionReceiver.class);
         final PendingIntent pendingIntent = PendingIntent.getBroadcast(context, REQUEST_CODE,
-                extraIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+                extraIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
         statsManager.setBroadcastSubscriber(pendingIntent,
                 StatsManagerConfig.ANOMALY_CONFIG_KEY, StatsManagerConfig.SUBSCRIBER_ID);
     }
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java
new file mode 100644
index 0000000..b8f5483
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2020 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.Intent;
+
+import com.android.settings.R;
+import com.android.settings.SettingsActivity;
+import com.android.settingslib.HelpUtils;
+
+/**
+ * Action to open the Support Center article
+ */
+public class BatteryDefenderAction extends BatteryTipAction {
+    private SettingsActivity mSettingsActivity;
+
+    public BatteryDefenderAction(SettingsActivity settingsActivity) {
+        super(settingsActivity.getApplicationContext());
+        mSettingsActivity = settingsActivity;
+    }
+
+    /**
+     * Handle the action when user clicks positive button
+     */
+    @Override
+    public void handlePositiveAction(int metricsKey) {
+        final Intent intent = HelpUtils.getHelpIntent(
+                mContext,
+                mContext.getString(R.string.help_url_battery_defender),
+                getClass().getName());
+        if (intent != null) {
+            mSettingsActivity.startActivityForResult(intent, 0);
+        }
+        // TODO(b/173985153): Add logging enums for Battery Defender.
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
new file mode 100644
index 0000000..dc33026
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2020 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 com.android.settings.fuelgauge.BatteryInfo;
+import com.android.settings.fuelgauge.BatteryUtils;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryDefenderTip;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+
+/**
+ * Detect whether the battery is overheated
+ */
+public class BatteryDefenderDetector implements BatteryTipDetector {
+    private BatteryInfo mBatteryInfo;
+
+    public BatteryDefenderDetector(BatteryInfo batteryInfo) {
+        mBatteryInfo = batteryInfo;
+    }
+
+    @Override
+    public BatteryTip detect() {
+        final int state =
+                BatteryUtils.isBatteryDefenderOn(mBatteryInfo)
+                    ? BatteryTip.StateType.NEW
+                    : BatteryTip.StateType.INVISIBLE;
+        return new BatteryDefenderTip(state);
+    }
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
new file mode 100644
index 0000000..cd23e50
--- /dev/null
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2020 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;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+/**
+ * Tip to show current battery is overheated
+ */
+public class BatteryDefenderTip extends BatteryTip {
+
+    public BatteryDefenderTip(@StateType int state) {
+        super(TipType.BATTERY_DEFENDER, state, false /* showDialog */);
+    }
+
+    private BatteryDefenderTip(Parcel in) {
+        super(in);
+    }
+
+    @Override
+    public CharSequence getTitle(Context context) {
+        return context.getString(R.string.battery_tip_limited_temporarily_title);
+    }
+
+    @Override
+    public CharSequence getSummary(Context context) {
+        return context.getString(R.string.battery_tip_limited_temporarily_summary);
+    }
+
+    @Override
+    public int getIconId() {
+        return R.drawable.ic_battery_status_good_24dp;
+    }
+
+    @Override
+    public void updateState(BatteryTip tip) {
+        mState = tip.mState;
+    }
+
+    @Override
+    public void log(Context context, MetricsFeatureProvider metricsFeatureProvider) {
+        // TODO(b/173985153): Add logging enums for Battery Defender.
+    }
+
+    public static final Creator CREATOR = new Creator() {
+        public BatteryTip createFromParcel(Parcel in) {
+            return new BatteryDefenderTip(in);
+        }
+
+        public BatteryTip[] newArray(int size) {
+            return new BatteryDefenderTip[size];
+        }
+    };
+
+}
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
index ebc4939..3b849be 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryTip.java
@@ -17,7 +17,6 @@
 package com.android.settings.fuelgauge.batterytip.tips;
 
 import android.content.Context;
-import android.content.res.ColorStateList;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.SparseIntArray;
@@ -58,7 +57,8 @@
             TipType.APP_RESTRICTION,
             TipType.REDUCED_BATTERY,
             TipType.LOW_BATTERY,
-            TipType.REMOVE_APP_RESTRICTION})
+            TipType.REMOVE_APP_RESTRICTION,
+            TipType.BATTERY_DEFENDER})
     public @interface TipType {
         int SMART_BATTERY_MANAGER = 0;
         int APP_RESTRICTION = 1;
@@ -68,20 +68,22 @@
         int LOW_BATTERY = 5;
         int SUMMARY = 6;
         int REMOVE_APP_RESTRICTION = 7;
+        int BATTERY_DEFENDER = 8;
     }
 
     @VisibleForTesting
     static final SparseIntArray TIP_ORDER;
     static {
         TIP_ORDER = new SparseIntArray();
-        TIP_ORDER.append(TipType.APP_RESTRICTION, 0);
-        TIP_ORDER.append(TipType.BATTERY_SAVER, 1);
-        TIP_ORDER.append(TipType.HIGH_DEVICE_USAGE, 2);
-        TIP_ORDER.append(TipType.LOW_BATTERY, 3);
-        TIP_ORDER.append(TipType.SUMMARY, 4);
-        TIP_ORDER.append(TipType.SMART_BATTERY_MANAGER, 5);
-        TIP_ORDER.append(TipType.REDUCED_BATTERY, 6);
-        TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 7);
+        TIP_ORDER.append(TipType.BATTERY_DEFENDER, 0);
+        TIP_ORDER.append(TipType.APP_RESTRICTION, 1);
+        TIP_ORDER.append(TipType.BATTERY_SAVER, 2);
+        TIP_ORDER.append(TipType.HIGH_DEVICE_USAGE, 3);
+        TIP_ORDER.append(TipType.LOW_BATTERY, 4);
+        TIP_ORDER.append(TipType.SUMMARY, 5);
+        TIP_ORDER.append(TipType.SMART_BATTERY_MANAGER, 6);
+        TIP_ORDER.append(TipType.REDUCED_BATTERY, 7);
+        TIP_ORDER.append(TipType.REMOVE_APP_RESTRICTION, 8);
     }
 
     private static final String KEY_PREFIX = "key_battery_tip";
@@ -137,9 +139,9 @@
 
     /**
      * Check whether data is still make sense. If not, try recover.
-     * @param context used to do sanity check
+     * @param context used to do validate check
      */
-    public void sanityCheck(Context context) {
+    public void validateCheck(Context context) {
         // do nothing
     }
 
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
index 1bd760b..c5f1171 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
@@ -107,8 +107,8 @@
     }
 
     @Override
-    public void sanityCheck(Context context) {
-        super.sanityCheck(context);
+    public void validateCheck(Context context) {
+        super.validateCheck(context);
 
         // Set it invisible if there is no valid app
         mRestrictAppList.removeIf(AppLabelPredicate.getInstance(context));
diff --git a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
index c3171b8..e4cea26 100644
--- a/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
+++ b/src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java
@@ -35,7 +35,7 @@
 
     private static final String PREF_KEY_VIDEO = "gesture_double_tap_screen_video";
 
-    private final String SECURE_KEY = DOZE_DOUBLE_TAP_GESTURE;
+    private static final String SECURE_KEY = DOZE_DOUBLE_TAP_GESTURE;
 
     private AmbientDisplayConfiguration mAmbientConfig;
     @UserIdInt
diff --git a/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java b/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java
new file mode 100644
index 0000000..278fa3a
--- /dev/null
+++ b/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Preference controller for emergency gesture setting's entyrpoint preference
+ */
+public class EmergencyGestureEntrypointPreferenceController extends BasePreferenceController {
+    private static final String TAG = "EmergencyGestureEntry";
+
+    @VisibleForTesting
+    static final String ACTION_EMERGENCY_GESTURE_SETTINGS =
+            "com.android.settings.action.emergency_gesture_settings";
+    @VisibleForTesting
+    Intent mIntent;
+
+    private boolean mUseCustomIntent;
+
+    public EmergencyGestureEntrypointPreferenceController(Context context, String key) {
+        super(context, key);
+        final String emergencyGestureSettingsPackageName = context.getResources().getString(
+                R.string.emergency_gesture_settings_package);
+        if (!TextUtils.isEmpty(emergencyGestureSettingsPackageName)) {
+            mUseCustomIntent = true;
+            // Use custom intent if it's configured and system can resolve it.
+            final Intent intent = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
+                    .setPackage(emergencyGestureSettingsPackageName);
+            if (canResolveIntent(intent)) {
+                mIntent = intent;
+            }
+        }
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        final boolean canHandleClicks = !mUseCustomIntent || mIntent != null;
+        if (preference != null) {
+            preference.setEnabled(canHandleClicks);
+        }
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (TextUtils.equals(getPreferenceKey(), preference.getKey()) && mIntent != null) {
+            mIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            mContext.startActivity(mIntent);
+            return true;
+        }
+        return super.handlePreferenceTreeClick(preference);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        final boolean isConfigEnabled = mContext.getResources()
+                .getBoolean(R.bool.config_show_emergency_gesture_settings);
+
+        if (!isConfigEnabled) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return AVAILABLE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        if (mUseCustomIntent) {
+            final String packageName = mContext.getResources().getString(
+                    R.string.emergency_gesture_settings_package);
+            try {
+                final PackageManager pm = mContext.getPackageManager();
+                final ApplicationInfo appInfo = pm.getApplicationInfo(
+                        packageName, PackageManager.MATCH_DISABLED_COMPONENTS
+                                | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS);
+                return mContext.getString(R.string.emergency_gesture_entrypoint_summary,
+                        appInfo.loadLabel(pm));
+            } catch (Exception e) {
+                Log.d(TAG, "Failed to get custom summary, falling back.");
+                return super.getSummary();
+            }
+        }
+
+        return super.getSummary();
+    }
+
+    /**
+     * Whether or not gesture page content should be suppressed from search.
+     */
+    public boolean shouldSuppressFromSearch() {
+        return mUseCustomIntent;
+    }
+
+    private boolean canResolveIntent(Intent intent) {
+        final ResolveInfo resolveActivity = mContext.getPackageManager()
+                .resolveActivity(intent, 0);
+        return resolveActivity != null;
+    }
+}
diff --git a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java b/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java
new file mode 100644
index 0000000..d481b2e
--- /dev/null
+++ b/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static android.content.DialogInterface.BUTTON_POSITIVE;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.EditText;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settingslib.CustomDialogPreferenceCompat;
+import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
+
+/**
+ * A dialog preference allowing user to provide a phone number to call during emergency gesture.
+ */
+public class EmergencyGestureNumberOverridePreference extends
+        CustomDialogPreferenceCompat {
+    private static final String TAG = "EmergencyGestureNumberO";
+    @VisibleForTesting
+    EditText mEditText;
+
+    private EmergencyNumberUtils mEmergencyNumberUtils;
+
+    public EmergencyGestureNumberOverridePreference(Context context,
+            AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context);
+    }
+
+    public EmergencyGestureNumberOverridePreference(Context context, AttributeSet attrs,
+            int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    public EmergencyGestureNumberOverridePreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public EmergencyGestureNumberOverridePreference(Context context) {
+        super(context);
+        init(context);
+    }
+
+    private void init(Context context) {
+        mEmergencyNumberUtils = new EmergencyNumberUtils(context);
+    }
+
+    @Override
+    public void setNegativeButtonText(int negativeButtonTextResId) {
+        super.setNegativeButtonText(negativeButtonTextResId);
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+        mEditText = view.findViewById(R.id.emergency_gesture_number_override);
+        final String defaultNumber = mEmergencyNumberUtils.getDefaultPoliceNumber();
+        mEditText.setHint(defaultNumber);
+        final String number = mEmergencyNumberUtils.getPoliceNumber();
+        if (!TextUtils.equals(number, defaultNumber)) {
+            mEditText.setText(number);
+        }
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == BUTTON_POSITIVE) {
+            final String input = mEditText.getText().toString();
+            if (!TextUtils.isEmpty(input)) {
+                Settings.Secure.putString(getContext().getContentResolver(),
+                        Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER, input);
+            } else {
+                Settings.Secure.putString(getContext().getContentResolver(),
+                        Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER,
+                        mEmergencyNumberUtils.getDefaultPoliceNumber());
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java b/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java
new file mode 100644
index 0000000..28e4154
--- /dev/null
+++ b/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+import android.telephony.PhoneNumberUtils;
+import android.text.Spannable;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
+
+/**
+ * Preference controller for emergency gesture number override.
+ */
+public class EmergencyGestureNumberOverridePreferenceController extends BasePreferenceController
+        implements LifecycleObserver, OnStart, OnStop {
+
+    @VisibleForTesting
+    EmergencyNumberUtils mEmergencyNumberUtils;
+    private final Handler mHandler;
+    private final ContentObserver mSettingsObserver;
+    private Preference mPreference;
+
+    public EmergencyGestureNumberOverridePreferenceController(Context context,
+            String preferenceKey) {
+        super(context, preferenceKey);
+        mEmergencyNumberUtils = new EmergencyNumberUtils(context);
+        mHandler = new Handler(Looper.getMainLooper());
+        mSettingsObserver = new EmergencyGestureNumberOverrideSettingsObserver(mHandler);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getResources()
+                .getBoolean(R.bool.config_show_emergency_gesture_settings) ? AVAILABLE
+                : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        String number = mEmergencyNumberUtils.getPoliceNumber();
+        String summary = mContext.getString(R.string.emergency_gesture_call_for_help_summary,
+                number);
+        int numberStartIndex = summary.indexOf(number);
+        if (numberStartIndex < 0) {
+            return summary;
+        }
+        Spannable summarySpan = Spannable.Factory.getInstance().newSpannable(summary);
+        PhoneNumberUtils.addTtsSpan(summarySpan, numberStartIndex,
+                numberStartIndex + number.length());
+        return summarySpan;
+    }
+
+    @Override
+    public void onStart() {
+        mContext.getContentResolver().registerContentObserver(Settings.Secure.getUriFor(
+                Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER), false, mSettingsObserver);
+    }
+
+    @Override
+    public void onStop() {
+        mContext.getContentResolver().unregisterContentObserver(mSettingsObserver);
+    }
+
+    private class EmergencyGestureNumberOverrideSettingsObserver extends ContentObserver {
+        EmergencyGestureNumberOverrideSettingsObserver(Handler h) {
+            super(h);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            if (mPreference != null) {
+                updateState(mPreference);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java b/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java
new file mode 100644
index 0000000..6f0357f
--- /dev/null
+++ b/src/com/android/settings/gestures/EmergencyGesturePreferenceController.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.widget.Switch;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.widget.LayoutPreference;
+
+/**
+ * Preference controller for emergency gesture setting
+ */
+public class EmergencyGesturePreferenceController extends BasePreferenceController implements
+        SwitchBar.OnSwitchChangeListener {
+
+    @VisibleForTesting
+    static final int ON = 1;
+    @VisibleForTesting
+    static final int OFF = 0;
+
+    private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_ENABLED;
+
+    private SwitchBar mSwitchBar;
+
+    public EmergencyGesturePreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        final boolean isConfigEnabled = mContext.getResources()
+                .getBoolean(R.bool.config_show_emergency_gesture_settings);
+
+        if (!isConfigEnabled) {
+            return UNSUPPORTED_ON_DEVICE;
+        }
+        return AVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        final LayoutPreference pref = screen.findPreference(mPreferenceKey);
+        mSwitchBar = pref.findViewById(R.id.switch_bar);
+        mSwitchBar.setSwitchBarText(R.string.emergency_gesture_switchbar_title,
+                R.string.emergency_gesture_switchbar_title);
+        mSwitchBar.addOnSwitchChangeListener(this);
+        mSwitchBar.setChecked(isChecked());
+        mSwitchBar.show();
+    }
+
+    @VisibleForTesting
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, OFF) == ON;
+    }
+
+    @Override
+    public void onSwitchChanged(Switch switchView, boolean isChecked) {
+        Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY, isChecked ? ON : OFF);
+    }
+}
diff --git a/src/com/android/settings/gestures/EmergencyGestureSettings.java b/src/com/android/settings/gestures/EmergencyGestureSettings.java
new file mode 100644
index 0000000..5eec21c
--- /dev/null
+++ b/src/com/android/settings/gestures/EmergencyGestureSettings.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * Settings page for emergency gesture
+ */
+@SearchIndexable
+public class EmergencyGestureSettings extends DashboardFragment {
+
+    private static final String TAG = "EmergencyGestureSetting";
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.emergency_gesture_settings;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.EMERGENCY_SOS_GESTURE_SETTINGS;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.emergency_gesture_settings) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    final EmergencyGestureEntrypointPreferenceController controller =
+                            new EmergencyGestureEntrypointPreferenceController(context,
+                                    "dummy_emergency_gesture_pref_key");
+                    return !controller.isAvailable()
+                            || controller.shouldSuppressFromSearch();
+                }
+            };
+}
diff --git a/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java b/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java
new file mode 100644
index 0000000..1a68ade
--- /dev/null
+++ b/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceController.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+
+/**
+ * Preference controller for emergency sos gesture setting
+ */
+public class EmergencyGestureSoundPreferenceController extends GesturePreferenceController {
+
+    @VisibleForTesting
+    static final int ON = 1;
+    @VisibleForTesting
+    static final int OFF = 0;
+
+    private static final String SECURE_KEY = Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED;
+
+    public EmergencyGestureSoundPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    protected String getVideoPrefKey() {
+        return "emergency_gesture_screen_video";
+    }
+
+    private static boolean isGestureAvailable(Context context) {
+        return context.getResources()
+                .getBoolean(R.bool.config_show_emergency_gesture_settings);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return isGestureAvailable(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return false;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(), SECURE_KEY, ON) == ON;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Secure.putInt(mContext.getContentResolver(), SECURE_KEY,
+                isChecked ? ON : OFF);
+    }
+}
diff --git a/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java b/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
index 95f4daa..546581b 100644
--- a/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
+++ b/src/com/android/settings/gestures/GestureNavigationSettingsFragment.java
@@ -28,6 +28,7 @@
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.LabeledSeekBarPreference;
+import com.android.settings.widget.SeekBarPreference;
 import com.android.settingslib.search.SearchIndexable;
 
 /**
@@ -115,6 +116,7 @@
     private void initSeekBarPreference(final String key) {
         final LabeledSeekBarPreference pref = getPreferenceScreen().findPreference(key);
         pref.setContinuousUpdates(true);
+        pref.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_TICKS);
 
         final String settingsKey = key == LEFT_EDGE_SEEKBAR_KEY
                 ? Settings.Secure.BACK_GESTURE_INSET_SCALE_LEFT
diff --git a/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceController.java b/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceController.java
new file mode 100644
index 0000000..c49199c
--- /dev/null
+++ b/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceController.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * The Controller to handle app taps to exit of one-handed mode
+ */
+public class OneHandedAppTapsExitPreferenceController extends TogglePreferenceController implements
+        LifecycleObserver, OnStart, OnStop, OneHandedSettingsUtils.TogglesCallback {
+
+    private Preference mPreference;
+    private final OneHandedSettingsUtils mUtils;
+
+    public OneHandedAppTapsExitPreferenceController(Context context, String key) {
+        super(context, key);
+        mUtils = new OneHandedSettingsUtils(context);
+
+        // By default, app taps to stop one-handed is enabled, this will get default value once.
+        OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, isChecked());
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)
+                ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        final int availabilityStatus = getAvailabilityStatus();
+        preference.setEnabled(
+                availabilityStatus == AVAILABLE || availabilityStatus == AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, isChecked);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return OneHandedSettingsUtils.getSettingsTapsAppToExit(mContext);
+    }
+
+    @Override
+    public void onStart() {
+        mUtils.registerToggleAwareObserver(this);
+    }
+
+    @Override
+    public void onStop() {
+        mUtils.unregisterToggleAwareObserver();
+    }
+
+    @Override
+    public void onChange(Uri uri) {
+        updateState(mPreference);
+    }
+}
diff --git a/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java b/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
new file mode 100644
index 0000000..c6db4ea
--- /dev/null
+++ b/src/com/android/settings/gestures/OneHandedEnablePreferenceController.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * The controller to handle one-handed mode enable or disable state.
+ **/
+public class OneHandedEnablePreferenceController extends TogglePreferenceController {
+
+    static final String SUPPORT_ONE_HANDED_MODE = "ro.support_one_handed_mode";
+
+    public OneHandedEnablePreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false)
+                ? BasePreferenceController.AVAILABLE
+                : BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext,
+                isChecked);
+        return true;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return OneHandedSettingsUtils.isOneHandedModeEnabled(mContext);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)
+                ? mContext.getText(R.string.switch_on_text)
+                : mContext.getText(R.string.switch_off_text);
+    }
+}
diff --git a/src/com/android/settings/gestures/OneHandedSettings.java b/src/com/android/settings/gestures/OneHandedSettings.java
new file mode 100644
index 0000000..2449cf2
--- /dev/null
+++ b/src/com/android/settings/gestures/OneHandedSettings.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * The Fragment for one-handed mode settings.
+ */
+@SearchIndexable
+public class OneHandedSettings extends DashboardFragment {
+
+    private static final String TAG = "OneHandedSettings";
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.SETTINGS_ONE_HANDED;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.one_handed_settings;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.one_handed_settings) {
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return SystemProperties.getBoolean(
+                            OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, false);
+                }
+            };
+}
diff --git a/src/com/android/settings/gestures/OneHandedSettingsUtils.java b/src/com/android/settings/gestures/OneHandedSettingsUtils.java
new file mode 100644
index 0000000..f3d7e33
--- /dev/null
+++ b/src/com/android/settings/gestures/OneHandedSettingsUtils.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.provider.Settings;
+
+/**
+ * The Util to query one-handed mode settings config
+ */
+public class OneHandedSettingsUtils {
+
+    public enum OneHandedTimeout {
+        NEVER(0), SHORT(4), MEDIUM(8), LONG(12);
+
+        private final int mValue;
+
+        OneHandedTimeout(int value) {
+            this.mValue = value;
+        }
+
+        public int getValue() {
+            return mValue;
+        }
+    }
+
+    private final Context mContext;
+    private final SettingsObserver mSettingsObserver;
+
+    OneHandedSettingsUtils(Context context) {
+        mContext = context;
+        mSettingsObserver = new SettingsObserver(new Handler(Looper.getMainLooper()));
+    }
+
+    /**
+     * Get one-handed mode enable or disable flag from Settings provider.
+     *
+     * @param context App context
+     * @return enable or disable one-handed mode flag.
+     */
+    public static boolean isOneHandedModeEnabled(Context context) {
+        return Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 0) == 1;
+    }
+
+    /**
+     * Set one-handed mode enable or disable flag to Settings provider.
+     *
+     * @param context App context
+     * @param enable enable or disable one-handed mode.
+     */
+    public static void setSettingsOneHandedModeEnabled(Context context, boolean enable) {
+        Settings.Secure.putInt(context.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, enable ? 1 : 0);
+    }
+
+    /**
+     * Get enabling taps app to exit one-handed mode flag from Settings provider.
+     *
+     * @param context App context
+     * @return enable or disable taps app to exit.
+     */
+    public static boolean getSettingsTapsAppToExit(Context context) {
+        return Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.TAPS_APP_TO_EXIT, 1) == 1;
+    }
+
+    /**
+     * Set enabling taps app to exit one-handed mode flag to Settings provider.
+     *
+     * @param context App context
+     * @param enable  enable or disable when taping app to exit one-handed mode.
+     */
+    public static boolean setSettingsTapsAppToExit(Context context, boolean enable) {
+        return Settings.Secure.putInt(context.getContentResolver(),
+                Settings.Secure.TAPS_APP_TO_EXIT, enable ? 1 : 0);
+    }
+
+    /**
+     * Get one-handed mode timeout value from Settings provider.
+     *
+     * @param context App context
+     * @return timeout value in seconds.
+     */
+    public static int getSettingsOneHandedModeTimeout(Context context) {
+        return Settings.Secure.getInt(context.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
+                OneHandedTimeout.MEDIUM.getValue() /* default MEDIUM(8) by UX */);
+    }
+
+    /**
+     * Set one-handed mode timeout value to Settings provider.
+     *
+     * @param context App context
+     * @param timeout timeout in seconds for exiting one-handed mode.
+     */
+    public static void setSettingsOneHandedModeTimeout(Context context, int timeout) {
+        Settings.Secure.putInt(context.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT, timeout);
+    }
+
+    /**
+     * Register callback for observing Settings.Secure.ONE_HANDED_MODE_ENABLED state.
+     * @param callback for state changes
+     */
+    public void registerToggleAwareObserver(TogglesCallback callback) {
+        mSettingsObserver.observe();
+        mSettingsObserver.setCallback(callback);
+    }
+
+    /**
+     * Unregister callback for observing Settings.Secure.ONE_HANDED_MODE_ENABLED state.
+     */
+    public void unregisterToggleAwareObserver() {
+        final ContentResolver resolver = mContext.getContentResolver();
+        resolver.unregisterContentObserver(mSettingsObserver);
+    }
+
+    private final class SettingsObserver extends ContentObserver {
+        private TogglesCallback mCallback;
+
+        private final Uri mOneHandedEnabledAware = Settings.Secure.getUriFor(
+                Settings.Secure.ONE_HANDED_MODE_ENABLED);
+
+        SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        private void setCallback(TogglesCallback callback) {
+            mCallback = callback;
+        }
+
+        public void observe() {
+            final ContentResolver resolver = mContext.getContentResolver();
+            resolver.registerContentObserver(mOneHandedEnabledAware, true, this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            if (mCallback != null) mCallback.onChange(uri);
+        }
+    }
+
+    /**
+     * An interface for when Settings.Secure key state changes.
+     */
+    public interface TogglesCallback {
+        /**
+         * Callback method for Settings.Secure key state changes.
+         * @param uri
+         */
+        void onChange(Uri uri);
+    }
+}
diff --git a/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java b/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java
new file mode 100644
index 0000000..90ff9a6
--- /dev/null
+++ b/src/com/android/settings/gestures/OneHandedTimeoutPreferenceController.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * The Controller to handle one-handed mode timeout state.
+ **/
+public class OneHandedTimeoutPreferenceController extends BasePreferenceController implements
+        Preference.OnPreferenceChangeListener, LifecycleObserver, OnStart, OnStop,
+        OneHandedSettingsUtils.TogglesCallback {
+
+    private final Map<String, String> mTimeoutMap;
+    private Preference mTimeoutPreference;
+    private final OneHandedSettingsUtils mUtils;
+
+    public OneHandedTimeoutPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mTimeoutMap = new HashMap<>();
+        initTimeoutMap();
+        mUtils = new OneHandedSettingsUtils(context);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)
+                ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object object) {
+        if (!(preference instanceof ListPreference)) {
+            return false;
+        }
+        final int newValue = Integer.parseInt((String) object);
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext, newValue);
+        updateState(preference);
+        return true;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        if (!(preference instanceof ListPreference)) {
+            return;
+        }
+        final ListPreference listPreference = (ListPreference) preference;
+        listPreference.setValue(getTimeoutValue());
+
+        final int availabilityStatus = getAvailabilityStatus();
+        preference.setEnabled(
+                availabilityStatus == AVAILABLE || availabilityStatus == AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        if (OneHandedSettingsUtils.getSettingsOneHandedModeTimeout(mContext) == 0) {
+            return mContext.getResources().getString(R.string.screensaver_settings_summary_never);
+        }
+        return String.format(mContext.getResources().getString(
+                R.string.screen_timeout_summary), mTimeoutMap.get(getTimeoutValue()));
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mTimeoutPreference = screen.findPreference(mPreferenceKey);
+    }
+
+    @Override
+    public void onStart() {
+        mUtils.registerToggleAwareObserver(this);
+    }
+
+    @Override
+    public void onStop() {
+        mUtils.unregisterToggleAwareObserver();
+    }
+
+    @Override
+    public void onChange(Uri uri) {
+        updateState(mTimeoutPreference);
+    }
+
+    private String getTimeoutValue() {
+        return String.valueOf(OneHandedSettingsUtils.getSettingsOneHandedModeTimeout(mContext));
+    }
+
+    private void initTimeoutMap() {
+        if (mTimeoutMap.size() != 0) {
+            return;
+        }
+
+        final String[] timeoutValues = mContext.getResources().getStringArray(
+                R.array.one_handed_timeout_values);
+        final String[] timeoutTitles = mContext.getResources().getStringArray(
+                R.array.one_handed_timeout_title);
+
+        if (timeoutValues.length != timeoutTitles.length) {
+            return;
+        }
+
+        for (int i = 0; i < timeoutValues.length; i++) {
+            mTimeoutMap.put(timeoutValues[i], timeoutTitles[i]);
+        }
+    }
+}
diff --git a/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceController.java b/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceController.java
new file mode 100644
index 0000000..04a32de
--- /dev/null
+++ b/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceController.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static android.provider.Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED;
+
+import static com.android.settings.gestures.OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * Handles swipe bottom to expand notification panel gesture.
+ **/
+public class SwipeBottomToNotificationPreferenceController extends TogglePreferenceController {
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
+    private static final String PREF_KEY = "gesture_swipe_bottom_to_notification";
+
+    public SwipeBottomToNotificationPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    /** Indicates whether the gesture is available or not. */
+    public static boolean isGestureAvailable(Context context) {
+        // Disable the gesture once One-Handed mode gesture enabled.
+        if (SystemProperties.getBoolean(SUPPORT_ONE_HANDED_MODE, false)) {
+            return !OneHandedSettingsUtils.isOneHandedModeEnabled(context);
+        }
+        return true;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return isGestureAvailable(mContext) ? AVAILABLE : DISABLED_DEPENDENT_SETTING;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return TextUtils.equals(getPreferenceKey(), PREF_KEY);
+    }
+
+    @Override
+    public boolean isPublicSlice() {
+        return true;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, isChecked ? ON : OFF);
+        return true;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, ON) == ON;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        // This toggle preference summary will be updated in gesture preference page since we bound
+        // it with entry preference in gesture.xml
+        return mContext.getText(
+                isChecked() ? R.string.gesture_setting_on : R.string.gesture_setting_off);
+    }
+}
diff --git a/src/com/android/settings/gestures/SwipeBottomToNotificationSettings.java b/src/com/android/settings/gestures/SwipeBottomToNotificationSettings.java
new file mode 100644
index 0000000..d0441f3
--- /dev/null
+++ b/src/com/android/settings/gestures/SwipeBottomToNotificationSettings.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+
+/**
+ * The Fragment for swipe bottom to notification gesture settings.
+ */
+public class SwipeBottomToNotificationSettings extends DashboardFragment {
+
+    private static final String TAG = "SwipeBottomToNotificationSettings";
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.SETTINGS_SWIPE_BOTTOM_TO_NOTIFICATION;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.swipe_bottom_to_notification_settings;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.swipe_bottom_to_notification_settings) {
+
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return SwipeBottomToNotificationPreferenceController
+                            .isGestureAvailable(context);
+                }
+            };
+}
diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
index bed14a8..ddcdd59 100644
--- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
+++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java
@@ -21,9 +21,6 @@
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY;
 import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY;
 
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_GONE;
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_SETTING;
-
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
@@ -49,7 +46,6 @@
 import com.android.settings.support.actionbar.HelpResourceProvider;
 import com.android.settings.utils.CandidateInfoExtra;
 import com.android.settings.widget.RadioButtonPickerFragment;
-import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget;
 import com.android.settings.widget.VideoPreference;
 import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.widget.CandidateInfo;
@@ -119,8 +115,8 @@
             return;
         }
         for (CandidateInfo info : candidateList) {
-            RadioButtonPreferenceWithExtraWidget pref =
-                    new RadioButtonPreferenceWithExtraWidget(getPrefContext());
+            RadioButtonPreference pref =
+                    new RadioButtonPreference(getPrefContext());
             bindPreference(pref, info.getKey(), info, defaultKey);
             bindPreferenceExtra(pref, info.getKey(), info, defaultKey, systemDefaultKey);
             screen.addPreference(pref);
@@ -131,20 +127,15 @@
     @Override
     public void bindPreferenceExtra(RadioButtonPreference pref,
             String key, CandidateInfo info, String defaultKey, String systemDefaultKey) {
-        if (!(info instanceof CandidateInfoExtra)
-                || !(pref instanceof RadioButtonPreferenceWithExtraWidget)) {
+        if (!(info instanceof CandidateInfoExtra)) {
             return;
         }
 
         pref.setSummary(((CandidateInfoExtra) info).loadSummary());
 
-        RadioButtonPreferenceWithExtraWidget p = (RadioButtonPreferenceWithExtraWidget) pref;
         if (info.getKey() == KEY_SYSTEM_NAV_GESTURAL) {
-            p.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_SETTING);
-            p.setExtraWidgetOnClickListener((v) -> startActivity(new Intent(
+            pref.setExtraWidgetOnClickListener((v) -> startActivity(new Intent(
                     GestureNavigationSettingsFragment.GESTURE_NAVIGATION_SETTINGS)));
-        } else {
-            p.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_GONE);
         }
     }
 
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index a842643..5eb9d94 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -20,6 +20,8 @@
 import android.app.ActivityManager;
 import android.app.settings.SettingsEnums;
 import android.os.Bundle;
+import android.util.FeatureFlagUtils;
+import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -33,12 +35,16 @@
 
 import com.android.settings.R;
 import com.android.settings.accounts.AvatarViewMixin;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.HideNonSystemOverlayMixin;
 import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
 import com.android.settings.overlay.FeatureFactory;
 
 public class SettingsHomepageActivity extends FragmentActivity {
 
+    private static final String TAG = "SettingsHomepageActivity";
+    private int mSearchBoxHeight;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -48,7 +54,9 @@
         root.setSystemUiVisibility(
                 View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
 
-        setHomepageContainerPaddingTop();
+        final View appBar = findViewById(R.id.app_bar_container);
+        appBar.setMinimumHeight(getSearchBoxHeight());
+        setDefaultHomepageContainerPaddingTop();
 
         final Toolbar toolbar = findViewById(R.id.search_action_bar);
         FeatureFactory.getFactory(this).getSearchFeatureProvider()
@@ -59,14 +67,35 @@
         getLifecycle().addObserver(new HideNonSystemOverlayMixin(this));
 
         if (!getSystemService(ActivityManager.class).isLowRamDevice()) {
-            // Only allow contextual feature on high ram devices.
-            showFragment(new ContextualCardsFragment(), R.id.contextual_cards_content);
+            // Only allow contextual features on high ram devices.
+            if (FeatureFlagUtils.isEnabled(this, FeatureFlags.SILKY_HOME)) {
+                showSuggestionFragment();
+            }
+            if (FeatureFlagUtils.isEnabled(this, FeatureFlags.CONTEXTUAL_HOME)) {
+                showFragment(new ContextualCardsFragment(), R.id.contextual_cards_content);
+            }
         }
         showFragment(new TopLevelSettings(), R.id.main_content);
         ((FrameLayout) findViewById(R.id.main_content))
                 .getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
     }
 
+    private void showSuggestionFragment() {
+        final Class<? extends Fragment> fragment = FeatureFactory.getFactory(this)
+                .getSuggestionFeatureProvider(this).getContextualSuggestionFragment();
+        if (fragment == null) {
+            return;
+        }
+
+        try {
+            showFragment(fragment.newInstance(), R.id.contextual_suggestion_content);
+            setHomepageContainerTopOffset(getResources()
+                    .getDimensionPixelSize(R.dimen.suggestion_height));
+        } catch (IllegalAccessException | InstantiationException e) {
+            Log.w(TAG, "Cannot show fragment", e);
+        }
+    }
+
     private void showFragment(Fragment fragment, int id) {
         final FragmentManager fragmentManager = getSupportFragmentManager();
         final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
@@ -81,18 +110,32 @@
     }
 
     @VisibleForTesting
-    void setHomepageContainerPaddingTop() {
-        final View view = this.findViewById(R.id.homepage_container);
-
-        final int searchBarHeight = getResources().getDimensionPixelSize(R.dimen.search_bar_height);
-        final int searchBarMargin = getResources().getDimensionPixelSize(R.dimen.search_bar_margin);
-
-        // The top padding is the height of action bar(48dp) + top/bottom margins(16dp)
-        final int paddingTop = searchBarHeight + searchBarMargin * 2;
+    void setHomepageContainerTopOffset(int offset) {
+        final View view = findViewById(R.id.homepage_container);
+        final int paddingTop = getSearchBoxHeight() + offset;
         view.setPadding(0 /* left */, paddingTop, 0 /* right */, 0 /* bottom */);
 
         // Prevent inner RecyclerView gets focus and invokes scrolling.
         view.setFocusableInTouchMode(true);
         view.requestFocus();
     }
+
+    @VisibleForTesting
+    void setDefaultHomepageContainerPaddingTop() {
+        setHomepageContainerTopOffset(0);
+    }
+
+    @VisibleForTesting
+    int getSearchBoxHeight() {
+        if (mSearchBoxHeight != 0) {
+            return mSearchBoxHeight;
+        }
+
+        final int searchBarHeight = getResources().getDimensionPixelSize(R.dimen.search_bar_height);
+        final int searchBarMargin = getResources().getDimensionPixelSize(R.dimen.search_bar_margin);
+
+        // The height of search box is the height of search bar(48dp) + top/bottom margins(24dp)
+        mSearchBoxHeight = searchBarHeight + searchBarMargin * 2;
+        return mSearchBoxHeight;
+    }
 }
diff --git a/src/com/android/settings/homepage/TopLevelSettings.java b/src/com/android/settings/homepage/TopLevelSettings.java
index 8a7f4bd..47a46f2 100644
--- a/src/com/android/settings/homepage/TopLevelSettings.java
+++ b/src/com/android/settings/homepage/TopLevelSettings.java
@@ -22,12 +22,15 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
+import android.util.FeatureFlagUtils;
 
 import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
 import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -35,6 +38,9 @@
 import com.android.settingslib.core.instrumentation.Instrumentable;
 import com.android.settingslib.search.SearchIndexable;
 
+import java.util.Arrays;
+import java.util.List;
+
 @SearchIndexable(forTarget = MOBILE)
 public class TopLevelSettings extends DashboardFragment implements
         PreferenceFragmentCompat.OnPreferenceStartFragmentCallback {
@@ -50,6 +56,9 @@
 
     @Override
     protected int getPreferenceScreenResId() {
+        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
+            return R.xml.top_level_settings_grouped;
+        }
         return R.xml.top_level_settings;
     }
 
@@ -100,7 +109,16 @@
     }
 
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.top_level_settings) {
+            new BaseSearchIndexProvider() {
+
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)
+                            ? R.xml.top_level_settings_grouped : R.xml.top_level_settings;
+                    return Arrays.asList(sir);
+                }
 
                 @Override
                 protected boolean isPageSearchEnabled(Context context) {
diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
index 9f0023a..3b75ebf 100644
--- a/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
+++ b/src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java
@@ -40,7 +40,6 @@
 import com.android.settings.homepage.contextualcards.slices.BluetoothUpdateWorker;
 import com.android.settings.homepage.contextualcards.slices.SwipeDismissalDelegate;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.wifi.slice.ContextualWifiScanWorker;
 
 public class ContextualCardsFragment extends InstrumentedFragment implements
         FocusRecyclerView.FocusListener {
@@ -80,7 +79,6 @@
         super.onStart();
         registerScreenOffReceiver();
         registerKeyEventReceiver();
-        ContextualWifiScanWorker.newVisibleUiSession();
         mContextualCardManager.loadContextualCards(LoaderManager.getInstance(this),
                 sRestartLoaderNeeded);
         sRestartLoaderNeeded = false;
diff --git a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java b/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
deleted file mode 100644
index d03b359..0000000
--- a/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.homepage.contextualcards.deviceinfo;
-
-import android.app.PendingIntent;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.storage.StorageManager;
-import android.text.format.Formatter;
-
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.SubSettings;
-import com.android.settings.Utils;
-import com.android.settings.deviceinfo.StorageDashboardFragment;
-import com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController;
-import com.android.settings.slices.CustomSliceRegistry;
-import com.android.settings.slices.CustomSliceable;
-import com.android.settings.slices.SliceBuilderUtils;
-import com.android.settingslib.deviceinfo.PrivateStorageInfo;
-import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
-
-public class StorageSlice implements CustomSliceable {
-    private static final String TAG = "StorageSlice";
-
-    private final Context mContext;
-
-    public StorageSlice(Context context) {
-        mContext = context;
-    }
-
-    @Override
-    public Uri getUri() {
-        return CustomSliceRegistry.STORAGE_SLICE_URI;
-    }
-
-    @Override
-    public Slice getSlice() {
-        final IconCompat icon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_homepage_storage);
-        final String title = mContext.getString(R.string.storage_label);
-        final SliceAction primaryAction = SliceAction.createDeeplink(getPrimaryAction(), icon,
-                ListBuilder.ICON_IMAGE, title);
-        final PrivateStorageInfo info = getPrivateStorageInfo();
-        return new ListBuilder(mContext, CustomSliceRegistry.STORAGE_SLICE_URI,
-                ListBuilder.INFINITY)
-                .setAccentColor(Utils.getColorAccentDefaultColor(mContext))
-                .setHeader(new ListBuilder.HeaderBuilder().setTitle(title))
-                .addRow(new ListBuilder.RowBuilder()
-                        .setTitle(getStorageUsedText(info))
-                        .setSubtitle(getStorageSummaryText(info))
-                        .setPrimaryAction(primaryAction))
-                .build();
-    }
-
-    @Override
-    public Intent getIntent() {
-        final String screenTitle = mContext.getText(R.string.storage_label).toString();
-        return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
-                StorageDashboardFragment.class.getName(), "" /* key */, screenTitle,
-                SettingsEnums.SLICE)
-                .setClassName(mContext.getPackageName(), SubSettings.class.getName())
-                .setData(CustomSliceRegistry.STORAGE_SLICE_URI);
-    }
-
-    private PendingIntent getPrimaryAction() {
-        final Intent intent = getIntent();
-        return PendingIntent.getActivity(mContext, 0  /* requestCode */, intent, 0  /* flags */);
-    }
-
-    @VisibleForTesting
-    PrivateStorageInfo getPrivateStorageInfo() {
-        final StorageManager storageManager = mContext.getSystemService(StorageManager.class);
-        final StorageManagerVolumeProvider smvp = new StorageManagerVolumeProvider(storageManager);
-        return PrivateStorageInfo.getPrivateStorageInfo(smvp);
-    }
-
-    @VisibleForTesting
-    CharSequence getStorageUsedText(PrivateStorageInfo info) {
-        final long usedBytes = info.totalBytes - info.freeBytes;
-        return StorageSummaryDonutPreferenceController.convertUsedBytesToFormattedText(mContext,
-                usedBytes);
-    }
-
-    @VisibleForTesting
-    CharSequence getStorageSummaryText(PrivateStorageInfo info) {
-        return mContext.getString(R.string.storage_volume_total,
-                Formatter.formatShortFileSize(mContext, info.totalBytes));
-    }
-
-    @Override
-    public void onNotifyChange(Intent intent) {
-
-    }
-}
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
index d99d01e..6a5b300 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BatteryFixSlice.java
@@ -163,7 +163,8 @@
 
     private PendingIntent getPrimaryAction() {
         final Intent intent = getIntent();
-        return PendingIntent.getActivity(mContext, 0  /* requestCode */, intent, 0  /* flags */);
+        return PendingIntent.getActivity(mContext, 0  /* requestCode */, intent,
+                PendingIntent.FLAG_IMMUTABLE);
     }
 
     private Slice buildBatteryGoodSlice(ListBuilder sliceBuilder, boolean isError) {
diff --git a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
index 19de403..bfdd13a 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSlice.java
@@ -206,7 +206,7 @@
         return PendingIntent
                 .getActivity(mContext, device.hashCode() /* requestCode */,
                         subSettingLauncher.toIntent(),
-                        0  /* flags */);
+                        PendingIntent.FLAG_IMMUTABLE);
     }
 
     @VisibleForTesting
@@ -236,7 +236,8 @@
                 .setClass(mContext, SliceBroadcastReceiver.class)
                 .putExtra(EXTRA_ENABLE_BLUETOOTH, true);
         final SliceAction action = SliceAction.create(PendingIntent.getBroadcast(mContext,
-                0 /* requestCode */, intent, 0 /* flags */), icon, ListBuilder.ICON_IMAGE, title);
+                0 /* requestCode */, intent, PendingIntent.FLAG_IMMUTABLE), icon,
+                ListBuilder.ICON_IMAGE, title);
 
         return new ListBuilder.RowBuilder()
                 .setTitleItem(icon, ListBuilder.ICON_IMAGE)
@@ -252,7 +253,7 @@
         final IconCompat icon = Utils.createIconWithDrawable(drawable);
         final CharSequence title = mContext.getText(R.string.bluetooth_devices);
         final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext,
-                0 /* requestCode */, getIntent(), 0 /* flags */);
+                0 /* requestCode */, getIntent(), PendingIntent.FLAG_IMMUTABLE);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(primaryActionIntent, icon,
                 ListBuilder.ICON_IMAGE, title);
 
@@ -274,7 +275,7 @@
                 .setSourceMetricsCategory(SettingsEnums.BLUETOOTH_PAIRING)
                 .toIntent();
         final PendingIntent pi = PendingIntent.getActivity(mContext, intent.hashCode(), intent,
-                0 /* flags */);
+                PendingIntent.FLAG_IMMUTABLE);
         return SliceAction.createDeeplink(pi, icon, ListBuilder.ICON_IMAGE, title);
     }
 
@@ -341,7 +342,8 @@
                 .putExtra(BLUETOOTH_DEVICE_HASH_CODE, bluetoothDevice.hashCode());
 
         return SliceAction.create(
-                PendingIntent.getBroadcast(mContext, bluetoothDevice.hashCode(), intent, 0),
+                PendingIntent.getBroadcast(mContext, bluetoothDevice.hashCode(), intent,
+                        PendingIntent.FLAG_IMMUTABLE),
                 getBluetoothDeviceIcon(bluetoothDevice),
                 ListBuilder.ICON_IMAGE,
                 bluetoothDevice.getName());
diff --git a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
index 4068d7c..f11b0e3 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/ContextualAdaptiveSleepSlice.java
@@ -17,8 +17,8 @@
 package com.android.settings.homepage.contextualcards.slices;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
-import static com.android.settings.display.AdaptiveSleepPreferenceController.PREF_NAME;
 import static com.android.settings.display.AdaptiveSleepPreferenceController.isControllerAvailable;
+import static com.android.settings.display.ScreenTimeoutPreferenceController.PREF_NAME;
 import static com.android.settings.slices.CustomSliceRegistry.CONTEXTUAL_ADAPTIVE_SLEEP_URI;
 
 import android.app.PendingIntent;
@@ -35,7 +35,7 @@
 
 import com.android.settings.R;
 import com.android.settings.SubSettings;
-import com.android.settings.display.AdaptiveSleepSettings;
+import com.android.settings.display.ScreenTimeoutSettings;
 import com.android.settings.slices.CustomSliceable;
 import com.android.settings.slices.SliceBuilderUtils;
 
@@ -43,6 +43,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+// TODO(b/172310863): consider removing this slice.
 public class ContextualAdaptiveSleepSlice implements CustomSliceable {
     private static final String TAG = "ContextualAdaptiveSleepSlice";
     private static final long DEFAULT_SETUP_TIME = 0;
@@ -115,14 +116,15 @@
         final CharSequence screenTitle = mContext.getText(R.string.adaptive_sleep_title);
         final Uri contentUri = new Uri.Builder().appendPath(PREF_NAME).build();
         return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
-                AdaptiveSleepSettings.class.getName(), PREF_NAME, screenTitle.toString(),
+                ScreenTimeoutSettings.class.getName(), PREF_NAME, screenTitle.toString(),
                 SettingsEnums.SLICE).setClassName(mContext.getPackageName(),
                 SubSettings.class.getName()).setData(contentUri);
     }
 
     private PendingIntent getPrimaryAction() {
         final Intent intent = getIntent();
-        return PendingIntent.getActivity(mContext, 0  /* requestCode */, intent, 0  /* flags */);
+        return PendingIntent.getActivity(mContext, 0  /* requestCode */, intent,
+                PendingIntent.FLAG_IMMUTABLE  /* flags */);
     }
 
     /**
diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
index 2bc09e9..576b435 100644
--- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
+++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java
@@ -116,8 +116,8 @@
 
     private RowBuilder buildRowBuilder(CharSequence title, String summary, IconCompat icon) {
         final SliceAction primarySliceAction = SliceAction.createDeeplink(
-                PendingIntent.getActivity(mContext, 0, getIntent(), 0), icon,
-                ListBuilder.ICON_IMAGE, title);
+                PendingIntent.getActivity(mContext, 0, getIntent(), PendingIntent.FLAG_IMMUTABLE),
+                icon, ListBuilder.ICON_IMAGE, title);
 
         return new RowBuilder()
                 .setTitleItem(icon, ListBuilder.ICON_IMAGE)
diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
index 017c101..dcd3703 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -93,8 +93,8 @@
         super.onResume();
         mSwitchBar = ((SettingsActivity) getActivity()).getSwitchBar();
         mSwitchBar.setSwitchBarText(
-                R.string.spell_checker_master_switch_title,
-                R.string.spell_checker_master_switch_title);
+                R.string.spell_checker_primary_switch_title,
+                R.string.spell_checker_primary_switch_title);
         mSwitchBar.show();
         mSwitchBar.addOnSwitchChangeListener(this);
         updatePreferenceScreen();
diff --git a/src/com/android/settings/location/LocationEnabler.java b/src/com/android/settings/location/LocationEnabler.java
index db53973..ab59b8e 100644
--- a/src/com/android/settings/location/LocationEnabler.java
+++ b/src/com/android/settings/location/LocationEnabler.java
@@ -109,7 +109,7 @@
 
         if (isRestricted()) {
             // Location toggling disabled by user restriction. Read the current location mode to
-            // update the location master switch.
+            // update the location primary switch.
             if (Log.isLoggable(TAG, Log.INFO)) {
                 Log.i(TAG, "Restricted user, not setting location mode");
             }
diff --git a/src/com/android/settings/location/LocationIndicatorsPreferenceController.java b/src/com/android/settings/location/LocationIndicatorsPreferenceController.java
new file mode 100644
index 0000000..f7b7408
--- /dev/null
+++ b/src/com/android/settings/location/LocationIndicatorsPreferenceController.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.provider.DeviceConfig;
+
+import com.android.settings.Utils;
+import com.android.settings.core.TogglePreferenceController;
+
+/** Controller for location indicators toggle. */
+public class LocationIndicatorsPreferenceController extends TogglePreferenceController {
+
+    public LocationIndicatorsPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
+                Utils.PROPERTY_LOCATION_INDICATORS_ENABLED, false);
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+                Utils.PROPERTY_LOCATION_INDICATORS_ENABLED, Boolean.toString(isChecked), true);
+        return true;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        // Location indicators feature is only available on devices that support location.
+        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LOCATION)
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+}
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 26a4afd..4391811 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -41,7 +41,7 @@
  * <ul>
  *     <li>Platform location controls</li>
  *     <ul>
- *         <li>In switch bar: location master switch. Used to toggle location on and off.
+ *         <li>In switch bar: location primary switch. Used to toggle location on and off.
  *         </li>
  *     </ul>
  *     <li>Recent location requests: automatically populated by {@link RecentLocationApps}</li>
@@ -71,8 +71,8 @@
         super.onActivityCreated(savedInstanceState);
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SwitchBar switchBar = activity.getSwitchBar();
-        switchBar.setSwitchBarText(R.string.location_settings_master_switch_title,
-                R.string.location_settings_master_switch_title);
+        switchBar.setSwitchBarText(R.string.location_settings_primary_switch_title,
+                R.string.location_settings_primary_switch_title);
         mSwitchBarController = new LocationSwitchBarController(activity, switchBar,
                 getSettingsLifecycle());
         switchBar.show();
diff --git a/src/com/android/settings/location/LocationSlice.java b/src/com/android/settings/location/LocationSlice.java
index 2759690..f8add12 100644
--- a/src/com/android/settings/location/LocationSlice.java
+++ b/src/com/android/settings/location/LocationSlice.java
@@ -96,6 +96,6 @@
     private PendingIntent getPrimaryAction() {
         final Intent intent = getIntent();
         return PendingIntent.getActivity(mContext, 0 /* requestCode */,
-                intent, 0 /* flags */);
+                intent, PendingIntent.FLAG_IMMUTABLE);
     }
 }
diff --git a/src/com/android/settings/location/LocationSwitchBarController.java b/src/com/android/settings/location/LocationSwitchBarController.java
index 7aa66ce..e8458d1 100644
--- a/src/com/android/settings/location/LocationSwitchBarController.java
+++ b/src/com/android/settings/location/LocationSwitchBarController.java
@@ -60,9 +60,9 @@
 
     @Override
     public void onLocationModeChanged(int mode, boolean restricted) {
-        // Restricted user can't change the location mode, so disable the master switch. But in some
-        // corner cases, the location might still be enabled. In such case the master switch should
-        // be disabled but checked.
+        // Restricted user can't change the location mode, so disable the primary switch. But in
+        // some corner cases, the location might still be enabled. In such case the primary switch
+        // should be disabled but checked.
         final boolean enabled = mLocationEnabler.isEnabled(mode);
         final int userId = UserHandle.myUserId();
         final RestrictedLockUtils.EnforcedAdmin admin =
@@ -90,7 +90,7 @@
     }
 
     /**
-     * Listens to the state change of the location master switch.
+     * Listens to the state change of the location primary switch.
      */
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
diff --git a/src/com/android/settings/location/TopLevelLocationPreferenceController.java b/src/com/android/settings/location/TopLevelLocationPreferenceController.java
index ec58a34..fe85c7f 100644
--- a/src/com/android/settings/location/TopLevelLocationPreferenceController.java
+++ b/src/com/android/settings/location/TopLevelLocationPreferenceController.java
@@ -11,6 +11,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.permission.PermissionControllerManager;
+import android.util.FeatureFlagUtils;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
@@ -18,6 +19,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -50,6 +52,11 @@
 
     @Override
     public CharSequence getSummary() {
+        // Remove homepage summaries for silky home.
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            return null;
+        }
+
         if (mLocationManager.isLocationEnabled()) {
             if (mNumTotal == -1) {
                 return mContext.getString(R.string.location_settings_loading_app_permission_stats);
diff --git a/src/com/android/settings/media/BluetoothPairingReceiver.java b/src/com/android/settings/media/BluetoothPairingReceiver.java
new file mode 100644
index 0000000..5b57800
--- /dev/null
+++ b/src/com/android/settings/media/BluetoothPairingReceiver.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2020 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.media;
+
+import android.app.settings.SettingsEnums;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+
+import com.android.settings.R;
+import com.android.settings.bluetooth.BluetoothPairingDetail;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settingslib.media.MediaOutputSliceConstants;
+
+/**
+ * BroadcastReceiver for handling media output intent
+ */
+public class BluetoothPairingReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (TextUtils.equals(MediaOutputSliceConstants.ACTION_LAUNCH_BLUETOOTH_PAIRING,
+                intent.getAction())) {
+            context.startActivity(new SubSettingLauncher(context)
+                    .setDestination(BluetoothPairingDetail.class.getName())
+                    .setTitleRes(R.string.bluetooth_pairing_page_title)
+                    .setSourceMetricsCategory(SettingsEnums.BLUETOOTH_PAIRING_RECEIVER)
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                    .toIntent());
+        }
+    }
+}
diff --git a/src/com/android/settings/media/MediaDeviceUpdateWorker.java b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
index 1288cf5..14e8267 100644
--- a/src/com/android/settings/media/MediaDeviceUpdateWorker.java
+++ b/src/com/android/settings/media/MediaDeviceUpdateWorker.java
@@ -18,8 +18,6 @@
 
 import static android.media.AudioManager.STREAM_DEVICES_CHANGED_ACTION;
 
-import static com.android.settings.media.MediaOutputSlice.MEDIA_PACKAGE_NAME;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -30,6 +28,7 @@
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.text.TextUtils;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 
@@ -51,6 +50,11 @@
 public class MediaDeviceUpdateWorker extends SliceBackgroundWorker
         implements LocalMediaManager.DeviceCallback {
 
+    private static final String TAG = "MediaDeviceUpdateWorker";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    public static final String MEDIA_PACKAGE_NAME = "media_package_name";
+
     protected final Context mContext;
     protected final Collection<MediaDevice> mMediaDevices = new CopyOnWriteArrayList<>();
     private final DevicesChangedBroadcastReceiver mReceiver;
@@ -213,6 +217,10 @@
         final List<RoutingSessionInfo> sessionInfos = new ArrayList<>();
         for (RoutingSessionInfo info : mLocalMediaManager.getActiveMediaSession()) {
             if (!info.isSystemSession()) {
+                if (DEBUG) {
+                    Log.d(TAG, "getActiveRemoteMediaDevice() info : " + info.toString()
+                            + ", package name : " + info.getClientPackageName());
+                }
                 sessionInfos.add(info);
             }
         }
@@ -247,6 +255,10 @@
 
     }
 
+    boolean shouldDisableMediaOutput(String packageName) {
+        return mLocalMediaManager.shouldDisableMediaOutput(packageName);
+    }
+
     private class DevicesChangedBroadcastReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
diff --git a/src/com/android/settings/media/MediaOutputGroupSlice.java b/src/com/android/settings/media/MediaOutputGroupSlice.java
deleted file mode 100644
index d33ca45..0000000
--- a/src/com/android/settings/media/MediaOutputGroupSlice.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*
- * Copyright (C) 2020 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.media;
-
-import static android.app.slice.Slice.EXTRA_RANGE_VALUE;
-
-import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_GROUP_SLICE_URI;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.slices.CustomSliceable;
-import com.android.settings.slices.SliceBackgroundWorker;
-import com.android.settings.slices.SliceBroadcastReceiver;
-import com.android.settingslib.media.MediaDevice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Show the Media device that can be transfer the media.
- */
-public class MediaOutputGroupSlice implements CustomSliceable {
-
-    @VisibleForTesting
-    static final String GROUP_DEVICES = "group_devices";
-    @VisibleForTesting
-    static final String MEDIA_DEVICE_ID = "media_device_id";
-    @VisibleForTesting
-    static final String CUSTOMIZED_ACTION = "customized_action";
-    @VisibleForTesting
-    static final int ACTION_VOLUME_ADJUSTMENT = 1;
-    @VisibleForTesting
-    static final int ACTION_MEDIA_SESSION_OPERATION = 2;
-    @VisibleForTesting
-    static final int ERROR = -1;
-
-    private static final String TAG = "MediaOutputGroupSlice";
-    private static final int COLOR_DISABLED = (int) (255 * 0.3);
-
-    private final Context mContext;
-    private MediaDeviceUpdateWorker mWorker;
-
-    public MediaOutputGroupSlice(Context context) {
-        mContext = context;
-    }
-
-    @Override
-    public Slice getSlice() {
-        final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
-                .setAccentColor(COLOR_NOT_TINTED);
-        // Add "Group" row
-        final IconCompat titleIcon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_speaker_group_black_24dp);
-        final Bitmap emptyBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
-        if (getWorker() == null) {
-            return listBuilder.build();
-        }
-        final int maxVolume = getWorker().getSessionVolumeMax();
-        final String title = mContext.getString(R.string.media_output_group);
-        final SliceAction primaryAction = SliceAction.createDeeplink(
-                getBroadcastIntent(GROUP_DEVICES,
-                        GROUP_DEVICES.hashCode(),
-                        ACTION_MEDIA_SESSION_OPERATION),
-                titleIcon, ListBuilder.ICON_IMAGE, GROUP_DEVICES);
-        final SliceAction endItemAction = SliceAction.createDeeplink(
-                getBroadcastIntent(GROUP_DEVICES,
-                        GROUP_DEVICES.hashCode() + ACTION_MEDIA_SESSION_OPERATION,
-                        ACTION_MEDIA_SESSION_OPERATION),
-                IconCompat.createWithBitmap(emptyBitmap), ListBuilder.ICON_IMAGE, "");
-        if (maxVolume > 0 && !getWorker().hasAdjustVolumeUserRestriction()) {
-            // Add InputRange row
-            listBuilder.addInputRange(new ListBuilder.InputRangeBuilder()
-                    .setTitleItem(titleIcon, ListBuilder.ICON_IMAGE)
-                    .addEndItem(endItemAction)
-                    .setTitle(title)
-                    .setPrimaryAction(primaryAction)
-                    .setInputAction(getBroadcastIntent(GROUP_DEVICES,
-                            GROUP_DEVICES.hashCode() + ACTION_VOLUME_ADJUSTMENT,
-                            ACTION_VOLUME_ADJUSTMENT))
-                    .setMax(maxVolume)
-                    .setValue(getWorker().getSessionVolume()));
-        } else {    // No max volume information. Add generic Row
-            listBuilder.addRow(new ListBuilder.RowBuilder()
-                    .setTitleItem(titleIcon, ListBuilder.ICON_IMAGE)
-                    .setTitle(title)
-                    .setPrimaryAction(primaryAction));
-        }
-        // Add device row
-        addRow(listBuilder, getWorker().getSelectedMediaDevice(), true);
-        addRow(listBuilder, getWorker().getSelectableMediaDevice(), false);
-        return listBuilder.build();
-    }
-
-    private void addRow(ListBuilder listBuilder, List<MediaDevice> mediaDevices, boolean selected) {
-        final boolean adjustVolumeUserRestriction = getWorker().hasAdjustVolumeUserRestriction();
-        List<MediaDevice> deselectableMediaDevices = new ArrayList<>();
-        if (selected) {
-            deselectableMediaDevices = getWorker().getDeselectableMediaDevice();
-        }
-        for (MediaDevice device : mediaDevices) {
-            final int maxVolume = device.getMaxVolume();
-            final IconCompat titleIcon = Utils.createIconWithDrawable(device.getIcon());
-            final String title = device.getName();
-            final SliceAction disabledIconSliceAction = SliceAction.createDeeplink(
-                    getBroadcastIntent(null, 0, 0),
-                    getDisabledCheckboxIcon(), ListBuilder.ICON_IMAGE, "");
-            final SliceAction enabledIconSliceAction = SliceAction.createToggle(
-                    getBroadcastIntent(device.getId(),
-                            device.hashCode() + ACTION_MEDIA_SESSION_OPERATION,
-                            ACTION_MEDIA_SESSION_OPERATION),
-                    IconCompat.createWithResource(mContext, R.drawable.ic_check_box_anim),
-                    "",
-                    selected);
-            if (maxVolume > 0 && selected && !adjustVolumeUserRestriction) {
-                // Add InputRange row
-                final ListBuilder.InputRangeBuilder builder = new ListBuilder.InputRangeBuilder()
-                        .setTitleItem(titleIcon, ListBuilder.ICON_IMAGE)
-                        .setTitle(title)
-                        .setInputAction(getBroadcastIntent(device.getId(),
-                                device.hashCode() + ACTION_VOLUME_ADJUSTMENT,
-                                ACTION_VOLUME_ADJUSTMENT))
-                        .setMax(device.getMaxVolume())
-                        .setValue(device.getCurrentVolume());
-                // Add endItem with different icons
-                if (selected && (!getWorker().isDeviceIncluded(deselectableMediaDevices, device)
-                        || mediaDevices.size() == 1)) {
-                    builder.addEndItem(disabledIconSliceAction);
-                } else {
-                    builder.addEndItem(enabledIconSliceAction);
-                }
-                listBuilder.addInputRange(builder);
-            } else {    // No max volume information. Add generic Row
-                final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()
-                        .setTitleItem(titleIcon, ListBuilder.ICON_IMAGE)
-                        .setTitle(title);
-                // Add endItem with different icons
-                if (selected && (!getWorker().isDeviceIncluded(deselectableMediaDevices, device)
-                        || mediaDevices.size() == 1)) {
-                    rowBuilder.addEndItem(disabledIconSliceAction);
-                } else {
-                    rowBuilder.addEndItem(enabledIconSliceAction);
-                }
-                listBuilder.addRow(rowBuilder);
-            }
-        }
-    }
-
-    private IconCompat getDisabledCheckboxIcon() {
-        final Drawable drawable = mContext.getDrawable(R.drawable.ic_check_box_blue_24dp).mutate();
-        final Bitmap checkbox = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
-                drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-        final Canvas canvas = new Canvas(checkbox);
-        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        drawable.setAlpha(COLOR_DISABLED);
-        drawable.draw(canvas);
-
-        return IconCompat.createWithBitmap(checkbox);
-    }
-
-    private PendingIntent getBroadcastIntent(String id, int requestCode, int action) {
-        final Intent intent = new Intent(getUri().toString());
-        intent.setClass(mContext, SliceBroadcastReceiver.class);
-        intent.putExtra(MEDIA_DEVICE_ID, id);
-        intent.putExtra(CUSTOMIZED_ACTION, action);
-        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        return PendingIntent.getBroadcast(mContext, requestCode, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-    }
-
-    private MediaDeviceUpdateWorker getWorker() {
-        if (mWorker == null) {
-            mWorker = SliceBackgroundWorker.getInstance(getUri());
-        }
-        return mWorker;
-    }
-
-    @Override
-    public Uri getUri() {
-        return MEDIA_OUTPUT_GROUP_SLICE_URI;
-    }
-
-    @Override
-    public void onNotifyChange(Intent intent) {
-        final String id = intent.getStringExtra(MEDIA_DEVICE_ID);
-        if (TextUtils.isEmpty(id)) {
-            Log.e(TAG, "Unable to handle notification. The device is unavailable");
-            return;
-        }
-        final MediaDeviceUpdateWorker worker = getWorker();
-        final MediaDevice device = worker.getMediaDeviceById(id);
-        switch (intent.getIntExtra(CUSTOMIZED_ACTION, ERROR)) {
-            case ACTION_VOLUME_ADJUSTMENT:
-                final int newPosition = intent.getIntExtra(EXTRA_RANGE_VALUE, ERROR);
-                if (newPosition == ERROR) {
-                    Log.e(TAG, "Unable to adjust volume. The volume value is unavailable");
-                    return;
-                }
-                // Group volume adjustment
-                if (TextUtils.equals(id, GROUP_DEVICES)) {
-                    worker.adjustSessionVolume(newPosition);
-                } else {
-                    if (device == null) {
-                        Log.e(TAG, "Unable to adjust volume. The device(" + id
-                                + ") is unavailable");
-                        return;
-                    }
-                    // Single device volume adjustment
-                    worker.adjustVolume(device, newPosition);
-                }
-                break;
-            case ACTION_MEDIA_SESSION_OPERATION:
-                if (device == null) {
-                    Log.e(TAG, "Unable to adjust session volume. The device(" + id
-                            + ") is unavailable");
-                    return;
-                }
-                if (worker.isDeviceIncluded(worker.getSelectableMediaDevice(), device)) {
-                    worker.addDeviceToPlayMedia(device);
-                } else if (worker.isDeviceIncluded(worker.getDeselectableMediaDevice(), device)) {
-                    worker.removeDeviceFromPlayMedia(device);
-                } else {
-                    // Do nothing
-                    Log.d(TAG, device.getName() + " is not selectable nor deselectable");
-                }
-                break;
-        }
-    }
-
-    @Override
-    public Intent getIntent() {
-        return null;
-    }
-
-    @Override
-    public Class getBackgroundWorkerClass() {
-        return MediaDeviceUpdateWorker.class;
-    }
-}
diff --git a/src/com/android/settings/media/MediaOutputIndicatorSlice.java b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
index 17c8ef8..69e5dde 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorSlice.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorSlice.java
@@ -16,17 +16,15 @@
 
 package com.android.settings.media;
 
-import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
-
 import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI;
 
 import android.annotation.ColorInt;
-import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.media.session.MediaController;
 import android.net.Uri;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.core.graphics.drawable.IconCompat;
@@ -62,10 +60,9 @@
                 com.android.internal.R.drawable.ic_settings_bluetooth);
         final CharSequence title = mContext.getString(R.string.media_output_label_title,
                 Utils.getApplicationLabel(mContext, getWorker().getPackageName()));
-        final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext,
-                0 /* requestCode */, getMediaOutputSliceIntent(), FLAG_UPDATE_CURRENT);
-        final SliceAction primarySliceAction = SliceAction.createDeeplink(
-                primaryActionIntent, icon, ListBuilder.ICON_IMAGE, title);
+        final SliceAction primarySliceAction = SliceAction.create(
+                getBroadcastIntent(mContext), icon, ListBuilder.ICON_IMAGE, title);
+
         @ColorInt final int color = Utils.getColorAccentDefaultColor(mContext);
         // To set an empty icon to indent the row
         final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
@@ -78,22 +75,6 @@
         return listBuilder.build();
     }
 
-    @VisibleForTesting
-    Intent getMediaOutputSliceIntent() {
-        final MediaController mediaController = getWorker().getActiveLocalMediaController();
-        final Intent intent = new Intent()
-                .setPackage(Utils.SETTINGS_PACKAGE_NAME)
-                .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        if (mediaController != null) {
-            intent.putExtra(MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN,
-                    mediaController.getSessionToken());
-            intent.putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
-                    mediaController.getPackageName());
-        }
-        return intent;
-    }
-
     private IconCompat createEmptyIcon() {
         final Bitmap bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
         return IconCompat.createWithBitmap(bitmap);
@@ -106,7 +87,7 @@
 
     @Override
     public Intent getIntent() {
-        // This Slice reflects active media device information and launch MediaOutputSlice. It does
+        // This Slice reflects active media device information and launch MediaOutputDialog. It does
         // not contain its owned Slice data
         return null;
     }
@@ -136,4 +117,26 @@
                 && getWorker().getMediaDevices().size() > 0
                 && getWorker().getActiveLocalMediaController() != null;
     }
+
+    @Override
+    public void onNotifyChange(Intent intent) {
+        final MediaController mediaController = getWorker().getActiveLocalMediaController();
+
+        if (mediaController == null) {
+            Log.d(TAG, "No active local media controller");
+            return;
+        }
+        // Launch media output dialog
+        mContext.sendBroadcast(new Intent()
+                .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)
+                .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)
+                .putExtra(MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN,
+                        mediaController.getSessionToken())
+                .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
+                        mediaController.getPackageName()));
+        // Dismiss volume panel
+        mContext.sendBroadcast(new Intent()
+                .setPackage(MediaOutputSliceConstants.SETTINGS_PACKAGE_NAME)
+                .setAction(MediaOutputSliceConstants.ACTION_CLOSE_PANEL));
+    }
 }
diff --git a/src/com/android/settings/media/MediaOutputIndicatorWorker.java b/src/com/android/settings/media/MediaOutputIndicatorWorker.java
index f094d47..ef3a7bc 100644
--- a/src/com/android/settings/media/MediaOutputIndicatorWorker.java
+++ b/src/com/android/settings/media/MediaOutputIndicatorWorker.java
@@ -25,7 +25,6 @@
 import android.media.AudioManager;
 import android.media.session.MediaController;
 import android.media.session.MediaSessionManager;
-import android.media.session.PlaybackState;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
@@ -53,6 +52,7 @@
         LocalMediaManager.DeviceCallback {
 
     private static final String TAG = "MediaOutputIndWorker";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     private final DevicesChangedBroadcastReceiver mReceiver;
     private final Context mContext;
@@ -127,24 +127,8 @@
 
     @Nullable
     MediaController getActiveLocalMediaController() {
-        final MediaSessionManager mMediaSessionManager = mContext.getSystemService(
-                MediaSessionManager.class);
-
-        for (MediaController controller : mMediaSessionManager.getActiveSessions(null)) {
-            final MediaController.PlaybackInfo pi = controller.getPlaybackInfo();
-            if (pi == null) {
-                return null;
-            }
-            final PlaybackState playbackState = controller.getPlaybackState();
-            if (playbackState == null) {
-                return null;
-            }
-            if (pi.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL
-                    && playbackState.getState() == PlaybackState.STATE_PLAYING) {
-                return controller;
-            }
-        }
-        return null;
+        return MediaOutputUtils.getActiveLocalMediaController(mContext.getSystemService(
+                MediaSessionManager.class));
     }
 
     @Override
diff --git a/src/com/android/settings/media/MediaOutputSlice.java b/src/com/android/settings/media/MediaOutputSlice.java
deleted file mode 100644
index 94a4f50..0000000
--- a/src/com/android/settings/media/MediaOutputSlice.java
+++ /dev/null
@@ -1,405 +0,0 @@
-/*
- * Copyright (C) 2019 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.media;
-
-import static android.app.slice.Slice.EXTRA_RANGE_VALUE;
-import static android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE;
-
-import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_SLICE_URI;
-
-import android.app.PendingIntent;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.text.SpannableString;
-import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
-import android.util.Log;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.builders.ListBuilder;
-import androidx.slice.builders.SliceAction;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.bluetooth.BluetoothPairingDetail;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.slices.CustomSliceable;
-import com.android.settings.slices.SliceBackgroundWorker;
-import com.android.settings.slices.SliceBroadcastReceiver;
-import com.android.settingslib.media.LocalMediaManager;
-import com.android.settingslib.media.MediaDevice;
-import com.android.settingslib.media.MediaOutputSliceConstants;
-
-import java.util.Collection;
-
-/**
- * Show the Media device that can be transfer the media.
- */
-public class MediaOutputSlice implements CustomSliceable {
-
-    private static final String TAG = "MediaOutputSlice";
-    private static final String MEDIA_DEVICE_ID = "media_device_id";
-    private static final String MEDIA_GROUP_DEVICE = "media_group_device";
-    private static final String MEDIA_GROUP_REQUEST = "media_group_request";
-    private static final int NON_SLIDER_VALUE = -1;
-
-    public static final String MEDIA_PACKAGE_NAME = "media_package_name";
-
-    private final Context mContext;
-
-    private MediaDeviceUpdateWorker mWorker;
-
-    public MediaOutputSlice(Context context) {
-        mContext = context;
-    }
-
-    @VisibleForTesting
-    void init(MediaDeviceUpdateWorker worker) {
-        mWorker = worker;
-    }
-
-    @Override
-    public Slice getSlice() {
-        final ListBuilder listBuilder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
-                .setAccentColor(COLOR_NOT_TINTED);
-        if (!isVisible()) {
-            Log.d(TAG, "getSlice() is not visible");
-            return listBuilder.build();
-        }
-
-        final Collection<MediaDevice> devices = getMediaDevices();
-        final MediaDeviceUpdateWorker worker = getWorker();
-
-        if (worker.getSelectedMediaDevice().size() > 1) {
-            // Insert group item to the first when it is available
-            if (worker.getSessionVolumeMax() > 0 && !worker.hasAdjustVolumeUserRestriction()) {
-                listBuilder.addInputRange(getGroupSliderRow());
-            } else {
-                listBuilder.addRow(getGroupRow());
-            }
-            // Add all other devices
-            for (MediaDevice device : devices) {
-                addRow(device, null /* connectedDevice */, listBuilder);
-            }
-        } else {
-            final MediaDevice connectedDevice = worker.getCurrentConnectedMediaDevice();
-            if (devices.size() == 1) {
-                // Zero state
-                for (MediaDevice device : devices) {
-                    addRow(device, device, listBuilder);
-                }
-                listBuilder.addRow(getPairNewRow());
-            } else {
-                final boolean isTouched = worker.getIsTouched();
-                // Fix the last top device when user press device to transfer.
-                final MediaDevice topDevice = isTouched ? worker.getTopDevice() : connectedDevice;
-
-                if (topDevice != null) {
-                    addRow(topDevice, connectedDevice, listBuilder);
-                    worker.setTopDevice(topDevice);
-                }
-
-                for (MediaDevice device : devices) {
-                    if (topDevice == null || !TextUtils.equals(topDevice.getId(), device.getId())) {
-                        addRow(device, connectedDevice, listBuilder);
-                    }
-                }
-            }
-        }
-        return listBuilder.build();
-    }
-
-    private ListBuilder.RowBuilder getPairNewRow() {
-        final Drawable d = mContext.getDrawable(R.drawable.ic_add_24dp);
-        d.setColorFilter(new PorterDuffColorFilter(Utils.getColorAccentDefaultColor(mContext),
-                PorterDuff.Mode.SRC_IN));
-        final IconCompat icon = Utils.createIconWithDrawable(d);
-        final String title = mContext.getString(R.string.bluetooth_pairing_pref_title);
-        final Intent intent = new SubSettingLauncher(mContext)
-                .setDestination(BluetoothPairingDetail.class.getName())
-                .setTitleRes(R.string.bluetooth_pairing_page_title)
-                .setSourceMetricsCategory(SettingsEnums.PANEL_MEDIA_OUTPUT)
-                .toIntent();
-        final SliceAction primarySliceAction = SliceAction.createDeeplink(
-                PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */),
-                IconCompat.createWithResource(mContext, R.drawable.ic_add_24dp/*ic_add_blue_24dp*/),
-                ListBuilder.ICON_IMAGE,
-                mContext.getText(R.string.bluetooth_pairing_pref_title));
-        final ListBuilder.RowBuilder builder = new ListBuilder.RowBuilder()
-                .setTitleItem(icon, ListBuilder.ICON_IMAGE)
-                .setTitle(title)
-                .setPrimaryAction(primarySliceAction);
-        return builder;
-    }
-
-    private ListBuilder.InputRangeBuilder getGroupSliderRow() {
-        final IconCompat icon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_speaker_group_black_24dp);
-        final CharSequence sessionName = getWorker().getSessionName();
-        final CharSequence title = TextUtils.isEmpty(sessionName)
-                ? mContext.getString(R.string.media_output_group) : sessionName;
-        final PendingIntent broadcastAction =
-                getBroadcastIntent(mContext, MEDIA_GROUP_DEVICE, MEDIA_GROUP_DEVICE.hashCode());
-        final SliceAction primarySliceAction = SliceAction.createDeeplink(broadcastAction, icon,
-                ListBuilder.ICON_IMAGE, title);
-        final ListBuilder.InputRangeBuilder builder = new ListBuilder.InputRangeBuilder()
-                .setTitleItem(icon, ListBuilder.ICON_IMAGE)
-                .setTitle(title)
-                .setPrimaryAction(primarySliceAction)
-                .setInputAction(getSliderInputAction(MEDIA_GROUP_DEVICE.hashCode(),
-                        MEDIA_GROUP_DEVICE))
-                .setMax(getWorker().getSessionVolumeMax())
-                .setValue(getWorker().getSessionVolume())
-                .addEndItem(getEndItemSliceAction());
-        return builder;
-    }
-
-    private ListBuilder.RowBuilder getGroupRow() {
-        final IconCompat icon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_speaker_group_black_24dp);
-        final CharSequence sessionName = getWorker().getSessionName();
-        final CharSequence title = TextUtils.isEmpty(sessionName)
-                ? mContext.getString(R.string.media_output_group) : sessionName;
-        final PendingIntent broadcastAction =
-                getBroadcastIntent(mContext, MEDIA_GROUP_DEVICE, MEDIA_GROUP_DEVICE.hashCode());
-        final SliceAction primarySliceAction = SliceAction.createDeeplink(broadcastAction, icon,
-                ListBuilder.ICON_IMAGE, title);
-        final ListBuilder.RowBuilder builder = new ListBuilder.RowBuilder()
-                .setTitleItem(icon, ListBuilder.ICON_IMAGE)
-                .setTitle(title)
-                .setPrimaryAction(primarySliceAction)
-                .addEndItem(getEndItemSliceAction());
-        return builder;
-    }
-
-    private void addRow(MediaDevice device, MediaDevice connectedDevice, ListBuilder listBuilder) {
-        if (connectedDevice != null && TextUtils.equals(device.getId(), connectedDevice.getId())) {
-            final String title = device.getName();
-            final IconCompat icon = getDeviceIconCompat(device);
-
-            final PendingIntent broadcastAction =
-                    getBroadcastIntent(mContext, device.getId(), device.hashCode());
-            final SliceAction primarySliceAction = SliceAction.createDeeplink(broadcastAction, icon,
-                    ListBuilder.ICON_IMAGE, title);
-
-            if (device.getMaxVolume() > 0 && !getWorker().hasAdjustVolumeUserRestriction()) {
-                final ListBuilder.InputRangeBuilder builder = new ListBuilder.InputRangeBuilder()
-                        .setTitleItem(icon, ListBuilder.ICON_IMAGE)
-                        .setTitle(title)
-                        .setPrimaryAction(primarySliceAction)
-                        .setInputAction(getSliderInputAction(device.hashCode(), device.getId()))
-                        .setMax(device.getMaxVolume())
-                        .setValue(device.getCurrentVolume());
-                // Check end item visibility
-                if (device.getDeviceType() == MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE
-                        && !getWorker().getSelectableMediaDevice().isEmpty()) {
-                    builder.addEndItem(getEndItemSliceAction());
-                }
-                listBuilder.addInputRange(builder);
-            } else {
-                Log.d(TAG, "addRow device = " + device.getName() + " MaxVolume = "
-                        + device.getMaxVolume());
-                final ListBuilder.RowBuilder builder = getMediaDeviceRow(device);
-                // Check end item visibility
-                if (device.getDeviceType() == MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE
-                        && !getWorker().getSelectableMediaDevice().isEmpty()) {
-                    builder.addEndItem(getEndItemSliceAction());
-                }
-                listBuilder.addRow(builder);
-            }
-        } else {
-            if (device.getState() == LocalMediaManager.MediaDeviceState.STATE_CONNECTING) {
-                listBuilder.addRange(getTransferringMediaDeviceRow(device));
-            } else {
-                listBuilder.addRow(getMediaDeviceRow(device));
-            }
-        }
-    }
-
-    private PendingIntent getSliderInputAction(int requestCode, String id) {
-        final Intent intent = new Intent(getUri().toString())
-                .setData(getUri())
-                .putExtra(MEDIA_DEVICE_ID, id)
-                .setClass(mContext, SliceBroadcastReceiver.class);
-
-        return PendingIntent.getBroadcast(mContext, requestCode, intent, 0);
-    }
-
-    private SliceAction getEndItemSliceAction() {
-        final Intent intent = new Intent()
-                .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT_GROUP)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
-                        getWorker().getPackageName());
-
-        return SliceAction.createDeeplink(
-                PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */),
-                IconCompat.createWithResource(mContext, R.drawable.ic_add_blue_24dp),
-                ListBuilder.ICON_IMAGE,
-                mContext.getText(R.string.add));
-    }
-
-    private IconCompat getDeviceIconCompat(MediaDevice device) {
-        Drawable drawable = device.getIcon();
-        if (drawable == null) {
-            Log.d(TAG, "getDeviceIconCompat() device : " + device.getName() + ", drawable is null");
-            // Use default Bluetooth device icon to handle getIcon() is null case.
-            drawable = mContext.getDrawable(com.android.internal.R.drawable.ic_bt_headphones_a2dp);
-        }
-
-        return Utils.createIconWithDrawable(drawable);
-    }
-
-    private MediaDeviceUpdateWorker getWorker() {
-        if (mWorker == null) {
-            mWorker = SliceBackgroundWorker.getInstance(getUri());
-        }
-        return mWorker;
-    }
-
-    private Collection<MediaDevice> getMediaDevices() {
-        final Collection<MediaDevice> devices = getWorker().getMediaDevices();
-        return devices;
-    }
-
-    private ListBuilder.RangeBuilder getTransferringMediaDeviceRow(MediaDevice device) {
-        final IconCompat deviceIcon = getDeviceIconCompat(device);
-        final SliceAction sliceAction = SliceAction.create(getBroadcastIntent(mContext,
-                device.getId(), device.hashCode()), deviceIcon, ListBuilder.ICON_IMAGE,
-                mContext.getText(R.string.media_output_switching));
-
-        return new ListBuilder.RangeBuilder()
-                .setTitleItem(deviceIcon, ListBuilder.ICON_IMAGE)
-                .setMode(ListBuilder.RANGE_MODE_INDETERMINATE)
-                .setTitle(device.getName())
-                .setPrimaryAction(sliceAction);
-    }
-
-    private ListBuilder.RowBuilder getMediaDeviceRow(MediaDevice device) {
-        final String deviceName = device.getName();
-        final PendingIntent broadcastAction =
-                getBroadcastIntent(mContext, device.getId(), device.hashCode());
-        final IconCompat deviceIcon = getDeviceIconCompat(device);
-        final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()
-                .setTitleItem(deviceIcon, ListBuilder.ICON_IMAGE);
-
-        if (device.getDeviceType() == MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE
-                && !device.isConnected()) {
-            final int state = device.getState();
-            if (state == LocalMediaManager.MediaDeviceState.STATE_CONNECTING_FAILED) {
-                rowBuilder.setTitle(deviceName);
-                rowBuilder.setPrimaryAction(SliceAction.create(broadcastAction, deviceIcon,
-                        ListBuilder.ICON_IMAGE, deviceName));
-                rowBuilder.setSubtitle(mContext.getText(R.string.bluetooth_connect_failed));
-            } else {
-                // Append status to title only for the disconnected Bluetooth device.
-                final SpannableString spannableTitle = new SpannableString(
-                        mContext.getString(R.string.media_output_disconnected_status, deviceName));
-                spannableTitle.setSpan(new ForegroundColorSpan(
-                                Utils.getColorAttrDefaultColor(mContext,
-                                        android.R.attr.textColorSecondary)),
-                        deviceName.length(),
-                        spannableTitle.length(), SPAN_EXCLUSIVE_EXCLUSIVE);
-                rowBuilder.setTitle(spannableTitle);
-                rowBuilder.setPrimaryAction(SliceAction.create(broadcastAction, deviceIcon,
-                        ListBuilder.ICON_IMAGE, spannableTitle));
-            }
-        } else {
-            rowBuilder.setTitle(deviceName);
-            rowBuilder.setPrimaryAction(SliceAction.create(broadcastAction, deviceIcon,
-                    ListBuilder.ICON_IMAGE, deviceName));
-            if (device.getState() == LocalMediaManager.MediaDeviceState.STATE_CONNECTING_FAILED) {
-                rowBuilder.setSubtitle(mContext.getText(R.string.media_output_switch_error_text));
-            }
-        }
-
-        return rowBuilder;
-    }
-
-    private PendingIntent getBroadcastIntent(Context context, String id, int requestCode) {
-        final Intent intent = new Intent(getUri().toString());
-        intent.setClass(context, SliceBroadcastReceiver.class);
-        intent.putExtra(MEDIA_DEVICE_ID, id);
-        intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        return PendingIntent.getBroadcast(context, requestCode, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
-    }
-
-    @Override
-    public Uri getUri() {
-        return MEDIA_OUTPUT_SLICE_URI;
-    }
-
-    @Override
-    public void onNotifyChange(Intent intent) {
-        final MediaDeviceUpdateWorker worker = getWorker();
-        final String id = intent != null ? intent.getStringExtra(MEDIA_DEVICE_ID) : "";
-        if (TextUtils.isEmpty(id)) {
-            return;
-        }
-
-        final int newPosition = intent.getIntExtra(EXTRA_RANGE_VALUE, NON_SLIDER_VALUE);
-        if (TextUtils.equals(id, MEDIA_GROUP_DEVICE)) {
-            // Session volume adjustment
-            worker.adjustSessionVolume(newPosition);
-        } else {
-            final MediaDevice device = worker.getMediaDeviceById(id);
-            if (device == null) {
-                Log.d(TAG, "onNotifyChange: Unable to get device " + id);
-                return;
-            }
-
-            if (newPosition == NON_SLIDER_VALUE) {
-                // Intent for device connection
-                Log.d(TAG, "onNotifyChange: Switch to " + device.getName());
-                worker.setIsTouched(true);
-                worker.connectDevice(device);
-            } else {
-                // Single device volume adjustment
-                worker.adjustVolume(device, newPosition);
-            }
-        }
-    }
-
-    @Override
-    public Intent getIntent() {
-        return null;
-    }
-
-    @Override
-    public Class getBackgroundWorkerClass() {
-        return MediaOutputSliceWorker.class;
-    }
-
-    private boolean isVisible() {
-        // To decide Slice's visibility.
-        // Return true if
-        // 1. AudioMode is not in on-going call
-        // 2. worker is not null
-        // 3. Available devices are more than 0
-        return getWorker() != null
-                && !com.android.settingslib.Utils.isAudioModeOngoingCall(mContext)
-                && getWorker().getMediaDevices().size() > 0;
-    }
-}
diff --git a/src/com/android/settings/media/MediaOutputSliceWorker.java b/src/com/android/settings/media/MediaOutputSliceWorker.java
deleted file mode 100644
index 357b234..0000000
--- a/src/com/android/settings/media/MediaOutputSliceWorker.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 2020 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.media;
-
-import static android.media.MediaRoute2ProviderService.REASON_INVALID_COMMAND;
-import static android.media.MediaRoute2ProviderService.REASON_NETWORK_ERROR;
-import static android.media.MediaRoute2ProviderService.REASON_REJECTED;
-import static android.media.MediaRoute2ProviderService.REASON_ROUTE_NOT_AVAILABLE;
-import static android.media.MediaRoute2ProviderService.REASON_UNKNOWN_ERROR;
-
-import android.content.Context;
-import android.content.pm.ApplicationInfo;
-import android.net.Uri;
-import android.util.Log;
-
-import com.android.settings.core.instrumentation.SettingsStatsLog;
-import com.android.settingslib.media.MediaDevice;
-
-/**
- * SliceBackgroundWorker for the MediaOutputSlice class.
- * It inherits from MediaDeviceUpdateWorker and add metrics logging.
- */
-public class MediaOutputSliceWorker extends MediaDeviceUpdateWorker {
-
-    private static final String TAG = "MediaOutputSliceWorker";
-    private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);
-
-    private MediaDevice mSourceDevice, mTargetDevice;
-    private int mWiredDeviceCount;
-    private int mConnectedBluetoothDeviceCount;
-    private int mRemoteDeviceCount;
-    private int mAppliedDeviceCountWithinRemoteGroup;
-
-    public MediaOutputSliceWorker(Context context, Uri uri) {
-        super(context, uri);
-    }
-
-    @Override
-    public void connectDevice(MediaDevice device) {
-        mSourceDevice = mLocalMediaManager.getCurrentConnectedDevice();
-        mTargetDevice = device;
-
-        if (DBG) {
-            Log.d(TAG, "connectDevice -"
-                    + " source:" + mSourceDevice.toString()
-                    + " target:" + mTargetDevice.toString());
-        }
-
-        super.connectDevice(device);
-    }
-
-    private int getLoggingDeviceType(MediaDevice device, boolean isSourceDevice) {
-        switch (device.getDeviceType()) {
-            case MediaDevice.MediaDeviceType.TYPE_PHONE_DEVICE:
-                return isSourceDevice
-                        ? SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__SOURCE__BUILTIN_SPEAKER
-                        : SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__TARGET__BUILTIN_SPEAKER;
-            case MediaDevice.MediaDeviceType.TYPE_3POINT5_MM_AUDIO_DEVICE:
-                return isSourceDevice
-                        ? SettingsStatsLog
-                        .MEDIA_OUTPUT_OP_SWITCH_REPORTED__SOURCE__WIRED_3POINT5_MM_AUDIO
-                        : SettingsStatsLog
-                                .MEDIA_OUTPUT_OP_SWITCH_REPORTED__TARGET__WIRED_3POINT5_MM_AUDIO;
-            case MediaDevice.MediaDeviceType.TYPE_USB_C_AUDIO_DEVICE:
-                return isSourceDevice
-                        ? SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__SOURCE__USB_C_AUDIO
-                        : SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__TARGET__USB_C_AUDIO;
-            case MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE:
-                return isSourceDevice
-                        ? SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__SOURCE__BLUETOOTH
-                        : SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__TARGET__BLUETOOTH;
-            case MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE:
-                return isSourceDevice
-                        ? SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__SOURCE__REMOTE_SINGLE
-                        : SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__TARGET__REMOTE_SINGLE;
-            case MediaDevice.MediaDeviceType.TYPE_CAST_GROUP_DEVICE:
-                return isSourceDevice
-                        ? SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__SOURCE__REMOTE_GROUP
-                        : SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__TARGET__REMOTE_GROUP;
-            default:
-                return isSourceDevice
-                        ? SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__SOURCE__UNKNOWN_TYPE
-                        : SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__TARGET__UNKNOWN_TYPE;
-        }
-    }
-
-    private int getLoggingSwitchOpSubResult(int reason) {
-        switch (reason) {
-            case REASON_REJECTED:
-                return SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__SUBRESULT__REJECTED;
-            case REASON_NETWORK_ERROR:
-                return SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__SUBRESULT__NETWORK_ERROR;
-            case REASON_ROUTE_NOT_AVAILABLE:
-                return SettingsStatsLog
-                        .MEDIA_OUTPUT_OP_SWITCH_REPORTED__SUBRESULT__ROUTE_NOT_AVAILABLE;
-            case REASON_INVALID_COMMAND:
-                return SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__SUBRESULT__INVALID_COMMAND;
-            case REASON_UNKNOWN_ERROR:
-            default:
-                return SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__SUBRESULT__UNKNOWN_ERROR;
-        }
-    }
-
-    private String getLoggingPackageName() {
-        final String packageName = getPackageName();
-        if (packageName != null && !packageName.isEmpty()) {
-            try {
-                final ApplicationInfo applicationInfo = mContext.getPackageManager()
-                        .getApplicationInfo(packageName, /* default flag */ 0);
-                if ((applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0
-                        || (applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
-                    return packageName;
-                }
-            } catch (Exception ex) {
-                Log.e(TAG, packageName + "is invalid.");
-            }
-        }
-
-        return "";
-    }
-
-    private void updateLoggingDeviceCount() {
-        mWiredDeviceCount = mConnectedBluetoothDeviceCount = mRemoteDeviceCount = 0;
-        mAppliedDeviceCountWithinRemoteGroup = 0;
-
-        for (MediaDevice mediaDevice : mMediaDevices) {
-            if (mediaDevice.isConnected()) {
-                switch (mediaDevice.getDeviceType()) {
-                    case MediaDevice.MediaDeviceType.TYPE_3POINT5_MM_AUDIO_DEVICE:
-                    case MediaDevice.MediaDeviceType.TYPE_USB_C_AUDIO_DEVICE:
-                        mWiredDeviceCount++;
-                        break;
-                    case MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE:
-                        mConnectedBluetoothDeviceCount++;
-                        break;
-                    case MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE:
-                    case MediaDevice.MediaDeviceType.TYPE_CAST_GROUP_DEVICE:
-                        mRemoteDeviceCount++;
-                        break;
-                    default:
-                }
-            }
-        }
-
-        if (DBG) {
-            Log.d(TAG, "connected devices:" + " wired: " + mWiredDeviceCount
-                    + " bluetooth: " + mConnectedBluetoothDeviceCount
-                    + " remote: " + mRemoteDeviceCount);
-        }
-    }
-
-    @Override
-    public void onSelectedDeviceStateChanged(MediaDevice device, int state) {
-        if (DBG) {
-            Log.d(TAG, "onSelectedDeviceStateChanged - " + device.toString());
-        }
-
-        updateLoggingDeviceCount();
-
-        SettingsStatsLog.write(
-                SettingsStatsLog.MEDIAOUTPUT_OP_SWITCH_REPORTED,
-                getLoggingDeviceType(mSourceDevice, true),
-                getLoggingDeviceType(mTargetDevice, false),
-                SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__RESULT__OK,
-                SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__SUBRESULT__NO_ERROR,
-                getLoggingPackageName(),
-                mWiredDeviceCount,
-                mConnectedBluetoothDeviceCount,
-                mRemoteDeviceCount,
-                mAppliedDeviceCountWithinRemoteGroup);
-
-        super.onSelectedDeviceStateChanged(device, state);
-    }
-
-    @Override
-    public void onRequestFailed(int reason) {
-        if (DBG) {
-            Log.e(TAG, "onRequestFailed - " + reason);
-        }
-
-        updateLoggingDeviceCount();
-
-        SettingsStatsLog.write(
-                SettingsStatsLog.MEDIAOUTPUT_OP_SWITCH_REPORTED,
-                getLoggingDeviceType(mSourceDevice, true),
-                getLoggingDeviceType(mTargetDevice, false),
-                SettingsStatsLog.MEDIA_OUTPUT_OP_SWITCH_REPORTED__RESULT__ERROR,
-                getLoggingSwitchOpSubResult(reason),
-                getLoggingPackageName(),
-                mWiredDeviceCount,
-                mConnectedBluetoothDeviceCount,
-                mRemoteDeviceCount,
-                mAppliedDeviceCountWithinRemoteGroup);
-
-        super.onRequestFailed(reason);
-    }
-}
diff --git a/src/com/android/settings/media/MediaOutputUtils.java b/src/com/android/settings/media/MediaOutputUtils.java
new file mode 100644
index 0000000..977c517
--- /dev/null
+++ b/src/com/android/settings/media/MediaOutputUtils.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2020 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.media;
+
+import android.media.session.MediaController;
+import android.media.session.MediaSessionManager;
+import android.media.session.PlaybackState;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import com.android.settings.sound.MediaOutputPreferenceController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Utilities that can be shared between {@link MediaOutputIndicatorWorker} and
+ * {@link MediaOutputPreferenceController}.
+ */
+public class MediaOutputUtils {
+
+    private static final String TAG = "MediaOutputUtils";
+    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+
+    /**
+     *  Returns a {@link MediaController} that state is playing and type is local playback,
+     *  and also have active sessions.
+     */
+    @Nullable
+    public static MediaController getActiveLocalMediaController(
+            MediaSessionManager mediaSessionManager) {
+
+        MediaController localController = null;
+        final List<String> remoteMediaSessionLists = new ArrayList<>();
+        for (MediaController controller : mediaSessionManager.getActiveSessions(null)) {
+            final MediaController.PlaybackInfo pi = controller.getPlaybackInfo();
+            if (pi == null) {
+                // do nothing
+                continue;
+            }
+            final PlaybackState playbackState = controller.getPlaybackState();
+            if (playbackState == null) {
+                // do nothing
+                continue;
+            }
+            if (DEBUG) {
+                Log.d(TAG, "getActiveLocalMediaController() package name : "
+                        + controller.getPackageName()
+                        + ", play back type : " + pi.getPlaybackType() + ", play back state : "
+                        + playbackState.getState());
+            }
+            if (playbackState.getState() != PlaybackState.STATE_PLAYING) {
+                // do nothing
+                continue;
+            }
+            if (pi.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE) {
+                if (localController != null && TextUtils.equals(localController.getPackageName(),
+                        controller.getPackageName())) {
+                    localController = null;
+                }
+                if (!remoteMediaSessionLists.contains(controller.getPackageName())) {
+                    remoteMediaSessionLists.add(controller.getPackageName());
+                }
+                continue;
+            }
+            if (pi.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL) {
+                if (localController == null
+                        && !remoteMediaSessionLists.contains(controller.getPackageName())) {
+                    localController = controller;
+                }
+            }
+        }
+        return localController;
+    }
+}
diff --git a/src/com/android/settings/media/RemoteMediaSlice.java b/src/com/android/settings/media/RemoteMediaSlice.java
index 61a53f3..839dc4f 100644
--- a/src/com/android/settings/media/RemoteMediaSlice.java
+++ b/src/com/android/settings/media/RemoteMediaSlice.java
@@ -17,6 +17,7 @@
 package com.android.settings.media;
 
 import static android.app.slice.Slice.EXTRA_RANGE_VALUE;
+import static android.text.Spanned.SPAN_EXCLUSIVE_EXCLUSIVE;
 
 import static com.android.settings.slices.CustomSliceRegistry.REMOTE_MEDIA_SLICE_URI;
 
@@ -24,11 +25,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
+import android.media.MediaRouter2Manager;
 import android.media.RoutingSessionInfo;
 import android.net.Uri;
+import android.text.SpannableString;
 import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
 import android.util.Log;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.core.graphics.drawable.IconCompat;
 import androidx.slice.Slice;
 import androidx.slice.builders.ListBuilder;
@@ -54,11 +59,17 @@
 
     private static final String TAG = "RemoteMediaSlice";
     private static final String MEDIA_ID = "media_id";
+    private static final String ACTION_LAUNCH_DIALOG = "action_launch_dialog";
+    private static final String SESSION_INFO = "RoutingSessionInfo";
+    private static final String CUSTOMIZED_ACTION = "customized_action";
 
     private final Context mContext;
 
     private MediaDeviceUpdateWorker mWorker;
 
+    @VisibleForTesting
+    MediaRouter2Manager mRouterManager;
+
     public RemoteMediaSlice(Context context) {
         mContext = context;
     }
@@ -69,6 +80,20 @@
         final String id = intent.getStringExtra(MEDIA_ID);
         if (!TextUtils.isEmpty(id)) {
             getWorker().adjustSessionVolume(id, newPosition);
+            return;
+        }
+        if (TextUtils.equals(ACTION_LAUNCH_DIALOG, intent.getStringExtra(CUSTOMIZED_ACTION))) {
+            // Launch Media Output Dialog
+            final RoutingSessionInfo info = intent.getParcelableExtra(SESSION_INFO);
+            mContext.sendBroadcast(new Intent()
+                    .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)
+                    .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)
+                    .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
+                            info.getClientPackageName()));
+            // Dismiss volume panel
+            mContext.sendBroadcast(new Intent()
+                    .setPackage(MediaOutputSliceConstants.SETTINGS_PACKAGE_NAME)
+                    .setAction(MediaOutputSliceConstants.ACTION_CLOSE_PANEL));
         }
     }
 
@@ -80,6 +105,9 @@
             Log.e(TAG, "Unable to get the slice worker.");
             return listBuilder.build();
         }
+        if (mRouterManager == null) {
+            mRouterManager = MediaRouter2Manager.getInstance(mContext);
+        }
         // Only displaying remote devices
         final List<RoutingSessionInfo> infos = getWorker().getActiveRemoteMediaDevice();
         if (infos.isEmpty()) {
@@ -91,7 +119,6 @@
                 R.drawable.ic_volume_remote);
         // To create an empty icon to indent the row
         final IconCompat emptyIcon = createEmptyIcon();
-        int requestCode = 0;
         for (RoutingSessionInfo info : infos) {
             final int maxVolume = info.getVolumeMax();
             if (maxVolume <= 0) {
@@ -99,20 +126,31 @@
                         + maxVolume);
                 continue;
             }
+            final CharSequence appName = Utils.getApplicationLabel(
+                    mContext, info.getClientPackageName());
             final CharSequence outputTitle = mContext.getString(R.string.media_output_label_title,
-                    Utils.getApplicationLabel(mContext, info.getClientPackageName()));
+                    appName);
             listBuilder.addInputRange(new InputRangeBuilder()
                     .setTitleItem(icon, ListBuilder.ICON_IMAGE)
                     .setTitle(castVolume)
-                    .setInputAction(getSliderInputAction(requestCode++, info.getId()))
+                    .setInputAction(getSliderInputAction(info.getId().hashCode(), info.getId()))
                     .setPrimaryAction(getSoundSettingAction(castVolume, icon, info.getId()))
                     .setMax(maxVolume)
                     .setValue(info.getVolume()));
+
+            final boolean isMediaOutputDisabled =
+                    getWorker().shouldDisableMediaOutput(info.getClientPackageName());
+            final SpannableString spannableTitle = new SpannableString(
+                    TextUtils.isEmpty(appName) ? "" : appName);
+            spannableTitle.setSpan(new ForegroundColorSpan(
+                            Utils.getColorAttrDefaultColor(
+                                    mContext, android.R.attr.textColorSecondary)), 0,
+                    spannableTitle.length(), SPAN_EXCLUSIVE_EXCLUSIVE);
             listBuilder.addRow(new ListBuilder.RowBuilder()
-                    .setTitle(outputTitle)
+                    .setTitle(isMediaOutputDisabled ? spannableTitle : outputTitle)
                     .setSubtitle(info.getName())
                     .setTitleItem(emptyIcon, ListBuilder.ICON_IMAGE)
-                    .setPrimaryAction(getMediaOutputSliceAction(info.getClientPackageName())));
+                    .setPrimaryAction(getMediaOutputDialogAction(info, isMediaOutputDisabled)));
         }
         return listBuilder.build();
     }
@@ -127,7 +165,8 @@
                 .setData(getUri())
                 .putExtra(MEDIA_ID, id)
                 .setClass(mContext, SliceBroadcastReceiver.class);
-        return PendingIntent.getBroadcast(mContext, requestCode, intent, 0);
+        return PendingIntent.getBroadcast(mContext, requestCode, intent,
+                PendingIntent.FLAG_MUTABLE);
     }
 
     private SliceAction getSoundSettingAction(CharSequence actionTitle, IconCompat icon,
@@ -139,25 +178,30 @@
                 mContext.getText(R.string.sound_settings).toString(), 0);
         intent.setClassName(mContext.getPackageName(), SubSettings.class.getName());
         intent.setData(contentUri);
-        final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, 0);
+        final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent,
+                PendingIntent.FLAG_IMMUTABLE);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(pendingIntent, icon,
                 ListBuilder.ICON_IMAGE, actionTitle);
         return primarySliceAction;
     }
 
-    private SliceAction getMediaOutputSliceAction(String packageName) {
-        final Intent intent = new Intent()
-                .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, packageName);
-        final IconCompat icon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_volume_remote);
-        final PendingIntent primaryActionIntent = PendingIntent.getActivity(mContext,
-                0 /* requestCode */, intent, 0 /* flags */);
+    private SliceAction getMediaOutputDialogAction(RoutingSessionInfo info,
+            boolean isMediaOutputDisabled) {
+        final Intent intent = new Intent(getUri().toString())
+                .setData(getUri())
+                .setClass(mContext, SliceBroadcastReceiver.class)
+                .putExtra(CUSTOMIZED_ACTION, isMediaOutputDisabled ? "" : ACTION_LAUNCH_DIALOG)
+                .putExtra(SESSION_INFO, info)
+                .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        final PendingIntent primaryBroadcastIntent = PendingIntent.getBroadcast(mContext,
+                info.hashCode(), intent,
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         final SliceAction primarySliceAction = SliceAction.createDeeplink(
-                primaryActionIntent, icon, ListBuilder.ICON_IMAGE,
+                primaryBroadcastIntent,
+                IconCompat.createWithResource(mContext, R.drawable.ic_volume_remote),
+                ListBuilder.ICON_IMAGE,
                 mContext.getString(R.string.media_output_label_title,
-                        Utils.getApplicationLabel(mContext, packageName)));
+                        Utils.getApplicationLabel(mContext, info.getClientPackageName())));
         return primarySliceAction;
     }
 
diff --git a/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java b/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java
new file mode 100644
index 0000000..33d1d5b
--- /dev/null
+++ b/src/com/android/settings/network/AdaptiveConnectivityPreferenceController.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * {@link BasePreferenceController} that shows Adaptive connectivity on/off state.
+ */
+public class AdaptiveConnectivityPreferenceController extends BasePreferenceController {
+
+    public AdaptiveConnectivityPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return mContext.getResources().getBoolean(R.bool.config_show_adaptive_connectivity)
+                ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1) == 1
+                ? mContext.getString(R.string.switch_on_text)
+                : mContext.getString(R.string.switch_off_text);
+    }
+}
diff --git a/src/com/android/settings/network/AdaptiveConnectivitySettings.java b/src/com/android/settings/network/AdaptiveConnectivitySettings.java
new file mode 100644
index 0000000..5e1dc12
--- /dev/null
+++ b/src/com/android/settings/network/AdaptiveConnectivitySettings.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network;
+
+import android.app.settings.SettingsEnums;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * Adaptive connectivity is a feature which automatically manages network connections.
+ */
+@SearchIndexable
+public class AdaptiveConnectivitySettings extends DashboardFragment {
+
+    private static final String TAG = "AdaptiveConnectivitySettings";
+
+    private static final String KEY_ADAPTIVE_CONNECTIVITY_PREFERENCE = "adaptive_connectivity";
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.ADAPTIVE_CONNECTIVITY_CATEGORY;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.adaptive_connectivity_settings;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.adaptive_connectivity_settings);
+}
diff --git a/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
new file mode 100644
index 0000000..e072b5c
--- /dev/null
+++ b/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceController.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.TogglePreferenceController;
+
+/**
+ * {@link TogglePreferenceController} that controls whether Adaptive connectivity option is enabled.
+ */
+public class AdaptiveConnectivityTogglePreferenceController extends TogglePreferenceController {
+
+    public AdaptiveConnectivityTogglePreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1) == 1;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED,
+                isChecked ? 1 : 0);
+        return true;
+    }
+}
diff --git a/src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java b/src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java
new file mode 100644
index 0000000..fa80c38
--- /dev/null
+++ b/src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.Context;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.AirplaneModeEnabler;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.GenericSwitchController;
+import com.android.settings.wifi.WifiEnabler;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+public class AirplaneSafeNetworksPreferenceController extends AbstractPreferenceController
+        implements LifecycleObserver, AirplaneModeEnabler.OnAirplaneModeChangedListener {
+
+    private static final String PREFERENCE_KEY = "airplane_safe_networks";
+
+    private RestrictedSwitchPreference mPreference;
+
+    private AirplaneModeEnabler mAirplaneModeEnabler;
+    private WifiEnabler mWifiEnabler;
+
+    public AirplaneSafeNetworksPreferenceController(Context context, Lifecycle lifecycle) {
+        super(context);
+        if (lifecycle == null) {
+            throw new IllegalArgumentException("Lifecycle must be set");
+        }
+
+        mAirplaneModeEnabler = new AirplaneModeEnabler(mContext, this);
+        lifecycle.addObserver(this);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return PREFERENCE_KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mAirplaneModeEnabler.isAirplaneModeOn();
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_START)
+    public void onStart() {
+        mAirplaneModeEnabler.start();
+        if (mPreference != null) {
+            mWifiEnabler = new WifiEnabler(mContext, new GenericSwitchController(mPreference),
+                    FeatureFactory.getFactory(mContext).getMetricsFeatureProvider());
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_STOP)
+    public void onStop() {
+        mAirplaneModeEnabler.stop();
+        if (mWifiEnabler != null) {
+            mWifiEnabler.teardownSwitchController();
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_RESUME)
+    public void onResume() {
+        if (mWifiEnabler != null) {
+            mWifiEnabler.resume(mContext);
+        }
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_PAUSE)
+    public void onPause() {
+        if (mWifiEnabler != null) {
+            mWifiEnabler.pause();
+        }
+    }
+
+    @Override
+    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
+        if (mPreference != null) {
+            mPreference.setVisible(isAirplaneModeOn);
+        }
+    }
+}
diff --git a/src/com/android/settings/network/AirplaneSafeNetworksSlice.java b/src/com/android/settings/network/AirplaneSafeNetworksSlice.java
new file mode 100644
index 0000000..fbef282
--- /dev/null
+++ b/src/com/android/settings/network/AirplaneSafeNetworksSlice.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.net.Uri;
+import android.net.wifi.WifiManager;
+import android.util.Log;
+
+import androidx.annotation.IntDef;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.ListBuilder.RowBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.settings.AirplaneModeEnabler;
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.slices.CustomSliceRegistry;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.slices.SliceBackgroundWorker;
+import com.android.settings.slices.SliceBroadcastReceiver;
+import com.android.settingslib.WirelessUtils;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * {@link CustomSliceable} for airplane-safe networks, used by generic clients.
+ */
+// TODO(b/173413889): Need to update the slice to Button style.
+public class AirplaneSafeNetworksSlice implements CustomSliceable,
+        AirplaneModeEnabler.OnAirplaneModeChangedListener {
+
+    private static final String TAG = "AirplaneSafeNetworksSlice";
+
+    public static final String ACTION_INTENT_EXTRA = "action";
+
+    /**
+     * Annotation for different action of the slice.
+     *
+     * {@code VIEW_AIRPLANE_SAFE_NETWORKS} for action of turning on Wi-Fi.
+     * {@code TURN_OFF_AIRPLANE_MODE} for action of turning off Airplane Mode.
+     */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef(value = {
+            Action.VIEW_AIRPLANE_SAFE_NETWORKS,
+            Action.TURN_OFF_AIRPLANE_MODE,
+    })
+    public @interface Action {
+        int VIEW_AIRPLANE_SAFE_NETWORKS = 1;
+        int TURN_OFF_AIRPLANE_MODE = 2;
+    }
+
+    private final Context mContext;
+    private final AirplaneModeEnabler mAirplaneModeEnabler;
+    private final WifiManager mWifiManager;
+
+    public AirplaneSafeNetworksSlice(Context context) {
+        mContext = context;
+        mAirplaneModeEnabler = new AirplaneModeEnabler(context, this);
+        mWifiManager = mContext.getSystemService(WifiManager.class);
+    }
+
+    private static void logd(String s) {
+        Log.d(TAG, s);
+    }
+
+    @Override
+    public Slice getSlice() {
+        if (!WirelessUtils.isAirplaneModeOn(mContext)) {
+            return null;
+        }
+
+        return new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
+                .addRow(new RowBuilder()
+                        .setTitle(getTitle())
+                        .setPrimaryAction(getSliceAction()))
+                .build();
+    }
+
+    @Override
+    public Uri getUri() {
+        return CustomSliceRegistry.AIRPLANE_SAFE_NETWORKS_SLICE_URI;
+    }
+
+    @Override
+    public void onNotifyChange(Intent intent) {
+        final int action = intent.getIntExtra(ACTION_INTENT_EXTRA, 0);
+        if (action == Action.VIEW_AIRPLANE_SAFE_NETWORKS) {
+            if (!mWifiManager.isWifiEnabled()) {
+                logd("Action: turn on WiFi");
+                mWifiManager.setWifiEnabled(true);
+            }
+        } else if (action == Action.TURN_OFF_AIRPLANE_MODE) {
+            if (WirelessUtils.isAirplaneModeOn(mContext)) {
+                logd("Action: turn off Airplane mode");
+                mAirplaneModeEnabler.setAirplaneMode(false);
+            }
+        }
+    }
+
+    @Override
+    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {
+        final AirplaneSafeNetworksWorker worker = SliceBackgroundWorker.getInstance(getUri());
+        if (worker != null) {
+            worker.updateSlice();
+        }
+    }
+
+    @Override
+    public Intent getIntent() {
+        return new Intent(getUri().toString())
+                .setData(getUri())
+                .setClass(mContext, SliceBroadcastReceiver.class)
+                .putExtra(ACTION_INTENT_EXTRA, getAction());
+    }
+
+    @Action
+    private int getAction() {
+        return mWifiManager.isWifiEnabled()
+                ? Action.TURN_OFF_AIRPLANE_MODE
+                : Action.VIEW_AIRPLANE_SAFE_NETWORKS;
+    }
+
+    private String getTitle() {
+        return mContext.getText(
+                (getAction() == Action.VIEW_AIRPLANE_SAFE_NETWORKS)
+                        ? R.string.view_airplane_safe_networks
+                        : R.string.turn_off_airplane_mode).toString();
+    }
+
+    private SliceAction getSliceAction() {
+        final PendingIntent pendingIntent = PendingIntent.getBroadcast(mContext,
+                0 /* requestCode */, getIntent(),
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+        final IconCompat icon = Utils.createIconWithDrawable(new ColorDrawable(Color.TRANSPARENT));
+        return SliceAction.createDeeplink(pendingIntent, icon, ListBuilder.ACTION_WITH_LABEL,
+                getTitle());
+    }
+
+    @Override
+    public Class getBackgroundWorkerClass() {
+        return AirplaneSafeNetworksWorker.class;
+    }
+
+    public static class AirplaneSafeNetworksWorker extends SliceBackgroundWorker {
+
+        private final IntentFilter mIntentFilter;
+        private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                if (WifiManager.WIFI_STATE_CHANGED_ACTION.equals(intent.getAction())) {
+                    notifySliceChange();
+                }
+            }
+        };
+
+        public AirplaneSafeNetworksWorker(Context context, Uri uri) {
+            super(context, uri);
+            mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
+        }
+
+        @Override
+        protected void onSlicePinned() {
+            getContext().registerReceiver(mBroadcastReceiver, mIntentFilter);
+        }
+
+        @Override
+        protected void onSliceUnpinned() {
+            getContext().unregisterReceiver(mBroadcastReceiver);
+        }
+
+        @Override
+        public void close() {
+            // Do nothing.
+        }
+
+        public void updateSlice() {
+            notifySliceChange();
+        }
+    }
+}
diff --git a/src/com/android/settings/network/AllInOneTetherPreferenceController.java b/src/com/android/settings/network/AllInOneTetherPreferenceController.java
index 75453b4..0f4905a 100644
--- a/src/com/android/settings/network/AllInOneTetherPreferenceController.java
+++ b/src/com/android/settings/network/AllInOneTetherPreferenceController.java
@@ -42,8 +42,8 @@
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.core.FeatureFlags;
-import com.android.settings.widget.MasterSwitchController;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.GenericSwitchController;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.TetherUtil;
 
 import java.util.concurrent.atomic.AtomicReference;
@@ -75,7 +75,7 @@
                 }
             };
 
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     private TetherEnabler mTetherEnabler;
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
@@ -191,7 +191,7 @@
     void initEnabler(Lifecycle lifecycle) {
         if (mPreference != null) {
             mTetherEnabler = new TetherEnabler(
-                    mContext, new MasterSwitchController(mPreference), mBluetoothPan);
+                    mContext, new GenericSwitchController(mPreference), mBluetoothPan);
             if (lifecycle != null) {
                 lifecycle.addObserver(mTetherEnabler);
             }
diff --git a/src/com/android/settings/network/ApnEditor.java b/src/com/android/settings/network/ApnEditor.java
deleted file mode 100644
index f9eccfa..0000000
--- a/src/com/android/settings/network/ApnEditor.java
+++ /dev/null
@@ -1,1463 +0,0 @@
-/*
- * Copyright (C) 2006 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import android.app.Dialog;
-import android.app.settings.SettingsEnums;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.PersistableBundle;
-import android.provider.Telephony;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnKeyListener;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.preference.EditTextPreference;
-import androidx.preference.ListPreference;
-import androidx.preference.MultiSelectListPreference;
-import androidx.preference.Preference;
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.SwitchPreference;
-
-import com.android.internal.util.ArrayUtils;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
-import com.android.settingslib.utils.ThreadUtils;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-
-public class ApnEditor extends SettingsPreferenceFragment
-        implements OnPreferenceChangeListener, OnKeyListener {
-
-    private final static String TAG = ApnEditor.class.getSimpleName();
-    private final static boolean VDBG = false;   // STOPSHIP if true
-
-    private final static String KEY_AUTH_TYPE = "auth_type";
-    private static final String KEY_APN_TYPE = "apn_type";
-    private final static String KEY_PROTOCOL = "apn_protocol";
-    private final static String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol";
-    private final static String KEY_CARRIER_ENABLED = "carrier_enabled";
-    private final static String KEY_BEARER_MULTI = "bearer_multi";
-    private final static String KEY_MVNO_TYPE = "mvno_type";
-    private final static String KEY_PASSWORD = "apn_password";
-
-    private static final int MENU_DELETE = Menu.FIRST;
-    private static final int MENU_SAVE = Menu.FIRST + 1;
-    private static final int MENU_CANCEL = Menu.FIRST + 2;
-
-    @VisibleForTesting
-    static String sNotSet;
-    @VisibleForTesting
-    EditTextPreference mName;
-    @VisibleForTesting
-    EditTextPreference mApn;
-    @VisibleForTesting
-    EditTextPreference mProxy;
-    @VisibleForTesting
-    EditTextPreference mPort;
-    @VisibleForTesting
-    EditTextPreference mUser;
-    @VisibleForTesting
-    EditTextPreference mServer;
-    @VisibleForTesting
-    EditTextPreference mPassword;
-    @VisibleForTesting
-    EditTextPreference mMmsc;
-    @VisibleForTesting
-    EditTextPreference mMcc;
-    @VisibleForTesting
-    EditTextPreference mMnc;
-    @VisibleForTesting
-    EditTextPreference mMmsProxy;
-    @VisibleForTesting
-    EditTextPreference mMmsPort;
-    @VisibleForTesting
-    ListPreference mAuthType;
-    @VisibleForTesting
-    EditTextPreference mApnType;
-    @VisibleForTesting
-    ListPreference mProtocol;
-    @VisibleForTesting
-    ListPreference mRoamingProtocol;
-    @VisibleForTesting
-    SwitchPreference mCarrierEnabled;
-    @VisibleForTesting
-    MultiSelectListPreference mBearerMulti;
-    @VisibleForTesting
-    ListPreference mMvnoType;
-    @VisibleForTesting
-    EditTextPreference mMvnoMatchData;
-
-    @VisibleForTesting
-    ApnData mApnData;
-
-    private String mCurMnc;
-    private String mCurMcc;
-
-    private boolean mNewApn;
-    private int mSubId;
-    @VisibleForTesting
-    ProxySubscriptionManager mProxySubscriptionMgr;
-    private int mBearerInitialVal = 0;
-    private String mMvnoTypeStr;
-    private String mMvnoMatchDataStr;
-    @VisibleForTesting
-    String[] mReadOnlyApnTypes;
-    @VisibleForTesting
-    String[] mDefaultApnTypes;
-    @VisibleForTesting
-    String mDefaultApnProtocol;
-    @VisibleForTesting
-    String mDefaultApnRoamingProtocol;
-    private String[] mReadOnlyApnFields;
-    private boolean mReadOnlyApn;
-    private Uri mCarrierUri;
-
-    /**
-     * APN types for data connections.  These are usage categories for an APN
-     * entry.  One APN entry may support multiple APN types, eg, a single APN
-     * may service regular internet traffic ("default") as well as MMS-specific
-     * connections.<br/>
-     * APN_TYPE_ALL is a special type to indicate that this APN entry can
-     * service all data connections.
-     */
-    public static final String APN_TYPE_ALL = "*";
-    /** APN type for default data traffic */
-    public static final String APN_TYPE_DEFAULT = "default";
-    /** APN type for MMS traffic */
-    public static final String APN_TYPE_MMS = "mms";
-    /** APN type for SUPL assisted GPS */
-    public static final String APN_TYPE_SUPL = "supl";
-    /** APN type for DUN traffic */
-    public static final String APN_TYPE_DUN = "dun";
-    /** APN type for HiPri traffic */
-    public static final String APN_TYPE_HIPRI = "hipri";
-    /** APN type for FOTA */
-    public static final String APN_TYPE_FOTA = "fota";
-    /** APN type for IMS */
-    public static final String APN_TYPE_IMS = "ims";
-    /** APN type for CBS */
-    public static final String APN_TYPE_CBS = "cbs";
-    /** APN type for IA Initial Attach APN */
-    public static final String APN_TYPE_IA = "ia";
-    /** APN type for Emergency PDN. This is not an IA apn, but is used
-     * for access to carrier services in an emergency call situation. */
-    public static final String APN_TYPE_EMERGENCY = "emergency";
-    /** APN type for Mission Critical Services */
-    public static final String APN_TYPE_MCX = "mcx";
-    /** APN type for XCAP */
-    public static final String APN_TYPE_XCAP = "xcap";
-    /** Array of all APN types */
-    public static final String[] APN_TYPES = {APN_TYPE_DEFAULT,
-            APN_TYPE_MMS,
-            APN_TYPE_SUPL,
-            APN_TYPE_DUN,
-            APN_TYPE_HIPRI,
-            APN_TYPE_FOTA,
-            APN_TYPE_IMS,
-            APN_TYPE_CBS,
-            APN_TYPE_IA,
-            APN_TYPE_EMERGENCY,
-            APN_TYPE_MCX,
-            APN_TYPE_XCAP,
-    };
-
-    /**
-     * Standard projection for the interesting columns of a normal note.
-     */
-    private static final String[] sProjection = new String[] {
-            Telephony.Carriers._ID,     // 0
-            Telephony.Carriers.NAME,    // 1
-            Telephony.Carriers.APN,     // 2
-            Telephony.Carriers.PROXY,   // 3
-            Telephony.Carriers.PORT,    // 4
-            Telephony.Carriers.USER,    // 5
-            Telephony.Carriers.SERVER,  // 6
-            Telephony.Carriers.PASSWORD, // 7
-            Telephony.Carriers.MMSC, // 8
-            Telephony.Carriers.MCC, // 9
-            Telephony.Carriers.MNC, // 10
-            Telephony.Carriers.NUMERIC, // 11
-            Telephony.Carriers.MMSPROXY,// 12
-            Telephony.Carriers.MMSPORT, // 13
-            Telephony.Carriers.AUTH_TYPE, // 14
-            Telephony.Carriers.TYPE, // 15
-            Telephony.Carriers.PROTOCOL, // 16
-            Telephony.Carriers.CARRIER_ENABLED, // 17
-            Telephony.Carriers.BEARER, // 18
-            Telephony.Carriers.BEARER_BITMASK, // 19
-            Telephony.Carriers.ROAMING_PROTOCOL, // 20
-            Telephony.Carriers.MVNO_TYPE,   // 21
-            Telephony.Carriers.MVNO_MATCH_DATA,  // 22
-            Telephony.Carriers.EDITED_STATUS,   // 23
-            Telephony.Carriers.USER_EDITABLE    //24
-    };
-
-    private static final int ID_INDEX = 0;
-    @VisibleForTesting
-    static final int NAME_INDEX = 1;
-    @VisibleForTesting
-    static final int APN_INDEX = 2;
-    private static final int PROXY_INDEX = 3;
-    private static final int PORT_INDEX = 4;
-    private static final int USER_INDEX = 5;
-    private static final int SERVER_INDEX = 6;
-    private static final int PASSWORD_INDEX = 7;
-    private static final int MMSC_INDEX = 8;
-    @VisibleForTesting
-    static final int MCC_INDEX = 9;
-    @VisibleForTesting
-    static final int MNC_INDEX = 10;
-    private static final int MMSPROXY_INDEX = 12;
-    private static final int MMSPORT_INDEX = 13;
-    private static final int AUTH_TYPE_INDEX = 14;
-    @VisibleForTesting
-    static final int TYPE_INDEX = 15;
-    @VisibleForTesting
-    static final int PROTOCOL_INDEX = 16;
-    @VisibleForTesting
-    static final int CARRIER_ENABLED_INDEX = 17;
-    private static final int BEARER_INDEX = 18;
-    private static final int BEARER_BITMASK_INDEX = 19;
-    @VisibleForTesting
-    static final int ROAMING_PROTOCOL_INDEX = 20;
-    private static final int MVNO_TYPE_INDEX = 21;
-    private static final int MVNO_MATCH_DATA_INDEX = 22;
-    private static final int EDITED_INDEX = 23;
-    private static final int USER_EDITABLE_INDEX = 24;
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        setLifecycleForAllControllers();
-
-        final Intent intent = getIntent();
-        final String action = intent.getAction();
-        if (TextUtils.isEmpty(action)) {
-            finish();
-            return;
-        }
-        mSubId = intent.getIntExtra(ApnSettings.SUB_ID,
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-
-        initApnEditorUi();
-        getCarrierCustomizedConfig();
-
-        Uri uri = null;
-        if (action.equals(Intent.ACTION_EDIT)) {
-            uri = intent.getData();
-            if (!uri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) {
-                Log.e(TAG, "Edit request not for carrier table. Uri: " + uri);
-                finish();
-                return;
-            }
-        } else if (action.equals(Intent.ACTION_INSERT)) {
-            mCarrierUri = intent.getData();
-            if (!mCarrierUri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) {
-                Log.e(TAG, "Insert request not for carrier table. Uri: " + mCarrierUri);
-                finish();
-                return;
-            }
-            mNewApn = true;
-            mMvnoTypeStr = intent.getStringExtra(ApnSettings.MVNO_TYPE);
-            mMvnoMatchDataStr = intent.getStringExtra(ApnSettings.MVNO_MATCH_DATA);
-        } else {
-            finish();
-            return;
-        }
-
-        // Creates an ApnData to store the apn data temporary, so that we don't need the cursor to
-        // get the apn data. The uri is null if the action is ACTION_INSERT, that mean there is no
-        // record in the database, so create a empty ApnData to represent a empty row of database.
-        if (uri != null) {
-            mApnData = getApnDataFromUri(uri);
-        } else {
-            mApnData = new ApnData(sProjection.length);
-        }
-
-        final boolean isUserEdited = mApnData.getInteger(EDITED_INDEX,
-                Telephony.Carriers.USER_EDITED) == Telephony.Carriers.USER_EDITED;
-
-        Log.d(TAG, "onCreate: EDITED " + isUserEdited);
-        // if it's not a USER_EDITED apn, check if it's read-only
-        if (!isUserEdited && (mApnData.getInteger(USER_EDITABLE_INDEX, 1) == 0
-                || apnTypesMatch(mReadOnlyApnTypes, mApnData.getString(TYPE_INDEX)))) {
-            Log.d(TAG, "onCreate: apnTypesMatch; read-only APN");
-            mReadOnlyApn = true;
-            disableAllFields();
-        } else if (!ArrayUtils.isEmpty(mReadOnlyApnFields)) {
-            disableFields(mReadOnlyApnFields);
-        }
-
-        for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
-            getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);
-        }
-    }
-
-    /**
-     * Enable ProxySubscriptionMgr with Lifecycle support for all controllers
-     * live within this fragment
-     */
-    private void setLifecycleForAllControllers() {
-        if (mProxySubscriptionMgr == null) {
-            mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(getContext());
-        }
-        mProxySubscriptionMgr.setLifecycle(getLifecycle());
-    }
-
-    @Override
-    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
-        super.onViewStateRestored(savedInstanceState);
-        fillUI(savedInstanceState == null);
-        setCarrierCustomizedConfigToUi();
-    }
-
-    @VisibleForTesting
-    static String formatInteger(String value) {
-        try {
-            final int intValue = Integer.parseInt(value);
-            return String.format(getCorrectDigitsFormat(value), intValue);
-        } catch (NumberFormatException e) {
-            return value;
-        }
-    }
-
-    /**
-     * Get the digits format so we preserve leading 0's.
-     * MCCs are 3 digits and MNCs are either 2 or 3.
-     */
-    static String getCorrectDigitsFormat(String value) {
-        if (value.length() == 2) return "%02d";
-        else return "%03d";
-    }
-
-
-    /**
-     * Check if passed in array of APN types indicates all APN types
-     * @param apnTypes array of APN types. "*" indicates all types.
-     * @return true if all apn types are included in the array, false otherwise
-     */
-    static boolean hasAllApns(String[] apnTypes) {
-        if (ArrayUtils.isEmpty(apnTypes)) {
-            return false;
-        }
-
-        final List apnList = Arrays.asList(apnTypes);
-        if (apnList.contains(APN_TYPE_ALL)) {
-            Log.d(TAG, "hasAllApns: true because apnList.contains(APN_TYPE_ALL)");
-            return true;
-        }
-        for (String apn : APN_TYPES) {
-            if (!apnList.contains(apn)) {
-                return false;
-            }
-        }
-
-        Log.d(TAG, "hasAllApns: true");
-        return true;
-    }
-
-    /**
-     * Check if APN types overlap.
-     * @param apnTypesArray1 array of APNs. Empty array indicates no APN type; "*" indicates all
-     *                       types
-     * @param apnTypes2 comma separated string of APN types. Empty string represents all types.
-     * @return if any apn type matches return true, otherwise return false
-     */
-    private boolean apnTypesMatch(String[] apnTypesArray1, String apnTypes2) {
-        if (ArrayUtils.isEmpty(apnTypesArray1)) {
-            return false;
-        }
-
-        if (hasAllApns(apnTypesArray1) || TextUtils.isEmpty(apnTypes2)) {
-            return true;
-        }
-
-        final List apnTypesList1 = Arrays.asList(apnTypesArray1);
-        final String[] apnTypesArray2 = apnTypes2.split(",");
-
-        for (String apn : apnTypesArray2) {
-            if (apnTypesList1.contains(apn.trim())) {
-                Log.d(TAG, "apnTypesMatch: true because match found for " + apn.trim());
-                return true;
-            }
-        }
-
-        Log.d(TAG, "apnTypesMatch: false");
-        return false;
-    }
-
-    /**
-     * Function to get Preference obj corresponding to an apnField
-     * @param apnField apn field name for which pref is needed
-     * @return Preference obj corresponding to passed in apnField
-     */
-    private Preference getPreferenceFromFieldName(String apnField) {
-        switch (apnField) {
-            case Telephony.Carriers.NAME:
-                return mName;
-            case Telephony.Carriers.APN:
-                return mApn;
-            case Telephony.Carriers.PROXY:
-                return mProxy;
-            case Telephony.Carriers.PORT:
-                return mPort;
-            case Telephony.Carriers.USER:
-                return mUser;
-            case Telephony.Carriers.SERVER:
-                return mServer;
-            case Telephony.Carriers.PASSWORD:
-                return mPassword;
-            case Telephony.Carriers.MMSPROXY:
-                return mMmsProxy;
-            case Telephony.Carriers.MMSPORT:
-                return mMmsPort;
-            case Telephony.Carriers.MMSC:
-                return mMmsc;
-            case Telephony.Carriers.MCC:
-                return mMcc;
-            case Telephony.Carriers.MNC:
-                return mMnc;
-            case Telephony.Carriers.TYPE:
-                return mApnType;
-            case Telephony.Carriers.AUTH_TYPE:
-                return mAuthType;
-            case Telephony.Carriers.PROTOCOL:
-                return mProtocol;
-            case Telephony.Carriers.ROAMING_PROTOCOL:
-                return mRoamingProtocol;
-            case Telephony.Carriers.CARRIER_ENABLED:
-                return mCarrierEnabled;
-            case Telephony.Carriers.BEARER:
-            case Telephony.Carriers.BEARER_BITMASK:
-                return mBearerMulti;
-            case Telephony.Carriers.MVNO_TYPE:
-                return mMvnoType;
-            case Telephony.Carriers.MVNO_MATCH_DATA:
-                return mMvnoMatchData;
-        }
-        return null;
-    }
-
-    /**
-     * Disables given fields so that user cannot modify them
-     *
-     * @param apnFields fields to be disabled
-     */
-    private void disableFields(String[] apnFields) {
-        for (String apnField : apnFields) {
-            final Preference preference = getPreferenceFromFieldName(apnField);
-            if (preference != null) {
-                preference.setEnabled(false);
-            }
-        }
-    }
-
-    /**
-     * Disables all fields so that user cannot modify the APN
-     */
-    private void disableAllFields() {
-        mName.setEnabled(false);
-        mApn.setEnabled(false);
-        mProxy.setEnabled(false);
-        mPort.setEnabled(false);
-        mUser.setEnabled(false);
-        mServer.setEnabled(false);
-        mPassword.setEnabled(false);
-        mMmsProxy.setEnabled(false);
-        mMmsPort.setEnabled(false);
-        mMmsc.setEnabled(false);
-        mMcc.setEnabled(false);
-        mMnc.setEnabled(false);
-        mApnType.setEnabled(false);
-        mAuthType.setEnabled(false);
-        mProtocol.setEnabled(false);
-        mRoamingProtocol.setEnabled(false);
-        mCarrierEnabled.setEnabled(false);
-        mBearerMulti.setEnabled(false);
-        mMvnoType.setEnabled(false);
-        mMvnoMatchData.setEnabled(false);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.APN_EDITOR;
-    }
-
-    @VisibleForTesting
-    void fillUI(boolean firstTime) {
-        if (firstTime) {
-            // Fill in all the values from the db in both text editor and summary
-            mName.setText(mApnData.getString(NAME_INDEX));
-            mApn.setText(mApnData.getString(APN_INDEX));
-            mProxy.setText(mApnData.getString(PROXY_INDEX));
-            mPort.setText(mApnData.getString(PORT_INDEX));
-            mUser.setText(mApnData.getString(USER_INDEX));
-            mServer.setText(mApnData.getString(SERVER_INDEX));
-            mPassword.setText(mApnData.getString(PASSWORD_INDEX));
-            mMmsProxy.setText(mApnData.getString(MMSPROXY_INDEX));
-            mMmsPort.setText(mApnData.getString(MMSPORT_INDEX));
-            mMmsc.setText(mApnData.getString(MMSC_INDEX));
-            mMcc.setText(mApnData.getString(MCC_INDEX));
-            mMnc.setText(mApnData.getString(MNC_INDEX));
-            mApnType.setText(mApnData.getString(TYPE_INDEX));
-            if (mNewApn) {
-                final SubscriptionInfo subInfo =
-                        mProxySubscriptionMgr.getAccessibleSubscriptionInfo(mSubId);
-
-                // Country code
-                final String mcc = (subInfo == null) ? null : subInfo.getMccString();
-                // Network code
-                final String mnc = (subInfo == null) ? null : subInfo.getMncString();
-
-                if ((!TextUtils.isEmpty(mcc)) && (!TextUtils.isEmpty(mcc))) {
-                    // Auto populate MNC and MCC for new entries, based on what SIM reports
-                    mMcc.setText(mcc);
-                    mMnc.setText(mnc);
-                    mCurMnc = mnc;
-                    mCurMcc = mcc;
-                }
-            }
-            final int authVal = mApnData.getInteger(AUTH_TYPE_INDEX, -1);
-            if (authVal != -1) {
-                mAuthType.setValueIndex(authVal);
-            } else {
-                mAuthType.setValue(null);
-            }
-
-            mProtocol.setValue(mApnData.getString(PROTOCOL_INDEX));
-            mRoamingProtocol.setValue(mApnData.getString(ROAMING_PROTOCOL_INDEX));
-            mCarrierEnabled.setChecked(mApnData.getInteger(CARRIER_ENABLED_INDEX, 1) == 1);
-            mBearerInitialVal = mApnData.getInteger(BEARER_INDEX, 0);
-
-            final HashSet<String> bearers = new HashSet<String>();
-            int bearerBitmask = mApnData.getInteger(BEARER_BITMASK_INDEX, 0);
-            if (bearerBitmask == 0) {
-                if (mBearerInitialVal == 0) {
-                    bearers.add("" + 0);
-                }
-            } else {
-                int i = 1;
-                while (bearerBitmask != 0) {
-                    if ((bearerBitmask & 1) == 1) {
-                        bearers.add("" + i);
-                    }
-                    bearerBitmask >>= 1;
-                    i++;
-                }
-            }
-
-            if (mBearerInitialVal != 0 && bearers.contains("" + mBearerInitialVal) == false) {
-                // add mBearerInitialVal to bearers
-                bearers.add("" + mBearerInitialVal);
-            }
-            mBearerMulti.setValues(bearers);
-
-            mMvnoType.setValue(mApnData.getString(MVNO_TYPE_INDEX));
-            mMvnoMatchData.setEnabled(false);
-            mMvnoMatchData.setText(mApnData.getString(MVNO_MATCH_DATA_INDEX));
-            if (mNewApn && mMvnoTypeStr != null && mMvnoMatchDataStr != null) {
-                mMvnoType.setValue(mMvnoTypeStr);
-                mMvnoMatchData.setText(mMvnoMatchDataStr);
-            }
-        }
-
-        mName.setSummary(checkNull(mName.getText()));
-        mApn.setSummary(checkNull(mApn.getText()));
-        mProxy.setSummary(checkNull(mProxy.getText()));
-        mPort.setSummary(checkNull(mPort.getText()));
-        mUser.setSummary(checkNull(mUser.getText()));
-        mServer.setSummary(checkNull(mServer.getText()));
-        mPassword.setSummary(starify(mPassword.getText()));
-        mMmsProxy.setSummary(checkNull(mMmsProxy.getText()));
-        mMmsPort.setSummary(checkNull(mMmsPort.getText()));
-        mMmsc.setSummary(checkNull(mMmsc.getText()));
-        mMcc.setSummary(formatInteger(checkNull(mMcc.getText())));
-        mMnc.setSummary(formatInteger(checkNull(mMnc.getText())));
-        mApnType.setSummary(checkNull(mApnType.getText()));
-
-        final String authVal = mAuthType.getValue();
-        if (authVal != null) {
-            final int authValIndex = Integer.parseInt(authVal);
-            mAuthType.setValueIndex(authValIndex);
-
-            final String[] values = getResources().getStringArray(R.array.apn_auth_entries);
-            mAuthType.setSummary(values[authValIndex]);
-        } else {
-            mAuthType.setSummary(sNotSet);
-        }
-
-        mProtocol.setSummary(checkNull(protocolDescription(mProtocol.getValue(), mProtocol)));
-        mRoamingProtocol.setSummary(
-                checkNull(protocolDescription(mRoamingProtocol.getValue(), mRoamingProtocol)));
-        mBearerMulti.setSummary(
-                checkNull(bearerMultiDescription(mBearerMulti.getValues())));
-        mMvnoType.setSummary(
-                checkNull(mvnoDescription(mMvnoType.getValue())));
-        mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
-        // allow user to edit carrier_enabled for some APN
-        final boolean ceEditable = getResources().getBoolean(
-                R.bool.config_allow_edit_carrier_enabled);
-        if (ceEditable) {
-            mCarrierEnabled.setEnabled(true);
-        } else {
-            mCarrierEnabled.setEnabled(false);
-        }
-    }
-
-    /**
-     * Returns the UI choice (e.g., "IPv4/IPv6") corresponding to the given
-     * raw value of the protocol preference (e.g., "IPV4V6"). If unknown,
-     * return null.
-     */
-    private String protocolDescription(String raw, ListPreference protocol) {
-        String uRaw = checkNull(raw).toUpperCase();
-        uRaw = uRaw.equals("IPV4") ? "IP" : uRaw;
-        final int protocolIndex = protocol.findIndexOfValue(uRaw);
-        if (protocolIndex == -1) {
-            return null;
-        } else {
-            final String[] values = getResources().getStringArray(R.array.apn_protocol_entries);
-            try {
-                return values[protocolIndex];
-            } catch (ArrayIndexOutOfBoundsException e) {
-                return null;
-            }
-        }
-    }
-
-    private String bearerMultiDescription(Set<String> raw) {
-        final String[] values = getResources().getStringArray(R.array.bearer_entries);
-        final StringBuilder retVal = new StringBuilder();
-        boolean first = true;
-        for (String bearer : raw) {
-            int bearerIndex = mBearerMulti.findIndexOfValue(bearer);
-            try {
-                if (first) {
-                    retVal.append(values[bearerIndex]);
-                    first = false;
-                } else {
-                    retVal.append(", " + values[bearerIndex]);
-                }
-            } catch (ArrayIndexOutOfBoundsException e) {
-                // ignore
-            }
-        }
-        final String val = retVal.toString();
-        if (!TextUtils.isEmpty(val)) {
-            return val;
-        }
-        return null;
-    }
-
-    private String mvnoDescription(String newValue) {
-        final int mvnoIndex = mMvnoType.findIndexOfValue(newValue);
-        final String oldValue = mMvnoType.getValue();
-
-        if (mvnoIndex == -1) {
-            return null;
-        } else {
-            final String[] values = getResources().getStringArray(R.array.mvno_type_entries);
-            final boolean mvnoMatchDataUneditable =
-                    mReadOnlyApn || (mReadOnlyApnFields != null
-                            && Arrays.asList(mReadOnlyApnFields)
-                            .contains(Telephony.Carriers.MVNO_MATCH_DATA));
-            mMvnoMatchData.setEnabled(!mvnoMatchDataUneditable && mvnoIndex != 0);
-            if (newValue != null && newValue.equals(oldValue) == false) {
-                if (values[mvnoIndex].equals("SPN")) {
-                    TelephonyManager telephonyManager = (TelephonyManager)
-                            getContext().getSystemService(TelephonyManager.class);
-                    final TelephonyManager telephonyManagerForSubId =
-                            telephonyManager.createForSubscriptionId(mSubId);
-                    if (telephonyManagerForSubId != null) {
-                        telephonyManager = telephonyManagerForSubId;
-                    }
-                    mMvnoMatchData.setText(telephonyManager.getSimOperatorName());
-                } else if (values[mvnoIndex].equals("IMSI")) {
-                    final SubscriptionInfo subInfo =
-                            mProxySubscriptionMgr.getAccessibleSubscriptionInfo(mSubId);
-                    final String mcc = (subInfo == null) ? "" :
-                            Objects.toString(subInfo.getMccString(), "");
-                    final String mnc = (subInfo == null) ? "" :
-                            Objects.toString(subInfo.getMncString(), "");
-                    mMvnoMatchData.setText(mcc + mnc + "x");
-                } else if (values[mvnoIndex].equals("GID")) {
-                    TelephonyManager telephonyManager = (TelephonyManager)
-                            getContext().getSystemService(TelephonyManager.class);
-                    final TelephonyManager telephonyManagerForSubId =
-                            telephonyManager.createForSubscriptionId(mSubId);
-                    if (telephonyManagerForSubId != null) {
-                        telephonyManager = telephonyManagerForSubId;
-                    }
-                    mMvnoMatchData.setText(telephonyManager.getGroupIdLevel1());
-                }
-            }
-
-            try {
-                return values[mvnoIndex];
-            } catch (ArrayIndexOutOfBoundsException e) {
-                return null;
-            }
-        }
-    }
-
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        String key = preference.getKey();
-        if (KEY_AUTH_TYPE.equals(key)) {
-            try {
-                final int index = Integer.parseInt((String) newValue);
-                mAuthType.setValueIndex(index);
-
-                final String[] values = getResources().getStringArray(R.array.apn_auth_entries);
-                mAuthType.setSummary(values[index]);
-            } catch (NumberFormatException e) {
-                return false;
-            }
-        } else if (KEY_APN_TYPE.equals(key)) {
-            String data = (TextUtils.isEmpty((String) newValue)
-                    && !ArrayUtils.isEmpty(mDefaultApnTypes))
-                    ? getEditableApnType(mDefaultApnTypes) : (String) newValue;
-            if (!TextUtils.isEmpty(data)) {
-                mApnType.setSummary(data);
-            }
-        } else if (KEY_PROTOCOL.equals(key)) {
-            final String protocol = protocolDescription((String) newValue, mProtocol);
-            if (protocol == null) {
-                return false;
-            }
-            mProtocol.setSummary(protocol);
-            mProtocol.setValue((String) newValue);
-        } else if (KEY_ROAMING_PROTOCOL.equals(key)) {
-            final String protocol = protocolDescription((String) newValue, mRoamingProtocol);
-            if (protocol == null) {
-                return false;
-            }
-            mRoamingProtocol.setSummary(protocol);
-            mRoamingProtocol.setValue((String) newValue);
-        } else if (KEY_BEARER_MULTI.equals(key)) {
-            final String bearer = bearerMultiDescription((Set<String>) newValue);
-            if (bearer == null) {
-                return false;
-            }
-            mBearerMulti.setValues((Set<String>) newValue);
-            mBearerMulti.setSummary(bearer);
-        } else if (KEY_MVNO_TYPE.equals(key)) {
-            final String mvno = mvnoDescription((String) newValue);
-            if (mvno == null) {
-                return false;
-            }
-            mMvnoType.setValue((String) newValue);
-            mMvnoType.setSummary(mvno);
-        } else if (KEY_PASSWORD.equals(key)) {
-            mPassword.setSummary(starify(newValue != null ? String.valueOf(newValue) : ""));
-        } else if (KEY_CARRIER_ENABLED.equals(key)) {
-            // do nothing
-        } else {
-            preference.setSummary(checkNull(newValue != null ? String.valueOf(newValue) : null));
-        }
-        return true;
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        super.onCreateOptionsMenu(menu, inflater);
-        // If it's a new APN, then cancel will delete the new entry in onPause
-        if (!mNewApn && !mReadOnlyApn) {
-            menu.add(0, MENU_DELETE, 0, R.string.menu_delete)
-                .setIcon(R.drawable.ic_delete);
-        }
-        menu.add(0, MENU_SAVE, 0, R.string.menu_save)
-            .setIcon(android.R.drawable.ic_menu_save);
-        menu.add(0, MENU_CANCEL, 0, R.string.menu_cancel)
-            .setIcon(android.R.drawable.ic_menu_close_clear_cancel);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_DELETE:
-                deleteApn();
-                finish();
-                return true;
-            case MENU_SAVE:
-                if (validateAndSaveApnData()) {
-                    finish();
-                }
-                return true;
-            case MENU_CANCEL:
-                finish();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        view.setOnKeyListener(this);
-        view.setFocusableInTouchMode(true);
-        view.requestFocus();
-    }
-
-    /**
-     * Try to save the apn data when pressed the back button. An error message will be displayed if
-     * the apn data is invalid.
-     *
-     * TODO(b/77339593): Try to keep the same behavior between back button and up navigate button.
-     * We will save the valid apn data to the database when pressed the back button, but discard all
-     * user changed when pressed the up navigate button.
-     */
-    @Override
-    public boolean onKey(View v, int keyCode, KeyEvent event) {
-        if (event.getAction() != KeyEvent.ACTION_DOWN) return false;
-        switch (keyCode) {
-            case KeyEvent.KEYCODE_BACK: {
-                if (validateAndSaveApnData()) {
-                    finish();
-                }
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Add key, value to {@code cv} and compare the value against the value at index in
-     * {@link #mApnData}.
-     *
-     * <p>
-     * The key, value will not add to {@code cv} if value is null.
-     *
-     * @return true if values are different. {@code assumeDiff} indicates if values can be assumed
-     * different in which case no comparison is needed.
-     */
-    boolean setStringValueAndCheckIfDiff(
-            ContentValues cv, String key, String value, boolean assumeDiff, int index) {
-        final String valueFromLocalCache = mApnData.getString(index);
-        if (VDBG) {
-            Log.d(TAG, "setStringValueAndCheckIfDiff: assumeDiff: " + assumeDiff
-                    + " key: " + key
-                    + " value: '" + value
-                    + "' valueFromDb: '" + valueFromLocalCache + "'");
-        }
-        final boolean isDiff = assumeDiff
-                || !((TextUtils.isEmpty(value) && TextUtils.isEmpty(valueFromLocalCache))
-                || (value != null && value.equals(valueFromLocalCache)));
-
-        if (isDiff && value != null) {
-            cv.put(key, value);
-        }
-        return isDiff;
-    }
-
-    /**
-     * Add key, value to {@code cv} and compare the value against the value at index in
-     * {@link #mApnData}.
-     *
-     * @return true if values are different. {@code assumeDiff} indicates if values can be assumed
-     * different in which case no comparison is needed.
-     */
-    boolean setIntValueAndCheckIfDiff(
-            ContentValues cv, String key, int value, boolean assumeDiff, int index) {
-        final Integer valueFromLocalCache = mApnData.getInteger(index);
-        if (VDBG) {
-            Log.d(TAG, "setIntValueAndCheckIfDiff: assumeDiff: " + assumeDiff
-                    + " key: " + key
-                    + " value: '" + value
-                    + "' valueFromDb: '" + valueFromLocalCache + "'");
-        }
-
-        final boolean isDiff = assumeDiff || value != valueFromLocalCache;
-        if (isDiff) {
-            cv.put(key, value);
-        }
-        return isDiff;
-    }
-
-    /**
-     * Validates the apn data and save it to the database if it's valid.
-     *
-     * <p>
-     * A dialog with error message will be displayed if the APN data is invalid.
-     *
-     * @return true if there is no error
-     */
-    @VisibleForTesting
-    boolean validateAndSaveApnData() {
-        // Nothing to do if it's a read only APN
-        if (mReadOnlyApn) {
-            return true;
-        }
-
-        final String name = checkNotSet(mName.getText());
-        final String apn = checkNotSet(mApn.getText());
-        final String mcc = checkNotSet(mMcc.getText());
-        final String mnc = checkNotSet(mMnc.getText());
-
-        final String errorMsg = validateApnData();
-        if (errorMsg != null) {
-            showError();
-            return false;
-        }
-
-        final ContentValues values = new ContentValues();
-        // call update() if it's a new APN. If not, check if any field differs from the db value;
-        // if any diff is found update() should be called
-        boolean callUpdate = mNewApn;
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.NAME,
-                name,
-                callUpdate,
-                NAME_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.APN,
-                apn,
-                callUpdate,
-                APN_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.PROXY,
-                checkNotSet(mProxy.getText()),
-                callUpdate,
-                PROXY_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.PORT,
-                checkNotSet(mPort.getText()),
-                callUpdate,
-                PORT_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MMSPROXY,
-                checkNotSet(mMmsProxy.getText()),
-                callUpdate,
-                MMSPROXY_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MMSPORT,
-                checkNotSet(mMmsPort.getText()),
-                callUpdate,
-                MMSPORT_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.USER,
-                checkNotSet(mUser.getText()),
-                callUpdate,
-                USER_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.SERVER,
-                checkNotSet(mServer.getText()),
-                callUpdate,
-                SERVER_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.PASSWORD,
-                checkNotSet(mPassword.getText()),
-                callUpdate,
-                PASSWORD_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MMSC,
-                checkNotSet(mMmsc.getText()),
-                callUpdate,
-                MMSC_INDEX);
-
-        final String authVal = mAuthType.getValue();
-        if (authVal != null) {
-            callUpdate = setIntValueAndCheckIfDiff(values,
-                    Telephony.Carriers.AUTH_TYPE,
-                    Integer.parseInt(authVal),
-                    callUpdate,
-                    AUTH_TYPE_INDEX);
-        }
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.PROTOCOL,
-                checkNotSet(mProtocol.getValue()),
-                callUpdate,
-                PROTOCOL_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.ROAMING_PROTOCOL,
-                checkNotSet(mRoamingProtocol.getValue()),
-                callUpdate,
-                ROAMING_PROTOCOL_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.TYPE,
-                checkNotSet(getUserEnteredApnType()),
-                callUpdate,
-                TYPE_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MCC,
-                mcc,
-                callUpdate,
-                MCC_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MNC,
-                mnc,
-                callUpdate,
-                MNC_INDEX);
-
-        values.put(Telephony.Carriers.NUMERIC, mcc + mnc);
-
-        if (mCurMnc != null && mCurMcc != null) {
-            if (mCurMnc.equals(mnc) && mCurMcc.equals(mcc)) {
-                values.put(Telephony.Carriers.CURRENT, 1);
-            }
-        }
-
-        final Set<String> bearerSet = mBearerMulti.getValues();
-        int bearerBitmask = 0;
-        for (String bearer : bearerSet) {
-            if (Integer.parseInt(bearer) == 0) {
-                bearerBitmask = 0;
-                break;
-            } else {
-                bearerBitmask |= getBitmaskForTech(Integer.parseInt(bearer));
-            }
-        }
-        callUpdate = setIntValueAndCheckIfDiff(values,
-                Telephony.Carriers.BEARER_BITMASK,
-                bearerBitmask,
-                callUpdate,
-                BEARER_BITMASK_INDEX);
-
-        int bearerVal;
-        if (bearerBitmask == 0 || mBearerInitialVal == 0) {
-            bearerVal = 0;
-        } else if (bitmaskHasTech(bearerBitmask, mBearerInitialVal)) {
-            bearerVal = mBearerInitialVal;
-        } else {
-            // bearer field was being used but bitmask has changed now and does not include the
-            // initial bearer value -- setting bearer to 0 but maybe better behavior is to choose a
-            // random tech from the new bitmask??
-            bearerVal = 0;
-        }
-        callUpdate = setIntValueAndCheckIfDiff(values,
-                Telephony.Carriers.BEARER,
-                bearerVal,
-                callUpdate,
-                BEARER_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MVNO_TYPE,
-                checkNotSet(mMvnoType.getValue()),
-                callUpdate,
-                MVNO_TYPE_INDEX);
-
-        callUpdate = setStringValueAndCheckIfDiff(values,
-                Telephony.Carriers.MVNO_MATCH_DATA,
-                checkNotSet(mMvnoMatchData.getText()),
-                callUpdate,
-                MVNO_MATCH_DATA_INDEX);
-
-        callUpdate = setIntValueAndCheckIfDiff(values,
-                Telephony.Carriers.CARRIER_ENABLED,
-                mCarrierEnabled.isChecked() ? 1 : 0,
-                callUpdate,
-                CARRIER_ENABLED_INDEX);
-
-        values.put(Telephony.Carriers.EDITED_STATUS, Telephony.Carriers.USER_EDITED);
-
-        if (callUpdate) {
-            final Uri uri = mApnData.getUri() == null ? mCarrierUri : mApnData.getUri();
-            updateApnDataToDatabase(uri, values);
-        } else {
-            if (VDBG) Log.d(TAG, "validateAndSaveApnData: not calling update()");
-        }
-
-        return true;
-    }
-
-    private void updateApnDataToDatabase(Uri uri, ContentValues values) {
-        ThreadUtils.postOnBackgroundThread(() -> {
-            if (uri.equals(mCarrierUri)) {
-                // Add a new apn to the database
-                final Uri newUri = getContentResolver().insert(mCarrierUri, values);
-                if (newUri == null) {
-                    Log.e(TAG, "Can't add a new apn to database " + mCarrierUri);
-                }
-            } else {
-                // Update the existing apn
-                getContentResolver().update(
-                        uri, values, null /* where */, null /* selection Args */);
-            }
-        });
-    }
-
-    /**
-     * Validates whether the apn data is valid.
-     *
-     * @return An error message if the apn data is invalid, otherwise return null.
-     */
-    @VisibleForTesting
-    String validateApnData() {
-        String errorMsg = null;
-
-        final String name = checkNotSet(mName.getText());
-        final String apn = checkNotSet(mApn.getText());
-        final String mcc = checkNotSet(mMcc.getText());
-        final String mnc = checkNotSet(mMnc.getText());
-
-        if (TextUtils.isEmpty(name)) {
-            errorMsg = getResources().getString(R.string.error_name_empty);
-        } else if (TextUtils.isEmpty(apn)) {
-            errorMsg = getResources().getString(R.string.error_apn_empty);
-        } else if (mcc == null || mcc.length() != 3) {
-            errorMsg = getResources().getString(R.string.error_mcc_not3);
-        } else if ((mnc == null || (mnc.length() & 0xFFFE) != 2)) {
-            errorMsg = getResources().getString(R.string.error_mnc_not23);
-        }
-
-        if (errorMsg == null) {
-            // if carrier does not allow editing certain apn types, make sure type does not include
-            // those
-            if (!ArrayUtils.isEmpty(mReadOnlyApnTypes)
-                    && apnTypesMatch(mReadOnlyApnTypes, getUserEnteredApnType())) {
-                final StringBuilder stringBuilder = new StringBuilder();
-                for (String type : mReadOnlyApnTypes) {
-                    stringBuilder.append(type).append(", ");
-                    Log.d(TAG, "validateApnData: appending type: " + type);
-                }
-                // remove last ", "
-                if (stringBuilder.length() >= 2) {
-                    stringBuilder.delete(stringBuilder.length() - 2, stringBuilder.length());
-                }
-                errorMsg = String.format(getResources().getString(R.string.error_adding_apn_type),
-                        stringBuilder);
-            }
-        }
-
-        return errorMsg;
-    }
-
-    @VisibleForTesting
-    void showError() {
-        ErrorDialog.showError(this);
-    }
-
-    private void deleteApn() {
-        if (mApnData.getUri() != null) {
-            getContentResolver().delete(mApnData.getUri(), null, null);
-            mApnData = new ApnData(sProjection.length);
-        }
-    }
-
-    private String starify(String value) {
-        if (value == null || value.length() == 0) {
-            return sNotSet;
-        } else {
-            final char[] password = new char[value.length()];
-            for (int i = 0; i < password.length; i++) {
-                password[i] = '*';
-            }
-            return new String(password);
-        }
-    }
-
-    /**
-     * Returns {@link #sNotSet} if the given string {@code value} is null or empty. The string
-     * {@link #sNotSet} typically used as the default display when an entry in the preference is
-     * null or empty.
-     */
-    private String checkNull(String value) {
-        return TextUtils.isEmpty(value) ? sNotSet : value;
-    }
-
-    /**
-     * Returns null if the given string {@code value} equals to {@link #sNotSet}. This method
-     * should be used when convert a string value from preference to database.
-     */
-    private String checkNotSet(String value) {
-        return sNotSet.equals(value) ? null : value;
-    }
-
-    @VisibleForTesting
-    String getUserEnteredApnType() {
-        // if user has not specified a type, map it to "ALL APN TYPES THAT ARE NOT READ-ONLY"
-        // but if user enter empty type, map it just for default
-        String userEnteredApnType = mApnType.getText();
-        if (userEnteredApnType != null) userEnteredApnType = userEnteredApnType.trim();
-        if ((TextUtils.isEmpty(userEnteredApnType)
-                || APN_TYPE_ALL.equals(userEnteredApnType))) {
-            userEnteredApnType = getEditableApnType(APN_TYPES);
-        }
-        Log.d(TAG, "getUserEnteredApnType: changed apn type to editable apn types: "
-                + userEnteredApnType);
-        return userEnteredApnType;
-    }
-
-    private String getEditableApnType(String[] apnTypeList) {
-        final StringBuilder editableApnTypes = new StringBuilder();
-        final List<String> readOnlyApnTypes = Arrays.asList(mReadOnlyApnTypes);
-        boolean first = true;
-        for (String apnType : apnTypeList) {
-            // add APN type if it is not read-only and is not wild-cardable
-            if (!readOnlyApnTypes.contains(apnType)
-                    && !apnType.equals(APN_TYPE_IA)
-                    && !apnType.equals(APN_TYPE_EMERGENCY)
-                    && !apnType.equals(APN_TYPE_MCX)) {
-                if (first) {
-                    first = false;
-                } else {
-                    editableApnTypes.append(",");
-                }
-                editableApnTypes.append(apnType);
-            }
-        }
-        return editableApnTypes.toString();
-    }
-
-    private void initApnEditorUi() {
-        addPreferencesFromResource(R.xml.apn_editor);
-
-        sNotSet = getResources().getString(R.string.apn_not_set);
-        mName = (EditTextPreference) findPreference("apn_name");
-        mApn = (EditTextPreference) findPreference("apn_apn");
-        mProxy = (EditTextPreference) findPreference("apn_http_proxy");
-        mPort = (EditTextPreference) findPreference("apn_http_port");
-        mUser = (EditTextPreference) findPreference("apn_user");
-        mServer = (EditTextPreference) findPreference("apn_server");
-        mPassword = (EditTextPreference) findPreference(KEY_PASSWORD);
-        mMmsProxy = (EditTextPreference) findPreference("apn_mms_proxy");
-        mMmsPort = (EditTextPreference) findPreference("apn_mms_port");
-        mMmsc = (EditTextPreference) findPreference("apn_mmsc");
-        mMcc = (EditTextPreference) findPreference("apn_mcc");
-        mMnc = (EditTextPreference) findPreference("apn_mnc");
-        mApnType = (EditTextPreference) findPreference("apn_type");
-        mAuthType = (ListPreference) findPreference(KEY_AUTH_TYPE);
-        mProtocol = (ListPreference) findPreference(KEY_PROTOCOL);
-        mRoamingProtocol = (ListPreference) findPreference(KEY_ROAMING_PROTOCOL);
-        mCarrierEnabled = (SwitchPreference) findPreference(KEY_CARRIER_ENABLED);
-        mBearerMulti = (MultiSelectListPreference) findPreference(KEY_BEARER_MULTI);
-        mMvnoType = (ListPreference) findPreference(KEY_MVNO_TYPE);
-        mMvnoMatchData = (EditTextPreference) findPreference("mvno_match_data");
-    }
-
-    private void getCarrierCustomizedConfig() {
-        mReadOnlyApn = false;
-        mReadOnlyApnTypes = null;
-        mReadOnlyApnFields = null;
-
-        final CarrierConfigManager configManager = (CarrierConfigManager)
-                getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        if (configManager != null) {
-            final PersistableBundle b = configManager.getConfigForSubId(mSubId);
-            if (b != null) {
-                mReadOnlyApnTypes = b.getStringArray(
-                        CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY);
-                if (!ArrayUtils.isEmpty(mReadOnlyApnTypes)) {
-                    Log.d(TAG,
-                            "onCreate: read only APN type: " + Arrays.toString(mReadOnlyApnTypes));
-                }
-                mReadOnlyApnFields = b.getStringArray(
-                        CarrierConfigManager.KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY);
-
-                mDefaultApnTypes = b.getStringArray(
-                        CarrierConfigManager.KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY);
-
-                if (!ArrayUtils.isEmpty(mDefaultApnTypes)) {
-                    Log.d(TAG, "onCreate: default apn types: " + Arrays.toString(mDefaultApnTypes));
-                }
-
-                mDefaultApnProtocol = b.getString(
-                        CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_PROTOCOL_STRING);
-                if (!TextUtils.isEmpty(mDefaultApnProtocol)) {
-                    Log.d(TAG, "onCreate: default apn protocol: " + mDefaultApnProtocol);
-                }
-
-                mDefaultApnRoamingProtocol = b.getString(
-                        CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_ROAMING_PROTOCOL_STRING);
-                if (!TextUtils.isEmpty(mDefaultApnRoamingProtocol)) {
-                    Log.d(TAG, "onCreate: default apn roaming protocol: "
-                            + mDefaultApnRoamingProtocol);
-                }
-            }
-        }
-    }
-
-    private void setCarrierCustomizedConfigToUi() {
-        if (TextUtils.isEmpty(mApnType.getText()) && !ArrayUtils.isEmpty(mDefaultApnTypes)) {
-            String value = getEditableApnType(mDefaultApnTypes);
-            mApnType.setText(value);
-            mApnType.setSummary(value);
-        }
-
-        String protocol = protocolDescription(mDefaultApnProtocol, mProtocol);
-        if (TextUtils.isEmpty(mProtocol.getValue()) && !TextUtils.isEmpty(protocol)) {
-            mProtocol.setValue(mDefaultApnProtocol);
-            mProtocol.setSummary(protocol);
-        }
-
-        String roamingProtocol = protocolDescription(mDefaultApnRoamingProtocol, mRoamingProtocol);
-        if (TextUtils.isEmpty(mRoamingProtocol.getValue()) && !TextUtils.isEmpty(roamingProtocol)) {
-            mRoamingProtocol.setValue(mDefaultApnRoamingProtocol);
-            mRoamingProtocol.setSummary(roamingProtocol);
-        }
-    }
-
-    public static class ErrorDialog extends InstrumentedDialogFragment {
-
-        public static void showError(ApnEditor editor) {
-            final ErrorDialog dialog = new ErrorDialog();
-            dialog.setTargetFragment(editor, 0);
-            dialog.show(editor.getFragmentManager(), "error");
-        }
-
-        @Override
-        public Dialog onCreateDialog(Bundle savedInstanceState) {
-            final String msg = ((ApnEditor) getTargetFragment()).validateApnData();
-
-            return new AlertDialog.Builder(getContext())
-                    .setTitle(R.string.error_title)
-                    .setPositiveButton(android.R.string.ok, null)
-                    .setMessage(msg)
-                    .create();
-        }
-
-        @Override
-        public int getMetricsCategory() {
-            return SettingsEnums.DIALOG_APN_EDITOR_ERROR;
-        }
-    }
-
-    @VisibleForTesting
-    ApnData getApnDataFromUri(Uri uri) {
-        ApnData apnData = null;
-        try (Cursor cursor = getContentResolver().query(
-                uri,
-                sProjection,
-                null /* selection */,
-                null /* selectionArgs */,
-                null /* sortOrder */)) {
-            if (cursor != null) {
-                cursor.moveToFirst();
-                apnData = new ApnData(uri, cursor);
-            }
-        }
-
-        if (apnData == null) {
-            Log.d(TAG, "Can't get apnData from Uri " + uri);
-        }
-
-        return apnData;
-    }
-
-    @VisibleForTesting
-    static class ApnData {
-        /**
-         * The uri correspond to a database row of the apn data. This should be null if the apn
-         * is not in the database.
-         */
-        Uri mUri;
-
-        /** Each element correspond to a column of the database row. */
-        Object[] mData;
-
-        ApnData(int numberOfField) {
-            mData = new Object[numberOfField];
-        }
-
-        ApnData(Uri uri, Cursor cursor) {
-            mUri = uri;
-            mData = new Object[cursor.getColumnCount()];
-            for (int i = 0; i < mData.length; i++) {
-                switch (cursor.getType(i)) {
-                    case Cursor.FIELD_TYPE_FLOAT:
-                        mData[i] = cursor.getFloat(i);
-                        break;
-                    case Cursor.FIELD_TYPE_INTEGER:
-                        mData[i] = cursor.getInt(i);
-                        break;
-                    case Cursor.FIELD_TYPE_STRING:
-                        mData[i] = cursor.getString(i);
-                        break;
-                    case Cursor.FIELD_TYPE_BLOB:
-                        mData[i] = cursor.getBlob(i);
-                        break;
-                    default:
-                        mData[i] = null;
-                }
-            }
-        }
-
-        Uri getUri() {
-            return mUri;
-        }
-
-        void setUri(Uri uri) {
-            mUri = uri;
-        }
-
-        Integer getInteger(int index) {
-            return (Integer) mData[index];
-        }
-
-        Integer getInteger(int index, Integer defaultValue) {
-            final Integer val = getInteger(index);
-            return val == null ? defaultValue : val;
-        }
-
-        String getString(int index) {
-            return (String) mData[index];
-        }
-    }
-
-    private static int getBitmaskForTech(int radioTech) {
-        if (radioTech >= 1) {
-            return (1 << (radioTech - 1));
-        }
-        return 0;
-    }
-
-    private static boolean bitmaskHasTech(int bearerBitmask, int radioTech) {
-        if (bearerBitmask == 0) {
-            return true;
-        } else if (radioTech >= 1) {
-            return ((bearerBitmask & (1 << (radioTech - 1))) != 0);
-        }
-        return false;
-    }
-}
diff --git a/src/com/android/settings/network/ApnPreference.java b/src/com/android/settings/network/ApnPreference.java
deleted file mode 100755
index 63e2838..0000000
--- a/src/com/android/settings/network/ApnPreference.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2009 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import android.content.ContentUris;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.provider.Telephony;
-import android.telephony.SubscriptionManager;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.View;
-import android.widget.CompoundButton;
-import android.widget.RadioButton;
-import android.widget.RelativeLayout;
-import android.widget.Toast;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-
-/**
- * Preference of APN UI entry
- */
-public class ApnPreference extends Preference implements CompoundButton.OnCheckedChangeListener,
-        View.OnClickListener {
-    final static String TAG = "ApnPreference";
-
-    private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-
-    /**
-     * Constructor of Preference
-     */
-    public ApnPreference(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    /**
-     * Constructor of Preference
-     */
-    public ApnPreference(Context context, AttributeSet attrs) {
-        this(context, attrs, R.attr.apnPreferenceStyle);
-    }
-
-    /**
-     * Constructor of Preference
-     */
-    public ApnPreference(Context context) {
-        this(context, null);
-    }
-
-    private static String mSelectedKey = null;
-    private static CompoundButton mCurrentChecked = null;
-    private boolean mProtectFromCheckedChange = false;
-    private boolean mSelectable = true;
-    private boolean mHideDetails = false;
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-
-        final RelativeLayout textArea = (RelativeLayout) view.findViewById(R.id.text_layout);
-        textArea.setOnClickListener(this);
-
-        final View widget = view.findViewById(R.id.apn_radiobutton);
-        if ((widget != null) && widget instanceof RadioButton) {
-            final RadioButton rb = (RadioButton) widget;
-            if (mSelectable) {
-                rb.setOnCheckedChangeListener(this);
-
-                final boolean isChecked = getKey().equals(mSelectedKey);
-                if (isChecked) {
-                    mCurrentChecked = rb;
-                    mSelectedKey = getKey();
-                }
-
-                mProtectFromCheckedChange = true;
-                rb.setChecked(isChecked);
-                mProtectFromCheckedChange = false;
-                rb.setVisibility(View.VISIBLE);
-            } else {
-                rb.setVisibility(View.GONE);
-            }
-        }
-    }
-
-    public boolean isChecked() {
-        return getKey().equals(mSelectedKey);
-    }
-
-    public void setChecked() {
-        mSelectedKey = getKey();
-    }
-
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-        Log.i(TAG, "ID: " + getKey() + " :" + isChecked);
-        if (mProtectFromCheckedChange) {
-            return;
-        }
-
-        if (isChecked) {
-            if (mCurrentChecked != null) {
-                mCurrentChecked.setChecked(false);
-            }
-            mCurrentChecked = buttonView;
-            mSelectedKey = getKey();
-            callChangeListener(mSelectedKey);
-        } else {
-            mCurrentChecked = null;
-            mSelectedKey = null;
-        }
-    }
-
-    @Override
-    public void onClick(View layoutView) {
-        super.onClick();
-        final Context context = getContext();
-        final int pos = Integer.parseInt(getKey());
-        if (context == null) {
-            Log.w(TAG, "No context available for pos=" + pos);
-            return;
-        }
-
-        if (mHideDetails) {
-            Toast.makeText(context, context.getString(
-                    R.string.cannot_change_apn_toast), Toast.LENGTH_LONG).show();
-            return;
-        }
-        final Uri url = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, pos);
-        final Intent editIntent = new Intent(Intent.ACTION_EDIT, url);
-        editIntent.putExtra(ApnSettings.SUB_ID, mSubId);
-        editIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        context.startActivity(editIntent);
-    }
-
-    public void setSelectable(boolean selectable) {
-        mSelectable = selectable;
-    }
-
-    public boolean getSelectable() {
-        return mSelectable;
-    }
-
-    public void setSubId(int subId) {
-        mSubId = subId;
-    }
-
-    public void setHideDetails() {
-        mHideDetails = true;
-    }
-}
diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java
deleted file mode 100755
index f7617fc..0000000
--- a/src/com/android/settings/network/ApnSettings.java
+++ /dev/null
@@ -1,546 +0,0 @@
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.app.ProgressDialog;
-import android.app.settings.SettingsEnums;
-import android.content.BroadcastReceiver;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.Message;
-import android.os.PersistableBundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.Telephony;
-import android.telephony.CarrierConfigManager;
-import android.telephony.PhoneStateListener;
-import android.telephony.PreciseDataConnectionState;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.widget.Toast;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-
-import com.android.settings.R;
-import com.android.settings.RestrictedSettingsFragment;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-import java.util.ArrayList;
-
-public class ApnSettings extends RestrictedSettingsFragment
-        implements Preference.OnPreferenceChangeListener {
-    static final String TAG = "ApnSettings";
-
-    public static final String EXTRA_POSITION = "position";
-    public static final String RESTORE_CARRIERS_URI =
-        "content://telephony/carriers/restore";
-    public static final String PREFERRED_APN_URI =
-        "content://telephony/carriers/preferapn";
-
-    public static final String APN_ID = "apn_id";
-    public static final String SUB_ID = "sub_id";
-    public static final String MVNO_TYPE = "mvno_type";
-    public static final String MVNO_MATCH_DATA = "mvno_match_data";
-
-    private static final String[] CARRIERS_PROJECTION = new String[] {
-            Telephony.Carriers._ID,
-            Telephony.Carriers.NAME,
-            Telephony.Carriers.APN,
-            Telephony.Carriers.TYPE,
-            Telephony.Carriers.MVNO_TYPE,
-            Telephony.Carriers.MVNO_MATCH_DATA,
-            Telephony.Carriers.EDITED_STATUS,
-    };
-
-    private static final int ID_INDEX = 0;
-    private static final int NAME_INDEX = 1;
-    private static final int APN_INDEX = 2;
-    private static final int TYPES_INDEX = 3;
-    private static final int MVNO_TYPE_INDEX = 4;
-    private static final int MVNO_MATCH_DATA_INDEX = 5;
-    private static final int EDITED_INDEX = 6;
-
-    private static final int MENU_NEW = Menu.FIRST;
-    private static final int MENU_RESTORE = Menu.FIRST + 1;
-
-    private static final int EVENT_RESTORE_DEFAULTAPN_START = 1;
-    private static final int EVENT_RESTORE_DEFAULTAPN_COMPLETE = 2;
-
-    private static final int DIALOG_RESTORE_DEFAULTAPN = 1001;
-
-    private static final Uri DEFAULTAPN_URI = Uri.parse(RESTORE_CARRIERS_URI);
-    private static final Uri PREFERAPN_URI = Uri.parse(PREFERRED_APN_URI);
-
-    private static boolean mRestoreDefaultApnMode;
-
-    private UserManager mUserManager;
-    private TelephonyManager mTelephonyManager;
-    private RestoreApnUiHandler mRestoreApnUiHandler;
-    private RestoreApnProcessHandler mRestoreApnProcessHandler;
-    private HandlerThread mRestoreDefaultApnThread;
-    private SubscriptionInfo mSubscriptionInfo;
-    private int mSubId;
-    private int mPhoneId;
-    private String mMvnoType;
-    private String mMvnoMatchData;
-
-    private String mSelectedKey;
-
-    private IntentFilter mIntentFilter;
-
-    private boolean mUnavailable;
-
-    private boolean mHideImsApn;
-    private boolean mAllowAddingApns;
-    private boolean mHidePresetApnDetails;
-
-    public ApnSettings() {
-        super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
-    }
-
-    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
-        @Override
-        public void onPreciseDataConnectionStateChanged(
-                PreciseDataConnectionState dataConnectionState) {
-            if (dataConnectionState.getState() == TelephonyManager.DATA_CONNECTED) {
-                if (!mRestoreDefaultApnMode) {
-                    fillList();
-                } else {
-                    showDialog(DIALOG_RESTORE_DEFAULTAPN);
-                }
-            }
-        }
-    };
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (intent.getAction().equals(
-                    TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED)) {
-                if (mRestoreDefaultApnMode) {
-                    return;
-                }
-                final int extraSubId = intent.getIntExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID,
-                        SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-                if (SubscriptionManager.isValidSubscriptionId(extraSubId)
-                        && mPhoneId == SubscriptionUtil.getPhoneId(context, extraSubId)
-                        && extraSubId != mSubId) {
-                    // subscription has changed
-                    mSubId = extraSubId;
-                    mSubscriptionInfo = getSubscriptionInfo(mSubId);
-                    restartPhoneStateListener(mSubId);
-                }
-                fillList();
-            }
-        }
-    };
-
-    private void restartPhoneStateListener(int subId) {
-        if (mRestoreDefaultApnMode) {
-            return;
-        }
-
-        final TelephonyManager updatedTelephonyManager =
-                mTelephonyManager.createForSubscriptionId(subId);
-
-        // restart monitoring when subscription has been changed
-        mTelephonyManager.listen(mPhoneStateListener,
-                PhoneStateListener.LISTEN_NONE);
-
-        mTelephonyManager = updatedTelephonyManager;
-
-        mTelephonyManager.listen(mPhoneStateListener,
-                PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.APN;
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        final Activity activity = getActivity();
-        mSubId = activity.getIntent().getIntExtra(SUB_ID,
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-        mPhoneId = SubscriptionUtil.getPhoneId(activity, mSubId);
-        mIntentFilter = new IntentFilter(
-                TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED);
-
-        setIfOnlyAvailableForAdmins(true);
-
-        mSubscriptionInfo = getSubscriptionInfo(mSubId);
-        mTelephonyManager = activity.getSystemService(TelephonyManager.class);
-
-        final CarrierConfigManager configManager = (CarrierConfigManager)
-                getSystemService(Context.CARRIER_CONFIG_SERVICE);
-        final PersistableBundle b = configManager.getConfigForSubId(mSubId);
-        mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL);
-        mAllowAddingApns = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL);
-        if (mAllowAddingApns) {
-            final String[] readOnlyApnTypes = b.getStringArray(
-                    CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY);
-            // if no apn type can be edited, do not allow adding APNs
-            if (ApnEditor.hasAllApns(readOnlyApnTypes)) {
-                Log.d(TAG, "not allowing adding APN because all APN types are read only");
-                mAllowAddingApns = false;
-            }
-        }
-        mHidePresetApnDetails = b.getBoolean(CarrierConfigManager.KEY_HIDE_PRESET_APN_DETAILS_BOOL);
-        mUserManager = UserManager.get(activity);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        getEmptyTextView().setText(R.string.apn_settings_not_available);
-        mUnavailable = isUiRestricted();
-        setHasOptionsMenu(!mUnavailable);
-        if (mUnavailable) {
-            addPreferencesFromResource(R.xml.placeholder_prefs);
-            return;
-        }
-
-        addPreferencesFromResource(R.xml.apn_settings);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        if (mUnavailable) {
-            return;
-        }
-
-        getActivity().registerReceiver(mReceiver, mIntentFilter);
-
-        restartPhoneStateListener(mSubId);
-
-        if (!mRestoreDefaultApnMode) {
-            fillList();
-        }
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-
-        if (mUnavailable) {
-            return;
-        }
-
-        getActivity().unregisterReceiver(mReceiver);
-
-        mTelephonyManager.listen(mPhoneStateListener,
-                PhoneStateListener.LISTEN_NONE);
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        if (mRestoreDefaultApnThread != null) {
-            mRestoreDefaultApnThread.quit();
-        }
-    }
-
-    @Override
-    public EnforcedAdmin getRestrictionEnforcedAdmin() {
-        final UserHandle user = UserHandle.of(mUserManager.getUserHandle());
-        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, user)
-                && !mUserManager.hasBaseUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
-                        user)) {
-            return EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN;
-        }
-        return null;
-    }
-
-    private SubscriptionInfo getSubscriptionInfo(int subId) {
-        return SubscriptionManager.from(getActivity()).getActiveSubscriptionInfo(subId);
-    }
-
-    private void fillList() {
-        final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
-                : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-        final Uri simApnUri = Uri.withAppendedPath(Telephony.Carriers.SIM_APN_URI,
-                String.valueOf(subId));
-        final StringBuilder where =
-                new StringBuilder("NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND "
-                + "user_visible!=0");
-
-        if (mHideImsApn) {
-            where.append(" AND NOT (type='ims')");
-        }
-
-        final Cursor cursor = getContentResolver().query(simApnUri,
-                CARRIERS_PROJECTION, where.toString(), null,
-                Telephony.Carriers.DEFAULT_SORT_ORDER);
-
-        if (cursor != null) {
-            final PreferenceGroup apnPrefList = (PreferenceGroup) findPreference("apn_list");
-            apnPrefList.removeAll();
-
-            final ArrayList<ApnPreference> apnList = new ArrayList<ApnPreference>();
-            final ArrayList<ApnPreference> mmsApnList = new ArrayList<ApnPreference>();
-
-            mSelectedKey = getSelectedApnKey();
-            cursor.moveToFirst();
-            while (!cursor.isAfterLast()) {
-                final String name = cursor.getString(NAME_INDEX);
-                final String apn = cursor.getString(APN_INDEX);
-                final String key = cursor.getString(ID_INDEX);
-                final String type = cursor.getString(TYPES_INDEX);
-                final int edited = cursor.getInt(EDITED_INDEX);
-                mMvnoType = cursor.getString(MVNO_TYPE_INDEX);
-                mMvnoMatchData = cursor.getString(MVNO_MATCH_DATA_INDEX);
-
-                final ApnPreference pref = new ApnPreference(getPrefContext());
-
-                pref.setKey(key);
-                pref.setTitle(name);
-                pref.setPersistent(false);
-                pref.setOnPreferenceChangeListener(this);
-                pref.setSubId(subId);
-                if (mHidePresetApnDetails && edited == Telephony.Carriers.UNEDITED) {
-                    pref.setHideDetails();
-                } else {
-                    pref.setSummary(apn);
-                }
-
-                final boolean selectable = ((type == null) || !type.equals("mms"));
-                pref.setSelectable(selectable);
-                if (selectable) {
-                    if ((mSelectedKey != null) && mSelectedKey.equals(key)) {
-                        pref.setChecked();
-                    }
-                    apnList.add(pref);
-                } else {
-                    mmsApnList.add(pref);
-                }
-                cursor.moveToNext();
-            }
-            cursor.close();
-
-            for (Preference preference : apnList) {
-                apnPrefList.addPreference(preference);
-            }
-            for (Preference preference : mmsApnList) {
-                apnPrefList.addPreference(preference);
-            }
-        }
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        if (!mUnavailable) {
-            if (mAllowAddingApns) {
-                menu.add(0, MENU_NEW, 0,
-                        getResources().getString(R.string.menu_new))
-                        .setIcon(R.drawable.ic_add_24dp)
-                        .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-            }
-            menu.add(0, MENU_RESTORE, 0,
-                    getResources().getString(R.string.menu_restore))
-                    .setIcon(android.R.drawable.ic_menu_upload);
-        }
-
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-        case MENU_NEW:
-            addNewApn();
-            return true;
-
-        case MENU_RESTORE:
-            restoreDefaultApn();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void addNewApn() {
-        final Intent intent = new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI);
-        final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
-                : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-        intent.putExtra(SUB_ID, subId);
-        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        if (!TextUtils.isEmpty(mMvnoType) && !TextUtils.isEmpty(mMvnoMatchData)) {
-            intent.putExtra(MVNO_TYPE, mMvnoType);
-            intent.putExtra(MVNO_MATCH_DATA, mMvnoMatchData);
-        }
-        startActivity(intent);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        Log.d(TAG, "onPreferenceChange(): Preference - " + preference
-                + ", newValue - " + newValue + ", newValue type - "
-                + newValue.getClass());
-        if (newValue instanceof String) {
-            setSelectedApnKey((String) newValue);
-        }
-
-        return true;
-    }
-
-    private void setSelectedApnKey(String key) {
-        mSelectedKey = key;
-        final ContentResolver resolver = getContentResolver();
-
-        final ContentValues values = new ContentValues();
-        values.put(APN_ID, mSelectedKey);
-        resolver.update(getUriForCurrSubId(PREFERAPN_URI), values, null, null);
-    }
-
-    private String getSelectedApnKey() {
-        String key = null;
-
-        final Cursor cursor = getContentResolver().query(getUriForCurrSubId(PREFERAPN_URI),
-                new String[] {"_id"}, null, null, Telephony.Carriers.DEFAULT_SORT_ORDER);
-        if (cursor.getCount() > 0) {
-            cursor.moveToFirst();
-            key = cursor.getString(ID_INDEX);
-        }
-        cursor.close();
-        return key;
-    }
-
-    private boolean restoreDefaultApn() {
-        showDialog(DIALOG_RESTORE_DEFAULTAPN);
-        mRestoreDefaultApnMode = true;
-
-        if (mRestoreApnUiHandler == null) {
-            mRestoreApnUiHandler = new RestoreApnUiHandler();
-        }
-
-        if (mRestoreApnProcessHandler == null ||
-            mRestoreDefaultApnThread == null) {
-            mRestoreDefaultApnThread = new HandlerThread(
-                    "Restore default APN Handler: Process Thread");
-            mRestoreDefaultApnThread.start();
-            mRestoreApnProcessHandler = new RestoreApnProcessHandler(
-                    mRestoreDefaultApnThread.getLooper(), mRestoreApnUiHandler);
-        }
-
-        mRestoreApnProcessHandler
-                .sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_START);
-        return true;
-    }
-
-    // Append subId to the Uri
-    private Uri getUriForCurrSubId(Uri uri) {
-        final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
-                : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-        if (SubscriptionManager.isValidSubscriptionId(subId)) {
-            return Uri.withAppendedPath(uri, "subId/" + String.valueOf(subId));
-        } else {
-            return uri;
-        }
-    }
-
-    private class RestoreApnUiHandler extends Handler {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case EVENT_RESTORE_DEFAULTAPN_COMPLETE:
-                    final Activity activity = getActivity();
-                    if (activity == null) {
-                        mRestoreDefaultApnMode = false;
-                        return;
-                    }
-                    fillList();
-                    getPreferenceScreen().setEnabled(true);
-                    mRestoreDefaultApnMode = false;
-                    removeDialog(DIALOG_RESTORE_DEFAULTAPN);
-                    Toast.makeText(
-                        activity,
-                        getResources().getString(
-                                R.string.restore_default_apn_completed),
-                        Toast.LENGTH_LONG).show();
-                    break;
-            }
-        }
-    }
-
-    private class RestoreApnProcessHandler extends Handler {
-        private Handler mRestoreApnUiHandler;
-
-        public RestoreApnProcessHandler(Looper looper, Handler restoreApnUiHandler) {
-            super(looper);
-            this.mRestoreApnUiHandler = restoreApnUiHandler;
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case EVENT_RESTORE_DEFAULTAPN_START:
-                    final ContentResolver resolver = getContentResolver();
-                    resolver.delete(getUriForCurrSubId(DEFAULTAPN_URI), null, null);
-                    mRestoreApnUiHandler
-                        .sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_COMPLETE);
-                    break;
-            }
-        }
-    }
-
-    @Override
-    public Dialog onCreateDialog(int id) {
-        if (id == DIALOG_RESTORE_DEFAULTAPN) {
-            final ProgressDialog dialog = new ProgressDialog(getActivity()) {
-                public boolean onTouchEvent(MotionEvent event) {
-                    return true;
-                }
-            };
-            dialog.setMessage(getResources().getString(R.string.restore_default_apn));
-            dialog.setCancelable(false);
-            return dialog;
-        }
-        return null;
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        if (dialogId == DIALOG_RESTORE_DEFAULTAPN) {
-            return SettingsEnums.DIALOG_APN_RESTORE_DEFAULT;
-        }
-        return 0;
-    }
-}
diff --git a/src/com/android/settings/network/CarrierConfigChangedReceiver.java b/src/com/android/settings/network/CarrierConfigChangedReceiver.java
new file mode 100644
index 0000000..8a6d47d
--- /dev/null
+++ b/src/com/android/settings/network/CarrierConfigChangedReceiver.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.telephony.CarrierConfigManager;
+import android.util.Log;
+
+import java.util.concurrent.CountDownLatch;
+
+/** A receiver listens to the carrier config changes. */
+public class CarrierConfigChangedReceiver extends BroadcastReceiver {
+    private static final String TAG = "CarrierConfigChangedReceiver";
+    private static final String ACTION_CARRIER_CONFIG_CHANGED =
+            CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED;
+
+    private final CountDownLatch mLatch;
+
+    public CarrierConfigChangedReceiver(CountDownLatch latch) {
+        mLatch = latch;
+    }
+
+    public void registerOn(Context context) {
+        context.registerReceiver(this, new IntentFilter(ACTION_CARRIER_CONFIG_CHANGED));
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (isInitialStickyBroadcast()) {
+            return;
+        }
+
+        if (ACTION_CARRIER_CONFIG_CHANGED.equals(intent.getAction())) {
+            checkSubscriptionIndex(intent);
+        }
+    }
+
+    private void checkSubscriptionIndex(Intent intent) {
+        if (intent.hasExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX)) {
+            int subId = intent.getIntExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX, -1);
+            Log.i(TAG, "subId from config changed: " + subId);
+            mLatch.countDown();
+        }
+    }
+}
diff --git a/src/com/android/settings/network/EnableMultiSimSidecar.java b/src/com/android/settings/network/EnableMultiSimSidecar.java
new file mode 100644
index 0000000..c47e61a
--- /dev/null
+++ b/src/com/android/settings/network/EnableMultiSimSidecar.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.app.FragmentManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.telephony.CarrierConfigManager;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccSlotInfo;
+import android.util.ArraySet;
+import android.util.Log;
+
+import com.android.settings.AsyncTaskSidecar;
+import com.android.settings.SidecarFragment;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * {@code EnableMultiSimSidecar} enables multi SIM on the device. It should only be called for
+ * Android R+. After {@code run} is called, it sets the configuration on modem side to enable
+ * multiple SIMs. Once the configuration is set successfully, it will listen to UICC card changes
+ * until {@code TelMan.EXTRA_ACTIVE_SIM_SUPPORTED_COUNT} matches {@code mNumOfActiveSim} or timeout.
+ */
+public class EnableMultiSimSidecar extends AsyncTaskSidecar<Void, Boolean> {
+
+    // Tags
+    private static final String TAG = "EnableMultiSimSidecar";
+
+    // TODO(b/171846124): Pass timeout value from LPA to Settings
+    private static final long ENABLE_MULTI_SIM_TIMEOUT_MILLS = 40 * 1000L;
+
+    public static EnableMultiSimSidecar get(FragmentManager fm) {
+        return SidecarFragment.get(fm, TAG, EnableMultiSimSidecar.class, null /* args */);
+    }
+
+    final CountDownLatch mSimCardStateChangedLatch = new CountDownLatch(1);
+    private TelephonyManager mTelephonyManager;
+    private int mNumOfActiveSim = 0;
+
+    private final BroadcastReceiver mCarrierConfigChangeReceiver =
+            new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    int readySimsCount = getReadySimsCount();
+                    int activeSlotsCount = getActiveSlotsCount();
+                    // If the number of ready SIM count and active slots equal to the number of SIMs
+                    // need to be activated, the device is successfully switched to multiple active
+                    // SIM mode.
+                    if (readySimsCount == mNumOfActiveSim && activeSlotsCount == mNumOfActiveSim) {
+                        Log.i(
+                                TAG,
+                                String.format("%d slots are active and ready.", mNumOfActiveSim));
+                        mSimCardStateChangedLatch.countDown();
+                        return;
+                    }
+                    Log.i(
+                            TAG,
+                            String.format(
+                                    "%d slots are active and %d SIMs are ready. Keep waiting until"
+                                        + " timeout.",
+                                    activeSlotsCount, readySimsCount));
+                }
+            };
+
+    @Override
+    protected Boolean doInBackground(Void aVoid) {
+        return updateMultiSimConfig();
+    }
+
+    @Override
+    protected void onPostExecute(Boolean isDsdsEnabled) {
+        if (isDsdsEnabled) {
+            setState(State.SUCCESS, Substate.UNUSED);
+        } else {
+            setState(State.ERROR, Substate.UNUSED);
+        }
+    }
+
+    public void run(int numberOfSimToActivate) {
+        mTelephonyManager = getContext().getSystemService(TelephonyManager.class);
+        mNumOfActiveSim = numberOfSimToActivate;
+
+        if (mNumOfActiveSim > mTelephonyManager.getSupportedModemCount()) {
+            Log.e(TAG, "Requested number of active SIM is greater than supported modem count.");
+            setState(State.ERROR, Substate.UNUSED);
+            return;
+        }
+        if (mTelephonyManager.doesSwitchMultiSimConfigTriggerReboot()) {
+            Log.e(TAG, "The device does not support reboot free DSDS.");
+            setState(State.ERROR, Substate.UNUSED);
+            return;
+        }
+        super.run(null /* param */);
+    }
+
+    // This method registers a ACTION_SIM_CARD_STATE_CHANGED broadcast receiver and wait for slot
+    // changes. If multi SIMs have been successfully enabled, it returns true. Otherwise, returns
+    // false.
+    private boolean updateMultiSimConfig() {
+        try {
+            getContext()
+                    .registerReceiver(
+                            mCarrierConfigChangeReceiver,
+                            new IntentFilter(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED));
+            mTelephonyManager.switchMultiSimConfig(mNumOfActiveSim);
+            if (mSimCardStateChangedLatch.await(
+                    ENABLE_MULTI_SIM_TIMEOUT_MILLS, TimeUnit.MILLISECONDS)) {
+                Log.i(TAG, "Multi SIM were successfully enabled.");
+                return true;
+            } else {
+                Log.e(TAG, "Timeout for waiting SIM status.");
+                return false;
+            }
+        } catch (InterruptedException e) {
+            Log.e(TAG, "Failed to enable multiple SIM due to InterruptedException", e);
+            return false;
+        } finally {
+            getContext().unregisterReceiver(mCarrierConfigChangeReceiver);
+        }
+    }
+
+    // Returns how many SIMs have SIM ready state, not ready state, or removable slot with absent
+    // SIM state.
+    private int getReadySimsCount() {
+        int readyCardsCount = 0;
+        int activeSlotCount = mTelephonyManager.getActiveModemCount();
+        Set<Integer> activeRemovableLogicalSlots = getActiveRemovableLogicalSlotIds();
+        for (int logicalSlotId = 0; logicalSlotId < activeSlotCount; logicalSlotId++) {
+            int simState = mTelephonyManager.getSimState(logicalSlotId);
+            if (simState == TelephonyManager.SIM_STATE_READY
+                    || simState == TelephonyManager.SIM_STATE_NOT_READY
+                    || simState == TelephonyManager.SIM_STATE_LOADED
+                    || (simState == TelephonyManager.SIM_STATE_ABSENT
+                            && activeRemovableLogicalSlots.contains(logicalSlotId))) {
+                readyCardsCount++;
+            }
+        }
+        return readyCardsCount;
+    }
+
+    // Get active slots count from {@code TelephonyManager#getUiccSlotsInfo}.
+    private int getActiveSlotsCount() {
+        UiccSlotInfo[] slotsInfo = mTelephonyManager.getUiccSlotsInfo();
+        if (slotsInfo == null) {
+            return 0;
+        }
+        int activeSlots = 0;
+        for (UiccSlotInfo slotInfo : slotsInfo) {
+            if (slotInfo != null && slotInfo.getIsActive()) {
+                activeSlots++;
+            }
+        }
+        return activeSlots;
+    }
+
+    /** Returns a list of active removable logical slot ids. */
+    public Set<Integer> getActiveRemovableLogicalSlotIds() {
+        UiccSlotInfo[] infos = mTelephonyManager.getUiccSlotsInfo();
+        if (infos == null) {
+            return Collections.emptySet();
+        }
+        Set<Integer> activeRemovableLogicalSlotIds = new ArraySet<>();
+        for (UiccSlotInfo info : infos) {
+            if (info != null && info.getIsActive() && info.isRemovable()) {
+                activeRemovableLogicalSlotIds.add(info.getLogicalSlotIdx());
+            }
+        }
+        return activeRemovableLogicalSlotIds;
+    }
+}
diff --git a/src/com/android/settings/network/EraseEuiccDataController.java b/src/com/android/settings/network/EraseEuiccDataController.java
new file mode 100644
index 0000000..d221fbd
--- /dev/null
+++ b/src/com/android/settings/network/EraseEuiccDataController.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.system.ResetDashboardFragment;
+
+/**
+ * Controller for erasing Euicc data
+ */
+public class EraseEuiccDataController extends BasePreferenceController implements
+        PreferenceControllerMixin {
+    private ResetDashboardFragment mHostFragment;
+
+    public EraseEuiccDataController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    public void setFragment(ResetDashboardFragment hostFragment) {
+        mHostFragment = hostFragment;
+    }
+
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) {
+            return false;
+        }
+        EraseEuiccDataDialogFragment.show(mHostFragment);
+        return true;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE_UNSEARCHABLE;
+    }
+}
diff --git a/src/com/android/settings/network/EraseEuiccDataDialogFragment.java b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
new file mode 100644
index 0000000..3aee9b1
--- /dev/null
+++ b/src/com/android/settings/network/EraseEuiccDataDialogFragment.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.settings.SettingsEnums;
+import android.content.DialogInterface;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RecoverySystem;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+
+import com.android.settings.R;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.system.ResetDashboardFragment;
+
+public class EraseEuiccDataDialogFragment extends InstrumentedDialogFragment implements
+        DialogInterface.OnClickListener {
+
+    public static final String TAG = "EraseEuiccDataDlg";
+    private static final String PACKAGE_NAME_EUICC_DATA_MANAGEMENT_CALLBACK =
+            "com.android.settings.network";
+
+    public static void show(ResetDashboardFragment host) {
+        final EraseEuiccDataDialogFragment dialog = new EraseEuiccDataDialogFragment();
+        dialog.setTargetFragment(host, 0 /* requestCode */);
+        final FragmentManager manager = host.getActivity().getSupportFragmentManager();
+        dialog.show(manager, TAG);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.RESET_EUICC;
+    }
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.reset_esim_title)
+                .setMessage(R.string.reset_esim_desc)
+                .setPositiveButton(R.string.erase_euicc_data_button, this)
+                .setNegativeButton(R.string.cancel, null)
+                .setOnDismissListener(this)
+                .create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        Fragment fragment = getTargetFragment();
+        if (!(fragment instanceof ResetDashboardFragment)) {
+            Log.e(TAG, "getTargetFragment return unexpected type");
+        }
+
+        if (which == DialogInterface.BUTTON_POSITIVE) {
+            AsyncTask.execute(new Runnable() {
+                @Override
+                public void run() {
+                    RecoverySystem.wipeEuiccData(
+                            getContext(), PACKAGE_NAME_EUICC_DATA_MANAGEMENT_CALLBACK);
+                }
+            });
+        }
+    }
+}
diff --git a/src/com/android/settings/network/InternetPreferenceController.java b/src/com/android/settings/network/InternetPreferenceController.java
new file mode 100644
index 0000000..3cdcaca
--- /dev/null
+++ b/src/com/android/settings/network/InternetPreferenceController.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.Context;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.widget.SummaryUpdater;
+import com.android.settings.wifi.WifiSummaryUpdater;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+/**
+ * PreferenceController to update the internet state.
+ */
+public class InternetPreferenceController extends AbstractPreferenceController implements
+        PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
+        LifecycleObserver, OnResume, OnPause {
+
+    public static final String KEY_INTERNET_SETTINGS = "internet_settings";
+
+    private Preference mPreference;
+    private final WifiSummaryUpdater mSummaryHelper;
+
+    public InternetPreferenceController(Context context) {
+        super(context);
+        mSummaryHelper = new WifiSummaryUpdater(mContext, this);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(KEY_INTERNET_SETTINGS);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_INTERNET_SETTINGS;
+    }
+
+    @Override
+    public void onResume() {
+        mSummaryHelper.register(true);
+    }
+
+    @Override
+    public void onPause() {
+        mSummaryHelper.register(false);
+    }
+
+    @Override
+    public void onSummaryChanged(String summary) {
+        if (mPreference != null) {
+            mPreference.setSummary(summary);
+        }
+    }
+}
diff --git a/src/com/android/settings/network/MobileNetworkListController.java b/src/com/android/settings/network/MobileNetworkListController.java
index f1980b2..77c93ff 100644
--- a/src/com/android/settings/network/MobileNetworkListController.java
+++ b/src/com/android/settings/network/MobileNetworkListController.java
@@ -128,7 +128,7 @@
             pref.setOnPreferenceClickListener(clickedPref -> {
                 if (!info.isEmbedded() && !mSubscriptionManager.isActiveSubscriptionId(subId)
                         && !SubscriptionUtil.showToggleForPhysicalSim(mSubscriptionManager)) {
-                    mSubscriptionManager.setSubscriptionEnabled(subId, true);
+                    SubscriptionUtil.startToggleSubscriptionDialogActivity(mContext, subId, true);
                 } else {
                     final Intent intent = new Intent(mContext, MobileNetworkActivity.class);
                     intent.putExtra(Settings.EXTRA_SUB_ID, info.getSubscriptionId());
diff --git a/src/com/android/settings/network/MobileNetworkPreferenceController.java b/src/com/android/settings/network/MobileNetworkPreferenceController.java
index 5612d2e..b968438 100644
--- a/src/com/android/settings/network/MobileNetworkPreferenceController.java
+++ b/src/com/android/settings/network/MobileNetworkPreferenceController.java
@@ -18,6 +18,8 @@
 import static android.os.UserHandle.myUserId;
 import static android.os.UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS;
 
+import static androidx.lifecycle.Lifecycle.Event;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -29,6 +31,8 @@
 import android.telephony.TelephonyManager;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
@@ -39,12 +43,9 @@
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.Utils;
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.core.lifecycle.events.OnStop;
 
 public class MobileNetworkPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin, LifecycleObserver, OnStart, OnStop {
+        implements PreferenceControllerMixin, LifecycleObserver {
 
     @VisibleForTesting
     static final String KEY_MOBILE_NETWORK_SETTINGS = "mobile_network_settings";
@@ -96,7 +97,7 @@
         return KEY_MOBILE_NETWORK_SETTINGS;
     }
 
-    @Override
+    @OnLifecycleEvent(Event.ON_START)
     public void onStart() {
         if (isAvailable()) {
             if (mPhoneStateListener == null) {
@@ -115,7 +116,7 @@
         }
     }
 
-    @Override
+    @OnLifecycleEvent(Event.ON_STOP)
     public void onStop() {
         if (mPhoneStateListener != null) {
             mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.java b/src/com/android/settings/network/MobileNetworkSummaryController.java
index 9e3f1e8..08da41a 100644
--- a/src/com/android/settings/network/MobileNetworkSummaryController.java
+++ b/src/com/android/settings/network/MobileNetworkSummaryController.java
@@ -45,6 +45,7 @@
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class MobileNetworkSummaryController extends AbstractPreferenceController implements
         SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver,
@@ -124,12 +125,20 @@
                 return subs.get(0).getDisplayName();
             }
         } else {
+            if (com.android.settings.Utils.isProviderModelEnabled(mContext)) {
+                return getSummaryForProviderModel(subs);
+            }
             final int count = subs.size();
             return mContext.getResources().getQuantityString(R.plurals.mobile_network_summary_count,
                     count, count);
         }
     }
 
+    private CharSequence getSummaryForProviderModel(List<SubscriptionInfo> subs) {
+        return String.join(", ", subs.stream().map(SubscriptionInfo::getDisplayName)
+                .collect(Collectors.toList()));
+    }
+
     private void startAddSimFlow() {
         final Intent intent = new Intent(EuiccManager.ACTION_PROVISION_EMBEDDED_SUBSCRIPTION);
         intent.putExtra(EuiccManager.EXTRA_FORCE_PROVISION, true);
@@ -180,7 +189,8 @@
                     final int subId = info.getSubscriptionId();
                     if (!info.isEmbedded() && !mSubscriptionManager.isActiveSubscriptionId(subId)
                             && !SubscriptionUtil.showToggleForPhysicalSim(mSubscriptionManager)) {
-                        mSubscriptionManager.setSubscriptionEnabled(subId, true);
+                        SubscriptionUtil.startToggleSubscriptionDialogActivity(
+                                mContext, subId, true);
                     } else {
                         final Intent intent = new Intent(mContext, MobileNetworkActivity.class);
                         intent.putExtra(Settings.EXTRA_SUB_ID, subs.get(0).getSubscriptionId());
diff --git a/src/com/android/settings/network/MobilePlanPreferenceController.java b/src/com/android/settings/network/MobilePlanPreferenceController.java
index 255dfcd..b4135b8 100644
--- a/src/com/android/settings/network/MobilePlanPreferenceController.java
+++ b/src/com/android/settings/network/MobilePlanPreferenceController.java
@@ -145,7 +145,7 @@
             }
 
             // Get provisioning URL
-            String url = mCm.getMobileProvisioningUrl();
+            String url = mTm.getMobileProvisioningUrl();
             if (!TextUtils.isEmpty(url)) {
                 Intent intent = Intent.makeMainSelectorActivity(Intent.ACTION_MAIN,
                         Intent.CATEGORY_APP_BROWSER);
diff --git a/src/com/android/settings/network/MultiNetworkHeaderController.java b/src/com/android/settings/network/MultiNetworkHeaderController.java
index e99cbb6..1143546 100644
--- a/src/com/android/settings/network/MultiNetworkHeaderController.java
+++ b/src/com/android/settings/network/MultiNetworkHeaderController.java
@@ -27,9 +27,14 @@
 import com.android.settings.wifi.WifiConnectionPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
-// This controls a header at the top of the Network & internet page that only appears when there
-// are two or more active mobile subscriptions. It shows an overview of available network
-// connections with an entry for wifi (if connected) and an entry for each subscription.
+/**
+ * This controls a header at the top of the Network & internet page that only appears when there
+ * are two or more active mobile subscriptions. It shows an overview of available network
+ * connections with an entry for wifi (if connected) and an entry for each subscription.
+ *
+ * TODO(tomhsu) when provider model is completed, this class will be replaced
+ * by {@link NetworkMobileProviderController}
+ */
 public class MultiNetworkHeaderController extends BasePreferenceController implements
         WifiConnectionPreferenceController.UpdateListener,
         SubscriptionsPreferenceController.UpdateListener {
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index db704ae..7ce98e8 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -21,22 +21,25 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.os.Bundle;
+import android.provider.SearchIndexableResource;
 import android.util.Log;
 
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.Fragment;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.network.MobilePlanPreferenceController.MobilePlanPreferenceHost;
 import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @SearchIndexable
@@ -57,14 +60,20 @@
 
     @Override
     protected int getPreferenceScreenResId() {
-        return R.xml.network_and_internet;
+        if (Utils.isProviderModelEnabled(getContext())) {
+            return R.xml.network_provider_internet;
+        } else {
+            return R.xml.network_and_internet;
+        }
     }
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
 
-        use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
+        if (!Utils.isProviderModelEnabled(context)) {
+            use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
+        }
         use(AirplaneModePreferenceController.class).setFragment(this);
         getSettingsLifecycle().addObserver(use(AllInOneTetherPreferenceController.class));
     }
@@ -96,8 +105,16 @@
             MobilePlanPreferenceHost mobilePlanHost) {
         final MobilePlanPreferenceController mobilePlanPreferenceController =
                 new MobilePlanPreferenceController(context, mobilePlanHost);
-        final WifiMasterSwitchPreferenceController wifiPreferenceController =
-                new WifiMasterSwitchPreferenceController(context, metricsFeatureProvider);
+        final WifiPrimarySwitchPreferenceController wifiPreferenceController =
+                Utils.isProviderModelEnabled(context)
+                        ? null
+                        : new WifiPrimarySwitchPreferenceController(
+                                context,
+                                metricsFeatureProvider);
+        final InternetPreferenceController internetPreferenceController =
+                Utils.isProviderModelEnabled(context)
+                        ? new InternetPreferenceController(context)
+                        : null;
 
         final VpnPreferenceController vpnPreferenceController =
                 new VpnPreferenceController(context);
@@ -106,7 +123,12 @@
 
         if (lifecycle != null) {
             lifecycle.addObserver(mobilePlanPreferenceController);
-            lifecycle.addObserver(wifiPreferenceController);
+            if (wifiPreferenceController != null) {
+                lifecycle.addObserver(wifiPreferenceController);
+            }
+            if (internetPreferenceController != null) {
+                lifecycle.addObserver(internetPreferenceController);
+            }
             lifecycle.addObserver(vpnPreferenceController);
             lifecycle.addObserver(privateDnsPreferenceController);
         }
@@ -118,8 +140,17 @@
         controllers.add(vpnPreferenceController);
         controllers.add(new ProxyPreferenceController(context));
         controllers.add(mobilePlanPreferenceController);
-        controllers.add(wifiPreferenceController);
+        if (wifiPreferenceController != null) {
+            controllers.add(wifiPreferenceController);
+        }
+        if (internetPreferenceController != null) {
+            controllers.add(internetPreferenceController);
+        }
         controllers.add(privateDnsPreferenceController);
+        if (Utils.isProviderModelEnabled(context)) {
+            controllers.add(new NetworkProviderCallsSmsController(context, lifecycle));
+            controllers.add(new AirplaneSafeNetworksPreferenceController(context, lifecycle));
+        }
         return controllers;
     }
 
@@ -157,6 +188,18 @@
             new BaseSearchIndexProvider(R.xml.network_and_internet) {
 
                 @Override
+                // TODO(b/167474581): Should remove this method when Provider Model finished.
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    if (Utils.isProviderModelEnabled(context)) {
+                        final SearchIndexableResource sir = new SearchIndexableResource(context);
+                        sir.xmlResId = R.xml.network_provider_internet;
+                        return Arrays.asList(sir);
+                    }
+                    return super.getXmlResourcesToIndex(context, enabled);
+                }
+
+                @Override
                 public List<AbstractPreferenceController> createPreferenceControllers(Context
                         context) {
                     return buildPreferenceControllers(context, null /* lifecycle */,
diff --git a/src/com/android/settings/network/NetworkMobileProviderController.java b/src/com/android/settings/network/NetworkMobileProviderController.java
new file mode 100644
index 0000000..5dc6c0d
--- /dev/null
+++ b/src/com/android/settings/network/NetworkMobileProviderController.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.content.Context;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+/**
+ * This controls mobile network display of the internet page that only appears when there
+ * are active mobile subscriptions. It shows an overview of available mobile network
+ * connections with an entry for each subscription.
+ *
+ *  {@link NetworkMobileProviderController} is used to show subscription status on internet
+ *  page for provider model. This original class can refer to {@link MultiNetworkHeaderController},
+ *
+  */
+public class NetworkMobileProviderController extends BasePreferenceController implements
+        SubscriptionsPreferenceController.UpdateListener {
+
+    private static final String TAG = NetworkMobileProviderController.class.getSimpleName();
+
+    public static final String PREF_KEY_PROVIDER_MOBILE_NETWORK = "provider_model_mobile_network";
+    private static final int PREFERENCE_START_ORDER = 10;
+
+    private PreferenceCategory mPreferenceCategory;
+    private PreferenceScreen mPreferenceScreen;
+
+    private SubscriptionsPreferenceController mSubscriptionsController;
+
+    private int mOriginalExpandedChildrenCount;
+
+    public NetworkMobileProviderController(Context context, String key) {
+        super(context, key);
+    }
+
+    /**
+     * Initialize NetworkMobileProviderController
+     * @param lifecycle Lifecycle of Settings
+     */
+    public void init(Lifecycle lifecycle) {
+        mSubscriptionsController = createSubscriptionsController(lifecycle);
+    }
+
+    @VisibleForTesting
+    SubscriptionsPreferenceController createSubscriptionsController(Lifecycle lifecycle) {
+        if (mSubscriptionsController == null) {
+            return new SubscriptionsPreferenceController(
+                    mContext,
+                    lifecycle,
+                    this,
+                    PREF_KEY_PROVIDER_MOBILE_NETWORK,
+                    PREFERENCE_START_ORDER);
+        }
+        return mSubscriptionsController;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        if (mSubscriptionsController == null) {
+            Log.e(TAG, "[displayPreference] SubscriptionsController is null.");
+            return;
+        }
+        mPreferenceScreen = screen;
+        mOriginalExpandedChildrenCount = mPreferenceScreen.getInitialExpandedChildrenCount();
+        mPreferenceCategory = screen.findPreference(PREF_KEY_PROVIDER_MOBILE_NETWORK);
+        mPreferenceCategory.setVisible(isAvailable());
+        // TODO(tomhsu) For the provider model, subscriptionsController shall do more
+        // implementation of preference type change and summary control.
+        mSubscriptionsController.displayPreference(screen);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (mSubscriptionsController == null) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
+        return mSubscriptionsController.isAvailable() ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public void onChildrenUpdated() {
+        final boolean available = isAvailable();
+        // TODO(b/129893781) we need a better way to express where the advanced collapsing starts
+        // for preference groups that have items dynamically added/removed in the top expanded
+        // section.
+        if (mOriginalExpandedChildrenCount != Integer.MAX_VALUE) {
+            if (available) {
+                mPreferenceScreen.setInitialExpandedChildrenCount(
+                        mOriginalExpandedChildrenCount + mPreferenceCategory.getPreferenceCount());
+            } else {
+                mPreferenceScreen.setInitialExpandedChildrenCount(mOriginalExpandedChildrenCount);
+            }
+        }
+        mPreferenceCategory.setVisible(available);
+    }
+
+    public void setWifiPickerTrackerHelper(WifiPickerTrackerHelper helper) {
+        if (mSubscriptionsController != null) {
+            mSubscriptionsController.setWifiPickerTrackerHelper(helper);
+        }
+    }
+}
diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsController.java b/src/com/android/settings/network/NetworkProviderCallsSmsController.java
new file mode 100644
index 0000000..3a228dc
--- /dev/null
+++ b/src/com/android/settings/network/NetworkProviderCallsSmsController.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static androidx.lifecycle.Lifecycle.Event;
+
+import android.content.Context;
+import android.os.UserManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settingslib.RestrictedPreference;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.List;
+
+public class NetworkProviderCallsSmsController extends AbstractPreferenceController implements
+        SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver {
+
+    private static final String TAG = "NetworkProviderCallsSmsController";
+    private static final String KEY = "calls_and_sms";
+
+    private UserManager mUserManager;
+    private SubscriptionManager mSubscriptionManager;
+    private SubscriptionsChangeListener mSubscriptionsChangeListener;
+
+    private RestrictedPreference mPreference;
+
+    /**
+     * The summary text and click behavior of the "Calls & SMS" item on the
+     * Network & internet page.
+     */
+    public NetworkProviderCallsSmsController(Context context, Lifecycle lifecycle) {
+        super(context);
+
+        mUserManager = context.getSystemService(UserManager.class);
+        mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
+        if (lifecycle != null) {
+            mSubscriptionsChangeListener = new SubscriptionsChangeListener(context, this);
+            lifecycle.addObserver(this);
+        }
+    }
+
+    @OnLifecycleEvent(Event.ON_RESUME)
+    public void onResume() {
+        mSubscriptionsChangeListener.start();
+        update();
+    }
+
+    @OnLifecycleEvent(Event.ON_PAUSE)
+    public void onPause() {
+        mSubscriptionsChangeListener.stop();
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(
+                mSubscriptionManager);
+
+        if (subs.isEmpty()) {
+            return setSummaryResId(R.string.calls_sms_no_sim);
+        } else {
+            final StringBuilder summary = new StringBuilder();
+            for (SubscriptionInfo subInfo : subs) {
+                int subsSize = subs.size();
+
+                // Set displayName as summary if there is only one valid SIM.
+                if (subsSize == 1
+                        && SubscriptionManager.isValidSubscriptionId(subInfo.getSubscriptionId())) {
+                    return subInfo.getDisplayName();
+                }
+
+                CharSequence status = getPreferredStatus(subInfo);
+                if (status.toString().isEmpty()) {
+                    // If there are 2 or more SIMs and one of these has no preferred status,
+                    // set only its displayName as summary.
+                    summary.append(subInfo.getDisplayName());
+                } else {
+                    summary.append(subInfo.getDisplayName())
+                            .append(" (")
+                            .append(status)
+                            .append(")");
+                }
+                // Do not add ", " for the last subscription.
+                if (subInfo != subs.get(subs.size() - 1)) {
+                    summary.append(", ");
+                }
+            }
+            return summary;
+        }
+    }
+
+    @VisibleForTesting
+    protected CharSequence getPreferredStatus(SubscriptionInfo subInfo) {
+        final int subId = subInfo.getSubscriptionId();
+        String status = "";
+        boolean isDataPreferred = subId == getDefaultVoiceSubscriptionId();
+        boolean isSmsPreferred = subId == getDefaultSmsSubscriptionId();
+
+        if (!SubscriptionManager.isValidSubscriptionId(subId)) {
+            status = setSummaryResId(R.string.calls_sms_unavailable);
+        } else {
+            if (isDataPreferred && isSmsPreferred) {
+                status = setSummaryResId(R.string.calls_sms_preferred);
+            } else if (isDataPreferred) {
+                status = setSummaryResId(R.string.calls_sms_calls_preferred);
+            } else if (isSmsPreferred) {
+                status = setSummaryResId(R.string.calls_sms_sms_preferred);
+            }
+        }
+        return status;
+    }
+
+    private String setSummaryResId(int resId) {
+        return mContext.getResources().getString(resId);
+    }
+
+    @VisibleForTesting
+    protected int getDefaultVoiceSubscriptionId(){
+        return SubscriptionManager.getDefaultVoiceSubscriptionId();
+    }
+
+    @VisibleForTesting
+    protected int getDefaultSmsSubscriptionId(){
+        return SubscriptionManager.getDefaultSmsSubscriptionId();
+    }
+
+    private void update() {
+        if (mPreference == null || mPreference.isDisabledByAdmin()) {
+            return;
+        }
+        refreshSummary(mPreference);
+        mPreference.setOnPreferenceClickListener(null);
+        mPreference.setFragment(null);
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(
+                mSubscriptionManager);
+        if (subs.isEmpty()) {
+            mPreference.setEnabled(false);
+        } else {
+            mPreference.setEnabled(true);
+            mPreference.setFragment(NetworkProviderCallsSmsFragment.class.getCanonicalName());
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mUserManager.isAdminUser();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public void onAirplaneModeChanged(boolean airplaneModeEnabled) {
+        update();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        if (preference == null) {
+            return;
+        }
+        refreshSummary(mPreference);
+        update();
+    }
+
+    @Override
+    public void onSubscriptionsChanged() {
+        refreshSummary(mPreference);
+        update();
+    }
+}
diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
new file mode 100644
index 0000000..3339cdb
--- /dev/null
+++ b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.os.UserManager;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.network.telephony.CallsDefaultSubscriptionController;
+import com.android.settings.network.telephony.NetworkProviderWifiCallingPreferenceController;
+import com.android.settings.network.telephony.SmsDefaultSubscriptionController;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.search.SearchIndexable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
+public class NetworkProviderCallsSmsFragment extends DashboardFragment {
+    @VisibleForTesting
+    static final String LOG_TAG = "NetworkProviderCallsSmsFragment";
+    @VisibleForTesting
+    static final String KEY_PREFERENCE_CATEGORY_CALLING = "provider_model_calling_category";
+    @VisibleForTesting
+    static final String KEY_PREFERENCE_CALLS= "provider_model_calls_preference";
+    @VisibleForTesting
+    static final String KEY_PREFERENCE_SMS = "provider_model_sms_preference";
+
+    private NetworkProviderWifiCallingPreferenceController
+            mNetworkProviderWifiCallingPreferenceController;
+
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        final List<AbstractPreferenceController> controllers = new ArrayList<>();
+        controllers.add(new CallsDefaultSubscriptionController(context, KEY_PREFERENCE_CALLS));
+        controllers.add(new SmsDefaultSubscriptionController(context, KEY_PREFERENCE_SMS));
+        mNetworkProviderWifiCallingPreferenceController =
+                new NetworkProviderWifiCallingPreferenceController(context,
+                        KEY_PREFERENCE_CATEGORY_CALLING);
+        mNetworkProviderWifiCallingPreferenceController.init(getSettingsLifecycle());
+        controllers.add(mNetworkProviderWifiCallingPreferenceController);
+
+        return controllers;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updatePreferenceStates();
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.network_provider_calls_sms;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return LOG_TAG;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.ACTION_UNKNOWN;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.network_provider_calls_sms) {
+
+                @Override
+                protected boolean isPageSearchEnabled(Context context) {
+                    return Utils.isProviderModelEnabled(context) &&
+                            context.getSystemService(UserManager.class).isAdminUser();
+                }
+            };
+}
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
new file mode 100644
index 0000000..c4c767b
--- /dev/null
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -0,0 +1,1104 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLED;
+import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.settings.SettingsEnums;
+import android.content.ActivityNotFoundException;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.NetworkTemplate;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.PowerManager;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
+import android.util.Log;
+import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Toast;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.LinkifyUtils;
+import com.android.settings.R;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.datausage.DataUsagePreference;
+import com.android.settings.datausage.DataUsageUtils;
+import com.android.settings.location.ScanningSettings;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.wifi.AddNetworkFragment;
+import com.android.settings.wifi.AddWifiNetworkPreference;
+import com.android.settings.wifi.ConfigureWifiEntryFragment;
+import com.android.settings.wifi.ConnectedWifiEntryPreference;
+import com.android.settings.wifi.LinkablePreference;
+import com.android.settings.wifi.WifiConfigUiBase2;
+import com.android.settings.wifi.WifiConnectListener;
+import com.android.settings.wifi.WifiDialog2;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
+import com.android.settings.wifi.WifiUtils;
+import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
+import com.android.settings.wifi.dpp.WifiDppUtils;
+import com.android.settingslib.HelpUtils;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtilsInternal;
+import com.android.settingslib.search.Indexable;
+import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.wifi.LongPressWifiEntryPreference;
+import com.android.settingslib.wifi.WifiSavedConfigUtils;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
+import com.android.wifitrackerlib.WifiPickerTracker;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * UI for Mobile network and Wi-Fi network settings.
+ *
+ * TODO(b/167474581): Define the intent android.settings.NETWORK_PROVIDER_SETTINGS in Settings.java.
+ */
+@SearchIndexable
+public class NetworkProviderSettings extends RestrictedSettingsFragment
+        implements Indexable, WifiPickerTracker.WifiPickerTrackerCallback,
+        WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener {
+
+    public static final String ACTION_NETWORK_PROVIDER_SETTINGS =
+            "android.settings.NETWORK_PROVIDER_SETTINGS";
+
+    private static final String TAG = "NetworkProviderSettings";
+    // IDs of context menu
+    static final int MENU_ID_CONNECT = Menu.FIRST + 1;
+    @VisibleForTesting
+    static final int MENU_ID_DISCONNECT = Menu.FIRST + 2;
+    @VisibleForTesting
+    static final int MENU_ID_FORGET = Menu.FIRST + 3;
+    static final int MENU_ID_MODIFY = Menu.FIRST + 4;
+
+    @VisibleForTesting
+    static final int ADD_NETWORK_REQUEST = 2;
+    static final int CONFIG_NETWORK_REQUEST = 3;
+    static final int MANAGE_SUBSCRIPTION = 4;
+
+    private static final String PREF_KEY_EMPTY_WIFI_LIST = "wifi_empty_list";
+    // TODO(b/70983952): Rename these to use WifiEntry instead of AccessPoint.
+    private static final String PREF_KEY_CONNECTED_ACCESS_POINTS = "connected_access_point";
+    private static final String PREF_KEY_ACCESS_POINTS = "access_points";
+    private static final String PREF_KEY_CONFIGURE_WIFI_SETTINGS = "configure_wifi_settings";
+    private static final String PREF_KEY_SAVED_NETWORKS = "saved_networks";
+    private static final String PREF_KEY_STATUS_MESSAGE = "wifi_status_message";
+    @VisibleForTesting
+    static final String PREF_KEY_DATA_USAGE = "non_carrier_data_usage";
+
+    private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
+
+    public static final int WIFI_DIALOG_ID = 1;
+
+    // Instance state keys
+    private static final String SAVE_DIALOG_MODE = "dialog_mode";
+    private static final String SAVE_DIALOG_WIFIENTRY_KEY = "wifi_ap_key";
+
+    // Cache at onCreateContextMenu and use at onContextItemSelected. Don't use it in other methods.
+    private WifiEntry mSelectedWifiEntry;
+
+    // Save the dialog details
+    private int mDialogMode;
+    private String mDialogWifiEntryKey;
+    private WifiEntry mDialogWifiEntry;
+
+    // This boolean extra specifies whether to enable the Next button when connected. Used by
+    // account creation outside of setup wizard.
+    private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
+
+    // Enable the Next button when a Wi-Fi network is connected.
+    private boolean mEnableNextOnConnection;
+
+    // This string extra specifies a network to open the connect dialog on, so the user can enter
+    // network credentials.  This is used by quick settings for secured networks, among other
+    // things.
+    private static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
+    private String mOpenSsid;
+
+    private static boolean isVerboseLoggingEnabled() {
+        return WifiPickerTracker.isVerboseLoggingEnabled();
+    }
+
+    private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {
+        updateWifiEntryPreferences();
+    };
+    private final Runnable mHideProgressBarRunnable = () -> {
+        setProgressBarVisible(false);
+    };
+
+    protected WifiManager mWifiManager;
+    private WifiManager.ActionListener mConnectListener;
+    private WifiManager.ActionListener mSaveListener;
+    private WifiManager.ActionListener mForgetListener;
+
+    /**
+     * The state of {@link #isUiRestricted()} at {@link #onCreate(Bundle)}}. This is necessary to
+     * ensure that behavior is consistent if {@link #isUiRestricted()} changes. It could be changed
+     * by the Test DPC tool in AFW mode.
+     */
+    private boolean mIsRestricted;
+
+    @VisibleForTesting
+    WifiPickerTracker mWifiPickerTracker;
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
+
+    private WifiDialog2 mDialog;
+
+    private View mProgressHeader;
+
+    private PreferenceCategory mConnectedWifiEntryPreferenceCategory;
+    private PreferenceCategory mWifiEntryPreferenceCategory;
+    @VisibleForTesting
+    AddWifiNetworkPreference mAddWifiNetworkPreference;
+    @VisibleForTesting
+    Preference mConfigureWifiSettingsPreference;
+    @VisibleForTesting
+    Preference mSavedNetworksPreference;
+    @VisibleForTesting
+    DataUsagePreference mDataUsagePreference;
+    private LinkablePreference mStatusMessagePreference;
+
+    /**
+     * Mobile networks list for provider model
+     */
+    private static final String PREF_KEY_PROVIDER_MOBILE_NETWORK = "provider_model_mobile_network";
+    private NetworkMobileProviderController mNetworkMobileProviderController;
+
+    /**
+     * Tracks whether the user initiated a connection via clicking in order to autoscroll to the
+     * network once connected.
+     */
+    private boolean mClickedConnect;
+
+    public NetworkProviderSettings() {
+        super(DISALLOW_CONFIG_WIFI);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        final Activity activity = getActivity();
+        if (activity != null) {
+            mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
+                    .findViewById(R.id.progress_bar_animation);
+            setProgressBarVisible(false);
+        }
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        // TODO(b/37429702): Add animations and preference comparator back after initial screen is
+        // loaded (ODR).
+        setAnimationAllowed(false);
+
+        addPreferences();
+
+        mIsRestricted = isUiRestricted();
+    }
+
+    private void addPreferences() {
+        addPreferencesFromResource(R.xml.network_provider_settings);
+
+        mConnectedWifiEntryPreferenceCategory = findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
+        mWifiEntryPreferenceCategory = findPreference(PREF_KEY_ACCESS_POINTS);
+        mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
+        mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
+        mAddWifiNetworkPreference = new AddWifiNetworkPreference(getPrefContext());
+        mStatusMessagePreference = findPreference(PREF_KEY_STATUS_MESSAGE);
+        mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
+        mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext()));
+        mDataUsagePreference.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(),
+                0 /*subId*/,
+                null /*service*/);
+        addNetworkMobileProviderController();
+    }
+
+    private void addNetworkMobileProviderController() {
+        if (mNetworkMobileProviderController == null) {
+            mNetworkMobileProviderController = new NetworkMobileProviderController(
+                    getContext(), PREF_KEY_PROVIDER_MOBILE_NETWORK);
+        }
+        mNetworkMobileProviderController.init(getSettingsLifecycle());
+        mNetworkMobileProviderController.displayPreference(getPreferenceScreen());
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        mWifiPickerTrackerHelper =
+                new WifiPickerTrackerHelper(getSettingsLifecycle(), getContext(), this);
+        mWifiPickerTracker = mWifiPickerTrackerHelper.getWifiPickerTracker();
+
+        final Activity activity = getActivity();
+
+        if (activity != null) {
+            mWifiManager = getActivity().getSystemService(WifiManager.class);
+        }
+
+        mConnectListener = new WifiConnectListener(getActivity());
+
+        mSaveListener = new WifiManager.ActionListener() {
+            @Override
+            public void onSuccess() {
+            }
+
+            @Override
+            public void onFailure(int reason) {
+                Activity activity = getActivity();
+                if (activity != null) {
+                    Toast.makeText(activity,
+                            R.string.wifi_failed_save_message,
+                            Toast.LENGTH_SHORT).show();
+                }
+            }
+        };
+
+        mForgetListener = new WifiManager.ActionListener() {
+            @Override
+            public void onSuccess() {
+            }
+
+            @Override
+            public void onFailure(int reason) {
+                Activity activity = getActivity();
+                if (activity != null) {
+                    Toast.makeText(activity,
+                            R.string.wifi_failed_forget_message,
+                            Toast.LENGTH_SHORT).show();
+                }
+            }
+        };
+        registerForContextMenu(getListView());
+        setHasOptionsMenu(true);
+
+        if (savedInstanceState != null) {
+            mDialogMode = savedInstanceState.getInt(SAVE_DIALOG_MODE);
+            mDialogWifiEntryKey = savedInstanceState.getString(SAVE_DIALOG_WIFIENTRY_KEY);
+        }
+
+        // If we're supposed to enable/disable the Next button based on our current connection
+        // state, start it off in the right state.
+        final Intent intent = getActivity().getIntent();
+        mEnableNextOnConnection = intent.getBooleanExtra(EXTRA_ENABLE_NEXT_ON_CONNECT, false);
+
+        if (intent.hasExtra(EXTRA_START_CONNECT_SSID)) {
+            mOpenSsid = intent.getStringExtra(EXTRA_START_CONNECT_SSID);
+        }
+
+        if (mNetworkMobileProviderController != null) {
+            mNetworkMobileProviderController.setWifiPickerTrackerHelper(mWifiPickerTrackerHelper);
+        }
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+
+        if (mIsRestricted) {
+            restrictUi();
+        }
+    }
+
+    private void restrictUi() {
+        if (!isUiRestrictedByOnlyAdmin()) {
+            getEmptyTextView().setText(R.string.wifi_empty_list_user_restricted);
+        }
+        getPreferenceScreen().removeAll();
+    }
+
+    @Override
+    public void onResume() {
+        final Activity activity = getActivity();
+        super.onResume();
+
+        // Because RestrictedSettingsFragment's onResume potentially requests authorization,
+        // which changes the restriction state, recalculate it.
+        final boolean alreadyImmutablyRestricted = mIsRestricted;
+        mIsRestricted = isUiRestricted();
+        if (!alreadyImmutablyRestricted && mIsRestricted) {
+            restrictUi();
+        }
+
+        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);
+    }
+
+    @Override
+    public void onStop() {
+        getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);
+        getView().removeCallbacks(mHideProgressBarRunnable);
+        super.onStop();
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == ADD_NETWORK_REQUEST) {
+            handleAddNetworkRequest(resultCode, data);
+            return;
+        } else if (requestCode == REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER) {
+            if (resultCode == Activity.RESULT_OK) {
+                if (mDialog != null) {
+                    mDialog.dismiss();
+                }
+            }
+            return;
+        } else if (requestCode == CONFIG_NETWORK_REQUEST) {
+            if (resultCode == Activity.RESULT_OK) {
+                final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
+                        ConfigureWifiEntryFragment.NETWORK_CONFIG_KEY);
+                if (wifiConfiguration != null) {
+                    mWifiManager.connect(wifiConfiguration,
+                            new WifiConnectActionListener());
+                }
+            }
+            return;
+        } else if (requestCode == MANAGE_SUBSCRIPTION) {
+            //Do nothing
+            return;
+        }
+
+        final boolean formerlyRestricted = mIsRestricted;
+        mIsRestricted = isUiRestricted();
+        if (formerlyRestricted && !mIsRestricted
+                && getPreferenceScreen().getPreferenceCount() == 0) {
+            // De-restrict the ui
+            addPreferences();
+        }
+    }
+
+    @Override
+    protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {
+        final RecyclerView.Adapter adapter = super.onCreateAdapter(preferenceScreen);
+        adapter.setHasStableIds(true);
+        return adapter;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.WIFI;
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        // If dialog has been shown, save its state.
+        if (mDialog != null) {
+            outState.putInt(SAVE_DIALOG_MODE, mDialogMode);
+            outState.putString(SAVE_DIALOG_WIFIENTRY_KEY, mDialogWifiEntryKey);
+        }
+    }
+
+    @Override
+    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
+        Preference preference = (Preference) view.getTag();
+        if (!(preference instanceof LongPressWifiEntryPreference)) {
+            // Do nothing.
+            return;
+        }
+
+        // Cache the WifiEntry for onContextItemSelected. Don't use it in other methods.
+        mSelectedWifiEntry = ((LongPressWifiEntryPreference) preference).getWifiEntry();
+
+        menu.setHeaderTitle(mSelectedWifiEntry.getTitle());
+        if (mSelectedWifiEntry.canConnect()) {
+            menu.add(Menu.NONE, MENU_ID_CONNECT, 0 /* order */, R.string.wifi_connect);
+        }
+
+        if (mSelectedWifiEntry.canDisconnect()) {
+            menu.add(Menu.NONE, MENU_ID_DISCONNECT, 0 /* order */,
+                    R.string.wifi_disconnect_button_text);
+        }
+
+        // "forget" for normal saved network. And "disconnect" for ephemeral network because it
+        // could only be disconnected and be put in blocklists so it won't be used again.
+        if (canForgetNetwork()) {
+            menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);
+        }
+
+        WifiConfiguration config = mSelectedWifiEntry.getWifiConfiguration();
+        // Some configs are ineditable
+        if (WifiUtils.isNetworkLockedDown(getActivity(), config)) {
+            return;
+        }
+
+        if (mSelectedWifiEntry.isSaved() && mSelectedWifiEntry.getConnectedState()
+                != WifiEntry.CONNECTED_STATE_CONNECTED) {
+            menu.add(Menu.NONE, MENU_ID_MODIFY, 0 /* order */, R.string.wifi_modify);
+        }
+    }
+
+    private boolean canForgetNetwork() {
+        return mSelectedWifiEntry.canForget() && !WifiUtils.isNetworkLockedDown(getActivity(),
+                mSelectedWifiEntry.getWifiConfiguration());
+    }
+
+    @Override
+    public boolean onContextItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_ID_CONNECT:
+                connect(mSelectedWifiEntry, true /* editIfNoConfig */, false /* fullScreenEdit */);
+                return true;
+            case MENU_ID_DISCONNECT:
+                mSelectedWifiEntry.disconnect(null /* callback */);
+                return true;
+            case MENU_ID_FORGET:
+                forget(mSelectedWifiEntry);
+                return true;
+            case MENU_ID_MODIFY:
+                showDialog(mSelectedWifiEntry, WifiConfigUiBase2.MODE_MODIFY);
+                return true;
+            default:
+                return super.onContextItemSelected(item);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        // If the preference has a fragment set, open that
+        if (preference.getFragment() != null) {
+            preference.setOnPreferenceClickListener(null);
+            return super.onPreferenceTreeClick(preference);
+        }
+
+        if (preference instanceof LongPressWifiEntryPreference) {
+            final WifiEntry selectedEntry =
+                    ((LongPressWifiEntryPreference) preference).getWifiEntry();
+
+            if (selectedEntry.shouldEditBeforeConnect()) {
+                launchConfigNewNetworkFragment(selectedEntry);
+                return true;
+            }
+
+            connect(selectedEntry, true /* editIfNoConfig */, true /* fullScreenEdit */);
+        } else if (preference == mAddWifiNetworkPreference) {
+            onAddNetworkPressed();
+        } else {
+            return super.onPreferenceTreeClick(preference);
+        }
+        return true;
+    }
+
+    private void showDialog(WifiEntry wifiEntry, int dialogMode) {
+        if (WifiUtils.isNetworkLockedDown(getActivity(), wifiEntry.getWifiConfiguration())
+                && wifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
+                    RestrictedLockUtilsInternal.getDeviceOwner(getActivity()));
+            return;
+        }
+
+        if (mDialog != null) {
+            removeDialog(WIFI_DIALOG_ID);
+            mDialog = null;
+        }
+
+        // Save the access point and edit mode
+        mDialogWifiEntry = wifiEntry;
+        mDialogWifiEntryKey = wifiEntry.getKey();
+        mDialogMode = dialogMode;
+
+        showDialog(WIFI_DIALOG_ID);
+    }
+
+    @Override
+    public Dialog onCreateDialog(int dialogId) {
+        switch (dialogId) {
+            case WIFI_DIALOG_ID:
+                // modify network
+                mDialog = WifiDialog2
+                        .createModal(getActivity(), this, mDialogWifiEntry, mDialogMode);
+                return mDialog;
+            default:
+                return super.onCreateDialog(dialogId);
+        }
+    }
+
+    @Override
+    public void onDialogShowing() {
+        super.onDialogShowing();
+        setOnDismissListener(this);
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        // We don't keep any dialog object when dialog was dismissed.
+        mDialog = null;
+        mDialogWifiEntry = null;
+        mDialogWifiEntryKey = null;
+    }
+
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        switch (dialogId) {
+            case WIFI_DIALOG_ID:
+                return SettingsEnums.DIALOG_WIFI_AP_EDIT;
+            default:
+                return 0;
+        }
+    }
+
+    /** Called when the state of Wifi has changed. */
+    @Override
+    public void onWifiStateChanged() {
+        if (mIsRestricted) {
+            return;
+        }
+        final int wifiState = mWifiPickerTracker.getWifiState();
+
+        if (isVerboseLoggingEnabled()) {
+            Log.i(TAG, "onWifiStateChanged called with wifi state: " + wifiState);
+        }
+
+        switch (wifiState) {
+            case WifiManager.WIFI_STATE_ENABLED:
+                updateWifiEntryPreferences();
+                break;
+
+            case WifiManager.WIFI_STATE_ENABLING:
+                removeConnectedWifiEntryPreference();
+                removeWifiEntryPreference();
+                addMessagePreference(R.string.wifi_starting);
+                setProgressBarVisible(true);
+                break;
+
+            case WifiManager.WIFI_STATE_DISABLING:
+                removeConnectedWifiEntryPreference();
+                removeWifiEntryPreference();
+                addMessagePreference(R.string.wifi_stopping);
+                break;
+
+            case WifiManager.WIFI_STATE_DISABLED:
+                setOffMessage();
+                setAdditionalSettingsSummaries();
+                setProgressBarVisible(false);
+                mClickedConnect = false;
+                break;
+        }
+    }
+
+    @Override
+    public void onWifiEntriesChanged() {
+        updateWifiEntryPreferencesDelayed();
+        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);
+
+        // Edit the Wi-Fi network of specified SSID.
+        if (mOpenSsid != null) {
+            Optional<WifiEntry> matchedWifiEntry = mWifiPickerTracker.getWifiEntries().stream()
+                    .filter(wifiEntry -> TextUtils.equals(mOpenSsid, wifiEntry.getSsid()))
+                    .filter(wifiEntry -> wifiEntry.getSecurity() != WifiEntry.SECURITY_NONE
+                            && wifiEntry.getSecurity() != WifiEntry.SECURITY_OWE)
+                    .filter(wifiEntry -> !wifiEntry.isSaved()
+                            || isDisabledByWrongPassword(wifiEntry))
+                    .findFirst();
+            if (matchedWifiEntry.isPresent()) {
+                mOpenSsid = null;
+                launchConfigNewNetworkFragment(matchedWifiEntry.get());
+            }
+        }
+    }
+
+    @Override
+    public void onNumSavedNetworksChanged() {
+        if (isFinishingOrDestroyed()) {
+            return;
+        }
+        setAdditionalSettingsSummaries();
+    }
+
+    @Override
+    public void onNumSavedSubscriptionsChanged() {
+        if (isFinishingOrDestroyed()) {
+            return;
+        }
+        setAdditionalSettingsSummaries();
+    }
+
+    /**
+     * Updates WifiEntries from {@link WifiPickerTracker#getWifiEntries()}. Adds a delay to have
+     * progress bar displayed before starting to modify entries.
+     */
+    private void updateWifiEntryPreferencesDelayed() {
+        // Safeguard from some delayed event handling
+        if (getActivity() != null && !mIsRestricted
+                && mWifiPickerTracker.getWifiState() == WifiManager.WIFI_STATE_ENABLED) {
+            final View view = getView();
+            final Handler handler = view.getHandler();
+            if (handler != null && handler.hasCallbacks(mUpdateWifiEntryPreferencesRunnable)) {
+                return;
+            }
+            setProgressBarVisible(true);
+            view.postDelayed(mUpdateWifiEntryPreferencesRunnable, 300);
+        }
+    }
+
+    private void updateWifiEntryPreferences() {
+        // in case state has changed
+        if (mWifiPickerTracker.getWifiState() != WifiManager.WIFI_STATE_ENABLED) {
+            return;
+        }
+
+        boolean hasAvailableWifiEntries = false;
+        mStatusMessagePreference.setVisible(false);
+        mWifiEntryPreferenceCategory.setVisible(true);
+
+        final WifiEntry connectedEntry = mWifiPickerTracker.getConnectedWifiEntry();
+        mConnectedWifiEntryPreferenceCategory.setVisible(connectedEntry != null);
+        if (connectedEntry != null) {
+            final LongPressWifiEntryPreference connectedPref =
+                    mConnectedWifiEntryPreferenceCategory.findPreference(connectedEntry.getKey());
+            if (connectedPref == null || connectedPref.getWifiEntry() != connectedEntry) {
+                mConnectedWifiEntryPreferenceCategory.removeAll();
+                final ConnectedWifiEntryPreference pref =
+                        new ConnectedWifiEntryPreference(getPrefContext(), connectedEntry, this);
+                pref.setKey(connectedEntry.getKey());
+                pref.refresh();
+                mConnectedWifiEntryPreferenceCategory.addPreference(pref);
+                pref.setOnPreferenceClickListener(preference -> {
+                    if (connectedEntry.canSignIn()) {
+                        connectedEntry.signIn(null /* callback */);
+                    } else {
+                        launchNetworkDetailsFragment(pref);
+                    }
+                    return true;
+                });
+                pref.setOnGearClickListener(preference -> {
+                    launchNetworkDetailsFragment(pref);
+                });
+
+                if (mClickedConnect) {
+                    mClickedConnect = false;
+                    scrollToPreference(mConnectedWifiEntryPreferenceCategory);
+                }
+            }
+        } else {
+            mConnectedWifiEntryPreferenceCategory.removeAll();
+        }
+
+        int index = 0;
+        cacheRemoveAllPrefs(mWifiEntryPreferenceCategory);
+        List<WifiEntry> wifiEntries = mWifiPickerTracker.getWifiEntries();
+        for (WifiEntry wifiEntry : wifiEntries) {
+            hasAvailableWifiEntries = true;
+
+            String key = wifiEntry.getKey();
+            LongPressWifiEntryPreference pref =
+                    (LongPressWifiEntryPreference) getCachedPreference(key);
+            if (pref != null) {
+                if (pref.getWifiEntry() == wifiEntry) {
+                    pref.setOrder(index++);
+                    continue;
+                } else {
+                    // Create a new preference if the underlying WifiEntry object has changed
+                    removePreference(key);
+                }
+            }
+
+            pref = createLongPressWifiEntryPreference(wifiEntry);
+            pref.setKey(wifiEntry.getKey());
+            pref.setOrder(index++);
+            pref.refresh();
+
+            if (wifiEntry.getHelpUriString() != null) {
+                pref.setOnButtonClickListener(preference -> {
+                    openSubscriptionHelpPage(wifiEntry);
+                });
+            }
+            mWifiEntryPreferenceCategory.addPreference(pref);
+        }
+        removeCachedPrefs(mWifiEntryPreferenceCategory);
+
+        if (!hasAvailableWifiEntries) {
+            setProgressBarVisible(true);
+            Preference pref = new Preference(getPrefContext());
+            pref.setSelectable(false);
+            pref.setSummary(R.string.wifi_empty_list_wifi_on);
+            pref.setOrder(index++);
+            pref.setKey(PREF_KEY_EMPTY_WIFI_LIST);
+            mWifiEntryPreferenceCategory.addPreference(pref);
+        } else {
+            // Continuing showing progress bar for an additional delay to overlap with animation
+            getView().postDelayed(mHideProgressBarRunnable, 1700 /* delay millis */);
+        }
+
+        mAddWifiNetworkPreference.setOrder(index++);
+        mWifiEntryPreferenceCategory.addPreference(mAddWifiNetworkPreference);
+        setAdditionalSettingsSummaries();
+    }
+
+    private void launchNetworkDetailsFragment(LongPressWifiEntryPreference pref) {
+        final WifiEntry wifiEntry = pref.getWifiEntry();
+        final Context context = getContext();
+        final CharSequence title =
+                FeatureFlagUtils.isEnabled(context, FeatureFlags.WIFI_DETAILS_DATAUSAGE_HEADER)
+                        ? wifiEntry.getTitle()
+                        : context.getText(R.string.pref_title_network_details);
+
+        final Bundle bundle = new Bundle();
+        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY, wifiEntry.getKey());
+
+        new SubSettingLauncher(context)
+                .setTitleText(title)
+                .setDestination(WifiNetworkDetailsFragment2.class.getName())
+                .setArguments(bundle)
+                .setSourceMetricsCategory(getMetricsCategory())
+                .launch();
+    }
+
+    @VisibleForTesting
+    LongPressWifiEntryPreference createLongPressWifiEntryPreference(WifiEntry wifiEntry) {
+        return new LongPressWifiEntryPreference(getPrefContext(), wifiEntry, this);
+    }
+
+    private void launchAddNetworkFragment() {
+        new SubSettingLauncher(getContext())
+                .setTitleRes(R.string.wifi_add_network)
+                .setDestination(AddNetworkFragment.class.getName())
+                .setSourceMetricsCategory(getMetricsCategory())
+                .setResultListener(this, ADD_NETWORK_REQUEST)
+                .launch();
+    }
+
+    /** Removes all preferences and hide the {@link #mConnectedWifiEntryPreferenceCategory}. */
+    private void removeConnectedWifiEntryPreference() {
+        mConnectedWifiEntryPreferenceCategory.removeAll();
+        mConnectedWifiEntryPreferenceCategory.setVisible(false);
+    }
+
+    private void removeWifiEntryPreference() {
+        mWifiEntryPreferenceCategory.removeAll();
+        mWifiEntryPreferenceCategory.setVisible(false);
+    }
+
+    @VisibleForTesting
+    void setAdditionalSettingsSummaries() {
+        if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
+            mConfigureWifiSettingsPreference.setSummary(getString(
+                    isWifiWakeupEnabled()
+                            ? R.string.wifi_configure_settings_preference_summary_wakeup_on
+                            : R.string.wifi_configure_settings_preference_summary_wakeup_off));
+        }
+
+        final int numSavedNetworks = mWifiPickerTracker.getNumSavedNetworks();
+        final int numSavedSubscriptions = mWifiPickerTracker.getNumSavedSubscriptions();
+        if (numSavedNetworks + numSavedSubscriptions > 0) {
+            mSavedNetworksPreference.setVisible(true);
+            mSavedNetworksPreference.setSummary(
+                    getSavedNetworkSettingsSummaryText(numSavedNetworks, numSavedSubscriptions));
+        } else {
+            mSavedNetworksPreference.setVisible(false);
+        }
+    }
+
+    private String getSavedNetworkSettingsSummaryText(
+            int numSavedNetworks, int numSavedSubscriptions) {
+        if (numSavedSubscriptions == 0) {
+            return getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,
+                    numSavedNetworks, numSavedNetworks);
+        } else if (numSavedNetworks == 0) {
+            return getResources().getQuantityString(
+                    R.plurals.wifi_saved_passpoint_access_points_summary,
+                    numSavedSubscriptions, numSavedSubscriptions);
+        } else {
+            final int numTotalEntries = numSavedNetworks + numSavedSubscriptions;
+            return getResources().getQuantityString(R.plurals.wifi_saved_all_access_points_summary,
+                    numTotalEntries, numTotalEntries);
+        }
+    }
+
+    private boolean isWifiWakeupEnabled() {
+        final Context context = getContext();
+        final PowerManager powerManager = context.getSystemService(PowerManager.class);
+        final ContentResolver contentResolver = context.getContentResolver();
+        return mWifiManager.isAutoWakeupEnabled()
+                && mWifiManager.isScanAlwaysAvailable()
+                && Settings.Global.getInt(contentResolver,
+                Settings.Global.AIRPLANE_MODE_ON, 0) == 0
+                && !powerManager.isPowerSaveMode();
+    }
+
+    private void setOffMessage() {
+        final CharSequence title = getText(R.string.wifi_empty_list_wifi_off);
+        // Don't use WifiManager.isScanAlwaysAvailable() to check the Wi-Fi scanning mode. Instead,
+        // read the system settings directly. Because when the device is in Airplane mode, even if
+        // Wi-Fi scanning mode is on, WifiManager.isScanAlwaysAvailable() still returns "off".
+        // TODO(b/149421497): Fix this?
+        final boolean wifiScanningMode = mWifiManager.isScanAlwaysAvailable();
+        final CharSequence description = wifiScanningMode ? getText(R.string.wifi_scan_notify_text)
+                : getText(R.string.wifi_scan_notify_text_scanning_off);
+        final LinkifyUtils.OnClickListener clickListener =
+                () -> new SubSettingLauncher(getContext())
+                        .setDestination(ScanningSettings.class.getName())
+                        .setTitleRes(R.string.location_scanning_screen_title)
+                        .setSourceMetricsCategory(getMetricsCategory())
+                        .launch();
+        mStatusMessagePreference.setText(title, description, clickListener);
+        removeConnectedWifiEntryPreference();
+        removeWifiEntryPreference();
+        mStatusMessagePreference.setVisible(true);
+    }
+
+    private void addMessagePreference(int messageId) {
+        mStatusMessagePreference.setTitle(messageId);
+        mStatusMessagePreference.setVisible(true);
+
+    }
+
+    protected void setProgressBarVisible(boolean visible) {
+        if (mProgressHeader != null) {
+            mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    @VisibleForTesting
+    void handleAddNetworkRequest(int result, Intent data) {
+        if (result == Activity.RESULT_OK) {
+            handleAddNetworkSubmitEvent(data);
+        }
+    }
+
+    private void handleAddNetworkSubmitEvent(Intent data) {
+        final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
+                AddNetworkFragment.WIFI_CONFIG_KEY);
+        if (wifiConfiguration != null) {
+            mWifiManager.save(wifiConfiguration, mSaveListener);
+        }
+    }
+
+    /**
+     * Called when "add network" button is pressed.
+     */
+    private void onAddNetworkPressed() {
+        launchAddNetworkFragment();
+    }
+
+    @Override
+    public int getHelpResource() {
+        return R.string.help_url_wifi;
+    }
+
+    /**
+     * Renames/replaces "Next" button when appropriate. "Next" button usually exists in
+     * Wi-Fi setup screens, not in usual wifi settings screen.
+     *
+     * @param enabled true when the device is connected to a wifi network.
+     */
+    @VisibleForTesting
+    void changeNextButtonState(boolean enabled) {
+        if (mEnableNextOnConnection && hasNextButton()) {
+            getNextButton().setEnabled(enabled);
+        }
+    }
+
+    @Override
+    public void onForget(WifiDialog2 dialog) {
+        forget(dialog.getWifiEntry());
+    }
+
+    @Override
+    public void onSubmit(WifiDialog2 dialog) {
+        final int dialogMode = dialog.getMode();
+        final WifiConfiguration config = dialog.getController().getConfig();
+        final WifiEntry wifiEntry = dialog.getWifiEntry();
+
+        if (dialogMode == WifiConfigUiBase2.MODE_MODIFY) {
+            if (config == null) {
+                Toast.makeText(getContext(), R.string.wifi_failed_save_message,
+                        Toast.LENGTH_SHORT).show();
+            } else {
+                mWifiManager.save(config, mSaveListener);
+            }
+        } else if (dialogMode == WifiConfigUiBase2.MODE_CONNECT
+                || (dialogMode == WifiConfigUiBase2.MODE_VIEW && wifiEntry.canConnect())) {
+            if (config == null) {
+                connect(wifiEntry, false /* editIfNoConfig */,
+                        false /* fullScreenEdit*/);
+            } else {
+                mWifiManager.connect(config, new WifiConnectActionListener());
+            }
+        }
+    }
+
+    @Override
+    public void onScan(WifiDialog2 dialog, String ssid) {
+        // Launch QR code scanner to join a network.
+        startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),
+                REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);
+    }
+
+    private void forget(WifiEntry wifiEntry) {
+        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
+        wifiEntry.forget(null /* callback */);
+    }
+
+    @VisibleForTesting
+    void connect(WifiEntry wifiEntry, boolean editIfNoConfig, boolean fullScreenEdit) {
+        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_CONNECT,
+                wifiEntry.isSaved());
+
+        // If it's an unsaved secure WifiEntry, it will callback
+        // ConnectCallback#onConnectResult with ConnectCallback#CONNECT_STATUS_FAILURE_NO_CONFIG
+        wifiEntry.connect(new WifiEntryConnectCallback(wifiEntry, editIfNoConfig,
+                fullScreenEdit));
+    }
+
+    private class WifiConnectActionListener implements WifiManager.ActionListener {
+        @Override
+        public void onSuccess() {
+            mClickedConnect = true;
+        }
+
+        @Override
+        public void onFailure(int reason) {
+            if (isFinishingOrDestroyed()) {
+                return;
+            }
+            Toast.makeText(getContext(), R.string.wifi_failed_connect_message, Toast.LENGTH_SHORT)
+                    .show();
+        }
+    };
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.network_provider_settings) {
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+
+                    final WifiManager wifiManager = context.getSystemService(WifiManager.class);
+                    if (WifiSavedConfigUtils.getAllConfigsCount(context, wifiManager) == 0) {
+                        keys.add(PREF_KEY_SAVED_NETWORKS);
+                    }
+
+                    if (!DataUsageUtils.hasWifiRadio(context)) {
+                        keys.add(PREF_KEY_DATA_USAGE);
+                    }
+                    return keys;
+                }
+            };
+
+    private class WifiEntryConnectCallback implements ConnectCallback {
+        final WifiEntry mConnectWifiEntry;
+        final boolean mEditIfNoConfig;
+        final boolean mFullScreenEdit;
+
+        WifiEntryConnectCallback(WifiEntry connectWifiEntry, boolean editIfNoConfig,
+                boolean fullScreenEdit) {
+            mConnectWifiEntry = connectWifiEntry;
+            mEditIfNoConfig = editIfNoConfig;
+            mFullScreenEdit = fullScreenEdit;
+        }
+
+        @Override
+        public void onConnectResult(@ConnectStatus int status) {
+            if (isFinishingOrDestroyed()) {
+                return;
+            }
+
+            if (status == ConnectCallback.CONNECT_STATUS_SUCCESS) {
+                mClickedConnect = true;
+            } else if (status == ConnectCallback.CONNECT_STATUS_FAILURE_NO_CONFIG) {
+                if (mEditIfNoConfig) {
+                    // Edit an unsaved secure Wi-Fi network.
+                    if (mFullScreenEdit) {
+                        launchConfigNewNetworkFragment(mConnectWifiEntry);
+                    } else {
+                        showDialog(mConnectWifiEntry, WifiConfigUiBase2.MODE_CONNECT);
+                    }
+                }
+            } else if (status == CONNECT_STATUS_FAILURE_UNKNOWN) {
+                Toast.makeText(getContext(), R.string.wifi_failed_connect_message,
+                        Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void launchConfigNewNetworkFragment(WifiEntry wifiEntry) {
+        final Bundle bundle = new Bundle();
+        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,
+                wifiEntry.getKey());
+        new SubSettingLauncher(getContext())
+                .setTitleText(wifiEntry.getTitle())
+                .setDestination(ConfigureWifiEntryFragment.class.getName())
+                .setArguments(bundle)
+                .setSourceMetricsCategory(getMetricsCategory())
+                .setResultListener(NetworkProviderSettings.this, CONFIG_NETWORK_REQUEST)
+                .launch();
+    }
+
+    /** Helper method to return whether a WifiEntry is disabled due to a wrong password */
+    private static boolean isDisabledByWrongPassword(WifiEntry wifiEntry) {
+        WifiConfiguration config = wifiEntry.getWifiConfiguration();
+        if (config == null) {
+            return false;
+        }
+        WifiConfiguration.NetworkSelectionStatus networkStatus =
+                config.getNetworkSelectionStatus();
+        if (networkStatus == null
+                || networkStatus.getNetworkSelectionStatus() == NETWORK_SELECTION_ENABLED) {
+            return false;
+        }
+        int reason = networkStatus.getNetworkSelectionDisableReason();
+        return WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD == reason;
+    }
+
+    @VisibleForTesting
+    void openSubscriptionHelpPage(WifiEntry wifiEntry) {
+        final Intent intent = getHelpIntent(getContext(), wifiEntry.getHelpUriString());
+        if (intent != null) {
+            try {
+                startActivityForResult(intent, MANAGE_SUBSCRIPTION);
+            } catch (ActivityNotFoundException e) {
+                Log.e(TAG, "Activity was not found for intent, " + intent.toString());
+            }
+        }
+    }
+
+    @VisibleForTesting
+    Intent getHelpIntent(Context context, String helpUrlString) {
+        return HelpUtils.getHelpIntent(context, helpUrlString, context.getClass().getName());
+    }
+}
diff --git a/src/com/android/settings/network/OWNERS b/src/com/android/settings/network/OWNERS
index 87e5fcc..991ad43 100644
--- a/src/com/android/settings/network/OWNERS
+++ b/src/com/android/settings/network/OWNERS
@@ -2,6 +2,7 @@
 allenwtsu@google.com
 andychou@google.com
 bonianchen@google.com
+goldmanj@google.com
 leechou@google.com
 songferngwang@google.com
 tomhsu@google.com
diff --git a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
index bdadfe4..4878f31 100644
--- a/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
+++ b/src/com/android/settings/network/PrivateDnsModeDialogPreference.java
@@ -28,7 +28,6 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.net.NetworkUtils;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -56,6 +55,8 @@
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 
+import com.google.common.net.InternetDomainName;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -278,7 +279,7 @@
         final Button saveButton = getSaveButton();
         if (saveButton != null) {
             saveButton.setEnabled(modeProvider
-                    ? NetworkUtils.isWeaklyValidatedHostname(mEditText.getText().toString())
+                    ? InternetDomainName.isValid(mEditText.getText().toString())
                     : true);
         }
     }
diff --git a/src/com/android/settings/network/ProviderModelSlice.java b/src/com/android/settings/network/ProviderModelSlice.java
new file mode 100644
index 0000000..a495e89
--- /dev/null
+++ b/src/com/android/settings/network/ProviderModelSlice.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+
+import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+
+import static com.android.settings.slices.CustomSliceRegistry.PROVIDER_MODEL_SLICE_URI;
+
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.telephony.SubscriptionManager;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.slice.Slice;
+import androidx.slice.builders.ListBuilder;
+
+import com.android.settings.R;
+import com.android.settings.SubSettings;
+import com.android.settings.network.telephony.MobileNetworkUtils;
+import com.android.settings.network.telephony.NetworkProviderWorker;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.slices.SliceBackgroundWorker;
+import com.android.settings.slices.SliceBuilderUtils;
+import com.android.settings.wifi.slice.WifiSlice;
+import com.android.settings.wifi.slice.WifiSliceItem;
+import com.android.wifitrackerlib.WifiEntry;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * {@link CustomSliceable} for Wi-Fi and mobile data connection, used by generic clients.
+ */
+// ToDo If the provider model become default design in the future, the code needs to refactor
+// the whole structure and use new "data object", and then split provider model out of old design.
+public class ProviderModelSlice extends WifiSlice {
+
+    private static final String TAG = "ProviderModelSlice";
+    private final ProviderModelSliceHelper mHelper;
+
+    public ProviderModelSlice(Context context) {
+        super(context);
+        mHelper = getHelper();
+    }
+
+    @Override
+    public Uri getUri() {
+        return PROVIDER_MODEL_SLICE_URI;
+    }
+
+    private static void log(String s) {
+        Log.d(TAG, s);
+    }
+
+    protected boolean isApRowCollapsed() {
+        return false;
+    }
+
+    @Override
+    public Slice getSlice() {
+        // The provider model slice step:
+        // First section:  Add a Wi-Fi item which state is connected.
+        // Second section:  Add a carrier item.
+        // Third section:  Add the Wi-Fi items which are not connected.
+        // Fourth section:  If device has connection problem, this row show the message for user.
+
+        if (mHelper.isAirplaneModeEnabled() && !mWifiManager.isWifiEnabled()) {
+            log("Airplane mode is enabled.");
+            // ToDo Next CL will add the Airplane mode Message.
+            return mHelper.createListBuilder(getUri()).build();
+        }
+
+        int maxListSize = 0;
+        List<WifiSliceItem> wifiList = null;
+        final NetworkProviderWorker worker = getWorker();
+        if (worker != null) {
+            // get Wi-Fi list.
+            wifiList = worker.getResults();
+            maxListSize = worker.getApRowCount();
+        } else {
+            log("network provider worker is null.");
+        }
+
+        final boolean hasCarrier = mHelper.hasCarrier();
+        log("hasCarrier: " + hasCarrier);
+
+
+        final ListBuilder listBuilder = mHelper.createListBuilder(getUri());
+
+        // First section:  Add a Wi-Fi item which state is connected.
+        final WifiSliceItem connectedWifiItem = mHelper.getConnectedWifiItem(wifiList);
+        if (connectedWifiItem != null) {
+            log("get Wi-Fi item witch is connected");
+            listBuilder.addRow(getWifiSliceItemRow(connectedWifiItem));
+            maxListSize--;
+        }
+
+        // Second section:  Add a carrier item.
+        if (hasCarrier) {
+            listBuilder.addRow(mHelper.createCarrierRow());
+            maxListSize--;
+        }
+
+        // Third section:  Add the Wi-Fi items which are not connected.
+        if (wifiList != null) {
+            log("get Wi-Fi items which are not connected");
+            final List<WifiSliceItem> disconnectedWifiList = wifiList.stream()
+                    .filter(wifiSliceItem -> wifiSliceItem.getConnectedState()
+                            != WifiEntry.CONNECTED_STATE_CONNECTED)
+                    .limit(maxListSize)
+                    .collect(Collectors.toList());
+            for (WifiSliceItem item : disconnectedWifiList) {
+                listBuilder.addRow(getWifiSliceItemRow(item));
+            }
+        }
+
+        // Fourth section:  If device has connection problem, this row show the message for user.
+        // 1) show non_carrier_network_unavailable:
+        //    - while no wifi item
+        // 2) show all_network_unavailable:
+        //    - while no wifi item + no carrier
+        //    - while no wifi item + no data capability
+        if (worker == null || wifiList == null) {
+            log("wifiList is null");
+            int resId = R.string.non_carrier_network_unavailable;
+            if (!hasCarrier || mHelper.isNoCarrierData()) {
+                log("No carrier item or no carrier data.");
+                resId = R.string.all_network_unavailable;
+            }
+
+            if (!hasCarrier) {
+                // If there is no item in ProviderModelItem, slice needs a header.
+                listBuilder.setHeader(mHelper.createHeader());
+            }
+            listBuilder.addGridRow(mHelper.createMessageGridRow(resId));
+        }
+
+        return listBuilder.build();
+    }
+
+    /**
+     * Update the current carrier's mobile data status.
+     */
+    @Override
+    public void onNotifyChange(Intent intent) {
+        final SubscriptionManager subscriptionManager = mHelper.getSubscriptionManager();
+        if (subscriptionManager == null) {
+            return;
+        }
+        final int defaultSubId = subscriptionManager.getDefaultDataSubscriptionId();
+        log("defaultSubId:" + defaultSubId);
+        if (!SubscriptionManager.isUsableSubscriptionId(defaultSubId)) {
+            return; // No subscription - do nothing.
+        }
+        boolean requestConnectCarrier = !intent.hasExtra(EXTRA_TOGGLE_STATE);
+        // Enable the mobile data always if the user requests to connect to the carrier network.
+        boolean newState = requestConnectCarrier ? true
+                : intent.getBooleanExtra(EXTRA_TOGGLE_STATE, mHelper.isMobileDataEnabled());
+
+        MobileNetworkUtils.setMobileDataEnabled(mContext, defaultSubId, newState,
+                false /* disableOtherSubscriptions */);
+
+        final NetworkProviderWorker worker = getWorker();
+        if (worker == null) {
+            return;
+        }
+        if (requestConnectCarrier) {
+            worker.connectCarrierNetwork();
+        } else {
+            worker.setCarrierNetworkEnabled(newState);
+        }
+    }
+
+    @Override
+    public Intent getIntent() {
+        final String screenTitle = mContext.getText(R.string.provider_internet_settings).toString();
+        return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
+                NetworkProviderSettings.class.getName(), "" /* key */, screenTitle,
+                SettingsEnums.SLICE)
+                .setClassName(mContext.getPackageName(), SubSettings.class.getName())
+                .setData(getUri());
+    }
+
+    @Override
+    public Class getBackgroundWorkerClass() {
+        return NetworkProviderWorker.class;
+    }
+
+    @VisibleForTesting
+    ProviderModelSliceHelper getHelper() {
+        return new ProviderModelSliceHelper(mContext, this);
+    }
+
+    @VisibleForTesting
+    NetworkProviderWorker getWorker() {
+        return SliceBackgroundWorker.getInstance(getUri());
+    }
+}
diff --git a/src/com/android/settings/network/ProviderModelSliceHelper.java b/src/com/android/settings/network/ProviderModelSliceHelper.java
new file mode 100644
index 0000000..3164af4
--- /dev/null
+++ b/src/com/android/settings/network/ProviderModelSliceHelper.java
@@ -0,0 +1,278 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network;
+
+import static com.android.settings.network.telephony.MobileNetworkUtils.NO_CELL_DATA_TYPE_ICON;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.net.Uri;
+import android.telephony.ServiceState;
+import android.telephony.SignalStrength;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.builders.GridRowBuilder;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+
+import com.android.settings.R;
+import com.android.settings.Utils;
+import com.android.settings.network.telephony.MobileNetworkUtils;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.wifi.slice.WifiSliceItem;
+import com.android.settingslib.WirelessUtils;
+import com.android.settingslib.net.SignalStrengthUtil;
+import com.android.settingslib.utils.ThreadUtils;
+import com.android.wifitrackerlib.WifiEntry;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+/**
+ * The helper is for slice of carrier and non-Carrier, used by ProviderModelSlice.
+ */
+public class ProviderModelSliceHelper {
+    private static final String TAG = "ProviderModelSlice";
+    private final SubscriptionManager mSubscriptionManager;
+    private final TelephonyManager mTelephonyManager;
+    protected final Context mContext;
+    private CustomSliceable mSliceable;
+
+    public ProviderModelSliceHelper(Context context, CustomSliceable sliceable) {
+        mContext = context;
+        mSliceable = sliceable;
+        mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
+        mTelephonyManager = context.getSystemService(TelephonyManager.class);
+    }
+
+    private static void log(String s) {
+        Log.d(TAG, s);
+    }
+
+    protected ListBuilder.HeaderBuilder createHeader() {
+        return new ListBuilder.HeaderBuilder()
+                .setTitle(mContext.getText(R.string.summary_placeholder))
+                .setPrimaryAction(getPrimarySliceAction());
+    }
+
+    protected ListBuilder createListBuilder(Uri uri) {
+        final ListBuilder builder = new ListBuilder(mContext, uri, ListBuilder.INFINITY)
+                .setAccentColor(-1)
+                .setKeywords(getKeywords());
+        return builder;
+    }
+
+    protected GridRowBuilder createMessageGridRow(int messageResId) {
+        final CharSequence title = mContext.getText(messageResId);
+        return new GridRowBuilder()
+                // Add cells to the grid row.
+                .addCell(new GridRowBuilder.CellBuilder().addTitleText(title))
+                .setPrimaryAction(getPrimarySliceAction());
+    }
+
+    @Nullable
+    protected WifiSliceItem getConnectedWifiItem(List<WifiSliceItem> wifiList) {
+        if (wifiList == null) {
+            return null;
+        }
+        Optional<WifiSliceItem> item = wifiList.stream()
+                .filter(x -> x.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED)
+                .findFirst();
+        return item.isPresent() ? item.get() : null;
+    }
+
+    protected boolean hasCarrier() {
+        if (isAirplaneModeEnabled()
+                || mSubscriptionManager == null || mTelephonyManager == null
+                || mSubscriptionManager.getDefaultDataSubscriptionId()
+                == mSubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            return false;
+        }
+        return true;
+    }
+
+    protected ListBuilder.RowBuilder createCarrierRow() {
+        final String title = getMobileTitle();
+        final String summary = getMobileSummary();
+        Drawable drawable = mContext.getDrawable(
+                R.drawable.ic_signal_strength_zero_bar_no_internet);
+        try {
+            drawable = getMobileDrawable(drawable);
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+        final IconCompat levelIcon = Utils.createIconWithDrawable(drawable);
+        final PendingIntent rowIntent = mSliceable.getBroadcastIntent(mContext);
+        final SliceAction primaryAction = SliceAction.create(rowIntent,
+                levelIcon, ListBuilder.ICON_IMAGE, title);
+        final SliceAction toggleAction = SliceAction.createToggle(rowIntent,
+                "mobile_toggle" /* actionTitle */, isMobileDataEnabled());
+        final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()
+                .setTitle(title)
+                .setTitleItem(levelIcon, ListBuilder.ICON_IMAGE)
+                .addEndItem(toggleAction)
+                .setPrimaryAction(primaryAction)
+                .setSubtitle(summary);
+        return rowBuilder;
+    }
+
+    protected SliceAction getPrimarySliceAction() {
+        return SliceAction.createDeeplink(
+                getPrimaryAction(),
+                Utils.createIconWithDrawable(new ColorDrawable(Color.TRANSPARENT)),
+                ListBuilder.ICON_IMAGE, mContext.getText(R.string.summary_placeholder));
+    }
+
+    private PendingIntent getPrimaryAction() {
+        final Intent intent = new Intent("android.settings.NETWORK_PROVIDER_SETTINGS")
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        return PendingIntent.getActivity(mContext, 0 /* requestCode */,
+                intent, PendingIntent.FLAG_IMMUTABLE /* flags */);
+    }
+
+    private boolean shouldInflateSignalStrength(int subId) {
+        return SignalStrengthUtil.shouldInflateSignalStrength(mContext, subId);
+    }
+
+    protected boolean isAirplaneModeEnabled() {
+        return WirelessUtils.isAirplaneModeOn(mContext);
+    }
+
+    protected boolean isMobileDataEnabled() {
+        if (mTelephonyManager == null) {
+            return false;
+        }
+        return mTelephonyManager.isDataEnabled();
+    }
+
+    protected boolean isDataSimActive() {
+        return MobileNetworkUtils.activeNetworkIsCellular(mContext);
+    }
+
+    protected boolean isNoCarrierData() {
+        if (mTelephonyManager == null) {
+            return false;
+        }
+        boolean mobileDataOnAndNoData = isMobileDataEnabled()
+                && mTelephonyManager.getDataState() != mTelephonyManager.DATA_CONNECTED;
+        ServiceState serviceState = mTelephonyManager.getServiceState();
+        boolean mobileDataOffAndOutOfService = !isMobileDataEnabled() && serviceState != null
+                && serviceState.getState() == serviceState.STATE_OUT_OF_SERVICE;
+        log("mobileDataOnAndNoData: " + mobileDataOnAndNoData
+                + ",mobileDataOffAndOutOfService: " + mobileDataOffAndOutOfService);
+        return mobileDataOnAndNoData || mobileDataOffAndOutOfService;
+    }
+
+    private boolean isAirplaneSafeNetworksModeEnabled() {
+        // TODO: isAirplaneSafeNetworksModeEnabled is not READY
+        return false;
+    }
+
+    @VisibleForTesting
+    Drawable getMobileDrawable(Drawable drawable) throws Throwable {
+        // set color and drawable
+        if (mTelephonyManager == null) {
+            log("mTelephonyManager == null");
+            return drawable;
+        }
+        if (!isNoCarrierData()) {
+            Semaphore lock = new Semaphore(0);
+            AtomicReference<Drawable> shared = new AtomicReference<>();
+            ThreadUtils.postOnMainThread(() -> {
+                shared.set(getDrawableWithSignalStrength());
+                lock.release();
+            });
+            lock.acquire();
+            drawable = shared.get();
+        }
+
+        if (isDataSimActive()) {
+            drawable.setTint(Utils.getColorAccentDefaultColor(mContext));
+        }
+        return drawable;
+    }
+
+    /**
+     * To get the signal bar icon with level.
+     *
+     * @return The Drawable which is a signal bar icon with level.
+     */
+    public Drawable getDrawableWithSignalStrength() {
+        final SignalStrength strength = mTelephonyManager.getSignalStrength();
+        int level = (strength == null) ? 0 : strength.getLevel();
+        int numLevels = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
+        if (mSubscriptionManager != null && shouldInflateSignalStrength(
+                mSubscriptionManager.getDefaultDataSubscriptionId())) {
+            level += 1;
+            numLevels += 1;
+        }
+        return MobileNetworkUtils.getSignalStrengthIcon(mContext, level, numLevels,
+                NO_CELL_DATA_TYPE_ICON, false);
+    }
+
+    private String getMobileSummary() {
+        String summary = "";
+        //TODO: get radio technology.
+        String networkType = "";
+        if (isDataSimActive()) {
+            summary = mContext.getString(R.string.preference_summary_default_combination,
+                    mContext.getString(R.string.mobile_data_connection_active), networkType);
+        } else if (!isMobileDataEnabled()) {
+            summary = mContext.getString(R.string.mobile_data_off_summary);
+        }
+        return summary;
+    }
+
+    private String getMobileTitle() {
+        String title = mContext.getText(R.string.mobile_data_settings_title).toString();
+        if (mSubscriptionManager == null) {
+            return title;
+        }
+        final SubscriptionInfo defaultSubscription = mSubscriptionManager.getActiveSubscriptionInfo(
+                mSubscriptionManager.getDefaultDataSubscriptionId());
+        if (defaultSubscription != null) {
+            title = defaultSubscription.getDisplayName().toString();
+        }
+        return title;
+    }
+
+    protected SubscriptionManager getSubscriptionManager() {
+        return mSubscriptionManager;
+    }
+
+    private Set<String> getKeywords() {
+        final String keywords = mContext.getString(R.string.keywords_internet);
+        return Arrays.stream(TextUtils.split(keywords, ","))
+                .map(String::trim)
+                .collect(Collectors.toSet());
+    }
+}
diff --git a/src/com/android/settings/network/SubscriptionUtil.java b/src/com/android/settings/network/SubscriptionUtil.java
index e61cc36..cff8f55 100644
--- a/src/com/android/settings/network/SubscriptionUtil.java
+++ b/src/com/android/settings/network/SubscriptionUtil.java
@@ -21,19 +21,26 @@
 
 import static com.android.internal.util.CollectionUtils.emptyIfNull;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.os.ParcelUuid;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.telephony.UiccSlotInfo;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.settings.network.telephony.DeleteEuiccSubscriptionDialogActivity;
+import com.android.settings.network.telephony.ToggleSubscriptionDialogActivity;
+
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class SubscriptionUtil {
     private static final String TAG = "SubscriptionUtil";
@@ -278,6 +285,55 @@
         }
     }
 
+    /**
+     * Starts a dialog activity to handle SIM enabling/disabling.
+     * @param context {@code Context}
+     * @param subId The id of subscription need to be enabled or disabled.
+     * @param enable Whether the subscription with {@code subId} should be enabled or disabled.
+     */
+    public static void startToggleSubscriptionDialogActivity(
+            Context context, int subId, boolean enable) {
+        if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
+            Log.i(TAG, "Unable to toggle subscription due to invalid subscription ID.");
+            return;
+        }
+        context.startActivity(ToggleSubscriptionDialogActivity.getIntent(context, subId, enable));
+    }
+
+    /**
+     * Starts a dialog activity to handle eSIM deletion.
+     * @param context {@code Context}
+     * @param subId The id of subscription need to be deleted.
+     */
+    public static void startDeleteEuiccSubscriptionDialogActivity(Context context, int subId) {
+        if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
+            Log.i(TAG, "Unable to delete subscription due to invalid subscription ID.");
+            return;
+        }
+        context.startActivity(DeleteEuiccSubscriptionDialogActivity.getIntent(context, subId));
+    }
+
+    /**
+     * Finds and returns a subscription with a specific subscription ID.
+     * @param subscriptionManager The ProxySubscriptionManager for accessing subscription
+     *                            information
+     * @param subId The id of subscription to be returned
+     * @return the {@code SubscriptionInfo} whose ID is {@code subId}. It returns null if the
+     * {@code subId} is {@code SubscriptionManager.INVALID_SUBSCRIPTION_ID} or no such
+     * {@code SubscriptionInfo} is found.
+     */
+    @Nullable
+    public static SubscriptionInfo getSubById(SubscriptionManager subscriptionManager, int subId) {
+        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            return null;
+        }
+        return subscriptionManager
+                .getAllSubscriptionInfoList()
+                .stream()
+                .filter(subInfo -> subInfo.getSubscriptionId() == subId)
+                .findFirst()
+                .get();
+    }
 
     /**
      * Whether a subscription is visible to API caller. If it's a bundled opportunistic
@@ -302,4 +358,33 @@
                 || subscriptionManager.canManageSubscription(info);
         return hasCarrierPrivilegePermission;
     }
+
+    /**
+     * Finds all the available subscriptions having the same group uuid as {@code subscriptionInfo}.
+     * @param subscriptionManager The SubscriptionManager for accessing subscription information
+     * @param subId The id of subscription
+     * @return a list of {@code SubscriptionInfo} which have the same group UUID.
+     */
+    public static List<SubscriptionInfo> findAllSubscriptionsInGroup(
+            SubscriptionManager subscriptionManager, int subId) {
+
+        SubscriptionInfo subscription = getSubById(subscriptionManager, subId);
+        if (subscription == null) {
+            return Collections.emptyList();
+        }
+        ParcelUuid groupUuid = subscription.getGroupUuid();
+        List<SubscriptionInfo> availableSubscriptions =
+                subscriptionManager.getAvailableSubscriptionInfoList();
+
+        if (availableSubscriptions == null
+                || availableSubscriptions.isEmpty()
+                || groupUuid == null) {
+            return Collections.singletonList(subscription);
+        }
+
+        return availableSubscriptions
+                .stream()
+                .filter(sub -> sub.isEmbedded() && groupUuid.equals(sub.getGroupUuid()))
+                .collect(Collectors.toList());
+    }
 }
diff --git a/src/com/android/settings/network/SubscriptionsPreferenceController.java b/src/com/android/settings/network/SubscriptionsPreferenceController.java
index e9cdb46..6e67543 100644
--- a/src/com/android/settings/network/SubscriptionsPreferenceController.java
+++ b/src/com/android/settings/network/SubscriptionsPreferenceController.java
@@ -21,13 +21,13 @@
 
 import static com.android.settings.network.telephony.MobileNetworkUtils.NO_CELL_DATA_TYPE_ICON;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
 import android.provider.Settings;
+import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
@@ -44,21 +44,31 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.network.telephony.DataConnectivityListener;
 import com.android.settings.network.telephony.MobileNetworkActivity;
 import com.android.settings.network.telephony.MobileNetworkUtils;
 import com.android.settings.network.telephony.SignalStrengthListener;
+import com.android.settings.widget.GearPreference;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.net.SignalStrengthUtil;
 
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 /**
- * This manages a set of Preferences it places into a PreferenceGroup owned by some parent
+ * If the provider model is not enabled, this controller manages a set of Preferences it places into
+ * a PreferenceGroup owned by some parent
  * controller class - one for each available subscription. This controller is only considered
  * available if there are 2 or more subscriptions.
+ *
+ * If the provider model is enabled, this controller manages preference with data subscription
+ * information and make its state display on preference.
+ * TODO this class will clean up the multiple subscriptions functionality after the provider
+ * model is released.
  */
 public class SubscriptionsPreferenceController extends AbstractPreferenceController implements
         LifecycleObserver, SubscriptionsChangeListener.SubscriptionsChangeListenerClient,
@@ -69,18 +79,31 @@
     private UpdateListener mUpdateListener;
     private String mPreferenceGroupKey;
     private PreferenceGroup mPreferenceGroup;
-    private SubscriptionManager mManager;
-    private ConnectivityManager mConnectivityManager;
+    private TelephonyManager mTelephonyManager;
+    private SubscriptionManager mSubscriptionManager;
     private SubscriptionsChangeListener mSubscriptionsListener;
     private MobileDataEnabledListener mDataEnabledListener;
     private DataConnectivityListener mConnectivityListener;
     private SignalStrengthListener mSignalStrengthListener;
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
 
+    @VisibleForTesting
+    final BroadcastReceiver mDataSubscriptionChangedReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final String action = intent.getAction();
+            if (action.equals(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED)) {
+                update();
+            }
+        }
+    };
 
     // Map of subscription id to Preference
     private Map<Integer, Preference> mSubscriptionPreferences;
     private int mStartOrder;
+    private GearPreference mSubsGearPref;
 
+    private SubsPrefCtrlInjector mSubsPrefCtrlInjector;
     /**
      * This interface lets a parent of this class know that some change happened - this could
      * either be because overall availability changed, or because we've added/removed/updated some
@@ -110,22 +133,37 @@
         mUpdateListener = updateListener;
         mPreferenceGroupKey = preferenceGroupKey;
         mStartOrder = startOrder;
-        mManager = context.getSystemService(SubscriptionManager.class);
-        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
+        mTelephonyManager = context.getSystemService(TelephonyManager.class);
+        mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
         mSubscriptionPreferences = new ArrayMap<>();
         mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
         mDataEnabledListener = new MobileDataEnabledListener(context, this);
         mConnectivityListener = new DataConnectivityListener(context, this);
         mSignalStrengthListener = new SignalStrengthListener(context, this);
         lifecycle.addObserver(this);
+        mSubsPrefCtrlInjector = createSubsPrefCtrlInjector();
+    }
+
+    private void registerDataSubscriptionChangedReceiver() {
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);
+        mContext.registerReceiver(mDataSubscriptionChangedReceiver, filter);
+    }
+
+    private void unRegisterDataSubscriptionChangedReceiver() {
+        if (mDataSubscriptionChangedReceiver != null) {
+            mContext.unregisterReceiver(mDataSubscriptionChangedReceiver);
+        }
+
     }
 
     @OnLifecycleEvent(ON_RESUME)
     public void onResume() {
         mSubscriptionsListener.start();
-        mDataEnabledListener.start(SubscriptionManager.getDefaultDataSubscriptionId());
+        mDataEnabledListener.start(mSubsPrefCtrlInjector.getDefaultDataSubscriptionId());
         mConnectivityListener.start();
         mSignalStrengthListener.resume();
+        registerDataSubscriptionChangedReceiver();
         update();
     }
 
@@ -135,6 +173,7 @@
         mDataEnabledListener.stop();
         mConnectivityListener.stop();
         mSignalStrengthListener.pause();
+        unRegisterDataSubscriptionChangedReceiver();
     }
 
     @Override
@@ -147,25 +186,118 @@
         if (mPreferenceGroup == null) {
             return;
         }
-
         if (!isAvailable()) {
+            if (mSubsGearPref != null) {
+                mPreferenceGroup.removePreference(mSubsGearPref);
+            }
             for (Preference pref : mSubscriptionPreferences.values()) {
                 mPreferenceGroup.removePreference(pref);
             }
+
             mSubscriptionPreferences.clear();
             mSignalStrengthListener.updateSubscriptionIds(Collections.emptySet());
             mUpdateListener.onChildrenUpdated();
             return;
         }
 
+        if (mSubsPrefCtrlInjector.isProviderModelEnabled(mContext)) {
+            updateForProvider();
+        } else {
+            updateForBase();
+        }
+    }
+
+    private void updateForProvider() {
+        SubscriptionInfo subInfo = mSubscriptionManager.getDefaultDataSubscriptionInfo();
+        if (subInfo == null) {
+            mPreferenceGroup.removeAll();
+            return;
+        }
+        if (mSubsGearPref == null) {
+            mPreferenceGroup.removeAll();
+            mSubsGearPref = new GearPreference(mContext, null);
+            mSubsGearPref.setOnPreferenceClickListener(preference -> {
+                connectCarrierNetwork();
+                return true;
+            });
+            mSubsGearPref.setOnGearClickListener(p ->
+                    startMobileNetworkActivity(mContext, subInfo.getSubscriptionId()));
+        }
+
+        mSubsGearPref.setTitle(subInfo.getDisplayName());
+        mSubsGearPref.setOrder(mStartOrder);
+        //TODO(b/176141828) Wait for api provided by system ui.
+        mSubsGearPref.setSummary(getMobilePreferenceSummary());
+        mSubsGearPref.setIcon(getIcon(subInfo.getSubscriptionId()));
+        mPreferenceGroup.addPreference(mSubsGearPref);
+
+        final Set<Integer> activeDataSubIds = new ArraySet<>();
+        activeDataSubIds.add(subInfo.getSubscriptionId());
+        mSignalStrengthListener.updateSubscriptionIds(activeDataSubIds);
+        mUpdateListener.onChildrenUpdated();
+    }
+
+    private String getMobilePreferenceSummary() {
+        //TODO(b/176141828) Waiting for the api provided by system UI.
+        String result = "5G";
+        if (MobileNetworkUtils.activeNetworkIsCellular(mContext)) {
+            result = "Active, " + result;
+        }
+        return result;
+    }
+
+    private Drawable getIcon(int subId) {
+        final TelephonyManager tmForSubId = mTelephonyManager.createForSubscriptionId(subId);
+        final SignalStrength strength = tmForSubId.getSignalStrength();
+        int level = (strength == null) ? 0 : strength.getLevel();
+
+        int numLevels = SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
+        if (shouldInflateSignalStrength(subId)) {
+            level += 1;
+            numLevels += 1;
+        }
+
+        final boolean isMobileDataOn = tmForSubId.isDataEnabled();
+        final boolean isActiveCellularNetwork =
+                mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext);
+        final boolean isMobileDataAccessible = tmForSubId.getDataState()
+                == TelephonyManager.DATA_CONNECTED;
+        final ServiceState serviceState = tmForSubId.getServiceState();
+        final boolean isVoiceOutOfService = (serviceState == null)
+                ? true
+                : (serviceState.getState() == ServiceState.STATE_OUT_OF_SERVICE);
+
+        Drawable icon = mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels, false);
+
+        if (isActiveCellularNetwork) {
+            icon.setTint(Utils.getColorAccentDefaultColor(mContext));
+            return icon;
+        }
+        if ((isMobileDataOn && isMobileDataAccessible)
+                || (!isMobileDataOn && !isVoiceOutOfService)) {
+            return icon;
+        }
+
+        icon = mContext.getDrawable(R.drawable.ic_signal_strength_zero_bar_no_internet);
+        return icon;
+    }
+
+    private void updateForBase() {
         final Map<Integer, Preference> existingPrefs = mSubscriptionPreferences;
         mSubscriptionPreferences = new ArrayMap<>();
 
         int order = mStartOrder;
         final Set<Integer> activeSubIds = new ArraySet<>();
-        final int dataDefaultSubId = SubscriptionManager.getDefaultDataSubscriptionId();
-        for (SubscriptionInfo info : SubscriptionUtil.getActiveSubscriptions(mManager)) {
+        final int dataDefaultSubId = mSubsPrefCtrlInjector.getDefaultDataSubscriptionId();
+        for (SubscriptionInfo info :
+                SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager)) {
             final int subId = info.getSubscriptionId();
+            // Avoid from showing subscription(SIM)s which has been marked as hidden
+            // For example, only one subscription will be shown when there're multiple
+            // subscriptions with same group UUID.
+            if (!mSubsPrefCtrlInjector.canSubscriptionBeDisplayed(mContext, subId)) {
+                continue;
+            }
             activeSubIds.add(subId);
             Preference pref = existingPrefs.remove(subId);
             if (pref == null) {
@@ -179,9 +311,7 @@
             pref.setOrder(order++);
 
             pref.setOnPreferenceClickListener(clickedPref -> {
-                final Intent intent = new Intent(mContext, MobileNetworkActivity.class);
-                intent.putExtra(Settings.EXTRA_SUB_ID, subId);
-                mContext.startActivity(intent);
+                startMobileNetworkActivity(mContext, subId);
                 return true;
             });
 
@@ -196,6 +326,12 @@
         mUpdateListener.onChildrenUpdated();
     }
 
+    private static void startMobileNetworkActivity(Context context, int subId) {
+        final Intent intent = new Intent(context, MobileNetworkActivity.class);
+        intent.putExtra(Settings.EXTRA_SUB_ID, subId);
+        context.startActivity(intent);
+    }
+
     @VisibleForTesting
     boolean shouldInflateSignalStrength(int subId) {
         return SignalStrengthUtil.shouldInflateSignalStrength(mContext, subId);
@@ -212,27 +348,9 @@
             level += 1;
             numLevels += 1;
         }
+
         final boolean showCutOut = !isDefaultForData || !mgr.isDataEnabled();
-        pref.setIcon(getIcon(level, numLevels, showCutOut));
-    }
-
-    @VisibleForTesting
-    Drawable getIcon(int level, int numLevels, boolean cutOut) {
-        return MobileNetworkUtils.getSignalStrengthIcon(mContext, level, numLevels,
-                NO_CELL_DATA_TYPE_ICON, cutOut);
-    }
-
-    private boolean activeNetworkIsCellular() {
-        final Network activeNetwork = mConnectivityManager.getActiveNetwork();
-        if (activeNetwork == null) {
-            return false;
-        }
-        final NetworkCapabilities networkCapabilities = mConnectivityManager.getNetworkCapabilities(
-                activeNetwork);
-        if (networkCapabilities == null) {
-            return false;
-        }
-        return networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
+        pref.setIcon(mSubsPrefCtrlInjector.getIcon(mContext, level, numLevels, showCutOut));
     }
 
     /**
@@ -247,8 +365,8 @@
      * If a subscription isn't the default for anything, we just say it is available.
      */
     protected String getSummary(int subId, boolean isDefaultForData) {
-        final int callsDefaultSubId = SubscriptionManager.getDefaultVoiceSubscriptionId();
-        final int smsDefaultSubId = SubscriptionManager.getDefaultSmsSubscriptionId();
+        final int callsDefaultSubId = mSubsPrefCtrlInjector.getDefaultVoiceSubscriptionId();
+        final int smsDefaultSubId = mSubsPrefCtrlInjector.getDefaultSmsSubscriptionId();
 
         String line1 = null;
         if (subId == callsDefaultSubId && subId == smsDefaultSubId) {
@@ -264,7 +382,7 @@
             final TelephonyManager telMgrForSub = mContext.getSystemService(
                     TelephonyManager.class).createForSubscriptionId(subId);
             final boolean dataEnabled = telMgrForSub.isDataEnabled();
-            if (dataEnabled && activeNetworkIsCellular()) {
+            if (dataEnabled && mSubsPrefCtrlInjector.isActiveCellularNetwork(mContext)) {
                 line2 = mContext.getString(R.string.mobile_data_active);
             } else if (!dataEnabled) {
                 line2 = mContext.getString(R.string.mobile_data_off);
@@ -285,14 +403,27 @@
     }
 
     /**
-     * @return true if there are at least 2 available subscriptions.
+     * @return true if there are at least 2 available subscriptions,
+     * or if there is at least 1 available subscription for provider model.
      */
     @Override
     public boolean isAvailable() {
         if (mSubscriptionsListener.isAirplaneModeOn()) {
             return false;
         }
-        return SubscriptionUtil.getActiveSubscriptions(mManager).size() >= 2;
+        List<SubscriptionInfo> subInfoList =
+                SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager);
+        if (subInfoList == null) {
+            return false;
+        }
+        return subInfoList.stream()
+                // Avoid from showing subscription(SIM)s which has been marked as hidden
+                // For example, only one subscription will be shown when there're multiple
+                // subscriptions with same group UUID.
+                .filter(subInfo ->
+                        mSubsPrefCtrlInjector.canSubscriptionBeDisplayed(mContext,
+                                subInfo.getSubscriptionId()))
+                .count() >= (mSubsPrefCtrlInjector.isProviderModelEnabled(mContext) ? 1 : 2);
     }
 
     @Override
@@ -308,7 +439,7 @@
     @Override
     public void onSubscriptionsChanged() {
         // See if we need to change which sub id we're using to listen for enabled/disabled changes.
-        int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+        int defaultDataSubId = mSubsPrefCtrlInjector.getDefaultDataSubscriptionId();
         if (defaultDataSubId != mDataEnabledListener.getSubId()) {
             mDataEnabledListener.stop();
             mDataEnabledListener.start(defaultDataSubId);
@@ -330,4 +461,85 @@
     public void onSignalStrengthChanged() {
         update();
     }
-}
+
+    @VisibleForTesting
+    boolean canSubscriptionBeDisplayed(Context context, int subId) {
+        return (SubscriptionUtil.getAvailableSubscription(context,
+                ProxySubscriptionManager.getInstance(context), subId) != null);
+    }
+
+    public void setWifiPickerTrackerHelper(WifiPickerTrackerHelper helper) {
+        mWifiPickerTrackerHelper = helper;
+    }
+
+    @VisibleForTesting
+    public void connectCarrierNetwork() {
+        if (mTelephonyManager == null || !mTelephonyManager.isDataEnabled()) {
+            return;
+        }
+        if (mWifiPickerTrackerHelper != null) {
+            mWifiPickerTrackerHelper.connectCarrierNetwork(null /* ConnectCallback */);
+        }
+    }
+
+    SubsPrefCtrlInjector createSubsPrefCtrlInjector() {
+        return new SubsPrefCtrlInjector();
+    }
+
+    /**
+     * To inject necessary data from each static api.
+     */
+    @VisibleForTesting
+    public static class SubsPrefCtrlInjector {
+        /**
+         * Use to inject function and value for class and test class.
+         */
+        public boolean canSubscriptionBeDisplayed(Context context, int subId) {
+            return (SubscriptionUtil.getAvailableSubscription(context,
+                    ProxySubscriptionManager.getInstance(context), subId) != null);
+        }
+
+        /**
+         * Check SIM be able to display on UI.
+         */
+        public int getDefaultSmsSubscriptionId() {
+            return SubscriptionManager.getDefaultSmsSubscriptionId();
+        }
+
+        /**
+         * Get default voice subscription ID.
+         */
+        public int getDefaultVoiceSubscriptionId() {
+            return SubscriptionManager.getDefaultVoiceSubscriptionId();
+        }
+
+        /**
+         * Get default data subscription ID.
+         */
+        public int getDefaultDataSubscriptionId() {
+            return SubscriptionManager.getDefaultDataSubscriptionId();
+        }
+
+        /**
+         * Confirm the current network is cellular and active.
+         */
+        public boolean isActiveCellularNetwork(Context context) {
+            return MobileNetworkUtils.activeNetworkIsCellular(context);
+        }
+
+        /**
+         * Confirm the flag of Provider Model switch is turned on or not.
+         */
+        public boolean isProviderModelEnabled(Context context) {
+            return Utils.isProviderModelEnabled(context);
+        }
+
+        /**
+         * Get signal icon with different signal level.
+         */
+        public Drawable getIcon(Context context, int level, int numLevels, boolean cutOut) {
+            return MobileNetworkUtils.getSignalStrengthIcon(context, level, numLevels,
+                    NO_CELL_DATA_TYPE_ICON, cutOut);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/com/android/settings/network/SwitchSlotSidecar.java b/src/com/android/settings/network/SwitchSlotSidecar.java
new file mode 100644
index 0000000..cffb23f
--- /dev/null
+++ b/src/com/android/settings/network/SwitchSlotSidecar.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.annotation.IntDef;
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.util.Log;
+
+import com.android.settings.AsyncTaskSidecar;
+import com.android.settings.SidecarFragment;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+import javax.annotation.Nullable;
+
+/** {@link SidecarFragment} to switch SIM slot. */
+public class SwitchSlotSidecar
+        extends AsyncTaskSidecar<SwitchSlotSidecar.Param, SwitchSlotSidecar.Result> {
+    private static final String TAG = "SwitchSlotSidecar";
+
+    /** Commands */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({
+        Command.SWITCH_TO_REMOVABLE_SIM,
+    })
+    private @interface Command {
+        int SWITCH_TO_REMOVABLE_SIM = 0;
+    }
+
+    static class Param {
+        @Command int command;
+        int slotId;
+    }
+
+    static class Result {
+        Exception exception;
+    }
+
+    /** Returns a SwitchSlotSidecar sidecar instance. */
+    public static SwitchSlotSidecar get(FragmentManager fm) {
+        return SidecarFragment.get(fm, TAG, SwitchSlotSidecar.class, null /* args */);
+    }
+
+    @Nullable private Exception mException;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    /** Starts switching to the removable slot. */
+    public void runSwitchToRemovableSlot(int id) {
+        Param param = new Param();
+        param.command = Command.SWITCH_TO_REMOVABLE_SIM;
+        param.slotId = id;
+        super.run(param);
+    }
+
+    /**
+     * Returns the exception thrown during the execution of a command. Will be null in any state
+     * other than {@link State#SUCCESS}, and may be null in that state if there was not an error.
+     */
+    @Nullable
+    public Exception getException() {
+        return mException;
+    }
+
+    @Override
+    protected Result doInBackground(@Nullable Param param) {
+        Result result = new Result();
+        if (param == null) {
+            result.exception = new UiccSlotsException("Null param");
+            return result;
+        }
+        try {
+            switch (param.command) {
+                case Command.SWITCH_TO_REMOVABLE_SIM:
+                    UiccSlotUtil.switchToRemovableSlot(param.slotId, getContext());
+                    break;
+                default:
+                    Log.e(TAG, "Wrong command.");
+                    break;
+            }
+        } catch (UiccSlotsException e) {
+            result.exception = e;
+        }
+        return result;
+    }
+
+    @Override
+    protected void onPostExecute(Result result) {
+        if (result.exception == null) {
+            setState(State.SUCCESS, Substate.UNUSED);
+        } else {
+            mException = result.exception;
+            setState(State.ERROR, Substate.UNUSED);
+        }
+    }
+}
diff --git a/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java b/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
new file mode 100644
index 0000000..2eaa0ec
--- /dev/null
+++ b/src/com/android/settings/network/SwitchToEuiccSubscriptionSidecar.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.app.FragmentManager;
+import android.app.PendingIntent;
+
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.telephony.EuiccOperationSidecar;
+
+/** A headless fragment encapsulating long-running eSIM enabling/disabling operations. */
+public class SwitchToEuiccSubscriptionSidecar extends EuiccOperationSidecar {
+    private static final String TAG = "SwitchToEuiccSubscriptionSidecar";
+    private static final String ACTION_SWITCH_TO_SUBSCRIPTION =
+            "com.android.settings.network.switchToSubscription";
+
+    private PendingIntent mCallbackIntent;
+
+    /** Returns a SwitchToEuiccSubscriptionSidecar sidecar instance. */
+    public static SwitchToEuiccSubscriptionSidecar get(FragmentManager fm) {
+        return SidecarFragment.get(
+                fm, TAG, SwitchToEuiccSubscriptionSidecar.class, null /* args */);
+    }
+
+    @Override
+    public String getReceiverAction() {
+        return ACTION_SWITCH_TO_SUBSCRIPTION;
+    }
+
+    /** Returns the pendingIntent of the eSIM operations. */
+    public PendingIntent getCallbackIntent() {
+        return mCallbackIntent;
+    }
+
+    /** Starts calling EuiccManager#switchToSubscription to enable/disable the eSIM profile. */
+    public void run(int subscriptionId) {
+        setState(State.RUNNING, Substate.UNUSED);
+        mCallbackIntent = createCallbackIntent();
+        mEuiccManager.switchToSubscription(subscriptionId, mCallbackIntent);
+    }
+}
diff --git a/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java b/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java
new file mode 100644
index 0000000..132a2fd
--- /dev/null
+++ b/src/com/android/settings/network/SwitchToRemovableSlotSidecar.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.app.FragmentManager;
+import android.os.Bundle;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.util.Log;
+
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.telephony.EuiccOperationSidecar;
+
+/**
+ * This sidecar is responsible for switching to the removable slot. It disables the active eSIM
+ * profile before switching if there is one.
+ */
+public class SwitchToRemovableSlotSidecar extends EuiccOperationSidecar
+        implements SidecarFragment.Listener {
+
+    private static final String TAG = "DisableSubscriptionAndSwitchSlotSidecar";
+    private static final String ACTION_DISABLE_SUBSCRIPTION_AND_SWITCH_SLOT =
+            "disable_subscription_and_switch_slot_sidecar";
+
+    // Stateless members.
+    private SwitchToEuiccSubscriptionSidecar mSwitchToSubscriptionSidecar;
+    private SwitchSlotSidecar mSwitchSlotSidecar;
+    private int mPhysicalSlotId;
+
+    /** Returns a SwitchToRemovableSlotSidecar sidecar instance. */
+    public static SwitchToRemovableSlotSidecar get(FragmentManager fm) {
+        return SidecarFragment.get(fm, TAG, SwitchToRemovableSlotSidecar.class, null /* args */);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mSwitchToSubscriptionSidecar =
+                SwitchToEuiccSubscriptionSidecar.get(getChildFragmentManager());
+        mSwitchSlotSidecar = SwitchSlotSidecar.get(getChildFragmentManager());
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSwitchToSubscriptionSidecar.addListener(this);
+        mSwitchSlotSidecar.addListener(this);
+    }
+
+    @Override
+    public void onPause() {
+        mSwitchToSubscriptionSidecar.removeListener(this);
+        mSwitchSlotSidecar.removeListener(this);
+        super.onPause();
+    }
+
+    @Override
+    protected String getReceiverAction() {
+        return ACTION_DISABLE_SUBSCRIPTION_AND_SWITCH_SLOT;
+    }
+
+    @Override
+    public void onStateChange(SidecarFragment fragment) {
+        if (fragment == mSwitchToSubscriptionSidecar) {
+            onSwitchToSubscriptionSidecarStateChange();
+        } else if (fragment == mSwitchSlotSidecar) {
+            onSwitchSlotSidecarStateChange();
+        } else {
+            Log.wtf(TAG, "Received state change from a sidecar not expected.");
+        }
+    }
+
+    /**
+     * Starts switching to the removable slot. It disables the active eSIM profile before switching
+     * if there is one.
+     *
+     * @param physicalSlotId removable physical SIM slot ID.
+     */
+    public void run(int physicalSlotId) {
+        mPhysicalSlotId = physicalSlotId;
+        SubscriptionManager subscriptionManager =
+                getContext().getSystemService(SubscriptionManager.class);
+        if (SubscriptionUtil.getActiveSubscriptions(subscriptionManager).stream()
+                .anyMatch(SubscriptionInfo::isEmbedded)) {
+            Log.i(TAG, "There is an active eSIM profile. Disable the profile first.");
+            // Use INVALID_SUBSCRIPTION_ID to disable the only active profile.
+            mSwitchToSubscriptionSidecar.run(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        } else {
+            Log.i(TAG, "There is no active eSIM profiles. Start to switch to removable slot.");
+            mSwitchSlotSidecar.runSwitchToRemovableSlot(mPhysicalSlotId);
+        }
+    }
+
+    private void onSwitchToSubscriptionSidecarStateChange() {
+        switch (mSwitchToSubscriptionSidecar.getState()) {
+            case State.SUCCESS:
+                mSwitchToSubscriptionSidecar.reset();
+                Log.i(
+                        TAG,
+                        "Successfully disabled eSIM profile. Start to switch to Removable slot.");
+                mSwitchSlotSidecar.runSwitchToRemovableSlot(mPhysicalSlotId);
+                break;
+            case State.ERROR:
+                mSwitchToSubscriptionSidecar.reset();
+                Log.i(TAG, "Failed to disable the active eSIM profile.");
+                setState(State.ERROR, Substate.UNUSED);
+                break;
+        }
+    }
+
+    private void onSwitchSlotSidecarStateChange() {
+        switch (mSwitchSlotSidecar.getState()) {
+            case State.SUCCESS:
+                mSwitchSlotSidecar.reset();
+                Log.i(TAG, "Successfully switched to removable slot.");
+                setState(State.SUCCESS, Substate.UNUSED);
+                break;
+            case State.ERROR:
+                mSwitchSlotSidecar.reset();
+                Log.i(TAG, "Failed to switch to removable slot.");
+                setState(State.ERROR, Substate.UNUSED);
+                break;
+        }
+    }
+}
diff --git a/src/com/android/settings/network/TetherBasePreferenceController.java b/src/com/android/settings/network/TetherBasePreferenceController.java
index 36ce2a4..1919770 100644
--- a/src/com/android/settings/network/TetherBasePreferenceController.java
+++ b/src/com/android/settings/network/TetherBasePreferenceController.java
@@ -129,11 +129,11 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
     }
 
     /**
diff --git a/src/com/android/settings/network/TetherEnabler.java b/src/com/android/settings/network/TetherEnabler.java
index b3c6d61..6ab4cb2 100644
--- a/src/com/android/settings/network/TetherEnabler.java
+++ b/src/com/android/settings/network/TetherEnabler.java
@@ -368,12 +368,12 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
         // we don't care, since we just want to read the value
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
         // we don't care, since we just want to read the value
     }
 
diff --git a/src/com/android/settings/network/TetherProvisioningActivity.java b/src/com/android/settings/network/TetherProvisioningActivity.java
index 047c90d..285780b 100644
--- a/src/com/android/settings/network/TetherProvisioningActivity.java
+++ b/src/com/android/settings/network/TetherProvisioningActivity.java
@@ -36,7 +36,7 @@
 import androidx.annotation.VisibleForTesting;
 
 /**
- * Activity which acts as a proxy to the tether provisioning app for sanity checks and permission
+ * Activity which acts as a proxy to the tether provisioning app for validity checks and permission
  * restrictions. Specifically, the provisioning apps require
  * {@link android.permission.TETHER_PRIVILEGED}, while this activity can be started by a caller
  * with {@link android.permission.TETHER_PRIVILEGED}.
diff --git a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
index f2e1312..fe2392b 100644
--- a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
+++ b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java
@@ -20,18 +20,20 @@
 import android.icu.text.ListFormatter;
 import android.text.BidiFormatter;
 import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
-import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settings.core.FeatureFlags;
+import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class TopLevelNetworkEntryPreferenceController extends BasePreferenceController {
 
-    private final WifiMasterSwitchPreferenceController mWifiPreferenceController;
+    private final WifiPrimarySwitchPreferenceController mWifiPreferenceController;
     private final MobileNetworkPreferenceController mMobileNetworkPreferenceController;
     private final TetherPreferenceController mTetherPreferenceController;
 
@@ -40,7 +42,7 @@
         mMobileNetworkPreferenceController = new MobileNetworkPreferenceController(mContext);
         mTetherPreferenceController = new TetherPreferenceController(
                 mContext, null /* lifecycle */);
-        mWifiPreferenceController = new WifiMasterSwitchPreferenceController(
+        mWifiPreferenceController = new WifiPrimarySwitchPreferenceController(
                 mContext, null /* metrics */);
     }
 
@@ -51,6 +53,11 @@
 
     @Override
     public CharSequence getSummary() {
+        // Remove homepage summaries for silky home.
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            return null;
+        }
+
         final String wifiSummary = BidiFormatter.getInstance()
                 .unicodeWrap(mContext.getString(R.string.wifi_settings_title));
         final String mobileSummary = mContext.getString(
diff --git a/src/com/android/settings/network/UiccSlotUtil.java b/src/com/android/settings/network/UiccSlotUtil.java
new file mode 100644
index 0000000..792f02a
--- /dev/null
+++ b/src/com/android/settings/network/UiccSlotUtil.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import android.annotation.IntDef;
+import android.content.Context;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccSlotInfo;
+import android.util.Log;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import com.google.common.collect.ImmutableList;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class UiccSlotUtil {
+
+    private static final String TAG = "UiccSlotUtil";
+
+    // TODO(b/171846124): Pass timeout value from LPA to Settings
+    private static final long WAIT_AFTER_SWITCH_TIMEOUT_MILLIS = 25000;
+
+    public static final int INVALID_PHYSICAL_SLOT_ID = -1;
+
+    /**
+     * Mode for switching to eSIM slot which decides whether there is cleanup process, e.g.
+     * disabling test profile, after eSIM slot is activated and whether we will wait it finished.
+     */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({
+        SwitchingEsimMode.NO_CLEANUP,
+        SwitchingEsimMode.ASYNC_CLEANUP,
+        SwitchingEsimMode.SYNC_CLEANUP
+    })
+    public @interface SwitchingEsimMode {
+        /** No cleanup process after switching to eSIM slot */
+        int NO_CLEANUP = 0;
+        /** Has cleanup process, but we will not wait it finished. */
+        int ASYNC_CLEANUP = 1;
+        /** Has cleanup process and we will wait until it's finished */
+        int SYNC_CLEANUP = 2;
+    }
+
+    /**
+     * Returns an immutable list of all UICC slots. If TelephonyManager#getUiccSlotsInfo returns, it
+     * returns an empty list instead.
+     */
+    public static ImmutableList<UiccSlotInfo> getSlotInfos(TelephonyManager telMgr) {
+        UiccSlotInfo[] slotInfos = telMgr.getUiccSlotsInfo();
+        if (slotInfos == null) {
+            return ImmutableList.of();
+        }
+        return ImmutableList.copyOf(slotInfos);
+    }
+
+    /**
+     * Switches to the removable slot. It waits for SIM_STATE_LOADED after switch. If slotId is
+     * INVALID_PHYSICAL_SLOT_ID, the method will use the first detected inactive removable slot.
+     *
+     * @param slotId the physical removable slot id.
+     * @param context the application context.
+     * @throws UiccSlotsException if there is an error.
+     */
+    public static synchronized void switchToRemovableSlot(int slotId, Context context)
+            throws UiccSlotsException {
+        if (ThreadUtils.isMainThread()) {
+            throw new IllegalThreadStateException(
+                    "Do not call switchToRemovableSlot on the main thread.");
+        }
+        TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
+        if (telMgr.isMultiSimEnabled()) {
+            // If this device supports multiple active slots, don't mess with TelephonyManager.
+            Log.i(TAG, "Multiple active slots supported. Not calling switchSlots.");
+            return;
+        }
+        UiccSlotInfo[] slots = telMgr.getUiccSlotsInfo();
+        if (slotId == INVALID_PHYSICAL_SLOT_ID) {
+            for (int i = 0; i < slots.length; i++) {
+                if (slots[i].isRemovable()
+                        && !slots[i].getIsActive()
+                        && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_ERROR
+                        && slots[i].getCardStateInfo() != UiccSlotInfo.CARD_STATE_INFO_RESTRICTED) {
+                    performSwitchToRemovableSlot(i, context);
+                    return;
+                }
+            }
+        } else {
+            if (slotId >= slots.length || !slots[slotId].isRemovable()) {
+                throw new UiccSlotsException("The given slotId is not a removable slot: " + slotId);
+            }
+            if (!slots[slotId].getIsActive()) {
+                performSwitchToRemovableSlot(slotId, context);
+            }
+        }
+    }
+
+    private static void performSwitchToRemovableSlot(int slotId, Context context)
+            throws UiccSlotsException {
+        CarrierConfigChangedReceiver receiver = null;
+        try {
+            CountDownLatch latch = new CountDownLatch(1);
+            receiver = new CarrierConfigChangedReceiver(latch);
+            receiver.registerOn(context);
+            switchSlots(context, slotId);
+            latch.await(WAIT_AFTER_SWITCH_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            Log.e(TAG, "Failed switching to physical slot.", e);
+        } finally {
+            if (receiver != null) {
+                context.unregisterReceiver(receiver);
+            }
+        }
+    }
+
+    /**
+     * Changes the logical slot to physical slot mapping. OEM should override this to provide
+     * device-specific implementation if the device supports switching slots.
+     *
+     * @param context the application context.
+     * @param physicalSlots List of physical slot ids in the order of logical slots.
+     */
+    private static void switchSlots(Context context, int... physicalSlots)
+            throws UiccSlotsException {
+        TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
+        if (telMgr.isMultiSimEnabled()) {
+            // If this device supports multiple active slots, don't mess with TelephonyManager.
+            Log.i(TAG, "Multiple active slots supported. Not calling switchSlots.");
+            return;
+        }
+        if (!telMgr.switchSlots(physicalSlots)) {
+            throw new UiccSlotsException("Failed to switch slots");
+        }
+    }
+}
diff --git a/src/com/android/settings/network/UiccSlotsException.java b/src/com/android/settings/network/UiccSlotsException.java
new file mode 100644
index 0000000..2a2edc5
--- /dev/null
+++ b/src/com/android/settings/network/UiccSlotsException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+/** The exception that is thrown when an error happens in a call to {@link UiccSlotUtil}. */
+public class UiccSlotsException extends Exception {
+
+    public UiccSlotsException() {}
+
+    public UiccSlotsException(String message) {
+        super(message);
+    }
+
+    public UiccSlotsException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public UiccSlotsException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/src/com/android/settings/network/apn/ApnEditor.java b/src/com/android/settings/network/apn/ApnEditor.java
new file mode 100644
index 0000000..afc68d5
--- /dev/null
+++ b/src/com/android/settings/network/apn/ApnEditor.java
@@ -0,0 +1,1478 @@
+/*
+ * Copyright (C) 2006 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.apn;
+
+import android.app.Dialog;
+import android.app.settings.SettingsEnums;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.provider.Telephony;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnKeyListener;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.EditTextPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.MultiSelectListPreference;
+import androidx.preference.Preference;
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.SwitchPreference;
+
+import com.android.internal.util.ArrayUtils;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.network.ProxySubscriptionManager;
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+/** Use to edit apn settings. */
+public class ApnEditor extends SettingsPreferenceFragment
+        implements OnPreferenceChangeListener, OnKeyListener {
+
+    private static final String TAG = ApnEditor.class.getSimpleName();
+    private static final boolean VDBG = false;   // STOPSHIP if true
+
+    private static final String KEY_AUTH_TYPE = "auth_type";
+    private static final String KEY_APN_TYPE = "apn_type";
+    private static final String KEY_PROTOCOL = "apn_protocol";
+    private static final String KEY_ROAMING_PROTOCOL = "apn_roaming_protocol";
+    private static final String KEY_CARRIER_ENABLED = "carrier_enabled";
+    private static final String KEY_BEARER_MULTI = "bearer_multi";
+    private static final String KEY_MVNO_TYPE = "mvno_type";
+    private static final String KEY_PASSWORD = "apn_password";
+
+    private static final int MENU_DELETE = Menu.FIRST;
+    private static final int MENU_SAVE = Menu.FIRST + 1;
+    private static final int MENU_CANCEL = Menu.FIRST + 2;
+
+    @VisibleForTesting
+    static String sNotSet;
+    @VisibleForTesting
+    EditTextPreference mName;
+    @VisibleForTesting
+    EditTextPreference mApn;
+    @VisibleForTesting
+    EditTextPreference mProxy;
+    @VisibleForTesting
+    EditTextPreference mPort;
+    @VisibleForTesting
+    EditTextPreference mUser;
+    @VisibleForTesting
+    EditTextPreference mServer;
+    @VisibleForTesting
+    EditTextPreference mPassword;
+    @VisibleForTesting
+    EditTextPreference mMmsc;
+    @VisibleForTesting
+    EditTextPreference mMcc;
+    @VisibleForTesting
+    EditTextPreference mMnc;
+    @VisibleForTesting
+    EditTextPreference mMmsProxy;
+    @VisibleForTesting
+    EditTextPreference mMmsPort;
+    @VisibleForTesting
+    ListPreference mAuthType;
+    @VisibleForTesting
+    EditTextPreference mApnType;
+    @VisibleForTesting
+    ListPreference mProtocol;
+    @VisibleForTesting
+    ListPreference mRoamingProtocol;
+    @VisibleForTesting
+    SwitchPreference mCarrierEnabled;
+    @VisibleForTesting
+    MultiSelectListPreference mBearerMulti;
+    @VisibleForTesting
+    ListPreference mMvnoType;
+    @VisibleForTesting
+    EditTextPreference mMvnoMatchData;
+
+    @VisibleForTesting
+    ApnData mApnData;
+
+    private String mCurMnc;
+    private String mCurMcc;
+
+    private boolean mNewApn;
+    private int mSubId;
+    @VisibleForTesting
+    ProxySubscriptionManager mProxySubscriptionMgr;
+    private int mBearerInitialVal = 0;
+    private String mMvnoTypeStr;
+    private String mMvnoMatchDataStr;
+    @VisibleForTesting
+    String[] mReadOnlyApnTypes;
+    @VisibleForTesting
+    String[] mDefaultApnTypes;
+    @VisibleForTesting
+    String mDefaultApnProtocol;
+    @VisibleForTesting
+    String mDefaultApnRoamingProtocol;
+    private String[] mReadOnlyApnFields;
+    private boolean mReadOnlyApn;
+    private Uri mCarrierUri;
+
+    /**
+     * APN types for data connections.  These are usage categories for an APN
+     * entry.  One APN entry may support multiple APN types, eg, a single APN
+     * may service regular internet traffic ("default") as well as MMS-specific
+     * connections.<br/>
+     * APN_TYPE_ALL is a special type to indicate that this APN entry can
+     * service all data connections.
+     */
+    public static final String APN_TYPE_ALL = "*";
+    /** APN type for default data traffic */
+    public static final String APN_TYPE_DEFAULT = "default";
+    /** APN type for MMS traffic */
+    public static final String APN_TYPE_MMS = "mms";
+    /** APN type for SUPL assisted GPS */
+    public static final String APN_TYPE_SUPL = "supl";
+    /** APN type for DUN traffic */
+    public static final String APN_TYPE_DUN = "dun";
+    /** APN type for HiPri traffic */
+    public static final String APN_TYPE_HIPRI = "hipri";
+    /** APN type for FOTA */
+    public static final String APN_TYPE_FOTA = "fota";
+    /** APN type for IMS */
+    public static final String APN_TYPE_IMS = "ims";
+    /** APN type for CBS */
+    public static final String APN_TYPE_CBS = "cbs";
+    /** APN type for IA Initial Attach APN */
+    public static final String APN_TYPE_IA = "ia";
+    /** APN type for Emergency PDN. This is not an IA apn, but is used
+     * for access to carrier services in an emergency call situation. */
+    public static final String APN_TYPE_EMERGENCY = "emergency";
+    /** APN type for Mission Critical Services */
+    public static final String APN_TYPE_MCX = "mcx";
+    /** APN type for XCAP */
+    public static final String APN_TYPE_XCAP = "xcap";
+    /** Array of all APN types */
+    public static final String[] APN_TYPES = {APN_TYPE_DEFAULT,
+            APN_TYPE_MMS,
+            APN_TYPE_SUPL,
+            APN_TYPE_DUN,
+            APN_TYPE_HIPRI,
+            APN_TYPE_FOTA,
+            APN_TYPE_IMS,
+            APN_TYPE_CBS,
+            APN_TYPE_IA,
+            APN_TYPE_EMERGENCY,
+            APN_TYPE_MCX,
+            APN_TYPE_XCAP,
+    };
+
+    /**
+     * Standard projection for the interesting columns of a normal note.
+     */
+    private static final String[] sProjection = new String[] {
+            Telephony.Carriers._ID,     // 0
+            Telephony.Carriers.NAME,    // 1
+            Telephony.Carriers.APN,     // 2
+            Telephony.Carriers.PROXY,   // 3
+            Telephony.Carriers.PORT,    // 4
+            Telephony.Carriers.USER,    // 5
+            Telephony.Carriers.SERVER,  // 6
+            Telephony.Carriers.PASSWORD, // 7
+            Telephony.Carriers.MMSC, // 8
+            Telephony.Carriers.MCC, // 9
+            Telephony.Carriers.MNC, // 10
+            Telephony.Carriers.NUMERIC, // 11
+            Telephony.Carriers.MMSPROXY, // 12
+            Telephony.Carriers.MMSPORT, // 13
+            Telephony.Carriers.AUTH_TYPE, // 14
+            Telephony.Carriers.TYPE, // 15
+            Telephony.Carriers.PROTOCOL, // 16
+            Telephony.Carriers.CARRIER_ENABLED, // 17
+            Telephony.Carriers.BEARER, // 18
+            Telephony.Carriers.BEARER_BITMASK, // 19
+            Telephony.Carriers.ROAMING_PROTOCOL, // 20
+            Telephony.Carriers.MVNO_TYPE,   // 21
+            Telephony.Carriers.MVNO_MATCH_DATA,  // 22
+            Telephony.Carriers.EDITED_STATUS,   // 23
+            Telephony.Carriers.USER_EDITABLE    //24
+    };
+
+    private static final int ID_INDEX = 0;
+    @VisibleForTesting
+    static final int NAME_INDEX = 1;
+    @VisibleForTesting
+    static final int APN_INDEX = 2;
+    private static final int PROXY_INDEX = 3;
+    private static final int PORT_INDEX = 4;
+    private static final int USER_INDEX = 5;
+    private static final int SERVER_INDEX = 6;
+    private static final int PASSWORD_INDEX = 7;
+    private static final int MMSC_INDEX = 8;
+    @VisibleForTesting
+    static final int MCC_INDEX = 9;
+    @VisibleForTesting
+    static final int MNC_INDEX = 10;
+    private static final int MMSPROXY_INDEX = 12;
+    private static final int MMSPORT_INDEX = 13;
+    private static final int AUTH_TYPE_INDEX = 14;
+    @VisibleForTesting
+    static final int TYPE_INDEX = 15;
+    @VisibleForTesting
+    static final int PROTOCOL_INDEX = 16;
+    @VisibleForTesting
+    static final int CARRIER_ENABLED_INDEX = 17;
+    private static final int BEARER_INDEX = 18;
+    private static final int BEARER_BITMASK_INDEX = 19;
+    @VisibleForTesting
+    static final int ROAMING_PROTOCOL_INDEX = 20;
+    private static final int MVNO_TYPE_INDEX = 21;
+    private static final int MVNO_MATCH_DATA_INDEX = 22;
+    private static final int EDITED_INDEX = 23;
+    private static final int USER_EDITABLE_INDEX = 24;
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        setLifecycleForAllControllers();
+
+        final Intent intent = getIntent();
+        final String action = intent.getAction();
+        if (TextUtils.isEmpty(action)) {
+            finish();
+            return;
+        }
+        mSubId = intent.getIntExtra(ApnSettings.SUB_ID,
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+        initApnEditorUi();
+        getCarrierCustomizedConfig();
+
+        Uri uri = null;
+        if (action.equals(Intent.ACTION_EDIT)) {
+            uri = intent.getData();
+            if (!uri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) {
+                Log.e(TAG, "Edit request not for carrier table. Uri: " + uri);
+                finish();
+                return;
+            }
+        } else if (action.equals(Intent.ACTION_INSERT)) {
+            mCarrierUri = intent.getData();
+            if (!mCarrierUri.isPathPrefixMatch(Telephony.Carriers.CONTENT_URI)) {
+                Log.e(TAG, "Insert request not for carrier table. Uri: " + mCarrierUri);
+                finish();
+                return;
+            }
+            mNewApn = true;
+            mMvnoTypeStr = intent.getStringExtra(ApnSettings.MVNO_TYPE);
+            mMvnoMatchDataStr = intent.getStringExtra(ApnSettings.MVNO_MATCH_DATA);
+        } else {
+            finish();
+            return;
+        }
+
+        // Creates an ApnData to store the apn data temporary, so that we don't need the cursor to
+        // get the apn data. The uri is null if the action is ACTION_INSERT, that mean there is no
+        // record in the database, so create a empty ApnData to represent a empty row of database.
+        if (uri != null) {
+            mApnData = getApnDataFromUri(uri);
+        } else {
+            mApnData = new ApnData(sProjection.length);
+        }
+
+        final boolean isUserEdited = mApnData.getInteger(EDITED_INDEX,
+                Telephony.Carriers.USER_EDITED) == Telephony.Carriers.USER_EDITED;
+
+        Log.d(TAG, "onCreate: EDITED " + isUserEdited);
+        // if it's not a USER_EDITED apn, check if it's read-only
+        if (!isUserEdited && (mApnData.getInteger(USER_EDITABLE_INDEX, 1) == 0
+                || apnTypesMatch(mReadOnlyApnTypes, mApnData.getString(TYPE_INDEX)))) {
+            Log.d(TAG, "onCreate: apnTypesMatch; read-only APN");
+            mReadOnlyApn = true;
+            disableAllFields();
+        } else if (!ArrayUtils.isEmpty(mReadOnlyApnFields)) {
+            disableFields(mReadOnlyApnFields);
+        }
+
+        for (int i = 0; i < getPreferenceScreen().getPreferenceCount(); i++) {
+            getPreferenceScreen().getPreference(i).setOnPreferenceChangeListener(this);
+        }
+    }
+
+    /**
+     * Enable ProxySubscriptionMgr with Lifecycle support for all controllers
+     * live within this fragment
+     */
+    private void setLifecycleForAllControllers() {
+        if (mProxySubscriptionMgr == null) {
+            mProxySubscriptionMgr = ProxySubscriptionManager.getInstance(getContext());
+        }
+        mProxySubscriptionMgr.setLifecycle(getLifecycle());
+    }
+
+    @Override
+    public void onViewStateRestored(@Nullable Bundle savedInstanceState) {
+        super.onViewStateRestored(savedInstanceState);
+        fillUI(savedInstanceState == null);
+        setCarrierCustomizedConfigToUi();
+    }
+
+    @VisibleForTesting
+    static String formatInteger(String value) {
+        try {
+            final int intValue = Integer.parseInt(value);
+            return String.format(getCorrectDigitsFormat(value), intValue);
+        } catch (NumberFormatException e) {
+            return value;
+        }
+    }
+
+    /**
+     * Get the digits format so we preserve leading 0's.
+     * MCCs are 3 digits and MNCs are either 2 or 3.
+     */
+    static String getCorrectDigitsFormat(String value) {
+        if (value.length() == 2) return "%02d";
+        else return "%03d";
+    }
+
+
+    /**
+     * Check if passed in array of APN types indicates all APN types
+     * @param apnTypes array of APN types. "*" indicates all types.
+     * @return true if all apn types are included in the array, false otherwise
+     */
+    static boolean hasAllApns(String[] apnTypes) {
+        if (ArrayUtils.isEmpty(apnTypes)) {
+            return false;
+        }
+
+        final List apnList = Arrays.asList(apnTypes);
+        if (apnList.contains(APN_TYPE_ALL)) {
+            Log.d(TAG, "hasAllApns: true because apnList.contains(APN_TYPE_ALL)");
+            return true;
+        }
+        for (String apn : APN_TYPES) {
+            if (!apnList.contains(apn)) {
+                return false;
+            }
+        }
+
+        Log.d(TAG, "hasAllApns: true");
+        return true;
+    }
+
+    /**
+     * Check if APN types overlap.
+     * @param apnTypesArray1 array of APNs. Empty array indicates no APN type; "*" indicates all
+     *                       types
+     * @param apnTypes2 comma separated string of APN types. Empty string represents all types.
+     * @return if any apn type matches return true, otherwise return false
+     */
+    private boolean apnTypesMatch(String[] apnTypesArray1, String apnTypes2) {
+        if (ArrayUtils.isEmpty(apnTypesArray1)) {
+            return false;
+        }
+
+        if (hasAllApns(apnTypesArray1) || TextUtils.isEmpty(apnTypes2)) {
+            return true;
+        }
+
+        final List apnTypesList1 = Arrays.asList(apnTypesArray1);
+        final String[] apnTypesArray2 = apnTypes2.split(",");
+
+        for (String apn : apnTypesArray2) {
+            if (apnTypesList1.contains(apn.trim())) {
+                Log.d(TAG, "apnTypesMatch: true because match found for " + apn.trim());
+                return true;
+            }
+        }
+
+        Log.d(TAG, "apnTypesMatch: false");
+        return false;
+    }
+
+    /**
+     * Function to get Preference obj corresponding to an apnField
+     * @param apnField apn field name for which pref is needed
+     * @return Preference obj corresponding to passed in apnField
+     */
+    private Preference getPreferenceFromFieldName(String apnField) {
+        switch (apnField) {
+            case Telephony.Carriers.NAME:
+                return mName;
+            case Telephony.Carriers.APN:
+                return mApn;
+            case Telephony.Carriers.PROXY:
+                return mProxy;
+            case Telephony.Carriers.PORT:
+                return mPort;
+            case Telephony.Carriers.USER:
+                return mUser;
+            case Telephony.Carriers.SERVER:
+                return mServer;
+            case Telephony.Carriers.PASSWORD:
+                return mPassword;
+            case Telephony.Carriers.MMSPROXY:
+                return mMmsProxy;
+            case Telephony.Carriers.MMSPORT:
+                return mMmsPort;
+            case Telephony.Carriers.MMSC:
+                return mMmsc;
+            case Telephony.Carriers.MCC:
+                return mMcc;
+            case Telephony.Carriers.MNC:
+                return mMnc;
+            case Telephony.Carriers.TYPE:
+                return mApnType;
+            case Telephony.Carriers.AUTH_TYPE:
+                return mAuthType;
+            case Telephony.Carriers.PROTOCOL:
+                return mProtocol;
+            case Telephony.Carriers.ROAMING_PROTOCOL:
+                return mRoamingProtocol;
+            case Telephony.Carriers.CARRIER_ENABLED:
+                return mCarrierEnabled;
+            case Telephony.Carriers.BEARER:
+            case Telephony.Carriers.BEARER_BITMASK:
+                return mBearerMulti;
+            case Telephony.Carriers.MVNO_TYPE:
+                return mMvnoType;
+            case Telephony.Carriers.MVNO_MATCH_DATA:
+                return mMvnoMatchData;
+        }
+        return null;
+    }
+
+    /**
+     * Disables given fields so that user cannot modify them
+     *
+     * @param apnFields fields to be disabled
+     */
+    private void disableFields(String[] apnFields) {
+        for (String apnField : apnFields) {
+            final Preference preference = getPreferenceFromFieldName(apnField);
+            if (preference != null) {
+                preference.setEnabled(false);
+            }
+        }
+    }
+
+    /**
+     * Disables all fields so that user cannot modify the APN
+     */
+    private void disableAllFields() {
+        mName.setEnabled(false);
+        mApn.setEnabled(false);
+        mProxy.setEnabled(false);
+        mPort.setEnabled(false);
+        mUser.setEnabled(false);
+        mServer.setEnabled(false);
+        mPassword.setEnabled(false);
+        mMmsProxy.setEnabled(false);
+        mMmsPort.setEnabled(false);
+        mMmsc.setEnabled(false);
+        mMcc.setEnabled(false);
+        mMnc.setEnabled(false);
+        mApnType.setEnabled(false);
+        mAuthType.setEnabled(false);
+        mProtocol.setEnabled(false);
+        mRoamingProtocol.setEnabled(false);
+        mCarrierEnabled.setEnabled(false);
+        mBearerMulti.setEnabled(false);
+        mMvnoType.setEnabled(false);
+        mMvnoMatchData.setEnabled(false);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.APN_EDITOR;
+    }
+
+    @VisibleForTesting
+    void fillUI(boolean firstTime) {
+        if (firstTime) {
+            // Fill in all the values from the db in both text editor and summary
+            mName.setText(mApnData.getString(NAME_INDEX));
+            mApn.setText(mApnData.getString(APN_INDEX));
+            mProxy.setText(mApnData.getString(PROXY_INDEX));
+            mPort.setText(mApnData.getString(PORT_INDEX));
+            mUser.setText(mApnData.getString(USER_INDEX));
+            mServer.setText(mApnData.getString(SERVER_INDEX));
+            mPassword.setText(mApnData.getString(PASSWORD_INDEX));
+            mMmsProxy.setText(mApnData.getString(MMSPROXY_INDEX));
+            mMmsPort.setText(mApnData.getString(MMSPORT_INDEX));
+            mMmsc.setText(mApnData.getString(MMSC_INDEX));
+            mMcc.setText(mApnData.getString(MCC_INDEX));
+            mMnc.setText(mApnData.getString(MNC_INDEX));
+            mApnType.setText(mApnData.getString(TYPE_INDEX));
+            if (mNewApn) {
+                final SubscriptionInfo subInfo =
+                        mProxySubscriptionMgr.getAccessibleSubscriptionInfo(mSubId);
+
+                // Country code
+                final String mcc = (subInfo == null) ? null : subInfo.getMccString();
+                // Network code
+                final String mnc = (subInfo == null) ? null : subInfo.getMncString();
+
+                if ((!TextUtils.isEmpty(mcc)) && (!TextUtils.isEmpty(mcc))) {
+                    // Auto populate MNC and MCC for new entries, based on what SIM reports
+                    mMcc.setText(mcc);
+                    mMnc.setText(mnc);
+                    mCurMnc = mnc;
+                    mCurMcc = mcc;
+                }
+            }
+            final int authVal = mApnData.getInteger(AUTH_TYPE_INDEX, -1);
+            if (authVal != -1) {
+                mAuthType.setValueIndex(authVal);
+            } else {
+                mAuthType.setValue(null);
+            }
+
+            mProtocol.setValue(mApnData.getString(PROTOCOL_INDEX));
+            mRoamingProtocol.setValue(mApnData.getString(ROAMING_PROTOCOL_INDEX));
+            mCarrierEnabled.setChecked(mApnData.getInteger(CARRIER_ENABLED_INDEX, 1) == 1);
+            mBearerInitialVal = mApnData.getInteger(BEARER_INDEX, 0);
+
+            final HashSet<String> bearers = new HashSet<String>();
+            int bearerBitmask = mApnData.getInteger(BEARER_BITMASK_INDEX, 0);
+            if (bearerBitmask == 0) {
+                if (mBearerInitialVal == 0) {
+                    bearers.add("" + 0);
+                }
+            } else {
+                int i = 1;
+                while (bearerBitmask != 0) {
+                    if ((bearerBitmask & 1) == 1) {
+                        bearers.add("" + i);
+                    }
+                    bearerBitmask >>= 1;
+                    i++;
+                }
+            }
+
+            if (mBearerInitialVal != 0 && !bearers.contains("" + mBearerInitialVal)) {
+                // add mBearerInitialVal to bearers
+                bearers.add("" + mBearerInitialVal);
+            }
+            mBearerMulti.setValues(bearers);
+
+            mMvnoType.setValue(mApnData.getString(MVNO_TYPE_INDEX));
+            mMvnoMatchData.setEnabled(false);
+            mMvnoMatchData.setText(mApnData.getString(MVNO_MATCH_DATA_INDEX));
+            if (mNewApn && mMvnoTypeStr != null && mMvnoMatchDataStr != null) {
+                mMvnoType.setValue(mMvnoTypeStr);
+                mMvnoMatchData.setText(mMvnoMatchDataStr);
+            }
+        }
+
+        mName.setSummary(checkNull(mName.getText()));
+        mApn.setSummary(checkNull(mApn.getText()));
+        mProxy.setSummary(checkNull(mProxy.getText()));
+        mPort.setSummary(checkNull(mPort.getText()));
+        mUser.setSummary(checkNull(mUser.getText()));
+        mServer.setSummary(checkNull(mServer.getText()));
+        mPassword.setSummary(starify(mPassword.getText()));
+        mMmsProxy.setSummary(checkNull(mMmsProxy.getText()));
+        mMmsPort.setSummary(checkNull(mMmsPort.getText()));
+        mMmsc.setSummary(checkNull(mMmsc.getText()));
+        mMcc.setSummary(formatInteger(checkNull(mMcc.getText())));
+        mMnc.setSummary(formatInteger(checkNull(mMnc.getText())));
+        mApnType.setSummary(checkNull(mApnType.getText()));
+
+        final String authVal = mAuthType.getValue();
+        if (authVal != null) {
+            final int authValIndex = Integer.parseInt(authVal);
+            mAuthType.setValueIndex(authValIndex);
+
+            final String[] values = getResources().getStringArray(R.array.apn_auth_entries);
+            mAuthType.setSummary(values[authValIndex]);
+        } else {
+            mAuthType.setSummary(sNotSet);
+        }
+
+        mProtocol.setSummary(checkNull(protocolDescription(mProtocol.getValue(), mProtocol)));
+        mRoamingProtocol.setSummary(
+                checkNull(protocolDescription(mRoamingProtocol.getValue(), mRoamingProtocol)));
+        mBearerMulti.setSummary(
+                checkNull(bearerMultiDescription(mBearerMulti.getValues())));
+        mMvnoType.setSummary(
+                checkNull(mvnoDescription(mMvnoType.getValue())));
+        mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
+        // allow user to edit carrier_enabled for some APN
+        final boolean ceEditable = getResources().getBoolean(
+                R.bool.config_allow_edit_carrier_enabled);
+        if (ceEditable) {
+            mCarrierEnabled.setEnabled(true);
+        } else {
+            mCarrierEnabled.setEnabled(false);
+        }
+    }
+
+    /**
+     * Returns the UI choice (e.g., "IPv4/IPv6") corresponding to the given
+     * raw value of the protocol preference (e.g., "IPV4V6"). If unknown,
+     * return null.
+     */
+    private String protocolDescription(String raw, ListPreference protocol) {
+        String uRaw = checkNull(raw).toUpperCase();
+        uRaw = uRaw.equals("IPV4") ? "IP" : uRaw;
+        final int protocolIndex = protocol.findIndexOfValue(uRaw);
+        if (protocolIndex == -1) {
+            return null;
+        } else {
+            final String[] values = getResources().getStringArray(R.array.apn_protocol_entries);
+            try {
+                return values[protocolIndex];
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return null;
+            }
+        }
+    }
+
+    private String bearerMultiDescription(Set<String> raw) {
+        final String[] values = getResources().getStringArray(R.array.bearer_entries);
+        final StringBuilder retVal = new StringBuilder();
+        boolean first = true;
+        for (String bearer : raw) {
+            int bearerIndex = mBearerMulti.findIndexOfValue(bearer);
+            try {
+                if (first) {
+                    retVal.append(values[bearerIndex]);
+                    first = false;
+                } else {
+                    retVal.append(", " + values[bearerIndex]);
+                }
+            } catch (ArrayIndexOutOfBoundsException e) {
+                // ignore
+            }
+        }
+        final String val = retVal.toString();
+        if (!TextUtils.isEmpty(val)) {
+            return val;
+        }
+        return null;
+    }
+
+    private String mvnoDescription(String newValue) {
+        final int mvnoIndex = mMvnoType.findIndexOfValue(newValue);
+        final String oldValue = mMvnoType.getValue();
+
+        if (mvnoIndex == -1) {
+            return null;
+        } else {
+            final String[] values = getResources().getStringArray(R.array.mvno_type_entries);
+            final boolean mvnoMatchDataUneditable =
+                    mReadOnlyApn || (mReadOnlyApnFields != null
+                            && Arrays.asList(mReadOnlyApnFields)
+                            .contains(Telephony.Carriers.MVNO_MATCH_DATA));
+            mMvnoMatchData.setEnabled(!mvnoMatchDataUneditable && mvnoIndex != 0);
+            if (newValue != null && !newValue.equals(oldValue)) {
+                if (values[mvnoIndex].equals("SPN")) {
+                    TelephonyManager telephonyManager = (TelephonyManager)
+                            getContext().getSystemService(TelephonyManager.class);
+                    final TelephonyManager telephonyManagerForSubId =
+                            telephonyManager.createForSubscriptionId(mSubId);
+                    if (telephonyManagerForSubId != null) {
+                        telephonyManager = telephonyManagerForSubId;
+                    }
+                    mMvnoMatchData.setText(telephonyManager.getSimOperatorName());
+                } else if (values[mvnoIndex].equals("IMSI")) {
+                    final SubscriptionInfo subInfo =
+                            mProxySubscriptionMgr.getAccessibleSubscriptionInfo(mSubId);
+                    final String mcc = (subInfo == null) ? "" :
+                            Objects.toString(subInfo.getMccString(), "");
+                    final String mnc = (subInfo == null) ? "" :
+                            Objects.toString(subInfo.getMncString(), "");
+                    mMvnoMatchData.setText(mcc + mnc + "x");
+                } else if (values[mvnoIndex].equals("GID")) {
+                    TelephonyManager telephonyManager = (TelephonyManager)
+                            getContext().getSystemService(TelephonyManager.class);
+                    final TelephonyManager telephonyManagerForSubId =
+                            telephonyManager.createForSubscriptionId(mSubId);
+                    if (telephonyManagerForSubId != null) {
+                        telephonyManager = telephonyManagerForSubId;
+                    }
+                    mMvnoMatchData.setText(telephonyManager.getGroupIdLevel1());
+                } else {
+                    // mvno type 'none' case. At this time, mvnoIndex should be 0.
+                    mMvnoMatchData.setText("");
+                }
+            }
+
+            try {
+                return values[mvnoIndex];
+            } catch (ArrayIndexOutOfBoundsException e) {
+                return null;
+            }
+        }
+    }
+    /**
+     * Callback when preference status changed.
+     */
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        String key = preference.getKey();
+        if (KEY_AUTH_TYPE.equals(key)) {
+            try {
+                final int index = Integer.parseInt((String) newValue);
+                mAuthType.setValueIndex(index);
+
+                final String[] values = getResources().getStringArray(R.array.apn_auth_entries);
+                mAuthType.setSummary(values[index]);
+            } catch (NumberFormatException e) {
+                return false;
+            }
+        } else if (KEY_APN_TYPE.equals(key)) {
+            String data = (TextUtils.isEmpty((String) newValue)
+                    && !ArrayUtils.isEmpty(mDefaultApnTypes))
+                    ? getEditableApnType(mDefaultApnTypes) : (String) newValue;
+            if (!TextUtils.isEmpty(data)) {
+                mApnType.setSummary(data);
+            }
+        } else if (KEY_PROTOCOL.equals(key)) {
+            final String protocol = protocolDescription((String) newValue, mProtocol);
+            if (protocol == null) {
+                return false;
+            }
+            mProtocol.setSummary(protocol);
+            mProtocol.setValue((String) newValue);
+        } else if (KEY_ROAMING_PROTOCOL.equals(key)) {
+            final String protocol = protocolDescription((String) newValue, mRoamingProtocol);
+            if (protocol == null) {
+                return false;
+            }
+            mRoamingProtocol.setSummary(protocol);
+            mRoamingProtocol.setValue((String) newValue);
+        } else if (KEY_BEARER_MULTI.equals(key)) {
+            final String bearer = bearerMultiDescription((Set<String>) newValue);
+            if (bearer == null) {
+                return false;
+            }
+            mBearerMulti.setValues((Set<String>) newValue);
+            mBearerMulti.setSummary(bearer);
+        } else if (KEY_MVNO_TYPE.equals(key)) {
+            final String mvno = mvnoDescription((String) newValue);
+            if (mvno == null) {
+                return false;
+            }
+            mMvnoType.setValue((String) newValue);
+            mMvnoType.setSummary(mvno);
+            mMvnoMatchData.setSummary(checkNull(mMvnoMatchData.getText()));
+        } else if (KEY_PASSWORD.equals(key)) {
+            mPassword.setSummary(starify(newValue != null ? String.valueOf(newValue) : ""));
+        } else if (KEY_CARRIER_ENABLED.equals(key)) {
+            // do nothing
+        } else {
+            preference.setSummary(checkNull(newValue != null ? String.valueOf(newValue) : null));
+        }
+        return true;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        // If it's a new APN, then cancel will delete the new entry in onPause
+        if (!mNewApn && !mReadOnlyApn) {
+            menu.add(0, MENU_DELETE, 0, R.string.menu_delete)
+                .setIcon(R.drawable.ic_delete);
+        }
+        if (!mReadOnlyApn) {
+            menu.add(0, MENU_SAVE, 0, R.string.menu_save)
+                .setIcon(android.R.drawable.ic_menu_save);
+        }
+        menu.add(0, MENU_CANCEL, 0, R.string.menu_cancel)
+            .setIcon(android.R.drawable.ic_menu_close_clear_cancel);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_DELETE:
+                deleteApn();
+                finish();
+                return true;
+            case MENU_SAVE:
+                if (validateAndSaveApnData()) {
+                    finish();
+                }
+                return true;
+            case MENU_CANCEL:
+                finish();
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        view.setOnKeyListener(this);
+        view.setFocusableInTouchMode(true);
+        view.requestFocus();
+    }
+
+    /**
+     * Try to save the apn data when pressed the back button. An error message will be displayed if
+     * the apn data is invalid.
+     *
+     * TODO(b/77339593): Try to keep the same behavior between back button and up navigate button.
+     * We will save the valid apn data to the database when pressed the back button, but discard all
+     * user changed when pressed the up navigate button.
+     */
+    @Override
+    public boolean onKey(View v, int keyCode, KeyEvent event) {
+        if (event.getAction() != KeyEvent.ACTION_DOWN) return false;
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_BACK: {
+                if (validateAndSaveApnData()) {
+                    finish();
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Add key, value to {@code cv} and compare the value against the value at index in
+     * {@link #mApnData}.
+     *
+     * <p>
+     * The key, value will not add to {@code cv} if value is null.
+     *
+     * @return true if values are different. {@code assumeDiff} indicates if values can be assumed
+     * different in which case no comparison is needed.
+     */
+    boolean setStringValueAndCheckIfDiff(
+            ContentValues cv, String key, String value, boolean assumeDiff, int index) {
+        final String valueFromLocalCache = mApnData.getString(index);
+        if (VDBG) {
+            Log.d(TAG, "setStringValueAndCheckIfDiff: assumeDiff: " + assumeDiff
+                    + " key: " + key
+                    + " value: '" + value
+                    + "' valueFromDb: '" + valueFromLocalCache + "'");
+        }
+        final boolean isDiff = assumeDiff
+                || !((TextUtils.isEmpty(value) && TextUtils.isEmpty(valueFromLocalCache))
+                || (value != null && value.equals(valueFromLocalCache)));
+
+        if (isDiff && value != null) {
+            cv.put(key, value);
+        }
+        return isDiff;
+    }
+
+    /**
+     * Add key, value to {@code cv} and compare the value against the value at index in
+     * {@link #mApnData}.
+     *
+     * @return true if values are different. {@code assumeDiff} indicates if values can be assumed
+     * different in which case no comparison is needed.
+     */
+    boolean setIntValueAndCheckIfDiff(
+            ContentValues cv, String key, int value, boolean assumeDiff, int index) {
+        final Integer valueFromLocalCache = mApnData.getInteger(index);
+        if (VDBG) {
+            Log.d(TAG, "setIntValueAndCheckIfDiff: assumeDiff: " + assumeDiff
+                    + " key: " + key
+                    + " value: '" + value
+                    + "' valueFromDb: '" + valueFromLocalCache + "'");
+        }
+
+        final boolean isDiff = assumeDiff || value != valueFromLocalCache;
+        if (isDiff) {
+            cv.put(key, value);
+        }
+        return isDiff;
+    }
+
+    /**
+     * Validates the apn data and save it to the database if it's valid.
+     *
+     * <p>
+     * A dialog with error message will be displayed if the APN data is invalid.
+     *
+     * @return true if there is no error
+     */
+    @VisibleForTesting
+    boolean validateAndSaveApnData() {
+        // Nothing to do if it's a read only APN
+        if (mReadOnlyApn) {
+            return true;
+        }
+
+        final String name = checkNotSet(mName.getText());
+        final String apn = checkNotSet(mApn.getText());
+        final String mcc = checkNotSet(mMcc.getText());
+        final String mnc = checkNotSet(mMnc.getText());
+
+        final String errorMsg = validateApnData();
+        if (errorMsg != null) {
+            showError();
+            return false;
+        }
+
+        final ContentValues values = new ContentValues();
+        // call update() if it's a new APN. If not, check if any field differs from the db value;
+        // if any diff is found update() should be called
+        boolean callUpdate = mNewApn;
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.NAME,
+                name,
+                callUpdate,
+                NAME_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.APN,
+                apn,
+                callUpdate,
+                APN_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.PROXY,
+                checkNotSet(mProxy.getText()),
+                callUpdate,
+                PROXY_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.PORT,
+                checkNotSet(mPort.getText()),
+                callUpdate,
+                PORT_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MMSPROXY,
+                checkNotSet(mMmsProxy.getText()),
+                callUpdate,
+                MMSPROXY_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MMSPORT,
+                checkNotSet(mMmsPort.getText()),
+                callUpdate,
+                MMSPORT_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.USER,
+                checkNotSet(mUser.getText()),
+                callUpdate,
+                USER_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.SERVER,
+                checkNotSet(mServer.getText()),
+                callUpdate,
+                SERVER_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.PASSWORD,
+                checkNotSet(mPassword.getText()),
+                callUpdate,
+                PASSWORD_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MMSC,
+                checkNotSet(mMmsc.getText()),
+                callUpdate,
+                MMSC_INDEX);
+
+        final String authVal = mAuthType.getValue();
+        if (authVal != null) {
+            callUpdate = setIntValueAndCheckIfDiff(values,
+                    Telephony.Carriers.AUTH_TYPE,
+                    Integer.parseInt(authVal),
+                    callUpdate,
+                    AUTH_TYPE_INDEX);
+        }
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.PROTOCOL,
+                checkNotSet(mProtocol.getValue()),
+                callUpdate,
+                PROTOCOL_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.ROAMING_PROTOCOL,
+                checkNotSet(mRoamingProtocol.getValue()),
+                callUpdate,
+                ROAMING_PROTOCOL_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.TYPE,
+                checkNotSet(getUserEnteredApnType()),
+                callUpdate,
+                TYPE_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MCC,
+                mcc,
+                callUpdate,
+                MCC_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MNC,
+                mnc,
+                callUpdate,
+                MNC_INDEX);
+
+        values.put(Telephony.Carriers.NUMERIC, mcc + mnc);
+
+        if (mCurMnc != null && mCurMcc != null) {
+            if (mCurMnc.equals(mnc) && mCurMcc.equals(mcc)) {
+                values.put(Telephony.Carriers.CURRENT, 1);
+            }
+        }
+
+        final Set<String> bearerSet = mBearerMulti.getValues();
+        int bearerBitmask = 0;
+        for (String bearer : bearerSet) {
+            if (Integer.parseInt(bearer) == 0) {
+                bearerBitmask = 0;
+                break;
+            } else {
+                bearerBitmask |= getBitmaskForTech(Integer.parseInt(bearer));
+            }
+        }
+        callUpdate = setIntValueAndCheckIfDiff(values,
+                Telephony.Carriers.BEARER_BITMASK,
+                bearerBitmask,
+                callUpdate,
+                BEARER_BITMASK_INDEX);
+
+        int bearerVal;
+        if (bearerBitmask == 0 || mBearerInitialVal == 0) {
+            bearerVal = 0;
+        } else if (bitmaskHasTech(bearerBitmask, mBearerInitialVal)) {
+            bearerVal = mBearerInitialVal;
+        } else {
+            // bearer field was being used but bitmask has changed now and does not include the
+            // initial bearer value -- setting bearer to 0 but maybe better behavior is to choose a
+            // random tech from the new bitmask??
+            bearerVal = 0;
+        }
+        callUpdate = setIntValueAndCheckIfDiff(values,
+                Telephony.Carriers.BEARER,
+                bearerVal,
+                callUpdate,
+                BEARER_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MVNO_TYPE,
+                checkNotSet(mMvnoType.getValue()),
+                callUpdate,
+                MVNO_TYPE_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MVNO_MATCH_DATA,
+                checkNotSet(mMvnoMatchData.getText()),
+                callUpdate,
+                MVNO_MATCH_DATA_INDEX);
+
+        callUpdate = setIntValueAndCheckIfDiff(values,
+                Telephony.Carriers.CARRIER_ENABLED,
+                mCarrierEnabled.isChecked() ? 1 : 0,
+                callUpdate,
+                CARRIER_ENABLED_INDEX);
+
+        values.put(Telephony.Carriers.EDITED_STATUS, Telephony.Carriers.USER_EDITED);
+
+        if (callUpdate) {
+            final Uri uri = mApnData.getUri() == null ? mCarrierUri : mApnData.getUri();
+            updateApnDataToDatabase(uri, values);
+        } else {
+            if (VDBG) Log.d(TAG, "validateAndSaveApnData: not calling update()");
+        }
+
+        return true;
+    }
+
+    private void updateApnDataToDatabase(Uri uri, ContentValues values) {
+        ThreadUtils.postOnBackgroundThread(() -> {
+            if (uri.equals(mCarrierUri)) {
+                // Add a new apn to the database
+                final Uri newUri = getContentResolver().insert(mCarrierUri, values);
+                if (newUri == null) {
+                    Log.e(TAG, "Can't add a new apn to database " + mCarrierUri);
+                }
+            } else {
+                // Update the existing apn
+                getContentResolver().update(
+                        uri, values, null /* where */, null /* selection Args */);
+            }
+        });
+    }
+
+    /**
+     * Validates whether the apn data is valid.
+     *
+     * @return An error message if the apn data is invalid, otherwise return null.
+     */
+    @VisibleForTesting
+    String validateApnData() {
+        String errorMsg = null;
+
+        final String name = checkNotSet(mName.getText());
+        final String apn = checkNotSet(mApn.getText());
+        final String mcc = checkNotSet(mMcc.getText());
+        final String mnc = checkNotSet(mMnc.getText());
+
+        if (TextUtils.isEmpty(name)) {
+            errorMsg = getResources().getString(R.string.error_name_empty);
+        } else if (TextUtils.isEmpty(apn)) {
+            errorMsg = getResources().getString(R.string.error_apn_empty);
+        } else if (mcc == null || mcc.length() != 3) {
+            errorMsg = getResources().getString(R.string.error_mcc_not3);
+        } else if ((mnc == null || (mnc.length() & 0xFFFE) != 2)) {
+            errorMsg = getResources().getString(R.string.error_mnc_not23);
+        }
+
+        if (errorMsg == null) {
+            // if carrier does not allow editing certain apn types, make sure type does not include
+            // those
+            if (!ArrayUtils.isEmpty(mReadOnlyApnTypes)
+                    && apnTypesMatch(mReadOnlyApnTypes, getUserEnteredApnType())) {
+                final StringBuilder stringBuilder = new StringBuilder();
+                for (String type : mReadOnlyApnTypes) {
+                    stringBuilder.append(type).append(", ");
+                    Log.d(TAG, "validateApnData: appending type: " + type);
+                }
+                // remove last ", "
+                if (stringBuilder.length() >= 2) {
+                    stringBuilder.delete(stringBuilder.length() - 2, stringBuilder.length());
+                }
+                errorMsg = String.format(getResources().getString(R.string.error_adding_apn_type),
+                        stringBuilder);
+            }
+        }
+
+        return errorMsg;
+    }
+
+    @VisibleForTesting
+    void showError() {
+        ErrorDialog.showError(this);
+    }
+
+    private void deleteApn() {
+        if (mApnData.getUri() != null) {
+            getContentResolver().delete(mApnData.getUri(), null, null);
+            mApnData = new ApnData(sProjection.length);
+        }
+    }
+
+    private String starify(String value) {
+        if (value == null || value.length() == 0) {
+            return sNotSet;
+        } else {
+            final char[] password = new char[value.length()];
+            for (int i = 0; i < password.length; i++) {
+                password[i] = '*';
+            }
+            return new String(password);
+        }
+    }
+
+    /**
+     * Returns {@link #sNotSet} if the given string {@code value} is null or empty. The string
+     * {@link #sNotSet} typically used as the default display when an entry in the preference is
+     * null or empty.
+     */
+    private String checkNull(String value) {
+        return TextUtils.isEmpty(value) ? sNotSet : value;
+    }
+
+    /**
+     * Returns null if the given string {@code value} equals to {@link #sNotSet}. This method
+     * should be used when convert a string value from preference to database.
+     */
+    private String checkNotSet(String value) {
+        return sNotSet.equals(value) ? null : value;
+    }
+
+    @VisibleForTesting
+    String getUserEnteredApnType() {
+        // if user has not specified a type, map it to "ALL APN TYPES THAT ARE NOT READ-ONLY"
+        // but if user enter empty type, map it just for default
+        String userEnteredApnType = mApnType.getText();
+        if (userEnteredApnType != null) userEnteredApnType = userEnteredApnType.trim();
+        if ((TextUtils.isEmpty(userEnteredApnType)
+                || APN_TYPE_ALL.equals(userEnteredApnType))) {
+            userEnteredApnType = getEditableApnType(APN_TYPES);
+        }
+        Log.d(TAG, "getUserEnteredApnType: changed apn type to editable apn types: "
+                + userEnteredApnType);
+        return userEnteredApnType;
+    }
+
+    private String getEditableApnType(String[] apnTypeList) {
+        final StringBuilder editableApnTypes = new StringBuilder();
+        final List<String> readOnlyApnTypes = Arrays.asList(mReadOnlyApnTypes);
+        boolean first = true;
+        for (String apnType : apnTypeList) {
+            // add APN type if it is not read-only and is not wild-cardable
+            if (!readOnlyApnTypes.contains(apnType)
+                    && !apnType.equals(APN_TYPE_IA)
+                    && !apnType.equals(APN_TYPE_EMERGENCY)
+                    && !apnType.equals(APN_TYPE_MCX)) {
+                if (first) {
+                    first = false;
+                } else {
+                    editableApnTypes.append(",");
+                }
+                editableApnTypes.append(apnType);
+            }
+        }
+        return editableApnTypes.toString();
+    }
+
+    private void initApnEditorUi() {
+        addPreferencesFromResource(R.xml.apn_editor);
+
+        sNotSet = getResources().getString(R.string.apn_not_set);
+        mName = (EditTextPreference) findPreference("apn_name");
+        mApn = (EditTextPreference) findPreference("apn_apn");
+        mProxy = (EditTextPreference) findPreference("apn_http_proxy");
+        mPort = (EditTextPreference) findPreference("apn_http_port");
+        mUser = (EditTextPreference) findPreference("apn_user");
+        mServer = (EditTextPreference) findPreference("apn_server");
+        mPassword = (EditTextPreference) findPreference(KEY_PASSWORD);
+        mMmsProxy = (EditTextPreference) findPreference("apn_mms_proxy");
+        mMmsPort = (EditTextPreference) findPreference("apn_mms_port");
+        mMmsc = (EditTextPreference) findPreference("apn_mmsc");
+        mMcc = (EditTextPreference) findPreference("apn_mcc");
+        mMnc = (EditTextPreference) findPreference("apn_mnc");
+        mApnType = (EditTextPreference) findPreference("apn_type");
+        mAuthType = (ListPreference) findPreference(KEY_AUTH_TYPE);
+        mProtocol = (ListPreference) findPreference(KEY_PROTOCOL);
+        mRoamingProtocol = (ListPreference) findPreference(KEY_ROAMING_PROTOCOL);
+        mCarrierEnabled = (SwitchPreference) findPreference(KEY_CARRIER_ENABLED);
+        mBearerMulti = (MultiSelectListPreference) findPreference(KEY_BEARER_MULTI);
+        mMvnoType = (ListPreference) findPreference(KEY_MVNO_TYPE);
+        mMvnoMatchData = (EditTextPreference) findPreference("mvno_match_data");
+    }
+
+    private void getCarrierCustomizedConfig() {
+        mReadOnlyApn = false;
+        mReadOnlyApnTypes = null;
+        mReadOnlyApnFields = null;
+
+        final CarrierConfigManager configManager = (CarrierConfigManager)
+                getSystemService(Context.CARRIER_CONFIG_SERVICE);
+        if (configManager != null) {
+            final PersistableBundle b = configManager.getConfigForSubId(mSubId);
+            if (b != null) {
+                mReadOnlyApnTypes = b.getStringArray(
+                        CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY);
+                if (!ArrayUtils.isEmpty(mReadOnlyApnTypes)) {
+                    Log.d(TAG,
+                            "onCreate: read only APN type: " + Arrays.toString(mReadOnlyApnTypes));
+                }
+                mReadOnlyApnFields = b.getStringArray(
+                        CarrierConfigManager.KEY_READ_ONLY_APN_FIELDS_STRING_ARRAY);
+
+                mDefaultApnTypes = b.getStringArray(
+                        CarrierConfigManager.KEY_APN_SETTINGS_DEFAULT_APN_TYPES_STRING_ARRAY);
+
+                if (!ArrayUtils.isEmpty(mDefaultApnTypes)) {
+                    Log.d(TAG, "onCreate: default apn types: " + Arrays.toString(mDefaultApnTypes));
+                }
+
+                mDefaultApnProtocol = b.getString(
+                        CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_PROTOCOL_STRING);
+                if (!TextUtils.isEmpty(mDefaultApnProtocol)) {
+                    Log.d(TAG, "onCreate: default apn protocol: " + mDefaultApnProtocol);
+                }
+
+                mDefaultApnRoamingProtocol = b.getString(
+                        CarrierConfigManager.Apn.KEY_SETTINGS_DEFAULT_ROAMING_PROTOCOL_STRING);
+                if (!TextUtils.isEmpty(mDefaultApnRoamingProtocol)) {
+                    Log.d(TAG, "onCreate: default apn roaming protocol: "
+                            + mDefaultApnRoamingProtocol);
+                }
+            }
+        }
+    }
+
+    private void setCarrierCustomizedConfigToUi() {
+        if (TextUtils.isEmpty(mApnType.getText()) && !ArrayUtils.isEmpty(mDefaultApnTypes)) {
+            String value = getEditableApnType(mDefaultApnTypes);
+            mApnType.setText(value);
+            mApnType.setSummary(value);
+        }
+
+        String protocol = protocolDescription(mDefaultApnProtocol, mProtocol);
+        if (TextUtils.isEmpty(mProtocol.getValue()) && !TextUtils.isEmpty(protocol)) {
+            mProtocol.setValue(mDefaultApnProtocol);
+            mProtocol.setSummary(protocol);
+        }
+
+        String roamingProtocol = protocolDescription(mDefaultApnRoamingProtocol, mRoamingProtocol);
+        if (TextUtils.isEmpty(mRoamingProtocol.getValue()) && !TextUtils.isEmpty(roamingProtocol)) {
+            mRoamingProtocol.setValue(mDefaultApnRoamingProtocol);
+            mRoamingProtocol.setSummary(roamingProtocol);
+        }
+    }
+
+    /**
+     * Dialog of error message.
+     */
+    public static class ErrorDialog extends InstrumentedDialogFragment {
+        /**
+         * Show error dialog.
+         */
+        public static void showError(ApnEditor editor) {
+            final ErrorDialog dialog = new ErrorDialog();
+            dialog.setTargetFragment(editor, 0);
+            dialog.show(editor.getFragmentManager(), "error");
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final String msg = ((ApnEditor) getTargetFragment()).validateApnData();
+
+            return new AlertDialog.Builder(getContext())
+                    .setTitle(R.string.error_title)
+                    .setPositiveButton(android.R.string.ok, null)
+                    .setMessage(msg)
+                    .create();
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return SettingsEnums.DIALOG_APN_EDITOR_ERROR;
+        }
+    }
+
+    @VisibleForTesting
+    ApnData getApnDataFromUri(Uri uri) {
+        ApnData apnData = null;
+        try (Cursor cursor = getContentResolver().query(
+                uri,
+                sProjection,
+                null /* selection */,
+                null /* selectionArgs */,
+                null /* sortOrder */)) {
+            if (cursor != null) {
+                cursor.moveToFirst();
+                apnData = new ApnData(uri, cursor);
+            }
+        }
+
+        if (apnData == null) {
+            Log.d(TAG, "Can't get apnData from Uri " + uri);
+        }
+
+        return apnData;
+    }
+
+    @VisibleForTesting
+    static class ApnData {
+        /**
+         * The uri correspond to a database row of the apn data. This should be null if the apn
+         * is not in the database.
+         */
+        Uri mUri;
+
+        /** Each element correspond to a column of the database row. */
+        Object[] mData;
+
+        ApnData(int numberOfField) {
+            mData = new Object[numberOfField];
+        }
+
+        ApnData(Uri uri, Cursor cursor) {
+            mUri = uri;
+            mData = new Object[cursor.getColumnCount()];
+            for (int i = 0; i < mData.length; i++) {
+                switch (cursor.getType(i)) {
+                    case Cursor.FIELD_TYPE_FLOAT:
+                        mData[i] = cursor.getFloat(i);
+                        break;
+                    case Cursor.FIELD_TYPE_INTEGER:
+                        mData[i] = cursor.getInt(i);
+                        break;
+                    case Cursor.FIELD_TYPE_STRING:
+                        mData[i] = cursor.getString(i);
+                        break;
+                    case Cursor.FIELD_TYPE_BLOB:
+                        mData[i] = cursor.getBlob(i);
+                        break;
+                    default:
+                        mData[i] = null;
+                }
+            }
+        }
+
+        Uri getUri() {
+            return mUri;
+        }
+
+        void setUri(Uri uri) {
+            mUri = uri;
+        }
+
+        Integer getInteger(int index) {
+            return (Integer) mData[index];
+        }
+
+        Integer getInteger(int index, Integer defaultValue) {
+            final Integer val = getInteger(index);
+            return val == null ? defaultValue : val;
+        }
+
+        String getString(int index) {
+            return (String) mData[index];
+        }
+    }
+
+    private static int getBitmaskForTech(int radioTech) {
+        if (radioTech >= 1) {
+            return (1 << (radioTech - 1));
+        }
+        return 0;
+    }
+
+    private static boolean bitmaskHasTech(int bearerBitmask, int radioTech) {
+        if (bearerBitmask == 0) {
+            return true;
+        } else if (radioTech >= 1) {
+            return ((bearerBitmask & (1 << (radioTech - 1))) != 0);
+        }
+        return false;
+    }
+}
diff --git a/src/com/android/settings/network/apn/ApnPreference.java b/src/com/android/settings/network/apn/ApnPreference.java
new file mode 100755
index 0000000..f277db0
--- /dev/null
+++ b/src/com/android/settings/network/apn/ApnPreference.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2009 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.apn;
+
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.Telephony;
+import android.telephony.SubscriptionManager;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.CompoundButton;
+import android.widget.RadioButton;
+import android.widget.RelativeLayout;
+import android.widget.Toast;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+/**
+ * Preference of APN UI entry
+ */
+public class ApnPreference extends Preference implements CompoundButton.OnCheckedChangeListener,
+        View.OnClickListener {
+    private static final  String TAG = "ApnPreference";
+
+    private int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+
+    /**
+     * Constructor of Preference
+     */
+    public ApnPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    /**
+     * Constructor of Preference
+     */
+    public ApnPreference(Context context, AttributeSet attrs) {
+        this(context, attrs, R.attr.apnPreferenceStyle);
+    }
+
+    /**
+     * Constructor of Preference
+     */
+    public ApnPreference(Context context) {
+        this(context, null);
+    }
+
+    private static String sSelectedKey = null;
+    private static CompoundButton sCurrentChecked = null;
+    private boolean mProtectFromCheckedChange = false;
+    private boolean mSelectable = true;
+    private boolean mHideDetails = false;
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
+
+        final RelativeLayout textArea = (RelativeLayout) view.findViewById(R.id.text_layout);
+        textArea.setOnClickListener(this);
+
+        final View widget = view.findViewById(R.id.apn_radiobutton);
+        if ((widget != null) && widget instanceof RadioButton) {
+            final RadioButton rb = (RadioButton) widget;
+            if (mSelectable) {
+                rb.setOnCheckedChangeListener(this);
+
+                final boolean isChecked = getKey().equals(sSelectedKey);
+                if (isChecked) {
+                    sCurrentChecked = rb;
+                    sSelectedKey = getKey();
+                }
+
+                mProtectFromCheckedChange = true;
+                rb.setChecked(isChecked);
+                mProtectFromCheckedChange = false;
+                rb.setVisibility(View.VISIBLE);
+            } else {
+                rb.setVisibility(View.GONE);
+            }
+        }
+    }
+
+    /**
+     * Return the preference is checked or not.
+     */
+    public boolean isChecked() {
+        return getKey().equals(sSelectedKey);
+    }
+
+    /**
+     * Set preference checked.
+     */
+    public void setChecked() {
+        sSelectedKey = getKey();
+    }
+
+    /**
+     * Change the preference status.
+     */
+    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        Log.i(TAG, "ID: " + getKey() + " :" + isChecked);
+        if (mProtectFromCheckedChange) {
+            return;
+        }
+
+        if (isChecked) {
+            if (sCurrentChecked != null) {
+                sCurrentChecked.setChecked(false);
+            }
+            sCurrentChecked = buttonView;
+            sSelectedKey = getKey();
+            callChangeListener(sSelectedKey);
+        } else {
+            sCurrentChecked = null;
+            sSelectedKey = null;
+        }
+    }
+
+    @Override
+    public void onClick(View layoutView) {
+        super.onClick();
+        final Context context = getContext();
+        final int pos = Integer.parseInt(getKey());
+        if (context == null) {
+            Log.w(TAG, "No context available for pos=" + pos);
+            return;
+        }
+
+        if (mHideDetails) {
+            Toast.makeText(context, context.getString(
+                    R.string.cannot_change_apn_toast), Toast.LENGTH_LONG).show();
+            return;
+        }
+        final Uri url = ContentUris.withAppendedId(Telephony.Carriers.CONTENT_URI, pos);
+        final Intent editIntent = new Intent(Intent.ACTION_EDIT, url);
+        editIntent.putExtra(ApnSettings.SUB_ID, mSubId);
+        editIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        context.startActivity(editIntent);
+    }
+
+    public void setSelectable(boolean selectable) {
+        mSelectable = selectable;
+    }
+
+    public boolean getSelectable() {
+        return mSelectable;
+    }
+
+    public void setSubId(int subId) {
+        mSubId = subId;
+    }
+
+    /**
+     * Hide details
+     */
+    public void setHideDetails() {
+        mHideDetails = true;
+    }
+}
diff --git a/src/com/android/settings/network/apn/ApnSettings.java b/src/com/android/settings/network/apn/ApnSettings.java
new file mode 100755
index 0000000..f5bb1be
--- /dev/null
+++ b/src/com/android/settings/network/apn/ApnSettings.java
@@ -0,0 +1,546 @@
+/*
+ * Copyright (C) 2008 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.apn;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.app.ProgressDialog;
+import android.app.settings.SettingsEnums;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+import android.os.PersistableBundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Telephony;
+import android.telephony.CarrierConfigManager;
+import android.telephony.PhoneStateListener;
+import android.telephony.PreciseDataConnectionState;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.MotionEvent;
+import android.widget.Toast;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceGroup;
+
+import com.android.settings.R;
+import com.android.settings.RestrictedSettingsFragment;
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import java.util.ArrayList;
+
+/** Handle each different apn setting. */
+public class ApnSettings extends RestrictedSettingsFragment
+        implements Preference.OnPreferenceChangeListener {
+    static final String TAG = "ApnSettings";
+
+    public static final String EXTRA_POSITION = "position";
+    public static final String RESTORE_CARRIERS_URI =
+            "content://telephony/carriers/restore";
+    public static final String PREFERRED_APN_URI =
+            "content://telephony/carriers/preferapn";
+
+    public static final String APN_ID = "apn_id";
+    public static final String SUB_ID = "sub_id";
+    public static final String MVNO_TYPE = "mvno_type";
+    public static final String MVNO_MATCH_DATA = "mvno_match_data";
+
+    private static final String[] CARRIERS_PROJECTION = new String[] {
+            Telephony.Carriers._ID,
+            Telephony.Carriers.NAME,
+            Telephony.Carriers.APN,
+            Telephony.Carriers.TYPE,
+            Telephony.Carriers.MVNO_TYPE,
+            Telephony.Carriers.MVNO_MATCH_DATA,
+            Telephony.Carriers.EDITED_STATUS,
+    };
+
+    private static final int ID_INDEX = 0;
+    private static final int NAME_INDEX = 1;
+    private static final int APN_INDEX = 2;
+    private static final int TYPES_INDEX = 3;
+    private static final int MVNO_TYPE_INDEX = 4;
+    private static final int MVNO_MATCH_DATA_INDEX = 5;
+    private static final int EDITED_INDEX = 6;
+
+    private static final int MENU_NEW = Menu.FIRST;
+    private static final int MENU_RESTORE = Menu.FIRST + 1;
+
+    private static final int EVENT_RESTORE_DEFAULTAPN_START = 1;
+    private static final int EVENT_RESTORE_DEFAULTAPN_COMPLETE = 2;
+
+    private static final int DIALOG_RESTORE_DEFAULTAPN = 1001;
+
+    private static final Uri DEFAULTAPN_URI = Uri.parse(RESTORE_CARRIERS_URI);
+    private static final Uri PREFERAPN_URI = Uri.parse(PREFERRED_APN_URI);
+
+    private boolean mRestoreDefaultApnMode;
+
+    private UserManager mUserManager;
+    private TelephonyManager mTelephonyManager;
+    private RestoreApnUiHandler mRestoreApnUiHandler;
+    private RestoreApnProcessHandler mRestoreApnProcessHandler;
+    private HandlerThread mRestoreDefaultApnThread;
+    private SubscriptionInfo mSubscriptionInfo;
+    private int mSubId;
+    private int mPhoneId;
+    private String mMvnoType;
+    private String mMvnoMatchData;
+
+    private String mSelectedKey;
+
+    private IntentFilter mIntentFilter;
+
+    private boolean mUnavailable;
+
+    private boolean mHideImsApn;
+    private boolean mAllowAddingApns;
+    private boolean mHidePresetApnDetails;
+
+    public ApnSettings() {
+        super(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS);
+    }
+
+    private final PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
+        @Override
+        public void onPreciseDataConnectionStateChanged(
+                PreciseDataConnectionState dataConnectionState) {
+            if (dataConnectionState.getState() == TelephonyManager.DATA_CONNECTED) {
+                if (!mRestoreDefaultApnMode) {
+                    fillList();
+                } else {
+                    showDialog(DIALOG_RESTORE_DEFAULTAPN);
+                }
+            }
+        }
+    };
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.getAction().equals(
+                    TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED)) {
+                if (mRestoreDefaultApnMode) {
+                    return;
+                }
+                final int extraSubId = intent.getIntExtra(TelephonyManager.EXTRA_SUBSCRIPTION_ID,
+                        SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+                if (SubscriptionManager.isValidSubscriptionId(extraSubId)
+                        && mPhoneId == SubscriptionUtil.getPhoneId(context, extraSubId)
+                        && extraSubId != mSubId) {
+                    // subscription has changed
+                    mSubId = extraSubId;
+                    mSubscriptionInfo = getSubscriptionInfo(mSubId);
+                    restartPhoneStateListener(mSubId);
+                }
+                fillList();
+            }
+        }
+    };
+
+    private void restartPhoneStateListener(int subId) {
+        if (mRestoreDefaultApnMode) {
+            return;
+        }
+
+        final TelephonyManager updatedTelephonyManager =
+                mTelephonyManager.createForSubscriptionId(subId);
+
+        // restart monitoring when subscription has been changed
+        mTelephonyManager.listen(mPhoneStateListener,
+                PhoneStateListener.LISTEN_NONE);
+
+        mTelephonyManager = updatedTelephonyManager;
+
+        mTelephonyManager.listen(mPhoneStateListener,
+                PhoneStateListener.LISTEN_PRECISE_DATA_CONNECTION_STATE);
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.APN;
+    }
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        final Activity activity = getActivity();
+        mSubId = activity.getIntent().getIntExtra(SUB_ID,
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        mPhoneId = SubscriptionUtil.getPhoneId(activity, mSubId);
+        mIntentFilter = new IntentFilter(
+                TelephonyManager.ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED);
+
+        setIfOnlyAvailableForAdmins(true);
+
+        mSubscriptionInfo = getSubscriptionInfo(mSubId);
+        mTelephonyManager = activity.getSystemService(TelephonyManager.class);
+
+        final CarrierConfigManager configManager = (CarrierConfigManager)
+                getSystemService(Context.CARRIER_CONFIG_SERVICE);
+        final PersistableBundle b = configManager.getConfigForSubId(mSubId);
+        mHideImsApn = b.getBoolean(CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL);
+        mAllowAddingApns = b.getBoolean(CarrierConfigManager.KEY_ALLOW_ADDING_APNS_BOOL);
+        if (mAllowAddingApns) {
+            final String[] readOnlyApnTypes = b.getStringArray(
+                    CarrierConfigManager.KEY_READ_ONLY_APN_TYPES_STRING_ARRAY);
+            // if no apn type can be edited, do not allow adding APNs
+            if (ApnEditor.hasAllApns(readOnlyApnTypes)) {
+                Log.d(TAG, "not allowing adding APN because all APN types are read only");
+                mAllowAddingApns = false;
+            }
+        }
+        mHidePresetApnDetails = b.getBoolean(CarrierConfigManager.KEY_HIDE_PRESET_APN_DETAILS_BOOL);
+        mUserManager = UserManager.get(activity);
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        getEmptyTextView().setText(R.string.apn_settings_not_available);
+        mUnavailable = isUiRestricted();
+        setHasOptionsMenu(!mUnavailable);
+        if (mUnavailable) {
+            addPreferencesFromResource(R.xml.placeholder_prefs);
+            return;
+        }
+
+        addPreferencesFromResource(R.xml.apn_settings);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (mUnavailable) {
+            return;
+        }
+
+        getActivity().registerReceiver(mReceiver, mIntentFilter);
+
+        restartPhoneStateListener(mSubId);
+
+        if (!mRestoreDefaultApnMode) {
+            fillList();
+        }
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        if (mUnavailable) {
+            return;
+        }
+
+        getActivity().unregisterReceiver(mReceiver);
+
+        mTelephonyManager.listen(mPhoneStateListener,
+                PhoneStateListener.LISTEN_NONE);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        if (mRestoreDefaultApnThread != null) {
+            mRestoreDefaultApnThread.quit();
+        }
+    }
+
+    @Override
+    public EnforcedAdmin getRestrictionEnforcedAdmin() {
+        final UserHandle user = UserHandle.of(mUserManager.getUserHandle());
+        if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, user)
+                && !mUserManager.hasBaseUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
+                        user)) {
+            return EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN;
+        }
+        return null;
+    }
+
+    private SubscriptionInfo getSubscriptionInfo(int subId) {
+        return SubscriptionManager.from(getActivity()).getActiveSubscriptionInfo(subId);
+    }
+
+    private void fillList() {
+        final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
+                : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+        final Uri simApnUri = Uri.withAppendedPath(Telephony.Carriers.SIM_APN_URI,
+                String.valueOf(subId));
+        final StringBuilder where =
+                new StringBuilder("NOT (type='ia' AND (apn=\"\" OR apn IS NULL)) AND "
+                + "user_visible!=0");
+
+        if (mHideImsApn) {
+            where.append(" AND NOT (type='ims')");
+        }
+
+        final Cursor cursor = getContentResolver().query(simApnUri,
+                CARRIERS_PROJECTION, where.toString(), null,
+                Telephony.Carriers.DEFAULT_SORT_ORDER);
+
+        if (cursor != null) {
+            final PreferenceGroup apnPrefList = (PreferenceGroup) findPreference("apn_list");
+            apnPrefList.removeAll();
+
+            final ArrayList<ApnPreference> apnList = new ArrayList<ApnPreference>();
+            final ArrayList<ApnPreference> mmsApnList = new ArrayList<ApnPreference>();
+
+            mSelectedKey = getSelectedApnKey();
+            cursor.moveToFirst();
+            while (!cursor.isAfterLast()) {
+                final String name = cursor.getString(NAME_INDEX);
+                final String apn = cursor.getString(APN_INDEX);
+                final String key = cursor.getString(ID_INDEX);
+                final String type = cursor.getString(TYPES_INDEX);
+                final int edited = cursor.getInt(EDITED_INDEX);
+                mMvnoType = cursor.getString(MVNO_TYPE_INDEX);
+                mMvnoMatchData = cursor.getString(MVNO_MATCH_DATA_INDEX);
+
+                final ApnPreference pref = new ApnPreference(getPrefContext());
+
+                pref.setKey(key);
+                pref.setTitle(name);
+                pref.setPersistent(false);
+                pref.setOnPreferenceChangeListener(this);
+                pref.setSubId(subId);
+                if (mHidePresetApnDetails && edited == Telephony.Carriers.UNEDITED) {
+                    pref.setHideDetails();
+                } else {
+                    pref.setSummary(apn);
+                }
+
+                final boolean selectable = ((type == null) || !type.equals("mms"));
+                pref.setSelectable(selectable);
+                if (selectable) {
+                    if ((mSelectedKey != null) && mSelectedKey.equals(key)) {
+                        pref.setChecked();
+                    }
+                    apnList.add(pref);
+                } else {
+                    mmsApnList.add(pref);
+                }
+                cursor.moveToNext();
+            }
+            cursor.close();
+
+            for (Preference preference : apnList) {
+                apnPrefList.addPreference(preference);
+            }
+            for (Preference preference : mmsApnList) {
+                apnPrefList.addPreference(preference);
+            }
+        }
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        if (!mUnavailable) {
+            if (mAllowAddingApns) {
+                menu.add(0, MENU_NEW, 0,
+                        getResources().getString(R.string.menu_new))
+                        .setIcon(R.drawable.ic_add_24dp)
+                        .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            }
+            menu.add(0, MENU_RESTORE, 0,
+                    getResources().getString(R.string.menu_restore))
+                    .setIcon(android.R.drawable.ic_menu_upload);
+        }
+
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case MENU_NEW:
+                addNewApn();
+                return true;
+            case MENU_RESTORE:
+                restoreDefaultApn();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private void addNewApn() {
+        final Intent intent = new Intent(Intent.ACTION_INSERT, Telephony.Carriers.CONTENT_URI);
+        final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
+                : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+        intent.putExtra(SUB_ID, subId);
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        if (!TextUtils.isEmpty(mMvnoType) && !TextUtils.isEmpty(mMvnoMatchData)) {
+            intent.putExtra(MVNO_TYPE, mMvnoType);
+            intent.putExtra(MVNO_MATCH_DATA, mMvnoMatchData);
+        }
+        startActivity(intent);
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        Log.d(TAG, "onPreferenceChange(): Preference - " + preference
+                + ", newValue - " + newValue + ", newValue type - "
+                + newValue.getClass());
+        if (newValue instanceof String) {
+            setSelectedApnKey((String) newValue);
+        }
+
+        return true;
+    }
+
+    private void setSelectedApnKey(String key) {
+        mSelectedKey = key;
+        final ContentResolver resolver = getContentResolver();
+
+        final ContentValues values = new ContentValues();
+        values.put(APN_ID, mSelectedKey);
+        resolver.update(getUriForCurrSubId(PREFERAPN_URI), values, null, null);
+    }
+
+    private String getSelectedApnKey() {
+        String key = null;
+
+        final Cursor cursor = getContentResolver().query(getUriForCurrSubId(PREFERAPN_URI),
+                new String[] {"_id"}, null, null, Telephony.Carriers.DEFAULT_SORT_ORDER);
+        if (cursor.getCount() > 0) {
+            cursor.moveToFirst();
+            key = cursor.getString(ID_INDEX);
+        }
+        cursor.close();
+        return key;
+    }
+
+    private boolean restoreDefaultApn() {
+        showDialog(DIALOG_RESTORE_DEFAULTAPN);
+        mRestoreDefaultApnMode = true;
+
+        if (mRestoreApnUiHandler == null) {
+            mRestoreApnUiHandler = new RestoreApnUiHandler();
+        }
+
+        if (mRestoreApnProcessHandler == null || mRestoreDefaultApnThread == null) {
+            mRestoreDefaultApnThread = new HandlerThread(
+                    "Restore default APN Handler: Process Thread");
+            mRestoreDefaultApnThread.start();
+            mRestoreApnProcessHandler = new RestoreApnProcessHandler(
+                    mRestoreDefaultApnThread.getLooper(), mRestoreApnUiHandler);
+        }
+
+        mRestoreApnProcessHandler
+                .sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_START);
+        return true;
+    }
+
+    // Append subId to the Uri
+    private Uri getUriForCurrSubId(Uri uri) {
+        final int subId = mSubscriptionInfo != null ? mSubscriptionInfo.getSubscriptionId()
+                : SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+        if (SubscriptionManager.isValidSubscriptionId(subId)) {
+            return Uri.withAppendedPath(uri, "subId/" + String.valueOf(subId));
+        } else {
+            return uri;
+        }
+    }
+
+    private class RestoreApnUiHandler extends Handler {
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case EVENT_RESTORE_DEFAULTAPN_COMPLETE:
+                    final Activity activity = getActivity();
+                    if (activity == null) {
+                        mRestoreDefaultApnMode = false;
+                        return;
+                    }
+                    fillList();
+                    getPreferenceScreen().setEnabled(true);
+                    mRestoreDefaultApnMode = false;
+                    removeDialog(DIALOG_RESTORE_DEFAULTAPN);
+                    Toast.makeText(
+                        activity,
+                        getResources().getString(
+                                R.string.restore_default_apn_completed),
+                        Toast.LENGTH_LONG).show();
+                    break;
+            }
+        }
+    }
+
+    private class RestoreApnProcessHandler extends Handler {
+        private Handler mRestoreApnUiHandler;
+
+        RestoreApnProcessHandler(Looper looper, Handler restoreApnUiHandler) {
+            super(looper);
+            this.mRestoreApnUiHandler = restoreApnUiHandler;
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case EVENT_RESTORE_DEFAULTAPN_START:
+                    final ContentResolver resolver = getContentResolver();
+                    resolver.delete(getUriForCurrSubId(DEFAULTAPN_URI), null, null);
+                    mRestoreApnUiHandler
+                        .sendEmptyMessage(EVENT_RESTORE_DEFAULTAPN_COMPLETE);
+                    break;
+            }
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(int id) {
+        if (id == DIALOG_RESTORE_DEFAULTAPN) {
+            final ProgressDialog dialog = new ProgressDialog(getActivity()) {
+                public boolean onTouchEvent(MotionEvent event) {
+                    return true;
+                }
+            };
+            dialog.setMessage(getResources().getString(R.string.restore_default_apn));
+            dialog.setCancelable(false);
+            return dialog;
+        }
+        return null;
+    }
+
+    @Override
+    public int getDialogMetricsCategory(int dialogId) {
+        if (dialogId == DIALOG_RESTORE_DEFAULTAPN) {
+            return SettingsEnums.DIALOG_APN_RESTORE_DEFAULT;
+        }
+        return 0;
+    }
+}
diff --git a/src/com/android/settings/network/telephony/AbstractMobileNetworkSettings.java b/src/com/android/settings/network/telephony/AbstractMobileNetworkSettings.java
index aa84cc1..ff831e8 100644
--- a/src/com/android/settings/network/telephony/AbstractMobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/AbstractMobileNetworkSettings.java
@@ -132,7 +132,6 @@
         final TelephonyStatusControlSession session =
                 setTelephonyAvailabilityStatus(controllers);
 
-
         final PreferenceScreen screen = getPreferenceScreen();
         controllers.forEach(controller -> {
             controller.displayPreference(screen);
diff --git a/src/com/android/settings/network/telephony/AlertDialogFragment.java b/src/com/android/settings/network/telephony/AlertDialogFragment.java
new file mode 100644
index 0000000..5940789
--- /dev/null
+++ b/src/com/android/settings/network/telephony/AlertDialogFragment.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+/** Fragment to show an alert dialog which only has the positive button. */
+public class AlertDialogFragment extends BaseDialogFragment
+        implements DialogInterface.OnClickListener {
+    private static final String TAG = "AlertDialogFragment";
+
+    // Arguments
+    private static final String ARG_TITLE = "title";
+    private static final String ARG_MSG = "msg";
+
+    /**
+     * @param activity
+     * @param title
+     * @param msg
+     */
+    public static void show(Activity activity, String title, String msg) {
+        AlertDialogFragment fragment = new AlertDialogFragment();
+        Bundle arguments = new Bundle();
+        arguments.putString(ARG_TITLE, title);
+        arguments.putString(ARG_MSG, msg);
+        fragment.setArguments(arguments);
+        fragment.show(activity.getFragmentManager(), TAG);
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        AlertDialog.Builder builder =
+                new AlertDialog.Builder(getContext())
+                        .setTitle(getArguments().getString(ARG_TITLE))
+                        .setPositiveButton(android.R.string.ok, this);
+        if (!TextUtils.isEmpty(getArguments().getString(ARG_MSG))) {
+            builder.setMessage(getArguments().getString(ARG_MSG));
+        }
+        return builder.show();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (getActivity() != null) {
+            getActivity().finish();
+        }
+        super.dismiss();
+    }
+}
diff --git a/src/com/android/settings/network/telephony/ApnPreferenceController.java b/src/com/android/settings/network/telephony/ApnPreferenceController.java
index 8442de2..0e0e5d1 100644
--- a/src/com/android/settings/network/telephony/ApnPreferenceController.java
+++ b/src/com/android/settings/network/telephony/ApnPreferenceController.java
@@ -32,7 +32,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.SettingsActivity;
-import com.android.settings.network.ApnSettings;
+import com.android.settings.network.apn.ApnSettings;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
diff --git a/src/com/android/settings/network/telephony/BaseDialogFragment.java b/src/com/android/settings/network/telephony/BaseDialogFragment.java
new file mode 100644
index 0000000..7da3259
--- /dev/null
+++ b/src/com/android/settings/network/telephony/BaseDialogFragment.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.Activity;
+import android.app.DialogFragment;
+import android.app.Fragment;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Base dialog fragment class with the functionality to make a fragment or an activity as a listener
+ * which can survive through the activity restarts.
+ */
+public abstract class BaseDialogFragment extends DialogFragment {
+    // Tags for the listener which receives event callbacks.
+    private static final String ARG_LISTENER_TAG = "listener_tag";
+    private static final String ARG_IN_CALLER_TAG = "in_caller_tag";
+
+    /**
+     * @param activity The caller activity or the activity attached with the fragment.
+     * @param listener The original caller, that is, the listener. The listener can be the fragment
+     *     to receive event callbacks. If it is null, will use the activity to handle the event
+     *     callback instead.
+     * @param callbackInterfaceClass The interface that the listener should implements.
+     * @param arguments The arguments bundle of the dispatcher fragment used to store the listener's
+     *     info.
+     * @param tagInCaller An integer given by the listener to distinguish the action when calling
+     *     the listener's callback function.
+     */
+    protected static <T> void setListener(
+            Activity activity,
+            @Nullable Fragment listener,
+            Class<T> callbackInterfaceClass,
+            int tagInCaller,
+            Bundle arguments) {
+        checkValidity(activity, listener, callbackInterfaceClass);
+
+        if (listener != null && listener.getParentFragment() != null) {
+            throw new IllegalArgumentException("The listener must be attached to an activity.");
+        }
+        arguments.putInt(ARG_IN_CALLER_TAG, tagInCaller);
+        if (listener != null) {
+            arguments.putString(ARG_LISTENER_TAG, listener.getTag());
+        }
+    }
+
+    /**
+     * @param callbackInterfaceClass The interface that the listener should implements.
+     * @param <T> Template type.
+     * @return The listener class.
+     */
+    @SuppressWarnings("unchecked")
+    protected <T> T getListener(Class<T> callbackInterfaceClass) {
+        Object listener;
+        String listenerTag = getArguments().getString(ARG_LISTENER_TAG);
+        if (listenerTag == null) {
+            listener = getActivity();
+        } else {
+            listener = getActivity().getFragmentManager().findFragmentByTag(listenerTag);
+        }
+        if (callbackInterfaceClass.isInstance(listener)) {
+            return (T) listener;
+        }
+        throw new IllegalArgumentException("The caller should implement the callback function.");
+    }
+
+    /** @return The tag set in the listener. */
+    protected int getTagInCaller() {
+        return getArguments().getInt(ARG_IN_CALLER_TAG);
+    }
+
+    private static <T> void checkValidity(
+            Activity activity, @Nullable Fragment listener, Class<T> callbackInterfaceClass) {
+        if (listener != null) {
+            if (!callbackInterfaceClass.isInstance(listener)) {
+                throw new IllegalArgumentException(
+                        "The listener fragment should implement the callback function.");
+            }
+        } else {
+            if (!callbackInterfaceClass.isInstance(activity)) {
+                throw new IllegalArgumentException(
+                        "The caller activity should implement the callback function.");
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java b/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
index a6db773..aec3648 100644
--- a/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
+++ b/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceController.java
@@ -20,6 +20,7 @@
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
 
 import com.android.settings.core.BasePreferenceController;
 
@@ -49,6 +50,6 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        return TextUtils.isEmpty(getSummary()) ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
     }
 }
diff --git a/src/com/android/settings/network/telephony/ConfirmDialogFragment.java b/src/com/android/settings/network/telephony/ConfirmDialogFragment.java
new file mode 100644
index 0000000..1ba99c5
--- /dev/null
+++ b/src/com/android/settings/network/telephony/ConfirmDialogFragment.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+
+/** Fragment to show a confirm dialog. The caller should implement onConfirmListener. */
+public class ConfirmDialogFragment extends BaseDialogFragment
+        implements DialogInterface.OnClickListener {
+    private static final String TAG = "ConfirmDialogFragment";
+    private static final String ARG_TITLE = "title";
+    private static final String ARG_MSG = "msg";
+    private static final String ARG_POS_BUTTON_STRING = "pos_button_string";
+    private static final String ARG_NEG_BUTTON_STRING = "neg_button_string";
+
+    /**
+     * Interface defining the method that will be invoked when the user has done with the dialog.
+     */
+    public interface OnConfirmListener {
+        /**
+         * @param tag The tag in the caller.
+         * @param confirmed True if the user has clicked the positive button. False if the user has
+         *     clicked the negative button or cancel the dialog.
+         */
+        void onConfirm(int tag, boolean confirmed);
+    }
+
+    /** Displays a confirmation dialog which has confirm and cancel buttons. */
+    public static <T> void show(
+            Activity activity,
+            Class<T> callbackInterfaceClass,
+            int tagInCaller,
+            String title,
+            String msg,
+            String posButtonString,
+            String negButtonString) {
+        ConfirmDialogFragment fragment = new ConfirmDialogFragment();
+        Bundle arguments = new Bundle();
+        arguments.putString(ARG_TITLE, title);
+        arguments.putCharSequence(ARG_MSG, msg);
+        arguments.putString(ARG_POS_BUTTON_STRING, posButtonString);
+        arguments.putString(ARG_NEG_BUTTON_STRING, negButtonString);
+        setListener(activity, null, callbackInterfaceClass, tagInCaller, arguments);
+        fragment.setArguments(arguments);
+        fragment.show(activity.getFragmentManager(), TAG);
+    }
+
+    @Override
+    public final Dialog onCreateDialog(Bundle savedInstanceState) {
+        String title = getArguments().getString(ARG_TITLE);
+        String message = getArguments().getString(ARG_MSG);
+        String posBtnString = getArguments().getString(ARG_POS_BUTTON_STRING);
+        String negBtnString = getArguments().getString(ARG_NEG_BUTTON_STRING);
+
+        Log.i("Showing dialog with title = %s", title);
+        AlertDialog.Builder builder =
+                new AlertDialog.Builder(getContext())
+                        .setTitle(title)
+                        .setPositiveButton(posBtnString, this)
+                        .setNegativeButton(negBtnString, this);
+
+        if (!TextUtils.isEmpty(message)) {
+            builder.setMessage(message);
+        }
+        AlertDialog dialog = builder.show();
+        dialog.setCanceledOnTouchOutside(false);
+        return dialog;
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        informCaller(which == DialogInterface.BUTTON_POSITIVE);
+    }
+
+    @Override
+    public void onCancel(DialogInterface dialog) {
+        informCaller(false);
+    }
+
+    private void informCaller(boolean confirmed) {
+        OnConfirmListener listener = getListener(OnConfirmListener.class);
+        if (listener == null) {
+            return;
+        }
+        listener.onConfirm(getTagInCaller(), confirmed);
+    }
+}
diff --git a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
index 6eebe6b..eead41f 100644
--- a/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
+++ b/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceController.java
@@ -98,8 +98,11 @@
     @Override
     public int getAvailabilityStatus(int subId) {
         PersistableBundle bundle = mCarrierConfigManager.getConfigForSubId(subId);
-        boolean shouldShowPresence = bundle != null && bundle.getBoolean(
-                CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/);
+        boolean shouldShowPresence = bundle != null
+                && (bundle.getBoolean(
+                CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/)
+                || bundle.getBoolean(
+                CarrierConfigManager.Ims.KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL, false /*default*/));
         return shouldShowPresence ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
     }
 
diff --git a/src/com/android/settings/network/telephony/CrossSimCallingPreferenceController.java b/src/com/android/settings/network/telephony/CrossSimCallingPreferenceController.java
new file mode 100644
index 0000000..01c9707
--- /dev/null
+++ b/src/com/android/settings/network/telephony/CrossSimCallingPreferenceController.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.content.Context;
+
+/**
+ * Preference controller for "Cross SIM Calling"
+ **/
+public class CrossSimCallingPreferenceController extends TelephonyTogglePreferenceController {
+
+    /**
+     * Class constructor of cross sim calling.
+     *
+     * @param context of settings
+     * @param key assigned within UI entry of XML file
+     **/
+    public CrossSimCallingPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    /**
+     * Initialization based on given subscription id.
+     *
+     * @param subId is the subscription id
+     * @return this instance after initialization
+     **/
+    public CrossSimCallingPreferenceController init(int subId) {
+        return this;
+    }
+
+    @Override
+    public int getAvailabilityStatus(int subId) {
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+
+    /**
+     * Implementation of abstract methods
+     **/
+    public boolean setChecked(boolean isChecked) {
+        return false;
+    }
+
+    /**
+     * Implementation of abstract methods
+     **/
+    public boolean isChecked() {
+        return false;
+    }
+
+}
diff --git a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
index 625f863..1cd0e8e 100644
--- a/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
+++ b/src/com/android/settings/network/telephony/DataDuringCallsPreferenceController.java
@@ -90,12 +90,15 @@
 
     @Override
     public boolean isChecked() {
-        return mManager.isDataAllowedInVoiceCall();
+        return mManager.isMobileDataPolicyEnabled(
+                TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL);
     }
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        mManager.setDataAllowedDuringVoiceCall(isChecked);
+        mManager.setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_DATA_ON_NON_DEFAULT_DURING_VOICE_CALL,
+                isChecked);
         return true;
     }
 
diff --git a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
index 1d82f65..560922c 100644
--- a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java
@@ -36,6 +36,7 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.network.SubscriptionsChangeListener;
 
@@ -83,10 +84,14 @@
     /** Called to change the default subscription for the service. */
     protected abstract void setDefaultSubscription(int subscriptionId);
 
+    protected boolean isAskEverytimeSupported() {
+        return true;
+    }
+
     @Override
     public int getAvailabilityStatus(int subId) {
         final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mManager);
-        if (subs.size() > 1) {
+        if (subs.size() > 1 || Utils.isProviderModelEnabled(mContext)) {
             return AVAILABLE;
         } else {
             return CONDITIONALLY_UNAVAILABLE;
@@ -123,7 +128,11 @@
             // display subscription based account
             return info.getDisplayName();
         } else {
-            return mContext.getString(R.string.calls_and_sms_ask_every_time);
+            if (isAskEverytimeSupported()) {
+                return mContext.getString(R.string.calls_and_sms_ask_every_time);
+            } else {
+                return "";
+            }
         }
     }
 
@@ -149,6 +158,12 @@
         final ArrayList<CharSequence> displayNames = new ArrayList<>();
         final ArrayList<CharSequence> subscriptionIds = new ArrayList<>();
 
+        if (Utils.isProviderModelEnabled(mContext) && subs.size() == 1) {
+            mPreference.setEnabled(false);
+            mPreference.setSummary(subs.get(0).getDisplayName());
+            return;
+        }
+
         final int serviceDefaultSubId = getDefaultSubscriptionId();
         boolean subIsAvailable = false;
 
@@ -163,9 +178,12 @@
                 subIsAvailable = true;
             }
         }
-        // Add the extra "Ask every time" value at the end.
-        displayNames.add(mContext.getString(R.string.calls_and_sms_ask_every_time));
-        subscriptionIds.add(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+
+        if (isAskEverytimeSupported()) {
+            // Add the extra "Ask every time" value at the end.
+            displayNames.add(mContext.getString(R.string.calls_and_sms_ask_every_time));
+            subscriptionIds.add(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+        }
 
         mPreference.setEntries(displayNames.toArray(new CharSequence[0]));
         mPreference.setEntryValues(subscriptionIds.toArray(new CharSequence[0]));
diff --git a/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
new file mode 100644
index 0000000..8257bf3
--- /dev/null
+++ b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionDialogActivity.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.util.Log;
+
+import com.android.settings.R;
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.SubscriptionUtil;
+
+import java.util.List;
+
+/** This dialog activity handles deleting eSIM profiles. */
+public class DeleteEuiccSubscriptionDialogActivity extends SubscriptionActionDialogActivity
+        implements SidecarFragment.Listener, ConfirmDialogFragment.OnConfirmListener {
+
+    private static final String TAG = "DeleteEuiccSubscriptionDialogActivity";
+    // Dialog tags
+    private static final int DIALOG_TAG_DELETE_SIM_CONFIRMATION = 1;
+
+    /**
+     * Returns an intent of DeleteEuiccSubscriptionDialogActivity.
+     *
+     * @param context The context used to start the DeleteEuiccSubscriptionDialogActivity.
+     * @param subId The subscription ID of the subscription needs to be deleted. If the subscription
+     *     belongs to a group of subscriptions, all subscriptions from the group will be deleted.
+     */
+    public static Intent getIntent(Context context, int subId) {
+        Intent intent = new Intent(context, DeleteEuiccSubscriptionDialogActivity.class);
+        intent.putExtra(ARG_SUB_ID, subId);
+        return intent;
+    }
+
+    private DeleteEuiccSubscriptionSidecar mDeleteEuiccSubscriptionSidecar;
+    private List<SubscriptionInfo> mSubscriptionsToBeDeleted;
+    private SubscriptionInfo mSubscriptionToBeDeleted;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        int subId = intent.getIntExtra(ARG_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        mSubscriptionToBeDeleted = SubscriptionUtil.getSubById(mSubscriptionManager, subId);
+        mSubscriptionsToBeDeleted =
+                SubscriptionUtil.findAllSubscriptionsInGroup(mSubscriptionManager, subId);
+
+        if (mSubscriptionToBeDeleted == null || mSubscriptionsToBeDeleted.isEmpty()) {
+            Log.e(TAG, "Cannot find subscription with sub ID: " + subId);
+            finish();
+            return;
+        }
+
+        mDeleteEuiccSubscriptionSidecar = DeleteEuiccSubscriptionSidecar.get(getFragmentManager());
+        if (savedInstanceState == null) {
+            showDeleteSimConfirmDialog();
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mDeleteEuiccSubscriptionSidecar.addListener(this);
+    }
+
+    @Override
+    protected void onPause() {
+        mDeleteEuiccSubscriptionSidecar.removeListener(this);
+        super.onPause();
+    }
+
+    @Override
+    public void onStateChange(SidecarFragment fragment) {
+        if (fragment == mDeleteEuiccSubscriptionSidecar) {
+            handleDeleteEuiccSubscriptionSidecarStateChange();
+        }
+    }
+
+    @Override
+    public void onConfirm(int tag, boolean confirmed) {
+        if (!confirmed) {
+            finish();
+            return;
+        }
+
+        switch (tag) {
+            case DIALOG_TAG_DELETE_SIM_CONFIRMATION:
+                Log.i(TAG, "Subscription deletion confirmed");
+                showProgressDialog(getString(R.string.erasing_sim));
+                mDeleteEuiccSubscriptionSidecar.run(mSubscriptionsToBeDeleted);
+                break;
+            default:
+                Log.e(TAG, "Unrecognized confirmation dialog tag: " + tag);
+                break;
+        }
+    }
+
+    private void handleDeleteEuiccSubscriptionSidecarStateChange() {
+        switch (mDeleteEuiccSubscriptionSidecar.getState()) {
+            case SidecarFragment.State.SUCCESS:
+                Log.i(TAG, "Successfully delete the subscription.");
+                mDeleteEuiccSubscriptionSidecar.reset();
+                dismissProgressDialog();
+                finish();
+                break;
+            case SidecarFragment.State.ERROR:
+                Log.e(TAG, "Failed to delete the subscription.");
+                mDeleteEuiccSubscriptionSidecar.reset();
+                showErrorDialog(
+                        getString(R.string.erase_sim_fail_title),
+                        getString(R.string.erase_sim_fail_text));
+                break;
+        }
+    }
+
+    /* Displays the eSIM deleting confirmation dialog. */
+    private void showDeleteSimConfirmDialog() {
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_DELETE_SIM_CONFIRMATION,
+                getString(R.string.erase_sim_dialog_title),
+                getString(
+                        R.string.erase_sim_dialog_text, mSubscriptionToBeDeleted.getDisplayName()),
+                getString(R.string.erase_sim_confirm_button),
+                getString(R.string.cancel));
+    }
+}
diff --git a/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionSidecar.java b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionSidecar.java
new file mode 100644
index 0000000..f03f33f
--- /dev/null
+++ b/src/com/android/settings/network/telephony/DeleteEuiccSubscriptionSidecar.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.FragmentManager;
+import android.app.PendingIntent;
+import android.telephony.SubscriptionInfo;
+import android.telephony.euicc.EuiccManager;
+import android.util.Log;
+
+import com.android.settings.SidecarFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/** A headless fragment encapsulating long-running eSIM erasing operations. */
+public class DeleteEuiccSubscriptionSidecar extends EuiccOperationSidecar {
+    private static final String TAG = "DeleteEuiccSubscriptionSidecar";
+    private static final String ACTION_DELETE_SUBSCRIPTION =
+            "com.android.settings.network.delete_subscription";
+
+    private List<SubscriptionInfo> mSubscriptions;
+
+    @Override
+    public String getReceiverAction() {
+        return ACTION_DELETE_SUBSCRIPTION;
+    }
+
+    /** Returns a DeleteEuiccSubscriptionSidecar sidecar instance. */
+    public static DeleteEuiccSubscriptionSidecar get(FragmentManager fm) {
+        return SidecarFragment.get(fm, TAG, DeleteEuiccSubscriptionSidecar.class, null /* args */);
+    }
+
+    /** Starts calling EuiccManager#deleteSubscription to delete the eSIM profile. */
+    public void run(List<SubscriptionInfo> subscriptions) {
+        if (subscriptions == null || subscriptions.isEmpty()) {
+            throw new IllegalArgumentException("Subscriptions cannot be empty.");
+        }
+
+        setState(State.RUNNING, Substate.UNUSED);
+
+        mSubscriptions = new ArrayList<>(subscriptions);
+        deleteSubscription();
+    }
+
+    @Override
+    protected void onActionReceived() {
+        if (getResultCode() == EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_OK
+                && !mSubscriptions.isEmpty()) {
+            // Continue to delete remaining subscriptions.
+            deleteSubscription();
+        } else {
+            super.onActionReceived();
+        }
+    }
+
+    private void deleteSubscription() {
+        SubscriptionInfo subscription = mSubscriptions.remove(0);
+        PendingIntent intent = createCallbackIntent();
+        Log.i(TAG, "Deleting subscription ID: " + subscription.getSubscriptionId());
+        mEuiccManager.deleteSubscription(subscription.getSubscriptionId(), intent);
+    }
+}
diff --git a/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.java b/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.java
index 44187e4..3035a9f 100644
--- a/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.java
+++ b/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.java
@@ -81,9 +81,8 @@
     }
 
     private void deleteSim() {
-        final Intent intent = new Intent(EuiccManager.ACTION_DELETE_SUBSCRIPTION_PRIVILEGED);
-        intent.putExtra(EuiccManager.EXTRA_SUBSCRIPTION_ID, mSubscriptionInfo.getSubscriptionId());
-        mParentFragment.startActivityForResult(intent, mRequestCode);
+        SubscriptionUtil.startDeleteEuiccSubscriptionDialogActivity(
+                mContext, mSubscriptionInfo.getSubscriptionId());
         // result handled in MobileNetworkSettings
     }
 
diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
index 6327375..8a32a95 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -164,7 +164,22 @@
         }
     }
 
-    private final static class PreferenceEntriesBuilder {
+    enum EnabledNetworks {
+        ENABLED_NETWORKS_UNKNOWN,
+        ENABLED_NETWORKS_CDMA_CHOICES,
+        ENABLED_NETWORKS_CDMA_NO_LTE_CHOICES,
+        ENABLED_NETWORKS_CDMA_ONLY_LTE_CHOICES,
+        ENABLED_NETWORKS_TDSCDMA_CHOICES,
+        ENABLED_NETWORKS_EXCEPT_GSM_LTE_CHOICES,
+        ENABLED_NETWORKS_EXCEPT_GSM_4G_CHOICES,
+        ENABLED_NETWORKS_EXCEPT_GSM_CHOICES,
+        ENABLED_NETWORKS_EXCEPT_LTE_CHOICES,
+        ENABLED_NETWORKS_4G_CHOICES,
+        ENABLED_NETWORKS_CHOICES,
+        PREFERRED_NETWORK_MODE_CHOICES_WORLD_MODE
+    }
+
+    private final class PreferenceEntriesBuilder {
         private CarrierConfigManager mCarrierConfigManager;
         private Context mContext;
         private TelephonyManager mTelephonyManager;
@@ -181,21 +196,6 @@
         private List<String> mEntries = new ArrayList<>();
         private List<Integer> mEntriesValue = new ArrayList<>();
 
-        enum EnabledNetworks {
-            ENABLED_NETWORKS_UNKNOWN,
-            ENABLED_NETWORKS_CDMA_CHOICES,
-            ENABLED_NETWORKS_CDMA_NO_LTE_CHOICES,
-            ENABLED_NETWORKS_CDMA_ONLY_LTE_CHOICES,
-            ENABLED_NETWORKS_TDSCDMA_CHOICES,
-            ENABLED_NETWORKS_EXCEPT_GSM_LTE_CHOICES,
-            ENABLED_NETWORKS_EXCEPT_GSM_4G_CHOICES,
-            ENABLED_NETWORKS_EXCEPT_GSM_CHOICES,
-            ENABLED_NETWORKS_EXCEPT_LTE_CHOICES,
-            ENABLED_NETWORKS_4G_CHOICES,
-            ENABLED_NETWORKS_CHOICES,
-            PREFERRED_NETWORK_MODE_CHOICES_WORLD_MODE
-        }
-
         PreferenceEntriesBuilder(Context context, int subId) {
             this.mContext = context;
             this.mSubId = subId;
@@ -226,7 +226,7 @@
             int[] entryValuesInt;
             switch (getEnabledNetworkType()) {
                 case ENABLED_NETWORKS_CDMA_CHOICES:
-                    entryValues = mContext.getResources().getStringArray(
+                    entryValues = getResourcesForSubId().getStringArray(
                             R.array.enabled_networks_cdma_values);
                     entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
                     if (entryValuesInt.length < 4) {
@@ -240,7 +240,7 @@
                     addGlobalEntry(entryValuesInt[3]);
                     break;
                 case ENABLED_NETWORKS_CDMA_NO_LTE_CHOICES:
-                    entryValues = mContext.getResources().getStringArray(
+                    entryValues = getResourcesForSubId().getStringArray(
                             R.array.enabled_networks_cdma_no_lte_values);
                     entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
                     if (entryValuesInt.length < 2) {
@@ -251,7 +251,7 @@
                     add1xEntry(entryValuesInt[1]);
                     break;
                 case ENABLED_NETWORKS_CDMA_ONLY_LTE_CHOICES:
-                    entryValues = mContext.getResources().getStringArray(
+                    entryValues = getResourcesForSubId().getStringArray(
                             R.array.enabled_networks_cdma_only_lte_values);
                     entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
                     if (entryValuesInt.length < 2) {
@@ -262,7 +262,7 @@
                     addGlobalEntry(entryValuesInt[1]);
                     break;
                 case ENABLED_NETWORKS_TDSCDMA_CHOICES:
-                    entryValues = mContext.getResources().getStringArray(
+                    entryValues = getResourcesForSubId().getStringArray(
                             R.array.enabled_networks_tdscdma_values);
                     entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
                     if (entryValuesInt.length < 3) {
@@ -275,7 +275,7 @@
                     add2gEntry(entryValuesInt[2]);
                     break;
                 case ENABLED_NETWORKS_EXCEPT_GSM_LTE_CHOICES:
-                    entryValues = mContext.getResources().getStringArray(
+                    entryValues = getResourcesForSubId().getStringArray(
                             R.array.enabled_networks_except_gsm_lte_values);
                     entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
                     if (entryValuesInt.length < 1) {
@@ -285,7 +285,7 @@
                     add3gEntry(entryValuesInt[0]);
                     break;
                 case ENABLED_NETWORKS_EXCEPT_GSM_4G_CHOICES:
-                    entryValues = mContext.getResources().getStringArray(
+                    entryValues = getResourcesForSubId().getStringArray(
                             R.array.enabled_networks_except_gsm_values);
                     entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
                     if (entryValuesInt.length < 2) {
@@ -297,7 +297,7 @@
                     add3gEntry(entryValuesInt[1]);
                     break;
                 case ENABLED_NETWORKS_EXCEPT_GSM_CHOICES:
-                    entryValues = mContext.getResources().getStringArray(
+                    entryValues = getResourcesForSubId().getStringArray(
                             R.array.enabled_networks_except_gsm_values);
                     entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
                     if (entryValuesInt.length < 2) {
@@ -309,7 +309,7 @@
                     add3gEntry(entryValuesInt[1]);
                     break;
                 case ENABLED_NETWORKS_EXCEPT_LTE_CHOICES:
-                    entryValues = mContext.getResources().getStringArray(
+                    entryValues = getResourcesForSubId().getStringArray(
                             R.array.enabled_networks_except_lte_values);
                     entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
                     if (entryValuesInt.length < 2) {
@@ -320,7 +320,7 @@
                     add2gEntry(entryValuesInt[1]);
                     break;
                 case ENABLED_NETWORKS_4G_CHOICES:
-                    entryValues = mContext.getResources().getStringArray(
+                    entryValues = getResourcesForSubId().getStringArray(
                             R.array.enabled_networks_values);
                     entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
                     if (entryValuesInt.length < 3) {
@@ -334,7 +334,7 @@
                     add2gEntry(entryValuesInt[2]);
                     break;
                 case ENABLED_NETWORKS_CHOICES:
-                    entryValues = mContext.getResources().getStringArray(
+                    entryValues = getResourcesForSubId().getStringArray(
                             R.array.enabled_networks_values);
                     entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
                     if (entryValuesInt.length < 3) {
@@ -346,7 +346,7 @@
                     add2gEntry(entryValuesInt[2]);
                     break;
                 case PREFERRED_NETWORK_MODE_CHOICES_WORLD_MODE:
-                    entryValues = mContext.getResources().getStringArray(
+                    entryValues = getResourcesForSubId().getStringArray(
                             R.array.preferred_network_mode_values_world_mode);
                     entryValuesInt = Stream.of(entryValues).mapToInt(Integer::parseInt).toArray();
                     if (entryValuesInt.length < 3) {
@@ -354,9 +354,14 @@
                                 "PREFERRED_NETWORK_MODE_CHOICES_WORLD_MODE index error.");
                     }
                     addGlobalEntry(entryValuesInt[0]);
-                    addCustomEntry(mContext.getString(R.string.network_world_mode_cdma_lte),
+
+                    addCustomEntry(
+                            getResourcesForSubId().getString(
+                                    R.string.network_world_mode_cdma_lte),
                             entryValuesInt[1]);
-                    addCustomEntry(mContext.getString(R.string.network_world_mode_gsm_lte),
+                    addCustomEntry(
+                            getResourcesForSubId().getString(
+                                    R.string.network_world_mode_gsm_lte),
                             entryValuesInt[2]);
                     break;
                 default:
@@ -365,9 +370,15 @@
         }
 
         private int getPreferredNetworkMode() {
-            return Settings.Global.getInt(mContext.getContentResolver(),
+            int networkMode = Settings.Global.getInt(mContext.getContentResolver(),
                     Settings.Global.PREFERRED_NETWORK_MODE + mSubId,
                     TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
+            if (!showNrList()) {
+                Log.d(LOG_TAG, "Network mode :" + networkMode + " reduce NR");
+                networkMode = reduceNrToLteNetworkType(networkMode);
+            }
+            Log.d(LOG_TAG, "getPreferredNetworkMode: " + networkMode);
+            return networkMode;
         }
 
         private EnabledNetworks getEnabledNetworkType() {
@@ -565,8 +576,9 @@
                 case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
                     setSelectedEntry(
                             TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);
-                    setSummary(mContext.getString(R.string.network_5G)
-                            + mContext.getString(R.string.network_recommended));
+                    setSummary(getResourcesForSubId().getString(R.string.network_5G)
+                            + getResourcesForSubId().getString(
+                            R.string.network_recommended));
                     break;
                 case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA:
                 case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM:
@@ -575,13 +587,15 @@
                 case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
                     setSelectedEntry(TelephonyManagerConstants
                             .NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
-                    setSummary(mContext.getString(R.string.network_5G)
-                            + mContext.getString(R.string.network_recommended));
+                    setSummary(getResourcesForSubId().getString(R.string.network_5G)
+                            + getResourcesForSubId().getString(
+                            R.string.network_recommended));
                     break;
                 case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO:
                     setSelectedEntry(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO);
-                    setSummary(mContext.getString(R.string.network_5G)
-                            + mContext.getString(R.string.network_recommended));
+                    setSummary(getResourcesForSubId().getString(R.string.network_5G)
+                            + getResourcesForSubId().getString(
+                            R.string.network_recommended));
                     break;
                 case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
                     setSelectedEntry(
@@ -591,13 +605,15 @@
                             || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
                         setSummary(R.string.network_global);
                     } else {
-                        setSummary(mContext.getString(R.string.network_5G)
-                                + mContext.getString(R.string.network_recommended));
+                        setSummary(getResourcesForSubId().getString(R.string.network_5G)
+                                + getResourcesForSubId().getString(
+                                R.string.network_recommended));
                     }
                     break;
                 default:
                     setSummary(
-                            mContext.getString(R.string.mobile_network_mode_error, networkMode));
+                            getResourcesForSubId().getString(
+                                    R.string.mobile_network_mode_error, networkMode));
             }
         }
 
@@ -607,7 +623,7 @@
          * @param networkType an LTE network mode without 5G.
          * @return the corresponding network mode with 5G.
          */
-        private static int addNrToLteNetworkType(int networkType) {
+        private int addNrToLteNetworkType(int networkType) {
             switch(networkType) {
                 case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
                     return TelephonyManagerConstants.NETWORK_MODE_NR_LTE;
@@ -635,6 +651,40 @@
             }
         }
 
+        /**
+         * Transform NR5G network mode to LTE network mode.
+         *
+         * @param networkType an 5G network mode.
+         * @return the corresponding network mode without 5G.
+         */
+        private int reduceNrToLteNetworkType(int networkType) {
+            switch(networkType) {
+                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE:
+                    return TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY;
+                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO:
+                    return TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO;
+                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA:
+                    return TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA;
+                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
+                    return TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA;
+                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
+                    return TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA;
+                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA:
+                    return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA;
+                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM:
+                    return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM;
+                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_WCDMA:
+                    return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA;
+                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA:
+                    return TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA;
+                case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+                    return TelephonyManagerConstants
+                            .NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA;
+                default:
+                    return networkType; // do nothing
+            }
+        }
+
         private void setPreferenceValueAndSummary() {
             setPreferenceValueAndSummary(getPreferredNetworkMode());
         }
@@ -649,8 +699,8 @@
         private void add5gEntry(int value) {
             boolean isNRValue = value >= TelephonyManagerConstants.NETWORK_MODE_NR_ONLY;
             if (showNrList() && isNRValue) {
-                mEntries.add(mContext.getString(R.string.network_5G)
-                        + mContext.getString(R.string.network_recommended));
+                mEntries.add(getResourcesForSubId().getString(R.string.network_5G)
+                        + getResourcesForSubId().getString(R.string.network_recommended));
                 mEntriesValue.add(value);
                 mIs5gEntryDisplayed = true;
             } else {
@@ -666,7 +716,7 @@
             Log.d(LOG_TAG, "addGlobalEntry. "
                     + " supported5GRadioAccessFamily: " + mSupported5gRadioAccessFamily
                     + " allowed5GNetworkType: " + mAllowed5gNetworkType);
-            mEntries.add(mContext.getString(R.string.network_global));
+            mEntries.add(getResourcesForSubId().getString(R.string.network_global));
             if (showNrList()) {
                 value = addNrToLteNetworkType(value);
             }
@@ -682,9 +732,9 @@
          */
         private void addLteEntry(int value) {
             if (showNrList()) {
-                mEntries.add(mContext.getString(R.string.network_lte_pure));
+                mEntries.add(getResourcesForSubId().getString(R.string.network_lte_pure));
             } else {
-                mEntries.add(mContext.getString(R.string.network_lte));
+                mEntries.add(getResourcesForSubId().getString(R.string.network_lte));
             }
             mEntriesValue.add(value);
         }
@@ -694,25 +744,25 @@
          */
         private void add4gEntry(int value) {
             if (showNrList()) {
-                mEntries.add(mContext.getString(R.string.network_4G_pure));
+                mEntries.add(getResourcesForSubId().getString(R.string.network_4G_pure));
             } else {
-                mEntries.add(mContext.getString(R.string.network_4G));
+                mEntries.add(getResourcesForSubId().getString(R.string.network_4G));
             }
             mEntriesValue.add(value);
         }
 
         private void add3gEntry(int value) {
-            mEntries.add(mContext.getString(R.string.network_3G));
+            mEntries.add(getResourcesForSubId().getString(R.string.network_3G));
             mEntriesValue.add(value);
         }
 
         private void add2gEntry(int value) {
-            mEntries.add(mContext.getString(R.string.network_2G));
+            mEntries.add(getResourcesForSubId().getString(R.string.network_2G));
             mEntriesValue.add(value);
         }
 
         private void add1xEntry(int value) {
-            mEntries.add(mContext.getString(R.string.network_1x));
+            mEntries.add(getResourcesForSubId().getString(R.string.network_1x));
             mEntriesValue.add(value);
         }
 
@@ -760,7 +810,7 @@
         }
 
         private void setSummary(int summaryResId) {
-            setSummary(mContext.getString(summaryResId));
+            setSummary(getResourcesForSubId().getString(summaryResId));
         }
 
         private void setSummary(String summary) {
diff --git a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
index d6aed67..348c9c8 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceController.java
@@ -57,8 +57,7 @@
     private boolean mShow5gLimitedDialog;
     boolean mIsNrEnabledFromCarrierConfig;
     private boolean mHas5gCapability;
-    @VisibleForTesting
-    Integer mCallState;
+    private Integer mCallState;
     private final List<On4gLteUpdateListener> m4gLteListeners;
 
     protected static final int MODE_NONE = -1;
@@ -128,7 +127,7 @@
 
     @Override
     public void onStart() {
-        if (mPhoneStateListener == null) {
+        if (!isModeMatched() || (mPhoneStateListener == null)) {
             return;
         }
         mPhoneStateListener.register(mContext, mSubId);
@@ -186,6 +185,7 @@
         return this;
     }
 
+    @VisibleForTesting
     protected int getMode() {
         return MODE_NONE;
     }
@@ -195,12 +195,17 @@
     }
 
     @VisibleForTesting
-    VolteQueryImsState queryImsState(int subId) {
+    protected VolteQueryImsState queryImsState(int subId) {
         return new VolteQueryImsState(mContext, subId);
     }
 
+    @VisibleForTesting
+    protected boolean isCallStateIdle() {
+        return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE);
+    }
+
     private boolean isUserControlAllowed(final PersistableBundle carrierConfig) {
-        return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE)
+        return isCallStateIdle()
                 && (carrierConfig != null)
                 && carrierConfig.getBoolean(
                 CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL);
@@ -225,6 +230,9 @@
             if (SubscriptionManager.isValidSubscriptionId(subId)) {
                 mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
             }
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mTelephonyManager.getCallState(subId);
             mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
 
             final long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();
@@ -234,7 +242,9 @@
 
         public void unregister() {
             mCallState = null;
-            mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+            if (mTelephonyManager != null) {
+                mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
+            }
         }
     }
 
diff --git a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
index 9e46158..158becc 100644
--- a/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
+++ b/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelper.java
@@ -23,8 +23,6 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.net.Uri;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
@@ -84,6 +82,10 @@
     private static final String RESOURCE_ENHANCED_4G_LTE_MODE_TITLE_VARIANT =
             "enhanced_4g_lte_mode_title_variant";
 
+    private static final int MODE_VOLTE = 0;
+    private static final int MODE_ADVANCED_CALL = 1;
+    private static final int MODE_4G_CALLING = 2;
+
     @VisibleForTesting
     public Enhanced4gLteSliceHelper(Context context) {
         mContext = context;
@@ -217,40 +219,47 @@
     }
 
     private CharSequence getEnhanced4glteModeTitle(int subId) {
-        CharSequence ret = mContext.getText(R.string.enhanced_4g_lte_mode_title);
-        try {
-            if (isCarrierConfigManagerKeyEnabled(
-                    CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL,
-                    subId,
-                    false)) {
-                final PackageManager manager = mContext.getPackageManager();
-                final Resources resources = manager.getResourcesForApplication(
-                        PACKAGE_PHONE);
-                final int resId = resources.getIdentifier(
-                        RESOURCE_ENHANCED_4G_LTE_MODE_TITLE_VARIANT,
-                        RESOURCE_TYPE_STRING, PACKAGE_PHONE);
-                ret = resources.getText(resId);
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(TAG, "package name not found");
+        final int variant4gLteTitleIndex = getCarrierConfigManagerKeyValue(
+                CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, subId, 0);
+        final boolean show4GForLTE = isCarrierConfigManagerKeyEnabled(
+                CarrierConfigManager.KEY_SHOW_4G_FOR_LTE_DATA_ICON_BOOL, subId, false);
+        final CharSequence[] variantTitles = mContext.getResources()
+                .getTextArray(R.array.enhanced_4g_lte_mode_title_variant);
+        int index = MODE_ADVANCED_CALL;
+        if (variant4gLteTitleIndex != MODE_ADVANCED_CALL) {
+            index = show4GForLTE ? MODE_4G_CALLING : MODE_VOLTE;
         }
-        return ret;
+        return variantTitles[index];
     }
 
     /**
      * Returns {@code true} when the key is enabled for the carrier, and {@code false} otherwise.
      */
-    private boolean isCarrierConfigManagerKeyEnabled(String key,
-            int subId, boolean defaultValue) {
-        final CarrierConfigManager configManager = getCarrierConfigManager();
-        boolean ret = defaultValue;
-        if (configManager != null) {
-            final PersistableBundle bundle = configManager.getConfigForSubId(subId);
-            if (bundle != null) {
-                ret = bundle.getBoolean(key, defaultValue);
-            }
+    private boolean isCarrierConfigManagerKeyEnabled(String key, int subId, boolean defaultValue) {
+        boolean result = defaultValue;
+        final PersistableBundle carrierConfig = getCarrierConfig(subId);
+        if (carrierConfig != null) {
+            result = carrierConfig.getBoolean(key, defaultValue);
         }
-        return ret;
+        return result;
+    }
+
+    private int getCarrierConfigManagerKeyValue(String key, int subId, int defaultValue) {
+        int result = defaultValue;
+        final PersistableBundle carrierConfig = getCarrierConfig(subId);
+        if (carrierConfig != null) {
+            result = carrierConfig.getInt(key, defaultValue);
+        }
+        return result;
+    }
+
+    private PersistableBundle getCarrierConfig(int subId) {
+        final CarrierConfigManager configManager = getCarrierConfigManager();
+        PersistableBundle bundle = null;
+        if (configManager != null) {
+            bundle = configManager.getConfigForSubId(subId);
+        }
+        return bundle;
     }
 
     protected CarrierConfigManager getCarrierConfigManager() {
@@ -261,7 +270,7 @@
         final Intent intent = new Intent(action);
         intent.setClass(mContext, SliceBroadcastReceiver.class);
         return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,
-                PendingIntent.FLAG_CANCEL_CURRENT);
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 
     /**
@@ -278,7 +287,8 @@
         final Intent intent = new Intent(action);
         intent.setPackage(SETTINGS_PACKAGE_NAME);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
+        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent,
+                PendingIntent.FLAG_IMMUTABLE);
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/network/telephony/EuiccOperationSidecar.java b/src/com/android/settings/network/telephony/EuiccOperationSidecar.java
new file mode 100644
index 0000000..c82220e
--- /dev/null
+++ b/src/com/android/settings/network/telephony/EuiccOperationSidecar.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.Manifest;
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.os.SystemClock;
+import android.telephony.euicc.EuiccManager;
+import android.util.Log;
+
+import com.android.settings.SidecarFragment;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * The sidecar base class that an Euicc sidecar can extend from. The extended class should implement
+ * getReceiverAction() to return the action string for the broadcast receiver. The extended class
+ * should implement its own get() function to return an instance of that class, and implement the
+ * functional class like run() to actually trigger the function in EuiccManager.
+ */
+public abstract class EuiccOperationSidecar extends SidecarFragment {
+    private static final String TAG = "EuiccOperationSidecar";
+    private static final int REQUEST_CODE = 0;
+    private static final String EXTRA_OP_ID = "op_id";
+    private static AtomicInteger sCurrentOpId =
+            new AtomicInteger((int) SystemClock.elapsedRealtime());
+
+    protected EuiccManager mEuiccManager;
+
+    private int mResultCode;
+    private int mDetailedCode;
+    private Intent mResultIntent;
+    private int mOpId;
+
+    protected final BroadcastReceiver mReceiver =
+            new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    if (getReceiverAction().equals(intent.getAction())
+                            && mOpId == intent.getIntExtra(EXTRA_OP_ID, -1)) {
+                        mResultCode = getResultCode();
+                        /* TODO: This relies on our LUI and LPA to coexist, should think about how
+                        to generalize this further. */
+                        mDetailedCode =
+                                intent.getIntExtra(
+                                        EuiccManager.EXTRA_EMBEDDED_SUBSCRIPTION_DETAILED_CODE,
+                                        0 /* defaultValue*/);
+                        mResultIntent = intent;
+                        Log.i(
+                                TAG,
+                                String.format(
+                                        "Result code : %d; detailed code : %d",
+                                        mResultCode, mDetailedCode));
+                        onActionReceived();
+                    }
+                }
+            };
+
+    /**
+     * This is called when the broadcast action is received. The subclass may override this to
+     * perform different logic. The broadcast result code may be obtained with {@link
+     * #getResultCode()} and the Intent may be obtained with {@link #getResultIntent()}.
+     */
+    protected void onActionReceived() {
+        if (mResultCode == EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_OK) {
+            setState(State.SUCCESS, Substate.UNUSED);
+        } else {
+            setState(State.ERROR, mResultCode);
+        }
+    }
+
+    /**
+     * The extended class should implement it to return a string for the broadcast action. The class
+     * should be unique across all the child classes.
+     */
+    protected abstract String getReceiverAction();
+
+    protected PendingIntent createCallbackIntent() {
+        mOpId = sCurrentOpId.incrementAndGet();
+        Intent intent = new Intent(getReceiverAction());
+        intent.putExtra(EXTRA_OP_ID, mOpId);
+        return PendingIntent.getBroadcast(
+                getContext(), REQUEST_CODE, intent, PendingIntent.FLAG_CANCEL_CURRENT);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mEuiccManager = getContext().getSystemService(EuiccManager.class);
+
+        getContext()
+                .getApplicationContext()
+                .registerReceiver(
+                        mReceiver,
+                        new IntentFilter(getReceiverAction()),
+                        Manifest.permission.WRITE_EMBEDDED_SUBSCRIPTIONS,
+                        null);
+    }
+
+    @Override
+    public void onDestroy() {
+        getContext().getApplicationContext().unregisterReceiver(mReceiver);
+        super.onDestroy();
+    }
+
+    public int getResultCode() {
+        return mResultCode;
+    }
+
+    public int getDetailedCode() {
+        return mDetailedCode;
+    }
+
+    public Intent getResultIntent() {
+        return mResultIntent;
+    }
+}
diff --git a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
index 07b808f..e3db5eb 100644
--- a/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
+++ b/src/com/android/settings/network/telephony/MmsMessagePreferenceController.java
@@ -88,7 +88,10 @@
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        return mTelephonyManager.setAlwaysAllowMmsData(isChecked);
+        mTelephonyManager.setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, isChecked);
+        return isChecked == mTelephonyManager.isMobileDataPolicyEnabled(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED);
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
index c8a1e98..180d503 100644
--- a/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
+++ b/src/com/android/settings/network/telephony/MobileDataDialogFragment.java
@@ -28,6 +28,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
 
 
 /**
@@ -50,6 +51,8 @@
     private int mType;
     private int mSubId;
 
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
+
     public static MobileDataDialogFragment newInstance(int type, int subId) {
         final MobileDataDialogFragment dialogFragment = new MobileDataDialogFragment();
 
@@ -65,6 +68,8 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mSubscriptionManager = getContext().getSystemService(SubscriptionManager.class);
+        mWifiPickerTrackerHelper = new WifiPickerTrackerHelper(getSettingsLifecycle(), getContext(),
+                null /* WifiPickerTrackerCallback */);
     }
 
     @Override
@@ -124,11 +129,17 @@
             case TYPE_DISABLE_DIALOG:
                 MobileNetworkUtils.setMobileDataEnabled(getContext(), mSubId, false /* enabled */,
                         false /* disableOtherSubscriptions */);
+                if (mWifiPickerTrackerHelper != null) {
+                    mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false);
+                }
                 break;
             case TYPE_MULTI_SIM_DIALOG:
                 mSubscriptionManager.setDefaultDataSubId(mSubId);
                 MobileNetworkUtils.setMobileDataEnabled(getContext(), mSubId, true /* enabled */,
                         true /* disableOtherSubscriptions */);
+                if (mWifiPickerTrackerHelper != null) {
+                    mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true);
+                }
                 break;
             default:
                 throw new IllegalArgumentException("unknown type " + mType);
diff --git a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
index c35eef6..78bc0a0 100644
--- a/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
+++ b/src/com/android/settings/network/telephony/MobileDataPreferenceController.java
@@ -32,6 +32,7 @@
 
 import com.android.settings.R;
 import com.android.settings.network.MobileDataContentObserver;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;
@@ -54,6 +55,8 @@
     @VisibleForTesting
     boolean mNeedDialog;
 
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
+
     public MobileDataPreferenceController(Context context, String key) {
         super(context, key);
         mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
@@ -107,6 +110,9 @@
         if (!mNeedDialog) {
             // Update data directly if we don't need dialog
             MobileNetworkUtils.setMobileDataEnabled(mContext, mSubId, isChecked, false);
+            if (mWifiPickerTrackerHelper != null) {
+                mWifiPickerTrackerHelper.setCarrierNetworkEnabled(isChecked);
+            }
             return true;
         }
 
@@ -128,6 +134,13 @@
             preference.setEnabled(true);
             preference.setSummary(R.string.mobile_data_settings_summary);
         }
+
+        if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            preference.setSelectable(false);
+            preference.setSummary(R.string.mobile_data_settings_summary_unavailable);
+        } else {
+            preference.setSelectable(true);
+        }
     }
 
     private boolean isOpportunistic() {
@@ -142,6 +155,10 @@
                 .createForSubscriptionId(mSubId);
     }
 
+    public void setWifiPickerTrackerHelper(WifiPickerTrackerHelper helper) {
+        mWifiPickerTrackerHelper = helper;
+    }
+
     @VisibleForTesting
     boolean isDialogNeeded() {
         final boolean enableData = !isChecked();
diff --git a/src/com/android/settings/network/telephony/MobileNetworkActivity.java b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
index 7f7dc3a..b179770 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkActivity.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.network.telephony;
 
+import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
+
 import android.app.ActionBar;
 import android.content.Intent;
 import android.os.Bundle;
@@ -81,7 +83,7 @@
         mCurSubscriptionId = updateSubscriptionIndex;
         mFragmentForceReload = (mCurSubscriptionId == oldSubId);
         final SubscriptionInfo info = getSubscription();
-        updateSubscriptions(info);
+        updateSubscriptions(info, null);
 
         // If the subscription has changed or the new intent doesnt contain the opt in action,
         // remove the old discovery dialog. If the activity is being recreated, we will see
@@ -132,7 +134,7 @@
         // perform registration after mCurSubscriptionId been configured.
         registerActiveSubscriptionsListener();
 
-        updateSubscriptions(subscription);
+        updateSubscriptions(subscription, savedInstanceState);
     }
 
     @VisibleForTesting
@@ -154,10 +156,15 @@
     public void onChanged() {
         SubscriptionInfo info = getSubscription();
         int oldSubIndex = mCurSubscriptionId;
-        updateSubscriptions(info);
+        updateSubscriptions(info, null);
 
         // Remove the dialog if the subscription associated with this activity changes.
         if (info == null) {
+            // Close the activity when subscription removed
+            if ((oldSubIndex != SUB_ID_NULL)
+                    && (!isFinishing()) && (!isDestroyed())) {
+                finish();
+            }
             return;
         }
         int subIndex = info.getSubscriptionId();
@@ -204,14 +211,16 @@
     }
 
     @VisibleForTesting
-    void updateSubscriptions(SubscriptionInfo subscription) {
+    void updateSubscriptions(SubscriptionInfo subscription, Bundle savedInstanceState) {
         if (subscription == null) {
             return;
         }
         final int subscriptionIndex = subscription.getSubscriptionId();
 
         updateTitleAndNavigation(subscription);
-        switchFragment(subscription);
+        if (savedInstanceState == null) {
+            switchFragment(subscription);
+        }
 
         mCurSubscriptionId = subscriptionIndex;
         mFragmentForceReload = false;
@@ -247,8 +256,13 @@
         final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
 
         final int subId = subInfo.getSubscriptionId();
+        final Intent intent = getIntent();
         final Bundle bundle = new Bundle();
         bundle.putInt(Settings.EXTRA_SUB_ID, subId);
+        if (intent != null && Settings.ACTION_MMS_MESSAGE_SETTING.equals(intent.getAction())) {
+            // highlight "mms_message" preference.
+            bundle.putString(EXTRA_FRAGMENT_ARG_KEY, "mms_message");
+        }
 
         final String fragmentTag = buildFragmentTag(subId);
         if (fragmentManager.findFragmentByTag(fragmentTag) != null) {
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index 528e5c7..7c45949 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -43,6 +43,7 @@
 import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController;
 import com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.search.SearchIndexable;
 import com.android.settingslib.utils.ThreadUtils;
@@ -147,6 +148,9 @@
         use(DisableSimFooterPreferenceController.class).init(mSubId);
         use(NrDisabledInDsdsFooterPreferenceController.class).init(mSubId);
         use(MobileDataPreferenceController.class).init(getFragmentManager(), mSubId);
+        use(MobileDataPreferenceController.class).setWifiPickerTrackerHelper(
+                new WifiPickerTrackerHelper(getSettingsLifecycle(), context,
+                        null /* WifiPickerTrackerCallback */));
         use(RoamingPreferenceController.class).init(getFragmentManager(), mSubId);
         use(ApnPreferenceController.class).init(mSubId);
         use(CarrierPreferenceController.class).init(mSubId);
@@ -173,8 +177,11 @@
 
         final VideoCallingPreferenceController videoCallingPreferenceController =
                 use(VideoCallingPreferenceController.class).init(mSubId);
+        final CrossSimCallingPreferenceController crossSimCallingPreferenceController =
+                use(CrossSimCallingPreferenceController.class).init(mSubId);
         use(CallingPreferenceCategoryController.class).setChildren(
-                Arrays.asList(wifiCallingPreferenceController, videoCallingPreferenceController));
+                Arrays.asList(wifiCallingPreferenceController, videoCallingPreferenceController,
+                        crossSimCallingPreferenceController));
         use(Enhanced4gLtePreferenceController.class).init(mSubId)
                 .addListener(videoCallingPreferenceController);
         use(Enhanced4gCallingPreferenceController.class).init(mSubId)
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
index 46c5234..1fdc191 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSwitchController.java
@@ -78,8 +78,8 @@
         mSwitchBar.getSwitch().setOnBeforeCheckedChangeListener((toggleSwitch, isChecked) -> {
             // TODO b/135222940: re-evaluate whether to use
             // mSubscriptionManager#isSubscriptionEnabled
-            if (mSubscriptionManager.isActiveSubscriptionId(mSubId) != isChecked
-                    && (!mSubscriptionManager.setSubscriptionEnabled(mSubId, isChecked))) {
+            if (mSubscriptionManager.isActiveSubscriptionId(mSubId) != isChecked) {
+                SubscriptionUtil.startToggleSubscriptionDialogActivity(mContext, mSubId, isChecked);
                 return true;
             }
             return false;
diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
index 3b5e6e0..87b4ef5 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java
@@ -31,6 +31,7 @@
 import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO;
 import static com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA;
 
+import android.annotation.Nullable;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -41,6 +42,9 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.os.PersistableBundle;
 import android.os.SystemClock;
 import android.os.SystemProperties;
@@ -48,6 +52,7 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
@@ -68,6 +73,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.network.ims.WifiCallingQueryImsState;
 import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
 import com.android.settingslib.development.DevelopmentSettingsEnabler;
 import com.android.settingslib.graph.SignalDrawable;
@@ -198,11 +204,13 @@
             return false;
         }
         PersistableBundle bundle = carrierConfigManager.getConfigForSubId(subId);
-        return bundle.getBoolean(CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/);
+        return bundle.getBoolean(
+                CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, false /*default*/)
+                || bundle.getBoolean(CarrierConfigManager.Ims.KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL,
+                false /*default*/);
     }
 
-    @VisibleForTesting
-    static Intent buildPhoneAccountConfigureIntent(
+    public static Intent buildPhoneAccountConfigureIntent(
             Context context, PhoneAccountHandle accountHandle) {
         Intent intent = buildConfigureIntent(
                 context, accountHandle, TelecomManager.ACTION_CONFIGURE_PHONE_ACCOUNT);
@@ -279,7 +287,8 @@
                 String.format("showEuiccSettings: esimIgnoredDevice: %b, enabledEsimUiByDefault: "
                         + "%b, euiccProvisioned: %b, inDeveloperMode: %b.",
                 esimIgnoredDevice, enabledEsimUiByDefault, euiccProvisioned, inDeveloperMode));
-        return (inDeveloperMode || euiccProvisioned
+        return (euiccProvisioned
+                || (!esimIgnoredDevice && inDeveloperMode)
                 || (!esimIgnoredDevice && enabledEsimUiByDefault
                         && isCurrentCountrySupported(context)));
     }
@@ -475,8 +484,9 @@
         if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL)) {
             return true;
         }
-
-        final String operatorNumeric = telephonyManager.getServiceState().getOperatorNumeric();
+        final ServiceState serviceState = telephonyManager.getServiceState();
+        final String operatorNumeric =
+                (serviceState != null) ? serviceState.getOperatorNumeric() : null;
         final String[] numericArray = carrierConfig.getStringArray(
                 CarrierConfigManager.KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY);
         if (numericArray == null || operatorNumeric == null) {
@@ -851,4 +861,45 @@
         raf = ((NR & raf) > 0) ? (NR | raf) : raf;
         return raf;
     }
+
+    /**
+     * Copied from SubscriptionsPreferenceController#activeNetworkIsCellular()
+     */
+    public static boolean activeNetworkIsCellular(Context context) {
+        final ConnectivityManager connectivityManager =
+                context.getSystemService(ConnectivityManager.class);
+        final Network activeNetwork = connectivityManager.getActiveNetwork();
+        if (activeNetwork == null) {
+            return false;
+        }
+        final NetworkCapabilities networkCapabilities =
+                connectivityManager.getNetworkCapabilities(activeNetwork);
+        if (networkCapabilities == null) {
+            return false;
+        }
+        return networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
+    }
+
+    /**
+     * Copied from WifiCallingPreferenceController#isWifiCallingEnabled()
+     */
+    public static boolean isWifiCallingEnabled(Context context, int subId,
+            @Nullable WifiCallingQueryImsState queryImsState,
+            @Nullable PhoneAccountHandle phoneAccountHandle) {
+        if (phoneAccountHandle == null){
+            phoneAccountHandle = context.getSystemService(TelecomManager.class)
+                    .getSimCallManagerForSubscription(subId);
+        }
+        boolean isWifiCallingEnabled;
+        if (phoneAccountHandle != null) {
+            final Intent intent = buildPhoneAccountConfigureIntent(context, phoneAccountHandle);
+            isWifiCallingEnabled = intent != null;
+        } else {
+            if (queryImsState == null) {
+                queryImsState = new WifiCallingQueryImsState(context, subId);
+            }
+            isWifiCallingEnabled = queryImsState.isReadyToWifiCalling();
+        }
+        return isWifiCallingEnabled;
+    }
 }
diff --git a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
index 97894b1..cfd587a 100644
--- a/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
+++ b/src/com/android/settings/network/telephony/NetworkOperatorPreference.java
@@ -37,6 +37,7 @@
 
 import androidx.preference.Preference;
 
+import com.android.internal.telephony.OperatorInfo;
 import com.android.settings.R;
 
 import java.util.List;
@@ -125,10 +126,8 @@
         final CellSignalStrength signalStrength = getCellSignalStrength(mCellInfo);
         final int level = signalStrength != null ? signalStrength.getLevel() : LEVEL_NONE;
         if (DBG) Log.d(TAG, "refresh level: " + String.valueOf(level));
-        if (mLevel != level) {
-            mLevel = level;
-            updateIcon(mLevel);
-        }
+        mLevel = level;
+        updateIcon(mLevel);
     }
 
     /**
@@ -175,6 +174,15 @@
         return CellInfoUtil.getNetworkTitle(mCellId, getOperatorNumeric());
     }
 
+    /**
+     * Operator info of this cell
+     */
+    public OperatorInfo getOperatorInfo() {
+        return new OperatorInfo(Objects.toString(mCellId.getOperatorAlphaLong(), ""),
+                Objects.toString(mCellId.getOperatorAlphaShort(), ""),
+                getOperatorNumeric());
+    }
+
     private int getIconIdForCell(CellInfo ci) {
         if (ci instanceof CellInfoGsm) {
             return R.drawable.signal_strength_g;
diff --git a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java
new file mode 100644
index 0000000..50e7d9b
--- /dev/null
+++ b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroup.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static androidx.lifecycle.Lifecycle.Event;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.util.ArrayMap;
+import android.util.ArraySet;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.network.SubscriptionsChangeListener;
+import com.android.settings.network.ims.WifiCallingQueryImsState;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Copied the logic of WiFi calling from {@link WifiCallingPreferenceController}.
+ */
+public class NetworkProviderWifiCallingGroup extends
+        AbstractPreferenceController implements LifecycleObserver,
+        SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
+
+    private static final String TAG = "NetworkProviderWifiCallingGroup";
+    private static final int PREF_START_ORDER = 10;
+    private static final String KEY_PREFERENCE_WIFICALLING_GROUP = "provider_model_wfc_group";
+
+    @VisibleForTesting
+    protected CarrierConfigManager mCarrierConfigManager;
+    private SubscriptionManager mSubscriptionManager;
+
+    private String mPreferenceGroupKey;
+    private PreferenceGroup mPreferenceGroup;
+    private Map<Integer, TelephonyManager> mTelephonyManagerList = new HashMap<>();
+    private Map<Integer, PhoneAccountHandle> mSimCallManagerList = new HashMap<>();
+    private Map<Integer, Preference> mWifiCallingForSubPreferences;
+    private Set<Integer> mSubIdList = new ArraySet<>();
+
+
+    public NetworkProviderWifiCallingGroup(Context context, Lifecycle lifecycle,
+            String preferenceGroupKey) {
+        super(context);
+        mCarrierConfigManager = context.getSystemService(CarrierConfigManager.class);
+        mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
+
+        mPreferenceGroupKey = preferenceGroupKey;
+        mWifiCallingForSubPreferences = new ArrayMap<>();
+        lifecycle.addObserver(this);
+        setSubscriptionInfoList(context);
+    }
+
+    private void setSubscriptionInfoList(Context context){
+        final List<SubscriptionInfo> subscriptions = SubscriptionUtil.getActiveSubscriptions(
+                mSubscriptionManager);
+        for (SubscriptionInfo info : subscriptions) {
+            final int subId = info.getSubscriptionId();
+            mSubIdList.add(subId);
+            setTelephonyManagerForSubscriptionId(context, subId);
+            setPhoneAccountHandleForSubscriptionId(context, subId);
+        }
+    }
+
+    private void setTelephonyManagerForSubscriptionId(Context context, int subId) {
+        TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)
+                .createForSubscriptionId(subId);
+        mTelephonyManagerList.put(subId, telephonyManager);
+    }
+
+    private void setPhoneAccountHandleForSubscriptionId(Context context, int subId) {
+        PhoneAccountHandle phoneAccountHandle = context.getSystemService(TelecomManager.class)
+                .getSimCallManagerForSubscription(subId);
+        mSimCallManagerList.put(subId, phoneAccountHandle);
+    }
+
+    private TelephonyManager getTelephonyManagerForSubscriptionId(int subId){
+       return mTelephonyManagerList.get(subId);
+    }
+
+    @VisibleForTesting
+    protected PhoneAccountHandle getPhoneAccountHandleForSubscriptionId(int subId){
+        return mSimCallManagerList.get(subId);
+    }
+
+    @VisibleForTesting
+    protected WifiCallingQueryImsState queryImsState(int subId) {
+        return new WifiCallingQueryImsState(mContext, subId);
+    }
+
+    @OnLifecycleEvent(Event.ON_RESUME)
+    public void onResume() {
+        update();
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mSubIdList.size() >= 1;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        mPreferenceGroup = screen.findPreference(mPreferenceGroupKey);
+        update();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        // Do nothing in this case since preference is invisible
+        if (preference == null) {
+            return;
+        }
+        update();
+    }
+
+    private void update() {
+        if (mPreferenceGroup == null) {
+            return;
+        }
+
+        setSubscriptionInfoList(mContext);
+
+        if (!isAvailable()) {
+            for (Preference pref : mWifiCallingForSubPreferences.values()) {
+                mPreferenceGroup.removePreference(pref);
+            }
+            mWifiCallingForSubPreferences.clear();
+            return;
+        }
+
+        final Map<Integer, Preference> toRemovePreferences = mWifiCallingForSubPreferences;
+        mWifiCallingForSubPreferences = new ArrayMap<>();
+        final List<SubscriptionInfo> subscriptions = SubscriptionUtil.getActiveSubscriptions(
+                mSubscriptionManager);
+        setSubscriptionInfoForPreference(subscriptions, toRemovePreferences);
+
+        for (Preference pref : toRemovePreferences.values()) {
+            mPreferenceGroup.removePreference(pref);
+        }
+    }
+
+    private void setSubscriptionInfoForPreference(List<SubscriptionInfo> subscriptions,
+                                                  Map<Integer, Preference> toRemovePreferences) {
+        int order = PREF_START_ORDER;
+        for (SubscriptionInfo info : subscriptions) {
+            final int subId = info.getSubscriptionId();
+
+            if (!shouldShowWifiCallingForSub(subId)) {
+                continue;
+            }
+
+            Preference pref = toRemovePreferences.remove(subId);
+            if (pref == null) {
+                pref = new Preference(mPreferenceGroup.getContext());
+                mPreferenceGroup.addPreference(pref);
+            }
+
+            CharSequence title = info.getDisplayName();
+            if (getPhoneAccountHandleForSubscriptionId(subId) != null) {
+                final Intent intent = MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
+                        getPhoneAccountHandleForSubscriptionId(subId));
+                if (intent != null) {
+                    final PackageManager pm = mContext.getPackageManager();
+                    final List<ResolveInfo> resolutions = pm.queryIntentActivities(intent, 0);
+                    title = resolutions.get(0).loadLabel(pm);
+                    pref.setIntent(intent);
+                }
+            }
+
+            pref.setTitle(title);
+            pref.setOnPreferenceClickListener(clickedPref -> {
+                final Intent intent = new Intent(
+                        mContext,
+                        com.android.settings.Settings.WifiCallingSettingsActivity.class);
+                intent.putExtra(Settings.EXTRA_SUB_ID, info.getSubscriptionId());
+                mContext.startActivity(intent);
+                return true;
+            });
+
+            pref.setEnabled(getTelephonyManagerForSubscriptionId(subId).getCallState()
+                    == TelephonyManager.CALL_STATE_IDLE);
+            pref.setOrder(order++);
+            pref.setSummary(R.string.calls_sms_wfc_summary);
+
+            mWifiCallingForSubPreferences.put(subId, pref);
+        }
+    }
+
+    // Do nothing in this case since preference will not be impacted.
+    @Override
+    public void onAirplaneModeChanged(boolean airplaneModeEnabled) {
+    }
+
+    @Override
+    public void onSubscriptionsChanged() {
+        update();
+    }
+
+    /**
+     * To indicate that should show the Wi-Fi calling preference or not.
+     *
+     * It will check these 3 conditions:
+     * 1. Check the subscription is valid or not.
+     * 2. Check whether Wi-Fi Calling can be perform or not on this subscription.
+     * 3. Check the carrier's config (carrier_wfc_ims_available_bool). If true, the carrier
+     *    supports the Wi-Fi calling, otherwise false.
+     */
+    @VisibleForTesting
+    protected boolean shouldShowWifiCallingForSub(int subId) {
+        if (SubscriptionManager.isValidSubscriptionId(subId)
+                && MobileNetworkUtils.isWifiCallingEnabled(
+                mContext, subId, queryImsState(subId),
+                getPhoneAccountHandleForSubscriptionId(subId))
+                && isWifiCallingAvailableForCarrier(subId)) {
+            return true;
+        }
+        return false;
+    }
+
+    private boolean isWifiCallingAvailableForCarrier(int subId) {
+        boolean isWifiCallingAvailableForCarrier = false;
+        if (mCarrierConfigManager != null) {
+            final PersistableBundle carrierConfig =
+                    mCarrierConfigManager.getConfigForSubId(subId);
+            if (carrierConfig != null) {
+                isWifiCallingAvailableForCarrier = carrierConfig.getBoolean(
+                        CarrierConfigManager.KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL);
+            }
+        }
+        return isWifiCallingAvailableForCarrier;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_PREFERENCE_WIFICALLING_GROUP;
+    }
+}
diff --git a/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceController.java
new file mode 100644
index 0000000..f49a322
--- /dev/null
+++ b/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceController.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.content.Context;
+import android.telephony.CarrierConfigManager;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+
+/**
+ * Preference controller for "Wifi Calling"
+ */
+public class NetworkProviderWifiCallingPreferenceController extends
+        BasePreferenceController implements LifecycleObserver{
+
+    private static final String TAG = "NetworkProviderWfcController";
+    private static final String PREFERENCE_CATEGORY_KEY = "provider_model_calling_category";
+
+    private NetworkProviderWifiCallingGroup mNetworkProviderWifiCallingGroup;
+    private PreferenceCategory mPreferenceCategory;
+    private PreferenceScreen mPreferenceScreen;
+
+    public NetworkProviderWifiCallingPreferenceController(Context context, String key) {
+        super(context, key);
+    }
+
+    public void init(Lifecycle lifecycle) {
+        mNetworkProviderWifiCallingGroup = createWifiCallingControllerForSub(lifecycle);
+    }
+
+    @VisibleForTesting
+    protected NetworkProviderWifiCallingGroup createWifiCallingControllerForSub(
+            Lifecycle lifecycle) {
+        return new NetworkProviderWifiCallingGroup(mContext, lifecycle, PREFERENCE_CATEGORY_KEY);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        if (mNetworkProviderWifiCallingGroup == null
+                || !mNetworkProviderWifiCallingGroup.isAvailable()) {
+            return UNSUPPORTED_ON_DEVICE;
+        } else {
+            return AVAILABLE;
+        }
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreferenceScreen = screen;
+        mPreferenceCategory = screen.findPreference(PREFERENCE_CATEGORY_KEY);
+        mPreferenceCategory.setVisible(isAvailable());
+        mNetworkProviderWifiCallingGroup.displayPreference(screen);
+    }
+}
diff --git a/src/com/android/settings/network/telephony/NetworkProviderWorker.java b/src/com/android/settings/network/telephony/NetworkProviderWorker.java
new file mode 100644
index 0000000..bc82901
--- /dev/null
+++ b/src/com/android/settings/network/telephony/NetworkProviderWorker.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.os.Looper;
+import android.telephony.PhoneStateListener;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyDisplayInfo;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settings.network.MobileDataContentObserver;
+import com.android.settings.network.MobileDataEnabledListener;
+import com.android.settings.network.SubscriptionsChangeListener;
+import com.android.settings.wifi.slice.WifiScanWorker;
+
+import java.util.Collections;
+import java.util.concurrent.Executor;
+
+
+/**
+ * BackgroundWorker for Provider Model slice.
+ */
+public class NetworkProviderWorker extends WifiScanWorker implements
+        SignalStrengthListener.Callback, MobileDataEnabledListener.Client,
+        DataConnectivityListener.Client,
+        SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
+    private static final String TAG = "NetworkProviderWorker";
+    private static final int PROVIDER_MODEL_DEFAULT_EXPANDED_ROW_COUNT = 4;
+    private DataContentObserver mMobileDataObserver;
+    private SignalStrengthListener mSignalStrengthListener;
+    private SubscriptionsChangeListener mSubscriptionsListener;
+    private MobileDataEnabledListener mDataEnabledListener;
+    private DataConnectivityListener mConnectivityListener;
+
+    private final Context mContext;
+    @VisibleForTesting
+    final PhoneStateListener mPhoneStateListener;
+    private final SubscriptionManager mSubscriptionManager;
+    private final TelephonyManager mTelephonyManager;
+
+    public NetworkProviderWorker(Context context, Uri uri) {
+        super(context, uri);
+        // Mobile data worker
+        final Handler handler = new Handler(Looper.getMainLooper());
+        mMobileDataObserver = new DataContentObserver(handler, this);
+
+        mContext = context;
+        mSubscriptionManager = mContext.getSystemService(SubscriptionManager.class);
+        mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+
+        mPhoneStateListener = new NetworkProviderPhoneStateListener(handler::post);
+        mSubscriptionsListener = new SubscriptionsChangeListener(context, this);
+        mDataEnabledListener = new MobileDataEnabledListener(context, this);
+        mConnectivityListener = new DataConnectivityListener(context, this);
+        mSignalStrengthListener = new SignalStrengthListener(context, this);
+    }
+
+    @Override
+    protected void onSlicePinned() {
+        mMobileDataObserver.register(mContext,
+                getDefaultSubscriptionId(mSubscriptionManager));
+
+        mSubscriptionsListener.start();
+        mDataEnabledListener.start(SubscriptionManager.getDefaultDataSubscriptionId());
+        mConnectivityListener.start();
+        mSignalStrengthListener.resume();
+        mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE
+                | PhoneStateListener.LISTEN_ACTIVE_DATA_SUBSCRIPTION_ID_CHANGE
+                | PhoneStateListener.LISTEN_DISPLAY_INFO_CHANGED);
+
+        super.onSlicePinned();
+    }
+
+    @Override
+    protected void onSliceUnpinned() {
+        mMobileDataObserver.unregister(mContext);
+        mSubscriptionsListener.stop();
+        mDataEnabledListener.stop();
+        mConnectivityListener.stop();
+        mSignalStrengthListener.pause();
+        mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE);
+        super.onSliceUnpinned();
+    }
+
+    @Override
+    public void close() {
+        mMobileDataObserver = null;
+        super.close();
+    }
+
+    @Override
+    public int getApRowCount() {
+        return PROVIDER_MODEL_DEFAULT_EXPANDED_ROW_COUNT;
+    }
+
+    /**
+     * To update the Slice.
+     */
+    public void updateSlice() {
+        notifySliceChange();
+    }
+
+    @Override
+    public void onSubscriptionsChanged() {
+        int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+        Log.d(TAG, "onSubscriptionsChanged: defaultDataSubId:" + defaultDataSubId);
+
+        mSignalStrengthListener.updateSubscriptionIds(
+                SubscriptionManager.isUsableSubscriptionId(defaultDataSubId)
+                        ? Collections.singleton(defaultDataSubId) : Collections.emptySet());
+        if (defaultDataSubId != mDataEnabledListener.getSubId()) {
+            mDataEnabledListener.stop();
+            mDataEnabledListener.start(defaultDataSubId);
+        }
+        updateSlice();
+    }
+
+    @Override
+    public void onSignalStrengthChanged() {
+        Log.d(TAG, "onSignalStrengthChanged");
+        updateSlice();
+    }
+
+    @Override
+    public void onAirplaneModeChanged(boolean airplaneModeEnabled) {
+        Log.d(TAG, "onAirplaneModeChanged");
+        updateSlice();
+    }
+
+    @Override
+    public void onMobileDataEnabledChange() {
+        Log.d(TAG, "onMobileDataEnabledChange");
+        updateSlice();
+    }
+
+    @Override
+    public void onDataConnectivityChange() {
+        Log.d(TAG, "onDataConnectivityChange");
+        updateSlice();
+    }
+
+    /**
+     * Listen to update of mobile data change.
+     */
+    public class DataContentObserver extends ContentObserver {
+        private final NetworkProviderWorker mNetworkProviderWorker;
+
+        public DataContentObserver(Handler handler, NetworkProviderWorker backgroundWorker) {
+            super(handler);
+            mNetworkProviderWorker = backgroundWorker;
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            mNetworkProviderWorker.updateSlice();
+        }
+
+        /**
+         * To register the observer for mobile data changed.
+         * @param context the Context object.
+         * @param subId the default data subscription id.
+         */
+        public void register(Context context, int subId) {
+            final Uri uri = MobileDataContentObserver.getObservableUri(context, subId);
+            context.getContentResolver().registerContentObserver(uri, false, this);
+        }
+
+        /**
+         * To unregister the observer for mobile data changed.
+         * @param context the Context object.
+         */
+        public void unregister(Context context) {
+            context.getContentResolver().unregisterContentObserver(this);
+        }
+    }
+
+    class NetworkProviderPhoneStateListener extends PhoneStateListener {
+        NetworkProviderPhoneStateListener(Executor executor) {
+            super(executor);
+        }
+
+        @Override
+        public void onServiceStateChanged(ServiceState state) {
+            Log.d(TAG, "onServiceStateChanged voiceState=" + state.getState()
+                    + " dataState=" + state.getDataRegistrationState());
+            updateSlice();
+        }
+
+        @Override
+        public void onActiveDataSubscriptionIdChanged(int subId) {
+            Log.d(TAG, "onActiveDataSubscriptionIdChanged: subId=" + subId);
+            updateSlice();
+        }
+
+        @Override
+        public void onDisplayInfoChanged(TelephonyDisplayInfo telephonyDisplayInfo) {
+            Log.d(TAG, "onDisplayInfoChanged: telephonyDisplayInfo=" + telephonyDisplayInfo);
+            updateSlice();
+        }
+    }
+
+    protected static int getDefaultSubscriptionId(SubscriptionManager subscriptionManager) {
+        final SubscriptionInfo defaultSubscription = subscriptionManager.getActiveSubscriptionInfo(
+                subscriptionManager.getDefaultDataSubscriptionId());
+
+        if (defaultSubscription == null) {
+            return SubscriptionManager.INVALID_SUBSCRIPTION_ID; // No default subscription
+        }
+        return defaultSubscription.getSubscriptionId();
+    }
+}
diff --git a/src/com/android/settings/network/telephony/NetworkSelectSettings.java b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
index 3f18928..ff641e9 100644
--- a/src/com/android/settings/network/telephony/NetworkSelectSettings.java
+++ b/src/com/android/settings/network/telephony/NetworkSelectSettings.java
@@ -40,6 +40,7 @@
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 
+import com.android.internal.telephony.OperatorInfo;
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
@@ -185,12 +186,12 @@
 
             mRequestIdManualNetworkSelect = getNewRequestId();
             mWaitingForNumberOfScanResults = MIN_NUMBER_OF_SCAN_REQUIRED;
-            final String operatorNumeric = mSelectedPreference.getOperatorNumeric();
+            final OperatorInfo operator = mSelectedPreference.getOperatorInfo();
             ThreadUtils.postOnBackgroundThread(() -> {
                 final Message msg = mHandler.obtainMessage(
                         EVENT_SET_NETWORK_SELECTION_MANUALLY_DONE);
                 msg.obj = mTelephonyManager.setNetworkSelectionModeManual(
-                        operatorNumeric, true /* persistSelection */);
+                        operator, true /* persistSelection */);
                 msg.sendToTarget();
             });
         }
@@ -223,9 +224,13 @@
                     setProgressBarVisible(false);
                     getPreferenceScreen().setEnabled(true);
 
-                    mSelectedPreference.setSummary(isSucceed
-                            ? R.string.network_connected
-                            : R.string.network_could_not_connect);
+                    if (mSelectedPreference != null) {
+                        mSelectedPreference.setSummary(isSucceed
+                                ? R.string.network_connected
+                                : R.string.network_could_not_connect);
+                    } else {
+                        Log.e(TAG, "No preference to update!");
+                    }
                     break;
                 case EVENT_NETWORK_SCAN_RESULTS:
                     final List<CellInfo> results = (List<CellInfo>) msg.obj;
@@ -400,6 +405,9 @@
         if (mTelephonyManager.getDataState() == mTelephonyManager.DATA_CONNECTED) {
             // Try to get the network registration states
             final ServiceState ss = mTelephonyManager.getServiceState();
+            if (ss == null) {
+                return;
+            }
             final List<NetworkRegistrationInfo> networkList =
                     ss.getNetworkRegistrationInfoListForTransportType(
                             AccessNetworkConstants.TRANSPORT_TYPE_WWAN);
diff --git a/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java b/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
index 3911fb8..78dfe51 100644
--- a/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
+++ b/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceController.java
@@ -55,6 +55,13 @@
         super.updateState(preference);
 
         if (preference != null) {
+            // This is necessary to ensure that setting the title to the spannable string returned
+            // by getFooterText will be accepted.  Internally, setTitle does an equality check on
+            // the spannable string being set to the text already set on the preference.  That
+            // equality check apparently only takes into account the raw text and not and spannables
+            // that are part of the text.  So we clear the title before applying the spannable
+            // footer to ensure it is accepted.
+            preference.setTitle("");
             preference.setTitle(getFooterText());
         }
     }
diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
index 83fa208..ff6ff59 100644
--- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -153,7 +153,7 @@
                 if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
                         || mIsGlobalCdma
                         || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
-                    return R.string.preferred_network_mode_global_summary;
+                    return R.string.preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary;
                 } else {
                     return R.string.preferred_network_mode_lte_summary;
                 }
@@ -174,7 +174,7 @@
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA:
                 return R.string.preferred_network_mode_nr_lte_gsm_wcdma_summary;
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
-                return R.string.preferred_network_mode_nr_lte_cdma_evdo_gsm_wcdma_summary;
+                return R.string.preferred_network_mode_global_summary;
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
                 return R.string.preferred_network_mode_nr_lte_wcdma_summary;
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA:
diff --git a/src/com/android/settings/network/telephony/ProgressDialogFragment.java b/src/com/android/settings/network/telephony/ProgressDialogFragment.java
new file mode 100644
index 0000000..0d1b657
--- /dev/null
+++ b/src/com/android/settings/network/telephony/ProgressDialogFragment.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.app.ProgressDialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.KeyEvent;
+
+/** Fragment to show a progress dialog. */
+public class ProgressDialogFragment extends DialogFragment {
+    private static final String ARG_TITLE = "title";
+
+    private static final String TAG = "ProgressDialogFragment";
+
+    private OnDismissCallback mDismissCallback;
+
+    // Host fragment is optional to implement this interface.
+    public interface OnDismissCallback {
+        // Action performed when the progress dialog is dismissed.
+        void onProgressDialogDismiss();
+    }
+
+    /**
+     * Check whether there is already a showing progress dialog. If yes and the title of the showing
+     * one is the same with the new coming one, just return and do nothing. If the title of the
+     * showing one is different from the new one, remove the showing one and create a new dialog for
+     * the new one. If there is no progress dialog right now, just create a new one.
+     */
+    public static void show(FragmentManager fm, String title, OnDismissCallback dismissCallback) {
+        ProgressDialogFragment fragment = (ProgressDialogFragment) fm.findFragmentByTag(TAG);
+        if (fragment != null
+                && TextUtils.equals(fragment.getArguments().getString(ARG_TITLE), title)) {
+            return;
+        }
+
+        FragmentTransaction ft = fm.beginTransaction();
+        if (fragment != null) {
+            ft.remove(fragment);
+        }
+
+        fragment = new ProgressDialogFragment();
+        fragment.setDismissCallback(dismissCallback);
+
+        Bundle arguments = new Bundle();
+        arguments.putString(ARG_TITLE, title);
+        fragment.setArguments(arguments);
+        fragment.show(ft, TAG);
+    }
+
+    /**
+     * Called by the caller activity or fragment when the progress is finished.
+     *
+     * @param fm The fragment manager.
+     */
+    public static void dismiss(FragmentManager fm) {
+        DialogFragment fragment = (DialogFragment) fm.findFragmentByTag(TAG);
+        if (fragment != null) {
+            fragment.dismiss();
+        }
+    }
+
+    @Override
+    @SuppressWarnings("deprecation") // ProgressDialog is deprecated but is intended UX for now
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        ProgressDialog dialog = new ProgressDialog(getActivity());
+        dialog.setCancelable(false);
+        dialog.setCanceledOnTouchOutside(false);
+        dialog.setMessage(getArguments().getString(ARG_TITLE));
+        dialog.setOnKeyListener(
+                (progressDialog, keyCode, event) -> KeyEvent.KEYCODE_BACK == keyCode);
+
+        return dialog;
+    }
+
+    @Override
+    public void onDismiss(DialogInterface dialog) {
+        super.onDismiss(dialog);
+        if (mDismissCallback != null) {
+            mDismissCallback.onProgressDialogDismiss();
+        }
+    }
+
+    private void setDismissCallback(OnDismissCallback dismissCallback) {
+        mDismissCallback = dismissCallback;
+    }
+}
diff --git a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
index e53a452..2a7bc02 100644
--- a/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
+++ b/src/com/android/settings/network/telephony/RenameMobileNetworkDialogFragment.java
@@ -19,6 +19,7 @@
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Paint;
 import android.graphics.drawable.ShapeDrawable;
@@ -48,7 +49,10 @@
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settingslib.DeviceInfoUtils;
 
+import com.google.common.collect.ImmutableMap;
+
 import java.util.List;
+import java.util.Map;
 
 /**
  * A dialog allowing the display name of a mobile network subscription to be changed
@@ -65,6 +69,7 @@
     private EditText mNameView;
     private Spinner mColorSpinner;
     private Color[] mColors;
+    private Map<Integer, Integer> mLightDarkMap;
 
     public static RenameMobileNetworkDialogFragment newInstance(int subscriptionId) {
         final Bundle args = new Bundle(1);
@@ -100,6 +105,21 @@
         mTelephonyManager = getTelephonyManager(context);
         mSubscriptionManager = getSubscriptionManager(context);
         mSubId = getArguments().getInt(KEY_SUBSCRIPTION_ID);
+        Resources res = context.getResources();
+        mLightDarkMap = ImmutableMap.<Integer, Integer>builder()
+                .put(res.getInteger(R.color.SIM_color_teal),
+                        res.getInteger(R.color.SIM_dark_mode_color_teal))
+                .put(res.getInteger(R.color.SIM_color_blue),
+                        res.getInteger(R.color.SIM_dark_mode_color_blue))
+                .put(res.getInteger(R.color.SIM_color_indigo),
+                        res.getInteger(R.color.SIM_dark_mode_color_indigo))
+                .put(res.getInteger(R.color.SIM_color_purple),
+                        res.getInteger(R.color.SIM_dark_mode_color_purple))
+                .put(res.getInteger(R.color.SIM_color_pink),
+                        res.getInteger(R.color.SIM_dark_mode_color_pink))
+                .put(res.getInteger(R.color.SIM_color_red),
+                        res.getInteger(R.color.SIM_dark_mode_color_red))
+                .build();
     }
 
     @NonNull
@@ -163,7 +183,7 @@
         final TextView operatorName = view.findViewById(R.id.operator_name_value);
         mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
         final ServiceState serviceState = mTelephonyManager.getServiceState();
-        operatorName.setText(serviceState.getOperatorAlphaLong());
+        operatorName.setText(serviceState == null ? "" : serviceState.getOperatorAlphaLong());
 
         final TextView phoneTitle = view.findViewById(R.id.number_label);
         phoneTitle.setVisibility(info.isOpportunistic() ? View.GONE : View.VISIBLE);
@@ -196,8 +216,13 @@
             if (convertView == null) {
                 convertView = inflater.inflate(mItemResId, null);
             }
+            boolean isDarkMode = false;
+            if ((getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK)
+                    == Configuration.UI_MODE_NIGHT_YES) {
+                isDarkMode = true;
+            }
             ((ImageView) convertView.findViewById(R.id.color_icon))
-                    .setImageDrawable(getItem(position).getDrawable());
+                    .setImageDrawable(getItem(position).getDrawable(isDarkMode));
             ((TextView) convertView.findViewById(R.id.color_label))
                     .setText(getItem(position).getLabel());
 
@@ -223,7 +248,7 @@
         return colors;
     }
 
-    private static class Color {
+    private class Color {
 
         private String mLabel;
         private int mColor;
@@ -248,8 +273,15 @@
             return mColor;
         }
 
-        private ShapeDrawable getDrawable() {
+        private ShapeDrawable getDrawable(boolean isDarkMode) {
+            if (isDarkMode) {
+                mDrawable.getPaint().setColor(getDarkColor(mColor));
+            }
             return mDrawable;
         }
     }
+
+    private int getDarkColor(int lightColor) {
+        return mLightDarkMap.getOrDefault(lightColor, lightColor);
+    }
 }
diff --git a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
index cf544ab..fadddd5 100644
--- a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
+++ b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java
@@ -23,8 +23,12 @@
 
 public class SmsDefaultSubscriptionController extends DefaultSubscriptionController {
 
+    private final boolean mIsAskEverytimeSupported;
+
     public SmsDefaultSubscriptionController(Context context, String preferenceKey) {
         super(context, preferenceKey);
+        mIsAskEverytimeSupported = mContext.getResources()
+                .getBoolean(com.android.internal.R.bool.config_sms_ask_every_time_support);
     }
 
     @Override
@@ -43,6 +47,11 @@
     }
 
     @Override
+    protected boolean isAskEverytimeSupported() {
+        return mIsAskEverytimeSupported;
+    }
+
+    @Override
     public PhoneAccountHandle getDefaultCallingAccountHandle() {
         // Not supporting calling account override by VoIP
         return null;
diff --git a/src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java b/src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java
new file mode 100644
index 0000000..7ff0d9a
--- /dev/null
+++ b/src/com/android/settings/network/telephony/SubscriptionActionDialogActivity.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.telephony.SubscriptionManager;
+
+/** The base class for subscription action dialogs */
+public class SubscriptionActionDialogActivity extends Activity {
+
+    private static final String TAG = "SubscriptionActionDialogActivity";
+    // Arguments
+    protected static final String ARG_SUB_ID = "sub_id";
+
+    protected SubscriptionManager mSubscriptionManager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mSubscriptionManager = getSystemService(SubscriptionManager.class);
+    }
+
+    /**
+     * Displays a loading dialog.
+     *
+     * @param message The string content should be displayed in the progress dialog.
+     */
+    protected void showProgressDialog(String message) {
+        ProgressDialogFragment.show(getFragmentManager(), message, null);
+    }
+
+    /** Dismisses the loading dialog. */
+    protected void dismissProgressDialog() {
+        ProgressDialogFragment.dismiss(getFragmentManager());
+    }
+
+    /**
+     * Displays an error dialog to indicate the subscription action failure.
+     *
+     * @param title The title of the error dialog.
+     * @param message The body text of the error dialog.
+     */
+    protected void showErrorDialog(String title, String message) {
+        AlertDialogFragment.show(this, title, message);
+    }
+}
diff --git a/src/com/android/settings/network/telephony/TelephonyBasePreferenceController.java b/src/com/android/settings/network/telephony/TelephonyBasePreferenceController.java
index 2bd7de9..3972f39 100644
--- a/src/com/android/settings/network/telephony/TelephonyBasePreferenceController.java
+++ b/src/com/android/settings/network/telephony/TelephonyBasePreferenceController.java
@@ -17,6 +17,7 @@
 package com.android.settings.network.telephony;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.os.PersistableBundle;
 import android.telephony.CarrierConfigManager;
 import android.telephony.SubscriptionManager;
@@ -74,4 +75,13 @@
                 mContext.getSystemService(CarrierConfigManager.class);
         return carrierConfigMgr.getConfigForSubId(subId);
     }
+
+    /**
+     * Returns the resources associated with Subscription.
+     *
+     * @return Resources associated with Subscription.
+     */
+    public Resources getResourcesForSubId() {
+        return SubscriptionManager.getResourcesForSubId(mContext, mSubId);
+    }
 }
diff --git a/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java b/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
index 12c9bee..3716f1f 100644
--- a/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
+++ b/src/com/android/settings/network/telephony/TelephonyStatusControlSession.java
@@ -22,6 +22,7 @@
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.utils.ThreadUtils;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -37,7 +38,7 @@
     private static final String LOG_TAG = "TelephonyStatusControlSS";
 
     private Collection<AbstractPreferenceController> mControllers;
-    private Future<Boolean> mResult;
+    private Collection<Future<Boolean>> mResult = new ArrayList<>();
 
     /**
      * Buider of session
@@ -67,9 +68,9 @@
 
     private TelephonyStatusControlSession(Collection<AbstractPreferenceController> controllers) {
         mControllers = controllers;
-        mResult = ThreadUtils.postOnBackgroundThread(() ->
-            setupAvailabilityStatus(controllers)
-        );
+        controllers.forEach(prefCtrl -> mResult
+                .add(ThreadUtils.postOnBackgroundThread(() -> setupAvailabilityStatus(prefCtrl))));
+
     }
 
     /**
@@ -79,25 +80,24 @@
      */
     public void close() {
         //check the background thread is finished then unset the status of availability.
-        try {
-            mResult.get();
-        } catch (ExecutionException | InterruptedException exception) {
-            Log.e(LOG_TAG, "setup availability status failed!", exception);
+
+        for (Future<Boolean> result : mResult) {
+            try {
+                result.get();
+            } catch (ExecutionException | InterruptedException exception) {
+                Log.e(LOG_TAG, "setup availability status failed!", exception);
+            }
         }
         unsetAvailabilityStatus(mControllers);
     }
 
-    private Boolean setupAvailabilityStatus(
-            Collection<AbstractPreferenceController> controllerLists) {
+    private Boolean setupAvailabilityStatus(AbstractPreferenceController controller) {
         try {
-            controllerLists.stream()
-                    .filter(controller -> controller instanceof TelephonyAvailabilityHandler)
-                    .map(TelephonyAvailabilityHandler.class::cast)
-                    .forEach(controller -> {
-                        int status = ((BasePreferenceController) controller)
-                                .getAvailabilityStatus();
-                        controller.setAvailabilityStatus(status);
-                    });
+            if (controller instanceof TelephonyAvailabilityHandler) {
+                int status = ((BasePreferenceController) controller)
+                        .getAvailabilityStatus();
+                ((TelephonyAvailabilityHandler) controller).setAvailabilityStatus(status);
+            }
             return true;
         } catch (Exception exception) {
             Log.e(LOG_TAG, "Setup availability status failed!", exception);
diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
new file mode 100644
index 0000000..4af42ba
--- /dev/null
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -0,0 +1,478 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.UserManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccSlotInfo;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.R;
+import com.android.settings.SidecarFragment;
+import com.android.settings.network.EnableMultiSimSidecar;
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.network.SwitchToEuiccSubscriptionSidecar;
+import com.android.settings.network.SwitchToRemovableSlotSidecar;
+import com.android.settings.network.UiccSlotUtil;
+import com.android.settings.sim.SimActivationNotifier;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+
+/** This dialog activity handles both eSIM and pSIM subscriptions enabling and disabling. */
+public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogActivity
+        implements SidecarFragment.Listener, ConfirmDialogFragment.OnConfirmListener {
+
+    private static final String TAG = "ToggleSubscriptionDialogActivity";
+    // Arguments
+    @VisibleForTesting
+    public static final String ARG_enable = "enable";
+    // Dialog tags
+    private static final int DIALOG_TAG_DISABLE_SIM_CONFIRMATION = 1;
+    private static final int DIALOG_TAG_ENABLE_SIM_CONFIRMATION = 2;
+    private static final int DIALOG_TAG_ENABLE_DSDS_CONFIRMATION = 3;
+    private static final int DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION = 4;
+    // Number of SIMs for DSDS
+    private static final int NUM_OF_SIMS_FOR_DSDS = 2;
+
+    /**
+     * Returns an intent of ToggleSubscriptionDialogActivity.
+     *
+     * @param context The context used to start the ToggleSubscriptionDialogActivity.
+     * @param subId The subscription ID of the subscription needs to be toggled.
+     * @param enable Whether the activity should enable or disable the subscription.
+     */
+    public static Intent getIntent(Context context, int subId, boolean enable) {
+        Intent intent = new Intent(context, ToggleSubscriptionDialogActivity.class);
+        intent.putExtra(ARG_SUB_ID, subId);
+        intent.putExtra(ARG_enable, enable);
+        return intent;
+    }
+
+    private SubscriptionInfo mSubInfo;
+    private SwitchToEuiccSubscriptionSidecar mSwitchToEuiccSubscriptionSidecar;
+    private SwitchToRemovableSlotSidecar mSwitchToRemovableSlotSidecar;
+    private EnableMultiSimSidecar mEnableMultiSimSidecar;
+    private boolean mEnable;
+    private boolean mIsEsimOperation;
+    private TelephonyManager mTelMgr;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        int subId = intent.getIntExtra(ARG_SUB_ID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        mTelMgr = getSystemService(TelephonyManager.class);
+
+        UserManager userManager = getSystemService(UserManager.class);
+        if (!userManager.isAdminUser()) {
+            Log.e(TAG, "It is not the admin user. Unable to toggle subscription.");
+            finish();
+            return;
+        }
+
+        if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
+            Log.e(TAG, "The subscription id is not usable.");
+            finish();
+            return;
+        }
+
+        mSubInfo = SubscriptionUtil.getSubById(mSubscriptionManager, subId);
+        mIsEsimOperation = mSubInfo != null && mSubInfo.isEmbedded();
+        mSwitchToEuiccSubscriptionSidecar =
+                SwitchToEuiccSubscriptionSidecar.get(getFragmentManager());
+        mSwitchToRemovableSlotSidecar = SwitchToRemovableSlotSidecar.get(getFragmentManager());
+        mEnableMultiSimSidecar = EnableMultiSimSidecar.get(getFragmentManager());
+        mEnable = intent.getBooleanExtra(ARG_enable, true);
+
+        if (savedInstanceState == null) {
+            if (mEnable) {
+                showEnableSubDialog();
+            } else {
+                showDisableSimConfirmDialog();
+            }
+        }
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        mSwitchToEuiccSubscriptionSidecar.addListener(this);
+        mSwitchToRemovableSlotSidecar.addListener(this);
+        mEnableMultiSimSidecar.addListener(this);
+    }
+
+    @Override
+    protected void onPause() {
+        mEnableMultiSimSidecar.removeListener(this);
+        mSwitchToRemovableSlotSidecar.removeListener(this);
+        mSwitchToEuiccSubscriptionSidecar.removeListener(this);
+        super.onPause();
+    }
+
+    @Override
+    public void onStateChange(SidecarFragment fragment) {
+        if (fragment == mSwitchToEuiccSubscriptionSidecar) {
+            handleSwitchToEuiccSubscriptionSidecarStateChange();
+        } else if (fragment == mSwitchToRemovableSlotSidecar) {
+            handleSwitchToRemovableSlotSidecarStateChange();
+        } else if (fragment == mEnableMultiSimSidecar) {
+            handleEnableMultiSimSidecarStateChange();
+        }
+    }
+
+    @Override
+    public void onConfirm(int tag, boolean confirmed) {
+        if (!confirmed
+                && tag != DIALOG_TAG_ENABLE_DSDS_CONFIRMATION
+                && tag != DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION) {
+            finish();
+            return;
+        }
+
+        switch (tag) {
+            case DIALOG_TAG_DISABLE_SIM_CONFIRMATION:
+                if (mIsEsimOperation) {
+                    Log.i(TAG, "Disabling the eSIM profile.");
+                    showProgressDialog(
+                            getString(R.string.privileged_action_disable_sub_dialog_progress));
+                    mSwitchToEuiccSubscriptionSidecar.run(
+                            SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+                    return;
+                }
+                Log.i(TAG, "Disabling the pSIM profile.");
+                handleTogglePsimAction();
+                break;
+            case DIALOG_TAG_ENABLE_DSDS_CONFIRMATION:
+                if (!confirmed) {
+                    Log.i(TAG, "User cancel the dialog to enable DSDS.");
+                    showEnableSimConfirmDialog();
+                    return;
+                }
+                if (mTelMgr.doesSwitchMultiSimConfigTriggerReboot()) {
+                    Log.i(TAG, "Device does not support reboot free DSDS.");
+                    showRebootConfirmDialog();
+                    return;
+                }
+                Log.i(
+                        TAG,
+                        "Enabling DSDS without rebooting. "
+                                + getString(R.string.sim_action_enabling_sim_without_carrier_name));
+                showProgressDialog(
+                        getString(R.string.sim_action_enabling_sim_without_carrier_name));
+                mEnableMultiSimSidecar.run(NUM_OF_SIMS_FOR_DSDS);
+                break;
+            case DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION:
+                if (!confirmed) {
+                    Log.i(TAG, "User cancel the dialog to reboot to enable DSDS.");
+                    showEnableSimConfirmDialog();
+                    return;
+                }
+                Log.i(TAG, "User confirmed reboot to enable DSDS.");
+                SimActivationNotifier.setShowSimSettingsNotification(this, true);
+                mTelMgr.switchMultiSimConfig(NUM_OF_SIMS_FOR_DSDS);
+                break;
+            case DIALOG_TAG_ENABLE_SIM_CONFIRMATION:
+                Log.i(TAG, "User confirmed to enable the subscription.");
+                if (mIsEsimOperation) {
+                    showProgressDialog(
+                            getString(
+                                    R.string.sim_action_switch_sub_dialog_progress,
+                                    mSubInfo.getDisplayName()));
+                    mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId());
+                    return;
+                }
+                showProgressDialog(
+                        getString(R.string.sim_action_enabling_sim_without_carrier_name));
+                mSwitchToRemovableSlotSidecar.run(UiccSlotUtil.INVALID_PHYSICAL_SLOT_ID);
+                break;
+            default:
+                Log.e(TAG, "Unrecognized confirmation dialog tag: " + tag);
+                break;
+        }
+    }
+
+    private void handleSwitchToEuiccSubscriptionSidecarStateChange() {
+        switch (mSwitchToEuiccSubscriptionSidecar.getState()) {
+            case SidecarFragment.State.SUCCESS:
+                Log.i(
+                        TAG,
+                        String.format(
+                                "Successfully %s the eSIM profile.",
+                                mEnable ? "enable" : "disable"));
+                mSwitchToEuiccSubscriptionSidecar.reset();
+                dismissProgressDialog();
+                finish();
+                break;
+            case SidecarFragment.State.ERROR:
+                Log.i(
+                        TAG,
+                        String.format(
+                                "Failed to %s the eSIM profile.", mEnable ? "enable" : "disable"));
+                mSwitchToEuiccSubscriptionSidecar.reset();
+                dismissProgressDialog();
+                showErrorDialog(
+                        getString(R.string.privileged_action_disable_fail_title),
+                        getString(R.string.privileged_action_disable_fail_text));
+                break;
+        }
+    }
+
+    private void handleSwitchToRemovableSlotSidecarStateChange() {
+        switch (mSwitchToRemovableSlotSidecar.getState()) {
+            case SidecarFragment.State.SUCCESS:
+                Log.i(TAG, "Successfully switched to removable slot.");
+                mSwitchToRemovableSlotSidecar.reset();
+                handleTogglePsimAction();
+                dismissProgressDialog();
+                finish();
+                break;
+            case SidecarFragment.State.ERROR:
+                Log.e(TAG, "Failed switching to removable slot.");
+                mSwitchToRemovableSlotSidecar.reset();
+                dismissProgressDialog();
+                showErrorDialog(
+                        getString(R.string.sim_action_enable_sim_fail_title),
+                        getString(R.string.sim_action_enable_sim_fail_text));
+                break;
+        }
+    }
+
+    private void handleEnableMultiSimSidecarStateChange() {
+        switch (mEnableMultiSimSidecar.getState()) {
+            case SidecarFragment.State.SUCCESS:
+                mEnableMultiSimSidecar.reset();
+                Log.i(TAG, "Successfully switched to DSDS without reboot.");
+                handleEnableSubscriptionAfterEnablingDsds();
+                break;
+            case SidecarFragment.State.ERROR:
+                mEnableMultiSimSidecar.reset();
+                Log.i(TAG, "Failed to switch to DSDS without rebooting.");
+                ProgressDialogFragment.dismiss(getFragmentManager());
+                showErrorDialog(
+                        getString(R.string.dsds_activation_failure_title),
+                        getString(R.string.dsds_activation_failure_body_msg2));
+                break;
+        }
+    }
+
+    private void handleEnableSubscriptionAfterEnablingDsds() {
+        if (mIsEsimOperation) {
+            Log.i(TAG, "DSDS enabled, start to enable profile: " + mSubInfo.getSubscriptionId());
+            // For eSIM operations, we simply switch to the selected eSIM profile.
+            mSwitchToEuiccSubscriptionSidecar.run(mSubInfo.getSubscriptionId());
+            return;
+        }
+
+        Log.i(TAG, "DSDS enabled, start to enable pSIM profile.");
+        handleTogglePsimAction();
+        ProgressDialogFragment.dismiss(getFragmentManager());
+        finish();
+    }
+
+    private void handleTogglePsimAction() {
+        if (mSubscriptionManager.canDisablePhysicalSubscription() && mSubInfo != null) {
+            mSubscriptionManager.setUiccApplicationsEnabled(mSubInfo.getSubscriptionId(), mEnable);
+            finish();
+        } else {
+            Log.i(
+                    TAG,
+                    "The device does not support toggling pSIM. It is enough to just "
+                            + "enable the removable slot.");
+        }
+    }
+
+    /* Handles the enabling SIM action. */
+    private void showEnableSubDialog() {
+        Log.i(TAG, "Handle subscription enabling.");
+        if (isDsdsConditionSatisfied()) {
+            showEnableDsdsConfirmDialog();
+            return;
+        }
+        if (!mIsEsimOperation && mTelMgr.isMultiSimEnabled()) {
+            Log.i(TAG, "Toggle on pSIM, no dialog displayed.");
+            handleTogglePsimAction();
+            finish();
+            return;
+        }
+        showEnableSimConfirmDialog();
+    }
+
+    private void showEnableDsdsConfirmDialog() {
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_ENABLE_DSDS_CONFIRMATION,
+                getString(R.string.sim_action_enable_dsds_title),
+                getString(R.string.sim_action_enable_dsds_text),
+                getString(R.string.sim_action_continue),
+                getString(R.string.sim_action_no_thanks));
+    }
+
+    private void showRebootConfirmDialog() {
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_ENABLE_DSDS_REBOOT_CONFIRMATION,
+                getString(R.string.sim_action_restart_title),
+                getString(R.string.sim_action_enable_dsds_text),
+                getString(R.string.sim_action_reboot),
+                getString(R.string.cancel));
+    }
+
+    /* Displays the SIM toggling confirmation dialog. */
+    private void showDisableSimConfirmDialog() {
+        String title =
+                mSubInfo == null || TextUtils.isEmpty(mSubInfo.getDisplayName())
+                        ? getString(
+                                R.string.privileged_action_disable_sub_dialog_title_without_carrier)
+                        : getString(
+                                R.string.privileged_action_disable_sub_dialog_title,
+                                mSubInfo.getDisplayName());
+
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_DISABLE_SIM_CONFIRMATION,
+                title,
+                null,
+                getString(R.string.yes),
+                getString(R.string.cancel));
+    }
+
+    private void showEnableSimConfirmDialog() {
+        List<SubscriptionInfo> activeSubs =
+                SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager);
+        SubscriptionInfo activeSub = activeSubs.isEmpty() ? null : activeSubs.get(0);
+        if (activeSub == null) {
+            Log.i(TAG, "No active subscriptions available.");
+            showNonSwitchSimConfirmDialog();
+            return;
+        }
+        Log.i(TAG, "Found active subscription.");
+        boolean isBetweenEsim = mIsEsimOperation && activeSub.isEmbedded();
+        if (mTelMgr.isMultiSimEnabled() && !isBetweenEsim) {
+            showNonSwitchSimConfirmDialog();
+            return;
+        }
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_ENABLE_SIM_CONFIRMATION,
+                getSwitchSubscriptionTitle(),
+                getSwitchDialogBodyMsg(activeSub, isBetweenEsim),
+                getSwitchDialogPosBtnText(),
+                getString(android.R.string.cancel));
+    }
+
+    private void showNonSwitchSimConfirmDialog() {
+        ConfirmDialogFragment.show(
+                this,
+                ConfirmDialogFragment.OnConfirmListener.class,
+                DIALOG_TAG_ENABLE_SIM_CONFIRMATION,
+                getEnableSubscriptionTitle(),
+                null /* msg */,
+                getString(R.string.yes),
+                getString(android.R.string.cancel));
+    }
+
+    private String getSwitchDialogPosBtnText() {
+        return mIsEsimOperation
+                ? getString(
+                        R.string.sim_action_switch_sub_dialog_confirm, mSubInfo.getDisplayName())
+                : getString(R.string.sim_switch_button);
+    }
+
+    private String getEnableSubscriptionTitle() {
+        if (mSubInfo == null || TextUtils.isEmpty(mSubInfo.getDisplayName())) {
+            return getString(R.string.sim_action_enable_sub_dialog_title_without_carrier_name);
+        }
+        return getString(R.string.sim_action_enable_sub_dialog_title, mSubInfo.getDisplayName());
+    }
+
+    private String getSwitchSubscriptionTitle() {
+        if (mIsEsimOperation) {
+            return getString(
+                    R.string.sim_action_switch_sub_dialog_title, mSubInfo.getDisplayName());
+        }
+        return getString(R.string.sim_action_switch_psim_dialog_title);
+    }
+
+    private String getSwitchDialogBodyMsg(SubscriptionInfo activeSub, boolean betweenEsim) {
+        if (betweenEsim && mIsEsimOperation) {
+            return getString(
+                    R.string.sim_action_switch_sub_dialog_text_downloaded,
+                    mSubInfo.getDisplayName(),
+                    activeSub.getDisplayName());
+        } else if (mIsEsimOperation) {
+            return getString(
+                    R.string.sim_action_switch_sub_dialog_text,
+                    mSubInfo.getDisplayName(),
+                    activeSub.getDisplayName());
+        } else {
+            return getString(
+                    R.string.sim_action_switch_sub_dialog_text_single_sim,
+                    activeSub.getDisplayName());
+        }
+    }
+
+    private boolean isDsdsConditionSatisfied() {
+        if (mTelMgr.isMultiSimEnabled()) {
+            Log.i(TAG, "DSDS is already enabled. Condition not satisfied.");
+            return false;
+        }
+        if (mTelMgr.isMultiSimSupported() != TelephonyManager.MULTISIM_ALLOWED) {
+            Log.i(TAG, "Hardware does not support DSDS.");
+            return false;
+        }
+        ImmutableList<UiccSlotInfo> slotInfos = UiccSlotUtil.getSlotInfos(mTelMgr);
+        boolean isRemovableSimEnabled =
+                slotInfos.stream()
+                        .anyMatch(
+                                slot ->
+                                        slot != null
+                                                && slot.isRemovable()
+                                                && slot.getIsActive()
+                                                && slot.getCardStateInfo()
+                                                        == UiccSlotInfo.CARD_STATE_INFO_PRESENT);
+        if (mIsEsimOperation && isRemovableSimEnabled) {
+            Log.i(TAG, "eSIM operation and removable SIM is enabled. DSDS condition satisfied.");
+            return true;
+        }
+        boolean isEsimProfileEnabled =
+                SubscriptionUtil.getActiveSubscriptions(mSubscriptionManager).stream()
+                        .anyMatch(SubscriptionInfo::isEmbedded);
+        if (!mIsEsimOperation && isEsimProfileEnabled) {
+            Log.i(
+                    TAG,
+                    "Removable SIM operation and eSIM profile is enabled. DSDS condition"
+                        + " satisfied.");
+            return true;
+        }
+        Log.i(TAG, "DSDS condition not satisfied.");
+        return false;
+    }
+}
diff --git a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
index 3321fb3..fa8b47f 100644
--- a/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/VideoCallingPreferenceController.java
@@ -182,6 +182,9 @@
             if (SubscriptionManager.isValidSubscriptionId(subId)) {
                 mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
             }
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mTelephonyManager.getCallState(subId);
             mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
         }
 
diff --git a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
index 32be36e..94a5999 100644
--- a/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
+++ b/src/com/android/settings/network/telephony/WifiCallingPreferenceController.java
@@ -47,6 +47,7 @@
 /**
  * Preference controller for "Wifi Calling"
  */
+//TODO: Remove the class once Provider Model is always enabled in the future.
 public class WifiCallingPreferenceController extends TelephonyBasePreferenceController implements
         LifecycleObserver, OnStart, OnStop {
 
@@ -71,7 +72,7 @@
     @Override
     public int getAvailabilityStatus(int subId) {
         return SubscriptionManager.isValidSubscriptionId(subId)
-                && isWifiCallingEnabled(mContext, subId)
+                && MobileNetworkUtils.isWifiCallingEnabled(mContext, subId, null, null)
                 ? AVAILABLE
                 : UNSUPPORTED_ON_DEVICE;
     }
@@ -210,6 +211,9 @@
 
         public void register(Context context, int subId) {
             mTelephonyManager = getTelephonyManager(context, subId);
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mTelephonyManager.getCallState(subId);
             mTelephonyManager.listen(this, PhoneStateListener.LISTEN_CALL_STATE);
         }
 
@@ -218,23 +222,4 @@
             mTelephonyManager.listen(this, PhoneStateListener.LISTEN_NONE);
         }
     }
-
-    private boolean isWifiCallingEnabled(Context context, int subId) {
-        final PhoneAccountHandle simCallManager =
-                context.getSystemService(TelecomManager.class)
-                       .getSimCallManagerForSubscription(subId);
-        final int phoneId = SubscriptionManager.getSlotIndex(subId);
-
-        boolean isWifiCallingEnabled;
-        if (simCallManager != null) {
-            final Intent intent = MobileNetworkUtils.buildPhoneAccountConfigureIntent(
-                    context, simCallManager);
-
-            isWifiCallingEnabled = intent != null;
-        } else {
-            isWifiCallingEnabled = queryImsState(subId).isReadyToWifiCalling();
-        }
-
-        return isWifiCallingEnabled;
-    }
 }
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
index e714fbe..4959565 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceController.java
@@ -67,19 +67,20 @@
     public boolean onPreferenceChange(Preference preference, Object object) {
         final int newMode = Integer.parseInt((String) object);
         //TODO(b/117611981): only set it in one place
-        if (mTelephonyManager.setCdmaSubscriptionMode(newMode)) {
+        try {
+            mTelephonyManager.setCdmaSubscriptionMode(newMode);
             Settings.Global.putInt(mContext.getContentResolver(),
                     Settings.Global.CDMA_SUBSCRIPTION_MODE, newMode);
             return true;
+        } catch (IllegalStateException e) {
+            return false;
         }
-
-        return false;
     }
 
     @VisibleForTesting
     boolean deviceSupportsNvAndRuim() {
         // retrieve the list of subscription types supported by device.
-        final String subscriptionsSupported = SystemProperties.get("ril.subscription.types");
+        final String subscriptionsSupported = getRilSubscriptionTypes();
         boolean nvSupported = false;
         boolean ruimSupported = false;
 
@@ -98,4 +99,9 @@
 
         return (nvSupported && ruimSupported);
     }
+
+    @VisibleForTesting
+    protected String getRilSubscriptionTypes() {
+        return SystemProperties.get("ril.subscription.types");
+    }
 }
diff --git a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
index 13324fc..2b0c221 100644
--- a/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceController.java
@@ -63,13 +63,14 @@
     public boolean onPreferenceChange(Preference preference, Object object) {
         int newMode = Integer.parseInt((String) object);
         //TODO(b/117611981): only set it in one place
-        if (mTelephonyManager.setCdmaRoamingMode(newMode)) {
+        try {
+            mTelephonyManager.setCdmaRoamingMode(newMode);
             Settings.Global.putInt(mContext.getContentResolver(),
                     Settings.Global.CDMA_ROAMING_MODE, newMode);
             return true;
+        } catch (IllegalStateException e) {
+            return false;
         }
-
-        return false;
     }
 
     private void resetCdmaRoamingModeToDefault() {
diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
index 361f58e..5fa70f9 100644
--- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
@@ -29,6 +29,7 @@
 import android.os.SystemClock;
 import android.provider.Settings;
 import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 
@@ -50,6 +51,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -125,7 +127,13 @@
         super.updateState(preference);
 
         preference.setSummary(null);
-        if (mTelephonyManager.getServiceState().getRoaming()) {
+        final ServiceState serviceState = mTelephonyManager.getServiceState();
+        if (serviceState == null) {
+            preference.setEnabled(false);
+            return;
+        }
+
+        if (serviceState.getRoaming()) {
             preference.setEnabled(true);
         } else {
             preference.setEnabled(!mOnlyAutoSelectInHome);
@@ -140,27 +148,7 @@
     @Override
     public boolean setChecked(boolean isChecked) {
         if (isChecked) {
-            final long startMillis = SystemClock.elapsedRealtime();
-            showAutoSelectProgressBar();
-            mSwitchPreference.setEnabled(false);
-            ThreadUtils.postOnBackgroundThread(() -> {
-                // set network selection mode in background
-                mTelephonyManager.setNetworkSelectionModeAutomatic();
-                final int mode = mTelephonyManager.getNetworkSelectionMode();
-
-                //Update UI in UI thread
-                final long durationMillis = SystemClock.elapsedRealtime() - startMillis;
-                mUiHandler.postDelayed(() -> {
-                            mSwitchPreference.setEnabled(true);
-                            mSwitchPreference.setChecked(
-                                    mode == TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
-                            for (OnNetworkSelectModeListener lsn : mListeners) {
-                                lsn.onNetworkSelectModeChanged();
-                            }
-                            dismissProgressBar();
-                        },
-                        Math.max(MINIMUM_DIALOG_TIME_MILLIS - durationMillis, 0));
-            });
+            setAutomaticSelectionMode();
             return false;
         } else {
             final Bundle bundle = new Bundle();
@@ -175,6 +163,30 @@
         }
     }
 
+    @VisibleForTesting
+    Future setAutomaticSelectionMode() {
+        final long startMillis = SystemClock.elapsedRealtime();
+        showAutoSelectProgressBar();
+        mSwitchPreference.setEnabled(false);
+        return ThreadUtils.postOnBackgroundThread(() -> {
+            // set network selection mode in background
+            mTelephonyManager.setNetworkSelectionModeAutomatic();
+            final int mode = mTelephonyManager.getNetworkSelectionMode();
+
+            //Update UI in UI thread
+            final long durationMillis = SystemClock.elapsedRealtime() - startMillis;
+            mUiHandler.postDelayed(() -> {
+                mSwitchPreference.setEnabled(true);
+                mSwitchPreference.setChecked(
+                        mode == TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
+                for (OnNetworkSelectModeListener lsn : mListeners) {
+                    lsn.onNetworkSelectModeChanged();
+                }
+                dismissProgressBar();
+            }, Math.max(MINIMUM_DIALOG_TIME_MILLIS - durationMillis, 0));
+        });
+    }
+
     public AutoSelectPreferenceController init(Lifecycle lifecycle, int subId) {
         mSubId = subId;
         mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
diff --git a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java
index bed25cd..f75fd4b 100644
--- a/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java
+++ b/src/com/android/settings/notification/AdjustVolumeRestrictedPreferenceController.java
@@ -64,6 +64,7 @@
         filter.addAction(AudioManager.VOLUME_CHANGED_ACTION);
         filter.addAction(AudioManager.STREAM_MUTE_CHANGED_ACTION);
         filter.addAction(AudioManager.MASTER_MUTE_CHANGED_ACTION);
+        filter.addAction(AudioManager.STREAM_DEVICES_CHANGED_ACTION);
         return filter;
     }
 }
diff --git a/src/com/android/settings/notification/AssistantFeedbackPreferenceController.java b/src/com/android/settings/notification/AssistantFeedbackPreferenceController.java
new file mode 100644
index 0000000..491fd8b
--- /dev/null
+++ b/src/com/android/settings/notification/AssistantFeedbackPreferenceController.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2020 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.notification;
+
+import static android.provider.Settings.Global.NOTIFICATION_FEEDBACK_ENABLED;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.Handler;
+import android.provider.DeviceConfig;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+import com.google.common.annotations.VisibleForTesting;
+
+public class AssistantFeedbackPreferenceController extends TogglePreferenceController
+        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener,
+        LifecycleObserver, OnResume, OnPause {
+
+    @VisibleForTesting
+    static final int ON = 1;
+    @VisibleForTesting
+    static final int OFF = 0;
+
+    private SettingObserver mSettingObserver;
+
+    public AssistantFeedbackPreferenceController(Context context,
+            String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        Preference preference = screen.findPreference(NOTIFICATION_FEEDBACK_ENABLED);
+        if (preference != null) {
+            mSettingObserver = new SettingObserver(preference);
+        }
+    }
+
+    @Override
+    public void onResume() {
+        if (mSettingObserver != null) {
+            mSettingObserver.register(mContext.getContentResolver(), true /* register */);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (mSettingObserver != null) {
+            mSettingObserver.register(mContext.getContentResolver(), false /* register */);
+        }
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
+                        SystemUiDeviceConfigFlags.ENABLE_NAS_FEEDBACK, false)
+                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                NOTIFICATION_FEEDBACK_ENABLED, ON) == ON;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.Global.putInt(mContext.getContentResolver(),
+                NOTIFICATION_FEEDBACK_ENABLED, isChecked ? ON : OFF);
+    }
+
+    class SettingObserver extends ContentObserver {
+
+        private final Uri NOTIFICATION_URI =
+                Settings.Global.getUriFor(NOTIFICATION_FEEDBACK_ENABLED);
+
+        private final Preference mPreference;
+
+        SettingObserver(Preference preference) {
+            super(new Handler());
+            mPreference = preference;
+        }
+
+        public void register(ContentResolver cr, boolean register) {
+            if (register) {
+                cr.registerContentObserver(NOTIFICATION_URI, false, this);
+            } else {
+                cr.unregisterContentObserver(this);
+            }
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            super.onChange(selfChange, uri);
+            if (NOTIFICATION_URI.equals(uri)) {
+                updateState(mPreference);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/BubbleNotificationPreferenceController.java b/src/com/android/settings/notification/BubbleNotificationPreferenceController.java
index 0fa480c..1c7b4df 100644
--- a/src/com/android/settings/notification/BubbleNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BubbleNotificationPreferenceController.java
@@ -18,6 +18,7 @@
 
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
+import android.app.ActivityManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.database.ContentObserver;
@@ -81,7 +82,8 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        ActivityManager am = mContext.getSystemService(ActivityManager.class);
+        return am.isLowRamDevice() ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
     }
 
     @Override
diff --git a/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java b/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java
index f123c51..a99155f 100644
--- a/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceController.java
@@ -18,6 +18,7 @@
 
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.provider.Settings;
 
@@ -48,7 +49,8 @@
 
     @Override
     public int getAvailabilityStatus() {
-        return AVAILABLE;
+        ActivityManager am = mContext.getSystemService(ActivityManager.class);
+        return am.isLowRamDevice() ? UNSUPPORTED_ON_DEVICE : AVAILABLE;
     }
 
     private boolean areBubblesEnabled() {
diff --git a/src/com/android/settings/notification/ImportanceResetPreferenceController.java b/src/com/android/settings/notification/ImportanceResetPreferenceController.java
new file mode 100644
index 0000000..3c66f1a
--- /dev/null
+++ b/src/com/android/settings/notification/ImportanceResetPreferenceController.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2020 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.notification;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Toast;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.widget.LayoutPreference;
+
+public class ImportanceResetPreferenceController extends BasePreferenceController implements
+        View.OnClickListener {
+
+    public static final String KEY = "asst_importance_reset";
+    private static final String TAG = "ResetImportanceButton";
+
+    private NotificationBackend mBackend;
+    private Button mButton;
+
+    public ImportanceResetPreferenceController(Context context, String key) {
+        super(context, key);
+        mBackend = new NotificationBackend();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+
+        mButton = ((LayoutPreference) preference)
+                .findViewById(R.id.reset_importance_button);
+        mButton.setOnClickListener(this);
+    }
+
+    @Override
+    public void onClick(View v) {
+        mBackend.resetNotificationImportance();
+        Toast.makeText(mContext, R.string.reset_importance_completed, Toast.LENGTH_SHORT)
+                            .show();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+}
+
diff --git a/src/com/android/settings/notification/NotificationAccessSettings.java b/src/com/android/settings/notification/NotificationAccessSettings.java
index 9df548c..65ad571 100644
--- a/src/com/android/settings/notification/NotificationAccessSettings.java
+++ b/src/com/android/settings/notification/NotificationAccessSettings.java
@@ -35,7 +35,6 @@
 import android.view.View;
 import android.widget.Toast;
 
-import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
@@ -48,6 +47,7 @@
 import com.android.settings.widget.EmptyTextSettings;
 import com.android.settingslib.applications.ServiceListing;
 import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.widget.apppreference.AppPreference;
 
 import java.util.List;
 
@@ -140,7 +140,7 @@
                 Log.e(TAG, "can't find package name", e);
             }
 
-            final Preference pref = new Preference(getPrefContext());
+            final AppPreference pref = new AppPreference(getPrefContext());
             pref.setTitle(title);
             pref.setIcon(mIconDrawableFactory.getBadgedIcon(service, service.applicationInfo,
                     UserHandle.getUserId(service.applicationInfo.uid)));
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index e23e4a5..6d51eb3 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -541,6 +541,15 @@
         }
     }
 
+    public void createConversationNotificationChannel(String pkg, int uid,
+            NotificationChannel parent, String conversationId) {
+        try {
+            sINM.createConversationNotificationChannelForPackage(pkg, uid, parent, conversationId);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+    }
+
     public ShortcutInfo getConversationInfo(Context context, String pkg, int uid, String id) {
         LauncherApps la = context.getSystemService(LauncherApps.class);
 
@@ -576,6 +585,14 @@
         sm.requestPinShortcut(shortcutInfo, null);
     }
 
+    public void resetNotificationImportance() {
+        try {
+            sINM.unlockAllNotificationChannels();
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+        }
+    }
+
     /**
      * NotificationsSentState contains how often an app sends notifications and how recently it sent
      * one.
diff --git a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
index aaa96bcc..bab0d5f 100644
--- a/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
@@ -33,13 +33,19 @@
 import android.util.IconDrawableFactory;
 import android.util.Slog;
 
+import androidx.annotation.VisibleForTesting;
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.app.AppNotificationSettings;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.TwoTargetPreference;
 import com.android.settingslib.applications.ApplicationsState;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -52,12 +58,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import androidx.annotation.VisibleForTesting;
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
 /**
  * This controller displays a list of recently used apps and a "See all" button. If there is
  * no recently used app, "See all" will be displayed as "Notifications".
@@ -223,13 +223,13 @@
 
         // Rebind prefs/avoid adding new prefs if possible. Adding/removing prefs causes jank.
         // Build a cached preference pool
-        final Map<String, MasterSwitchPreference> appPreferences = new ArrayMap<>();
+        final Map<String, PrimarySwitchPreference> appPreferences = new ArrayMap<>();
         int prefCount = mCategory.getPreferenceCount();
         for (int i = 0; i < prefCount; i++) {
             final Preference pref = mCategory.getPreference(i);
             final String key = pref.getKey();
             if (!TextUtils.equals(key, KEY_SEE_ALL)) {
-                appPreferences.put(key, (MasterSwitchPreference) pref);
+                appPreferences.put(key, (PrimarySwitchPreference) pref);
             }
         }
         final int recentAppsCount = recentApps.size();
@@ -244,10 +244,10 @@
             }
 
             boolean rebindPref = true;
-            MasterSwitchPreference pref = appPreferences.remove(getKey(app.getUserId(),
+            PrimarySwitchPreference pref = appPreferences.remove(getKey(app.getUserId(),
                     pkgName));
             if (pref == null) {
-                pref = new MasterSwitchPreference(prefContext);
+                pref = new PrimarySwitchPreference(prefContext);
                 rebindPref = false;
             }
             pref.setKey(getKey(app.getUserId(), pkgName));
diff --git a/src/com/android/settings/notification/RedactionInterstitial.java b/src/com/android/settings/notification/RedactionInterstitial.java
index ac648a5..a17298f 100644
--- a/src/com/android/settings/notification/RedactionInterstitial.java
+++ b/src/com/android/settings/notification/RedactionInterstitial.java
@@ -62,8 +62,8 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     @Override
diff --git a/src/com/android/settings/notification/RemoteVolumeGroupController.java b/src/com/android/settings/notification/RemoteVolumeGroupController.java
index 6d3c96d..eaff9e1 100644
--- a/src/com/android/settings/notification/RemoteVolumeGroupController.java
+++ b/src/com/android/settings/notification/RemoteVolumeGroupController.java
@@ -18,6 +18,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.media.MediaRouter2Manager;
 import android.media.RoutingSessionInfo;
 import android.text.TextUtils;
 
@@ -57,6 +58,8 @@
 
     @VisibleForTesting
     LocalMediaManager mLocalMediaManager;
+    @VisibleForTesting
+    MediaRouter2Manager mRouterManager;
 
     public RemoteVolumeGroupController(Context context, String preferenceKey) {
         super(context, preferenceKey);
@@ -65,6 +68,7 @@
             mLocalMediaManager.registerCallback(this);
             mLocalMediaManager.startScan();
         }
+        mRouterManager = MediaRouter2Manager.getInstance(context);
     }
 
     @Override
@@ -98,38 +102,80 @@
         mLocalMediaManager.stopScan();
     }
 
-    private void refreshPreference() {
-        mPreferenceCategory.removeAll();
+    private synchronized void refreshPreference() {
         if (!isAvailable()) {
             mPreferenceCategory.setVisible(false);
             return;
         }
         final CharSequence castVolume = mContext.getText(R.string.remote_media_volume_option_title);
         mPreferenceCategory.setVisible(true);
-
         for (RoutingSessionInfo info : mRoutingSessionInfos) {
-            if (mPreferenceCategory.findPreference(info.getId()) != null) {
+            final CharSequence appName = Utils.getApplicationLabel(mContext,
+                    info.getClientPackageName());
+            RemoteVolumeSeekBarPreference seekBarPreference = mPreferenceCategory.findPreference(
+                    info.getId());
+            if (seekBarPreference != null) {
+                // Update slider
+                if (seekBarPreference.getProgress() != info.getVolume()) {
+                    seekBarPreference.setProgress(info.getVolume());
+                }
+            } else {
+                // Add slider
+                seekBarPreference = new RemoteVolumeSeekBarPreference(mContext);
+                seekBarPreference.setKey(info.getId());
+                seekBarPreference.setTitle(castVolume);
+                seekBarPreference.setMax(info.getVolumeMax());
+                seekBarPreference.setProgress(info.getVolume());
+                seekBarPreference.setMin(0);
+                seekBarPreference.setOnPreferenceChangeListener(this);
+                seekBarPreference.setIcon(R.drawable.ic_volume_remote);
+                mPreferenceCategory.addPreference(seekBarPreference);
+            }
+
+            Preference switcherPreference = mPreferenceCategory.findPreference(
+                    SWITCHER_PREFIX + info.getId());
+            final boolean isMediaOutputDisabled = mLocalMediaManager.shouldDisableMediaOutput(
+                    info.getClientPackageName());
+            final CharSequence outputTitle = mContext.getString(R.string.media_output_label_title,
+                    appName);
+            if (switcherPreference != null) {
+                // Update output indicator
+                switcherPreference.setTitle(isMediaOutputDisabled ? appName : outputTitle);
+                switcherPreference.setSummary(info.getName());
+                switcherPreference.setEnabled(!isMediaOutputDisabled);
+            } else {
+                // Add output indicator
+                switcherPreference = new Preference(mContext);
+                switcherPreference.setKey(SWITCHER_PREFIX + info.getId());
+                switcherPreference.setTitle(isMediaOutputDisabled ? appName : outputTitle);
+                switcherPreference.setSummary(info.getName());
+                switcherPreference.setEnabled(!isMediaOutputDisabled);
+                mPreferenceCategory.addPreference(switcherPreference);
+            }
+        }
+
+        // Check and remove non-active session preference
+        // There is a pair of preferences for each session. First one is a seekBar preference.
+        // The second one shows the session information and provide an entry-point to launch output
+        // switcher. It is unnecessary to go through all preferences. It is fine ignore the second
+        // preference and only to check the seekBar's key value.
+        for (int i = 0; i < mPreferenceCategory.getPreferenceCount(); i = i + 2) {
+            final Preference preference = mPreferenceCategory.getPreference(i);
+            boolean isActive = false;
+            for (RoutingSessionInfo info : mRoutingSessionInfos) {
+                if (TextUtils.equals(preference.getKey(), info.getId())) {
+                    isActive = true;
+                    break;
+                }
+            }
+            if (isActive) {
                 continue;
             }
-            final CharSequence outputTitle = mContext.getString(R.string.media_output_label_title,
-                    Utils.getApplicationLabel(mContext, info.getClientPackageName()));
-            // Add slider
-            final RemoteVolumeSeekBarPreference seekBarPreference =
-                    new RemoteVolumeSeekBarPreference(mContext);
-            seekBarPreference.setKey(info.getId());
-            seekBarPreference.setTitle(castVolume);
-            seekBarPreference.setMax(info.getVolumeMax());
-            seekBarPreference.setProgress(info.getVolume());
-            seekBarPreference.setMin(0);
-            seekBarPreference.setOnPreferenceChangeListener(this);
-            seekBarPreference.setIcon(R.drawable.ic_volume_remote);
-            mPreferenceCategory.addPreference(seekBarPreference);
-            // Add output indicator
-            final Preference preference = new Preference(mContext);
-            preference.setKey(SWITCHER_PREFIX + info.getId());
-            preference.setTitle(outputTitle);
-            preference.setSummary(info.getName());
-            mPreferenceCategory.addPreference(preference);
+            final Preference switcherPreference = mPreferenceCategory.getPreference(i + 1);
+            if (switcherPreference != null) {
+                mPreferenceCategory.removePreference(preference);
+                mPreferenceCategory.removePreference(switcherPreference);
+            }
         }
     }
 
@@ -150,11 +196,11 @@
             if (TextUtils.equals(info.getId(),
                     preference.getKey().substring(SWITCHER_PREFIX.length()))) {
                 final Intent intent = new Intent()
-                        .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
-                        .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)
+                        .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)
                         .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
                                 info.getClientPackageName());
-                mContext.startActivity(intent);
+                mContext.sendBroadcast(intent);
                 return true;
             }
         }
@@ -172,8 +218,10 @@
             // Preference group is not ready.
             return;
         }
-        initRemoteMediaSession();
-        refreshPreference();
+        ThreadUtils.postOnMainThread(() -> {
+            initRemoteMediaSession();
+            refreshPreference();
+        });
     }
 
     @Override
diff --git a/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java b/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
index df1f4a2..f8f76ca 100644
--- a/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
+++ b/src/com/android/settings/notification/ShowOnLockScreenNotificationPreferenceController.java
@@ -35,6 +35,7 @@
 import java.util.ArrayList;
 
 import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
 public class ShowOnLockScreenNotificationPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
@@ -66,8 +67,9 @@
     }
 
     @Override
-    public void updateState(Preference preference) {
-        RestrictedListPreference pref = (RestrictedListPreference) preference;
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        RestrictedListPreference pref = screen.findPreference(mSettingKey);
         pref.clearRestrictedItems();
         ArrayList<CharSequence> entries = new ArrayList<>();
         ArrayList<CharSequence> values = new ArrayList<>();
@@ -104,7 +106,7 @@
 
         pref.setOnPreferenceChangeListener(this);
 
-        refreshSummary(preference);
+        refreshSummary(pref);
     }
 
     @Override
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 9e7f3ed..1ad093f 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -76,6 +76,7 @@
     private RingtonePreference mRequestPreference;
     private UpdatableListPreferenceDialogFragment mDialogFragment;
     private String mHfpOutputControllerKey;
+    private String mVibrationPreferencesKey = "vibration_preference_screen";
 
     @Override
     public int getMetricsCategory() {
@@ -127,6 +128,10 @@
 
     @Override
     public void onDisplayPreferenceDialog(Preference preference) {
+        if (TextUtils.equals(mVibrationPreferencesKey, preference.getKey())) {
+            super.onDisplayPreferenceDialog(preference);
+            return;
+        }
         final int metricsCategory;
         if (mHfpOutputControllerKey.equals(preference.getKey())) {
             metricsCategory = SettingsEnums.DIALOG_SWITCH_HFP_DEVICES;
@@ -199,10 +204,6 @@
 
         @Override
         public void onSampleStarting(SeekBarVolumizer sbv) {
-            if (mCurrent != null && mCurrent != sbv) {
-                mCurrent.stopSample();
-            }
-            mCurrent = sbv;
             if (mCurrent != null) {
                 mHandler.removeMessages(STOP_SAMPLE);
                 mHandler.sendEmptyMessageDelayed(STOP_SAMPLE, SAMPLE_CUTOFF);
@@ -217,6 +218,15 @@
             }
         }
 
+        @Override
+        public void onStartTrackingTouch(SeekBarVolumizer sbv) {
+            // stop the ringtone when other seek bar is adjust
+            if (mCurrent != null && mCurrent != sbv) {
+                mCurrent.stopSample();
+            }
+            mCurrent = sbv;
+        }
+
         public void stopSample() {
             if (mCurrent != null) {
                 mCurrent.stopSample();
@@ -310,4 +320,4 @@
             mDialogFragment.onListPreferenceUpdated(preference);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index 92b3cae..36a4d8a 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -138,6 +138,12 @@
                 mZenMuted = zenMuted;
                 updateIconView();
             }
+            @Override
+            public void onStartTrackingTouch(SeekBarVolumizer sbv) {
+                if (mCallback != null) {
+                    mCallback.onStartTrackingTouch(sbv);
+                }
+            }
         };
         final Uri sampleUri = mStream == AudioManager.STREAM_MUSIC ? getMediaVolumeUri() : null;
         if (mVolumizer == null) {
@@ -201,5 +207,10 @@
     public interface Callback {
         void onSampleStarting(SeekBarVolumizer sbv);
         void onStreamValueChanged(int stream, int progress);
+
+        /**
+         * Callback reporting that the seek bar is start tracking.
+         */
+        void onStartTrackingTouch(SeekBarVolumizer sbv);
     }
 }
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
index f7bf75f..b32f922 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreferenceController.java
@@ -107,7 +107,10 @@
         return mHelper.getMinVolume(getAudioStream());
     }
 
-    protected abstract int getAudioStream();
+    /**
+     * @return the audio stream type
+     */
+    public abstract int getAudioStream();
 
     protected abstract int getMuteIcon();
 
diff --git a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
index fa05299..684a27a 100644
--- a/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
+++ b/src/com/android/settings/notification/app/AppChannelsBypassingDndPreferenceController.java
@@ -39,7 +39,7 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.util.ArrayList;
@@ -92,8 +92,8 @@
                         // the 0th index is the mAllNotificationsToggle which allows users to
                         // toggle all notifications from this app to bypass DND
                         for (int i = 1; i < mPreferenceCategory.getPreferenceCount(); i++) {
-                            MasterSwitchPreference childPreference =
-                                    (MasterSwitchPreference) mPreferenceCategory.getPreference(i);
+                            PrimarySwitchPreference childPreference =
+                                    (PrimarySwitchPreference) mPreferenceCategory.getPreference(i);
                             childPreference.setChecked(showNotificationInDnd(mChannels.get(i - 1)));
                         }
                         return true;
@@ -158,7 +158,7 @@
         mPreferenceCategory.removeAll();
         mPreferenceCategory.addPreference(mAllNotificationsToggle);
         for (NotificationChannel channel : mChannels) {
-            MasterSwitchPreference channelPreference = new MasterSwitchPreference(mContext);
+            PrimarySwitchPreference channelPreference = new PrimarySwitchPreference(mContext);
             channelPreference.setDisabledByAdmin(mAdmin);
             channelPreference.setSwitchEnabled(
                     (mAdmin == null || !channelPreference.isDisabledByAdmin())
diff --git a/src/com/android/settings/notification/app/BlockPreferenceController.java b/src/com/android/settings/notification/app/BlockPreferenceController.java
index f55ea8c..2738962 100644
--- a/src/com/android/settings/notification/app/BlockPreferenceController.java
+++ b/src/com/android/settings/notification/app/BlockPreferenceController.java
@@ -106,8 +106,11 @@
             // It's always safe to override the importance if it's meant to be blocked or if
             // it was blocked and we are unblocking it.
             if (blocked || originalImportance == IMPORTANCE_NONE) {
-                final int importance = blocked ? IMPORTANCE_NONE
-                        : isDefaultChannel() ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_DEFAULT;
+                final int importance = blocked
+                        ? IMPORTANCE_NONE
+                        : isDefaultChannel()
+                                ? IMPORTANCE_UNSPECIFIED
+                                : mChannel.getOriginalImportance();
                 mChannel.setImportance(importance);
                 saveChannel();
             }
diff --git a/src/com/android/settings/notification/app/BubblePreference.java b/src/com/android/settings/notification/app/BubblePreference.java
index 7e071ff..f0046d7 100644
--- a/src/com/android/settings/notification/app/BubblePreference.java
+++ b/src/com/android/settings/notification/app/BubblePreference.java
@@ -45,8 +45,6 @@
     private int mSelectedPreference;
 
     private Context mContext;
-    private Drawable mSelectedBackground;
-    private Drawable mUnselectedBackground;
 
     private ButtonViewHolder mBubbleAllButton;
     private ButtonViewHolder mBubbleSelectedButton;
@@ -72,8 +70,6 @@
         mHelper = new RestrictedPreferenceHelper(context, this, attrs);
         mHelper.useAdminDisabledSummary(true);
         mContext = context;
-        mSelectedBackground = mContext.getDrawable(R.drawable.button_border_selected);
-        mUnselectedBackground = mContext.getDrawable(R.drawable.button_border_unselected);
         setLayoutResource(R.layout.bubble_preference);
     }
 
@@ -167,7 +163,9 @@
         }
 
         void setSelected(Context context, boolean selected) {
-            mView.setBackground(selected ?  mSelectedBackground : mUnselectedBackground);
+            mView.setBackground(mContext.getDrawable(selected
+                ? R.drawable.button_border_selected
+                : R.drawable.button_border_unselected));
             mView.setSelected(selected);
 
             ColorStateList stateList = selected
diff --git a/src/com/android/settings/notification/app/BubblePreferenceController.java b/src/com/android/settings/notification/app/BubblePreferenceController.java
index 1aed156..8f452f7 100644
--- a/src/com/android/settings/notification/app/BubblePreferenceController.java
+++ b/src/com/android/settings/notification/app/BubblePreferenceController.java
@@ -19,6 +19,7 @@
 import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE;
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
+import android.app.ActivityManager;
 import android.annotation.Nullable;
 import android.content.Context;
 import android.provider.Settings;
@@ -77,7 +78,7 @@
             if (isDefaultChannel()) {
                 return true;
             } else {
-                return mAppRow != null;
+                return mAppRow != null &&  mAppRow.bubblePreference != BUBBLE_PREFERENCE_NONE;
             }
         }
         return true;
@@ -139,7 +140,8 @@
     }
 
     private boolean isGloballyEnabled() {
-        return Settings.Global.getInt(mContext.getContentResolver(),
+        ActivityManager am = mContext.getSystemService(ActivityManager.class);
+        return !am.isLowRamDevice() && Settings.Global.getInt(mContext.getContentResolver(),
                 NOTIFICATION_BUBBLES, SYSTEM_WIDE_OFF) == SYSTEM_WIDE_ON;
     }
 
diff --git a/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java b/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
index 7519c23..236e628 100644
--- a/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
+++ b/src/com/android/settings/notification/app/BubbleSummaryPreferenceController.java
@@ -20,6 +20,7 @@
 import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE;
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
@@ -99,7 +100,8 @@
     }
 
     private boolean isGloballyEnabled() {
-        return Settings.Global.getInt(mContext.getContentResolver(),
+        ActivityManager am = mContext.getSystemService(ActivityManager.class);
+        return !am.isLowRamDevice() && Settings.Global.getInt(mContext.getContentResolver(),
                 NOTIFICATION_BUBBLES, ON) == ON;
     }
 }
diff --git a/src/com/android/settings/notification/app/ChannelListPreferenceController.java b/src/com/android/settings/notification/app/ChannelListPreferenceController.java
index b19fc71..8410ce1 100644
--- a/src/com/android/settings/notification/app/ChannelListPreferenceController.java
+++ b/src/com/android/settings/notification/app/ChannelListPreferenceController.java
@@ -23,16 +23,14 @@
 import android.app.NotificationChannelGroup;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.graphics.BlendMode;
-import android.graphics.BlendModeColorFilter;
 import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.LayerDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceGroup;
@@ -43,7 +41,7 @@
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.NotificationBackend;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.util.ArrayList;
@@ -53,7 +51,8 @@
 public class ChannelListPreferenceController extends NotificationPreferenceController {
 
     private static final String KEY = "channels";
-    private static String KEY_GENERAL_CATEGORY = "categories";
+    private static final String KEY_GENERAL_CATEGORY = "categories";
+    private static final String KEY_ZERO_CATEGORIES = "zeroCategories";
     public static final String ARG_FROM_SETTINGS = "fromSettings";
 
     private List<NotificationChannelGroup> mChannelGroupList;
@@ -102,62 +101,192 @@
                 if (mContext == null) {
                     return;
                 }
-                populateList();
+                updateFullList(mPreference, mChannelGroupList);
             }
         }.execute();
     }
 
-    private void populateList() {
-        // TODO: if preference has children, compare with newly loaded list
-        mPreference.removeAll();
-
-        if (mChannelGroupList.isEmpty()) {
-            PreferenceCategory groupCategory = new PreferenceCategory(mContext);
-            groupCategory.setTitle(R.string.notification_channels);
-            groupCategory.setKey(KEY_GENERAL_CATEGORY);
-            mPreference.addPreference(groupCategory);
-
-            Preference empty = new Preference(mContext);
-            empty.setTitle(R.string.no_channels);
-            empty.setEnabled(false);
-            groupCategory.addPreference(empty);
-        } else {
-            populateGroupList();
-        }
-    }
-
-    private void populateGroupList() {
-        for (NotificationChannelGroup group : mChannelGroupList) {
-            PreferenceCategory groupCategory = new PreferenceCategory(mContext);
-            groupCategory.setOrderingAsAdded(true);
-            mPreference.addPreference(groupCategory);
-            if (group.getId() == null) {
-                groupCategory.setTitle(R.string.notification_channels_other);
-                groupCategory.setKey(KEY_GENERAL_CATEGORY);
+    /**
+     * Update the preferences group to match the
+     * @param groupPrefsList
+     * @param channelGroups
+     */
+    void updateFullList(@NonNull PreferenceCategory groupPrefsList,
+                @NonNull List<NotificationChannelGroup> channelGroups) {
+        if (channelGroups.isEmpty()) {
+            if (groupPrefsList.getPreferenceCount() == 1
+                    && KEY_ZERO_CATEGORIES.equals(groupPrefsList.getPreference(0).getKey())) {
+                // Ensure the titles are correct for the current language, but otherwise leave alone
+                PreferenceGroup groupCategory = (PreferenceGroup) groupPrefsList.getPreference(0);
+                groupCategory.setTitle(R.string.notification_channels);
+                groupCategory.getPreference(0).setTitle(R.string.no_channels);
             } else {
-                groupCategory.setTitle(group.getName());
-                groupCategory.setKey(group.getId());
-                populateGroupToggle(groupCategory, group);
+                // Clear any contents and create the 'zero-categories' group.
+                groupPrefsList.removeAll();
+
+                PreferenceCategory groupCategory = new PreferenceCategory(mContext);
+                groupCategory.setTitle(R.string.notification_channels);
+                groupCategory.setKey(KEY_ZERO_CATEGORIES);
+                groupPrefsList.addPreference(groupCategory);
+
+                Preference empty = new Preference(mContext);
+                empty.setTitle(R.string.no_channels);
+                empty.setEnabled(false);
+                groupCategory.addPreference(empty);
             }
-            if (!group.isBlocked()) {
-                final List<NotificationChannel> channels = group.getChannels();
-                Collections.sort(channels, CHANNEL_COMPARATOR);
-                int N = channels.size();
-                for (int i = 0; i < N; i++) {
-                    final NotificationChannel channel = channels.get(i);
-                    // conversations get their own section
-                    if (TextUtils.isEmpty(channel.getConversationId()) || channel.isDemoted()) {
-                        populateSingleChannelPrefs(groupCategory, channel, group.isBlocked());
-                    }
-                }
+        } else {
+            updateGroupList(groupPrefsList, channelGroups);
+        }
+    }
+
+    /**
+     * Looks for the category for the given group's key at the expected index, if that doesn't
+     * match, it checks all groups, and if it can't find that group anywhere, it creates it.
+     */
+    @NonNull
+    private PreferenceCategory findOrCreateGroupCategoryForKey(
+            @NonNull PreferenceCategory groupPrefsList, @Nullable String key, int expectedIndex) {
+        if (key == null) {
+            key = KEY_GENERAL_CATEGORY;
+        }
+        int preferenceCount = groupPrefsList.getPreferenceCount();
+        if (expectedIndex < preferenceCount) {
+            Preference preference = groupPrefsList.getPreference(expectedIndex);
+            if (key.equals(preference.getKey())) {
+                return (PreferenceCategory) preference;
+            }
+        }
+        for (int i = 0; i < preferenceCount; i++) {
+            Preference preference = groupPrefsList.getPreference(i);
+            if (key.equals(preference.getKey())) {
+                preference.setOrder(expectedIndex);
+                return (PreferenceCategory) preference;
+            }
+        }
+        PreferenceCategory groupCategory = new PreferenceCategory(mContext);
+        groupCategory.setOrder(expectedIndex);
+        groupCategory.setKey(key);
+        groupPrefsList.addPreference(groupCategory);
+        return groupCategory;
+    }
+
+    private void updateGroupList(@NonNull PreferenceCategory groupPrefsList,
+            @NonNull List<NotificationChannelGroup> channelGroups) {
+        // Update the list, but optimize for the most common case where the list hasn't changed.
+        int numFinalGroups = channelGroups.size();
+        int initialPrefCount = groupPrefsList.getPreferenceCount();
+        List<PreferenceCategory> finalOrderedGroups = new ArrayList<>(numFinalGroups);
+        for (int i = 0; i < numFinalGroups; i++) {
+            NotificationChannelGroup group = channelGroups.get(i);
+            PreferenceCategory groupCategory =
+                    findOrCreateGroupCategoryForKey(groupPrefsList, group.getId(), i);
+            finalOrderedGroups.add(groupCategory);
+            updateGroupPreferences(group, groupCategory);
+        }
+        int postAddPrefCount = groupPrefsList.getPreferenceCount();
+        // If any groups were inserted (into a non-empty list) or need to be removed, we need to
+        // remove all groups and re-add them all.
+        // This is required to ensure proper ordering of inserted groups, and it simplifies logic
+        // at the cost of computation in the rare case that the list is changing.
+        boolean hasInsertions = initialPrefCount != 0 && initialPrefCount != numFinalGroups;
+        boolean requiresRemoval = postAddPrefCount != numFinalGroups;
+        if (hasInsertions || requiresRemoval) {
+            groupPrefsList.removeAll();
+            for (PreferenceCategory group : finalOrderedGroups) {
+                groupPrefsList.addPreference(group);
             }
         }
     }
 
-    protected void populateGroupToggle(final PreferenceGroup parent,
-            NotificationChannelGroup group) {
-        RestrictedSwitchPreference preference =
-                new RestrictedSwitchPreference(mContext);
+    /**
+     * Looks for the channel preference for the given channel's key at the expected index, if that
+     * doesn't match, it checks all rows, and if it can't find that channel anywhere, it creates
+     * the preference.
+     */
+    @NonNull
+    private PrimarySwitchPreference findOrCreateChannelPrefForKey(
+            @NonNull PreferenceGroup groupPrefGroup, @NonNull String key, int expectedIndex) {
+        int preferenceCount = groupPrefGroup.getPreferenceCount();
+        if (expectedIndex < preferenceCount) {
+            Preference preference = groupPrefGroup.getPreference(expectedIndex);
+            if (key.equals(preference.getKey())) {
+                return (PrimarySwitchPreference) preference;
+            }
+        }
+        for (int i = 0; i < preferenceCount; i++) {
+            Preference preference = groupPrefGroup.getPreference(i);
+            if (key.equals(preference.getKey())) {
+                preference.setOrder(expectedIndex);
+                return (PrimarySwitchPreference) preference;
+            }
+        }
+        PrimarySwitchPreference channelPref = new PrimarySwitchPreference(mContext);
+        channelPref.setOrder(expectedIndex);
+        channelPref.setKey(key);
+        groupPrefGroup.addPreference(channelPref);
+        return channelPref;
+    }
+
+    private void updateGroupPreferences(@NonNull NotificationChannelGroup group,
+            @NonNull PreferenceGroup groupPrefGroup) {
+        int initialPrefCount = groupPrefGroup.getPreferenceCount();
+        List<Preference> finalOrderedPrefs = new ArrayList<>();
+        if (group.getId() == null) {
+            // For the 'null' group, set the "Other" title.
+            groupPrefGroup.setTitle(R.string.notification_channels_other);
+        } else {
+            // For an app-defined group, set their name and create a row to toggle 'isBlocked'.
+            groupPrefGroup.setTitle(group.getName());
+            finalOrderedPrefs.add(addOrUpdateGroupToggle(groupPrefGroup, group));
+        }
+        // Here "empty" means having no channel rows; the group toggle is ignored for this purpose.
+        boolean initiallyEmpty = groupPrefGroup.getPreferenceCount() == finalOrderedPrefs.size();
+
+        // For each channel, add or update the preference object.
+        final List<NotificationChannel> channels =
+                group.isBlocked() ? Collections.emptyList() : group.getChannels();
+        Collections.sort(channels, CHANNEL_COMPARATOR);
+        for (NotificationChannel channel : channels) {
+            if (!TextUtils.isEmpty(channel.getConversationId()) && !channel.isDemoted()) {
+                // conversations get their own section
+                continue;
+            }
+            // Get or create the row, and populate its current state.
+            PrimarySwitchPreference channelPref = findOrCreateChannelPrefForKey(groupPrefGroup,
+                    channel.getId(), /* expectedIndex */ finalOrderedPrefs.size());
+            updateSingleChannelPrefs(channelPref, channel, group.isBlocked());
+            finalOrderedPrefs.add(channelPref);
+        }
+        int postAddPrefCount = groupPrefGroup.getPreferenceCount();
+
+        // If any channels were inserted (into a non-empty list) or need to be removed, we need to
+        // remove all preferences and re-add them all.
+        // This is required to ensure proper ordering of inserted channels, and it simplifies logic
+        // at the cost of computation in the rare case that the list is changing.
+        int numFinalGroups = finalOrderedPrefs.size();
+        boolean hasInsertions = !initiallyEmpty && initialPrefCount != numFinalGroups;
+        boolean requiresRemoval = postAddPrefCount != numFinalGroups;
+        if (hasInsertions || requiresRemoval) {
+            groupPrefGroup.removeAll();
+            for (Preference preference : finalOrderedPrefs) {
+                groupPrefGroup.addPreference(preference);
+            }
+        }
+    }
+
+    /** Add or find and update the toggle for disabling the entire notification channel group. */
+    private Preference addOrUpdateGroupToggle(@NonNull final PreferenceGroup parent,
+            @NonNull final NotificationChannelGroup group) {
+        boolean shouldAdd = false;
+        final RestrictedSwitchPreference preference;
+        if (parent.getPreferenceCount() > 0
+                && parent.getPreference(0) instanceof RestrictedSwitchPreference) {
+            preference = (RestrictedSwitchPreference) parent.getPreference(0);
+        } else {
+            shouldAdd = true;
+            preference = new RestrictedSwitchPreference(mContext);
+        }
+        preference.setOrder(-1);
         preference.setTitle(mContext.getString(
                 R.string.notification_switch_label, group.getName()));
         preference.setEnabled(mAdmin == null
@@ -171,23 +300,26 @@
             onGroupBlockStateChanged(group);
             return true;
         });
-
-        parent.addPreference(preference);
+        if (shouldAdd) {
+            parent.addPreference(preference);
+        }
+        return preference;
     }
 
-    protected Preference populateSingleChannelPrefs(PreferenceGroup parent,
-            final NotificationChannel channel, final boolean groupBlocked) {
-        MasterSwitchPreference channelPref = new MasterSwitchPreference(mContext);
+    /** Update the properties of the channel preference with the values from the channel object. */
+    private void updateSingleChannelPrefs(@NonNull final PrimarySwitchPreference channelPref,
+            @NonNull final NotificationChannel channel,
+            final boolean groupBlocked) {
         channelPref.setSwitchEnabled(mAdmin == null
                 && isChannelBlockable(channel)
                 && isChannelConfigurable(channel)
                 && !groupBlocked);
-        channelPref.setIcon(null);
         if (channel.getImportance() > IMPORTANCE_LOW) {
             channelPref.setIcon(getAlertingIcon());
+        } else {
+            channelPref.setIcon(null);
         }
-        channelPref.setIconSize(MasterSwitchPreference.ICON_SIZE_SMALL);
-        channelPref.setKey(channel.getId());
+        channelPref.setIconSize(PrimarySwitchPreference.ICON_SIZE_SMALL);
         channelPref.setTitle(channel.getName());
         channelPref.setSummary(NotificationBackend.getSentSummary(
                 mContext, mAppRow.sentByChannel.get(channel.getId()), false));
@@ -207,25 +339,18 @@
         channelPref.setOnPreferenceChangeListener(
                 (preference, o) -> {
                     boolean value = (Boolean) o;
-                    int importance = value ? IMPORTANCE_LOW : IMPORTANCE_NONE;
+                    int importance = value ? channel.getOriginalImportance() : IMPORTANCE_NONE;
                     channel.setImportance(importance);
-                    channel.lockFields(
-                            NotificationChannel.USER_LOCKED_IMPORTANCE);
-                    MasterSwitchPreference channelPref1 = (MasterSwitchPreference) preference;
+                    channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
+                    PrimarySwitchPreference channelPref1 = (PrimarySwitchPreference) preference;
                     channelPref1.setIcon(null);
                     if (channel.getImportance() > IMPORTANCE_LOW) {
                         channelPref1.setIcon(getAlertingIcon());
                     }
-                    toggleBehaviorIconState(channelPref1.getIcon(),
-                            importance != IMPORTANCE_NONE);
                     mBackend.updateChannel(mAppRow.pkg, mAppRow.uid, channel);
 
                     return true;
                 });
-        if (parent.findPreference(channelPref.getKey()) == null) {
-            parent.addPreference(channelPref);
-        }
-        return channelPref;
     }
 
     private Drawable getAlertingIcon() {
@@ -234,52 +359,13 @@
         return icon;
     }
 
-    private void toggleBehaviorIconState(Drawable icon, boolean enabled) {
-        if (icon == null) return;
-
-        LayerDrawable layerDrawable = (LayerDrawable) icon;
-        GradientDrawable background =
-                (GradientDrawable) layerDrawable.findDrawableByLayerId(R.id.back);
-
-        if (background == null) return;
-
-        if (enabled) {
-            background.clearColorFilter();
-        } else {
-            background.setColorFilter(new BlendModeColorFilter(
-                    mContext.getColor(R.color.material_grey_300),
-                    BlendMode.SRC_IN));
-        }
-    }
-
     protected void onGroupBlockStateChanged(NotificationChannelGroup group) {
         if (group == null) {
             return;
         }
-        PreferenceGroup groupGroup = mPreference.findPreference(group.getId());
-
-        if (groupGroup != null) {
-            if (group.isBlocked()) {
-                List<Preference> toRemove = new ArrayList<>();
-                int childCount = groupGroup.getPreferenceCount();
-                for (int i = 0; i < childCount; i++) {
-                    Preference pref = groupGroup.getPreference(i);
-                    if (pref instanceof MasterSwitchPreference) {
-                        toRemove.add(pref);
-                    }
-                }
-                for (Preference pref : toRemove) {
-                    groupGroup.removePreference(pref);
-                }
-            } else {
-                final List<NotificationChannel> channels = group.getChannels();
-                Collections.sort(channels, CHANNEL_COMPARATOR);
-                int N = channels.size();
-                for (int i = 0; i < N; i++) {
-                    final NotificationChannel channel = channels.get(i);
-                    populateSingleChannelPrefs(groupGroup, channel, group.isBlocked());
-                }
-            }
+        PreferenceGroup groupPrefGroup = mPreference.findPreference(group.getId());
+        if (groupPrefGroup != null) {
+            updateGroupPreferences(group, groupPrefGroup);
         }
     }
 }
diff --git a/src/com/android/settings/notification/app/ConversationListSettings.java b/src/com/android/settings/notification/app/ConversationListSettings.java
index 8f232ca..83fc072 100644
--- a/src/com/android/settings/notification/app/ConversationListSettings.java
+++ b/src/com/android/settings/notification/app/ConversationListSettings.java
@@ -16,8 +16,10 @@
 
 package com.android.settings.notification.app;
 
+import android.app.people.IPeopleManager;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
+import android.os.ServiceManager;
 import android.util.Log;
 
 import com.android.settings.R;
@@ -33,8 +35,15 @@
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
     NotificationBackend mBackend = new NotificationBackend();
+    IPeopleManager mPs;
+
     protected List<AbstractPreferenceController> mControllers = new ArrayList<>();
 
+    public ConversationListSettings() {
+        mPs = IPeopleManager.Stub.asInterface(
+                ServiceManager.getService(Context.PEOPLE_SERVICE));
+    }
+
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.NOTIFICATION_CONVERSATION_LIST_SETTINGS;
@@ -53,9 +62,10 @@
     @Override
     protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
         mControllers = new ArrayList<>();
-        mControllers.add(new NoConversationsPreferenceController(context, mBackend));
+        mControllers.add(new NoConversationsPreferenceController(context, mBackend, mPs));
         mControllers.add(new PriorityConversationsPreferenceController(context, mBackend));
         mControllers.add(new AllConversationsPreferenceController(context, mBackend));
+        mControllers.add(new RecentConversationsPreferenceController(context, mBackend, mPs));
         return new ArrayList<>(mControllers);
     }
 }
diff --git a/src/com/android/settings/notification/app/ConversationPriorityPreference.java b/src/com/android/settings/notification/app/ConversationPriorityPreference.java
index 307abec..67bffbf 100644
--- a/src/com/android/settings/notification/app/ConversationPriorityPreference.java
+++ b/src/com/android/settings/notification/app/ConversationPriorityPreference.java
@@ -50,8 +50,6 @@
     private View mAlertButton;
     private View mPriorityButton;
     private Context mContext;
-    Drawable selectedBackground;
-    Drawable unselectedBackground;
     private static final int BUTTON_ANIM_TIME_MS = 100;
 
     public ConversationPriorityPreference(Context context, AttributeSet attrs,
@@ -77,8 +75,6 @@
 
     private void init(Context context) {
         mContext = context;
-        selectedBackground = mContext.getDrawable(R.drawable.button_border_selected);
-        unselectedBackground = mContext.getDrawable(R.drawable.button_border_unselected);
         setLayoutResource(R.layout.notif_priority_conversation_preference);
     }
 
@@ -148,86 +144,43 @@
             TransitionManager.beginDelayedTransition(parent, transition);
         }
 
-        ColorStateList colorAccent = getAccentTint();
-        ColorStateList colorNormal = getRegularTint();
-        ImageView silenceIcon = parent.findViewById(R.id.silence_icon);
-        TextView silenceLabel = parent.findViewById(R.id.silence_label);
-        TextView silenceSummary = parent.findViewById(R.id.silence_summary);
-        ImageView alertIcon = parent.findViewById(R.id.alert_icon);
-        TextView alertLabel = parent.findViewById(R.id.alert_label);
-        TextView alertSummary = parent.findViewById(R.id.alert_summary);
-        ImageView priorityIcon = parent.findViewById(R.id.priority_icon);
-        TextView priorityLabel = parent.findViewById(R.id.priority_label);
-        TextView prioritySummary = parent.findViewById(R.id.priority_summary);
-
         if (importance <= IMPORTANCE_LOW && importance > IMPORTANCE_UNSPECIFIED) {
-            alertSummary.setVisibility(GONE);
-            alertIcon.setImageTintList(colorNormal);
-            alertLabel.setTextColor(colorNormal);
-
-            prioritySummary.setVisibility(GONE);
-            priorityIcon.setImageTintList(colorNormal);
-            priorityLabel.setTextColor(colorNormal);
-
-            silenceIcon.setImageTintList(colorAccent);
-            silenceLabel.setTextColor(colorAccent);
-            silenceSummary.setVisibility(VISIBLE);
-
-            mAlertButton.setBackground(unselectedBackground);
-            mPriorityButton.setBackground(unselectedBackground);
-            mSilenceButton.setBackground(selectedBackground);
-            // a11y service won't always read the newly appearing text in the right order if the
-            // selection happens too soon (readback happens on a different thread as layout). post
-            // the selection to make that conflict less likely
-            parent.post(() -> {
-                mSilenceButton.setSelected(true);
-                mAlertButton.setSelected(false);
-                mPriorityButton.setSelected(false);
-            });
+            setSelected(mPriorityButton, false);
+            setSelected(mAlertButton, false);
+            setSelected(mSilenceButton, true);
         } else {
             if (isPriority) {
-                alertSummary.setVisibility(GONE);
-                alertIcon.setImageTintList(colorNormal);
-                alertLabel.setTextColor(colorNormal);
-
-                prioritySummary.setVisibility(VISIBLE);
-                priorityIcon.setImageTintList(colorAccent);
-                priorityLabel.setTextColor(colorAccent);
-
-                silenceIcon.setImageTintList(colorNormal);
-                silenceLabel.setTextColor(colorNormal);
-                silenceSummary.setVisibility(GONE);
-
-                mAlertButton.setBackground(unselectedBackground);
-                mPriorityButton.setBackground(selectedBackground);
-                mSilenceButton.setBackground(unselectedBackground);
-                parent.post(() -> {
-                    mSilenceButton.setSelected(false);
-                    mAlertButton.setSelected(false);
-                    mPriorityButton.setSelected(true);
-                });
+                setSelected(mPriorityButton, true);
+                setSelected(mAlertButton, false);
+                setSelected(mSilenceButton, false);
             } else {
-                alertSummary.setVisibility(VISIBLE);
-                alertIcon.setImageTintList(colorAccent);
-                alertLabel.setTextColor(colorAccent);
-
-                prioritySummary.setVisibility(GONE);
-                priorityIcon.setImageTintList(colorNormal);
-                priorityLabel.setTextColor(colorNormal);
-
-                silenceIcon.setImageTintList(colorNormal);
-                silenceLabel.setTextColor(colorNormal);
-                silenceSummary.setVisibility(GONE);
-
-                mAlertButton.setBackground(selectedBackground);
-                mPriorityButton.setBackground(unselectedBackground);
-                mSilenceButton.setBackground(unselectedBackground);
-                parent.post(() -> {
-                    mSilenceButton.setSelected(false);
-                    mAlertButton.setSelected(true);
-                    mPriorityButton.setSelected(false);
-                });
+                setSelected(mPriorityButton, false);
+                setSelected(mAlertButton, true);
+                setSelected(mSilenceButton, false);
             }
         }
     }
+
+    void setSelected(View view, boolean selected) {
+        ColorStateList colorAccent = getAccentTint();
+        ColorStateList colorNormal = getRegularTint();
+
+        ImageView icon = view.findViewById(R.id.icon);
+        TextView label = view.findViewById(R.id.label);
+        TextView summary = view.findViewById(R.id.summary);
+
+        icon.setImageTintList(selected ? colorAccent : colorNormal);
+        label.setTextColor(selected ? colorAccent : colorNormal);
+        summary.setVisibility(selected ? VISIBLE : GONE);
+
+        view.setBackground(mContext.getDrawable(selected
+                ? R.drawable.button_border_selected
+                : R.drawable.button_border_unselected));
+        // a11y service won't always read the newly appearing text in the right order if the
+        // selection happens too soon (readback happens on a different thread as layout). post
+        // the selection to make that conflict less likely
+        view.post(() -> {
+            view.setSelected(selected);
+        });
+    }
 }
diff --git a/src/com/android/settings/notification/app/NoConversationsPreferenceController.java b/src/com/android/settings/notification/app/NoConversationsPreferenceController.java
index 40faadc..475d90d 100644
--- a/src/com/android/settings/notification/app/NoConversationsPreferenceController.java
+++ b/src/com/android/settings/notification/app/NoConversationsPreferenceController.java
@@ -16,9 +16,12 @@
 
 package com.android.settings.notification.app;
 
+import android.app.people.IPeopleManager;
 import android.content.Context;
 import android.os.AsyncTask;
+import android.os.RemoteException;
 import android.service.notification.ConversationChannelWrapper;
+import android.util.Log;
 import android.view.View;
 
 import androidx.preference.Preference;
@@ -27,17 +30,18 @@
 import com.android.settings.notification.NotificationBackend;
 import com.android.settingslib.widget.LayoutPreference;
 
-import java.util.List;
-
 public class NoConversationsPreferenceController extends ConversationListPreferenceController {
 
+    private static String TAG = "NoConversationsPC";
     private static final String KEY = "no_conversations";
 
-    private List<ConversationChannelWrapper> mConversations;
+    private IPeopleManager mPs;
+    private int mConversationCount = 0;
 
     public NoConversationsPreferenceController(Context context,
-            NotificationBackend backend) {
+            NotificationBackend backend, IPeopleManager ps) {
         super(context, backend);
+        mPs = ps;
     }
 
     @Override
@@ -67,7 +71,12 @@
         new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... unused) {
-                mConversations = mBackend.getConversations(false).getList();
+                mConversationCount = mBackend.getConversations(false).getList().size();
+                try {
+                    mConversationCount += mPs.getRecentConversations().getList().size();
+                } catch (RemoteException e) {
+                    Log.w(TAG, "Error calling PS", e);
+                }
                 return null;
             }
 
@@ -76,9 +85,9 @@
                 if (mContext == null) {
                     return;
                 }
-                pref.findViewById(R.id.onboarding).setVisibility(mConversations.size() == 0
+                pref.findViewById(R.id.onboarding).setVisibility(mConversationCount == 0
                         ? View.VISIBLE : View.GONE);
-                preference.setVisible(mConversations.size() == 0);
+                preference.setVisible(mConversationCount == 0);
             }
         }.execute();
     }
diff --git a/src/com/android/settings/notification/app/RecentConversationPreference.java b/src/com/android/settings/notification/app/RecentConversationPreference.java
new file mode 100644
index 0000000..49e2c02
--- /dev/null
+++ b/src/com/android/settings/notification/app/RecentConversationPreference.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2020 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.notification.app;
+
+import android.content.Context;
+import android.view.View;
+
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+import com.android.settingslib.TwoTargetPreference;
+
+import com.google.common.annotations.VisibleForTesting;
+
+public class RecentConversationPreference extends TwoTargetPreference {
+
+    private OnClearClickListener mOnClearClickListener;
+
+    private View mClearView;
+
+    public interface OnClearClickListener {
+        void onClear();
+    }
+
+    public RecentConversationPreference(Context context) {
+        super(context);
+    }
+
+    public void setOnClearClickListener(
+            OnClearClickListener onClearClickListener) {
+        mOnClearClickListener = onClearClickListener;
+    }
+
+    @VisibleForTesting
+    View getClearView() {
+        return mClearView;
+    }
+
+    @Override
+    protected int getSecondTargetResId() {
+        return R.layout.preference_widget_clear;
+    }
+
+    @VisibleForTesting
+    int getClearId() {
+        return R.id.clear_button;
+    }
+
+    @VisibleForTesting
+    boolean hasClearListener() {
+        return mOnClearClickListener != null;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
+        final View widgetFrame = view.findViewById(android.R.id.widget_frame);
+        widgetFrame.setVisibility(mOnClearClickListener != null ? View.VISIBLE : View.GONE);
+        mClearView = view.findViewById(getClearId());
+        mClearView.setOnClickListener(v -> {
+            if (mOnClearClickListener != null) {
+                mOnClearClickListener.onClear();
+            }
+        });
+    }
+
+}
diff --git a/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java b/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
new file mode 100644
index 0000000..8be6016
--- /dev/null
+++ b/src/com/android/settings/notification/app/RecentConversationsPreferenceController.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2020 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.notification.app;
+
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+
+import android.app.people.ConversationChannel;
+import android.app.people.IPeopleManager;
+import android.app.settings.SettingsEnums;
+import android.content.Context;
+import android.content.pm.ShortcutInfo;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.os.RemoteException;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Slog;
+import android.widget.Button;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+
+import com.android.settings.R;
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.notification.NotificationBackend;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.widget.LayoutPreference;
+
+import java.text.Collator;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+public class RecentConversationsPreferenceController extends AbstractPreferenceController {
+
+    private static final String TAG = "RecentConversationsPC";
+    private static final String KEY = "recent_conversations";
+    private List<ConversationChannel> mConversations;
+    private final IPeopleManager mPs;
+    private final NotificationBackend mBackend;
+
+    public RecentConversationsPreferenceController(Context context, NotificationBackend backend,
+            IPeopleManager ps) {
+        super(context);
+        mBackend = backend;
+        mPs = ps;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY;
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    Preference getClearAll(PreferenceGroup parent) {
+        LayoutPreference pref = new LayoutPreference(
+                mContext, R.layout.conversations_clear_recents);
+        pref.setOrder(1);
+        Button button = pref.findViewById(R.id.conversation_settings_clear_recents);
+        button.setOnClickListener(v -> {
+            try {
+                mPs.removeAllRecentConversations();
+            } catch (RemoteException e) {
+                Slog.w(TAG, "Could not clear recents", e);
+            }
+            updateState(parent);
+        });
+        return pref;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        PreferenceCategory pref = (PreferenceCategory) preference;
+        // Load conversations
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... unused) {
+                try {
+                    mConversations = mPs.getRecentConversations().getList();
+                } catch (RemoteException e) {
+                    Slog.w(TAG, "Could get recents", e);
+                }
+                Collections.sort(mConversations, mConversationComparator);
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Void unused) {
+                if (mContext == null) {
+                    return;
+                }
+                populateList(mConversations, pref);
+            }
+        }.execute();
+
+    }
+
+    protected void populateList(List<ConversationChannel> conversations,
+            PreferenceGroup containerGroup) {
+        containerGroup.removeAll();
+        if (conversations != null) {
+            populateConversations(conversations, containerGroup);
+        }
+
+        if (containerGroup.getPreferenceCount() == 0) {
+            containerGroup.setVisible(false);
+        } else {
+            containerGroup.setVisible(true);
+            Preference clearAll = getClearAll(containerGroup);
+            if (clearAll != null) {
+                containerGroup.addPreference(clearAll);
+            }
+        }
+    }
+
+    protected void populateConversations(List<ConversationChannel> conversations,
+            PreferenceGroup containerGroup) {
+        int order = 100;
+        for (ConversationChannel conversation : conversations) {
+            if (conversation.getParentNotificationChannel().getImportance() == IMPORTANCE_NONE
+                    || (conversation.getParentNotificationChannelGroup() != null
+                    && conversation.getParentNotificationChannelGroup().isBlocked())) {
+                continue;
+            }
+            containerGroup.addPreference(
+                    createConversationPref(containerGroup, conversation, order++));
+        }
+    }
+
+    protected Preference createConversationPref(PreferenceGroup parent,
+            final ConversationChannel conversation, int order) {
+        final String pkg = conversation.getShortcutInfo().getPackage();
+        final int uid = conversation.getUid();
+        final String conversationId = conversation.getShortcutInfo().getId();
+        RecentConversationPreference pref = new RecentConversationPreference(mContext);
+
+        if (!conversation.hasActiveNotifications()) {
+            pref.setOnClearClickListener(() -> {
+                try {
+                    mPs.removeRecentConversation(pkg, UserHandle.getUserId(uid), conversationId);
+                    parent.removePreference(pref);
+                } catch (RemoteException e) {
+                    Slog.w(TAG, "Could not clear recent", e);
+                }
+            });
+        }
+        pref.setOrder(order);
+
+        pref.setTitle(getTitle(conversation));
+        pref.setSummary(getSummary(conversation));
+        pref.setIcon(mBackend.getConversationDrawable(mContext, conversation.getShortcutInfo(),
+                pkg, uid, false));
+        pref.setKey(conversation.getParentNotificationChannel().getId()
+                + ":" + conversationId);
+        pref.setOnPreferenceClickListener(preference -> {
+            mBackend.createConversationNotificationChannel(
+                    pkg, uid,
+                    conversation.getParentNotificationChannel(),
+                    conversationId);
+            getSubSettingLauncher(conversation, pref.getTitle()).launch();
+            return true;
+        });
+
+        return pref;
+    }
+
+    CharSequence getSummary(ConversationChannel conversation) {
+        return conversation.getParentNotificationChannelGroup() == null
+                ? conversation.getParentNotificationChannel().getName()
+                : mContext.getString(R.string.notification_conversation_summary,
+                        conversation.getParentNotificationChannel().getName(),
+                        conversation.getParentNotificationChannelGroup().getName());
+    }
+
+    CharSequence getTitle(ConversationChannel conversation) {
+        ShortcutInfo si = conversation.getShortcutInfo();
+        return si.getLabel();
+    }
+
+    SubSettingLauncher getSubSettingLauncher(ConversationChannel conversation,
+            CharSequence title) {
+        Bundle channelArgs = new Bundle();
+        channelArgs.putInt(AppInfoBase.ARG_PACKAGE_UID, conversation.getUid());
+        channelArgs.putString(AppInfoBase.ARG_PACKAGE_NAME,
+                conversation.getShortcutInfo().getPackage());
+        channelArgs.putString(Settings.EXTRA_CHANNEL_ID,
+                conversation.getParentNotificationChannel().getId());
+        channelArgs.putString(Settings.EXTRA_CONVERSATION_ID,
+                conversation.getShortcutInfo().getId());
+
+        return new SubSettingLauncher(mContext)
+                .setDestination(ChannelNotificationSettings.class.getName())
+                .setArguments(channelArgs)
+                .setExtras(channelArgs)
+                .setUserHandle(UserHandle.getUserHandleForUid(conversation.getUid()))
+                .setTitleText(title)
+                .setSourceMetricsCategory(SettingsEnums.NOTIFICATION_CONVERSATION_LIST_SETTINGS);
+    }
+
+    protected Comparator<ConversationChannel> mConversationComparator =
+            new Comparator<ConversationChannel>() {
+                private final Collator sCollator = Collator.getInstance();
+                @Override
+                public int compare(ConversationChannel o1, ConversationChannel o2) {
+                    int labelComparison = sCollator.compare(o1.getShortcutInfo().getLabel(),
+                            o2.getShortcutInfo().getLabel());
+
+                    if (labelComparison == 0) {
+                        return o1.getParentNotificationChannel().getId().compareTo(
+                                o2.getParentNotificationChannel().getId());
+                    }
+
+                    return labelComparison;
+                }
+            };
+}
diff --git a/src/com/android/settings/notification/history/NotificationHistoryActivity.java b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
index 7635a4f..b184740 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryActivity.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryActivity.java
@@ -155,21 +155,22 @@
 
             final View container = viewForPackage.findViewById(R.id.notification_list);
             container.setVisibility(View.GONE);
-            ImageButton expand = viewForPackage.findViewById(R.id.expand);
-            expand.setContentDescription(container.getVisibility() == View.VISIBLE
+            View header = viewForPackage.findViewById(R.id.app_header);
+            ImageView expand = viewForPackage.findViewById(R.id.expand);
+            header.setStateDescription(container.getVisibility() == View.VISIBLE
                     ? getString(R.string.condition_expand_hide)
                     : getString(R.string.condition_expand_show));
             int finalI = i;
-            expand.setOnClickListener(v -> {
+            header.setOnClickListener(v -> {
                 container.setVisibility(container.getVisibility() == View.VISIBLE
                         ? View.GONE : View.VISIBLE);
                 expand.setImageResource(container.getVisibility() == View.VISIBLE
                         ? R.drawable.ic_expand_less
                         : com.android.internal.R.drawable.ic_expand_more);
-                expand.setContentDescription(container.getVisibility() == View.VISIBLE
+                header.setStateDescription(container.getVisibility() == View.VISIBLE
                         ? getString(R.string.condition_expand_hide)
                         : getString(R.string.condition_expand_show));
-                expand.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);
+                header.sendAccessibilityEvent(TYPE_VIEW_ACCESSIBILITY_FOCUSED);
                 mUiEventLogger.logWithPosition(
                         (container.getVisibility() == View.VISIBLE)
                             ? NotificationHistoryEvent.NOTIFICATION_HISTORY_PACKAGE_HISTORY_OPEN
diff --git a/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java b/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java
index 5a6ff7e..06c74bc 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryRecyclerView.java
@@ -1,9 +1,14 @@
 package com.android.settings.notification.history;
 
+import static android.view.HapticFeedbackConstants.CLOCK_TICK;
+
 import android.annotation.Nullable;
 import android.content.Context;
+import android.graphics.Canvas;
 import android.util.AttributeSet;
+import android.view.View;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
@@ -15,6 +20,9 @@
 
     private OnItemSwipeDeleteListener listener;
 
+    /** The amount of horizontal displacement caused by user's action, used to track the swiping. */
+    private float dXLast;
+
     public NotificationHistoryRecyclerView(Context context) {
         this(context, null);
     }
@@ -57,6 +65,27 @@
                 listener.onItemSwipeDeleted(viewHolder.getAdapterPosition());
             }
         }
+
+        /** Performs haptic effect once the swiping goes past a certain location. */
+        @Override
+        public void onChildDraw(@NonNull Canvas c, @NonNull RecyclerView recyclerView,
+                @NonNull ViewHolder viewHolder, float dX, float dY, int actionState,
+                boolean isCurrentlyActive) {
+            super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+            if (isCurrentlyActive) {
+                View view = viewHolder.itemView;
+                float swipeThreshold = getSwipeThreshold(viewHolder);
+                float snapOffset = swipeThreshold * view.getWidth();
+                boolean snapIntoNewLocation = dX < -snapOffset || dX > snapOffset;
+                boolean snapIntoNewLocationLast = dXLast < -snapOffset || dXLast > snapOffset;
+                if (snapIntoNewLocation != snapIntoNewLocationLast) {
+                    view.performHapticFeedback(CLOCK_TICK);
+                }
+                dXLast = dX;
+            } else {
+                dXLast = 0;
+            }
+        }
     }
 
     public interface OnItemSwipeDeleteListener {
diff --git a/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java b/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
index 4991548..da1ed11 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
@@ -33,7 +33,6 @@
     NotificationHistoryViewHolder(View itemView) {
         super(itemView);
         mTime = itemView.findViewById(R.id.timestamp);
-        mTime.setShowRelativeTime(true);
         mTitle = itemView.findViewById(R.id.title);
         mSummary = itemView.findViewById(R.id.text);
     }
diff --git a/src/com/android/settings/notification/history/NotificationSbnAdapter.java b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
index 0eb14ba..f836855 100644
--- a/src/com/android/settings/notification/history/NotificationSbnAdapter.java
+++ b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
@@ -52,6 +52,7 @@
 import com.android.internal.logging.UiEventLogger;
 import com.android.internal.util.ContrastColorUtil;
 import com.android.settings.R;
+import com.android.settingslib.Utils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -79,8 +80,8 @@
         mPm = pm;
         mUserBadgeCache = new HashMap<>();
         mValues = new ArrayList<>();
-        mBackgroundColor = mContext.getColor(
-                com.android.internal.R.color.notification_material_background_color);
+        mBackgroundColor = Utils.getColorAttrDefaultColor(context,
+                android.R.attr.colorBackground);
         Configuration currentConfig = mContext.getResources().getConfiguration();
         mInNightMode = (currentConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK)
                 == Configuration.UI_MODE_NIGHT_YES;
diff --git a/src/com/android/settings/notification/history/NotificationSbnViewHolder.java b/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
index de12847..1219143 100644
--- a/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
+++ b/src/com/android/settings/notification/history/NotificationSbnViewHolder.java
@@ -98,7 +98,8 @@
         Intent appIntent = itemView.getContext().getPackageManager()
                 .getLaunchIntentForPackage(pkg);
         boolean isPendingIntentValid = pi != null && PendingIntent.getActivity(
-                itemView.getContext(), 0, pi.getIntent(), PendingIntent.FLAG_NO_CREATE) != null;
+                itemView.getContext(), 0, pi.getIntent(),
+                PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_NO_CREATE) != null;
         if (isPendingIntentValid || appIntent != null) {
             itemView.setOnClickListener(v -> {
                 uiEventLogger.logWithInstanceIdAndPosition(
@@ -108,7 +109,7 @@
                                 : NotificationHistoryActivity.NotificationHistoryEvent
                                 .NOTIFICATION_HISTORY_RECENT_ITEM_CLICK,
                         uid, pkg, instanceId, position);
-                if (pi != null) {
+                if (pi != null && isPendingIntentValid) {
                     try {
                         pi.send();
                     } catch (PendingIntent.CanceledException e) {
diff --git a/src/com/android/settings/notification/history/NotificationStation.java b/src/com/android/settings/notification/history/NotificationStation.java
index 9d53479..fe8b168 100644
--- a/src/com/android/settings/notification/history/NotificationStation.java
+++ b/src/com/android/settings/notification/history/NotificationStation.java
@@ -312,7 +312,7 @@
         if (n.extras != null) {
             title = n.extras.getCharSequence(Notification.EXTRA_TITLE);
         }
-        return title == null? null : String.valueOf(title);
+        return title == null? "" : String.valueOf(title);
     }
 
     /**
@@ -339,7 +339,7 @@
                 text = n.extras.getCharSequence(Notification.EXTRA_TEXT);
             }
         }
-        return text == null ? null : String.valueOf(text);
+        return text == null ? "" : String.valueOf(text);
     }
 
     private Drawable loadIcon(HistoricalNotificationInfo info, StatusBarNotification sbn) {
@@ -461,7 +461,7 @@
             sb.append("\n")
                     .append(bold("getShortcutInfo"))
                     .append(delim)
-                    .append(String.valueOf(rank.getShortcutInfo()));
+                    .append(String.valueOf(rank.getConversationShortcutInfo()));
             sb.append("\n")
                     .append(bold("isConversation"))
                     .append(delim)
diff --git a/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java b/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java
index 6fa446b..02e4015 100644
--- a/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java
+++ b/src/com/android/settings/notification/zen/AbstractZenModePreferenceController.java
@@ -84,7 +84,10 @@
         mScreen = screen;
         Preference pref = screen.findPreference(KEY);
         if (pref != null) {
-            mSettingObserver = new SettingObserver(pref);
+            if (mSettingObserver == null) {
+                mSettingObserver = new SettingObserver();
+            }
+            mSettingObserver.setPreference(pref);
         }
     }
 
@@ -128,10 +131,13 @@
         private final Uri ZEN_MODE_DURATION_URI = Settings.Secure.getUriFor(
                 Settings.Secure.ZEN_DURATION);
 
-        private final Preference mPreference;
+        private Preference mPreference;
 
-        public SettingObserver(Preference preference) {
+        public SettingObserver() {
             super(new Handler());
+        }
+
+        public void setPreference(Preference preference) {
             mPreference = preference;
         }
 
diff --git a/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreference.java b/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreference.java
deleted file mode 100644
index 57f4891..0000000
--- a/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreference.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification.zen;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.RadioButton;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settingslib.TwoTargetPreference;
-
-/**
- * A radio button preference with a divider and a settings icon that links to another screen.
- */
-public class ZenCustomRadioButtonPreference extends TwoTargetPreference
-        implements View.OnClickListener {
-
-    private RadioButton mButton;
-    private boolean mChecked;
-
-    private OnGearClickListener mOnGearClickListener;
-    private OnRadioButtonClickListener mOnRadioButtonClickListener;
-
-    public ZenCustomRadioButtonPreference(Context context, AttributeSet attrs,
-            int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        setLayoutResource(R.layout.preference_two_target_radio);
-    }
-
-    public ZenCustomRadioButtonPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        setLayoutResource(R.layout.preference_two_target_radio);
-    }
-
-    public ZenCustomRadioButtonPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        setLayoutResource(R.layout.preference_two_target_radio);
-    }
-
-    public ZenCustomRadioButtonPreference(Context context) {
-        super(context);
-        setLayoutResource(R.layout.preference_two_target_radio);
-    }
-
-    @Override
-    protected int getSecondTargetResId() {
-        return R.layout.preference_widget_gear;
-    }
-
-    public void setOnGearClickListener(OnGearClickListener l) {
-        mOnGearClickListener = l;
-        notifyChanged();
-    }
-
-    public void setOnRadioButtonClickListener(OnRadioButtonClickListener l) {
-        mOnRadioButtonClickListener = l;
-        notifyChanged();
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        View buttonFrame = holder.findViewById(R.id.checkbox_frame);
-        if (buttonFrame != null) {
-            buttonFrame.setOnClickListener(this);
-        }
-        mButton = (RadioButton) holder.findViewById(android.R.id.checkbox);
-        if (mButton != null) {
-            mButton.setChecked(mChecked);
-        }
-
-        final View gear = holder.findViewById(android.R.id.widget_frame);
-        final View divider = holder.findViewById(R.id.two_target_divider);
-        if (mOnGearClickListener != null) {
-            divider.setVisibility(View.VISIBLE);
-            gear.setVisibility(View.VISIBLE);
-            gear.setOnClickListener(this);
-        } else {
-            divider.setVisibility(View.GONE);
-            gear.setVisibility(View.GONE);
-            gear.setOnClickListener(null);
-        }
-    }
-
-    public boolean isChecked() {
-        return mButton != null && mChecked;
-    }
-
-    public void setChecked(boolean checked) {
-        mChecked = checked;
-        if (mButton != null) {
-            mButton.setChecked(checked);
-        }
-    }
-
-    public RadioButton getRadioButton() {
-        return mButton;
-    }
-
-    @Override
-    public void onClick() {
-        if (mOnRadioButtonClickListener != null) {
-            mOnRadioButtonClickListener.onRadioButtonClick(this);
-        }
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v.getId() == android.R.id.widget_frame) {
-            if (mOnGearClickListener != null) {
-                mOnGearClickListener.onGearClick(this);
-            }
-        } else if (v.getId() == R.id.checkbox_frame) {
-            if (mOnRadioButtonClickListener != null) {
-                mOnRadioButtonClickListener.onRadioButtonClick(this);
-            }
-        }
-    }
-
-    public interface OnGearClickListener {
-        void onGearClick(ZenCustomRadioButtonPreference p);
-    }
-
-    public interface OnRadioButtonClickListener {
-        void onRadioButtonClick(ZenCustomRadioButtonPreference p);
-    }
-}
diff --git a/src/com/android/settings/notification/zen/ZenModeBackend.java b/src/com/android/settings/notification/zen/ZenModeBackend.java
index 2f6a2b1..e3f5063 100644
--- a/src/com/android/settings/notification/zen/ZenModeBackend.java
+++ b/src/com/android/settings/notification/zen/ZenModeBackend.java
@@ -26,7 +26,7 @@
 import android.app.NotificationManager;
 import android.content.Context;
 import android.database.Cursor;
-import android.icu.text.ListFormatter;
+import android.icu.text.MessageFormat;
 import android.net.Uri;
 import android.provider.ContactsContract;
 import android.provider.Settings;
@@ -41,7 +41,9 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 public class ZenModeBackend {
@@ -445,9 +447,9 @@
         if (cursor != null && cursor.moveToFirst()) {
             do {
                 String contact = cursor.getString(0);
-                if (contact != null) {
-                    starredContacts.add(contact);
-                }
+                starredContacts.add(contact != null ? contact :
+                        mContext.getString(R.string.zen_mode_starred_contacts_empty_name));
+
             } while (cursor.moveToNext());
         }
         return starredContacts;
@@ -468,37 +470,30 @@
     String getStarredContactsSummary(Context context) {
         List<String> starredContacts = getStarredContacts();
         int numStarredContacts = starredContacts.size();
-
-        List<String> displayContacts = new ArrayList<>();
-
-        if (numStarredContacts == 0) {
-            displayContacts.add(context.getString(R.string.zen_mode_starred_contacts_summary_none));
-        } else {
-            for (int i = 0; i < 2 && i < numStarredContacts; i++) {
-                displayContacts.add(starredContacts.get(i));
-            }
-
-            if (numStarredContacts == 3) {
-                displayContacts.add(starredContacts.get(2));
-            } else if (numStarredContacts > 2) {
-                displayContacts.add(context.getResources().getQuantityString(
-                        R.plurals.zen_mode_starred_contacts_summary_additional_contacts,
-                        numStarredContacts - 2, numStarredContacts - 2));
+        MessageFormat msgFormat = new MessageFormat(
+                mContext.getString(R.string.zen_mode_starred_contacts_summary_contacts),
+                Locale.getDefault());
+        Map<String, Object> args = new HashMap<>();
+        args.put("count", numStarredContacts);
+        if (numStarredContacts >= 1) {
+            args.put("contact_1", starredContacts.get(0));
+            if (numStarredContacts >= 2) {
+                args.put("contact_2", starredContacts.get(1));
+                if (numStarredContacts == 3) {
+                    args.put("contact_3", starredContacts.get(2));
+                }
             }
         }
-
-        // values in displayContacts must not be null
-        return ListFormatter.getInstance().format(displayContacts);
+        return msgFormat.format(args);
     }
 
     String getContactsNumberSummary(Context context) {
-        final int numContacts = queryAllContactsData().getCount();
-        if (numContacts == 0) {
-            return context.getResources().getString(
-                    R.string.zen_mode_contacts_count_none);
-        }
-        return context.getResources().getQuantityString(R.plurals.zen_mode_contacts_count,
-                numContacts, numContacts);
+        MessageFormat msgFormat = new MessageFormat(
+                mContext.getString(R.string.zen_mode_contacts_count),
+                Locale.getDefault());
+        Map<String, Object> args = new HashMap<>();
+        args.put("count", queryAllContactsData().getCount());
+        return msgFormat.format(args);
     }
 
     private Cursor queryStarredContactsData() {
diff --git a/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
index d088c0a..8d2ae48 100644
--- a/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceController.java
@@ -3,7 +3,7 @@
 import android.app.Application;
 import android.app.NotificationChannel;
 import android.content.Context;
-import android.icu.text.ListFormatter;
+import android.icu.text.MessageFormat;
 import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.ArraySet;
@@ -21,7 +21,10 @@
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -119,29 +122,23 @@
         }
 
         final int numAppsBypassingDnd = appsBypassingDnd.size();
-        if (numAppsBypassingDnd == 0) {
-            mSummary = mContext.getResources().getString(
-                    R.string.zen_mode_bypassing_apps_subtext_none);
-            refreshSummary(mPreference);
-            return;
+        String[] appsBypassingDndArr = appsBypassingDnd.toArray(new String[numAppsBypassingDnd]);
+        MessageFormat msgFormat = new MessageFormat(
+                mContext.getString(R.string.zen_mode_bypassing_apps_subtext),
+                Locale.getDefault());
+        Map<String, Object> args = new HashMap<>();
+        args.put("count", numAppsBypassingDnd);
+        if (numAppsBypassingDnd >= 1) {
+            args.put("app_1", appsBypassingDndArr[0]);
+            if (numAppsBypassingDnd >= 2) {
+                args.put("app_2", appsBypassingDndArr[1]);
+                if (numAppsBypassingDnd == 3) {
+                    args.put("app_3", appsBypassingDndArr[2]);
+                }
+            }
         }
 
-        List<String> displayAppsBypassing = new ArrayList<>();
-        if (numAppsBypassingDnd <= 2) {
-            displayAppsBypassing.addAll(appsBypassingDnd);
-        } else {
-            String[] appsBypassingDndArr =
-                    appsBypassingDnd.toArray(new String[numAppsBypassingDnd]);
-            displayAppsBypassing.add(appsBypassingDndArr[0]);
-            displayAppsBypassing.add(appsBypassingDndArr[1]);
-            displayAppsBypassing.add(mContext.getResources().getString(
-                    R.string.zen_mode_apps_bypassing_list_count,
-                    numAppsBypassingDnd - 2));
-        }
-        mSummary = mContext.getResources().getQuantityString(
-                R.plurals.zen_mode_bypassing_apps_subtext,
-                numAppsBypassingDnd,
-                ListFormatter.getInstance().format(displayAppsBypassing));
+        mSummary = msgFormat.format(args);
         refreshSummary(mPreference);
     }
 
diff --git a/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
index f5d21a2..938796b 100644
--- a/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeDurationPreferenceController.java
@@ -17,11 +17,16 @@
 package com.android.settings.notification.zen;
 
 import android.content.Context;
+import android.icu.text.MessageFormat;
 
 import com.android.settings.R;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+
 public class ZenModeDurationPreferenceController extends AbstractZenModePreferenceController
         implements PreferenceControllerMixin {
 
@@ -51,12 +56,19 @@
             summary = mContext.getString(R.string.zen_mode_duration_summary_forever);
         } else {
             if (zenDuration >= 60) {
-                int hours = zenDuration / 60;
-                summary = mContext.getResources().getQuantityString(
-                        R.plurals.zen_mode_duration_summary_time_hours, hours, hours);
+                MessageFormat msgFormat = new MessageFormat(
+                        mContext.getString(R.string.zen_mode_duration_summary_time_hours),
+                        Locale.getDefault());
+                Map<String, Object> msgArgs = new HashMap<>();
+                msgArgs.put("count", zenDuration / 60);
+                summary = msgFormat.format(msgArgs);
             } else {
-                summary = mContext.getResources().getString(
-                        R.string.zen_mode_duration_summary_time_minutes, zenDuration);
+                MessageFormat msgFormat = new MessageFormat(
+                        mContext.getString(R.string.zen_mode_duration_summary_time_minutes),
+                        Locale.getDefault());
+                Map<String, Object> msgArgs = new HashMap<>();
+                msgArgs.put("count", zenDuration);
+                summary = msgFormat.format(msgArgs);
             }
         }
 
diff --git a/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java b/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java
index 4ae16bc..5afe0b6 100644
--- a/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModePriorityConversationsPreferenceController.java
@@ -16,13 +16,11 @@
 
 package com.android.settings.notification.zen;
 
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_GONE;
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_SETTING;
-
 import android.app.NotificationManager;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.pm.ParceledListSlice;
+import android.icu.text.MessageFormat;
 import android.os.AsyncTask;
 import android.service.notification.ConversationChannelWrapper;
 import android.view.View;
@@ -36,12 +34,14 @@
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.notification.NotificationBackend;
 import com.android.settings.notification.app.ConversationListSettings;
-import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.RadioButtonPreference;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 
 /**
  * Options to choose the priority conversations that are allowed to bypass DND.
@@ -130,12 +130,13 @@
 
         if (numConversations == UNSET) {
             return null;
-        } else if (numConversations == 0) {
-            return mContext.getResources().getString(
-                    R.string.zen_mode_conversations_count_none);
         } else {
-            return mContext.getResources().getQuantityString(
-                    R.plurals.zen_mode_conversations_count, numConversations, numConversations);
+            MessageFormat msgFormat = new MessageFormat(
+                    mContext.getString(R.string.zen_mode_conversations_count),
+                    Locale.getDefault());
+            Map<String, Object> args = new HashMap<>();
+            args.put("count", numConversations);
+            return msgFormat.format(args);
         }
     }
 
@@ -181,13 +182,10 @@
     }
 
     private RadioButtonPreference makeRadioPreference(String key, int titleId) {
-        RadioButtonPreferenceWithExtraWidget pref =
-                new RadioButtonPreferenceWithExtraWidget(mPreferenceCategory.getContext());
+        final RadioButtonPreference pref =
+                new RadioButtonPreference(mPreferenceCategory.getContext());
         if (KEY_ALL.equals(key) || KEY_IMPORTANT.equals(key)) {
             pref.setExtraWidgetOnClickListener(mConversationSettingsWidgetClickListener);
-            pref.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_SETTING);
-        } else {
-            pref.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_GONE);
         }
         pref.setKey(key);
         pref.setTitle(titleId);
diff --git a/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java b/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java
index abf2ced..482865c 100644
--- a/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModePrioritySendersPreferenceController.java
@@ -19,9 +19,6 @@
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CALLS;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
 
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_GONE;
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_SETTING;
-
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.Intent;
@@ -35,7 +32,6 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.widget.RadioButtonPreferenceWithExtraWidget;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.RadioButtonPreference;
 
@@ -67,7 +63,7 @@
     private final boolean mIsMessages; // if this is false, then this preference is for calls
 
     private PreferenceCategory mPreferenceCategory;
-    private List<RadioButtonPreferenceWithExtraWidget> mRadioButtonPreferences = new ArrayList<>();
+    private List<RadioButtonPreference> mRadioButtonPreferences = new ArrayList<>();
 
     public ZenModePrioritySendersPreferenceController(Context context, String key,
             Lifecycle lifecycle, boolean isMessages) {
@@ -114,7 +110,7 @@
     public void updateState(Preference preference) {
         final int currSetting = getPrioritySenders();
 
-        for (RadioButtonPreferenceWithExtraWidget pref : mRadioButtonPreferences) {
+        for (RadioButtonPreference pref : mRadioButtonPreferences) {
             pref.setChecked(keyToSetting(pref.getKey()) == currSetting);
         }
     }
@@ -126,7 +122,7 @@
     }
 
     private void updateSummaries() {
-        for (RadioButtonPreferenceWithExtraWidget pref : mRadioButtonPreferences) {
+        for (RadioButtonPreference pref : mRadioButtonPreferences) {
             pref.setSummary(getSummary(pref.getKey()));
         }
     }
@@ -169,9 +165,9 @@
         }
     }
 
-    private RadioButtonPreferenceWithExtraWidget makeRadioPreference(String key, int titleId) {
-        RadioButtonPreferenceWithExtraWidget pref =
-                new RadioButtonPreferenceWithExtraWidget(mPreferenceCategory.getContext());
+    private RadioButtonPreference makeRadioPreference(String key, int titleId) {
+        final RadioButtonPreference pref =
+                new RadioButtonPreference(mPreferenceCategory.getContext());
         pref.setKey(key);
         pref.setTitle(titleId);
         pref.setOnClickListener(mRadioButtonClickListener);
@@ -179,9 +175,6 @@
         View.OnClickListener widgetClickListener = getWidgetClickListener(key);
         if (widgetClickListener != null) {
             pref.setExtraWidgetOnClickListener(widgetClickListener);
-            pref.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_SETTING);
-        } else {
-            pref.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_GONE);
         }
 
         mPreferenceCategory.addPreference(pref);
diff --git a/src/com/android/settings/notification/zen/ZenModeSettings.java b/src/com/android/settings/notification/zen/ZenModeSettings.java
index 436a399..2cc4f8b 100644
--- a/src/com/android/settings/notification/zen/ZenModeSettings.java
+++ b/src/com/android/settings/notification/zen/ZenModeSettings.java
@@ -32,7 +32,7 @@
 import android.app.NotificationManager.Policy;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-import android.icu.text.ListFormatter;
+import android.icu.text.MessageFormat;
 import android.provider.Settings;
 import android.service.notification.ZenModeConfig;
 
@@ -47,7 +47,9 @@
 import com.android.settingslib.search.SearchIndexable;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.function.Predicate;
@@ -130,24 +132,21 @@
                             || PRIORITY_CATEGORY_EVENTS == category,
                     true);
             int numCategories = enabledCategories.size();
-            if (numCategories == 0) {
-                return mContext.getResources().getString(R.string.zen_mode_other_sounds_none);
+            MessageFormat msgFormat = new MessageFormat(
+                    mContext.getString(R.string.zen_mode_other_sounds_summary),
+                    Locale.getDefault());
+            Map<String, Object> args = new HashMap<>();
+            args.put("count", numCategories);
+            if (numCategories >= 1) {
+                args.put("sound_category_1", enabledCategories.get(0));
+                if (numCategories >= 2) {
+                    args.put("sound_category_2", enabledCategories.get(1));
+                    if (numCategories == 3) {
+                        args.put("sound_category_3", enabledCategories.get(2));
+                    }
+                }
             }
-
-            List<String> displayCategories = new ArrayList<>();
-            if (numCategories <= 2) {
-                displayCategories = enabledCategories;
-            } else {
-                displayCategories.add(enabledCategories.get(0));
-                displayCategories.add(enabledCategories.get(1));
-                displayCategories.add(mContext.getString(R.string.zen_mode_other_sounds_list_count,
-                        numCategories - 2));
-            }
-
-            return mContext.getResources().getQuantityString(
-                    R.plurals.zen_mode_other_sounds_summary,
-                    numCategories /* quantity */,
-                    ListFormatter.getInstance().format(displayCategories));
+            return msgFormat.format(args);
         }
 
         String getCallsSettingSummary(Policy policy) {
@@ -192,15 +191,12 @@
                             description);
                 }
             } else {
-                final int count = getEnabledAutomaticRulesCount();
-                if (count > 0) {
-                    return mContext.getString(R.string.zen_mode_sound_summary_off_with_info,
-                            mContext.getResources().getQuantityString(
-                                    R.plurals.zen_mode_sound_summary_summary_off_info,
-                                    count, count));
-                }
-
-                return mContext.getString(R.string.zen_mode_sound_summary_off);
+                MessageFormat msgFormat = new MessageFormat(
+                        mContext.getString(R.string.zen_mode_sound_summary_off),
+                        Locale.getDefault());
+                Map<String, Object> msgArgs = new HashMap<>();
+                msgArgs.put("count", getEnabledAutomaticRulesCount());
+                return msgFormat.format(msgArgs);
             }
         }
 
@@ -218,10 +214,12 @@
         }
 
         String getAutomaticRulesSummary() {
-            final int count = getEnabledAutomaticRulesCount();
-            return count == 0 ? mContext.getString(R.string.zen_mode_settings_summary_off)
-                    : mContext.getResources().getQuantityString(
-                            R.plurals.zen_mode_settings_summary_on, count, count);
+            MessageFormat msgFormat = new MessageFormat(
+                    mContext.getString(R.string.zen_mode_settings_schedules_summary),
+                    Locale.getDefault());
+            Map<String, Object> msgArgs = new HashMap<>();
+            msgArgs.put("count", getEnabledAutomaticRulesCount());
+            return msgFormat.format(msgArgs);
         }
 
         @VisibleForTesting
diff --git a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
index c9a203e..14c9117 100644
--- a/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
+++ b/src/com/android/settings/notification/zen/ZenModeSliceBuilder.java
@@ -142,13 +142,14 @@
 
     private static PendingIntent getPrimaryAction(Context context) {
         final Intent intent = getIntent(context);
-        return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
+        return PendingIntent.getActivity(context, 0 /* requestCode */, intent,
+                PendingIntent.FLAG_IMMUTABLE);
     }
 
     private static PendingIntent getBroadcastIntent(Context context) {
         final Intent intent = new Intent(ACTION_ZEN_MODE_SLICE_CHANGED)
                 .setClass(context, SliceBroadcastReceiver.class);
         return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
-                PendingIntent.FLAG_CANCEL_CURRENT);
+                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_IMMUTABLE);
     }
 }
diff --git a/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java
index 691c2ae..1ceb357 100644
--- a/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeSoundVibrationPreferenceController.java
@@ -58,7 +58,7 @@
         switch (getZenMode()) {
             case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
                 preference.setEnabled(false);
-                preference.setSummary(mContext.getString(R.string.zen_mode_other_sounds_none));
+                preference.setSummary(mContext.getString(R.string.zen_mode_sounds_none));
                 break;
             case Settings.Global.ZEN_MODE_ALARMS:
                 preference.setEnabled(false);
diff --git a/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java
index f729be8..735ce79 100644
--- a/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceController.java
@@ -24,12 +24,13 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenModeVisEffectsAllPreferenceController
         extends AbstractZenModePreferenceController
-        implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener {
+        implements RadioButtonPreference.OnClickListener {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     protected static final int EFFECTS = Policy.SUPPRESSED_EFFECT_SCREEN_OFF
             | Policy.SUPPRESSED_EFFECT_SCREEN_ON
@@ -50,7 +51,7 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
-        mPreference.setOnRadioButtonClickListener(this);
+        mPreference.setOnClickListener(this);
     }
 
     @Override
@@ -68,7 +69,7 @@
     }
 
     @Override
-    public void onRadioButtonClick(ZenCustomRadioButtonPreference p) {
+    public void onRadioButtonClicked(RadioButtonPreference p) {
         mMetricsFeatureProvider.action(mContext,
                 SettingsEnums.ACTION_ZEN_SOUND_AND_VIS_EFFECTS, true);
         mBackend.saveVisualEffectsPolicy(EFFECTS, true);
diff --git a/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
index a772eb5..535dca3 100644
--- a/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceController.java
@@ -26,11 +26,12 @@
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenModeVisEffectsCustomPreferenceController
         extends AbstractZenModePreferenceController {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     protected static final int INTERRUPTIVE_EFFECTS =
             NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT
@@ -53,12 +54,11 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnGearClickListener(p -> {
+        mPreference.setExtraWidgetOnClickListener(p -> {
             launchCustomSettings();
-
         });
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             launchCustomSettings();
         });
     }
diff --git a/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java
index 84037b9..8723ea8 100644
--- a/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceController.java
@@ -24,12 +24,13 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenModeVisEffectsNonePreferenceController
         extends AbstractZenModePreferenceController
-        implements ZenCustomRadioButtonPreference.OnRadioButtonClickListener {
+        implements RadioButtonPreference.OnClickListener {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     protected static final int EFFECTS = Policy.SUPPRESSED_EFFECT_SCREEN_OFF
             | Policy.SUPPRESSED_EFFECT_SCREEN_ON
@@ -50,7 +51,7 @@
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
-        mPreference.setOnRadioButtonClickListener(this);
+        mPreference.setOnClickListener(this);
     }
 
     @Override
@@ -67,7 +68,7 @@
     }
 
     @Override
-    public void onRadioButtonClick(ZenCustomRadioButtonPreference preference) {
+    public void onRadioButtonClicked(RadioButtonPreference preference) {
         mMetricsFeatureProvider.action(mContext,
                 SettingsEnums.ACTION_ZEN_SOUND_ONLY, true);
         mBackend.saveVisualEffectsPolicy(EFFECTS, false);
diff --git a/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java
index 56b98ff..2cf8679 100644
--- a/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceController.java
@@ -25,11 +25,12 @@
 
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenRuleCustomPolicyPreferenceController extends
         AbstractZenCustomRulePreferenceController {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     public ZenRuleCustomPolicyPreferenceController(Context context, Lifecycle lifecycle,
             String key) {
@@ -41,13 +42,12 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnGearClickListener(p -> {
+        mPreference.setExtraWidgetOnClickListener(p -> {
             setCustomPolicy();
             launchCustomSettings();
-
         });
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             setCustomPolicy();
             launchCustomSettings();
         });
diff --git a/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java
index 268156b..372f152 100644
--- a/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceController.java
@@ -26,11 +26,12 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenRuleDefaultPolicyPreferenceController extends
         AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     public ZenRuleDefaultPolicyPreferenceController(Context context, Lifecycle lifecycle,
             String key) {
@@ -42,7 +43,7 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             mRule.setZenPolicy(null);
             mBackend.updateZenRule(mId, mRule);
         });
diff --git a/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java
index fb46209..6e9152f 100644
--- a/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceController.java
@@ -27,11 +27,12 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenRuleVisEffectsAllPreferenceController extends
         AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     public ZenRuleVisEffectsAllPreferenceController(Context context, Lifecycle lifecycle,
             String key) {
@@ -43,7 +44,7 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_SOUND_ONLY,
                     Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_RULE_ID, mId));
             mRule.setZenPolicy(new ZenPolicy.Builder(mRule.getZenPolicy())
diff --git a/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java
index 68ab818..d7c5f86 100644
--- a/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceController.java
@@ -27,11 +27,12 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenRuleVisEffectsCustomPreferenceController extends
         AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     public ZenRuleVisEffectsCustomPreferenceController(Context context, Lifecycle lifecycle,
             String key) {
@@ -43,12 +44,12 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnGearClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             launchCustomSettings();
 
         });
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setExtraWidgetOnClickListener(p -> {
             launchCustomSettings();
         });
     }
diff --git a/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java b/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java
index cb3e690..5484ed5 100644
--- a/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java
+++ b/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceController.java
@@ -27,11 +27,12 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 public class ZenRuleVisEffectsNonePreferenceController extends
         AbstractZenCustomRulePreferenceController implements PreferenceControllerMixin {
 
-    private ZenCustomRadioButtonPreference mPreference;
+    private RadioButtonPreference mPreference;
 
     public ZenRuleVisEffectsNonePreferenceController(Context context, Lifecycle lifecycle,
             String key) {
@@ -43,7 +44,7 @@
         super.displayPreference(screen);
         mPreference = screen.findPreference(getPreferenceKey());
 
-        mPreference.setOnRadioButtonClickListener(p -> {
+        mPreference.setOnClickListener(p -> {
             mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_ZEN_SOUND_AND_VIS_EFFECTS,
                     Pair.create(MetricsProto.MetricsEvent.FIELD_ZEN_RULE_ID, mId));
             mRule.setZenPolicy(new ZenPolicy.Builder(mRule.getZenPolicy())
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index afbce09..a15075e 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -31,6 +31,7 @@
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
+import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
 import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
@@ -40,6 +41,7 @@
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.slices.SlicesFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
+import com.android.settings.wifi.WifiTrackerLibProvider;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 /**
@@ -103,6 +105,12 @@
 
     public abstract PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context);
 
+    /**
+     * Retrieve implementation for Battery Status feature.
+     */
+    public abstract BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(
+            Context context);
+
     public abstract DashboardFeatureProvider getDashboardFeatureProvider(Context context);
 
     public abstract DockUpdaterFeatureProvider getDockUpdaterFeatureProvider();
@@ -136,6 +144,11 @@
 
     public abstract FaceFeatureProvider getFaceFeatureProvider();
 
+    /**
+     * Gets implementation for the WifiTrackerLib.
+     */
+    public abstract WifiTrackerLibProvider getWifiTrackerLibProvider();
+
     public static final class FactoryNotFoundException extends RuntimeException {
         public FactoryNotFoundException(Throwable throwable) {
             super("Unable to create factory. Did you misconfigure Proguard?", throwable);
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index 29beb5b..ebbe87c 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -42,6 +42,8 @@
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
+import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
+import com.android.settings.fuelgauge.BatteryStatusFeatureProviderImpl;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProviderImpl;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
@@ -60,6 +62,8 @@
 import com.android.settings.slices.SlicesFeatureProviderImpl;
 import com.android.settings.users.UserFeatureProvider;
 import com.android.settings.users.UserFeatureProviderImpl;
+import com.android.settings.wifi.WifiTrackerLibProvider;
+import com.android.settings.wifi.WifiTrackerLibProviderImpl;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 /**
@@ -78,6 +82,7 @@
     private SecurityFeatureProvider mSecurityFeatureProvider;
     private SuggestionFeatureProvider mSuggestionFeatureProvider;
     private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
+    private BatteryStatusFeatureProvider mBatteryStatusFeatureProvider;
     private AssistGestureFeatureProvider mAssistGestureFeatureProvider;
     private UserFeatureProvider mUserFeatureProvider;
     private SlicesFeatureProvider mSlicesFeatureProvider;
@@ -87,6 +92,7 @@
     private BluetoothFeatureProvider mBluetoothFeatureProvider;
     private AwareFeatureProvider mAwareFeatureProvider;
     private FaceFeatureProvider mFaceFeatureProvider;
+    private WifiTrackerLibProvider mWifiTrackerLibProvider;
 
     @Override
     public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -111,6 +117,15 @@
     }
 
     @Override
+    public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(Context context) {
+        if (mBatteryStatusFeatureProvider == null) {
+            mBatteryStatusFeatureProvider = new BatteryStatusFeatureProviderImpl(
+                    context.getApplicationContext());
+        }
+        return mBatteryStatusFeatureProvider;
+    }
+
+    @Override
     public DashboardFeatureProvider getDashboardFeatureProvider(Context context) {
         if (mDashboardFeatureProvider == null) {
             mDashboardFeatureProvider = new DashboardFeatureProviderImpl(
@@ -266,4 +281,12 @@
         }
         return mFaceFeatureProvider;
     }
+
+    @Override
+    public WifiTrackerLibProvider getWifiTrackerLibProvider() {
+        if (mWifiTrackerLibProvider == null) {
+            mWifiTrackerLibProvider = new WifiTrackerLibProviderImpl();
+        }
+        return mWifiTrackerLibProvider;
+    }
 }
diff --git a/src/com/android/settings/panel/InternetConnectivityPanel.java b/src/com/android/settings/panel/InternetConnectivityPanel.java
index db0c5e3..312bf75 100644
--- a/src/com/android/settings/panel/InternetConnectivityPanel.java
+++ b/src/com/android/settings/panel/InternetConnectivityPanel.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.panel;
 
+import static com.android.settings.network.NetworkProviderSettings.ACTION_NETWORK_PROVIDER_SETTINGS;
+
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
@@ -23,6 +25,7 @@
 import android.provider.Settings;
 
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.network.AirplaneModePreferenceController;
 import com.android.settings.slices.CustomSliceRegistry;
 
@@ -50,21 +53,28 @@
 
     @Override
     public CharSequence getTitle() {
-        return mContext.getText(R.string.internet_connectivity_panel_title);
+        return mContext.getText(Utils.isProviderModelEnabled(mContext)
+                ? R.string.provider_internet_settings : R.string.internet_connectivity_panel_title);
     }
 
     @Override
     public List<Uri> getSlices() {
         final List<Uri> uris = new ArrayList<>();
-        uris.add(CustomSliceRegistry.WIFI_SLICE_URI);
-        uris.add(CustomSliceRegistry.MOBILE_DATA_SLICE_URI);
-        uris.add(AirplaneModePreferenceController.SLICE_URI);
+        if (Utils.isProviderModelEnabled(mContext)) {
+            uris.add(CustomSliceRegistry.PROVIDER_MODEL_SLICE_URI);
+            uris.add(CustomSliceRegistry.AIRPLANE_SAFE_NETWORKS_SLICE_URI);
+        } else {
+            uris.add(CustomSliceRegistry.WIFI_SLICE_URI);
+            uris.add(CustomSliceRegistry.MOBILE_DATA_SLICE_URI);
+            uris.add(AirplaneModePreferenceController.SLICE_URI);
+        }
         return uris;
     }
 
     @Override
     public Intent getSeeMoreIntent() {
-        return new Intent(Settings.ACTION_WIRELESS_SETTINGS)
+        return new Intent(Utils.isProviderModelEnabled(mContext)
+                ? ACTION_NETWORK_PROVIDER_SETTINGS : Settings.ACTION_WIRELESS_SETTINGS)
                 .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
     }
 
diff --git a/src/com/android/settings/panel/MediaOutputGroupPanel.java b/src/com/android/settings/panel/MediaOutputGroupPanel.java
deleted file mode 100644
index 36f779b..0000000
--- a/src/com/android/settings/panel/MediaOutputGroupPanel.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.panel;
-
-import static androidx.lifecycle.Lifecycle.Event.ON_START;
-import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
-
-import static com.android.settings.media.MediaOutputSlice.MEDIA_PACKAGE_NAME;
-import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_GROUP_SLICE_URI;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Color;
-import android.net.Uri;
-
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-
-import com.android.settings.R;
-import com.android.settingslib.media.LocalMediaManager;
-import com.android.settingslib.media.MediaDevice;
-import com.android.settingslib.media.MediaOutputSliceConstants;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents the Media output group Panel.
- *
- * <p>
- * Displays Media output group item
- * </p>
- */
-public class MediaOutputGroupPanel implements PanelContent, LocalMediaManager.DeviceCallback,
-        LifecycleObserver {
-
-    private final Context mContext;
-    private final String mPackageName;
-
-    private PanelContentCallback mCallback;
-    private LocalMediaManager mLocalMediaManager;
-
-    /**
-     * To generate a Media output group Panel instance.
-     *
-     * @param context the context of the caller.
-     * @param packageName media application package name.
-     * @return MediaOutputGroupPanel instance.
-     */
-    public static MediaOutputGroupPanel create(Context context, String packageName) {
-        return new MediaOutputGroupPanel(context, packageName);
-    }
-
-    private MediaOutputGroupPanel(Context context, String packageName) {
-        mContext = context.getApplicationContext();
-        mPackageName = packageName;
-    }
-
-    @Override
-    public CharSequence getTitle() {
-        return mContext.getText(R.string.media_output_group_panel_title);
-    }
-
-    @Override
-    public CharSequence getSubTitle() {
-        final int size = mLocalMediaManager.getSelectedMediaDevice().size();
-        if (size == 1) {
-            return mContext.getText(R.string.media_output_group_panel_single_device_summary);
-        }
-        return mContext.getString(R.string.media_output_group_panel_multiple_devices_summary, size);
-    }
-
-    @Override
-    public IconCompat getIcon() {
-        return IconCompat.createWithResource(mContext, R.drawable.ic_arrow_back).setTint(
-                Color.BLACK);
-    }
-
-    @Override
-    public List<Uri> getSlices() {
-        final List<Uri> uris = new ArrayList<>();
-        MEDIA_OUTPUT_GROUP_SLICE_URI =
-                MEDIA_OUTPUT_GROUP_SLICE_URI
-                        .buildUpon()
-                        .clearQuery()
-                        .appendQueryParameter(MEDIA_PACKAGE_NAME, mPackageName)
-                        .build();
-        uris.add(MEDIA_OUTPUT_GROUP_SLICE_URI);
-        return uris;
-    }
-
-    @Override
-    public Intent getSeeMoreIntent() {
-        return null;
-    }
-
-    @Override
-    public Intent getHeaderIconIntent() {
-        final Intent intent = new Intent()
-                .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME, mPackageName);
-        return intent;
-    }
-
-    @Override
-    public void registerCallback(PanelContentCallback callback) {
-        mCallback = callback;
-    }
-
-    /**
-     * Lifecycle callback to initial {@link LocalMediaManager}
-     */
-    @OnLifecycleEvent(ON_START)
-    public void onStart() {
-        if (mLocalMediaManager == null) {
-            mLocalMediaManager = new LocalMediaManager(mContext, mPackageName, null);
-        }
-        mLocalMediaManager.registerCallback(this);
-        mLocalMediaManager.startScan();
-    }
-
-    /**
-     * Lifecycle callback to de-initial {@link LocalMediaManager}
-     */
-    @OnLifecycleEvent(ON_STOP)
-    public void onStop() {
-        mLocalMediaManager.unregisterCallback(this);
-        mLocalMediaManager.stopScan();
-    }
-
-    @Override
-    public void onDeviceListUpdate(List<MediaDevice> devices) {
-        if (mCallback != null) {
-            mCallback.onHeaderChanged();
-        }
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.PANEL_MEDIA_OUTPUT_GROUP;
-    }
-
-    @Override
-    public int getViewType() {
-        return PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON;
-    }
-}
diff --git a/src/com/android/settings/panel/MediaOutputPanel.java b/src/com/android/settings/panel/MediaOutputPanel.java
deleted file mode 100644
index 6a296b7..0000000
--- a/src/com/android/settings/panel/MediaOutputPanel.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.panel;
-
-import static androidx.lifecycle.Lifecycle.Event.ON_START;
-import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
-
-import static com.android.settings.media.MediaOutputSlice.MEDIA_PACKAGE_NAME;
-import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_SLICE_URI;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.media.MediaMetadata;
-import android.media.session.MediaController;
-import android.media.session.MediaSessionManager;
-import android.media.session.PlaybackState;
-import android.net.Uri;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.lifecycle.LifecycleObserver;
-import androidx.lifecycle.OnLifecycleEvent;
-
-import com.android.internal.annotations.VisibleForTesting;
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settingslib.media.InfoMediaDevice;
-import com.android.settingslib.media.LocalMediaManager;
-import com.android.settingslib.media.MediaDevice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents the Media output Panel.
- *
- * <p>
- * Displays Media output item
- * </p>
- */
-public class MediaOutputPanel implements PanelContent, LocalMediaManager.DeviceCallback,
-        LifecycleObserver {
-
-    private static final String TAG = "MediaOutputPanel";
-
-    private final Context mContext;
-    private final String mPackageName;
-
-    @VisibleForTesting
-    LocalMediaManager mLocalMediaManager;
-
-    private PanelContentCallback mCallback;
-    private boolean mIsCustomizedButtonUsed = true;
-    private MediaSessionManager mMediaSessionManager;
-    private MediaController mMediaController;
-
-    public static MediaOutputPanel create(Context context, String packageName) {
-        return new MediaOutputPanel(context, packageName);
-    }
-
-    private MediaOutputPanel(Context context, String packageName) {
-        mContext = context.getApplicationContext();
-        mPackageName = TextUtils.isEmpty(packageName) ? "" : packageName;
-    }
-
-    @Override
-    public CharSequence getTitle() {
-        if (mMediaController != null) {
-            final MediaMetadata metadata = mMediaController.getMetadata();
-            if (metadata != null) {
-                return metadata.getDescription().getTitle();
-            }
-        }
-        return mContext.getText(R.string.media_volume_title);
-    }
-
-    @Override
-    public CharSequence getSubTitle() {
-        if (mMediaController != null) {
-            final MediaMetadata metadata = mMediaController.getMetadata();
-            if (metadata != null) {
-                return metadata.getDescription().getSubtitle();
-            }
-        }
-        return mContext.getText(R.string.media_output_panel_title);
-    }
-
-    @Override
-    public IconCompat getIcon() {
-        if (mMediaController == null) {
-            return IconCompat.createWithResource(mContext, R.drawable.ic_media_stream).setTint(
-                    Utils.getColorAccentDefaultColor(mContext));
-        }
-        final MediaMetadata metadata = mMediaController.getMetadata();
-        if (metadata != null) {
-            final Bitmap bitmap = metadata.getDescription().getIconBitmap();
-            if (bitmap != null) {
-                final Bitmap roundBitmap = Utils.convertCornerRadiusBitmap(mContext, bitmap,
-                        (float) mContext.getResources().getDimensionPixelSize(
-                                R.dimen.output_switcher_panel_icon_corner_radius));
-
-                return IconCompat.createWithBitmap(roundBitmap);
-            }
-        }
-        Log.d(TAG, "Media meta data does not contain icon information");
-        return getPackageIcon();
-    }
-
-    private IconCompat getPackageIcon() {
-        try {
-            final Drawable drawable = mContext.getPackageManager().getApplicationIcon(mPackageName);
-            if (drawable instanceof BitmapDrawable) {
-                return IconCompat.createWithBitmap(((BitmapDrawable) drawable).getBitmap());
-            }
-            final Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(),
-                    drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-            final Canvas canvas = new Canvas(bitmap);
-            drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-            drawable.draw(canvas);
-
-            return IconCompat.createWithBitmap(bitmap);
-        } catch (PackageManager.NameNotFoundException e) {
-            Log.e(TAG, "Package is not found. Unable to get package icon.");
-        }
-        return null;
-    }
-
-    @Override
-    public List<Uri> getSlices() {
-        final List<Uri> uris = new ArrayList<>();
-        MEDIA_OUTPUT_SLICE_URI =
-                MEDIA_OUTPUT_SLICE_URI
-                        .buildUpon()
-                        .clearQuery()
-                        .appendQueryParameter(MEDIA_PACKAGE_NAME, mPackageName)
-                        .build();
-        uris.add(MEDIA_OUTPUT_SLICE_URI);
-        return uris;
-    }
-
-    @Override
-    public Intent getSeeMoreIntent() {
-        return null;
-    }
-
-    @Override
-    public boolean isCustomizedButtonUsed() {
-        return mIsCustomizedButtonUsed;
-    }
-
-    @Override
-    public CharSequence getCustomizedButtonTitle() {
-        return mContext.getText(R.string.service_stop);
-    }
-
-    @Override
-    public void onClickCustomizedButton() {
-        mLocalMediaManager.releaseSession();
-    }
-
-    @Override
-    public void registerCallback(PanelContentCallback callback) {
-        mCallback = callback;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.PANEL_MEDIA_OUTPUT;
-    }
-
-    @Override
-    public void onSelectedDeviceStateChanged(MediaDevice device, int state) {
-        dispatchCustomButtonStateChanged();
-    }
-
-    @Override
-    public void onDeviceListUpdate(List<MediaDevice> devices) {
-        dispatchCustomButtonStateChanged();
-    }
-
-    @Override
-    public void onDeviceAttributesChanged() {
-        dispatchCustomButtonStateChanged();
-    }
-
-    private void dispatchCustomButtonStateChanged() {
-        hideCustomButtonIfNecessary();
-        if (mCallback != null) {
-            mCallback.onCustomizedButtonStateChanged();
-        }
-    }
-
-    private void hideCustomButtonIfNecessary() {
-        final MediaDevice device = mLocalMediaManager.getCurrentConnectedDevice();
-        mIsCustomizedButtonUsed = device instanceof InfoMediaDevice;
-    }
-
-    @OnLifecycleEvent(ON_START)
-    public void onStart() {
-        if (!TextUtils.isEmpty(mPackageName)) {
-            mMediaSessionManager = mContext.getSystemService(MediaSessionManager.class);
-            for (MediaController controller : mMediaSessionManager.getActiveSessions(null)) {
-                if (TextUtils.equals(controller.getPackageName(), mPackageName)) {
-                    mMediaController = controller;
-                    mMediaController.registerCallback(mCb);
-                    mCallback.onHeaderChanged();
-                    break;
-                }
-            }
-        }
-        if (mMediaController == null) {
-            Log.d(TAG, "No media controller for " + mPackageName);
-        }
-        if (mLocalMediaManager == null) {
-            mLocalMediaManager = new LocalMediaManager(mContext, mPackageName, null);
-        }
-        mLocalMediaManager.registerCallback(this);
-        mLocalMediaManager.startScan();
-    }
-
-    @OnLifecycleEvent(ON_STOP)
-    public void onStop() {
-        if (mMediaController != null) {
-            mMediaController.unregisterCallback(mCb);
-        }
-        mLocalMediaManager.unregisterCallback(this);
-        mLocalMediaManager.stopScan();
-    }
-
-    @Override
-    public int getViewType() {
-        return PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON;
-    }
-
-    private final MediaController.Callback mCb = new MediaController.Callback() {
-        @Override
-        public void onMetadataChanged(MediaMetadata metadata) {
-            if (mCallback != null) {
-                mCallback.onHeaderChanged();
-            }
-        }
-
-        @Override
-        public void onPlaybackStateChanged(PlaybackState state) {
-            final int playState = state.getState();
-            if (mCallback != null && (playState == PlaybackState.STATE_STOPPED
-                    || playState == PlaybackState.STATE_PAUSED)) {
-                mCallback.forceClose();
-            }
-        }
-    };
-}
diff --git a/src/com/android/settings/panel/PanelContent.java b/src/com/android/settings/panel/PanelContent.java
index 9fa4316..6c271fd 100644
--- a/src/com/android/settings/panel/PanelContent.java
+++ b/src/com/android/settings/panel/PanelContent.java
@@ -31,7 +31,6 @@
 public interface PanelContent extends Instrumentable {
 
     int VIEW_TYPE_SLIDER = 1;
-    int VIEW_TYPE_SLIDER_LARGE_ICON = 2;
 
     /**
      * @return a icon for the title of the Panel.
diff --git a/src/com/android/settings/panel/PanelFeatureProviderImpl.java b/src/com/android/settings/panel/PanelFeatureProviderImpl.java
index 93c6025..ca30952 100644
--- a/src/com/android/settings/panel/PanelFeatureProviderImpl.java
+++ b/src/com/android/settings/panel/PanelFeatureProviderImpl.java
@@ -16,9 +16,6 @@
 
 package com.android.settings.panel;
 
-import static com.android.settingslib.media.MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT;
-import static com.android.settingslib.media.MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT_GROUP;
-
 import android.content.Context;
 import android.os.Bundle;
 import android.provider.Settings;
@@ -39,16 +36,12 @@
         switch (panelType) {
             case Settings.Panel.ACTION_INTERNET_CONNECTIVITY:
                 return InternetConnectivityPanel.create(context);
-            case ACTION_MEDIA_OUTPUT:
-                return MediaOutputPanel.create(context, mediaPackageName);
             case Settings.Panel.ACTION_NFC:
                 return NfcPanel.create(context);
             case Settings.Panel.ACTION_WIFI:
                 return WifiPanel.create(context);
             case Settings.Panel.ACTION_VOLUME:
                 return VolumePanel.create(context);
-            case ACTION_MEDIA_OUTPUT_GROUP:
-                return MediaOutputGroupPanel.create(context, mediaPackageName);
         }
 
         throw new IllegalStateException("No matching panel for: "  + panelType);
diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java
index 9cb626d..cc27683 100644
--- a/src/com/android/settings/panel/PanelFragment.java
+++ b/src/com/android/settings/panel/PanelFragment.java
@@ -93,10 +93,12 @@
     private String mPanelClosedKey;
     private LinearLayout mPanelHeader;
     private ImageView mTitleIcon;
+    private LinearLayout mTitleGroup;
     private TextView mHeaderTitle;
     private TextView mHeaderSubtitle;
     private int mMaxHeight;
     private View mFooterDivider;
+    private boolean mPanelCreating;
 
     private final Map<Uri, LiveData<Slice>> mSliceLiveData = new LinkedHashMap<>();
 
@@ -127,6 +129,7 @@
                     if (mPanelSlices != null) {
                         mPanelSlices.getViewTreeObserver().removeOnGlobalLayoutListener(this);
                     }
+                    mPanelCreating = false;
                 }
             };
 
@@ -140,6 +143,7 @@
         mLayoutView.getViewTreeObserver()
                 .addOnGlobalLayoutListener(mPanelLayoutListener);
         mMaxHeight = getResources().getDimensionPixelSize(R.dimen.output_switcher_slice_max_height);
+        mPanelCreating = true;
         createPanelContent();
         return mLayoutView;
     }
@@ -153,6 +157,7 @@
      * Call createPanelContent() once animation end.
      */
     void updatePanelWithAnimation() {
+        mPanelCreating = true;
         final View panelContent = mLayoutView.findViewById(R.id.panel_container);
         final AnimatorSet animatorSet = buildAnimatorSet(mLayoutView,
                 0.0f /* startY */, panelContent.getHeight() /* endY */,
@@ -171,11 +176,21 @@
         animatorSet.start();
     }
 
+    boolean isPanelCreating() {
+        return mPanelCreating;
+    }
+
     private void createPanelContent() {
         final FragmentActivity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+
         if (mLayoutView == null) {
             activity.finish();
+            return;
         }
+
         final ViewGroup.LayoutParams params = mLayoutView.getLayoutParams();
         params.height = ViewGroup.LayoutParams.WRAP_CONTENT;
         mLayoutView.setLayoutParams(params);
@@ -186,6 +201,7 @@
         mTitleView = mLayoutView.findViewById(R.id.panel_title);
         mPanelHeader = mLayoutView.findViewById(R.id.panel_header);
         mTitleIcon = mLayoutView.findViewById(R.id.title_icon);
+        mTitleGroup = mLayoutView.findViewById(R.id.title_group);
         mHeaderTitle = mLayoutView.findViewById(R.id.header_title);
         mHeaderSubtitle = mLayoutView.findViewById(R.id.header_subtitle);
         mFooterDivider = mLayoutView.findViewById(R.id.footer_divider);
@@ -204,6 +220,7 @@
 
         if (mPanel == null) {
             activity.finish();
+            return;
         }
 
         mPanel.registerCallback(new LocalPanelCallback());
@@ -222,33 +239,16 @@
 
         final IconCompat icon = mPanel.getIcon();
         final CharSequence title = mPanel.getTitle();
-        if (icon == null) {
+
+        if (icon != null) {
+            enablePanelHeader(icon, title);
+        } else {
             mTitleView.setVisibility(View.VISIBLE);
             mPanelHeader.setVisibility(View.GONE);
             mTitleView.setText(title);
-        } else {
-            mTitleView.setVisibility(View.GONE);
-            mPanelHeader.setVisibility(View.VISIBLE);
-            mPanelHeader.setAccessibilityPaneTitle(title);
-            mTitleIcon.setImageIcon(icon.toIcon(getContext()));
-            mHeaderTitle.setText(title);
-            mHeaderSubtitle.setText(mPanel.getSubTitle());
-            if (mPanel.getHeaderIconIntent() != null) {
-                mTitleIcon.setOnClickListener(getHeaderIconListener());
-                mTitleIcon.setLayoutParams(new LinearLayout.LayoutParams(
-                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-            } else {
-                final int size = getResources().getDimensionPixelSize(
-                        R.dimen.output_switcher_panel_icon_size);
-                mTitleIcon.setLayoutParams(new LinearLayout.LayoutParams(size, size));
-            }
         }
 
-        if (mPanel.getViewType() == PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON) {
-            mFooterDivider.setVisibility(View.VISIBLE);
-        } else {
-            mFooterDivider.setVisibility(View.GONE);
-        }
+        mFooterDivider.setVisibility(View.GONE);
 
         mSeeMoreButton.setOnClickListener(getSeeMoreListener());
         mDoneButton.setOnClickListener(getCloseListener());
@@ -275,6 +275,29 @@
                 0 /* value */);
     }
 
+    private void enablePanelHeader(IconCompat icon, CharSequence title) {
+        mTitleView.setVisibility(View.GONE);
+        mPanelHeader.setVisibility(View.VISIBLE);
+        mPanelHeader.setAccessibilityPaneTitle(title);
+        mHeaderTitle.setText(title);
+        mHeaderSubtitle.setText(mPanel.getSubTitle());
+        if (icon != null) {
+            mTitleGroup.setVisibility(View.VISIBLE);
+            mTitleIcon.setImageIcon(icon.toIcon(getContext()));
+            if (mPanel.getHeaderIconIntent() != null) {
+                mTitleIcon.setOnClickListener(getHeaderIconListener());
+                mTitleIcon.setLayoutParams(new LinearLayout.LayoutParams(
+                        ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+            } else {
+                final int size = getResources().getDimensionPixelSize(
+                        R.dimen.output_switcher_panel_icon_size);
+                mTitleIcon.setLayoutParams(new LinearLayout.LayoutParams(size, size));
+            }
+        } else {
+            mTitleGroup.setVisibility(View.GONE);
+        }
+    }
+
     private void loadAllSlices() {
         mSliceLiveData.clear();
         final List<Uri> sliceUris = mPanel.getSlices();
@@ -300,7 +323,7 @@
                  * Watching for the {@link Slice} to load.
                  * <p>
                  *     If the Slice comes back {@code null} or with the Error attribute, if slice
-                 *     uri is not in the whitelist, remove the Slice data from the list, otherwise
+                 *     uri is not in the allowlist, remove the Slice data from the list, otherwise
                  *     keep the Slice data.
                  * <p>
                  *     If the Slice has come back fully loaded, then mark the Slice as loaded.  No
@@ -331,10 +354,10 @@
     }
 
     private void removeSliceLiveData(Uri uri) {
-        final List<String> whiteList = Arrays.asList(
+        final List<String> allowList = Arrays.asList(
                 getResources().getStringArray(
                         R.array.config_panel_keep_observe_uri));
-        if (!whiteList.contains(uri.toString())) {
+        if (!allowList.contains(uri.toString())) {
             mSliceLiveData.remove(uri);
         }
     }
@@ -415,12 +438,14 @@
         if (mLayoutView != null) {
             mLayoutView.getViewTreeObserver().removeOnGlobalLayoutListener(mPanelLayoutListener);
         }
-        mMetricsProvider.action(
-                0 /* attribution */,
-                SettingsEnums.PAGE_HIDE,
-                mPanel.getMetricsCategory(),
-                mPanelClosedKey,
-                0 /* value */);
+        if (mPanel != null) {
+            mMetricsProvider.action(
+                    0 /* attribution */,
+                    SettingsEnums.PAGE_HIDE,
+                    mPanel.getMetricsCategory(),
+                    mPanelClosedKey,
+                    0 /* value */);
+        }
     }
 
     @VisibleForTesting
@@ -471,7 +496,13 @@
         @Override
         public void onHeaderChanged() {
             ThreadUtils.postOnMainThread(() -> {
-                mTitleIcon.setImageIcon(mPanel.getIcon().toIcon(getContext()));
+                final IconCompat icon = mPanel.getIcon();
+                if (icon != null) {
+                    mTitleIcon.setImageIcon(icon.toIcon(getContext()));
+                    mTitleGroup.setVisibility(View.VISIBLE);
+                } else {
+                    mTitleGroup.setVisibility(View.GONE);
+                }
                 mHeaderTitle.setText(mPanel.getTitle());
                 mHeaderSubtitle.setText(mPanel.getSubTitle());
             });
diff --git a/src/com/android/settings/panel/PanelSlicesAdapter.java b/src/com/android/settings/panel/PanelSlicesAdapter.java
index a055dbb..4c8698a 100644
--- a/src/com/android/settings/panel/PanelSlicesAdapter.java
+++ b/src/com/android/settings/panel/PanelSlicesAdapter.java
@@ -16,9 +16,7 @@
 
 package com.android.settings.panel;
 
-import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_GROUP_SLICE_URI;
 import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI;
-import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_SLICE_URI;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -75,8 +73,6 @@
         View view;
         if (viewType == PanelContent.VIEW_TYPE_SLIDER) {
             view = inflater.inflate(R.layout.panel_slice_slider_row, viewGroup, false);
-        } else if (viewType == PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON) {
-            view = inflater.inflate(R.layout.panel_slice_slider_row_large_icon, viewGroup, false);
         } else {
             view = inflater.inflate(R.layout.panel_slice_row, viewGroup, false);
         }
@@ -142,15 +138,6 @@
             final Slice slice = sliceLiveData.getValue();
             if (slice == null || slice.getUri().equals(MEDIA_OUTPUT_INDICATOR_SLICE_URI)) {
                 mDividerAllowedAbove = false;
-            } else if (position == 0 && (slice.getUri().equals(MEDIA_OUTPUT_SLICE_URI)
-                    || slice.getUri().equals(MEDIA_OUTPUT_GROUP_SLICE_URI))) {
-                sliceView.setClickable(false);
-                // Customize output switcher slice padding
-                final int padding = mPanelFragment.getResources().getDimensionPixelSize(
-                        R.dimen.output_switcher_slice_padding_top);
-                mSliceSliderLayout.setPadding(mSliceSliderLayout.getPaddingLeft(), padding,
-                        mSliceSliderLayout.getPaddingRight(),
-                        padding);
             }
 
             // Log Panel interaction
@@ -175,7 +162,7 @@
 
         @Override
         public boolean isDividerAllowedBelow() {
-            return mPanelFragment.getPanelViewType() != PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON;
+            return true;
         }
     }
 }
diff --git a/src/com/android/settings/panel/SettingsPanelActivity.java b/src/com/android/settings/panel/SettingsPanelActivity.java
index 68cb8d5..b7b1519 100644
--- a/src/com/android/settings/panel/SettingsPanelActivity.java
+++ b/src/com/android/settings/panel/SettingsPanelActivity.java
@@ -21,6 +21,7 @@
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.Window;
@@ -41,12 +42,14 @@
  */
 public class SettingsPanelActivity extends FragmentActivity {
 
-    private final String TAG = "panel_activity";
+    private static final String TAG = "SettingsPanelActivity";
 
     @VisibleForTesting
     final Bundle mBundle = new Bundle();
     @VisibleForTesting
     boolean mForceCreation = false;
+    @VisibleForTesting
+    PanelFragment mPanelFragment;
 
     /**
      * Key specifying which Panel the app is requesting.
@@ -87,7 +90,9 @@
     @Override
     protected void onStop() {
         super.onStop();
-        mForceCreation = true;
+        if (mPanelFragment != null && !mPanelFragment.isPanelCreating()) {
+            mForceCreation = true;
+        }
     }
 
     @Override
@@ -104,10 +109,10 @@
             return;
         }
 
+        final String action = callingIntent.getAction();
         // We will use it once media output switch panel support remote device.
         final String mediaPackageName = callingIntent.getStringExtra(EXTRA_PACKAGE_NAME);
-
-        mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, callingIntent.getAction());
+        mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, action);
         mBundle.putString(KEY_CALLING_PACKAGE_NAME, getCallingPackage());
         mBundle.putString(KEY_MEDIA_PACKAGE_NAME, mediaPackageName);
 
@@ -116,9 +121,21 @@
 
         // If fragment already exists and visible, we will need to update panel with animation.
         if (!shouldForceCreation && fragment != null && fragment instanceof PanelFragment) {
-            final PanelFragment panelFragment = (PanelFragment) fragment;
-            panelFragment.setArguments(mBundle);
-            panelFragment.updatePanelWithAnimation();
+            mPanelFragment = (PanelFragment) fragment;
+            if (mPanelFragment.isPanelCreating()) {
+                Log.w(TAG, "A panel is creating, skip " + action);
+                return;
+            }
+
+            final Bundle bundle = fragment.getArguments();
+            if (bundle != null
+                    && TextUtils.equals(action, bundle.getString(KEY_PANEL_TYPE_ARGUMENT))) {
+                Log.w(TAG, "Panel is showing the same action, skip " + action);
+                return;
+            }
+
+            mPanelFragment.setArguments(new Bundle(mBundle));
+            mPanelFragment.updatePanelWithAnimation();
         } else {
             setContentView(R.layout.settings_panel);
 
@@ -127,9 +144,9 @@
             window.setGravity(Gravity.BOTTOM);
             window.setLayout(WindowManager.LayoutParams.MATCH_PARENT,
                     WindowManager.LayoutParams.WRAP_CONTENT);
-            final PanelFragment panelFragment = new PanelFragment();
-            panelFragment.setArguments(mBundle);
-            fragmentManager.beginTransaction().add(R.id.main_content, panelFragment).commit();
+            mPanelFragment = new PanelFragment();
+            mPanelFragment.setArguments(new Bundle(mBundle));
+            fragmentManager.beginTransaction().add(R.id.main_content, mPanelFragment).commit();
         }
     }
 }
diff --git a/src/com/android/settings/panel/VolumePanel.java b/src/com/android/settings/panel/VolumePanel.java
index d45bfd1..b5e807d 100644
--- a/src/com/android/settings/panel/VolumePanel.java
+++ b/src/com/android/settings/panel/VolumePanel.java
@@ -16,6 +16,9 @@
 
 package com.android.settings.panel;
 
+import static androidx.lifecycle.Lifecycle.Event.ON_PAUSE;
+import static androidx.lifecycle.Lifecycle.Event.ON_RESUME;
+
 import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI;
 import static com.android.settings.slices.CustomSliceRegistry.REMOTE_MEDIA_SLICE_URI;
 import static com.android.settings.slices.CustomSliceRegistry.VOLUME_ALARM_URI;
@@ -24,20 +27,40 @@
 import static com.android.settings.slices.CustomSliceRegistry.VOLUME_RINGER_URI;
 
 import android.app.settings.SettingsEnums;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.net.Uri;
 import android.provider.Settings;
 
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+
 import com.android.settings.R;
+import com.android.settingslib.media.MediaOutputSliceConstants;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class VolumePanel implements PanelContent {
+/**
+ * Panel data class for Volume settings.
+ */
+public class VolumePanel implements PanelContent, LifecycleObserver {
 
     private final Context mContext;
 
+    private PanelContentCallback mCallback;
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (MediaOutputSliceConstants.ACTION_CLOSE_PANEL.equals(intent.getAction())) {
+                mCallback.forceClose();
+            }
+        }
+    };
+
     public static VolumePanel create(Context context) {
         return new VolumePanel(context);
     }
@@ -46,6 +69,20 @@
         mContext = context.getApplicationContext();
     }
 
+    /** Invoked when the panel is resumed. */
+    @OnLifecycleEvent(ON_RESUME)
+    public void onResume() {
+        final IntentFilter filter = new IntentFilter();
+        filter.addAction(MediaOutputSliceConstants.ACTION_CLOSE_PANEL);
+        mContext.registerReceiver(mReceiver, filter);
+    }
+
+    /** Invoked when the panel is paused. */
+    @OnLifecycleEvent(ON_PAUSE)
+    public void onPause() {
+        mContext.unregisterReceiver(mReceiver);
+    }
+
     @Override
     public CharSequence getTitle() {
         return mContext.getText(R.string.sound_settings);
@@ -78,4 +115,9 @@
     public int getViewType() {
         return PanelContent.VIEW_TYPE_SLIDER;
     }
+
+    @Override
+    public void registerCallback(PanelContentCallback callback) {
+        mCallback = callback;
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/panel/WifiPanel.java b/src/com/android/settings/panel/WifiPanel.java
index 0efa804..3b36a57 100644
--- a/src/com/android/settings/panel/WifiPanel.java
+++ b/src/com/android/settings/panel/WifiPanel.java
@@ -20,14 +20,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
 import com.android.settings.SubSettings;
 import com.android.settings.slices.CustomSliceRegistry;
 import com.android.settings.slices.SliceBuilderUtils;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.wifi.WifiSettings2;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,20 +61,11 @@
     public Intent getSeeMoreIntent() {
         final String screenTitle =
                 mContext.getText(R.string.wifi_settings).toString();
-        Intent intent;
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
-                    WifiSettings2.class.getName(),
-                    null /* key */,
-                    screenTitle,
-                    SettingsEnums.WIFI);
-        } else {
-            intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
+        final Intent intent = SliceBuilderUtils.buildSearchResultPageIntent(mContext,
                     WifiSettings.class.getName(),
                     null /* key */,
                     screenTitle,
                     SettingsEnums.WIFI);
-        }
         intent.setClassName(mContext.getPackageName(), SubSettings.class.getName());
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         return intent;
diff --git a/src/com/android/settings/password/BiometricFragment.java b/src/com/android/settings/password/BiometricFragment.java
index de2a1ff..7666a36 100644
--- a/src/com/android/settings/password/BiometricFragment.java
+++ b/src/com/android/settings/password/BiometricFragment.java
@@ -17,11 +17,10 @@
 package com.android.settings.password;
 
 import android.app.settings.SettingsEnums;
-import android.content.DialogInterface;
-import android.hardware.biometrics.BiometricConstants;
 import android.hardware.biometrics.BiometricPrompt;
 import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
 import android.hardware.biometrics.BiometricPrompt.AuthenticationResult;
+import android.hardware.biometrics.PromptInfo;
 import android.os.Bundle;
 import android.os.CancellationSignal;
 
@@ -38,6 +37,8 @@
 
     private static final String TAG = "ConfirmDeviceCredential/BiometricFragment";
 
+    private static final String KEY_PROMPT_INFO = "prompt_info";
+
     // Re-set by the application. Should be done upon orientation changes, etc
     private Executor mClientExecutor;
     private AuthenticationCallback mClientCallback;
@@ -46,16 +47,14 @@
     private int mUserId;
 
     // Created/Initialized once and retained
-    private Bundle mBundle;
+    private PromptInfo mPromptInfo;
     private BiometricPrompt mBiometricPrompt;
     private CancellationSignal mCancellationSignal;
-    private boolean mAuthenticating;
 
     private AuthenticationCallback mAuthenticationCallback =
             new AuthenticationCallback() {
         @Override
         public void onAuthenticationError(int error, @NonNull CharSequence message) {
-            mAuthenticating = false;
             mClientExecutor.execute(() -> {
                 mClientCallback.onAuthenticationError(error, message);
             });
@@ -64,7 +63,6 @@
 
         @Override
         public void onAuthenticationSucceeded(AuthenticationResult result) {
-            mAuthenticating = false;
             mClientExecutor.execute(() -> {
                 mClientCallback.onAuthenticationSucceeded(result);
             });
@@ -86,22 +84,14 @@
         }
     };
 
-    private final DialogInterface.OnClickListener mNegativeButtonListener =
-            new DialogInterface.OnClickListener() {
-        @Override
-        public void onClick(DialogInterface dialog, int which) {
-            mAuthenticationCallback.onAuthenticationError(
-                    BiometricConstants.BIOMETRIC_ERROR_NEGATIVE_BUTTON,
-                    mBundle.getString(BiometricPrompt.KEY_NEGATIVE_TEXT));
-        }
-    };
-
     /**
-     * @param bundle Bundle passed from {@link BiometricPrompt.Builder#buildIntent()}
+     * @param promptInfo
      * @return
      */
-    public static BiometricFragment newInstance(Bundle bundle) {
+    public static BiometricFragment newInstance(PromptInfo promptInfo) {
         BiometricFragment biometricFragment = new BiometricFragment();
+        final Bundle bundle = new Bundle();
+        bundle.putParcelable(KEY_PROMPT_INFO, promptInfo);
         biometricFragment.setArguments(bundle);
         return biometricFragment;
     }
@@ -134,28 +124,27 @@
         super.onCreate(savedInstanceState);
         setRetainInstance(true);
 
-        mBundle = getArguments();
+        final Bundle bundle = getArguments();
+        final PromptInfo promptInfo = bundle.getParcelable(KEY_PROMPT_INFO);
+
         final BiometricPrompt.Builder builder = new BiometricPrompt.Builder(getContext())
-                .setTitle(mBundle.getString(BiometricPrompt.KEY_TITLE))
+                .setTitle(promptInfo.getTitle())
                 .setUseDefaultTitle() // use default title if title is null/empty
                 .setDeviceCredentialAllowed(true)
-                .setSubtitle(mBundle.getString(BiometricPrompt.KEY_SUBTITLE))
-                .setDescription(mBundle.getString(BiometricPrompt.KEY_DESCRIPTION))
+                .setSubtitle(promptInfo.getSubtitle())
+                .setDescription(promptInfo.getDescription())
                 .setTextForDeviceCredential(
-                        mBundle.getCharSequence(BiometricPrompt.KEY_DEVICE_CREDENTIAL_TITLE),
-                        mBundle.getCharSequence(BiometricPrompt.KEY_DEVICE_CREDENTIAL_SUBTITLE),
-                        mBundle.getCharSequence(BiometricPrompt.KEY_DEVICE_CREDENTIAL_DESCRIPTION))
-                .setConfirmationRequired(mBundle.getBoolean(
-                        BiometricPrompt.KEY_REQUIRE_CONFIRMATION, true))
-                .setDisallowBiometricsIfPolicyExists(mBundle.getBoolean(
-                        BiometricPrompt.EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS, false))
+                        promptInfo.getDeviceCredentialTitle(),
+                        promptInfo.getDeviceCredentialSubtitle(),
+                        promptInfo.getDeviceCredentialDescription())
+                .setConfirmationRequired(promptInfo.isConfirmationRequested())
+                .setDisallowBiometricsIfPolicyExists(
+                        promptInfo.isDisallowBiometricsIfPolicyExists())
                 .setReceiveSystemEvents(true);
 
         mBiometricPrompt = builder.build();
         mCancellationSignal = new CancellationSignal();
 
-        // TODO: CC doesn't use crypto for now
-        mAuthenticating = true;
         mBiometricPrompt.authenticateUser(mCancellationSignal, mClientExecutor,
                 mAuthenticationCallback, mUserId);
     }
diff --git a/src/com/android/settings/password/ChooseLockGeneric.java b/src/com/android/settings/password/ChooseLockGeneric.java
index 04ee1b8..8b0c2c9 100644
--- a/src/com/android/settings/password/ChooseLockGeneric.java
+++ b/src/com/android/settings/password/ChooseLockGeneric.java
@@ -103,6 +103,7 @@
         private static final String TAG = "ChooseLockGenericFragment";
         private static final String KEY_SKIP_FINGERPRINT = "unlock_skip_fingerprint";
         private static final String KEY_SKIP_FACE = "unlock_skip_face";
+        private static final String KEY_SKIP_BIOMETRICS = "unlock_skip_biometrics";
         private static final String PASSWORD_CONFIRMED = "password_confirmed";
         private static final String WAITING_FOR_CONFIRMATION = "waiting_for_confirmation";
         public static final String MINIMUM_QUALITY_KEY = "minimum_quality";
@@ -142,15 +143,13 @@
         @VisibleForTesting
         static final int SKIP_FINGERPRINT_REQUEST = 104;
 
-        private ChooseLockSettingsHelper mChooseLockSettingsHelper;
+        private LockPatternUtils mLockPatternUtils;
         private DevicePolicyManager mDpm;
-        private boolean mHasChallenge = false;
-        private long mChallenge;
+        private boolean mRequestGatekeeperPasswordHandle = false;
         private boolean mPasswordConfirmed = false;
         private boolean mWaitingForConfirmation = false;
         private boolean mForChangeCredRequiredForBoot = false;
         private LockscreenCredential mUserPassword;
-        private LockPatternUtils mLockPatternUtils;
         private FingerprintManager mFingerprintManager;
         private FaceManager mFaceManager;
         private int mUserId;
@@ -177,6 +176,7 @@
 
         protected boolean mForFingerprint = false;
         protected boolean mForFace = false;
+        protected boolean mForBiometrics = false;
 
         @Override
         public int getMetricsCategory() {
@@ -199,7 +199,6 @@
             mFingerprintManager = Utils.getFingerprintManagerOrNull(activity);
             mFaceManager = Utils.getFaceManagerOrNull(activity);
             mDpm = (DevicePolicyManager) getSystemService(Context.DEVICE_POLICY_SERVICE);
-            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(activity);
             mLockPatternUtils = new LockPatternUtils(activity);
             mIsSetNewPassword = ACTION_SET_NEW_PARENT_PROFILE_PASSWORD.equals(chooseLockAction)
                     || ACTION_SET_NEW_PASSWORD.equals(chooseLockAction);
@@ -213,17 +212,28 @@
                         ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
             }
 
-            mHasChallenge = intent.getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
-            mChallenge = intent.getLongExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+            mRequestGatekeeperPasswordHandle = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
             mForFingerprint = intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
             mForFace = intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false);
-            mRequestedMinComplexity = intent
+            mForBiometrics = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, false);
+
+            final int complexityFromIntent = intent
                     .getIntExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, PASSWORD_COMPLEXITY_NONE);
-            mCallerAppName =
+            final int complexityFromAdmin = mLockPatternUtils.getRequestedPasswordComplexity(
+                    mUserId);
+            mRequestedMinComplexity = Math.max(complexityFromIntent, complexityFromAdmin);
+            final boolean isComplexityProvidedByAdmin = (complexityFromAdmin > complexityFromIntent)
+                    && mRequestedMinComplexity > PASSWORD_COMPLEXITY_NONE;
+
+            // If the complexity is provided by the admin, do not get the caller app's name.
+            // If the app requires, for example, low complexity, and the admin requires high
+            // complexity, it does not make sense to show a footer telling the user it's the app
+            // requesting a particular complexity because the admin-set complexity will override it.
+            mCallerAppName = isComplexityProvidedByAdmin ? null :
                     intent.getStringExtra(EXTRA_KEY_CALLER_APP_NAME);
             mIsCallingAppAdmin = intent
                     .getBooleanExtra(EXTRA_KEY_IS_CALLING_APP_ADMIN, /* defValue= */ false);
@@ -274,15 +284,17 @@
                             mUserId), false);
                 }
             } else if (!mWaitingForConfirmation) {
-                ChooseLockSettingsHelper helper =
-                        new ChooseLockSettingsHelper(activity, this);
+                final ChooseLockSettingsHelper.Builder builder =
+                        new ChooseLockSettingsHelper.Builder(activity, this);
+                builder.setRequestCode(CONFIRM_EXISTING_REQUEST)
+                        .setTitle(getString(R.string.unlock_set_unlock_launch_picker_title))
+                        .setReturnCredentials(true)
+                        .setUserId(mUserId);
                 boolean managedProfileWithUnifiedLock =
                         UserManager.get(activity).isManagedProfile(mUserId)
                         && !mLockPatternUtils.isSeparateProfileChallengeEnabled(mUserId);
                 boolean skipConfirmation = managedProfileWithUnifiedLock && !mIsSetNewPassword;
-                if (skipConfirmation
-                        || !helper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
-                        getString(R.string.unlock_set_unlock_launch_picker_title), true, mUserId)) {
+                if (skipConfirmation || !builder.show()) {
                     mPasswordConfirmed = true; // no password set, so no need to confirm
                     updatePreferencesOrFinish(savedInstanceState != null);
                 } else {
@@ -306,17 +318,20 @@
         }
 
         protected void addHeaderView() {
+            setHeaderView(R.layout.choose_lock_generic_biometric_header);
+            TextView textView = getHeaderView().findViewById(R.id.biometric_header_description);
+
             if (mForFingerprint) {
-                setHeaderView(R.layout.choose_lock_generic_fingerprint_header);
                 if (mIsSetNewPassword) {
-                    ((TextView) getHeaderView().findViewById(R.id.fingerprint_header_description))
-                            .setText(R.string.fingerprint_unlock_title);
+                    textView.setText(R.string.fingerprint_unlock_title);
                 }
             } else if (mForFace) {
-                setHeaderView(R.layout.choose_lock_generic_face_header);
                 if (mIsSetNewPassword) {
-                    ((TextView) getHeaderView().findViewById(R.id.face_header_description))
-                            .setText(R.string.face_unlock_title);
+                    textView.setText(R.string.face_unlock_title);
+                }
+            } else if (mForBiometrics) {
+                if (mIsSetNewPassword) {
+                    textView.setText(R.string.biometrics_unlock_title);
                 }
             }
         }
@@ -331,7 +346,8 @@
                 // unlock method to an insecure one
                 showFactoryResetProtectionWarningDialog(key);
                 return true;
-            } else if (KEY_SKIP_FINGERPRINT.equals(key) || KEY_SKIP_FACE.equals(key)) {
+            } else if (KEY_SKIP_FINGERPRINT.equals(key) || KEY_SKIP_FACE.equals(key)
+                    || KEY_SKIP_BIOMETRICS.equals(key)) {
                 Intent chooseLockGenericIntent = new Intent(getActivity(),
                     getInternalActivityClass());
                 chooseLockGenericIntent.setAction(getIntent().getAction());
@@ -360,7 +376,7 @@
          * @param disabled
          */
         // TODO: why does this take disabled, its always called with a quality higher than
-        // what makes sense with disabled == true
+        //  what makes sense with disabled == true
         private void maybeEnableEncryption(int quality, boolean disabled) {
             DevicePolicyManager dpm = (DevicePolicyManager) getSystemService(DEVICE_POLICY_SERVICE);
             if (UserManager.get(getActivity()).isAdminUser()
@@ -384,11 +400,14 @@
                         unlockMethodIntent);
                 intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT,
                         mForFingerprint);
-                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE,
-                        mForFace);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, mForFace);
+                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, mForBiometrics);
+                // If the caller requested Gatekeeper Password to be returned, we assume it came
+                // from biometric enrollment. This should be cleaned up, since requesting
+                // Gatekeeper Password should not imply it came from biometric setup/settings.
                 startActivityForResult(
                         intent,
-                        mIsSetNewPassword && mHasChallenge
+                        mIsSetNewPassword && mRequestGatekeeperPasswordHandle
                                 ? CHOOSE_LOCK_BEFORE_BIOMETRIC_REQUEST
                                 : ENABLE_ENCRYPTION_REQUEST);
             } else {
@@ -438,6 +457,11 @@
                     && resultCode == BiometricEnrollBase.RESULT_FINISHED) {
                 Intent intent = getBiometricEnrollIntent(getActivity());
                 if (data != null) {
+                    // ChooseLockGeneric should have requested for a Gatekeeper Password Handle to
+                    // be returned, so that biometric enrollment(s) can subsequently request
+                    // Gatekeeper to create HardwareAuthToken(s) wrapping biometric-specific
+                    // challenges. Send the extras (including the GK Password) to the enrollment
+                    // activity.
                     intent.putExtras(data.getExtras());
                 }
                 // Forward the target user id to fingerprint setup page.
@@ -526,6 +550,7 @@
             findPreference(ScreenLockType.NONE.preferenceKey).setViewId(R.id.lock_none);
             findPreference(KEY_SKIP_FINGERPRINT).setViewId(R.id.lock_none);
             findPreference(KEY_SKIP_FACE).setViewId(R.id.lock_none);
+            findPreference(KEY_SKIP_BIOMETRICS).setViewId(R.id.lock_none);
             findPreference(ScreenLockType.PIN.preferenceKey).setViewId(R.id.lock_pin);
             findPreference(ScreenLockType.PASSWORD.preferenceKey).setViewId(R.id.lock_password);
         }
@@ -564,6 +589,12 @@
                 setPreferenceTitle(ScreenLockType.PIN, R.string.face_unlock_set_unlock_pin);
                 setPreferenceTitle(ScreenLockType.PASSWORD,
                         R.string.face_unlock_set_unlock_password);
+            } else if (mForBiometrics) {
+                setPreferenceTitle(ScreenLockType.PATTERN,
+                        R.string.biometrics_unlock_set_unlock_pattern);
+                setPreferenceTitle(ScreenLockType.PIN, R.string.biometrics_unlock_set_unlock_pin);
+                setPreferenceTitle(ScreenLockType.PASSWORD,
+                        R.string.biometrics_unlock_set_unlock_password);
             }
 
             if (mManagedPasswordProvider.isSettingManagedPasswordSupported()) {
@@ -579,6 +610,9 @@
             if (!(mForFace && mIsSetNewPassword)) {
                 removePreference(KEY_SKIP_FACE);
             }
+            if (!(mForBiometrics && mIsSetNewPassword)) {
+                removePreference(KEY_SKIP_BIOMETRICS);
+            }
         }
 
         private void setPreferenceTitle(ScreenLockType lock, @StringRes int title) {
@@ -645,8 +679,9 @@
             final PreferenceScreen entries = getPreferenceScreen();
 
             int adminEnforcedQuality = mDpm.getPasswordQuality(null, mUserId);
-            EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal.checkIfPasswordQualityIsSet(
-                    getActivity(), mUserId);
+            EnforcedAdmin enforcedAdmin =
+                    RestrictedLockUtilsInternal.checkIfPasswordQualityIsSet(getActivity(),
+                            mUserId);
             // If we are to unify a work challenge at the end of the credential enrollment, manually
             // merge any password policy from that profile here, so we are enrolling a compliant
             // password. This is because once unified, the profile's password policy will
@@ -722,10 +757,9 @@
                             .setRequestedMinComplexity(mRequestedMinComplexity)
                             .setForFingerprint(mForFingerprint)
                             .setForFace(mForFace)
-                            .setUserId(mUserId);
-            if (mHasChallenge) {
-                builder.setChallenge(mChallenge);
-            }
+                            .setForBiometrics(mForBiometrics)
+                            .setUserId(mUserId)
+                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPasswordHandle);
             if (mUserPassword != null) {
                 builder.setPassword(mUserPassword);
             }
@@ -740,10 +774,9 @@
                     new ChooseLockPattern.IntentBuilder(getContext())
                             .setForFingerprint(mForFingerprint)
                             .setForFace(mForFace)
-                            .setUserId(mUserId);
-            if (mHasChallenge) {
-                builder.setChallenge(mChallenge);
-            }
+                            .setForBiometrics(mForBiometrics)
+                            .setUserId(mUserId)
+                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPasswordHandle);
             if (mUserPassword != null) {
                 builder.setPattern(mUserPassword);
             }
@@ -772,7 +805,7 @@
          * {@link DevicePolicyManager#PASSWORD_QUALITY_UNSPECIFIED}
          */
         void updateUnlockMethodAndFinish(int quality, boolean disabled, boolean chooseLockSkipped) {
-            // Sanity check. We should never get here without confirming user's existing password.
+            // We should never get here without confirming user's existing password.
             if (!mPasswordConfirmed) {
                 throw new IllegalStateException("Tried to update password without confirming it");
             }
@@ -784,8 +817,13 @@
                     intent.putExtra(EXTRA_SHOW_OPTIONS_BUTTON, chooseLockSkipped);
                 }
                 intent.putExtra(EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS, getIntent().getExtras());
+                // If the caller requested Gatekeeper Password Handle to be returned, we assume it
+                // came from biometric enrollment. onActivityResult will put the LockSettingsService
+                // into the extras and launch biometric enrollment. This should be cleaned up,
+                // since requesting a Gatekeeper Password Handle should not imply it came from
+                // biometric setup/settings.
                 startActivityForResult(intent,
-                        mIsSetNewPassword && mHasChallenge
+                        mIsSetNewPassword && mRequestGatekeeperPasswordHandle
                                 ? CHOOSE_LOCK_BEFORE_BIOMETRIC_REQUEST
                                 : CHOOSE_LOCK_REQUEST);
                 return;
@@ -797,10 +835,10 @@
                 if (mUserPassword != null) {
                     // No need to call setLockCredential if the user currently doesn't
                     // have a password
-                    mChooseLockSettingsHelper.utils().setLockCredential(
+                    mLockPatternUtils.setLockCredential(
                             LockscreenCredential.createNone(), mUserPassword, mUserId);
                 }
-                mChooseLockSettingsHelper.utils().setLockScreenDisabled(disabled, mUserId);
+                mLockPatternUtils.setLockScreenDisabled(disabled, mUserId);
                 getActivity().setResult(Activity.RESULT_OK);
                 finish();
             }
diff --git a/src/com/android/settings/password/ChooseLockPassword.java b/src/com/android/settings/password/ChooseLockPassword.java
index 19cc9c8..0c84ba9 100644
--- a/src/com/android/settings/password/ChooseLockPassword.java
+++ b/src/com/android/settings/password/ChooseLockPassword.java
@@ -73,10 +73,10 @@
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
 import com.android.internal.widget.LockscreenCredential;
 import com.android.internal.widget.PasswordValidationError;
 import com.android.internal.widget.TextViewInputDisabler;
+import com.android.internal.widget.VerifyCredentialResponse;
 import com.android.settings.EncryptionInterstitial;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -105,8 +105,8 @@
 
     @Override
     protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     public static class IntentBuilder {
@@ -117,7 +117,6 @@
             mIntent = new Intent(context, ChooseLockPassword.class);
             mIntent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
             mIntent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false);
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
         }
 
         public IntentBuilder setPasswordQuality(int quality) {
@@ -130,9 +129,10 @@
             return this;
         }
 
-        public IntentBuilder setChallenge(long challenge) {
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        public IntentBuilder setRequestGatekeeperPasswordHandle(
+                boolean requestGatekeeperPasswordHandle) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE,
+                    requestGatekeeperPasswordHandle);
             return this;
         }
 
@@ -151,6 +151,11 @@
             return this;
         }
 
+        public IntentBuilder setForBiometrics(boolean forBiometrics) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, forBiometrics);
+            return this;
+        }
+
         public IntentBuilder setRequestedMinComplexity(@PasswordComplexity int level) {
             mIntent.putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, level);
             return this;
@@ -190,12 +195,16 @@
                 .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
         final boolean forFace = getIntent()
                 .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false);
+        final boolean forBiometrics = getIntent()
+                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, false);
 
         CharSequence msg = getText(R.string.lockpassword_choose_your_screen_lock_header);
         if (forFingerprint) {
             msg = getText(R.string.lockpassword_choose_your_password_header_for_fingerprint);
         } else if (forFace) {
             msg = getText(R.string.lockpassword_choose_your_password_header_for_face);
+        } else if (forBiometrics) {
+            msg = getText(R.string.lockpassword_choose_your_password_header_for_biometrics);
         }
 
         setTitle(msg);
@@ -211,8 +220,7 @@
 
         private LockscreenCredential mCurrentCredential;
         private LockscreenCredential mChosenPassword;
-        private boolean mHasChallenge;
-        private long mChallenge;
+        private boolean mRequestGatekeeperPassword;
         private ImeAwareEditText mPasswordEntry;
         private TextViewInputDisabler mPasswordEntryInputDisabler;
 
@@ -228,12 +236,12 @@
         private LockPatternUtils mLockPatternUtils;
         private SaveAndFinishWorker mSaveAndFinishWorker;
         private int mRequestedQuality = DevicePolicyManager.PASSWORD_QUALITY_NUMERIC;
-        private ChooseLockSettingsHelper mChooseLockSettingsHelper;
         protected Stage mUiStage = Stage.Introduction;
         private PasswordRequirementAdapter mPasswordRequirementAdapter;
         private GlifLayout mLayout;
         protected boolean mForFingerprint;
         protected boolean mForFace;
+        protected boolean mForBiometrics;
 
         private LockscreenCredential mFirstPassword;
         private RecyclerView mPasswordRestrictionView;
@@ -256,9 +264,11 @@
                     R.string.lockpassword_choose_your_screen_lock_header, // password
                     R.string.lockpassword_choose_your_password_header_for_fingerprint,
                     R.string.lockpassword_choose_your_password_header_for_face,
+                    R.string.lockpassword_choose_your_password_header_for_biometrics,
                     R.string.lockpassword_choose_your_screen_lock_header, // pin
                     R.string.lockpassword_choose_your_pin_header_for_fingerprint,
                     R.string.lockpassword_choose_your_pin_header_for_face,
+                    R.string.lockpassword_choose_your_pin_header_for_biometrics,
                     R.string.lockpassword_choose_your_password_message, // added security message
                     R.string.lock_settings_picker_biometrics_added_security_message,
                     R.string.lockpassword_choose_your_pin_message,
@@ -269,6 +279,8 @@
                     R.string.lockpassword_confirm_your_password_header,
                     R.string.lockpassword_confirm_your_password_header,
                     R.string.lockpassword_confirm_your_password_header,
+                    R.string.lockpassword_confirm_your_password_header,
+                    R.string.lockpassword_confirm_your_pin_header,
                     R.string.lockpassword_confirm_your_pin_header,
                     R.string.lockpassword_confirm_your_pin_header,
                     R.string.lockpassword_confirm_your_pin_header,
@@ -282,6 +294,8 @@
                     R.string.lockpassword_confirm_passwords_dont_match,
                     R.string.lockpassword_confirm_passwords_dont_match,
                     R.string.lockpassword_confirm_passwords_dont_match,
+                    R.string.lockpassword_confirm_passwords_dont_match,
+                    R.string.lockpassword_confirm_pins_dont_match,
                     R.string.lockpassword_confirm_pins_dont_match,
                     R.string.lockpassword_confirm_pins_dont_match,
                     R.string.lockpassword_confirm_pins_dont_match,
@@ -291,18 +305,22 @@
                     0,
                     R.string.lockpassword_confirm_label);
 
-            Stage(int hintInAlpha, int hintInAlphaForFingerprint, int hintInAlphaForFace,
-                    int hintInNumeric, int hintInNumericForFingerprint, int hintInNumericForFace,
+            Stage(int hintInAlpha,
+                    int hintInAlphaForFingerprint, int hintInAlphaForFace, int hintInAlphaForBiometrics,
+                    int hintInNumeric,
+                    int hintInNumericForFingerprint, int hintInNumericForFace, int hintInNumericForBiometrics,
                     int messageInAlpha, int messageInAlphaForBiometrics,
                     int messageInNumeric, int messageInNumericForBiometrics,
                     int nextButtonText) {
                 this.alphaHint = hintInAlpha;
                 this.alphaHintForFingerprint = hintInAlphaForFingerprint;
                 this.alphaHintForFace = hintInAlphaForFace;
+                this.alphaHintForBiometrics = hintInAlphaForBiometrics;
 
                 this.numericHint = hintInNumeric;
                 this.numericHintForFingerprint = hintInNumericForFingerprint;
                 this.numericHintForFace = hintInNumericForFace;
+                this.numericHintForBiometrics = hintInNumericForBiometrics;
 
                 this.alphaMessage = messageInAlpha;
                 this.alphaMessageForBiometrics = messageInAlphaForBiometrics;
@@ -314,16 +332,19 @@
             public static final int TYPE_NONE = 0;
             public static final int TYPE_FINGERPRINT = 1;
             public static final int TYPE_FACE = 2;
+            public static final int TYPE_BIOMETRIC = 3;
 
             // Password
             public final int alphaHint;
             public final int alphaHintForFingerprint;
             public final int alphaHintForFace;
+            public final int alphaHintForBiometrics;
 
             // PIN
             public final int numericHint;
             public final int numericHintForFingerprint;
             public final int numericHintForFace;
+            public final int numericHintForBiometrics;
 
             public final int alphaMessage;
             public final int alphaMessageForBiometrics;
@@ -337,6 +358,8 @@
                         return alphaHintForFingerprint;
                     } else if (type == TYPE_FACE) {
                         return alphaHintForFace;
+                    } else if (type == TYPE_BIOMETRIC) {
+                        return alphaHintForBiometrics;
                     } else {
                         return alphaHint;
                     }
@@ -345,6 +368,8 @@
                         return numericHintForFingerprint;
                     } else if (type == TYPE_FACE) {
                         return numericHintForFace;
+                    } else if (type == TYPE_BIOMETRIC) {
+                        return numericHintForBiometrics;
                     } else {
                         return numericHint;
                     }
@@ -378,6 +403,8 @@
             mForFingerprint = intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
             mForFace = intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false);
+            mForBiometrics = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, false);
             mMinComplexity = intent.getIntExtra(
                     EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, PASSWORD_COMPLEXITY_NONE);
 
@@ -394,10 +421,10 @@
             if (mUnificationProfileId != UserHandle.USER_NULL) {
                 mMinMetrics.maxWith(
                         mLockPatternUtils.getRequestedPasswordMetrics(mUnificationProfileId));
+                mMinComplexity = Math.max(mMinComplexity,
+                        mLockPatternUtils.getRequestedPasswordComplexity(mUnificationProfileId));
             }
 
-            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
-
             if (intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_CHANGE_CRED_REQUIRED_FOR_BOOT, false)) {
                 SaveAndFinishWorker w = new SaveAndFinishWorker();
@@ -406,10 +433,12 @@
                 LockscreenCredential currentCredential = intent.getParcelableExtra(
                         ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
 
+                final LockPatternUtils utils = new LockPatternUtils(getActivity());
+
                 w.setBlocking(true);
                 w.setListener(this);
-                w.start(mChooseLockSettingsHelper.utils(), required, false, 0,
-                        currentCredential, currentCredential, mUserId);
+                w.start(utils, required, false /* requestGatekeeperPassword */, currentCredential,
+                        currentCredential, mUserId);
             }
             mTextChangedHandler = new TextChangedHandler();
         }
@@ -456,6 +485,8 @@
                 mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_fingerprint_header));
             } else if (mForFace) {
                 mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_face_header));
+            } else if (mForBiometrics) {
+                mLayout.setIcon(getActivity().getDrawable(R.drawable.ic_lock));
             }
 
             mIsAlphaMode = DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC == mRequestedQuality
@@ -493,15 +524,19 @@
                     ChooseLockGeneric.CONFIRM_CREDENTIALS, true);
             mCurrentCredential = intent.getParcelableExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
-            mHasChallenge = intent.getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
-            mChallenge = intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+            mRequestGatekeeperPassword = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
             if (savedInstanceState == null) {
                 updateStage(Stage.Introduction);
                 if (confirmCredentials) {
-                    mChooseLockSettingsHelper.launchConfirmationActivity(CONFIRM_EXISTING_REQUEST,
-                            getString(R.string.unlock_set_unlock_launch_picker_title), true,
-                            mUserId);
+                    final ChooseLockSettingsHelper.Builder builder =
+                            new ChooseLockSettingsHelper.Builder(getActivity());
+                    builder.setRequestCode(CONFIRM_EXISTING_REQUEST)
+                            .setTitle(getString(R.string.unlock_set_unlock_launch_picker_title))
+                            .setReturnCredentials(true)
+                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword)
+                            .setUserId(mUserId)
+                            .show();
                 }
             } else {
 
@@ -544,9 +579,15 @@
         }
 
         protected int getStageType() {
-            return mForFingerprint ? Stage.TYPE_FINGERPRINT :
-                    mForFace ? Stage.TYPE_FACE :
-                            Stage.TYPE_NONE;
+            if (mForFingerprint) {
+                return Stage.TYPE_FINGERPRINT;
+            } else if (mForFace) {
+                return Stage.TYPE_FACE;
+            } else if (mForBiometrics) {
+                return Stage.TYPE_BIOMETRIC;
+            } else {
+                return Stage.TYPE_NONE;
+            }
         }
 
         private void setupPasswordRequirementsView(View view) {
@@ -883,7 +924,7 @@
                             profileCredential);
                 }
             }
-            mSaveAndFinishWorker.start(mLockPatternUtils, required, mHasChallenge, mChallenge,
+            mSaveAndFinishWorker.start(mLockPatternUtils, required, mRequestGatekeeperPassword,
                     mChosenPassword, mCurrentCredential, mUserId);
         }
 
@@ -943,10 +984,9 @@
         private LockscreenCredential mCurrentCredential;
 
         public void start(LockPatternUtils utils, boolean required,
-                boolean hasChallenge, long challenge,
-                LockscreenCredential chosenPassword, LockscreenCredential currentCredential,
-                int userId) {
-            prepare(utils, required, hasChallenge, challenge, userId);
+                boolean requestGatekeeperPassword, LockscreenCredential chosenPassword,
+                LockscreenCredential currentCredential, int userId) {
+            prepare(utils, required, requestGatekeeperPassword, userId);
 
             mChosenPassword = chosenPassword;
             mCurrentCredential = currentCredential != null ? currentCredential
@@ -964,20 +1004,21 @@
                 unifyProfileCredentialIfRequested();
             }
             Intent result = null;
-            if (success && mHasChallenge) {
-                byte[] token;
-                try {
-                    token = mUtils.verifyCredential(mChosenPassword, mChallenge, mUserId);
-                } catch (RequestThrottledException e) {
-                    token = null;
-                }
+            if (success && mRequestGatekeeperPassword) {
+                // If a Gatekeeper Password was requested, invoke the LockSettingsService code
+                // path to return a Gatekeeper Password based on the credential that the user
+                // chose. This should only be run if the credential was successfully set.
+                final VerifyCredentialResponse response = mUtils.verifyCredential(mChosenPassword,
+                        mUserId, LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE);
 
-                if (token == null) {
-                    Log.e(TAG, "critical: no token returned for known good password.");
+                if (!response.isMatched() || !response.containsGatekeeperPasswordHandle()) {
+                    Log.e(TAG, "critical: bad response or missing GK PW handle for known good"
+                            + " password: " + response.toString());
                 }
 
                 result = new Intent();
-                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
+                        response.getGatekeeperPasswordHandle());
             }
             return Pair.create(success, result);
         }
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index 27fc9f0..6e9cf98 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -42,11 +42,11 @@
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockPatternUtils.RequestThrottledException;
 import com.android.internal.widget.LockPatternView;
 import com.android.internal.widget.LockPatternView.Cell;
 import com.android.internal.widget.LockPatternView.DisplayMode;
 import com.android.internal.widget.LockscreenCredential;
+import com.android.internal.widget.VerifyCredentialResponse;
 import com.android.settings.EncryptionInterstitial;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
@@ -54,7 +54,6 @@
 import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.notification.RedactionInterstitial;
-import com.android.settings.password.ChooseLockPassword.IntentBuilder;
 
 import com.google.android.collect.Lists;
 import com.google.android.setupcompat.template.FooterBarMixin;
@@ -82,7 +81,7 @@
      * behavior. So, now an activity does not finish itself until it gets this
      * result.
      */
-    static final int RESULT_FINISHED = RESULT_FIRST_USER;
+    public static final int RESULT_FINISHED = RESULT_FIRST_USER;
 
     private static final String TAG = "ChooseLockPattern";
 
@@ -95,8 +94,8 @@
 
     @Override
     protected void onApplyThemeResource(Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     public static class IntentBuilder {
@@ -106,7 +105,6 @@
             mIntent = new Intent(context, ChooseLockPattern.class);
             mIntent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, false);
             mIntent.putExtra(ChooseLockGeneric.CONFIRM_CREDENTIALS, false);
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
         }
 
         public IntentBuilder setUserId(int userId) {
@@ -114,9 +112,10 @@
             return this;
         }
 
-        public IntentBuilder setChallenge(long challenge) {
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        public IntentBuilder setRequestGatekeeperPasswordHandle(
+                boolean requestGatekeeperPasswordHandle) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE,
+                    requestGatekeeperPasswordHandle);
             return this;
         }
 
@@ -135,6 +134,11 @@
             return this;
         }
 
+        public IntentBuilder setForBiometrics(boolean forBiometrics) {
+            mIntent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, forBiometrics);
+            return this;
+        }
+
         /**
          * Configures the launch such that at the end of the pattern enrollment, one of its
          * managed profile (specified by {@code profileId}) will have its lockscreen unified
@@ -206,8 +210,7 @@
         private static final String FRAGMENT_TAG_SAVE_AND_FINISH = "save_and_finish_worker";
 
         private LockscreenCredential mCurrentCredential;
-        private boolean mHasChallenge;
-        private long mChallenge;
+        private boolean mRequestGatekeeperPassword;
         protected TextView mTitleText;
         protected TextView mHeaderText;
         protected TextView mMessageText;
@@ -452,11 +455,12 @@
             }
         };
 
-        private ChooseLockSettingsHelper mChooseLockSettingsHelper;
+        private LockPatternUtils mLockPatternUtils;
         private SaveAndFinishWorker mSaveAndFinishWorker;
         protected int mUserId;
         protected boolean mForFingerprint;
         protected boolean mForFace;
+        protected boolean mForBiometrics;
 
         private static final String KEY_UI_STAGE = "uiStage";
         private static final String KEY_PATTERN_CHOICE = "chosenPattern";
@@ -465,7 +469,6 @@
         @Override
         public void onCreate(Bundle savedInstanceState) {
             super.onCreate(savedInstanceState);
-            mChooseLockSettingsHelper = new ChooseLockSettingsHelper(getActivity());
             if (!(getActivity() instanceof ChooseLockPattern)) {
                 throw new SecurityException("Fragment contained in wrong activity");
             }
@@ -473,6 +476,8 @@
             // Only take this argument into account if it belongs to the current profile.
             mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras());
 
+            mLockPatternUtils = new LockPatternUtils(getActivity());
+
             if (intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_CHANGE_CRED_REQUIRED_FOR_BOOT, false)) {
                 SaveAndFinishWorker w = new SaveAndFinishWorker();
@@ -482,13 +487,15 @@
                         ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
                 w.setBlocking(true);
                 w.setListener(this);
-                w.start(mChooseLockSettingsHelper.utils(), required,
-                        false, 0, current, current, mUserId);
+                w.start(mLockPatternUtils, required, false /* requestGatekeeperPassword */, current,
+                        current, mUserId);
             }
             mForFingerprint = intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
             mForFace = intent.getBooleanExtra(
                     ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false);
+            mForBiometrics = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, false);
         }
 
         @Override
@@ -507,6 +514,8 @@
                     layout.setIcon(getActivity().getDrawable(R.drawable.ic_fingerprint_header));
                 } else if (mForFace) {
                     layout.setIcon(getActivity().getDrawable(R.drawable.ic_face_header));
+                } else if (mForBiometrics) {
+                    layout.setIcon(getActivity().getDrawable(R.drawable.ic_lock));
                 }
             }
 
@@ -543,7 +552,7 @@
             mLockPatternView = (LockPatternView) view.findViewById(R.id.lockPattern);
             mLockPatternView.setOnPatternListener(mChooseNewLockPatternListener);
             mLockPatternView.setTactileFeedbackEnabled(
-                    mChooseLockSettingsHelper.utils().isTactileFeedbackEnabled());
+                    mLockPatternUtils.isTactileFeedbackEnabled());
             mLockPatternView.setFadePattern(false);
 
             mFooterText = (TextView) view.findViewById(R.id.footerText);
@@ -563,21 +572,25 @@
             Intent intent = getActivity().getIntent();
             mCurrentCredential =
                     intent.getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD);
-            mHasChallenge = intent.getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
-            mChallenge = intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+            mRequestGatekeeperPassword = intent.getBooleanExtra(
+                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
 
             if (savedInstanceState == null) {
                 if (confirmCredentials) {
                     // first launch. As a security measure, we're in NeedToConfirm mode until we
                     // know there isn't an existing password or the user confirms their password.
                     updateStage(Stage.NeedToConfirm);
-                    boolean launchedConfirmationActivity =
-                        mChooseLockSettingsHelper.launchConfirmationActivity(
-                                CONFIRM_EXISTING_REQUEST,
-                                getString(R.string.unlock_set_unlock_launch_picker_title), true,
-                                mUserId);
-                    if (!launchedConfirmationActivity) {
+
+                    final ChooseLockSettingsHelper.Builder builder =
+                            new ChooseLockSettingsHelper.Builder(getActivity());
+                    final boolean launched = builder.setRequestCode(CONFIRM_EXISTING_REQUEST)
+                            .setTitle(getString(R.string.unlock_set_unlock_launch_picker_title))
+                            .setReturnCredentials(true)
+                            .setRequestGatekeeperPasswordHandle(mRequestGatekeeperPassword)
+                            .setUserId(mUserId)
+                            .show();
+
+                    if (!launched) {
                         updateStage(Stage.Introduction);
                     }
                 } else {
@@ -729,8 +742,8 @@
             } else {
                 mHeaderText.setText(stage.headerMessage);
             }
-            final boolean forBiometrics = mForFingerprint || mForFace;
-            int message = forBiometrics ? stage.messageForBiometrics : stage.message;
+            final boolean forAnyBiometric = mForFingerprint || mForFace || mForBiometrics;
+            int message = forAnyBiometric ? stage.messageForBiometrics : stage.message;
             if (message == ID_EMPTY_MESSAGE) {
                 mMessageText.setText("");
             } else {
@@ -753,7 +766,7 @@
                     mHeaderText.setTextColor(mDefaultHeaderColorList);
                 }
 
-                if (stage == Stage.NeedToConfirm && forBiometrics) {
+                if (stage == Stage.NeedToConfirm && forAnyBiometric) {
                     mHeaderText.setText("");
                     mTitleText.setText(R.string.lockpassword_draw_your_pattern_again_header);
                 }
@@ -853,8 +866,8 @@
                             profileCredential);
                 }
             }
-            mSaveAndFinishWorker.start(mChooseLockSettingsHelper.utils(), required,
-                    mHasChallenge, mChallenge, mChosenPattern, mCurrentCredential, mUserId);
+            mSaveAndFinishWorker.start(mLockPatternUtils, required,
+                    mRequestGatekeeperPassword, mChosenPattern, mCurrentCredential, mUserId);
         }
 
         @Override
@@ -884,10 +897,10 @@
         private LockscreenCredential mCurrentCredential;
         private boolean mLockVirgin;
 
-        public void start(LockPatternUtils utils, boolean credentialRequired, boolean hasChallenge,
-                long challenge, LockscreenCredential chosenPattern,
+        public void start(LockPatternUtils utils, boolean credentialRequired,
+                boolean requestGatekeeperPassword, LockscreenCredential chosenPattern,
                 LockscreenCredential currentCredential, int userId) {
-            prepare(utils, credentialRequired, hasChallenge, challenge, userId);
+            prepare(utils, credentialRequired, requestGatekeeperPassword, userId);
 
             mCurrentCredential = currentCredential != null ? currentCredential
                     : LockscreenCredential.createNone();
@@ -908,20 +921,21 @@
                 unifyProfileCredentialIfRequested();
             }
             Intent result = null;
-            if (success && mHasChallenge) {
-                byte[] token;
-                try {
-                    token = mUtils.verifyCredential(mChosenPattern, mChallenge, userId);
-                } catch (RequestThrottledException e) {
-                    token = null;
-                }
+            if (success && mRequestGatekeeperPassword) {
+                // If a Gatekeeper Password was requested, invoke the LockSettingsService code
+                // path to return a Gatekeeper Password based on the credential that the user
+                // chose. This should only be run if the credential was successfully set.
+                final VerifyCredentialResponse response = mUtils.verifyCredential(mChosenPattern,
+                        userId, LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE);
 
-                if (token == null) {
-                    Log.e(TAG, "critical: no token returned for known good pattern");
+                if (!response.isMatched() || !response.containsGatekeeperPasswordHandle()) {
+                    Log.e(TAG, "critical: bad response or missing GK PW handle for known good"
+                            + " pattern: " + response.toString());
                 }
 
                 result = new Intent();
-                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN, token);
+                result.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
+                        response.getGatekeeperPasswordHandle());
             }
             return Pair.create(success, result);
         }
diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java
index 3989ee6..1e1f59f 100644
--- a/src/com/android/settings/password/ChooseLockSettingsHelper.java
+++ b/src/com/android/settings/password/ChooseLockSettingsHelper.java
@@ -18,14 +18,15 @@
 
 import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
 
+import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.app.Activity;
 import android.app.KeyguardManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 import android.content.IntentSender;
-import android.os.Bundle;
 import android.os.UserManager;
+import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
@@ -39,16 +40,28 @@
 
 public final class ChooseLockSettingsHelper {
 
+    private static final String TAG = "ChooseLockSettingsHelper";
+
     public static final String EXTRA_KEY_TYPE = "type";
     public static final String EXTRA_KEY_PASSWORD = "password";
     public static final String EXTRA_KEY_RETURN_CREDENTIALS = "return_credentials";
-    public static final String EXTRA_KEY_HAS_CHALLENGE = "has_challenge";
-    public static final String EXTRA_KEY_CHALLENGE = "challenge";
+    // Force the verifyCredential path instead of checkCredential path. This will be removed
+    // after b/161956762 is resolved.
+    public static final String EXTRA_KEY_FORCE_VERIFY = "force_verify";
+    // Gatekeeper HardwareAuthToken
     public static final String EXTRA_KEY_CHALLENGE_TOKEN = "hw_auth_token";
+    // For the fingerprint-only path
     public static final String EXTRA_KEY_FOR_FINGERPRINT = "for_fingerprint";
+    // For the face-only path
     public static final String EXTRA_KEY_FOR_FACE = "for_face";
+    // For the paths where multiple biometric sensors exist
+    public static final String EXTRA_KEY_FOR_BIOMETRICS = "for_biometrics";
     public static final String EXTRA_KEY_FOR_CHANGE_CRED_REQUIRED_FOR_BOOT = "for_cred_req_boot";
     public static final String EXTRA_KEY_FOREGROUND_ONLY = "foreground_only";
+    public static final String EXTRA_KEY_REQUEST_GK_PW_HANDLE = "request_gk_pw_handle";
+    // Gatekeeper password handle, which can subsequently be used to generate Gatekeeper
+    // HardwareAuthToken(s) via LockSettingsService#verifyGatekeeperPasswordHandle
+    public static final String EXTRA_KEY_GK_PW_HANDLE = "gk_pw_handle";
 
     /**
      * When EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL and EXTRA_KEY_UNIFICATION_PROFILE_ID are
@@ -84,330 +97,220 @@
      * controls if we relax the enforcement of
      * {@link Utils#enforceSameOwner(android.content.Context, int)}.
      */
-    public static final String EXTRA_ALLOW_ANY_USER = "allow_any_user";
+    public static final String EXTRA_KEY_ALLOW_ANY_USER = "allow_any_user";
 
-    @VisibleForTesting LockPatternUtils mLockPatternUtils;
-    private Activity mActivity;
-    private Fragment mFragment;
+    @VisibleForTesting @NonNull LockPatternUtils mLockPatternUtils;
+    @NonNull private final Activity mActivity;
+    @Nullable private final Fragment mFragment;
+    @NonNull private final Builder mBuilder;
 
-    public ChooseLockSettingsHelper(Activity activity) {
+    private ChooseLockSettingsHelper(@NonNull Builder builder, @NonNull Activity activity,
+            @Nullable Fragment fragment) {
+        mBuilder = builder;
         mActivity = activity;
+        mFragment = fragment;
         mLockPatternUtils = new LockPatternUtils(activity);
     }
 
-    public ChooseLockSettingsHelper(Activity activity, Fragment fragment) {
-        this(activity);
-        mFragment = fragment;
-    }
+    public static class Builder {
+        @NonNull private final Activity mActivity;
+        @Nullable private Fragment mFragment;
 
-    public LockPatternUtils utils() {
-        return mLockPatternUtils;
+        private int mRequestCode;
+        @Nullable private CharSequence mTitle;
+        @Nullable private CharSequence mHeader;
+        @Nullable private CharSequence mDescription;
+        @Nullable private CharSequence mAlternateButton;
+        private boolean mReturnCredentials;
+        private boolean mExternal;
+        private boolean mForegroundOnly;
+        // ChooseLockSettingsHelper will determine the caller's userId if none provided.
+        private int mUserId;
+        private boolean mAllowAnyUserId;
+        private boolean mForceVerifyPath;
+        boolean mRequestGatekeeperPasswordHandle;
+
+        public Builder(@NonNull Activity activity) {
+            mActivity = activity;
+            mUserId = Utils.getCredentialOwnerUserId(mActivity);
+        }
+
+        public Builder(@NonNull Activity activity, @NonNull Fragment fragment) {
+            this(activity);
+            mFragment = fragment;
+        }
+
+        /**
+         * @param requestCode for onActivityResult
+         */
+        @NonNull public Builder setRequestCode(int requestCode) {
+            mRequestCode = requestCode;
+            return this;
+        }
+
+        /**
+         * @param title of the confirmation screen; shown in the action bar
+         */
+        @NonNull public Builder setTitle(@Nullable CharSequence title) {
+            mTitle = title;
+            return this;
+        }
+
+        /**
+         * @param header of the confirmation screen; shown as large text
+         */
+        @NonNull public Builder setHeader(@Nullable CharSequence header) {
+            mHeader = header;
+            return this;
+        }
+
+        /**
+         * @param description of the confirmation screen
+         */
+        @NonNull public Builder setDescription(@Nullable CharSequence description) {
+            mDescription = description;
+            return this;
+        }
+
+        /**
+         * @param alternateButton text for an alternate button
+         */
+        @NonNull public Builder setAlternateButton(@Nullable CharSequence alternateButton) {
+            mAlternateButton = alternateButton;
+            return this;
+        }
+
+        /**
+         * @param returnCredentials if true, puts the following credentials into intent for
+         *                          onActivityResult with the following keys:
+         *                          {@link #EXTRA_KEY_TYPE}, {@link #EXTRA_KEY_PASSWORD},
+         *                          {@link #EXTRA_KEY_CHALLENGE_TOKEN},
+         *                          {@link #EXTRA_KEY_GK_PW_HANDLE}
+         *                          Note that if this is true, this can only be called internally.
+         *
+         *                          This should also generally be set if
+         *                          {@link #setRequestGatekeeperPasswordHandle(boolean)} is set.
+         */
+        @NonNull public Builder setReturnCredentials(boolean returnCredentials) {
+            mReturnCredentials = returnCredentials;
+            return this;
+        }
+
+        /**
+         * @param userId for whom the credential should be confirmed.
+         */
+        @NonNull public Builder setUserId(int userId) {
+            mUserId = userId;
+            return this;
+        }
+
+        /**
+         * @param allowAnyUserId Allows the caller to prompt for credentials of any user, including
+         *                       those which aren't associated with the current user. As an example,
+         *                       this is useful when unlocking the storage for secondary users.
+         */
+        @NonNull public Builder setAllowAnyUserId(boolean allowAnyUserId) {
+            mAllowAnyUserId = allowAnyUserId;
+            return this;
+        }
+
+        /**
+         * @param external specifies whether this activity is launched externally, meaning that it
+         *                 will get a dark theme, allow biometric authentication, and it will
+         *                 forward the activity result.
+         */
+        @NonNull public Builder setExternal(boolean external) {
+            mExternal = external;
+            return this;
+        }
+
+        /**
+         * @param foregroundOnly if true, the confirmation activity will be finished if it loses
+         *                       foreground.
+         */
+        @NonNull public Builder setForegroundOnly(boolean foregroundOnly) {
+            mForegroundOnly = foregroundOnly;
+            return this;
+        }
+
+        /**
+         * @param forceVerifyPath Forces the VerifyCredential path instead of the CheckCredential
+         *                        path. This will be removed after b/161956762 is resolved.
+         */
+        @NonNull public Builder setForceVerifyPath(boolean forceVerifyPath) {
+            mForceVerifyPath = forceVerifyPath;
+            return this;
+        }
+
+        /**
+         * Requests that LockSettingsService return a handle to the Gatekeeper Password (instead of
+         * the Gatekeeper HAT). This allows us to use a single entry of the user's credential
+         * to create multiple Gatekeeper HATs containing distinct challenges via
+         * {@link LockPatternUtils#verifyGatekeeperPasswordHandle(long, long, int)}.
+         *
+         * Upon confirmation of the user's password, the Gatekeeper Password Handle will be returned
+         * via onActivityResult with the key being {@link #EXTRA_KEY_GK_PW_HANDLE}.
+         * @param requestGatekeeperPasswordHandle
+         */
+        @NonNull public Builder setRequestGatekeeperPasswordHandle(
+                boolean requestGatekeeperPasswordHandle) {
+            mRequestGatekeeperPasswordHandle = requestGatekeeperPasswordHandle;
+            return this;
+        }
+
+        @NonNull public ChooseLockSettingsHelper build() {
+            if (!mAllowAnyUserId && mUserId != LockPatternUtils.USER_FRP) {
+                Utils.enforceSameOwner(mActivity, mUserId);
+            }
+
+            if (mExternal && mReturnCredentials) {
+                throw new IllegalArgumentException("External and ReturnCredentials specified. "
+                        + " External callers should never be allowed to receive credentials in"
+                        + " onActivityResult");
+            }
+
+            if (mRequestGatekeeperPasswordHandle && !mReturnCredentials) {
+                // HAT containing the signed challenge will not be available to the caller.
+                Log.w(TAG, "Requested gatekeeper password handle but not requesting"
+                        + " ReturnCredentials. Are you sure this is what you want?");
+            }
+
+            return new ChooseLockSettingsHelper(this, mActivity, mFragment);
+        }
+
+        public boolean show() {
+            return build().launch();
+        }
     }
 
     /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
+     * If a PIN, Pattern, or Password exists, prompt the user to confirm it.
+     * @return true if the confirmation activity is shown (e.g. user has a credential set up)
      */
-    public boolean launchConfirmationActivity(int request, CharSequence title) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                null /* header */,
-                null /* description */,
-                false /* returnCredentials */,
-                false /* external */,
-                false /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
-     *                          this can only be called internally.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    public boolean launchConfirmationActivity(int request, CharSequence title, boolean returnCredentials) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                null /* header */,
-                null /* description */,
-                returnCredentials /* returnCredentials */,
-                false /* external */,
-                false /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
-     *                          this can only be called internally.
-     * @param userId The userId for whom the lock should be confirmed.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    public boolean launchConfirmationActivity(int request, CharSequence title,
-            boolean returnCredentials, int userId) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                null /* header */,
-                null /* description */,
-                returnCredentials /* returnCredentials */,
-                false /* external */,
-                false /* hasChallenge */,
-                0 /* challenge */,
-                Utils.enforceSameOwner(mActivity, userId) /* userId */,
-                false /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param header header of the confirmation screen; shown as large text
-     * @param description description of the confirmation screen
-     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
-     *                          this can only be called internally.
-     * @param external specifies whether this activity is launched externally, meaning that it will
-     *                 get a dark theme, allow fingerprint authentication and it will forward
-     *                 activity result.
-     * @param foregroundOnly if the confirmation activity should be finished if it loses foreground.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            boolean returnCredentials, boolean external, boolean foregroundOnly) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                returnCredentials /* returnCredentials */,
-                external /* external */,
-                false /* hasChallenge */,
-                0 /* challenge */,
-                Utils.getCredentialOwnerUserId(mActivity) /* userId */,
-                foregroundOnly /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param header header of the confirmation screen; shown as large text
-     * @param description description of the confirmation screen
-     * @param returnCredentials if true, put credentials into intent. Note that if this is true,
-     *                          this can only be called internally.
-     * @param external specifies whether this activity is launched externally, meaning that it will
-     *                 get a dark theme, allow fingerprint authentication and it will forward
-     *                 activity result.
-     * @param userId The userId for whom the lock should be confirmed.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            boolean returnCredentials, boolean external, int userId) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                returnCredentials /* returnCredentials */,
-                external /* external */,
-                false /* hasChallenge */,
-                0 /* challenge */,
-                Utils.enforceSameOwner(mActivity, userId) /* userId */,
-                false /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param header header of the confirmation screen; shown as large text
-     * @param description description of the confirmation screen
-     * @param challenge a challenge to be verified against the device credential.
-     * @param foregroundOnly if the confirmation activity should be finished if it loses foreground.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    public boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            long challenge, boolean foregroundOnly) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                true /* returnCredentials */,
-                false /* external */,
-                true /* hasChallenge */,
-                challenge /* challenge */,
-                Utils.getCredentialOwnerUserId(mActivity) /* userId */,
-                foregroundOnly /* foregroundOnly */);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param header header of the confirmation screen; shown as large text
-     * @param description description of the confirmation screen
-     * @param challenge a challenge to be verified against the device credential.
-     * @param userId The userId for whom the lock should be confirmed.
-     * @param foregroundOnly if the confirmation activity should be finished if it loses foreground.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    public boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            long challenge, int userId, boolean foregroundOnly) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                true /* returnCredentials */,
-                false /* external */,
-                true /* hasChallenge */,
-                challenge /* challenge */,
-                Utils.enforceSameOwner(mActivity, userId) /* userId */,
-                foregroundOnly);
-    }
-
-    /**
-     * If a pattern, password or PIN exists, prompt the user before allowing them to change it.
-     *
-     * @param title title of the confirmation screen; shown in the action bar
-     * @param header header of the confirmation screen; shown as large text
-     * @param description description of the confirmation screen
-     * @param external specifies whether this activity is launched externally, meaning that it will
-     *                 get a dark theme, allow fingerprint authentication and it will forward
-     *                 activity result.
-     * @param challenge a challenge to be verified against the device credential.
-     * @param userId The userId for whom the lock should be confirmed.
-     * @return true if one exists and we launched an activity to confirm it
-     * @see Activity#onActivityResult(int, int, android.content.Intent)
-     */
-    public boolean launchConfirmationActivityWithExternalAndChallenge(int request,
-            @Nullable CharSequence title, @Nullable CharSequence header,
-            @Nullable CharSequence description, boolean external, long challenge, int userId) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                false /* returnCredentials */,
-                external /* external */,
-                true /* hasChallenge */,
-                challenge /* challenge */,
-                Utils.enforceSameOwner(mActivity, userId) /* userId */,
-                false /* foregroundOnly */);
-    }
-
-    /**
-     * Variant that allows you to prompt for credentials of any user, including
-     * those which aren't associated with the current user. As an example, this
-     * is useful when unlocking the storage for secondary users.
-     */
-    public boolean launchConfirmationActivityForAnyUser(int request,
-            @Nullable CharSequence title, @Nullable CharSequence header,
-            @Nullable CharSequence description, int userId) {
-        final Bundle extras = new Bundle();
-        extras.putBoolean(EXTRA_ALLOW_ANY_USER, true);
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                false /* returnCredentials */,
-                false /* external */,
-                true /* hasChallenge */,
-                0 /* challenge */,
-                userId /* userId */,
-                extras /* extras */);
+    public boolean launch() {
+        return launchConfirmationActivity(mBuilder.mRequestCode, mBuilder.mTitle, mBuilder.mHeader,
+                mBuilder.mDescription, mBuilder.mReturnCredentials, mBuilder.mExternal,
+                mBuilder.mForceVerifyPath, mBuilder.mUserId, mBuilder.mAlternateButton,
+                mBuilder.mAllowAnyUserId, mBuilder.mForegroundOnly,
+                mBuilder.mRequestGatekeeperPasswordHandle);
     }
 
     private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
             @Nullable CharSequence header, @Nullable CharSequence description,
-            boolean returnCredentials, boolean external, boolean hasChallenge,
-            long challenge, int userId, boolean foregroundOnly) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                returnCredentials /* returnCredentials */,
-                external /* external */,
-                hasChallenge /* hasChallenge */,
-                challenge /* challenge */,
-                userId /* userId */,
-                null /* alternateButton */,
-                null /* extras */,
-                foregroundOnly /* foregroundOnly */);
-    }
-
-    private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            boolean returnCredentials, boolean external, boolean hasChallenge,
-            long challenge, int userId, Bundle extras) {
-        return launchConfirmationActivity(
-                request /* request */,
-                title /* title */,
-                header /* header */,
-                description /* description */,
-                returnCredentials /* returnCredentials */,
-                external /* external */,
-                hasChallenge /* hasChallenge */,
-                challenge /* challenge */,
-                userId /* userId */,
-                null /* alternateButton */,
-                extras /* extras */,
-                false /* foregroundOnly */);
-    }
-
-    public boolean launchFrpConfirmationActivity(int request, @Nullable CharSequence header,
-            @Nullable CharSequence description, @Nullable CharSequence alternateButton) {
-        return launchConfirmationActivity(
-                request /* request */,
-                null /* title */,
-                header /* header */,
-                description /* description */,
-                false /* returnCredentials */,
-                true /* external */,
-                false /* hasChallenge */,
-                0 /* challenge */,
-                LockPatternUtils.USER_FRP /* userId */,
-                alternateButton /* alternateButton */,
-                null /* extras */,
-                false /* foregroundOnly */);
-    }
-
-    private boolean launchConfirmationActivity(int request, @Nullable CharSequence title,
-            @Nullable CharSequence header, @Nullable CharSequence description,
-            boolean returnCredentials, boolean external, boolean hasChallenge,
-            long challenge, int userId, @Nullable CharSequence alternateButton, Bundle extras,
-            boolean foregroundOnly) {
+            boolean returnCredentials, boolean external, boolean forceVerifyPath,
+            int userId, @Nullable CharSequence alternateButton, boolean allowAnyUser,
+            boolean foregroundOnly, boolean requestGatekeeperPasswordHandle) {
         final int effectiveUserId = UserManager.get(mActivity).getCredentialOwnerProfile(userId);
         boolean launched = false;
 
         switch (mLockPatternUtils.getKeyguardStoredPasswordQuality(effectiveUserId)) {
             case DevicePolicyManager.PASSWORD_QUALITY_SOMETHING:
                 launched = launchConfirmationActivity(request, title, header, description,
-                        returnCredentials || hasChallenge
+                        returnCredentials
                                 ? ConfirmLockPattern.InternalActivity.class
                                 : ConfirmLockPattern.class, returnCredentials, external,
-                                hasChallenge, challenge, userId, alternateButton, extras,
-                                foregroundOnly);
+                                forceVerifyPath, userId, alternateButton, allowAnyUser,
+                                foregroundOnly, requestGatekeeperPasswordHandle);
                 break;
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC:
             case DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX:
@@ -416,11 +319,11 @@
             case DevicePolicyManager.PASSWORD_QUALITY_COMPLEX:
             case DevicePolicyManager.PASSWORD_QUALITY_MANAGED:
                 launched = launchConfirmationActivity(request, title, header, description,
-                        returnCredentials || hasChallenge
+                        returnCredentials
                                 ? ConfirmLockPassword.InternalActivity.class
                                 : ConfirmLockPassword.class, returnCredentials, external,
-                                hasChallenge, challenge, userId, alternateButton, extras,
-                                foregroundOnly);
+                                forceVerifyPath, userId, alternateButton, allowAnyUser,
+                                foregroundOnly, requestGatekeeperPasswordHandle);
                 break;
         }
         return launched;
@@ -428,9 +331,9 @@
 
     private boolean launchConfirmationActivity(int request, CharSequence title, CharSequence header,
             CharSequence message, Class<?> activityClass, boolean returnCredentials,
-            boolean external, boolean hasChallenge, long challenge,
-            int userId, @Nullable CharSequence alternateButton, Bundle extras,
-            boolean foregroundOnly) {
+            boolean external, boolean forceVerifyPath, int userId,
+            @Nullable CharSequence alternateButton, boolean allowAnyUser,
+            boolean foregroundOnly, boolean requestGatekeeperPasswordHandle) {
         final Intent intent = new Intent();
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.TITLE_TEXT, title);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.HEADER_TEXT, header);
@@ -441,14 +344,14 @@
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, external);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.USE_FADE_ANIMATION, external);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, returnCredentials);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, hasChallenge);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, forceVerifyPath);
         intent.putExtra(Intent.EXTRA_USER_ID, userId);
         intent.putExtra(KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL, alternateButton);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOREGROUND_ONLY, foregroundOnly);
-        if (extras != null) {
-            intent.putExtras(extras);
-        }
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_ALLOW_ANY_USER, allowAnyUser);
+        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE,
+                requestGatekeeperPasswordHandle);
+
         intent.setClassName(SETTINGS_PACKAGE_NAME, activityClass.getName());
         if (external) {
             intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
diff --git a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
index 8793471..8bc2976 100644
--- a/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
+++ b/src/com/android/settings/password/ChooseLockTypeDialogFragment.java
@@ -74,7 +74,7 @@
 
             // Copy the original extras into the new intent
             copyBooleanExtra(activityIntent, intent,
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
+                    ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
             copyBooleanExtra(activityIntent, intent,
                     ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false);
             if (activityIntent.hasExtra(
@@ -83,8 +83,6 @@
                         ChooseLockGenericFragment.EXTRA_CHOOSE_LOCK_GENERIC_EXTRAS));
             }
             intent.putExtra(LockPatternUtils.PASSWORD_TYPE_KEY, selectedLockType.defaultQuality);
-            intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE,
-                    activityIntent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0));
             WizardManagerHelper.copyWizardManagerExtras(activityIntent, intent);
             activity.startActivity(intent);
             activity.finish();
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
index 64812fd..6a97dcd 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialActivity.java
@@ -27,9 +27,9 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.hardware.biometrics.BiometricConstants;
-import android.hardware.biometrics.BiometricManager;
 import android.hardware.biometrics.BiometricPrompt;
 import android.hardware.biometrics.BiometricPrompt.AuthenticationCallback;
+import android.hardware.biometrics.PromptInfo;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -80,24 +80,11 @@
         return intent;
     }
 
-    public static Intent createIntent(CharSequence title, CharSequence details, long challenge) {
-        Intent intent = new Intent();
-        intent.setClassName(SETTINGS_PACKAGE_NAME,
-                ConfirmDeviceCredentialActivity.class.getName());
-        intent.putExtra(KeyguardManager.EXTRA_TITLE, title);
-        intent.putExtra(KeyguardManager.EXTRA_DESCRIPTION, details);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
-        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-        return intent;
-    }
-
-    private BiometricManager mBiometricManager;
     private BiometricFragment mBiometricFragment;
     private DevicePolicyManager mDevicePolicyManager;
     private LockPatternUtils mLockPatternUtils;
     private UserManager mUserManager;
     private TrustManager mTrustManager;
-    private ChooseLockSettingsHelper mChooseLockSettingsHelper;
     private Handler mHandler = new Handler(Looper.getMainLooper());
     private Context mContext;
     private boolean mCheckDevicePolicyManager;
@@ -181,7 +168,6 @@
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
         getWindow().setStatusBarColor(Color.TRANSPARENT);
 
-        mBiometricManager = getSystemService(BiometricManager.class);
         mDevicePolicyManager = getSystemService(DevicePolicyManager.class);
         mUserManager = UserManager.get(this);
         mTrustManager = getSystemService(TrustManager.class);
@@ -190,7 +176,7 @@
         Intent intent = getIntent();
         mContext = this;
         mCheckDevicePolicyManager = intent
-                .getBooleanExtra(BiometricPrompt.EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS, false);
+                .getBooleanExtra(KeyguardManager.EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS, false);
         mTitle = intent.getStringExtra(KeyguardManager.EXTRA_TITLE);
         mDetails = intent.getStringExtra(KeyguardManager.EXTRA_DESCRIPTION);
         String alternateButton = intent.getStringExtra(
@@ -213,24 +199,21 @@
             mTitle = getTitleFromOrganizationName(mUserId);
         }
 
-
-        mChooseLockSettingsHelper = new ChooseLockSettingsHelper(this);
         final LockPatternUtils lockPatternUtils = new LockPatternUtils(this);
 
-        final Bundle bpBundle = new Bundle();
-        bpBundle.putString(BiometricPrompt.KEY_TITLE, mTitle);
-        bpBundle.putString(BiometricPrompt.KEY_DESCRIPTION, mDetails);
-        bpBundle.putBoolean(BiometricPrompt.EXTRA_DISALLOW_BIOMETRICS_IF_POLICY_EXISTS,
-                mCheckDevicePolicyManager);
+        final PromptInfo promptInfo = new PromptInfo();
+        promptInfo.setTitle(mTitle);
+        promptInfo.setDescription(mDetails);
+        promptInfo.setDisallowBiometricsIfPolicyExists(mCheckDevicePolicyManager);
 
         final @LockPatternUtils.CredentialType int credentialType = Utils.getCredentialType(
                 mContext, effectiveUserId);
         if (mTitle == null) {
-            bpBundle.putString(BiometricPrompt.KEY_DEVICE_CREDENTIAL_TITLE,
+            promptInfo.setDeviceCredentialTitle(
                     getTitleFromCredentialType(credentialType, isManagedProfile));
         }
         if (mDetails == null) {
-            bpBundle.putString(BiometricPrompt.KEY_DEVICE_CREDENTIAL_SUBTITLE,
+            promptInfo.setSubtitle(
                     getDetailsFromCredentialType(credentialType, isManagedProfile));
         }
 
@@ -240,13 +223,19 @@
         // tied profile so it will enable work mode and unlock managed profile, when personal
         // challenge is unlocked.
         if (frp) {
-            launchedCDC = mChooseLockSettingsHelper.launchFrpConfirmationActivity(
-                    0, mTitle, mDetails, alternateButton);
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(this);
+            launchedCDC = builder.setHeader(mTitle) // Show the title in the header location
+                    .setDescription(mDetails)
+                    .setAlternateButton(alternateButton)
+                    .setExternal(true)
+                    .setUserId(LockPatternUtils.USER_FRP)
+                    .show();
         } else if (isManagedProfile && isInternalActivity()
                 && !lockPatternUtils.isSeparateProfileChallengeEnabled(mUserId)) {
             mCredentialMode = CREDENTIAL_MANAGED;
             if (isBiometricAllowed(effectiveUserId, mUserId)) {
-                showBiometricPrompt(bpBundle);
+                showBiometricPrompt(promptInfo);
                 launchedBiometric = true;
             } else {
                 showConfirmCredentials();
@@ -257,7 +246,7 @@
             if (isBiometricAllowed(effectiveUserId, mUserId)) {
                 // Don't need to check if biometrics / pin/pattern/pass are enrolled. It will go to
                 // onAuthenticationError and do the right thing automatically.
-                showBiometricPrompt(bpBundle);
+                showBiometricPrompt(promptInfo);
                 launchedBiometric = true;
             } else {
                 showConfirmCredentials();
@@ -350,15 +339,13 @@
                 .hasPendingEscrowToken(realUserId);
     }
 
-    private void showBiometricPrompt(Bundle bundle) {
-        mBiometricManager.setActiveUser(mUserId);
-
+    private void showBiometricPrompt(PromptInfo promptInfo) {
         mBiometricFragment = (BiometricFragment) getSupportFragmentManager()
                 .findFragmentByTag(TAG_BIOMETRIC_FRAGMENT);
         boolean newFragment = false;
 
         if (mBiometricFragment == null) {
-            mBiometricFragment = BiometricFragment.newInstance(bundle);
+            mBiometricFragment = BiometricFragment.newInstance(promptInfo);
             newFragment = true;
         }
         mBiometricFragment.setCallbacks(mExecutor, mAuthenticationCallback);
@@ -377,7 +364,7 @@
         boolean launched = false;
         // The only difference between CREDENTIAL_MANAGED and CREDENTIAL_NORMAL is that for
         // CREDENTIAL_MANAGED, we launch the real confirm credential activity with an explicit
-        // but dummy challenge value (0L). This will result in ConfirmLockPassword calling
+        // but fake challenge value (0L). This will result in ConfirmLockPassword calling
         // verifyTiedProfileChallenge() (if it's a profile with unified challenge), due to the
         // difference between ConfirmLockPassword.startVerifyPassword() and
         // ConfirmLockPassword.startCheckPassword(). Calling verifyTiedProfileChallenge() here is
@@ -387,15 +374,22 @@
         // LockPatternChecker and LockPatternUtils. verifyPassword should be the only API to use,
         // which optionally accepts a challenge.
         if (mCredentialMode == CREDENTIAL_MANAGED) {
-            launched = mChooseLockSettingsHelper
-                    .launchConfirmationActivityWithExternalAndChallenge(
-                            0 /* request code */, null /* title */, mTitle, mDetails,
-                            true /* isExternal */, 0L /* challenge */, mUserId);
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(this);
+            launched = builder.setHeader(mTitle)
+                    .setDescription(mDetails)
+                    .setExternal(true)
+                    .setUserId(mUserId)
+                    .setForceVerifyPath(true)
+                    .show();
         } else if (mCredentialMode == CREDENTIAL_NORMAL) {
-            launched = mChooseLockSettingsHelper.launchConfirmationActivity(
-                    0 /* request code */, null /* title */,
-                    mTitle, mDetails, false /* returnCredentials */, true /* isExternal */,
-                    mUserId);
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(this);
+            launched = builder.setHeader(mTitle) // Show the title string in the header area
+                    .setDescription(mDetails)
+                    .setExternal(true)
+                    .setUserId(mUserId)
+                    .show();
         }
         if (!launched) {
             Log.d(TAG, "No pin/pattern/pass set");
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
index 383ae4f..3ecff58 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java
@@ -64,14 +64,14 @@
             return;
         }
         if (UserManager.get(this).isManagedProfile(credentialOwnerUserId)) {
-            setTheme(SetupWizardUtils.getTheme(getIntent()));
+            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
             mConfirmCredentialTheme = ConfirmCredentialTheme.WORK;
         } else if (getIntent().getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.DARK_THEME, false)) {
             setTheme(R.style.Theme_ConfirmDeviceCredentialsDark);
             mConfirmCredentialTheme = ConfirmCredentialTheme.DARK;
         } else {
-            setTheme(SetupWizardUtils.getTheme(getIntent()));
+            setTheme(SetupWizardUtils.getTheme(this, getIntent()));
             mConfirmCredentialTheme = ConfirmCredentialTheme.NORMAL;
         }
         super.onCreate(savedState);
diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
index 262a550..a60fab9 100644
--- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
+++ b/src/com/android/settings/password/ConfirmDeviceCredentialBaseFragment.java
@@ -27,10 +27,6 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.UserInfo;
-import android.graphics.Point;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
 import android.hardware.biometrics.BiometricManager;
 import android.os.Bundle;
 import android.os.Handler;
@@ -39,10 +35,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewGroup;
 import android.widget.Button;
-import android.widget.FrameLayout;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AlertDialog;
@@ -78,6 +71,8 @@
     protected static final long CLEAR_WRONG_ATTEMPT_TIMEOUT_MS = 3000;
 
     protected boolean mReturnCredentials = false;
+    protected boolean mReturnGatekeeperPassword = false;
+    protected boolean mForceVerifyPath = false;
     protected Button mCancelButton;
     /** Button allowing managed profile password reset, null when is not shown. */
     @Nullable protected Button mForgotButton;
@@ -100,12 +95,18 @@
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mFrpAlternateButtonText = getActivity().getIntent().getCharSequenceExtra(
+        final Intent intent = getActivity().getIntent();
+        mFrpAlternateButtonText = intent.getCharSequenceExtra(
                 KeyguardManager.EXTRA_ALTERNATE_BUTTON_LABEL);
-        mReturnCredentials = getActivity().getIntent().getBooleanExtra(
+        mReturnCredentials = intent.getBooleanExtra(
                 ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false);
+
+        mReturnGatekeeperPassword = intent.getBooleanExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false);
+        mForceVerifyPath = intent.getBooleanExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false);
+
         // Only take this argument into account if it belongs to the current profile.
-        Intent intent = getActivity().getIntent();
         mUserId = Utils.getUserIdFromBundle(getActivity(), intent.getExtras(),
                 isInternalActivity());
         mFrp = (mUserId == LockPatternUtils.USER_FRP);
@@ -210,30 +211,6 @@
     public void startEnterAnimation() {
     }
 
-    private void setWorkChallengeBackground(View baseView, int userId) {
-        View mainContent = getActivity().findViewById(com.android.settings.R.id.main_content);
-        if (mainContent != null) {
-            // Remove the main content padding so that the background image is full screen.
-            mainContent.setPadding(0, 0, 0, 0);
-        }
-
-        baseView.setBackground(
-                new ColorDrawable(mDevicePolicyManager.getOrganizationColorForUser(userId)));
-        ImageView imageView = (ImageView) baseView.findViewById(R.id.background_image);
-        if (imageView != null) {
-            Drawable image = getResources().getDrawable(R.drawable.work_challenge_background);
-            image.setColorFilter(
-                    getResources().getColor(R.color.confirm_device_credential_transparent_black),
-                    PorterDuff.Mode.DARKEN);
-            imageView.setImageDrawable(image);
-            Point screenSize = new Point();
-            getActivity().getWindowManager().getDefaultDisplay().getSize(screenSize);
-            imageView.setLayoutParams(new FrameLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    screenSize.y));
-        }
-    }
-
     protected void reportFailedAttempt() {
         updateErrorMessage(
                 mLockPatternUtils.getCurrentFailedPasswordAttempts(mEffectiveUserId) + 1);
diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java
index 8aa44e9..6092d9f 100644
--- a/src/com/android/settings/password/ConfirmLockPassword.java
+++ b/src/com/android/settings/password/ConfirmLockPassword.java
@@ -380,13 +380,18 @@
                     : LockscreenCredential.createPin(passwordText);
 
             mPasswordEntryInputDisabler.setInputEnabled(false);
-            final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
 
             Intent intent = new Intent();
-            if (verifyChallenge)  {
+            // TODO(b/161956762): Sanitize this
+            if (mReturnGatekeeperPassword) {
                 if (isInternalActivity()) {
-                    startVerifyPassword(credential, intent);
+                    startVerifyPassword(credential, intent,
+                            LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE);
+                    return;
+                }
+            } else if (mForceVerifyPath)  {
+                if (isInternalActivity()) {
+                    startVerifyPassword(credential, intent, 0 /* flags */);
                     return;
                 }
             } else {
@@ -401,35 +406,31 @@
             return getActivity() instanceof ConfirmLockPassword.InternalActivity;
         }
 
-        private void startVerifyPassword(LockscreenCredential credential, final Intent intent) {
-            long challenge = getActivity().getIntent().getLongExtra(
-                    ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
+        private void startVerifyPassword(LockscreenCredential credential, final Intent intent,
+                @LockPatternUtils.VerifyFlag int flags) {
             final int localEffectiveUserId = mEffectiveUserId;
             final int localUserId = mUserId;
-            final LockPatternChecker.OnVerifyCallback onVerifyCallback =
-                    new LockPatternChecker.OnVerifyCallback() {
-                        @Override
-                        public void onVerified(byte[] token, int timeoutMs) {
-                            mPendingLockCheck = null;
-                            boolean matched = false;
-                            if (token != null) {
-                                matched = true;
-                                if (mReturnCredentials) {
-                                    intent.putExtra(
-                                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
-                                            token);
-                                }
-                            }
-                            mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
-                                    localEffectiveUserId);
-                        }
+            final LockPatternChecker.OnVerifyCallback onVerifyCallback = (response, timeoutMs) -> {
+                mPendingLockCheck = null;
+                final boolean matched = response.isMatched();
+                if (matched && mReturnCredentials) {
+                    if ((flags & LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE) != 0) {
+                        intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
+                                response.getGatekeeperPasswordHandle());
+                    } else {
+                        intent.putExtra(
+                                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
+                                response.getGatekeeperHAT());
+                    }
+                }
+                mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
+                        localEffectiveUserId);
             };
             mPendingLockCheck = (localEffectiveUserId == localUserId)
-                    ? LockPatternChecker.verifyCredential(
-                            mLockPatternUtils, credential, challenge, localUserId, onVerifyCallback)
-                    : LockPatternChecker.verifyTiedProfileChallenge(
-                            mLockPatternUtils, credential, challenge, localUserId,
-                            onVerifyCallback);
+                    ? LockPatternChecker.verifyCredential(mLockPatternUtils, credential,
+                            localUserId, flags, onVerifyCallback)
+                    : LockPatternChecker.verifyTiedProfileChallenge(mLockPatternUtils, credential,
+                            localUserId, flags, onVerifyCallback);
         }
 
         private void startCheckPassword(final LockscreenCredential credential,
diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java
index 48014cb..598e09a 100644
--- a/src/com/android/settings/password/ConfirmLockPattern.java
+++ b/src/com/android/settings/password/ConfirmLockPattern.java
@@ -422,14 +422,18 @@
 
                 mLockPatternView.setEnabled(false);
 
-                final boolean verifyChallenge = getActivity().getIntent().getBooleanExtra(
-                        ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false);
                 final LockscreenCredential credential = LockscreenCredential.createPattern(pattern);
-                //TODO: how to sanitize this?
+                // TODO(b/161956762): Sanitize this
                 Intent intent = new Intent();
-                if (verifyChallenge) {
+                if (mReturnGatekeeperPassword) {
                     if (isInternalActivity()) {
-                        startVerifyPattern(credential, intent);
+                        startVerifyPattern(credential, intent,
+                                LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE);
+                        return;
+                    }
+                } else if (mForceVerifyPath) {
+                    if (isInternalActivity()) {
+                        startVerifyPattern(credential, intent, 0 /* flags */);
                         return;
                     }
                 } else {
@@ -445,36 +449,33 @@
             }
 
             private void startVerifyPattern(final LockscreenCredential pattern,
-                    final Intent intent) {
+                    final Intent intent, @LockPatternUtils.VerifyFlag int flags) {
                 final int localEffectiveUserId = mEffectiveUserId;
                 final int localUserId = mUserId;
-                long challenge = getActivity().getIntent().getLongExtra(
-                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0);
                 final LockPatternChecker.OnVerifyCallback onVerifyCallback =
-                    new LockPatternChecker.OnVerifyCallback() {
-                        @Override
-                        public void onVerified(byte[] token, int timeoutMs) {
-                            mPendingLockCheck = null;
-                            boolean matched = false;
-                            if (token != null) {
-                                matched = true;
-                                if (mReturnCredentials) {
-                                    intent.putExtra(
-                                            ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
-                                            token);
-                                }
+                    (response, timeoutMs) -> {
+                        mPendingLockCheck = null;
+                        final boolean matched = response.isMatched();
+                        if (matched && mReturnCredentials) {
+                            if ((flags & LockPatternUtils.VERIFY_FLAG_REQUEST_GK_PW_HANDLE) != 0) {
+                                intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_GK_PW_HANDLE,
+                                        response.getGatekeeperPasswordHandle());
+                            } else {
+                                intent.putExtra(
+                                        ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE_TOKEN,
+                                        response.getGatekeeperHAT());
                             }
-                            mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
-                                    localEffectiveUserId);
                         }
-                    };
+                        mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
+                                localEffectiveUserId);
+                };
                 mPendingLockCheck = (localEffectiveUserId == localUserId)
                         ? LockPatternChecker.verifyCredential(
-                                mLockPatternUtils, pattern, challenge, localUserId,
+                                mLockPatternUtils, pattern, localUserId, flags,
                                 onVerifyCallback)
                         : LockPatternChecker.verifyTiedProfileChallenge(
-                                mLockPatternUtils, pattern,
-                                challenge, localUserId, onVerifyCallback);
+                                mLockPatternUtils, pattern, localUserId, flags,
+                                onVerifyCallback);
             }
 
             private void startCheckPattern(final LockscreenCredential pattern,
diff --git a/src/com/android/settings/password/SaveChosenLockWorkerBase.java b/src/com/android/settings/password/SaveChosenLockWorkerBase.java
index 26e4d5a..cea908b 100644
--- a/src/com/android/settings/password/SaveChosenLockWorkerBase.java
+++ b/src/com/android/settings/password/SaveChosenLockWorkerBase.java
@@ -42,8 +42,7 @@
     private Intent mResultData;
 
     protected LockPatternUtils mUtils;
-    protected boolean mHasChallenge;
-    protected long mChallenge;
+    protected boolean mRequestGatekeeperPassword;
     protected boolean mWasSecureBefore;
     protected int mUserId;
     protected int mUnificationProfileId = UserHandle.USER_NULL;
@@ -69,12 +68,10 @@
     }
 
     protected void prepare(LockPatternUtils utils, boolean credentialRequired,
-            boolean hasChallenge, long challenge, int userId) {
+            boolean requestGatekeeperPassword, int userId) {
         mUtils = utils;
         mUserId = userId;
-
-        mHasChallenge = hasChallenge;
-        mChallenge = challenge;
+        mRequestGatekeeperPassword = requestGatekeeperPassword;
         // This will be a no-op for non managed profiles.
         mWasSecureBefore = mUtils.isSecure(mUserId);
 
diff --git a/src/com/android/settings/password/SetNewPasswordController.java b/src/com/android/settings/password/SetNewPasswordController.java
index bf55271..03efa60 100644
--- a/src/com/android/settings/password/SetNewPasswordController.java
+++ b/src/com/android/settings/password/SetNewPasswordController.java
@@ -111,50 +111,67 @@
      */
     public void dispatchSetNewPasswordIntent() {
         final Bundle extras;
-        // TODO: handle the case with multiple biometrics, perhaps take an arg for biometric type?
-        if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)
-                && mFaceManager != null
-                && mFaceManager.isHardwareDetected()
-                && !mFaceManager.hasEnrolledTemplates(mTargetUserId)
-                && !isFaceDisabledByAdmin()) {
-            extras = getFaceChooseLockExtras();
-        } else if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)
-                && mFingerprintManager != null
+
+        final boolean hasFeatureFingerprint = mPackageManager
+                .hasSystemFeature(PackageManager.FEATURE_FINGERPRINT);
+        final boolean hasFeatureFace = mPackageManager
+                .hasSystemFeature(PackageManager.FEATURE_FACE);
+
+        final boolean shouldShowFingerprintEnroll = mFingerprintManager != null
                 && mFingerprintManager.isHardwareDetected()
                 && !mFingerprintManager.hasEnrolledFingerprints(mTargetUserId)
-                && !isFingerprintDisabledByAdmin()) {
+                && !isFingerprintDisabledByAdmin();
+        final boolean shouldShowFaceEnroll = mFaceManager != null
+                && mFaceManager.isHardwareDetected()
+                && !mFaceManager.hasEnrolledTemplates(mTargetUserId)
+                && !isFaceDisabledByAdmin();
+
+        if (hasFeatureFace && shouldShowFaceEnroll
+                && hasFeatureFingerprint && shouldShowFingerprintEnroll) {
+            extras = getBiometricChooseLockExtras();
+        } else if (hasFeatureFace && shouldShowFaceEnroll) {
+            extras = getFaceChooseLockExtras();
+        } else if (hasFeatureFingerprint && shouldShowFingerprintEnroll) {
             extras = getFingerprintChooseLockExtras();
         } else {
             extras = new Bundle();
         }
+
         // No matter we show fingerprint options or not, we should tell the next activity which
         // user is setting new password.
         extras.putInt(Intent.EXTRA_USER_ID, mTargetUserId);
         mUi.launchChooseLock(extras);
     }
 
-    private Bundle getFingerprintChooseLockExtras() {
+    private Bundle getBiometricChooseLockExtras() {
         Bundle chooseLockExtras = new Bundle();
-        long challenge = mFingerprintManager.preEnroll();
         chooseLockExtras.putInt(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
                 PASSWORD_QUALITY_SOMETHING);
         chooseLockExtras.putBoolean(
                 ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
-        chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-        chooseLockExtras.putLong(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
+        chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, true);
+        return chooseLockExtras;
+    }
+
+    private Bundle getFingerprintChooseLockExtras() {
+        Bundle chooseLockExtras = new Bundle();
+        chooseLockExtras.putInt(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+                PASSWORD_QUALITY_SOMETHING);
+        chooseLockExtras.putBoolean(
+                ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
+        chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
         chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true);
         return chooseLockExtras;
     }
 
     private Bundle getFaceChooseLockExtras() {
         Bundle chooseLockExtras = new Bundle();
-        long challenge = mFaceManager.generateChallenge();
         chooseLockExtras.putInt(ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
                 PASSWORD_QUALITY_SOMETHING);
         chooseLockExtras.putBoolean(
                 ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS, true);
-        chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true);
-        chooseLockExtras.putLong(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, challenge);
+        chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, true);
         chooseLockExtras.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, true);
         return chooseLockExtras;
     }
diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index aa17f8e..7818f0d 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -31,7 +31,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 import androidx.fragment.app.Fragment;
 import androidx.preference.Preference;
@@ -42,8 +41,6 @@
 import com.android.settings.R;
 import com.android.settings.SetupEncryptionInterstitial;
 import com.android.settings.SetupWizardUtils;
-import com.android.settings.biometrics.BiometricEnrollActivity;
-import com.android.settings.biometrics.fingerprint.SetupFingerprintEnrollFindSensor;
 import com.android.settings.utils.SettingsDividerItemDecoration;
 
 import com.google.android.setupdesign.GlifPreferenceLayout;
@@ -72,8 +69,8 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
-        super.onApplyThemeResource(theme, resid, first);
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 
     @Override
@@ -200,8 +197,9 @@
                                 .getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false),
                         /* isPatternMode= */ false,
                         /* isAlphaMode= */ false,
-                        /* isFingerprintSupported= */ false,
-                        /* isFaceSupported= */ false
+                        /* forFingerprint= */ false,
+                        /* forFace= */ false,
+                        /* forBiometrics= */ false
                 );
                 dialog.show(getFragmentManager());
                 return true;
@@ -242,7 +240,7 @@
         }
 
         private boolean isForBiometric() {
-            return mForFingerprint || mForFace;
+            return mForFingerprint || mForFace || mForBiometrics;
         }
     }
 
diff --git a/src/com/android/settings/password/SetupChooseLockPassword.java b/src/com/android/settings/password/SetupChooseLockPassword.java
index 60bb0cd..e82dc94 100644
--- a/src/com/android/settings/password/SetupChooseLockPassword.java
+++ b/src/com/android/settings/password/SetupChooseLockPassword.java
@@ -104,18 +104,23 @@
         @Override
         protected void onSkipOrClearButtonClick(View view) {
             if (mLeftButtonIsSkip) {
-                SetupSkipDialog dialog = SetupSkipDialog.newInstance(
-                        getActivity().getIntent()
-                                .getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false),
+                final Intent intent = getActivity().getIntent();
+                final boolean frpSupported = intent
+                        .getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false);
+                final boolean forFingerprint = intent
+                        .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
+                final boolean forFace = intent
+                        .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false);
+                final boolean forBiometrics = intent
+                        .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, false);
+
+                final SetupSkipDialog dialog = SetupSkipDialog.newInstance(
+                        frpSupported,
                         /* isPatternMode= */ false,
                         mIsAlphaMode,
-                        getActivity().getIntent()
-                                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT,
-                                        false),
-                        getActivity().getIntent()
-                                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false)
-
-                );
+                        forFingerprint,
+                        forFace,
+                        forBiometrics);
                 dialog.show(getFragmentManager());
                 return;
             }
diff --git a/src/com/android/settings/password/SetupChooseLockPattern.java b/src/com/android/settings/password/SetupChooseLockPattern.java
index 8e59d8c..e80599f 100644
--- a/src/com/android/settings/password/SetupChooseLockPattern.java
+++ b/src/com/android/settings/password/SetupChooseLockPattern.java
@@ -90,18 +90,23 @@
         @Override
         protected void onSkipOrClearButtonClick(View view) {
             if (mLeftButtonIsSkip) {
-                SetupSkipDialog dialog = SetupSkipDialog.newInstance(
-                        getActivity().getIntent()
-                                .getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false),
+                final Intent intent = getActivity().getIntent();
+                final boolean frpSupported = intent
+                        .getBooleanExtra(SetupSkipDialog.EXTRA_FRP_SUPPORTED, false);
+                final boolean forFingerprint = intent
+                        .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, false);
+                final boolean forFace = intent
+                        .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false);
+                final boolean forBiometrics = intent
+                        .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, false);
+
+                final SetupSkipDialog dialog = SetupSkipDialog.newInstance(
+                        frpSupported,
                         /* isPatternMode= */ true,
                         /* isAlphaMode= */ false,
-                        getActivity().getIntent()
-                                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT,
-                                false),
-                        getActivity().getIntent()
-                                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, false)
-
-                );
+                        forFingerprint,
+                        forFace,
+                        forBiometrics);
                 dialog.show(getFragmentManager());
                 return;
             }
diff --git a/src/com/android/settings/password/SetupSkipDialog.java b/src/com/android/settings/password/SetupSkipDialog.java
index 68f8dd4..ef00357 100644
--- a/src/com/android/settings/password/SetupSkipDialog.java
+++ b/src/com/android/settings/password/SetupSkipDialog.java
@@ -43,14 +43,16 @@
     public static final int RESULT_SKIP = Activity.RESULT_FIRST_USER + 10;
 
     public static SetupSkipDialog newInstance(boolean isFrpSupported, boolean isPatternMode,
-            boolean isAlphanumericMode, boolean isFingerprintSupported, boolean isFaceSupported) {
+            boolean isAlphanumericMode, boolean forFingerprint, boolean forFace,
+            boolean forBiometrics) {
         SetupSkipDialog dialog = new SetupSkipDialog();
         Bundle args = new Bundle();
         args.putBoolean(ARG_FRP_SUPPORTED, isFrpSupported);
         args.putBoolean(ARG_LOCK_TYPE_PATTERN, isPatternMode);
         args.putBoolean(ARG_LOCK_TYPE_ALPHANUMERIC, isAlphanumericMode);
-        args.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, isFingerprintSupported);
-        args.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, isFaceSupported);
+        args.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, forFingerprint);
+        args.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE, forFace);
+        args.putBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS, forBiometrics);
         dialog.setArguments(args);
         return dialog;
     }
@@ -68,11 +70,13 @@
     @NonNull
     public AlertDialog.Builder onCreateDialogBuilder() {
         Bundle args = getArguments();
-        final boolean isFaceSupported =
+        final boolean forFace =
                 args.getBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE);
-        final boolean isFingerprintSupported =
+        final boolean forFingerprint =
                 args.getBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT);
-        if (isFaceSupported || isFingerprintSupported) {
+        final boolean forBiometrics =
+                args.getBoolean(ChooseLockSettingsHelper.EXTRA_KEY_FOR_BIOMETRICS);
+        if (forFace || forFingerprint || forBiometrics) {
             final int titleId;
 
             if (args.getBoolean(ARG_LOCK_TYPE_PATTERN)) {
@@ -82,13 +86,20 @@
                     R.string.lock_screen_password_skip_title : R.string.lock_screen_pin_skip_title;
             }
 
+            final int msgResId;
+            if (forBiometrics) {
+                msgResId = R.string.biometrics_lock_screen_setup_skip_dialog_text;
+            } else if (forFace) {
+                msgResId = R.string.face_lock_screen_setup_skip_dialog_text;
+            } else {
+                msgResId = R.string.fingerprint_lock_screen_setup_skip_dialog_text;
+            }
+
             return new AlertDialog.Builder(getContext())
                     .setPositiveButton(R.string.skip_lock_screen_dialog_button_label, this)
                     .setNegativeButton(R.string.cancel_lock_screen_dialog_button_label, this)
                     .setTitle(titleId)
-                    .setMessage(isFaceSupported ?
-                            R.string.face_lock_screen_setup_skip_dialog_text :
-                            R.string.fingerprint_lock_screen_setup_skip_dialog_text);
+                    .setMessage(msgResId);
         } else {
             return new AlertDialog.Builder(getContext())
                     .setPositiveButton(R.string.skip_anyway_button_label, this)
diff --git a/src/com/android/settings/print/PrintSettingPreferenceController.java b/src/com/android/settings/print/PrintSettingPreferenceController.java
index 16c4320..c0adfa3 100644
--- a/src/com/android/settings/print/PrintSettingPreferenceController.java
+++ b/src/com/android/settings/print/PrintSettingPreferenceController.java
@@ -60,6 +60,7 @@
     @Override
     public int getAvailabilityStatus() {
         return mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING)
+                && mPrintManager != null
                 ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
     }
 
@@ -71,12 +72,16 @@
 
     @Override
     public void onStart() {
-        mPrintManager.addPrintJobStateChangeListener(this);
+        if (mPrintManager != null) {
+            mPrintManager.addPrintJobStateChangeListener(this);
+        }
     }
 
     @Override
     public void onStop() {
-        mPrintManager.removePrintJobStateChangeListener(this);
+        if (mPrintManager != null) {
+            mPrintManager.removePrintJobStateChangeListener(this);
+        }
     }
 
     @Override
diff --git a/src/com/android/settings/search/CustomSiteMapRegistry.java b/src/com/android/settings/search/CustomSiteMapRegistry.java
index f1c6211..cd716fa 100644
--- a/src/com/android/settings/search/CustomSiteMapRegistry.java
+++ b/src/com/android/settings/search/CustomSiteMapRegistry.java
@@ -35,7 +35,7 @@
 import com.android.settings.security.screenlock.ScreenLockSettings;
 import com.android.settings.system.SystemDashboardFragment;
 import com.android.settings.wallpaper.WallpaperSuggestionActivity;
-import com.android.settings.wifi.WifiSettings2;
+import com.android.settings.wifi.WifiSettings;
 
 import java.util.Map;
 
@@ -55,7 +55,7 @@
         CUSTOM_SITE_MAP.put(
                 WallpaperSuggestionActivity.class.getName(), DisplaySettings.class.getName());
         CUSTOM_SITE_MAP.put(
-                WifiSettings2.class.getName(), NetworkDashboardFragment.class.getName());
+                WifiSettings.class.getName(), NetworkDashboardFragment.class.getName());
         CUSTOM_SITE_MAP.put(PowerUsageAdvanced.class.getName(), PowerUsageSummary.class.getName());
         CUSTOM_SITE_MAP.put(RecentLocationRequestSeeAllFragment.class.getName(),
                 LocationSettings.class.getName());
diff --git a/src/com/android/settings/search/SearchFeatureProviderImpl.java b/src/com/android/settings/search/SearchFeatureProviderImpl.java
index 63bf420..508d37d 100644
--- a/src/com/android/settings/search/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search/SearchFeatureProviderImpl.java
@@ -45,13 +45,13 @@
         final String packageName = caller.getPackageName();
         final boolean isSettingsPackage = TextUtils.equals(packageName, context.getPackageName())
                 || TextUtils.equals(getSettingsIntelligencePkgName(context), packageName);
-        final boolean isWhitelistedPackage =
-                isSignatureWhitelisted(context, caller.getPackageName());
-        if (isSettingsPackage || isWhitelistedPackage) {
+        final boolean isAllowlistedPackage =
+                isSignatureAllowlisted(context, caller.getPackageName());
+        if (isSettingsPackage || isAllowlistedPackage) {
             return;
         }
         throw new SecurityException("Search result intents must be called with from a "
-                + "whitelisted package.");
+                + "allowlisted package.");
     }
 
     @Override
@@ -69,7 +69,7 @@
                 .putExtra(Intent.EXTRA_REFERRER, buildReferrer(context, pageId));
     }
 
-    protected boolean isSignatureWhitelisted(Context context, String callerPackage) {
+    protected boolean isSignatureAllowlisted(Context context, String callerPackage) {
         return false;
     }
 
diff --git a/src/com/android/settings/security/CredentialManagementAppAdapter.java b/src/com/android/settings/security/CredentialManagementAppAdapter.java
new file mode 100644
index 0000000..e56fc63
--- /dev/null
+++ b/src/com/android/settings/security/CredentialManagementAppAdapter.java
@@ -0,0 +1,270 @@
+/*
+ * Copyright (C) 2020 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 android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.security.AppUriAuthenticationPolicy;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.R;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Adapter for the requesting credential management app. This adapter displays the details of the
+ * requesting app, including its authentication policy, when {@link RequestManageCredentials}
+ * is started.
+ * <p>
+ *
+ * @hide
+ * @see RequestManageCredentials
+ * @see AppUriAuthenticationPolicy
+ */
+public class CredentialManagementAppAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
+
+    private static final int HEADER_VIEW = 1;
+
+    private final String mCredentialManagerPackage;
+    private final Map<String, Map<Uri, String>> mAppUriAuthentication;
+    private final List<String> mSortedAppNames;
+
+    private final Context mContext;
+    private final PackageManager mPackageManager;
+    private final RecyclerView.RecycledViewPool mViewPool;
+
+    private final boolean mIncludeHeader;
+    private final boolean mIncludeExpander;
+
+    /**
+     * View holder for the header in the request manage credentials screen.
+     */
+    public class HeaderViewHolder extends RecyclerView.ViewHolder {
+        private final ImageView mAppIconView;
+        private final TextView mTitleView;
+
+        public HeaderViewHolder(View view) {
+            super(view);
+            mAppIconView = view.findViewById(R.id.credential_management_app_icon);
+            mTitleView = view.findViewById(R.id.credential_management_app_title);
+        }
+
+        /**
+         * Bind the header view and add details on the requesting app's icon and name.
+         */
+        public void bindView() {
+            try {
+                ApplicationInfo applicationInfo =
+                        mPackageManager.getApplicationInfo(mCredentialManagerPackage, 0);
+                mAppIconView.setImageDrawable(mPackageManager.getApplicationIcon(applicationInfo));
+                mTitleView.setText(mContext.getString(R.string.request_manage_credentials_title,
+                        applicationInfo.loadLabel(mPackageManager)));
+            } catch (PackageManager.NameNotFoundException e) {
+                mAppIconView.setImageDrawable(null);
+                mTitleView.setText(mContext.getString(R.string.request_manage_credentials_title,
+                        mCredentialManagerPackage));
+            }
+        }
+    }
+
+    /**
+     * View holder for the authentication policy in the request manage credentials screen.
+     */
+    public class AppAuthenticationViewHolder extends RecyclerView.ViewHolder {
+        private final ImageView mAppIconView;
+        private final TextView mAppNameView;
+        private final TextView mNumberOfUrisView;
+        private final ImageView mExpanderIconView;
+        private final RecyclerView mChildRecyclerView;
+        private final List<String> mExpandedApps;
+
+        public AppAuthenticationViewHolder(View view) {
+            super(view);
+            mAppIconView = view.findViewById(R.id.app_icon);
+            mAppNameView = view.findViewById(R.id.app_name);
+            mNumberOfUrisView = view.findViewById(R.id.number_of_uris);
+            mExpanderIconView = view.findViewById(R.id.expand);
+            mChildRecyclerView = view.findViewById(R.id.uris);
+            mExpandedApps = new ArrayList<>();
+
+            mExpanderIconView.setOnClickListener(view1 -> {
+                final String appName = mSortedAppNames.get(getBindingAdapterPosition());
+                if (mExpandedApps.contains(appName)) {
+                    mExpandedApps.remove(appName);
+                } else {
+                    mExpandedApps.add(appName);
+                }
+                bindPolicyView(appName);
+            });
+        }
+
+        /**
+         * Bind the app's authentication policy view at the given position. Add details on the
+         * app's icon, name and list of URIs.
+         */
+        public void bindView(int position) {
+            final String appName = mSortedAppNames.get(position);
+            try {
+                ApplicationInfo applicationInfo = mPackageManager.getApplicationInfo(appName, 0);
+                mAppIconView.setImageDrawable(mPackageManager.getApplicationIcon(applicationInfo));
+                mAppNameView.setText(String.valueOf(applicationInfo.loadLabel(mPackageManager)));
+            } catch (PackageManager.NameNotFoundException e) {
+                mAppIconView.setImageDrawable(null);
+                mAppNameView.setText(appName);
+            }
+            bindPolicyView(appName);
+        }
+
+        private void bindPolicyView(String appName) {
+            if (mIncludeExpander) {
+                mExpanderIconView.setVisibility(View.VISIBLE);
+                if (mExpandedApps.contains(appName)) {
+                    mNumberOfUrisView.setVisibility(View.GONE);
+                    mExpanderIconView.setImageResource(R.drawable.ic_expand_less);
+                    bindChildView(mAppUriAuthentication.get(appName));
+                } else {
+                    mChildRecyclerView.setVisibility(View.GONE);
+                    mNumberOfUrisView.setVisibility(View.VISIBLE);
+                    mNumberOfUrisView.setText(
+                            getNumberOfUrlsText(mAppUriAuthentication.get(appName)));
+                    mExpanderIconView.setImageResource(
+                            com.android.internal.R.drawable.ic_expand_more);
+                }
+            } else {
+                mNumberOfUrisView.setVisibility(View.GONE);
+                mExpanderIconView.setVisibility(View.GONE);
+                bindChildView(mAppUriAuthentication.get(appName));
+            }
+        }
+
+        /**
+         * Bind the list of URIs for an app.
+         */
+        private void bindChildView(Map<Uri, String> urisToAliases) {
+            LinearLayoutManager layoutManager = new LinearLayoutManager(
+                    mChildRecyclerView.getContext(), RecyclerView.VERTICAL, false);
+            layoutManager.setInitialPrefetchItemCount(urisToAliases.size());
+            UriAuthenticationPolicyAdapter childItemAdapter =
+                    new UriAuthenticationPolicyAdapter(new ArrayList<>(urisToAliases.keySet()));
+            mChildRecyclerView.setLayoutManager(layoutManager);
+            mChildRecyclerView.setVisibility(View.VISIBLE);
+            mChildRecyclerView.setAdapter(childItemAdapter);
+            mChildRecyclerView.setRecycledViewPool(mViewPool);
+        }
+
+        private String getNumberOfUrlsText(Map<Uri, String> urisToAliases) {
+            String url = urisToAliases.size() > 1 ? " URLs" : " URL";
+            return urisToAliases.size() + url;
+        }
+    }
+
+    public CredentialManagementAppAdapter(Context context, String credentialManagerPackage,
+            Map<String, Map<Uri, String>> appUriAuthentication,
+            boolean includeHeader, boolean includeExpander) {
+        mContext = context;
+        mCredentialManagerPackage = credentialManagerPackage;
+        mPackageManager = context.getPackageManager();
+        mAppUriAuthentication = appUriAuthentication;
+        mSortedAppNames = sortPackageNames(mAppUriAuthentication);
+        mViewPool = new RecyclerView.RecycledViewPool();
+        mIncludeHeader = includeHeader;
+        mIncludeExpander = includeExpander;
+    }
+
+    /**
+     * Sort package names in the following order:
+     * - installed apps
+     * - alphabetically
+     */
+    private List<String> sortPackageNames(Map<String, Map<Uri, String>> authenticationPolicy) {
+        List<String> packageNames = new ArrayList<>(authenticationPolicy.keySet());
+        packageNames.sort((firstPackageName, secondPackageName) -> {
+            boolean isFirstPackageInstalled = isPackageInstalled(firstPackageName);
+            boolean isSecondPackageInstalled = isPackageInstalled(secondPackageName);
+            if (isFirstPackageInstalled == isSecondPackageInstalled) {
+                return firstPackageName.compareTo(secondPackageName);
+            } else if (isFirstPackageInstalled) {
+                return -1;
+            } else {
+                return 1;
+            }
+        });
+        return packageNames;
+    }
+
+    private boolean isPackageInstalled(String packageName) {
+        try {
+            mPackageManager.getPackageInfo(packageName, 0);
+            return true;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
+    @NonNull
+    @Override
+    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int viewType) {
+        View view;
+        if (viewType == HEADER_VIEW) {
+            view = LayoutInflater.from(viewGroup.getContext())
+                    .inflate(R.layout.request_manage_credentials_header, viewGroup, false);
+            view.setEnabled(false);
+            return new HeaderViewHolder(view);
+        } else {
+            view = LayoutInflater.from(viewGroup.getContext())
+                    .inflate(R.layout.app_authentication_item, viewGroup, false);
+            return new AppAuthenticationViewHolder(view);
+        }
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
+        if (viewHolder instanceof HeaderViewHolder) {
+            ((HeaderViewHolder) viewHolder).bindView();
+        } else if (viewHolder instanceof AppAuthenticationViewHolder) {
+            int position = mIncludeHeader ? i - 1 : i;
+            ((AppAuthenticationViewHolder) viewHolder).bindView(position);
+        }
+    }
+
+    @Override
+    public int getItemCount() {
+        // Add an extra view to show the header view
+        return mIncludeHeader ? mAppUriAuthentication.size() + 1 : mAppUriAuthentication.size();
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        if (mIncludeHeader && position == 0) {
+            return HEADER_VIEW;
+        }
+        return super.getItemViewType(position);
+    }
+
+}
diff --git a/src/com/android/settings/security/CredentialManagementAppButtonsController.java b/src/com/android/settings/security/CredentialManagementAppButtonsController.java
new file mode 100644
index 0000000..9efa098
--- /dev/null
+++ b/src/com/android/settings/security/CredentialManagementAppButtonsController.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2020 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 android.app.AppOpsManager;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.RemoteException;
+import android.security.IKeyChainService;
+import android.security.KeyChain;
+import android.util.Log;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.widget.ActionButtonsPreference;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Controller that shows the remove button of the credential management app, which allows the user
+ * to remove the credential management app and its certificates.
+ */
+public class CredentialManagementAppButtonsController extends BasePreferenceController {
+
+    private static final String TAG = "CredentialManagementApp";
+
+    private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+
+    private final PackageManager mPackageManager;
+    private final AppOpsManager mAppOpsManager;
+    private boolean mHasCredentialManagerPackage;
+    private String mCredentialManagerPackageName;
+
+    public CredentialManagementAppButtonsController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mPackageManager = context.getPackageManager();
+        mAppOpsManager = context.getSystemService(AppOpsManager.class);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE_UNSEARCHABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mExecutor.execute(() -> {
+            try {
+                IKeyChainService service = KeyChain.bind(mContext).getService();
+                mHasCredentialManagerPackage = service.hasCredentialManagementApp();
+                mCredentialManagerPackageName = service.getCredentialManagementAppPackageName();
+            } catch (InterruptedException | RemoteException e) {
+                Log.e(TAG, "Unable to display credential management app buttons");
+            }
+            mHandler.post(() -> displayButtons(screen));
+        });
+    }
+
+    private void displayButtons(PreferenceScreen screen) {
+        if (mHasCredentialManagerPackage) {
+            ((ActionButtonsPreference) screen.findPreference(getPreferenceKey()))
+                    .setButton1Text(R.string.remove_credential_management_app)
+                    .setButton1Icon(R.drawable.ic_undo_24)
+                    .setButton1OnClickListener(view -> removeCredentialManagementApp());
+        }
+    }
+
+    private void removeCredentialManagementApp() {
+        try {
+            ApplicationInfo appInfo = mPackageManager.getApplicationInfo(
+                    mCredentialManagerPackageName, 0);
+            mAppOpsManager.setMode(AppOpsManager.OP_MANAGE_CREDENTIALS,
+                    appInfo.uid, mCredentialManagerPackageName, AppOpsManager.MODE_DEFAULT);
+            mExecutor.execute(() -> {
+                try {
+                    IKeyChainService service = KeyChain.bind(mContext).getService();
+                    service.removeCredentialManagementApp();
+                } catch (InterruptedException | RemoteException e) {
+                    Log.e(TAG, "Unable to remove the credential management app");
+                }
+            });
+        } catch (PackageManager.NameNotFoundException e) {
+            Log.e(TAG, "Unable to remove the credential management app");
+        }
+    }
+}
diff --git a/src/com/android/settings/security/CredentialManagementAppFragment.java b/src/com/android/settings/security/CredentialManagementAppFragment.java
new file mode 100644
index 0000000..5544ee6
--- /dev/null
+++ b/src/com/android/settings/security/CredentialManagementAppFragment.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 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 android.app.settings.SettingsEnums;
+
+import com.android.settings.R;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.SearchIndexable;
+
+/**
+ * Settings fragment containing the credential management app. The credential management app has
+ * the ability to manage the user's credentials on unmanaged devices.
+ */
+@SearchIndexable
+public class CredentialManagementAppFragment extends DashboardFragment {
+
+    private static final String TAG = "CredentialManagementApp";
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.credential_management_app_fragment;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.CREDENTIAL_MANAGEMENT_APP;
+    }
+
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.credential_management_app_fragment);
+}
diff --git a/src/com/android/settings/security/CredentialManagementAppHeaderController.java b/src/com/android/settings/security/CredentialManagementAppHeaderController.java
new file mode 100644
index 0000000..975c49d
--- /dev/null
+++ b/src/com/android/settings/security/CredentialManagementAppHeaderController.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2020 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 android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.RemoteException;
+import android.security.IKeyChainService;
+import android.security.KeyChain;
+import android.util.Log;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.widget.LayoutPreference;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Controller that shows the header of the credential management app, which includes credential
+ * management app's name, icon and a description.
+ */
+public class CredentialManagementAppHeaderController extends BasePreferenceController {
+
+    private static final String TAG = "CredentialManagementApp";
+
+    private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+
+    public CredentialManagementAppHeaderController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        mPackageManager = context.getPackageManager();
+    }
+
+    private final PackageManager mPackageManager;
+    private boolean mHasCredentialManagerPackage;
+    private String mCredentialManagerPackageName;
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE_UNSEARCHABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        mExecutor.execute(() -> {
+            try {
+                IKeyChainService service = KeyChain.bind(mContext).getService();
+                mHasCredentialManagerPackage = service.hasCredentialManagementApp();
+                mCredentialManagerPackageName = service.getCredentialManagementAppPackageName();
+            } catch (InterruptedException | RemoteException e) {
+                Log.e(TAG, "Unable to display credential management app header");
+            }
+            mHandler.post(() -> displayHeader(screen));
+        });
+    }
+
+    private void displayHeader(PreferenceScreen screen) {
+        LayoutPreference headerPref = screen.findPreference(getPreferenceKey());
+        ImageView mAppIconView = headerPref.findViewById(R.id.entity_header_icon);
+        TextView mTitleView = headerPref.findViewById(R.id.entity_header_title);
+        TextView mDescriptionView = headerPref.findViewById(R.id.entity_header_summary);
+
+        try {
+            ApplicationInfo applicationInfo =
+                    mPackageManager.getApplicationInfo(mCredentialManagerPackageName, 0);
+            mAppIconView.setImageDrawable(mPackageManager.getApplicationIcon(applicationInfo));
+            mTitleView.setText(applicationInfo.loadLabel(mPackageManager));
+        } catch (PackageManager.NameNotFoundException e) {
+            mAppIconView.setImageDrawable(null);
+            mTitleView.setText(mCredentialManagerPackageName);
+        }
+        // TODO (b/165641221): The description should be multi-lined, which is currently a
+        // limitation of using Settings entity header. However, the Settings entity header
+        // should be used to be consistent with the rest of Settings.
+        mDescriptionView.setText(
+                mContext.getString(R.string.request_manage_credentials_description));
+    }
+}
diff --git a/src/com/android/settings/security/CredentialManagementAppPolicyController.java b/src/com/android/settings/security/CredentialManagementAppPolicyController.java
new file mode 100644
index 0000000..9561c5f
--- /dev/null
+++ b/src/com/android/settings/security/CredentialManagementAppPolicyController.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2020 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.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+
+import android.content.Context;
+
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * Controller that shows the credential management app's authentication policy.
+ */
+public class CredentialManagementAppPolicyController extends BasePreferenceController {
+
+    public CredentialManagementAppPolicyController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE_UNSEARCHABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+
+        PreferenceGroup group = screen.findPreference(getPreferenceKey());
+        group.addPreference(new CredentialManagementAppPolicyPreference(group.getContext()));
+    }
+}
diff --git a/src/com/android/settings/security/CredentialManagementAppPolicyPreference.java b/src/com/android/settings/security/CredentialManagementAppPolicyPreference.java
new file mode 100644
index 0000000..1747be3
--- /dev/null
+++ b/src/com/android/settings/security/CredentialManagementAppPolicyPreference.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2020 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 android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.RemoteException;
+import android.security.AppUriAuthenticationPolicy;
+import android.security.IKeyChainService;
+import android.security.KeyChain;
+import android.util.Log;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.R;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Preference that shows the credential management app's authentication policy.
+ */
+public class CredentialManagementAppPolicyPreference extends Preference {
+
+    private static final String TAG = "CredentialManagementApp";
+
+    private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+
+    private final Context mContext;
+
+    private boolean mHasCredentialManagerPackage;
+    private String mCredentialManagerPackageName;
+    private AppUriAuthenticationPolicy mCredentialManagerPolicy;
+
+    public CredentialManagementAppPolicyPreference(Context context) {
+        super(context);
+        setLayoutResource(R.layout.credential_management_app_policy);
+        mContext = context;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder view) {
+        super.onBindViewHolder(view);
+
+        mExecutor.execute(() -> {
+            try {
+                IKeyChainService service = KeyChain.bind(mContext).getService();
+                mHasCredentialManagerPackage = service.hasCredentialManagementApp();
+                mCredentialManagerPackageName = service.getCredentialManagementAppPackageName();
+                mCredentialManagerPolicy = service.getCredentialManagementAppPolicy();
+            } catch (InterruptedException | RemoteException e) {
+                Log.e(TAG, "Unable to display credential management app policy");
+            }
+            mHandler.post(() -> displayPolicy(view));
+        });
+    }
+
+    private void displayPolicy(PreferenceViewHolder view) {
+        if (mHasCredentialManagerPackage) {
+            RecyclerView recyclerView = (RecyclerView) view.findViewById(R.id.recycler_view);
+            recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
+
+            CredentialManagementAppAdapter recyclerViewAdapter = new CredentialManagementAppAdapter(
+                    mContext, mCredentialManagerPackageName,
+                    mCredentialManagerPolicy.getAppAndUriMappings(),
+                    /* include header= */ false, /* include expander= */ true);
+            recyclerView.setAdapter(recyclerViewAdapter);
+        }
+    }
+}
diff --git a/src/com/android/settings/security/CredentialManagementAppPreferenceController.java b/src/com/android/settings/security/CredentialManagementAppPreferenceController.java
new file mode 100644
index 0000000..107b8f2
--- /dev/null
+++ b/src/com/android/settings/security/CredentialManagementAppPreferenceController.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2020 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 android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.RemoteException;
+import android.security.IKeyChainService;
+import android.security.KeyChain;
+import android.util.Log;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Controller that shows and updates the credential management app summary.
+ */
+public class CredentialManagementAppPreferenceController extends BasePreferenceController {
+
+    private static final String TAG = "CredentialManagementApp";
+
+    private final ExecutorService mExecutor = Executors.newSingleThreadExecutor();
+    private final Handler mHandler = new Handler(Looper.getMainLooper());
+
+    private final PackageManager mPackageManager;
+    private boolean mHasCredentialManagerPackage;
+    private String mCredentialManagerPackageName;
+
+    public CredentialManagementAppPreferenceController(Context context, String key) {
+        super(context, key);
+        mPackageManager = context.getPackageManager();
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        mExecutor.execute(() -> {
+            try {
+                IKeyChainService service = KeyChain.bind(mContext).getService();
+                mHasCredentialManagerPackage = service.hasCredentialManagementApp();
+                mCredentialManagerPackageName = service.getCredentialManagementAppPackageName();
+            } catch (InterruptedException | RemoteException e) {
+                Log.e(TAG, "Unable to display credential management app preference");
+            }
+            mHandler.post(() -> displayPreference(preference));
+        });
+    }
+
+    private void displayPreference(Preference preference) {
+        if (mHasCredentialManagerPackage) {
+            preference.setEnabled(true);
+            try {
+                ApplicationInfo applicationInfo =
+                        mPackageManager.getApplicationInfo(mCredentialManagerPackageName, 0);
+                preference.setSummary(applicationInfo.loadLabel(mPackageManager));
+            } catch (PackageManager.NameNotFoundException e) {
+                preference.setSummary(mCredentialManagerPackageName);
+            }
+        } else {
+            preference.setEnabled(false);
+            preference.setSummary(R.string.no_certificate_management_app);
+        }
+    }
+}
diff --git a/src/com/android/settings/security/CredentialStorage.java b/src/com/android/settings/security/CredentialStorage.java
index 5e64723..2e3e2ed 100644
--- a/src/com/android/settings/security/CredentialStorage.java
+++ b/src/com/android/settings/security/CredentialStorage.java
@@ -357,9 +357,11 @@
      */
     private boolean confirmKeyGuard(int requestCode) {
         final Resources res = getResources();
-        return new ChooseLockSettingsHelper(this)
-                .launchConfirmationActivity(requestCode,
-                        res.getText(R.string.credentials_title), true);
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(this);
+        return builder.setRequestCode(requestCode)
+                .setTitle(res.getText(R.string.credentials_title))
+                .show();
     }
 
     @Override
diff --git a/src/com/android/settings/security/CredentialStoragePreferenceController.java b/src/com/android/settings/security/CredentialStoragePreferenceController.java
deleted file mode 100644
index 060d964..0000000
--- a/src/com/android/settings/security/CredentialStoragePreferenceController.java
+++ /dev/null
@@ -1,49 +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.security;
-
-import android.content.Context;
-import android.os.UserManager;
-import android.security.KeyStore;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-
-public class CredentialStoragePreferenceController extends
-        RestrictedEncryptionPreferenceController {
-
-    private static final String KEY_CREDENTIAL_STORAGE_TYPE = "credential_storage_type";
-    private final KeyStore mKeyStore;
-
-    public CredentialStoragePreferenceController(Context context) {
-        super(context, UserManager.DISALLOW_CONFIG_CREDENTIALS);
-        mKeyStore = KeyStore.getInstance();
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_CREDENTIAL_STORAGE_TYPE;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        preference.setSummary(mKeyStore.isHardwareBacked()
-                ? R.string.credential_storage_type_hardware
-                : R.string.credential_storage_type_software);
-    }
-}
diff --git a/src/com/android/settings/security/CryptKeeperSettings.java b/src/com/android/settings/security/CryptKeeperSettings.java
index aa47b2b..4fc17fb 100644
--- a/src/com/android/settings/security/CryptKeeperSettings.java
+++ b/src/com/android/settings/security/CryptKeeperSettings.java
@@ -37,6 +37,7 @@
 import androidx.appcompat.app.AlertDialog;
 import androidx.preference.Preference;
 
+import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockscreenCredential;
 import com.android.settings.CryptKeeperConfirm;
 import com.android.settings.R;
@@ -169,17 +170,20 @@
      * @return true if confirmation launched
      */
     private boolean runKeyguardConfirmation(int request) {
-        Resources res = getActivity().getResources();
-        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(getActivity(), this);
-
-        if (helper.utils().getKeyguardStoredPasswordQuality(UserHandle.myUserId())
+        final LockPatternUtils utils = new LockPatternUtils(getActivity());
+        if (utils.getKeyguardStoredPasswordQuality(UserHandle.myUserId())
                 == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
             showFinalConfirmation(StorageManager.CRYPT_TYPE_DEFAULT, "".getBytes());
             return true;
         }
 
-        return helper.launchConfirmationActivity(request,
-                res.getText(R.string.crypt_keeper_encrypt_title), true);
+        final Resources res = getActivity().getResources();
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(getActivity(), this);
+        return builder.setRequestCode(request)
+                .setTitle(res.getText(R.string.crypt_keeper_encrypt_title))
+                .setReturnCredentials(true)
+                .show();
     }
 
     @Override
diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java
index d873271..5362ad0 100644
--- a/src/com/android/settings/security/EncryptionAndCredential.java
+++ b/src/com/android/settings/security/EncryptionAndCredential.java
@@ -72,7 +72,6 @@
         controllers.add(new PreferenceCategoryController(context,
                 "encryption_and_credentials_status_category").setChildren(
                 Arrays.asList(encryptStatusController)));
-        controllers.add(new CredentialStoragePreferenceController(context));
         controllers.add(new UserCredentialsPreferenceController(context));
         controllers.add(new ResetCredentialsPreferenceController(context, lifecycle));
         controllers.add(new InstallCertificatePreferenceController(context));
diff --git a/src/com/android/settings/security/LockUnificationPreferenceController.java b/src/com/android/settings/security/LockUnificationPreferenceController.java
index 9cacf8e..e47180e 100644
--- a/src/com/android/settings/security/LockUnificationPreferenceController.java
+++ b/src/com/android/settings/security/LockUnificationPreferenceController.java
@@ -118,11 +118,15 @@
             startUnification();
         } else {
             final String title = mContext.getString(R.string.unlock_set_unlock_launch_picker_title);
-            final ChooseLockSettingsHelper helper =
-                    new ChooseLockSettingsHelper(mHost.getActivity(), mHost);
-            if (!helper.launchConfirmationActivity(
-                    UNUNIFY_LOCK_CONFIRM_DEVICE_REQUEST,
-                    title, true /* returnCredentials */, MY_USER_ID)) {
+            final ChooseLockSettingsHelper.Builder builder =
+                    new ChooseLockSettingsHelper.Builder(mHost.getActivity(), mHost);
+            final boolean launched = builder.setRequestCode(UNUNIFY_LOCK_CONFIRM_DEVICE_REQUEST)
+                    .setTitle(title)
+                    .setReturnCredentials(true)
+                    .setUserId(MY_USER_ID)
+                    .show();
+
+            if (!launched) {
                 ununifyLocks();
             }
         }
@@ -176,10 +180,14 @@
         // Confirm profile lock
         final String title = mContext.getString(
                 R.string.unlock_set_unlock_launch_picker_title_profile);
-        final ChooseLockSettingsHelper helper =
-                new ChooseLockSettingsHelper(mHost.getActivity(), mHost);
-        if (!helper.launchConfirmationActivity(
-                UNIFY_LOCK_CONFIRM_PROFILE_REQUEST, title, true, mProfileUserId)) {
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(mHost.getActivity(), mHost);
+        final boolean launched = builder.setRequestCode(UNIFY_LOCK_CONFIRM_PROFILE_REQUEST)
+                .setTitle(title)
+                .setReturnCredentials(true)
+                .setUserId(mProfileUserId)
+                .show();
+        if (!launched) {
             // If profile has no lock, go straight to unification.
             unifyLocks();
             // TODO: update relevant prefs.
diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java
index 3352991..39355f3 100644
--- a/src/com/android/settings/security/LockscreenDashboardFragment.java
+++ b/src/com/android/settings/security/LockscreenDashboardFragment.java
@@ -88,9 +88,7 @@
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        use(AmbientDisplayAlwaysOnPreferenceController.class)
-                .setConfig(getConfig(context))
-                .setCallback(this::updatePreferenceStates);
+        use(AmbientDisplayAlwaysOnPreferenceController.class).setConfig(getConfig(context));
         use(AmbientDisplayNotificationsPreferenceController.class).setConfig(getConfig(context));
         use(DoubleTapScreenPreferenceController.class).setConfig(getConfig(context));
         use(PickupGesturePreferenceController.class).setConfig(getConfig(context));
diff --git a/src/com/android/settings/security/RequestManageCredentials.java b/src/com/android/settings/security/RequestManageCredentials.java
new file mode 100644
index 0000000..56fa83d
--- /dev/null
+++ b/src/com/android/settings/security/RequestManageCredentials.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright (C) 2020 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 android.annotation.Nullable;
+import android.app.Activity;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.pm.UserInfo;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Process;
+import android.os.RemoteException;
+import android.os.UserManager;
+import android.security.AppUriAuthenticationPolicy;
+import android.security.Credentials;
+import android.security.KeyChain;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.R;
+
+import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
+
+/**
+ * Displays a full screen to the user asking whether the calling app can manage the user's
+ * KeyChain credentials. This screen includes the authentication policy highlighting what apps and
+ * URLs the calling app can authenticate the user to.
+ * <p>
+ * Users can allow or deny the calling app. If denied, the calling app may re-request this
+ * capability. If allowed, the calling app will become the credential management app and will be
+ * able to manage the user's KeyChain credentials. The following APIs can be called to manage
+ * KeyChain credentials:
+ * {@link DevicePolicyManager#installKeyPair}
+ * {@link DevicePolicyManager#removeKeyPair}
+ * {@link DevicePolicyManager#generateKeyPair}
+ * {@link DevicePolicyManager#setKeyPairCertificate}
+ * <p>
+ *
+ * @see AppUriAuthenticationPolicy
+ */
+public class RequestManageCredentials extends Activity {
+
+    private static final String TAG = "ManageCredentials";
+
+    private String mCredentialManagerPackage;
+    private AppUriAuthenticationPolicy mAuthenticationPolicy;
+
+    private RecyclerView mRecyclerView;
+    private LinearLayoutManager mLayoutManager;
+    private LinearLayout mButtonPanel;
+    private ExtendedFloatingActionButton mExtendedFab;
+
+    private HandlerThread mKeyChainTread;
+    private KeyChain.KeyChainConnection mKeyChainConnection;
+
+    private boolean mDisplayingButtonPanel = false;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (!Credentials.ACTION_MANAGE_CREDENTIALS.equals(getIntent().getAction())) {
+            Log.e(TAG, "Unable to start activity because intent action is not "
+                    + Credentials.ACTION_MANAGE_CREDENTIALS);
+            finishWithResultCancelled();
+            return;
+        }
+        if (isManagedDevice()) {
+            Log.e(TAG, "Credential management on managed devices should be done by the Device "
+                    + "Policy Controller, not a credential management app");
+            finishWithResultCancelled();
+            return;
+        }
+        mCredentialManagerPackage = getLaunchedFromPackage();
+        if (TextUtils.isEmpty(mCredentialManagerPackage)) {
+            Log.e(TAG, "Unknown credential manager app");
+            finishWithResultCancelled();
+            return;
+        }
+        setContentView(R.layout.request_manage_credentials);
+
+        mKeyChainTread = new HandlerThread("KeyChainConnection");
+        mKeyChainTread.start();
+        mKeyChainConnection = getKeyChainConnection(this, mKeyChainTread);
+
+        AppUriAuthenticationPolicy policy =
+                getIntent().getParcelableExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY);
+        if (!isValidAuthenticationPolicy(policy)) {
+            Log.e(TAG, "Invalid authentication policy");
+            finishWithResultCancelled();
+            return;
+        }
+        mAuthenticationPolicy = policy;
+
+        loadRecyclerView();
+        loadButtons();
+        loadExtendedFloatingActionButton();
+        addOnScrollListener();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mKeyChainConnection != null) {
+            mKeyChainConnection.close();
+            mKeyChainConnection = null;
+            mKeyChainTread.quitSafely();
+        }
+    }
+
+    private boolean isValidAuthenticationPolicy(AppUriAuthenticationPolicy policy) {
+        if (policy == null || policy.getAppAndUriMappings().isEmpty()) {
+            return false;
+        }
+        try {
+            // Check whether any of the aliases in the policy already exist
+            for (String alias : policy.getAliases()) {
+                if (mKeyChainConnection.getService().requestPrivateKey(alias) != null) {
+                    return false;
+                }
+            }
+        } catch (RemoteException e) {
+            Log.e(TAG, "Invalid authentication policy", e);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean isManagedDevice() {
+        DevicePolicyManager dpm = getSystemService(DevicePolicyManager.class);
+
+        return dpm.getDeviceOwnerUser() != null
+                || dpm.getProfileOwner() != null
+                || hasManagedProfile();
+    }
+
+    private boolean hasManagedProfile() {
+        UserManager um = getSystemService(UserManager.class);
+        for (final UserInfo userInfo : um.getProfiles(getUserId())) {
+            if (userInfo.isManagedProfile()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void loadRecyclerView() {
+        mLayoutManager = new LinearLayoutManager(this);
+        mRecyclerView = findViewById(R.id.apps_list);
+        mRecyclerView.setLayoutManager(mLayoutManager);
+
+        CredentialManagementAppAdapter recyclerViewAdapter = new CredentialManagementAppAdapter(
+                this, mCredentialManagerPackage, mAuthenticationPolicy.getAppAndUriMappings(),
+                /* include header= */ true, /* include expander= */ false);
+        mRecyclerView.setAdapter(recyclerViewAdapter);
+    }
+
+    private void loadButtons() {
+        mButtonPanel = findViewById(R.id.button_panel);
+        Button dontAllowButton = findViewById(R.id.dont_allow_button);
+        Button allowButton = findViewById(R.id.allow_button);
+
+        dontAllowButton.setOnClickListener(b -> {
+            finishWithResultCancelled();
+        });
+        allowButton.setOnClickListener(b -> setOrUpdateCredentialManagementApp());
+    }
+
+    private void loadExtendedFloatingActionButton() {
+        mExtendedFab = findViewById(R.id.extended_fab);
+        mExtendedFab.setOnClickListener(v -> {
+            mRecyclerView.scrollToPosition(mAuthenticationPolicy.getAppAndUriMappings().size());
+            mExtendedFab.hide();
+            showButtonPanel();
+        });
+    }
+
+    private void setOrUpdateCredentialManagementApp() {
+        try {
+            mKeyChainConnection.getService().setCredentialManagementApp(
+                    mCredentialManagerPackage, mAuthenticationPolicy);
+        } catch (RemoteException e) {
+            Log.e(TAG, "Unable to set credential manager app", e);
+        }
+        finish();
+    }
+
+    @VisibleForTesting
+    KeyChain.KeyChainConnection getKeyChainConnection(Context context, HandlerThread thread) {
+        final Handler handler = new Handler(thread.getLooper());
+        try {
+            KeyChain.KeyChainConnection connection = KeyChain.bindAsUser(
+                    context, handler, Process.myUserHandle());
+            return connection;
+        } catch (InterruptedException e) {
+            throw new RuntimeException("Faile to bind to KeyChain", e);
+        }
+    }
+
+    private void addOnScrollListener() {
+        mRecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                super.onScrolled(recyclerView, dx, dy);
+                if (!mDisplayingButtonPanel) {
+                    // On down scroll, hide text in floating action button by setting
+                    // extended to false.
+                    if (dy > 0 && mExtendedFab.getVisibility() == View.VISIBLE) {
+                        mExtendedFab.setExtended(false);
+                    }
+                    if (isRecyclerScrollable()) {
+                        mExtendedFab.show();
+                        hideButtonPanel();
+                    } else {
+                        mExtendedFab.hide();
+                        showButtonPanel();
+                    }
+                }
+            }
+        });
+    }
+
+    private void showButtonPanel() {
+        // Add padding to remove overlap between recycler view and button panel.
+        int padding_in_px = (int) (60 * getResources().getDisplayMetrics().density + 0.5f);
+        mRecyclerView.setPadding(0, 0, 0, padding_in_px);
+        mButtonPanel.setVisibility(View.VISIBLE);
+        mDisplayingButtonPanel = true;
+    }
+
+    private void hideButtonPanel() {
+        mRecyclerView.setPadding(0, 0, 0, 0);
+        mButtonPanel.setVisibility(View.GONE);
+    }
+
+    private boolean isRecyclerScrollable() {
+        if (mLayoutManager == null || mRecyclerView.getAdapter() == null) {
+            return false;
+        }
+        return mLayoutManager.findLastCompletelyVisibleItemPosition()
+                < mRecyclerView.getAdapter().getItemCount() - 1;
+    }
+
+    private void finishWithResultCancelled() {
+        setResult(RESULT_CANCELED);
+        finish();
+    }
+}
diff --git a/src/com/android/settings/security/ScreenPinningSettings.java b/src/com/android/settings/security/ScreenPinningSettings.java
index c532366..1e620cf 100644
--- a/src/com/android/settings/security/ScreenPinningSettings.java
+++ b/src/com/android/settings/security/ScreenPinningSettings.java
@@ -186,7 +186,7 @@
     }
 
     /**
-     * Listens to the state change of the lock-to-app master switch.
+     * Listens to the state change of the overall lock-to-app switch.
      */
     @Override
     public void onSwitchChanged(Switch switchView, boolean isChecked) {
diff --git a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
index 4a4d345..4efc620 100644
--- a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
+++ b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java
@@ -19,10 +19,12 @@
 import android.content.Context;
 import android.hardware.face.FaceManager;
 import android.hardware.fingerprint.FingerprintManager;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.FeatureFlags;
 
 public class TopLevelSecurityEntryPreferenceController extends BasePreferenceController {
 
@@ -37,6 +39,11 @@
 
     @Override
     public CharSequence getSummary() {
+        // Remove homepage summaries for silky home.
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            return null;
+        }
+
         final FingerprintManager fpm =
                 Utils.getFingerprintManagerOrNull(mContext);
         final FaceManager faceManager =
diff --git a/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java b/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java
new file mode 100644
index 0000000..8aeb074
--- /dev/null
+++ b/src/com/android/settings/security/UriAuthenticationPolicyAdapter.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2020 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 android.net.Uri;
+import android.security.AppUriAuthenticationPolicy;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.R;
+
+import java.util.List;
+
+/**
+ * Child adapter for the requesting credential management app. This adapter displays the list of
+ * URIs for each app in the requesting app's authentication policy, when
+ * {@link RequestManageCredentials} is started.
+ *
+ * @hide
+ * @see CredentialManagementAppAdapter
+ * @see RequestManageCredentials
+ * @see AppUriAuthenticationPolicy
+ */
+public class UriAuthenticationPolicyAdapter extends
+        RecyclerView.Adapter<UriAuthenticationPolicyAdapter.UriViewHolder> {
+
+    private final List<Uri> mUris;
+
+    /**
+     * View holder for each URI which is part of the authentication policy in the
+     * request manage credentials screen.
+     */
+    public class UriViewHolder extends RecyclerView.ViewHolder {
+        TextView mUriNameView;
+
+        public UriViewHolder(@NonNull View view) {
+            super(view);
+            mUriNameView = itemView.findViewById(R.id.uri_name);
+        }
+    }
+
+    UriAuthenticationPolicyAdapter(List<Uri> uris) {
+        this.mUris = uris;
+    }
+
+    @Override
+    public UriAuthenticationPolicyAdapter.UriViewHolder onCreateViewHolder(ViewGroup parent,
+            int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(
+                R.layout.app_authentication_uri_item, parent, false);
+        return new UriViewHolder(view);
+    }
+
+    @Override
+    public void onBindViewHolder(UriAuthenticationPolicyAdapter.UriViewHolder holder,
+            int position) {
+        Uri uri = mUris.get(position);
+        holder.mUriNameView.setText(uri.toString());
+    }
+
+    @Override
+    public int getItemCount() {
+        return mUris.size();
+    }
+}
diff --git a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
index 999c945..abeef2d 100644
--- a/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/LockAfterTimeoutPreferenceController.java
@@ -112,7 +112,7 @@
                     mDPM.getMaximumTimeToLock(null /* admin */, UserHandle.myUserId());
             final long displayTimeout = Math.max(0,
                     Settings.System.getInt(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, 0));
-            // This setting is a slave to display timeout when a device policy is enforced.
+            // This setting is a secondary to display timeout when a device policy is enforced.
             // As such, maxLockTimeout = adminTimeout - displayTimeout.
             // If there isn't enough time, shows "immediately" setting.
             final long maxTimeout = Math.max(0, adminTimeout - displayTimeout);
diff --git a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
index ffd0183..d3c10b0 100644
--- a/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
+++ b/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceController.java
@@ -78,7 +78,7 @@
                     R.string.lockpattern_settings_power_button_instantly_locks_summary,
                     trustAgentLabel));
         } else {
-            preference.setSummary(R.string.summary_placeholder);
+            preference.setSummary(R.string.summary_empty);
         }
     }
 
diff --git a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
index 19e25fc..5e624cc 100644
--- a/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
+++ b/src/com/android/settings/security/trustagent/TrustAgentListPreferenceController.java
@@ -120,11 +120,14 @@
         if (!mTrustAgentsKeyList.contains(preference.getKey())) {
             return super.handlePreferenceTreeClick(preference);
         }
-        final ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(
-                mHost.getActivity(), mHost);
+
+        final ChooseLockSettingsHelper.Builder builder =
+                new ChooseLockSettingsHelper.Builder(mHost.getActivity(), mHost);
+        final boolean confirmationLaunched = builder.setRequestCode(CHANGE_TRUST_AGENT_SETTINGS)
+                .setTitle(preference.getTitle())
+                .show();
+
         mTrustAgentClickIntent = preference.getIntent();
-        boolean confirmationLaunched = helper.launchConfirmationActivity(
-                CHANGE_TRUST_AGENT_SETTINGS, preference.getTitle());
 
         if (!confirmationLaunched && mTrustAgentClickIntent != null) {
             // If this returns false, it means no password confirmation is required.
diff --git a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
index 4843736..c0f7e1f 100644
--- a/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
+++ b/src/com/android/settings/shortcut/CreateShortcutPreferenceController.java
@@ -32,7 +32,6 @@
 import android.graphics.drawable.Icon;
 import android.graphics.drawable.LayerDrawable;
 import android.net.ConnectivityManager;
-import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.view.ContextThemeWrapper;
 import android.view.LayoutInflater;
@@ -46,8 +45,6 @@
 
 import com.android.settings.R;
 import com.android.settings.Settings.TetherSettingsActivity;
-import com.android.settings.Settings.WifiSettings2Activity;
-import com.android.settings.Settings.WifiSettingsActivity;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
@@ -190,15 +187,6 @@
                 Log.d(TAG, "Skipping non-system app: " + info.activityInfo);
                 continue;
             }
-            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-                if (info.activityInfo.name.endsWith(WifiSettingsActivity.class.getSimpleName())) {
-                    continue;
-                }
-            } else {
-                if (info.activityInfo.name.endsWith(WifiSettings2Activity.class.getSimpleName())) {
-                    continue;
-                }
-            }
             shortcuts.add(info);
         }
         Collections.sort(shortcuts, SHORTCUT_COMPARATOR);
diff --git a/src/com/android/settings/sim/OWNERS b/src/com/android/settings/sim/OWNERS
index bedbe16..e6569f4 100644
--- a/src/com/android/settings/sim/OWNERS
+++ b/src/com/android/settings/sim/OWNERS
@@ -1,6 +1,7 @@
 # Default reviewers for this and subdirectories.
 andychou@google.com
 bonianchen@google.com
+goldmanj@google.com
 allenwtsu@google.com
 
 # Emergency approvers in case the above are not available
diff --git a/src/com/android/settings/sim/SimActivationNotifier.java b/src/com/android/settings/sim/SimActivationNotifier.java
new file mode 100644
index 0000000..85d3da2
--- /dev/null
+++ b/src/com/android/settings/sim/SimActivationNotifier.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2020 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.sim;
+
+import static android.content.Context.MODE_PRIVATE;
+
+import android.annotation.IntDef;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.core.app.TaskStackBuilder;
+
+import com.android.settings.R;
+import com.android.settings.Settings;
+import com.android.settings.network.SubscriptionUtil;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * This class manages the notification of SIM activation notification including creating and
+ * canceling the notifications.
+ */
+public class SimActivationNotifier {
+
+    private static final String TAG = "SimActivationNotifier";
+    private static final String SIM_SETUP_CHANNEL_ID = "sim_setup";
+    private static final String SIM_PREFS = "sim_prefs";
+    private static final String KEY_SHOW_SIM_SETTINGS_NOTIFICATION =
+            "show_sim_settings_notification";
+
+    public static final int SIM_ACTIVATION_NOTIFICATION_ID = 1;
+
+    /** Notification types */
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef(
+            value = {
+                NotificationType.NETWORK_CONFIG,
+            })
+    public @interface NotificationType {
+        // The notification to remind users to config network Settings.
+        int NETWORK_CONFIG = 1;
+    }
+
+    private final Context mContext;
+    private final NotificationManager mNotificationManager;
+
+    public SimActivationNotifier(Context context) {
+        mContext = context;
+        mNotificationManager = context.getSystemService(NotificationManager.class);
+        mNotificationManager.createNotificationChannel(
+                new NotificationChannel(
+                        SIM_SETUP_CHANNEL_ID,
+                        mContext.getString(R.string.sim_setup_channel_id),
+                        NotificationManager.IMPORTANCE_HIGH));
+    }
+
+    /**
+     * Sets whether Settings should send a push notification for the SIM activation.
+     *
+     * @param context
+     * @param showNotification whether Settings should send a push notification for the SIM
+     *     activation.
+     */
+    public static void setShowSimSettingsNotification(Context context, boolean showNotification) {
+        final SharedPreferences prefs = context.getSharedPreferences(SIM_PREFS, MODE_PRIVATE);
+        prefs.edit().putBoolean(KEY_SHOW_SIM_SETTINGS_NOTIFICATION, showNotification).apply();
+    }
+
+    /**
+     * Gets whether Settings should send a push notification for the SIM activation.
+     *
+     * @param context
+     * @return true if Settings should send a push notification for SIM activation. Otherwise,
+     *     return false.
+     */
+    public static boolean getShowSimSettingsNotification(Context context) {
+        final SharedPreferences prefs = context.getSharedPreferences(SIM_PREFS, MODE_PRIVATE);
+        return prefs.getBoolean(KEY_SHOW_SIM_SETTINGS_NOTIFICATION, false);
+    }
+
+    /** Sends a push notification for the SIM activation. It should be called after DSDS reboot. */
+    public void sendNetworkConfigNotification() {
+        SubscriptionManager subscriptionManager =
+                mContext.getSystemService(SubscriptionManager.class);
+        SubscriptionInfo activeRemovableSub =
+                SubscriptionUtil.getActiveSubscriptions(subscriptionManager).stream()
+                        .filter(sub -> !sub.isEmbedded())
+                        .findFirst()
+                        .orElse(null);
+
+        if (activeRemovableSub == null) {
+            Log.e(TAG, "No removable subscriptions found. Do not show notification.");
+            return;
+        }
+
+        String carrierName =
+                TextUtils.isEmpty(activeRemovableSub.getDisplayName())
+                        ? mContext.getString(R.string.sim_card_label)
+                        : activeRemovableSub.getDisplayName().toString();
+        String title =
+                mContext.getString(
+                        R.string.post_dsds_reboot_notification_title_with_carrier, carrierName);
+        String text = mContext.getString(R.string.post_dsds_reboot_notification_text);
+        Intent clickIntent = new Intent(mContext, Settings.MobileNetworkListActivity.class);
+        TaskStackBuilder stackBuilder =
+                TaskStackBuilder.create(mContext).addNextIntent(clickIntent);
+        PendingIntent contentIntent =
+                stackBuilder.getPendingIntent(
+                        0 /* requestCode */, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        Notification.Builder builder =
+                new Notification.Builder(mContext, SIM_SETUP_CHANNEL_ID)
+                        .setContentTitle(title)
+                        .setContentText(text)
+                        .setContentIntent(contentIntent)
+                        .setSmallIcon(R.drawable.ic_sim_alert)
+                        .setAutoCancel(true);
+        mNotificationManager.notify(SIM_ACTIVATION_NOTIFICATION_ID, builder.build());
+    }
+}
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 0ae294e..252b6c0 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -19,7 +19,6 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.telephony.SubscriptionManager;
@@ -54,6 +53,8 @@
     public static final int PREFERRED_PICK = 3;
     // Show the "select SMS subscription" dialog, but don't save as default, just return a result
     public static final int SMS_PICK_FOR_MESSAGE = 4;
+    // Dismiss the current dialog and finish the activity.
+    public static final int PICK_DISMISS = 5;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -70,6 +71,12 @@
 
     private void showOrUpdateDialog() {
         final int dialogType = getIntent().getIntExtra(DIALOG_TYPE_KEY, INVALID_PICK);
+
+        if (dialogType == PICK_DISMISS) {
+            finishAndRemoveTask();
+            return;
+        }
+
         final String tag = Integer.toString(dialogType);
         final FragmentManager fragmentManager = getSupportFragmentManager();
         SimDialogFragment fragment = (SimDialogFragment) fragmentManager.findFragmentByTag(tag);
diff --git a/src/com/android/settings/sim/SimNotificationService.java b/src/com/android/settings/sim/SimNotificationService.java
new file mode 100644
index 0000000..303c21d
--- /dev/null
+++ b/src/com/android/settings/sim/SimNotificationService.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2020 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.sim;
+
+import android.app.job.JobInfo;
+import android.app.job.JobParameters;
+import android.app.job.JobScheduler;
+import android.app.job.JobService;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.util.Log;
+
+import com.android.settings.R;
+
+/** A JobService sends SIM notifications. */
+public class SimNotificationService extends JobService {
+
+    private static final String TAG = "SimNotificationService";
+    private static final String EXTRA_NOTIFICATION_TYPE = "notification_type";
+
+    /**
+     * Schedules a service to send SIM push notifications.
+     * @param context
+     * @param notificationType indicates which SIM notification to send.
+     */
+    public static void scheduleSimNotification(
+            Context context, @SimActivationNotifier.NotificationType int notificationType) {
+        final JobScheduler jobScheduler =
+                context.getApplicationContext().getSystemService(JobScheduler.class);
+        final ComponentName component =
+                new ComponentName(context.getApplicationContext(), SimNotificationService.class);
+        PersistableBundle extra = new PersistableBundle();
+        extra.putInt(EXTRA_NOTIFICATION_TYPE, notificationType);
+
+        jobScheduler.schedule(
+                new JobInfo.Builder(R.integer.sim_notification_send, component)
+                        .setExtras(extra)
+                        .build());
+    }
+
+    @Override
+    public boolean onStartJob(JobParameters params) {
+        PersistableBundle extra = params.getExtras();
+        if (extra == null) {
+            Log.e(TAG, "Failed to get notification type.");
+            return false;
+        }
+        int notificationType = extra.getInt(EXTRA_NOTIFICATION_TYPE);
+        switch (notificationType) {
+            case SimActivationNotifier.NotificationType.NETWORK_CONFIG:
+                Log.i(TAG, "Sending SIM config notification.");
+                SimActivationNotifier.setShowSimSettingsNotification(this, false);
+                new SimActivationNotifier(this).sendNetworkConfigNotification();
+                break;
+            default:
+                Log.e(TAG, "Invalid notification type: " + notificationType);
+                break;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onStopJob(JobParameters params) {
+        return false;
+    }
+}
diff --git a/src/com/android/settings/sim/SimSelectNotification.java b/src/com/android/settings/sim/SimSelectNotification.java
index ae36f35..8d5a3e0 100644
--- a/src/com/android/settings/sim/SimSelectNotification.java
+++ b/src/com/android/settings/sim/SimSelectNotification.java
@@ -23,6 +23,7 @@
 import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE;
 import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_ALL;
 import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA;
+import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DISMISS;
 import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_NONE;
 import static android.telephony.TelephonyManager.EXTRA_SIM_COMBINATION_NAMES;
 import static android.telephony.TelephonyManager.EXTRA_SIM_COMBINATION_WARNING_TYPE;
@@ -31,6 +32,9 @@
 import static android.telephony.TelephonyManager.EXTRA_SUBSCRIPTION_ID;
 import static android.telephony.data.ApnSetting.TYPE_MMS;
 
+import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
+import static com.android.settings.sim.SimDialogActivity.PICK_DISMISS;
+
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -50,7 +54,6 @@
 import com.android.settings.R;
 import com.android.settings.network.SubscriptionUtil;
 import com.android.settings.network.telephony.MobileNetworkActivity;
-import com.android.settingslib.HelpUtils;
 
 public class SimSelectNotification extends BroadcastReceiver {
     private static final String TAG = "SimSelectNotification";
@@ -158,6 +161,16 @@
 
         // Cancel any previous notifications
         cancelSimSelectNotification(context);
+
+        // If the dialog type is to dismiss.
+        if (dialogType == EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DISMISS) {
+            Intent newIntent = new Intent(context, SimDialogActivity.class);
+            newIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            newIntent.putExtra(SimDialogActivity.DIALOG_TYPE_KEY, PICK_DISMISS);
+            context.startActivity(newIntent);
+            return;
+        }
+
         // Create a notification to tell the user that some defaults are missing
         createSimSelectNotification(context);
 
@@ -185,10 +198,11 @@
         final int warningType = intent.getIntExtra(EXTRA_SIM_COMBINATION_WARNING_TYPE,
                 EXTRA_SIM_COMBINATION_WARNING_TYPE_NONE);
 
+        // Cancel any previous notifications
+        cancelSimCombinationWarningNotification(context);
+
         if (warningType == EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA) {
-            // Cancel any previous notifications
-            cancelSimCombinationWarningNotification(context);
-            // Create a notification to tell the user that some defaults are missing
+            // Create a notification to tell the user that there's a sim combination warning.
             createSimCombinationWarningNotification(context, intent);
         }
     }
@@ -209,6 +223,7 @@
                 .setContentText(resources.getText(R.string.sim_notification_summary))
                 .setAutoCancel(true);
         Intent resultIntent = new Intent(Settings.ACTION_WIRELESS_SETTINGS);
+        resultIntent.setPackage(SETTINGS_PACKAGE_NAME);
         resultIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         PendingIntent resultPendingIntent = PendingIntent.getActivity(context, 0, resultIntent,
                 PendingIntent.FLAG_CANCEL_CURRENT);
diff --git a/src/com/android/settings/sim/receivers/SimCompleteBootReceiver.java b/src/com/android/settings/sim/receivers/SimCompleteBootReceiver.java
new file mode 100644
index 0000000..e9acf94
--- /dev/null
+++ b/src/com/android/settings/sim/receivers/SimCompleteBootReceiver.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2020 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.sim.receivers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+import com.android.settings.sim.SimActivationNotifier;
+import com.android.settings.sim.SimNotificationService;
+
+/** This class manage all SIM operations after device boot up. */
+public class SimCompleteBootReceiver extends BroadcastReceiver {
+    private static final String TAG = "SimCompleteBootReceiver";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (!Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+            Log.e(TAG, "Invalid broadcast received.");
+            return;
+        }
+        if (SimActivationNotifier.getShowSimSettingsNotification(context)) {
+            SimNotificationService.scheduleSimNotification(
+                    context, SimActivationNotifier.NotificationType.NETWORK_CONFIG);
+        }
+    }
+}
diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
new file mode 100644
index 0000000..814f1a4
--- /dev/null
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2020 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.sim.receivers;
+
+import static android.content.Context.MODE_PRIVATE;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Looper;
+import android.provider.Settings;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccSlotInfo;
+import android.util.Log;
+
+import com.android.settings.network.SubscriptionUtil;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+/** Perform actions after a slot change event is triggered. */
+public class SimSlotChangeHandler {
+    private static final String TAG = "SimSlotChangeHandler";
+
+    private static final String EUICC_PREFS = "euicc_prefs";
+    private static final String KEY_REMOVABLE_SLOT_STATE = "removable_slot_state";
+
+    private static volatile SimSlotChangeHandler sSlotChangeHandler;
+
+    /** Returns a SIM slot change handler singleton. */
+    public static SimSlotChangeHandler get() {
+        if (sSlotChangeHandler == null) {
+            synchronized (SimSlotChangeHandler.class) {
+                if (sSlotChangeHandler == null) {
+                    sSlotChangeHandler = new SimSlotChangeHandler();
+                }
+            }
+        }
+        return sSlotChangeHandler;
+    }
+
+    private SubscriptionManager mSubMgr;
+    private TelephonyManager mTelMgr;
+    private Context mContext;
+
+    void onSlotsStatusChange(Context context) {
+        init(context);
+
+        if (Looper.myLooper() == Looper.getMainLooper()) {
+            throw new IllegalStateException("Cannot be called from main thread.");
+        }
+
+        if (mTelMgr.getActiveModemCount() > 1) {
+            Log.i(TAG, "The device is already in DSDS mode. Do nothing.");
+            return;
+        }
+
+        UiccSlotInfo removableSlotInfo = getRemovableUiccSlotInfo();
+        if (removableSlotInfo == null) {
+            Log.e(TAG, "Unable to find the removable slot. Do nothing.");
+            return;
+        }
+
+        int lastRemovableSlotState = getLastRemovableSimSlotState(mContext);
+        int currentRemovableSlotState = removableSlotInfo.getCardStateInfo();
+
+        // Sets the current removable slot state.
+        setRemovableSimSlotState(mContext, currentRemovableSlotState);
+
+        if (lastRemovableSlotState == UiccSlotInfo.CARD_STATE_INFO_ABSENT
+                && currentRemovableSlotState == UiccSlotInfo.CARD_STATE_INFO_PRESENT) {
+            handleSimInsert(removableSlotInfo);
+            return;
+        }
+        if (lastRemovableSlotState == UiccSlotInfo.CARD_STATE_INFO_PRESENT
+                && currentRemovableSlotState == UiccSlotInfo.CARD_STATE_INFO_ABSENT) {
+            handleSimRemove(removableSlotInfo);
+            return;
+        }
+        Log.i(TAG, "Do nothing on slot status changes.");
+    }
+
+    private void init(Context context) {
+        mSubMgr =
+                (SubscriptionManager)
+                        context.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+        mTelMgr = context.getSystemService(TelephonyManager.class);
+        mContext = context;
+    }
+
+    private void handleSimInsert(UiccSlotInfo removableSlotInfo) {
+        Log.i(TAG, "Detect SIM inserted.");
+
+        if (!isSuwFinished(mContext)) {
+            // TODO(b/170508680): Store the action and handle it after SUW is finished.
+            Log.i(TAG, "Still in SUW. Handle SIM insertion after SUW is finished");
+            return;
+        }
+
+        if (removableSlotInfo.getIsActive()) {
+            Log.i(TAG, "The removable slot is already active. Do nothing.");
+            return;
+        }
+
+        if (!hasActiveEsimSubscription()) {
+            if (mTelMgr.isMultiSimEnabled()) {
+                Log.i(TAG, "Enabled profile exists. DSDS condition satisfied.");
+                // TODO(b/170508680): Display DSDS dialog to ask users whether to enable DSDS.
+            } else {
+                Log.i(TAG, "Enabled profile exists. DSDS condition not satisfied.");
+                // TODO(b/170508680): Display Choose a number to use screen for subscription
+                //  selection.
+            }
+            return;
+        }
+
+        Log.i(
+                TAG,
+                "No enabled eSIM profile. Ready to switch to removable slot and show"
+                        + " notification.");
+        // TODO(b/170508680): Switch the slot to the removebale slot and show the notification.
+    }
+
+    private void handleSimRemove(UiccSlotInfo removableSlotInfo) {
+        Log.i(TAG, "Detect SIM removed.");
+
+        if (!isSuwFinished(mContext)) {
+            // TODO(b/170508680): Store the action and handle it after SUW is finished.
+            Log.i(TAG, "Still in SUW. Handle SIM removal after SUW is finished");
+            return;
+        }
+
+        List<SubscriptionInfo> groupedEmbeddedSubscriptions = getGroupedEmbeddedSubscriptions();
+
+        if (groupedEmbeddedSubscriptions.size() == 0 || !removableSlotInfo.getIsActive()) {
+            Log.i(TAG, "eSIM slot is active or no subscriptions exist. Do nothing.");
+            return;
+        }
+
+        // If there is only 1 eSIM profile exists, we ask the user if they want to switch to that
+        // profile.
+        if (groupedEmbeddedSubscriptions.size() == 1) {
+            Log.i(TAG, "Only 1 eSIM profile found. Ask user's consent to switch.");
+            // TODO(b/170508680): Display a dialog to ask users to switch.
+            return;
+        }
+
+        // If there are more than 1 eSIM profiles installed, we show a screen to let users to choose
+        // the number they want to use.
+        Log.i(TAG, "Multiple eSIM profiles found. Ask user which subscription to use.");
+        // TODO(b/170508680): Display a dialog to ask user which SIM to switch.
+    }
+
+    private int getLastRemovableSimSlotState(Context context) {
+        final SharedPreferences prefs = context.getSharedPreferences(EUICC_PREFS, MODE_PRIVATE);
+        return prefs.getInt(KEY_REMOVABLE_SLOT_STATE, UiccSlotInfo.CARD_STATE_INFO_ABSENT);
+    }
+
+    private void setRemovableSimSlotState(Context context, int state) {
+        final SharedPreferences prefs = context.getSharedPreferences(EUICC_PREFS, MODE_PRIVATE);
+        prefs.edit().putInt(KEY_REMOVABLE_SLOT_STATE, state).apply();
+    }
+
+    @Nullable
+    private UiccSlotInfo getRemovableUiccSlotInfo() {
+        UiccSlotInfo[] slotInfos = mTelMgr.getUiccSlotsInfo();
+        if (slotInfos == null) {
+            Log.e(TAG, "slotInfos is null. Unable to get slot infos.");
+            return null;
+        }
+        for (UiccSlotInfo slotInfo : slotInfos) {
+            if (slotInfo != null && slotInfo.isRemovable()) {
+
+                return slotInfo;
+            }
+        }
+        return null;
+    }
+
+    private static boolean isSuwFinished(Context context) {
+        try {
+            // DEVICE_PROVISIONED is 0 if still in setup wizard. 1 if setup completed.
+            return Settings.Global.getInt(
+                            context.getContentResolver(), Settings.Global.DEVICE_PROVISIONED)
+                    == 1;
+        } catch (Settings.SettingNotFoundException e) {
+            Log.e(TAG, "Cannot get DEVICE_PROVISIONED from the device.", e);
+            return false;
+        }
+    }
+
+    private boolean hasActiveEsimSubscription() {
+        List<SubscriptionInfo> activeSubs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
+        return activeSubs.stream().anyMatch(SubscriptionInfo::isEmbedded);
+    }
+
+    private List<SubscriptionInfo> getGroupedEmbeddedSubscriptions() {
+        List<SubscriptionInfo> groupedSubscriptions =
+                SubscriptionUtil.getSelectableSubscriptionInfoList(mContext);
+        if (groupedSubscriptions == null) {
+            return ImmutableList.of();
+        }
+        return ImmutableList.copyOf(
+                groupedSubscriptions.stream()
+                        .filter(sub -> sub.isEmbedded())
+                        .collect(Collectors.toList()));
+    }
+
+    private SimSlotChangeHandler() {}
+}
diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java b/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
new file mode 100644
index 0000000..17a1b8d
--- /dev/null
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeReceiver.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2020 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.sim.receivers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccCardInfo;
+import android.telephony.UiccSlotInfo;
+import android.telephony.euicc.EuiccManager;
+import android.text.TextUtils;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import com.android.settingslib.utils.ThreadUtils;
+
+import java.util.List;
+
+/** The receiver when the slot status changes. */
+public class SimSlotChangeReceiver extends BroadcastReceiver {
+    private static final String TAG = "SlotChangeReceiver";
+
+    private final SimSlotChangeHandler mSlotChangeHandler = SimSlotChangeHandler.get();
+    private final Object mLock = new Object();
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+        String action = intent.getAction();
+        if (!TelephonyManager.ACTION_SIM_SLOT_STATUS_CHANGED.equals(action)) {
+            Log.e(TAG, "Ignore slot changes due to unexpected action: " + action);
+            return;
+        }
+
+        ThreadUtils.postOnBackgroundThread(
+                () -> {
+                    synchronized (mLock) {
+                        if (!shouldHandleSlotChange(context)) {
+                            return;
+                        }
+                        mSlotChangeHandler.onSlotsStatusChange(context);
+                    }
+                });
+    }
+
+    // Checks whether the slot event should be handled.
+    private boolean shouldHandleSlotChange(Context context) {
+        final EuiccManager euiccManager = context.getSystemService(EuiccManager.class);
+        if (euiccManager == null || !euiccManager.isEnabled()) {
+            Log.i(TAG, "Ignore slot changes because EuiccManager is disabled.");
+            return false;
+        }
+
+        if (euiccManager.getOtaStatus() == EuiccManager.EUICC_OTA_IN_PROGRESS) {
+            Log.i(TAG, "Ignore slot changes because eSIM OTA is in progress.");
+            return false;
+        }
+
+        if (!isSimSlotStateValid(context)) {
+            Log.i(TAG, "Ignore slot changes because SIM states are not valid.");
+            return false;
+        }
+
+        return true;
+    }
+
+    // Checks whether the SIM slot state is valid for slot change event.
+    private boolean isSimSlotStateValid(Context context) {
+        final TelephonyManager telMgr = context.getSystemService(TelephonyManager.class);
+        UiccSlotInfo[] slotInfos = telMgr.getUiccSlotsInfo();
+        if (slotInfos == null) {
+            Log.e(TAG, "slotInfos is null. Unable to get slot infos.");
+            return false;
+        }
+
+        boolean isAllCardStringsEmpty = true;
+        for (int i = 0; i < slotInfos.length; i++) {
+            UiccSlotInfo slotInfo = slotInfos[i];
+
+            if (slotInfo == null) {
+                return false;
+            }
+
+            // After pSIM is inserted, there might be a short period that the status of both slots
+            // are not accurate. We drop the event if any of sim presence state is ERROR or
+            // RESTRICTED.
+            if (slotInfo.getCardStateInfo() == UiccSlotInfo.CARD_STATE_INFO_ERROR
+                    || slotInfo.getCardStateInfo() == UiccSlotInfo.CARD_STATE_INFO_RESTRICTED) {
+                Log.i(TAG, "The SIM state is in an error. Drop the event. SIM info: " + slotInfo);
+                return false;
+            }
+
+            UiccCardInfo cardInfo = findUiccCardInfoBySlot(telMgr, i);
+            if (cardInfo == null) {
+                continue;
+            }
+            if (!TextUtils.isEmpty(slotInfo.getCardId())
+                    || !TextUtils.isEmpty(cardInfo.getIccId())) {
+                isAllCardStringsEmpty = false;
+            }
+        }
+
+        // We also drop the event if both the card strings are empty, which usually means it's
+        // between SIM slots switch the slot status is not stable at this moment.
+        if (isAllCardStringsEmpty) {
+            Log.i(TAG, "All UICC card strings are empty. Drop this event.");
+            return false;
+        }
+
+        return true;
+    }
+
+    @Nullable
+    private UiccCardInfo findUiccCardInfoBySlot(TelephonyManager telMgr, int physicalSlotIndex) {
+        List<UiccCardInfo> cardInfos = telMgr.getUiccCardsInfo();
+        if (cardInfos == null) {
+            return null;
+        }
+        return cardInfos.stream()
+                .filter(info -> info.getSlotIndex() == physicalSlotIndex)
+                .findFirst()
+                .orElse(null);
+    }
+}
diff --git a/src/com/android/settings/slices/CustomSliceRegistry.java b/src/com/android/settings/slices/CustomSliceRegistry.java
index a5768d3..be71b30 100644
--- a/src/com/android/settings/slices/CustomSliceRegistry.java
+++ b/src/com/android/settings/slices/CustomSliceRegistry.java
@@ -26,11 +26,10 @@
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.settings.display.AdaptiveSleepPreferenceController;
 import com.android.settings.display.AlwaysOnDisplaySlice;
+import com.android.settings.display.ScreenTimeoutPreferenceController;
 import com.android.settings.flashlight.FlashlightSlice;
 import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
-import com.android.settings.homepage.contextualcards.deviceinfo.StorageSlice;
 import com.android.settings.homepage.contextualcards.slices.BatteryFixSlice;
 import com.android.settings.homepage.contextualcards.slices.BluetoothDevicesSlice;
 import com.android.settings.homepage.contextualcards.slices.ContextualAdaptiveSleepSlice;
@@ -38,10 +37,10 @@
 import com.android.settings.homepage.contextualcards.slices.FaceSetupSlice;
 import com.android.settings.homepage.contextualcards.slices.LowStorageSlice;
 import com.android.settings.location.LocationSlice;
-import com.android.settings.media.MediaOutputGroupSlice;
 import com.android.settings.media.MediaOutputIndicatorSlice;
-import com.android.settings.media.MediaOutputSlice;
 import com.android.settings.media.RemoteMediaSlice;
+import com.android.settings.network.AirplaneSafeNetworksSlice;
+import com.android.settings.network.ProviderModelSlice;
 import com.android.settings.network.telephony.MobileDataSlice;
 import com.android.settings.notification.zen.ZenModeButtonPreferenceController;
 import com.android.settings.wifi.calling.WifiCallingSliceHelper;
@@ -63,7 +62,7 @@
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
             .appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)
-            .appendPath(AdaptiveSleepPreferenceController.PREF_NAME)
+            .appendPath(ScreenTimeoutPreferenceController.PREF_NAME)
             .build();
 
     /**
@@ -169,15 +168,17 @@
             .appendEncodedPath(SettingsSlicesContract.PATH_SETTING_ACTION)
             .appendPath("mobile_data")
             .build();
+
     /**
-     * Backing Uri for the storage slice.
+     * Full {@link Uri} for the Provider Model Slice.
      */
-    public static final Uri STORAGE_SLICE_URI = new Uri.Builder()
+    public static final Uri PROVIDER_MODEL_SLICE_URI = new Uri.Builder()
             .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SettingsSliceProvider.SLICE_AUTHORITY)
-            .appendPath(SettingsSlicesContract.PATH_SETTING_INTENT)
-            .appendPath("storage_card")
+            .appendEncodedPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+            .appendPath("provider_model")
             .build();
+
     /**
      * Full {@link Uri} for the Alarm volume Slice.
      */
@@ -187,6 +188,7 @@
             .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
             .appendPath("alarm_volume")
             .build();
+
     /**
      * Full {@link Uri} for the Call Volume Slice.
      */
@@ -217,6 +219,16 @@
             .build();
 
     /**
+     * Full {@link Uri} for the all volume Slices.
+     */
+    public static final Uri VOLUME_SLICES_URI = new Uri.Builder()
+            .scheme(ContentResolver.SCHEME_CONTENT)
+            .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+            .appendPath("volume_slices")
+            .build();
+
+    /**
      * Full {@link Uri} for the Wifi Calling Slice.
      */
     public static final Uri WIFI_CALLING_URI = new Uri.Builder()
@@ -255,26 +267,6 @@
             .build();
 
     /**
-     * Backing Uri for the Media output Slice.
-     */
-    public static Uri MEDIA_OUTPUT_SLICE_URI = new Uri.Builder()
-            .scheme(ContentResolver.SCHEME_CONTENT)
-            .authority(SettingsSliceProvider.SLICE_AUTHORITY)
-            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
-            .appendPath(MediaOutputSliceConstants.KEY_MEDIA_OUTPUT)
-            .build();
-
-    /**
-     * Backing Uri for the Media output group Slice.
-     */
-    public static Uri MEDIA_OUTPUT_GROUP_SLICE_URI = new Uri.Builder()
-            .scheme(ContentResolver.SCHEME_CONTENT)
-            .authority(SettingsSliceProvider.SLICE_AUTHORITY)
-            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
-            .appendPath(MediaOutputSliceConstants.KEY_MEDIA_OUTPUT_GROUP)
-            .build();
-
-    /**
      * Backing Uri for the Media output indicator Slice.
      */
     public static Uri MEDIA_OUTPUT_INDICATOR_SLICE_URI = new Uri.Builder()
@@ -314,6 +306,16 @@
             .appendPath("always_on_display")
             .build();
 
+    /**
+     * Backing Uri for the Always On Slice.
+     */
+    public static final Uri AIRPLANE_SAFE_NETWORKS_SLICE_URI = new Uri.Builder()
+            .scheme(ContentResolver.SCHEME_CONTENT)
+            .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+            .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+            .appendPath("airplane_safe_networks")
+            .build();
+
     @VisibleForTesting
     static final Map<Uri, Class<? extends CustomSliceable>> sUriToSlice;
 
@@ -329,14 +331,13 @@
         sUriToSlice.put(LOCATION_SLICE_URI, LocationSlice.class);
         sUriToSlice.put(LOW_STORAGE_SLICE_URI, LowStorageSlice.class);
         sUriToSlice.put(MEDIA_OUTPUT_INDICATOR_SLICE_URI, MediaOutputIndicatorSlice.class);
-        sUriToSlice.put(MEDIA_OUTPUT_SLICE_URI, MediaOutputSlice.class);
         sUriToSlice.put(MOBILE_DATA_SLICE_URI, MobileDataSlice.class);
-        sUriToSlice.put(STORAGE_SLICE_URI, StorageSlice.class);
+        sUriToSlice.put(PROVIDER_MODEL_SLICE_URI, ProviderModelSlice.class);
         sUriToSlice.put(WIFI_SLICE_URI, WifiSlice.class);
         sUriToSlice.put(DARK_THEME_SLICE_URI, DarkThemeSlice.class);
         sUriToSlice.put(REMOTE_MEDIA_SLICE_URI, RemoteMediaSlice.class);
-        sUriToSlice.put(MEDIA_OUTPUT_GROUP_SLICE_URI, MediaOutputGroupSlice.class);
         sUriToSlice.put(ALWAYS_ON_SLICE_URI, AlwaysOnDisplaySlice.class);
+        sUriToSlice.put(AIRPLANE_SAFE_NETWORKS_SLICE_URI, AirplaneSafeNetworksSlice.class);
     }
 
     public static Class<? extends CustomSliceable> getSliceClassByUri(Uri uri) {
diff --git a/src/com/android/settings/slices/CustomSliceable.java b/src/com/android/settings/slices/CustomSliceable.java
index 92c604e..d06ad1e 100644
--- a/src/com/android/settings/slices/CustomSliceable.java
+++ b/src/com/android/settings/slices/CustomSliceable.java
@@ -95,7 +95,7 @@
                 .setData(getUri())
                 .setClass(context, SliceBroadcastReceiver.class);
         return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
     }
 
     @Override
@@ -119,4 +119,4 @@
                     "Invalid sliceable class: " + sliceable, e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/slices/SettingsSliceProvider.java b/src/com/android/settings/slices/SettingsSliceProvider.java
index c22d001..0c6205f 100644
--- a/src/com/android/settings/slices/SettingsSliceProvider.java
+++ b/src/com/android/settings/slices/SettingsSliceProvider.java
@@ -47,6 +47,7 @@
 import com.android.settings.Utils;
 import com.android.settings.bluetooth.BluetoothSliceBuilder;
 import com.android.settings.core.BasePreferenceController;
+import com.android.settings.notification.VolumeSeekBarPreferenceController;
 import com.android.settings.notification.zen.ZenModeSliceBuilder;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.SliceBroadcastRelay;
@@ -184,7 +185,10 @@
 
     @Override
     public void onSliceUnpinned(Uri sliceUri) {
-        SliceBroadcastRelay.unregisterReceivers(getContext(), sliceUri);
+        final Context context = getContext();
+        if (!VolumeSliceHelper.unregisterUri(context, sliceUri)) {
+            SliceBroadcastRelay.unregisterReceivers(context, sliceUri);
+        }
         ThreadUtils.postOnMainThread(() -> stopBackgroundWorker(sliceUri));
     }
 
@@ -328,7 +332,7 @@
                     .collect(Collectors.toList());
             descendants.addAll(customSlices);
         }
-        grantWhitelistedPackagePermissions(getContext(), descendants);
+        grantAllowlistedPackagePermissions(getContext(), descendants);
         return descendants;
     }
 
@@ -344,23 +348,23 @@
     }
 
     @VisibleForTesting
-    static void grantWhitelistedPackagePermissions(Context context, List<Uri> descendants) {
+    static void grantAllowlistedPackagePermissions(Context context, List<Uri> descendants) {
         if (descendants == null) {
             Log.d(TAG, "No descendants to grant permission with, skipping.");
         }
-        final String[] whitelistPackages =
-                context.getResources().getStringArray(R.array.slice_whitelist_package_names);
-        if (whitelistPackages == null || whitelistPackages.length == 0) {
-            Log.d(TAG, "No packages to whitelist, skipping.");
+        final String[] allowlistPackages =
+                context.getResources().getStringArray(R.array.slice_allowlist_package_names);
+        if (allowlistPackages == null || allowlistPackages.length == 0) {
+            Log.d(TAG, "No packages to allowlist, skipping.");
             return;
         } else {
             Log.d(TAG, String.format(
-                    "Whitelisting %d uris to %d pkgs.",
-                    descendants.size(), whitelistPackages.length));
+                    "Allowlisting %d uris to %d pkgs.",
+                    descendants.size(), allowlistPackages.length));
         }
         final SliceManager sliceManager = context.getSystemService(SliceManager.class);
         for (Uri descendant : descendants) {
-            for (String toPackage : whitelistPackages) {
+            for (String toPackage : allowlistPackages) {
                 sliceManager.grantSlicePermission(toPackage, descendant);
             }
         }
@@ -390,7 +394,13 @@
 
         final IntentFilter filter = controller.getIntentFilter();
         if (filter != null) {
-            registerIntentToUri(filter, uri);
+            if (controller instanceof VolumeSeekBarPreferenceController) {
+                // Register volume slices to a broadcast relay to reduce unnecessary UI updates
+                VolumeSliceHelper.registerIntentToUri(getContext(), filter, uri,
+                        ((VolumeSeekBarPreferenceController) controller).getAudioStream());
+            } else {
+                registerIntentToUri(filter, uri);
+            }
         }
 
         ThreadUtils.postOnMainThread(() -> startBackgroundWorker(controller, uri));
@@ -426,7 +436,7 @@
         try {
             KEY_VALUE_LIST_PARSER.setString(value);
         } catch (IllegalArgumentException e) {
-            Log.e(TAG, "Bad Settings Slices Whitelist flags", e);
+            Log.e(TAG, "Bad Settings Slices Allowlist flags", e);
             return set;
         }
 
diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index 552927e..402e044 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -159,7 +159,7 @@
                 .setClass(context, SliceBroadcastReceiver.class)
                 .putExtra(EXTRA_SLICE_KEY, data.getKey());
         return PendingIntent.getBroadcast(context, 0 /* requestCode */, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE);
     }
 
     /**
@@ -167,7 +167,8 @@
      */
     public static PendingIntent getContentPendingIntent(Context context, SliceData sliceData) {
         final Intent intent = getContentIntent(context, sliceData);
-        return PendingIntent.getActivity(context, 0 /* requestCode */, intent, 0 /* flags */);
+        return PendingIntent.getActivity(context, 0 /* requestCode */, intent,
+                PendingIntent.FLAG_IMMUTABLE);
     }
 
     /**
diff --git a/src/com/android/settings/slices/VolumeSliceHelper.java b/src/com/android/settings/slices/VolumeSliceHelper.java
new file mode 100644
index 0000000..bcf02e5
--- /dev/null
+++ b/src/com/android/settings/slices/VolumeSliceHelper.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2020 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.slices;
+
+import static com.android.settings.slices.CustomSliceRegistry.VOLUME_SLICES_URI;
+
+import android.content.ContentProvider;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+
+import com.android.settingslib.SliceBroadcastRelay;
+
+import java.util.Map;
+
+/**
+ * This helper is to handle the broadcasts of volume slices
+ */
+public class VolumeSliceHelper {
+
+    private static final String TAG = "VolumeSliceHelper";
+
+    @VisibleForTesting
+    static Map<Uri, Integer> sRegisteredUri = new ArrayMap<>();
+    @VisibleForTesting
+    static IntentFilter sIntentFilter;
+
+    static void registerIntentToUri(Context context, IntentFilter intentFilter, Uri sliceUri,
+            int audioStream) {
+        Log.d(TAG, "Registering uri for broadcast relay: " + sliceUri);
+        synchronized (sRegisteredUri) {
+            if (sRegisteredUri.isEmpty()) {
+                SliceBroadcastRelay.registerReceiver(context, VOLUME_SLICES_URI,
+                        VolumeSliceRelayReceiver.class, intentFilter);
+                sIntentFilter = intentFilter;
+            }
+            sRegisteredUri.put(sliceUri, audioStream);
+        }
+    }
+
+    static boolean unregisterUri(Context context, Uri sliceUri) {
+        if (!sRegisteredUri.containsKey(sliceUri)) {
+            return false;
+        }
+
+        Log.d(TAG, "Unregistering uri broadcast relay: " + sliceUri);
+        synchronized (sRegisteredUri) {
+            sRegisteredUri.remove(sliceUri);
+            if (sRegisteredUri.isEmpty()) {
+                sIntentFilter = null;
+                SliceBroadcastRelay.unregisterReceivers(context, VOLUME_SLICES_URI);
+            }
+        }
+        return true;
+    }
+
+    static void onReceive(Context context, Intent intent) {
+        final String action = intent.getAction();
+        if (sIntentFilter == null || action == null || !sIntentFilter.hasAction(action)) {
+            return;
+        }
+
+        final String uriString = intent.getStringExtra(SliceBroadcastRelay.EXTRA_URI);
+        if (uriString == null) {
+            return;
+        }
+
+        final Uri uri = Uri.parse(uriString);
+        if (!VOLUME_SLICES_URI.equals(ContentProvider.getUriWithoutUserId(uri))) {
+            Log.w(TAG, "Invalid uri: " + uriString);
+            return;
+        }
+
+        if (AudioManager.VOLUME_CHANGED_ACTION.equals(action)) {
+            handleVolumeChanged(context, intent);
+        } else if (AudioManager.STREAM_MUTE_CHANGED_ACTION.equals(action)
+                || AudioManager.STREAM_DEVICES_CHANGED_ACTION.equals(action)) {
+            handleStreamChanged(context, intent);
+        } else {
+            notifyAllStreamsChanged(context);
+        }
+    }
+
+    private static void handleVolumeChanged(Context context, Intent intent) {
+        final int vol = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, -1);
+        final int prevVol = intent.getIntExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, -1);
+        if (vol != prevVol) {
+            handleStreamChanged(context, intent);
+        }
+    }
+
+    private static void handleStreamChanged(Context context, Intent intent) {
+        final int inputType = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, -1);
+        for (Map.Entry<Uri, Integer> entry : sRegisteredUri.entrySet()) {
+            if (entry.getValue() == inputType) {
+                context.getContentResolver().notifyChange(entry.getKey(), null /* observer */);
+                break;
+            }
+        }
+    }
+
+    private static void notifyAllStreamsChanged(Context context) {
+        sRegisteredUri.forEach((uri, audioStream) -> {
+            context.getContentResolver().notifyChange(uri, null /* observer */);
+        });
+    }
+}
diff --git a/src/com/android/settings/slices/VolumeSliceRelayReceiver.java b/src/com/android/settings/slices/VolumeSliceRelayReceiver.java
new file mode 100644
index 0000000..f6088d0
--- /dev/null
+++ b/src/com/android/settings/slices/VolumeSliceRelayReceiver.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2020 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.slices;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * Receives broadcasts to notify that Settings volume Slices are potentially stale.
+ */
+public class VolumeSliceRelayReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        VolumeSliceHelper.onReceive(context, intent);
+    }
+}
diff --git a/src/com/android/settings/sound/MediaControlsPreferenceController.java b/src/com/android/settings/sound/MediaControlsPreferenceController.java
index 050cf93..219eb24 100644
--- a/src/com/android/settings/sound/MediaControlsPreferenceController.java
+++ b/src/com/android/settings/sound/MediaControlsPreferenceController.java
@@ -35,12 +35,12 @@
     @Override
     public boolean isChecked() {
         int val = Settings.Secure.getInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, 1);
-        return val == 0;
+        return val == 1;
     }
 
     @Override
     public boolean setChecked(boolean isChecked) {
-        int val = isChecked ? 0 : 1;
+        int val = isChecked ? 1 : 0;
         return Settings.Secure.putInt(mContext.getContentResolver(), MEDIA_CONTROLS_RESUME, val);
     }
 
diff --git a/src/com/android/settings/sound/MediaOutputPreferenceController.java b/src/com/android/settings/sound/MediaOutputPreferenceController.java
index da92b2b..b5562a3 100644
--- a/src/com/android/settings/sound/MediaOutputPreferenceController.java
+++ b/src/com/android/settings/sound/MediaOutputPreferenceController.java
@@ -22,14 +22,13 @@
 import android.media.AudioManager;
 import android.media.session.MediaController;
 import android.media.session.MediaSessionManager;
-import android.media.session.PlaybackState;
 import android.text.TextUtils;
 
-import androidx.annotation.Nullable;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
+import com.android.settings.media.MediaOutputUtils;
 import com.android.settingslib.Utils;
 import com.android.settingslib.bluetooth.A2dpProfile;
 import com.android.settingslib.bluetooth.HearingAidProfile;
@@ -38,7 +37,7 @@
 import java.util.List;
 
 /**
- * This class allows launching MediaOutputSlice to switch output device.
+ * This class allows launching MediaOutputDialog to switch output device.
  * Preference would hide only when
  * - Bluetooth = OFF
  * - Bluetooth = ON and Connected Devices = 0 and Previously Connected = 0
@@ -51,7 +50,8 @@
 
     public MediaOutputPreferenceController(Context context, String key) {
         super(context, key);
-        mMediaController = getActiveLocalMediaController();
+        mMediaController = MediaOutputUtils.getActiveLocalMediaController(context.getSystemService(
+                MediaSessionManager.class));
     }
 
     @Override
@@ -133,34 +133,15 @@
     @Override
     public boolean handlePreferenceTreeClick(Preference preference) {
         if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {
-            final Intent intent = new Intent()
-                    .setAction(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT)
-                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            mContext.startActivity(intent);
+            mContext.sendBroadcast(new Intent()
+                    .setAction(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)
+                    .setPackage(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME)
+                    .putExtra(MediaOutputSliceConstants.EXTRA_PACKAGE_NAME,
+                            mMediaController.getPackageName())
+                    .putExtra(MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN,
+                            mMediaController.getSessionToken()));
             return true;
         }
         return false;
     }
-
-    @Nullable
-    MediaController getActiveLocalMediaController() {
-        final MediaSessionManager mMediaSessionManager = mContext.getSystemService(
-                MediaSessionManager.class);
-
-        for (MediaController controller : mMediaSessionManager.getActiveSessions(null)) {
-            final MediaController.PlaybackInfo pi = controller.getPlaybackInfo();
-            if (pi == null) {
-                return null;
-            }
-            final PlaybackState playbackState = controller.getPlaybackState();
-            if (playbackState == null) {
-                return null;
-            }
-            if (pi.getPlaybackType() == MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL
-                    && playbackState.getState() == PlaybackState.STATE_PLAYING) {
-                return controller;
-            }
-        }
-        return null;
-    }
 }
diff --git a/src/com/android/settings/sound/ResumableMediaAppsController.java b/src/com/android/settings/sound/ResumableMediaAppsController.java
new file mode 100644
index 0000000..383cd41
--- /dev/null
+++ b/src/com/android/settings/sound/ResumableMediaAppsController.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2020 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.sound;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.graphics.drawable.Drawable;
+import android.provider.Settings;
+import android.service.media.MediaBrowserService;
+import android.text.TextUtils;
+import android.util.ArraySet;
+import android.util.Log;
+
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.core.BasePreferenceController;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Section of media controls settings that contains a list of potentially resumable apps
+ */
+public class ResumableMediaAppsController extends BasePreferenceController {
+    private static final String TAG = "ResumableMediaAppsCtrl";
+
+    private PreferenceGroup mPreferenceGroup;
+    private PackageManager mPackageManager;
+    private List<ResolveInfo> mResumeInfo;
+
+    public ResumableMediaAppsController(Context context, String key) {
+        super(context, key);
+        mPackageManager = mContext.getPackageManager();
+        Intent serviceIntent = new Intent(MediaBrowserService.SERVICE_INTERFACE);
+        mResumeInfo = mPackageManager.queryIntentServices(serviceIntent, 0);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        // Update list, since this will be called when the app goes to onStart / onPause
+        Intent serviceIntent = new Intent(MediaBrowserService.SERVICE_INTERFACE);
+        mResumeInfo = mPackageManager.queryIntentServices(serviceIntent, 0);
+        return (mResumeInfo.size() > 0) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreferenceGroup = screen.findPreference(getPreferenceKey());
+        Set<String> blockedApps = getBlockedMediaApps();
+        for (ResolveInfo inf : mResumeInfo) {
+            String packageName = inf.getComponentInfo().packageName;
+            MediaSwitchPreference pref = new MediaSwitchPreference(mContext, packageName);
+            CharSequence appTitle = packageName;
+            try {
+                appTitle = mPackageManager.getApplicationLabel(
+                        mPackageManager.getApplicationInfo(packageName, 0));
+                Drawable appIcon = mPackageManager.getApplicationIcon(packageName);
+                pref.setIcon(appIcon);
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.e(TAG, "Couldn't get app title", e);
+            }
+            pref.setTitle(appTitle);
+
+            pref.setOnPreferenceChangeListener((preference, status) -> {
+                MediaSwitchPreference mediaPreference = (MediaSwitchPreference) preference;
+                boolean isEnabled = (boolean) status;
+                Log.d(TAG, "preference " + mediaPreference + " changed " + isEnabled);
+
+                if (isEnabled) {
+                    blockedApps.remove(mediaPreference.getPackageName());
+                } else {
+                    blockedApps.add(mediaPreference.getPackageName());
+                }
+                setBlockedMediaApps(blockedApps);
+                return true;
+            });
+
+            pref.setChecked(!blockedApps.contains(packageName));
+            mPreferenceGroup.addPreference(pref);
+        }
+    }
+
+    class MediaSwitchPreference extends SwitchPreference {
+        private String mPackageName;
+
+        MediaSwitchPreference(Context context, String packageName) {
+            super(context);
+            mPackageName = packageName;
+        }
+
+        public String getPackageName() {
+            return mPackageName;
+        }
+    }
+
+    private Set<String> getBlockedMediaApps() {
+        String list = Settings.Secure.getString(mContext.getContentResolver(),
+                Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED);
+        if (TextUtils.isEmpty(list)) {
+            return new ArraySet<>();
+        }
+        String[] names = list.split(":");
+        Set<String> set = new ArraySet<>(names.length);
+        Collections.addAll(set, names);
+        return set;
+    }
+
+    private void setBlockedMediaApps(Set<String> apps) {
+        if (apps == null || apps.size() == 0) {
+            Settings.Secure.putString(mContext.getContentResolver(),
+                    Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED, "");
+            return;
+        }
+        String list = String.join(":", apps);
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED, list);
+    }
+}
diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java
index 024db14..e5fc8f1 100644
--- a/src/com/android/settings/system/ResetDashboardFragment.java
+++ b/src/com/android/settings/system/ResetDashboardFragment.java
@@ -22,6 +22,7 @@
 import com.android.settings.R;
 import com.android.settings.applications.manageapplications.ResetAppPrefPreferenceController;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.network.EraseEuiccDataController;
 import com.android.settings.network.NetworkResetPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -57,6 +58,12 @@
         return buildPreferenceControllers(context, getSettingsLifecycle());
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        use(EraseEuiccDataController.class).setFragment(this);
+    }
+
     private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
             Lifecycle lifecycle) {
         final List<AbstractPreferenceController> controllers = new ArrayList<>();
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 3245657..30e9967 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -318,11 +318,15 @@
         mDefaultRatePref.setProgress(getSeekBarProgressFromValue(KEY_DEFAULT_RATE, mDefaultRate));
         mDefaultRatePref.setOnPreferenceChangeListener(this);
         mDefaultRatePref.setMax(getSeekBarProgressFromValue(KEY_DEFAULT_RATE, MAX_SPEECH_RATE));
+        mDefaultRatePref.setContinuousUpdates(true);
+        mDefaultRatePref.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);
 
         mDefaultPitchPref.setProgress(
                 getSeekBarProgressFromValue(KEY_DEFAULT_PITCH, mDefaultPitch));
         mDefaultPitchPref.setOnPreferenceChangeListener(this);
         mDefaultPitchPref.setMax(getSeekBarProgressFromValue(KEY_DEFAULT_PITCH, MAX_SPEECH_PITCH));
+        mDefaultPitchPref.setContinuousUpdates(true);
+        mDefaultPitchPref.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);
 
         if (mTts != null) {
             mCurrentEngine = mTts.getCurrentEngine();
diff --git a/src/com/android/settings/users/AppRestrictionsFragment.java b/src/com/android/settings/users/AppRestrictionsFragment.java
index 9f6a2b6..a23aeef 100644
--- a/src/com/android/settings/users/AppRestrictionsFragment.java
+++ b/src/com/android/settings/users/AppRestrictionsFragment.java
@@ -393,7 +393,7 @@
             p.setChecked(false);
             p.setTitle(app.activityName);
             p.setKey(getKeyForPackage(packageName));
-            p.setSettingsEnabled(hasSettings && app.masterEntry == null);
+            p.setSettingsEnabled(hasSettings && app.primaryEntry == null);
             p.setPersistent(false);
             p.setOnPreferenceChangeListener(this);
             p.setOnPreferenceClickListener(this);
@@ -406,14 +406,14 @@
                 // Get and populate the defaults, since the user is not going to be
                 // able to toggle this app ON (it's ON by default and immutable).
                 // Only do this for restricted profiles, not single-user restrictions
-                // Also don't do this for slave icons
-                if (app.masterEntry == null) {
+                // Also don't do this for secondary icons
+                if (app.primaryEntry == null) {
                     requestRestrictionsForApp(packageName, p, false);
                 }
             } else if (!mNewUser && isAppEnabledForUser(pi)) {
                 p.setChecked(true);
             }
-            if (app.masterEntry != null) {
+            if (app.primaryEntry != null) {
                 p.setImmutable(true);
                 p.setChecked(mHelper.isPackageSelected(packageName));
             }
@@ -432,17 +432,17 @@
 
     private String getPackageSummary(PackageInfo pi, AppRestrictionsHelper.SelectableAppInfo app) {
         // Check for 3 cases:
-        // - Slave entry that can see primary user accounts
-        // - Slave entry that cannot see primary user accounts
-        // - Master entry that can see primary user accounts
+        // - Secondary entry that can see primary user accounts
+        // - Secondary entry that cannot see primary user accounts
+        // - Primary entry that can see primary user accounts
         // Otherwise no summary is returned
-        if (app.masterEntry != null) {
+        if (app.primaryEntry != null) {
             if (mRestrictedProfile && pi.restrictedAccountType != null) {
                 return getString(R.string.app_sees_restricted_accounts_and_controlled_by,
-                        app.masterEntry.activityName);
+                        app.primaryEntry.activityName);
             }
             return getString(R.string.user_restrictions_controlled_by,
-                    app.masterEntry.activityName);
+                    app.primaryEntry.activityName);
         } else if (pi.restrictedAccountType != null) {
             return getString(R.string.app_sees_restricted_accounts);
         }
diff --git a/src/com/android/settings/users/EditUserInfoController.java b/src/com/android/settings/users/EditUserInfoController.java
deleted file mode 100644
index d205968..0000000
--- a/src/com/android/settings/users/EditUserInfoController.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Copyright (C) 2013 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.users;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.UserInfo;
-import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.text.TextUtils;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.ImageView;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-
-import com.android.settings.R;
-import com.android.settingslib.drawable.CircleFramedDrawable;
-
-import java.io.File;
-
-/**
- * This class encapsulates a Dialog for editing the user nickname and photo.
- */
-public class EditUserInfoController {
-
-    private static final String KEY_AWAITING_RESULT = "awaiting_result";
-    private static final String KEY_SAVED_PHOTO = "pending_photo";
-
-    private Dialog mEditUserInfoDialog;
-    private Bitmap mSavedPhoto;
-    private EditUserPhotoController mEditUserPhotoController;
-    private UserHandle mUser;
-    private UserManager mUserManager;
-    private boolean mWaitingForActivityResult = false;
-
-    /**
-     * Callback made when either the username text or photo choice changes.
-     */
-    public interface OnContentChangedCallback {
-        /** Photo updated. */
-        void onPhotoChanged(UserHandle user, Drawable photo);
-        /** Username updated. */
-        void onLabelChanged(UserHandle user, CharSequence label);
-    }
-
-    /**
-     * Callback made when the dialog finishes.
-     */
-    public interface OnDialogCompleteCallback {
-        /** Dialog closed with positive button. */
-        void onPositive();
-        /** Dialog closed with negative button or cancelled. */
-        void onNegativeOrCancel();
-    }
-
-    public void clear() {
-        if (mEditUserPhotoController != null) {
-            mEditUserPhotoController.removeNewUserPhotoBitmapFile();
-        }
-        mEditUserInfoDialog = null;
-        mSavedPhoto = null;
-    }
-
-    public Dialog getDialog() {
-        return mEditUserInfoDialog;
-    }
-
-    public void onRestoreInstanceState(Bundle icicle) {
-        String pendingPhoto = icicle.getString(KEY_SAVED_PHOTO);
-        if (pendingPhoto != null) {
-            mSavedPhoto = EditUserPhotoController.loadNewUserPhotoBitmap(new File(pendingPhoto));
-        }
-        mWaitingForActivityResult = icicle.getBoolean(KEY_AWAITING_RESULT, false);
-    }
-
-    public void onSaveInstanceState(Bundle outState) {
-        if (mEditUserInfoDialog != null && mEditUserInfoDialog.isShowing()
-                && mEditUserPhotoController != null) {
-            // Bitmap cannot be stored into bundle because it may exceed parcel limit
-            // Store it in a temporary file instead
-            File file = mEditUserPhotoController.saveNewUserPhotoBitmap();
-            if (file != null) {
-                outState.putString(KEY_SAVED_PHOTO, file.getPath());
-            }
-        }
-        if (mWaitingForActivityResult) {
-            outState.putBoolean(KEY_AWAITING_RESULT, mWaitingForActivityResult);
-        }
-    }
-
-    public void startingActivityForResult() {
-        mWaitingForActivityResult = true;
-    }
-
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        mWaitingForActivityResult = false;
-
-        if (mEditUserPhotoController != null && mEditUserInfoDialog != null) {
-            mEditUserPhotoController.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-    public Dialog createDialog(final Fragment fragment, final Drawable currentUserIcon,
-            final CharSequence currentUserName,
-            String title, final OnContentChangedCallback callback, UserHandle user,
-            OnDialogCompleteCallback completeCallback) {
-        Activity activity = fragment.getActivity();
-        mUser = user;
-        if (mUserManager == null) {
-            mUserManager = activity.getSystemService(UserManager.class);
-        }
-        LayoutInflater inflater = activity.getLayoutInflater();
-        View content = inflater.inflate(R.layout.edit_user_info_dialog_content, null);
-
-        final EditText userNameView = (EditText) content.findViewById(R.id.user_name);
-        userNameView.setText(currentUserName);
-
-        final ImageView userPhotoView = (ImageView) content.findViewById(R.id.user_photo);
-
-        boolean canChangePhoto = mUserManager != null &&
-                canChangePhoto(activity, mUserManager.getUserInfo(user.getIdentifier()));
-        if (!canChangePhoto) {
-            // some users can't change their photos so we need to remove suggestive
-            // background from the photoView
-            userPhotoView.setBackground(null);
-        }
-        Drawable drawable = null;
-        if (mSavedPhoto != null) {
-            drawable = CircleFramedDrawable.getInstance(activity, mSavedPhoto);
-        } else {
-            drawable = currentUserIcon;
-        }
-        userPhotoView.setImageDrawable(drawable);
-        if (canChangePhoto) {
-            mEditUserPhotoController =
-                    createEditUserPhotoController(fragment, userPhotoView, drawable);
-        }
-        mEditUserInfoDialog = new AlertDialog.Builder(activity)
-                .setTitle(title)
-                .setView(content)
-                .setCancelable(true)
-                .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        if (which == DialogInterface.BUTTON_POSITIVE) {
-                            // Update the name if changed.
-                            CharSequence userName = userNameView.getText();
-                            if (!TextUtils.isEmpty(userName)) {
-                                if (currentUserName == null
-                                        || !userName.toString().equals(
-                                        currentUserName.toString())) {
-                                    if (callback != null) {
-                                        callback.onLabelChanged(mUser, userName.toString());
-                                    }
-                                }
-                            }
-                            // Update the photo if changed.
-                            if (mEditUserPhotoController != null) {
-                                Drawable drawable =
-                                        mEditUserPhotoController.getNewUserPhotoDrawable();
-                                if (drawable != null && !drawable.equals(currentUserIcon)) {
-                                    if (callback != null) {
-                                        callback.onPhotoChanged(mUser, drawable);
-                                    }
-                                }
-                            }
-                        }
-                        clear();
-                        if (completeCallback != null) {
-                            completeCallback.onPositive();
-                        }
-                    }
-                })
-                .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
-                    @Override
-                    public void onClick(DialogInterface dialog, int which) {
-                        clear();
-                        if (completeCallback != null) {
-                            completeCallback.onNegativeOrCancel();
-                        }
-                    }
-                })
-                .setOnCancelListener(new DialogInterface.OnCancelListener() {
-                    @Override
-                    public void onCancel(DialogInterface dialog) {
-                        clear();
-                        if (completeCallback != null) {
-                            completeCallback.onNegativeOrCancel();
-                        }
-                    }
-                })
-                .create();
-
-        // Make sure the IME is up.
-        mEditUserInfoDialog.getWindow().setSoftInputMode(
-                WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
-
-        return mEditUserInfoDialog;
-    }
-
-    @VisibleForTesting
-    boolean canChangePhoto(Context context, UserInfo user) {
-        return PhotoCapabilityUtils.canCropPhoto(context) &&
-                (PhotoCapabilityUtils.canChoosePhoto(context)
-                        || PhotoCapabilityUtils.canTakePhoto(context));
-    }
-
-    @VisibleForTesting
-    EditUserPhotoController createEditUserPhotoController(Fragment fragment,
-            ImageView userPhotoView, Drawable drawable) {
-        return new EditUserPhotoController(fragment, userPhotoView,
-                mSavedPhoto, drawable, mWaitingForActivityResult);
-    }
-}
diff --git a/src/com/android/settings/users/EditUserPhotoController.java b/src/com/android/settings/users/EditUserPhotoController.java
deleted file mode 100644
index a20513a..0000000
--- a/src/com/android/settings/users/EditUserPhotoController.java
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
- * Copyright (C) 2013 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.users;
-
-import android.app.Activity;
-import android.content.ClipData;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.BitmapFactory;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.os.AsyncTask;
-import android.os.StrictMode;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.ContactsContract.DisplayPhoto;
-import android.provider.MediaStore;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.ListPopupWindow;
-import android.widget.TextView;
-
-import androidx.core.content.FileProvider;
-import androidx.fragment.app.Fragment;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.drawable.CircleFramedDrawable;
-
-import libcore.io.Streams;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-public class EditUserPhotoController {
-    private static final String TAG = "EditUserPhotoController";
-
-    // It seems that this class generates custom request codes and they may
-    // collide with ours, these values are very unlikely to have a conflict.
-    private static final int REQUEST_CODE_CHOOSE_PHOTO = 1001;
-    private static final int REQUEST_CODE_TAKE_PHOTO   = 1002;
-    private static final int REQUEST_CODE_CROP_PHOTO   = 1003;
-
-    private static final String CROP_PICTURE_FILE_NAME = "CropEditUserPhoto.jpg";
-    private static final String TAKE_PICTURE_FILE_NAME = "TakeEditUserPhoto2.jpg";
-    private static final String NEW_USER_PHOTO_FILE_NAME = "NewUserPhoto.png";
-
-    private final int mPhotoSize;
-
-    private final Context mContext;
-    private final Fragment mFragment;
-    private final ImageView mImageView;
-
-    private final Uri mCropPictureUri;
-    private final Uri mTakePictureUri;
-
-    private Bitmap mNewUserPhotoBitmap;
-    private Drawable mNewUserPhotoDrawable;
-
-    public EditUserPhotoController(Fragment fragment, ImageView view,
-            Bitmap bitmap, Drawable drawable, boolean waiting) {
-        mContext = view.getContext();
-        mFragment = fragment;
-        mImageView = view;
-        mCropPictureUri = createTempImageUri(mContext, CROP_PICTURE_FILE_NAME, !waiting);
-        mTakePictureUri = createTempImageUri(mContext, TAKE_PICTURE_FILE_NAME, !waiting);
-        mPhotoSize = getPhotoSize(mContext);
-        mImageView.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                showUpdatePhotoPopup();
-            }
-        });
-        mNewUserPhotoBitmap = bitmap;
-        mNewUserPhotoDrawable = drawable;
-    }
-
-    public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode != Activity.RESULT_OK) {
-            return false;
-        }
-        final Uri pictureUri = data != null && data.getData() != null
-                ? data.getData() : mTakePictureUri;
-        switch (requestCode) {
-            case REQUEST_CODE_CROP_PHOTO:
-                onPhotoCropped(pictureUri, true);
-                return true;
-            case REQUEST_CODE_TAKE_PHOTO:
-            case REQUEST_CODE_CHOOSE_PHOTO:
-                if (mTakePictureUri.equals(pictureUri)) {
-                    cropPhoto();
-                } else {
-                    copyAndCropPhoto(pictureUri);
-                }
-                return true;
-        }
-        return false;
-    }
-
-    public Bitmap getNewUserPhotoBitmap() {
-        return mNewUserPhotoBitmap;
-    }
-
-    public Drawable getNewUserPhotoDrawable() {
-        return mNewUserPhotoDrawable;
-    }
-
-    private void showUpdatePhotoPopup() {
-        final Context context = mImageView.getContext();
-        final boolean canTakePhoto = PhotoCapabilityUtils.canTakePhoto(context);
-        final boolean canChoosePhoto = PhotoCapabilityUtils.canChoosePhoto(context);
-
-        if (!canTakePhoto && !canChoosePhoto) {
-            return;
-        }
-
-        final List<EditUserPhotoController.RestrictedMenuItem> items = new ArrayList<>();
-
-        if (canTakePhoto) {
-            final String title = context.getString(R.string.user_image_take_photo);
-            final Runnable action = new Runnable() {
-                @Override
-                public void run() {
-                    takePhoto();
-                }
-            };
-            items.add(new RestrictedMenuItem(context, title, UserManager.DISALLOW_SET_USER_ICON,
-                    action));
-        }
-
-        if (canChoosePhoto) {
-            final String title = context.getString(R.string.user_image_choose_photo);
-            final Runnable action = new Runnable() {
-                @Override
-                public void run() {
-                    choosePhoto();
-                }
-            };
-            items.add(new RestrictedMenuItem(context, title, UserManager.DISALLOW_SET_USER_ICON,
-                    action));
-        }
-
-        final ListPopupWindow listPopupWindow = new ListPopupWindow(context);
-
-        listPopupWindow.setAnchorView(mImageView);
-        listPopupWindow.setModal(true);
-        listPopupWindow.setInputMethodMode(ListPopupWindow.INPUT_METHOD_NOT_NEEDED);
-        listPopupWindow.setAdapter(new RestrictedPopupMenuAdapter(context, items));
-
-        final int width = Math.max(mImageView.getWidth(), context.getResources()
-                .getDimensionPixelSize(R.dimen.update_user_photo_popup_min_width));
-        listPopupWindow.setWidth(width);
-        listPopupWindow.setDropDownGravity(Gravity.START);
-
-        listPopupWindow.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                listPopupWindow.dismiss();
-                final RestrictedMenuItem item =
-                        (RestrictedMenuItem) parent.getAdapter().getItem(position);
-                item.doAction();
-            }
-        });
-
-        listPopupWindow.show();
-    }
-
-    private void takePhoto() {
-        Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
-        appendOutputExtra(intent, mTakePictureUri);
-        mFragment.startActivityForResult(intent, REQUEST_CODE_TAKE_PHOTO);
-    }
-
-    private void choosePhoto() {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT, null);
-        intent.setType("image/*");
-        appendOutputExtra(intent, mTakePictureUri);
-        mFragment.startActivityForResult(intent, REQUEST_CODE_CHOOSE_PHOTO);
-    }
-
-    private void copyAndCropPhoto(final Uri pictureUri) {
-        new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected Void doInBackground(Void... params) {
-                final ContentResolver cr = mContext.getContentResolver();
-                try (InputStream in = cr.openInputStream(pictureUri);
-                        OutputStream out = cr.openOutputStream(mTakePictureUri)) {
-                    Streams.copy(in, out);
-                } catch (IOException e) {
-                    Log.w(TAG, "Failed to copy photo", e);
-                }
-                return null;
-            }
-
-            @Override
-            protected void onPostExecute(Void result) {
-                if (!mFragment.isAdded()) return;
-                cropPhoto();
-            }
-        }.execute();
-    }
-
-    private void cropPhoto() {
-        // TODO: Use a public intent, when there is one.
-        Intent intent = new Intent("com.android.camera.action.CROP");
-        intent.setDataAndType(mTakePictureUri, "image/*");
-        appendOutputExtra(intent, mCropPictureUri);
-        appendCropExtras(intent);
-        if (intent.resolveActivity(mContext.getPackageManager()) != null) {
-            try {
-                StrictMode.disableDeathOnFileUriExposure();
-                mFragment.startActivityForResult(intent, REQUEST_CODE_CROP_PHOTO);
-            } finally {
-                StrictMode.enableDeathOnFileUriExposure();
-            }
-        } else {
-            onPhotoCropped(mTakePictureUri, false);
-        }
-    }
-
-    private void appendOutputExtra(Intent intent, Uri pictureUri) {
-        intent.putExtra(MediaStore.EXTRA_OUTPUT, pictureUri);
-        intent.addFlags(Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-                | Intent.FLAG_GRANT_READ_URI_PERMISSION);
-        intent.setClipData(ClipData.newRawUri(MediaStore.EXTRA_OUTPUT, pictureUri));
-    }
-
-    private void appendCropExtras(Intent intent) {
-        intent.putExtra("crop", "true");
-        intent.putExtra("scale", true);
-        intent.putExtra("scaleUpIfNeeded", true);
-        intent.putExtra("aspectX", 1);
-        intent.putExtra("aspectY", 1);
-        intent.putExtra("outputX", mPhotoSize);
-        intent.putExtra("outputY", mPhotoSize);
-    }
-
-    private void onPhotoCropped(final Uri data, final boolean cropped) {
-        new AsyncTask<Void, Void, Bitmap>() {
-            @Override
-            protected Bitmap doInBackground(Void... params) {
-                if (cropped) {
-                    InputStream imageStream = null;
-                    try {
-                        imageStream = mContext.getContentResolver()
-                                .openInputStream(data);
-                        return BitmapFactory.decodeStream(imageStream);
-                    } catch (FileNotFoundException fe) {
-                        Log.w(TAG, "Cannot find image file", fe);
-                        return null;
-                    } finally {
-                        if (imageStream != null) {
-                            try {
-                                imageStream.close();
-                            } catch (IOException ioe) {
-                                Log.w(TAG, "Cannot close image stream", ioe);
-                            }
-                        }
-                    }
-                } else {
-                    // Scale and crop to a square aspect ratio
-                    Bitmap croppedImage = Bitmap.createBitmap(mPhotoSize, mPhotoSize,
-                            Config.ARGB_8888);
-                    Canvas canvas = new Canvas(croppedImage);
-                    Bitmap fullImage = null;
-                    try {
-                        InputStream imageStream = mContext.getContentResolver()
-                                .openInputStream(data);
-                        fullImage = BitmapFactory.decodeStream(imageStream);
-                    } catch (FileNotFoundException fe) {
-                        return null;
-                    }
-                    if (fullImage != null) {
-                        final int squareSize = Math.min(fullImage.getWidth(),
-                                fullImage.getHeight());
-                        final int left = (fullImage.getWidth() - squareSize) / 2;
-                        final int top = (fullImage.getHeight() - squareSize) / 2;
-                        Rect rectSource = new Rect(left, top,
-                                left + squareSize, top + squareSize);
-                        Rect rectDest = new Rect(0, 0, mPhotoSize, mPhotoSize);
-                        Paint paint = new Paint();
-                        canvas.drawBitmap(fullImage, rectSource, rectDest, paint);
-                        return croppedImage;
-                    } else {
-                        // Bah! Got nothin.
-                        return null;
-                    }
-                }
-            }
-
-            @Override
-            protected void onPostExecute(Bitmap bitmap) {
-                if (bitmap != null) {
-                    mNewUserPhotoBitmap = bitmap;
-                    mNewUserPhotoDrawable = CircleFramedDrawable
-                            .getInstance(mImageView.getContext(), mNewUserPhotoBitmap);
-                    mImageView.setImageDrawable(mNewUserPhotoDrawable);
-                }
-                new File(mContext.getCacheDir(), TAKE_PICTURE_FILE_NAME).delete();
-                new File(mContext.getCacheDir(), CROP_PICTURE_FILE_NAME).delete();
-            }
-        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void[]) null);
-    }
-
-    private static int getPhotoSize(Context context) {
-        Cursor cursor = context.getContentResolver().query(
-                DisplayPhoto.CONTENT_MAX_DIMENSIONS_URI,
-                new String[]{DisplayPhoto.DISPLAY_MAX_DIM}, null, null, null);
-        try {
-            cursor.moveToFirst();
-            return cursor.getInt(0);
-        } finally {
-            cursor.close();
-        }
-    }
-
-    private Uri createTempImageUri(Context context, String fileName, boolean purge) {
-        final File folder = context.getCacheDir();
-        folder.mkdirs();
-        final File fullPath = new File(folder, fileName);
-        if (purge) {
-            fullPath.delete();
-        }
-        return FileProvider.getUriForFile(context, Utils.FILE_PROVIDER_AUTHORITY, fullPath);
-    }
-
-    File saveNewUserPhotoBitmap() {
-        if (mNewUserPhotoBitmap == null) {
-            return null;
-        }
-        try {
-            File file = new File(mContext.getCacheDir(), NEW_USER_PHOTO_FILE_NAME);
-            OutputStream os = new FileOutputStream(file);
-            mNewUserPhotoBitmap.compress(Bitmap.CompressFormat.PNG, 100, os);
-            os.flush();
-            os.close();
-            return file;
-        } catch (IOException e) {
-            Log.e(TAG, "Cannot create temp file", e);
-        }
-        return null;
-    }
-
-    static Bitmap loadNewUserPhotoBitmap(File file) {
-        return BitmapFactory.decodeFile(file.getAbsolutePath());
-    }
-
-    void removeNewUserPhotoBitmapFile() {
-        new File(mContext.getCacheDir(), NEW_USER_PHOTO_FILE_NAME).delete();
-    }
-
-    private static final class RestrictedMenuItem {
-        private final Context mContext;
-        private final String mTitle;
-        private final Runnable mAction;
-        private final RestrictedLockUtils.EnforcedAdmin mAdmin;
-        // Restriction may be set by system or something else via UserManager.setUserRestriction().
-        private final boolean mIsRestrictedByBase;
-
-        /**
-         * The menu item, used for popup menu. Any element of such a menu can be disabled by admin.
-         * @param context A context.
-         * @param title The title of the menu item.
-         * @param restriction The restriction, that if is set, blocks the menu item.
-         * @param action The action on menu item click.
-         */
-        public RestrictedMenuItem(Context context, String title, String restriction,
-                Runnable action) {
-            mContext = context;
-            mTitle = title;
-            mAction = action;
-
-            final int myUserId = UserHandle.myUserId();
-            mAdmin = RestrictedLockUtilsInternal.checkIfRestrictionEnforced(context,
-                    restriction, myUserId);
-            mIsRestrictedByBase = RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
-                    restriction, myUserId);
-        }
-
-        @Override
-        public String toString() {
-            return mTitle;
-        }
-
-        final void doAction() {
-            if (isRestrictedByBase()) {
-                return;
-            }
-
-            if (isRestrictedByAdmin()) {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mContext, mAdmin);
-                return;
-            }
-
-            mAction.run();
-        }
-
-        final boolean isRestrictedByAdmin() {
-            return mAdmin != null;
-        }
-
-        final boolean isRestrictedByBase() {
-            return mIsRestrictedByBase;
-        }
-    }
-
-    /**
-     * Provide this adapter to ListPopupWindow.setAdapter() to have a popup window menu, where
-     * any element can be restricted by admin (profile owner or device owner).
-     */
-    private static final class RestrictedPopupMenuAdapter extends ArrayAdapter<RestrictedMenuItem> {
-        public RestrictedPopupMenuAdapter(Context context, List<RestrictedMenuItem> items) {
-            super(context, R.layout.restricted_popup_menu_item, R.id.text, items);
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            final View view = super.getView(position, convertView, parent);
-            final RestrictedMenuItem item = getItem(position);
-            final TextView text = (TextView) view.findViewById(R.id.text);
-            final ImageView image = (ImageView) view.findViewById(R.id.restricted_icon);
-
-            text.setEnabled(!item.isRestrictedByAdmin() && !item.isRestrictedByBase());
-            image.setVisibility(item.isRestrictedByAdmin() && !item.isRestrictedByBase() ?
-                    ImageView.VISIBLE : ImageView.GONE);
-
-            return view;
-        }
-    }
-}
diff --git a/src/com/android/settings/users/MultiUserFooterPreferenceController.java b/src/com/android/settings/users/MultiUserFooterPreferenceController.java
deleted file mode 100644
index 03ed6ce..0000000
--- a/src/com/android/settings/users/MultiUserFooterPreferenceController.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.users;
-
-import android.content.Context;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-
-import com.android.settings.core.BasePreferenceController;
-
-public class MultiUserFooterPreferenceController extends BasePreferenceController {
-
-    @VisibleForTesting
-    final UserCapabilities mUserCaps;
-
-    public MultiUserFooterPreferenceController(Context context, String key) {
-        super(context, key);
-        mUserCaps = UserCapabilities.create(context);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return (mUserCaps.mEnabled && !mUserCaps.mUserSwitcherEnabled)
-                ? AVAILABLE_UNSEARCHABLE
-                : DISABLED_FOR_USER;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        mUserCaps.updateAddUserCapabilities(mContext);
-        preference.setVisible(isAvailable());
-    }
-}
diff --git a/src/com/android/settings/users/MultiUserTopIntroPreferenceController.java b/src/com/android/settings/users/MultiUserTopIntroPreferenceController.java
new file mode 100644
index 0000000..a8076c2
--- /dev/null
+++ b/src/com/android/settings/users/MultiUserTopIntroPreferenceController.java
@@ -0,0 +1,52 @@
+/*
+ * 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.users;
+
+import android.content.Context;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+
+import com.android.settings.core.BasePreferenceController;
+
+/**
+ * MultiUserTopIntroPreferenceController can control the visibility of multi user top info
+ * preference.
+ */
+public class MultiUserTopIntroPreferenceController extends BasePreferenceController {
+
+    @VisibleForTesting
+    final UserCapabilities mUserCaps;
+
+    public MultiUserTopIntroPreferenceController(Context context, String key) {
+        super(context, key);
+        mUserCaps = UserCapabilities.create(context);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return (mUserCaps.mEnabled && !mUserCaps.mUserSwitcherEnabled)
+                ? AVAILABLE_UNSEARCHABLE
+                : DISABLED_FOR_USER;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        mUserCaps.updateAddUserCapabilities(mContext);
+        preference.setVisible(isAvailable());
+    }
+}
diff --git a/src/com/android/settings/users/PhotoCapabilityUtils.java b/src/com/android/settings/users/PhotoCapabilityUtils.java
deleted file mode 100644
index 1e09857..0000000
--- a/src/com/android/settings/users/PhotoCapabilityUtils.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2020 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.users;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.provider.MediaStore;
-
-class PhotoCapabilityUtils {
-
-    /**
-     * Check if the current user can perform any activity for
-     * android.media.action.IMAGE_CAPTURE action.
-     */
-    static boolean canTakePhoto(Context context) {
-        return context.getPackageManager().queryIntentActivities(
-                new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
-                PackageManager.MATCH_DEFAULT_ONLY).size() > 0;
-    }
-
-    /**
-     * Check if the current user can perform any activity for
-     * android.intent.action.GET_CONTENT action for images.
-     */
-    static boolean canChoosePhoto(Context context) {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("image/*");
-        return context.getPackageManager().queryIntentActivities(intent, 0).size() > 0;
-    }
-
-    /**
-     * Check if the current user can perform any activity for
-     * com.android.camera.action.CROP action for images.
-     */
-    static boolean canCropPhoto(Context context) {
-        Intent intent = new Intent("com.android.camera.action.CROP");
-        intent.setType("image/*");
-        return context.getPackageManager().queryIntentActivities(intent, 0).size() > 0;
-    }
-
-}
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 897b3c7..5005399 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -243,7 +243,7 @@
                 mDefaultGuestRestrictions = mUserManager.getDefaultGuestRestrictions();
                 mPhonePref.setChecked(
                         !mDefaultGuestRestrictions.getBoolean(UserManager.DISALLOW_OUTGOING_CALLS));
-                mRemoveUserPref.setTitle(R.string.user_exit_guest_title);
+                mRemoveUserPref.setTitle(R.string.user_exit_guest_menu);
             } else {
                 mPhonePref.setChecked(!mUserManager.hasUserRestriction(
                         UserManager.DISALLOW_OUTGOING_CALLS, new UserHandle(userId)));
@@ -309,7 +309,7 @@
             // Update the guest's restrictions, if there is a guest
             // TODO: Maybe setDefaultGuestRestrictions() can internally just set the restrictions
             // on any existing guest rather than do it here with multiple Binder calls.
-            List<UserInfo> users = mUserManager.getUsers(true);
+            List<UserInfo> users = mUserManager.getAliveUsers();
             for (UserInfo user : users) {
                 if (user.isGuest()) {
                     UserHandle userHandle = UserHandle.of(user.id);
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 9669190..8ba5432 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -16,8 +16,6 @@
 
 package com.android.settings.users;
 
-import static android.os.Process.myUserHandle;
-
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.Dialog;
@@ -33,16 +31,19 @@
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Process;
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.ContactsContract;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.SparseArray;
 import android.view.Menu;
@@ -73,6 +74,8 @@
 import com.android.settingslib.RestrictedPreference;
 import com.android.settingslib.drawable.CircleFramedDrawable;
 import com.android.settingslib.search.SearchIndexable;
+import com.android.settingslib.users.EditUserInfoController;
+import com.android.settingslib.users.UserCreatingDialog;
 import com.android.settingslib.utils.ThreadUtils;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
@@ -83,7 +86,6 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Random;
 
 /**
  * Screen that manages the list of users on the device.
@@ -109,7 +111,7 @@
     private static final String KEY_ADD_GUEST = "guest_add";
     private static final String KEY_ADD_USER = "user_add";
     private static final String KEY_ADD_USER_WHEN_LOCKED = "user_settings_add_users_when_locked";
-    private static final String KEY_MULTIUSER_FOOTER = "multiuser_footer";
+    private static final String KEY_MULTIUSER_TOP_INTRO = "multiuser_top_intro";
 
     private static final int MENU_REMOVE_USER = Menu.FIRST;
 
@@ -163,18 +165,24 @@
     private final Object mUserLock = new Object();
     private UserManager mUserManager;
     private static SparseArray<Bitmap> sDarkDefaultUserBitmapCache = new SparseArray<>();
+    private static Bitmap sRemoveGuestBitmap = null;
 
     private MultiUserSwitchBarController mSwitchBarController;
-    private EditUserInfoController mEditUserInfoController = new EditUserInfoController();
+    private EditUserInfoController mEditUserInfoController =
+            new EditUserInfoController(Utils.FILE_PROVIDER_AUTHORITY);
     private AddUserWhenLockedPreferenceController mAddUserWhenLockedPreferenceController;
-    private MultiUserFooterPreferenceController mMultiUserFooterPreferenceController;
+    private MultiUserTopIntroPreferenceController mMultiUserTopIntroPreferenceController;
+    private UserCreatingDialog mUserCreatingDialog;
 
     private CharSequence mPendingUserName;
     private Drawable mPendingUserIcon;
 
     // A place to cache the generated default avatar
     private Drawable mDefaultIconDrawable;
+    private Drawable mRemoveGuestIconDrawable;
 
+    // TODO:   Replace current Handler solution to something that doesn't leak memory and works
+    // TODO:   during a configuration change
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
@@ -235,12 +243,12 @@
         mAddUserWhenLockedPreferenceController = new AddUserWhenLockedPreferenceController(
                 activity, KEY_ADD_USER_WHEN_LOCKED);
 
-        mMultiUserFooterPreferenceController = new MultiUserFooterPreferenceController(activity,
-                KEY_MULTIUSER_FOOTER);
+        mMultiUserTopIntroPreferenceController = new MultiUserTopIntroPreferenceController(activity,
+                KEY_MULTIUSER_TOP_INTRO);
 
         final PreferenceScreen screen = getPreferenceScreen();
         mAddUserWhenLockedPreferenceController.displayPreference(screen);
-        mMultiUserFooterPreferenceController.displayPreference(screen);
+        mMultiUserTopIntroPreferenceController.displayPreference(screen);
 
         screen.findPreference(mAddUserWhenLockedPreferenceController.getPreferenceKey())
                 .setOnPreferenceChangeListener(mAddUserWhenLockedPreferenceController);
@@ -321,9 +329,9 @@
 
     @Override
     public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
         mEditUserInfoController.onSaveInstanceState(outState);
         outState.putInt(SAVE_REMOVING_USER, mRemovingUserId);
+        super.onSaveInstanceState(outState);
     }
 
     @Override
@@ -378,8 +386,8 @@
     private void loadProfile() {
         if (isCurrentUserGuest()) {
             // No need to load profile information
-            mMePreference.setIcon(getEncircledDefaultIcon());
-            mMePreference.setTitle(R.string.user_exit_guest_title);
+            mMePreference.setIcon(getEncircledRemoveGuestIcon());
+            mMePreference.setTitle(R.string.user_clear_guest_menu);
             mMePreference.setSelectable(true);
             // removing a guest will result in switching back to the admin user
             mMePreference.setEnabled(canSwitchUserNow());
@@ -471,11 +479,22 @@
     }
 
     private void onUserCreated(int userId) {
+        hideUserCreatingDialog();
+        // prevent crash when config changes during user creation
+        if (getContext() == null) {
+            return;
+        }
         mAddingUser = false;
         UserInfo userInfo = mUserManager.getUserInfo(userId);
         openUserDetails(userInfo, true);
     }
 
+    private void hideUserCreatingDialog() {
+        if (mUserCreatingDialog != null && mUserCreatingDialog.isShowing()) {
+            mUserCreatingDialog.dismiss();
+        }
+    }
+
     private void openUserDetails(UserInfo userInfo, boolean newUser) {
         Bundle extras = new Bundle();
         extras.putInt(UserDetailsSettings.EXTRA_USER_ID, userInfo.id);
@@ -605,94 +624,82 @@
                 return dlg;
             }
             case DIALOG_USER_PROFILE_EDITOR: {
-                UserHandle user = myUserHandle();
-                UserInfo info = mUserManager.getUserInfo(user.getIdentifier());
-                return mEditUserInfoController.createDialog(
-                        this,
-                        Utils.getUserIcon(getPrefContext(), mUserManager, info),
-                        info.name,
-                        getString(com.android.settingslib.R.string.profile_info_settings_title),
-                        new EditUserInfoController.OnContentChangedCallback() {
-                            @Override
-                            public void onPhotoChanged(UserHandle user, Drawable photo) {
-                                ThreadUtils.postOnBackgroundThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        mUserManager.setUserIcon(user.getIdentifier(),
-                                                UserIcons.convertToBitmap(photo));
-                                    }
-                                });
-                                mMePreference.setIcon(photo);
-                            }
-
-                            @Override
-                            public void onLabelChanged(UserHandle user, CharSequence label) {
-                                mMePreference.setTitle(label.toString());
-                                mUserManager.setUserName(user.getIdentifier(), label.toString());
-                            }
-                        },
-                        user,
-                        null);
+                return buildEditCurrentUserDialog();
             }
             case DIALOG_USER_PROFILE_EDITOR_ADD_USER: {
                 synchronized (mUserLock) {
-                    mPendingUserIcon = UserIcons.getDefaultUserIcon(getPrefContext().getResources(),
-                            new Random(System.currentTimeMillis()).nextInt(8), false);
                     mPendingUserName = getString(
                             com.android.settingslib.R.string.user_new_user_name);
+                    mPendingUserIcon = null;
                 }
-                return buildAddUserProfileEditorDialog(USER_TYPE_USER);
+                return buildAddUserDialog(USER_TYPE_USER);
             }
             case DIALOG_USER_PROFILE_EDITOR_ADD_RESTRICTED_PROFILE: {
                 synchronized (mUserLock) {
-                    mPendingUserIcon = UserIcons.getDefaultUserIcon(getPrefContext().getResources(),
-                            new Random(System.currentTimeMillis()).nextInt(8), false);
                     mPendingUserName = getString(
                             com.android.settingslib.R.string.user_new_profile_name);
+                    mPendingUserIcon = null;
                 }
-                return buildAddUserProfileEditorDialog(USER_TYPE_RESTRICTED_PROFILE);
+                return buildAddUserDialog(USER_TYPE_RESTRICTED_PROFILE);
             }
             default:
                 return null;
         }
     }
 
-    private Dialog buildAddUserProfileEditorDialog(int userType) {
+    private Dialog buildEditCurrentUserDialog() {
+        final Activity activity = getActivity();
+        if (activity == null) {
+            return null;
+        }
+
+        UserInfo user = mUserManager.getUserInfo(Process.myUserHandle().getIdentifier());
+        Drawable userIcon = Utils.getUserIcon(activity, mUserManager, user);
+
+        return mEditUserInfoController.createDialog(
+                activity,
+                this::startActivityForResult,
+                userIcon,
+                user.name,
+                getString(com.android.settingslib.R.string.profile_info_settings_title),
+                (newUserName, newUserIcon) -> {
+                    if (newUserIcon != userIcon) {
+                        ThreadUtils.postOnBackgroundThread(() ->
+                                mUserManager.setUserIcon(user.id,
+                                        UserIcons.convertToBitmap(newUserIcon)));
+                        mMePreference.setIcon(newUserIcon);
+                    }
+
+                    if (!TextUtils.isEmpty(newUserName) && !newUserName.equals(user.name)) {
+                        mMePreference.setTitle(newUserName);
+                        mUserManager.setUserName(user.id, newUserName);
+                    }
+                }, null);
+    }
+
+    private Dialog buildAddUserDialog(int userType) {
         Dialog d;
         synchronized (mUserLock) {
             d = mEditUserInfoController.createDialog(
-                    this,
-                    mPendingUserIcon,
-                    mPendingUserName,
+                    getActivity(),
+                    this::startActivityForResult,
+                    null,
+                    mPendingUserName.toString(),
                     getString(userType == USER_TYPE_USER
                             ? com.android.settingslib.R.string.user_info_settings_title
                             : com.android.settingslib.R.string.profile_info_settings_title),
-                    new EditUserInfoController.OnContentChangedCallback() {
-                        @Override
-                        public void onPhotoChanged(UserHandle user, Drawable photo) {
-                            mPendingUserIcon = photo;
-                        }
-
-                        @Override
-                        public void onLabelChanged(UserHandle user, CharSequence label) {
-                            mPendingUserName = label;
-                        }
+                    (userName, userIcon) -> {
+                        mPendingUserIcon = userIcon;
+                        mPendingUserName = userName;
+                        addUserNow(userType);
                     },
-                    myUserHandle(),
-                    new EditUserInfoController.OnDialogCompleteCallback() {
-                        @Override
-                        public void onPositive() {
-                            addUserNow(userType);
+                    () -> {
+                        synchronized (mUserLock) {
+                            mPendingUserIcon = null;
+                            mPendingUserName = null;
                         }
-
-                        @Override
-                        public void onNegativeOrCancel() {
-                            synchronized (mUserLock) {
-                                mPendingUserIcon = null;
-                                mPendingUserName = null;
-                            }
-                        }
-                    });
+                    }
+            );
         }
         return d;
     }
@@ -743,8 +750,9 @@
             return;
         }
         try {
+            getContext().getSystemService(UserManager.class)
+                    .removeUserOrSetEphemeral(UserHandle.myUserId());
             ActivityManager.getService().switchUser(UserHandle.USER_SYSTEM);
-            getContext().getSystemService(UserManager.class).removeUser(UserHandle.myUserId());
         } catch (RemoteException re) {
             Log.e(TAG, "Unable to remove self user");
         }
@@ -759,6 +767,9 @@
                     : (mPendingUserName != null ? mPendingUserName.toString()
                             : getString(R.string.user_new_profile_name));
         }
+
+        mUserCreatingDialog = new UserCreatingDialog(getActivity());
+        mUserCreatingDialog.show();
         ThreadUtils.postOnBackgroundThread(new Runnable() {
             @Override
             public void run() {
@@ -781,13 +792,15 @@
                         mAddingUser = false;
                         mPendingUserIcon = null;
                         mPendingUserName = null;
+                        ThreadUtils.postOnMainThread(() -> hideUserCreatingDialog());
                         return;
                     }
 
-                    if (mPendingUserIcon != null) {
-                        mUserManager.setUserIcon(user.id,
-                                UserIcons.convertToBitmap(mPendingUserIcon));
+                    Drawable newUserIcon = mPendingUserIcon;
+                    if (newUserIcon == null) {
+                        newUserIcon = UserIcons.getDefaultUserIcon(getResources(), user.id, false);
                     }
+                    mUserManager.setUserIcon(user.id, UserIcons.convertToBitmap(newUserIcon));
 
                     if (userType == USER_TYPE_USER) {
                         mHandler.sendEmptyMessage(MESSAGE_UPDATE_LIST);
@@ -820,7 +833,7 @@
         if (context == null) {
             return;
         }
-        final List<UserInfo> users = mUserManager.getUsers(true);
+        final List<UserInfo> users = mUserManager.getAliveUsers();
 
         final ArrayList<Integer> missingIcons = new ArrayList<>();
         final ArrayList<UserPreference> userPreferences = new ArrayList<>();
@@ -889,7 +902,7 @@
                 } else {
                     setPhotoId(pref, user);
                 }
-            } else {
+            } else if (!user.isGuest()) {
                 // Icon not available yet, print a placeholder
                 pref.setIcon(getEncircledDefaultIcon());
             }
@@ -926,14 +939,14 @@
         // Remove everything from mUserListCategory and add new users.
         mUserListCategory.removeAll();
 
-        // If multi-user is disabled, just show footer and return.
+        // If multi-user is disabled, just show top info and return.
         final Preference addUserOnLockScreen = getPreferenceScreen().findPreference(
                 mAddUserWhenLockedPreferenceController.getPreferenceKey());
         mAddUserWhenLockedPreferenceController.updateState(addUserOnLockScreen);
 
-        final Preference multiUserFooterPrefence = getPreferenceScreen().findPreference(
-                mMultiUserFooterPreferenceController.getPreferenceKey());
-        mMultiUserFooterPreferenceController.updateState(multiUserFooterPrefence);
+        final Preference multiUserTopIntroPrefence = getPreferenceScreen().findPreference(
+                mMultiUserTopIntroPreferenceController.getPreferenceKey());
+        mMultiUserTopIntroPreferenceController.updateState(multiUserTopIntroPrefence);
         mUserListCategory.setVisible(mUserCaps.mUserSwitcherEnabled);
 
         updateAddGuest(context, users.stream().anyMatch(UserInfo::isGuest));
@@ -1034,6 +1047,14 @@
         return mDefaultIconDrawable;
     }
 
+    private Drawable getEncircledRemoveGuestIcon() {
+        if (mRemoveGuestIconDrawable == null) {
+            mRemoveGuestIconDrawable = encircle(
+                    getRemoveGuestIconAsBitmap(getContext().getResources()));
+        }
+        return mRemoveGuestIconDrawable;
+    }
+
     private void setPhotoId(Preference pref, UserInfo user) {
         Bitmap bitmap = mUserIcons.get(user.id);
         if (bitmap != null) {
@@ -1113,6 +1134,23 @@
     }
 
     /**
+     * Returns a remove guest icon (as a {@link Bitmap})
+     *
+     * @param resources resources object to fetch the remove guest icon.
+     */
+    private static Bitmap getRemoveGuestIconAsBitmap(Resources resources) {
+        if (sRemoveGuestBitmap == null) {
+            Drawable icon = resources.getDrawable(R.drawable.ic_delete, null).mutate();
+            icon.setColorFilter(
+                    resources.getColor(com.android.internal.R.color.user_icon_default_gray, null),
+                    PorterDuff.Mode.SRC_IN);
+            icon.setBounds(0, 0, icon.getIntrinsicWidth(), icon.getIntrinsicHeight());
+            sRemoveGuestBitmap = UserIcons.convertToBitmap(icon);
+        }
+        return sRemoveGuestBitmap;
+    }
+
+    /**
      * Assign the default photo to user with {@paramref userId}
      *
      * @param context used to get the {@link UserManager}
diff --git a/src/com/android/settings/utils/ContentCaptureUtils.java b/src/com/android/settings/utils/ContentCaptureUtils.java
index a92651f..b01749f 100644
--- a/src/com/android/settings/utils/ContentCaptureUtils.java
+++ b/src/com/android/settings/utils/ContentCaptureUtils.java
@@ -45,7 +45,7 @@
 
     public static boolean isFeatureAvailable() {
         // We cannot look for ContentCaptureManager, because it's not available if the service
-        // didn't whitelist Settings
+        // didn't allowlist Settings
         IBinder service = ServiceManager.checkService(Context.CONTENT_CAPTURE_MANAGER_SERVICE);
         return service != null;
     }
diff --git a/src/com/android/settings/vpn2/AppDialogFragment.java b/src/com/android/settings/vpn2/AppDialogFragment.java
index ea9e546..9c73784 100644
--- a/src/com/android/settings/vpn2/AppDialogFragment.java
+++ b/src/com/android/settings/vpn2/AppDialogFragment.java
@@ -167,7 +167,7 @@
         try {
             if (mPackageInfo.packageName.equals(VpnUtils.getConnectedPackage(mService, userId))) {
                 mService.setAlwaysOnVpnPackage(userId, null, /* lockdownEnabled */ false,
-                        /* lockdownWhitelist */ null);
+                        /* lockdownAllowlist */ null);
                 mService.prepareVpn(mPackageInfo.packageName, VpnConfig.LEGACY_VPN, userId);
             }
         } catch (RemoteException e) {
diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
index 8280a3d..d2cbcd5 100644
--- a/src/com/android/settings/vpn2/AppManagementFragment.java
+++ b/src/com/android/settings/vpn2/AppManagementFragment.java
@@ -231,7 +231,7 @@
 
     private boolean setAlwaysOnVpn(boolean isEnabled, boolean isLockdown) {
         return mConnectivityManager.setAlwaysOnVpnPackageForUser(mUserId,
-                isEnabled ? mPackageName : null, isLockdown, /* lockdownWhitelist */ null);
+                isEnabled ? mPackageName : null, isLockdown, /* lockdownAllowlist */ null);
     }
 
     private void updateUI() {
diff --git a/src/com/android/settings/vpn2/ConfigDialog.java b/src/com/android/settings/vpn2/ConfigDialog.java
index 12d91ec..26c1565 100644
--- a/src/com/android/settings/vpn2/ConfigDialog.java
+++ b/src/com/android/settings/vpn2/ConfigDialog.java
@@ -348,14 +348,14 @@
         mView.findViewById(R.id.vpn_proxy_fields).setVisibility(visible);
     }
 
-    private boolean hasAdvancedOptionsEnabled() {
+    private boolean isAdvancedOptionsEnabled() {
         return mSearchDomains.getText().length() > 0 || mDnsServers.getText().length() > 0 ||
                     mRoutes.getText().length() > 0 || mProxyHost.getText().length() > 0
                     || mProxyPort.getText().length() > 0;
     }
 
     private void configureAdvancedOptionsVisibility() {
-        if (mShowOptions.isChecked() || hasAdvancedOptionsEnabled()) {
+        if (mShowOptions.isChecked() || isAdvancedOptionsEnabled()) {
             mView.findViewById(R.id.options).setVisibility(View.VISIBLE);
             mShowOptions.setVisibility(View.GONE);
 
diff --git a/src/com/android/settings/vpn2/ConfigDialogFragment.java b/src/com/android/settings/vpn2/ConfigDialogFragment.java
index 57ba8bf..d6b92d7 100644
--- a/src/com/android/settings/vpn2/ConfigDialogFragment.java
+++ b/src/com/android/settings/vpn2/ConfigDialogFragment.java
@@ -180,7 +180,7 @@
 
             final ConnectivityManager conn = ConnectivityManager.from(mContext);
             conn.setAlwaysOnVpnPackageForUser(UserHandle.myUserId(), null,
-                    /* lockdownEnabled */ false, /* lockdownWhitelist */ null);
+                    /* lockdownEnabled */ false, /* lockdownAllowlist */ null);
             VpnUtils.setLockdownVpn(mContext, profile.key);
         } else {
             // update only if lockdown vpn has been changed
diff --git a/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java b/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
index abbf3dc..f6b5a84 100644
--- a/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
+++ b/src/com/android/settings/wallpaper/StyleSuggestionActivityBase.java
@@ -38,7 +38,7 @@
         super.onCreate(savedInstanceState);
         final PackageManager pm = getPackageManager();
         final Intent intent = new Intent()
-                .setComponent(new WallpaperPreferenceController(this, "dummy key")
+                .setComponent(new WallpaperPreferenceController(this, "unused key")
                         .getComponentName())
                 .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
 
diff --git a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
index a5cc414..c2b3fa0 100644
--- a/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
+++ b/src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
@@ -23,6 +23,7 @@
 
 import androidx.annotation.VisibleForTesting;
 
+import com.android.settings.R;
 import com.android.settings.display.WallpaperPreferenceController;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.Indexable;
@@ -40,11 +41,18 @@
     private static final String WALLPAPER_FLAVOR_EXTRA = "com.android.launcher3.WALLPAPER_FLAVOR";
     private static final String WALLPAPER_FOCUS = "focus_wallpaper";
     private static final String WALLPAPER_ONLY = "wallpaper_only";
+    private static final String LAUNCHED_SUW = "app_launched_suw";
+
+    private String mWallpaperLaunchExtra;
 
     @Override
     protected void addExtras(Intent intent) {
         if (WizardManagerHelper.isAnySetupWizard(intent)) {
             intent.putExtra(WALLPAPER_FLAVOR_EXTRA, WALLPAPER_ONLY);
+
+            mWallpaperLaunchExtra =
+                    getResources().getString(R.string.config_wallpaper_picker_launch_extra);
+            intent.putExtra(mWallpaperLaunchExtra, LAUNCHED_SUW);
         } else {
             intent.putExtra(WALLPAPER_FLAVOR_EXTRA, WALLPAPER_FOCUS);
         }
@@ -69,7 +77,7 @@
                         boolean enabled) {
                     final List<SearchIndexableRaw> result = new ArrayList<>();
                     WallpaperPreferenceController controller =
-                            new WallpaperPreferenceController(context, "dummy key");
+                            new WallpaperPreferenceController(context, "unused key");
                     SearchIndexableRaw data = new SearchIndexableRaw(context);
                     data.title = controller.getTitle();
                     data.screenTitle = data.title;
diff --git a/src/com/android/settings/widget/GenericSwitchController.java b/src/com/android/settings/widget/GenericSwitchController.java
new file mode 100644
index 0000000..b1b4342
--- /dev/null
+++ b/src/com/android/settings/widget/GenericSwitchController.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2020 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 androidx.preference.Preference;
+
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedSwitchPreference;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+/**
+ * The switch controller that is used to update the switch widget in the PrimarySwitchPreference
+ * and RestrictedSwitchPreference layouts.
+ */
+public class GenericSwitchController extends SwitchWidgetController implements
+        Preference.OnPreferenceChangeListener {
+
+    private Preference mPreference;
+    private MetricsFeatureProvider mMetricsFeatureProvider;
+
+    public GenericSwitchController(PrimarySwitchPreference preference) {
+        setPreference(preference);
+    }
+
+    public GenericSwitchController(RestrictedSwitchPreference preference) {
+        setPreference(preference);
+    }
+
+    private void setPreference(Preference preference) {
+        mPreference = preference;
+        mMetricsFeatureProvider =
+                FeatureFactory.getFactory(preference.getContext()).getMetricsFeatureProvider();
+    }
+
+    @Override
+    public void updateTitle(boolean isChecked) {
+    }
+
+    @Override
+    public void startListening() {
+        mPreference.setOnPreferenceChangeListener(this);
+    }
+
+    @Override
+    public void stopListening() {
+        mPreference.setOnPreferenceChangeListener(null);
+    }
+
+    @Override
+    public void setChecked(boolean checked) {
+        if (mPreference instanceof PrimarySwitchPreference) {
+            ((PrimarySwitchPreference) mPreference).setChecked(checked);
+        } else if (mPreference instanceof RestrictedSwitchPreference) {
+            ((RestrictedSwitchPreference) mPreference).setChecked(checked);
+        }
+    }
+
+    @Override
+    public boolean isChecked() {
+        if (mPreference instanceof PrimarySwitchPreference) {
+            return ((PrimarySwitchPreference) mPreference).isChecked();
+        } else if (mPreference instanceof RestrictedSwitchPreference) {
+            return ((RestrictedSwitchPreference) mPreference).isChecked();
+        }
+        return false;
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        if (mPreference instanceof PrimarySwitchPreference) {
+            ((PrimarySwitchPreference) mPreference).setSwitchEnabled(enabled);
+        } else if (mPreference instanceof RestrictedSwitchPreference) {
+            ((RestrictedSwitchPreference) mPreference).setEnabled(enabled);
+        }
+    }
+
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (mListener != null) {
+            final boolean result = mListener.onSwitchToggled((Boolean) newValue);
+            if (result) {
+                mMetricsFeatureProvider.logClickedPreference(preference,
+                        preference.getExtras().getInt(DashboardFragment.CATEGORY));
+            }
+            return result;
+        }
+        return false;
+    }
+
+    @Override
+    public void setDisabledByAdmin(EnforcedAdmin admin) {
+        if (mPreference instanceof PrimarySwitchPreference) {
+            ((PrimarySwitchPreference) mPreference).setDisabledByAdmin(admin);
+        } else if (mPreference instanceof RestrictedSwitchPreference) {
+            ((RestrictedSwitchPreference) mPreference).setDisabledByAdmin(admin);
+        }
+    }
+}
diff --git a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
index 81dc98b..e89e793 100644
--- a/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
+++ b/src/com/android/settings/widget/HighlightablePreferenceGroupAdapter.java
@@ -23,7 +23,6 @@
 import android.animation.ArgbEvaluator;
 import android.animation.ValueAnimator;
 import android.content.Context;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -114,7 +113,9 @@
     @VisibleForTesting
     void updateBackground(PreferenceViewHolder holder, int position) {
         View v = holder.itemView;
-        if (position == mHighlightPosition) {
+        if (position == mHighlightPosition
+                && (mHighlightKey != null
+                        && TextUtils.equals(mHighlightKey, getItem(position).getKey()))) {
             // This position should be highlighted. If it's highlighted before - skip animation.
             addHighlightBackground(v, !mFadeInAnimated);
         } else if (Boolean.TRUE.equals(v.getTag(R.id.preference_highlighted))) {
diff --git a/src/com/android/settings/widget/LabeledSeekBar.java b/src/com/android/settings/widget/LabeledSeekBar.java
index 14c3d7d..5945c75 100644
--- a/src/com/android/settings/widget/LabeledSeekBar.java
+++ b/src/com/android/settings/widget/LabeledSeekBar.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.widget;
 
+import static android.view.HapticFeedbackConstants.CLOCK_TICK;
+
 import android.content.Context;
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -48,6 +50,8 @@
     /** Labels for discrete progress values. */
     private String[] mLabels;
 
+    private int mLastProgress = -1;
+
     public LabeledSeekBar(Context context, AttributeSet attrs) {
         this(context, attrs, com.android.internal.R.attr.seekBarStyle);
     }
@@ -118,6 +122,10 @@
                 mOnSeekBarChangeListener.onProgressChanged(seekBar, progress, fromUser);
                 sendClickEventForAccessibility(progress);
             }
+            if (progress != mLastProgress) {
+                seekBar.performHapticFeedback(CLOCK_TICK);
+                mLastProgress = progress;
+            }
         }
     };
 
diff --git a/src/com/android/settings/widget/MasterCheckBoxPreference.java b/src/com/android/settings/widget/MasterCheckBoxPreference.java
deleted file mode 100644
index 48e09c9..0000000
--- a/src/com/android/settings/widget/MasterCheckBoxPreference.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.CheckBox;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settingslib.TwoTargetPreference;
-
-/**
- * A custom preference that provides inline checkbox. It has a mandatory field for title, and
- * optional fields for icon and sub-text.
- */
-public class MasterCheckBoxPreference extends TwoTargetPreference {
-
-    private CheckBox mCheckBox;
-    private boolean mChecked;
-    private boolean mEnableCheckBox = true;
-
-    public MasterCheckBoxPreference(Context context, AttributeSet attrs,
-            int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    public MasterCheckBoxPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public MasterCheckBoxPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MasterCheckBoxPreference(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected int getSecondTargetResId() {
-        return R.layout.preference_widget_master_checkbox;
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        final View widgetView = holder.findViewById(android.R.id.widget_frame);
-        if (widgetView != null) {
-            widgetView.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (mCheckBox != null && !mCheckBox.isEnabled()) {
-                        return;
-                    }
-                    setChecked(!mChecked);
-                    if (!callChangeListener(mChecked)) {
-                        setChecked(!mChecked);
-                    } else {
-                        persistBoolean(mChecked);
-                    }
-                }
-            });
-        }
-
-        mCheckBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
-        if (mCheckBox != null) {
-            mCheckBox.setContentDescription(getTitle());
-            mCheckBox.setChecked(mChecked);
-            mCheckBox.setEnabled(mEnableCheckBox);
-        }
-    }
-
-    @Override
-    public void setEnabled(boolean enabled) {
-        super.setEnabled(enabled);
-        setCheckBoxEnabled(enabled);
-    }
-
-    public boolean isChecked() {
-        return mCheckBox != null && mChecked;
-    }
-
-    public void setChecked(boolean checked) {
-        mChecked = checked;
-        if (mCheckBox != null) {
-            mCheckBox.setChecked(checked);
-        }
-    }
-
-    public void setCheckBoxEnabled(boolean enabled) {
-        mEnableCheckBox = enabled;
-        if (mCheckBox != null) {
-            mCheckBox.setEnabled(enabled);
-        }
-    }
-
-    public CheckBox getCheckBox() {
-        return mCheckBox;
-    }
-}
diff --git a/src/com/android/settings/widget/MasterSwitchController.java b/src/com/android/settings/widget/MasterSwitchController.java
deleted file mode 100644
index 92e3884..0000000
--- a/src/com/android/settings/widget/MasterSwitchController.java
+++ /dev/null
@@ -1,88 +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.widget;
-
-import androidx.preference.Preference;
-
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-
-/*
- * The switch controller that is used to update the switch widget in the MasterSwitchPreference
- * layout.
- */
-public class MasterSwitchController extends SwitchWidgetController implements
-    Preference.OnPreferenceChangeListener {
-
-    private final MasterSwitchPreference mPreference;
-    private final MetricsFeatureProvider mMetricsFeatureProvider;
-
-    public MasterSwitchController(MasterSwitchPreference preference) {
-        mPreference = preference;
-        mMetricsFeatureProvider = FeatureFactory.getFactory(preference.getContext())
-                .getMetricsFeatureProvider();
-    }
-
-    @Override
-    public void updateTitle(boolean isChecked) {
-    }
-
-    @Override
-    public void startListening() {
-        mPreference.setOnPreferenceChangeListener(this);
-    }
-
-    @Override
-    public void stopListening() {
-        mPreference.setOnPreferenceChangeListener(null);
-    }
-
-    @Override
-    public void setChecked(boolean checked) {
-        mPreference.setChecked(checked);
-    }
-
-    @Override
-    public boolean isChecked() {
-        return mPreference.isChecked();
-    }
-
-    @Override
-    public void setEnabled(boolean enabled) {
-        mPreference.setSwitchEnabled(enabled);
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (mListener != null) {
-            final boolean result = mListener.onSwitchToggled((Boolean) newValue);
-            if (result) {
-                mMetricsFeatureProvider.logClickedPreference(preference,
-                        preference.getExtras().getInt(DashboardFragment.CATEGORY));
-            }
-            return result;
-        }
-        return false;
-    }
-
-    @Override
-    public void setDisabledByAdmin(EnforcedAdmin admin) {
-        mPreference.setDisabledByAdmin(admin);
-    }
-}
diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java
deleted file mode 100644
index 9fe077e..0000000
--- a/src/com/android/settings/widget/MasterSwitchPreference.java
+++ /dev/null
@@ -1,140 +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.widget;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Switch;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.RestrictedPreference;
-
-/**
- * A custom preference that provides inline switch toggle. It has a mandatory field for title, and
- * optional fields for icon and sub-text. And it can be restricted by admin state.
- */
-public class MasterSwitchPreference extends RestrictedPreference {
-
-    private Switch mSwitch;
-    private boolean mChecked;
-    private boolean mCheckedSet;
-    private boolean mEnableSwitch = true;
-
-    public MasterSwitchPreference(Context context, AttributeSet attrs,
-            int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    public MasterSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public MasterSwitchPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MasterSwitchPreference(Context context) {
-        super(context);
-    }
-
-    @Override
-    protected int getSecondTargetResId() {
-        return R.layout.restricted_preference_widget_master_switch;
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-        final View switchWidget = holder.findViewById(R.id.switchWidget);
-        if (switchWidget != null) {
-            switchWidget.setVisibility(isDisabledByAdmin() ? View.GONE : View.VISIBLE);
-            switchWidget.setOnClickListener(new OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    if (mSwitch != null && !mSwitch.isEnabled()) {
-                        return;
-                    }
-                    setChecked(!mChecked);
-                    if (!callChangeListener(mChecked)) {
-                        setChecked(!mChecked);
-                    } else {
-                        persistBoolean(mChecked);
-                    }
-                }
-            });
-
-            // Consumes move events to ignore drag actions.
-            switchWidget.setOnTouchListener((v, event) -> {
-                return event.getActionMasked() == MotionEvent.ACTION_MOVE;
-            });
-        }
-
-        mSwitch = (Switch) holder.findViewById(R.id.switchWidget);
-        if (mSwitch != null) {
-            mSwitch.setContentDescription(getTitle());
-            mSwitch.setChecked(mChecked);
-            mSwitch.setEnabled(mEnableSwitch);
-        }
-    }
-
-    public boolean isChecked() {
-        return mSwitch != null && mChecked;
-    }
-
-    public void setChecked(boolean checked) {
-        // Always set checked the first time; don't assume the field's default of false.
-        final boolean changed = mChecked != checked;
-        if (changed || !mCheckedSet) {
-            mChecked = checked;
-            mCheckedSet = true;
-            if (mSwitch != null) {
-                mSwitch.setChecked(checked);
-            }
-        }
-    }
-
-    public void setSwitchEnabled(boolean enabled) {
-        mEnableSwitch = enabled;
-        if (mSwitch != null) {
-            mSwitch.setEnabled(enabled);
-        }
-    }
-
-    /**
-     * If admin is not null, disables the switch.
-     * Otherwise, keep it enabled.
-     */
-    public void setDisabledByAdmin(EnforcedAdmin admin) {
-        super.setDisabledByAdmin(admin);
-        setSwitchEnabled(admin == null);
-    }
-
-    public Switch getSwitch() {
-        return mSwitch;
-    }
-
-    @Override
-    protected boolean shouldHideSecondTarget() {
-        return getSecondTargetResId() == 0;
-    }
-}
diff --git a/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java b/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java
index c7d4d92..271378a 100644
--- a/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java
+++ b/src/com/android/settings/widget/MatchParentShrinkingLinearLayout.java
@@ -40,7 +40,7 @@
  * A LinearLayout with a twist: if the contents don't fit, it takes space away from the
  * MATCH_PARENT children, instead of taking it from the weighted ones.
  *
- * TODO: Remove once we redesign the ChooseLockPattern screen with a sane layout.
+ * TODO: Remove once we redesign the ChooseLockPattern screen with a rational layout.
  */
 public class MatchParentShrinkingLinearLayout extends ViewGroup {
     /** @hide */
diff --git a/src/com/android/settings/widget/PrimaryCheckBoxPreference.java b/src/com/android/settings/widget/PrimaryCheckBoxPreference.java
new file mode 100644
index 0000000..a784d5d
--- /dev/null
+++ b/src/com/android/settings/widget/PrimaryCheckBoxPreference.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.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.CheckBox;
+
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+import com.android.settingslib.TwoTargetPreference;
+
+/**
+ * A custom preference that provides inline checkbox. It has a mandatory field for title, and
+ * optional fields for icon and sub-text.
+ */
+public class PrimaryCheckBoxPreference extends TwoTargetPreference {
+
+    private CheckBox mCheckBox;
+    private boolean mChecked;
+    private boolean mEnableCheckBox = true;
+
+    public PrimaryCheckBoxPreference(Context context, AttributeSet attrs,
+            int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public PrimaryCheckBoxPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public PrimaryCheckBoxPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public PrimaryCheckBoxPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected int getSecondTargetResId() {
+        return R.layout.preference_widget_primary_checkbox;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        final View widgetView = holder.findViewById(android.R.id.widget_frame);
+        if (widgetView != null) {
+            widgetView.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mCheckBox != null && !mCheckBox.isEnabled()) {
+                        return;
+                    }
+                    setChecked(!mChecked);
+                    if (!callChangeListener(mChecked)) {
+                        setChecked(!mChecked);
+                    } else {
+                        persistBoolean(mChecked);
+                    }
+                }
+            });
+        }
+
+        mCheckBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
+        if (mCheckBox != null) {
+            mCheckBox.setContentDescription(getTitle());
+            mCheckBox.setChecked(mChecked);
+            mCheckBox.setEnabled(mEnableCheckBox);
+        }
+    }
+
+    @Override
+    public void setEnabled(boolean enabled) {
+        super.setEnabled(enabled);
+        setCheckBoxEnabled(enabled);
+    }
+
+    public boolean isChecked() {
+        return mCheckBox != null && mChecked;
+    }
+
+    /**
+     * Set the check status of checkbox
+     * @param checked
+     */
+    public void setChecked(boolean checked) {
+        mChecked = checked;
+        if (mCheckBox != null) {
+            mCheckBox.setChecked(checked);
+        }
+    }
+
+    /**
+     * Set the enabled status of CheckBox
+     * @param enabled
+     */
+    public void setCheckBoxEnabled(boolean enabled) {
+        mEnableCheckBox = enabled;
+        if (mCheckBox != null) {
+            mCheckBox.setEnabled(enabled);
+        }
+    }
+
+    public CheckBox getCheckBox() {
+        return mCheckBox;
+    }
+}
diff --git a/src/com/android/settings/widget/PrimarySwitchPreference.java b/src/com/android/settings/widget/PrimarySwitchPreference.java
new file mode 100644
index 0000000..b70ae4e
--- /dev/null
+++ b/src/com/android/settings/widget/PrimarySwitchPreference.java
@@ -0,0 +1,162 @@
+/*
+ * 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.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Switch;
+
+import androidx.annotation.Keep;
+import androidx.annotation.Nullable;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedPreference;
+
+/**
+ * A custom preference that provides inline switch toggle. It has a mandatory field for title, and
+ * optional fields for icon and sub-text. And it can be restricted by admin state.
+ */
+public class PrimarySwitchPreference extends RestrictedPreference {
+
+    private Switch mSwitch;
+    private boolean mChecked;
+    private boolean mCheckedSet;
+    private boolean mEnableSwitch = true;
+
+    public PrimarySwitchPreference(Context context, AttributeSet attrs,
+            int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    public PrimarySwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public PrimarySwitchPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public PrimarySwitchPreference(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected int getSecondTargetResId() {
+        return R.layout.restricted_preference_widget_primary_switch;
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        final View switchWidget = holder.findViewById(R.id.switchWidget);
+        if (switchWidget != null) {
+            switchWidget.setVisibility(isDisabledByAdmin() ? View.GONE : View.VISIBLE);
+            switchWidget.setOnClickListener(new OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mSwitch != null && !mSwitch.isEnabled()) {
+                        return;
+                    }
+                    setChecked(!mChecked);
+                    if (!callChangeListener(mChecked)) {
+                        setChecked(!mChecked);
+                    } else {
+                        persistBoolean(mChecked);
+                    }
+                }
+            });
+
+            // Consumes move events to ignore drag actions.
+            switchWidget.setOnTouchListener((v, event) -> {
+                return event.getActionMasked() == MotionEvent.ACTION_MOVE;
+            });
+        }
+
+        mSwitch = (Switch) holder.findViewById(R.id.switchWidget);
+        if (mSwitch != null) {
+            mSwitch.setContentDescription(getTitle());
+            mSwitch.setChecked(mChecked);
+            mSwitch.setEnabled(mEnableSwitch);
+        }
+    }
+
+    public boolean isChecked() {
+        return mSwitch != null && mChecked;
+    }
+
+    /**
+     * Used to validate the state of mChecked and mCheckedSet when testing, without requiring
+     * that a ViewHolder be bound to the object.
+     */
+    @Keep
+    @Nullable
+    public Boolean getCheckedState() {
+        return mCheckedSet ? mChecked : null;
+    }
+
+    /**
+     * Set the checked status to be {@code checked}.
+     *
+     * @param checked The new checked status
+     */
+    public void setChecked(boolean checked) {
+        // Always set checked the first time; don't assume the field's default of false.
+        final boolean changed = mChecked != checked;
+        if (changed || !mCheckedSet) {
+            mChecked = checked;
+            mCheckedSet = true;
+            if (mSwitch != null) {
+                mSwitch.setChecked(checked);
+            }
+        }
+    }
+
+    /**
+     * Set the Switch to be the status of {@code enabled}.
+     *
+     * @param enabled The new enabled status
+     */
+    public void setSwitchEnabled(boolean enabled) {
+        mEnableSwitch = enabled;
+        if (mSwitch != null) {
+            mSwitch.setEnabled(enabled);
+        }
+    }
+
+    /**
+     * If admin is not null, disables the switch.
+     * Otherwise, keep it enabled.
+     */
+    public void setDisabledByAdmin(EnforcedAdmin admin) {
+        super.setDisabledByAdmin(admin);
+        setSwitchEnabled(admin == null);
+    }
+
+    public Switch getSwitch() {
+        return mSwitch;
+    }
+
+    @Override
+    protected boolean shouldHideSecondTarget() {
+        return getSecondTargetResId() == 0;
+    }
+}
diff --git a/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java b/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java
deleted file mode 100644
index 2b28ec1..0000000
--- a/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidget.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2019 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.view.View;
-import android.widget.ImageView;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settingslib.widget.RadioButtonPreference;
-
-public class RadioButtonPreferenceWithExtraWidget extends RadioButtonPreference {
-    public static final int EXTRA_WIDGET_VISIBILITY_GONE = 0;
-    public static final int EXTRA_WIDGET_VISIBILITY_INFO = 1;
-    public static final int EXTRA_WIDGET_VISIBILITY_SETTING = 2;
-
-    private View mExtraWidgetDivider;
-    private ImageView mExtraWidget;
-
-    private int mExtraWidgetVisibility = EXTRA_WIDGET_VISIBILITY_GONE;
-    private View.OnClickListener mExtraWidgetOnClickListener;
-
-    public RadioButtonPreferenceWithExtraWidget(Context context) {
-        super(context, null);
-        setLayoutResource(R.layout.preference_radio_with_extra_widget);
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-
-        mExtraWidget = (ImageView) view.findViewById(R.id.radio_extra_widget);
-        mExtraWidgetDivider = view.findViewById(R.id.radio_extra_widget_divider);
-        setExtraWidgetVisibility(mExtraWidgetVisibility);
-
-        if (mExtraWidgetOnClickListener != null) {
-            setExtraWidgetOnClickListener(mExtraWidgetOnClickListener);
-        }
-    }
-
-    public void setExtraWidgetVisibility(int visibility) {
-        mExtraWidgetVisibility = visibility;
-        if (mExtraWidget == null || mExtraWidgetDivider == null) {
-            return;
-        }
-
-        if (visibility == EXTRA_WIDGET_VISIBILITY_GONE) {
-            mExtraWidget.setClickable(false);
-            mExtraWidget.setVisibility(View.GONE);
-            mExtraWidgetDivider.setVisibility(View.GONE);
-        } else {
-            mExtraWidget.setClickable(true);
-            mExtraWidget.setVisibility(View.VISIBLE);
-            mExtraWidgetDivider.setVisibility(View.VISIBLE);
-            if (mExtraWidgetVisibility == EXTRA_WIDGET_VISIBILITY_INFO) {
-                mExtraWidget.setImageResource(R.drawable.ic_settings_about);
-                mExtraWidget.setContentDescription(
-                        getContext().getResources().getText(R.string.information_label));
-            } else if (mExtraWidgetVisibility == EXTRA_WIDGET_VISIBILITY_SETTING) {
-                mExtraWidget.setImageResource(R.drawable.ic_settings_accent);
-                mExtraWidget.setContentDescription(
-                        getContext().getResources().getText(R.string.settings_label));
-            }
-        }
-    }
-
-    public void setExtraWidgetOnClickListener(View.OnClickListener listener) {
-        mExtraWidgetOnClickListener = listener;
-        if (mExtraWidget != null) {
-            mExtraWidget.setEnabled(true);
-            mExtraWidget.setOnClickListener(listener);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/widget/SeekBarPreference.java b/src/com/android/settings/widget/SeekBarPreference.java
index bdd1ba9..47bb286 100644
--- a/src/com/android/settings/widget/SeekBarPreference.java
+++ b/src/com/android/settings/widget/SeekBarPreference.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.widget;
 
+import static android.view.HapticFeedbackConstants.CLOCK_TICK;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Parcel;
@@ -39,18 +41,24 @@
 public class SeekBarPreference extends RestrictedPreference
         implements OnSeekBarChangeListener, View.OnKeyListener {
 
+    public static final int HAPTIC_FEEDBACK_MODE_NONE = 0;
+    public static final int HAPTIC_FEEDBACK_MODE_ON_TICKS = 1;
+    public static final int HAPTIC_FEEDBACK_MODE_ON_ENDS = 2;
+
     private int mProgress;
     private int mMax;
     private int mMin;
     private boolean mTrackingTouch;
 
     private boolean mContinuousUpdates;
+    private int mHapticFeedbackMode = HAPTIC_FEEDBACK_MODE_NONE;
     private int mDefaultProgress = -1;
 
     private SeekBar mSeekBar;
     private boolean mShouldBlink;
     private int mAccessibilityRangeInfoType = AccessibilityNodeInfo.RangeInfo.RANGE_TYPE_INT;
     private CharSequence mSeekBarContentDescription;
+    private CharSequence mSeekBarStateDescription;
 
     public SeekBarPreference(
             Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
@@ -124,6 +132,9 @@
         } else if (!TextUtils.isEmpty(title)) {
             mSeekBar.setContentDescription(title);
         }
+        if (!TextUtils.isEmpty(mSeekBarStateDescription)) {
+            mSeekBar.setStateDescription(mSeekBarStateDescription);
+        }
         if (mSeekBar instanceof DefaultIndicatorSeekBar) {
             ((DefaultIndicatorSeekBar) mSeekBar).setDefaultProgress(mDefaultProgress);
         }
@@ -231,6 +242,17 @@
         mContinuousUpdates = continuousUpdates;
     }
 
+    /**
+     * Sets the haptic feedback mode. HAPTIC_FEEDBACK_MODE_ON_TICKS means to perform haptic feedback
+     * as the SeekBar's progress is updated; HAPTIC_FEEDBACK_MODE_ON_ENDS means to perform haptic
+     * feedback as the SeekBar's progress value is equal to the min/max value.
+     *
+     * @param hapticFeedbackMode the haptic feedback mode.
+     */
+    public void setHapticFeedbackMode(int hapticFeedbackMode) {
+        mHapticFeedbackMode = hapticFeedbackMode;
+    }
+
     private void setProgress(int progress, boolean notifyChanged) {
         if (progress > mMax) {
             progress = mMax;
@@ -260,6 +282,16 @@
         if (progress != mProgress) {
             if (callChangeListener(progress)) {
                 setProgress(progress, false);
+                switch (mHapticFeedbackMode) {
+                    case HAPTIC_FEEDBACK_MODE_ON_TICKS:
+                        seekBar.performHapticFeedback(CLOCK_TICK);
+                        break;
+                    case HAPTIC_FEEDBACK_MODE_ON_ENDS:
+                        if (progress == mMax || progress == mMin) {
+                            seekBar.performHapticFeedback(CLOCK_TICK);
+                        }
+                        break;
+                }
             } else {
                 seekBar.setProgress(mProgress);
             }
@@ -304,6 +336,18 @@
         }
     }
 
+    /**
+     * Specify the state description for this seek bar represents.
+     *
+     * @param stateDescription the state description of seek bar
+     */
+    public void setSeekBarStateDescription(CharSequence stateDescription) {
+        mSeekBarStateDescription = stateDescription;
+        if (mSeekBar != null) {
+            mSeekBar.setStateDescription(stateDescription);
+        }
+    }
+
     @Override
     protected Parcelable onSaveInstanceState() {
         /*
diff --git a/src/com/android/settings/wifi/AddNetworkFragment.java b/src/com/android/settings/wifi/AddNetworkFragment.java
index 2f0ecad..2ed213b 100644
--- a/src/com/android/settings/wifi/AddNetworkFragment.java
+++ b/src/com/android/settings/wifi/AddNetworkFragment.java
@@ -32,12 +32,16 @@
 
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.wifi.dpp.WifiDppQrCodeScannerFragment;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 
-public class AddNetworkFragment extends InstrumentedFragment implements WifiConfigUiBase,
+/**
+ * A full screen UI component for users to edit and add a Wi-Fi network.
+ */
+public class AddNetworkFragment extends InstrumentedFragment implements WifiConfigUiBase2,
         View.OnClickListener {
 
-    final static String WIFI_CONFIG_KEY = "wifi_config_key";
+    public static final String WIFI_CONFIG_KEY = "wifi_config_key";
     @VisibleForTesting
     final static int SUBMIT_BUTTON_ID = android.R.id.button1;
     @VisibleForTesting
@@ -46,7 +50,7 @@
 
     private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
 
-    private WifiConfigController mUIController;
+    private WifiConfigController2 mUIController;
     private Button mSubmitBtn;
     private Button mCancelBtn;
 
@@ -76,7 +80,7 @@
         mSubmitBtn.setOnClickListener(this);
         mCancelBtn.setOnClickListener(this);
         ssidScannerButton.setOnClickListener(this);
-        mUIController = new WifiConfigController(this, rootView, null, getMode());
+        mUIController = new WifiConfigController2(this, rootView, null, getMode());
 
         return rootView;
     }
@@ -113,18 +117,18 @@
             }
 
             final WifiConfiguration config = data.getParcelableExtra(
-                    WifiDialogActivity.KEY_WIFI_CONFIGURATION);
+                    WifiDppQrCodeScannerFragment.KEY_WIFI_CONFIGURATION);
             successfullyFinish(config);
         }
     }
 
     @Override
     public int getMode() {
-        return WifiConfigUiBase.MODE_CONNECT;
+        return WifiConfigUiBase2.MODE_CONNECT;
     }
 
     @Override
-    public WifiConfigController getController() {
+    public WifiConfigController2 getController() {
         return mUIController;
     }
 
diff --git a/src/com/android/settings/wifi/CaptivePortalNetworkCallback.java b/src/com/android/settings/wifi/CaptivePortalNetworkCallback.java
deleted file mode 100644
index 630476f..0000000
--- a/src/com/android/settings/wifi/CaptivePortalNetworkCallback.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-
-import com.android.internal.util.Preconditions;
-
-/** Listens for changes to NetworkCapabilities to update the ConnectedAccessPointPreference. */
-class CaptivePortalNetworkCallback extends NetworkCallback {
-
-    private final ConnectedAccessPointPreference mConnectedApPreference;
-    private final Network mNetwork;
-
-    private boolean mIsCaptivePortal;
-
-    CaptivePortalNetworkCallback(
-            Network network, ConnectedAccessPointPreference connectedApPreference) {
-        mNetwork = Preconditions.checkNotNull(network);
-        mConnectedApPreference = Preconditions.checkNotNull(connectedApPreference);
-    }
-
-    @Override
-    public final void onLost(Network network) {
-        if (mNetwork.equals(network)) {
-            setIsCaptivePortal(false);
-        }
-    }
-
-    @Override
-    public final void onCapabilitiesChanged(Network network,
-            NetworkCapabilities networkCapabilities) {
-        if (mNetwork.equals(network)) {
-            boolean isCaptivePortal = WifiUtils.canSignIntoNetwork(networkCapabilities);
-            setIsCaptivePortal(isCaptivePortal);
-            mConnectedApPreference.setCaptivePortal(isCaptivePortal);
-        }
-    }
-
-    /**
-     * Called when captive portal capability changes for the current network. Default implementation
-     * is a no-op. Use {@link CaptivePortalNetworkCallback#isCaptivePortal()} to read new
-     * capability.
-     */
-    public void onCaptivePortalCapabilityChanged() {}
-
-    private void setIsCaptivePortal(boolean isCaptivePortal) {
-        if (isCaptivePortal == mIsCaptivePortal) {
-            return;
-        }
-        mIsCaptivePortal = isCaptivePortal;
-        onCaptivePortalCapabilityChanged();
-    }
-
-    /**
-     * Returns true if the supplied network and preference are not null and are the same as the
-     * originally supplied values.
-     */
-    public final boolean isSameNetworkAndPreference(
-            Network network, ConnectedAccessPointPreference connectedApPreference) {
-        return mNetwork.equals(network) && mConnectedApPreference == connectedApPreference;
-    }
-
-    /**
-     * Returns true if the most recent update to the NetworkCapabilities indicates a captive portal
-     * network and the Network was not lost in the interim.
-     */
-    public final boolean isCaptivePortal() {
-        return mIsCaptivePortal;
-    }
-
-    /** Returns the currently associated network. */
-    public final Network getNetwork() {
-        return mNetwork;
-    }
-}
diff --git a/src/com/android/settings/wifi/ConfigureAccessPointFragment.java b/src/com/android/settings/wifi/ConfigureAccessPointFragment.java
deleted file mode 100644
index 508d549..0000000
--- a/src/com/android/settings/wifi/ConfigureAccessPointFragment.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.R;
-import com.android.settings.core.InstrumentedFragment;
-import com.android.settingslib.wifi.AccessPoint;
-
-/**
- * Detail page for configuring Wi-Fi network.
- *
- * The AccessPoint should be saved to the argument when launching this class in order to properly
- * render this page.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in {@link ConfigureWifiEntryFragment}.
- */
-public class ConfigureAccessPointFragment extends InstrumentedFragment implements WifiConfigUiBase {
-
-    public static final String NETWORK_CONFIG_KEY = "network_config_key";
-
-    private static final int SUBMIT_BUTTON_ID = android.R.id.button1;
-    private static final int CANCEL_BUTTON_ID = android.R.id.button2;
-
-    private WifiConfigController mUiController;
-    private Button mSubmitBtn;
-    private Button mCancelBtn;
-    private AccessPoint mAccessPoint;
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        mAccessPoint = new AccessPoint(context, getArguments());
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.SETTINGS_WIFI_CONFIGURE_NETWORK;
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        final View rootView = inflater.inflate(R.layout.wifi_add_network_view,
-                container, false /* attachToRoot */);
-
-        final Button neutral = rootView.findViewById(android.R.id.button3);
-        if (neutral != null) {
-            neutral.setVisibility(View.GONE);
-        }
-
-        mSubmitBtn = rootView.findViewById(SUBMIT_BUTTON_ID);
-        mCancelBtn = rootView.findViewById(CANCEL_BUTTON_ID);
-        mSubmitBtn.setOnClickListener(view -> handleSubmitAction());
-        mCancelBtn.setOnClickListener(view -> handleCancelAction());
-
-        mUiController = new WifiConfigController(this, rootView, mAccessPoint,
-                getMode(), false /* requestFocus */);
-
-        /**
-         * For this add AccessPoint UI, need to remove the Home button, so set related feature as
-         * false.
-         */
-        final ActionBar actionBar = getActivity().getActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(false);
-            actionBar.setHomeButtonEnabled(false);
-            actionBar.setDisplayShowHomeEnabled(false);
-        }
-
-        return rootView;
-    }
-
-    @Override
-    public void onViewStateRestored(Bundle savedInstanceState) {
-        super.onViewStateRestored(savedInstanceState);
-        mUiController.updatePassword();
-    }
-
-    @Override
-    public int getMode() {
-        return WifiConfigUiBase.MODE_CONNECT;
-    }
-
-    @Override
-    public WifiConfigController getController() {
-        return mUiController;
-    }
-
-    @Override
-    public void dispatchSubmit() {
-        handleSubmitAction();
-    }
-
-    @Override
-    public void setTitle(int id) {
-        getActivity().setTitle(id);
-    }
-
-    @Override
-    public void setTitle(CharSequence title) {
-        getActivity().setTitle(title);
-    }
-
-    @Override
-    public void setSubmitButton(CharSequence text) {
-        mSubmitBtn.setText(text);
-    }
-
-    @Override
-    public void setCancelButton(CharSequence text) {
-        mCancelBtn.setText(text);
-    }
-
-    @Override
-    public void setForgetButton(CharSequence text) {
-        // AddNetwork doesn't need forget button.
-    }
-
-    @Override
-    public Button getSubmitButton() {
-        return mSubmitBtn;
-    }
-
-    @Override
-    public Button getCancelButton() {
-        return mCancelBtn;
-    }
-
-    @Override
-    public Button getForgetButton() {
-        // AddNetwork doesn't need forget button.
-        return null;
-    }
-
-    @VisibleForTesting
-    void handleSubmitAction() {
-        final Intent intent = new Intent();
-        final Activity activity = getActivity();
-        intent.putExtra(NETWORK_CONFIG_KEY, mUiController.getConfig());
-        activity.setResult(Activity.RESULT_OK, intent);
-        activity.finish();
-    }
-
-    @VisibleForTesting
-    void handleCancelAction() {
-        final Activity activity = getActivity();
-        activity.setResult(Activity.RESULT_CANCELED);
-        activity.finish();
-    }
-}
diff --git a/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java b/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
index 881aaea..c36a298 100644
--- a/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
+++ b/src/com/android/settings/wifi/ConfigureWifiEntryFragment.java
@@ -21,9 +21,6 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
-import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -40,6 +37,7 @@
 
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
 import com.android.wifitrackerlib.NetworkDetailsTracker;
 import com.android.wifitrackerlib.WifiEntry;
@@ -222,17 +220,17 @@
             }
         };
 
-        mNetworkDetailsTracker = NetworkDetailsTracker.createNetworkDetailsTracker(
-                getSettingsLifecycle(),
-                context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                getArguments().getString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY));
+        mNetworkDetailsTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createNetworkDetailsTracker(
+                        getSettingsLifecycle(),
+                        context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        getArguments().getString(
+                                WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY));
     }
 }
diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java
index 3009ae7..ff313c7 100644
--- a/src/com/android/settings/wifi/ConfigureWifiSettings.java
+++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java
@@ -21,6 +21,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
 import com.android.settings.dashboard.DashboardFragment;
@@ -43,6 +45,14 @@
     private UseOpenWifiPreferenceController mUseOpenWifiPreferenceController;
 
     @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
+            getActivity().setTitle(R.string.network_and_internet_preferences_title);
+        }
+    }
+
+    @Override
     public int getMetricsCategory() {
         return SettingsEnums.CONFIGURE_WIFI;
     }
@@ -53,15 +63,6 @@
     }
 
     @Override
-    public int getInitialExpandedChildCount() {
-        int tileLimit = 2;
-        if (mUseOpenWifiPreferenceController.isAvailable()) {
-            tileLimit++;
-        }
-        return tileLimit;
-    }
-
-    @Override
     protected int getPreferenceScreenResId() {
         return R.xml.wifi_configure_settings;
     }
diff --git a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java b/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
deleted file mode 100644
index e904602..0000000
--- a/src/com/android/settings/wifi/ConnectedAccessPointPreference.java
+++ /dev/null
@@ -1,99 +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.wifi;
-
-import android.content.Context;
-import android.view.View;
-
-import androidx.annotation.DrawableRes;
-import androidx.fragment.app.Fragment;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settingslib.wifi.AccessPoint;
-
-/**
- * An AP preference for the currently connected AP.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in {@link ConnectedWifiEntryPreference}.
- */
-public class ConnectedAccessPointPreference extends LongPressAccessPointPreference implements
-        View.OnClickListener {
-
-    private OnGearClickListener mOnGearClickListener;
-    private boolean mIsCaptivePortal;
-
-    public ConnectedAccessPointPreference(AccessPoint accessPoint, Context context,
-            UserBadgeCache cache, @DrawableRes int iconResId, boolean forSavedNetworks,
-            Fragment fragment) {
-        super(accessPoint, context, cache, forSavedNetworks, iconResId, fragment);
-    }
-
-    @Override
-    protected int getWidgetLayoutResourceId() {
-        return R.layout.preference_widget_gear_optional_background;
-    }
-
-    @Override
-    public void refresh() {
-        super.refresh();
-
-        setShowDivider(mIsCaptivePortal);
-        if (mIsCaptivePortal) {
-            setSummary(R.string.wifi_tap_to_sign_in);
-        }
-    }
-
-    public void setOnGearClickListener(OnGearClickListener l) {
-        mOnGearClickListener = l;
-        notifyChanged();
-    }
-
-    @Override
-    public void onBindViewHolder(PreferenceViewHolder holder) {
-        super.onBindViewHolder(holder);
-
-        final View gear = holder.findViewById(R.id.settings_button);
-        gear.setOnClickListener(this);
-
-        final View gearNoBg = holder.findViewById(R.id.settings_button_no_background);
-        gearNoBg.setVisibility(mIsCaptivePortal ? View.INVISIBLE : View.VISIBLE);
-        gear.setVisibility(mIsCaptivePortal ? View.VISIBLE : View.INVISIBLE);
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v.getId() == R.id.settings_button) {
-            if (mOnGearClickListener != null) {
-                mOnGearClickListener.onGearClick(this);
-            }
-        }
-    }
-
-    public void setCaptivePortal(boolean isCaptivePortal) {
-        if (mIsCaptivePortal != isCaptivePortal) {
-            mIsCaptivePortal = isCaptivePortal;
-            refresh();
-        }
-    }
-
-    public interface OnGearClickListener {
-        void onGearClick(ConnectedAccessPointPreference p);
-    }
-
-}
diff --git a/src/com/android/settings/wifi/LongPressAccessPointPreference.java b/src/com/android/settings/wifi/LongPressAccessPointPreference.java
deleted file mode 100644
index 1590325..0000000
--- a/src/com/android/settings/wifi/LongPressAccessPointPreference.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import android.content.Context;
-
-import androidx.fragment.app.Fragment;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPointPreference;
-
-/**
- * An AP preference for the currently connected AP.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in {@link com.android.settingslib.wifi.LongPressWifiEntryPreference}.
- */
-public class LongPressAccessPointPreference extends AccessPointPreference {
-
-    private final Fragment mFragment;
-
-    public LongPressAccessPointPreference(AccessPoint accessPoint, Context context,
-            UserBadgeCache cache, boolean forSavedNetworks, int iconResId, Fragment fragment) {
-        super(accessPoint, context, cache, iconResId, forSavedNetworks);
-        mFragment = fragment;
-    }
-
-    @Override
-    public void onBindViewHolder(final PreferenceViewHolder view) {
-        super.onBindViewHolder(view);
-        if (mFragment != null) {
-            view.itemView.setOnCreateContextMenuListener(mFragment);
-            view.itemView.setTag(this);
-            view.itemView.setLongClickable(true);
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogActivity.java b/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
index 90a0de3..b160d90 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogActivity.java
@@ -31,6 +31,7 @@
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
@@ -57,12 +58,12 @@
     final static String EXTRA_IS_SPECIFIED_SSID =
         "com.android.settings.wifi.extra.REQUEST_IS_FOR_SINGLE_NETWORK";
 
-    private NetworkRequestDialogBaseFragment mDialogFragment;
+    @VisibleForTesting NetworkRequestDialogBaseFragment mDialogFragment;
     private NetworkRequestUserSelectionCallback mUserSelectionCallback;
     private boolean mIsSpecifiedSsid;
     private boolean mShowingErrorDialog;
     private WifiConfiguration mMatchedConfig;
-    private ProgressDialog mProgressDialog;
+    @VisibleForTesting ProgressDialog mProgressDialog;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -193,8 +194,7 @@
         if (mIsSpecifiedSsid) {
             // Prevent from throwing same dialog, because onMatch() will be called many times.
             if (mMatchedConfig == null) {
-                mMatchedConfig = WifiUtils.getWifiConfig(
-                    null /* accesspoint */, scanResults.get(0), null /* password */);
+                mMatchedConfig = WifiUtils.getWifiConfig(null /* wifiEntry */, scanResults.get(0));
                 showSingleSsidRequestDialog(
                         WifiInfo.sanitizeSsid(mMatchedConfig.SSID), false /* isTryAgain */);
             }
diff --git a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
index f179df0..11f3612 100644
--- a/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
+++ b/src/com/android/settings/wifi/NetworkRequestDialogFragment.java
@@ -16,6 +16,10 @@
 
 package com.android.settings.wifi;
 
+import static com.android.settings.wifi.WifiUtils.getWifiEntrySecurity;
+
+import static java.util.stream.Collectors.toList;
+
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -25,6 +29,12 @@
 import android.net.wifi.WifiManager.NetworkRequestMatchCallback;
 import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -41,12 +51,13 @@
 import androidx.preference.internal.PreferenceImageView;
 
 import com.android.settings.R;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.Utils;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
+import java.time.Clock;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -56,7 +67,9 @@
  * happens, {@link NetworkRequestErrorDialogFragment} will be called to display error message.
  */
 public class NetworkRequestDialogFragment extends NetworkRequestDialogBaseFragment implements
-        DialogInterface.OnClickListener{
+        DialogInterface.OnClickListener, WifiPickerTracker.WifiPickerTrackerCallback {
+
+    private static final String TAG = "NetworkRequestDialogFragment";
 
     /**
      * Spec defines there should be 5 wifi ap on the list at most or just show all if {@code
@@ -65,18 +78,51 @@
     private static final int MAX_NUMBER_LIST_ITEM = 5;
     private boolean mShowLimitedItem = true;
 
-    private List<AccessPoint> mAccessPointList;
-    @VisibleForTesting
-    FilterWifiTracker mFilterWifiTracker;
-    private AccessPointAdapter mDialogAdapter;
+    @VisibleForTesting List<WifiEntry> mFilteredWifiEntries = new ArrayList<>();
+    @VisibleForTesting List<ScanResult> mMatchedScanResults = new ArrayList<>();
+    private WifiEntryAdapter mDialogAdapter;
     private NetworkRequestUserSelectionCallback mUserSelectionCallback;
 
+    @VisibleForTesting WifiPickerTracker mWifiPickerTracker;
+    // Worker thread used for WifiPickerTracker work.
+    private HandlerThread mWorkerThread;
+    // Max age of tracked WifiEntries.
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating WifiPickerTracker scans.
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+
     public static NetworkRequestDialogFragment newInstance() {
         NetworkRequestDialogFragment dialogFragment = new NetworkRequestDialogFragment();
         return dialogFragment;
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mWorkerThread = new HandlerThread(
+                TAG + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+            @Override
+            public long millis() {
+                return SystemClock.elapsedRealtime();
+            }
+        };
+        final Context context = getContext();
+        mWifiPickerTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(getSettingsLifecycle(), context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        this);
+    }
+
+    @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         final Context context = getContext();
 
@@ -94,8 +140,8 @@
         progressBar.setVisibility(View.VISIBLE);
 
         // Prepares adapter.
-        mDialogAdapter = new AccessPointAdapter(context,
-                R.layout.preference_access_point, getAccessPointList());
+        mDialogAdapter = new WifiEntryAdapter(context,
+                R.layout.preference_access_point, mFilteredWifiEntries);
 
         final AlertDialog.Builder builder = new AlertDialog.Builder(context)
                 .setCustomTitle(customTitle)
@@ -107,9 +153,8 @@
 
         // Clicking list item is to connect wifi ap.
         final AlertDialog dialog = builder.create();
-        dialog.getListView()
-                .setOnItemClickListener(
-                        (parent, view, position, id) -> this.onClick(dialog, position));
+        dialog.getListView().setOnItemClickListener(
+                (parent, view, position, id) -> this.onClick(dialog, position));
 
         // Don't dismiss dialog when touching outside. User reports it is easy to touch outside.
         // This causes dialog to close.
@@ -121,76 +166,49 @@
             neutralBtn.setVisibility(View.GONE);
             neutralBtn.setOnClickListener(v -> {
                 mShowLimitedItem = false;
-                renewAccessPointList(null /* scanResults */);
-                notifyAdapterRefresh();
+                updateWifiEntries();
+                updateUi();
                 neutralBtn.setVisibility(View.GONE);
             });
         });
         return dialog;
     }
 
-    @NonNull
-    List<AccessPoint> getAccessPointList() {
-        // Initials list for adapter, in case of display crashing.
-        if (mAccessPointList == null) {
-            mAccessPointList = new ArrayList<>();
-        }
-        return mAccessPointList;
-    }
-
     private BaseAdapter getDialogAdapter() {
         return mDialogAdapter;
     }
 
     @Override
     public void onClick(DialogInterface dialog, int which) {
-        final List<AccessPoint> accessPointList = getAccessPointList();
-        if (accessPointList.size() == 0) {
+        if (mFilteredWifiEntries.size() == 0 || which >= mFilteredWifiEntries.size()) {
             return;  // Invalid values.
         }
         if (mUserSelectionCallback == null) {
             return; // Callback is missing or not ready.
         }
 
-        if (which < accessPointList.size()) {
-            final AccessPoint selectedAccessPoint = accessPointList.get(which);
-            WifiConfiguration wifiConfig = selectedAccessPoint.getConfig();
-            if (wifiConfig == null) {
-                wifiConfig = WifiUtils.getWifiConfig(selectedAccessPoint, /* scanResult */
-                        null, /* password */ null);
-            }
-
-            if (wifiConfig != null) {
-                mUserSelectionCallback.select(wifiConfig);
-            }
+        final WifiEntry wifiEntry = mFilteredWifiEntries.get(which);
+        WifiConfiguration config = wifiEntry.getWifiConfiguration();
+        if (config == null) {
+            config = WifiUtils.getWifiConfig(wifiEntry, null /* scanResult */);
         }
+        mUserSelectionCallback.select(config);
     }
 
     @Override
     public void onCancel(@NonNull DialogInterface dialog) {
         super.onCancel(dialog);
+
         if (mUserSelectionCallback != null) {
             mUserSelectionCallback.reject();
         }
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
-
-        if (mFilterWifiTracker != null) {
-            mFilterWifiTracker.onPause();
-        }
-    }
-
-    @Override
     public void onDestroy() {
-        super.onDestroy();
+        mWorkerThread.quit();
 
-        if (mFilterWifiTracker != null) {
-            mFilterWifiTracker.onDestroy();
-            mFilterWifiTracker = null;
-        }
+        super.onDestroy();
     }
 
     private void showAllButton() {
@@ -217,22 +235,65 @@
         }
     }
 
+    /** Called when the state of Wifi has changed. */
     @Override
-    public void onResume() {
-        super.onResume();
-
-        if (mFilterWifiTracker == null) {
-            mFilterWifiTracker = new FilterWifiTracker(getContext(), getSettingsLifecycle());
+    public void onWifiStateChanged() {
+        if (mMatchedScanResults.size() == 0) {
+            return;
         }
-        mFilterWifiTracker.onResume();
+        updateWifiEntries();
+        updateUi();
     }
 
-    private class AccessPointAdapter extends ArrayAdapter<AccessPoint> {
+    /**
+     * Update the results when data changes
+     */
+    @Override
+    public void onWifiEntriesChanged() {
+        if (mMatchedScanResults.size() == 0) {
+            return;
+        }
+        updateWifiEntries();
+        updateUi();
+    }
+
+    @Override
+    public void onNumSavedSubscriptionsChanged() {
+        // Do nothing.
+    }
+
+    @Override
+    public void onNumSavedNetworksChanged() {
+        // Do nothing.
+    }
+
+    @VisibleForTesting
+    void updateWifiEntries() {
+        final List<WifiEntry> wifiEntries = new ArrayList<>();
+        if (mWifiPickerTracker.getConnectedWifiEntry() != null) {
+            wifiEntries.add(mWifiPickerTracker.getConnectedWifiEntry());
+        }
+        wifiEntries.addAll(mWifiPickerTracker.getWifiEntries());
+
+        mFilteredWifiEntries.clear();
+        mFilteredWifiEntries.addAll(wifiEntries.stream().filter(entry -> {
+            for (ScanResult matchedScanResult : mMatchedScanResults) {
+                if (TextUtils.equals(entry.getSsid(), matchedScanResult.SSID)
+                        && entry.getSecurity() == getWifiEntrySecurity(matchedScanResult)) {
+                    return true;
+                }
+            }
+            return false;
+        }).limit(mShowLimitedItem ? MAX_NUMBER_LIST_ITEM : Long.MAX_VALUE)
+                .collect(toList()));
+    }
+
+    private class WifiEntryAdapter extends ArrayAdapter<WifiEntry> {
 
         private final int mResourceId;
         private final LayoutInflater mInflater;
 
-        public AccessPointAdapter(Context context, int resourceId, List<AccessPoint> objects) {
+        WifiEntryAdapter(Context context, int resourceId, List<WifiEntry> objects) {
             super(context, resourceId, objects);
             mResourceId = resourceId;
             mInflater = LayoutInflater.from(context);
@@ -248,18 +309,18 @@
                 divider.setVisibility(View.GONE);
             }
 
-            final AccessPoint accessPoint = getItem(position);
+            final WifiEntry wifiEntry = getItem(position);
 
             final TextView titleView = view.findViewById(android.R.id.title);
             if (titleView != null) {
                 // Shows whole SSID for better UX.
                 titleView.setSingleLine(false);
-                titleView.setText(accessPoint.getTitle());
+                titleView.setText(wifiEntry.getTitle());
             }
 
             final TextView summary = view.findViewById(android.R.id.summary);
             if (summary != null) {
-                final String summaryString = accessPoint.getSettingsSummary();
+                final String summaryString = wifiEntry.getSummary();
                 if (TextUtils.isEmpty(summaryString)) {
                     summary.setVisibility(View.GONE);
                 } else {
@@ -269,7 +330,7 @@
             }
 
             final PreferenceImageView imageView = view.findViewById(android.R.id.icon);
-            final int level = accessPoint.getLevel();
+            final int level = wifiEntry.getLevel();
             if (imageView != null) {
                 final Drawable drawable = getContext().getDrawable(
                         Utils.getWifiIconResource(level));
@@ -290,137 +351,23 @@
 
     @Override
     public void onMatch(List<ScanResult> scanResults) {
-        // Shouldn't need to renew cached list, since input result is empty.
-        if (scanResults != null && scanResults.size() > 0) {
-            renewAccessPointList(scanResults);
-
-            notifyAdapterRefresh();
-        }
-    }
-
-    // Updates internal AccessPoint list from WifiTracker. scanResults are used to update key list
-    // of AccessPoint, and could be null if there is no necessary to update key list.
-    private void renewAccessPointList(List<ScanResult> scanResults) {
-        if (mFilterWifiTracker == null) {
-            return;
-        }
-
-        // TODO(b/119846365): Checks if we could escalate the converting effort.
-        // Updates keys of scanResults into FilterWifiTracker for updating matched AccessPoints.
-        if (scanResults != null) {
-            mFilterWifiTracker.updateKeys(scanResults);
-        }
-
-        // Re-gets matched AccessPoints from WifiTracker.
-        final List<AccessPoint> list = getAccessPointList();
-        list.clear();
-        list.addAll(mFilterWifiTracker.getAccessPoints());
+        mMatchedScanResults = scanResults;
+        updateWifiEntries();
+        updateUi();
     }
 
     @VisibleForTesting
-    void notifyAdapterRefresh() {
+    void updateUi() {
+        // Update related UI buttons
+        if (mShowLimitedItem && mFilteredWifiEntries.size() >= MAX_NUMBER_LIST_ITEM) {
+            showAllButton();
+        }
+        if (mFilteredWifiEntries.size() > 0) {
+            hideProgressIcon();
+        }
+
         if (getDialogAdapter() != null) {
             getDialogAdapter().notifyDataSetChanged();
         }
     }
-
-    @VisibleForTesting
-    final class FilterWifiTracker {
-        private final List<String> mAccessPointKeys;
-        private final WifiTracker mWifiTracker;
-        private final Context mContext;
-
-        public FilterWifiTracker(Context context, Lifecycle lifecycle) {
-            mWifiTracker = WifiTrackerFactory.create(context, mWifiListener,
-                    lifecycle, /* includeSaved */ true, /* includeScans */ true);
-            mAccessPointKeys = new ArrayList<>();
-            mContext = context;
-        }
-
-        /**
-         * Updates key list from input. {@code onMatch()} may be called in multi-times according
-         * wifi scanning result, so needs patchwork here.
-         */
-        public void updateKeys(List<ScanResult> scanResults) {
-            for (ScanResult scanResult : scanResults) {
-                final String key = AccessPoint.getKey(mContext, scanResult);
-                if (!mAccessPointKeys.contains(key)) {
-                    mAccessPointKeys.add(key);
-                }
-            }
-        }
-
-        /**
-         * Returns only AccessPoints whose key is in {@code mAccessPointKeys}.
-         *
-         * @return List of matched AccessPoints.
-         */
-        public List<AccessPoint> getAccessPoints() {
-            final List<AccessPoint> allAccessPoints = mWifiTracker.getAccessPoints();
-            final List<AccessPoint> result = new ArrayList<>();
-
-            // The order should be kept, because order means wifi score (sorting in WifiTracker).
-            int count = 0;
-            for (AccessPoint accessPoint : allAccessPoints) {
-                final String key = accessPoint.getKey();
-                if (mAccessPointKeys.contains(key)) {
-                    result.add(accessPoint);
-
-                    count++;
-                    // Limits how many count of items could show.
-                    if (mShowLimitedItem && count >= MAX_NUMBER_LIST_ITEM) {
-                        break;
-                    }
-                }
-            }
-
-            // Update related UI buttons
-            if (mShowLimitedItem && (count >= MAX_NUMBER_LIST_ITEM)) {
-                showAllButton();
-            }
-            if (count > 0) {
-                hideProgressIcon();
-            }
-
-            return result;
-        }
-
-        @VisibleForTesting
-        WifiTracker.WifiListener mWifiListener = new WifiTracker.WifiListener() {
-
-            @Override
-            public void onWifiStateChanged(int state) {
-                notifyAdapterRefresh();
-            }
-
-            @Override
-            public void onConnectedChanged() {
-                notifyAdapterRefresh();
-            }
-
-            @Override
-            public void onAccessPointsChanged() {
-                renewAccessPointList(null /* scanResults */);
-                notifyAdapterRefresh();
-            }
-        };
-
-        public void onDestroy() {
-            if (mWifiTracker != null) {
-                mWifiTracker.onDestroy();
-            }
-        }
-
-        public void onResume() {
-            if (mWifiTracker != null) {
-                mWifiTracker.onStart();
-            }
-        }
-
-        public void onPause() {
-            if (mWifiTracker != null) {
-                mWifiTracker.onStop();
-            }
-        }
-    }
 }
diff --git a/src/com/android/settings/wifi/OWNERS b/src/com/android/settings/wifi/OWNERS
index ab0af7c..5e20fd5 100644
--- a/src/com/android/settings/wifi/OWNERS
+++ b/src/com/android/settings/wifi/OWNERS
@@ -1,4 +1,5 @@
 # Default reviewers for this and subdirectories.
-govenliu@google.com
+andychou@google.com
 arcwang@google.com
-tmfang@google.com
+goldmanj@google.com
+wengsu@google.com
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 1579188..59de675 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -37,12 +37,13 @@
 import android.os.UserManager;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -69,8 +70,6 @@
 
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
-import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
-import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.Utils;
 import com.android.settingslib.utils.ThreadUtils;
@@ -80,7 +79,9 @@
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -144,6 +145,10 @@
         UNDESIRED_CERTIFICATE_MACRANDSAPSECRET
     };
 
+    // Should be the same index value as wifi_privacy_entries in arrays.xml
+    @VisibleForTesting static final int PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC = 0;
+    @VisibleForTesting static final int PRIVACY_SPINNER_INDEX_DEVICE_MAC = 1;
+
     /* Phase2 methods supported by PEAP are limited */
     private ArrayAdapter<CharSequence> mPhase2PeapAdapter;
     /* Phase2 methods supported by TTLS are limited */
@@ -159,11 +164,11 @@
     private String mMultipleCertSetString;
     private String mUseSystemCertsString;
     private String mDoNotProvideEapUserCertString;
-    private String mDoNotValidateEapServerString;
 
     private ScrollView mDialogContainer;
     private Spinner mSecuritySpinner;
-    private Spinner mEapMethodSpinner;
+    @VisibleForTesting Spinner mEapMethodSpinner;
+    @VisibleForTesting Spinner mEapSimSpinner;    // For EAP-SIM, EAP-AKA and EAP-AKA-PRIME.
     private Spinner mEapCaCertSpinner;
     private Spinner mEapOcspSpinner;
     private TextView mEapDomainView;
@@ -209,6 +214,8 @@
 
     private final WifiManager mWifiManager;
 
+    private final List<SubscriptionInfo> mActiveSubscriptionInfos = new ArrayList<>();
+
     public WifiConfigController(WifiConfigUiBase parent, View view, AccessPoint accessPoint,
             int mode) {
         this (parent, view, accessPoint, mode, true /* requestFocus */);
@@ -264,8 +271,6 @@
         mUseSystemCertsString = mContext.getString(R.string.wifi_use_system_certs);
         mDoNotProvideEapUserCertString =
             mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
-        mDoNotValidateEapServerString =
-            mContext.getString(R.string.wifi_do_not_validate_eap_server);
 
         mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
         mDialogContainer = mView.findViewById(R.id.dialog_scrollview);
@@ -305,15 +310,9 @@
                         ? HIDDEN_NETWORK
                         : NOT_HIDDEN_NETWORK);
 
-                int prefMacValue;
-                if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-                    prefMacValue = WifiPrivacyPreferenceController2
-                            .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);
-                } else {
-                    prefMacValue = WifiPrivacyPreferenceController
-                            .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);
-                }
-                mPrivacySettingsSpinner.setSelection(prefMacValue);
+                mPrivacySettingsSpinner.setSelection(
+                        config.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT
+                        ? PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC : PRIVACY_SPINNER_INDEX_DEVICE_MAC);
 
                 if (config.getIpConfiguration().getIpAssignment() == IpAssignment.STATIC) {
                     mIpSettingsSpinner.setSelection(STATIC_IP);
@@ -554,12 +553,10 @@
                 // Disallow submit if the user has not selected a CA certificate for an EAP network
                 // configuration.
                 enabled = false;
-            }
-            if (caCertSelection.equals(mUseSystemCertsString)
-                    && mEapDomainView != null
+            } else if (mEapDomainView != null
                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                // Disallow submit if the user chooses to use system certificates for EAP server
+                // Disallow submit if the user chooses to use a certificate for EAP server
                 // validation, but does not provide a domain.
                 enabled = false;
             }
@@ -577,7 +574,6 @@
     }
 
     void showWarningMessagesIfAppropriate() {
-        mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
@@ -590,19 +586,11 @@
         }
         if (mEapCaCertSpinner != null
                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
-            String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-            if (caCertSelection.equals(mDoNotValidateEapServerString)) {
-                // Display warning if user chooses not to validate the EAP server with a
-                // user-supplied CA certificate in an EAP network configuration.
-                mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
-            }
-            if (caCertSelection.equals(mUseSystemCertsString)
-                    && mEapDomainView != null
+            if (mEapDomainView != null
                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                // Display warning if user chooses to use pre-installed public CA certificates
-                // without restricting the server domain that these certificates can be used to
-                // validate.
+                // Display warning if user chooses to use a certificate without restricting the
+                // server domain that these certificates can be used to validate.
                 mView.findViewById(R.id.no_domain_warning).setVisibility(View.VISIBLE);
             }
         }
@@ -736,8 +724,7 @@
                 config.enterpriseConfig.setCaCertificateAliases(null);
                 config.enterpriseConfig.setCaPath(null);
                 config.enterpriseConfig.setDomainSuffixMatch(mEapDomainView.getText().toString());
-                if (caCert.equals(mUnspecifiedCertString)
-                        || caCert.equals(mDoNotValidateEapServerString)) {
+                if (caCert.equals(mUnspecifiedCertString)) {
                     // ca_cert already set to null, so do nothing.
                 } else if (caCert.equals(mUseSystemCertsString)) {
                     config.enterpriseConfig.setCaPath(SYSTEM_CA_STORE_PATH);
@@ -771,8 +758,7 @@
                 }
 
                 // Only set OCSP option if there is a valid CA certificate.
-                if (caCert.equals(mUnspecifiedCertString)
-                        || caCert.equals(mDoNotValidateEapServerString)) {
+                if (caCert.equals(mUnspecifiedCertString)) {
                     config.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_NONE);
                 } else {
                     config.enterpriseConfig.setOcsp(mEapOcspSpinner.getSelectedItemPosition());
@@ -825,6 +811,12 @@
                 return null;
         }
 
+        if (config.enterpriseConfig.isAuthenticationSimBased()
+                && mActiveSubscriptionInfos.size() > 0) {
+            config.carrierId = mActiveSubscriptionInfos
+                    .get(mEapSimSpinner.getSelectedItemPosition()).getCarrierId();
+        }
+
         config.setIpConfiguration(
                 new IpConfiguration(mIpAssignment, mProxySettings,
                                     mStaticIpConfiguration, mHttpProxy));
@@ -833,15 +825,10 @@
         }
 
         if (mPrivacySettingsSpinner != null) {
-            int macValue;
-            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-                macValue = WifiPrivacyPreferenceController2.translatePrefValueToMacRandomizedValue(
-                        mPrivacySettingsSpinner.getSelectedItemPosition());
-            } else {
-                macValue = WifiPrivacyPreferenceController.translatePrefValueToMacRandomizedValue(
-                        mPrivacySettingsSpinner.getSelectedItemPosition());
-            }
-            config.macRandomizationSetting = macValue;
+            config.macRandomizationSetting = mPrivacySettingsSpinner.getSelectedItemPosition()
+                    == PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC
+                    ? WifiConfiguration.RANDOMIZATION_PERSISTENT
+                    : WifiConfiguration.RANDOMIZATION_NONE;
         }
 
         return config;
@@ -1013,6 +1000,7 @@
             initiateEnterpriseNetworkUi = true;
             mEapMethodSpinner = (Spinner) mView.findViewById(R.id.method);
             mEapMethodSpinner.setOnItemSelectedListener(this);
+            mEapSimSpinner = (Spinner) mView.findViewById(R.id.sim);
             mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
             mPhase2Spinner.setOnItemSelectedListener(this);
             mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert);
@@ -1049,18 +1037,20 @@
         }
 
         if (refreshCertificates) {
+            loadSims();
+
             loadCertificates(
                     mEapCaCertSpinner,
                     Credentials.CA_CERTIFICATE,
-                    mDoNotValidateEapServerString,
-                    false,
-                    true);
+                    null /* noCertificateString */,
+                    false /* showMultipleCerts */,
+                    true /* showUsePreinstalledCertOption */);
             loadCertificates(
                     mEapUserCertSpinner,
                     Credentials.USER_PRIVATE_KEY,
                     mDoNotProvideEapUserCertString,
-                    false,
-                    false);
+                    false /* showMultipleCerts */,
+                    false /* showUsePreinstalledCertOption */);
             // To avoid the user connects to a non-secure network unexpectedly,
             // request using system trusted certificates by default
             // unless the user explicitly chooses "Do not validate" or other
@@ -1070,9 +1060,10 @@
 
         // Modifying an existing network
         if (initiateEnterpriseNetworkUi && mAccessPoint != null && mAccessPoint.isSaved()) {
-            WifiEnterpriseConfig enterpriseConfig = mAccessPoint.getConfig().enterpriseConfig;
-            int eapMethod = enterpriseConfig.getEapMethod();
-            int phase2Method = enterpriseConfig.getPhase2Method();
+            final WifiConfiguration wifiConfig = mAccessPoint.getConfig();
+            final WifiEnterpriseConfig enterpriseConfig = wifiConfig.enterpriseConfig;
+            final int eapMethod = enterpriseConfig.getEapMethod();
+            final int phase2Method = enterpriseConfig.getPhase2Method();
             mEapMethodSpinner.setSelection(eapMethod);
             showEapFieldsByMethod(eapMethod);
             switch (eapMethod) {
@@ -1120,12 +1111,22 @@
                 default:
                     break;
             }
+
+            if (enterpriseConfig.isAuthenticationSimBased()) {
+                for (int i = 0; i < mActiveSubscriptionInfos.size(); i++) {
+                    if (wifiConfig.carrierId == mActiveSubscriptionInfos.get(i).getCarrierId()) {
+                        mEapSimSpinner.setSelection(i);
+                        break;
+                    }
+                }
+            }
+
             if (!TextUtils.isEmpty(enterpriseConfig.getCaPath())) {
                 setSelection(mEapCaCertSpinner, mUseSystemCertsString);
             } else {
                 String[] caCerts = enterpriseConfig.getCaCertificateAliases();
                 if (caCerts == null) {
-                    setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
+                    setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
                 } else if (caCerts.length == 1) {
                     setSelection(mEapCaCertSpinner, caCerts[0]);
                 } else {
@@ -1133,9 +1134,9 @@
                     loadCertificates(
                             mEapCaCertSpinner,
                             Credentials.CA_CERTIFICATE,
-                            mDoNotValidateEapServerString,
-                            true,
-                            true);
+                            null /* noCertificateString */,
+                            true /* showMultipleCerts */,
+                            true /* showUsePreinstalledCertOption */);
                     setSelection(mEapCaCertSpinner, mMultipleCertSetString);
                 }
             }
@@ -1208,6 +1209,7 @@
         mView.findViewById(R.id.l_ocsp).setVisibility(View.VISIBLE);
         mView.findViewById(R.id.password_layout).setVisibility(View.VISIBLE);
         mView.findViewById(R.id.show_password_layout).setVisibility(View.VISIBLE);
+        mView.findViewById(R.id.l_sim).setVisibility(View.VISIBLE);
 
         Context context = mConfigUi.getContext();
         switch (eapMethod) {
@@ -1218,12 +1220,14 @@
                 setDomainInvisible();
                 setAnonymousIdentInvisible();
                 setUserCertInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_TLS:
                 mView.findViewById(R.id.l_user_cert).setVisibility(View.VISIBLE);
                 setPhase2Invisible();
                 setAnonymousIdentInvisible();
                 setPasswordInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_PEAP:
                 // Reset adapter if needed
@@ -1245,6 +1249,7 @@
                 mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
                 mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
                 setUserCertInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_SIM:
             case WIFI_EAP_METHOD_AKA:
@@ -1262,8 +1267,7 @@
 
         if (mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
             String eapCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-            if (eapCertSelection.equals(mDoNotValidateEapServerString)
-                    || eapCertSelection.equals(mUnspecifiedCertString)) {
+            if (eapCertSelection.equals(mUnspecifiedCertString)) {
                 // Domain suffix matching is not relevant if the user hasn't chosen a CA
                 // certificate yet, or chooses not to validate the EAP server.
                 setDomainInvisible();
@@ -1282,11 +1286,13 @@
             mEapIdentityView.setText("");
             mView.findViewById(R.id.l_identity).setVisibility(View.GONE);
             setPasswordInvisible();
+            mView.findViewById(R.id.l_sim).setVisibility(View.VISIBLE);
         } else {
             mView.findViewById(R.id.l_identity).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.password_layout).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.show_password_layout).setVisibility(View.VISIBLE);
+            mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
         }
     }
 
@@ -1450,6 +1456,44 @@
     }
 
     @VisibleForTesting
+    void loadSims() {
+        List<SubscriptionInfo> activeSubscriptionInfos = mContext
+                .getSystemService(SubscriptionManager.class).getActiveSubscriptionInfoList();
+        if (activeSubscriptionInfos == null) {
+            activeSubscriptionInfos = Collections.EMPTY_LIST;
+        }
+        mActiveSubscriptionInfos.clear();
+
+        // De-duplicates active subscriptions and caches in mActiveSubscriptionInfos.
+        for (SubscriptionInfo newInfo : activeSubscriptionInfos) {
+            for (SubscriptionInfo cachedInfo : mActiveSubscriptionInfos) {
+                if (newInfo.getCarrierId() == cachedInfo.getCarrierId()) {
+                    continue;
+                }
+            }
+            mActiveSubscriptionInfos.add(newInfo);
+        }
+
+        // Shows disabled 'No SIM' when there is no active subscription.
+        if (mActiveSubscriptionInfos.size() == 0) {
+            final String[] noSim = new String[]{mContext.getString(R.string.wifi_no_sim_card)};
+            mEapSimSpinner.setAdapter(getSpinnerAdapter(noSim));
+            mEapSimSpinner.setSelection(0 /* position */);
+            mEapSimSpinner.setEnabled(false);
+            return;
+        }
+
+        // Shows display name of each active subscription.
+        final String[] displayNames = mActiveSubscriptionInfos.stream().map(
+                SubscriptionInfo::getDisplayName).toArray(String[]::new);
+        mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));
+        mEapSimSpinner.setSelection(0 /* position */);
+        if (displayNames.length == 1) {
+            mEapSimSpinner.setEnabled(false);
+        }
+    }
+
+    @VisibleForTesting
     void loadCertificates(
             Spinner spinner,
             String prefix,
@@ -1485,7 +1529,8 @@
                     }).collect(Collectors.toList()));
         }
 
-        if (mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
+        if (!TextUtils.isEmpty(noCertificateString)
+                && mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
             certs.add(noCertificateString);
         }
 
@@ -1713,7 +1758,8 @@
                 mContext.getResources().getStringArray(contentStringArrayResId));
     }
 
-    private ArrayAdapter<CharSequence> getSpinnerAdapter(
+    @VisibleForTesting
+    ArrayAdapter<CharSequence> getSpinnerAdapter(
             String[] contentStringArray) {
         ArrayAdapter<CharSequence> spinnerAdapter = new ArrayAdapter<>(mContext,
                 android.R.layout.simple_spinner_item, contentStringArray);
diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java
index 99907f3..37013f2 100644
--- a/src/com/android/settings/wifi/WifiConfigController2.java
+++ b/src/com/android/settings/wifi/WifiConfigController2.java
@@ -35,12 +35,13 @@
 import android.os.UserManager;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
@@ -67,12 +68,10 @@
 
 import com.android.settings.ProxySelector;
 import com.android.settings.R;
-import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
 import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.Utils;
 import com.android.settingslib.utils.ThreadUtils;
-import com.android.settingslib.wifi.AccessPoint;
 import com.android.wifitrackerlib.WifiEntry;
 import com.android.wifitrackerlib.WifiEntry.ConnectedInfo;
 
@@ -80,7 +79,9 @@
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -156,11 +157,12 @@
     private String mMultipleCertSetString;
     private String mUseSystemCertsString;
     private String mDoNotProvideEapUserCertString;
-    private String mDoNotValidateEapServerString;
 
     private ScrollView mDialogContainer;
     private Spinner mSecuritySpinner;
-    private Spinner mEapMethodSpinner;
+    @VisibleForTesting Spinner mEapMethodSpinner;
+    private int mLastShownEapMethod;
+    @VisibleForTesting Spinner mEapSimSpinner;    // For EAP-SIM, EAP-AKA and EAP-AKA-PRIME.
     private Spinner mEapCaCertSpinner;
     private Spinner mEapOcspSpinner;
     private TextView mEapDomainView;
@@ -205,6 +207,8 @@
 
     private final WifiManager mWifiManager;
 
+    private final List<SubscriptionInfo> mActiveSubscriptionInfos = new ArrayList<>();
+
     public WifiConfigController2(WifiConfigUiBase2 parent, View view, WifiEntry wifiEntry,
             int mode) {
         mConfigUi = parent;
@@ -253,8 +257,6 @@
         mUseSystemCertsString = mContext.getString(R.string.wifi_use_system_certs);
         mDoNotProvideEapUserCertString =
             mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
-        mDoNotValidateEapServerString =
-            mContext.getString(R.string.wifi_do_not_validate_eap_server);
 
         mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
         mDialogContainer = mView.findViewById(R.id.dialog_scrollview);
@@ -294,14 +296,8 @@
                         ? HIDDEN_NETWORK
                         : NOT_HIDDEN_NETWORK);
 
-                int prefMacValue;
-                if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-                    prefMacValue = WifiPrivacyPreferenceController2
-                            .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);
-                } else {
-                    prefMacValue = WifiPrivacyPreferenceController
-                            .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);
-                }
+                final int prefMacValue = WifiPrivacyPreferenceController2
+                        .translateMacRandomizedValueToPrefValue(config.macRandomizationSetting);
                 mPrivacySettingsSpinner.setSelection(prefMacValue);
 
                 if (config.getIpConfiguration().getIpAssignment() == IpAssignment.STATIC) {
@@ -371,19 +367,6 @@
                             && signalLevel != null) {
                     mConfigUi.setSubmitButton(res.getString(R.string.wifi_connect));
                 } else {
-                    // TODO(b/143326832): Add fine-grained state information.
-                    //WifiConfiguration config = mWifiEntry.getWifiConfiguration();
-                    //String suggestionOrSpecifierPackageName = null;
-                    //if (config != null
-                    //        && (config.fromWifiNetworkSpecifier
-                    //        || config.fromWifiNetworkSuggestion)) {
-                    //    suggestionOrSpecifierPackageName = config.creatorName;
-                    //}
-                    //String summary = AccessPoint.getSummary(
-                    //        mConfigUi.getContext(), /* ssid */ null, state, isEphemeral,
-                    //        suggestionOrSpecifierPackageName);
-                    //addRow(group, R.string.wifi_status, summary);
-
                     if (signalLevel != null) {
                         addRow(group, R.string.wifi_signal, signalLevel);
                     }
@@ -398,11 +381,11 @@
                         final int frequency = info.frequencyMhz;
                         String band = null;
 
-                        if (frequency >= WifiEntryShell.LOWER_FREQ_24GHZ
-                                && frequency < WifiEntryShell.HIGHER_FREQ_24GHZ) {
+                        if (frequency >= WifiEntry.MIN_FREQ_24GHZ
+                                && frequency < WifiEntry.MAX_FREQ_24GHZ) {
                             band = res.getString(R.string.wifi_band_24ghz);
-                        } else if (frequency >= WifiEntryShell.LOWER_FREQ_5GHZ
-                                && frequency < WifiEntryShell.HIGHER_FREQ_5GHZ) {
+                        } else if (frequency >= WifiEntry.MIN_FREQ_5GHZ
+                                && frequency < WifiEntry.MAX_FREQ_5GHZ) {
                             band = res.getString(R.string.wifi_band_5ghz);
                         } else {
                             Log.e(TAG, "Unexpected frequency " + frequency);
@@ -533,12 +516,10 @@
                 // Disallow submit if the user has not selected a CA certificate for an EAP network
                 // configuration.
                 enabled = false;
-            }
-            if (caCertSelection.equals(mUseSystemCertsString)
-                    && mEapDomainView != null
+            } else if (mEapDomainView != null
                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                // Disallow submit if the user chooses to use system certificates for EAP server
+                // Disallow submit if the user chooses to use a certificate for EAP server
                 // validation, but does not provide a domain.
                 enabled = false;
             }
@@ -556,7 +537,6 @@
     }
 
     void showWarningMessagesIfAppropriate() {
-        mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
         mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
@@ -569,19 +549,11 @@
         }
         if (mEapCaCertSpinner != null
                 && mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
-            String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-            if (caCertSelection.equals(mDoNotValidateEapServerString)) {
-                // Display warning if user chooses not to validate the EAP server with a
-                // user-supplied CA certificate in an EAP network configuration.
-                mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
-            }
-            if (caCertSelection.equals(mUseSystemCertsString)
-                    && mEapDomainView != null
+            if (mEapDomainView != null
                     && mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
                     && TextUtils.isEmpty(mEapDomainView.getText().toString())) {
-                // Display warning if user chooses to use pre-installed public CA certificates
-                // without restricting the server domain that these certificates can be used to
-                // validate.
+                // Display warning if user chooses to use a certificate without restricting the
+                // server domain that these certificates can be used to validate.
                 mView.findViewById(R.id.no_domain_warning).setVisibility(View.VISIBLE);
             }
         }
@@ -606,13 +578,11 @@
         WifiConfiguration config = new WifiConfiguration();
 
         if (mWifiEntry == null) {
-            config.SSID = AccessPoint.convertToQuotedString(
-                    mSsidView.getText().toString());
+            config.SSID = "\"" + mSsidView.getText().toString() + "\"";
             // If the user adds a network manually, assume that it is hidden.
             config.hiddenSSID = mHiddenSettingsSpinner.getSelectedItemPosition() == HIDDEN_NETWORK;
         } else if (!mWifiEntry.isSaved()) {
-            config.SSID = AccessPoint.convertToQuotedString(
-                    mWifiEntry.getTitle());
+            config.SSID = "\"" + mWifiEntry.getTitle() + "\"";
         } else {
             config.networkId = mWifiEntry.getWifiConfiguration().networkId;
             config.hiddenSSID = mWifiEntry.getWifiConfiguration().hiddenSSID;
@@ -714,12 +684,17 @@
                         break;
                 }
 
+                if (config.enterpriseConfig.isAuthenticationSimBased()
+                        && mActiveSubscriptionInfos.size() > 0) {
+                    config.carrierId = mActiveSubscriptionInfos
+                            .get(mEapSimSpinner.getSelectedItemPosition()).getCarrierId();
+                }
+
                 String caCert = (String) mEapCaCertSpinner.getSelectedItem();
                 config.enterpriseConfig.setCaCertificateAliases(null);
                 config.enterpriseConfig.setCaPath(null);
                 config.enterpriseConfig.setDomainSuffixMatch(mEapDomainView.getText().toString());
-                if (caCert.equals(mUnspecifiedCertString)
-                        || caCert.equals(mDoNotValidateEapServerString)) {
+                if (caCert.equals(mUnspecifiedCertString)) {
                     // ca_cert already set to null, so do nothing.
                 } else if (caCert.equals(mUseSystemCertsString)) {
                     config.enterpriseConfig.setCaPath(SYSTEM_CA_STORE_PATH);
@@ -752,8 +727,7 @@
                 }
 
                 // Only set OCSP option if there is a valid CA certificate.
-                if (caCert.equals(mUnspecifiedCertString)
-                        || caCert.equals(mDoNotValidateEapServerString)) {
+                if (caCert.equals(mUnspecifiedCertString)) {
                     config.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_NONE);
                 } else {
                     config.enterpriseConfig.setOcsp(mEapOcspSpinner.getSelectedItemPosition());
@@ -814,15 +788,9 @@
         }
 
         if (mPrivacySettingsSpinner != null) {
-            int macValue;
-            if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-                macValue = WifiPrivacyPreferenceController2.translatePrefValueToMacRandomizedValue(
-                        mPrivacySettingsSpinner.getSelectedItemPosition());
-            } else {
-                macValue = WifiPrivacyPreferenceController.translatePrefValueToMacRandomizedValue(
-                        mPrivacySettingsSpinner.getSelectedItemPosition());
-            }
-            config.macRandomizationSetting = macValue;
+            config.macRandomizationSetting = WifiPrivacyPreferenceController2
+                    .translatePrefValueToMacRandomizedValue(mPrivacySettingsSpinner
+                            .getSelectedItemPosition());
         }
 
         return config;
@@ -994,6 +962,7 @@
             initiateEnterpriseNetworkUi = true;
             mEapMethodSpinner = (Spinner) mView.findViewById(R.id.method);
             mEapMethodSpinner.setOnItemSelectedListener(this);
+            mEapSimSpinner = (Spinner) mView.findViewById(R.id.sim);
             mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
             mPhase2Spinner.setOnItemSelectedListener(this);
             mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert);
@@ -1031,18 +1000,20 @@
         }
 
         if (refreshCertificates) {
+            loadSims();
+
             loadCertificates(
                     mEapCaCertSpinner,
                     Credentials.CA_CERTIFICATE,
-                    mDoNotValidateEapServerString,
-                    false,
-                    true);
+                    null /* noCertificateString */,
+                    false /* showMultipleCerts */,
+                    true /* showUsePreinstalledCertOption */);
             loadCertificates(
                     mEapUserCertSpinner,
                     Credentials.USER_PRIVATE_KEY,
                     mDoNotProvideEapUserCertString,
-                    false,
-                    false);
+                    false /* showMultipleCerts */,
+                    false /* showUsePreinstalledCertOption */);
             // To avoid the user connects to a non-secure network unexpectedly,
             // request using system trusted certificates by default
             // unless the user explicitly chooses "Do not validate" or other
@@ -1052,11 +1023,12 @@
 
         // Modifying an existing network
         if (initiateEnterpriseNetworkUi && mWifiEntry != null && mWifiEntry.isSaved()) {
-            WifiEnterpriseConfig enterpriseConfig = mWifiEntry.getWifiConfiguration()
-                    .enterpriseConfig;
-            int eapMethod = enterpriseConfig.getEapMethod();
-            int phase2Method = enterpriseConfig.getPhase2Method();
+            final WifiConfiguration wifiConfig = mWifiEntry.getWifiConfiguration();
+            final WifiEnterpriseConfig enterpriseConfig = wifiConfig.enterpriseConfig;
+            final int eapMethod = enterpriseConfig.getEapMethod();
+            final int phase2Method = enterpriseConfig.getPhase2Method();
             mEapMethodSpinner.setSelection(eapMethod);
+            mLastShownEapMethod = eapMethod;
             showEapFieldsByMethod(eapMethod);
             switch (eapMethod) {
                 case Eap.PEAP:
@@ -1103,12 +1075,22 @@
                 default:
                     break;
             }
+
+            if (enterpriseConfig.isAuthenticationSimBased()) {
+                for (int i = 0; i < mActiveSubscriptionInfos.size(); i++) {
+                    if (wifiConfig.carrierId == mActiveSubscriptionInfos.get(i).getCarrierId()) {
+                        mEapSimSpinner.setSelection(i);
+                        break;
+                    }
+                }
+            }
+
             if (!TextUtils.isEmpty(enterpriseConfig.getCaPath())) {
                 setSelection(mEapCaCertSpinner, mUseSystemCertsString);
             } else {
                 String[] caCerts = enterpriseConfig.getCaCertificateAliases();
                 if (caCerts == null) {
-                    setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
+                    setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
                 } else if (caCerts.length == 1) {
                     setSelection(mEapCaCertSpinner, caCerts[0]);
                 } else {
@@ -1116,9 +1098,9 @@
                     loadCertificates(
                             mEapCaCertSpinner,
                             Credentials.CA_CERTIFICATE,
-                            mDoNotValidateEapServerString,
-                            true,
-                            true);
+                            null /* noCertificateString */,
+                            true /* showMultipleCerts */,
+                            true /* showUsePreinstalledCertOption */);
                     setSelection(mEapCaCertSpinner, mMultipleCertSetString);
                 }
             }
@@ -1191,6 +1173,7 @@
         mView.findViewById(R.id.l_ocsp).setVisibility(View.VISIBLE);
         mView.findViewById(R.id.password_layout).setVisibility(View.VISIBLE);
         mView.findViewById(R.id.show_password_layout).setVisibility(View.VISIBLE);
+        mView.findViewById(R.id.l_sim).setVisibility(View.VISIBLE);
 
         Context context = mConfigUi.getContext();
         switch (eapMethod) {
@@ -1201,12 +1184,14 @@
                 setDomainInvisible();
                 setAnonymousIdentInvisible();
                 setUserCertInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_TLS:
                 mView.findViewById(R.id.l_user_cert).setVisibility(View.VISIBLE);
                 setPhase2Invisible();
                 setAnonymousIdentInvisible();
                 setPasswordInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_PEAP:
                 // Reset adapter if needed
@@ -1228,6 +1213,7 @@
                 mView.findViewById(R.id.l_phase2).setVisibility(View.VISIBLE);
                 mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
                 setUserCertInvisible();
+                mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
                 break;
             case WIFI_EAP_METHOD_SIM:
             case WIFI_EAP_METHOD_AKA:
@@ -1245,8 +1231,7 @@
 
         if (mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
             String eapCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
-            if (eapCertSelection.equals(mDoNotValidateEapServerString)
-                    || eapCertSelection.equals(mUnspecifiedCertString)) {
+            if (eapCertSelection.equals(mUnspecifiedCertString)) {
                 // Domain suffix matching is not relevant if the user hasn't chosen a CA
                 // certificate yet, or chooses not to validate the EAP server.
                 setDomainInvisible();
@@ -1265,11 +1250,13 @@
             mEapIdentityView.setText("");
             mView.findViewById(R.id.l_identity).setVisibility(View.GONE);
             setPasswordInvisible();
+            mView.findViewById(R.id.l_sim).setVisibility(View.VISIBLE);
         } else {
             mView.findViewById(R.id.l_identity).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.l_anonymous).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.password_layout).setVisibility(View.VISIBLE);
             mView.findViewById(R.id.show_password_layout).setVisibility(View.VISIBLE);
+            mView.findViewById(R.id.l_sim).setVisibility(View.GONE);
         }
     }
 
@@ -1433,6 +1420,44 @@
     }
 
     @VisibleForTesting
+    void loadSims() {
+        List<SubscriptionInfo> activeSubscriptionInfos = mContext
+                .getSystemService(SubscriptionManager.class).getActiveSubscriptionInfoList();
+        if (activeSubscriptionInfos == null) {
+            activeSubscriptionInfos = Collections.EMPTY_LIST;
+        }
+        mActiveSubscriptionInfos.clear();
+
+        // De-duplicates active subscriptions and caches in mActiveSubscriptionInfos.
+        for (SubscriptionInfo newInfo : activeSubscriptionInfos) {
+            for (SubscriptionInfo cachedInfo : mActiveSubscriptionInfos) {
+                if (newInfo.getCarrierId() == cachedInfo.getCarrierId()) {
+                    continue;
+                }
+            }
+            mActiveSubscriptionInfos.add(newInfo);
+        }
+
+        // Shows disabled 'No SIM' when there is no active subscription.
+        if (mActiveSubscriptionInfos.size() == 0) {
+            final String[] noSim = new String[]{mContext.getString(R.string.wifi_no_sim_card)};
+            mEapSimSpinner.setAdapter(getSpinnerAdapter(noSim));
+            mEapSimSpinner.setSelection(0 /* position */);
+            mEapSimSpinner.setEnabled(false);
+            return;
+        }
+
+        // Shows display name of each active subscription.
+        final String[] displayNames = mActiveSubscriptionInfos.stream().map(
+                SubscriptionInfo::getDisplayName).toArray(String[]::new);
+        mEapSimSpinner.setAdapter(getSpinnerAdapter(displayNames));
+        mEapSimSpinner.setSelection(0 /* position */);
+        if (displayNames.length == 1) {
+            mEapSimSpinner.setEnabled(false);
+        }
+    }
+
+    @VisibleForTesting
     void loadCertificates(
             Spinner spinner,
             String prefix,
@@ -1468,7 +1493,8 @@
                     }).collect(Collectors.toList()));
         }
 
-        if (mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
+        if (!TextUtils.isEmpty(noCertificateString)
+                && mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
             certs.add(noCertificateString);
         }
 
@@ -1573,7 +1599,11 @@
                 mSsidScanButton.setVisibility(View.GONE);
             }
         } else if (parent == mEapMethodSpinner) {
-            showSecurityFields(/* refreshEapMethods */ false, /* refreshCertificates */ true);
+            final int selectedItemPosition = mEapMethodSpinner.getSelectedItemPosition();
+            if (mLastShownEapMethod != selectedItemPosition) {
+                mLastShownEapMethod = selectedItemPosition;
+                showSecurityFields(/* refreshEapMethods */ false, /* refreshCertificates */ true);
+            }
         } else if (parent == mEapCaCertSpinner) {
             showSecurityFields(/* refreshEapMethods */ false, /* refreshCertificates */ false);
         } else if (parent == mPhase2Spinner
@@ -1696,7 +1726,8 @@
                 mContext.getResources().getStringArray(contentStringArrayResId));
     }
 
-    private ArrayAdapter<CharSequence> getSpinnerAdapter(
+    @VisibleForTesting
+    ArrayAdapter<CharSequence> getSpinnerAdapter(
             String[] contentStringArray) {
         ArrayAdapter<CharSequence> spinnerAdapter = new ArrayAdapter<>(mContext,
                 android.R.layout.simple_spinner_item, contentStringArray);
diff --git a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
index 742edd1..3b2669c 100644
--- a/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiConnectionPreferenceController.java
@@ -17,9 +17,6 @@
 package com.android.settings.wifi;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
-import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -29,11 +26,14 @@
 import android.os.SystemClock;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -50,7 +50,7 @@
  * controller class when there is a wifi connection present.
  */
 public class WifiConnectionPreferenceController extends AbstractPreferenceController implements
-        WifiPickerTracker.WifiPickerTrackerCallback {
+        WifiPickerTracker.WifiPickerTrackerCallback, LifecycleObserver {
 
     private static final String TAG = "WifiConnPrefCtrl";
 
@@ -97,6 +97,7 @@
             UpdateListener updateListener, String preferenceGroupKey, int order,
             int metricsCategory) {
         super(context);
+        lifecycle.addObserver(this);
         mUpdateListener = updateListener;
         mPreferenceGroupKey = preferenceGroupKey;
         this.order = order;
@@ -112,16 +113,23 @@
                 return SystemClock.elapsedRealtime();
             }
         };
-        mWifiPickerTracker = new WifiPickerTracker(lifecycle, context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                this);
+        mWifiPickerTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(lifecycle, context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        this);
+    }
+
+    /**
+     * This event is triggered when users click back button at 'Network & internet'.
+     */
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    public void onDestroy() {
+        mWorkerThread.quit();
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/WifiDialogActivity.java b/src/com/android/settings/wifi/WifiDialogActivity.java
index 7782786..1c5a8ed 100644
--- a/src/com/android/settings/wifi/WifiDialogActivity.java
+++ b/src/com/android/settings/wifi/WifiDialogActivity.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.wifi;
 
-import android.app.Activity;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.NetworkInfo;
@@ -24,22 +23,49 @@
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.ActionListener;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
+import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
 
 import com.android.settings.R;
 import com.android.settings.SetupWizardUtils;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.dpp.WifiDppUtils;
+import com.android.settingslib.core.lifecycle.ObservableActivity;
 import com.android.settingslib.wifi.AccessPoint;
+import com.android.wifitrackerlib.NetworkDetailsTracker;
+import com.android.wifitrackerlib.WifiEntry;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
+import com.google.android.setupdesign.util.ThemeHelper;
 
-public class WifiDialogActivity extends Activity implements WifiDialog.WifiDialogListener,
-        DialogInterface.OnDismissListener {
+import java.time.Clock;
+import java.time.ZoneOffset;
+
+/**
+ * The activity shows a Wi-fi editor dialog.
+ *
+ * TODO(b/152571756): This activity supports both WifiTrackerLib and SettingsLib because this is an
+ *                    exported UI component, some other APPs (e.g., SetupWizard) still use
+ *                    SettingsLib. Remove the SettingsLib compatible part after these APPs use
+ *                    WifiTrackerLib.
+ */
+public class WifiDialogActivity extends ObservableActivity implements WifiDialog.WifiDialogListener,
+        WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener {
 
     private static final String TAG = "WifiDialogActivity";
 
+    // For the callers which support WifiTrackerLib.
+    public static final String KEY_CHOSEN_WIFIENTRY_KEY = "key_chosen_wifientry_key";
+
+    // For the callers which support SettingsLib.
     public static final String KEY_ACCESS_POINT_STATE = "access_point_state";
 
     /**
@@ -58,49 +84,136 @@
 
     private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
 
+    // Max age of tracked WifiEntries.
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating NetworkDetailsTracker scans.
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+
     private WifiDialog mDialog;
+    private AccessPoint mAccessPoint;
+
+    private WifiDialog2 mDialog2;
+
+    // The received intent supports a key of WifiTrackerLib or SettingsLib.
+    private boolean mIsWifiTrackerLib;
 
     private Intent mIntent;
+    private NetworkDetailsTracker mNetworkDetailsTracker;
+    private HandlerThread mWorkerThread;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         mIntent = getIntent();
         if (WizardManagerHelper.isSetupWizardIntent(mIntent)) {
-            setTheme(SetupWizardUtils.getTransparentTheme(mIntent));
+            setTheme(SetupWizardUtils.getTransparentTheme(this, mIntent));
         }
 
         super.onCreate(savedInstanceState);
 
-        final Bundle accessPointState = mIntent.getBundleExtra(KEY_ACCESS_POINT_STATE);
-        AccessPoint accessPoint = null;
-        if (accessPointState != null) {
-            accessPoint = new AccessPoint(this, accessPointState);
+        mIsWifiTrackerLib = !TextUtils.isEmpty(mIntent.getStringExtra(KEY_CHOSEN_WIFIENTRY_KEY));
+
+        if (mIsWifiTrackerLib) {
+            mWorkerThread = new HandlerThread(
+                    TAG + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                    Process.THREAD_PRIORITY_BACKGROUND);
+            mWorkerThread.start();
+            final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+                @Override
+                public long millis() {
+                    return SystemClock.elapsedRealtime();
+                }
+            };
+            mNetworkDetailsTracker = FeatureFactory.getFactory(this)
+                    .getWifiTrackerLibProvider()
+                    .createNetworkDetailsTracker(
+                            getLifecycle(),
+                            this,
+                            new Handler(Looper.getMainLooper()),
+                            mWorkerThread.getThreadHandler(),
+                            elapsedRealtimeClock,
+                            MAX_SCAN_AGE_MILLIS,
+                            SCAN_INTERVAL_MILLIS,
+                            mIntent.getStringExtra(KEY_CHOSEN_WIFIENTRY_KEY));
+        } else {
+            final Bundle accessPointState = mIntent.getBundleExtra(KEY_ACCESS_POINT_STATE);
+            if (accessPointState != null) {
+                mAccessPoint = new AccessPoint(this, accessPointState);
+            }
+        }
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        if (mDialog2 != null || mDialog != null) {
+            return;
         }
 
         if (WizardManagerHelper.isAnySetupWizard(getIntent())) {
-            mDialog = WifiDialog.createModal(this, this, accessPoint,
-                    WifiConfigUiBase.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light);
+            final int targetStyle = ThemeHelper.isSetupWizardDayNightEnabled(this)
+                    ? R.style.SuwAlertDialogThemeCompat_DayNight :
+                    R.style.SuwAlertDialogThemeCompat_Light;
+            if (mIsWifiTrackerLib) {
+                mDialog2 = WifiDialog2.createModal(this, this,
+                        mNetworkDetailsTracker.getWifiEntry(),
+                        WifiConfigUiBase2.MODE_CONNECT, targetStyle);
+            } else {
+                mDialog = WifiDialog.createModal(this, this, mAccessPoint,
+                        WifiConfigUiBase.MODE_CONNECT, targetStyle);
+            }
         } else {
-            mDialog = WifiDialog.createModal(
-                    this, this, accessPoint, WifiConfigUiBase.MODE_CONNECT);
+            if (mIsWifiTrackerLib) {
+                mDialog2 = WifiDialog2.createModal(this, this,
+                        mNetworkDetailsTracker.getWifiEntry(), WifiConfigUiBase2.MODE_CONNECT);
+            } else {
+                mDialog = WifiDialog.createModal(
+                        this, this, mAccessPoint, WifiConfigUiBase.MODE_CONNECT);
+            }
         }
-        mDialog.show();
-        mDialog.setOnDismissListener(this);
+
+        if (mIsWifiTrackerLib) {
+            mDialog2.show();
+            mDialog2.setOnDismissListener(this);
+        } else {
+            mDialog.show();
+            mDialog.setOnDismissListener(this);
+        }
     }
 
     @Override
     public void finish() {
-        super.finish();
         overridePendingTransition(0, 0);
+
+        super.finish();
     }
 
     @Override
     public void onDestroy() {
-        super.onDestroy();
-        if (mDialog != null && mDialog.isShowing()) {
-            mDialog.dismiss();
-            mDialog = null;
+        if (mIsWifiTrackerLib) {
+            if (mDialog2 != null && mDialog2.isShowing()) {
+                mDialog2.dismiss();
+                mDialog2 = null;
+            }
+            mWorkerThread.quit();
+        } else {
+            if (mDialog != null && mDialog.isShowing()) {
+                mDialog.dismiss();
+                mDialog = null;
+            }
         }
+
+        super.onDestroy();
+    }
+
+    @Override
+    public void onForget(WifiDialog2 dialog) {
+        final WifiEntry wifiEntry = dialog.getController().getWifiEntry();
+        if (wifiEntry != null && wifiEntry.canForget()) {
+            wifiEntry.forget(null /* callback */);
+        }
+
+        setResult(RESULT_FORGET);
+        finish();
     }
 
     @Override
@@ -134,6 +247,27 @@
     }
 
     @Override
+    public void onSubmit(WifiDialog2 dialog) {
+        final WifiEntry wifiEntry = dialog.getController().getWifiEntry();
+        final WifiConfiguration config = dialog.getController().getConfig();
+
+        if (getIntent().getBooleanExtra(KEY_CONNECT_FOR_CALLER, true)) {
+            if (config == null && wifiEntry != null && wifiEntry.canConnect()) {
+                wifiEntry.connect(null /* callback */);
+            } else {
+                getSystemService(WifiManager.class).connect(config, null /* listener */);
+            }
+        }
+
+        final Intent resultData = new Intent();
+        if (config != null) {
+            resultData.putExtra(KEY_WIFI_CONFIGURATION, config);
+        }
+        setResult(RESULT_CONNECTED, resultData);
+        finish();
+    }
+
+    @Override
     public void onSubmit(WifiDialog dialog) {
         final WifiConfiguration config = dialog.getController().getConfig();
         final AccessPoint accessPoint = dialog.getController().getAccessPoint();
@@ -171,11 +305,21 @@
 
     @Override
     public void onDismiss(DialogInterface dialogInterface) {
+        mDialog2 = null;
         mDialog = null;
         finish();
     }
 
     @Override
+    public void onScan(WifiDialog2 dialog, String ssid) {
+        Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid);
+        WizardManagerHelper.copyWizardManagerExtras(mIntent, intent);
+
+        // Launch QR code scanner to join a network.
+        startActivityForResult(intent, REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);
+    }
+
+    @Override
     public void onScan(WifiDialog dialog, String ssid) {
         Intent intent = WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid);
         WizardManagerHelper.copyWizardManagerExtras(mIntent, intent);
diff --git a/src/com/android/settings/wifi/WifiEntryShell.java b/src/com/android/settings/wifi/WifiEntryShell.java
deleted file mode 100644
index 385cca1..0000000
--- a/src/com/android/settings/wifi/WifiEntryShell.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import com.android.wifitrackerlib.WifiEntry;
-
-/**
- * {@link WifiEntry is working in progess, many methods are not available, this class is to group
- * all the unavalable {@link AccessPoint} methods & constants.
- *
- * TODO(b/143326832): Replace all methods & constants with WifiEntry version when it's available.
- */
-public class WifiEntryShell {
-    public WifiEntryShell(){};
-
-    /**
-     * Lower bound on the 2.4 GHz (802.11b/g/n) WLAN channels
-     */
-    public static final int LOWER_FREQ_24GHZ = 2400;
-
-    /**
-     * Upper bound on the 2.4 GHz (802.11b/g/n) WLAN channels
-     */
-    public static final int HIGHER_FREQ_24GHZ = 2500;
-
-    /**
-     * Lower bound on the 5.0 GHz (802.11a/h/j/n/ac) WLAN channels
-     */
-    public static final int LOWER_FREQ_5GHZ = 4900;
-
-    /**
-     * Upper bound on the 5.0 GHz (802.11a/h/j/n/ac) WLAN channels
-     */
-    public static final int HIGHER_FREQ_5GHZ = 5900;
-}
diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
deleted file mode 100644
index 1e18c59..0000000
--- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
+++ /dev/null
@@ -1,106 +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.wifi;
-
-import android.content.Context;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.widget.MasterSwitchController;
-import com.android.settings.widget.MasterSwitchPreference;
-import com.android.settings.widget.SummaryUpdater;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-import com.android.settingslib.core.lifecycle.events.OnStart;
-import com.android.settingslib.core.lifecycle.events.OnStop;
-
-// TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController.
-public class WifiMasterSwitchPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
-        LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
-
-    public static final String KEY_TOGGLE_WIFI = "main_toggle_wifi";
-
-    private MasterSwitchPreference mWifiPreference;
-    private WifiEnabler mWifiEnabler;
-    private final WifiSummaryUpdater mSummaryHelper;
-    private final MetricsFeatureProvider mMetricsFeatureProvider;
-
-    public WifiMasterSwitchPreferenceController(Context context,
-            MetricsFeatureProvider metricsFeatureProvider) {
-        super(context);
-        mMetricsFeatureProvider = metricsFeatureProvider;
-        mSummaryHelper = new WifiSummaryUpdater(mContext, this);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mWifiPreference = screen.findPreference(KEY_TOGGLE_WIFI);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return mContext.getResources().getBoolean(R.bool.config_show_wifi_settings);
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_TOGGLE_WIFI;
-    }
-
-    @Override
-    public void onResume() {
-        mSummaryHelper.register(true);
-        if (mWifiEnabler != null) {
-            mWifiEnabler.resume(mContext);
-        }
-    }
-
-    @Override
-    public void onPause() {
-        if (mWifiEnabler != null) {
-            mWifiEnabler.pause();
-        }
-        mSummaryHelper.register(false);
-    }
-
-    @Override
-    public void onStart() {
-        mWifiEnabler = new WifiEnabler(mContext, new MasterSwitchController(mWifiPreference),
-            mMetricsFeatureProvider);
-    }
-
-    @Override
-    public void onStop() {
-        if (mWifiEnabler != null) {
-            mWifiEnabler.teardownSwitchController();
-        }
-    }
-
-    @Override
-    public void onSummaryChanged(String summary) {
-        if (mWifiPreference != null) {
-            mWifiPreference.setSummary(summary);
-        }
-    }
-
-}
diff --git a/src/com/android/settings/wifi/WifiNoInternetDialog.java b/src/com/android/settings/wifi/WifiNoInternetDialog.java
index ccfda3a..9d90b6a 100644
--- a/src/com/android/settings/wifi/WifiNoInternetDialog.java
+++ b/src/com/android/settings/wifi/WifiNoInternetDialog.java
@@ -38,11 +38,16 @@
 import android.view.View;
 import android.widget.CheckBox;
 
+import androidx.annotation.VisibleForTesting;
+
 import com.android.internal.app.AlertActivity;
 import com.android.internal.app.AlertController;
 import com.android.settings.R;
 
-public final class WifiNoInternetDialog extends AlertActivity implements
+/**
+ * To display a dialog that asks the user whether to connect to a network that is not validated.
+ */
+public class WifiNoInternetDialog extends AlertActivity implements
         DialogInterface.OnClickListener {
     private static final String TAG = "WifiNoInternetDialog";
 
@@ -50,7 +55,7 @@
     private Network mNetwork;
     private String mNetworkName;
     private ConnectivityManager.NetworkCallback mNetworkCallback;
-    private CheckBox mAlwaysAllow;
+    @VisibleForTesting CheckBox mAlwaysAllow;
     private String mAction;
     private boolean mButtonClicked;
 
diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java
index adfc7ec..d56e7e5 100644
--- a/src/com/android/settings/wifi/WifiPickerActivity.java
+++ b/src/com/android/settings/wifi/WifiPickerActivity.java
@@ -16,7 +16,6 @@
 package com.android.settings.wifi;
 
 import android.content.Intent;
-import android.util.FeatureFlagUtils;
 
 import androidx.preference.PreferenceFragmentCompat;
 
@@ -24,7 +23,6 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
-import com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2;
 
 public class WifiPickerActivity extends SettingsActivity implements ButtonBarHandler {
@@ -41,14 +39,8 @@
 
     @Override
     protected boolean isValidFragment(String fragmentName) {
-        boolean isSavedAccessPointsWifiSettings;
-        if (FeatureFlagUtils.isEnabled(this, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            isSavedAccessPointsWifiSettings =
-                    SavedAccessPointsWifiSettings2.class.getName().equals(fragmentName);
-        } else {
-            isSavedAccessPointsWifiSettings =
-                    SavedAccessPointsWifiSettings.class.getName().equals(fragmentName);
-        }
+        final boolean isSavedAccessPointsWifiSettings =
+                SavedAccessPointsWifiSettings2.class.getName().equals(fragmentName);
 
         if (WifiSettings.class.getName().equals(fragmentName)
                 || WifiP2pSettings.class.getName().equals(fragmentName)
diff --git a/src/com/android/settings/wifi/WifiPickerTrackerHelper.java b/src/com/android/settings/wifi/WifiPickerTrackerHelper.java
new file mode 100644
index 0000000..c20f355
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiPickerTrackerHelper.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import android.content.Context;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleObserver;
+import androidx.lifecycle.OnLifecycleEvent;
+
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.wifitrackerlib.MergedCarrierEntry;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
+
+import java.time.Clock;
+import java.time.ZoneOffset;
+
+public class WifiPickerTrackerHelper implements LifecycleObserver {
+
+    private static final String TAG = "WifiPickerTrackerHelper";
+
+    // Max age of tracked WifiEntries
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating WifiPickerTracker scans
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+    // Clock used for evaluating the age of scans
+    private static final Clock ELAPSED_REALTIME_CLOCK = new SimpleClock(ZoneOffset.UTC) {
+        @Override
+        public long millis() {
+            return SystemClock.elapsedRealtime();
+        }
+    };
+
+    private WifiPickerTracker mWifiPickerTracker;
+    // Worker thread used for WifiPickerTracker work
+    private HandlerThread mWorkerThread;
+
+    public WifiPickerTrackerHelper(@NonNull Lifecycle lifecycle, @NonNull Context context,
+            @Nullable WifiPickerTracker.WifiPickerTrackerCallback listener) {
+        if (lifecycle == null) {
+            throw new IllegalArgumentException("lifecycle must be non-null.");
+        }
+        lifecycle.addObserver(this);
+        mWorkerThread = new HandlerThread(TAG
+                + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+
+        mWifiPickerTracker =  FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(lifecycle, context,
+                new Handler(Looper.getMainLooper()),
+                mWorkerThread.getThreadHandler(),
+                ELAPSED_REALTIME_CLOCK,
+                MAX_SCAN_AGE_MILLIS,
+                SCAN_INTERVAL_MILLIS,
+                listener);
+
+    }
+
+    @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
+    public void onDestroy() {
+        mWorkerThread.quit();
+    }
+
+    public @NonNull WifiPickerTracker getWifiPickerTracker() {
+        return mWifiPickerTracker;
+    }
+
+    public boolean setCarrierNetworkEnabled(boolean enable) {
+        final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
+        if (mergedCarrierEntry == null) {
+            return false;
+        }
+        mergedCarrierEntry.setEnabled(enable);
+        return true;
+    }
+
+    public boolean connectCarrierNetwork(@Nullable WifiEntry.ConnectCallback callback) {
+        final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
+        if (mergedCarrierEntry == null || !mergedCarrierEntry.canConnect()) {
+            return false;
+        }
+        mergedCarrierEntry.connect(callback);
+        return true;
+    }
+
+    @VisibleForTesting
+    void setWifiPickerTracker(@NonNull WifiPickerTracker wifiPickerTracker) {
+        mWifiPickerTracker = wifiPickerTracker;
+    }
+
+    @VisibleForTesting
+    void setWorkerThread(@NonNull HandlerThread workerThread) {
+        mWorkerThread = workerThread;
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java b/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
new file mode 100644
index 0000000..fdc12aa
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
@@ -0,0 +1,110 @@
+/*
+ * 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.wifi;
+
+import android.content.Context;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settings.widget.GenericSwitchController;
+import com.android.settings.widget.PrimarySwitchPreference;
+import com.android.settings.widget.SummaryUpdater;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * PreferenceController to update the wifi state.
+ */
+// TODO(b/167474581): Should clean up this controller when Provider Model finished.
+public class WifiPrimarySwitchPreferenceController extends AbstractPreferenceController
+        implements PreferenceControllerMixin, SummaryUpdater.OnSummaryChangeListener,
+        LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
+    //TODO(b/151133650): Replace AbstractPreferenceController with BasePreferenceController.
+
+    public static final String KEY_TOGGLE_WIFI = "main_toggle_wifi";
+
+    private PrimarySwitchPreference mWifiPreference;
+    private WifiEnabler mWifiEnabler;
+    private final WifiSummaryUpdater mSummaryHelper;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
+
+    public WifiPrimarySwitchPreferenceController(Context context,
+            MetricsFeatureProvider metricsFeatureProvider) {
+        super(context);
+        mMetricsFeatureProvider = metricsFeatureProvider;
+        mSummaryHelper = new WifiSummaryUpdater(mContext, this);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mWifiPreference = screen.findPreference(KEY_TOGGLE_WIFI);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mContext.getResources().getBoolean(R.bool.config_show_wifi_settings);
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_TOGGLE_WIFI;
+    }
+
+    @Override
+    public void onResume() {
+        mSummaryHelper.register(true);
+        if (mWifiEnabler != null) {
+            mWifiEnabler.resume(mContext);
+        }
+    }
+
+    @Override
+    public void onPause() {
+        if (mWifiEnabler != null) {
+            mWifiEnabler.pause();
+        }
+        mSummaryHelper.register(false);
+    }
+
+    @Override
+    public void onStart() {
+        mWifiEnabler = new WifiEnabler(mContext, new GenericSwitchController(mWifiPreference),
+                mMetricsFeatureProvider);
+    }
+
+    @Override
+    public void onStop() {
+        if (mWifiEnabler != null) {
+            mWifiEnabler.teardownSwitchController();
+        }
+    }
+
+    @Override
+    public void onSummaryChanged(String summary) {
+        if (mWifiPreference != null) {
+            mWifiPreference.setSummary(summary);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 1ba99a2..cf8242b 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -16,31 +16,30 @@
 
 package com.android.settings.wifi;
 
-import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
 import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLED;
 import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
 
-import android.annotation.NonNull;
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.settings.SettingsEnums;
+import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.State;
-import android.net.NetworkRequest;
 import android.net.NetworkTemplate;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.Looper;
 import android.os.PowerManager;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -50,7 +49,6 @@
 import android.view.View;
 import android.widget.Toast;
 
-import androidx.annotation.IntDef;
 import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -66,58 +64,61 @@
 import com.android.settings.datausage.DataUsagePreference;
 import com.android.settings.datausage.DataUsageUtils;
 import com.android.settings.location.ScanningSettings;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.widget.SwitchBarController;
-import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
+import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
 import com.android.settings.wifi.dpp.WifiDppUtils;
+import com.android.settingslib.HelpUtils;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.search.Indexable;
 import com.android.settingslib.search.SearchIndexable;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPoint.AccessPointListener;
-import com.android.settingslib.wifi.AccessPointPreference;
+import com.android.settingslib.wifi.LongPressWifiEntryPreference;
 import com.android.settingslib.wifi.WifiSavedConfigUtils;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
+import java.time.Clock;
+import java.time.ZoneOffset;
 import java.util.List;
+import java.util.Optional;
 
 /**
- * Two types of UI are provided here.
+ * UI for Wi-Fi settings screen
  *
- * The first is for "usual Settings", appearing as any other Setup fragment.
- *
- * The second is for Setup Wizard, with a simplified interface that hides the action bar
- * and menus.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in {@link WifiSettings2}.
+ * TODO(b/167474581): This file will be deprecated at Android S, please merge your WifiSettings
+ * in change in {@link NetworkProviderSettings}.
  */
 @SearchIndexable
 public class WifiSettings extends RestrictedSettingsFragment
-        implements Indexable, WifiTracker.WifiListener, AccessPointListener,
-        WifiDialog.WifiDialogListener, DialogInterface.OnDismissListener {
+        implements Indexable, WifiPickerTracker.WifiPickerTrackerCallback,
+        WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener {
 
     private static final String TAG = "WifiSettings";
 
-    private static final int MENU_ID_CONNECT = Menu.FIRST + 6;
+    // IDs of context menu
+    static final int MENU_ID_CONNECT = Menu.FIRST + 1;
     @VisibleForTesting
-    static final int MENU_ID_FORGET = Menu.FIRST + 7;
-    private static final int MENU_ID_MODIFY = Menu.FIRST + 8;
+    static final int MENU_ID_DISCONNECT = Menu.FIRST + 2;
+    @VisibleForTesting
+    static final int MENU_ID_FORGET = Menu.FIRST + 3;
+    static final int MENU_ID_MODIFY = Menu.FIRST + 4;
+    static final int MENU_ID_SHARE = Menu.FIRST + 5;
 
-    public static final int WIFI_DIALOG_ID = 1;
+    // Max age of tracked WifiEntries
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating WifiPickerTracker scans
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
     @VisibleForTesting
     static final int ADD_NETWORK_REQUEST = 2;
-
     static final int CONFIG_NETWORK_REQUEST = 3;
-
-    // Instance state keys
-    private static final String SAVE_DIALOG_MODE = "dialog_mode";
-    private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
+    static final int MANAGE_SUBSCRIPTION = 4;
 
     private static final String PREF_KEY_EMPTY_WIFI_LIST = "wifi_empty_list";
+    // TODO(b/70983952): Rename these to use WifiEntry instead of AccessPoint.
     private static final String PREF_KEY_CONNECTED_ACCESS_POINTS = "connected_access_point";
     private static final String PREF_KEY_ACCESS_POINTS = "access_points";
     private static final String PREF_KEY_CONFIGURE_WIFI_SETTINGS = "configure_wifi_settings";
@@ -128,27 +129,48 @@
 
     private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
 
+    public static final int WIFI_DIALOG_ID = 1;
+
+    // Instance state keys
+    private static final String SAVE_DIALOG_MODE = "dialog_mode";
+    private static final String SAVE_DIALOG_WIFIENTRY_KEY = "wifi_ap_key";
+
+    // Cache at onCreateContextMenu and use at onContextItemSelected. Don't use it in other methods.
+    private WifiEntry mSelectedWifiEntry;
+
+    // Save the dialog details
+    private int mDialogMode;
+    private String mDialogWifiEntryKey;
+    private WifiEntry mDialogWifiEntry;
+
+    // This boolean extra specifies whether to enable the Next button when connected. Used by
+    // account creation outside of setup wizard.
+    private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
+
+    // Enable the Next button when a Wi-Fi network is connected.
+    private boolean mEnableNextOnConnection;
+
+    // This string extra specifies a network to open the connect dialog on, so the user can enter
+    // network credentials.  This is used by quick settings for secured networks, among other
+    // things.
+    private static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
+    private String mOpenSsid;
+
     private static boolean isVerboseLoggingEnabled() {
-        return WifiTracker.sVerboseLogging || Log.isLoggable(TAG, Log.VERBOSE);
+        return WifiPickerTracker.isVerboseLoggingEnabled();
     }
 
-    private final Runnable mUpdateAccessPointsRunnable = () -> {
-        updateAccessPointPreferences();
+    private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {
+        updateWifiEntryPreferences();
     };
     private final Runnable mHideProgressBarRunnable = () -> {
         setProgressBarVisible(false);
     };
 
-    @VisibleForTesting
-    WifiManager mWifiManager;
-    @VisibleForTesting
-    ConnectivityManager mConnectivityManager;
+    protected WifiManager mWifiManager;
     private WifiManager.ActionListener mConnectListener;
     private WifiManager.ActionListener mSaveListener;
     private WifiManager.ActionListener mForgetListener;
-    @VisibleForTesting
-    CaptivePortalNetworkCallback mCaptivePortalNetworkCallback;
-    private Network mLastNetworkCaptivePortalAppStarted;
 
     /**
      * The state of {@link #isUiRestricted()} at {@link #onCreate(Bundle)}}. This is neccesary to
@@ -158,37 +180,19 @@
     private boolean mIsRestricted;
 
     private WifiEnabler mWifiEnabler;
-    // An access point being edited is stored here.
-    private AccessPoint mSelectedAccessPoint;
 
-    private WifiDialog mDialog;
+    // Worker thread used for WifiPickerTracker work
+    private HandlerThread mWorkerThread;
+
+    @VisibleForTesting
+    WifiPickerTracker mWifiPickerTracker;
+
+    private WifiDialog2 mDialog;
 
     private View mProgressHeader;
 
-    // this boolean extra specifies whether to disable the Next button when not connected. Used by
-    // account creation outside of setup wizard.
-    private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
-    // This string extra specifies a network to open the connect dialog on, so the user can enter
-    // network credentials.  This is used by quick settings for secured networks, among other
-    // things.
-    public static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
-
-    // should Next button only be enabled when we have a connection?
-    private boolean mEnableNextOnConnection;
-
-    // Save the dialog details
-    private int mDialogMode;
-    private AccessPoint mDlgAccessPoint;
-    private Bundle mAccessPointSavedState;
-
-    @VisibleForTesting
-    WifiTracker mWifiTracker;
-    private String mOpenSsid;
-
-    private AccessPointPreference.UserBadgeCache mUserBadgeCache;
-
-    private PreferenceCategory mConnectedAccessPointPreferenceCategory;
-    private PreferenceCategory mAccessPointsPreferenceCategory;
+    private PreferenceCategory mConnectedWifiEntryPreferenceCategory;
+    private PreferenceCategory mWifiEntryPreferenceCategory;
     @VisibleForTesting
     AddWifiNetworkPreference mAddWifiNetworkPreference;
     @VisibleForTesting
@@ -204,17 +208,6 @@
      * network once connected.
      */
     private boolean mClickedConnect;
-    @ConnectSource int mConnectSource = CONNECT_SOURCE_UNSPECIFIED;
-
-    private static final int CONNECT_SOURCE_UNSPECIFIED = 0;
-    private static final int CONNECT_SOURCE_NETWORK_MENU_ITEM_CLICK = 1;
-    private static final int CONNECT_SOURCE_NETWORK_LIST_ITEM_CLICK = 2;
-
-    @IntDef({CONNECT_SOURCE_UNSPECIFIED, CONNECT_SOURCE_NETWORK_MENU_ITEM_CLICK,
-        CONNECT_SOURCE_NETWORK_LIST_ITEM_CLICK})
-    private @interface ConnectSource {}
-
-    /* End of "used in Wifi Setup context" */
 
     public WifiSettings() {
         super(DISALLOW_CONFIG_WIFI);
@@ -230,16 +223,16 @@
             setProgressBarVisible(false);
         }
         ((SettingsActivity) activity).getSwitchBar().setSwitchBarText(
-                R.string.wifi_settings_master_switch_title,
-                R.string.wifi_settings_master_switch_title);
+                R.string.wifi_settings_primary_switch_title,
+                R.string.wifi_settings_primary_switch_title);
     }
 
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
 
-        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            final Intent intent = new Intent("android.settings.WIFI_SETTINGS2");
+        if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
+            final Intent intent = new Intent("android.settings.NETWORK_PROVIDER_SETTINGS");
             final Bundle extras = getActivity().getIntent().getExtras();
             if (extras != null) {
                 intent.putExtras(extras);
@@ -261,15 +254,12 @@
     private void addPreferences() {
         addPreferencesFromResource(R.xml.wifi_settings);
 
-        mConnectedAccessPointPreferenceCategory =
-                (PreferenceCategory) findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
-        mAccessPointsPreferenceCategory =
-                (PreferenceCategory) findPreference(PREF_KEY_ACCESS_POINTS);
+        mConnectedWifiEntryPreferenceCategory = findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
+        mWifiEntryPreferenceCategory = findPreference(PREF_KEY_ACCESS_POINTS);
         mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
         mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
         mAddWifiNetworkPreference = new AddWifiNetworkPreference(getPrefContext());
-        mStatusMessagePreference = (LinkablePreference) findPreference(PREF_KEY_STATUS_MESSAGE);
-        mUserBadgeCache = new AccessPointPreference.UserBadgeCache(getPackageManager());
+        mStatusMessagePreference = findPreference(PREF_KEY_STATUS_MESSAGE);
         mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
         mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext()));
         mDataUsagePreference.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(),
@@ -281,13 +271,31 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mWifiTracker = WifiTrackerFactory.create(
-                getActivity(), this, getSettingsLifecycle(), true, true);
-        mWifiManager = mWifiTracker.getManager();
+        final Context context = getContext();
+        mWorkerThread = new HandlerThread(TAG
+                + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+            @Override
+            public long millis() {
+                return SystemClock.elapsedRealtime();
+            }
+        };
+        mWifiPickerTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(getSettingsLifecycle(), context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        this);
 
         final Activity activity = getActivity();
+
         if (activity != null) {
-            mConnectivityManager = getActivity().getSystemService(ConnectivityManager.class);
+            mWifiManager = getActivity().getSystemService(WifiManager.class);
         }
 
         mConnectListener = new WifiConnectListener(getActivity());
@@ -323,35 +331,19 @@
                 }
             }
         };
+        registerForContextMenu(getListView());
+        setHasOptionsMenu(true);
 
         if (savedInstanceState != null) {
             mDialogMode = savedInstanceState.getInt(SAVE_DIALOG_MODE);
-            if (savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) {
-                mAccessPointSavedState =
-                        savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE);
-            }
+            mDialogWifiEntryKey = savedInstanceState.getString(SAVE_DIALOG_WIFIENTRY_KEY);
         }
 
-        // if we're supposed to enable/disable the Next button based on our current connection
-        // state, start it off in the right state
-        Intent intent = getActivity().getIntent();
+        // If we're supposed to enable/disable the Next button based on our current connection
+        // state, start it off in the right state.
+        final Intent intent = getActivity().getIntent();
         mEnableNextOnConnection = intent.getBooleanExtra(EXTRA_ENABLE_NEXT_ON_CONNECT, false);
 
-        if (mEnableNextOnConnection) {
-            if (hasNextButton()) {
-                final ConnectivityManager connectivity = (ConnectivityManager)
-                        getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
-                if (connectivity != null) {
-                    NetworkInfo info = connectivity.getNetworkInfo(
-                            ConnectivityManager.TYPE_WIFI);
-                    changeNextButtonState(info.isConnected());
-                }
-            }
-        }
-
-        registerForContextMenu(getListView());
-        setHasOptionsMenu(true);
-
         if (intent.hasExtra(EXTRA_START_CONNECT_SSID)) {
             mOpenSsid = intent.getStringExtra(EXTRA_START_CONNECT_SSID);
         }
@@ -359,26 +351,23 @@
 
     @Override
     public void onDestroyView() {
-        super.onDestroyView();
-
         if (mWifiEnabler != null) {
             mWifiEnabler.teardownSwitchController();
         }
+        mWorkerThread.quit();
+
+        super.onDestroyView();
     }
 
     @Override
     public void onStart() {
         super.onStart();
 
-        // On/off switch is hidden for Setup Wizard (returns null)
         mWifiEnabler = createWifiEnabler();
 
         if (mIsRestricted) {
             restrictUi();
-            return;
         }
-
-        onWifiStateChanged(mWifiManager.getWifiState());
     }
 
     private void restrictUi() {
@@ -389,7 +378,7 @@
     }
 
     /**
-     * @return new WifiEnabler or null (as overridden by WifiSettingsForSetupWizard)
+     * @return new WifiEnabler
      */
     private WifiEnabler createWifiEnabler() {
         final SettingsActivity activity = (SettingsActivity) getActivity();
@@ -413,6 +402,8 @@
         if (mWifiEnabler != null) {
             mWifiEnabler.resume(activity);
         }
+
+        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);
     }
 
     @Override
@@ -425,9 +416,8 @@
 
     @Override
     public void onStop() {
-        getView().removeCallbacks(mUpdateAccessPointsRunnable);
+        getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);
         getView().removeCallbacks(mHideProgressBarRunnable);
-        unregisterCaptivePortalNetworkCallback();
         super.onStop();
     }
 
@@ -443,14 +433,21 @@
                 if (mDialog != null) {
                     mDialog.dismiss();
                 }
-                mWifiTracker.resumeScanning();
             }
             return;
         } else if (requestCode == CONFIG_NETWORK_REQUEST) {
             if (resultCode == Activity.RESULT_OK) {
-                handleConfigNetworkSubmitEvent(data);
+                final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
+                        ConfigureWifiEntryFragment.NETWORK_CONFIG_KEY);
+                if (wifiConfiguration != null) {
+                    mWifiManager.connect(wifiConfiguration,
+                            new WifiConnectActionListener());
+                }
             }
             return;
+        } else if (requestCode == MANAGE_SUBSCRIPTION) {
+            //Do nothing
+            return;
         }
 
         final boolean formerlyRestricted = mIsRestricted;
@@ -480,78 +477,77 @@
         // If dialog has been shown, save its state.
         if (mDialog != null) {
             outState.putInt(SAVE_DIALOG_MODE, mDialogMode);
-            if (mDlgAccessPoint != null) {
-                mAccessPointSavedState = new Bundle();
-                mDlgAccessPoint.saveWifiState(mAccessPointSavedState);
-                outState.putBundle(SAVE_DIALOG_ACCESS_POINT_STATE, mAccessPointSavedState);
-            }
+            outState.putString(SAVE_DIALOG_WIFIENTRY_KEY, mDialogWifiEntryKey);
         }
     }
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
         Preference preference = (Preference) view.getTag();
-
-        if (preference instanceof LongPressAccessPointPreference) {
-            mSelectedAccessPoint =
-                    ((LongPressAccessPointPreference) preference).getAccessPoint();
-            menu.setHeaderTitle(mSelectedAccessPoint.getTitle());
-            if (mSelectedAccessPoint.isConnectable()) {
-                menu.add(Menu.NONE, MENU_ID_CONNECT, 0 /* order */, R.string.wifi_connect);
-            }
-
-            WifiConfiguration config = mSelectedAccessPoint.getConfig();
-            // Some configs are ineditable
-            if (WifiUtils.isNetworkLockedDown(getActivity(), config)) {
-                return;
-            }
-
-            // "forget" for normal saved network. And "disconnect" for ephemeral network because it
-            // could only be disconnected and be put in blacklists so it won't be used again.
-            if (mSelectedAccessPoint.isSaved() || mSelectedAccessPoint.isEphemeral()) {
-                final int stringId = mSelectedAccessPoint.isEphemeral() ?
-                        R.string.wifi_disconnect_button_text : R.string.forget;
-                menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, stringId);
-            }
-
-            if (mSelectedAccessPoint.isSaved() && !mSelectedAccessPoint.isActive()) {
-                menu.add(Menu.NONE, MENU_ID_MODIFY, 0 /* order */, R.string.wifi_modify);
-            }
+        if (!(preference instanceof LongPressWifiEntryPreference)) {
+            // Do nothing.
+            return;
         }
+
+        // Cache the WifiEntry for onContextItemSelected. Don't use it in other methods.
+        mSelectedWifiEntry = ((LongPressWifiEntryPreference) preference).getWifiEntry();
+
+        menu.setHeaderTitle(mSelectedWifiEntry.getTitle());
+        if (mSelectedWifiEntry.canConnect()) {
+            menu.add(Menu.NONE, MENU_ID_CONNECT, 0 /* order */, R.string.wifi_connect);
+        }
+
+        if (mSelectedWifiEntry.canDisconnect()) {
+            menu.add(Menu.NONE, MENU_ID_SHARE, 0 /* order */, R.string.share);
+            menu.add(Menu.NONE, MENU_ID_DISCONNECT, 1 /* order */,
+                    R.string.wifi_disconnect_button_text);
+        }
+
+        // "forget" for normal saved network. And "disconnect" for ephemeral network because it
+        // could only be disconnected and be put in blocklists so it won't be used again.
+        if (canForgetNetwork()) {
+            menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);
+        }
+
+        WifiConfiguration config = mSelectedWifiEntry.getWifiConfiguration();
+        // Some configs are ineditable
+        if (WifiUtils.isNetworkLockedDown(getActivity(), config)) {
+            return;
+        }
+
+        if (mSelectedWifiEntry.isSaved() && mSelectedWifiEntry.getConnectedState()
+                != WifiEntry.CONNECTED_STATE_CONNECTED) {
+            menu.add(Menu.NONE, MENU_ID_MODIFY, 0 /* order */, R.string.wifi_modify);
+        }
+    }
+
+    private boolean canForgetNetwork() {
+        return mSelectedWifiEntry.canForget() && !WifiUtils.isNetworkLockedDown(getActivity(),
+                mSelectedWifiEntry.getWifiConfiguration());
     }
 
     @Override
     public boolean onContextItemSelected(MenuItem item) {
-        if (mSelectedAccessPoint == null) {
-            return super.onContextItemSelected(item);
-        }
         switch (item.getItemId()) {
-            case MENU_ID_CONNECT: {
-                boolean isSavedNetwork = mSelectedAccessPoint.isSaved();
-                if (isSavedNetwork) {
-                    connect(mSelectedAccessPoint.getConfig(), isSavedNetwork,
-                            CONNECT_SOURCE_NETWORK_MENU_ITEM_CLICK);
-                } else if ((mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
-                        (mSelectedAccessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) {
-                    /** Bypass dialog for unsecured networks */
-                    mSelectedAccessPoint.generateOpenNetworkConfig();
-                    connect(mSelectedAccessPoint.getConfig(), isSavedNetwork,
-                            CONNECT_SOURCE_NETWORK_MENU_ITEM_CLICK);
-                } else {
-                    showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_CONNECT);
-                }
+            case MENU_ID_CONNECT:
+                connect(mSelectedWifiEntry, true /* editIfNoConfig */, false /* fullScreenEdit */);
                 return true;
-            }
-            case MENU_ID_FORGET: {
-                forget();
+            case MENU_ID_DISCONNECT:
+                mSelectedWifiEntry.disconnect(null /* callback */);
                 return true;
-            }
-            case MENU_ID_MODIFY: {
-                showDialog(mSelectedAccessPoint, WifiConfigUiBase.MODE_MODIFY);
+            case MENU_ID_FORGET:
+                forget(mSelectedWifiEntry);
                 return true;
-            }
+            case MENU_ID_SHARE:
+                WifiDppUtils.showLockScreen(getContext(),
+                        () -> launchWifiDppConfiguratorActivity(mSelectedWifiEntry));
+                return true;
+            case MENU_ID_MODIFY:
+                showDialog(mSelectedWifiEntry, WifiConfigUiBase2.MODE_MODIFY);
+                return true;
+            default:
+                return super.onContextItemSelected(item);
         }
-        return super.onContextItemSelected(item);
     }
 
     @Override
@@ -562,44 +558,16 @@
             return super.onPreferenceTreeClick(preference);
         }
 
-        if (preference instanceof LongPressAccessPointPreference) {
-            mSelectedAccessPoint = ((LongPressAccessPointPreference) preference).getAccessPoint();
-            if (mSelectedAccessPoint == null) {
-                return false;
-            }
-            if (mSelectedAccessPoint.isActive()) {
-                return super.onPreferenceTreeClick(preference);
-            }
-            /**
-             * Bypass dialog and connect to unsecured networks, or previously connected saved
-             * networks, or Passpoint provided networks.
-             */
-            switch (WifiUtils.getConnectingType(mSelectedAccessPoint)) {
-                case WifiUtils.CONNECT_TYPE_OSU_PROVISION:
-                    mSelectedAccessPoint.startOsuProvisioning(mConnectListener);
-                    mClickedConnect = true;
-                    break;
+        if (preference instanceof LongPressWifiEntryPreference) {
+            final WifiEntry selectedEntry =
+                    ((LongPressWifiEntryPreference) preference).getWifiEntry();
 
-                case WifiUtils.CONNECT_TYPE_OPEN_NETWORK:
-                    mSelectedAccessPoint.generateOpenNetworkConfig();
-                    connect(mSelectedAccessPoint.getConfig(),
-                            mSelectedAccessPoint.isSaved(),
-                            CONNECT_SOURCE_NETWORK_LIST_ITEM_CLICK);
-                    break;
-
-                case WifiUtils.CONNECT_TYPE_SAVED_NETWORK:
-                    connect(mSelectedAccessPoint.getConfig(),
-                            true /* isSavedNetwork */,
-                            CONNECT_SOURCE_NETWORK_LIST_ITEM_CLICK);
-                    break;
-
-                default:
-                    final Bundle bundle = ((LongPressAccessPointPreference) preference).getExtras();
-                    mSelectedAccessPoint.saveWifiState(bundle);
-                    launchConfigNewNetworkFragment(mSelectedAccessPoint,
-                            WifiConfigUiBase.MODE_CONNECT, bundle);
-                    break;
+            if (selectedEntry.shouldEditBeforeConnect()) {
+                launchConfigNewNetworkFragment(selectedEntry);
+                return true;
             }
+
+            connect(selectedEntry, true /* editIfNoConfig */, true /* fullScreenEdit */);
         } else if (preference == mAddWifiNetworkPreference) {
             onAddNetworkPressed();
         } else {
@@ -608,14 +576,12 @@
         return true;
     }
 
-    private void showDialog(AccessPoint accessPoint, int dialogMode) {
-        if (accessPoint != null) {
-            WifiConfiguration config = accessPoint.getConfig();
-            if (WifiUtils.isNetworkLockedDown(getActivity(), config) && accessPoint.isActive()) {
-                RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
-                        RestrictedLockUtilsInternal.getDeviceOwner(getActivity()));
-                return;
-            }
+    private void showDialog(WifiEntry wifiEntry, int dialogMode) {
+        if (WifiUtils.isNetworkLockedDown(getActivity(), wifiEntry.getWifiConfiguration())
+                && wifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
+            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
+                    RestrictedLockUtilsInternal.getDeviceOwner(getActivity()));
+            return;
         }
 
         if (mDialog != null) {
@@ -624,7 +590,8 @@
         }
 
         // Save the access point and edit mode
-        mDlgAccessPoint = accessPoint;
+        mDialogWifiEntry = wifiEntry;
+        mDialogWifiEntryKey = wifiEntry.getKey();
         mDialogMode = dialogMode;
 
         showDialog(WIFI_DIALOG_ID);
@@ -635,18 +602,12 @@
         switch (dialogId) {
             case WIFI_DIALOG_ID:
                 // modify network
-                if (mDlgAccessPoint == null && mAccessPointSavedState != null) {
-                    // restore AP from save state
-                    mDlgAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState);
-                    // Reset the saved access point data
-                    mAccessPointSavedState = null;
-                }
-                mDialog = WifiDialog
-                        .createModal(getActivity(), this, mDlgAccessPoint, mDialogMode);
-                mSelectedAccessPoint = mDlgAccessPoint;
+                mDialog = WifiDialog2
+                        .createModal(getActivity(), this, mDialogWifiEntry, mDialogMode);
                 return mDialog;
+            default:
+                return super.onCreateDialog(dialogId);
         }
-        return super.onCreateDialog(dialogId);
     }
 
     @Override
@@ -659,6 +620,8 @@
     public void onDismiss(DialogInterface dialog) {
         // We don't keep any dialog object when dialog was dismissed.
         mDialog = null;
+        mDialogWifiEntry = null;
+        mDialogWifiEntryKey = null;
     }
 
     @Override
@@ -671,56 +634,33 @@
         }
     }
 
-    /**
-     * Called to indicate the list of AccessPoints has been updated and
-     * getAccessPoints should be called to get the latest information.
-     */
-    @Override
-    public void onAccessPointsChanged() {
-        Log.d(TAG, "onAccessPointsChanged (WifiTracker) callback initiated");
-        updateAccessPointsDelayed();
-    }
-
-    /**
-     * Updates access points from {@link WifiManager#getScanResults()}. Adds a delay to have
-     * progress bar displayed before starting to modify APs.
-     */
-    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);
-            view.postDelayed(mUpdateAccessPointsRunnable, 300 /* delay milliseconds */);
-        }
-    }
-
     /** Called when the state of Wifi has changed. */
     @Override
-    public void onWifiStateChanged(int state) {
+    public void onWifiStateChanged() {
         if (mIsRestricted) {
             return;
         }
+        final int wifiState = mWifiPickerTracker.getWifiState();
 
-        final int wifiState = mWifiManager.getWifiState();
+        if (isVerboseLoggingEnabled()) {
+            Log.i(TAG, "onWifiStateChanged called with wifi state: " + wifiState);
+        }
+
         switch (wifiState) {
             case WifiManager.WIFI_STATE_ENABLED:
-                updateAccessPointPreferences();
+                updateWifiEntryPreferences();
                 break;
 
             case WifiManager.WIFI_STATE_ENABLING:
-                removeConnectedAccessPointPreference();
-                removeAccessPointPreference();
+                removeConnectedWifiEntryPreference();
+                removeWifiEntryPreference();
                 addMessagePreference(R.string.wifi_starting);
                 setProgressBarVisible(true);
                 break;
 
             case WifiManager.WIFI_STATE_DISABLING:
-                removeConnectedAccessPointPreference();
-                removeAccessPointPreference();
+                removeConnectedWifiEntryPreference();
+                removeWifiEntryPreference();
                 addMessagePreference(R.string.wifi_stopping);
                 break;
 
@@ -728,241 +668,182 @@
                 setOffMessage();
                 setAdditionalSettingsSummaries();
                 setProgressBarVisible(false);
-                mConnectSource = CONNECT_SOURCE_UNSPECIFIED;
                 mClickedConnect = false;
                 break;
         }
     }
 
-    /**
-     * Called when the connection state of wifi has changed.
-     */
     @Override
-    public void onConnectedChanged() {
-        changeNextButtonState(mWifiTracker.isConnected());
-    }
+    public void onWifiEntriesChanged() {
+        updateWifiEntryPreferencesDelayed();
+        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);
 
-    /** Helper method to return whether an AccessPoint is disabled due to a wrong password */
-    private static boolean isDisabledByWrongPassword(AccessPoint accessPoint) {
-        WifiConfiguration config = accessPoint.getConfig();
-        if (config == null) {
-            return false;
-        }
-        WifiConfiguration.NetworkSelectionStatus networkStatus =
-                config.getNetworkSelectionStatus();
-        if (networkStatus == null
-                || networkStatus.getNetworkSelectionStatus() == NETWORK_SELECTION_ENABLED) {
-            return false;
-        }
-        int reason = networkStatus.getNetworkSelectionDisableReason();
-        return WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD == reason;
-    }
-
-    private void updateAccessPointPreferences() {
-        // in case state has changed
-        if (!mWifiManager.isWifiEnabled()) {
-            return;
-        }
-        // AccessPoints are sorted by the WifiTracker
-        final List<AccessPoint> accessPoints = mWifiTracker.getAccessPoints();
-        if (isVerboseLoggingEnabled()) {
-            Log.i(TAG, "updateAccessPoints called for: " + accessPoints);
-        }
-
-        boolean hasAvailableAccessPoints = false;
-        mStatusMessagePreference.setVisible(false);
-        mConnectedAccessPointPreferenceCategory.setVisible(true);
-        mAccessPointsPreferenceCategory.setVisible(true);
-
-        cacheRemoveAllPrefs(mAccessPointsPreferenceCategory);
-
-        int index =
-                configureConnectedAccessPointPreferenceCategory(accessPoints) ? 1 : 0;
-        int numAccessPoints = accessPoints.size();
-        for (; index < numAccessPoints; index++) {
-            AccessPoint accessPoint = accessPoints.get(index);
-            // Ignore access points that are out of range.
-            if (accessPoint.isReachable()) {
-                String key = accessPoint.getKey();
-                hasAvailableAccessPoints = true;
-                LongPressAccessPointPreference pref =
-                        (LongPressAccessPointPreference) getCachedPreference(key);
-                if (pref != null) {
-                    pref.setOrder(index);
-                    continue;
-                }
-                LongPressAccessPointPreference preference =
-                        createLongPressAccessPointPreference(accessPoint);
-                preference.setKey(key);
-                preference.setOrder(index);
-                if (mOpenSsid != null && mOpenSsid.equals(accessPoint.getSsidStr())
-                        && (accessPoint.getSecurity() != AccessPoint.SECURITY_NONE &&
-                        accessPoint.getSecurity() != AccessPoint.SECURITY_OWE)) {
-                    if (!accessPoint.isSaved() || isDisabledByWrongPassword(accessPoint)) {
-                        onPreferenceTreeClick(preference);
-                        mOpenSsid = null;
-                    }
-                }
-                mAccessPointsPreferenceCategory.addPreference(preference);
-                accessPoint.setListener(WifiSettings.this);
-                preference.refresh();
+        // Edit the Wi-Fi network of specified SSID.
+        if (mOpenSsid != null) {
+            Optional<WifiEntry> matchedWifiEntry = mWifiPickerTracker.getWifiEntries().stream()
+                    .filter(wifiEntry -> TextUtils.equals(mOpenSsid, wifiEntry.getSsid()))
+                    .filter(wifiEntry -> wifiEntry.getSecurity() != WifiEntry.SECURITY_NONE
+                            && wifiEntry.getSecurity() != WifiEntry.SECURITY_OWE)
+                    .filter(wifiEntry -> !wifiEntry.isSaved()
+                            || isDisabledByWrongPassword(wifiEntry))
+                    .findFirst();
+            if (matchedWifiEntry.isPresent()) {
+                mOpenSsid = null;
+                launchConfigNewNetworkFragment(matchedWifiEntry.get());
             }
         }
-        removeCachedPrefs(mAccessPointsPreferenceCategory);
-        mAddWifiNetworkPreference.setOrder(index);
-        mAccessPointsPreferenceCategory.addPreference(mAddWifiNetworkPreference);
-        setAdditionalSettingsSummaries();
+    }
 
-        if (!hasAvailableAccessPoints) {
+    @Override
+    public void onNumSavedNetworksChanged() {
+        if (isFinishingOrDestroyed()) {
+            return;
+        }
+        setAdditionalSettingsSummaries();
+    }
+
+    @Override
+    public void onNumSavedSubscriptionsChanged() {
+        if (isFinishingOrDestroyed()) {
+            return;
+        }
+        setAdditionalSettingsSummaries();
+    }
+
+    /**
+     * Updates WifiEntries from {@link WifiPickerTracker#getWifiEntries()}. Adds a delay to have
+     * progress bar displayed before starting to modify entries.
+     */
+    private void updateWifiEntryPreferencesDelayed() {
+        // Safeguard from some delayed event handling
+        if (getActivity() != null && !mIsRestricted
+                && mWifiPickerTracker.getWifiState() == WifiManager.WIFI_STATE_ENABLED) {
+            final View view = getView();
+            final Handler handler = view.getHandler();
+            if (handler != null && handler.hasCallbacks(mUpdateWifiEntryPreferencesRunnable)) {
+                return;
+            }
+            setProgressBarVisible(true);
+            view.postDelayed(mUpdateWifiEntryPreferencesRunnable, 300);
+        }
+    }
+
+    private void updateWifiEntryPreferences() {
+        // in case state has changed
+        if (mWifiPickerTracker.getWifiState() != WifiManager.WIFI_STATE_ENABLED) {
+            return;
+        }
+
+        boolean hasAvailableWifiEntries = false;
+        mStatusMessagePreference.setVisible(false);
+        mWifiEntryPreferenceCategory.setVisible(true);
+
+        final WifiEntry connectedEntry = mWifiPickerTracker.getConnectedWifiEntry();
+        mConnectedWifiEntryPreferenceCategory.setVisible(connectedEntry != null);
+        if (connectedEntry != null) {
+            final LongPressWifiEntryPreference connectedPref =
+                    mConnectedWifiEntryPreferenceCategory.findPreference(connectedEntry.getKey());
+            if (connectedPref == null || connectedPref.getWifiEntry() != connectedEntry) {
+                mConnectedWifiEntryPreferenceCategory.removeAll();
+                final ConnectedWifiEntryPreference pref =
+                        new ConnectedWifiEntryPreference(getPrefContext(), connectedEntry, this);
+                pref.setKey(connectedEntry.getKey());
+                pref.refresh();
+                mConnectedWifiEntryPreferenceCategory.addPreference(pref);
+                pref.setOnPreferenceClickListener(preference -> {
+                    if (connectedEntry.canSignIn()) {
+                        connectedEntry.signIn(null /* callback */);
+                    } else {
+                        launchNetworkDetailsFragment(pref);
+                    }
+                    return true;
+                });
+                pref.setOnGearClickListener(preference -> {
+                    launchNetworkDetailsFragment(pref);
+                });
+
+                if (mClickedConnect) {
+                    mClickedConnect = false;
+                    scrollToPreference(mConnectedWifiEntryPreferenceCategory);
+                }
+            }
+        } else {
+            mConnectedWifiEntryPreferenceCategory.removeAll();
+        }
+
+        int index = 0;
+        cacheRemoveAllPrefs(mWifiEntryPreferenceCategory);
+        List<WifiEntry> wifiEntries = mWifiPickerTracker.getWifiEntries();
+        for (WifiEntry wifiEntry : wifiEntries) {
+            hasAvailableWifiEntries = true;
+
+            String key = wifiEntry.getKey();
+            LongPressWifiEntryPreference pref =
+                    (LongPressWifiEntryPreference) getCachedPreference(key);
+            if (pref != null) {
+                if (pref.getWifiEntry() == wifiEntry) {
+                    pref.setOrder(index++);
+                    continue;
+                } else {
+                    // Create a new preference if the underlying WifiEntry object has changed
+                    removePreference(key);
+                }
+            }
+
+            pref = createLongPressWifiEntryPreference(wifiEntry);
+            pref.setKey(wifiEntry.getKey());
+            pref.setOrder(index++);
+            pref.refresh();
+
+            if (wifiEntry.getHelpUriString() != null) {
+                pref.setOnButtonClickListener(preference -> {
+                    openSubscriptionHelpPage(wifiEntry);
+                });
+            }
+            mWifiEntryPreferenceCategory.addPreference(pref);
+        }
+        removeCachedPrefs(mWifiEntryPreferenceCategory);
+
+        if (!hasAvailableWifiEntries) {
             setProgressBarVisible(true);
             Preference pref = new Preference(getPrefContext());
             pref.setSelectable(false);
             pref.setSummary(R.string.wifi_empty_list_wifi_on);
             pref.setOrder(index++);
             pref.setKey(PREF_KEY_EMPTY_WIFI_LIST);
-            mAccessPointsPreferenceCategory.addPreference(pref);
+            mWifiEntryPreferenceCategory.addPreference(pref);
         } else {
             // Continuing showing progress bar for an additional delay to overlap with animation
             getView().postDelayed(mHideProgressBarRunnable, 1700 /* delay millis */);
         }
+
+        mAddWifiNetworkPreference.setOrder(index++);
+        mWifiEntryPreferenceCategory.addPreference(mAddWifiNetworkPreference);
+        setAdditionalSettingsSummaries();
     }
 
-    @NonNull
-    private LongPressAccessPointPreference createLongPressAccessPointPreference(
-            AccessPoint accessPoint) {
-        return new LongPressAccessPointPreference(accessPoint, getPrefContext(), mUserBadgeCache,
-                false /* forSavedNetworks */, R.drawable.ic_wifi_signal_0, this);
+    private void launchNetworkDetailsFragment(LongPressWifiEntryPreference pref) {
+        final WifiEntry wifiEntry = pref.getWifiEntry();
+        final Context context = getContext();
+        final CharSequence title =
+                FeatureFlagUtils.isEnabled(context, FeatureFlags.WIFI_DETAILS_DATAUSAGE_HEADER)
+                        ? wifiEntry.getTitle()
+                        : context.getText(R.string.pref_title_network_details);
+
+        final Bundle bundle = new Bundle();
+        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY, wifiEntry.getKey());
+
+        new SubSettingLauncher(context)
+                .setTitleText(title)
+                .setDestination(WifiNetworkDetailsFragment2.class.getName())
+                .setArguments(bundle)
+                .setSourceMetricsCategory(getMetricsCategory())
+                .launch();
     }
 
-    @NonNull
     @VisibleForTesting
-    ConnectedAccessPointPreference createConnectedAccessPointPreference(
-            AccessPoint accessPoint, Context context) {
-        return new ConnectedAccessPointPreference(accessPoint, context, mUserBadgeCache,
-                R.drawable.ic_wifi_signal_0, false /* forSavedNetworks */, this);
-    }
-
-    /**
-     * Configure the ConnectedAccessPointPreferenceCategory and return true if the Category was
-     * shown.
-     */
-    private boolean configureConnectedAccessPointPreferenceCategory(
-            List<AccessPoint> accessPoints) {
-        if (accessPoints.size() == 0) {
-            removeConnectedAccessPointPreference();
-            return false;
-        }
-
-        AccessPoint connectedAp = accessPoints.get(0);
-        if (!connectedAp.isActive()) {
-            removeConnectedAccessPointPreference();
-            return false;
-        }
-
-        // Is the preference category empty?
-        if (mConnectedAccessPointPreferenceCategory.getPreferenceCount() == 0) {
-            addConnectedAccessPointPreference(connectedAp);
-            return true;
-        }
-
-        // Is the previous currently connected SSID different from the new one?
-        ConnectedAccessPointPreference preference =
-                (ConnectedAccessPointPreference)
-                        (mConnectedAccessPointPreferenceCategory.getPreference(0));
-        // The AccessPoints need to be the same reference to ensure that updates are reflected
-        // in the UI.
-        if (preference.getAccessPoint() != connectedAp) {
-            removeConnectedAccessPointPreference();
-            addConnectedAccessPointPreference(connectedAp);
-            return true;
-        }
-
-        // Else same AP is connected, simply refresh the connected access point preference
-        // (first and only access point in this category).
-        preference.refresh();
-        // Update any potential changes to the connected network and ensure that the callback is
-        // registered after an onStop lifecycle event.
-        registerCaptivePortalNetworkCallback(getCurrentWifiNetwork(), preference);
-        return true;
-    }
-
-    /**
-     * Creates a Preference for the given {@link AccessPoint} and adds it to the
-     * {@link #mConnectedAccessPointPreferenceCategory}.
-     */
-    private void addConnectedAccessPointPreference(AccessPoint connectedAp) {
-        final ConnectedAccessPointPreference pref =
-                createConnectedAccessPointPreference(connectedAp, getPrefContext());
-        registerCaptivePortalNetworkCallback(getCurrentWifiNetwork(), pref);
-
-        // Launch details page or captive portal on click.
-        pref.setOnPreferenceClickListener(
-                preference -> {
-                    pref.getAccessPoint().saveWifiState(pref.getExtras());
-                    if (mCaptivePortalNetworkCallback != null
-                            && mCaptivePortalNetworkCallback.isCaptivePortal()) {
-                        startCaptivePortalApp(
-                                mCaptivePortalNetworkCallback.getNetwork());
-                    } else {
-                        launchNetworkDetailsFragment(pref);
-                    }
-                    return true;
-                });
-
-        pref.setOnGearClickListener(
-                preference -> {
-                    pref.getAccessPoint().saveWifiState(pref.getExtras());
-                    launchNetworkDetailsFragment(pref);
-                });
-
-        pref.refresh();
-
-        mConnectedAccessPointPreferenceCategory.addPreference(pref);
-        mConnectedAccessPointPreferenceCategory.setVisible(true);
-        if (mClickedConnect) {
-            mClickedConnect = false;
-            scrollToPreference(mConnectedAccessPointPreferenceCategory);
-        }
-    }
-
-    private void registerCaptivePortalNetworkCallback(
-            Network wifiNetwork, ConnectedAccessPointPreference pref) {
-        if (wifiNetwork == null || pref == null) {
-            Log.w(TAG, "Network or Preference were null when registering callback.");
-            return;
-        }
-
-        if (mCaptivePortalNetworkCallback != null
-                && mCaptivePortalNetworkCallback.isSameNetworkAndPreference(wifiNetwork, pref)) {
-            return;
-        }
-
-        unregisterCaptivePortalNetworkCallback();
-
-        mCaptivePortalNetworkCallback = new CaptivePortalNetworkCallback(wifiNetwork, pref) {
-            @Override
-            public void onCaptivePortalCapabilityChanged() {
-                checkStartCaptivePortalApp();
-            }
-        };
-        mConnectivityManager.registerNetworkCallback(
-                new NetworkRequest.Builder()
-                        .clearCapabilities()
-                        .addTransportType(TRANSPORT_WIFI)
-                        .build(),
-                mCaptivePortalNetworkCallback,
-                new Handler(Looper.getMainLooper()));
-    }
-
-    private void unregisterCaptivePortalNetworkCallback() {
-        if (mCaptivePortalNetworkCallback != null) {
-            try {
-                mConnectivityManager.unregisterNetworkCallback(mCaptivePortalNetworkCallback);
-            } catch (RuntimeException e) {
-                Log.e(TAG, "Unregistering CaptivePortalNetworkCallback failed.", e);
-            }
-            mCaptivePortalNetworkCallback = null;
-        }
+    LongPressWifiEntryPreference createLongPressWifiEntryPreference(WifiEntry wifiEntry) {
+        return new LongPressWifiEntryPreference(getPrefContext(), wifiEntry, this);
     }
 
     private void launchAddNetworkFragment() {
@@ -974,36 +855,15 @@
                 .launch();
     }
 
-    private void launchNetworkDetailsFragment(ConnectedAccessPointPreference pref) {
-        final AccessPoint accessPoint = pref.getAccessPoint();
-        final Context context = getContext();
-        final CharSequence title =
-                FeatureFlagUtils.isEnabled(context, FeatureFlags.WIFI_DETAILS_DATAUSAGE_HEADER)
-                        ? accessPoint.getTitle()
-                        : context.getText(R.string.pref_title_network_details);
-
-        new SubSettingLauncher(getContext())
-                .setTitleText(title)
-                .setDestination(WifiNetworkDetailsFragment.class.getName())
-                .setArguments(pref.getExtras())
-                .setSourceMetricsCategory(getMetricsCategory())
-                .launch();
+    /** Removes all preferences and hide the {@link #mConnectedWifiEntryPreferenceCategory}. */
+    private void removeConnectedWifiEntryPreference() {
+        mConnectedWifiEntryPreferenceCategory.removeAll();
+        mConnectedWifiEntryPreferenceCategory.setVisible(false);
     }
 
-    private Network getCurrentWifiNetwork() {
-        return mWifiManager != null ? mWifiManager.getCurrentNetwork() : null;
-    }
-
-    /** Removes all preferences and hide the {@link #mConnectedAccessPointPreferenceCategory}. */
-    private void removeConnectedAccessPointPreference() {
-        mConnectedAccessPointPreferenceCategory.removeAll();
-        mConnectedAccessPointPreferenceCategory.setVisible(false);
-        unregisterCaptivePortalNetworkCallback();
-    }
-
-    private void removeAccessPointPreference() {
-        mAccessPointsPreferenceCategory.removeAll();
-        mAccessPointsPreferenceCategory.setVisible(false);
+    private void removeWifiEntryPreference() {
+        mWifiEntryPreferenceCategory.removeAll();
+        mWifiEntryPreferenceCategory.setVisible(false);
     }
 
     @VisibleForTesting
@@ -1013,36 +873,30 @@
                         ? R.string.wifi_configure_settings_preference_summary_wakeup_on
                         : R.string.wifi_configure_settings_preference_summary_wakeup_off));
 
-        final List<AccessPoint> savedNetworks =
-                WifiSavedConfigUtils.getAllConfigs(getContext(), mWifiManager);
-        final int numSavedNetworks = (savedNetworks != null) ? savedNetworks.size() : 0;
-        mSavedNetworksPreference.setVisible(numSavedNetworks > 0);
-        if (numSavedNetworks > 0) {
+        final int numSavedNetworks = mWifiPickerTracker.getNumSavedNetworks();
+        final int numSavedSubscriptions = mWifiPickerTracker.getNumSavedSubscriptions();
+        if (numSavedNetworks + numSavedSubscriptions > 0) {
+            mSavedNetworksPreference.setVisible(true);
             mSavedNetworksPreference.setSummary(
-                    getSavedNetworkSettingsSummaryText(savedNetworks, numSavedNetworks));
+                    getSavedNetworkSettingsSummaryText(numSavedNetworks, numSavedSubscriptions));
+        } else {
+            mSavedNetworksPreference.setVisible(false);
         }
     }
 
     private String getSavedNetworkSettingsSummaryText(
-            List<AccessPoint> savedNetworks, int numSavedNetworks) {
-        int numSavedPasspointNetworks = 0;
-        for (AccessPoint savedNetwork : savedNetworks) {
-            if (savedNetwork.isPasspointConfig() || savedNetwork.isPasspoint()) {
-                numSavedPasspointNetworks++;
-            }
-        }
-        final int numSavedNormalNetworks = numSavedNetworks - numSavedPasspointNetworks;
-
-        if (numSavedNetworks == numSavedNormalNetworks) {
+            int numSavedNetworks, int numSavedSubscriptions) {
+        if (numSavedSubscriptions == 0) {
             return getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,
-                    numSavedNormalNetworks, numSavedNormalNetworks);
-        } else if (numSavedNetworks == numSavedPasspointNetworks) {
+                    numSavedNetworks, numSavedNetworks);
+        } else if (numSavedNetworks == 0) {
             return getResources().getQuantityString(
                     R.plurals.wifi_saved_passpoint_access_points_summary,
-                    numSavedPasspointNetworks, numSavedPasspointNetworks);
+                    numSavedSubscriptions, numSavedSubscriptions);
         } else {
+            final int numTotalEntries = numSavedNetworks + numSavedSubscriptions;
             return getResources().getQuantityString(R.plurals.wifi_saved_all_access_points_summary,
-                    numSavedNetworks, numSavedNetworks);
+                    numTotalEntries, numTotalEntries);
         }
     }
 
@@ -1073,8 +927,8 @@
                         .setSourceMetricsCategory(getMetricsCategory())
                         .launch();
         mStatusMessagePreference.setText(title, description, clickListener);
-        removeConnectedAccessPointPreference();
-        removeAccessPointPreference();
+        removeConnectedWifiEntryPreference();
+        removeWifiEntryPreference();
         mStatusMessagePreference.setVisible(true);
     }
 
@@ -1090,107 +944,11 @@
         }
     }
 
-    /**
-     * Renames/replaces "Next" button when appropriate. "Next" button usually exists in
-     * Wifi setup screens, not in usual wifi settings screen.
-     *
-     * @param enabled true when the device is connected to a wifi network.
-     */
-    private void changeNextButtonState(boolean enabled) {
-        if (mEnableNextOnConnection && hasNextButton()) {
-            getNextButton().setEnabled(enabled);
-        }
-    }
-
-    @Override
-    public void onForget(WifiDialog dialog) {
-        forget();
-    }
-
-    @Override
-    public void onSubmit(WifiDialog dialog) {
-        if (mDialog != null) {
-            submit(mDialog.getController());
-        }
-    }
-
-    @Override
-    public void onScan(WifiDialog dialog, String ssid) {
-        // Launch QR code scanner to join a network.
-        startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),
-                REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);
-    }
-
-    /* package */ void submit(WifiConfigController configController) {
-
-        final WifiConfiguration config = configController.getConfig();
-
-        if (config == null) {
-            if (mSelectedAccessPoint != null
-                    && mSelectedAccessPoint.isSaved()) {
-                connect(mSelectedAccessPoint.getConfig(),
-                        true /* isSavedNetwork */,
-                        CONNECT_SOURCE_UNSPECIFIED);
-            }
-        } else if (configController.getMode() == WifiConfigUiBase.MODE_MODIFY) {
-            mWifiManager.save(config, mSaveListener);
-        } else {
-            mWifiManager.save(config, mSaveListener);
-            if (mSelectedAccessPoint != null) { // Not an "Add network"
-                connect(config, false /* isSavedNetwork */,
-                        CONNECT_SOURCE_UNSPECIFIED);
-            }
-        }
-
-        mWifiTracker.resumeScanning();
-    }
-
-    /* package */ void forget() {
-        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
-        if (!mSelectedAccessPoint.isSaved()) {
-            if (mSelectedAccessPoint.getNetworkInfo() != null &&
-                    mSelectedAccessPoint.getNetworkInfo().getState() != State.DISCONNECTED) {
-                // Network is active but has no network ID - must be ephemeral.
-                mWifiManager.disableEphemeralNetwork(
-                        AccessPoint.convertToQuotedString(mSelectedAccessPoint.getSsidStr()));
-            } else {
-                // Should not happen, but a monkey seems to trigger it
-                Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
-                return;
-            }
-        } else if (mSelectedAccessPoint.getConfig().isPasspoint()) {
-            try {
-                mWifiManager.removePasspointConfiguration(mSelectedAccessPoint.getConfig().FQDN);
-            } catch (IllegalArgumentException e) {
-                Log.e(TAG, "Failed to remove Passpoint configuration with error: " + e);
-                return;
-            }
-        } else {
-            mWifiManager.forget(mSelectedAccessPoint.getConfig().networkId, mForgetListener);
-        }
-
-        mWifiTracker.resumeScanning();
-
-        // We need to rename/replace "Next" button in wifi setup context.
-        changeNextButtonState(false);
-    }
-
-    protected void connect(final WifiConfiguration config,
-            boolean isSavedNetwork, @ConnectSource int connectSource) {
-        // Log subtype if configuration is a saved network.
-        mMetricsFeatureProvider.action(getContext(), SettingsEnums.ACTION_WIFI_CONNECT,
-                isSavedNetwork);
-        mConnectSource = connectSource;
-        mWifiManager.connect(config, mConnectListener);
-        mClickedConnect = true;
-    }
-
     @VisibleForTesting
     void handleAddNetworkRequest(int result, Intent data) {
         if (result == Activity.RESULT_OK) {
             handleAddNetworkSubmitEvent(data);
         }
-        mWifiTracker.resumeScanning();
     }
 
     private void handleAddNetworkSubmitEvent(Intent data) {
@@ -1205,8 +963,6 @@
      * Called when "add network" button is pressed.
      */
     private void onAddNetworkPressed() {
-        // No exact access point is selected.
-        mSelectedAccessPoint = null;
         launchAddNetworkFragment();
     }
 
@@ -1215,91 +971,87 @@
         return R.string.help_url_wifi;
     }
 
-    @Override
-    public void onAccessPointChanged(final AccessPoint accessPoint) {
-        Log.d(TAG, "onAccessPointChanged (singular) callback initiated");
-        View view = getView();
-        if (view != null) {
-            view.post(new Runnable() {
-                @Override
-                public void run() {
-                    Object tag = accessPoint.getTag();
-                    if (tag != null) {
-                        ((AccessPointPreference) tag).refresh();
-                    }
-                }
-            });
-        }
-    }
-
-    @Override
-    public void onLevelChanged(AccessPoint accessPoint) {
-        ((AccessPointPreference) accessPoint.getTag()).onLevelChanged();
-    }
-
-    private void handleConfigNetworkSubmitEvent(Intent data) {
-        final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
-                ConfigureAccessPointFragment.NETWORK_CONFIG_KEY);
-        if (wifiConfiguration != null) {
-            mWifiManager.save(wifiConfiguration, mSaveListener);
-
-            if (mSelectedAccessPoint != null) {
-                connect(wifiConfiguration, false /*isSavedNetwork*/,
-                        CONNECT_SOURCE_UNSPECIFIED);
-            }
-            mWifiTracker.resumeScanning();
-        }
-    }
-
-    private void launchConfigNewNetworkFragment(AccessPoint accessPoint, int dialogMode,
-            Bundle bundleForArguments) {
-        mDialogMode = dialogMode;
-        final CharSequence title = accessPoint.getTitle();
-        new SubSettingLauncher(getContext())
-                .setTitleText(title)
-                .setDestination(ConfigureAccessPointFragment.class.getName())
-                .setArguments(bundleForArguments)
-                .setSourceMetricsCategory(getMetricsCategory())
-                .setResultListener(this, CONFIG_NETWORK_REQUEST)
-                .launch();
-    }
-
     /**
-     * Starts the captive portal for current network if it's been clicked from the available
-     * networks (or contextual menu). We only do it *once* for a picked network, to avoid connecting
-     * again on bg/fg or if user dismisses Captive Portal before connecting (otherwise, coming back
-     * to this screen while connected to the same network but not signed in would open CP again).
+     * Renames/replaces "Next" button when appropriate. "Next" button usually exists in
+     * Wi-Fi setup screens, not in usual wifi settings screen.
+     *
+     * @param enabled true when the device is connected to a wifi network.
      */
-    private void checkStartCaptivePortalApp() {
-        Network currentNetwork = getCurrentWifiNetwork();
-        if (mCaptivePortalNetworkCallback == null || currentNetwork == null
-                || !currentNetwork.equals(mCaptivePortalNetworkCallback.getNetwork())
-                || !mCaptivePortalNetworkCallback.isCaptivePortal()) {
-            return;
+    @VisibleForTesting
+    void changeNextButtonState(boolean enabled) {
+        if (mEnableNextOnConnection && hasNextButton()) {
+            getNextButton().setEnabled(enabled);
         }
-
-        if (mConnectSource != CONNECT_SOURCE_NETWORK_LIST_ITEM_CLICK
-                && mConnectSource != CONNECT_SOURCE_NETWORK_MENU_ITEM_CLICK) {
-            return;
-        }
-
-        if (mLastNetworkCaptivePortalAppStarted != null
-                && mLastNetworkCaptivePortalAppStarted.equals(currentNetwork)) {
-            // We already auto-opened CP for same network
-            return;
-        }
-
-        startCaptivePortalApp(currentNetwork);
     }
 
-    private void startCaptivePortalApp(Network network) {
-        if (mConnectivityManager == null || network == null) {
-            return;
-        }
-        mLastNetworkCaptivePortalAppStarted = network;
-        mConnectivityManager.startCaptivePortalApp(network);
+    @Override
+    public void onForget(WifiDialog2 dialog) {
+        forget(dialog.getWifiEntry());
     }
 
+    @Override
+    public void onSubmit(WifiDialog2 dialog) {
+        final int dialogMode = dialog.getMode();
+        final WifiConfiguration config = dialog.getController().getConfig();
+        final WifiEntry wifiEntry = dialog.getWifiEntry();
+
+        if (dialogMode == WifiConfigUiBase2.MODE_MODIFY) {
+            if (config == null) {
+                Toast.makeText(getContext(), R.string.wifi_failed_save_message,
+                        Toast.LENGTH_SHORT).show();
+            } else {
+                mWifiManager.save(config, mSaveListener);
+            }
+        } else if (dialogMode == WifiConfigUiBase2.MODE_CONNECT
+                || (dialogMode == WifiConfigUiBase2.MODE_VIEW && wifiEntry.canConnect())) {
+            if (config == null) {
+                connect(wifiEntry, false /* editIfNoConfig */,
+                        false /* fullScreenEdit*/);
+            } else {
+                mWifiManager.connect(config, new WifiConnectActionListener());
+            }
+        }
+    }
+
+    @Override
+    public void onScan(WifiDialog2 dialog, String ssid) {
+        // Launch QR code scanner to join a network.
+        startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),
+                REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);
+    }
+
+    private void forget(WifiEntry wifiEntry) {
+        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
+        wifiEntry.forget(null /* callback */);
+    }
+
+    @VisibleForTesting
+    void connect(WifiEntry wifiEntry, boolean editIfNoConfig, boolean fullScreenEdit) {
+        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_CONNECT,
+                wifiEntry.isSaved());
+
+        // If it's an unsaved secure WifiEntry, it will callback
+        // ConnectCallback#onConnectResult with ConnectCallback#CONNECT_STATUS_FAILURE_NO_CONFIG
+        wifiEntry.connect(new WifiEntryConnectCallback(wifiEntry, editIfNoConfig,
+                fullScreenEdit));
+    }
+
+    private class WifiConnectActionListener implements WifiManager.ActionListener {
+        @Override
+        public void onSuccess() {
+            mClickedConnect = true;
+        }
+
+        @Override
+        public void onFailure(int reason) {
+            if (isFinishingOrDestroyed()) {
+                return;
+            }
+            Toast.makeText(getContext(), R.string.wifi_failed_connect_message, Toast.LENGTH_SHORT)
+                    .show();
+        }
+    };
+
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.wifi_settings) {
                 @Override
@@ -1317,4 +1069,103 @@
                     return keys;
                 }
             };
+
+    private class WifiEntryConnectCallback implements ConnectCallback {
+        final WifiEntry mConnectWifiEntry;
+        final boolean mEditIfNoConfig;
+        final boolean mFullScreenEdit;
+
+        WifiEntryConnectCallback(WifiEntry connectWifiEntry, boolean editIfNoConfig,
+                boolean fullScreenEdit) {
+            mConnectWifiEntry = connectWifiEntry;
+            mEditIfNoConfig = editIfNoConfig;
+            mFullScreenEdit = fullScreenEdit;
+        }
+
+        @Override
+        public void onConnectResult(@ConnectStatus int status) {
+            if (isFinishingOrDestroyed()) {
+                return;
+            }
+
+            if (status == ConnectCallback.CONNECT_STATUS_SUCCESS) {
+                mClickedConnect = true;
+            } else if (status == ConnectCallback.CONNECT_STATUS_FAILURE_NO_CONFIG) {
+                if (mEditIfNoConfig) {
+                    // Edit an unsaved secure Wi-Fi network.
+                    if (mFullScreenEdit) {
+                        launchConfigNewNetworkFragment(mConnectWifiEntry);
+                    } else {
+                        showDialog(mConnectWifiEntry, WifiConfigUiBase2.MODE_CONNECT);
+                    }
+                }
+            } else if (status == CONNECT_STATUS_FAILURE_UNKNOWN) {
+                Toast.makeText(getContext(), R.string.wifi_failed_connect_message,
+                        Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    private void launchConfigNewNetworkFragment(WifiEntry wifiEntry) {
+        final Bundle bundle = new Bundle();
+        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,
+                wifiEntry.getKey());
+        new SubSettingLauncher(getContext())
+                .setTitleText(wifiEntry.getTitle())
+                .setDestination(ConfigureWifiEntryFragment.class.getName())
+                .setArguments(bundle)
+                .setSourceMetricsCategory(getMetricsCategory())
+                .setResultListener(WifiSettings.this, CONFIG_NETWORK_REQUEST)
+                .launch();
+    }
+
+    private void launchWifiDppConfiguratorActivity(WifiEntry wifiEntry) {
+        final Intent intent = WifiDppUtils.getConfiguratorQrCodeGeneratorIntentOrNull(getContext(),
+                mWifiManager, wifiEntry);
+
+        if (intent == null) {
+            Log.e(TAG, "Launch Wi-Fi DPP QR code generator with a wrong Wi-Fi network!");
+        } else {
+            mMetricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
+                    SettingsEnums.ACTION_SETTINGS_SHARE_WIFI_QR_CODE,
+                    SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR,
+                    /* key */ null,
+                    /* value */ Integer.MIN_VALUE);
+
+            startActivity(intent);
+        }
+    }
+
+    /** Helper method to return whether a WifiEntry is disabled due to a wrong password */
+    private static boolean isDisabledByWrongPassword(WifiEntry wifiEntry) {
+        WifiConfiguration config = wifiEntry.getWifiConfiguration();
+        if (config == null) {
+            return false;
+        }
+        WifiConfiguration.NetworkSelectionStatus networkStatus =
+                config.getNetworkSelectionStatus();
+        if (networkStatus == null
+                || networkStatus.getNetworkSelectionStatus() == NETWORK_SELECTION_ENABLED) {
+            return false;
+        }
+        int reason = networkStatus.getNetworkSelectionDisableReason();
+        return WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD == reason;
+    }
+
+    @VisibleForTesting
+    void openSubscriptionHelpPage(WifiEntry wifiEntry) {
+        final Intent intent = getHelpIntent(getContext(), wifiEntry.getHelpUriString());
+        if (intent != null) {
+            try {
+                startActivityForResult(intent, MANAGE_SUBSCRIPTION);
+            } catch (ActivityNotFoundException e) {
+                Log.e(TAG, "Activity was not found for intent, " + intent.toString());
+            }
+        }
+    }
+
+    @VisibleForTesting
+    Intent getHelpIntent(Context context, String helpUrlString) {
+        return HelpUtils.getHelpIntent(context, helpUrlString, context.getClass().getName());
+    }
 }
diff --git a/src/com/android/settings/wifi/WifiSettings2.java b/src/com/android/settings/wifi/WifiSettings2.java
deleted file mode 100644
index 79f48fb..0000000
--- a/src/com/android/settings/wifi/WifiSettings2.java
+++ /dev/null
@@ -1,1136 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import static android.net.wifi.WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLED;
-import static android.os.UserManager.DISALLOW_CONFIG_WIFI;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.app.settings.SettingsEnums;
-import android.content.ActivityNotFoundException;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
-import android.net.NetworkTemplate;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.Looper;
-import android.os.PowerManager;
-import android.os.Process;
-import android.os.SimpleClock;
-import android.os.SystemClock;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.util.FeatureFlagUtils;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.Toast;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.android.settings.LinkifyUtils;
-import com.android.settings.R;
-import com.android.settings.RestrictedSettingsFragment;
-import com.android.settings.SettingsActivity;
-import com.android.settings.core.FeatureFlags;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.datausage.DataUsagePreference;
-import com.android.settings.datausage.DataUsageUtils;
-import com.android.settings.location.ScanningSettings;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settings.widget.SwitchBarController;
-import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
-import com.android.settings.wifi.dpp.WifiDppUtils;
-import com.android.settingslib.HelpUtils;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexable;
-import com.android.settingslib.wifi.LongPressWifiEntryPreference;
-import com.android.settingslib.wifi.WifiSavedConfigUtils;
-import com.android.wifitrackerlib.WifiEntry;
-import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
-import com.android.wifitrackerlib.WifiPickerTracker;
-
-import java.time.Clock;
-import java.time.ZoneOffset;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * UI for Wi-Fi settings screen
- */
-@SearchIndexable
-public class WifiSettings2 extends RestrictedSettingsFragment
-        implements Indexable, WifiPickerTracker.WifiPickerTrackerCallback,
-        WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener {
-
-    private static final String TAG = "WifiSettings2";
-
-    // IDs of context menu
-    static final int MENU_ID_CONNECT = Menu.FIRST + 1;
-    @VisibleForTesting
-    static final int MENU_ID_DISCONNECT = Menu.FIRST + 2;
-    @VisibleForTesting
-    static final int MENU_ID_FORGET = Menu.FIRST + 3;
-    static final int MENU_ID_MODIFY = Menu.FIRST + 4;
-
-    // Max age of tracked WifiEntries
-    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
-    // Interval between initiating WifiPickerTracker scans
-    private static final long SCAN_INTERVAL_MILLIS = 10_000;
-
-    @VisibleForTesting
-    static final int ADD_NETWORK_REQUEST = 2;
-    static final int CONFIG_NETWORK_REQUEST = 3;
-    static final int MANAGE_SUBSCRIPTION = 4;
-
-    private static final String PREF_KEY_EMPTY_WIFI_LIST = "wifi_empty_list";
-    // TODO(b/70983952): Rename these to use WifiEntry instead of AccessPoint.
-    private static final String PREF_KEY_CONNECTED_ACCESS_POINTS = "connected_access_point";
-    private static final String PREF_KEY_ACCESS_POINTS = "access_points";
-    private static final String PREF_KEY_CONFIGURE_WIFI_SETTINGS = "configure_wifi_settings";
-    private static final String PREF_KEY_SAVED_NETWORKS = "saved_networks";
-    private static final String PREF_KEY_STATUS_MESSAGE = "wifi_status_message";
-    @VisibleForTesting
-    static final String PREF_KEY_DATA_USAGE = "wifi_data_usage";
-
-    private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;
-
-    public static final int WIFI_DIALOG_ID = 1;
-
-    // Instance state keys
-    private static final String SAVE_DIALOG_MODE = "dialog_mode";
-    private static final String SAVE_DIALOG_WIFIENTRY_KEY = "wifi_ap_key";
-
-    // Cache at onCreateContextMenu and use at onContextItemSelected. Don't use it in other methods.
-    private WifiEntry mSelectedWifiEntry;
-
-    // Save the dialog details
-    private int mDialogMode;
-    private String mDialogWifiEntryKey;
-    private WifiEntry mDialogWifiEntry;
-
-    // This boolean extra specifies whether to enable the Next button when connected. Used by
-    // account creation outside of setup wizard.
-    private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
-
-    // Enable the Next button when a Wi-Fi network is connected.
-    private boolean mEnableNextOnConnection;
-
-    // This string extra specifies a network to open the connect dialog on, so the user can enter
-    // network credentials.  This is used by quick settings for secured networks, among other
-    // things.
-    private static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
-    private String mOpenSsid;
-
-    private static boolean isVerboseLoggingEnabled() {
-        return WifiPickerTracker.isVerboseLoggingEnabled();
-    }
-
-    private final Runnable mUpdateWifiEntryPreferencesRunnable = () -> {
-        updateWifiEntryPreferences();
-    };
-    private final Runnable mHideProgressBarRunnable = () -> {
-        setProgressBarVisible(false);
-    };
-
-    protected WifiManager mWifiManager;
-    private WifiManager.ActionListener mConnectListener;
-    private WifiManager.ActionListener mSaveListener;
-    private WifiManager.ActionListener mForgetListener;
-
-    /**
-     * The state of {@link #isUiRestricted()} at {@link #onCreate(Bundle)}}. This is neccesary to
-     * ensure that behavior is consistent if {@link #isUiRestricted()} changes. It could be changed
-     * by the Test DPC tool in AFW mode.
-     */
-    private boolean mIsRestricted;
-
-    private WifiEnabler mWifiEnabler;
-
-    // Worker thread used for WifiPickerTracker work
-    private HandlerThread mWorkerThread;
-
-    @VisibleForTesting
-    WifiPickerTracker mWifiPickerTracker;
-
-    private WifiDialog2 mDialog;
-
-    private View mProgressHeader;
-
-    private PreferenceCategory mConnectedWifiEntryPreferenceCategory;
-    private PreferenceCategory mWifiEntryPreferenceCategory;
-    @VisibleForTesting
-    AddWifiNetworkPreference mAddWifiNetworkPreference;
-    @VisibleForTesting
-    Preference mConfigureWifiSettingsPreference;
-    @VisibleForTesting
-    Preference mSavedNetworksPreference;
-    @VisibleForTesting
-    DataUsagePreference mDataUsagePreference;
-    private LinkablePreference mStatusMessagePreference;
-
-    /**
-     * Tracks whether the user initiated a connection via clicking in order to autoscroll to the
-     * network once connected.
-     */
-    private boolean mClickedConnect;
-
-    public WifiSettings2() {
-        super(DISALLOW_CONFIG_WIFI);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        final Activity activity = getActivity();
-        if (activity != null) {
-            mProgressHeader = setPinnedHeaderView(R.layout.progress_header)
-                    .findViewById(R.id.progress_bar_animation);
-            setProgressBarVisible(false);
-        }
-        ((SettingsActivity) activity).getSwitchBar().setSwitchBarText(
-                R.string.wifi_settings_master_switch_title,
-                R.string.wifi_settings_master_switch_title);
-    }
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-
-        // TODO(b/37429702): Add animations and preference comparator back after initial screen is
-        // loaded (ODR).
-        setAnimationAllowed(false);
-
-        addPreferences();
-
-        mIsRestricted = isUiRestricted();
-    }
-
-    private void addPreferences() {
-        addPreferencesFromResource(R.xml.wifi_settings2);
-
-        mConnectedWifiEntryPreferenceCategory = findPreference(PREF_KEY_CONNECTED_ACCESS_POINTS);
-        mWifiEntryPreferenceCategory = findPreference(PREF_KEY_ACCESS_POINTS);
-        mConfigureWifiSettingsPreference = findPreference(PREF_KEY_CONFIGURE_WIFI_SETTINGS);
-        mSavedNetworksPreference = findPreference(PREF_KEY_SAVED_NETWORKS);
-        mAddWifiNetworkPreference = new AddWifiNetworkPreference(getPrefContext());
-        mStatusMessagePreference = findPreference(PREF_KEY_STATUS_MESSAGE);
-        mDataUsagePreference = findPreference(PREF_KEY_DATA_USAGE);
-        mDataUsagePreference.setVisible(DataUsageUtils.hasWifiRadio(getContext()));
-        mDataUsagePreference.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(),
-                0 /*subId*/,
-                null /*service*/);
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        final Context context = getContext();
-        mWorkerThread = new HandlerThread(TAG +
-                "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
-                Process.THREAD_PRIORITY_BACKGROUND);
-        mWorkerThread.start();
-        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
-            @Override
-            public long millis() {
-                return SystemClock.elapsedRealtime();
-            }
-        };
-        mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                this);
-
-        final Activity activity = getActivity();
-
-        if (activity != null) {
-            mWifiManager = getActivity().getSystemService(WifiManager.class);
-        }
-
-        mConnectListener = new WifiConnectListener(getActivity());
-
-        mSaveListener = new WifiManager.ActionListener() {
-            @Override
-            public void onSuccess() {
-            }
-
-            @Override
-            public void onFailure(int reason) {
-                Activity activity = getActivity();
-                if (activity != null) {
-                    Toast.makeText(activity,
-                            R.string.wifi_failed_save_message,
-                            Toast.LENGTH_SHORT).show();
-                }
-            }
-        };
-
-        mForgetListener = new WifiManager.ActionListener() {
-            @Override
-            public void onSuccess() {
-            }
-
-            @Override
-            public void onFailure(int reason) {
-                Activity activity = getActivity();
-                if (activity != null) {
-                    Toast.makeText(activity,
-                            R.string.wifi_failed_forget_message,
-                            Toast.LENGTH_SHORT).show();
-                }
-            }
-        };
-        registerForContextMenu(getListView());
-        setHasOptionsMenu(true);
-
-        if (savedInstanceState != null) {
-            mDialogMode = savedInstanceState.getInt(SAVE_DIALOG_MODE);
-            mDialogWifiEntryKey = savedInstanceState.getString(SAVE_DIALOG_WIFIENTRY_KEY);
-        }
-
-        // If we're supposed to enable/disable the Next button based on our current connection
-        // state, start it off in the right state.
-        final Intent intent = getActivity().getIntent();
-        mEnableNextOnConnection = intent.getBooleanExtra(EXTRA_ENABLE_NEXT_ON_CONNECT, false);
-
-        if (intent.hasExtra(EXTRA_START_CONNECT_SSID)) {
-            mOpenSsid = intent.getStringExtra(EXTRA_START_CONNECT_SSID);
-        }
-    }
-
-    @Override
-    public void onDestroyView() {
-        if (mWifiEnabler != null) {
-            mWifiEnabler.teardownSwitchController();
-        }
-        mWorkerThread.quit();
-
-        super.onDestroyView();
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-
-        mWifiEnabler = createWifiEnabler();
-
-        if (mIsRestricted) {
-            restrictUi();
-        }
-    }
-
-    private void restrictUi() {
-        if (!isUiRestrictedByOnlyAdmin()) {
-            getEmptyTextView().setText(R.string.wifi_empty_list_user_restricted);
-        }
-        getPreferenceScreen().removeAll();
-    }
-
-    /**
-     * @return new WifiEnabler
-     */
-    private WifiEnabler createWifiEnabler() {
-        final SettingsActivity activity = (SettingsActivity) getActivity();
-        return new WifiEnabler(activity, new SwitchBarController(activity.getSwitchBar()),
-                mMetricsFeatureProvider);
-    }
-
-    @Override
-    public void onResume() {
-        final Activity activity = getActivity();
-        super.onResume();
-
-        // Because RestrictedSettingsFragment's onResume potentially requests authorization,
-        // which changes the restriction state, recalculate it.
-        final boolean alreadyImmutablyRestricted = mIsRestricted;
-        mIsRestricted = isUiRestricted();
-        if (!alreadyImmutablyRestricted && mIsRestricted) {
-            restrictUi();
-        }
-
-        if (mWifiEnabler != null) {
-            mWifiEnabler.resume(activity);
-        }
-
-        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        if (mWifiEnabler != null) {
-            mWifiEnabler.pause();
-        }
-    }
-
-    @Override
-    public void onStop() {
-        getView().removeCallbacks(mUpdateWifiEntryPreferencesRunnable);
-        getView().removeCallbacks(mHideProgressBarRunnable);
-        super.onStop();
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode == ADD_NETWORK_REQUEST) {
-            handleAddNetworkRequest(resultCode, data);
-            return;
-        } else if (requestCode == REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER) {
-            if (resultCode == Activity.RESULT_OK) {
-                if (mDialog != null) {
-                    mDialog.dismiss();
-                }
-            }
-            return;
-        } else if (requestCode == CONFIG_NETWORK_REQUEST) {
-            if (resultCode == Activity.RESULT_OK) {
-                final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
-                        ConfigureWifiEntryFragment.NETWORK_CONFIG_KEY);
-                if (wifiConfiguration != null) {
-                    mWifiManager.connect(wifiConfiguration,
-                            new WifiConnectActionListener());
-                }
-            }
-            return;
-        } else if (requestCode == MANAGE_SUBSCRIPTION) {
-            //Do nothing
-            return;
-        }
-
-        final boolean formerlyRestricted = mIsRestricted;
-        mIsRestricted = isUiRestricted();
-        if (formerlyRestricted && !mIsRestricted
-                && getPreferenceScreen().getPreferenceCount() == 0) {
-            // De-restrict the ui
-            addPreferences();
-        }
-    }
-
-    @Override
-    protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {
-        final RecyclerView.Adapter adapter = super.onCreateAdapter(preferenceScreen);
-        adapter.setHasStableIds(true);
-        return adapter;
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.WIFI;
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        // If dialog has been shown, save its state.
-        if (mDialog != null) {
-            outState.putInt(SAVE_DIALOG_MODE, mDialogMode);
-            outState.putString(SAVE_DIALOG_WIFIENTRY_KEY, mDialogWifiEntryKey);
-        }
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo info) {
-        Preference preference = (Preference) view.getTag();
-        if (!(preference instanceof LongPressWifiEntryPreference)) {
-            // Do nothing.
-            return;
-        }
-
-        // Cache the WifiEntry for onContextItemSelected. Don't use it in other methods.
-        mSelectedWifiEntry = ((LongPressWifiEntryPreference) preference).getWifiEntry();
-
-        menu.setHeaderTitle(mSelectedWifiEntry.getTitle());
-        if (mSelectedWifiEntry.canConnect()) {
-            menu.add(Menu.NONE, MENU_ID_CONNECT, 0 /* order */, R.string.wifi_connect);
-        }
-
-        if (mSelectedWifiEntry.canDisconnect()) {
-            menu.add(Menu.NONE, MENU_ID_DISCONNECT, 0 /* order */,
-                    R.string.wifi_disconnect_button_text);
-        }
-
-        // "forget" for normal saved network. And "disconnect" for ephemeral network because it
-        // could only be disconnected and be put in blacklists so it won't be used again.
-        if (canForgetNetwork()) {
-            menu.add(Menu.NONE, MENU_ID_FORGET, 0 /* order */, R.string.forget);
-        }
-
-        WifiConfiguration config = mSelectedWifiEntry.getWifiConfiguration();
-        // Some configs are ineditable
-        if (WifiUtils.isNetworkLockedDown(getActivity(), config)) {
-            return;
-        }
-
-        if (mSelectedWifiEntry.isSaved() && mSelectedWifiEntry.getConnectedState()
-                != WifiEntry.CONNECTED_STATE_CONNECTED) {
-            menu.add(Menu.NONE, MENU_ID_MODIFY, 0 /* order */, R.string.wifi_modify);
-        }
-    }
-
-    private boolean canForgetNetwork() {
-        return mSelectedWifiEntry.canForget() && !WifiUtils.isNetworkLockedDown(getActivity(),
-                mSelectedWifiEntry.getWifiConfiguration());
-    }
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case MENU_ID_CONNECT:
-                connect(mSelectedWifiEntry, true /* editIfNoConfig */, false /* fullScreenEdit */);
-                return true;
-            case MENU_ID_DISCONNECT:
-                mSelectedWifiEntry.disconnect(null /* callback */);
-                return true;
-            case MENU_ID_FORGET:
-                forget(mSelectedWifiEntry);
-                return true;
-            case MENU_ID_MODIFY:
-                showDialog(mSelectedWifiEntry, WifiConfigUiBase2.MODE_MODIFY);
-                return true;
-            default:
-                return super.onContextItemSelected(item);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        // If the preference has a fragment set, open that
-        if (preference.getFragment() != null) {
-            preference.setOnPreferenceClickListener(null);
-            return super.onPreferenceTreeClick(preference);
-        }
-
-        if (preference instanceof LongPressWifiEntryPreference) {
-            final WifiEntry selectedEntry =
-                    ((LongPressWifiEntryPreference) preference).getWifiEntry();
-
-            if (selectedEntry.shouldEditBeforeConnect()) {
-                launchConfigNewNetworkFragment(selectedEntry);
-                return true;
-            }
-
-            connect(selectedEntry, true /* editIfNoConfig */, true /* fullScreenEdit */);
-        } else if (preference == mAddWifiNetworkPreference) {
-            onAddNetworkPressed();
-        } else {
-            return super.onPreferenceTreeClick(preference);
-        }
-        return true;
-    }
-
-    private void showDialog(WifiEntry wifiEntry, int dialogMode) {
-        if (WifiUtils.isNetworkLockedDown(getActivity(), wifiEntry.getWifiConfiguration())
-                && wifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
-            RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getActivity(),
-                    RestrictedLockUtilsInternal.getDeviceOwner(getActivity()));
-            return;
-        }
-
-        if (mDialog != null) {
-            removeDialog(WIFI_DIALOG_ID);
-            mDialog = null;
-        }
-
-        // Save the access point and edit mode
-        mDialogWifiEntry = wifiEntry;
-        mDialogWifiEntryKey = wifiEntry.getKey();
-        mDialogMode = dialogMode;
-
-        showDialog(WIFI_DIALOG_ID);
-    }
-
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        switch (dialogId) {
-            case WIFI_DIALOG_ID:
-                // modify network
-                mDialog = WifiDialog2
-                        .createModal(getActivity(), this, mDialogWifiEntry, mDialogMode);
-                return mDialog;
-            default:
-                return super.onCreateDialog(dialogId);
-        }
-    }
-
-    @Override
-    public void onDialogShowing() {
-        super.onDialogShowing();
-        setOnDismissListener(this);
-    }
-
-    @Override
-    public void onDismiss(DialogInterface dialog) {
-        // We don't keep any dialog object when dialog was dismissed.
-        mDialog = null;
-        mDialogWifiEntry = null;
-        mDialogWifiEntryKey = null;
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        switch (dialogId) {
-            case WIFI_DIALOG_ID:
-                return SettingsEnums.DIALOG_WIFI_AP_EDIT;
-            default:
-                return 0;
-        }
-    }
-
-    /** Called when the state of Wifi has changed. */
-    @Override
-    public void onWifiStateChanged() {
-        if (mIsRestricted) {
-            return;
-        }
-        final int wifiState = mWifiPickerTracker.getWifiState();
-
-        if (isVerboseLoggingEnabled()) {
-            Log.i(TAG, "onWifiStateChanged called with wifi state: " + wifiState);
-        }
-
-        switch (wifiState) {
-            case WifiManager.WIFI_STATE_ENABLED:
-                updateWifiEntryPreferences();
-                break;
-
-            case WifiManager.WIFI_STATE_ENABLING:
-                removeConnectedWifiEntryPreference();
-                removeWifiEntryPreference();
-                addMessagePreference(R.string.wifi_starting);
-                setProgressBarVisible(true);
-                break;
-
-            case WifiManager.WIFI_STATE_DISABLING:
-                removeConnectedWifiEntryPreference();
-                removeWifiEntryPreference();
-                addMessagePreference(R.string.wifi_stopping);
-                break;
-
-            case WifiManager.WIFI_STATE_DISABLED:
-                setOffMessage();
-                setAdditionalSettingsSummaries();
-                setProgressBarVisible(false);
-                mClickedConnect = false;
-                break;
-        }
-    }
-
-    @Override
-    public void onWifiEntriesChanged() {
-        updateWifiEntryPreferencesDelayed();
-        changeNextButtonState(mWifiPickerTracker.getConnectedWifiEntry() != null);
-
-        // Edit the Wi-Fi network of specified SSID.
-        if (mOpenSsid != null) {
-            Optional<WifiEntry> matchedWifiEntry = mWifiPickerTracker.getWifiEntries().stream()
-                    .filter(wifiEntry -> TextUtils.equals(mOpenSsid, wifiEntry.getSsid()))
-                    .filter(wifiEntry -> wifiEntry.getSecurity() != WifiEntry.SECURITY_NONE
-                            && wifiEntry.getSecurity() != WifiEntry.SECURITY_OWE)
-                    .filter(wifiEntry -> !wifiEntry.isSaved()
-                            || isDisabledByWrongPassword(wifiEntry))
-                    .findFirst();
-            if (matchedWifiEntry.isPresent()) {
-                mOpenSsid = null;
-                launchConfigNewNetworkFragment(matchedWifiEntry.get());
-            }
-        }
-    }
-
-    @Override
-    public void onNumSavedNetworksChanged() {
-        if (isFinishingOrDestroyed()) {
-            return;
-        }
-        setAdditionalSettingsSummaries();
-    }
-
-    @Override
-    public void onNumSavedSubscriptionsChanged() {
-        if (isFinishingOrDestroyed()) {
-            return;
-        }
-        setAdditionalSettingsSummaries();
-    }
-
-    /**
-     * Updates WifiEntries from {@link WifiPickerTracker#getWifiEntries()}. Adds a delay to have
-     * progress bar displayed before starting to modify entries.
-     */
-    private void updateWifiEntryPreferencesDelayed() {
-        // Safeguard from some delayed event handling
-        if (getActivity() != null && !mIsRestricted &&
-                mWifiPickerTracker.getWifiState() == WifiManager.WIFI_STATE_ENABLED) {
-            final View view = getView();
-            final Handler handler = view.getHandler();
-            if (handler != null && handler.hasCallbacks(mUpdateWifiEntryPreferencesRunnable)) {
-                return;
-            }
-            setProgressBarVisible(true);
-            view.postDelayed(mUpdateWifiEntryPreferencesRunnable, 300);
-        }
-    }
-
-    private void updateWifiEntryPreferences() {
-        // in case state has changed
-        if (mWifiPickerTracker.getWifiState() != WifiManager.WIFI_STATE_ENABLED) {
-            return;
-        }
-
-        boolean hasAvailableWifiEntries = false;
-        mStatusMessagePreference.setVisible(false);
-        mWifiEntryPreferenceCategory.setVisible(true);
-
-        final WifiEntry connectedEntry = mWifiPickerTracker.getConnectedWifiEntry();
-        mConnectedWifiEntryPreferenceCategory.setVisible(connectedEntry != null);
-        if (connectedEntry != null) {
-            final LongPressWifiEntryPreference connectedPref =
-                    mConnectedWifiEntryPreferenceCategory.findPreference(connectedEntry.getKey());
-            if (connectedPref == null || connectedPref.getWifiEntry() != connectedEntry) {
-                mConnectedWifiEntryPreferenceCategory.removeAll();
-                final ConnectedWifiEntryPreference pref =
-                        new ConnectedWifiEntryPreference(getPrefContext(), connectedEntry, this);
-                pref.setKey(connectedEntry.getKey());
-                pref.refresh();
-                mConnectedWifiEntryPreferenceCategory.addPreference(pref);
-                pref.setOnPreferenceClickListener(preference -> {
-                    if (connectedEntry.canSignIn()) {
-                        connectedEntry.signIn(null /* callback */);
-                    } else {
-                        launchNetworkDetailsFragment(pref);
-                    }
-                    return true;
-                });
-                pref.setOnGearClickListener(preference -> {
-                    launchNetworkDetailsFragment(pref);
-                });
-
-                if (mClickedConnect) {
-                    mClickedConnect = false;
-                    scrollToPreference(mConnectedWifiEntryPreferenceCategory);
-                }
-            }
-        } else {
-            mConnectedWifiEntryPreferenceCategory.removeAll();
-        }
-
-        int index = 0;
-        cacheRemoveAllPrefs(mWifiEntryPreferenceCategory);
-        List<WifiEntry> wifiEntries = mWifiPickerTracker.getWifiEntries();
-        for (WifiEntry wifiEntry : wifiEntries) {
-            hasAvailableWifiEntries = true;
-
-            String key = wifiEntry.getKey();
-            LongPressWifiEntryPreference pref =
-                    (LongPressWifiEntryPreference) getCachedPreference(key);
-            if (pref != null) {
-                if (pref.getWifiEntry() == wifiEntry) {
-                    pref.setOrder(index++);
-                    continue;
-                } else {
-                    // Create a new preference if the underlying WifiEntry object has changed
-                    removePreference(key);
-                }
-            }
-
-            pref = createLongPressWifiEntryPreference(wifiEntry);
-            pref.setKey(wifiEntry.getKey());
-            pref.setOrder(index++);
-            pref.refresh();
-
-            if (wifiEntry.getHelpUriString() != null) {
-                pref.setOnButtonClickListener(preference -> {
-                    openSubscriptionHelpPage(wifiEntry);
-                });
-            }
-            mWifiEntryPreferenceCategory.addPreference(pref);
-        }
-        removeCachedPrefs(mWifiEntryPreferenceCategory);
-
-        if (!hasAvailableWifiEntries) {
-            setProgressBarVisible(true);
-            Preference pref = new Preference(getPrefContext());
-            pref.setSelectable(false);
-            pref.setSummary(R.string.wifi_empty_list_wifi_on);
-            pref.setOrder(index++);
-            pref.setKey(PREF_KEY_EMPTY_WIFI_LIST);
-            mWifiEntryPreferenceCategory.addPreference(pref);
-        } else {
-            // Continuing showing progress bar for an additional delay to overlap with animation
-            getView().postDelayed(mHideProgressBarRunnable, 1700 /* delay millis */);
-        }
-
-        mAddWifiNetworkPreference.setOrder(index++);
-        mWifiEntryPreferenceCategory.addPreference(mAddWifiNetworkPreference);
-        setAdditionalSettingsSummaries();
-    }
-
-    private void launchNetworkDetailsFragment(LongPressWifiEntryPreference pref) {
-        final WifiEntry wifiEntry = pref.getWifiEntry();
-        final Context context = getContext();
-        final CharSequence title =
-                FeatureFlagUtils.isEnabled(context, FeatureFlags.WIFI_DETAILS_DATAUSAGE_HEADER)
-                        ? wifiEntry.getTitle()
-                        : context.getText(R.string.pref_title_network_details);
-
-        final Bundle bundle = new Bundle();
-        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY, wifiEntry.getKey());
-
-        new SubSettingLauncher(context)
-                .setTitleText(title)
-                .setDestination(WifiNetworkDetailsFragment2.class.getName())
-                .setArguments(bundle)
-                .setSourceMetricsCategory(getMetricsCategory())
-                .launch();
-    }
-
-    @VisibleForTesting
-    LongPressWifiEntryPreference createLongPressWifiEntryPreference(WifiEntry wifiEntry) {
-        return new LongPressWifiEntryPreference(getPrefContext(), wifiEntry, this);
-    }
-
-    private void launchAddNetworkFragment() {
-        new SubSettingLauncher(getContext())
-                .setTitleRes(R.string.wifi_add_network)
-                .setDestination(AddNetworkFragment.class.getName())
-                .setSourceMetricsCategory(getMetricsCategory())
-                .setResultListener(this, ADD_NETWORK_REQUEST)
-                .launch();
-    }
-
-    /** Removes all preferences and hide the {@link #mConnectedWifiEntryPreferenceCategory}. */
-    private void removeConnectedWifiEntryPreference() {
-        mConnectedWifiEntryPreferenceCategory.removeAll();
-        mConnectedWifiEntryPreferenceCategory.setVisible(false);
-    }
-
-    private void removeWifiEntryPreference() {
-        mWifiEntryPreferenceCategory.removeAll();
-        mWifiEntryPreferenceCategory.setVisible(false);
-    }
-
-    @VisibleForTesting
-    void setAdditionalSettingsSummaries() {
-        mConfigureWifiSettingsPreference.setSummary(getString(
-                isWifiWakeupEnabled()
-                        ? R.string.wifi_configure_settings_preference_summary_wakeup_on
-                        : R.string.wifi_configure_settings_preference_summary_wakeup_off));
-
-        final int numSavedNetworks = mWifiPickerTracker.getNumSavedNetworks();
-        final int numSavedSubscriptions = mWifiPickerTracker.getNumSavedSubscriptions();
-        if (numSavedNetworks + numSavedSubscriptions > 0) {
-            mSavedNetworksPreference.setVisible(true);
-            mSavedNetworksPreference.setSummary(
-                    getSavedNetworkSettingsSummaryText(numSavedNetworks, numSavedSubscriptions));
-        } else {
-            mSavedNetworksPreference.setVisible(false);
-        }
-    }
-
-    private String getSavedNetworkSettingsSummaryText(
-            int numSavedNetworks, int numSavedSubscriptions) {
-        if (numSavedSubscriptions == 0) {
-            return getResources().getQuantityString(R.plurals.wifi_saved_access_points_summary,
-                    numSavedNetworks, numSavedNetworks);
-        } else if (numSavedNetworks == 0) {
-            return getResources().getQuantityString(
-                    R.plurals.wifi_saved_passpoint_access_points_summary,
-                    numSavedSubscriptions, numSavedSubscriptions);
-        } else {
-            final int numTotalEntries = numSavedNetworks + numSavedSubscriptions;
-            return getResources().getQuantityString(R.plurals.wifi_saved_all_access_points_summary,
-                    numTotalEntries, numTotalEntries);
-        }
-    }
-
-    private boolean isWifiWakeupEnabled() {
-        final Context context = getContext();
-        final PowerManager powerManager = context.getSystemService(PowerManager.class);
-        final ContentResolver contentResolver = context.getContentResolver();
-        return mWifiManager.isAutoWakeupEnabled()
-                && mWifiManager.isScanAlwaysAvailable()
-                && Settings.Global.getInt(contentResolver,
-                Settings.Global.AIRPLANE_MODE_ON, 0) == 0
-                && !powerManager.isPowerSaveMode();
-    }
-
-    private void setOffMessage() {
-        final CharSequence title = getText(R.string.wifi_empty_list_wifi_off);
-        // Don't use WifiManager.isScanAlwaysAvailable() to check the Wi-Fi scanning mode. Instead,
-        // read the system settings directly. Because when the device is in Airplane mode, even if
-        // Wi-Fi scanning mode is on, WifiManager.isScanAlwaysAvailable() still returns "off".
-        // TODO(b/149421497): Fix this?
-        final boolean wifiScanningMode = mWifiManager.isScanAlwaysAvailable();
-        final CharSequence description = wifiScanningMode ? getText(R.string.wifi_scan_notify_text)
-                : getText(R.string.wifi_scan_notify_text_scanning_off);
-        final LinkifyUtils.OnClickListener clickListener =
-                () -> new SubSettingLauncher(getContext())
-                        .setDestination(ScanningSettings.class.getName())
-                        .setTitleRes(R.string.location_scanning_screen_title)
-                        .setSourceMetricsCategory(getMetricsCategory())
-                        .launch();
-        mStatusMessagePreference.setText(title, description, clickListener);
-        removeConnectedWifiEntryPreference();
-        removeWifiEntryPreference();
-        mStatusMessagePreference.setVisible(true);
-    }
-
-    private void addMessagePreference(int messageId) {
-        mStatusMessagePreference.setTitle(messageId);
-        mStatusMessagePreference.setVisible(true);
-
-    }
-
-    protected void setProgressBarVisible(boolean visible) {
-        if (mProgressHeader != null) {
-            mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
-        }
-    }
-
-    @VisibleForTesting
-    void handleAddNetworkRequest(int result, Intent data) {
-        if (result == Activity.RESULT_OK) {
-            handleAddNetworkSubmitEvent(data);
-        }
-    }
-
-    private void handleAddNetworkSubmitEvent(Intent data) {
-        final WifiConfiguration wifiConfiguration = data.getParcelableExtra(
-                AddNetworkFragment.WIFI_CONFIG_KEY);
-        if (wifiConfiguration != null) {
-            mWifiManager.save(wifiConfiguration, mSaveListener);
-        }
-    }
-
-    /**
-     * Called when "add network" button is pressed.
-     */
-    private void onAddNetworkPressed() {
-        launchAddNetworkFragment();
-    }
-
-    @Override
-    public int getHelpResource() {
-        return R.string.help_url_wifi;
-    }
-
-    /**
-     * Renames/replaces "Next" button when appropriate. "Next" button usually exists in
-     * Wi-Fi setup screens, not in usual wifi settings screen.
-     *
-     * @param enabled true when the device is connected to a wifi network.
-     */
-    @VisibleForTesting
-    void changeNextButtonState(boolean enabled) {
-        if (mEnableNextOnConnection && hasNextButton()) {
-            getNextButton().setEnabled(enabled);
-        }
-    }
-
-    @Override
-    public void onForget(WifiDialog2 dialog) {
-        forget(dialog.getWifiEntry());
-    }
-
-    @Override
-    public void onSubmit(WifiDialog2 dialog) {
-        final int dialogMode = dialog.getMode();
-        final WifiConfiguration config = dialog.getController().getConfig();
-        final WifiEntry wifiEntry = dialog.getWifiEntry();
-
-        if (dialogMode == WifiConfigUiBase2.MODE_MODIFY) {
-            if (config == null) {
-                Toast.makeText(getContext(), R.string.wifi_failed_save_message,
-                        Toast.LENGTH_SHORT).show();
-            } else {
-                mWifiManager.save(config, mSaveListener);
-            }
-        } else if (dialogMode == WifiConfigUiBase2.MODE_CONNECT
-                || (dialogMode == WifiConfigUiBase2.MODE_VIEW && wifiEntry.canConnect())) {
-            if (config == null) {
-                connect(wifiEntry, false /* editIfNoConfig */,
-                        false /* fullScreenEdit*/);
-            } else {
-                mWifiManager.connect(config, new WifiConnectActionListener());
-            }
-        }
-    }
-
-    @Override
-    public void onScan(WifiDialog2 dialog, String ssid) {
-        // Launch QR code scanner to join a network.
-        startActivityForResult(WifiDppUtils.getEnrolleeQrCodeScannerIntent(ssid),
-                REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER);
-    }
-
-    private void forget(WifiEntry wifiEntry) {
-        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
-        wifiEntry.forget(null /* callback */);
-    }
-
-    @VisibleForTesting
-    void connect(WifiEntry wifiEntry, boolean editIfNoConfig, boolean fullScreenEdit) {
-        mMetricsFeatureProvider.action(getActivity(), SettingsEnums.ACTION_WIFI_CONNECT,
-                wifiEntry.isSaved());
-
-        // If it's an unsaved secure WifiEntry, it will callback
-        // ConnectCallback#onConnectResult with ConnectCallback#CONNECT_STATUS_FAILURE_NO_CONFIG
-        wifiEntry.connect(new WifiEntryConnectCallback(wifiEntry, editIfNoConfig,
-                fullScreenEdit));
-    }
-
-    private class WifiConnectActionListener implements WifiManager.ActionListener {
-        @Override
-        public void onSuccess() {
-            mClickedConnect = true;
-        }
-
-        @Override
-        public void onFailure(int reason) {
-            if (isFinishingOrDestroyed()) {
-                return;
-            }
-            Toast.makeText(getContext(), R.string.wifi_failed_connect_message, Toast.LENGTH_SHORT)
-                    .show();
-        }
-    };
-
-    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-            new BaseSearchIndexProvider(R.xml.wifi_settings2) {
-                @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    final List<String> keys = super.getNonIndexableKeys(context);
-
-                    final WifiManager wifiManager = context.getSystemService(WifiManager.class);
-                    if (WifiSavedConfigUtils.getAllConfigsCount(context, wifiManager) == 0) {
-                        keys.add(PREF_KEY_SAVED_NETWORKS);
-                    }
-
-                    if (!DataUsageUtils.hasWifiRadio(context)) {
-                        keys.add(PREF_KEY_DATA_USAGE);
-                    }
-                    return keys;
-                }
-            };
-
-    private class WifiEntryConnectCallback implements ConnectCallback {
-        final WifiEntry mConnectWifiEntry;
-        final boolean mEditIfNoConfig;
-        final boolean mFullScreenEdit;
-
-        WifiEntryConnectCallback(WifiEntry connectWifiEntry, boolean editIfNoConfig,
-                boolean fullScreenEdit) {
-            mConnectWifiEntry = connectWifiEntry;
-            mEditIfNoConfig = editIfNoConfig;
-            mFullScreenEdit = fullScreenEdit;
-        }
-
-        @Override
-        public void onConnectResult(@ConnectStatus int status) {
-            if (isFinishingOrDestroyed()) {
-                return;
-            }
-
-            if (status == ConnectCallback.CONNECT_STATUS_SUCCESS) {
-                mClickedConnect = true;
-            } else if (status == ConnectCallback.CONNECT_STATUS_FAILURE_NO_CONFIG) {
-                if (mEditIfNoConfig) {
-                    // Edit an unsaved secure Wi-Fi network.
-                    if (mFullScreenEdit) {
-                        launchConfigNewNetworkFragment(mConnectWifiEntry);
-                    } else {
-                        showDialog(mConnectWifiEntry, WifiConfigUiBase2.MODE_CONNECT);
-                    }
-                }
-            } else if (status == CONNECT_STATUS_FAILURE_UNKNOWN) {
-                Toast.makeText(getContext(), R.string.wifi_failed_connect_message,
-                        Toast.LENGTH_SHORT).show();
-            }
-        }
-    }
-
-    private void launchConfigNewNetworkFragment(WifiEntry wifiEntry) {
-        final Bundle bundle = new Bundle();
-        bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,
-                wifiEntry.getKey());
-        new SubSettingLauncher(getContext())
-                .setTitleText(wifiEntry.getTitle())
-                .setDestination(ConfigureWifiEntryFragment.class.getName())
-                .setArguments(bundle)
-                .setSourceMetricsCategory(getMetricsCategory())
-                .setResultListener(WifiSettings2.this, CONFIG_NETWORK_REQUEST)
-                .launch();
-    }
-
-    /** Helper method to return whether a WifiEntry is disabled due to a wrong password */
-    private static boolean isDisabledByWrongPassword(WifiEntry wifiEntry) {
-        WifiConfiguration config = wifiEntry.getWifiConfiguration();
-        if (config == null) {
-            return false;
-        }
-        WifiConfiguration.NetworkSelectionStatus networkStatus =
-                config.getNetworkSelectionStatus();
-        if (networkStatus == null
-                || networkStatus.getNetworkSelectionStatus() == NETWORK_SELECTION_ENABLED) {
-            return false;
-        }
-        int reason = networkStatus.getNetworkSelectionDisableReason();
-        return WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD == reason;
-    }
-
-    @VisibleForTesting
-    void openSubscriptionHelpPage(WifiEntry wifiEntry) {
-        final Intent intent = getHelpIntent(getContext(), wifiEntry.getHelpUriString());
-        if (intent != null) {
-            try {
-                startActivityForResult(intent, MANAGE_SUBSCRIPTION);
-            } catch (ActivityNotFoundException e) {
-                Log.e(TAG, "Activity was not found for intent, " + intent.toString());
-            }
-        }
-    }
-
-    @VisibleForTesting
-    Intent getHelpIntent(Context context, String helpUrlString) {
-        return HelpUtils.getHelpIntent(context, helpUrlString, context.getClass().getName());
-    }
-}
diff --git a/src/com/android/settings/wifi/WifiTrackerLibProvider.java b/src/com/android/settings/wifi/WifiTrackerLibProvider.java
new file mode 100644
index 0000000..10b3373
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiTrackerLibProvider.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import android.content.Context;
+import android.os.Handler;
+
+import androidx.lifecycle.Lifecycle;
+
+import com.android.wifitrackerlib.NetworkDetailsTracker;
+import com.android.wifitrackerlib.WifiPickerTracker;
+
+import java.time.Clock;
+
+/**
+ * Provides the objects instances from the AOSP WifiTrackerLib.
+ */
+public interface WifiTrackerLibProvider {
+
+    /** Create a new instance of WifiPickerTracker */
+    WifiPickerTracker createWifiPickerTracker(
+            Lifecycle lifecycle, Context context,
+            Handler mainHandler, Handler workerHandler, Clock clock,
+            long maxScanAgeMillis, long scanIntervalMillis,
+            WifiPickerTracker.WifiPickerTrackerCallback listener);
+
+    /** Create a new instance of NetworkDetailsTracker */
+    NetworkDetailsTracker createNetworkDetailsTracker(
+            Lifecycle lifecycle, Context context,
+            Handler mainHandler, Handler workerHandler, Clock clock,
+            long maxScanAgeMillis, long scanIntervalMillis,
+            String key);
+
+}
diff --git a/src/com/android/settings/wifi/WifiTrackerLibProviderImpl.java b/src/com/android/settings/wifi/WifiTrackerLibProviderImpl.java
new file mode 100644
index 0000000..f835409
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiTrackerLibProviderImpl.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkScoreManager;
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+
+import androidx.lifecycle.Lifecycle;
+
+import com.android.wifitrackerlib.NetworkDetailsTracker;
+import com.android.wifitrackerlib.WifiPickerTracker;
+
+import java.time.Clock;
+
+/**
+ * Implementation of AOSP WifiTrackerLibProvider.
+ */
+public class WifiTrackerLibProviderImpl implements WifiTrackerLibProvider {
+
+    /**
+     * Create an instance of WifiPickerTracker.
+     */
+    @Override
+    public WifiPickerTracker createWifiPickerTracker(
+            Lifecycle lifecycle, Context context,
+            Handler mainHandler, Handler workerHandler, Clock clock,
+            long maxScanAgeMillis, long scanIntervalMillis,
+            WifiPickerTracker.WifiPickerTrackerCallback listener) {
+        return new WifiPickerTracker(
+                lifecycle, context,
+                context.getSystemService(WifiManager.class),
+                context.getSystemService(ConnectivityManager.class),
+                context.getSystemService(NetworkScoreManager.class),
+                mainHandler, workerHandler, clock,
+                maxScanAgeMillis, scanIntervalMillis,
+                listener);
+    }
+
+    /**
+     * Create an instance of NetworkDetailsTracker.
+     */
+    @Override
+    public NetworkDetailsTracker createNetworkDetailsTracker(
+            Lifecycle lifecycle, Context context,
+            Handler mainHandler, Handler workerHandler, Clock clock,
+            long maxScanAgeMillis, long scanIntervalMillis,
+            String key) {
+        return NetworkDetailsTracker.createNetworkDetailsTracker(
+                lifecycle, context,
+                context.getSystemService(WifiManager.class),
+                context.getSystemService(ConnectivityManager.class),
+                context.getSystemService(NetworkScoreManager.class),
+                mainHandler, workerHandler, clock,
+                maxScanAgeMillis, scanIntervalMillis,
+                key);
+    }
+}
diff --git a/src/com/android/settings/wifi/WifiUtils.java b/src/com/android/settings/wifi/WifiUtils.java
index 1333ab4..06f74d5 100644
--- a/src/com/android/settings/wifi/WifiUtils.java
+++ b/src/com/android/settings/wifi/WifiUtils.java
@@ -23,6 +23,7 @@
 import android.content.pm.PackageManager;
 import android.net.NetworkCapabilities;
 import android.net.wifi.ScanResult;
+import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiConfiguration;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -30,7 +31,7 @@
 import android.text.TextUtils;
 
 import com.android.settings.Utils;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.wifitrackerlib.WifiEntry;
 
 import java.nio.charset.StandardCharsets;
 
@@ -38,8 +39,6 @@
 
     private static final int SSID_ASCII_MIN_LENGTH = 1;
     private static final int SSID_ASCII_MAX_LENGTH = 32;
-    private static final int PASSWORD_MIN_LENGTH = 8;
-    private static final int PASSWORD_MAX_LENGTH = 63;
 
 
     public static boolean isSSIDTooLong(String ssid) {
@@ -56,13 +55,17 @@
         return ssid.length() < SSID_ASCII_MIN_LENGTH;
     }
 
-    public static boolean isHotspotPasswordValid(String password) {
-        if (TextUtils.isEmpty(password)) {
+    /**
+     * Check if the WPA2-PSK hotspot password is valid.
+     */
+    public static boolean isHotspotWpa2PasswordValid(String password) {
+        final SoftApConfiguration.Builder configBuilder = new SoftApConfiguration.Builder();
+        try {
+            configBuilder.setPassphrase(password, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
+        } catch (IllegalArgumentException e) {
             return false;
         }
-
-        final int length = password.length();
-        return length >= PASSWORD_MIN_LENGTH && length <= PASSWORD_MAX_LENGTH;
+        return true;
     }
 
     /**
@@ -132,161 +135,99 @@
 
     /**
      * Provides a simple way to generate a new {@link WifiConfiguration} obj from
-     * {@link ScanResult} or {@link AccessPoint}. Either {@code accessPoint} or {@code scanResult
+     * {@link ScanResult} or {@link WifiEntry}. Either {@code wifiEntry} or {@code scanResult
      * } input should be not null for retrieving information, otherwise will throw
      * IllegalArgumentException.
-     * This method prefers to take {@link AccessPoint} input in priority. Therefore this method
-     * will take {@link AccessPoint} input as preferred data extraction source when you input
-     * both {@link AccessPoint} and {@link ScanResult}, and ignore {@link ScanResult} input.
+     * This method prefers to take {@link WifiEntry} input in priority. Therefore this method
+     * will take {@link WifiEntry} input as preferred data extraction source when you input
+     * both {@link WifiEntry} and {@link ScanResult}, and ignore {@link ScanResult} input.
      *
      * Duplicated and simplified method from {@link WifiConfigController#getConfig()}.
      * TODO(b/120827021): Should be removed if the there is have a common one in shared place (e.g.
      * SettingsLib).
      *
-     * @param accessPoint Input data for retrieving WifiConfiguration.
+     * @param wifiEntry Input data for retrieving WifiConfiguration.
      * @param scanResult  Input data for retrieving WifiConfiguration.
      * @return WifiConfiguration obj based on input.
      */
-    public static WifiConfiguration getWifiConfig(AccessPoint accessPoint, ScanResult scanResult,
-            String password) {
-        if (accessPoint == null && scanResult == null) {
+    public static WifiConfiguration getWifiConfig(WifiEntry wifiEntry, ScanResult scanResult) {
+        if (wifiEntry == null && scanResult == null) {
             throw new IllegalArgumentException(
-                    "At least one of AccessPoint and ScanResult input is required.");
+                    "At least one of WifiEntry and ScanResult input is required.");
         }
 
         final WifiConfiguration config = new WifiConfiguration();
         final int security;
 
-        if (accessPoint == null) {
-            config.SSID = AccessPoint.convertToQuotedString(scanResult.SSID);
-            security = getAccessPointSecurity(scanResult);
+        if (wifiEntry == null) {
+            config.SSID = "\"" + scanResult.SSID + "\"";
+            security = getWifiEntrySecurity(scanResult);
         } else {
-            if (!accessPoint.isSaved()) {
-                config.SSID = AccessPoint.convertToQuotedString(
-                        accessPoint.getSsidStr());
+            if (wifiEntry.getWifiConfiguration() == null) {
+                config.SSID = "\"" + wifiEntry.getSsid() + "\"";
             } else {
-                config.networkId = accessPoint.getConfig().networkId;
-                config.hiddenSSID = accessPoint.getConfig().hiddenSSID;
+                config.networkId = wifiEntry.getWifiConfiguration().networkId;
+                config.hiddenSSID = wifiEntry.getWifiConfiguration().hiddenSSID;
             }
-            security = accessPoint.getSecurity();
+            security = wifiEntry.getSecurity();
         }
 
         switch (security) {
-            case AccessPoint.SECURITY_NONE:
+            case WifiEntry.SECURITY_NONE:
                 config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OPEN);
                 break;
 
-            case AccessPoint.SECURITY_WEP:
+            case WifiEntry.SECURITY_WEP:
                 config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_WEP);
-                if (!TextUtils.isEmpty(password)) {
-                    int length = password.length();
-                    // WEP-40, WEP-104, and 256-bit WEP (WEP-232?)
-                    if ((length == 10 || length == 26 || length == 58)
-                            && password.matches("[0-9A-Fa-f]*")) {
-                        config.wepKeys[0] = password;
-                    } else {
-                        config.wepKeys[0] = '"' + password + '"';
-                    }
-                }
                 break;
 
-            case AccessPoint.SECURITY_PSK:
+            case WifiEntry.SECURITY_PSK:
                 config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_PSK);
-                if (!TextUtils.isEmpty(password)) {
-                    if (password.matches("[0-9A-Fa-f]{64}")) {
-                        config.preSharedKey = password;
-                    } else {
-                        config.preSharedKey = '"' + password + '"';
-                    }
-                }
                 break;
 
-            case AccessPoint.SECURITY_EAP:
-            case AccessPoint.SECURITY_EAP_SUITE_B:
-                if (security == AccessPoint.SECURITY_EAP_SUITE_B) {
-                    // allowedSuiteBCiphers will be set according to certificate type
-                    config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
-                } else {
-                    config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
-                }
-
-                if (!TextUtils.isEmpty(password)) {
-                    config.enterpriseConfig.setPassword(password);
-                }
+            case WifiEntry.SECURITY_EAP_SUITE_B:
+                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B);
                 break;
-            case AccessPoint.SECURITY_SAE:
+
+            case WifiEntry.SECURITY_EAP:
+                config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_EAP);
+                break;
+
+            case WifiEntry.SECURITY_SAE:
                 config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_SAE);
-                if (!TextUtils.isEmpty(password)) {
-                    config.preSharedKey = '"' + password + '"';
-                }
                 break;
 
-            case AccessPoint.SECURITY_OWE:
+            case WifiEntry.SECURITY_OWE:
                 config.setSecurityParams(WifiConfiguration.SECURITY_TYPE_OWE);
                 break;
 
             default:
                 break;
         }
-
         return config;
     }
 
-
     /**
      * Gets security value from ScanResult.
      *
-     * Duplicated method from {@link AccessPoint#getSecurity(ScanResult)}.
-     * TODO(b/120827021): Should be removed if the there is have a common one in shared place (e.g.
-     * SettingsLib).
-     *
      * @param result ScanResult
-     * @return Related security value based on {@link AccessPoint}.
+     * @return Related security value based on {@link WifiEntry}.
      */
-    public static int getAccessPointSecurity(ScanResult result) {
+    public static int getWifiEntrySecurity(ScanResult result) {
         if (result.capabilities.contains("WEP")) {
-            return AccessPoint.SECURITY_WEP;
+            return WifiEntry.SECURITY_WEP;
         } else if (result.capabilities.contains("SAE")) {
-            return AccessPoint.SECURITY_SAE;
+            return WifiEntry.SECURITY_SAE;
         } else if (result.capabilities.contains("PSK")) {
-            return AccessPoint.SECURITY_PSK;
+            return WifiEntry.SECURITY_PSK;
         } else if (result.capabilities.contains("EAP_SUITE_B_192")) {
-            return AccessPoint.SECURITY_EAP_SUITE_B;
+            return WifiEntry.SECURITY_EAP_SUITE_B;
         } else if (result.capabilities.contains("EAP")) {
-            return AccessPoint.SECURITY_EAP;
+            return WifiEntry.SECURITY_EAP;
         } else if (result.capabilities.contains("OWE")) {
-            return AccessPoint.SECURITY_OWE;
+            return WifiEntry.SECURITY_OWE;
         }
 
-        return AccessPoint.SECURITY_NONE;
-    }
-
-
-    public static final int CONNECT_TYPE_OTHERS = 0;
-    public static final int CONNECT_TYPE_OPEN_NETWORK = 1;
-    public static final int CONNECT_TYPE_SAVED_NETWORK = 2;
-    public static final int CONNECT_TYPE_OSU_PROVISION = 3;
-
-    /**
-     * Gets the connecting type of {@link AccessPoint}.
-     */
-    public static int getConnectingType(AccessPoint accessPoint) {
-        final WifiConfiguration config = accessPoint.getConfig();
-        if (accessPoint.isOsuProvider()) {
-            return CONNECT_TYPE_OSU_PROVISION;
-        } else if ((accessPoint.getSecurity() == AccessPoint.SECURITY_NONE) ||
-                (accessPoint.getSecurity() == AccessPoint.SECURITY_OWE)) {
-            return CONNECT_TYPE_OPEN_NETWORK;
-        } else if (accessPoint.isSaved() && config != null
-                && config.getNetworkSelectionStatus() != null
-                && config.getNetworkSelectionStatus().hasEverConnected()) {
-            return CONNECT_TYPE_SAVED_NETWORK;
-        } else if (accessPoint.isPasspoint()) {
-            // Access point provided by an installed Passpoint provider, connect using
-            // the associated config.
-            return CONNECT_TYPE_SAVED_NETWORK;
-        } else {
-            return CONNECT_TYPE_OTHERS;
-        }
+        return WifiEntry.SECURITY_NONE;
     }
 }
diff --git a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
index e9fd350..5869705 100644
--- a/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiWakeupPreferenceController.java
@@ -26,6 +26,7 @@
 import android.location.LocationManager;
 import android.net.wifi.WifiManager;
 import android.provider.Settings;
+import android.util.FeatureFlagUtils;
 
 import androidx.annotation.VisibleForTesting;
 import androidx.fragment.app.Fragment;
@@ -44,6 +45,7 @@
  * {@link TogglePreferenceController} that controls whether the Wi-Fi Wakeup feature should be
  * enabled.
  */
+// TODO(b/167474581): Should clean up this controller when Provider Model finished.
 public class WifiWakeupPreferenceController extends TogglePreferenceController implements
         LifecycleObserver, OnPause, OnResume {
 
@@ -89,6 +91,9 @@
 
     @Override
     public int getAvailabilityStatus() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL)) {
+            return CONDITIONALLY_UNAVAILABLE;
+        }
         return AVAILABLE;
     }
 
diff --git a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
index a48358f..46f4414 100644
--- a/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
+++ b/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragment.java
@@ -24,8 +24,6 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiConfiguration.KeyMgmt;
 import android.net.wifi.WifiManager;
@@ -60,6 +58,7 @@
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.core.InstrumentedFragment;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.wifitrackerlib.WifiEntry;
 import com.android.wifitrackerlib.WifiPickerTracker;
 
@@ -86,9 +85,9 @@
     static final int RESULT_NETWORK_ALREADY_EXISTS = 2;
 
     // Handler messages for controlling different state and delay showing the status message.
-    private static final int MESSAGE_START_SAVING_NETWORK = 1;
-    private static final int MESSAGE_SHOW_SAVED_AND_CONNECT_NETWORK = 2;
-    private static final int MESSAGE_SHOW_SAVE_FAILED = 3;
+    @VisibleForTesting static final int MESSAGE_START_SAVING_NETWORK = 1;
+    @VisibleForTesting static final int MESSAGE_SHOW_SAVED_AND_CONNECT_NETWORK = 2;
+    @VisibleForTesting static final int MESSAGE_SHOW_SAVE_FAILED = 3;
     private static final int MESSAGE_FINISH = 4;
 
     // Signal level for the initial signal icon.
@@ -137,7 +136,8 @@
     private WifiManager.ActionListener mSaveListener;
     private WifiManager mWifiManager;
 
-    private final Handler mHandler = new Handler() {
+    @VisibleForTesting
+    final Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
             showSaveStatusByState(msg.what);
@@ -190,16 +190,15 @@
                 return SystemClock.elapsedRealtime();
             }
         };
-        mWifiPickerTracker = new WifiPickerTracker(getSettingsLifecycle(), mActivity,
-                mActivity.getSystemService(WifiManager.class),
-                mActivity.getSystemService(ConnectivityManager.class),
-                mActivity.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                this);
+        mWifiPickerTracker = FeatureFactory.getFactory(mActivity.getApplicationContext())
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(getSettingsLifecycle(), mActivity,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        this);
         return inflater.inflate(R.layout.wifi_add_app_networks, container, false);
     }
 
@@ -638,7 +637,8 @@
     /**
      * Call framework API to save single network.
      */
-    private void saveNetwork(int index) {
+    @VisibleForTesting
+    void saveNetwork(int index) {
         final PasspointConfiguration passpointConfig =
                 mUiToRequestedList.get(index).mWifiNetworkSuggestion.getPasspointConfig();
         if (passpointConfig != null) {
@@ -689,7 +689,8 @@
         return SettingsEnums.PANEL_ADD_WIFI_NETWORKS;
     }
 
-    private void showSaveStatusByState(int status) {
+    @VisibleForTesting
+    void showSaveStatusByState(int status) {
         switch (status) {
             case MESSAGE_START_SAVING_NETWORK:
                 if (mIsSingleNetwork) {
@@ -747,21 +748,29 @@
 
 
     @VisibleForTesting
-    void updateScanResultsToUi(List<WifiEntry> allEntries) {
+    void updateScanResultsToUi() {
         if (mUiToRequestedList == null) {
             // Nothing need to be updated.
             return;
         }
 
+        List<WifiEntry> reachableWifiEntries = null;
+        if (mWifiPickerTracker.getWifiState() == WifiManager.WIFI_STATE_ENABLED) {
+            reachableWifiEntries = mWifiPickerTracker.getWifiEntries();
+            final WifiEntry connectedWifiEntry = mWifiPickerTracker.getConnectedWifiEntry();
+            if (connectedWifiEntry != null) {
+                reachableWifiEntries.add(connectedWifiEntry);
+            }
+        }
+
         // Update the signal level of the UI networks.
         for (UiConfigurationItem uiConfigurationItem : mUiToRequestedList) {
             uiConfigurationItem.mLevel = 0;
-            if (allEntries != null) {
-                final Optional<WifiEntry> matchedWifiEntry = allEntries.stream()
+            if (reachableWifiEntries != null) {
+                final Optional<WifiEntry> matchedWifiEntry = reachableWifiEntries.stream()
                         .filter(wifiEntry -> TextUtils.equals(
                                 uiConfigurationItem.mWifiNetworkSuggestion.getSsid(),
                                 wifiEntry.getSsid()))
-                        .filter(wifiEntry -> !wifiEntry.isSaved())
                         .findFirst();
                 uiConfigurationItem.mLevel =
                         matchedWifiEntry.isPresent() ? matchedWifiEntry.get().getLevel() : 0;
@@ -794,9 +803,7 @@
      */
     @Override
     public void onWifiEntriesChanged() {
-        updateScanResultsToUi(
-                (mWifiPickerTracker.getWifiState() == WifiManager.WIFI_STATE_ENABLED)
-                        ? mWifiPickerTracker.getWifiEntries() : null);
+        updateScanResultsToUi();
     }
 
     @Override
diff --git a/src/com/android/settings/wifi/calling/OWNERS b/src/com/android/settings/wifi/calling/OWNERS
index 87e5fcc..991ad43 100644
--- a/src/com/android/settings/wifi/calling/OWNERS
+++ b/src/com/android/settings/wifi/calling/OWNERS
@@ -2,6 +2,7 @@
 allenwtsu@google.com
 andychou@google.com
 bonianchen@google.com
+goldmanj@google.com
 leechou@google.com
 songferngwang@google.com
 tomhsu@google.com
diff --git a/src/com/android/settings/wifi/details/AddDevicePreferenceController.java b/src/com/android/settings/wifi/details/AddDevicePreferenceController.java
deleted file mode 100644
index 2f4434a..0000000
--- a/src/com/android/settings/wifi/details/AddDevicePreferenceController.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.details;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.wifi.WifiManager;
-import android.util.Log;
-
-import androidx.preference.Preference;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.wifi.dpp.WifiDppUtils;
-import com.android.settingslib.wifi.AccessPoint;
-
-/**
- * {@link BasePreferenceController} that launches Wi-Fi Easy Connect configurator flow.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.details2.AddDevicePreferenceController2}.
- */
-public class AddDevicePreferenceController extends BasePreferenceController {
-
-    private static final String TAG = "AddDevicePreferenceController";
-
-    private static final String KEY_ADD_DEVICE = "add_device_to_network";
-
-    private AccessPoint mAccessPoint;
-    private WifiManager mWifiManager;
-
-    public AddDevicePreferenceController(Context context) {
-        super(context, KEY_ADD_DEVICE);
-
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-    }
-
-    public AddDevicePreferenceController init(AccessPoint accessPoint) {
-        mAccessPoint = accessPoint;
-
-        return this;
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        if (WifiDppUtils.isSupportConfiguratorQrCodeScanner(mContext, mAccessPoint)) {
-            return AVAILABLE;
-        } else {
-            return CONDITIONALLY_UNAVAILABLE;
-        }
-    }
-
-    @Override
-    public boolean handlePreferenceTreeClick(Preference preference) {
-        if (KEY_ADD_DEVICE.equals(preference.getKey())) {
-            WifiDppUtils.showLockScreen(mContext, () -> launchWifiDppConfiguratorQrCodeScanner());
-            return true; /* click is handled */
-        }
-
-        return false; /* click is not handled */
-    }
-
-    private void launchWifiDppConfiguratorQrCodeScanner() {
-        final Intent intent = WifiDppUtils.getConfiguratorQrCodeScannerIntentOrNull(mContext,
-                mWifiManager, mAccessPoint);
-
-        if (intent == null) {
-            Log.e(TAG, "Launch Wi-Fi QR code scanner with a wrong Wi-Fi network!");
-        } else {
-            mContext.startActivity(intent);
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
deleted file mode 100644
index 8dd8d7a..0000000
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ /dev/null
@@ -1,1296 +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.wifi.details;
-
-import static android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
-import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.settings.SettingsEnums;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.VectorDrawable;
-import android.net.CaptivePortalData;
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.LinkAddress;
-import android.net.LinkProperties;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.NetworkRequest;
-import android.net.NetworkUtils;
-import android.net.RouteInfo;
-import android.net.Uri;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.CountDownTimer;
-import android.os.Handler;
-import android.text.TextUtils;
-import android.util.FeatureFlagUtils;
-import android.util.Log;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.core.text.BidiFormatter;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceFragmentCompat;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.core.FeatureFlags;
-import com.android.settings.core.PreferenceControllerMixin;
-import com.android.settings.datausage.WifiDataUsageSummaryPreferenceController;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settings.wifi.WifiDialog;
-import com.android.settings.wifi.WifiDialog.WifiDialogListener;
-import com.android.settings.wifi.WifiUtils;
-import com.android.settings.wifi.dpp.WifiDppUtils;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.core.lifecycle.LifecycleObserver;
-import com.android.settingslib.core.lifecycle.events.OnPause;
-import com.android.settingslib.core.lifecycle.events.OnResume;
-import com.android.settingslib.utils.StringUtil;
-import com.android.settingslib.widget.ActionButtonsPreference;
-import com.android.settingslib.widget.LayoutPreference;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.time.Duration;
-import java.time.Instant;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
-import java.util.StringJoiner;
-import java.util.stream.Collectors;
-
-/**
- * Controller for logic pertaining to displaying Wifi information for the
- * {@link WifiNetworkDetailsFragment}.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.details2.WifiDetailPreferenceController2}.
- */
-public class WifiDetailPreferenceController extends AbstractPreferenceController
-        implements PreferenceControllerMixin, WifiDialogListener, LifecycleObserver, OnPause,
-        OnResume {
-
-    private static final String TAG = "WifiDetailsPrefCtrl";
-    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
-
-    @VisibleForTesting
-    static final String KEY_HEADER = "connection_header";
-    @VisibleForTesting
-    static final String KEY_DATA_USAGE_HEADER = "status_header";
-    @VisibleForTesting
-    static final String KEY_BUTTONS_PREF = "buttons";
-    @VisibleForTesting
-    static final String KEY_SIGNAL_STRENGTH_PREF = "signal_strength";
-    @VisibleForTesting
-    static final String KEY_TX_LINK_SPEED = "tx_link_speed";
-    @VisibleForTesting
-    static final String KEY_RX_LINK_SPEED = "rx_link_speed";
-    @VisibleForTesting
-    static final String KEY_FREQUENCY_PREF = "frequency";
-    @VisibleForTesting
-    static final String KEY_SECURITY_PREF = "security";
-    @VisibleForTesting
-    static final String KEY_SSID_PREF = "ssid";
-    @VisibleForTesting
-    static final String KEY_MAC_ADDRESS_PREF = "mac_address";
-    @VisibleForTesting
-    static final String KEY_IP_ADDRESS_PREF = "ip_address";
-    @VisibleForTesting
-    static final String KEY_GATEWAY_PREF = "gateway";
-    @VisibleForTesting
-    static final String KEY_SUBNET_MASK_PREF = "subnet_mask";
-    @VisibleForTesting
-    static final String KEY_DNS_PREF = "dns";
-    @VisibleForTesting
-    static final String KEY_IPV6_CATEGORY = "ipv6_category";
-    @VisibleForTesting
-    static final String KEY_IPV6_ADDRESSES_PREF = "ipv6_addresses";
-
-    private static final int STATE_NONE = 1;
-    private static final int STATE_ENABLE_WIFI = 2;
-    private static final int STATE_ENABLE_WIFI_FAILED = 3;
-    private static final int STATE_CONNECTING = 4;
-    private static final int STATE_CONNECTED = 5;
-    private static final int STATE_FAILED = 6;
-    private static final int STATE_NOT_IN_RANGE = 7;
-    private static final int STATE_DISCONNECTED = 8;
-    private static final long TIMEOUT = Duration.ofSeconds(10).toMillis();
-
-    // Be static to avoid too much object not be reset.
-    @VisibleForTesting
-    static CountDownTimer mTimer;
-
-    private AccessPoint mAccessPoint;
-    private final ConnectivityManager mConnectivityManager;
-    private final PreferenceFragmentCompat mFragment;
-    private final Handler mHandler;
-    private LinkProperties mLinkProperties;
-    private Network mNetwork;
-    private NetworkInfo mNetworkInfo;
-    private NetworkCapabilities mNetworkCapabilities;
-    private int mRssiSignalLevel = -1;
-    private String[] mSignalStr;
-    private WifiConfiguration mWifiConfig;
-    private WifiInfo mWifiInfo;
-    private final WifiManager mWifiManager;
-    private final WifiTracker mWifiTracker;
-    private final MetricsFeatureProvider mMetricsFeatureProvider;
-    private boolean mIsOutOfRange;
-    private boolean mIsEphemeral;
-    private boolean mConnected;
-    private int mConnectingState;
-    private WifiManager.ActionListener mConnectListener;
-
-    // UI elements - in order of appearance
-    private ActionButtonsPreference mButtonsPref;
-    private EntityHeaderController mEntityHeaderController;
-    private Preference mSignalStrengthPref;
-    private Preference mTxLinkSpeedPref;
-    private Preference mRxLinkSpeedPref;
-    private Preference mFrequencyPref;
-    private Preference mSecurityPref;
-    private Preference mSsidPref;
-    private Preference mMacAddressPref;
-    private Preference mIpAddressPref;
-    private Preference mGatewayPref;
-    private Preference mSubnetPref;
-    private Preference mDnsPref;
-    private PreferenceCategory mIpv6Category;
-    private Preference mIpv6AddressPref;
-    private Lifecycle mLifecycle;
-    Preference mDataUsageSummaryPref;
-    WifiDataUsageSummaryPreferenceController mSummaryHeaderController;
-
-    private final IconInjector mIconInjector;
-    private final Clock mClock;
-    private final IntentFilter mFilter;
-
-    // Passpoint information - cache it in case of losing these information after
-    // updateAccessPointFromScannedList(). For R2, we should update these data from
-    // WifiManager#getPasspointConfigurations() after users manage the passpoint profile.
-    private boolean mIsExpired;
-    private boolean mIsPasspointConfigurationR1;
-
-    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            switch (intent.getAction()) {
-                case WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION:
-                    updateMatchingWifiConfig();
-                    // fall through
-                case WifiManager.NETWORK_STATE_CHANGED_ACTION:
-                case WifiManager.RSSI_CHANGED_ACTION:
-                    refreshPage();
-                    break;
-            }
-        }
-
-        private void updateMatchingWifiConfig() {
-            // use getPrivilegedConfiguredNetworks() to get Passpoint & other ephemeral networks
-            for (WifiConfiguration wifiConfiguration :
-                    mWifiManager.getPrivilegedConfiguredNetworks()) {
-                if (mAccessPoint.matches(wifiConfiguration)) {
-                    mWifiConfig = wifiConfiguration;
-                    break;
-                }
-            }
-        }
-    };
-
-    private final NetworkRequest mNetworkRequest = new NetworkRequest.Builder()
-            .clearCapabilities().addTransportType(TRANSPORT_WIFI).build();
-
-    // Must be run on the UI thread since it directly manipulates UI state.
-    private final NetworkCallback mNetworkCallback = new NetworkCallback() {
-        @Override
-        public void onLinkPropertiesChanged(Network network, LinkProperties lp) {
-            if (network.equals(mNetwork) && !lp.equals(mLinkProperties)) {
-                mLinkProperties = lp;
-                refreshEntityHeader();
-                refreshButtons();
-                refreshIpLayerInfo();
-            }
-        }
-
-        private boolean hasCapabilityChanged(NetworkCapabilities nc, int cap) {
-            // If this is the first time we get NetworkCapabilities, report that something changed.
-            if (mNetworkCapabilities == null) return true;
-
-            // nc can never be null, see ConnectivityService#callCallbackForRequest.
-            return mNetworkCapabilities.hasCapability(cap) != nc.hasCapability(cap);
-        }
-
-        private boolean hasPrivateDnsStatusChanged(NetworkCapabilities nc) {
-            // If this is the first time that WifiDetailPreferenceController gets
-            // NetworkCapabilities, report that something has changed and assign nc to
-            // mNetworkCapabilities in onCapabilitiesChanged. Note that the NetworkCapabilities
-            // from onCapabilitiesChanged() will never be null, so calling
-            // mNetworkCapabilities.isPrivateDnsBroken() would be safe next time.
-            if (mNetworkCapabilities == null) {
-                return true;
-            }
-
-            return mNetworkCapabilities.isPrivateDnsBroken() != nc.isPrivateDnsBroken();
-        }
-
-        @Override
-        public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) {
-            // If the network just validated or lost Internet access or detected partial internet
-            // connectivity or private dns was broken, refresh network state. Don't do this on
-            // every NetworkCapabilities change because refreshEntityHeader sends IPCs to the
-            // system server from the UI thread, which can cause jank.
-            if (network.equals(mNetwork) && !nc.equals(mNetworkCapabilities)) {
-                if (hasPrivateDnsStatusChanged(nc)
-                        || hasCapabilityChanged(nc, NET_CAPABILITY_VALIDATED)
-                        || hasCapabilityChanged(nc, NET_CAPABILITY_CAPTIVE_PORTAL)
-                        || hasCapabilityChanged(nc, NET_CAPABILITY_PARTIAL_CONNECTIVITY)) {
-                    mAccessPoint.update(mWifiConfig, mWifiInfo, mNetworkInfo);
-                    refreshEntityHeader();
-                }
-                mNetworkCapabilities = nc;
-                refreshButtons();
-                refreshIpLayerInfo();
-            }
-        }
-
-        @Override
-        public void onLost(Network network) {
-            // Ephemeral network not a saved network, leave detail page once disconnected
-            if (mIsEphemeral && network.equals(mNetwork)) {
-                exitActivity();
-            }
-        }
-    };
-
-    @VisibleForTesting
-    final WifiTracker.WifiListener mWifiListener = new WifiTracker.WifiListener() {
-        /** Called when the state of Wifi has changed. */
-        public void onWifiStateChanged(int state) {
-            Log.d(TAG, "onWifiStateChanged(" + state + ")");
-            if (mConnectingState == STATE_ENABLE_WIFI && state == WifiManager.WIFI_STATE_ENABLED) {
-                updateConnectingState(STATE_CONNECTING);
-            } else if (mConnectingState != STATE_NONE && state == WifiManager.WIFI_STATE_DISABLED) {
-                // update as disconnected once Wi-Fi disabled since may not received
-                // onConnectedChanged for this case.
-                updateConnectingState(STATE_DISCONNECTED);
-            }
-        }
-
-        /** Called when the connection state of wifi has changed. */
-        public void onConnectedChanged() {
-            refreshPage();
-        }
-
-        /**
-         * Called to indicate the list of AccessPoints has been updated and
-         * {@link WifiTracker#getAccessPoints()} should be called to get the updated list.
-         */
-        public void onAccessPointsChanged() {
-            refreshPage();
-        }
-    };
-
-    public static WifiDetailPreferenceController newInstance(
-            AccessPoint accessPoint,
-            ConnectivityManager connectivityManager,
-            Context context,
-            PreferenceFragmentCompat fragment,
-            Handler handler,
-            Lifecycle lifecycle,
-            WifiManager wifiManager,
-            MetricsFeatureProvider metricsFeatureProvider) {
-        return new WifiDetailPreferenceController(
-                accessPoint, connectivityManager, context, fragment, handler, lifecycle,
-                wifiManager, metricsFeatureProvider, new IconInjector(context), new Clock());
-    }
-
-    @VisibleForTesting
-        /* package */ WifiDetailPreferenceController(
-            AccessPoint accessPoint,
-            ConnectivityManager connectivityManager,
-            Context context,
-            PreferenceFragmentCompat fragment,
-            Handler handler,
-            Lifecycle lifecycle,
-            WifiManager wifiManager,
-            MetricsFeatureProvider metricsFeatureProvider,
-            IconInjector injector,
-            Clock clock) {
-        super(context);
-
-        mAccessPoint = accessPoint;
-        mConnectivityManager = connectivityManager;
-        mFragment = fragment;
-        mHandler = handler;
-        mSignalStr = context.getResources().getStringArray(R.array.wifi_signal);
-        mWifiConfig = accessPoint.getConfig();
-        mWifiManager = wifiManager;
-        mMetricsFeatureProvider = metricsFeatureProvider;
-        mIconInjector = injector;
-        mClock = clock;
-
-        mFilter = new IntentFilter();
-        mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.RSSI_CHANGED_ACTION);
-        mFilter.addAction(WifiManager.CONFIGURED_NETWORKS_CHANGED_ACTION);
-
-        mLifecycle = lifecycle;
-        lifecycle.addObserver(this);
-
-        mWifiTracker = WifiTrackerFactory.create(
-                mFragment.getActivity(),
-                mWifiListener,
-                mLifecycle,
-                true /*includeSaved*/,
-                true /*includeScans*/);
-        mConnected = mAccessPoint.isActive();
-        // When lost the network connection, WifiInfo/NetworkInfo will be clear. So causes we
-        // could not check if the AccessPoint is ephemeral. Need to cache it in first.
-        mIsEphemeral = mAccessPoint.isEphemeral();
-        mConnectingState = STATE_NONE;
-        mConnectListener = new WifiManager.ActionListener() {
-            @Override
-            public void onSuccess() {
-                // Do nothing
-            }
-
-            @Override
-            public void onFailure(int reason) {
-                updateConnectingState(STATE_FAILED);
-            }
-        };
-
-        mIsExpired = mAccessPoint.isExpired();
-        mIsPasspointConfigurationR1 = mAccessPoint.isPasspointConfigurationR1();
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        // Returns null since this controller contains more than one Preference
-        return null;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-
-        setupEntityHeader(screen);
-
-        mButtonsPref = ((ActionButtonsPreference) screen.findPreference(KEY_BUTTONS_PREF))
-                .setButton1Text(R.string.forget)
-                .setButton1Icon(R.drawable.ic_settings_delete)
-                .setButton1OnClickListener(view -> forgetNetwork())
-                .setButton3Text(R.string.wifi_connect)
-                .setButton3Icon(R.drawable.ic_settings_wireless)
-                .setButton3OnClickListener(view -> connectNetwork())
-                .setButton3Enabled(true)
-                .setButton4Text(R.string.share)
-                .setButton4Icon(R.drawable.ic_qrcode_24dp)
-                .setButton4OnClickListener(view -> shareNetwork());
-        updateCaptivePortalButton();
-
-        if (isPasspointConfigurationR1Expired()) {
-            // Hide Connect button.
-            mButtonsPref.setButton3Visible(false);
-        }
-
-        mSignalStrengthPref = screen.findPreference(KEY_SIGNAL_STRENGTH_PREF);
-        mTxLinkSpeedPref = screen.findPreference(KEY_TX_LINK_SPEED);
-        mRxLinkSpeedPref = screen.findPreference(KEY_RX_LINK_SPEED);
-        mFrequencyPref = screen.findPreference(KEY_FREQUENCY_PREF);
-        mSecurityPref = screen.findPreference(KEY_SECURITY_PREF);
-
-        mSsidPref = screen.findPreference(KEY_SSID_PREF);
-        mMacAddressPref = screen.findPreference(KEY_MAC_ADDRESS_PREF);
-        mIpAddressPref = screen.findPreference(KEY_IP_ADDRESS_PREF);
-        mGatewayPref = screen.findPreference(KEY_GATEWAY_PREF);
-        mSubnetPref = screen.findPreference(KEY_SUBNET_MASK_PREF);
-        mDnsPref = screen.findPreference(KEY_DNS_PREF);
-
-        mIpv6Category = screen.findPreference(KEY_IPV6_CATEGORY);
-        mIpv6AddressPref = screen.findPreference(KEY_IPV6_ADDRESSES_PREF);
-
-        mSecurityPref.setSummary(mAccessPoint.getSecurityString(/* concise */ false));
-    }
-
-    /**
-     * Update text, icon and listener of the captive portal button.
-     * @return True if the button should be shown.
-     */
-    private boolean updateCaptivePortalButton() {
-        final Uri venueInfoUrl = getCaptivePortalVenueInfoUrl();
-        if (venueInfoUrl == null) {
-            mButtonsPref.setButton2Text(R.string.wifi_sign_in_button_text)
-                    .setButton2Icon(R.drawable.ic_settings_sign_in)
-                    .setButton2OnClickListener(view -> signIntoNetwork());
-            return canSignIntoNetwork();
-        }
-
-        mButtonsPref.setButton2Text(R.string.wifi_venue_website_button_text)
-                .setButton2Icon(R.drawable.ic_settings_sign_in)
-                .setButton2OnClickListener(view -> {
-                    final Intent infoIntent = new Intent(Intent.ACTION_VIEW);
-                    infoIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    infoIntent.setData(venueInfoUrl);
-                    mContext.startActivity(infoIntent);
-                });
-        return mAccessPoint.isActive();
-    }
-
-    private Uri getCaptivePortalVenueInfoUrl() {
-        final LinkProperties lp = mLinkProperties;
-        if (lp == null) {
-            return null;
-        }
-        final CaptivePortalData data = lp.getCaptivePortalData();
-        if (data == null) {
-            return null;
-        }
-        return data.getVenueInfoUrl();
-    }
-
-    private void setupEntityHeader(PreferenceScreen screen) {
-        LayoutPreference headerPref = screen.findPreference(KEY_HEADER);
-
-        if (usingDataUsageHeader(mContext)) {
-            headerPref.setVisible(false);
-            mDataUsageSummaryPref = screen.findPreference(KEY_DATA_USAGE_HEADER);
-            mDataUsageSummaryPref.setVisible(true);
-            mSummaryHeaderController =
-                new WifiDataUsageSummaryPreferenceController(mFragment.getActivity(),
-                        mLifecycle, (PreferenceFragmentCompat) mFragment, mAccessPoint.getSsid());
-            return;
-        }
-
-        mEntityHeaderController =
-                EntityHeaderController.newInstance(
-                        mFragment.getActivity(), mFragment,
-                        headerPref.findViewById(R.id.entity_header));
-
-        ImageView iconView = headerPref.findViewById(R.id.entity_header_icon);
-
-        iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
-
-        mEntityHeaderController.setLabel(mAccessPoint.getTitle());
-    }
-
-    private String getExpiryTimeSummary() {
-        if (mLinkProperties == null || mLinkProperties.getCaptivePortalData() == null) {
-            return null;
-        }
-
-        final long expiryTimeMillis = mLinkProperties.getCaptivePortalData().getExpiryTimeMillis();
-        if (expiryTimeMillis <= 0) {
-            return null;
-        }
-        final ZonedDateTime now = mClock.now();
-        final ZonedDateTime expiryTime = ZonedDateTime.ofInstant(
-                Instant.ofEpochMilli(expiryTimeMillis),
-                now.getZone());
-
-        if (now.isAfter(expiryTime)) {
-            return null;
-        }
-
-        if (now.plusDays(2).isAfter(expiryTime)) {
-            // Expiration within 2 days: show a duration
-            return mContext.getString(R.string.wifi_time_remaining, StringUtil.formatElapsedTime(
-                    mContext,
-                    Duration.between(now, expiryTime).getSeconds() * 1000,
-                    false /* withSeconds */));
-        }
-
-        // For more than 2 days, show the expiry date
-        return mContext.getString(R.string.wifi_expiry_time,
-                DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT).format(expiryTime));
-    }
-
-    private void refreshEntityHeader() {
-        if (usingDataUsageHeader(mContext)) {
-            mSummaryHeaderController.updateState(mDataUsageSummaryPref);
-        } else {
-            String summary;
-            if (isPasspointConfigurationR1Expired()) {
-                // Not able to get summary from AccessPoint because we may lost
-                // PasspointConfiguration information after updateAccessPointFromScannedList().
-                summary = mContext.getResources().getString(
-                        com.android.settingslib.R.string.wifi_passpoint_expired);
-            } else {
-                summary = mAccessPoint.getSettingsSummary(true /* convertSavedAsDisconnected */);
-            }
-
-            mEntityHeaderController
-                    .setSummary(summary)
-                    .setSecondSummary(getExpiryTimeSummary())
-                    .setRecyclerView(mFragment.getListView(), mLifecycle)
-                    .done(mFragment.getActivity(), true /* rebind */);
-        }
-    }
-
-    private void updateNetworkInfo() {
-        mNetwork = mWifiManager.getCurrentNetwork();
-        mLinkProperties = mConnectivityManager.getLinkProperties(mNetwork);
-        mNetworkCapabilities = mConnectivityManager.getNetworkCapabilities(mNetwork);
-    }
-
-    @Override
-    public void onResume() {
-        // Ensure mNetwork is set before any callbacks above are delivered, since our
-        // NetworkCallback only looks at changes to mNetwork.
-        updateNetworkInfo();
-        refreshPage();
-        mContext.registerReceiver(mReceiver, mFilter);
-        mConnectivityManager.registerNetworkCallback(mNetworkRequest, mNetworkCallback,
-                mHandler);
-    }
-
-    @Override
-    public void onPause() {
-        mNetwork = null;
-        mLinkProperties = null;
-        mNetworkCapabilities = null;
-        mNetworkInfo = null;
-        mWifiInfo = null;
-        mContext.unregisterReceiver(mReceiver);
-        mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
-    }
-
-    private void refreshPage() {
-        if(!updateAccessPoint()) {
-            return;
-        }
-
-        Log.d(TAG, "Update UI!");
-
-        // refresh header
-        refreshEntityHeader();
-
-        // refresh Buttons
-        refreshButtons();
-
-        // Update Connection Header icon and Signal Strength Preference
-        refreshRssiViews();
-        // Frequency Pref
-        refreshFrequency();
-        // Transmit Link Speed Pref
-        refreshTxSpeed();
-        // Receive Link Speed Pref
-        refreshRxSpeed();
-        // IP related information
-        refreshIpLayerInfo();
-        // SSID Pref
-        refreshSsid();
-        // MAC Address Pref
-        refreshMacAddress();
-    }
-
-    @VisibleForTesting
-    boolean updateAccessPoint() {
-        boolean changed = false;
-        // remember mIsOutOfRange as old before updated
-        boolean oldState = mIsOutOfRange;
-        updateAccessPointFromScannedList();
-
-        if (mAccessPoint.isActive()) {
-            updateNetworkInfo();
-            mNetworkInfo = mConnectivityManager.getNetworkInfo(mNetwork);
-            mWifiInfo = mWifiManager.getConnectionInfo();
-            if (mNetwork == null || mNetworkInfo == null || mWifiInfo == null) {
-                // Once connected, can't get mNetwork immediately, return false and wait for
-                // next time to update UI. also reset {@code mIsOutOfRange}
-                mIsOutOfRange = oldState;
-                return false;
-            }
-            changed |= mAccessPoint.update(mWifiConfig, mWifiInfo, mNetworkInfo);
-        }
-
-        // signal level changed
-        changed |= mRssiSignalLevel != mAccessPoint.getLevel();
-        // In/Out of range changed
-        changed |= oldState != mIsOutOfRange;
-        // connect state changed
-        if (mConnected != mAccessPoint.isActive()) {
-            mConnected = mAccessPoint.isActive();
-            changed = true;
-            updateConnectingState(mAccessPoint.isActive() ? STATE_CONNECTED : STATE_DISCONNECTED);
-        }
-
-        return changed;
-    }
-
-    private void updateAccessPointFromScannedList() {
-        mIsOutOfRange = true;
-
-        for (AccessPoint ap : mWifiTracker.getAccessPoints()) {
-            if (mAccessPoint.matches(ap)) {
-                mAccessPoint = ap;
-                mWifiConfig = ap.getConfig();
-                mIsOutOfRange = !mAccessPoint.isReachable();
-                return;
-            }
-        }
-    }
-
-    private void exitActivity() {
-        if (DEBUG) {
-            Log.d(TAG, "Exiting the WifiNetworkDetailsPage");
-        }
-        mFragment.getActivity().finish();
-    }
-
-    private void refreshRssiViews() {
-        int signalLevel = mAccessPoint.getLevel();
-
-        // Disappears signal view if not in range. e.g. for saved networks.
-        if (mIsOutOfRange) {
-            mSignalStrengthPref.setVisible(false);
-            mRssiSignalLevel = -1;
-            return;
-        }
-
-        if (mRssiSignalLevel == signalLevel) {
-            return;
-        }
-        mRssiSignalLevel = signalLevel;
-        Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel);
-
-        if (mEntityHeaderController != null) {
-            mEntityHeaderController
-                    .setIcon(redrawIconForHeader(wifiIcon)).done(mFragment.getActivity(),
-                            true /* rebind */);
-        }
-
-        Drawable wifiIconDark = wifiIcon.getConstantState().newDrawable().mutate();
-        wifiIconDark.setTintList(Utils.getColorAttr(mContext, android.R.attr.colorControlNormal));
-        mSignalStrengthPref.setIcon(wifiIconDark);
-
-        mSignalStrengthPref.setSummary(mSignalStr[mRssiSignalLevel]);
-        mSignalStrengthPref.setVisible(true);
-    }
-
-    private Drawable redrawIconForHeader(Drawable original) {
-        final int iconSize = mContext.getResources().getDimensionPixelSize(
-                R.dimen.wifi_detail_page_header_image_size);
-        final int actualWidth = original.getMinimumWidth();
-        final int actualHeight = original.getMinimumHeight();
-
-        if ((actualWidth == iconSize && actualHeight == iconSize)
-                || !VectorDrawable.class.isInstance(original)) {
-            return original;
-        }
-
-        // clear tint list to make sure can set 87% black after enlarge
-        original.setTintList(null);
-
-        // enlarge icon size
-        final Bitmap bitmap = Utils.createBitmap(original,
-                iconSize /*width*/,
-                iconSize /*height*/);
-        Drawable newIcon = new BitmapDrawable(null /*resource*/, bitmap);
-
-        // config color for 87% black after enlarge
-        newIcon.setTintList(Utils.getColorAttr(mContext, android.R.attr.textColorPrimary));
-
-        return newIcon;
-    }
-
-    private void refreshFrequency() {
-        if (mWifiInfo == null) {
-            mFrequencyPref.setVisible(false);
-            return;
-        }
-
-        final int frequency = mWifiInfo.getFrequency();
-        String band = null;
-        if (frequency >= AccessPoint.LOWER_FREQ_24GHZ
-                && frequency < AccessPoint.HIGHER_FREQ_24GHZ) {
-            band = mContext.getResources().getString(R.string.wifi_band_24ghz);
-        } else if (frequency >= AccessPoint.LOWER_FREQ_5GHZ
-                && frequency < AccessPoint.HIGHER_FREQ_5GHZ) {
-            band = mContext.getResources().getString(R.string.wifi_band_5ghz);
-        } else {
-            Log.e(TAG, "Unexpected frequency " + frequency);
-            // Connecting state is unstable, make it disappeared if unexpected
-            if (mConnectingState == STATE_CONNECTING) {
-                mFrequencyPref.setVisible(false);
-            }
-            return;
-        }
-        mFrequencyPref.setSummary(band);
-        mFrequencyPref.setVisible(true);
-    }
-
-    private void refreshTxSpeed() {
-        if (mWifiInfo == null) {
-            mTxLinkSpeedPref.setVisible(false);
-            return;
-        }
-
-        int txLinkSpeedMbps = mWifiInfo.getTxLinkSpeedMbps();
-        mTxLinkSpeedPref.setVisible(txLinkSpeedMbps >= 0);
-        mTxLinkSpeedPref.setSummary(mContext.getString(
-                R.string.tx_link_speed, mWifiInfo.getTxLinkSpeedMbps()));
-    }
-
-    private void refreshRxSpeed() {
-        if (mWifiInfo == null) {
-            mRxLinkSpeedPref.setVisible(false);
-            return;
-        }
-
-        int rxLinkSpeedMbps = mWifiInfo.getRxLinkSpeedMbps();
-        mRxLinkSpeedPref.setVisible(rxLinkSpeedMbps >= 0);
-        mRxLinkSpeedPref.setSummary(mContext.getString(
-                R.string.rx_link_speed, mWifiInfo.getRxLinkSpeedMbps()));
-    }
-
-    private void refreshSsid() {
-        if (mAccessPoint.isPasspoint() || mAccessPoint.isOsuProvider()) {
-            mSsidPref.setVisible(true);
-            mSsidPref.setSummary(mAccessPoint.getSsidStr());
-        } else {
-            mSsidPref.setVisible(false);
-        }
-    }
-
-    private void refreshMacAddress() {
-        String macAddress = getMacAddress();
-        if (macAddress == null) {
-            mMacAddressPref.setVisible(false);
-            return;
-        }
-
-        mMacAddressPref.setVisible(true);
-        if (macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {
-            mMacAddressPref.setSummary(R.string.device_info_not_available);
-        } else {
-            mMacAddressPref.setSummary(macAddress);
-        }
-
-        // MAC Address Pref Title
-        refreshMacTitle();
-    }
-
-    private String getMacAddress() {
-        if (mWifiInfo != null) {
-            // get MAC address from connected network information
-            return mWifiInfo.getMacAddress();
-        }
-
-        // return randomized MAC address
-        if (mWifiConfig != null &&
-                mWifiConfig.macRandomizationSetting == WifiConfiguration.RANDOMIZATION_PERSISTENT) {
-            return mWifiConfig.getRandomizedMacAddress().toString();
-        }
-
-        // return device MAC address
-        final String[] macAddresses = mWifiManager.getFactoryMacAddresses();
-        if (macAddresses != null && macAddresses.length > 0) {
-            return macAddresses[0];
-        }
-
-        Log.e(TAG, "Can't get device MAC address!");
-        return null;
-    }
-
-    private void updatePreference(Preference pref, String detailText) {
-        if (!TextUtils.isEmpty(detailText)) {
-            pref.setSummary(detailText);
-            pref.setVisible(true);
-        } else {
-            pref.setVisible(false);
-        }
-    }
-
-    private void refreshButtons() {
-        // Ephemeral network won't be removed permanently, but be putted in blacklist.
-        mButtonsPref.setButton1Text(
-                mIsEphemeral ? R.string.wifi_disconnect_button_text : R.string.forget);
-
-        boolean canForgetNetwork = canForgetNetwork();
-        boolean showCaptivePortalButton = updateCaptivePortalButton();
-        boolean canConnectNetwork = canConnectNetwork() && !isPasspointConfigurationR1Expired();
-        boolean canShareNetwork = canShareNetwork();
-
-        mButtonsPref.setButton1Visible(canForgetNetwork);
-        mButtonsPref.setButton2Visible(showCaptivePortalButton);
-        mButtonsPref.setButton3Visible(canConnectNetwork);
-        mButtonsPref.setButton4Visible(canShareNetwork);
-        mButtonsPref.setVisible(canForgetNetwork
-                || showCaptivePortalButton
-                || canConnectNetwork
-                || canShareNetwork);
-    }
-
-    private boolean canConnectNetwork() {
-        // Display connect button for disconnected AP even not in the range.
-        return !mAccessPoint.isActive();
-    }
-
-    private boolean isPasspointConfigurationR1Expired() {
-        return mIsPasspointConfigurationR1 && mIsExpired;
-    }
-
-    private void refreshIpLayerInfo() {
-        // Hide IP layer info if not a connected network.
-        if (!mAccessPoint.isActive() || mNetwork == null || mLinkProperties == null) {
-            mIpAddressPref.setVisible(false);
-            mSubnetPref.setVisible(false);
-            mGatewayPref.setVisible(false);
-            mDnsPref.setVisible(false);
-            mIpv6Category.setVisible(false);
-            return;
-        }
-
-        // Find IPv4 and IPv6 addresses.
-        String ipv4Address = null;
-        String subnet = null;
-        StringJoiner ipv6Addresses = new StringJoiner("\n");
-
-        for (LinkAddress addr : mLinkProperties.getLinkAddresses()) {
-            if (addr.getAddress() instanceof Inet4Address) {
-                ipv4Address = addr.getAddress().getHostAddress();
-                subnet = ipv4PrefixLengthToSubnetMask(addr.getPrefixLength());
-            } else if (addr.getAddress() instanceof Inet6Address) {
-                ipv6Addresses.add(addr.getAddress().getHostAddress());
-            }
-        }
-
-        // Find IPv4 default gateway.
-        String gateway = null;
-        for (RouteInfo routeInfo : mLinkProperties.getRoutes()) {
-            if (routeInfo.isIPv4Default() && routeInfo.hasGateway()) {
-                gateway = routeInfo.getGateway().getHostAddress();
-                break;
-            }
-        }
-
-        // Find all (IPv4 and IPv6) DNS addresses.
-        String dnsServers = mLinkProperties.getDnsServers().stream()
-                .map(InetAddress::getHostAddress)
-                .collect(Collectors.joining("\n"));
-
-        // Update UI.
-        updatePreference(mIpAddressPref, ipv4Address);
-        updatePreference(mSubnetPref, subnet);
-        updatePreference(mGatewayPref, gateway);
-        updatePreference(mDnsPref, dnsServers);
-
-        if (ipv6Addresses.length() > 0) {
-            mIpv6AddressPref.setSummary(
-                    BidiFormatter.getInstance().unicodeWrap(ipv6Addresses.toString()));
-            mIpv6Category.setVisible(true);
-        } else {
-            mIpv6Category.setVisible(false);
-        }
-    }
-
-    private static String ipv4PrefixLengthToSubnetMask(int prefixLength) {
-        try {
-            InetAddress all = InetAddress.getByAddress(
-                    new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255});
-            return NetworkUtils.getNetworkPart(all, prefixLength).getHostAddress();
-        } catch (UnknownHostException e) {
-            return null;
-        }
-    }
-
-    /**
-     * Returns whether the network represented by this preference can be forgotten.
-     */
-    private boolean canForgetNetwork() {
-        return (mWifiInfo != null && mWifiInfo.isEphemeral()) || canModifyNetwork()
-                || mAccessPoint.isPasspoint() || mAccessPoint.isPasspointConfig();
-    }
-
-    /**
-     * Returns whether the network represented by this preference can be modified.
-     */
-    public boolean canModifyNetwork() {
-        return mWifiConfig != null && !WifiUtils.isNetworkLockedDown(mContext, mWifiConfig);
-    }
-
-    /**
-     * Returns whether the user can sign into the network represented by this preference.
-     */
-    private boolean canSignIntoNetwork() {
-        return mAccessPoint.isActive() && WifiUtils.canSignIntoNetwork(mNetworkCapabilities);
-    }
-
-    /**
-     * Returns whether the user can share the network represented by this preference with QR code.
-     */
-    private boolean canShareNetwork() {
-        return mAccessPoint.getConfig() != null &&
-                WifiDppUtils.isSupportConfiguratorQrCodeGenerator(mContext, mAccessPoint);
-    }
-
-    /**
-     * Forgets the wifi network associated with this preference.
-     */
-    private void forgetNetwork() {
-        if (mWifiInfo != null && mWifiInfo.isEphemeral()) {
-            mWifiManager.disableEphemeralNetwork(mWifiInfo.getSSID());
-        } else if (mAccessPoint.isPasspoint() || mAccessPoint.isPasspointConfig()) {
-            // Post a dialog to confirm if user really want to forget the passpoint network.
-            showConfirmForgetDialog();
-            return;
-        } else if (mWifiConfig != null) {
-            mWifiManager.forget(mWifiConfig.networkId, null /* action listener */);
-        }
-
-        mMetricsFeatureProvider.action(
-                mFragment.getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
-        mFragment.getActivity().finish();
-    }
-
-    @VisibleForTesting
-    protected void showConfirmForgetDialog() {
-        final AlertDialog dialog = new AlertDialog.Builder(mContext)
-                .setPositiveButton(R.string.forget, ((dialog1, which) -> {
-                    try {
-                        mWifiManager.removePasspointConfiguration(mAccessPoint.getPasspointFqdn());
-                    } catch (RuntimeException e) {
-                        Log.e(TAG, "Failed to remove Passpoint configuration for "
-                                + mAccessPoint.getPasspointFqdn());
-                    }
-                    mMetricsFeatureProvider.action(
-                            mFragment.getActivity(), SettingsEnums.ACTION_WIFI_FORGET);
-                    mFragment.getActivity().finish();
-                }))
-                .setNegativeButton(R.string.cancel, null /* listener */)
-                .setTitle(R.string.wifi_forget_dialog_title)
-                .setMessage(R.string.forget_passpoint_dialog_message)
-                .create();
-        dialog.show();
-    }
-
-    /**
-     * Show QR code to share the network represented by this preference.
-     */
-    private void launchWifiDppConfiguratorActivity() {
-        final Intent intent = WifiDppUtils.getConfiguratorQrCodeGeneratorIntentOrNull(mContext,
-                mWifiManager, mAccessPoint);
-
-        if (intent == null) {
-            Log.e(TAG, "Launch Wi-Fi DPP QR code generator with a wrong Wi-Fi network!");
-        } else {
-            mMetricsFeatureProvider.action(SettingsEnums.PAGE_UNKNOWN,
-                    SettingsEnums.ACTION_SETTINGS_SHARE_WIFI_QR_CODE,
-                    SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR,
-                    /* key */ null,
-                    /* value */ Integer.MIN_VALUE);
-
-            mContext.startActivity(intent);
-        }
-    }
-
-    /**
-     * Share the wifi network with QR code.
-     */
-    private void shareNetwork() {
-        WifiDppUtils.showLockScreen(mContext, () -> launchWifiDppConfiguratorActivity());
-    }
-
-    /**
-     * Sign in to the captive portal found on this wifi network associated with this preference.
-     */
-    private void signIntoNetwork() {
-        mMetricsFeatureProvider.action(
-                mFragment.getActivity(), SettingsEnums.ACTION_WIFI_SIGNIN);
-        mConnectivityManager.startCaptivePortalApp(mNetwork);
-    }
-
-    @Override
-    public void onSubmit(WifiDialog dialog) {
-        if (dialog.getController() != null) {
-            mWifiManager.save(dialog.getController().getConfig(), new WifiManager.ActionListener() {
-                @Override
-                public void onSuccess() {
-                }
-
-                @Override
-                public void onFailure(int reason) {
-                    Activity activity = mFragment.getActivity();
-                    if (activity != null) {
-                        Toast.makeText(mContext,
-                                R.string.wifi_failed_save_message,
-                                Toast.LENGTH_SHORT).show();
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * Wrapper for testing compatibility.
-     */
-    @VisibleForTesting
-    static class IconInjector {
-        private final Context mContext;
-
-        public IconInjector(Context context) {
-            mContext = context;
-        }
-
-        public Drawable getIcon(int level) {
-            return mContext.getDrawable(Utils.getWifiIconResource(level)).mutate();
-        }
-    }
-
-    @VisibleForTesting
-    static class Clock {
-        public ZonedDateTime now() {
-            return ZonedDateTime.now();
-        }
-    }
-
-    private boolean usingDataUsageHeader(Context context) {
-        return FeatureFlagUtils.isEnabled(context, FeatureFlags.WIFI_DETAILS_DATAUSAGE_HEADER);
-    }
-
-    @VisibleForTesting
-    void connectNetwork() {
-        final Activity activity = mFragment.getActivity();
-        // error handling, connected/saved network should have mWifiConfig.
-        if (mWifiConfig == null) {
-            Toast.makeText(mContext,
-                    R.string.wifi_failed_connect_message,
-                    Toast.LENGTH_SHORT).show();
-            return;
-        }
-
-        // init state before connect
-        mConnectingState = STATE_NONE;
-
-        if (mWifiManager.isWifiEnabled()) {
-            updateConnectingState(STATE_CONNECTING);
-        } else {
-            // Enable Wi-Fi automatically to connect AP
-            updateConnectingState(STATE_ENABLE_WIFI);
-        }
-    }
-
-    private void updateConnectingState(int state) {
-        final Activity activity = mFragment.getActivity();
-        Log.d(TAG, "updateConnectingState from " + mConnectingState + " to " + state);
-        switch (mConnectingState) {
-            case STATE_NONE:
-            case STATE_ENABLE_WIFI:
-                if (state == STATE_ENABLE_WIFI) {
-                    Log.d(TAG, "Turn on Wi-Fi automatically!");
-                    updateConnectedButton(STATE_ENABLE_WIFI);
-                    Toast.makeText(mContext,
-                            R.string.wifi_turned_on_message,
-                            Toast.LENGTH_SHORT).show();
-                    mWifiManager.setWifiEnabled(true);
-                    // start timer for error handling
-                    startTimer();
-                } else if (state == STATE_CONNECTING) {
-                    Log.d(TAG, "connecting...");
-                    updateConnectedButton(STATE_CONNECTING);
-                    if (mAccessPoint.isPasspoint()) {
-                        mWifiManager.connect(mWifiConfig, mConnectListener);
-                    } else {
-                        mWifiManager.connect(mWifiConfig.networkId, mConnectListener);
-                    }
-                    // start timer for error handling since framework didn't call back if failed
-                    startTimer();
-                } else if (state == STATE_ENABLE_WIFI_FAILED) {
-                    Log.e(TAG, "Wi-Fi failed to enable network!");
-                    stopTimer();
-                    // reset state
-                    state = STATE_NONE;
-                    Toast.makeText(mContext,
-                            R.string.wifi_failed_connect_message,
-                            Toast.LENGTH_SHORT).show();
-                    updateConnectedButton(STATE_ENABLE_WIFI_FAILED);
-                }
-                // Do not break here for disconnected event.
-            case STATE_CONNECTED:
-                if (state == STATE_DISCONNECTED) {
-                    Log.d(TAG, "disconnected");
-                    // reset state
-                    state = STATE_NONE;
-                    updateConnectedButton(STATE_DISCONNECTED);
-                    refreshPage();
-                    // clear for getting MAC Address from saved configuration
-                    mWifiInfo = null;
-                }
-                break;
-            case STATE_CONNECTING:
-                if (state == STATE_CONNECTED) {
-                    Log.d(TAG, "connected");
-                    stopTimer();
-                    updateConnectedButton(STATE_CONNECTED);
-                    Toast.makeText(mContext,
-                            mContext.getString(R.string.wifi_connected_to_message,
-                                    mAccessPoint.getTitle()),
-                            Toast.LENGTH_SHORT).show();
-
-                    refreshPage();
-                } else if (state == STATE_NOT_IN_RANGE) {
-                    Log.d(TAG, "AP not in range");
-                    stopTimer();
-                    // reset state
-                    state = STATE_NONE;
-                    Toast.makeText(mContext,
-                            R.string.wifi_not_in_range_message,
-                            Toast.LENGTH_SHORT).show();
-                    updateConnectedButton(STATE_NOT_IN_RANGE);
-                } else if (state == STATE_FAILED) {
-                    Log.d(TAG, "failed");
-                    stopTimer();
-                    // reset state
-                    state = STATE_NONE;
-                    Toast.makeText(mContext,
-                            R.string.wifi_failed_connect_message,
-                            Toast.LENGTH_SHORT).show();
-                    updateConnectedButton(STATE_FAILED);
-                }
-                break;
-            default:
-                Log.e(TAG, "Invalid state : " + mConnectingState);
-                // don't update invalid state
-                return;
-        }
-
-        mConnectingState = state;
-    }
-
-    private void updateConnectedButton(int state) {
-        switch (state) {
-            case STATE_ENABLE_WIFI:
-            case STATE_CONNECTING:
-                mButtonsPref.setButton3Text(R.string.wifi_connecting)
-                        .setButton3Enabled(false);
-                break;
-            case STATE_CONNECTED:
-                // init button state and set as invisible
-                mButtonsPref.setButton3Text(R.string.wifi_connect)
-                        .setButton3Icon(R.drawable.ic_settings_wireless)
-                        .setButton3Enabled(true)
-                        .setButton3Visible(false);
-                break;
-            case STATE_DISCONNECTED:
-            case STATE_NOT_IN_RANGE:
-            case STATE_FAILED:
-            case STATE_ENABLE_WIFI_FAILED:
-                if (isPasspointConfigurationR1Expired()) {
-                    // Hide Connect button.
-                    mButtonsPref.setButton3Visible(false);
-                } else {
-                    mButtonsPref.setButton3Text(R.string.wifi_connect)
-                            .setButton3Icon(R.drawable.ic_settings_wireless)
-                            .setButton3Enabled(true)
-                            .setButton3Visible(true);
-                }
-                break;
-            default:
-                Log.e(TAG, "Invalid connect button state : " + state);
-                break;
-        }
-    }
-
-    private void startTimer() {
-        if (mTimer != null) {
-            stopTimer();
-        }
-
-        mTimer = new CountDownTimer(TIMEOUT, TIMEOUT + 1) {
-            @Override
-            public void onTick(long millisUntilFinished) {
-                // Do nothing
-            }
-            @Override
-            public void onFinish() {
-                if (mFragment == null || mFragment.getActivity() == null) {
-                    Log.d(TAG, "Ignore timeout since activity not exist!");
-                    return;
-                }
-                Log.e(TAG, "Timeout for state:" + mConnectingState);
-                if (mConnectingState == STATE_ENABLE_WIFI) {
-                    updateConnectingState(STATE_ENABLE_WIFI_FAILED);
-                } else if (mConnectingState == STATE_CONNECTING) {
-                    updateAccessPointFromScannedList();
-                    if (mIsOutOfRange) {
-                        updateConnectingState(STATE_NOT_IN_RANGE);
-                    } else {
-                        updateConnectingState(STATE_FAILED);
-                    }
-                }
-            }
-        };
-        mTimer.start();
-    }
-
-    private void stopTimer() {
-        if (mTimer == null) return;
-
-        mTimer.cancel();
-        mTimer = null;
-    }
-
-    private void refreshMacTitle() {
-        if (mWifiConfig == null) {
-            return;
-        }
-
-        // For saved Passpoint network, framework doesn't have the field to keep the MAC choice
-        // persistently, so Passpoint network will always use the default value so far, which is
-        // randomized MAC address, so don't need to modify title.
-        if (mAccessPoint.isPasspoint() || mAccessPoint.isPasspointConfig()) {
-            return;
-        }
-
-        mMacAddressPref.setTitle(
-                (mWifiConfig.macRandomizationSetting
-                        == WifiConfiguration.RANDOMIZATION_PERSISTENT)
-                        ? R.string.wifi_advanced_randomized_mac_address_title
-                        : R.string.wifi_advanced_device_mac_address_title);
-
-    }
-}
diff --git a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java b/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java
deleted file mode 100644
index 0b2b47e..0000000
--- a/src/com/android/settings/wifi/details/WifiMeteredPreferenceController.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.details;
-
-import android.app.backup.BackupManager;
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.DropDownPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.wifi.WifiDialog;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-/**
- * {@link AbstractPreferenceController} that controls whether the wifi network is metered or not.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.details2.WifiMeteredPreferenceControlle2}.
- */
-public class WifiMeteredPreferenceController extends BasePreferenceController implements
-        Preference.OnPreferenceChangeListener, WifiDialog.WifiDialogListener {
-
-    private static final String KEY_WIFI_METERED = "metered";
-    private WifiConfiguration mWifiConfiguration;
-    private WifiManager mWifiManager;
-    private Preference mPreference;
-
-    public WifiMeteredPreferenceController(Context context, WifiConfiguration wifiConfiguration) {
-        super(context, KEY_WIFI_METERED);
-        mWifiConfiguration = wifiConfiguration;
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final DropDownPreference dropDownPreference = (DropDownPreference) preference;
-        final int meteredOverride = getMeteredOverride();
-        dropDownPreference.setValue(Integer.toString(meteredOverride));
-        updateSummary(dropDownPreference, meteredOverride);
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return AVAILABLE;
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (mWifiConfiguration != null) {
-            mWifiConfiguration.meteredOverride = Integer.parseInt((String) newValue);
-        }
-        mWifiManager.updateNetwork(mWifiConfiguration);
-        // Stage the backup of the SettingsProvider package which backs this up
-        BackupManager.dataChanged("com.android.providers.settings");
-        updateSummary((DropDownPreference) preference, getMeteredOverride());
-        return true;
-    }
-
-    @VisibleForTesting
-    int getMeteredOverride() {
-        if (mWifiConfiguration != null) {
-            // Wrap the meteredOverride since robolectric cannot recognize it
-            return mWifiConfiguration.meteredOverride;
-        }
-        return WifiConfiguration.METERED_OVERRIDE_NONE;
-    }
-
-    private void updateSummary(DropDownPreference preference, int meteredOverride) {
-        preference.setSummary(preference.getEntries()[meteredOverride]);
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
-    public void onSubmit(WifiDialog dialog) {
-        if (dialog.getController() != null) {
-            final WifiConfiguration newConfig = dialog.getController().getConfig();
-            if (newConfig == null || mWifiConfiguration == null) {
-                return;
-            }
-
-            if (newConfig.meteredOverride != mWifiConfiguration.meteredOverride) {
-                mWifiConfiguration = newConfig;
-                onPreferenceChange(mPreference, String.valueOf(newConfig.meteredOverride));
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
deleted file mode 100644
index 8af9a7f..0000000
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ /dev/null
@@ -1,171 +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.wifi.details;
-
-import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
-
-import android.app.Dialog;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-
-import com.android.settings.R;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.wifi.WifiConfigUiBase;
-import com.android.settings.wifi.WifiDialog;
-import com.android.settingslib.RestrictedLockUtils;
-import com.android.settingslib.RestrictedLockUtilsInternal;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.wifi.AccessPoint;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Detail page for the currently connected wifi network.
- *
- * <p>The AccessPoint should be saved to the intent Extras when launching this class via
- * {@link AccessPoint#saveWifiState(Bundle)} in order to properly render this page.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.details2.WifiNetworkDetailsFragment2}.
- */
-public class WifiNetworkDetailsFragment extends DashboardFragment implements
-        WifiDialog.WifiDialogListener {
-
-    private static final String TAG = "WifiNetworkDetailsFrg";
-
-    private AccessPoint mAccessPoint;
-    private WifiDetailPreferenceController mWifiDetailPreferenceController;
-    private List<WifiDialog.WifiDialogListener> mWifiDialogListeners = new ArrayList<>();
-
-    @Override
-    public void onAttach(Context context) {
-        mAccessPoint = new AccessPoint(context, getArguments());
-        super.onAttach(context);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.WIFI_NETWORK_DETAILS;
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.wifi_network_details_fragment;
-    }
-
-    @Override
-    public int getDialogMetricsCategory(int dialogId) {
-        if (dialogId == WIFI_DIALOG_ID) {
-            return SettingsEnums.DIALOG_WIFI_AP_EDIT;
-        }
-        return 0;
-    }
-
-    @Override
-    public Dialog onCreateDialog(int dialogId) {
-        if (getActivity() == null || mWifiDetailPreferenceController == null
-                || mAccessPoint == null) {
-            return null;
-        }
-        return WifiDialog.createModal(getActivity(), this, mAccessPoint,
-                WifiConfigUiBase.MODE_MODIFY);
-    }
-
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        MenuItem item = menu.add(0, Menu.FIRST, 0, R.string.wifi_modify);
-        item.setIcon(com.android.internal.R.drawable.ic_mode_edit);
-        item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem menuItem) {
-        switch (menuItem.getItemId()) {
-            case Menu.FIRST:
-                if (!mWifiDetailPreferenceController.canModifyNetwork()) {
-                    RestrictedLockUtils.sendShowAdminSupportDetailsIntent(getContext(),
-                            RestrictedLockUtilsInternal.getDeviceOwner(getContext()));
-                } else {
-                    showDialog(WIFI_DIALOG_ID);
-                }
-                return true;
-            default:
-                return super.onOptionsItemSelected(menuItem);
-        }
-    }
-
-    @Override
-    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
-        final List<AbstractPreferenceController> controllers = new ArrayList<>();
-        final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
-
-        mWifiDetailPreferenceController = WifiDetailPreferenceController.newInstance(
-                mAccessPoint,
-                cm,
-                context,
-                this,
-                new Handler(Looper.getMainLooper()),  // UI thread.
-                getSettingsLifecycle(),
-                context.getSystemService(WifiManager.class),
-                mMetricsFeatureProvider);
-
-        controllers.add(mWifiDetailPreferenceController);
-        controllers.add(new AddDevicePreferenceController(context).init(mAccessPoint));
-
-        final WifiMeteredPreferenceController meteredPreferenceController =
-                new WifiMeteredPreferenceController(context, mAccessPoint.getConfig());
-        controllers.add(meteredPreferenceController);
-
-        final WifiPrivacyPreferenceController privacyController =
-                new WifiPrivacyPreferenceController(context);
-        privacyController.setWifiConfiguration(mAccessPoint.getConfig());
-        privacyController.setIsEphemeral(mAccessPoint.isEphemeral());
-        privacyController.setIsPasspoint(
-                mAccessPoint.isPasspoint() || mAccessPoint.isPasspointConfig());
-        controllers.add(privacyController);
-
-        // Sets callback listener for wifi dialog.
-        mWifiDialogListeners.add(mWifiDetailPreferenceController);
-        mWifiDialogListeners.add(privacyController);
-        mWifiDialogListeners.add(meteredPreferenceController);
-
-        return controllers;
-    }
-
-    @Override
-    public void onSubmit(WifiDialog dialog) {
-        for (WifiDialog.WifiDialogListener listener : mWifiDialogListeners) {
-            listener.onSubmit(dialog);
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java b/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java
deleted file mode 100644
index 6658411..0000000
--- a/src/com/android/settings/wifi/details/WifiPrivacyPreferenceController.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.details;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.DropDownPreference;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.wifi.WifiDialog;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-/**
- * {@link AbstractPreferenceController} that controls whether the wifi network is mac randomized
- * or not.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.details2.WifiPrivacyPreferenceController2}.
- */
-public class WifiPrivacyPreferenceController extends BasePreferenceController implements
-        Preference.OnPreferenceChangeListener, WifiDialog.WifiDialogListener {
-
-    private static final String KEY_WIFI_PRIVACY = "privacy";
-    private WifiConfiguration mWifiConfiguration;
-    private WifiManager mWifiManager;
-    private boolean mIsEphemeral = false;
-    private boolean mIsPasspoint = false;
-    private Preference mPreference;
-
-    public WifiPrivacyPreferenceController(Context context) {
-        super(context, KEY_WIFI_PRIVACY);
-        mWifiConfiguration = null;
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-    }
-
-    public void setWifiConfiguration(WifiConfiguration wifiConfiguration) {
-        mWifiConfiguration = wifiConfiguration;
-    }
-
-    public void setIsEphemeral(boolean isEphemeral) {
-        mIsEphemeral = isEphemeral;
-    }
-
-    public void setIsPasspoint(boolean isPasspoint) {
-        mIsPasspoint = isPasspoint;
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        return mWifiManager.isConnectedMacRandomizationSupported()
-                ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        mPreference = screen.findPreference(getPreferenceKey());
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final DropDownPreference dropDownPreference = (DropDownPreference) preference;
-        final int randomizationLevel = getRandomizationValue();
-        dropDownPreference.setValue(Integer.toString(randomizationLevel));
-        updateSummary(dropDownPreference, randomizationLevel);
-
-        // Makes preference not selectable, when this is a ephemeral network.
-        if (mIsEphemeral || mIsPasspoint) {
-            preference.setSelectable(false);
-            dropDownPreference.setSummary(R.string.wifi_privacy_settings_ephemeral_summary);
-        }
-    }
-
-    @Override
-    public boolean onPreferenceChange(Preference preference, Object newValue) {
-        if (mWifiConfiguration != null) {
-            mWifiConfiguration.macRandomizationSetting = Integer.parseInt((String) newValue);
-            mWifiManager.updateNetwork(mWifiConfiguration);
-
-            // To activate changing, we need to reconnect network. WiFi will auto connect to
-            // current network after disconnect(). Only needed when this is connected network.
-            final WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
-            if (wifiInfo != null && wifiInfo.getNetworkId() == mWifiConfiguration.networkId) {
-                mWifiManager.disconnect();
-            }
-        }
-        updateSummary((DropDownPreference) preference, Integer.parseInt((String) newValue));
-        return true;
-    }
-
-    @VisibleForTesting
-    int getRandomizationValue() {
-        if (mWifiConfiguration != null) {
-            return mWifiConfiguration.macRandomizationSetting;
-        }
-        return WifiConfiguration.RANDOMIZATION_PERSISTENT;
-    }
-
-    private static final int PREF_RANDOMIZATION_PERSISTENT = 0;
-    private static final int PREF_RANDOMIZATION_NONE = 1;
-
-    /**
-     * Returns preference index value.
-     *
-     * @param macRandomized is mac randomized value
-     * @return index value of preference
-     */
-    public static int translateMacRandomizedValueToPrefValue(int macRandomized) {
-        return (macRandomized == WifiConfiguration.RANDOMIZATION_PERSISTENT)
-            ? PREF_RANDOMIZATION_PERSISTENT : PREF_RANDOMIZATION_NONE;
-    }
-
-    /**
-     * Returns mac randomized value.
-     *
-     * @param prefMacRandomized is preference index value
-     * @return mac randomized value
-     */
-    public static int translatePrefValueToMacRandomizedValue(int prefMacRandomized) {
-        return (prefMacRandomized == PREF_RANDOMIZATION_PERSISTENT)
-            ? WifiConfiguration.RANDOMIZATION_PERSISTENT : WifiConfiguration.RANDOMIZATION_NONE;
-    }
-
-    private void updateSummary(DropDownPreference preference, int macRandomized) {
-        // Translates value here to set RANDOMIZATION_PERSISTENT as first item in UI for better UX.
-        final int prefMacRandomized = translateMacRandomizedValueToPrefValue(macRandomized);
-        preference.setSummary(preference.getEntries()[prefMacRandomized]);
-    }
-
-    @Override
-    public void onSubmit(WifiDialog dialog) {
-        if (dialog.getController() != null) {
-            final WifiConfiguration newConfig = dialog.getController().getConfig();
-            if (newConfig == null || mWifiConfiguration == null) {
-                return;
-            }
-
-            if (newConfig.macRandomizationSetting != mWifiConfiguration.macRandomizationSetting) {
-                mWifiConfiguration = newConfig;
-                onPreferenceChange(mPreference, String.valueOf(newConfig.macRandomizationSetting));
-            }
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
index 5c48dfd..a2b143e 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -23,8 +23,10 @@
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.settings.SettingsEnums;
+import android.content.AsyncQueryHandler;
 import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
@@ -41,9 +43,14 @@
 import android.net.NetworkUtils;
 import android.net.RouteInfo;
 import android.net.Uri;
+import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
+import android.provider.Telephony.CarrierId;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.FeatureFlagUtils;
 import android.util.Log;
@@ -65,7 +72,6 @@
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settings.wifi.WifiDialog2;
 import com.android.settings.wifi.WifiDialog2.WifiDialog2Listener;
-import com.android.settings.wifi.WifiEntryShell;
 import com.android.settings.wifi.WifiUtils;
 import com.android.settings.wifi.dpp.WifiDppUtils;
 import com.android.settingslib.core.AbstractPreferenceController;
@@ -98,6 +104,7 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.FormatStyle;
+import java.util.List;
 import java.util.StringJoiner;
 import java.util.stream.Collectors;
 
@@ -133,6 +140,8 @@
     @VisibleForTesting
     static final String KEY_SSID_PREF = "ssid";
     @VisibleForTesting
+    static final String KEY_EAP_SIM_SUBSCRIPTION_PREF = "eap_sim_subscription";
+    @VisibleForTesting
     static final String KEY_MAC_ADDRESS_PREF = "mac_address";
     @VisibleForTesting
     static final String KEY_IP_ADDRESS_PREF = "ip_address";
@@ -156,6 +165,7 @@
     private NetworkInfo mNetworkInfo;
     private NetworkCapabilities mNetworkCapabilities;
     private int mRssiSignalLevel = -1;
+    @VisibleForTesting boolean mShowX; // Shows the Wi-Fi signal icon of Pie+x when it's true.
     private String[] mSignalStr;
     private WifiInfo mWifiInfo;
     private final WifiManager mWifiManager;
@@ -170,6 +180,7 @@
     private Preference mFrequencyPref;
     private Preference mSecurityPref;
     private Preference mSsidPref;
+    private Preference mEapSimSubscriptionPref;
     private Preference mMacAddressPref;
     private Preference mIpAddressPref;
     private Preference mGatewayPref;
@@ -187,6 +198,35 @@
     private final NetworkRequest mNetworkRequest = new NetworkRequest.Builder()
             .clearCapabilities().addTransportType(TRANSPORT_WIFI).build();
 
+    private CarrierIdAsyncQueryHandler mCarrierIdAsyncQueryHandler;
+    private static final int TOKEN_QUERY_CARRIER_ID_AND_UPDATE_SIM_SUMMARY = 1;
+    private static final int COLUMN_CARRIER_NAME = 0;
+
+    private class CarrierIdAsyncQueryHandler extends AsyncQueryHandler {
+
+        private CarrierIdAsyncQueryHandler(Context context) {
+            super(context.getContentResolver());
+        }
+
+        @Override
+        protected void onQueryComplete(int token, Object cookie, Cursor cursor) {
+            if (token == TOKEN_QUERY_CARRIER_ID_AND_UPDATE_SIM_SUMMARY) {
+                if (mContext == null || cursor == null || !cursor.moveToFirst()) {
+                    if (cursor != null) {
+                        cursor.close();
+                    }
+                    mEapSimSubscriptionPref.setSummary(R.string.wifi_require_sim_card_to_connect);
+                    return;
+                }
+                mEapSimSubscriptionPref.setSummary(mContext.getString(
+                        R.string.wifi_require_specific_sim_card_to_connect,
+                        cursor.getString(COLUMN_CARRIER_NAME)));
+                cursor.close();
+                return;
+            }
+        }
+    }
+
     // Must be run on the UI thread since it directly manipulates UI state.
     private final NetworkCallback mNetworkCallback = new NetworkCallback() {
         @Override
@@ -336,6 +376,7 @@
         mSecurityPref = screen.findPreference(KEY_SECURITY_PREF);
 
         mSsidPref = screen.findPreference(KEY_SSID_PREF);
+        mEapSimSubscriptionPref = screen.findPreference(KEY_EAP_SIM_SUBSCRIPTION_PREF);
         mMacAddressPref = screen.findPreference(KEY_MAC_ADDRESS_PREF);
         mIpAddressPref = screen.findPreference(KEY_IP_ADDRESS_PREF);
         mGatewayPref = screen.findPreference(KEY_GATEWAY_PREF);
@@ -507,12 +548,14 @@
         refreshIpLayerInfo();
         // SSID Pref
         refreshSsid();
+        // EAP SIM subscription
+        refreshEapSimSubscription();
         // MAC Address Pref
         refreshMacAddress();
     }
 
     private void refreshRssiViews() {
-        int signalLevel = mWifiEntry.getLevel();
+        final int signalLevel = mWifiEntry.getLevel();
 
         // Disappears signal view if not in range. e.g. for saved networks.
         if (signalLevel == WifiEntry.WIFI_LEVEL_UNREACHABLE) {
@@ -521,11 +564,14 @@
             return;
         }
 
-        if (mRssiSignalLevel == signalLevel) {
+        final boolean showX = mWifiEntry.shouldShowXLevelIcon();
+
+        if (mRssiSignalLevel == signalLevel && mShowX == showX) {
             return;
         }
         mRssiSignalLevel = signalLevel;
-        Drawable wifiIcon = mIconInjector.getIcon(mRssiSignalLevel);
+        mShowX = showX;
+        Drawable wifiIcon = mIconInjector.getIcon(mShowX, mRssiSignalLevel);
 
         if (mEntityHeaderController != null) {
             mEntityHeaderController
@@ -576,11 +622,9 @@
 
         final int frequency = connectedInfo.frequencyMhz;
         String band = null;
-        if (frequency >= WifiEntryShell.LOWER_FREQ_24GHZ
-                && frequency < WifiEntryShell.HIGHER_FREQ_24GHZ) {
+        if (frequency >= WifiEntry.MIN_FREQ_24GHZ && frequency < WifiEntry.MAX_FREQ_24GHZ) {
             band = mContext.getResources().getString(R.string.wifi_band_24ghz);
-        } else if (frequency >= WifiEntryShell.LOWER_FREQ_5GHZ
-                && frequency < WifiEntryShell.HIGHER_FREQ_5GHZ) {
+        } else if (frequency >= WifiEntry.MIN_FREQ_5GHZ && frequency < WifiEntry.MAX_FREQ_5GHZ) {
             band = mContext.getResources().getString(R.string.wifi_band_5ghz);
         } else {
             // Connecting state is unstable, make it disappeared if unexpected
@@ -630,6 +674,62 @@
         }
     }
 
+    private void refreshEapSimSubscription() {
+        mEapSimSubscriptionPref.setVisible(false);
+
+        if (mWifiEntry.getSecurity() != WifiEntry.SECURITY_EAP) {
+            return;
+        }
+        final WifiConfiguration config = mWifiEntry.getWifiConfiguration();
+        if (config == null || config.enterpriseConfig == null) {
+            return;
+        }
+        if (!config.enterpriseConfig.isAuthenticationSimBased()) {
+            return;
+        }
+
+        mEapSimSubscriptionPref.setVisible(true);
+
+        // Checks if the SIM subscription is active.
+        final List<SubscriptionInfo> activeSubscriptionInfos = mContext
+                .getSystemService(SubscriptionManager.class).getActiveSubscriptionInfoList();
+        final int defaultDataSubscriptionId = SubscriptionManager.getDefaultDataSubscriptionId();
+        if (activeSubscriptionInfos != null) {
+            for (SubscriptionInfo subscriptionInfo : activeSubscriptionInfos) {
+                if (config.carrierId == subscriptionInfo.getCarrierId()) {
+                    mEapSimSubscriptionPref.setSummary(subscriptionInfo.getDisplayName());
+                    return;
+                }
+
+                // When it's UNKNOWN_CARRIER_ID, devices connects it with the SIM subscription of
+                // defaultDataSubscriptionId.
+                if (config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID
+                        && defaultDataSubscriptionId == subscriptionInfo.getSubscriptionId()) {
+                    mEapSimSubscriptionPref.setSummary(subscriptionInfo.getDisplayName());
+                    return;
+                }
+            }
+        }
+
+        if (config.carrierId == TelephonyManager.UNKNOWN_CARRIER_ID) {
+            mEapSimSubscriptionPref.setSummary(R.string.wifi_no_related_sim_card);
+            return;
+        }
+
+        // The Wi-Fi network has specified carrier id, query carrier name from CarrierIdProvider.
+        if (mCarrierIdAsyncQueryHandler == null) {
+            mCarrierIdAsyncQueryHandler = new CarrierIdAsyncQueryHandler(mContext);
+        }
+        mCarrierIdAsyncQueryHandler.cancelOperation(TOKEN_QUERY_CARRIER_ID_AND_UPDATE_SIM_SUMMARY);
+        mCarrierIdAsyncQueryHandler.startQuery(TOKEN_QUERY_CARRIER_ID_AND_UPDATE_SIM_SUMMARY,
+                null /* cookie */,
+                CarrierId.All.CONTENT_URI,
+                new String[]{CarrierId.CARRIER_NAME},
+                CarrierId.CARRIER_ID + "=?",
+                new String[] {Integer.toString(config.carrierId)},
+                null /* orderBy */);
+    }
+
     private void refreshMacAddress() {
         final String macAddress = mWifiEntry.getMacAddress();
         if (TextUtils.isEmpty(macAddress)) {
@@ -638,10 +738,7 @@
         }
 
         mMacAddressPref.setVisible(true);
-
-        mMacAddressPref.setTitle((mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC)
-                ? R.string.wifi_advanced_randomized_mac_address_title
-                : R.string.wifi_advanced_device_mac_address_title);
+        mMacAddressPref.setTitle(getMacAddressTitle());
 
         if (macAddress.equals(WifiInfo.DEFAULT_MAC_ADDRESS)) {
             mMacAddressPref.setSummary(R.string.device_info_not_available);
@@ -650,6 +747,15 @@
         }
     }
 
+    private int getMacAddressTitle() {
+        if (mWifiEntry.getPrivacy() == WifiEntry.PRIVACY_RANDOMIZED_MAC) {
+            return mWifiEntry.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED
+                    ? R.string.wifi_advanced_randomized_mac_address_title
+                    : R.string.wifi_advanced_randomized_mac_address_disconnected_title;
+        }
+        return R.string.wifi_advanced_device_mac_address_title;
+    }
+
     private void updatePreference(Preference pref, String detailText) {
         if (!TextUtils.isEmpty(detailText)) {
             pref.setSummary(detailText);
@@ -907,8 +1013,8 @@
             mContext = context;
         }
 
-        public Drawable getIcon(int level) {
-            return mContext.getDrawable(Utils.getWifiIconResource(level)).mutate();
+        public Drawable getIcon(boolean showX, int level) {
+            return mContext.getDrawable(Utils.getWifiIconResource(showX, level)).mutate();
         }
     }
 
diff --git a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
index 76a8c5f..b154a9b 100644
--- a/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
+++ b/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2.java
@@ -22,7 +22,6 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.NetworkScoreManager;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -36,11 +35,13 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.WifiConfigUiBase2;
 import com.android.settings.wifi.WifiDialog2;
 import com.android.settingslib.RestrictedLockUtils;
@@ -78,7 +79,8 @@
     private HandlerThread mWorkerThread;
     private WifiDetailPreferenceController2 mWifiDetailPreferenceController2;
     private List<WifiDialog2.WifiDialog2Listener> mWifiDialogListeners = new ArrayList<>();
-    private List<AbstractPreferenceController> mControllers;
+    @VisibleForTesting
+    List<AbstractPreferenceController> mControllers;
 
     @Override
     public void onDestroy() {
@@ -237,24 +239,28 @@
             }
         };
 
-        mNetworkDetailsTracker = NetworkDetailsTracker.createNetworkDetailsTracker(
-                getSettingsLifecycle(),
-                context,
-                context.getSystemService(WifiManager.class),
-                context.getSystemService(ConnectivityManager.class),
-                context.getSystemService(NetworkScoreManager.class),
-                new Handler(Looper.getMainLooper()),
-                mWorkerThread.getThreadHandler(),
-                elapsedRealtimeClock,
-                MAX_SCAN_AGE_MILLIS,
-                SCAN_INTERVAL_MILLIS,
-                getArguments().getString(KEY_CHOSEN_WIFIENTRY_KEY));
+        mNetworkDetailsTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createNetworkDetailsTracker(
+                        getSettingsLifecycle(),
+                        context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        getArguments().getString(KEY_CHOSEN_WIFIENTRY_KEY));
     }
 
     /**
      * API call for refreshing the preferences in this fragment.
      */
     public void refreshPreferences() {
+        updatePreferenceStates();
+        displayPreferenceControllers();
+    }
+
+    protected void displayPreferenceControllers() {
         final PreferenceScreen screen = getPreferenceScreen();
         for (AbstractPreferenceController controller : mControllers) {
             // WifiDetailPreferenceController2 gets the callback WifiEntryCallback#onUpdated,
diff --git a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
index a0d4b16..d6e1b60 100644
--- a/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2.java
@@ -69,12 +69,13 @@
     public void updateState(Preference preference) {
         final DropDownPreference dropDownPreference = (DropDownPreference) preference;
         final int randomizationLevel = getRandomizationValue();
+        final boolean isSelectable = mWifiEntry.canSetPrivacy();
+        preference.setSelectable(isSelectable);
         dropDownPreference.setValue(Integer.toString(randomizationLevel));
         updateSummary(dropDownPreference, randomizationLevel);
 
-        // Makes preference not selectable, when this is a ephemeral network.
-        if (!mWifiEntry.canSetPrivacy()) {
-            preference.setSelectable(false);
+        // If the preference cannot be selectable, display a temporary network in the summary.
+        if (!isSelectable) {
             dropDownPreference.setSummary(R.string.wifi_privacy_settings_ephemeral_summary);
         }
     }
diff --git a/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
index a7daee6..499f66c 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppBaseActivity.java
@@ -45,8 +45,8 @@
 
     @Override
     protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
-        resid = SetupWizardUtils.getTheme(getIntent());
+        final int new_resid = SetupWizardUtils.getTheme(this, getIntent());
         theme.applyStyle(R.style.SetupWizardPartnerResource, /* force */ true);
-        super.onApplyThemeResource(theme, resid, first);
+        super.onApplyThemeResource(theme, new_resid, first);
     }
 }
diff --git a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
index b19e3b8..6659c7a 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivity.java
@@ -88,9 +88,6 @@
      */
     private int[] mWifiDppRemoteBandSupport;
 
-    /** Secret extra that allows fake networks to show in UI for testing purposes */
-    private boolean mIsTest;
-
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
@@ -149,7 +146,6 @@
             case Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_URI:
                 final Uri uri = intent.getData();
                 final String uriString = (uri == null) ? null : uri.toString();
-                mIsTest = intent.getBooleanExtra(WifiDppUtils.EXTRA_TEST, false);
                 mWifiDppQrCode = WifiQrCode.getValidWifiDppQrCodeOrNull(uriString);
                 mWifiDppRemoteBandSupport = intent.getIntArrayExtra(
                         Settings.EXTRA_EASY_CONNECT_BAND_LIST); // returns null if none
@@ -239,11 +235,6 @@
 
         if (fragment == null) {
             fragment = new WifiDppChooseSavedWifiNetworkFragment();
-            if (mIsTest) {
-                Bundle bundle = new Bundle();
-                bundle.putBoolean(WifiDppUtils.EXTRA_TEST, true);
-                fragment.setArguments(bundle);
-            }
         } else {
             if (fragment.isVisible()) {
                 return;
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
index 603ea10..aa67bde 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragment.java
@@ -16,9 +16,17 @@
 
 package com.android.settings.wifi.dpp;
 
+import android.annotation.Nullable;
 import android.app.settings.SettingsEnums;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -27,9 +35,13 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.android.internal.annotations.VisibleForTesting;
+import com.android.internal.app.chooser.DisplayResolveInfo;
+import com.android.internal.app.chooser.TargetInfo;
 import com.android.settings.R;
 import com.android.settings.wifi.qrcode.QrCodeGenerator;
 
@@ -45,6 +57,15 @@
     private ImageView mQrCodeView;
     private String mQrCode;
 
+    private static final String CHIP_LABEL_METADATA_KEY = "android.service.chooser.chip_label";
+    private static final String CHIP_ICON_METADATA_KEY = "android.service.chooser.chip_icon";
+    private static final String EXTRA_WIFI_CREDENTIALS_BUNDLE =
+            "android.intent.extra.WIFI_CREDENTIALS_BUNDLE";
+    private static final String EXTRA_SSID = "android.intent.extra.SSID";
+    private static final String EXTRA_PASSWORD = "android.intent.extra.PASSWORD";
+    private static final String EXTRA_SECURITY_TYPE = "android.intent.extra.SECURITY_TYPE";
+    private static final String EXTRA_HIDDEN_SSID = "android.intent.extra.HIDDEN_SSID";
+
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
@@ -56,10 +77,12 @@
 
         // setTitle for TalkBack
         final WifiNetworkConfig wifiNetworkConfig = getWifiNetworkConfigFromHostActivity();
-        if (wifiNetworkConfig.isHotspot()) {
-            getActivity().setTitle(R.string.wifi_dpp_share_hotspot);
-        } else {
-            getActivity().setTitle(R.string.wifi_dpp_share_wifi);
+        if (getActivity() != null) {
+            if (wifiNetworkConfig.isHotspot()) {
+                getActivity().setTitle(R.string.wifi_dpp_share_hotspot);
+            } else {
+                getActivity().setTitle(R.string.wifi_dpp_share_wifi);
+            }
         }
     }
 
@@ -112,10 +135,127 @@
             }
         }
 
+        final Intent intent = new Intent().setComponent(getNearbySharingComponent());
+        addActionButton(view.findViewById(R.id.wifi_dpp_layout), createNearbyButton(intent, v -> {
+            intent.setAction(Intent.ACTION_SEND);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+            Bundle wifiCredentialBundle = new Bundle();
+
+            String ssid = WifiDppUtils.removeFirstAndLastDoubleQuotes(wifiNetworkConfig.getSsid());
+
+            String passwordExtra = wifiNetworkConfig.getPreSharedKey();
+            String securityType = wifiNetworkConfig.getSecurity();
+            boolean hiddenSsid = wifiNetworkConfig.getHiddenSsid();
+
+            wifiCredentialBundle.putString(EXTRA_SSID, ssid);
+            wifiCredentialBundle.putString(EXTRA_PASSWORD, passwordExtra);
+            wifiCredentialBundle.putString(EXTRA_SECURITY_TYPE, securityType);
+            wifiCredentialBundle.putBoolean(EXTRA_HIDDEN_SSID, hiddenSsid);
+
+            intent.putExtra(EXTRA_WIFI_CREDENTIALS_BUNDLE, wifiCredentialBundle);
+            startActivity(intent);
+        }));
+
         mQrCode = wifiNetworkConfig.getQrCode();
         setQrCode();
     }
 
+    @VisibleForTesting ComponentName getNearbySharingComponent() {
+        String nearbyComponent = Settings.Secure.getString(
+                getContext().getContentResolver(),
+                Settings.Secure.NEARBY_SHARING_COMPONENT);
+        if (TextUtils.isEmpty(nearbyComponent)) {
+            nearbyComponent = getString(
+                    com.android.internal.R.string.config_defaultNearbySharingComponent);
+        }
+        if (TextUtils.isEmpty(nearbyComponent)) {
+            return null;
+        }
+        return ComponentName.unflattenFromString(nearbyComponent);
+    }
+
+    private TargetInfo getNearbySharingTarget(Intent originalIntent) {
+        final ComponentName cn = getNearbySharingComponent();
+        if (cn == null) return null;
+
+        final Intent resolveIntent = new Intent(originalIntent);
+        resolveIntent.setComponent(cn);
+        PackageManager pm = getContext().getPackageManager();
+        final ResolveInfo resolveInfo = pm.resolveActivity(
+                resolveIntent, PackageManager.GET_META_DATA);
+        if (resolveInfo == null || resolveInfo.activityInfo == null) {
+            Log.e(TAG, "Device-specified nearby sharing component (" + cn
+                    + ") not available");
+            return null;
+        }
+
+        // Allow the nearby sharing component to provide a more appropriate icon and label
+        // for the chip.
+        CharSequence name = null;
+        Drawable icon = null;
+        final Bundle metaData = resolveInfo.activityInfo.metaData;
+        if (metaData != null) {
+            try {
+                final Resources pkgRes = pm.getResourcesForActivity(cn);
+                final int nameResId = metaData.getInt(CHIP_LABEL_METADATA_KEY);
+                name = pkgRes.getString(nameResId);
+                final int resId = metaData.getInt(CHIP_ICON_METADATA_KEY);
+                icon = pkgRes.getDrawable(resId);
+            } catch (Resources.NotFoundException ex) {
+            } catch (PackageManager.NameNotFoundException ex) {
+            }
+        }
+        if (TextUtils.isEmpty(name)) {
+            name = resolveInfo.loadLabel(pm);
+        }
+        if (icon == null) {
+            icon = resolveInfo.loadIcon(pm);
+        }
+
+        final DisplayResolveInfo dri = new DisplayResolveInfo(
+                originalIntent, resolveInfo, name, "", resolveIntent, null);
+        dri.setDisplayIcon(icon);
+        return dri;
+    }
+
+    private Button createActionButton(Drawable icon, CharSequence title, View.OnClickListener r) {
+        Button b = (Button) LayoutInflater.from(getContext()).inflate(
+                com.android.internal.R.layout.chooser_action_button, null);
+        if (icon != null) {
+            final int size = getResources()
+                    .getDimensionPixelSize(
+                            com.android.internal.R.dimen.chooser_action_button_icon_size);
+            icon.setBounds(0, 0, size, size);
+            b.setCompoundDrawablesRelative(icon, null, null, null);
+        }
+        b.setText(title);
+        b.setOnClickListener(r);
+        return b;
+    }
+
+    private void addActionButton(ViewGroup parent, Button b) {
+        if (b == null) return;
+        final ViewGroup.MarginLayoutParams lp = new ViewGroup.MarginLayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT
+        );
+        final int gap = getResources().getDimensionPixelSize(
+                com.android.internal.R.dimen.resolver_icon_margin) / 2;
+        lp.setMarginsRelative(gap, 0, gap, 0);
+        parent.addView(b, lp);
+    }
+
+    @VisibleForTesting
+    @Nullable
+    Button createNearbyButton(Intent originalIntent, View.OnClickListener r) {
+        final TargetInfo ti = getNearbySharingTarget(originalIntent);
+        if (ti == null) return null;
+
+        return createActionButton(ti.getDisplayIcon(getContext()), ti.getDisplayLabel(), r);
+    }
+
     private void setQrCode() {
         try {
             final int qrcodeSize = getContext().getResources().getDimensionPixelSize(
diff --git a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
index b3bd9c6..5c80024 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragment.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.wifi.dpp;
 
+import static android.net.wifi.WifiInfo.sanitizeSsid;
+
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
@@ -28,7 +30,12 @@
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
 import android.os.Message;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Size;
@@ -48,21 +55,20 @@
 import androidx.lifecycle.ViewModelProviders;
 
 import com.android.settings.R;
-import com.android.settings.wifi.WifiDialogActivity;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.wifi.qrcode.QrCamera;
 import com.android.settings.wifi.qrcode.QrDecorateView;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
+import java.time.Clock;
+import java.time.ZoneOffset;
 import java.util.List;
 
 public class WifiDppQrCodeScannerFragment extends WifiDppQrCodeBaseFragment implements
         SurfaceTextureListener,
         QrCamera.ScannerCallback,
-        WifiManager.ActionListener,
-        WifiTracker.WifiListener {
+        WifiManager.ActionListener {
     private static final String TAG = "WifiDppQrCodeScanner";
 
     /** Message sent to hide error message */
@@ -83,10 +89,15 @@
     // Key for Bundle usage
     private static final String KEY_IS_CONFIGURATOR_MODE = "key_is_configurator_mode";
     private static final String KEY_LATEST_ERROR_CODE = "key_latest_error_code";
-    private static final String KEY_WIFI_CONFIGURATION = "key_wifi_configuration";
+    public static final String KEY_WIFI_CONFIGURATION = "key_wifi_configuration";
 
     private static final int ARG_RESTART_CAMERA = 1;
 
+    // Max age of tracked WifiEntries.
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating WifiPickerTracker scans.
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+
     private QrCamera mCamera;
     private TextureView mTextureView;
     private QrDecorateView mDecorateView;
@@ -106,7 +117,8 @@
 
     private int mLatestStatusCode = WifiDppUtils.EASY_CONNECT_EVENT_FAILURE_NONE;
 
-    private WifiTracker mWifiTracker;
+    private WifiPickerTracker mWifiPickerTracker;
+    private HandlerThread mWorkerThread;
 
     private final Handler mHandler = new Handler() {
         @Override
@@ -219,11 +231,27 @@
     }
 
     private boolean isReachableWifiNetwork(WifiConfiguration wifiConfiguration) {
-        final List<AccessPoint> scannedAccessPoints = mWifiTracker.getAccessPoints();
+        final List<WifiEntry> wifiEntries = mWifiPickerTracker.getWifiEntries();
+        final WifiEntry connectedWifiEntry = mWifiPickerTracker.getConnectedWifiEntry();
+        if (connectedWifiEntry != null) {
+            // Add connected WifiEntry to prevent fail toast to users when it's connected.
+            wifiEntries.add(connectedWifiEntry);
+        }
 
-        for (AccessPoint scannedAccessPoint : scannedAccessPoints) {
-            if (scannedAccessPoint.matches(wifiConfiguration) &&
-                    scannedAccessPoint.isReachable()) {
+        for (WifiEntry wifiEntry : wifiEntries) {
+            if (!TextUtils.equals(wifiEntry.getSsid(), sanitizeSsid(wifiConfiguration.SSID))) {
+                continue;
+            }
+            final int security =
+                    WifiDppUtils.getSecurityTypeFromWifiConfiguration(wifiConfiguration);
+            if (security == wifiEntry.getSecurity()) {
+                return true;
+            }
+
+            // Default security type of PSK/SAE transition mode WifiEntry is SECURITY_PSK and
+            // there is no way to know if a WifiEntry is of transition mode. Give it a chance.
+            if (security == WifiEntry.SECURITY_SAE
+                    && wifiEntry.getSecurity() == WifiEntry.SECURITY_PSK) {
                 return true;
             }
         }
@@ -323,8 +351,26 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mWifiTracker = WifiTrackerFactory.create(getActivity(), /* wifiListener */ this,
-                getSettingsLifecycle(), /* includeSaved */ false, /* includeScans */ true);
+        mWorkerThread = new HandlerThread(
+                TAG + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+            @Override
+            public long millis() {
+                return SystemClock.elapsedRealtime();
+            }
+        };
+        final Context context = getContext();
+        mWifiPickerTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(getSettingsLifecycle(), context,
+                        new Handler(Looper.getMainLooper()),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        null /* listener */);
 
         // setTitle for TalkBack
         if (mIsConfiguratorMode) {
@@ -349,6 +395,13 @@
     }
 
     @Override
+    public void onDestroyView() {
+        mWorkerThread.quit();
+
+        super.onDestroyView();
+    }
+
+    @Override
     public final View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
         return inflater.inflate(R.layout.wifi_dpp_qrcode_scanner_fragment, container,
@@ -633,8 +686,7 @@
     @Override
     public void onSuccess() {
         final Intent resultIntent = new Intent();
-        resultIntent.putExtra(WifiDialogActivity.KEY_WIFI_CONFIGURATION,
-                mEnrolleeWifiConfiguration);
+        resultIntent.putExtra(KEY_WIFI_CONFIGURATION, mEnrolleeWifiConfiguration);
 
         final Activity hostActivity = getActivity();
         hostActivity.setResult(Activity.RESULT_OK, resultIntent);
@@ -690,27 +742,6 @@
         }
     }
 
-    /** Called when the state of Wifi has changed. */
-    @Override
-    public void onWifiStateChanged(int state) {
-        // Do nothing.
-    }
-
-    /** Called when the connection state of wifi has changed. */
-    @Override
-    public void onConnectedChanged() {
-        // Do nothing.
-    }
-
-    /**
-     * Called to indicate the list of AccessPoints has been updated and
-     * getAccessPoints should be called to get the latest information.
-     */
-    @Override
-    public void onAccessPointsChanged() {
-        // Do nothing.
-    }
-
     @VisibleForTesting
     protected boolean isDecodeTaskAlive() {
         return mCamera != null && mCamera.isDecodeTaskAlive();
diff --git a/src/com/android/settings/wifi/dpp/WifiDppUtils.java b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
index 7a502c9..2957e1f 100644
--- a/src/com/android/settings/wifi/dpp/WifiDppUtils.java
+++ b/src/com/android/settings/wifi/dpp/WifiDppUtils.java
@@ -65,7 +65,7 @@
      */
     static final String TAG_FRAGMENT_ADD_DEVICE = "add_device_fragment";
 
-    /** The data is from {@code com.android.settingslib.wifi.AccessPoint.securityToString} */
+    /** The data is one of the static String SECURITY_* in {@link WifiQrCode} */
     static final String EXTRA_WIFI_SECURITY = "security";
 
     /** The data corresponding to {@code WifiConfiguration} SSID */
@@ -83,10 +83,6 @@
     /** The data to recognize if it's a Wi-Fi hotspot for configuration */
     static final String EXTRA_IS_HOTSPOT = "isHotspot";
 
-    /** Used by {@link android.provider.Settings#ACTION_PROCESS_WIFI_EASY_CONNECT_URI} to
-     * indicate test mode UI should be shown. Test UI does not make API calls. Value is a boolean.*/
-    static final String EXTRA_TEST = "test";
-
     /**
      * Default status code for Easy Connect
      */
@@ -149,7 +145,7 @@
         return wifiConfiguration.preSharedKey;
     }
 
-    private static String removeFirstAndLastDoubleQuotes(String str) {
+    static String removeFirstAndLastDoubleQuotes(String str) {
         if (TextUtils.isEmpty(str)) {
             return str;
         }
@@ -261,36 +257,6 @@
      *
      * @param context     The context to use for the content resolver
      * @param wifiManager An instance of {@link WifiManager}
-     * @param accessPoint An instance of {@link AccessPoint}
-     * @return Intent for launching QR code scanner
-     */
-    public static Intent getConfiguratorQrCodeScannerIntentOrNull(Context context,
-            WifiManager wifiManager, AccessPoint accessPoint) {
-        final Intent intent = new Intent(context, WifiDppConfiguratorActivity.class);
-        if (isSupportConfiguratorQrCodeScanner(context, accessPoint)) {
-            intent.setAction(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
-        } else {
-            return null;
-        }
-
-        final WifiConfiguration wifiConfiguration = accessPoint.getConfig();
-        setConfiguratorIntentExtra(intent, wifiManager, wifiConfiguration);
-
-        if (wifiConfiguration.networkId == WifiConfiguration.INVALID_NETWORK_ID) {
-            throw new IllegalArgumentException("Invalid network ID");
-        } else {
-            intent.putExtra(EXTRA_WIFI_NETWORK_ID, wifiConfiguration.networkId);
-        }
-
-        return intent;
-    }
-
-    /**
-     * Returns an intent to launch QR code scanner. It may return null if the security is not
-     * supported by QR code scanner.
-     *
-     * @param context     The context to use for the content resolver
-     * @param wifiManager An instance of {@link WifiManager}
      * @param wifiEntry An instance of {@link WifiEntry}
      * @return Intent for launching QR code scanner
      */
@@ -439,20 +405,6 @@
     }
 
     /**
-     * Checks if QR code scanner supports to config other devices with the Wi-Fi network
-     *
-     * @param context The context to use for {@link WifiManager#isEasyConnectSupported()}
-     * @param accessPoint The {@link AccessPoint} of the Wi-Fi network
-     */
-    public static boolean isSupportConfiguratorQrCodeScanner(Context context,
-            AccessPoint accessPoint) {
-        if (accessPoint.isPasspoint()) {
-            return false;
-        }
-        return isSupportWifiDpp(context, accessPoint.getSecurity());
-    }
-
-    /**
      * Checks if QR code generator supports to config other devices with the Wi-Fi network
      *
      * @param context The context to use for {@code WifiManager}
@@ -470,12 +422,11 @@
      * Checks if this device supports to be configured by the Wi-Fi network of the security
      *
      * @param context The context to use for {@code WifiManager}
-     * @param accesspointSecurity The security constants defined in {@link AccessPoint}
+     * @param wifiEntrySecurity The security constants defined in {@link WifiEntry}
      */
-    public static boolean isSupportEnrolleeQrCodeScanner(Context context,
-            int accesspointSecurity) {
-        return isSupportWifiDpp(context, accesspointSecurity) ||
-                isSupportZxing(context, accesspointSecurity);
+    public static boolean isSupportEnrolleeQrCodeScanner(Context context, int wifiEntrySecurity) {
+        return isSupportWifiDpp(context, wifiEntrySecurity)
+                || isSupportZxing(context, wifiEntrySecurity);
     }
 
     private static boolean isSupportHotspotConfiguratorQrCodeGenerator(
@@ -487,39 +438,39 @@
                 || softApConfiguration.getSecurityType() == SoftApConfiguration.SECURITY_TYPE_OPEN;
     }
 
-    private static boolean isSupportWifiDpp(Context context, int accesspointSecurity) {
+    private static boolean isSupportWifiDpp(Context context, int wifiEntrySecurity) {
         if (!isWifiDppEnabled(context)) {
             return false;
         }
 
         // DPP 1.0 only supports SAE and PSK.
         final WifiManager wifiManager = context.getSystemService(WifiManager.class);
-        switch (accesspointSecurity) {
-            case AccessPoint.SECURITY_SAE:
+        switch (wifiEntrySecurity) {
+            case WifiEntry.SECURITY_SAE:
                 if (wifiManager.isWpa3SaeSupported()) {
                     return true;
                 }
                 break;
-            case AccessPoint.SECURITY_PSK:
+            case WifiEntry.SECURITY_PSK:
                 return true;
             default:
         }
         return false;
     }
 
-    private static boolean isSupportZxing(Context context, int accesspointSecurity) {
+    private static boolean isSupportZxing(Context context, int wifiEntrySecurity) {
         final WifiManager wifiManager = context.getSystemService(WifiManager.class);
-        switch (accesspointSecurity) {
-            case AccessPoint.SECURITY_PSK:
-            case AccessPoint.SECURITY_WEP:
-            case AccessPoint.SECURITY_NONE:
+        switch (wifiEntrySecurity) {
+            case WifiEntry.SECURITY_PSK:
+            case WifiEntry.SECURITY_WEP:
+            case WifiEntry.SECURITY_NONE:
                 return true;
-            case AccessPoint.SECURITY_SAE:
+            case WifiEntry.SECURITY_SAE:
                 if (wifiManager.isWpa3SaeSupported()) {
                     return true;
                 }
                 break;
-            case AccessPoint.SECURITY_OWE:
+            case WifiEntry.SECURITY_OWE:
                 if (wifiManager.isEnhancedOpenSupported()) {
                     return true;
                 }
@@ -538,4 +489,25 @@
                 VIBRATE_DURATION_QR_CODE_RECOGNITION.toMillis(),
                 VibrationEffect.DEFAULT_AMPLITUDE));
     }
+
+    @WifiEntry.Security
+    static int getSecurityTypeFromWifiConfiguration(WifiConfiguration config) {
+        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SAE)) {
+            return WifiEntry.SECURITY_SAE;
+        }
+        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_PSK)) {
+            return WifiEntry.SECURITY_PSK;
+        }
+        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.SUITE_B_192)) {
+            return WifiEntry.SECURITY_EAP_SUITE_B;
+        }
+        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.WPA_EAP)
+                || config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.IEEE8021X)) {
+            return WifiEntry.SECURITY_EAP;
+        }
+        if (config.allowedKeyManagement.get(WifiConfiguration.KeyMgmt.OWE)) {
+            return WifiEntry.SECURITY_OWE;
+        }
+        return (config.wepKeys[0] != null) ? WifiEntry.SECURITY_WEP : WifiEntry.SECURITY_NONE;
+    }
 }
diff --git a/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java b/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
index c854828..a017fac 100644
--- a/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
+++ b/src/com/android/settings/wifi/dpp/WifiNetworkListFragment.java
@@ -20,13 +20,20 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.NetworkScoreManager;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.util.Log;
-import android.view.View;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
 import android.widget.Toast;
 
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 
@@ -34,47 +41,63 @@
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.wifi.AddNetworkFragment;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPointPreference;
-import com.android.settingslib.wifi.WifiSavedConfigUtils;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.settingslib.wifi.WifiEntryPreference;
+import com.android.wifitrackerlib.SavedNetworkTracker;
+import com.android.wifitrackerlib.WifiEntry;
 
+import java.time.Clock;
+import java.time.ZoneOffset;
 import java.util.List;
 import java.util.stream.Collectors;
 
 public class WifiNetworkListFragment extends SettingsPreferenceFragment implements
-        WifiTracker.WifiListener, AccessPoint.AccessPointListener {
+        SavedNetworkTracker.SavedNetworkTrackerCallback, Preference.OnPreferenceClickListener {
     private static final String TAG = "WifiNetworkListFragment";
 
-    private static final String WIFI_CONFIG_KEY = "wifi_config_key";
+    @VisibleForTesting static final String WIFI_CONFIG_KEY = "wifi_config_key";
     private static final String PREF_KEY_ACCESS_POINTS = "access_points";
 
-    private static final int ADD_NETWORK_REQUEST = 1;
+    @VisibleForTesting
+    static final int ADD_NETWORK_REQUEST = 1;
 
-    private PreferenceCategory mAccessPointsPreferenceCategory;
-    private AccessPointPreference.UserBadgeCache mUserBadgeCache;
-    private Preference mAddPreference;
-    // Only shows up if mIsTest == true
-    private Preference mFakeNetworkPreference;
+    @VisibleForTesting PreferenceCategory mPreferenceGroup;
+    @VisibleForTesting Preference mAddPreference;
 
-    private WifiManager mWifiManager;
-    private WifiTracker mWifiTracker;
+    @VisibleForTesting WifiManager mWifiManager;
 
     private WifiManager.ActionListener mSaveListener;
-    private boolean mIsTest;
+
+    // Max age of tracked WifiEntries
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating SavedNetworkTracker scans
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+
+    @VisibleForTesting SavedNetworkTracker mSavedNetworkTracker;
+    @VisibleForTesting HandlerThread mWorkerThread;
 
     // Container Activity must implement this interface
     public interface OnChooseNetworkListener {
         void onChooseNetwork(WifiNetworkConfig wifiNetworkConfig);
     }
-    private OnChooseNetworkListener mOnChooseNetworkListener;
+    @VisibleForTesting OnChooseNetworkListener mOnChooseNetworkListener;
 
     @Override
     public int getMetricsCategory() {
         return SettingsEnums.SETTINGS_WIFI_DPP_CONFIGURATOR;
     }
 
+    private static class DisableUnreachableWifiEntryPreference extends WifiEntryPreference {
+        DisableUnreachableWifiEntryPreference(Context context, WifiEntry entry) {
+            super(context, entry);
+        }
+
+        @Override
+        public void onUpdated() {
+            super.onUpdated();
+            this.setEnabled(getWifiEntry().getLevel() != WifiEntry.WIFI_LEVEL_UNREACHABLE);
+        }
+    }
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
@@ -94,14 +117,8 @@
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mWifiTracker = WifiTrackerFactory.create(getActivity(), this,
-                getSettingsLifecycle(), /* includeSaved */true, /* includeScans */ true);
-        mWifiManager = mWifiTracker.getManager();
-
-        final Bundle args = getArguments();
-        if (args != null) {
-            mIsTest = args.getBoolean(WifiDppUtils.EXTRA_TEST, false);
-        }
+        final Context context = getContext();
+        mWifiManager = context.getSystemService(WifiManager.class);
 
         mSaveListener = new WifiManager.ActionListener() {
             @Override
@@ -111,25 +128,52 @@
 
             @Override
             public void onFailure(int reason) {
-                Activity activity = getActivity();
-                if (activity != null) {
-                    Toast.makeText(activity,
-                            R.string.wifi_failed_save_message,
+                final Activity activity = getActivity();
+                if (activity != null && !activity.isFinishing()) {
+                    Toast.makeText(activity, R.string.wifi_failed_save_message,
                             Toast.LENGTH_SHORT).show();
                 }
             }
         };
+
+        mWorkerThread = new HandlerThread(TAG
+                + "{" + Integer.toHexString(System.identityHashCode(this)) + "}",
+                Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+            @Override
+            public long millis() {
+                return SystemClock.elapsedRealtime();
+            }
+        };
+        mSavedNetworkTracker = new SavedNetworkTracker(getSettingsLifecycle(), context,
+                context.getSystemService(WifiManager.class),
+                context.getSystemService(ConnectivityManager.class),
+                context.getSystemService(NetworkScoreManager.class),
+                new Handler(Looper.getMainLooper()),
+                mWorkerThread.getThreadHandler(),
+                elapsedRealtimeClock,
+                MAX_SCAN_AGE_MILLIS,
+                SCAN_INTERVAL_MILLIS,
+                this);
+    }
+
+    @Override
+    public void onDestroyView() {
+        mWorkerThread.quit();
+
+        super.onDestroyView();
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
 
-        if (requestCode == ADD_NETWORK_REQUEST) {
-            if (resultCode == Activity.RESULT_OK) {
-                handleAddNetworkSubmitEvent(data);
+        if (requestCode == ADD_NETWORK_REQUEST && resultCode == Activity.RESULT_OK) {
+            final WifiConfiguration wifiConfiguration = data.getParcelableExtra(WIFI_CONFIG_KEY);
+            if (wifiConfiguration != null) {
+                mWifiManager.save(wifiConfiguration, mSaveListener);
             }
-            mWifiTracker.resumeScanning();
         }
     }
 
@@ -137,203 +181,81 @@
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.wifi_dpp_network_list);
 
-        mAccessPointsPreferenceCategory = findPreference(PREF_KEY_ACCESS_POINTS);
-
-        mFakeNetworkPreference = new Preference(getPrefContext());
-        mFakeNetworkPreference.setIcon(R.drawable.ic_wifi_signal_0);
-        mFakeNetworkPreference.setKey("fake_key");
-        mFakeNetworkPreference.setTitle("fake network");
+        mPreferenceGroup = findPreference(PREF_KEY_ACCESS_POINTS);
 
         mAddPreference = new Preference(getPrefContext());
         mAddPreference.setIcon(R.drawable.ic_add_24dp);
         mAddPreference.setTitle(R.string.wifi_add_network);
-
-        mUserBadgeCache = new AccessPointPreference.UserBadgeCache(getPackageManager());
+        mAddPreference.setOnPreferenceClickListener(this);
     }
 
     /** Called when the state of Wifi has changed. */
     @Override
-    public void onWifiStateChanged(int state) {
-        final int wifiState = mWifiManager.getWifiState();
-        switch (wifiState) {
-            case WifiManager.WIFI_STATE_ENABLED:
-                updateAccessPointPreferences();
-                break;
+    public void onSavedWifiEntriesChanged() {
+        final List<WifiEntry> savedWifiEntries = mSavedNetworkTracker.getSavedWifiEntries().stream()
+                .filter(entry -> isValidForDppConfiguration(entry))
+                .collect(Collectors.toList());
 
-            case WifiManager.WIFI_STATE_ENABLING:
-            case WifiManager.WIFI_STATE_DISABLING:
-                removeAccessPointPreferences();
-                break;
+        int index = 0;
+        mPreferenceGroup.removeAll();
+        for (WifiEntry savedEntry : savedWifiEntries) {
+            final DisableUnreachableWifiEntryPreference preference =
+                    new DisableUnreachableWifiEntryPreference(getContext(), savedEntry);
+            preference.setOnPreferenceClickListener(this);
+            preference.setEnabled(savedEntry.getLevel() != WifiEntry.WIFI_LEVEL_UNREACHABLE);
+            preference.setOrder(index++);
+
+            mPreferenceGroup.addPreference(preference);
         }
+
+        mAddPreference.setOrder(index);
+        mPreferenceGroup.addPreference(mAddPreference);
     }
 
-    /** Called when the connection state of wifi has changed. */
     @Override
-    public void onConnectedChanged() {
+    public void onSubscriptionWifiEntriesChanged() {
         // Do nothing.
     }
 
-    /**
-     * Called to indicate the list of AccessPoints has been updated and
-     * getAccessPoints should be called to get the latest information.
-     */
     @Override
-    public void onAccessPointsChanged() {
-        updateAccessPointPreferences();
+    public void onWifiStateChanged() {
+        // Do nothing.
     }
 
     @Override
-    public void onAccessPointChanged(final AccessPoint accessPoint) {
-        Log.d(TAG, "onAccessPointChanged (singular) callback initiated");
-        View view = getView();
-        if (view != null) {
-            view.post(() -> {
-                final Object tag = accessPoint.getTag();
-                if (tag != null) {
-                    ((AccessPointPreference) tag).refresh();
-                }
-            });
-        }
-    }
-
-    @Override
-    public void onLevelChanged(AccessPoint accessPoint) {
-        ((AccessPointPreference) accessPoint.getTag()).onLevelChanged();
-    }
-
-    @Override
-    public boolean onPreferenceTreeClick(Preference preference) {
-        if (preference instanceof AccessPointPreference) {
-            final AccessPoint selectedAccessPoint =
-                    ((AccessPointPreference) preference).getAccessPoint();
-            if (selectedAccessPoint == null) {
-                return false;
-            }
+    public boolean onPreferenceClick(Preference preference) {
+        if (preference instanceof WifiEntryPreference) {
+            final WifiEntry selectedWifiEntry = ((WifiEntryPreference) preference).getWifiEntry();
 
             // Launch WifiDppAddDeviceFragment to start DPP in Configurator-Initiator role.
-            final WifiConfiguration wifiConfig = selectedAccessPoint.getConfig();
+            final WifiConfiguration wifiConfig = selectedWifiEntry.getWifiConfiguration();
             if (wifiConfig == null) {
                 throw new IllegalArgumentException("Invalid access point");
             }
             final WifiNetworkConfig networkConfig = WifiNetworkConfig.getValidConfigOrNull(
-                    selectedAccessPoint.getSecurityString(/* concise */ true),
+                    WifiDppUtils.getSecurityString(selectedWifiEntry),
                     wifiConfig.getPrintableSsid(), wifiConfig.preSharedKey, wifiConfig.hiddenSSID,
                     wifiConfig.networkId, /* isHotspot */ false);
             if (mOnChooseNetworkListener != null) {
                 mOnChooseNetworkListener.onChooseNetwork(networkConfig);
             }
         } else if (preference == mAddPreference) {
-            launchAddNetworkFragment();
-        } else if (preference == mFakeNetworkPreference) {
-            if (mOnChooseNetworkListener != null) {
-                mOnChooseNetworkListener.onChooseNetwork(
-                        new WifiNetworkConfig(
-                                WifiQrCode.SECURITY_WPA_PSK,
-                                /* ssid */ WifiNetworkConfig.FAKE_SSID,
-                                /* preSharedKey */ WifiNetworkConfig.FAKE_PASSWORD,
-                                /* hiddenSsid */ true,
-                                /* networkId */ WifiConfiguration.INVALID_NETWORK_ID,
-                                /* isHotspot*/ false));
-            }
+            new SubSettingLauncher(getContext())
+                .setTitleRes(R.string.wifi_add_network)
+                .setDestination(AddNetworkFragment.class.getName())
+                .setSourceMetricsCategory(getMetricsCategory())
+                .setResultListener(this, ADD_NETWORK_REQUEST)
+                .launch();
         } else {
             return super.onPreferenceTreeClick(preference);
         }
         return true;
     }
 
-    private void handleAddNetworkSubmitEvent(Intent data) {
-        final WifiConfiguration wifiConfiguration = data.getParcelableExtra(WIFI_CONFIG_KEY);
-        if (wifiConfiguration != null) {
-            mWifiManager.save(wifiConfiguration, mSaveListener);
-        }
-    }
-
-    private boolean isValidForDppConfiguration(AccessPoint accessPoint) {
-        final int security = accessPoint.getSecurity();
+    private boolean isValidForDppConfiguration(WifiEntry wifiEntry) {
+        final int security = wifiEntry.getSecurity();
 
         // DPP 1.0 only support PSK and SAE.
-        return security == AccessPoint.SECURITY_PSK || security == AccessPoint.SECURITY_SAE;
-    }
-
-    private void launchAddNetworkFragment() {
-        new SubSettingLauncher(getContext())
-                .setTitleRes(R.string.wifi_add_network)
-                .setDestination(AddNetworkFragment.class.getName())
-                .setSourceMetricsCategory(getMetricsCategory())
-                .setResultListener(this, ADD_NETWORK_REQUEST)
-                .launch();
-    }
-
-    private void removeAccessPointPreferences() {
-        mAccessPointsPreferenceCategory.removeAll();
-        mAccessPointsPreferenceCategory.setVisible(false);
-    }
-
-    private void updateAccessPointPreferences() {
-        // in case state has changed
-        if (!mWifiManager.isWifiEnabled()) {
-            return;
-        }
-
-        List<AccessPoint> savedAccessPoints =
-                WifiSavedConfigUtils.getAllConfigs(getContext(), mWifiManager);
-
-        savedAccessPoints = savedAccessPoints.stream()
-                .filter(accessPoint -> isValidForDppConfiguration(accessPoint))
-                .map(accessPoint -> getScannedAccessPointIfAvailable(accessPoint))
-                .sorted((ap1, ap2) -> {
-                    // orders reachable Wi-Fi networks on top
-                    if (ap1.isReachable() && !ap2.isReachable()) {
-                        return -1;
-                    } else if (!ap1.isReachable() && ap2.isReachable()) {
-                        return 1;
-                    }
-
-                    String ap1Title = nullToEmpty(ap1.getTitle());
-                    String ap2Title = nullToEmpty(ap2.getTitle());
-
-                    return ap1Title.compareToIgnoreCase(ap2Title);
-                }).collect(Collectors.toList());
-
-        int index = 0;
-        mAccessPointsPreferenceCategory.removeAll();
-        for (AccessPoint savedAccessPoint : savedAccessPoints) {
-            final AccessPointPreference preference =
-                    createAccessPointPreference(savedAccessPoint);
-
-            preference.setOrder(index++);
-            preference.setEnabled(savedAccessPoint.isReachable());
-            savedAccessPoint.setListener(this);
-
-            preference.refresh();
-            mAccessPointsPreferenceCategory.addPreference(preference);
-        }
-        mAddPreference.setOrder(index);
-        mAccessPointsPreferenceCategory.addPreference(mAddPreference);
-
-        if (mIsTest) {
-            mAccessPointsPreferenceCategory.addPreference(mFakeNetworkPreference);
-        }
-    }
-
-    private String nullToEmpty(String string) {
-        return (string == null) ? "" : string;
-    }
-
-    // Replaces with an AccessPoint from scanned result for signal information
-    private AccessPoint getScannedAccessPointIfAvailable(AccessPoint savedAccessPoint) {
-        final List<AccessPoint> scannedAccessPoints = mWifiTracker.getAccessPoints();
-        final WifiConfiguration savedWifiConfiguration = savedAccessPoint.getConfig();
-        for (AccessPoint scannedAccessPoint : scannedAccessPoints) {
-            if (scannedAccessPoint.matches(savedWifiConfiguration)) {
-                return scannedAccessPoint;
-            }
-        }
-        return savedAccessPoint;
-    }
-
-    private AccessPointPreference createAccessPointPreference(AccessPoint accessPoint) {
-        return new AccessPointPreference(accessPoint, getPrefContext(), mUserBadgeCache,
-                R.drawable.ic_wifi_signal_0, /* forSavedNetworks */ false);
+        return security == WifiEntry.SECURITY_PSK || security == WifiEntry.SECURITY_SAE;
     }
 }
diff --git a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceController.java b/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceController.java
deleted file mode 100644
index 397fb8b..0000000
--- a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import android.content.Context;
-import android.net.wifi.WifiManager;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceGroup;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPointPreference;
-import com.android.settingslib.wifi.AccessPointPreference.UserBadgeCache;
-import com.android.settingslib.wifi.WifiSavedConfigUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * Controller that manages a PreferenceGroup, which contains a list of saved access points.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsPreferenceController2}.
- */
-public class SavedAccessPointsPreferenceController extends BasePreferenceController implements
-        Preference.OnPreferenceClickListener {
-
-    protected final WifiManager mWifiManager;
-    private final UserBadgeCache mUserBadgeCache;
-    private PreferenceGroup mPreferenceGroup;
-    private SavedAccessPointsWifiSettings mHost;
-    @VisibleForTesting
-    List<AccessPoint> mAccessPoints;
-
-    public SavedAccessPointsPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-        mUserBadgeCache = new AccessPointPreference.UserBadgeCache(context.getPackageManager());
-        mWifiManager = context.getSystemService(WifiManager.class);
-    }
-
-    public SavedAccessPointsPreferenceController setHost(SavedAccessPointsWifiSettings host) {
-        mHost = host;
-        return this;
-    }
-
-    @Override
-    public int getAvailabilityStatus() {
-        refreshSavedAccessPoints();
-        return mAccessPoints.size() > 0 ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        mPreferenceGroup = screen.findPreference(getPreferenceKey());
-        refreshSavedAccessPoints();
-        updatePreference();
-        super.displayPreference(screen);
-    }
-
-    @Override
-    public boolean onPreferenceClick(Preference preference) {
-        if (mHost != null) {
-            final Preference preferenceInGroup =
-                    mPreferenceGroup.findPreference(preference.getKey());
-            mHost.showWifiPage((AccessPointPreference) preferenceInGroup);
-        }
-        return false;
-    }
-
-    protected void refreshSavedAccessPoints() {
-        mAccessPoints = WifiSavedConfigUtils.getAllConfigs(mContext, mWifiManager).stream()
-                .filter(accessPoint -> !accessPoint.isPasspointConfig())
-                .sorted(SavedNetworkComparator.INSTANCE)
-                .collect(Collectors.toList());
-    }
-
-    private void updatePreference() {
-        mPreferenceGroup.removeAll();
-        for (AccessPoint accessPoint : mAccessPoints) {
-            final String key = accessPoint.getKey();
-
-            final AccessPointPreference preference = new AccessPointPreference(accessPoint,
-                    mContext, mUserBadgeCache, true /* forSavedNetworks */);
-            preference.setKey(key);
-            preference.setIcon(null);
-            preference.setOnPreferenceClickListener(this);
-
-            mPreferenceGroup.addPreference(preference);
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java
deleted file mode 100644
index 262dce6..0000000
--- a/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettings.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import android.annotation.Nullable;
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.VisibleForTesting;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.core.SubSettingLauncher;
-import com.android.settings.dashboard.DashboardFragment;
-import com.android.settings.wifi.WifiSettings;
-import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.AccessPointPreference;
-
-/**
- * UI to manage saved networks/access points.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2}.
- */
-public class SavedAccessPointsWifiSettings extends DashboardFragment {
-
-    private static final String TAG = "SavedAccessPoints";
-
-    @VisibleForTesting
-    Bundle mAccessPointSavedState;
-    private AccessPoint mSelectedAccessPoint;
-
-    // Instance state key
-    private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
-
-    @Override
-    public int getMetricsCategory() {
-        return SettingsEnums.WIFI_SAVED_ACCESS_POINTS;
-    }
-
-    @Override
-    protected int getPreferenceScreenResId() {
-        return R.xml.wifi_display_saved_access_points;
-    }
-
-    @Override
-    protected String getLogTag() {
-        return TAG;
-    }
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        use(SavedAccessPointsPreferenceController.class)
-                .setHost(this);
-        use(SubscribedAccessPointsPreferenceController.class)
-                .setHost(this);
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (savedInstanceState != null) {
-            if (savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) {
-                mAccessPointSavedState =
-                        savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE);
-            } else {
-                mAccessPointSavedState = null;
-            }
-        }
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        if (mAccessPointSavedState != null) {
-            final PreferenceScreen screen = getPreferenceScreen();
-            use(SavedAccessPointsPreferenceController.class).displayPreference(screen);
-            use(SubscribedAccessPointsPreferenceController.class).displayPreference(screen);
-        }
-    }
-
-    public void showWifiPage(@Nullable AccessPointPreference accessPoint) {
-        removeDialog(WifiSettings.WIFI_DIALOG_ID);
-
-        if (accessPoint != null) {
-            // Save the access point and edit mode
-            mSelectedAccessPoint = accessPoint.getAccessPoint();
-        } else {
-            // No access point is selected. Clear saved state.
-            mSelectedAccessPoint = null;
-            mAccessPointSavedState = null;
-        }
-
-        if (mSelectedAccessPoint == null) {
-            mSelectedAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState);
-        }
-        final Bundle savedState = new Bundle();
-        mSelectedAccessPoint.saveWifiState(savedState);
-
-        new SubSettingLauncher(getContext())
-                .setTitleText(mSelectedAccessPoint.getTitle())
-                .setDestination(WifiNetworkDetailsFragment.class.getName())
-                .setArguments(savedState)
-                .setSourceMetricsCategory(getMetricsCategory())
-                .launch();
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        // If the dialog is showing (indicated by the existence of mSelectedAccessPoint), then we
-        // save its state.
-        if (mSelectedAccessPoint != null) {
-            mAccessPointSavedState = new Bundle();
-            mSelectedAccessPoint.saveWifiState(mAccessPointSavedState);
-            outState.putBundle(SAVE_DIALOG_ACCESS_POINT_STATE, mAccessPointSavedState);
-        }
-    }
-}
diff --git a/src/com/android/settings/wifi/savedaccesspoints/SavedNetworkComparator.java b/src/com/android/settings/wifi/savedaccesspoints/SavedNetworkComparator.java
deleted file mode 100644
index e66ef23..0000000
--- a/src/com/android/settings/wifi/savedaccesspoints/SavedNetworkComparator.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import android.icu.text.Collator;
-
-import com.android.settingslib.wifi.AccessPoint;
-
-import java.util.Comparator;
-
-public final class SavedNetworkComparator {
-    public static final Comparator<AccessPoint> INSTANCE =
-            new Comparator<AccessPoint>() {
-                final Collator mCollator = Collator.getInstance();
-
-                @Override
-                public int compare(AccessPoint ap1, AccessPoint ap2) {
-                    return mCollator.compare(
-                            nullToEmpty(ap1.getTitle()), nullToEmpty(ap2.getTitle()));
-                }
-
-                private String nullToEmpty(String string) {
-                    return (string == null) ? "" : string;
-                }
-            };
-}
diff --git a/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceController.java b/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceController.java
deleted file mode 100644
index 23ba7c4..0000000
--- a/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceController.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import android.content.Context;
-
-import com.android.settingslib.wifi.WifiSavedConfigUtils;
-
-import java.util.stream.Collectors;
-
-/**
- * Controller that manages a PreferenceGroup, which contains a list of subscribed access points.
- *
- * Migrating from Wi-Fi SettingsLib to to WifiTrackerLib, this object will be removed in the near
- * future, please develop in
- * {@link com.android.settings.wifi.savedaccesspoints2.SubscribedAccessPointsPreferenceController2}.
- */
-public class SubscribedAccessPointsPreferenceController extends
-        SavedAccessPointsPreferenceController {
-
-    public SubscribedAccessPointsPreferenceController(Context context, String preferenceKey) {
-        super(context, preferenceKey);
-    }
-
-    @Override
-    protected void refreshSavedAccessPoints() {
-        mAccessPoints = WifiSavedConfigUtils.getAllConfigs(mContext, mWifiManager).stream()
-                .filter(accessPoint -> accessPoint.isPasspointConfig())
-                .sorted(SavedNetworkComparator.INSTANCE)
-                .collect(Collectors.toList());
-    }
-}
diff --git a/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java b/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
index c70f077..e579ad7 100644
--- a/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
+++ b/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2.java
@@ -32,6 +32,7 @@
 import android.util.Log;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
@@ -50,15 +51,15 @@
 public class SavedAccessPointsWifiSettings2 extends DashboardFragment
         implements SavedNetworkTracker.SavedNetworkTrackerCallback {
 
-    private static final String TAG = "SavedAccessPoints2";
+    @VisibleForTesting static final String TAG = "SavedAccessPoints2";
 
     // Max age of tracked WifiEntries
     private static final long MAX_SCAN_AGE_MILLIS = 15_000;
     // Interval between initiating SavedNetworkTracker scans
     private static final long SCAN_INTERVAL_MILLIS = 10_000;
 
-    private SavedNetworkTracker mSavedNetworkTracker;
-    private HandlerThread mWorkerThread;
+    @VisibleForTesting SavedNetworkTracker mSavedNetworkTracker;
+    @VisibleForTesting HandlerThread mWorkerThread;
 
     @Override
     public int getMetricsCategory() {
diff --git a/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java b/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
index 5c92d81..779a57e 100644
--- a/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
+++ b/src/com/android/settings/wifi/slice/ConnectToWifiHandler.java
@@ -19,61 +19,74 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
+import android.text.TextUtils;
+import android.widget.Toast;
 
 import androidx.annotation.VisibleForTesting;
 
-import com.android.settings.wifi.WifiConnectListener;
+import com.android.settings.R;
+import com.android.settings.slices.SliceBackgroundWorker;
 import com.android.settings.wifi.WifiDialogActivity;
-import com.android.settings.wifi.WifiUtils;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
 
 /**
  * This receiver helps connect to Wi-Fi network
  */
 public class ConnectToWifiHandler extends BroadcastReceiver {
 
+    static final String KEY_CHOSEN_WIFIENTRY_KEY = "key_chosen_wifientry_key";
+    static final String KEY_WIFI_SLICE_URI = "key_wifi_slice_uri";
+
     @Override
     public void onReceive(Context context, Intent intent) {
         if (context == null || intent == null) {
             return;
         }
-
-        final Network network = intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK);
-        final Bundle accessPointState = intent.getBundleExtra(
-                WifiDialogActivity.KEY_ACCESS_POINT_STATE);
-
-        if (network != null) {
-            WifiScanWorker.clearClickedWifi();
-            final ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
-            // start captive portal app to sign in to network
-            cm.startCaptivePortalApp(network);
-        } else if (accessPointState != null) {
-            connect(context, new AccessPoint(context, accessPointState));
+        final String key = intent.getStringExtra(KEY_CHOSEN_WIFIENTRY_KEY);
+        if (TextUtils.isEmpty(key)) {
+            return;
         }
+        if (intent.getParcelableExtra(KEY_WIFI_SLICE_URI) == null) {
+            return;
+        }
+        final WifiScanWorker worker = getWifiScanWorker(intent);
+        if (worker == null) {
+            return;
+        }
+        final WifiEntry wifiEntry = worker.getWifiEntry(key);
+        if (wifiEntry == null) {
+            return;
+        }
+        wifiEntry.connect(new WifiEntryConnectCallback(context, wifiEntry));
     }
 
     @VisibleForTesting
-    void connect(Context context, AccessPoint accessPoint) {
-        ContextualWifiScanWorker.saveSession();
-        WifiScanWorker.saveClickedWifi(accessPoint);
+    WifiScanWorker getWifiScanWorker(Intent intent) {
+        return SliceBackgroundWorker.getInstance(intent.getParcelableExtra(KEY_WIFI_SLICE_URI));
+    }
 
-        final WifiConnectListener connectListener = new WifiConnectListener(context);
-        switch (WifiUtils.getConnectingType(accessPoint)) {
-            case WifiUtils.CONNECT_TYPE_OSU_PROVISION:
-                accessPoint.startOsuProvisioning(connectListener);
-                break;
+    @VisibleForTesting
+    static class WifiEntryConnectCallback implements WifiEntry.ConnectCallback {
+        final Context mContext;
+        final WifiEntry mWifiEntry;
 
-            case WifiUtils.CONNECT_TYPE_OPEN_NETWORK:
-                accessPoint.generateOpenNetworkConfig();
+        WifiEntryConnectCallback(Context context, WifiEntry connectWifiEntry) {
+            mContext = context;
+            mWifiEntry = connectWifiEntry;
+        }
 
-            case WifiUtils.CONNECT_TYPE_SAVED_NETWORK:
-                final WifiManager wifiManager = context.getSystemService(WifiManager.class);
-                wifiManager.connect(accessPoint.getConfig(), connectListener);
-                break;
+        @Override
+        public void onConnectResult(@ConnectStatus int status) {
+            if (status == ConnectCallback.CONNECT_STATUS_FAILURE_NO_CONFIG) {
+                final Intent intent = new Intent(mContext, WifiDialogActivity.class)
+                        .putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, mWifiEntry.getKey());
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                mContext.startActivity(intent);
+            } else if (status == CONNECT_STATUS_FAILURE_UNKNOWN) {
+                Toast.makeText(mContext, R.string.wifi_failed_connect_message,
+                        Toast.LENGTH_SHORT).show();
+            }
         }
     }
 }
diff --git a/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java b/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
index 616c92f..aa73a17 100644
--- a/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
+++ b/src/com/android/settings/wifi/slice/ContextualWifiScanWorker.java
@@ -18,7 +18,6 @@
 
 import android.content.Context;
 import android.net.Uri;
-import android.os.SystemClock;
 
 import com.android.settings.slices.SliceBackgroundWorker;
 
@@ -27,44 +26,12 @@
  */
 public class ContextualWifiScanWorker extends WifiScanWorker {
 
-    private static long sVisibleUiSessionToken;
-    private static long sActiveSession;
-
     public ContextualWifiScanWorker(Context context, Uri uri) {
         super(context, uri);
     }
 
-    /**
-     * Starts a new visible UI session for the purpose of automatically starting captive portal.
-     *
-     * A visible UI session is defined as a duration of time when a UI screen is visible to user.
-     * Going to a sub-page and coming out breaks the continuation, leaving the page and coming back
-     * breaks it too.
-     */
-    public static void newVisibleUiSession() {
-        sVisibleUiSessionToken = SystemClock.elapsedRealtime();
-    }
-
-    static void saveSession() {
-        sActiveSession = sVisibleUiSessionToken;
-    }
-
-    @Override
-    protected void clearClickedWifiOnSliceUnpinned() {
-        // Do nothing for contextual Wi-Fi slice
-    }
-
-    @Override
-    protected boolean isSessionValid() {
-        if (sVisibleUiSessionToken != sActiveSession) {
-            clearClickedWifi();
-            return false;
-        }
-        return true;
-    }
-
     @Override
     protected int getApRowCount() {
         return ContextualWifiSlice.getApRowCount();
     }
-}
\ No newline at end of file
+}
diff --git a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
index ea9a745..4806573 100644
--- a/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
+++ b/src/com/android/settings/wifi/slice/ContextualWifiSlice.java
@@ -18,10 +18,8 @@
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
 import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.DetailedState;
-import android.net.NetworkInfo.State;
 import android.net.Uri;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
@@ -37,7 +35,7 @@
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.slices.CustomSliceRegistry;
 import com.android.settings.slices.CustomSliceable;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.wifitrackerlib.WifiEntry;
 
 /**
  * {@link CustomSliceable} for Wi-Fi, used by contextual homepage.
@@ -52,8 +50,12 @@
     @VisibleForTesting
     static boolean sApRowCollapsed;
 
+    private final ConnectivityManager mConnectivityManager;
+
     public ContextualWifiSlice(Context context) {
         super(context);
+
+        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
     }
 
     @Override
@@ -84,16 +86,17 @@
     }
 
     @Override
-    protected ListBuilder.RowBuilder getHeaderRow(boolean isWifiEnabled, AccessPoint accessPoint) {
-        final ListBuilder.RowBuilder builder = super.getHeaderRow(isWifiEnabled, accessPoint);
-        builder.setTitleItem(getHeaderIcon(isWifiEnabled, accessPoint), ListBuilder.ICON_IMAGE);
+    protected ListBuilder.RowBuilder getHeaderRow(boolean isWifiEnabled,
+            WifiSliceItem wifiSliceItem) {
+        final ListBuilder.RowBuilder builder = super.getHeaderRow(isWifiEnabled, wifiSliceItem);
+        builder.setTitleItem(getHeaderIcon(isWifiEnabled, wifiSliceItem), ListBuilder.ICON_IMAGE);
         if (sApRowCollapsed) {
-            builder.setSubtitle(getSubtitle(accessPoint));
+            builder.setSubtitle(getHeaderSubtitle(wifiSliceItem));
         }
         return builder;
     }
 
-    private IconCompat getHeaderIcon(boolean isWifiEnabled, AccessPoint accessPoint) {
+    private IconCompat getHeaderIcon(boolean isWifiEnabled, WifiSliceItem wifiSliceItem) {
         final Drawable drawable;
         final int tint;
         if (!isWifiEnabled) {
@@ -103,7 +106,8 @@
         } else {
             // get icon of medium signal strength
             drawable = mContext.getDrawable(com.android.settingslib.Utils.getWifiIconResource(2));
-            if (isNetworkConnected(accessPoint)) {
+            if (wifiSliceItem != null
+                    && wifiSliceItem.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
                 tint = Utils.getColorAccentDefaultColor(mContext);
             } else {
                 tint = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorControlNormal);
@@ -113,49 +117,16 @@
         return Utils.createIconWithDrawable(drawable);
     }
 
-    private boolean isNetworkConnected(AccessPoint accessPoint) {
-        if (accessPoint == null) {
-            return false;
-        }
-
-        final NetworkInfo networkInfo = accessPoint.getNetworkInfo();
-        if (networkInfo == null) {
-            return false;
-        }
-
-        return networkInfo.getState() == State.CONNECTED;
-    }
-
-    private CharSequence getSubtitle(AccessPoint accessPoint) {
-        if (isCaptivePortal()) {
-            final int id = mContext.getResources()
-                    .getIdentifier("network_available_sign_in", "string", "android");
-            return mContext.getText(id);
-        }
-
-        if (accessPoint == null) {
+    private CharSequence getHeaderSubtitle(WifiSliceItem wifiSliceItem) {
+        if (wifiSliceItem == null
+                || wifiSliceItem.getConnectedState() == WifiEntry.CONNECTED_STATE_DISCONNECTED) {
             return mContext.getText(R.string.disconnected);
         }
-
-        final NetworkInfo networkInfo = accessPoint.getNetworkInfo();
-        if (networkInfo == null) {
-            return mContext.getText(R.string.disconnected);
+        if (wifiSliceItem.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTING) {
+            return mContext.getString(R.string.wifi_connecting_to_message,
+                wifiSliceItem.getTitle());
         }
-
-        final State state = networkInfo.getState();
-        DetailedState detailedState;
-        if (state == State.CONNECTING) {
-            detailedState = DetailedState.CONNECTING;
-        } else if (state == State.CONNECTED) {
-            detailedState = DetailedState.CONNECTED;
-        } else {
-            detailedState = networkInfo.getDetailedState();
-        }
-
-        final String[] formats = mContext.getResources().getStringArray(
-                R.array.wifi_status_with_ssid);
-        final int index = detailedState.ordinal();
-        return String.format(formats[index], accessPoint.getTitle());
+        return mContext.getString(R.string.wifi_connected_to_message, wifiSliceItem.getTitle());
     }
 
     private boolean hasWorkingNetwork() {
diff --git a/src/com/android/settings/wifi/slice/WifiScanWorker.java b/src/com/android/settings/wifi/slice/WifiScanWorker.java
index 9d0f821..78b0d33 100644
--- a/src/com/android/settings/wifi/slice/WifiScanWorker.java
+++ b/src/com/android/settings/wifi/slice/WifiScanWorker.java
@@ -16,243 +16,200 @@
 
 package com.android.settings.wifi.slice;
 
-import static android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY;
-import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
-import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
-
 import static com.android.settings.wifi.slice.WifiSlice.DEFAULT_EXPANDED_ROW_COUNT;
 
 import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkRequest;
 import android.net.Uri;
-import android.net.wifi.WifiInfo;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.UserHandle;
+import android.net.wifi.WifiManager;
+import android.os.HandlerThread;
+import android.os.Process;
+import android.os.SimpleClock;
+import android.os.SystemClock;
 import android.text.TextUtils;
-import android.util.Log;
 
 import androidx.annotation.VisibleForTesting;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
 
-import com.android.internal.util.Preconditions;
+import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.slices.SliceBackgroundWorker;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
+import com.android.settingslib.utils.ThreadUtils;
+import com.android.wifitrackerlib.MergedCarrierEntry;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiEntry.WifiEntryCallback;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
+import java.time.Clock;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * {@link SliceBackgroundWorker} for Wi-Fi, used by {@link WifiSlice}.
  */
-public class WifiScanWorker extends SliceBackgroundWorker<AccessPoint> implements
-        WifiTracker.WifiListener {
+public class WifiScanWorker extends SliceBackgroundWorker<WifiSliceItem> implements
+        WifiPickerTracker.WifiPickerTrackerCallback, LifecycleOwner, WifiEntryCallback {
 
     private static final String TAG = "WifiScanWorker";
 
+    // Max age of tracked WifiEntries.
+    private static final long MAX_SCAN_AGE_MILLIS = 15_000;
+    // Interval between initiating WifiPickerTracker scans.
+    private static final long SCAN_INTERVAL_MILLIS = 10_000;
+
     @VisibleForTesting
-    WifiNetworkCallback mNetworkCallback;
-
-    private final Context mContext;
-    private final ConnectivityManager mConnectivityManager;
-    private final WifiTracker mWifiTracker;
-
-    private static String sClickedWifiSsid;
+    final LifecycleRegistry mLifecycleRegistry;
+    @VisibleForTesting
+    protected WifiPickerTracker mWifiPickerTracker;
+    // Worker thread used for WifiPickerTracker work
+    private final HandlerThread mWorkerThread;
 
     public WifiScanWorker(Context context, Uri uri) {
         super(context, uri);
-        mContext = context;
-        mConnectivityManager = context.getSystemService(ConnectivityManager.class);
-        mWifiTracker = new WifiTracker(mContext, this /* wifiListener */,
-                true /* includeSaved */, true /* includeScans */);
+
+        mLifecycleRegistry = new LifecycleRegistry(this);
+
+        mWorkerThread = new HandlerThread(TAG, Process.THREAD_PRIORITY_BACKGROUND);
+        mWorkerThread.start();
+        final Clock elapsedRealtimeClock = new SimpleClock(ZoneOffset.UTC) {
+            @Override
+            public long millis() {
+                return SystemClock.elapsedRealtime();
+            }
+        };
+        mWifiPickerTracker = FeatureFactory.getFactory(context)
+                .getWifiTrackerLibProvider()
+                .createWifiPickerTracker(getLifecycle(), context,
+                        ThreadUtils.getUiThreadHandler(),
+                        mWorkerThread.getThreadHandler(),
+                        elapsedRealtimeClock,
+                        MAX_SCAN_AGE_MILLIS,
+                        SCAN_INTERVAL_MILLIS,
+                        this);
+
+        mLifecycleRegistry.markState(Lifecycle.State.INITIALIZED);
+        mLifecycleRegistry.markState(Lifecycle.State.CREATED);
     }
 
     @Override
     protected void onSlicePinned() {
-        mWifiTracker.onStart();
-        onAccessPointsChanged();
+        mLifecycleRegistry.markState(Lifecycle.State.STARTED);
+        mLifecycleRegistry.markState(Lifecycle.State.RESUMED);
+        updateResults();
     }
 
     @Override
     protected void onSliceUnpinned() {
-        mWifiTracker.onStop();
-        unregisterNetworkCallback();
-        clearClickedWifiOnSliceUnpinned();
+        mLifecycleRegistry.markState(Lifecycle.State.STARTED);
+        mLifecycleRegistry.markState(Lifecycle.State.CREATED);
     }
 
     @Override
     public void close() {
-        mWifiTracker.onDestroy();
+        mLifecycleRegistry.markState(Lifecycle.State.DESTROYED);
+        mWorkerThread.quit();
     }
 
     @Override
-    public void onWifiStateChanged(int state) {
+    public Lifecycle getLifecycle() {
+        return mLifecycleRegistry;
+    }
+
+    /** Called when the state of Wifi has changed. */
+    @Override
+    public void onWifiStateChanged() {
         notifySliceChange();
     }
 
+    /**
+     * Update the results when data changes
+     */
     @Override
-    public void onConnectedChanged() {
+    public void onWifiEntriesChanged() {
+        updateResults();
     }
 
+    /**
+     * Indicates the state of the WifiEntry has changed and clients may retrieve updates through
+     * the WifiEntry getter methods.
+     */
     @Override
-    public void onAccessPointsChanged() {
-        // in case state has changed
-        if (!mWifiTracker.getManager().isWifiEnabled()) {
-            updateResults(null);
-            return;
-        }
-        // AccessPoints are sorted by the WifiTracker
-        final List<AccessPoint> accessPoints = mWifiTracker.getAccessPoints();
-        final List<AccessPoint> resultList = new ArrayList<>();
-        final int apRowCount = getApRowCount();
-        for (AccessPoint ap : accessPoints) {
-            if (ap.isReachable()) {
-                resultList.add(clone(ap));
-                if (resultList.size() >= apRowCount) {
-                    break;
-                }
-            }
-        }
-        updateResults(resultList);
+    public void onUpdated() {
+        updateResults();
     }
 
     protected int getApRowCount() {
         return DEFAULT_EXPANDED_ROW_COUNT;
     }
 
-    private AccessPoint clone(AccessPoint accessPoint) {
-        final Bundle savedState = new Bundle();
-        accessPoint.saveWifiState(savedState);
-        return new AccessPoint(mContext, savedState);
+    @Override
+    public void onNumSavedSubscriptionsChanged() {
+        // Do nothing.
     }
 
     @Override
-    protected boolean areListsTheSame(List<AccessPoint> a, List<AccessPoint> b) {
-        if (!a.equals(b)) {
-            return false;
-        }
+    public void onNumSavedNetworksChanged() {
+        // Do nothing.
+    }
 
-        // compare access point states one by one
-        final int listSize = a.size();
-        for (int i = 0; i < listSize; i++) {
-            if (a.get(i).getDetailedState() != b.get(i).getDetailedState()) {
-                return false;
+    /**
+     * To get the WifiEntry of key.
+     */
+    public WifiEntry getWifiEntry(String key) {
+        // Get specified WifiEntry.
+        WifiEntry keyWifiEntry = null;
+        final WifiEntry connectedWifiEntry = mWifiPickerTracker.getConnectedWifiEntry();
+        if (connectedWifiEntry != null && TextUtils.equals(key, connectedWifiEntry.getKey())) {
+            keyWifiEntry = connectedWifiEntry;
+        } else {
+            for (WifiEntry wifiEntry : mWifiPickerTracker.getWifiEntries()) {
+                if (TextUtils.equals(key, wifiEntry.getKey())) {
+                    keyWifiEntry = wifiEntry;
+                    break;
+                }
             }
         }
-        return true;
+        return keyWifiEntry;
     }
 
-    static void saveClickedWifi(AccessPoint accessPoint) {
-        sClickedWifiSsid = accessPoint.getSsidStr();
-    }
-
-    static void clearClickedWifi() {
-        sClickedWifiSsid = null;
-    }
-
-    static boolean isWifiClicked(WifiInfo info) {
-        final String ssid = WifiInfo.sanitizeSsid(info.getSSID());
-        return !TextUtils.isEmpty(ssid) && TextUtils.equals(ssid, sClickedWifiSsid);
-    }
-
-    protected void clearClickedWifiOnSliceUnpinned() {
-        clearClickedWifi();
-    }
-
-    protected boolean isSessionValid() {
-        return true;
-    }
-
-    public void registerNetworkCallback(Network wifiNetwork) {
-        if (wifiNetwork == null) {
+    @VisibleForTesting
+    void updateResults() {
+        if (mWifiPickerTracker.getWifiState() != WifiManager.WIFI_STATE_ENABLED
+                || mLifecycleRegistry.getCurrentState() != Lifecycle.State.RESUMED) {
+            super.updateResults(null);
             return;
         }
 
-        if (mNetworkCallback != null && mNetworkCallback.isSameNetwork(wifiNetwork)) {
-            return;
+        final List<WifiSliceItem> resultList = new ArrayList<>();
+        final WifiEntry connectedWifiEntry = mWifiPickerTracker.getConnectedWifiEntry();
+        if (connectedWifiEntry != null) {
+            connectedWifiEntry.setListener(this);
+            resultList.add(new WifiSliceItem(getContext(), connectedWifiEntry));
         }
-
-        unregisterNetworkCallback();
-
-        mNetworkCallback = new WifiNetworkCallback(wifiNetwork);
-        mConnectivityManager.registerNetworkCallback(
-                new NetworkRequest.Builder()
-                        .clearCapabilities()
-                        .addTransportType(TRANSPORT_WIFI)
-                        .build(),
-                mNetworkCallback,
-                new Handler(Looper.getMainLooper()));
+        for (WifiEntry wifiEntry : mWifiPickerTracker.getWifiEntries()) {
+            if (resultList.size() >= getApRowCount()) {
+                break;
+            }
+            if (wifiEntry.getLevel() != WifiEntry.WIFI_LEVEL_UNREACHABLE) {
+                wifiEntry.setListener(this);
+                resultList.add(new WifiSliceItem(getContext(), wifiEntry));
+            }
+        }
+        super.updateResults(resultList);
     }
 
-    public void unregisterNetworkCallback() {
-        if (mNetworkCallback != null) {
-            try {
-                mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
-            } catch (RuntimeException e) {
-                Log.e(TAG, "Unregistering CaptivePortalNetworkCallback failed.", e);
-            }
-            mNetworkCallback = null;
+    public void setCarrierNetworkEnabled(boolean enable) {
+        final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
+        if (mergedCarrierEntry != null) {
+            mergedCarrierEntry.setEnabled(enable);
         }
     }
 
-    class WifiNetworkCallback extends NetworkCallback {
-
-        private final Network mNetwork;
-        private boolean mIsCaptivePortal;
-        private boolean mHasPartialConnectivity;
-        private boolean mIsValidated;
-
-        WifiNetworkCallback(Network network) {
-            mNetwork = Preconditions.checkNotNull(network);
-        }
-
-        @Override
-        public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) {
-            if (!isSameNetwork(network)) {
-                return;
-            }
-
-            final boolean prevIsCaptivePortal = mIsCaptivePortal;
-            final boolean prevHasPartialConnectivity = mHasPartialConnectivity;
-            final boolean prevIsValidated = mIsValidated;
-
-            mIsCaptivePortal = nc.hasCapability(NET_CAPABILITY_CAPTIVE_PORTAL);
-            mHasPartialConnectivity = nc.hasCapability(NET_CAPABILITY_PARTIAL_CONNECTIVITY);
-            mIsValidated = nc.hasCapability(NET_CAPABILITY_VALIDATED);
-
-            if (prevIsCaptivePortal == mIsCaptivePortal
-                    && prevHasPartialConnectivity == mHasPartialConnectivity
-                    && prevIsValidated == mIsValidated) {
-                return;
-            }
-
-            notifySliceChange();
-
-            // Automatically start captive portal
-            if (!prevIsCaptivePortal && mIsCaptivePortal
-                    && isWifiClicked(mWifiTracker.getManager().getConnectionInfo())
-                    && isSessionValid()) {
-                final Intent intent = new Intent(mContext, ConnectToWifiHandler.class)
-                        .putExtra(ConnectivityManager.EXTRA_NETWORK, network)
-                        .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-                // Sending a broadcast in the system process needs to specify a user
-                mContext.sendBroadcastAsUser(intent, UserHandle.CURRENT);
-            }
-        }
-
-        /**
-         * Returns true if the supplied network is not null and is the same as the originally
-         * supplied value.
-         */
-        public boolean isSameNetwork(Network network) {
-            return mNetwork.equals(network);
+    public void connectCarrierNetwork() {
+        final MergedCarrierEntry mergedCarrierEntry = mWifiPickerTracker.getMergedCarrierEntry();
+        if (mergedCarrierEntry != null && mergedCarrierEntry.canConnect()) {
+            mergedCarrierEntry.connect(null /* ConnectCallback */);
         }
     }
 }
diff --git a/src/com/android/settings/wifi/slice/WifiSlice.java b/src/com/android/settings/wifi/slice/WifiSlice.java
index a489b05..898de56 100644
--- a/src/com/android/settings/wifi/slice/WifiSlice.java
+++ b/src/com/android/settings/wifi/slice/WifiSlice.java
@@ -29,9 +29,6 @@
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.net.ConnectivityManager;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
@@ -52,9 +49,8 @@
 import com.android.settings.slices.SliceBuilderUtils;
 import com.android.settings.wifi.WifiDialogActivity;
 import com.android.settings.wifi.WifiSettings;
-import com.android.settings.wifi.WifiUtils;
-import com.android.settings.wifi.details.WifiNetworkDetailsFragment;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.settings.wifi.details2.WifiNetworkDetailsFragment2;
+import com.android.wifitrackerlib.WifiEntry;
 
 import java.util.Arrays;
 import java.util.List;
@@ -71,12 +67,10 @@
 
     protected final Context mContext;
     protected final WifiManager mWifiManager;
-    protected final ConnectivityManager mConnectivityManager;
 
     public WifiSlice(Context context) {
         mContext = context;
         mWifiManager = mContext.getSystemService(WifiManager.class);
-        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
     }
 
     @Override
@@ -87,17 +81,16 @@
     @Override
     public Slice getSlice() {
         final boolean isWifiEnabled = isWifiEnabled();
-        ListBuilder listBuilder = getListBuilder(isWifiEnabled, null /* accessPoint */);
+        ListBuilder listBuilder = getListBuilder(isWifiEnabled, null /* wifiSliceItem */);
         if (!isWifiEnabled) {
-            WifiScanWorker.clearClickedWifi();
             return listBuilder.build();
         }
 
         final WifiScanWorker worker = SliceBackgroundWorker.getInstance(getUri());
-        final List<AccessPoint> apList = worker != null ? worker.getResults() : null;
+        final List<WifiSliceItem> apList = worker != null ? worker.getResults() : null;
         final int apCount = apList == null ? 0 : apList.size();
-        final boolean isFirstApActive = apCount > 0 && apList.get(0).isActive();
-        handleNetworkCallback(worker, isFirstApActive);
+        final boolean isFirstApActive = apCount > 0
+                && apList.get(0).getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED;
 
         if (isFirstApActive) {
             // refresh header subtext
@@ -112,7 +105,7 @@
         final CharSequence placeholder = mContext.getText(R.string.summary_placeholder);
         for (int i = 0; i < DEFAULT_EXPANDED_ROW_COUNT; i++) {
             if (i < apCount) {
-                listBuilder.addRow(getAccessPointRow(apList.get(i)));
+                listBuilder.addRow(getWifiSliceItemRow(apList.get(i)));
             } else if (i == apCount) {
                 listBuilder.addRow(getLoadingRow(placeholder));
             } else {
@@ -124,22 +117,12 @@
         return listBuilder.build();
     }
 
-    private void handleNetworkCallback(WifiScanWorker worker, boolean isFirstApActive) {
-        if (worker == null) {
-            return;
-        }
-        if (isFirstApActive) {
-            worker.registerNetworkCallback(mWifiManager.getCurrentNetwork());
-        } else {
-            worker.unregisterNetworkCallback();
-        }
-    }
-
     protected boolean isApRowCollapsed() {
         return false;
     }
 
-    protected ListBuilder.RowBuilder getHeaderRow(boolean isWifiEnabled, AccessPoint accessPoint) {
+    protected ListBuilder.RowBuilder getHeaderRow(boolean isWifiEnabled,
+            WifiSliceItem wifiSliceItem) {
         final IconCompat icon = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_wireless);
         final String title = mContext.getString(R.string.wifi_settings);
@@ -152,121 +135,96 @@
                 .setPrimaryAction(primarySliceAction);
     }
 
-    private ListBuilder getListBuilder(boolean isWifiEnabled, AccessPoint accessPoint) {
+    private ListBuilder getListBuilder(boolean isWifiEnabled, WifiSliceItem wifiSliceItem) {
         final PendingIntent toggleAction = getBroadcastIntent(mContext);
         final SliceAction toggleSliceAction = SliceAction.createToggle(toggleAction,
                 null /* actionTitle */, isWifiEnabled);
         final ListBuilder builder = new ListBuilder(mContext, getUri(), ListBuilder.INFINITY)
                 .setAccentColor(COLOR_NOT_TINTED)
                 .setKeywords(getKeywords())
-                .addRow(getHeaderRow(isWifiEnabled, accessPoint))
+                .addRow(getHeaderRow(isWifiEnabled, wifiSliceItem))
                 .addAction(toggleSliceAction);
         return builder;
     }
 
-    private ListBuilder.RowBuilder getAccessPointRow(AccessPoint accessPoint) {
-        final boolean isCaptivePortal = accessPoint.isActive() && isCaptivePortal();
-        final CharSequence title = accessPoint.getTitle();
-        final CharSequence summary = getAccessPointSummary(accessPoint, isCaptivePortal);
-        final IconCompat levelIcon = getAccessPointLevelIcon(accessPoint);
+    protected ListBuilder.RowBuilder getWifiSliceItemRow(WifiSliceItem wifiSliceItem) {
+        final CharSequence title = wifiSliceItem.getTitle();
+        final IconCompat levelIcon = getWifiSliceItemLevelIcon(wifiSliceItem);
         final ListBuilder.RowBuilder rowBuilder = new ListBuilder.RowBuilder()
                 .setTitleItem(levelIcon, ListBuilder.ICON_IMAGE)
                 .setTitle(title)
-                .setSubtitle(summary)
-                .setPrimaryAction(getAccessPointAction(accessPoint, isCaptivePortal, levelIcon,
-                        title));
+                .setSubtitle(wifiSliceItem.getSummary())
+                .setContentDescription(wifiSliceItem.getContentDescription())
+                .setPrimaryAction(getWifiEntryAction(wifiSliceItem, levelIcon, title));
 
-        if (isCaptivePortal) {
-            rowBuilder.addEndItem(getCaptivePortalEndAction(accessPoint, title));
-        } else {
-            final IconCompat endIcon = getEndIcon(accessPoint);
-            if (endIcon != null) {
-                rowBuilder.addEndItem(endIcon, ListBuilder.ICON_IMAGE);
-            }
+        final IconCompat endIcon = getEndIcon(wifiSliceItem);
+        if (endIcon != null) {
+            rowBuilder.addEndItem(endIcon, ListBuilder.ICON_IMAGE);
         }
         return rowBuilder;
     }
 
-    private CharSequence getAccessPointSummary(AccessPoint accessPoint, boolean isCaptivePortal) {
-        if (isCaptivePortal) {
-            return mContext.getText(R.string.wifi_tap_to_sign_in);
-        }
-
-        final CharSequence summary = accessPoint.getSettingsSummary();
-        return TextUtils.isEmpty(summary) ? mContext.getText(R.string.disconnected) : summary;
-    }
-
-    private IconCompat getAccessPointLevelIcon(AccessPoint accessPoint) {
+    private IconCompat getWifiSliceItemLevelIcon(WifiSliceItem wifiSliceItem) {
         final @ColorInt int tint;
-        if (accessPoint.isActive()) {
-            final NetworkInfo.State state = accessPoint.getNetworkInfo().getState();
-            if (state == NetworkInfo.State.CONNECTED) {
-                tint = Utils.getColorAccentDefaultColor(mContext);
-            } else { // connecting
-                tint = Utils.getDisabled(mContext, Utils.getColorAttrDefaultColor(mContext,
-                        android.R.attr.colorControlNormal));
-            }
-        } else {
+        if (wifiSliceItem.getConnectedState() == WifiEntry.CONNECTED_STATE_CONNECTED) {
+            tint = Utils.getColorAccentDefaultColor(mContext);
+        } else if (wifiSliceItem.getConnectedState() == WifiEntry.CONNECTED_STATE_DISCONNECTED) {
             tint = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorControlNormal);
+        } else {
+            tint = Utils.getDisabled(mContext, Utils.getColorAttrDefaultColor(mContext,
+                        android.R.attr.colorControlNormal));
         }
 
         final Drawable drawable = mContext.getDrawable(
-                com.android.settingslib.Utils.getWifiIconResource(accessPoint.getLevel()));
+                com.android.settingslib.Utils.getWifiIconResource(wifiSliceItem.getLevel()));
         drawable.setTint(tint);
         return Utils.createIconWithDrawable(drawable);
     }
 
-    private IconCompat getEndIcon(AccessPoint accessPoint) {
-        if (accessPoint.isActive()) {
-            return null;
-        } else if (accessPoint.getSecurity() != AccessPoint.SECURITY_NONE) {
+    private IconCompat getEndIcon(WifiSliceItem wifiSliceItem) {
+        if (wifiSliceItem.getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED) {
+            return IconCompat.createWithResource(mContext, R.drawable.ic_settings_24dp);
+        }
+
+        if (wifiSliceItem.getSecurity() != WifiEntry.SECURITY_NONE) {
             return IconCompat.createWithResource(mContext, R.drawable.ic_friction_lock_closed);
-        } else if (accessPoint.isMetered()) {
-            return IconCompat.createWithResource(mContext, R.drawable.ic_friction_money);
         }
         return null;
     }
 
-    private SliceAction getCaptivePortalEndAction(AccessPoint accessPoint, CharSequence title) {
-        return getAccessPointAction(accessPoint, false /* isCaptivePortal */,
-                IconCompat.createWithResource(mContext, R.drawable.ic_settings_accent), title);
-    }
+    private SliceAction getWifiEntryAction(WifiSliceItem wifiSliceItem, IconCompat icon,
+            CharSequence title) {
+        final int requestCode = wifiSliceItem.getKey().hashCode();
 
-    private SliceAction getAccessPointAction(AccessPoint accessPoint, boolean isCaptivePortal,
-            IconCompat icon, CharSequence title) {
-        final int requestCode = accessPoint.hashCode();
-        if (isCaptivePortal) {
-            final Intent intent = new Intent(mContext, ConnectToWifiHandler.class)
-                    .putExtra(ConnectivityManager.EXTRA_NETWORK, mWifiManager.getCurrentNetwork());
-            return getBroadcastAction(requestCode, intent, icon, title);
-        }
-
-        final Bundle extras = new Bundle();
-        accessPoint.saveWifiState(extras);
-
-        if (accessPoint.isActive()) {
+        if (wifiSliceItem.getConnectedState() != WifiEntry.CONNECTED_STATE_DISCONNECTED) {
+            final Bundle bundle = new Bundle();
+            bundle.putString(WifiNetworkDetailsFragment2.KEY_CHOSEN_WIFIENTRY_KEY,
+                    wifiSliceItem.getKey());
             final Intent intent = new SubSettingLauncher(mContext)
                     .setTitleRes(R.string.pref_title_network_details)
-                    .setDestination(WifiNetworkDetailsFragment.class.getName())
-                    .setArguments(extras)
+                    .setDestination(WifiNetworkDetailsFragment2.class.getName())
+                    .setArguments(bundle)
                     .setSourceMetricsCategory(SettingsEnums.WIFI)
                     .toIntent();
             return getActivityAction(requestCode, intent, icon, title);
-        } else if (WifiUtils.getConnectingType(accessPoint) != WifiUtils.CONNECT_TYPE_OTHERS) {
-            final Intent intent = new Intent(mContext, ConnectToWifiHandler.class)
-                    .putExtra(WifiDialogActivity.KEY_ACCESS_POINT_STATE, extras);
-            return getBroadcastAction(requestCode, intent, icon, title);
-        } else {
+        }
+
+        if (wifiSliceItem.shouldEditBeforeConnect()) {
             final Intent intent = new Intent(mContext, WifiDialogActivity.class)
-                    .putExtra(WifiDialogActivity.KEY_ACCESS_POINT_STATE, extras);
+                    .putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, wifiSliceItem.getKey());
             return getActivityAction(requestCode, intent, icon, title);
         }
+
+        final Intent intent = new Intent(mContext, ConnectToWifiHandler.class)
+                .putExtra(ConnectToWifiHandler.KEY_CHOSEN_WIFIENTRY_KEY, wifiSliceItem.getKey())
+                .putExtra(ConnectToWifiHandler.KEY_WIFI_SLICE_URI, getUri());
+        return getBroadcastAction(requestCode, intent, icon, title);
     }
 
     private SliceAction getActivityAction(int requestCode, Intent intent, IconCompat icon,
             CharSequence title) {
         final PendingIntent pi = PendingIntent.getActivity(mContext, requestCode, intent,
-                0 /* flags */);
+                PendingIntent.FLAG_IMMUTABLE /* flags */);
         return SliceAction.createDeeplink(pi, icon, ListBuilder.ICON_IMAGE, title);
     }
 
@@ -274,7 +232,7 @@
             CharSequence title) {
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         final PendingIntent pi = PendingIntent.getBroadcast(mContext, requestCode, intent,
-                PendingIntent.FLAG_UPDATE_CURRENT);
+                PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
         return SliceAction.create(pi, icon, ListBuilder.ICON_IMAGE, title);
     }
 
@@ -291,12 +249,6 @@
                 .setSubtitle(title);
     }
 
-    protected boolean isCaptivePortal() {
-        final NetworkCapabilities nc = mConnectivityManager.getNetworkCapabilities(
-                mWifiManager.getCurrentNetwork());
-        return WifiUtils.canSignIntoNetwork(nc);
-    }
-
     /**
      * Update the current wifi status to the boolean value keyed by
      * {@link android.app.slice.Slice#EXTRA_TOGGLE_STATE} on {@param intent}.
@@ -337,7 +289,7 @@
     private PendingIntent getPrimaryAction() {
         final Intent intent = getIntent();
         return PendingIntent.getActivity(mContext, 0 /* requestCode */,
-                intent, 0 /* flags */);
+                intent, PendingIntent.FLAG_IMMUTABLE /* flags */);
     }
 
     private Set<String> getKeywords() {
diff --git a/src/com/android/settings/wifi/slice/WifiSliceItem.java b/src/com/android/settings/wifi/slice/WifiSliceItem.java
new file mode 100644
index 0000000..7a0f0d7
--- /dev/null
+++ b/src/com/android/settings/wifi/slice/WifiSliceItem.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.slice;
+
+import android.content.Context;
+import android.text.TextUtils;
+
+import com.android.settingslib.R;
+import com.android.wifitrackerlib.WifiEntry;
+
+/**
+ * The data set which is needed by a Wi-Fi Slice, it collects necessary data from {@link WifiEntry}
+ * and provides similar getter methods for corresponding data.
+ */
+public class WifiSliceItem {
+
+    private final Context mContext;
+    private final String mKey;
+    private final String mTitle;
+    private final int mSecurity;
+    private final int mConnectedState;
+    private final int mLevel;
+    private final boolean mShouldEditBeforeConnect;
+    private final String mSummary;
+
+    // These values must be kept within [WifiEntry.WIFI_LEVEL_MIN, WifiEntry.WIFI_LEVEL_MAX]
+    private static final int[] WIFI_CONNECTION_STRENGTH = {
+            R.string.accessibility_no_wifi,
+            R.string.accessibility_wifi_one_bar,
+            R.string.accessibility_wifi_two_bars,
+            R.string.accessibility_wifi_three_bars,
+            R.string.accessibility_wifi_signal_full
+    };
+
+    public WifiSliceItem(Context context, WifiEntry wifiEntry) {
+        mContext = context;
+        mKey = wifiEntry.getKey();
+        mTitle = wifiEntry.getTitle();
+        mSecurity = wifiEntry.getSecurity();
+        mConnectedState = wifiEntry.getConnectedState();
+        mLevel = wifiEntry.getLevel();
+        mShouldEditBeforeConnect = wifiEntry.shouldEditBeforeConnect();
+        mSummary = wifiEntry.getSummary(false /* concise */);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof WifiSliceItem)) {
+            return false;
+        }
+
+        final WifiSliceItem otherItem = (WifiSliceItem) other;
+        if (!TextUtils.equals(getKey(), otherItem.getKey())) {
+            return false;
+        }
+        if (getConnectedState() != otherItem.getConnectedState()) {
+            return false;
+        }
+        if (getLevel() != otherItem.getLevel()) {
+            return false;
+        }
+        if (!TextUtils.equals(getSummary(), otherItem.getSummary())) {
+            return false;
+        }
+        return true;
+    }
+
+    public String getKey() {
+        return mKey;
+    }
+
+    public String getTitle() {
+        return mTitle;
+    }
+
+    public int getSecurity() {
+        return mSecurity;
+    }
+
+    public int getConnectedState() {
+        return mConnectedState;
+    }
+
+    public int getLevel() {
+        return mLevel;
+    }
+
+    /**
+     * In Wi-Fi picker, when users click a saved network, it will connect to the Wi-Fi network.
+     * However, for some special cases, Wi-Fi picker should show Wi-Fi editor UI for users to edit
+     * security or password before connecting. Or users will always get connection fail results.
+     */
+    public boolean shouldEditBeforeConnect() {
+        return mShouldEditBeforeConnect;
+    }
+
+    /**
+     * Returns a 'NOT' concise summary, this is different from WifiEntry#getSummary().
+     */
+    public String getSummary() {
+        return mSummary;
+    }
+
+    /**
+     * This method has similar code as WifiEntryPreference#buildContentDescription().
+     * TODO(b/154191825): Adds WifiEntry#getContentDescription() to replace the duplicate code.
+     */
+    public CharSequence getContentDescription() {
+        CharSequence contentDescription = mTitle;
+        if (!TextUtils.isEmpty(mSummary)) {
+            contentDescription = TextUtils.concat(contentDescription, ",", mSummary);
+        }
+        if (mLevel >= 0 && mLevel < WIFI_CONNECTION_STRENGTH.length) {
+            contentDescription = TextUtils.concat(contentDescription, ",",
+                    mContext.getString(WIFI_CONNECTION_STRENGTH[mLevel]));
+        }
+        return TextUtils.concat(contentDescription, ",", mSecurity == WifiEntry.SECURITY_NONE
+                ? mContext.getString(R.string.accessibility_wifi_security_type_none)
+                : mContext.getString(R.string.accessibility_wifi_security_type_secured));
+    }
+}
diff --git a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
index a4a51dc..be67d22 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherPasswordPreferenceController.java
@@ -118,7 +118,7 @@
 
     @Override
     public boolean isTextValid(String value) {
-        return WifiUtils.isHotspotPasswordValid(value);
+        return WifiUtils.isHotspotWpa2PasswordValid(value);
     }
 
     private static String generateRandomPassword() {
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
index 9e68202..d6c49bc 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java
@@ -129,6 +129,9 @@
         // SettingsActivity as base for all preference fragments.
         final SettingsActivity activity = (SettingsActivity) getActivity();
         final SwitchBar switchBar = activity.getSwitchBar();
+        switchBar.setSwitchBarText(
+                com.android.settingslib.R.string.wifi_hotspot_switch_on_text,
+                com.android.settingslib.R.string.wifi_hotspot_switch_off_text);
         mSwitchBarController = new WifiTetherSwitchBarController(activity, switchBar);
         getSettingsLifecycle().addObserver(mSwitchBarController);
         switchBar.show();
diff --git a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
index 912fb8c..e83eb1c 100644
--- a/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
+++ b/src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
@@ -162,12 +162,12 @@
     }
 
     @Override
-    public void onWhitelistStatusChanged(int uid, boolean isWhitelisted) {
+    public void onAllowlistStatusChanged(int uid, boolean isAllowlisted) {
         // we don't care, since we just want to read the value
     }
 
     @Override
-    public void onBlacklistStatusChanged(int uid, boolean isBlacklisted) {
+    public void onDenylistStatusChanged(int uid, boolean isDenylisted) {
         // we don't care, since we just want to read the value
     }
 }
diff --git a/tests/unit/InstrumentedEntitlementApp/Android.bp b/tests/legacy_unit/InstrumentedEntitlementApp/Android.bp
similarity index 100%
rename from tests/unit/InstrumentedEntitlementApp/Android.bp
rename to tests/legacy_unit/InstrumentedEntitlementApp/Android.bp
diff --git a/tests/unit/InstrumentedEntitlementApp/AndroidManifest.xml b/tests/legacy_unit/InstrumentedEntitlementApp/AndroidManifest.xml
similarity index 100%
rename from tests/unit/InstrumentedEntitlementApp/AndroidManifest.xml
rename to tests/legacy_unit/InstrumentedEntitlementApp/AndroidManifest.xml
diff --git a/tests/unit/InstrumentedEntitlementApp/src/android/test/entitlement/InstrumentedEntitlementActivity.java b/tests/legacy_unit/InstrumentedEntitlementApp/src/android/test/entitlement/InstrumentedEntitlementActivity.java
similarity index 100%
rename from tests/unit/InstrumentedEntitlementApp/src/android/test/entitlement/InstrumentedEntitlementActivity.java
rename to tests/legacy_unit/InstrumentedEntitlementApp/src/android/test/entitlement/InstrumentedEntitlementActivity.java
diff --git a/tests/legacy_unit/README b/tests/legacy_unit/README
new file mode 100644
index 0000000..9e318d7
--- /dev/null
+++ b/tests/legacy_unit/README
@@ -0,0 +1 @@
+Directory for legacy settings unit tests, which are no longer maintained.
diff --git a/tests/unit/src/com/android/settings/UserCredentialsTest.java b/tests/legacy_unit/src/com/android/settings/UserCredentialsTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/UserCredentialsTest.java
rename to tests/legacy_unit/src/com/android/settings/UserCredentialsTest.java
diff --git a/tests/unit/src/com/android/settings/UtilsTest.java b/tests/legacy_unit/src/com/android/settings/UtilsTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/UtilsTest.java
rename to tests/legacy_unit/src/com/android/settings/UtilsTest.java
diff --git a/tests/unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/legacy_unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
rename to tests/legacy_unit/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
diff --git a/tests/unit/src/com/android/settings/accounts/AccountsSettingsTest.java b/tests/legacy_unit/src/com/android/settings/accounts/AccountsSettingsTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/accounts/AccountsSettingsTest.java
rename to tests/legacy_unit/src/com/android/settings/accounts/AccountsSettingsTest.java
diff --git a/tests/unit/src/com/android/settings/accounts/Authenticator.java b/tests/legacy_unit/src/com/android/settings/accounts/Authenticator.java
similarity index 100%
rename from tests/unit/src/com/android/settings/accounts/Authenticator.java
rename to tests/legacy_unit/src/com/android/settings/accounts/Authenticator.java
diff --git a/tests/unit/src/com/android/settings/accounts/TestAuthService.java b/tests/legacy_unit/src/com/android/settings/accounts/TestAuthService.java
similarity index 100%
rename from tests/unit/src/com/android/settings/accounts/TestAuthService.java
rename to tests/legacy_unit/src/com/android/settings/accounts/TestAuthService.java
diff --git a/tests/unit/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.java b/tests/legacy_unit/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.java
rename to tests/legacy_unit/src/com/android/settings/applications/manageapplications/ManageApplicationsUnitTest.java
diff --git a/tests/unit/src/com/android/settings/backup/BackupIntentTest.java b/tests/legacy_unit/src/com/android/settings/backup/BackupIntentTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/backup/BackupIntentTest.java
rename to tests/legacy_unit/src/com/android/settings/backup/BackupIntentTest.java
diff --git a/tests/unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java b/tests/legacy_unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
rename to tests/legacy_unit/src/com/android/settings/bluetooth/Utf8ByteLengthFilterTest.java
diff --git a/tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java b/tests/legacy_unit/src/com/android/settings/core/LifecycleEventHandlingTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/core/LifecycleEventHandlingTest.java
rename to tests/legacy_unit/src/com/android/settings/core/LifecycleEventHandlingTest.java
diff --git a/tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java b/tests/legacy_unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java
similarity index 100%
rename from tests/unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java
rename to tests/legacy_unit/src/com/android/settings/dashboard/FirstIdViewMatcher.java
diff --git a/tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java b/tests/legacy_unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
rename to tests/legacy_unit/src/com/android/settings/dashboard/PreferenceThemeTest.java
diff --git a/tests/unit/src/com/android/settings/dashboard/UiBlockerControllerTest.java b/tests/legacy_unit/src/com/android/settings/dashboard/UiBlockerControllerTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/dashboard/UiBlockerControllerTest.java
rename to tests/legacy_unit/src/com/android/settings/dashboard/UiBlockerControllerTest.java
diff --git a/tests/unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/legacy_unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
rename to tests/legacy_unit/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
diff --git a/tests/unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java b/tests/legacy_unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java
rename to tests/legacy_unit/src/com/android/settings/display/NightDisplaySettingsActivityTest.java
diff --git a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/legacy_unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
rename to tests/legacy_unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
diff --git a/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/legacy_unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
rename to tests/legacy_unit/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java
diff --git a/tests/unit/src/com/android/settings/notification/AppBubbleNotificationSettingsTest.java b/tests/legacy_unit/src/com/android/settings/notification/AppBubbleNotificationSettingsTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/notification/AppBubbleNotificationSettingsTest.java
rename to tests/legacy_unit/src/com/android/settings/notification/AppBubbleNotificationSettingsTest.java
diff --git a/tests/unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java b/tests/legacy_unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java
rename to tests/legacy_unit/src/com/android/settings/notification/ChannelNotificationSettingsTest.java
diff --git a/tests/unit/src/com/android/settings/notification/OWNERS b/tests/legacy_unit/src/com/android/settings/notification/OWNERS
similarity index 100%
rename from tests/unit/src/com/android/settings/notification/OWNERS
rename to tests/legacy_unit/src/com/android/settings/notification/OWNERS
diff --git a/tests/legacy_unit/src/com/android/settings/notification/app/ChannelListPreferenceControllerTest.java b/tests/legacy_unit/src/com/android/settings/notification/app/ChannelListPreferenceControllerTest.java
new file mode 100644
index 0000000..b54782c
--- /dev/null
+++ b/tests/legacy_unit/src/com/android/settings/notification/app/ChannelListPreferenceControllerTest.java
@@ -0,0 +1,395 @@
+/*
+ * Copyright (C) 2020 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.notification.app;
+
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_NONE;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertFalse;
+import static junit.framework.TestCase.assertNotNull;
+import static junit.framework.TestCase.assertNull;
+import static junit.framework.TestCase.assertTrue;
+
+import android.app.Instrumentation;
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.content.Context;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.settings.notification.NotificationBackend;
+import com.android.settings.notification.NotificationBackend.NotificationsSentState;
+import com.android.settings.widget.PrimarySwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class ChannelListPreferenceControllerTest {
+    private Context mContext;
+    private NotificationBackend mBackend;
+    private NotificationBackend.AppRow mAppRow;
+    private ChannelListPreferenceController mController;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mPreferenceScreen;
+    private PreferenceCategory mGroupList;
+
+    @Before
+    public void setUp() throws Exception {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        mContext = instrumentation.getTargetContext();
+
+        instrumentation.runOnMainSync(() -> {
+            mBackend = new NotificationBackend();
+            mAppRow = mBackend.loadAppRow(mContext,
+                    mContext.getPackageManager(), mContext.getApplicationInfo());
+            mController = new ChannelListPreferenceController(mContext, mBackend);
+            mController.onResume(mAppRow, null, null, null, null, null);
+            mPreferenceManager = new PreferenceManager(mContext);
+            mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+            mGroupList = new PreferenceCategory(mContext);
+            mPreferenceScreen.addPreference(mGroupList);
+        });
+    }
+
+    @Test
+    @UiThreadTest
+    public void testUpdateFullList_incrementalUpdates() {
+        // Start by testing the case with no groups or channels
+        List<NotificationChannelGroup> inGroups = new ArrayList<>();
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            assertEquals("zeroCategories", mGroupList.getPreference(0).getKey());
+        }
+
+        // Test that adding a group clears the zero category and adds everything
+        NotificationChannelGroup inGroup1 = new NotificationChannelGroup("group1", "Group 1");
+        inGroup1.addChannel(new NotificationChannel("ch1a", "Channel 1A", IMPORTANCE_DEFAULT));
+        inGroups.add(inGroup1);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group1", group1.getKey());
+            assertEquals(2, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+        }
+
+        // Test that adding a channel works -- no dupes or omissions
+        inGroup1.addChannel(new NotificationChannel("ch1b", "Channel 1B", IMPORTANCE_DEFAULT));
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B", group1.getPreference(2).getTitle());
+        }
+
+        // Test that renaming a channel does in fact rename the preferences
+        inGroup1.getChannels().get(1).setName("Channel 1B - Renamed");
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B - Renamed", group1.getPreference(2).getTitle());
+        }
+
+        // Test that adding a group works and results in the correct sorting.
+        NotificationChannelGroup inGroup0 = new NotificationChannelGroup("group0", "Group 0");
+        inGroup0.addChannel(new NotificationChannel("ch0b", "Channel 0B", IMPORTANCE_DEFAULT));
+        // NOTE: updateFullList takes a List which has been sorted, so we insert at 0 for this check
+        inGroups.add(0, inGroup0);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(2, mGroupList.getPreferenceCount());
+            PreferenceGroup group0 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group0", group0.getKey());
+            assertEquals(2, group0.getPreferenceCount());
+            assertNull(group0.getPreference(0).getKey());
+            assertEquals("All \"Group 0\" notifications", group0.getPreference(0).getTitle());
+            assertEquals("ch0b", group0.getPreference(1).getKey());
+            assertEquals("Channel 0B", group0.getPreference(1).getTitle());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(1);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B - Renamed", group1.getPreference(2).getTitle());
+        }
+
+        // Test that adding a channel that comes before another works and has correct ordering.
+        // NOTE: the channels within a group are sorted inside updateFullList.
+        inGroup0.addChannel(new NotificationChannel("ch0a", "Channel 0A", IMPORTANCE_DEFAULT));
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(2, mGroupList.getPreferenceCount());
+            PreferenceGroup group0 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group0", group0.getKey());
+            assertEquals(3, group0.getPreferenceCount());
+            assertNull(group0.getPreference(0).getKey());
+            assertEquals("All \"Group 0\" notifications", group0.getPreference(0).getTitle());
+            assertEquals("ch0a", group0.getPreference(1).getKey());
+            assertEquals("Channel 0A", group0.getPreference(1).getTitle());
+            assertEquals("ch0b", group0.getPreference(2).getKey());
+            assertEquals("Channel 0B", group0.getPreference(2).getTitle());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(1);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B - Renamed", group1.getPreference(2).getTitle());
+        }
+
+        // Test that the "Other" group works.
+        // Also test a simultaneous addition and deletion.
+        inGroups.remove(inGroup0);
+        NotificationChannelGroup inGroupOther = new NotificationChannelGroup(null, null);
+        inGroupOther.addChannel(new NotificationChannel("chXa", "Other A", IMPORTANCE_DEFAULT));
+        inGroupOther.addChannel(new NotificationChannel("chXb", "Other B", IMPORTANCE_DEFAULT));
+        inGroups.add(inGroupOther);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(2, mGroupList.getPreferenceCount());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B - Renamed", group1.getPreference(2).getTitle());
+            PreferenceGroup groupOther = (PreferenceGroup) mGroupList.getPreference(1);
+            assertEquals("categories", groupOther.getKey());
+            assertEquals(2, groupOther.getPreferenceCount());
+            assertEquals("chXa", groupOther.getPreference(0).getKey());
+            assertEquals("Other A", groupOther.getPreference(0).getTitle());
+            assertEquals("chXb", groupOther.getPreference(1).getKey());
+            assertEquals("Other B", groupOther.getPreference(1).getTitle());
+        }
+
+        // Test that the removal of a channel works.
+        inGroupOther.getChannels().remove(0);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(2, mGroupList.getPreferenceCount());
+            PreferenceGroup group1 = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group1", group1.getKey());
+            assertEquals(3, group1.getPreferenceCount());
+            assertNull(group1.getPreference(0).getKey());
+            assertEquals("All \"Group 1\" notifications", group1.getPreference(0).getTitle());
+            assertEquals("ch1a", group1.getPreference(1).getKey());
+            assertEquals("Channel 1A", group1.getPreference(1).getTitle());
+            assertEquals("ch1b", group1.getPreference(2).getKey());
+            assertEquals("Channel 1B - Renamed", group1.getPreference(2).getTitle());
+            PreferenceGroup groupOther = (PreferenceGroup) mGroupList.getPreference(1);
+            assertEquals("categories", groupOther.getKey());
+            assertEquals(1, groupOther.getPreferenceCount());
+            assertEquals("chXb", groupOther.getPreference(0).getKey());
+            assertEquals("Other B", groupOther.getPreference(0).getTitle());
+        }
+
+        // Test that we go back to the empty state when clearing all groups and channels.
+        inGroups.clear();
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            assertEquals("zeroCategories", mGroupList.getPreference(0).getKey());
+        }
+    }
+
+
+    @Test
+    @UiThreadTest
+    public void testUpdateFullList_groupBlockedChange() {
+        List<NotificationChannelGroup> inGroups = new ArrayList<>();
+        NotificationChannelGroup inGroup = new NotificationChannelGroup("group", "My Group");
+        inGroup.addChannel(new NotificationChannel("channelA", "Channel A", IMPORTANCE_DEFAULT));
+        inGroup.addChannel(new NotificationChannel("channelB", "Channel B", IMPORTANCE_NONE));
+        inGroups.add(inGroup);
+
+        // Test that the group is initially showing all preferences
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group", group.getKey());
+            assertEquals(3, group.getPreferenceCount());
+            SwitchPreference groupBlockPref = (SwitchPreference) group.getPreference(0);
+            assertNull(groupBlockPref.getKey());
+            assertEquals("All \"My Group\" notifications", groupBlockPref.getTitle());
+            assertTrue(groupBlockPref.isChecked());
+            PrimarySwitchPreference channelAPref = (PrimarySwitchPreference) group.getPreference(1);
+            assertEquals("channelA", channelAPref.getKey());
+            assertEquals("Channel A", channelAPref.getTitle());
+            assertEquals(Boolean.TRUE, channelAPref.getCheckedState());
+            PrimarySwitchPreference channelBPref = (PrimarySwitchPreference) group.getPreference(2);
+            assertEquals("channelB", channelBPref.getKey());
+            assertEquals("Channel B", channelBPref.getTitle());
+            assertEquals(Boolean.FALSE, channelBPref.getCheckedState());
+        }
+
+        // Test that when a group is blocked, the list removes its individual channel preferences
+        inGroup.setBlocked(true);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group", group.getKey());
+            assertEquals(1, group.getPreferenceCount());
+            SwitchPreference groupBlockPref = (SwitchPreference) group.getPreference(0);
+            assertNull(groupBlockPref.getKey());
+            assertEquals("All \"My Group\" notifications", groupBlockPref.getTitle());
+            assertFalse(groupBlockPref.isChecked());
+        }
+
+        // Test that when a group is unblocked, the list adds its individual channel preferences
+        inGroup.setBlocked(false);
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group", group.getKey());
+            assertEquals(3, group.getPreferenceCount());
+            SwitchPreference groupBlockPref = (SwitchPreference) group.getPreference(0);
+            assertNull(groupBlockPref.getKey());
+            assertEquals("All \"My Group\" notifications", groupBlockPref.getTitle());
+            assertTrue(groupBlockPref.isChecked());
+            PrimarySwitchPreference channelAPref = (PrimarySwitchPreference) group.getPreference(1);
+            assertEquals("channelA", channelAPref.getKey());
+            assertEquals("Channel A", channelAPref.getTitle());
+            assertEquals(Boolean.TRUE, channelAPref.getCheckedState());
+            PrimarySwitchPreference channelBPref = (PrimarySwitchPreference) group.getPreference(2);
+            assertEquals("channelB", channelBPref.getKey());
+            assertEquals("Channel B", channelBPref.getTitle());
+            assertEquals(Boolean.FALSE, channelBPref.getCheckedState());
+        }
+    }
+
+    @Test
+    @UiThreadTest
+    public void testUpdateFullList_channelUpdates() {
+        List<NotificationChannelGroup> inGroups = new ArrayList<>();
+        NotificationChannelGroup inGroup = new NotificationChannelGroup("group", "Group");
+        NotificationChannel channelA =
+                new NotificationChannel("channelA", "Channel A", IMPORTANCE_HIGH);
+        NotificationChannel channelB =
+                new NotificationChannel("channelB", "Channel B", IMPORTANCE_NONE);
+        inGroup.addChannel(channelA);
+        inGroup.addChannel(channelB);
+        inGroups.add(inGroup);
+
+        NotificationsSentState sentA = new NotificationsSentState();
+        sentA.avgSentDaily = 2;
+        sentA.avgSentWeekly = 10;
+        NotificationsSentState sentB = new NotificationsSentState();
+        sentB.avgSentDaily = 0;
+        sentB.avgSentWeekly = 2;
+        mAppRow.sentByChannel.put("channelA", sentA);
+
+        // Test that the channels' properties are reflected in the preference
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group", group.getKey());
+            assertEquals(3, group.getPreferenceCount());
+            assertNull(group.getPreference(0).getKey());
+            assertEquals("All \"Group\" notifications", group.getPreference(0).getTitle());
+            PrimarySwitchPreference channelAPref = (PrimarySwitchPreference) group.getPreference(1);
+            assertEquals("channelA", channelAPref.getKey());
+            assertEquals("Channel A", channelAPref.getTitle());
+            assertEquals(Boolean.TRUE, channelAPref.getCheckedState());
+            assertEquals("~2 notifications per day", channelAPref.getSummary());
+            assertNotNull(channelAPref.getIcon());
+            PrimarySwitchPreference channelBPref = (PrimarySwitchPreference) group.getPreference(2);
+            assertEquals("channelB", channelBPref.getKey());
+            assertEquals("Channel B", channelBPref.getTitle());
+            assertEquals(Boolean.FALSE, channelBPref.getCheckedState());
+            assertNull(channelBPref.getSummary());
+            assertNull(channelBPref.getIcon());
+        }
+
+        channelA.setImportance(IMPORTANCE_NONE);
+        channelB.setImportance(IMPORTANCE_DEFAULT);
+
+        mAppRow.sentByChannel.remove("channelA");
+        mAppRow.sentByChannel.put("channelB", sentB);
+
+        // Test that changing the channels' properties correctly updates the preference
+        mController.updateFullList(mGroupList, inGroups);
+        {
+            assertEquals(1, mGroupList.getPreferenceCount());
+            PreferenceGroup group = (PreferenceGroup) mGroupList.getPreference(0);
+            assertEquals("group", group.getKey());
+            assertEquals(3, group.getPreferenceCount());
+            assertNull(group.getPreference(0).getKey());
+            assertEquals("All \"Group\" notifications", group.getPreference(0).getTitle());
+            PrimarySwitchPreference channelAPref = (PrimarySwitchPreference) group.getPreference(1);
+            assertEquals("channelA", channelAPref.getKey());
+            assertEquals("Channel A", channelAPref.getTitle());
+            assertEquals(Boolean.FALSE, channelAPref.getCheckedState());
+            assertNull(channelAPref.getSummary());
+            assertNull(channelAPref.getIcon());
+            PrimarySwitchPreference channelBPref = (PrimarySwitchPreference) group.getPreference(2);
+            assertEquals("channelB", channelBPref.getKey());
+            assertEquals("Channel B", channelBPref.getTitle());
+            assertEquals(Boolean.TRUE, channelBPref.getCheckedState());
+            assertEquals("~2 notifications per week", channelBPref.getSummary());
+            assertNotNull(channelBPref.getIcon());
+        }
+    }
+
+}
diff --git a/tests/legacy_unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/legacy_unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
new file mode 100644
index 0000000..037c805
--- /dev/null
+++ b/tests/legacy_unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
@@ -0,0 +1,121 @@
+/*
+ * 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.password;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.action.ViewActions.click;
+import static androidx.test.espresso.action.ViewActions.pressKey;
+import static androidx.test.espresso.assertion.ViewAssertions.matches;
+import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
+import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
+import static androidx.test.espresso.matcher.ViewMatchers.withId;
+import static androidx.test.espresso.matcher.ViewMatchers.withText;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.hamcrest.CoreMatchers.not;
+
+import android.content.Context;
+import android.view.KeyEvent;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.espresso.action.ViewActions;
+import androidx.test.espresso.matcher.ViewMatchers;
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.settings.R;
+
+import com.google.android.setupcompat.PartnerCustomizationLayout;
+import com.google.android.setupcompat.template.FooterBarMixin;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@MediumTest
+public class SetupChooseLockPasswordAppTest {
+
+    private Context mContext;
+
+    @Rule
+    public ActivityTestRule<SetupChooseLockPassword> mActivityTestRule =
+            new ActivityTestRule<>(
+                    SetupChooseLockPassword.class,
+                    true /* enable touch at launch */,
+                    false /* don't launch at every test */);
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
+    public void testSkipDialogIsShown() throws Throwable {
+        SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null);
+        PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
+        final Button skipOrClearButton =
+                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
+
+        assertThat(skipOrClearButton.getText()).isEqualTo(mContext.getString(R.string.skip_label));
+        assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE);
+        skipOrClearButton.performClick();
+        assertWithMessage("Is finishing").that(activity.isFinishing()).isTrue();
+    }
+
+    @Test
+    public void clearIsNotShown_when_activityLaunchedInitially() {
+        SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null);
+        PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
+        assertThat(layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getText())
+                .isEqualTo(mContext.getString(R.string.lockpassword_clear_label));
+    }
+
+    @Test
+    public void clearIsNotShown_when_nothingEntered() throws Throwable {
+        SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null);
+        PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
+        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
+                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
+        assertThat(
+                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility())
+                        .isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void clearIsShown_when_somethingEnteredToConfirm() {
+        SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null);
+        PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
+        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
+               .perform(pressKey(KeyEvent.KEYCODE_ENTER));
+        mActivityTestRule.launchActivity(null);
+        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
+                .perform(pressKey(KeyEvent.KEYCODE_ENTER))
+                .perform(ViewActions.typeText("1"));
+        // clear should be present if text field contains content
+        assertThat(
+                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility())
+                        .isEqualTo(View.VISIBLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java b/tests/legacy_unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java
rename to tests/legacy_unit/src/com/android/settings/print/PrintJobSettingsActivityTest.java
diff --git a/tests/unit/src/com/android/settings/search/SearchIndexablesContractTest.java b/tests/legacy_unit/src/com/android/settings/search/SearchIndexablesContractTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/search/SearchIndexablesContractTest.java
rename to tests/legacy_unit/src/com/android/settings/search/SearchIndexablesContractTest.java
diff --git a/tests/unit/src/com/android/settings/search/SearchResultTrampolineTest.java b/tests/legacy_unit/src/com/android/settings/search/SearchResultTrampolineTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/search/SearchResultTrampolineTest.java
rename to tests/legacy_unit/src/com/android/settings/search/SearchResultTrampolineTest.java
diff --git a/tests/unit/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/legacy_unit/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
rename to tests/legacy_unit/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
diff --git a/tests/legacy_unit/src/com/android/settings/sim/OWNERS b/tests/legacy_unit/src/com/android/settings/sim/OWNERS
new file mode 100644
index 0000000..273597e
--- /dev/null
+++ b/tests/legacy_unit/src/com/android/settings/sim/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/sim/OWNERS
diff --git a/tests/unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java b/tests/legacy_unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
rename to tests/legacy_unit/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
diff --git a/tests/unit/src/com/android/settings/tests/Manufacturer.java b/tests/legacy_unit/src/com/android/settings/tests/Manufacturer.java
similarity index 100%
rename from tests/unit/src/com/android/settings/tests/Manufacturer.java
rename to tests/legacy_unit/src/com/android/settings/tests/Manufacturer.java
diff --git a/tests/unit/src/com/android/settings/tests/Operator.java b/tests/legacy_unit/src/com/android/settings/tests/Operator.java
similarity index 100%
rename from tests/unit/src/com/android/settings/tests/Operator.java
rename to tests/legacy_unit/src/com/android/settings/tests/Operator.java
diff --git a/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java b/tests/legacy_unit/src/com/android/settings/utils/FileSizeFormatterTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java
rename to tests/legacy_unit/src/com/android/settings/utils/FileSizeFormatterTest.java
diff --git a/tests/unit/src/com/android/settings/utils/MockedServiceManager.java b/tests/legacy_unit/src/com/android/settings/utils/MockedServiceManager.java
similarity index 100%
rename from tests/unit/src/com/android/settings/utils/MockedServiceManager.java
rename to tests/legacy_unit/src/com/android/settings/utils/MockedServiceManager.java
diff --git a/tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java b/tests/legacy_unit/src/com/android/settings/vpn2/AppSettingsTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/vpn2/AppSettingsTest.java
rename to tests/legacy_unit/src/com/android/settings/vpn2/AppSettingsTest.java
diff --git a/tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java b/tests/legacy_unit/src/com/android/settings/vpn2/PreferenceListTest.java
similarity index 100%
rename from tests/unit/src/com/android/settings/vpn2/PreferenceListTest.java
rename to tests/legacy_unit/src/com/android/settings/vpn2/PreferenceListTest.java
diff --git a/tests/legacy_unit/src/com/android/settings/wifi/calling/OWNERS b/tests/legacy_unit/src/com/android/settings/wifi/calling/OWNERS
new file mode 100644
index 0000000..b592652
--- /dev/null
+++ b/tests/legacy_unit/src/com/android/settings/wifi/calling/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/wifi/calling/OWNERS
diff --git a/tests/perftests/Android.bp b/tests/perftests/Android.bp
index 7708bbe..1ba5d9c 100644
--- a/tests/perftests/Android.bp
+++ b/tests/perftests/Android.bp
@@ -19,4 +19,4 @@
     test_suites: ["device-tests"],
 
     instrumentation_for: "Settings",
-}
\ No newline at end of file
+}
diff --git a/tests/perftests/AndroidManifest.xml b/tests/perftests/AndroidManifest.xml
index 972467f..8aae24a 100644
--- a/tests/perftests/AndroidManifest.xml
+++ b/tests/perftests/AndroidManifest.xml
@@ -15,15 +15,15 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.settings.tests.perf">
+    package="com.android.settings.tests.perf">
 
     <application>
-        <uses-library android:name="android.test.runner"/>
+        <uses-library android:name="android.test.runner" />
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.settings.tests.perf"
-                     android:label="Settings Performance Test Cases">
+        android:targetPackage="com.android.settings.tests.perf"
+        android:label="Settings Performance Test Cases">
     </instrumentation>
 
 </manifest>
diff --git a/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
index f55598c..a8c5230 100644
--- a/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
+++ b/tests/perftests/src/com/android/settings/tests/perf/LaunchSettingsTest.java
@@ -21,8 +21,10 @@
 
 import android.app.Instrumentation;
 import android.os.Bundle;
+import android.util.Log;
 import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiSelector;
 import android.support.test.uiautomator.Until;
 
 import androidx.test.InstrumentationRegistry;
@@ -34,9 +36,9 @@
 import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Collections;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -54,10 +56,13 @@
         }
     }
 
+    private static final String SCREEN_TIME_OUT = "7200000";
+    private static final String DEFAULT_SCREEN_TIMEOUT = "15000";
     private static final int TIME_OUT = 5000;
     private static final int TEST_TIME = 10;
     private static final Pattern PATTERN = Pattern.compile("TotalTime:\\s[0-9]*");
     private static final Page[] PAGES;
+    private static final String TAG = "SettingsPerfTests";
 
     static {
         PAGES = new Page[]{
@@ -65,7 +70,8 @@
                 new Page("android.settings.WIFI_SETTINGS", "Use Wi‑Fi", "Wi-Fi"),
                 new Page("android.settings.BLUETOOTH_SETTINGS", "Connected devices", "BlueTooth"),
                 new Page("android.settings.APPLICATION_SETTINGS", "App info", "Application"),
-                new Page("android.intent.action.POWER_USAGE_SUMMARY", "Battery", "Battery")
+                new Page("android.intent.action.POWER_USAGE_SUMMARY", "Battery", "Battery"),
+                new Page("android.settings.INTERNAL_STORAGE_SETTINGS", "Storage", "Storage")
         };
     }
 
@@ -73,6 +79,8 @@
     private UiDevice mDevice;
     private Instrumentation mInstrumentation;
     private Map<String, ArrayList<Integer>> mResult;
+    private String mDefaultScreenTimeout;
+    private String mDefaultAirplaneModeStatus;
 
     @Before
     public void setUp() throws Exception {
@@ -80,6 +88,11 @@
         mDevice = UiDevice.getInstance(getInstrumentation());
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mResult = new LinkedHashMap<>();
+        mDefaultScreenTimeout = mDevice.executeShellCommand(
+                "settings get system screen_off_timeout");
+        mDefaultAirplaneModeStatus = getAirplaneModeStatus();
+        setScreenTimeOut(SCREEN_TIME_OUT);
+        setAirplaneMode();
         mDevice.pressHome();
         mDevice.waitForIdle(TIME_OUT);
 
@@ -92,6 +105,9 @@
     public void tearDown() throws Exception {
         putResultToBundle();
         mInstrumentation.sendStatus(0, mBundle);
+        resetScreenTimeout();
+        resetAirplaneMode();
+        closeApp();
     }
 
     @Test
@@ -105,19 +121,19 @@
 
     private void executePreformanceTest(String action, String displayName, String title)
             throws Exception {
+        closeApp();
+        mDevice.waitForIdle(TIME_OUT);
         final String mString = mDevice.executeShellCommand("am start -W -a" + action);
         mDevice.wait(Until.findObject(By.text(displayName)), TIME_OUT);
         handleLaunchResult(title, mString);
-        closeApp();
-        mDevice.waitForIdle(TIME_OUT);
     }
 
-    private void handleLaunchResult(String title, String s) {
-        Matcher mMatcher = PATTERN.matcher(s);
+    private void handleLaunchResult(String title, String shellCommandResult) {
+        Matcher mMatcher = PATTERN.matcher(shellCommandResult);
         if (mMatcher.find()) {
             mResult.get(title).add(Integer.valueOf(mMatcher.group().split("\\s")[1]));
         } else {
-            fail("Some pages can't be found");
+            fail(String.format("Not found %s.\n %s", title, shellCommandResult));
         }
     }
 
@@ -129,23 +145,92 @@
     private void putResultToBundle() {
         for (String string : mResult.keySet()) {
             mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "max"),
-                    getMax(mResult.get(string)));
+                    getMax(string));
             mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "min"),
-                    getMin(mResult.get(string)));
+                    getMin(string));
             mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "avg"),
-                    getAvg(mResult.get(string)));
+                    getAvg(string));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "25 Percentile"),
+                    getPercentile(string, 25));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "50 Percentile"),
+                    getPercentile(string, 50));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "75 Percentile"),
+                    getPercentile(string, 75));
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "all_results"),
+                    mResult.get(string).toString());
+            mBundle.putString(String.format("LaunchSettingsTest_%s_%s", string, "results_count"),
+                    String.valueOf(mResult.get(string).size()));
         }
     }
 
-    private String getMax(ArrayList<Integer> launchResult) {
-        return String.format("%s", launchResult.isEmpty() ? "null" : Collections.max(launchResult));
+    private String getMax(String page) {
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.format("%s", Collections.max(mResult.get(page)));
+        }
+        Log.e(TAG, String.format("Fail to get max of %s.", page));
+        return "0";
+
     }
 
-    private String getMin(ArrayList<Integer> launchResult) {
-        return String.format("%s", launchResult.isEmpty() ? "null" : Collections.min(launchResult));
+    private String getMin(String page) {
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.format("%s", Collections.min(mResult.get(page)));
+        }
+        Log.e(TAG, String.format("Fail to get min of %s.", page));
+        return "0";
     }
 
-    private String getAvg(ArrayList<Integer> launchResult) {
-        return String.valueOf((int) launchResult.stream().mapToInt(i -> i).average().orElse(0));
+    private String getAvg(String page) {
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.valueOf((int) mResult.get(page).stream().mapToInt(
+                    i -> i).average().orElse(0));
+        }
+        Log.e(TAG, String.format("Fail to get avg of %s.", page));
+        return "0";
+    }
+
+    private void setScreenTimeOut(String timeout) throws Exception {
+        mDevice.executeShellCommand("settings put system screen_off_timeout " + timeout);
+    }
+
+    private void resetScreenTimeout() throws Exception {
+        String timeout = DEFAULT_SCREEN_TIMEOUT;
+        if (!mDefaultScreenTimeout.isEmpty()) {
+            timeout = mDefaultScreenTimeout;
+        }
+        setScreenTimeOut(timeout);
+    }
+
+    private void setAirplaneMode() throws Exception {
+        if (mDefaultAirplaneModeStatus.equals("0\n")) {
+            clickAirplaneMode();
+        }
+    }
+
+    private void resetAirplaneMode() throws Exception {
+        if (!getAirplaneModeStatus().equals(mDefaultAirplaneModeStatus)) {
+            clickAirplaneMode();
+        }
+    }
+
+    private void clickAirplaneMode() throws Exception {
+        mDevice.executeShellCommand("am start -W -a android.settings.AIRPLANE_MODE_SETTINGS");
+        mDevice.waitForIdle(TIME_OUT);
+        mDevice.findObject(By.textContains("Airplane")).click();
+        mDevice.waitForIdle(TIME_OUT);
+    }
+
+    private String getAirplaneModeStatus() throws Exception {
+        return mDevice.executeShellCommand("settings get global airplane_mode_on");
+    }
+
+    private String getPercentile(String page, double position) {
+        Collections.sort(mResult.get(page));
+        if (mResult.get(page).size() == TEST_TIME) {
+            return String.valueOf(
+                    mResult.get(page).get((int) (Math.ceil(TEST_TIME * position / 100)) - 1));
+        }
+        Log.e(TAG, String.format("Fail to get percentile of %s.", page));
+        return "0";
     }
 }
\ No newline at end of file
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index efef10a..c8c6c38 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -49,6 +49,7 @@
         "telephony-common",
         "ims-common",
     ],
+    uses_libs: ["org.apache.http.legacy"],
 }
 
 //############################################################
@@ -68,6 +69,10 @@
         "androidx.test.ext.junit",
     ],
 
+    libs: [
+        "ims-common",
+    ],
+
     java_resource_dirs: ["config", "resources"],
 
     instrumentation_for: "SettingsRoboTestStub",
diff --git a/tests/robotests/assets/exempt_invalid_base_preference_controller_constructor b/tests/robotests/assets/exempt_invalid_base_preference_controller_constructor
new file mode 100644
index 0000000..b8c2575
--- /dev/null
+++ b/tests/robotests/assets/exempt_invalid_base_preference_controller_constructor
@@ -0,0 +1,14 @@
+com.android.settings.applications.appinfo.AppButtonsPreferenceController
+com.android.settings.applications.appinfo.AppBatteryPreferenceController
+com.android.settings.applications.appinfo.AppHeaderViewPreferenceController
+com.android.settings.applications.appinfo.AppMemoryPreferenceController
+com.android.settings.applications.appinfo.InstantAppButtonsPreferenceController
+com.android.settings.bluetooth.BluetoothDeviceNamePreferenceController
+com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController
+com.android.settings.datausage.DataUsageSummaryPreferenceController
+com.android.settings.datausage.WifiDataUsageSummaryPreferenceController
+com.android.settings.fuelgauge.RestrictAppPreferenceController
+com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController
+com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController
+com.android.settings.security.VisiblePatternProfilePreferenceController
+com.android.settings.wifi.details2.WifiMeteredPreferenceController2
diff --git a/tests/robotests/assets/exempt_not_implementing_index_provider b/tests/robotests/assets/exempt_not_implementing_index_provider
new file mode 100644
index 0000000..97fe120
--- /dev/null
+++ b/tests/robotests/assets/exempt_not_implementing_index_provider
@@ -0,0 +1,97 @@
+com.android.settings.accessibility.AccessibilitySettingsForSetupWizard
+com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment
+com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment
+com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard
+com.android.settings.accessibility.ToggleScreenReaderPreferenceFragmentForSetupWizard
+com.android.settings.accessibility.ToggleSelectToSpeakPreferenceFragmentForSetupWizard
+com.android.settings.accounts.AccountDetailDashboardFragment
+com.android.settings.accounts.AccountPersonalDashboardFragment
+com.android.settings.accounts.AccountWorkProfileDashboardFragment
+com.android.settings.accounts.AccountSyncSettings
+com.android.settings.accounts.ChooseAccountFragment
+com.android.settings.applications.appinfo.AppInfoDashboardFragment
+com.android.settings.applications.appinfo.DrawOverlayDetails
+com.android.settings.applications.appinfo.ExternalSourcesDetails
+com.android.settings.applications.appinfo.WriteSettingsDetails
+com.android.settings.applications.AppLaunchSettings
+com.android.settings.applications.AppStorageSettings
+com.android.settings.applications.ConfirmConvertToFbe
+com.android.settings.applications.ProcessStatsDetail
+com.android.settings.applications.ProcessStatsSummary
+com.android.settings.applications.ProcessStatsUi
+com.android.settings.applications.RunningServices
+com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails
+com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails
+com.android.settings.applications.UsageAccessDetails
+com.android.settings.backup.ToggleBackupSettingFragment
+com.android.settings.biometrics.fingerprint.FingerprintSettings$FingerprintSettingsFragment
+com.android.settings.bluetooth.BluetoothDeviceDetailsFragment
+com.android.settings.bluetooth.BluetoothPairingDetail
+com.android.settings.bluetooth.DevicePickerFragment
+com.android.settings.dashboard.profileselector.ProfileSelectAccountFragment
+com.android.settings.dashboard.profileselector.ProfileSelectManageApplications
+com.android.settings.dashboard.profileselector.ProfileSelectLocationFragment
+com.android.settings.datausage.AppDataUsage
+com.android.settings.datausage.DataUsageList
+com.android.settings.datausage.DataUsageSummary
+com.android.settings.datetime.timezone.TimeZoneSettings
+com.android.settings.development.compat.PlatformCompatDashboard
+com.android.settings.deviceinfo.PrivateVolumeSettings
+com.android.settings.deviceinfo.PublicVolumeSettings
+com.android.settings.deviceinfo.StorageProfileFragment
+com.android.settings.deviceinfo.legal.ModuleLicensesDashboard
+com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera
+com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionLocation
+com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone
+com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
+com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
+com.android.settings.fuelgauge.AdvancedPowerUsageDetail
+com.android.settings.fuelgauge.InactiveApps
+com.android.settings.fuelgauge.RestrictedAppDetails
+com.android.settings.IccLockSettings
+com.android.settings.inputmethod.InputMethodAndSubtypeEnabler
+com.android.settings.inputmethod.KeyboardLayoutPickerFragment
+com.android.settings.inputmethod.SpellCheckersSettings
+com.android.settings.location.LocationPersonalSettings
+com.android.settings.location.LocationWorkProfileSettings
+com.android.settings.network.apn.ApnEditor
+com.android.settings.network.apn.ApnSettings
+com.android.settings.network.telephony.NetworkSelectSettings
+com.android.settings.notification.app.AppNotificationSettings
+com.android.settings.notification.app.ChannelNotificationSettings
+com.android.settings.notification.history.NotificationStation
+com.android.settings.notification.RedactionInterstitial$RedactionInterstitialFragment
+com.android.settings.notification.zen.ZenModeEventRuleSettings
+com.android.settings.notification.zen.ZenModeScheduleRuleSettings
+com.android.settings.notification.zen.ZenCustomRuleNotificationsSettings
+com.android.settings.notification.zen.ZenCustomRuleCallsSettings
+com.android.settings.notification.zen.ZenCustomRuleConfigSettings
+com.android.settings.notification.zen.ZenCustomRuleSettings
+com.android.settings.notification.zen.ZenCustomRuleBlockedEffectsSettings
+com.android.settings.notification.zen.ZenCustomRuleMessagesSettings
+com.android.settings.password.ChooseLockGeneric$ChooseLockGenericFragment
+com.android.settings.password.SetupChooseLockGeneric$InternalActivity$InternalSetupChooseLockGenericFragment
+com.android.settings.password.SetupChooseLockGeneric$SetupChooseLockGenericFragment
+com.android.settings.print.PrintJobSettingsFragment
+com.android.settings.print.PrintServiceSettingsFragment
+com.android.settings.SetupRedactionInterstitial$SetupRedactionInterstitialFragment
+com.android.settings.shortcut.CreateShortcut
+com.android.settings.TestingSettings
+com.android.settings.UserCredentialsSettings
+com.android.settings.users.AppRestrictionsFragment
+com.android.settings.users.RestrictedProfileSettings
+com.android.settings.users.UserDetailsSettings
+com.android.settings.vpn2.AppManagementFragment
+com.android.settings.vpn2.VpnSettings
+com.android.settings.wallpaper.WallpaperTypeSettings
+com.android.settings.wifi.ChangeWifiStateDetails
+com.android.settings.wifi.calling.WifiCallingSettingsForSub
+com.android.settings.wifi.details.WifiNetworkDetailsFragment
+com.android.settings.wifi.dpp.WifiNetworkListFragment
+com.android.settings.wifi.p2p.WifiP2pSettings
+com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings
+com.android.settings.wifi.WifiInfo
+com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessDetails
+com.android.settings.wifi.details2.WifiNetworkDetailsFragment2
+com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2
+com.android.settings.dashboard.profileselector.ProfileSelectRecentLocationRequestFragment
diff --git a/tests/robotests/assets/grandfather_not_implementing_instrumentable b/tests/robotests/assets/exempt_not_implementing_instrumentable
similarity index 100%
rename from tests/robotests/assets/grandfather_not_implementing_instrumentable
rename to tests/robotests/assets/exempt_not_implementing_instrumentable
diff --git a/tests/robotests/assets/grandfather_not_in_search_index_provider_registry b/tests/robotests/assets/exempt_not_in_search_index_provider_registry
similarity index 100%
rename from tests/robotests/assets/grandfather_not_in_search_index_provider_registry
rename to tests/robotests/assets/exempt_not_in_search_index_provider_registry
diff --git a/tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider b/tests/robotests/assets/exempt_not_sharing_pref_controllers_with_search_provider
similarity index 100%
rename from tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider
rename to tests/robotests/assets/exempt_not_sharing_pref_controllers_with_search_provider
diff --git a/tests/robotests/assets/exempt_slice_controller_not_in_xml b/tests/robotests/assets/exempt_slice_controller_not_in_xml
new file mode 100644
index 0000000..d711833
--- /dev/null
+++ b/tests/robotests/assets/exempt_slice_controller_not_in_xml
@@ -0,0 +1,13 @@
+com.android.settings.accessibility.AccessibilitySlicePreferenceController
+com.android.settings.core.TogglePreferenceControllerTest$FakeToggle
+com.android.settings.biometrics.face.FaceSettingsAttentionPreferenceController
+com.android.settings.network.telephony.MmsMessagePreferenceController
+com.android.settings.network.telephony.DataDuringCallsPreferenceController
+com.android.settings.network.telephony.Enhanced4gBasePreferenceController
+com.android.settings.testutils.FakeToggleController
+com.android.settings.testutils.FakeSliderController
+com.android.settings.testutils.FakeInvalidSliderController
+com.android.settings.wifi.details2.WifiAutoConnectPreferenceController2
+com.android.settings.accessibility.ReduceBrightColorsIntensityPreferenceController
+com.android.settings.accessibility.ReduceBrightColorsPersistencePreferenceController
+
diff --git a/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor b/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor
deleted file mode 100644
index c29807b..0000000
--- a/tests/robotests/assets/grandfather_invalid_base_preference_controller_constructor
+++ /dev/null
@@ -1,15 +0,0 @@
-com.android.settings.applications.appinfo.AppButtonsPreferenceController
-com.android.settings.applications.appinfo.AppBatteryPreferenceController
-com.android.settings.applications.appinfo.AppHeaderViewPreferenceController
-com.android.settings.applications.appinfo.AppMemoryPreferenceController
-com.android.settings.applications.appinfo.InstantAppButtonsPreferenceController
-com.android.settings.bluetooth.BluetoothDeviceNamePreferenceController
-com.android.settings.bluetooth.BluetoothDeviceRenamePreferenceController
-com.android.settings.datausage.DataUsageSummaryPreferenceController
-com.android.settings.datausage.WifiDataUsageSummaryPreferenceController
-com.android.settings.fuelgauge.RestrictAppPreferenceController
-com.android.settings.fuelgauge.batterysaver.BatterySaverButtonPreferenceController
-com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController
-com.android.settings.security.VisiblePatternProfilePreferenceController
-com.android.settings.wifi.details.WifiMeteredPreferenceController
-com.android.settings.wifi.details2.WifiMeteredPreferenceController2
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
deleted file mode 100644
index 80e179a..0000000
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ /dev/null
@@ -1,97 +0,0 @@
-com.android.settings.accessibility.AccessibilitySettingsForSetupWizard
-com.android.settings.accessibility.ToggleAccessibilityServicePreferenceFragment
-com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment
-com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragmentForSetupWizard
-com.android.settings.accessibility.ToggleScreenReaderPreferenceFragmentForSetupWizard
-com.android.settings.accessibility.ToggleSelectToSpeakPreferenceFragmentForSetupWizard
-com.android.settings.accounts.AccountDetailDashboardFragment
-com.android.settings.accounts.AccountPersonalDashboardFragment
-com.android.settings.accounts.AccountWorkProfileDashboardFragment
-com.android.settings.accounts.AccountSyncSettings
-com.android.settings.accounts.ChooseAccountFragment
-com.android.settings.applications.appinfo.AppInfoDashboardFragment
-com.android.settings.applications.appinfo.DrawOverlayDetails
-com.android.settings.applications.appinfo.ExternalSourcesDetails
-com.android.settings.applications.appinfo.WriteSettingsDetails
-com.android.settings.applications.AppLaunchSettings
-com.android.settings.applications.AppStorageSettings
-com.android.settings.applications.ConfirmConvertToFbe
-com.android.settings.applications.ProcessStatsDetail
-com.android.settings.applications.ProcessStatsSummary
-com.android.settings.applications.ProcessStatsUi
-com.android.settings.applications.RunningServices
-com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails
-com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails
-com.android.settings.applications.UsageAccessDetails
-com.android.settings.backup.ToggleBackupSettingFragment
-com.android.settings.biometrics.fingerprint.FingerprintSettings$FingerprintSettingsFragment
-com.android.settings.bluetooth.BluetoothDeviceDetailsFragment
-com.android.settings.bluetooth.BluetoothPairingDetail
-com.android.settings.bluetooth.DevicePickerFragment
-com.android.settings.dashboard.profileselector.ProfileSelectAccountFragment
-com.android.settings.dashboard.profileselector.ProfileSelectManageApplications
-com.android.settings.dashboard.profileselector.ProfileSelectLocationFragment
-com.android.settings.datausage.AppDataUsage
-com.android.settings.datausage.DataUsageList
-com.android.settings.datausage.DataUsageSummary
-com.android.settings.datetime.timezone.TimeZoneSettings
-com.android.settings.development.compat.PlatformCompatDashboard
-com.android.settings.deviceinfo.PrivateVolumeSettings
-com.android.settings.deviceinfo.PublicVolumeSettings
-com.android.settings.deviceinfo.StorageProfileFragment
-com.android.settings.deviceinfo.legal.ModuleLicensesDashboard
-com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera
-com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionLocation
-com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone
-com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
-com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
-com.android.settings.fuelgauge.AdvancedPowerUsageDetail
-com.android.settings.fuelgauge.InactiveApps
-com.android.settings.fuelgauge.RestrictedAppDetails
-com.android.settings.IccLockSettings
-com.android.settings.inputmethod.InputMethodAndSubtypeEnabler
-com.android.settings.inputmethod.KeyboardLayoutPickerFragment
-com.android.settings.inputmethod.SpellCheckersSettings
-com.android.settings.location.LocationPersonalSettings
-com.android.settings.location.LocationWorkProfileSettings
-com.android.settings.network.ApnEditor
-com.android.settings.network.ApnSettings
-com.android.settings.network.telephony.NetworkSelectSettings
-com.android.settings.notification.app.AppNotificationSettings
-com.android.settings.notification.app.ChannelNotificationSettings
-com.android.settings.notification.history.NotificationStation
-com.android.settings.notification.RedactionInterstitial$RedactionInterstitialFragment
-com.android.settings.notification.zen.ZenModeEventRuleSettings
-com.android.settings.notification.zen.ZenModeScheduleRuleSettings
-com.android.settings.notification.zen.ZenCustomRuleNotificationsSettings
-com.android.settings.notification.zen.ZenCustomRuleCallsSettings
-com.android.settings.notification.zen.ZenCustomRuleConfigSettings
-com.android.settings.notification.zen.ZenCustomRuleSettings
-com.android.settings.notification.zen.ZenCustomRuleBlockedEffectsSettings
-com.android.settings.notification.zen.ZenCustomRuleMessagesSettings
-com.android.settings.password.ChooseLockGeneric$ChooseLockGenericFragment
-com.android.settings.password.SetupChooseLockGeneric$InternalActivity$InternalSetupChooseLockGenericFragment
-com.android.settings.password.SetupChooseLockGeneric$SetupChooseLockGenericFragment
-com.android.settings.print.PrintJobSettingsFragment
-com.android.settings.print.PrintServiceSettingsFragment
-com.android.settings.SetupRedactionInterstitial$SetupRedactionInterstitialFragment
-com.android.settings.shortcut.CreateShortcut
-com.android.settings.TestingSettings
-com.android.settings.UserCredentialsSettings
-com.android.settings.users.AppRestrictionsFragment
-com.android.settings.users.RestrictedProfileSettings
-com.android.settings.users.UserDetailsSettings
-com.android.settings.vpn2.AppManagementFragment
-com.android.settings.vpn2.VpnSettings
-com.android.settings.wallpaper.WallpaperTypeSettings
-com.android.settings.wifi.ChangeWifiStateDetails
-com.android.settings.wifi.calling.WifiCallingSettingsForSub
-com.android.settings.wifi.details.WifiNetworkDetailsFragment
-com.android.settings.wifi.dpp.WifiNetworkListFragment
-com.android.settings.wifi.p2p.WifiP2pSettings
-com.android.settings.wifi.savedaccesspoints.SavedAccessPointsWifiSettings
-com.android.settings.wifi.WifiInfo
-com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessDetails
-com.android.settings.wifi.details2.WifiNetworkDetailsFragment2
-com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2
-com.android.settings.dashboard.profileselector.ProfileSelectRecentLocationRequestFragment
diff --git a/tests/robotests/assets/grandfather_slice_controller_not_in_xml b/tests/robotests/assets/grandfather_slice_controller_not_in_xml
deleted file mode 100644
index 5cd855f..0000000
--- a/tests/robotests/assets/grandfather_slice_controller_not_in_xml
+++ /dev/null
@@ -1,11 +0,0 @@
-com.android.settings.accessibility.AccessibilitySlicePreferenceController
-com.android.settings.core.TogglePreferenceControllerTest$FakeToggle
-com.android.settings.biometrics.face.FaceSettingsAttentionPreferenceController
-com.android.settings.network.telephony.MmsMessagePreferenceController
-com.android.settings.network.telephony.DataDuringCallsPreferenceController
-com.android.settings.network.telephony.Enhanced4gBasePreferenceController
-com.android.settings.testutils.FakeToggleController
-com.android.settings.testutils.FakeSliderController
-com.android.settings.testutils.FakeInvalidSliderController
-com.android.settings.wifi.details2.WifiAutoConnectPreferenceController2
-
diff --git a/tests/robotests/new_tests_hook.sh b/tests/robotests/new_tests_hook.sh
new file mode 100755
index 0000000..92d6670
--- /dev/null
+++ b/tests/robotests/new_tests_hook.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# This script detects the presence of new robolectric java tests within
+# commits to be uploaded. If a new file is detected the script will print an
+# error message and return an error code. Intended to be used as a repo hook.
+
+new_robolectric_tests=$(
+    git diff --name-status $REPO_LREV | grep "^A.*tests/robotests.*\.java")
+if [ $new_robolectric_tests != "" ]
+then
+    echo "New Robolectric unit tests detected. Please submit junit tests" \
+    "instead, in the tests/junit directory." \
+    "See go/android-platform-robolectric-cleanup."
+    echo $new_robolectric_tests
+    exit 1
+fi
diff --git a/tests/robotests/res/values-mcc998/config.xml b/tests/robotests/res/values-mcc998/config.xml
index f9b9137..6572b14 100644
--- a/tests/robotests/res/values-mcc998/config.xml
+++ b/tests/robotests/res/values-mcc998/config.xml
@@ -15,6 +15,6 @@
   -->
 
 <resources>
-    <!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
-    <string-array name="slice_whitelist_package_names" translatable="false"/>
+    <!-- List of packages that should be allowlisted for slice uri access. Do not translate -->
+    <string-array name="slice_allowlist_package_names" translatable="false"/>
 </resources>
diff --git a/tests/robotests/res/values-mcc999/config.xml b/tests/robotests/res/values-mcc999/config.xml
index ff17891..b1d4be9 100644
--- a/tests/robotests/res/values-mcc999/config.xml
+++ b/tests/robotests/res/values-mcc999/config.xml
@@ -81,9 +81,9 @@
         <item>fake_package/fake_service</item>
     </string-array>
 
-    <!-- List of packages that should be whitelisted for slice uri access. Do not translate -->
-    <string-array name="slice_whitelist_package_names" translatable="false">
-        <item>com.android.settings.slice_whitelist_package</item>
+    <!-- List of packages that should be allowlisted for slice uri access. Do not translate -->
+    <string-array name="slice_allowlist_package_names" translatable="false">
+        <item>com.android.settings.slice_allowlist_package</item>
     </string-array>
 
     <!-- Email address for the homepage contextual cards feedback -->
diff --git a/tests/robotests/res/xml-mcc999/about_legal.xml b/tests/robotests/res/xml-mcc999/about_legal.xml
index 3e008cb..cbbc99a 100644
--- a/tests/robotests/res/xml-mcc999/about_legal.xml
+++ b/tests/robotests/res/xml-mcc999/about_legal.xml
@@ -24,7 +24,7 @@
 
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        xmlns:settings="http://schemas.android.com/apk/res-auto"
         android:title="bears_bears_bears"
         settings:keywords="keywords">
 
diff --git a/tests/robotests/res/xml-mcc999/display_settings.xml b/tests/robotests/res/xml-mcc999/display_settings.xml
index fccad7f..b5bf789 100644
--- a/tests/robotests/res/xml-mcc999/display_settings.xml
+++ b/tests/robotests/res/xml-mcc999/display_settings.xml
@@ -23,7 +23,7 @@
 
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:title="page_title"
     settings:keywords="keywords">
 
diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
index e914b01..e251669 100644
--- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java
@@ -35,6 +35,6 @@
         // Nightmode is currently hidden
         preferenceKeys.remove("night_mode");
 
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+        assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/LegalSettingsTest.java b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
index 78a5ee3..3418a40 100644
--- a/tests/robotests/src/com/android/settings/LegalSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/LegalSettingsTest.java
@@ -46,6 +46,6 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.about_legal);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/LinkifyUtilsTest.java b/tests/robotests/src/com/android/settings/LinkifyUtilsTest.java
deleted file mode 100644
index de06302..0000000
--- a/tests/robotests/src/com/android/settings/LinkifyUtilsTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2020 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;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.text.Spannable;
-import android.text.style.ClickableSpan;
-import android.widget.TextView;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class LinkifyUtilsTest {
-    private static final String TEST_STRING = "to LINK_BEGINscanning settingsLINK_END.";
-    private static final String WRONG_STRING = "to scanning settingsLINK_END.";
-    private final LinkifyUtils.OnClickListener mClickListener = () -> { /* Do nothing */ };
-
-    private StringBuilder mSpanStringBuilder;
-    private StringBuilder mWrongSpanStringBuilder;
-    TextView mTextView;
-
-    @Before
-    public void setUp() throws Exception {
-        mSpanStringBuilder = new StringBuilder(TEST_STRING);
-        mWrongSpanStringBuilder = new StringBuilder(WRONG_STRING);
-        mTextView = new TextView(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void linkify_whenSpanStringCorrect_shouldReturnTrue() {
-        final boolean linkifyResult = LinkifyUtils.linkify(mTextView, mSpanStringBuilder,
-                mClickListener);
-
-        assertThat(linkifyResult).isTrue();
-    }
-
-    @Test
-    public void linkify_whenSpanStringWrong_shouldReturnFalse() {
-        final boolean linkifyResult = LinkifyUtils.linkify(mTextView, mWrongSpanStringBuilder,
-                mClickListener);
-
-        assertThat(linkifyResult).isFalse();
-    }
-
-    @Test
-    public void linkify_whenSpanStringCorrect_shouldContainClickableSpan() {
-        LinkifyUtils.linkify(mTextView, mSpanStringBuilder, mClickListener);
-        final Spannable spannableContent = (Spannable) mTextView.getText();
-        final int len = spannableContent.length();
-        final Object[] spans = spannableContent.getSpans(0, len, Object.class);
-
-        assertThat(spans[1] instanceof ClickableSpan).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/MainClearConfirmTest.java b/tests/robotests/src/com/android/settings/MainClearConfirmTest.java
new file mode 100644
index 0000000..c302250
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/MainClearConfirmTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2019 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.admin.DevicePolicyManager;
+import android.app.admin.FactoryResetProtectionPolicy;
+import android.content.Context;
+import android.service.persistentdata.PersistentDataBlockManager;
+import android.view.LayoutInflater;
+import android.widget.TextView;
+
+import androidx.fragment.app.FragmentActivity;
+
+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.RobolectricTestRunner;
+
+import java.util.ArrayList;
+
+@RunWith(RobolectricTestRunner.class)
+public class MainClearConfirmTest {
+
+    private FragmentActivity mActivity;
+
+    @Mock
+    private FragmentActivity mMockActivity;
+
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+
+    @Mock
+    private PersistentDataBlockManager mPersistentDataBlockManager;
+
+    private MainClearConfirm mMainClearConfirm;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mActivity = Robolectric.setupActivity(FragmentActivity.class);
+        mMainClearConfirm = spy(new MainClearConfirm());
+    }
+
+    @Test
+    public void setSubtitle_eraseEsim() {
+        MainClearConfirm mainClearConfirm = new MainClearConfirm();
+        mainClearConfirm.mEraseEsims = true;
+        mainClearConfirm.mContentView =
+                LayoutInflater.from(mActivity).inflate(R.layout.main_clear_confirm, null);
+
+        mainClearConfirm.setSubtitle();
+
+        assertThat(((TextView) mainClearConfirm.mContentView
+                .findViewById(R.id.sud_layout_description)).getText())
+                .isEqualTo(mActivity.getString(R.string.main_clear_final_desc_esim));
+    }
+
+    @Test
+    public void setSubtitle_notEraseEsim() {
+        MainClearConfirm mainClearConfirm = new MainClearConfirm();
+        mainClearConfirm.mEraseEsims = false;
+        mainClearConfirm.mContentView =
+                LayoutInflater.from(mActivity).inflate(R.layout.main_clear_confirm, null);
+
+        mainClearConfirm.setSubtitle();
+
+        assertThat(((TextView) mainClearConfirm.mContentView
+                .findViewById(R.id.sud_layout_description)).getText())
+                .isEqualTo(mActivity.getString(R.string.main_clear_final_desc));
+    }
+
+    @Test
+    public void shouldWipePersistentDataBlock_noPersistentDataBlockManager_shouldReturnFalse() {
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(null)).isFalse();
+    }
+
+    @Test
+    public void shouldWipePersistentDataBlock_deviceIsStillBeingProvisioned_shouldReturnFalse() {
+        doReturn(true).when(mMainClearConfirm).isDeviceStillBeingProvisioned();
+
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(
+                mPersistentDataBlockManager)).isFalse();
+    }
+
+    @Test
+    public void shouldWipePersistentDataBlock_oemUnlockAllowed_shouldReturnFalse() {
+        doReturn(false).when(mMainClearConfirm).isDeviceStillBeingProvisioned();
+        doReturn(true).when(mMainClearConfirm).isOemUnlockedAllowed();
+
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(
+                mPersistentDataBlockManager)).isFalse();
+    }
+
+    @Test
+    public void shouldWipePersistentDataBlock_frpPolicyNotSupported_shouldReturnFalse() {
+        when(mMainClearConfirm.getActivity()).thenReturn(mMockActivity);
+
+        doReturn(false).when(mMainClearConfirm).isDeviceStillBeingProvisioned();
+        doReturn(false).when(mMainClearConfirm).isOemUnlockedAllowed();
+        when(mMockActivity.getSystemService(Context.DEVICE_POLICY_SERVICE))
+                .thenReturn(mDevicePolicyManager);
+        when(mDevicePolicyManager.isFactoryResetProtectionPolicySupported()).thenReturn(false);
+
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(
+                mPersistentDataBlockManager)).isFalse();
+    }
+
+    @Test
+    public void shouldWipePersistentDataBlock_hasFactoryResetProtectionPolicy_shouldReturnFalse() {
+        when(mMainClearConfirm.getActivity()).thenReturn(mMockActivity);
+
+        doReturn(false).when(mMainClearConfirm).isDeviceStillBeingProvisioned();
+        doReturn(false).when(mMainClearConfirm).isOemUnlockedAllowed();
+        ArrayList<String> accounts = new ArrayList<>();
+        accounts.add("test");
+        FactoryResetProtectionPolicy frp = new FactoryResetProtectionPolicy.Builder()
+                .setFactoryResetProtectionAccounts(accounts)
+                .setFactoryResetProtectionEnabled(true)
+                .build();
+        when(mMockActivity.getSystemService(Context.DEVICE_POLICY_SERVICE))
+                .thenReturn(mDevicePolicyManager);
+        when(mDevicePolicyManager.isFactoryResetProtectionPolicySupported()).thenReturn(true);
+        when(mDevicePolicyManager.getFactoryResetProtectionPolicy(null)).thenReturn(frp);
+        when(mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()).thenReturn(true);
+
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(
+                mPersistentDataBlockManager)).isFalse();
+    }
+
+    @Test
+    public void shouldWipePersistentDataBlock_isNotOrganizationOwnedDevice_shouldReturnTrue() {
+        when(mMainClearConfirm.getActivity()).thenReturn(mMockActivity);
+
+        doReturn(false).when(mMainClearConfirm).isDeviceStillBeingProvisioned();
+        doReturn(false).when(mMainClearConfirm).isOemUnlockedAllowed();
+
+        when(mMockActivity.getSystemService(Context.DEVICE_POLICY_SERVICE))
+                .thenReturn(mDevicePolicyManager);
+        when(mDevicePolicyManager.isFactoryResetProtectionPolicySupported()).thenReturn(true);
+        when(mDevicePolicyManager.getFactoryResetProtectionPolicy(null)).thenReturn(null);
+        when(mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()).thenReturn(false);
+
+        assertThat(mMainClearConfirm.shouldWipePersistentDataBlock(
+                mPersistentDataBlockManager)).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/MainClearTest.java b/tests/robotests/src/com/android/settings/MainClearTest.java
new file mode 100644
index 0000000..ec33fad
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/MainClearTest.java
@@ -0,0 +1,467 @@
+/*
+ * 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
+
+import androidx.fragment.app.FragmentActivity;
+
+import com.android.settings.testutils.shadow.ShadowUtils;
+import com.android.settingslib.development.DevelopmentSettingsEnabler;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowActivity;
+import org.robolectric.shadows.ShadowUserManager;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowUtils.class)
+public class MainClearTest {
+
+    private static final String TEST_ACCOUNT_TYPE = "android.test.account.type";
+    private static final String TEST_CONFIRMATION_PACKAGE = "android.test.conf.pkg";
+    private static final String TEST_CONFIRMATION_CLASS = "android.test.conf.pkg.ConfActivity";
+    private static final String TEST_ACCOUNT_NAME = "test@example.com";
+
+    @Mock
+    private ScrollView mScrollView;
+    @Mock
+    private LinearLayout mLinearLayout;
+
+    @Mock
+    private PackageManager mPackageManager;
+
+    @Mock
+    private AccountManager mAccountManager;
+
+    @Mock
+    private FragmentActivity mMockActivity;
+
+    @Mock
+    private Intent mMockIntent;
+
+    private MainClear mMainClear;
+    private ShadowActivity mShadowActivity;
+    private FragmentActivity mActivity;
+    private ShadowUserManager mShadowUserManager;
+    private View mContentView;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mMainClear = spy(new MainClear());
+        mActivity = Robolectric.setupActivity(FragmentActivity.class);
+        mShadowActivity = Shadows.shadowOf(mActivity);
+        UserManager userManager = mActivity.getSystemService(UserManager.class);
+        mShadowUserManager = Shadows.shadowOf(userManager);
+        mShadowUserManager.setIsAdminUser(true);
+        mContentView = LayoutInflater.from(mActivity).inflate(R.layout.main_clear, null);
+
+        // Make scrollView only have one child
+        when(mScrollView.getChildAt(0)).thenReturn(mLinearLayout);
+        when(mScrollView.getChildCount()).thenReturn(1);
+    }
+
+    @After
+    public void tearDown() {
+        mShadowUserManager.setIsAdminUser(false);
+    }
+
+    @Test
+    public void testShowFinalConfirmation_eraseEsimVisible_eraseEsimChecked() {
+        final Context context = mock(Context.class);
+        when(mMainClear.getContext()).thenReturn(context);
+
+        mMainClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+        mMainClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMainClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMainClear.mEsimStorageContainer.setVisibility(View.VISIBLE);
+        mMainClear.mEsimStorage.setChecked(true);
+        mMainClear.showFinalConfirmation();
+
+        final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
+
+        verify(context).startActivity(intent.capture());
+        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false))
+                .isTrue();
+    }
+
+    @Test
+    public void testShowFinalConfirmation_eraseEsimVisible_eraseEsimUnchecked() {
+        final Context context = mock(Context.class);
+        when(mMainClear.getContext()).thenReturn(context);
+
+        mMainClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+        mMainClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMainClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMainClear.mEsimStorageContainer.setVisibility(View.VISIBLE);
+        mMainClear.mEsimStorage.setChecked(false);
+        mMainClear.showFinalConfirmation();
+        final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
+
+        verify(context).startActivity(intent.capture());
+        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false))
+                .isFalse();
+    }
+
+    @Test
+    public void testShowFinalConfirmation_eraseEsimGone_eraseEsimChecked() {
+        final Context context = mock(Context.class);
+        when(mMainClear.getContext()).thenReturn(context);
+
+        mMainClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+        mMainClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMainClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMainClear.mEsimStorageContainer.setVisibility(View.GONE);
+        mMainClear.mEsimStorage.setChecked(true);
+        mMainClear.showFinalConfirmation();
+
+        final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
+
+        verify(context).startActivity(intent.capture());
+        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+            .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false))
+            .isTrue();
+    }
+
+    @Test
+    public void testShowFinalConfirmation_eraseEsimGone_eraseEsimUnchecked() {
+        final Context context = mock(Context.class);
+        when(mMainClear.getContext()).thenReturn(context);
+
+        mMainClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
+        mMainClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
+        mMainClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
+        mMainClear.mEsimStorageContainer.setVisibility(View.GONE);
+        mMainClear.mEsimStorage.setChecked(false);
+        mMainClear.showFinalConfirmation();
+        final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
+
+        verify(context).startActivity(intent.capture());
+        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
+            .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false))
+            .isFalse();
+    }
+
+    @Test
+    public void testShowWipeEuicc_euiccDisabled() {
+        prepareEuiccState(
+                false /* isEuiccEnabled */,
+                true /* isEuiccProvisioned */,
+                false /* isDeveloper */);
+        assertThat(mMainClear.showWipeEuicc()).isFalse();
+    }
+
+    @Test
+    public void testShowWipeEuicc_euiccEnabled_unprovisioned() {
+        prepareEuiccState(
+                true /* isEuiccEnabled */,
+                false /* isEuiccProvisioned */,
+                false /* isDeveloper */);
+        assertThat(mMainClear.showWipeEuicc()).isFalse();
+    }
+
+    @Test
+    public void testShowWipeEuicc_euiccEnabled_provisioned() {
+        prepareEuiccState(
+                true /* isEuiccEnabled */,
+                true /* isEuiccProvisioned */,
+                false /* isDeveloper */);
+        assertThat(mMainClear.showWipeEuicc()).isTrue();
+    }
+
+    @Test
+    public void testShowWipeEuicc_developerMode_unprovisioned() {
+        prepareEuiccState(
+                true /* isEuiccEnabled */,
+                false /* isEuiccProvisioned */,
+                true /* isDeveloper */);
+        assertThat(mMainClear.showWipeEuicc()).isTrue();
+    }
+
+    @Test
+    public void testEsimRecheckBoxDefaultChecked() {
+        assertThat(((CheckBox) mContentView.findViewById(R.id.erase_esim)).isChecked()).isFalse();
+    }
+
+    @Test
+    public void testHasReachedBottom_NotScrollDown_returnFalse() {
+        initScrollView(100, 0, 200);
+
+        assertThat(mMainClear.hasReachedBottom(mScrollView)).isFalse();
+    }
+
+    @Test
+    public void testHasReachedBottom_CanNotScroll_returnTrue() {
+        initScrollView(100, 0, 80);
+
+        assertThat(mMainClear.hasReachedBottom(mScrollView)).isTrue();
+    }
+
+    @Test
+    public void testHasReachedBottom_ScrollToBottom_returnTrue() {
+        initScrollView(100, 100, 200);
+
+        assertThat(mMainClear.hasReachedBottom(mScrollView)).isTrue();
+    }
+
+    @Test
+    public void testInitiateMainClear_inDemoMode_sendsIntent() {
+        ShadowUtils.setIsDemoUser(true);
+
+        final ComponentName componentName =
+                ComponentName.unflattenFromString("com.android.retaildemo/.DeviceAdminReceiver");
+        ShadowUtils.setDeviceOwnerComponent(componentName);
+
+        mMainClear.mInitiateListener.onClick(mContentView);
+        final Intent intent = mShadowActivity.getNextStartedActivity();
+        assertThat(Intent.ACTION_FACTORY_RESET).isEqualTo(intent.getAction());
+        assertThat(componentName).isNotNull();
+        assertThat(componentName.getPackageName()).isEqualTo(intent.getPackage());
+    }
+
+    @Test
+    public void testOnActivityResultInternal_invalideRequest() {
+        int invalidRequestCode = -1;
+        doReturn(false).when(mMainClear).isValidRequestCode(eq(invalidRequestCode));
+
+        mMainClear.onActivityResultInternal(invalidRequestCode, Activity.RESULT_OK, null);
+
+        verify(mMainClear, times(1)).isValidRequestCode(eq(invalidRequestCode));
+        verify(mMainClear, times(0)).establishInitialState();
+        verify(mMainClear, times(0)).getAccountConfirmationIntent();
+        verify(mMainClear, times(0)).showFinalConfirmation();
+    }
+
+    @Test
+    public void testOnActivityResultInternal_resultCanceled() {
+        doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        doNothing().when(mMainClear).establishInitialState();
+
+        mMainClear
+                .onActivityResultInternal(MainClear.KEYGUARD_REQUEST, Activity.RESULT_CANCELED,
+                        null);
+
+        verify(mMainClear, times(1)).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        verify(mMainClear, times(1)).establishInitialState();
+        verify(mMainClear, times(0)).getAccountConfirmationIntent();
+        verify(mMainClear, times(0)).showFinalConfirmation();
+    }
+
+    @Test
+    public void testOnActivityResultInternal_keyguardRequestTriggeringConfirmAccount() {
+        doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        doReturn(mMockIntent).when(mMainClear).getAccountConfirmationIntent();
+        doNothing().when(mMainClear).showAccountCredentialConfirmation(eq(mMockIntent));
+
+        mMainClear
+                .onActivityResultInternal(MainClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
+
+        verify(mMainClear, times(1)).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        verify(mMainClear, times(0)).establishInitialState();
+        verify(mMainClear, times(1)).getAccountConfirmationIntent();
+        verify(mMainClear, times(1)).showAccountCredentialConfirmation(eq(mMockIntent));
+    }
+
+    @Test
+    public void testOnActivityResultInternal_keyguardRequestTriggeringShowFinal() {
+        doReturn(true).when(mMainClear).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        doReturn(null).when(mMainClear).getAccountConfirmationIntent();
+        doNothing().when(mMainClear).showFinalConfirmation();
+
+        mMainClear
+                .onActivityResultInternal(MainClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
+
+        verify(mMainClear, times(1)).isValidRequestCode(eq(MainClear.KEYGUARD_REQUEST));
+        verify(mMainClear, times(0)).establishInitialState();
+        verify(mMainClear, times(1)).getAccountConfirmationIntent();
+        verify(mMainClear, times(1)).showFinalConfirmation();
+    }
+
+    @Test
+    public void testOnActivityResultInternal_confirmRequestTriggeringShowFinal() {
+        doReturn(true).when(mMainClear)
+                .isValidRequestCode(eq(MainClear.CREDENTIAL_CONFIRM_REQUEST));
+        doNothing().when(mMainClear).showFinalConfirmation();
+
+        mMainClear.onActivityResultInternal(
+                MainClear.CREDENTIAL_CONFIRM_REQUEST, Activity.RESULT_OK, null);
+
+        verify(mMainClear, times(1))
+                .isValidRequestCode(eq(MainClear.CREDENTIAL_CONFIRM_REQUEST));
+        verify(mMainClear, times(0)).establishInitialState();
+        verify(mMainClear, times(0)).getAccountConfirmationIntent();
+        verify(mMainClear, times(1)).showFinalConfirmation();
+    }
+
+    @Test
+    public void testGetAccountConfirmationIntent_unsupported() {
+        when(mMainClear.getActivity()).thenReturn(mActivity);
+        /* Using the default resources, account confirmation shouldn't trigger */
+        assertThat(mMainClear.getAccountConfirmationIntent()).isNull();
+    }
+
+    @Test
+    public void testGetAccountConfirmationIntent_no_relevant_accounts() {
+        when(mMainClear.getActivity()).thenReturn(mMockActivity);
+        when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
+        when(mMockActivity.getString(R.string.account_confirmation_package))
+                .thenReturn(TEST_CONFIRMATION_PACKAGE);
+        when(mMockActivity.getString(R.string.account_confirmation_class))
+                .thenReturn(TEST_CONFIRMATION_CLASS);
+
+        Account[] accounts = new Account[0];
+        when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
+        when(mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE)).thenReturn(accounts);
+        assertThat(mMainClear.getAccountConfirmationIntent()).isNull();
+    }
+
+    @Test
+    public void testGetAccountConfirmationIntent_unresolved() {
+        when(mMainClear.getActivity()).thenReturn(mMockActivity);
+        when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
+        when(mMockActivity.getString(R.string.account_confirmation_package))
+                .thenReturn(TEST_CONFIRMATION_PACKAGE);
+        when(mMockActivity.getString(R.string.account_confirmation_class))
+                .thenReturn(TEST_CONFIRMATION_CLASS);
+        Account[] accounts = new Account[]{new Account(TEST_ACCOUNT_NAME, TEST_ACCOUNT_TYPE)};
+        when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
+        when(mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE)).thenReturn(accounts);
+        // The package manager should not resolve the confirmation intent targeting the non-existent
+        // confirmation package.
+        when(mMockActivity.getPackageManager()).thenReturn(mPackageManager);
+        assertThat(mMainClear.getAccountConfirmationIntent()).isNull();
+    }
+
+    @Test
+    public void testTryShowAccountConfirmation_ok() {
+        when(mMainClear.getActivity()).thenReturn(mMockActivity);
+        // Only try to show account confirmation if the appropriate resource overlays are available.
+        when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
+        when(mMockActivity.getString(R.string.account_confirmation_package))
+                .thenReturn(TEST_CONFIRMATION_PACKAGE);
+        when(mMockActivity.getString(R.string.account_confirmation_class))
+                .thenReturn(TEST_CONFIRMATION_CLASS);
+        // Add accounts to trigger the search for a resolving intent.
+        Account[] accounts = new Account[]{new Account(TEST_ACCOUNT_NAME, TEST_ACCOUNT_TYPE)};
+        when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
+        when(mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE)).thenReturn(accounts);
+        // The package manager should not resolve the confirmation intent targeting the non-existent
+        // confirmation package.
+        when(mMockActivity.getPackageManager()).thenReturn(mPackageManager);
+
+        ActivityInfo activityInfo = new ActivityInfo();
+        activityInfo.packageName = TEST_CONFIRMATION_PACKAGE;
+        ResolveInfo resolveInfo = new ResolveInfo();
+        resolveInfo.activityInfo = activityInfo;
+        when(mPackageManager.resolveActivity(any(), eq(0))).thenReturn(resolveInfo);
+
+        Intent actualIntent = mMainClear.getAccountConfirmationIntent();
+        assertThat(TEST_CONFIRMATION_PACKAGE).isEqualTo(
+                actualIntent.getComponent().getPackageName());
+        assertThat(TEST_CONFIRMATION_CLASS).isEqualTo(actualIntent.getComponent().getClassName());
+    }
+
+    @Test
+    public void testShowAccountCredentialConfirmation() {
+        // Finally mock out the startActivityForResultCall
+        doNothing().when(mMainClear)
+                .startActivityForResult(eq(mMockIntent),
+                        eq(MainClear.CREDENTIAL_CONFIRM_REQUEST));
+        mMainClear.showAccountCredentialConfirmation(mMockIntent);
+        verify(mMainClear, times(1))
+                .startActivityForResult(eq(mMockIntent),
+                        eq(MainClear.CREDENTIAL_CONFIRM_REQUEST));
+    }
+
+    @Test
+    public void testIsValidRequestCode() {
+        assertThat(mMainClear.isValidRequestCode(MainClear.KEYGUARD_REQUEST)).isTrue();
+        assertThat(mMainClear.isValidRequestCode(MainClear.CREDENTIAL_CONFIRM_REQUEST))
+                .isTrue();
+        assertThat(mMainClear.isValidRequestCode(0)).isFalse();
+    }
+
+    @Test
+    public void testOnGlobalLayout_shouldNotRemoveListener() {
+        final ViewTreeObserver viewTreeObserver = mock(ViewTreeObserver.class);
+        mMainClear.mScrollView = mScrollView;
+        doNothing().when(mMainClear).onGlobalLayout();
+        doReturn(true).when(mMainClear).hasReachedBottom(any());
+        when(mScrollView.getViewTreeObserver()).thenReturn(viewTreeObserver);
+
+        mMainClear.onGlobalLayout();
+
+        verify(viewTreeObserver, never()).removeOnGlobalLayoutListener(mMainClear);
+    }
+
+    private void prepareEuiccState(
+            boolean isEuiccEnabled, boolean isEuiccProvisioned, boolean isDeveloper) {
+        doReturn(mActivity).when(mMainClear).getContext();
+        doReturn(isEuiccEnabled).when(mMainClear).isEuiccEnabled(any());
+        ContentResolver cr = mActivity.getContentResolver();
+        Settings.Global.putInt(cr, Settings.Global.EUICC_PROVISIONED, isEuiccProvisioned ? 1 : 0);
+        DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mActivity, isDeveloper);
+    }
+
+    private void initScrollView(int height, int scrollY, int childBottom) {
+        when(mScrollView.getHeight()).thenReturn(height);
+        when(mScrollView.getScrollY()).thenReturn(scrollY);
+        when(mLinearLayout.getBottom()).thenReturn(childBottom);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/MasterClearConfirmTest.java b/tests/robotests/src/com/android/settings/MasterClearConfirmTest.java
deleted file mode 100644
index f2000e5..0000000
--- a/tests/robotests/src/com/android/settings/MasterClearConfirmTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2019 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;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.app.admin.DevicePolicyManager;
-import android.app.admin.FactoryResetProtectionPolicy;
-import android.content.Context;
-import android.service.persistentdata.PersistentDataBlockManager;
-import android.view.LayoutInflater;
-import android.widget.TextView;
-
-import androidx.fragment.app.FragmentActivity;
-
-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.RobolectricTestRunner;
-
-import java.util.ArrayList;
-
-@RunWith(RobolectricTestRunner.class)
-public class MasterClearConfirmTest {
-
-    private FragmentActivity mActivity;
-
-    @Mock
-    private FragmentActivity mMockActivity;
-
-    @Mock
-    private DevicePolicyManager mDevicePolicyManager;
-
-    @Mock
-    private PersistentDataBlockManager mPersistentDataBlockManager;
-
-    private MasterClearConfirm mMasterClearConfirm;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mActivity = Robolectric.setupActivity(FragmentActivity.class);
-        mMasterClearConfirm = spy(new MasterClearConfirm());
-    }
-
-    @Test
-    public void setSubtitle_eraseEsim() {
-        MasterClearConfirm masterClearConfirm = new MasterClearConfirm();
-        masterClearConfirm.mEraseEsims = true;
-        masterClearConfirm.mContentView =
-                LayoutInflater.from(mActivity).inflate(R.layout.master_clear_confirm, null);
-
-        masterClearConfirm.setSubtitle();
-
-        assertThat(((TextView) masterClearConfirm.mContentView
-                .findViewById(R.id.sud_layout_description)).getText())
-                .isEqualTo(mActivity.getString(R.string.master_clear_final_desc_esim));
-    }
-
-    @Test
-    public void setSubtitle_notEraseEsim() {
-        MasterClearConfirm masterClearConfirm = new MasterClearConfirm();
-        masterClearConfirm.mEraseEsims = false;
-        masterClearConfirm.mContentView =
-                LayoutInflater.from(mActivity).inflate(R.layout.master_clear_confirm, null);
-
-        masterClearConfirm.setSubtitle();
-
-        assertThat(((TextView) masterClearConfirm.mContentView
-                .findViewById(R.id.sud_layout_description)).getText())
-                .isEqualTo(mActivity.getString(R.string.master_clear_final_desc));
-    }
-
-    @Test
-    public void shouldWipePersistentDataBlock_noPersistentDataBlockManager_shouldReturnFalse() {
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(null)).isFalse();
-    }
-
-    @Test
-    public void shouldWipePersistentDataBlock_deviceIsStillBeingProvisioned_shouldReturnFalse() {
-        doReturn(true).when(mMasterClearConfirm).isDeviceStillBeingProvisioned();
-
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(
-                mPersistentDataBlockManager)).isFalse();
-    }
-
-    @Test
-    public void shouldWipePersistentDataBlock_oemUnlockAllowed_shouldReturnFalse() {
-        doReturn(false).when(mMasterClearConfirm).isDeviceStillBeingProvisioned();
-        doReturn(true).when(mMasterClearConfirm).isOemUnlockedAllowed();
-
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(
-                mPersistentDataBlockManager)).isFalse();
-    }
-
-    @Test
-    public void shouldWipePersistentDataBlock_frpPolicyNotSupported_shouldReturnFalse() {
-        when(mMasterClearConfirm.getActivity()).thenReturn(mMockActivity);
-
-        doReturn(false).when(mMasterClearConfirm).isDeviceStillBeingProvisioned();
-        doReturn(false).when(mMasterClearConfirm).isOemUnlockedAllowed();
-        when(mMockActivity.getSystemService(Context.DEVICE_POLICY_SERVICE))
-                .thenReturn(mDevicePolicyManager);
-        when(mDevicePolicyManager.isFactoryResetProtectionPolicySupported()).thenReturn(false);
-
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(
-                mPersistentDataBlockManager)).isFalse();
-    }
-
-    @Test
-    public void shouldWipePersistentDataBlock_hasFactoryResetProtectionPolicy_shouldReturnFalse() {
-        when(mMasterClearConfirm.getActivity()).thenReturn(mMockActivity);
-
-        doReturn(false).when(mMasterClearConfirm).isDeviceStillBeingProvisioned();
-        doReturn(false).when(mMasterClearConfirm).isOemUnlockedAllowed();
-        ArrayList<String> accounts = new ArrayList<>();
-        accounts.add("test");
-        FactoryResetProtectionPolicy frp = new FactoryResetProtectionPolicy.Builder()
-                .setFactoryResetProtectionAccounts(accounts)
-                .setFactoryResetProtectionEnabled(true)
-                .build();
-        when(mMockActivity.getSystemService(Context.DEVICE_POLICY_SERVICE))
-                .thenReturn(mDevicePolicyManager);
-        when(mDevicePolicyManager.isFactoryResetProtectionPolicySupported()).thenReturn(true);
-        when(mDevicePolicyManager.getFactoryResetProtectionPolicy(null)).thenReturn(frp);
-        when(mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()).thenReturn(true);
-
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(
-                mPersistentDataBlockManager)).isFalse();
-    }
-
-    @Test
-    public void shouldWipePersistentDataBlock_isNotOrganizationOwnedDevice_shouldReturnTrue() {
-        when(mMasterClearConfirm.getActivity()).thenReturn(mMockActivity);
-
-        doReturn(false).when(mMasterClearConfirm).isDeviceStillBeingProvisioned();
-        doReturn(false).when(mMasterClearConfirm).isOemUnlockedAllowed();
-
-        when(mMockActivity.getSystemService(Context.DEVICE_POLICY_SERVICE))
-                .thenReturn(mDevicePolicyManager);
-        when(mDevicePolicyManager.isFactoryResetProtectionPolicySupported()).thenReturn(true);
-        when(mDevicePolicyManager.getFactoryResetProtectionPolicy(null)).thenReturn(null);
-        when(mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()).thenReturn(false);
-
-        assertThat(mMasterClearConfirm.shouldWipePersistentDataBlock(
-                mPersistentDataBlockManager)).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java
deleted file mode 100644
index 03d42a9..0000000
--- a/tests/robotests/src/com/android/settings/MasterClearTest.java
+++ /dev/null
@@ -1,467 +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;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewTreeObserver;
-import android.widget.CheckBox;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-
-import androidx.fragment.app.FragmentActivity;
-
-import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settingslib.development.DevelopmentSettingsEnabler;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowActivity;
-import org.robolectric.shadows.ShadowUserManager;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowUtils.class)
-public class MasterClearTest {
-
-    private static final String TEST_ACCOUNT_TYPE = "android.test.account.type";
-    private static final String TEST_CONFIRMATION_PACKAGE = "android.test.conf.pkg";
-    private static final String TEST_CONFIRMATION_CLASS = "android.test.conf.pkg.ConfActivity";
-    private static final String TEST_ACCOUNT_NAME = "test@example.com";
-
-    @Mock
-    private ScrollView mScrollView;
-    @Mock
-    private LinearLayout mLinearLayout;
-
-    @Mock
-    private PackageManager mPackageManager;
-
-    @Mock
-    private AccountManager mAccountManager;
-
-    @Mock
-    private FragmentActivity mMockActivity;
-
-    @Mock
-    private Intent mMockIntent;
-
-    private MasterClear mMasterClear;
-    private ShadowActivity mShadowActivity;
-    private FragmentActivity mActivity;
-    private ShadowUserManager mShadowUserManager;
-    private View mContentView;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mMasterClear = spy(new MasterClear());
-        mActivity = Robolectric.setupActivity(FragmentActivity.class);
-        mShadowActivity = Shadows.shadowOf(mActivity);
-        UserManager userManager = mActivity.getSystemService(UserManager.class);
-        mShadowUserManager = Shadows.shadowOf(userManager);
-        mShadowUserManager.setIsAdminUser(true);
-        mContentView = LayoutInflater.from(mActivity).inflate(R.layout.master_clear, null);
-
-        // Make scrollView only have one child
-        when(mScrollView.getChildAt(0)).thenReturn(mLinearLayout);
-        when(mScrollView.getChildCount()).thenReturn(1);
-    }
-
-    @After
-    public void tearDown() {
-        mShadowUserManager.setIsAdminUser(false);
-    }
-
-    @Test
-    public void testShowFinalConfirmation_eraseEsimVisible_eraseEsimChecked() {
-        final Context context = mock(Context.class);
-        when(mMasterClear.getContext()).thenReturn(context);
-
-        mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
-        mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
-        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
-        mMasterClear.mEsimStorageContainer.setVisibility(View.VISIBLE);
-        mMasterClear.mEsimStorage.setChecked(true);
-        mMasterClear.showFinalConfirmation();
-
-        final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
-
-        verify(context).startActivity(intent.capture());
-        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
-                .isTrue();
-    }
-
-    @Test
-    public void testShowFinalConfirmation_eraseEsimVisible_eraseEsimUnchecked() {
-        final Context context = mock(Context.class);
-        when(mMasterClear.getContext()).thenReturn(context);
-
-        mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
-        mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
-        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
-        mMasterClear.mEsimStorageContainer.setVisibility(View.VISIBLE);
-        mMasterClear.mEsimStorage.setChecked(false);
-        mMasterClear.showFinalConfirmation();
-        final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
-
-        verify(context).startActivity(intent.capture());
-        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
-                .isFalse();
-    }
-
-    @Test
-    public void testShowFinalConfirmation_eraseEsimGone_eraseEsimChecked() {
-        final Context context = mock(Context.class);
-        when(mMasterClear.getContext()).thenReturn(context);
-
-        mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
-        mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
-        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
-        mMasterClear.mEsimStorageContainer.setVisibility(View.GONE);
-        mMasterClear.mEsimStorage.setChecked(true);
-        mMasterClear.showFinalConfirmation();
-
-        final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
-
-        verify(context).startActivity(intent.capture());
-        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-            .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
-            .isTrue();
-    }
-
-    @Test
-    public void testShowFinalConfirmation_eraseEsimGone_eraseEsimUnchecked() {
-        final Context context = mock(Context.class);
-        when(mMasterClear.getContext()).thenReturn(context);
-
-        mMasterClear.mEsimStorage = mContentView.findViewById(R.id.erase_esim);
-        mMasterClear.mExternalStorage = mContentView.findViewById(R.id.erase_external);
-        mMasterClear.mEsimStorageContainer = mContentView.findViewById(R.id.erase_esim_container);
-        mMasterClear.mEsimStorageContainer.setVisibility(View.GONE);
-        mMasterClear.mEsimStorage.setChecked(false);
-        mMasterClear.showFinalConfirmation();
-        final ArgumentCaptor<Intent> intent = ArgumentCaptor.forClass(Intent.class);
-
-        verify(context).startActivity(intent.capture());
-        assertThat(intent.getValue().getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-            .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false))
-            .isFalse();
-    }
-
-    @Test
-    public void testShowWipeEuicc_euiccDisabled() {
-        prepareEuiccState(
-                false /* isEuiccEnabled */,
-                true /* isEuiccProvisioned */,
-                false /* isDeveloper */);
-        assertThat(mMasterClear.showWipeEuicc()).isFalse();
-    }
-
-    @Test
-    public void testShowWipeEuicc_euiccEnabled_unprovisioned() {
-        prepareEuiccState(
-                true /* isEuiccEnabled */,
-                false /* isEuiccProvisioned */,
-                false /* isDeveloper */);
-        assertThat(mMasterClear.showWipeEuicc()).isFalse();
-    }
-
-    @Test
-    public void testShowWipeEuicc_euiccEnabled_provisioned() {
-        prepareEuiccState(
-                true /* isEuiccEnabled */,
-                true /* isEuiccProvisioned */,
-                false /* isDeveloper */);
-        assertThat(mMasterClear.showWipeEuicc()).isTrue();
-    }
-
-    @Test
-    public void testShowWipeEuicc_developerMode_unprovisioned() {
-        prepareEuiccState(
-                true /* isEuiccEnabled */,
-                false /* isEuiccProvisioned */,
-                true /* isDeveloper */);
-        assertThat(mMasterClear.showWipeEuicc()).isTrue();
-    }
-
-    @Test
-    public void testEsimRecheckBoxDefaultChecked() {
-        assertThat(((CheckBox) mContentView.findViewById(R.id.erase_esim)).isChecked()).isTrue();
-    }
-
-    @Test
-    public void testHasReachedBottom_NotScrollDown_returnFalse() {
-        initScrollView(100, 0, 200);
-
-        assertThat(mMasterClear.hasReachedBottom(mScrollView)).isFalse();
-    }
-
-    @Test
-    public void testHasReachedBottom_CanNotScroll_returnTrue() {
-        initScrollView(100, 0, 80);
-
-        assertThat(mMasterClear.hasReachedBottom(mScrollView)).isTrue();
-    }
-
-    @Test
-    public void testHasReachedBottom_ScrollToBottom_returnTrue() {
-        initScrollView(100, 100, 200);
-
-        assertThat(mMasterClear.hasReachedBottom(mScrollView)).isTrue();
-    }
-
-    @Test
-    public void testInitiateMasterClear_inDemoMode_sendsIntent() {
-        ShadowUtils.setIsDemoUser(true);
-
-        final ComponentName componentName =
-                ComponentName.unflattenFromString("com.android.retaildemo/.DeviceAdminReceiver");
-        ShadowUtils.setDeviceOwnerComponent(componentName);
-
-        mMasterClear.mInitiateListener.onClick(mContentView);
-        final Intent intent = mShadowActivity.getNextStartedActivity();
-        assertThat(Intent.ACTION_FACTORY_RESET).isEqualTo(intent.getAction());
-        assertThat(componentName).isNotNull();
-        assertThat(componentName.getPackageName()).isEqualTo(intent.getPackage());
-    }
-
-    @Test
-    public void testOnActivityResultInternal_invalideRequest() {
-        int invalidRequestCode = -1;
-        doReturn(false).when(mMasterClear).isValidRequestCode(eq(invalidRequestCode));
-
-        mMasterClear.onActivityResultInternal(invalidRequestCode, Activity.RESULT_OK, null);
-
-        verify(mMasterClear, times(1)).isValidRequestCode(eq(invalidRequestCode));
-        verify(mMasterClear, times(0)).establishInitialState();
-        verify(mMasterClear, times(0)).getAccountConfirmationIntent();
-        verify(mMasterClear, times(0)).showFinalConfirmation();
-    }
-
-    @Test
-    public void testOnActivityResultInternal_resultCanceled() {
-        doReturn(true).when(mMasterClear).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        doNothing().when(mMasterClear).establishInitialState();
-
-        mMasterClear
-                .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_CANCELED,
-                        null);
-
-        verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        verify(mMasterClear, times(1)).establishInitialState();
-        verify(mMasterClear, times(0)).getAccountConfirmationIntent();
-        verify(mMasterClear, times(0)).showFinalConfirmation();
-    }
-
-    @Test
-    public void testOnActivityResultInternal_keyguardRequestTriggeringConfirmAccount() {
-        doReturn(true).when(mMasterClear).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        doReturn(mMockIntent).when(mMasterClear).getAccountConfirmationIntent();
-        doNothing().when(mMasterClear).showAccountCredentialConfirmation(eq(mMockIntent));
-
-        mMasterClear
-                .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
-
-        verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        verify(mMasterClear, times(0)).establishInitialState();
-        verify(mMasterClear, times(1)).getAccountConfirmationIntent();
-        verify(mMasterClear, times(1)).showAccountCredentialConfirmation(eq(mMockIntent));
-    }
-
-    @Test
-    public void testOnActivityResultInternal_keyguardRequestTriggeringShowFinal() {
-        doReturn(true).when(mMasterClear).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        doReturn(null).when(mMasterClear).getAccountConfirmationIntent();
-        doNothing().when(mMasterClear).showFinalConfirmation();
-
-        mMasterClear
-                .onActivityResultInternal(MasterClear.KEYGUARD_REQUEST, Activity.RESULT_OK, null);
-
-        verify(mMasterClear, times(1)).isValidRequestCode(eq(MasterClear.KEYGUARD_REQUEST));
-        verify(mMasterClear, times(0)).establishInitialState();
-        verify(mMasterClear, times(1)).getAccountConfirmationIntent();
-        verify(mMasterClear, times(1)).showFinalConfirmation();
-    }
-
-    @Test
-    public void testOnActivityResultInternal_confirmRequestTriggeringShowFinal() {
-        doReturn(true).when(mMasterClear)
-                .isValidRequestCode(eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
-        doNothing().when(mMasterClear).showFinalConfirmation();
-
-        mMasterClear.onActivityResultInternal(
-                MasterClear.CREDENTIAL_CONFIRM_REQUEST, Activity.RESULT_OK, null);
-
-        verify(mMasterClear, times(1))
-                .isValidRequestCode(eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
-        verify(mMasterClear, times(0)).establishInitialState();
-        verify(mMasterClear, times(0)).getAccountConfirmationIntent();
-        verify(mMasterClear, times(1)).showFinalConfirmation();
-    }
-
-    @Test
-    public void testGetAccountConfirmationIntent_unsupported() {
-        when(mMasterClear.getActivity()).thenReturn(mActivity);
-        /* Using the default resources, account confirmation shouldn't trigger */
-        assertThat(mMasterClear.getAccountConfirmationIntent()).isNull();
-    }
-
-    @Test
-    public void testGetAccountConfirmationIntent_no_relevant_accounts() {
-        when(mMasterClear.getActivity()).thenReturn(mMockActivity);
-        when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
-        when(mMockActivity.getString(R.string.account_confirmation_package))
-                .thenReturn(TEST_CONFIRMATION_PACKAGE);
-        when(mMockActivity.getString(R.string.account_confirmation_class))
-                .thenReturn(TEST_CONFIRMATION_CLASS);
-
-        Account[] accounts = new Account[0];
-        when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
-        when(mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE)).thenReturn(accounts);
-        assertThat(mMasterClear.getAccountConfirmationIntent()).isNull();
-    }
-
-    @Test
-    public void testGetAccountConfirmationIntent_unresolved() {
-        when(mMasterClear.getActivity()).thenReturn(mMockActivity);
-        when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
-        when(mMockActivity.getString(R.string.account_confirmation_package))
-                .thenReturn(TEST_CONFIRMATION_PACKAGE);
-        when(mMockActivity.getString(R.string.account_confirmation_class))
-                .thenReturn(TEST_CONFIRMATION_CLASS);
-        Account[] accounts = new Account[]{new Account(TEST_ACCOUNT_NAME, TEST_ACCOUNT_TYPE)};
-        when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
-        when(mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE)).thenReturn(accounts);
-        // The package manager should not resolve the confirmation intent targeting the non-existent
-        // confirmation package.
-        when(mMockActivity.getPackageManager()).thenReturn(mPackageManager);
-        assertThat(mMasterClear.getAccountConfirmationIntent()).isNull();
-    }
-
-    @Test
-    public void testTryShowAccountConfirmation_ok() {
-        when(mMasterClear.getActivity()).thenReturn(mMockActivity);
-        // Only try to show account confirmation if the appropriate resource overlays are available.
-        when(mMockActivity.getString(R.string.account_type)).thenReturn(TEST_ACCOUNT_TYPE);
-        when(mMockActivity.getString(R.string.account_confirmation_package))
-                .thenReturn(TEST_CONFIRMATION_PACKAGE);
-        when(mMockActivity.getString(R.string.account_confirmation_class))
-                .thenReturn(TEST_CONFIRMATION_CLASS);
-        // Add accounts to trigger the search for a resolving intent.
-        Account[] accounts = new Account[]{new Account(TEST_ACCOUNT_NAME, TEST_ACCOUNT_TYPE)};
-        when(mMockActivity.getSystemService(Context.ACCOUNT_SERVICE)).thenReturn(mAccountManager);
-        when(mAccountManager.getAccountsByType(TEST_ACCOUNT_TYPE)).thenReturn(accounts);
-        // The package manager should not resolve the confirmation intent targeting the non-existent
-        // confirmation package.
-        when(mMockActivity.getPackageManager()).thenReturn(mPackageManager);
-
-        ActivityInfo activityInfo = new ActivityInfo();
-        activityInfo.packageName = TEST_CONFIRMATION_PACKAGE;
-        ResolveInfo resolveInfo = new ResolveInfo();
-        resolveInfo.activityInfo = activityInfo;
-        when(mPackageManager.resolveActivity(any(), eq(0))).thenReturn(resolveInfo);
-
-        Intent actualIntent = mMasterClear.getAccountConfirmationIntent();
-        assertThat(TEST_CONFIRMATION_PACKAGE).isEqualTo(
-                actualIntent.getComponent().getPackageName());
-        assertThat(TEST_CONFIRMATION_CLASS).isEqualTo(actualIntent.getComponent().getClassName());
-    }
-
-    @Test
-    public void testShowAccountCredentialConfirmation() {
-        // Finally mock out the startActivityForResultCall
-        doNothing().when(mMasterClear)
-                .startActivityForResult(eq(mMockIntent),
-                        eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
-        mMasterClear.showAccountCredentialConfirmation(mMockIntent);
-        verify(mMasterClear, times(1))
-                .startActivityForResult(eq(mMockIntent),
-                        eq(MasterClear.CREDENTIAL_CONFIRM_REQUEST));
-    }
-
-    @Test
-    public void testIsValidRequestCode() {
-        assertThat(mMasterClear.isValidRequestCode(MasterClear.KEYGUARD_REQUEST)).isTrue();
-        assertThat(mMasterClear.isValidRequestCode(MasterClear.CREDENTIAL_CONFIRM_REQUEST))
-                .isTrue();
-        assertThat(mMasterClear.isValidRequestCode(0)).isFalse();
-    }
-
-    @Test
-    public void testOnGlobalLayout_shouldNotRemoveListener() {
-        final ViewTreeObserver viewTreeObserver = mock(ViewTreeObserver.class);
-        mMasterClear.mScrollView = mScrollView;
-        doNothing().when(mMasterClear).onGlobalLayout();
-        doReturn(true).when(mMasterClear).hasReachedBottom(any());
-        when(mScrollView.getViewTreeObserver()).thenReturn(viewTreeObserver);
-
-        mMasterClear.onGlobalLayout();
-
-        verify(viewTreeObserver, never()).removeOnGlobalLayoutListener(mMasterClear);
-    }
-
-    private void prepareEuiccState(
-            boolean isEuiccEnabled, boolean isEuiccProvisioned, boolean isDeveloper) {
-        doReturn(mActivity).when(mMasterClear).getContext();
-        doReturn(isEuiccEnabled).when(mMasterClear).isEuiccEnabled(any());
-        ContentResolver cr = mActivity.getContentResolver();
-        Settings.Global.putInt(cr, Settings.Global.EUICC_PROVISIONED, isEuiccProvisioned ? 1 : 0);
-        DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mActivity, isDeveloper);
-    }
-
-    private void initScrollView(int height, int scrollY, int childBottom) {
-        when(mScrollView.getHeight()).thenReturn(height);
-        when(mScrollView.getScrollY()).thenReturn(scrollY);
-        when(mLinearLayout.getBottom()).thenReturn(childBottom);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/PointerSpeedPreferenceTest.java b/tests/robotests/src/com/android/settings/PointerSpeedPreferenceTest.java
new file mode 100644
index 0000000..0925344
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/PointerSpeedPreferenceTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2020 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;
+
+import static android.view.HapticFeedbackConstants.CLOCK_TICK;
+import static android.view.HapticFeedbackConstants.CONTEXT_CLICK;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.Shadows.shadowOf;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.SeekBar;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class PointerSpeedPreferenceTest {
+
+    private Context mContext;
+    private AttributeSet mAttrs;
+    private SeekBar mSeekBar;
+    private PointerSpeedPreference mPointerSpeedPreference;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mSeekBar = new SeekBar(mContext, mAttrs);
+        mPointerSpeedPreference = new PointerSpeedPreference(mContext, mAttrs);
+    }
+
+    @Test
+    public void onProgressChanged_minimumValue_clockTickFeedbackPerformed() {
+        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
+        mPointerSpeedPreference.onProgressChanged(mSeekBar, 0, true);
+
+        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isEqualTo(CLOCK_TICK);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/ResetNetworkTest.java b/tests/robotests/src/com/android/settings/ResetNetworkTest.java
index 3b1d73b..d703279 100644
--- a/tests/robotests/src/com/android/settings/ResetNetworkTest.java
+++ b/tests/robotests/src/com/android/settings/ResetNetworkTest.java
@@ -18,10 +18,9 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.robolectric.Shadows.shadowOf;
-
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -57,7 +56,7 @@
 
         Intent intent = shadowOf(mActivity).getNextStartedActivity();
         assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isTrue();
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isTrue();
     }
 
     @Test
@@ -69,7 +68,7 @@
 
         Intent intent = shadowOf(mActivity).getNextStartedActivity();
         assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isFalse();
     }
 
     @Test
@@ -81,7 +80,7 @@
 
         Intent intent = shadowOf(mActivity).getNextStartedActivity();
         assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isFalse();
     }
 
     @Test
@@ -93,6 +92,6 @@
 
         Intent intent = shadowOf(mActivity).getNextStartedActivity();
         assertThat(intent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS)
-                .getBoolean(MasterClear.ERASE_ESIMS_EXTRA, false)).isFalse();
+                .getBoolean(MainClear.ERASE_ESIMS_EXTRA, false)).isFalse();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
index c28ffc4..a8f42c2 100644
--- a/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
+++ b/tests/robotests/src/com/android/settings/SettingsInitializeTest.java
@@ -94,6 +94,6 @@
 
         final List<ShortcutInfo> updatedShortcuts = mShortcutManager.getPinnedShortcuts();
         assertThat(updatedShortcuts).hasSize(1);
-        assertThat(updatedShortcuts.get(0)).isSameAs(info);
+        assertThat(updatedShortcuts.get(0)).isSameInstanceAs(info);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
index 5f4f31b..5fddb80 100644
--- a/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/SetupWizardUtilsTest.java
@@ -18,20 +18,42 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.Context;
 import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
 import android.os.Bundle;
 import android.sysprop.SetupWizardProperties;
+import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.google.android.setupcompat.partnerconfig.PartnerConfigHelper;
 import com.google.android.setupcompat.util.WizardManagerHelper;
 import com.google.android.setupdesign.util.ThemeHelper;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class SetupWizardUtilsTest {
 
+    private Context mContext;
+
+    @Before
+    public void setup() {
+        PartnerConfigHelper.resetInstance();
+        mContext = ApplicationProvider.getApplicationContext();
+    }
+
     @Test
     public void testCopySetupExtras() {
         Intent fromIntent = new Intent();
@@ -66,12 +88,13 @@
     }
 
     @Test
-    public void testGetTheme_withIntentExtra_shouldReturnExtraTheme() {
+    public void testGetTheme_withIntentExtra_shouldReturnTheme() {
         SetupWizardProperties.theme(ThemeHelper.THEME_GLIF);
         Intent intent = createSetupWizardIntent();
         intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V2);
 
-        assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme);
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV2Theme);
     }
 
     @Test
@@ -79,26 +102,109 @@
         SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
         Intent intent = createSetupWizardIntent();
 
-        assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV2Theme_Light);
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV2Theme_Light);
     }
 
     @Test
-    public void testGetTheme_glifV3Light_shouldReturnThemeResource() {
+    public void testGetTheme_whenSuwDayNightEnabledAndWithIntentExtra_shouldReturnDayNightTheme() {
+        FakePartnerContentProvider provider =
+                Robolectric.setupContentProvider(
+                        FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+        provider.injectFakeDayNightEnabledResult(true);
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
+        Intent intent = createSetupWizardIntent();
+        intent.putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V2);
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV2Theme_DayNight);
+    }
+
+    @Test
+    public void testGetTheme_glifV3Light_shouldReturnLightTheme() {
         SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3_LIGHT);
         Intent intent = createSetupWizardIntent();
 
-        assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme_Light);
-        assertThat(SetupWizardUtils.getTransparentTheme(intent))
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme_Light);
+        assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
                 .isEqualTo(R.style.GlifV3Theme_Light_Transparent);
     }
 
     @Test
-    public void testGetTheme_nonSuw_shouldReturnDayNightTheme() {
+    public void testGetTheme_glifV3_shouldReturnTheme() {
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3);
+        Intent intent = createSetupWizardIntent();
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme);
+        assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme_Transparent);
+    }
+
+    @Test
+    public void testGetTheme_whenSuwDayNightDisabledAndGlifV2_shouldReturnLightTheme() {
+        FakePartnerContentProvider provider =
+                Robolectric.setupContentProvider(
+                        FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+        provider.injectFakeDayNightEnabledResult(false);
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
+        Intent intent = createSetupWizardIntent();
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV2Theme_Light);
+    }
+
+    @Test
+    public void testGetTheme_whenSuwDayNightEnabledAndGlifV2_shouldReturnDayNightTheme() {
+        FakePartnerContentProvider provider =
+                Robolectric.setupContentProvider(
+                        FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+        provider.injectFakeDayNightEnabledResult(true);
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V2_LIGHT);
+        Intent intent = createSetupWizardIntent();
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV2Theme_DayNight);
+    }
+
+    @Test
+    public void testGetTheme_whenSuwDayNightDisabledAndGlifV3_shouldReturnTheme() {
+        FakePartnerContentProvider provider =
+                Robolectric.setupContentProvider(
+                        FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+        provider.injectFakeDayNightEnabledResult(false);
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3);
+        Intent intent = createSetupWizardIntent();
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme);
+        assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme_Transparent);
+    }
+
+    @Test
+    public void testGetTheme_whenSuwDayNightEnabledAndGlifV3_shouldReturnDayNightTheme() {
+        FakePartnerContentProvider provider =
+                Robolectric.setupContentProvider(
+                        FakePartnerContentProvider.class, "com.google.android.setupwizard.partner");
+        provider.injectFakeDayNightEnabledResult(true);
+        SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3);
+        Intent intent = createSetupWizardIntent();
+
+        assertThat(SetupWizardUtils.getTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme_DayNight);
+        assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
+                .isEqualTo(R.style.GlifV3Theme_DayNight_Transparent);
+    }
+
+    @Test
+    public void testGetTheme_nonSuw_shouldReturnTheme() {
         SetupWizardProperties.theme(ThemeHelper.THEME_GLIF_V3_LIGHT);
         Intent intent = new Intent();
 
-        assertThat(SetupWizardUtils.getTheme(intent)).isEqualTo(R.style.GlifV3Theme);
-        assertThat(SetupWizardUtils.getTransparentTheme(intent))
+        assertThat(SetupWizardUtils.getTheme(mContext, intent)).isEqualTo(R.style.GlifV3Theme);
+        assertThat(SetupWizardUtils.getTransparentTheme(mContext, intent))
                 .isEqualTo(R.style.GlifV3Theme_Transparent);
     }
 
@@ -107,4 +213,65 @@
                 .putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true)
                 .putExtra(WizardManagerHelper.EXTRA_IS_FIRST_RUN, true);
     }
+
+    private static final class FakePartnerContentProvider extends ContentProvider {
+
+        private final Bundle mFakeProviderDayNightEnabledResultBundle = new Bundle();
+
+        @Override
+        public boolean onCreate() {
+            return true;
+        }
+
+        @Override
+        public Cursor query(
+                @NonNull Uri uri,
+                @Nullable String[] projection,
+                @Nullable String selection,
+                @Nullable String[] selectionArgs,
+                @Nullable String sortOrder) {
+            return null;
+        }
+
+        @Nullable
+        @Override
+        public String getType(@NonNull Uri uri) {
+            return null;
+        }
+
+        @Nullable
+        @Override
+        public Uri insert(@NonNull Uri uri, @Nullable ContentValues values) {
+            return null;
+        }
+
+        @Override
+        public int delete(
+                @NonNull Uri uri, @Nullable String selection, @Nullable String[] selectionArgs) {
+            return 0;
+        }
+
+        @Override
+        public int update(
+                @NonNull Uri uri,
+                @Nullable ContentValues values,
+                @Nullable String selection,
+                @Nullable String[] selectionArgs) {
+            return 0;
+        }
+
+        @Override
+        public Bundle call(String method, String arg, Bundle extras) {
+            if (TextUtils.equals(method, "isSuwDayNightEnabled")) {
+                return mFakeProviderDayNightEnabledResultBundle;
+            }
+            return null;
+        }
+
+        public FakePartnerContentProvider injectFakeDayNightEnabledResult(boolean dayNightEnabled) {
+            mFakeProviderDayNightEnabledResultBundle.putBoolean(
+                    "isSuwDayNightEnabled", dayNightEnabled);
+            return this;
+        }
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/TetherSettingsTest.java b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
index 3c38c51d..f217e21 100644
--- a/tests/robotests/src/com/android/settings/TetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/TetherSettingsTest.java
@@ -18,6 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -25,20 +27,28 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothPan;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.FeatureFlagUtils;
 
+import androidx.fragment.app.FragmentActivity;
 import androidx.preference.Preference;
+import androidx.preference.SwitchPreference;
 
 import com.android.settings.core.FeatureFlags;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -113,7 +123,7 @@
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
         // We can ignore the condition of Utils.isMonkeyRunning()
         // In normal case, monkey and robotest should not execute at the same time
-        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{"dummyRegex"});
+        when(mConnectivityManager.getTetherableUsbRegexs()).thenReturn(new String[]{"fakeRegex"});
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -135,7 +145,7 @@
     public void testTetherNonIndexableKeys_bluetoothAvailable_bluetoothKeyNotReturned() {
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
         when(mConnectivityManager.getTetherableBluetoothRegexs())
-                .thenReturn(new String[]{"dummyRegex"});
+                .thenReturn(new String[]{"fakeRegex"});
 
         final List<String> niks =
             TetherSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
@@ -148,18 +158,94 @@
         final TetherSettings spyTetherSettings = spy(new TetherSettings());
         when(spyTetherSettings.getContext()).thenReturn(mContext);
         final Preference mockPreference = mock(Preference.class);
-        when(spyTetherSettings.findPreference(TetherSettings.KEY_TETHER_PREFS_FOOTER))
+        when(spyTetherSettings.findPreference(TetherSettings.KEY_TETHER_PREFS_TOP_INTRO))
             .thenReturn(mockPreference);
         final WifiManager mockWifiManager = mock(WifiManager.class);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mockWifiManager);
         when(mockWifiManager.isStaApConcurrencySupported()).thenReturn(true);
 
-        spyTetherSettings.setFooterPreferenceTitle();
+        spyTetherSettings.setTopIntroPreferenceTitle();
 
         verify(mockPreference, never()).setTitle(R.string.tethering_footer_info);
         verify(mockPreference).setTitle(R.string.tethering_footer_info_sta_ap_concurrency);
     }
 
+    @Test
+    public void testBluetoothState_updateBluetoothState_bluetoothTetheringStateOn() {
+        final TetherSettings spyTetherSettings = spy(new TetherSettings());
+        when(spyTetherSettings.getContext()).thenReturn(mContext);
+        final SwitchPreference mockSwitchPreference = mock(SwitchPreference.class);
+        when(spyTetherSettings.findPreference(TetherSettings.KEY_ENABLE_BLUETOOTH_TETHERING))
+            .thenReturn(mockSwitchPreference);
+        final FragmentActivity mockActivity = mock(FragmentActivity.class);
+        when(spyTetherSettings.getActivity()).thenReturn(mockActivity);
+        final ArgumentCaptor<BroadcastReceiver> captor =
+                ArgumentCaptor.forClass(BroadcastReceiver.class);
+        when(mockActivity.registerReceiver(captor.capture(), any(IntentFilter.class)))
+            .thenReturn(null);
+        // Bluetooth tethering state is on
+        when(spyTetherSettings.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_ON);
+        when(spyTetherSettings.isBluetoothTetheringOn()).thenReturn(true);
+
+        spyTetherSettings.setupTetherPreference();
+        spyTetherSettings.registerReceiver();
+        updateOnlyBluetoothState(spyTetherSettings);
+
+        // Simulate Bluetooth tethering state changed
+        final BroadcastReceiver receiver = captor.getValue();
+        final Intent bluetoothTetheringOn = new Intent(BluetoothPan.ACTION_TETHERING_STATE_CHANGED);
+        bluetoothTetheringOn.putExtra(BluetoothPan.EXTRA_TETHERING_STATE,
+                BluetoothPan.TETHERING_STATE_ON);
+        receiver.onReceive(mockActivity, bluetoothTetheringOn);
+
+        verify(mockSwitchPreference).setEnabled(true);
+        verify(mockSwitchPreference).setChecked(true);
+    }
+
+    @Test
+    public void testBluetoothState_updateBluetoothState_bluetoothTetheringStateOff() {
+        final TetherSettings spyTetherSettings = spy(new TetherSettings());
+        when(spyTetherSettings.getContext()).thenReturn(mContext);
+        final SwitchPreference mockSwitchPreference = mock(SwitchPreference.class);
+        when(spyTetherSettings.findPreference(TetherSettings.KEY_ENABLE_BLUETOOTH_TETHERING))
+            .thenReturn(mockSwitchPreference);
+        final FragmentActivity mockActivity = mock(FragmentActivity.class);
+        when(spyTetherSettings.getActivity()).thenReturn(mockActivity);
+        final ArgumentCaptor<BroadcastReceiver> captor =
+                ArgumentCaptor.forClass(BroadcastReceiver.class);
+        when(mockActivity.registerReceiver(captor.capture(), any(IntentFilter.class)))
+            .thenReturn(null);
+        // Bluetooth tethering state is off
+        when(spyTetherSettings.getBluetoothState()).thenReturn(BluetoothAdapter.STATE_ON);
+        when(spyTetherSettings.isBluetoothTetheringOn()).thenReturn(false);
+
+        spyTetherSettings.setupTetherPreference();
+        spyTetherSettings.registerReceiver();
+        updateOnlyBluetoothState(spyTetherSettings);
+
+        // Simulate Bluetooth tethering state changed
+        final BroadcastReceiver receiver = captor.getValue();
+        final Intent bluetoothTetheringOn = new Intent(BluetoothPan.ACTION_TETHERING_STATE_CHANGED);
+        bluetoothTetheringOn.putExtra(BluetoothPan.EXTRA_TETHERING_STATE,
+                BluetoothPan.TETHERING_STATE_ON);
+        receiver.onReceive(mockActivity, bluetoothTetheringOn);
+
+        verify(mockSwitchPreference).setEnabled(true);
+        verify(mockSwitchPreference).setChecked(false);
+    }
+
+    private void updateOnlyBluetoothState(TetherSettings tetherSettings) {
+        doReturn(mConnectivityManager).when(tetherSettings)
+            .getSystemService(Context.CONNECTIVITY_SERVICE);
+        when(mConnectivityManager.getTetherableIfaces()).thenReturn(new String[0]);
+        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[0]);
+        when(mConnectivityManager.getTetheringErroredIfaces()).thenReturn(new String[0]);
+        doNothing().when(tetherSettings).updateUsbState(any(String[].class), any(String[].class),
+                any(String[].class));
+        doNothing().when(tetherSettings).updateEthernetState(any(String[].class),
+                any(String[].class));
+    }
+
     private void setupIsTetherAvailable(boolean returnValue) {
         when(mConnectivityManager.isTetheringSupported()).thenReturn(true);
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
index 9ad00eb..a04f0cf 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityDetailsSettingsFragmentTest.java
@@ -16,6 +16,10 @@
 
 package com.android.settings.accessibility;
 
+import static com.android.internal.accessibility.AccessibilityShortcutController.MAGNIFICATION_COMPONENT_NAME;
+
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
@@ -33,11 +37,14 @@
 
 import androidx.fragment.app.FragmentActivity;
 
+import com.android.settings.SettingsActivity;
 import com.android.settings.testutils.shadow.ShadowFragment;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -61,6 +68,8 @@
     private Context mContext;
     private AccessibilityDetailsSettingsFragment mFragment;
     private ShadowAccessibilityManager mShadowAccessibilityManager;
+    @Captor
+    private ArgumentCaptor<Intent> mIntentArgumentCaptor;
     @Mock private FragmentActivity mActivity;
 
     @Before
@@ -76,39 +85,43 @@
     }
 
     @Test
-    public void onCreate_hasValidExtraComponentName_shouldOpenAccessibilityDetailsSettings() {
+    public void onCreate_hasValidExtraComponentName_launchExpectedFragmentAndFinish() {
         final Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME);
         doReturn(intent).when(mActivity).getIntent();
 
         mFragment.onCreate(Bundle.EMPTY);
 
-        verify(mFragment).openAccessibilityDetailsSettingsAndFinish(any());
+        assertStartActivityWithExpectedFragment(mActivity,
+                ToggleAccessibilityServicePreferenceFragment.class.getName());
+        verify(mActivity).finish();
     }
 
     @Test
-    public void onCreate_hasInvalidExtraComponentName_shouldOpenAccessibilityServicesList() {
+    public void onCreate_hasInvalidExtraComponentName_launchAccessibilitySettingsAndFinish() {
         final Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_COMPONENT_NAME, PACKAGE_NAME + "/.service");
         doReturn(intent).when(mActivity).getIntent();
 
         mFragment.onCreate(Bundle.EMPTY);
 
-        verify(mFragment).openAccessibilitySettingsAndFinish();
+        assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName());
+        verify(mActivity).finish();
     }
 
     @Test
-    public void onCreate_hasNoExtraComponentName_shouldOpenAccessibilityServicesList() {
+    public void onCreate_hasNoExtraComponentName_launchAccessibilitySettingsAndFinish() {
         final Intent intent = new Intent();
         doReturn(intent).when(mActivity).getIntent();
 
         mFragment.onCreate(Bundle.EMPTY);
 
-        verify(mFragment).openAccessibilitySettingsAndFinish();
+        assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName());
+        verify(mActivity).finish();
     }
 
     @Test
-    public void onCreate_extraComponentNameIsDisallowed_shouldOpenAccessibilityServicesList() {
+    public void onCreate_extraComponentNameIsDisallowed_launchAccessibilitySettingsAndFinish() {
         final Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_COMPONENT_NAME, COMPONENT_NAME);
         doReturn(intent).when(mActivity).getIntent();
@@ -116,7 +129,23 @@
 
         mFragment.onCreate(Bundle.EMPTY);
 
-        verify(mFragment).openAccessibilitySettingsAndFinish();
+        assertStartActivityWithExpectedFragment(mActivity, AccessibilitySettings.class.getName());
+        verify(mActivity).finish();
+    }
+
+    @Test
+    public void onCreate_magnificationComponentName_launchMagnificationFragmentAndFinish() {
+        final Intent intent = new Intent();
+        intent.putExtra(Intent.EXTRA_COMPONENT_NAME,
+                MAGNIFICATION_COMPONENT_NAME.flattenToString());
+        doReturn(intent).when(mActivity).getIntent();
+
+        mFragment.onCreate(Bundle.EMPTY);
+
+
+        assertStartActivityWithExpectedFragment(mActivity,
+                ToggleScreenMagnificationPreferenceFragment.class.getName());
+        verify(mActivity).finish();
     }
 
     private AccessibilityServiceInfo getMockAccessibilityServiceInfo() {
@@ -148,4 +177,11 @@
         infoList.add(getMockAccessibilityServiceInfo());
         return infoList;
     }
+
+    private void assertStartActivityWithExpectedFragment(Context mockContext, String fragmentName) {
+        verify(mockContext).startActivity(mIntentArgumentCaptor.capture());
+        assertThat(mIntentArgumentCaptor.getValue()
+                .getStringExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT))
+                .isEqualTo(fragmentName);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
index bf63130..c2cc609 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
@@ -60,8 +60,8 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class AccessibilitySettingsTest {
-    private static final String DUMMY_PACKAGE_NAME = "com.dummy.example";
-    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".dummy_a11y_service";
+    private static final String DUMMY_PACKAGE_NAME = "com.mock.example";
+    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".mock_a11y_service";
     private static final ComponentName DUMMY_COMPONENT_NAME = new ComponentName(DUMMY_PACKAGE_NAME,
             DUMMY_CLASS_NAME);
     private static final int ON = 1;
@@ -99,7 +99,7 @@
         final List<String> keys =
                 XmlTestUtils.getKeysFromPreferenceXml(mContext, R.xml.accessibility_settings);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceControllerTest.java
deleted file mode 100644
index 53f6cc0..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceControllerTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
-import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import androidx.preference.SwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class AccessibilityShortcutPreferenceControllerTest {
-
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private AccessibilityShortcutPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new SwitchPreference(mContext);
-        mController = new AccessibilityShortcutPreferenceController(mContext,
-                "accessibility_shortcut_preference");
-    }
-
-    @Test
-    public void isChecked_enabledShortcutOnLockScreen_shouldReturnTrue() {
-        Settings.Secure.putIntForUser(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, ON, UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void isChecked_disabledShortcutOnLockScreen_shouldReturnFalse() {
-        Settings.Secure.putIntForUser(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, OFF,
-                UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setChecked_setTrue_shouldEnableShortcutOnLockScreen() {
-        mController.setChecked(true);
-
-        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, OFF,
-                UserHandle.USER_CURRENT)).isEqualTo(ON);
-    }
-
-    @Test
-    public void setChecked_setFalse_shouldDisableShortcutOnLockScreen() {
-        mController.setChecked(false);
-
-        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, ON,
-                UserHandle.USER_CURRENT)).isEqualTo(OFF);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
index ac3198f..83c5bc2 100644
--- a/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/AccessibilityUtilTest.java
@@ -44,9 +44,9 @@
     private static final int ON = 1;
     private static final int OFF = 0;
     private static final String SECURE_TEST_KEY = "secure_test_key";
-    private static final String DUMMY_PACKAGE_NAME = "com.dummy.example";
-    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".dummy_a11y_service";
-    private static final String DUMMY_CLASS_NAME2 = DUMMY_PACKAGE_NAME + ".dummy_a11y_service2";
+    private static final String DUMMY_PACKAGE_NAME = "com.mock.example";
+    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".mock_a11y_service";
+    private static final String DUMMY_CLASS_NAME2 = DUMMY_PACKAGE_NAME + ".mock_a11y_service2";
     private static final ComponentName DUMMY_COMPONENT_NAME = new ComponentName(DUMMY_PACKAGE_NAME,
             DUMMY_CLASS_NAME);
     private static final ComponentName DUMMY_COMPONENT_NAME2 = new ComponentName(DUMMY_PACKAGE_NAME,
diff --git a/tests/robotests/src/com/android/settings/accessibility/AnimatedImagePreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/AnimatedImagePreferenceTest.java
new file mode 100644
index 0000000..c3dd7b5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/AnimatedImagePreferenceTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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 android.content.Context;
+import android.graphics.drawable.AnimatedImageDrawable;
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/** Tests for {@link AnimatedImagePreference}. */
+@RunWith(RobolectricTestRunner.class)
+public class AnimatedImagePreferenceTest {
+    private Uri mImageUri;
+    private View mRootView;
+    private PreferenceViewHolder mViewHolder;
+    private AnimatedImagePreference mAnimatedImagePreference;
+
+    @Spy
+    private ImageView mImageView;
+
+    @Mock
+    private AnimatedImageDrawable mAnimatedImageDrawable;
+
+    @Before
+    public void init() {
+        MockitoAnnotations.initMocks(this);
+
+        final Context context = RuntimeEnvironment.application;
+        final LayoutInflater inflater = LayoutInflater.from(context);
+        mRootView = spy(inflater.inflate(R.layout.preference_animated_image, /* root= */ null));
+        mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(mRootView));
+        mImageView = spy(new ImageView(context));
+
+        mAnimatedImagePreference = new AnimatedImagePreference(context);
+        mImageUri = new Uri.Builder().build();
+    }
+
+    @Test
+    public void readImageUri_animatedImage_startAnimation() {
+        doReturn(mImageView).when(mRootView).findViewById(R.id.animated_img);
+        doReturn(mAnimatedImageDrawable).when(mImageView).getDrawable();
+
+        mAnimatedImagePreference.setImageUri(mImageUri);
+        mAnimatedImagePreference.onBindViewHolder(mViewHolder);
+
+        verify(mAnimatedImageDrawable).start();
+    }
+
+    @Test
+    public void setImageUri_viewNotExist_setFail() {
+        doReturn(null).when(mRootView).findViewById(R.id.animated_img);
+
+        mAnimatedImagePreference.setImageUri(mImageUri);
+        mAnimatedImagePreference.onBindViewHolder(mViewHolder);
+
+        verify(mImageView, never()).setImageURI(mImageUri);
+    }
+
+    @Test
+    public void setMaxHeight_success() {
+        final int maxHeight = 100;
+        doReturn(mImageView).when(mRootView).findViewById(R.id.animated_img);
+
+        mAnimatedImagePreference.setMaxHeight(maxHeight);
+        mAnimatedImagePreference.onBindViewHolder(mViewHolder);
+
+        assertThat(mImageView.getMaxHeight()).isEqualTo(maxHeight);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java b/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java
index e0dc681..93f1a7b 100644
--- a/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/BalanceSeekBarTest.java
@@ -16,12 +16,16 @@
 
 package com.android.settings.accessibility;
 
+import static android.view.HapticFeedbackConstants.CLOCK_TICK;
+import static android.view.HapticFeedbackConstants.CONTEXT_CLICK;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -49,7 +53,7 @@
     public void setUp() {
         mContext = RuntimeEnvironment.application;
         mSeekBar = new BalanceSeekBar(mContext, mAttrs);
-        mProxySeekBarListener = mSeekBar.getProxySeekBarListener();
+        mProxySeekBarListener = shadowOf(mSeekBar).getOnSeekBarChangeListener();
         mockSeekBarChangeListener = mock(SeekBar.OnSeekBarChangeListener.class);
         mSeekBar.setOnSeekBarChangeListener(mockSeekBarChangeListener);
     }
@@ -78,6 +82,31 @@
     }
 
     @Test
+    public void onProgressChanged_minimumValue_clockTickFeedbackPerformed() {
+        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
+        mProxySeekBarListener.onProgressChanged(mSeekBar, 0, true);
+
+        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isEqualTo(CLOCK_TICK);
+    }
+
+    @Test
+    public void onProgressChanged_centerValue_clockTickFeedbackPerformed() {
+        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
+        mProxySeekBarListener.onProgressChanged(mSeekBar, MAX_PROGRESS_VALUE / 2, true);
+
+        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isEqualTo(CLOCK_TICK);
+    }
+
+    @Test
+    public void onProgressChanged_maximumValue_clockTickFeedbackPerformed() {
+        mSeekBar.setMax(MAX_PROGRESS_VALUE);
+        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
+        mProxySeekBarListener.onProgressChanged(mSeekBar, MAX_PROGRESS_VALUE, true);
+
+        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isEqualTo(CLOCK_TICK);
+    }
+
+    @Test
     public void setMaxTest_shouldSetValue() {
         mSeekBar.setMax(MAX_PROGRESS_VALUE);
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/ColorPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/ColorPreferenceTest.java
new file mode 100644
index 0000000..d967b98
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ColorPreferenceTest.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.preference.PreferenceViewHolder;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link ColorPreference}. */
+@RunWith(RobolectricTestRunner.class)
+public class ColorPreferenceTest {
+
+    private Context mContext;
+    private static final int COLOR_TRANSPARENT_VALUE = 0;
+    private static final int COLOR_WHITE_VALUE = 0xFFFFFFFF;
+    private static final int COLOR_BLACK_VALUE = 0xFF000000;
+    private static final String COLOR_TRANSPARENT = "TRANSPARENT";
+    private static final String COLOR_WHITE = "WHITE";
+    private static final String COLOR_BLACK = "BLACK";
+    private final int[] mColorValues =
+            {COLOR_TRANSPARENT_VALUE, COLOR_WHITE_VALUE, COLOR_BLACK_VALUE};
+    private final String[] mColorTitles = {COLOR_TRANSPARENT, COLOR_WHITE, COLOR_BLACK};
+    private View mRootView;
+    private ImageView mImageView;
+    private TextView mTextView;
+    private ColorPreference mColorPreference;
+    private PreferenceViewHolder mViewHolder;
+
+    @Before
+    public void init() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mRootView = spy(new View(mContext));
+        mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(mRootView));
+        mImageView = spy(new ImageView(mContext));
+        mTextView = spy(new TextView(mContext));
+
+        final AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
+        mColorPreference = new ColorPreference(mContext, attributeSet);
+    }
+
+    @Test
+    public void setPreviewEnabled_enabled_shouldSetCustomLayout() {
+        mColorPreference.setPreviewEnabled(true);
+
+        assertThat(mColorPreference.getWidgetLayoutResource()).isEqualTo(R.layout.preference_color);
+    }
+
+    @Test
+    public void setPreviewEnabled_disabled_shouldSetInvalidId() {
+        mColorPreference.setPreviewEnabled(false);
+
+        assertThat(mColorPreference.getWidgetLayoutResource()).isEqualTo(0);
+    }
+
+    @Test
+    public void setTitles_titlesExist_returnTitle() {
+        mColorPreference.setTitles(mColorTitles);
+
+        assertThat(mColorPreference.getTitleAt(/* index= */ 0)).isEqualTo(mColorTitles[0]);
+        assertThat(mColorPreference.getTitleAt(/* index= */ 1)).isEqualTo(mColorTitles[1]);
+        assertThat(mColorPreference.getTitleAt(/* index= */ 2)).isEqualTo(mColorTitles[2]);
+    }
+
+    @Test
+    public void setTitles_noTitle_returnRGBText() {
+        final int testIndex = 0;
+        mColorPreference.setValues(mColorValues);
+        final ListDialogPreference listDialogPreference = (ListDialogPreference) mColorPreference;
+        final int value = listDialogPreference.getValueAt(testIndex);
+        final int r = Color.red(value);
+        final int g = Color.green(value);
+        final int b = Color.blue(value);
+        final String rgbText = mContext.getString(R.string.color_custom, r, g, b);
+
+        mColorPreference.setTitles(null);
+        final CharSequence title = mColorPreference.getTitleAt(testIndex);
+
+        assertThat(title).isEqualTo(rgbText);
+    }
+
+    @Test
+    public void onBindViewHolder_enabled_transparent_matchBackgroundResource() {
+        doReturn(mImageView).when(mViewHolder).findViewById(R.id.color_preview);
+        mColorPreference.setPreviewEnabled(true);
+
+        mColorPreference.setEnabled(true);
+        mColorPreference.setTitles(mColorTitles);
+        mColorPreference.setValues(mColorValues);
+        mColorPreference.setValue(COLOR_TRANSPARENT_VALUE);
+        mColorPreference.onBindViewHolder(mViewHolder);
+
+        verify(mImageView).setBackgroundResource(R.drawable.transparency_tileable);
+    }
+
+    @Test
+    public void onBindViewHolder_enabled_titlesExist_matchDescription() {
+        doReturn(mImageView).when(mViewHolder).findViewById(R.id.color_preview);
+        mColorPreference.setPreviewEnabled(true);
+
+        mColorPreference.setEnabled(true);
+        mColorPreference.setTitles(mColorTitles);
+        mColorPreference.setValues(mColorValues);
+        mColorPreference.setValue(COLOR_WHITE_VALUE);
+        mColorPreference.onBindViewHolder(mViewHolder);
+
+        verify(mImageView).setContentDescription(COLOR_WHITE);
+    }
+
+    @Test
+    public void onBindViewHolder_disabled_matchAlpha() {
+        doReturn(mImageView).when(mViewHolder).findViewById(R.id.color_preview);
+        mColorPreference.setPreviewEnabled(true);
+        mColorPreference.setValues(mColorValues);
+        mColorPreference.setValue(COLOR_WHITE_VALUE);
+
+        mColorPreference.setEnabled(false);
+        mColorPreference.onBindViewHolder(mViewHolder);
+
+        verify(mImageView).setAlpha(0.2f);
+    }
+
+    @Test
+    public void onBindListItem_transparent_matchBackgroundResource() {
+        final int colorTransparentIndex = 0;
+        doReturn(mImageView).when(mRootView).findViewById(R.id.color_swatch);
+        doReturn(mTextView).when(mRootView).findViewById(R.id.summary);
+        mColorPreference.setTitles(mColorTitles);
+        mColorPreference.setValues(mColorValues);
+
+        mColorPreference.onBindListItem(mRootView, colorTransparentIndex);
+
+        verify(mImageView).setBackgroundResource(R.drawable.transparency_tileable);
+    }
+
+    @Test
+    public void onBindListItem_colorDrawable_matchColor() {
+        final int testIndex = 0;
+        final ColorDrawable colorDrawable = spy(new ColorDrawable());
+        doReturn(mImageView).when(mRootView).findViewById(R.id.color_swatch);
+        doReturn(colorDrawable).when(mImageView).getDrawable();
+        doReturn(mTextView).when(mRootView).findViewById(R.id.summary);
+        mColorPreference.setTitles(mColorTitles);
+        mColorPreference.setValues(mColorValues);
+
+        mColorPreference.onBindListItem(mRootView, testIndex);
+        final int argb = mColorPreference.getValueAt(testIndex);
+        final int alpha = Color.alpha(argb);
+
+        verify(colorDrawable).setColor(alpha);
+    }
+
+    @Test
+    public void onBindListItem_colorDrawable_matchSummary() {
+        final int testIndex = 0;
+        doReturn(mImageView).when(mRootView).findViewById(R.id.color_swatch);
+        doReturn(mTextView).when(mRootView).findViewById(R.id.summary);
+        mColorPreference.setTitles(mColorTitles);
+        mColorPreference.setValues(mColorValues);
+
+        mColorPreference.onBindListItem(mRootView, /* index= */ testIndex);
+        final CharSequence title = mColorPreference.getTitleAt(testIndex);
+
+        verify(mTextView).setText(title);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/DisableAnimationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/DisableAnimationsPreferenceControllerTest.java
deleted file mode 100644
index 245fb74..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/DisableAnimationsPreferenceControllerTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static com.android.settings.accessibility.DisableAnimationsPreferenceController.ANIMATION_OFF_VALUE;
-import static com.android.settings.accessibility.DisableAnimationsPreferenceController.ANIMATION_ON_VALUE;
-import static com.android.settings.accessibility.DisableAnimationsPreferenceController.TOGGLE_ANIMATION_TARGETS;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.core.BasePreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class DisableAnimationsPreferenceControllerTest {
-
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private DisableAnimationsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new SwitchPreference(mContext);
-        mController = new DisableAnimationsPreferenceController(mContext, "disable_animation");
-    }
-
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void isChecked_enabledAnimation_shouldReturnFalse() {
-        for (String animationPreference : TOGGLE_ANIMATION_TARGETS) {
-            Settings.Global.putString(mContext.getContentResolver(), animationPreference,
-                    ANIMATION_ON_VALUE);
-        }
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void isChecked_disabledAnimation_shouldReturnTrue() {
-        for (String animationPreference : TOGGLE_ANIMATION_TARGETS) {
-            Settings.Global.putString(mContext.getContentResolver(), animationPreference,
-                    ANIMATION_OFF_VALUE);
-        }
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void setChecked_disabledAnimation_shouldDisableAnimationTargets() {
-        mController.setChecked(true);
-
-        for (String animationSetting : TOGGLE_ANIMATION_TARGETS) {
-            assertThat(Settings.Global.getString(mContext.getContentResolver(), animationSetting))
-                    .isEqualTo(ANIMATION_OFF_VALUE);
-        }
-    }
-
-    @Test
-    public void setChecked_enabledAnimation_shouldEnableAnimationTargets() {
-        mController.setChecked(false);
-
-        for (String animationSetting : TOGGLE_ANIMATION_TARGETS) {
-            assertThat(Settings.Global.getString(mContext.getContentResolver(), animationSetting))
-                    .isEqualTo(ANIMATION_ON_VALUE);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/DividerAllowedBelowPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/DividerAllowedBelowPreferenceTest.java
new file mode 100644
index 0000000..27f0623
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/DividerAllowedBelowPreferenceTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.internal.verification.VerificationModeFactory.times;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/** Tests for {@link DividerAllowedBelowPreference}. */
+@RunWith(RobolectricTestRunner.class)
+public class DividerAllowedBelowPreferenceTest {
+    private final Context mContext = RuntimeEnvironment.application;
+    private PreferenceViewHolder mViewHolder;
+
+    @Before
+    public void setUp() {
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        final View rootView =
+                inflater.inflate(R.layout.preference, /* root= */ null);
+        mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(rootView));
+    }
+
+    @Test
+    public void onBindViewHolder_dividerAllowedBelow() {
+        final DividerAllowedBelowPreference dividerAllowedBelowPreference =
+                new DividerAllowedBelowPreference(mContext);
+
+        dividerAllowedBelowPreference.onBindViewHolder(mViewHolder);
+
+        // One time was in parent, the other time was in child.
+        verify(mViewHolder, times(2)).setDividerAllowedBelow(true);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/DividerSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/DividerSwitchPreferenceTest.java
new file mode 100644
index 0000000..d80a4e8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/DividerSwitchPreferenceTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.internal.verification.VerificationModeFactory.times;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+/** Tests for {@link DividerSwitchPreference}. */
+@RunWith(RobolectricTestRunner.class)
+public class DividerSwitchPreferenceTest {
+    private final Context mContext = RuntimeEnvironment.application;
+    private View mRootView;
+    private PreferenceViewHolder mViewHolder;
+    private DividerSwitchPreference mDividerSwitchPreference;
+
+    @Before
+    public void setUp() {
+        initRootView();
+        initPreference();
+    }
+
+    @Test
+    public void setDividerAllowedAbove_allowed_success() {
+        mDividerSwitchPreference.setDividerAllowedAbove(true);
+        mDividerSwitchPreference.onBindViewHolder(mViewHolder);
+
+        // One time was in parent, the other time was in child.
+        verify(mViewHolder, times(2)).setDividerAllowedAbove(true);
+    }
+
+    @Test
+    public void setDividerAllowedBelow_allowed_success() {
+        mDividerSwitchPreference.setDividerAllowedBelow(true);
+        mDividerSwitchPreference.onBindViewHolder(mViewHolder);
+
+        // One time was in parent, the other time was in child.
+        verify(mViewHolder, times(2)).setDividerAllowedBelow(true);
+    }
+
+    @Test
+    public void setSwitchVisibility_visible_success() {
+        final View view = spy(new View(mContext));
+        doReturn(view).when(mRootView).findViewById(android.R.id.widget_frame);
+
+        mDividerSwitchPreference.setSwitchVisibility(View.VISIBLE);
+        mDividerSwitchPreference.onBindViewHolder(mViewHolder);
+
+        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
+    }
+
+    private void initRootView() {
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        mRootView = spy(inflater.inflate(R.layout.preference_widget_switch, /* root= */ null));
+        mViewHolder = spy(PreferenceViewHolder.createInstanceForTests(mRootView));
+    }
+
+    private void initPreference() {
+        mDividerSwitchPreference = new DividerSwitchPreference(mContext);
+        mDividerSwitchPreference.setDividerAllowedAbove(false);
+        mDividerSwitchPreference.setDividerAllowedBelow(false);
+        mDividerSwitchPreference.setSwitchVisibility(View.INVISIBLE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/EdgeTypePreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/EdgeTypePreferenceTest.java
new file mode 100644
index 0000000..9117d51
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/EdgeTypePreferenceTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.accessibility.CaptioningManager.CaptionStyle;
+import android.widget.TextView;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.internal.widget.SubtitleView;
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link EdgeTypePreference}. */
+@RunWith(RobolectricTestRunner.class)
+public class EdgeTypePreferenceTest {
+
+    private Context mContext;
+    private View mRootView;
+    private TextView mSummaryView;
+    private SubtitleView mSubtitleView;
+    private EdgeTypePreference mEdgeTypePreference;
+
+    @Before
+    public void init() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mRootView = spy(new View(mContext));
+        mSummaryView = spy(new TextView(mContext));
+        mSubtitleView = spy(new SubtitleView(mContext));
+
+        final AttributeSet attributeSet = Robolectric.buildAttributeSet().build();
+        mEdgeTypePreference = spy(new EdgeTypePreference(mContext, attributeSet));
+        doReturn(mSubtitleView).when(mRootView).findViewById(R.id.preview);
+        doReturn(mSummaryView).when(mRootView).findViewById(R.id.summary);
+    }
+
+    @Test
+    public void shouldDisableDependents_edgeTypeNone_returnTrue() {
+        mEdgeTypePreference.setValue(CaptionStyle.EDGE_TYPE_NONE);
+        final boolean shouldDisableDependents =
+                mEdgeTypePreference.shouldDisableDependents();
+
+        assertThat(shouldDisableDependents).isTrue();
+    }
+
+    @Test
+    public void onBindListItem_initSubtitleView() {
+        final int testIndex = 0;
+        mEdgeTypePreference.onBindListItem(mRootView, testIndex);
+        final float density = mContext.getResources().getDisplayMetrics().density;
+        final int value = mEdgeTypePreference.getValueAt(testIndex);
+
+        verify(mSubtitleView).setForegroundColor(Color.WHITE);
+        verify(mSubtitleView).setBackgroundColor(Color.TRANSPARENT);
+        verify(mSubtitleView).setTextSize(32f * density);
+        verify(mSubtitleView).setEdgeType(value);
+        verify(mSubtitleView).setEdgeColor(Color.BLACK);
+    }
+
+    @Test
+    public void onBindListItem_setSummary() {
+        final int testIndex = 0;
+        mEdgeTypePreference.onBindListItem(mRootView, testIndex);
+        final CharSequence title = mEdgeTypePreference.getTitleAt(testIndex);
+
+        verify(mSummaryView).setText(title);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/HighTextContrastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/HighTextContrastPreferenceControllerTest.java
deleted file mode 100644
index 6eaf7a7..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/HighTextContrastPreferenceControllerTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.core.BasePreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class HighTextContrastPreferenceControllerTest {
-
-    private static final int ON = 1;
-    private static final int OFF = 0;
-    private static final int UNKNOWN = -1;
-
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private HighTextContrastPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new SwitchPreference(mContext);
-        mController = new HighTextContrastPreferenceController(mContext, "text_contrast");
-    }
-
-    @Test
-    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void isChecked_enabledTextContrast_shouldReturnTrue() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, ON);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void isChecked_disabledTextContrast_shouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, OFF);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setChecked_setTrue_shouldEnableTextContrast() {
-        mController.setChecked(true);
-
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, UNKNOWN)).isEqualTo(ON);
-
-    }
-
-    @Test
-    public void setChecked_setFalse_shouldDisableTextContrast() {
-        mController.setChecked(false);
-
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, UNKNOWN)).isEqualTo(OFF);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java
deleted file mode 100644
index 1f7f5ad..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static com.android.settings.accessibility.LargePointerIconPreferenceController.OFF;
-import static com.android.settings.accessibility.LargePointerIconPreferenceController.ON;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.core.BasePreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class LargePointerIconPreferenceControllerTest {
-
-    private static final int UNKNOWN = -1;
-
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private LargePointerIconPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new SwitchPreference(mContext);
-        mController = new LargePointerIconPreferenceController(mContext, "large_pointer");
-    }
-
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void isChecked_enabledLargePointer_shouldReturnTrue() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, ON);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void isChecked_disabledLargePointer_shouldReturnFalse() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, OFF);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setChecked_enabled_shouldEnableLargePointer() {
-        mController.setChecked(true);
-
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, UNKNOWN)).isEqualTo(ON);
-    }
-
-    @Test
-    public void setChecked_disabled_shouldDisableLargePointer() {
-        mController.setChecked(false);
-
-        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, UNKNOWN)).isEqualTo(OFF);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationCapabilitiesTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationCapabilitiesTest.java
new file mode 100644
index 0000000..ac7f073
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationCapabilitiesTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link MagnificationCapabilities} */
+@RunWith(RobolectricTestRunner.class)
+public final class MagnificationCapabilitiesTest {
+
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Test
+    public void getCapabilities_windowMode_expectedCapabilities() {
+        MagnificationCapabilities.setCapabilities(mContext,
+                MagnificationCapabilities.MagnificationMode.WINDOW);
+
+        final int windowCapabilities = MagnificationCapabilities.getCapabilities(mContext);
+        assertThat(windowCapabilities).isEqualTo(
+                MagnificationCapabilities.MagnificationMode.WINDOW);
+
+    }
+
+    @Test
+    public void getSummary_fullScreenMode_expectedSummary() {
+        final int fullScreenCapabilities = MagnificationCapabilities.MagnificationMode.FULLSCREEN;
+
+        final String actualString = MagnificationCapabilities.getSummary(mContext,
+                fullScreenCapabilities);
+
+        final String expectedString = mContext.getString(
+                R.string.accessibility_magnification_area_settings_full_screen_summary);
+        assertThat(actualString).isEqualTo(expectedString);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationEnablePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationEnablePreferenceControllerTest.java
deleted file mode 100644
index a34e04a..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/MagnificationEnablePreferenceControllerTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import androidx.preference.SwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class MagnificationEnablePreferenceControllerTest {
-    private static final String PREF_KEY = "screen_magnification_enable";
-    private static final String KEY_ENABLE = Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE;
-    private static final int UNKNOWN = -1;
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private MagnificationEnablePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new SwitchPreference(mContext);
-        mController = new MagnificationEnablePreferenceController(mContext, PREF_KEY);
-    }
-
-    @Test
-    public void isChecked_enabledFullscreenMagnificationMode_shouldReturnTrue() {
-        Settings.Secure.putIntForUser(mContext.getContentResolver(),
-                KEY_ENABLE, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN,
-                UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void isChecked_enabledWindowMagnificationMode_shouldReturnFalse() {
-        Settings.Secure.putIntForUser(mContext.getContentResolver(),
-                KEY_ENABLE, Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW,
-                UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-
-    @Test
-    public void setChecked_setTrue_shouldEnableFullscreenMagnificationMode() {
-        mController.setChecked(true);
-
-        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                KEY_ENABLE, UNKNOWN,
-                UserHandle.USER_CURRENT)).isEqualTo(
-                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_FULLSCREEN);
-    }
-
-    @Test
-    public void setChecked_setFalse_shouldEnableWindowMagnificationMode() {
-        mController.setChecked(false);
-
-        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                KEY_ENABLE, UNKNOWN,
-                UserHandle.USER_CURRENT)).isEqualTo(
-                Settings.Secure.ACCESSIBILITY_MAGNIFICATION_MODE_WINDOW);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java
index 5162bc2..7461235 100644
--- a/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/MagnificationModePreferenceControllerTest.java
@@ -32,8 +32,8 @@
 @RunWith(RobolectricTestRunner.class)
 public class MagnificationModePreferenceControllerTest {
     private static final String PREF_KEY = "screen_magnification_mode";
-    // TODO(b/146019459): Use magnification_capability.
-    private static final String KEY_CAPABILITY = Settings.System.MASTER_MONO;
+    private static final String KEY_CAPABILITY =
+            Settings.Secure.ACCESSIBILITY_MAGNIFICATION_CAPABILITY;
     private static final int WINDOW_SCREEN_VALUE = 2;
     private static final int ALL_VALUE = 3;
 
diff --git a/tests/robotests/src/com/android/settings/accessibility/MagnificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MagnificationPreferenceControllerTest.java
deleted file mode 100644
index d462c2a..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/MagnificationPreferenceControllerTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.core.BasePreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class MagnificationPreferenceControllerTest {
-
-    private Context mContext;
-    private MagnificationPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new MagnificationPreferenceController(mContext, "magnification");
-    }
-
-    @Test
-    public void getAvailabilityStatus_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java
deleted file mode 100644
index ee54b88..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/MasterMonoPreferenceControllerTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.core.BasePreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class MasterMonoPreferenceControllerTest {
-
-    private static final int ON = 1;
-    private static final int OFF = 0;
-    private static final int UNKNOWN = -1;
-
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private MasterMonoPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new SwitchPreference(mContext);
-        mController = new MasterMonoPreferenceController(mContext, "master_mono");
-    }
-
-    @Test
-    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void isChecked_enabledMonoAudio_shouldReturnTrue() {
-        Settings.System.putIntForUser(mContext.getContentResolver(),
-                Settings.System.MASTER_MONO, ON, UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void isChecked_disabledMonoAudio_shouldReturnFalse() {
-        Settings.System.putIntForUser(mContext.getContentResolver(),
-                Settings.System.MASTER_MONO, OFF, UserHandle.USER_CURRENT);
-
-        mController.updateState(mPreference);
-
-        assertThat(mController.isChecked()).isFalse();
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setChecked_setTrue_shouldEnableMonoAudio() {
-        mController.setChecked(true);
-
-        assertThat(Settings.System.getIntForUser(mContext.getContentResolver(),
-                Settings.System.MASTER_MONO, UNKNOWN, UserHandle.USER_CURRENT)).isEqualTo(ON);
-    }
-
-    @Test
-    public void setChecked_setFalse_shouldDisableMonoAudio() {
-        mController.setChecked(false);
-
-        assertThat(Settings.System.getIntForUser(mContext.getContentResolver(),
-                Settings.System.MASTER_MONO, UNKNOWN, UserHandle.USER_CURRENT)).isEqualTo(OFF);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java b/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java
new file mode 100644
index 0000000..759b180
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/PaletteListPreferenceTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.preference.PreferenceViewHolder;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link PaletteListPreference}. */
+@RunWith(RobolectricTestRunner.class)
+public final class PaletteListPreferenceTest {
+
+    private PaletteListPreference mPaletteListPreference;
+    private PreferenceViewHolder mPreferenceViewHolder;
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Before
+    public void initObjects() {
+        mPaletteListPreference = new PaletteListPreference(mContext, null);
+
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        final View view =
+                inflater.inflate(R.layout.daltonizer_preview, null);
+        mPreferenceViewHolder = PreferenceViewHolder.createInstanceForTests(view);
+    }
+
+    @Test
+    public void initPaletteView_success() {
+        mPaletteListPreference.onBindViewHolder(mPreferenceViewHolder);
+
+        final ViewGroup viewGroup =
+                mPreferenceViewHolder.itemView.findViewById(R.id.palette_view);
+        final int expectedCount =
+                mContext.getResources().getStringArray(R.array.setting_palette_data).length;
+        assertEquals(expectedCount, viewGroup.getChildCount());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/PaletteListViewTest.java b/tests/robotests/src/com/android/settings/accessibility/PaletteListViewTest.java
deleted file mode 100644
index 13e76d7..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/PaletteListViewTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import androidx.test.core.app.ApplicationProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-/** Tests for {@link PaletteListView} */
-@RunWith(RobolectricTestRunner.class)
-public class PaletteListViewTest {
-
-    private final Context mContext = ApplicationProvider.getApplicationContext();
-    private PaletteListView mPaletteListView;
-
-    @Before
-    public void setUp() {
-        mPaletteListView = new PaletteListView(mContext);
-    }
-
-    @Test
-    public void setColors_applySameLengthArray_configureSuccessful() {
-        final String[] colorName = {"White", "Black", "Yellow"};
-        final String[] colorCode = {"#ffffff", "#000000", "#f9ab00"};
-
-        assertThat(mPaletteListView.setPaletteListColors(colorName, colorCode)).isTrue();
-    }
-
-    @Test
-    public void setColors_applyDifferentLengthArray_configureSuccessful() {
-        final String[] colorName = {"White", "Black", "Yellow", "Orange", "Red"};
-        final String[] colorCode = {"#ffffff", "#000000", "#f9ab00"};
-
-        assertThat(mPaletteListView.setPaletteListColors(colorName, colorCode)).isTrue();
-    }
-
-    @Test
-    public void setColors_configureFailed() {
-        final String[] colorName = null;
-        final String[] colorCode = null;
-
-        assertThat(mPaletteListView.setPaletteListColors(colorName, colorCode)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/RTTSettingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/RTTSettingPreferenceControllerTest.java
index 6f3f77d..5a90098 100644
--- a/tests/robotests/src/com/android/settings/accessibility/RTTSettingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/RTTSettingPreferenceControllerTest.java
@@ -25,67 +25,104 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
+import android.os.PersistableBundle;
+import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.testutils.ResolveInfoBuilder;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowPackageManager;
 
+/** Tests for {@link RTTSettingPreferenceController}. */
 @RunWith(RobolectricTestRunner.class)
 public class RTTSettingPreferenceControllerTest {
 
-    private Context mContext;
     private ShadowPackageManager mShadowPackageManager;
     private RTTSettingPreferenceController mController;
+    private TelephonyManager mTelephonyManagerFromSubId;
+
+    @Mock
+    private PersistableBundle mPersistableBundle;
 
     @Before
     public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mShadowPackageManager = shadowOf(mContext.getPackageManager());
-        mController = spy(new RTTSettingPreferenceController(mContext, "rtt_setting"));
+        MockitoAnnotations.initMocks(this);
+
+        final Context context = spy(ApplicationProvider.getApplicationContext());
+        final int subId = SubscriptionManager.getDefaultVoiceSubscriptionId();
+        final String rttSettingsPackageName =
+                context.getString(R.string.config_rtt_setting_package_name);
+        final CarrierConfigManager configManager = spy(new CarrierConfigManager(context));
+        final TelephonyManager telephonyManager = spy(new TelephonyManager(context));
+        final TelecomManager telecomManager = spy(new TelecomManager(context));
+        mTelephonyManagerFromSubId = spy(new TelephonyManager(context, subId));
+        doReturn(telephonyManager).when(context).getSystemService(TelephonyManager.class);
+        doReturn(mTelephonyManagerFromSubId).when(telephonyManager).createForSubscriptionId(subId);
+        doReturn(telecomManager).when(context).getSystemService(TelecomManager.class);
+        doReturn(configManager).when(context).getSystemService(CarrierConfigManager.class);
+        doReturn(mPersistableBundle).when(configManager).getConfigForSubId(subId);
+        doReturn(rttSettingsPackageName).when(telecomManager).getDefaultDialerPackage();
+
+        mShadowPackageManager = shadowOf(context.getPackageManager());
+        mController = spy(new RTTSettingPreferenceController(context, "rtt_setting"));
         mController.mRTTIntent = new Intent("com.android.test.action.example");
     }
 
     @Test
-    public void getAvailabilityStatus_defaultDialerIsExpected_intentCanBeHandled_returnAVAILABLE() {
-        // Default dialer is expected.
-        doReturn(true).when(mController).isDialerSupportRTTSetting();
-        // Intent can be handled.
-        final ResolveInfo info = new ResolveInfoBuilder("pkg")
-                .setActivity("pkg", "class").build();
-        final Intent intent = new Intent("com.android.test.action.example");
-        mShadowPackageManager.addResolveInfoForIntent(intent, info);
+    public void getStatus_carrierAndRttSupported_settingsIntent_available() {
+        doReturn(true).when(mTelephonyManagerFromSubId).isRttSupported();
+        doReturn(true).when(mPersistableBundle).getBoolean(
+                CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL);
+        setupTestIntent();
 
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(BasePreferenceController.AVAILABLE);
     }
 
     @Test
-    public void getAvailabilityStatus_intentCanNotBeHandled_shouldReturnUNSUPPORTED_ON_DEVICE() {
-        // Default dialer is expected.
-        doReturn(true).when(mController).isDialerSupportRTTSetting();
-        // Intent can not be handled.
+    public void getStatus_rttSupported_settingsIntent_unsupported() {
+        doReturn(true).when(mTelephonyManagerFromSubId).isRttSupported();
+        doReturn(false).when(mPersistableBundle).getBoolean(
+                CarrierConfigManager.KEY_IGNORE_RTT_MODE_SETTING_BOOL);
+        setupTestIntent();
 
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
-    public void getAvailabilityStatus_defaultDialerIsNotExpected_returnUNSUPPORTED_ON_DEVICE() {
-        // Default dialer is not expected.
-        doReturn(false).when(mController).isDialerSupportRTTSetting();
-        // Intent can be handled.
+    public void getStatus_settingsIntent_unsupported() {
+        doReturn(false).when(mTelephonyManagerFromSubId).isRttSupported();
+        setupTestIntent();
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getStatus_unsupported() {
+        doReturn(false).when(mTelephonyManagerFromSubId).isRttSupported();
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    private void setupTestIntent() {
         final ResolveInfo info = new ResolveInfoBuilder("pkg")
                 .setActivity("pkg", "class").build();
         final Intent intent = new Intent("com.android.test.action.example");
         mShadowPackageManager.addResolveInfoForIntent(intent, info);
-
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java
new file mode 100644
index 0000000..39a663e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ReduceBrightColorsPreferenceControllerTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.R;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ReduceBrightColorsPreferenceControllerTest {
+    private static final String PREF_KEY = "rbc_preference";
+    private static final String RBC_ACTIVATED =
+            Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED;
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+    private final ReduceBrightColorsPreferenceController mController =
+            new ReduceBrightColorsPreferenceController(mContext, PREF_KEY);
+
+    @Test
+    public void getSummary_enabledRbc_shouldReturnOnSummary() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                RBC_ACTIVATED, ON);
+
+        assertThat(mController.getSummary().toString().contains(
+                mContext.getText(R.string.accessibility_feature_state_on))).isTrue();
+    }
+    @Test
+    public void getSummary_disabledRbc_shouldReturnOffSummary() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                RBC_ACTIVATED, OFF);
+
+        assertThat(mController.getSummary().toString().contains(
+                mContext.getText(R.string.accessibility_feature_state_off))).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java
new file mode 100644
index 0000000..0eaf008
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/RingVibrationIntensityPreferenceControllerTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.os.Vibrator;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link RingVibrationIntensityPreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+public class RingVibrationIntensityPreferenceControllerTest {
+    @Mock
+    private Vibrator mVibrator;
+
+    private RingVibrationIntensityPreferenceController mController;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        final Context mContext = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mVibrator).when(mContext).getSystemService(Vibrator.class);
+        mController = new RingVibrationIntensityPreferenceController(mContext);
+    }
+
+    @Test
+    public void getAvailabilityStatus_available() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getDefaultIntensity_success() {
+        doReturn(/* toBeReturned= */ 5).when(mVibrator).getDefaultRingVibrationIntensity();
+
+        assertThat(mController.getDefaultIntensity()).isEqualTo(/* expected= */ 5);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java
deleted file mode 100644
index 1bdfb41..0000000
--- a/tests/robotests/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accessibility;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import com.android.settings.core.BasePreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class SelectLongPressTimeoutPreferenceControllerTest {
-    private static final int VALID_VALUE = 1500;
-    private static final int INVALID_VALUE = 0;
-    private static final int DEFAULT_VALUE = 400;
-
-    private Context mContext;
-    private SelectLongPressTimeoutPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new SelectLongPressTimeoutPreferenceController(mContext, "press_timeout");
-    }
-
-    @Test
-    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void getSummary_byDefault_shouldReturnShort() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.LONG_PRESS_TIMEOUT, DEFAULT_VALUE);
-        final String expected = "Short";
-
-        assertThat(mController.getSummary()).isEqualTo(expected);
-    }
-
-    @Test
-    public void getSummary_validValue_shouldReturnLong() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.LONG_PRESS_TIMEOUT, VALID_VALUE);
-        final String expected = "Long";
-
-        assertThat(mController.getSummary()).isEqualTo(expected);
-    }
-
-    @Test
-    public void getSummary_invalidValue_shouldReturnNull() {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.LONG_PRESS_TIMEOUT, INVALID_VALUE);
-
-        assertThat(mController.getSummary()).isNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accessibility/TextAndDisplayFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/TextAndDisplayFragmentTest.java
new file mode 100644
index 0000000..96756ecd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/TextAndDisplayFragmentTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.XmlTestUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class TextAndDisplayFragmentTest {
+
+    private Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Test
+    public void getNonIndexableKeys_existInXmlLayout() {
+        final List<String> niks = TextAndDisplayFragment.SEARCH_INDEX_DATA_PROVIDER
+                .getNonIndexableKeys(mContext);
+        final List<String> keys =
+                XmlTestUtils.getKeysFromPreferenceXml(mContext,
+                        R.xml.accessibility_text_and_display);
+
+        assertThat(keys).containsAtLeastElementsIn(niks);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceControllerTest.java
new file mode 100644
index 0000000..edc2992
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleAutoclickPreferenceControllerTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static android.content.Context.MODE_PRIVATE;
+
+import static com.android.settings.accessibility.ToggleAutoclickPreferenceController.AUTOCLICK_CUSTOM_MODE;
+import static com.android.settings.accessibility.ToggleAutoclickPreferenceController.AUTOCLICK_OFF_MODE;
+import static com.android.settings.accessibility.ToggleAutoclickPreferenceController.KEY_AUTOCLICK_CUSTOM_SEEKBAR;
+import static com.android.settings.accessibility.ToggleAutoclickPreferenceController.KEY_DELAY_MODE;
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.provider.Settings.Secure;
+
+import androidx.lifecycle.LifecycleObserver;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.accessibility.ToggleAutoclickPreferenceController.OnChangeListener;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.RadioButtonPreference;
+import com.android.settingslib.widget.RadioButtonPreference.OnClickListener;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.Map;
+
+/** Tests for {@link ToggleAutoclickPreferenceController}. */
+@RunWith(RobolectricTestRunner.class)
+public class ToggleAutoclickPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+
+    @Mock
+    private RadioButtonPreference mDelayModePref;
+
+    @Mock
+    private OnChangeListener mOnChangeListener;
+
+    @Mock
+    private LayoutPreference mSeekBarPref;
+
+    @Mock
+    private Map<String, Integer> mAccessibilityAutoclickKeyToValueMap;
+
+    private ToggleAutoclickPreferenceController mController;
+    private SharedPreferences mSharedPreferences;
+    private final String mPrefKey = "prefKey";
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mController = new ToggleAutoclickPreferenceController(mContext, mPrefKey);
+        mController.mAccessibilityAutoclickKeyToValueMap = mAccessibilityAutoclickKeyToValueMap;
+        mSharedPreferences =
+                mContext.getSharedPreferences(mContext.getPackageName(), MODE_PRIVATE);
+
+        when(mScreen.findPreference(mPrefKey)).thenReturn(mDelayModePref);
+        when(mScreen.findPreference(KEY_AUTOCLICK_CUSTOM_SEEKBAR)).thenReturn(mSeekBarPref);
+        when(mAccessibilityAutoclickKeyToValueMap.get(mDelayModePref.getKey())).thenReturn(
+                AUTOCLICK_OFF_MODE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_available() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void setClickListenerOnDelayModePref_whenDisplay_success() {
+        mController.displayPreference(mScreen);
+
+        verify(mDelayModePref).setOnClickListener(any(OnClickListener.class));
+    }
+
+    @Test
+    public void constructor_hasLifecycle_addObserver() {
+        final Lifecycle lifecycle = mock(Lifecycle.class);
+        mController = new ToggleAutoclickPreferenceController(mContext, lifecycle, mPrefKey);
+
+        verify(lifecycle).addObserver(any(LifecycleObserver.class));
+    }
+
+    @Test
+    public void onRadioButtonClicked_offMode_disableAutoClick() {
+        when(mAccessibilityAutoclickKeyToValueMap.get(mPrefKey)).thenReturn(AUTOCLICK_OFF_MODE);
+
+        mController.displayPreference(mScreen);
+        mController.onRadioButtonClicked(any(RadioButtonPreference.class));
+        final boolean isEnabled = Secure.getInt(mContext.getContentResolver(),
+                Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, /* def= */ 0) == 1;
+        final int delayMs = Secure.getInt(mContext.getContentResolver(),
+                Secure.ACCESSIBILITY_AUTOCLICK_DELAY, /* def= */ 0);
+        final int keyDelayMode = mSharedPreferences.getInt(KEY_DELAY_MODE, AUTOCLICK_CUSTOM_MODE);
+
+        assertThat(keyDelayMode).isEqualTo(AUTOCLICK_OFF_MODE);
+        assertThat(delayMs).isEqualTo(/* expected= */ 0);
+        assertThat(isEnabled).isFalse();
+    }
+
+    @Test
+    public void onRadioButtonClicked_customMode_enableAutoClick() {
+        when(mAccessibilityAutoclickKeyToValueMap.get(mDelayModePref.getKey())).thenReturn(
+                AUTOCLICK_CUSTOM_MODE);
+        when(mAccessibilityAutoclickKeyToValueMap.get(mPrefKey)).thenReturn(AUTOCLICK_CUSTOM_MODE);
+
+        mController.displayPreference(mScreen);
+        mController.onRadioButtonClicked(any(RadioButtonPreference.class));
+        final boolean isEnabled = Secure.getInt(mContext.getContentResolver(),
+                Secure.ACCESSIBILITY_AUTOCLICK_ENABLED, /* def= */ 0) == 1;
+        final int keyDelayMode = mSharedPreferences.getInt(KEY_DELAY_MODE, AUTOCLICK_CUSTOM_MODE);
+
+        assertThat(keyDelayMode).isEqualTo(AUTOCLICK_CUSTOM_MODE);
+        assertThat(isEnabled).isTrue();
+    }
+
+    @Test
+    public void onRadioButtonClicked_hasListener_runOnCheckedChanged() {
+        when(mAccessibilityAutoclickKeyToValueMap.get(mDelayModePref.getKey())).thenReturn(
+                AUTOCLICK_CUSTOM_MODE);
+        when(mAccessibilityAutoclickKeyToValueMap.get(mPrefKey)).thenReturn(AUTOCLICK_CUSTOM_MODE);
+
+        mController.setOnChangeListener(mOnChangeListener);
+        mController.displayPreference(mScreen);
+        mController.onRadioButtonClicked(any(RadioButtonPreference.class));
+
+        verify(mOnChangeListener).onCheckedChanged(mDelayModePref);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index 3df9c04..6c62f19 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -16,108 +16,197 @@
 
 package com.android.settings.accessibility;
 
+import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_USER_SHORTCUT_TYPE;
+
 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 static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.XmlRes;
+import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceManager;
+import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
-import com.android.settings.accessibility.ToggleFeaturePreferenceFragment.AccessibilityUserShortcutType;
+import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+import com.android.settings.testutils.shadow.ShadowFragment;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 import org.robolectric.shadows.androidx.fragment.FragmentController;
 
-import java.util.HashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
+/** Tests for {@link ToggleFeaturePreferenceFragment} */
 @RunWith(RobolectricTestRunner.class)
 public class ToggleFeaturePreferenceFragmentTest {
 
-    private ToggleFeaturePreferenceFragmentTestable mFragment;
+    private static final String PLACEHOLDER_PACKAGE_NAME = "com.placeholder.example";
+    private static final String PLACEHOLDER_CLASS_NAME = PLACEHOLDER_PACKAGE_NAME + ".placeholder";
+    private static final ComponentName PLACEHOLDER_COMPONENT_NAME = new ComponentName(
+            PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_CLASS_NAME);
+    private static final String PLACEHOLDER_DIALOG_TITLE = "title";
 
-    private static final String TEST_SERVICE_KEY_1 = "abc:111";
-    private static final String TEST_SERVICE_KEY_2 = "mno:222";
-    private static final String TEST_SERVICE_KEY_3 = "xyz:333";
+    private static final String SOFTWARE_SHORTCUT_KEY =
+            Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
+    private static final String HARDWARE_SHORTCUT_KEY =
+            Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
 
-    private static final String TEST_SERVICE_NAME_1 = "abc";
-    private static final int TEST_SERVICE_VALUE_1 = 111;
+    private TestToggleFeaturePreferenceFragment mFragment;
+    private Context mContext = ApplicationProvider.getApplicationContext();
 
-    @Test
-    public void a11yUserShortcutType_setConcatString_shouldReturnTargetValue() {
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
-                TEST_SERVICE_KEY_1);
+    @Mock
+    private PreferenceManager mPreferenceManager;
 
-        assertThat(shortcut.getComponentName()).isEqualTo(TEST_SERVICE_NAME_1);
-        assertThat(shortcut.getType()).isEqualTo(TEST_SERVICE_VALUE_1);
-    }
+    @Before
+    public void setUpTestFragment() {
+        MockitoAnnotations.initMocks(this);
 
-    @Test
-    public void a11yUserShortcutType_shouldUpdateConcatString() {
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(
-                TEST_SERVICE_KEY_2);
-
-        shortcut.setComponentName(TEST_SERVICE_NAME_1);
-        shortcut.setType(TEST_SERVICE_VALUE_1);
-
-        assertThat(shortcut.flattenToString()).isEqualTo(TEST_SERVICE_KEY_1);
-    }
-
-    @Test
-    public void stringSet_convertA11yPreferredShortcut_shouldRemoveTarget() {
-        Set<String> mySet = new HashSet<>();
-        mySet.add(TEST_SERVICE_KEY_1);
-        mySet.add(TEST_SERVICE_KEY_2);
-        mySet.add(TEST_SERVICE_KEY_3);
-
-        final Set<String> filtered = mySet.stream()
-                .filter(str -> str.contains(TEST_SERVICE_NAME_1))
-                .collect(Collectors.toSet());
-        mySet.removeAll(filtered);
-
-        assertThat(mySet).doesNotContain(TEST_SERVICE_KEY_1);
-        assertThat(mySet).hasSize(/* expectedSize= */2);
-    }
-
-    @Test
-    public void stringSet_convertA11yUserShortcutType_shouldReturnPreferredShortcut() {
-        Set<String> mySet = new HashSet<>();
-        mySet.add(TEST_SERVICE_KEY_1);
-        mySet.add(TEST_SERVICE_KEY_2);
-        mySet.add(TEST_SERVICE_KEY_3);
-
-        final Set<String> filtered = mySet.stream()
-                .filter(str -> str.contains(TEST_SERVICE_NAME_1))
-                .collect(Collectors.toSet());
-
-        final String str = (String) filtered.toArray()[0];
-        final AccessibilityUserShortcutType shortcut = new AccessibilityUserShortcutType(str);
-        final int type = shortcut.getType();
-        assertThat(type).isEqualTo(TEST_SERVICE_VALUE_1);
+        mFragment = spy(new TestToggleFeaturePreferenceFragment());
+        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
+        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
+        when(mFragment.getContext()).thenReturn(mContext);
+        doReturn(null).when(mFragment).getPreferenceScreen();
     }
 
     @Test
     public void createFragment_shouldOnlyAddPreferencesOnce() {
-        mFragment = spy(new ToggleFeaturePreferenceFragmentTestable());
         FragmentController.setupFragment(mFragment, FragmentActivity.class,
-                /* containerViewId= */ 0, /* bundle= */null);
+                /* containerViewId= */ 0, /* bundle= */ null);
 
         // execute exactly once
         verify(mFragment).addPreferencesFromResource(R.xml.placeholder_prefs);
     }
 
-    public static class ToggleFeaturePreferenceFragmentTestable
+    @Test
+    public void updateShortcutPreferenceData_assignDefaultValueToVariable() {
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+
+        mFragment.updateShortcutPreferenceData();
+
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+        // Compare to default UserShortcutType
+        assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE);
+    }
+
+    @Test
+    public void updateShortcutPreferenceData_hasValueInSettings_assignToVariable() {
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, PLACEHOLDER_COMPONENT_NAME.flattenToString());
+        putStringIntoSettings(HARDWARE_SHORTCUT_KEY, PLACEHOLDER_COMPONENT_NAME.flattenToString());
+        mFragment.updateShortcutPreferenceData();
+
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+    }
+
+    @Test
+    public void updateShortcutPreferenceData_hasValueInSharedPreference_assignToVariable() {
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+        final PreferredShortcut hardwareShortcut = new PreferredShortcut(
+                PLACEHOLDER_COMPONENT_NAME.flattenToString(), UserShortcutType.HARDWARE);
+
+        putUserShortcutTypeIntoSharedPreference(mContext, hardwareShortcut);
+        mFragment.updateShortcutPreferenceData();
+
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.HARDWARE);
+    }
+
+    @Test
+    public void setupEditShortcutDialog_shortcutPreferenceOff_checkboxIsEmptyValue() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+        final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+                null);
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+        mFragment.mShortcutPreference = shortcutPreference;
+
+        mFragment.mShortcutPreference.setChecked(false);
+        mFragment.setupEditShortcutDialog(dialog);
+
+        final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+        assertThat(checkboxValue).isEqualTo(UserShortcutType.EMPTY);
+    }
+
+    @Test
+    public void setupEditShortcutDialog_shortcutPreferenceOn_checkboxIsSavedValue() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+        final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+                null);
+        final PreferredShortcut hardwareShortcut = new PreferredShortcut(
+                PLACEHOLDER_COMPONENT_NAME.flattenToString(), UserShortcutType.HARDWARE);
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+        mFragment.mShortcutPreference = shortcutPreference;
+
+        PreferredShortcuts.saveUserShortcutType(mContext, hardwareShortcut);
+        mFragment.mShortcutPreference.setChecked(true);
+        mFragment.setupEditShortcutDialog(dialog);
+
+        final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+        assertThat(checkboxValue).isEqualTo(UserShortcutType.HARDWARE);
+    }
+
+    @Test
+    @Config(shadows = ShadowFragment.class)
+    public void restoreValueFromSavedInstanceState_assignToVariable() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showEditShortcutDialog(
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+        final Bundle savedInstanceState = new Bundle();
+        final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+                null);
+        mFragment.mComponentName = PLACEHOLDER_COMPONENT_NAME;
+        mFragment.mShortcutPreference = shortcutPreference;
+
+        savedInstanceState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE,
+                UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+        mFragment.onCreate(savedInstanceState);
+        mFragment.setupEditShortcutDialog(dialog);
+        final int value = mFragment.getShortcutTypeCheckBoxValue();
+        mFragment.saveNonEmptyUserShortcutType(value);
+
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                mFragment.mComponentName.flattenToString(), UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE);
+    }
+
+    private void putStringIntoSettings(String key, String componentName) {
+        Settings.Secure.putString(mContext.getContentResolver(), key, componentName);
+    }
+
+    private void putUserShortcutTypeIntoSharedPreference(Context context,
+            PreferredShortcut shortcut) {
+        PreferredShortcuts.saveUserShortcutType(context, shortcut);
+    }
+
+    private void callEmptyOnClicked(DialogInterface dialog, int which) {}
+
+    public static class TestToggleFeaturePreferenceFragment
             extends ToggleFeaturePreferenceFragment {
 
         @Override
@@ -146,13 +235,24 @@
         }
 
         @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            // do nothing
+        }
+
+        @Override
+        public void onDestroyView() {
+            // do nothing
+        }
+
+        @Override
         public void addPreferencesFromResource(@XmlRes int preferencesResId) {
             // do nothing
         }
 
         @Override
-        public void onViewCreated(View view, Bundle savedInstanceState) {
-            // do nothing
+        protected void updateShortcutPreference() {
+            // UI related function, do nothing in tests
         }
+
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
index 10d8af7..3df6221 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragmentTest.java
@@ -19,40 +19,79 @@
 import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
 import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
 import static com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
+import static com.android.settings.accessibility.ToggleFeaturePreferenceFragment.KEY_SAVED_USER_SHORTCUT_TYPE;
 
 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 static org.mockito.Mockito.when;
+
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
 import android.provider.Settings;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.XmlRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.PreferenceManager;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.ShadowFragment;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
 public class ToggleScreenMagnificationPreferenceFragmentTest {
 
-    private static final String DUMMY_PACKAGE_NAME = "com.dummy.example";
-    private static final String DUMMY_CLASS_NAME = DUMMY_PACKAGE_NAME + ".dummy_a11y_service";
-    private static final ComponentName DUMMY_COMPONENT_NAME = new ComponentName(DUMMY_PACKAGE_NAME,
-            DUMMY_CLASS_NAME);
+    private static final String PLACEHOLDER_PACKAGE_NAME = "com.mock.example";
+    private static final String PLACEHOLDER_CLASS_NAME =
+            PLACEHOLDER_PACKAGE_NAME + ".mock_a11y_service";
+    private static final ComponentName PLACEHOLDER_COMPONENT_NAME = new ComponentName(
+            PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_CLASS_NAME);
+    private static final String PLACEHOLDER_DIALOG_TITLE = "title";
+
     private static final String SOFTWARE_SHORTCUT_KEY =
             Settings.Secure.ACCESSIBILITY_BUTTON_TARGETS;
     private static final String HARDWARE_SHORTCUT_KEY =
             Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE;
     private static final String TRIPLETAP_SHORTCUT_KEY =
             Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED;
+
     private static final String MAGNIFICATION_CONTROLLER_NAME =
             "com.android.server.accessibility.MagnificationController";
 
-    private Context mContext;
+    private TestToggleScreenMagnificationPreferenceFragment mFragment;
+    private Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
+    private FragmentActivity mActivity;
 
     @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
+    public void setUpTestFragment() {
+        MockitoAnnotations.initMocks(this);
+
+        mFragment = spy(new TestToggleScreenMagnificationPreferenceFragment());
+        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);
+        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
+        when(mFragment.getContext()).thenReturn(mContext);
+        doReturn(null).when(mFragment).getPreferenceScreen();
+        doReturn(mActivity).when(mFragment).getActivity();
     }
 
     @Test
@@ -78,14 +117,13 @@
 
     @Test
     public void optInAllValuesToSettings_existOtherValue_optInValue_haveMatchString() {
-        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, DUMMY_COMPONENT_NAME.flattenToString());
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, PLACEHOLDER_COMPONENT_NAME.flattenToString());
 
         ToggleScreenMagnificationPreferenceFragment.optInAllMagnificationValuesToSettings(mContext,
                 UserShortcutType.SOFTWARE);
 
         assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
-                DUMMY_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
-
+                PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
     }
 
     @Test
@@ -107,27 +145,123 @@
     @Test
     public void optOutValueFromSettings_existOtherValue_optOutValue_haveMatchString() {
         putStringIntoSettings(SOFTWARE_SHORTCUT_KEY,
-                DUMMY_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
+                PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
         putStringIntoSettings(HARDWARE_SHORTCUT_KEY,
-                DUMMY_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
+                PLACEHOLDER_COMPONENT_NAME.flattenToString() + ":" + MAGNIFICATION_CONTROLLER_NAME);
         int shortcutTypes = UserShortcutType.SOFTWARE | UserShortcutType.HARDWARE;
 
         ToggleScreenMagnificationPreferenceFragment.optOutAllMagnificationValuesFromSettings(
                 mContext, shortcutTypes);
 
         assertThat(getStringFromSettings(SOFTWARE_SHORTCUT_KEY)).isEqualTo(
-                DUMMY_COMPONENT_NAME.flattenToString());
+                PLACEHOLDER_COMPONENT_NAME.flattenToString());
         assertThat(getStringFromSettings(HARDWARE_SHORTCUT_KEY)).isEqualTo(
-                DUMMY_COMPONENT_NAME.flattenToString());
+                PLACEHOLDER_COMPONENT_NAME.flattenToString());
+    }
+
+    @Test
+    public void updateShortcutPreferenceData_assignDefaultValueToVariable() {
+        mFragment.updateShortcutPreferenceData();
+
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+        // Compare to default UserShortcutType
+        assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE);
+    }
+
+    @Test
+    public void updateShortcutPreferenceData_hasValueInSettings_assignToVariable() {
+        putStringIntoSettings(SOFTWARE_SHORTCUT_KEY, MAGNIFICATION_CONTROLLER_NAME);
+        setMagnificationTripleTapEnabled(/* enabled= */ true);
+        mFragment.updateShortcutPreferenceData();
+
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.SOFTWARE | UserShortcutType.TRIPLETAP);
+    }
+
+    @Test
+    public void updateShortcutPreferenceData_hasValueInSharedPreference_assignToVariable() {
+        final PreferredShortcut tripleTapShortcut = new PreferredShortcut(
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TRIPLETAP);
+
+        putUserShortcutTypeIntoSharedPreference(mContext, tripleTapShortcut);
+        mFragment.updateShortcutPreferenceData();
+
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+        assertThat(expectedType).isEqualTo(UserShortcutType.TRIPLETAP);
+    }
+
+    @Test
+    public void setupMagnificationEditShortcutDialog_shortcutPreferenceOff_checkboxIsEmptyValue() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+        final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+                null);
+        mFragment.mShortcutPreference = shortcutPreference;
+
+        mFragment.mShortcutPreference.setChecked(false);
+        mFragment.setupMagnificationEditShortcutDialog(dialog);
+
+        final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+        assertThat(checkboxValue).isEqualTo(UserShortcutType.EMPTY);
+    }
+
+    @Test
+    public void setupMagnificationEditShortcutDialog_shortcutPreferenceOn_checkboxIsSavedValue() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+        final ShortcutPreference shortcutPreference = new ShortcutPreference(mContext, /* attrs= */
+                null);
+        final PreferredShortcut tripletapShortcut = new PreferredShortcut(
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.TRIPLETAP);
+        mFragment.mShortcutPreference = shortcutPreference;
+
+        PreferredShortcuts.saveUserShortcutType(mContext, tripletapShortcut);
+        mFragment.mShortcutPreference.setChecked(true);
+        mFragment.setupMagnificationEditShortcutDialog(dialog);
+
+        final int checkboxValue = mFragment.getShortcutTypeCheckBoxValue();
+        assertThat(checkboxValue).isEqualTo(UserShortcutType.TRIPLETAP);
+    }
+
+    @Test
+    @Config(shadows = ShadowFragment.class)
+    public void restoreValueFromSavedInstanceState_assignToVariable() {
+        mContext.setTheme(R.style.Theme_AppCompat);
+        final AlertDialog dialog = AccessibilityEditDialogUtils.showMagnificationEditShortcutDialog(
+                mContext, PLACEHOLDER_DIALOG_TITLE, this::callEmptyOnClicked);
+        final Bundle savedInstanceState = new Bundle();
+        mFragment.mShortcutPreference = new ShortcutPreference(mContext, /* attrs= */ null);
+
+        savedInstanceState.putInt(KEY_SAVED_USER_SHORTCUT_TYPE,
+                UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP);
+        mFragment.onCreate(savedInstanceState);
+        mFragment.setupMagnificationEditShortcutDialog(dialog);
+        final int value = mFragment.getShortcutTypeCheckBoxValue();
+        mFragment.saveNonEmptyUserShortcutType(value);
+
+        final int expectedType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                MAGNIFICATION_CONTROLLER_NAME, UserShortcutType.SOFTWARE);
+        assertThat(value).isEqualTo(6);
+        assertThat(expectedType).isEqualTo(UserShortcutType.HARDWARE | UserShortcutType.TRIPLETAP);
     }
 
     private void putStringIntoSettings(String key, String componentName) {
         Settings.Secure.putString(mContext.getContentResolver(), key, componentName);
     }
 
+    private void putUserShortcutTypeIntoSharedPreference(Context context,
+            PreferredShortcut shortcut) {
+        PreferredShortcuts.saveUserShortcutType(context, shortcut);
+    }
+
     private void setMagnificationTripleTapEnabled(boolean enabled) {
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, enabled ? ON : OFF);
+        Settings.Secure.putInt(mContext.getContentResolver(), TRIPLETAP_SHORTCUT_KEY,
+                enabled ? ON : OFF);
     }
 
     private String getStringFromSettings(String key) {
@@ -135,7 +269,57 @@
     }
 
     private boolean getMagnificationTripleTapStatus() {
-        return Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, OFF) == ON;
+        return Settings.Secure.getInt(mContext.getContentResolver(), TRIPLETAP_SHORTCUT_KEY, OFF)
+                == ON;
+    }
+
+    private void callEmptyOnClicked(DialogInterface dialog, int which) {}
+
+    public static class TestToggleScreenMagnificationPreferenceFragment
+            extends ToggleScreenMagnificationPreferenceFragment {
+        @Override
+        protected void onPreferenceToggled(String preferenceKey, boolean enabled) {
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return 0;
+        }
+
+        @Override
+        int getUserShortcutTypes() {
+            return 0;
+        }
+
+        @Override
+        public int getPreferenceScreenResId() {
+            return R.xml.placeholder_prefs;
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            return mock(View.class);
+        }
+
+        @Override
+        public void onViewCreated(View view, Bundle savedInstanceState) {
+            // do nothing
+        }
+
+        @Override
+        public void onDestroyView() {
+            // do nothing
+        }
+
+        @Override
+        public void addPreferencesFromResource(@XmlRes int preferencesResId) {
+            // do nothing
+        }
+
+        @Override
+        protected void updateShortcutPreference() {
+            // UI related function, do nothing in tests
+        }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accessibility/VideoPlayerTest.java b/tests/robotests/src/com/android/settings/accessibility/VideoPlayerTest.java
new file mode 100644
index 0000000..57df456
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/accessibility/VideoPlayerTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.media.MediaPlayer;
+import android.view.Surface;
+import android.view.TextureView;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.accessibility.VideoPlayer.State;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+/** Tests for {@link VideoPlayer}. */
+@RunWith(RobolectricTestRunner.class)
+public class VideoPlayerTest {
+
+    @Mock
+    private MediaPlayer mMediaPlayer;
+
+    @Mock
+    private TextureView mTextureView;
+
+    @Mock
+    private Surface mSurface;
+
+    private VideoPlayer mVideoPlayer;
+
+    @Before
+    public void initVideoPlayer() {
+        MockitoAnnotations.initMocks(this);
+
+        final int videoRes = 0;
+        final Context context = ApplicationProvider.getApplicationContext();
+
+        mVideoPlayer = spy(VideoPlayer.create(context, videoRes, mTextureView));
+        mVideoPlayer.mMediaPlayer = mMediaPlayer;
+        mVideoPlayer.mAnimationSurface = mSurface;
+    }
+
+    @Test
+    public void setSurfaceTextureListener_success() {
+        verify(mTextureView).setSurfaceTextureListener(any());
+    }
+
+    @Test
+    public void onPlayerPaused_startedState_pause() {
+        mVideoPlayer.mMediaPlayerState = State.STARTED;
+
+        mVideoPlayer.pause();
+
+        assertThat(mVideoPlayer.mMediaPlayerState).isEqualTo(State.PAUSED);
+        verify(mMediaPlayer).pause();
+    }
+
+    @Test
+    public void onPlayerResumed_pausedState_start() {
+        mVideoPlayer.mMediaPlayerState = State.PAUSED;
+
+        mVideoPlayer.resume();
+
+        assertThat(mVideoPlayer.mMediaPlayerState).isEqualTo(State.STARTED);
+        verify(mMediaPlayer).start();
+    }
+
+    @Test
+    public void onPlayerReleased_stoppedState_release() {
+        mVideoPlayer.mMediaPlayerState = State.STOPPED;
+
+        mVideoPlayer.release();
+
+        assertThat(mVideoPlayer.mMediaPlayerState).isEqualTo(State.END);
+        verify(mMediaPlayer).release();
+        verify(mSurface).release();
+    }
+
+    @Test
+    public void onSurfaceTextureDestroyed_preparedState_release() {
+        mVideoPlayer.mMediaPlayerState = State.PREPARED;
+
+        mVideoPlayer.onSurfaceTextureDestroyed(any());
+
+        assertThat(mVideoPlayer.mMediaPlayerState).isEqualTo(State.END);
+        verify(mMediaPlayer).release();
+        verify(mSurface).release();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
index 8dbf2a8..80f21fc 100644
--- a/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/AvatarViewMixinTest.java
@@ -62,9 +62,9 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class AvatarViewMixinTest {
-    private static final String DUMMY_ACCOUNT = "test@domain.com";
-    private static final String DUMMY_DOMAIN = "domain.com";
-    private static final String DUMMY_AUTHORITY = "authority.domain.com";
+    private static final String FAKE_ACCOUNT = "test@domain.com";
+    private static final String FAKE_DOMAIN = "domain.com";
+    private static final String FAKE_AUTHORITY = "authority.domain.com";
     private static final String METHOD_GET_ACCOUNT_AVATAR = "getAccountAvatar";
 
     private Context mContext;
@@ -134,7 +134,7 @@
     @Config(qualifiers = "mcc999")
     public void onStart_noAccount_mAccountNameShouldBeNull() {
         final AvatarViewMixin avatarViewMixin = new AvatarViewMixin(mActivity, mImageView);
-        avatarViewMixin.mAccountName = DUMMY_ACCOUNT;
+        avatarViewMixin.mAccountName = FAKE_ACCOUNT;
 
         avatarViewMixin.onStart();
 
@@ -159,7 +159,7 @@
         accountProvider.applicationInfo.packageName = accountProvider.packageName;
         accountProvider.providers = new ProviderInfo[1];
         accountProvider.providers[0] = new ProviderInfo();
-        accountProvider.providers[0].authority = DUMMY_AUTHORITY;
+        accountProvider.providers[0].authority = FAKE_AUTHORITY;
         accountProvider.providers[0].packageName = accountProvider.packageName;
         accountProvider.providers[0].name = "test.class";
         accountProvider.providers[0].applicationInfo = accountProvider.applicationInfo;
@@ -168,22 +168,22 @@
         resolveInfo.providerInfo = accountProvider.providers[0];
         shadowPackageManager.addResolveInfoForIntent(AvatarViewMixin.INTENT_GET_ACCOUNT_DATA,
                 resolveInfo);
-        assertThat(avatarViewMixin.queryProviderAuthority()).isEqualTo(DUMMY_AUTHORITY);
+        assertThat(avatarViewMixin.queryProviderAuthority()).isEqualTo(FAKE_AUTHORITY);
     }
 
     @Test
-    public void callWithGetAccountAvatarMethod_useDummyData_shouldReturnAccountNameAndAvatar() {
+    public void callWithGetAccountAvatarMethod_useFakeData_shouldReturnAccountNameAndAvatar() {
         final ContentResolver contentResolver = mContext.getContentResolver();
         final Uri uri = new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT).authority(
-                DUMMY_AUTHORITY).build();
+                FAKE_AUTHORITY).build();
         final ContentProvider mockContentProvider = mock(ContentProvider.class);
 
-        ShadowContentResolver.registerProviderInternal(DUMMY_AUTHORITY, mockContentProvider);
+        ShadowContentResolver.registerProviderInternal(FAKE_AUTHORITY, mockContentProvider);
 
         final Bundle bundle = new Bundle();
         final Bitmap bitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
         bundle.putParcelable("account_avatar", bitmap);
-        bundle.putString("account_name", DUMMY_ACCOUNT);
+        bundle.putString("account_name", FAKE_ACCOUNT);
         doReturn(bundle).when(mockContentProvider).call(anyString(), anyString(),
                 any(Bundle.class));
 
@@ -191,7 +191,7 @@
 
         final Object object = bundle.getParcelable("account_avatar");
         assertThat(object instanceof Bitmap).isTrue();
-        assertThat(bundle.getString("account_name")).isEqualTo(DUMMY_ACCOUNT);
+        assertThat(bundle.getString("account_name")).isEqualTo(FAKE_ACCOUNT);
     }
 
     @Test
@@ -209,7 +209,7 @@
 
         @Implementation
         protected Account[] getAccounts(Context context) {
-            return new Account[]{new Account(DUMMY_ACCOUNT, DUMMY_DOMAIN)};
+            return new Account[]{new Account(FAKE_ACCOUNT, FAKE_DOMAIN)};
         }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java b/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
deleted file mode 100644
index 4537eb9..0000000
--- a/tests/robotests/src/com/android/settings/accounts/RemoveUserFragmentTest.java
+++ /dev/null
@@ -1,36 +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.accounts;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.lang.reflect.Modifier;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class RemoveUserFragmentTest {
-
-    @Test
-    public void testClassModifier_shouldBePublic() {
-        final int modifiers = RemoveUserFragment.class.getModifiers();
-
-        assertThat(Modifier.isPublic(modifiers)).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java
deleted file mode 100644
index 9c7b346..0000000
--- a/tests/robotests/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.accounts;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.accounts.Account;
-import android.content.Context;
-import android.os.UserHandle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class SyncStateSwitchPreferenceTest {
-
-    private Context mContext;
-    private SyncStateSwitchPreference mPreference;
-
-    @Before
-    public void setup() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    public void setup_validAuthority_shouldBeVisible() {
-        mPreference = new SyncStateSwitchPreference(mContext, null /* attrs */);
-
-        mPreference.setup(new Account("name", "type"), "authority", mContext.getPackageName(),
-                UserHandle.USER_CURRENT);
-
-        assertThat(mPreference.isVisible()).isTrue();
-    }
-
-    @Test
-    public void setup_emptyAuthority_shouldBeInvisible() {
-        mPreference = new SyncStateSwitchPreference(mContext, null /* attrs */);
-
-        mPreference.setup(new Account("name", "type"), null /* authority */,
-                mContext.getPackageName(), UserHandle.USER_CURRENT);
-
-        assertThat(mPreference.isVisible()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
index 8fe8e19..1cd5fb1 100644
--- a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java
@@ -19,8 +19,10 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.testutils.shadow.ShadowAuthenticationHelper;
 
 import org.junit.After;
@@ -51,6 +53,10 @@
     @After
     public void tearDown() {
         ShadowAuthenticationHelper.reset();
+
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        }
     }
 
     @Test
@@ -76,4 +82,11 @@
         // should only show the 2 accounts with labels
         assertThat(mController.getSummary()).isEqualTo(LABELS[0] + " and " + LABELS[1]);
     }
+
+    @Test
+    public void getSummary_silkyHomeEnabled_shouldBeNull() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+
+        assertThat(mController.getSummary()).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
deleted file mode 100644
index 277f63e..0000000
--- a/tests/robotests/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
+++ /dev/null
@@ -1,59 +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.applications;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.AppOpsManager;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class AppStateInstallAppsBridgeTest {
-
-    @Test
-    public void testInstallAppsStateCanInstallApps() {
-        AppStateInstallAppsBridge.InstallAppsState appState =
-            new AppStateInstallAppsBridge.InstallAppsState();
-        assertThat(appState.canInstallApps()).isFalse();
-
-        appState.permissionRequested = true;
-        assertThat(appState.canInstallApps()).isFalse();
-
-        appState.appOpMode = AppOpsManager.MODE_ALLOWED;
-        assertThat(appState.canInstallApps()).isTrue();
-
-        appState.appOpMode = AppOpsManager.MODE_ERRORED;
-        assertThat(appState.canInstallApps()).isFalse();
-    }
-
-    @Test
-    public void testInstallAppsStateIsPotentialAppSource() {
-        AppStateInstallAppsBridge.InstallAppsState appState =
-            new AppStateInstallAppsBridge.InstallAppsState();
-        assertThat(appState.isPotentialAppSource()).isFalse();
-
-        appState.appOpMode = AppOpsManager.MODE_ERRORED;
-        assertThat(appState.isPotentialAppSource()).isTrue();
-
-        appState.permissionRequested = true;
-        appState.appOpMode = AppOpsManager.MODE_DEFAULT;
-        assertThat(appState.isPotentialAppSource()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index 2bb93b5..7044389 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -280,7 +280,7 @@
 
         final List<String> expectedPackages = Arrays.asList(testDialer, testSms,
                 testLocationHistory);
-        assertThat(keepEnabledPackages).containsAllIn(expectedPackages);
+        assertThat(keepEnabledPackages).containsAtLeastElementsIn(expectedPackages);
     }
 
     @Test
@@ -329,9 +329,9 @@
 
         ReflectionHelpers.setField(mProvider, "mContext", spyContext);
 
-        final Set<String> whitelist = mProvider.getKeepEnabledPackages();
+        final Set<String> allowlist = mProvider.getKeepEnabledPackages();
 
-        assertThat(whitelist).contains("com.android.settings.intelligence");
+        assertThat(allowlist).contains("com.android.settings.intelligence");
     }
 
     @Test
@@ -351,9 +351,9 @@
 
         ReflectionHelpers.setField(mProvider, "mContext", spyContext);
 
-        final Set<String> whitelist = mProvider.getKeepEnabledPackages();
+        final Set<String> allowlist = mProvider.getKeepEnabledPackages();
 
-        assertThat(whitelist).contains("com.android.packageinstaller");
+        assertThat(allowlist).contains("com.android.packageinstaller");
     }
 
     private void setUpUsersAndInstalledApps() {
diff --git a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
deleted file mode 100644
index 558334d..0000000
--- a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
+++ /dev/null
@@ -1,40 +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.applications;
-
-import static org.junit.Assert.assertTrue;
-
-import com.android.settings.R;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class EnterpriseDefaultAppsTest {
-    @Test
-    public void testNumberOfIntentsCorrelateWithUI() {
-        final int concatenation_templates[] =
-                new int[]{0 /* no need for single app name */,
-                        R.string.app_names_concatenation_template_2,
-                        R.string.app_names_concatenation_template_3};
-        for (EnterpriseDefaultApps app : EnterpriseDefaultApps.values()) {
-            assertTrue("Number of intents should be limited by number of apps the UI can show",
-                    app.getIntents().length <= concatenation_templates.length);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
index 00d3cb1..e0a0836 100644
--- a/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
@@ -93,7 +93,7 @@
         entry.hasLauncherEntry = true;
         entry.info = new ApplicationInfo();
         entry.extraInfo = new AppStateDataUsageBridge.DataUsageState(
-                true /* whitelisted */, false /* blacklisted */);
+                true /* allowlisted */, false /* denylisted */);
         apps.add(entry);
         when(mSession.getAllApps()).thenReturn(apps);
 
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
index a5ac209..9a65dc8 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppButtonsPreferenceControllerTest.java
@@ -420,7 +420,7 @@
         mController.forceStopPackage(PACKAGE_NAME);
 
         verify(mAm).forceStopPackage(PACKAGE_NAME);
-        assertThat(mController.mAppEntry).isSameAs(appEntry);
+        assertThat(mController.mAppEntry).isSameInstanceAs(appEntry);
         verify(mController).updateForceStopButton();
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
index e46cd06..95d7659 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java
@@ -297,7 +297,7 @@
         final List<UserInfo> userInfos = new ArrayList<>();
         userInfos.add(new UserInfo(userID1, "User1", UserInfo.FLAG_PRIMARY));
         userInfos.add(new UserInfo(userID2, "yue", UserInfo.FLAG_GUEST));
-        when(mUserManager.getUsers(true)).thenReturn(userInfos);
+        when(mUserManager.getAliveUsers()).thenReturn(userInfos);
         final ApplicationInfo appInfo = new ApplicationInfo();
         appInfo.flags = ApplicationInfo.FLAG_INSTALLED;
         when(mPackageManager.getApplicationInfoAsUser(
@@ -320,7 +320,7 @@
         final List<UserInfo> userInfos = new ArrayList<>();
         userInfos.add(new UserInfo(userID1, "User1", UserInfo.FLAG_PRIMARY));
         userInfos.add(new UserInfo(userID2, "yue", UserInfo.FLAG_GUEST));
-        when(mUserManager.getUsers(true)).thenReturn(userInfos);
+        when(mUserManager.getAliveUsers()).thenReturn(userInfos);
         final ApplicationInfo appInfo = new ApplicationInfo();
         appInfo.flags = ApplicationInfo.FLAG_INSTALLED;
         when(mPackageManager.getApplicationInfoAsUser(
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
index 8626d2d..691ce5e 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/DefaultSmsShortcutPreferenceControllerTest.java
@@ -19,6 +19,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.app.role.RoleControllerManager;
+import android.app.role.RoleManager;
 import android.content.Context;
 
 import org.junit.Before;
@@ -37,6 +38,8 @@
     private static final String PREFERENCE_KEY = "default_sms_app";
 
     @Mock
+    private RoleManager mRoleManager;
+    @Mock
     private RoleControllerManager mRoleControllerManager;
 
     private DefaultSmsShortcutPreferenceController mController;
@@ -44,8 +47,9 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        ShadowApplication.getInstance().setSystemService(Context.ROLE_CONTROLLER_SERVICE,
-                mRoleControllerManager);
+        final ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        shadowApplication.setSystemService(Context.ROLE_SERVICE, mRoleManager);
+        shadowApplication.setSystemService(Context.ROLE_CONTROLLER_SERVICE, mRoleControllerManager);
         mController = new DefaultSmsShortcutPreferenceController(RuntimeEnvironment.application,
                 TEST_PACKAGE_NAME);
     }
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
index 002a0bc..10c2675 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ExternalSourcesDetailsTest.java
@@ -19,17 +19,11 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.Mockito.doAnswer;
 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.app.ActivityManager;
-import android.app.AppOpsManager;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.pm.ApplicationInfo;
@@ -61,10 +55,6 @@
     @Mock
     private UserManager mUserManager;
     @Mock
-    private ActivityManager mActivityManager;
-    @Mock
-    private AppOpsManager mAppOpsManager;
-    @Mock
     private RestrictedSwitchPreference mSwitchPref;
     @Mock
     private RestrictedPreferenceHelper mHelper;
@@ -79,47 +69,10 @@
 
         mFragment = new ExternalSourcesDetails();
         ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
-        ReflectionHelpers.setField(mFragment, "mActivityManager", mActivityManager);
-        ReflectionHelpers.setField(mFragment, "mAppOpsManager", mAppOpsManager);
         ReflectionHelpers.setField(mFragment, "mSwitchPref", mSwitchPref);
     }
 
     @Test
-    public void setCanInstallApps_false_shouldKillNonCoreUid() {
-        int mockUid = 23456;
-        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
-
-        mPackageInfo.applicationInfo = new ApplicationInfo();
-        mPackageInfo.applicationInfo.uid = mockUid;
-        assertThat(UserHandle.isCore(mockUid)).isFalse();
-        mFragment.setCanInstallApps(false);
-        verify(mActivityManager).killUid(eq(mockUid), anyString());
-    }
-
-    @Test
-    public void setCanInstallApps_false_shouldNotKillCoreUid() {
-        int mockUid = 1234;
-        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
-
-        mPackageInfo.applicationInfo = new ApplicationInfo();
-        mPackageInfo.applicationInfo.uid = mockUid;
-        assertThat(UserHandle.isCore(mockUid)).isTrue();
-        mFragment.setCanInstallApps(false);
-        verify(mActivityManager, never()).killUid(eq(mockUid), anyString());
-    }
-
-    @Test
-    public void setCanInstallApps_true_shouldNotKillUid() {
-        int mockUid = 23456;
-        ReflectionHelpers.setField(mFragment, "mPackageInfo", mPackageInfo);
-
-        mPackageInfo.applicationInfo = new ApplicationInfo();
-        mPackageInfo.applicationInfo.uid = mockUid;
-        mFragment.setCanInstallApps(true);
-        verify(mActivityManager, never()).killUid(eq(mockUid), anyString());
-    }
-
-    @Test
     public void refreshUi_noPackageInfo_shouldReturnFalseAndNoCrash() {
         mFragment.refreshUi();
 
diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/ManageExternalStorageDetailsTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/ManageExternalStorageDetailsTest.java
index 88c2471..487760f 100644
--- a/tests/robotests/src/com/android/settings/applications/appinfo/ManageExternalStorageDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/appinfo/ManageExternalStorageDetailsTest.java
@@ -37,6 +37,7 @@
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -85,6 +86,7 @@
     }
 
     @Test
+    @Ignore
     public void onPreferenceChange_enableManageExternalStorage_shouldTriggerAppOpsManager() {
         // Inject mock package details
         final int mockUid = 23333;
@@ -119,6 +121,7 @@
     }
 
     @Test
+    @Ignore
     public void onPreferenceChange_disableManageExternalStorage_shouldTriggerAppOpsManager() {
         // Inject mock package details
         final int mockUid = 24444;
diff --git a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java b/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
deleted file mode 100644
index f930106..0000000
--- a/tests/robotests/src/com/android/settings/applications/assist/AssistSettingObserverTest.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.applications.assist;
-
-import android.net.Uri;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class AssistSettingObserverTest {
-
-    @Test
-    public void callConstructor_shouldNotCrash() {
-        new AssistSettingObserver() {
-            @Override
-            protected List<Uri> getSettingUris() {
-                return null;
-            }
-
-            @Override
-            public void onSettingChange() {
-
-            }
-        };
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
deleted file mode 100644
index 680cd8a..0000000
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
+++ /dev/null
@@ -1,88 +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.applications.manageapplications;
-
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_ALL;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_INSTALL_SOURCES;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_POWER_WHITELIST;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_RECENT;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_USAGE_ACCESS;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_WITH_OVERLAY;
-import static com.android.settings.applications.manageapplications.AppFilterRegistry
-        .FILTER_APPS_WRITE_SETTINGS;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_GAMES;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_HIGH_POWER;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_MAIN;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_MANAGE_SOURCES;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_MOVIES;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_NOTIFICATION;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_OVERLAY;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_PHOTOGRAPHY;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_STORAGE;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_USAGE_ACCESS;
-import static com.android.settings.applications.manageapplications.ManageApplications
-        .LIST_TYPE_WRITE_SETTINGS;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class AppFilterRegistryTest {
-
-  @Test
-  public void getDefaultType_shouldMatchForAllListType() {
-      final AppFilterRegistry registry = AppFilterRegistry.getInstance();
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_USAGE_ACCESS))
-          .isEqualTo(FILTER_APPS_USAGE_ACCESS);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_HIGH_POWER))
-          .isEqualTo(FILTER_APPS_POWER_WHITELIST);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_OVERLAY))
-          .isEqualTo(FILTER_APPS_WITH_OVERLAY);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_WRITE_SETTINGS))
-          .isEqualTo(FILTER_APPS_WRITE_SETTINGS);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES))
-          .isEqualTo(FILTER_APPS_INSTALL_SOURCES);
-
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN)).isEqualTo(FILTER_APPS_ALL);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION))
-              .isEqualTo(FILTER_APPS_RECENT);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_STORAGE)).isEqualTo(FILTER_APPS_ALL);
-
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_GAMES)).isEqualTo(FILTER_APPS_ALL);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_MOVIES)).isEqualTo(FILTER_APPS_ALL);
-      assertThat(registry.getDefaultFilterType(LIST_TYPE_PHOTOGRAPHY)).isEqualTo(FILTER_APPS_ALL);
-  }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
index 4d420d1..86f5fe8 100644
--- a/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/manageapplications/ManageApplicationsTest.java
@@ -570,12 +570,14 @@
 
         mFragment.createHeader();
 
-        assertThat(mFragment.mFilterAdapter.getCount()).isEqualTo(3);
+        assertThat(mFragment.mFilterAdapter.getCount()).isEqualTo(4);
         assertThat(mFragment.mFilterAdapter.getItem(0)).isEqualTo(
                 mContext.getString(R.string.sort_order_recent_notification));
         assertThat(mFragment.mFilterAdapter.getItem(1)).isEqualTo(
                 mContext.getString(R.string.sort_order_frequent_notification));
         assertThat(mFragment.mFilterAdapter.getItem(2)).isEqualTo(
+                mContext.getString(R.string.filter_all_apps));
+        assertThat(mFragment.mFilterAdapter.getItem(3)).isEqualTo(
                 mContext.getString(R.string.filter_notif_blocked_apps));
     }
 
@@ -594,8 +596,8 @@
         mFragment.onItemSelected(null, null, 0, 0);
 
         AppFilter filter = ReflectionHelpers.getField(adapter, "mCompositeFilter");
-        assertThat(filter.filterApp(createPowerWhiteListApp(false))).isFalse();
-        assertThat(filter.filterApp(createPowerWhiteListApp(true))).isTrue();
+        assertThat(filter.filterApp(createPowerAllowListApp(false))).isFalse();
+        assertThat(filter.filterApp(createPowerAllowListApp(true))).isTrue();
     }
 
     @Test
@@ -613,8 +615,8 @@
         mFragment.onItemSelected(null, null, 1, 0);
 
         AppFilter filter = ReflectionHelpers.getField(adapter, "mCompositeFilter");
-        assertThat(filter.filterApp(createPowerWhiteListApp(false))).isTrue();
-        assertThat(filter.filterApp(createPowerWhiteListApp(true))).isTrue();
+        assertThat(filter.filterApp(createPowerAllowListApp(false))).isTrue();
+        assertThat(filter.filterApp(createPowerAllowListApp(true))).isTrue();
     }
 
     private void setUpOptionMenus() {
@@ -644,11 +646,11 @@
         return appList;
     }
 
-    private AppEntry createPowerWhiteListApp(boolean isPowerWhiteListed) {
+    private AppEntry createPowerAllowListApp(boolean isPowerAllowListed) {
         final ApplicationInfo info = new ApplicationInfo();
         info.sourceDir = "abc";
         final AppEntry entry = new AppEntry(mContext, info, 0);
-        entry.extraInfo = isPowerWhiteListed ? Boolean.TRUE : Boolean.FALSE;
+        entry.extraInfo = isPowerAllowListed ? Boolean.TRUE : Boolean.FALSE;
         return entry;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetailsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetailsTest.java
deleted file mode 100644
index 26a78d0..0000000
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetailsTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2019 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.specialaccess.notificationaccess;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class NotificationAccessDetailsTest {
-
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    private NotificationAccessDetails mFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
-        mFragment = spy(new NotificationAccessDetails());
-        mContext = RuntimeEnvironment.application;
-        doReturn(mContext).when(mFragment).getContext();
-
-    }
-
-    @Test
-    public void logSpecialPermissionChange() {
-        mFragment.logSpecialPermissionChange(true, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(
-                mContext,
-                MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW,
-                "app");
-
-        mFragment.logSpecialPermissionChange(false, "app");
-        verify(mFeatureFactory.metricsFeatureProvider).action(
-                mContext,
-                MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_DENY,
-                "app");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java
index b6c6c6a..4eebd7d 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/pictureinpicture/PictureInPictureDetailsTest.java
@@ -55,18 +55,18 @@
 
     @Test
     public void testNonPippableApp() {
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage")).isFalse();
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
+        assertThat(checkPackageHasPictureInPictureActivities("com.android.fakepackage")).isFalse();
+        assertThat(checkPackageHasPictureInPictureActivities("com.android.fakepackage",
                 false, false, false)).isFalse();
     }
 
     @Test
     public void testPippableApp() {
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
+        assertThat(checkPackageHasPictureInPictureActivities("com.android.fakepackage",
                 true)).isTrue();
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
+        assertThat(checkPackageHasPictureInPictureActivities("com.android.fakepackage",
                 false, true)).isTrue();
-        assertThat(checkPackageHasPictureInPictureActivities("com.android.dummypackage",
+        assertThat(checkPackageHasPictureInPictureActivities("com.android.fakepackage",
                 true, false)).isTrue();
     }
 
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java
index 6041e9d..8febbc6 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java
@@ -63,12 +63,6 @@
     }
 
     @Test
-    public void isAvailable_lowMemory_false() {
-        mActivityManager.setIsLowRamDevice(true);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
     public void logSpecialPermissionChange() {
         ZenAccessController.logSpecialPermissionChange(true, "app", mContext);
         verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixinTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixinTest.java
index cba1a51..afda8d5 100644
--- a/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixinTest.java
+++ b/tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessSettingObserverMixinTest.java
@@ -65,7 +65,7 @@
     }
 
     @Test
-    public void onStart_lowMemory_shouldNotRegisterListener() {
+    public void onStart_shouldRegisterListener() {
         final ShadowActivityManager sam = Shadow.extract(
                 mContext.getSystemService(ActivityManager.class));
         sam.setIsLowRamDevice(true);
@@ -73,36 +73,18 @@
         mLifecycle.handleLifecycleEvent(ON_START);
 
         mContext.getContentResolver().notifyChange(Settings.Secure.getUriFor(
-                Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES), null);
-
-        verify(mListener, never()).onZenAccessPolicyChanged();
-    }
-
-    @Test
-    public void onStart_highMemory_shouldRegisterListener() {
-        final ShadowActivityManager sam = Shadow.extract(
-                mContext.getSystemService(ActivityManager.class));
-        sam.setIsLowRamDevice(false);
-
-        mLifecycle.handleLifecycleEvent(ON_START);
-
-        mContext.getContentResolver().notifyChange(Settings.Secure.getUriFor(
-                Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES), null);
+                Settings.Secure.ENABLED_NOTIFICATION_LISTENERS), null);
 
         verify(mListener).onZenAccessPolicyChanged();
     }
 
     @Test
     public void onStop_shouldUnregisterListener() {
-        final ShadowActivityManager sam = Shadow.extract(
-                mContext.getSystemService(ActivityManager.class));
-        sam.setIsLowRamDevice(false);
-
         mLifecycle.handleLifecycleEvent(ON_START);
         mLifecycle.handleLifecycleEvent(ON_STOP);
 
         mContext.getContentResolver().notifyChange(Settings.Secure.getUriFor(
-                Settings.Secure.ENABLED_NOTIFICATION_POLICY_ACCESS_PACKAGES), null);
+                Settings.Secure.ENABLED_NOTIFICATION_LISTENERS), null);
 
         verify(mListener, never()).onZenAccessPolicyChanged();
     }
diff --git a/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceControllerTest.java
deleted file mode 100644
index 6dd53a3..0000000
--- a/tests/robotests/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceControllerTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2019 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.biometrics.face;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class FaceSettingsAttentionPreferenceControllerTest {
-
-    private Context mContext;
-    private FaceSettingsAttentionPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new FaceSettingsAttentionPreferenceController(mContext);
-    }
-
-    @Test
-    public void isSliceable_returnFalse() {
-        assertThat(mController.isSliceable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
index bfe7df3..47edb40 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java
@@ -36,6 +36,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -74,6 +75,7 @@
     }
 
     @Test
+    @Ignore
     public void fingerprintEnrollHelp_shouldShowHelpText() {
         EnrollmentCallback enrollmentCallback = verifyAndCaptureEnrollmentCallback();
 
@@ -93,7 +95,6 @@
                 any(byte[].class),
                 any(CancellationSignal.class),
                 anyInt(),
-                anyInt(),
                 callbackCaptor.capture());
 
         return callbackCaptor.getValue();
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
index 8be6b30..465e735 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFindSensorTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.biometrics.fingerprint;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -92,7 +93,7 @@
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
         IntentForResult startedActivity =
                 shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity 1").isNotNull();
+        assertWithMessage("Next activity 1").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
     }
@@ -107,12 +108,12 @@
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
         IntentForResult startedActivity =
                 shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity 1").isNotNull();
+        assertWithMessage("Next activity 1").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
 
         // Should only start one next activity
-        assertThat(shadowActivity.getNextStartedActivityForResult()).named("Next activity 2")
+        assertWithMessage("Next activity 2").that(shadowActivity.getNextStartedActivityForResult())
                 .isNull();
     }
 
@@ -129,7 +130,7 @@
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
         IntentForResult startedActivity =
                 shadowActivity.getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity").isNotNull();
+        assertWithMessage("Next activity").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(new ComponentName(application, FingerprintEnrollEnrolling.class));
     }
@@ -140,7 +141,7 @@
         layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
-        assertThat(shadowActivity.getResultCode()).named("result code")
+        assertWithMessage("result code").that(shadowActivity.getResultCode())
                 .isEqualTo(BiometricEnrollBase.RESULT_SKIP);
     }
 
@@ -151,7 +152,6 @@
                 any(byte[].class),
                 any(CancellationSignal.class),
                 anyInt(),
-                anyInt(),
                 callbackCaptor.capture());
 
         return callbackCaptor.getValue();
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
index 9fa6099..d3a1fc1 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintSuggestionActivityTest.java
@@ -17,18 +17,25 @@
 package com.android.settings.biometrics.fingerprint;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
 import android.app.Activity;
 import android.app.KeyguardManager;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.hardware.biometrics.SensorProperties;
+import android.hardware.fingerprint.FingerprintSensorProperties;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.view.View;
 import android.widget.Button;
 
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowFingerprintManager;
 import com.android.settings.testutils.shadow.ShadowLockPatternUtils;
+import com.android.settings.testutils.shadow.ShadowStorageManager;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 
 import com.google.android.setupcompat.PartnerCustomizationLayout;
@@ -45,18 +52,39 @@
 import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowKeyguardManager;
 
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowLockPatternUtils.class, ShadowUserManager.class})
-public class FingerprintSuggestionActivityTest {
+import java.util.ArrayList;
 
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {
+        ShadowFingerprintManager.class,
+        ShadowLockPatternUtils.class,
+        ShadowStorageManager.class,
+        ShadowUserManager.class
+})
+public class FingerprintSuggestionActivityTest {
+    private FingerprintSuggestionActivity mActivity;
     private ActivityController<FingerprintSuggestionActivity> mController;
 
     @Before
     public void setUp() {
+        Shadows.shadowOf(application.getPackageManager())
+                .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
+
+        final FingerprintSensorPropertiesInternal prop = new FingerprintSensorPropertiesInternal(
+                0 /* sensorId */,
+                SensorProperties.STRENGTH_STRONG,
+                5 /* maxEnrollmentsPerUser */,
+                FingerprintSensorProperties.TYPE_REAR,
+                true /* resetLockoutRequiresHardwareAuthToken */);
+        final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
+        props.add(prop);
+        ShadowFingerprintManager.setSensorProperties(props);
+
         FakeFeatureFactory.setupForTest();
 
         final Intent intent = new Intent();
         mController = Robolectric.buildActivity(FingerprintSuggestionActivity.class, intent);
+        mActivity = mController.get();
     }
 
     @Test
@@ -65,17 +93,17 @@
 
         mController.create().resume();
 
-        PartnerCustomizationLayout layout =
-                mController.get().findViewById(R.id.setup_wizard_layout);
+        PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout);
         final Button cancelButton =
                 layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
         assertThat(cancelButton.getText().toString()).isEqualTo("Cancel");
-        assertThat(cancelButton.getVisibility()).named("Cancel visible").isEqualTo(View.VISIBLE);
+        assertWithMessage("Cancel visible").that(cancelButton.getVisibility())
+                .isEqualTo(View.VISIBLE);
         cancelButton.performClick();
 
-        ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
+        ShadowActivity shadowActivity = Shadows.shadowOf(mActivity);
+        assertWithMessage("Is finishing").that(mActivity.isFinishing()).isTrue();
+        assertWithMessage("Result code").that(shadowActivity.getResultCode())
             .isEqualTo(Activity.RESULT_CANCELED);
     }
 
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
index 57a56fc..e238a0e 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollFinishTest.java
@@ -19,6 +19,7 @@
 import static com.android.settings.biometrics.fingerprint.FingerprintEnrollFinish.FINGERPRINT_SUGGESTION_ACTIVITY;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -76,7 +77,7 @@
 
         ShadowActivity.IntentForResult startedActivity =
                 Shadows.shadowOf(mActivity).getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity").isNotNull();
+        assertWithMessage("Next activity").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(enrollingComponent);
     }
@@ -91,7 +92,7 @@
 
         ShadowActivity.IntentForResult startedActivity =
                 Shadows.shadowOf(mActivity).getNextStartedActivityForResult();
-        assertThat(startedActivity).named("Next activity").isNotNull();
+        assertWithMessage("Next activity").that(startedActivity).isNotNull();
         assertThat(startedActivity.intent.getComponent())
                 .isEqualTo(enrollingComponent);
     }
@@ -162,4 +163,4 @@
         assertThat(application.getPackageManager().getComponentEnabledSetting(
                 mComponentName)).isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
index 3fa0ed4..25780f7 100644
--- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/SetupFingerprintEnrollIntroductionTest.java
@@ -17,12 +17,17 @@
 package com.android.settings.biometrics.fingerprint;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
 import android.app.KeyguardManager;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.hardware.biometrics.SensorProperties;
+import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintSensorProperties;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 import android.view.View;
 import android.widget.Button;
 
@@ -53,6 +58,8 @@
 import org.robolectric.shadows.ShadowActivity.IntentForResult;
 import org.robolectric.shadows.ShadowKeyguardManager;
 
+import java.util.ArrayList;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
     ShadowFingerprintManager.class,
@@ -69,6 +76,16 @@
         Shadows.shadowOf(application.getPackageManager())
             .setSystemFeature(PackageManager.FEATURE_FINGERPRINT, true);
 
+        final FingerprintSensorPropertiesInternal prop = new FingerprintSensorPropertiesInternal(
+                0 /* sensorId */,
+                SensorProperties.STRENGTH_STRONG,
+                5 /* maxEnrollmentsPerUser */,
+                FingerprintSensorProperties.TYPE_REAR,
+                true /* resetLockoutRequiresHardwareAuthToken */);
+        final ArrayList<FingerprintSensorPropertiesInternal> props = new ArrayList<>();
+        props.add(prop);
+        ShadowFingerprintManager.setSensorProperties(props);
+
         FakeFeatureFactory.setupForTest();
 
         final Intent intent = new Intent();
@@ -90,12 +107,12 @@
                 mController.get().findViewById(R.id.setup_wizard_layout);
         final Button skipButton =
                 layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
-        assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
+        assertWithMessage("Skip visible").that(skipButton.getVisibility()).isEqualTo(View.VISIBLE);
         skipButton.performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
+        assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+        assertWithMessage("Result code").that(shadowActivity.getResultCode())
             .isEqualTo(SetupSkipDialog.RESULT_SKIP);
     }
 
@@ -109,12 +126,12 @@
                 mController.get().findViewById(R.id.setup_wizard_layout);
         final Button skipButton =
                 layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
-        assertThat(skipButton.getVisibility()).named("Skip visible").isEqualTo(View.VISIBLE);
+        assertWithMessage("Skip visible").that(skipButton.getVisibility()).isEqualTo(View.VISIBLE);
         skipButton.performClick();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(mController.get());
-        assertThat(mController.get().isFinishing()).named("Is finishing").isTrue();
-        assertThat(shadowActivity.getResultCode()).named("Result code")
+        assertWithMessage("Is finishing").that(mController.get().isFinishing()).isTrue();
+        assertWithMessage("Result code").that(shadowActivity.getResultCode())
             .isEqualTo(BiometricEnrollBase.RESULT_SKIP);
     }
 
diff --git a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
index 5c4e03d..4d2ad36 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/AdvancedBluetoothDetailsHeaderControllerTest.java
@@ -42,6 +42,7 @@
 import com.android.settings.testutils.shadow.ShadowDeviceConfig;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
+import com.android.settingslib.utils.StringUtil;
 import com.android.settingslib.widget.LayoutPreference;
 
 import org.junit.Before;
@@ -285,6 +286,68 @@
         verify(mBitmap).recycle();
     }
 
+    @Test
+    public void showBatteryPredictionIfNecessary_estimateReadyIsAvailable_showView() {
+        mController.showBatteryPredictionIfNecessary(1, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_left));
+        mController.showBatteryPredictionIfNecessary(1, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_middle));
+        mController.showBatteryPredictionIfNecessary(1, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_right));
+
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_left),
+                View.VISIBLE);
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_middle),
+                View.VISIBLE);
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_right),
+                View.VISIBLE);
+    }
+
+    @Test
+    public void showBatteryPredictionIfNecessary_estimateReadyIsNotAvailable_notShowView() {
+        mController.showBatteryPredictionIfNecessary(0, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_left));
+        mController.showBatteryPredictionIfNecessary(0, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_middle));
+        mController.showBatteryPredictionIfNecessary(0, 14218009,
+                mLayoutPreference.findViewById(R.id.layout_right));
+
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_left),
+                View.GONE);
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_middle),
+                View.GONE);
+        assertBatteryPredictionVisible(mLayoutPreference.findViewById(R.id.layout_right),
+                View.GONE);
+    }
+
+    @Test
+    public void showBatteryPredictionIfNecessary_estimateReadyIsAvailable_showCorrectValue() {
+        final String leftBatteryPrediction =
+                StringUtil.formatElapsedTime(mContext, 12000000, false).toString();
+        final String rightBatteryPrediction =
+                StringUtil.formatElapsedTime(mContext, 1200000, false).toString();
+
+        mController.showBatteryPredictionIfNecessary(1, 12000000,
+                mLayoutPreference.findViewById(R.id.layout_left));
+        mController.showBatteryPredictionIfNecessary(1, 1200000,
+                mLayoutPreference.findViewById(R.id.layout_right));
+
+        assertBatteryPrediction(mLayoutPreference.findViewById(R.id.layout_left),
+                leftBatteryPrediction);
+        assertBatteryPrediction(mLayoutPreference.findViewById(R.id.layout_right),
+                rightBatteryPrediction);
+    }
+
+    private void assertBatteryPredictionVisible(LinearLayout linearLayout, int visible) {
+        final TextView textView = linearLayout.findViewById(R.id.bt_battery_prediction);
+        assertThat(textView.getVisibility()).isEqualTo(visible);
+    }
+
+    private void assertBatteryPrediction(LinearLayout linearLayout, String prediction) {
+        final TextView textView = linearLayout.findViewById(R.id.bt_battery_prediction);
+        assertThat(textView.getText().toString()).isEqualTo(prediction);
+    }
+
     private void assertBatteryLevel(LinearLayout linearLayout, int batteryLevel) {
         final TextView textView = linearLayout.findViewById(R.id.bt_battery_summary);
         assertThat(textView.getText().toString()).isEqualTo(
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
index 7313321..6401388 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsControllerTestBase.java
@@ -41,7 +41,7 @@
 import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
-public class BluetoothDetailsControllerTestBase {
+public abstract class BluetoothDetailsControllerTestBase {
 
     protected Context mContext;
     private LifecycleOwner mLifecycleOwner;
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
index f12e06e..c87cc25 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDevicePreferenceTest.java
@@ -17,10 +17,12 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -35,7 +37,6 @@
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.testutils.DrawableTestHelper;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -261,4 +262,19 @@
         assertThat(mPreferenceList.get(2).getCachedDevice().getAddress())
                 .isEqualTo(preference3.getCachedDevice().getAddress());
     }
+
+    @Test
+    public void onAttached_callbackNotRemoved_doNotRegisterCallback() {
+        mPreference.onAttached();
+
+        verify(mCachedBluetoothDevice, never()).unregisterCallback(any());
+    }
+
+    @Test
+    public void onAttached_callbackRemoved_registerCallback() {
+        mPreference.onPrepareForRemoval();
+        mPreference.onAttached();
+
+        verify(mCachedBluetoothDevice, times(2)).registerCallback(any());
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
index da11781..20cc59d 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/SavedBluetoothDeviceUpdaterTest.java
@@ -145,6 +145,15 @@
     }
 
     @Test
+    public void onClick_Preference_connected_setActive() {
+        when(mCachedBluetoothDevice.isConnected()).thenReturn(true);
+
+        mBluetoothDeviceUpdater.onPreferenceClick(mPreference);
+
+        verify(mCachedBluetoothDevice).setActive();
+    }
+
+    @Test
     public void forceUpdate_findCachedBluetoothDeviceIsMatched_addPreference() {
         final List<BluetoothDevice> bluetoothDevices = new ArrayList<>();
         bluetoothDevices.add(mBluetoothDevice);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
index 974a52b..6ae670d 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceControllerTest.java
@@ -34,6 +34,7 @@
 
 import com.android.settings.R;
 import com.android.settings.nfc.NfcPreferenceController;
+import com.android.settings.testutils.shadow.ShadowNfcAdapter;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,7 +44,7 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowNfcAdapter;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowPackageManager;
 import org.robolectric.util.ReflectionHelpers;
 
@@ -70,7 +71,7 @@
         mContentResolver = mContext.getContentResolver();
         mNfcController = new NfcPreferenceController(mContext,
                 NfcPreferenceController.KEY_TOGGLE_NFC);
-        mShadowNfcAdapter = Shadows.shadowOf(NfcAdapter.getNfcAdapter(mContext));
+        mShadowNfcAdapter = Shadow.extract(NfcAdapter.getDefaultAdapter(mContext));
         mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
     }
 
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
index d6bcb12..aed3787 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragmentTest.java
@@ -18,7 +18,6 @@
 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.nfc.NfcAdapter;
@@ -26,35 +25,38 @@
 
 import com.android.settings.nfc.AndroidBeamPreferenceController;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.testutils.shadow.ShadowNfcAdapter;
 import com.android.settings.testutils.shadow.ShadowUserManager;
 import com.android.settingslib.drawer.CategoryKey;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {ShadowUserManager.class,
-        ShadowConnectivityManager.class})
+        ShadowConnectivityManager.class, ShadowNfcAdapter.class})
 public class AdvancedConnectedDeviceDashboardFragmentTest {
 
     private AdvancedConnectedDeviceDashboardFragment mFragment;
 
-    @Mock
-    private NfcAdapter mNfcAdapter;
+    private Context mContext;
+    private ShadowNfcAdapter mShadowNfcAdapter;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
+        mContext = spy(RuntimeEnvironment.application);
         mFragment = new AdvancedConnectedDeviceDashboardFragment();
+        mShadowNfcAdapter = Shadow.extract(NfcAdapter.getDefaultAdapter(mContext));
     }
 
     @Test
@@ -79,13 +81,10 @@
 
     @Test
     public void testSearchIndexProvider_correctNonIndexables() {
-        Context context = spy(RuntimeEnvironment.application);
-        when(context.getApplicationContext()).thenReturn(context);
-        when(NfcAdapter.getDefaultAdapter(context)).thenReturn(mNfcAdapter);
-        when(mNfcAdapter.isSecureNfcSupported()).thenReturn(true);
+        mShadowNfcAdapter.setSecureNfcSupported(true);
         final List<String> niks =
                 AdvancedConnectedDeviceDashboardFragment.SEARCH_INDEX_DATA_PROVIDER
-                        .getNonIndexableKeys(context);
+                        .getNonIndexableKeys(mContext);
 
         assertThat(niks).contains(AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
     }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java
index ffaade3..8acb81c 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentControllerTest.java
@@ -29,6 +29,7 @@
 import android.os.UserManager;
 
 import com.android.settings.R;
+import com.android.settings.testutils.shadow.ShadowNfcAdapter;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -37,9 +38,12 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowNfcAdapter.class)
 public class NfcAndPaymentFragmentControllerTest {
     private NfcAndPaymentFragmentController mController;
     private Context mContext;
@@ -50,29 +54,28 @@
     private UserManager mUserManager;
     @Mock
     private NfcManager mNfcManager;
-    @Mock
-    private NfcAdapter mNfcAdapter;
+
+    private ShadowNfcAdapter mShadowNfcAdapter;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
+        mShadowNfcAdapter = Shadow.extract(NfcAdapter.getDefaultAdapter(mContext));
 
         when(mContext.getApplicationContext()).thenReturn(mContext);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
         when(mContext.getSystemService(Context.NFC_SERVICE)).thenReturn(mNfcManager);
-        when(NfcAdapter.getDefaultAdapter(mContext)).thenReturn(mNfcAdapter);
 
         mController = new NfcAndPaymentFragmentController(mContext, "fakeKey");
-        ReflectionHelpers.setField(mController, "mNfcAdapter", mNfcAdapter);
     }
 
     @Test
     public void getAvailabilityStatus_hasNfc_shouldReturnAvailable() {
         when(mPackageManager.hasSystemFeature(anyString())).thenReturn(true);
         when(mUserManager.isAdminUser()).thenReturn(true);
-        when(mNfcAdapter.isEnabled()).thenReturn(true);
+        mShadowNfcAdapter.setEnabled(true);
 
         assertThat(mController.getAvailabilityStatus())
                 .isEqualTo(NfcAndPaymentFragmentController.AVAILABLE);
@@ -87,14 +90,14 @@
 
     @Test
     public void getSummary_nfcOn_shouldProvideOnSummary() {
-        when(mNfcAdapter.isEnabled()).thenReturn(true);
+        mShadowNfcAdapter.setEnabled(true);
         assertThat(mController.getSummary().toString()).contains(
                 mContext.getString(R.string.switch_on_text));
     }
 
     @Test
     public void getSummary_nfcOff_shouldProvideOffSummary() {
-        when(mNfcAdapter.isEnabled()).thenReturn(false);
+        mShadowNfcAdapter.setEnabled(false);
         assertThat(mController.getSummary().toString()).contains(
                 mContext.getString(R.string.switch_off_text));
     }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentTest.java
index 46c9cbb..dea0c73 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/NfcAndPaymentFragmentTest.java
@@ -22,9 +22,12 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.nfc.NfcAdapter;
 import android.provider.SearchIndexableResource;
 
+import com.android.settings.testutils.shadow.ShadowNfcAdapter;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,16 +35,20 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowNfcAdapter.class)
 public class NfcAndPaymentFragmentTest {
+    @Mock
+    private PackageManager mPackageManager;
+
     private NfcAndPaymentFragment mFragment;
     private Context mContext;
-
-    @Mock
-    private NfcAdapter mNfcAdapter;
+    private ShadowNfcAdapter mShadowNfcAdapter;
 
     @Before
     public void setUp() {
@@ -49,6 +56,9 @@
 
         mFragment = new NfcAndPaymentFragment();
         mContext = spy(RuntimeEnvironment.application);
+        mShadowNfcAdapter = Shadow.extract(NfcAdapter.getDefaultAdapter(mContext));
+
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
     }
 
     @Test
@@ -64,8 +74,10 @@
     @Test
     public void searchIndexProvider_shouldIndexValidItems() {
         when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(NfcAdapter.getDefaultAdapter(mContext)).thenReturn(mNfcAdapter);
-        when(mNfcAdapter.isSecureNfcSupported()).thenReturn(true);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC)).thenReturn(true);
+        when(mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_NFC_HOST_CARD_EMULATION)).thenReturn(true);
+        mShadowNfcAdapter.setSecureNfcSupported(true);
 
         final List<String> niks = NfcAndPaymentFragment.SEARCH_INDEX_DATA_PROVIDER
                 .getNonIndexableKeys(mContext);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragmentTest.java
new file mode 100644
index 0000000..6261015
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDeviceDashboardFragmentTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.connecteddevice;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.bluetooth.BluetoothAdapter;
+
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowBluetoothAdapter.class)
+public class PreviouslyConnectedDeviceDashboardFragmentTest {
+
+    private ShadowBluetoothAdapter mShadowBluetoothAdapter;
+    private PreviouslyConnectedDeviceDashboardFragment mFragment;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+        mFragment = new PreviouslyConnectedDeviceDashboardFragment();
+        mFragment.mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+    }
+
+    @Test
+    public void onStart_bluetoothIsDisable_enableBluetooth() {
+        mShadowBluetoothAdapter.setEnabled(false);
+
+        assertThat(mFragment.mBluetoothAdapter.isEnabled()).isFalse();
+        mFragment.enableBluetoothIfNecessary();
+
+        assertThat(mFragment.mBluetoothAdapter.isEnabled()).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
index 90cbea9..420b1a4 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java
@@ -23,7 +23,10 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
 import android.content.Context;
 import android.content.pm.PackageManager;
 
@@ -32,9 +35,14 @@
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceManager;
 
+import com.android.settings.R;
+import com.android.settings.bluetooth.BluetoothDevicePreference;
 import com.android.settings.bluetooth.BluetoothDeviceUpdater;
 import com.android.settings.connecteddevice.dock.DockUpdater;
 import com.android.settings.dashboard.DashboardFragment;
+import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
+import com.android.settings.widget.SingleTargetGearPreference;
+import com.android.settingslib.bluetooth.CachedBluetoothDevice;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,11 +51,22 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowBluetoothAdapter.class)
 public class PreviouslyConnectedDevicePreferenceControllerTest {
 
-    private final String KEY = "test_key";
+    private static final String KEY = "test_key";
+    private static final String FAKE_ADDRESS_1 = "AA:AA:AA:AA:AA:01";
+    private static final String FAKE_ADDRESS_2 = "AA:AA:AA:AA:AA:02";
+    private static final String FAKE_ADDRESS_3 = "AA:AA:AA:AA:AA:03";
+    private static final String FAKE_ADDRESS_4 = "AA:AA:AA:AA:AA:04";
+    private static final String FAKE_ADDRESS_5 = "AA:AA:AA:AA:AA:05";
 
     @Mock
     private DashboardFragment mDashboardFragment;
@@ -59,10 +78,33 @@
     private PackageManager mPackageManager;
     @Mock
     private PreferenceManager mPreferenceManager;
+    @Mock
+    private Preference mSeeAllPreference;
+    @Mock
+    private CachedBluetoothDevice mCachedDevice1;
+    @Mock
+    private CachedBluetoothDevice mCachedDevice2;
+    @Mock
+    private CachedBluetoothDevice mCachedDevice3;
+    @Mock
+    private CachedBluetoothDevice mCachedDevice4;
+    @Mock
+    private CachedBluetoothDevice mCachedDevice5;
+    @Mock
+    private BluetoothDevice mBluetoothDevice1;
+    @Mock
+    private BluetoothDevice mBluetoothDevice2;
+    @Mock
+    private BluetoothDevice mBluetoothDevice3;
+    @Mock
+    private BluetoothDevice mBluetoothDevice4;
+    @Mock
+    private BluetoothDevice mBluetoothDevice5;
 
     private Context mContext;
     private PreviouslyConnectedDevicePreferenceController mPreConnectedDeviceController;
     private PreferenceGroup mPreferenceGroup;
+    private ShadowBluetoothAdapter mShadowBluetoothAdapter;
 
     @Before
     public void setUp() {
@@ -74,11 +116,31 @@
                 new PreviouslyConnectedDevicePreferenceController(mContext, KEY);
         mPreConnectedDeviceController.setBluetoothDeviceUpdater(mBluetoothDeviceUpdater);
         mPreConnectedDeviceController.setSavedDockUpdater(mDockUpdater);
+        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
+
+        when(mCachedDevice1.getDevice()).thenReturn(mBluetoothDevice1);
+        when(mCachedDevice1.getAddress()).thenReturn(FAKE_ADDRESS_1);
+        when(mCachedDevice2.getDevice()).thenReturn(mBluetoothDevice2);
+        when(mCachedDevice2.getAddress()).thenReturn(FAKE_ADDRESS_2);
+        when(mCachedDevice3.getDevice()).thenReturn(mBluetoothDevice3);
+        when(mCachedDevice3.getAddress()).thenReturn(FAKE_ADDRESS_3);
+        when(mCachedDevice4.getDevice()).thenReturn(mBluetoothDevice4);
+        when(mCachedDevice4.getAddress()).thenReturn(FAKE_ADDRESS_4);
+        when(mCachedDevice5.getDevice()).thenReturn(mBluetoothDevice5);
+        when(mCachedDevice5.getAddress()).thenReturn(FAKE_ADDRESS_5);
+
+        final List<BluetoothDevice> mMostRecentlyConnectedDevices = new ArrayList<>();
+        mMostRecentlyConnectedDevices.add(mBluetoothDevice1);
+        mMostRecentlyConnectedDevices.add(mBluetoothDevice2);
+        mMostRecentlyConnectedDevices.add(mBluetoothDevice4);
+        mMostRecentlyConnectedDevices.add(mBluetoothDevice3);
+        mShadowBluetoothAdapter.setMostRecentlyConnectedDevices(mMostRecentlyConnectedDevices);
 
         mPreferenceGroup = spy(new PreferenceCategory(mContext));
         doReturn(mPreferenceManager).when(mPreferenceGroup).getPreferenceManager();
         mPreferenceGroup.setVisible(false);
         mPreConnectedDeviceController.setPreferenceGroup(mPreferenceGroup);
+        mPreConnectedDeviceController.mSeeAllPreference = mSeeAllPreference;
     }
 
     @Test
@@ -87,11 +149,14 @@
         mPreConnectedDeviceController.onStart();
         verify(mBluetoothDeviceUpdater).registerCallback();
         verify(mDockUpdater).registerCallback();
+        verify(mContext).registerReceiver(mPreConnectedDeviceController.mReceiver,
+                mPreConnectedDeviceController.mIntentFilter);
 
         // unregister the callback in onStop()
         mPreConnectedDeviceController.onStop();
         verify(mBluetoothDeviceUpdater).unregisterCallback();
         verify(mDockUpdater).unregisterCallback();
+        verify(mContext).unregisterReceiver(mPreConnectedDeviceController.mReceiver);
     }
 
     @Test
@@ -122,32 +187,87 @@
 
     @Test
     public void onDeviceAdded_addDevicePreference_displayIt() {
-        mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
+        final BluetoothDevicePreference preference1 = new BluetoothDevicePreference(
+                mContext, mCachedDevice1, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
 
-        assertThat(mPreferenceGroup.isVisible()).isTrue();
-        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(1);
+        mPreConnectedDeviceController.onDeviceAdded(preference1);
+
+        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void onDeviceAdded_addDockDevicePreference_displayIt() {
+        final SingleTargetGearPreference dockPreference = new SingleTargetGearPreference(
+                mContext, null /* AttributeSet */);
+
+        mPreConnectedDeviceController.onDeviceAdded(dockPreference);
+
+        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(2);
     }
 
     @Test
     public void onDeviceAdded_addFourDevicePreference_onlyDisplayThree() {
-        mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
-        mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
-        mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
-        mPreConnectedDeviceController.onDeviceAdded(new Preference(mContext));
+        final BluetoothDevicePreference preference1 = new BluetoothDevicePreference(
+                mContext, mCachedDevice1, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+        final BluetoothDevicePreference preference2 = new BluetoothDevicePreference(
+                mContext, mCachedDevice2, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+        final BluetoothDevicePreference preference3 = new BluetoothDevicePreference(
+                mContext, mCachedDevice3, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+        final BluetoothDevicePreference preference4 = new BluetoothDevicePreference(
+                mContext, mCachedDevice4, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+        final SingleTargetGearPreference dockPreference = new SingleTargetGearPreference(
+                mContext, null /* AttributeSet */);
 
-        assertThat(mPreferenceGroup.isVisible()).isTrue();
-        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(3);
+        mPreConnectedDeviceController.onDeviceAdded(preference1);
+        mPreConnectedDeviceController.onDeviceAdded(preference2);
+        mPreConnectedDeviceController.onDeviceAdded(preference3);
+        mPreConnectedDeviceController.onDeviceAdded(preference4);
+        mPreConnectedDeviceController.onDeviceAdded(dockPreference);
+
+        // 3 BluetoothDevicePreference and 1 see all preference
+        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(4);
     }
 
     @Test
-    public void onDeviceRemoved_removeLastDevice_setInvisible() {
-        final Preference preference = new Preference(mContext);
-        mPreferenceGroup.addPreference(preference);
-        mPreferenceGroup.setVisible(true);
+    public void onDeviceAdded_addPreferenceNotExistInRecentlyDevices_noCrash() {
+        final BluetoothDevicePreference preference = new BluetoothDevicePreference(
+                mContext, mCachedDevice5, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
 
-        mPreConnectedDeviceController.onDeviceRemoved(preference);
+        mPreConnectedDeviceController.onDeviceAdded(preference);
 
-        assertThat(mPreferenceGroup.isVisible()).isFalse();
-        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(0);
+        // 1 BluetoothDevicePreference and 1 see all preference
+        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(2);
+    }
+
+    @Test
+    public void onDeviceRemoved_removeLastDevice_showSeeAllPreference() {
+        final BluetoothDevicePreference preference1 = new BluetoothDevicePreference(
+                mContext, mCachedDevice1, true, BluetoothDevicePreference.SortType.TYPE_NO_SORT);
+        final SingleTargetGearPreference dockPreference = new SingleTargetGearPreference(
+                mContext, null /* AttributeSet */);
+        mPreferenceGroup.addPreference(preference1);
+        mPreferenceGroup.addPreference(dockPreference);
+
+        mPreConnectedDeviceController.onDeviceRemoved(preference1);
+        mPreConnectedDeviceController.onDeviceRemoved(dockPreference);
+
+        assertThat(mPreferenceGroup.getPreferenceCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void updatePreferenceVisibility_bluetoothIsEnable_shouldShowCorrectText() {
+        mShadowBluetoothAdapter.setEnabled(true);
+        mPreConnectedDeviceController.updatePreferenceVisibility();
+
+        verify(mSeeAllPreference).setSummary("");
+    }
+
+    @Test
+    public void updatePreferenceVisibility_bluetoothIsDisable_shouldShowCorrectText() {
+        mShadowBluetoothAdapter.setEnabled(false);
+        mPreConnectedDeviceController.updatePreferenceVisibility();
+
+        verify(mSeeAllPreference).setSummary(
+                mContext.getString(R.string.connected_device_see_all_summary));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java
index 14fe4bd..232bc16 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java
@@ -22,9 +22,12 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -46,6 +49,13 @@
         mController = new TopLevelConnectedDevicesPreferenceController(mContext, "test_key");
     }
 
+    @After
+    public void tearDown() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        }
+    }
+
     @Test
     public void getAvailibilityStatus_availableByDefault() {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
@@ -64,6 +74,13 @@
                 .isEqualTo(mContext.getText(R.string.settings_label_launcher));
     }
 
+    @Test
+    public void getSummary_silkyHomeEnabled_shouldBeNull() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+
+        assertThat(mController.getSummary()).isNull();
+    }
+
     @Implements(AdvancedConnectedDeviceController.class)
     private static class ShadowAdvancedConnectedDeviceController {
 
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
index 4e5897d..b816a18 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbBackendTest.java
@@ -181,4 +181,24 @@
 
         assertThat(usbBackend.areFunctionsSupported(UsbManager.FUNCTION_MTP)).isTrue();
     }
+
+    @Test
+    public void areFunctionsDisallowedByNonAdminUser_isAdminUser_returnFalse() {
+        when(mUserManager.isAdminUser()).thenReturn(true);
+
+        final UsbBackend usbBackend = new UsbBackend(mContext, mUserManager);
+
+        assertThat(usbBackend.areFunctionsDisallowedByNonAdminUser(
+                UsbManager.FUNCTION_RNDIS)).isFalse();
+    }
+
+    @Test
+    public void areFunctionsDisallowedByNonAdminUser_isNotAdminUser_returnTrue() {
+        when(mUserManager.isAdminUser()).thenReturn(false);
+
+        final UsbBackend usbBackend = new UsbBackend(mContext, mUserManager);
+
+        assertThat(usbBackend.areFunctionsDisallowedByNonAdminUser(
+                UsbManager.FUNCTION_RNDIS)).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
index 3a6eec0..3ea2756 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsFunctionsControllerTest.java
@@ -154,6 +154,19 @@
     }
 
     @Test
+    public void displayRefresh_accessoryEnabled_shouldCheckSwitches() {
+        when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
+
+        mDetailsFunctionsController.refresh(true, UsbManager.FUNCTION_ACCESSORY, POWER_ROLE_SINK,
+                DATA_ROLE_DEVICE);
+        List<RadioButtonPreference> prefs = getRadioPreferences();
+
+        assertThat(prefs.get(0).getKey())
+                .isEqualTo(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MTP));
+        assertThat(prefs.get(0).isChecked()).isTrue();
+    }
+
+    @Test
     public void onClickMtp_noneEnabled_shouldEnableMtp() {
         when(mUsbBackend.areFunctionsSupported(anyLong())).thenReturn(true);
 
@@ -251,6 +264,30 @@
     }
 
     @Test
+    public void onRadioButtonClicked_functionMtp_inAccessoryMode_doNothing() {
+        mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MTP));
+        doReturn(UsbManager.FUNCTION_ACCESSORY).when(mUsbBackend).getCurrentFunctions();
+
+        mDetailsFunctionsController.mPreviousFunction = UsbManager.FUNCTION_ACCESSORY;
+        mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+        assertThat(mDetailsFunctionsController.mPreviousFunction).isEqualTo(
+                UsbManager.FUNCTION_ACCESSORY);
+    }
+
+    @Test
+    public void onRadioButtonClicked_functionMtp_inAccessoryCombinationsMode_doNothing() {
+        final long function = UsbManager.FUNCTION_ACCESSORY | UsbManager.FUNCTION_AUDIO_SOURCE;
+        mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_MTP));
+        doReturn(UsbManager.FUNCTION_ACCESSORY).when(mUsbBackend).getCurrentFunctions();
+
+        mDetailsFunctionsController.mPreviousFunction = function;
+        mDetailsFunctionsController.onRadioButtonClicked(mRadioButtonPreference);
+
+        assertThat(mDetailsFunctionsController.mPreviousFunction).isEqualTo(function);
+    }
+
+    @Test
     public void onRadioButtonClicked_clickSameButton_doNothing() {
         mRadioButtonPreference.setKey(UsbBackend.usbFunctionsToString(UsbManager.FUNCTION_PTP));
         doReturn(UsbManager.FUNCTION_PTP).when(mUsbBackend).getCurrentFunctions();
diff --git a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java
index 2d1dc5c..817218e 100644
--- a/tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java
+++ b/tests/robotests/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java
@@ -28,13 +28,13 @@
 
 public class BasePreferenceControllerSignatureInspector extends CodeInspector {
 
-    private final List<String> grandfather;
+    private final List<String> mExemptList;
 
     public BasePreferenceControllerSignatureInspector(List<Class<?>> classes) {
         super(classes);
-        grandfather = new ArrayList<>();
-        initializeGrandfatherList(grandfather,
-                "grandfather_invalid_base_preference_controller_constructor");
+        mExemptList = new ArrayList<>();
+        initializeExemptList(mExemptList,
+                "exempt_invalid_base_preference_controller_constructor");
     }
 
     @Override
@@ -51,7 +51,7 @@
                 continue;
             }
             final String className = c.getName();
-            if (grandfather.remove(className)) {
+            if (mExemptList.remove(className)) {
                 continue;
             }
             final Constructor[] constructors = c.getDeclaredConstructors();
@@ -76,10 +76,10 @@
                 .that(badClasses.toString())
                 .isEmpty();
 
-        assertWithMessage("Something in the grandfather list is no longer relevant. Please remove"
+        assertWithMessage("Something in the exempt list is no longer relevant. Please remove"
             + "it from packages/apps/Settings/tests/robotests/assets/"
-            + "grandfather_invalid_base_preference_controller_constructor")
-                .that(grandfather)
+            + "exempt_invalid_base_preference_controller_constructor")
+                .that(mExemptList)
                 .isEmpty();
     }
 
diff --git a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
index 41e1ab1..4cde04b 100644
--- a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.core;
 
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
 import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_APPEND;
 import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
 import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEYWORDS;
@@ -38,7 +40,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
@@ -52,7 +53,7 @@
  * uncommon (such as summaryOn).
  *
  * If changing a preference file breaks a test in this test file, please replace its reference
- * with another preference with a matchin replacement attribute.
+ * with another preference with a matching replacement attribute.
  */
 @RunWith(RobolectricTestRunner.class)
 public class PreferenceXmlParserUtilsTest {
@@ -61,43 +62,43 @@
 
     @Before
     public void setUp() {
-        mContext = RuntimeEnvironment.application;
+        mContext = getApplicationContext();
     }
 
     @Test
     public void testDataTitleValid_ReturnsPreferenceTitle() {
         XmlResourceParser parser = getChildByType(R.xml.display_settings,
-                "com.android.settings.display.TimeoutListPreference");
+                "com.android.settings.display.darkmode.DarkModePreference");
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String title = PreferenceXmlParserUtils.getDataTitle(mContext, attrs);
-        String expTitle = mContext.getString(R.string.screen_timeout);
+        String expTitle = mContext.getString(R.string.dark_ui_mode);
         assertThat(title).isEqualTo(expTitle);
     }
 
     @Test
     public void testDataKeywordsValid_ReturnsPreferenceKeywords() {
         XmlResourceParser parser = getChildByType(R.xml.display_settings,
-                "com.android.settings.display.TimeoutListPreference");
+                "com.android.settings.display.darkmode.DarkModePreference");
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String keywords = PreferenceXmlParserUtils.getDataKeywords(mContext, attrs);
-        String expKeywords = mContext.getString(R.string.keywords_screen_timeout);
+        String expKeywords = mContext.getString(R.string.keywords_dark_ui_mode);
         assertThat(keywords).isEqualTo(expKeywords);
     }
 
     @Test
     public void testDataKeyValid_ReturnsPreferenceKey() {
         XmlResourceParser parser = getChildByType(R.xml.display_settings,
-                "com.android.settings.display.TimeoutListPreference");
+                "com.android.settings.display.darkmode.DarkModePreference");
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String key = PreferenceXmlParserUtils.getDataKey(mContext, attrs);
-        String expKey = "screen_timeout";
+        String expKey = "dark_ui_mode";
         assertThat(key).isEqualTo(expKey);
     }
 
     @Test
     public void testDataSummaryValid_ReturnsPreferenceSummary() {
-        XmlResourceParser parser = getChildByType(R.xml.display_settings,
-                "com.android.settings.display.TimeoutListPreference");
+        XmlResourceParser parser = getChildByType(R.xml.sound_settings,
+                "com.android.settings.DefaultRingtonePreference");
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String summary = PreferenceXmlParserUtils.getDataSummary(mContext, attrs);
         String expSummary = mContext.getString(R.string.summary_placeholder);
diff --git a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java
deleted file mode 100644
index a04ec37..0000000
--- a/tests/robotests/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.core;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.slices.SliceData;
-import com.android.settings.widget.SeekBarPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class SettingsSliderPreferenceControllerTest {
-
-    private FakeSliderPreferenceController mSliderController;
-
-    private SeekBarPreference mPreference;
-
-    @Before
-    public void setUp() {
-        mPreference = new SeekBarPreference(RuntimeEnvironment.application);
-        mSliderController = new FakeSliderPreferenceController(RuntimeEnvironment.application,
-                "key");
-
-        mPreference.setContinuousUpdates(true);
-        mPreference.setMin(mSliderController.getMin());
-        mPreference.setMax(mSliderController.getMax());
-    }
-
-    @Test
-    public void onPreferenceChange_updatesPosition() {
-        final int newValue = 28;
-
-        mSliderController.onPreferenceChange(mPreference, newValue);
-
-        assertThat(mSliderController.getSliderPosition()).isEqualTo(newValue);
-    }
-
-    @Test
-    public void updateState_setsPreferenceToCurrentValue() {
-        final int newValue = 28;
-        mSliderController.setSliderPosition(newValue);
-
-        mSliderController.updateState(mPreference);
-
-        assertThat(mPreference.getProgress()).isEqualTo(newValue);
-    }
-
-    @Test
-    public void testSliceType_returnsSliceType() {
-        assertThat(mSliderController.getSliceType()).isEqualTo(SliceData.SliceType.SLIDER);
-    }
-
-    private class FakeSliderPreferenceController extends SliderPreferenceController {
-
-        private final int MAX_STEPS = 2112;
-        private int mPosition;
-
-        private FakeSliderPreferenceController(Context context, String key) {
-            super(context, key);
-        }
-
-        @Override
-        public int getSliderPosition() {
-            return mPosition;
-        }
-
-        @Override
-        public boolean setSliderPosition(int position) {
-            mPosition = position;
-            return true;
-        }
-
-        @Override
-        public int getMax() {
-            return MAX_STEPS;
-        }
-
-        @Override
-        public int getMin() {
-            return 0;
-        }
-
-        @Override
-        public int getAvailabilityStatus() {
-            return AVAILABLE;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.java
deleted file mode 100644
index 541f0c4..0000000
--- a/tests/robotests/src/com/android/settings/core/TogglePreferenceControllerTest.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.core;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.slices.SliceData;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class TogglePreferenceControllerTest {
-
-    private FakeToggle mToggleController;
-
-    private Context mContext;
-    private SwitchPreference mPreference;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new SwitchPreference(mContext);
-        mToggleController = new FakeToggle(mContext, "key");
-    }
-
-    @Test
-    public void testSetsPreferenceValue_setsChecked() {
-        mToggleController.setChecked(true);
-        mPreference.setChecked(false);
-
-        mToggleController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void testSetsPreferenceValue_setsNotChecked() {
-        mToggleController.setChecked(false);
-        mPreference.setChecked(true);
-
-        mToggleController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void testUpdatesPreferenceOnChange_turnsOn() {
-        boolean newValue = true;
-        mToggleController.setChecked(!newValue);
-
-        mToggleController.onPreferenceChange(mPreference, newValue);
-
-        assertThat(mToggleController.isChecked()).isEqualTo(newValue);
-    }
-
-    @Test
-    public void testUpdatesPreferenceOnChange_turnsOff() {
-        boolean newValue = false;
-        mToggleController.setChecked(!newValue);
-
-        mToggleController.onPreferenceChange(mPreference, newValue);
-
-        assertThat(mToggleController.isChecked()).isEqualTo(newValue);
-    }
-
-    @Test
-    public void testSliceType_returnsSliceType() {
-        assertThat(mToggleController.getSliceType()).isEqualTo(
-                SliceData.SliceType.SWITCH);
-    }
-
-    @Test
-    public void isSliceable_returnTrue() {
-        assertThat(mToggleController.isSliceable()).isTrue();
-    }
-
-    @Test
-    public void isPublicSlice_returnFalse() {
-        assertThat(mToggleController.isPublicSlice()).isFalse();
-    }
-
-    private static class FakeToggle extends TogglePreferenceController {
-
-        private boolean checkedFlag;
-
-        private FakeToggle(Context context, String preferenceKey) {
-            super(context, preferenceKey);
-        }
-
-        @Override
-        public boolean isChecked() {
-            return checkedFlag;
-        }
-
-        @Override
-        public boolean setChecked(boolean isChecked) {
-            checkedFlag = isChecked;
-            return true;
-        }
-
-        @Override
-        public int getAvailabilityStatus() {
-            return AVAILABLE;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
index da234a1..5a62f74 100644
--- a/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
+++ b/tests/robotests/src/com/android/settings/core/XmlControllerAttributeTest.java
@@ -35,7 +35,7 @@
 public class XmlControllerAttributeTest {
 
     // List of XML that could be retrieved from the illegalClasses list.
-    private final List<Integer> whitelistXml = Arrays.asList(R.xml.security_dashboard_settings);
+    private final List<Integer> mAllowlistXml = Arrays.asList(R.xml.security_dashboard_settings);
 
     private static final String NO_VALID_CONSTRUCTOR_ERROR =
             "Controllers added in XML need a constructor following either:"
@@ -62,7 +62,7 @@
     @Test
     public void testAllIndexableXML_onlyValidBasePreferenceControllersAdded() throws Exception {
         Set<Integer> xmlSet = getIndexableXml();
-        xmlSet.addAll(whitelistXml);
+        xmlSet.addAll(mAllowlistXml);
 
         List<String> xmlControllers = new ArrayList<>();
         Set<String> invalidConstructors = new HashSet<>();
diff --git a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
index d8869ea..48833c6 100644
--- a/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/codeinspection/CodeInspector.java
@@ -48,13 +48,13 @@
      */
     public abstract void run();
 
-    protected void assertNoObsoleteInGrandfatherList(String listName, List<String> list) {
-        final StringBuilder obsoleteGrandfatherItems = new StringBuilder(listName)
-            .append(" contains item that should not be grandfathered.\n");
+    protected void assertNoObsoleteInExemptList(String listName, List<String> list) {
+        final StringBuilder obsoleteExemptItems = new StringBuilder(listName).append(
+                " contains item that should not be exempted.\n");
         for (String c : list) {
-            obsoleteGrandfatherItems.append(c).append("\n");
+            obsoleteExemptItems.append(c).append("\n");
         }
-        assertWithMessage(obsoleteGrandfatherItems.toString()).that(list).isEmpty();
+        assertWithMessage(obsoleteExemptItems.toString()).that(list).isEmpty();
     }
 
     protected boolean isConcreteSettingsClass(Class clazz) {
@@ -78,16 +78,16 @@
         return true;
     }
 
-    public static void initializeGrandfatherList(List<String> grandfather, String filename) {
+    public static void initializeExemptList(List<String> exemptList, String filename) {
         try {
             final InputStream in = RuntimeEnvironment.application.getAssets().open(filename);
             BufferedReader reader = new BufferedReader(new InputStreamReader(in));
             String line;
             while ((line = reader.readLine()) != null) {
-                grandfather.add(line);
+                exemptList.add(line);
             }
         } catch (Exception e) {
-            throw new IllegalArgumentException("Error initializing grandfather " + filename, e);
+            throw new IllegalArgumentException("Error initializing exempt list " + filename, e);
         }
     }
 }
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
index 9480e6d..8f650ea 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
@@ -34,13 +34,13 @@
  */
 public class InstrumentableFragmentCodeInspector extends CodeInspector {
 
-    private final List<String> grandfather_notImplementingInstrumentable;
+    private final List<String> mNotImplementingInstrumentableExemptList;
 
     public InstrumentableFragmentCodeInspector(List<Class<?>> classes) {
         super(classes);
-        grandfather_notImplementingInstrumentable = new ArrayList<>();
-        initializeGrandfatherList(grandfather_notImplementingInstrumentable,
-                "grandfather_not_implementing_instrumentable");
+        mNotImplementingInstrumentableExemptList = new ArrayList<>();
+        initializeExemptList(mNotImplementingInstrumentableExemptList,
+                "exempt_not_implementing_instrumentable");
     }
 
     @Override
@@ -53,11 +53,11 @@
             }
             final String className = clazz.getName();
             // If it's a fragment, it must also be instrumentable.
-            final boolean whitelisted =
-                    grandfather_notImplementingInstrumentable.remove(className);
+            final boolean allowlisted =
+                    mNotImplementingInstrumentableExemptList.remove(className);
             if (Fragment.class.isAssignableFrom(clazz)
                     && !Instrumentable.class.isAssignableFrom(clazz)
-                    && !whitelisted) {
+                    && !allowlisted) {
                 broken.add(className);
             }
         }
@@ -67,7 +67,7 @@
             sb.append(c).append("\n");
         }
         assertWithMessage(sb.toString()).that(broken.isEmpty()).isTrue();
-        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_instrumentable",
-                grandfather_notImplementingInstrumentable);
+        assertNoObsoleteInExemptList("exempt_not_implementing_instrumentable",
+                mNotImplementingInstrumentableExemptList);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
index 9b1c411..a6bd865 100644
--- a/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
+++ b/tests/robotests/src/com/android/settings/core/instrumentation/MetricsFeatureProviderTest.java
@@ -47,6 +47,6 @@
         MetricsFeatureProvider feature2 =
                 FeatureFactory.getFactory(mContext).getMetricsFeatureProvider();
 
-        assertThat(feature1).isSameAs(feature2);
+        assertThat(feature1).isSameInstanceAs(feature2);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java b/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
deleted file mode 100644
index 64eaad5..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/CategoryManagerTest.java
+++ /dev/null
@@ -1,337 +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.dashboard;
-
-import static com.android.settingslib.drawer.CategoryKey.CATEGORY_HOMEPAGE;
-import static com.android.settingslib.drawer.TileUtils.META_DATA_KEY_ORDER;
-import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_KEYHINT;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ProviderInfo;
-import android.os.Bundle;
-import android.util.Pair;
-
-import com.android.settingslib.drawer.ActivityTile;
-import com.android.settingslib.drawer.CategoryKey;
-import com.android.settingslib.drawer.DashboardCategory;
-import com.android.settingslib.drawer.ProviderTile;
-import com.android.settingslib.drawer.Tile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@RunWith(RobolectricTestRunner.class)
-public class CategoryManagerTest {
-
-    private ActivityInfo mActivityInfo;
-    private Context mContext;
-    private CategoryManager mCategoryManager;
-    private Map<Pair<String, String>, Tile> mTileByComponentCache;
-    private Map<String, DashboardCategory> mCategoryByKeyMap;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mActivityInfo = new ActivityInfo();
-        mActivityInfo.packageName = "pkg";
-        mActivityInfo.name = "class";
-        mActivityInfo.applicationInfo = new ApplicationInfo();
-        mTileByComponentCache = new HashMap<>();
-        mCategoryByKeyMap = new HashMap<>();
-        mCategoryManager = CategoryManager.get(mContext);
-    }
-
-    @Test
-    public void getInstance_shouldBeSingleton() {
-        assertThat(mCategoryManager).isSameAs(CategoryManager.get(mContext));
-    }
-
-    @Test
-    public void backwardCompatCleanupForCategory_shouldNotChangeCategoryForNewKeys() {
-        final Tile tile1 = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_ACCOUNT);
-        final Tile tile2 = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_ACCOUNT);
-        final DashboardCategory category = new DashboardCategory(CategoryKey.CATEGORY_ACCOUNT);
-        category.addTile(tile1);
-        category.addTile(tile2);
-        mCategoryByKeyMap.put(CategoryKey.CATEGORY_ACCOUNT, category);
-        mTileByComponentCache.put(new Pair<>("PACKAGE", "1"), tile1);
-        mTileByComponentCache.put(new Pair<>("PACKAGE", "2"), tile2);
-
-        mCategoryManager.backwardCompatCleanupForCategory(mTileByComponentCache, mCategoryByKeyMap);
-
-        assertThat(mCategoryByKeyMap.size()).isEqualTo(1);
-        assertThat(mCategoryByKeyMap.get(CategoryKey.CATEGORY_ACCOUNT)).isNotNull();
-    }
-
-    @Test
-    public void backwardCompatCleanupForCategory_shouldNotChangeCategoryForMixedKeys() {
-        final Tile tile1 = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_ACCOUNT);
-        final String oldCategory = "com.android.settings.category.wireless";
-        final Tile tile2 = new ActivityTile(mActivityInfo, oldCategory);
-        final DashboardCategory category1 = new DashboardCategory(CategoryKey.CATEGORY_ACCOUNT);
-        category1.addTile(tile1);
-        final DashboardCategory category2 = new DashboardCategory(oldCategory);
-        category2.addTile(tile2);
-        mCategoryByKeyMap.put(CategoryKey.CATEGORY_ACCOUNT, category1);
-        mCategoryByKeyMap.put(oldCategory, category2);
-        mTileByComponentCache.put(new Pair<>("PACKAGE", "CLASS1"), tile1);
-        mTileByComponentCache.put(new Pair<>("PACKAGE", "CLASS2"), tile2);
-
-        mCategoryManager.backwardCompatCleanupForCategory(mTileByComponentCache, mCategoryByKeyMap);
-
-        assertThat(mCategoryByKeyMap.size()).isEqualTo(2);
-        assertThat(
-                mCategoryByKeyMap.get(CategoryKey.CATEGORY_ACCOUNT).getTilesCount()).isEqualTo(1);
-        assertThat(mCategoryByKeyMap.get(oldCategory).getTilesCount()).isEqualTo(1);
-    }
-
-    @Test
-    public void backwardCompatCleanupForCategory_shouldChangeCategoryForOldKeys() {
-        final String oldCategory = "com.android.settings.category.wireless";
-        final Tile tile1 = new ActivityTile(mActivityInfo, oldCategory);
-        tile1.setCategory(oldCategory);
-        final DashboardCategory category1 = new DashboardCategory(oldCategory);
-        category1.addTile(tile1);
-        mCategoryByKeyMap.put(oldCategory, category1);
-        mTileByComponentCache.put(new Pair<>("PACKAGE", "CLASS1"), tile1);
-
-        mCategoryManager.backwardCompatCleanupForCategory(mTileByComponentCache, mCategoryByKeyMap);
-
-        // Added 1 more category to category map.
-        assertThat(mCategoryByKeyMap.size()).isEqualTo(2);
-        // The new category map has CATEGORY_NETWORK type now, which contains 1 tile.
-        assertThat(
-                mCategoryByKeyMap.get(CategoryKey.CATEGORY_NETWORK).getTilesCount()).isEqualTo(1);
-        // Old category still exists.
-        assertThat(mCategoryByKeyMap.get(oldCategory).getTilesCount()).isEqualTo(1);
-    }
-
-    @Test
-    public void sortCategories_singlePackage_shouldReorderBasedOnPriority() {
-        // Create some fake tiles that are not sorted.
-        final String testPackage = "com.android.test";
-        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
-        final Tile tile1 = createActivityTile(category.key, testPackage, "class1", 100);
-        final Tile tile2 = createActivityTile(category.key, testPackage, "class2", 50);
-        final Tile tile3 = createActivityTile(category.key, testPackage, "class3", 200);
-        category.addTile(tile1);
-        category.addTile(tile2);
-        category.addTile(tile3);
-        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
-
-        // Sort their priorities
-        mCategoryManager.sortCategories(RuntimeEnvironment.application, mCategoryByKeyMap);
-
-        // Verify they are now sorted.
-        assertThat(category.getTile(0)).isSameAs(tile3);
-        assertThat(category.getTile(1)).isSameAs(tile1);
-        assertThat(category.getTile(2)).isSameAs(tile2);
-    }
-
-    @Test
-    public void sortCategories_multiPackage_shouldReorderBasedOnPackageAndPriority() {
-        // Create some fake tiles that are not sorted.
-        final String testPackage1 = "com.android.test1";
-        final String testPackage2 = "com.android.test2";
-        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
-        final Tile tile1 = createActivityTile(category.key, testPackage2, "class1", 100);
-        final Tile tile2 = createActivityTile(category.key, testPackage1, "class2", 100);
-        final Tile tile3 = createActivityTile(category.key, testPackage1, "class3", 50);
-        category.addTile(tile1);
-        category.addTile(tile2);
-        category.addTile(tile3);
-        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
-
-        // Sort their priorities
-        mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
-
-        // Verify they are now sorted.
-        assertThat(category.getTile(0)).isSameAs(tile2);
-        assertThat(category.getTile(1)).isSameAs(tile1);
-        assertThat(category.getTile(2)).isSameAs(tile3);
-    }
-
-    @Test
-    public void sortCategories_internalPackageTiles_shouldSkipTileForInternalPackage() {
-        // Create some fake tiles that are not sorted.
-        final String testPackage = mContext.getPackageName();
-        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
-        final Tile tile1 = createActivityTile(category.key, testPackage, "class1", 100);
-        final Tile tile2 = createActivityTile(category.key, testPackage, "class2", 100);
-        final Tile tile3 = createActivityTile(category.key, testPackage, "class3", 50);
-        category.addTile(tile1);
-        category.addTile(tile2);
-        category.addTile(tile3);
-        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
-
-        // Sort their priorities
-        mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
-
-        // Verify the sorting order is not changed
-        assertThat(category.getTile(0)).isSameAs(tile1);
-        assertThat(category.getTile(1)).isSameAs(tile2);
-        assertThat(category.getTile(2)).isSameAs(tile3);
-    }
-
-    @Test
-    public void sortCategories_internalAndExternalPackageTiles_shouldRetainPriorityOrdering() {
-        // Inject one external tile among internal tiles.
-        final String testPackage = mContext.getPackageName();
-        final String testPackage2 = "com.google.test2";
-        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
-        final Tile tile1 = createActivityTile(category.key, testPackage, "class1", 2);
-        final Tile tile2 = createActivityTile(category.key, testPackage, "class2", 1);
-        final Tile tile3 = createActivityTile(category.key, testPackage2, "class0", 0);
-        final Tile tile4 = createActivityTile(category.key, testPackage, "class3", -1);
-        category.addTile(tile1);
-        category.addTile(tile2);
-        category.addTile(tile3);
-        category.addTile(tile4);
-        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
-
-        // Sort their priorities
-        mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
-
-        // Verify the sorting order is not changed
-        assertThat(category.getTile(0)).isSameAs(tile1);
-        assertThat(category.getTile(1)).isSameAs(tile2);
-        assertThat(category.getTile(2)).isSameAs(tile3);
-        assertThat(category.getTile(3)).isSameAs(tile4);
-    }
-
-    @Test
-    public void sortCategories_samePriority_internalPackageTileShouldTakePrecedence() {
-        // Inject one external tile among internal tiles with same priority.
-        final String testPackage = mContext.getPackageName();
-        final String testPackage2 = "com.google.test2";
-        final String testPackage3 = "com.abcde.test3";
-        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
-        final Tile tile1 = createActivityTile(category.key, testPackage2, "class1", 1);
-        final Tile tile2 = createActivityTile(category.key, testPackage, "class2", 1);
-        final Tile tile3 = createActivityTile(category.key, testPackage3, "class3", 1);
-        category.addTile(tile1);
-        category.addTile(tile2);
-        category.addTile(tile3);
-        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
-
-        // Sort their priorities
-        mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
-
-        // Verify the sorting order is internal first, follow by package name ordering
-        assertThat(category.getTile(0)).isSameAs(tile2);
-        assertThat(category.getTile(1)).isSameAs(tile3);
-        assertThat(category.getTile(2)).isSameAs(tile1);
-    }
-
-    @Test
-    public void filterTiles_noDuplicate_noChange() {
-        // Create some unique tiles
-        final String testPackage = mContext.getPackageName();
-        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
-        final Tile tile1 = createActivityTile(category.key, testPackage, "class1", 100);
-        final Tile tile2 = createActivityTile(category.key, testPackage, "class2", 100);
-        final Tile tile3 = createActivityTile(category.key, testPackage, "class3", 50);
-        final Tile tile4 = createProviderTile(category.key, testPackage, "class1", "authority1",
-                "key1", 100);
-        final Tile tile5 = createProviderTile(category.key, testPackage, "class1", "authority2",
-                "key2", 100);
-        final Tile tile6 = createProviderTile(category.key, testPackage, "class1", "authority1",
-                "key2", 50);
-        category.addTile(tile1);
-        category.addTile(tile2);
-        category.addTile(tile3);
-        category.addTile(tile4);
-        category.addTile(tile5);
-        category.addTile(tile6);
-        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
-
-        mCategoryManager.filterDuplicateTiles(mCategoryByKeyMap);
-
-        assertThat(category.getTilesCount()).isEqualTo(6);
-    }
-
-    @Test
-    public void filterTiles_hasDuplicateActivityTiles_shouldOnlyKeepUniqueTiles() {
-        // Create tiles pointing to same intent.
-        final String testPackage = mContext.getPackageName();
-        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
-        final Tile tile1 = createActivityTile(category.key, testPackage, "class1", 100);
-        final Tile tile2 = createActivityTile(category.key, testPackage, "class1", 100);
-        final Tile tile3 = createActivityTile(category.key, testPackage, "class1", 50);
-        category.addTile(tile1);
-        category.addTile(tile2);
-        category.addTile(tile3);
-        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
-
-        mCategoryManager.filterDuplicateTiles(mCategoryByKeyMap);
-
-        assertThat(category.getTilesCount()).isEqualTo(1);
-    }
-
-    @Test
-    public void filterTiles_hasDuplicateProviderTiles_shouldOnlyKeepUniqueTiles() {
-        // Create tiles pointing to same authority and key.
-        final String testPackage = mContext.getPackageName();
-        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
-        final Tile tile1 = createProviderTile(category.key, testPackage, "class1", "authority1",
-                "key1", 100);
-        final Tile tile2 = createProviderTile(category.key, testPackage, "class2", "authority1",
-                "key1", 100);
-        final Tile tile3 = createProviderTile(category.key, testPackage, "class3", "authority1",
-                "key1", 50);
-        category.addTile(tile1);
-        category.addTile(tile2);
-        category.addTile(tile3);
-        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
-
-        mCategoryManager.filterDuplicateTiles(mCategoryByKeyMap);
-
-        assertThat(category.getTilesCount()).isEqualTo(1);
-    }
-
-    private Tile createActivityTile(String categoryKey, String packageName, String className,
-            int order) {
-        final ActivityInfo activityInfo = new ActivityInfo();
-        activityInfo.packageName = packageName;
-        activityInfo.name = className;
-        activityInfo.metaData = new Bundle();
-        activityInfo.metaData.putInt(META_DATA_KEY_ORDER, order);
-        return new ActivityTile(activityInfo, categoryKey);
-    }
-
-    private Tile createProviderTile(String categoryKey, String packageName, String className,
-            String authority, String key, int order) {
-        final ProviderInfo providerInfo = new ProviderInfo();
-        final Bundle metaData = new Bundle();
-        providerInfo.packageName = packageName;
-        providerInfo.name = className;
-        providerInfo.authority = authority;
-        metaData.putString(META_DATA_PREFERENCE_KEYHINT, key);
-        metaData.putInt(META_DATA_KEY_ORDER, order);
-        return new ProviderTile(providerInfo, categoryKey, metaData);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index 3f2b7c3..36bc376 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -21,6 +21,8 @@
 import static com.android.settingslib.drawer.SwitchesProvider.EXTRA_SWITCH_SET_CHECKED_ERROR;
 import static com.android.settingslib.drawer.TileUtils.META_DATA_KEY_ORDER;
 import static com.android.settingslib.drawer.TileUtils.META_DATA_KEY_PROFILE;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_ICON_URI;
 import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_KEYHINT;
 import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SUMMARY;
 import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_SWITCH_URI;
@@ -48,10 +50,13 @@
 import android.content.pm.ProviderInfo;
 import android.content.pm.ResolveInfo;
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
 import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.util.FeatureFlagUtils;
+import android.util.Pair;
 
 import androidx.fragment.app.FragmentActivity;
 import androidx.preference.Preference;
@@ -60,6 +65,8 @@
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowTileUtils;
 import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -70,6 +77,7 @@
 import com.android.settingslib.drawer.Tile;
 import com.android.settingslib.drawer.TileUtils;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -141,6 +149,13 @@
         mImpl = new DashboardFeatureProviderImpl(mContext);
     }
 
+    @After
+    public void tearDown() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        }
+    }
+
     @Test
     public void shouldHoldAppContext() {
         assertThat(mImpl.mContext).isEqualTo(mContext.getApplicationContext());
@@ -401,20 +416,78 @@
     }
 
     @Test
-    @Config(shadows = {ShadowTileUtils.class})
-    public void bindPreference_withIconUri_shouldLoadIconFromContentProvider() {
+    public void bindIcon_withStaticIcon_shouldLoadStaticIcon() {
         final Preference preference = new Preference(RuntimeEnvironment.application);
         mActivityInfo.packageName = RuntimeEnvironment.application.getPackageName();
         final Tile tile = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
         mActivityInfo.metaData.putString(META_DATA_PREFERENCE_KEYHINT, "key");
-        mActivityInfo.metaData.putString(TileUtils.META_DATA_PREFERENCE_ICON_URI,
+        mActivityInfo.metaData.putInt(META_DATA_PREFERENCE_ICON, R.drawable.ic_add_40dp);
+
+        mImpl.bindIcon(preference, tile, false /* forceRoundedIcon */);
+
+        final Bitmap preferenceBmp = Utils.createIconWithDrawable(preference.getIcon()).getBitmap();
+        final Drawable staticIcon = Icon.createWithResource(mActivityInfo.packageName,
+                R.drawable.ic_add_40dp).loadDrawable(preference.getContext());
+        final Bitmap staticIconBmp = Utils.createIconWithDrawable(staticIcon).getBitmap();
+        assertThat(preferenceBmp.sameAs(staticIconBmp)).isTrue();
+    }
+
+    @Test
+    @Config(shadows = {ShadowTileUtils.class})
+    public void bindIcon_withIconUri_shouldLoadIconFromContentProvider() {
+        final Preference preference = new Preference(RuntimeEnvironment.application);
+        mActivityInfo.packageName = RuntimeEnvironment.application.getPackageName();
+        final Tile tile = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
+        mActivityInfo.metaData.putString(META_DATA_PREFERENCE_KEYHINT, "key");
+        mActivityInfo.metaData.putString(META_DATA_PREFERENCE_ICON_URI,
                 "content://com.android.settings/tile_icon");
+
         mImpl.bindIcon(preference, tile, false /* forceRoundedIcon */);
 
         assertThat(preference.getIcon()).isNotNull();
     }
 
     @Test
+    @Config(shadows = {ShadowTileUtils.class})
+    public void bindIcon_withStaticIconAndIconUri_shouldLoadIconFromContentProvider() {
+        final Preference preference = new Preference(RuntimeEnvironment.application);
+        mActivityInfo.packageName = RuntimeEnvironment.application.getPackageName();
+        final Tile tile = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
+        mActivityInfo.metaData.putString(META_DATA_PREFERENCE_KEYHINT, "key");
+        mActivityInfo.metaData.putInt(META_DATA_PREFERENCE_ICON, R.drawable.ic_add_40dp);
+        mActivityInfo.metaData.putString(META_DATA_PREFERENCE_ICON_URI,
+                "content://com.android.settings/tile_icon");
+
+        mImpl.bindIcon(preference, tile, false /* forceRoundedIcon */);
+
+        final Bitmap preferenceBmp = Utils.createIconWithDrawable(preference.getIcon()).getBitmap();
+        final Drawable staticIcon = Icon.createWithResource(mActivityInfo.packageName,
+                R.drawable.ic_add_40dp).loadDrawable(preference.getContext());
+        final Bitmap staticIconBmp = Utils.createIconWithDrawable(staticIcon).getBitmap();
+        assertThat(preferenceBmp.sameAs(staticIconBmp)).isFalse();
+
+        final Pair<String, Integer> iconInfo = TileUtils.getIconFromUri(
+                mContext, "pkg", null /* uri */, null /* providerMap */);
+        final Drawable iconFromUri = Icon.createWithResource(iconInfo.first, iconInfo.second)
+                .loadDrawable(preference.getContext());
+        final Bitmap iconBmpFromUri = Utils.createIconWithDrawable(iconFromUri).getBitmap();
+        assertThat(preferenceBmp.sameAs(iconBmpFromUri)).isTrue();
+    }
+
+    @Test
+    @Config(shadows = {ShadowTileUtils.class})
+    public void bindIcon_noIcon_shouldNotLoadIcon() {
+        final Preference preference = new Preference(RuntimeEnvironment.application);
+        mActivityInfo.packageName = RuntimeEnvironment.application.getPackageName();
+        final Tile tile = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
+        mActivityInfo.metaData.putString(META_DATA_PREFERENCE_KEYHINT, "key");
+
+        mImpl.bindIcon(preference, tile, false /* forceRoundedIcon */);
+
+        assertThat(preference.getIcon()).isNull();
+    }
+
+    @Test
     public void bindPreference_withBaseOrder_shouldOffsetOrder() {
         final int baseOrder = 100;
         final Preference preference = new Preference(RuntimeEnvironment.application);
@@ -583,4 +656,55 @@
                 .startActivityForResultAsUser(any(Intent.class), anyInt(), any(UserHandle.class));
         verify(mActivity).getSupportFragmentManager();
     }
+
+    @Test
+    public void openTileIntent_profileSelectionDialog_unresolvableWorkProfileIntentShouldNotShow() {
+        final int userId = 10;
+        ShadowUserManager.getShadow().addUser(userId, "Someone", 0);
+        final UserHandle userHandle = new UserHandle(userId);
+        final Tile tile = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
+        final ArrayList<UserHandle> handles = new ArrayList<>();
+        handles.add(new UserHandle(0));
+        handles.add(userHandle);
+        tile.userHandle = handles;
+        when(mPackageManager.resolveActivityAsUser(any(Intent.class), anyInt(), eq(0)))
+                .thenReturn(new ResolveInfo());
+        when(mPackageManager.resolveActivityAsUser(any(Intent.class), anyInt(), eq(userId)))
+                .thenReturn(null);
+
+        mImpl.openTileIntent(mActivity, tile);
+
+        final ArgumentCaptor<UserHandle> argument = ArgumentCaptor.forClass(UserHandle.class);
+        verify(mActivity)
+                .startActivityForResultAsUser(any(Intent.class), anyInt(), argument.capture());
+        assertThat(argument.getValue().getIdentifier()).isEqualTo(0);
+        verify(mActivity, never()).getSupportFragmentManager();
+    }
+
+    @Test
+    public void bindPreference_silkyHomeEnabled_shouldNotBindHomepageTileSummary() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+        final Preference preference = new Preference(RuntimeEnvironment.application);
+        final Tile tile = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
+
+        mImpl.bindPreferenceToTileAndGetObservers(mActivity, mForceRoundedIcon,
+                MetricsEvent.VIEW_UNKNOWN, preference, tile, null /*key */,
+                Preference.DEFAULT_ORDER);
+
+        assertThat(preference.getSummary()).isNull();
+    }
+
+    @Test
+    public void bindPreference_silkyHomeEnabled_shouldBindSubpageTileSummary() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+        final Preference preference = new Preference(RuntimeEnvironment.application);
+        final Tile tile = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_SYSTEM);
+
+        mImpl.bindPreferenceToTileAndGetObservers(mActivity, mForceRoundedIcon,
+                MetricsEvent.VIEW_UNKNOWN, preference, tile, null /*key */,
+                Preference.DEFAULT_ORDER);
+
+        assertThat(preference.getSummary()).isEqualTo(
+                mContext.getText(R.string.about_settings_summary));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java
deleted file mode 100644
index 10aaad8..0000000
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.dashboard;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.android.settings.accounts.AccountDashboardFragment;
-import com.android.settingslib.drawer.CategoryKey;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class DashboardFragmentRegistryTest {
-    @Test
-    public void pageAndKeyShouldHave1to1Mapping() {
-        assertThat(DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP.size())
-                .isEqualTo(DashboardFragmentRegistry.PARENT_TO_CATEGORY_KEY_MAP.size());
-    }
-
-    @Test
-    public void accountDetailCategoryShouldRedirectToAccountDashboardFragment() {
-        final String fragment = DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP.get(
-                CategoryKey.CATEGORY_ACCOUNT_DETAIL);
-
-        assertThat(fragment).isEqualTo(AccountDashboardFragment.class.getName());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
index 6103b2b..24d4d33 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
@@ -24,7 +24,6 @@
 import com.android.settings.core.PreferenceControllerListHelper;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.DatabaseIndexingUtils;
-import com.android.settingslib.search.Indexable;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import org.robolectric.RuntimeEnvironment;
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
index e70578e..efc7263 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java
@@ -50,7 +50,7 @@
 import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.slices.BlockingSlicePrefController;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.AbstractPreferenceController;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
@@ -129,7 +129,7 @@
         final TestPreferenceController retrievedController = mTestFragment.use
                 (TestPreferenceController.class);
 
-        assertThat(controller).isSameAs(retrievedController);
+        assertThat(controller).isSameInstanceAs(retrievedController);
     }
 
     @Test
@@ -142,7 +142,7 @@
         final TestPreferenceController retrievedController = mTestFragment.use
                 (TestPreferenceController.class);
 
-        assertThat(controller1).isSameAs(retrievedController);
+        assertThat(controller1).isSameInstanceAs(retrievedController);
     }
 
     @Test
@@ -327,12 +327,12 @@
     }
 
     @Test
-    public void createPreference_isActivityTileAndHasSwitch_returnMasterSwitchPreference() {
+    public void createPreference_isActivityTileAndHasSwitch_returnPrimarySwitchPreference() {
         mActivityTile.getMetaData().putString(META_DATA_PREFERENCE_SWITCH_URI, "uri");
 
         final Preference pref = mTestFragment.createPreference(mActivityTile);
 
-        assertThat(pref).isInstanceOf(MasterSwitchPreference.class);
+        assertThat(pref).isInstanceOf(PrimarySwitchPreference.class);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
deleted file mode 100644
index 5efeaf2..0000000
--- a/tests/robotests/src/com/android/settings/datausage/AppPrefLoaderTest.java
+++ /dev/null
@@ -1,82 +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.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.graphics.drawable.Drawable;
-import android.util.ArraySet;
-
-import androidx.preference.Preference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class AppPrefLoaderTest {
-
-    @Mock
-    private PackageManager mPackageManager;
-
-    private AppPrefLoader mLoader;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        final ArraySet<String> pkgs = new ArraySet<>(2);
-        pkgs.add("pkg0");
-        pkgs.add("pkg1");
-        mLoader = new AppPrefLoader(RuntimeEnvironment.application, pkgs, mPackageManager);
-    }
-
-    @Test
-    public void loadInBackground_packageNotFound_shouldReturnEmptySet()
-            throws NameNotFoundException {
-        when(mPackageManager.getApplicationInfo(anyString(), anyInt()))
-            .thenThrow(new NameNotFoundException());
-
-        assertThat(mLoader.loadInBackground()).isEmpty();
-    }
-
-    @Test
-    public void loadInBackground_shouldReturnPreference() throws NameNotFoundException {
-        ApplicationInfo info = mock(ApplicationInfo.class);
-        when(mPackageManager.getApplicationInfo(anyString(), anyInt())).thenReturn(info);
-        final Drawable drawable = mock(Drawable.class);
-        final String label = "Label1";
-        when(info.loadIcon(mPackageManager)).thenReturn(drawable);
-        when(info.loadLabel(mPackageManager)).thenReturn(label);
-
-        Preference preference = mLoader.loadInBackground().valueAt(0);
-        assertThat(preference.getTitle()).isEqualTo(label);
-        assertThat(preference.getIcon()).isEqualTo(drawable);
-        assertThat(preference.isSelectable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java
deleted file mode 100644
index c0b12dc..0000000
--- a/tests/robotests/src/com/android/settings/datausage/CellDataPreferenceTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-
-import android.content.Context;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.LinearLayout;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.network.ProxySubscriptionManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class CellDataPreferenceTest {
-
-    @Mock
-    private ProxySubscriptionManager mProxySubscriptionMgr;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private SubscriptionInfo mSubInfo;
-
-    private Context mContext;
-    private PreferenceViewHolder mHolder;
-    private CellDataPreference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        mPreference = new CellDataPreference(mContext, null) {
-            @Override
-            ProxySubscriptionManager getProxySubscriptionManager() {
-                return mProxySubscriptionMgr;
-            }
-            @Override
-            SubscriptionInfo getActiveSubscriptionInfo(int subId) {
-                return mSubInfo;
-            }
-        };
-        doNothing().when(mSubscriptionManager).setDefaultDataSubId(anyInt());
-        doReturn(mSubscriptionManager).when(mProxySubscriptionMgr).get();
-        doNothing().when(mProxySubscriptionMgr).addActiveSubscriptionsListener(any());
-        doNothing().when(mProxySubscriptionMgr).removeActiveSubscriptionsListener(any());
-
-        final LayoutInflater inflater = LayoutInflater.from(mContext);
-        final View view = inflater.inflate(mPreference.getLayoutResource(),
-                new LinearLayout(mContext), false);
-
-        mHolder = PreferenceViewHolder.createInstanceForTests(view);
-    }
-
-    @Test
-    public void noActiveSub_shouldDisable() {
-        mSubInfo = null;
-        mPreference.mOnSubscriptionsChangeListener.onChanged();
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void hasActiveSub_shouldEnable() {
-        mPreference.mOnSubscriptionsChangeListener.onChanged();
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
index 8881b49..aab67be 100644
--- a/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/ChartDataUsagePreferenceTest.java
@@ -124,7 +124,7 @@
             tonight - TimeUnit.DAYS.toMillis(2), tonight - TimeUnit.DAYS.toMillis(1), 83849690L));
         mNetworkCycleData.add(createNetworkCycleData(
             tonight - TimeUnit.DAYS.toMillis(1), tonight, 1883657L));
-        // add dummy usage data for next 5 days
+        // add test usage data for next 5 days
         mNetworkCycleData.add(createNetworkCycleData(
             tonight, tonight + TimeUnit.DAYS.toMillis(1), 0L));
         mNetworkCycleData.add(createNetworkCycleData(
@@ -149,7 +149,7 @@
 
         verify(usageView).addPath(pointsCaptor.capture());
         final SparseIntArray points = pointsCaptor.getValue();
-        // should only have 7 points: 1 dummy point indicating the start of data, starting point 0,
+        // should only have 7 points: 1 test point indicating the start of data, starting point 0,
         // and 5 actual data point for each day
         assertThat(points.size()).isEqualTo(7);
         assertThat(points.keyAt(0)).isEqualTo(-1);
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
deleted file mode 100644
index 6c89201..0000000
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package com.android.settings.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.net.NetworkPolicy;
-import android.net.NetworkTemplate;
-
-import com.android.settingslib.net.DataUsageController.DataUsageInfo;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class DataUsageInfoControllerTest {
-
-    private static final int NEGATIVE = -1;
-    private static final int ZERO = 0;
-    private static final int POSITIVE_SMALL = 1;
-    private static final int POSITIVE_LARGE = 5;
-
-    private DataUsageInfoController mInfoController;
-    private DataUsageInfo info;
-
-    @Before
-    public void setUp()  {
-        mInfoController = new DataUsageInfoController();
-        info = new DataUsageInfo();
-    }
-
-    @Test
-    public void testLowUsageLowWarning_LimitUsed() {
-        info.warningLevel = POSITIVE_SMALL;
-        info.limitLevel = POSITIVE_LARGE;
-        info.usageLevel = POSITIVE_SMALL;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.limitLevel);
-    }
-
-    @Test
-    public void testLowUsageEqualWarning_LimitUsed() {
-        info.warningLevel = POSITIVE_LARGE;
-        info.limitLevel = POSITIVE_LARGE;
-        info.usageLevel = POSITIVE_SMALL;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.limitLevel);
-    }
-
-    @Test
-    public void testNoLimitNoUsage_WarningUsed() {
-        info.warningLevel = POSITIVE_LARGE;
-        info.limitLevel = ZERO;
-        info.usageLevel = ZERO;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.warningLevel);
-    }
-
-    @Test
-    public void testNoLimitLowUsage_WarningUsed() {
-        info.warningLevel = POSITIVE_LARGE;
-        info.limitLevel = ZERO;
-        info.usageLevel = POSITIVE_SMALL;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.warningLevel);
-    }
-
-    @Test
-    public void testLowWarningNoLimit_UsageUsed() {
-        info.warningLevel = POSITIVE_SMALL;
-        info.limitLevel = ZERO;
-        info.usageLevel = POSITIVE_LARGE;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.usageLevel);
-    }
-
-    @Test
-    public void testLowWarningLowLimit_UsageUsed() {
-        info.warningLevel = POSITIVE_SMALL;
-        info.limitLevel = POSITIVE_SMALL;
-        info.usageLevel = POSITIVE_LARGE;
-        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.usageLevel);
-    }
-
-    private NetworkPolicy getDefaultNetworkPolicy() {
-        NetworkTemplate template =
-            new NetworkTemplate(NetworkTemplate.MATCH_WIFI_WILDCARD, null, null);
-        int cycleDay  = -1;
-        String cycleTimezone = "UTC";
-        long warningBytes = -1;
-        long limitBytes = -1;
-        return new NetworkPolicy(template, cycleDay, cycleTimezone, warningBytes, limitBytes, true);
-    }
-
-    @Test
-    public void testNullArguments_NoError() {
-        mInfoController.updateDataLimit(null, null);
-        mInfoController.updateDataLimit(info, null);
-        mInfoController.updateDataLimit(null, getDefaultNetworkPolicy());
-    }
-
-    @Test
-    public void testNegativeWarning_UpdatedToZero() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = NEGATIVE;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.warningLevel).isEqualTo(ZERO);
-    }
-
-    @Test
-    public void testWarningZero_UpdatedToZero() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = ZERO;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.warningLevel).isEqualTo(ZERO);
-    }
-
-    @Test
-    public void testWarningPositive_UpdatedToWarning() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.warningBytes = POSITIVE_SMALL;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.warningLevel).isEqualTo(policy.warningBytes);
-    }
-
-    @Test
-    public void testLimitNegative_UpdatedToZero() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = NEGATIVE;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.limitLevel).isEqualTo(ZERO);
-    }
-
-    @Test
-    public void testLimitZero_UpdatedToZero() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = ZERO;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.limitLevel).isEqualTo(ZERO);
-    }
-
-    @Test
-    public void testLimitPositive_UpdatedToLimit() {
-        NetworkPolicy policy = getDefaultNetworkPolicy();
-        policy.limitBytes = POSITIVE_SMALL;
-        mInfoController.updateDataLimit(info, policy);
-        assertThat(info.limitLevel).isEqualTo(policy.limitBytes);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
index 210f0fd7..4a5bc70 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java
@@ -184,9 +184,10 @@
         CharSequence value = captor.getValue();
         assertThat(value.toString()).isEqualTo("512 MB data warning / 1.00 GB data limit");
 
+        // TODO (b/170330084): return intent instead of null for mSummaryPreference
         verify(mSummaryPreference).setUsageInfo((info.cycleEnd / 1000) * 1000,
                 now - UPDATE_BACKOFF_MS,
-                CARRIER_NAME, 1 /* numPlans */, intent);
+                CARRIER_NAME, 1 /* numPlans */, null /* launchIntent */);
         verify(mSummaryPreference).setChartEnabled(true);
         verify(mSummaryPreference).setWifiMode(false /* isWifiMode */, null /* usagePeriod */,
                 false /* isSingleWifi */);
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
deleted file mode 100644
index 35e6b1d..0000000
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
+++ /dev/null
@@ -1,562 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.datausage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.graphics.Typeface;
-import android.net.ConnectivityManager;
-import android.net.NetworkTemplate;
-import android.os.Bundle;
-import android.telephony.SubscriptionManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.SubSettings;
-import com.android.settingslib.Utils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.Shadows;
-import org.robolectric.shadows.ShadowActivity;
-
-import java.util.concurrent.TimeUnit;
-
-@RunWith(RobolectricTestRunner.class)
-public class DataUsageSummaryPreferenceTest {
-
-    private static final long CYCLE_DURATION_MILLIS = 1000000000L;
-    private static final long UPDATE_LAG_MILLIS = 10000000L;
-    private static final String DUMMY_CARRIER = "z-mobile";
-
-    private Activity mActivity;
-    private PreferenceViewHolder mHolder;
-    private DataUsageSummaryPreference mSummaryPreference;
-    private TextView mUsageTitle;
-    private TextView mCycleTime;
-    private TextView mCarrierInfo;
-    private TextView mDataLimits;
-    private TextView mDataUsed;
-    private TextView mDataRemaining;
-    private Button mLaunchButton;
-    private LinearLayout mLabelBar;
-    private TextView mLabel1;
-    private TextView mLabel2;
-    private ProgressBar mProgressBar;
-
-    private long mCycleEnd;
-    private long mUpdateTime;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mActivity = spy(Robolectric.setupActivity(Activity.class));
-        mSummaryPreference = new DataUsageSummaryPreference(mActivity, null /* attrs */);
-        LayoutInflater inflater = LayoutInflater.from(mActivity);
-        View view = inflater.inflate(mSummaryPreference.getLayoutResource(), null /* root */,
-                false /* attachToRoot */);
-
-        mHolder = spy(PreferenceViewHolder.createInstanceForTests(view));
-
-        final long now = System.currentTimeMillis();
-        mCycleEnd = now + CYCLE_DURATION_MILLIS;
-        mUpdateTime = now - UPDATE_LAG_MILLIS;
-    }
-
-    @Test
-    public void testSetUsageInfo_withLaunchIntent_launchButtonShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mLaunchButton.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void testSetUsageInfo_withoutLaunchIntent_launchButtonNotShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
-                null /* launchIntent */);
-
-        bindViewHolder();
-        assertThat(mLaunchButton.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testSetUsageInfo_withDataPlans_carrierInfoShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mCarrierInfo.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void testSetUsageInfo_withNoDataPlans_carrierInfoNotShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mCarrierInfo.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testCarrierUpdateTime_shouldFormatDaysCorrectly() {
-        int baseUnit = 2;
-        int smudge = 6;
-        final long updateTime = System.currentTimeMillis()
-                - TimeUnit.DAYS.toMillis(baseUnit) - TimeUnit.HOURS.toMillis(smudge);
-        mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mCarrierInfo.getText().toString())
-                .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " days ago");
-    }
-
-    @Test
-    public void testCarrierUpdateTime_shouldFormatHoursCorrectly() {
-        int baseUnit = 2;
-        int smudge = 6;
-        final long updateTime = System.currentTimeMillis()
-                - TimeUnit.HOURS.toMillis(baseUnit) - TimeUnit.MINUTES.toMillis(smudge);
-        mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mCarrierInfo.getText().toString())
-                .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " hr ago");
-    }
-
-    @Test
-    public void testCarrierUpdateTime_shouldFormatMinutesCorrectly() {
-        int baseUnit = 2;
-        int smudge = 6;
-        final long updateTime = System.currentTimeMillis()
-                - TimeUnit.MINUTES.toMillis(baseUnit) - TimeUnit.SECONDS.toMillis(smudge);
-        mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mCarrierInfo.getText().toString())
-                .isEqualTo("Updated by " + DUMMY_CARRIER + " " + baseUnit + " min ago");
-    }
-
-    @Test
-    public void testCarrierUpdateTime_shouldFormatLessThanMinuteCorrectly() {
-        final long updateTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(45);
-        mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mCarrierInfo.getText().toString())
-                .isEqualTo("Updated by " + DUMMY_CARRIER + " just now");
-    }
-
-    @Test
-    public void testCarrierUpdateTimeWithNoCarrier_shouldSayJustNow() {
-        final long updateTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(45);
-        mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, null /* carrier */,
-                1 /* numPlans */, new Intent());
-
-        bindViewHolder();
-        assertThat(mCarrierInfo.getText().toString())
-                .isEqualTo("Updated just now");
-    }
-
-    @Test
-    public void testCarrierUpdateTimeWithNoCarrier_shouldFormatTime() {
-        final long updateTime = System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(2);
-        mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, null /* carrier */,
-                1 /* numPlans */, new Intent());
-
-        bindViewHolder();
-        assertThat(mCarrierInfo.getText().toString())
-                .isEqualTo("Updated 2 min ago");
-    }
-
-    @Test
-    public void setUsageInfo_withRecentCarrierUpdate_doesNotSetCarrierInfoWarningColorAndFont() {
-        final long updateTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(1);
-        mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mCarrierInfo.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mCarrierInfo.getCurrentTextColor()).isEqualTo(
-                Utils.getColorAttrDefaultColor(mActivity, android.R.attr.textColorSecondary));
-        assertThat(mCarrierInfo.getTypeface()).isEqualTo(Typeface.SANS_SERIF);
-    }
-
-    @Test
-    public void testSetUsageInfo_withStaleCarrierUpdate_setsCarrierInfoWarningColorAndFont() {
-        final long updateTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(7);
-        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, DUMMY_CARRIER, 1 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mCarrierInfo.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mCarrierInfo.getCurrentTextColor()).isEqualTo(
-                Utils.getColorAttrDefaultColor(mActivity, android.R.attr.colorError));
-        assertThat(mCarrierInfo.getTypeface()).isEqualTo(
-                DataUsageSummaryPreference.SANS_SERIF_MEDIUM);
-    }
-
-    @Test
-    public void testSetUsageInfo_withNoDataPlans_usageTitleNotShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mUsageTitle.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testSetUsageInfo_withMultipleDataPlans_usageTitleShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 2 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mUsageTitle.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void testSetUsageInfo_cycleRemainingTimeIsLessOneDay() {
-        // just under one day
-        final long cycleEnd = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(23);
-        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mCycleTime.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mCycleTime.getText()).isEqualTo(
-                mActivity.getString(R.string.billing_cycle_less_than_one_day_left));
-    }
-
-    @Test
-    public void testSetUsageInfo_cycleRemainingTimeNegativeDaysLeft_shouldDisplayNoneLeft() {
-        final long cycleEnd = System.currentTimeMillis() - 1L;
-        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mCycleTime.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mCycleTime.getText()).isEqualTo(
-                mActivity.getString(R.string.billing_cycle_none_left));
-    }
-
-    @Test
-    public void testSetUsageInfo_cycleRemainingTimeDaysLeft_shouldUsePlurals() {
-        final int daysLeft = 3;
-        final long cycleEnd = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(daysLeft)
-                + TimeUnit.HOURS.toMillis(1);
-        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
-                new Intent());
-
-        bindViewHolder();
-        assertThat(mCycleTime.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mCycleTime.getText()).isEqualTo(daysLeft + " days left");
-    }
-
-    @Test
-    public void testSetLimitInfo_withLimitInfo_dataLimitsShown() {
-        final String limitText = "test limit text";
-        mSummaryPreference.setLimitInfo(limitText);
-
-        bindViewHolder();
-        assertThat(mDataLimits.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mDataLimits.getText()).isEqualTo(limitText);
-    }
-
-    @Test
-    public void testSetLimitInfo_withNullLimitInfo_dataLimitsNotShown() {
-        mSummaryPreference.setLimitInfo(null);
-
-        bindViewHolder();
-        assertThat(mDataLimits.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testSetLimitInfo_withEmptyLimitInfo_dataLimitsNotShown() {
-        final String emptyLimitText = "";
-        mSummaryPreference.setLimitInfo(emptyLimitText);
-
-        bindViewHolder();
-        assertThat(mDataLimits.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testSetChartEnabledFalse_hidesLabelBar() {
-        setValidLabels();
-        mSummaryPreference.setChartEnabled(false);
-
-        bindViewHolder();
-        assertThat(mLabelBar.getVisibility()).isEqualTo(View.GONE);
-        assertThat(mProgressBar.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testSetEmptyLabels_hidesLabelBar() {
-        mSummaryPreference.setLabels("", "");
-
-        bindViewHolder();
-        assertThat(mLabelBar.getVisibility()).isEqualTo(View.GONE);
-        assertThat(mProgressBar.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testLabelBar_isVisible_whenLabelsSet() {
-        setValidLabels();
-        //mChartEnabled defaults to true
-
-        bindViewHolder();
-        assertThat(mLabelBar.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mProgressBar.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
-    public void testSetProgress_updatesProgressBar() {
-        setValidLabels();
-        mSummaryPreference.setProgress(.5f);
-
-        bindViewHolder();
-        assertThat(mProgressBar.getProgress()).isEqualTo(50);
-    }
-
-    private void setValidLabels() {
-        mSummaryPreference.setLabels("0.0 GB", "5.0 GB");
-    }
-
-    @Test
-    public void testSetUsageAndRemainingInfo_withUsageInfo_dataUsageAndRemainingShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */,
-                new Intent());
-        mSummaryPreference.setUsageNumbers(
-                BillingCycleSettings.MIB_IN_BYTES,
-                10 * BillingCycleSettings.MIB_IN_BYTES,
-                true /* hasMobileData */);
-
-        bindViewHolder();
-        assertThat(mDataUsed.getText().toString()).isEqualTo("1.00 MB used");
-        assertThat(mDataRemaining.getText().toString()).isEqualTo("9.00 MB left");
-        assertThat(mDataRemaining.getVisibility()).isEqualTo(View.VISIBLE);
-        final int colorId = Utils.getColorAttrDefaultColor(mActivity, android.R.attr.colorAccent);
-        assertThat(mDataRemaining.getCurrentTextColor()).isEqualTo(colorId);
-    }
-
-    @Test
-    public void testSetUsageInfo_withDataOverusage() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */,
-                new Intent());
-        mSummaryPreference.setUsageNumbers(
-                11 * BillingCycleSettings.MIB_IN_BYTES,
-                10 * BillingCycleSettings.MIB_IN_BYTES,
-                true /* hasMobileData */);
-
-        bindViewHolder();
-        assertThat(mDataUsed.getText().toString()).isEqualTo("11.00 MB used");
-        assertThat(mDataRemaining.getText().toString()).isEqualTo("1.00 MB over");
-        final int colorId = Utils.getColorAttrDefaultColor(mActivity, android.R.attr.colorError);
-        assertThat(mDataRemaining.getCurrentTextColor()).isEqualTo(colorId);
-    }
-
-    @Test
-    public void testSetUsageInfo_withUsageInfo_dataUsageShown() {
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
-                new Intent());
-        mSummaryPreference.setUsageNumbers(
-                BillingCycleSettings.MIB_IN_BYTES, -1L, true /* hasMobileData */);
-
-        bindViewHolder();
-        assertThat(mDataUsed.getText().toString()).isEqualTo("1.00 MB used");
-        assertThat(mDataRemaining.getText()).isEqualTo("");
-    }
-
-    @Test
-    public void testSetAppIntent_toMdpApp_intentCorrect() {
-        final FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
-        final Intent intent = new Intent(SubscriptionManager.ACTION_MANAGE_SUBSCRIPTION_PLANS);
-        intent.setPackage("test-owner.example.com");
-        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, 42);
-
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
-                intent);
-
-        bindViewHolder();
-        assertThat(mLaunchButton.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mLaunchButton.getText())
-                .isEqualTo(mActivity.getString(R.string.launch_mdp_app_text));
-
-        mLaunchButton.callOnClick();
-        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
-        Intent startedIntent = shadowActivity.getNextStartedActivity();
-        assertThat(startedIntent.getAction())
-                .isEqualTo(SubscriptionManager.ACTION_MANAGE_SUBSCRIPTION_PLANS);
-        assertThat(startedIntent.getPackage()).isEqualTo("test-owner.example.com");
-        assertThat(startedIntent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, -1))
-                .isEqualTo(42);
-    }
-
-    @Test
-    public void testSetUsageInfo_withOverflowStrings_dataRemainingNotShown() {
-        LayoutInflater inflater = LayoutInflater.from(mActivity);
-        View view = inflater.inflate(mSummaryPreference.getLayoutResource(), null /* root */,
-                false /* attachToRoot */);
-
-        TextView dataUsed = spy(new TextView(mActivity));
-        TextView dataRemaining = spy(new TextView(mActivity));
-        doReturn(dataUsed).when(mHolder).findViewById(R.id.data_usage_view);
-        doReturn(dataRemaining).when(mHolder).findViewById(R.id.data_remaining_view);
-
-        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, DUMMY_CARRIER, 1 /* numPlans */,
-                new Intent());
-        mSummaryPreference.setUsageNumbers(
-                BillingCycleSettings.MIB_IN_BYTES,
-                10 * BillingCycleSettings.MIB_IN_BYTES,
-                true /* hasMobileData */);
-
-        when(mActivity.getResources()).thenCallRealMethod();
-        when(mActivity.getText(R.string.data_used_formatted))
-                .thenReturn("^1 ^2 used with long trailing text");
-        when(mActivity.getText(R.string.data_remaining)).thenReturn("^1 left");
-
-        bindViewHolder();
-
-        doReturn(500).when(dataUsed).getMeasuredWidth();
-        doReturn(500).when(dataRemaining).getMeasuredWidth();
-
-        assertThat(dataRemaining.getVisibility()).isEqualTo(View.VISIBLE);
-
-        MeasurableLinearLayout layout =
-                (MeasurableLinearLayout) mHolder.findViewById(R.id.usage_layout);
-        layout.measure(
-                View.MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.EXACTLY),
-                View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
-
-        assertThat(dataUsed.getText().toString()).isEqualTo("1.00 MB used with long trailing text");
-        assertThat(dataRemaining.getVisibility()).isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void testSetWifiMode_withUsageInfo_dataUsageShown() {
-        final int daysLeft = 3;
-        final long cycleEnd = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(daysLeft)
-                + TimeUnit.HOURS.toMillis(1);
-        final FragmentActivity activity = Robolectric.setupActivity(FragmentActivity.class);
-        mSummaryPreference = spy(mSummaryPreference);
-        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, DUMMY_CARRIER, 0 /* numPlans */,
-                new Intent());
-        mSummaryPreference.setUsageNumbers(1000000L, -1L, true);
-        final String cycleText = "The quick fox";
-        mSummaryPreference.setWifiMode(true /* isWifiMode */, cycleText, false /* isSingleWifi */);
-        doReturn(200L).when(mSummaryPreference).getHistoricalUsageLevel();
-
-        bindViewHolder();
-        assertThat(mUsageTitle.getText().toString())
-                .isEqualTo(mActivity.getString(R.string.data_usage_wifi_title));
-        assertThat(mUsageTitle.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mCycleTime.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mCycleTime.getText()).isEqualTo(cycleText);
-        assertThat(mCarrierInfo.getVisibility()).isEqualTo(View.GONE);
-        assertThat(mDataLimits.getVisibility()).isEqualTo(View.GONE);
-        assertThat(mLaunchButton.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(mLaunchButton.getText())
-                .isEqualTo(mActivity.getString(R.string.launch_wifi_text));
-
-        mLaunchButton.callOnClick();
-        ShadowActivity shadowActivity = Shadows.shadowOf(activity);
-        Intent startedIntent = shadowActivity.getNextStartedActivity();
-        assertThat(startedIntent.getComponent()).isEqualTo(new ComponentName("com.android.settings",
-                SubSettings.class.getName()));
-
-        final Bundle expect = new Bundle(1);
-        expect.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE,
-                NetworkTemplate.buildTemplateWifiWildcard());
-        final Bundle actual = startedIntent
-                .getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
-        assertThat((NetworkTemplate) actual.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE))
-                .isEqualTo(NetworkTemplate.buildTemplateWifiWildcard());
-
-        assertThat(startedIntent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
-                .isEqualTo(R.string.wifi_data_usage);
-    }
-
-    @Test
-    public void testSetWifiMode_noUsageInfo_shouldDisableLaunchButton() {
-        mSummaryPreference = spy(mSummaryPreference);
-        mSummaryPreference.setWifiMode(true /* isWifiMode */, "Test cycle text",
-                false /* isSingleWifi */);
-        doReturn(0L).when(mSummaryPreference).getHistoricalUsageLevel();
-
-        bindViewHolder();
-
-        assertThat(mLaunchButton.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void launchWifiDataUsage_shouldSetWifiNetworkTypeInIntentExtra() {
-        mSummaryPreference.launchWifiDataUsage(mActivity);
-
-        final Intent launchIntent = Shadows.shadowOf(mActivity).getNextStartedActivity();
-        final Bundle args =
-            launchIntent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
-
-        assertThat(args.getInt(DataUsageList.EXTRA_NETWORK_TYPE))
-            .isEqualTo(ConnectivityManager.TYPE_WIFI);
-    }
-
-    private void bindViewHolder() {
-        mSummaryPreference.onBindViewHolder(mHolder);
-        mUsageTitle = (TextView) mHolder.findViewById(R.id.usage_title);
-        mCycleTime = (TextView) mHolder.findViewById(R.id.cycle_left_time);
-        mCarrierInfo = (TextView) mHolder.findViewById(R.id.carrier_and_update);
-        mDataLimits = (TextView) mHolder.findViewById(R.id.data_limits);
-        mDataUsed = spy((TextView) mHolder.findViewById(R.id.data_usage_view));
-        mDataRemaining = spy((TextView) mHolder.findViewById(R.id.data_remaining_view));
-        mLaunchButton = (Button) mHolder.findViewById(R.id.launch_mdp_app_button);
-        mLabelBar = (LinearLayout) mHolder.findViewById(R.id.label_bar);
-        mLabel1 = (TextView) mHolder.findViewById(R.id.text1);
-        mLabel2 = (TextView) mHolder.findViewById(R.id.text2);
-        mProgressBar = (ProgressBar) mHolder.findViewById(R.id.determinateBar);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
new file mode 100644
index 0000000..0758869
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datetime/LocationTimeZoneDetectionPreferenceControllerTest.java
@@ -0,0 +1,121 @@
+/*
+ * 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.datetime;
+
+import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;
+import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_SUPPORTED;
+import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.time.TimeManager;
+import android.app.time.TimeZoneCapabilities;
+import android.app.time.TimeZoneCapabilitiesAndConfig;
+import android.app.time.TimeZoneConfiguration;
+import android.content.Context;
+import android.location.LocationManager;
+import android.os.UserHandle;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class LocationTimeZoneDetectionPreferenceControllerTest {
+    @Mock
+    private TimeManager mTimeManager;
+    @Mock
+    private LocationManager mLocationManager;
+    private Context mContext;
+    private LocationTimeZoneDetectionPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getSystemService(TimeManager.class)).thenReturn(mTimeManager);
+        when(mContext.getSystemService(LocationManager.class)).thenReturn(mLocationManager);
+        mController = new LocationTimeZoneDetectionPreferenceController(mContext, "key");
+    }
+
+    @Test
+    public void testLocationTimeZoneDetection_supported_shouldBeShown() {
+        TimeZoneCapabilities capabilities =
+                createTimeZoneCapabilities(/* geoDetectionSupported= */ true);
+        TimeZoneConfiguration configuration = createTimeZoneConfig(/* geoDetectionEnabled= */ true);
+        TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
+                new TimeZoneCapabilitiesAndConfig(capabilities, configuration);
+        when(mTimeManager.getTimeZoneCapabilitiesAndConfig()).thenReturn(capabilitiesAndConfig);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void testLocationTimeZoneDetection_unsupported_shouldNotBeShown() {
+        TimeZoneCapabilities capabilities =
+                createTimeZoneCapabilities(/* geoDetectionSupported= */ false);
+        TimeZoneConfiguration configuration = createTimeZoneConfig(/* geoDetectionEnabled= */ true);
+        TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
+                new TimeZoneCapabilitiesAndConfig(capabilities, configuration);
+        when(mTimeManager.getTimeZoneCapabilitiesAndConfig()).thenReturn(capabilitiesAndConfig);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    /**
+     * Tests that the summary is set in just one of many cases. Exhaustive testing would be brittle.
+     */
+    @Test
+    public void testLocationTimeZoneDetection_summary_geoDetectionEnabled() {
+        TimeZoneCapabilities capabilities =
+                createTimeZoneCapabilities(/* geoDetectionSupported= */ true);
+        TimeZoneConfiguration configuration = createTimeZoneConfig(/* geoDetectionEnabled= */ true);
+        TimeZoneCapabilitiesAndConfig capabilitiesAndConfig =
+                new TimeZoneCapabilitiesAndConfig(capabilities, configuration);
+
+        when(mTimeManager.getTimeZoneCapabilitiesAndConfig()).thenReturn(capabilitiesAndConfig);
+        assertThat(mController.getSummary()).isEqualTo(
+                mContext.getString(R.string.location_time_zone_detection_on));
+    }
+
+    private static TimeZoneCapabilities createTimeZoneCapabilities(boolean geoDetectionSupported) {
+        UserHandle arbitraryUserHandle = UserHandle.of(123);
+        int geoDetectionCapability =
+                geoDetectionSupported ? CAPABILITY_POSSESSED : CAPABILITY_NOT_SUPPORTED;
+        return new TimeZoneCapabilities.Builder(arbitraryUserHandle)
+                .setConfigureAutoDetectionEnabledCapability(CAPABILITY_POSSESSED)
+                .setConfigureGeoDetectionEnabledCapability(geoDetectionCapability)
+                .setSuggestManualTimeZoneCapability(CAPABILITY_NOT_APPLICABLE)
+                .build();
+    }
+
+    private static TimeZoneConfiguration createTimeZoneConfig(boolean geoDetectionEnabled) {
+        return new TimeZoneConfiguration.Builder()
+                .setAutoDetectionEnabled(true)
+                .setGeoDetectionEnabled(geoDetectionEnabled)
+                .build();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java
new file mode 100644
index 0000000..9f16492
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionSettingsTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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.datetime.locationtimezone;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class TimeZoneDetectionSettingsTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void searchProvider_shouldIndexDefaultXml() {
+        final List<SearchIndexableResource> sir =
+                TimeZoneDetectionSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        mContext, /* enabled= */ true);
+
+        assertThat(sir).hasSize(1);
+        assertThat(sir.get(0).xmlResId).isEqualTo(R.xml.location_time_zone_detection);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java
new file mode 100644
index 0000000..27a9859
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/datetime/locationtimezone/TimeZoneDetectionTogglePreferenceControllerTest.java
@@ -0,0 +1,119 @@
+/*
+ * 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.datetime.locationtimezone;
+
+import static android.app.time.TimeZoneCapabilities.CAPABILITY_NOT_APPLICABLE;
+import static android.app.time.TimeZoneCapabilities.CAPABILITY_POSSESSED;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.time.TimeManager;
+import android.app.time.TimeZoneCapabilities;
+import android.app.time.TimeZoneCapabilitiesAndConfig;
+import android.app.time.TimeZoneConfiguration;
+import android.content.Context;
+import android.os.UserHandle;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class TimeZoneDetectionTogglePreferenceControllerTest {
+
+    private static final String PREF_KEY = "test_key";
+
+    @Mock
+    private Context mContext;
+
+    @Mock
+    private TimeManager mTimeManager;
+    private TimeZoneDetectionTogglePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(TimeManager.class)).thenReturn(mTimeManager);
+
+        mController = new TimeZoneDetectionTogglePreferenceController(mContext, PREF_KEY);
+    }
+
+    @Test
+    public void isAvailable_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isChecked_whenEnabled_shouldReturnTrue() {
+        when(mTimeManager.getTimeZoneCapabilitiesAndConfig())
+                .thenReturn(createTimeZoneCapabilitiesAndConfig(true));
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_whenDisabled_shouldReturnFalse() {
+        when(mTimeManager.getTimeZoneCapabilitiesAndConfig())
+                .thenReturn(createTimeZoneCapabilitiesAndConfig(false));
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_withTrue_shouldUpdateSetting() {
+        // Simulate the UI being clicked.
+        mController.setChecked(true);
+
+        // Verify the TimeManager was updated with the UI value.
+        TimeZoneConfiguration expectedConfiguration = new TimeZoneConfiguration.Builder()
+                .setGeoDetectionEnabled(true)
+                .build();
+        verify(mTimeManager).updateTimeZoneConfiguration(expectedConfiguration);
+    }
+
+    @Test
+    public void setChecked_withFalse_shouldUpdateSetting() {
+        // Simulate the UI being clicked.
+        mController.setChecked(false);
+
+        // Verify the TimeManager was updated with the UI value.
+        TimeZoneConfiguration expectedConfiguration = new TimeZoneConfiguration.Builder()
+                .setGeoDetectionEnabled(false)
+                .build();
+        verify(mTimeManager).updateTimeZoneConfiguration(expectedConfiguration);
+    }
+
+    private static TimeZoneCapabilitiesAndConfig createTimeZoneCapabilitiesAndConfig(
+            boolean geoDetectionEnabled) {
+        UserHandle arbitraryUserHandle = UserHandle.of(123);
+        TimeZoneCapabilities capabilities = new TimeZoneCapabilities.Builder(arbitraryUserHandle)
+                .setConfigureAutoDetectionEnabledCapability(CAPABILITY_POSSESSED)
+                .setConfigureGeoDetectionEnabledCapability(CAPABILITY_POSSESSED)
+                .setSuggestManualTimeZoneCapability(CAPABILITY_NOT_APPLICABLE)
+                .build();
+        TimeZoneConfiguration configuration = new TimeZoneConfiguration.Builder()
+                .setAutoDetectionEnabled(true)
+                .setGeoDetectionEnabled(geoDetectionEnabled)
+                .build();
+        return new TimeZoneCapabilitiesAndConfig(capabilities, configuration);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
index 1207621..eef88f2 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/FixedOffsetPickerTest.java
@@ -23,11 +23,10 @@
 
 import android.content.Context;
 
+import com.android.i18n.timezone.CountryZonesFinder;
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
 import com.android.settings.datetime.timezone.model.TimeZoneData;
 
-import libcore.timezone.CountryZonesFinder;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
index c0553a5..78055cf 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/RegionSearchPickerTest.java
@@ -28,13 +28,12 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 
+import com.android.i18n.timezone.CountryZonesFinder;
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.AdapterItem;
 import com.android.settings.datetime.timezone.BaseTimeZoneAdapter.ItemViewHolder;
 import com.android.settings.datetime.timezone.RegionSearchPicker.RegionItem;
 import com.android.settings.datetime.timezone.model.TimeZoneData;
 
-import libcore.timezone.CountryZonesFinder;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java
deleted file mode 100644
index dd734bb..0000000
--- a/tests/robotests/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime.timezone;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.icu.text.Collator;
-
-import com.android.settings.datetime.timezone.RegionZonePicker.TimeZoneInfoComparator;
-import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class RegionZonePickerTest {
-
-    @Test
-    public void compareTimeZoneInfo_matchGmtOrder() {
-        Date now = new Date(0); // 00:00 1, Jan 1970
-        Formatter formatter = new Formatter(Locale.US, now);
-        TimeZoneInfo timeZone1 = formatter.format("Pacific/Honolulu");
-        TimeZoneInfo timeZone2 = formatter.format("America/Los_Angeles");
-        TimeZoneInfo timeZone3 = formatter.format("America/Indiana/Marengo");
-        TimeZoneInfo timeZone4 = formatter.format("America/New_York");
-
-        TimeZoneInfoComparator comparator =
-                new TimeZoneInfoComparator(Collator.getInstance(Locale.US), now);
-
-        // Verify the sorted order
-        List<TimeZoneInfo> list = Arrays.asList(timeZone4, timeZone2, timeZone3, timeZone1);
-        Collections.sort(list, comparator);
-        assertThat(list).isEqualTo(Arrays.asList(timeZone1, timeZone2, timeZone3, timeZone4));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
deleted file mode 100644
index 563bf8d..0000000
--- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime.timezone;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
-import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.Date;
-import java.util.Locale;
-
-@RunWith(RobolectricTestRunner.class)
-public class TimeZoneInfoPreferenceControllerTest {
-
-    private TimeZoneInfo mTimeZoneInfo;
-    private TimeZoneInfoPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        final Context context = RuntimeEnvironment.application;
-        final Date now = new Date(0L); // 00:00 1/1/1970
-        final Formatter formatter = new Formatter(Locale.US, now);
-        mTimeZoneInfo = formatter.format("America/Los_Angeles");
-        mController = new TimeZoneInfoPreferenceController(context, "key");
-        mController.mDate = now;
-        mController.setTimeZoneInfo(mTimeZoneInfo);
-    }
-
-    @Test
-    public void getSummary_matchExpectedFormattedText() {
-        assertThat(mController.getSummary().toString()).isEqualTo(
-                "Uses Pacific Time (GMT-08:00). "
-                        + "Pacific Daylight Time starts on April 26, 1970.");
-    }
-
-    @Test
-    public void getAvailabilityStatus_timeZoneInfoSet_shouldReturnAVAILABLE_UNSEARCHABLE() {
-        mController.setTimeZoneInfo(mTimeZoneInfo);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_noTimeZoneInfoSet_shouldReturnUNSUPPORTED_ON_DEVICE() {
-        mController.setTimeZoneInfo(null);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java
deleted file mode 100644
index fd8b81f..0000000
--- a/tests/robotests/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.datetime.timezone;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Date;
-import java.util.Locale;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class TimeZoneInfoTest {
-
-    @Test
-    public void testFormat() {
-        Date now = new Date(0L); // 00:00 1/1/1970
-        Formatter formatter = new Formatter(Locale.US, now);
-
-        TimeZoneInfo timeZoneInfo = formatter.format("America/Los_Angeles");
-        assertThat(timeZoneInfo.getId()).isEqualTo("America/Los_Angeles");
-        assertThat(timeZoneInfo.getExemplarLocation()).isEqualTo("Los Angeles");
-        assertThat(timeZoneInfo.getGmtOffset().toString()).isEqualTo("GMT-08:00");
-        assertThat(timeZoneInfo.getGenericName()).isEqualTo("Pacific Time");
-        assertThat(timeZoneInfo.getStandardName()).isEqualTo("Pacific Standard Time");
-        assertThat(timeZoneInfo.getDaylightName()).isEqualTo("Pacific Daylight Time");
-    }
-
-    @Test
-    public void getGmtOffset_zoneLordHowe_correctGmtOffset() {
-        Date date = new Date(1514764800000L); // 00:00 1/1/2018 GMT
-        Formatter formatter = new Formatter(Locale.US, date);
-
-        TimeZoneInfo timeZoneInfo = formatter.format("Australia/Lord_Howe");
-        assertThat(timeZoneInfo.getGmtOffset().toString()).isEqualTo("GMT+11:00");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
index 253b537..d21aa04 100644
--- a/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
+++ b/tests/robotests/src/com/android/settings/datetime/timezone/model/TimeZoneDataTest.java
@@ -21,18 +21,20 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import libcore.timezone.CountryTimeZones;
-import libcore.timezone.CountryTimeZones.TimeZoneMapping;
-import libcore.timezone.CountryZonesFinder;
+import static java.util.Collections.emptyList;
+
+import com.android.i18n.timezone.CountryTimeZones;
+import com.android.i18n.timezone.CountryTimeZones.TimeZoneMapping;
+import com.android.i18n.timezone.CountryZonesFinder;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
 public class TimeZoneDataTest {
@@ -49,15 +51,15 @@
     public void testRegionsWithTimeZone() {
         TimeZoneData timeZoneData = new TimeZoneData(mCountryZonesFinder);
         CountryTimeZones countryTimeZones = mock(CountryTimeZones.class);
-        when(countryTimeZones.getTimeZoneMappings()).thenReturn(Collections.emptyList());
+        when(countryTimeZones.getTimeZoneMappings()).thenReturn(emptyList());
         when(mCountryZonesFinder.lookupCountryTimeZones("US")).thenReturn(countryTimeZones);
         assertThat(timeZoneData.lookupCountryTimeZones("US").getCountryTimeZones())
-                .isSameAs(countryTimeZones);
+                .isSameInstanceAs(countryTimeZones);
     }
 
     @Test
     public void testGetRegionIds() {
-        when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(Collections.emptyList());
+        when(mCountryZonesFinder.lookupAllCountryIsoCodes()).thenReturn(emptyList());
         TimeZoneData timeZoneData = new TimeZoneData(mCountryZonesFinder);
         assertThat(timeZoneData.getRegionIds()).isEmpty();
 
@@ -73,13 +75,16 @@
         CountryTimeZones US = mock(CountryTimeZones.class);
         when(US.getCountryIso()).thenReturn("us");
         when(US.getTimeZoneMappings()).thenReturn(Arrays.asList(
-           TimeZoneMapping.createForTests("Unknown/Secret_City", true, null /* notUsedAfter */),
-           TimeZoneMapping.createForTests("Unknown/Secret_City2", false, null /* notUsedAfter */)
+                TimeZoneMapping.createForTests(
+                        "Unknown/Secret_City", true, null /* notUsedAfter */, emptyList()),
+                TimeZoneMapping.createForTests(
+                        "Unknown/Secret_City2", false, null /* notUsedAfter */, emptyList())
         ));
         CountryTimeZones GB = mock(CountryTimeZones.class);
         when(GB.getCountryIso()).thenReturn("gb");
         when(GB.getTimeZoneMappings()).thenReturn(Collections.singletonList(
-            TimeZoneMapping.createForTests("Unknown/Secret_City", true, null /* notUsedAfter */)
+                TimeZoneMapping.createForTests(
+                        "Unknown/Secret_City", true, null /* notUsedAfter */, emptyList())
         ));
         when(mCountryZonesFinder.lookupCountryTimeZonesForZoneId("Unknown/Secret_City"))
                 .thenReturn(Arrays.asList(US, GB));
diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
index 101297b..1ebbb3d 100644
--- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java
@@ -41,6 +41,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
@@ -130,6 +131,7 @@
     }
 
     @Test
+    @Ignore
     @Config(shadows = {
             ShadowPictureColorModePreferenceController.class,
             ShadowAdbPreferenceController.class,
diff --git a/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java
deleted file mode 100644
index db0b0db..0000000
--- a/tests/robotests/src/com/android/settings/development/EnhancedConnectivityPreferenceControllerTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.PreferenceScreen;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.R;
-
-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.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class EnhancedConnectivityPreferenceControllerTest {
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-
-    @Mock
-    private SwitchPreference mPreference;
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-
-    private EnhancedConnectivityPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mController = new EnhancedConnectivityPreferenceController(mContext);
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreference);
-        mController.displayPreference(mPreferenceScreen);
-    }
-
-    @Test
-    public void onPreferenceChanged_enhanceConnectivity_shouldBeOn() {
-        mController.onPreferenceChange(mPreference, true /* new value */);
-
-        assertThat(isSettingEnabled()).isTrue();
-    }
-
-    @Test
-    public void onPreferenceChanged_enhanceConnectivity_shouldBeOff() {
-        mController.onPreferenceChange(mPreference, false /* new value */);
-
-        assertThat(isSettingEnabled()).isFalse();
-    }
-
-    @Test
-    public void updateState_preferenceShouldBeChecked() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, 1 /* enabled */);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(true);
-    }
-
-    @Test
-    public void updateState_preferenceShouldNotBeChecked() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED, 0 /* disabled */);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setChecked(false);
-    }
-
-    @Test
-    public void onDeveloperOptionsDisabled_shouldEnablePreference() {
-        mController.onDeveloperOptionsSwitchDisabled();
-
-        verify(mPreference).setEnabled(false);
-        verify(mPreference).setChecked(true);
-
-        assertThat(isSettingEnabled()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_enhancedConnectivityShown_shouldReturnTrue() {
-        enableEnhancedConnectivityPreference(true);
-
-        boolean availability = mController.isAvailable();
-
-        assertThat(availability).isTrue();
-    }
-
-    @Test
-    public void isAvailable_enhancedConnectivityNotShown_shouldReturnFalse() {
-        enableEnhancedConnectivityPreference(false);
-
-        boolean availability = mController.isAvailable();
-
-        assertThat(availability).isFalse();
-    }
-
-    private void enableEnhancedConnectivityPreference(boolean enable) {
-        when(mContext.getResources().getBoolean(R.bool.config_show_enhanced_connectivity))
-                .thenReturn(enable);
-    }
-
-    private boolean isSettingEnabled() {
-        return Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.ENHANCED_CONNECTIVITY_ENABLED,
-                EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON
-                /* default on */)
-                == EnhancedConnectivityPreferenceController.ENHANCED_CONNECTIVITY_ON;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/OverlaySettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/OverlaySettingsPreferenceControllerTest.java
deleted file mode 100644
index 4f04c38..0000000
--- a/tests/robotests/src/com/android/settings/development/OverlaySettingsPreferenceControllerTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2020 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 android.content.Context;
-import android.content.SharedPreferences;
-
-import androidx.preference.SwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class OverlaySettingsPreferenceControllerTest {
-
-    private Context mContext;
-    private SwitchPreference mPreference;
-    private OverlaySettingsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new OverlaySettingsPreferenceController(mContext);
-        mPreference = new SwitchPreference(mContext);
-    }
-
-    @Test
-    public void isAvailable_shouldReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_isOverlaySettingsEnabled_shouldCheckPreference() {
-        OverlaySettingsPreferenceController.setOverlaySettingsEnabled(mContext, true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void updateState_isOverlaySettingsDisabled_shouldUncheckPreference() {
-        OverlaySettingsPreferenceController.setOverlaySettingsEnabled(mContext, false);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isFalse();
-    }
-
-    @Test
-    public void onPreferenceChange_preferenceChecked_shouldEnableSettings() {
-        mController.onPreferenceChange(mPreference, true);
-
-        assertThat(OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isTrue();
-    }
-
-    @Test
-    public void onPreferenceChange_preferenceUnchecked_shouldDisableSettings() {
-        mController.onPreferenceChange(mPreference, false);
-
-        assertThat(
-                OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isFalse();
-    }
-
-    @Test
-    public void isOverlaySettingsEnabled_sharePreferenceSetTrue_shouldReturnTrue() {
-        final SharedPreferences editor = mContext.getSharedPreferences(
-                OverlaySettingsPreferenceController.SHARE_PERFS,
-                Context.MODE_PRIVATE);
-        editor.edit().putBoolean(OverlaySettingsPreferenceController.SHARE_PERFS, true).apply();
-
-        assertThat(OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isTrue();
-    }
-
-    @Test
-    public void isOverlaySettingsEnabled_sharePreferenceSetFalse_shouldReturnFalse() {
-        final SharedPreferences editor = mContext.getSharedPreferences(
-                OverlaySettingsPreferenceController.SHARE_PERFS,
-                Context.MODE_PRIVATE);
-        editor.edit().putBoolean(OverlaySettingsPreferenceController.SHARE_PERFS, false).apply();
-
-        assertThat(
-                OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isFalse();
-    }
-
-    @Test
-    public void setOverlaySettingsEnabled_setTrue_shouldStoreTrue() {
-        OverlaySettingsPreferenceController.setOverlaySettingsEnabled(mContext, true);
-
-        assertThat(
-                OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isTrue();
-    }
-
-    @Test
-    public void setOverlaySettingsEnabled_setFalse_shouldStoreTrue() {
-        OverlaySettingsPreferenceController.setOverlaySettingsEnabled(mContext, false);
-
-        assertThat(
-                OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java
index da689b7..54bd54b 100644
--- a/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/WirelessDebuggingPreferenceControllerTest.java
@@ -33,7 +33,7 @@
 
 import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settings.testutils.shadow.ShadowWirelessDebuggingPreferenceController;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.After;
@@ -54,7 +54,7 @@
     @Mock
     private PreferenceScreen mScreen;
     @Mock
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     @Mock
     private IAdbManager mAdbManager;
     @Mock
diff --git a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
index afb1778..a12131d 100644
--- a/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/bluetooth/AbstractBluetoothDialogPreferenceControllerTest.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.development.bluetooth;
 
+import static android.bluetooth.BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.never;
@@ -199,7 +201,7 @@
         verify(mBluetoothA2dpConfigStore).setSampleRate(mCodecConfigAAC.getSampleRate());
         verify(mBluetoothA2dpConfigStore).setBitsPerSample(mCodecConfigAAC.getBitsPerSample());
         verify(mBluetoothA2dpConfigStore).setChannelMode(mCodecConfigAAC.getChannelMode());
-        verify(mBluetoothA2dpConfigStore).setCodecPriority(mCodecConfigAAC.getCodecPriority());
+        verify(mBluetoothA2dpConfigStore).setCodecPriority(CODEC_PRIORITY_HIGHEST);
         verify(mBluetoothA2dpConfigStore).setCodecSpecific1Value(
                 mCodecConfigAAC.getCodecSpecific1());
     }
diff --git a/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java b/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java
index e59bd0b..15e9bda 100644
--- a/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java
+++ b/tests/robotests/src/com/android/settings/development/compat/PlatformCompatDashboardTest.java
@@ -88,11 +88,14 @@
     public void setUp() throws RemoteException, NameNotFoundException {
         MockitoAnnotations.initMocks(this);
         mChanges = new CompatibilityChangeInfo[5];
-        mChanges[0] = new CompatibilityChangeInfo(1L, "Default_Enabled", 0, false, false, "");
-        mChanges[1] = new CompatibilityChangeInfo(2L, "Default_Disabled", 0, true, false, "");
-        mChanges[2] = new CompatibilityChangeInfo(3L, "Enabled_After_SDK_1_1", 1, false, false, "");
-        mChanges[3] = new CompatibilityChangeInfo(4L, "Enabled_After_SDK_1_2", 1, false, false, "");
-        mChanges[4] = new CompatibilityChangeInfo(5L, "Enabled_After_SDK_2", 2, false, false, "");
+        mChanges[0] = new CompatibilityChangeInfo(1L, "Default_Enabled", 0, 0, false, false, "");
+        mChanges[1] = new CompatibilityChangeInfo(2L, "Default_Disabled", 0, 0, true, false, "");
+        mChanges[2] = new CompatibilityChangeInfo(3L, "Enabled_Since_SDK_1_1", -1, 1, false, false,
+                                                  "");
+        mChanges[3] = new CompatibilityChangeInfo(4L, "Enabled_Since_SDK_1_2", -1, 1, false, false,
+                                                  "");
+        mChanges[4] = new CompatibilityChangeInfo(5L, "Enabled_Since_SDK_2", -1, 2, false, false,
+                                                  "");
         when(mPlatformCompat.listUIChanges()).thenReturn(mChanges);
         when(mPlatformCompat.getOverrideValidator()).thenReturn(mOverrideValidator);
         // By default, allow any change
@@ -204,7 +207,7 @@
         List<CompatibilityChangeInfo> changesToAdd = new ArrayList<>();
         for (int i = 0; i < mChanges.length; ++i) {
             changesToAdd.add(new CompatibilityChangeInfo(mChanges[i].getId(), mChanges[i].getName(),
-                    mChanges[i].getEnableAfterTargetSdk(), mChanges[i].getDisabled(),
+                    -1, mChanges[i].getEnableSinceTargetSdk(), mChanges[i].getDisabled(),
                     mChanges[i].getLoggingOnly(), mChanges[i].getDescription()));
         }
 
diff --git a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java b/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java
deleted file mode 100644
index 7d7e36b..0000000
--- a/tests/robotests/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.development.featureflags;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.os.SystemProperties;
-import android.provider.Settings;
-import android.util.FeatureFlagUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class FeatureFlagPersistentTest {
-
-    private static final String TEST_FEATURE_NAME = "test_feature";
-
-    private static final String PERSISTENT_FALSE_NAME = "false_persistent";
-    private static final String PERSISTENT_TRUE_NAME = "true_persistent";
-    private static final String VOLATILE_FALSE_NAME = "volatile_false_volatile";
-    private static final String VOLATILE_TRUE_NAME = "volatile_true_volatile";
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-
-        FeatureFlagPersistent.getAllPersistentFlags().add(TEST_FEATURE_NAME);
-        FeatureFlagUtils.getAllFeatureFlags().put(TEST_FEATURE_NAME, "false");
-
-        FeatureFlagUtils.getAllFeatureFlags().put(VOLATILE_FALSE_NAME, "false");
-        FeatureFlagUtils.getAllFeatureFlags().put(VOLATILE_TRUE_NAME, "true");
-
-        FeatureFlagPersistent.getAllPersistentFlags().add(PERSISTENT_FALSE_NAME);
-        FeatureFlagUtils.getAllFeatureFlags().put(PERSISTENT_FALSE_NAME, "false");
-
-        FeatureFlagPersistent.getAllPersistentFlags().add(PERSISTENT_TRUE_NAME);
-        FeatureFlagUtils.getAllFeatureFlags().put(PERSISTENT_TRUE_NAME, "true");
-    }
-
-    @After
-    public void tearDown() {
-        cleanup(PERSISTENT_FALSE_NAME);
-        cleanup(PERSISTENT_TRUE_NAME);
-        cleanup(VOLATILE_FALSE_NAME);
-        cleanup(VOLATILE_TRUE_NAME);
-        cleanup(TEST_FEATURE_NAME);
-    }
-
-    private void cleanup(String flagName) {
-        Settings.Global.putString(mContext.getContentResolver(), flagName, "");
-        SystemProperties.set(FeatureFlagUtils.FFLAG_PREFIX + flagName, "");
-        SystemProperties.set(FeatureFlagUtils.FFLAG_OVERRIDE_PREFIX + flagName, "");
-        SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + flagName, "");
-    }
-
-    /**
-     * Test to verify a non-persistent flag is indeed not persistent.
-     */
-    @Test
-    public void isPersistent_notPersistent_shouldReturnFalse() {
-        assertThat(FeatureFlagPersistent.isPersistent(VOLATILE_FALSE_NAME)).isFalse();
-    }
-
-    /**
-     * Test to verify a persistent flag is indeed persistent.
-     */
-    @Test
-    public void isPersistent_persistent_shouldReturnTrue() {
-        assertThat(FeatureFlagPersistent.isPersistent(PERSISTENT_TRUE_NAME)).isTrue();
-    }
-
-    /**
-     * Test to verify a persistent flag that is enabled should return true.
-     */
-    @Test
-    public void isEnabled_enabled_shouldReturnTrue() {
-        assertThat(FeatureFlagPersistent.isEnabled(mContext, PERSISTENT_TRUE_NAME)).isTrue();
-    }
-
-    /**
-     * Test to verify a persistent flag that is disabled should return false.
-     */
-    @Test
-    public void isEnabled_disabled_shouldReturnFalse() {
-        assertThat(FeatureFlagPersistent.isEnabled(mContext, PERSISTENT_FALSE_NAME)).isFalse();
-    }
-
-    /**
-     * Test to verify a persistent flag that has an enabled in system property should return true.
-     */
-    @Test
-    public void isEnabled_sysPropEnabled_shouldReturnTrue() {
-        SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "true");
-        FeatureFlagUtils.setEnabled(mContext, TEST_FEATURE_NAME, false);
-
-        assertThat(FeatureFlagPersistent.isEnabled(mContext, TEST_FEATURE_NAME)).isTrue();
-    }
-
-    /**
-     * Test to verify a persistent flag that is disabled in system property should return false.
-     */
-    @Test
-    public void isEnabled_sysPropDisabled_shouldReturnFalse() {
-        SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "false");
-        FeatureFlagUtils.setEnabled(mContext, TEST_FEATURE_NAME, true);
-
-        assertThat(FeatureFlagPersistent.isEnabled(mContext, TEST_FEATURE_NAME)).isFalse();
-    }
-
-    /**
-     * Test to verify setting persistent flag to enable works.
-     */
-    @Test
-    public void setEnabled_sysPropTrue_shouldSetValues() {
-        SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "");
-
-        FeatureFlagPersistent.setEnabled(mContext, TEST_FEATURE_NAME, true);
-
-        assertThat(SystemProperties.get(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME)).isEqualTo("true");
-        assertThat(FeatureFlagUtils.isEnabled(mContext, TEST_FEATURE_NAME)).isTrue();
-    }
-
-    /**
-     * Test to verify setting persistent flag to disable works.
-     */
-    @Test
-    public void setEnabled_sysPropFalse_shouldSetValues() {
-        SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "");
-
-        FeatureFlagPersistent.setEnabled(mContext, TEST_FEATURE_NAME, false);
-
-        assertThat(SystemProperties.get(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME)).isEqualTo("false");
-        assertThat(FeatureFlagUtils.isEnabled(mContext, TEST_FEATURE_NAME)).isFalse();
-    }
-}
-
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
index 372daf0..2266ed9 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverAppPreferenceControllerTest.java
@@ -18,8 +18,8 @@
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
 import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -57,7 +57,7 @@
 
     private static final int DEFAULT = 0;
     private static final int PRERELEASE_DRIVER = 1;
-    private static final int GAME_DRIVER = 2;
+    private static final int PRODUCTION_DRIVER = 2;
     private static final int SYSTEM = 3;
     private static final String TEST_APP_NAME = "testApp";
     private static final String TEST_PKG_NAME = "testPkg";
@@ -99,11 +99,11 @@
     }
 
     @Test
-    public void getAvailability_developmentSettingsEnabledAndGameDriverOn_available() {
+    public void getAvailability_developmentSettingsEnabledAndProductionDriverOn_available() {
         loadDefaultConfig();
         Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
@@ -119,7 +119,8 @@
     @Test
     public void getAvailability_graphicsDriverOff_conditionallyUnavailable() {
         loadDefaultConfig();
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
@@ -157,7 +158,7 @@
     public void updateState_available_visible() {
         Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         loadDefaultConfig();
 
         assertThat(mGroup.isVisible()).isTrue();
@@ -165,7 +166,8 @@
 
     @Test
     public void updateState_graphicsDriverOff_notVisible() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         loadDefaultConfig();
 
         assertThat(mGroup.isVisible()).isFalse();
@@ -188,7 +190,7 @@
     }
 
     @Test
-    public void createPreference_configGAME_DRIVER_shouldSetGameDriverAttributes() {
+    public void createPreference_configProduction_DRIVER_shouldSetProductionDriverAttributes() {
         loadConfig(TEST_PKG_NAME, "", "");
         final ListPreference preference =
                 mController.createListPreference(mContext, TEST_PKG_NAME, TEST_APP_NAME);
@@ -198,9 +200,9 @@
         assertThat(preference.getDialogTitle()).isEqualTo(mDialogTitle);
         assertThat(preference.getEntries()).isEqualTo(mValueList);
         assertThat(preference.getEntryValues()).isEqualTo(mValueList);
-        assertThat(preference.getEntry()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getValue()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getSummary()).isEqualTo(mValueList[GAME_DRIVER]);
+        assertThat(preference.getEntry()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getValue()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getSummary()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
     }
 
     @Test
@@ -245,9 +247,11 @@
         assertThat(preference.getEntry()).isEqualTo(mValueList[DEFAULT]);
         assertThat(preference.getValue()).isEqualTo(mValueList[DEFAULT]);
         assertThat(preference.getSummary()).isEqualTo(mValueList[DEFAULT]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS))
                 .isEqualTo("");
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo("");
     }
 
@@ -262,25 +266,28 @@
         assertThat(preference.getValue()).isEqualTo(mValueList[PRERELEASE_DRIVER]);
         assertThat(preference.getSummary()).isEqualTo(mValueList[PRERELEASE_DRIVER]);
         assertThat(Settings.Global.getString(mResolver,
-                Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS))
+                Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS))
                 .isEqualTo(TEST_PKG_NAME);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo("");
     }
 
     @Test
-    public void onPreferenceChange_selectGAME_DRIVER_shouldUpdateAttributesAndSettingsGlobal() {
+    public void onPreferenceChange_selectPRODUCTION_DRIVER_shouldUpdateAttrAndSettingsGlobal() {
         loadDefaultConfig();
         final ListPreference preference =
                 mController.createListPreference(mContext, TEST_PKG_NAME, TEST_APP_NAME);
-        mController.onPreferenceChange(preference, mValueList[GAME_DRIVER]);
+        mController.onPreferenceChange(preference, mValueList[PRODUCTION_DRIVER]);
 
-        assertThat(preference.getEntry()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getValue()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(preference.getSummary()).isEqualTo(mValueList[GAME_DRIVER]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
+        assertThat(preference.getEntry()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getValue()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(preference.getSummary()).isEqualTo(mValueList[PRODUCTION_DRIVER]);
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS))
                 .isEqualTo(TEST_PKG_NAME);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo("");
     }
 
@@ -294,9 +301,11 @@
         assertThat(preference.getEntry()).isEqualTo(mValueList[SYSTEM]);
         assertThat(preference.getValue()).isEqualTo(mValueList[SYSTEM]);
         assertThat(preference.getSummary()).isEqualTo(mValueList[SYSTEM]);
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS))
                 .isEqualTo("");
-        assertThat(Settings.Global.getString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS))
+        assertThat(Settings.Global.getString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS))
                 .isEqualTo(TEST_PKG_NAME);
     }
 
@@ -320,10 +329,13 @@
     }
 
     private void loadConfig(String optIn, String prereleaseOptIn, String optOut) {
-        Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_IN_APPS, optIn);
+        Settings.Global.putString(mResolver,
+                Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS, optIn);
         Settings.Global.putString(
-                mResolver, Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS, prereleaseOptIn);
-        Settings.Global.putString(mResolver, Settings.Global.GAME_DRIVER_OPT_OUT_APPS, optOut);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS,
+                prereleaseOptIn);
+        Settings.Global.putString(
+                mResolver, Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_OUT_APPS, optOut);
 
         mController = new GraphicsDriverAppPreferenceController(mContext, "testKey");
         mController.mEntryList = mContext.getResources().getStringArray(
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java
index b6bf4a7..4beca0b 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverContentObserverTest.java
@@ -58,7 +58,7 @@
         mGraphicsDriverContentObserver.register(mResolver);
 
         verify(mResolver).registerContentObserver(
-                Settings.Global.getUriFor(Settings.Global.GAME_DRIVER_ALL_APPS), false,
+                Settings.Global.getUriFor(Settings.Global.UPDATABLE_DRIVER_ALL_APPS), false,
                 mGraphicsDriverContentObserver);
     }
 
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
index 838f47b..df8a438 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverDashboardTest.java
@@ -45,7 +45,7 @@
     @Test
     public void getMetricesCategory_shouldReturnGraphicsDriverDashboard() {
         assertThat(mDashboard.getMetricsCategory())
-                .isEqualTo(SettingsEnums.SETTINGS_GAME_DRIVER_DASHBOARD);
+                .isEqualTo(SettingsEnums.SETTINGS_GRAPHICS_DRIVER_DASHBOARD);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
index 920e9d1..e24b9e5 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverEnableForAllAppsPreferenceControllerTest.java
@@ -18,10 +18,10 @@
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRERELEASE_ALL_APPS;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -61,7 +61,7 @@
     private ContentResolver mResolver;
     private GraphicsDriverEnableForAllAppsPreferenceController mController;
     private String mPreferenceDefault;
-    private String mPreferenceGameDriver;
+    private String mPreferenceProductionDriver;
     private String mPreferencePrereleaseDriver;
 
     @Before
@@ -72,14 +72,14 @@
 
         final Resources resources = mContext.getResources();
         mPreferenceDefault = resources.getString(R.string.graphics_driver_app_preference_default);
-        mPreferenceGameDriver =
-                resources.getString(R.string.graphics_driver_app_preference_game_driver);
+        mPreferenceProductionDriver =
+                resources.getString(R.string.graphics_driver_app_preference_production_driver);
         mPreferencePrereleaseDriver =
                 resources.getString(R.string.graphics_driver_app_preference_prerelease_driver);
 
         Settings.Global.putInt(mResolver, Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 1);
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
 
         mController = new GraphicsDriverEnableForAllAppsPreferenceController(mContext, "testKey");
         mController.mEntryList = mContext.getResources().getStringArray(
@@ -89,9 +89,9 @@
     }
 
     @Test
-    public void getAvailability_developmentSettingsEnabledAndGameDriverSettingsOn_available() {
+    public void getAvailability_developmentSettingsEnabledAndUpdatableDriverSettingsOn_available() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
     }
@@ -104,8 +104,9 @@
     }
 
     @Test
-    public void getAvailability_gameDriverOff_conditionallyUnavailable() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void getAvailability_updatableDriverOff_conditionallyUnavailable() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
 
         assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
     }
@@ -113,7 +114,7 @@
     @Test
     public void displayPreference_shouldAddListPreference() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController.updateState(mPreference);
 
         verify(mPreference).setValue(mPreferenceDefault);
@@ -139,7 +140,7 @@
     @Test
     public void updateState_availableAndDefault_visibleAndDefault() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController.updateState(mPreference);
 
         verify(mPreference, atLeastOnce()).setVisible(true);
@@ -148,20 +149,22 @@
     }
 
     @Test
-    public void updateState_availableAndGameDriver_visibleAndGameDriver() {
+    public void updateState_availableAndProductionDriver_visibleAndProductionDriver() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
         mController.updateState(mPreference);
 
         verify(mPreference, atLeastOnce()).setVisible(true);
-        verify(mPreference).setValue(mPreferenceGameDriver);
-        verify(mPreference).setSummary(mPreferenceGameDriver);
+        verify(mPreference).setValue(mPreferenceProductionDriver);
+        verify(mPreference).setSummary(mPreferenceProductionDriver);
     }
 
     @Test
     public void updateState_availableAndPrereleaseDriver_visibleAndPrereleaseDriver() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_PRERELEASE_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRERELEASE_ALL_APPS);
         mController.updateState(mPreference);
 
         verify(mPreference, atLeastOnce()).setVisible(true);
@@ -170,8 +173,9 @@
     }
 
     @Test
-    public void updateState_gameDriverOff_notVisibleAndSystemDriver() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void updateState_updatableDriverOff_notVisibleAndSystemDriver() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         mController.updateState(mPreference);
 
         verify(mPreference).setVisible(false);
@@ -182,33 +186,35 @@
     @Test
     public void onPreferenceChange_default_shouldUpdateSettingsGlobal() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
         mController.onPreferenceChange(mPreference, mPreferenceDefault);
 
         assertThat(Settings.Global.getInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_DEFAULT);
     }
 
     @Test
-    public void onPreferenceChange_gameDriver_shouldUpdateSettingsGlobal() {
+    public void onPreferenceChange_updatableDriver_shouldUpdateSettingsGlobal() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
-        mController.onPreferenceChange(mPreference, mPreferenceGameDriver);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
+        mController.onPreferenceChange(mPreference, mPreferenceProductionDriver);
 
         assertThat(Settings.Global.getInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
     }
 
     @Test
     public void onPreferenceChange_prereleaseDriver_shouldUpdateSettingsGlobal() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController.onPreferenceChange(mPreference, mPreferencePrereleaseDriver);
 
         assertThat(Settings.Global.getInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_PRERELEASE_ALL_APPS);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_PRERELEASE_ALL_APPS);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java
deleted file mode 100644
index a2d23b6..0000000
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverFooterPreferenceControllerTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2019 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.graphicsdriver;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_ALL_APPS;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.settingslib.widget.FooterPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class GraphicsDriverFooterPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private FooterPreference mPreference;
-    @Mock
-    private GraphicsDriverContentObserver mGraphicsDriverContentObserver;
-
-    private Context mContext;
-    private ContentResolver mResolver;
-    private GraphicsDriverFooterPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mResolver = mContext.getContentResolver();
-        mController = spy(new GraphicsDriverFooterPreferenceController(mContext, "key"));
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-    }
-
-    @Test
-    public void getAvailabilityStatus_gameDriverOff_availableUnsearchable() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_gameDriverDefault_conditionallyUnavailable() {
-        Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_gameDriverAllApps_conditionallyUnavailable() {
-        Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_ALL_APPS);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void onStart_shouldRegister() {
-        mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
-        mController.onStart();
-
-        verify(mGraphicsDriverContentObserver).register(mResolver);
-    }
-
-    @Test
-    public void onStop_shouldUnregister() {
-        mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
-        mController.onStop();
-
-        verify(mGraphicsDriverContentObserver).unregister(mResolver);
-    }
-
-    @Test
-    public void updateState_available_visible() {
-        when(mController.getAvailabilityStatus()).thenReturn(AVAILABLE_UNSEARCHABLE);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setVisible(true);
-    }
-
-    @Test
-    public void updateState_unavailable_invisible() {
-        when(mController.getAvailabilityStatus()).thenReturn(CONDITIONALLY_UNAVAILABLE);
-        mController.updateState(mPreference);
-
-        verify(mPreference).setVisible(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
index 7d4ee45..838703d 100644
--- a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverGlobalSwitchBarControllerTest.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.development.graphicsdriver;
 
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_DEFAULT;
-import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.GAME_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -61,9 +61,9 @@
     }
 
     @Test
-    public void constructor_gameDriverOn_shouldCheckSwitchBar() {
+    public void constructor_updatableDriverOn_shouldCheckSwitchBar() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
 
@@ -71,8 +71,9 @@
     }
 
     @Test
-    public void constructor_gameDriverOff_shouldUncheckSwitchBar() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void constructor_updatableDriverOff_shouldUncheckSwitchBar() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
 
@@ -122,27 +123,30 @@
     }
 
     @Test
-    public void onSwitchToggled_checked_shouldTurnOnGameDriver() {
-        Settings.Global.putInt(mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_OFF);
+    public void onSwitchToggled_checked_shouldTurnOnUpdatableDriver() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
         mController.onSwitchToggled(true);
 
         assertThat(Settings.Global.getInt(
-                           mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_DEFAULT);
+                           mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                           UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_DEFAULT);
     }
 
     @Test
-    public void onSwitchToggled_unchecked_shouldTurnOffGameDriver() {
+    public void onSwitchToggled_unchecked_shouldTurnOffUpdatableDriver() {
         Settings.Global.putInt(
-                mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT);
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
         mController = new GraphicsDriverGlobalSwitchBarController(
                 mContext, new SwitchBarController(mSwitchBar));
         mController.onSwitchToggled(false);
 
         assertThat(Settings.Global.getInt(
-                           mResolver, Settings.Global.GAME_DRIVER_ALL_APPS, GAME_DRIVER_DEFAULT))
-                .isEqualTo(GAME_DRIVER_OFF);
+                           mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                           UPDATABLE_DRIVER_DEFAULT))
+                .isEqualTo(UPDATABLE_DRIVER_OFF);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverTopIntroPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverTopIntroPreferenceControllerTest.java
new file mode 100644
index 0000000..28e5c5a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/graphicsdriver/GraphicsDriverTopIntroPreferenceControllerTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2019 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.graphicsdriver;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_DEFAULT;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_OFF;
+import static com.android.settings.development.graphicsdriver.GraphicsDriverEnableForAllAppsPreferenceController.UPDATABLE_DRIVER_PRODUCTION_ALL_APPS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settingslib.widget.TopIntroPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class GraphicsDriverTopIntroPreferenceControllerTest {
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private TopIntroPreference mPreference;
+    @Mock
+    private GraphicsDriverContentObserver mGraphicsDriverContentObserver;
+
+    private Context mContext;
+    private ContentResolver mResolver;
+    private GraphicsDriverTopIntroPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mResolver = mContext.getContentResolver();
+        mController = spy(new GraphicsDriverTopIntroPreferenceController(mContext, "key"));
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+    }
+
+    @Test
+    public void getAvailabilityStatus_updatableDriverOff_availableUnsearchable() {
+        Settings.Global.putInt(mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_OFF);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_updatableDriverDefault_conditionallyUnavailable() {
+        Settings.Global.putInt(
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, UPDATABLE_DRIVER_DEFAULT);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_updatableProductionDriverAllApps_conditionallyUnavailable() {
+        Settings.Global.putInt(
+                mResolver, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
+                UPDATABLE_DRIVER_PRODUCTION_ALL_APPS);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void onStart_shouldRegister() {
+        mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
+        mController.onStart();
+
+        verify(mGraphicsDriverContentObserver).register(mResolver);
+    }
+
+    @Test
+    public void onStop_shouldUnregister() {
+        mController.mGraphicsDriverContentObserver = mGraphicsDriverContentObserver;
+        mController.onStop();
+
+        verify(mGraphicsDriverContentObserver).unregister(mResolver);
+    }
+
+    @Test
+    public void updateState_available_visible() {
+        when(mController.getAvailabilityStatus()).thenReturn(AVAILABLE_UNSEARCHABLE);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setVisible(true);
+    }
+
+    @Test
+    public void updateState_unavailable_invisible() {
+        when(mController.getAvailabilityStatus()).thenReturn(CONDITIONALLY_UNAVAILABLE);
+        mController.updateState(mPreference);
+
+        verify(mPreference).setVisible(false);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
index cafebe4..88e2886 100644
--- a/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
+++ b/tests/robotests/src/com/android/settings/development/qstile/WinscopeTraceTest.java
@@ -37,6 +37,8 @@
 import android.view.IWindowManager;
 import android.widget.Toast;
 
+import com.android.internal.inputmethod.IBooleanResultCallback;
+import com.android.internal.view.IInputMethodManager;
 import com.android.settings.testutils.shadow.ShadowParcel;
 
 import org.junit.After;
@@ -55,6 +57,8 @@
     @Mock
     private IWindowManager mWindowManager;
     @Mock
+    private IInputMethodManager mInputMethodManager;
+    @Mock
     private IBinder mSurfaceFlinger;
     @Mock
     private Toast mToast;
@@ -65,7 +69,11 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mWinscopeTrace = spy(new DevelopmentTiles.WinscopeTrace());
+        // default ImeTraceEnabled value, prevent tests from actually calling into IMM and
+        // await the result forever.
+        doReturn(false).when(mWinscopeTrace).isImeTraceEnabled();
         ReflectionHelpers.setField(mWinscopeTrace, "mWindowManager", mWindowManager);
+        ReflectionHelpers.setField(mWinscopeTrace, "mInputMethodManager", mInputMethodManager);
         ReflectionHelpers.setField(mWinscopeTrace, "mSurfaceFlinger", mSurfaceFlinger);
         ReflectionHelpers.setField(mWinscopeTrace, "mToast", mToast);
     }
@@ -78,7 +86,7 @@
     @Test
     @Config(shadows = ShadowParcel.class)
     public void wmReturnsTraceEnabled_shouldReturnEnabled() throws RemoteException {
-        // Assume Surface Trace is disabled.
+        // Assume Surface Trace and Input Method Manager are disabled.
         ShadowParcel.sReadBoolResult = false;
         doReturn(true).when(mWindowManager).isWindowTraceEnabled();
         assertThat(mWinscopeTrace.isEnabled()).isTrue();
@@ -87,7 +95,7 @@
     @Test
     @Config(shadows = ShadowParcel.class)
     public void sfReturnsTraceEnabled_shouldReturnEnabled() throws RemoteException {
-        // Assume Window Trace is disabled.
+        // Assume Window Trace and Input Method Manager are disabled.
         doReturn(false).when(mWindowManager).isWindowTraceEnabled();
         ShadowParcel.sReadBoolResult = true;
         assertThat(mWinscopeTrace.isEnabled()).isTrue();
@@ -106,17 +114,47 @@
     }
 
     @Test
-    public void wmAndSfReturnsTraceDisabled_shouldReturnDisabled() throws RemoteException {
+    public void wmAndSfAndImmReturnTraceDisabled_shouldReturnDisabled() throws RemoteException {
         ShadowParcel.sReadBoolResult = false;
         doReturn(false).when(mWindowManager).isWindowTraceEnabled();
         assertThat(mWinscopeTrace.isEnabled()).isFalse();
         verify(mSurfaceFlinger)
                 .transact(eq(SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE), any(), any(),
-                        eq(0 /* flags */));
+                eq(0 /* flags */));
         verifyNoMoreInteractions(mSurfaceFlinger);
     }
 
     @Test
+    public void wmAndSfReturnTraceDisabled_immReturnsTraceEnabled_shouldReturnEnabled()
+            throws RemoteException {
+        ShadowParcel.sReadBoolResult = false;
+        doReturn(false).when(mWindowManager).isWindowTraceEnabled();
+        doReturn(true).when(mWinscopeTrace).isImeTraceEnabled();
+        assertThat(mWinscopeTrace.isEnabled()).isTrue();
+        verify(mSurfaceFlinger)
+                .transact(eq(SURFACE_FLINGER_LAYER_TRACE_STATUS_CODE), any(), any(),
+                eq(0 /* flags */));
+        verifyNoMoreInteractions(mSurfaceFlinger);
+    }
+
+    @Test
+    @Config(shadows = ShadowParcel.class)
+    public void immReturnsTraceEnabled_shouldReturnEnabled() throws RemoteException {
+        // Assume Window Manager and Surface Trace are disabled.
+        ShadowParcel.sReadBoolResult = false;
+        doReturn(true).when(mWinscopeTrace).isImeTraceEnabled();
+        assertThat(mWinscopeTrace.isEnabled()).isTrue();
+    }
+
+    @Test
+    @Config(shadows = ShadowParcel.class)
+    public void immReturnsTraceDisabled_shouldReturnDisabled() throws RemoteException {
+        // Assume Window Manager and Surface Trace are disabled.
+        ShadowParcel.sReadBoolResult = false;
+        assertThat(mWinscopeTrace.isEnabled()).isFalse();
+    }
+
+    @Test
     @Config(shadows = ShadowParcel.class)
     public void wmThrowsRemoteExAndSfReturnsTraceDisabled_shouldReturnDisabled()
             throws RemoteException {
@@ -127,7 +165,7 @@
     }
 
     @Test
-    public void sfUnavailableAndWmReturnsTraceDisabled_shouldReturnDisabled()
+    public void sfUnavailableAndWmAndImmReturnTraceDisabled_shouldReturnDisabled()
             throws RemoteException {
         doReturn(false).when(mWindowManager).isWindowTraceEnabled();
         ReflectionHelpers.setField(mWinscopeTrace, "mSurfaceFlinger", null);
@@ -142,6 +180,13 @@
     }
 
     @Test
+    public void setIsEnableTrue_shouldEnableImeTrace() throws RemoteException {
+        mWinscopeTrace.setIsEnabled(true);
+        verify(mInputMethodManager).startImeTrace();
+        verifyNoMoreInteractions(mInputMethodManager);
+    }
+
+    @Test
     @Config(shadows = ShadowParcel.class)
     public void setIsEnableTrue_shouldEnableLayerTrace() throws RemoteException {
         mWinscopeTrace.setIsEnabled(true);
@@ -163,6 +208,15 @@
 
     @Test
     @Config(shadows = ShadowParcel.class)
+    public void setIsEnableFalse_shouldDisableImeTrace() throws RemoteException {
+        mWinscopeTrace.setIsEnabled(false);
+        verify(mInputMethodManager).stopImeTrace();
+        verifyNoMoreInteractions(mInputMethodManager);
+        verify(mToast).show();
+    }
+
+    @Test
+    @Config(shadows = ShadowParcel.class)
     public void setIsEnableFalse_shouldDisableLayerTrace() throws RemoteException {
         mWinscopeTrace.setIsEnabled(false);
         assertThat(ShadowParcel.sWriteIntResult).isEqualTo(0);
@@ -191,6 +245,18 @@
     }
 
     /**
+     * Verify when input method manager call throws a remote exception, it is handled without
+     * re-throwing the exception.
+     */
+    @Test
+    public void setIsEnableAndImmThrowsRemoteException_shouldFailGracefully()
+            throws RemoteException {
+        doThrow(new RemoteException("Unknown")).when(mInputMethodManager)
+                .isImeTraceEnabled(any(IBooleanResultCallback.Stub.class));
+        mWinscopeTrace.setIsEnabled(true);
+    }
+
+    /**
      * Verify is surface flinger is not available not calls are made to it.
      */
     @Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
deleted file mode 100644
index 50a2cd1..0000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.Context;
-import android.net.wifi.SoftApConfiguration;
-import android.net.wifi.WifiManager;
-import android.os.Build;
-import android.provider.Settings;
-
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
-import com.android.settings.widget.ValidatedEditTextPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowBluetoothAdapter.class})
-public class DeviceNamePreferenceControllerTest {
-    private static final String TESTING_STRING = "Testing";
-
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    private ValidatedEditTextPreference mPreference;
-    private DeviceNamePreferenceController mController;
-    private Context mContext;
-    private BluetoothAdapter mBluetoothAdapter;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        ShadowApplication shadowApplication = ShadowApplication.getInstance();
-        shadowApplication.setSystemService(Context.WIFI_SERVICE, mWifiManager);
-        mContext = RuntimeEnvironment.application;
-        mPreference = new ValidatedEditTextPreference(mContext);
-        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
-        final SoftApConfiguration configuration =
-                new SoftApConfiguration.Builder().setSsid("test-ap").build();
-        when(mWifiManager.getSoftApConfiguration()).thenReturn(configuration);
-
-        mController = new DeviceNamePreferenceController(mContext, "test_key");
-        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
-    }
-
-    @Test
-    public void getAvailibilityStatus_availableByDefault() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
-    }
-
-    @Test
-    @Config(qualifiers = "mcc999")
-    public void getAvailabilityStatus_unsupportedWhenSet() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
-    }
-
-    @Test
-    public void constructor_defaultDeviceNameIsModelName() {
-        assertThat(mController.getSummary()).isEqualTo(Build.MODEL);
-    }
-
-    @Test
-    public void constructor_deviceNameLoadedIfSet() {
-        Settings.Global.putString(
-                mContext.getContentResolver(), Settings.Global.DEVICE_NAME, "Test");
-        mController = new DeviceNamePreferenceController(mContext, "test_key");
-        assertThat(mController.getSummary()).isEqualTo("Test");
-    }
-
-    @Test
-    public void isTextValid_nameUnder33Characters_isValid() {
-        assertThat(mController.isTextValid("12345678901234567890123456789012")).isTrue();
-    }
-
-    @Test
-    public void isTextValid_nameTooLong_isInvalid() {
-        assertThat(mController.isTextValid("123456789012345678901234567890123")).isFalse();
-    }
-
-    @Test
-    public void setDeviceName_preferenceUpdatedWhenDeviceNameUpdated() {
-        acceptDeviceName(true);
-        mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mPreference, TESTING_STRING);
-
-        assertThat(mPreference.getSummary()).isEqualTo(TESTING_STRING);
-    }
-
-    @Test
-    public void setDeviceName_bluetoothNameUpdatedWhenDeviceNameUpdated() {
-        acceptDeviceName(true);
-        mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mPreference, TESTING_STRING);
-
-        assertThat(mBluetoothAdapter.getName()).isEqualTo(TESTING_STRING);
-    }
-
-    @Test
-    public void setDeviceName_wifiTetherNameUpdatedWhenDeviceNameUpdated() {
-        acceptDeviceName(true);
-        mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mPreference, TESTING_STRING);
-
-        ArgumentCaptor<SoftApConfiguration> captor =
-                ArgumentCaptor.forClass(SoftApConfiguration.class);
-        verify(mWifiManager).setSoftApConfiguration(captor.capture());
-        assertThat(captor.getValue().getSsid()).isEqualTo(TESTING_STRING);
-    }
-
-    @Test
-    public void displayPreference_defaultDeviceNameIsModelNameOnPreference() {
-        mController.displayPreference(mScreen);
-
-        assertThat(mPreference.getText()).isEqualTo(Build.MODEL);
-    }
-
-    @Test
-    public void setDeviceName_ignoresIfCancelPressed() {
-        acceptDeviceName(true);
-        mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mPreference, TESTING_STRING);
-
-        assertThat(mBluetoothAdapter.getName()).isEqualTo(TESTING_STRING);
-    }
-
-    @Test
-    public void setDeviceName_okInDeviceNameWarningDialog_shouldChangePreferenceText() {
-        acceptDeviceName(true);
-        mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mPreference, TESTING_STRING);
-
-        assertThat(mPreference.getSummary()).isEqualTo(TESTING_STRING);
-    }
-
-    @Test
-    public void setDeviceName_cancelInDeviceNameWarningDialog_shouldNotChangePreferenceText() {
-        acceptDeviceName(false);
-        mController.displayPreference(mScreen);
-        mController.onPreferenceChange(mPreference, TESTING_STRING);
-
-        assertThat(mPreference.getSummary()).isNotEqualTo(TESTING_STRING);
-        assertThat(mPreference.getText()).isEqualTo(mPreference.getSummary());
-    }
-
-    private void acceptDeviceName(boolean accept) {
-        mController.setHost(deviceName -> mController.updateDeviceName(accept));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java b/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java
deleted file mode 100644
index 9434daa..0000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/PrivateVolumeForgetTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.deviceinfo;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.os.storage.VolumeRecord;
-import android.widget.Button;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.FragmentActivity;
-
-import com.android.settings.R;
-import com.android.settings.deviceinfo.PrivateVolumeForget.ForgetConfirmFragment;
-import com.android.settings.testutils.shadow.ShadowStorageManager;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.androidx.fragment.FragmentController;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowStorageManager.class)
-public class PrivateVolumeForgetTest {
-
-    private PrivateVolumeForget mFragment;
-    private FragmentActivity mActivity;
-
-    @Before
-    public void setUp() {
-        final Bundle bundle = new Bundle();
-        bundle.putString(VolumeRecord.EXTRA_FS_UUID, "id");
-        mFragment = FragmentController.of(new PrivateVolumeForget(), bundle)
-                .create()
-                .start()
-                .resume()
-                .visible()
-                .get();
-        mActivity = mFragment.getActivity();
-    }
-
-    @After
-    public void tearDown() {
-        ShadowStorageManager.reset();
-    }
-
-    @Test
-    public void OnClickListener_shouldCallForget() {
-        assertThat(ShadowStorageManager.isForgetCalled()).isFalse();
-
-        final Button confirm = mFragment.getView().findViewById(R.id.confirm);
-
-        confirm.performClick();
-        final ForgetConfirmFragment confirmFragment =
-                (ForgetConfirmFragment) mActivity.getSupportFragmentManager().findFragmentByTag(
-                        PrivateVolumeForget.TAG_FORGET_CONFIRM);
-
-        assertThat(confirmFragment).isNotNull();
-
-        final AlertDialog dialog = (AlertDialog) confirmFragment.getDialog();
-        final Button forget = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
-
-        forget.performClick();
-
-        assertThat(ShadowStorageManager.isForgetCalled()).isTrue();
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java
index 7d7be6c..e19066a 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java
@@ -28,12 +28,15 @@
 import android.icu.text.NumberFormat;
 import android.os.storage.VolumeInfo;
 import android.text.format.Formatter;
+import android.util.FeatureFlagUtils;
 
 import androidx.preference.Preference;
 
 import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -68,6 +71,13 @@
         mController = new TopLevelStoragePreferenceController(mContext, "test_key");
     }
 
+    @After
+    public void tearDown() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        }
+    }
+
     @Test
     public void updateSummary_shouldDisplayUsedPercentAndFreeSpace() throws Exception {
         final VolumeInfo volumeInfo = mVolumes.get(0);
@@ -90,4 +100,11 @@
         assertThat(preference.getSummary()).isEqualTo(
                 mContext.getString(R.string.storage_summary, percentage, freeSpace));
     }
+
+    @Test
+    public void refreshSummary_silkyHomeEnabled_shouldBeNull() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+
+        assertThat(mController.getSummary()).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java
index 988a94b..16c77a4 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java
@@ -23,7 +23,11 @@
 import android.content.Context;
 import android.os.Build;
 import android.provider.Settings.Global;
+import android.util.FeatureFlagUtils;
 
+import com.android.settings.core.FeatureFlags;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,6 +46,13 @@
         mController = new TopLevelAboutDevicePreferenceController(mContext, "test_key");
     }
 
+    @After
+    public void teardown() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        }
+    }
+
     @Test
     public void getAvailabilityState_shouldBeAvailable() {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
@@ -57,4 +68,12 @@
         Global.putString(mContext.getContentResolver(), Global.DEVICE_NAME, "Test");
         assertThat(mController.getSummary().toString()).isEqualTo("Test");
     }
+
+    @Test
+    public void getSummary_silkyHomeEnabled_shouldBeNull() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+        Global.putString(mContext.getContentResolver(), Global.DEVICE_NAME, "Test");
+
+        assertThat(mController.getSummary()).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java
index 291f6e2..c7c7669 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/hardwareinfo/HardwareInfoPreferenceControllerTest.java
@@ -24,7 +24,6 @@
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.deviceinfo.HardwareInfoPreferenceController;
 
@@ -79,8 +78,6 @@
     }
 
     private boolean containBuildModel(CharSequence result) {
-        final String oracle = mContext.getResources().getString(R.string.model_summary,
-                Build.MODEL);
-        return result.toString().contains(oracle);
+        return result.toString().contains(Build.MODEL);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
index 2fb2a3d..26444ea 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
@@ -142,7 +142,6 @@
         verify(mDialog).removeViewFromScreen(ID_GSM_SETTINGS);
     }
 
-
     @Test
     public void populateImeiInfo_cdmaSimPresent_shouldSetImeiInfoAndSetAllCdmaSetting() {
         ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/legal/ModuleLicenseProviderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/legal/ModuleLicenseProviderTest.java
deleted file mode 100644
index b65137b..0000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/legal/ModuleLicenseProviderTest.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.deviceinfo.legal;
-
-import static com.android.settings.deviceinfo.legal.ModuleLicenseProvider.LICENSE_FILE_NAME;
-
-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 static org.mockito.Mockito.when;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.ModuleInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.res.AssetFileDescriptor;
-import android.content.res.AssetManager;
-import android.content.res.Resources;
-import android.net.Uri;
-import android.os.ParcelFileDescriptor;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-@RunWith(RobolectricTestRunner.class)
-public class ModuleLicenseProviderTest {
-    public static final String PACKAGE_NAME = "com.android.test_package";
-    @Test
-    public void onCreate_returnsTrue() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        assertThat(provider.onCreate()).isTrue();
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void query_throwsUnsupportedOperationException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.query(null, null, null, null, null);
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void insert_throwsUnsupportedOperationException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.insert(null, null);
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void delete_throwsUnsupportedOperationException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.delete(null, null, null);
-    }
-
-    @Test(expected = UnsupportedOperationException.class)
-    public void update_throwsUnsupportedOperationException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.update(null, null, null, null);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void getType_notContentScheme_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.getType(new Uri.Builder()
-                .scheme("badscheme")
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(PACKAGE_NAME)
-                .appendPath(LICENSE_FILE_NAME)
-                .build());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void getType_invalidAuthority_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.getType(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority("notmyauthority")
-                .appendPath(PACKAGE_NAME)
-                .appendPath(LICENSE_FILE_NAME)
-                .build());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void getType_emptyPath_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.getType(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .build());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void getType_missingPackageName_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.getType(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(LICENSE_FILE_NAME)
-                .build());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void getType_missingFileName_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.getType(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(PACKAGE_NAME)
-                .build());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void getType_incorrectFileName_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.getType(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(PACKAGE_NAME)
-                .appendPath("badname.txt")
-                .build());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void getType_packageNotAModule_throwsIllegalArgumentException()
-            throws PackageManager.NameNotFoundException {
-        ModuleLicenseProvider provider = spy(new ModuleLicenseProvider());
-        Context context = mock(Context.class);
-        PackageManager packageManager = mock(PackageManager.class);
-        when(provider.getContext()).thenReturn(context);
-        when(context.getPackageManager()).thenReturn(packageManager);
-        when(packageManager.getModuleInfo(PACKAGE_NAME, 0))
-                .thenThrow(new PackageManager.NameNotFoundException());
-
-        provider.getType(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(PACKAGE_NAME)
-                .appendPath(LICENSE_FILE_NAME)
-                .build());
-    }
-
-    @Test
-    public void getType_validUri_returnsHtmlMimeType()
-            throws PackageManager.NameNotFoundException {
-        ModuleLicenseProvider provider = spy(new ModuleLicenseProvider());
-        Context context = mock(Context.class);
-        PackageManager packageManager = mock(PackageManager.class);
-        when(provider.getContext()).thenReturn(context);
-        when(context.getPackageManager()).thenReturn(packageManager);
-        when(packageManager.getModuleInfo(PACKAGE_NAME, 0))
-                .thenReturn(new ModuleInfo());
-
-        assertThat(provider.getType(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(PACKAGE_NAME)
-                .appendPath(LICENSE_FILE_NAME)
-                .build())).isEqualTo(ModuleLicenseProvider.LICENSE_FILE_MIME_TYPE);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void openFile_notContentScheme_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.openFile(new Uri.Builder()
-                .scheme("badscheme")
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(PACKAGE_NAME)
-                .appendPath(LICENSE_FILE_NAME)
-                .build(), "r");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void openFile_invalidAuthority_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.openFile(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority("notmyauthority")
-                .appendPath(PACKAGE_NAME)
-                .appendPath(LICENSE_FILE_NAME)
-                .build(), "r");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void openFile_emptyPath_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.openFile(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .build(), "r");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void openFile_missingPackageName_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.openFile(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(LICENSE_FILE_NAME)
-                .build(), "r");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void openFile_missingFileName_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.openFile(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(PACKAGE_NAME)
-                .build(), "r");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void openFile_incorrectFileName_throwsIllegalArgumentException() {
-        ModuleLicenseProvider provider = new ModuleLicenseProvider();
-        provider.openFile(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(PACKAGE_NAME)
-                .appendPath("badname.txt")
-                .build(), "r");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void openFile_packageNotAModule_throwsIllegalArgumentException()
-            throws PackageManager.NameNotFoundException {
-        ModuleLicenseProvider provider = spy(new ModuleLicenseProvider());
-        Context context = mock(Context.class);
-        PackageManager packageManager = mock(PackageManager.class);
-        when(provider.getContext()).thenReturn(context);
-        when(context.getPackageManager()).thenReturn(packageManager);
-        when(packageManager.getModuleInfo(PACKAGE_NAME, 0))
-                .thenThrow(new PackageManager.NameNotFoundException());
-
-        provider.openFile(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(PACKAGE_NAME)
-                .appendPath(LICENSE_FILE_NAME)
-                .build(), "r");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void openFile_validUri_notReadMode_throwsIllegalArgumentException()
-            throws PackageManager.NameNotFoundException {
-        ModuleLicenseProvider provider = spy(new ModuleLicenseProvider());
-        Context context = mock(Context.class);
-        PackageManager packageManager = mock(PackageManager.class);
-        when(provider.getContext()).thenReturn(context);
-        when(context.getPackageManager()).thenReturn(packageManager);
-        when(packageManager.getModuleInfo(PACKAGE_NAME, 0))
-                .thenReturn(new ModuleInfo());
-
-        provider.openFile(new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(ModuleLicenseProvider.AUTHORITY)
-                .appendPath(PACKAGE_NAME)
-                .appendPath(LICENSE_FILE_NAME)
-                .build(), "badmode");
-    }
-
-    @Test
-    public void isCachedHtmlFileOutdated_packageNotInSharedPrefs_returnTrue()
-            throws PackageManager.NameNotFoundException {
-        Context context = RuntimeEnvironment.application;
-        context.getSharedPreferences(ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
-                .edit().clear().commit();
-
-        assertThat(ModuleLicenseProvider.isCachedHtmlFileOutdated(context, PACKAGE_NAME)).isTrue();
-    }
-
-    @Test
-    public void isCachedHtmlFileOutdated_versionCodeDiffersFromSharedPref_returnTrue()
-            throws PackageManager.NameNotFoundException {
-        Context context = spy(RuntimeEnvironment.application);
-        SharedPreferences.Editor editor = context.getSharedPreferences(
-                ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
-                .edit();
-        editor.clear().commit();
-        editor.putLong(PACKAGE_NAME, 900L).commit();
-        PackageManager packageManager = mock(PackageManager.class);
-        doReturn(packageManager).when(context).getPackageManager();
-        PackageInfo packageInfo = new PackageInfo();
-        packageInfo.setLongVersionCode(1000L);
-        when(packageManager.getPackageInfo(PACKAGE_NAME, PackageManager.MATCH_APEX))
-                .thenReturn(packageInfo);
-
-        assertThat(ModuleLicenseProvider.isCachedHtmlFileOutdated(context, PACKAGE_NAME)).isTrue();
-    }
-
-    @Test
-    public void isCachedHtmlFileOutdated_fileDoesNotExist_returnTrue()
-            throws PackageManager.NameNotFoundException {
-        Context context = spy(RuntimeEnvironment.application);
-        context.getSharedPreferences(ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
-                .edit().clear().commit();
-        SharedPreferences.Editor editor = context.getSharedPreferences(
-                ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
-                .edit();
-        editor.clear().commit();
-        editor.putLong(PACKAGE_NAME, 1000L).commit();
-        PackageManager packageManager = mock(PackageManager.class);
-        doReturn(packageManager).when(context).getPackageManager();
-        PackageInfo packageInfo = new PackageInfo();
-        packageInfo.setLongVersionCode(1000L);
-        when(packageManager.getPackageInfo(PACKAGE_NAME, PackageManager.MATCH_APEX))
-                .thenReturn(packageInfo);
-        new File(context.getCacheDir() + "/" + PACKAGE_NAME, LICENSE_FILE_NAME).delete();
-
-        assertThat(ModuleLicenseProvider.isCachedHtmlFileOutdated(context, PACKAGE_NAME)).isTrue();
-    }
-
-    @Test
-    public void isCachedHtmlFileOutdated_fileIsEmpty_returnTrue()
-            throws PackageManager.NameNotFoundException, IOException {
-        Context context = spy(RuntimeEnvironment.application);
-        context.getSharedPreferences(ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
-                .edit().clear().commit();
-        SharedPreferences.Editor editor = context.getSharedPreferences(
-                ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
-                .edit();
-        editor.clear().commit();
-        editor.putLong(PACKAGE_NAME, 1000L).commit();
-        PackageManager packageManager = mock(PackageManager.class);
-        doReturn(packageManager).when(context).getPackageManager();
-        PackageInfo packageInfo = new PackageInfo();
-        packageInfo.setLongVersionCode(1000L);
-        when(packageManager.getPackageInfo(PACKAGE_NAME, PackageManager.MATCH_APEX))
-                .thenReturn(packageInfo);
-        new File(context.getCacheDir(), PACKAGE_NAME).mkdir();
-        File file = new File(context.getCacheDir() + "/" + PACKAGE_NAME, LICENSE_FILE_NAME);
-        file.delete();
-        file.createNewFile();
-
-        assertThat(ModuleLicenseProvider.isCachedHtmlFileOutdated(context, PACKAGE_NAME)).isTrue();
-    }
-
-    @Test
-    public void isCachedHtmlFileOutdated_notOutdated_returnFalse()
-            throws PackageManager.NameNotFoundException, IOException {
-        Context context = spy(RuntimeEnvironment.application);
-        context.getSharedPreferences(ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
-                .edit().clear().commit();
-        SharedPreferences.Editor editor = context.getSharedPreferences(
-                ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
-                .edit();
-        editor.clear().commit();
-        editor.putLong(PACKAGE_NAME, 1000L).commit();
-        PackageManager packageManager = mock(PackageManager.class);
-        doReturn(packageManager).when(context).getPackageManager();
-        PackageInfo packageInfo = new PackageInfo();
-        packageInfo.setLongVersionCode(1000L);
-        when(packageManager.getPackageInfo(PACKAGE_NAME, PackageManager.MATCH_APEX))
-                .thenReturn(packageInfo);
-        new File(context.getCacheDir(), PACKAGE_NAME).mkdir();
-        File file = new File(context.getCacheDir() + "/" + PACKAGE_NAME, LICENSE_FILE_NAME);
-        file.delete();
-        file.createNewFile();
-        try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
-            writer.write("test");
-        }
-
-        assertThat(ModuleLicenseProvider.isCachedHtmlFileOutdated(context, PACKAGE_NAME)).isFalse();
-    }
-
-    @Test
-    public void getUriForPackage_returnsProperlyFormattedUri() {
-        assertThat(ModuleLicenseProvider.getUriForPackage(PACKAGE_NAME))
-                .isEqualTo(Uri.parse("content://com.android.settings.module_licenses/com.android.test_package/NOTICE.html"));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
deleted file mode 100644
index bbab259..0000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
+++ /dev/null
@@ -1,811 +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.deviceinfo.simstatus;
-
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.CELL_DATA_NETWORK_TYPE_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.CELL_VOICE_NETWORK_TYPE_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.EID_INFO_LABEL_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.EID_INFO_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_LABEL_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_LABEL_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.MAX_PHONE_COUNT_SINGLE_SIM;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.NETWORK_PROVIDER_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_LABEL_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.PHONE_NUMBER_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ROAMING_INFO_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SERVICE_STATE_VALUE_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_LABEL_ID;
-import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_VALUE_ID;
-
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-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 static org.robolectric.Shadows.shadowOf;
-
-import android.content.Context;
-import android.content.pm.PackageInfo;
-import android.os.PersistableBundle;
-import android.telephony.CarrierConfigManager;
-import android.telephony.CellSignalStrength;
-import android.telephony.CellSignalStrengthCdma;
-import android.telephony.CellSignalStrengthLte;
-import android.telephony.CellSignalStrengthWcdma;
-import android.telephony.PhoneStateListener;
-import android.telephony.ServiceState;
-import android.telephony.SignalStrength;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.telephony.UiccCardInfo;
-import android.telephony.euicc.EuiccManager;
-
-import androidx.lifecycle.LifecycleOwner;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowDeviceInfoUtils;
-import com.android.settingslib.DeviceInfoUtils;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowPackageManager;
-import org.robolectric.shadows.ShadowTelephonyManager;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowDeviceInfoUtils.class})
-public class SimStatusDialogControllerTest {
-
-    @Mock
-    private SimStatusDialogFragment mDialog;
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private SubscriptionInfo mSubscriptionInfo;
-    @Mock
-    private ServiceState mServiceState;
-    @Mock
-    private PhoneStateListener mPhoneStateListener;
-    @Mock
-    private SignalStrength mSignalStrength;
-    @Mock
-    private CellSignalStrengthCdma mCellSignalStrengthCdma;
-    @Mock
-    private CellSignalStrengthLte mCellSignalStrengthLte;
-    @Mock
-    private CellSignalStrengthWcdma mCellSignalStrengthWcdma;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-    @Mock
-    private PersistableBundle mPersistableBundle;
-    @Mock
-    private EuiccManager mEuiccManager;
-    private SubscriptionManager mSubscriptionManager;
-
-    private SimStatusDialogController mController;
-    private Context mContext;
-    private LifecycleOwner mLifecycleOwner;
-    private Lifecycle mLifecycle;
-
-    private static final String TEST_EID_FROM_CARD = "11111111111111111111111111111111";
-    private static final String TEST_EID_FROM_MANAGER = "22222222222222222222222222222222";
-
-    private static final int MAX_PHONE_COUNT_DUAL_SIM = 2;
-
-    @Before
-    public void setup() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        when(mDialog.getContext()).thenReturn(mContext);
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-
-        mSubscriptionManager = spy(mContext.getSystemService(SubscriptionManager.class));
-
-        mTelephonyManager = spy(mContext.getSystemService(TelephonyManager.class));
-        final ShadowTelephonyManager shadowTelephonyMgr = shadowOf(mTelephonyManager);
-        shadowTelephonyMgr.setTelephonyManagerForSubscriptionId(
-                SubscriptionManager.DEFAULT_SUBSCRIPTION_ID, mTelephonyManager);
-        doReturn(2).when(mTelephonyManager).getCardIdForDefaultEuicc();
-        doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mTelephonyManager).getDataNetworkType();
-
-        doReturn(mEuiccManager).when(mContext).getSystemService(EuiccManager.class);
-
-        mController = spy(new SimStatusDialogController(mDialog, mLifecycle, 0 /* phone id */));
-        ShadowDeviceInfoUtils.setPhoneNumber("");
-        //CellSignalStrength setup
-        doReturn(0).when(mCellSignalStrengthCdma).getDbm();
-        doReturn(0).when(mCellSignalStrengthCdma).getAsuLevel();
-        doReturn(0).when(mCellSignalStrengthLte).getDbm();
-        doReturn(0).when(mCellSignalStrengthLte).getAsuLevel();
-        doReturn(0).when(mCellSignalStrengthWcdma).getDbm();
-        doReturn(0).when(mCellSignalStrengthWcdma).getAsuLevel();
-
-        doReturn(null).when(mSignalStrength).getCellSignalStrengths();
-        doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();
-        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
-
-        ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
-        ReflectionHelpers.setField(mController, "mCarrierConfigManager", mCarrierConfigManager);
-        ReflectionHelpers.setField(mController, "mSubscriptionInfo", mSubscriptionInfo);
-        ReflectionHelpers.setField(mController, "mEuiccManager", mEuiccManager);
-        ReflectionHelpers.setField(mController, "mSubscriptionManager", mSubscriptionManager);
-
-        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
-        doReturn(new ArrayList<UiccCardInfo>()).when(mTelephonyManager).getUiccCardsInfo();
-        doReturn(new HashMap<Integer, Integer>()).when(mTelephonyManager)
-                .getLogicalToPhysicalSlotMapping();
-
-        when(mEuiccManager.isEnabled()).thenReturn(false);
-        when(mEuiccManager.getEid()).thenReturn("");
-        when(mEuiccManager.createForCardId(anyInt())).thenReturn(mEuiccManager);
-
-        when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(mPersistableBundle);
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL))
-                .thenReturn(true);
-        doReturn(mServiceState).when(mTelephonyManager).getServiceState();
-        doReturn(mSignalStrength).when(mTelephonyManager).getSignalStrength();
-
-        final ShadowPackageManager shadowPackageManager =
-                Shadows.shadowOf(RuntimeEnvironment.application.getPackageManager());
-        final PackageInfo sysUIPackageInfo = new PackageInfo();
-        sysUIPackageInfo.packageName = "com.android.systemui";
-        shadowPackageManager.addPackage(sysUIPackageInfo);
-    }
-
-    @After
-    public void tearDown() {
-        ShadowDeviceInfoUtils.reset();
-    }
-
-    @Test
-    public void initialize_updateNetworkProviderWithFoobarCarrier_shouldUpdateCarrierWithFoobar() {
-        final CharSequence carrierName = "foobar";
-        doReturn(carrierName).when(mSubscriptionInfo).getCarrierName();
-
-        mController.initialize();
-
-        verify(mDialog).setText(NETWORK_PROVIDER_VALUE_ID, carrierName);
-    }
-
-    @Test
-    public void initialize_updatePhoneNumberWith1111111111_shouldUpdatePhoneNumber() {
-        ShadowDeviceInfoUtils.setPhoneNumber("1111111111");
-
-        final String phoneNumber = DeviceInfoUtils.getBidiFormattedPhoneNumber(mContext,
-                mSubscriptionInfo);
-
-        mController.initialize();
-
-        verify(mDialog).setText(PHONE_NUMBER_VALUE_ID, phoneNumber);
-    }
-
-    @Test
-    public void initialize_updateLatestAreaInfoWithCdmaPhone_shouldRemoveOperatorInfoSetting() {
-        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
-
-        mController.initialize();
-
-        verify(mDialog).removeSettingFromScreen(OPERATOR_INFO_LABEL_ID);
-        verify(mDialog).removeSettingFromScreen(OPERATOR_INFO_VALUE_ID);
-    }
-
-    @Test
-    public void initialize_updateServiceStateWithInService_shouldUpdateTextToBeCInService() {
-        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
-
-        mController.initialize();
-
-        final String inServiceText = mContext.getString(R.string.radioInfo_service_in);
-        verify(mDialog).setText(SERVICE_STATE_VALUE_ID, inServiceText);
-    }
-
-    @Test
-    public void initialize_updateServiceStateWithPowerOff_shouldUpdateTextAndResetSignalStrength() {
-        when(mServiceState.getState()).thenReturn(ServiceState.STATE_POWER_OFF);
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
-
-        mController.initialize();
-
-        final String offServiceText = mContext.getString(R.string.radioInfo_service_off);
-        verify(mDialog).setText(SERVICE_STATE_VALUE_ID, offServiceText);
-        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, "0");
-    }
-
-    @Test
-    public void initialize_updateVoiceDataOutOfService_shouldUpdateSettingAndResetSignalStrength() {
-        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
-        when(mServiceState.getDataRegistrationState()).thenReturn(
-                ServiceState.STATE_OUT_OF_SERVICE);
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
-
-        mController.initialize();
-
-        final String offServiceText = mContext.getString(R.string.radioInfo_service_out);
-        verify(mDialog).setText(SERVICE_STATE_VALUE_ID, offServiceText);
-        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, "0");
-    }
-
-    @Test
-    public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateTextToBeInService() {
-        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
-        when(mServiceState.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE);
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
-
-        mController.initialize();
-
-        final String inServiceText = mContext.getString(R.string.radioInfo_service_in);
-        verify(mDialog).setText(SERVICE_STATE_VALUE_ID, inServiceText);
-    }
-
-    @Test
-    public void initialize_updateSignalStrengthWithLte50Wcdma40_shouldUpdateSignalStrengthTo50() {
-        final int lteDbm = 50;
-        final int lteAsu = 50;
-        final int wcdmaDbm = 40;
-        final int wcdmaAsu = 40;
-        setupCellSignalStrength_lteWcdma(lteDbm, lteAsu, wcdmaDbm, wcdmaAsu);
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
-
-        mController.initialize();
-
-        final String signalStrengthString =
-                mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
-        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
-    }
-
-    @Test
-    public void initialize_updateSignalStrengthWithLte50Cdma30_shouldUpdateSignalStrengthTo50() {
-        final int lteDbm = 50;
-        final int lteAsu = 50;
-        final int cdmaDbm = 30;
-        final int cdmaAsu = 30;
-        setupCellSignalStrength_lteCdma(lteDbm, lteAsu, cdmaDbm, cdmaAsu);
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
-
-        mController.initialize();
-
-        final String signalStrengthString =
-                mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
-        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
-    }
-
-    @Test
-    public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateSignalStrengthTo50() {
-        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
-        when(mServiceState.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE);
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
-
-        final int lteDbm = 50;
-        final int lteAsu = 50;
-        setupCellSignalStrength_lteOnly(lteDbm, lteAsu);
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL)).thenReturn(true);
-
-        mController.initialize();
-
-        final String signalStrengthString =
-                mContext.getString(R.string.sim_signal_strength, lteDbm, lteAsu);
-        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
-    }
-
-    @Test
-    public void initialize_updateVoiceNetworkTypeWithEdge_shouldUpdateSettingToEdge() {
-        when(mTelephonyManager.getVoiceNetworkType()).thenReturn(
-                TelephonyManager.NETWORK_TYPE_EDGE);
-
-        mController.initialize();
-
-        verify(mDialog).setText(CELL_VOICE_NETWORK_TYPE_VALUE_ID,
-                SimStatusDialogController.getNetworkTypeName(TelephonyManager.NETWORK_TYPE_EDGE));
-    }
-
-    @Test
-    public void initialize_updateDataNetworkTypeWithEdge_shouldUpdateSettingToEdge() {
-        when(mTelephonyManager.getDataNetworkType()).thenReturn(
-                TelephonyManager.NETWORK_TYPE_EDGE);
-
-        mController.initialize();
-
-        verify(mDialog).setText(CELL_DATA_NETWORK_TYPE_VALUE_ID,
-                SimStatusDialogController.getNetworkTypeName(TelephonyManager.NETWORK_TYPE_EDGE));
-    }
-
-    @Test
-    public void initialize_updateRoamingStatusIsRoaming_shouldSetSettingToRoaming() {
-        when(mServiceState.getRoaming()).thenReturn(true);
-
-        mController.initialize();
-
-        final String roamingOnString = mContext.getString(R.string.radioInfo_roaming_in);
-        verify(mDialog).setText(ROAMING_INFO_VALUE_ID, roamingOnString);
-    }
-
-    @Test
-    public void initialize_updateRoamingStatusNotRoaming_shouldSetSettingToRoamingOff() {
-        when(mServiceState.getRoaming()).thenReturn(false);
-
-        mController.initialize();
-
-        final String roamingOffString = mContext.getString(R.string.radioInfo_roaming_not);
-        verify(mDialog).setText(ROAMING_INFO_VALUE_ID, roamingOffString);
-    }
-
-    @Test
-    public void initialize_doNotShowIccid_shouldRemoveIccidSetting() {
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL)).thenReturn(false);
-
-        mController.initialize();
-
-        verify(mDialog).removeSettingFromScreen(ICCID_INFO_LABEL_ID);
-        verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID);
-    }
-
-    @Test
-    public void initialize_doNotShowSignalStrength_shouldRemoveSignalStrengthSetting() {
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL))
-                .thenReturn(false);
-
-        mController.initialize();
-
-        verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID);
-        verify(mDialog).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID);
-    }
-
-    @Test
-    public void initialize_showSignalStrengthAndIccId_shouldShowSignalStrengthAndIccIdSetting() {
-        // getConfigForSubId is nullable, so make sure the default behavior is correct
-        when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(null);
-
-        mController.initialize();
-
-        verify(mDialog).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any());
-        verify(mDialog).removeSettingFromScreen(ICCID_INFO_LABEL_ID);
-        verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID);
-    }
-
-    @Test
-    public void initialize_showIccid_shouldSetIccidToSetting() {
-        final String iccid = "12351351231241";
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL)).thenReturn(true);
-        doReturn(iccid).when(mTelephonyManager).getSimSerialNumber();
-
-        mController.initialize();
-
-        verify(mDialog).setText(ICCID_INFO_VALUE_ID, iccid);
-    }
-
-    @Test
-    public void initialize_updateEid_shouldNotSetEid() {
-        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
-
-        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
-        UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
-                false,                                  // isEuicc
-                0,                                      // cardId
-                null,                                   // eid
-                "123451234567890",                      // iccid
-                0,                                      // slotIndex
-                true);                                  // isRemovable
-        uiccCardInfos.add(uiccCardInfo1);
-        UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
-                true,                                   // isEuicc
-                1,                                      // cardId
-                null,                                   // eid (unavailable)
-                null,                                   // iccid
-                1,                                      // slotIndex
-                false);                                 // isRemovable
-        uiccCardInfos.add(uiccCardInfo2);
-        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
-
-        Map<Integer, Integer> slotMapping = new HashMap<>();
-        slotMapping.put(0, 1);
-        slotMapping.put(1, 0);
-        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
-
-        when(mEuiccManager.isEnabled()).thenReturn(true);
-        when(mEuiccManager.getEid()).thenReturn(null);
-
-        doNothing().when(mController).requestForUpdateEid();
-        mController.updateEid(mController.getEid(0));
-        mController.initialize();
-
-        // Keep 'Not available' if neither the card nor the associated manager can provide EID.
-        verify(mDialog, never()).setText(eq(EID_INFO_VALUE_ID), any());
-        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
-    }
-
-    @Test
-    public void initialize_updateEid_shouldSetEidFromCard() {
-        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
-
-        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
-        UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
-                true,                                   // isEuicc
-                0,                                      // cardId
-                TEST_EID_FROM_CARD,                     // eid
-                null,                                   // iccid
-                0,                                      // slotIndex
-                false);                                 // isRemovable
-        uiccCardInfos.add(uiccCardInfo1);
-        UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
-                false,                                  // isEuicc
-                1,                                      // cardId
-                null,                                   // eid
-                "123451234567890",                      // iccid
-                1,                                      // slotIndex
-                true);                                  // isRemovable
-        uiccCardInfos.add(uiccCardInfo2);
-        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
-
-        Map<Integer, Integer> slotMapping = new HashMap<>();
-        slotMapping.put(0, 0);
-        slotMapping.put(1, 1);
-        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
-
-        when(mEuiccManager.isEnabled()).thenReturn(true);
-        when(mEuiccManager.getEid()).thenReturn(TEST_EID_FROM_MANAGER);
-        when(mEuiccManager.createForCardId(0)).thenReturn(mEuiccManager);
-
-        doNothing().when(mController).requestForUpdateEid();
-        mController.updateEid(mController.getEid(0));
-        mController.initialize();
-
-        // Set EID retrieved from the card.
-        verify(mDialog).setText(EID_INFO_VALUE_ID, TEST_EID_FROM_CARD);
-        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
-    }
-
-    @Test
-    public void initialize_updateEid_shouldSetEidFromManager() {
-        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
-
-        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
-        UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
-                false,                                  // isEuicc
-                0,                                      // cardId
-                null,                                   // eid
-                "123451234567890",                      // iccid
-                0,                                      // slotIndex
-                true);                                  // isRemovable
-        uiccCardInfos.add(uiccCardInfo1);
-        UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
-                true,                                   // isEuicc
-                1,                                      // cardId
-                null,                                   // eid (unavailable)
-                null,                                   // iccid
-                1,                                      // slotIndex
-                false);                                 // isRemovable
-        uiccCardInfos.add(uiccCardInfo2);
-        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
-
-        Map<Integer, Integer> slotMapping = new HashMap<>();
-        slotMapping.put(0, 1);
-        slotMapping.put(1, 0);
-        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
-
-        when(mEuiccManager.isEnabled()).thenReturn(true);
-        when(mEuiccManager.getEid()).thenReturn(TEST_EID_FROM_MANAGER);
-        when(mEuiccManager.createForCardId(0)).thenThrow(
-                new RuntimeException("Unexpected card ID was specified"));
-        when(mEuiccManager.createForCardId(1)).thenReturn(mEuiccManager);
-
-        doNothing().when(mController).requestForUpdateEid();
-        mController.updateEid(mController.getEid(0));
-        mController.initialize();
-
-        // Set EID retrieved from the manager associated with the card which cannot provide EID.
-        verify(mDialog).setText(EID_INFO_VALUE_ID, TEST_EID_FROM_MANAGER);
-        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
-    }
-
-    @Test
-    public void initialize_updateEid_shouldRemoveEid() {
-        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
-
-        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
-        UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
-                false,                                  // isEuicc
-                0,                                      // cardId
-                null,                                   // eid
-                "123451234567890",                      // iccid
-                0,                                      // slotIndex
-                true);                                  // isRemovable
-        uiccCardInfos.add(uiccCardInfo1);
-        UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
-                true,                                   // isEuicc
-                1,                                      // cardId
-                TEST_EID_FROM_CARD,                     // eid
-                null,                                   // iccid
-                1,                                      // slotIndex
-                false);                                 // isRemovable
-        uiccCardInfos.add(uiccCardInfo2);
-        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
-
-        Map<Integer, Integer> slotMapping = new HashMap<>();
-        slotMapping.put(0, 0);
-        slotMapping.put(1, 1);
-        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
-
-        when(mEuiccManager.isEnabled()).thenReturn(true);
-        when(mEuiccManager.getEid()).thenReturn(TEST_EID_FROM_MANAGER);
-
-        doNothing().when(mController).requestForUpdateEid();
-        mController.updateEid(mController.getEid(0));
-        mController.initialize();
-
-        // Remove EID if the card is not eUICC.
-        verify(mDialog, never()).setText(eq(EID_INFO_VALUE_ID), any());
-        verify(mDialog).removeSettingFromScreen(eq(EID_INFO_LABEL_ID));
-        verify(mDialog).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
-    }
-
-    @Test
-    public void initialize_updateEid_shouldNotSetEidInSingleSimMode() {
-        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
-
-        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
-        UiccCardInfo uiccCardInfo = new UiccCardInfo(
-                true,                                   // isEuicc
-                0,                                      // cardId
-                TEST_EID_FROM_CARD,                     // eid (not used)
-                null,                                   // iccid
-                0,                                      // slotIndex
-                false);                                 // isRemovable
-        uiccCardInfos.add(uiccCardInfo);
-        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
-
-        Map<Integer, Integer> slotMapping = new HashMap<>();
-        slotMapping.put(0, 0);
-        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
-
-        when(mEuiccManager.isEnabled()).thenReturn(true);
-        when(mEuiccManager.getEid()).thenReturn(null);
-
-        doNothing().when(mController).requestForUpdateEid();
-        mController.updateEid(mController.getEid(0));
-        mController.initialize();
-
-        // Keep 'Not available' if the default eUICC manager cannot provide EID in Single SIM mode.
-        verify(mDialog, never()).setText(eq(EID_INFO_VALUE_ID), any());
-        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
-    }
-
-    @Test
-    public void initialize_updateEid_shouldSetEidInSingleSimModeWithEnabledEuicc() {
-        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
-
-        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
-        UiccCardInfo uiccCardInfo = new UiccCardInfo(
-                true,                                   // isEuicc (eUICC slot is selected)
-                0,                                      // cardId
-                TEST_EID_FROM_CARD,                     // eid (not used)
-                null,                                   // iccid
-                0,                                      // slotIndex
-                false);                                 // isRemovable
-        uiccCardInfos.add(uiccCardInfo);
-        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
-
-        Map<Integer, Integer> slotMapping = new HashMap<>();
-        slotMapping.put(0, 0);
-        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
-
-        when(mEuiccManager.isEnabled()).thenReturn(true);
-        when(mEuiccManager.getEid()).thenReturn(TEST_EID_FROM_MANAGER);
-        when(mEuiccManager.createForCardId(anyInt())).thenThrow(
-                new RuntimeException("EID shall be retrieved from the default eUICC manager"));
-
-        doNothing().when(mController).requestForUpdateEid();
-        mController.updateEid(mController.getEid(0));
-        mController.initialize();
-
-        // Set EID retrieved from the default eUICC manager in Single SIM mode.
-        verify(mDialog).setText(EID_INFO_VALUE_ID, TEST_EID_FROM_MANAGER);
-        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
-    }
-
-    @Test
-    public void initialize_updateEid_shouldSetEidInSingleSimModeWithDisabledEuicc() {
-        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
-
-        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
-        UiccCardInfo uiccCardInfo = new UiccCardInfo(
-                false,                                  // isEuicc (eUICC slot is not selected)
-                0,                                      // cardId
-                null,                                   // eid
-                "123451234567890",                      // iccid
-                0,                                      // slotIndex
-                true);                                  // isRemovable
-        uiccCardInfos.add(uiccCardInfo);
-        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
-
-        Map<Integer, Integer> slotMapping = new HashMap<>();
-        slotMapping.put(0, 0);
-        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
-
-        when(mEuiccManager.isEnabled()).thenReturn(true);
-        when(mEuiccManager.getEid()).thenReturn(TEST_EID_FROM_MANAGER);
-        when(mEuiccManager.createForCardId(anyInt())).thenThrow(
-                new RuntimeException("EID shall be retrieved from the default eUICC manager"));
-
-        doNothing().when(mController).requestForUpdateEid();
-        mController.updateEid(mController.getEid(0));
-        mController.initialize();
-
-        // Set EID retrieved from the default eUICC manager in Single SIM mode.
-        verify(mDialog).setText(EID_INFO_VALUE_ID, TEST_EID_FROM_MANAGER);
-        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
-    }
-
-    @Test
-    public void initialize_updateEid_shouldRemoveEidInSingleSimMode() {
-        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
-
-        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
-        UiccCardInfo uiccCardInfo = new UiccCardInfo(
-                false,                                  // isEuicc
-                0,                                      // cardId
-                null,                                   // eid
-                "123451234567890",                      // iccid
-                0,                                      // slotIndex
-                true);                                  // isRemovable
-        uiccCardInfos.add(uiccCardInfo);
-        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
-
-        Map<Integer, Integer> slotMapping = new HashMap<>();
-        slotMapping.put(0, 0);
-        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
-
-        when(mEuiccManager.isEnabled()).thenReturn(false);
-        when(mEuiccManager.getEid()).thenReturn(null);
-
-        doNothing().when(mController).requestForUpdateEid();
-        mController.updateEid(mController.getEid(0));
-        mController.initialize();
-
-        // Remove EID if the default eUICC manager indicates that eSIM is not enabled.
-        verify(mDialog, never()).setText(eq(EID_INFO_VALUE_ID), any());
-        verify(mDialog).removeSettingFromScreen(eq(EID_INFO_LABEL_ID));
-        verify(mDialog).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
-    }
-
-    @Test
-    @Ignore
-    public void initialize_imsRegistered_shouldSetImsRegistrationStateSummaryToRegisterd() {
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL)).thenReturn(true);
-        when(mTelephonyManager.isImsRegistered(anyInt())).thenReturn(true);
-
-        mController.initialize();
-
-        verify(mDialog).setText(IMS_REGISTRATION_STATE_VALUE_ID,
-                mContext.getString(R.string.ims_reg_status_registered));
-    }
-
-    @Test
-    @Ignore
-    public void initialize_imsNotRegistered_shouldSetImsRegistrationStateSummaryToNotRegisterd() {
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL)).thenReturn(true);
-        when(mTelephonyManager.isImsRegistered(anyInt())).thenReturn(false);
-
-        mController.initialize();
-
-        verify(mDialog).setText(IMS_REGISTRATION_STATE_VALUE_ID,
-                mContext.getString(R.string.ims_reg_status_not_registered));
-    }
-
-    @Test
-    @Ignore
-    public void initialize_showImsRegistration_shouldNotRemoveImsRegistrationStateSetting() {
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL)).thenReturn(true);
-
-        mController.initialize();
-
-        verify(mDialog, never()).removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID);
-    }
-
-    @Test
-    @Ignore
-    public void initialize_doNotShowImsRegistration_shouldRemoveImsRegistrationStateSetting() {
-        when(mPersistableBundle.getBoolean(
-                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL)).thenReturn(false);
-
-        mController.initialize();
-
-        verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_LABEL_ID);
-        verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID);
-    }
-
-    @Test
-    public void initialize_nullSignalStrength_noCrash() {
-        doReturn(null).when(mTelephonyManager).getSignalStrength();
-        // we should not crash when running the following line
-        mController.initialize();
-    }
-
-    private void setupCellSignalStrength_lteWcdma(int lteDbm, int lteAsu, int wcdmaDbm,
-            int wcdmaAsu) {
-        doReturn(lteDbm).when(mCellSignalStrengthLte).getDbm();
-        doReturn(lteAsu).when(mCellSignalStrengthLte).getAsuLevel();
-        doReturn(wcdmaDbm).when(mCellSignalStrengthWcdma).getDbm();
-        doReturn(wcdmaAsu).when(mCellSignalStrengthWcdma).getAsuLevel();
-
-        List<CellSignalStrength> cellSignalStrengthList = new ArrayList<>(2);
-        cellSignalStrengthList.add(mCellSignalStrengthLte);
-        cellSignalStrengthList.add(mCellSignalStrengthWcdma);
-
-        doReturn(cellSignalStrengthList).when(mSignalStrength).getCellSignalStrengths();
-    }
-
-    private void setupCellSignalStrength_lteCdma(int lteDbm, int lteAsu, int cdmaDbm, int cdmaAsu) {
-        doReturn(lteDbm).when(mCellSignalStrengthLte).getDbm();
-        doReturn(lteAsu).when(mCellSignalStrengthLte).getAsuLevel();
-        doReturn(cdmaDbm).when(mCellSignalStrengthCdma).getDbm();
-        doReturn(cdmaAsu).when(mCellSignalStrengthCdma).getAsuLevel();
-
-        List<CellSignalStrength> cellSignalStrengthList = new ArrayList<>(2);
-        cellSignalStrengthList.add(mCellSignalStrengthLte);
-        cellSignalStrengthList.add(mCellSignalStrengthCdma);
-
-        doReturn(cellSignalStrengthList).when(mSignalStrength).getCellSignalStrengths();
-    }
-
-    private void setupCellSignalStrength_lteOnly(int lteDbm, int lteAsu) {
-        doReturn(lteDbm).when(mCellSignalStrengthLte).getDbm();
-        doReturn(lteAsu).when(mCellSignalStrengthLte).getAsuLevel();
-
-        List<CellSignalStrength> cellSignalStrengthList = new ArrayList<>(2);
-        cellSignalStrengthList.add(mCellSignalStrengthLte);
-
-        doReturn(cellSignalStrengthList).when(mSignalStrength).getCellSignalStrengths();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
index 70620bc..d1371a2 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java
@@ -42,7 +42,7 @@
 import com.android.settings.deletionhelper.ActivationWarningFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -60,7 +60,7 @@
     @Mock
     private PreferenceScreen mScreen;
     @Mock
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mMockContext;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
deleted file mode 100644
index 5aa9f72..0000000
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.android.settings.deviceinfo.storage;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.os.storage.VolumeInfo;
-
-import com.android.settingslib.deviceinfo.PrivateStorageInfo;
-import com.android.settingslib.deviceinfo.StorageVolumeProvider;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class VolumeSizesLoaderTest {
-    @Test
-    public void getVolumeSize_getsValidSizes() throws Exception {
-        VolumeInfo info = mock(VolumeInfo.class);
-        StorageVolumeProvider storageVolumeProvider = mock(StorageVolumeProvider.class);
-        when(storageVolumeProvider.getTotalBytes(any(), any())).thenReturn(10000L);
-        when(storageVolumeProvider.getFreeBytes(any(), any())).thenReturn(1000L);
-
-        PrivateStorageInfo storageInfo =
-                VolumeSizesLoader.getVolumeSize(storageVolumeProvider, null, info);
-
-        assertThat(storageInfo.freeBytes).isEqualTo(1000L);
-        assertThat(storageInfo.totalBytes).isEqualTo(10000L);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/AdaptiveSleepDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AdaptiveSleepDetailPreferenceControllerTest.java
deleted file mode 100644
index 981942d..0000000
--- a/tests/robotests/src/com/android/settings/display/AdaptiveSleepDetailPreferenceControllerTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.display;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import com.android.internal.R;
-import com.android.settings.testutils.shadow.SettingsShadowResources;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {SettingsShadowResources.class})
-public class AdaptiveSleepDetailPreferenceControllerTest {
-
-    private AdaptiveSleepDetailPreferenceController mController;
-    @Mock
-    private PackageManager mPackageManager;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        Context context = Mockito.spy(RuntimeEnvironment.application);
-        doReturn(mPackageManager).when(context).getPackageManager();
-        mController = new AdaptiveSleepDetailPreferenceController(context, "test_key");
-    }
-
-    @Test
-    public void isSliceable_returnTrue() {
-        mController.onPreferenceChange(null, true);
-        assertThat(mController.isSliceable()).isTrue();
-    }
-
-    @Test
-    public void isPublicSlice_returnTrue() {
-        assertThat(mController.isPublicSlice()).isTrue();
-    }
-
-    @Test
-    public void getAvailabilityStatus_configTrueSet_shouldReturnAvailable() {
-        SettingsShadowResources.overrideResource(R.bool.config_adaptive_sleep_available, true);
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_configFalseSet_shouldReturnUnsupportedOnDevice() {
-        SettingsShadowResources.overrideResource(R.bool.config_adaptive_sleep_available, false);
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceControllerTest.java
index f2edf98..0ac600f 100644
--- a/tests/robotests/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AdaptiveSleepPermissionPreferenceControllerTest.java
@@ -11,73 +11,69 @@
  * 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
+ * limitations under the License.
  */
 
 package com.android.settings.display;
 
-import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 
-import static com.google.common.truth.Truth.assertThat;
-
+import static org.mockito.ArgumentMatchers.any;
 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.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
 
-import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class AdaptiveSleepPermissionPreferenceControllerTest {
-    private final static String PACKAGE_NAME = "package_name";
+    private Context mContext;
     private AdaptiveSleepPermissionPreferenceController mController;
+
     @Mock
     private PackageManager mPackageManager;
     @Mock
-    private Preference mPreference;
+    private PreferenceScreen mScreen;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        Context context = Mockito.spy(RuntimeEnvironment.application);
-        doReturn(mPackageManager).when(context).getPackageManager();
-        doReturn(PACKAGE_NAME).when(mPackageManager).getAttentionServicePackageName();
-        doReturn(PackageManager.PERMISSION_GRANTED).when(mPackageManager).checkPermission(
-                Manifest.permission.CAMERA, PACKAGE_NAME);
-        mController = new AdaptiveSleepPermissionPreferenceController(context, "test_key");
-        doReturn(mController.getPreferenceKey()).when(mPreference).getKey();
+        mContext = spy(getApplicationContext());
+
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        when(mPackageManager.getAttentionServicePackageName()).thenReturn("some.package");
+        when(mPackageManager.checkPermission(any(), any())).thenReturn(
+                PackageManager.PERMISSION_GRANTED);
+
+        mController = new AdaptiveSleepPermissionPreferenceController(mContext);
     }
 
     @Test
-    public void getAvailabilityStatus_returnAvailableUnsearchable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+    public void addToScreen_normalCase_hidePreference() {
+        mController.addToScreen(mScreen);
+
+        verify(mScreen, never()).addPreference(mController.mPreference);
     }
 
     @Test
-    public void updateStates_permissionGranted_preferenceInvisible() {
-        mController.updateState(mPreference);
+    public void addToScreen_permissionNotGranted_showPreference() {
+        when(mPackageManager.checkPermission(any(), any())).thenReturn(
+                PackageManager.PERMISSION_DENIED);
 
-        verify(mPreference).setVisible(false);
-    }
+        mController.addToScreen(mScreen);
 
-    @Test
-    public void updateStates_permissionRevoked_preferenceVisible() {
-        doReturn(PackageManager.PERMISSION_DENIED).when(mPackageManager).checkPermission(
-                Manifest.permission.CAMERA, PACKAGE_NAME);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setVisible(true);
+        verify(mScreen).addPreference(mController.mPreference);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/AdaptiveSleepPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AdaptiveSleepPreferenceControllerTest.java
index 87f59f2..1db7873 100644
--- a/tests/robotests/src/com/android/settings/display/AdaptiveSleepPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AdaptiveSleepPreferenceControllerTest.java
@@ -18,27 +18,32 @@
 
 import static android.provider.Settings.Secure.ADAPTIVE_SLEEP;
 
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 
 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.ArgumentMatchers.isA;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.os.UserManager;
 import android.provider.Settings;
 
-import androidx.preference.Preference;
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.R;
+import com.android.settings.bluetooth.RestrictionUtils;
+import com.android.settingslib.RestrictedLockUtils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -46,13 +51,9 @@
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class AdaptiveSleepPreferenceControllerTest {
-
-    private static final String PREFERENCE_KEY = "adaptive_sleep";
-
     private Context mContext;
     private AdaptiveSleepPreferenceController mController;
     private ContentResolver mContentResolver;
@@ -62,114 +63,101 @@
     @Mock
     private PreferenceScreen mScreen;
     @Mock
-    private Preference mPreference;
+    private RestrictionUtils mRestrictionUtils;
+    @Mock
+    private RestrictedLockUtils.EnforcedAdmin mEnforcedAdmin;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
+        mContext = spy(getApplicationContext());
         mContentResolver = mContext.getContentResolver();
 
         doReturn(mPackageManager).when(mContext).getPackageManager();
         when(mPackageManager.getAttentionServicePackageName()).thenReturn("some.package");
         when(mPackageManager.checkPermission(any(), any())).thenReturn(
                 PackageManager.PERMISSION_GRANTED);
+        when(mRestrictionUtils.checkIfRestrictionEnforced(any(),
+                eq(UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT))).thenReturn(null);
 
-        mController = new AdaptiveSleepPreferenceController(mContext, PREFERENCE_KEY);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        mController = new AdaptiveSleepPreferenceController(mContext, mRestrictionUtils);
     }
 
     @Test
-    public void isControllerAvailable_ServiceUnavailable_returnUnsupported() {
-        doReturn(null).when(mPackageManager).resolveService(isA(Intent.class), anyInt());
+    public void controlSetting_preferenceChecked_FeatureTurnOn() {
+        mController.mPreference.setChecked(false);
+
+        mController.mPreference.performClick();
+
+        int mode = Settings.Secure.getInt(mContentResolver, ADAPTIVE_SLEEP, 0);
+        assertThat(mode).isEqualTo(1);
+    }
+
+    @Test
+    public void controlSetting_preferenceNotChecked_FeatureTurnOff() {
+        mController.mPreference.setChecked(true);
+
+        mController.mPreference.performClick();
+
+        int mode = Settings.Secure.getInt(mContentResolver, ADAPTIVE_SLEEP, 1);
+        assertThat(mode).isEqualTo(0);
+    }
+
+    @Test
+    public void isControllerAvailable_serviceNotSupported_returnUnsupportedCode() {
+        when(mPackageManager.resolveService(isA(Intent.class), anyInt())).thenReturn(null);
 
         assertThat(AdaptiveSleepPreferenceController.isControllerAvailable(mContext)).isEqualTo(
                 UNSUPPORTED_ON_DEVICE);
     }
 
     @Test
-    public void onPreferenceChange_turnOn_returnOn() {
-        mController.onPreferenceChange(null, true);
-
-        final int mode = Settings.Secure.getInt(mContentResolver, ADAPTIVE_SLEEP, 0);
-        assertThat(mode).isEqualTo(1);
+    public void hasSufficientPermission_permissionGranted_returnTrue() {
+        assertThat(AdaptiveSleepPreferenceController.hasSufficientPermission(
+                mPackageManager)).isTrue();
     }
 
     @Test
-    public void onPreferenceChange_turnOff_returnOff() {
-        mController.onPreferenceChange(null, false);
-
-        final int mode = Settings.Secure.getInt(mContentResolver, ADAPTIVE_SLEEP, 1);
-        assertThat(mode).isEqualTo(0);
-    }
-
-    @Test
-    public void setChecked_updatesCorrectly() {
-        mController.setChecked(true);
-
-        assertThat(mController.isChecked()).isTrue();
-
-        mController.setChecked(false);
-
-        assertThat(mController.isChecked()).isFalse();
-    }
-
-    @Test
-    public void isChecked_no() {
-        Settings.System.putInt(mContentResolver, ADAPTIVE_SLEEP, 0);
-
-        assertThat(mController.isChecked()).isFalse();
-    }
-
-    @Test
-    public void isChecked_yes() {
-        Settings.Secure.putInt(mContentResolver, ADAPTIVE_SLEEP, 1);
-
-        assertThat(mController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void getSummary_settingOn_shouldReturnOnSummary() {
-        mController.setChecked(true);
-
-        assertThat(mController.getSummary())
-                .isEqualTo(mContext.getText(R.string.adaptive_sleep_summary_on));
-    }
-
-    @Test
-    public void getSummary_settingOff_shouldReturnOffSummary() {
-        mController.setChecked(false);
-
-        assertThat(mController.getSummary())
-                .isEqualTo(mContext.getText(R.string.adaptive_sleep_summary_off));
-    }
-
-    @Test
-    public void isSliceable_returnsTrue() {
-        final AdaptiveSleepPreferenceController controller =
-                new AdaptiveSleepPreferenceController(mContext, "any_key");
-        assertThat(controller.isSliceable()).isTrue();
-    }
-
-    @Test
-    public void isChecked_returnsFalseWhenNotSufficientPermissions() {
-        when(mPackageManager.checkPermission(any(), any())).thenReturn(
-                PackageManager.PERMISSION_DENIED);
-        final AdaptiveSleepPreferenceController controller = new AdaptiveSleepPreferenceController(
-                mContext, PREFERENCE_KEY);
-
-        controller.setChecked(true);
-        assertThat(controller.isChecked()).isFalse();
-    }
-
-    @Test
-    public void isEnabled_returnsFalseWhenNotSufficientPermissions() {
+    public void hasSufficientPermission_permissionNotGranted_returnFalse() {
         when(mPackageManager.checkPermission(any(), any())).thenReturn(
                 PackageManager.PERMISSION_DENIED);
 
-        mController.setChecked(true);
-        mController.displayPreference(mScreen);
-        assertThat(mPreference.isEnabled()).isFalse();
+        assertThat(AdaptiveSleepPreferenceController.hasSufficientPermission(
+                mPackageManager)).isFalse();
+    }
+
+    @Test
+    public void addToScreen_normalCase_enablePreference() {
+        mController.mPreference.setEnabled(false);
+        when(mPackageManager.checkPermission(any(), any())).thenReturn(
+                PackageManager.PERMISSION_GRANTED);
+
+        mController.addToScreen(mScreen);
+
+        assertThat(mController.mPreference.isEnabled()).isTrue();
+        verify(mScreen).addPreference(mController.mPreference);
+    }
+
+    @Test
+    public void addToScreen_permissionNotGranted_disablePreference() {
+        mController.mPreference.setEnabled(true);
+        when(mPackageManager.checkPermission(any(), any())).thenReturn(
+                PackageManager.PERMISSION_DENIED);
+
+        mController.addToScreen(mScreen);
+
+        assertThat(mController.mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void addToScreen_enforcedAdmin_disablePreference() {
+        mController.mPreference.setEnabled(true);
+
+        when(mRestrictionUtils.checkIfRestrictionEnforced(any(),
+                eq(UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT))).thenReturn(mEnforcedAdmin);
+
+        mController.addToScreen(mScreen);
+
+        assertThat(mController.mPreference.isEnabled()).isFalse();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
index 1548b42..405ea12 100644
--- a/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceControllerTest.java
@@ -19,13 +19,20 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyInt;
+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.ContentResolver;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.hardware.display.AmbientDisplayConfiguration;
+import android.os.PowerManager;
 import android.provider.Settings;
 
+import com.android.internal.R;
 import com.android.settings.testutils.shadow.ShadowSecureSettings;
 
 import org.junit.Before;
@@ -41,24 +48,41 @@
 @Config(shadows = ShadowSecureSettings.class)
 public class AmbientDisplayAlwaysOnPreferenceControllerTest {
 
+    private static final String TEST_PACKAGE = "com.android.test";
+
     @Mock
     private AmbientDisplayConfiguration mConfig;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private PowerManager mPowerManager;
+    @Mock
+    private ApplicationInfo mApplicationInfo;
 
     private Context mContext;
 
     private ContentResolver mContentResolver;
 
     private AmbientDisplayAlwaysOnPreferenceController mController;
-    private boolean mCallbackInvoked;
 
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
+        mContext = spy(RuntimeEnvironment.application);
         mContentResolver = mContext.getContentResolver();
         mController = new AmbientDisplayAlwaysOnPreferenceController(mContext, "key");
         mController.setConfig(mConfig);
-        mController.setCallback(() -> mCallbackInvoked = true);
+
+        mApplicationInfo.uid = 1;
+        when(mContext.getString(R.string.config_defaultWellbeingPackage)).thenReturn(TEST_PACKAGE);
+
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        doReturn(mApplicationInfo).when(mPackageManager).getApplicationInfo(
+                TEST_PACKAGE, /* flag= */0);
+
+        doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
+        when(mPowerManager.isAmbientDisplaySuppressedForTokenByApp(anyString(), anyInt()))
+                .thenReturn(false);
     }
 
     @Test
@@ -108,13 +132,6 @@
     }
 
     @Test
-    public void onPreferenceChange_callback() {
-        assertThat(mCallbackInvoked).isFalse();
-        mController.setChecked(true);
-        assertThat(mCallbackInvoked).isTrue();
-    }
-
-    @Test
     public void isSliceableCorrectKey_returnsTrue() {
         final AmbientDisplayAlwaysOnPreferenceController controller =
                 new AmbientDisplayAlwaysOnPreferenceController(mContext,
@@ -133,4 +150,39 @@
     public void isPublicSlice_returnTrue() {
         assertThat(mController.isPublicSlice()).isTrue();
     }
+
+    @Test
+    public void isAodSuppressedByBedtime_bedTimeModeOn_returnTrue() {
+        when(mPowerManager.isAmbientDisplaySuppressedForTokenByApp(anyString(), anyInt()))
+                .thenReturn(true);
+
+        assertThat(AmbientDisplayAlwaysOnPreferenceController
+                .isAodSuppressedByBedtime(mContext)).isTrue();
+    }
+
+    @Test
+    public void isAodSuppressedByBedtime_bedTimeModeOff_returnFalse() {
+        assertThat(AmbientDisplayAlwaysOnPreferenceController
+                .isAodSuppressedByBedtime(mContext)).isFalse();
+    }
+
+    @Test
+    public void isAodSuppressedByBedtime_notFoundWellbeingPackage_returnFalse()
+            throws PackageManager.NameNotFoundException {
+        when(mPackageManager.getApplicationInfo(TEST_PACKAGE, /* flag= */0)).thenThrow(
+                new PackageManager.NameNotFoundException());
+
+        assertThat(AmbientDisplayAlwaysOnPreferenceController
+                .isAodSuppressedByBedtime(mContext)).isFalse();
+    }
+
+    @Test
+    public void getSummary_bedTimeModeOn_shouldReturnUnavailableSummary() {
+        when(mPowerManager.isAmbientDisplaySuppressedForTokenByApp(anyString(), anyInt()))
+                .thenReturn(true);
+
+        final CharSequence summary = mController.getSummary();
+        assertThat(summary).isEqualTo(mContext.getString(
+                com.android.settings.R.string.aware_summary_when_bedtime_on));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
index bbc8faf..c84127b 100644
--- a/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/BatteryPercentagePreferenceControllerTest.java
@@ -18,18 +18,25 @@
 
 import static android.provider.Settings.System.SHOW_BATTERY_PERCENT;
 
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
 import android.provider.Settings;
 
+import com.android.settings.testutils.shadow.ShadowUtils;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowUtils.class)
 public class BatteryPercentagePreferenceControllerTest {
 
     private static final String PREF_KEY = "battery_percentage";
@@ -43,6 +50,11 @@
         mController = new BatteryPercentagePreferenceController(mContext, PREF_KEY);
     }
 
+    @After
+    public void tearDown() {
+        ShadowUtils.reset();
+    }
+
     private int getPercentageSetting() {
         return Settings.System.getInt(mContext.getContentResolver(), SHOW_BATTERY_PERCENT, 0);
     }
@@ -60,4 +72,11 @@
         final int isOn = getPercentageSetting();
         assertThat(isOn).isEqualTo(0);
     }
+
+    @Test
+    public void getAvailabilityStatus_batteryNotPresent_shouldReturnConditionallyUnavailable() {
+        ShadowUtils.setIsBatteryPresent(false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java
deleted file mode 100644
index efb26fa..0000000
--- a/tests/robotests/src/com/android/settings/display/NightDisplayFooterPreferenceControllerTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.android.settings.display;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
-import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-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.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = SettingsShadowResources.class)
-public class NightDisplayFooterPreferenceControllerTest {
-
-    private NightDisplayFooterPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mController =
-                new NightDisplayFooterPreferenceController(RuntimeEnvironment.application, "key");
-    }
-
-    @After
-    public void tearDown() {
-        SettingsShadowResources.reset();
-    }
-
-    @Test
-    public void getAvailabilityStatus_configuredAvailable_shouldReturnAVAILABLE_UNSEARCHABLE() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.bool.config_nightDisplayAvailable, true);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_configuredUnavailable_shouldReturnUNSUPPORTED_ON_DEVICE() {
-        SettingsShadowResources.overrideResource(
-                com.android.internal.R.bool.config_nightDisplayAvailable, false);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java
index eeaae67f..ea1896e 100644
--- a/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/NightDisplayPreferenceControllerTest.java
@@ -2,11 +2,15 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.app.Application;
+import android.content.Context;
 import android.hardware.display.ColorDisplayManager;
+
 import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
 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.robolectric.RobolectricTestRunner;
@@ -17,41 +21,81 @@
 @Config(shadows = {SettingsShadowResources.class})
 public class NightDisplayPreferenceControllerTest {
 
-  @After
-  public void tearDown() {
-    SettingsShadowResources.reset();
-  }
+    private Context mContext;
+    private ColorDisplayManager mColorDisplayManager;
+    private NightDisplayPreferenceController mPreferenceController;
 
-  @Test
-  public void nightDisplaySuggestion_isNotCompleted_ifAutoModeDisabled() {
-    final Application context = RuntimeEnvironment.application;
-    context.getSystemService(ColorDisplayManager.class)
-        .setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_DISABLED);
-    assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isFalse();
-  }
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mColorDisplayManager = mContext.getSystemService(ColorDisplayManager.class);
+        mPreferenceController = new NightDisplayPreferenceController(mContext, "test");
+    }
 
-  @Test
-  public void nightDisplaySuggestion_isCompleted_ifAutoModeCustom() {
-    final Application context = RuntimeEnvironment.application;
-    context.getSystemService(ColorDisplayManager.class)
-        .setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_CUSTOM_TIME);
-    assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isTrue();
-  }
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
 
-  @Test
-  public void nightDisplaySuggestion_isCompleted_ifAutoModeTwilight() {
-    final Application context = RuntimeEnvironment.application;
-    context.getSystemService(ColorDisplayManager.class)
-        .setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_TWILIGHT);
-    assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isTrue();
-  }
+    @Test
+    public void nightDisplaySuggestion_isNotCompleted_ifAutoModeDisabled() {
+        mColorDisplayManager.setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_DISABLED);
 
-  @Test
-  public void nightDisplaySuggestion_isCompleted_ifSuggestionDisabled() {
-    final Application context = RuntimeEnvironment.application;
-    context.getSystemService(ColorDisplayManager.class)
-        .setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_DISABLED);
-    SettingsShadowResources.overrideResource(R.bool.config_night_light_suggestion_enabled, false);
-    assertThat(NightDisplayPreferenceController.isSuggestionComplete(context)).isTrue();
-  }
-}
+        assertThat(NightDisplayPreferenceController.isSuggestionComplete(mContext)).isFalse();
+    }
+
+    @Test
+    public void nightDisplaySuggestion_isCompleted_ifAutoModeCustom() {
+        mColorDisplayManager.setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_CUSTOM_TIME);
+
+        assertThat(NightDisplayPreferenceController.isSuggestionComplete(mContext)).isTrue();
+    }
+
+    @Test
+    public void nightDisplaySuggestion_isCompleted_ifAutoModeTwilight() {
+        mColorDisplayManager.setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_TWILIGHT);
+
+        assertThat(NightDisplayPreferenceController.isSuggestionComplete(mContext)).isTrue();
+    }
+
+    @Test
+    public void nightDisplaySuggestion_isCompleted_ifSuggestionDisabled() {
+        mColorDisplayManager.setNightDisplayAutoMode(ColorDisplayManager.AUTO_MODE_DISABLED);
+        SettingsShadowResources.overrideResource(R.bool.config_night_light_suggestion_enabled,
+                false);
+
+        assertThat(NightDisplayPreferenceController.isSuggestionComplete(mContext)).isTrue();
+    }
+
+    @Test
+    public void getAvailabilityStatus_nightDisplayIsSupported_returnAvailable() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_nightDisplayAvailable, true);
+
+        assertThat(mPreferenceController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_nightDisplayIsNotSupported_returnUnsupportedOnDevice() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_nightDisplayAvailable, false);
+
+        assertThat(mPreferenceController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void isChecked_nightDisplayIsActivated_returnTrue() {
+        mColorDisplayManager.setNightDisplayActivated(true);
+
+        assertThat(mPreferenceController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_nightDisplayIsNotActivated_returnFalse() {
+        mColorDisplayManager.setNightDisplayActivated(false);
+
+        assertThat(mPreferenceController.isChecked()).isFalse();
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayTopIntroPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayTopIntroPreferenceControllerTest.java
new file mode 100644
index 0000000..10f7f0b
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/NightDisplayTopIntroPreferenceControllerTest.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class NightDisplayTopIntroPreferenceControllerTest {
+
+    private NightDisplayTopIntroPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mController =
+                new NightDisplayTopIntroPreferenceController(RuntimeEnvironment.application, "key");
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void getAvailabilityStatus_configuredAvailable_shouldReturnAVAILABLE_UNSEARCHABLE() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_nightDisplayAvailable, true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_configuredUnavailable_shouldReturnUNSUPPORTED_ON_DEVICE() {
+        SettingsShadowResources.overrideResource(
+                com.android.internal.R.bool.config_nightDisplayAvailable, false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
new file mode 100644
index 0000000..621ddfa
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/ScreenTimeoutSettingsTest.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.atLeast;
+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 android.app.admin.DevicePolicyManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settingslib.RestrictedLockUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class ScreenTimeoutSettingsTest {
+    private static final String[] TIMEOUT_ENTRIES = new String[]{"15 secs", "30 secs"};
+    private static final String[] TIMEOUT_VALUES = new String[]{"15000", "30000"};
+
+    private ScreenTimeoutSettings mSettings;
+    private Context mContext;
+    private ContentResolver mContentResolver;
+
+    @Mock
+    private Resources mResources;
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+
+    @Mock
+    AdaptiveSleepPermissionPreferenceController mPermissionPreferenceController;
+
+    @Mock
+    AdaptiveSleepPreferenceController mAdaptiveSleepPreferenceController;
+
+    @Mock
+    Preference mDisableOptionsPreference;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(getApplicationContext());
+        mSettings = spy(new ScreenTimeoutSettings());
+        mContentResolver = mContext.getContentResolver();
+
+        doReturn(TIMEOUT_ENTRIES).when(mResources).getStringArray(R.array.screen_timeout_entries);
+        doReturn(TIMEOUT_VALUES).when(mResources).getStringArray(R.array.screen_timeout_entries);
+        doReturn(true).when(mResources).getBoolean(
+                com.android.internal.R.bool.config_adaptive_sleep_available);
+
+        doReturn(null).when(mContext).getSystemService(DevicePolicyManager.class);
+
+        doReturn(mResources).when(mSettings).getResources();
+        doReturn(mContext).when(mSettings).getContext();
+        doReturn(mPreferenceScreen).when(mSettings).getPreferenceScreen();
+
+        mSettings.mAdaptiveSleepController = mAdaptiveSleepPreferenceController;
+        mSettings.mAdaptiveSleepPermissionController = mPermissionPreferenceController;
+    }
+
+    @Test
+    public void searchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                ScreenTimeoutSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        mContext, true /* enabled */);
+
+        assertThat(indexRes).isNotNull();
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+    }
+
+    @Test
+    public void getDefaultKey_returnCurrentTimeout() {
+        long timeout = Long.parseLong(TIMEOUT_VALUES[1]);
+        Settings.System.putLong(mContentResolver, SCREEN_OFF_TIMEOUT, timeout);
+
+        String key = mSettings.getDefaultKey();
+
+        assertThat(key).isEqualTo(TIMEOUT_VALUES[1]);
+    }
+
+    @Test
+    public void updateCandidates_screenAttentionAvailable_showAdaptiveSleepPreference() {
+        mSettings.updateCandidates();
+
+        verify(mSettings.mAdaptiveSleepController).addToScreen(mPreferenceScreen);
+    }
+
+    @Test
+    public void updateCandidates_screenAttentionNotAvailable_doNotShowAdaptiveSleepPreference() {
+        doReturn(false).when(mResources).getBoolean(
+                com.android.internal.R.bool.config_adaptive_sleep_available);
+
+        mSettings.updateCandidates();
+
+        verify(mSettings.mAdaptiveSleepController, never()).addToScreen(mPreferenceScreen);
+    }
+
+    @Test
+    public void updateCandidates_enforcedAdmin_showDisabledByAdminPreference() {
+        mSettings.mAdmin = new RestrictedLockUtils.EnforcedAdmin();
+        mSettings.mDisableOptionsPreference = mDisableOptionsPreference;
+
+        mSettings.updateCandidates();
+
+        verify(mPreferenceScreen, atLeast(1)).addPreference(mDisableOptionsPreference);
+    }
+
+    @Test
+    public void setDefaultKey_controlCurrentScreenTimeout() {
+        mSettings.setDefaultKey(TIMEOUT_VALUES[0]);
+
+        long timeout = Settings.System.getLong(mContentResolver, SCREEN_OFF_TIMEOUT,
+                30000 /* default */);
+
+        assertThat(Long.toString(timeout)).isEqualTo(TIMEOUT_VALUES[0]);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
deleted file mode 100644
index cf0e660..0000000
--- a/tests/robotests/src/com/android/settings/display/TimeoutPreferenceControllerTest.java
+++ /dev/null
@@ -1,161 +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.display;
-
-import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.provider.Settings;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
-import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowDevicePolicyManager.class)
-public class TimeoutPreferenceControllerTest {
-
-    private static final int TIMEOUT = 30;
-    private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
-    private static final String DEFAULT_TIMEOUT = "300000"; // 5 minutes
-
-    private Context mContext;
-    @Mock
-    private TimeoutListPreference mPreference;
-    @Mock
-    private UserManager mUserManager;
-
-    private TimeoutPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mPreference.getValue()).thenReturn(DEFAULT_TIMEOUT);
-        mController = new TimeoutPreferenceController(mContext, KEY_SCREEN_TIMEOUT);
-    }
-
-    @After
-    public void tearDown() {
-          ShadowRestrictedLockUtilsInternal.reset();
-    }
-
-    @Test
-    public void testOnPreferenceChange_SetTimeout_ReturnCorrectTimeout() {
-        mController.onPreferenceChange(mPreference, Integer.toString(TIMEOUT));
-
-        final int mode = Settings.System.getInt(mContext.getContentResolver(),
-                SCREEN_OFF_TIMEOUT, 0);
-        assertThat(mode).isEqualTo(TIMEOUT);
-    }
-
-    @Test
-    public void testUpdateStateNoAdminTimeouts() {
-        when(mUserManager.getProfiles(anyInt())).thenReturn(Collections.emptyList());
-        mController.updateState(mPreference);
-        verify(mPreference).removeUnusableTimeouts(0, null);
-    }
-
-    @Test
-    public void testUpdateStateWithAdminTimeouts() {
-        final int profileUserId = UserHandle.myUserId();
-        final long timeout = 10000;
-        when(mUserManager.getProfiles(profileUserId)).thenReturn(Collections.emptyList());
-        ShadowDevicePolicyManager.getShadow().setMaximumTimeToLock(profileUserId, timeout);
-
-        mController.updateState(mPreference);
-        verify(mPreference).removeUnusableTimeouts(timeout, null);
-    }
-
-    @Test
-    public void testUpdateStateWithAdminTimeoutsAndRestriction() {
-        final int profileUserId = UserHandle.myUserId();
-        final long timeout = 100;
-        when(mUserManager.getProfiles(profileUserId)).thenReturn(Collections.emptyList());
-        ShadowDevicePolicyManager.getShadow().setMaximumTimeToLock(profileUserId, timeout);
-
-        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_SCREEN_TIMEOUT, UserHandle.of(userId)))
-                .thenReturn(enforcingUsers);
-
-        mController.updateState(mPreference);
-
-        ArgumentCaptor<Long> longCaptor = ArgumentCaptor.forClass(Long.class);
-        ArgumentCaptor<EnforcedAdmin> adminCaptor = ArgumentCaptor.forClass(EnforcedAdmin.class);
-
-        verify(mPreference, times(2))
-                .removeUnusableTimeouts(longCaptor.capture(), adminCaptor.capture());
-        assertThat(longCaptor.getValue()).isEqualTo(0);
-        assertThat(adminCaptor.getValue()).isNotNull();
-    }
-
-    @Test
-    @Config(shadows = ShadowRestrictedLockUtilsInternal.class)
-    public void updateState_selectedTimeoutLargerThanAdminMax_shouldSetSummaryToUpdatedPrefValue() {
-        final int profileUserId = UserHandle.myUserId();
-        final long allowedTimeout = 480000L; // 8 minutes
-        when(mUserManager.getProfiles(profileUserId)).thenReturn(Collections.emptyList());
-        ShadowDevicePolicyManager.getShadow().setMaximumTimeToLock(profileUserId, allowedTimeout);
-        ShadowRestrictedLockUtilsInternal.setMaximumTimeToLockIsSet(true);
-        final CharSequence[] timeouts = {"15000", "30000", "60000", "120000", "300000", "600000"};
-        final CharSequence[] summaries = {"15s", "30s", "1m", "2m", "5m", "10m"};
-        // set current timeout to be 10 minutes, which is longer than the allowed 8 minutes
-        Settings.System.putLong(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT, 600000L);
-        when(mPreference.getEntries()).thenReturn(summaries);
-        when(mPreference.getEntryValues()).thenReturn(timeouts);
-        when(mPreference.getValue()).thenReturn("300000");
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setSummary(mContext.getString(R.string.screen_timeout_summary, "5m"));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
index d16a6d2..a52ad71 100644
--- a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
@@ -31,9 +31,12 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -65,6 +68,13 @@
         mController = new TopLevelDisplayPreferenceController(mContext, "test_key");
     }
 
+    @After
+    public void tearDown() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        }
+    }
+
     @Test
     public void getAvailibilityStatus_availableByDefault() {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
@@ -109,4 +119,11 @@
         assertThat(mController.getSummary())
                 .isEqualTo(mContext.getText(R.string.display_dashboard_nowallpaper_summary));
     }
+
+    @Test
+    public void getSummary_silkyHomeEnabled_shouldBeNull() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+
+        assertThat(mController.getSummary()).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java
new file mode 100644
index 0000000..7b3ae65
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/display/TopLevelWallpaperPreferenceControllerTest.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.display;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.ResolveInfo;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+
+import com.google.common.collect.Lists;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {SettingsShadowResources.class})
+public class TopLevelWallpaperPreferenceControllerTest {
+    private static final String TEST_KEY = "test_key";
+
+    private Intent mWallpaperIntent;
+    private Intent mStylesAndWallpaperIntent;
+    private FragmentActivity mContext;
+    private ShadowPackageManager mShadowPackageManager;
+
+    private TopLevelWallpaperPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = Robolectric.buildActivity(FragmentActivity.class).get();
+        SettingsShadowResources.overrideResource(
+                R.string.config_wallpaper_picker_package, "bogus.package.for.testing");
+        SettingsShadowResources.overrideResource(
+                R.string.config_styles_and_wallpaper_picker_class, "bogus.package.class");
+        mWallpaperIntent = new Intent().setComponent(new ComponentName(
+                mContext.getString(R.string.config_wallpaper_picker_package),
+                mContext.getString(R.string.config_wallpaper_picker_class)));
+        mStylesAndWallpaperIntent = new Intent().setComponent(new ComponentName(
+                mContext.getString(R.string.config_wallpaper_picker_package),
+                mContext.getString(R.string.config_styles_and_wallpaper_picker_class)));
+        mShadowPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+        mController = new TopLevelWallpaperPreferenceController(mContext, TEST_KEY);
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerEnabledAndStylePickerEnabled_returnsTrue() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerEnabledAndStylePickerDisabled_returnsTrue() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerDisabledAndStylePickerEnabled_returnsTrue() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerDisabledAndStylePickerDisabled_returnsFalse() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void getComponentClassString_stylesAvailable_returnsStylePickerClassString() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent,
+                Lists.newArrayList(mock(ResolveInfo.class)));
+        assertThat(mController.getComponentClassString())
+                .isEqualTo(mContext.getString(R.string.config_styles_and_wallpaper_picker_class));
+    }
+
+    @Test
+    public void getComponentClassString_stylesUnavailable_returnsWallpaperPickerClassString() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+        assertThat(mController.getComponentClassString())
+                .isEqualTo(mContext.getString(R.string.config_wallpaper_picker_class));
+    }
+
+    @Test
+    public void areStylesAvailable_noComponentSpecified() {
+        SettingsShadowResources.overrideResource(
+                R.string.config_styles_and_wallpaper_picker_class, "");
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+
+        assertThat(mController.areStylesAvailable()).isFalse();
+    }
+
+    @Test
+    public void areStylesAvailable_componentUnresolveable() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+
+        assertThat(mController.areStylesAvailable()).isFalse();
+    }
+
+    @Test
+    public void areStylesAvailable_componentResolved() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent,
+                Lists.newArrayList(mock(ResolveInfo.class)));
+
+        assertThat(mController.areStylesAvailable()).isTrue();
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_wallpaperOnly() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+        Preference preference = new Preference(mContext);
+        preference.setKey(TEST_KEY);
+
+        mController.handlePreferenceTreeClick(preference);
+
+        assertThat(Shadows.shadowOf(mContext)
+                .getNextStartedActivityForResult().intent.getComponent().getClassName())
+                .isEqualTo(mContext.getString(R.string.config_wallpaper_picker_class));
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_stylesAndWallpaper() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        Preference preference = new Preference(mContext);
+        preference.setKey(TEST_KEY);
+
+        mController.handlePreferenceTreeClick(preference);
+
+        assertThat(Shadows.shadowOf(mContext)
+                .getNextStartedActivityForResult().intent.getComponent().getClassName())
+                .isEqualTo(mContext.getString(R.string.config_styles_and_wallpaper_picker_class));
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_launchSourceExtra() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+        Preference preference = new Preference(mContext);
+        preference.setKey(TEST_KEY);
+
+        mController.handlePreferenceTreeClick(preference);
+
+        assertThat(Shadows.shadowOf(mContext).getNextStartedActivityForResult()
+                .intent.hasExtra("com.android.wallpaper.LAUNCH_SOURCE")).isTrue();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
index d6ad52d2..04bd4bb 100644
--- a/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/WallpaperPreferenceControllerTest.java
@@ -73,22 +73,63 @@
     }
 
     @Test
-    public void isAvailable_wallpaperPickerEnabled_shouldReturnTrue() {
+    public void isAvailable_wallpaperPickerEnabledAndStylePickerEnabled_returnsTrue() {
         mShadowPackageManager.setResolveInfosForIntent(
                 mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
 
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
-    public void isAvailable_wallpaperPickerDisabled_shouldReturnFalse() {
+    public void isAvailable_wallpaperPickerEnabledAndStylePickerDisabled_returnsTrue() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerDisabledAndStylePickerEnabled_returnsTrue() {
         mShadowPackageManager.setResolveInfosForIntent(
                 mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList(mock(ResolveInfo.class)));
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_wallpaperPickerDisabledAndStylePickerDisabled_returnsFalse() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
 
         assertThat(mController.isAvailable()).isFalse();
     }
 
     @Test
+    public void getComponentClassString_stylesAvailable_returnsStylePickerClassString() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent,
+                Lists.newArrayList(mock(ResolveInfo.class)));
+        assertThat(mController.getComponentClassString())
+                .isEqualTo(mContext.getString(R.string.config_styles_and_wallpaper_picker_class));
+    }
+
+    @Test
+    public void getComponentClassString_stylesUnavailable_returnsWallpaperPickerClassString() {
+        mShadowPackageManager.setResolveInfosForIntent(
+                mStylesAndWallpaperIntent, Lists.newArrayList());
+        assertThat(mController.getComponentClassString())
+                .isEqualTo(mContext.getString(R.string.config_wallpaper_picker_class));
+    }
+
+    @Test
     public void areStylesAvailable_noComponentSpecified() {
         SettingsShadowResources.overrideResource(
                 R.string.config_styles_and_wallpaper_picker_class, "");
@@ -170,4 +211,19 @@
                 .getNextStartedActivityForResult().intent.getComponent().getClassName())
                 .isEqualTo(mContext.getString(R.string.config_styles_and_wallpaper_picker_class));
     }
+
+    @Test
+    public void handlePreferenceTreeClick_launchSourceExtra() {
+        mShadowPackageManager.setResolveInfosForIntent(
+            mWallpaperIntent, Lists.newArrayList());
+        mShadowPackageManager.setResolveInfosForIntent(
+            mStylesAndWallpaperIntent, Lists.newArrayList());
+        Preference preference = new Preference(mContext);
+        preference.setKey(TEST_KEY);
+
+        mController.handlePreferenceTreeClick(preference);
+
+        assertThat(Shadows.shadowOf(mContext).getNextStartedActivityForResult()
+            .intent.hasExtra("com.android.wallpaper.LAUNCH_SOURCE")).isTrue();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
index f539350..c28267b 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImplTest.java
@@ -63,27 +63,34 @@
 import java.util.Date;
 import java.util.List;
 
+
 @RunWith(RobolectricTestRunner.class)
 public class EnterprisePrivacyFeatureProviderImplTest {
 
-    private final ComponentName OWNER = new ComponentName("dummy", "component");
-    private final ComponentName ADMIN_1 = new ComponentName("dummy", "admin1");
-    private final ComponentName ADMIN_2 = new ComponentName("dummy", "admin2");
-    private final String OWNER_ORGANIZATION = new String("ACME");
-    private final Date TIMESTAMP = new Date(2011, 11, 11);
-    private final int MY_USER_ID = UserHandle.myUserId();
-    private final int MANAGED_PROFILE_USER_ID = MY_USER_ID + 1;
-    private final String VPN_PACKAGE_ID = "com.example.vpn";
-    private final String IME_PACKAGE_ID = "com.example.ime";
-    private final String IME_PACKAGE_LABEL = "Test IME";
+    private static final String OWNER_ORGANIZATION = "ACME";
+    private static final String VPN_PACKAGE_ID = "com.example.vpn";
+    private static final String IME_PACKAGE_ID = "com.example.ime";
+    private static final String IME_PACKAGE_LABEL = "Test IME";
+
+    private final ComponentName mOwner = new ComponentName("mock", "component");
+    private final ComponentName mAdmin1 = new ComponentName("mock", "admin1");
+    private final ComponentName mAdmin2 = new ComponentName("mock", "admin2");
+    private final Date mDate = new Date(2011, 11, 11);
+    private final int mUserId = UserHandle.myUserId();
+    private final int mManagedProfileUserId = mUserId + 1;
 
     private List<UserInfo> mProfiles = new ArrayList<>();
 
-    private @Mock Context mContext;
-    private @Mock DevicePolicyManager mDevicePolicyManager;
-    private @Mock PackageManager mPackageManager;
-    private @Mock UserManager mUserManager;
-    private @Mock ConnectivityManager mConnectivityManger;
+    @Mock
+    private Context mContext;
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private ConnectivityManager mConnectivityManger;
     private Resources mResources;
 
     private EnterprisePrivacyFeatureProvider mProvider;
@@ -94,8 +101,8 @@
 
         when(mContext.getApplicationContext()).thenReturn(mContext);
         resetAndInitializePackageManager();
-        when(mUserManager.getProfiles(MY_USER_ID)).thenReturn(mProfiles);
-        mProfiles.add(new UserInfo(MY_USER_ID, "", "", 0 /* flags */));
+        when(mUserManager.getProfiles(mUserId)).thenReturn(mProfiles);
+        mProfiles.add(new UserInfo(mUserId, "", "", 0 /* flags */));
         mResources = RuntimeEnvironment.application.getResources();
 
         mProvider = new EnterprisePrivacyFeatureProviderImpl(mContext, mDevicePolicyManager,
@@ -107,16 +114,16 @@
         when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
         assertThat(mProvider.hasDeviceOwner()).isFalse();
 
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner);
         assertThat(mProvider.hasDeviceOwner()).isTrue();
     }
 
     @Test
     public void testIsInCompMode() {
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner);
         assertThat(mProvider.isInCompMode()).isFalse();
 
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
         assertThat(mProvider.isInCompMode()).isTrue();
     }
 
@@ -139,7 +146,7 @@
         disclosure.append(mResources.getString(R.string.do_disclosure_learn_more_separator));
         disclosure.append(mResources.getString(R.string.learn_more),
                 new EnterprisePrivacyFeatureProviderImpl.EnterprisePrivacySpan(mContext), 0);
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner);
         when(mDevicePolicyManager.getDeviceOwnerOrganizationName()).thenReturn(null);
         assertThat(mProvider.getDeviceOwnerDisclosure()).isEqualTo(disclosure);
 
@@ -159,8 +166,8 @@
         assertThat(mProvider.getLastSecurityLogRetrievalTime()).isNull();
 
         when(mDevicePolicyManager.getLastSecurityLogRetrievalTime())
-                .thenReturn(TIMESTAMP.getTime());
-        assertThat(mProvider.getLastSecurityLogRetrievalTime()).isEqualTo(TIMESTAMP);
+                .thenReturn(mDate.getTime());
+        assertThat(mProvider.getLastSecurityLogRetrievalTime()).isEqualTo(mDate);
     }
 
     @Test
@@ -168,8 +175,8 @@
         when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(-1L);
         assertThat(mProvider.getLastBugReportRequestTime()).isNull();
 
-        when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(TIMESTAMP.getTime());
-        assertThat(mProvider.getLastBugReportRequestTime()).isEqualTo(TIMESTAMP);
+        when(mDevicePolicyManager.getLastBugReportRequestTime()).thenReturn(mDate.getTime());
+        assertThat(mProvider.getLastBugReportRequestTime()).isEqualTo(mDate);
     }
 
     @Test
@@ -177,8 +184,8 @@
         when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(-1L);
         assertThat(mProvider.getLastNetworkLogRetrievalTime()).isNull();
 
-        when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(TIMESTAMP.getTime());
-        assertThat(mProvider.getLastNetworkLogRetrievalTime()).isEqualTo(TIMESTAMP);
+        when(mDevicePolicyManager.getLastNetworkLogRetrievalTime()).thenReturn(mDate.getTime());
+        assertThat(mProvider.getLastNetworkLogRetrievalTime()).isEqualTo(mDate);
     }
 
     @Test
@@ -201,10 +208,10 @@
 
     @Test
     public void testIsAlwaysOnVpnSetInCurrentUser() {
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MY_USER_ID)).thenReturn(null);
+        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(mUserId)).thenReturn(null);
         assertThat(mProvider.isAlwaysOnVpnSetInCurrentUser()).isFalse();
 
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MY_USER_ID))
+        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(mUserId))
                 .thenReturn(VPN_PACKAGE_ID);
         assertThat(mProvider.isAlwaysOnVpnSetInCurrentUser()).isTrue();
     }
@@ -213,13 +220,13 @@
     public void testIsAlwaysOnVpnSetInManagedProfileProfile() {
         assertThat(mProvider.isAlwaysOnVpnSetInManagedProfile()).isFalse();
 
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
 
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MANAGED_PROFILE_USER_ID))
+        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(mManagedProfileUserId))
                 .thenReturn(null);
         assertThat(mProvider.isAlwaysOnVpnSetInManagedProfile()).isFalse();
 
-        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(MANAGED_PROFILE_USER_ID))
+        when(mConnectivityManger.getAlwaysOnVpnPackageForUser(mManagedProfileUserId))
                 .thenReturn(VPN_PACKAGE_ID);
         assertThat(mProvider.isAlwaysOnVpnSetInManagedProfile()).isTrue();
     }
@@ -230,34 +237,34 @@
         assertThat(mProvider.isGlobalHttpProxySet()).isFalse();
 
         when(mConnectivityManger.getGlobalProxy())
-            .thenReturn(ProxyInfo.buildDirectProxy("localhost", 123));
+                .thenReturn(ProxyInfo.buildDirectProxy("localhost", 123));
         assertThat(mProvider.isGlobalHttpProxySet()).isTrue();
     }
 
     @Test
     public void testGetMaximumFailedPasswordsForWipeInCurrentUser() {
         when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(null);
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(null);
-        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(OWNER, MY_USER_ID))
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mUserId)).thenReturn(null);
+        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(mOwner, mUserId))
                 .thenReturn(10);
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(0);
 
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(OWNER);
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mUserId)).thenReturn(mOwner);
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(10);
 
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(OWNER);
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(null);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnCallingUser()).thenReturn(mOwner);
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mUserId)).thenReturn(null);
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInCurrentUser()).isEqualTo(10);
     }
 
     @Test
     public void testGetMaximumFailedPasswordsForWipeInManagedProfile() {
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MANAGED_PROFILE_USER_ID)).thenReturn(OWNER);
-        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(OWNER, MANAGED_PROFILE_USER_ID))
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mManagedProfileUserId)).thenReturn(mOwner);
+        when(mDevicePolicyManager.getMaximumFailedPasswordsForWipe(mOwner, mManagedProfileUserId))
                 .thenReturn(10);
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInManagedProfile()).isEqualTo(0);
 
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
         assertThat(mProvider.getMaximumFailedPasswordsBeforeWipeInManagedProfile()).isEqualTo(10);
     }
 
@@ -267,7 +274,7 @@
         when(applicationInfo.loadLabel(mPackageManager)).thenReturn(IME_PACKAGE_LABEL);
 
         Settings.Secure.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD, IME_PACKAGE_ID);
-        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
+        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, mUserId))
                 .thenReturn(applicationInfo);
 
         // IME not set by Device Owner.
@@ -281,13 +288,13 @@
 
         // Device Owner set IME to nonexistent package.
         Settings.Secure.putString(null, Settings.Secure.DEFAULT_INPUT_METHOD, IME_PACKAGE_ID);
-        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
+        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, mUserId))
                 .thenThrow(new PackageManager.NameNotFoundException());
         assertThat(mProvider.getImeLabelIfOwnerSet()).isNull();
 
         // Device Owner set IME to existent package.
         resetAndInitializePackageManager();
-        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, MY_USER_ID))
+        when(mPackageManager.getApplicationInfoAsUser(IME_PACKAGE_ID, 0, mUserId))
                 .thenReturn(applicationInfo);
         assertThat(mProvider.getImeLabelIfOwnerSet()).isEqualTo(IME_PACKAGE_LABEL);
     }
@@ -295,7 +302,7 @@
     @Test
     public void testGetNumberOfOwnerInstalledCaCertsForCurrent() {
         final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM);
-        final UserHandle managedProfileUserHandle = new UserHandle(MANAGED_PROFILE_USER_ID);
+        final UserHandle managedProfileUserHandle = new UserHandle(mManagedProfileUserId);
 
         when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
                 .thenReturn(Arrays.asList("ca1", "ca2"));
@@ -317,9 +324,9 @@
     @Test
     public void testGetNumberOfOwnerInstalledCaCertsForManagedProfile() {
         final UserHandle userHandle = new UserHandle(UserHandle.USER_SYSTEM);
-        final UserHandle managedProfileUserHandle = new UserHandle(MANAGED_PROFILE_USER_ID);
+        final UserHandle managedProfileUserHandle = new UserHandle(mManagedProfileUserId);
         final UserInfo managedProfile =
-                new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE);
+                new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE);
 
         // Without a profile
         when(mDevicePolicyManager.getOwnerInstalledCaCerts(managedProfileUserHandle))
@@ -345,15 +352,15 @@
 
     @Test
     public void testGetNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile() {
-        when(mDevicePolicyManager.getActiveAdminsAsUser(MY_USER_ID))
-                .thenReturn(Arrays.asList(ADMIN_1, ADMIN_2));
-        when(mDevicePolicyManager.getActiveAdminsAsUser(MANAGED_PROFILE_USER_ID))
-                .thenReturn(Arrays.asList(ADMIN_1));
+        when(mDevicePolicyManager.getActiveAdminsAsUser(mUserId))
+                .thenReturn(Arrays.asList(mAdmin1, mAdmin2));
+        when(mDevicePolicyManager.getActiveAdminsAsUser(mManagedProfileUserId))
+                .thenReturn(Arrays.asList(mAdmin1));
 
         assertThat(mProvider.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile())
                 .isEqualTo(2);
 
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
         assertThat(mProvider.getNumberOfActiveDeviceAdminsForCurrentUserAndManagedProfile())
                 .isEqualTo(3);
     }
@@ -362,7 +369,7 @@
     public void workPolicyInfo_unmanagedDevice_shouldDoNothing() {
         // Even if we have the intent resolved, don't show it if there's no DO or PO
         when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
-        addWorkPolicyInfoIntent(OWNER.getPackageName(), true, false);
+        addWorkPolicyInfoIntent(mOwner.getPackageName(), true, false);
         assertThat(mProvider.hasWorkPolicyInfo()).isFalse();
 
         assertThat(mProvider.showWorkPolicyInfo()).isFalse();
@@ -372,12 +379,12 @@
     @Test
     public void workPolicyInfo_deviceOwner_shouldResolveIntent() {
         // If the intent is not resolved, then there's no info to show for DO
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner);
         assertThat(mProvider.hasWorkPolicyInfo()).isFalse();
         assertThat(mProvider.showWorkPolicyInfo()).isFalse();
 
         // If the intent is resolved, then we can use it to launch the activity
-        Intent intent = addWorkPolicyInfoIntent(OWNER.getPackageName(), true, false);
+        Intent intent = addWorkPolicyInfoIntent(mOwner.getPackageName(), true, false);
         assertThat(mProvider.hasWorkPolicyInfo()).isTrue();
         assertThat(mProvider.showWorkPolicyInfo()).isTrue();
         verify(mContext).startActivity(intentEquals(intent));
@@ -386,40 +393,51 @@
     @Test
     public void workPolicyInfo_profileOwner_shouldResolveIntent() {
         when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(null);
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MANAGED_PROFILE_USER_ID)).thenReturn(OWNER);
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mManagedProfileUserId)).thenReturn(mOwner);
 
         // If the intent is not resolved, then there's no info to show for PO
         assertThat(mProvider.hasWorkPolicyInfo()).isFalse();
         assertThat(mProvider.showWorkPolicyInfo()).isFalse();
 
         // If the intent is resolved, then we can use it to launch the activity in managed profile
-        Intent intent = addWorkPolicyInfoIntent(OWNER.getPackageName(), false, true);
+        Intent intent = addWorkPolicyInfoIntent(mOwner.getPackageName(), false, true);
         assertThat(mProvider.hasWorkPolicyInfo()).isTrue();
         assertThat(mProvider.showWorkPolicyInfo()).isTrue();
         verify(mContext)
                 .startActivityAsUser(
                         intentEquals(intent),
-                        argThat(handle -> handle.getIdentifier() == MANAGED_PROFILE_USER_ID));
+                        argThat(handle -> handle.getIdentifier() == mManagedProfileUserId));
     }
 
     @Test
     public void workPolicyInfo_comp_shouldUseDeviceOwnerIntent() {
-        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(OWNER);
-        mProfiles.add(new UserInfo(MANAGED_PROFILE_USER_ID, "", "", UserInfo.FLAG_MANAGED_PROFILE));
-        when(mDevicePolicyManager.getProfileOwnerAsUser(MY_USER_ID)).thenReturn(OWNER);
+        when(mDevicePolicyManager.getDeviceOwnerComponentOnAnyUser()).thenReturn(mOwner);
+        mProfiles.add(new UserInfo(mManagedProfileUserId, "", "", UserInfo.FLAG_MANAGED_PROFILE));
+        when(mDevicePolicyManager.getProfileOwnerAsUser(mUserId)).thenReturn(mOwner);
 
         // If the intent is not resolved, then there's no info to show for COMP
         assertThat(mProvider.hasWorkPolicyInfo()).isFalse();
         assertThat(mProvider.showWorkPolicyInfo()).isFalse();
 
         // If the intent is resolved, then we can use it to launch the activity for device owner
-        Intent intent = addWorkPolicyInfoIntent(OWNER.getPackageName(), true, true);
+        Intent intent = addWorkPolicyInfoIntent(mOwner.getPackageName(), true, true);
         assertThat(mProvider.hasWorkPolicyInfo()).isTrue();
         assertThat(mProvider.showWorkPolicyInfo()).isTrue();
         verify(mContext).startActivity(intentEquals(intent));
     }
 
+    @Test
+    public void testShowParentalControls() {
+        when(mDevicePolicyManager.getProfileOwnerOrDeviceOwnerSupervisionComponent(any()))
+                .thenReturn(mOwner);
+
+        // If the intent is resolved, then we can use it to launch the activity
+        Intent intent = addParentalControlsIntent(mOwner.getPackageName());
+        assertThat(mProvider.showParentalControls()).isTrue();
+        verify(mContext).startActivity(intentEquals(intent));
+    }
+
     private Intent addWorkPolicyInfoIntent(
             String packageName, boolean deviceOwner, boolean profileOwner) {
         Intent intent = new Intent(Settings.ACTION_SHOW_WORK_POLICY_INFO);
@@ -437,13 +455,30 @@
         }
         if (profileOwner) {
             when(mPackageManager.queryIntentActivitiesAsUser(
-                            intentEquals(intent), anyInt(), eq(MANAGED_PROFILE_USER_ID)))
+                    intentEquals(intent), anyInt(), eq(mManagedProfileUserId)))
                     .thenReturn(activities);
         }
 
         return intent;
     }
 
+    private Intent addParentalControlsIntent(String packageName) {
+        Intent intent = new Intent(EnterprisePrivacyFeatureProviderImpl.ACTION_PARENTAL_CONTROLS);
+        intent.setPackage(packageName);
+        ResolveInfo resolveInfo = new ResolveInfo();
+        resolveInfo.resolvePackageName = packageName;
+        resolveInfo.activityInfo = new ActivityInfo();
+        resolveInfo.activityInfo.name = "activityName";
+        resolveInfo.activityInfo.packageName = packageName;
+
+        List<ResolveInfo> activities = ImmutableList.of(resolveInfo);
+        when(mPackageManager.queryIntentActivities(intentEquals(intent), anyInt()))
+                .thenReturn(activities);
+        when(mPackageManager.queryIntentActivitiesAsUser(intentEquals(intent), anyInt(), anyInt()))
+                .thenReturn(activities);
+        return intent;
+    }
+
     private static class IntentMatcher implements ArgumentMatcher<Intent> {
         private final Intent mExpectedIntent;
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
index 75b38a0..de0cc05 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BackgroundActivityPreferenceControllerTest.java
@@ -40,7 +40,7 @@
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowFragment;
 import com.android.settingslib.RestrictedPreference;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -79,7 +79,7 @@
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private AdvancedPowerUsageDetail mFragment;
     @Mock
-    private PowerWhitelistBackend mPowerWhitelistBackend;
+    private PowerAllowlistBackend mPowerAllowlistBackend;
     private BackgroundActivityPreferenceController mController;
     private RestrictedPreference mPreference;
     private Context mShadowContext;
@@ -103,7 +103,7 @@
         when(mPackageManager.getApplicationInfo(LOW_SDK_PACKAGE, PackageManager.GET_META_DATA))
                 .thenReturn(mLowApplicationInfo);
 
-        when(mPowerWhitelistBackend.isWhitelisted(LOW_SDK_PACKAGE)).thenReturn(false);
+        when(mPowerAllowlistBackend.isAllowlisted(LOW_SDK_PACKAGE)).thenReturn(false);
         mHighApplicationInfo.targetSdkVersion = Build.VERSION_CODES.O;
         mLowApplicationInfo.targetSdkVersion = Build.VERSION_CODES.L;
 
@@ -113,7 +113,7 @@
         mPreference = spy(new RestrictedPreference(mShadowContext, null /* attrs */));
         mPreference.setKey(BackgroundActivityPreferenceController.KEY_BACKGROUND_ACTIVITY);
         mController = spy(new BackgroundActivityPreferenceController(
-                mContext, mFragment, UID_LOW_SDK, LOW_SDK_PACKAGE, mPowerWhitelistBackend));
+                mContext, mFragment, UID_LOW_SDK, LOW_SDK_PACKAGE, mPowerAllowlistBackend));
         mController.mDpm = mDevicePolicyManagerWrapper;
         mController.mBatteryUtils = mBatteryUtils;
     }
@@ -150,12 +150,12 @@
     }
 
     @Test
-    public void updateState_whitelisted() {
-        when(mPowerWhitelistBackend.isWhitelisted(LOW_SDK_PACKAGE)).thenReturn(true);
+    public void updateState_allowlisted() {
+        when(mPowerAllowlistBackend.isAllowlisted(LOW_SDK_PACKAGE)).thenReturn(true);
         mController.updateState(mPreference);
         assertThat(mPreference.isEnabled()).isFalse();
         assertThat(mPreference.getSummary()).isEqualTo(
-                mShadowContext.getText(R.string.background_activity_summary_whitelisted));
+                mShadowContext.getText(R.string.background_activity_summary_allowlisted));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
index 4d5f1a0..a072988 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryBroadcastReceiverTest.java
@@ -66,6 +66,7 @@
         mBatteryBroadcastReceiver = new BatteryBroadcastReceiver(mContext);
         mBatteryBroadcastReceiver.mBatteryLevel = BATTERY_INIT_LEVEL;
         mBatteryBroadcastReceiver.mBatteryStatus = BATTERY_INIT_STATUS;
+        mBatteryBroadcastReceiver.mBatteryHealth = BatteryManager.BATTERY_HEALTH_UNKNOWN;
         mBatteryBroadcastReceiver.setBatteryChangedListener(mBatteryListener);
 
         mChargingIntent = new Intent(Intent.ACTION_BATTERY_CHANGED);
@@ -95,6 +96,34 @@
             BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
             BatteryFixSliceTest.ShadowBatteryTipLoader.class
     })
+    public void testOnReceive_batteryHealthChanged_dataUpdated() {
+        mChargingIntent
+                .putExtra(BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_OVERHEAT);
+        mBatteryBroadcastReceiver.onReceive(mContext, mChargingIntent);
+
+        assertThat(mBatteryBroadcastReceiver.mBatteryHealth)
+                .isEqualTo(BatteryManager.BATTERY_HEALTH_OVERHEAT);
+        verify(mBatteryListener).onBatteryChanged(BatteryUpdateType.BATTERY_HEALTH);
+    }
+
+    @Test
+    @Config(shadows = {
+            BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
+            BatteryFixSliceTest.ShadowBatteryTipLoader.class
+    })
+    public void onReceive_batteryNotPresent_shouldShowHelpMessage() {
+        mChargingIntent.putExtra(BatteryManager.EXTRA_PRESENT, false);
+
+        mBatteryBroadcastReceiver.onReceive(mContext, mChargingIntent);
+
+        verify(mBatteryListener).onBatteryChanged(BatteryUpdateType.BATTERY_NOT_PRESENT);
+    }
+
+    @Test
+    @Config(shadows = {
+            BatteryFixSliceTest.ShadowBatteryStatsHelperLoader.class,
+            BatteryFixSliceTest.ShadowBatteryTipLoader.class
+    })
     public void testOnReceive_powerSaveModeChanged_listenerInvoked() {
         mBatteryBroadcastReceiver.onReceive(mContext,
                 new Intent(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED));
@@ -118,6 +147,8 @@
 
         assertThat(mBatteryBroadcastReceiver.mBatteryLevel).isEqualTo(batteryLevel);
         assertThat(mBatteryBroadcastReceiver.mBatteryStatus).isEqualTo(batteryStatus);
+        assertThat(mBatteryBroadcastReceiver.mBatteryHealth)
+                .isEqualTo(BatteryManager.BATTERY_HEALTH_UNKNOWN);
         verify(mBatteryListener, never()).onBatteryChanged(anyInt());
     }
 
@@ -136,6 +167,8 @@
                 .isEqualTo(Utils.getBatteryPercentage(mChargingIntent));
         assertThat(mBatteryBroadcastReceiver.mBatteryStatus)
                 .isEqualTo(Utils.getBatteryStatus(mContext, mChargingIntent));
+        assertThat(mBatteryBroadcastReceiver.mBatteryHealth)
+                .isEqualTo(BatteryManager.BATTERY_HEALTH_UNKNOWN);
         // 2 times because register will force update the battery
         verify(mBatteryListener, times(2)).onBatteryChanged(BatteryUpdateType.MANUAL);
     }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
index 63e8a80..ac3c8f9 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
@@ -44,6 +44,7 @@
 import com.android.settings.R;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
+import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import com.android.settingslib.widget.LayoutPreference;
@@ -61,7 +62,7 @@
 import org.robolectric.shadows.ShadowPowerManager;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowEntityHeaderController.class)
+@Config(shadows = {ShadowEntityHeaderController.class, ShadowUtils.class})
 public class BatteryHeaderPreferenceControllerTest {
 
     private static final String PREF_KEY = "battery_header";
@@ -116,7 +117,7 @@
 
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
 
-        mController = new BatteryHeaderPreferenceController(mContext, PREF_KEY);
+        mController = spy(new BatteryHeaderPreferenceController(mContext, PREF_KEY));
         mLifecycle.addObserver(mController);
         mController.setActivity(mActivity);
         mController.setFragment(mPreferenceFragment);
@@ -129,6 +130,7 @@
     @After
     public void tearDown() {
         ShadowEntityHeaderController.reset();
+        ShadowUtils.reset();
     }
 
     @Test
@@ -174,6 +176,15 @@
     }
 
     @Test
+    public void updatePreference_isOverheat_showEmptyText() {
+        mBatteryInfo.isOverheated = true;
+
+        mController.updateHeaderPreference(mBatteryInfo);
+
+        assertThat(mSummary.getText().toString().isEmpty()).isTrue();
+    }
+
+    @Test
     public void onStart_shouldStyleActionBar() {
         when(mEntityHeaderController.setRecyclerView(nullable(RecyclerView.class), eq(mLifecycle)))
                 .thenReturn(mEntityHeaderController);
@@ -214,4 +225,13 @@
         assertThat(mController.getAvailabilityStatus()).isEqualTo(
                 BasePreferenceController.AVAILABLE_UNSEARCHABLE);
     }
+
+    @Test
+    public void displayPreference_batteryNotPresent_shouldShowHelpMessage() {
+        ShadowUtils.setIsBatteryPresent(false);
+
+        mController.displayPreference(mPreferenceScreen);
+
+        verify(mController).showHelpMessage();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
index 3cbc58a..4c19477 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryInfoTest.java
@@ -74,7 +74,7 @@
             "1 min left until charged";
     private static final String TEST_BATTERY_LEVEL_10 = "10%";
     private static final String FIFTEEN_MIN_FORMATTED = "15 min";
-    private static final Estimate DUMMY_ESTIMATE = new Estimate(
+    private static final Estimate MOCK_ESTIMATE = new Estimate(
             1000, /* estimateMillis */
             false, /* isBasedOnUsage */
             1000 /* averageDischargeTime */);
@@ -211,10 +211,10 @@
     @Test
     public void testGetBatteryInfo_basedOnUsageFalse_usesDefaultString() {
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, DUMMY_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
         BatteryInfo info2 = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
-                mBatteryStats, DUMMY_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 true /* shortString */);
 
         assertThat(info.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
@@ -228,7 +228,7 @@
                 .computeChargeTimeRemaining(anyLong());
 
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, DUMMY_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
         assertThat(info.remainingTimeUs).isEqualTo(TEST_CHARGE_TIME_REMAINING);
         assertThat(info.remainingLabel.toString())
@@ -240,12 +240,28 @@
         mChargingBatteryBroadcast.putExtra(BatteryManager.EXTRA_LEVEL, 100);
 
         BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
-                mBatteryStats, DUMMY_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
                 false /* shortString */);
 
         assertThat(info.chargeLabel).isEqualTo("100%");
     }
 
+    @Test
+    public void testGetBatteryInfo_chargingWithOverheated_updateChargeLabel() {
+        doReturn(TEST_CHARGE_TIME_REMAINING)
+                .when(mBatteryStats)
+                .computeChargeTimeRemaining(anyLong());
+        mChargingBatteryBroadcast
+                .putExtra(BatteryManager.EXTRA_HEALTH, BatteryManager.BATTERY_HEALTH_OVERHEAT);
+
+        BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mChargingBatteryBroadcast,
+                mBatteryStats, MOCK_ESTIMATE, SystemClock.elapsedRealtime() * 1000,
+                false /* shortString */);
+
+        assertThat(info.isOverheated).isTrue();
+        assertThat(info.chargeLabel).isEqualTo("50% - Optimizing for battery health");
+    }
+
     // Make our battery stats return a sequence of battery events.
     private void mockBatteryStatsHistory() {
         // Mock out new data every time start...Locked is called.
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
index 329a70d..b9a87aa 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceControllerTest.java
@@ -33,7 +33,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.dashboard.DashboardFragment;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -46,8 +46,8 @@
 @RunWith(RobolectricTestRunner.class)
 public class BatteryOptimizationPreferenceControllerTest {
 
-    private static final String PKG_IN_WHITELIST = "com.pkg.in.whitelist";
-    private static final String PKG_NOT_IN_WHITELIST = "com.pkg.not.in.whitelist";
+    private static final String PKG_IN_ALLOWLIST = "com.pkg.in.allowlist";
+    private static final String PKG_NOT_IN_ALLOWLIST = "com.pkg.not.in.allowlist";
     private static final String KEY_OPTIMIZATION = "battery_optimization";
     private static final String KEY_OTHER = "other";
     @Mock
@@ -55,7 +55,7 @@
     @Mock
     private DashboardFragment mFragment;
     @Mock
-    private TestPowerWhitelistBackend mBackend;
+    private TestPowerAllowlistBackend mBackend;
 
     private BatteryOptimizationPreferenceController mController;
     private Preference mPreference;
@@ -66,12 +66,12 @@
         MockitoAnnotations.initMocks(this);
 
         mContext = RuntimeEnvironment.application;
-        doReturn(false).when(mBackend).isWhitelisted(PKG_NOT_IN_WHITELIST);
-        doReturn(true).when(mBackend).isWhitelisted(PKG_IN_WHITELIST);
+        doReturn(false).when(mBackend).isAllowlisted(PKG_NOT_IN_ALLOWLIST);
+        doReturn(true).when(mBackend).isAllowlisted(PKG_IN_ALLOWLIST);
 
         mPreference = new SwitchPreference(mContext);
         mController = spy(new BatteryOptimizationPreferenceController(mSettingsActivity, mFragment,
-                PKG_NOT_IN_WHITELIST, mBackend));
+                PKG_NOT_IN_ALLOWLIST, mBackend));
     }
 
     @Test
@@ -95,10 +95,10 @@
     }
 
     @Test
-    public void testUpdateState_appInWhitelist_showSummaryNotOptimized() {
+    public void testUpdateState_appInAllowlist_showSummaryNotOptimized() {
         BatteryOptimizationPreferenceController controller =
                 new BatteryOptimizationPreferenceController(mSettingsActivity, mFragment,
-                        PKG_IN_WHITELIST, mBackend);
+                        PKG_IN_ALLOWLIST, mBackend);
 
         controller.updateState(mPreference);
 
@@ -106,7 +106,7 @@
     }
 
     @Test
-    public void testUpdateState_appNotInWhitelist_showSummaryOptimized() {
+    public void testUpdateState_appNotInAllowlist_showSummaryOptimized() {
         mController.updateState(mPreference);
 
         assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(R.string.high_power_off));
@@ -115,9 +115,9 @@
     /**
      * Create this test class so we could mock it
      */
-    public static class TestPowerWhitelistBackend extends PowerWhitelistBackend {
+    public static class TestPowerAllowlistBackend extends PowerAllowlistBackend {
 
-        public TestPowerWhitelistBackend(Context context) {
+        public TestPowerAllowlistBackend(Context context) {
             super(context);
         }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index 0faddc3..f393da8 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -63,7 +63,7 @@
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowThreadUtils;
 import com.android.settingslib.fuelgauge.Estimate;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import org.junit.Before;
 import org.junit.Ignore;
@@ -144,6 +144,8 @@
     @Mock
     private BatterySipper mIdleBatterySipper;
     @Mock
+    private BatteryInfo mBatteryInfo;
+    @Mock
     private Bundle mBundle;
     @Mock
     private UserManager mUserManager;
@@ -160,7 +162,7 @@
     @Mock
     private ApplicationInfo mLowApplicationInfo;
     @Mock
-    private PowerWhitelistBackend mPowerWhitelistBackend;
+    private PowerAllowlistBackend mPowerAllowlistBackend;
     @Mock
     private BatteryDatabaseManager mBatteryDatabaseManager;
     private AnomalyInfo mAnomalyInfo;
@@ -533,7 +535,7 @@
         BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
                 BatterySipper.DrainType.SCREEN);
 
-        assertThat(sipper).isSameAs(mScreenBatterySipper);
+        assertThat(sipper).isSameInstanceAs(mScreenBatterySipper);
     }
 
     @Test
@@ -541,7 +543,7 @@
         BatterySipper sipper = mBatteryUtils.findBatterySipperByType(mUsageList,
                 BatterySipper.DrainType.APP);
 
-        assertThat(sipper).isSameAs(mNormalBatterySipper);
+        assertThat(sipper).isSameInstanceAs(mNormalBatterySipper);
     }
 
     @Test
@@ -642,7 +644,7 @@
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
         mHighApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isTrue();
     }
 
@@ -652,7 +654,7 @@
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
         mHighApplicationInfo.flags = ApplicationInfo.FLAG_SYSTEM;
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isTrue();
     }
 
@@ -661,16 +663,16 @@
         final int systemUid = Process.ROOT_UID;
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(systemUid);
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, systemUid,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, systemUid,
                 mAnomalyInfo)).isTrue();
     }
 
     @Test
     public void testShouldHideAnomaly_AppInDozeList_returnTrue() {
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
-        doReturn(true).when(mPowerWhitelistBackend).isWhitelisted(new String[]{HIGH_SDK_PACKAGE});
+        doReturn(true).when(mPowerAllowlistBackend).isAllowlisted(new String[]{HIGH_SDK_PACKAGE});
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isTrue();
     }
 
@@ -678,7 +680,7 @@
     public void testShouldHideAnomaly_normalApp_returnFalse() {
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isFalse();
     }
 
@@ -687,7 +689,7 @@
         doReturn(new String[]{LOW_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
         mAnomalyInfo = new AnomalyInfo(INFO_EXCESSIVE);
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isFalse();
     }
 
@@ -696,7 +698,7 @@
         doReturn(new String[]{HIGH_SDK_PACKAGE}).when(mPackageManager).getPackagesForUid(UID);
         mAnomalyInfo = new AnomalyInfo(INFO_EXCESSIVE);
 
-        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerWhitelistBackend, UID,
+        assertThat(mBatteryUtils.shouldHideAnomaly(mPowerAllowlistBackend, UID,
                 mAnomalyInfo)).isTrue();
     }
 
@@ -754,4 +756,36 @@
         assertThat(estimate.isBasedOnUsage()).isTrue();
         assertThat(estimate.getAverageDischargeTime()).isEqualTo(1000);
     }
+
+    @Test
+    public void testIsBatteryDefenderOn_isOverheatedAndIsCharging_returnTrue() {
+        mBatteryInfo.isOverheated = true;
+        mBatteryInfo.discharging = false;
+
+        assertThat(mBatteryUtils.isBatteryDefenderOn(mBatteryInfo)).isTrue();
+    }
+
+    @Test
+    public void testIsBatteryDefenderOn_isOverheatedAndDischarging_returnFalse() {
+        mBatteryInfo.isOverheated = true;
+        mBatteryInfo.discharging = true;
+
+        assertThat(mBatteryUtils.isBatteryDefenderOn(mBatteryInfo)).isFalse();
+    }
+
+    @Test
+    public void testIsBatteryDefenderOn_notOverheatedAndDischarging_returnFalse() {
+        mBatteryInfo.isOverheated = false;
+        mBatteryInfo.discharging = true;
+
+        assertThat(mBatteryUtils.isBatteryDefenderOn(mBatteryInfo)).isFalse();
+    }
+
+    @Test
+    public void testIsBatteryDefenderOn_notOverheatedAndIsCharging_returnFalse() {
+        mBatteryInfo.isOverheated = false;
+        mBatteryInfo.discharging = false;
+
+        assertThat(mBatteryUtils.isBatteryDefenderOn(mBatteryInfo)).isFalse();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
index e613684..4af741d 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/HighPowerDetailTest.java
@@ -32,7 +32,7 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -52,7 +52,7 @@
 
     private Context mContext;
     @Mock
-    private PowerWhitelistBackend mPowerWhitelistBackend;
+    private PowerAllowlistBackend mPowerAllowlistBackend;
     @Mock
     private BatteryUtils mBatteryUtils;
 
@@ -63,7 +63,7 @@
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
         mFragment = spy(new HighPowerDetail());
-        mFragment.mBackend = mPowerWhitelistBackend;
+        mFragment.mBackend = mPowerAllowlistBackend;
         mFragment.mBatteryUtils = mBatteryUtils;
         mFragment.mPackageUid = TEST_UID;
         mFragment.mPackageName = TEST_PACKAGE;
@@ -71,21 +71,21 @@
 
     @Test
     public void logSpecialPermissionChange() {
-        // Deny means app is whitelisted to opt out of power save restrictions
+        // Deny means app is allowlisted to opt out of power save restrictions
         HighPowerDetail.logSpecialPermissionChange(true, "app", RuntimeEnvironment.application);
         verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_DENY), eq("app"));
 
-        // Allow means app is NOT whitelisted to opt out of power save restrictions
+        // Allow means app is NOT allowlisted to opt out of power save restrictions
         HighPowerDetail.logSpecialPermissionChange(false, "app", RuntimeEnvironment.application);
         verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class),
                 eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_BATTERY_ALLOW), eq("app"));
     }
 
     @Test
-    public void onClick_appAddedToDozeWhitelist_getsUnrestricted() {
+    public void onClick_appAddedToDozeAllowlist_getsUnrestricted() {
         mFragment.mIsEnabled = true;
-        when(mPowerWhitelistBackend.isWhitelisted(TEST_PACKAGE)).thenReturn(false);
+        when(mPowerAllowlistBackend.isAllowlisted(TEST_PACKAGE)).thenReturn(false);
         mFragment.onClick(null, DialogInterface.BUTTON_POSITIVE);
         verify(mBatteryUtils).setForceAppStandby(TEST_UID, TEST_PACKAGE,
                 AppOpsManager.MODE_ALLOWED);
@@ -93,9 +93,9 @@
 
     @Test
     public void getSummary_defaultActivePackage_returnUnavailable() {
-        doReturn(true).when(mPowerWhitelistBackend).isDefaultActiveApp(TEST_PACKAGE);
+        doReturn(true).when(mPowerAllowlistBackend).isDefaultActiveApp(TEST_PACKAGE);
 
-        assertThat(HighPowerDetail.getSummary(mContext, mPowerWhitelistBackend, TEST_PACKAGE))
+        assertThat(HighPowerDetail.getSummary(mContext, mPowerAllowlistBackend, TEST_PACKAGE))
                 .isEqualTo(mContext.getString(R.string.high_power_system));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
index 7839e1a..1cc4dca 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
@@ -45,7 +45,6 @@
 import android.view.View;
 import android.widget.TextView;
 
-import androidx.annotation.VisibleForTesting;
 import androidx.loader.app.LoaderManager;
 import androidx.preference.PreferenceScreen;
 
@@ -56,6 +55,7 @@
 import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.XmlTestUtils;
+import com.android.settings.testutils.shadow.ShadowUtils;
 import com.android.settingslib.core.instrumentation.VisibilityLoggerMixin;
 import com.android.settingslib.widget.LayoutPreference;
 
@@ -72,6 +72,7 @@
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
@@ -224,6 +225,7 @@
     }
 
     @Test
+    @Config(shadows = ShadowUtils.class)
     public void nonIndexableKeys_MatchPreferenceKeys() {
         final Context context = RuntimeEnvironment.application;
         final List<String> niks =
@@ -232,7 +234,7 @@
         final List<String> keys =
                 XmlTestUtils.getKeysFromPreferenceXml(context, R.xml.power_usage_summary);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
index 3775802..6d2298b 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
@@ -18,12 +18,16 @@
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
 import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
-import static com.android.settings.fuelgauge.TopLevelBatteryPreferenceController.getDashboardLabel;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
+import android.util.FeatureFlagUtils;
 
+import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,6 +46,13 @@
         mController = new TopLevelBatteryPreferenceController(mContext, "test_key");
     }
 
+    @After
+    public void tearDown() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        }
+    }
+
     @Test
     public void getAvailibilityStatus_availableByDefault() {
         assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
@@ -57,13 +68,31 @@
     public void getDashboardLabel_returnsCorrectLabel() {
         BatteryInfo info = new BatteryInfo();
         info.batteryPercentString = "3%";
-        assertThat(getDashboardLabel(mContext, info)).isEqualTo(info.batteryPercentString);
+        assertThat(mController.getDashboardLabel(mContext, info, true))
+                .isEqualTo(info.batteryPercentString);
 
         info.remainingLabel = "Phone will shut down soon";
-        assertThat(getDashboardLabel(mContext, info)).isEqualTo("3% - Phone will shut down soon");
+        assertThat(mController.getDashboardLabel(mContext, info, true))
+                .isEqualTo("3% - Phone will shut down soon");
 
         info.discharging = false;
         info.chargeLabel = "5% - charging";
-        assertThat(getDashboardLabel(mContext, info)).isEqualTo("5% - charging");
+        assertThat(mController.getDashboardLabel(mContext, info, true)).isEqualTo("5% - charging");
+    }
+
+    @Test
+    public void getSummary_silkyHomeEnabled_shouldBeNull() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+
+        assertThat(mController.getSummary()).isNull();
+    }
+
+    @Test
+    public void getSummary_batteryNotPresent_shouldShowWarningMessage() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        mController.mIsBatteryPresent = false;
+
+        assertThat(mController.getSummary())
+                .isEqualTo(mContext.getString(R.string.battery_missing_message));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsControllerTest.java
deleted file mode 100644
index 2919edc..0000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsControllerTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.android.settings.fuelgauge.batterysaver;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.os.PowerManager;
-import android.provider.Settings;
-import android.provider.Settings.Global;
-import android.provider.Settings.Secure;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class BatterySaverScheduleRadioButtonsControllerTest {
-    private Context mContext;
-    private ContentResolver mResolver;
-    private BatterySaverScheduleRadioButtonsController mController;
-    private BatterySaverScheduleSeekBarController mSeekBarController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mSeekBarController = new BatterySaverScheduleSeekBarController(mContext);
-        mController = new BatterySaverScheduleRadioButtonsController(
-                mContext, mSeekBarController);
-        mResolver = mContext.getContentResolver();
-    }
-
-    @Test
-    public void getDefaultKey_routine_returnsCorrectValue() {
-        Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
-                PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC);
-        assertThat(mController.getDefaultKey())
-                .isEqualTo(BatterySaverScheduleRadioButtonsController.KEY_ROUTINE);
-    }
-
-    @Test
-    public void getDefaultKey_automatic_returnsCorrectValue() {
-        Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
-                PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
-        Settings.Global.putInt(mResolver, Global.LOW_POWER_MODE_TRIGGER_LEVEL, 5);
-        assertThat(mController.getDefaultKey())
-                .isEqualTo(BatterySaverScheduleRadioButtonsController.KEY_PERCENTAGE);
-    }
-
-    @Test
-    public void getDefaultKey_none_returnsCorrectValue() {
-        Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
-                PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
-        Settings.Global.putInt(mResolver, Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
-        assertThat(mController.getDefaultKey())
-                .isEqualTo(BatterySaverScheduleRadioButtonsController.KEY_NO_SCHEDULE);
-    }
-
-    @Test
-    public void setDefaultKey_any_defaultsToNoScheduleIfWarningNotSeen() {
-        Secure.putString(
-                mContext.getContentResolver(), Secure.LOW_POWER_WARNING_ACKNOWLEDGED, "null");
-        mController.setDefaultKey(BatterySaverScheduleRadioButtonsController.KEY_ROUTINE);
-        assertThat(mController.getDefaultKey())
-                .isEqualTo(BatterySaverScheduleRadioButtonsController.KEY_NO_SCHEDULE);
-    }
-
-    @Test
-    public void setDefaultKey_percentage_shouldSuppressNotification() {
-        Secure.putInt(
-                mContext.getContentResolver(), Secure.LOW_POWER_WARNING_ACKNOWLEDGED, 1);
-        Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
-                PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
-        Settings.Global.putInt(mResolver, Global.LOW_POWER_MODE_TRIGGER_LEVEL, 5);
-        mController.setDefaultKey(BatterySaverScheduleRadioButtonsController.KEY_PERCENTAGE);
-
-        final int result = Settings.Secure.getInt(mResolver,
-                Secure.SUPPRESS_AUTO_BATTERY_SAVER_SUGGESTION, 0);
-        assertThat(result).isEqualTo(1);
-    }
-
-    @Test
-    public void setDefaultKey_routine_shouldSuppressNotification() {
-        Secure.putInt(
-                mContext.getContentResolver(), Secure.LOW_POWER_WARNING_ACKNOWLEDGED, 1);
-        Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
-                PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC);
-        mController.setDefaultKey(BatterySaverScheduleRadioButtonsController.KEY_ROUTINE);
-
-        final int result = Settings.Secure.getInt(mResolver,
-                Secure.SUPPRESS_AUTO_BATTERY_SAVER_SUGGESTION, 0);
-        assertThat(result).isEqualTo(1);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceControllerTest.java
deleted file mode 100644
index 0e7c312..0000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceControllerTest.java
+++ /dev/null
@@ -1,63 +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.fuelgauge.batterysaver;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.provider.Settings.Global;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class BatterySaverStickyPreferenceControllerTest {
-
-    private static final String PREF_KEY = "battery_saver_sticky";
-
-    private Context mContext;
-    private BatterySaverStickyPreferenceController mController;
-
-    @Before
-    public void setup() {
-        mContext = RuntimeEnvironment.application;
-        mController = new BatterySaverStickyPreferenceController(mContext, PREF_KEY);
-    }
-
-    private int getAutoDisableSetting() {
-        return Settings.Global.getInt(mContext.getContentResolver(),
-            Global.LOW_POWER_MODE_STICKY_AUTO_DISABLE_ENABLED,
-                1);
-    }
-
-    @Test
-    public void testOnPreferenceChange_turnOnAutoOff_autoDisableOn() {
-        mController.setChecked(true);
-        final int isOn = getAutoDisableSetting();
-        assertThat(isOn).isEqualTo(1);
-    }
-
-    @Test
-    public void testOnPreferenceChange_TurnOffAutoOff_autoDisableOff() {
-        mController.setChecked(false);
-        final int isOn = getAutoDisableSetting();
-        assertThat(isOn).isEqualTo(0);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
index e839717..dd90dc8 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AnomalyDetectionJobServiceTest.java
@@ -36,7 +36,6 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.robolectric.RuntimeEnvironment.application;
 
 import android.app.JobSchedulerImpl;
 import android.app.StatsManager;
@@ -59,8 +58,7 @@
 import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settings.testutils.shadow.ShadowPowerWhitelistBackend;
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
+import com.android.settingslib.fuelgauge.PowerAllowlistBackend;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -78,7 +76,7 @@
 import java.util.concurrent.TimeUnit;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowConnectivityManager.class, ShadowPowerWhitelistBackend.class})
+@Config(shadows = {ShadowConnectivityManager.class})
 public class AnomalyDetectionJobServiceTest {
     private static final int UID = 12345;
     private static final String SYSTEM_PACKAGE = "com.android.system";
@@ -95,7 +93,7 @@
     @Mock
     private BatteryUtils mBatteryUtils;
     @Mock
-    private PowerWhitelistBackend mPowerWhitelistBackend;
+    private PowerAllowlistBackend mPowerAllowlistBackend;
     @Mock
     private StatsDimensionsValue mStatsDimensionsValue;
     @Mock
@@ -145,13 +143,13 @@
     }
 
     @Test
-    public void saveAnomalyToDatabase_systemWhitelisted_doNotSave() {
+    public void saveAnomalyToDatabase_systemAllowlisted_doNotSave() {
         doReturn(UID).when(mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
-        doReturn(true).when(mPowerWhitelistBackend).isWhitelisted(any(String[].class));
+        doReturn(true).when(mPowerAllowlistBackend).isAllowlisted(any(String[].class));
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider,
                 mFeatureFactory.metricsFeatureProvider, mBundle);
 
@@ -165,14 +163,14 @@
         cookies.add(SUBSCRIBER_COOKIES_AUTO_RESTRICTION);
         mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
         doReturn(SYSTEM_PACKAGE).when(mBatteryUtils).getPackageName(anyInt());
-        doReturn(false).when(mPowerWhitelistBackend).isSysWhitelisted(SYSTEM_PACKAGE);
+        doReturn(false).when(mPowerAllowlistBackend).isSysAllowlisted(SYSTEM_PACKAGE);
         doReturn(Process.FIRST_APPLICATION_UID).when(
                 mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
         doReturn(true).when(mBatteryUtils).shouldHideAnomaly(any(), anyInt(), any());
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider,
                 mFeatureFactory.metricsFeatureProvider, mBundle);
 
@@ -192,7 +190,7 @@
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
                 mBundle);
 
@@ -207,7 +205,7 @@
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
                 mBundle);
 
@@ -221,13 +219,13 @@
         cookies.add(SUBSCRIBER_COOKIES_AUTO_RESTRICTION);
         mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
         doReturn(SYSTEM_PACKAGE).when(mBatteryUtils).getPackageName(anyInt());
-        doReturn(false).when(mPowerWhitelistBackend).isSysWhitelisted(SYSTEM_PACKAGE);
+        doReturn(false).when(mPowerAllowlistBackend).isSysAllowlisted(SYSTEM_PACKAGE);
         doReturn(Process.FIRST_APPLICATION_UID).when(
                 mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
                 mBundle);
 
@@ -246,13 +244,13 @@
         cookies.add(SUBSCRIBER_COOKIES_NOT_AUTO_RESTRICTION);
         mBundle.putStringArrayList(StatsManager.EXTRA_STATS_BROADCAST_SUBSCRIBER_COOKIES, cookies);
         doReturn(SYSTEM_PACKAGE).when(mBatteryUtils).getPackageName(anyInt());
-        doReturn(false).when(mPowerWhitelistBackend).isSysWhitelisted(SYSTEM_PACKAGE);
+        doReturn(false).when(mPowerAllowlistBackend).isSysAllowlisted(SYSTEM_PACKAGE);
         doReturn(Process.FIRST_APPLICATION_UID).when(
                 mAnomalyDetectionJobService).extractUidFromStatsDimensionsValue(any());
 
         mAnomalyDetectionJobService.saveAnomalyToDatabase(mContext,
                 mUserManager, mBatteryDatabaseManager, mBatteryUtils, mPolicy,
-                mPowerWhitelistBackend, mContext.getContentResolver(),
+                mPowerAllowlistBackend, mContext.getContentResolver(),
                 mFeatureFactory.powerUsageFeatureProvider, mFeatureFactory.metricsFeatureProvider,
                 mBundle);
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java
deleted file mode 100644
index ad546f3..0000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.batterytip;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.os.Parcel;
-import android.text.format.DateUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class AppInfoTest {
-
-    private static final String PACKAGE_NAME = "com.android.app";
-    private static final int TYPE_WAKELOCK =
-            StatsManagerConfig.AnomalyType.EXCESSIVE_WAKELOCK_ALL_SCREEN_OFF;
-    private static final int TYPE_WAKEUP =
-            StatsManagerConfig.AnomalyType.EXCESSIVE_WAKEUPS_IN_BACKGROUND;
-    private static final long SCREEN_TIME_MS = DateUtils.HOUR_IN_MILLIS;
-    private static final int UID = 3452;
-
-    private AppInfo mAppInfo;
-
-    @Before
-    public void setUp() {
-        mAppInfo = new AppInfo.Builder()
-                .setPackageName(PACKAGE_NAME)
-                .addAnomalyType(TYPE_WAKELOCK)
-                .addAnomalyType(TYPE_WAKEUP)
-                .setScreenOnTimeMs(SCREEN_TIME_MS)
-                .setUid(UID)
-                .build();
-    }
-
-    @Test
-    public void testParcel() {
-        Parcel parcel = Parcel.obtain();
-        mAppInfo.writeToParcel(parcel, mAppInfo.describeContents());
-        parcel.setDataPosition(0);
-
-        final AppInfo appInfo = new AppInfo(parcel);
-
-        assertThat(appInfo.packageName).isEqualTo(PACKAGE_NAME);
-        assertThat(appInfo.anomalyTypes).containsExactly(TYPE_WAKELOCK, TYPE_WAKEUP);
-        assertThat(appInfo.screenOnTimeMs).isEqualTo(SCREEN_TIME_MS);
-        assertThat(appInfo.uid).isEqualTo(UID);
-    }
-
-    @Test
-    public void testCompareTo_hasCorrectOrder() {
-        final AppInfo appInfo = new AppInfo.Builder()
-                .setPackageName(PACKAGE_NAME)
-                .addAnomalyType(TYPE_WAKELOCK)
-                .setScreenOnTimeMs(SCREEN_TIME_MS + 100)
-                .build();
-
-        List<AppInfo> appInfos = new ArrayList<>();
-        appInfos.add(appInfo);
-        appInfos.add(mAppInfo);
-
-        Collections.sort(appInfos);
-        assertThat(appInfos.get(0).screenOnTimeMs).isLessThan(appInfos.get(1).screenOnTimeMs);
-    }
-
-    @Test
-    public void testBuilder() {
-        assertThat(mAppInfo.packageName).isEqualTo(PACKAGE_NAME);
-        assertThat(mAppInfo.anomalyTypes).containsExactly(TYPE_WAKELOCK, TYPE_WAKEUP);
-        assertThat(mAppInfo.screenOnTimeMs).isEqualTo(SCREEN_TIME_MS);
-        assertThat(mAppInfo.uid).isEqualTo(UID);
-    }
-}
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 116033b..8cc17d8 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java
@@ -50,6 +50,7 @@
 public class BatteryTipLoaderTest {
 
     private static final int[] TIP_ORDER = {
+            BatteryTip.TipType.BATTERY_DEFENDER,
             BatteryTip.TipType.BATTERY_SAVER,
             BatteryTip.TipType.HIGH_DEVICE_USAGE,
             BatteryTip.TipType.LOW_BATTERY,
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
deleted file mode 100644
index 9b54fc7..0000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
+++ /dev/null
@@ -1,115 +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.fuelgauge.batterytip;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.text.format.DateUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class BatteryTipPolicyTest {
-
-    private static final String BATTERY_TIP_CONSTANTS_VALUE = "battery_tip_enabled=true"
-            + ",summary_enabled=false"
-            + ",battery_saver_tip_enabled=false"
-            + ",high_usage_enabled=true"
-            + ",high_usage_app_count=5"
-            + ",high_usage_period_ms=2000"
-            + ",high_usage_battery_draining=30"
-            + ",app_restriction_enabled=true"
-            + ",reduced_battery_enabled=true"
-            + ",reduced_battery_percent=30"
-            + ",low_battery_enabled=false"
-            + ",low_battery_hour=10"
-            + ",data_history_retain_day=24"
-            + ",excessive_bg_drain_percentage=25"
-            + ",test_battery_saver_tip=true"
-            + ",test_high_usage_tip=false"
-            + ",test_smart_battery_tip=true"
-            + ",test_low_battery_tip=true"
-            + ",app_restriction_active_hour=6";
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    public void testInit_usesConfigValues() {
-        Settings.Global.putString(mContext.getContentResolver(),
-                Settings.Global.BATTERY_TIP_CONSTANTS, BATTERY_TIP_CONSTANTS_VALUE);
-
-        final BatteryTipPolicy batteryTipPolicy = new BatteryTipPolicy(mContext);
-
-        assertThat(batteryTipPolicy.batteryTipEnabled).isTrue();
-        assertThat(batteryTipPolicy.summaryEnabled).isFalse();
-        assertThat(batteryTipPolicy.batterySaverTipEnabled).isFalse();
-        assertThat(batteryTipPolicy.highUsageEnabled).isTrue();
-        assertThat(batteryTipPolicy.highUsageAppCount).isEqualTo(5);
-        assertThat(batteryTipPolicy.highUsagePeriodMs).isEqualTo(2000);
-        assertThat(batteryTipPolicy.highUsageBatteryDraining).isEqualTo(30);
-        assertThat(batteryTipPolicy.appRestrictionEnabled).isTrue();
-        assertThat(batteryTipPolicy.appRestrictionActiveHour).isEqualTo(6);
-        assertThat(batteryTipPolicy.reducedBatteryEnabled).isTrue();
-        assertThat(batteryTipPolicy.reducedBatteryPercent).isEqualTo(30);
-        assertThat(batteryTipPolicy.lowBatteryEnabled).isFalse();
-        assertThat(batteryTipPolicy.lowBatteryHour).isEqualTo(10);
-        assertThat(batteryTipPolicy.dataHistoryRetainDay).isEqualTo(24);
-        assertThat(batteryTipPolicy.excessiveBgDrainPercentage).isEqualTo(25);
-        assertThat(batteryTipPolicy.testBatterySaverTip).isTrue();
-        assertThat(batteryTipPolicy.testHighUsageTip).isFalse();
-        assertThat(batteryTipPolicy.testSmartBatteryTip).isTrue();
-        assertThat(batteryTipPolicy.testLowBatteryTip).isTrue();
-    }
-
-    @Test
-    public void testInit_defaultValues() {
-        Settings.Global.putString(mContext.getContentResolver(),
-                Settings.Global.BATTERY_TIP_CONSTANTS, "");
-
-        final BatteryTipPolicy batteryTipPolicy = new BatteryTipPolicy(mContext);
-
-        assertThat(batteryTipPolicy.batteryTipEnabled).isTrue();
-        assertThat(batteryTipPolicy.summaryEnabled).isTrue();
-        assertThat(batteryTipPolicy.batterySaverTipEnabled).isTrue();
-        assertThat(batteryTipPolicy.highUsageEnabled).isTrue();
-        assertThat(batteryTipPolicy.highUsageAppCount).isEqualTo(3);
-        assertThat(batteryTipPolicy.highUsagePeriodMs).isEqualTo(2 * DateUtils.HOUR_IN_MILLIS);
-        assertThat(batteryTipPolicy.highUsageBatteryDraining).isEqualTo(25);
-        assertThat(batteryTipPolicy.appRestrictionEnabled).isTrue();
-        assertThat(batteryTipPolicy.appRestrictionActiveHour).isEqualTo(24);
-        assertThat(batteryTipPolicy.reducedBatteryEnabled).isFalse();
-        assertThat(batteryTipPolicy.reducedBatteryPercent).isEqualTo(50);
-        assertThat(batteryTipPolicy.lowBatteryEnabled).isTrue();
-        assertThat(batteryTipPolicy.lowBatteryHour).isEqualTo(3);
-        assertThat(batteryTipPolicy.dataHistoryRetainDay).isEqualTo(30);
-        assertThat(batteryTipPolicy.excessiveBgDrainPercentage).isEqualTo(10);
-        assertThat(batteryTipPolicy.testBatterySaverTip).isFalse();
-        assertThat(batteryTipPolicy.testHighUsageTip).isFalse();
-        assertThat(batteryTipPolicy.testSmartBatteryTip).isFalse();
-        assertThat(batteryTipPolicy.testLowBatteryTip).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
index 275bfe0..6199788 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipUtilsTest.java
@@ -23,10 +23,12 @@
 
 import com.android.settings.SettingsActivity;
 import com.android.settings.core.InstrumentedPreferenceFragment;
+import com.android.settings.fuelgauge.batterytip.actions.BatteryDefenderAction;
 import com.android.settings.fuelgauge.batterytip.actions.BatterySaverAction;
 import com.android.settings.fuelgauge.batterytip.actions.OpenBatterySaverAction;
 import com.android.settings.fuelgauge.batterytip.actions.OpenRestrictAppFragmentAction;
 import com.android.settings.fuelgauge.batterytip.actions.RestrictAppAction;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryDefenderTip;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.fuelgauge.batterytip.tips.EarlyWarningTip;
 import com.android.settings.fuelgauge.batterytip.tips.LowBatteryTip;
@@ -53,6 +55,7 @@
     private RestrictAppTip mRestrictAppTip;
     private EarlyWarningTip mEarlyWarningTip;
     private LowBatteryTip mLowBatteryTip;
+    private BatteryDefenderTip mBatteryDefenderTip;
 
     @Before
     public void setUp() {
@@ -67,6 +70,7 @@
         mLowBatteryTip = spy(
                 new LowBatteryTip(BatteryTip.StateType.NEW, false /* powerSaveModeOn */,
                         "" /* summary */));
+        mBatteryDefenderTip = spy(new BatteryDefenderTip(BatteryTip.StateType.NEW));
     }
 
     @Test
@@ -116,4 +120,13 @@
         assertThat(BatteryTipUtils.getActionForBatteryTip(mLowBatteryTip, mSettingsActivity,
                 mFragment)).isInstanceOf(OpenBatterySaverAction.class);
     }
+
+    @Test
+    public void
+            testGetActionForBatteryTip_typeBatteryDefenderStateNew_returnActionBatteryDefender() {
+        when(mBatteryDefenderTip.getState()).thenReturn(BatteryTip.StateType.NEW);
+
+        assertThat(BatteryTipUtils.getActionForBatteryTip(mBatteryDefenderTip, mSettingsActivity,
+                mFragment)).isInstanceOf(BatteryDefenderAction.class);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java
new file mode 100644
index 0000000..a1f9d1f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetectorTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2020 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 com.android.settings.fuelgauge.BatteryInfo;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class BatteryDefenderDetectorTest {
+
+    @Mock
+    private BatteryInfo mBatteryInfo;
+    private BatteryDefenderDetector mBatteryDefenderDetector;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mBatteryInfo.discharging = false;
+
+        mBatteryDefenderDetector = new BatteryDefenderDetector(mBatteryInfo);
+    }
+
+    @Test
+    public void testDetect_notOverheated_tipInvisible() {
+        mBatteryInfo.isOverheated = false;
+
+        assertThat(mBatteryDefenderDetector.detect().isVisible()).isFalse();
+    }
+
+    @Test
+    public void testDetect_isOverheated_tipNew() {
+        mBatteryInfo.isOverheated = true;
+
+        assertThat(mBatteryDefenderDetector.detect().getState())
+                .isEqualTo(BatteryTip.StateType.NEW);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java
new file mode 100644
index 0000000..c6eb15d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTipTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 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 com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class BatteryDefenderTipTest {
+
+    private Context mContext;
+    private BatteryDefenderTip mBatteryDefenderTip;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mBatteryDefenderTip = new BatteryDefenderTip(BatteryTip.StateType.NEW);
+    }
+
+    @Test
+    public void getTitle_showTitle() {
+        assertThat(mBatteryDefenderTip.getTitle(mContext))
+                .isEqualTo(mContext.getString(R.string.battery_tip_limited_temporarily_title));
+    }
+
+    @Test
+    public void getSummary_showSummary() {
+        assertThat(mBatteryDefenderTip.getSummary(mContext))
+                .isEqualTo(mContext.getString(R.string.battery_tip_limited_temporarily_summary));
+    }
+
+    @Test
+    public void getIcon_showIcon() {
+        assertThat(mBatteryDefenderTip.getIconId())
+                .isEqualTo(R.drawable.ic_battery_status_good_24dp);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
index b95040a..f02eec2 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
@@ -34,7 +34,6 @@
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.fuelgauge.batterytip.AppInfo;
-import com.android.settings.testutils.BatteryTestUtils;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.junit.After;
@@ -45,10 +44,10 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
 public class RestrictAppTipTest {
@@ -198,7 +197,7 @@
         appInfos.add(mUninstallAppInfo);
         final BatteryTip batteryTip = new RestrictAppTip(BatteryTip.StateType.NEW, appInfos);
 
-        batteryTip.sanityCheck(mContext);
+        batteryTip.validateCheck(mContext);
 
         assertThat(batteryTip.getState()).isEqualTo(BatteryTip.StateType.INVISIBLE);
     }
@@ -210,7 +209,7 @@
         appInfos.add(mUninstallAppInfo);
         final BatteryTip batteryTip = new RestrictAppTip(BatteryTip.StateType.NEW, appInfos);
 
-        batteryTip.sanityCheck(mContext);
+        batteryTip.validateCheck(mContext);
 
         assertThat(batteryTip.getState()).isEqualTo(BatteryTip.StateType.NEW);
     }
diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java
new file mode 100644
index 0000000..e62de08
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+import static com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController.ACTION_EMERGENCY_GESTURE_SETTINGS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ResolveInfo;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+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.robolectric.RobolectricTestRunner;
+import org.robolectric.Shadows;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowPackageManager;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class EmergencyGestureEntrypointPreferenceControllerTest {
+
+    private static final String TEST_PKG_NAME = "test_pkg";
+    private static final String TEST_CLASS_NAME = "name";
+    private static final Intent SETTING_INTENT = new Intent(ACTION_EMERGENCY_GESTURE_SETTINGS)
+            .setPackage(TEST_PKG_NAME);
+
+    private Context mContext;
+    private ShadowPackageManager mPackageManager;
+    private EmergencyGestureEntrypointPreferenceController mController;
+    private static final String PREF_KEY = "gesture_emergency_button";
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mPackageManager = Shadows.shadowOf(mContext.getPackageManager());
+        mController = new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void constructor_hasCustomPackageConfig_shouldSetIntent() {
+        final ResolveInfo info = new ResolveInfo();
+        info.activityInfo = new ActivityInfo();
+        info.activityInfo.packageName = TEST_PKG_NAME;
+        info.activityInfo.name = TEST_CLASS_NAME;
+
+        mPackageManager.addResolveInfoForIntent(SETTING_INTENT, info);
+
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.TRUE);
+
+        SettingsShadowResources.overrideResource(
+                R.string.emergency_gesture_settings_package,
+                TEST_PKG_NAME);
+
+        mController = new EmergencyGestureEntrypointPreferenceController(mContext, PREF_KEY);
+
+        assertThat(mController.mIntent).isNotNull();
+    }
+
+    @Test
+    public void getAvailabilityStatus_configIsTrue_shouldReturnAvailable() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.TRUE);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_configIsFalse_shouldReturnUnsupported() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.FALSE);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceControllerTest.java
new file mode 100644
index 0000000..80c10d0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceControllerTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
+import com.android.settingslib.emergencynumber.EmergencyNumberUtils;
+
+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.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class EmergencyGestureNumberOverridePreferenceControllerTest {
+    private static final String PREF_KEY = "test";
+
+    @Mock
+    private EmergencyNumberUtils mEmergencyNumberUtils;
+    private Context mContext;
+    private EmergencyGestureNumberOverridePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new EmergencyGestureNumberOverridePreferenceController(mContext, PREF_KEY);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void getAvailabilityStatus_configIsTrue_shouldReturnAvailable() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.TRUE);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_configIsFalse_shouldReturnUnsupported() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.FALSE);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void updateState_shouldLoadNumberFromSettings() {
+        final Preference preference = new Preference(mContext);
+        mController.mEmergencyNumberUtils = mEmergencyNumberUtils;
+        when(mEmergencyNumberUtils.getPoliceNumber()).thenReturn("123");
+
+        mController.updateState(preference);
+
+        assertThat(preference.getSummary().toString()).isEqualTo(
+                mContext.getString(R.string.emergency_gesture_call_for_help_summary, "123"));
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java
new file mode 100644
index 0000000..08106d3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/EmergencyGesturePreferenceControllerTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+import static com.android.settings.gestures.EmergencyGesturePreferenceController.OFF;
+import static com.android.settings.gestures.EmergencyGesturePreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+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.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class EmergencyGesturePreferenceControllerTest {
+
+    private Context mContext;
+    private ContentResolver mContentResolver;
+    private EmergencyGesturePreferenceController mController;
+    private static final String PREF_KEY = "gesture_emergency_button";
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mContentResolver = mContext.getContentResolver();
+        mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void getAvailabilityStatus_configIsTrue_shouldReturnAvailable() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.TRUE);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_configIsFalse_shouldReturnUnsupported() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.FALSE);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void isChecked_configIsNotSet_shouldReturnTrue() {
+        // Set the setting to be enabled.
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, ON);
+        mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_configIsSet_shouldReturnFalse() {
+        // Set the setting to be disabled.
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_ENABLED, OFF);
+        mController = new EmergencyGesturePreferenceController(mContext, PREF_KEY);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isSliceable_returnsFalse() {
+        assertThat(mController.isSliceable()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceControllerTest.java
new file mode 100644
index 0000000..b14a29e
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/EmergencyGestureSoundPreferenceControllerTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.android.settings.gestures.EmergencyGestureSoundPreferenceController.OFF;
+import static com.android.settings.gestures.EmergencyGestureSoundPreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.R;
+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.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = SettingsShadowResources.class)
+public class EmergencyGestureSoundPreferenceControllerTest {
+
+    private Context mContext;
+    private ContentResolver mContentResolver;
+    private EmergencyGestureSoundPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mContentResolver = mContext.getContentResolver();
+        mController = new EmergencyGestureSoundPreferenceController(mContext, "test_key");
+    }
+
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
+    @Test
+    public void isAvailable_configIsTrue_shouldReturnTrue() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.TRUE);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_configIsTrue_shouldReturnFalse() {
+        SettingsShadowResources.overrideResource(
+                R.bool.config_show_emergency_gesture_settings,
+                Boolean.FALSE);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isChecked_configIsSet_shouldReturnTrue() {
+        // Set the setting to be enabled.
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED,
+                ON);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_configIsSetToFalse_shouldReturnFalse() {
+        // Set the setting to be disabled.
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.EMERGENCY_GESTURE_SOUND_ENABLED,
+                OFF);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isSliceable_returnsFalse() {
+        assertThat(mController.isSliceable()).isFalse();
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java
new file mode 100644
index 0000000..11128f3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedEnablePreferenceControllerTest.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+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.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class OneHandedEnablePreferenceControllerTest {
+
+    private static final String KEY = "gesture_one_handed_mode_enabled";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    private OneHandedEnablePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new OneHandedEnablePreferenceController(mContext, KEY);
+    }
+
+    @Test
+    public void setChecked_setBoolean_checkIsTrueOrFalse() {
+        mController.setChecked(false);
+        assertThat(OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)).isFalse();
+
+        mController.setChecked(true);
+        assertThat(OneHandedSettingsUtils.isOneHandedModeEnabled(mContext)).isTrue();
+    }
+
+    @Test
+    public void getAvailabilityStatus_setSupportOneHandedModeProperty_shouldAvailable() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_unsetSupportOneHandedModeProperty_shouldUnsupported() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "false");
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getSummary_enabledOneHanded_shouldDisplayOnSummary() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        assertThat(mController.getSummary())
+                .isEqualTo(mContext.getText(R.string.switch_on_text));
+    }
+
+    @Test
+    public void getSummary_disabledOneHanded_shouldDisplayOffSummary() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        assertThat(mController.getSummary())
+                .isEqualTo(mContext.getText(R.string.switch_off_text));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java
new file mode 100644
index 0000000..fcea919
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.SearchIndexableResource;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class OneHandedSettingsTest {
+
+    private OneHandedSettings mSettings;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mSettings = new OneHandedSettings();
+        mContext = RuntimeEnvironment.application;
+    }
+
+    @Test
+    public void testSearchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                OneHandedSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        RuntimeEnvironment.application, true /* enabled */);
+
+        assertThat(indexRes).isNotNull();
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+    }
+
+    @Test
+    public void isPageSearchEnabled_setSupportOneHandedModeProperty_shouldReturnTrue() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+
+        final Object obj = ReflectionHelpers.callInstanceMethod(
+                OneHandedSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
+                ReflectionHelpers.ClassParameter.from(Context.class, mContext));
+        final boolean isEnabled = (Boolean) obj;
+        assertThat(isEnabled).isTrue();
+    }
+
+    @Test
+    public void isPageSearchEnabled_unsetSupportOneHandedModeProperty_shouldReturnFalse() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "false");
+
+        final Object obj = ReflectionHelpers.callInstanceMethod(
+                OneHandedSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
+                ReflectionHelpers.ClassParameter.from(Context.class, mContext));
+        final boolean isEnabled = (Boolean) obj;
+        assertThat(isEnabled).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java
new file mode 100644
index 0000000..7afd12d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class OneHandedSettingsUtilsTest {
+
+    private static final int TIMEOUT_INDEX_NEVER = 0;
+    private static final int TIMEOUT_INDEX_SHORT = 1;
+    private static final int TIMEOUT_INDEX_MEDIUM = 2;
+    private static final int TIMEOUT_INDEX_LONG = 3;
+
+    private Context mContext;
+    private String[] mConfigTimeout;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mConfigTimeout = mContext.getResources().getStringArray(R.array.one_handed_timeout_values);
+    }
+
+    @Test
+    public void setSettingsOneHandedModeEnabled_setEnable_shouldReturnEnabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 0)).isEqualTo(1);
+    }
+
+    @Test
+    public void setSettingsOneHandedModeEnabled_setDisable_shouldReturnDisabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 0)).isEqualTo(0);
+    }
+
+    @Test
+    public void setSettingsTapsAppToExitEnabled_setEnable_shouldReturnEnabled() {
+        OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, true);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.TAPS_APP_TO_EXIT, 1)).isEqualTo(1);
+    }
+
+    @Test
+    public void setSettingsTapsAppToExitEnabled_setDisable_shouldReturnDisabled() {
+        OneHandedSettingsUtils.setSettingsTapsAppToExit(mContext, false);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.TAPS_APP_TO_EXIT, 1)).isEqualTo(0);
+    }
+
+    @Test
+    public void setSettingsTimeout_setNever_shouldReturnNeverValue() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue());
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
+                OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue()))
+                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_NEVER]));
+    }
+
+    @Test
+    public void setSettingsTimeout_setShort_shouldReturnShortValue() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue());
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
+                OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue()))
+                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_SHORT]));
+    }
+
+    @Test
+    public void setSettingsTimeout_setMedium_shouldReturnMediumValue() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.MEDIUM.getValue());
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
+                OneHandedSettingsUtils.OneHandedTimeout.MEDIUM.getValue()))
+                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_MEDIUM]));
+    }
+
+    @Test
+    public void setSettingsTimeout_setLong_shouldReturnLongValue() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.LONG.getValue());
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
+                OneHandedSettingsUtils.OneHandedTimeout.LONG.getValue()))
+                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_LONG]));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java
new file mode 100644
index 0000000..baf8347
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedTimeoutPreferenceControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.preference.ListPreference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class OneHandedTimeoutPreferenceControllerTest {
+
+    private static final String KEY = "one_handed_timeout_preference";
+
+    private Context mContext;
+    private OneHandedTimeoutPreferenceController mController;
+    private ListPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mController = new OneHandedTimeoutPreferenceController(mContext, KEY);
+        mPreference = new ListPreference(mContext);
+        mPreference.setKey(KEY);
+    }
+
+    @Test
+    public void getAvailabilityStatus_enabledOneHanded_shouldAvailable() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_disableOneHanded_shouldUnavailable() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void updateState_enableOneHanded_switchShouldEnabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_disableOneHanded_switchShouldDisabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void getSummary_setTimeoutNever_shouldReturnNeverSummary() {
+        final String[] timeoutTitles = mContext.getResources().getStringArray(
+                R.array.one_handed_timeout_title);
+
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue());
+
+        assertThat(mController.getSummary()).isEqualTo(
+                timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.NEVER.ordinal()]);
+    }
+
+    @Test
+    public void getSummary_setTimeoutShort_shouldReturnShortSummary() {
+        final String[] timeoutTitles = mContext.getResources().getStringArray(
+                R.array.one_handed_timeout_title);
+
+        OneHandedSettingsUtils.setSettingsOneHandedModeTimeout(mContext,
+                OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue());
+
+        assertThat(mController.getSummary()).isEqualTo(String.format(
+                mContext.getResources().getString(R.string.screen_timeout_summary),
+                timeoutTitles[OneHandedSettingsUtils.OneHandedTimeout.SHORT.ordinal()]));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceControllerTest.java
new file mode 100644
index 0000000..a1c0c8f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationPreferenceControllerTest.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static android.provider.Settings.Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_DEPENDENT_SETTING;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+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.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class SwipeBottomToNotificationPreferenceControllerTest {
+
+    private static final String KEY = "gesture_swipe_bottom_to_notification";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+
+    private SwipeBottomToNotificationPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new SwipeBottomToNotificationPreferenceController(mContext, KEY);
+    }
+
+    @Test
+    public void setChecked_toggledOn_enablesSwipeBottomToNotification() {
+        mController.setChecked(true);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 1)).isEqualTo(1);
+    }
+
+    @Test
+    public void setChecked_toggledOff_disablesSwipeBottomToNotification() {
+        mController.setChecked(false);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, 1)).isEqualTo(0);
+    }
+
+    @Test
+    public void getAvailabilityStatus_oneHandedUnsupported_returnsAvailable() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "false");
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_oneHandedDisabled_returnsAvailable() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 0);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_oneHandedEnabled_returnsDisabled() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 1);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void getSummary_gestureEnabled_returnsOnSummary() {
+        mController.setChecked(true);
+
+        assertThat(mController.getSummary()).isEqualTo(
+                mContext.getText(R.string.gesture_setting_on));
+    }
+
+    @Test
+    public void getSummary_gestureDisabled_returnsOffSummary() {
+        mController.setChecked(false);
+
+        assertThat(mController.getSummary()).isEqualTo(
+                mContext.getText(R.string.gesture_setting_off));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationSettingsTest.java
new file mode 100644
index 0000000..ad8104c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/gestures/SwipeBottomToNotificationSettingsTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.SearchIndexableResource;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+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.RobolectricTestRunner;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class SwipeBottomToNotificationSettingsTest {
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+
+    private SwipeBottomToNotificationSettings mSettings = new SwipeBottomToNotificationSettings();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void getPreferenceScreenResId_shouldReturnsXml() {
+        assertThat(mSettings.getPreferenceScreenResId())
+                .isEqualTo(R.xml.swipe_bottom_to_notification_settings);
+    }
+
+    @Test
+    public void searchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        mContext, true /* enabled */);
+
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mSettings.getPreferenceScreenResId());
+    }
+
+    @Test
+    public void isPageSearchEnabled_oneHandedUnsupported_shouldReturnTrue() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "false");
+
+        final Object obj = ReflectionHelpers.callInstanceMethod(
+                SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
+                ReflectionHelpers.ClassParameter.from(Context.class, mContext));
+
+        final boolean isEnabled = (Boolean) obj;
+        assertThat(isEnabled).isTrue();
+    }
+
+    @Test
+    public void isPageSearchEnabled_oneHandedDisabled_shouldReturnTrue() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 0);
+
+        final Object obj = ReflectionHelpers.callInstanceMethod(
+                SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
+                ReflectionHelpers.ClassParameter.from(Context.class, mContext));
+
+        final boolean isEnabled = (Boolean) obj;
+        assertThat(isEnabled).isTrue();
+    }
+
+    @Test
+    public void isPageSearchEnabled_oneHandedEnabled_shouldReturnFalse() {
+        SystemProperties.set(OneHandedEnablePreferenceController.SUPPORT_ONE_HANDED_MODE, "true");
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ONE_HANDED_MODE_ENABLED, 1);
+
+        final Object obj = ReflectionHelpers.callInstanceMethod(
+                SwipeBottomToNotificationSettings.SEARCH_INDEX_DATA_PROVIDER, "isPageSearchEnabled",
+                ReflectionHelpers.ClassParameter.from(Context.class, mContext));
+
+        final boolean isEnabled = (Boolean) obj;
+        assertThat(isEnabled).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
index db12580..4c7b4b5 100644
--- a/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java
@@ -48,25 +48,36 @@
 
 @RunWith(RobolectricTestRunner.class)
 public class SettingsHomepageActivityTest {
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
     }
 
     @Test
-    public void setHomepageContainerPaddingTop_shouldBeSetPaddingTop() {
+    public void setDefaultHomepageContainerPaddingTop_shouldSetSearchBoxHeight() {
         final SettingsHomepageActivity activity = Robolectric.buildActivity(
                 SettingsHomepageActivity.class).create().get();
-        final int searchBarHeight = activity.getResources().getDimensionPixelSize(
-                R.dimen.search_bar_height);
-        final int searchBarMargin = activity.getResources().getDimensionPixelSize(
-                R.dimen.search_bar_margin);
         final View view = activity.findViewById(R.id.homepage_container);
 
-        activity.setHomepageContainerPaddingTop();
+        activity.setDefaultHomepageContainerPaddingTop();
 
         final int actualPaddingTop = view.getPaddingTop();
-        assertThat(actualPaddingTop).isEqualTo(searchBarHeight + searchBarMargin * 2);
+        assertThat(actualPaddingTop).isEqualTo(activity.getSearchBoxHeight());
+    }
+
+    @Test
+    public void setHomepageContainerTopOffset_shouldBeSetPaddingTop() {
+        final SettingsHomepageActivity activity = Robolectric.buildActivity(
+                SettingsHomepageActivity.class).create().get();
+        final View view = activity.findViewById(R.id.homepage_container);
+        final int offset = activity.getResources().getDimensionPixelSize(
+                R.dimen.suggestion_height);
+
+        activity.setHomepageContainerTopOffset(offset);
+
+        final int actualPaddingTop = view.getPaddingTop();
+        assertThat(actualPaddingTop).isEqualTo(activity.getSearchBoxHeight() + offset);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
index 5a6ca86..0cc6b43 100644
--- a/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
@@ -22,6 +22,10 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -45,4 +49,17 @@
     public void shouldForceRoundedIcon_true() {
         assertThat(mSettings.shouldForceRoundedIcon()).isTrue();
     }
+
+    @Test
+    public void getPreferenceScreenResId_silkyHomeDisabled_defaultSettings() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.top_level_settings);
+    }
+
+    @Test
+    public void getPreferenceScreenResId_silkyHomeEnabled_groupedSettings() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+        assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(
+                R.xml.top_level_settings_grouped);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java
deleted file mode 100644
index c908225..0000000
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.homepage.contextualcards;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class CardDatabaseHelperTest {
-
-    private Context mContext;
-    private CardDatabaseHelper mCardDatabaseHelper;
-    private SQLiteDatabase mDatabase;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mCardDatabaseHelper = CardDatabaseHelper.getInstance(mContext);
-        mDatabase = mCardDatabaseHelper.getReadableDatabase();
-    }
-
-    @After
-    public void cleanUp() {
-        CardDatabaseHelper.getInstance(mContext).close();
-        CardDatabaseHelper.sCardDatabaseHelper = null;
-    }
-
-    @Test
-    public void testDatabaseSchema() {
-        final Cursor cursor = mDatabase.rawQuery("SELECT * FROM " + CardDatabaseHelper.CARD_TABLE,
-                null);
-        final String[] columnNames = cursor.getColumnNames();
-
-        final String[] expectedNames = {
-                CardDatabaseHelper.CardColumns.NAME,
-                CardDatabaseHelper.CardColumns.TYPE,
-                CardDatabaseHelper.CardColumns.SCORE,
-                CardDatabaseHelper.CardColumns.SLICE_URI,
-                CardDatabaseHelper.CardColumns.CATEGORY,
-                CardDatabaseHelper.CardColumns.PACKAGE_NAME,
-                CardDatabaseHelper.CardColumns.APP_VERSION,
-                CardDatabaseHelper.CardColumns.DISMISSED_TIMESTAMP,
-        };
-
-        assertThat(columnNames).isEqualTo(expectedNames);
-        cursor.close();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java
deleted file mode 100644
index 36f9c96..0000000
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.homepage.contextualcards;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.android.settings.homepage.contextualcards.ContextualCardLookupTable.ControllerRendererMapping;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class ContextualCardLookupTableTest {
-
-    private static final int UNSUPPORTED_CARD_TYPE = -99999;
-    private static final int UNSUPPORTED_VIEW_TYPE = -99999;
-
-    private List<ControllerRendererMapping> mOriginalLookupTable;
-
-    @Before
-    public void setUp() {
-        mOriginalLookupTable = new ArrayList<>();
-        ContextualCardLookupTable.LOOKUP_TABLE.stream()
-                .forEach(mapping -> mOriginalLookupTable.add(mapping));
-    }
-
-    @After
-    public void reset() {
-        ContextualCardLookupTable.LOOKUP_TABLE.clear();
-        ContextualCardLookupTable.LOOKUP_TABLE.addAll(mOriginalLookupTable);
-    }
-
-    @Test
-    public void getCardControllerClass_hasSupportedCardType_shouldGetCorrespondingController() {
-        for (ControllerRendererMapping mapping : ContextualCardLookupTable.LOOKUP_TABLE) {
-            assertThat(ContextualCardLookupTable.getCardControllerClass(mapping.mCardType))
-                    .isEqualTo(mapping.mControllerClass);
-        }
-    }
-
-    @Test
-    public void getCardControllerClass_hasUnsupportedCardType_shouldAlwaysGetNull() {
-        assertThat(ContextualCardLookupTable.getCardControllerClass(UNSUPPORTED_CARD_TYPE))
-                .isNull();
-    }
-
-    @Test
-    public void
-    getCardRendererClassByViewType_hasSupportedViewType_shouldGetCorrespondingRenderer() {
-        for (ControllerRendererMapping mapping : ContextualCardLookupTable.LOOKUP_TABLE) {
-            assertThat(ContextualCardLookupTable.getCardRendererClassByViewType(mapping.mViewType))
-                    .isEqualTo(mapping.mRendererClass);
-        }
-    }
-
-    @Test
-    public void getCardRendererClassByViewType_hasUnsupportedViewType_shouldAlwaysGetNull() {
-        assertThat(ContextualCardLookupTable.getCardRendererClassByViewType(
-                UNSUPPORTED_VIEW_TYPE)).isNull();
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void
-    getCardRendererClassByViewType_hasDuplicateViewType_shouldThrowsIllegalStateException() {
-        final ControllerRendererMapping mapping1 =
-                new ControllerRendererMapping(
-                        1111 /* cardType */, UNSUPPORTED_VIEW_TYPE /* viewType */,
-                        ContextualCardController.class, ContextualCardRenderer.class
-                );
-        final ControllerRendererMapping mapping2 =
-                new ControllerRendererMapping(
-                        2222 /* cardType */, UNSUPPORTED_VIEW_TYPE /* viewType */,
-                        ContextualCardController.class, ContextualCardRenderer.class
-                );
-        ContextualCardLookupTable.LOOKUP_TABLE.add(mapping1);
-        ContextualCardLookupTable.LOOKUP_TABLE.add(mapping2);
-
-        ContextualCardLookupTable.getCardRendererClassByViewType(UNSUPPORTED_VIEW_TYPE);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallbackTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallbackTest.java
deleted file mode 100644
index 1e17a0b..0000000
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallbackTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2019 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.homepage.contextualcards;
-
-import static com.android.settings.intelligence.ContextualCardProto.ContextualCard.Category.IMPORTANT_VALUE;
-import static com.android.settings.intelligence.ContextualCardProto.ContextualCard.Category.STICKY_VALUE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.net.Uri;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class ContextualCardsDiffCallbackTest {
-
-    private static final Uri TEST_SLICE_URI = Uri.parse("content://test/test");
-
-    private ContextualCardsDiffCallback mDiffCallback;
-    private List<ContextualCard> mOldCards;
-    private List<ContextualCard> mNewCards;
-
-    @Before
-    public void setUp() {
-        mOldCards = new ArrayList<>();
-        mNewCards = new ArrayList<>();
-        mOldCards.add(getContextualCard("test1"));
-        mNewCards.add(getContextualCard("test1"));
-        mNewCards.add(getContextualCard("test2"));
-        mDiffCallback = new ContextualCardsDiffCallback(mOldCards, mNewCards);
-    }
-
-    @Test
-    public void getOldListSize_oneCard_returnOne() {
-        assertThat(mDiffCallback.getOldListSize()).isEqualTo(1);
-    }
-
-    @Test
-    public void getNewListSize_twoCards_returnTwo() {
-        assertThat(mDiffCallback.getNewListSize()).isEqualTo(2);
-    }
-
-    @Test
-    public void areItemsTheSame_sameItems_returnTrue() {
-        assertThat(mDiffCallback.areItemsTheSame(0, 0)).isTrue();
-    }
-
-    @Test
-    public void areItemsTheSame_differentItems_returnFalse() {
-        mOldCards.add(getContextualCard("test3"));
-
-        assertThat(mDiffCallback.areItemsTheSame(1, 1)).isFalse();
-    }
-
-    @Test
-    public void areContentsTheSame_sameContents_returnTrue() {
-        assertThat(mDiffCallback.areContentsTheSame(0, 0)).isTrue();
-    }
-
-    @Test
-    public void areContentsTheSame_sliceWithToggle_returnFalse() {
-        final ContextualCard card = getContextualCard("test1").mutate()
-                .setHasInlineAction(true).build();
-        mNewCards.add(0, card);
-
-        assertThat(mDiffCallback.areContentsTheSame(0, 0)).isFalse();
-    }
-
-    @Test
-    public void areContentsTheSame_stickySlice_returnFalse() {
-        final ContextualCard card = getContextualCard("test1").mutate()
-                .setCategory(STICKY_VALUE).build();
-        mNewCards.add(0, card);
-
-        assertThat(mDiffCallback.areContentsTheSame(0, 0)).isFalse();
-    }
-
-    @Test
-    public void areContentsTheSame_importantSlice_returnFalse() {
-        final ContextualCard card = getContextualCard("test1").mutate()
-                .setCategory(IMPORTANT_VALUE).build();
-        mNewCards.add(0, card);
-
-        assertThat(mDiffCallback.areContentsTheSame(0, 0)).isFalse();
-    }
-
-    private ContextualCard getContextualCard(String name) {
-        return new ContextualCard.Builder()
-                .setName(name)
-                .setRankingScore(0.5)
-                .setCardType(ContextualCard.CardType.SLICE)
-                .setSliceUri(TEST_SLICE_URI)
-                .build();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java
deleted file mode 100644
index b658822..0000000
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.homepage.contextualcards.conditional;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.android.settings.homepage.contextualcards.ContextualCard;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class ConditionFooterContextualCardTest {
-
-    @Test(expected = IllegalArgumentException.class)
-    public void newInstance_changeCardType_shouldCrash() {
-        new ConditionFooterContextualCard.Builder()
-                .setCardType(ContextualCard.CardType.LEGACY_SUGGESTION)
-                .build();
-    }
-
-    @Test
-    public void getCardType_shouldAlwaysBeConditionalFooter() {
-        assertThat(new ConditionFooterContextualCard.Builder().build().getCardType())
-                .isEqualTo(ContextualCard.CardType.CONDITIONAL_FOOTER);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java
deleted file mode 100644
index 275e96b..0000000
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.homepage.contextualcards.conditional;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.android.settings.homepage.contextualcards.ContextualCard;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class ConditionHeaderContextualCardTest {
-
-    @Test(expected = IllegalArgumentException.class)
-    public void newInstance_changeCardType_shouldCrash() {
-        new ConditionHeaderContextualCard.Builder()
-                .setCardType(ContextualCard.CardType.LEGACY_SUGGESTION)
-                .build();
-    }
-
-    @Test
-    public void getCardType_shouldAlwaysBeConditionalHeader() {
-        assertThat(new ConditionHeaderContextualCard.Builder().build().getCardType())
-                .isEqualTo(ContextualCard.CardType.CONDITIONAL_HEADER);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
index 2157908..06cd726 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionManagerTest.java
@@ -67,13 +67,6 @@
     }
 
     @Test
-    public void getDisplayableCards_hasDisplayable() {
-        when(mController.isDisplayable()).thenReturn(true);
-
-        assertThat(mManager.getDisplayableCards()).hasSize(1);
-    }
-
-    @Test
     public void onPrimaryClick_shouldRelayToController() {
         mManager.onPrimaryClick(mContext, ID);
 
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java
deleted file mode 100644
index 3f57228..0000000
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.homepage.contextualcards.conditional;
-
-import static com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard
-        .UNSUPPORTED_RANKING_SCORE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.android.settings.homepage.contextualcards.ContextualCard;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class ConditionalContextualCardTest {
-
-    @Test(expected = IllegalArgumentException.class)
-    public void newInstance_changeCardType_shouldCrash() {
-        new ConditionalContextualCard.Builder()
-                .setCardType(ContextualCard.CardType.LEGACY_SUGGESTION)
-                .build();
-    }
-
-    @Test
-    public void getCardType_shouldAlwaysBeConditional() {
-        assertThat(new ConditionalContextualCard.Builder().build().getCardType())
-                .isEqualTo(ContextualCard.CardType.CONDITIONAL);
-    }
-
-    @Test
-    public void getRankingScore_shouldAlwaysBeUnsupportedScore() {
-        assertThat(new ConditionalContextualCard.Builder().build().getRankingScore())
-                .isEqualTo(UNSUPPORTED_RANKING_SCORE);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
deleted file mode 100644
index a758a94..0000000
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSliceTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.homepage.contextualcards.deviceinfo;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-
-import androidx.core.graphics.drawable.IconCompat;
-import androidx.slice.Slice;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.widget.SliceLiveData;
-
-import com.android.settings.R;
-import com.android.settingslib.deviceinfo.PrivateStorageInfo;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class StorageSliceTest {
-    private static final String USED_BYTES_TEXT = "test used bytes";
-    private static final String SUMMARY_TEXT = "test summary";
-
-    private Context mContext;
-    private StorageSlice mStorageSlice;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-
-        // Set-up specs for SliceMetadata.
-        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
-
-        mStorageSlice = spy(new StorageSlice(mContext));
-    }
-
-    @Test
-    public void getSlice_shouldBeCorrectSliceContent() {
-        final PrivateStorageInfo info = new PrivateStorageInfo(100L, 600L);
-        doReturn(info).when(mStorageSlice).getPrivateStorageInfo();
-        doReturn(USED_BYTES_TEXT).when(mStorageSlice).getStorageUsedText(any());
-        doReturn(SUMMARY_TEXT).when(mStorageSlice).getStorageSummaryText(any());
-
-        final Slice slice = mStorageSlice.getSlice();
-
-        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
-        assertThat(metadata.getTitle()).isEqualTo(mContext.getString(R.string.storage_label));
-
-        final SliceAction primaryAction = metadata.getPrimaryAction();
-        final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_homepage_storage);
-        assertThat(primaryAction.getIcon().toString()).isEqualTo(expectedIcon.toString());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
index e139469..cbd4390 100644
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/BluetoothDevicesSliceTest.java
@@ -97,7 +97,8 @@
         // Mock the icon and detail intent of Bluetooth.
         mIcon = IconCompat.createWithResource(mContext,
                 com.android.internal.R.drawable.ic_settings_bluetooth);
-        mDetailIntent = PendingIntent.getActivity(mContext, 0, new Intent("test action"), 0);
+        mDetailIntent = PendingIntent.getActivity(mContext, 0, new Intent("test action"),
+                PendingIntent.FLAG_IMMUTABLE);
         doReturn(mIcon).when(mBluetoothDevicesSlice).getBluetoothDeviceIcon(any());
         doReturn(mDetailIntent).when(mBluetoothDevicesSlice).getBluetoothDetailIntent(any());
 
diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java
deleted file mode 100644
index 6f212df..0000000
--- a/tests/robotests/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2019 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.homepage.contextualcards.slices;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.hardware.face.FaceManager;
-import android.os.UserHandle;
-import android.provider.Settings;
-
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.widget.SliceLiveData;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class FaceSetupSliceTest {
-
-    private Context mContext;
-    private PackageManager mPackageManager;
-
-    @Before
-    public void setUp() {
-        // Set-up specs for SliceMetadata.
-        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
-        mContext = spy(RuntimeEnvironment.application);
-        mPackageManager = mock(PackageManager.class);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-    }
-
-    @Test
-    public void getSlice_noFaceManager_shouldReturnNull() {
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(false);
-        final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
-        final SliceMetadata metadata = SliceMetadata.from(mContext, setupSlice.getSlice());
-
-        assertThat(metadata.isErrorSlice()).isTrue();
-    }
-
-    @Test
-    public void getSlice_faceEnrolled_noReEnroll_shouldReturnNull() {
-        final FaceManager faceManager = mock(FaceManager.class);
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
-        when(faceManager.hasEnrolledTemplates(UserHandle.myUserId())).thenReturn(true);
-        when(mContext.getSystemService(Context.FACE_SERVICE)).thenReturn(faceManager);
-        Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.FACE_UNLOCK_RE_ENROLL,
-                0);
-        final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
-
-        final SliceMetadata metadata = SliceMetadata.from(mContext, setupSlice.getSlice());
-
-        assertThat(metadata.isErrorSlice()).isTrue();
-    }
-
-    @Test
-    public void getSlice_faceNotEnrolled_shouldReturnSlice() {
-        final FaceManager faceManager = mock(FaceManager.class);
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
-        when(faceManager.hasEnrolledTemplates(UserHandle.myUserId())).thenReturn(false);
-        when(mContext.getSystemService(Context.FACE_SERVICE)).thenReturn(faceManager);
-        final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
-
-        assertThat(setupSlice.getSlice()).isNotNull();
-    }
-
-    @Test
-    public void getSlice_faceEnrolled_shouldReEnroll_shouldReturnSlice() {
-        final FaceManager faceManager = mock(FaceManager.class);
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
-        when(faceManager.hasEnrolledTemplates(UserHandle.myUserId())).thenReturn(true);
-        when(mContext.getSystemService(Context.FACE_SERVICE)).thenReturn(faceManager);
-        Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.FACE_UNLOCK_RE_ENROLL,
-                1);
-        final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
-
-        assertThat(setupSlice.getSlice()).isNotNull();
-    }
-
-    @Test
-    public void getSlice_faceEnrolled_musteEnroll_shouldReturnSlice() {
-        final FaceManager faceManager = mock(FaceManager.class);
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
-        when(faceManager.hasEnrolledTemplates(UserHandle.myUserId())).thenReturn(true);
-        when(mContext.getSystemService(Context.FACE_SERVICE)).thenReturn(faceManager);
-        Settings.Secure.putInt(mContext.getContentResolver(),
-                Settings.Secure.FACE_UNLOCK_RE_ENROLL,
-                3);
-        final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
-
-        assertThat(setupSlice.getSlice()).isNotNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index a6a362e..5a92aa2 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -133,7 +133,7 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
@@ -151,7 +151,7 @@
             preferenceKeys.add(controller.getPreferenceKey());
         }
 
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+        assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/location/LocationIndicatorsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationIndicatorsPreferenceControllerTest.java
new file mode 100644
index 0000000..e1182fd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/location/LocationIndicatorsPreferenceControllerTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.location;
+
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.provider.DeviceConfig;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.Utils;
+import com.android.settings.testutils.shadow.ShadowDeviceConfig;
+
+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.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit tests for {@link LocationIndicatorsPreferenceController}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowDeviceConfig.class})
+public class LocationIndicatorsPreferenceControllerTest {
+    @Mock
+    PackageManager mPackageManager;
+    private Context mContext;
+    private LocationIndicatorsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mController = new LocationIndicatorsPreferenceController(mContext, "key");
+
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowDeviceConfig.reset();
+    }
+
+    /**
+     * Verify the location indicator settings are visible when location feature is supported
+     * on the device.
+     */
+    @Test
+    public void getAvailabilityStatus_locationSupported_shouldReturnAVAILABLE() {
+        when(mPackageManager.hasSystemFeature(eq(PackageManager.FEATURE_LOCATION))).thenReturn(
+                true);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    /**
+     * Verify the location indicator settings are not visible when location feature is not supported
+     * on the device.
+     */
+    @Test
+    public void getAvailabilityStatus_locationNotSupported_shouldReturnUNSUPPORTED() {
+        when(mPackageManager.hasSystemFeature(eq(PackageManager.FEATURE_LOCATION))).thenReturn(
+                false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    /**
+     * Verify the location indicator preference is checked when the feature is enabled.
+     */
+    @Test
+    public void isChecked_featureEnabled_shouldReturnTrue() {
+        final boolean enabled = true;
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+                Utils.PROPERTY_LOCATION_INDICATORS_ENABLED, Boolean.toString(enabled), true);
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    /**
+     * Verify the location indicator preference is unchecked when the feature is not enabled.
+     */
+    @Test
+    public void isChecked_featureNotEnabled_shouldReturnFalse() {
+        final boolean enabled = false;
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+                Utils.PROPERTY_LOCATION_INDICATORS_ENABLED, Boolean.toString(enabled), true);
+        assertThat(mController.isChecked()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java
index 68e7f88..2fa7413 100644
--- a/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java
@@ -20,9 +20,12 @@
 
 import android.content.Context;
 import android.location.LocationManager;
+import android.util.FeatureFlagUtils;
 
 import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -43,6 +46,13 @@
         mLocationManager = (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE);
     }
 
+    @After
+    public void tearDown() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        }
+    }
+
     @Test
     public void isAvailable_byDefault_shouldReturnTrue() {
         assertThat(mController.isAvailable()).isTrue();
@@ -83,4 +93,11 @@
                         R.plurals.location_settings_summary_location_on,
                         LOCATION_APP_COUNT, LOCATION_APP_COUNT));
     }
+
+    @Test
+    public void getSummary_silkyHomeEnabled_shouldBeNull() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+
+        assertThat(mController.getSummary()).isNull();
+    }
 }
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java
deleted file mode 100644
index bb0478c..0000000
--- a/tests/robotests/src/com/android/settings/media/MediaOutputGroupSliceTest.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (C) 2020 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.media;
-
-import static android.app.slice.Slice.EXTRA_RANGE_VALUE;
-import static android.app.slice.Slice.HINT_LIST_ITEM;
-import static android.app.slice.SliceItem.FORMAT_SLICE;
-
-import static com.android.settings.media.MediaOutputGroupSlice.ACTION_MEDIA_SESSION_OPERATION;
-import static com.android.settings.media.MediaOutputGroupSlice.ACTION_VOLUME_ADJUSTMENT;
-import static com.android.settings.media.MediaOutputGroupSlice.CUSTOMIZED_ACTION;
-import static com.android.settings.media.MediaOutputGroupSlice.GROUP_DEVICES;
-import static com.android.settings.media.MediaOutputGroupSlice.MEDIA_DEVICE_ID;
-import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_GROUP_SLICE_URI;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.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.graphics.drawable.Drawable;
-import android.net.Uri;
-
-import androidx.slice.Slice;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.core.SliceQuery;
-import androidx.slice.widget.SliceLiveData;
-
-import com.android.settings.R;
-import com.android.settings.slices.SliceBackgroundWorker;
-import com.android.settingslib.media.LocalMediaManager;
-import com.android.settingslib.media.MediaDevice;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = MediaOutputGroupSliceTest.ShadowSliceBackgroundWorker.class)
-public class MediaOutputGroupSliceTest {
-
-    private static final String TEST_PACKAGE_NAME = "com.test.music";
-    private static final String TEST_PACKAGE_NAME2 = "com.test.music2";
-    private static final String TEST_DEVICE_1_ID = "test_device_1_id";
-    private static final String TEST_DEVICE_1_NAME = "test_device_1_name";
-    private static final String TEST_DEVICE_2_ID = "test_device_2_id";
-    private static final String TEST_DEVICE_2_NAME = "test_device_2_name";
-    private static final int TEST_VOLUME = 3;
-
-    private static MediaDeviceUpdateWorker sMediaDeviceUpdateWorker;
-
-    @Mock
-    private LocalMediaManager mLocalMediaManager;
-    @Mock
-    private MediaDevice mDevice1;
-    @Mock
-    private MediaDevice mDevice2;
-
-    private final List<MediaDevice> mSelectableDevices = new ArrayList<>();
-    private final List<MediaDevice> mSelectedDevices = new ArrayList<>();
-    private final List<MediaDevice> mDeselectableDevices = new ArrayList<>();
-
-    private Context mContext;
-    private MediaOutputGroupSlice mMediaOutputGroupSlice;
-    private Drawable mDrawable;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-
-        // Set-up specs for SliceMetadata.
-        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
-
-        mMediaOutputGroupSlice = new MediaOutputGroupSlice(mContext);
-        sMediaDeviceUpdateWorker = spy(new MediaDeviceUpdateWorker(mContext,
-                MEDIA_OUTPUT_GROUP_SLICE_URI));
-        sMediaDeviceUpdateWorker.mLocalMediaManager = mLocalMediaManager;
-        when(sMediaDeviceUpdateWorker.getPackageName()).thenReturn(TEST_PACKAGE_NAME);
-        mDrawable = mContext.getDrawable(R.drawable.ic_check_box_blue_24dp);
-        when(sMediaDeviceUpdateWorker.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        doReturn(false).when(sMediaDeviceUpdateWorker).hasAdjustVolumeUserRestriction();
-        when(mDevice1.getId()).thenReturn(TEST_DEVICE_1_ID);
-        when(mDevice1.getIcon()).thenReturn(mDrawable);
-        when(mDevice1.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(mDevice1.getMaxVolume()).thenReturn(100);
-        when(mDevice1.getCurrentVolume()).thenReturn(10);
-        when(mDevice1.getClientPackageName()).thenReturn(TEST_PACKAGE_NAME);
-        when(mDevice2.getId()).thenReturn(TEST_DEVICE_2_ID);
-        when(mDevice2.getIcon()).thenReturn(mDrawable);
-        when(mDevice2.getName()).thenReturn(TEST_DEVICE_2_NAME);
-        when(mDevice2.getMaxVolume()).thenReturn(100);
-        when(mDevice2.getCurrentVolume()).thenReturn(20);
-    }
-
-    @Test
-    public void getSlice_noMatchedDevice_doNothing() {
-        mSelectableDevices.add(mDevice1);
-        mSelectedDevices.add(mDevice1);
-        when(mLocalMediaManager.getMediaDeviceById(mSelectableDevices, TEST_DEVICE_1_ID))
-                .thenReturn(mDevice1);
-        sMediaDeviceUpdateWorker.onDeviceListUpdate(mSelectableDevices);
-        when(sMediaDeviceUpdateWorker.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        final Intent intent = new Intent();
-        intent.putExtra(EXTRA_RANGE_VALUE, TEST_VOLUME);
-        intent.putExtra(MEDIA_DEVICE_ID, TEST_DEVICE_2_ID);
-        intent.putExtra(CUSTOMIZED_ACTION, ACTION_VOLUME_ADJUSTMENT);
-
-        mMediaOutputGroupSlice.onNotifyChange(intent);
-
-        verify(sMediaDeviceUpdateWorker, never()).adjustSessionVolume(anyInt());
-        verify(mDevice1, never()).requestSetVolume(TEST_VOLUME);
-    }
-
-    @Test
-    public void getSlice_withOneSelectableDevice_checkRowNumber() {
-        mSelectableDevices.add(mDevice1);
-        mSelectedDevices.add(mDevice2);
-        when(sMediaDeviceUpdateWorker.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(sMediaDeviceUpdateWorker.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        final Slice slice = mMediaOutputGroupSlice.getSlice();
-        final int rows = SliceQuery.findAll(slice, FORMAT_SLICE, HINT_LIST_ITEM, null).size();
-
-        // Group item and 2 * InputRange
-        assertThat(rows).isEqualTo(3);
-    }
-
-    @Test
-    public void getSlice_nullWorker_noException() {
-        sMediaDeviceUpdateWorker = null;
-        mMediaOutputGroupSlice.getSlice();
-    }
-
-    @Test
-    public void getSlice_withOneSelectableDevice_checkTitle() {
-        mSelectableDevices.add(mDevice1);
-        mSelectedDevices.add(mDevice1);
-        sMediaDeviceUpdateWorker.onDeviceListUpdate(mSelectableDevices);
-        when(sMediaDeviceUpdateWorker.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        final Slice slice = mMediaOutputGroupSlice.getSlice();
-        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
-        final SliceAction primaryAction = metadata.getPrimaryAction();
-
-        assertThat(primaryAction.getTitle().toString()).isEqualTo(GROUP_DEVICES);
-    }
-
-    @Test
-    public void onNotifyChange_verifyAdjustDeviceVolume() {
-        mSelectableDevices.add(mDevice1);
-        mSelectedDevices.add(mDevice1);
-        when(mLocalMediaManager.getMediaDeviceById(mSelectableDevices, TEST_DEVICE_1_ID))
-                .thenReturn(mDevice1);
-        sMediaDeviceUpdateWorker.onDeviceListUpdate(mSelectableDevices);
-        when(sMediaDeviceUpdateWorker.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        final Intent intent = new Intent();
-        intent.putExtra(EXTRA_RANGE_VALUE, TEST_VOLUME);
-        intent.putExtra(MEDIA_DEVICE_ID, TEST_DEVICE_1_ID);
-        intent.putExtra(CUSTOMIZED_ACTION, ACTION_VOLUME_ADJUSTMENT);
-
-        mMediaOutputGroupSlice.onNotifyChange(intent);
-
-        verify(mDevice1).requestSetVolume(TEST_VOLUME);
-    }
-
-    @Test
-    public void onNotifyChange_verifyAdjustGroupVolume() {
-        mSelectableDevices.add(mDevice1);
-        mSelectedDevices.add(mDevice1);
-        when(mLocalMediaManager.getMediaDeviceById(mSelectableDevices, TEST_DEVICE_1_ID))
-                .thenReturn(mDevice1);
-        sMediaDeviceUpdateWorker.onDeviceListUpdate(mSelectableDevices);
-        when(sMediaDeviceUpdateWorker.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        final Intent intent = new Intent();
-        intent.putExtra(EXTRA_RANGE_VALUE, TEST_VOLUME);
-        intent.putExtra(MEDIA_DEVICE_ID, GROUP_DEVICES);
-        intent.putExtra(CUSTOMIZED_ACTION, ACTION_VOLUME_ADJUSTMENT);
-
-        mMediaOutputGroupSlice.onNotifyChange(intent);
-
-        verify(sMediaDeviceUpdateWorker).adjustSessionVolume(TEST_VOLUME);
-    }
-
-    @Test
-    public void onNotifyChange_sendSelectableDevice_verifyAddSession() {
-        mSelectableDevices.add(mDevice2);
-        mSelectedDevices.add(mDevice1);
-        when(mLocalMediaManager.getMediaDeviceById(mSelectableDevices, TEST_DEVICE_2_ID))
-                .thenReturn(mDevice2);
-        sMediaDeviceUpdateWorker.onDeviceListUpdate(mSelectableDevices);
-        when(sMediaDeviceUpdateWorker.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        final Intent intent = new Intent();
-        intent.putExtra(MEDIA_DEVICE_ID, TEST_DEVICE_2_ID);
-        intent.putExtra(CUSTOMIZED_ACTION, ACTION_MEDIA_SESSION_OPERATION);
-
-        mMediaOutputGroupSlice.onNotifyChange(intent);
-
-        verify(sMediaDeviceUpdateWorker).addDeviceToPlayMedia(mDevice2);
-    }
-
-    @Test
-    public void onNotifyChange_sendDeselectableDevice_verifyRemoveSession() {
-        mSelectedDevices.add(mDevice1);
-        mSelectedDevices.add(mDevice2);
-        mDeselectableDevices.add(mDevice1);
-        mDeselectableDevices.add(mDevice2);
-        when(mLocalMediaManager.getMediaDeviceById(mSelectedDevices, TEST_DEVICE_2_ID))
-                .thenReturn(mDevice2);
-        sMediaDeviceUpdateWorker.onDeviceListUpdate(mSelectedDevices);
-        when(sMediaDeviceUpdateWorker.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(sMediaDeviceUpdateWorker.getDeselectableMediaDevice()).thenReturn(
-                mDeselectableDevices);
-        final Intent intent = new Intent();
-        intent.putExtra(MEDIA_DEVICE_ID, TEST_DEVICE_2_ID);
-        intent.putExtra(CUSTOMIZED_ACTION, ACTION_MEDIA_SESSION_OPERATION);
-
-        mMediaOutputGroupSlice.onNotifyChange(intent);
-
-        verify(sMediaDeviceUpdateWorker).removeDeviceFromPlayMedia(mDevice2);
-    }
-
-    @Test
-    public void onNotifyChange_sendNonDeselectableDevice_notRemoveSession() {
-        mSelectedDevices.add(mDevice1);
-        mSelectedDevices.add(mDevice2);
-        mDeselectableDevices.add(mDevice1);
-        when(mLocalMediaManager.getMediaDeviceById(mSelectedDevices, TEST_DEVICE_2_ID))
-                .thenReturn(mDevice2);
-        sMediaDeviceUpdateWorker.onDeviceListUpdate(mSelectedDevices);
-        when(sMediaDeviceUpdateWorker.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(sMediaDeviceUpdateWorker.getDeselectableMediaDevice()).thenReturn(
-                mDeselectableDevices);
-        final Intent intent = new Intent();
-        intent.putExtra(MEDIA_DEVICE_ID, TEST_DEVICE_2_ID);
-        intent.putExtra(CUSTOMIZED_ACTION, ACTION_MEDIA_SESSION_OPERATION);
-
-        mMediaOutputGroupSlice.onNotifyChange(intent);
-
-        verify(sMediaDeviceUpdateWorker, never()).removeDeviceFromPlayMedia(mDevice2);
-    }
-
-    @Test
-    public void onNotifyChange_noId_doNothing() {
-        mSelectableDevices.add(mDevice1);
-        mSelectedDevices.add(mDevice1);
-        when(mLocalMediaManager.getMediaDeviceById(mSelectableDevices, TEST_DEVICE_1_ID))
-                .thenReturn(mDevice1);
-        sMediaDeviceUpdateWorker.onDeviceListUpdate(mSelectableDevices);
-        when(sMediaDeviceUpdateWorker.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        final Intent intent = new Intent();
-        intent.putExtra(EXTRA_RANGE_VALUE, TEST_VOLUME);
-        intent.putExtra(CUSTOMIZED_ACTION, ACTION_VOLUME_ADJUSTMENT);
-
-        mMediaOutputGroupSlice.onNotifyChange(intent);
-
-        verify(sMediaDeviceUpdateWorker, never()).adjustSessionVolume(anyInt());
-        verify(mDevice1, never()).requestSetVolume(TEST_VOLUME);
-    }
-
-    @Implements(SliceBackgroundWorker.class)
-    public static class ShadowSliceBackgroundWorker {
-
-        @Implementation
-        public static SliceBackgroundWorker getInstance(Uri uri) {
-            return sMediaDeviceUpdateWorker;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
index 28620e9..68848af 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorSliceTest.java
@@ -23,6 +23,8 @@
 
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
@@ -54,6 +56,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
@@ -203,31 +206,45 @@
     }
 
     @Test
-    public void getMediaOutputSliceIntent_withActiveLocalMedia_verifyIntentExtra() {
+    public void onNotifyChange_withActiveLocalMedia_verifyIntentExtra() {
         when(mMediaController.getSessionToken()).thenReturn(mToken);
         when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME);
         doReturn(mMediaController).when(sMediaOutputIndicatorWorker)
                 .getActiveLocalMediaController();
-        final Intent intent = mMediaOutputIndicatorSlice.getMediaOutputSliceIntent();
+        ArgumentCaptor<Intent> argument = ArgumentCaptor.forClass(Intent.class);
+
+        mMediaOutputIndicatorSlice.onNotifyChange(null);
+        verify(mContext, times(2)).sendBroadcast(argument.capture());
+        List<Intent> intentList = argument.getAllValues();
+        Intent intent = intentList.get(0);
 
         assertThat(TextUtils.equals(TEST_PACKAGE_NAME, intent.getStringExtra(
                 MediaOutputSliceConstants.EXTRA_PACKAGE_NAME))).isTrue();
-        assertThat(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT).isEqualTo(intent.getAction());
-        assertThat(TextUtils.equals(Utils.SETTINGS_PACKAGE_NAME, intent.getPackage())).isTrue();
+        assertThat(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG).isEqualTo(
+                intent.getAction());
+        assertThat(TextUtils.equals(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME,
+                intent.getPackage())).isTrue();
         assertThat(mToken == intent.getExtras().getParcelable(
                 MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN)).isTrue();
     }
 
     @Test
-    public void getMediaOutputSliceIntent_withoutActiveLocalMedia_verifyIntentExtra() {
+    public void onNotifyChange_withoutActiveLocalMedia_verifyIntentExtra() {
         doReturn(mMediaController).when(sMediaOutputIndicatorWorker)
                 .getActiveLocalMediaController();
-        final Intent intent = mMediaOutputIndicatorSlice.getMediaOutputSliceIntent();
+        ArgumentCaptor<Intent> argument = ArgumentCaptor.forClass(Intent.class);
+
+        mMediaOutputIndicatorSlice.onNotifyChange(null);
+        verify(mContext, times(2)).sendBroadcast(argument.capture());
+        List<Intent> intentList = argument.getAllValues();
+        Intent intent = intentList.get(0);
 
         assertThat(TextUtils.isEmpty(intent.getStringExtra(
                 MediaOutputSliceConstants.EXTRA_PACKAGE_NAME))).isTrue();
-        assertThat(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT).isEqualTo(intent.getAction());
-        assertThat(TextUtils.equals(Utils.SETTINGS_PACKAGE_NAME, intent.getPackage())).isTrue();
+        assertThat(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG).isEqualTo(
+                intent.getAction());
+        assertThat(TextUtils.equals(MediaOutputSliceConstants.SYSTEMUI_PACKAGE_NAME,
+                intent.getPackage())).isTrue();
         assertThat(intent.getExtras().getParcelable(
                 MediaOutputSliceConstants.KEY_MEDIA_SESSION_TOKEN) == null).isTrue();
     }
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
index d9b2247..2339f4c 100644
--- a/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputIndicatorWorkerTest.java
@@ -22,7 +22,6 @@
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -94,9 +93,9 @@
         ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBluetoothManager;
         when(mLocalBluetoothManager.getEventManager()).thenReturn(mBluetoothEventManager);
         mMediaOutputIndicatorWorker = new MediaOutputIndicatorWorker(mContext, URI);
-        when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager);
+        doReturn(mMediaSessionManager).when(mContext).getSystemService(MediaSessionManager.class);
         mMediaControllers.add(mMediaController);
-        when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers);
+        doReturn(mMediaControllers).when(mMediaSessionManager).getActiveSessions(any());
 
         mResolver = mock(ContentResolver.class);
         doReturn(mResolver).when(mContext).getContentResolver();
@@ -144,6 +143,7 @@
 
     @Test
     public void onSlicePinned_noActiveController_noPackageName() {
+        mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager;
         mMediaControllers.clear();
 
         mMediaOutputIndicatorWorker.onSlicePinned();
@@ -186,18 +186,16 @@
 
     @Test
     public void onReceive_shouldNotifyChange() {
+        mMediaOutputIndicatorWorker.mLocalMediaManager = mLocalMediaManager;
         mMediaOutputIndicatorWorker.onSlicePinned();
         waitForLocalMediaManagerInit();
-        // onSlicePinned will registerCallback() and get first callback. Callback triggers this at
-        // the first time.
-        verify(mResolver, times(1)).notifyChange(URI, null);
 
         final Intent intent = new Intent(AudioManager.STREAM_DEVICES_CHANGED_ACTION);
         for (BroadcastReceiver receiver : mShadowApplication.getReceiversForIntent(intent)) {
             receiver.onReceive(mContext, intent);
         }
         // Intent receiver triggers notifyChange() again
-        verify(mResolver, times(2)).notifyChange(URI, null /* observer */);
+        verify(mResolver).notifyChange(URI, null /* observer */);
     }
 
     @Test
@@ -261,4 +259,29 @@
 
         assertThat(mMediaOutputIndicatorWorker.getActiveLocalMediaController()).isNull();
     }
+
+    @Test
+    public void getActiveLocalMediaController_bothHaveRemoteMediaAndLocalMedia_returnNull() {
+        final MediaController.PlaybackInfo playbackInfo = new MediaController.PlaybackInfo(
+                MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE,
+                VolumeProvider.VOLUME_CONTROL_ABSOLUTE,
+                100,
+                10,
+                new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(),
+                null);
+        final PlaybackState playbackState = new PlaybackState.Builder()
+                .setState(PlaybackState.STATE_PLAYING, 0, 1)
+                .build();
+        final MediaController remoteMediaController = mock(MediaController.class);
+
+        mMediaControllers.add(remoteMediaController);
+        initPlayback();
+
+        when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo);
+        when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState);
+        when(remoteMediaController.getPlaybackInfo()).thenReturn(playbackInfo);
+        when(remoteMediaController.getPlaybackState()).thenReturn(playbackState);
+
+        assertThat(mMediaOutputIndicatorWorker.getActiveLocalMediaController()).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
deleted file mode 100644
index 0a8ffa7..0000000
--- a/tests/robotests/src/com/android/settings/media/MediaOutputSliceTest.java
+++ /dev/null
@@ -1,607 +0,0 @@
-/*
- * Copyright (C) 2019 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.media;
-
-import static android.app.slice.Slice.EXTRA_RANGE_VALUE;
-import static android.app.slice.Slice.HINT_LIST_ITEM;
-import static android.app.slice.SliceItem.FORMAT_SLICE;
-
-import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_SLICE_URI;
-
-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.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.bluetooth.BluetoothAdapter;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.drawable.Drawable;
-import android.media.AudioManager;
-import android.text.TextUtils;
-
-import androidx.slice.Slice;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.core.SliceQuery;
-import androidx.slice.widget.SliceLiveData;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
-import com.android.settingslib.media.LocalMediaManager;
-import com.android.settingslib.media.MediaDevice;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadow.api.Shadow;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowBluetoothAdapter.class})
-public class MediaOutputSliceTest {
-
-    private static final String TEST_DEVICE_1_ID = "test_device_1_id";
-    private static final String TEST_DEVICE_2_ID = "test_device_2_id";
-    private static final String TEST_DEVICE_1_NAME = "test_device_1_name";
-    private static final String TEST_DEVICE_2_NAME = "test_device_2_name";
-    private static final int TEST_DEVICE_1_ICON =
-            com.android.internal.R.drawable.ic_bt_headphones_a2dp;
-
-    @Mock
-    private LocalMediaManager mLocalMediaManager;
-    @Mock
-    private Drawable mTestDrawable;
-
-    private final List<MediaDevice> mDevices = new ArrayList<>();
-
-    private Context mContext;
-    private MediaOutputSlice mMediaOutputSlice;
-    private MediaDeviceUpdateWorker mMediaDeviceUpdateWorker;
-    private ShadowBluetoothAdapter mShadowBluetoothAdapter;
-    private AudioManager mAudioManager;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
-        mAudioManager.setMode(AudioManager.MODE_NORMAL);
-
-        // Set-up specs for SliceMetadata.
-        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
-        // Setup BluetoothAdapter
-        mShadowBluetoothAdapter = Shadow.extract(BluetoothAdapter.getDefaultAdapter());
-        mShadowBluetoothAdapter.setEnabled(true);
-
-        mMediaOutputSlice = new MediaOutputSlice(mContext);
-        mMediaDeviceUpdateWorker = spy(new MediaDeviceUpdateWorker(mContext,
-                MEDIA_OUTPUT_SLICE_URI));
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-        mMediaDeviceUpdateWorker.mLocalMediaManager = mLocalMediaManager;
-        doReturn(false).when(mMediaDeviceUpdateWorker).hasAdjustVolumeUserRestriction();
-        mMediaOutputSlice.init(mMediaDeviceUpdateWorker);
-    }
-
-    @Test
-    public void getSlice_workerIsNull_shouldReturnZeroRow() {
-        mMediaOutputSlice.init(null);
-
-        final Slice slice = mMediaOutputSlice.getSlice();
-
-        final int rows = SliceQuery.findAll(slice, FORMAT_SLICE, HINT_LIST_ITEM,
-                null /* nonHints */).size();
-
-        assertThat(rows).isEqualTo(0);
-    }
-
-    @Test
-    public void getSlice_bluetoothIsDisable_shouldReturnZeroRow() {
-        mShadowBluetoothAdapter.setEnabled(false);
-
-        final Slice slice = mMediaOutputSlice.getSlice();
-
-        final int rows = SliceQuery.findAll(slice, FORMAT_SLICE, HINT_LIST_ITEM,
-                null /* nonHints */).size();
-
-        assertThat(rows).isEqualTo(0);
-    }
-
-    @Test
-    public void getSlice_audioModeIsOngoingCall_shouldReturnZeroRow() {
-        mAudioManager.setMode(AudioManager.MODE_IN_CALL);
-
-        final Slice slice = mMediaOutputSlice.getSlice();
-
-        final int rows = SliceQuery.findAll(slice, FORMAT_SLICE, HINT_LIST_ITEM,
-                null /* nonHints */).size();
-
-        assertThat(rows).isEqualTo(0);
-    }
-
-    @Test
-    public void getSlice_shouldHaveActiveDeviceName() {
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(true);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        final MediaDevice device2 = mock(MediaDevice.class);
-        when(device2.getName()).thenReturn(TEST_DEVICE_2_NAME);
-        when(device2.getIcon()).thenReturn(mTestDrawable);
-        when(device2.getMaxVolume()).thenReturn(100);
-        when(device2.isConnected()).thenReturn(false);
-        when(device2.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device2.getId()).thenReturn(TEST_DEVICE_2_ID);
-        mDevices.add(device);
-        mDevices.add(device2);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(device);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-        final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
-
-        final SliceAction primaryAction = metadata.getPrimaryAction();
-        assertThat(primaryAction.getTitle().toString()).isEqualTo(TEST_DEVICE_1_NAME);
-    }
-
-    @Test
-    public void getSlice_disconnectedBluetooth_verifyTitle() {
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(false);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        final MediaDevice device2 = mock(MediaDevice.class);
-        when(device2.getName()).thenReturn(TEST_DEVICE_2_NAME);
-        when(device2.getIcon()).thenReturn(mTestDrawable);
-        when(device2.getMaxVolume()).thenReturn(100);
-        when(device2.isConnected()).thenReturn(false);
-        when(device2.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE);
-        when(device2.getId()).thenReturn(TEST_DEVICE_2_ID);
-        mDevices.add(device);
-        mDevices.add(device2);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-        final SliceMetadata metadata = SliceMetadata.from(mContext, mediaSlice);
-
-        final SliceAction primaryAction = metadata.getPrimaryAction();
-        assertThat(primaryAction.getTitle().toString()).isEqualTo(mContext.getString(
-                R.string.media_output_disconnected_status, TEST_DEVICE_1_NAME));
-    }
-
-    @Test
-    public void getSlice_inGroupState_checkSliceSize() {
-        final List<MediaDevice> mSelectedDevices = new ArrayList<>();
-        final List<MediaDevice> mSelectableDevices = new ArrayList<>();
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(true);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        final MediaDevice device2 = mock(MediaDevice.class);
-        when(device2.getName()).thenReturn(TEST_DEVICE_2_NAME);
-        when(device2.getIcon()).thenReturn(mTestDrawable);
-        when(device2.getMaxVolume()).thenReturn(100);
-        when(device2.isConnected()).thenReturn(true);
-        when(device2.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device2.getId()).thenReturn(TEST_DEVICE_2_ID);
-        mSelectedDevices.add(device);
-        mSelectedDevices.add(device2);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(device);
-        mDevices.add(device);
-        mDevices.add(device2);
-        when(mLocalMediaManager.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(mLocalMediaManager.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        when(mMediaDeviceUpdateWorker.getSessionVolumeMax()).thenReturn(100);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-
-        assertThat(SliceQuery.findAll(mediaSlice, FORMAT_SLICE, HINT_LIST_ITEM, null).size())
-                .isEqualTo(mDevices.size() + 1);
-    }
-
-    @Test
-    public void getSlice_notInGroupState_checkSliceSize() {
-        final List<MediaDevice> mSelectedDevices = new ArrayList<>();
-        final List<MediaDevice> mSelectableDevices = new ArrayList<>();
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(true);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        final MediaDevice device2 = mock(MediaDevice.class);
-        when(device2.getName()).thenReturn(TEST_DEVICE_2_NAME);
-        when(device2.getIcon()).thenReturn(mTestDrawable);
-        when(device2.getMaxVolume()).thenReturn(100);
-        when(device2.isConnected()).thenReturn(true);
-        when(device2.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device2.getId()).thenReturn(TEST_DEVICE_2_ID);
-        mSelectedDevices.add(device);
-        mSelectableDevices.add(device2);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(device);
-        mDevices.add(device);
-        mDevices.add(device2);
-        when(mLocalMediaManager.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(mLocalMediaManager.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-
-        assertThat(SliceQuery.findAll(mediaSlice, FORMAT_SLICE, HINT_LIST_ITEM, null).size())
-                .isEqualTo(mDevices.size());
-    }
-
-    @Test
-    public void getSlice_singleCastDevice_notContainGroupIconText() {
-        final List<MediaDevice> mSelectedDevices = new ArrayList<>();
-        final List<MediaDevice> mSelectableDevices = new ArrayList<>();
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(true);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        when(mLocalMediaManager.getSelectedMediaDevice()).thenReturn(mDevices);
-        when(mLocalMediaManager.getSelectableMediaDevice()).thenReturn(null);
-        mSelectedDevices.add(device);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(device);
-        mDevices.add(device);
-        when(mLocalMediaManager.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(mLocalMediaManager.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-
-        final String sliceInfo = SliceQuery.findAll(mediaSlice, FORMAT_SLICE, HINT_LIST_ITEM,
-                null).toString();
-
-        assertThat(TextUtils.indexOf(sliceInfo, mContext.getText(R.string.add))).isEqualTo(-1);
-    }
-
-    @Test
-    public void getSlice_multipleCastDevices_containGroupIconText() {
-        final List<MediaDevice> mSelectedDevices = new ArrayList<>();
-        final List<MediaDevice> mSelectableDevices = new ArrayList<>();
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(true);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        final MediaDevice device2 = mock(MediaDevice.class);
-        when(device2.getName()).thenReturn(TEST_DEVICE_2_NAME);
-        when(device2.getIcon()).thenReturn(mTestDrawable);
-        when(device2.getMaxVolume()).thenReturn(100);
-        when(device2.isConnected()).thenReturn(true);
-        when(device2.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device2.getId()).thenReturn(TEST_DEVICE_2_ID);
-        mSelectedDevices.add(device);
-        mSelectableDevices.add(device2);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(device);
-        mDevices.add(device);
-        mDevices.add(device2);
-        when(mLocalMediaManager.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(mLocalMediaManager.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-        String sliceInfo = SliceQuery.findAll(mediaSlice, FORMAT_SLICE, HINT_LIST_ITEM,
-                null).toString();
-
-        assertThat(TextUtils.indexOf(sliceInfo, mContext.getText(R.string.add))).isNotEqualTo(-1);
-    }
-
-    @Test
-    public void getSlice_onTransferring_containTransferringSubtitle() {
-        final List<MediaDevice> mSelectedDevices = new ArrayList<>();
-        final List<MediaDevice> mSelectableDevices = new ArrayList<>();
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(true);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        final MediaDevice device2 = mock(MediaDevice.class);
-        when(device2.getName()).thenReturn(TEST_DEVICE_2_NAME);
-        when(device2.getIcon()).thenReturn(mTestDrawable);
-        when(device2.getMaxVolume()).thenReturn(100);
-        when(device2.isConnected()).thenReturn(false);
-        when(device2.getState()).thenReturn(LocalMediaManager.MediaDeviceState.STATE_CONNECTING);
-        when(device2.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device2.getId()).thenReturn(TEST_DEVICE_2_ID);
-        mSelectedDevices.add(device);
-        mSelectableDevices.add(device2);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(device);
-        mDevices.add(device);
-        mDevices.add(device2);
-        when(mLocalMediaManager.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(mLocalMediaManager.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-        final String sliceInfo = SliceQuery.findAll(mediaSlice, FORMAT_SLICE, HINT_LIST_ITEM,
-                null).toString();
-
-        assertThat(TextUtils.indexOf(sliceInfo, mContext.getText(R.string.media_output_switching)))
-                .isNotEqualTo(-1);
-    }
-
-    @Test
-    public void getSlice_onTransferringFailed_containFailedSubtitle() {
-        final List<MediaDevice> mSelectedDevices = new ArrayList<>();
-        final List<MediaDevice> mSelectableDevices = new ArrayList<>();
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(true);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        final MediaDevice device2 = mock(MediaDevice.class);
-        when(device2.getName()).thenReturn(TEST_DEVICE_2_NAME);
-        when(device2.getIcon()).thenReturn(mTestDrawable);
-        when(device2.getMaxVolume()).thenReturn(100);
-        when(device2.isConnected()).thenReturn(false);
-        when(device2.getState()).thenReturn(LocalMediaManager.MediaDeviceState
-                .STATE_CONNECTING_FAILED);
-        when(device2.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device2.getId()).thenReturn(TEST_DEVICE_2_ID);
-        mSelectedDevices.add(device);
-        mSelectableDevices.add(device2);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(device);
-        mDevices.add(device);
-        mDevices.add(device2);
-        when(mLocalMediaManager.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(mLocalMediaManager.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-        final String sliceInfo = SliceQuery.findAll(mediaSlice, FORMAT_SLICE, HINT_LIST_ITEM,
-                null).toString();
-
-        assertThat(TextUtils.indexOf(sliceInfo, mContext.getText(
-                R.string.media_output_switch_error_text))).isNotEqualTo(-1);
-    }
-
-    @Test
-    public void getSlice_zeroState_containPairingText() {
-        final List<MediaDevice> mSelectedDevices = new ArrayList<>();
-        final List<MediaDevice> mSelectableDevices = new ArrayList<>();
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(true);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_PHONE_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        mSelectedDevices.add(device);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(device);
-        mDevices.add(device);
-        when(mLocalMediaManager.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(mLocalMediaManager.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-        String sliceInfo = SliceQuery.findAll(mediaSlice, FORMAT_SLICE, HINT_LIST_ITEM,
-                null).toString();
-
-        assertThat(TextUtils.indexOf(sliceInfo, mContext.getText(
-                R.string.bluetooth_pairing_pref_title))).isNotEqualTo(-1);
-    }
-
-    @Test
-    public void getSlice_twoConnectedDevices_notContainPairingText() {
-        final List<MediaDevice> mSelectedDevices = new ArrayList<>();
-        final List<MediaDevice> mSelectableDevices = new ArrayList<>();
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(true);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        final MediaDevice device2 = mock(MediaDevice.class);
-        when(device2.getName()).thenReturn(TEST_DEVICE_2_NAME);
-        when(device2.getIcon()).thenReturn(mTestDrawable);
-        when(device2.getMaxVolume()).thenReturn(100);
-        when(device2.isConnected()).thenReturn(true);
-        when(device2.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_CAST_DEVICE);
-        when(device2.getId()).thenReturn(TEST_DEVICE_2_ID);
-        mSelectedDevices.add(device);
-        mSelectableDevices.add(device2);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(device);
-        mDevices.add(device);
-        mDevices.add(device2);
-        when(mLocalMediaManager.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(mLocalMediaManager.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-        String sliceInfo = SliceQuery.findAll(mediaSlice, FORMAT_SLICE, HINT_LIST_ITEM,
-                null).toString();
-
-        assertThat(TextUtils.indexOf(sliceInfo, mContext.getText(
-                R.string.bluetooth_pairing_pref_title))).isEqualTo(-1);
-    }
-
-    @Test
-    public void getSlice_disconnectedBtOnTransferring_containTransferringSubtitle() {
-        final List<MediaDevice> mSelectedDevices = new ArrayList<>();
-        final List<MediaDevice> mSelectableDevices = new ArrayList<>();
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(true);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        final MediaDevice device2 = mock(MediaDevice.class);
-        when(device2.getName()).thenReturn(TEST_DEVICE_2_NAME);
-        when(device2.getIcon()).thenReturn(mTestDrawable);
-        when(device2.getMaxVolume()).thenReturn(100);
-        when(device2.isConnected()).thenReturn(false);
-        when(device2.getState()).thenReturn(LocalMediaManager.MediaDeviceState.STATE_CONNECTING);
-        when(device2.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE);
-        when(device2.getId()).thenReturn(TEST_DEVICE_2_ID);
-        mSelectedDevices.add(device);
-        mSelectableDevices.add(device2);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(device);
-        mDevices.add(device);
-        mDevices.add(device2);
-        when(mLocalMediaManager.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(mLocalMediaManager.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-        final String sliceInfo = SliceQuery.findAll(mediaSlice, FORMAT_SLICE, HINT_LIST_ITEM,
-                null).toString();
-
-        assertThat(TextUtils.indexOf(sliceInfo, mContext.getText(R.string.media_output_switching)))
-                .isNotEqualTo(-1);
-    }
-
-    @Test
-    public void getSlice_disconnectedBtOnTransferringFailed_containTransferringFailedSubtitle() {
-        final List<MediaDevice> mSelectedDevices = new ArrayList<>();
-        final List<MediaDevice> mSelectableDevices = new ArrayList<>();
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getName()).thenReturn(TEST_DEVICE_1_NAME);
-        when(device.getIcon()).thenReturn(mTestDrawable);
-        when(device.getMaxVolume()).thenReturn(100);
-        when(device.isConnected()).thenReturn(true);
-        when(device.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        final MediaDevice device2 = mock(MediaDevice.class);
-        when(device2.getName()).thenReturn(TEST_DEVICE_2_NAME);
-        when(device2.getIcon()).thenReturn(mTestDrawable);
-        when(device2.getMaxVolume()).thenReturn(100);
-        when(device2.isConnected()).thenReturn(false);
-        when(device2.getState()).thenReturn(
-                LocalMediaManager.MediaDeviceState.STATE_CONNECTING_FAILED);
-        when(device2.getDeviceType()).thenReturn(MediaDevice.MediaDeviceType.TYPE_BLUETOOTH_DEVICE);
-        when(device2.getId()).thenReturn(TEST_DEVICE_2_ID);
-        mSelectedDevices.add(device);
-        mSelectableDevices.add(device2);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(device);
-        mDevices.add(device);
-        mDevices.add(device2);
-        when(mLocalMediaManager.getSelectedMediaDevice()).thenReturn(mSelectedDevices);
-        when(mLocalMediaManager.getSelectableMediaDevice()).thenReturn(mSelectableDevices);
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Slice mediaSlice = mMediaOutputSlice.getSlice();
-        final String sliceInfo = SliceQuery.findAll(mediaSlice, FORMAT_SLICE, HINT_LIST_ITEM,
-                null).toString();
-
-        assertThat(TextUtils.indexOf(sliceInfo,
-                mContext.getText(R.string.bluetooth_connect_failed))).isNotEqualTo(-1);
-    }
-
-    @Test
-    public void onNotifyChange_foundMediaDevice_connect() {
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        when(mLocalMediaManager.getMediaDeviceById(mDevices, TEST_DEVICE_1_ID)).thenReturn(device);
-        mDevices.add(device);
-
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Intent intent = new Intent();
-        intent.putExtra("media_device_id", TEST_DEVICE_1_ID);
-
-        mMediaOutputSlice.onNotifyChange(intent);
-
-        verify(mLocalMediaManager).connectDevice(device);
-    }
-
-    @Test
-    public void onNotifyChange_notFoundMediaDevice_doNothing() {
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        when(mLocalMediaManager.getMediaDeviceById(mDevices, TEST_DEVICE_1_ID)).thenReturn(device);
-        mDevices.add(device);
-
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Intent intent = new Intent();
-        intent.putExtra("media_device_id", "fake_123");
-
-        mMediaOutputSlice.onNotifyChange(intent);
-
-        verify(mLocalMediaManager, never()).connectDevice(device);
-    }
-
-    @Test
-    public void onNotifyChange_adjustVolume() {
-        mDevices.clear();
-        final MediaDevice device = mock(MediaDevice.class);
-        when(device.getId()).thenReturn(TEST_DEVICE_1_ID);
-        when(mLocalMediaManager.getMediaDeviceById(mDevices, TEST_DEVICE_1_ID)).thenReturn(device);
-        mDevices.add(device);
-
-        mMediaDeviceUpdateWorker.onDeviceListUpdate(mDevices);
-
-        final Intent intent = new Intent();
-        intent.putExtra("media_device_id", TEST_DEVICE_1_ID);
-        intent.putExtra(EXTRA_RANGE_VALUE, 30);
-
-        mMediaOutputSlice.onNotifyChange(intent);
-
-        verify(device).requestSetVolume(30);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/media/MediaOutputUtilsTest.java b/tests/robotests/src/com/android/settings/media/MediaOutputUtilsTest.java
new file mode 100644
index 0000000..dea6a2c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/media/MediaOutputUtilsTest.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2020 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.media;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.VolumeProvider;
+import android.media.session.MediaController;
+import android.media.session.MediaSessionManager;
+import android.media.session.PlaybackState;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class MediaOutputUtilsTest {
+
+    @Mock
+    private MediaSessionManager mMediaSessionManager;
+    @Mock
+    private MediaController mMediaController;
+
+    private Context mContext;
+    private List<MediaController> mMediaControllers = new ArrayList<>();
+    private PlaybackState mPlaybackState;
+    private MediaController.PlaybackInfo mPlaybackInfo;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mMediaSessionManager).when(mContext).getSystemService(MediaSessionManager.class);
+        mMediaControllers.add(mMediaController);
+        doReturn(mMediaControllers).when(mMediaSessionManager).getActiveSessions(any());
+    }
+
+    @Test
+    public void getActiveLocalMediaController_localMediaPlaying_returnController() {
+        initPlayback();
+
+        when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo);
+        when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState);
+
+        assertThat(MediaOutputUtils.getActiveLocalMediaController(mMediaSessionManager)).isEqualTo(
+                mMediaController);
+    }
+
+    @Test
+    public void getActiveLocalMediaController_remoteMediaPlaying_returnNull() {
+        mPlaybackInfo = new MediaController.PlaybackInfo(
+                MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE,
+                VolumeProvider.VOLUME_CONTROL_ABSOLUTE,
+                100,
+                10,
+                new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(),
+                null);
+        mPlaybackState = new PlaybackState.Builder()
+                .setState(PlaybackState.STATE_PLAYING, 0, 1)
+                .build();
+
+        when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo);
+        when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState);
+
+        assertThat(MediaOutputUtils.getActiveLocalMediaController(mMediaSessionManager)).isNull();
+    }
+
+    @Test
+    public void getActiveLocalMediaController_localMediaStopped_returnNull() {
+        mPlaybackInfo = new MediaController.PlaybackInfo(
+                MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL,
+                VolumeProvider.VOLUME_CONTROL_ABSOLUTE,
+                100,
+                10,
+                new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(),
+                null);
+        mPlaybackState = new PlaybackState.Builder()
+                .setState(PlaybackState.STATE_STOPPED, 0, 1)
+                .build();
+
+        when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo);
+        when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState);
+
+        assertThat(MediaOutputUtils.getActiveLocalMediaController(mMediaSessionManager)).isNull();
+    }
+
+    @Test
+    public void getActiveLocalMediaController_bothHaveRemoteMediaAndLocalMedia_returnNull() {
+        mMediaControllers.clear();
+        final MediaController.PlaybackInfo playbackInfo = new MediaController.PlaybackInfo(
+                MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE,
+                VolumeProvider.VOLUME_CONTROL_ABSOLUTE,
+                100,
+                10,
+                new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(),
+                null);
+        final PlaybackState playbackState = new PlaybackState.Builder()
+                .setState(PlaybackState.STATE_PLAYING, 0, 1)
+                .build();
+        final MediaController remoteMediaController = mock(MediaController.class);
+
+        mMediaControllers.add(remoteMediaController);
+        mMediaControllers.add(mMediaController);
+        initPlayback();
+
+        when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo);
+        when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState);
+        when(remoteMediaController.getPlaybackInfo()).thenReturn(playbackInfo);
+        when(remoteMediaController.getPlaybackState()).thenReturn(playbackState);
+
+        assertThat(MediaOutputUtils.getActiveLocalMediaController(mMediaSessionManager)).isNull();
+    }
+
+    @Test
+    public void getActiveLocalMediaController_bothHaveLocalMediaAndRemoteMedia_returnNull() {
+        final MediaController.PlaybackInfo playbackInfo = new MediaController.PlaybackInfo(
+                MediaController.PlaybackInfo.PLAYBACK_TYPE_REMOTE,
+                VolumeProvider.VOLUME_CONTROL_ABSOLUTE,
+                100,
+                10,
+                new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(),
+                null);
+        final PlaybackState playbackState = new PlaybackState.Builder()
+                .setState(PlaybackState.STATE_PLAYING, 0, 1)
+                .build();
+        final MediaController remoteMediaController = mock(MediaController.class);
+
+        mMediaControllers.add(remoteMediaController);
+        initPlayback();
+
+        when(mMediaController.getPlaybackInfo()).thenReturn(mPlaybackInfo);
+        when(mMediaController.getPlaybackState()).thenReturn(mPlaybackState);
+        when(remoteMediaController.getPlaybackInfo()).thenReturn(playbackInfo);
+        when(remoteMediaController.getPlaybackState()).thenReturn(playbackState);
+
+        assertThat(MediaOutputUtils.getActiveLocalMediaController(mMediaSessionManager)).isNull();
+    }
+
+    private void initPlayback() {
+        mPlaybackInfo = new MediaController.PlaybackInfo(
+                MediaController.PlaybackInfo.PLAYBACK_TYPE_LOCAL,
+                VolumeProvider.VOLUME_CONTROL_ABSOLUTE,
+                100,
+                10,
+                new AudioAttributes.Builder().setUsage(AudioAttributes.USAGE_MEDIA).build(),
+                null);
+        mPlaybackState = new PlaybackState.Builder()
+                .setState(PlaybackState.STATE_PLAYING, 0, 1)
+                .build();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java b/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java
index 017faa5..e0e6e50 100644
--- a/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java
+++ b/tests/robotests/src/com/android/settings/media/RemoteMediaSliceTest.java
@@ -32,6 +32,7 @@
 
 import android.content.Context;
 import android.content.Intent;
+import android.media.MediaRouter2Manager;
 import android.media.RoutingSessionInfo;
 import android.net.Uri;
 
@@ -87,6 +88,7 @@
         SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
 
         mRemoteMediaSlice = new RemoteMediaSlice(mContext);
+        mRemoteMediaSlice.mRouterManager = mock(MediaRouter2Manager.class);
         sMediaDeviceUpdateWorker = spy(new MediaDeviceUpdateWorker(mContext,
                 REMOTE_MEDIA_SLICE_URI));
         sMediaDeviceUpdateWorker.mLocalMediaManager = mLocalMediaManager;
diff --git a/tests/robotests/src/com/android/settings/network/ActiveSubsciptionsListenerTest.java b/tests/robotests/src/com/android/settings/network/ActiveSubsciptionsListenerTest.java
deleted file mode 100644
index 5565ca3..0000000
--- a/tests/robotests/src/com/android/settings/network/ActiveSubsciptionsListenerTest.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Looper;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.internal.telephony.TelephonyIntents;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.shadow.api.Shadow;
-import org.robolectric.shadows.ShadowBroadcastReceiver;
-import org.robolectric.shadows.ShadowContextImpl;
-import org.robolectric.shadows.ShadowSubscriptionManager;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-@RunWith(AndroidJUnit4.class)
-public class ActiveSubsciptionsListenerTest {
-    private static final int SUB_ID1 = 3;
-    private static final int SUB_ID2 = 7;
-
-    private static final Intent INTENT_RADIO_TECHNOLOGY_CHANGED =
-            new Intent(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
-
-    private static final Intent INTENT_MULTI_SIM_CONFIG_CHANGED =
-            new Intent(TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED);
-
-    private static final Intent INTENT_CARRIER_CONFIG_CHANGED =
-            new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
-
-    private Context mContext;
-    private ShadowContextImpl mShadowContextImpl;
-    private SubscriptionManager mSubscriptionManager;
-    private ShadowSubscriptionManager mShadowSubscriptionManager;
-    private List<SubscriptionInfo> mActiveSubscriptions;
-
-    private ActiveSubsciptionsListenerImpl mListener;
-    private BroadcastReceiver mReceiver;
-    private ShadowBroadcastReceiver mShadowReceiver;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application.getBaseContext();
-        mShadowContextImpl = Shadow.extract(mContext);
-
-        mSubscriptionManager = spy(mContext.getSystemService(SubscriptionManager.class));
-        mShadowSubscriptionManager = shadowOf(mSubscriptionManager);
-
-        mActiveSubscriptions = new ArrayList<SubscriptionInfo>();
-        mActiveSubscriptions.add(ShadowSubscriptionManager.SubscriptionInfoBuilder
-                .newBuilder().setId(SUB_ID1).buildSubscriptionInfo());
-        mActiveSubscriptions.add(ShadowSubscriptionManager.SubscriptionInfoBuilder
-                .newBuilder().setId(SUB_ID2).buildSubscriptionInfo());
-        mShadowSubscriptionManager.setActiveSubscriptionInfoList(mActiveSubscriptions);
-
-        mListener = spy(new ActiveSubsciptionsListenerImpl(Looper.getMainLooper(), mContext));
-        doReturn(mSubscriptionManager).when(mListener).getSubscriptionManager();
-        mReceiver = mListener.getSubscriptionChangeReceiver();
-        mShadowReceiver = shadowOf(mReceiver);
-        doReturn(mReceiver).when(mListener).getSubscriptionChangeReceiver();
-    }
-
-    @After
-    public void cleanUp() {
-        mListener.close();
-    }
-
-    private class ActiveSubsciptionsListenerImpl extends ActiveSubsciptionsListener {
-        private ActiveSubsciptionsListenerImpl(Looper looper, Context context) {
-            super(looper, context);
-        }
-
-        @Override
-        void registerForSubscriptionsChange() {}
-
-        public void onChanged() {}
-    }
-
-    private void sendIntentToReceiver(Intent intent) {
-        mShadowReceiver.onReceive(mContext, intent, new AtomicBoolean(false));
-    }
-
-    @Test
-    public void constructor_noListeningWasSetup() {
-        verify(mListener, never()).onChanged();
-    }
-
-    @Test
-    public void start_configChangedIntent_onChangedShouldBeCalled() {
-        sendIntentToReceiver(INTENT_RADIO_TECHNOLOGY_CHANGED);
-        sendIntentToReceiver(INTENT_MULTI_SIM_CONFIG_CHANGED);
-        verify(mListener, never()).onChanged();
-
-        mListener.start();
-
-        sendIntentToReceiver(INTENT_RADIO_TECHNOLOGY_CHANGED);
-        verify(mListener, times(1)).onChanged();
-
-        sendIntentToReceiver(INTENT_MULTI_SIM_CONFIG_CHANGED);
-        verify(mListener, times(2)).onChanged();
-
-        mListener.stop();
-
-        sendIntentToReceiver(INTENT_RADIO_TECHNOLOGY_CHANGED);
-        sendIntentToReceiver(INTENT_MULTI_SIM_CONFIG_CHANGED);
-        verify(mListener, times(2)).onChanged();
-    }
-
-    @Test
-    public void start_carrierConfigChangedIntent_onChangedWhenSubIdBeenCached() {
-        sendIntentToReceiver(INTENT_CARRIER_CONFIG_CHANGED);
-        verify(mListener, never()).onChanged();
-
-        mListener.start();
-
-        mListener.getActiveSubscriptionsInfo();
-
-        sendIntentToReceiver(INTENT_CARRIER_CONFIG_CHANGED);
-        verify(mListener, never()).onChanged();
-
-        INTENT_CARRIER_CONFIG_CHANGED.putExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX,
-                SUB_ID2);
-        sendIntentToReceiver(INTENT_CARRIER_CONFIG_CHANGED);
-        verify(mListener, times(1)).onChanged();
-
-        mListener.stop();
-
-        sendIntentToReceiver(INTENT_CARRIER_CONFIG_CHANGED);
-        verify(mListener, times(1)).onChanged();
-    }
-
-
-    @Test
-    public void start_alwaysFetchAndCacheResult() {
-        mListener.start();
-
-        List<SubscriptionInfo> subInfoList = null;
-        int numberOfAccess = 0;
-        for (int numberOfSubInfo = mActiveSubscriptions.size(); numberOfSubInfo >= 0;
-                numberOfSubInfo--) {
-            if (mActiveSubscriptions.size() > numberOfSubInfo) {
-                mActiveSubscriptions.remove(numberOfSubInfo);
-            }
-            mShadowSubscriptionManager.setActiveSubscriptionInfoList(mActiveSubscriptions);
-
-            // fetch twice and test if they generated access to SubscriptionManager only once
-            subInfoList = mListener.getActiveSubscriptionsInfo();
-            subInfoList = mListener.getActiveSubscriptionsInfo();
-
-            numberOfAccess++;
-            verify(mSubscriptionManager, times(numberOfAccess)).getActiveSubscriptionInfoList();
-
-            mListener.clearCache();
-        }
-
-        mShadowSubscriptionManager.setActiveSubscriptionInfoList(null);
-
-        // fetch twice and test if they generated access to SubscriptionManager only once
-        subInfoList = mListener.getActiveSubscriptionsInfo();
-        subInfoList = mListener.getActiveSubscriptionsInfo();
-
-        numberOfAccess++;
-        verify(mSubscriptionManager, times(numberOfAccess)).getActiveSubscriptionInfoList();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityPreferenceControllerTest.java
new file mode 100644
index 0000000..9ba6238
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityPreferenceControllerTest.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.Settings;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class AdaptiveConnectivityPreferenceControllerTest {
+
+    private static final String PREF_KEY = "adaptive_connectivity";
+
+    private Context mContext;
+    @Mock private Resources mResources;
+    private AdaptiveConnectivityPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mResources).when(mContext).getResources();
+        mController = new AdaptiveConnectivityPreferenceController(mContext, PREF_KEY);
+    }
+
+    @Test
+    public void isAvailable_supportAdaptiveConnectivity_shouldReturnTrue() {
+        when(mResources.getBoolean(R.bool.config_show_adaptive_connectivity))
+                .thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_notSupportAdaptiveConnectivity_shouldReturnFalse() {
+        when(mResources.getBoolean(R.bool.config_show_adaptive_connectivity))
+                .thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void getSummary_adaptiveConnectivityEnabled_shouldShowOn() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1);
+
+        assertThat(mController.getSummary()).isEqualTo(mContext.getString(R.string.switch_on_text));
+    }
+
+    @Test
+    public void getSummary_adaptiveConnectivityEnabled_shouldShowOff() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 0);
+
+        assertThat(mController.getSummary())
+                .isEqualTo(mContext.getString(R.string.switch_off_text));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
new file mode 100644
index 0000000..dfb9a8f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/AdaptiveConnectivityTogglePreferenceControllerTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Answers.RETURNS_DEEP_STUBS;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class AdaptiveConnectivityTogglePreferenceControllerTest {
+
+    private static final String PREF_KEY = "adaptive_connectivity";
+
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private Context mContext;
+
+    private AdaptiveConnectivityTogglePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new AdaptiveConnectivityTogglePreferenceController(mContext, PREF_KEY);
+    }
+
+    @Test
+    public void isAvailable_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void setChecked_withTrue_shouldUpdateSetting() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 0);
+
+        mController.setChecked(true);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1))
+                .isEqualTo(1);
+    }
+
+    @Test
+    public void setChecked_withFalse_shouldUpdateSetting() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1);
+
+        mController.setChecked(false);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1))
+                .isEqualTo(0);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
deleted file mode 100644
index cb68e2a..0000000
--- a/tests/robotests/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
+++ /dev/null
@@ -1,182 +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.network;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.provider.Settings;
-import android.provider.SettingsSlicesContract;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.AirplaneModeEnabler;
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.RestrictedSwitchPreference;
-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.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-public class AirplaneModePreferenceControllerTest {
-
-    private static final int ON = 1;
-    private static final int OFF = 0;
-
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private AirplaneModeEnabler mAirplaneModeEnabler;
-    private Context mContext;
-    private ContentResolver mResolver;
-    private PreferenceManager mPreferenceManager;
-    private PreferenceScreen mScreen;
-    private RestrictedSwitchPreference mPreference;
-    private AirplaneModePreferenceController mController;
-    private LifecycleOwner mLifecycleOwner;
-    private Lifecycle mLifecycle;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest();
-        mContext = spy(RuntimeEnvironment.application);
-        mResolver = RuntimeEnvironment.application.getContentResolver();
-        doReturn(mPackageManager).when(mContext).getPackageManager();
-        mController = new AirplaneModePreferenceController(mContext,
-                SettingsSlicesContract.KEY_AIRPLANE_MODE);
-
-        mPreferenceManager = new PreferenceManager(mContext);
-        mScreen = mPreferenceManager.createPreferenceScreen(mContext);
-        mPreference = new RestrictedSwitchPreference(mContext);
-        mPreference.setKey(SettingsSlicesContract.KEY_AIRPLANE_MODE);
-        mScreen.addPreference(mPreference);
-        mController.setFragment(null);
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-        mLifecycle.addObserver(mController);
-    }
-
-    @Test
-    public void getSliceUri_shouldUsePlatformAuthority() {
-        assertThat(mController.getSliceUri().getAuthority())
-                .isEqualTo(SettingsSlicesContract.AUTHORITY);
-    }
-
-    @Test
-    @Config(qualifiers = "mcc999")
-    public void airplaneModePreference_shouldNotBeAvailable_ifSetToNotVisible() {
-        assertThat(mController.getAvailabilityStatus())
-                .isNotEqualTo(BasePreferenceController.AVAILABLE);
-
-        mController.displayPreference(mScreen);
-
-        // This should not crash
-        mController.onStart();
-        mController.onStop();
-    }
-
-    @Test
-    public void airplaneModePreference_shouldNotBeAvailable_ifHasLeanbackFeature() {
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(true);
-        assertThat(mController.getAvailabilityStatus())
-                .isNotEqualTo(BasePreferenceController.AVAILABLE);
-
-        mController.displayPreference(mScreen);
-
-        // This should not crash
-        mController.onStart();
-        mController.onStop();
-    }
-
-    @Test
-    public void airplaneModePreference_shouldBeAvailable_ifNoLeanbackFeature() {
-        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(false);
-        assertThat(mController.getAvailabilityStatus())
-                .isEqualTo(BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void airplaneModePreference_testSetValue_updatesCorrectly() {
-
-        // Set airplane mode ON by setChecked
-        mController.setAirplaneModeEnabler(mAirplaneModeEnabler);
-        assertThat(mController.setChecked(true)).isTrue();
-
-        // Check return value if set same status.
-        when(mAirplaneModeEnabler.isAirplaneModeOn()).thenReturn(true);
-        assertThat(mController.setChecked(true)).isFalse();
-
-        // Set to OFF
-        assertThat(mController.setChecked(false)).isTrue();
-    }
-
-    @Test
-    public void airplaneModePreference_testGetValue_correctValueReturned() {
-        // Set airplane mode ON
-        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, ON);
-
-        mController.displayPreference(mScreen);
-        mController.onStart();
-
-        assertThat(mController.isChecked()).isTrue();
-
-        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, OFF);
-        assertThat(mController.isChecked()).isFalse();
-    }
-
-    @Test
-    public void airplaneModePreference_testPreferenceUI_updatesCorrectly() {
-        // Airplane mode default off
-        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, OFF);
-
-        mController.displayPreference(mScreen);
-        mController.onStop();
-
-        assertThat(mPreference.isChecked()).isFalse();
-
-        mController.onAirplaneModeChanged(true);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void isSliceable_returnsTrue() {
-        assertThat(mController.isSliceable()).isTrue();
-    }
-
-    @Test
-    public void isPublicSlice_returnsTrue() {
-        assertThat(mController.isPublicSlice()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java
index f37b0e4..7dcd6d4 100644
--- a/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/AllInOneTetherPreferenceControllerTest.java
@@ -40,7 +40,7 @@
 import androidx.test.core.app.ApplicationProvider;
 
 import com.android.settings.R;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -117,7 +117,7 @@
     @Mock
     private BluetoothAdapter mBluetoothAdapter;
     @Mock
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
 
     private static final String PREF_KEY = "tether";
     private AllInOneTetherPreferenceController mController;
diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
deleted file mode 100644
index 7ec1174..0000000
--- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java
+++ /dev/null
@@ -1,559 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.net.Uri;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.EditTextPreference;
-import androidx.preference.ListPreference;
-import androidx.preference.MultiSelectListPreference;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.R;
-import com.android.settings.network.ApnEditor.ApnData;
-import com.android.settings.testutils.shadow.ShadowFragment;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-public class ApnEditorTest {
-
-    private static final Object[] APN_DATA = {
-            0, /* ID */
-            "apn_name" /* apn name */,
-            "apn.com" /* apn */,
-            "" /* proxy */,
-            "" /* port */,
-            "" /* username */,
-            "" /* server */,
-            "" /* password */,
-            "" /* MMSC */,
-            "123" /* MCC */,
-            "456" /* MNC */,
-            "123456" /* operator numeric */,
-            "" /* MMS proxy */,
-            "" /* MMS port */,
-            0 /* Authentication type */,
-            "default,supl,ia" /* APN type */,
-            "IP" /* APN protocol */,
-            1 /* APN enable/disable */,
-            0 /* Bearer */,
-            0 /* Bearer BITMASK*/,
-            "IPV6" /* APN roaming protocol */,
-            "None" /* MVNO type */,
-            "", /* MVNO value */
-    };
-
-    private static final int CURSOR_INTEGER_INDEX = 0;
-    private static final int CURSOR_STRING_INDEX = 1;
-
-    private static final Uri mApnUri = Uri.parse("Apn://row/1");
-
-    @Mock
-    private Cursor mCursor;
-
-    @Mock
-    private FragmentActivity mActivity;
-    @Mock
-    private ProxySubscriptionManager mProxySubscriptionMgr;
-
-    @Captor
-    private ArgumentCaptor<Uri> mUriCaptor;
-
-    private ApnEditor mApnEditorUT;
-    private Context mContext;
-    private Resources mResources;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-
-        mResources = mContext.getResources();
-        mApnEditorUT = spy(new ApnEditor());
-
-        doReturn(mActivity).when(mApnEditorUT).getActivity();
-        doReturn(mResources).when(mApnEditorUT).getResources();
-        doNothing().when(mApnEditorUT).finish();
-        doNothing().when(mApnEditorUT).showError();
-        doReturn(mContext).when(mApnEditorUT).getContext();
-        doReturn(mContext.getTheme()).when(mActivity).getTheme();
-        doReturn(mContext.getContentResolver()).when(mActivity).getContentResolver();
-
-        setMockPreference(mContext);
-        mApnEditorUT.mApnData = new FakeApnData(APN_DATA);
-        mApnEditorUT.sNotSet = "Not Set";
-    }
-
-    @Test
-    public void testApnEditor_doesNotUseManagedQuery() {
-        mApnEditorUT.getApnDataFromUri(Mockito.mock(Uri.class));
-
-        verify(mActivity, never()).managedQuery(
-                any(Uri.class),
-                any(String[].class),
-                any(String.class),
-                any(String.class));
-
-        verify(mActivity, never()).managedQuery(
-                any(Uri.class),
-                any(String[].class),
-                any(String.class),
-                any(String[].class),
-                any(String.class));
-    }
-
-    @Test
-    public void testSetStringValue_valueChanged_shouldSetValue() {
-        // GIVEN an APN value which is different than the APN value in database
-        final String apnKey = "apn";
-        final String apnValue = "testing.com";
-        final ContentValues cv = new ContentValues();
-
-        // WHEN try to check and set the apn value
-        final boolean isDiff = mApnEditorUT.setStringValueAndCheckIfDiff(
-                cv, apnKey, apnValue, false /* assumeDiff */, ApnEditor.APN_INDEX);
-
-        // THEN the APN value is different than the one in database, and it has been stored in the
-        // given ContentValues
-        assertThat(isDiff).isTrue();
-        assertThat(apnValue).isEqualTo(cv.getAsString(apnKey));
-    }
-
-    @Test
-    public void testSetStringValue_valueNotChanged_shouldNotSetValue() {
-        // GIVEN an APN value which is same as the APN value in database
-        final String apnKey = "apn";
-        final String apnValue = (String) APN_DATA[ApnEditor.APN_INDEX];
-        final ContentValues cv = new ContentValues();
-
-        // WHEN try to check and set the apn value
-        final boolean isDiff = mApnEditorUT.setStringValueAndCheckIfDiff(
-                cv, apnKey, apnValue, false /* assumeDiff */, ApnEditor.APN_INDEX);
-
-        // THEN the APN value is same as the one in database, and the new APN value is not stored
-        // in the given ContentValues
-        assertThat(isDiff).isFalse();
-        assertThat(cv.get(apnKey)).isNull();
-    }
-
-    @Test
-    public void testSetStringValue_nullValue_shouldNotSetValue_shouldNotSetValue() {
-        // GIVEN a null APN value
-        final String apnKey = "apn";
-        final String apnValue = null;
-        final ContentValues cv = new ContentValues();
-
-        // WHEN try to check and set the apn value
-        final boolean isDiff = mApnEditorUT.setStringValueAndCheckIfDiff(
-                cv, apnKey, apnValue, false /* assumeDiff */, ApnEditor.APN_INDEX);
-
-        // THEN the APN value is different than the one in database, but the null value is not
-        // stored in the given ContentValues
-        assertThat(isDiff).isTrue();
-        assertThat(cv.get(apnKey)).isNull();
-    }
-
-    @Test
-    public void testSetIntValue_valueChanged_shouldSetValue() {
-        // GIVEN a value indicated whether the apn is enabled, and it's different than the value in
-        // the database
-        final String apnEnabledKey = "apn_enabled";
-        final int apnEnabledValue = 0;
-        final ContentValues cv = new ContentValues();
-
-        // WHEN try to check and set the apn enabled
-        final boolean isDiff = mApnEditorUT.setIntValueAndCheckIfDiff(
-                cv,
-                apnEnabledKey,
-                apnEnabledValue,
-                false /* assumeDiff */,
-                ApnEditor.CARRIER_ENABLED_INDEX);
-
-        // THEN the apn enabled field is different than the one in database, and it has been stored
-        // in the given ContentValues
-        assertThat(isDiff).isTrue();
-        assertThat(cv.getAsInteger(apnEnabledKey)).isEqualTo(apnEnabledValue);
-    }
-
-    @Test
-    public void testSetIntValue_valueNotChanged_shouldNotSetValue() {
-        // GIVEN a value indicated whether the apn is enabled, and it's same as the one in the
-        // database
-        final String apnEnabledKey = "apn_enabled";
-        final int apnEnabledValue = (int) APN_DATA[ApnEditor.CARRIER_ENABLED_INDEX];
-        final ContentValues cv = new ContentValues();
-
-        // WHEN try to check and set the apn enabled
-        final boolean isDiff = mApnEditorUT.setIntValueAndCheckIfDiff(
-                cv,
-                apnEnabledKey,
-                apnEnabledValue,
-                false /* assumeDiff */,
-                ApnEditor.CARRIER_ENABLED_INDEX);
-
-        // THEN the apn enabled field is same as the one in the database, and the filed is not
-        // stored in the given ContentValues
-        assertThat(isDiff).isFalse();
-        assertThat(cv.get(apnEnabledKey)).isNull();
-    }
-
-    @Test
-    public void testValidateApnData_validData_shouldReturnNull() {
-        // GIVEN a valid apn data
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN validate the apn data
-        final String errMsg = mApnEditorUT.validateApnData();
-
-        // THEN the error message should be null
-        assertThat(errMsg).isNull();
-    }
-
-    @Test
-    public void testValidateApn_apnNameNotSet_shouldReturnErrorMessage() {
-        // GIVEN a apn data without the apn name
-        mApnEditorUT.mApnData.mData[ApnEditor.NAME_INDEX] = "";
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // THEN validate the apn data
-        final String errMsg = mApnEditorUT.validateApnData();
-
-        // THEN the error message indicated the apn name not set is returned
-        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_name_empty));
-    }
-
-    @Test
-    public void testValidateApnData_apnNotSet_shouldReturnErrorMessage() {
-        // GIVEN a apn data without the apn
-        mApnEditorUT.mApnData.mData[ApnEditor.APN_INDEX] = "";
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // THEN validate the apn data
-        final String errMsg = mApnEditorUT.validateApnData();
-
-        // THEN the error message indicated the apn not set is returned
-        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_apn_empty));
-    }
-
-    @Test
-    public void testValidateApnData_mccInvalid_shouldReturnErrorMessage() {
-        // The length of the mcc should be 3
-        mApnEditorUT.mApnData.mData[ApnEditor.MCC_INDEX] = "1324";
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN validate the apn data
-        final String errMsg = mApnEditorUT.validateApnData();
-
-        // THEN the error message indicated the mcc invalid is returned
-        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_mcc_not3));
-    }
-
-    @Test
-    public void testValidateApnData_mncInvalid_shouldReturnErrorMessage() {
-        // GIVEN an apn data with invalid mnc
-        // The length of the mnc should be 2 or 3
-        mApnEditorUT.mApnData.mData[ApnEditor.MNC_INDEX] = "1324";
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN validate the apn data
-        final String errMsg = mApnEditorUT.validateApnData();
-
-        // THEN the error message indicated the mnc invalid is returned
-        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_mnc_not23));
-    }
-
-    @Test
-    public void testSaveApnData_pressBackButtonWithValidApnData_shouldSaveApnData() {
-        // GIVEN a valid apn data
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN press the back button
-        final KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK);
-        mApnEditorUT.onKey(new View(mContext), KeyEvent.KEYCODE_BACK, event);
-
-        // THEN the apn data is saved and the apn editor is closed
-        verify(mApnEditorUT).validateAndSaveApnData();
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test
-    public void testSaveApnData_pressSaveButtonWithValidApnData_shouldSaveApnData() {
-        // GIVEN a valid apn data
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN press the save button
-        MenuItem item = Mockito.mock(MenuItem.class);
-        // Menu.FIRST + 1 indicated the SAVE option in ApnEditor
-        doReturn(Menu.FIRST + 1).when(item).getItemId();
-        mApnEditorUT.onOptionsItemSelected(item);
-
-        // THEN the apn data is saved and the apn editor is closed
-        verify(mApnEditorUT).validateAndSaveApnData();
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test
-    public void testSaveApnData_apnDataInvalid_shouldNotSaveApnData() {
-        // GIVEN an invalid apn data
-        // The valid apn data should contains a non-empty apn name
-        mApnEditorUT.mApnData.mData[ApnEditor.NAME_INDEX] = "";
-        mApnEditorUT.fillUI(true /* firstTime */);
-
-        // WHEN press the save button
-        final MenuItem item = Mockito.mock(MenuItem.class);
-        // Menu.FIRST + 1 indicated the SAVE option in ApnEditor
-        doReturn(Menu.FIRST + 1).when(item).getItemId();
-        mApnEditorUT.onOptionsItemSelected(item);
-
-        // THEN the error dialog is shown
-        verify(mApnEditorUT).validateAndSaveApnData();
-        verify(mApnEditorUT).showError();
-    }
-
-    @Test
-    public void testDeleteApnData_shouldDeleteData() {
-        // GIVEN a valid apn data correspond a row in database
-        final Uri apnUri = Uri.parse("content://telephony/carriers/1");
-        mApnEditorUT.mApnData = new FakeApnData(APN_DATA, apnUri);
-        mApnEditorUT.fillUI(true /* firstTime */);
-        ContentResolver mockContentResolver = Mockito.mock(ContentResolver.class);
-        doReturn(mockContentResolver).when(mActivity).getContentResolver();
-
-        // WHEN press the save button
-        final MenuItem item = Mockito.mock(MenuItem.class);
-        // Menu.FIRST indicated the DELETE option in ApnEditor
-        doReturn(Menu.FIRST).when(item).getItemId();
-        mApnEditorUT.onOptionsItemSelected(item);
-
-        // THEN the apn data is deleted and the apn editor is closed
-        verify(mockContentResolver).delete(mUriCaptor.capture(), any(), any());
-        assertThat(apnUri).isEqualTo(mUriCaptor.getValue());
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test(expected = ClassCastException.class)
-    public void testApnData_invalidIntegerType_throwsInvalidTypeException() {
-        // GIVEN a ApnData constructed from cursor
-        initCursor();
-        final ApnData data = new ApnData(mApnUri, mCursor);
-
-        // WHEN get a string from an integer column
-        // THEN the InvalidTypeException is threw
-        data.getString(CURSOR_INTEGER_INDEX);
-    }
-
-    @Test(expected = ClassCastException.class)
-    public void testApnData_invalidStringType_throwsInvalidTypeException() {
-        // GIVEN a ApnData constructed from cursor
-        initCursor();
-        final ApnData data = new ApnData(mApnUri, mCursor);
-
-        // WHEN get a integer from a string column
-        // THEN the InvalidTypeException is threw
-        data.getInteger(CURSOR_STRING_INDEX);
-    }
-
-    @Test
-    public void testApnData_validIntegerType_returnCorrectValue() {
-        // GIVEN a ApnData constructed from cursor
-        initCursor();
-        final ApnData data = new ApnData(mApnUri, mCursor);
-
-        // WHEN get integer from an integer column
-        final int val = data.getInteger(CURSOR_INTEGER_INDEX);
-
-        // THEN the integer is returned correctly
-        assertThat(val).isEqualTo(mCursor.getInt(CURSOR_INTEGER_INDEX));
-    }
-
-    @Test
-    public void testApnData_validStringType_returnCorrectValue() {
-        // GIVEN a ApnData constructed from cursor
-        initCursor();
-        final ApnData data = new ApnData(mApnUri, mCursor);
-
-        // WHEN get string from a string column
-        final String str = data.getString(CURSOR_STRING_INDEX);
-
-        // THEN the integer is returned correctly
-        assertThat(str).isEqualTo(mCursor.getString(CURSOR_STRING_INDEX));
-    }
-
-    @Test
-    public void testApnData_nullValueColumn_returnNull() {
-        // GIVEN a empty ApnData
-        final ApnData data = new ApnData(3);
-
-        // WHEN get string value from a null column
-        final String str = data.getString(0);
-
-        // THEN the null value is returned
-        assertThat(str).isNull();
-    }
-
-    @Test
-    public void formatInteger_shouldParseString() {
-        assertThat(ApnEditor.formatInteger("42")).isEqualTo("42");
-        assertThat(ApnEditor.formatInteger("01")).isEqualTo("01");
-        assertThat(ApnEditor.formatInteger("001")).isEqualTo("001");
-    }
-
-    @Test
-    public void formatInteger_shouldIgnoreNonIntegers() {
-        assertThat(ApnEditor.formatInteger("not an int")).isEqualTo("not an int");
-    }
-
-    @Test
-    @Config(shadows = ShadowFragment.class)
-    public void onCreate_noAction_shouldFinishAndNoCrash() {
-        ProxySubscriptionManager proxySubscriptionMgr = mock(ProxySubscriptionManager.class);
-        mApnEditorUT.mProxySubscriptionMgr = proxySubscriptionMgr;
-        doReturn(new Intent()).when(mActivity).getIntent();
-        doNothing().when(mApnEditorUT).addPreferencesFromResource(anyInt());
-
-        mApnEditorUT.onCreate(null);
-
-        verify(mApnEditorUT).finish();
-    }
-
-    @Test
-    public void testOnViewStateRestored_customizedValueWithoutDefault_shouldShowCustomized() {
-        mApnEditorUT.mDefaultApnProtocol = "IP";
-        mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = null;
-        mApnEditorUT.mProtocol.setEntryValues(new CharSequence[]{"IP", "IPV6", "IPV4V6"});
-
-        mApnEditorUT.onViewStateRestored(null);
-
-        assertThat(mApnEditorUT.mProtocol.getSummary()).isEqualTo("IPv4");
-    }
-
-    @Test
-    public void testOnViewStateRestored_customizedValueWithDefault_shouldShowDefault() {
-        mApnEditorUT.mDefaultApnProtocol = "IP";
-        mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = "IPV6";
-        mApnEditorUT.mProtocol.setEntryValues(new CharSequence[]{"IP", "IPV6", "IPV4V6"});
-
-        mApnEditorUT.onViewStateRestored(null);
-
-        assertThat(mApnEditorUT.mProtocol.getSummary()).isEqualTo("IPv6");
-    }
-
-    @Test
-    public void getUserEnteredApnType_emptyApnType_shouldReturnDefault() {
-        // case 1
-        // GIVEN read only APN types with DUN
-        mApnEditorUT.mReadOnlyApnTypes = new String [] {"dun"};
-        // GIVEN read specificApnTypeForEmptyInput with DEFAULT,DUN
-        mApnEditorUT.mDefaultApnTypes = new String [] {"default", "dun"};
-
-        // Input empty in TYPE
-        mApnEditorUT.mApnData.mData[ApnEditor.TYPE_INDEX] = "";
-        mApnEditorUT.onViewStateRestored(null);
-
-        // THEN APN type should be default
-        assertThat(mApnEditorUT.getUserEnteredApnType()).isEqualTo("default");
-
-        // case 2
-        // GIVEN read only APN types with DUN
-        mApnEditorUT.mReadOnlyApnTypes = new String [] {"dun"};
-        // GIVEN read specificApnTypeForEmptyInput with DEFAULT
-        mApnEditorUT.mDefaultApnTypes = new String [] {"default"};
-
-        // Input empty in TYPE
-        mApnEditorUT.mApnData.mData[ApnEditor.TYPE_INDEX] = "";
-        mApnEditorUT.onViewStateRestored(null);
-
-        // THEN APN type should be default
-        assertThat(mApnEditorUT.getUserEnteredApnType()).isEqualTo("default");
-    }
-
-    private void initCursor() {
-        doReturn(2).when(mCursor).getColumnCount();
-        doReturn(2).when(mCursor).getInt(CURSOR_INTEGER_INDEX);
-        doReturn("str").when(mCursor).getString(CURSOR_STRING_INDEX);
-        doReturn(Cursor.FIELD_TYPE_INTEGER).when(mCursor).getType(CURSOR_INTEGER_INDEX);
-        doReturn(Cursor.FIELD_TYPE_STRING).when(mCursor).getType(CURSOR_STRING_INDEX);
-    }
-
-    private void setMockPreference(Context context) {
-        mApnEditorUT.mName = new EditTextPreference(context);
-        mApnEditorUT.mApn = new EditTextPreference(context);
-        mApnEditorUT.mProxy = new EditTextPreference(context);
-        mApnEditorUT.mPort = new EditTextPreference(context);
-        mApnEditorUT.mUser = new EditTextPreference(context);
-        mApnEditorUT.mServer = new EditTextPreference(context);
-        mApnEditorUT.mPassword = new EditTextPreference(context);
-        mApnEditorUT.mMmsc = new EditTextPreference(context);
-        mApnEditorUT.mMcc = new EditTextPreference(context);
-        mApnEditorUT.mMnc = new EditTextPreference(context);
-        mApnEditorUT.mMmsProxy = new EditTextPreference(context);
-        mApnEditorUT.mMmsPort = new EditTextPreference(context);
-        mApnEditorUT.mAuthType = new ListPreference(context);
-        mApnEditorUT.mApnType = new EditTextPreference(context);
-        mApnEditorUT.mProtocol = new ListPreference(context);
-        mApnEditorUT.mRoamingProtocol = new ListPreference(context);
-        mApnEditorUT.mCarrierEnabled = new SwitchPreference(context);
-        mApnEditorUT.mBearerMulti = new MultiSelectListPreference(context);
-        mApnEditorUT.mMvnoType = new ListPreference(context);
-        mApnEditorUT.mMvnoMatchData = new EditTextPreference(context);
-    }
-
-    private final class FakeApnData extends ApnData {
-        FakeApnData(Object[] data) {
-            super(data.length);
-            System.arraycopy(data, 0, mData, 0, data.length);
-        }
-
-        FakeApnData(Object[] data, Uri uri) {
-            this(data);
-            mUri = uri;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/DataConnectivityListenerTest.java b/tests/robotests/src/com/android/settings/network/DataConnectivityListenerTest.java
deleted file mode 100644
index b45e28c..0000000
--- a/tests/robotests/src/com/android/settings/network/DataConnectivityListenerTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.network;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.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.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkRequest;
-import android.os.Handler;
-
-import com.android.settings.network.telephony.DataConnectivityListener;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class DataConnectivityListenerTest {
-    @Mock
-    private DataConnectivityListener.Client mClient;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private Network mActiveNetwork;
-
-    private Context mContext;
-    private DataConnectivityListener mListener;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
-        when(mConnectivityManager.getActiveNetwork()).thenReturn(mActiveNetwork);
-        mListener = new DataConnectivityListener(mContext, mClient);
-    }
-
-    @Test
-    public void noStart_doesNotRegister() {
-        verify(mConnectivityManager, never()).registerNetworkCallback(any(NetworkRequest.class),
-                any(ConnectivityManager.NetworkCallback.class), any(Handler.class));
-    }
-
-    @Test
-    public void start_doesRegister() {
-        mListener.start();
-        verify(mConnectivityManager).registerNetworkCallback(any(NetworkRequest.class),
-                eq(mListener), any(Handler.class));
-    }
-
-    @Test
-    public void onCapabilitiesChanged_notActiveNetwork_noCallback() {
-        Network changedNetwork = mock(Network.class);
-        mListener.onCapabilitiesChanged(changedNetwork, mock(NetworkCapabilities.class));
-        verify(mClient, never()).onDataConnectivityChange();
-    }
-
-    @Test
-    public void onCapabilitiesChanged_activeNetwork_onDataConnectivityChangeFires() {
-        mListener.onCapabilitiesChanged(mActiveNetwork, mock(NetworkCapabilities.class));
-        verify(mClient).onDataConnectivityChange();
-    }
-
-    @Test
-    public void onLosing_notActiveNetwork_onDataConnectivityChangeFires() {
-        Network changedNetwork = mock(Network.class);
-        mListener.onLosing(changedNetwork, 500);
-        verify(mClient).onDataConnectivityChange();
-    }
-
-    @Test
-    public void onLosing_activeNetwork_onDataConnectivityChangeFires() {
-        mListener.onLosing(mActiveNetwork, 500);
-        verify(mClient).onDataConnectivityChange();
-    }
-
-    @Test
-    public void onLost_notActiveNetwork_onDataConnectivityChangeFires() {
-        Network changedNetwork = mock(Network.class);
-        mListener.onLost(changedNetwork);
-        verify(mClient).onDataConnectivityChange();
-    }
-
-    @Test
-    public void onLost_activeNetwork_onDataConnectivityChangeFires() {
-        mListener.onLost(mActiveNetwork);
-        verify(mClient).onDataConnectivityChange();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/GlobalSettingsChangeListenerTest.java b/tests/robotests/src/com/android/settings/network/GlobalSettingsChangeListenerTest.java
deleted file mode 100644
index e419071..0000000
--- a/tests/robotests/src/com/android/settings/network/GlobalSettingsChangeListenerTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.os.Looper;
-import android.provider.Settings;
-
-import androidx.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.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class GlobalSettingsChangeListenerTest {
-
-    @Mock
-    private Lifecycle mLifecycle;
-
-    private Context mContext;
-    private GlobalSettingsChangeListener mListener;
-
-    private static final String SETTINGS_FIELD = Settings.Global.AIRPLANE_MODE_ON;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mListener = spy(new GlobalSettingsChangeListener(Looper.getMainLooper(),
-                mContext, SETTINGS_FIELD) {
-            public void onChanged(String field) {}
-        });
-
-        doNothing().when(mLifecycle).addObserver(mListener);
-        doNothing().when(mLifecycle).removeObserver(mListener);
-    }
-
-    @Test
-    public void whenChanged_onChangedBeenCalled() {
-        mListener.onChange(false);
-        verify(mListener, times(1)).onChanged(SETTINGS_FIELD);
-    }
-
-    @Test
-    public void whenNotifyChangeBasedOnLifecycle_onStopEvent_onChangedNotCalled() {
-        mListener.notifyChangeBasedOn(mLifecycle);
-        mListener.onStart();
-
-        mListener.onChange(false);
-        verify(mListener, times(1)).onChanged(SETTINGS_FIELD);
-
-        mListener.onStop();
-
-        mListener.onChange(false);
-        verify(mListener, times(1)).onChanged(SETTINGS_FIELD);
-
-        mListener.onStart();
-
-        mListener.onChange(false);
-        verify(mListener, times(2)).onChanged(SETTINGS_FIELD);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
deleted file mode 100644
index 6d46f9c..0000000
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
+++ /dev/null
@@ -1,182 +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.network;
-
-import static androidx.lifecycle.Lifecycle.Event.ON_START;
-import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
-
-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 static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-import static org.robolectric.shadow.api.Shadow.extract;
-
-import android.content.Context;
-import android.net.ConnectivityManager;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.provider.Settings.Global;
-import android.telephony.PhoneStateListener;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-import com.android.settingslib.RestrictedPreference;
-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.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowConnectivityManager.class, ShadowUserManager.class})
-public class MobileNetworkPreferenceControllerTest {
-
-    private Context mContext;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private Lifecycle mLifecycle;
-    private LifecycleOwner mLifecycleOwner;
-    private MobileNetworkPreferenceController mController;
-    private Preference mPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        mPreference = new Preference(mContext);
-        mPreference.setKey(MobileNetworkPreferenceController.KEY_MOBILE_NETWORK_SETTINGS);
-    }
-
-    @Test
-    public void secondaryUser_prefIsNotAvailable() {
-        ShadowUserManager userManager = extract(mContext.getSystemService(UserManager.class));
-        userManager.setIsAdminUser(false);
-        ShadowConnectivityManager connectivityManager =
-                extract(mContext.getSystemService(ConnectivityManager.class));
-        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, true);
-
-        mController = new MobileNetworkPreferenceController(mContext);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void wifiOnly_prefIsNotAvailable() {
-        ShadowUserManager userManager = extract(mContext.getSystemService(UserManager.class));
-        userManager.setIsAdminUser(true);
-        ShadowConnectivityManager connectivityManager =
-                extract(mContext.getSystemService(ConnectivityManager.class));
-        connectivityManager.setNetworkSupported(ConnectivityManager.TYPE_MOBILE, false);
-
-        mController = new MobileNetworkPreferenceController(mContext);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void goThroughLifecycle_isAvailable_shouldListenToServiceChange() {
-        mController = spy(new MobileNetworkPreferenceController(mContext));
-        mLifecycle.addObserver(mController);
-        doReturn(true).when(mController).isAvailable();
-
-        mLifecycle.handleLifecycleEvent(ON_START);
-        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
-                PhoneStateListener.LISTEN_SERVICE_STATE);
-
-        mLifecycle.handleLifecycleEvent(ON_STOP);
-        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
-                PhoneStateListener.LISTEN_NONE);
-    }
-
-    @Test
-    public void serviceStateChange_shouldUpdatePrefSummary() {
-        final String testCarrierName = "test";
-        final Preference mPreference = mock(Preference.class);
-        mController = spy(new MobileNetworkPreferenceController(mContext));
-        mLifecycle.addObserver(mController);
-
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        doReturn(true).when(mController).isAvailable();
-
-        // Display pref and go through lifecycle to set up listener.
-        mController.displayPreference(mScreen);
-        mLifecycle.handleLifecycleEvent(ON_START);
-        verify(mController).onStart();
-        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
-                PhoneStateListener.LISTEN_SERVICE_STATE);
-
-        doReturn(testCarrierName).when(mController).getSummary();
-
-        mController.mPhoneStateListener.onServiceStateChanged(null);
-
-        // Carrier name should be set.
-        verify(mPreference).setSummary(testCarrierName);
-    }
-
-    @Test
-    public void airplaneModeTurnedOn_shouldDisablePreference() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Global.AIRPLANE_MODE_ON, 1);
-        mController = spy(new MobileNetworkPreferenceController(mContext));
-        final RestrictedPreference mPreference = new RestrictedPreference(mContext);
-        mController.updateState(mPreference);
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void airplaneModeTurnedOffAndNoUserRestriction_shouldEnablePreference() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Global.AIRPLANE_MODE_ON, 0);
-        mController = spy(new MobileNetworkPreferenceController(mContext));
-        final RestrictedPreference mPreference = new RestrictedPreference(mContext);
-        mPreference.setDisabledByAdmin(null);
-        mController.updateState(mPreference);
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void airplaneModeTurnedOffAndHasUserRestriction_shouldDisablePreference() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Global.AIRPLANE_MODE_ON, 0);
-        mController = spy(new MobileNetworkPreferenceController(mContext));
-        final RestrictedPreference mPreference = new RestrictedPreference(mContext);
-        mPreference.setDisabledByAdmin(EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN);
-        mController.updateState(mPreference);
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
index f6bc05a..a32f981 100644
--- a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java
@@ -23,6 +23,7 @@
 import static org.mockito.ArgumentMatchers.notNull;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -39,6 +40,7 @@
 import android.telephony.TelephonyManager;
 import android.telephony.euicc.EuiccManager;
 import android.text.TextUtils;
+import android.util.FeatureFlagUtils;
 
 import androidx.lifecycle.Lifecycle;
 import androidx.preference.PreferenceScreen;
@@ -61,7 +63,6 @@
 import java.util.Arrays;
 
 @RunWith(RobolectricTestRunner.class)
-@Ignore
 public class MobileNetworkSummaryControllerTest {
     @Mock
     private Lifecycle mLifecycle;
@@ -84,10 +85,11 @@
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mContext.getSystemService(EuiccManager.class)).thenReturn(mEuiccManager);
-        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
+        doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
+        doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
+        doReturn(mEuiccManager).when(mContext).getSystemService(EuiccManager.class);
+        doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);
+
         when(mTelephonyManager.getNetworkCountryIso()).thenReturn("");
         when(mSubscriptionManager.isActiveSubscriptionId(anyInt())).thenReturn(true);
         when(mEuiccManager.isEnabled()).thenReturn(true);
@@ -168,6 +170,7 @@
     }
 
     @Test
+    @Ignore
     public void getSummary_oneInactivePSim_cannotDisablePsim_correctSummaryAndClickHandler() {
         final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);
         when(sub1.getSubscriptionId()).thenReturn(1);
@@ -211,6 +214,7 @@
 
     @Test
     public void getSummary_twoSubscriptions_correctSummaryAndFragment() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false);
         final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);
         final SubscriptionInfo sub2 = mock(SubscriptionInfo.class);
         when(sub1.getSubscriptionId()).thenReturn(1);
@@ -225,6 +229,7 @@
 
     @Test
     public void getSummaryAfterUpdate_twoSubscriptionsBecomesOne_correctSummaryAndFragment() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false);
         final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);
         final SubscriptionInfo sub2 = mock(SubscriptionInfo.class);
         when(sub1.getSubscriptionId()).thenReturn(1);
@@ -253,6 +258,7 @@
 
     @Test
     public void getSummaryAfterUpdate_oneSubscriptionBecomesTwo_correctSummaryAndFragment() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false);
         final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);
         final SubscriptionInfo sub2 = mock(SubscriptionInfo.class);
         when(sub1.getSubscriptionId()).thenReturn(1);
@@ -280,6 +286,27 @@
     }
 
     @Test
+    public void getSummary_providerModel_Enabled() {
+        final SubscriptionInfo sub1 = mock(SubscriptionInfo.class);
+        final SubscriptionInfo sub2 = mock(SubscriptionInfo.class);
+        when(sub1.getSubscriptionId()).thenReturn(1);
+        when(sub2.getSubscriptionId()).thenReturn(2);
+        when(sub1.getDisplayName()).thenReturn("sub1");
+        when(sub2.getDisplayName()).thenReturn("sub2");
+
+        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true);
+        mController.displayPreference(mPreferenceScreen);
+        mController.onResume();
+        assertThat(mController.getSummary()).isEqualTo("sub1, sub2");
+
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false);
+        mController.displayPreference(mPreferenceScreen);
+        mController.onResume();
+        assertThat(mController.getSummary()).isEqualTo("2 SIMs");
+    }
+
+    @Test
     public void addButton_noSubscriptionsNoEuiccMgr_noAddClickListener() {
         when(mEuiccManager.isEnabled()).thenReturn(false);
         mController.displayPreference(mPreferenceScreen);
diff --git a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
deleted file mode 100644
index ab34087..0000000
--- a/tests/robotests/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
+++ /dev/null
@@ -1,40 +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.network;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.R;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class MobilePlanPreferenceControllerTest {
-
-    @Test
-    public void testNoProvisionStringFormattedCorrectly() {
-        final String operator = "test_operator";
-        final Context context = RuntimeEnvironment.application;
-        assertThat(context.getString(R.string.mobile_no_provisioning_url, operator, operator))
-                .contains(operator);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java b/tests/robotests/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
deleted file mode 100644
index 47935d0..0000000
--- a/tests/robotests/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-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.atLeastOnce;
-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.Context;
-import android.telephony.SubscriptionManager;
-
-import com.android.settings.wifi.WifiConnectionPreferenceController;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.List;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-@RunWith(RobolectricTestRunner.class)
-public class MultiNetworkHeaderControllerTest {
-    private static final String KEY_HEADER = "multi_network_header";
-    private static final int EXPANDED_CHILDREN_COUNT = 5;
-
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private PreferenceCategory mPreferenceCategory;
-    @Mock
-    private WifiConnectionPreferenceController mWifiController;
-    @Mock
-    private SubscriptionsPreferenceController mSubscriptionsController;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-
-    private Context mContext;
-    private LifecycleOwner mLifecycleOwner;
-    private Lifecycle mLifecycle;
-    private MultiNetworkHeaderController mHeaderController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mPreferenceScreen.findPreference(eq(KEY_HEADER))).thenReturn(mPreferenceCategory);
-        when(mPreferenceCategory.getPreferenceCount()).thenReturn(3);
-        when(mPreferenceScreen.getInitialExpandedChildrenCount()).thenReturn(
-                EXPANDED_CHILDREN_COUNT);
-
-        mHeaderController = spy(new MultiNetworkHeaderController(mContext, KEY_HEADER));
-        doReturn(mWifiController).when(mHeaderController).createWifiController(mLifecycle);
-        doReturn(mSubscriptionsController).when(mHeaderController).createSubscriptionsController(
-                mLifecycle);
-    }
-
-    @Test
-    public void isAvailable_beforeInitIsCalled_notAvailable() {
-        assertThat(mHeaderController.isAvailable()).isFalse();
-    }
-
-    // When calling displayPreference, the header itself should only be visible if the
-    // subscriptions controller says it is available. This is a helper for test cases of this logic.
-    private void displayPreferenceTest(boolean wifiAvailable, boolean subscriptionsAvailable,
-            boolean setVisibleExpectedValue) {
-        when(mWifiController.isAvailable()).thenReturn(wifiAvailable);
-        when(mSubscriptionsController.isAvailable()).thenReturn(subscriptionsAvailable);
-
-        mHeaderController.init(mLifecycle);
-        mHeaderController.displayPreference(mPreferenceScreen);
-        verify(mPreferenceCategory, never()).setVisible(eq(!setVisibleExpectedValue));
-        verify(mPreferenceCategory, atLeastOnce()).setVisible(eq(setVisibleExpectedValue));
-    }
-
-    @Test
-    public void displayPreference_bothNotAvailable_categoryIsNotVisible() {
-        displayPreferenceTest(false, false, false);
-    }
-
-    @Test
-    public void displayPreference_wifiAvailableButNotSubscriptions_categoryIsNotVisible() {
-        displayPreferenceTest(true, false, false);
-    }
-
-    @Test
-    public void displayPreference_subscriptionsAvailableButNotWifi_categoryIsVisible() {
-        displayPreferenceTest(false, true, true);
-    }
-
-    @Test
-    public void displayPreference_bothAvailable_categoryIsVisible() {
-        displayPreferenceTest(true, true, true);
-    }
-
-    @Test
-    public void onChildUpdated_subscriptionsBecameAvailable_categoryIsVisible() {
-        when(mSubscriptionsController.isAvailable()).thenReturn(false);
-        mHeaderController.init(mLifecycle);
-        mHeaderController.displayPreference(mPreferenceScreen);
-
-        when(mSubscriptionsController.isAvailable()).thenReturn(true);
-        mHeaderController.onChildrenUpdated();
-        ArgumentCaptor<Boolean> captor = ArgumentCaptor.forClass(Boolean.class);
-
-        verify(mPreferenceCategory, atLeastOnce()).setVisible(captor.capture());
-        List<Boolean> values = captor.getAllValues();
-        assertThat(values.get(values.size()-1)).isEqualTo(Boolean.TRUE);
-
-        ArgumentCaptor<Integer> expandedCountCaptor = ArgumentCaptor.forClass(Integer.class);
-        verify(mPreferenceScreen).setInitialExpandedChildrenCount(expandedCountCaptor.capture());
-        assertThat(expandedCountCaptor.getValue()).isEqualTo(
-                EXPANDED_CHILDREN_COUNT + mPreferenceCategory.getPreferenceCount());
-    }
-
-    @Test
-    public void onChildUpdated_subscriptionsBecameUnavailable_categoryIsNotVisible() {
-        when(mSubscriptionsController.isAvailable()).thenReturn(true);
-        mHeaderController.init(mLifecycle);
-        mHeaderController.displayPreference(mPreferenceScreen);
-
-        when(mSubscriptionsController.isAvailable()).thenReturn(false);
-        mHeaderController.onChildrenUpdated();
-        ArgumentCaptor<Boolean> captor = ArgumentCaptor.forClass(Boolean.class);
-
-        verify(mPreferenceCategory, atLeastOnce()).setVisible(captor.capture());
-        List<Boolean> values = captor.getAllValues();
-        assertThat(values.get(values.size()-1)).isEqualTo(Boolean.FALSE);
-
-        ArgumentCaptor<Integer> expandedCountCaptor = ArgumentCaptor.forClass(Integer.class);
-        verify(mPreferenceScreen).setInitialExpandedChildrenCount(expandedCountCaptor.capture());
-        assertThat(expandedCountCaptor.getValue()).isEqualTo(EXPANDED_CHILDREN_COUNT);
-    }
-
-    @Test
-    public void onChildUpdated_noExpandedChildCountAndAvailable_doesNotSetExpandedCount() {
-        when(mPreferenceScreen.getInitialExpandedChildrenCount()).thenReturn(Integer.MAX_VALUE);
-
-        when(mSubscriptionsController.isAvailable()).thenReturn(false);
-        mHeaderController.init(mLifecycle);
-        mHeaderController.displayPreference(mPreferenceScreen);
-
-        when(mSubscriptionsController.isAvailable()).thenReturn(true);
-        mHeaderController.onChildrenUpdated();
-
-        verify(mPreferenceScreen, never()).setInitialExpandedChildrenCount(anyInt());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
deleted file mode 100644
index e84d286..0000000
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ /dev/null
@@ -1,61 +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.network;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.provider.SearchIndexableResource;
-
-import com.android.settingslib.drawer.CategoryKey;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class NetworkDashboardFragmentTest {
-
-    private Context mContext;
-
-    private NetworkDashboardFragment mFragment;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mFragment = new NetworkDashboardFragment();
-    }
-
-    @Test
-    public void getCategoryKey_isNetwork() {
-        assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_NETWORK);
-    }
-
-    @Test
-    public void getXmlResourcesToIndex_shouldIncludeFragmentXml() {
-        final List<SearchIndexableResource> indexRes =
-                NetworkDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
-                        mContext,
-                        true /* enabled */);
-
-        assertThat(indexRes).hasSize(1);
-        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
new file mode 100644
index 0000000..90018b5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/NetworkProviderSettingsTest.java
@@ -0,0 +1,377 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network;
+
+import static com.android.settings.wifi.WifiConfigUiBase2.MODE_CONNECT;
+import static com.android.settings.wifi.WifiConfigUiBase2.MODE_MODIFY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.os.PowerManager;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.view.ContextMenu;
+import android.view.View;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.R;
+import com.android.settings.datausage.DataUsagePreference;
+import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
+import com.android.settings.testutils.shadow.ShadowFragment;
+import com.android.settings.wifi.AddWifiNetworkPreference;
+import com.android.settings.wifi.WifiConfigController2;
+import com.android.settings.wifi.WifiDialog2;
+import com.android.settingslib.wifi.LongPressWifiEntryPreference;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowToast;
+
+@RunWith(RobolectricTestRunner.class)
+public class NetworkProviderSettingsTest {
+
+    private static final int NUM_NETWORKS = 4;
+    private static final String FAKE_URI_STRING = "fakeuri";
+
+    @Mock
+    private PowerManager mPowerManager;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private DataUsagePreference mDataUsagePreference;
+    private Context mContext;
+    private NetworkProviderSettings mNetworkProviderSettings;
+    @Mock
+    private WifiPickerTracker mMockWifiPickerTracker;
+    @Mock
+    private PreferenceManager mPreferenceManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+
+        mNetworkProviderSettings = spy(new NetworkProviderSettings());
+        doReturn(mContext).when(mNetworkProviderSettings).getContext();
+        doReturn(mPreferenceManager).when(mNetworkProviderSettings).getPreferenceManager();
+        doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
+        doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class);
+        doReturn(mContext).when(mPreferenceManager).getContext();
+        mNetworkProviderSettings.mAddWifiNetworkPreference = new AddWifiNetworkPreference(mContext);
+        mNetworkProviderSettings.mSavedNetworksPreference = new Preference(mContext);
+        mNetworkProviderSettings.mConfigureWifiSettingsPreference =
+                new Preference(mContext);
+        mNetworkProviderSettings.mWifiPickerTracker = mMockWifiPickerTracker;
+        mNetworkProviderSettings.mWifiManager = mWifiManager;
+    }
+
+    @Test
+    public void addNetworkFragmentSendResult_onActivityResult_shouldHandleEvent() {
+        final NetworkProviderSettings NetworkProviderSettings = spy(new NetworkProviderSettings());
+        final Intent intent = new Intent();
+        doNothing().when(NetworkProviderSettings).handleAddNetworkRequest(anyInt(),
+                any(Intent.class));
+
+        NetworkProviderSettings.onActivityResult(NetworkProviderSettings.ADD_NETWORK_REQUEST,
+                Activity.RESULT_OK, intent);
+
+        verify(NetworkProviderSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
+    }
+
+    @Test
+    public void setAdditionalSettingsSummaries_hasSavedNetwork_preferenceVisible() {
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(NUM_NETWORKS);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(0 /* count */);
+
+        mNetworkProviderSettings.setAdditionalSettingsSummaries();
+
+        assertThat(mNetworkProviderSettings.mSavedNetworksPreference.isVisible()).isTrue();
+        assertThat(mNetworkProviderSettings.mSavedNetworksPreference.getSummary()).isEqualTo(
+                mContext.getResources().getQuantityString(
+                        R.plurals.wifi_saved_access_points_summary,
+                        NUM_NETWORKS, NUM_NETWORKS));
+    }
+
+    @Test
+    public void setAdditionalSettingsSummaries_hasSavedPasspointNetwork_preferenceVisible() {
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(0 /* count */);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(NUM_NETWORKS);
+
+        mNetworkProviderSettings.setAdditionalSettingsSummaries();
+
+        assertThat(mNetworkProviderSettings.mSavedNetworksPreference.isVisible()).isTrue();
+        assertThat(mNetworkProviderSettings.mSavedNetworksPreference.getSummary()).isEqualTo(
+                mContext.getResources().getQuantityString(
+                        R.plurals.wifi_saved_passpoint_access_points_summary,
+                        NUM_NETWORKS, NUM_NETWORKS));
+    }
+
+    @Test
+    public void setAdditionalSettingsSummaries_hasTwoKindsSavedNetwork_preferenceVisible() {
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(NUM_NETWORKS);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(NUM_NETWORKS);
+
+        mNetworkProviderSettings.setAdditionalSettingsSummaries();
+
+        assertThat(mNetworkProviderSettings.mSavedNetworksPreference.isVisible()).isTrue();
+        assertThat(mNetworkProviderSettings.mSavedNetworksPreference.getSummary()).isEqualTo(
+                mContext.getResources().getQuantityString(
+                R.plurals.wifi_saved_all_access_points_summary,
+                NUM_NETWORKS * 2, NUM_NETWORKS * 2));
+    }
+
+    @Test
+    public void setAdditionalSettingsSummaries_noSavedNetwork_preferenceInvisible() {
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(0 /* count */);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(0 /* count */);
+
+        mNetworkProviderSettings.setAdditionalSettingsSummaries();
+
+        assertThat(mNetworkProviderSettings.mSavedNetworksPreference.isVisible()).isFalse();
+    }
+
+    @Test
+    public void setAdditionalSettingsSummaries_wifiWakeupEnabled_displayOn() {
+        final ContentResolver contentResolver = mContext.getContentResolver();
+        when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true);
+        when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true);
+        Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);
+        when(mPowerManager.isPowerSaveMode()).thenReturn(false);
+
+        mNetworkProviderSettings.setAdditionalSettingsSummaries();
+
+        assertThat(mNetworkProviderSettings
+                .mConfigureWifiSettingsPreference.getSummary()).isEqualTo(
+                mContext.getString(R.string.wifi_configure_settings_preference_summary_wakeup_on));
+    }
+
+    @Test
+    public void setAdditionalSettingsSummaries_wifiWakeupDisabled_displayOff() {
+        final ContentResolver contentResolver = mContext.getContentResolver();
+        when(mWifiManager.isAutoWakeupEnabled()).thenReturn(false);
+
+        mNetworkProviderSettings.setAdditionalSettingsSummaries();
+
+        assertThat(mNetworkProviderSettings
+                .mConfigureWifiSettingsPreference.getSummary()).isEqualTo(
+                mContext.getString(R.string.wifi_configure_settings_preference_summary_wakeup_off));
+    }
+
+    @Test
+    public void checkAddWifiNetworkPreference_preferenceVisible() {
+        assertThat(mNetworkProviderSettings.mAddWifiNetworkPreference.isVisible()).isTrue();
+        assertThat(mNetworkProviderSettings.mAddWifiNetworkPreference.getTitle()).isEqualTo(
+                mContext.getString(R.string.wifi_add_network));
+    }
+
+    private void setUpForOnCreate() {
+        final FragmentActivity activity = mock(FragmentActivity.class);
+        when(mNetworkProviderSettings.getActivity()).thenReturn(activity);
+        final Resources.Theme theme = mContext.getTheme();
+        when(activity.getTheme()).thenReturn(theme);
+        UserManager userManager = mock(UserManager.class);
+        when(activity.getSystemService(Context.USER_SERVICE))
+                .thenReturn(userManager);
+
+        when(mNetworkProviderSettings.findPreference(NetworkProviderSettings.PREF_KEY_DATA_USAGE))
+                .thenReturn(mDataUsagePreference);
+    }
+
+    @Test
+    @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
+    public void checkDataUsagePreference_perferenceInvisibleIfWifiNotSupported() {
+        setUpForOnCreate();
+        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false;
+
+        mNetworkProviderSettings.onCreate(Bundle.EMPTY);
+
+        verify(mDataUsagePreference).setVisible(false);
+    }
+
+    @Test
+    @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
+    public void checkDataUsagePreference_perferenceVisibleIfWifiSupported() {
+        setUpForOnCreate();
+        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
+
+        mNetworkProviderSettings.onCreate(Bundle.EMPTY);
+
+        verify(mDataUsagePreference).setVisible(true);
+        verify(mDataUsagePreference).setTemplate(any(), eq(0) /*subId*/, eq(null) /*service*/);
+    }
+
+    @Test
+    public void onCreateAdapter_hasStableIdsTrue() {
+        final PreferenceScreen preferenceScreen = mock(PreferenceScreen.class);
+        when(preferenceScreen.getContext()).thenReturn(mContext);
+
+        RecyclerView.Adapter adapter = mNetworkProviderSettings.onCreateAdapter(preferenceScreen);
+
+        assertThat(adapter.hasStableIds()).isTrue();
+    }
+
+    @Test
+    public void onCreateContextMenu_shouldHaveForgetAndDisconnectMenuForConnectedWifiEntry() {
+        final FragmentActivity activity = mock(FragmentActivity.class);
+        when(activity.getApplicationContext()).thenReturn(mContext);
+        when(mNetworkProviderSettings.getActivity()).thenReturn(activity);
+
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.canDisconnect()).thenReturn(true);
+        when(wifiEntry.canForget()).thenReturn(true);
+        when(wifiEntry.isSaved()).thenReturn(true);
+        when(wifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
+
+        final LongPressWifiEntryPreference connectedWifiEntryPreference =
+                mNetworkProviderSettings.createLongPressWifiEntryPreference(wifiEntry);
+        final View view = mock(View.class);
+        when(view.getTag()).thenReturn(connectedWifiEntryPreference);
+
+        final ContextMenu menu = mock(ContextMenu.class);
+        mNetworkProviderSettings.onCreateContextMenu(menu, view, null /* info */);
+
+        verify(menu).add(anyInt(), eq(NetworkProviderSettings.MENU_ID_FORGET), anyInt(), anyInt());
+        verify(menu).add(anyInt(), eq(NetworkProviderSettings.MENU_ID_DISCONNECT), anyInt(),
+                anyInt());
+    }
+
+    @Test
+    public void onWifiEntriesChanged_shouldChangeNextButtonState() {
+        mNetworkProviderSettings.onWifiEntriesChanged();
+
+        verify(mNetworkProviderSettings).changeNextButtonState(anyBoolean());
+    }
+
+    @Test
+    public void openSubscriptionHelpPage_shouldCallStartActivityForResult() {
+        doReturn(new Intent()).when(mNetworkProviderSettings).getHelpIntent(mContext,
+                FAKE_URI_STRING);
+        doNothing().when(mNetworkProviderSettings).startActivityForResult(any(Intent.class),
+                anyInt());
+        final WifiEntry mockWifiEntry = mock(WifiEntry.class);
+        when(mockWifiEntry.getHelpUriString()).thenReturn(FAKE_URI_STRING);
+
+        mNetworkProviderSettings.openSubscriptionHelpPage(mockWifiEntry);
+
+        verify(mNetworkProviderSettings, times(1)).startActivityForResult(any(), anyInt());
+    }
+
+    @Test
+    public void onNumSavedNetworksChanged_isFinishing_ShouldNotCrash() {
+        final FragmentActivity activity = mock(FragmentActivity.class);
+        when(activity.isFinishing()).thenReturn(true);
+        when(mNetworkProviderSettings.getActivity()).thenReturn(activity);
+        when(mNetworkProviderSettings.getContext()).thenReturn(null);
+
+        mNetworkProviderSettings.onNumSavedNetworksChanged();
+    }
+
+    @Test
+    public void onNumSavedSubscriptionsChanged_isFinishing_ShouldNotCrash() {
+        final FragmentActivity activity = mock(FragmentActivity.class);
+        when(activity.isFinishing()).thenReturn(true);
+        when(mNetworkProviderSettings.getActivity()).thenReturn(activity);
+        when(mNetworkProviderSettings.getContext()).thenReturn(null);
+
+        mNetworkProviderSettings.onNumSavedSubscriptionsChanged();
+    }
+
+    @Test
+    public void onSubmit_modeModifyNoConfig_toastErrorMessage() {
+        WifiDialog2 dialog = createWifiDialog2(MODE_MODIFY, null /* config */);
+
+        mNetworkProviderSettings.onSubmit(dialog);
+
+        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
+                mContext.getString(R.string.wifi_failed_save_message));
+    }
+
+    @Test
+    public void onSubmit_modeModifyHasConfig_saveWifiManager() {
+        final WifiConfiguration config = mock(WifiConfiguration.class);
+        WifiDialog2 dialog = createWifiDialog2(MODE_MODIFY, config);
+
+        mNetworkProviderSettings.onSubmit(dialog);
+
+        verify(mWifiManager).save(eq(config), any());
+    }
+
+    @Test
+    public void onSubmit_modeConnectNoConfig_connectWifiEntry() {
+        WifiDialog2 dialog = createWifiDialog2(MODE_CONNECT, null /* config */);
+        final WifiEntry wifiEntry = dialog.getWifiEntry();
+
+        mNetworkProviderSettings.onAttach(mContext);
+        mNetworkProviderSettings.onSubmit(dialog);
+
+        verify(mNetworkProviderSettings).connect(wifiEntry, false /* editIfNoConfig */,
+                false /* fullScreenEdit*/);
+    }
+
+    @Test
+    public void onSubmit_modeConnectHasConfig_connectWifiManager() {
+        final WifiConfiguration config = mock(WifiConfiguration.class);
+        WifiDialog2 dialog = createWifiDialog2(MODE_CONNECT, config);
+
+        mNetworkProviderSettings.onSubmit(dialog);
+
+        verify(mWifiManager).connect(eq(config), any(WifiManager.ActionListener.class));
+    }
+
+    private WifiDialog2 createWifiDialog2(int mode, WifiConfiguration config) {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.canConnect()).thenReturn(true);
+        final WifiConfigController2 controller = mock(WifiConfigController2.class);
+        when(controller.getConfig()).thenReturn(config);
+        final WifiDialog2 wifiDialog2 =  spy(WifiDialog2.createModal(mContext, null /* listener */,
+                wifiEntry, mode));
+        when(wifiDialog2.getController()).thenReturn(controller);
+        return wifiDialog2;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
deleted file mode 100644
index 3593cf7..0000000
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
+++ /dev/null
@@ -1,130 +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.network;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.net.NetworkScoreManager;
-import android.net.NetworkScorerAppData;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.Collections;
-
-@RunWith(RobolectricTestRunner.class)
-public class NetworkScorerPickerPreferenceControllerTest {
-
-    private static final String TEST_SCORER_PACKAGE = "Test Package";
-    private static final String TEST_SCORER_CLASS = "Test Class";
-    private static final String TEST_SCORER_LABEL = "Test Label";
-
-    private Context mContext;
-    @Mock
-    private NetworkScoreManager mNetworkScorer;
-    private NetworkScorerPickerPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mController = new NetworkScorerPickerPreferenceController(mContext, "test_key");
-        ReflectionHelpers.setField(mController, "mNetworkScoreManager", mNetworkScorer);
-    }
-
-    @Test
-    public void testIsAvailable_shouldAlwaysReturnTrue() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void updateState_preferenceSetSummaryAsActiveScorerLabel() {
-        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
-        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
-                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
-                null /* networkAvailableNotificationChannelId */);
-        when(mNetworkScorer.getAllValidScorers())
-                .thenReturn(Collections.singletonList(scorerAppData));
-        when(mNetworkScorer.getActiveScorer()).thenReturn(scorerAppData);
-        Preference preference = mock(Preference.class);
-
-        mController.updateState(preference);
-
-        verify(preference).setSummary(TEST_SCORER_LABEL);
-    }
-
-    @Test
-    public void updateState_scorersAvailable_noActiveScorer_preferenceSetSummaryToNone() {
-        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
-        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
-                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
-                null /* networkAvailableNotificationChannelId */);
-        when(mNetworkScorer.getAllValidScorers())
-                .thenReturn(Collections.singletonList(scorerAppData));
-        when(mNetworkScorer.getActiveScorer()).thenReturn(null);
-        Preference preference = mock(Preference.class);
-
-        mController.updateState(preference);
-
-        verify(preference).setSummary(mContext.getString(
-                R.string.network_scorer_picker_none_preference));
-    }
-
-    @Test
-    public void updateState_scorersAvailable_preferenceEnabled() {
-        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
-        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
-                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
-                null /* networkAvailableNotificationChannelId */);
-        when(mNetworkScorer.getAllValidScorers())
-                .thenReturn(Collections.singletonList(scorerAppData));
-
-        Preference preference = mock(Preference.class);
-
-        mController.updateState(preference);
-
-        verify(preference).setEnabled(true);
-    }
-
-    @Test
-    public void updateState_noScorersAvailable_preferenceDisabled() {
-        when(mNetworkScorer.getAllValidScorers())
-                .thenReturn(Collections.emptyList());
-        Preference preference = mock(Preference.class);
-
-        mController.updateState(preference);
-
-        verify(preference).setEnabled(false);
-        verify(preference).setSummary(null);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java b/tests/robotests/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java
deleted file mode 100644
index 657b8b3..0000000
--- a/tests/robotests/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-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.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class PreferredNetworkModeContentObserverTest {
-
-    private static final int SUB_ID = 1;
-
-    @Mock
-    private ContentResolver mResolver;
-    @Mock
-    private Context mContext;
-    @Mock
-    private PreferredNetworkModeContentObserver.OnPreferredNetworkModeChangedListener mListener;
-
-    private PreferredNetworkModeContentObserver mPreferredNetworkModeContentObserver;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-		when(mContext.getContentResolver()).thenReturn(mResolver);
-        mPreferredNetworkModeContentObserver =
-                spy(new PreferredNetworkModeContentObserver(null));
-    }
-
-    @Test
-    public void onChange_shouldCallListener() {
-        mPreferredNetworkModeContentObserver.mListener = mListener;
-        mPreferredNetworkModeContentObserver.onChange(true);
-
-        verify(mListener).onPreferredNetworkModeChanged();
-    }
-
-    @Test
-    public void register_shouldRegisterContentObserver() {
-        mPreferredNetworkModeContentObserver.register(mContext, SUB_ID);
-
-        verify(mResolver).registerContentObserver(
-            Settings.Global.getUriFor(Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID), false,
-            mPreferredNetworkModeContentObserver);
-    }
-
-    @Test
-    public void unregister_shouldUnregisterContentObserver() {
-        mPreferredNetworkModeContentObserver.unregister(mContext);
-
-        verify(mResolver).unregisterContentObserver(mPreferredNetworkModeContentObserver);
-    }
-
-}
diff --git a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
index a7e59fc..5fd417d 100644
--- a/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/network/PrivateDnsModeDialogPreferenceTest.java
@@ -22,6 +22,7 @@
 import static android.provider.Settings.Global.PRIVATE_DNS_MODE;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.mock;
@@ -145,13 +146,13 @@
             mPreference.mEditText.setText(invalid);
 
             mPreference.onCheckedChanged(null, R.id.private_dns_mode_off);
-            assertThat(mSaveButton.isEnabled()).named("off: " + invalid).isTrue();
+            assertWithMessage("off: " + invalid).that(mSaveButton.isEnabled()).isTrue();
 
             mPreference.onCheckedChanged(null, R.id.private_dns_mode_opportunistic);
-            assertThat(mSaveButton.isEnabled()).named("opportunistic: " + invalid).isTrue();
+            assertWithMessage("opportunistic: " + invalid).that(mSaveButton.isEnabled()).isTrue();
 
             mPreference.onCheckedChanged(null, R.id.private_dns_mode_provider);
-            assertThat(mSaveButton.isEnabled()).named("provider: " + invalid).isFalse();
+            assertWithMessage("provider: " + invalid).that(mSaveButton.isEnabled()).isFalse();
         }
     }
 
diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java
deleted file mode 100644
index 4ae829f..0000000
--- a/tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-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.when;
-
-import android.content.Context;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-import java.util.Arrays;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class SubscriptionUtilTest {
-    @Mock
-    private Context mContext;
-    @Mock
-    private SubscriptionManager mSubMgr;
-    @Mock
-    private TelephonyManager mTelMgr;
-
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        doReturn(mSubMgr).when(mContext).getSystemService(SubscriptionManager.class);
-        doReturn(mTelMgr).when(mContext).getSystemService(TelephonyManager.class);
-        when(mTelMgr.getUiccSlotsInfo()).thenReturn(null);
-    }
-
-    @Test
-    public void getAvailableSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() {
-        when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(null);
-        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mContext);
-        assertThat(subs).isNotNull();
-        assertThat(subs).isEmpty();
-    }
-
-    @Test
-    public void getAvailableSubscriptions_oneSubscription_oneResult() {
-        final SubscriptionInfo info = mock(SubscriptionInfo.class);
-        when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info));
-        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mContext);
-        assertThat(subs).isNotNull();
-        assertThat(subs).hasSize(1);
-    }
-
-    @Test
-    public void getAvailableSubscriptions_twoSubscriptions_twoResults() {
-        final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
-        final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
-        when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));
-        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mContext);
-        assertThat(subs).isNotNull();
-        assertThat(subs).hasSize(2);
-    }
-
-    @Test
-    public void getActiveSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() {
-        when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(null);
-        final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
-        assertThat(subs).isNotNull();
-        assertThat(subs).isEmpty();
-    }
-
-    @Test
-    public void getActiveSubscriptions_oneSubscription_oneResult() {
-        final SubscriptionInfo info = mock(SubscriptionInfo.class);
-        when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(Arrays.asList(info));
-        final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
-        assertThat(subs).isNotNull();
-        assertThat(subs).hasSize(1);
-    }
-
-    @Test
-    public void getActiveSubscriptions_twoSubscriptions_twoResults() {
-        final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
-        final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
-        when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
-                Arrays.asList(info1, info2));
-        final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
-        assertThat(subs).isNotNull();
-        assertThat(subs).hasSize(2);
-    }
-
-    @Test
-    public void isInactiveInsertedPSim_nullSubInfo_doesNotCrash() {
-        assertThat(SubscriptionUtil.isInactiveInsertedPSim(null)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
deleted file mode 100644
index 6fd94c3..0000000
--- a/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
+++ /dev/null
@@ -1,545 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import static android.telephony.SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
-import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GOOD;
-import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GREAT;
-import static android.telephony.SignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN;
-import static android.telephony.SignalStrength.SIGNAL_STRENGTH_POOR;
-import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-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.graphics.drawable.Drawable;
-import android.graphics.drawable.LayerDrawable;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.provider.Settings;
-import android.telephony.SignalStrength;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.R;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.graph.SignalDrawable;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowSubscriptionManager;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowSubscriptionManager.class)
-public class SubscriptionsPreferenceControllerTest {
-    private static final String KEY = "preference_group";
-
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private PreferenceCategory mPreferenceCategory;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private Network mActiveNetwork;
-    @Mock
-    private NetworkCapabilities mCapabilities;
-    @Mock
-    private Drawable mSignalStrengthIcon;
-
-    private Context mContext;
-    private LifecycleOwner mLifecycleOwner;
-    private Lifecycle mLifecycle;
-    private SubscriptionsPreferenceController mController;
-    private int mOnChildUpdatedCount;
-    private SubscriptionsPreferenceController.UpdateListener mUpdateListener;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
-        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
-        when(mConnectivityManager.getActiveNetwork()).thenReturn(mActiveNetwork);
-        when(mConnectivityManager.getNetworkCapabilities(mActiveNetwork)).thenReturn(mCapabilities);
-        when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
-        when(mScreen.findPreference(eq(KEY))).thenReturn(mPreferenceCategory);
-        when(mPreferenceCategory.getContext()).thenReturn(mContext);
-        mOnChildUpdatedCount = 0;
-        mUpdateListener = () -> mOnChildUpdatedCount++;
-
-        mController = spy(
-                new SubscriptionsPreferenceController(mContext, mLifecycle, mUpdateListener,
-                        KEY, 5));
-        doReturn(mSignalStrengthIcon).when(mController).getIcon(anyInt(), anyInt(), anyBoolean());
-    }
-
-    @After
-    public void tearDown() {
-        SubscriptionUtil.setActiveSubscriptionsForTesting(null);
-    }
-
-    @Test
-    public void isAvailable_oneSubscription_availableFalse() {
-        setupMockSubscriptions(1);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_twoSubscriptions_availableTrue() {
-        setupMockSubscriptions(2);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_fiveSubscriptions_availableTrue() {
-        setupMockSubscriptions(5);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_airplaneModeOn_availableFalse() {
-        setupMockSubscriptions(2);
-        assertThat(mController.isAvailable()).isTrue();
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void onAirplaneModeChanged_airplaneModeTurnedOn_eventFired() {
-        setupMockSubscriptions(2);
-        mController.onResume();
-        mController.displayPreference(mScreen);
-        assertThat(mController.isAvailable()).isTrue();
-
-        final int updateCountBeforeModeChange = mOnChildUpdatedCount;
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
-        mController.onAirplaneModeChanged(true);
-        assertThat(mController.isAvailable()).isFalse();
-        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeModeChange + 1);
-    }
-
-    @Test
-    public void onAirplaneModeChanged_airplaneModeTurnedOff_eventFired() {
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
-        setupMockSubscriptions(2);
-        mController.onResume();
-        mController.displayPreference(mScreen);
-        assertThat(mController.isAvailable()).isFalse();
-
-        final int updateCountBeforeModeChange = mOnChildUpdatedCount;
-        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0);
-        mController.onAirplaneModeChanged(false);
-        assertThat(mController.isAvailable()).isTrue();
-        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeModeChange + 1);
-    }
-
-    @Test
-    public void onSubscriptionsChanged_countBecameTwo_eventFired() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
-        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 1));
-        mController.onResume();
-        mController.displayPreference(mScreen);
-        assertThat(mController.isAvailable()).isFalse();
-
-        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
-        SubscriptionUtil.setActiveSubscriptionsForTesting(subs);
-        mController.onSubscriptionsChanged();
-        assertThat(mController.isAvailable()).isTrue();
-        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
-    }
-
-    @Test
-    public void onSubscriptionsChanged_countBecameOne_eventFiredAndPrefsRemoved() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
-        mController.onResume();
-        mController.displayPreference(mScreen);
-        assertThat(mController.isAvailable()).isTrue();
-        verify(mPreferenceCategory, times(2)).addPreference(any(Preference.class));
-
-        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
-        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 1));
-        mController.onSubscriptionsChanged();
-        assertThat(mController.isAvailable()).isFalse();
-        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
-
-        verify(mPreferenceCategory, times(2)).removePreference(any(Preference.class));
-    }
-
-    @Test
-    public void onSubscriptionsChanged_subscriptionReplaced_preferencesChanged() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(3);
-
-        // Start out with only sub1 and sub2.
-        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 2));
-        mController.onResume();
-        mController.displayPreference(mScreen);
-        final ArgumentCaptor<Preference> captor = ArgumentCaptor.forClass(Preference.class);
-        verify(mPreferenceCategory, times(2)).addPreference(captor.capture());
-        assertThat(captor.getAllValues().size()).isEqualTo(2);
-        assertThat(captor.getAllValues().get(0).getTitle()).isEqualTo("sub1");
-        assertThat(captor.getAllValues().get(1).getTitle()).isEqualTo("sub2");
-
-        // Now replace sub2 with sub3, and make sure the old preference was removed and the new
-        // preference was added.
-        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(subs.get(0), subs.get(2)));
-        mController.onSubscriptionsChanged();
-        assertThat(mController.isAvailable()).isTrue();
-        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
-
-        verify(mPreferenceCategory).removePreference(captor.capture());
-        assertThat(captor.getValue().getTitle()).isEqualTo("sub2");
-        verify(mPreferenceCategory, times(3)).addPreference(captor.capture());
-        assertThat(captor.getValue().getTitle()).isEqualTo("sub3");
-    }
-
-
-    /**
-     * Helper to create a specified number of subscriptions, display them, and then click on one and
-     * verify that the intent fires and has the right subscription id extra.
-     *
-     * @param subscriptionCount the number of subscriptions
-     * @param selectedPrefIndex index of the subscription to click on
-     */
-    private void runPreferenceClickTest(final int subscriptionCount, final int selectedPrefIndex) {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(subscriptionCount);
-        final ArgumentCaptor<Preference> prefCaptor = ArgumentCaptor.forClass(Preference.class);
-        mController.displayPreference(mScreen);
-        verify(mPreferenceCategory, times(subscriptionCount)).addPreference(prefCaptor.capture());
-        final List<Preference> prefs = prefCaptor.getAllValues();
-        final Preference pref = prefs.get(selectedPrefIndex);
-        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivity(intentCaptor.capture());
-        pref.getOnPreferenceClickListener().onPreferenceClick(pref);
-        final Intent intent = intentCaptor.getValue();
-        assertThat(intent).isNotNull();
-        assertThat(intent.hasExtra(Settings.EXTRA_SUB_ID)).isTrue();
-        final int subIdFromIntent = intent.getIntExtra(Settings.EXTRA_SUB_ID,
-                INVALID_SUBSCRIPTION_ID);
-        assertThat(subIdFromIntent).isEqualTo(
-                subs.get(selectedPrefIndex).getSubscriptionId());
-    }
-
-    @Test
-    public void twoPreferences_firstPreferenceClicked_correctIntentFires() {
-        runPreferenceClickTest(2, 0);
-    }
-
-    @Test
-    public void twoPreferences_secondPreferenceClicked_correctIntentFires() {
-        runPreferenceClickTest(2, 1);
-    }
-
-    @Test
-    public void threePreferences_secondPreferenceClicked_correctIntentFires() {
-        runPreferenceClickTest(3, 1);
-    }
-
-    @Test
-    public void threePreferences_thirdPreferenceClicked_correctIntentFires() {
-        runPreferenceClickTest(3, 2);
-    }
-
-    @Test
-    public void getSummary_twoSubsOneDefaultForEverythingDataActive() {
-        setupMockSubscriptions(2);
-
-        ShadowSubscriptionManager.setDefaultSmsSubscriptionId(11);
-        ShadowSubscriptionManager.setDefaultVoiceSubscriptionId(11);
-        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
-        when(mCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)).thenReturn(true);
-
-        assertThat(mController.getSummary(11, true)).isEqualTo(
-                mContext.getString(R.string.default_for_calls_and_sms) + System.lineSeparator()
-                        + mContext.getString(R.string.mobile_data_active));
-
-        assertThat(mController.getSummary(22, false)).isEqualTo(
-                mContext.getString(R.string.subscription_available));
-    }
-
-    @Test
-    public void getSummary_twoSubsOneDefaultForEverythingDataNotActive() {
-        setupMockSubscriptions(2, 1, true);
-
-        ShadowSubscriptionManager.setDefaultSmsSubscriptionId(1);
-        ShadowSubscriptionManager.setDefaultVoiceSubscriptionId(1);
-
-        assertThat(mController.getSummary(1, true)).isEqualTo(
-                mContext.getString(R.string.default_for_calls_and_sms) + System.lineSeparator()
-                        + mContext.getString(R.string.default_for_mobile_data));
-
-        assertThat(mController.getSummary(2, false)).isEqualTo(
-                mContext.getString(R.string.subscription_available));
-    }
-
-    @Test
-    public void getSummary_twoSubsOneDefaultForEverythingDataDisabled() {
-        setupMockSubscriptions(2);
-
-        ShadowSubscriptionManager.setDefaultVoiceSubscriptionId(1);
-        ShadowSubscriptionManager.setDefaultSmsSubscriptionId(1);
-
-        assertThat(mController.getSummary(1, true)).isEqualTo(
-                mContext.getString(R.string.default_for_calls_and_sms) + System.lineSeparator()
-                        + mContext.getString(R.string.mobile_data_off));
-
-        assertThat(mController.getSummary(2, false)).isEqualTo(
-                mContext.getString(R.string.subscription_available));
-    }
-
-    @Test
-    public void getSummary_twoSubsOneForCallsAndDataOneForSms() {
-        setupMockSubscriptions(2, 1, true);
-
-        ShadowSubscriptionManager.setDefaultSmsSubscriptionId(2);
-        ShadowSubscriptionManager.setDefaultVoiceSubscriptionId(1);
-
-        assertThat(mController.getSummary(1, true)).isEqualTo(
-                mContext.getString(R.string.default_for_calls) + System.lineSeparator()
-                        + mContext.getString(R.string.default_for_mobile_data));
-
-        assertThat(mController.getSummary(2, false)).isEqualTo(
-                mContext.getString(R.string.default_for_sms));
-    }
-
-    @Test
-    public void setIcon_nullStrength_noCrash() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
-        setMockSubSignalStrength(subs, 0, -1);
-        final Preference pref = mock(Preference.class);
-
-        mController.setIcon(pref, 1, true /* isDefaultForData */);
-        verify(mController).getIcon(eq(0), eq(NUM_SIGNAL_STRENGTH_BINS), eq(true));
-    }
-
-    @Test
-    public void setIcon_noSignal_correctLevels() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
-        setMockSubSignalStrength(subs, 0, SIGNAL_STRENGTH_NONE_OR_UNKNOWN);
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_NONE_OR_UNKNOWN);
-        setMockSubDataEnabled(subs, 0, true);
-        final Preference pref = mock(Preference.class);
-
-        mController.setIcon(pref, 1, true /* isDefaultForData */);
-        verify(mController).getIcon(eq(0), eq(NUM_SIGNAL_STRENGTH_BINS), eq(false));
-
-        mController.setIcon(pref, 2, false /* isDefaultForData */);
-        verify(mController).getIcon(eq(0), eq(NUM_SIGNAL_STRENGTH_BINS), eq(true));
-    }
-
-    @Test
-    public void setIcon_noSignal_withInflation_correctLevels() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
-        setMockSubSignalStrength(subs, 0, SIGNAL_STRENGTH_NONE_OR_UNKNOWN);
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_NONE_OR_UNKNOWN);
-        final Preference pref = mock(Preference.class);
-        doReturn(true).when(mController).shouldInflateSignalStrength(anyInt());
-
-        mController.setIcon(pref, 1, true /* isDefaultForData */);
-        verify(mController).getIcon(eq(1), eq(NUM_SIGNAL_STRENGTH_BINS + 1), eq(false));
-
-        mController.setIcon(pref, 2, false /* isDefaultForData */);
-        verify(mController).getIcon(eq(1), eq(NUM_SIGNAL_STRENGTH_BINS + 1), eq(true));
-    }
-
-    @Test
-    public void setIcon_greatSignal_correctLevels() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
-        setMockSubSignalStrength(subs, 0, SIGNAL_STRENGTH_GREAT);
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_GREAT);
-        final Preference pref = mock(Preference.class);
-
-        mController.setIcon(pref, 1, true /* isDefaultForData */);
-        verify(mController).getIcon(eq(4), eq(NUM_SIGNAL_STRENGTH_BINS), eq(false));
-
-        mController.setIcon(pref, 2, false /* isDefaultForData */);
-        verify(mController).getIcon(eq(4), eq(NUM_SIGNAL_STRENGTH_BINS), eq(true));
-    }
-
-    @Test
-    public void onSignalStrengthChanged_subTwoGoesFromGoodToGreat_correctLevels() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
-        setMockSubSignalStrength(subs, 0, SIGNAL_STRENGTH_POOR);
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_GOOD);
-
-        mController.onResume();
-        mController.displayPreference(mScreen);
-
-        // Now change the signal strength for the 2nd subscription from Good to Great
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_GREAT);
-        mController.onSignalStrengthChanged();
-
-        final ArgumentCaptor<Integer> level = ArgumentCaptor.forClass(Integer.class);
-        verify(mController, times(4)).getIcon(level.capture(), eq(NUM_SIGNAL_STRENGTH_BINS),
-                eq(true));
-        assertThat(level.getAllValues().get(0)).isEqualTo(1);
-        assertThat(level.getAllValues().get(1)).isEqualTo(3); // sub2, first time
-        assertThat(level.getAllValues().get(2)).isEqualTo(1);
-        assertThat(level.getAllValues().get(3)).isEqualTo(4); // sub2, after change
-    }
-
-    @Test
-    public void displayPreference_mobileDataOff_bothSubsHaveCutOut() {
-        setupMockSubscriptions(2, 1, false);
-
-        mController.onResume();
-        mController.displayPreference(mScreen);
-
-        verify(mController, times(2)).getIcon(eq(SIGNAL_STRENGTH_GOOD),
-                eq(NUM_SIGNAL_STRENGTH_BINS), eq(true));
-    }
-
-    @Test
-    public void displayPreference_mobileDataOn_onlyNonDefaultSubHasCutOut() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
-        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_POOR);
-
-        mController.onResume();
-        mController.displayPreference(mScreen);
-
-        verify(mController).getIcon(eq(SIGNAL_STRENGTH_GOOD), eq(NUM_SIGNAL_STRENGTH_BINS),
-                eq(false));
-        verify(mController).getIcon(eq(SIGNAL_STRENGTH_POOR), eq(NUM_SIGNAL_STRENGTH_BINS),
-                eq(true));
-    }
-
-
-    @Test
-    public void onMobileDataEnabledChange_mobileDataTurnedOff_bothSubsHaveCutOut() {
-        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
-
-        mController.onResume();
-        mController.displayPreference(mScreen);
-
-        setMockSubDataEnabled(subs, 0, false);
-        mController.onMobileDataEnabledChange();
-
-        final ArgumentCaptor<Boolean> cutOutCaptor = ArgumentCaptor.forClass(Boolean.class);
-        verify(mController, times(4)).getIcon(eq(SIGNAL_STRENGTH_GOOD),
-                eq(NUM_SIGNAL_STRENGTH_BINS), cutOutCaptor.capture());
-        assertThat(cutOutCaptor.getAllValues().get(0)).isEqualTo(false); // sub1, first time
-        assertThat(cutOutCaptor.getAllValues().get(1)).isEqualTo(true);
-        assertThat(cutOutCaptor.getAllValues().get(2)).isEqualTo(true); // sub1, second time
-        assertThat(cutOutCaptor.getAllValues().get(3)).isEqualTo(true);
-    }
-
-    private List<SubscriptionInfo> setupMockSubscriptions(int count) {
-        return setupMockSubscriptions(count, 0, true);
-    }
-
-    /** Helper method to setup several mock active subscriptions. The generated subscription id's
-     * start at 1.
-     *
-     * @param count How many subscriptions to create
-     * @param defaultDataSubId The subscription id of the default data subscription - pass
-     *                         INVALID_SUBSCRIPTION_ID if there should not be one
-     * @param mobileDataEnabled Whether mobile data should be considered enabled for the default
-     *                          data subscription
-     */
-    private List<SubscriptionInfo> setupMockSubscriptions(int count, int defaultDataSubId,
-            boolean mobileDataEnabled) {
-        if (defaultDataSubId != INVALID_SUBSCRIPTION_ID) {
-            ShadowSubscriptionManager.setDefaultDataSubscriptionId(defaultDataSubId);
-        }
-        final ArrayList<SubscriptionInfo> infos = new ArrayList<>();
-        for (int i = 0; i < count; i++) {
-            final int subscriptionId = i + 1;
-            final SubscriptionInfo info = mock(SubscriptionInfo.class);
-            final TelephonyManager mgrForSub = mock(TelephonyManager.class);
-            final SignalStrength signalStrength = mock(SignalStrength.class);
-
-            if (subscriptionId == defaultDataSubId) {
-                when(mgrForSub.isDataEnabled()).thenReturn(mobileDataEnabled);
-            }
-            when(info.getSubscriptionId()).thenReturn(i + 1);
-            when(info.getDisplayName()).thenReturn("sub" + (i + 1));
-            doReturn(mgrForSub).when(mTelephonyManager).createForSubscriptionId(eq(subscriptionId));
-            when(mgrForSub.getSignalStrength()).thenReturn(signalStrength);
-            when(signalStrength.getLevel()).thenReturn(SIGNAL_STRENGTH_GOOD);
-
-            infos.add(info);
-        }
-        SubscriptionUtil.setActiveSubscriptionsForTesting(infos);
-        return infos;
-    }
-
-    /**
-     * Helper method to set the signal strength returned for a mock subscription
-     * @param subs The list of subscriptions
-     * @param index The index in of the subscription in |subs| to change
-     * @param level The signal strength level to return for the subscription. Pass -1 to force
-     *              return of a null SignalStrength object for the subscription.
-     */
-    private void setMockSubSignalStrength(List<SubscriptionInfo> subs, int index, int level) {
-        final TelephonyManager mgrForSub =
-                mTelephonyManager.createForSubscriptionId(subs.get(index).getSubscriptionId());
-        if (level == -1) {
-            when(mgrForSub.getSignalStrength()).thenReturn(null);
-        } else {
-            final SignalStrength signalStrength = mgrForSub.getSignalStrength();
-            when(signalStrength.getLevel()).thenReturn(level);
-        }
-    }
-
-    private void setMockSubDataEnabled(List<SubscriptionInfo> subs, int index, boolean enabled) {
-        final TelephonyManager mgrForSub =
-                mTelephonyManager.createForSubscriptionId(subs.get(index).getSubscriptionId());
-        when(mgrForSub.isDataEnabled()).thenReturn(enabled);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
index e04262f..857b3eb 100644
--- a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java
@@ -24,10 +24,12 @@
 
 import android.content.Context;
 import android.os.UserManager;
+import android.util.FeatureFlagUtils;
 
+import com.android.settings.core.FeatureFlags;
 import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
 import com.android.settings.testutils.shadow.ShadowUtils;
-import com.android.settings.wifi.WifiMasterSwitchPreferenceController;
+import com.android.settings.wifi.WifiPrimarySwitchPreferenceController;
 
 import org.junit.After;
 import org.junit.Before;
@@ -47,7 +49,7 @@
 public class TopLevelNetworkEntryPreferenceControllerTest {
 
     @Mock
-    private WifiMasterSwitchPreferenceController mWifiPreferenceController;
+    private WifiPrimarySwitchPreferenceController mWifiPreferenceController;
     @Mock
     private MobileNetworkPreferenceController mMobileNetworkPreferenceController;
     @Mock
@@ -77,6 +79,10 @@
     @After
     public void tearDown() {
         ShadowUtils.reset();
+
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        }
     }
 
     @Test
@@ -103,4 +109,11 @@
 
         assertThat(mController.getSummary()).isEqualTo("Wi\u2011Fi and data usage");
     }
+
+    @Test
+    public void getSummary_silkyHomeEnabled_shouldBeNull() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+
+        assertThat(mController.getSummary()).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
new file mode 100644
index 0000000..0a430cd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/apn/ApnEditorTest.java
@@ -0,0 +1,560 @@
+/*
+ * 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.network.apn;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.net.Uri;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.preference.EditTextPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.MultiSelectListPreference;
+import androidx.preference.SwitchPreference;
+
+import com.android.settings.R;
+import com.android.settings.network.ProxySubscriptionManager;
+import com.android.settings.network.apn.ApnEditor.ApnData;
+import com.android.settings.testutils.shadow.ShadowFragment;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+public class ApnEditorTest {
+
+    private static final Object[] APN_DATA = {
+            0, /* ID */
+            "apn_name" /* apn name */,
+            "apn.com" /* apn */,
+            "" /* proxy */,
+            "" /* port */,
+            "" /* username */,
+            "" /* server */,
+            "" /* password */,
+            "" /* MMSC */,
+            "123" /* MCC */,
+            "456" /* MNC */,
+            "123456" /* operator numeric */,
+            "" /* MMS proxy */,
+            "" /* MMS port */,
+            0 /* Authentication type */,
+            "default,supl,ia" /* APN type */,
+            "IP" /* APN protocol */,
+            1 /* APN enable/disable */,
+            0 /* Bearer */,
+            0 /* Bearer BITMASK*/,
+            "IPV6" /* APN roaming protocol */,
+            "None" /* MVNO type */,
+            "", /* MVNO value */
+    };
+
+    private static final int CURSOR_INTEGER_INDEX = 0;
+    private static final int CURSOR_STRING_INDEX = 1;
+
+    private static final Uri APN_URI = Uri.parse("Apn://row/1");
+
+    @Mock
+    private Cursor mCursor;
+
+    @Mock
+    private FragmentActivity mActivity;
+    @Mock
+    private ProxySubscriptionManager mProxySubscriptionMgr;
+
+    @Captor
+    private ArgumentCaptor<Uri> mUriCaptor;
+
+    private ApnEditor mApnEditorUT;
+    private Context mContext;
+    private Resources mResources;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+
+        mResources = mContext.getResources();
+        mApnEditorUT = spy(new ApnEditor());
+
+        doReturn(mActivity).when(mApnEditorUT).getActivity();
+        doReturn(mResources).when(mApnEditorUT).getResources();
+        doNothing().when(mApnEditorUT).finish();
+        doNothing().when(mApnEditorUT).showError();
+        doReturn(mContext).when(mApnEditorUT).getContext();
+        doReturn(mContext.getTheme()).when(mActivity).getTheme();
+        doReturn(mContext.getContentResolver()).when(mActivity).getContentResolver();
+
+        setMockPreference(mContext);
+        mApnEditorUT.mApnData = new FakeApnData(APN_DATA);
+        mApnEditorUT.sNotSet = "Not Set";
+    }
+
+    @Test
+    public void testApnEditor_doesNotUseManagedQuery() {
+        mApnEditorUT.getApnDataFromUri(Mockito.mock(Uri.class));
+
+        verify(mActivity, never()).managedQuery(
+                any(Uri.class),
+                any(String[].class),
+                any(String.class),
+                any(String.class));
+
+        verify(mActivity, never()).managedQuery(
+                any(Uri.class),
+                any(String[].class),
+                any(String.class),
+                any(String[].class),
+                any(String.class));
+    }
+
+    @Test
+    public void testSetStringValue_valueChanged_shouldSetValue() {
+        // GIVEN an APN value which is different than the APN value in database
+        final String apnKey = "apn";
+        final String apnValue = "testing.com";
+        final ContentValues cv = new ContentValues();
+
+        // WHEN try to check and set the apn value
+        final boolean isDiff = mApnEditorUT.setStringValueAndCheckIfDiff(
+                cv, apnKey, apnValue, false /* assumeDiff */, ApnEditor.APN_INDEX);
+
+        // THEN the APN value is different than the one in database, and it has been stored in the
+        // given ContentValues
+        assertThat(isDiff).isTrue();
+        assertThat(apnValue).isEqualTo(cv.getAsString(apnKey));
+    }
+
+    @Test
+    public void testSetStringValue_valueNotChanged_shouldNotSetValue() {
+        // GIVEN an APN value which is same as the APN value in database
+        final String apnKey = "apn";
+        final String apnValue = (String) APN_DATA[ApnEditor.APN_INDEX];
+        final ContentValues cv = new ContentValues();
+
+        // WHEN try to check and set the apn value
+        final boolean isDiff = mApnEditorUT.setStringValueAndCheckIfDiff(
+                cv, apnKey, apnValue, false /* assumeDiff */, ApnEditor.APN_INDEX);
+
+        // THEN the APN value is same as the one in database, and the new APN value is not stored
+        // in the given ContentValues
+        assertThat(isDiff).isFalse();
+        assertThat(cv.get(apnKey)).isNull();
+    }
+
+    @Test
+    public void testSetStringValue_nullValue_shouldNotSetValue_shouldNotSetValue() {
+        // GIVEN a null APN value
+        final String apnKey = "apn";
+        final String apnValue = null;
+        final ContentValues cv = new ContentValues();
+
+        // WHEN try to check and set the apn value
+        final boolean isDiff = mApnEditorUT.setStringValueAndCheckIfDiff(
+                cv, apnKey, apnValue, false /* assumeDiff */, ApnEditor.APN_INDEX);
+
+        // THEN the APN value is different than the one in database, but the null value is not
+        // stored in the given ContentValues
+        assertThat(isDiff).isTrue();
+        assertThat(cv.get(apnKey)).isNull();
+    }
+
+    @Test
+    public void testSetIntValue_valueChanged_shouldSetValue() {
+        // GIVEN a value indicated whether the apn is enabled, and it's different than the value in
+        // the database
+        final String apnEnabledKey = "apn_enabled";
+        final int apnEnabledValue = 0;
+        final ContentValues cv = new ContentValues();
+
+        // WHEN try to check and set the apn enabled
+        final boolean isDiff = mApnEditorUT.setIntValueAndCheckIfDiff(
+                cv,
+                apnEnabledKey,
+                apnEnabledValue,
+                false /* assumeDiff */,
+                ApnEditor.CARRIER_ENABLED_INDEX);
+
+        // THEN the apn enabled field is different than the one in database, and it has been stored
+        // in the given ContentValues
+        assertThat(isDiff).isTrue();
+        assertThat(cv.getAsInteger(apnEnabledKey)).isEqualTo(apnEnabledValue);
+    }
+
+    @Test
+    public void testSetIntValue_valueNotChanged_shouldNotSetValue() {
+        // GIVEN a value indicated whether the apn is enabled, and it's same as the one in the
+        // database
+        final String apnEnabledKey = "apn_enabled";
+        final int apnEnabledValue = (int) APN_DATA[ApnEditor.CARRIER_ENABLED_INDEX];
+        final ContentValues cv = new ContentValues();
+
+        // WHEN try to check and set the apn enabled
+        final boolean isDiff = mApnEditorUT.setIntValueAndCheckIfDiff(
+                cv,
+                apnEnabledKey,
+                apnEnabledValue,
+                false /* assumeDiff */,
+                ApnEditor.CARRIER_ENABLED_INDEX);
+
+        // THEN the apn enabled field is same as the one in the database, and the filed is not
+        // stored in the given ContentValues
+        assertThat(isDiff).isFalse();
+        assertThat(cv.get(apnEnabledKey)).isNull();
+    }
+
+    @Test
+    public void testValidateApnData_validData_shouldReturnNull() {
+        // GIVEN a valid apn data
+        mApnEditorUT.fillUI(true /* firstTime */);
+
+        // WHEN validate the apn data
+        final String errMsg = mApnEditorUT.validateApnData();
+
+        // THEN the error message should be null
+        assertThat(errMsg).isNull();
+    }
+
+    @Test
+    public void testValidateApn_apnNameNotSet_shouldReturnErrorMessage() {
+        // GIVEN a apn data without the apn name
+        mApnEditorUT.mApnData.mData[ApnEditor.NAME_INDEX] = "";
+        mApnEditorUT.fillUI(true /* firstTime */);
+
+        // THEN validate the apn data
+        final String errMsg = mApnEditorUT.validateApnData();
+
+        // THEN the error message indicated the apn name not set is returned
+        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_name_empty));
+    }
+
+    @Test
+    public void testValidateApnData_apnNotSet_shouldReturnErrorMessage() {
+        // GIVEN a apn data without the apn
+        mApnEditorUT.mApnData.mData[ApnEditor.APN_INDEX] = "";
+        mApnEditorUT.fillUI(true /* firstTime */);
+
+        // THEN validate the apn data
+        final String errMsg = mApnEditorUT.validateApnData();
+
+        // THEN the error message indicated the apn not set is returned
+        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_apn_empty));
+    }
+
+    @Test
+    public void testValidateApnData_mccInvalid_shouldReturnErrorMessage() {
+        // The length of the mcc should be 3
+        mApnEditorUT.mApnData.mData[ApnEditor.MCC_INDEX] = "1324";
+        mApnEditorUT.fillUI(true /* firstTime */);
+
+        // WHEN validate the apn data
+        final String errMsg = mApnEditorUT.validateApnData();
+
+        // THEN the error message indicated the mcc invalid is returned
+        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_mcc_not3));
+    }
+
+    @Test
+    public void testValidateApnData_mncInvalid_shouldReturnErrorMessage() {
+        // GIVEN an apn data with invalid mnc
+        // The length of the mnc should be 2 or 3
+        mApnEditorUT.mApnData.mData[ApnEditor.MNC_INDEX] = "1324";
+        mApnEditorUT.fillUI(true /* firstTime */);
+
+        // WHEN validate the apn data
+        final String errMsg = mApnEditorUT.validateApnData();
+
+        // THEN the error message indicated the mnc invalid is returned
+        assertThat(errMsg).isEqualTo(mResources.getString(R.string.error_mnc_not23));
+    }
+
+    @Test
+    public void testSaveApnData_pressBackButtonWithValidApnData_shouldSaveApnData() {
+        // GIVEN a valid apn data
+        mApnEditorUT.fillUI(true /* firstTime */);
+
+        // WHEN press the back button
+        final KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK);
+        mApnEditorUT.onKey(new View(mContext), KeyEvent.KEYCODE_BACK, event);
+
+        // THEN the apn data is saved and the apn editor is closed
+        verify(mApnEditorUT).validateAndSaveApnData();
+        verify(mApnEditorUT).finish();
+    }
+
+    @Test
+    public void testSaveApnData_pressSaveButtonWithValidApnData_shouldSaveApnData() {
+        // GIVEN a valid apn data
+        mApnEditorUT.fillUI(true /* firstTime */);
+
+        // WHEN press the save button
+        MenuItem item = Mockito.mock(MenuItem.class);
+        // Menu.FIRST + 1 indicated the SAVE option in ApnEditor
+        doReturn(Menu.FIRST + 1).when(item).getItemId();
+        mApnEditorUT.onOptionsItemSelected(item);
+
+        // THEN the apn data is saved and the apn editor is closed
+        verify(mApnEditorUT).validateAndSaveApnData();
+        verify(mApnEditorUT).finish();
+    }
+
+    @Test
+    public void testSaveApnData_apnDataInvalid_shouldNotSaveApnData() {
+        // GIVEN an invalid apn data
+        // The valid apn data should contains a non-empty apn name
+        mApnEditorUT.mApnData.mData[ApnEditor.NAME_INDEX] = "";
+        mApnEditorUT.fillUI(true /* firstTime */);
+
+        // WHEN press the save button
+        final MenuItem item = Mockito.mock(MenuItem.class);
+        // Menu.FIRST + 1 indicated the SAVE option in ApnEditor
+        doReturn(Menu.FIRST + 1).when(item).getItemId();
+        mApnEditorUT.onOptionsItemSelected(item);
+
+        // THEN the error dialog is shown
+        verify(mApnEditorUT).validateAndSaveApnData();
+        verify(mApnEditorUT).showError();
+    }
+
+    @Test
+    public void testDeleteApnData_shouldDeleteData() {
+        // GIVEN a valid apn data correspond a row in database
+        final Uri apnUri = Uri.parse("content://telephony/carriers/1");
+        mApnEditorUT.mApnData = new FakeApnData(APN_DATA, apnUri);
+        mApnEditorUT.fillUI(true /* firstTime */);
+        ContentResolver mockContentResolver = Mockito.mock(ContentResolver.class);
+        doReturn(mockContentResolver).when(mActivity).getContentResolver();
+
+        // WHEN press the save button
+        final MenuItem item = Mockito.mock(MenuItem.class);
+        // Menu.FIRST indicated the DELETE option in ApnEditor
+        doReturn(Menu.FIRST).when(item).getItemId();
+        mApnEditorUT.onOptionsItemSelected(item);
+
+        // THEN the apn data is deleted and the apn editor is closed
+        verify(mockContentResolver).delete(mUriCaptor.capture(), any(), any());
+        assertThat(apnUri).isEqualTo(mUriCaptor.getValue());
+        verify(mApnEditorUT).finish();
+    }
+
+    @Test(expected = ClassCastException.class)
+    public void testApnData_invalidIntegerType_throwsInvalidTypeException() {
+        // GIVEN a ApnData constructed from cursor
+        initCursor();
+        final ApnData data = new ApnData(APN_URI, mCursor);
+
+        // WHEN get a string from an integer column
+        // THEN the InvalidTypeException is threw
+        data.getString(CURSOR_INTEGER_INDEX);
+    }
+
+    @Test(expected = ClassCastException.class)
+    public void testApnData_invalidStringType_throwsInvalidTypeException() {
+        // GIVEN a ApnData constructed from cursor
+        initCursor();
+        final ApnData data = new ApnData(APN_URI, mCursor);
+
+        // WHEN get a integer from a string column
+        // THEN the InvalidTypeException is threw
+        data.getInteger(CURSOR_STRING_INDEX);
+    }
+
+    @Test
+    public void testApnData_validIntegerType_returnCorrectValue() {
+        // GIVEN a ApnData constructed from cursor
+        initCursor();
+        final ApnData data = new ApnData(APN_URI, mCursor);
+
+        // WHEN get integer from an integer column
+        final int val = data.getInteger(CURSOR_INTEGER_INDEX);
+
+        // THEN the integer is returned correctly
+        assertThat(val).isEqualTo(mCursor.getInt(CURSOR_INTEGER_INDEX));
+    }
+
+    @Test
+    public void testApnData_validStringType_returnCorrectValue() {
+        // GIVEN a ApnData constructed from cursor
+        initCursor();
+        final ApnData data = new ApnData(APN_URI, mCursor);
+
+        // WHEN get string from a string column
+        final String str = data.getString(CURSOR_STRING_INDEX);
+
+        // THEN the integer is returned correctly
+        assertThat(str).isEqualTo(mCursor.getString(CURSOR_STRING_INDEX));
+    }
+
+    @Test
+    public void testApnData_nullValueColumn_returnNull() {
+        // GIVEN a empty ApnData
+        final ApnData data = new ApnData(3);
+
+        // WHEN get string value from a null column
+        final String str = data.getString(0);
+
+        // THEN the null value is returned
+        assertThat(str).isNull();
+    }
+
+    @Test
+    public void formatInteger_shouldParseString() {
+        assertThat(ApnEditor.formatInteger("42")).isEqualTo("42");
+        assertThat(ApnEditor.formatInteger("01")).isEqualTo("01");
+        assertThat(ApnEditor.formatInteger("001")).isEqualTo("001");
+    }
+
+    @Test
+    public void formatInteger_shouldIgnoreNonIntegers() {
+        assertThat(ApnEditor.formatInteger("not an int")).isEqualTo("not an int");
+    }
+
+    @Test
+    @Config(shadows = ShadowFragment.class)
+    public void onCreate_noAction_shouldFinishAndNoCrash() {
+        ProxySubscriptionManager proxySubscriptionMgr = mock(ProxySubscriptionManager.class);
+        mApnEditorUT.mProxySubscriptionMgr = proxySubscriptionMgr;
+        doReturn(new Intent()).when(mActivity).getIntent();
+        doNothing().when(mApnEditorUT).addPreferencesFromResource(anyInt());
+
+        mApnEditorUT.onCreate(null);
+
+        verify(mApnEditorUT).finish();
+    }
+
+    @Test
+    public void testOnViewStateRestored_customizedValueWithoutDefault_shouldShowCustomized() {
+        mApnEditorUT.mDefaultApnProtocol = "IP";
+        mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = null;
+        mApnEditorUT.mProtocol.setEntryValues(new CharSequence[]{"IP", "IPV6", "IPV4V6"});
+
+        mApnEditorUT.onViewStateRestored(null);
+
+        assertThat(mApnEditorUT.mProtocol.getSummary()).isEqualTo("IPv4");
+    }
+
+    @Test
+    public void testOnViewStateRestored_customizedValueWithDefault_shouldShowDefault() {
+        mApnEditorUT.mDefaultApnProtocol = "IP";
+        mApnEditorUT.mApnData.mData[ApnEditor.PROTOCOL_INDEX] = "IPV6";
+        mApnEditorUT.mProtocol.setEntryValues(new CharSequence[]{"IP", "IPV6", "IPV4V6"});
+
+        mApnEditorUT.onViewStateRestored(null);
+
+        assertThat(mApnEditorUT.mProtocol.getSummary()).isEqualTo("IPv6");
+    }
+
+    @Test
+    public void getUserEnteredApnType_emptyApnType_shouldReturnDefault() {
+        // case 1
+        // GIVEN read only APN types with DUN
+        mApnEditorUT.mReadOnlyApnTypes = new String [] {"dun"};
+        // GIVEN read specificApnTypeForEmptyInput with DEFAULT,DUN
+        mApnEditorUT.mDefaultApnTypes = new String [] {"default", "dun"};
+
+        // Input empty in TYPE
+        mApnEditorUT.mApnData.mData[ApnEditor.TYPE_INDEX] = "";
+        mApnEditorUT.onViewStateRestored(null);
+
+        // THEN APN type should be default
+        assertThat(mApnEditorUT.getUserEnteredApnType()).isEqualTo("default");
+
+        // case 2
+        // GIVEN read only APN types with DUN
+        mApnEditorUT.mReadOnlyApnTypes = new String [] {"dun"};
+        // GIVEN read specificApnTypeForEmptyInput with DEFAULT
+        mApnEditorUT.mDefaultApnTypes = new String [] {"default"};
+
+        // Input empty in TYPE
+        mApnEditorUT.mApnData.mData[ApnEditor.TYPE_INDEX] = "";
+        mApnEditorUT.onViewStateRestored(null);
+
+        // THEN APN type should be default
+        assertThat(mApnEditorUT.getUserEnteredApnType()).isEqualTo("default");
+    }
+
+    private void initCursor() {
+        doReturn(2).when(mCursor).getColumnCount();
+        doReturn(2).when(mCursor).getInt(CURSOR_INTEGER_INDEX);
+        doReturn("str").when(mCursor).getString(CURSOR_STRING_INDEX);
+        doReturn(Cursor.FIELD_TYPE_INTEGER).when(mCursor).getType(CURSOR_INTEGER_INDEX);
+        doReturn(Cursor.FIELD_TYPE_STRING).when(mCursor).getType(CURSOR_STRING_INDEX);
+    }
+
+    private void setMockPreference(Context context) {
+        mApnEditorUT.mName = new EditTextPreference(context);
+        mApnEditorUT.mApn = new EditTextPreference(context);
+        mApnEditorUT.mProxy = new EditTextPreference(context);
+        mApnEditorUT.mPort = new EditTextPreference(context);
+        mApnEditorUT.mUser = new EditTextPreference(context);
+        mApnEditorUT.mServer = new EditTextPreference(context);
+        mApnEditorUT.mPassword = new EditTextPreference(context);
+        mApnEditorUT.mMmsc = new EditTextPreference(context);
+        mApnEditorUT.mMcc = new EditTextPreference(context);
+        mApnEditorUT.mMnc = new EditTextPreference(context);
+        mApnEditorUT.mMmsProxy = new EditTextPreference(context);
+        mApnEditorUT.mMmsPort = new EditTextPreference(context);
+        mApnEditorUT.mAuthType = new ListPreference(context);
+        mApnEditorUT.mApnType = new EditTextPreference(context);
+        mApnEditorUT.mProtocol = new ListPreference(context);
+        mApnEditorUT.mRoamingProtocol = new ListPreference(context);
+        mApnEditorUT.mCarrierEnabled = new SwitchPreference(context);
+        mApnEditorUT.mBearerMulti = new MultiSelectListPreference(context);
+        mApnEditorUT.mMvnoType = new ListPreference(context);
+        mApnEditorUT.mMvnoMatchData = new EditTextPreference(context);
+    }
+
+    private final class FakeApnData extends ApnData {
+        FakeApnData(Object[] data) {
+            super(data.length);
+            System.arraycopy(data, 0, mData, 0, data.length);
+        }
+
+        FakeApnData(Object[] data, Uri uri) {
+            this(data);
+            mUri = uri;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
deleted file mode 100644
index e03da10..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doNothing;
-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 android.os.PersistableBundle;
-import android.provider.Settings;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.network.ApnSettings;
-import com.android.settingslib.RestrictedPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class ApnPreferenceControllerTest {
-    private static final int SUB_ID = 2;
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private TelephonyManager mInvalidTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-
-    private ApnPreferenceController mController;
-    private RestrictedPreference mPreference;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
-        doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
-        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-        doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
-
-        mPreference = new RestrictedPreference(mContext);
-        mController = new ApnPreferenceController(mContext, "mobile_data");
-        mController.init(SUB_ID);
-        mController.setPreference(mPreference);
-        mController.mCarrierConfigManager = mCarrierConfigManager;
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void getAvailabilityStatus_apnSettingsNotSupported_returnUnavailable() {
-        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
-        final PersistableBundle bundle = new PersistableBundle();
-        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, false);
-        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_apnSettingsSupportedWithCDMA_returnAvailable() {
-        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
-        final PersistableBundle bundle = new PersistableBundle();
-        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
-        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_apnSettingsSupportedWithGsm_returnAvailable() {
-        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
-        final PersistableBundle bundle = new PersistableBundle();
-        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);
-        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_carrierConfigNull_returnUnavailable() {
-        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
-        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(null);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-
-    @Test
-    public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {
-        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
-        final PersistableBundle bundle = new PersistableBundle();
-        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);
-        bundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, true);
-        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void handPreferenceTreeClick_fireIntent() {
-        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivity(captor.capture());
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final Intent intent = captor.getValue();
-        assertThat(intent.getAction()).isEqualTo(Settings.ACTION_APN_SETTINGS);
-        assertThat(intent.getIntExtra(ApnSettings.SUB_ID, 0)).isEqualTo(SUB_ID);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java
deleted file mode 100644
index d978fea..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-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 android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.PersistableBundle;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import com.android.settingslib.RestrictedPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class CarrierPreferenceControllerTest {
-    private static final int SUB_ID = 2;
-    private static final String CARRIER_SETTINGS_COMPONENT = "packageName/className";
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private TelephonyManager mInvalidTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-
-    private CarrierPreferenceController mController;
-    private RestrictedPreference mPreference;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
-        doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
-        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-        doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
-
-        mPreference = new RestrictedPreference(mContext);
-        mController = new CarrierPreferenceController(mContext, "mobile_data");
-        mController.init(SUB_ID);
-        mController.mCarrierConfigManager = mCarrierConfigManager;
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void getAvailabilityStatus_cdmaWithFlagOff_returnUnavailable() {
-        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
-        final PersistableBundle bundle = new PersistableBundle();
-        bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, false);
-        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_cdmaWithFlagOnreturnAvailable() {
-        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
-        final PersistableBundle bundle = new PersistableBundle();
-        bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, true);
-        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_gsmWithFlagOnreturnAvailable() {
-        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
-        final PersistableBundle bundle = new PersistableBundle();
-        bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, true);
-        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
-    }
-
-    @Test
-    public void handlePreferenceClick_activityFound_openCarrierSettingActivity() {
-        final PersistableBundle bundle = new PersistableBundle();
-        bundle.putString(
-                CarrierConfigManager.KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING,
-                CARRIER_SETTINGS_COMPONENT);
-        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-        PackageManager pm = Mockito.mock(PackageManager.class);
-        doReturn(pm).when(mContext).getPackageManager();
-        doReturn(new ResolveInfo()).when(pm).resolveActivity(any(Intent.class), anyInt());
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
-        verify(mContext).startActivity(captor.capture());
-        final Intent intent = captor.getValue();
-        assertThat(intent.getComponent()).isEqualTo(
-                ComponentName.unflattenFromString(CARRIER_SETTINGS_COMPONENT));
-    }
-
-    @Test
-    public void handlePreferenceClick_activityNotFound_DoNothing() {
-        final PersistableBundle bundle = new PersistableBundle();
-        bundle.putString(
-                CarrierConfigManager.KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING,
-                CARRIER_SETTINGS_COMPONENT);
-        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-        PackageManager pm = Mockito.mock(PackageManager.class);
-        doReturn(pm).when(mContext).getPackageManager();
-        doReturn(null).when(pm).resolveActivity(any(Intent.class), anyInt());
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
-        verify(mContext, never()).startActivity(captor.capture());
-    }
-
-    @Test
-    public void handlePreferenceClick_activityNotConfigured_DoNothing() {
-        final PersistableBundle bundle = new PersistableBundle();
-        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-        PackageManager pm = Mockito.mock(PackageManager.class);
-        doReturn(pm).when(mContext).getPackageManager();
-        doReturn(new ResolveInfo()).when(pm).resolveActivity(any(Intent.class), anyInt());
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
-        verify(mContext, never()).startActivity(captor.capture());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceControllerTest.java
deleted file mode 100644
index 268c581..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceControllerTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.os.PersistableBundle;
-import android.telephony.CarrierConfigManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.Shadows;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowCarrierConfigManager;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowCarrierConfigManager.class)
-public class CarrierSettingsVersionPreferenceControllerTest {
-
-    private ShadowCarrierConfigManager mCarrierConfigManager;
-    private CarrierSettingsVersionPreferenceController mController;
-    private int mSubscriptionId = 1234;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        final Context context = RuntimeEnvironment.application;
-        mController = new CarrierSettingsVersionPreferenceController(context, "dummy_key");
-        mController.init(mSubscriptionId);
-        mCarrierConfigManager = Shadows.shadowOf(
-                context.getSystemService(CarrierConfigManager.class));
-    }
-
-    @Test
-    public void getSummary_nullConfig_noCrash() {
-        mCarrierConfigManager.setConfigForSubId(mSubscriptionId, null);
-        assertThat(mController.getSummary()).isNull();
-    }
-
-    @Test
-    public void getSummary_nullVersionString_noCrash() {
-        mCarrierConfigManager.setConfigForSubId(mSubscriptionId, new PersistableBundle());
-        assertThat(mController.getSummary()).isNull();
-    }
-
-    @Test
-    public void getSummary_hasVersionString_correctSummary() {
-        final PersistableBundle bundle = new PersistableBundle();
-        bundle.putString(CarrierConfigManager.KEY_CARRIER_CONFIG_VERSION_STRING,
-                "test_version_123");
-        mCarrierConfigManager.setConfigForSubId(mSubscriptionId, bundle);
-        assertThat(mController.getSummary()).isEqualTo("test_version_123");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java
index 3d54cfb..fd5ed37 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/ContactDiscoveryPreferenceControllerTest.java
@@ -159,7 +159,9 @@
     }
 
     private void setRcsPresenceConfig(boolean isEnabled) {
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_USE_RCS_PRESENCE_BOOL, isEnabled);
+        mCarrierConfig.putBoolean(
+                CarrierConfigManager.Ims.KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL,
+                isEnabled);
     }
 
     private ContentObserver getUceChangeObserver() {
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
deleted file mode 100644
index 3eb3caf..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.PersistableBundle;
-import android.provider.Settings;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.text.TextUtils;
-
-import androidx.preference.Preference;
-
-import com.android.settingslib.RestrictedPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class DataServiceSetupPreferenceControllerTest {
-    private static final int SUB_ID = 2;
-
-    private static final String SETUP_URL = "url://tmp_url:^1";
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private TelephonyManager mInvalidTelephonyManager;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-
-    private PersistableBundle mCarrierConfig;
-    private DataServiceSetupPreferenceController mController;
-    private Preference mPreference;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
-        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-        doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
-        Settings.Global.putString(mContext.getContentResolver(),
-                Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, SETUP_URL);
-
-        mCarrierConfig = new PersistableBundle();
-        doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
-        mPreference = new RestrictedPreference(mContext);
-        mController = new DataServiceSetupPreferenceController(mContext, "data_service_setup");
-        mController.init(SUB_ID);
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void getAvailabilityStatus_allConfigOn_returnAvailable() {
-        doReturn(true).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
-                false);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_missUrl_returnUnavailable() {
-        Settings.Global.putString(mContext.getContentResolver(),
-                Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, "");
-        doReturn(true).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
-                false);
-
-        mController = new DataServiceSetupPreferenceController(mContext, "data_service_setup");
-        mController.init(SUB_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_notCdma_returnUnavailable() {
-        doReturn(false).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
-                false);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_startActivity() {
-        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivity(captor.capture());
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final Intent intent = captor.getValue();
-        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
-        assertThat(intent.getData()).isEqualTo(
-                Uri.parse(TextUtils.expandTemplate(SETUP_URL, "").toString()));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
deleted file mode 100644
index e20241b..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settings.network.SubscriptionUtil;
-
-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.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.Arrays;
-
-@RunWith(RobolectricTestRunner.class)
-public class DefaultSubscriptionControllerTest {
-    @Mock
-    private SubscriptionManager mManager;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private ListPreference mListPreference;
-    private Context mContext;
-    private DefaultSubscriptionController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mManager);
-        final String key = "prefkey";
-        mController = spy(new TestDefaultSubscriptionController(mContext, key));
-        mListPreference = spy(new ListPreference(mContext));
-        when(mScreen.findPreference(key)).thenReturn(mListPreference);
-    }
-
-    @After
-    public void tearDown() {
-        SubscriptionUtil.setActiveSubscriptionsForTesting(null);
-    }
-
-    @Test
-    public void getAvailabilityStatus_onlyOneSubscription_notAvailable() {
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(
-                createMockSub(1, "sub1")));
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_twoSubscriptions_isAvailable() {
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(
-                createMockSub(1, "sub1"),
-                createMockSub(2, "sub2")));
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
-    }
-
-    @Test
-    public void isCallingAccountBindToSubscription_invalidAccount_withoutCrash() {
-        doReturn(null).when(mController).getPhoneAccount(any());
-
-        mController.isCallingAccountBindToSubscription(null);
-    }
-
-    @Test
-    public void getLabelFromCallingAccount_invalidAccount_emptyString() {
-        doReturn(null).when(mController).getPhoneAccount(any());
-
-        assertThat(mController.getLabelFromCallingAccount(null)).isEqualTo("");
-    }
-
-    @Test
-    public void displayPreference_twoSubscriptionsSub1Default_correctListPreferenceValues() {
-        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
-        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
-        doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
-
-        mController.displayPreference(mScreen);
-
-        final CharSequence entry = mListPreference.getEntry();
-        final String value = mListPreference.getValue();
-        assertThat(entry).isEqualTo("sub1");
-        assertThat(value).isEqualTo("111");
-
-        final CharSequence[] entries = mListPreference.getEntries();
-        assertThat(entries.length).isEqualTo(3);
-        assertThat(entries[0]).isEqualTo("sub1");
-        assertThat(entries[1]).isEqualTo("sub2");
-        assertThat(entries[2]).isEqualTo(mContext.getString(R.string.calls_and_sms_ask_every_time));
-
-        final CharSequence[] entryValues = mListPreference.getEntryValues();
-        assertThat(entryValues.length).isEqualTo(3);
-        assertThat(entryValues[0]).isEqualTo("111");
-        assertThat(entryValues[1]).isEqualTo("222");
-        assertThat(entryValues[2]).isEqualTo(
-                Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
-    }
-
-    @Test
-    public void displayPreference_twoSubscriptionsSub2Default_correctListPreferenceValues() {
-        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
-        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
-        doReturn(sub2.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
-
-        mController.displayPreference(mScreen);
-
-        final CharSequence entry = mListPreference.getEntry();
-        final String value = mListPreference.getValue();
-        assertThat(entry).isEqualTo("sub2");
-        assertThat(value).isEqualTo("222");
-
-        final CharSequence[] entries = mListPreference.getEntries();
-        assertThat(entries.length).isEqualTo(3);
-        assertThat(entries[0]).isEqualTo("sub1");
-        assertThat(entries[1]).isEqualTo("sub2");
-        assertThat(entries[2]).isEqualTo(mContext.getString(R.string.calls_and_sms_ask_every_time));
-
-        final CharSequence[] entryValues = mListPreference.getEntryValues();
-        assertThat(entryValues.length).isEqualTo(3);
-        assertThat(entryValues[0]).isEqualTo("111");
-        assertThat(entryValues[1]).isEqualTo("222");
-        assertThat(entryValues[2]).isEqualTo(
-                Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
-    }
-
-    @Test
-    public void displayPreference_threeSubsOneIsOpportunistic_correctListPreferenceValues() {
-        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
-        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
-        final SubscriptionInfo sub3 = createMockSub(333, "sub3");
-
-        // Mark sub2 as opportunistic; then it should not appear in the list of entries/entryValues.
-        when(sub2.isOpportunistic()).thenReturn(true);
-
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2, sub3));
-        doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
-
-        mController.displayPreference(mScreen);
-
-        final CharSequence[] entries = mListPreference.getEntries();
-        assertThat(entries.length).isEqualTo(3);
-        assertThat(entries[0]).isEqualTo("sub1");
-        assertThat(entries[1]).isEqualTo("sub3");
-        assertThat(entries[2]).isEqualTo(mContext.getString(R.string.calls_and_sms_ask_every_time));
-
-        final CharSequence[] entryValues = mListPreference.getEntryValues();
-        assertThat(entryValues.length).isEqualTo(3);
-        assertThat(entryValues[0]).isEqualTo("111");
-        assertThat(entryValues[1]).isEqualTo("333");
-        assertThat(entryValues[2]).isEqualTo(
-                Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
-    }
-
-    @Test
-    public void onPreferenceChange_prefChangedToSub2_callbackCalledCorrectly() {
-        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
-        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
-        doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
-
-        mController.displayPreference(mScreen);
-        mListPreference.setValue("222");
-        mController.onPreferenceChange(mListPreference, "222");
-        verify(mController).setDefaultSubscription(eq(222));
-    }
-
-    @Test
-    public void onPreferenceChange_prefChangedToAlwaysAsk_callbackCalledCorrectly() {
-        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
-        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
-        doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
-
-        mController.displayPreference(mScreen);
-        mListPreference.setValue(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
-        mController.onPreferenceChange(mListPreference,
-                Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
-        verify(mController).setDefaultSubscription(
-                eq(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
-    }
-
-    @Test
-    public void onPreferenceChange_prefBecomesAvailable_onPreferenceChangeCallbackNotNull() {
-        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
-        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
-
-        // Start with only one sub active, so the pref is not available
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
-        doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
-
-        mController.displayPreference(mScreen);
-        assertThat(mController.isAvailable()).isFalse();
-
-        // Now make two subs be active - the pref should become available, and the
-        // onPreferenceChange callback should be properly wired up.
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
-        mController.onSubscriptionsChanged();
-        assertThat(mController.isAvailable()).isTrue();
-        assertThat(mListPreference.getOnPreferenceChangeListener()).isEqualTo(mController);
-        mListPreference.callChangeListener("222");
-        verify(mController).setDefaultSubscription(eq(222));
-    }
-
-    @Test
-    public void onSubscriptionsChanged_twoSubscriptionsDefaultChanges_selectedEntryGetsUpdated() {
-        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
-        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
-        doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
-
-        mController.displayPreference(mScreen);
-        assertThat( mListPreference.getEntry()).isEqualTo("sub1");
-        assertThat(mListPreference.getValue()).isEqualTo("111");
-
-        doReturn(sub2.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
-        mController.onSubscriptionsChanged();
-        assertThat( mListPreference.getEntry()).isEqualTo("sub2");
-        assertThat(mListPreference.getValue()).isEqualTo("222");
-    }
-
-    @Test
-    public void onSubscriptionsChanged_goFromTwoSubscriptionsToOne_prefDisappears() {
-        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
-        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
-        doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
-
-        mController.displayPreference(mScreen);
-        assertThat(mController.isAvailable()).isTrue();
-        assertThat(mListPreference.isVisible()).isTrue();
-
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
-        mController.onSubscriptionsChanged();
-
-        assertThat(mController.isAvailable()).isFalse();
-        assertThat(mListPreference.isVisible()).isFalse();
-    }
-
-    @Test
-    public void onSubscriptionsChanged_goFromOneSubscriptionToTwo_prefAppears() {
-        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
-        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
-        doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
-
-        mController.displayPreference(mScreen);
-        assertThat(mController.isAvailable()).isFalse();
-        assertThat(mListPreference.isVisible()).isFalse();
-
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
-        mController.onSubscriptionsChanged();
-
-        assertThat(mController.isAvailable()).isTrue();
-        assertThat(mListPreference.isVisible()).isTrue();
-    }
-
-    @Test
-    public void onSubscriptionsChanged_goFromTwoToThreeSubscriptions_listGetsUpdated() {
-        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
-        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
-        final SubscriptionInfo sub3 = createMockSub(333, "sub3");
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
-        doReturn(sub1.getSubscriptionId()).when(mController).getDefaultSubscriptionId();
-
-        mController.displayPreference(mScreen);
-        assertThat(mListPreference.getEntries().length).isEqualTo(3);
-
-        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2, sub3));
-        mController.onSubscriptionsChanged();
-
-        assertThat(mController.isAvailable()).isTrue();
-        assertThat(mListPreference.isVisible()).isTrue();
-        final CharSequence[] entries = mListPreference.getEntries();
-        final CharSequence[] entryValues = mListPreference.getEntryValues();
-        assertThat(entries.length).isEqualTo(4);
-        assertThat(entries[0].toString()).isEqualTo("sub1");
-        assertThat(entries[1].toString()).isEqualTo("sub2");
-        assertThat(entries[2].toString()).isEqualTo("sub3");
-        assertThat(entries[3].toString()).isEqualTo(
-                mContext.getString(R.string.calls_and_sms_ask_every_time));
-        assertThat(entryValues[0].toString()).isEqualTo("111");
-        assertThat(entryValues[1].toString()).isEqualTo("222");
-        assertThat(entryValues[2].toString()).isEqualTo("333");
-        assertThat(entryValues[3].toString()).isEqualTo(
-                Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
-    }
-
-    private SubscriptionInfo createMockSub(int id, String displayName) {
-        final SubscriptionInfo sub = mock(SubscriptionInfo.class);
-        when(sub.getSubscriptionId()).thenReturn(id);
-        when(sub.getDisplayName()).thenReturn(displayName);
-        return sub;
-    }
-
-    private class TestDefaultSubscriptionController extends DefaultSubscriptionController {
-
-        public TestDefaultSubscriptionController(Context context, String preferenceKey) {
-            super(context, preferenceKey);
-        }
-
-        @Override
-        protected SubscriptionInfo getDefaultSubscriptionInfo() {
-            return null;
-        }
-
-        @Override
-        protected int getDefaultSubscriptionId() {
-            return 0;
-        }
-
-        @Override
-        protected void setDefaultSubscription(int subscriptionId) {
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceControllerTest.java
deleted file mode 100644
index 401a92e..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceControllerTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.eq;
-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.provider.Settings;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.euicc.EuiccManager;
-
-import androidx.fragment.app.Fragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.network.SubscriptionUtil;
-import com.android.settings.security.ConfirmSimDeletionPreferenceController;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-@RunWith(RobolectricTestRunner.class)
-public class DeleteSimProfilePreferenceControllerTest {
-    private static final String PREF_KEY = "delete_profile_key";
-    private static final int REQUEST_CODE = 4321;
-    private static final int SUB_ID = 1234;
-    private static final int OTHER_ID = 5678;
-
-    @Mock
-    private Fragment mFragment;
-    @Mock
-    private SubscriptionInfo mSubscriptionInfo;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private Context mContext;
-    private Preference mPreference;
-    private DeleteSimProfilePreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscriptionInfo));
-        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(SUB_ID);
-        when(mSubscriptionInfo.isEmbedded()).thenReturn(true);
-
-        mPreference = new Preference(mContext);
-        mPreference.setKey(PREF_KEY);
-        when(mScreen.findPreference(PREF_KEY)).thenReturn(mPreference);
-
-        mController = new DeleteSimProfilePreferenceController(mContext, PREF_KEY);
-    }
-
-    @After
-    public void tearDown() {
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(null);
-    }
-
-    @Test
-    public void getAvailabilityStatus_noSubs_notAvailable() {
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(new ArrayList<>());
-        mController.init(SUB_ID, mFragment, REQUEST_CODE);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void getAvailabilityStatus_physicalSim_notAvailable() {
-        when(mSubscriptionInfo.isEmbedded()).thenReturn(false);
-        mController.init(SUB_ID, mFragment, REQUEST_CODE);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void getAvailabilityStatus_unknownSim_notAvailable() {
-        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(OTHER_ID);
-        mController.init(SUB_ID, mFragment, REQUEST_CODE);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void getAvailabilityStatus_knownEsim_isAvailable() {
-        mController.init(SUB_ID, mFragment, REQUEST_CODE);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void onPreferenceClick_startsIntent() {
-        mController.init(SUB_ID, mFragment, REQUEST_CODE);
-        mController.displayPreference(mScreen);
-        // turn off confirmation before click
-        Settings.Global.putInt(mContext.getContentResolver(),
-                ConfirmSimDeletionPreferenceController.KEY_CONFIRM_SIM_DELETION, 0);
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mFragment).startActivityForResult(intentCaptor.capture(), eq(REQUEST_CODE));
-        final Intent intent = intentCaptor.getValue();
-        assertThat(intent.getAction()).isEqualTo(
-                EuiccManager.ACTION_DELETE_SUBSCRIPTION_PRIVILEGED);
-        assertThat(intent.getIntExtra(EuiccManager.EXTRA_SUBSCRIPTION_ID,
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID)).isEqualTo(SUB_ID);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DisableSimFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DisableSimFooterPreferenceControllerTest.java
deleted file mode 100644
index fa48ba5..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/DisableSimFooterPreferenceControllerTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-
-import com.android.settings.network.SubscriptionUtil;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.Arrays;
-
-@RunWith(RobolectricTestRunner.class)
-public class DisableSimFooterPreferenceControllerTest {
-    private static final String PREF_KEY = "pref_key";
-    private static final int SUB_ID = 111;
-
-    @Mock
-    private SubscriptionInfo mInfo;
-
-    private Context mContext;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    private DisableSimFooterPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
-        when(mInfo.getSubscriptionId()).thenReturn(SUB_ID);
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mInfo));
-        mController = new DisableSimFooterPreferenceController(mContext, PREF_KEY);
-    }
-
-    @Test
-    public void isAvailable_noInit_notAvailable() {
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_eSIM_notAvailable() {
-        when(mInfo.isEmbedded()).thenReturn(true);
-        mController.init(SUB_ID);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_pSIM_available_cannot_disable_pSIM() {
-        when(mInfo.isEmbedded()).thenReturn(false);
-        mController.init(SUB_ID);
-        doReturn(false).when(mSubscriptionManager).canDisablePhysicalSubscription();
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_pSIM_available_can_disable_pSIM() {
-        when(mInfo.isEmbedded()).thenReturn(false);
-        mController.init(SUB_ID);
-        doReturn(true).when(mSubscriptionManager).canDisablePhysicalSubscription();
-        assertThat(mController.isAvailable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
deleted file mode 100644
index 38223b8..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.telephony.SubscriptionManager;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-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.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class DisabledSubscriptionControllerTest {
-
-    private static final String KEY = "disabled_subscription_category";
-    private static final int SUB_ID = 111;
-
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private PreferenceScreen mScreen;
-
-    private PreferenceCategory mCategory;
-    private Context mContext;
-    private Lifecycle mLifecycle;
-    private DisabledSubscriptionController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        LifecycleOwner lifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(lifecycleOwner);
-        doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
-        mCategory = new PreferenceCategory(mContext);
-        doReturn(mCategory).when(mScreen).findPreference(KEY);
-        mController = new DisabledSubscriptionController(mContext, KEY);
-        mController.init(mLifecycle, SUB_ID);
-    }
-
-    @Test
-    public void displayPreference_subscriptionEnabled_categoryIsVisible() {
-        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
-        mController.displayPreference(mScreen);
-        assertThat(mCategory.isVisible()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_subscriptionDisabled_categoryIsNotVisible() {
-        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
-        mController.displayPreference(mScreen);
-        assertThat(mCategory.isVisible()).isFalse();
-    }
-
-    @Test
-    public void onSubscriptionsChanged_subscriptionBecomesDisabled_categoryIsNotVisible() {
-        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
-        mController.displayPreference(mScreen);
-        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
-        mController.onSubscriptionsChanged();
-        assertThat(mCategory.isVisible()).isFalse();
-    }
-
-    @Test
-    public void onSubscriptionsChanged_subscriptionBecomesEnabled_categoryIsVisible() {
-        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
-        mController.displayPreference(mScreen);
-        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
-        mController.onSubscriptionsChanged();
-        assertThat(mCategory.isVisible()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
index e38bd62..ca36f1f 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceControllerTest.java
@@ -222,6 +222,28 @@
     }
 
     @Test
+    public void updateState_NrEnableBoolFalse_5gOptionHidden() {
+        mockEnabledNetworkMode(TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);
+        mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_NR_ENABLED_BOOL, false);
+
+        mController.init(mLifecycle, SUB_ID);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
+                TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getValue()).isEqualTo(
+                String.valueOf(
+                        TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA));
+        assertThat(mPreference.getEntryValues())
+                .asList()
+                .doesNotContain(
+                        String.valueOf(TelephonyManager.NETWORK_MODE_NR_LTE_GSM_WCDMA));
+    }
+
+    @Test
     public void updateState_GlobalDisAllowed5g_GlobalWithoutNR() {
         mockAccessFamily(TelephonyManager.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA);
         mockAllowedNetworkTypes(DISABLED_5G_NETWORK_TYPE);
@@ -341,43 +363,43 @@
 
     @Test
     public void checkResource_stringArrayLength() {
-        String[] entryValues = mContext.getResources().getStringArray(
+        String[] entryValues = mController.getResourcesForSubId().getStringArray(
                 R.array.enabled_networks_cdma_values);
         assertEquals(4, entryValues.length);
 
-        entryValues = mContext.getResources().getStringArray(
+        entryValues = mController.getResourcesForSubId().getStringArray(
                 R.array.enabled_networks_cdma_no_lte_values);
         assertEquals(2, entryValues.length);
 
-        entryValues = mContext.getResources().getStringArray(
+        entryValues = mController.getResourcesForSubId().getStringArray(
                 R.array.enabled_networks_cdma_only_lte_values);
         assertEquals(2, entryValues.length);
 
-        entryValues = mContext.getResources().getStringArray(
+        entryValues = mController.getResourcesForSubId().getStringArray(
                 R.array.enabled_networks_tdscdma_values);
         assertEquals(3, entryValues.length);
 
-        entryValues = mContext.getResources().getStringArray(
+        entryValues = mController.getResourcesForSubId().getStringArray(
                 R.array.enabled_networks_except_gsm_lte_values);
         assertEquals(1, entryValues.length);
 
-        entryValues = mContext.getResources().getStringArray(
+        entryValues = mController.getResourcesForSubId().getStringArray(
                 R.array.enabled_networks_except_gsm_values);
         assertEquals(2, entryValues.length);
 
-        entryValues = mContext.getResources().getStringArray(
+        entryValues = mController.getResourcesForSubId().getStringArray(
                 R.array.enabled_networks_except_lte_values);
         assertEquals(2, entryValues.length);
 
-        entryValues = mContext.getResources().getStringArray(
+        entryValues = mController.getResourcesForSubId().getStringArray(
                 R.array.enabled_networks_values);
         assertEquals(3, entryValues.length);
 
-        entryValues = mContext.getResources().getStringArray(
+        entryValues = mController.getResourcesForSubId().getStringArray(
                 R.array.enabled_networks_values);
         assertEquals(3, entryValues.length);
 
-        entryValues = mContext.getResources().getStringArray(
+        entryValues = mController.getResourcesForSubId().getStringArray(
                 R.array.preferred_network_mode_values_world_mode);
         assertEquals(3, entryValues.length);
     }
@@ -393,6 +415,11 @@
         } else if (networkMode == TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA_GSM_WCDMA) {
             mockPhoneType(TelephonyManager.PHONE_TYPE_GSM);
             mPersistableBundle.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, true);
+        } else if (networkMode
+                == TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA) {
+            mockPhoneType(TelephonyManager.PHONE_TYPE_GSM);
+            mPersistableBundle.putBoolean(CarrierConfigManager.KEY_PREFER_2G_BOOL, true);
+            mPersistableBundle.putBoolean(CarrierConfigManager.KEY_LTE_ENABLED_BOOL, true);
         }
     }
 
@@ -407,6 +434,6 @@
     }
 
     private void mockPhoneType(int phoneType) {
-        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        doReturn(phoneType).when(mTelephonyManager).getPhoneType();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
deleted file mode 100644
index 598f30a..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.os.PersistableBundle;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.telephony.ims.ProvisioningManager;
-
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settings.network.ims.MockVolteQueryImsState;
-import com.android.settingslib.RestrictedSwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class Enhanced4gBasePreferenceControllerTest {
-    private static final int SUB_ID = 2;
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private TelephonyManager mInvalidTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-    @Mock
-    private ProvisioningManager mProvisioningManager;
-
-    private MockVolteQueryImsState mQueryImsState;
-
-    private Enhanced4gLtePreferenceController mController;
-    private SwitchPreference mPreference;
-    private PersistableBundle mCarrierConfig;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
-        doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
-        doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
-        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-
-        mCarrierConfig = new PersistableBundle();
-        doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
-        mQueryImsState = spy(new MockVolteQueryImsState(mContext, SUB_ID));
-        mQueryImsState.setEnabledByPlatform(true);
-        mQueryImsState.setIsProvisionedOnDevice(true);
-        mQueryImsState.setIsTtyOnVolteEnabled(true);
-        mQueryImsState.setServiceStateReady(true);
-        mQueryImsState.setIsEnabledByUser(true);
-
-        mPreference = new RestrictedSwitchPreference(mContext);
-        mController = spy(new Enhanced4gLtePreferenceController(mContext, "VoLTE"));
-        mController.init(SUB_ID);
-        doReturn(mQueryImsState).when(mController).queryImsState(anyInt());
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void getAvailabilityStatus_default_returnUnavailable() {
-        mQueryImsState.setEnabledByPlatform(false);
-        mQueryImsState.setIsProvisionedOnDevice(false);
-
-        mController.init(SUB_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_volteDisabled_returnUnavailable() {
-        mQueryImsState.setEnabledByPlatform(false);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void updateState_configEnabled_prefEnabled() {
-        mQueryImsState.setIsEnabledByUser(true);
-        mPreference.setEnabled(false);
-        mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 1);
-        mController.mCallState = TelephonyManager.CALL_STATE_IDLE;
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void updateState_configOn_prefChecked() {
-        mQueryImsState.setIsEnabledByUser(true);
-        mPreference.setChecked(false);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java b/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
deleted file mode 100644
index 416e2f0..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
-import static android.app.slice.Slice.HINT_TITLE;
-import static android.app.slice.SliceItem.FORMAT_TEXT;
-
-import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.Intent;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.ims.ProvisioningManager;
-
-import androidx.slice.Slice;
-import androidx.slice.SliceItem;
-import androidx.slice.SliceMetadata;
-import androidx.slice.SliceProvider;
-import androidx.slice.core.SliceAction;
-import androidx.slice.core.SliceQuery;
-import androidx.slice.widget.SliceLiveData;
-
-import com.android.settings.R;
-import com.android.settings.network.ims.MockVolteQueryImsState;
-import com.android.settings.slices.CustomSliceRegistry;
-import com.android.settings.slices.SettingsSliceProvider;
-import com.android.settings.slices.SliceBroadcastReceiver;
-import com.android.settings.slices.SlicesFeatureProvider;
-import com.android.settings.testutils.FakeFeatureFactory;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.shadow.api.Shadow;
-import org.robolectric.shadows.ShadowSubscriptionManager;
-
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class Enhanced4gLteSliceHelperTest {
-    private static final int SUB_ID = 1;
-
-    @Mock
-    private CarrierConfigManager mMockCarrierConfigManager;
-
-    @Mock
-    private ProvisioningManager mProvisioningManager;
-
-    private ShadowSubscriptionManager mShadowSubscriptionManager;
-    private MockVolteQueryImsState mQueryImsState;
-
-    private Context mContext;
-    private FakeEnhanced4gLteSliceHelper mEnhanced4gLteSliceHelper;
-    private SettingsSliceProvider mProvider;
-    private SliceBroadcastReceiver mReceiver;
-    private FakeFeatureFactory mFeatureFactory;
-    private SlicesFeatureProvider mSlicesFeatureProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-
-        mShadowSubscriptionManager = Shadow.extract(mContext.getSystemService(
-                SubscriptionManager.class));
-        mShadowSubscriptionManager.setDefaultVoiceSubscriptionId(SUB_ID);
-
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
-        mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider();
-
-        //setup for SettingsSliceProvider tests
-        mProvider = spy(new SettingsSliceProvider());
-        doReturn(mContext).when(mProvider).getContext();
-        mProvider.onCreateSliceProvider();
-
-        //setup for SliceBroadcastReceiver test
-        mReceiver = spy(new SliceBroadcastReceiver());
-
-        mQueryImsState = spy(new MockVolteQueryImsState(mContext, SUB_ID));
-        mQueryImsState.setEnabledByPlatform(true);
-        mQueryImsState.setIsProvisionedOnDevice(true);
-        mQueryImsState.setIsTtyOnVolteEnabled(true);
-        mQueryImsState.setServiceStateReady(true);
-        mQueryImsState.setIsEnabledByUser(true);
-
-        mEnhanced4gLteSliceHelper = spy(new FakeEnhanced4gLteSliceHelper(mContext));
-        doReturn(mQueryImsState).when(mEnhanced4gLteSliceHelper).queryImsState(anyInt());
-
-        // Set-up specs for SliceMetadata.
-        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
-    }
-
-    @Test
-    public void test_CreateEnhanced4gLteSlice_invalidSubId() {
-        mQueryImsState.setEnabledByPlatform(false);
-        mQueryImsState.setIsProvisionedOnDevice(false);
-        mQueryImsState.setIsEnabledByUser(false);
-        mShadowSubscriptionManager.setDefaultVoiceSubscriptionId(-1);
-
-        final Slice slice = mEnhanced4gLteSliceHelper.createEnhanced4gLteSlice(
-                CustomSliceRegistry.ENHANCED_4G_SLICE_URI);
-
-        assertThat(slice).isNull();
-    }
-
-    @Test
-    public void test_CreateEnhanced4gLteSlice_enhanced4gLteNotSupported() {
-        mQueryImsState.setEnabledByPlatform(false);
-
-        final Slice slice = mEnhanced4gLteSliceHelper.createEnhanced4gLteSlice(
-                CustomSliceRegistry.ENHANCED_4G_SLICE_URI);
-
-        assertThat(mEnhanced4gLteSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
-        assertThat(slice).isNull();
-    }
-
-    @Test
-    public void test_CreateEnhanced4gLteSlice_success() {
-        mQueryImsState.setEnabledByPlatform(true);
-        mQueryImsState.setIsProvisionedOnDevice(true);
-        when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
-
-        final Slice slice = mEnhanced4gLteSliceHelper.createEnhanced4gLteSlice(
-                CustomSliceRegistry.ENHANCED_4G_SLICE_URI);
-
-        assertThat(mEnhanced4gLteSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
-        testEnhanced4gLteSettingsToggleSlice(slice);
-    }
-
-    @Test
-    public void test_SettingSliceProvider_getsRightSliceEnhanced4gLte() {
-        mQueryImsState.setEnabledByPlatform(true);
-        mQueryImsState.setIsProvisionedOnDevice(true);
-        when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
-        when(mSlicesFeatureProvider.getNewEnhanced4gLteSliceHelper(mContext))
-                .thenReturn(mEnhanced4gLteSliceHelper);
-
-        final Slice slice = mProvider.onBindSlice(CustomSliceRegistry.ENHANCED_4G_SLICE_URI);
-
-        assertThat(mEnhanced4gLteSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
-        testEnhanced4gLteSettingsToggleSlice(slice);
-    }
-
-    @Test
-    @Ignore
-    public void test_SliceBroadcastReceiver_toggleOffEnhanced4gLte() {
-        mQueryImsState.setEnabledByPlatform(true);
-        mQueryImsState.setIsProvisionedOnDevice(true);
-        mQueryImsState.setIsEnabledByUser(false);
-        when(mSlicesFeatureProvider.getNewEnhanced4gLteSliceHelper(mContext))
-                .thenReturn(mEnhanced4gLteSliceHelper);
-
-        final ArgumentCaptor<Boolean> mEnhanced4gLteSettingCaptor = ArgumentCaptor.forClass(
-                Boolean.class);
-
-        // turn on Enhanced4gLte setting
-        final Intent intent = new Intent(Enhanced4gLteSliceHelper.ACTION_ENHANCED_4G_LTE_CHANGED);
-        intent.putExtra(EXTRA_TOGGLE_STATE, true);
-
-        // change the setting
-        mReceiver.onReceive(mContext, intent);
-
-        verify(mEnhanced4gLteSliceHelper).setEnhanced4gLteModeSetting(anyInt(),
-                mEnhanced4gLteSettingCaptor.capture());
-
-        // assert the change
-        assertThat(mEnhanced4gLteSettingCaptor.getValue()).isTrue();
-    }
-
-    private void testEnhanced4gLteSettingsUnavailableSlice(Slice slice,
-            PendingIntent expectedPrimaryAction) {
-        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
-
-        //Check there is no toggle action
-        final List<SliceAction> toggles = metadata.getToggles();
-        assertThat(toggles).isEmpty();
-
-        // Check whether the primary action is to open Enhanced4gLte settings activity
-        final PendingIntent primaryPendingIntent =
-                metadata.getPrimaryAction().getAction();
-        assertThat(primaryPendingIntent).isEqualTo(expectedPrimaryAction);
-
-        // Check the title
-        final List<SliceItem> sliceItems = slice.getItems();
-        assertTitle(sliceItems, mContext.getString(R.string.enhanced_4g_lte_mode_title));
-    }
-
-    private void testEnhanced4gLteSettingsToggleSlice(Slice slice) {
-        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
-
-        final List<SliceAction> toggles = metadata.getToggles();
-        assertThat(toggles).hasSize(1);
-
-        final SliceAction mainToggleAction = toggles.get(0);
-
-        // Check intent in Toggle Action
-        final PendingIntent togglePendingIntent = mainToggleAction.getAction();
-        final PendingIntent expectedToggleIntent = getBroadcastIntent(
-                Enhanced4gLteSliceHelper.ACTION_ENHANCED_4G_LTE_CHANGED);
-        assertThat(togglePendingIntent).isEqualTo(expectedToggleIntent);
-
-        // Check primary intent
-        final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
-        final PendingIntent expectedPendingIntent =
-                getActivityIntent(Enhanced4gLteSliceHelper.ACTION_MOBILE_NETWORK_SETTINGS_ACTIVITY);
-        assertThat(primaryPendingIntent).isEqualTo(expectedPendingIntent);
-
-        // Check the title
-        final List<SliceItem> sliceItems = slice.getItems();
-        assertTitle(sliceItems, mContext.getString(R.string.enhanced_4g_lte_mode_title));
-    }
-
-    private PendingIntent getBroadcastIntent(String action) {
-        final Intent intent = new Intent(action);
-        intent.setClass(mContext, SliceBroadcastReceiver.class);
-        return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,
-                PendingIntent.FLAG_CANCEL_CURRENT);
-    }
-
-    private PendingIntent getActivityIntent(String action) {
-        final Intent intent = new Intent(action);
-        intent.setPackage(SETTINGS_PACKAGE_NAME);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent, 0 /* flags */);
-    }
-
-    private void assertTitle(List<SliceItem> sliceItems, String title) {
-        boolean hasTitle = false;
-        for (SliceItem item : sliceItems) {
-            final List<SliceItem> titleItems = SliceQuery.findAll(item, FORMAT_TEXT, HINT_TITLE,
-                    null /* non-hints */);
-            if (titleItems == null) {
-                continue;
-            }
-
-            hasTitle = true;
-            for (SliceItem subTitleItem : titleItems) {
-                assertThat(subTitleItem.getText()).isEqualTo(title);
-            }
-        }
-        assertThat(hasTitle).isTrue();
-    }
-
-    private class FakeEnhanced4gLteSliceHelper extends Enhanced4gLteSliceHelper {
-        int mSubId = SUB_ID;
-
-        FakeEnhanced4gLteSliceHelper(Context context) {
-            super(context);
-        }
-
-        @Override
-        protected CarrierConfigManager getCarrierConfigManager() {
-            return mMockCarrierConfigManager;
-        }
-
-        protected int getDefaultVoiceSubId() {
-            return mSubId;
-        }
-
-        private void setDefaultVoiceSubId(int id) {
-            mSubId = id;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
deleted file mode 100644
index bb60fd6..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.spy;
-import static org.robolectric.Shadows.shadowOf;
-
-import android.content.Context;
-import android.content.Intent;
-import android.telephony.TelephonyManager;
-import android.telephony.euicc.EuiccManager;
-
-import androidx.preference.Preference;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.shadows.ShadowTelephonyManager;
-
-@RunWith(AndroidJUnit4.class)
-public class EuiccPreferenceControllerTest {
-    private static final int SUB_ID = 2;
-
-    private TelephonyManager mTelephonyManager;
-    private ShadowTelephonyManager mShadowTelephonyManager;
-
-    private EuiccPreferenceController mController;
-    private Preference mPreference;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application.getBaseContext());
-
-        mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
-        mShadowTelephonyManager = shadowOf(mTelephonyManager);
-        mShadowTelephonyManager.setTelephonyManagerForSubscriptionId(SUB_ID, mTelephonyManager);
-
-        mPreference = new Preference(mContext);
-        mController = new EuiccPreferenceController(mContext, "euicc");
-        mController.init(SUB_ID);
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_startActivity() {
-        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
-        doNothing().when(mContext).startActivity(captor.capture());
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        assertThat(captor.getValue().getAction()).isEqualTo(
-                EuiccManager.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
deleted file mode 100644
index a612657..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.telephony.data.ApnSetting;
-
-import androidx.preference.SwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowSubscriptionManager;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowSubscriptionManager.class)
-public class MmsMessagePreferenceControllerTest {
-    private static final int SUB_ID = 2;
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-
-    private MmsMessagePreferenceController mController;
-    private SwitchPreference mPreference;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
-
-        mPreference = new SwitchPreference(mContext);
-        mController = new MmsMessagePreferenceController(mContext, "mms_message");
-        ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID);
-        mController.init(SUB_ID);
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void getAvailabilityStatus_invalidSubscription_returnUnavailable() {
-        mController.init(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_mobileDataOn_returnUnavailable() {
-        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
-
-        assertThat(mController.getAvailabilityStatus(SUB_ID)).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_meteredOff_returnUnavailable() {
-        when(mTelephonyManager.isApnMetered(ApnSetting.TYPE_MMS)).thenReturn(false);
-
-        assertThat(mController.getAvailabilityStatus(SUB_ID)).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_mobileDataOffWithValidSubId_returnAvailable() {
-        mController.init(SUB_ID);
-        when(mTelephonyManager.isDataEnabled()).thenReturn(false);
-        when(mTelephonyManager.isApnMetered(ApnSetting.TYPE_MMS)).thenReturn(true);
-
-        assertThat(mController.getAvailabilityStatus(SUB_ID)).isEqualTo(AVAILABLE);
-    }
-
-    @Test
-    public void isChecked_returnDataFromTelephonyManager() {
-        when(mTelephonyManager.isDataEnabledForApn(ApnSetting.TYPE_MMS)).thenReturn(false);
-        assertThat(mController.isChecked()).isFalse();
-
-        when(mTelephonyManager.isDataEnabledForApn(ApnSetting.TYPE_MMS)).thenReturn(true);
-        assertThat(mController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void setChecked_setDataIntoSubscriptionManager() {
-        mController.setChecked(true);
-        verify(mTelephonyManager).setAlwaysAllowMmsData(true);
-
-        mController.setChecked(false);
-        verify(mTelephonyManager).setAlwaysAllowMmsData(false);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
deleted file mode 100644
index 29f0f25..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowSubscriptionManager;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowSubscriptionManager.class)
-public class MobileDataPreferenceControllerTest {
-    private static final int SUB_ID = 2;
-    private static final int SUB_ID_OTHER = 3;
-
-    @Mock
-    private FragmentManager mFragmentManager;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private TelephonyManager mInvalidTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private SubscriptionInfo mSubscriptionInfo;
-    @Mock
-    private FragmentTransaction mFragmentTransaction;
-
-    private MobileDataPreferenceController mController;
-    private SwitchPreference mPreference;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
-        doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
-        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-        doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
-
-        mPreference = new SwitchPreference(mContext);
-        mController = new MobileDataPreferenceController(mContext, "mobile_data");
-        ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID);
-        mController.init(mFragmentManager, SUB_ID);
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void getAvailabilityStatus_invalidSubscription_returnAvailableUnsearchable() {
-        mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
-    }
-
-    @Test
-    public void isDialogNeeded_disableSingleSim_returnFalse() {
-        doReturn(true).when(mTelephonyManager).isDataEnabled();
-        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
-        doReturn(1).when(mTelephonyManager).getActiveModemCount();
-
-        assertThat(mController.isDialogNeeded()).isFalse();
-    }
-
-    @Test
-    public void isDialogNeeded_enableNonDefaultSimInMultiSimMode_returnTrue() {
-        doReturn(false).when(mTelephonyManager).isDataEnabled();
-        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
-        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID_OTHER);
-        ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_OTHER);
-        doReturn(2).when(mTelephonyManager).getActiveModemCount();
-
-        assertThat(mController.isDialogNeeded()).isTrue();
-        assertThat(mController.mDialogType).isEqualTo(
-                MobileDataDialogFragment.TYPE_MULTI_SIM_DIALOG);
-    }
-
-    @Test
-    public void handlePreferenceTreeClick_needDialog_showDialog() {
-        mController.mNeedDialog = true;
-
-        mController.handlePreferenceTreeClick(mPreference);
-
-        verify(mFragmentManager).beginTransaction();
-    }
-
-    @Test
-    public void onPreferenceChange_singleSim_On_shouldEnableData() {
-        doReturn(true).when(mTelephonyManager).isDataEnabled();
-        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
-        doReturn(1).when(mTelephonyManager).getActiveModemCount();
-
-        mController.onPreferenceChange(mPreference, true);
-
-        verify(mTelephonyManager).setDataEnabled(true);
-    }
-
-    @Test
-    public void onPreferenceChange_multiSim_On_shouldEnableData() {
-        doReturn(true).when(mTelephonyManager).isDataEnabled();
-        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
-        doReturn(2).when(mTelephonyManager).getActiveModemCount();
-
-        mController.onPreferenceChange(mPreference, true);
-
-        verify(mTelephonyManager).setDataEnabled(true);
-    }
-
-    @Test
-    public void isChecked_returnUserDataEnabled() {
-        mController.init(mFragmentManager, SUB_ID);
-        assertThat(mController.isChecked()).isFalse();
-
-        doReturn(true).when(mTelephonyManager).isDataEnabled();
-        assertThat(mController.isChecked()).isTrue();
-    }
-
-    @Test
-    public void updateState_opportunistic_disabled() {
-        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
-        mController.init(mFragmentManager, SUB_ID);
-        doReturn(true).when(mSubscriptionInfo).isOpportunistic();
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getString(R.string.mobile_data_settings_summary_auto_switch));
-    }
-
-    @Test
-    public void updateState_notOpportunistic_enabled() {
-        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
-        mController.init(mFragmentManager, SUB_ID);
-        doReturn(false).when(mSubscriptionInfo).isOpportunistic();
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getString(R.string.mobile_data_settings_summary));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
index c69f2ed..459d77e 100644
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
+++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java
@@ -44,6 +44,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -135,6 +136,7 @@
     }
 
     @Test
+    @Ignore
     public void updateBottomNavigationView_oneSubscription_shouldNotCrash() {
         mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo1);
 
@@ -144,6 +146,7 @@
     }
 
     @Test
+    @Ignore
     public void updateBottomNavigationView_twoSubscription_shouldNotCrash() {
         mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo1, mSubscriptionInfo2);
 
@@ -153,6 +156,7 @@
     }
 
     @Test
+    @Ignore
     public void switchFragment_switchBetweenTwoSubscriptions() {
         mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo1, mSubscriptionInfo2);
 
@@ -169,6 +173,7 @@
     }
 
     @Test
+    @Ignore
     public void switchFragment_subscriptionsUpdate_notifyByIntent() {
         mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo1, mSubscriptionInfo2);
 
@@ -197,6 +202,7 @@
     }
 
     @Test
+    @Ignore
     public void onSaveInstanceState_saveCurrentSubId() {
         mSubscriptionManager.setActiveSubscriptionInfos(mSubscriptionInfo1, mSubscriptionInfo2);
 
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java
deleted file mode 100644
index ba839c6..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-
-import com.android.settings.R;
-import com.android.settings.network.SubscriptionUtil;
-import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.widget.LayoutPreference;
-
-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.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.Arrays;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.PreferenceScreen;
-
-@RunWith(RobolectricTestRunner.class)
-public class MobileNetworkSwitchControllerTest {
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private LayoutPreference mLayoutPreference;
-    @Mock
-    private SubscriptionInfo mSubscription;
-
-    private Context mContext;
-    private LifecycleOwner mLifecycleOwner;
-    private Lifecycle mLifecycle;
-    private MobileNetworkSwitchController mController;
-    private SwitchBar mSwitchBar;
-    private int mSubId = 123;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))
-                .thenReturn(true);
-
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-
-        when(mSubscription.isEmbedded()).thenReturn(true);
-        when(mSubscription.getSubscriptionId()).thenReturn(mSubId);
-        // Most tests want to have 2 available subscriptions so that the switch bar will show.
-        final SubscriptionInfo sub2 = mock(SubscriptionInfo.class);
-        when(sub2.getSubscriptionId()).thenReturn(456);
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription, sub2));
-
-        final String key = "prefKey";
-        mController = new MobileNetworkSwitchController(mContext, key);
-        mController.init(mLifecycle, mSubscription.getSubscriptionId());
-
-        mSwitchBar = new SwitchBar(mContext);
-        when(mScreen.findPreference(key)).thenReturn(mLayoutPreference);
-        when(mLayoutPreference.findViewById(R.id.switch_bar)).thenReturn(mSwitchBar);
-    }
-
-    @After
-    public void cleanUp() {
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(null);
-    }
-
-    @Test
-    public void isAvailable_pSIM_isNotAvailable() {
-        when(mSubscription.isEmbedded()).thenReturn(false);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isFalse();
-
-        when(mSubscriptionManager.canDisablePhysicalSubscription()).thenReturn(true);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_oneEnabledSubscription_switchBarNotHidden() {
-        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(mSubId);
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_oneDisabledSubscription_switchBarNotHidden() {
-        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(mSubId);
-        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_subscriptionEnabled_switchIsOn() {
-        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-        assertThat(mSwitchBar.isChecked()).isTrue();
-    }
-
-    @Test
-    public void displayPreference_subscriptionDisabled_switchIsOff() {
-        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-        assertThat(mSwitchBar.isChecked()).isFalse();
-    }
-
-    @Test
-    public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledCalledCorrectly() {
-        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-        assertThat(mSwitchBar.isChecked()).isTrue();
-        mSwitchBar.setChecked(false);
-        verify(mSubscriptionManager).setSubscriptionEnabled(eq(mSubId), eq(false));
-    }
-
-    @Test
-    public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledFailed() {
-        when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))
-                .thenReturn(false);
-        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-        assertThat(mSwitchBar.isChecked()).isTrue();
-        mSwitchBar.setChecked(false);
-        verify(mSubscriptionManager).setSubscriptionEnabled(eq(mSubId), eq(false));
-        assertThat(mSwitchBar.isChecked()).isTrue();
-    }
-
-    @Test
-    public void switchChangeListener_fromDisabledToEnabled_setSubscriptionEnabledCalledCorrectly() {
-        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
-        mController.displayPreference(mScreen);
-        assertThat(mSwitchBar.isShowing()).isTrue();
-        assertThat(mSwitchBar.isChecked()).isFalse();
-        mSwitchBar.setChecked(true);
-        verify(mSubscriptionManager).setSubscriptionEnabled(eq(mSubId), eq(true));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
deleted file mode 100644
index bbb8aac..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.nullable;
-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.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.PersistableBundle;
-import android.provider.Settings;
-import android.telecom.PhoneAccountHandle;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-@RunWith(RobolectricTestRunner.class)
-public class MobileNetworkUtilsTest {
-    private static final String PACKAGE_NAME = "com.android.app";
-    private static final int SUB_ID_1 = 1;
-    private static final int SUB_ID_2 = 2;
-    private static final int SUB_ID_INVALID = -1;
-    private static final String PLMN_FROM_TELEPHONY_MANAGER_API = "testPlmn";
-    private static final String PLMN_FROM_SUB_ID_1 = "testPlmnSub1";
-    private static final String PLMN_FROM_SUB_ID_2 = "testPlmnSub2";
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private TelephonyManager mTelephonyManager2;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private SubscriptionInfo mSubscriptionInfo1;
-    @Mock
-    private SubscriptionInfo mSubscriptionInfo2;
-    @Mock
-    private PackageManager mPackageManager;
-    @Mock
-    private PhoneAccountHandle mPhoneAccountHandle;
-    @Mock
-    private ComponentName mComponentName;
-    @Mock
-    private ResolveInfo mResolveInfo;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-
-    private Context mContext;
-    private PersistableBundle mCarrierConfig;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mTelephonyManager.createForSubscriptionId(SUB_ID_1)).thenReturn(mTelephonyManager);
-        when(mTelephonyManager.createForSubscriptionId(SUB_ID_2)).thenReturn(mTelephonyManager2);
-        when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        when(mPhoneAccountHandle.getComponentName()).thenReturn(mComponentName);
-        when(mComponentName.getPackageName()).thenReturn(PACKAGE_NAME);
-        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
-                mCarrierConfigManager);
-
-        mCarrierConfig = new PersistableBundle();
-        when(mCarrierConfigManager.getConfigForSubId(SUB_ID_1)).thenReturn(mCarrierConfig);
-
-        when(mSubscriptionInfo1.getSubscriptionId()).thenReturn(SUB_ID_1);
-        when(mSubscriptionInfo1.getCarrierName()).thenReturn(PLMN_FROM_SUB_ID_1);
-        when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(SUB_ID_2);
-        when(mSubscriptionInfo2.getCarrierName()).thenReturn(PLMN_FROM_SUB_ID_2);
-
-        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
-                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
-        when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
-                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
-
-        when(mTelephonyManager.getNetworkOperatorName()).thenReturn(
-                PLMN_FROM_TELEPHONY_MANAGER_API);
-    }
-
-    @Test
-    public void setMobileDataEnabled_setEnabled_enabled() {
-        MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_1, true, false);
-
-        verify(mTelephonyManager).setDataEnabled(true);
-        verify(mTelephonyManager2, never()).setDataEnabled(anyBoolean());
-    }
-
-    @Test
-    public void setMobileDataEnabled_setDisabled_disabled() {
-        MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_2, true, false);
-
-        verify(mTelephonyManager2).setDataEnabled(true);
-        verify(mTelephonyManager, never()).setDataEnabled(anyBoolean());
-    }
-
-    @Test
-    public void setMobileDataEnabled_disableOtherSubscriptions() {
-        MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_1, true, true);
-
-        verify(mTelephonyManager).setDataEnabled(true);
-        verify(mTelephonyManager2).setDataEnabled(false);
-    }
-
-    @Test
-    public void buildConfigureIntent_nullHandle_returnNull() {
-        assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext, null)).isNull();
-    }
-
-    @Test
-    public void buildConfigureIntent_noActivityHandleIntent_returnNull() {
-        when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
-                .thenReturn(new ArrayList<>());
-
-        assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
-                mPhoneAccountHandle)).isNull();
-    }
-
-    @Test
-    public void buildConfigureIntent_hasActivityHandleIntent_returnIntent() {
-        when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
-                .thenReturn(Arrays.asList(mResolveInfo));
-
-        assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
-                mPhoneAccountHandle)).isNotNull();
-    }
-
-    @Test
-    public void isCdmaOptions_phoneTypeCdma_returnTrue() {
-        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
-
-        assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
-    }
-
-    @Test
-    public void isCdmaOptions_worldModeWithGsmWcdma_returnTrue() {
-        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
-
-        Settings.Global.putInt(mContext.getContentResolver(),
-                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
-
-        assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
-    }
-
-    @Test
-    public void isCdmaOptions_carrierWorldModeWithoutHideCarrier_returnTrue() {
-        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
-                false);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL, true);
-
-        assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
-    }
-
-    @Test
-    public void getSearchableSubscriptionId_oneActive_returnValid() {
-        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
-                Arrays.asList(mSubscriptionInfo1));
-        assertThat(MobileNetworkUtils.getSearchableSubscriptionId(mContext)).isEqualTo(SUB_ID_1);
-    }
-
-    @Test
-    public void getSearchableSubscriptionId_nonActive_returnInvalid() {
-        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(new ArrayList<>());
-
-        assertThat(MobileNetworkUtils.getSearchableSubscriptionId(mContext))
-                .isEqualTo(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-    }
-
-    @Test
-    public void shouldDisplayNetworkSelectOptions_HideCarrierNetwork_returnFalse() {
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
-                true);
-
-        assertThat(MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext, SUB_ID_1))
-                .isFalse();
-    }
-
-    @Test
-    public void shouldDisplayNetworkSelectOptions_allCheckPass_returnTrue() {
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
-                false);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL, false);
-        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
-
-        assertThat(MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext, SUB_ID_1))
-                .isTrue();
-    }
-
-    @Test
-    public void shouldSpeciallyUpdateGsmCdma_notWorldMode_returnFalse() {
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, false);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
-
-        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isFalse();
-    }
-
-    @Test
-    public void shouldSpeciallyUpdateGsmCdma_supportTdscdma_returnFalse() {
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, true);
-
-        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isFalse();
-    }
-
-    @Test
-    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaGsm_returnTrue() {
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
-
-        Settings.Global.putInt(mContext.getContentResolver(),
-                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM);
-        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
-    }
-
-    @Test
-    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaGsmWcdma_returnTrue() {
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
-
-        Settings.Global.putInt(mContext.getContentResolver(),
-                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA);
-        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
-    }
-
-    @Test
-    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdma_returnTrue() {
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
-
-        Settings.Global.putInt(mContext.getContentResolver(),
-                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
-        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
-    }
-
-    @Test
-    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaWcdma_returnTrue() {
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
-
-        Settings.Global.putInt(mContext.getContentResolver(),
-                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA);
-        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
-    }
-
-    @Test
-    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaCdmaEvdoGsmWcdma_returnTrue() {
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
-
-        Settings.Global.putInt(mContext.getContentResolver(),
-                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
-        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
-    }
-
-    @Test
-    public void shouldSpeciallyUpdateGsmCdma_ModeLteCdmaEvdoGsmWcdma_returnTrue() {
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
-
-        Settings.Global.putInt(mContext.getContentResolver(),
-                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
-        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
-    }
-
-    @Test
-    public void getCurrentCarrierNameForDisplay_withoutValidSubId_returnNetworkOperatorName() {
-        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
-                mContext, SUB_ID_INVALID)).isEqualTo(PLMN_FROM_TELEPHONY_MANAGER_API);
-    }
-
-    @Test
-    public void getCurrentCarrierNameForDisplay_withValidSubId_returnCurrentCarrierName() {
-        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
-                mContext, SUB_ID_1)).isEqualTo(PLMN_FROM_SUB_ID_1);
-        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
-                mContext, SUB_ID_2)).isEqualTo(PLMN_FROM_SUB_ID_2);
-    }
-
-    @Test
-    public void getCurrentCarrierNameForDisplay_withoutSubId_returnNotNull() {
-        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
-                mContext)).isNotNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceControllerTest.java
deleted file mode 100644
index b4e8a25..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceControllerTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class NrDisabledInDsdsFooterPreferenceControllerTest {
-    private static final String PREF_KEY = "pref_key";
-    private static final int SUB_ID = 111;
-
-    private Context mContext;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    private NrDisabledInDsdsFooterPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
-        doReturn(mSubscriptionManager).when(mContext).getSystemService(
-                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(anyInt());
-        mController = new NrDisabledInDsdsFooterPreferenceController(mContext, PREF_KEY);
-    }
-
-    @Test
-    public void isAvailable_noInit_notAvailable() {
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    @Ignore
-    public void isAvailable_dataOnAndDsdsAnd5GSupported_Available() {
-        when(mTelephonyManager.getSupportedRadioAccessFamily())
-                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
-        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1, 2});
-        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
-        mController.init(SUB_ID);
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_5gNotSupported_notAvailable() {
-        when(mTelephonyManager.getSupportedRadioAccessFamily())
-                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_LTE);
-        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1, 2});
-        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
-        mController.init(SUB_ID);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_mobileDataOff_notAvailable() {
-        when(mTelephonyManager.getSupportedRadioAccessFamily())
-                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
-        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1, 2});
-        when(mTelephonyManager.isDataEnabled()).thenReturn(false);
-        mController.init(SUB_ID);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_singleSimMode_notAvailable() {
-        when(mTelephonyManager.getSupportedRadioAccessFamily())
-                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
-        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1});
-        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
-        mController.init(SUB_ID);
-        assertThat(mController.isAvailable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
deleted file mode 100644
index 1feb08b..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-import static com.android.settings.network.telephony.MobileNetworkUtils.getRafFromNetworkType;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.PersistableBundle;
-import android.provider.Settings;
-import android.telephony.CarrierConfigManager;
-import android.telephony.ServiceState;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.preference.ListPreference;
-
-import com.android.settings.R;
-import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class PreferredNetworkModePreferenceControllerTest {
-    private static final int SUB_ID = 2;
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private TelephonyManager mInvalidTelephonyManager;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-    @Mock
-    private ServiceState mServiceState;
-
-    private PersistableBundle mPersistableBundle;
-    private PreferredNetworkModePreferenceController mController;
-    private ListPreference mPreference;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
-        doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
-        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-        doReturn(mServiceState).when(mTelephonyManager).getServiceState();
-        mPersistableBundle = new PersistableBundle();
-        doReturn(mPersistableBundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-
-        mPreference = new ListPreference(mContext);
-        mPreference.setEntries(R.array.preferred_network_mode_choices);
-        mPreference.setEntryValues(R.array.preferred_network_mode_values);
-        mController = new PreferredNetworkModePreferenceController(mContext, "mobile_data");
-        mController.init(SUB_ID);
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {
-        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
-                true);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_worldPhone_returnAvailable() {
-        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
-                false);
-        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL, true);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_hidePreferredNetworkType_returnUnavailable() {
-        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL,
-                true);
-
-        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
-        when(mServiceState.getDataRegistrationState()).thenReturn(
-                ServiceState.STATE_OUT_OF_SERVICE);
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-
-        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
-        when(mServiceState.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE);
-
-        when(mServiceState.getRoaming()).thenReturn(false);
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-
-        when(mServiceState.getRoaming()).thenReturn(true);
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void updateState_updateByNetworkMode() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
-                TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getValue()).isEqualTo(
-                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
-        assertThat(mPreference.getSummary()).isEqualTo(
-                mContext.getString(R.string.preferred_network_mode_tdscdma_gsm_wcdma_summary));
-    }
-
-    @Test
-    public void onPreferenceChange_updateSuccess() {
-        doReturn(true).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
-                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
-
-        mController.onPreferenceChange(mPreference,
-                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
-
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isEqualTo(
-                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
-    }
-
-    @Test
-    public void onPreferenceChange_updateFail() {
-        doReturn(false).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
-                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
-
-        mController.onPreferenceChange(mPreference,
-                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
-
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo(
-                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java
deleted file mode 100644
index 092b9b7..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.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.os.PersistableBundle;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-
-import com.android.settings.core.BasePreferenceController;
-import com.android.settingslib.RestrictedSwitchPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class RoamingPreferenceControllerTest {
-    private static final int SUB_ID = 2;
-
-    @Mock
-    private FragmentManager mFragmentManager;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private TelephonyManager mInvalidTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private FragmentTransaction mFragmentTransaction;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-
-    private RoamingPreferenceController mController;
-    private RestrictedSwitchPreference mPreference;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
-        doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
-        doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
-        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-        doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
-
-        mPreference = spy(new RestrictedSwitchPreference(mContext));
-        mController = spy(new RoamingPreferenceController(mContext, "roaming"));
-        mController.init(mFragmentManager, SUB_ID);
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void getAvailabilityStatus_validSubId_returnAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_invalidSubId_returnUnsearchable() {
-        mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(
-                BasePreferenceController.AVAILABLE_UNSEARCHABLE);
-    }
-
-    @Test
-    public void isDialogNeeded_roamingDisabledWithoutFlag_returnTrue() {
-        final PersistableBundle bundle = new PersistableBundle();
-        bundle.putBoolean(CarrierConfigManager.KEY_DISABLE_CHARGE_INDICATION_BOOL, false);
-        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
-        doReturn(false).when(mTelephonyManager).isDataRoamingEnabled();
-
-        assertThat(mController.isDialogNeeded()).isTrue();
-    }
-
-    @Test
-    public void isDialogNeeded_roamingEnabled_returnFalse() {
-        doReturn(true).when(mTelephonyManager).isDataRoamingEnabled();
-
-        assertThat(mController.isDialogNeeded()).isFalse();
-    }
-
-    @Test
-    public void setChecked_needDialog_showDialog() {
-        doReturn(true).when(mController).isDialogNeeded();
-
-        mController.setChecked(true);
-
-        verify(mFragmentManager).beginTransaction();
-    }
-
-    @Test
-    public void updateState_invalidSubId_disabled() {
-        mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void updateState_validSubId_enabled() {
-        doReturn(true).when(mTelephonyManager).isDataRoamingEnabled();
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(mPreference.isChecked()).isTrue();
-    }
-
-    @Test
-    public void updateState_isNotDisabledByAdmin_shouldInvokeSetEnabled() {
-        when(mPreference.isDisabledByAdmin()).thenReturn(false);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference).setEnabled(anyBoolean());
-    }
-
-    @Test
-    public void updateState_isDisabledByAdmin_shouldNotInvokeSetEnabled() {
-        when(mPreference.isDisabledByAdmin()).thenReturn(true);
-
-        mController.updateState(mPreference);
-
-        verify(mPreference, never()).setEnabled(anyBoolean());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java
deleted file mode 100644
index 6ba2ffa..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.Arrays;
-
-@RunWith(RobolectricTestRunner.class)
-public class TelephonyBasePreferenceControllerTest {
-    private static final int VALID_SUB_ID = 1;
-
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private SubscriptionInfo mSubscriptionInfo;
-
-    private TestPreferenceController mPreferenceController;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getSystemService(SubscriptionManager.class))
-                .thenReturn(mSubscriptionManager);
-        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(VALID_SUB_ID);
-        mPreferenceController = new TestPreferenceController(mContext, "prefKey");
-    }
-
-    @Test
-    public void isAvailable_validSubIdSet_returnTrue() {
-        mPreferenceController.init(VALID_SUB_ID);
-
-        assertThat(mPreferenceController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_noIdSetHoweverHasDefaultOne_returnTrue() {
-        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
-                Arrays.asList(mSubscriptionInfo));
-
-        assertThat(mPreferenceController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_noDefaultAndNoSet_returnFalse() {
-        assertThat(mPreferenceController.isAvailable()).isFalse();
-    }
-
-    /**
-     * Test preference controller for {@link TelephonyBasePreferenceController}
-     */
-    public class TestPreferenceController extends TelephonyBasePreferenceController {
-        public TestPreferenceController(Context context, String prefKey) {
-            super(context, prefKey);
-        }
-
-        public void init(int subId) {
-            mSubId = subId;
-        }
-
-        @Override
-        public int getAvailabilityStatus(int subId) {
-            return subId == VALID_SUB_ID ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java
deleted file mode 100644
index 7542512..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class TelephonyTogglePreferenceControllerTest {
-
-    private Context mContext;
-    private FakeTelephonyToggle mFakeTelephonyToggle;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mFakeTelephonyToggle = new FakeTelephonyToggle(mContext, "key");
-    }
-
-    @Test
-    public void isSliceable_byDefault_shouldReturnFalse() {
-        assertThat(mFakeTelephonyToggle.isSliceable()).isFalse();
-    }
-
-    private static class FakeTelephonyToggle extends TelephonyTogglePreferenceController {
-
-        private FakeTelephonyToggle(Context context, String preferenceKey) {
-            super(context, preferenceKey);
-        }
-
-        @Override
-        public boolean isChecked() {
-            return false;
-        }
-
-        @Override
-        public boolean setChecked(boolean isChecked) {
-            return false;
-        }
-
-        @Override
-        public int getAvailabilityStatus(int subId) {
-            return 0;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java
deleted file mode 100644
index 40329a5..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony.cdma;
-
-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 android.content.Context;
-import android.telephony.TelephonyManager;
-
-import androidx.preference.PreferenceManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class CdmaListPreferenceTest {
-    private static final int SUB_ID = 2;
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private PreferenceManager mPreferenceManager;
-
-    private CdmaListPreference mPreference;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
-
-        mPreference = spy(new CdmaListPreference(mContext, null));
-        mPreference.setSubId(SUB_ID);
-    }
-
-    @Test
-    public void onClick_inEcm_doNothing() {
-        doReturn(true).when(mTelephonyManager).getEmergencyCallbackMode();
-
-        mPreference.onClick();
-
-        verify(mPreferenceManager, never()).showDialog(mPreference);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
deleted file mode 100644
index bcc82ba..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony.cdma;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.PersistableBundle;
-import android.os.SystemProperties;
-import android.provider.Settings;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class CdmaSubscriptionPreferenceControllerTest {
-    private static final int SUB_ID = 2;
-
-    @Mock
-    private PreferenceManager mPreferenceManager;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private TelephonyManager mInvalidTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-
-    private CdmaSubscriptionPreferenceController mController;
-    private ListPreference mPreference;
-    private PersistableBundle mCarrierConfig;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
-        doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
-        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-        doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
-
-        mCarrierConfig = new PersistableBundle();
-        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
-
-        mPreference = new ListPreference(mContext);
-        mController = new CdmaSubscriptionPreferenceController(mContext, "mobile_data");
-        mController.init(mPreferenceManager, SUB_ID);
-        mController.mPreference = mPreference;
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void onPreferenceChange_selectNV_returnNVMode() {
-        doReturn(true).when(mTelephonyManager).setCdmaSubscriptionMode(anyInt());
-
-        mController.onPreferenceChange(mPreference, Integer.toString(
-                TelephonyManager.CDMA_SUBSCRIPTION_NV));
-
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.CDMA_SUBSCRIPTION_MODE,
-                TelephonyManager.CDMA_SUBSCRIPTION_RUIM_SIM)).isEqualTo(
-                        TelephonyManager.CDMA_SUBSCRIPTION_NV);
-    }
-
-    @Test
-    public void updateState_stateRUIM_displayRUIM() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.CDMA_SUBSCRIPTION_MODE, TelephonyManager.CDMA_SUBSCRIPTION_NV);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getValue()).isEqualTo(Integer.toString(
-                TelephonyManager.CDMA_SUBSCRIPTION_NV));
-    }
-
-    @Test
-    public void updateState_stateUnknown_doNothing() {
-        mPreference.setValue(Integer.toString(TelephonyManager.CDMA_SUBSCRIPTION_NV));
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.CDMA_SUBSCRIPTION_MODE, TelephonyManager.CDMA_SUBSCRIPTION_UNKNOWN);
-
-        mController.updateState(mPreference);
-
-        // Still NV mode
-        assertThat(mPreference.getValue()).isEqualTo(Integer.toString(
-                TelephonyManager.CDMA_SUBSCRIPTION_NV));
-    }
-
-    @Test
-    public void deviceSupportsNvAndRuim() {
-        SystemProperties.set("ril.subscription.types", "NV,RUIM");
-        assertThat(mController.deviceSupportsNvAndRuim()).isTrue();
-
-        SystemProperties.set("ril.subscription.types", "");
-
-        assertThat(mController.deviceSupportsNvAndRuim()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
deleted file mode 100644
index 1a7fd86..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony.cdma;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.os.PersistableBundle;
-import android.provider.Settings;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.preference.ListPreference;
-import androidx.preference.PreferenceManager;
-
-import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class CdmaSystemSelectPreferenceControllerTest {
-    private static final int SUB_ID = 2;
-
-    @Mock
-    private PreferenceManager mPreferenceManager;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private TelephonyManager mInvalidTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-
-    private CdmaSystemSelectPreferenceController mController;
-    private ListPreference mPreference;
-    private PersistableBundle mCarrierConfig;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
-        doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
-        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
-        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
-                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
-
-        doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
-
-        mCarrierConfig = new PersistableBundle();
-        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
-
-
-        mPreference = new ListPreference(mContext);
-        mController = new CdmaSystemSelectPreferenceController(mContext, "mobile_data");
-        mController.init(mPreferenceManager, SUB_ID);
-        mController.mPreference = mPreference;
-        mPreference.setKey(mController.getPreferenceKey());
-    }
-
-    @Test
-    public void onPreferenceChange_selectHome_returnHomeMode() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.CDMA_ROAMING_MODE,
-                TelephonyManager.CDMA_ROAMING_MODE_ANY);
-        doReturn(true).when(mTelephonyManager).setCdmaRoamingMode(anyInt());
-
-        mController.onPreferenceChange(mPreference,
-                Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));
-
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.CDMA_ROAMING_MODE,
-                TelephonyManager.CDMA_ROAMING_MODE_ANY)).isEqualTo(
-                TelephonyManager.CDMA_ROAMING_MODE_HOME);
-    }
-
-    @Test
-    public void updateState_stateHome_displayHome() {
-        doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
-                mTelephonyManager).getCdmaRoamingMode();
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getValue()).isEqualTo(
-                Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));
-    }
-
-    @Test
-    public void updateState_LteGSMWcdma_disabled() {
-        doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
-                mTelephonyManager).getCdmaRoamingMode();
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
-                TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void updateState_stateOther_resetToDefault() {
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.CDMA_ROAMING_MODE,
-                TelephonyManager.CDMA_ROAMING_MODE_HOME);
-        doReturn(TelephonyManager.CDMA_ROAMING_MODE_AFFILIATED).when(
-                mTelephonyManager).getCdmaRoamingMode();
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getValue()).isEqualTo(
-                Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_ANY));
-        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.CDMA_ROAMING_MODE,
-                TelephonyManager.CDMA_ROAMING_MODE_HOME)).isEqualTo(
-                TelephonyManager.CDMA_ROAMING_MODE_ANY);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
deleted file mode 100644
index d1a794d..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony.gsm;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.ProgressDialog;
-import android.content.Context;
-import android.os.PersistableBundle;
-import android.telephony.CarrierConfigManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.SwitchPreference;
-
-import com.android.settings.R;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-
-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.Robolectric;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class AutoSelectPreferenceControllerTest {
-    private static final int SUB_ID = 2;
-    private static final String OPERATOR_NAME = "T-mobile";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-    @Mock
-    private ProgressDialog mProgressDialog;
-
-    private PersistableBundle mCarrierConfig;
-    private AutoSelectPreferenceController mController;
-    private SwitchPreference mSwitchPreference;
-    private Context mContext;
-    private LifecycleOwner mLifecycleOwner;
-    private Lifecycle mLifecycle;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
-                mCarrierConfigManager);
-        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
-
-        mCarrierConfig = new PersistableBundle();
-        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_ONLY_AUTO_SELECT_IN_HOME_NETWORK_BOOL,
-                true);
-        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
-
-        mSwitchPreference = new SwitchPreference(mContext);
-        mController = new AutoSelectPreferenceController(mContext, "auto_select");
-        mController.mProgressDialog = mProgressDialog;
-        mController.mSwitchPreference = mSwitchPreference;
-        mController.init(mLifecycle, SUB_ID);
-    }
-
-    @Test
-    public void setChecked_isChecked_showProgressDialog() {
-        when(mTelephonyManager.getNetworkSelectionMode()).thenReturn(
-                TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
-
-        assertThat(mController.setChecked(true)).isFalse();
-        Robolectric.flushBackgroundThreadScheduler();
-
-        verify(mProgressDialog).show();
-        verify(mTelephonyManager).setNetworkSelectionModeAutomatic();
-    }
-
-    @Test
-    public void updateState_isRoaming_enabled() {
-        when(mTelephonyManager.getServiceState().getRoaming()).thenReturn(true);
-
-        mController.updateState(mSwitchPreference);
-
-        assertThat(mSwitchPreference.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void updateState_notRoamingWithAutoSelectOn_disabled() {
-        when(mTelephonyManager.getServiceState().getRoaming()).thenReturn(false);
-        doReturn(OPERATOR_NAME).when(mTelephonyManager).getSimOperatorName();
-
-        mController.updateState(mSwitchPreference);
-
-        assertThat(mSwitchPreference.isEnabled()).isFalse();
-        assertThat(mSwitchPreference.getSummary()).isEqualTo(
-                mContext.getString(R.string.manual_mode_disallowed_summary,
-                        mTelephonyManager.getSimOperatorName()));
-    }
-
-    @Test
-    public void init_carrierConfigNull_shouldNotCrash() {
-        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(null);
-
-        // Should not crash
-        mController.init(mLifecycle, SUB_ID);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
deleted file mode 100644
index 60de5aa..0000000
--- a/tests/robotests/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network.telephony.gsm;
-
-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.os.PersistableBundle;
-import android.telephony.CarrierConfigManager;
-import android.telephony.ServiceState;
-import android.telephony.SubscriptionInfo;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-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.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.Arrays;
-
-@RunWith(RobolectricTestRunner.class)
-public class OpenNetworkSelectPagePreferenceControllerTest {
-    private static final int SUB_ID = 2;
-    private static final String OPERATOR_NAME = "T-mobile";
-
-    @Mock
-    private TelephonyManager mTelephonyManager;
-    @Mock
-    private SubscriptionManager mSubscriptionManager;
-    @Mock
-    private CarrierConfigManager mCarrierConfigManager;
-    @Mock
-    private ServiceState mServiceState;
-    @Mock
-    private SubscriptionInfo mSubscriptionInfo;
-
-    private PersistableBundle mCarrierConfig;
-    private OpenNetworkSelectPagePreferenceController mController;
-    private Preference mPreference;
-    private Context mContext;
-    private LifecycleOwner mLifecycleOwner;
-    private Lifecycle mLifecycle;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
-        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
-        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
-                mCarrierConfigManager);
-        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
-        when(mTelephonyManager.getServiceState()).thenReturn(mServiceState);
-
-        mCarrierConfig = new PersistableBundle();
-        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
-
-        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(SUB_ID);
-        when(mSubscriptionInfo.getCarrierName()).thenReturn(OPERATOR_NAME);
-
-        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
-                Arrays.asList(mSubscriptionInfo));
-        when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
-                Arrays.asList(mSubscriptionInfo));
-
-        when(mTelephonyManager.getNetworkOperatorName()).thenReturn(OPERATOR_NAME);
-
-        mPreference = new Preference(mContext);
-        mController = new OpenNetworkSelectPagePreferenceController(mContext,
-                "open_network_select");
-        mController.init(mLifecycle, SUB_ID);
-    }
-
-    @Test
-    public void updateState_modeAuto_disabled() {
-        when(mTelephonyManager.getNetworkSelectionMode()).thenReturn(
-                TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void getSummary_inService_returnOperatorName() {
-        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
-
-        assertThat(mController.getSummary()).isEqualTo(OPERATOR_NAME);
-    }
-
-    @Test
-    public void getSummary_notInService_returnDisconnect() {
-        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
-
-        assertThat(mController.getSummary()).isEqualTo(
-                mContext.getString(R.string.network_disconnected));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
index cd70d66..7e15618 100644
--- a/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/AndroidBeamPreferenceControllerTest.java
@@ -31,6 +31,7 @@
 
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.testutils.shadow.ShadowNfcAdapter;
 import com.android.settingslib.RestrictedLockUtilsInternal;
 import com.android.settingslib.RestrictedPreference;
 
@@ -41,19 +42,20 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowNfcAdapter.class)
 public class AndroidBeamPreferenceControllerTest {
 
     Context mContext;
     @Mock
-    private NfcAdapter mNfcAdapter;
-    @Mock
-    NfcManager mManager;
+    NfcManager mNfcManager;
     @Mock
     private UserManager mUserManager;
     @Mock
@@ -63,18 +65,19 @@
 
     private RestrictedPreference mAndroidBeamPreference;
     private AndroidBeamPreferenceController mAndroidBeamController;
+    private ShadowNfcAdapter mShadowNfcAdapter;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
+        mShadowNfcAdapter = Shadow.extract(NfcAdapter.getDefaultAdapter(mContext));
 
         when(mContext.getApplicationContext()).thenReturn(mContext);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
-        when(mContext.getSystemService(Context.NFC_SERVICE)).thenReturn(mManager);
+        when(mContext.getSystemService(Context.NFC_SERVICE)).thenReturn(mNfcManager);
         when(RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
                 UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId())).thenReturn(false);
-        when(NfcAdapter.getDefaultAdapter(mContext)).thenReturn(mNfcAdapter);
 
         mAndroidBeamController = new AndroidBeamPreferenceController(mContext,
                 AndroidBeamPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
@@ -95,13 +98,13 @@
 
     @Test
     public void isAvailable_hasNfc_shouldReturnTrue() {
-        when(mNfcAdapter.isEnabled()).thenReturn(true);
+        mShadowNfcAdapter.setEnabled(true);
         assertThat(mAndroidBeamController.isAvailable()).isTrue();
     }
 
     @Test
     public void isAvailable_noNfcFeature_shouldReturnFalse() {
-        when(mNfcAdapter.isEnabled()).thenReturn(true);
+        mShadowNfcAdapter.setEnabled(true);
         when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_NFC_BEAM)).thenReturn(false);
         assertThat(mAndroidBeamController.isAvailable()).isFalse();
     }
@@ -114,7 +117,7 @@
 
     @Test
     public void isBeamEnable_disAllowBeam_shouldReturnFalse() {
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_OFF);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_OFF);
 
         when(RestrictedLockUtilsInternal.hasBaseUserRestriction(mContext,
                 UserManager.DISALLOW_OUTGOING_BEAM, UserHandle.myUserId())).thenReturn(true);
@@ -125,7 +128,7 @@
 
     @Test
     public void isBeamEnable_nfcStateOn_shouldReturnTrue() {
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_ON);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_ON);
         try {
             mAndroidBeamController.onResume();
         } catch (NullPointerException e) {
@@ -137,22 +140,22 @@
 
     @Test
     public void isBeamEnable_nfcStateNotOn_shouldReturnFalse() {
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_OFF);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_OFF);
         mAndroidBeamController.onResume();
         assertThat(mAndroidBeamPreference.isEnabled()).isFalse();
 
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_ON);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_TURNING_ON);
         mAndroidBeamController.onResume();
         assertThat(mAndroidBeamPreference.isEnabled()).isFalse();
 
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_OFF);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_TURNING_OFF);
         mAndroidBeamController.onResume();
         assertThat(mAndroidBeamPreference.isEnabled()).isFalse();
     }
 
     @Test
     public void updateNonIndexableKeys_available_shouldNotUpdate() {
-        when(mNfcAdapter.isEnabled()).thenReturn(true);
+        mShadowNfcAdapter.setEnabled(true);
         final List<String> keys = new ArrayList<>();
 
         mAndroidBeamController.updateNonIndexableKeys(keys);
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcDetectionPointControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcDetectionPointControllerTest.java
deleted file mode 100644
index 31ac7d6..0000000
--- a/tests/robotests/src/com/android/settings/nfc/NfcDetectionPointControllerTest.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2020 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 org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class NfcDetectionPointControllerTest {
-
-    private NfcDetectionPointController mController;
-
-    @Before
-    public void setUp() {
-        mController = new NfcDetectionPointController(RuntimeEnvironment.application, "fakeKey");
-    }
-
-    @Test
-    public void getAvailabilityStatus_withConfigIsTrue_returnAvailable() {
-        mController.setConfig(true);
-        assertThat(mController.getAvailabilityStatus())
-            .isEqualTo(NfcDetectionPointController.AVAILABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_withConfigIsFalse_returnUnavailable() {
-        mController.setConfig(false);
-        assertThat(mController.getAvailabilityStatus())
-            .isNotEqualTo(NfcDetectionPointController.AVAILABLE);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
index b69e172..026fdee 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcPaymentPreferenceControllerTest.java
@@ -29,6 +29,7 @@
 
 import com.android.settings.R;
 import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
+import com.android.settings.testutils.shadow.ShadowNfcAdapter;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -37,10 +38,12 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 import java.util.ArrayList;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowNfcAdapter.class)
 public class NfcPaymentPreferenceControllerTest {
 
     private static final String PREF_KEY = PaymentSettingsTest.PAYMENT_KEY;
diff --git a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
index 872c712..1d05162 100644
--- a/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/NfcPreferenceControllerTest.java
@@ -35,6 +35,7 @@
 
 import com.android.settings.nfc.NfcPreferenceController.NfcSliceWorker;
 import com.android.settings.nfc.NfcPreferenceController.NfcSliceWorker.NfcUpdateReceiver;
+import com.android.settings.testutils.shadow.ShadowNfcAdapter;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -43,17 +44,18 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowNfcAdapter.class)
 public class NfcPreferenceControllerTest {
 
     @Mock
-    private NfcAdapter mNfcAdapter;
-    @Mock
     NfcManager mManager;
     @Mock
     private UserManager mUserManager;
@@ -63,16 +65,19 @@
     private Context mContext;
     private SwitchPreference mNfcPreference;
     private NfcPreferenceController mNfcController;
+    private ShadowNfcAdapter mShadowNfcAdapter;
+    private NfcAdapter mNfcAdapter;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = spy(RuntimeEnvironment.application);
+        mShadowNfcAdapter = Shadow.extract(NfcAdapter.getDefaultAdapter(mContext));
+        mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext);
 
         when(mContext.getApplicationContext()).thenReturn(mContext);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
         when(mContext.getSystemService(Context.NFC_SERVICE)).thenReturn(mManager);
-        when(NfcAdapter.getDefaultAdapter(mContext)).thenReturn(mNfcAdapter);
 
         mNfcController = new NfcPreferenceController(mContext,
                 NfcPreferenceController.KEY_TOGGLE_NFC);
@@ -83,7 +88,7 @@
 
     @Test
     public void getAvailabilityStatus_hasNfc_shouldReturnAvailable() {
-        when(mNfcAdapter.isEnabled()).thenReturn(true);
+        mShadowNfcAdapter.setEnabled(true);
         assertThat(mNfcController.getAvailabilityStatus())
                 .isEqualTo(NfcPreferenceController.AVAILABLE);
     }
@@ -98,11 +103,11 @@
     @Test
     public void isNfcEnable_nfcStateNotTurning_shouldReturnTrue() {
         mNfcController.displayPreference(mScreen);
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_ON);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_ON);
         mNfcController.onResume();
         assertThat(mNfcPreference.isEnabled()).isTrue();
 
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_OFF);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_OFF);
         mNfcController.onResume();
         assertThat(mNfcPreference.isEnabled()).isTrue();
     }
@@ -110,11 +115,11 @@
     @Test
     public void isNfcEnable_nfcStateTurning_shouldReturnFalse() {
         mNfcController.displayPreference(mScreen);
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_ON);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_TURNING_ON);
         mNfcController.onResume();
         assertThat(mNfcPreference.isEnabled()).isFalse();
 
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_OFF);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_TURNING_OFF);
         mNfcController.onResume();
         assertThat(mNfcPreference.isEnabled()).isFalse();
     }
@@ -122,29 +127,29 @@
     @Test
     public void isNfcChecked_nfcStateOn_shouldReturnTrue() {
         mNfcController.displayPreference(mScreen);
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_ON);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_ON);
         mNfcController.onResume();
         assertThat(mNfcPreference.isChecked()).isTrue();
 
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_ON);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_TURNING_ON);
         mNfcController.onResume();
         assertThat(mNfcPreference.isChecked()).isTrue();
     }
 
     @Test
     public void isNfcChecked_nfcStateOff_shouldReturnFalse() {
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_OFF);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_OFF);
         mNfcController.onResume();
         assertThat(mNfcPreference.isChecked()).isFalse();
 
-        when(mNfcAdapter.getAdapterState()).thenReturn(NfcAdapter.STATE_TURNING_OFF);
+        mShadowNfcAdapter.setAdapterState(NfcAdapter.STATE_TURNING_OFF);
         mNfcController.onResume();
         assertThat(mNfcPreference.isChecked()).isFalse();
     }
 
     @Test
     public void updateNonIndexableKeys_available_shouldNotUpdate() {
-        when(mNfcAdapter.isEnabled()).thenReturn(true);
+        mShadowNfcAdapter.setEnabled(true);
         final List<String> keys = new ArrayList<>();
 
         mNfcController.updateNonIndexableKeys(keys);
@@ -167,7 +172,7 @@
         mNfcController.setChecked(true);
         mNfcController.onResume();
 
-        verify(mNfcAdapter).enable();
+        assertThat(mNfcAdapter.isEnabled()).isTrue();
     }
 
     @Test
@@ -175,7 +180,7 @@
         mNfcController.setChecked(false);
         mNfcController.onResume();
 
-        verify(mNfcAdapter).disable();
+        assertThat(mNfcAdapter.isEnabled()).isFalse();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
index 525f3ef..32eedd8 100644
--- a/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/nfc/PaymentSettingsTest.java
@@ -33,6 +33,8 @@
 import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 
+import com.android.settings.testutils.shadow.ShadowNfcAdapter;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -48,7 +50,7 @@
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = PaymentSettingsTest.ShadowPaymentBackend.class)
+@Config(shadows = {PaymentSettingsTest.ShadowPaymentBackend.class, ShadowNfcAdapter.class})
 public class PaymentSettingsTest {
 
     static final String PAYMENT_KEY = "nfc_payment";
@@ -113,7 +115,7 @@
         final List<String> niks =
                 PaymentSettings.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
 
-        assertThat(niks).containsAllOf(FOREGROUND_KEY, PAYMENT_KEY);
+        assertThat(niks).containsAtLeast(FOREGROUND_KEY, PAYMENT_KEY);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/nfc/SecureNfcPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/nfc/SecureNfcPreferenceControllerTest.java
deleted file mode 100644
index 56f012a..0000000
--- a/tests/robotests/src/com/android/settings/nfc/SecureNfcPreferenceControllerTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.nfc;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class SecureNfcPreferenceControllerTest {
-
-    private Context mContext;
-    private SecureNfcPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new SecureNfcPreferenceController(mContext, "nfc_secure_settings");
-    }
-
-    @Test
-    public void isPublicSlice_returnsTrue() {
-        assertThat(mController.isPublicSlice()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/AssistantFeedbackPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/AssistantFeedbackPreferenceControllerTest.java
new file mode 100644
index 0000000..9f172a6
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/AssistantFeedbackPreferenceControllerTest.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2020 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.notification;
+
+import static android.provider.Settings.Global.NOTIFICATION_FEEDBACK_ENABLED;
+
+import static com.android.settings.notification.AssistantFeedbackPreferenceController.OFF;
+import static com.android.settings.notification.AssistantFeedbackPreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.DeviceConfig;
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+
+import com.android.internal.config.sysui.SystemUiDeviceConfigFlags;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.testutils.shadow.ShadowDeviceConfig;
+
+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.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = {ShadowDeviceConfig.class})
+public class AssistantFeedbackPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+
+    private AssistantFeedbackPreferenceController mController;
+    private Preference mPreference;
+
+    private static final String KEY = "asst_feedback_indicator";
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mController = new AssistantFeedbackPreferenceController(mContext, KEY);
+        mPreference = new Preference(RuntimeEnvironment.application);
+        mPreference.setKey(mController.getPreferenceKey());
+        when(mScreen.findPreference(mPreference.getKey())).thenReturn(mPreference);
+    }
+
+    @After
+    public void tearDown() {
+        ShadowDeviceConfig.reset();
+    }
+
+    @Test
+    public void testIsVisible_DeviceConfigOn() {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
+                SystemUiDeviceConfigFlags.ENABLE_NAS_FEEDBACK, "true", true);
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.isVisible()).isTrue();
+    }
+
+    @Test
+    public void testIsVisible_DeviceConfigOff() {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
+                SystemUiDeviceConfigFlags.ENABLE_NAS_FEEDBACK, "false", true);
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.isVisible()).isFalse();
+    }
+
+    @Test
+    public void getAvailabilityStatus_DeviceConfigOn_returnAvailable() {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
+                SystemUiDeviceConfigFlags.ENABLE_NAS_FEEDBACK, "true", true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_DeviceConfigOff_returnUnavailable() {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_SYSTEMUI,
+                SystemUiDeviceConfigFlags.ENABLE_NAS_FEEDBACK, "false", true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void updateState_preferenceSetCheckedWhenSettingIsOn() {
+        final TwoStatePreference preference = mock(TwoStatePreference.class);
+        final Context context = RuntimeEnvironment.application;
+        Settings.Global.putInt(context.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, ON);
+
+        mController = new AssistantFeedbackPreferenceController(context, KEY);
+        mController.updateState(preference);
+
+        verify(preference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_preferenceSetUncheckedWhenSettingIsOff() {
+        final TwoStatePreference preference = mock(TwoStatePreference.class);
+        final Context context = RuntimeEnvironment.application;
+        Settings.Global.putInt(context.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, OFF);
+
+        mController = new AssistantFeedbackPreferenceController(context, KEY);
+        mController.updateState(preference);
+
+        verify(preference).setChecked(false);
+    }
+
+    @Test
+    public void isChecked_settingIsOff_shouldReturnFalse() {
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, OFF);
+
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_settingIsOn_shouldReturnTrue() {
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, ON);
+
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void setChecked_setFalse_disablesSetting() {
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, ON);
+
+        mController.setChecked(false);
+        int updatedValue = Settings.Global.getInt(mContext.getContentResolver(),
+                NOTIFICATION_FEEDBACK_ENABLED, -1);
+
+        assertThat(updatedValue).isEqualTo(OFF);
+    }
+
+    @Test
+    public void setChecked_setTrue_enablesSetting() {
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_FEEDBACK_ENABLED, OFF);
+
+        mController.setChecked(true);
+        int updatedValue = Settings.Global.getInt(mContext.getContentResolver(),
+                NOTIFICATION_FEEDBACK_ENABLED, -1);
+
+        assertThat(updatedValue).isEqualTo(ON);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java
index b2cf55b..871de0f 100644
--- a/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BubbleNotificationPreferenceControllerTest.java
@@ -19,6 +19,7 @@
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
 import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF;
 import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;
 
@@ -29,6 +30,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.provider.Settings;
 
@@ -44,6 +46,8 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowActivityManager;
 
 @RunWith(RobolectricTestRunner.class)
 public class BubbleNotificationPreferenceControllerTest {
@@ -69,7 +73,18 @@
     }
 
     @Test
-    public void getAvilabilityStatus_returnsAvailable() {
+    public void isAvailable_lowRam_returnsUnsupported() {
+        final ShadowActivityManager activityManager =
+               Shadow.extract(mContext.getSystemService(ActivityManager.class));
+        activityManager.setIsLowRamDevice(true);
+        assertEquals(UNSUPPORTED_ON_DEVICE, mController.getAvailabilityStatus());
+    }
+
+    @Test
+    public void isAvailable_notLowRam_returnsAvailable() {
+        final ShadowActivityManager activityManager =
+               Shadow.extract(mContext.getSystemService(ActivityManager.class));
+        activityManager.setIsLowRamDevice(false);
         assertEquals(AVAILABLE, mController.getAvailabilityStatus());
     }
 
diff --git a/tests/robotests/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceControllerTest.java
index b5f505b..88de7ac 100644
--- a/tests/robotests/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/BubbleSummaryNotificationPreferenceControllerTest.java
@@ -18,11 +18,14 @@
 
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 import static com.android.settings.notification.BadgingNotificationPreferenceController.OFF;
 import static com.android.settings.notification.BadgingNotificationPreferenceController.ON;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.app.ActivityManager;
 import android.content.Context;
 import android.provider.Settings;
 
@@ -35,6 +38,8 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowActivityManager;
 
 @RunWith(RobolectricTestRunner.class)
 public class BubbleSummaryNotificationPreferenceControllerTest {
@@ -68,4 +73,20 @@
         String onString = mContext.getString(R.string.notifications_bubble_setting_on_summary);
         assertThat(mController.getSummary()).isEqualTo(onString);
     }
+
+    @Test
+    public void isAvailable_lowRam_returnsUnsupported() {
+        final ShadowActivityManager activityManager =
+                Shadow.extract(mContext.getSystemService(ActivityManager.class));
+        activityManager.setIsLowRamDevice(true);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void isAvailable_notLowRam_returnsAvailable() {
+        final ShadowActivityManager activityManager =
+                Shadow.extract(mContext.getSystemService(ActivityManager.class));
+        activityManager.setIsLowRamDevice(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/ImportanceResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ImportanceResetPreferenceControllerTest.java
new file mode 100644
index 0000000..1dfa65d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/ImportanceResetPreferenceControllerTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2020 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.notification;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.view.View;
+
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settingslib.widget.LayoutPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.util.ReflectionHelpers;
+
+@RunWith(RobolectricTestRunner.class)
+public class ImportanceResetPreferenceControllerTest {
+
+    private static final String KEY = "asst_importance_reset";
+    private ImportanceResetPreferenceController mController;
+
+    @Mock
+    private PreferenceScreen mScreen;
+    private LayoutPreference mPreference;
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = RuntimeEnvironment.application;
+        mPreference = new LayoutPreference(mContext, R.layout.reset_importance_button);
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        mController = new ImportanceResetPreferenceController(mContext, KEY);
+        mController.displayPreference(mScreen);
+
+        ReflectionHelpers.setField(mController, "mBackend", mBackend);
+    }
+
+    @Test
+    public void onClick_callReset() {
+        final View view = mPreference.findViewById(R.id.reset_importance_button);
+        mController.updateState(mPreference);
+        assertThat(view.getVisibility()).isEqualTo(View.VISIBLE);
+        view.performClick();
+
+        verify(mBackend, times(1)).resetNotificationImportance();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java b/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
index e824505..8b46374 100644
--- a/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/RemoteVolumeGroupControllerTest.java
@@ -21,6 +21,7 @@
 
 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 static org.mockito.Mockito.when;
@@ -30,7 +31,9 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageStats;
+import android.media.MediaRouter2Manager;
 import android.media.RoutingSessionInfo;
+import android.media.session.MediaSessionManager;
 
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -77,6 +80,8 @@
     private PreferenceManager mPreferenceManager;
     @Mock
     private SharedPreferences mSharedPreferences;
+    @Mock
+    private MediaSessionManager mMediaSessionManager;
 
     private final List<RoutingSessionInfo> mRoutingSessionInfos = new ArrayList<>();
 
@@ -91,9 +96,12 @@
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
+        mContext = spy(RuntimeEnvironment.application);
+        doReturn(mMediaSessionManager).when(mContext).getSystemService(
+                Context.MEDIA_SESSION_SERVICE);
         mController = new RemoteVolumeGroupController(mContext, KEY_REMOTE_VOLUME_GROUP);
         mController.mLocalMediaManager = mLocalMediaManager;
+        mController.mRouterManager = mock(MediaRouter2Manager.class);
         mPreferenceCategory = spy(new PreferenceCategory(mContext));
         mPreferenceCategory.setKey(mController.getPreferenceKey());
 
diff --git a/tests/robotests/src/com/android/settings/notification/ShowOnLockscreenNotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/ShowOnLockscreenNotificationPreferenceControllerTest.java
index a341def..496897f 100644
--- a/tests/robotests/src/com/android/settings/notification/ShowOnLockscreenNotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/ShowOnLockscreenNotificationPreferenceControllerTest.java
@@ -89,7 +89,7 @@
                 LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS,
                 1);
 
-        mController.updateState(mPreference);
+        mController.displayPreference(mScreen);
 
         assertThat(mPreference.getValue()).isEqualTo(
                 String.valueOf(R.string.lock_screen_notifs_show_none));
@@ -107,7 +107,7 @@
                 LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS,
                 0);
 
-        mController.updateState(mPreference);
+        mController.displayPreference(mScreen);
 
         assertThat(mPreference.getValue()).isEqualTo(
                 String.valueOf(R.string.lock_screen_notifs_show_alerting));
@@ -124,7 +124,7 @@
                 LOCK_SCREEN_SHOW_SILENT_NOTIFICATIONS,
                 1);
 
-        mController.updateState(mPreference);
+        mController.displayPreference(mScreen);
 
         assertThat(mPreference.getValue()).isEqualTo(
                 String.valueOf(R.string.lock_screen_notifs_show_all));
@@ -136,7 +136,7 @@
     public void updateState_allNotifsOnLockscreen_isDefault() {
         // settings don't exist
 
-        mController.updateState(mPreference);
+        mController.displayPreference(mScreen);
 
         assertThat(mPreference.getValue()).isEqualTo(
                 String.valueOf(R.string.lock_screen_notifs_show_all));
@@ -158,7 +158,7 @@
         ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
                 KEYGUARD_DISABLE_SECURE_NOTIFICATIONS);
 
-        mController.updateState(mPreference);
+        mController.displayPreference(mScreen);
 
         assertThat(mPreference.getValue()).isEqualTo(
                 String.valueOf(R.string.lock_screen_notifs_show_none));
diff --git a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
index b6f06f4..af0567f 100644
--- a/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/notification/SoundSettingsTest.java
@@ -70,7 +70,7 @@
         keys.add("ring_volume");
         keys.add("notification_volume");
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java
index d203c47..2ea240e 100644
--- a/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/BlockPreferenceControllerTest.java
@@ -368,6 +368,7 @@
     public void testOnSwitchChanged_channel_nonDefault() {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         NotificationChannel channel = new NotificationChannel("a", "a", IMPORTANCE_HIGH);
+        channel.setOriginalImportance(IMPORTANCE_HIGH);
         mController.onResume(appRow, channel, null, null, null, null);
         mController.updateState(mPreference);
 
@@ -375,7 +376,7 @@
         assertEquals(IMPORTANCE_NONE, channel.getImportance());
 
         mController.onSwitchChanged(null, true);
-        assertEquals(IMPORTANCE_DEFAULT, channel.getImportance());
+        assertEquals(IMPORTANCE_HIGH, channel.getImportance());
 
         verify(mBackend, times(2)).updateChannel(any(), anyInt(), any());
     }
diff --git a/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java
index 6fec525..ea963e3 100644
--- a/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/BubblePreferenceControllerTest.java
@@ -42,6 +42,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import android.app.ActivityManager;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
@@ -67,7 +68,9 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadow.api.Shadow;
 import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.shadows.ShadowActivityManager;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -137,7 +140,7 @@
     }
 
     @Test
-    public void isAvailable_channel_yesIfAppOff() {
+    public void isAvailable_channel_notIfAppOff() {
         Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         appRow.bubblePreference = BUBBLE_PREFERENCE_NONE;
@@ -145,7 +148,7 @@
         when(channel.getImportance()).thenReturn(IMPORTANCE_HIGH);
         mController.onResume(appRow, channel, null, null, null, null);
 
-        assertTrue(mController.isAvailable());
+        assertFalse(mController.isAvailable());
     }
 
     @Test
@@ -159,6 +162,18 @@
     }
 
     @Test
+    public void isNotAvailable_ifLowRam() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        mController.onResume(appRow, null, null, null, null, null);
+
+        final ShadowActivityManager activityManager =
+                Shadow.extract(mContext.getSystemService(ActivityManager.class));
+        activityManager.setIsLowRamDevice(true);
+        assertFalse(mController.isAvailable());
+    }
+
+
+    @Test
     public void isAvailable_notIfOffGlobally_channel() {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         NotificationChannel channel = mock(NotificationChannel.class);
@@ -171,6 +186,18 @@
     }
 
     @Test
+    public void isAvailable_ifNotLowRam() {
+        NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
+        mController.onResume(appRow, null, null, null, null, null);
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+
+        final ShadowActivityManager activityManager =
+                Shadow.extract(mContext.getSystemService(ActivityManager.class));
+        activityManager.setIsLowRamDevice(false);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
     public void isAvailable_app_evenIfOffGlobally() {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         mAppPageController.onResume(appRow, null, null, null, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
index af7b108..f851c96 100644
--- a/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/BubbleSummaryPreferenceControllerTest.java
@@ -23,6 +23,8 @@
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
 import static android.provider.Settings.Global.NOTIFICATION_BUBBLES;
 
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
 import static com.android.settings.notification.app.BubblePreferenceController.SYSTEM_WIDE_OFF;
 import static com.android.settings.notification.app.BubblePreferenceController.SYSTEM_WIDE_ON;
 
@@ -37,6 +39,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 
+import android.app.ActivityManager;
 import android.app.NotificationChannel;
 import android.content.Context;
 import android.provider.Settings;
@@ -53,6 +56,8 @@
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadow.api.Shadow;
+import org.robolectric.shadows.ShadowActivityManager;
 import org.robolectric.shadows.ShadowApplication;
 
 @RunWith(RobolectricTestRunner.class)
@@ -140,6 +145,28 @@
     }
 
     @Test
+    public void isAvailable_lowRam_shouldReturnFalse() {
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+        mController.onResume(mAppRow, null, null, null, null, null);
+
+        final ShadowActivityManager activityManager =
+                Shadow.extract(mContext.getSystemService(ActivityManager.class));
+        activityManager.setIsLowRamDevice(true);
+        assertFalse(mController.isAvailable());
+    }
+
+    @Test
+    public void isAvailable_notLowRam_shouldReturnTrue() {
+        Settings.Global.putInt(mContext.getContentResolver(), NOTIFICATION_BUBBLES, SYSTEM_WIDE_ON);
+        mController.onResume(mAppRow, null, null, null, null, null);
+
+        final ShadowActivityManager activityManager =
+               Shadow.extract(mContext.getSystemService(ActivityManager.class));
+        activityManager.setIsLowRamDevice(false);
+        assertTrue(mController.isAvailable());
+    }
+
+    @Test
     public void updateState_setsIntent() {
         mAppRow.bubblePreference = BUBBLE_PREFERENCE_ALL;
         mController.onResume(mAppRow, null, null, null, null, null);
diff --git a/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java
index 12e1f35..2d2fcc8 100644
--- a/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/ConversationPriorityPreferenceTest.java
@@ -68,10 +68,6 @@
         final LayoutInflater inflater = LayoutInflater.from(mContext);
         PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
                 inflater.inflate(preference.getLayoutResource(), null));
-        Drawable unselected = mock(Drawable.class);
-        Drawable selected = mock(Drawable.class);
-        preference.selectedBackground = selected;
-        preference.unselectedBackground = unselected;
 
         preference.setConfigurable(false);
         preference.setImportance(IMPORTANCE_DEFAULT);
@@ -81,35 +77,6 @@
         assertThat(holder.itemView.findViewById(R.id.silence).isEnabled()).isFalse();
         assertThat(holder.itemView.findViewById(R.id.priority_group).isEnabled()).isFalse();
         assertThat(holder.itemView.findViewById(R.id.alert).isEnabled()).isFalse();
-
-        assertThat(holder.itemView.findViewById(R.id.priority_group).getBackground())
-                .isEqualTo(selected);
-        assertThat(holder.itemView.findViewById(R.id.alert).getBackground()).isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.silence).getBackground())
-                .isEqualTo(unselected);
-
-        // other button
-        preference.setPriorityConversation(false);
-        holder = PreferenceViewHolder.createInstanceForTests(
-                inflater.inflate(preference.getLayoutResource(), null));
-        preference.onBindViewHolder(holder);
-
-        assertThat(holder.itemView.findViewById(R.id.alert).getBackground()).isEqualTo(selected);
-        assertThat(holder.itemView.findViewById(R.id.silence).getBackground())
-                .isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.priority_group).getBackground())
-                .isEqualTo(unselected);
-
-        // other other button
-        preference.setImportance(IMPORTANCE_LOW);
-        holder = PreferenceViewHolder.createInstanceForTests(
-                inflater.inflate(preference.getLayoutResource(), null));
-        preference.onBindViewHolder(holder);
-
-        assertThat(holder.itemView.findViewById(R.id.priority_group).getBackground())
-                .isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.alert).getBackground()).isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.silence).getBackground()).isEqualTo(selected);
     }
 
     @Test
@@ -119,10 +86,6 @@
         final LayoutInflater inflater = LayoutInflater.from(mContext);
         final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
                 inflater.inflate(preference.getLayoutResource(), null));
-        Drawable unselected = mock(Drawable.class);
-        Drawable selected = mock(Drawable.class);
-        preference.selectedBackground = selected;
-        preference.unselectedBackground = unselected;
 
         preference.setConfigurable(true);
         preference.setImportance(IMPORTANCE_LOW);
@@ -130,12 +93,8 @@
 
         preference.onBindViewHolder(holder);
 
-        assertThat(holder.itemView.findViewById(R.id.priority_group).getBackground())
-                .isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.alert).getBackground()).isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.silence).getBackground())
-                .isEqualTo(selected);
-        assertThat(holder.itemView.findViewById(R.id.silence_summary).getVisibility())
+        assertThat(holder.itemView.findViewById(R.id.silence)
+                .findViewById(R.id.summary).getVisibility())
                 .isEqualTo(View.VISIBLE);
     }
 
@@ -146,10 +105,6 @@
         final LayoutInflater inflater = LayoutInflater.from(mContext);
         final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
                 inflater.inflate(preference.getLayoutResource(), null));
-        Drawable unselected = mock(Drawable.class);
-        Drawable selected = mock(Drawable.class);
-        preference.selectedBackground = selected;
-        preference.unselectedBackground = unselected;
 
         preference.setConfigurable(true);
         preference.setImportance(IMPORTANCE_DEFAULT);
@@ -161,12 +116,6 @@
 
         silenceButton.callOnClick();
 
-        assertThat(holder.itemView.findViewById(R.id.alert).getBackground()).isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.priority_group).getBackground())
-                .isEqualTo(unselected);
-        assertThat(holder.itemView.findViewById(R.id.silence).getBackground())
-                .isEqualTo(selected);
-
         verify(preference, times(1)).callChangeListener(new Pair(IMPORTANCE_LOW, false));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
index 259f40e..a9e4361 100644
--- a/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/app/NotificationPreferenceControllerTest.java
@@ -206,7 +206,7 @@
     }
 
     @Test
-    public void testIsBlockable_oemWhitelist() {
+    public void testIsBlockable_oemAllowlist() {
         NotificationBackend.AppRow appRow = new NotificationBackend.AppRow();
         NotificationChannel channel = mock(NotificationChannel.class);
         when(channel.isImportanceLockedByOEM()).thenReturn(true);
diff --git a/tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java
new file mode 100644
index 0000000..660b4e1
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/notification/app/RecentConversationsPreferenceControllerTest.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright (C) 2020 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.notification.app;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.app.people.ConversationChannel;
+import android.app.people.IPeopleManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.notification.NotificationBackend;
+
+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.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.ArrayList;
+
+@RunWith(RobolectricTestRunner.class)
+public class RecentConversationsPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private NotificationBackend mBackend;
+    @Mock
+    private IPeopleManager mPs;
+
+    private RecentConversationsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowApplication = ShadowApplication.getInstance();
+        mContext = RuntimeEnvironment.application;
+        mController = new RecentConversationsPreferenceController(mContext, mBackend, mPs);
+    }
+
+    @Test
+    public void isAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void testPopulateList_hideIfNoConversations() {
+        PreferenceCategory outerContainer = mock(PreferenceCategory.class);
+
+        mController.populateList(new ArrayList<>(), outerContainer);
+
+        verify(outerContainer).setVisible(false);
+        verify(outerContainer, never()).addPreference(any());
+    }
+
+    @Test
+    public void testPopulateList_validConversations() {
+        final PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        PreferenceScreen ps = preferenceManager.createPreferenceScreen(mContext);
+        PreferenceCategory outerContainer = spy(new PreferenceCategory(mContext));
+        ps.addPreference(outerContainer);
+
+        ConversationChannel ccw = new ConversationChannel(mock(ShortcutInfo.class), 6,
+        new NotificationChannel("hi", "hi", 4),
+        new NotificationChannelGroup("hi", "hi"), 7,
+        true);
+
+        ArrayList<ConversationChannel> list = new ArrayList<>();
+        list.add(ccw);
+
+        mController.populateList(list, outerContainer);
+        // one for the preference, one for the button ro clear all
+        verify(outerContainer, times(2)).addPreference(any());
+    }
+
+    @Test
+    public void populateConversations_blocked() {
+        PreferenceCategory container = mock(PreferenceCategory.class);
+
+        ConversationChannel ccw = new ConversationChannel(mock(ShortcutInfo.class), 6,
+                new NotificationChannel("hi", "hi", 4),
+                new NotificationChannelGroup("hi", "hi"), 7,
+                true);
+
+        ConversationChannel ccw2 = new ConversationChannel(mock(ShortcutInfo.class), 6,
+                new NotificationChannel("hi", "hi", 0),
+                new NotificationChannelGroup("hi", "hi"), 7,
+                true);
+
+        NotificationChannelGroup blockedGroup = new NotificationChannelGroup("hi", "hi");
+        blockedGroup.setBlocked(true);
+        ConversationChannel ccw3 = new ConversationChannel(mock(ShortcutInfo.class), 6,
+                new NotificationChannel("hi", "hi", 4),
+                blockedGroup, 7,
+                true);
+
+        ArrayList<ConversationChannel> list = new ArrayList<>();
+        list.add(ccw);
+        list.add(ccw2);
+        list.add(ccw3);
+
+        mController.populateConversations(list, container);
+
+        verify(container, times(1)).addPreference(any());
+    }
+
+    @Test
+    public void getSummary_withGroup() {
+        ShortcutInfo si = mock(ShortcutInfo.class);
+        when(si.getLabel()).thenReturn("person");
+        ConversationChannel ccw = new ConversationChannel(mock(ShortcutInfo.class), 6,
+                new NotificationChannel("hi", "channel", 4),
+                new NotificationChannelGroup("hi", "group"), 7,
+                true);
+
+        assertThat(mController.getSummary(ccw).toString()).contains(
+                ccw.getParentNotificationChannelGroup().getName());
+        assertThat(mController.getSummary(ccw).toString()).contains(
+                ccw.getParentNotificationChannel().getName());
+    }
+
+    @Test
+    public void getSummary_noGroup() {
+        ShortcutInfo si = mock(ShortcutInfo.class);
+        when(si.getLabel()).thenReturn("person");
+        ConversationChannel ccw = new ConversationChannel(mock(ShortcutInfo.class), 6,
+                new NotificationChannel("hi", "channel", 4),
+                null, 7,
+                true);
+
+        assertThat(mController.getSummary(ccw).toString()).isEqualTo(
+                ccw.getParentNotificationChannel().getName());
+    }
+
+    @Test
+    public void getTitle_withShortcut() {
+        ShortcutInfo si = mock(ShortcutInfo.class);
+        when(si.getLabel()).thenReturn("person");
+        ConversationChannel ccw = new ConversationChannel(si, 6,
+                new NotificationChannel("hi", "channel", 4),
+                new NotificationChannelGroup("hi", "group"), 7,
+                true);
+
+        assertThat(mController.getTitle(ccw).toString()).isEqualTo(si.getLabel());
+    }
+
+    @Test
+    public void testGetSubSettingLauncher() {
+        ShortcutInfo si = mock(ShortcutInfo.class);
+        when(si.getId()).thenReturn("person");
+        when(si.getPackage()).thenReturn("pkg");
+        ConversationChannel ccw = new ConversationChannel(si, 6,
+                new NotificationChannel("hi", "channel", 4),
+                new NotificationChannelGroup("hi", "group"), 7,
+                true);
+
+
+        Intent intent = mController.getSubSettingLauncher(ccw, "title").toIntent();
+
+        Bundle extras = intent.getExtras();
+        assertThat(extras.getString(AppInfoBase.ARG_PACKAGE_NAME)).isEqualTo(
+                ccw.getShortcutInfo().getPackage());
+        assertThat(extras.getInt(AppInfoBase.ARG_PACKAGE_UID)).isEqualTo(ccw.getUid());
+        assertThat(extras.getString(Settings.EXTRA_CHANNEL_ID)).isEqualTo(
+                ccw.getParentNotificationChannel().getId());
+        assertThat(extras.getString(Settings.EXTRA_CONVERSATION_ID)).isEqualTo(
+                ccw.getShortcutInfo().getId());
+    }
+
+    @Test
+    public void testCreatesChannel() {
+        ShortcutInfo si = mock(ShortcutInfo.class);
+        when(si.getId()).thenReturn("person");
+        when(si.getPackage()).thenReturn("pkg");
+        ConversationChannel ccw = new ConversationChannel(si, 6,
+                new NotificationChannel("hi", "channel", 4),
+                new NotificationChannelGroup("hi", "group"), 7,
+                true);
+
+        Preference pref = mController.createConversationPref(new PreferenceCategory(mContext),
+                ccw, 100);
+        try {
+            pref.performClick();
+        } catch (RuntimeException e) {
+            // expected since it tries to launch an activity
+        }
+        verify(mBackend).createConversationNotificationChannel(
+                si.getPackage(), ccw.getUid(), ccw.getParentNotificationChannel(), si.getId());
+    }
+
+    @Test
+    public void testRemoveConversation() throws Exception {
+        ShortcutInfo si = mock(ShortcutInfo.class);
+        when(si.getId()).thenReturn("person");
+        when(si.getPackage()).thenReturn("pkg");
+        ConversationChannel ccw = new ConversationChannel(si, 6,
+                new NotificationChannel("hi", "channel", 4),
+                new NotificationChannelGroup("hi", "group"), 7,
+                false);
+
+        RecentConversationPreference pref =
+                (RecentConversationPreference) mController.createConversationPref(
+                        new PreferenceCategory(mContext), ccw, 100);
+        final View view = View.inflate(mContext, pref.getLayoutResource(), null);
+        PreferenceViewHolder holder = spy(PreferenceViewHolder.createInstanceForTests(view));
+        View delete = View.inflate(mContext, pref.getSecondTargetResId(), null);
+        when(holder.findViewById(pref.getClearId())).thenReturn(delete);
+
+        pref.onBindViewHolder(holder);
+        pref.getClearView().performClick();
+
+        verify(mPs).removeRecentConversation(
+                si.getPackage(), UserHandle.getUserId(ccw.getUid()), si.getId());
+    }
+
+    @Test
+    public void testNonremoveableConversation() throws Exception {
+        ShortcutInfo si = mock(ShortcutInfo.class);
+        when(si.getId()).thenReturn("person");
+        when(si.getPackage()).thenReturn("pkg");
+        ConversationChannel ccw = new ConversationChannel(si, 6,
+                new NotificationChannel("hi", "channel", 4),
+                new NotificationChannelGroup("hi", "group"), 7,
+                true);
+
+        RecentConversationPreference pref =
+                (RecentConversationPreference) mController.createConversationPref(
+                        new PreferenceCategory(mContext), ccw, 100);
+        assertThat(pref.hasClearListener()).isFalse();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreferenceTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreferenceTest.java
deleted file mode 100644
index f6e51cd..0000000
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenCustomRadioButtonPreferenceTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.notification.zen;
-
-import static com.google.common.truth.Truth.assertThat;
-
-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 android.widget.RadioButton;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class ZenCustomRadioButtonPreferenceTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-    }
-
-    @Test
-    public void createNewPreference_shouldSetLayout() {
-        final ZenCustomRadioButtonPreference preference
-                = new ZenCustomRadioButtonPreference(mContext);
-
-        assertThat(preference.getLayoutResource()).isEqualTo(R.layout.preference_two_target_radio);
-        assertThat(preference.getWidgetLayoutResource())
-                .isEqualTo(R.layout.preference_widget_gear);
-    }
-
-    @Test
-    public void setChecked_shouldUpdateButtonCheckedState() {
-        final ZenCustomRadioButtonPreference preference =
-                new ZenCustomRadioButtonPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(
-                  R.layout.preference_two_target_radio, null));
-        final RadioButton toggle = (RadioButton) holder.findViewById(android.R.id.checkbox);
-        preference.onBindViewHolder(holder);
-
-        preference.setChecked(true);
-        assertThat(toggle.isChecked()).isTrue();
-
-        preference.setChecked(false);
-        assertThat(toggle.isChecked()).isFalse();
-    }
-
-    @Test
-    public void clickRadioButton_shouldNotifyRadioButtonClicked() {
-        final ZenCustomRadioButtonPreference preference
-                = new ZenCustomRadioButtonPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(R.layout.preference_two_target_radio, null));
-        final View toggle = holder.findViewById(R.id.checkbox_frame);
-
-        ZenCustomRadioButtonPreference.OnRadioButtonClickListener l = mock(
-                ZenCustomRadioButtonPreference.OnRadioButtonClickListener.class);
-        preference.setOnRadioButtonClickListener(l);
-        preference.onBindViewHolder(holder);
-
-        toggle.performClick();
-        verify(l).onRadioButtonClick(preference);
-    }
-
-    @Test
-    public void clickWidgetView_shouldNotifyWidgetClicked() {
-        final ZenCustomRadioButtonPreference preference =
-                new ZenCustomRadioButtonPreference(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(R.layout.preference_two_target_radio, null));
-        final View widgetView = holder.findViewById(android.R.id.widget_frame);
-
-        ZenCustomRadioButtonPreference.OnGearClickListener l = mock(
-                ZenCustomRadioButtonPreference.OnGearClickListener.class);
-        preference.setOnGearClickListener(l);
-        preference.onBindViewHolder(holder);
-
-        widgetView.performClick();
-        verify(l).onGearClick(preference);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
index a9b82eb..460ae2d 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeBypassingAppsPreferenceControllerTest.java
@@ -36,6 +36,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
index a8e583f..11e8548 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeDurationPreferenceControllerTest.java
@@ -90,7 +90,6 @@
         Settings.Secure.putInt(mContentResolver, Settings.Secure.ZEN_DURATION,
                 zenDuration);
 
-        assertEquals(mContext.getString(R.string.zen_mode_duration_summary_time_minutes,
-                zenDuration), mController.getSummary());
+        assertEquals("45 minutes", mController.getSummary());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
index ef20406..c2abbcd 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModePreferenceControllerTest.java
@@ -33,10 +33,6 @@
 
 import androidx.preference.Preference;
 
-import com.android.settings.R;
-import com.android.settings.notification.zen.ZenModePreferenceController;
-import com.android.settings.notification.zen.ZenModeSettings;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -85,7 +81,7 @@
         when(mPreference.isEnabled()).thenReturn(true);
 
         mController.updateState(mPreference);
-        verify(mPreference).setSummary(mContext.getString(R.string.zen_mode_sound_summary_off));
+        verify(mPreference).setSummary("Off");
 
         doReturn(1).when(mSummaryBuilder).getEnabledAutomaticRulesCount();
         mController.updateState(mPreference);
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java
index 05537f3..45a40d3 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsAllPreferenceControllerTest.java
@@ -40,11 +40,9 @@
 
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
-import com.android.settings.notification.zen.ZenModeBackend;
-import com.android.settings.notification.zen.ZenModeVisEffectsAllPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -63,7 +61,7 @@
     @Mock
     private ZenModeBackend mBackend;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mPref;
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
     @Mock
@@ -86,7 +84,7 @@
                 mContext, mock(Lifecycle.class), PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
 
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPref);
         mController.displayPreference(mScreen);
     }
 
@@ -98,9 +96,9 @@
     @Test
     public void updateState_notChecked() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 1);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mPref).setChecked(false);
     }
 
     @Test
@@ -115,9 +113,9 @@
                 | SUPPRESSED_EFFECT_PEEK
                 | SUPPRESSED_EFFECT_NOTIFICATION_LIST;
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, allSuppressed);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setChecked(true);
+        verify(mPref).setChecked(true);
     }
 
     @Test
@@ -132,7 +130,7 @@
                 | SUPPRESSED_EFFECT_PEEK
                 | SUPPRESSED_EFFECT_NOTIFICATION_LIST;
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 1);
-        mController.onRadioButtonClick(mockPref);
+        mController.onRadioButtonClicked(mPref);
         verify(mBackend).saveVisualEffectsPolicy(allSuppressed, true);
         verify(mFeatureFactory.metricsFeatureProvider).action(eq(mContext),
                 eq(ACTION_ZEN_SOUND_AND_VIS_EFFECTS),
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java
index baea9ef..88c2c50 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsCustomPreferenceControllerTest.java
@@ -38,11 +38,9 @@
 
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
-import com.android.settings.notification.zen.ZenModeBackend;
-import com.android.settings.notification.zen.ZenModeVisEffectsCustomPreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -61,7 +59,7 @@
     @Mock
     private ZenModeBackend mBackend;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mPref;
     private Context mContext;
     @Mock
     private PreferenceScreen mScreen;
@@ -83,7 +81,7 @@
                 mContext, mock(Lifecycle.class), PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
 
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPref);
         mController.displayPreference(mScreen);
     }
 
@@ -102,9 +100,9 @@
     @Test
     public void updateState_notChecked_noVisEffects() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 0);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mPref).setChecked(false);
     }
 
     @Test
@@ -119,25 +117,25 @@
                 | SUPPRESSED_EFFECT_PEEK
                 | SUPPRESSED_EFFECT_NOTIFICATION_LIST;
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, allSuppressed);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mPref).setChecked(false);
     }
 
     @Test
     public void updateState_checked() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 2);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setChecked(true);
+        verify(mPref).setChecked(true);
     }
 
     @Test
     public void updateState_listeners() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 2);
-        mController.updateState(mockPref);
+        mController.updateState(mPref);
 
-        verify(mockPref).setOnGearClickListener(any());
-        verify(mockPref).setOnRadioButtonClickListener(any());
+        verify(mPref).setExtraWidgetOnClickListener(any());
+        verify(mPref).setOnClickListener(any());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java
index aacb109..79c6cb8 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenModeVisEffectsNonePreferenceControllerTest.java
@@ -40,11 +40,9 @@
 
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
-import com.android.settings.notification.zen.ZenModeBackend;
-import com.android.settings.notification.zen.ZenModeVisEffectsNonePreferenceController;
 import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -63,7 +61,7 @@
     @Mock
     private ZenModeBackend mBackend;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     private Context mContext;
     private FakeFeatureFactory mFeatureFactory;
     @Mock
@@ -86,7 +84,7 @@
                 mContext, mock(Lifecycle.class), PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
 
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
@@ -98,17 +96,17 @@
     @Test
     public void updateState_notChecked() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 1);
-        mController.updateState(mockPref);
+        mController.updateState(mMockPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
     public void updateState_checked() {
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 0);
-        mController.updateState(mockPref);
+        mController.updateState(mMockPref);
 
-        verify(mockPref).setChecked(true);
+        verify(mMockPref).setChecked(true);
     }
 
     @Test
@@ -123,7 +121,7 @@
                 | SUPPRESSED_EFFECT_PEEK
                 | SUPPRESSED_EFFECT_NOTIFICATION_LIST;
         mBackend.mPolicy = new NotificationManager.Policy(0, 0, 0, 1);
-        mController.onRadioButtonClick(mockPref);
+        mController.onRadioButtonClicked(mMockPref);
         verify(mBackend).saveVisualEffectsPolicy(allSuppressed, false);
         verify(mFeatureFactory.metricsFeatureProvider).action(nullable(Context.class),
                 eq(ACTION_ZEN_SOUND_ONLY),
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java
index f6fa5b7..f149541 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleCustomPolicyPreferenceControllerTest.java
@@ -27,6 +27,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +48,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -70,21 +71,21 @@
                 PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
         when(mBackend.getAutomaticZenRule(RULE_ID)).thenReturn(mRule);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
     @Test
     public void updateState_nullZenPolicy() {
         updateControllerZenPolicy(null);
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
     public void updateState_hasZenPolicy() {
         updateControllerZenPolicy(new ZenPolicy.Builder().build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(true);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(true);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java
index 7091ceb..c0258e4 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleDefaultPolicyPreferenceControllerTest.java
@@ -27,6 +27,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +48,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -70,21 +71,21 @@
                 PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
         when(mBackend.getAutomaticZenRule(RULE_ID)).thenReturn(mRule);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
     @Test
     public void updateState_nullZenPolicy() {
         updateControllerZenPolicy(null);
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(true);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(true);
     }
 
     @Test
     public void updateState_hasZenPolicy() {
         updateControllerZenPolicy(new ZenPolicy.Builder().build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java
index 13963db..e3fef19 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRulePreferenceControllerTest.java
@@ -28,10 +28,8 @@
 
 import androidx.preference.PreferenceScreen;
 
-import com.android.settings.notification.zen.AbstractZenCustomRulePreferenceController;
-import com.android.settings.notification.zen.ZenCustomRadioButtonPreference;
-import com.android.settings.notification.zen.ZenModeBackend;
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -51,7 +49,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -67,7 +65,7 @@
         mContext = RuntimeEnvironment.application;
         mController = new TestablePreferenceController(mContext,"test", mock(Lifecycle.class));
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java
index f30587f..edbcd06 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsAllPreferenceControllerTest.java
@@ -27,6 +27,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +48,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -69,7 +70,7 @@
                 PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
         when(mBackend.getAutomaticZenRule(RULE_ID)).thenReturn(mRule);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
@@ -78,8 +79,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .hideAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
@@ -87,8 +88,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .showAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(true);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(true);
     }
 
     @Test
@@ -97,8 +98,8 @@
                 .showPeeking(true)
                 .showBadges(false)
                 .build());
-        mController.updateState(mockPref);
+        mController.updateState(mMockPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mMockPref).setChecked(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java
index 99b76ce..ece5d5f 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsCustomPreferenceControllerTest.java
@@ -27,6 +27,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +48,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -69,7 +70,7 @@
                 PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
         when(mBackend.getAutomaticZenRule(RULE_ID)).thenReturn(mRule);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
@@ -78,8 +79,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .hideAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
@@ -87,8 +88,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .showAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
@@ -97,8 +98,8 @@
                 .showPeeking(true)
                 .showBadges(false)
                 .build());
-        mController.updateState(mockPref);
+        mController.updateState(mMockPref);
 
-        verify(mockPref).setChecked(true);
+        verify(mMockPref).setChecked(true);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java
index 510da5f..2daf4fb 100644
--- a/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/zen/ZenRuleVisEffectsNonePreferenceControllerTest.java
@@ -27,6 +27,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.RadioButtonPreference;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -47,7 +48,7 @@
     @Mock
     private NotificationManager mNotificationManager;
     @Mock
-    private ZenCustomRadioButtonPreference mockPref;
+    private RadioButtonPreference mMockPref;
     @Mock
     private PreferenceScreen mScreen;
 
@@ -69,7 +70,7 @@
                 PREF_KEY);
         ReflectionHelpers.setField(mController, "mBackend", mBackend);
         when(mBackend.getAutomaticZenRule(RULE_ID)).thenReturn(mRule);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mockPref);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mMockPref);
         mController.displayPreference(mScreen);
     }
 
@@ -78,8 +79,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .hideAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(true);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(true);
     }
 
     @Test
@@ -87,8 +88,8 @@
         updateControllerZenPolicy(new ZenPolicy.Builder()
                 .showAllVisualEffects()
                 .build());
-        mController.updateState(mockPref);
-        verify(mockPref).setChecked(false);
+        mController.updateState(mMockPref);
+        verify(mMockPref).setChecked(false);
     }
 
     @Test
@@ -97,8 +98,8 @@
                 .showPeeking(true)
                 .showBadges(false)
                 .build());
-        mController.updateState(mockPref);
+        mController.updateState(mMockPref);
 
-        verify(mockPref).setChecked(false);
+        verify(mMockPref).setChecked(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/panel/FakeSettingsPanelActivity.java b/tests/robotests/src/com/android/settings/panel/FakeSettingsPanelActivity.java
index 2a62b54..ba763ce 100644
--- a/tests/robotests/src/com/android/settings/panel/FakeSettingsPanelActivity.java
+++ b/tests/robotests/src/com/android/settings/panel/FakeSettingsPanelActivity.java
@@ -30,4 +30,4 @@
         final Intent intent = new Intent(FakePanelContent.FAKE_ACTION);
         return intent;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/panel/MediaOutputGroupPanelTest.java b/tests/robotests/src/com/android/settings/panel/MediaOutputGroupPanelTest.java
deleted file mode 100644
index 003fda7..0000000
--- a/tests/robotests/src/com/android/settings/panel/MediaOutputGroupPanelTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.panel;
-
-import static com.android.settings.media.MediaOutputSlice.MEDIA_PACKAGE_NAME;
-
-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.net.Uri;
-
-import com.android.settings.slices.CustomSliceRegistry;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class MediaOutputGroupPanelTest {
-
-    private static final String TEST_PACKAGENAME = "com.test.packagename";
-
-    private MediaOutputGroupPanel mPanel;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        mPanel = MediaOutputGroupPanel.create(mContext, TEST_PACKAGENAME);
-    }
-
-    @Test
-    public void getSlices_containsNecessarySlices() {
-        final List<Uri> uris = mPanel.getSlices();
-
-        assertThat(uris).containsExactly(CustomSliceRegistry.MEDIA_OUTPUT_GROUP_SLICE_URI);
-    }
-
-    @Test
-    public void getSlices_verifyPackageName_isEqual() {
-        final List<Uri> uris = mPanel.getSlices();
-
-        assertThat(uris.get(0).getQueryParameter(MEDIA_PACKAGE_NAME)).isEqualTo(TEST_PACKAGENAME);
-    }
-
-    @Test
-    public void getSeeMoreIntent_isNull() {
-        assertThat(mPanel.getSeeMoreIntent()).isNull();
-    }
-
-    @Test
-    public void getViewType_checkType() {
-        assertThat(mPanel.getViewType()).isEqualTo(PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java b/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
deleted file mode 100644
index 2ab428d..0000000
--- a/tests/robotests/src/com/android/settings/panel/MediaOutputPanelTest.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-package com.android.settings.panel;
-
-import static com.android.settings.media.MediaOutputSlice.MEDIA_PACKAGE_NAME;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.media.MediaDescription;
-import android.media.MediaMetadata;
-import android.media.session.MediaController;
-import android.media.session.MediaSessionManager;
-import android.media.session.PlaybackState;
-import android.net.Uri;
-
-import com.android.settings.R;
-import com.android.settings.slices.CustomSliceRegistry;
-import com.android.settingslib.media.InfoMediaDevice;
-import com.android.settingslib.media.LocalMediaManager;
-import com.android.settingslib.media.PhoneMediaDevice;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class MediaOutputPanelTest {
-
-    private static final String TEST_PACKAGENAME = "com.test.packagename";
-    private static final String TEST_PACKAGENAME2 = "com.test.packagename2";
-    private static final String TEST_ARTIST = "test_artist";
-    private static final String TEST_SONG = "test_song";
-
-    @Mock
-    private MediaSessionManager mMediaSessionManager;
-    @Mock
-    private MediaController mMediaController;
-    @Mock
-    private MediaMetadata mMediaMetadata;
-    @Mock
-    private LocalMediaManager mLocalMediaManager;
-    @Mock
-    private PanelContentCallback mCallback;
-    @Mock
-    private PlaybackState mPlaybackState;
-
-    private MediaOutputPanel mPanel;
-    private Context mContext;
-    private List<MediaController> mMediaControllers = new ArrayList<>();
-    private ArgumentCaptor<MediaController.Callback> mControllerCbs =
-            ArgumentCaptor.forClass(MediaController.Callback.class);
-    private MediaDescription mMediaDescription;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-
-        mMediaControllers.add(mMediaController);
-        when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGENAME);
-        when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers);
-        when(mContext.getApplicationContext()).thenReturn(mContext);
-        when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager);
-        MediaDescription.Builder builder = new MediaDescription.Builder();
-        builder.setTitle(TEST_SONG);
-        builder.setSubtitle(TEST_ARTIST);
-        mMediaDescription = builder.build();
-        when(mMediaMetadata.getDescription()).thenReturn(mMediaDescription);
-
-        mPanel = MediaOutputPanel.create(mContext, TEST_PACKAGENAME);
-        mPanel.mLocalMediaManager = mLocalMediaManager;
-        mPanel.registerCallback(mCallback);
-    }
-
-    @Test
-    public void getSlices_containsNecessarySlices() {
-        final List<Uri> uris = mPanel.getSlices();
-
-        assertThat(uris).containsExactly(CustomSliceRegistry.MEDIA_OUTPUT_SLICE_URI);
-    }
-
-    @Test
-    public void getSlices_verifyPackageName_isEqual() {
-        final List<Uri> uris = mPanel.getSlices();
-
-        assertThat(uris.get(0).getQueryParameter(MEDIA_PACKAGE_NAME)).isEqualTo(TEST_PACKAGENAME);
-    }
-
-    @Test
-    public void getSeeMoreIntent_isNull() {
-        assertThat(mPanel.getSeeMoreIntent()).isNull();
-    }
-
-    @Test
-    public void onStart_shouldRegisterCallback() {
-        mPanel.onStart();
-
-        verify(mMediaController).registerCallback(any());
-        verify(mLocalMediaManager).registerCallback(any());
-        verify(mLocalMediaManager).startScan();
-    }
-
-    @Test
-    public void onStart_activeSession_verifyOnHeaderChanged() {
-        mPanel.onStart();
-
-        verify(mCallback).onHeaderChanged();
-    }
-
-    @Test
-    public void onStart_noMatchedActiveSession_verifyNeverOnHeaderChanged() {
-        when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGENAME2);
-        mPanel.onStart();
-
-        verify(mCallback, never()).onHeaderChanged();
-    }
-
-    @Test
-    public void onStop_shouldUnregisterCallback() {
-        mPanel.onStop();
-
-        verify(mLocalMediaManager).unregisterCallback(any());
-        verify(mLocalMediaManager).stopScan();
-    }
-
-    @Test
-    public void onSelectedDeviceStateChanged_shouldDispatchCustomButtonStateChanged() {
-        mPanel.onSelectedDeviceStateChanged(null, 0);
-
-        verify(mCallback).onCustomizedButtonStateChanged();
-    }
-
-    @Test
-    public void onDeviceListUpdate_shouldDispatchCustomButtonStateChanged() {
-        mPanel.onDeviceListUpdate(null);
-
-        verify(mCallback).onCustomizedButtonStateChanged();
-    }
-
-    @Test
-    public void onDeviceAttributesChanged_shouldDispatchCustomButtonStateChanged() {
-        mPanel.onDeviceAttributesChanged();
-
-        verify(mCallback).onCustomizedButtonStateChanged();
-    }
-
-    @Test
-    public void currentConnectDeviceIsInfoDevice_useCustomButtonIsTrue() {
-        final InfoMediaDevice infoMediaDevice = mock(InfoMediaDevice.class);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(infoMediaDevice);
-
-        mPanel.onDeviceAttributesChanged();
-
-        assertThat(mPanel.isCustomizedButtonUsed()).isTrue();
-    }
-
-    @Test
-    public void currentConnectDeviceIsNotInfoDevice_useCustomButtonIsFalse() {
-        final PhoneMediaDevice phoneMediaDevice = mock(PhoneMediaDevice.class);
-        when(mLocalMediaManager.getCurrentConnectedDevice()).thenReturn(phoneMediaDevice);
-
-        mPanel.onDeviceAttributesChanged();
-
-        assertThat(mPanel.isCustomizedButtonUsed()).isFalse();
-    }
-
-    @Test
-    public void getTitle_withMetadata_returnSongName() {
-        mPanel.onStart();
-        when(mMediaController.getMetadata()).thenReturn(mMediaMetadata);
-
-        assertThat(mPanel.getTitle()).isEqualTo(TEST_SONG);
-    }
-
-    @Test
-    public void getTitle_noMetadata_returnDefaultString() {
-        when(mMediaController.getMetadata()).thenReturn(null);
-
-        assertThat(mPanel.getTitle()).isEqualTo(mContext.getText(R.string.media_volume_title));
-    }
-    @Test
-    public void getTitle_noPackageName_returnDefaultString() {
-        mPanel = MediaOutputPanel.create(mContext, null);
-        when(mMediaController.getMetadata()).thenReturn(mMediaMetadata);
-
-        assertThat(mPanel.getTitle()).isEqualTo(mContext.getText(R.string.media_volume_title));
-    }
-
-    @Test
-    public void getTitle_noController_defaultString() {
-        mMediaControllers.clear();
-        when(mMediaMetadata.getString(MediaMetadata.METADATA_KEY_ARTIST)).thenReturn(TEST_ARTIST);
-        when(mMediaController.getMetadata()).thenReturn(mMediaMetadata);
-        mPanel = MediaOutputPanel.create(mContext, TEST_PACKAGENAME);
-
-        assertThat(mPanel.getTitle()).isEqualTo(mContext.getText(R.string.media_volume_title));
-    }
-
-    @Test
-    public void getSubTitle_withMetadata_returnArtistName() {
-        mPanel.onStart();
-        when(mMediaController.getMetadata()).thenReturn(mMediaMetadata);
-
-        assertThat(mPanel.getSubTitle()).isEqualTo(TEST_ARTIST);
-    }
-
-    @Test
-    public void getSubTitle_noMetadata_returnDefault() {
-        when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGENAME);
-        when(mMediaController.getMetadata()).thenReturn(null);
-
-        assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText(
-                R.string.media_output_panel_title));
-    }
-
-    @Test
-    public void getSubTitle_noPackageName_returnDefault() {
-        mPanel = MediaOutputPanel.create(mContext, null);
-        when(mMediaController.getMetadata()).thenReturn(mMediaMetadata);
-
-        assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText(
-                R.string.media_output_panel_title));
-    }
-
-    @Test
-    public void getSubTitle_noController_returnDefault() {
-        mMediaControllers.clear();
-        mPanel = MediaOutputPanel.create(mContext, TEST_PACKAGENAME);
-        when(mMediaController.getMetadata()).thenReturn(mMediaMetadata);
-
-        assertThat(mPanel.getSubTitle()).isEqualTo(mContext.getText(
-                R.string.media_output_panel_title));
-    }
-
-    @Test
-    public void onClickCustomizedButton_shouldReleaseSession() {
-        mPanel.onClickCustomizedButton();
-
-        verify(mLocalMediaManager).releaseSession();
-    }
-
-    @Test
-    public void onMetadataChanged_verifyCallOnHeaderChanged() {
-        mPanel.onStart();
-        verify(mCallback).onHeaderChanged();
-        verify(mMediaController).registerCallback(mControllerCbs.capture());
-        final MediaController.Callback controllerCallbacks = mControllerCbs.getValue();
-
-        controllerCallbacks.onMetadataChanged(mMediaMetadata);
-
-        verify(mCallback, times(2)).onHeaderChanged();
-    }
-
-    @Test
-    public void onPlaybackStateChanged_stateFromPlayingToStopped_verifyCallForceClose() {
-        mPanel.onStart();
-        verify(mMediaController).registerCallback(mControllerCbs.capture());
-        final MediaController.Callback controllerCallbacks = mControllerCbs.getValue();
-        when(mPlaybackState.getState()).thenReturn(PlaybackState.STATE_PLAYING);
-        controllerCallbacks.onPlaybackStateChanged(mPlaybackState);
-        verify(mCallback, never()).forceClose();
-
-        when(mPlaybackState.getState()).thenReturn(PlaybackState.STATE_STOPPED);
-        controllerCallbacks.onPlaybackStateChanged(mPlaybackState);
-
-        verify(mCallback).forceClose();
-    }
-
-    @Test
-    public void onPlaybackStateChanged_stateFromPlayingToPaused_verifyCallForceClose() {
-        mPanel.onStart();
-        verify(mMediaController).registerCallback(mControllerCbs.capture());
-        final MediaController.Callback controllerCallbacks = mControllerCbs.getValue();
-        when(mPlaybackState.getState()).thenReturn(PlaybackState.STATE_PLAYING);
-        controllerCallbacks.onPlaybackStateChanged(mPlaybackState);
-        verify(mCallback, never()).forceClose();
-
-        when(mPlaybackState.getState()).thenReturn(PlaybackState.STATE_PAUSED);
-        controllerCallbacks.onPlaybackStateChanged(mPlaybackState);
-
-        verify(mCallback).forceClose();
-    }
-
-    @Test
-    public void getViewType_checkType() {
-        assertThat(mPanel.getViewType()).isEqualTo(PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/panel/NfcPanelTest.java b/tests/robotests/src/com/android/settings/panel/NfcPanelTest.java
deleted file mode 100644
index 1de2c5a..0000000
--- a/tests/robotests/src/com/android/settings/panel/NfcPanelTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.panel;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.net.Uri;
-
-import com.android.settings.slices.CustomSliceRegistry;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class NfcPanelTest {
-
-    private NfcPanel mPanel;
-
-    @Before
-    public void setUp() {
-        mPanel = NfcPanel.create(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void getSlices_containsNecessarySlices() {
-        final List<Uri> uris = mPanel.getSlices();
-
-        assertThat(uris).containsExactly(
-                CustomSliceRegistry.NFC_SLICE_URI);
-    }
-
-    @Test
-    public void getSeeMoreIntent_notNull() {
-        assertThat(mPanel.getSeeMoreIntent()).isNotNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
deleted file mode 100644
index 54f1894..0000000
--- a/tests/robotests/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.panel;
-
-import static com.android.settings.panel.SettingsPanelActivity.KEY_MEDIA_PACKAGE_NAME;
-import static com.android.settings.panel.SettingsPanelActivity.KEY_PANEL_TYPE_ARGUMENT;
-import static com.android.settingslib.media.MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.provider.Settings;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class PanelFeatureProviderImplTest {
-
-    private static final String TEST_PACKAGENAME = "com.test.packagename";
-
-    private Context mContext;
-    private PanelFeatureProviderImpl mProvider;
-    private Bundle mBundle;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mProvider = new PanelFeatureProviderImpl();
-        mBundle = new Bundle();
-        mBundle.putString(KEY_MEDIA_PACKAGE_NAME, TEST_PACKAGENAME);
-    }
-
-    @Test
-    public void getPanel_internetConnectivityKey_returnsCorrectPanel() {
-        mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, Settings.Panel.ACTION_INTERNET_CONNECTIVITY);
-
-        final PanelContent panel = mProvider.getPanel(mContext, mBundle);
-
-        assertThat(panel).isInstanceOf(InternetConnectivityPanel.class);
-    }
-
-    @Test
-    public void getPanel_volume_returnsCorrectPanel() {
-        mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, Settings.Panel.ACTION_VOLUME);
-
-        final PanelContent panel = mProvider.getPanel(mContext, mBundle);
-
-        assertThat(panel).isInstanceOf(VolumePanel.class);
-    }
-
-    @Test
-    public void getPanel_mediaOutputKey_returnsCorrectPanel() {
-        mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, ACTION_MEDIA_OUTPUT);
-
-        final PanelContent panel = mProvider.getPanel(mContext, mBundle);
-
-        assertThat(panel).isInstanceOf(MediaOutputPanel.class);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java b/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java
index 405e4c3..41935c4 100644
--- a/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java
@@ -18,7 +18,6 @@
 package com.android.settings.panel;
 
 import static com.android.settings.panel.PanelContent.VIEW_TYPE_SLIDER;
-import static com.android.settings.panel.PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -213,22 +212,6 @@
     }
 
     @Test
-    public void sliderLargeIconPanelType_displayFooterDivider() {
-        mFakePanelContent.setViewType(VIEW_TYPE_SLIDER_LARGE_ICON);
-        final ActivityController<FakeSettingsPanelActivity> activityController =
-                Robolectric.buildActivity(FakeSettingsPanelActivity.class);
-        activityController.setup();
-        final PanelFragment panelFragment = (PanelFragment)
-                Objects.requireNonNull(activityController
-                        .get()
-                        .getSupportFragmentManager()
-                        .findFragmentById(R.id.main_content));
-        final View footerDivider = panelFragment.mLayoutView.findViewById(R.id.footer_divider);
-        // Check visibility
-        assertThat(footerDivider.getVisibility()).isEqualTo(View.VISIBLE);
-    }
-
-    @Test
     public void sliderPanelType_notDisplayFooterDivider() {
         mFakePanelContent.setViewType(VIEW_TYPE_SLIDER);
         final ActivityController<FakeSettingsPanelActivity> activityController =
diff --git a/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java b/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java
index f8c2f84..ac74fe5 100644
--- a/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java
@@ -17,11 +17,8 @@
 package com.android.settings.panel;
 
 import static com.android.settings.panel.PanelContent.VIEW_TYPE_SLIDER;
-import static com.android.settings.panel.PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON;
 import static com.android.settings.panel.PanelSlicesAdapter.MAX_NUM_OF_SLICES;
-import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_GROUP_SLICE_URI;
 import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_INDICATOR_SLICE_URI;
-import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_SLICE_URI;
 import static com.android.settings.slices.CustomSliceRegistry.VOLUME_MEDIA_URI;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -144,22 +141,6 @@
     }
 
     @Test
-    public void sliderLargeIconPanel_shouldNotAllowDividerBelow() {
-        addTestLiveData(MEDIA_OUTPUT_SLICE_URI);
-        mFakePanelContent.setViewType(PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON);
-
-        final PanelSlicesAdapter adapter =
-                new PanelSlicesAdapter(mPanelFragment, mData, 0 /* metrics category */);
-        final int position = 0;
-        final ViewGroup view = new FrameLayout(mContext);
-        final SliceRowViewHolder viewHolder =
-                adapter.onCreateViewHolder(view, PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON);
-        adapter.onBindViewHolder(viewHolder, position);
-
-        assertThat(viewHolder.isDividerAllowedBelow()).isFalse();
-    }
-
-    @Test
     public void sliderPanelType_shouldAllowDividerBelow() {
         addTestLiveData(VOLUME_MEDIA_URI);
         mFakePanelContent.setViewType(PanelContent.VIEW_TYPE_SLIDER);
@@ -191,42 +172,6 @@
     }
 
     @Test
-    public void outputSwitcherSlice_shouldAddFirstItemPadding() {
-        addTestLiveData(MEDIA_OUTPUT_SLICE_URI);
-
-        final PanelSlicesAdapter adapter =
-                new PanelSlicesAdapter(mPanelFragment, mData, 0 /* metrics category */);
-        final int position = 0;
-        final ViewGroup view = new FrameLayout(mContext);
-        final SliceRowViewHolder viewHolder =
-                adapter.onCreateViewHolder(view, PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON);
-
-        adapter.onBindViewHolder(viewHolder, position);
-
-        assertThat(viewHolder.mSliceSliderLayout.getPaddingTop()).isEqualTo(
-                mPanelFragment.getResources().getDimensionPixelSize(
-                        R.dimen.output_switcher_slice_padding_top));
-    }
-
-    @Test
-    public void outputSwitcherGroupSlice_shouldAddFirstItemPadding() {
-        addTestLiveData(MEDIA_OUTPUT_GROUP_SLICE_URI);
-
-        final PanelSlicesAdapter adapter =
-                new PanelSlicesAdapter(mPanelFragment, mData, 0 /* metrics category */);
-        final int position = 0;
-        final ViewGroup view = new FrameLayout(mContext);
-        final SliceRowViewHolder viewHolder =
-                adapter.onCreateViewHolder(view, PanelContent.VIEW_TYPE_SLIDER_LARGE_ICON);
-
-        adapter.onBindViewHolder(viewHolder, position);
-
-        assertThat(viewHolder.mSliceSliderLayout.getPaddingTop()).isEqualTo(
-                mPanelFragment.getResources().getDimensionPixelSize(
-                        R.dimen.output_switcher_slice_padding_top));
-    }
-
-    @Test
     public void mediaOutputIndicatorSlice_notSliderPanel_noSliderLayout() {
         addTestLiveData(MEDIA_OUTPUT_INDICATOR_SLICE_URI);
 
@@ -256,19 +201,6 @@
     }
 
     @Test
-    public void onCreateViewHolder_viewTypeSliderLargeIcon_verifyLayout() {
-        final PanelSlicesAdapter adapter = new PanelSlicesAdapter(mPanelFragment, mData, 0);
-        final ViewGroup view = new FrameLayout(mContext);
-        final ArgumentCaptor<Integer> intArgumentCaptor = ArgumentCaptor.forClass(Integer.class);
-
-        adapter.onCreateViewHolder(view, VIEW_TYPE_SLIDER_LARGE_ICON);
-
-        verify(sLayoutInflater).inflate(intArgumentCaptor.capture(), eq(view), eq(false));
-        assertThat(intArgumentCaptor.getValue()).isEqualTo(
-                R.layout.panel_slice_slider_row_large_icon);
-    }
-
-    @Test
     public void onCreateViewHolder_viewTypeDefault_verifyLayout() {
         final PanelSlicesAdapter adapter =
                 new PanelSlicesAdapter(mPanelFragment, mData, 0);
diff --git a/tests/robotests/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatchTest.java b/tests/robotests/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatchTest.java
deleted file mode 100644
index dd8a91f..0000000
--- a/tests/robotests/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatchTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package com.android.settings.panel;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.net.Uri;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class PanelSlicesLoaderCountdownLatchTest {
-
-    private Context mContext;
-    private PanelSlicesLoaderCountdownLatch mSliceCountdownLatch;
-
-    private static final Uri[] URIS = new Uri[] {
-      Uri.parse("content://testUri"),
-      Uri.parse("content://wowUri"),
-      Uri.parse("content://boxTurtle")
-    };
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mSliceCountdownLatch = new PanelSlicesLoaderCountdownLatch(URIS.length);
-    }
-
-
-    @Test
-    public void hasLoaded_newObject_returnsFalse() {
-        assertThat(mSliceCountdownLatch.isSliceLoaded(URIS[0])).isFalse();
-    }
-
-    @Test
-    public void hasLoaded_markSliceLoaded_returnsTrue() {
-        mSliceCountdownLatch.markSliceLoaded(URIS[0]);
-
-        assertThat(mSliceCountdownLatch.isSliceLoaded(URIS[0])).isTrue();
-    }
-
-    @Test
-    public void markSliceLoaded_onlyCountsDownUniqueUris() {
-        for (int i = 0; i < URIS.length; i++) {
-            mSliceCountdownLatch.markSliceLoaded(URIS[0]);
-        }
-
-        assertThat(mSliceCountdownLatch.isPanelReadyToLoad()).isFalse();
-    }
-
-    @Test
-    public void areSlicesReadyToLoad_allSlicesLoaded_returnsTrue() {
-        for (int i = 0; i < URIS.length; i++) {
-            mSliceCountdownLatch.markSliceLoaded(URIS[i]);
-        }
-
-        assertThat(mSliceCountdownLatch.isPanelReadyToLoad()).isTrue();
-    }
-
-    @Test
-    public void areSlicesReadyToLoad_onlyReturnsTrueOnce() {
-        for (int i = 0; i < URIS.length; i++) {
-            mSliceCountdownLatch.markSliceLoaded(URIS[i]);
-        }
-
-        // Verify that it returns true once
-        assertThat(mSliceCountdownLatch.isPanelReadyToLoad()).isTrue();
-        // Verify the second call returns false without external state change
-        assertThat(mSliceCountdownLatch.isPanelReadyToLoad()).isFalse();
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java b/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
index 833d510..25e1786 100644
--- a/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
+++ b/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java
@@ -18,24 +18,24 @@
 
 import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;
 
-import static com.android.settings.panel.SettingsPanelActivity.KEY_MEDIA_PACKAGE_NAME;
-import static com.android.settings.panel.SettingsPanelActivity.KEY_PANEL_TYPE_ARGUMENT;
-
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.fragment.app.FragmentManager;
+
+import com.android.settings.R;
 import com.android.settings.core.HideNonSystemOverlayMixin;
 import com.android.settings.testutils.FakeFeatureFactory;
 
@@ -43,6 +43,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
@@ -56,6 +57,10 @@
     private FakeSettingsPanelActivity mSettingsPanelActivity;
     private PanelFeatureProvider mPanelFeatureProvider;
     private FakePanelContent mFakePanelContent;
+    @Mock
+    private PanelFragment mPanelFragment;
+    @Mock
+    private FragmentManager mFragmentManager;
 
     @Before
     public void setUp() {
@@ -67,35 +72,10 @@
         mFakeFeatureFactory.panelFeatureProvider = mPanelFeatureProvider;
         mFakePanelContent = new FakePanelContent();
         doReturn(mFakePanelContent).when(mPanelFeatureProvider).getPanel(any(), any());
-    }
 
-    @Test
-    public void startMediaOutputSlice_withPackageName_bundleShouldHaveValue() {
-        final Intent intent = new Intent()
-                .setAction("com.android.settings.panel.action.MEDIA_OUTPUT")
-                .putExtra("com.android.settings.panel.extra.PACKAGE_NAME",
-                        "com.google.android.music");
-
-        final SettingsPanelActivity activity =
-                Robolectric.buildActivity(SettingsPanelActivity.class, intent).create().get();
-
-        assertThat(activity.mBundle.getString(KEY_MEDIA_PACKAGE_NAME))
-                .isEqualTo("com.google.android.music");
-        assertThat(activity.mBundle.getString(KEY_PANEL_TYPE_ARGUMENT))
-                .isEqualTo("com.android.settings.panel.action.MEDIA_OUTPUT");
-    }
-
-    @Test
-    public void startMediaOutputSlice_withoutPackageName_bundleShouldHaveValue() {
-        final Intent intent = new Intent()
-                .setAction("com.android.settings.panel.action.MEDIA_OUTPUT");
-
-        final SettingsPanelActivity activity =
-                Robolectric.buildActivity(SettingsPanelActivity.class, intent).create().get();
-
-        assertThat(activity.mBundle.containsKey(KEY_MEDIA_PACKAGE_NAME)).isTrue();
-        assertThat(activity.mBundle.getString(KEY_PANEL_TYPE_ARGUMENT))
-                .isEqualTo("com.android.settings.panel.action.MEDIA_OUTPUT");
+        mSettingsPanelActivity.mPanelFragment = mPanelFragment;
+        when(mFragmentManager.findFragmentById(R.id.main_content)).thenReturn(mPanelFragment);
+        when(mSettingsPanelActivity.getSupportFragmentManager()).thenReturn(mFragmentManager);
     }
 
     @Test
@@ -142,10 +122,61 @@
     }
 
     @Test
+    public void onStop_panelIsNotCreating_shouldForceUpdate() {
+        mSettingsPanelActivity.mForceCreation = false;
+        when(mPanelFragment.isPanelCreating()).thenReturn(false);
+        mSettingsPanelActivity.mPanelFragment = mPanelFragment;
+
+        mSettingsPanelActivity.onStop();
+
+        assertThat(mSettingsPanelActivity.mForceCreation).isTrue();
+    }
+
+    @Test
+    public void onStop_panelIsCreating_shouldNotForceUpdate() {
+        mSettingsPanelActivity.mForceCreation = false;
+        when(mPanelFragment.isPanelCreating()).thenReturn(true);
+        mSettingsPanelActivity.mPanelFragment = mPanelFragment;
+
+        mSettingsPanelActivity.onStop();
+
+        assertThat(mSettingsPanelActivity.mForceCreation).isFalse();
+    }
+
+    @Test
     public void onConfigurationChanged_shouldForceUpdate() {
         mSettingsPanelActivity.mForceCreation = false;
+
         mSettingsPanelActivity.onConfigurationChanged(new Configuration());
 
         assertThat(mSettingsPanelActivity.mForceCreation).isTrue();
     }
+
+    @Test
+    public void onNewIntent_panelIsNotCreating_shouldUpdatePanel() {
+        when(mPanelFragment.isPanelCreating()).thenReturn(false);
+
+        mSettingsPanelActivity.onNewIntent(mSettingsPanelActivity.getIntent());
+
+        verify(mPanelFragment).updatePanelWithAnimation();
+    }
+
+    @Test
+    public void onNewIntent_panelIsCreating_shouldNotUpdatePanel() {
+        when(mPanelFragment.isPanelCreating()).thenReturn(true);
+
+        mSettingsPanelActivity.onNewIntent(mSettingsPanelActivity.getIntent());
+
+        verify(mPanelFragment, never()).updatePanelWithAnimation();
+    }
+
+    @Test
+    public void onNewIntent_panelIsShowingTheSameAction_shouldNotUpdatePanel() {
+        when(mPanelFragment.isPanelCreating()).thenReturn(false);
+        when(mPanelFragment.getArguments()).thenReturn(mSettingsPanelActivity.mBundle);
+
+        mSettingsPanelActivity.onNewIntent(mSettingsPanelActivity.getIntent());
+
+        verify(mPanelFragment, never()).updatePanelWithAnimation();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/panel/WifiPanelTest.java b/tests/robotests/src/com/android/settings/panel/WifiPanelTest.java
deleted file mode 100644
index 08db23e..0000000
--- a/tests/robotests/src/com/android/settings/panel/WifiPanelTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.panel;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.net.Uri;
-
-import com.android.settings.slices.CustomSliceRegistry;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class WifiPanelTest {
-
-    private WifiPanel mPanel;
-
-    @Before
-    public void setUp() {
-        mPanel = WifiPanel.create(RuntimeEnvironment.application);
-    }
-
-    @Test
-    public void getSlices_containsNecessarySlices() {
-        final List<Uri> uris = mPanel.getSlices();
-
-        assertThat(uris).containsExactly(
-                CustomSliceRegistry.WIFI_SLICE_URI);
-    }
-
-    @Test
-    public void getSeeMoreIntent_notNull() {
-        assertThat(mPanel.getSeeMoreIntent()).isNotNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
index 4adc01b..5067de6 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericControllerTest.java
@@ -22,6 +22,7 @@
 import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -84,24 +85,24 @@
     public void isScreenLockVisible_shouldRespectResourceConfig() {
         for (ScreenLockType lock : ScreenLockType.values()) {
             // All locks except managed defaults to visible
-            assertThat(mController.isScreenLockVisible(lock)).named(lock + " visible")
+            assertWithMessage(lock + " visible").that(mController.isScreenLockVisible(lock))
                     .isEqualTo(lock != ScreenLockType.MANAGED);
         }
 
         SettingsShadowResources.overrideResource(R.bool.config_hide_none_security_option, true);
         SettingsShadowResources.overrideResource(R.bool.config_hide_swipe_security_option, true);
-        assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
+        assertWithMessage("NONE visible").that(mController.isScreenLockVisible(ScreenLockType.NONE))
                 .isFalse();
-        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
-                .isFalse();
+        assertWithMessage("SWIPE visible").that(
+                mController.isScreenLockVisible(ScreenLockType.SWIPE)).isFalse();
     }
 
     @Test
     public void isScreenLockVisible_notCurrentUser_shouldHideInsecure() {
         mController = new ChooseLockGenericController(application, 1 /* userId */);
-        assertThat(mController.isScreenLockVisible(ScreenLockType.SWIPE)).named("SWIPE visible")
-                .isFalse();
-        assertThat(mController.isScreenLockVisible(ScreenLockType.NONE)).named("NONE visible")
+        assertWithMessage("SWIPE visible").that(
+                mController.isScreenLockVisible(ScreenLockType.SWIPE)).isFalse();
+        assertWithMessage("NONE visible").that(mController.isScreenLockVisible(ScreenLockType.NONE))
                 .isFalse();
     }
 
@@ -109,34 +110,31 @@
     public void isScreenLockVisible_managedPasswordChoosable_shouldShowManaged() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
 
-        assertThat(mController.isScreenLockVisible(ScreenLockType.MANAGED)).named("MANAGED visible")
-                .isTrue();
+        assertWithMessage("MANAGED visible").that(
+                mController.isScreenLockVisible(ScreenLockType.MANAGED)).isTrue();
     }
 
     @Test
     public void isScreenLockEnabled_lowerQuality_shouldReturnFalse() {
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality + 1))
-                    .named(lock + " enabled")
-                    .isFalse();
+            assertWithMessage(lock + " enabled").that(
+                    mController.isScreenLockEnabled(lock, lock.maxQuality + 1)).isFalse();
         }
     }
 
     @Test
     public void isScreenLockEnabled_equalQuality_shouldReturnTrue() {
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.defaultQuality))
-                    .named(lock + " enabled")
-                    .isTrue();
+            assertWithMessage(lock + " enabled").that(
+                    mController.isScreenLockEnabled(lock, lock.defaultQuality)).isTrue();
         }
     }
 
     @Test
     public void isScreenLockEnabled_higherQuality_shouldReturnTrue() {
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockEnabled(lock, lock.maxQuality - 1))
-                    .named(lock + " enabled")
-                    .isTrue();
+            assertWithMessage(lock + " enabled").that(
+                    mController.isScreenLockEnabled(lock, lock.maxQuality - 1)).isTrue();
         }
     }
 
@@ -144,9 +142,8 @@
     public void isScreenLockDisabledByAdmin_lowerQuality_shouldReturnTrue() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1))
-                    .named(lock + " disabledByAdmin")
-                    .isTrue();
+            assertWithMessage(lock + " disabledByAdmin").that(
+                    mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality + 1)).isTrue();
         }
     }
 
@@ -154,9 +151,8 @@
     public void isScreenLockDisabledByAdmin_equalQuality_shouldReturnFalse() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality))
-                    .named(lock + " disabledByAdmin")
-                    .isFalse();
+            assertWithMessage(lock + " disabledByAdmin").that(
+                    mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality)).isFalse();
         }
     }
 
@@ -164,18 +160,16 @@
     public void isScreenLockDisabledByAdmin_higherQuality_shouldReturnFalse() {
         doReturn(true).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
         for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1))
-                    .named(lock + " disabledByAdmin")
-                    .isFalse();
+            assertWithMessage(lock + " disabledByAdmin").that(
+                    mController.isScreenLockDisabledByAdmin(lock, lock.maxQuality - 1)).isFalse();
         }
     }
 
     @Test
     public void isScreenLockDisabledByAdmin_managedNotChoosable_shouldReturnTrue() {
         doReturn(false).when(mManagedLockPasswordProvider).isManagedPasswordChoosable();
-        assertThat(mController.isScreenLockDisabledByAdmin(
+        assertWithMessage("MANANGED disabledByAdmin").that(mController.isScreenLockDisabledByAdmin(
                 ScreenLockType.MANAGED, DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
-                .named("MANANGED disabledByAdmin")
                 .isTrue();
     }
 
@@ -218,7 +212,7 @@
 
         final int upgradedQuality =
             mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
-        assertThat(upgradedQuality).named("upgradedQuality")
+        assertWithMessage("upgradedQuality").that(upgradedQuality)
                 .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
     }
 
@@ -230,7 +224,7 @@
 
         final int upgradedQuality =
             mController.upgradeQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
-        assertThat(upgradedQuality).named("upgradedQuality")
+        assertWithMessage("upgradedQuality").that(upgradedQuality)
                 .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC);
     }
 
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
index 036df2c..6097980 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockGenericTest.java
@@ -21,6 +21,7 @@
 import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_LOW;
 import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_MEDIUM;
 import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
+import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
 
 import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.KEY_LOCK_SETTINGS_FOOTER;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CALLER_APP_NAME;
@@ -90,6 +91,7 @@
         Global.putInt(application.getContentResolver(), Global.DEVICE_PROVISIONED, 1);
         ShadowStorageManager.reset();
         ShadowPersistentDataBlockManager.reset();
+        ShadowLockPatternUtils.reset();
     }
 
     @Test
@@ -377,6 +379,64 @@
                 ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL)).isNotNull();
     }
 
+    @Test
+    public void updatePreferencesOrFinish_ComplexityIsReadFromDPM() {
+        ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
+        ShadowLockPatternUtils.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_HIGH);
+
+        initActivity(null);
+        mFragment.updatePreferencesOrFinish(false /* isRecreatingActivity */);
+
+        FooterPreference footer = mFragment.findPreference(KEY_LOCK_SETTINGS_FOOTER);
+        assertThat(footer.getTitle()).isEqualTo(null);
+
+        Intent intent = mFragment.getLockPasswordIntent(PASSWORD_QUALITY_COMPLEX);
+        assertThat(intent.getIntExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY,
+                PASSWORD_COMPLEXITY_NONE)).isEqualTo(PASSWORD_COMPLEXITY_HIGH);
+    }
+
+    @Test
+    public void updatePreferencesOrFinish_ComplexityIsMergedWithDPM() {
+        ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
+        ShadowLockPatternUtils.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_HIGH);
+        Intent intent = new Intent()
+                .putExtra(EXTRA_KEY_CALLER_APP_NAME, "app name")
+                .putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, PASSWORD_COMPLEXITY_LOW);
+        initActivity(intent);
+
+        mFragment.updatePreferencesOrFinish(false /* isRecreatingActivity */);
+
+        // Footer should be null because admin complexity wins.
+        FooterPreference footer = mFragment.findPreference(KEY_LOCK_SETTINGS_FOOTER);
+        assertThat(footer.getTitle()).isEqualTo(null);
+
+        Intent passwordIntent = mFragment.getLockPasswordIntent(PASSWORD_QUALITY_COMPLEX);
+        assertThat(passwordIntent.getIntExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY,
+                PASSWORD_COMPLEXITY_NONE)).isEqualTo(PASSWORD_COMPLEXITY_HIGH);
+    }
+
+    @Test
+    public void updatePreferencesOrFinish_ComplexityIsMergedWithDPM_AppIsHigher() {
+        ShadowStorageManager.setIsFileEncryptedNativeOrEmulated(false);
+        ShadowLockPatternUtils.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_LOW);
+        Intent intent = new Intent()
+                .putExtra(EXTRA_KEY_CALLER_APP_NAME, "app name")
+                .putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, PASSWORD_COMPLEXITY_HIGH);
+        initActivity(intent);
+
+        mFragment.updatePreferencesOrFinish(false /* isRecreatingActivity */);
+
+        // Footer should include app name because app requirement is higher.
+        CharSequence expectedTitle =
+                mActivity.getString(R.string.unlock_footer_high_complexity_requested, "app name");
+        FooterPreference footer = mFragment.findPreference(KEY_LOCK_SETTINGS_FOOTER);
+        assertThat(footer.getTitle()).isEqualTo(expectedTitle);
+
+        Intent passwordIntent = mFragment.getLockPasswordIntent(PASSWORD_QUALITY_COMPLEX);
+        assertThat(passwordIntent.getIntExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY,
+                PASSWORD_COMPLEXITY_NONE)).isEqualTo(PASSWORD_COMPLEXITY_HIGH);
+    }
+
     private void initActivity(@Nullable Intent intent) {
         if (intent == null) {
             intent = new Intent();
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
index 5ec6f41..0ca6a3e 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPasswordTest.java
@@ -31,8 +31,10 @@
 import static com.android.internal.widget.LockPatternUtils.PASSWORD_TYPE_KEY;
 import static com.android.settings.password.ChooseLockGeneric.CONFIRM_CREDENTIALS;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUESTED_MIN_COMPLEXITY;
+import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -54,6 +56,7 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
@@ -65,6 +68,7 @@
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
         SettingsShadowResources.class,
+        ShadowLockPatternUtils.class,
         ShadowUtils.class,
         ShadowDevicePolicyManager.class,
 })
@@ -82,6 +86,7 @@
     @After
     public void tearDown() {
         SettingsShadowResources.reset();
+        ShadowLockPatternUtils.reset();
     }
 
     @Test
@@ -92,40 +97,34 @@
                 .setUserId(123)
                 .build();
 
-        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
+        assertWithMessage("EXTRA_KEY_FORCE_VERIFY").that(
+                intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
                 .isFalse();
-        assertThat((LockscreenCredential) intent.getParcelableExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
-                .named("EXTRA_KEY_PASSWORD")
+        assertWithMessage("EXTRA_KEY_PASSWORD").that(
+                (LockscreenCredential) intent.getParcelableExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
                 .isEqualTo(LockscreenCredential.createPassword("password"));
-        assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
-                .named("PASSWORD_TYPE_KEY")
+        assertWithMessage("PASSWORD_TYPE_KEY").that(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
                 .isEqualTo(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC);
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
+        assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .isEqualTo(123);
     }
 
     @Test
-    public void intentBuilder_setChallenge_shouldAddExtras() {
+    public void intentBuilder_setRequestGatekeeperPassword_shouldAddExtras() {
         Intent intent = new IntentBuilder(application)
-                .setChallenge(12345L)
+                .setRequestGatekeeperPasswordHandle(true)
                 .setPasswordQuality(PASSWORD_QUALITY_ALPHANUMERIC)
                 .setUserId(123)
                 .build();
 
-        assertThat(intent.getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
+        assertWithMessage("EXTRA_KEY_REQUEST_GK_PW").that(
+                intent.getBooleanExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false))
                 .isTrue();
-        assertThat(intent.getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L))
-                .named("EXTRA_KEY_CHALLENGE")
-                .isEqualTo(12345L);
-        assertThat(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
-                .named("PASSWORD_TYPE_KEY")
+        assertWithMessage("PASSWORD_TYPE_KEY").that(intent.getIntExtra(PASSWORD_TYPE_KEY, 0))
                 .isEqualTo(PASSWORD_QUALITY_ALPHANUMERIC);
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
+        assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .isEqualTo(123);
     }
 
@@ -153,12 +152,12 @@
                 .setProfileToUnify(23, LockscreenCredential.createNone())
                 .build();
 
-        assertThat(intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_ID")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_ID").that(
+                intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
                 .isEqualTo(23);
-        assertThat((LockscreenCredential) intent.getParcelableExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL").that(
+                (LockscreenCredential) intent.getParcelableExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
                 .isNotNull();
     }
 
@@ -187,6 +186,7 @@
     }
 
     @Test
+    @Ignore
     public void processAndValidatePasswordRequirements_minPasswordComplexityStricter_password() {
         mShadowDpm.setPasswordQuality(PASSWORD_QUALITY_SOMETHING);
 
@@ -300,6 +300,7 @@
     }
 
     @Test
+    @Ignore
     public void processAndValidatePasswordRequirements_requirementsUpdateAccordingToMinComplexityAndUserInput_empty() {
         mShadowDpm.setPasswordQuality(PASSWORD_QUALITY_UNSPECIFIED);
 
@@ -312,6 +313,7 @@
     }
 
     @Test
+    @Ignore
     public void processAndValidatePasswordRequirements_requirementsUpdateAccordingToMinComplexityAndUserInput_numeric() {
         mShadowDpm.setPasswordQuality(PASSWORD_QUALITY_UNSPECIFIED);
 
@@ -379,6 +381,29 @@
         assertThat(drawable.getCreatedFromResId()).isNotEqualTo(R.drawable.ic_fingerprint_header);
     }
 
+    @Test
+    public void validateComplexityMergedFromDpmOnCreate() {
+        ShadowLockPatternUtils.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_LOW);
+
+        assertPasswordValidationResult(
+                /* minComplexity= */ PASSWORD_COMPLEXITY_HIGH,
+                /* passwordType= */ PASSWORD_QUALITY_NUMERIC,
+                /* userEnteredPassword= */ LockscreenCredential.createNone(),
+                "PIN must be at least 8 digits");
+    }
+
+    @Test
+    public void validateComplexityMergedFromUnificationUserOnCreate() {
+        ShadowLockPatternUtils.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_LOW);
+        ShadowLockPatternUtils.setRequiredPasswordComplexity(123, PASSWORD_COMPLEXITY_HIGH);
+
+        Intent intent = createIntentForPasswordValidation(PASSWORD_COMPLEXITY_NONE,
+                PASSWORD_QUALITY_NUMERIC);
+        intent.putExtra(EXTRA_KEY_UNIFICATION_PROFILE_ID, 123);
+        assertPasswordValidationResultForIntent(LockscreenCredential.createNone(), intent,
+                "PIN must be at least 8 digits");
+    }
+
     private ChooseLockPassword buildChooseLockPasswordActivity(Intent intent) {
         return Robolectric.buildActivity(ChooseLockPassword.class, intent).setup().get();
     }
@@ -401,14 +426,27 @@
     private void assertPasswordValidationResult(@PasswordComplexity int minComplexity,
             int passwordType, LockscreenCredential userEnteredPassword,
             String... expectedValidationResult) {
-        Intent intent = new Intent();
-        intent.putExtra(CONFIRM_CREDENTIALS, false);
-        intent.putExtra(PASSWORD_TYPE_KEY, passwordType);
-        intent.putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, minComplexity);
+        Intent intent = createIntentForPasswordValidation(minComplexity, passwordType);
+        assertPasswordValidationResultForIntent(userEnteredPassword, intent,
+                expectedValidationResult);
+    }
+
+    private void assertPasswordValidationResultForIntent(LockscreenCredential userEnteredPassword,
+            Intent intent, String... expectedValidationResult) {
         ChooseLockPassword activity = buildChooseLockPasswordActivity(intent);
         ChooseLockPasswordFragment fragment = getChooseLockPasswordFragment(activity);
         fragment.validatePassword(userEnteredPassword);
         String[] messages = fragment.convertErrorCodeToMessages();
-        assertThat(messages).asList().containsExactly((Object[]) expectedValidationResult);
+        assertThat(messages).asList().containsExactly(expectedValidationResult);
+    }
+
+    private Intent createIntentForPasswordValidation(
+            @PasswordComplexity int minComplexity,
+            int passwordType) {
+        Intent intent = new Intent();
+        intent.putExtra(CONFIRM_CREDENTIALS, false);
+        intent.putExtra(PASSWORD_TYPE_KEY, passwordType);
+        intent.putExtra(EXTRA_KEY_REQUESTED_MIN_COMPLEXITY, minComplexity);
+        return intent;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index 557e7c1..1cb946b 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.password;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -46,7 +47,7 @@
 
     @Test
     public void activityCreationTest() {
-        // Basic sanity test for activity created without crashing
+        // Basic test for activity created without crashing
         Robolectric.buildActivity(ChooseLockPattern.class, new IntentBuilder(application).build())
                 .setup().get();
     }
@@ -58,37 +59,28 @@
                 .setUserId(123)
                 .build();
 
-        assertThat(intent
-                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, true))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
+        assertWithMessage("EXTRA_KEY_FORCE_VERIFY").that(intent
+                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, false))
                 .isFalse();
-        assertThat((LockscreenCredential) intent
+        assertWithMessage("EXTRA_KEY_PASSWORD").that((LockscreenCredential) intent
                 .getParcelableExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD))
-                .named("EXTRA_KEY_PASSWORD")
                 .isEqualTo(createPattern("1234"));
-        assertThat(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
+        assertWithMessage("EXTRA_USER_ID").that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .isEqualTo(123);
     }
 
     @Test
-    public void intentBuilder_setChallenge_shouldAddExtras() {
+    public void intentBuilder_setRequestGatekeeperPassword_shouldAddExtras() {
         Intent intent = new IntentBuilder(application)
-                .setChallenge(12345L)
+                .setRequestGatekeeperPasswordHandle(true)
                 .setUserId(123)
                 .build();
 
-        assertThat(intent
-                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false))
-                .named("EXTRA_KEY_HAS_CHALLENGE")
+        assertWithMessage("EXTRA_KEY_REQUEST_GK_PW").that(intent
+                .getBooleanExtra(ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE, false))
                 .isTrue();
-        assertThat(intent
-                .getLongExtra(ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L))
-                .named("EXTRA_KEY_CHALLENGE")
-                .isEqualTo(12345L);
-        assertThat(intent
-                .getIntExtra(Intent.EXTRA_USER_ID, 0))
-                .named("EXTRA_USER_ID")
+        assertWithMessage("EXTRA_USER_ID")
+                .that(intent.getIntExtra(Intent.EXTRA_USER_ID, 0))
                 .isEqualTo(123);
     }
 
@@ -98,12 +90,12 @@
                 .setProfileToUnify(23, LockscreenCredential.createNone())
                 .build();
 
-        assertThat(intent.getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_ID")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_ID").that(intent
+                .getIntExtra(ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_ID, 0))
                 .isEqualTo(23);
-        assertThat((LockscreenCredential) intent.getParcelableExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
-                .named("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL")
+        assertWithMessage("EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL").that(
+                (LockscreenCredential) intent.getParcelableExtra(
+                        ChooseLockSettingsHelper.EXTRA_KEY_UNIFICATION_PROFILE_CREDENTIAL))
                 .isNotNull();
     }
 
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
index 64e1915..d082bde 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java
@@ -36,31 +36,26 @@
 public class ChooseLockSettingsHelperTest {
 
     @Test
-    public void testLaunchConfirmationActivityWithExternalAndChallenge() {
+    public void testLaunchConfirmationActivityWithExternal() {
         final Activity activity = Robolectric.setupActivity(Activity.class);
-        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
-        helper.launchConfirmationActivityWithExternalAndChallenge(
-            100, // request
-            "title",
-            "header",
-            "description",
-            true, // external
-            10000L,
-            UserHandle.myUserId()
-        );
+
+        ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(activity);
+        builder.setRequestCode(100)
+                .setTitle("title")
+                .setHeader("header")
+                .setDescription("description")
+                .setExternal(true)
+                .setUserId(UserHandle.myUserId());
+        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(builder);
+        helper.launch();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(activity);
         Intent startedIntent = shadowActivity.getNextStartedActivity();
 
-        assertEquals(new ComponentName("com.android.settings",
-                        ConfirmLockPattern.InternalActivity.class.getName()),
+        assertEquals(new ComponentName("com.android.settings", ConfirmLockPattern.class.getName()),
                 startedIntent.getComponent());
         assertFalse(startedIntent.getBooleanExtra(
                 ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
-        assertTrue(startedIntent.getBooleanExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
-        assertEquals(10000L, startedIntent.getLongExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
         assertTrue((startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
         assertFalse(startedIntent.getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
@@ -71,30 +66,30 @@
     }
 
     @Test
-    public void testLaunchConfirmationActivityInternalAndChallenge() {
+    public void testLaunchConfirmationActivityInternal() {
         final Activity activity = Robolectric.setupActivity(Activity.class);
-        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
-        helper.launchConfirmationActivityWithExternalAndChallenge(
-            100,
-            "title",
-            "header",
-            "description",
-            false, // external
-            10000L,
-            UserHandle.myUserId()
-        );
+
+        ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(activity);
+        builder.setRequestCode(100)
+                .setTitle("title")
+                .setHeader("header")
+                .setDescription("description")
+                .setForceVerifyPath(true)
+                .setReturnCredentials(true)
+                .setUserId(UserHandle.myUserId());
+        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(builder);
+        helper.launch();
+
         ShadowActivity shadowActivity = Shadows.shadowOf(activity);
         Intent startedIntent = shadowActivity.getNextStartedActivity();
 
         assertEquals(new ComponentName("com.android.settings",
                         ConfirmLockPattern.InternalActivity.class.getName()),
                 startedIntent.getComponent());
-        assertFalse(startedIntent.getBooleanExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, false));
         assertTrue(startedIntent.getBooleanExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE, false));
-        assertEquals(10000L, startedIntent.getLongExtra(
-                ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0L));
+                ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, true));
+        assertTrue(startedIntent.getBooleanExtra(
+                ChooseLockSettingsHelper.EXTRA_KEY_FORCE_VERIFY, true));
         assertFalse((startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
         assertFalse(startedIntent.getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
@@ -109,8 +104,14 @@
         Intent intent = new Intent()
                 .putExtra(WizardManagerHelper.EXTRA_THEME, ThemeHelper.THEME_GLIF_V2);
         Activity activity = Robolectric.buildActivity(Activity.class, intent).get();
-        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(activity);
-        helper.launchConfirmationActivity(123, "test title", true, 0 /* userId */);
+
+        ChooseLockSettingsHelper.Builder builder = new ChooseLockSettingsHelper.Builder(activity);
+        builder.setRequestCode(123)
+                .setTitle("test title")
+                .setReturnCredentials(true)
+                .setUserId(0);
+        ChooseLockSettingsHelper helper = getChooseLockSettingsHelper(builder);
+        helper.launch();
 
         ShadowActivity shadowActivity = Shadows.shadowOf(activity);
         IntentForResult startedActivity = shadowActivity.getNextStartedActivityForResult();
@@ -119,12 +120,13 @@
                 .isEqualTo(ThemeHelper.THEME_GLIF_V2);
     }
 
-    private ChooseLockSettingsHelper getChooseLockSettingsHelper(Activity activity) {
+    private ChooseLockSettingsHelper getChooseLockSettingsHelper(
+            ChooseLockSettingsHelper.Builder builder) {
         LockPatternUtils mockLockPatternUtils = mock(LockPatternUtils.class);
         when(mockLockPatternUtils.getKeyguardStoredPasswordQuality(anyInt()))
                 .thenReturn(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
 
-        ChooseLockSettingsHelper helper = new ChooseLockSettingsHelper(activity);
+        ChooseLockSettingsHelper helper = builder.build();
         helper.mLockPatternUtils = mockLockPatternUtils;
         return helper;
     }
diff --git a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java b/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
deleted file mode 100644
index 05c3f64..0000000
--- a/tests/robotests/src/com/android/settings/password/ScreenLockTypeTest.java
+++ /dev/null
@@ -1,59 +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.password;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.admin.DevicePolicyManager;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class ScreenLockTypeTest {
-
-    @Test
-    public void fromQuality_shouldReturnLockWithAssociatedQuality() {
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC))
-                .isEqualTo(ScreenLockType.PASSWORD);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC))
-                .isEqualTo(ScreenLockType.PASSWORD);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK))
-                .isNull();
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_COMPLEX))
-                .isEqualTo(ScreenLockType.PASSWORD);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_MANAGED))
-                .isEqualTo(ScreenLockType.MANAGED);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC))
-                .isEqualTo(ScreenLockType.PIN);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX))
-                .isEqualTo(ScreenLockType.PIN);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING))
-                .isEqualTo(ScreenLockType.PATTERN);
-        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
-                .isEqualTo(ScreenLockType.SWIPE);
-    }
-
-    @Test
-    public void fromKey_shouldReturnLockWithGivenKey() {
-        for (ScreenLockType lock : ScreenLockType.values()) {
-            assertThat(ScreenLockType.fromKey(lock.preferenceKey)).isEqualTo(lock);
-        }
-        assertThat(ScreenLockType.fromKey("nonexistent")).isNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
index b579347..3034807 100644
--- a/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetNewPasswordControllerTest.java
@@ -19,14 +19,11 @@
 import static android.content.pm.PackageManager.FEATURE_FACE;
 import static android.content.pm.PackageManager.FEATURE_FINGERPRINT;
 
-import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
-        .HIDE_DISABLED_PREFS;
-import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment
-        .MINIMUM_QUALITY_KEY;
-import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.HIDE_DISABLED_PREFS;
+import static com.android.settings.password.ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FACE;
 import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT;
-import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_HAS_CHALLENGE;
+import static com.android.settings.password.ChooseLockSettingsHelper.EXTRA_KEY_REQUEST_GK_PW_HANDLE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -57,8 +54,6 @@
 public final class SetNewPasswordControllerTest {
 
     private static final int CURRENT_USER_ID = 101;
-    private static final long FINGERPRINT_CHALLENGE = -9876512313131L;
-    private static final long FACE_CHALLENGE = 1352057789L;
 
     @Mock
     private PackageManager mPackageManager;
@@ -79,11 +74,7 @@
         mSetNewPasswordController = new SetNewPasswordController(
                 CURRENT_USER_ID, mPackageManager, mFingerprintManager, mFaceManager,
                 mDevicePolicyManager, mUi);
-
-        when(mFingerprintManager.preEnroll()).thenReturn(FINGERPRINT_CHALLENGE);
         when(mPackageManager.hasSystemFeature(eq(FEATURE_FINGERPRINT))).thenReturn(true);
-
-        when(mFaceManager.generateChallenge()).thenReturn(FACE_CHALLENGE);
         when(mPackageManager.hasSystemFeature(eq(FEATURE_FACE))).thenReturn(true);
     }
 
@@ -278,12 +269,8 @@
                 "All disabled preference should be removed.",
                 actualBundle.getBoolean(HIDE_DISABLED_PREFS));
         assertTrue(
-                "There must be a fingerprint challenge.",
-                actualBundle.getBoolean(EXTRA_KEY_HAS_CHALLENGE));
-        assertEquals(
-                "The fingerprint challenge must come from the FingerprintManager",
-                FINGERPRINT_CHALLENGE,
-                actualBundle.getLong(EXTRA_KEY_CHALLENGE));
+                "Fingerprint enroll must request Gatekeeper Password.",
+                actualBundle.getBoolean(EXTRA_KEY_REQUEST_GK_PW_HANDLE));
         assertTrue(
                 "The request must be a fingerprint set up request.",
                 actualBundle.getBoolean(EXTRA_KEY_FOR_FINGERPRINT));
@@ -302,12 +289,8 @@
                 "All disabled preference should be removed.",
                 actualBundle.getBoolean(HIDE_DISABLED_PREFS));
         assertTrue(
-                "There must be a face challenge.",
-                actualBundle.getBoolean(EXTRA_KEY_HAS_CHALLENGE));
-        assertEquals(
-                "The face challenge must come from the FaceManager",
-                FACE_CHALLENGE,
-                actualBundle.getLong(EXTRA_KEY_CHALLENGE));
+                "Face enroll must request Gatekeeper Password",
+                actualBundle.getBoolean(EXTRA_KEY_REQUEST_GK_PW_HANDLE));
         assertTrue(
                 "The request must be a face set up request.",
                 actualBundle.getBoolean(EXTRA_KEY_FOR_FACE));
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
index 77058c0..5242e11 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.password;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -82,7 +83,7 @@
 
     @Test
     public void createActivity_shouldNotCrash() {
-        // Basic sanity test for activity created without crashing
+        // Basic test for activity created without crashing
         final Intent intent =
                 SetupChooseLockPassword.modifyIntentForSetup(
                         application,
@@ -115,7 +116,7 @@
         activity.findViewById(R.id.screen_lock_options).performClick();
         AlertDialog latestAlertDialog = (AlertDialog) ShadowDialog.getLatestDialog();
         int count = latestAlertDialog.getListView().getCount();
-        assertThat(count).named("List items shown").isEqualTo(3);
+        assertWithMessage("List items shown").that(count).isEqualTo(3);
     }
 
     @Test
@@ -141,7 +142,7 @@
         assertThat(nextStartedActivity).isNotNull();
         assertThat(nextStartedActivity.getBooleanExtra(
                 ChooseLockGenericFragment.EXTRA_SHOW_OPTIONS_BUTTON, false)).isTrue();
-        assertThat(nextStartedActivity.getStringExtra("foo")).named("Foo extra")
+        assertWithMessage("Foo extra").that(nextStartedActivity.getStringExtra("foo"))
                 .isEqualTo("bar");
     }
 
diff --git a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
index 4852546..53e68d9 100644
--- a/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupChooseLockPatternTest.java
@@ -17,6 +17,7 @@
 package com.android.settings.password;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 
@@ -112,7 +113,7 @@
         AlertDialog chooserDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
         assertThat(chooserDialog).isNotNull();
         int count = chooserDialog.getListView().getCount();
-        assertThat(count).named("List items shown").isEqualTo(3);
+        assertWithMessage("List items shown").that(count).isEqualTo(3);
     }
 
     @Config(qualifiers = "sw400dp")
diff --git a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
index f46f68f..1de0c7b 100644
--- a/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
+++ b/tests/robotests/src/com/android/settings/password/SetupSkipDialogTest.java
@@ -46,7 +46,7 @@
     @Test
     public void frpMessages_areShownCorrectly_whenNotSupported() {
         SetupSkipDialog setupSkipDialog =
-                SetupSkipDialog.newInstance(false, false, false, false, false);
+                SetupSkipDialog.newInstance(false, false, false, false, false, false);
         setupSkipDialog.show(mActivity.getSupportFragmentManager());
 
         AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
@@ -61,7 +61,7 @@
     @Test
     public void frpMessages_areShownCorrectly_whenSupported() {
         SetupSkipDialog setupSkipDialog =
-                SetupSkipDialog.newInstance(true, false, false, false, false);
+                SetupSkipDialog.newInstance(true, false, false, false, false, false);
         setupSkipDialog.show(mActivity.getSupportFragmentManager());
 
         AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
@@ -76,7 +76,7 @@
     @Test
     public void dialogMessage_whenSkipPinSetupForFace_shouldShownCorrectly() {
         SetupSkipDialog setupSkipDialog =
-                SetupSkipDialog.newInstance(true, false, false, false, true);
+                SetupSkipDialog.newInstance(true, false, false, false, true, false);
         setupSkipDialog.show(mActivity.getSupportFragmentManager());
 
         AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
@@ -85,13 +85,14 @@
         assertThat(mActivity.getString(R.string.lock_screen_pin_skip_title)).isEqualTo(
                 shadowAlertDialog.getTitle());
 
-        assertThat(getSkipDialogMessage(false)).isEqualTo(shadowAlertDialog.getMessage());
+        assertThat(getSkipDialogMessage(false, true, false))
+                .isEqualTo(shadowAlertDialog.getMessage());
     }
 
     @Test
     public void dialogMessage_whenSkipPasswordSetupForFace_shouldShownCorrectly() {
         SetupSkipDialog setupSkipDialog =
-                SetupSkipDialog.newInstance(true, false, true, false, true);
+                SetupSkipDialog.newInstance(true, false, true, false, true, false);
         setupSkipDialog.show(mActivity.getSupportFragmentManager());
 
         AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
@@ -100,13 +101,14 @@
         assertThat(mActivity.getString(R.string.lock_screen_password_skip_title)).isEqualTo(
                 shadowAlertDialog.getTitle());
 
-        assertThat(getSkipDialogMessage(false)).isEqualTo(shadowAlertDialog.getMessage());
+        assertThat(getSkipDialogMessage(false, true, false))
+                .isEqualTo(shadowAlertDialog.getMessage());
     }
 
     @Test
     public void dialogMessage_whenSkipPatternSetupForFace_shouldShownCorrectly() {
         SetupSkipDialog setupSkipDialog =
-                SetupSkipDialog.newInstance(true, true, false, false, true);
+                SetupSkipDialog.newInstance(true, true, false, false, true, false);
         setupSkipDialog.show(mActivity.getSupportFragmentManager());
 
         AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
@@ -115,13 +117,14 @@
         assertThat(mActivity.getString(R.string.lock_screen_pattern_skip_title)).isEqualTo(
                 shadowAlertDialog.getTitle());
 
-        assertThat(getSkipDialogMessage(false)).isEqualTo(shadowAlertDialog.getMessage());
+        assertThat(getSkipDialogMessage(false, true, false))
+                .isEqualTo(shadowAlertDialog.getMessage());
     }
 
     @Test
     public void dialogMessage_whenSkipPinSetupForFingerprint_shouldShownCorrectly() {
         SetupSkipDialog setupSkipDialog =
-                SetupSkipDialog.newInstance(true, false, false, true, false);
+                SetupSkipDialog.newInstance(true, false, false, true, false, false);
         setupSkipDialog.show(mActivity.getSupportFragmentManager());
 
         AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
@@ -130,13 +133,14 @@
         assertThat(mActivity.getString(R.string.lock_screen_pin_skip_title)).isEqualTo(
                 shadowAlertDialog.getTitle());
 
-        assertThat(getSkipDialogMessage(true)).isEqualTo(shadowAlertDialog.getMessage());
+        assertThat(getSkipDialogMessage(true, false, false))
+                .isEqualTo(shadowAlertDialog.getMessage());
     }
 
     @Test
     public void dialogMessage_whenSkipPasswordSetupForFingerprint_shouldShownCorrectly() {
         SetupSkipDialog setupSkipDialog =
-                SetupSkipDialog.newInstance(true, false, true, true, false);
+                SetupSkipDialog.newInstance(true, false, true, true, false, false);
         setupSkipDialog.show(mActivity.getSupportFragmentManager());
 
         AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
@@ -145,13 +149,14 @@
         assertThat(mActivity.getString(R.string.lock_screen_password_skip_title)).isEqualTo(
                 shadowAlertDialog.getTitle());
 
-        assertThat(getSkipDialogMessage(true)).isEqualTo(shadowAlertDialog.getMessage());
+        assertThat(getSkipDialogMessage(true, false, false))
+                .isEqualTo(shadowAlertDialog.getMessage());
     }
 
     @Test
     public void dialogMessage_whenSkipPatternSetupForFingerprint_shouldShownCorrectly() {
         SetupSkipDialog setupSkipDialog =
-                SetupSkipDialog.newInstance(true, true, false, true, false);
+                SetupSkipDialog.newInstance(true, true, false, true, false, false);
         setupSkipDialog.show(mActivity.getSupportFragmentManager());
 
         AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
@@ -160,13 +165,71 @@
         assertThat(mActivity.getString(R.string.lock_screen_pattern_skip_title)).isEqualTo(
                 shadowAlertDialog.getTitle());
 
-        assertThat(getSkipDialogMessage(true)).isEqualTo(shadowAlertDialog.getMessage());
+        assertThat(getSkipDialogMessage(true, false, false))
+                .isEqualTo(shadowAlertDialog.getMessage());
     }
 
-    public String getSkipDialogMessage(boolean isFingerprintSupported) {
-        return String.format(
-                mActivity.getString(isFingerprintSupported ?
-                        R.string.fingerprint_lock_screen_setup_skip_dialog_text :
-                        R.string.face_lock_screen_setup_skip_dialog_text));
+
+    @Test
+    public void dialogMessage_whenSkipPinSetupForBiometrics_shouldShownCorrectly() {
+        SetupSkipDialog setupSkipDialog =
+                SetupSkipDialog.newInstance(true, false, false, false, false, true);
+        setupSkipDialog.show(mActivity.getSupportFragmentManager());
+
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        assertThat(alertDialog).isNotNull();
+        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
+        assertThat(mActivity.getString(R.string.lock_screen_pin_skip_title)).isEqualTo(
+                shadowAlertDialog.getTitle());
+
+        assertThat(getSkipDialogMessage(false, false, true))
+                .isEqualTo(shadowAlertDialog.getMessage());
+    }
+
+    @Test
+    public void dialogMessage_whenSkipPasswordSetupForBiometrics_shouldShownCorrectly() {
+        SetupSkipDialog setupSkipDialog =
+                SetupSkipDialog.newInstance(true, false, true, false, false, true);
+        setupSkipDialog.show(mActivity.getSupportFragmentManager());
+
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        assertThat(alertDialog).isNotNull();
+        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
+        assertThat(mActivity.getString(R.string.lock_screen_password_skip_title)).isEqualTo(
+                shadowAlertDialog.getTitle());
+
+        assertThat(getSkipDialogMessage(false, false, true))
+                .isEqualTo(shadowAlertDialog.getMessage());
+    }
+
+    @Test
+    public void dialogMessage_whenSkipPatternSetupForBiometrics_shouldShownCorrectly() {
+        SetupSkipDialog setupSkipDialog =
+                SetupSkipDialog.newInstance(true, true, false, false, false, true);
+        setupSkipDialog.show(mActivity.getSupportFragmentManager());
+
+        AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        assertThat(alertDialog).isNotNull();
+        ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(alertDialog);
+        assertThat(mActivity.getString(R.string.lock_screen_pattern_skip_title)).isEqualTo(
+                shadowAlertDialog.getTitle());
+
+        assertThat(getSkipDialogMessage(false, false, true))
+                .isEqualTo(shadowAlertDialog.getMessage());
+    }
+
+    public String getSkipDialogMessage(boolean forFingerprint, boolean forFace,
+            boolean forBiometrics) {
+        final int resId;
+        if (forFingerprint) {
+            resId = R.string.fingerprint_lock_screen_setup_skip_dialog_text;
+        } else if (forFace) {
+            resId = R.string.face_lock_screen_setup_skip_dialog_text;
+        } else if (forBiometrics) {
+            resId = R.string.biometrics_lock_screen_setup_skip_dialog_text;
+        } else {
+            return null;
+        }
+        return String.format(mActivity.getString(resId));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
index 69db28f..e24eb8f 100644
--- a/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/print/PrintSettingsPreferenceControllerTest.java
@@ -19,14 +19,19 @@
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
 
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.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.pm.PackageManager;
 import android.os.UserManager;
 import android.print.PrintJob;
 import android.print.PrintJobInfo;
@@ -61,6 +66,8 @@
     private UserManager mUserManager;
     @Mock
     private RestrictedPreference mPreference;
+    @Mock
+    private PackageManager mPackageManager;
 
     private Context mContext;
     private PrintSettingPreferenceController mController;
@@ -77,6 +84,7 @@
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
         ReflectionHelpers.setField(mController, "mPrintManager", mPrintManager);
+        ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
         mLifecycle.addObserver(mController);
     }
 
@@ -90,6 +98,17 @@
     }
 
     @Test
+    public void onStartStop_printManagerIsNull_doNothing() {
+        ReflectionHelpers.setField(mController, "mPrintManager", null);
+
+        mLifecycle.handleLifecycleEvent(ON_START);
+        mLifecycle.handleLifecycleEvent(ON_STOP);
+
+        verify(mPrintManager, never()).addPrintJobStateChangeListener(mController);
+        verify(mPrintManager, never()).removePrintJobStateChangeListener(mController);
+    }
+
+    @Test
     public void updateState_hasActiveJob_shouldSetSummaryToNumberOfJobs() {
         final List<PrintJob> printJobs = new ArrayList<>();
         final PrintJob job = mock(PrintJob.class, Mockito.RETURNS_DEEP_STUBS);
@@ -133,4 +152,29 @@
         mController.updateState(mPreference);
         verify(mPreference).checkRestrictionAndSetDisabled(UserManager.DISALLOW_PRINTING);
     }
+
+    @Test
+    public void getAvailabilityStatus_hasFeature_returnsAvailable() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING))
+                .thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noFeature_returnsUnsupported() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING))
+                .thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_printManagerIsNull_returnsUnsupported() {
+        ReflectionHelpers.setField(mController, "mPrintManager", null);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_PRINTING))
+                .thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java b/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java
deleted file mode 100644
index 20f0716..0000000
--- a/tests/robotests/src/com/android/settings/search/CustomSiteMapRegistryTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (C) 2020 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 com.android.settings.DisplaySettings;
-import com.android.settings.backup.UserBackupSettingsActivity;
-import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
-import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
-import com.android.settings.fuelgauge.PowerUsageAdvanced;
-import com.android.settings.fuelgauge.PowerUsageSummary;
-import com.android.settings.gestures.GestureNavigationSettingsFragment;
-import com.android.settings.gestures.SystemNavigationGestureSettings;
-import com.android.settings.location.LocationSettings;
-import com.android.settings.location.RecentLocationRequestSeeAllFragment;
-import com.android.settings.network.NetworkDashboardFragment;
-import com.android.settings.notification.zen.ZenModeBlockedEffectsSettings;
-import com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings;
-import com.android.settings.security.SecuritySettings;
-import com.android.settings.security.screenlock.ScreenLockSettings;
-import com.android.settings.system.SystemDashboardFragment;
-import com.android.settings.wallpaper.WallpaperSuggestionActivity;
-import com.android.settings.wifi.WifiSettings2;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class CustomSiteMapRegistryTest {
-
-    @Test
-    public void shouldContainScreenLockSettingsPairs() {
-        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(ScreenLockSettings.class.getName()))
-                .isEqualTo(SecuritySettings.class.getName());
-    }
-
-    @Test
-    public void shouldContainWallpaperSuggestionActivityPairs() {
-        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
-                WallpaperSuggestionActivity.class.getName()))
-                .isEqualTo(DisplaySettings.class.getName());
-    }
-
-    @Test
-    public void shouldContainWifiSettings2Pairs() {
-        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(WifiSettings2.class.getName()))
-                .isEqualTo(NetworkDashboardFragment.class.getName());
-    }
-
-    @Test
-    public void shouldContainPowerUsageAdvancedPairs() {
-        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(PowerUsageAdvanced.class.getName()))
-                .isEqualTo(PowerUsageSummary.class.getName());
-    }
-
-    @Test
-    public void shouldContainRecentLocationRequestSeeAllFragmentPairs() {
-        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
-                RecentLocationRequestSeeAllFragment.class.getName())).isEqualTo(
-                LocationSettings.class.getName());
-    }
-
-    @Test
-    public void shouldContainUsbDetailsFragmentPairs() {
-        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
-                UsbDetailsFragment.class.getName())).isEqualTo(
-                ConnectedDeviceDashboardFragment.class.getName());
-    }
-
-    @Test
-    public void shouldContainUserBackupSettingsActivityPairs() {
-        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
-                UserBackupSettingsActivity.class.getName())).isEqualTo(
-                SystemDashboardFragment.class.getName());
-    }
-
-    @Test
-    public void shouldContainZenModeBlockedEffectsSettingsPairs() {
-        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
-                ZenModeBlockedEffectsSettings.class.getName())).isEqualTo(
-                ZenModeRestrictNotificationsSettings.class.getName());
-    }
-
-    @Test
-    public void shouldContainGestureNavigationSettingsFragmentPairs() {
-        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
-                GestureNavigationSettingsFragment.class.getName())).isEqualTo(
-                SystemNavigationGestureSettings.class.getName());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java b/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java
index 19282dd..7a229f6 100644
--- a/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java
+++ b/tests/robotests/src/com/android/settings/search/FakeSettingsFragment.java
@@ -115,4 +115,4 @@
                     return keys;
                 }
             };
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
index 9daac80..5fc293e 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
@@ -57,21 +57,21 @@
             "SearchIndexableProvider must either provide no resource to index, or valid ones. "
                     + "But the followings contain resource with xml id = 0\n";
 
-    private final List<String> notImplementingIndexProviderGrandfatherList;
-    private final List<String> notInSearchIndexableRegistryGrandfatherList;
-    private final List<String> notSharingPrefControllersGrandfatherList;
+    private final List<String> mNotImplementingIndexProviderExemptList;
+    private final List<String> mNotInSearchIndexableRegistryExemptList;
+    private final List<String> mNotSharingPrefControllersExemptList;
 
     public SearchIndexProviderCodeInspector(List<Class<?>> classes) {
         super(classes);
-        notImplementingIndexProviderGrandfatherList = new ArrayList<>();
-        notInSearchIndexableRegistryGrandfatherList = new ArrayList<>();
-        notSharingPrefControllersGrandfatherList = new ArrayList<>();
-        initializeGrandfatherList(notImplementingIndexProviderGrandfatherList,
-                "grandfather_not_implementing_index_provider");
-        initializeGrandfatherList(notInSearchIndexableRegistryGrandfatherList,
-                "grandfather_not_in_search_index_provider_registry");
-        initializeGrandfatherList(notSharingPrefControllersGrandfatherList,
-                "grandfather_not_sharing_pref_controllers_with_search_provider");
+        mNotImplementingIndexProviderExemptList = new ArrayList<>();
+        mNotInSearchIndexableRegistryExemptList = new ArrayList<>();
+        mNotSharingPrefControllersExemptList = new ArrayList<>();
+        initializeExemptList(mNotImplementingIndexProviderExemptList,
+                "exempt_not_implementing_index_provider");
+        initializeExemptList(mNotInSearchIndexableRegistryExemptList,
+                "exempt_not_in_search_index_provider_registry");
+        initializeExemptList(mNotSharingPrefControllersExemptList,
+                "exempt_not_sharing_pref_controllers_with_search_provider");
     }
 
     @Override
@@ -100,7 +100,7 @@
             final boolean hasSearchIndexProvider = hasSearchIndexProvider(clazz);
             // If it implements Indexable, it must also implement the index provider field.
             if (!hasSearchIndexProvider) {
-                if (!notImplementingIndexProviderGrandfatherList.remove(className)) {
+                if (!mNotImplementingIndexProviderExemptList.remove(className)) {
                     notImplementingIndexProvider.add(className);
                 }
                 continue;
@@ -110,14 +110,14 @@
             final boolean isSharingPrefControllers = DashboardFragmentSearchIndexProviderInspector
                     .isSharingPreferenceControllers(clazz);
             if (!isSharingPrefControllers) {
-                if (!notSharingPrefControllersGrandfatherList.remove(className)) {
+                if (!mNotSharingPrefControllersExemptList.remove(className)) {
                     notSharingPreferenceControllers.add(className);
                 }
                 continue;
             }
             // Must be in SearchProviderRegistry
             if (!providerClasses.contains(clazz)) {
-                if (!notInSearchIndexableRegistryGrandfatherList.remove(className)) {
+                if (!mNotInSearchIndexableRegistryExemptList.remove(className)) {
                     notInSearchProviderRegistry.add(className);
                 }
             }
@@ -149,13 +149,13 @@
         assertWithMessage(notProvidingValidResourceError)
                 .that(notProvidingValidResource)
                 .isEmpty();
-        assertNoObsoleteInGrandfatherList("grandfather_not_implementing_index_provider",
-                notImplementingIndexProviderGrandfatherList);
-        assertNoObsoleteInGrandfatherList("grandfather_not_in_search_index_provider_registry",
-                notInSearchIndexableRegistryGrandfatherList);
-        assertNoObsoleteInGrandfatherList(
-                "grandfather_not_sharing_pref_controllers_with_search_provider",
-                notSharingPrefControllersGrandfatherList);
+        assertNoObsoleteInExemptList("exempt_not_implementing_index_provider",
+                mNotImplementingIndexProviderExemptList);
+        assertNoObsoleteInExemptList("exempt_not_in_search_index_provider_registry",
+                mNotInSearchIndexableRegistryExemptList);
+        assertNoObsoleteInExemptList(
+                "exempt_not_sharing_pref_controllers_with_search_provider",
+                mNotSharingPrefControllersExemptList);
     }
 
     private boolean hasSearchIndexProvider(Class clazz) {
diff --git a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
index 5bcce57..893b56e 100644
--- a/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchIndexableResourcesTest.java
@@ -39,6 +39,7 @@
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
 public class SearchIndexableResourcesTest {
@@ -89,6 +90,7 @@
     }
 
     @Test
+    @Config(qualifiers = "mcc999")
     public void testNonIndexableKeys_GetsKeyFromProvider() {
         mSearchProvider.getSearchIndexableResources().getProviderValues().clear();
         mSearchProvider.getSearchIndexableResources().addIndex(
diff --git a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
index c9bff38..1fc0230 100644
--- a/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/SettingsSearchIndexablesProviderTest.java
@@ -117,7 +117,7 @@
         }
 
         assertThat(keys).hasSize(3);
-        assertThat(keys).containsAllOf("pref_key_1", "pref_key_3", "pref_key_5");
+        assertThat(keys).containsAtLeast("pref_key_1", "pref_key_3", "pref_key_5");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/security/CredentialManagementAppControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialManagementAppControllerTest.java
new file mode 100644
index 0000000..36f056c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/CredentialManagementAppControllerTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2020 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 android.content.Context;
+
+import androidx.preference.Preference;
+
+import com.android.settings.R;
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class CredentialManagementAppControllerTest {
+
+    private Context mContext;
+    private CredentialManagementAppPreferenceController mController;
+    private Preference mPreference;
+
+    private static final String PREF_KEY_CREDENTIAL_MANAGEMENT_APP = "certificate_management_app";
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mController = new CredentialManagementAppPreferenceController(
+                mContext, PREF_KEY_CREDENTIAL_MANAGEMENT_APP);
+        mPreference = new Preference(mContext);
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldAlwaysReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    @Ignore
+    public void updateState_noCredentialManagementApp_shouldDisablePreference() {
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isEqualTo(false);
+        assertThat(mPreference.getSummary()).isEqualTo(
+                mContext.getText(R.string.no_certificate_management_app));
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/CredentialManagementAppFragmentTest.java b/tests/robotests/src/com/android/settings/security/CredentialManagementAppFragmentTest.java
new file mode 100644
index 0000000..de19e5c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/CredentialManagementAppFragmentTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2020 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 android.app.settings.SettingsEnums.CREDENTIAL_MANAGEMENT_APP;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+import com.android.settings.R;
+import com.android.settings.testutils.shadow.ShadowDashboardFragment;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowDashboardFragment.class)
+public class CredentialManagementAppFragmentTest {
+
+    private CredentialManagementAppFragment mFragment;
+    private Context mContext;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        mFragment = spy(new CredentialManagementAppFragment());
+
+        doReturn(mContext).when(mFragment).getContext();
+    }
+
+    @Test
+    public void searchIndexProvider_shouldIndexResource() {
+        final List<SearchIndexableResource> indexRes =
+                CredentialManagementAppFragment.SEARCH_INDEX_DATA_PROVIDER
+                        .getXmlResourcesToIndex(mContext, true /* enabled */);
+
+        assertThat(indexRes).isNotNull();
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(R.xml.credential_management_app_fragment);
+    }
+
+    @Test
+    public void getMetricsCategory_shouldReturnInstallCertificateFromStorage() {
+        assertThat(mFragment.getMetricsCategory()).isEqualTo(CREDENTIAL_MANAGEMENT_APP);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
deleted file mode 100644
index 3eb21cf..0000000
--- a/tests/robotests/src/com/android/settings/security/CredentialStoragePreferenceControllerTest.java
+++ /dev/null
@@ -1,69 +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.security;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import androidx.preference.Preference;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowKeyStore;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowKeyStore.class)
-public class CredentialStoragePreferenceControllerTest {
-
-    private Context mContext;
-    private CredentialStoragePreferenceController mController;
-    private Preference mPreference;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new CredentialStoragePreferenceController(mContext);
-        mPreference = new Preference(mContext);
-    }
-
-    @Test
-    public void updateState_hardwareBacked_showHardwareSummary() {
-        ShadowKeyStore.setHardwareBacked(true);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getText(R.string.credential_storage_type_hardware));
-    }
-
-    @Test
-    public void updateState_hardwareBacked_showSoftwareSummary() {
-        ShadowKeyStore.setHardwareBacked(false);
-
-        mController.updateState(mPreference);
-
-        assertThat(mPreference.getSummary())
-                .isEqualTo(mContext.getText(R.string.credential_storage_type_software));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java b/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
index 2adad00..43d8d94 100644
--- a/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
+++ b/tests/robotests/src/com/android/settings/security/InstallCertificateFromStorageTest.java
@@ -80,7 +80,7 @@
         final List<String> nonIndexableKeys =
                 SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
 
-        assertThat(nonIndexableKeys).containsAllIn(mTestKeys);
+        assertThat(nonIndexableKeys).containsAtLeastElementsIn(mTestKeys);
     }
 
 }
diff --git a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
index 8b5c5fe..5c60001 100644
--- a/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/security/LockscreenDashboardFragmentTest.java
@@ -74,7 +74,7 @@
         List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(RuntimeEnvironment.application,
                 mTestFragment.getPreferenceScreenResId());
 
-        assertThat(keys).containsAllOf(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON,
+        assertThat(keys).containsAtLeast(LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON,
                 LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE,
                 LockscreenDashboardFragment.KEY_LOCK_SCREEN_NOTIFICATON_WORK_PROFILE_HEADER);
     }
@@ -88,7 +88,6 @@
 
         mTestFragment.onAttach(mContext);
         verify(controller).setConfig(any());
-        verify(controller).setCallback(any());
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/security/RequestManageCredentialsTest.java b/tests/robotests/src/com/android/settings/security/RequestManageCredentialsTest.java
new file mode 100644
index 0000000..aacbf0c
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/RequestManageCredentialsTest.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2020 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.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.UserHandle;
+import android.security.AppUriAuthenticationPolicy;
+import android.security.Credentials;
+import android.security.IKeyChainService;
+import android.security.KeyChain;
+import android.widget.Button;
+import android.widget.LinearLayout;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.android.settings.R;
+
+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.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class RequestManageCredentialsTest {
+
+    private static final AppUriAuthenticationPolicy AUTHENTICATION_POLICY =
+            new AppUriAuthenticationPolicy.Builder()
+                    .addAppAndUriMapping("com.android.test", Uri.parse("test.com"), "testAlias")
+                    .build();
+
+    private RequestManageCredentials mActivity;
+
+    @Mock
+    private DevicePolicyManager mDevicePolicyManager;
+
+    @Mock
+    private KeyChain.KeyChainConnection mKeyChainConnection;
+
+    @Mock
+    private IKeyChainService mKeyChainService;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void onCreate_intentActionNotManageCredentials_finishActivity()
+            throws Exception {
+        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS + "_bad");
+        intent.putExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY, AUTHENTICATION_POLICY);
+        setupActivityWithAction(intent);
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(null);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(null);
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
+
+        mActivity.onCreate(null);
+
+        assertThat(mActivity).isNotNull();
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+
+    @Test
+    public void onCreate_noAuthenticationPolicy_finishActivity()
+            throws Exception {
+        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS);
+        setupActivityWithAction(intent);
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(null);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(null);
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
+
+        mActivity.onCreate(null);
+
+        assertThat(mActivity).isNotNull();
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+
+    @Test
+    public void onCreate_invalidAuthenticationPolicy_finishActivity()
+            throws Exception {
+        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS);
+        intent.putExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY, "Invalid policy");
+
+        setupActivityWithAction(intent);
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(null);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(null);
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
+
+        mActivity.onCreate(null);
+
+        assertThat(mActivity).isNotNull();
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+
+    @Test
+    public void onCreate_runOnManagedProfile_finishActivity()
+            throws Exception {
+        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS);
+        intent.putExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY, AUTHENTICATION_POLICY);
+
+        setupActivityWithAction(intent);
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(null);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(new ComponentName("pkg", "cls"));
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
+
+        mActivity.onCreate(null);
+
+        assertThat(mActivity).isNotNull();
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+
+    @Test
+    public void onCreate_runOnManagedDevice_finishActivity()
+            throws Exception {
+        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS);
+        intent.putExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY, AUTHENTICATION_POLICY);
+
+        setupActivityWithAction(intent);
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(UserHandle.SYSTEM);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(null);
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
+
+        mActivity.onCreate(null);
+
+        assertThat(mActivity).isNotNull();
+        assertThat(mActivity.isFinishing()).isTrue();
+    }
+
+    @Test
+    public void onCreate_authenticationPolicyProvided_startActivity() throws Exception {
+        final Intent intent = new Intent(Credentials.ACTION_MANAGE_CREDENTIALS);
+        intent.putExtra(KeyChain.EXTRA_AUTHENTICATION_POLICY, AUTHENTICATION_POLICY);
+        setupActivityWithAction(intent);
+
+        when(mDevicePolicyManager.getDeviceOwnerUser()).thenReturn(null);
+        when(mDevicePolicyManager.getProfileOwner()).thenReturn(null);
+        when(mActivity.getLaunchedFromPackage()).thenReturn("com.example.credapp");
+
+        mActivity.onCreate(null);
+
+        assertThat(mActivity).isNotNull();
+        assertThat(mActivity.isFinishing()).isFalse();
+        assertThat((RecyclerView) mActivity.findViewById(R.id.apps_list)).isNotNull();
+        assertThat((LinearLayout) mActivity.findViewById(R.id.button_panel)).isNotNull();
+        assertThat((Button) mActivity.findViewById(R.id.allow_button)).isNotNull();
+        assertThat((Button) mActivity.findViewById(R.id.dont_allow_button)).isNotNull();
+    }
+
+    private void setupActivityWithAction(Intent intent) throws Exception {
+        mActivity = spy(Robolectric.buildActivity(RequestManageCredentials.class, intent).get());
+        doReturn(mKeyChainConnection).when(mActivity).getKeyChainConnection(eq(mActivity), any());
+        doReturn(mDevicePolicyManager).when(mActivity).getSystemService(DevicePolicyManager.class);
+        when(mKeyChainConnection.getService()).thenReturn(mKeyChainService);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
index 78ad5e5..c25700c 100644
--- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java
@@ -39,7 +39,6 @@
 
     private Context mContext;
     private ShadowUserManager mUserManager;
-    private CredentialStoragePreferenceController mCredentialStoragePreferenceController;
     private InstallCertificatePreferenceController mInstallCertificatePreferenceController;
     private ResetCredentialsPreferenceController mResetCredentialsPreferenceController;
     private UserCredentialsPreferenceController mUserCredentialsPreferenceController;
@@ -54,8 +53,6 @@
         mContext = RuntimeEnvironment.application;
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
-        mCredentialStoragePreferenceController =
-                new CredentialStoragePreferenceController(mContext);
         mInstallCertificatePreferenceController =
                 new InstallCertificatePreferenceController(mContext);
         mResetCredentialsPreferenceController =
@@ -73,7 +70,6 @@
 
     @Test
     public void isAvailable_noRestriction_shouldReturnTrue() {
-        assertThat(mCredentialStoragePreferenceController.isAvailable()).isTrue();
         assertThat(mInstallCertificatePreferenceController.isAvailable()).isTrue();
         assertThat(mResetCredentialsPreferenceController.isAvailable()).isTrue();
         assertThat(mUserCredentialsPreferenceController.isAvailable()).isTrue();
@@ -86,7 +82,6 @@
     public void isAvailable_hasRestriction_shouldReturnFalse() {
         mUserManager.addBaseUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS);
 
-        assertThat(mCredentialStoragePreferenceController.isAvailable()).isFalse();
         assertThat(mInstallCertificatePreferenceController.isAvailable()).isFalse();
         assertThat(mResetCredentialsPreferenceController.isAvailable()).isFalse();
         assertThat(mUserCredentialsPreferenceController.isAvailable()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
index 8dc0db5..392d44e 100644
--- a/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/security/SecurityFeatureProviderImplTest.java
@@ -48,7 +48,7 @@
         final TrustAgentManager m1 = mImpl.getTrustAgentManager();
         final TrustAgentManager m2 = mImpl.getTrustAgentManager();
 
-        assertThat(m1).isSameAs(m2);
+        assertThat(m1).isSameInstanceAs(m2);
     }
 
     @Test
@@ -56,6 +56,6 @@
         final LockPatternUtils l1 = mImpl.getLockPatternUtils(mContext);
         final LockPatternUtils l2 = mImpl.getLockPatternUtils(mContext);
 
-        assertThat(l1).isSameAs(l2);
+        assertThat(l1).isSameInstanceAs(l2);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java
new file mode 100644
index 0000000..33d22d4
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java
@@ -0,0 +1,150 @@
+/*
+ * 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.security;
+
+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.content.pm.PackageManager;
+import android.hardware.face.FaceManager;
+import android.hardware.fingerprint.FingerprintManager;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.R;
+import com.android.settings.core.FeatureFlags;
+
+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.RobolectricTestRunner;
+
+@RunWith(RobolectricTestRunner.class)
+public class TopLevelSecurityEntryPreferenceControllerTest {
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private Context mContext;
+    @Mock
+    private FingerprintManager mFingerprintManager;
+    @Mock
+    private FaceManager mFaceManager;
+    private TopLevelSecurityEntryPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.FINGERPRINT_SERVICE))
+                .thenReturn(mFingerprintManager);
+        when(mContext.getSystemService(Context.FACE_SERVICE))
+                .thenReturn(mFaceManager);
+        mController = new TopLevelSecurityEntryPreferenceController(mContext, "test_key");
+    }
+
+    @After
+    public void tearDown() {
+        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
+            FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
+        }
+    }
+
+    @Test
+    public void geSummary_hasFace_hasStaticSummary() {
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
+                .thenReturn(true);
+        when(mFaceManager.isHardwareDetected()).thenReturn(true);
+
+        mController.getSummary();
+
+        verify(mContext).getText(R.string.security_dashboard_summary_face);
+    }
+
+    @Test
+    public void geSummary_hasFingerPrint_hasStaticSummary() {
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
+                .thenReturn(false);
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
+                .thenReturn(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
+
+        mController.getSummary();
+
+        verify(mContext).getText(R.string.security_dashboard_summary);
+    }
+
+    @Test
+    public void geSummary_noFpFeature_shouldSetSummaryWithNoBiometrics() {
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
+                .thenReturn(false);
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
+                .thenReturn(false);
+
+        mController.getSummary();
+
+        verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
+    }
+
+    @Test
+    public void geSummary_noFpHardware_shouldSetSummaryWithNoBiometrics() {
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
+                .thenReturn(false);
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
+                .thenReturn(true);
+        when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
+
+        mController.getSummary();
+
+        verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
+    }
+
+    @Test
+    public void geSummary_noFaceFeature_shouldSetSummaryWithNoBiometrics() {
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
+                .thenReturn(false);
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
+                .thenReturn(false);
+
+        mController.getSummary();
+
+        verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
+    }
+
+    @Test
+    public void geSummary_noFaceHardware_shouldSetSummaryWithNoBiometrics() {
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
+                .thenReturn(true);
+        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
+                .thenReturn(false);
+        when(mFaceManager.isHardwareDetected()).thenReturn(false);
+
+        mController.getSummary();
+
+        verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
+    }
+
+    @Test
+    public void getSummary_silkyHomeEnabled_shouldBeNull() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
+
+        assertThat(mController.getSummary()).isNull();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java
deleted file mode 100644
index 4e18a3e..0000000
--- a/tests/robotests/src/com/android/settings/security/TopLevelSecurityPreferenceControllerTest.java
+++ /dev/null
@@ -1,131 +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.security;
-
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.hardware.face.FaceManager;
-import android.hardware.fingerprint.FingerprintManager;
-
-import com.android.settings.R;
-
-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.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class TopLevelSecurityPreferenceControllerTest {
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private Context mContext;
-    @Mock
-    private FingerprintManager mFingerprintManager;
-    @Mock
-    private FaceManager mFaceManager;
-    private TopLevelSecurityEntryPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        when(mContext.getSystemService(Context.FINGERPRINT_SERVICE))
-                .thenReturn(mFingerprintManager);
-        when(mContext.getSystemService(Context.FACE_SERVICE))
-                .thenReturn(mFaceManager);
-        mController = new TopLevelSecurityEntryPreferenceController(mContext, "test_key");
-    }
-
-    @Test
-    public void geSummary_hasFace_hasStaticSummary() {
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
-                .thenReturn(true);
-        when(mFaceManager.isHardwareDetected()).thenReturn(true);
-
-        mController.getSummary();
-
-        verify(mContext).getText(R.string.security_dashboard_summary_face);
-    }
-
-    @Test
-    public void geSummary_hasFingerPrint_hasStaticSummary() {
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
-                .thenReturn(false);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(true);
-
-        mController.getSummary();
-
-        verify(mContext).getText(R.string.security_dashboard_summary);
-    }
-
-    @Test
-    public void geSummary_noFpFeature_shouldSetSummaryWithNoBiometrics() {
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(false);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
-                .thenReturn(false);
-
-        mController.getSummary();
-
-        verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
-    }
-
-    @Test
-    public void geSummary_noFpHardware_shouldSetSummaryWithNoBiometrics() {
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
-                .thenReturn(false);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(true);
-        when(mFingerprintManager.isHardwareDetected()).thenReturn(false);
-
-        mController.getSummary();
-
-        verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
-    }
-
-    @Test
-    public void geSummary_noFaceFeature_shouldSetSummaryWithNoBiometrics() {
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(false);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
-                .thenReturn(false);
-
-        mController.getSummary();
-
-        verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
-    }
-
-    @Test
-    public void geSummary_noFaceHardware_shouldSetSummaryWithNoBiometrics() {
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE))
-                .thenReturn(true);
-        when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT))
-                .thenReturn(false);
-        when(mFaceManager.isHardwareDetected()).thenReturn(false);
-
-        mController.getSummary();
-
-        verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
index 7c44561..8884ab8 100644
--- a/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/security/screenlock/PowerButtonInstantLockPreferenceControllerTest.java
@@ -119,7 +119,7 @@
         mController.updateState(mPreference);
         assertThat(mPreference.isChecked()).isFalse();
         assertThat(mPreference.getSummary()).isEqualTo(mContext.getString(
-                R.string.summary_placeholder));
+                R.string.summary_empty));
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
index f9cedb3..cfc9f90 100644
--- a/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/shortcut/CreateShortcutPreferenceControllerTest.java
@@ -93,7 +93,7 @@
         final Intent intent = new Intent(CreateShortcutPreferenceController.SHORTCUT_PROBE)
                 .setClass(mContext, Settings.ManageApplicationsActivity.class);
         final ResolveInfo ri = mContext.getPackageManager().resolveActivity(intent, 0);
-        final Intent result = mController.createResultIntent(intent, ri, "dummy");
+        final Intent result = mController.createResultIntent(intent, ri, "mock");
 
         assertThat(result.getStringExtra("d1")).isEqualTo("d2");
         assertThat((Object) result.getParcelableExtra(Intent.EXTRA_SHORTCUT_INTENT)).isNotNull();
diff --git a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
index 8f861eb..84e88cb 100644
--- a/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
+++ b/tests/robotests/src/com/android/settings/sim/SimSelectNotificationTest.java
@@ -21,11 +21,17 @@
 import static android.provider.Settings.ENABLE_MMS_DATA_REQUEST_REASON_OUTGOING_MMS;
 import static android.provider.Settings.EXTRA_ENABLE_MMS_DATA_REQUEST_REASON;
 import static android.provider.Settings.EXTRA_SUB_ID;
+import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE;
+import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA;
+import static android.telephony.TelephonyManager.EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DISMISS;
 import static android.telephony.TelephonyManager.EXTRA_SIM_COMBINATION_NAMES;
 import static android.telephony.TelephonyManager.EXTRA_SIM_COMBINATION_WARNING_TYPE;
 import static android.telephony.TelephonyManager.EXTRA_SIM_COMBINATION_WARNING_TYPE_DUAL_CDMA;
 import static android.telephony.data.ApnSetting.TYPE_MMS;
 
+import static com.android.settings.sim.SimDialogActivity.DATA_PICK;
+import static com.android.settings.sim.SimDialogActivity.INVALID_PICK;
+import static com.android.settings.sim.SimDialogActivity.PICK_DISMISS;
 import static com.android.settings.sim.SimSelectNotification.ENABLE_MMS_NOTIFICATION_CHANNEL;
 import static com.android.settings.sim.SimSelectNotification.ENABLE_MMS_NOTIFICATION_ID;
 import static com.android.settings.sim.SimSelectNotification.SIM_WARNING_NOTIFICATION_CHANNEL;
@@ -36,6 +42,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -54,7 +61,6 @@
 import android.telephony.TelephonyManager;
 
 import com.android.settings.R;
-
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 
 import org.junit.Before;
@@ -197,6 +203,50 @@
     }
 
     @Test
+    public void onReceivePrimarySubListChange_WithDataPickExtra_shouldStartActivity() {
+        Intent intent = new Intent(TelephonyManager.ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED);
+        intent.putExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE,
+                EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA);
+
+        mSimSelectNotification.onReceive(mContext, intent);
+
+        ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(mContext).startActivity(intentCaptor.capture());
+        Intent capturedIntent = intentCaptor.getValue();
+        assertThat(capturedIntent).isNotNull();
+        assertThat(capturedIntent.getComponent().getClassName()).isEqualTo(
+                SimDialogActivity.class.getName());
+        assertThat(capturedIntent.getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK)
+                .isNotEqualTo(0);
+        assertThat(capturedIntent.getIntExtra(SimDialogActivity.DIALOG_TYPE_KEY, INVALID_PICK))
+                .isEqualTo(DATA_PICK);
+    }
+
+    @Test
+    public void onReceivePrimarySubListChange_WithDismissExtra_shouldDismiss() {
+        Intent intent = new Intent(TelephonyManager.ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED);
+        intent.putExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE,
+                EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DATA);
+
+        mSimSelectNotification.onReceive(mContext, intent);
+        clearInvocations(mContext);
+
+        // Dismiss.
+        intent.putExtra(EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE,
+                EXTRA_DEFAULT_SUBSCRIPTION_SELECT_TYPE_DISMISS);
+        mSimSelectNotification.onReceive(mContext, intent);
+        ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(mContext).startActivity(intentCaptor.capture());
+        Intent capturedIntent = intentCaptor.getValue();
+        assertThat(capturedIntent).isNotNull();
+        assertThat(capturedIntent.getComponent().getClassName()).isEqualTo(
+                SimDialogActivity.class.getName());
+        assertThat(capturedIntent.getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK)
+                .isNotEqualTo(0);
+        assertThat(capturedIntent.getIntExtra(SimDialogActivity.DIALOG_TYPE_KEY, INVALID_PICK))
+                .isEqualTo(PICK_DISMISS);
+    }
+    @Test
     public void onReceivePrimarySubListChange_DualCdmaWarning_notificationShouldSend() {
         Intent intent = new Intent(TelephonyManager.ACTION_PRIMARY_SUBSCRIPTION_LIST_CHANGED);
 
diff --git a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
index 2f0d60a..b5c6c44 100644
--- a/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
@@ -215,7 +215,7 @@
 
     @Test
     public void testLoadSlice_cachedEntryRemovedOnBuild() {
-        SliceData data = getDummyData();
+        SliceData data = getMockData();
         mProvider.mSliceWeakDataCache.put(data.getUri(), data);
         mProvider.onBindSlice(data.getUri());
         SliceTestUtils.insertSliceToDb(mContext, data.getKey());
@@ -229,7 +229,7 @@
     public void onBindSlice_mainThread_shouldNotOverrideStrictMode() {
         ShadowThreadUtils.setIsMainThread(true);
         final StrictMode.ThreadPolicy oldThreadPolicy = StrictMode.getThreadPolicy();
-        SliceData data = getDummyData();
+        SliceData data = getMockData();
         mProvider.mSliceWeakDataCache.put(data.getUri(), data);
         mProvider.onBindSlice(data.getUri());
 
@@ -243,7 +243,7 @@
     public void onBindSlice_backgroundThread_shouldOverrideStrictMode() {
         ShadowThreadUtils.setIsMainThread(false);
 
-        SliceData data = getDummyData();
+        SliceData data = getMockData();
         mProvider.mSliceWeakDataCache.put(data.getUri(), data);
         mProvider.onBindSlice(data.getUri());
 
@@ -271,7 +271,7 @@
     @Test
     public void onBindSlice_nightModeChanged_shouldReloadTheme() {
         mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
-        final SliceData data = getDummyData();
+        final SliceData data = getMockData();
         mProvider.mSliceWeakDataCache.put(data.getUri(), data);
         mProvider.onBindSlice(data.getUri());
 
@@ -284,7 +284,7 @@
     @Test
     public void onBindSlice_nightModeNotChanged_shouldNotReloadTheme() {
         mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
-        SliceData data = getDummyData();
+        SliceData data = getMockData();
         mProvider.mSliceWeakDataCache.put(data.getUri(), data);
         mProvider.onBindSlice(data.getUri());
 
@@ -625,25 +625,25 @@
 
     @Test
     @Config(qualifiers = "mcc998")
-    public void grantWhitelistedPackagePermissions_noWhitelist_shouldNotGrant() {
+    public void grantAllowlistedPackagePermissions_noAllowlist_shouldNotGrant() {
         final List<Uri> uris = new ArrayList<>();
         uris.add(Uri.parse("content://settings/slice"));
 
-        SettingsSliceProvider.grantWhitelistedPackagePermissions(mContext, uris);
+        SettingsSliceProvider.grantAllowlistedPackagePermissions(mContext, uris);
 
         verify(mManager, never()).grantSlicePermission(anyString(), any(Uri.class));
     }
 
     @Test
     @Config(qualifiers = "mcc999")
-    public void grantWhitelistedPackagePermissions_hasPackageWhitelist_shouldGrant() {
+    public void grantAllowlistedPackagePermissions_hasPackageAllowlist_shouldGrant() {
         final List<Uri> uris = new ArrayList<>();
         uris.add(Uri.parse("content://settings/slice"));
 
-        SettingsSliceProvider.grantWhitelistedPackagePermissions(mContext, uris);
+        SettingsSliceProvider.grantAllowlistedPackagePermissions(mContext, uris);
 
         verify(mManager)
-                .grantSlicePermission("com.android.settings.slice_whitelist_package", uris.get(0));
+                .grantSlicePermission("com.android.settings.slice_allowlist_package", uris.get(0));
     }
 
     @Test
@@ -696,7 +696,7 @@
         assertThat(mProvider.isPrivateSlicesNeeded(uri)).isFalse();
     }
 
-    private static SliceData getDummyData() {
+    private static SliceData getMockData() {
         return new SliceData.Builder()
                 .setKey(KEY)
                 .setUri(URI)
diff --git a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
index 33bdc61..6789718 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceBuilderUtilsTest.java
@@ -87,7 +87,7 @@
 
     @Test
     public void buildIntentSlice_returnsMatchingSlice() {
-        final SliceData sliceData = getDummyData(CONTEXT_CONTROLLER, SliceData.SliceType.INTENT);
+        final SliceData sliceData = getMockData(CONTEXT_CONTROLLER, SliceData.SliceType.INTENT);
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, sliceData);
 
         SliceTester.testSettingsIntentSlice(mContext, slice, sliceData);
@@ -95,21 +95,21 @@
 
     @Test
     public void buildToggleSlice_returnsMatchingSlice() {
-        final SliceData dummyData = getDummyData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH);
+        final SliceData mockData = getMockData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH);
 
-        final Slice slice = SliceBuilderUtils.buildSlice(mContext, dummyData);
+        final Slice slice = SliceBuilderUtils.buildSlice(mContext, mockData);
         verify(mFeatureFactory.metricsFeatureProvider)
                 .action(SettingsEnums.PAGE_UNKNOWN,
                         MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED,
                         SettingsEnums.PAGE_UNKNOWN,
-                        dummyData.getKey(),
+                        mockData.getKey(),
                         0);
-        SliceTester.testSettingsToggleSlice(mContext, slice, dummyData);
+        SliceTester.testSettingsToggleSlice(mContext, slice, mockData);
     }
 
     @Test
     public void buildSliderSlice_returnsMatchingSlice() {
-        final SliceData data = getDummyData(SLIDER_CONTROLLER, SliceData.SliceType.SLIDER);
+        final SliceData data = getMockData(SLIDER_CONTROLLER, SliceData.SliceType.SLIDER);
 
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
         verify(mFeatureFactory.metricsFeatureProvider)
@@ -123,22 +123,22 @@
 
     @Test
     public void buildCopyableSlice_returnsMatchingSlice() {
-        final SliceData dummyData = getDummyData(COPYABLE_CONTROLLER, -1);
+        final SliceData mockData = getMockData(COPYABLE_CONTROLLER, -1);
 
-        final Slice slice = SliceBuilderUtils.buildSlice(mContext, dummyData);
+        final Slice slice = SliceBuilderUtils.buildSlice(mContext, mockData);
         verify(mFeatureFactory.metricsFeatureProvider)
                 .action(SettingsEnums.PAGE_UNKNOWN,
                         MetricsEvent.ACTION_SETTINGS_SLICE_REQUESTED,
                         SettingsEnums.PAGE_UNKNOWN,
-                        dummyData.getKey(),
+                        mockData.getKey(),
                         0);
-        SliceTester.testSettingsCopyableSlice(mContext, slice, dummyData);
+        SliceTester.testSettingsCopyableSlice(mContext, slice, mockData);
     }
 
     @Test
     public void testGetPreferenceController_buildsMatchingController() {
         final BasePreferenceController controller =
-                SliceBuilderUtils.getPreferenceController(mContext, getDummyData());
+                SliceBuilderUtils.getPreferenceController(mContext, getMockData());
 
         assertThat(controller).isInstanceOf(FakeToggleController.class);
     }
@@ -147,14 +147,14 @@
     public void testGetPreferenceController_contextOnly_buildsMatchingController() {
         final BasePreferenceController controller =
                 SliceBuilderUtils.getPreferenceController(mContext,
-                        getDummyData(CONTEXT_CONTROLLER, 0));
+                        getMockData(CONTEXT_CONTROLLER, 0));
 
         assertThat(controller).isInstanceOf(FakeContextOnlyPreferenceController.class);
     }
 
     @Test
     public void getDynamicSummary_allowDynamicSummary_returnsControllerSummary() {
-        final SliceData data = getDummyData();
+        final SliceData data = getMockData();
         final FakePreferenceController controller = spy(
                 new FakePreferenceController(mContext, KEY));
         final String controllerSummary = "new_Summary";
@@ -167,7 +167,7 @@
 
     @Test
     public void getDynamicSummary_allowDynamicSummary_nullSummary_returnsNull() {
-        final SliceData data = getDummyData();
+        final SliceData data = getMockData();
         final FakePreferenceController controller = spy(
                 new FakePreferenceController(mContext, KEY));
 
@@ -180,7 +180,7 @@
 
     @Test
     public void getDynamicSummary_noScreenTitle_returnsPrefControllerSummary() {
-        final SliceData data = getDummyData("", "");
+        final SliceData data = getMockData("", "");
         final FakePreferenceController controller = spy(
                 new FakePreferenceController(mContext, KEY));
         final String controllerSummary = "new_Summary";
@@ -193,7 +193,7 @@
 
     @Test
     public void getDynamicSummary_screenTitleMatchesTitle_returnsPrefControllerSummary() {
-        final SliceData data = getDummyData("", TITLE);
+        final SliceData data = getMockData("", TITLE);
         final FakePreferenceController controller = spy(
                 new FakePreferenceController(mContext, KEY));
         final String controllerSummary = "new_Summary";
@@ -206,7 +206,7 @@
 
     @Test
     public void getDynamicSummary_emptyScreenTitle_emptyControllerSummary_returnsEmptyString() {
-        final SliceData data = getDummyData(null, null);
+        final SliceData data = getMockData(null, null);
         final FakePreferenceController controller = new FakePreferenceController(mContext, KEY);
         final CharSequence summary = SliceBuilderUtils.getSubtitleText(mContext, controller, data);
 
@@ -216,7 +216,7 @@
     @Test
     public void getDynamicSummary_screenTitleAndControllerPlaceholder_returnsSliceEmptyString() {
         final String summaryPlaceholder = mContext.getString(R.string.summary_placeholder);
-        final SliceData data = getDummyData(summaryPlaceholder, summaryPlaceholder);
+        final SliceData data = getMockData(summaryPlaceholder, summaryPlaceholder);
         final FakePreferenceController controller = spy(
                 new FakePreferenceController(mContext, KEY));
         doReturn(summaryPlaceholder).when(controller).getSummary();
@@ -283,7 +283,7 @@
 
     @Test
     public void testUnsupportedSlice_validTitleSummary() {
-        final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+        final SliceData data = getMockData(FakeUnavailablePreferenceController.class,
                 SliceData.SliceType.SWITCH);
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeUnavailablePreferenceController.AVAILABILITY_KEY,
@@ -296,7 +296,7 @@
 
     @Test
     public void testDisabledForUserSlice_validTitleSummary() {
-        final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+        final SliceData data = getMockData(FakeUnavailablePreferenceController.class,
                 SliceData.SliceType.SWITCH);
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeUnavailablePreferenceController.AVAILABILITY_KEY,
@@ -309,7 +309,7 @@
 
     @Test
     public void testDisabledDependentSettingSlice_validTitleSummary() {
-        final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+        final SliceData data = getMockData(FakeUnavailablePreferenceController.class,
                 SliceData.SliceType.INTENT);
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeUnavailablePreferenceController.AVAILABILITY_KEY,
@@ -329,7 +329,7 @@
 
     @Test
     public void testConditionallyUnavailableSlice_validTitleSummary() {
-        final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+        final SliceData data = getMockData(FakeUnavailablePreferenceController.class,
                 SliceData.SliceType.SWITCH);
         Settings.Global.putInt(mContext.getContentResolver(),
                 FakeUnavailablePreferenceController.AVAILABILITY_KEY,
@@ -347,7 +347,7 @@
 
     @Test
     public void testContentIntent_includesUniqueData() {
-        final SliceData sliceData = getDummyData();
+        final SliceData sliceData = getMockData();
         final Uri expectedUri = new Uri.Builder().appendPath(sliceData.getKey()).build();
 
         final Intent intent = SliceBuilderUtils.getContentIntent(mContext, sliceData);
@@ -360,7 +360,7 @@
     public void buildIntentSlice_noIconPassed_returnsSliceWithIcon() {
         final int expectedIconResource = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_accent).toIcon().getResId();
-        final SliceData sliceData = getDummyData(CONTEXT_CONTROLLER, SliceData.SliceType.INTENT,
+        final SliceData sliceData = getMockData(CONTEXT_CONTROLLER, SliceData.SliceType.INTENT,
                 0x0);
 
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, sliceData);
@@ -375,7 +375,7 @@
     public void buildDisabledDependentSlice_noIconPassed_returnsSliceWithIcon() {
         final int expectedIconResource = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_accent).toIcon().getResId();
-        final SliceData data = getDummyData(FakeUnavailablePreferenceController.class,
+        final SliceData data = getMockData(FakeUnavailablePreferenceController.class,
                 SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE, 0 /* icon */,
                 null /* unavailableSliceSubtitle */);
         Settings.Global.putInt(mContext.getContentResolver(),
@@ -394,10 +394,10 @@
     public void buildToggleSlice_noIconPassed_returnsSliceWithIcon() {
         final int expectedIconResource = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_accent).toIcon().getResId();
-        final SliceData dummyData = getDummyData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
+        final SliceData mockData = getMockData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
                 0x0);
 
-        final Slice slice = SliceBuilderUtils.buildSlice(mContext, dummyData);
+        final Slice slice = SliceBuilderUtils.buildSlice(mContext, mockData);
 
         final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
         final SliceAction primaryAction = metadata.getPrimaryAction();
@@ -409,7 +409,7 @@
     public void buildSliderSlice_noIconPassed_returnsSliceWithIcon() {
         final int expectedIconResource = IconCompat.createWithResource(mContext,
                 R.drawable.ic_settings_accent).toIcon().getResId();
-        final SliceData data = getDummyData(SLIDER_CONTROLLER, SliceData.SliceType.SLIDER, 0x0);
+        final SliceData data = getMockData(SLIDER_CONTROLLER, SliceData.SliceType.SLIDER, 0x0);
 
         final Slice slice = SliceBuilderUtils.buildSlice(mContext, data);
 
@@ -421,7 +421,7 @@
 
     @Test
     public void buildSliderSlice_invalidSlider_returnNull() {
-        final SliceData data = getDummyData(INVALID_SLIDER_CONTROLLER, SliceData.SliceType.SLIDER,
+        final SliceData data = getMockData(INVALID_SLIDER_CONTROLLER, SliceData.SliceType.SLIDER,
                 0x0 /* icon */);
 
         assertThat(SliceBuilderUtils.buildSlice(mContext, data)).isNull();
@@ -431,7 +431,7 @@
     public void getSafeIcon_replacesEmptyIconWithSettingsIcon() {
         final int settingsIcon = R.drawable.ic_settings_accent;
         final int zeroIcon = 0x0;
-        final SliceData data = getDummyData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
+        final SliceData data = getMockData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
                 zeroIcon);
 
         final IconCompat actualIcon = SliceBuilderUtils.getSafeIcon(mContext, data);
@@ -445,7 +445,7 @@
     public void getSafeIcon_invalidResource_shouldFallbackToSettingsIcon() {
         final int settingsIcon = R.drawable.ic_settings_accent;
         final int badIcon = 0x12345678;
-        final SliceData data = getDummyData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
+        final SliceData data = getMockData(TOGGLE_CONTROLLER, SliceData.SliceType.SWITCH,
                 badIcon);
 
         final IconCompat actualIcon = SliceBuilderUtils.getSafeIcon(mContext, data);
@@ -454,27 +454,27 @@
         assertThat(actualIconResource).isEqualTo(settingsIcon);
     }
 
-    private SliceData getDummyData() {
-        return getDummyData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE,
+    private SliceData getMockData() {
+        return getMockData(TOGGLE_CONTROLLER, SUMMARY, SliceData.SliceType.SWITCH, SCREEN_TITLE,
                 ICON, null /* unavailableSliceSubtitle */);
     }
 
-    private SliceData getDummyData(Class prefController, int sliceType, int icon) {
-        return getDummyData(prefController, SUMMARY, sliceType, SCREEN_TITLE,
+    private SliceData getMockData(Class prefController, int sliceType, int icon) {
+        return getMockData(prefController, SUMMARY, sliceType, SCREEN_TITLE,
                 icon, null /* unavailableSliceSubtitle */);
     }
 
-    private SliceData getDummyData(String summary, String screenTitle) {
-        return getDummyData(TOGGLE_CONTROLLER, summary, SliceData.SliceType.SWITCH, screenTitle,
+    private SliceData getMockData(String summary, String screenTitle) {
+        return getMockData(TOGGLE_CONTROLLER, summary, SliceData.SliceType.SWITCH, screenTitle,
                 ICON, null /* unavailableSliceSubtitle */);
     }
 
-    private SliceData getDummyData(Class prefController, int sliceType) {
-        return getDummyData(prefController, SUMMARY, sliceType, SCREEN_TITLE, ICON,
+    private SliceData getMockData(Class prefController, int sliceType) {
+        return getMockData(prefController, SUMMARY, sliceType, SCREEN_TITLE, ICON,
                 null /* unavailableSliceSubtitle */);
     }
 
-    private SliceData getDummyData(Class prefController, String summary, int sliceType,
+    private SliceData getMockData(Class prefController, String summary, int sliceType,
             String screenTitle, int icon, String unavailableSliceSubtitle) {
         return new SliceData.Builder()
                 .setKey(KEY)
diff --git a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java
index 72eae7d..93fb25f 100644
--- a/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java
+++ b/tests/robotests/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java
@@ -54,13 +54,13 @@
     );
 
     private final List<String> mXmlDeclaredControllers = new ArrayList<>();
-    private final List<String> mGrandfatheredClasses = new ArrayList<>();
+    private final List<String> mExemptedClasses = new ArrayList<>();
 
     private final String ERROR_MISSING_CONTROLLER =
             "The following controllers were expected to be declared by "
                     + "'settings:controller=Controller_Class_Name' in their corresponding Xml. "
                     + "If it should not appear in XML, add the controller's classname to "
-                    + "grandfather_slice_controller_not_in_xml. Controllers:\n";
+                    + "exempt_slice_controller_not_in_xml. Controllers:\n";
 
     private final Context mContext;
     private final SearchFeatureProvider mSearchProvider;
@@ -73,8 +73,8 @@
         mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
         mFakeFeatureFactory.searchFeatureProvider = mSearchProvider;
 
-        CodeInspector.initializeGrandfatherList(mGrandfatheredClasses,
-                "grandfather_slice_controller_not_in_xml");
+        CodeInspector.initializeExemptList(mExemptedClasses,
+                "exempt_slice_controller_not_in_xml");
         initDeclaredControllers();
     }
 
@@ -111,13 +111,13 @@
             }
 
             if (!mXmlDeclaredControllers.contains(clazz.getName())) {
-                // Class clazz should have been declared in XML (unless whitelisted).
+                // Class clazz should have been declared in XML (unless allowlisted).
                 missingControllersInXml.add(clazz.getName());
             }
         }
 
-        // Removed whitelisted classes
-        missingControllersInXml.removeAll(mGrandfatheredClasses);
+        // Removed allowlisted classes
+        missingControllersInXml.removeAll(mExemptedClasses);
 
         final String missingControllerError =
                 buildErrorMessage(ERROR_MISSING_CONTROLLER, missingControllersInXml);
diff --git a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java b/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
deleted file mode 100644
index fa3f8b9..0000000
--- a/tests/robotests/src/com/android/settings/slices/SliceDataTest.java
+++ /dev/null
@@ -1,286 +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.slices;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.net.Uri;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class SliceDataTest {
-
-    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 KEYWORDS = "a, b, c";
-    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 = "com.android.settings.slices.tester";
-    private final int SLICE_TYPE = SliceData.SliceType.SWITCH;
-    private final String UNAVAILABLE_SLICE_SUBTITLE = "subtitleOfUnavailableSlice";
-
-    @Test
-    public void testBuilder_buildsMatchingObject() {
-        SliceData.Builder builder = new SliceData.Builder()
-                .setKey(KEY)
-                .setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setScreenTitle(SCREEN_TITLE)
-                .setKeywords(KEYWORDS)
-                .setIcon(ICON)
-                .setFragmentName(FRAGMENT_NAME)
-                .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER)
-                .setSliceType(SLICE_TYPE)
-                .setUnavailableSliceSubtitle(UNAVAILABLE_SLICE_SUBTITLE)
-                .setIsPublicSlice(true);
-
-        SliceData data = builder.build();
-
-        assertThat(data.getKey()).isEqualTo(KEY);
-        assertThat(data.getTitle()).isEqualTo(TITLE);
-        assertThat(data.getSummary()).isEqualTo(SUMMARY);
-        assertThat(data.getScreenTitle()).isEqualTo(SCREEN_TITLE);
-        assertThat(data.getKeywords()).isEqualTo(KEYWORDS);
-        assertThat(data.getIconResource()).isEqualTo(ICON);
-        assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
-        assertThat(data.getUri()).isEqualTo(URI);
-        assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
-        assertThat(data.getSliceType()).isEqualTo(SLICE_TYPE);
-        assertThat(data.getUnavailableSliceSubtitle()).isEqualTo(UNAVAILABLE_SLICE_SUBTITLE);
-        assertThat(data.isPublicSlice()).isEqualTo(true);
-    }
-
-    @Test(expected = SliceData.InvalidSliceDataException.class)
-    public void testBuilder_noKey_throwsIllegalStateException() {
-        new SliceData.Builder()
-                .setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setScreenTitle(SCREEN_TITLE)
-                .setIcon(ICON)
-                .setFragmentName(FRAGMENT_NAME)
-                .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER)
-                .build();
-    }
-
-    @Test(expected = SliceData.InvalidSliceDataException.class)
-    public void testBuilder_noTitle_throwsIllegalStateException() {
-        new SliceData.Builder()
-                .setKey(KEY)
-                .setSummary(SUMMARY)
-                .setScreenTitle(SCREEN_TITLE)
-                .setIcon(ICON)
-                .setFragmentName(FRAGMENT_NAME)
-                .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER)
-                .build();
-    }
-
-    @Test(expected = SliceData.InvalidSliceDataException.class)
-    public void testBuilder_noFragment_throwsIllegalStateException() {
-        new SliceData.Builder()
-                .setKey(KEY)
-                .setFragmentName(FRAGMENT_NAME)
-                .setSummary(SUMMARY)
-                .setScreenTitle(SCREEN_TITLE)
-                .setIcon(ICON)
-                .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER)
-                .build();
-    }
-
-    @Test(expected = SliceData.InvalidSliceDataException.class)
-    public void testBuilder_noPrefController_throwsIllegalStateException() {
-        new SliceData.Builder()
-                .setKey(KEY)
-                .setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setScreenTitle(SCREEN_TITLE)
-                .setIcon(ICON)
-                .setUri(URI)
-                .setFragmentName(FRAGMENT_NAME)
-                .build();
-    }
-
-    @Test
-    public void testBuilder_noSubtitle_buildsMatchingObject() {
-        SliceData.Builder builder = new SliceData.Builder()
-                .setKey(KEY)
-                .setTitle(TITLE)
-                .setScreenTitle(SCREEN_TITLE)
-                .setIcon(ICON)
-                .setFragmentName(FRAGMENT_NAME)
-                .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER);
-
-        SliceData data = builder.build();
-
-        assertThat(data.getKey()).isEqualTo(KEY);
-        assertThat(data.getTitle()).isEqualTo(TITLE);
-        assertThat(data.getSummary()).isNull();
-        assertThat(data.getScreenTitle()).isEqualTo(SCREEN_TITLE);
-        assertThat(data.getIconResource()).isEqualTo(ICON);
-        assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
-        assertThat(data.getUri()).isEqualTo(URI);
-        assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
-    }
-
-    @Test
-    public void testBuilder_noScreenTitle_buildsMatchingObject() {
-        SliceData.Builder builder = new SliceData.Builder()
-                .setKey(KEY)
-                .setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setIcon(ICON)
-                .setFragmentName(FRAGMENT_NAME)
-                .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER);
-
-        SliceData data = builder.build();
-
-        assertThat(data.getKey()).isEqualTo(KEY);
-        assertThat(data.getTitle()).isEqualTo(TITLE);
-        assertThat(data.getSummary()).isEqualTo(SUMMARY);
-        assertThat(data.getScreenTitle()).isNull();
-        assertThat(data.getIconResource()).isEqualTo(ICON);
-        assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
-        assertThat(data.getUri()).isEqualTo(URI);
-        assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
-    }
-
-    @Test
-    public void testBuilder_noIcon_buildsMatchingObject() {
-        SliceData.Builder builder = new SliceData.Builder()
-                .setKey(KEY)
-                .setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setScreenTitle(SCREEN_TITLE)
-                .setFragmentName(FRAGMENT_NAME)
-                .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER);
-
-        SliceData data = builder.build();
-
-        assertThat(data.getKey()).isEqualTo(KEY);
-        assertThat(data.getTitle()).isEqualTo(TITLE);
-        assertThat(data.getSummary()).isEqualTo(SUMMARY);
-        assertThat(data.getScreenTitle()).isEqualTo(SCREEN_TITLE);
-        assertThat(data.getIconResource()).isEqualTo(0);
-        assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
-        assertThat(data.getUri()).isEqualTo(URI);
-        assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
-    }
-
-    @Test
-    public void testBuilder_noUri_buildsMatchingObject() {
-        SliceData.Builder builder = new SliceData.Builder()
-                .setKey(KEY)
-                .setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setScreenTitle(SCREEN_TITLE)
-                .setIcon(ICON)
-                .setFragmentName(FRAGMENT_NAME)
-                .setUri(null)
-                .setPreferenceControllerClassName(PREF_CONTROLLER);
-
-        SliceData data = builder.build();
-
-        assertThat(data.getKey()).isEqualTo(KEY);
-        assertThat(data.getTitle()).isEqualTo(TITLE);
-        assertThat(data.getSummary()).isEqualTo(SUMMARY);
-        assertThat(data.getScreenTitle()).isEqualTo(SCREEN_TITLE);
-        assertThat(data.getIconResource()).isEqualTo(ICON);
-        assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
-        assertThat(data.getUri()).isNull();
-        assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
-    }
-
-    @Test
-    public void testEquality_identicalObjects() {
-        SliceData.Builder builder = new SliceData.Builder()
-                .setKey(KEY)
-                .setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setScreenTitle(SCREEN_TITLE)
-                .setIcon(ICON)
-                .setFragmentName(FRAGMENT_NAME)
-                .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER);
-
-        SliceData dataOne = builder.build();
-        SliceData dataTwo = builder.build();
-
-        assertThat(dataOne.hashCode()).isEqualTo(dataTwo.hashCode());
-        assertThat(dataOne).isEqualTo(dataTwo);
-    }
-
-    @Test
-    public void testEquality_matchingKey_EqualObjects() {
-        SliceData.Builder builder = new SliceData.Builder()
-                .setKey(KEY)
-                .setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setScreenTitle(SCREEN_TITLE)
-                .setIcon(ICON)
-                .setFragmentName(FRAGMENT_NAME)
-                .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER);
-
-        SliceData dataOne = builder.build();
-
-        builder.setTitle(TITLE + " diff")
-                .setSummary(SUMMARY + " diff")
-                .setScreenTitle(SCREEN_TITLE + " diff")
-                .setIcon(ICON + 1)
-                .setFragmentName(FRAGMENT_NAME + " diff")
-                .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER + " diff");
-
-        SliceData dataTwo = builder.build();
-
-        assertThat(dataOne.hashCode()).isEqualTo(dataTwo.hashCode());
-        assertThat(dataOne).isEqualTo(dataTwo);
-    }
-
-    @Test
-    public void testEquality_differentKey_differentObjects() {
-        SliceData.Builder builder = new SliceData.Builder()
-                .setKey(KEY)
-                .setTitle(TITLE)
-                .setSummary(SUMMARY)
-                .setScreenTitle(SCREEN_TITLE)
-                .setIcon(ICON)
-                .setFragmentName(FRAGMENT_NAME)
-                .setUri(URI)
-                .setPreferenceControllerClassName(PREF_CONTROLLER);
-
-        SliceData dataOne = builder.build();
-
-        builder.setKey("not key");
-        SliceData dataTwo = builder.build();
-
-        assertThat(dataOne.hashCode()).isNotEqualTo(dataTwo.hashCode());
-        assertThat(dataOne).isNotEqualTo(dataTwo);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
index 65214fc..70b26dd 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseHelperTest.java
@@ -83,9 +83,9 @@
 
     @Test
     public void testUpgrade_dropsOldData() {
-        ContentValues dummyValues = getDummyRow();
+        ContentValues mockValues = getMockRow();
 
-        mDatabase.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, dummyValues);
+        mDatabase.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, mockValues);
         Cursor baseline = mDatabase.rawQuery("SELECT * FROM slices_index", null);
         assertThat(baseline.getCount()).isEqualTo(1);
 
@@ -126,7 +126,7 @@
         assertThat(mSlicesDatabaseHelper.isSliceDataIndexed()).isFalse();
     }
 
-    private ContentValues getDummyRow() {
+    private ContentValues getMockRow() {
         final ContentValues values = new ContentValues();
         values.put(IndexColumns.KEY, "key");
         values.put(IndexColumns.TITLE, "title");
diff --git a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
index 3cb68c0..a943ac0 100644
--- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
@@ -106,7 +106,7 @@
 
     @Test
     public void testInsertSliceData_nonPublicSlice_mockDataInserted() {
-        final List<SliceData> sliceData = getDummyIndexableData(false);
+        final List<SliceData> sliceData = getMockIndexableData(false);
         doReturn(sliceData).when(mManager).getSliceData();
 
         mManager.run();
@@ -151,7 +151,7 @@
 
     @Test
     public void insertSliceData_publicSlice_mockDataInserted() {
-        final List<SliceData> sliceData = getDummyIndexableData(true);
+        final List<SliceData> sliceData = getMockIndexableData(true);
         doReturn(sliceData).when(mManager).getSliceData();
 
         mManager.run();
@@ -209,7 +209,7 @@
         db.close();
     }
 
-    private List<SliceData> getDummyIndexableData(boolean isPublicSlice) {
+    private List<SliceData> getMockIndexableData(boolean isPublicSlice) {
         final List<SliceData> sliceData = new ArrayList<>();
         final SliceData.Builder builder = new SliceData.Builder()
                 .setSummary(SUMMARY)
diff --git a/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java b/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java
deleted file mode 100644
index d483f9e..0000000
--- a/tests/robotests/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.android.settings.slices;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.net.Uri;
-import android.provider.SettingsSlicesContract;
-
-import androidx.slice.Slice;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class SpecialCaseSliceManagerTest {
-
-    private final String FAKE_PARAMETER_KEY = "fake_parameter_key";
-    private final String FAKE_PARAMETER_VALUE = "fake_value";
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        CustomSliceRegistry.sUriToSlice.clear();
-        CustomSliceRegistry.sUriToSlice.put(FakeSliceable.URI, FakeSliceable.class);
-    }
-
-    @Test
-    public void getSliceableFromUri_returnsCorrectObject() {
-        final CustomSliceable sliceable = CustomSliceable.createInstance(
-                mContext, CustomSliceRegistry.getSliceClassByUri(FakeSliceable.URI));
-
-        assertThat(sliceable).isInstanceOf(FakeSliceable.class);
-    }
-
-    @Test
-    public void getSliceableFromUriWithParameter_returnsCorrectObject() {
-        final Uri parameterUri = FakeSliceable.URI
-                .buildUpon()
-                .clearQuery()
-                .appendQueryParameter(FAKE_PARAMETER_KEY, FAKE_PARAMETER_VALUE)
-                .build();
-
-        final CustomSliceable sliceable = CustomSliceable.createInstance(
-                mContext, CustomSliceRegistry.getSliceClassByUri(parameterUri));
-
-        assertThat(sliceable).isInstanceOf(FakeSliceable.class);
-    }
-
-    @Test
-    public void isValidUri_validUri_returnsTrue() {
-        final boolean isValidUri = CustomSliceRegistry.isValidUri(FakeSliceable.URI);
-
-        assertThat(isValidUri).isTrue();
-    }
-
-    @Test
-    public void isValidUri_invalidUri_returnsFalse() {
-        final boolean isValidUri = CustomSliceRegistry.isValidUri(null);
-
-        assertThat(isValidUri).isFalse();
-    }
-
-    @Test
-    public void isValidAction_validActions_returnsTrue() {
-        final boolean isValidAction =
-                CustomSliceRegistry.isValidAction(FakeSliceable.URI.toString());
-
-        assertThat(isValidAction).isTrue();
-    }
-
-    @Test
-    public void isValidAction_invalidAction_returnsFalse() {
-        final boolean isValidAction = CustomSliceRegistry.isValidAction("action");
-
-        assertThat(isValidAction).isFalse();
-    }
-
-    static class FakeSliceable implements CustomSliceable {
-
-        static final String KEY = "magic key of khazad dum";
-
-        static final Uri URI = new Uri.Builder()
-                .scheme(ContentResolver.SCHEME_CONTENT)
-                .authority(SettingsSliceProvider.SLICE_AUTHORITY)
-                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
-                .appendPath(KEY)
-                .build();
-
-        static final Slice SLICE = new Slice.Builder(URI).build();
-
-        static boolean backingData = false;
-
-        final Context mContext;
-
-        public FakeSliceable(Context context) {
-            mContext = context;
-        }
-
-        @Override
-        public Slice getSlice() {
-            return SLICE;
-        }
-
-        @Override
-        public Uri getUri() {
-            return URI;
-        }
-
-        @Override
-        public void onNotifyChange(Intent intent) {
-            backingData = !backingData;
-        }
-
-        @Override
-        public IntentFilter getIntentFilter() {
-            return new IntentFilter();
-        }
-
-        @Override
-        public Intent getIntent() {
-            return null;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/slices/VolumeSliceHelperTest.java b/tests/robotests/src/com/android/settings/slices/VolumeSliceHelperTest.java
new file mode 100644
index 0000000..5e22adf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/slices/VolumeSliceHelperTest.java
@@ -0,0 +1,260 @@
+/*
+ * Copyright (C) 2020 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.slices;
+
+import static com.android.settings.slices.CustomSliceRegistry.VOLUME_SLICES_URI;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.media.AudioManager;
+import android.net.Uri;
+
+import com.android.settings.notification.MediaVolumePreferenceController;
+import com.android.settings.notification.RingVolumePreferenceController;
+import com.android.settings.notification.VolumeSeekBarPreferenceController;
+import com.android.settingslib.SliceBroadcastRelay;
+
+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.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = VolumeSliceHelperTest.ShadowSliceBroadcastRelay.class)
+public class VolumeSliceHelperTest {
+
+    @Mock
+    private ContentResolver mResolver;
+
+    private Context mContext;
+    private Intent mIntent;
+    private VolumeSeekBarPreferenceController mMediaController;
+    private VolumeSeekBarPreferenceController mRingController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
+        when(mContext.getContentResolver()).thenReturn(mResolver);
+
+        mMediaController = new MediaVolumePreferenceController(mContext);
+        mRingController = new RingVolumePreferenceController(mContext);
+
+        mIntent = createIntent(AudioManager.VOLUME_CHANGED_ACTION)
+                .putExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, 1)
+                .putExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, 2)
+                .putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, mMediaController.getAudioStream());
+    }
+
+    @After
+    public void cleanUp() {
+        ShadowSliceBroadcastRelay.reset();
+        VolumeSliceHelper.sRegisteredUri.clear();
+        VolumeSliceHelper.sIntentFilter = null;
+    }
+
+    @Test
+    public void registerIntentToUri_volumeController_shouldRegisterReceiver() {
+        registerIntentToUri(mMediaController);
+
+        assertThat(ShadowSliceBroadcastRelay.getRegisteredCount()).isEqualTo(1);
+        assertThat(VolumeSliceHelper.sRegisteredUri)
+                .containsKey((mMediaController.getSliceUri()));
+    }
+
+    @Test
+    public void registerIntentToUri_doubleVolumeControllers_shouldRegisterReceiverOnce() {
+        registerIntentToUri(mMediaController);
+
+        registerIntentToUri(mRingController);
+
+        assertThat(ShadowSliceBroadcastRelay.getRegisteredCount()).isEqualTo(1);
+        assertThat(VolumeSliceHelper.sRegisteredUri)
+                .containsKey((mRingController.getSliceUri()));
+    }
+
+    @Test
+    public void unregisterUri_notFinalUri_shouldNotUnregisterReceiver() {
+        registerIntentToUri(mMediaController);
+        registerIntentToUri(mRingController);
+
+        VolumeSliceHelper.unregisterUri(mContext, mMediaController.getSliceUri());
+
+        assertThat(ShadowSliceBroadcastRelay.getRegisteredCount()).isEqualTo(1);
+        assertThat(VolumeSliceHelper.sRegisteredUri)
+                .doesNotContainKey((mMediaController.getSliceUri()));
+    }
+
+    @Test
+    public void unregisterUri_finalUri_shouldUnregisterReceiver() {
+        registerIntentToUri(mMediaController);
+
+        VolumeSliceHelper.unregisterUri(mContext, mMediaController.getSliceUri());
+
+        assertThat(ShadowSliceBroadcastRelay.getRegisteredCount()).isEqualTo(0);
+        assertThat(VolumeSliceHelper.sRegisteredUri)
+                .doesNotContainKey((mMediaController.getSliceUri()));
+    }
+
+    @Test
+    public void unregisterUri_unregisterTwice_shouldUnregisterReceiverOnce() {
+        registerIntentToUri(mMediaController);
+
+        VolumeSliceHelper.unregisterUri(mContext, mMediaController.getSliceUri());
+        VolumeSliceHelper.unregisterUri(mContext, mMediaController.getSliceUri());
+
+        assertThat(ShadowSliceBroadcastRelay.getRegisteredCount()).isEqualTo(0);
+    }
+
+    @Test
+    public void unregisterUri_notRegistered_shouldNotUnregisterReceiver() {
+        registerIntentToUri(mMediaController);
+
+        VolumeSliceHelper.unregisterUri(mContext, mRingController.getSliceUri());
+
+        assertThat(ShadowSliceBroadcastRelay.getRegisteredCount()).isEqualTo(1);
+        assertThat(VolumeSliceHelper.sRegisteredUri)
+                .containsKey((mMediaController.getSliceUri()));
+    }
+
+    @Test
+    public void onReceive_audioStreamRegistered_shouldNotifyChange() {
+        registerIntentToUri(mMediaController);
+
+        VolumeSliceHelper.onReceive(mContext, mIntent);
+
+        verify(mResolver).notifyChange(mMediaController.getSliceUri(), null);
+    }
+
+    @Test
+    public void onReceive_audioStreamNotRegistered_shouldNotNotifyChange() {
+        VolumeSliceHelper.onReceive(mContext, mIntent);
+
+        verify(mResolver, never()).notifyChange(mMediaController.getSliceUri(), null);
+    }
+
+    @Test
+    public void onReceive_audioStreamNotMatched_shouldNotNotifyChange() {
+        registerIntentToUri(mMediaController);
+        mIntent.putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, AudioManager.STREAM_DTMF);
+
+        VolumeSliceHelper.onReceive(mContext, mIntent);
+
+        verify(mResolver, never()).notifyChange(mMediaController.getSliceUri(), null);
+    }
+
+    @Test
+    public void onReceive_mediaVolumeNotChanged_shouldNotNotifyChange() {
+        mIntent.putExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, 1)
+                .putExtra(AudioManager.EXTRA_PREV_VOLUME_STREAM_VALUE, 1);
+        registerIntentToUri(mMediaController);
+
+        VolumeSliceHelper.onReceive(mContext, mIntent);
+
+        verify(mResolver, never()).notifyChange(mMediaController.getSliceUri(), null);
+    }
+
+    @Test
+    public void onReceive_streamVolumeMuted_shouldNotifyChange() {
+        final Intent intent = createIntent(AudioManager.STREAM_MUTE_CHANGED_ACTION)
+                .putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, mMediaController.getAudioStream());
+        registerIntentToUri(mMediaController);
+        registerIntentToUri(mRingController);
+
+        VolumeSliceHelper.onReceive(mContext, intent);
+
+        verify(mResolver).notifyChange(mMediaController.getSliceUri(), null);
+    }
+
+    @Test
+    public void onReceive_streamDevicesChanged_shouldNotifyChange() {
+        final Intent intent = createIntent(AudioManager.STREAM_DEVICES_CHANGED_ACTION)
+                .putExtra(AudioManager.EXTRA_VOLUME_STREAM_TYPE, mRingController.getAudioStream());
+        registerIntentToUri(mMediaController);
+        registerIntentToUri(mRingController);
+
+        VolumeSliceHelper.onReceive(mContext, intent);
+
+        verify(mResolver).notifyChange(mRingController.getSliceUri(), null);
+    }
+
+    @Test
+    public void onReceive_primaryMutedChanged_shouldNotifyChangeAll() {
+        final Intent intent = createIntent(AudioManager.MASTER_MUTE_CHANGED_ACTION);
+        registerIntentToUri(mMediaController);
+        registerIntentToUri(mRingController);
+
+        VolumeSliceHelper.onReceive(mContext, intent);
+
+        verify(mResolver).notifyChange(mMediaController.getSliceUri(), null);
+        verify(mResolver).notifyChange(mRingController.getSliceUri(), null);
+    }
+
+    private void registerIntentToUri(VolumeSeekBarPreferenceController controller) {
+        VolumeSliceHelper.registerIntentToUri(mContext, controller.getIntentFilter(),
+                controller.getSliceUri(), controller.getAudioStream());
+    }
+
+    private Intent createIntent(String action) {
+        return new Intent(action)
+                .putExtra(SliceBroadcastRelay.EXTRA_URI, VOLUME_SLICES_URI.toString());
+    }
+
+    @Implements(SliceBroadcastRelay.class)
+    public static class ShadowSliceBroadcastRelay {
+
+        private static int sRegisteredCount;
+
+        @Implementation
+        public static void registerReceiver(Context context, Uri sliceUri,
+                Class<? extends BroadcastReceiver> receiver, IntentFilter filter) {
+            sRegisteredCount++;
+        }
+
+        @Implementation
+        public static void unregisterReceivers(Context context, Uri sliceUri) {
+            sRegisteredCount--;
+        }
+
+        @Resetter
+        static void reset() {
+            sRegisteredCount = 0;
+        }
+
+        static int getRegisteredCount() {
+            return sRegisteredCount;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java
deleted file mode 100644
index b8cc709..0000000
--- a/tests/robotests/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2020 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.sound;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-
-import android.content.ContentResolver;
-import android.content.Context;
-import android.provider.Settings;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class MediaControlsPreferenceControllerTest {
-
-    private static final String KEY = "media_controls_resume_switch";
-
-    private Context mContext;
-    private int mOriginalQs;
-    private int mOriginalResume;
-    private ContentResolver mContentResolver;
-    private MediaControlsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = spy(RuntimeEnvironment.application);
-        mContentResolver = mContext.getContentResolver();
-        mOriginalQs = Settings.Global.getInt(mContentResolver,
-                Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
-        mOriginalResume = Settings.Secure.getInt(mContentResolver,
-                Settings.Secure.MEDIA_CONTROLS_RESUME, 1);
-        mController = new MediaControlsPreferenceController(mContext, KEY);
-    }
-
-    @After
-    public void tearDown() {
-        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS,
-                mOriginalQs);
-        Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME,
-                mOriginalResume);
-    }
-
-    @Test
-    public void getAvailability_returnAvailable() {
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
-    }
-
-    @Test
-    public void setChecked_enable_shouldTurnOff() {
-        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
-        Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 1);
-
-        assertThat(mController.isChecked()).isFalse();
-
-        mController.setChecked(true);
-
-        assertThat(Settings.Secure.getInt(mContentResolver,
-                Settings.Secure.MEDIA_CONTROLS_RESUME, -1)).isEqualTo(0);
-    }
-
-    @Test
-    public void setChecked_disable_shouldTurnOn() {
-        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
-        Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 0);
-
-        assertThat(mController.isChecked()).isTrue();
-
-        mController.setChecked(false);
-
-        assertThat(Settings.Secure.getInt(mContentResolver,
-                Settings.Secure.MEDIA_CONTROLS_RESUME, -1)).isEqualTo(1);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
index 49928db..eb84a4f 100644
--- a/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/sound/MediaOutputPreferenceControllerTest.java
@@ -23,6 +23,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
@@ -147,7 +148,7 @@
         ShadowBluetoothUtils.sLocalBluetoothManager = mLocalManager;
         mLocalBluetoothManager = Utils.getLocalBtManager(mContext);
 
-        when(mContext.getSystemService(MediaSessionManager.class)).thenReturn(mMediaSessionManager);
+        doReturn(mMediaSessionManager).when(mContext).getSystemService(MediaSessionManager.class);
         when(mMediaSessionManager.getActiveSessions(any())).thenReturn(mMediaControllers);
         when(mMediaController.getPackageName()).thenReturn(TEST_PACKAGE_NAME);
         mPlaybackInfo = new MediaController.PlaybackInfo(
@@ -299,9 +300,9 @@
 
         mPreference.setKey(TEST_KEY);
         mController.handlePreferenceTreeClick(mPreference);
-        verify(mContext).startActivity(intentCaptor.capture());
+        verify(mContext).sendBroadcast(intentCaptor.capture());
         assertThat(intentCaptor.getValue().getAction())
-                .isEqualTo(MediaOutputSliceConstants.ACTION_MEDIA_OUTPUT);
+                .isEqualTo(MediaOutputSliceConstants.ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG);
     }
 
     /**
diff --git a/tests/robotests/src/com/android/settings/sound/ResumableMediaAppsControllerTest.java b/tests/robotests/src/com/android/settings/sound/ResumableMediaAppsControllerTest.java
new file mode 100644
index 0000000..797560a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/sound/ResumableMediaAppsControllerTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2020 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.sound;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.testutils.ResolveInfoBuilder;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(RobolectricTestRunner.class)
+public class ResumableMediaAppsControllerTest {
+
+    private static final String KEY = "media_controls_resumable_apps";
+
+    private static final String FAKE_APP = "com.test.fakeapp1";
+
+    private Context mContext;
+    private int mOriginalQs;
+    private int mOriginalResume;
+    private String mOriginalBlocked;
+    private ContentResolver mContentResolver;
+    private ResumableMediaAppsController mController;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PreferenceGroup mPreferenceGroup;
+
+    @Before
+    public void setUp() {
+        mContext = spy(RuntimeEnvironment.application);
+        mContentResolver = mContext.getContentResolver();
+        mOriginalQs = Settings.Global.getInt(mContentResolver,
+                Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
+        mOriginalResume = Settings.Secure.getInt(mContentResolver,
+                Settings.Secure.MEDIA_CONTROLS_RESUME, 1);
+        mOriginalBlocked = Settings.Secure.getString(mContentResolver,
+                Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED);
+
+        // Start all tests with feature enabled, nothing blocked
+        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 1);
+        Settings.Secure.putString(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED,
+                mOriginalBlocked);
+
+        mPreferenceScreen = mock(PreferenceScreen.class);
+        mPreferenceGroup = mock(PreferenceGroup.class);
+        mPackageManager = mock(PackageManager.class);
+
+        List<ResolveInfo> fakeInfo = new ArrayList<>();
+        fakeInfo.add(createResolveInfo(FAKE_APP));
+        when(mPackageManager.queryIntentServices(any(), anyInt())).thenReturn(fakeInfo);
+
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        when(mPreferenceScreen.findPreference(KEY)).thenReturn(mPreferenceGroup);
+
+        mController = new ResumableMediaAppsController(mContext, KEY);
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS,
+                mOriginalQs);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME,
+                mOriginalResume);
+        Settings.Secure.putString(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED,
+                mOriginalBlocked);
+    }
+
+    @Test
+    public void getAvailability_hasEligibleApps_isAvailable() {
+        // The package manager already has an eligible app from setUp()
+        assertEquals(AVAILABLE, mController.getAvailabilityStatus());
+    }
+
+    @Test
+    public void getAvailability_noEligibleApps_isConditionallyUnavailable() {
+        Context context = mock(Context.class);
+        PackageManager packageManager = mock(PackageManager.class);
+        List<ResolveInfo> fakeInfo = new ArrayList<>();
+        when(packageManager.queryIntentServices(any(), anyInt())).thenReturn(fakeInfo);
+        when(context.getPackageManager()).thenReturn(packageManager);
+        ResumableMediaAppsController controller = new ResumableMediaAppsController(context, KEY);
+
+        assertEquals(CONDITIONALLY_UNAVAILABLE, controller.getAvailabilityStatus());
+    }
+
+    @Test
+    public void displayPreference_addsApps() {
+        mController.displayPreference(mPreferenceScreen);
+        verify(mPreferenceGroup, times(1)).addPreference(any());
+    }
+
+    @Test
+    public void unblockedApp_isChecked() {
+        ArgumentCaptor<ResumableMediaAppsController.MediaSwitchPreference> argument =
+                ArgumentCaptor.forClass(ResumableMediaAppsController.MediaSwitchPreference.class);
+        mController.displayPreference(mPreferenceScreen);
+        verify(mPreferenceGroup).addPreference(argument.capture());
+        assertTrue(argument.getValue().isChecked());
+    }
+
+    @Test
+    public void blockedApp_isNotChecked() {
+        Settings.Secure.putString(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME_BLOCKED,
+                FAKE_APP);
+
+        ArgumentCaptor<ResumableMediaAppsController.MediaSwitchPreference> argument =
+                ArgumentCaptor.forClass(ResumableMediaAppsController.MediaSwitchPreference.class);
+        mController.displayPreference(mPreferenceScreen);
+        verify(mPreferenceGroup).addPreference(argument.capture());
+
+        assertFalse(argument.getValue().isChecked());
+    }
+
+    private ResolveInfo createResolveInfo(String name) {
+        ResolveInfoBuilder builder = new ResolveInfoBuilder(name);
+        builder.setActivity(name, name);
+        return builder.build();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
index 7bdc368..baa4690 100644
--- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java
@@ -73,7 +73,7 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
 
-        assertThat(keys).containsAllIn(niks);
+        assertThat(keys).containsAtLeastElementsIn(niks);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index b6c4fb7..6fb2eae 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -29,6 +29,7 @@
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
+import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
 import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
@@ -42,6 +43,7 @@
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.slices.SlicesFeatureProvider;
 import com.android.settings.users.UserFeatureProvider;
+import com.android.settings.wifi.WifiTrackerLibProvider;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 
 import org.mockito.Answers;
@@ -54,6 +56,7 @@
 
     public final SupportFeatureProvider supportFeatureProvider;
     public final MetricsFeatureProvider metricsFeatureProvider;
+    public final BatteryStatusFeatureProvider batteryStatusFeatureProvider;
     public final PowerUsageFeatureProvider powerUsageFeatureProvider;
     public final DashboardFeatureProvider dashboardFeatureProvider;
     public final DockUpdaterFeatureProvider dockUpdaterFeatureProvider;
@@ -75,6 +78,8 @@
     public SearchFeatureProvider searchFeatureProvider;
     public ContextualCardFeatureProvider mContextualCardFeatureProvider;
 
+    public WifiTrackerLibProvider wifiTrackerLibProvider;
+
     /**
      * Call this in {@code @Before} method of the test class to use fake factory.
      */
@@ -98,6 +103,7 @@
     public FakeFeatureFactory() {
         supportFeatureProvider = mock(SupportFeatureProvider.class);
         metricsFeatureProvider = mock(MetricsFeatureProvider.class);
+        batteryStatusFeatureProvider = mock(BatteryStatusFeatureProvider.class);
         powerUsageFeatureProvider = mock(PowerUsageFeatureProvider.class);
         dashboardFeatureProvider = mock(DashboardFeatureProvider.class);
         dockUpdaterFeatureProvider = mock(DockUpdaterFeatureProvider.class);
@@ -117,6 +123,7 @@
         mBluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
         mAwareFeatureProvider = mock(AwareFeatureProvider.class);
         mFaceFeatureProvider = mock(FaceFeatureProvider.class);
+        wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class);
     }
 
     @Override
@@ -135,6 +142,11 @@
     }
 
     @Override
+    public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(Context context) {
+        return batteryStatusFeatureProvider;
+    }
+
+    @Override
     public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
         return powerUsageFeatureProvider;
     }
@@ -223,4 +235,9 @@
     public FaceFeatureProvider getFaceFeatureProvider() {
         return mFaceFeatureProvider;
     }
+
+    @Override
+    public WifiTrackerLibProvider getWifiTrackerLibProvider() {
+        return wifiTrackerLibProvider;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java b/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java
index c961559..8cd0892 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeIndexProvider.java
@@ -29,6 +29,12 @@
 
     public static final String KEY = "TestKey";
 
+    /**
+     * The fake SearchIndexProvider. Note that the use of location_settings below implies that tests
+     * using this should be using the res/xml-mcc999/location_settings.xml or
+     * res/xml-mcc998/location_settings.xml. Annotate tests with
+     * {@code @Config(qualifiers = "mcc999")}.
+     */
     public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider(R.xml.location_settings) {
 
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
index 8bceb13..6812451 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeToggleController.java
@@ -12,9 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
  */
-
 package com.android.settings.testutils;
 
 import android.content.Context;
@@ -26,8 +24,6 @@
 import com.android.settings.core.TogglePreferenceController;
 import com.android.settings.slices.SliceBackgroundWorker;
 
-import java.io.IOException;
-
 public class FakeToggleController extends TogglePreferenceController {
 
     public static final String AVAILABILITY_KEY = "fake_toggle_availability_key";
diff --git a/tests/robotests/src/com/android/settings/testutils/SliceTester.java b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
index f2cce3c..ede5fbd 100644
--- a/tests/robotests/src/com/android/settings/testutils/SliceTester.java
+++ b/tests/robotests/src/com/android/settings/testutils/SliceTester.java
@@ -322,4 +322,4 @@
         expectedKeywords.add(data.getScreenTitle().toString());
         assertThat(keywords).containsExactlyElementsIn(expectedKeywords);
     }
-}
\ No newline at end of file
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
index f657293..9de5c7f 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowBluetoothAdapter.java
@@ -17,6 +17,7 @@
 package com.android.settings.testutils.shadow;
 
 import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -29,6 +30,7 @@
 
     private int mState;
     private List<Integer> mSupportedProfiles = new ArrayList<>();
+    private List<BluetoothDevice> mMostRecentlyConnectedDevices = new ArrayList<>();
 
     @Implementation
     protected List<Integer> getSupportedProfiles() {
@@ -56,4 +58,13 @@
     protected boolean factoryReset() {
         return true;
     }
+
+    @Implementation
+    protected List<BluetoothDevice> getMostRecentlyConnectedDevices() {
+        return mMostRecentlyConnectedDevices;
+    }
+
+    public void setMostRecentlyConnectedDevices(List<BluetoothDevice> list) {
+        mMostRecentlyConnectedDevices = list;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
index 90c5910..e118a89 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowFingerprintManager.java
@@ -18,6 +18,7 @@
 
 import android.hardware.fingerprint.Fingerprint;
 import android.hardware.fingerprint.FingerprintManager;
+import android.hardware.fingerprint.FingerprintSensorPropertiesInternal;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
@@ -27,8 +28,19 @@
 @Implements(FingerprintManager.class)
 public class ShadowFingerprintManager extends org.robolectric.shadows.ShadowFingerprintManager {
 
+    private static List<FingerprintSensorPropertiesInternal> sFingerprintSensorProperties;
+
+    public static void setSensorProperties(List<FingerprintSensorPropertiesInternal> props) {
+        sFingerprintSensorProperties = props;
+    }
+
     @Implementation
     protected List<Fingerprint> getEnrolledFingerprints(int userId) {
         return getEnrolledFingerprints();
     }
+
+    @Implementation
+    protected List<FingerprintSensorPropertiesInternal> getSensorPropertiesInternal() {
+        return sFingerprintSensorProperties;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
index 38756ac..3a159b2 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowLockPatternUtils.java
@@ -18,19 +18,31 @@
 
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
+import android.os.UserHandle;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.internal.widget.LockscreenCredential;
 
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
+import org.robolectric.annotation.Resetter;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Implements(LockPatternUtils.class)
 public class ShadowLockPatternUtils {
 
     private static boolean sDeviceEncryptionEnabled;
+    private static Map<Integer, Integer> sUserToComplexityMap = new HashMap<>();
+
+
+    @Resetter
+    public static void reset() {
+        sUserToComplexityMap.clear();
+        sDeviceEncryptionEnabled = false;
+    }
 
     @Implementation
     protected boolean hasSecureLockScreen() {
@@ -76,4 +88,18 @@
     protected boolean checkPasswordHistory(byte[] passwordToCheck, byte[] hashFactor, int userId) {
         return false;
     }
+
+    @Implementation
+    public @DevicePolicyManager.PasswordComplexity int getRequestedPasswordComplexity(int userId) {
+        return sUserToComplexityMap.getOrDefault(userId,
+                DevicePolicyManager.PASSWORD_COMPLEXITY_NONE);
+    }
+
+    public static void setRequiredPasswordComplexity(int userId, int complexity) {
+        sUserToComplexityMap.put(userId, complexity);
+    }
+
+    public static void setRequiredPasswordComplexity(int complexity) {
+        setRequiredPasswordComplexity(UserHandle.myUserId(), complexity);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNetworkDetailsTracker.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNetworkDetailsTracker.java
new file mode 100644
index 0000000..5df9ba5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNetworkDetailsTracker.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils.shadow;
+
+import static org.mockito.Mockito.mock;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkScoreManager;
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
+
+import com.android.wifitrackerlib.NetworkDetailsTracker;
+import com.android.wifitrackerlib.WifiEntry;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+import java.time.Clock;
+
+@Implements(NetworkDetailsTracker.class)
+public class ShadowNetworkDetailsTracker {
+
+    @Implementation
+    public static NetworkDetailsTracker createNetworkDetailsTracker(@NonNull Lifecycle lifecycle,
+            @NonNull Context context,
+            @NonNull WifiManager wifiManager,
+            @NonNull ConnectivityManager connectivityManager,
+            @NonNull NetworkScoreManager networkScoreManager,
+            @NonNull Handler mainHandler,
+            @NonNull Handler workerHandler,
+            @NonNull Clock clock,
+            long maxScanAgeMillis,
+            long scanIntervalMillis,
+            String key) {
+        return mock(NetworkDetailsTracker.class);
+    }
+
+    @Implementation
+    public WifiEntry getWifiEntry() {
+        return mock(WifiEntry.class);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java
index fb8c068..54f665c 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowNfcAdapter.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.testutils.shadow;
 
+import static org.robolectric.shadow.api.Shadow.newInstanceOf;
+
 import android.app.Activity;
 import android.content.Context;
 import android.nfc.NfcAdapter;
@@ -24,16 +26,18 @@
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.Resetter;
-import org.robolectric.util.ReflectionHelpers;
-import org.robolectric.util.ReflectionHelpers.ClassParameter;
 
 /**
  * Shadow of {@link NfcAdapter}.
  */
-@Implements(NfcAdapter.class)
-public class ShadowNfcAdapter {
+@Implements(value = NfcAdapter.class)
+public class ShadowNfcAdapter extends org.robolectric.shadows.ShadowNfcAdapter {
     private static boolean sReaderModeEnabled;
+    private static Object sNfcAdapter = newInstanceOf("android.nfc.NfcAdapter");
+
     private boolean mIsNfcEnabled = false;
+    private int mState = NfcAdapter.STATE_ON;
+    private boolean mIsSecureNfcSupported = false;
 
     @Implementation
     protected void enableReaderMode(Activity activity, NfcAdapter.ReaderCallback callback,
@@ -43,8 +47,7 @@
 
     @Implementation
     protected static NfcAdapter getDefaultAdapter(Context context) {
-        return ReflectionHelpers.callConstructor(
-                NfcAdapter.class, ClassParameter.from(Context.class, context));
+        return (NfcAdapter) sNfcAdapter;
     }
 
     @Implementation
@@ -52,6 +55,28 @@
         return mIsNfcEnabled;
     }
 
+    public void setEnabled(boolean enable) {
+        mIsNfcEnabled = enable;
+    }
+
+    @Implementation
+    protected int getAdapterState() {
+        return mState;
+    }
+
+    public void setAdapterState(int state) {
+        this.mState = state;
+    }
+
+    @Implementation
+    protected boolean isSecureNfcSupported() {
+        return mIsSecureNfcSupported;
+    }
+
+    public void setSecureNfcSupported(boolean supported) {
+        this.mIsSecureNfcSupported = supported;
+    }
+
     @Implementation
     protected boolean enable() {
         mIsNfcEnabled = true;
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java
deleted file mode 100644
index c40e9c9..0000000
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerWhitelistBackend.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.testutils.shadow;
-
-import com.android.settingslib.fuelgauge.PowerWhitelistBackend;
-
-import org.robolectric.annotation.Implements;
-
-@Implements(PowerWhitelistBackend.class)
-public class ShadowPowerWhitelistBackend {
-    protected void __constructor__() {
-        // Do nothing
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
index eadd33a..5a32f34 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
@@ -46,6 +46,7 @@
     private static boolean sIsSystemAlertWindowEnabled;
     private static boolean sIsVoiceCapable;
     private static ArraySet<String> sResultLinks = new ArraySet<>();
+    private static boolean sIsBatteryPresent;
 
     @Implementation
     protected static int enforceSameOwner(Context context, int userId) {
@@ -67,6 +68,7 @@
         sIsDemoUser = false;
         sIsVoiceCapable = false;
         sResultLinks = new ArraySet<>();
+        sIsBatteryPresent = true;
     }
 
     public static void setIsDemoUser(boolean isDemoUser) {
@@ -155,4 +157,13 @@
     public static void setHandledDomains(ArraySet<String> links) {
         sResultLinks = links;
     }
+
+    @Implementation
+    protected static boolean isBatteryPresent(Context context) {
+        return sIsBatteryPresent;
+    }
+
+    public static void setIsBatteryPresent(boolean isBatteryPresent) {
+        sIsBatteryPresent = isBatteryPresent;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java
index 80db53e..ea57bf7 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowWifiManager.java
@@ -18,6 +18,7 @@
 
 import static org.robolectric.RuntimeEnvironment.application;
 
+import android.net.wifi.ScanResult;
 import android.net.wifi.SoftApConfiguration;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
@@ -81,6 +82,11 @@
         return false;
     }
 
+    @Implementation
+    protected List<ScanResult> getScanResults() {
+        return new ArrayList<ScanResult>();
+    }
+
     public static ShadowWifiManager get() {
         return Shadow.extract(application.getSystemService(WifiManager.class));
     }
diff --git a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
deleted file mode 100644
index db9872f..0000000
--- a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.users;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.same;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Dialog;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.UserInfo;
-import android.graphics.drawable.Drawable;
-import android.widget.EditText;
-import android.widget.ImageView;
-
-import androidx.appcompat.app.AlertDialog;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-
-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.RobolectricTestRunner;
-import org.robolectric.android.controller.ActivityController;
-import org.robolectric.annotation.Config;
-
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-@RunWith(RobolectricTestRunner.class)
-public class EditUserInfoControllerTest {
-    private static final int MAX_USER_NAME_LENGTH = 100;
-
-    @Mock
-    private Fragment mFragment;
-    @Mock
-    private Drawable mCurrentIcon;
-
-    private boolean mCanChangePhoto;
-
-    private FragmentActivity mActivity;
-    private TestEditUserInfoController mController;
-
-    public class TestEditUserInfoController extends EditUserInfoController {
-        private EditUserPhotoController mPhotoController;
-
-        private EditUserPhotoController getPhotoController() {
-            return mPhotoController;
-        }
-
-        @Override
-        protected EditUserPhotoController createEditUserPhotoController(Fragment fragment,
-                ImageView userPhotoView, Drawable drawable) {
-            mPhotoController = mock(EditUserPhotoController.class, Answers.RETURNS_DEEP_STUBS);
-            return mPhotoController;
-        }
-
-        @Override
-        boolean canChangePhoto(Context context, UserInfo user) {
-            return mCanChangePhoto;
-        }
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mActivity = spy(ActivityController.of(new FragmentActivity()).get());
-        when(mFragment.getActivity()).thenReturn(mActivity);
-        mController = new TestEditUserInfoController();
-        mCanChangePhoto = true;
-    }
-
-    @Test
-    public void photoControllerOnActivityResult_whenWaiting_isCalled() {
-        mController.createDialog(mFragment, mCurrentIcon, "test user",
-                "title", null,
-                android.os.Process.myUserHandle(), null);
-        mController.startingActivityForResult();
-        Intent resultData = new Intent();
-        mController.onActivityResult(0, 0, resultData);
-        EditUserPhotoController photoController = mController.getPhotoController();
-        assertThat(photoController).isNotNull();
-        verify(photoController).onActivityResult(eq(0), eq(0), same(resultData));
-    }
-
-    @Test
-    @Config(shadows = ShadowAlertDialogCompat.class)
-    public void userNameView_inputLongName_shouldBeConstrained() {
-        // generate a string of 200 'A's
-        final String longName = Stream.generate(
-                () -> String.valueOf('A')).limit(200).collect(Collectors.joining());
-        final AlertDialog dialog = (AlertDialog) mController.createDialog(mFragment, mCurrentIcon,
-                "test user", "title", null,
-                android.os.Process.myUserHandle(), null);
-        final EditText userName = ShadowAlertDialogCompat.shadowOf(dialog).getView()
-                .findViewById(R.id.user_name);
-
-        userName.setText(longName);
-
-        assertThat(userName.getText().length()).isEqualTo(MAX_USER_NAME_LENGTH);
-    }
-
-    @Test
-    public void onDialogCompleteCallback_isCalled_whenCancelled() {
-        EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
-                EditUserInfoController.OnContentChangedCallback.class);
-
-        EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
-                EditUserInfoController.OnDialogCompleteCallback.class);
-
-        AlertDialog dialog = (AlertDialog) mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", contentChangeCallback,
-                android.os.Process.myUserHandle(),
-                dialogCompleteCallback);
-
-        dialog.show();
-        dialog.cancel();
-
-        verify(contentChangeCallback, times(0))
-                .onLabelChanged(any(), any());
-        verify(contentChangeCallback, times(0))
-                .onPhotoChanged(any(), any());
-        verify(dialogCompleteCallback, times(0)).onPositive();
-        verify(dialogCompleteCallback, times(1)).onNegativeOrCancel();
-    }
-
-    @Test
-    public void onDialogCompleteCallback_isCalled_whenPositiveClicked() {
-        EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
-                EditUserInfoController.OnContentChangedCallback.class);
-
-        EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
-                EditUserInfoController.OnDialogCompleteCallback.class);
-
-        AlertDialog dialog = (AlertDialog) mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", contentChangeCallback,
-                android.os.Process.myUserHandle(),
-                dialogCompleteCallback);
-
-        // No change to the photo.
-        when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(mCurrentIcon);
-
-        dialog.show();
-        dialog.getButton(Dialog.BUTTON_POSITIVE).performClick();
-
-        verify(contentChangeCallback, times(0))
-                .onLabelChanged(any(), any());
-        verify(contentChangeCallback, times(0))
-                .onPhotoChanged(any(), any());
-        verify(dialogCompleteCallback, times(1)).onPositive();
-        verify(dialogCompleteCallback, times(0)).onNegativeOrCancel();
-    }
-
-    @Test
-    public void onDialogCompleteCallback_isCalled_whenNegativeClicked() {
-        EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
-                EditUserInfoController.OnContentChangedCallback.class);
-
-        EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
-                EditUserInfoController.OnDialogCompleteCallback.class);
-
-        AlertDialog dialog = (AlertDialog) mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", contentChangeCallback,
-                android.os.Process.myUserHandle(),
-                dialogCompleteCallback);
-
-        dialog.show();
-        dialog.getButton(Dialog.BUTTON_NEGATIVE).performClick();
-
-        verify(contentChangeCallback, times(0))
-                .onLabelChanged(any(), any());
-        verify(contentChangeCallback, times(0))
-                .onPhotoChanged(any(), any());
-        verify(dialogCompleteCallback, times(0)).onPositive();
-        verify(dialogCompleteCallback, times(1)).onNegativeOrCancel();
-    }
-
-    @Test
-    public void onContentChangedCallback_isCalled_whenLabelChanges() {
-        EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
-                EditUserInfoController.OnContentChangedCallback.class);
-
-        EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
-                EditUserInfoController.OnDialogCompleteCallback.class);
-
-        AlertDialog dialog = (AlertDialog) mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", contentChangeCallback,
-                android.os.Process.myUserHandle(),
-                dialogCompleteCallback);
-
-        // No change to the photo.
-        when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(mCurrentIcon);
-
-        dialog.show();
-        String expectedNewName = "new test user";
-        EditText editText = (EditText) dialog.findViewById(R.id.user_name);
-        editText.setText(expectedNewName);
-
-        dialog.getButton(Dialog.BUTTON_POSITIVE).performClick();
-
-        verify(contentChangeCallback, times(1))
-                .onLabelChanged(any(), eq(expectedNewName));
-        verify(contentChangeCallback, times(0))
-                .onPhotoChanged(any(), any());
-        verify(dialogCompleteCallback, times(1)).onPositive();
-        verify(dialogCompleteCallback, times(0)).onNegativeOrCancel();
-    }
-
-    @Test
-    public void onContentChangedCallback_isCalled_whenPhotoChanges() {
-        EditUserInfoController.OnContentChangedCallback contentChangeCallback = mock(
-                EditUserInfoController.OnContentChangedCallback.class);
-
-        EditUserInfoController.OnDialogCompleteCallback dialogCompleteCallback = mock(
-                EditUserInfoController.OnDialogCompleteCallback.class);
-
-        AlertDialog dialog = (AlertDialog) mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", contentChangeCallback,
-                android.os.Process.myUserHandle(),
-                dialogCompleteCallback);
-
-        // A different drawable.
-        Drawable newPhoto = mock(Drawable.class);
-        when(mController.getPhotoController().getNewUserPhotoDrawable()).thenReturn(newPhoto);
-
-        dialog.show();
-        dialog.getButton(Dialog.BUTTON_POSITIVE).performClick();
-
-        verify(contentChangeCallback, times(0))
-                .onLabelChanged(any(), any());
-        verify(contentChangeCallback, times(1))
-                .onPhotoChanged(any(), eq(newPhoto));
-        verify(dialogCompleteCallback, times(1)).onPositive();
-        verify(dialogCompleteCallback, times(0)).onNegativeOrCancel();
-    }
-
-    @Test
-    public void createDialog_canNotChangePhoto_nullPhotoController() {
-        mCanChangePhoto = false;
-
-        mController.createDialog(
-                mFragment, mCurrentIcon, "test",
-                "title", null,
-                android.os.Process.myUserHandle(),
-                null);
-
-        assertThat(mController.mPhotoController).isNull();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java
deleted file mode 100644
index 69825b4..0000000
--- a/tests/robotests/src/com/android/settings/users/MultiUserFooterPreferenceControllerTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.users;
-
-import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
-import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-@Ignore
-public class MultiUserFooterPreferenceControllerTest {
-
-    private Context mContext;
-    private MultiUserFooterPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mController = new MultiUserFooterPreferenceController(mContext, "footer");
-    }
-
-    @Test
-    public void getAvailabilityStatus_multiUserOff_shouldReturnEnabled() {
-        mController.mUserCaps.mEnabled = true;
-        mController.mUserCaps.mUserSwitcherEnabled = false;
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
-    }
-
-    @Test
-    public void getAvailabilityStatus_multiUserOn_shouldReturnDisabled() {
-        mController.mUserCaps.mEnabled = true;
-        mController.mUserCaps.mUserSwitcherEnabled = true;
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_FOR_USER);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
index 90c9172..50ddd2a 100644
--- a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java
@@ -363,7 +363,7 @@
         mFragment.initialize(mActivity, mArguments);
 
         verify(mRemoveUserPref).setOnPreferenceClickListener(mFragment);
-        verify(mRemoveUserPref).setTitle(R.string.user_exit_guest_title);
+        verify(mRemoveUserPref).setTitle(R.string.user_exit_guest_menu);
         verify(mFragment, never()).removePreference(KEY_REMOVE_USER);
     }
 
diff --git a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
index 2057788..3494c63 100644
--- a/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/users/UserSettingsTest.java
@@ -23,7 +23,6 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.notNull;
@@ -129,8 +128,8 @@
         mFragment = spy(new UserSettings());
         ReflectionHelpers.setField(mFragment, "mAddUserWhenLockedPreferenceController",
                 mock(AddUserWhenLockedPreferenceController.class));
-        ReflectionHelpers.setField(mFragment, "mMultiUserFooterPreferenceController",
-                mock(MultiUserFooterPreferenceController.class));
+        ReflectionHelpers.setField(mFragment, "mMultiUserTopIntroPreferenceController",
+                mock(MultiUserTopIntroPreferenceController.class));
         ReflectionHelpers.setField(mFragment, "mUserManager", mUserManager);
         ReflectionHelpers.setField(mFragment, "mUserCaps", mUserCapabilities);
         ReflectionHelpers.setField(mFragment, "mDefaultIconDrawable", mDefaultIconDrawable);
@@ -399,7 +398,7 @@
         ArgumentCaptor<UserPreference> captor = ArgumentCaptor.forClass(UserPreference.class);
         verify(mFragment.mUserListCategory).addPreference(captor.capture());
         UserPreference adminPref = captor.getValue();
-        assertThat(adminPref).isSameAs(mMePreference);
+        assertThat(adminPref).isSameInstanceAs(mMePreference);
     }
 
     @Test
@@ -418,7 +417,7 @@
         assertThat(guestPref.getKey()).isEqualTo(KEY_USER_GUEST);
         assertThat(guestPref.isEnabled()).isEqualTo(true);
         assertThat(guestPref.isSelectable()).isEqualTo(true);
-        assertThat(guestPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(guestPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -437,7 +436,7 @@
         assertThat(userPref.getKey()).isEqualTo("id=" + INACTIVE_SECONDARY_USER_ID);
         assertThat(userPref.isEnabled()).isEqualTo(true);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -457,7 +456,7 @@
         assertThat(userPref.getSummary()).isEqualTo("Restricted profile");
         assertThat(userPref.isEnabled()).isEqualTo(true);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -494,7 +493,7 @@
         assertThat(userPref.getSummary()).isEqualTo("Not set up - Restricted profile");
         assertThat(userPref.isEnabled()).isEqualTo(true);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -519,7 +518,7 @@
         assertThat(userPref.getSummary()).isEqualTo("Not set up");
         assertThat(userPref.isEnabled()).isEqualTo(false);
         assertThat(userPref.isSelectable()).isEqualTo(true);
-        assertThat(userPref.getOnPreferenceClickListener()).isSameAs(mFragment);
+        assertThat(userPref.getOnPreferenceClickListener()).isSameInstanceAs(mFragment);
     }
 
     @Test
@@ -575,7 +574,7 @@
 
         verify(mUserManager, never()).getUserIcon(anyInt());
         // updateUserList should be called only once
-        verify(mUserManager).getUsers(true);
+        verify(mUserManager).getAliveUsers();
     }
 
     @Test
@@ -592,7 +591,7 @@
 
         verify(mUserManager).getUserIcon(ACTIVE_USER_ID);
         // updateUserList should be called another time after loading the icons
-        verify(mUserManager, times(2)).getUsers(true);
+        verify(mUserManager, times(2)).getAliveUsers();
     }
 
     @Test
@@ -672,7 +671,7 @@
     private void givenUsers(UserInfo... userInfo) {
         List<UserInfo> users = Arrays.asList(userInfo);
         doReturn(users).when(mUserManager).getUsers();
-        doReturn(users).when(mUserManager).getUsers(anyBoolean());
+        doReturn(users).when(mUserManager).getAliveUsers();
     }
 
     private static void removeFlag(UserInfo userInfo, int flag) {
diff --git a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
deleted file mode 100644
index f7702be..0000000
--- a/tests/robotests/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
+++ /dev/null
@@ -1,41 +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.utils;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class LocalClassLoaderContextThemeWrapperTest {
-
-    private LocalClassLoaderContextThemeWrapper mContextThemeWrapper;
-
-    @Test
-    public void getClassLoader_shouldUseLocalClassLoader() {
-        final Context context = RuntimeEnvironment.application;
-        final Class clazz = LocalClassLoaderContextThemeWrapperTest.class;
-        mContextThemeWrapper = new LocalClassLoaderContextThemeWrapper(clazz, context, 0);
-
-        assertThat(mContextThemeWrapper.getClassLoader()).isSameAs(clazz.getClassLoader());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.java
deleted file mode 100644
index 7856b06..0000000
--- a/tests/robotests/src/com/android/settings/vpn2/VpnUtilsTest.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.vpn2;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.net.ConnectivityManager;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public final class VpnUtilsTest {
-    @Test
-    public void testIsAlwaysOnVpnSet() {
-        final ConnectivityManager cm = mock(ConnectivityManager.class);
-        when(cm.getAlwaysOnVpnPackageForUser(0)).thenReturn("com.example.vpn");
-        assertThat(VpnUtils.isAlwaysOnVpnSet(cm, 0)).isTrue();
-
-        when(cm.getAlwaysOnVpnPackageForUser(0)).thenReturn(null);
-        assertThat(VpnUtils.isAlwaysOnVpnSet(cm, 0)).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
index 73f12c2..6201bcb 100644
--- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
@@ -56,6 +56,7 @@
     private static final String PACKAGE_WALLPAPER_ACTIVITY =
             "com.android.settings.wallpaper.WallpaperSuggestionActivity";
     private static final String WALLPAPER_FLAVOR = "com.android.launcher3.WALLPAPER_FLAVOR";
+    private static final String WALLPAPER_LAUNCH_SOURCE = "com.android.wallpaper.LAUNCH_SOURCE";
 
     @Before
     public void setUp() {
@@ -100,7 +101,7 @@
     }
 
     @Test
-    public void addExtras_intentFromSetupWizard_extrasHasWallpaperOnly() {
+    public void addExtras_intentFromSetupWizard_extrasHasWallpaperOnlyAndLaunchedSuw() {
         WallpaperSuggestionActivity activity =
                 Robolectric.buildActivity(WallpaperSuggestionActivity.class, new Intent(
                         Intent.ACTION_MAIN).setComponent(
@@ -112,6 +113,8 @@
 
         assertThat(intent).isNotNull();
         assertThat(intent.getStringExtra(WALLPAPER_FLAVOR)).isEqualTo("wallpaper_only");
+        assertThat(intent.getStringExtra(WALLPAPER_LAUNCH_SOURCE))
+                .isEqualTo("app_launched_suw");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java b/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
deleted file mode 100644
index ac95afa..0000000
--- a/tests/robotests/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
+++ /dev/null
@@ -1,49 +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.widget;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class DefaultIndicatorSeekBarTest {
-
-    private DefaultIndicatorSeekBar mDefaultIndicatorSeekBar;
-
-    @Before
-    public void setUp() {
-        mDefaultIndicatorSeekBar = new DefaultIndicatorSeekBar(RuntimeEnvironment.application);
-        mDefaultIndicatorSeekBar.setMax(100);
-    }
-
-    @After
-    public void tearDown() {
-        mDefaultIndicatorSeekBar = null;
-    }
-
-    @Test
-    public void defaultProgress_setSucceeds() {
-        mDefaultIndicatorSeekBar.setDefaultProgress(40);
-        assertEquals(40, mDefaultIndicatorSeekBar.getDefaultProgress());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/DonutViewTest.java b/tests/robotests/src/com/android/settings/widget/DonutViewTest.java
deleted file mode 100644
index cc41f92..0000000
--- a/tests/robotests/src/com/android/settings/widget/DonutViewTest.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.android.settings.widget;
-
-import android.content.Context;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class DonutViewTest {
-    @Test
-    public void getPercentageStringSpannable_doesntCrashForMissingPercentage() {
-        Context context = RuntimeEnvironment.application;
-
-        DonutView.getPercentageStringSpannable(context.getResources(), "50%", "h");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
index df9a2c1..f73d0f7 100644
--- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
+++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java
@@ -105,7 +105,7 @@
         mController = EntityHeaderController.newInstance(mActivity, mFragment, inputView);
         View view = mController.done(mActivity);
 
-        assertThat(view).isSameAs(inputView);
+        assertThat(view).isSameInstanceAs(inputView);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
index bf6b95e..23b7edc 100644
--- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
+++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java
@@ -19,6 +19,7 @@
 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.spy;
@@ -32,6 +33,7 @@
 import android.os.Bundle;
 import android.view.View;
 
+import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.PreferenceScreen;
 import androidx.preference.PreferenceViewHolder;
@@ -65,14 +67,18 @@
     private Context mContext;
     private HighlightablePreferenceGroupAdapter mAdapter;
     private PreferenceViewHolder mViewHolder;
+    private Preference mPreference;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mContext = RuntimeEnvironment.application;
+        mPreference = new Preference(mContext);
+        mPreference.setKey(TEST_KEY);
         when(mPreferenceCatetory.getContext()).thenReturn(mContext);
         mAdapter = spy(new HighlightablePreferenceGroupAdapter(mPreferenceCatetory, TEST_KEY,
                 false /* highlighted*/));
+        when(mAdapter.getItem(anyInt())).thenReturn(mPreference);
         mViewHolder = PreferenceViewHolder.createInstanceForTests(
                 View.inflate(mContext, R.layout.app_preference_item, null));
     }
diff --git a/tests/robotests/src/com/android/settings/widget/LabeledSeekBarTest.java b/tests/robotests/src/com/android/settings/widget/LabeledSeekBarTest.java
new file mode 100644
index 0000000..cd73089
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/LabeledSeekBarTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2020 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 android.view.HapticFeedbackConstants.CLOCK_TICK;
+import static android.view.HapticFeedbackConstants.CONTEXT_CLICK;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.Shadows.shadowOf;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.SeekBar;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class LabeledSeekBarTest {
+
+    private Context mContext;
+    private AttributeSet mAttrs;
+    private SeekBar mSeekBar;
+    private LabeledSeekBar mLabeledSeekBar;
+    private SeekBar.OnSeekBarChangeListener mProxySeekBarListener;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mSeekBar = new SeekBar(mContext, mAttrs);
+        mLabeledSeekBar = new LabeledSeekBar(mContext, mAttrs);
+        mProxySeekBarListener = shadowOf(mLabeledSeekBar).getOnSeekBarChangeListener();
+    }
+
+    @Test
+    public void onProgressChanged_minimumValue_clockTickFeedbackPerformed() {
+        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
+        mProxySeekBarListener.onProgressChanged(mSeekBar, 0, true);
+
+        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isEqualTo(CLOCK_TICK);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
deleted file mode 100644
index 16818b4..0000000
--- a/tests/robotests/src/com/android/settings/widget/MasterCheckBoxPreferenceTest.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.widget;
-
-import static com.google.common.truth.Truth.assertThat;
-
-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 android.widget.CheckBox;
-import android.widget.LinearLayout;
-
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class MasterCheckBoxPreferenceTest {
-
-    private Context mContext;
-    private MasterCheckBoxPreference mPreference;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new MasterCheckBoxPreference(mContext);
-    }
-
-    @Test
-    public void createNewPreference_shouldSetLayout() {
-        assertThat(mPreference.getWidgetLayoutResource())
-                .isEqualTo(R.layout.preference_widget_master_checkbox);
-    }
-
-    @Test
-    public void setChecked_shouldUpdateCheckBoxCheckedState() {
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(
-                  R.layout.preference_widget_master_checkbox, null));
-        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
-        mPreference.onBindViewHolder(holder);
-
-        mPreference.setChecked(true);
-        assertThat(checkBox.isChecked()).isTrue();
-
-        mPreference.setChecked(false);
-        assertThat(checkBox.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setEnabled_shouldUpdateCheckBoxEnabledState() {
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(
-                  R.layout.preference_widget_master_checkbox, null));
-        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
-        mPreference.onBindViewHolder(holder);
-
-        mPreference.setEnabled(true);
-        assertThat(checkBox.isEnabled()).isTrue();
-
-        mPreference.setEnabled(false);
-        assertThat(checkBox.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void setCheckboxEnabled_shouldOnlyUpdateCheckBoxEnabledState() {
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(
-                        R.layout.preference_widget_master_checkbox, null));
-        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
-        mPreference.onBindViewHolder(holder);
-
-        mPreference.setCheckBoxEnabled(false);
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(checkBox.isEnabled()).isFalse();
-
-        mPreference.setCheckBoxEnabled(true);
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(checkBox.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void onBindViewHolder_shouldSetCheckboxEnabledState() {
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(
-                        R.layout.preference_widget_master_checkbox, null));
-        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
-
-        mPreference.setCheckBoxEnabled(false);
-        mPreference.onBindViewHolder(holder);
-
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(checkBox.isEnabled()).isFalse();
-
-        mPreference.setCheckBoxEnabled(true);
-        assertThat(mPreference.isEnabled()).isTrue();
-        assertThat(checkBox.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void clickWidgetView_shouldToggleCheckBox() {
-        final LayoutInflater inflater = LayoutInflater.from(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                inflater.inflate(R.layout.preference_two_target, null));
-        final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
-        assertThat(widgetView).isNotNull();
-
-        inflater.inflate(R.layout.preference_widget_master_checkbox, widgetView, true);
-        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
-        mPreference.onBindViewHolder(holder);
-
-        widgetView.performClick();
-        assertThat(checkBox.isChecked()).isTrue();
-
-        widgetView.performClick();
-        assertThat(checkBox.isChecked()).isFalse();
-    }
-
-    @Test
-    public void clickWidgetView_shouldNotToggleCheckBoxIfDisabled() {
-        final LayoutInflater inflater = LayoutInflater.from(mContext);
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                inflater.inflate(R.layout.preference_two_target, null));
-        final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
-        assertThat(widgetView).isNotNull();
-
-        inflater.inflate(R.layout.preference_widget_master_checkbox, widgetView, true);
-        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
-        mPreference.onBindViewHolder(holder);
-        mPreference.setEnabled(false);
-
-        widgetView.performClick();
-        assertThat(checkBox.isChecked()).isFalse();
-    }
-
-    @Test
-    public void clickWidgetView_shouldNotifyPreferenceChanged() {
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-                LayoutInflater.from(mContext).inflate(R.layout.preference_two_target, null));
-        final View widgetView = holder.findViewById(android.R.id.widget_frame);
-        final OnPreferenceChangeListener listener = mock(OnPreferenceChangeListener.class);
-        mPreference.setOnPreferenceChangeListener(listener);
-        mPreference.onBindViewHolder(holder);
-
-        mPreference.setChecked(false);
-        widgetView.performClick();
-        verify(listener).onPreferenceChange(mPreference, true);
-
-        mPreference.setChecked(true);
-        widgetView.performClick();
-        verify(listener).onPreferenceChange(mPreference, false);
-    }
-
-    @Test
-    public void onBindViewHolder_checkBoxShouldHaveContentDescription() {
-        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
-            LayoutInflater.from(mContext)
-                .inflate(R.layout.preference_widget_master_checkbox, null));
-        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
-        final String label = "TestButton";
-        mPreference.setTitle(label);
-
-        mPreference.onBindViewHolder(holder);
-
-        assertThat(checkBox.getContentDescription()).isEqualTo(label);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
deleted file mode 100644
index 8115a02..0000000
--- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
+++ /dev/null
@@ -1,173 +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.widget;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.widget.LinearLayout;
-import android.widget.Switch;
-
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class MasterSwitchPreferenceTest {
-
-    private Context mContext;
-    private MasterSwitchPreference mPreference;
-    private PreferenceViewHolder mHolder;
-    private LinearLayout mWidgetView;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new MasterSwitchPreference(mContext);
-        LayoutInflater inflater = LayoutInflater.from(mContext);
-        mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate(
-                com.android.settingslib.R.layout.preference_two_target, null));
-        mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame);
-        inflater.inflate(R.layout.restricted_preference_widget_master_switch, mWidgetView, true);
-    }
-
-    @Test
-    public void createNewPreference_shouldSetLayout() {
-        assertThat(mPreference.getWidgetLayoutResource())
-                .isEqualTo(R.layout.restricted_preference_widget_master_switch);
-    }
-
-    @Test
-    public void setChecked_shouldUpdateButtonCheckedState() {
-        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
-        mPreference.onBindViewHolder(mHolder);
-
-        mPreference.setChecked(true);
-        assertThat(toggle.isChecked()).isTrue();
-
-        mPreference.setChecked(false);
-        assertThat(toggle.isChecked()).isFalse();
-    }
-
-    @Test
-    public void setSwitchEnabled_shouldUpdateButtonEnabledState() {
-        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
-        mPreference.onBindViewHolder(mHolder);
-
-        mPreference.setSwitchEnabled(true);
-        assertThat(toggle.isEnabled()).isTrue();
-
-        mPreference.setSwitchEnabled(false);
-        assertThat(toggle.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void setSwitchEnabled_shouldUpdateButtonEnabledState_beforeViewBound() {
-        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
-
-        mPreference.setSwitchEnabled(false);
-        mPreference.onBindViewHolder(mHolder);
-        assertThat(toggle.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void clickWidgetView_shouldToggleButton() {
-        assertThat(mWidgetView).isNotNull();
-
-        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
-        mPreference.onBindViewHolder(mHolder);
-
-        toggle.performClick();
-        assertThat(toggle.isChecked()).isTrue();
-
-        toggle.performClick();
-        assertThat(toggle.isChecked()).isFalse();
-    }
-
-    @Test
-    public void clickWidgetView_shouldNotToggleButtonIfDisabled() {
-        assertThat(mWidgetView).isNotNull();
-
-        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
-        mPreference.onBindViewHolder(mHolder);
-        toggle.setEnabled(false);
-
-        mWidgetView.performClick();
-        assertThat(toggle.isChecked()).isFalse();
-    }
-
-    @Test
-    public void clickWidgetView_shouldNotifyPreferenceChanged() {
-
-        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
-
-        final OnPreferenceChangeListener listener = mock(OnPreferenceChangeListener.class);
-        mPreference.setOnPreferenceChangeListener(listener);
-        mPreference.onBindViewHolder(mHolder);
-
-        mPreference.setChecked(false);
-        toggle.performClick();
-        verify(listener).onPreferenceChange(mPreference, true);
-
-        mPreference.setChecked(true);
-        toggle.performClick();
-        verify(listener).onPreferenceChange(mPreference, false);
-    }
-
-    @Test
-    public void setDisabledByAdmin_hasEnforcedAdmin_shouldDisableButton() {
-        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
-        toggle.setEnabled(true);
-        mPreference.onBindViewHolder(mHolder);
-
-        mPreference.setDisabledByAdmin(mock(EnforcedAdmin.class));
-        assertThat(toggle.isEnabled()).isFalse();
-    }
-
-    @Test
-    public void setDisabledByAdmin_noEnforcedAdmin_shouldEnableButton() {
-        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
-        toggle.setEnabled(false);
-        mPreference.onBindViewHolder(mHolder);
-
-        mPreference.setDisabledByAdmin(null);
-        assertThat(toggle.isEnabled()).isTrue();
-    }
-
-    @Test
-    public void onBindViewHolder_toggleButtonShouldHaveContentDescription() {
-        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
-        final String label = "TestButton";
-        mPreference.setTitle(label);
-
-        mPreference.onBindViewHolder(mHolder);
-
-        assertThat(toggle.getContentDescription()).isEqualTo(label);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
deleted file mode 100644
index 59cd13d..0000000
--- a/tests/robotests/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
+++ /dev/null
@@ -1,75 +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.widget;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@RunWith(RobolectricTestRunner.class)
-public class PreferenceCategoryControllerTest {
-
-    private Context mContext;
-    private PreferenceCategoryController mController;
-    private List<AbstractPreferenceController> mChildren;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mChildren = new ArrayList<>();
-        mController = new PreferenceCategoryController(mContext, "pref_key").setChildren(mChildren);
-    }
-
-    @Test
-    public void isAvailable_noChildren_false() {
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void isAvailable_childrenAvailable_true() {
-        final AbstractPreferenceController child = mock(AbstractPreferenceController.class);
-        when(child.isAvailable()).thenReturn(true);
-        mChildren.add(child);
-        mController.setChildren(mChildren);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void isAvailable_childrenUnavailable_false() {
-        final AbstractPreferenceController child = mock(AbstractPreferenceController.class);
-        when(child.isAvailable()).thenReturn(false);
-        mChildren.add(child);
-        mController.setChildren(mChildren);
-
-        assertThat(mController.isAvailable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java
new file mode 100644
index 0000000..a1d74e3
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/PrimaryCheckBoxPreferenceTest.java
@@ -0,0 +1,191 @@
+/*
+ * 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.mock;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class PrimaryCheckBoxPreferenceTest {
+
+    private Context mContext;
+    private PrimaryCheckBoxPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mPreference = new PrimaryCheckBoxPreference(mContext);
+    }
+
+    @Test
+    public void createNewPreference_shouldSetLayout() {
+        assertThat(mPreference.getWidgetLayoutResource())
+                .isEqualTo(R.layout.preference_widget_primary_checkbox);
+    }
+
+    @Test
+    public void setChecked_shouldUpdateCheckBoxCheckedState() {
+        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
+                LayoutInflater.from(mContext).inflate(
+                  R.layout.preference_widget_primary_checkbox, null));
+        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
+        mPreference.onBindViewHolder(holder);
+
+        mPreference.setChecked(true);
+        assertThat(checkBox.isChecked()).isTrue();
+
+        mPreference.setChecked(false);
+        assertThat(checkBox.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setEnabled_shouldUpdateCheckBoxEnabledState() {
+        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
+                LayoutInflater.from(mContext).inflate(
+                  R.layout.preference_widget_primary_checkbox, null));
+        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
+        mPreference.onBindViewHolder(holder);
+
+        mPreference.setEnabled(true);
+        assertThat(checkBox.isEnabled()).isTrue();
+
+        mPreference.setEnabled(false);
+        assertThat(checkBox.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void setCheckboxEnabled_shouldOnlyUpdateCheckBoxEnabledState() {
+        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
+                LayoutInflater.from(mContext).inflate(
+                        R.layout.preference_widget_primary_checkbox, null));
+        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
+        mPreference.onBindViewHolder(holder);
+
+        mPreference.setCheckBoxEnabled(false);
+        assertThat(mPreference.isEnabled()).isTrue();
+        assertThat(checkBox.isEnabled()).isFalse();
+
+        mPreference.setCheckBoxEnabled(true);
+        assertThat(mPreference.isEnabled()).isTrue();
+        assertThat(checkBox.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void onBindViewHolder_shouldSetCheckboxEnabledState() {
+        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
+                LayoutInflater.from(mContext).inflate(
+                        R.layout.preference_widget_primary_checkbox, null));
+        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
+
+        mPreference.setCheckBoxEnabled(false);
+        mPreference.onBindViewHolder(holder);
+
+        assertThat(mPreference.isEnabled()).isTrue();
+        assertThat(checkBox.isEnabled()).isFalse();
+
+        mPreference.setCheckBoxEnabled(true);
+        assertThat(mPreference.isEnabled()).isTrue();
+        assertThat(checkBox.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void clickWidgetView_shouldToggleCheckBox() {
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
+                inflater.inflate(R.layout.preference_two_target, null));
+        final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
+        assertThat(widgetView).isNotNull();
+
+        inflater.inflate(R.layout.preference_widget_primary_checkbox, widgetView, true);
+        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
+        mPreference.onBindViewHolder(holder);
+
+        widgetView.performClick();
+        assertThat(checkBox.isChecked()).isTrue();
+
+        widgetView.performClick();
+        assertThat(checkBox.isChecked()).isFalse();
+    }
+
+    @Test
+    public void clickWidgetView_shouldNotToggleCheckBoxIfDisabled() {
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
+                inflater.inflate(R.layout.preference_two_target, null));
+        final LinearLayout widgetView = holder.itemView.findViewById(android.R.id.widget_frame);
+        assertThat(widgetView).isNotNull();
+
+        inflater.inflate(R.layout.preference_widget_primary_checkbox, widgetView, true);
+        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
+        mPreference.onBindViewHolder(holder);
+        mPreference.setEnabled(false);
+
+        widgetView.performClick();
+        assertThat(checkBox.isChecked()).isFalse();
+    }
+
+    @Test
+    public void clickWidgetView_shouldNotifyPreferenceChanged() {
+        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
+                LayoutInflater.from(mContext).inflate(R.layout.preference_two_target, null));
+        final View widgetView = holder.findViewById(android.R.id.widget_frame);
+        final OnPreferenceChangeListener listener = mock(OnPreferenceChangeListener.class);
+        mPreference.setOnPreferenceChangeListener(listener);
+        mPreference.onBindViewHolder(holder);
+
+        mPreference.setChecked(false);
+        widgetView.performClick();
+        verify(listener).onPreferenceChange(mPreference, true);
+
+        mPreference.setChecked(true);
+        widgetView.performClick();
+        verify(listener).onPreferenceChange(mPreference, false);
+    }
+
+    @Test
+    public void onBindViewHolder_checkBoxShouldHaveContentDescription() {
+        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
+                LayoutInflater.from(mContext).inflate(R.layout.preference_widget_primary_checkbox,
+                        null));
+        final CheckBox checkBox = (CheckBox) holder.findViewById(R.id.checkboxWidget);
+        final String label = "TestButton";
+        mPreference.setTitle(label);
+
+        mPreference.onBindViewHolder(holder);
+
+        assertThat(checkBox.getContentDescription()).isEqualTo(label);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java
new file mode 100644
index 0000000..c58f595
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/widget/PrimarySwitchPreferenceTest.java
@@ -0,0 +1,173 @@
+/*
+ * 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.widget;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.widget.LinearLayout;
+import android.widget.Switch;
+
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceViewHolder;
+
+import com.android.settings.R;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class PrimarySwitchPreferenceTest {
+
+    private Context mContext;
+    private PrimarySwitchPreference mPreference;
+    private PreferenceViewHolder mHolder;
+    private LinearLayout mWidgetView;
+
+    @Before
+    public void setUp() {
+        mContext = RuntimeEnvironment.application;
+        mPreference = new PrimarySwitchPreference(mContext);
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        mHolder = PreferenceViewHolder.createInstanceForTests(inflater.inflate(
+                com.android.settingslib.R.layout.preference_two_target, null));
+        mWidgetView = mHolder.itemView.findViewById(android.R.id.widget_frame);
+        inflater.inflate(R.layout.restricted_preference_widget_primary_switch, mWidgetView, true);
+    }
+
+    @Test
+    public void createNewPreference_shouldSetLayout() {
+        assertThat(mPreference.getWidgetLayoutResource())
+                .isEqualTo(R.layout.restricted_preference_widget_primary_switch);
+    }
+
+    @Test
+    public void setChecked_shouldUpdateButtonCheckedState() {
+        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
+        mPreference.onBindViewHolder(mHolder);
+
+        mPreference.setChecked(true);
+        assertThat(toggle.isChecked()).isTrue();
+
+        mPreference.setChecked(false);
+        assertThat(toggle.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setSwitchEnabled_shouldUpdateButtonEnabledState() {
+        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
+        mPreference.onBindViewHolder(mHolder);
+
+        mPreference.setSwitchEnabled(true);
+        assertThat(toggle.isEnabled()).isTrue();
+
+        mPreference.setSwitchEnabled(false);
+        assertThat(toggle.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void setSwitchEnabled_shouldUpdateButtonEnabledState_beforeViewBound() {
+        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
+
+        mPreference.setSwitchEnabled(false);
+        mPreference.onBindViewHolder(mHolder);
+        assertThat(toggle.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void clickWidgetView_shouldToggleButton() {
+        assertThat(mWidgetView).isNotNull();
+
+        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
+        mPreference.onBindViewHolder(mHolder);
+
+        toggle.performClick();
+        assertThat(toggle.isChecked()).isTrue();
+
+        toggle.performClick();
+        assertThat(toggle.isChecked()).isFalse();
+    }
+
+    @Test
+    public void clickWidgetView_shouldNotToggleButtonIfDisabled() {
+        assertThat(mWidgetView).isNotNull();
+
+        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
+        mPreference.onBindViewHolder(mHolder);
+        toggle.setEnabled(false);
+
+        mWidgetView.performClick();
+        assertThat(toggle.isChecked()).isFalse();
+    }
+
+    @Test
+    public void clickWidgetView_shouldNotifyPreferenceChanged() {
+
+        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
+
+        final OnPreferenceChangeListener listener = mock(OnPreferenceChangeListener.class);
+        mPreference.setOnPreferenceChangeListener(listener);
+        mPreference.onBindViewHolder(mHolder);
+
+        mPreference.setChecked(false);
+        toggle.performClick();
+        verify(listener).onPreferenceChange(mPreference, true);
+
+        mPreference.setChecked(true);
+        toggle.performClick();
+        verify(listener).onPreferenceChange(mPreference, false);
+    }
+
+    @Test
+    public void setDisabledByAdmin_hasEnforcedAdmin_shouldDisableButton() {
+        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
+        toggle.setEnabled(true);
+        mPreference.onBindViewHolder(mHolder);
+
+        mPreference.setDisabledByAdmin(mock(EnforcedAdmin.class));
+        assertThat(toggle.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void setDisabledByAdmin_noEnforcedAdmin_shouldEnableButton() {
+        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
+        toggle.setEnabled(false);
+        mPreference.onBindViewHolder(mHolder);
+
+        mPreference.setDisabledByAdmin(null);
+        assertThat(toggle.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void onBindViewHolder_toggleButtonShouldHaveContentDescription() {
+        final Switch toggle = (Switch) mHolder.findViewById(R.id.switchWidget);
+        final String label = "TestButton";
+        mPreference.setTitle(label);
+
+        mPreference.onBindViewHolder(mHolder);
+
+        assertThat(toggle.getContentDescription()).isEqualTo(label);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidgetTest.java b/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidgetTest.java
deleted file mode 100644
index 2e2d786..0000000
--- a/tests/robotests/src/com/android/settings/widget/RadioButtonPreferenceWithExtraWidgetTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2019 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.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_GONE;
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_INFO;
-import static com.android.settings.widget.RadioButtonPreferenceWithExtraWidget.EXTRA_WIDGET_VISIBILITY_SETTING;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertEquals;
-
-import android.app.Application;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.preference.PreferenceViewHolder;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class RadioButtonPreferenceWithExtraWidgetTest {
-
-    private Application mContext;
-    private RadioButtonPreferenceWithExtraWidget mPreference;
-
-    private TextView mSummary;
-    private ImageView mExtraWidget;
-    private View mExtraWidgetDivider;
-
-    private boolean mIsClickListenerCalled = false;
-    private View.OnClickListener mClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            mIsClickListenerCalled = true;
-        }
-    };
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-        mPreference = new RadioButtonPreferenceWithExtraWidget(mContext);
-        mPreference.setSummary("test summary");
-
-        View view = LayoutInflater.from(mContext)
-                .inflate(R.layout.preference_radio_with_extra_widget, null);
-        PreferenceViewHolder preferenceViewHolder =
-                PreferenceViewHolder.createInstanceForTests(view);
-        mPreference.onBindViewHolder(preferenceViewHolder);
-
-        mSummary = view.findViewById(android.R.id.summary);
-        mExtraWidget = view.findViewById(R.id.radio_extra_widget);
-        mExtraWidgetDivider = view.findViewById(R.id.radio_extra_widget_divider);
-    }
-
-    @Test
-    public void shouldHaveRadioPreferenceWithExtraWidgetLayout() {
-        assertThat(mPreference.getLayoutResource())
-                .isEqualTo(R.layout.preference_radio_with_extra_widget);
-    }
-
-    @Test
-    public void iconSpaceReservedShouldBeFalse() {
-        assertThat(mPreference.isIconSpaceReserved()).isFalse();
-    }
-
-    @Test
-    public void summaryShouldBeVisible() {
-        assertEquals(View.VISIBLE, mSummary.getVisibility());
-    }
-
-    @Test
-    public void testSetExtraWidgetVisibility_gone() {
-        mPreference.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_GONE);
-        assertEquals(View.GONE, mExtraWidget.getVisibility());
-        assertEquals(View.GONE, mExtraWidgetDivider.getVisibility());
-        assertThat(mExtraWidget.isClickable()).isFalse();
-    }
-
-    @Test
-    public void testSetExtraWidgetVisibility_info() {
-        mPreference.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_INFO);
-        assertEquals(View.VISIBLE, mExtraWidget.getVisibility());
-        assertEquals(View.VISIBLE, mExtraWidgetDivider.getVisibility());
-        assertThat(mExtraWidget.isClickable()).isTrue();
-        assertEquals(mContext.getResources().getText(R.string.information_label),
-                mExtraWidget.getContentDescription());
-    }
-
-    @Test
-    public void testSetExtraWidgetVisibility_setting() {
-        mPreference.setExtraWidgetVisibility(EXTRA_WIDGET_VISIBILITY_SETTING);
-        assertEquals(View.VISIBLE, mExtraWidget.getVisibility());
-        assertEquals(View.VISIBLE, mExtraWidgetDivider.getVisibility());
-        assertThat(mExtraWidget.isClickable()).isTrue();
-        assertEquals(mContext.getResources().getText(R.string.settings_label),
-                mExtraWidget.getContentDescription());
-    }
-
-    @Test
-    public void testSetExtraWidgetOnClickListener() {
-        mPreference.setExtraWidgetOnClickListener(mClickListener);
-
-        assertThat(mIsClickListenerCalled).isFalse();
-        mExtraWidget.callOnClick();
-        assertThat(mIsClickListenerCalled).isTrue();
-    }
-
-    @Test
-    public void extraWidgetStaysEnabledWhenPreferenceIsDisabled() {
-        mPreference.setEnabled(false);
-        mExtraWidget.setEnabled(false);
-
-        assertThat(mExtraWidget.isEnabled()).isFalse();
-        mPreference.setExtraWidgetOnClickListener(mClickListener);
-        assertThat(mExtraWidget.isEnabled()).isTrue();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java b/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
deleted file mode 100644
index 1d76f1b..0000000
--- a/tests/robotests/src/com/android/settings/widget/RingProgressBarTest.java
+++ /dev/null
@@ -1,67 +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.widget;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import android.content.Context;
-import android.view.View.MeasureSpec;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class RingProgressBarTest {
-
-    private Context mContext = RuntimeEnvironment.application;
-
-    private RingProgressBar mProgressBar;
-
-    @Before
-    public void setUp() {
-        mProgressBar = new RingProgressBar(mContext);
-    }
-
-    @Test
-    public void testMeasurePortrait() {
-        mProgressBar.measure(
-                MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(200, MeasureSpec.EXACTLY));
-        assertEquals(100, mProgressBar.getMeasuredHeight());
-        assertEquals(100, mProgressBar.getMeasuredWidth());
-    }
-
-    @Test
-    public void testMeasureLandscape() {
-        mProgressBar.measure(
-                MeasureSpec.makeMeasureSpec(200, MeasureSpec.EXACTLY),
-                MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY));
-        assertEquals(100, mProgressBar.getMeasuredHeight());
-        assertEquals(100, mProgressBar.getMeasuredWidth());
-    }
-
-    @Test
-    public void testDefaultAttributes() {
-        assertFalse(mProgressBar.isIndeterminate());
-        assertEquals(0, mProgressBar.getProgress());
-        assertEquals(10000, mProgressBar.getMax());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
deleted file mode 100644
index 8cb0539..0000000
--- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
+++ /dev/null
@@ -1,106 +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.widget;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.os.Parcelable;
-import android.text.TextUtils;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.viewpager.widget.PagerAdapter;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-import java.util.Locale;
-
-@RunWith(RobolectricTestRunner.class)
-public class RtlCompatibleViewPagerTest {
-
-    private Locale mLocaleEn;
-    private Locale mLocaleHe;
-    private RtlCompatibleViewPager mViewPager;
-
-    @Before
-    public void setUp() {
-        mViewPager = new RtlCompatibleViewPager(RuntimeEnvironment.application);
-        mViewPager.setAdapter(new ViewPagerAdapter());
-        mLocaleEn = new Locale("en");
-        mLocaleHe = new Locale("he");
-    }
-
-    @Test
-    public void testGetCurrentItem_shouldMaintainIndexDuringLocaleChange() {
-        testRtlCompatibleInner(0);
-        testRtlCompatibleInner(1);
-    }
-
-    private void testRtlCompatibleInner(int currentItem) {
-        // Set up the environment
-        Locale.setDefault(mLocaleEn);
-        mViewPager.setCurrentItem(currentItem);
-
-        assertThat(TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()))
-                .isEqualTo(View.LAYOUT_DIRECTION_LTR);
-        assertThat(mViewPager.getCurrentItem()).isEqualTo(currentItem);
-
-        // Simulate to change the language to RTL
-        Parcelable savedInstance = mViewPager.onSaveInstanceState();
-        Locale.setDefault(mLocaleHe);
-        mViewPager.onRestoreInstanceState(savedInstance);
-
-        assertThat(TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()))
-                .isEqualTo(View.LAYOUT_DIRECTION_RTL);
-        assertThat(mViewPager.getCurrentItem()).isEqualTo(currentItem);
-    }
-
-    /**
-     * Test viewpager adapter, uses 2 view to test it
-     */
-    private static final class ViewPagerAdapter extends PagerAdapter {
-
-        private static final int ITEM_COUNT = 2;
-
-        private ViewPagerAdapter() {
-        }
-
-        @Override
-        public int getCount() {
-            return ITEM_COUNT;
-        }
-
-        @Override
-        public boolean isViewFromObject(View view, Object object) {
-            return view == object;
-        }
-
-        @Override
-        public Object instantiateItem(ViewGroup container, int position) {
-            return null;
-        }
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return null;
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
index f7dea22..451b84b 100644
--- a/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SeekBarPreferenceTest.java
@@ -16,14 +16,21 @@
 
 package com.android.settings.widget;
 
+import static android.view.HapticFeedbackConstants.CLOCK_TICK;
+import static android.view.HapticFeedbackConstants.CONTEXT_CLICK;
+
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Parcelable;
+import android.widget.SeekBar;
 
 import androidx.preference.PreferenceFragmentCompat;
 
@@ -45,9 +52,11 @@
     private static final int MAX = 75;
     private static final int MIN = 5;
     private static final int PROGRESS = 16;
+    private static final int NEW_PROGRESS = 17;
 
     private Context mContext;
     private SeekBarPreference mSeekBarPreference;
+    private SeekBar mSeekBar;
 
     @Before
     public void setUp() {
@@ -59,6 +68,11 @@
         mSeekBarPreference.setMin(MIN);
         mSeekBarPreference.setProgress(PROGRESS);
         mSeekBarPreference.setPersistent(false);
+        mSeekBarPreference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_NONE);
+
+        mSeekBar = new SeekBar(mContext);
+        mSeekBar.setMax(MAX);
+        mSeekBar.setMin(MIN);
     }
 
     @Test
@@ -110,6 +124,60 @@
         assertThat(seekBarPreference.isSelectable()).isTrue();
     }
 
+    @Test
+    public void testSetSeekBarStateDescription() {
+        mSeekBarPreference.setSeekBarStateDescription("test");
+
+        verify(mSeekBarPreference).setSeekBarStateDescription("test");
+    }
+
+    @Test
+    public void onProgressChanged_hapticFeedbackModeNone_clockTickFeedbackNotPerformed() {
+        mSeekBar.setProgress(NEW_PROGRESS);
+        when(mSeekBarPreference.callChangeListener(anyInt())).thenReturn(true);
+        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
+
+        mSeekBarPreference.onProgressChanged(mSeekBar, NEW_PROGRESS, true);
+
+        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isNotEqualTo(CLOCK_TICK);
+    }
+
+    @Test
+    public void onProgressChanged_hapticFeedbackModeOnTicks_clockTickFeedbackPerformed() {
+        mSeekBarPreference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_TICKS);
+        mSeekBar.setProgress(NEW_PROGRESS);
+        when(mSeekBarPreference.callChangeListener(anyInt())).thenReturn(true);
+        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
+
+        mSeekBarPreference.onProgressChanged(mSeekBar, NEW_PROGRESS, true);
+
+        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isEqualTo(CLOCK_TICK);
+    }
+
+    @Test
+    public void onProgressChanged_hapticFeedbackModeOnEnds_clockTickFeedbackNotPerformed() {
+        mSeekBarPreference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);
+        mSeekBar.setProgress(NEW_PROGRESS);
+        when(mSeekBarPreference.callChangeListener(anyInt())).thenReturn(true);
+        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
+
+        mSeekBarPreference.onProgressChanged(mSeekBar, NEW_PROGRESS, true);
+
+        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isNotEqualTo(CLOCK_TICK);
+    }
+
+    @Test
+    public void onProgressChanged_hapticFeedbackModeOnEndsAndMinValue_clockTickFeedbackPerformed() {
+        mSeekBarPreference.setHapticFeedbackMode(SeekBarPreference.HAPTIC_FEEDBACK_MODE_ON_ENDS);
+        mSeekBar.setProgress(MIN);
+        when(mSeekBarPreference.callChangeListener(anyInt())).thenReturn(true);
+        mSeekBar.performHapticFeedback(CONTEXT_CLICK);
+
+        mSeekBarPreference.onProgressChanged(mSeekBar, MIN, true);
+
+        assertThat(shadowOf(mSeekBar).lastHapticFeedbackPerformed()).isEqualTo(CLOCK_TICK);
+    }
+
     public static class TestFragment extends PreferenceFragmentCompat {
         @Override
         public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
diff --git a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
index 31cb966..f85e104 100644
--- a/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
+++ b/tests/robotests/src/com/android/settings/widget/SwitchBarTest.java
@@ -70,7 +70,7 @@
 
     @Test
     public void cycleChecked_customLabel_shouldUpdateTextAndBackground() {
-        final int onText = R.string.master_clear_progress_text;
+        final int onText = R.string.main_clear_progress_text;
         final int offText = R.string.manage_space_text;
 
         mBar.setSwitchBarText(onText, offText);
@@ -87,9 +87,9 @@
     @Test
     public void setCheck_customLabelWithStringType_shouldUpdateTextAndBackground() {
         final String onText = mContext.getString(
-                R.string.accessibility_service_master_switch_title);
+                R.string.accessibility_service_primary_switch_title);
         final String offText = mContext.getString(
-                R.string.accessibility_service_master_switch_title);
+                R.string.accessibility_service_primary_switch_title);
         final TextView switchBarTextView = ((TextView) mBar.findViewById(R.id.switch_text));
 
         mBar.setSwitchBarText(onText, offText);
diff --git a/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java
index db699e5..7421bd3 100644
--- a/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/AddNetworkFragmentTest.java
@@ -55,7 +55,7 @@
 
     @Test
     public void getMode_shouldBeModeConnected() {
-        assertThat(mAddNetworkFragment.getMode()).isEqualTo(WifiConfigUiBase.MODE_CONNECT);
+        assertThat(mAddNetworkFragment.getMode()).isEqualTo(WifiConfigUiBase2.MODE_CONNECT);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureAccessPointFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureAccessPointFragmentTest.java
deleted file mode 100644
index 1189760..0000000
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureAccessPointFragmentTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.app.settings.SettingsEnums;
-import android.os.Bundle;
-
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.androidx.fragment.FragmentController;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowConnectivityManager.class)
-public class ConfigureAccessPointFragmentTest {
-
-    private static final String KEY_SSID = "key_ssid";
-    private static final String KEY_SECURITY = "key_security";
-
-    private ConfigureAccessPointFragment mConfigureAccessPointFragment;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        Bundle bundle = new Bundle();
-
-        bundle.putString(KEY_SSID, "Test AP");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        mConfigureAccessPointFragment = spy(new ConfigureAccessPointFragment());
-        mConfigureAccessPointFragment.setArguments(bundle);
-        FragmentController.setupFragment(mConfigureAccessPointFragment);
-    }
-
-    @Test
-    public void getMetricsCategory_shouldReturnConfigureNetwork() {
-        assertThat(mConfigureAccessPointFragment.getMetricsCategory()).isEqualTo(
-                SettingsEnums.SETTINGS_WIFI_CONFIGURE_NETWORK);
-    }
-
-    @Test
-    public void getMode_shouldBeModeConnected() {
-        assertThat(mConfigureAccessPointFragment.getMode()).isEqualTo(
-                WifiConfigUiBase.MODE_CONNECT);
-    }
-
-    @Test
-    public void launchFragment_shouldShowSubmitButton() {
-        assertThat(mConfigureAccessPointFragment.getSubmitButton()).isNotNull();
-    }
-
-    @Test
-    public void launchFragment_shouldShowCancelButton() {
-        assertThat(mConfigureAccessPointFragment.getCancelButton()).isNotNull();
-    }
-
-    @Test
-    public void onClickSubmitButton_shouldHandleSubmitAction() {
-        mConfigureAccessPointFragment.getSubmitButton().performClick();
-
-        verify(mConfigureAccessPointFragment).handleSubmitAction();
-    }
-
-    @Test
-    public void dispatchSubmit_shouldHandleSubmitAction() {
-        mConfigureAccessPointFragment.dispatchSubmit();
-
-        verify(mConfigureAccessPointFragment).handleSubmitAction();
-    }
-
-    @Test
-    public void onClickCancelButton_shouldHandleCancelAction() {
-        mConfigureAccessPointFragment.getCancelButton().performClick();
-
-        verify(mConfigureAccessPointFragment).handleCancelAction();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiEntryFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiEntryFragmentTest.java
index 27517e8..4a317a6 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiEntryFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiEntryFragmentTest.java
@@ -68,7 +68,7 @@
     @Test
     public void getMode_shouldBeModeConnected() {
         assertThat(mConfigureWifiEntryFragment.getMode()).isEqualTo(
-                WifiConfigUiBase.MODE_CONNECT);
+                WifiConfigUiBase2.MODE_CONNECT);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
index 9521e7a..89df035 100644
--- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java
@@ -36,6 +36,6 @@
 
         final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(mContext, xmlId);
         assertThat(keys).isNotNull();
-        assertThat(niks).containsAllIn(keys);
+        assertThat(niks).containsAtLeastElementsIn(keys);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java b/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
deleted file mode 100644
index bb9971b..0000000
--- a/tests/robotests/src/com/android/settings/wifi/ConnectedAccessPointPreferenceTest.java
+++ /dev/null
@@ -1,94 +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.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.view.View;
-
-import com.android.settings.R;
-import com.android.settingslib.wifi.AccessPoint;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class ConnectedAccessPointPreferenceTest {
-
-    @Mock
-    private AccessPoint mAccessPoint;
-    @Mock
-    private View mView;
-    @Mock
-    private ConnectedAccessPointPreference.OnGearClickListener mOnGearClickListener;
-    private Context mContext;
-    private ConnectedAccessPointPreference mConnectedAccessPointPreference;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = RuntimeEnvironment.application;
-        mConnectedAccessPointPreference = new ConnectedAccessPointPreference(mAccessPoint, mContext,
-                null, 0 /* iconResId */, false /* forSavedNetworks */, null /* fragment */);
-        mConnectedAccessPointPreference.setOnGearClickListener(mOnGearClickListener);
-    }
-
-    @Test
-    public void testOnClick_gearClicked_listenerInvoked() {
-        when(mView.getId()).thenReturn(R.id.settings_button);
-
-        mConnectedAccessPointPreference.onClick(mView);
-
-        verify(mOnGearClickListener).onGearClick(mConnectedAccessPointPreference);
-    }
-
-    @Test
-    public void testOnClick_gearNotClicked_listenerNotInvoked() {
-        mConnectedAccessPointPreference.onClick(mView);
-
-        verify(mOnGearClickListener, never()).onGearClick(mConnectedAccessPointPreference);
-    }
-
-    @Test
-    public void testCaptivePortalStatus_isCaptivePortal_dividerDrawn() {
-        mConnectedAccessPointPreference.setCaptivePortal(true);
-        assertThat(mConnectedAccessPointPreference.shouldShowDivider()).isTrue();
-    }
-
-    @Test
-    public void testCaptivePortalStatus_isNotCaptivePortal_dividerNotDrawn() {
-        mConnectedAccessPointPreference.setCaptivePortal(false);
-        assertThat(mConnectedAccessPointPreference.shouldShowDivider()).isFalse();
-    }
-
-    @Test
-    public void testWidgetLayoutPreference() {
-        assertThat(mConnectedAccessPointPreference.getWidgetLayoutResource())
-            .isEqualTo(R.layout.preference_widget_gear_optional_background);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java
index ecf9c68..094e282 100644
--- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogActivityTest.java
@@ -25,8 +25,11 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.ScanResult;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
+import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
 import android.os.Bundle;
 
 import androidx.annotation.Nullable;
@@ -40,22 +43,31 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowLooper;
 
+import java.util.ArrayList;
+import java.util.List;
+
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowAlertDialogCompat.class)
 public class NetworkRequestDialogActivityTest {
 
+    private static final String TEST_SSID = "testssid";
+    private static final String TEST_CAPABILITY = "wep";
+
     NetworkRequestDialogActivity mActivity;
     WifiManager mWifiManager;
     Context mContext;
 
     @Before
     public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
         mContext = spy(RuntimeEnvironment.application);
 
         WifiTracker wifiTracker = mock(WifiTracker.class);
@@ -118,6 +130,15 @@
         }
     }
 
+    private void startSpecifiedActivity() {
+        final Intent intent = new Intent().setClassName(
+                RuntimeEnvironment.application.getPackageName(),
+                NetworkRequestDialogActivity.class.getName());
+        intent.putExtra(NetworkRequestDialogActivity.EXTRA_IS_SPECIFIED_SSID, true);
+        mActivity = spy(Robolectric.buildActivity(NetworkRequestDialogActivity.class,
+                intent).create().get());
+    }
+
     @Test
     public void updateAccessPointList_onUserSelectionConnectSuccess_shouldFinishActivity() {
         final WifiConfiguration config = new WifiConfiguration();
@@ -128,6 +149,89 @@
     }
 
     @Test
+    public void specifiedSsid_onCreate_shouldShowProgressDialog() {
+        startSpecifiedActivity();
+
+        assertThat(mActivity.mProgressDialog).isNotNull();
+        assertThat(mActivity.mProgressDialog.isShowing()).isTrue();
+    }
+
+    private ScanResult getScanResult(String ssid, String capability) {
+        final ScanResult scanResult = mock(ScanResult.class);
+        scanResult.SSID = ssid;
+        scanResult.capabilities = capability;
+
+        return scanResult;
+    }
+
+    @Test
+    public void specifiedSsid_onMatch_shouldShowDialogFragment() {
+        startSpecifiedActivity();
+
+        final List<ScanResult> scanResults = new ArrayList<>();
+        scanResults.add(getScanResult(TEST_SSID, TEST_CAPABILITY));
+
+        mActivity.onMatch(scanResults);
+
+        assertThat(mActivity.mProgressDialog).isNull();
+        assertThat(mActivity.mDialogFragment).isNotNull();
+    }
+
+    @Test
+    public void onAbort_withFakeActivity_callStopAndPopShouldBeTrue() {
+        final FakeNetworkRequestDialogActivity fakeActivity =
+                Robolectric.setupActivity(FakeNetworkRequestDialogActivity.class);
+
+        fakeActivity.onResume();
+        fakeActivity.onAbort();
+
+        assertThat(fakeActivity.bCalledStopAndPop).isTrue();
+    }
+
+    @Test
+    public void onUserSelectionConnectFailure_shouldShowDialogFragment() {
+        WifiConfiguration wifiConfiguration = mock(WifiConfiguration.class);
+        startSpecifiedActivity();
+        final List<ScanResult> scanResults = new ArrayList<>();
+        scanResults.add(getScanResult(TEST_SSID, TEST_CAPABILITY));
+        mActivity.onMatch(scanResults);
+
+        mActivity.onUserSelectionConnectFailure(wifiConfiguration);
+
+        assertThat(mActivity.mProgressDialog).isNull();
+        assertThat(mActivity.mDialogFragment).isNotNull();
+    }
+
+    @Test
+    public void onClickConnectButton_shouldShowProgressDialog() {
+        NetworkRequestUserSelectionCallback networkRequestUserSelectionCallback = mock(
+                NetworkRequestUserSelectionCallback.class);
+        startSpecifiedActivity();
+        final List<ScanResult> scanResults = new ArrayList<>();
+        scanResults.add(getScanResult(TEST_SSID, TEST_CAPABILITY));
+        mActivity.onMatch(scanResults);
+        mActivity.onUserSelectionCallbackRegistration(networkRequestUserSelectionCallback);
+
+        mActivity.onClickConnectButton();
+
+        assertThat(mActivity.mProgressDialog.isShowing()).isTrue();
+        assertThat(mActivity.mDialogFragment).isNull();
+    }
+
+    @Test
+    public void onCancel_shouldCloseAllUI() {
+        startSpecifiedActivity();
+        final List<ScanResult> scanResults = new ArrayList<>();
+        scanResults.add(getScanResult(TEST_SSID, TEST_CAPABILITY));
+        mActivity.onMatch(scanResults);
+
+        mActivity.onCancel();
+
+        assertThat(mActivity.mProgressDialog).isNull();
+        assertThat(mActivity.mDialogFragment).isNull();
+    }
+
+    @Test
     public void updateAccessPointList_onUserSelectionConnectFailure_shouldFinishActivity() {
         final WifiConfiguration config = new WifiConfiguration();
         config.SSID = "Test AP 3";
diff --git a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
index ccd6e6c..2e9f019 100644
--- a/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/NetworkRequestDialogFragmentTest.java
@@ -18,19 +18,18 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.wifi.ScanResult;
-import android.net.wifi.WifiManager;
+import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager.NetworkRequestUserSelectionCallback;
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -40,13 +39,13 @@
 
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InOrder;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
@@ -65,8 +64,6 @@
 
     private FragmentActivity mActivity;
     private NetworkRequestDialogFragment networkRequestDialogFragment;
-    private Context mContext;
-    private WifiTracker mWifiTracker;
 
     @Before
     public void setUp() {
@@ -74,10 +71,7 @@
                 new Intent().putExtra(NetworkRequestDialogFragment.EXTRA_APP_NAME,
                         TEST_APP_NAME)).setup().get();
         networkRequestDialogFragment = spy(NetworkRequestDialogFragment.newInstance());
-        mContext = spy(RuntimeEnvironment.application);
-
-        mWifiTracker = mock(WifiTracker.class);
-        WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
+        networkRequestDialogFragment.mWifiPickerTracker = mock(WifiPickerTracker.class);
     }
 
     @Test
@@ -93,7 +87,7 @@
         networkRequestDialogFragment.show(mActivity.getSupportFragmentManager(), /* tag */ null);
         final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
 
-        final String targetTitle = mContext.getString(
+        final String targetTitle = RuntimeEnvironment.application.getString(
                 R.string.network_connection_request_dialog_title, TEST_APP_NAME);
         final TextView view = alertDialog.findViewById(R.id.network_request_title_text);
         assertThat(view.getText()).isEqualTo(targetTitle);
@@ -113,124 +107,95 @@
     }
 
     @Test
-    public void onUserSelectionCallbackRegistration_onClick_shouldCallSelect() {
+    public void onClick_validSelection_shouldCallSelect() {
         final int indexClickItem = 3;
-        List<AccessPoint> accessPointList = createAccessPointList();
-        AccessPoint clickedAccessPoint = accessPointList.get(indexClickItem);
-        clickedAccessPoint.generateOpenNetworkConfig();
-        when(networkRequestDialogFragment.getAccessPointList()).thenReturn(accessPointList);
-
-        NetworkRequestUserSelectionCallback selectionCallback = mock(
+        final List<WifiEntry> wifiEntryList = createWifiEntryList();
+        final WifiEntry clickedWifiEntry = wifiEntryList.get(indexClickItem);
+        final WifiConfiguration wifiConfig = new WifiConfiguration();
+        when(clickedWifiEntry.getWifiConfiguration()).thenReturn(wifiConfig);
+        networkRequestDialogFragment.mFilteredWifiEntries = wifiEntryList;
+        final NetworkRequestUserSelectionCallback selectionCallback = mock(
                 NetworkRequestUserSelectionCallback.class);
-        AlertDialog dialog = mock(AlertDialog.class);
+        final AlertDialog dialog = mock(AlertDialog.class);
         networkRequestDialogFragment.onUserSelectionCallbackRegistration(selectionCallback);
 
-        // Act.
         networkRequestDialogFragment.onClick(dialog, indexClickItem);
 
-        // Check.
-        verify(selectionCallback, times(1)).select(clickedAccessPoint.getConfig());
+        verify(selectionCallback, times(1)).select(wifiConfig);
     }
 
     @Test
-    public void onMatch_shouldUpdatedList() {
-        when(networkRequestDialogFragment.getContext()).thenReturn(mContext);
-        Context applicationContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        when(mContext.getApplicationContext()).thenReturn(applicationContext);
-        WifiManager wifiManager = mock(WifiManager.class);
-        when(applicationContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager);
-        networkRequestDialogFragment.onResume();
+    public void onMatch_shouldUpdateWifiEntries() {
+        final InOrder inOrder = inOrder(networkRequestDialogFragment);
 
-        List<AccessPoint> accessPointList = createAccessPointList();
-        when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
+        networkRequestDialogFragment.onMatch(new ArrayList<ScanResult>());
 
-        final String ssidAp1 = "Test AP 1";
-        final String ssidAp2 = "Test AP 2";
-        List<ScanResult> scanResults = new ArrayList<>();
-        ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = ssidAp1;
-        scanResult.capabilities = "WEP";
-        scanResults.add(scanResult);
-        scanResult = mock(ScanResult.class);
-        scanResult.SSID = ssidAp2;
-        scanResult.capabilities = "WEP";
-        scanResults.add(scanResult);
-
-        // Act.
-        networkRequestDialogFragment.onMatch(scanResults);
-
-        // Check.
-        List<AccessPoint> returnList = networkRequestDialogFragment.getAccessPointList();
-        assertThat(returnList).isNotEmpty();
-        assertThat(returnList.size()).isEqualTo(2);
-        assertThat(returnList.get(0).getSsid()).isEqualTo(ssidAp1);
-        assertThat(returnList.get(1).getSsid()).isEqualTo(ssidAp2);
+        inOrder.verify(networkRequestDialogFragment).updateWifiEntries();
+        inOrder.verify(networkRequestDialogFragment).updateUi();
     }
 
     @Test
-    public void onAccessPointsChanged_shouldUpdatedList() {
-        when(networkRequestDialogFragment.getContext()).thenReturn(mContext);
-        Context applicationContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        when(mContext.getApplicationContext()).thenReturn(applicationContext);
-        WifiManager wifiManager = mock(WifiManager.class);
-        when(applicationContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager);
-        networkRequestDialogFragment.onResume();
+    public void onWifiStateChanged_nonEmptyMatchedScanResults_shouldUpdateWifiEntries() {
+        final InOrder inOrder = inOrder(networkRequestDialogFragment);
 
-        List<AccessPoint> accessPointList = new ArrayList<>();
-        when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
-
-        final String ssidAp1 = "Test AP 1";
-        List<ScanResult> scanResults = new ArrayList<>();
+        final List<ScanResult> scanResults = new ArrayList<>();
+        networkRequestDialogFragment.mMatchedScanResults = scanResults;
         ScanResult scanResult = mock(ScanResult.class);
-        scanResult.SSID = ssidAp1;
-        scanResult.capabilities = "WEP";
-        scanResults.add(scanResult);
-
-        // Act.
+        networkRequestDialogFragment.mMatchedScanResults.add(scanResult);
         networkRequestDialogFragment.onMatch(scanResults);
 
-        accessPointList = createAccessPointList();
-        when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
-
-        // Act.
-        networkRequestDialogFragment.mFilterWifiTracker.mWifiListener.onAccessPointsChanged();
-
-        // Check.
-        List<AccessPoint> returnList = networkRequestDialogFragment.getAccessPointList();
-        assertThat(returnList).isNotEmpty();
-        assertThat(returnList.size()).isEqualTo(1);
-        assertThat(returnList.get(0).getSsid()).isEqualTo(ssidAp1);
+        inOrder.verify(networkRequestDialogFragment).updateWifiEntries();
+        inOrder.verify(networkRequestDialogFragment).updateUi();
     }
 
-    private List<AccessPoint> createAccessPointList() {
-        List<AccessPoint> accessPointList = spy(new ArrayList<>());
-        Bundle bundle = new Bundle();
+    @Test
+    public void onWifiEntriesChanged_nonEmptyMatchedScanResults_shouldUpdateWifiEntries() {
+        final InOrder inOrder = inOrder(networkRequestDialogFragment);
 
-        bundle.putString(KEY_SSID, "Test AP 1");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+        final List<ScanResult> scanResults = new ArrayList<>();
+        networkRequestDialogFragment.mMatchedScanResults = scanResults;
+        ScanResult scanResult = mock(ScanResult.class);
+        networkRequestDialogFragment.mMatchedScanResults.add(scanResult);
+        networkRequestDialogFragment.onMatch(scanResults);
 
-        bundle.putString(KEY_SSID, "Test AP 2");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+        inOrder.verify(networkRequestDialogFragment).updateWifiEntries();
+        inOrder.verify(networkRequestDialogFragment).updateUi();
+    }
 
-        bundle.putString(KEY_SSID, "Test AP 3");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+    private List<WifiEntry> createWifiEntryList() {
+        List<WifiEntry> wifiEntryList = spy(new ArrayList<>());
 
-        bundle.putString(KEY_SSID, "Test AP 4");
-        bundle.putInt(KEY_SECURITY, 0 /* NONE */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+        final WifiEntry wifiEntry1 = mock(WifiEntry.class);
+        when(wifiEntry1.getSsid()).thenReturn("Test AP 1");
+        when(wifiEntry1.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
+        wifiEntryList.add(wifiEntry1);
 
-        bundle.putString(KEY_SSID, "Test AP 5");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+        final WifiEntry wifiEntry2 = mock(WifiEntry.class);
+        when(wifiEntry2.getSsid()).thenReturn("Test AP 2");
+        when(wifiEntry2.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
+        wifiEntryList.add(wifiEntry2);
 
-        bundle.putString(KEY_SSID, "Test AP 6");
-        bundle.putInt(KEY_SECURITY, 1 /* WEP */);
-        accessPointList.add(new AccessPoint(mContext, bundle));
+        final WifiEntry wifiEntry3 = mock(WifiEntry.class);
+        when(wifiEntry3.getSsid()).thenReturn("Test AP 3");
+        when(wifiEntry3.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
+        wifiEntryList.add(wifiEntry3);
 
-        return accessPointList;
+        final WifiEntry wifiEntry4 = mock(WifiEntry.class);
+        when(wifiEntry4.getSsid()).thenReturn("Test AP 4");
+        when(wifiEntry4.getSecurity()).thenReturn(WifiEntry.SECURITY_NONE);
+        wifiEntryList.add(wifiEntry4);
+
+        final WifiEntry wifiEntry5 = mock(WifiEntry.class);
+        when(wifiEntry5.getSsid()).thenReturn("Test AP 5");
+        when(wifiEntry5.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
+        wifiEntryList.add(wifiEntry5);
+
+        final WifiEntry wifiEntry6 = mock(WifiEntry.class);
+        when(wifiEntry6.getSsid()).thenReturn("Test AP 6");
+        when(wifiEntry6.getSecurity()).thenReturn(WifiEntry.SECURITY_WEP);
+        wifiEntryList.add(wifiEntry6);
+
+        return wifiEntryList;
     }
 
     @Test
@@ -247,8 +212,10 @@
     public void onMatchManyResult_showNeutralButton() {
         networkRequestDialogFragment.show(mActivity.getSupportFragmentManager(), /* tag */ null);
         final AlertDialog alertDialog = ShadowAlertDialogCompat.getLatestAlertDialog();
-        List<AccessPoint> accessPointList = createAccessPointList();
-        when(mWifiTracker.getAccessPoints()).thenReturn(accessPointList);
+        List<WifiEntry> wifiEntryList = createWifiEntryList();
+        final WifiPickerTracker wifiPickerTracker = mock(WifiPickerTracker.class);
+        when(wifiPickerTracker.getWifiEntries()).thenReturn(wifiEntryList);
+        networkRequestDialogFragment.mWifiPickerTracker = wifiPickerTracker;
 
         final String ssidAp = "Test AP ";
         final List<ScanResult> scanResults = new ArrayList<>();
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
index e588799..93663bd 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigController2Test.java
@@ -18,9 +18,12 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.anyInt;
 import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -31,7 +34,11 @@
 import android.net.wifi.WifiEnterpriseConfig.Phase2;
 import android.net.wifi.WifiManager;
 import android.os.ServiceSpecificException;
+import android.security.Credentials;
 import android.security.KeyStore;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -43,7 +50,7 @@
 
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
+import com.android.settings.wifi.details2.WifiPrivacyPreferenceController2;
 import com.android.wifitrackerlib.WifiEntry;
 
 import org.junit.Before;
@@ -56,6 +63,9 @@
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowInputMethodManager;
+import org.robolectric.shadows.ShadowSubscriptionManager;
+
+import java.util.Arrays;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowConnectivityManager.class)
@@ -71,6 +81,11 @@
     private KeyStore mKeyStore;
     private View mView;
     private Spinner mHiddenSettingsSpinner;
+    private Spinner mEapCaCertSpinner;
+    private Spinner mEapUserCertSpinner;
+    private String mUseSystemCertsString;
+    private String mDoNotProvideEapUserCertString;
+    private ShadowSubscriptionManager mShadowSubscriptionManager;
 
     public WifiConfigController2 mController;
     private static final String HEX_PSK = "01234567012345670123456701234567012345670123456701234567"
@@ -90,6 +105,9 @@
     private static final String NUMBER_AND_CHARACTER_KEY = "123456abcd";
     private static final String PARTIAL_NUMBER_AND_CHARACTER_KEY = "123456abc?";
     private static final int DHCP = 0;
+    // Saved certificates
+    private static final String SAVED_CA_CERT = "saved CA cert";
+    private static final String SAVED_USER_CERT = "saved user cert";
 
     @Before
     public void setUp() {
@@ -100,7 +118,13 @@
         mView = LayoutInflater.from(mContext).inflate(R.layout.wifi_dialog, null);
         final Spinner ipSettingsSpinner = mView.findViewById(R.id.ip_settings);
         mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
+        mEapCaCertSpinner = mView.findViewById(R.id.ca_cert);
+        mEapUserCertSpinner = mView.findViewById(R.id.user_cert);
+        mUseSystemCertsString = mContext.getString(R.string.wifi_use_system_certs);
+        mDoNotProvideEapUserCertString =
+                mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
         ipSettingsSpinner.setSelection(DHCP);
+        mShadowSubscriptionManager = shadowOf(mContext.getSystemService(SubscriptionManager.class));
 
         mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
                 WifiConfigUiBase2.MODE_CONNECT);
@@ -225,6 +249,35 @@
     }
 
     @Test
+    public void isSubmittable_caCertWithoutDomain_shouldReturnFalse() {
+        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
+                WifiConfigUiBase2.MODE_CONNECT);
+        mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
+        final Spinner eapCaCertSpinner = mView.findViewById(R.id.ca_cert);
+        eapCaCertSpinner.setAdapter(mController.getSpinnerAdapter(new String[]{"certificate"}));
+        eapCaCertSpinner.setSelection(0);
+        mView.findViewById(R.id.l_domain).setVisibility(View.VISIBLE);
+
+        assertThat(mController.isSubmittable()).isFalse();
+    }
+
+    @Test
+    public void isSubmittable_caCertWithDomain_shouldReturnTrue() {
+        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
+                WifiConfigUiBase2.MODE_CONNECT);
+        mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
+        final Spinner eapCaCertSpinner = mView.findViewById(R.id.ca_cert);
+        eapCaCertSpinner.setAdapter(mController.getSpinnerAdapter(new String[]{"certificate"}));
+        eapCaCertSpinner.setSelection(0);
+        mView.findViewById(R.id.l_domain).setVisibility(View.VISIBLE);
+        ((TextView) mView.findViewById(R.id.domain)).setText("fakeDomain");
+
+        assertThat(mController.isSubmittable()).isTrue();
+    }
+
+    @Test
     public void getSignalString_notReachable_shouldHaveNoSignalString() {
         when(mWifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_UNREACHABLE);
 
@@ -249,7 +302,7 @@
     @Test
     public void loadCertificates_undesiredCertificates_shouldNotLoadUndesiredCertificates() {
         final Spinner spinner = new Spinner(mContext);
-        when(mKeyStore.list(anyString())).thenReturn(WifiConfigController.UNDESIRED_CERTIFICATES);
+        when(mKeyStore.list(anyString())).thenReturn(WifiConfigController2.UNDESIRED_CERTIFICATES);
 
         mController.loadCertificates(spinner,
                 "prefix",
@@ -392,7 +445,7 @@
     public void loadMacRandomizedValue_shouldPersistentAsDefault() {
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
         final int prefPersist =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
+                WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
                         WifiConfiguration.RANDOMIZATION_PERSISTENT);
 
         assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
@@ -420,7 +473,7 @@
 
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
         final int expectedPrefValue =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
+                WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
                         macRandomizedValue);
 
         assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
@@ -438,7 +491,7 @@
     public void saveMacRandomizedValue_ChangedToNone_shouldGetNone() {
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
         final int prefMacNone =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
+                WifiPrivacyPreferenceController2.translateMacRandomizedValueToPrefValue(
                         WifiConfiguration.RANDOMIZATION_NONE);
         privacySetting.setSelection(prefMacNone);
 
@@ -760,4 +813,112 @@
         mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
                 WifiConfigUiBase2.MODE_MODIFY);
     }
+
+    @Test
+    public void loadSims_noSim_simSpinnerDefaultNoSim() {
+        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
+                WifiConfigUiBase2.MODE_CONNECT);
+        final Spinner eapMethodSpinner = mock(Spinner.class);
+        when(eapMethodSpinner.getSelectedItemPosition()).thenReturn(
+                WifiConfigController2.WIFI_EAP_METHOD_SIM);
+        mController.mEapMethodSpinner = eapMethodSpinner;
+
+        mController.loadSims();
+
+        final WifiConfiguration wifiConfiguration = mController.getConfig();
+        assertThat(wifiConfiguration.carrierId).isEqualTo(TelephonyManager.UNKNOWN_CARRIER_ID);
+    }
+
+    @Test
+    public void loadSims_oneSim_simSpinnerDefaultSubscription() {
+        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        final SubscriptionInfo subscriptionInfo = mock(SubscriptionInfo.class);
+        final int carrierId = 6;
+        when(subscriptionInfo.getCarrierId()).thenReturn(carrierId);
+        when(subscriptionInfo.getCarrierName()).thenReturn("FAKE-CARRIER");
+        mShadowSubscriptionManager.setActiveSubscriptionInfoList(Arrays.asList(subscriptionInfo));
+        mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
+                WifiConfigUiBase2.MODE_CONNECT);
+        final Spinner eapMethodSpinner = mock(Spinner.class);
+        when(eapMethodSpinner.getSelectedItemPosition()).thenReturn(
+                WifiConfigController2.WIFI_EAP_METHOD_SIM);
+        mController.mEapMethodSpinner = eapMethodSpinner;
+
+        mController.loadSims();
+
+        final WifiConfiguration wifiConfiguration = mController.getConfig();
+        assertThat(wifiConfiguration.carrierId).isEqualTo(carrierId);
+    }
+
+    @Test
+    public void loadCaCertificateValue_shouldPersistentAsDefault() {
+        setUpModifyingSavedCertificateConfigController(null, null);
+
+        assertThat(mEapCaCertSpinner.getSelectedItem()).isEqualTo(mUseSystemCertsString);
+    }
+
+    @Test
+    public void loadSavedCaCertificateValue_shouldBeCorrectValue() {
+        setUpModifyingSavedCertificateConfigController(SAVED_CA_CERT, null);
+
+        assertThat(mEapCaCertSpinner.getSelectedItem()).isEqualTo(SAVED_CA_CERT);
+    }
+
+    @Test
+    public void loadUserCertificateValue_shouldPersistentAsDefault() {
+        setUpModifyingSavedCertificateConfigController(null, null);
+
+        assertThat(mEapUserCertSpinner.getSelectedItem()).isEqualTo(mDoNotProvideEapUserCertString);
+    }
+
+    @Test
+    public void loadSavedUserCertificateValue_shouldBeCorrectValue() {
+        setUpModifyingSavedCertificateConfigController(null, SAVED_USER_CERT);
+
+        assertThat(mEapUserCertSpinner.getSelectedItem()).isEqualTo(SAVED_USER_CERT);
+    }
+
+    private void setUpModifyingSavedCertificateConfigController(String savedCaCertificate,
+            String savedUserCertificate) {
+        final WifiConfiguration mockWifiConfig = mock(WifiConfiguration.class);
+        final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+        mockWifiConfig.enterpriseConfig = mockWifiEnterpriseConfig;
+        when(mWifiEntry.isSaved()).thenReturn(true);
+        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        when(mWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfig);
+        when(mockWifiConfig.getIpConfiguration()).thenReturn(mock(IpConfiguration.class));
+        when(mockWifiEnterpriseConfig.getEapMethod()).thenReturn(Eap.TLS);
+        if (savedCaCertificate != null) {
+            String[] savedCaCertificates = new String[]{savedCaCertificate};
+            when(mockWifiEnterpriseConfig.getCaCertificateAliases())
+                    .thenReturn(savedCaCertificates);
+            when(mKeyStore.list(eq(Credentials.CA_CERTIFICATE), anyInt()))
+                    .thenReturn(savedCaCertificates);
+        }
+        if (savedUserCertificate != null) {
+            String[] savedUserCertificates = new String[]{savedUserCertificate};
+            when(mockWifiEnterpriseConfig.getClientCertificateAlias())
+                    .thenReturn(savedUserCertificate);
+            when(mKeyStore.list(eq(Credentials.USER_PRIVATE_KEY), anyInt()))
+                    .thenReturn(savedUserCertificates);
+        }
+
+        mController = new TestWifiConfigController2(mConfigUiBase, mView, mWifiEntry,
+                WifiConfigUiBase2.MODE_MODIFY);
+
+        //  Because Robolectric has a different behavior from normal flow.
+        //
+        //  Normal flow:
+        //    showSecurityFields start -> mEapMethodSpinner.setSelection
+        //        -> showSecurityFields end -> mController.onItemSelected
+        //
+        //  Robolectric flow:
+        //    showSecurityFields start -> mEapMethodSpinner.setSelection
+        //        -> mController.onItemSelected -> showSecurityFields end
+        //
+        //  We need to add a redundant mEapMethodSpinner.setSelection here to verify whether the
+        //  certificates are covered by mController.onItemSelected after showSecurityFields end.
+        mController.mEapMethodSpinner.setSelection(Eap.TLS);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
index 9146998..8f73bc3 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -16,11 +16,15 @@
 
 package com.android.settings.wifi;
 
+import static com.android.settings.wifi.WifiConfigController.PRIVACY_SPINNER_INDEX_DEVICE_MAC;
+import static com.android.settings.wifi.WifiConfigController.PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -32,6 +36,9 @@
 import android.net.wifi.WifiManager;
 import android.os.ServiceSpecificException;
 import android.security.KeyStore;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
@@ -43,7 +50,6 @@
 
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settings.wifi.details.WifiPrivacyPreferenceController;
 import com.android.settingslib.wifi.AccessPoint;
 
 import org.junit.Before;
@@ -56,6 +62,9 @@
 import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowInputMethodManager;
+import org.robolectric.shadows.ShadowSubscriptionManager;
+
+import java.util.Arrays;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = ShadowConnectivityManager.class)
@@ -71,6 +80,7 @@
     private KeyStore mKeyStore;
     private View mView;
     private Spinner mHiddenSettingsSpinner;
+    private ShadowSubscriptionManager mShadowSubscriptionManager;
 
     public WifiConfigController mController;
     private static final String HEX_PSK = "01234567012345670123456701234567012345670123456701234567"
@@ -95,6 +105,7 @@
         final Spinner ipSettingsSpinner = mView.findViewById(R.id.ip_settings);
         mHiddenSettingsSpinner = mView.findViewById(R.id.hidden_settings);
         ipSettingsSpinner.setSelection(DHCP);
+        mShadowSubscriptionManager = shadowOf(mContext.getSystemService(SubscriptionManager.class));
 
         mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
                 WifiConfigUiBase.MODE_CONNECT);
@@ -219,6 +230,35 @@
     }
 
     @Test
+    public void isSubmittable_caCertWithoutDomain_shouldReturnFalse() {
+        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
+        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT);
+        mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
+        final Spinner eapCaCertSpinner = mView.findViewById(R.id.ca_cert);
+        eapCaCertSpinner.setAdapter(mController.getSpinnerAdapter(new String[]{"certificate"}));
+        eapCaCertSpinner.setSelection(0);
+        mView.findViewById(R.id.l_domain).setVisibility(View.VISIBLE);
+
+        assertThat(mController.isSubmittable()).isFalse();
+    }
+
+    @Test
+    public void isSubmittable_caCertWithDomain_shouldReturnTrue() {
+        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
+        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT);
+        mView.findViewById(R.id.l_ca_cert).setVisibility(View.VISIBLE);
+        final Spinner eapCaCertSpinner = mView.findViewById(R.id.ca_cert);
+        eapCaCertSpinner.setAdapter(mController.getSpinnerAdapter(new String[]{"certificate"}));
+        eapCaCertSpinner.setSelection(0);
+        mView.findViewById(R.id.l_domain).setVisibility(View.VISIBLE);
+        ((TextView) mView.findViewById(R.id.domain)).setText("fakeDomain");
+
+        assertThat(mController.isSubmittable()).isTrue();
+    }
+
+    @Test
     public void getSignalString_notReachable_shouldHaveNoSignalString() {
         when(mAccessPoint.isReachable()).thenReturn(false);
 
@@ -381,14 +421,12 @@
     }
 
     @Test
-    public void loadMacRandomizedValue_shouldPersistentAsDefault() {
+    public void loadMacRandomizedValue_shouldMandomizedMacAsDefault() {
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
-        final int prefPersist =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
-                        WifiConfiguration.RANDOMIZATION_PERSISTENT);
 
         assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(prefPersist);
+        assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(
+                PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC);
     }
 
     @Test
@@ -409,14 +447,12 @@
         mockWifiConfig.macRandomizationSetting = macRandomizedValue;
         mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
                 WifiConfigUiBase.MODE_CONNECT);
-
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
-        final int expectedPrefValue =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
-                        macRandomizedValue);
 
         assertThat(privacySetting.getVisibility()).isEqualTo(View.VISIBLE);
-        assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(expectedPrefValue);
+        assertThat(privacySetting.getSelectedItemPosition()).isEqualTo(
+                macRandomizedValue == WifiConfiguration.RANDOMIZATION_PERSISTENT
+                ? PRIVACY_SPINNER_INDEX_RANDOMIZED_MAC : PRIVACY_SPINNER_INDEX_DEVICE_MAC);
     }
 
     @Test
@@ -427,12 +463,9 @@
     }
 
     @Test
-    public void saveMacRandomizedValue_ChangedToNone_shouldGetNone() {
+    public void saveMacRandomizedValue_ChangedToDeviceMac_shouldGetNone() {
         final Spinner privacySetting = mView.findViewById(R.id.privacy_settings);
-        final int prefMacNone =
-                WifiPrivacyPreferenceController.translateMacRandomizedValueToPrefValue(
-                        WifiConfiguration.RANDOMIZATION_NONE);
-        privacySetting.setSelection(prefMacNone);
+        privacySetting.setSelection(PRIVACY_SPINNER_INDEX_DEVICE_MAC);
 
         WifiConfiguration config = mController.getConfig();
         assertThat(config.macRandomizationSetting).isEqualTo(WifiConfiguration.RANDOMIZATION_NONE);
@@ -575,4 +608,41 @@
 
         assertThat(advButton.getVisibility()).isEqualTo(View.GONE);
     }
+
+    @Test
+    public void loadSims_noSim_simSpinnerDefaultNoSim() {
+        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
+        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT);
+        final Spinner eapMethodSpinner = mock(Spinner.class);
+        when(eapMethodSpinner.getSelectedItemPosition()).thenReturn(
+                WifiConfigController2.WIFI_EAP_METHOD_SIM);
+        mController.mEapMethodSpinner = eapMethodSpinner;
+
+        mController.loadSims();
+
+        final WifiConfiguration wifiConfiguration = mController.getConfig();
+        assertThat(wifiConfiguration.carrierId).isEqualTo(TelephonyManager.UNKNOWN_CARRIER_ID);
+    }
+
+    @Test
+    public void loadSims_oneSim_simSpinnerDefaultSubscription() {
+        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_EAP);
+        final SubscriptionInfo subscriptionInfo = mock(SubscriptionInfo.class);
+        final int carrierId = 6;
+        when(subscriptionInfo.getCarrierId()).thenReturn(carrierId);
+        when(subscriptionInfo.getCarrierName()).thenReturn("FAKE-CARRIER");
+        mShadowSubscriptionManager.setActiveSubscriptionInfoList(Arrays.asList(subscriptionInfo));
+        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT);
+        final Spinner eapMethodSpinner = mock(Spinner.class);
+        when(eapMethodSpinner.getSelectedItemPosition()).thenReturn(
+                WifiConfigController2.WIFI_EAP_METHOD_SIM);
+        mController.mEapMethodSpinner = eapMethodSpinner;
+
+        mController.loadSims();
+
+        final WifiConfiguration wifiConfiguration = mController.getConfig();
+        assertThat(wifiConfiguration.carrierId).isEqualTo(carrierId);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
index 41d1bbe..f601e36 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
@@ -23,14 +23,20 @@
 import android.content.Intent;
 import android.net.wifi.WifiConfiguration;
 
+import androidx.lifecycle.Lifecycle.State;
+import androidx.test.core.app.ActivityScenario;
+
 import com.android.settings.R;
 import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
 import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+import com.android.settings.testutils.shadow.ShadowNetworkDetailsTracker;
 import com.android.settings.testutils.shadow.ShadowWifiManager;
 
 import com.google.android.setupcompat.util.WizardManagerHelper;
 
+import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -42,15 +48,20 @@
 
 @RunWith(RobolectricTestRunner.class)
 @Config(shadows = {
+        ShadowAlertDialogCompat.class,
         ShadowConnectivityManager.class,
-        ShadowWifiManager.class,
-        ShadowAlertDialogCompat.class
+        ShadowNetworkDetailsTracker.class,
+        ShadowWifiManager.class
 })
 public class WifiDialogActivityTest {
 
     private static final String AP1_SSID = "\"ap1\"";
     @Mock
     private WifiConfigController mController;
+    @Mock
+    private WifiConfigController2 mController2;
+
+    private ActivityScenario<WifiDialogActivity> mWifiDialogActivity;
 
     @Before
     public void setUp() {
@@ -59,6 +70,18 @@
         WifiConfiguration wifiConfig = new WifiConfiguration();
         wifiConfig.SSID = AP1_SSID;
         doReturn(wifiConfig).when(mController).getConfig();
+        doReturn(wifiConfig).when(mController2).getConfig();
+    }
+
+    @After
+    public void cleanUp() {
+        if (mWifiDialogActivity != null) {
+            mWifiDialogActivity.close();
+        }
+    }
+
+    private ActivityScenario<WifiDialogActivity> createTargetActivity(Intent activityIntent) {
+        return ActivityScenario.launch(activityIntent);
     }
 
     @Test
@@ -75,6 +98,28 @@
     }
 
     @Test
+    @Ignore
+    public void onSubmit2_whenConnectForCallerIsTrue_shouldConnectToNetwork() {
+        final Intent intent = new Intent("com.android.settings.WIFI_DIALOG");
+        intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY");
+        intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, true);
+        mWifiDialogActivity = createTargetActivity(intent);
+
+        mWifiDialogActivity.moveToState(State.CREATED);
+        mWifiDialogActivity.moveToState(State.STARTED);
+
+        WifiDialog2 dialog = (WifiDialog2) ShadowAlertDialogCompat.getLatestAlertDialog();
+        assertThat(dialog).isNotNull();
+
+        ReflectionHelpers.setField(dialog, "mController", mController2);
+
+        mWifiDialogActivity.onActivity(activity -> {
+            activity.onSubmit(dialog);
+            assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP1_SSID);
+        });
+    }
+
+    @Test
     public void onSubmit_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() {
         WifiDialogActivity activity =
                 Robolectric.buildActivity(
@@ -93,6 +138,28 @@
     }
 
     @Test
+    @Ignore
+    public void onSubmit2_whenConnectForCallerIsFalse_shouldNotConnectToNetwork() {
+        final Intent intent = new Intent("com.android.settings.WIFI_DIALOG");
+        intent.putExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY, "FAKE_KEY");
+        intent.putExtra(WifiDialogActivity.KEY_CONNECT_FOR_CALLER, false);
+        mWifiDialogActivity = createTargetActivity(intent);
+
+        mWifiDialogActivity.moveToState(State.CREATED);
+        mWifiDialogActivity.moveToState(State.STARTED);
+
+        WifiDialog2 dialog = (WifiDialog2) ShadowAlertDialogCompat.getLatestAlertDialog();
+        assertThat(dialog).isNotNull();
+
+        ReflectionHelpers.setField(dialog, "mController", mController2);
+
+        mWifiDialogActivity.onActivity(activity -> {
+            activity.onSubmit(dialog);
+            assertThat(ShadowWifiManager.get().savedWifiConfig).isEqualTo(null);
+        });
+    }
+
+    @Test
     public void onSubmit_whenLaunchInSetupFlow_shouldBeLightThemeForWifiDialog() {
         WifiDialogActivity activity =
                 Robolectric.buildActivity(
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
deleted file mode 100644
index ed9b851..0000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiDialogTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.wifi.WifiDialog.WifiDialogListener;
-import com.android.settingslib.wifi.AccessPoint;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowEntityHeaderController.class)
-public class WifiDialogTest {
-    @Mock private AccessPoint mockAccessPoint;
-
-    private Context mContext = RuntimeEnvironment.application;
-
-    private WifiDialogListener mListener = new WifiDialogListener() {};
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-    }
-
-    @Test
-    public void createModal_usesDefaultTheme() {
-        WifiDialog modal = WifiDialog
-                .createModal(mContext, mListener, mockAccessPoint, WifiConfigUiBase.MODE_CONNECT);
-
-        WifiDialog wifiDialog = new WifiDialog(mContext, mListener, mockAccessPoint,
-                WifiConfigUiBase.MODE_CONNECT, 0 /* style */, false /* hideSubmitButton */);
-        assertThat(modal.getContext().getThemeResId())
-                .isEqualTo(wifiDialog.getContext().getThemeResId());
-    }
-
-    @Test
-    public void createModal_whenSetTheme_shouldBeCustomizedTheme() {
-        WifiDialog modal = WifiDialog.createModal(mContext, mListener, mockAccessPoint,
-                WifiConfigUiBase.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light);
-
-        WifiDialog wifiDialog = new WifiDialog(mContext, mListener, mockAccessPoint,
-                WifiConfigUiBase.MODE_CONNECT, R.style.SuwAlertDialogThemeCompat_Light,
-                        false /* hideSubmitButton */);
-        assertThat(modal.getContext().getThemeResId())
-                .isEqualTo(wifiDialog.getContext().getThemeResId());
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
deleted file mode 100644
index 1d13232..0000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiMasterSwitchPreferenceControllerTest.java
+++ /dev/null
@@ -1,143 +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.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.IntentFilter;
-import android.net.ConnectivityManager;
-import android.net.NetworkRequest;
-import android.net.NetworkScoreManager;
-import android.net.wifi.WifiManager;
-import android.os.Handler;
-
-import androidx.preference.Preference.OnPreferenceChangeListener;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
-import com.android.settings.widget.MasterSwitchPreference;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
-public class WifiMasterSwitchPreferenceControllerTest {
-
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private MasterSwitchPreference mPreference;
-    @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private NetworkScoreManager mNetworkScoreManager;
-
-    private Context mContext;
-    private WifiMasterSwitchPreferenceController mController;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mMetricsFeatureProvider = FakeFeatureFactory.setupForTest().getMetricsFeatureProvider();
-        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
-        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
-        when(mContext.getSystemService(NetworkScoreManager.class)).thenReturn(mNetworkScoreManager);
-        mController = new WifiMasterSwitchPreferenceController(mContext, mMetricsFeatureProvider);
-        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
-        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(mWifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
-    }
-
-    @Test
-    public void testWifiMasterSwitch_byDefault_shouldBeShown() {
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    @Config(qualifiers = "mcc999")
-    public void testWifiMasterSwitch_ifDisabled_shouldNotBeShown() {
-        assertThat(mController.isAvailable()).isFalse();
-    }
-
-    @Test
-    public void onResume_shouldRegisterCallback() {
-        mController.onResume();
-
-        verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
-        verify(mConnectivityManager).registerNetworkCallback(
-                any(NetworkRequest.class),
-                any(ConnectivityManager.NetworkCallback.class),
-                any(Handler.class));
-    }
-
-    @Test
-    public void onPause_shouldUnregisterCallback() {
-        mController.onResume();
-        mController.onPause();
-
-        verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
-        verify(mConnectivityManager, times(2)).unregisterNetworkCallback(
-                any(ConnectivityManager.NetworkCallback.class));
-    }
-
-    @Test
-    public void onStart_shouldRegisterPreferenceChangeListener() {
-        mController.displayPreference(mScreen);
-        mController.onStart();
-
-        verify(mPreference).setOnPreferenceChangeListener(any(OnPreferenceChangeListener.class));
-    }
-
-    @Test
-    public void onStop_shouldRegisterPreferenceChangeListener() {
-        mController.displayPreference(mScreen);
-        mController.onStart();
-
-        mController.onStop();
-
-        verify(mPreference).setOnPreferenceChangeListener(null);
-    }
-
-    @Test
-    public void onSummaryChanged_shouldUpdatePreferenceSummary() {
-        mController.displayPreference(mScreen);
-
-        mController.onSummaryChanged("test summary");
-
-        verify(mPreference).setSummary("test summary");
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java b/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java
index af7a2a3..dc5ccb4 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiNoInternetDialogTest.java
@@ -16,16 +16,234 @@
 
 package com.android.settings.wifi;
 
+import static android.net.ConnectivityManager.ACTION_PROMPT_LOST_VALIDATION;
+import static android.net.ConnectivityManager.ACTION_PROMPT_PARTIAL_CONNECTIVITY;
+import static android.net.ConnectivityManager.ACTION_PROMPT_UNVALIDATED;
+import static android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkInfo;
+import android.net.NetworkRequest;
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.android.settings.R;
+
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class WifiNoInternetDialogTest {
+
+    private static final String FAKE_NETWORK_ID = "13";
+    private static final String FAKE_URL = "netId:13";
+    private static final String WRONG_URL = "netId:";
+    private static final String FAKE_SSID = "fake_ssid";
+
+    @Captor
+    private ArgumentCaptor<ConnectivityManager.NetworkCallback> mCallbackCaptor;
+
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+
+    @Mock
+    private NetworkInfo mNetworkInfo;
+
+    @Mock
+    private NetworkCapabilities mNetworkCapabilities;
+
+    private WifiNoInternetDialog mActivity;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
     @Test
     public void launchActivity_noIntentAction_shouldNotFatalException() {
         WifiNoInternetDialog wifiNoInternetDialog =
                 Robolectric.setupActivity(WifiNoInternetDialog.class);
     }
-}
+
+    @Test
+    public void setupPromptUnvalidated_shouldShowNoInternetAccessRemember() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+
+        mActivity.onCreate(new Bundle());
+
+        assertThat(mActivity.mAlwaysAllow.getText()).isEqualTo(
+                mActivity.getString(R.string.no_internet_access_remember));
+    }
+
+    @Test
+    public void setupPromptPartialConnectivity_shouldShowNoInternetAccessRemember() {
+        setupActivityWithAction(ACTION_PROMPT_PARTIAL_CONNECTIVITY, FAKE_URL);
+        setupNetworkComponents();
+
+        mActivity.onCreate(new Bundle());
+
+        assertThat(mActivity.mAlwaysAllow.getText()).isEqualTo(
+                mActivity.getString(R.string.no_internet_access_remember));
+    }
+
+    @Test
+    public void setupPromptLostValidationAction_shouldShowLostInternetAccessPersist() {
+        setupActivityWithAction(ACTION_PROMPT_LOST_VALIDATION, FAKE_URL);
+        setupNetworkComponents();
+
+        mActivity.onCreate(new Bundle());
+
+        assertThat(mActivity.mAlwaysAllow.getText()).isEqualTo(
+                mActivity.getString(R.string.lost_internet_access_persist));
+    }
+
+    @Test
+    public void clickPositiveButton_whenPromptUnvalidated_shouldCallSetAcceptUnvalidated() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+        mActivity.onCreate(new Bundle());
+
+        mActivity.onClick(null, DialogInterface.BUTTON_POSITIVE);
+
+        verify(mConnectivityManager).setAcceptUnvalidated(any(Network.class), eq(true), eq(false));
+    }
+
+    @Test
+    public void positiveButton_withPartialConnectivity_shouldCallSetAcceptPartialConnectivity() {
+        setupActivityWithAction(ACTION_PROMPT_PARTIAL_CONNECTIVITY, FAKE_URL);
+        setupNetworkComponents();
+        mActivity.onCreate(new Bundle());
+
+        mActivity.onClick(null, DialogInterface.BUTTON_POSITIVE);
+
+        verify(mConnectivityManager).setAcceptPartialConnectivity(any(Network.class), eq(true),
+                eq(false));
+    }
+
+    @Test
+    public void positiveButton_withLostValidation_shouldCallSetAvoidUnvalidated() {
+        setupActivityWithAction(ACTION_PROMPT_LOST_VALIDATION, FAKE_URL);
+        setupNetworkComponents();
+        mActivity.onCreate(new Bundle());
+
+        mActivity.onClick(null, DialogInterface.BUTTON_POSITIVE);
+
+        verify(mConnectivityManager).setAvoidUnvalidated(any(Network.class));
+    }
+
+    @Test
+    public void destroyWithNoClick_inPartialConnectivity_shouldCallSetAcceptPartialConnectivity() {
+        setupActivityWithAction(ACTION_PROMPT_PARTIAL_CONNECTIVITY, FAKE_URL);
+        setupNetworkComponents();
+        when(mActivity.isFinishing()).thenReturn(true);
+        mActivity.onCreate(new Bundle());
+
+        mActivity.onDestroy();
+
+        verify(mConnectivityManager).setAcceptPartialConnectivity(any(Network.class), eq(false),
+                eq(false));
+    }
+
+    @Test
+    public void destroyWithNoClick_whenUnvalidated_shouldCallSetAcceptUnvalidated() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+        when(mActivity.isFinishing()).thenReturn(true);
+        mActivity.onCreate(new Bundle());
+
+        mActivity.onDestroy();
+
+        verify(mConnectivityManager).setAcceptUnvalidated(any(Network.class), eq(false), eq(false));
+    }
+
+    @Test
+    public void networkCallbackOnLost_shouldFinish() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+        mActivity.onCreate(new Bundle());
+        verify(mConnectivityManager, times(1)).registerNetworkCallback(
+                any(NetworkRequest.class), mCallbackCaptor.capture());
+
+        mCallbackCaptor.getValue().onLost(new Network(Integer.parseInt(FAKE_NETWORK_ID)));
+
+        verify(mActivity).finish();
+    }
+
+    @Test
+    public void networkCallbackOnCapabilitiesChanged_shouldFinish() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+        when(mNetworkCapabilities.hasCapability(NET_CAPABILITY_VALIDATED)).thenReturn(true);
+        mActivity.onCreate(new Bundle());
+        verify(mConnectivityManager, times(1)).registerNetworkCallback(
+                any(NetworkRequest.class), mCallbackCaptor.capture());
+
+        mCallbackCaptor.getValue().onCapabilitiesChanged(
+                new Network(Integer.parseInt(FAKE_NETWORK_ID)), mNetworkCapabilities);
+
+        verify(mActivity).finish();
+    }
+
+    @Test
+    public void networkNotConnectedOrConnecting_shouldFinish() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, FAKE_URL);
+        setupNetworkComponents();
+        when(mNetworkInfo.isConnectedOrConnecting()).thenReturn(false);
+
+        mActivity.onCreate(new Bundle());
+
+        verify(mActivity).finish();
+    }
+
+    @Test
+    public void withWrongUrl_shouldFinish() {
+        setupActivityWithAction(ACTION_PROMPT_UNVALIDATED, WRONG_URL);
+        setupNetworkComponents();
+
+        mActivity.onCreate(new Bundle());
+
+        verify(mActivity).finish();
+    }
+
+    private void setupNetworkComponents() {
+        when(mActivity.getSystemService(Context.CONNECTIVITY_SERVICE))
+                .thenReturn(mConnectivityManager);
+        when(mNetworkInfo.isConnectedOrConnecting()).thenReturn(true);
+        when(mNetworkCapabilities.getSsid()).thenReturn(FAKE_SSID);
+        when(mConnectivityManager.getNetworkInfo(any()))
+                .thenReturn(mNetworkInfo);
+        when(mConnectivityManager.getNetworkCapabilities(any()))
+                .thenReturn(mNetworkCapabilities);
+    }
+
+    private void setupActivityWithAction(String action, String url) {
+        final Intent intent = new Intent(action).setClassName(
+                RuntimeEnvironment.application.getPackageName(),
+                WifiNoInternetDialog.class.getName());
+        intent.setData(Uri.parse(url));
+        mActivity = spy(Robolectric.buildActivity(WifiNoInternetDialog.class, intent).get());
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java
new file mode 100644
index 0000000..b94df29
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/WifiPrimarySwitchPreferenceControllerTest.java
@@ -0,0 +1,143 @@
+/*
+ * 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.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.NetworkRequest;
+import android.net.NetworkScoreManager;
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+
+import androidx.preference.Preference.OnPreferenceChangeListener;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal;
+import com.android.settings.widget.PrimarySwitchPreference;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+
+@RunWith(RobolectricTestRunner.class)
+@Config(shadows = ShadowRestrictedLockUtilsInternal.class)
+public class WifiPrimarySwitchPreferenceControllerTest {
+
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private PrimarySwitchPreference mPreference;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private NetworkScoreManager mNetworkScoreManager;
+
+    private Context mContext;
+    private WifiPrimarySwitchPreferenceController mController;
+    private MetricsFeatureProvider mMetricsFeatureProvider;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mMetricsFeatureProvider = FakeFeatureFactory.setupForTest().getMetricsFeatureProvider();
+        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mContext.getSystemService(NetworkScoreManager.class)).thenReturn(mNetworkScoreManager);
+        mController = new WifiPrimarySwitchPreferenceController(mContext, mMetricsFeatureProvider);
+        when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference);
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+        when(mWifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
+    }
+
+    @Test
+    public void testWifiPrimarySwitch_byDefault_shouldBeShown() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    @Config(qualifiers = "mcc999")
+    public void testWifiPrimarySwitch_ifDisabled_shouldNotBeShown() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void onResume_shouldRegisterCallback() {
+        mController.onResume();
+
+        verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
+        verify(mConnectivityManager).registerNetworkCallback(
+                any(NetworkRequest.class),
+                any(ConnectivityManager.NetworkCallback.class),
+                any(Handler.class));
+    }
+
+    @Test
+    public void onPause_shouldUnregisterCallback() {
+        mController.onResume();
+        mController.onPause();
+
+        verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
+        verify(mConnectivityManager, times(2)).unregisterNetworkCallback(
+                any(ConnectivityManager.NetworkCallback.class));
+    }
+
+    @Test
+    public void onStart_shouldRegisterPreferenceChangeListener() {
+        mController.displayPreference(mScreen);
+        mController.onStart();
+
+        verify(mPreference).setOnPreferenceChangeListener(any(OnPreferenceChangeListener.class));
+    }
+
+    @Test
+    public void onStop_shouldRegisterPreferenceChangeListener() {
+        mController.displayPreference(mScreen);
+        mController.onStart();
+
+        mController.onStop();
+
+        verify(mPreference).setOnPreferenceChangeListener(null);
+    }
+
+    @Test
+    public void onSummaryChanged_shouldUpdatePreferenceSummary() {
+        mController.displayPreference(mScreen);
+
+        mController.onSummaryChanged("test summary");
+
+        verify(mPreference).setSummary("test summary");
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java
deleted file mode 100644
index b2a28db..0000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiSettings2Test.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package com.android.settings.wifi;
-
-import static com.android.settings.wifi.WifiConfigUiBase2.MODE_CONNECT;
-import static com.android.settings.wifi.WifiConfigUiBase2.MODE_MODIFY;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.PowerManager;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.view.ContextMenu;
-import android.view.View;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceManager;
-import androidx.preference.PreferenceScreen;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.android.settings.R;
-import com.android.settings.datausage.DataUsagePreference;
-import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
-import com.android.settings.testutils.shadow.ShadowFragment;
-import com.android.settingslib.wifi.LongPressWifiEntryPreference;
-import com.android.wifitrackerlib.WifiEntry;
-import com.android.wifitrackerlib.WifiPickerTracker;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowToast;
-
-@RunWith(RobolectricTestRunner.class)
-public class WifiSettings2Test {
-
-    private static final int NUM_NETWORKS = 4;
-    private static final String FAKE_URI_STRING = "fakeuri";
-
-    @Mock
-    private PowerManager mPowerManager;
-    @Mock
-    private WifiManager mWifiManager;
-    @Mock
-    private DataUsagePreference mDataUsagePreference;
-    private Context mContext;
-    private WifiSettings2 mWifiSettings2;
-    @Mock
-    private WifiPickerTracker mMockWifiPickerTracker;
-    @Mock
-    private PreferenceManager mPreferenceManager;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = spy(RuntimeEnvironment.application);
-
-        mWifiSettings2 = spy(new WifiSettings2());
-        doReturn(mContext).when(mWifiSettings2).getContext();
-        doReturn(mPreferenceManager).when(mWifiSettings2).getPreferenceManager();
-        doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
-        doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class);
-        doReturn(mContext).when(mPreferenceManager).getContext();
-        mWifiSettings2.mAddWifiNetworkPreference = new AddWifiNetworkPreference(mContext);
-        mWifiSettings2.mSavedNetworksPreference = new Preference(mContext);
-        mWifiSettings2.mConfigureWifiSettingsPreference = new Preference(mContext);
-        mWifiSettings2.mWifiPickerTracker = mMockWifiPickerTracker;
-        mWifiSettings2.mWifiManager = mWifiManager;
-    }
-
-    @Test
-    public void addNetworkFragmentSendResult_onActivityResult_shouldHandleEvent() {
-        final WifiSettings2 wifiSettings2 = spy(new WifiSettings2());
-        final Intent intent = new Intent();
-        doNothing().when(wifiSettings2).handleAddNetworkRequest(anyInt(), any(Intent.class));
-
-        wifiSettings2.onActivityResult(WifiSettings2.ADD_NETWORK_REQUEST, Activity.RESULT_OK,
-                intent);
-
-        verify(wifiSettings2).handleAddNetworkRequest(anyInt(), any(Intent.class));
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_hasSavedNetwork_preferenceVisible() {
-        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(NUM_NETWORKS);
-        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(0 /* count */);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isTrue();
-        assertThat(mWifiSettings2.mSavedNetworksPreference.getSummary()).isEqualTo(
-                mContext.getResources().getQuantityString(
-                        R.plurals.wifi_saved_access_points_summary,
-                        NUM_NETWORKS, NUM_NETWORKS));
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_hasSavedPasspointNetwork_preferenceVisible() {
-        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(0 /* count */);
-        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(NUM_NETWORKS);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isTrue();
-        assertThat(mWifiSettings2.mSavedNetworksPreference.getSummary()).isEqualTo(
-                mContext.getResources().getQuantityString(
-                        R.plurals.wifi_saved_passpoint_access_points_summary,
-                        NUM_NETWORKS, NUM_NETWORKS));
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_hasTwoKindsSavedNetwork_preferenceVisible() {
-        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(NUM_NETWORKS);
-        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(NUM_NETWORKS);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isTrue();
-        assertThat(mWifiSettings2.mSavedNetworksPreference.getSummary()).isEqualTo(
-                mContext.getResources().getQuantityString(
-                        R.plurals.wifi_saved_all_access_points_summary,
-                        NUM_NETWORKS*2, NUM_NETWORKS*2));
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_noSavedNetwork_preferenceInvisible() {
-        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(0 /* count */);
-        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(0 /* count */);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mSavedNetworksPreference.isVisible()).isFalse();
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_wifiWakeupEnabled_displayOn() {
-        final ContentResolver contentResolver = mContext.getContentResolver();
-        when(mWifiManager.isAutoWakeupEnabled()).thenReturn(true);
-        when(mWifiManager.isScanAlwaysAvailable()).thenReturn(true);
-        Settings.Global.putInt(contentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);
-        when(mPowerManager.isPowerSaveMode()).thenReturn(false);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mConfigureWifiSettingsPreference.getSummary()).isEqualTo(
-                mContext.getString(R.string.wifi_configure_settings_preference_summary_wakeup_on));
-    }
-
-    @Test
-    public void setAdditionalSettingsSummaries_wifiWakeupDisabled_displayOff() {
-        final ContentResolver contentResolver = mContext.getContentResolver();
-        when(mWifiManager.isAutoWakeupEnabled()).thenReturn(false);
-
-        mWifiSettings2.setAdditionalSettingsSummaries();
-
-        assertThat(mWifiSettings2.mConfigureWifiSettingsPreference.getSummary()).isEqualTo(
-                mContext.getString(R.string.wifi_configure_settings_preference_summary_wakeup_off));
-    }
-
-    @Test
-    public void checkAddWifiNetworkPrefernce_preferenceVisible() {
-        assertThat(mWifiSettings2.mAddWifiNetworkPreference.isVisible()).isTrue();
-        assertThat(mWifiSettings2.mAddWifiNetworkPreference.getTitle()).isEqualTo(
-                mContext.getString(R.string.wifi_add_network));
-    }
-
-    private void setUpForOnCreate() {
-        final FragmentActivity activity = mock(FragmentActivity.class);
-        when(mWifiSettings2.getActivity()).thenReturn(activity);
-        final Resources.Theme theme = mContext.getTheme();
-        when(activity.getTheme()).thenReturn(theme);
-        UserManager userManager = mock(UserManager.class);
-        when(activity.getSystemService(Context.USER_SERVICE))
-                .thenReturn(userManager);
-
-        when(mWifiSettings2.findPreference(WifiSettings2.PREF_KEY_DATA_USAGE))
-                .thenReturn(mDataUsagePreference);
-    }
-
-    @Test
-    @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
-    public void checkDataUsagePreference_perferenceInvisibleIfWifiNotSupported() {
-        setUpForOnCreate();
-        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false;
-
-        mWifiSettings2.onCreate(Bundle.EMPTY);
-
-        verify(mDataUsagePreference).setVisible(false);
-    }
-
-    @Test
-    @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
-    public void checkDataUsagePreference_perferenceVisibleIfWifiSupported() {
-        setUpForOnCreate();
-        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
-
-        mWifiSettings2.onCreate(Bundle.EMPTY);
-
-        verify(mDataUsagePreference).setVisible(true);
-        verify(mDataUsagePreference).setTemplate(any(), eq(0) /*subId*/, eq(null) /*service*/);
-    }
-
-    @Test
-    public void onCreateAdapter_hasStableIdsTrue() {
-        final PreferenceScreen preferenceScreen = mock(PreferenceScreen.class);
-        when(preferenceScreen.getContext()).thenReturn(mContext);
-
-        RecyclerView.Adapter adapter = mWifiSettings2.onCreateAdapter(preferenceScreen);
-
-        assertThat(adapter.hasStableIds()).isTrue();
-    }
-
-    @Test
-    public void onCreateContextMenu_shouldHaveForgetAndDisconnectMenuForConnectedWifiEntry() {
-        final FragmentActivity activity = mock(FragmentActivity.class);
-        when(activity.getApplicationContext()).thenReturn(mContext);
-        when(mWifiSettings2.getActivity()).thenReturn(activity);
-
-        final WifiEntry wifiEntry = mock(WifiEntry.class);
-        when(wifiEntry.canDisconnect()).thenReturn(true);
-        when(wifiEntry.canForget()).thenReturn(true);
-        when(wifiEntry.isSaved()).thenReturn(true);
-        when(wifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
-
-        final LongPressWifiEntryPreference connectedWifiEntryPreference =
-                mWifiSettings2.createLongPressWifiEntryPreference(wifiEntry);
-        final View view = mock(View.class);
-        when(view.getTag()).thenReturn(connectedWifiEntryPreference);
-
-        final ContextMenu menu = mock(ContextMenu.class);
-        mWifiSettings2.onCreateContextMenu(menu, view, null /* info */);
-
-        verify(menu).add(anyInt(), eq(WifiSettings2.MENU_ID_FORGET), anyInt(), anyInt());
-        verify(menu).add(anyInt(), eq(WifiSettings2.MENU_ID_DISCONNECT), anyInt(), anyInt());
-    }
-
-    @Test
-    public void onWifiEntriesChanged_shouldChangeNextButtonState() {
-        mWifiSettings2.onWifiEntriesChanged();
-
-        verify(mWifiSettings2).changeNextButtonState(anyBoolean());
-    }
-
-    @Test
-    public void openSubscriptionHelpPage_shouldCallStartActivityForResult() {
-        doReturn(new Intent()).when(mWifiSettings2).getHelpIntent(mContext, FAKE_URI_STRING);
-        doNothing().when(mWifiSettings2).startActivityForResult(any(Intent.class), anyInt());
-        final WifiEntry mockWifiEntry = mock(WifiEntry.class);
-        when(mockWifiEntry.getHelpUriString()).thenReturn(FAKE_URI_STRING);
-
-        mWifiSettings2.openSubscriptionHelpPage(mockWifiEntry);
-
-        verify(mWifiSettings2, times(1)).startActivityForResult(any(), anyInt());
-    }
-
-    @Test
-    public void onNumSavedNetworksChanged_isFinishing_ShouldNotCrash() {
-        final FragmentActivity activity = mock(FragmentActivity.class);
-        when(activity.isFinishing()).thenReturn(true);
-        when(mWifiSettings2.getActivity()).thenReturn(activity);
-        when(mWifiSettings2.getContext()).thenReturn(null);
-
-        mWifiSettings2.onNumSavedNetworksChanged();
-    }
-
-    @Test
-    public void onNumSavedSubscriptionsChanged_isFinishing_ShouldNotCrash() {
-        final FragmentActivity activity = mock(FragmentActivity.class);
-        when(activity.isFinishing()).thenReturn(true);
-        when(mWifiSettings2.getActivity()).thenReturn(activity);
-        when(mWifiSettings2.getContext()).thenReturn(null);
-
-        mWifiSettings2.onNumSavedSubscriptionsChanged();
-    }
-
-    @Test
-    public void onSubmit_modeModifyNoConfig_toastErrorMessage() {
-        WifiDialog2 dialog = createWifiDialog2(MODE_MODIFY, null /* config */);
-
-        mWifiSettings2.onSubmit(dialog);
-
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_failed_save_message));
-    }
-
-    @Test
-    public void onSubmit_modeModifyHasConfig_saveWifiManager() {
-        final WifiConfiguration config = mock(WifiConfiguration.class);
-        WifiDialog2 dialog = createWifiDialog2(MODE_MODIFY, config);
-
-        mWifiSettings2.onSubmit(dialog);
-
-        verify(mWifiManager).save(eq(config), any());
-    }
-
-    @Test
-    public void onSubmit_modeConnectNoConfig_connectWifiEntry() {
-        WifiDialog2 dialog = createWifiDialog2(MODE_CONNECT, null /* config */);
-        final WifiEntry wifiEntry = dialog.getWifiEntry();
-
-        mWifiSettings2.onAttach(mContext);
-        mWifiSettings2.onSubmit(dialog);
-
-        verify(mWifiSettings2).connect(wifiEntry, false /* editIfNoConfig */,
-                false /* fullScreenEdit*/);
-    }
-
-    @Test
-    public void onSubmit_modeConnectHasConfig_connectWifiManager() {
-        final WifiConfiguration config = mock(WifiConfiguration.class);
-        WifiDialog2 dialog = createWifiDialog2(MODE_CONNECT, config);
-
-        mWifiSettings2.onSubmit(dialog);
-
-        verify(mWifiManager).connect(eq(config), any(WifiManager.ActionListener.class));
-    }
-
-    private WifiDialog2 createWifiDialog2(int mode, WifiConfiguration config) {
-        final WifiEntry wifiEntry = mock(WifiEntry.class);
-        when(wifiEntry.canConnect()).thenReturn(true);
-        final WifiConfigController2 controller = mock(WifiConfigController2.class);
-        when(controller.getConfig()).thenReturn(config);
-        final WifiDialog2 wifiDialog2 =  spy(WifiDialog2.createModal(mContext, null /* listener */,
-                wifiEntry, mode));
-        when(wifiDialog2.getController()).thenReturn(controller);
-        return wifiDialog2;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
index b955156..7eba586 100644
--- a/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/WifiSettingsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (C) 2019 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.
@@ -15,17 +15,20 @@
  */
 package com.android.settings.wifi;
 
-import static android.net.wifi.WifiManager.WIFI_STATE_ENABLED;
+import static com.android.settings.wifi.WifiConfigUiBase2.MODE_CONNECT;
+import static com.android.settings.wifi.WifiConfigUiBase2.MODE_MODIFY;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -33,91 +36,58 @@
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.net.ConnectivityManager;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.wifi.EAPConstants;
 import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
-import android.net.wifi.hotspot2.PasspointConfiguration;
-import android.net.wifi.hotspot2.pps.Credential;
-import android.net.wifi.hotspot2.pps.HomeSp;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.os.UserManager;
 import android.provider.Settings;
-import android.util.FeatureFlagUtils;
 import android.view.ContextMenu;
 import android.view.View;
 
 import androidx.fragment.app.FragmentActivity;
 import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
 import androidx.preference.PreferenceScreen;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settings.R;
-import com.android.settings.SettingsActivity;
 import com.android.settings.datausage.DataUsagePreference;
-import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.settings.testutils.shadow.ShadowDataUsageUtils;
 import com.android.settings.testutils.shadow.ShadowFragment;
-import com.android.settings.widget.SwitchBar;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.android.settingslib.wifi.LongPressWifiEntryPreference;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
-import org.robolectric.util.ReflectionHelpers;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import org.robolectric.shadows.ShadowToast;
 
 @RunWith(RobolectricTestRunner.class)
 public class WifiSettingsTest {
 
     private static final int NUM_NETWORKS = 4;
+    private static final String FAKE_URI_STRING = "fakeuri";
 
     @Mock
-    private WifiTracker mWifiTracker;
-    @Mock
     private PowerManager mPowerManager;
     @Mock
-    private DataUsagePreference mDataUsagePreference;
-    @Mock
-    private RecyclerView mRecyclerView;
-    @Mock
-    private RecyclerView.Adapter mRecyclerViewAdapter;
-    @Mock
-    private View mHeaderView;
-    @Mock
     private WifiManager mWifiManager;
     @Mock
-    private ConnectivityManager mConnectivityManager;
-    @Mock
-    private Intent mActivityIntent;
-    @Mock
-    private SwitchBar mSwitchBar;
-    @Mock
-    private WifiInfo mWifiInfo;
-    @Mock
-    private PackageManager mPackageManager;
+    private DataUsagePreference mDataUsagePreference;
     private Context mContext;
     private WifiSettings mWifiSettings;
-    private FakeFeatureFactory mFakeFeatureFactory;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
+    @Mock
+    private WifiPickerTracker mMockWifiPickerTracker;
+    @Mock
+    private PreferenceManager mPreferenceManager;
 
     @Before
     public void setUp() {
@@ -126,75 +96,33 @@
 
         mWifiSettings = spy(new WifiSettings());
         doReturn(mContext).when(mWifiSettings).getContext();
-        doReturn(mRecyclerViewAdapter).when(mRecyclerView).getAdapter();
-        doReturn(mRecyclerView).when(mWifiSettings).getListView();
+        doReturn(mPreferenceManager).when(mWifiSettings).getPreferenceManager();
         doReturn(mPowerManager).when(mContext).getSystemService(PowerManager.class);
-        doReturn(mHeaderView).when(mWifiSettings).setPinnedHeaderView(anyInt());
-        doReturn(mWifiInfo).when(mWifiManager).getConnectionInfo();
-        doReturn(mWifiManager).when(mWifiTracker).getManager();
+        doReturn(mWifiManager).when(mContext).getSystemService(WifiManager.class);
+        doReturn(mContext).when(mPreferenceManager).getContext();
         mWifiSettings.mAddWifiNetworkPreference = new AddWifiNetworkPreference(mContext);
         mWifiSettings.mSavedNetworksPreference = new Preference(mContext);
         mWifiSettings.mConfigureWifiSettingsPreference = new Preference(mContext);
-        mWifiSettings.mWifiTracker = mWifiTracker;
+        mWifiSettings.mWifiPickerTracker = mMockWifiPickerTracker;
         mWifiSettings.mWifiManager = mWifiManager;
-        mWifiSettings.mConnectivityManager = mConnectivityManager;
-        mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
-        mMetricsFeatureProvider = mFakeFeatureFactory.getMetricsFeatureProvider();
-        ReflectionHelpers.setField(mWifiSettings, "mMetricsFeatureProvider",
-                mMetricsFeatureProvider);
-        WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
     }
 
     @Test
     public void addNetworkFragmentSendResult_onActivityResult_shouldHandleEvent() {
-        final WifiSettings wifiSettings = spy(new WifiSettings());
+        final WifiSettings WifiSettings = spy(new WifiSettings());
         final Intent intent = new Intent();
-        doNothing().when(wifiSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
+        doNothing().when(WifiSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
 
-        wifiSettings.onActivityResult(WifiSettings.ADD_NETWORK_REQUEST, Activity.RESULT_OK, intent);
+        WifiSettings.onActivityResult(WifiSettings.ADD_NETWORK_REQUEST, Activity.RESULT_OK,
+                intent);
 
-        verify(wifiSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
-    }
-
-    private List<WifiConfiguration> createMockWifiConfigurations(int count) {
-        final List<WifiConfiguration> mockConfigs = new ArrayList<>();
-        for (int i = 0; i < count; i++) {
-            mockConfigs.add(new WifiConfiguration());
-        }
-        return mockConfigs;
-    }
-
-    private List<PasspointConfiguration> createMockPasspointConfigurations(int count) {
-        final List<PasspointConfiguration> mockConfigs = new ArrayList<>();
-        for (int i = 0; i < count; i++) {
-            final HomeSp sp = new HomeSp();
-            sp.setFqdn("fqdn");
-            final PasspointConfiguration config = new PasspointConfiguration();
-            config.setHomeSp(sp);
-            Credential.SimCredential simCredential = new Credential.SimCredential();
-            Credential credential = new Credential();
-            credential.setRealm("test.example.com");
-            simCredential.setImsi("12345*");
-            simCredential.setEapType(EAPConstants.EAP_SIM);
-            credential.setSimCredential(simCredential);
-            config.setCredential(credential);
-            mockConfigs.add(config);
-        }
-        return mockConfigs;
-    }
-
-    static NetworkCapabilities makeCaptivePortalNetworkCapabilities() {
-        final NetworkCapabilities capabilities = new NetworkCapabilities();
-        capabilities.clearAll();
-        capabilities.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
-        capabilities.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        return capabilities;
+        verify(WifiSettings).handleAddNetworkRequest(anyInt(), any(Intent.class));
     }
 
     @Test
     public void setAdditionalSettingsSummaries_hasSavedNetwork_preferenceVisible() {
-        when(mWifiManager.getConfiguredNetworks())
-                .thenReturn(createMockWifiConfigurations(NUM_NETWORKS));
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(NUM_NETWORKS);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(0 /* count */);
 
         mWifiSettings.setAdditionalSettingsSummaries();
 
@@ -207,8 +135,8 @@
 
     @Test
     public void setAdditionalSettingsSummaries_hasSavedPasspointNetwork_preferenceVisible() {
-        when(mWifiManager.getPasspointConfigurations())
-                .thenReturn(createMockPasspointConfigurations(NUM_NETWORKS));
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(0 /* count */);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(NUM_NETWORKS);
 
         mWifiSettings.setAdditionalSettingsSummaries();
 
@@ -221,10 +149,8 @@
 
     @Test
     public void setAdditionalSettingsSummaries_hasTwoKindsSavedNetwork_preferenceVisible() {
-        when(mWifiManager.getConfiguredNetworks())
-                .thenReturn(createMockWifiConfigurations(NUM_NETWORKS));
-        when(mWifiManager.getPasspointConfigurations())
-                .thenReturn(createMockPasspointConfigurations(NUM_NETWORKS));
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(NUM_NETWORKS);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(NUM_NETWORKS);
 
         mWifiSettings.setAdditionalSettingsSummaries();
 
@@ -237,8 +163,8 @@
 
     @Test
     public void setAdditionalSettingsSummaries_noSavedNetwork_preferenceInvisible() {
-        when(mWifiManager.getConfiguredNetworks())
-                .thenReturn(createMockWifiConfigurations(0 /* count */));
+        when(mMockWifiPickerTracker.getNumSavedNetworks()).thenReturn(0 /* count */);
+        when(mMockWifiPickerTracker.getNumSavedSubscriptions()).thenReturn(0 /* count */);
 
         mWifiSettings.setAdditionalSettingsSummaries();
 
@@ -278,29 +204,21 @@
     }
 
     private void setUpForOnCreate() {
-        final SettingsActivity activity = mock(SettingsActivity.class);
-        when(activity.getSwitchBar()).thenReturn(mSwitchBar);
+        final FragmentActivity activity = mock(FragmentActivity.class);
         when(mWifiSettings.getActivity()).thenReturn(activity);
         final Resources.Theme theme = mContext.getTheme();
         when(activity.getTheme()).thenReturn(theme);
-        when(activity.getIntent()).thenReturn(mActivityIntent);
         UserManager userManager = mock(UserManager.class);
         when(activity.getSystemService(Context.USER_SERVICE))
                 .thenReturn(userManager);
+
         when(mWifiSettings.findPreference(WifiSettings.PREF_KEY_DATA_USAGE))
                 .thenReturn(mDataUsagePreference);
-        when(activity.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
-        when(activity.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
-        when(activity.getPackageManager()).thenReturn(mPackageManager);
     }
 
     @Test
     @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
     public void checkDataUsagePreference_perferenceInvisibleIfWifiNotSupported() {
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            return;
-        }
-
         setUpForOnCreate();
         ShadowDataUsageUtils.IS_WIFI_SUPPORTED = false;
 
@@ -312,10 +230,6 @@
     @Test
     @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
     public void checkDataUsagePreference_perferenceVisibleIfWifiSupported() {
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            return;
-        }
-
         setUpForOnCreate();
         ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
 
@@ -326,28 +240,6 @@
     }
 
     @Test
-    public void onCreateContextMenu_shouldHaveForgetMenuForConnectedAccessPreference() {
-        final FragmentActivity mockActivity = mock(FragmentActivity.class);
-        when(mockActivity.getApplicationContext()).thenReturn(mContext);
-        when(mWifiSettings.getActivity()).thenReturn(mockActivity);
-
-        final AccessPoint accessPoint = mock(AccessPoint.class);
-        when(accessPoint.isConnectable()).thenReturn(false);
-        when(accessPoint.isSaved()).thenReturn(true);
-        when(accessPoint.isActive()).thenReturn(true);
-
-        final ConnectedAccessPointPreference connectedPreference =
-            mWifiSettings.createConnectedAccessPointPreference(accessPoint, mContext);
-        final View view = mock(View.class);
-        when(view.getTag()).thenReturn(connectedPreference);
-
-        final ContextMenu menu = mock(ContextMenu.class);
-        mWifiSettings.onCreateContextMenu(menu, view, null /* info */);
-
-        verify(menu).add(anyInt(), eq(WifiSettings.MENU_ID_FORGET), anyInt(), anyInt());
-    }
-
-    @Test
     public void onCreateAdapter_hasStableIdsTrue() {
         final PreferenceScreen preferenceScreen = mock(PreferenceScreen.class);
         when(preferenceScreen.getContext()).thenReturn(mContext);
@@ -358,60 +250,118 @@
     }
 
     @Test
-    @Config(shadows = {ShadowDataUsageUtils.class, ShadowFragment.class})
-    public void clickOnWifiNetworkWith_shouldStartCaptivePortalApp() {
-        if (FeatureFlagUtils.isEnabled(mContext, FeatureFlagUtils.SETTINGS_WIFITRACKER2)) {
-            return;
-        }
+    public void onCreateContextMenu_shouldHaveForgetAndDisconnectMenuForConnectedWifiEntry() {
+        final FragmentActivity activity = mock(FragmentActivity.class);
+        when(activity.getApplicationContext()).thenReturn(mContext);
+        when(mWifiSettings.getActivity()).thenReturn(activity);
 
-        when(mWifiManager.getConfiguredNetworks()).thenReturn(createMockWifiConfigurations(
-                NUM_NETWORKS));
-        when(mWifiTracker.isConnected()).thenReturn(true);
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.canDisconnect()).thenReturn(true);
+        when(wifiEntry.canForget()).thenReturn(true);
+        when(wifiEntry.isSaved()).thenReturn(true);
+        when(wifiEntry.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
 
-        final AccessPoint accessPointActive = mock(AccessPoint.class);
-        when(accessPointActive.isActive()).thenReturn(true);
-        when(accessPointActive.isSaved()).thenReturn(false);
-        when(accessPointActive.getConfig()).thenReturn(mock(WifiConfiguration.class));
+        final LongPressWifiEntryPreference connectedWifiEntryPreference =
+                mWifiSettings.createLongPressWifiEntryPreference(wifiEntry);
+        final View view = mock(View.class);
+        when(view.getTag()).thenReturn(connectedWifiEntryPreference);
 
-        final AccessPoint accessPointInactive = mock(AccessPoint.class);
-        when(accessPointInactive.isActive()).thenReturn(false);
-        when(accessPointInactive.isSaved()).thenReturn(false);
-        when(accessPointInactive.getConfig()).thenReturn(mock(WifiConfiguration.class));
+        final ContextMenu menu = mock(ContextMenu.class);
+        mWifiSettings.onCreateContextMenu(menu, view, null /* info */);
 
-        when(mWifiTracker.getAccessPoints()).thenReturn(Arrays.asList(accessPointActive,
-                accessPointInactive));
-        when(mWifiManager.getWifiState()).thenReturn(WIFI_STATE_ENABLED);
-        when(mWifiManager.isWifiEnabled()).thenReturn(true);
+        verify(menu).add(anyInt(), eq(WifiSettings.MENU_ID_FORGET), anyInt(), anyInt());
+        verify(menu).add(anyInt(), eq(WifiSettings.MENU_ID_DISCONNECT), anyInt(), anyInt());
+    }
 
-        final Network network = mock(Network.class);
-        when(mWifiManager.getCurrentNetwork()).thenReturn(network);
+    @Test
+    public void onWifiEntriesChanged_shouldChangeNextButtonState() {
+        mWifiSettings.onWifiEntriesChanged();
 
-        // Simulate activity creation cycle
-        setUpForOnCreate();
-        ShadowDataUsageUtils.IS_WIFI_SUPPORTED = true;
-        mWifiSettings.onCreate(Bundle.EMPTY);
-        mWifiSettings.onActivityCreated(null);
-        mWifiSettings.onViewCreated(new View(mContext), new Bundle());
-        mWifiSettings.onStart();
+        verify(mWifiSettings).changeNextButtonState(anyBoolean());
+    }
 
-        // Click on open network
-        final Preference openWifiPref = new LongPressAccessPointPreference(accessPointInactive,
-                mContext, null,
-                false /* forSavedNetworks */, R.drawable.ic_wifi_signal_0,
-                null);
-        mWifiSettings.onPreferenceTreeClick(openWifiPref);
+    @Test
+    public void openSubscriptionHelpPage_shouldCallStartActivityForResult() {
+        doReturn(new Intent()).when(mWifiSettings).getHelpIntent(mContext, FAKE_URI_STRING);
+        doNothing().when(mWifiSettings).startActivityForResult(any(Intent.class), anyInt());
+        final WifiEntry mockWifiEntry = mock(WifiEntry.class);
+        when(mockWifiEntry.getHelpUriString()).thenReturn(FAKE_URI_STRING);
 
-        // Ensure connect() was called, and fake success.
-        ArgumentCaptor<WifiManager.ActionListener> wifiCallbackCaptor = ArgumentCaptor.forClass(
-                WifiManager.ActionListener.class);
-        verify(mWifiManager).connect(any(WifiConfiguration.class), wifiCallbackCaptor.capture());
-        wifiCallbackCaptor.getValue().onSuccess();
+        mWifiSettings.openSubscriptionHelpPage(mockWifiEntry);
 
-        // Simulate capability change
-        mWifiSettings.mCaptivePortalNetworkCallback.onCapabilitiesChanged(network,
-                makeCaptivePortalNetworkCapabilities());
+        verify(mWifiSettings, times(1)).startActivityForResult(any(), anyInt());
+    }
 
-        // Ensure CP was called
-        verify(mConnectivityManager).startCaptivePortalApp(eq(network));
+    @Test
+    public void onNumSavedNetworksChanged_isFinishing_ShouldNotCrash() {
+        final FragmentActivity activity = mock(FragmentActivity.class);
+        when(activity.isFinishing()).thenReturn(true);
+        when(mWifiSettings.getActivity()).thenReturn(activity);
+        when(mWifiSettings.getContext()).thenReturn(null);
+
+        mWifiSettings.onNumSavedNetworksChanged();
+    }
+
+    @Test
+    public void onNumSavedSubscriptionsChanged_isFinishing_ShouldNotCrash() {
+        final FragmentActivity activity = mock(FragmentActivity.class);
+        when(activity.isFinishing()).thenReturn(true);
+        when(mWifiSettings.getActivity()).thenReturn(activity);
+        when(mWifiSettings.getContext()).thenReturn(null);
+
+        mWifiSettings.onNumSavedSubscriptionsChanged();
+    }
+
+    @Test
+    public void onSubmit_modeModifyNoConfig_toastErrorMessage() {
+        WifiDialog2 dialog = createWifiDialog2(MODE_MODIFY, null /* config */);
+
+        mWifiSettings.onSubmit(dialog);
+
+        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
+                mContext.getString(R.string.wifi_failed_save_message));
+    }
+
+    @Test
+    public void onSubmit_modeModifyHasConfig_saveWifiManager() {
+        final WifiConfiguration config = mock(WifiConfiguration.class);
+        WifiDialog2 dialog = createWifiDialog2(MODE_MODIFY, config);
+
+        mWifiSettings.onSubmit(dialog);
+
+        verify(mWifiManager).save(eq(config), any());
+    }
+
+    @Test
+    public void onSubmit_modeConnectNoConfig_connectWifiEntry() {
+        WifiDialog2 dialog = createWifiDialog2(MODE_CONNECT, null /* config */);
+        final WifiEntry wifiEntry = dialog.getWifiEntry();
+
+        mWifiSettings.onAttach(mContext);
+        mWifiSettings.onSubmit(dialog);
+
+        verify(mWifiSettings).connect(wifiEntry, false /* editIfNoConfig */,
+                false /* fullScreenEdit*/);
+    }
+
+    @Test
+    public void onSubmit_modeConnectHasConfig_connectWifiManager() {
+        final WifiConfiguration config = mock(WifiConfiguration.class);
+        WifiDialog2 dialog = createWifiDialog2(MODE_CONNECT, config);
+
+        mWifiSettings.onSubmit(dialog);
+
+        verify(mWifiManager).connect(eq(config), any(WifiManager.ActionListener.class));
+    }
+
+    private WifiDialog2 createWifiDialog2(int mode, WifiConfiguration config) {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.canConnect()).thenReturn(true);
+        final WifiConfigController2 controller = mock(WifiConfigController2.class);
+        when(controller.getConfig()).thenReturn(config);
+        final WifiDialog2 wifiDialog2 =  spy(WifiDialog2.createModal(mContext, null /* listener */,
+                wifiEntry, mode));
+        when(wifiDialog2.getController()).thenReturn(controller);
+        return wifiDialog2;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
deleted file mode 100644
index 9de095d..0000000
--- a/tests/robotests/src/com/android/settings/wifi/WifiUtilsTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.os.Bundle;
-
-import com.android.settingslib.wifi.AccessPoint;
-
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class WifiUtilsTest {
-
-    @Test
-    public void testSSID() {
-        assertThat(WifiUtils.isSSIDTooLong("123")).isFalse();
-        assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue();
-
-        assertThat(WifiUtils.isSSIDTooShort("123")).isFalse();
-        assertThat(WifiUtils.isSSIDTooShort("")).isTrue();
-    }
-
-    @Test
-    public void testPassword() {
-        final String longPassword = "123456789012345678901234567890"
-                + "1234567890123456789012345678901234567890";
-        assertThat(WifiUtils.isHotspotPasswordValid("123")).isFalse();
-        assertThat(WifiUtils.isHotspotPasswordValid("12345678")).isTrue();
-        assertThat(WifiUtils.isHotspotPasswordValid("1234567890")).isTrue();
-        assertThat(WifiUtils.isHotspotPasswordValid(longPassword)).isFalse();
-        assertThat(WifiUtils.isHotspotPasswordValid("")).isFalse();
-    }
-
-    @Test
-    public void getWifiConfigByAccessPoint_shouldReturnCorrectConfig() {
-        String testSSID = "WifiUtilsTest";
-        Bundle bundle = new Bundle();
-        bundle.putString("key_ssid", testSSID);
-        Context context = spy(RuntimeEnvironment.application);
-        AccessPoint accessPoint = new AccessPoint(context, bundle);
-
-        WifiConfiguration config = WifiUtils.getWifiConfig(accessPoint, null, null);
-
-        assertThat(config).isNotNull();
-        assertThat(config.SSID).isEqualTo(AccessPoint.convertToQuotedString(testSSID));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void getWifiConfigWithNullInput_ThrowIllegalArgumentException() {
-        WifiConfiguration config = WifiUtils.getWifiConfig(null, null, null);
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
index 3f02e2e..24d4c47 100644
--- a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java
@@ -18,9 +18,13 @@
 
 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.anyLong;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -35,16 +39,20 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
+import com.android.settings.testutils.FakeFeatureFactory;
 import com.android.wifitrackerlib.WifiEntry;
 import com.android.wifitrackerlib.WifiPickerTracker;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.shadows.androidx.fragment.FragmentController;
 
@@ -74,26 +82,37 @@
     private ArrayList<Integer> mFakedResultArrayList = new ArrayList<>();
 
     @Mock
-    private WifiEntry mMockWifiEntry;
+    private WifiEntry mWifiEntry;
+
+    private FakeFeatureFactory mFakeFeatureFactory;
 
     @Mock
-    private WifiPickerTracker mMockWifiPickerTracker;
+    private WifiPickerTracker mWifiPickerTracker;
 
     @Mock
-    private WifiManager mMockWifiManager;
+    private WifiManager mWifiManager;
+
+    private FragmentActivity mActivity;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         mAddAppNetworksFragment = spy(new AddAppNetworksFragment());
+        mActivity = spy(Robolectric.setupActivity(FragmentActivity.class));
+        doReturn(mActivity).when(mAddAppNetworksFragment).getActivity();
+        when(mWifiManager.isWifiEnabled()).thenReturn(true);
+        when(mActivity.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
+
         mNewWpaSuggestionEntry = generateRegularWifiSuggestion(FAKE_NEW_WPA_SSID,
                 WifiConfiguration.KeyMgmt.WPA_PSK, "1234567890");
         mNewOpenSuggestionEntry = generateRegularWifiSuggestion(FAKE_NEW_OPEN_SSID,
                 WifiConfiguration.KeyMgmt.NONE, null);
         mSavedWpaConfigurationEntry = generateRegularWifiConfiguration(FAKE_NEW_SAVED_WPA_SSID,
                 WifiConfiguration.KeyMgmt.WPA_PSK, "\"1234567890\"");
-        when(mMockWifiManager.isWifiEnabled()).thenReturn(true);
-        mAddAppNetworksFragment.mWifiPickerTracker = mMockWifiPickerTracker;
+
+        mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
+
+        mAddAppNetworksFragment.mWifiPickerTracker = mWifiPickerTracker;
         setUpOneScannedNetworkWithScanedLevel4();
     }
 
@@ -213,7 +232,7 @@
     @Test
     public void withOneSuggestion_whenScanResultChanged_uiListShouldHaveNewLevel() {
         // Arrange
-        when(mMockWifiPickerTracker.getWifiState()).thenReturn(WifiManager.WIFI_STATE_ENABLED);
+        when(mWifiPickerTracker.getWifiState()).thenReturn(WifiManager.WIFI_STATE_ENABLED);
         // Setup a fake saved network list and assign to fragment.
         addOneSavedNetworkConfiguration(mSavedWpaConfigurationEntry);
         // Setup one specified networks and its results and assign to fragment.
@@ -233,7 +252,7 @@
     @Test
     public void withOneSuggestion_whenScanResultChangedButWifiOff_uiListShouldHaveZeroLevel() {
         // Arrange
-        when(mMockWifiPickerTracker.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
+        when(mWifiPickerTracker.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
         // Setup a fake saved network list and assign to fragment.
         addOneSavedNetworkConfiguration(mSavedWpaConfigurationEntry);
         // Setup one specified networks and its results and assign to fragment.
@@ -252,6 +271,9 @@
 
     @Test
     public void onDestroy_quitWorkerThread() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
         mAddAppNetworksFragment.mWorkerThread = mock(HandlerThread.class);
 
         try {
@@ -263,12 +285,182 @@
         verify(mAddAppNetworksFragment.mWorkerThread).quit();
     }
 
+    @Test
+    public void status_withOneNetworkSave_shouldShowOneNetworkSaving() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_START_SAVING_NETWORK);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.single_status);
+        assertThat(textView.getText()).isEqualTo(mAddAppNetworksFragment.getString(
+                R.string.wifi_add_app_single_network_saving_summary));
+    }
+
+    @Test
+    public void status_withTwoNetworksSave_shouldShowMultipleNetworksSaving() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_START_SAVING_NETWORK);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.app_summary);
+        assertThat(textView.getText()).isEqualTo(
+                mAddAppNetworksFragment.getString(R.string.wifi_add_app_networks_saving_summary,
+                        2));
+    }
+
+    @Test
+    public void status_withOneNetworkSaved_shouldShowOneNetworkSaved() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVED_AND_CONNECT_NETWORK);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.single_status);
+        assertThat(textView.getText()).isEqualTo(mAddAppNetworksFragment.getString(
+                R.string.wifi_add_app_single_network_saved_summary));
+    }
+
+    @Test
+    public void status_withTwoNetworksSaved_shouldShowMultipleNetworksSaved() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVED_AND_CONNECT_NETWORK);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.app_summary);
+        assertThat(textView.getText()).isEqualTo(
+                mAddAppNetworksFragment.getString(R.string.wifi_add_app_networks_saved_summary));
+    }
+
+    @Test
+    public void status_withOneNetworkSaveFailed_shouldShowOneNetworkFailed() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVE_FAILED);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.single_status);
+        assertThat(textView.getText()).isEqualTo(mAddAppNetworksFragment.getString(
+                R.string.wifi_add_app_network_save_failed_summary));
+    }
+
+    @Test
+    public void status_withTwoNetworksSaveFailed_shouldShowMultipleNetworksFailed() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.showSaveStatusByState(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVE_FAILED);
+
+        final TextView textView = (TextView) mAddAppNetworksFragment.mLayoutView.findViewById(
+                R.id.app_summary);
+        assertThat(textView.getText()).isEqualTo(mAddAppNetworksFragment.getString(
+                R.string.wifi_add_app_network_save_failed_summary));
+    }
+
+    @Test
+    public void saveOneNetwork_shouldCallWifiManagerSaveOnce() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+
+        mAddAppNetworksFragment.saveNetwork(0 /* index */);
+
+        verify(mWifiManager, times(1)).save(any(), any());
+    }
+
+    @Test
+    public void onSuccess_saveTwoNetworks_shouldCallWifiNamagerSaveTwice() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+        mAddAppNetworksFragment.saveNetwork(0 /* index */);
+
+        final ArgumentCaptor<WifiManager.ActionListener> wifiCallbackCaptor =
+                ArgumentCaptor.forClass(WifiManager.ActionListener.class);
+        verify(mWifiManager).save(any(WifiConfiguration.class), wifiCallbackCaptor.capture());
+        wifiCallbackCaptor.getValue().onSuccess();
+
+        verify(mWifiManager, times(2)).save(any(), any());
+    }
+
+    @Test
+    public void onFailedFirstOne_saveTwoNetworks_shouldAlsoCallWifiNamagerSaveTwice() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        addOneSpecifiedRegularNetworkSuggestion(mNewOpenSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+        mAddAppNetworksFragment.saveNetwork(0 /* index */);
+
+        final ArgumentCaptor<WifiManager.ActionListener> wifiCallbackCaptor =
+                ArgumentCaptor.forClass(WifiManager.ActionListener.class);
+        verify(mWifiManager).save(any(WifiConfiguration.class), wifiCallbackCaptor.capture());
+        wifiCallbackCaptor.getValue().onFailure(anyInt());
+
+        verify(mWifiManager, times(2)).save(any(), any());
+    }
+
+    @Test
+    public void saveSuccess_shouldEnterShowAndConnectState() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+        mAddAppNetworksFragment.saveNetwork(0 /* index */);
+
+        final ArgumentCaptor<WifiManager.ActionListener> wifiCallbackCaptor =
+                ArgumentCaptor.forClass(WifiManager.ActionListener.class);
+        verify(mWifiManager).save(any(WifiConfiguration.class), wifiCallbackCaptor.capture());
+        wifiCallbackCaptor.getValue().onSuccess();
+
+        assertThat(mAddAppNetworksFragment.mHandler.hasMessages(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVED_AND_CONNECT_NETWORK)).isTrue();
+    }
+
+    @Test
+    public void saveFailed_shouldEnterFailedState() {
+        addOneSpecifiedRegularNetworkSuggestion(mNewWpaSuggestionEntry);
+        setUpBundle(mFakedSpecifiedNetworksList);
+        setupFragment();
+        mAddAppNetworksFragment.saveNetwork(0 /* index */);
+
+        final ArgumentCaptor<WifiManager.ActionListener> wifiCallbackCaptor =
+                ArgumentCaptor.forClass(
+                        WifiManager.ActionListener.class);
+        verify(mWifiManager).save(any(WifiConfiguration.class), wifiCallbackCaptor.capture());
+        wifiCallbackCaptor.getValue().onFailure(1 /* reason */);
+
+        assertThat(mAddAppNetworksFragment.mHandler.hasMessages(
+                AddAppNetworksFragment.MESSAGE_SHOW_SAVE_FAILED)).isTrue();
+    }
+
     private void setUpOneScannedNetworkWithScanedLevel4() {
         final ArrayList list = new ArrayList<>();
-        list.add(mMockWifiEntry);
-        when(mMockWifiPickerTracker.getWifiEntries()).thenReturn(list);
-        when(mMockWifiEntry.getSsid()).thenReturn(FAKE_NEW_OPEN_SSID);
-        when(mMockWifiEntry.getLevel()).thenReturn(SCANED_LEVEL4);
+        list.add(mWifiEntry);
+        when(mWifiPickerTracker.getWifiEntries()).thenReturn(list);
+        when(mWifiEntry.getSsid()).thenReturn(FAKE_NEW_OPEN_SSID);
+        when(mWifiEntry.getLevel()).thenReturn(SCANED_LEVEL4);
     }
 
     private void addOneSavedNetworkConfiguration(@NonNull WifiConfiguration wifiConfiguration) {
@@ -299,6 +491,9 @@
     }
 
     private void setupFragment() {
+        when(mFakeFeatureFactory.wifiTrackerLibProvider.createWifiPickerTracker(
+                any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))
+                .thenReturn(mWifiPickerTracker);
         FragmentController.setupFragment(mAddAppNetworksFragment);
     }
 
diff --git a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
index 0b9ef55..03a63b0 100644
--- a/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/calling/WifiCallingSliceHelperTest.java
@@ -21,6 +21,7 @@
 import static android.app.slice.SliceItem.FORMAT_TEXT;
 
 import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -152,7 +153,7 @@
         mQueryImsState.setIsEnabledByUser(false);
         mQueryImsState.setIsTtyOnVolteEnabled(false);
         when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
-        mWfcSliceHelper.setActivationAppIntent(new Intent()); // dummy Intent
+        mWfcSliceHelper.setActivationAppIntent(new Intent()); // unused Intent
 
         final Slice slice  = mWfcSliceHelper.createWifiCallingSlice(
                 CustomSliceRegistry.WIFI_CALLING_URI);
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
deleted file mode 100644
index 11d5ece..0000000
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ /dev/null
@@ -1,1992 +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.wifi.details;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.inOrder;
-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.times;
-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.PackageManager;
-import android.content.res.Resources;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.CaptivePortalData;
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.IpPrefix;
-import android.net.LinkAddress;
-import android.net.LinkProperties;
-import android.net.MacAddress;
-import android.net.Network;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
-import android.net.NetworkRequest;
-import android.net.RouteInfo;
-import android.net.Uri;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Handler;
-import android.provider.Settings;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.ImageView;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.lifecycle.LifecycleOwner;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.R;
-import com.android.settings.Utils;
-import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
-import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
-import com.android.settings.widget.EntityHeaderController;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.utils.StringUtil;
-import com.android.settingslib.widget.ActionButtonsPreference;
-import com.android.settingslib.widget.LayoutPreference;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.InOrder;
-import org.mockito.Matchers;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowToast;
-
-import java.net.Inet4Address;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.time.format.FormatStyle;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.stream.Collectors;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowDevicePolicyManager.class, ShadowEntityHeaderController.class})
-public class WifiDetailPreferenceControllerTest {
-
-    private static final int LEVEL = 1;
-    private static final int RSSI = -55;
-    private static final int TX_LINK_SPEED = 123;
-    private static final int RX_LINK_SPEED = 54;
-    private static final String SSID = "ssid";
-    private static final String MAC_ADDRESS = "01:23:45:67:89:ab";
-    private static final String RANDOMIZED_MAC_ADDRESS = "RANDOMIZED_MAC_ADDRESS";
-    private static final String FACTORY_MAC_ADDRESS = "FACTORY_MAC_ADDRESS";
-    private static final String SECURITY = "None";
-    private static final String FQDN = "fqdn";
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private PreferenceScreen mockScreen;
-
-    @Mock
-    private AccessPoint mockAccessPoint;
-    @Mock
-    private FragmentActivity mockActivity;
-    @Mock
-    private ConnectivityManager mockConnectivityManager;
-    @Mock
-    private Network mockNetwork;
-    @Mock
-    private NetworkInfo mockNetworkInfo;
-    @Mock
-    private WifiConfiguration mockWifiConfig;
-    @Mock
-    private WifiInfo mockWifiInfo;
-    @Mock
-    private WifiNetworkDetailsFragment mockFragment;
-    @Mock
-    private WifiManager mockWifiManager;
-    @Mock
-    private WifiTracker mockWifiTracker;
-    @Mock
-    private MetricsFeatureProvider mockMetricsFeatureProvider;
-    @Mock
-    private WifiDetailPreferenceController.IconInjector mockIconInjector;
-    @Mock
-    private WifiDetailPreferenceController.Clock mMockClock;
-    @Mock
-    private MacAddress mockMacAddress;
-
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private EntityHeaderController mockHeaderController;
-    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
-    private LayoutPreference mockHeaderLayoutPreference;
-    @Mock
-    private ImageView mockHeaderIcon;
-
-    @Mock
-    private ActionButtonsPreference mockButtonsPref;
-    @Mock
-    private Preference mockSignalStrengthPref;
-    @Mock
-    private Preference mockTxLinkSpeedPref;
-    @Mock
-    private Preference mockRxLinkSpeedPref;
-    @Mock
-    private Preference mockFrequencyPref;
-    @Mock
-    private Preference mockSecurityPref;
-    @Mock
-    private Preference mockSsidPref;
-    @Mock
-    private Preference mockMacAddressPref;
-    @Mock
-    private Preference mockIpAddressPref;
-    @Mock
-    private Preference mockGatewayPref;
-    @Mock
-    private Preference mockSubnetPref;
-    @Mock
-    private Preference mockDnsPref;
-    @Mock
-    private PreferenceCategory mockIpv6Category;
-    @Mock
-    private Preference mockIpv6AddressesPref;
-    @Mock
-    private PackageManager mockPackageManager;
-
-    @Captor
-    private ArgumentCaptor<NetworkCallback> mCallbackCaptor;
-    @Captor
-    private ArgumentCaptor<View.OnClickListener> mForgetClickListener;
-
-    private Context mContext;
-    private Lifecycle mLifecycle;
-    private LifecycleOwner mLifecycleOwner;
-    private LinkProperties mLinkProperties;
-    private WifiDetailPreferenceController mController;
-
-    // This class exists so that these values can be made static final. They can't be static final
-    // members of the test class, because any attempt to call IpPrefix or RouteInfo constructors
-    // during static initialization of the test class results in NoSuchMethorError being thrown
-    // when the test is run.
-    private static class Constants {
-        static final int IPV4_PREFIXLEN = 25;
-        static final LinkAddress IPV4_ADDR;
-        static final Inet4Address IPV4_GATEWAY;
-        static final RouteInfo IPV4_DEFAULT;
-        static final RouteInfo IPV4_SUBNET;
-        static final LinkAddress IPV6_LINKLOCAL;
-        static final LinkAddress IPV6_GLOBAL1;
-        static final LinkAddress IPV6_GLOBAL2;
-        static final InetAddress IPV4_DNS1;
-        static final InetAddress IPV4_DNS2;
-        static final InetAddress IPV6_DNS;
-
-        private static LinkAddress ipv6LinkAddress(String addr) throws UnknownHostException {
-            return new LinkAddress(InetAddress.getByName(addr), 64);
-        }
-
-        private static LinkAddress ipv4LinkAddress(String addr, int prefixlen)
-                throws UnknownHostException {
-            return new LinkAddress(InetAddress.getByName(addr), prefixlen);
-        }
-
-        static {
-            try {
-                // We create our test constants in these roundabout ways because the robolectric
-                // shadows don't contain NetworkUtils.parseNumericAddress and other utility methods,
-                // so the easy ways to do things fail with NoSuchMethodError.
-                IPV4_ADDR = ipv4LinkAddress("192.0.2.2", IPV4_PREFIXLEN);
-                IPV4_GATEWAY = (Inet4Address) InetAddress.getByName("192.0.2.127");
-
-                final Inet4Address any4 = (Inet4Address) InetAddress.getByName("0.0.0.0");
-                IpPrefix subnet = new IpPrefix(IPV4_ADDR.getAddress(), IPV4_PREFIXLEN);
-                IPV4_SUBNET = new RouteInfo(subnet, any4);
-                IPV4_DEFAULT = new RouteInfo(new IpPrefix(any4, 0), IPV4_GATEWAY);
-
-                IPV6_LINKLOCAL = ipv6LinkAddress("fe80::211:25ff:fef8:7cb2%1");
-                IPV6_GLOBAL1 = ipv6LinkAddress("2001:db8:1::211:25ff:fef8:7cb2");
-                IPV6_GLOBAL2 = ipv6LinkAddress("2001:db8:1::3dfe:8902:f98f:739d");
-
-                IPV4_DNS1 = InetAddress.getByName("8.8.8.8");
-                IPV4_DNS2 = InetAddress.getByName("8.8.4.4");
-                IPV6_DNS = InetAddress.getByName("2001:4860:4860::64");
-            } catch (UnknownHostException e) {
-                throw new RuntimeException("Invalid hardcoded IP addresss: " + e);
-            }
-        }
-    }
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mContext = spy(RuntimeEnvironment.application);
-        mLifecycleOwner = () -> mLifecycle;
-        mLifecycle = new Lifecycle(mLifecycleOwner);
-
-        when(mContext.getPackageManager()).thenReturn(mockPackageManager);
-        when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfig);
-        when(mockAccessPoint.getLevel()).thenReturn(LEVEL);
-        when(mockAccessPoint.getSecurityString(false)).thenReturn(SECURITY);
-        when(mockAccessPoint.getSsidStr()).thenReturn(SSID);
-        when(mockConnectivityManager.getNetworkInfo(any(Network.class)))
-                .thenReturn(mockNetworkInfo);
-        doNothing().when(mockConnectivityManager).registerNetworkCallback(
-                nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
-        mockButtonsPref = createMock();
-        when(mockButtonsPref.setButton1OnClickListener(mForgetClickListener.capture()))
-                .thenReturn(mockButtonsPref);
-
-        when(mockWifiInfo.getTxLinkSpeedMbps()).thenReturn(TX_LINK_SPEED);
-        when(mockWifiInfo.getRxLinkSpeedMbps()).thenReturn(RX_LINK_SPEED);
-        when(mockWifiInfo.getRssi()).thenReturn(RSSI);
-        when(mockWifiInfo.getMacAddress()).thenReturn(MAC_ADDRESS);
-        when(mockWifiManager.getConnectionInfo()).thenReturn(mockWifiInfo);
-
-        when(mockWifiManager.getCurrentNetwork()).thenReturn(mockNetwork);
-        mLinkProperties = new LinkProperties();
-        when(mockConnectivityManager.getLinkProperties(mockNetwork)).thenReturn(mLinkProperties);
-
-        when(mockFragment.getActivity()).thenReturn(mockActivity);
-
-        ShadowEntityHeaderController.setUseMock(mockHeaderController);
-        // builder pattern
-        when(mockHeaderController.setRecyclerView(mockFragment.getListView(), mLifecycle))
-                .thenReturn(mockHeaderController);
-        when(mockHeaderController.setSummary(nullable(String.class)))
-                .thenReturn(mockHeaderController);
-        when(mockHeaderController.setSecondSummary(nullable(String.class)))
-                .thenReturn(mockHeaderController);
-        when(mockIconInjector.getIcon(anyInt())).thenReturn(new ColorDrawable());
-
-        setupMockedPreferenceScreen();
-    }
-
-    private void setUpForConnectedNetwork() {
-        when(mockAccessPoint.isActive()).thenReturn(true);
-        ArrayList list = new ArrayList<>();
-        list.add(mockAccessPoint);
-        when(mockWifiTracker.getAccessPoints()).thenReturn(list);
-        WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker);
-        when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(true);
-        when(mockAccessPoint.isReachable()).thenReturn(true);
-
-        mController = newWifiDetailPreferenceController();
-    }
-
-    private void setUpForDisconnectedNetwork() {
-        when(mockAccessPoint.isActive()).thenReturn(false);
-        ArrayList list = new ArrayList<>();
-        list.add(mockAccessPoint);
-        when(mockWifiTracker.getAccessPoints()).thenReturn(list);
-        WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker);
-        when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(true);
-        when(mockAccessPoint.isReachable()).thenReturn(true);
-
-        mController = newWifiDetailPreferenceController();
-    }
-
-    private void setUpForNotInRangeNetwork() {
-        when(mockAccessPoint.isActive()).thenReturn(false);
-        ArrayList list = new ArrayList<>();
-        list.add(mockAccessPoint);
-        when(mockWifiTracker.getAccessPoints()).thenReturn(list);
-        WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker);
-        when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(false);
-        when(mockAccessPoint.isReachable()).thenReturn(false);
-
-        mController = newWifiDetailPreferenceController();
-    }
-
-    private WifiDetailPreferenceController newWifiDetailPreferenceController() {
-        return new WifiDetailPreferenceController(
-                mockAccessPoint,
-                mockConnectivityManager,
-                mContext,
-                mockFragment,
-                null,  // Handler
-                mLifecycle,
-                mockWifiManager,
-                mockMetricsFeatureProvider,
-                mockIconInjector,
-                mMockClock);
-    }
-
-    private void setupMockedPreferenceScreen() {
-        when(mockScreen.getPreferenceManager().getContext()).thenReturn(mContext);
-
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_HEADER))
-                .thenReturn(mockHeaderLayoutPreference);
-        when(mockHeaderLayoutPreference.findViewById(R.id.entity_header_icon))
-                .thenReturn(mockHeaderIcon);
-
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_BUTTONS_PREF))
-                .thenReturn(mockButtonsPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SIGNAL_STRENGTH_PREF))
-                .thenReturn(mockSignalStrengthPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_TX_LINK_SPEED))
-                .thenReturn(mockTxLinkSpeedPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_RX_LINK_SPEED))
-                .thenReturn(mockRxLinkSpeedPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_FREQUENCY_PREF))
-                .thenReturn(mockFrequencyPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SECURITY_PREF))
-                .thenReturn(mockSecurityPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SSID_PREF))
-                .thenReturn(mockSsidPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_MAC_ADDRESS_PREF))
-                .thenReturn(mockMacAddressPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IP_ADDRESS_PREF))
-                .thenReturn(mockIpAddressPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_GATEWAY_PREF))
-                .thenReturn(mockGatewayPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SUBNET_MASK_PREF))
-                .thenReturn(mockSubnetPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_DNS_PREF))
-                .thenReturn(mockDnsPref);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IPV6_CATEGORY))
-                .thenReturn(mockIpv6Category);
-        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IPV6_ADDRESSES_PREF))
-                .thenReturn(mockIpv6AddressesPref);
-    }
-
-    private void displayAndResume() {
-        mController.displayPreference(mockScreen);
-        mController.onResume();
-    }
-
-    @Test
-    public void isAvailable_shouldAlwaysReturnTrue() {
-        setUpForConnectedNetwork();
-        mController.displayPreference(mockScreen);
-
-        assertThat(mController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void securityPreference_stringShouldBeSet() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        verify(mockSecurityPref).setSummary(SECURITY);
-    }
-
-    @Test
-    public void latestWifiInfo_shouldBeFetchedInDisplayPreferenceForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-    }
-
-    @Test
-    public void latestWifiInfo_shouldNotBeFetchedInDisplayPreferenceForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockWifiManager, never()).getConnectionInfo();
-    }
-
-    @Test
-    public void latestWifiInfo_shouldNotBeFetchedInDisplayPreferenceForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockWifiManager, never()).getConnectionInfo();
-    }
-
-    @Test
-    public void latestNetworkInfo_shouldBeFetchedInDisplayPreferenceForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-    }
-
-    @Test
-    public void latestNetworkInfo_shouldNotBeFetchedInDisplayPreferenceForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, never()).getNetworkInfo(any(Network.class));
-    }
-
-    @Test
-    public void latestNetworkInfo_shouldNotBeFetchedInDisplayPreferenceForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, never()).getNetworkInfo(any(Network.class));
-    }
-
-    @Test
-    public void networkCallback_shouldBeRegisteredOnResume() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).registerNetworkCallback(
-                nullable(NetworkRequest.class), mCallbackCaptor.capture(), nullable(Handler.class));
-    }
-
-    @Test
-    public void networkCallback_shouldBeUnregisteredOnPause() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-        mController.onPause();
-
-        verify(mockConnectivityManager, times(1))
-                .unregisterNetworkCallback(mCallbackCaptor.getValue());
-    }
-
-    @Test
-    public void entityHeader_shouldHaveIconSetForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        Drawable expectedIcon = mockIconInjector.getIcon(LEVEL);
-
-        displayAndResume();
-
-        verify(mockHeaderController).setIcon(expectedIcon);
-    }
-
-    @Test
-    public void entityHeader_shouldHaveIconSetForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        Drawable expectedIcon = mockIconInjector.getIcon(LEVEL);
-
-        displayAndResume();
-
-        verify(mockHeaderController).setIcon(expectedIcon);
-    }
-
-    @Test
-    public void entityHeader_shouldNotHaveIconSetForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockHeaderController, never()).setIcon(any(Drawable.class));
-    }
-
-    @Test
-    public void entityHeader_shouldHaveLabelSetToTitle() {
-        setUpForConnectedNetwork();
-        String label = "title";
-        when(mockAccessPoint.getTitle()).thenReturn(label);
-
-        displayAndResume();
-
-        verify(mockHeaderController).setLabel(label);
-    }
-
-    @Test
-    public void entityHeader_shouldHaveSummarySet() {
-        setUpForConnectedNetwork();
-        String summary = "summary";
-        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
-                .thenReturn(summary);
-
-        displayAndResume();
-
-        verify(mockHeaderController).setSummary(summary);
-    }
-
-    private void doShouldShowRemainingTimeTest(ZonedDateTime now, long timeRemainingMs) {
-        when(mMockClock.now()).thenReturn(now);
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        final CaptivePortalData data = new CaptivePortalData.Builder()
-                .setExpiryTime(now.toInstant().getEpochSecond() * 1000 + timeRemainingMs)
-                .build();
-        final LinkProperties lp = new LinkProperties();
-        lp.setCaptivePortalData(data);
-
-        updateLinkProperties(lp);
-    }
-
-    @Test
-    public void entityHeader_shouldShowShortRemainingTime() {
-        // Expires in 1h, 2min, 15sec
-        final long timeRemainingMs = (3600 + 2 * 60 + 15) * 1000;
-        final ZonedDateTime fakeNow = ZonedDateTime.of(2020, 1, 2, 3, 4, 5, 6,
-                ZoneId.of("Europe/London"));
-        doShouldShowRemainingTimeTest(fakeNow, timeRemainingMs);
-        final String expectedSummary = mContext.getString(R.string.wifi_time_remaining,
-                StringUtil.formatElapsedTime(mContext, timeRemainingMs, false /* withSeconds */));
-        final InOrder inOrder = inOrder(mockHeaderController);
-        inOrder.verify(mockHeaderController).setSecondSummary(expectedSummary);
-
-        updateLinkProperties(new LinkProperties());
-        inOrder.verify(mockHeaderController).setSecondSummary((String) null);
-    }
-
-    @Test
-    public void entityHeader_shouldShowExpiryDate() {
-        // Expires in 49h, 2min, 15sec
-        final long timeRemainingMs = (49 * 3600 + 2 * 60 + 15) * 1000;
-        final ZonedDateTime fakeNow = ZonedDateTime.of(2020, 1, 2, 3, 4, 5, 6,
-                ZoneId.of("Europe/London"));
-        doShouldShowRemainingTimeTest(fakeNow, timeRemainingMs);
-        final String expectedSummary = mContext.getString(
-                R.string.wifi_expiry_time,
-                DateTimeFormatter.ofLocalizedDateTime(FormatStyle.SHORT).format(
-                        fakeNow.plusNanos(timeRemainingMs * 1_000_000)));
-        final InOrder inOrder = inOrder(mockHeaderController);
-        inOrder.verify(mockHeaderController).setSecondSummary(expectedSummary);
-
-        updateLinkProperties(new LinkProperties());
-        inOrder.verify(mockHeaderController).setSecondSummary((String) null);
-    }
-
-    @Test
-    public void entityHeader_shouldConvertSavedAsDisconnected() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockAccessPoint, times(1)).getSettingsSummary(true /*convertSavedAsDisconnected*/);
-    }
-
-    @Test
-    public void signalStrengthPref_shouldHaveIconSetForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref).setIcon(any(Drawable.class));
-    }
-
-    @Test
-    public void signalStrengthPref_shouldHaveIconSetForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref).setIcon(any(Drawable.class));
-    }
-
-    @Test
-    public void signalStrengthPref_shouldNotHaveIconSetForOutOfRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref, never()).setIcon(any(Drawable.class));
-    }
-
-    @Test
-    public void signalStrengthPref_shouldHaveDetailTextSetForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        String expectedStrength =
-                mContext.getResources().getStringArray(R.array.wifi_signal)[LEVEL];
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref).setSummary(expectedStrength);
-    }
-
-    @Test
-    public void signalStrengthPref_shouldHaveDetailTextSetForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        String expectedStrength =
-                mContext.getResources().getStringArray(R.array.wifi_signal)[LEVEL];
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref).setSummary(expectedStrength);
-    }
-
-    @Test
-    public void signalStrengthPref_shouldNotHaveDetailTextSetForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockSignalStrengthPref, never()).setSummary(any(String.class));
-    }
-
-    @Test
-    public void linkSpeedPref_shouldNotShowIfNotSet() {
-        setUpForConnectedNetwork();
-        when(mockWifiInfo.getTxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN);
-
-        displayAndResume();
-
-        verify(mockTxLinkSpeedPref).setVisible(false);
-    }
-
-    @Test
-    public void linkSpeedPref_shouldVisibleForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        String expectedLinkSpeed = mContext.getString(R.string.tx_link_speed, TX_LINK_SPEED);
-
-        displayAndResume();
-
-        verify(mockTxLinkSpeedPref).setVisible(true);
-        verify(mockTxLinkSpeedPref).setSummary(expectedLinkSpeed);
-    }
-
-    @Test
-    public void linkSpeedPref_shouldInvisibleForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockTxLinkSpeedPref).setVisible(false);
-        verify(mockTxLinkSpeedPref, never()).setSummary(any(String.class));
-    }
-
-    @Test
-    public void linkSpeedPref_shouldInvisibleForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockTxLinkSpeedPref).setVisible(false);
-        verify(mockTxLinkSpeedPref, never()).setSummary(any(String.class));
-    }
-
-    @Test
-    public void rxLinkSpeedPref_shouldNotShowIfNotSet() {
-        setUpForConnectedNetwork();
-        when(mockWifiInfo.getRxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN);
-
-        displayAndResume();
-
-        verify(mockRxLinkSpeedPref).setVisible(false);
-    }
-
-    @Test
-    public void rxLinkSpeedPref_shouldVisibleForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        String expectedLinkSpeed = mContext.getString(R.string.rx_link_speed, RX_LINK_SPEED);
-
-        displayAndResume();
-
-        verify(mockRxLinkSpeedPref).setVisible(true);
-        verify(mockRxLinkSpeedPref).setSummary(expectedLinkSpeed);
-    }
-
-    @Test
-    public void rxLinkSpeedPref_shouldInvisibleForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockRxLinkSpeedPref).setVisible(false);
-        verify(mockRxLinkSpeedPref, never()).setSummary(any(String.class));
-    }
-
-    @Test
-    public void rxLinkSpeedPref_shouldInvisibleForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        verify(mockRxLinkSpeedPref).setVisible(false);
-        verify(mockRxLinkSpeedPref, never()).setSummary(any(String.class));
-    }
-
-    @Test
-    public void ssidPref_shouldHaveDetailTextSetForPasspointR1() {
-        setUpForConnectedNetwork();
-        when(mockAccessPoint.isPasspoint()).thenReturn(true);
-        when(mockAccessPoint.isOsuProvider()).thenReturn(false);
-
-        displayAndResume();
-
-        verify(mockSsidPref, times(1)).setSummary(SSID);
-        verify(mockSsidPref, times(1)).setVisible(true);
-    }
-
-    @Test
-    public void ssidPref_shouldHaveDetailTextSetForPasspointR2() {
-        setUpForConnectedNetwork();
-        when(mockAccessPoint.isPasspoint()).thenReturn(false);
-        when(mockAccessPoint.isOsuProvider()).thenReturn(true);
-
-        displayAndResume();
-
-        verify(mockSsidPref, times(1)).setSummary(SSID);
-        verify(mockSsidPref, times(1)).setVisible(true);
-    }
-
-    @Test
-    public void ssidPref_shouldNotShowIfNotPasspoint() {
-        setUpForConnectedNetwork();
-        when(mockAccessPoint.isPasspoint()).thenReturn(false);
-        when(mockAccessPoint.isOsuProvider()).thenReturn(false);
-
-        displayAndResume();
-
-        verify(mockSsidPref).setVisible(false);
-    }
-
-    @Test
-    public void macAddressPref_shouldVisibleForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockMacAddressPref).setVisible(true);
-        verify(mockMacAddressPref).setSummary(MAC_ADDRESS);
-    }
-
-    @Test
-    public void macAddressPref_shouldVisibleAsRandomizedForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        mockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_PERSISTENT;
-        when(mockWifiConfig.getRandomizedMacAddress()).thenReturn(mockMacAddress);
-        when(mockMacAddress.toString()).thenReturn(RANDOMIZED_MAC_ADDRESS);
-
-        displayAndResume();
-
-        verify(mockMacAddressPref).setVisible(true);
-        verify(mockMacAddressPref).setSummary(RANDOMIZED_MAC_ADDRESS);
-    }
-
-    @Test
-    public void macAddressPref_shouldVisibleAsFactoryForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        mockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_NONE;
-        when(mockWifiManager.getFactoryMacAddresses())
-                .thenReturn(new String[]{FACTORY_MAC_ADDRESS});
-
-        displayAndResume();
-
-        verify(mockMacAddressPref).setVisible(true);
-        verify(mockMacAddressPref).setSummary(FACTORY_MAC_ADDRESS);
-    }
-
-    @Test
-    public void ipAddressPref_shouldHaveDetailTextSetForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        mLinkProperties.addLinkAddress(Constants.IPV4_ADDR);
-
-        displayAndResume();
-
-        verify(mockIpAddressPref).setSummary(Constants.IPV4_ADDR.getAddress().getHostAddress());
-        verify(mockIpAddressPref).setVisible(true);
-    }
-
-    @Test
-    public void ipAddressPref_shouldInvisibleForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockIpAddressPref).setVisible(false);
-    }
-
-    @Test
-    public void gatewayAndSubnet_shouldHaveDetailTextSetForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        mLinkProperties.addLinkAddress(Constants.IPV4_ADDR);
-        mLinkProperties.addRoute(Constants.IPV4_DEFAULT);
-        mLinkProperties.addRoute(Constants.IPV4_SUBNET);
-
-        displayAndResume();
-
-        verify(mockSubnetPref).setSummary("255.255.255.128");
-        verify(mockGatewayPref).setSummary("192.0.2.127");
-        verify(mockSubnetPref).setVisible(true);
-    }
-
-    @Test
-    public void gatewayAndSubnet_shouldInvisibleSetForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockSubnetPref).setVisible(false);
-    }
-
-    @Test
-    public void dnsServersPref_shouldHaveDetailTextSetForConnectedNetwork()
-            throws UnknownHostException {
-        setUpForConnectedNetwork();
-        mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[] {8, 8, 4, 4}));
-        mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[] {8, 8, 8, 8}));
-        mLinkProperties.addDnsServer(Constants.IPV6_DNS);
-
-        displayAndResume();
-
-        verify(mockDnsPref).setSummary(
-                "8.8.4.4\n" +
-                        "8.8.8.8\n" +
-                        Constants.IPV6_DNS.getHostAddress());
-        verify(mockDnsPref).setVisible(true);
-    }
-
-    @Test
-    public void dnsServersPref_shouldInvisibleSetForDisconnectedNetwork()
-            throws UnknownHostException {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockDnsPref).setVisible(false);
-    }
-
-    @Test
-    public void noCurrentNetwork_shouldNotFinishActivityForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        when(mockWifiManager.getCurrentNetwork()).thenReturn(null);
-
-        displayAndResume();
-
-        verify(mockActivity, never()).finish();
-    }
-
-    @Test
-    public void noLinkProperties_allIpDetailsHidden() {
-        setUpForConnectedNetwork();
-        when(mockConnectivityManager.getLinkProperties(mockNetwork)).thenReturn(null);
-        reset(mockIpv6Category, mockIpAddressPref, mockSubnetPref, mockGatewayPref, mockDnsPref);
-
-        displayAndResume();
-
-        verify(mockIpv6Category).setVisible(false);
-        verify(mockIpAddressPref).setVisible(false);
-        verify(mockSubnetPref).setVisible(false);
-        verify(mockGatewayPref).setVisible(false);
-        verify(mockDnsPref).setVisible(false);
-        verify(mockIpv6Category, never()).setVisible(true);
-        verify(mockIpAddressPref, never()).setVisible(true);
-        verify(mockSubnetPref, never()).setVisible(true);
-        verify(mockGatewayPref, never()).setVisible(true);
-        verify(mockDnsPref, never()).setVisible(true);
-    }
-
-    @Test
-    public void disconnectedNetwork_allIpDetailsHidden() {
-        setUpForDisconnectedNetwork();
-        reset(mockIpv6Category, mockIpAddressPref, mockSubnetPref, mockGatewayPref, mockDnsPref);
-
-        displayAndResume();
-
-        verify(mockIpv6Category).setVisible(false);
-        verify(mockIpAddressPref).setVisible(false);
-        verify(mockSubnetPref).setVisible(false);
-        verify(mockGatewayPref).setVisible(false);
-        verify(mockDnsPref).setVisible(false);
-        verify(mockIpv6Category, never()).setVisible(true);
-        verify(mockIpAddressPref, never()).setVisible(true);
-        verify(mockSubnetPref, never()).setVisible(true);
-        verify(mockGatewayPref, never()).setVisible(true);
-        verify(mockDnsPref, never()).setVisible(true);
-    }
-
-    // Convenience method to convert a LinkAddress to a string without a prefix length.
-    private String asString(LinkAddress l) {
-        return l.getAddress().getHostAddress();
-    }
-
-    // Pretend that the NetworkCallback was triggered with a new copy of lp. We need to create a
-    // new copy because the code only updates if !mLinkProperties.equals(lp).
-    private void updateLinkProperties(LinkProperties lp) {
-        mCallbackCaptor.getValue().onLinkPropertiesChanged(mockNetwork, new LinkProperties(lp));
-    }
-
-    private void updateNetworkCapabilities(NetworkCapabilities nc) {
-        mCallbackCaptor.getValue().onCapabilitiesChanged(mockNetwork, new NetworkCapabilities(nc));
-    }
-
-    private NetworkCapabilities makeNetworkCapabilities() {
-        NetworkCapabilities nc = new NetworkCapabilities();
-        nc.clearAll();
-        nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
-        return nc;
-    }
-
-    private void verifyDisplayedIpv6Addresses(InOrder inOrder, LinkAddress... addresses) {
-        String text = Arrays.stream(addresses)
-                .map(address -> asString(address))
-                .collect(Collectors.joining("\n"));
-        inOrder.verify(mockIpv6AddressesPref).setSummary(text);
-    }
-
-    @Test
-    public void onLinkPropertiesChanged_updatesFields() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        InOrder inOrder = inOrder(mockIpAddressPref, mockGatewayPref, mockSubnetPref,
-                mockDnsPref, mockIpv6Category, mockIpv6AddressesPref);
-
-        LinkProperties lp = new LinkProperties();
-
-        lp.addLinkAddress(Constants.IPV6_LINKLOCAL);
-        updateLinkProperties(lp);
-        verifyDisplayedIpv6Addresses(inOrder, Constants.IPV6_LINKLOCAL);
-        inOrder.verify(mockIpv6Category).setVisible(true);
-
-        lp.addRoute(Constants.IPV4_DEFAULT);
-        updateLinkProperties(lp);
-        inOrder.verify(mockGatewayPref).setSummary(Constants.IPV4_GATEWAY.getHostAddress());
-        inOrder.verify(mockGatewayPref).setVisible(true);
-
-        lp.addLinkAddress(Constants.IPV4_ADDR);
-        lp.addRoute(Constants.IPV4_SUBNET);
-        updateLinkProperties(lp);
-        inOrder.verify(mockIpAddressPref).setSummary(asString(Constants.IPV4_ADDR));
-        inOrder.verify(mockIpAddressPref).setVisible(true);
-        inOrder.verify(mockSubnetPref).setSummary("255.255.255.128");
-        inOrder.verify(mockSubnetPref).setVisible(true);
-
-        lp.addLinkAddress(Constants.IPV6_GLOBAL1);
-        lp.addLinkAddress(Constants.IPV6_GLOBAL2);
-        updateLinkProperties(lp);
-        verifyDisplayedIpv6Addresses(inOrder,
-                Constants.IPV6_LINKLOCAL,
-                Constants.IPV6_GLOBAL1,
-                Constants.IPV6_GLOBAL2);
-
-        lp.removeLinkAddress(Constants.IPV6_GLOBAL1);
-        updateLinkProperties(lp);
-        verifyDisplayedIpv6Addresses(inOrder,
-                Constants.IPV6_LINKLOCAL,
-                Constants.IPV6_GLOBAL2);
-
-        lp.addDnsServer(Constants.IPV6_DNS);
-        updateLinkProperties(lp);
-        inOrder.verify(mockDnsPref).setSummary(Constants.IPV6_DNS.getHostAddress());
-        inOrder.verify(mockDnsPref).setVisible(true);
-
-        lp.addDnsServer(Constants.IPV4_DNS1);
-        lp.addDnsServer(Constants.IPV4_DNS2);
-        updateLinkProperties(lp);
-        inOrder.verify(mockDnsPref).setSummary(
-                Constants.IPV6_DNS.getHostAddress() + "\n" +
-                        Constants.IPV4_DNS1.getHostAddress() + "\n" +
-                        Constants.IPV4_DNS2.getHostAddress());
-        inOrder.verify(mockDnsPref).setVisible(true);
-    }
-
-    @Test
-    public void onCapabilitiesChanged_callsRefreshIfNecessary() {
-        setUpForConnectedNetwork();
-        NetworkCapabilities nc = makeNetworkCapabilities();
-        when(mockConnectivityManager.getNetworkCapabilities(mockNetwork))
-                .thenReturn(new NetworkCapabilities(nc));
-
-        String summary = "Connected, no Internet";
-        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
-                .thenReturn(summary);
-
-        InOrder inOrder = inOrder(mockHeaderController);
-        displayAndResume();
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        // Check that an irrelevant capability update does not update the access point summary, as
-        // doing so could cause unnecessary jank...
-        summary = "Connected";
-        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
-                .thenReturn(summary);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController, never()).setSummary(any(CharSequence.class));
-
-        // ... but that if the network validates, then we do refresh.
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        summary = "Connected, no Internet";
-        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
-                .thenReturn(summary);
-
-        // Another irrelevant update won't cause the UI to refresh...
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController, never()).setSummary(any(CharSequence.class));
-
-        // ... but if the network is no longer validated, then we display "connected, no Internet".
-        nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        // UI will be refreshed when private DNS is broken.
-        summary = "Private DNS server cannot be accessed";
-        when(mockAccessPoint.getSettingsSummary(true /* convertSavedAsDisconnected */))
-                .thenReturn(summary);
-        nc.setPrivateDnsBroken(true);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        // UI will be refreshed when device connects to a partial connectivity network.
-        summary = "Limited connection";
-        when(mockAccessPoint.getSettingsSummary(true /*convertSavedAsDisconnected*/))
-                .thenReturn(summary);
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_PARTIAL_CONNECTIVITY);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-
-        // Although UI will be refreshed when network become validated. The Settings should
-        // continue to display "Limited connection" if network still provides partial connectivity.
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockHeaderController).setSummary(summary);
-    }
-
-    @Test
-    public void canForgetNetwork_shouldInvisibleIfWithoutConfiguration() {
-        setUpForConnectedNetwork();
-        when(mockAccessPoint.getConfig()).thenReturn(null);
-        mController = newWifiDetailPreferenceController();
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setButton1Visible(false);
-    }
-
-    @Test
-    public void canForgetNetwork_ephemeral() {
-        setUpForConnectedNetwork();
-        when(mockWifiInfo.isEphemeral()).thenReturn(true);
-        when(mockAccessPoint.getConfig()).thenReturn(null);
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setButton1Visible(true);
-    }
-
-    @Test
-    public void canForgetNetwork_saved() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        verify(mockButtonsPref).setButton1Visible(true);
-    }
-
-    @Test
-    public void canForgetNetwork_lockedDown() {
-        setUpForConnectedNetwork();
-        lockDownNetwork();
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setButton1Visible(false);
-    }
-
-    @Test
-    public void canShareNetwork_shouldInvisibleIfWithoutConfiguration() {
-        setUpForConnectedNetwork();
-        when(mockAccessPoint.getConfig()).thenReturn(null);
-
-        displayAndResume();
-
-        verify(mockButtonsPref).setButton4Visible(false);
-    }
-
-    @Test
-    public void canModifyNetwork_saved() {
-        setUpForConnectedNetwork();
-        assertThat(mController.canModifyNetwork()).isTrue();
-    }
-
-    @Test
-    public void canModifyNetwork_lockedDown() {
-        setUpForConnectedNetwork();
-        lockDownNetwork();
-
-        assertThat(mController.canModifyNetwork()).isFalse();
-    }
-
-    /**
-     * Pretends that current network is locked down by device owner.
-     */
-    private void lockDownNetwork() {
-        final int doUserId = 123;
-        final int doUid = 1234;
-        String doPackage = "some.package";
-
-        mockWifiConfig.creatorUid = doUid;
-        ComponentName doComponent = new ComponentName(doPackage, "some.Class");
-        try {
-            when(mockPackageManager.getPackageUidAsUser(Matchers.anyString(), Matchers.anyInt()))
-                    .thenReturn(doUid);
-        } catch (PackageManager.NameNotFoundException e) {
-            //do nothing
-        }
-        ShadowDevicePolicyManager.getShadow().setDeviceOwnerComponentOnAnyUser(doComponent);
-        ShadowDevicePolicyManager.getShadow().setDeviceOwnerUserId(doUserId);
-
-        Settings.Global.putInt(mContext.getContentResolver(),
-                Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN, 1);
-    }
-
-    @Test
-    public void forgetNetwork_ephemeral() {
-        setUpForConnectedNetwork();
-        String ssid = "ssid";
-        when(mockWifiInfo.isEphemeral()).thenReturn(true);
-        when(mockWifiInfo.getSSID()).thenReturn(ssid);
-
-        displayAndResume();
-        mForgetClickListener.getValue().onClick(null);
-
-        verify(mockWifiManager).disableEphemeralNetwork(ssid);
-        verify(mockMetricsFeatureProvider)
-                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
-    }
-
-    @Test
-    public void forgetNetwork_saved() {
-        setUpForConnectedNetwork();
-        mockWifiConfig.networkId = 5;
-
-        mController.displayPreference(mockScreen);
-        mForgetClickListener.getValue().onClick(null);
-
-        verify(mockWifiManager).forget(mockWifiConfig.networkId, null);
-        verify(mockMetricsFeatureProvider)
-                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
-    }
-
-    @Test
-    public void forgetNetwork_shouldShowDialog() {
-        setUpForConnectedNetwork();
-        final WifiDetailPreferenceController spyController = spy(mController);
-
-        mockWifiConfig.networkId = 5;
-        when(mockAccessPoint.isPasspoint()).thenReturn(true);
-        when(mockAccessPoint.getPasspointFqdn()).thenReturn(FQDN);
-        spyController.displayPreference(mockScreen);
-
-        mForgetClickListener.getValue().onClick(null);
-
-        verify(mockWifiManager, times(0)).removePasspointConfiguration(FQDN);
-        verify(mockMetricsFeatureProvider, times(0))
-                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
-        verify(spyController).showConfirmForgetDialog();
-    }
-
-    @Test
-    public void networkStateChangedIntent_shouldRefetchInfo() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-
-        mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
-
-        verify(mockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(2)).getConnectionInfo();
-    }
-
-    @Test
-    public void networkStateChangedIntent_shouldRefetchInfoForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-
-        mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
-
-        verify(mockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(2)).getConnectionInfo();
-    }
-
-    @Test
-    public void rssiChangedIntent_shouldRefetchInfo() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-        verify(mockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(2)).getConnectionInfo();
-    }
-
-    @Test
-    public void rssiChangedIntent_shouldRefetchInfoForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(1)).getConnectionInfo();
-
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-        verify(mockConnectivityManager, times(2)).getNetworkInfo(any(Network.class));
-        verify(mockWifiManager, times(2)).getConnectionInfo();
-    }
-
-    @Test
-    public void networkDisconnectedState_shouldNotFinishActivityForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        when(mockConnectivityManager.getNetworkInfo(any(Network.class))).thenReturn(null);
-        mContext.sendBroadcast(new Intent(WifiManager.NETWORK_STATE_CHANGED_ACTION));
-
-        verify(mockActivity, never()).finish();
-    }
-
-    @Test
-    public void networkOnLost_shouldNotFinishActivityForConnectedNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        mCallbackCaptor.getValue().onLost(mockNetwork);
-
-        verify(mockActivity, never()).finish();
-    }
-
-    @Test
-    public void ipv6AddressPref_shouldHaveHostAddressTextSet() {
-        setUpForConnectedNetwork();
-        mLinkProperties.addLinkAddress(Constants.IPV6_LINKLOCAL);
-        mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL1);
-        mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL2);
-
-        displayAndResume();
-
-        String expectedAddresses = String.join("\n",
-                asString(Constants.IPV6_LINKLOCAL),
-                asString(Constants.IPV6_GLOBAL1),
-                asString(Constants.IPV6_GLOBAL2));
-
-        verify(mockIpv6AddressesPref).setSummary(expectedAddresses);
-    }
-
-    @Test
-    public void ipv6AddressPref_shouldNotBeSelectable() {
-        setUpForConnectedNetwork();
-        mLinkProperties.addLinkAddress(Constants.IPV6_GLOBAL2);
-
-        displayAndResume();
-
-        assertThat(mockIpv6AddressesPref.isSelectable()).isFalse();
-    }
-
-    @Test
-    public void captivePortal_shouldShowSignInButton() {
-        setUpForConnectedNetwork();
-
-        InOrder inOrder = inOrder(mockButtonsPref);
-
-        displayAndResume();
-
-        inOrder.verify(mockButtonsPref).setButton2Visible(false);
-
-        NetworkCapabilities nc = makeNetworkCapabilities();
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockButtonsPref).setButton2Visible(false);
-
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        updateNetworkCapabilities(nc);
-
-        inOrder.verify(mockButtonsPref).setButton2Text(R.string.wifi_sign_in_button_text);
-        inOrder.verify(mockButtonsPref).setButton2Visible(true);
-
-        nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        updateNetworkCapabilities(nc);
-        inOrder.verify(mockButtonsPref).setButton2Visible(false);
-    }
-
-    @Test
-    public void captivePortal_shouldShowVenueInfoButton() {
-        setUpForConnectedNetwork();
-
-        InOrder inOrder = inOrder(mockButtonsPref);
-
-        displayAndResume();
-
-        inOrder.verify(mockButtonsPref).setButton2Visible(false);
-
-        LinkProperties lp = new LinkProperties();
-        final CaptivePortalData data = new CaptivePortalData.Builder()
-                .setVenueInfoUrl(Uri.parse("https://example.com/info"))
-                .build();
-        lp.setCaptivePortalData(data);
-        updateLinkProperties(lp);
-
-        inOrder.verify(mockButtonsPref).setButton2Text(R.string.wifi_venue_website_button_text);
-        inOrder.verify(mockButtonsPref).setButton2Visible(true);
-
-        lp.setCaptivePortalData(null);
-        updateLinkProperties(lp);
-        inOrder.verify(mockButtonsPref).setButton2Visible(false);
-    }
-
-    @Test
-    public void testSignInButton_shouldStartCaptivePortalApp() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        ArgumentCaptor<OnClickListener> captor = ArgumentCaptor.forClass(OnClickListener.class);
-        verify(mockButtonsPref, atLeastOnce()).setButton2OnClickListener(captor.capture());
-        // getValue() returns the last captured value
-        captor.getValue().onClick(null);
-        verify(mockConnectivityManager).startCaptivePortalApp(mockNetwork);
-        verify(mockMetricsFeatureProvider)
-                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_SIGNIN);
-    }
-
-    @Test
-    public void testSignInButton_shouldHideSignInButtonForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        NetworkCapabilities nc = makeNetworkCapabilities();
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        when(mockConnectivityManager.getNetworkCapabilities(mockNetwork))
-                .thenReturn(new NetworkCapabilities(nc));
-
-        // verify onResume
-        displayAndResume();
-
-        verify(mockButtonsPref, never()).setButton2Visible(true);
-        verify(mockButtonsPref).setButton2Visible(false);
-
-        // verify onCapabilitiesChanged
-        updateNetworkCapabilities(nc);
-
-        verify(mockButtonsPref, never()).setButton2Visible(true);
-        verify(mockButtonsPref).setButton2Visible(false);
-    }
-
-    @Test
-    public void testConnectButton_shouldInvisibleForConnectNetwork() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockButtonsPref, times(1)).setButton3Visible(false);
-    }
-
-    @Test
-    public void testConnectButton_shouldVisibleForDisconnectNetwork() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        verify(mockButtonsPref, times(1)).setButton3Text(R.string.wifi_connect);
-    }
-
-    private void setUpForToast() {
-        Resources res = mContext.getResources();
-        when(mockActivity.getResources()).thenReturn(res);
-    }
-
-    @Test
-    public void testConnectButton_clickConnect_displayAsSuccess() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(true);
-        InOrder inOrder = inOrder(mockButtonsPref);
-        String label = "title";
-        when(mockAccessPoint.getTitle()).thenReturn(label);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check display button as connecting
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as connected
-        when(mockAccessPoint.isActive()).thenReturn(true);
-        mController.updateAccessPoint();
-
-        // check connect button invisible, be init as default state and toast success message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(false);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_connected_to_message, label));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectButFailed_displayFailMessage() {
-        setUpForDisconnectedNetwork();
-        ArgumentCaptor<WifiManager.ActionListener> connectListenerCaptor =
-                ArgumentCaptor.forClass(WifiManager.ActionListener.class);
-        when(mockWifiManager.isWifiEnabled()).thenReturn(true);
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check display button as connecting
-        verify(mockWifiManager, times(1)).connect(anyInt(), connectListenerCaptor.capture());
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as failed
-        connectListenerCaptor.getValue().onFailure(-1);
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_failed_connect_message));
-    }
-
-    private void verifyConnectBtnSetUpAsVisible(InOrder inOrder) {
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Text(R.string.wifi_connect);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Icon(R.drawable.ic_settings_wireless);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-    }
-
-    private void verifyConnectBtnSetUpAsConnecting(InOrder inOrder) {
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Text(R.string.wifi_connecting);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Enabled(false);
-    }
-
-    private void verifyConnectBtnBeInitAsDefault(InOrder inOrder) {
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Text(R.string.wifi_connect);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Icon(R.drawable.ic_settings_wireless);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Enabled(true);
-    }
-
-    @Test
-    public void testConnectButton_clickConnectButTimeout_displayFailMessage() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(true);
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check display button as connecting
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as failed
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_failed_connect_message));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectButTimeout_displayNotInRangeMessage() {
-        setUpForNotInRangeNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(true);
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check display button as connecting
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as failed
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_not_in_range_message));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectWhenWiFiDisabled_displaySuccessMessage() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled
-        InOrder inOrder = inOrder(mockButtonsPref);
-        String label = "title";
-        when(mockAccessPoint.getTitle()).thenReturn(label);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check turn on Wi-Fi, display button as connecting and toast turn on Wi-Fi message
-        verify(mockWifiManager, times(1)).setWifiEnabled(true);
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_turned_on_message));
-
-        // notify Wi-Fi enabled
-        mController.mWifiListener.onWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
-
-        // check had connect network and icon display as expected
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as connected
-        when(mockAccessPoint.isActive()).thenReturn(true);
-        mController.updateAccessPoint();
-
-        // check connect button invisible, be init as default state and toast success message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(false);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_connected_to_message, label));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectWhenWiFiDisabled_failedToConnectWiFi() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check turn on Wi-Fi, display button as connecting and toast turn on Wi-Fi message
-        verify(mockWifiManager, times(1)).setWifiEnabled(true);
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_turned_on_message));
-
-        // notify Wi-Fi enabled
-        mController.mWifiListener.onWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
-
-        // check had connect network and icon display as expected
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as failed
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_failed_connect_message));
-    }
-
-    @Test
-    public void
-            testConnectButton_clickConnectWhenWiFiDisabled_failedToConnectWifiBecauseNotInRange() {
-        setUpForNotInRangeNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check turn on Wi-Fi, display button as connecting and toast turn on Wi-Fi message
-        verify(mockWifiManager, times(1)).setWifiEnabled(true);
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_turned_on_message));
-
-        // notify Wi-Fi enabled
-        mController.mWifiListener.onWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
-
-        // check had connect network and icon display as expected
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // update as failed
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_not_in_range_message));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectWhenWiFiDisabled_failedToEnableWifi() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(false); // wifi disabled
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check turn on Wi-Fi, display button as connecting and toast turn on Wi-Fi message
-        verify(mockWifiManager, times(1)).setWifiEnabled(true);
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_turned_on_message));
-
-        // notify turn on Wi-Fi failed
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        verifyConnectBtnBeInitAsDefault(inOrder);
-        inOrder.verify(mockButtonsPref, times(1)).setButton3Visible(true);
-        assertThat(ShadowToast.getTextOfLatestToast()).isEqualTo(
-                mContext.getString(R.string.wifi_failed_connect_message));
-    }
-
-    @Test
-    public void testConnectButton_clickConnectAndBackKey_ignoreTimeoutEvent() {
-        setUpForDisconnectedNetwork();
-        when(mockWifiManager.isWifiEnabled()).thenReturn(true);
-        InOrder inOrder = inOrder(mockButtonsPref);
-        setUpForToast();
-
-        displayAndResume();
-
-        // check connect button exist
-        verifyConnectBtnSetUpAsVisible(inOrder);
-
-        // click connect button
-        mController.connectNetwork();
-
-        // check display button as connecting
-        verify(mockWifiManager, times(1)).connect(anyInt(), any(WifiManager.ActionListener.class));
-        verifyConnectBtnSetUpAsConnecting(inOrder);
-
-        // leave detail page
-        when(mockFragment.getActivity()).thenReturn(null);
-
-        // timeout happened
-        mController.mTimer.onFinish();
-
-        // check connect button visible, be init as default and toast failed message
-        inOrder.verify(mockButtonsPref, never()).setButton3Text(R.string.wifi_connect);
-        inOrder.verify(mockButtonsPref, never()).setButton3Icon(R.drawable.ic_settings_wireless);
-        inOrder.verify(mockButtonsPref, never()).setButton3Enabled(true);
-        inOrder.verify(mockButtonsPref, never()).setButton3Visible(true);
-        assertThat(ShadowToast.shownToastCount()).isEqualTo(0);
-    }
-
-    @Test
-    public void updateAccessPoint_returnFalseForNothingChanged() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isFalse();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForSignalLevelChanged() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        // Level changed
-        when(mockAccessPoint.getLevel()).thenReturn(LEVEL + 1);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForChangeAsNotInRange() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        // change as not in range
-        when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(false);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForChangeAsInRange() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        // change as in range
-        when(mockAccessPoint.matches(any(AccessPoint.class))).thenReturn(true);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForChangeAsConnected() {
-        setUpForDisconnectedNetwork();
-
-        displayAndResume();
-
-        // change as connected
-        when(mockAccessPoint.isActive()).thenReturn(true);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForChangeAsDisconnected() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        // change as disconnected
-        when(mockAccessPoint.isActive()).thenReturn(false);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void updateAccessPoint_returnTrueForAccessPointUpdated() {
-        setUpForConnectedNetwork();
-
-        displayAndResume();
-
-        // change as disconnected
-        when(mockAccessPoint.update(mockWifiConfig, mockWifiInfo, mockNetworkInfo))
-                .thenReturn(true);
-        boolean changed = mController.updateAccessPoint();
-
-        assertThat(changed).isTrue();
-    }
-
-    @Test
-    public void testRefreshRssiViews_shouldNotUpdateIfLevelIsSameForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-        verify(mockAccessPoint, times(3)).getLevel();
-        verify(mockIconInjector, times(1)).getIcon(anyInt());
-    }
-
-    @Test
-    public void testRefreshRssiViews_shouldUpdateOnLevelChangeForConnectedNetwork() {
-        setUpForConnectedNetwork();
-        displayAndResume();
-
-        when(mockAccessPoint.getLevel()).thenReturn(0);
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-        verify(mockAccessPoint, times(4)).getLevel();
-        verify(mockIconInjector, times(2)).getIcon(anyInt());
-    }
-
-    @Test
-    public void testRefreshRssiViews_shouldNotUpdateForNotInRangeNetwork() {
-        setUpForNotInRangeNetwork();
-
-        displayAndResume();
-
-        when(mockAccessPoint.getLevel()).thenReturn(0);
-        mContext.sendBroadcast(new Intent(WifiManager.RSSI_CHANGED_ACTION));
-
-        verify(mockSignalStrengthPref, times(2)).setVisible(false);
-    }
-
-    @Test
-    public void testRedrawIconForHeader_shouldEnlarge() {
-        setUpForConnectedNetwork();
-        ArgumentCaptor<BitmapDrawable> drawableCaptor =
-                ArgumentCaptor.forClass(BitmapDrawable.class);
-        Drawable original = mContext.getDrawable(Utils.getWifiIconResource(LEVEL)).mutate();
-        when(mockIconInjector.getIcon(anyInt())).thenReturn(original);
-
-        displayAndResume();
-
-        verify(mockHeaderController, times(1)).setIcon(drawableCaptor.capture());
-
-        int expectedSize = mContext.getResources().getDimensionPixelSize(
-                R.dimen.wifi_detail_page_header_image_size);
-        BitmapDrawable icon = drawableCaptor.getValue();
-        assertThat(icon.getMinimumWidth()).isEqualTo(expectedSize);
-        assertThat(icon.getMinimumHeight()).isEqualTo(expectedSize);
-    }
-
-    @Test
-    public void testRedrawIconForHeader_shouldEnlargeForDisconnectedNetwork() {
-        setUpForDisconnectedNetwork();
-        ArgumentCaptor<BitmapDrawable> drawableCaptor =
-                ArgumentCaptor.forClass(BitmapDrawable.class);
-        Drawable original = mContext.getDrawable(Utils.getWifiIconResource(LEVEL)).mutate();
-        when(mockIconInjector.getIcon(anyInt())).thenReturn(original);
-
-        displayAndResume();
-
-        verify(mockHeaderController, times(1)).setIcon(drawableCaptor.capture());
-
-        int expectedSize = mContext.getResources().getDimensionPixelSize(
-                R.dimen.wifi_detail_page_header_image_size);
-        BitmapDrawable icon = drawableCaptor.getValue();
-        assertThat(icon.getMinimumWidth()).isEqualTo(expectedSize);
-        assertThat(icon.getMinimumHeight()).isEqualTo(expectedSize);
-    }
-
-    @Test
-    public void testRedrawIconForHeader_shouldNotEnlargeIfNotVectorDrawable() {
-        setUpForConnectedNetwork();
-        ArgumentCaptor<ColorDrawable> drawableCaptor =
-                ArgumentCaptor.forClass(ColorDrawable.class);
-
-        displayAndResume();
-
-        verify(mockHeaderController, times(1)).setIcon(drawableCaptor.capture());
-        ColorDrawable icon = drawableCaptor.getValue();
-        assertThat(icon).isNotNull();
-    }
-
-    @Test
-    public void checkMacTitle_whenPrivacyRandomizedMac_shouldBeRandom() {
-        setUpForDisconnectedNetwork();
-        mockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_PERSISTENT;
-        when(mockWifiConfig.getRandomizedMacAddress()).thenReturn(mockMacAddress);
-        when(mockMacAddress.toString()).thenReturn(RANDOMIZED_MAC_ADDRESS);
-
-        displayAndResume();
-
-        verify(mockMacAddressPref).setTitle(R.string.wifi_advanced_randomized_mac_address_title);
-    }
-
-    @Test
-    public void checkMacTitle_whenPrivacyDeviceMac_shouldBeFactory() {
-        setUpForDisconnectedNetwork();
-        mockWifiConfig.macRandomizationSetting = WifiConfiguration.RANDOMIZATION_NONE;
-        when(mockWifiConfig.getRandomizedMacAddress()).thenReturn(mockMacAddress);
-        when(mockWifiManager.getFactoryMacAddresses())
-                .thenReturn(new String[]{FACTORY_MAC_ADDRESS});
-
-        displayAndResume();
-
-        verify(mockMacAddressPref).setTitle(R.string.wifi_advanced_device_mac_address_title);
-    }
-
-    @Test
-    public void entityHeader_expiredPasspointR1_shouldHandleExpiration() {
-        when(mockAccessPoint.isPasspoint()).thenReturn(true);
-        when(mockAccessPoint.isPasspointConfigurationR1()).thenReturn(true);
-        when(mockAccessPoint.isExpired()).thenReturn(true);
-        setUpForDisconnectedNetwork();
-        String expireSummary = mContext.getResources().getString(
-                com.android.settingslib.R.string.wifi_passpoint_expired);
-
-        displayAndResume();
-
-        verify(mockButtonsPref, atLeastOnce()).setButton3Visible(false);
-        verify(mockHeaderController).setSummary(expireSummary);
-    }
-
-    private ActionButtonsPreference createMock() {
-        final ActionButtonsPreference pref = mock(ActionButtonsPreference.class);
-        when(pref.setButton1Text(anyInt())).thenReturn(pref);
-        when(pref.setButton1Icon(anyInt())).thenReturn(pref);
-        when(pref.setButton1Enabled(anyBoolean())).thenReturn(pref);
-        when(pref.setButton1Visible(anyBoolean())).thenReturn(pref);
-        when(pref.setButton1OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
-
-        when(pref.setButton2Text(anyInt())).thenReturn(pref);
-        when(pref.setButton2Icon(anyInt())).thenReturn(pref);
-        when(pref.setButton2Enabled(anyBoolean())).thenReturn(pref);
-        when(pref.setButton2Visible(anyBoolean())).thenReturn(pref);
-        when(pref.setButton2OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
-
-        when(pref.setButton3Text(anyInt())).thenReturn(pref);
-        when(pref.setButton3Icon(anyInt())).thenReturn(pref);
-        when(pref.setButton3Enabled(anyBoolean())).thenReturn(pref);
-        when(pref.setButton3Visible(anyBoolean())).thenReturn(pref);
-        when(pref.setButton3OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
-
-        when(pref.setButton4Text(anyInt())).thenReturn(pref);
-        when(pref.setButton4Icon(anyInt())).thenReturn(pref);
-        when(pref.setButton4Enabled(anyBoolean())).thenReturn(pref);
-        when(pref.setButton4Visible(anyBoolean())).thenReturn(pref);
-        when(pref.setButton4OnClickListener(any(View.OnClickListener.class))).thenReturn(pref);
-
-        return pref;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
deleted file mode 100644
index 30665e6..0000000
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiMeteredPreferenceControllerTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi.details;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-
-import androidx.preference.DropDownPreference;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class WifiMeteredPreferenceControllerTest {
-
-    private static final int METERED_OVERRIDE_NONE = 0;
-    private static final int METERED_OVERRIDE_METERED = 1;
-    private static final int METERED_OVERRIDE_NOT_METERED = 2;
-
-    @Mock
-    private WifiConfiguration mWifiConfiguration;
-
-    private WifiMeteredPreferenceController mPreferenceController;
-    private Context mContext;
-    private DropDownPreference mDropDownPreference;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-
-        mPreferenceController = spy(
-                new WifiMeteredPreferenceController(mContext, mWifiConfiguration));
-        mDropDownPreference = new DropDownPreference(mContext);
-        mDropDownPreference.setEntries(R.array.wifi_metered_entries);
-        mDropDownPreference.setEntryValues(R.array.wifi_metered_values);
-    }
-
-    @Test
-    public void testUpdateState_wifiMetered_setCorrectValue() {
-        doReturn(METERED_OVERRIDE_METERED).when(mPreferenceController).getMeteredOverride();
-
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.getEntry()).isEqualTo("Treat as metered");
-    }
-
-    @Test
-    public void testUpdateState_wifiNotMetered_setCorrectValue() {
-        doReturn(METERED_OVERRIDE_NOT_METERED).when(mPreferenceController).getMeteredOverride();
-
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.getEntry()).isEqualTo("Treat as unmetered");
-    }
-
-    @Test
-    public void testUpdateState_wifiAuto_setCorrectValue() {
-        doReturn(METERED_OVERRIDE_NONE).when(mPreferenceController).getMeteredOverride();
-
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.getEntry()).isEqualTo("Detect automatically");
-    }
-
-    @Test
-    public void testController_resilientToNullConfig() {
-        mPreferenceController = spy(new WifiMeteredPreferenceController(mContext, null));
-
-        mPreferenceController.getMeteredOverride();
-        mPreferenceController.onPreferenceChange(mDropDownPreference, 1);
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java
deleted file mode 100644
index 2e588b5..0000000
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiPrivacyPreferenceControllerTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.details;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-
-import androidx.preference.DropDownPreference;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class WifiPrivacyPreferenceControllerTest {
-
-    private static final int PRIVACY_RANDOMIZED = WifiConfiguration.RANDOMIZATION_PERSISTENT;
-    private static final int PRIVACY_TRUSTED = WifiConfiguration.RANDOMIZATION_NONE;
-
-    @Mock
-    private WifiConfiguration mWifiConfiguration;
-
-    private WifiPrivacyPreferenceController mPreferenceController;
-    private Context mContext;
-    private DropDownPreference mDropDownPreference;
-    private String[] perferenceString;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-
-        WifiPrivacyPreferenceController preferenceController = new WifiPrivacyPreferenceController(
-                mContext);
-        preferenceController.setWifiConfiguration(mWifiConfiguration);
-        mPreferenceController = spy(preferenceController);
-        mDropDownPreference = new DropDownPreference(mContext);
-        mDropDownPreference.setEntries(R.array.wifi_privacy_entries);
-        mDropDownPreference.setEntryValues(R.array.wifi_privacy_values);
-
-        perferenceString = mContext.getResources().getStringArray(R.array.wifi_privacy_entries);
-    }
-
-    @Test
-    public void testUpdateState_wifiPrivacy_setCorrectValue() {
-        doReturn(PRIVACY_TRUSTED).when(mPreferenceController).getRandomizationValue();
-
-        mPreferenceController.updateState(mDropDownPreference);
-
-        int prefValue = mPreferenceController.translateMacRandomizedValueToPrefValue(
-                PRIVACY_TRUSTED);
-        assertThat(mDropDownPreference.getEntry()).isEqualTo(perferenceString[prefValue]);
-    }
-
-    @Test
-    public void testUpdateState_wifiNotMetered_setCorrectValue() {
-        doReturn(PRIVACY_RANDOMIZED).when(mPreferenceController).getRandomizationValue();
-
-        mPreferenceController.updateState(mDropDownPreference);
-
-        int prefValue = mPreferenceController.translateMacRandomizedValueToPrefValue(
-                PRIVACY_RANDOMIZED);
-        assertThat(mDropDownPreference.getEntry()).isEqualTo(perferenceString[prefValue]);
-    }
-
-    @Test
-    public void testController_resilientToNullConfig() {
-        mPreferenceController = spy(new WifiPrivacyPreferenceController(mContext));
-
-        mPreferenceController.getRandomizationValue();
-        mPreferenceController.onPreferenceChange(mDropDownPreference, "1");
-    }
-
-    @Test
-    public void testUpdateState_isNotEphemeralNetwork_shouldBeSelectable() {
-        mPreferenceController.setIsEphemeral(false);
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.isSelectable()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isEphemeralNetwork_shouldNotSelectable() {
-        mPreferenceController.setIsEphemeral(true);
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.isSelectable()).isFalse();
-    }
-
-    @Test
-    public void testUpdateState_isNotPasspointNetwork_shouldBeSelectable() {
-        mPreferenceController.setIsPasspoint(false);
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.isSelectable()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_isPasspointNetwork_shouldNotSelectable() {
-        mPreferenceController.setIsPasspoint(true);
-        mPreferenceController.updateState(mDropDownPreference);
-
-        assertThat(mDropDownPreference.isSelectable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
index 8d3405c..c5f2a7f 100644
--- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java
@@ -53,10 +53,12 @@
 import android.net.RouteInfo;
 import android.net.Uri;
 import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiEnterpriseConfig;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
 import android.provider.Settings;
+import android.telephony.TelephonyManager;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.ImageView;
@@ -175,6 +177,8 @@
     @Mock
     private Preference mMockSsidPref;
     @Mock
+    private Preference mMockEapSimSubscriptionPref;
+    @Mock
     private Preference mMockMacAddressPref;
     @Mock
     private Preference mMockIpAddressPref;
@@ -295,7 +299,7 @@
                 .thenReturn(mMockHeaderController);
         when(mMockHeaderController.setSecondSummary(nullable(String.class)))
                 .thenReturn(mMockHeaderController);
-        when(mMockIconInjector.getIcon(anyInt())).thenReturn(new ColorDrawable());
+        when(mMockIconInjector.getIcon(anyBoolean(), anyInt())).thenReturn(new ColorDrawable());
 
         setupMockedPreferenceScreen();
     }
@@ -374,6 +378,8 @@
                 .thenReturn(mMockSecurityPref);
         when(mMockScreen.findPreference(WifiDetailPreferenceController2.KEY_SSID_PREF))
                 .thenReturn(mMockSsidPref);
+        when(mMockScreen.findPreference(WifiDetailPreferenceController2
+                .KEY_EAP_SIM_SUBSCRIPTION_PREF)).thenReturn(mMockEapSimSubscriptionPref);
         when(mMockScreen.findPreference(WifiDetailPreferenceController2.KEY_MAC_ADDRESS_PREF))
                 .thenReturn(mMockMacAddressPref);
         when(mMockScreen.findPreference(WifiDetailPreferenceController2.KEY_IP_ADDRESS_PREF))
@@ -494,7 +500,7 @@
     public void entityHeader_shouldHaveIconSetForConnectedNetwork() {
         setUpForConnectedNetwork();
         setUpSpyController();
-        Drawable expectedIcon = mMockIconInjector.getIcon(LEVEL);
+        Drawable expectedIcon = mMockIconInjector.getIcon(false /* showX */, LEVEL);
 
         displayAndResume();
 
@@ -504,7 +510,7 @@
     @Test
     public void entityHeader_shouldHaveIconSetForDisconnectedNetwork() {
         setUpForDisconnectedNetwork();
-        Drawable expectedIcon = mMockIconInjector.getIcon(LEVEL);
+        Drawable expectedIcon = mMockIconInjector.getIcon(false /* showX */, LEVEL);
 
         displayAndResume();
 
@@ -609,6 +615,7 @@
 
         displayAndResume();
 
+        assertThat(mController.mShowX).isFalse();
         verify(mMockSignalStrengthPref).setIcon(any(Drawable.class));
     }
 
@@ -618,6 +625,7 @@
 
         displayAndResume();
 
+        assertThat(mController.mShowX).isFalse();
         verify(mMockSignalStrengthPref).setIcon(any(Drawable.class));
     }
 
@@ -627,6 +635,7 @@
 
         displayAndResume();
 
+        assertThat(mController.mShowX).isFalse();
         verify(mMockSignalStrengthPref, never()).setIcon(any(Drawable.class));
     }
 
@@ -639,6 +648,7 @@
 
         displayAndResume();
 
+        assertThat(mController.mShowX).isFalse();
         verify(mMockSignalStrengthPref).setSummary(expectedStrength);
     }
 
@@ -650,6 +660,7 @@
 
         displayAndResume();
 
+        assertThat(mController.mShowX).isFalse();
         verify(mMockSignalStrengthPref).setSummary(expectedStrength);
     }
 
@@ -659,10 +670,25 @@
 
         displayAndResume();
 
+        assertThat(mController.mShowX).isFalse();
         verify(mMockSignalStrengthPref, never()).setSummary(any(String.class));
     }
 
     @Test
+    public void signalStrengthPref_shouldShowXLevelIcon_showXTrue() {
+        setUpForConnectedNetwork();
+        setUpSpyController();
+        final String expectedStrength =
+                mContext.getResources().getStringArray(R.array.wifi_signal)[LEVEL];
+        when(mMockWifiEntry.shouldShowXLevelIcon()).thenReturn(true);
+
+        displayAndResume();
+
+        assertThat(mController.mShowX).isTrue();
+        verify(mMockSignalStrengthPref).setSummary(expectedStrength);
+    }
+
+    @Test
     public void linkSpeedPref_shouldNotShowIfNotSet() {
         setUpForConnectedNetwork();
         setUpSpyController();
@@ -789,6 +815,22 @@
     }
 
     @Test
+    public void macAddressPref_shouldVisibleAsRandomizedForConnectedNetwork() {
+        setUpForConnectedNetwork();
+        setUpSpyController();
+        when(mMockWifiEntry.isSaved()).thenReturn(true);
+        when(mMockWifiEntry.getPrivacy()).thenReturn(WifiEntry.PRIVACY_RANDOMIZED_MAC);
+        when(mMockWifiEntry.getMacAddress()).thenReturn(RANDOMIZED_MAC_ADDRESS);
+
+        displayAndResume();
+
+        verify(mMockMacAddressPref).setVisible(true);
+        verify(mMockMacAddressPref).setSummary(RANDOMIZED_MAC_ADDRESS);
+        verify(mMockMacAddressPref).setTitle(
+                R.string.wifi_advanced_randomized_mac_address_title);
+    }
+
+    @Test
     public void macAddressPref_shouldVisibleAsRandomizedForDisconnectedNetwork() {
         setUpForDisconnectedNetwork();
         when(mMockWifiEntry.isSaved()).thenReturn(true);
@@ -799,7 +841,8 @@
 
         verify(mMockMacAddressPref).setVisible(true);
         verify(mMockMacAddressPref).setSummary(RANDOMIZED_MAC_ADDRESS);
-        verify(mMockMacAddressPref).setTitle(R.string.wifi_advanced_randomized_mac_address_title);
+        verify(mMockMacAddressPref).setTitle(
+                R.string.wifi_advanced_randomized_mac_address_disconnected_title);
     }
 
     @Test
@@ -1523,7 +1566,7 @@
         ArgumentCaptor<BitmapDrawable> drawableCaptor =
                 ArgumentCaptor.forClass(BitmapDrawable.class);
         Drawable original = mContext.getDrawable(Utils.getWifiIconResource(LEVEL)).mutate();
-        when(mMockIconInjector.getIcon(anyInt())).thenReturn(original);
+        when(mMockIconInjector.getIcon(anyBoolean(), anyInt())).thenReturn(original);
 
         displayAndResume();
 
@@ -1542,7 +1585,7 @@
         ArgumentCaptor<BitmapDrawable> drawableCaptor =
                 ArgumentCaptor.forClass(BitmapDrawable.class);
         Drawable original = mContext.getDrawable(Utils.getWifiIconResource(LEVEL)).mutate();
-        when(mMockIconInjector.getIcon(anyInt())).thenReturn(original);
+        when(mMockIconInjector.getIcon(anyBoolean(), anyInt())).thenReturn(original);
 
         displayAndResume();
 
@@ -1582,6 +1625,82 @@
         verify(mMockHeaderController).setSummary(expired);
     }
 
+    @Test
+    public void refreshEapSimSubscription_nonEapSecurity_invisibleEapSimSubscriptionPref() {
+        setUpForDisconnectedNetwork();
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_NONE);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref, times(1)).setVisible(false);
+
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_OWE);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref, times(2)).setVisible(false);
+
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_PSK);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref, times(3)).setVisible(false);
+
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_SAE);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref, times(4)).setVisible(false);
+        verify(mMockEapSimSubscriptionPref, never()).setVisible(true);
+    }
+
+    @Test
+    public void refreshEapSimSubscription_nonSimEapMethod_invisibleEapSimSubscriptionPref() {
+        setUpForDisconnectedNetwork();
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        final WifiConfiguration mockWifiConfiguration = mock(WifiConfiguration.class);
+        final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+        when(mockWifiEnterpriseConfig.isAuthenticationSimBased()).thenReturn(false);
+        mockWifiConfiguration.enterpriseConfig = mockWifiEnterpriseConfig;
+        when(mMockWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfiguration);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref, times(1)).setVisible(false);
+    }
+
+    @Test
+    public void refreshEapSimSubscription_simEapMethod_visibleEapSimSubscriptionPref() {
+        setUpForDisconnectedNetwork();
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        final WifiConfiguration mockWifiConfiguration = mock(WifiConfiguration.class);
+        final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+        when(mockWifiEnterpriseConfig.isAuthenticationSimBased()).thenReturn(true);
+        mockWifiConfiguration.enterpriseConfig = mockWifiEnterpriseConfig;
+        when(mMockWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfiguration);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref).setVisible(true);
+    }
+
+    @Test
+    public void refreshEapSimSubscription_unknownCarrierId_noSimEapSimSubscriptionPref() {
+        setUpForDisconnectedNetwork();
+        when(mMockWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_EAP);
+        final WifiConfiguration mockWifiConfiguration = mock(WifiConfiguration.class);
+        mockWifiConfiguration.carrierId = TelephonyManager.UNKNOWN_CARRIER_ID;
+        final WifiEnterpriseConfig mockWifiEnterpriseConfig = mock(WifiEnterpriseConfig.class);
+        when(mockWifiEnterpriseConfig.isAuthenticationSimBased()).thenReturn(true);
+        mockWifiConfiguration.enterpriseConfig = mockWifiEnterpriseConfig;
+        when(mMockWifiEntry.getWifiConfiguration()).thenReturn(mockWifiConfiguration);
+
+        displayAndResume();
+
+        verify(mMockEapSimSubscriptionPref).setVisible(true);
+        verify(mMockEapSimSubscriptionPref).setSummary(R.string.wifi_no_related_sim_card);
+    }
+
     private ActionButtonsPreference createMock() {
         final ActionButtonsPreference pref = mock(ActionButtonsPreference.class);
         when(pref.setButton1Text(anyInt())).thenReturn(pref);
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java
new file mode 100644
index 0000000..e0fb578
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiNetworkDetailsFragment2Test.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.details2;
+
+import static com.android.settings.wifi.WifiSettings.WIFI_DIALOG_ID;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.settings.SettingsEnums;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+
+@RunWith(RobolectricTestRunner.class)
+public class WifiNetworkDetailsFragment2Test {
+
+    final String TEST_PREFERENCE_KEY = "TEST_PREFERENCE_KEY";
+
+    private WifiNetworkDetailsFragment2 mFragment;
+
+    @Before
+    public void setUp() {
+        mFragment = new WifiNetworkDetailsFragment2();
+    }
+
+    @Test
+    public void getMetricsCategory_shouldReturnWifiNetworkDetails() {
+        assertThat(mFragment.getMetricsCategory()).isEqualTo(SettingsEnums.WIFI_NETWORK_DETAILS);
+    }
+
+    @Test
+    public void getDialogMetricsCategory_withCorrectId_shouldReturnDialogWifiApEdit() {
+        assertThat(mFragment.getDialogMetricsCategory(WIFI_DIALOG_ID)).isEqualTo(
+                SettingsEnums.DIALOG_WIFI_AP_EDIT);
+    }
+
+    @Test
+    public void getDialogMetricsCategory_withWrongId_shouldReturnZero() {
+        assertThat(mFragment.getDialogMetricsCategory(-1 /* dialogId */)).isEqualTo(0);
+    }
+
+    @Test
+    public void onCreateOptionsMenu_shouldSetCorrectIcon() {
+        final Menu menu = mock(Menu.class);
+        final MenuItem menuItem = mock(MenuItem.class);
+        doReturn(menuItem).when(menu).add(anyInt(), eq(Menu.FIRST), anyInt(), anyInt());
+
+        mFragment.onCreateOptionsMenu(menu, mock(MenuInflater.class));
+
+        verify(menuItem).setIcon(com.android.internal.R.drawable.ic_mode_edit);
+    }
+
+    @Test
+    public void refreshPreferences_controllerShouldUpdateStateAndDisplayPreference() {
+        final FakeFragment fragment = spy(new FakeFragment());
+        final PreferenceScreen screen = mock(PreferenceScreen.class);
+        final Preference preference = mock(Preference.class);
+        final TestController controller = mock(TestController.class);
+        doReturn(screen).when(fragment).getPreferenceScreen();
+        doReturn(preference).when(screen).findPreference(TEST_PREFERENCE_KEY);
+        doReturn(TEST_PREFERENCE_KEY).when(controller).getPreferenceKey();
+        fragment.mControllers = new ArrayList<>();
+        fragment.mControllers.add(controller);
+        fragment.addPreferenceController(controller);
+
+        fragment.refreshPreferences();
+
+        verify(controller).updateState(preference);
+        verify(controller).displayPreference(screen);
+    }
+
+    // Fake WifiNetworkDetailsFragment2 to override the protected method as public.
+    public class FakeFragment extends WifiNetworkDetailsFragment2 {
+
+        @Override
+        public void addPreferenceController(AbstractPreferenceController controller) {
+            super.addPreferenceController(controller);
+        }
+    }
+
+    public class TestController extends BasePreferenceController {
+
+        public TestController() {
+            super(RuntimeEnvironment.application, TEST_PREFERENCE_KEY);
+        }
+
+        @Override
+        public int getAvailabilityStatus() {
+            return AVAILABLE;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.java
index 0414b1c..d3244fa 100644
--- a/tests/robotests/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiPrivacyPreferenceController2Test.java
@@ -89,7 +89,15 @@
     }
 
     @Test
-    public void testUpdateState_canSetPrivacy_shouldBeSelectable() {
+    public void testUpdateState_canSetPrivacyInNextUpdate_shouldBeSelectable() {
+        // Return false in WifiEntry#canSetPrivacy to make preference un-selectable first.
+        when(mMockWifiEntry.canSetPrivacy()).thenReturn(false);
+
+        mPreferenceController.updateState(mDropDownPreference);
+
+        assertThat(mDropDownPreference.isSelectable()).isFalse();
+
+        // Return true in WifiEntry#canSetPrivacy to verify preference back to selectable.
         when(mMockWifiEntry.canSetPrivacy()).thenReturn(true);
 
         mPreferenceController.updateState(mDropDownPreference);
@@ -98,7 +106,15 @@
     }
 
     @Test
-    public void testUpdateState_canNotSetPrivacy_shouldNotSelectable() {
+    public void testUpdateState_canNotSetPrivacyInNextUpdate_shouldNotBeSelectable() {
+        // Return true in WifiEntry#canSetPrivacy to make preference selectable first.
+        when(mMockWifiEntry.canSetPrivacy()).thenReturn(true);
+
+        mPreferenceController.updateState(mDropDownPreference);
+
+        assertThat(mDropDownPreference.isSelectable()).isTrue();
+
+        // Return false in WifiEntry#canSetPrivacy to verify preference back to un-selectable.
         when(mMockWifiEntry.canSetPrivacy()).thenReturn(false);
 
         mPreferenceController.updateState(mDropDownPreference);
diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiSubscriptionDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiSubscriptionDetailPreferenceController2Test.java
deleted file mode 100644
index 18a5b86..0000000
--- a/tests/robotests/src/com/android/settings/wifi/details2/WifiSubscriptionDetailPreferenceController2Test.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.details2;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-
-import com.android.wifitrackerlib.WifiEntry;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public class WifiSubscriptionDetailPreferenceController2Test {
-
-    @Mock
-    private WifiEntry mMockWifiEntry;
-
-    private WifiSubscriptionDetailPreferenceController2 mPreferenceController;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = RuntimeEnvironment.application;
-
-        mMockWifiEntry = mock(WifiEntry.class);
-        WifiSubscriptionDetailPreferenceController2 preferenceController =
-                new WifiSubscriptionDetailPreferenceController2(mContext);
-        preferenceController.setWifiEntry(mMockWifiEntry);
-        mPreferenceController = spy(preferenceController);
-    }
-
-    @Test
-    public void testUpdateState_canSetPrivacy_shouldBeSelectable() {
-        when(mMockWifiEntry.canManageSubscription()).thenReturn(true);
-
-        assertThat(mPreferenceController.isAvailable()).isTrue();
-    }
-
-    @Test
-    public void testUpdateState_canNotSetPrivacy_shouldNotSelectable() {
-        when(mMockWifiEntry.canManageSubscription()).thenReturn(false);
-
-        assertThat(mPreferenceController.isAvailable()).isFalse();
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
new file mode 100644
index 0000000..b36d7f5
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.dpp;
+
+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.anyString;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+
+import androidx.fragment.app.FragmentTransaction;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiDppQrCodeGeneratorFragmentTest {
+
+    private WifiDppConfiguratorActivity mActivity;
+    private WifiDppQrCodeGeneratorFragment mFragment;
+    private Context mContext;
+
+
+    @Before
+    public void setUp() {
+        Intent intent =
+                new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_GENERATOR);
+        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
+        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WPA");
+        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "\\012345678,");
+
+        MockitoAnnotations.initMocks(this);
+        mActivity = Robolectric.setupActivity(WifiDppConfiguratorActivity.class);
+        mActivity.setWifiNetworkConfig(WifiNetworkConfig.getValidConfigOrNull(intent));
+        mActivity.startActivity(intent);
+
+        mFragment = spy(new WifiDppQrCodeGeneratorFragment());
+        FragmentTransaction ft = mActivity.getSupportFragmentManager().beginTransaction();
+        ft.add(mFragment, null);
+        ft.commit();
+
+        mContext = spy(InstrumentationRegistry.getTargetContext());
+        when(mFragment.getContext()).thenReturn(mContext);
+    }
+
+    @Test
+    public void rotateScreen_shouldNotCrash() {
+        mActivity.setRequestedOrientation(
+                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        mActivity.setRequestedOrientation(
+                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+    }
+
+    @Test
+    public void createNearbyButton_returnsNull() {
+        assertThat(mFragment.createNearbyButton(new Intent(), v -> {
+        })).isNull();
+    }
+
+    private static ResolveInfo createResolveInfo(int userId) {
+        final ResolveInfo resolveInfo = new ResolveInfo();
+        resolveInfo.activityInfo = createActivityInfo();
+        resolveInfo.targetUserId = userId;
+        return resolveInfo;
+    }
+
+    private static ActivityInfo createActivityInfo() {
+        ActivityInfo ai = new ActivityInfo();
+        ai.name = "activity_name";
+        ai.packageName = "foo_bar";
+        ai.enabled = true;
+        ai.exported = true;
+        ai.permission = null;
+        ai.applicationInfo = new ApplicationInfo();
+        ai.applicationInfo.packageName = "com.google.android.gms";
+
+        Bundle metadata = mock(Bundle.class);
+        when(metadata.getInt(anyString())).thenReturn(1);
+        ai.metaData = metadata;
+        return ai;
+    }
+
+    @Test
+    public void createNearbyButtonFromSetting_notNull()
+            throws PackageManager.NameNotFoundException {
+        doReturn(ComponentName.unflattenFromString(
+                "com.google.android.gms/com.google.android.gms.nearby.sharing.ShareSheetActivity"))
+                .when(mFragment).getNearbySharingComponent();
+        PackageManager packageManager = mock(PackageManager.class);
+        doReturn(createResolveInfo(0)).when(packageManager).resolveActivity(any(), anyInt());
+
+        Resources resources = mock(Resources.class);
+        when(resources.getString(anyInt())).thenReturn("Nearby");
+        Drawable drawable = mock(Drawable.class);
+        when(resources.getDrawable(anyInt())).thenReturn(drawable);
+
+        when(packageManager.getResourcesForActivity(any())).thenReturn(resources);
+
+        when(mContext.getPackageManager()).thenReturn(packageManager);
+
+
+        assertThat(mFragment.createNearbyButton(new Intent(), v -> {
+        })).isNotNull();
+    }
+
+    @Test
+    public void createNearbyButtonFromConfig_notNull() throws PackageManager.NameNotFoundException {
+        doReturn(
+                "com.google.android.gms/com.google.android.gms.nearby.sharing.ShareSheetActivity")
+                .when(mFragment).getString(anyInt());
+        PackageManager packageManager = mock(PackageManager.class);
+        doReturn(createResolveInfo(0)).when(packageManager).resolveActivity(any(), anyInt());
+
+        Resources resources = mock(Resources.class);
+        when(resources.getString(anyInt())).thenReturn("Nearby");
+        Drawable drawable = mock(Drawable.class);
+        when(resources.getDrawable(anyInt())).thenReturn(drawable);
+
+        when(packageManager.getResourcesForActivity(any())).thenReturn(resources);
+
+        when(mContext.getPackageManager()).thenReturn(packageManager);
+
+
+        assertThat(mFragment.createNearbyButton(new Intent(), v -> {
+        })).isNotNull();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppUtilsTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppUtilsTest.java
index 694088a..d8bcb59 100644
--- a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppUtilsTest.java
@@ -27,9 +27,7 @@
 import android.net.wifi.WifiConfiguration.KeyMgmt;
 import android.net.wifi.WifiManager;
 
-import com.android.settingslib.wifi.AccessPoint;
-
-import java.util.BitSet;
+import com.android.wifitrackerlib.WifiEntry;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -40,6 +38,8 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowApplication;
 
+import java.util.BitSet;
+
 @RunWith(RobolectricTestRunner.class)
 public class WifiDppUtilsTest {
 
@@ -47,7 +47,7 @@
     private WifiManager mWifiManager;
 
     @Mock
-    private AccessPoint mAccessPoint;
+    private WifiEntry mWifiEntry;
 
     @Mock
     private WifiConfiguration mWifiConfiguration;
@@ -66,16 +66,16 @@
     @Test
     public void getConfiguratorQrCodeScannerIntentOrNull_hiddenSsidNetwork_hasHiddenSsidExtra() {
         when(mWifiManager.isEasyConnectSupported()).thenReturn(true);
-        when(mAccessPoint.isPasspoint()).thenReturn(false);
-        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
-        when(mAccessPoint.getConfig()).thenReturn(mWifiConfiguration);
+        when(mWifiEntry.canEasyConnect()).thenReturn(true);
+        when(mWifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_PSK);
+        when(mWifiEntry.getWifiConfiguration()).thenReturn(mWifiConfiguration);
         mWifiConfiguration.SSID = "GuestNetwork";
         mWifiConfiguration.allowedKeyManagement = new BitSet();
         mWifiConfiguration.allowedKeyManagement.set(KeyMgmt.WPA_PSK);
         mWifiConfiguration.hiddenSSID = true;
 
         Intent intent = WifiDppUtils
-                .getConfiguratorQrCodeScannerIntentOrNull(mContext, mWifiManager, mAccessPoint);
+                .getConfiguratorQrCodeScannerIntentOrNull(mContext, mWifiManager, mWifiEntry);
 
         assertThat(intent.getBooleanExtra(WifiDppUtils.EXTRA_WIFI_HIDDEN_SSID, false))
                 .isEqualTo(true);
diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiNetworkConfigTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiNetworkConfigTest.java
deleted file mode 100644
index 1b7c0a8..0000000
--- a/tests/robotests/src/com/android/settings/wifi/dpp/WifiNetworkConfigTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Intent;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class WifiNetworkConfigTest {
-    private WifiNetworkConfig mWifiConfig;
-
-    @Before
-    public void setUp() {
-        Intent intent = new Intent();
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "Pixel:_ABCD;");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WPA");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "\\012345678,");
-        mWifiConfig = WifiNetworkConfig.getValidConfigOrNull(intent);
-    }
-
-    @Test
-    public void testInitConfig_IntentReceived_QRCodeValue() {
-        String qrcode = mWifiConfig.getQrCode();
-        assertThat(qrcode).isEqualTo("WIFI:S:Pixel\\:_ABCD\\;;T:WPA;P:\\\\012345678\\,;H:false;;");
-    }
-}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
new file mode 100644
index 0000000..70f2b1a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.dpp;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+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.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.HandlerThread;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.test.InstrumentationRegistry;
+
+import com.android.settingslib.wifi.WifiEntryPreference;
+import com.android.wifitrackerlib.SavedNetworkTracker;
+import com.android.wifitrackerlib.WifiEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+
+import java.util.Arrays;
+
+@RunWith(RobolectricTestRunner.class)
+public class WifiNetworkListFragmentTest {
+    private WifiNetworkListFragment mWifiNetworkListFragment;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(InstrumentationRegistry.getTargetContext());
+        mWifiNetworkListFragment = spy(new WifiNetworkListFragment());
+        doReturn(mContext).when(mWifiNetworkListFragment).getContext();
+        mWifiNetworkListFragment.mWifiManager = mock(WifiManager.class);
+        mWifiNetworkListFragment.mSavedNetworkTracker = mock(SavedNetworkTracker.class);
+        mWifiNetworkListFragment.mPreferenceGroup = mock(PreferenceCategory.class);
+        mWifiNetworkListFragment.mAddPreference = mock(Preference.class);
+        mWifiNetworkListFragment.mOnChooseNetworkListener =
+                mock(WifiNetworkListFragment.OnChooseNetworkListener.class);
+    }
+
+    @Test
+    public void onActivityResult_addNetworkRequestOk_shouldSaveNetwork() {
+        final WifiConfiguration wifiConfig = new WifiConfiguration();
+        final Intent intent = new Intent();
+        intent.putExtra(WifiNetworkListFragment.WIFI_CONFIG_KEY, wifiConfig);
+
+        mWifiNetworkListFragment.onActivityResult(WifiNetworkListFragment.ADD_NETWORK_REQUEST,
+                Activity.RESULT_OK, intent);
+
+        verify(mWifiNetworkListFragment.mWifiManager).save(eq(wifiConfig), any());
+    }
+
+    @Test
+    public void onSavedWifiEntriesChanged_noSavedWifiEntry_onlyAddNetworkPreference() {
+        when(mWifiNetworkListFragment.mSavedNetworkTracker.getSavedWifiEntries())
+                .thenReturn(Arrays.asList());
+
+        mWifiNetworkListFragment.onSavedWifiEntriesChanged();
+
+        verify(mWifiNetworkListFragment.mPreferenceGroup).addPreference(
+                mWifiNetworkListFragment.mAddPreference);
+    }
+
+    @Test
+    public void onSavedWifiEntriesChanged_openSavedWifiEntry_onlyAddNetworkPreference() {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_NONE);
+        when(mWifiNetworkListFragment.mSavedNetworkTracker.getSavedWifiEntries())
+                .thenReturn(Arrays.asList(wifiEntry));
+
+        mWifiNetworkListFragment.onSavedWifiEntriesChanged();
+
+        verify(mWifiNetworkListFragment.mPreferenceGroup).addPreference(
+                mWifiNetworkListFragment.mAddPreference);
+    }
+
+    @Test
+    public void onSavedWifiEntriesChanged_pskSavedWifiEntry_add2Preferences() {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_PSK);
+        when(mWifiNetworkListFragment.mSavedNetworkTracker.getSavedWifiEntries())
+                .thenReturn(Arrays.asList(wifiEntry));
+
+        mWifiNetworkListFragment.onSavedWifiEntriesChanged();
+
+        verify(mWifiNetworkListFragment.mPreferenceGroup, times(2)).addPreference(any());
+    }
+
+    @Test
+    public void onSavedWifiEntriesChanged_saeSavedWifiEntry_add2Preferences() {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getSecurity()).thenReturn(WifiEntry.SECURITY_SAE);
+        when(mWifiNetworkListFragment.mSavedNetworkTracker.getSavedWifiEntries())
+                .thenReturn(Arrays.asList(wifiEntry));
+
+        mWifiNetworkListFragment.onSavedWifiEntriesChanged();
+
+        verify(mWifiNetworkListFragment.mPreferenceGroup, times(2)).addPreference(any());
+    }
+
+    @Test
+    public void onPreferenceClick_validWifiEntryPreference_onChooseNetwork() {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getSecurityString(true /* concise */)).thenReturn("WPA3");
+        final WifiConfiguration wifiConfig = mock(WifiConfiguration.class);
+        when(wifiConfig.getPrintableSsid()).thenReturn("ssid");
+        when(wifiEntry.getWifiConfiguration()).thenReturn(wifiConfig);
+        final WifiEntryPreference preference = new WifiEntryPreference(mContext, wifiEntry);
+
+        mWifiNetworkListFragment.onPreferenceClick(preference);
+
+        verify(mWifiNetworkListFragment.mOnChooseNetworkListener).onChooseNetwork(any());
+    }
+
+    @Test
+    public void onDestroy_quitWorkerThread() {
+        mWifiNetworkListFragment.mWorkerThread = mock(HandlerThread.class);
+
+        try {
+            mWifiNetworkListFragment.onDestroyView();
+        } catch (IllegalArgumentException e) {
+            // Ignore the exception from super class.
+        }
+
+        verify(mWifiNetworkListFragment.mWorkerThread).quit();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
index 9731689..10d76d3 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java
@@ -106,12 +106,12 @@
         mController.displayPreference(mScreen);
         verify(mWifiDirectPreference).setEnabled(true);
 
-        Intent dummyIntent = new Intent();
-        mController.mReceiver.onReceive(mContext, dummyIntent);
+        Intent fakeIntent = new Intent();
+        mController.mReceiver.onReceive(mContext, fakeIntent);
         verify(mWifiDirectPreference, times(2)).setEnabled(true);
 
         when(mWifiManager.isWifiEnabled()).thenReturn(false);
-        mController.mReceiver.onReceive(mContext, dummyIntent);
+        mController.mReceiver.onReceive(mContext, fakeIntent);
         verify(mWifiDirectPreference).setEnabled(false);
     }
 
@@ -136,12 +136,12 @@
     public void updateState_withLocationDisabled_preferenceShouldBeDisable() {
         when(mWifiManager.isWifiEnabled()).thenReturn(true);
         when(mLocationManager.isLocationEnabled()).thenReturn(true);
-        Intent dummyIntent = new Intent();
+        Intent fakeIntent = new Intent();
         mController.displayPreference(mScreen);
         verify(mWifiDirectPreference).setEnabled(true);
 
         when(mLocationManager.isLocationEnabled()).thenReturn(false);
-        mController.mLocationReceiver.onReceive(mContext, dummyIntent);
+        mController.mLocationReceiver.onReceive(mContext, fakeIntent);
         verify(mWifiDirectPreference).setEnabled(false);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
index 81615f2..c9d2119 100644
--- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2pSettingsTest.java
@@ -103,7 +103,7 @@
             preferenceKeys.add(controller.getPreferenceKey());
         }
 
-        assertThat(preferenceScreenKeys).containsAllIn(preferenceKeys);
+        assertThat(preferenceScreenKeys).containsAtLeastElementsIn(preferenceKeys);
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java
deleted file mode 100644
index 483e259..0000000
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsPreferenceControllerTest.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-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.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.testutils.shadow.ShadowAccessPoint;
-import com.android.settings.testutils.shadow.ShadowWifiManager;
-import com.android.settingslib.wifi.AccessPointPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-import java.util.ArrayList;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowWifiManager.class})
-public class SavedAccessPointsPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private PreferenceCategory mPreferenceCategory;
-
-    private Context mContext;
-    private WifiManager mWifiManager;
-    private SavedAccessPointsWifiSettings mSettings;
-    private SavedAccessPointsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mWifiManager = mContext.getSystemService(WifiManager.class);
-        mSettings = spy(new SavedAccessPointsWifiSettings());
-        mController = spy(new SavedAccessPointsPreferenceController(mContext, "test_key"));
-        mController.setHost(mSettings);
-
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreferenceCategory);
-        when(mPreferenceCategory.getContext()).thenReturn(mContext);
-    }
-
-    @Test
-    public void getAvailability_noSavedAccessPoint_shouldNotAvailable() {
-        mController.mAccessPoints = new ArrayList<>();
-
-        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
-    }
-
-    @Test
-    public void getAvailability_shouldRefreshSavedAccessPoints() {
-        mController.getAvailabilityStatus();
-
-        verify(mController).refreshSavedAccessPoints();
-    }
-
-    @Test
-    @Config(shadows = ShadowAccessPoint.class)
-    public void displayPreference_oneAccessPoint_shouldListNonSubscribedAPs() {
-        final WifiConfiguration config = new WifiConfiguration();
-        config.SSID = "SSID";
-        config.BSSID = "BSSID";
-        config.networkId = 2;
-        mWifiManager.addNetwork(config);
-
-        final ArgumentCaptor<AccessPointPreference> captor =
-                ArgumentCaptor.forClass(AccessPointPreference.class);
-        mController.displayPreference(mPreferenceScreen);
-
-        verify(mPreferenceCategory).addPreference(captor.capture());
-
-        final AccessPointPreference pref = captor.getValue();
-        assertThat(pref.getTitle()).isEqualTo(config.SSID);
-    }
-
-    @Test
-    @Config(shadows = ShadowAccessPoint.class)
-    public void displayPreference_onePasspoint_shouldNotListSubscribedAPs() {
-        mWifiManager.addOrUpdatePasspointConfiguration(
-                SubscribedAccessPointsPreferenceControllerTest.createMockPasspointConfiguration());
-
-        mController.displayPreference(mPreferenceScreen);
-
-        verify(mPreferenceCategory, never()).addPreference(any(AccessPointPreference.class));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java
deleted file mode 100644
index 923f05e..0000000
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SavedAccessPointsWifiSettingsTest.java
+++ /dev/null
@@ -1,68 +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.wifi.savedaccesspoints;
-
-import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.settings.R;
-import com.android.settingslib.core.AbstractPreferenceController;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-
-@RunWith(RobolectricTestRunner.class)
-public class SavedAccessPointsWifiSettingsTest {
-
-    @Mock
-    private SubscribedAccessPointsPreferenceController mSubscribedApController;
-    @Mock
-    private SavedAccessPointsPreferenceController mSavedApController;
-
-    private TestFragment mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mSettings = spy(new TestFragment());
-
-        doReturn(mSubscribedApController).when(mSettings)
-                .use(SubscribedAccessPointsPreferenceController.class);
-        doReturn(mSavedApController).when(mSettings)
-                .use(SavedAccessPointsPreferenceController.class);
-    }
-
-    @Test
-    public void verifyConstants() {
-        assertThat(mSettings.getMetricsCategory()).isEqualTo(MetricsEvent.WIFI_SAVED_ACCESS_POINTS);
-        assertThat(mSettings.getPreferenceScreenResId())
-                .isEqualTo(R.xml.wifi_display_saved_access_points);
-    }
-
-    public static class TestFragment extends SavedAccessPointsWifiSettings {
-
-        public <T extends AbstractPreferenceController> T use(Class<T> clazz) {
-            return super.use(clazz);
-        }
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java
deleted file mode 100644
index 74f94e9..0000000
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints/SubscribedAccessPointsPreferenceControllerTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.savedaccesspoints;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.ArgumentMatchers.any;
-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.net.wifi.EAPConstants;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiManager;
-import android.net.wifi.hotspot2.PasspointConfiguration;
-import android.net.wifi.hotspot2.pps.Credential;
-import android.net.wifi.hotspot2.pps.HomeSp;
-
-import androidx.preference.PreferenceCategory;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.testutils.shadow.ShadowAccessPoint;
-import com.android.settings.testutils.shadow.ShadowWifiManager;
-import com.android.settingslib.wifi.AccessPointPreference;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowWifiManager.class})
-public class SubscribedAccessPointsPreferenceControllerTest {
-
-    @Mock
-    private PreferenceScreen mPreferenceScreen;
-    @Mock
-    private PreferenceCategory mPreferenceCategory;
-
-    private Context mContext;
-    private WifiManager mWifiManager;
-    private SavedAccessPointsWifiSettings mSettings;
-    private SubscribedAccessPointsPreferenceController mController;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = RuntimeEnvironment.application;
-        mWifiManager = mContext.getSystemService(WifiManager.class);
-        mSettings = spy(new SavedAccessPointsWifiSettings());
-        mController = spy(new SubscribedAccessPointsPreferenceController(mContext, "test_key"));
-        mController.setHost(mSettings);
-
-        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
-                .thenReturn(mPreferenceCategory);
-        when(mPreferenceCategory.getContext()).thenReturn(mContext);
-    }
-
-    @Test
-    @Config(shadows = ShadowAccessPoint.class)
-    public void displayPreference_oneAccessPoint_shouldNotListNonSubscribedAPs() {
-        final WifiConfiguration config = new WifiConfiguration();
-        config.SSID = "SSID";
-        config.BSSID = "BSSID";
-        config.networkId = 2;
-        mWifiManager.addNetwork(config);
-
-        mController.displayPreference(mPreferenceScreen);
-
-        verify(mPreferenceCategory, never()).addPreference(any(AccessPointPreference.class));
-    }
-
-    @Test
-    @Config(shadows = ShadowAccessPoint.class)
-    public void displayPreference_onePasspoint_shouldListSubscribedAPs() {
-        mWifiManager.addOrUpdatePasspointConfiguration(createMockPasspointConfiguration());
-
-        mController.displayPreference(mPreferenceScreen);
-
-        final ArgumentCaptor<AccessPointPreference> captor =
-                ArgumentCaptor.forClass(AccessPointPreference.class);
-        verify(mPreferenceCategory).addPreference(captor.capture());
-
-        final AccessPointPreference pref = captor.getValue();
-        assertThat(pref.getTitle()).isEqualTo("TESTPASSPOINT");
-    }
-
-    public static PasspointConfiguration createMockPasspointConfiguration() {
-        final PasspointConfiguration config = new PasspointConfiguration();
-        final HomeSp homeSp = new HomeSp();
-        homeSp.setFqdn("FQDN");
-        homeSp.setFriendlyName("TESTPASSPOINT");
-        config.setHomeSp(homeSp);
-        final Credential.SimCredential simCredential = new Credential.SimCredential();
-        final Credential credential = new Credential();
-        credential.setRealm("test.example.com");
-        simCredential.setImsi("12345*");
-        simCredential.setEapType(EAPConstants.EAP_SIM);
-        credential.setSimCredential(simCredential);
-        config.setCredential(credential);
-        return config;
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsPreferenceController2Test.java
index acc6543..7b7a3b1 100644
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsPreferenceController2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsPreferenceController2Test.java
@@ -21,8 +21,12 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -119,4 +123,23 @@
 
         assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(0);
     }
+
+    @Test
+    public void onPreferenceClick_shouldCallShowWifiPage() {
+        mContext = spy(RuntimeEnvironment.application);
+        doNothing().when(mContext).startActivity(any());
+        doReturn(mContext).when(mSettings).getContext();
+
+        final String title = "ssid_title";
+        final String key = "key";
+        final WifiEntry mockWifiEntry = mock(WifiEntry.class);
+        when(mockWifiEntry.getTitle()).thenReturn(title);
+        when(mockWifiEntry.getKey()).thenReturn(key);
+        final WifiEntryPreference preference = new WifiEntryPreference(mContext, mockWifiEntry);
+        preference.setKey(key);
+
+        mController.onPreferenceClick(preference);
+
+        verify(mSettings, times(1)).showWifiPage(key, title);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java
index ab1b51c..657d3a7 100644
--- a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java
+++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SavedAccessPointsWifiSettings2Test.java
@@ -18,8 +18,18 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
@@ -30,7 +40,9 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 
 @RunWith(RobolectricTestRunner.class)
 public class SavedAccessPointsWifiSettings2Test {
@@ -41,11 +53,15 @@
     private SavedAccessPointsPreferenceController2 mSavedApController;
 
     private TestFragment mSettings;
+    private Context mContext;
+    private FragmentActivity mActivity;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application);
         mSettings = spy(new TestFragment());
+        mActivity = Robolectric.setupActivity(FragmentActivity.class);
 
         doReturn(mSubscribedApController).when(mSettings)
                 .use(SubscribedAccessPointsPreferenceController2.class);
@@ -60,6 +76,54 @@
                 .isEqualTo(R.xml.wifi_display_saved_access_points2);
     }
 
+    @Test
+    public void getTag_shouldReturnRightTag() {
+        assertThat(mSettings.getLogTag()).isEqualTo(SavedAccessPointsWifiSettings2.TAG);
+    }
+
+    @Test
+    public void onAttach_shouldCallSavedControllerSetHost() {
+        mSettings.onAttach(mContext);
+
+        verify(mSavedApController, times(1)).setHost(any());
+    }
+
+    @Test
+    public void onAttach_shouldCallSubscriptionControllerSetHost() {
+        mSettings.onAttach(mContext);
+
+        verify(mSubscribedApController, times(1)).setHost(any());
+    }
+
+    @Test
+    public void onCreate_shouldNewSavedNetworkTracker() {
+        mSettings = new TestFragment();
+        final FragmentManager fragmentManager = mActivity.getSupportFragmentManager();
+        final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+        fragmentTransaction.add(mSettings, null /* tag */);
+        fragmentTransaction.commit();
+        final Bundle bundle = new Bundle();
+
+        mSettings.onCreate(bundle);
+
+        assertThat(mSettings.mSavedNetworkTracker).isNotNull();
+    }
+
+    @Test
+    public void onDestroy_shouldTerminateWorkerThread() {
+        mSettings = new TestFragment();
+        final FragmentManager fragmentManager = mActivity.getSupportFragmentManager();
+        final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+        fragmentTransaction.add(mSettings, null /* tag */);
+        fragmentTransaction.commit();
+        final Bundle bundle = new Bundle();
+        mSettings.onCreate(bundle);
+
+        mSettings.onDestroy();
+
+        assertThat(mSettings.mWorkerThread.getState()).isEqualTo(Thread.State.TERMINATED);
+    }
+
     public static class TestFragment extends SavedAccessPointsWifiSettings2 {
 
         public <T extends AbstractPreferenceController> T use(Class<T> clazz) {
diff --git a/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SubscribedAccessPointsPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SubscribedAccessPointsPreferenceController2Test.java
new file mode 100644
index 0000000..93323fb
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/savedaccesspoints2/SubscribedAccessPointsPreferenceController2Test.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.savedaccesspoints2;
+
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+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 androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+import java.util.ArrayList;
+
+@RunWith(RobolectricTestRunner.class)
+public class SubscribedAccessPointsPreferenceController2Test {
+
+    @Mock
+    private PreferenceScreen mPreferenceScreen;
+    @Mock
+    private PreferenceCategory mPreferenceCategory;
+
+    private Context mContext;
+    private SavedAccessPointsWifiSettings2 mSettings;
+    private SubscribedAccessPointsPreferenceController2 mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mSettings = spy(new SavedAccessPointsWifiSettings2());
+        mController = spy(new SubscribedAccessPointsPreferenceController2(mContext, "test_key"));
+        mController.setHost(mSettings);
+
+        when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
+                .thenReturn(mPreferenceCategory);
+        when(mPreferenceCategory.getContext()).thenReturn(mContext);
+    }
+
+    @Test
+    public void getAvailability_noSubscripbedAccessPoint_shouldNotAvailable() {
+        mController.mWifiEntries = new ArrayList<>();
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+}
+
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
index ac1384f..829ec8f 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/ConnectToWifiHandlerTest.java
@@ -26,95 +26,69 @@
 import static org.mockito.Mockito.when;
 
 import android.content.Context;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.NetworkSelectionStatus;
-import android.net.wifi.WifiManager;
+import android.content.Intent;
 
-import com.android.settings.testutils.shadow.ShadowWifiManager;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.settings.wifi.WifiDialogActivity;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiEntry.ConnectCallback;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = ShadowWifiManager.class)
 public class ConnectToWifiHandlerTest {
 
     private static final String AP_SSID = "\"ap\"";
     private Context mContext;
     private ConnectToWifiHandler mHandler;
-    private WifiConfiguration mWifiConfig;
     @Mock
-    private AccessPoint mAccessPoint;
+    private WifiScanWorker mWifiScanWorker;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
 
-        mContext = RuntimeEnvironment.application;
-        mHandler = new ConnectToWifiHandler();
-        mWifiConfig = spy(new WifiConfiguration());
-        mWifiConfig.SSID = AP_SSID;
-        doReturn(mWifiConfig).when(mAccessPoint).getConfig();
+        mContext = spy(RuntimeEnvironment.application);
+        mHandler = spy(new ConnectToWifiHandler());
+        doReturn(mWifiScanWorker).when(mHandler).getWifiScanWorker(any());
     }
 
     @Test
-    public void connect_shouldConnectToUnsavedOpenNetwork() {
-        when(mAccessPoint.isSaved()).thenReturn(false);
-        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_NONE);
+    public void onReceive_nonNullKeyAndUri_shouldConnectWifintry() {
+        final Intent intent = new Intent();
+        final String key = "key";
+        intent.putExtra(ConnectToWifiHandler.KEY_CHOSEN_WIFIENTRY_KEY, key);
+        intent.putExtra(ConnectToWifiHandler.KEY_WIFI_SLICE_URI,
+                com.android.settings.slices.CustomSliceRegistry.WIFI_SLICE_URI);
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(mWifiScanWorker.getWifiEntry(key)).thenReturn(wifiEntry);
 
-        mHandler.connect(mContext, mAccessPoint);
+        mHandler.onReceive(mContext, intent);
 
-        assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP_SSID);
+        verify(wifiEntry).connect(any());
     }
 
     @Test
-    public void connect_shouldStartOsuProvisioning() {
-        when(mAccessPoint.isSaved()).thenReturn(false);
-        when(mAccessPoint.isOsuProvider()).thenReturn(true);
+    public void onConnectResult_failNoConfig_shouldStartActivity() {
+        final String key = "key";
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getKey()).thenReturn(key);
+        final ConnectToWifiHandler.WifiEntryConnectCallback callback =
+                spy(new ConnectToWifiHandler.WifiEntryConnectCallback(mContext, wifiEntry));
 
-        mHandler.connect(mContext, mAccessPoint);
+        callback.onConnectResult(ConnectCallback.CONNECT_STATUS_FAILURE_NO_CONFIG);
 
-        verify(mAccessPoint).startOsuProvisioning(any(WifiManager.ActionListener.class));
-    }
-
-
-    @Test
-    public void connect_shouldConnectWithPasspointProvider() {
-        when(mAccessPoint.isSaved()).thenReturn(false);
-        when(mAccessPoint.isPasspoint()).thenReturn(true);
-
-        mHandler.connect(mContext, mAccessPoint);
-
-        assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP_SSID);
-    }
-
-    @Test
-    public void connect_shouldConnectToSavedSecuredNetwork() {
-        when(mAccessPoint.isSaved()).thenReturn(true);
-        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
-        final NetworkSelectionStatus status = mock(NetworkSelectionStatus.class);
-        when(status.hasEverConnected()).thenReturn(true);
-        when(mWifiConfig.getNetworkSelectionStatus()).thenReturn(status);
-
-        mHandler.connect(mContext, mAccessPoint);
-
-        assertThat(ShadowWifiManager.get().savedWifiConfig.SSID).isEqualTo(AP_SSID);
-    }
-
-    @Test
-    public void connect_shouldNotConnectToUnsavedSecuredNetwork() {
-        when(mAccessPoint.isSaved()).thenReturn(false);
-        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
-
-        mHandler.connect(mContext, mAccessPoint);
-
-        assertThat(ShadowWifiManager.get().savedWifiConfig).isNull();
+        final ArgumentCaptor<Intent> argument = ArgumentCaptor.forClass(Intent.class);
+        verify(mContext).startActivity(argument.capture());
+        assertThat(argument.getValue().getStringExtra(WifiDialogActivity.KEY_CHOSEN_WIFIENTRY_KEY))
+                .isEqualTo(key);
+        assertThat(argument.getValue().getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK)
+                .isEqualTo(Intent.FLAG_ACTIVITY_NEW_TASK);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiScanWorkerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiScanWorkerTest.java
deleted file mode 100644
index 0e52520..0000000
--- a/tests/robotests/src/com/android/settings/wifi/slice/ContextualWifiScanWorkerTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package com.android.settings.wifi.slice;
-
-import static com.android.settings.slices.CustomSliceRegistry.CONTEXTUAL_WIFI_SLICE_URI;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.Network;
-import android.net.wifi.WifiManager;
-import android.os.UserHandle;
-
-import com.android.settings.testutils.shadow.ShadowWifiManager;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-
-@RunWith(RobolectricTestRunner.class)
-@Config(shadows = {
-        ShadowWifiManager.class,
-        WifiScanWorkerTest.ShadowWifiTracker.class,
-})
-public class ContextualWifiScanWorkerTest {
-
-    private Context mContext;
-    private WifiManager mWifiManager;
-    private ConnectivityManager mConnectivityManager;
-    private ContextualWifiScanWorker mWifiScanWorker;
-    private ConnectToWifiHandler mConnectToWifiHandler;
-
-    @Before
-    public void setUp() {
-        mContext = spy(RuntimeEnvironment.application);
-        mWifiManager = mContext.getSystemService(WifiManager.class);
-        mWifiManager.setWifiEnabled(true);
-
-        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
-        mWifiScanWorker = new ContextualWifiScanWorker(mContext, CONTEXTUAL_WIFI_SLICE_URI);
-        mConnectToWifiHandler = new ConnectToWifiHandler();
-    }
-
-    @After
-    public void tearDown() {
-        mWifiScanWorker.clearClickedWifi();
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_sliceIsUnpinned_shouldSendBroadcast() {
-        final Intent intent = WifiScanWorkerTest.getIntentWithAccessPoint("ap1");
-        WifiScanWorkerTest.setConnectionInfoSSID("ap1");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-        final NetworkCallback callback = mWifiScanWorker.mNetworkCallback;
-
-        mWifiScanWorker.onSlicePinned();
-        mConnectToWifiHandler.onReceive(mContext, intent);
-        mWifiScanWorker.onSliceUnpinned();
-        callback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mContext).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_newSession_shouldNotSendBroadcast() {
-        final Intent intent = WifiScanWorkerTest.getIntentWithAccessPoint("ap1");
-        WifiScanWorkerTest.setConnectionInfoSSID("ap1");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-
-        mConnectToWifiHandler.onReceive(mContext, intent);
-        ContextualWifiScanWorker.newVisibleUiSession();
-        mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
-    }
-}
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java b/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
index 3319543..2a8d265 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiScanWorkerTest.java
@@ -17,216 +17,115 @@
 package com.android.settings.wifi.slice;
 
 import static com.android.settings.slices.CustomSliceRegistry.WIFI_SLICE_URI;
-import static com.android.settings.wifi.WifiDialogActivity.KEY_ACCESS_POINT_STATE;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.NetworkCallback;
-import android.net.Network;
-import android.net.NetworkInfo;
-import android.net.NetworkInfo.DetailedState;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.UserHandle;
+import androidx.lifecycle.Lifecycle;
 
-import com.android.settings.slices.ShadowSliceBackgroundWorker;
-import com.android.settings.testutils.shadow.ShadowWifiManager;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
+import com.android.wifitrackerlib.MergedCarrierEntry;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
 
-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.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.annotation.Implementation;
-import org.robolectric.annotation.Implements;
-import org.robolectric.shadows.ShadowNetworkInfo;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowSliceBackgroundWorker.class, ShadowWifiManager.class,
-        WifiScanWorkerTest.ShadowWifiTracker.class})
 public class WifiScanWorkerTest {
 
-    private Context mContext;
-    private ContentResolver mResolver;
-    private WifiManager mWifiManager;
-    private ConnectivityManager mConnectivityManager;
     private WifiScanWorker mWifiScanWorker;
-    private ConnectToWifiHandler mConnectToWifiHandler;
+    @Mock
+    WifiPickerTracker mWifiPickerTracker;
+    @Mock
+    MergedCarrierEntry mMergedCarrierEntry;
 
     @Before
     public void setUp() {
-        mContext = spy(RuntimeEnvironment.application);
-        mResolver = mock(ContentResolver.class);
-        doReturn(mResolver).when(mContext).getContentResolver();
-        mWifiManager = mContext.getSystemService(WifiManager.class);
-        mWifiManager.setWifiEnabled(true);
+        MockitoAnnotations.initMocks(this);
 
-        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
-        mWifiScanWorker = new WifiScanWorker(mContext, WIFI_SLICE_URI);
-        mConnectToWifiHandler = new ConnectToWifiHandler();
-    }
-
-    @After
-    public void tearDown() {
-        mWifiScanWorker.clearClickedWifi();
+        mWifiScanWorker = new WifiScanWorker(RuntimeEnvironment.application, WIFI_SLICE_URI);
+        mWifiScanWorker.mWifiPickerTracker = mWifiPickerTracker;
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
     }
 
     @Test
-    public void onWifiStateChanged_shouldNotifyChange() {
-        mWifiScanWorker.onWifiStateChanged(WifiManager.WIFI_STATE_DISABLED);
-
-        verify(mResolver).notifyChange(WIFI_SLICE_URI, null);
+    public void onConstructor_shouldBeInCreatedState() {
+        assertThat(mWifiScanWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.CREATED);
     }
 
     @Test
-    public void AccessPointList_sameState_shouldBeTheSame() {
-        final AccessPoint ap1 = createAccessPoint(DetailedState.CONNECTED);
-        final AccessPoint ap2 = createAccessPoint(DetailedState.CONNECTED);
-
-        assertThat(mWifiScanWorker.areListsTheSame(Arrays.asList(ap1), Arrays.asList(ap2)))
-                .isTrue();
-    }
-
-    @Test
-    public void AccessPointList_differentState_shouldBeDifferent() {
-        final AccessPoint ap1 = createAccessPoint(DetailedState.CONNECTING);
-        final AccessPoint ap2 = createAccessPoint(DetailedState.CONNECTED);
-
-        assertThat(mWifiScanWorker.areListsTheSame(Arrays.asList(ap1), Arrays.asList(ap2)))
-                .isFalse();
-    }
-
-    @Test
-    public void AccessPointList_differentListLength_shouldBeDifferent() {
-        final AccessPoint ap1 = createAccessPoint(DetailedState.CONNECTED);
-        final AccessPoint ap2 = createAccessPoint(DetailedState.CONNECTED);
-        final List<AccessPoint> list = new ArrayList<>();
-        list.add(ap1);
-        list.add(ap2);
-
-        assertThat(mWifiScanWorker.areListsTheSame(list, Arrays.asList(ap1))).isFalse();
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_shouldNotifyChange() {
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-
-        mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mResolver).notifyChange(WIFI_SLICE_URI, null);
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_isClickedWifi_shouldSendBroadcast() {
-        final Intent intent = getIntentWithAccessPoint("ap1");
-        setConnectionInfoSSID("ap1");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-
-        mConnectToWifiHandler.onReceive(mContext, intent);
-        mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mContext).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_isNotClickedWifi_shouldNotSendBroadcast() {
-        final Intent intent = getIntentWithAccessPoint("ap1");
-        setConnectionInfoSSID("ap2");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-
-        mConnectToWifiHandler.onReceive(mContext, intent);
-        mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_neverClickWifi_shouldNotSendBroadcast() {
-        setConnectionInfoSSID("ap1");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-
-        mWifiScanWorker.mNetworkCallback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
-
-        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
-    }
-
-    @Test
-    public void NetworkCallback_onCapabilitiesChanged_sliceIsUnpinned_shouldNotSendBroadcast() {
-        final Intent intent = getIntentWithAccessPoint("ap1");
-        setConnectionInfoSSID("ap1");
-        final Network network = mConnectivityManager.getActiveNetwork();
-        mWifiScanWorker.registerNetworkCallback(network);
-        final NetworkCallback callback = mWifiScanWorker.mNetworkCallback;
-
+    public void onSlicePinned_shouldBeInResumedState() {
         mWifiScanWorker.onSlicePinned();
-        mConnectToWifiHandler.onReceive(mContext, intent);
+
+        assertThat(mWifiScanWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.RESUMED);
+    }
+
+    @Test
+    public void onSliceUnpinned_shouldBeInCreatedState() {
         mWifiScanWorker.onSliceUnpinned();
-        callback.onCapabilitiesChanged(network,
-                WifiSliceTest.makeCaptivePortalNetworkCapabilities());
 
-        verify(mContext, never()).sendBroadcastAsUser(any(Intent.class), eq(UserHandle.CURRENT));
+        assertThat(mWifiScanWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.CREATED);
     }
 
-    static Intent getIntentWithAccessPoint(String ssid) {
-        final Bundle savedState = new Bundle();
-        savedState.putString("key_ssid", ssid);
-        return new Intent().putExtra(KEY_ACCESS_POINT_STATE, savedState);
+    @Test
+    public void close_shouldBeInDestroyedState() {
+        mWifiScanWorker.close();
+
+        assertThat(mWifiScanWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.DESTROYED);
     }
 
-    static void setConnectionInfoSSID(String ssid) {
-        final WifiInfo wifiInfo = mock(WifiInfo.class);
-        when(wifiInfo.getSSID()).thenReturn(ssid);
-        ShadowWifiManager.get().setConnectionInfo(wifiInfo);
+    @Test
+    public void getWifiEntry_connectedWifiKey_shouldGetConnectedWifi() {
+        final String key = "key";
+        final WifiEntry connectedWifiEntry = mock(WifiEntry.class);
+        when(connectedWifiEntry.getKey()).thenReturn(key);
+        when(mWifiPickerTracker.getConnectedWifiEntry()).thenReturn(connectedWifiEntry);
+
+        assertThat(mWifiScanWorker.getWifiEntry(key)).isEqualTo(connectedWifiEntry);
     }
 
-    private AccessPoint createAccessPoint(String ssid, DetailedState detailedState) {
-        final NetworkInfo info = ShadowNetworkInfo.newInstance(detailedState, 1 /* type */,
-                0 /*subType */, true /* isAvailable */, true /* isConnected */);
-        final Bundle savedState = new Bundle();
-        savedState.putString("key_ssid", ssid);
-        savedState.putParcelable("key_networkinfo", info);
-        return new AccessPoint(mContext, savedState);
+    @Test
+    public void getWifiEntry_reachableWifiKey_shouldGetReachableWifi() {
+        final String key = "key";
+        final WifiEntry reachableWifiEntry = mock(WifiEntry.class);
+        when(reachableWifiEntry.getKey()).thenReturn(key);
+        when(mWifiPickerTracker.getWifiEntries()).thenReturn(Arrays.asList(reachableWifiEntry));
+
+        assertThat(mWifiScanWorker.getWifiEntry(key)).isEqualTo(reachableWifiEntry);
     }
 
-    private AccessPoint createAccessPoint(DetailedState detailedState) {
-        return createAccessPoint("ap", detailedState);
+    @Test
+    public void setCarrierNetworkEnabled_shouldCallMergedCarrierEntrySetEnabled() {
+        mWifiScanWorker.setCarrierNetworkEnabled(true);
+
+        verify(mMergedCarrierEntry).setEnabled(true);
+
+        mWifiScanWorker.setCarrierNetworkEnabled(false);
+
+        verify(mMergedCarrierEntry).setEnabled(false);
     }
 
-    @Implements(WifiTracker.class)
-    public static class ShadowWifiTracker {
-        @Implementation
-        public void onStart() {
-            // do nothing
-        }
+    @Test
+    public void connectCarrierNetwork_shouldCallMergedCarrierEntryConnect() {
+        when(mMergedCarrierEntry.canConnect()).thenReturn(true);
+
+        mWifiScanWorker.connectCarrierNetwork();
+
+        verify(mMergedCarrierEntry).connect(any());
     }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
index ad74a32..5431540 100644
--- a/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/slice/WifiSliceTest.java
@@ -23,17 +23,14 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
 
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.wifi.WifiManager;
 
@@ -49,7 +46,8 @@
 import com.android.settings.R;
 import com.android.settings.slices.SliceBackgroundWorker;
 import com.android.settings.testutils.SliceTester;
-import com.android.settingslib.wifi.AccessPoint;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiEntry.ConnectedState;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -74,7 +72,6 @@
     private Context mContext;
     private ContentResolver mResolver;
     private WifiManager mWifiManager;
-    private ConnectivityManager mConnectivityManager;
     private WifiSlice mWifiSlice;
 
     @Before
@@ -88,9 +85,6 @@
         SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
         mWifiManager.setWifiEnabled(true);
 
-        mConnectivityManager = spy(mContext.getSystemService(ConnectivityManager.class));
-        doReturn(mConnectivityManager).when(mContext).getSystemService(ConnectivityManager.class);
-
         mWifiSlice = new WifiSlice(mContext);
     }
 
@@ -138,33 +132,42 @@
                 mContext.getString(R.string.wifi_empty_list_wifi_on));
     }
 
-    private AccessPoint createAccessPoint(String name, boolean active, boolean reachable) {
-        final AccessPoint accessPoint = mock(AccessPoint.class);
-        doReturn(name).when(accessPoint).getTitle();
-        doReturn(active).when(accessPoint).isActive();
-        doReturn(reachable).when(accessPoint).isReachable();
-        if (active) {
-            final NetworkInfo networkInfo = mock(NetworkInfo.class);
-            doReturn(networkInfo).when(accessPoint).getNetworkInfo();
-            doReturn(NetworkInfo.State.CONNECTED).when(networkInfo).getState();
-        }
-        return accessPoint;
+    private WifiSliceItem createWifiSliceItem(String title, @ConnectedState int connectedState) {
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getTitle()).thenReturn(title);
+        when(wifiEntry.getKey()).thenReturn("key");
+        when(wifiEntry.getConnectedState()).thenReturn(connectedState);
+        when(wifiEntry.getLevel()).thenReturn(WifiEntry.WIFI_LEVEL_MAX);
+        return new WifiSliceItem(mContext, wifiEntry);
     }
 
-    private void setWorkerResults(AccessPoint... accessPoints) {
-        final ArrayList<AccessPoint> results = new ArrayList<>();
-        for (AccessPoint ap : accessPoints) {
-            results.add(ap);
+    private void setWorkerResults(WifiSliceItem... wifiSliceItems) {
+        final ArrayList<WifiSliceItem> results = new ArrayList<>();
+        for (WifiSliceItem wifiSliceItem : wifiSliceItems) {
+            results.add(wifiSliceItem);
         }
         final SliceBackgroundWorker worker = SliceBackgroundWorker.getInstance(mWifiSlice.getUri());
         doReturn(results).when(worker).getResults();
     }
 
     @Test
-    public void getWifiSlice_noReachableAp_shouldReturnLoadingRow() {
+    public void getWifiSlice_oneConnectedAp_shouldReturnLoadingRow() {
+        setWorkerResults(createWifiSliceItem(AP1_NAME, WifiEntry.CONNECTED_STATE_CONNECTED));
+
+        final Slice wifiSlice = mWifiSlice.getSlice();
+        final List<SliceItem> sliceItems = wifiSlice.getItems();
+
+        SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME);
+        // Has scanning text
+        SliceTester.assertAnySliceItemContainsSubtitle(sliceItems,
+                mContext.getString(R.string.wifi_empty_list_wifi_on));
+    }
+
+    @Test
+    public void getWifiSlice_oneConnectedApAndOneDisconnectedAp_shouldReturnLoadingRow() {
         setWorkerResults(
-                createAccessPoint(AP1_NAME, false, false),
-                createAccessPoint(AP2_NAME, false, false));
+                createWifiSliceItem(AP1_NAME, WifiEntry.CONNECTED_STATE_CONNECTED),
+                createWifiSliceItem(AP2_NAME, WifiEntry.CONNECTED_STATE_DISCONNECTED));
 
         final Slice wifiSlice = mWifiSlice.getSlice();
         final List<SliceItem> sliceItems = wifiSlice.getItems();
@@ -177,8 +180,8 @@
     }
 
     @Test
-    public void getWifiSlice_oneActiveAp_shouldReturnLoadingRow() {
-        setWorkerResults(createAccessPoint(AP1_NAME, true, true));
+    public void getWifiSlice_oneDisconnectedAp_shouldReturnLoadingRow() {
+        setWorkerResults(createWifiSliceItem(AP1_NAME, WifiEntry.CONNECTED_STATE_DISCONNECTED));
 
         final Slice wifiSlice = mWifiSlice.getSlice();
         final List<SliceItem> sliceItems = wifiSlice.getItems();
@@ -190,40 +193,11 @@
     }
 
     @Test
-    public void getWifiSlice_oneActiveApAndOneUnreachableAp_shouldReturnLoadingRow() {
+    public void getWifiSlice_apReachExpandedCount_shouldNotReturnLoadingRow() {
         setWorkerResults(
-                createAccessPoint(AP1_NAME, true, true),
-                createAccessPoint(AP2_NAME, false, false));
-
-        final Slice wifiSlice = mWifiSlice.getSlice();
-        final List<SliceItem> sliceItems = wifiSlice.getItems();
-
-        SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME);
-        SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP2_NAME);
-        // Has scanning text
-        SliceTester.assertAnySliceItemContainsSubtitle(sliceItems,
-                mContext.getString(R.string.wifi_empty_list_wifi_on));
-    }
-
-    @Test
-    public void getWifiSlice_oneReachableAp_shouldReturnLoadingRow() {
-        setWorkerResults(createAccessPoint(AP1_NAME, false, true));
-
-        final Slice wifiSlice = mWifiSlice.getSlice();
-        final List<SliceItem> sliceItems = wifiSlice.getItems();
-
-        SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME);
-        // Has scanning text
-        SliceTester.assertAnySliceItemContainsSubtitle(sliceItems,
-                mContext.getString(R.string.wifi_empty_list_wifi_on));
-    }
-
-    @Test
-    public void getWifiSlice_allReachableAps_shouldNotReturnLoadingRow() {
-        setWorkerResults(
-                createAccessPoint(AP1_NAME, false, true),
-                createAccessPoint(AP2_NAME, false, true),
-                createAccessPoint(AP3_NAME, false, true));
+                createWifiSliceItem(AP1_NAME, WifiEntry.CONNECTED_STATE_DISCONNECTED),
+                createWifiSliceItem(AP2_NAME, WifiEntry.CONNECTED_STATE_DISCONNECTED),
+                createWifiSliceItem(AP3_NAME, WifiEntry.CONNECTED_STATE_DISCONNECTED));
 
         final Slice wifiSlice = mWifiSlice.getSlice();
         final List<SliceItem> sliceItems = wifiSlice.getItems();
@@ -237,29 +211,6 @@
     }
 
     @Test
-    public void getWifiSlice_isCaptivePortal_shouldHaveCaptivePortalItems() {
-        setWorkerResults(createAccessPoint(AP1_NAME, true, true));
-        doReturn(makeCaptivePortalNetworkCapabilities()).when(mConnectivityManager)
-                .getNetworkCapabilities(any());
-        final IconCompat expectedIcon = IconCompat.createWithResource(mContext,
-                R.drawable.ic_settings_accent);
-
-        final Slice wifiSlice = mWifiSlice.getSlice();
-        final List<SliceItem> sliceItems = wifiSlice.getItems();
-
-        SliceTester.assertAnySliceItemContainsTitle(sliceItems, AP1_NAME);
-        SliceTester.assertAnySliceItemContainsIcon(sliceItems, expectedIcon);
-    }
-
-    static NetworkCapabilities makeCaptivePortalNetworkCapabilities() {
-        final NetworkCapabilities nc = new NetworkCapabilities();
-        nc.clearAll();
-        nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
-        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
-        return nc;
-    }
-
-    @Test
     public void handleUriChange_updatesWifi() {
         final Intent intent = mWifiSlice.getIntent();
         intent.putExtra(android.app.slice.Slice.EXTRA_TOGGLE_STATE, true);
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
index b62f1ba..920582f 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java
@@ -31,7 +31,7 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.PrimarySwitchPreference;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 
 import org.junit.Before;
@@ -66,7 +66,7 @@
     private WifiTetherPreferenceController mController;
     private Lifecycle mLifecycle;
     private LifecycleOwner mLifecycleOwner;
-    private MasterSwitchPreference mPreference;
+    private PrimarySwitchPreference mPreference;
 
     @Before
     public void setUp() {
@@ -76,7 +76,7 @@
         mLifecycleOwner = () -> mLifecycle;
         mLifecycle = new Lifecycle(mLifecycleOwner);
         FakeFeatureFactory.setupForTest();
-        mPreference = new MasterSwitchPreference(RuntimeEnvironment.application);
+        mPreference = new PrimarySwitchPreference(RuntimeEnvironment.application);
         when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE))
                 .thenReturn(mConnectivityManager);
         when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
index e996b2d..b41616b 100644
--- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
@@ -45,6 +45,7 @@
 import com.android.settings.testutils.shadow.ShadowWifiManager;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -84,6 +85,7 @@
     }
 
     @Test
+    @Ignore
     public void wifiTetherNonIndexableKeys_tetherAvailable_keysNotReturned() {
         FeatureFlagUtils.setEnabled(mContext, FeatureFlags.TETHER_ALL_IN_ONE, false);
         // To let TetherUtil.isTetherAvailable return true, select one of the combinations
diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 583b46e..b857a0a 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -17,6 +17,8 @@
         "androidx.test.espresso.core",
         "androidx.test.espresso.contrib-nodeps",
         "androidx.test.espresso.intents-nodeps",
+        "androidx.test.ext.junit",
+        "androidx.preference_preference",
         "mockito-target-minus-junit4",
         "platform-test-annotations",
         "truth-prebuilt",
diff --git a/tests/unit/AndroidManifest.xml b/tests/unit/AndroidManifest.xml
index c387067..c5f082d 100644
--- a/tests/unit/AndroidManifest.xml
+++ b/tests/unit/AndroidManifest.xml
@@ -31,6 +31,7 @@
     <application>
         <uses-library android:name="android.test.runner" />
         <activity android:name="com.android.settings.tests.BluetoothRequestPermissionTest"
+            android:exported="true"
             android:label="Bluetooth Perm Test" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -38,7 +39,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="Operator" android:label="Operator Hook Test" >
+        <activity android:name="Operator" android:label="Operator Hook Test"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.android.settings.OPERATOR_APPLICATION_SETTING" />
             </intent-filter>
@@ -46,7 +48,8 @@
             <meta-data android:name="com.android.settings.summary" android:resource="@string/operator_settings_summary" />
             <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
         </activity>
-        <activity android:name="Manufacturer" android:label="Manufacturer Hook Test" >
+        <activity android:name="Manufacturer" android:label="Manufacturer Hook Test"
+            android:exported="true">
             <intent-filter>
                 <action android:name="com.android.settings.MANUFACTURER_APPLICATION_SETTING" />
             </intent-filter>
@@ -55,7 +58,8 @@
             <meta-data android:name="com.android.settings.icon" android:resource="@drawable/ic_settings_applications" />
         </activity>
 
-        <service android:name="com.android.settings.accounts.TestAuthService">
+        <service android:name="com.android.settings.accounts.TestAuthService"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
diff --git a/tests/unit/AndroidTest.xml b/tests/unit/AndroidTest.xml
index 9ce7657..b9321a3 100644
--- a/tests/unit/AndroidTest.xml
+++ b/tests/unit/AndroidTest.xml
@@ -19,7 +19,6 @@
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="SettingsUnitTests.apk" />
-        <option name="test-file-name" value="InstrumentedEntitlementApp.apk" />
     </target_preparer>
 
     <option name="test-tag" value="SettingsUnitTests" />
diff --git a/tests/unit/OWNERS b/tests/unit/OWNERS
new file mode 100644
index 0000000..4123742
--- /dev/null
+++ b/tests/unit/OWNERS
@@ -0,0 +1,2 @@
+# Additional reviewers for this and subdirectories.
+goldmanj@google.com
diff --git a/tests/unit/README b/tests/unit/README
index 881602a..5a85603 100644
--- a/tests/unit/README
+++ b/tests/unit/README
@@ -1,8 +1,20 @@
+The simplest way to run all SettingsUnitTests is with atest
+$ atest SettingsUnitTests
+
+A single class can also be tested with the following command
+$ atest -c <YourClassName>
+
+// The following instrutions show how to run the test suite using make + adb //
+
 To build the tests you can use the following command at the root of your android source tree
 $ make SettingsUnitTests
 
-The test apk then needs to be installed onto your test device via for example
-$ adb install -r out/target/product/shamu/data/app/SettingsUnitTests/SettingsUnitTests.apk
+The test apk then needs to be installed onto your test device. The apk's location will vary
+depending on your device model and architecture. At the end of the make command's output, there
+should be a line similar to the following:
+"Copy: out/target/product/shamu/testcases/SettingsUnitTests/arm64/SettingsUnitTests.apk"
+Install via the following command:
+$ adb install -r out/target/product/shamu/testcases/SettingsUnitTests/arm64/SettingsUnitTests.apk
 
 To run all tests:
 $ adb shell am instrument -w com.android.settings.tests.unit/androidx.test.runner.AndroidJUnitRunner
diff --git a/tests/unit/src/com/android/settings/LinkifyUtilsTest.java b/tests/unit/src/com/android/settings/LinkifyUtilsTest.java
new file mode 100644
index 0000000..34586d5
--- /dev/null
+++ b/tests/unit/src/com/android/settings/LinkifyUtilsTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2020 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.text.Spannable;
+import android.text.style.ClickableSpan;
+import android.widget.TextView;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class LinkifyUtilsTest {
+    private static final String TEST_STRING = "to LINK_BEGINscanning settingsLINK_END.";
+    private static final String WRONG_STRING = "to scanning settingsLINK_END.";
+    private final LinkifyUtils.OnClickListener mClickListener = () -> { /* Do nothing */ };
+
+    private StringBuilder mSpanStringBuilder;
+    private StringBuilder mWrongSpanStringBuilder;
+    TextView mTextView;
+
+    @Before
+    public void setUp() throws Exception {
+        mSpanStringBuilder = new StringBuilder(TEST_STRING);
+        mWrongSpanStringBuilder = new StringBuilder(WRONG_STRING);
+        mTextView = new TextView(ApplicationProvider.getApplicationContext());
+    }
+
+    @Test
+    public void linkify_whenSpanStringCorrect_shouldReturnTrue() {
+        final boolean linkifyResult = LinkifyUtils.linkify(mTextView, mSpanStringBuilder,
+                mClickListener);
+
+        assertThat(linkifyResult).isTrue();
+    }
+
+    @Test
+    public void linkify_whenSpanStringWrong_shouldReturnFalse() {
+        final boolean linkifyResult = LinkifyUtils.linkify(mTextView, mWrongSpanStringBuilder,
+                mClickListener);
+
+        assertThat(linkifyResult).isFalse();
+    }
+
+    @Test
+    public void linkify_whenSpanStringCorrect_shouldContainClickableSpan() {
+        LinkifyUtils.linkify(mTextView, mSpanStringBuilder, mClickListener);
+        final Spannable spannableContent = (Spannable) mTextView.getText();
+        final int len = spannableContent.length();
+        final Object[] spans = spannableContent.getSpans(0, len, Object.class);
+
+        assertThat(spans[1] instanceof ClickableSpan).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/TestUtils.java b/tests/unit/src/com/android/settings/TestUtils.java
new file mode 100644
index 0000000..d7b1ea4
--- /dev/null
+++ b/tests/unit/src/com/android/settings/TestUtils.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2020 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;
+
+/**
+ * Convenience methods and constants for testing.
+ */
+public class TestUtils {
+    public static final long KILOBYTE = 1024L; // TODO: Change to 1000 in O Robolectric.
+    public static final long MEGABYTE = KILOBYTE * KILOBYTE;
+    public static final long GIGABYTE = KILOBYTE * MEGABYTE;
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceControllerTest.java
new file mode 100644
index 0000000..7d903ee
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceControllerTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
+import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class AccessibilityShortcutPreferenceControllerTest {
+
+    private Context mContext;
+    private SwitchPreference mPreference;
+    private AccessibilityShortcutPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mPreference = new SwitchPreference(mContext);
+        mController = new AccessibilityShortcutPreferenceController(mContext,
+                "accessibility_shortcut_preference");
+    }
+
+    @Test
+    public void isChecked_enabledShortcutOnLockScreen_shouldReturnTrue() {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, ON, UserHandle.USER_CURRENT);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isTrue();
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_disabledShortcutOnLockScreen_shouldReturnFalse() {
+        Settings.Secure.putIntForUser(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, OFF,
+                UserHandle.USER_CURRENT);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isFalse();
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_setTrue_shouldEnableShortcutOnLockScreen() {
+        mController.setChecked(true);
+
+        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, OFF,
+                UserHandle.USER_CURRENT)).isEqualTo(ON);
+    }
+
+    @Test
+    public void setChecked_setFalse_shouldDisableShortcutOnLockScreen() {
+        mController.setChecked(false);
+
+        assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, ON,
+                UserHandle.USER_CURRENT)).isEqualTo(OFF);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/DisableAnimationsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/DisableAnimationsPreferenceControllerTest.java
new file mode 100644
index 0000000..5706008
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/DisableAnimationsPreferenceControllerTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.android.settings.accessibility.DisableAnimationsPreferenceController.ANIMATION_OFF_VALUE;
+import static com.android.settings.accessibility.DisableAnimationsPreferenceController.ANIMATION_ON_VALUE;
+import static com.android.settings.accessibility.DisableAnimationsPreferenceController.TOGGLE_ANIMATION_TARGETS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DisableAnimationsPreferenceControllerTest {
+
+    private Context mContext;
+    private SwitchPreference mPreference;
+    private DisableAnimationsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mPreference = new SwitchPreference(mContext);
+        mController = new DisableAnimationsPreferenceController(mContext, "disable_animation");
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void isChecked_enabledAnimation_shouldReturnFalse() {
+        for (String animationPreference : TOGGLE_ANIMATION_TARGETS) {
+            Settings.Global.putString(mContext.getContentResolver(), animationPreference,
+                    ANIMATION_ON_VALUE);
+        }
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isFalse();
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_disabledAnimation_shouldReturnTrue() {
+        for (String animationPreference : TOGGLE_ANIMATION_TARGETS) {
+            Settings.Global.putString(mContext.getContentResolver(), animationPreference,
+                    ANIMATION_OFF_VALUE);
+        }
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isTrue();
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void setChecked_disabledAnimation_shouldDisableAnimationTargets() {
+        mController.setChecked(true);
+
+        for (String animationSetting : TOGGLE_ANIMATION_TARGETS) {
+            assertThat(Settings.Global.getString(mContext.getContentResolver(), animationSetting))
+                    .isEqualTo(ANIMATION_OFF_VALUE);
+        }
+    }
+
+    @Test
+    public void setChecked_enabledAnimation_shouldEnableAnimationTargets() {
+        mController.setChecked(false);
+
+        for (String animationSetting : TOGGLE_ANIMATION_TARGETS) {
+            assertThat(Settings.Global.getString(mContext.getContentResolver(), animationSetting))
+                    .isEqualTo(ANIMATION_ON_VALUE);
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceControllerTest.java
new file mode 100644
index 0000000..7f4048d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/FontWeightAdjustmentPreferenceControllerTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class FontWeightAdjustmentPreferenceControllerTest {
+    private static final int ON = FontWeightAdjustmentPreferenceController.BOLD_TEXT_ADJUSTMENT;
+    private static final int OFF = 0;
+
+    private Context mContext;
+    private SwitchPreference mPreference;
+    private FontWeightAdjustmentPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mPreference = new SwitchPreference(mContext);
+        mController = new FontWeightAdjustmentPreferenceController(
+                mContext, "font_weight_adjustment");
+    }
+
+    @Test
+    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void isChecked_enabledBoldText_shouldReturnTrue() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.FONT_WEIGHT_ADJUSTMENT, ON);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isTrue();
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_disabledBoldText_shouldReturnFalse() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.FONT_WEIGHT_ADJUSTMENT, OFF);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isFalse();
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_setTrue_shouldEnableBoldText() {
+        mController.setChecked(true);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.FONT_WEIGHT_ADJUSTMENT, OFF)).isEqualTo(ON);
+    }
+
+    @Test
+    public void setChecked_setFalse_shouldDisableBoldText() {
+        mController.setChecked(false);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.FONT_WEIGHT_ADJUSTMENT, OFF)).isEqualTo(OFF);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/HighTextContrastPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/HighTextContrastPreferenceControllerTest.java
new file mode 100644
index 0000000..6250fef
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/HighTextContrastPreferenceControllerTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class HighTextContrastPreferenceControllerTest {
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+    private static final int UNKNOWN = -1;
+
+    private Context mContext;
+    private SwitchPreference mPreference;
+    private HighTextContrastPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mPreference = new SwitchPreference(mContext);
+        mController = new HighTextContrastPreferenceController(mContext, "text_contrast");
+    }
+
+    @Test
+    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void isChecked_enabledTextContrast_shouldReturnTrue() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, ON);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isTrue();
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_disabledTextContrast_shouldReturnFalse() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, OFF);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isFalse();
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_setTrue_shouldEnableTextContrast() {
+        mController.setChecked(true);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, UNKNOWN)).isEqualTo(ON);
+
+    }
+
+    @Test
+    public void setChecked_setFalse_shouldDisableTextContrast() {
+        mController.setChecked(false);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, UNKNOWN)).isEqualTo(OFF);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java
new file mode 100644
index 0000000..db588e8
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/LargePointerIconPreferenceControllerTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.android.settings.accessibility.LargePointerIconPreferenceController.OFF;
+import static com.android.settings.accessibility.LargePointerIconPreferenceController.ON;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class LargePointerIconPreferenceControllerTest {
+
+    private static final int UNKNOWN = -1;
+
+    private Context mContext;
+    private SwitchPreference mPreference;
+    private LargePointerIconPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mPreference = new SwitchPreference(mContext);
+        mController = new LargePointerIconPreferenceController(mContext, "large_pointer");
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void isChecked_enabledLargePointer_shouldReturnTrue() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, ON);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isTrue();
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_disabledLargePointer_shouldReturnFalse() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, OFF);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isFalse();
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_enabled_shouldEnableLargePointer() {
+        mController.setChecked(true);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, UNKNOWN)).isEqualTo(ON);
+    }
+
+    @Test
+    public void setChecked_disabled_shouldDisableLargePointer() {
+        mController.setChecked(false);
+
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ACCESSIBILITY_LARGE_POINTER_ICON, UNKNOWN)).isEqualTo(OFF);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/MagnificationPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/MagnificationPreferenceControllerTest.java
new file mode 100644
index 0000000..a81c3e4
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/MagnificationPreferenceControllerTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class MagnificationPreferenceControllerTest {
+
+    private Context mContext;
+    private MagnificationPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new MagnificationPreferenceController(mContext, "magnification");
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/PreferredShortcutTest.java b/tests/unit/src/com/android/settings/accessibility/PreferredShortcutTest.java
new file mode 100644
index 0000000..e7d0996
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/PreferredShortcutTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Tests for {@link PreferredShortcut} */
+@RunWith(AndroidJUnit4.class)
+public class PreferredShortcutTest {
+
+    private static final String STUB_COMPONENT_NAME = new ComponentName("com.example",
+            "com.example.testActivity").flattenToString();
+    private static final int STUB_TYPE = 3;
+
+    @Test
+    public void fromString_matchMemberObject() {
+        final String preferredShortcutString = STUB_COMPONENT_NAME + ":" + STUB_TYPE;
+
+        final PreferredShortcut shortcut = PreferredShortcut.fromString(preferredShortcutString);
+
+        assertThat(shortcut.getComponentName()).isEqualTo(STUB_COMPONENT_NAME);
+        assertThat(shortcut.getType()).isEqualTo(STUB_TYPE);
+    }
+
+    @Test
+    public void toString_matchString() {
+        final PreferredShortcut shortcut = new PreferredShortcut(STUB_COMPONENT_NAME, STUB_TYPE);
+
+        final String preferredShortcutString = shortcut.toString();
+
+        assertThat(preferredShortcutString).isEqualTo(STUB_COMPONENT_NAME + ":" + STUB_TYPE);
+    }
+
+    @Test
+    public void assertSameObject() {
+        final String preferredShortcutString = STUB_COMPONENT_NAME + ":" + STUB_TYPE;
+        final PreferredShortcut targetShortcut = PreferredShortcut.fromString(
+                preferredShortcutString);
+
+        assertThat(targetShortcut).isEqualTo(new PreferredShortcut(STUB_COMPONENT_NAME, STUB_TYPE));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java b/tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java
new file mode 100644
index 0000000..95a0b83
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/PreferredShortcutsTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/** Tests for {@link PreferredShortcuts} */
+@RunWith(AndroidJUnit4.class)
+public class PreferredShortcutsTest {
+
+    private static final String PACKAGE_NAME_1 = "com.test1.example";
+    private static final String CLASS_NAME_1 = PACKAGE_NAME_1 + ".test1";
+    private static final ComponentName COMPONENT_NAME_1 = new ComponentName(PACKAGE_NAME_1,
+            CLASS_NAME_1);
+    private static final String PACKAGE_NAME_2 = "com.test2.example";
+    private static final String CLASS_NAME_2 = PACKAGE_NAME_2 + ".test2";
+    private static final ComponentName COMPONENT_NAME_2 = new ComponentName(PACKAGE_NAME_2,
+            CLASS_NAME_2);
+
+    private Context mContext = ApplicationProvider.getApplicationContext();
+
+    @Test
+    public void retrieveUserShortcutType_fromSingleData_matchSavedType() {
+        final int type = 1;
+        final PreferredShortcut shortcut = new PreferredShortcut(COMPONENT_NAME_1.flattenToString(),
+                type);
+
+        PreferredShortcuts.saveUserShortcutType(mContext, shortcut);
+        final int retrieveType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                COMPONENT_NAME_1.flattenToString(), 0);
+
+        assertThat(retrieveType).isEqualTo(type);
+    }
+
+    @Test
+    public void retrieveUserShortcutType_fromMultiData_matchSavedType() {
+        final int type1 = 1;
+        final int type2 = 2;
+        final PreferredShortcut shortcut1 = new PreferredShortcut(
+                COMPONENT_NAME_1.flattenToString(), type1);
+        final PreferredShortcut shortcut2 = new PreferredShortcut(
+                COMPONENT_NAME_2.flattenToString(), type2);
+
+        PreferredShortcuts.saveUserShortcutType(mContext, shortcut1);
+        PreferredShortcuts.saveUserShortcutType(mContext, shortcut2);
+        final int retrieveType = PreferredShortcuts.retrieveUserShortcutType(mContext,
+                COMPONENT_NAME_1.flattenToString(), 0);
+
+        assertThat(retrieveType).isEqualTo(type1);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/PrimaryMonoPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/PrimaryMonoPreferenceControllerTest.java
new file mode 100644
index 0000000..8caeaff
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/PrimaryMonoPreferenceControllerTest.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class PrimaryMonoPreferenceControllerTest {
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+    private static final int UNKNOWN = -1;
+
+    private Context mContext;
+    private SwitchPreference mPreference;
+    private PrimaryMonoPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mPreference = new SwitchPreference(mContext);
+        mController = new PrimaryMonoPreferenceController(mContext, "test_key");
+    }
+
+    @Test
+    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void isChecked_enabledMonoAudio_shouldReturnTrue() {
+        Settings.System.putIntForUser(mContext.getContentResolver(),
+                Settings.System.MASTER_MONO, ON, UserHandle.USER_CURRENT);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isTrue();
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_disabledMonoAudio_shouldReturnFalse() {
+        Settings.System.putIntForUser(mContext.getContentResolver(),
+                Settings.System.MASTER_MONO, OFF, UserHandle.USER_CURRENT);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isFalse();
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_setTrue_shouldEnableMonoAudio() {
+        mController.setChecked(true);
+
+        assertThat(Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.MASTER_MONO, UNKNOWN, UserHandle.USER_CURRENT)).isEqualTo(ON);
+    }
+
+    @Test
+    public void setChecked_setFalse_shouldDisableMonoAudio() {
+        mController.setChecked(false);
+
+        assertThat(Settings.System.getIntForUser(mContext.getContentResolver(),
+                Settings.System.MASTER_MONO, UNKNOWN, UserHandle.USER_CURRENT)).isEqualTo(OFF);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceControllerTest.java
new file mode 100644
index 0000000..dee8817
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsIntensityPreferenceControllerTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ReduceBrightColorsIntensityPreferenceControllerTest {
+
+    private Context mContext;
+    private Resources mResources;
+    private ReduceBrightColorsIntensityPreferenceController mPreferenceController;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mResources = spy(mContext.getResources());
+        when(mContext.getResources()).thenReturn(mResources);
+        mPreferenceController = new ReduceBrightColorsIntensityPreferenceController(mContext,
+                "rbc_intensity");
+    }
+
+    @Test
+    public void isAvailable_configuredRbcAvailable_enabledRbc_shouldReturnTrue() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED, 1);
+        doReturn(true).when(mResources).getBoolean(
+                com.android.internal.R.bool.config_setColorTransformAccelerated);
+        assertThat(mPreferenceController.isAvailable()).isTrue();
+    }
+    @Test
+    public void isAvailable_configuredRbcAvailable_disabledRbc_shouldReturnTrue() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED, 0);
+        doReturn(true).when(mResources).getBoolean(
+                com.android.internal.R.bool.config_setColorTransformAccelerated);
+        assertThat(mPreferenceController.isAvailable()).isTrue();
+    }
+    @Test
+    public void isAvailable_configuredRbcUnavailable_enabledRbc_shouldReturnFalse() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED, 1);
+        doReturn(false).when(mResources).getBoolean(
+                com.android.internal.R.bool.config_setColorTransformAccelerated);
+        assertThat(mPreferenceController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChange_changesTemperature() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.REDUCE_BRIGHT_COLORS_ACTIVATED, 1);
+        mPreferenceController.onPreferenceChange(/* preference= */ null, 20);
+        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.REDUCE_BRIGHT_COLORS_LEVEL, 0))
+                .isEqualTo(20);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceControllerTest.java
new file mode 100644
index 0000000..ef27d73
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/ReduceBrightColorsPersistencePreferenceControllerTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ReduceBrightColorsPersistencePreferenceControllerTest {
+    private static final String PREF_KEY = "rbc_persist";
+    private static final String RBC_PERSIST =
+            Settings.Secure.REDUCE_BRIGHT_COLORS_PERSIST_ACROSS_REBOOTS;
+    private static final int ON = 1;
+    private static final int OFF = 0;
+    private static final int UNKNOWN = -1;
+
+    private final Context mContext = ApplicationProvider.getApplicationContext();
+    private final SwitchPreference mPreference = new SwitchPreference(mContext);
+    private final ReduceBrightColorsPersistencePreferenceController mController =
+            new ReduceBrightColorsPersistencePreferenceController(mContext, PREF_KEY);
+
+    @Test
+    public void isChecked_enabledRbc_shouldReturnTrue() {
+        Settings.Secure.putInt(mContext.getContentResolver(), RBC_PERSIST, ON);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isTrue();
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_disabledRbc_shouldReturnFalse() {
+        Settings.Secure.putInt(mContext.getContentResolver(), RBC_PERSIST, OFF);
+
+        mController.updateState(mPreference);
+
+        assertThat(mController.isChecked()).isFalse();
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_setTrue_shouldEnableRbc() {
+        mController.setChecked(true);
+
+        assertThat(
+                Settings.Secure.getInt(mContext.getContentResolver(), RBC_PERSIST, UNKNOWN))
+                .isEqualTo(ON);
+    }
+
+    @Test
+    public void setChecked_setFalse_shouldDisableRbc() {
+        mController.setChecked(false);
+
+        assertThat(
+                Settings.Secure.getInt(mContext.getContentResolver(), RBC_PERSIST, UNKNOWN))
+                .isEqualTo(OFF);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java b/tests/unit/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java
new file mode 100644
index 0000000..899fc09
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accessibility/SelectLongPressTimeoutPreferenceControllerTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accessibility;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class SelectLongPressTimeoutPreferenceControllerTest {
+    private static final int VALID_VALUE = 1500;
+    private static final int INVALID_VALUE = 0;
+    private static final int DEFAULT_VALUE = 400;
+
+    private Context mContext;
+    private SelectLongPressTimeoutPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new SelectLongPressTimeoutPreferenceController(mContext, "press_timeout");
+    }
+
+    @Test
+    public void getAvailabilityStatus_byDefault_shouldReturnAvailable() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getSummary_byDefault_shouldReturnShort() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LONG_PRESS_TIMEOUT, DEFAULT_VALUE);
+        final String expected = "Short";
+
+        assertThat(mController.getSummary()).isEqualTo(expected);
+    }
+
+    @Test
+    public void getSummary_validValue_shouldReturnLong() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LONG_PRESS_TIMEOUT, VALID_VALUE);
+        final String expected = "Long";
+
+        assertThat(mController.getSummary()).isEqualTo(expected);
+    }
+
+    @Test
+    public void getSummary_invalidValue_shouldReturnNull() {
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.LONG_PRESS_TIMEOUT, INVALID_VALUE);
+
+        assertThat(mController.getSummary()).isNull();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accounts/RemoveUserFragmentTest.java b/tests/unit/src/com/android/settings/accounts/RemoveUserFragmentTest.java
new file mode 100644
index 0000000..e38f42d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accounts/RemoveUserFragmentTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2020 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.accounts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.lang.reflect.Modifier;
+
+@RunWith(AndroidJUnit4.class)
+public class RemoveUserFragmentTest {
+
+    @Test
+    public void testClassModifier_shouldBePublic() {
+        final int modifiers = RemoveUserFragment.class.getModifiers();
+
+        assertThat(Modifier.isPublic(modifiers)).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java b/tests/unit/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java
new file mode 100644
index 0000000..cda6373
--- /dev/null
+++ b/tests/unit/src/com/android/settings/accounts/SyncStateSwitchPreferenceTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 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.accounts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.accounts.Account;
+import android.content.Context;
+import android.os.UserHandle;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class SyncStateSwitchPreferenceTest {
+
+    private Context mContext;
+    private SyncStateSwitchPreference mPreference;
+
+    @Before
+    public void setup() {
+        mContext = ApplicationProvider.getApplicationContext();
+    }
+
+    @Test
+    public void setup_validAuthority_shouldBeVisible() {
+        mPreference = new SyncStateSwitchPreference(mContext, null /* attrs */);
+
+        mPreference.setup(new Account("name", "type"), "authority", mContext.getPackageName(),
+                UserHandle.USER_CURRENT);
+
+        assertThat(mPreference.isVisible()).isTrue();
+    }
+
+    @Test
+    public void setup_emptyAuthority_shouldBeInvisible() {
+        mPreference = new SyncStateSwitchPreference(mContext, null /* attrs */);
+
+        mPreference.setup(new Account("name", "type"), null /* authority */,
+                mContext.getPackageName(), UserHandle.USER_CURRENT);
+
+        assertThat(mPreference.isVisible()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java b/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.java
deleted file mode 100644
index fbbc01a..0000000
--- a/tests/unit/src/com/android/settings/applications/AppOpsSettingsTest.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.applications;
-
-import static android.app.AppOpsManager.MODE_ALLOWED;
-import static android.app.AppOpsManager.MODE_DEFAULT;
-import static android.app.AppOpsManager.MODE_ERRORED;
-import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import android.app.AppOpsManager;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.UserInfo;
-import android.net.Uri;
-import android.os.UserHandle;
-import android.os.UserManager;
-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.widget.Switch;
-import android.widget.TextView;
-
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.test.InstrumentationRegistry;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.List;
-
-/**
- * An abstract parent for testing settings activities that manage an AppOps permission.
- */
-abstract public class AppOpsSettingsTest {
-    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
-    private static final long START_ACTIVITY_TIMEOUT = 5000;
-
-    private Context mContext;
-    private UiDevice mUiDevice;
-    private PackageManager mPackageManager;
-    private AppOpsManager mAppOpsManager;
-    private List<UserInfo> mProfiles;
-    private String mPackageName;
-
-    // These depend on which app op's settings UI is being tested.
-    private final String mActivityAction;
-    private final int mAppOpCode;
-
-    protected AppOpsSettingsTest(String activityAction, int appOpCode) {
-        mActivityAction = activityAction;
-        mAppOpCode = appOpCode;
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
-        mPackageName = InstrumentationRegistry.getContext().getPackageName();
-        mPackageManager = mContext.getPackageManager();
-        mAppOpsManager = mContext.getSystemService(AppOpsManager.class);
-        mProfiles = mContext.getSystemService(UserManager.class).getProfiles(UserHandle.myUserId());
-        resetAppOpModeForAllProfiles();
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mUiDevice.wakeUp();
-        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
-    }
-
-    private void resetAppOpModeForAllProfiles() throws Exception {
-        for (UserInfo user : mProfiles) {
-            final int uid = mPackageManager.getPackageUidAsUser(mPackageName, user.id);
-            mAppOpsManager.setMode(mAppOpCode, uid, mPackageName, MODE_DEFAULT);
-        }
-    }
-
-    /**
-     * Creates an intent for showing the permission settings for all apps.
-     */
-    private Intent createManageAllAppsIntent() {
-        final Intent intent = new Intent(mActivityAction);
-        intent.addFlags(FLAG_ACTIVITY_CLEAR_TASK | FLAG_ACTIVITY_NEW_TASK);
-        return intent;
-    }
-
-    /**
-     * Creates an intent for showing the permission setting for a single app.
-     */
-    private Intent createManageSingleAppIntent(String packageName) {
-        final Intent intent = createManageAllAppsIntent();
-        intent.setData(Uri.parse("package:" + packageName));
-        return intent;
-    }
-
-    private String getApplicationLabel(String packageName) throws Exception {
-        final ApplicationInfo info = mPackageManager.getApplicationInfo(packageName, 0);
-        return mPackageManager.getApplicationLabel(info).toString();
-    }
-
-    private UiObject2 findAndVerifySwitchState(boolean checked) {
-        final BySelector switchSelector = By.clazz(Switch.class).res("android:id/switch_widget");
-        final UiObject2 switchPref = mUiDevice.wait(Until.findObject(switchSelector),
-                START_ACTIVITY_TIMEOUT);
-        assertNotNull("Switch not shown", switchPref);
-        assertTrue("Switch in invalid state", switchPref.isChecked() == checked);
-        return switchPref;
-    }
-
-    @Test
-    public void testAppList() throws Exception {
-        final String testAppLabel = getApplicationLabel(mPackageName);
-
-        mContext.startActivity(createManageAllAppsIntent());
-        final BySelector preferenceListSelector =
-                By.clazz(RecyclerView.class).res("com.android.settings:id/apps_list");
-        final UiObject2 preferenceList = mUiDevice.wait(Until.findObject(preferenceListSelector),
-                START_ACTIVITY_TIMEOUT);
-        assertNotNull("App list not shown", preferenceList);
-
-        final BySelector appLabelTextViewSelector = By.clazz(TextView.class)
-                .res("android:id/title")
-                .text(testAppLabel);
-        List<UiObject2> listOfMatchingTextViews;
-        do {
-            listOfMatchingTextViews = preferenceList.findObjects(appLabelTextViewSelector);
-            // assuming the number of profiles will be sufficiently small so that all the entries
-            // for the same package will fit in one screen at some time during the scroll.
-        } while (listOfMatchingTextViews.size() != mProfiles.size() &&
-                preferenceList.scroll(Direction.DOWN, 0.2f));
-        assertEquals("Test app not listed for each profile", mProfiles.size(),
-                listOfMatchingTextViews.size());
-
-        for (UiObject2 matchingObject : listOfMatchingTextViews) {
-            matchingObject.click();
-            findAndVerifySwitchState(true);
-            mUiDevice.pressBack();
-        }
-    }
-
-    private void testAppDetailScreenForAppOp(int appOpMode, int userId) throws Exception {
-        final String testAppLabel = getApplicationLabel(mPackageName);
-        final BySelector appDetailTitleSelector = By.clazz(TextView.class)
-                .res("com.android.settings:id/app_detail_title")
-                .text(testAppLabel);
-
-        mAppOpsManager.setMode(mAppOpCode,
-                mPackageManager.getPackageUidAsUser(mPackageName, userId), mPackageName, appOpMode);
-        mContext.startActivityAsUser(createManageSingleAppIntent(mPackageName),
-                UserHandle.of(userId));
-        mUiDevice.wait(Until.findObject(appDetailTitleSelector), START_ACTIVITY_TIMEOUT);
-        findAndVerifySwitchState(appOpMode == MODE_ALLOWED || appOpMode == MODE_DEFAULT);
-        mUiDevice.pressBack();
-    }
-
-    @Test
-    public void testSingleApp() throws Exception {
-        // App op MODE_DEFAULT is already tested in #testAppList
-        for (UserInfo user : mProfiles) {
-            testAppDetailScreenForAppOp(MODE_ALLOWED, user.id);
-            testAppDetailScreenForAppOp(MODE_ERRORED, user.id);
-        }
-    }
-
-    private void testSwitchToggle(int fromAppOp, int toAppOp) throws Exception {
-        final int packageUid = mPackageManager.getPackageUid(mPackageName, 0);
-        final boolean initialState = (fromAppOp == MODE_ALLOWED || fromAppOp == MODE_DEFAULT);
-
-        mAppOpsManager.setMode(mAppOpCode, packageUid, mPackageName, fromAppOp);
-        mContext.startActivity(createManageSingleAppIntent(mPackageName));
-        final UiObject2 switchPref = findAndVerifySwitchState(initialState);
-        switchPref.click();
-        Thread.sleep(1000);
-        assertEquals("Toggling switch did not change app op", toAppOp,
-                mAppOpsManager.checkOpNoThrow(mAppOpCode, packageUid,
-                        mPackageName));
-        mUiDevice.pressBack();
-    }
-
-    @Test
-    public void testIfSwitchTogglesAppOp() throws Exception {
-        testSwitchToggle(MODE_ALLOWED, MODE_ERRORED);
-        testSwitchToggle(MODE_ERRORED, MODE_ALLOWED);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        mUiDevice.pressHome();
-        resetAppOpModeForAllProfiles();
-    }
-}
diff --git a/tests/unit/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java b/tests/unit/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
new file mode 100644
index 0000000..a3bfff9
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/AppStateInstallAppsBridgeTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2020 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 com.google.common.truth.Truth.assertThat;
+
+import android.app.AppOpsManager;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class AppStateInstallAppsBridgeTest {
+
+    @Test
+    public void testInstallAppsStateCanInstallApps() {
+        AppStateInstallAppsBridge.InstallAppsState appState =
+                new AppStateInstallAppsBridge.InstallAppsState();
+        assertThat(appState.canInstallApps()).isFalse();
+
+        appState.permissionRequested = true;
+        assertThat(appState.canInstallApps()).isFalse();
+
+        appState.appOpMode = AppOpsManager.MODE_ALLOWED;
+        assertThat(appState.canInstallApps()).isTrue();
+
+        appState.appOpMode = AppOpsManager.MODE_ERRORED;
+        assertThat(appState.canInstallApps()).isFalse();
+    }
+
+    @Test
+    public void testInstallAppsStateIsPotentialAppSource() {
+        AppStateInstallAppsBridge.InstallAppsState appState =
+                new AppStateInstallAppsBridge.InstallAppsState();
+        assertThat(appState.isPotentialAppSource()).isFalse();
+
+        appState.appOpMode = AppOpsManager.MODE_ERRORED;
+        assertThat(appState.isPotentialAppSource()).isTrue();
+
+        appState.permissionRequested = true;
+        appState.appOpMode = AppOpsManager.MODE_DEFAULT;
+        assertThat(appState.isPotentialAppSource()).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/DrawOverlaySettingsTest.java b/tests/unit/src/com/android/settings/applications/DrawOverlaySettingsTest.java
deleted file mode 100644
index b6d51ff..0000000
--- a/tests/unit/src/com/android/settings/applications/DrawOverlaySettingsTest.java
+++ /dev/null
@@ -1,36 +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.applications;
-
-import android.app.AppOpsManager;
-import android.provider.Settings;
-
-import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class DrawOverlaySettingsTest extends AppOpsSettingsTest {
-
-    public DrawOverlaySettingsTest() {
-        super(Settings.ACTION_MANAGE_OVERLAY_PERMISSION, AppOpsManager.OP_SYSTEM_ALERT_WINDOW);
-    }
-
-    // Test cases are in the superclass.
-}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/unit/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
new file mode 100644
index 0000000..b956089
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2020 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 org.junit.Assert.assertTrue;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.R;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class EnterpriseDefaultAppsTest {
+    @Test
+    public void testNumberOfIntentsCorrelateWithUI() {
+        final int[] concatenation_templates =
+                new int[]{0 /* no need for single app name */,
+                        R.string.app_names_concatenation_template_2,
+                        R.string.app_names_concatenation_template_3};
+        for (EnterpriseDefaultApps app : EnterpriseDefaultApps.values()) {
+            assertTrue("Number of intents should be limited by number of apps the UI can show",
+                    app.getIntents().length <= concatenation_templates.length);
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/ExternalSourcesSettingsTest.java b/tests/unit/src/com/android/settings/applications/ExternalSourcesSettingsTest.java
deleted file mode 100644
index b35d6cb..0000000
--- a/tests/unit/src/com/android/settings/applications/ExternalSourcesSettingsTest.java
+++ /dev/null
@@ -1,37 +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.applications;
-
-import android.app.AppOpsManager;
-import android.provider.Settings;
-
-import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class ExternalSourcesSettingsTest extends AppOpsSettingsTest {
-
-    public ExternalSourcesSettingsTest() {
-        super(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES,
-                AppOpsManager.OP_REQUEST_INSTALL_PACKAGES);
-    }
-
-    // Test cases are in the superclass.
-}
diff --git a/tests/unit/src/com/android/settings/applications/assist/AssistSettingObserverTest.java b/tests/unit/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
new file mode 100644
index 0000000..2bfdd0c
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/assist/AssistSettingObserverTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2020 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.assist;
+
+import android.net.Uri;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class AssistSettingObserverTest {
+
+    @Test
+    public void callConstructor_shouldNotCrash() {
+        new AssistSettingObserver() {
+            @Override
+            protected List<Uri> getSettingUris() {
+                return null;
+            }
+
+            @Override
+            public void onSettingChange() {
+
+            }
+        };
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java b/tests/unit/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
new file mode 100644
index 0000000..ba7a0d2
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/manageapplications/AppFilterRegistryTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2020 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.manageapplications;
+
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_ALL;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_INSTALL_SOURCES;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_POWER_ALLOWLIST;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_RECENT;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WITH_OVERLAY;
+import static com.android.settings.applications.manageapplications.AppFilterRegistry.FILTER_APPS_WRITE_SETTINGS;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_GAMES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_HIGH_POWER;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MAIN;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MANAGE_SOURCES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_MOVIES;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_NOTIFICATION;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_OVERLAY;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_PHOTOGRAPHY;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_STORAGE;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_USAGE_ACCESS;
+import static com.android.settings.applications.manageapplications.ManageApplications.LIST_TYPE_WRITE_SETTINGS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class AppFilterRegistryTest {
+
+    @Test
+    public void getDefaultType_shouldMatchForAllListType() {
+        final AppFilterRegistry registry = AppFilterRegistry.getInstance();
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_USAGE_ACCESS))
+                .isEqualTo(FILTER_APPS_USAGE_ACCESS);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_HIGH_POWER))
+                .isEqualTo(FILTER_APPS_POWER_ALLOWLIST);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_OVERLAY))
+                .isEqualTo(FILTER_APPS_WITH_OVERLAY);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_WRITE_SETTINGS))
+                .isEqualTo(FILTER_APPS_WRITE_SETTINGS);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_MANAGE_SOURCES))
+                .isEqualTo(FILTER_APPS_INSTALL_SOURCES);
+
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_MAIN)).isEqualTo(FILTER_APPS_ALL);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_NOTIFICATION))
+                .isEqualTo(FILTER_APPS_RECENT);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_STORAGE)).isEqualTo(FILTER_APPS_ALL);
+
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_GAMES)).isEqualTo(FILTER_APPS_ALL);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_MOVIES)).isEqualTo(FILTER_APPS_ALL);
+        assertThat(registry.getDefaultFilterType(LIST_TYPE_PHOTOGRAPHY)).isEqualTo(FILTER_APPS_ALL);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceControllerTest.java
new file mode 100644
index 0000000..064f813
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/ApprovalPreferenceControllerTest.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright (C) 2020 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.specialaccess.notificationaccess;
+
+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 static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.NotificationManager;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.testutils.FakeFeatureFactory;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class ApprovalPreferenceControllerTest {
+
+    private Context mContext;
+    private FakeFeatureFactory mFeatureFactory;
+    @Mock
+    private NotificationAccessDetails mFragment;
+    private ApprovalPreferenceController mController;
+    @Mock
+    NotificationManager mNm;
+    @Mock
+    PackageManager mPm;
+    PackageInfo mPkgInfo;
+    ComponentName mCn = new ComponentName("a", "b");
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mContext).when(mFragment).getContext();
+
+        mPkgInfo = new PackageInfo();
+        mPkgInfo.applicationInfo = mock(ApplicationInfo.class);
+        when(mPkgInfo.applicationInfo.loadLabel(mPm)).thenReturn("LABEL");
+
+        mController = new ApprovalPreferenceController(mContext, "key");
+        mController.setCn(mCn);
+        mController.setNm(mNm);
+        mController.setParent(mFragment);
+        mController.setPkgInfo(mPkgInfo);
+    }
+
+    @Test
+    public void updateState_checked() {
+        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);
+        SwitchPreference pref = new SwitchPreference(mContext);
+
+        mController.updateState(pref);
+        assertThat(pref.isChecked()).isTrue();
+    }
+
+    @Test
+    public void enable() {
+        mController.enable(mCn);
+        verify(mFeatureFactory.metricsFeatureProvider).action(
+                mContext,
+                MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW,
+                "a");
+
+        verify(mNm).setNotificationListenerAccessGranted(mCn, true);
+    }
+
+    @Test
+    public void disable() {
+        mController.disable(mCn);
+        verify(mFeatureFactory.metricsFeatureProvider).action(
+                mContext,
+                MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_NOTIVIEW_ALLOW,
+                "a");
+
+        verify(mNm).setNotificationListenerAccessGranted(mCn, false);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceControllerTest.java b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceControllerTest.java
new file mode 100644
index 0000000..c46f84a
--- /dev/null
+++ b/tests/unit/src/com/android/settings/biometrics/face/FaceSettingsAttentionPreferenceControllerTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 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.biometrics.face;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class FaceSettingsAttentionPreferenceControllerTest {
+
+    private Context mContext;
+    private FaceSettingsAttentionPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new FaceSettingsAttentionPreferenceController(mContext);
+    }
+
+    @Test
+    public void isSliceable_returnFalse() {
+        assertThat(mController.isSliceable()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java
deleted file mode 100644
index 589680d..0000000
--- a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollFinishTest.java
+++ /dev/null
@@ -1,93 +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.biometrics.fingerprint;
-
-import static androidx.test.InstrumentationRegistry.getTargetContext;
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.intent.Intents.intended;
-import static androidx.test.espresso.intent.Intents.intending;
-import static androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import android.app.Activity;
-import android.app.Instrumentation.ActivityResult;
-import android.content.ComponentName;
-
-import androidx.test.espresso.intent.rule.IntentsTestRule;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import com.google.android.setupcompat.PartnerCustomizationLayout;
-import com.google.android.setupcompat.template.FooterBarMixin;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class FingerprintEnrollFinishTest {
-
-    @Rule
-    public IntentsTestRule<FingerprintEnrollFinish> mActivityRule =
-            new IntentsTestRule<>(FingerprintEnrollFinish.class);
-
-    @Test
-    public void clickAddAnother_shouldLaunchEnrolling() {
-        final ComponentName enrollingComponent = new ComponentName(
-                getTargetContext(),
-                FingerprintEnrollEnrolling.class);
-
-        intending(hasComponent(enrollingComponent))
-                .respondWith(new ActivityResult(Activity.RESULT_CANCELED, null));
-
-        PartnerCustomizationLayout layout =
-                mActivityRule.getActivity().findViewById(R.id.setup_wizard_layout);
-        layout.getMixin(FooterBarMixin.class).getPrimaryButtonView().performClick();
-
-        intended(hasComponent(enrollingComponent));
-        assertFalse(mActivityRule.getActivity().isFinishing());
-    }
-
-    @Test
-    public void clickAddAnother_shouldPropagateResults() {
-        final ComponentName enrollingComponent = new ComponentName(
-                getTargetContext(),
-                FingerprintEnrollEnrolling.class);
-
-        intending(hasComponent(enrollingComponent))
-                .respondWith(new ActivityResult(Activity.RESULT_OK, null));
-
-        PartnerCustomizationLayout layout =
-                mActivityRule.getActivity().findViewById(R.id.setup_wizard_layout);
-        layout.getMixin(FooterBarMixin.class).getPrimaryButtonView().performClick();
-
-        intended(hasComponent(enrollingComponent));
-        assertTrue(mActivityRule.getActivity().isFinishing());
-    }
-
-    @Test
-    public void clickNext_shouldFinish() {
-        onView(withId(R.id.next_button)).perform(click());
-        assertTrue(mActivityRule.getActivity().isFinishing());
-    }
-}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java b/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
deleted file mode 100644
index 454de3d..0000000
--- a/tests/unit/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollIntroductionTest.java
+++ /dev/null
@@ -1,113 +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.biometrics.fingerprint;
-
-
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
-
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.hardware.fingerprint.Fingerprint;
-import android.hardware.fingerprint.FingerprintManager;
-import android.test.ActivityUnitTestCase;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-import com.google.android.setupcompat.PartnerCustomizationLayout;
-import com.google.android.setupcompat.template.FooterBarMixin;
-
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FingerprintEnrollIntroductionTest
-        extends ActivityUnitTestCase<FingerprintEnrollIntroduction> {
-
-    private TestContext mContext;
-
-    @Mock
-    private FingerprintManager mFingerprintManager;
-
-    private FingerprintEnrollIntroduction mActivity;
-
-    public FingerprintEnrollIntroductionTest() {
-        super(FingerprintEnrollIntroduction.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        MockitoAnnotations.initMocks(this);
-        mContext = new TestContext(getInstrumentation().getTargetContext());
-        setActivityContext(mContext);
-
-        getInstrumentation().runOnMainSync(() -> {
-            final Intent intent = new Intent();
-            mActivity = startActivity(intent,
-                    null /* savedInstanceState */, null /* lastNonConfigurationInstance */);
-        });
-    }
-
-    public void testMaxFingerprint_shouldShowErrorMessage() {
-        final int max = mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_fingerprintMaxTemplatesPerUser);
-        doReturn(generateFingerprintList(max)).when(mFingerprintManager)
-                .getEnrolledFingerprints(anyInt());
-
-        getInstrumentation().runOnMainSync(() -> {
-            getInstrumentation().callActivityOnCreate(mActivity, null);
-            getInstrumentation().callActivityOnResume(mActivity);
-        });
-
-        final TextView errorTextView = (TextView) mActivity.findViewById(R.id.error_text);
-        assertNotNull(errorTextView.getText().toString());
-
-        PartnerCustomizationLayout layout = mActivity.findViewById(R.id.setup_wizard_layout);
-        final Button nextButton = layout.getMixin(FooterBarMixin.class).getPrimaryButtonView();
-        assertEquals(View.GONE, nextButton.getVisibility());
-    }
-
-    private List<Fingerprint> generateFingerprintList(int num) {
-        ArrayList<Fingerprint> list = new ArrayList<>();
-        for (int i = 0; i < num; i++) {
-            list.add(new Fingerprint("Fingerprint " + i, 0, i, 0));
-        }
-        return list;
-    }
-
-    public class TestContext extends ContextWrapper {
-
-        public TestContext(Context base) {
-            super(base);
-        }
-
-        @Override
-        public Object getSystemService(String name) {
-            if (Context.FINGERPRINT_SERVICE.equals(name)) {
-                return mFingerprintManager;
-            }
-            return super.getSystemService(name);
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/core/BadPreferenceController.java b/tests/unit/src/com/android/settings/core/BadPreferenceController.java
new file mode 100644
index 0000000..68d3b53
--- /dev/null
+++ b/tests/unit/src/com/android/settings/core/BadPreferenceController.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2020 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.core;
+
+import android.content.Context;
+
+public class BadPreferenceController extends BasePreferenceController {
+
+    public BadPreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+        throw new IllegalArgumentException("error");
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean useDynamicSliceSummary() {
+        return true;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java b/tests/unit/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java
new file mode 100644
index 0000000..d2f5346
--- /dev/null
+++ b/tests/unit/src/com/android/settings/core/BasePreferenceControllerSignatureInspector.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (C) 2020 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.core;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.Context;
+
+import com.android.settings.core.codeinspection.CodeInspector;
+
+import java.lang.reflect.Constructor;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BasePreferenceControllerSignatureInspector extends CodeInspector {
+
+    private final List<String> mExemptList;
+
+    public BasePreferenceControllerSignatureInspector(List<Class<?>> classes) {
+        super(classes);
+        mExemptList = new ArrayList<>();
+        initializeExemptList(mExemptList,
+                "exempt_invalid_base_preference_controller_constructor");
+    }
+
+    @Override
+    public void run() {
+        StringBuilder badClasses = new StringBuilder();
+
+        for (Class c : mClasses) {
+            if (!isConcreteSettingsClass(c)) {
+                // Not a Settings class, or is abstract, don't care.
+                continue;
+            }
+            if (!BasePreferenceController.class.isAssignableFrom(c)) {
+                // Not a BasePreferenceController, don't care.
+                continue;
+            }
+            final String className = c.getName();
+            if (mExemptList.remove(className)) {
+                continue;
+            }
+            final Constructor[] constructors = c.getDeclaredConstructors();
+            if (constructors == null || constructors.length == 0) {
+                badClasses.append(c.getName()).append(",");
+            }
+
+            boolean hasValidConstructor = false;
+            for (Constructor constructor : constructors) {
+                if (hasValidConstructorSignature(constructor)) {
+                    hasValidConstructor = true;
+                    break;
+                }
+            }
+            if (!hasValidConstructor) {
+                badClasses.append(className).append(",");
+            }
+        }
+
+        assertWithMessage("All BasePreferenceController (and subclasses) constructor must either"
+                + " only take Context, or (Context, String). No other types are allowed")
+                .that(badClasses.toString())
+                .isEmpty();
+
+        assertWithMessage("Something in the exempt list is no longer relevant. Please remove"
+            + "it from packages/apps/Settings/tests/robotests/assets/"
+            + "exempt_invalid_base_preference_controller_constructor")
+                .that(mExemptList)
+                .isEmpty();
+    }
+
+    private static boolean hasValidConstructorSignature(Constructor constructor) {
+        final Class[] parameterTypes = constructor.getParameterTypes();
+        if (parameterTypes.length == 1) {
+            return Context.class.isAssignableFrom(parameterTypes[0]);
+        } else if (parameterTypes.length == 2) {
+            return Context.class.isAssignableFrom(parameterTypes[0])
+                    && String.class.isAssignableFrom(parameterTypes[1]);
+        }
+        return false;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java b/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
deleted file mode 100644
index 2d083f0..0000000
--- a/tests/unit/src/com/android/settings/core/PreferenceControllerContractTest.java
+++ /dev/null
@@ -1,95 +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.core;
-
-import static junit.framework.Assert.fail;
-
-import android.content.Context;
-import android.os.Looper;
-import android.platform.test.annotations.Presubmit;
-import android.util.ArraySet;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.search.BaseSearchIndexProvider;
-import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settingslib.search.SearchIndexableData;
-import com.android.settingslib.search.SearchIndexableResources;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-import java.util.Set;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class PreferenceControllerContractTest {
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    @Test
-    @Presubmit
-    public void controllersInSearchShouldImplementPreferenceControllerMixin() {
-        Looper.prepare(); // Required by AutofillLoggingLevelPreferenceController
-        final Set<String> errorClasses = new ArraySet<>();
-
-        final SearchIndexableResources resources =
-                FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
-                        .getSearchIndexableResources();
-        for (SearchIndexableData bundle : resources.getProviderValues()) {
-
-            final BaseSearchIndexProvider provider =
-                    (BaseSearchIndexProvider) bundle.getSearchIndexProvider();
-            if (provider == null) {
-                continue;
-            }
-
-            final List<AbstractPreferenceController> controllers =
-                    provider.getPreferenceControllers(mContext);
-            if (controllers == null) {
-                continue;
-            }
-            for (AbstractPreferenceController controller : controllers) {
-                if (!(controller instanceof PreferenceControllerMixin)
-                        && !(controller instanceof BasePreferenceController)) {
-                    errorClasses.add(controller.getClass().getName());
-                }
-            }
-        }
-
-        if (!errorClasses.isEmpty()) {
-            final StringBuilder errorMessage = new StringBuilder()
-                    .append("Each preference must implement PreferenceControllerMixin ")
-                    .append("or extend BasePreferenceController, ")
-                    .append("the following classes don't:\n");
-            for (String c : errorClasses) {
-                errorMessage.append(c).append("\n");
-            }
-            fail(errorMessage.toString());
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java b/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
deleted file mode 100644
index 7d03bba..0000000
--- a/tests/unit/src/com/android/settings/core/SettingsGatewayTest.java
+++ /dev/null
@@ -1,120 +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.core;
-
-import static android.content.pm.PackageManager.GET_ACTIVITIES;
-import static android.content.pm.PackageManager.GET_META_DATA;
-import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
-
-import static com.android.settings.SettingsActivity.META_DATA_KEY_FRAGMENT_CLASS;
-import static com.google.common.truth.Truth.assertThat;
-
-import static junit.framework.Assert.fail;
-
-import static org.junit.Assert.assertFalse;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.os.Bundle;
-import android.platform.test.annotations.Presubmit;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.core.gateway.SettingsGateway;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class SettingsGatewayTest {
-
-    private static final String TAG = "SettingsGatewayTest";
-
-    private Context mContext;
-    private PackageManager mPackageManager;
-    private String mPackageName;
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-        mPackageManager = mContext.getPackageManager();
-        mPackageName = mContext.getPackageName();
-    }
-
-    @Test
-    @Presubmit
-    public void allRestrictedActivityMustBeDefinedInManifest() {
-        for (String className : SettingsGateway.SETTINGS_FOR_RESTRICTED) {
-            final Intent intent = new Intent();
-            intent.setComponent(new ComponentName(mPackageName, className));
-            List<ResolveInfo> resolveInfos = mPackageManager.queryIntentActivities(intent,
-                    MATCH_DISABLED_COMPONENTS);
-            Log.d(TAG, mPackageName + "/" + className + "; resolveInfo size: "
-                    + resolveInfos.size());
-            assertFalse(className + " is not-defined in manifest", resolveInfos.isEmpty());
-        }
-    }
-
-    @Test
-    @Presubmit
-    public void publicFragmentMustAppearInSettingsGateway()
-            throws PackageManager.NameNotFoundException {
-        final List<String> whitelistedFragment = new ArrayList<>();
-        final StringBuilder error = new StringBuilder();
-
-        for (String fragment : SettingsGateway.ENTRY_FRAGMENTS) {
-            whitelistedFragment.add(fragment);
-        }
-        final PackageInfo pi = mPackageManager.getPackageInfo(mPackageName,
-                GET_META_DATA | MATCH_DISABLED_COMPONENTS | GET_ACTIVITIES);
-        final List<ActivityInfo> activities = Arrays.asList(pi.activities);
-
-        for (ActivityInfo activity : activities) {
-            final Bundle metaData = activity.metaData;
-            if (metaData == null || !metaData.containsKey(META_DATA_KEY_FRAGMENT_CLASS)) {
-                continue;
-            }
-            final String fragmentName = metaData.getString(META_DATA_KEY_FRAGMENT_CLASS);
-
-            assertThat(fragmentName).isNotNull();
-            if (!whitelistedFragment.contains(fragmentName)) {
-                error.append("SettingsGateway.ENTRY_FRAGMENTS must contain " + fragmentName
-                        + " because this fragment is used in manifest for " + activity.name)
-                        .append("\n");
-            }
-        }
-        final String message = error.toString();
-        if (!TextUtils.isEmpty(message)) {
-            fail(message);
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java b/tests/unit/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java
new file mode 100644
index 0000000..846ffd7
--- /dev/null
+++ b/tests/unit/src/com/android/settings/core/SettingsSliderPreferenceControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2020 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.core;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.slices.SliceData;
+import com.android.settings.widget.SeekBarPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class SettingsSliderPreferenceControllerTest {
+
+    private FakeSliderPreferenceController mSliderController;
+
+    private SeekBarPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mPreference = new SeekBarPreference(ApplicationProvider.getApplicationContext());
+        mSliderController = new FakeSliderPreferenceController(
+                ApplicationProvider.getApplicationContext(), "key");
+
+        mPreference.setContinuousUpdates(true);
+        mPreference.setMin(mSliderController.getMin());
+        mPreference.setMax(mSliderController.getMax());
+    }
+
+    @Test
+    public void onPreferenceChange_updatesPosition() {
+        final int newValue = 28;
+
+        mSliderController.onPreferenceChange(mPreference, newValue);
+
+        assertThat(mSliderController.getSliderPosition()).isEqualTo(newValue);
+    }
+
+    @Test
+    public void updateState_setsPreferenceToCurrentValue() {
+        final int newValue = 28;
+        mSliderController.setSliderPosition(newValue);
+
+        mSliderController.updateState(mPreference);
+
+        assertThat(mPreference.getProgress()).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testSliceType_returnsSliceType() {
+        assertThat(mSliderController.getSliceType()).isEqualTo(SliceData.SliceType.SLIDER);
+    }
+
+    private class FakeSliderPreferenceController extends SliderPreferenceController {
+
+        private static final int MAX_STEPS = 2112;
+        private int mPosition;
+
+        private FakeSliderPreferenceController(Context context, String key) {
+            super(context, key);
+        }
+
+        @Override
+        public int getSliderPosition() {
+            return mPosition;
+        }
+
+        @Override
+        public boolean setSliderPosition(int position) {
+            mPosition = position;
+            return true;
+        }
+
+        @Override
+        public int getMax() {
+            return MAX_STEPS;
+        }
+
+        @Override
+        public int getMin() {
+            return 0;
+        }
+
+        @Override
+        public int getAvailabilityStatus() {
+            return AVAILABLE;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java b/tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java
new file mode 100644
index 0000000..8817a17
--- /dev/null
+++ b/tests/unit/src/com/android/settings/core/TogglePreferenceControllerTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2020 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.core;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.slices.SliceData;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class TogglePreferenceControllerTest {
+
+    private FakeToggle mToggleController;
+
+    private Context mContext;
+    private SwitchPreference mPreference;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mPreference = new SwitchPreference(mContext);
+        mToggleController = new FakeToggle(mContext, "key");
+    }
+
+    @Test
+    public void testSetsPreferenceValue_setsChecked() {
+        mToggleController.setChecked(true);
+        mPreference.setChecked(false);
+
+        mToggleController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void testSetsPreferenceValue_setsNotChecked() {
+        mToggleController.setChecked(false);
+        mPreference.setChecked(true);
+
+        mToggleController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void testUpdatesPreferenceOnChange_turnsOn() {
+        boolean newValue = true;
+        mToggleController.setChecked(!newValue);
+
+        mToggleController.onPreferenceChange(mPreference, newValue);
+
+        assertThat(mToggleController.isChecked()).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testUpdatesPreferenceOnChange_turnsOff() {
+        boolean newValue = false;
+        mToggleController.setChecked(!newValue);
+
+        mToggleController.onPreferenceChange(mPreference, newValue);
+
+        assertThat(mToggleController.isChecked()).isEqualTo(newValue);
+    }
+
+    @Test
+    public void testSliceType_returnsSliceType() {
+        assertThat(mToggleController.getSliceType()).isEqualTo(
+                SliceData.SliceType.SWITCH);
+    }
+
+    @Test
+    public void isSliceable_returnTrue() {
+        assertThat(mToggleController.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isPublicSlice_returnFalse() {
+        assertThat(mToggleController.isPublicSlice()).isFalse();
+    }
+
+    private static class FakeToggle extends TogglePreferenceController {
+
+        private boolean mCheckedFlag;
+
+        private FakeToggle(Context context, String preferenceKey) {
+            super(context, preferenceKey);
+        }
+
+        @Override
+        public boolean isChecked() {
+            return mCheckedFlag;
+        }
+
+        @Override
+        public boolean setChecked(boolean isChecked) {
+            mCheckedFlag = isChecked;
+            return true;
+        }
+
+        @Override
+        public int getAvailabilityStatus() {
+            return AVAILABLE;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
deleted file mode 100644
index 9ed1c91..0000000
--- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
+++ /dev/null
@@ -1,219 +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.core;
-
-import static junit.framework.Assert.fail;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.platform.test.annotations.Presubmit;
-import android.provider.SearchIndexableResource;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexableData;
-import com.android.settingslib.search.SearchIndexableRaw;
-import com.android.settingslib.search.SearchIndexableResources;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class UniquePreferenceTest {
-
-    private static final String TAG = "UniquePreferenceTest";
-    private static final List<String> IGNORE_PREF_TYPES = Arrays.asList(
-            "com.android.settingslib.widget.FooterPreference");
-
-    private static final List<String> WHITELISTED_DUPLICATE_KEYS = Arrays.asList(
-            "owner_info_settings",          // Lock screen message in security - multiple xml files
-                                            // contain this because security page is constructed by
-                                            // combining small xml chunks. Eventually the page
-                                            // should be formed as one single xml and this entry
-                                            // should be removed.
-
-            "dashboard_tile_placeholder",   // This is the placeholder pref for injecting dynamic
-                                            // tiles.
-            // Dup keys from About Phone v2 experiment.
-            "ims_reg_state",
-            "bt_address",
-            "device_model",
-            "firmware_version",
-            "regulatory_info",
-            "manual",
-            "legal_container",
-            "device_feedback",
-            "fcc_equipment_id",
-            "sim_status",
-            "build_number",
-            "phone_number",
-            "imei_info",
-            "wifi_ip_address",
-            "wifi_mac_address",
-            "safety_info",
-            // Dupe keys from data usage v2.
-            "data_usage_screen",
-            "cellular_data_usage",
-            "data_usage_wifi_screen",
-            "status_header",
-            "billing_preference",
-            "data_usage_cellular_screen",
-            "wifi_data_usage",
-            "data_usage_enable"
-    );
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    /**
-     * All preferences should have their unique key. It's especially important for many parts of
-     * Settings to work properly: we assume pref keys are unique in displaying, search ranking,\
-     * search result suppression, and many other areas.
-     * <p/>
-     * So in this test we are checking preferences participating in search.
-     * <p/>
-     * Note: Preference is not limited to just <Preference/> object. Everything in preference xml
-     * should have a key.
-     */
-    @Test
-    @Presubmit
-    public void allPreferencesShouldHaveUniqueKey()
-            throws IOException, XmlPullParserException, Resources.NotFoundException {
-        final Set<String> uniqueKeys = new HashSet<>();
-        final Set<String> nullKeyClasses = new HashSet<>();
-        final Set<String> duplicatedKeys = new HashSet<>();
-        final SearchIndexableResources resources =
-                FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
-                        .getSearchIndexableResources();
-        for (SearchIndexableData SearchIndexableData : resources.getProviderValues()) {
-            verifyPreferenceKeys(uniqueKeys, duplicatedKeys, nullKeyClasses, SearchIndexableData);
-        }
-
-        if (!nullKeyClasses.isEmpty()) {
-            final StringBuilder nullKeyErrors = new StringBuilder()
-                    .append("Each preference/SearchIndexableData must have a key, ")
-                    .append("the following classes have null keys:\n");
-            for (String c : nullKeyClasses) {
-                nullKeyErrors.append(c).append("\n");
-            }
-            fail(nullKeyErrors.toString());
-        }
-
-        if (!duplicatedKeys.isEmpty()) {
-            final StringBuilder dupeKeysError = new StringBuilder(
-                    "The following keys are not unique\n");
-            for (String c : duplicatedKeys) {
-                dupeKeysError.append(c).append("\n");
-            }
-            fail(dupeKeysError.toString());
-        }
-    }
-
-    private void verifyPreferenceKeys(Set<String> uniqueKeys, Set<String> duplicatedKeys,
-            Set<String> nullKeyClasses, SearchIndexableData searchIndexableData)
-            throws IOException, XmlPullParserException, Resources.NotFoundException {
-
-        final String className = searchIndexableData.getTargetClass().getName();
-        final Indexable.SearchIndexProvider provider =
-                searchIndexableData.getSearchIndexProvider();
-        final List<SearchIndexableRaw> rawsToIndex = provider.getRawDataToIndex(mContext, true);
-        final List<SearchIndexableResource> resourcesToIndex =
-                provider.getXmlResourcesToIndex(mContext, true);
-        verifyResources(className, resourcesToIndex, uniqueKeys, duplicatedKeys, nullKeyClasses);
-        verifyRaws(className, rawsToIndex, uniqueKeys, duplicatedKeys, nullKeyClasses);
-    }
-
-    private void verifyResources(String className, List<SearchIndexableResource> resourcesToIndex,
-            Set<String> uniqueKeys, Set<String> duplicatedKeys, Set<String> nullKeyClasses)
-            throws IOException, XmlPullParserException, Resources.NotFoundException {
-        if (resourcesToIndex == null) {
-            Log.d(TAG, className + "is not providing SearchIndexableResource, skipping");
-            return;
-        }
-
-        for (SearchIndexableResource sir : resourcesToIndex) {
-            final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
-                    sir.xmlResId,
-                    MetadataFlag.FLAG_INCLUDE_PREF_SCREEN
-                            | MetadataFlag.FLAG_NEED_KEY
-                            | MetadataFlag.FLAG_NEED_PREF_TYPE);
-
-            for (Bundle bundle : metadata) {
-                final String type = bundle.getString(PreferenceXmlParserUtils.METADATA_PREF_TYPE);
-                if (IGNORE_PREF_TYPES.contains(type)) {
-                    continue;
-                }
-                final String key = bundle.getString(PreferenceXmlParserUtils.METADATA_KEY);
-                if (TextUtils.isEmpty(key)) {
-                    Log.e(TAG, "Every preference must have an key; found null key"
-                            + " in " + className);
-                    nullKeyClasses.add(className);
-                    continue;
-                }
-                if (uniqueKeys.contains(key) && !WHITELISTED_DUPLICATE_KEYS.contains(key)) {
-                    Log.e(TAG, "Every preference key must unique; found "
-                            + " in " + className
-                            + " / " + key);
-                    duplicatedKeys.add(key);
-                }
-                uniqueKeys.add(key);
-            }
-        }
-    }
-
-    private void verifyRaws(String className, List<SearchIndexableRaw> rawsToIndex,
-            Set<String> uniqueKeys, Set<String> duplicatedKeys, Set<String> nullKeyClasses) {
-        if (rawsToIndex == null) {
-            Log.d(TAG, className + "is not providing SearchIndexableRaw, skipping");
-            return;
-        }
-        for (SearchIndexableRaw raw : rawsToIndex) {
-            if (TextUtils.isEmpty(raw.key)) {
-                Log.e(TAG, "Every SearchIndexableRaw must have an key; found null key"
-                        + " in " + className);
-                nullKeyClasses.add(className);
-                continue;
-            }
-            if (uniqueKeys.contains(raw.key) && !WHITELISTED_DUPLICATE_KEYS.contains(raw.key)) {
-                Log.e(TAG, "Every SearchIndexableRaw key must unique; found " + raw.key
-                        + " in " + className);
-                duplicatedKeys.add(raw.key);
-            }
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java b/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
deleted file mode 100644
index e8e4927..0000000
--- a/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
+++ /dev/null
@@ -1,157 +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.core;
-
-import static junit.framework.Assert.fail;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.content.res.XmlResourceParser;
-import android.os.UserManager;
-import android.provider.SearchIndexableResource;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.Xml;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexableData;
-import com.android.settingslib.search.SearchIndexableResources;
-
-import com.google.android.collect.Sets;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Set;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class UserRestrictionTest {
-
-    private static final String TAG = "UserRestrictionTest";
-
-    private Context mContext;
-
-    private static final Set<String> USER_RESTRICTIONS = Sets.newHashSet(
-            UserManager.DISALLOW_CONFIG_DATE_TIME,
-            UserManager.DISALLOW_CONFIG_CREDENTIALS,
-            UserManager.DISALLOW_NETWORK_RESET,
-            UserManager.DISALLOW_FACTORY_RESET,
-            UserManager.DISALLOW_CONFIG_TETHERING,
-            UserManager.DISALLOW_CONFIG_VPN,
-            UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
-            UserManager.DISALLOW_AIRPLANE_MODE,
-            UserManager.DISALLOW_CONFIG_BRIGHTNESS,
-            UserManager.DISALLOW_CONFIG_SCREEN_TIMEOUT
-    );
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    /**
-     * Verity that userRestriction attributes are entered and parsed successfully.
-     */
-    @Test
-    public void userRestrictionAttributeShouldBeValid()
-            throws IOException, XmlPullParserException, Resources.NotFoundException {
-        final SearchIndexableResources resources =
-                FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
-                        .getSearchIndexableResources();
-        for (SearchIndexableData bundle : resources.getProviderValues()) {
-            verifyUserRestriction(bundle);
-        }
-    }
-
-    private void verifyUserRestriction(SearchIndexableData searchIndexableData)
-            throws IOException, XmlPullParserException, Resources.NotFoundException {
-
-        final Indexable.SearchIndexProvider provider =
-                searchIndexableData.getSearchIndexProvider();
-        final List<SearchIndexableResource> resourcesToIndex =
-                provider.getXmlResourcesToIndex(mContext, true);
-
-        final String className = searchIndexableData.getTargetClass().getName();
-
-        if (resourcesToIndex == null) {
-            Log.d(TAG, className + "is not providing SearchIndexableResource, skipping");
-            return;
-        }
-
-        for (SearchIndexableResource sir : resourcesToIndex) {
-            if (sir.xmlResId <= 0) {
-                Log.d(TAG, className + " doesn't have a valid xml to index.");
-                continue;
-            }
-            final XmlResourceParser parser = mContext.getResources().getXml(sir.xmlResId);
-
-            int type;
-            while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
-                    && type != XmlPullParser.START_TAG) {
-                // Parse next until start tag is found
-            }
-            final int outerDepth = parser.getDepth();
-
-            do {
-                if (type != XmlPullParser.START_TAG) {
-                    continue;
-                }
-                final String nodeName = parser.getName();
-                if (!nodeName.endsWith("Preference")) {
-                    continue;
-                }
-                final AttributeSet attrs = Xml.asAttributeSet(parser);
-                final String userRestriction = getDataUserRestrictions(mContext, attrs);
-                if (userRestriction != null) {
-                    if(!isValidRestriction(userRestriction)) {
-                        fail("userRestriction in " + className + " not valid.");
-                    }
-                }
-            } while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
-                    && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth));
-        }
-    }
-
-    boolean isValidRestriction(String userRestriction) {
-        return USER_RESTRICTIONS.contains(userRestriction);
-    }
-
-    private String getDataUserRestrictions(Context context, AttributeSet attrs) {
-        return getData(context, attrs,
-                com.android.settingslib.R.styleable.RestrictedPreference,
-                com.android.settingslib.R.styleable.RestrictedPreference_userRestriction);
-    }
-
-    private String getData(Context context, AttributeSet set, int[] attrs, int resId) {
-        final TypedArray ta = context.obtainStyledAttributes(set, attrs);
-        String data = ta.getString(resId);
-        ta.recycle();
-        return data;
-    }
-}
diff --git a/tests/unit/src/com/android/settings/core/codeinspection/ClassScanner.java b/tests/unit/src/com/android/settings/core/codeinspection/ClassScanner.java
new file mode 100644
index 0000000..b129ecd
--- /dev/null
+++ b/tests/unit/src/com/android/settings/core/codeinspection/ClassScanner.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2020 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.core.codeinspection;
+
+import com.google.common.reflect.ClassPath;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Scans and builds all classes in current classloader.
+ */
+public class ClassScanner {
+
+    public List<Class<?>> getClassesForPackage(String packageName) throws ClassNotFoundException {
+        final List<Class<?>> classes = new ArrayList<>();
+
+        try {
+            ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
+            ClassPath classPath = ClassPath.from(classLoader);
+
+            // Some anonymous classes don't return true when calling isAnonymousClass(), but they
+            // always seem to be nested anonymous classes like com.android.settings.Foo$1$2. In
+            // general we don't want any anonymous classes so we just filter these out by searching
+            // for $[0-9] in the name.
+            Pattern anonymousClassPattern = Pattern.compile(".*\\$\\d+.*");
+            Matcher anonymousClassMatcher = anonymousClassPattern.matcher("");
+
+            for (ClassPath.ClassInfo info : classPath.getAllClasses()) {
+                if (info.getPackageName().startsWith(packageName)) {
+                    try {
+                        Class clazz = classLoader.loadClass(info.getName());
+                        if (clazz.isAnonymousClass() || anonymousClassMatcher.reset(
+                                clazz.getName()).matches()) {
+                            continue;
+                        }
+                        classes.add(clazz);
+                    } catch (NoClassDefFoundError e) {
+                        // do nothing. this class hasn't been found by the
+                        // loader, and we don't care.
+                    }
+                }
+            }
+        } catch (final IOException e) {
+            throw new ClassNotFoundException("Error when parsing " + packageName, e);
+        }
+        return classes;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/core/codeinspection/CodeInspector.java b/tests/unit/src/com/android/settings/core/codeinspection/CodeInspector.java
new file mode 100644
index 0000000..fb8ad6e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/core/codeinspection/CodeInspector.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2020 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.core.codeinspection;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Modifier;
+import java.util.List;
+
+/**
+ * Inspector takes a list of class objects and perform static code analysis in its {@link #run()}
+ * method.
+ */
+public abstract class CodeInspector {
+
+    protected static final String PACKAGE_NAME = "com.android.settings";
+
+    private static final String TEST_CLASS_SUFFIX = "Test";
+    private static final String TEST_INNER_CLASS_SIGNATURE = "Test$";
+
+    protected final List<Class<?>> mClasses;
+
+    public CodeInspector(List<Class<?>> classes) {
+        mClasses = classes;
+    }
+
+    /**
+     * Code inspection runner method.
+     */
+    public abstract void run();
+
+    protected void assertNoObsoleteInExemptList(String listName, List<String> list) {
+        final StringBuilder obsoleteExemptItems = new StringBuilder(listName).append(
+                " contains item that should not be exempted.\n");
+        for (String c : list) {
+            obsoleteExemptItems.append(c).append("\n");
+        }
+        assertWithMessage(obsoleteExemptItems.toString()).that(list).isEmpty();
+    }
+
+    protected boolean isConcreteSettingsClass(Class clazz) {
+        // Abstract classes
+        if (Modifier.isAbstract(clazz.getModifiers())) {
+            return false;
+        }
+        final String packageName = clazz.getPackage().getName();
+        // Classes that are not in Settings
+        if (!packageName.contains(PACKAGE_NAME + ".") && !packageName.endsWith(PACKAGE_NAME)) {
+            return false;
+        }
+        final String className = clazz.getName();
+        // Classes from tests
+        if (className.endsWith(TEST_CLASS_SUFFIX)) {
+            return false;
+        }
+        if (className.contains(TEST_INNER_CLASS_SIGNATURE)) {
+            return false;
+        }
+        return true;
+    }
+
+    public static void initializeExemptList(List<String> exemptList, String filename) {
+        try {
+            final InputStream in = ApplicationProvider.getApplicationContext()
+                    .getAssets().open(filename);
+            BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                exemptList.add(line);
+            }
+        } catch (Exception e) {
+            throw new IllegalArgumentException("Error initializing exempt list " + filename, e);
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/core/codeinspection/LifecycleObserverCodeInspector.java b/tests/unit/src/com/android/settings/core/codeinspection/LifecycleObserverCodeInspector.java
new file mode 100644
index 0000000..f8b2a46
--- /dev/null
+++ b/tests/unit/src/com/android/settings/core/codeinspection/LifecycleObserverCodeInspector.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2020 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.core.codeinspection;
+
+import static org.junit.Assert.fail;
+
+import android.util.ArraySet;
+
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnAttach;
+import com.android.settingslib.core.lifecycle.events.OnCreate;
+import com.android.settingslib.core.lifecycle.events.OnCreateOptionsMenu;
+import com.android.settingslib.core.lifecycle.events.OnDestroy;
+import com.android.settingslib.core.lifecycle.events.OnOptionsItemSelected;
+import com.android.settingslib.core.lifecycle.events.OnPause;
+import com.android.settingslib.core.lifecycle.events.OnPrepareOptionsMenu;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+import com.android.settingslib.core.lifecycle.events.OnSaveInstanceState;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+import com.android.settingslib.core.lifecycle.events.SetPreferenceScreen;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+
+public class LifecycleObserverCodeInspector extends CodeInspector {
+
+    private static final List<Class> LIFECYCLE_EVENTS = Arrays.asList(
+            OnAttach.class,
+            OnCreate.class,
+            OnCreateOptionsMenu.class,
+            OnDestroy.class,
+            OnOptionsItemSelected.class,
+            OnPause.class,
+            OnPrepareOptionsMenu.class,
+            OnResume.class,
+            OnSaveInstanceState.class,
+            OnStart.class,
+            OnStop.class,
+            SetPreferenceScreen.class
+    );
+
+    public LifecycleObserverCodeInspector(List<Class<?>> classes) {
+        super(classes);
+    }
+
+    @Override
+    public void run() {
+        final Set<String> notImplementingLifecycleObserver = new ArraySet<>();
+        for (Class clazz : mClasses) {
+            if (!isConcreteSettingsClass(clazz)) {
+                continue;
+            }
+            boolean classObservesLifecycleEvent = false;
+            for (Class event : LIFECYCLE_EVENTS) {
+                if (event.isAssignableFrom(clazz)) {
+                    classObservesLifecycleEvent = true;
+                    break;
+                }
+            }
+            if (classObservesLifecycleEvent && !LifecycleObserver.class.isAssignableFrom(clazz)) {
+                // Observes LifecycleEvent but not implementing LifecycleObserver. Something is
+                // wrong.
+                notImplementingLifecycleObserver.add(clazz.getName());
+            }
+        }
+        if (!notImplementingLifecycleObserver.isEmpty()) {
+            final String errorTemplate =
+                    "The following class(es) implements lifecycle.events.*, but don't "
+                            + "implement LifecycleObserver. Something is wrong:\n";
+            final StringBuilder error = new StringBuilder(errorTemplate);
+            for (String name : notImplementingLifecycleObserver) {
+                error.append(name).append('\n');
+            }
+            fail(error.toString());
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java b/tests/unit/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
new file mode 100644
index 0000000..98958cf
--- /dev/null
+++ b/tests/unit/src/com/android/settings/core/instrumentation/InstrumentableFragmentCodeInspector.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2020 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.core.instrumentation;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.util.ArraySet;
+
+import androidx.fragment.app.Fragment;
+
+import com.android.settings.core.codeinspection.CodeInspector;
+import com.android.settingslib.core.instrumentation.Instrumentable;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * {@link CodeInspector} that verifies all fragments implements Instrumentable.
+ */
+public class InstrumentableFragmentCodeInspector extends CodeInspector {
+
+    private final List<String> mNotImplementingInstrumentableExemptList;
+
+    public InstrumentableFragmentCodeInspector(List<Class<?>> classes) {
+        super(classes);
+        mNotImplementingInstrumentableExemptList = new ArrayList<>();
+        initializeExemptList(mNotImplementingInstrumentableExemptList,
+                "exempt_not_implementing_instrumentable");
+    }
+
+    @Override
+    public void run() {
+        final Set<String> broken = new ArraySet<>();
+
+        for (Class clazz : mClasses) {
+            if (!isConcreteSettingsClass(clazz)) {
+                continue;
+            }
+            final String className = clazz.getName();
+            // If it's a fragment, it must also be instrumentable.
+            final boolean allowlisted =
+                    mNotImplementingInstrumentableExemptList.remove(className);
+            if (Fragment.class.isAssignableFrom(clazz)
+                    && !Instrumentable.class.isAssignableFrom(clazz)
+                    && !allowlisted) {
+                broken.add(className);
+            }
+        }
+        final StringBuilder sb = new StringBuilder(
+                "All fragments should implement Instrumentable, but the following are not:\n");
+        for (String c : broken) {
+            sb.append(c).append("\n");
+        }
+        assertWithMessage(sb.toString()).that(broken.isEmpty()).isTrue();
+        assertNoObsoleteInExemptList("exempt_not_implementing_instrumentable",
+                mNotImplementingInstrumentableExemptList);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/dashboard/CategoryManagerTest.java b/tests/unit/src/com/android/settings/dashboard/CategoryManagerTest.java
new file mode 100644
index 0000000..98540f9
--- /dev/null
+++ b/tests/unit/src/com/android/settings/dashboard/CategoryManagerTest.java
@@ -0,0 +1,339 @@
+/*
+ * Copyright (C) 2020 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.android.settingslib.drawer.CategoryKey.CATEGORY_HOMEPAGE;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_KEY_ORDER;
+import static com.android.settingslib.drawer.TileUtils.META_DATA_PREFERENCE_KEYHINT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ProviderInfo;
+import android.os.Bundle;
+import android.util.Pair;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.drawer.ActivityTile;
+import com.android.settingslib.drawer.CategoryKey;
+import com.android.settingslib.drawer.DashboardCategory;
+import com.android.settingslib.drawer.ProviderTile;
+import com.android.settingslib.drawer.Tile;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@RunWith(AndroidJUnit4.class)
+public class CategoryManagerTest {
+
+    private ActivityInfo mActivityInfo;
+    private Context mContext;
+    private CategoryManager mCategoryManager;
+    private Map<Pair<String, String>, Tile> mTileByComponentCache;
+    private Map<String, DashboardCategory> mCategoryByKeyMap;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mActivityInfo = new ActivityInfo();
+        mActivityInfo.packageName = "pkg";
+        mActivityInfo.name = "class";
+        mActivityInfo.applicationInfo = new ApplicationInfo();
+        mTileByComponentCache = new HashMap<>();
+        mCategoryByKeyMap = new HashMap<>();
+        mCategoryManager = CategoryManager.get(mContext);
+    }
+
+    @Test
+    public void getInstance_shouldBeSingleton() {
+        assertThat(mCategoryManager).isSameInstanceAs(CategoryManager.get(mContext));
+    }
+
+    @Test
+    public void backwardCompatCleanupForCategory_shouldNotChangeCategoryForNewKeys() {
+        final Tile tile1 = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_ACCOUNT);
+        final Tile tile2 = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_ACCOUNT);
+        final DashboardCategory category = new DashboardCategory(CategoryKey.CATEGORY_ACCOUNT);
+        category.addTile(tile1);
+        category.addTile(tile2);
+        mCategoryByKeyMap.put(CategoryKey.CATEGORY_ACCOUNT, category);
+        mTileByComponentCache.put(new Pair<>("PACKAGE", "1"), tile1);
+        mTileByComponentCache.put(new Pair<>("PACKAGE", "2"), tile2);
+
+        mCategoryManager.backwardCompatCleanupForCategory(mTileByComponentCache, mCategoryByKeyMap);
+
+        assertThat(mCategoryByKeyMap.size()).isEqualTo(1);
+        assertThat(mCategoryByKeyMap.get(CategoryKey.CATEGORY_ACCOUNT)).isNotNull();
+    }
+
+    @Test
+    public void backwardCompatCleanupForCategory_shouldNotChangeCategoryForMixedKeys() {
+        final Tile tile1 = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_ACCOUNT);
+        final String oldCategory = "com.android.settings.category.wireless";
+        final Tile tile2 = new ActivityTile(mActivityInfo, oldCategory);
+        final DashboardCategory category1 = new DashboardCategory(CategoryKey.CATEGORY_ACCOUNT);
+        category1.addTile(tile1);
+        final DashboardCategory category2 = new DashboardCategory(oldCategory);
+        category2.addTile(tile2);
+        mCategoryByKeyMap.put(CategoryKey.CATEGORY_ACCOUNT, category1);
+        mCategoryByKeyMap.put(oldCategory, category2);
+        mTileByComponentCache.put(new Pair<>("PACKAGE", "CLASS1"), tile1);
+        mTileByComponentCache.put(new Pair<>("PACKAGE", "CLASS2"), tile2);
+
+        mCategoryManager.backwardCompatCleanupForCategory(mTileByComponentCache, mCategoryByKeyMap);
+
+        assertThat(mCategoryByKeyMap.size()).isEqualTo(2);
+        assertThat(
+                mCategoryByKeyMap.get(CategoryKey.CATEGORY_ACCOUNT).getTilesCount()).isEqualTo(1);
+        assertThat(mCategoryByKeyMap.get(oldCategory).getTilesCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void backwardCompatCleanupForCategory_shouldChangeCategoryForOldKeys() {
+        final String oldCategory = "com.android.settings.category.wireless";
+        final Tile tile1 = new ActivityTile(mActivityInfo, oldCategory);
+        tile1.setCategory(oldCategory);
+        final DashboardCategory category1 = new DashboardCategory(oldCategory);
+        category1.addTile(tile1);
+        mCategoryByKeyMap.put(oldCategory, category1);
+        mTileByComponentCache.put(new Pair<>("PACKAGE", "CLASS1"), tile1);
+
+        mCategoryManager.backwardCompatCleanupForCategory(mTileByComponentCache, mCategoryByKeyMap);
+
+        // Added 1 more category to category map.
+        assertThat(mCategoryByKeyMap.size()).isEqualTo(2);
+        // The new category map has CATEGORY_NETWORK type now, which contains 1 tile.
+        assertThat(
+                mCategoryByKeyMap.get(CategoryKey.CATEGORY_NETWORK).getTilesCount()).isEqualTo(1);
+        // Old category still exists.
+        assertThat(mCategoryByKeyMap.get(oldCategory).getTilesCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void sortCategories_singlePackage_shouldReorderBasedOnPriority() {
+        // Create some fake tiles that are not sorted.
+        final String testPackage = "com.android.test";
+        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
+        final Tile tile1 = createActivityTile(category.key, testPackage, "class1", 100);
+        final Tile tile2 = createActivityTile(category.key, testPackage, "class2", 50);
+        final Tile tile3 = createActivityTile(category.key, testPackage, "class3", 200);
+        category.addTile(tile1);
+        category.addTile(tile2);
+        category.addTile(tile3);
+        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
+
+        // Sort their priorities
+        mCategoryManager.sortCategories(ApplicationProvider.getApplicationContext(),
+                mCategoryByKeyMap);
+
+        // Verify they are now sorted.
+        assertThat(category.getTile(0)).isSameInstanceAs(tile3);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile2);
+    }
+
+    @Test
+    public void sortCategories_multiPackage_shouldReorderBasedOnPackageAndPriority() {
+        // Create some fake tiles that are not sorted.
+        final String testPackage1 = "com.android.test1";
+        final String testPackage2 = "com.android.test2";
+        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
+        final Tile tile1 = createActivityTile(category.key, testPackage2, "class1", 100);
+        final Tile tile2 = createActivityTile(category.key, testPackage1, "class2", 100);
+        final Tile tile3 = createActivityTile(category.key, testPackage1, "class3", 50);
+        category.addTile(tile1);
+        category.addTile(tile2);
+        category.addTile(tile3);
+        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
+
+        // Sort their priorities
+        mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
+
+        // Verify they are now sorted.
+        assertThat(category.getTile(0)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile3);
+    }
+
+    @Test
+    public void sortCategories_internalPackageTiles_shouldSkipTileForInternalPackage() {
+        // Create some fake tiles that are not sorted.
+        final String testPackage = mContext.getPackageName();
+        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
+        final Tile tile1 = createActivityTile(category.key, testPackage, "class1", 100);
+        final Tile tile2 = createActivityTile(category.key, testPackage, "class2", 100);
+        final Tile tile3 = createActivityTile(category.key, testPackage, "class3", 50);
+        category.addTile(tile1);
+        category.addTile(tile2);
+        category.addTile(tile3);
+        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
+
+        // Sort their priorities
+        mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
+
+        // Verify the sorting order is not changed
+        assertThat(category.getTile(0)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile3);
+    }
+
+    @Test
+    public void sortCategories_internalAndExternalPackageTiles_shouldRetainPriorityOrdering() {
+        // Inject one external tile among internal tiles.
+        final String testPackage = mContext.getPackageName();
+        final String testPackage2 = "com.google.test2";
+        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
+        final Tile tile1 = createActivityTile(category.key, testPackage, "class1", 2);
+        final Tile tile2 = createActivityTile(category.key, testPackage, "class2", 1);
+        final Tile tile3 = createActivityTile(category.key, testPackage2, "class0", 0);
+        final Tile tile4 = createActivityTile(category.key, testPackage, "class3", -1);
+        category.addTile(tile1);
+        category.addTile(tile2);
+        category.addTile(tile3);
+        category.addTile(tile4);
+        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
+
+        // Sort their priorities
+        mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
+
+        // Verify the sorting order is not changed
+        assertThat(category.getTile(0)).isSameInstanceAs(tile1);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile3);
+        assertThat(category.getTile(3)).isSameInstanceAs(tile4);
+    }
+
+    @Test
+    public void sortCategories_samePriority_internalPackageTileShouldTakePrecedence() {
+        // Inject one external tile among internal tiles with same priority.
+        final String testPackage = mContext.getPackageName();
+        final String testPackage2 = "com.google.test2";
+        final String testPackage3 = "com.abcde.test3";
+        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
+        final Tile tile1 = createActivityTile(category.key, testPackage2, "class1", 1);
+        final Tile tile2 = createActivityTile(category.key, testPackage, "class2", 1);
+        final Tile tile3 = createActivityTile(category.key, testPackage3, "class3", 1);
+        category.addTile(tile1);
+        category.addTile(tile2);
+        category.addTile(tile3);
+        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
+
+        // Sort their priorities
+        mCategoryManager.sortCategories(mContext, mCategoryByKeyMap);
+
+        // Verify the sorting order is internal first, follow by package name ordering
+        assertThat(category.getTile(0)).isSameInstanceAs(tile2);
+        assertThat(category.getTile(1)).isSameInstanceAs(tile3);
+        assertThat(category.getTile(2)).isSameInstanceAs(tile1);
+    }
+
+    @Test
+    public void filterTiles_noDuplicate_noChange() {
+        // Create some unique tiles
+        final String testPackage = mContext.getPackageName();
+        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
+        final Tile tile1 = createActivityTile(category.key, testPackage, "class1", 100);
+        final Tile tile2 = createActivityTile(category.key, testPackage, "class2", 100);
+        final Tile tile3 = createActivityTile(category.key, testPackage, "class3", 50);
+        final Tile tile4 = createProviderTile(category.key, testPackage, "class1", "authority1",
+                "key1", 100);
+        final Tile tile5 = createProviderTile(category.key, testPackage, "class1", "authority2",
+                "key2", 100);
+        final Tile tile6 = createProviderTile(category.key, testPackage, "class1", "authority1",
+                "key2", 50);
+        category.addTile(tile1);
+        category.addTile(tile2);
+        category.addTile(tile3);
+        category.addTile(tile4);
+        category.addTile(tile5);
+        category.addTile(tile6);
+        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
+
+        mCategoryManager.filterDuplicateTiles(mCategoryByKeyMap);
+
+        assertThat(category.getTilesCount()).isEqualTo(6);
+    }
+
+    @Test
+    public void filterTiles_hasDuplicateActivityTiles_shouldOnlyKeepUniqueTiles() {
+        // Create tiles pointing to same intent.
+        final String testPackage = mContext.getPackageName();
+        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
+        final Tile tile1 = createActivityTile(category.key, testPackage, "class1", 100);
+        final Tile tile2 = createActivityTile(category.key, testPackage, "class1", 100);
+        final Tile tile3 = createActivityTile(category.key, testPackage, "class1", 50);
+        category.addTile(tile1);
+        category.addTile(tile2);
+        category.addTile(tile3);
+        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
+
+        mCategoryManager.filterDuplicateTiles(mCategoryByKeyMap);
+
+        assertThat(category.getTilesCount()).isEqualTo(1);
+    }
+
+    @Test
+    public void filterTiles_hasDuplicateProviderTiles_shouldOnlyKeepUniqueTiles() {
+        // Create tiles pointing to same authority and key.
+        final String testPackage = mContext.getPackageName();
+        final DashboardCategory category = new DashboardCategory(CATEGORY_HOMEPAGE);
+        final Tile tile1 = createProviderTile(category.key, testPackage, "class1", "authority1",
+                "key1", 100);
+        final Tile tile2 = createProviderTile(category.key, testPackage, "class2", "authority1",
+                "key1", 100);
+        final Tile tile3 = createProviderTile(category.key, testPackage, "class3", "authority1",
+                "key1", 50);
+        category.addTile(tile1);
+        category.addTile(tile2);
+        category.addTile(tile3);
+        mCategoryByKeyMap.put(CATEGORY_HOMEPAGE, category);
+
+        mCategoryManager.filterDuplicateTiles(mCategoryByKeyMap);
+
+        assertThat(category.getTilesCount()).isEqualTo(1);
+    }
+
+    private Tile createActivityTile(String categoryKey, String packageName, String className,
+            int order) {
+        final ActivityInfo activityInfo = new ActivityInfo();
+        activityInfo.packageName = packageName;
+        activityInfo.name = className;
+        activityInfo.metaData = new Bundle();
+        activityInfo.metaData.putInt(META_DATA_KEY_ORDER, order);
+        return new ActivityTile(activityInfo, categoryKey);
+    }
+
+    private Tile createProviderTile(String categoryKey, String packageName, String className,
+            String authority, String key, int order) {
+        final ProviderInfo providerInfo = new ProviderInfo();
+        final Bundle metaData = new Bundle();
+        providerInfo.packageName = packageName;
+        providerInfo.name = className;
+        providerInfo.authority = authority;
+        metaData.putString(META_DATA_PREFERENCE_KEYHINT, key);
+        metaData.putInt(META_DATA_KEY_ORDER, order);
+        return new ProviderTile(providerInfo, categoryKey, metaData);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java b/tests/unit/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java
new file mode 100644
index 0000000..435fe01
--- /dev/null
+++ b/tests/unit/src/com/android/settings/dashboard/DashboardFragmentRegistryTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2020 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 androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.accounts.AccountDashboardFragment;
+import com.android.settingslib.drawer.CategoryKey;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DashboardFragmentRegistryTest {
+    @Test
+    public void pageAndKeyShouldHave1to1Mapping() {
+        assertThat(DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP.size())
+                .isEqualTo(DashboardFragmentRegistry.PARENT_TO_CATEGORY_KEY_MAP.size());
+    }
+
+    @Test
+    public void accountDetailCategoryShouldRedirectToAccountDashboardFragment() {
+        final String fragment = DashboardFragmentRegistry.CATEGORY_KEY_TO_PARENT_MAP.get(
+                CategoryKey.CATEGORY_ACCOUNT_DETAIL);
+
+        assertThat(fragment).isEqualTo(AccountDashboardFragment.class.getName());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/unit/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
new file mode 100644
index 0000000..68a6788
--- /dev/null
+++ b/tests/unit/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2020 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.content.Context;
+
+import androidx.fragment.app.Fragment;
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.core.PreferenceControllerListHelper;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.DatabaseIndexingUtils;
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import java.util.List;
+
+public class DashboardFragmentSearchIndexProviderInspector {
+
+    public static boolean isSharingPreferenceControllers(Class clazz) {
+        final Context context = ApplicationProvider.getApplicationContext();
+        final Fragment fragment;
+        try {
+            fragment = Fragment.instantiate(context, clazz.getName());
+        } catch (Throwable e) {
+            // Can't do much with exception, assume the test passed.
+            return true;
+        }
+        if (!(fragment instanceof DashboardFragment)) {
+            return true;
+        }
+
+        final BaseSearchIndexProvider provider =
+                (BaseSearchIndexProvider) DatabaseIndexingUtils.getSearchIndexProvider(clazz);
+        if (provider == null) {
+            return true;
+        }
+        final List<AbstractPreferenceController> controllersFromSearchIndexProvider;
+        final List<AbstractPreferenceController> controllersFromFragment;
+        try {
+            controllersFromSearchIndexProvider = provider.getPreferenceControllers(context);
+        } catch (Throwable e) {
+            // Can't do much with exception, assume the test passed.
+            return true;
+        }
+        try {
+            controllersFromFragment =
+                    ((DashboardFragment) fragment).createPreferenceControllers(context);
+            List<BasePreferenceController> controllersFromXml = PreferenceControllerListHelper
+                    .getPreferenceControllersFromXml(context,
+                            ((DashboardFragment) fragment).getPreferenceScreenResId());
+            final List<BasePreferenceController> uniqueControllerFromXml =
+                    PreferenceControllerListHelper.filterControllers(
+                            controllersFromXml, controllersFromFragment);
+            controllersFromFragment.addAll(uniqueControllerFromXml);
+
+        } catch (Throwable e) {
+            // Can't do much with exception, assume the test passed.
+            return true;
+        }
+
+        if (controllersFromFragment == controllersFromSearchIndexProvider) {
+            return true;
+        } else if (controllersFromFragment != null && controllersFromSearchIndexProvider != null) {
+            return controllersFromFragment.size() == controllersFromSearchIndexProvider.size();
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/datausage/AppPrefLoaderTest.java b/tests/unit/src/com/android/settings/datausage/AppPrefLoaderTest.java
new file mode 100644
index 0000000..902906c
--- /dev/null
+++ b/tests/unit/src/com/android/settings/datausage/AppPrefLoaderTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.graphics.drawable.Drawable;
+import android.util.ArraySet;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class AppPrefLoaderTest {
+
+    @Mock
+    private PackageManager mPackageManager;
+
+    private AppPrefLoader mLoader;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        final ArraySet<String> pkgs = new ArraySet<>(2);
+        pkgs.add("pkg0");
+        pkgs.add("pkg1");
+        mLoader = new AppPrefLoader(
+                ApplicationProvider.getApplicationContext(), pkgs, mPackageManager);
+    }
+
+    @Test
+    public void loadInBackground_packageNotFound_shouldReturnEmptySet()
+            throws NameNotFoundException {
+        when(mPackageManager.getApplicationInfo(anyString(), anyInt()))
+            .thenThrow(new NameNotFoundException());
+
+        assertThat(mLoader.loadInBackground()).isEmpty();
+    }
+
+    @Test
+    public void loadInBackground_shouldReturnPreference() throws NameNotFoundException {
+        ApplicationInfo info = mock(ApplicationInfo.class);
+        when(mPackageManager.getApplicationInfo(anyString(), anyInt())).thenReturn(info);
+        final Drawable drawable = mock(Drawable.class);
+        final String label = "Label1";
+        when(info.loadIcon(mPackageManager)).thenReturn(drawable);
+        when(info.loadLabel(mPackageManager)).thenReturn(label);
+
+        Preference preference = mLoader.loadInBackground().valueAt(0);
+        assertThat(preference.getTitle()).isEqualTo(label);
+        assertThat(preference.getIcon()).isEqualTo(drawable);
+        assertThat(preference.isSelectable()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/datausage/CellDataPreferenceTest.java b/tests/unit/src/com/android/settings/datausage/CellDataPreferenceTest.java
new file mode 100644
index 0000000..93ca875
--- /dev/null
+++ b/tests/unit/src/com/android/settings/datausage/CellDataPreferenceTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.LinearLayout;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class CellDataPreferenceTest {
+
+    @Mock
+    private SubscriptionInfo mSubInfo;
+
+    private Context mContext;
+    private CellDataPreference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = ApplicationProvider.getApplicationContext();
+        mPreference = new CellDataPreference(mContext, null) {
+            @Override
+            SubscriptionInfo getActiveSubscriptionInfo(int subId) {
+                return mSubInfo;
+            }
+        };
+
+        final LayoutInflater inflater = LayoutInflater.from(mContext);
+        final View view = inflater.inflate(mPreference.getLayoutResource(),
+                new LinearLayout(mContext), false);
+    }
+
+    @Test
+    public void updateEnabled_noActiveSub_shouldDisable() {
+        mSubInfo = null;
+
+        mPreference.mOnSubscriptionsChangeListener.onChanged();
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void updateEnabled_hasActiveSub_shouldEnable() {
+        mPreference.mOnSubscriptionsChangeListener.onChanged();
+
+        assertThat(mPreference.isEnabled()).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java b/tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
new file mode 100644
index 0000000..d94d380
--- /dev/null
+++ b/tests/unit/src/com/android/settings/datausage/DataUsageInfoControllerTest.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.NetworkPolicy;
+import android.net.NetworkTemplate;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.net.DataUsageController.DataUsageInfo;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DataUsageInfoControllerTest {
+
+    private static final int NEGATIVE = -1;
+    private static final int ZERO = 0;
+    private static final int POSITIVE_SMALL = 1;
+    private static final int POSITIVE_LARGE = 5;
+
+    private DataUsageInfoController mInfoController;
+    private DataUsageInfo info;
+
+    @Before
+    public void setUp()  {
+        mInfoController = new DataUsageInfoController();
+        info = new DataUsageInfo();
+    }
+
+    @Test
+    public void getSummaryLimit_LowUsageLowWarning_LimitUsed() {
+        info.warningLevel = POSITIVE_SMALL;
+        info.limitLevel = POSITIVE_LARGE;
+        info.usageLevel = POSITIVE_SMALL;
+
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.limitLevel);
+    }
+
+    @Test
+    public void getSummaryLimit_LowUsageEqualWarning_LimitUsed() {
+        info.warningLevel = POSITIVE_LARGE;
+        info.limitLevel = POSITIVE_LARGE;
+        info.usageLevel = POSITIVE_SMALL;
+
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.limitLevel);
+    }
+
+    @Test
+    public void getSummaryLimit_NoLimitNoUsage_WarningUsed() {
+        info.warningLevel = POSITIVE_LARGE;
+        info.limitLevel = ZERO;
+        info.usageLevel = ZERO;
+
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.warningLevel);
+    }
+
+    @Test
+    public void getSummaryLimit_NoLimitLowUsage_WarningUsed() {
+        info.warningLevel = POSITIVE_LARGE;
+        info.limitLevel = ZERO;
+        info.usageLevel = POSITIVE_SMALL;
+
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.warningLevel);
+    }
+
+    @Test
+    public void getSummaryLimit_LowWarningNoLimit_UsageUsed() {
+        info.warningLevel = POSITIVE_SMALL;
+        info.limitLevel = ZERO;
+        info.usageLevel = POSITIVE_LARGE;
+
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.usageLevel);
+    }
+
+    @Test
+    public void getSummaryLimit_LowWarningLowLimit_UsageUsed() {
+        info.warningLevel = POSITIVE_SMALL;
+        info.limitLevel = POSITIVE_SMALL;
+        info.usageLevel = POSITIVE_LARGE;
+
+        assertThat(mInfoController.getSummaryLimit(info)).isEqualTo(info.usageLevel);
+    }
+
+    private NetworkPolicy getDefaultNetworkPolicy() {
+        NetworkTemplate template =
+            new NetworkTemplate(NetworkTemplate.MATCH_WIFI_WILDCARD, null, null);
+        int cycleDay  = -1;
+        String cycleTimezone = "UTC";
+        long warningBytes = -1;
+        long limitBytes = -1;
+        return new NetworkPolicy(template, cycleDay, cycleTimezone, warningBytes, limitBytes, true);
+    }
+
+    @Test
+    public void updateDataLimit_NullArguments_NoError() {
+        mInfoController.updateDataLimit(null, null);
+        mInfoController.updateDataLimit(info, null);
+        mInfoController.updateDataLimit(null, getDefaultNetworkPolicy());
+    }
+
+    @Test
+    public void updateDataLimit_NegativeWarning_UpdatedToZero() {
+        NetworkPolicy policy = getDefaultNetworkPolicy();
+        policy.warningBytes = NEGATIVE;
+
+        mInfoController.updateDataLimit(info, policy);
+
+        assertThat(info.warningLevel).isEqualTo(ZERO);
+    }
+
+    @Test
+    public void updateDataLimit_WarningZero_UpdatedToZero() {
+        NetworkPolicy policy = getDefaultNetworkPolicy();
+        policy.warningBytes = ZERO;
+
+        mInfoController.updateDataLimit(info, policy);
+
+        assertThat(info.warningLevel).isEqualTo(ZERO);
+    }
+
+    @Test
+    public void updateDataLimit_WarningPositive_UpdatedToWarning() {
+        NetworkPolicy policy = getDefaultNetworkPolicy();
+        policy.warningBytes = POSITIVE_SMALL;
+
+        mInfoController.updateDataLimit(info, policy);
+
+        assertThat(info.warningLevel).isEqualTo(policy.warningBytes);
+    }
+
+    @Test
+    public void updateDataLimit_LimitNegative_UpdatedToZero() {
+        NetworkPolicy policy = getDefaultNetworkPolicy();
+        policy.limitBytes = NEGATIVE;
+
+        mInfoController.updateDataLimit(info, policy);
+
+        assertThat(info.limitLevel).isEqualTo(ZERO);
+    }
+
+    @Test
+    public void updateDataLimit_LimitZero_UpdatedToZero() {
+        NetworkPolicy policy = getDefaultNetworkPolicy();
+        policy.limitBytes = ZERO;
+
+        mInfoController.updateDataLimit(info, policy);
+
+        assertThat(info.limitLevel).isEqualTo(ZERO);
+    }
+
+    @Test
+    public void updateDataLimit_LimitPositive_UpdatedToLimit() {
+        NetworkPolicy policy = getDefaultNetworkPolicy();
+        policy.limitBytes = POSITIVE_SMALL;
+
+        mInfoController.updateDataLimit(info, policy);
+        
+        assertThat(info.limitLevel).isEqualTo(policy.limitBytes);
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java b/tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
new file mode 100644
index 0000000..76deec6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
@@ -0,0 +1,571 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.datausage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.Typeface;
+import android.net.ConnectivityManager;
+import android.net.NetworkTemplate;
+import android.os.Bundle;
+import android.telephony.SubscriptionManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.MeasureSpec;
+import android.widget.TextView;
+
+import androidx.preference.PreferenceViewHolder;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.SettingsActivity;
+import com.android.settings.testutils.ResourcesUtils;
+import com.android.settingslib.Utils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.MockitoAnnotations;
+
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+public class DataUsageSummaryPreferenceTest {
+
+    private static final long CYCLE_DURATION_MILLIS = 1000000000L;
+    private static final long UPDATE_LAG_MILLIS = 10000000L;
+    private static final String FAKE_CARRIER = "z-mobile";
+
+    private Context mContext;
+    private Resources mResources;
+    private PreferenceViewHolder mHolder;
+    private DataUsageSummaryPreference mSummaryPreference;
+
+    private long mCycleEnd;
+    private long mUpdateTime;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mResources = spy(mContext.getResources());
+        when(mContext.getResources()).thenReturn(mResources);
+        mSummaryPreference = spy(new DataUsageSummaryPreference(mContext, null /* attrs */));
+        LayoutInflater inflater = mContext.getSystemService(LayoutInflater.class);
+        View view = inflater.inflate(
+                mSummaryPreference.getLayoutResource(),
+                null /* root */, false /* attachToRoot */);
+
+        mHolder = spy(PreferenceViewHolder.createInstanceForTests(view));
+        assertThat(mSummaryPreference.getDataUsed(mHolder)).isNotNull();
+
+        final long now = System.currentTimeMillis();
+        mCycleEnd = now + CYCLE_DURATION_MILLIS;
+        mUpdateTime = now - UPDATE_LAG_MILLIS;
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetUsageInfo_withLaunchIntent_launchButtonShown() {
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getLaunchButton(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void testSetUsageInfo_withoutLaunchIntent_launchButtonNotShown() {
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
+                null /* launchIntent */);
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getLaunchButton(mHolder).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testSetUsageInfo_withDataPlans_carrierInfoShown() {
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getCarrierInfo(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void testSetUsageInfo_withNoDataPlans_carrierInfoNotShown() {
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getCarrierInfo(mHolder).getVisibility())
+                .isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testCarrierUpdateTime_shouldFormatDaysCorrectly() {
+        int baseUnit = 2;
+        int smudge = 6;
+        final long updateTime = System.currentTimeMillis()
+                - TimeUnit.DAYS.toMillis(baseUnit) - TimeUnit.HOURS.toMillis(smudge);
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getCarrierInfo(mHolder).getText().toString())
+                .isEqualTo("Updated by " + FAKE_CARRIER + " " + baseUnit + " days ago");
+    }
+
+    @Test
+    public void testCarrierUpdateTime_shouldFormatHoursCorrectly() {
+        int baseUnit = 2;
+        int smudge = 6;
+        final long updateTime = System.currentTimeMillis()
+                - TimeUnit.HOURS.toMillis(baseUnit) - TimeUnit.MINUTES.toMillis(smudge);
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getCarrierInfo(mHolder).getText().toString())
+                .isEqualTo("Updated by " + FAKE_CARRIER + " " + baseUnit + " hr ago");
+    }
+
+    @Test
+    public void testCarrierUpdateTime_shouldFormatMinutesCorrectly() {
+        int baseUnit = 2;
+        int smudge = 6;
+        final long updateTime = System.currentTimeMillis()
+                - TimeUnit.MINUTES.toMillis(baseUnit) - TimeUnit.SECONDS.toMillis(smudge);
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getCarrierInfo(mHolder).getText().toString())
+                .isEqualTo("Updated by " + FAKE_CARRIER + " " + baseUnit + " min ago");
+    }
+
+    @Test
+    public void testCarrierUpdateTime_shouldFormatLessThanMinuteCorrectly() {
+        final long updateTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(45);
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getCarrierInfo(mHolder).getText().toString())
+                .isEqualTo("Updated by " + FAKE_CARRIER + " just now");
+    }
+
+    @Test
+    public void testCarrierUpdateTimeWithNoCarrier_shouldSayJustNow() {
+        final long updateTime = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(45);
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, null /* carrier */,
+                1 /* numPlans */, new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getCarrierInfo(mHolder).getText().toString())
+                .isEqualTo("Updated just now");
+    }
+
+    @Test
+    public void testCarrierUpdateTimeWithNoCarrier_shouldFormatTime() {
+        final long updateTime = System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(2);
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, null /* carrier */,
+                1 /* numPlans */, new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getCarrierInfo(mHolder).getText().toString())
+                .isEqualTo("Updated 2 min ago");
+    }
+
+    @Test
+    public void setUsageInfo_withRecentCarrierUpdate_doesNotSetCarrierInfoWarningColorAndFont() {
+        final long updateTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(1);
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        TextView carrierInfo = mSummaryPreference.getCarrierInfo(mHolder);
+        assertThat(carrierInfo.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(carrierInfo.getCurrentTextColor()).isEqualTo(
+                Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorSecondary));
+        assertThat(carrierInfo.getTypeface()).isEqualTo(Typeface.SANS_SERIF);
+    }
+
+    @Test
+    public void testSetUsageInfo_withStaleCarrierUpdate_setsCarrierInfoWarningColorAndFont() {
+        final long updateTime = System.currentTimeMillis() - TimeUnit.HOURS.toMillis(7);
+        mSummaryPreference.setUsageInfo(mCycleEnd, updateTime, FAKE_CARRIER, 1 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        TextView carrierInfo = mSummaryPreference.getCarrierInfo(mHolder);
+        assertThat(carrierInfo.getVisibility()).isEqualTo(View.VISIBLE);
+        assertThat(carrierInfo.getCurrentTextColor()).isEqualTo(
+                Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorError));
+        assertThat(carrierInfo.getTypeface()).isEqualTo(
+                DataUsageSummaryPreference.SANS_SERIF_MEDIUM);
+    }
+
+    @Test
+    public void testSetUsageInfo_withNoDataPlans_usageTitleNotShown() {
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getUsageTitle(mHolder).getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testSetUsageInfo_withMultipleDataPlans_usageTitleShown() {
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 2 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getUsageTitle(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void testSetUsageInfo_cycleRemainingTimeIsLessOneDay() {
+        // just under one day
+        final long cycleEnd = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(23);
+        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getCycleTime(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mSummaryPreference.getCycleTime(mHolder).getText()).isEqualTo(
+                ResourcesUtils.getResourcesString(
+                        mContext, "billing_cycle_less_than_one_day_left"));
+    }
+
+    @Test
+    public void testSetUsageInfo_cycleRemainingTimeNegativeDaysLeft_shouldDisplayNoneLeft() {
+        final long cycleEnd = System.currentTimeMillis() - 1L;
+        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getCycleTime(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mSummaryPreference.getCycleTime(mHolder).getText()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "billing_cycle_none_left"));
+    }
+
+    @Test
+    public void testSetUsageInfo_cycleRemainingTimeDaysLeft_shouldUsePlurals() {
+        final int daysLeft = 3;
+        final long cycleEnd = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(daysLeft)
+                + TimeUnit.HOURS.toMillis(1);
+        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
+                new Intent());
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getCycleTime(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mSummaryPreference.getCycleTime(mHolder).getText())
+                .isEqualTo(daysLeft + " days left");
+    }
+
+    @Test
+    public void testSetLimitInfo_withLimitInfo_dataLimitsShown() {
+        final String limitText = "test limit text";
+        mSummaryPreference.setLimitInfo(limitText);
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getDataLimits(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mSummaryPreference.getDataLimits(mHolder).getText()).isEqualTo(limitText);
+    }
+
+    @Test
+    public void testSetLimitInfo_withNullLimitInfo_dataLimitsNotShown() {
+        mSummaryPreference.setLimitInfo(null);
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getDataLimits(mHolder).getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testSetLimitInfo_withEmptyLimitInfo_dataLimitsNotShown() {
+        final String emptyLimitText = "";
+        mSummaryPreference.setLimitInfo(emptyLimitText);
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getDataLimits(mHolder).getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testSetChartEnabledFalse_hidesLabelBar() {
+        setValidLabels();
+        mSummaryPreference.setChartEnabled(false);
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getLabelBar(mHolder).getVisibility()).isEqualTo(View.GONE);
+        assertThat(mSummaryPreference.getProgressBar(mHolder).getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testSetEmptyLabels_hidesLabelBar() {
+        mSummaryPreference.setLabels("", "");
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getLabelBar(mHolder).getVisibility()).isEqualTo(View.GONE);
+        assertThat(mSummaryPreference.getProgressBar(mHolder).getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testLabelBar_isVisible_whenLabelsSet() {
+        setValidLabels();
+        //mChartEnabled defaults to true
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getLabelBar(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mSummaryPreference.getProgressBar(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+    }
+
+    @Test
+    public void testSetProgress_updatesProgressBar() {
+        setValidLabels();
+        mSummaryPreference.setProgress(.5f);
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getProgressBar(mHolder).getProgress()).isEqualTo(50);
+    }
+
+    private void setValidLabels() {
+        mSummaryPreference.setLabels("0.0 GB", "5.0 GB");
+    }
+
+    @Test
+    public void testSetUsageAndRemainingInfo_withUsageInfo_dataUsageAndRemainingShown() {
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
+                new Intent());
+        mSummaryPreference.setUsageNumbers(
+                BillingCycleSettings.MIB_IN_BYTES,
+                10 * BillingCycleSettings.MIB_IN_BYTES,
+                true /* hasMobileData */);
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getDataUsed(mHolder).getText().toString())
+                .isEqualTo("1.00 MB used");
+        assertThat(mSummaryPreference.getDataRemaining(mHolder).getText().toString())
+                .isEqualTo("9.00 MB left");
+        assertThat(mSummaryPreference.getDataRemaining(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        final int colorId = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorAccent);
+        assertThat(mSummaryPreference.getDataRemaining(mHolder).getCurrentTextColor())
+                .isEqualTo(colorId);
+    }
+
+    @Test
+    public void testSetUsageInfo_withDataOverusage() {
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
+                new Intent());
+        mSummaryPreference.setUsageNumbers(
+                11 * BillingCycleSettings.MIB_IN_BYTES,
+                10 * BillingCycleSettings.MIB_IN_BYTES,
+                true /* hasMobileData */);
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getDataUsed(mHolder).getText().toString())
+                .isEqualTo("11.00 MB used");
+        assertThat(mSummaryPreference.getDataRemaining(mHolder).getText().toString())
+                .isEqualTo("1.00 MB over");
+        final int colorId = Utils.getColorAttrDefaultColor(mContext, android.R.attr.colorError);
+        assertThat(mSummaryPreference.getDataRemaining(mHolder).getCurrentTextColor())
+                .isEqualTo(colorId);
+    }
+
+    @Test
+    public void testSetUsageInfo_withUsageInfo_dataUsageShown() {
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
+                new Intent());
+        mSummaryPreference.setUsageNumbers(
+                BillingCycleSettings.MIB_IN_BYTES, -1L, true /* hasMobileData */);
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getDataUsed(mHolder).getText().toString())
+                .isEqualTo("1.00 MB used");
+        assertThat(mSummaryPreference.getDataRemaining(mHolder).getText()).isEqualTo("");
+    }
+
+    @Test
+    public void testSetAppIntent_toMdpApp_intentCorrect() {
+        final Intent intent = new Intent(SubscriptionManager.ACTION_MANAGE_SUBSCRIPTION_PLANS);
+        intent.setPackage("test-owner.example.com");
+        intent.putExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, 42);
+
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
+                intent);
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getLaunchButton(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mSummaryPreference.getLaunchButton(mHolder).getText())
+                .isEqualTo(ResourcesUtils.getResourcesString(mContext, "launch_mdp_app_text"));
+
+        doNothing().when(mContext).startActivity(any(Intent.class));
+        mSummaryPreference.getLaunchButton(mHolder).callOnClick();
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(
+                Intent.class);
+        verify(mContext).startActivity(intentCaptor.capture());
+        final Intent startedIntent = intentCaptor.getValue();
+
+        assertThat(startedIntent.getAction())
+                .isEqualTo(SubscriptionManager.ACTION_MANAGE_SUBSCRIPTION_PLANS);
+        assertThat(startedIntent.getPackage()).isEqualTo("test-owner.example.com");
+        assertThat(startedIntent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX, -1))
+                .isEqualTo(42);
+    }
+
+    @Test
+    public void testSetUsageInfo_withOverflowStrings_dataRemainingNotShown() {
+        LayoutInflater inflater = LayoutInflater.from(mContext);
+        View view = inflater.inflate(mSummaryPreference.getLayoutResource(), null /* root */,
+                false /* attachToRoot */);
+
+        mSummaryPreference.setUsageInfo(mCycleEnd, mUpdateTime, FAKE_CARRIER, 1 /* numPlans */,
+                new Intent());
+        mSummaryPreference.setUsageNumbers(
+                BillingCycleSettings.MIB_IN_BYTES,
+                10 * BillingCycleSettings.MIB_IN_BYTES,
+                true /* hasMobileData */);
+
+        int data_used_formatted_id = ResourcesUtils.getResourcesId(
+                mContext, "string", "data_used_formatted");
+        int data_remaining_id = ResourcesUtils.getResourcesId(
+                mContext, "string", "data_remaining");
+        CharSequence data_used_formatted_cs = "^1 ^2 used with long trailing text";
+        CharSequence data_remaining_cs = "^1 left";
+        doReturn(data_used_formatted_cs).when(mResources).getText(data_used_formatted_id);
+        doReturn(data_remaining_cs).when(mResources).getText(data_remaining_id);
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+
+        TextView dataUsed = mSummaryPreference.getDataUsed(mHolder);
+        TextView dataRemaining = mSummaryPreference.getDataRemaining(mHolder);
+        int width = MeasureSpec.makeMeasureSpec(500, MeasureSpec.EXACTLY);
+        dataUsed.measure(width, MeasureSpec.UNSPECIFIED);
+        dataRemaining.measure(width, MeasureSpec.UNSPECIFIED);
+
+        assertThat(dataRemaining.getVisibility()).isEqualTo(View.VISIBLE);
+
+        MeasurableLinearLayout layout = mSummaryPreference.getLayout(mHolder);
+        layout.measure(
+                MeasureSpec.makeMeasureSpec(800, View.MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+
+        assertThat(dataUsed.getText().toString()).isEqualTo("1.00 MB used with long trailing text");
+        // TODO(b/175389659): re-enable this line once cuttlefish device specs are verified.
+        // assertThat(dataRemaining.getVisibility()).isEqualTo(View.GONE);
+    }
+
+    @Test
+    public void testSetWifiMode_withUsageInfo_dataUsageShown() {
+        final int daysLeft = 3;
+        final long cycleEnd = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(daysLeft)
+                + TimeUnit.HOURS.toMillis(1);
+        mSummaryPreference.setUsageInfo(cycleEnd, mUpdateTime, FAKE_CARRIER, 0 /* numPlans */,
+                new Intent());
+        mSummaryPreference.setUsageNumbers(1000000L, -1L, true);
+        final String cycleText = "The quick fox";
+        mSummaryPreference.setWifiMode(true /* isWifiMode */, cycleText, false /* isSingleWifi */);
+        doReturn(200L).when(mSummaryPreference).getHistoricalUsageLevel();
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+        assertThat(mSummaryPreference.getUsageTitle(mHolder).getText().toString())
+                .isEqualTo(ResourcesUtils.getResourcesString(mContext, "data_usage_wifi_title"));
+        assertThat(mSummaryPreference.getUsageTitle(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mSummaryPreference.getCycleTime(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mSummaryPreference.getCycleTime(mHolder).getText()).isEqualTo(cycleText);
+        assertThat(mSummaryPreference.getCarrierInfo(mHolder).getVisibility()).isEqualTo(View.GONE);
+        assertThat(mSummaryPreference.getDataLimits(mHolder).getVisibility()).isEqualTo(View.GONE);
+        assertThat(mSummaryPreference.getLaunchButton(mHolder).getVisibility())
+                .isEqualTo(View.VISIBLE);
+        assertThat(mSummaryPreference.getLaunchButton(mHolder).getText())
+                .isEqualTo(ResourcesUtils.getResourcesString(mContext, "launch_wifi_text"));
+
+        doNothing().when(mContext).startActivity(any(Intent.class));
+        mSummaryPreference.getLaunchButton(mHolder).callOnClick();
+
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(
+                Intent.class);
+        verify(mContext).startActivity(intentCaptor.capture());
+        final Intent startedIntent = intentCaptor.getValue();
+
+        final Bundle expect = new Bundle(1);
+        expect.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE,
+                NetworkTemplate.buildTemplateWifiWildcard());
+        final Bundle actual = startedIntent
+                .getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+        assertThat((NetworkTemplate) actual.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE))
+                .isEqualTo(NetworkTemplate.buildTemplateWifiWildcard());
+
+        assertThat(startedIntent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
+                .isEqualTo(ResourcesUtils.getResourcesId(mContext, "string", "wifi_data_usage"));
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetWifiMode_noUsageInfo_shouldDisableLaunchButton() {
+        mSummaryPreference.setWifiMode(true /* isWifiMode */, "Test cycle text",
+                false /* isSingleWifi */);
+        doReturn(0L).when(mSummaryPreference).getHistoricalUsageLevel();
+
+        mSummaryPreference.onBindViewHolder(mHolder);
+
+        assertThat(mSummaryPreference.getLaunchButton(mHolder).isEnabled()).isFalse();
+    }
+
+    @Test
+    public void launchWifiDataUsage_shouldSetWifiNetworkTypeInIntentExtra() {
+        doNothing().when(mContext).startActivity(any(Intent.class));
+        mSummaryPreference.launchWifiDataUsage(mContext);
+
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(
+                Intent.class);
+        verify(mContext).startActivity(intentCaptor.capture());
+        final Intent launchIntent = intentCaptor.getValue();
+        final Bundle args =
+                launchIntent.getBundleExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+
+        assertThat(args.getInt(DataUsageList.EXTRA_NETWORK_TYPE))
+            .isEqualTo(ConnectivityManager.TYPE_WIFI);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/datausage/OWNERS b/tests/unit/src/com/android/settings/datausage/OWNERS
new file mode 100644
index 0000000..18806f4
--- /dev/null
+++ b/tests/unit/src/com/android/settings/datausage/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/datausage/OWNERS
diff --git a/tests/unit/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java b/tests/unit/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java
new file mode 100644
index 0000000..de607da
--- /dev/null
+++ b/tests/unit/src/com/android/settings/datetime/timezone/RegionZonePickerTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2020 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.datetime.timezone;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.icu.text.Collator;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.datetime.timezone.RegionZonePicker.TimeZoneInfoComparator;
+import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+
+@RunWith(AndroidJUnit4.class)
+public class RegionZonePickerTest {
+
+    @Test
+    public void compareTimeZoneInfo_matchGmtOrder() {
+        Date now = new Date(0); // 00:00 1, Jan 1970
+        Formatter formatter = new Formatter(Locale.US, now);
+        TimeZoneInfo timeZone1 = formatter.format("Pacific/Honolulu");
+        TimeZoneInfo timeZone2 = formatter.format("America/Los_Angeles");
+        TimeZoneInfo timeZone3 = formatter.format("America/Indiana/Marengo");
+        TimeZoneInfo timeZone4 = formatter.format("America/New_York");
+
+        TimeZoneInfoComparator comparator =
+                new TimeZoneInfoComparator(Collator.getInstance(Locale.US), now);
+
+        // Verify the sorted order
+        List<TimeZoneInfo> list = Arrays.asList(timeZone4, timeZone2, timeZone3, timeZone1);
+        Collections.sort(list, comparator);
+        assertThat(list).isEqualTo(Arrays.asList(timeZone1, timeZone2, timeZone3, timeZone4));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java b/tests/unit/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
new file mode 100644
index 0000000..64d8abb
--- /dev/null
+++ b/tests/unit/src/com/android/settings/datetime/timezone/TimeZoneInfoPreferenceControllerTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2020 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.datetime.timezone;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Date;
+import java.util.Locale;
+
+@RunWith(AndroidJUnit4.class)
+public class TimeZoneInfoPreferenceControllerTest {
+
+    private TimeZoneInfo mTimeZoneInfo;
+    private TimeZoneInfoPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        final Context context = ApplicationProvider.getApplicationContext();
+        final Date now = new Date(0L); // 00:00 1/1/1970
+        final Formatter formatter = new Formatter(Locale.US, now);
+        mTimeZoneInfo = formatter.format("America/Los_Angeles");
+        mController = new TimeZoneInfoPreferenceController(context, "key");
+        mController.mDate = now;
+        mController.setTimeZoneInfo(mTimeZoneInfo);
+    }
+
+    @Test
+    public void getSummary_matchExpectedFormattedText() {
+        assertThat(mController.getSummary().toString()).isEqualTo(
+                "Uses Pacific Time (GMT-08:00). "
+                        + "Pacific Daylight Time starts on April 26, 1970.");
+    }
+
+    @Test
+    public void getAvailabilityStatus_timeZoneInfoSet_shouldReturnAVAILABLE_UNSEARCHABLE() {
+        mController.setTimeZoneInfo(mTimeZoneInfo);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noTimeZoneInfoSet_shouldReturnUNSUPPORTED_ON_DEVICE() {
+        mController.setTimeZoneInfo(null);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java b/tests/unit/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java
new file mode 100644
index 0000000..f43cde3
--- /dev/null
+++ b/tests/unit/src/com/android/settings/datetime/timezone/TimeZoneInfoTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2020 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.datetime.timezone;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.datetime.timezone.TimeZoneInfo.Formatter;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Date;
+import java.util.Locale;
+
+@RunWith(AndroidJUnit4.class)
+public class TimeZoneInfoTest {
+
+    @Test
+    public void testFormat() {
+        Date now = new Date(0L); // 00:00 1/1/1970
+        Formatter formatter = new Formatter(Locale.US, now);
+
+        TimeZoneInfo timeZoneInfo = formatter.format("America/Los_Angeles");
+        assertThat(timeZoneInfo.getId()).isEqualTo("America/Los_Angeles");
+        assertThat(timeZoneInfo.getExemplarLocation()).isEqualTo("Los Angeles");
+        assertThat(timeZoneInfo.getGmtOffset().toString()).isEqualTo("GMT-08:00");
+        assertThat(timeZoneInfo.getGenericName()).isEqualTo("Pacific Time");
+        assertThat(timeZoneInfo.getStandardName()).isEqualTo("Pacific Standard Time");
+        assertThat(timeZoneInfo.getDaylightName()).isEqualTo("Pacific Daylight Time");
+    }
+
+    @Test
+    public void getGmtOffset_zoneLordHowe_correctGmtOffset() {
+        Date date = new Date(1514764800000L); // 00:00 1/1/2018 GMT
+        Formatter formatter = new Formatter(Locale.US, date);
+
+        TimeZoneInfo timeZoneInfo = formatter.format("Australia/Lord_Howe");
+        assertThat(timeZoneInfo.getGmtOffset().toString()).isEqualTo("GMT+11:00");
+    }
+}
diff --git a/tests/unit/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerInstrumentationTest.java b/tests/unit/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerInstrumentationTest.java
deleted file mode 100644
index dbb73c0..0000000
--- a/tests/unit/src/com/android/settings/development/BluetoothMaxConnectedAudioDevicesPreferenceControllerInstrumentationTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.development;
-
-import android.content.Context;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class BluetoothMaxConnectedAudioDevicesPreferenceControllerInstrumentationTest {
-
-    private Context mTargetContext;
-    private String[] mListValues;
-    private String[] mListEntries;
-    private String mDefaultMaxConnectedAudioDevices;
-
-    @Before
-    public void setUp() throws Exception {
-        mTargetContext = InstrumentationRegistry.getTargetContext();
-        // Get XML values without mock
-        mListValues = mTargetContext.getResources()
-                .getStringArray(R.array.bluetooth_max_connected_audio_devices_values);
-        mListEntries = mTargetContext.getResources()
-                .getStringArray(R.array.bluetooth_max_connected_audio_devices);
-        mDefaultMaxConnectedAudioDevices = String.valueOf(mTargetContext.getResources()
-                .getInteger(
-                        com.android.internal.R.integer
-                                .config_bluetooth_max_connected_audio_devices));
-    }
-
-    @Test
-    public void verifyResource() {
-        // Verify normal list entries and default preference entries have the same size
-        Assert.assertEquals(mListEntries.length, mListValues.length);
-        Assert.assertThat(Arrays.asList(mListValues),
-                CoreMatchers.hasItem(mDefaultMaxConnectedAudioDevices));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/development/OverlaySettingsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/OverlaySettingsPreferenceControllerTest.java
new file mode 100644
index 0000000..827f5a1
--- /dev/null
+++ b/tests/unit/src/com/android/settings/development/OverlaySettingsPreferenceControllerTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2020 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 android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class OverlaySettingsPreferenceControllerTest {
+
+    private Context mContext;
+    private SwitchPreference mPreference;
+    private OverlaySettingsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new OverlaySettingsPreferenceController(mContext);
+        mPreference = new SwitchPreference(mContext);
+    }
+
+    @Test
+    public void isAvailable_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_isOverlaySettingsEnabled_shouldCheckPreference() {
+        OverlaySettingsPreferenceController.setOverlaySettingsEnabled(mContext, true);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_isOverlaySettingsDisabled_shouldUncheckPreference() {
+        OverlaySettingsPreferenceController.setOverlaySettingsEnabled(mContext, false);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceChecked_shouldEnableSettings() {
+        mController.onPreferenceChange(mPreference, true);
+
+        assertThat(OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isTrue();
+    }
+
+    @Test
+    public void onPreferenceChange_preferenceUnchecked_shouldDisableSettings() {
+        mController.onPreferenceChange(mPreference, false);
+
+        assertThat(
+                OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isFalse();
+    }
+
+    @Test
+    public void isOverlaySettingsEnabled_sharePreferenceSetTrue_shouldReturnTrue() {
+        final SharedPreferences editor = mContext.getSharedPreferences(
+                OverlaySettingsPreferenceController.SHARE_PERFS,
+                Context.MODE_PRIVATE);
+        editor.edit().putBoolean(OverlaySettingsPreferenceController.SHARE_PERFS, true).apply();
+
+        assertThat(OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isTrue();
+    }
+
+    @Test
+    public void isOverlaySettingsEnabled_sharePreferenceSetFalse_shouldReturnFalse() {
+        final SharedPreferences editor = mContext.getSharedPreferences(
+                OverlaySettingsPreferenceController.SHARE_PERFS,
+                Context.MODE_PRIVATE);
+        editor.edit().putBoolean(OverlaySettingsPreferenceController.SHARE_PERFS, false).apply();
+
+        assertThat(
+                OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isFalse();
+    }
+
+    @Test
+    public void setOverlaySettingsEnabled_setTrue_shouldStoreTrue() {
+        OverlaySettingsPreferenceController.setOverlaySettingsEnabled(mContext, true);
+
+        assertThat(
+                OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isTrue();
+    }
+
+    @Test
+    public void setOverlaySettingsEnabled_setFalse_shouldStoreTrue() {
+        OverlaySettingsPreferenceController.setOverlaySettingsEnabled(mContext, false);
+
+        assertThat(
+                OverlaySettingsPreferenceController.isOverlaySettingsEnabled(mContext)).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/development/autofill/AutofillTestingHelper.java b/tests/unit/src/com/android/settings/development/autofill/AutofillTestingHelper.java
new file mode 100644
index 0000000..c1ef2b5
--- /dev/null
+++ b/tests/unit/src/com/android/settings/development/autofill/AutofillTestingHelper.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2020 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.autofill;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+import android.provider.Settings.SettingNotFoundException;
+
+final class AutofillTestingHelper {
+    private final ContentResolver mResolver;
+
+    AutofillTestingHelper(Context context) {
+        mResolver = context.getContentResolver();
+    }
+
+    public void setLoggingLevel(int max) {
+        setGlobal(Settings.Global.AUTOFILL_LOGGING_LEVEL, max);
+    }
+
+    public void setMaxPartitionsSize(int max) {
+        setGlobal(Settings.Global.AUTOFILL_MAX_PARTITIONS_SIZE, max);
+    }
+
+    public void setMaxVisibleDatasets(int level) {
+        setGlobal(Settings.Global.AUTOFILL_MAX_VISIBLE_DATASETS, level);
+    }
+
+    public int getLoggingLevel() throws SettingNotFoundException {
+        return getGlobal(Settings.Global.AUTOFILL_LOGGING_LEVEL);
+    }
+
+    public int getMaxPartitionsSize() throws SettingNotFoundException {
+        return getGlobal(Settings.Global.AUTOFILL_MAX_PARTITIONS_SIZE);
+    }
+
+    public int getMaxVisibleDatasets() throws SettingNotFoundException {
+        return getGlobal(Settings.Global.AUTOFILL_MAX_VISIBLE_DATASETS);
+    }
+
+    private void setGlobal(String key, int value) {
+        Settings.Global.putInt(mResolver, key, value);
+    }
+
+    private int getGlobal(String key) throws SettingNotFoundException {
+        return Settings.Global.getInt(mResolver, key);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java b/tests/unit/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java
new file mode 100644
index 0000000..9b978b0
--- /dev/null
+++ b/tests/unit/src/com/android/settings/development/featureflags/FeatureFlagPersistentTest.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2020 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.featureflags;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+import android.provider.Settings;
+import android.util.FeatureFlagUtils;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class FeatureFlagPersistentTest {
+
+    private static final String TEST_FEATURE_NAME = "test_feature";
+
+    private static final String PERSISTENT_FALSE_NAME = "false_persistent";
+    private static final String PERSISTENT_TRUE_NAME = "true_persistent";
+    private static final String VOLATILE_FALSE_NAME = "volatile_false_volatile";
+    private static final String VOLATILE_TRUE_NAME = "volatile_true_volatile";
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+
+        FeatureFlagPersistent.getAllPersistentFlags().add(TEST_FEATURE_NAME);
+        FeatureFlagUtils.getAllFeatureFlags().put(TEST_FEATURE_NAME, "false");
+
+        FeatureFlagUtils.getAllFeatureFlags().put(VOLATILE_FALSE_NAME, "false");
+        FeatureFlagUtils.getAllFeatureFlags().put(VOLATILE_TRUE_NAME, "true");
+
+        FeatureFlagPersistent.getAllPersistentFlags().add(PERSISTENT_FALSE_NAME);
+        FeatureFlagUtils.getAllFeatureFlags().put(PERSISTENT_FALSE_NAME, "false");
+
+        FeatureFlagPersistent.getAllPersistentFlags().add(PERSISTENT_TRUE_NAME);
+        FeatureFlagUtils.getAllFeatureFlags().put(PERSISTENT_TRUE_NAME, "true");
+    }
+
+    @After
+    public void tearDown() {
+        cleanup(PERSISTENT_FALSE_NAME);
+        cleanup(PERSISTENT_TRUE_NAME);
+        cleanup(VOLATILE_FALSE_NAME);
+        cleanup(VOLATILE_TRUE_NAME);
+        cleanup(TEST_FEATURE_NAME);
+    }
+
+    private void cleanup(String flagName) {
+        Settings.Global.putString(mContext.getContentResolver(), flagName, "");
+        SystemProperties.set(FeatureFlagUtils.FFLAG_PREFIX + flagName, "");
+        SystemProperties.set(FeatureFlagUtils.FFLAG_OVERRIDE_PREFIX + flagName, "");
+        SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + flagName, "");
+    }
+
+    /**
+     * Test to verify a non-persistent flag is indeed not persistent.
+     */
+    @Test
+    public void isPersistent_notPersistent_shouldReturnFalse() {
+        assertThat(FeatureFlagPersistent.isPersistent(VOLATILE_FALSE_NAME)).isFalse();
+    }
+
+    /**
+     * Test to verify a persistent flag is indeed persistent.
+     */
+    @Test
+    public void isPersistent_persistent_shouldReturnTrue() {
+        assertThat(FeatureFlagPersistent.isPersistent(PERSISTENT_TRUE_NAME)).isTrue();
+    }
+
+    /**
+     * Test to verify a persistent flag that is enabled should return true.
+     */
+    @Test
+    public void isEnabled_enabled_shouldReturnTrue() {
+        assertThat(FeatureFlagPersistent.isEnabled(mContext, PERSISTENT_TRUE_NAME)).isTrue();
+    }
+
+    /**
+     * Test to verify a persistent flag that is disabled should return false.
+     */
+    @Test
+    public void isEnabled_disabled_shouldReturnFalse() {
+        assertThat(FeatureFlagPersistent.isEnabled(mContext, PERSISTENT_FALSE_NAME)).isFalse();
+    }
+
+    /**
+     * Test to verify a persistent flag that has an enabled in system property should return true.
+     */
+    @Test
+    public void isEnabled_sysPropEnabled_shouldReturnTrue() {
+        SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "true");
+        FeatureFlagUtils.setEnabled(mContext, TEST_FEATURE_NAME, false);
+
+        assertThat(FeatureFlagPersistent.isEnabled(mContext, TEST_FEATURE_NAME)).isTrue();
+    }
+
+    /**
+     * Test to verify a persistent flag that is disabled in system property should return false.
+     */
+    @Test
+    public void isEnabled_sysPropDisabled_shouldReturnFalse() {
+        SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "false");
+        FeatureFlagUtils.setEnabled(mContext, TEST_FEATURE_NAME, true);
+
+        assertThat(FeatureFlagPersistent.isEnabled(mContext, TEST_FEATURE_NAME)).isFalse();
+    }
+
+    /**
+     * Test to verify setting persistent flag to enable works.
+     */
+    @Test
+    public void setEnabled_sysPropTrue_shouldSetValues() {
+        SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "");
+
+        FeatureFlagPersistent.setEnabled(mContext, TEST_FEATURE_NAME, true);
+
+        assertThat(SystemProperties.get(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME))
+                .isEqualTo("true");
+        assertThat(FeatureFlagUtils.isEnabled(mContext, TEST_FEATURE_NAME)).isTrue();
+    }
+
+    /**
+     * Test to verify setting persistent flag to disable works.
+     */
+    @Test
+    public void setEnabled_sysPropFalse_shouldSetValues() {
+        SystemProperties.set(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME, "");
+
+        FeatureFlagPersistent.setEnabled(mContext, TEST_FEATURE_NAME, false);
+
+        assertThat(SystemProperties.get(FeatureFlagUtils.PERSIST_PREFIX + TEST_FEATURE_NAME))
+                .isEqualTo("false");
+        assertThat(FeatureFlagUtils.isEnabled(mContext, TEST_FEATURE_NAME)).isFalse();
+    }
+}
+
diff --git a/tests/unit/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceControllerTest.java
new file mode 100644
index 0000000..550613b
--- /dev/null
+++ b/tests/unit/src/com/android/settings/development/transcode/TranscodeDefaultOptionPreferenceControllerTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 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.transcode;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class TranscodeDefaultOptionPreferenceControllerTest {
+    private static final String TRANSCODE_DEFAULT_SYS_PROP_KEY =
+            "persist.sys.fuse.transcode_default";
+
+    private TranscodeDefaultOptionPreferenceController mUnderTest;
+
+    @Before
+    public void setUp() {
+        Context context = ApplicationProvider.getApplicationContext();
+        mUnderTest = new TranscodeDefaultOptionPreferenceController(context, "some_key");
+    }
+
+    @Test
+    public void isChecked_whenSysPropSet_shouldReturnFalse() {
+        SystemProperties.set(TRANSCODE_DEFAULT_SYS_PROP_KEY, "true");
+        assertThat(mUnderTest.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_whenSysPropUnset_shouldReturnTrue() {
+        SystemProperties.set(TRANSCODE_DEFAULT_SYS_PROP_KEY, "false");
+        assertThat(mUnderTest.isChecked()).isTrue();
+    }
+
+    @Test
+    public void setChecked_withTrue_shouldUnsetSysProp() {
+        mUnderTest.setChecked(true);
+        assertThat(
+                SystemProperties.getBoolean(TRANSCODE_DEFAULT_SYS_PROP_KEY, true)).isFalse();
+    }
+
+    @Test
+    public void setChecked_withFalse_shouldSetSysProp() {
+        mUnderTest.setChecked(false);
+        assertThat(
+                SystemProperties.getBoolean(TRANSCODE_DEFAULT_SYS_PROP_KEY, false)).isTrue();
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldReturn_isAvailable() {
+        assertThat(mUnderTest.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceControllerTest.java
new file mode 100644
index 0000000..7c0acd7
--- /dev/null
+++ b/tests/unit/src/com/android/settings/development/transcode/TranscodeGlobalTogglePreferenceControllerTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2020 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.transcode;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class TranscodeGlobalTogglePreferenceControllerTest {
+
+    private static final String TRANSCODE_ENABLED_PROP_KEY = "persist.sys.fuse.transcode_enabled";
+
+    private TranscodeGlobalTogglePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        Context context = ApplicationProvider.getApplicationContext();
+        mController = new TranscodeGlobalTogglePreferenceController(context, "test_key");
+    }
+
+    @Test
+    public void isAvailable_shouldReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isChecked_whenDisabled_shouldReturnFalse() {
+        SystemProperties.set(TRANSCODE_ENABLED_PROP_KEY, "false");
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_whenEnabled_shouldReturnTrue() {
+        SystemProperties.set(TRANSCODE_ENABLED_PROP_KEY, "true");
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void setChecked_withTrue_shouldUpdateSystemProperty() {
+        // Simulate the UI being clicked.
+        mController.setChecked(true);
+
+        // Verify the system property was updated.
+        assertThat(SystemProperties.getBoolean(TRANSCODE_ENABLED_PROP_KEY, false)).isTrue();
+    }
+
+    @Test
+    public void setChecked_withFalse_shouldUpdateSystemProperty() {
+        // Simulate the UI being clicked.
+        mController.setChecked(false);
+
+        // Verify the system property was updated.
+        assertThat(SystemProperties.getBoolean(TRANSCODE_ENABLED_PROP_KEY, true)).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceControllerTest.java b/tests/unit/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceControllerTest.java
new file mode 100644
index 0000000..3caf8ae
--- /dev/null
+++ b/tests/unit/src/com/android/settings/development/transcode/TranscodeUserControlPreferenceControllerTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 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.transcode;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.SystemProperties;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class TranscodeUserControlPreferenceControllerTest {
+    private static final String TRANSCODE_USER_CONTROL_SYS_PROP_KEY =
+            "persist.sys.fuse.transcode_user_control";
+
+    private TranscodeUserControlPreferenceController mUnderTest;
+
+    @Before
+    public void setUp() {
+        Context context = ApplicationProvider.getApplicationContext();
+        mUnderTest = new TranscodeUserControlPreferenceController(context, "some_key");
+    }
+
+    @Test
+    public void isChecked_whenSysPropSet_shouldReturnTrue() {
+        SystemProperties.set(TRANSCODE_USER_CONTROL_SYS_PROP_KEY, "true");
+        assertThat(mUnderTest.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isChecked_whenSysPropUnset_shouldReturnFalse() {
+        SystemProperties.set(TRANSCODE_USER_CONTROL_SYS_PROP_KEY, "false");
+        assertThat(mUnderTest.isChecked()).isFalse();
+    }
+
+    @Test
+    public void setChecked_withTrue_shouldSetSysProp() {
+        mUnderTest.setChecked(true);
+        assertThat(
+                SystemProperties.getBoolean(TRANSCODE_USER_CONTROL_SYS_PROP_KEY, false)).isTrue();
+    }
+
+    @Test
+    public void setChecked_withFalse_shouldUnsetSysProp() {
+        mUnderTest.setChecked(false);
+        assertThat(
+                SystemProperties.getBoolean(TRANSCODE_USER_CONTROL_SYS_PROP_KEY, true)).isFalse();
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldReturn_isAvailable() {
+        assertThat(mUnderTest.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
new file mode 100644
index 0000000..1c13506
--- /dev/null
+++ b/tests/unit/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+import static com.android.settings.deviceinfo.DeviceNamePreferenceController.RES_SHOW_DEVICE_NAME_BOOL;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.Context;
+import android.content.res.Resources;
+import android.net.wifi.SoftApConfiguration;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.os.Looper;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.widget.ValidatedEditTextPreference;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class DeviceNamePreferenceControllerTest {
+    private static final String TESTING_STRING = "Testing";
+    private static final String TEST_PREFERENCE_KEY = "test_key";
+
+    @Mock
+    private WifiManager mWifiManager;
+    private PreferenceScreen mScreen;
+    private ValidatedEditTextPreference mPreference;
+    private DeviceNamePreferenceController mController;
+    private Context mContext;
+    private Resources mResources;
+    private BluetoothAdapter mBluetoothAdapter;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
+        mResources = spy(mContext.getResources());
+        when(mContext.getResources()).thenReturn(mResources);
+
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        mScreen = preferenceManager.createPreferenceScreen(mContext);
+        mPreference = new ValidatedEditTextPreference(mContext);
+        mPreference.setKey(TEST_PREFERENCE_KEY);
+        mScreen.addPreference(mPreference);
+
+        final SoftApConfiguration configuration =
+                new SoftApConfiguration.Builder().setSsid("test-ap").build();
+        when(mWifiManager.getSoftApConfiguration()).thenReturn(configuration);
+
+        mController = new DeviceNamePreferenceController(mContext, TEST_PREFERENCE_KEY);
+        mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Global.putString(
+                mContext.getContentResolver(), Settings.Global.DEVICE_NAME, null);
+    }
+
+    @Test
+    public void getAvailibilityStatus_availableByDefault() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_unsupportedWhenSet() {
+        doReturn(false).when(mResources).getBoolean(RES_SHOW_DEVICE_NAME_BOOL);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void constructor_defaultDeviceNameIsModelName() {
+        assertThat(mController.getSummary()).isEqualTo(Build.MODEL);
+    }
+
+    @Test
+    public void constructor_deviceNameLoadedIfSet() {
+        Settings.Global.putString(
+                mContext.getContentResolver(), Settings.Global.DEVICE_NAME, "Test");
+        mController = new DeviceNamePreferenceController(mContext, "test_key");
+        assertThat(mController.getSummary()).isEqualTo("Test");
+    }
+
+    @Test
+    public void isTextValid_nameUnder33Characters_isValid() {
+        assertThat(mController.isTextValid("12345678901234567890123456789012")).isTrue();
+    }
+
+    @Test
+    public void isTextValid_nameTooLong_isInvalid() {
+        assertThat(mController.isTextValid("123456789012345678901234567890123")).isFalse();
+    }
+
+    @Test
+    public void setDeviceName_preferenceUpdatedWhenDeviceNameUpdated() {
+        acceptDeviceName(true);
+        mController.displayPreference(mScreen);
+        mController.onPreferenceChange(mPreference, TESTING_STRING);
+
+        assertThat(mPreference.getSummary()).isEqualTo(TESTING_STRING);
+    }
+
+    // TODO(b/175389659): Determine why this test case fails for virtual but not local devices.
+    @Ignore
+    @Test
+    public void setDeviceName_bluetoothNameUpdatedWhenDeviceNameUpdated() {
+        acceptDeviceName(true);
+        mController.displayPreference(mScreen);
+        mController.onPreferenceChange(mPreference, TESTING_STRING);
+
+        assertThat(mBluetoothAdapter.getName()).isEqualTo(TESTING_STRING);
+    }
+
+    @Test
+    public void setDeviceName_wifiTetherNameUpdatedWhenDeviceNameUpdated() {
+        acceptDeviceName(true);
+        mController.displayPreference(mScreen);
+        mController.onPreferenceChange(mPreference, TESTING_STRING);
+
+        ArgumentCaptor<SoftApConfiguration> captor =
+                ArgumentCaptor.forClass(SoftApConfiguration.class);
+        verify(mWifiManager).setSoftApConfiguration(captor.capture());
+        assertThat(captor.getValue().getSsid()).isEqualTo(TESTING_STRING);
+    }
+
+    @Test
+    public void displayPreference_defaultDeviceNameIsModelNameOnPreference() {
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.getText()).isEqualTo(Build.MODEL);
+    }
+
+    @Test
+    public void setDeviceName_okInDeviceNameWarningDialog_shouldChangePreferenceText() {
+        acceptDeviceName(true);
+        mController.displayPreference(mScreen);
+        mController.onPreferenceChange(mPreference, TESTING_STRING);
+
+        assertThat(mPreference.getSummary()).isEqualTo(TESTING_STRING);
+    }
+
+    @Test
+    public void setDeviceName_cancelInDeviceNameWarningDialog_shouldNotChangePreferenceText() {
+        acceptDeviceName(false);
+        mController.displayPreference(mScreen);
+        mController.onPreferenceChange(mPreference, TESTING_STRING);
+
+        assertThat(mPreference.getSummary()).isNotEqualTo(TESTING_STRING);
+        assertThat(mPreference.getText()).isEqualTo(mPreference.getSummary());
+    }
+
+    private void acceptDeviceName(boolean accept) {
+        mController.setHost(deviceName -> mController.updateDeviceName(accept));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/OWNERS b/tests/unit/src/com/android/settings/deviceinfo/OWNERS
new file mode 100644
index 0000000..ce702a7
--- /dev/null
+++ b/tests/unit/src/com/android/settings/deviceinfo/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/deviceinfo/OWNERS
diff --git a/tests/unit/src/com/android/settings/deviceinfo/legal/ModuleLicenseProviderTest.java b/tests/unit/src/com/android/settings/deviceinfo/legal/ModuleLicenseProviderTest.java
new file mode 100644
index 0000000..7719186
--- /dev/null
+++ b/tests/unit/src/com/android/settings/deviceinfo/legal/ModuleLicenseProviderTest.java
@@ -0,0 +1,391 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.legal;
+
+import static com.android.settings.deviceinfo.legal.ModuleLicenseProvider.LICENSE_FILE_NAME;
+
+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 static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.pm.ModuleInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+@RunWith(AndroidJUnit4.class)
+public class ModuleLicenseProviderTest {
+    public static final String PACKAGE_NAME = "com.android.test_package";
+    @Test
+    public void onCreate_returnsTrue() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        assertThat(provider.onCreate()).isTrue();
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void query_throwsUnsupportedOperationException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.query(null, null, null, null, null);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void insert_throwsUnsupportedOperationException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.insert(null, null);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void delete_throwsUnsupportedOperationException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.delete(null, null, null);
+    }
+
+    @Test(expected = UnsupportedOperationException.class)
+    public void update_throwsUnsupportedOperationException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.update(null, null, null, null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void getType_notContentScheme_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.getType(new Uri.Builder()
+                .scheme("badscheme")
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(PACKAGE_NAME)
+                .appendPath(LICENSE_FILE_NAME)
+                .build());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void getType_invalidAuthority_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.getType(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority("notmyauthority")
+                .appendPath(PACKAGE_NAME)
+                .appendPath(LICENSE_FILE_NAME)
+                .build());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void getType_emptyPath_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.getType(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .build());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void getType_missingPackageName_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.getType(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(LICENSE_FILE_NAME)
+                .build());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void getType_missingFileName_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.getType(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(PACKAGE_NAME)
+                .build());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void getType_incorrectFileName_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.getType(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(PACKAGE_NAME)
+                .appendPath("badname.txt")
+                .build());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void getType_packageNotAModule_throwsIllegalArgumentException()
+            throws PackageManager.NameNotFoundException {
+        ModuleLicenseProvider provider = spy(new ModuleLicenseProvider());
+        Context context = mock(Context.class);
+        PackageManager packageManager = mock(PackageManager.class);
+        when(provider.getModuleContext()).thenReturn(context);
+        when(context.getPackageManager()).thenReturn(packageManager);
+        when(packageManager.getModuleInfo(PACKAGE_NAME, 0))
+                .thenThrow(new PackageManager.NameNotFoundException());
+
+        provider.getType(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(PACKAGE_NAME)
+                .appendPath(LICENSE_FILE_NAME)
+                .build());
+    }
+
+    @Test
+    public void getType_validUri_returnsHtmlMimeType()
+            throws PackageManager.NameNotFoundException {
+        ModuleLicenseProvider provider = spy(new ModuleLicenseProvider());
+        Context context = mock(Context.class);
+        PackageManager packageManager = mock(PackageManager.class);
+        when(provider.getModuleContext()).thenReturn(context);
+        when(context.getPackageManager()).thenReturn(packageManager);
+        when(packageManager.getModuleInfo(PACKAGE_NAME, 0))
+                .thenReturn(new ModuleInfo());
+
+        assertThat(provider.getType(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(PACKAGE_NAME)
+                .appendPath(LICENSE_FILE_NAME)
+                .build())).isEqualTo(ModuleLicenseProvider.LICENSE_FILE_MIME_TYPE);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void openFile_notContentScheme_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.openFile(new Uri.Builder()
+                .scheme("badscheme")
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(PACKAGE_NAME)
+                .appendPath(LICENSE_FILE_NAME)
+                .build(), "r");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void openFile_invalidAuthority_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.openFile(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority("notmyauthority")
+                .appendPath(PACKAGE_NAME)
+                .appendPath(LICENSE_FILE_NAME)
+                .build(), "r");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void openFile_emptyPath_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.openFile(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .build(), "r");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void openFile_missingPackageName_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.openFile(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(LICENSE_FILE_NAME)
+                .build(), "r");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void openFile_missingFileName_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.openFile(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(PACKAGE_NAME)
+                .build(), "r");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void openFile_incorrectFileName_throwsIllegalArgumentException() {
+        ModuleLicenseProvider provider = new ModuleLicenseProvider();
+        provider.openFile(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(PACKAGE_NAME)
+                .appendPath("badname.txt")
+                .build(), "r");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void openFile_packageNotAModule_throwsIllegalArgumentException()
+            throws PackageManager.NameNotFoundException {
+        ModuleLicenseProvider provider = spy(new ModuleLicenseProvider());
+        Context context = mock(Context.class);
+        PackageManager packageManager = mock(PackageManager.class);
+        when(provider.getModuleContext()).thenReturn(context);
+        when(context.getPackageManager()).thenReturn(packageManager);
+        when(packageManager.getModuleInfo(PACKAGE_NAME, 0))
+                .thenThrow(new PackageManager.NameNotFoundException());
+
+        provider.openFile(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(PACKAGE_NAME)
+                .appendPath(LICENSE_FILE_NAME)
+                .build(), "r");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void openFile_validUri_notReadMode_throwsIllegalArgumentException()
+            throws PackageManager.NameNotFoundException {
+        ModuleLicenseProvider provider = spy(new ModuleLicenseProvider());
+        Context context = mock(Context.class);
+        PackageManager packageManager = mock(PackageManager.class);
+        when(provider.getModuleContext()).thenReturn(context);
+        when(context.getPackageManager()).thenReturn(packageManager);
+        when(packageManager.getModuleInfo(PACKAGE_NAME, 0))
+                .thenReturn(new ModuleInfo());
+
+        provider.openFile(new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(ModuleLicenseProvider.AUTHORITY)
+                .appendPath(PACKAGE_NAME)
+                .appendPath(LICENSE_FILE_NAME)
+                .build(), "badmode");
+    }
+
+    @Test
+    public void isCachedHtmlFileOutdated_packageNotInSharedPrefs_returnTrue()
+            throws PackageManager.NameNotFoundException {
+        Context context = ApplicationProvider.getApplicationContext();
+        context.getSharedPreferences(ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
+                .edit().clear().commit();
+
+        assertThat(ModuleLicenseProvider.isCachedHtmlFileOutdated(context, PACKAGE_NAME)).isTrue();
+    }
+
+    @Test
+    public void isCachedHtmlFileOutdated_versionCodeDiffersFromSharedPref_returnTrue()
+            throws PackageManager.NameNotFoundException {
+        Context context = spy(ApplicationProvider.getApplicationContext());
+        SharedPreferences.Editor editor = context.getSharedPreferences(
+                ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
+                .edit();
+        editor.clear().commit();
+        editor.putLong(PACKAGE_NAME, 900L).commit();
+        PackageManager packageManager = mock(PackageManager.class);
+        doReturn(packageManager).when(context).getPackageManager();
+        PackageInfo packageInfo = new PackageInfo();
+        packageInfo.setLongVersionCode(1000L);
+        when(packageManager.getPackageInfo(PACKAGE_NAME, PackageManager.MATCH_APEX))
+                .thenReturn(packageInfo);
+
+        assertThat(ModuleLicenseProvider.isCachedHtmlFileOutdated(context, PACKAGE_NAME)).isTrue();
+    }
+
+    @Test
+    public void isCachedHtmlFileOutdated_fileDoesNotExist_returnTrue()
+            throws PackageManager.NameNotFoundException {
+        Context context = spy(ApplicationProvider.getApplicationContext());
+        context.getSharedPreferences(ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
+                .edit().clear().commit();
+        SharedPreferences.Editor editor = context.getSharedPreferences(
+                ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
+                .edit();
+        editor.clear().commit();
+        editor.putLong(PACKAGE_NAME, 1000L).commit();
+        PackageManager packageManager = mock(PackageManager.class);
+        doReturn(packageManager).when(context).getPackageManager();
+        PackageInfo packageInfo = new PackageInfo();
+        packageInfo.setLongVersionCode(1000L);
+        when(packageManager.getPackageInfo(PACKAGE_NAME, PackageManager.MATCH_APEX))
+                .thenReturn(packageInfo);
+        new File(context.getCacheDir() + "/" + PACKAGE_NAME, LICENSE_FILE_NAME).delete();
+
+        assertThat(ModuleLicenseProvider.isCachedHtmlFileOutdated(context, PACKAGE_NAME)).isTrue();
+    }
+
+    @Test
+    public void isCachedHtmlFileOutdated_fileIsEmpty_returnTrue()
+            throws PackageManager.NameNotFoundException, IOException {
+        Context context = spy(ApplicationProvider.getApplicationContext());
+        context.getSharedPreferences(ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
+                .edit().clear().commit();
+        SharedPreferences.Editor editor = context.getSharedPreferences(
+                ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
+                .edit();
+        editor.clear().commit();
+        editor.putLong(PACKAGE_NAME, 1000L).commit();
+        PackageManager packageManager = mock(PackageManager.class);
+        doReturn(packageManager).when(context).getPackageManager();
+        PackageInfo packageInfo = new PackageInfo();
+        packageInfo.setLongVersionCode(1000L);
+        when(packageManager.getPackageInfo(PACKAGE_NAME, PackageManager.MATCH_APEX))
+                .thenReturn(packageInfo);
+        new File(context.getCacheDir(), PACKAGE_NAME).mkdir();
+        File file = new File(context.getCacheDir() + "/" + PACKAGE_NAME, LICENSE_FILE_NAME);
+        file.delete();
+        file.createNewFile();
+
+        assertThat(ModuleLicenseProvider.isCachedHtmlFileOutdated(context, PACKAGE_NAME)).isTrue();
+    }
+
+    @Test
+    public void isCachedHtmlFileOutdated_notOutdated_returnFalse()
+            throws PackageManager.NameNotFoundException, IOException {
+        Context context = spy(ApplicationProvider.getApplicationContext());
+        context.getSharedPreferences(ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
+                .edit().clear().commit();
+        SharedPreferences.Editor editor = context.getSharedPreferences(
+                ModuleLicenseProvider.PREFS_NAME, Context.MODE_PRIVATE)
+                .edit();
+        editor.clear().commit();
+        editor.putLong(PACKAGE_NAME, 1000L).commit();
+        PackageManager packageManager = mock(PackageManager.class);
+        doReturn(packageManager).when(context).getPackageManager();
+        PackageInfo packageInfo = new PackageInfo();
+        packageInfo.setLongVersionCode(1000L);
+        when(packageManager.getPackageInfo(PACKAGE_NAME, PackageManager.MATCH_APEX))
+                .thenReturn(packageInfo);
+        new File(context.getCacheDir(), PACKAGE_NAME).mkdir();
+        File file = new File(context.getCacheDir() + "/" + PACKAGE_NAME, LICENSE_FILE_NAME);
+        file.delete();
+        file.createNewFile();
+        try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
+            writer.write("test");
+        }
+
+        assertThat(ModuleLicenseProvider.isCachedHtmlFileOutdated(context, PACKAGE_NAME)).isFalse();
+    }
+
+    @Test
+    public void getUriForPackage_returnsProperlyFormattedUri() {
+        assertThat(ModuleLicenseProvider.getUriForPackage(PACKAGE_NAME))
+                .isEqualTo(Uri.parse(
+                        "content://com.android.settings.module_licenses/"
+                        + "com.android.test_package/NOTICE.html"));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
new file mode 100644
index 0000000..e94c4e7
--- /dev/null
+++ b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -0,0 +1,771 @@
+/*
+ * 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.deviceinfo.simstatus;
+
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.CELL_DATA_NETWORK_TYPE_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.CELL_VOICE_NETWORK_TYPE_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.EID_INFO_LABEL_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.EID_INFO_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_LABEL_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ICCID_INFO_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_LABEL_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.IMS_REGISTRATION_STATE_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.MAX_PHONE_COUNT_SINGLE_SIM;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.NETWORK_PROVIDER_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_LABEL_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.OPERATOR_INFO_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.ROAMING_INFO_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SERVICE_STATE_VALUE_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_LABEL_ID;
+import static com.android.settings.deviceinfo.simstatus.SimStatusDialogController.SIGNAL_STRENGTH_VALUE_ID;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.CellSignalStrength;
+import android.telephony.PhoneStateListener;
+import android.telephony.ServiceState;
+import android.telephony.SignalStrength;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.UiccCardInfo;
+import android.telephony.euicc.EuiccManager;
+
+import androidx.lifecycle.LifecycleOwner;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.R;
+import com.android.settings.testutils.ResourcesUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(AndroidJUnit4.class)
+public class SimStatusDialogControllerTest {
+
+    @Mock
+    private SimStatusDialogFragment mDialog;
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+    @Mock
+    private ServiceState mServiceState;
+    @Mock
+    private PhoneStateListener mPhoneStateListener;
+    @Mock
+    private SignalStrength mSignalStrength;
+    @Mock
+    private CellSignalStrength mCellSignalStrengthCdma;
+    @Mock
+    private CellSignalStrength mCellSignalStrengthLte;
+    @Mock
+    private CellSignalStrength mCellSignalStrengthWcdma;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    private PersistableBundle mPersistableBundle;
+    @Mock
+    private EuiccManager mEuiccManager;
+    private SubscriptionManager mSubscriptionManager;
+
+    private SimStatusDialogController mController;
+    private Context mContext;
+    @Mock
+    private LifecycleOwner mLifecycleOwner;
+    private Lifecycle mLifecycle;
+
+    private static final String TEST_EID_FROM_CARD = "11111111111111111111111111111111";
+    private static final String TEST_EID_FROM_MANAGER = "22222222222222222222222222222222";
+
+    private static final int MAX_PHONE_COUNT_DUAL_SIM = 2;
+
+    @Before
+    @UiThreadTest
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mDialog.getContext()).thenReturn(mContext);
+        mLifecycle = new Lifecycle(mLifecycleOwner);
+
+        mTelephonyManager = spy(mContext.getSystemService(TelephonyManager.class));
+        mSubscriptionManager = spy(mContext.getSystemService(SubscriptionManager.class));
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager)
+                .getActiveSubscriptionInfoForSimSlotIndex(anyInt());
+
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                    mCarrierConfigManager);
+        when(mContext.getSystemService(EuiccManager.class)).thenReturn(mEuiccManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.DEFAULT_SUBSCRIPTION_ID);
+        doReturn(2).when(mTelephonyManager).getCardIdForDefaultEuicc();
+        doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mTelephonyManager).getDataNetworkType();
+
+        mController = spy(new SimStatusDialogController(mDialog, mLifecycle, 0 /* phone id */));
+        // CellSignalStrength setup
+        doReturn(0).when(mCellSignalStrengthCdma).getDbm();
+        doReturn(0).when(mCellSignalStrengthCdma).getAsuLevel();
+        doReturn(0).when(mCellSignalStrengthLte).getDbm();
+        doReturn(0).when(mCellSignalStrengthLte).getAsuLevel();
+        doReturn(0).when(mCellSignalStrengthWcdma).getDbm();
+        doReturn(0).when(mCellSignalStrengthWcdma).getAsuLevel();
+
+        doReturn(null).when(mSignalStrength).getCellSignalStrengths();
+        doReturn(mPhoneStateListener).when(mController).getPhoneStateListener();
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(anyInt());
+
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
+        doReturn(new ArrayList<UiccCardInfo>()).when(mTelephonyManager).getUiccCardsInfo();
+        doReturn(new HashMap<Integer, Integer>()).when(mTelephonyManager)
+                .getLogicalToPhysicalSlotMapping();
+
+        when(mEuiccManager.isEnabled()).thenReturn(false);
+        when(mEuiccManager.getEid()).thenReturn("");
+        when(mEuiccManager.createForCardId(anyInt())).thenReturn(mEuiccManager);
+
+        mPersistableBundle = new PersistableBundle();
+        when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(mPersistableBundle);
+
+        mPersistableBundle.putBoolean(
+                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL, true);
+        doReturn(mServiceState).when(mTelephonyManager).getServiceState();
+        doReturn(mSignalStrength).when(mTelephonyManager).getSignalStrength();
+    }
+
+    @Test
+    public void initialize_updateNetworkProviderWithFoobarCarrier_shouldUpdateCarrierWithFoobar() {
+        final CharSequence carrierName = "foobar";
+        doReturn(carrierName).when(mSubscriptionInfo).getCarrierName();
+
+        mController.initialize();
+
+        verify(mDialog).setText(NETWORK_PROVIDER_VALUE_ID, carrierName);
+    }
+
+    @Test
+    public void initialize_shouldUpdatePhoneNumber() {
+        mController.initialize();
+
+        verify(mController).updatePhoneNumber();
+    }
+
+    @Test
+    public void initialize_updateLatestAreaInfoWithCdmaPhone_shouldRemoveOperatorInfoSetting() {
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
+
+        mController.initialize();
+
+        verify(mDialog).removeSettingFromScreen(OPERATOR_INFO_LABEL_ID);
+        verify(mDialog).removeSettingFromScreen(OPERATOR_INFO_VALUE_ID);
+    }
+
+    @Test
+    public void initialize_updateServiceStateWithInService_shouldUpdateTextToBeCInService() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+
+        mController.initialize();
+
+        final String inServiceText = ResourcesUtils.getResourcesString(
+                mContext, "radioInfo_service_in");
+        verify(mDialog).setText(SERVICE_STATE_VALUE_ID, inServiceText);
+    }
+
+    @Test
+    public void initialize_updateServiceStateWithPowerOff_shouldUpdateTextAndResetSignalStrength() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_POWER_OFF);
+
+        mController.initialize();
+
+        final String offServiceText = ResourcesUtils.getResourcesString(
+                mContext, "radioInfo_service_off");
+        verify(mDialog).setText(SERVICE_STATE_VALUE_ID, offServiceText);
+        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, "0");
+    }
+
+    @Test
+    public void initialize_updateVoiceDataOutOfService_shouldUpdateSettingAndResetSignalStrength() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        when(mServiceState.getDataRegistrationState()).thenReturn(
+                ServiceState.STATE_OUT_OF_SERVICE);
+
+        mController.initialize();
+
+        final String offServiceText = ResourcesUtils.getResourcesString(
+                mContext, "radioInfo_service_out");
+        verify(mDialog).setText(SERVICE_STATE_VALUE_ID, offServiceText);
+        verify(mDialog).setText(SIGNAL_STRENGTH_VALUE_ID, "0");
+    }
+
+    @Test
+    public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateTextToBeInService() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        when(mServiceState.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+
+        mController.initialize();
+
+        final String inServiceText = ResourcesUtils.getResourcesString(
+                mContext, "radioInfo_service_in");
+        verify(mDialog).setText(SERVICE_STATE_VALUE_ID, inServiceText);
+    }
+
+    @Test
+    public void initialize_updateSignalStrengthWithLte50Wcdma40_shouldUpdateSignalStrengthTo50() {
+        final int lteDbm = 50;
+        final int lteAsu = 50;
+        final int wcdmaDbm = 40;
+        final int wcdmaAsu = 40;
+        setupCellSignalStrength_lteWcdma(lteDbm, lteAsu, wcdmaDbm, wcdmaAsu);
+
+        mController.initialize();
+
+        final String signalStrengthString = ResourcesUtils.getResourcesString(
+                mContext, "sim_signal_strength", lteDbm, lteAsu);
+        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+    }
+
+    @Test
+    public void initialize_updateSignalStrengthWithLte50Cdma30_shouldUpdateSignalStrengthTo50() {
+        final int lteDbm = 50;
+        final int lteAsu = 50;
+        final int cdmaDbm = 30;
+        final int cdmaAsu = 30;
+        setupCellSignalStrength_lteCdma(lteDbm, lteAsu, cdmaDbm, cdmaAsu);
+
+        mController.initialize();
+
+        final String signalStrengthString = ResourcesUtils.getResourcesString(
+                mContext, "sim_signal_strength", lteDbm, lteAsu);
+        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+    }
+
+    @Test
+    public void initialize_updateVoiceOutOfServiceDataInService_shouldUpdateSignalStrengthTo50() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        when(mServiceState.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+
+        final int lteDbm = 50;
+        final int lteAsu = 50;
+        setupCellSignalStrength_lteOnly(lteDbm, lteAsu);
+
+        mController.initialize();
+
+        final String signalStrengthString = ResourcesUtils.getResourcesString(
+                mContext, "sim_signal_strength", lteDbm, lteAsu);
+        verify(mDialog, times(2)).setText(SIGNAL_STRENGTH_VALUE_ID, signalStrengthString);
+    }
+
+    @Test
+    public void initialize_updateVoiceNetworkTypeWithEdge_shouldUpdateSettingToEdge() {
+        when(mTelephonyManager.getVoiceNetworkType()).thenReturn(
+                TelephonyManager.NETWORK_TYPE_EDGE);
+
+        mController.initialize();
+
+        verify(mDialog).setText(CELL_VOICE_NETWORK_TYPE_VALUE_ID,
+                SimStatusDialogController.getNetworkTypeName(TelephonyManager.NETWORK_TYPE_EDGE));
+    }
+
+    @Test
+    public void initialize_updateDataNetworkTypeWithEdge_shouldUpdateSettingToEdge() {
+        when(mTelephonyManager.getDataNetworkType()).thenReturn(
+                TelephonyManager.NETWORK_TYPE_EDGE);
+
+        mController.initialize();
+
+        verify(mDialog).setText(CELL_DATA_NETWORK_TYPE_VALUE_ID,
+                SimStatusDialogController.getNetworkTypeName(TelephonyManager.NETWORK_TYPE_EDGE));
+    }
+
+    @Test
+    public void initialize_updateRoamingStatusIsRoaming_shouldSetSettingToRoaming() {
+        when(mServiceState.getRoaming()).thenReturn(true);
+
+        mController.initialize();
+
+        final String roamingOnString = ResourcesUtils.getResourcesString(
+                mContext, "radioInfo_roaming_in");
+        verify(mDialog).setText(ROAMING_INFO_VALUE_ID, roamingOnString);
+    }
+
+    @Test
+    public void initialize_updateRoamingStatusNotRoaming_shouldSetSettingToRoamingOff() {
+        when(mServiceState.getRoaming()).thenReturn(false);
+
+        mController.initialize();
+
+        final String roamingOffString = ResourcesUtils.getResourcesString(
+                mContext, "radioInfo_roaming_not");
+        verify(mDialog).setText(ROAMING_INFO_VALUE_ID, roamingOffString);
+    }
+
+    @Test
+    public void initialize_doNotShowIccid_shouldRemoveIccidSetting() {
+        mPersistableBundle.putBoolean(
+                CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL, false);
+
+        mController.initialize();
+
+        verify(mDialog).removeSettingFromScreen(ICCID_INFO_LABEL_ID);
+        verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID);
+    }
+
+    @Test
+    public void initialize_doNotShowSignalStrength_shouldRemoveSignalStrengthSetting() {
+        mPersistableBundle.putBoolean(
+                CarrierConfigManager.KEY_SHOW_SIGNAL_STRENGTH_IN_SIM_STATUS_BOOL, false);
+
+        mController.initialize();
+
+        verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_LABEL_ID);
+        verify(mDialog, times(2)).removeSettingFromScreen(SIGNAL_STRENGTH_VALUE_ID);
+    }
+
+    @Test
+    public void initialize_showSignalStrengthAndIccId_shouldShowSignalStrengthAndIccIdSetting() {
+        // getConfigForSubId is nullable, so make sure the default behavior is correct
+        when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(null);
+
+        mController.initialize();
+
+        verify(mDialog, times(2)).setText(eq(SIGNAL_STRENGTH_VALUE_ID), any());
+        verify(mDialog).removeSettingFromScreen(ICCID_INFO_LABEL_ID);
+        verify(mDialog).removeSettingFromScreen(ICCID_INFO_VALUE_ID);
+    }
+
+    @Test
+    public void initialize_showIccid_shouldSetIccidToSetting() {
+        final String iccid = "12351351231241";
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_SHOW_ICCID_IN_SIM_STATUS_BOOL, true);
+        doReturn(iccid).when(mTelephonyManager).getSimSerialNumber();
+
+        mController.initialize();
+
+        verify(mDialog).setText(ICCID_INFO_VALUE_ID, iccid);
+    }
+
+    @Test
+    public void initialize_updateEid_shouldNotSetEid() {
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
+
+        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
+        UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
+                false,                                  // isEuicc
+                0,                                      // cardId
+                null,                                   // eid
+                "123451234567890",                      // iccid
+                0,                                      // slotIndex
+                true);                                  // isRemovable
+        uiccCardInfos.add(uiccCardInfo1);
+        UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
+                true,                                   // isEuicc
+                1,                                      // cardId
+                null,                                   // eid (unavailable)
+                null,                                   // iccid
+                1,                                      // slotIndex
+                false);                                 // isRemovable
+        uiccCardInfos.add(uiccCardInfo2);
+        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
+
+        Map<Integer, Integer> slotMapping = new HashMap<>();
+        slotMapping.put(0, 1);
+        slotMapping.put(1, 0);
+        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
+
+        when(mEuiccManager.isEnabled()).thenReturn(true);
+        when(mEuiccManager.getEid()).thenReturn(null);
+
+        doNothing().when(mController).requestForUpdateEid();
+        mController.updateEid(mController.getEid(0));
+        mController.initialize();
+
+        // Keep 'Not available' if neither the card nor the associated manager can provide EID.
+        verify(mDialog, never()).setText(eq(EID_INFO_VALUE_ID), any());
+        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
+    }
+
+    @Test
+    public void initialize_updateEid_shouldSetEidFromCard() {
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
+
+        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
+        UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
+                true,                                   // isEuicc
+                0,                                      // cardId
+                TEST_EID_FROM_CARD,                     // eid
+                null,                                   // iccid
+                0,                                      // slotIndex
+                false);                                 // isRemovable
+        uiccCardInfos.add(uiccCardInfo1);
+        UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
+                false,                                  // isEuicc
+                1,                                      // cardId
+                null,                                   // eid
+                "123451234567890",                      // iccid
+                1,                                      // slotIndex
+                true);                                  // isRemovable
+        uiccCardInfos.add(uiccCardInfo2);
+        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
+
+        Map<Integer, Integer> slotMapping = new HashMap<>();
+        slotMapping.put(0, 0);
+        slotMapping.put(1, 1);
+        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
+
+        when(mEuiccManager.isEnabled()).thenReturn(true);
+        when(mEuiccManager.getEid()).thenReturn(TEST_EID_FROM_MANAGER);
+        when(mEuiccManager.createForCardId(0)).thenReturn(mEuiccManager);
+
+        doNothing().when(mController).requestForUpdateEid();
+        mController.updateEid(mController.getEid(0));
+        mController.initialize();
+
+        // Set EID retrieved from the card.
+        verify(mDialog).setText(EID_INFO_VALUE_ID, TEST_EID_FROM_CARD);
+        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
+    }
+
+    @Test
+    public void initialize_updateEid_shouldSetEidFromManager() {
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
+
+        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
+        UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
+                false,                                  // isEuicc
+                0,                                      // cardId
+                null,                                   // eid
+                "123451234567890",                      // iccid
+                0,                                      // slotIndex
+                true);                                  // isRemovable
+        uiccCardInfos.add(uiccCardInfo1);
+        UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
+                true,                                   // isEuicc
+                1,                                      // cardId
+                null,                                   // eid (unavailable)
+                null,                                   // iccid
+                1,                                      // slotIndex
+                false);                                 // isRemovable
+        uiccCardInfos.add(uiccCardInfo2);
+        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
+
+        Map<Integer, Integer> slotMapping = new HashMap<>();
+        slotMapping.put(0, 1);
+        slotMapping.put(1, 0);
+        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
+
+        when(mEuiccManager.isEnabled()).thenReturn(true);
+        when(mEuiccManager.getEid()).thenReturn(TEST_EID_FROM_MANAGER);
+        when(mEuiccManager.createForCardId(0)).thenThrow(
+                new RuntimeException("Unexpected card ID was specified"));
+        when(mEuiccManager.createForCardId(1)).thenReturn(mEuiccManager);
+
+        doNothing().when(mController).requestForUpdateEid();
+        mController.updateEid(mController.getEid(0));
+        mController.initialize();
+
+        // Set EID retrieved from the manager associated with the card which cannot provide EID.
+        verify(mDialog).setText(EID_INFO_VALUE_ID, TEST_EID_FROM_MANAGER);
+        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
+    }
+
+    @Test
+    public void initialize_updateEid_shouldRemoveEid() {
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_DUAL_SIM);
+
+        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
+        UiccCardInfo uiccCardInfo1 = new UiccCardInfo(
+                false,                                  // isEuicc
+                0,                                      // cardId
+                null,                                   // eid
+                "123451234567890",                      // iccid
+                0,                                      // slotIndex
+                true);                                  // isRemovable
+        uiccCardInfos.add(uiccCardInfo1);
+        UiccCardInfo uiccCardInfo2 = new UiccCardInfo(
+                true,                                   // isEuicc
+                1,                                      // cardId
+                TEST_EID_FROM_CARD,                     // eid
+                null,                                   // iccid
+                1,                                      // slotIndex
+                false);                                 // isRemovable
+        uiccCardInfos.add(uiccCardInfo2);
+        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
+
+        Map<Integer, Integer> slotMapping = new HashMap<>();
+        slotMapping.put(0, 0);
+        slotMapping.put(1, 1);
+        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
+
+        when(mEuiccManager.isEnabled()).thenReturn(true);
+        when(mEuiccManager.getEid()).thenReturn(TEST_EID_FROM_MANAGER);
+
+        doNothing().when(mController).requestForUpdateEid();
+        mController.updateEid(mController.getEid(0));
+        mController.initialize();
+
+        // Remove EID if the card is not eUICC.
+        verify(mDialog, never()).setText(eq(EID_INFO_VALUE_ID), any());
+        verify(mDialog).removeSettingFromScreen(eq(EID_INFO_LABEL_ID));
+        verify(mDialog).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
+    }
+
+    @Test
+    public void initialize_updateEid_shouldNotSetEidInSingleSimMode() {
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
+
+        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
+        UiccCardInfo uiccCardInfo = new UiccCardInfo(
+                true,                                   // isEuicc
+                0,                                      // cardId
+                TEST_EID_FROM_CARD,                     // eid (not used)
+                null,                                   // iccid
+                0,                                      // slotIndex
+                false);                                 // isRemovable
+        uiccCardInfos.add(uiccCardInfo);
+        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
+
+        Map<Integer, Integer> slotMapping = new HashMap<>();
+        slotMapping.put(0, 0);
+        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
+
+        when(mEuiccManager.isEnabled()).thenReturn(true);
+        when(mEuiccManager.getEid()).thenReturn(null);
+
+        doNothing().when(mController).requestForUpdateEid();
+        mController.updateEid(mController.getEid(0));
+        mController.initialize();
+
+        // Keep 'Not available' if the default eUICC manager cannot provide EID in Single SIM mode.
+        verify(mDialog, never()).setText(eq(EID_INFO_VALUE_ID), any());
+        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
+    }
+
+    @Test
+    public void initialize_updateEid_shouldSetEidInSingleSimModeWithEnabledEuicc() {
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
+
+        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
+        UiccCardInfo uiccCardInfo = new UiccCardInfo(
+                true,                                   // isEuicc (eUICC slot is selected)
+                0,                                      // cardId
+                TEST_EID_FROM_CARD,                     // eid (not used)
+                null,                                   // iccid
+                0,                                      // slotIndex
+                false);                                 // isRemovable
+        uiccCardInfos.add(uiccCardInfo);
+        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
+
+        Map<Integer, Integer> slotMapping = new HashMap<>();
+        slotMapping.put(0, 0);
+        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
+
+        when(mEuiccManager.isEnabled()).thenReturn(true);
+        when(mEuiccManager.getEid()).thenReturn(TEST_EID_FROM_MANAGER);
+        when(mEuiccManager.createForCardId(anyInt())).thenThrow(
+                new RuntimeException("EID shall be retrieved from the default eUICC manager"));
+
+        doNothing().when(mController).requestForUpdateEid();
+        mController.updateEid(mController.getEid(0));
+        mController.initialize();
+
+        // Set EID retrieved from the default eUICC manager in Single SIM mode.
+        verify(mDialog).setText(EID_INFO_VALUE_ID, TEST_EID_FROM_MANAGER);
+        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
+    }
+
+    @Test
+    public void initialize_updateEid_shouldSetEidInSingleSimModeWithDisabledEuicc() {
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
+
+        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
+        UiccCardInfo uiccCardInfo = new UiccCardInfo(
+                false,                                  // isEuicc (eUICC slot is not selected)
+                0,                                      // cardId
+                null,                                   // eid
+                "123451234567890",                      // iccid
+                0,                                      // slotIndex
+                true);                                  // isRemovable
+        uiccCardInfos.add(uiccCardInfo);
+        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
+
+        Map<Integer, Integer> slotMapping = new HashMap<>();
+        slotMapping.put(0, 0);
+        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
+
+        when(mEuiccManager.isEnabled()).thenReturn(true);
+        when(mEuiccManager.getEid()).thenReturn(TEST_EID_FROM_MANAGER);
+        when(mEuiccManager.createForCardId(anyInt())).thenThrow(
+                new RuntimeException("EID shall be retrieved from the default eUICC manager"));
+
+        doNothing().when(mController).requestForUpdateEid();
+        mController.updateEid(mController.getEid(0));
+        mController.initialize();
+
+        // Set EID retrieved from the default eUICC manager in Single SIM mode.
+        verify(mDialog).setText(EID_INFO_VALUE_ID, TEST_EID_FROM_MANAGER);
+        verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
+    }
+
+    @Test
+    public void initialize_updateEid_shouldRemoveEidInSingleSimMode() {
+        when(mTelephonyManager.getActiveModemCount()).thenReturn(MAX_PHONE_COUNT_SINGLE_SIM);
+
+        ArrayList<UiccCardInfo> uiccCardInfos = new ArrayList<>();
+        UiccCardInfo uiccCardInfo = new UiccCardInfo(
+                false,                                  // isEuicc
+                0,                                      // cardId
+                null,                                   // eid
+                "123451234567890",                      // iccid
+                0,                                      // slotIndex
+                true);                                  // isRemovable
+        uiccCardInfos.add(uiccCardInfo);
+        when(mTelephonyManager.getUiccCardsInfo()).thenReturn(uiccCardInfos);
+
+        Map<Integer, Integer> slotMapping = new HashMap<>();
+        slotMapping.put(0, 0);
+        when(mTelephonyManager.getLogicalToPhysicalSlotMapping()).thenReturn(slotMapping);
+
+        when(mEuiccManager.isEnabled()).thenReturn(false);
+        when(mEuiccManager.getEid()).thenReturn(null);
+
+        doNothing().when(mController).requestForUpdateEid();
+        mController.updateEid(mController.getEid(0));
+        mController.initialize();
+
+        // Remove EID if the default eUICC manager indicates that eSIM is not enabled.
+        verify(mDialog, never()).setText(eq(EID_INFO_VALUE_ID), any());
+        verify(mDialog).removeSettingFromScreen(eq(EID_INFO_LABEL_ID));
+        verify(mDialog).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
+    }
+
+    @Test
+    @Ignore
+    public void initialize_imsRegistered_shouldSetImsRegistrationStateSummaryToRegisterd() {
+        mPersistableBundle.putBoolean(
+                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, true);
+        when(mTelephonyManager.isImsRegistered(anyInt())).thenReturn(true);
+
+        mController.initialize();
+
+        verify(mDialog).setText(IMS_REGISTRATION_STATE_VALUE_ID,
+                mContext.getString(R.string.ims_reg_status_registered));
+    }
+
+    @Test
+    @Ignore
+    public void initialize_imsNotRegistered_shouldSetImsRegistrationStateSummaryToNotRegisterd() {
+        mPersistableBundle.putBoolean(
+                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, true);
+        when(mTelephonyManager.isImsRegistered(anyInt())).thenReturn(false);
+
+        mController.initialize();
+
+        verify(mDialog).setText(IMS_REGISTRATION_STATE_VALUE_ID,
+                mContext.getString(R.string.ims_reg_status_not_registered));
+    }
+
+    @Test
+    @Ignore
+    public void initialize_showImsRegistration_shouldNotRemoveImsRegistrationStateSetting() {
+        mPersistableBundle.putBoolean(
+                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, true);
+
+        mController.initialize();
+
+        verify(mDialog, never()).removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID);
+    }
+
+    @Test
+    @Ignore
+    public void initialize_doNotShowImsRegistration_shouldRemoveImsRegistrationStateSetting() {
+        mPersistableBundle.putBoolean(
+                CarrierConfigManager.KEY_SHOW_IMS_REGISTRATION_STATUS_BOOL, false);
+
+        mController.initialize();
+
+        verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_LABEL_ID);
+        verify(mDialog).removeSettingFromScreen(IMS_REGISTRATION_STATE_VALUE_ID);
+    }
+
+    @Test
+    public void initialize_nullSignalStrength_noCrash() {
+        doReturn(null).when(mTelephonyManager).getSignalStrength();
+        // we should not crash when running the following line
+        mController.initialize();
+    }
+
+    private void setupCellSignalStrength_lteWcdma(int lteDbm, int lteAsu, int wcdmaDbm,
+            int wcdmaAsu) {
+        doReturn(lteDbm).when(mCellSignalStrengthLte).getDbm();
+        doReturn(lteAsu).when(mCellSignalStrengthLte).getAsuLevel();
+        doReturn(wcdmaDbm).when(mCellSignalStrengthWcdma).getDbm();
+        doReturn(wcdmaAsu).when(mCellSignalStrengthWcdma).getAsuLevel();
+
+        List<CellSignalStrength> cellSignalStrengthList = new ArrayList<>(2);
+        cellSignalStrengthList.add(mCellSignalStrengthLte);
+        cellSignalStrengthList.add(mCellSignalStrengthWcdma);
+
+        doReturn(cellSignalStrengthList).when(mSignalStrength).getCellSignalStrengths();
+    }
+
+    private void setupCellSignalStrength_lteCdma(int lteDbm, int lteAsu, int cdmaDbm, int cdmaAsu) {
+        doReturn(lteDbm).when(mCellSignalStrengthLte).getDbm();
+        doReturn(lteAsu).when(mCellSignalStrengthLte).getAsuLevel();
+        doReturn(cdmaDbm).when(mCellSignalStrengthCdma).getDbm();
+        doReturn(cdmaAsu).when(mCellSignalStrengthCdma).getAsuLevel();
+
+        List<CellSignalStrength> cellSignalStrengthList = new ArrayList<>(2);
+        cellSignalStrengthList.add(mCellSignalStrengthLte);
+        cellSignalStrengthList.add(mCellSignalStrengthCdma);
+
+        doReturn(cellSignalStrengthList).when(mSignalStrength).getCellSignalStrengths();
+    }
+
+    private void setupCellSignalStrength_lteOnly(int lteDbm, int lteAsu) {
+        doReturn(lteDbm).when(mCellSignalStrengthLte).getDbm();
+        doReturn(lteAsu).when(mCellSignalStrengthLte).getAsuLevel();
+
+        List<CellSignalStrength> cellSignalStrengthList = new ArrayList<>(2);
+        cellSignalStrengthList.add(mCellSignalStrengthLte);
+
+        doReturn(cellSignalStrengthList).when(mSignalStrength).getCellSignalStrengths();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/unit/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
new file mode 100644
index 0000000..79c5db8
--- /dev/null
+++ b/tests/unit/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.deviceinfo.storage;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.os.storage.VolumeInfo;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.deviceinfo.PrivateStorageInfo;
+import com.android.settingslib.deviceinfo.StorageVolumeProvider;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class VolumeSizesLoaderTest {
+    @Test
+    public void getVolumeSize_getsValidSizes() throws Exception {
+        VolumeInfo info = mock(VolumeInfo.class);
+        StorageVolumeProvider storageVolumeProvider = mock(StorageVolumeProvider.class);
+        when(storageVolumeProvider.getTotalBytes(any(), any())).thenReturn(10000L);
+        when(storageVolumeProvider.getFreeBytes(any(), any())).thenReturn(1000L);
+
+        PrivateStorageInfo storageInfo =
+                VolumeSizesLoader.getVolumeSize(storageVolumeProvider, null, info);
+
+        assertThat(storageInfo.freeBytes).isEqualTo(1000L);
+        assertThat(storageInfo.totalBytes).isEqualTo(10000L);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsControllerTest.java b/tests/unit/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsControllerTest.java
new file mode 100644
index 0000000..b807114
--- /dev/null
+++ b/tests/unit/src/com/android/settings/fuelgauge/batterysaver/BatterySaverScheduleRadioButtonsControllerTest.java
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2020 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.batterysaver;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.os.PowerManager;
+import android.provider.Settings;
+import android.provider.Settings.Global;
+import android.provider.Settings.Secure;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class BatterySaverScheduleRadioButtonsControllerTest {
+    private Context mContext;
+    private ContentResolver mResolver;
+    private BatterySaverScheduleRadioButtonsController mController;
+    private BatterySaverScheduleSeekBarController mSeekBarController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mSeekBarController = new BatterySaverScheduleSeekBarController(mContext);
+        mController = new BatterySaverScheduleRadioButtonsController(
+                mContext, mSeekBarController);
+        mResolver = mContext.getContentResolver();
+    }
+
+    @Test
+    public void getDefaultKey_routine_returnsCorrectValue() {
+        Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
+                PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC);
+        assertThat(mController.getDefaultKey())
+                .isEqualTo(BatterySaverScheduleRadioButtonsController.KEY_ROUTINE);
+    }
+
+    @Test
+    public void getDefaultKey_automatic_returnsCorrectValue() {
+        Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
+                PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
+        Settings.Global.putInt(mResolver, Global.LOW_POWER_MODE_TRIGGER_LEVEL, 5);
+        assertThat(mController.getDefaultKey())
+                .isEqualTo(BatterySaverScheduleRadioButtonsController.KEY_PERCENTAGE);
+    }
+
+    @Test
+    public void getDefaultKey_none_returnsCorrectValue() {
+        Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
+                PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
+        Settings.Global.putInt(mResolver, Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
+        assertThat(mController.getDefaultKey())
+                .isEqualTo(BatterySaverScheduleRadioButtonsController.KEY_NO_SCHEDULE);
+    }
+
+    @Test
+    public void setDefaultKey_any_defaultsToNoScheduleIfWarningNotSeen() {
+        Secure.putString(
+                mContext.getContentResolver(), Secure.LOW_POWER_WARNING_ACKNOWLEDGED, "null");
+        mController.setDefaultKey(BatterySaverScheduleRadioButtonsController.KEY_ROUTINE);
+        assertThat(mController.getDefaultKey())
+                .isEqualTo(BatterySaverScheduleRadioButtonsController.KEY_NO_SCHEDULE);
+    }
+
+    @Test
+    public void setDefaultKey_percentage_shouldSuppressNotification() {
+        Secure.putInt(
+                mContext.getContentResolver(), Secure.LOW_POWER_WARNING_ACKNOWLEDGED, 1);
+        Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
+                PowerManager.POWER_SAVE_MODE_TRIGGER_PERCENTAGE);
+        Settings.Global.putInt(mResolver, Global.LOW_POWER_MODE_TRIGGER_LEVEL, 5);
+        mController.setDefaultKey(BatterySaverScheduleRadioButtonsController.KEY_PERCENTAGE);
+
+        final int result = Settings.Secure.getInt(mResolver,
+                Secure.SUPPRESS_AUTO_BATTERY_SAVER_SUGGESTION, 0);
+        assertThat(result).isEqualTo(1);
+    }
+
+    @Test
+    public void setDefaultKey_routine_shouldSuppressNotification() {
+        Secure.putInt(
+                mContext.getContentResolver(), Secure.LOW_POWER_WARNING_ACKNOWLEDGED, 1);
+        Settings.Global.putInt(mResolver, Global.AUTOMATIC_POWER_SAVE_MODE,
+                PowerManager.POWER_SAVE_MODE_TRIGGER_DYNAMIC);
+        mController.setDefaultKey(BatterySaverScheduleRadioButtonsController.KEY_ROUTINE);
+
+        final int result = Settings.Secure.getInt(mResolver,
+                Secure.SUPPRESS_AUTO_BATTERY_SAVER_SUGGESTION, 0);
+        assertThat(result).isEqualTo(1);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceControllerTest.java b/tests/unit/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceControllerTest.java
new file mode 100644
index 0000000..8cfedf6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/fuelgauge/batterysaver/BatterySaverStickyPreferenceControllerTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2020 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.batterysaver;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.provider.Settings.Global;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class BatterySaverStickyPreferenceControllerTest {
+
+    private static final String PREF_KEY = "battery_saver_sticky";
+
+    private Context mContext;
+    private BatterySaverStickyPreferenceController mController;
+
+    @Before
+    public void setup() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new BatterySaverStickyPreferenceController(mContext, PREF_KEY);
+    }
+
+    private int getAutoDisableSetting() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+            Global.LOW_POWER_MODE_STICKY_AUTO_DISABLE_ENABLED,
+                1);
+    }
+
+    @Test
+    public void testOnPreferenceChange_turnOnAutoOff_autoDisableOn() {
+        mController.setChecked(true);
+        final int isOn = getAutoDisableSetting();
+        assertThat(isOn).isEqualTo(1);
+    }
+
+    @Test
+    public void testOnPreferenceChange_TurnOffAutoOff_autoDisableOff() {
+        mController.setChecked(false);
+        final int isOn = getAutoDisableSetting();
+        assertThat(isOn).isEqualTo(0);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java b/tests/unit/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java
new file mode 100644
index 0000000..069f123
--- /dev/null
+++ b/tests/unit/src/com/android/settings/fuelgauge/batterytip/AppInfoTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2020 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Parcel;
+import android.text.format.DateUtils;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class AppInfoTest {
+
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final int TYPE_WAKELOCK =
+            StatsManagerConfig.AnomalyType.EXCESSIVE_WAKELOCK_ALL_SCREEN_OFF;
+    private static final int TYPE_WAKEUP =
+            StatsManagerConfig.AnomalyType.EXCESSIVE_WAKEUPS_IN_BACKGROUND;
+    private static final long SCREEN_TIME_MS = DateUtils.HOUR_IN_MILLIS;
+    private static final int UID = 3452;
+
+    private AppInfo mAppInfo;
+
+    @Before
+    public void setUp() {
+        mAppInfo = new AppInfo.Builder()
+                .setPackageName(PACKAGE_NAME)
+                .addAnomalyType(TYPE_WAKELOCK)
+                .addAnomalyType(TYPE_WAKEUP)
+                .setScreenOnTimeMs(SCREEN_TIME_MS)
+                .setUid(UID)
+                .build();
+    }
+
+    @Test
+    public void testParcel() {
+        Parcel parcel = Parcel.obtain();
+        mAppInfo.writeToParcel(parcel, mAppInfo.describeContents());
+        parcel.setDataPosition(0);
+
+        final AppInfo appInfo = new AppInfo(parcel);
+
+        assertThat(appInfo.packageName).isEqualTo(PACKAGE_NAME);
+        assertThat(appInfo.anomalyTypes).containsExactly(TYPE_WAKELOCK, TYPE_WAKEUP);
+        assertThat(appInfo.screenOnTimeMs).isEqualTo(SCREEN_TIME_MS);
+        assertThat(appInfo.uid).isEqualTo(UID);
+    }
+
+    @Test
+    public void testCompareTo_hasCorrectOrder() {
+        final AppInfo appInfo = new AppInfo.Builder()
+                .setPackageName(PACKAGE_NAME)
+                .addAnomalyType(TYPE_WAKELOCK)
+                .setScreenOnTimeMs(SCREEN_TIME_MS + 100)
+                .build();
+
+        List<AppInfo> appInfos = new ArrayList<>();
+        appInfos.add(appInfo);
+        appInfos.add(mAppInfo);
+
+        Collections.sort(appInfos);
+        assertThat(appInfos.get(0).screenOnTimeMs).isLessThan(appInfos.get(1).screenOnTimeMs);
+    }
+
+    @Test
+    public void testBuilder() {
+        assertThat(mAppInfo.packageName).isEqualTo(PACKAGE_NAME);
+        assertThat(mAppInfo.anomalyTypes).containsExactly(TYPE_WAKELOCK, TYPE_WAKEUP);
+        assertThat(mAppInfo.screenOnTimeMs).isEqualTo(SCREEN_TIME_MS);
+        assertThat(mAppInfo.uid).isEqualTo(UID);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java b/tests/unit/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
new file mode 100644
index 0000000..4be2ae6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/fuelgauge/batterytip/BatteryTipPolicyTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2020 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.text.format.DateUtils;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class BatteryTipPolicyTest {
+
+    private static final String BATTERY_TIP_CONSTANTS_VALUE = "battery_tip_enabled=true"
+            + ",summary_enabled=false"
+            + ",battery_saver_tip_enabled=false"
+            + ",high_usage_enabled=true"
+            + ",high_usage_app_count=5"
+            + ",high_usage_period_ms=2000"
+            + ",high_usage_battery_draining=30"
+            + ",app_restriction_enabled=true"
+            + ",reduced_battery_enabled=true"
+            + ",reduced_battery_percent=30"
+            + ",low_battery_enabled=false"
+            + ",low_battery_hour=10"
+            + ",data_history_retain_day=24"
+            + ",excessive_bg_drain_percentage=25"
+            + ",test_battery_saver_tip=true"
+            + ",test_high_usage_tip=false"
+            + ",test_smart_battery_tip=true"
+            + ",test_low_battery_tip=true"
+            + ",app_restriction_active_hour=6";
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+    }
+
+    @Test
+    public void testInit_usesConfigValues() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.BATTERY_TIP_CONSTANTS, BATTERY_TIP_CONSTANTS_VALUE);
+
+        final BatteryTipPolicy batteryTipPolicy = new BatteryTipPolicy(mContext);
+
+        assertThat(batteryTipPolicy.batteryTipEnabled).isTrue();
+        assertThat(batteryTipPolicy.summaryEnabled).isFalse();
+        assertThat(batteryTipPolicy.batterySaverTipEnabled).isFalse();
+        assertThat(batteryTipPolicy.highUsageEnabled).isTrue();
+        assertThat(batteryTipPolicy.highUsageAppCount).isEqualTo(5);
+        assertThat(batteryTipPolicy.highUsagePeriodMs).isEqualTo(2000);
+        assertThat(batteryTipPolicy.highUsageBatteryDraining).isEqualTo(30);
+        assertThat(batteryTipPolicy.appRestrictionEnabled).isTrue();
+        assertThat(batteryTipPolicy.appRestrictionActiveHour).isEqualTo(6);
+        assertThat(batteryTipPolicy.reducedBatteryEnabled).isTrue();
+        assertThat(batteryTipPolicy.reducedBatteryPercent).isEqualTo(30);
+        assertThat(batteryTipPolicy.lowBatteryEnabled).isFalse();
+        assertThat(batteryTipPolicy.lowBatteryHour).isEqualTo(10);
+        assertThat(batteryTipPolicy.dataHistoryRetainDay).isEqualTo(24);
+        assertThat(batteryTipPolicy.excessiveBgDrainPercentage).isEqualTo(25);
+        assertThat(batteryTipPolicy.testBatterySaverTip).isTrue();
+        assertThat(batteryTipPolicy.testHighUsageTip).isFalse();
+        assertThat(batteryTipPolicy.testSmartBatteryTip).isTrue();
+        assertThat(batteryTipPolicy.testLowBatteryTip).isTrue();
+    }
+
+    @Test
+    public void testInit_defaultValues() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.BATTERY_TIP_CONSTANTS, "");
+
+        final BatteryTipPolicy batteryTipPolicy = new BatteryTipPolicy(mContext);
+
+        assertThat(batteryTipPolicy.batteryTipEnabled).isTrue();
+        assertThat(batteryTipPolicy.summaryEnabled).isTrue();
+        assertThat(batteryTipPolicy.batterySaverTipEnabled).isTrue();
+        assertThat(batteryTipPolicy.highUsageEnabled).isTrue();
+        assertThat(batteryTipPolicy.highUsageAppCount).isEqualTo(3);
+        assertThat(batteryTipPolicy.highUsagePeriodMs).isEqualTo(2 * DateUtils.HOUR_IN_MILLIS);
+        assertThat(batteryTipPolicy.highUsageBatteryDraining).isEqualTo(25);
+        assertThat(batteryTipPolicy.appRestrictionEnabled).isTrue();
+        assertThat(batteryTipPolicy.appRestrictionActiveHour).isEqualTo(24);
+        assertThat(batteryTipPolicy.reducedBatteryEnabled).isFalse();
+        assertThat(batteryTipPolicy.reducedBatteryPercent).isEqualTo(50);
+        assertThat(batteryTipPolicy.lowBatteryEnabled).isTrue();
+        assertThat(batteryTipPolicy.lowBatteryHour).isEqualTo(3);
+        assertThat(batteryTipPolicy.dataHistoryRetainDay).isEqualTo(30);
+        assertThat(batteryTipPolicy.excessiveBgDrainPercentage).isEqualTo(10);
+        assertThat(batteryTipPolicy.testBatterySaverTip).isFalse();
+        assertThat(batteryTipPolicy.testHighUsageTip).isFalse();
+        assertThat(batteryTipPolicy.testSmartBatteryTip).isFalse();
+        assertThat(batteryTipPolicy.testLowBatteryTip).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java b/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java
deleted file mode 100644
index 355a7e4..0000000
--- a/tests/unit/src/com/android/settings/fuelgauge/batterytip/RestrictAppTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.fuelgauge.batterytip;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.support.test.uiautomator.UiDevice;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class RestrictAppTest {
-    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
-    private static final String BATTERY_INTENT = "android.intent.action.POWER_USAGE_SUMMARY";
-    private static final String PACKAGE_SETTINGS = "com.android.settings";
-    private static final String PACKAGE_SYSTEM_UI = "com.android.systemui";
-    private static final int ANOMALY_TYPE =
-            StatsManagerConfig.AnomalyType.EXCESSIVE_WAKELOCK_ALL_SCREEN_OFF;
-
-    private BatteryDatabaseManager mBatteryDatabaseManager;
-    private PackageManager mPackageManager;
-    private UiDevice mUiDevice;
-
-    @Before
-    public void setUp() throws Exception {
-        final Context context = InstrumentationRegistry.getTargetContext();
-
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mUiDevice.wakeUp();
-        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
-
-        mPackageManager = context.getPackageManager();
-        mBatteryDatabaseManager = BatteryDatabaseManager.getInstance(context);
-        mBatteryDatabaseManager.deleteAllAnomaliesBeforeTimeStamp(System.currentTimeMillis() +
-                TimeUnit.DAYS.toMillis(1));
-    }
-
-    @Test
-    public void batterySettings_hasOneAnomaly_showAnomaly() throws
-            PackageManager.NameNotFoundException {
-        mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SETTINGS, 0),
-                PACKAGE_SETTINGS, ANOMALY_TYPE,
-                AnomalyDatabaseHelper.State.NEW, System.currentTimeMillis());
-
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(createBatteryIntent());
-        onView(withText("Restrict 1 app")).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void batterySettings_hasTwoAnomalies_showAnomalies() throws
-            PackageManager.NameNotFoundException {
-        mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SETTINGS, 0),
-                PACKAGE_SETTINGS, ANOMALY_TYPE,
-                AnomalyDatabaseHelper.State.NEW, System.currentTimeMillis());
-        mBatteryDatabaseManager.insertAnomaly(mPackageManager.getPackageUid(PACKAGE_SYSTEM_UI, 0),
-                PACKAGE_SYSTEM_UI, ANOMALY_TYPE,
-                AnomalyDatabaseHelper.State.NEW, System.currentTimeMillis());
-
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.startActivitySync(createBatteryIntent());
-        onView(withText("Restrict 2 apps")).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void insertDuplicateAnomalies_onlyInsertOnce() throws
-            PackageManager.NameNotFoundException {
-        final int uid = mPackageManager.getPackageUid(PACKAGE_SETTINGS, 0);
-        final long now = System.currentTimeMillis();
-
-        // Insert same anomaly twice, it fails at the second time.
-        assertThat(mBatteryDatabaseManager.insertAnomaly(uid, PACKAGE_SETTINGS, ANOMALY_TYPE,
-                AnomalyDatabaseHelper.State.NEW, now)).isTrue();
-        assertThat(mBatteryDatabaseManager.insertAnomaly(uid, PACKAGE_SETTINGS, ANOMALY_TYPE,
-                AnomalyDatabaseHelper.State.NEW, now)).isFalse();
-
-        // In database, only contains one row
-        List<AppInfo> newAppInfos = mBatteryDatabaseManager.queryAllAnomalies(0,
-                AnomalyDatabaseHelper.State.NEW);
-        assertThat(newAppInfos).containsExactly(new AppInfo.Builder()
-                .setUid(uid)
-                .setPackageName(PACKAGE_SETTINGS)
-                .addAnomalyType(ANOMALY_TYPE)
-                .build());
-    }
-
-    private Intent createBatteryIntent() {
-        final Intent intent = new Intent(BATTERY_INTENT);
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        return intent;
-    }
-}
diff --git a/tests/unit/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceControllerTest.java b/tests/unit/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceControllerTest.java
new file mode 100644
index 0000000..18738e9
--- /dev/null
+++ b/tests/unit/src/com/android/settings/gestures/OneHandedAppTapsExitPreferenceControllerTest.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.gestures;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.TogglePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class OneHandedAppTapsExitPreferenceControllerTest {
+
+    private static final String KEY = "gesture_app_taps_to_exit";
+
+    private Context mContext;
+    private SwitchPreference mSwitchPreference;
+
+    private OneHandedAppTapsExitPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new OneHandedAppTapsExitPreferenceController(mContext, KEY);
+        mSwitchPreference = new SwitchPreference(mContext);
+        mSwitchPreference.setKey(KEY);
+    }
+
+    @Test
+    public void setChecked_setBoolean_checkIsTrueOrFalse() {
+        mController.setChecked(false);
+        assertThat(mController.isChecked()).isFalse();
+
+        mController.setChecked(true);
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void getAvailabilityStatus_enabledOneHanded_shouldAvailable() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(TogglePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_disabledOneHanded_shouldUnavailable() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(TogglePreferenceController.DISABLED_DEPENDENT_SETTING);
+    }
+
+    @Test
+    public void updateState_enableOneHanded_switchShouldEnabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, true);
+
+        mController.updateState(mSwitchPreference);
+
+        assertThat(mSwitchPreference.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_disableOneHanded_switchShouldDisabled() {
+        OneHandedSettingsUtils.setSettingsOneHandedModeEnabled(mContext, false);
+
+        mController.updateState(mSwitchPreference);
+
+        assertThat(mSwitchPreference.isEnabled()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java b/tests/unit/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java
new file mode 100644
index 0000000..cf9b3c6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/homepage/contextualcards/CardDatabaseHelperTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2020 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.homepage.contextualcards;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class CardDatabaseHelperTest {
+
+    private Context mContext;
+    private CardDatabaseHelper mCardDatabaseHelper;
+    private SQLiteDatabase mDatabase;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mCardDatabaseHelper = CardDatabaseHelper.getInstance(mContext);
+        mDatabase = mCardDatabaseHelper.getReadableDatabase();
+    }
+
+    @After
+    public void cleanUp() {
+        CardDatabaseHelper.getInstance(mContext).close();
+        CardDatabaseHelper.sCardDatabaseHelper = null;
+    }
+
+    @Test
+    public void testDatabaseSchema() {
+        final Cursor cursor = mDatabase.rawQuery("SELECT * FROM " + CardDatabaseHelper.CARD_TABLE,
+                null);
+        final String[] columnNames = cursor.getColumnNames();
+
+        final String[] expectedNames = {
+                CardDatabaseHelper.CardColumns.NAME,
+                CardDatabaseHelper.CardColumns.TYPE,
+                CardDatabaseHelper.CardColumns.SCORE,
+                CardDatabaseHelper.CardColumns.SLICE_URI,
+                CardDatabaseHelper.CardColumns.CATEGORY,
+                CardDatabaseHelper.CardColumns.PACKAGE_NAME,
+                CardDatabaseHelper.CardColumns.APP_VERSION,
+                CardDatabaseHelper.CardColumns.DISMISSED_TIMESTAMP,
+        };
+
+        assertThat(columnNames).isEqualTo(expectedNames);
+        cursor.close();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java b/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java
new file mode 100644
index 0000000..a7acffc
--- /dev/null
+++ b/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardLookupTableTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2020 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.homepage.contextualcards;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.homepage.contextualcards.ContextualCardLookupTable.ControllerRendererMapping;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class ContextualCardLookupTableTest {
+
+    private static final int UNSUPPORTED_CARD_TYPE = -99999;
+    private static final int UNSUPPORTED_VIEW_TYPE = -99999;
+
+    private List<ControllerRendererMapping> mOriginalLookupTable;
+
+    @Before
+    public void setUp() {
+        mOriginalLookupTable = new ArrayList<>();
+        ContextualCardLookupTable.LOOKUP_TABLE.stream()
+                .forEach(mapping -> mOriginalLookupTable.add(mapping));
+    }
+
+    @After
+    public void reset() {
+        ContextualCardLookupTable.LOOKUP_TABLE.clear();
+        ContextualCardLookupTable.LOOKUP_TABLE.addAll(mOriginalLookupTable);
+    }
+
+    @Test
+    public void getCardControllerClass_hasSupportedCardType_shouldGetCorrespondingController() {
+        for (ControllerRendererMapping mapping : ContextualCardLookupTable.LOOKUP_TABLE) {
+            assertThat(ContextualCardLookupTable.getCardControllerClass(mapping.mCardType))
+                    .isEqualTo(mapping.mControllerClass);
+        }
+    }
+
+    @Test
+    public void getCardControllerClass_hasUnsupportedCardType_shouldAlwaysGetNull() {
+        assertThat(ContextualCardLookupTable.getCardControllerClass(UNSUPPORTED_CARD_TYPE))
+                .isNull();
+    }
+
+    @Test
+    public void
+    getCardRendererClassByViewType_hasSupportedViewType_shouldGetCorrespondingRenderer() {
+        for (ControllerRendererMapping mapping : ContextualCardLookupTable.LOOKUP_TABLE) {
+            assertThat(ContextualCardLookupTable.getCardRendererClassByViewType(mapping.mViewType))
+                    .isEqualTo(mapping.mRendererClass);
+        }
+    }
+
+    @Test
+    public void getCardRendererClassByViewType_hasUnsupportedViewType_shouldAlwaysGetNull() {
+        assertThat(ContextualCardLookupTable.getCardRendererClassByViewType(
+                UNSUPPORTED_VIEW_TYPE)).isNull();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void
+    getCardRendererClassByViewType_hasDuplicateViewType_shouldThrowsIllegalStateException() {
+        final ControllerRendererMapping mapping1 =
+                new ControllerRendererMapping(
+                        1111 /* cardType */, UNSUPPORTED_VIEW_TYPE /* viewType */,
+                        ContextualCardController.class, ContextualCardRenderer.class
+                );
+        final ControllerRendererMapping mapping2 =
+                new ControllerRendererMapping(
+                        2222 /* cardType */, UNSUPPORTED_VIEW_TYPE /* viewType */,
+                        ContextualCardController.class, ContextualCardRenderer.class
+                );
+        ContextualCardLookupTable.LOOKUP_TABLE.add(mapping1);
+        ContextualCardLookupTable.LOOKUP_TABLE.add(mapping2);
+
+        ContextualCardLookupTable.getCardRendererClassByViewType(UNSUPPORTED_VIEW_TYPE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallbackTest.java b/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallbackTest.java
new file mode 100644
index 0000000..3e7dadf
--- /dev/null
+++ b/tests/unit/src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallbackTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2020 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.homepage.contextualcards;
+
+import static com.android.settings.intelligence.ContextualCardProto.ContextualCard.Category.IMPORTANT_VALUE;
+import static com.android.settings.intelligence.ContextualCardProto.ContextualCard.Category.STICKY_VALUE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class ContextualCardsDiffCallbackTest {
+
+    private static final Uri TEST_SLICE_URI = Uri.parse("content://test/test");
+
+    private ContextualCardsDiffCallback mDiffCallback;
+    private List<ContextualCard> mOldCards;
+    private List<ContextualCard> mNewCards;
+
+    @Before
+    public void setUp() {
+        mOldCards = new ArrayList<>();
+        mNewCards = new ArrayList<>();
+        mOldCards.add(getContextualCard("test1"));
+        mNewCards.add(getContextualCard("test1"));
+        mNewCards.add(getContextualCard("test2"));
+        mDiffCallback = new ContextualCardsDiffCallback(mOldCards, mNewCards);
+    }
+
+    @Test
+    public void getOldListSize_oneCard_returnOne() {
+        assertThat(mDiffCallback.getOldListSize()).isEqualTo(1);
+    }
+
+    @Test
+    public void getNewListSize_twoCards_returnTwo() {
+        assertThat(mDiffCallback.getNewListSize()).isEqualTo(2);
+    }
+
+    @Test
+    public void areItemsTheSame_sameItems_returnTrue() {
+        assertThat(mDiffCallback.areItemsTheSame(0, 0)).isTrue();
+    }
+
+    @Test
+    public void areItemsTheSame_differentItems_returnFalse() {
+        mOldCards.add(getContextualCard("test3"));
+
+        assertThat(mDiffCallback.areItemsTheSame(1, 1)).isFalse();
+    }
+
+    @Test
+    public void areContentsTheSame_sameContents_returnTrue() {
+        assertThat(mDiffCallback.areContentsTheSame(0, 0)).isTrue();
+    }
+
+    @Test
+    public void areContentsTheSame_sliceWithToggle_returnFalse() {
+        final ContextualCard card = getContextualCard("test1").mutate()
+                .setHasInlineAction(true).build();
+        mNewCards.add(0, card);
+
+        assertThat(mDiffCallback.areContentsTheSame(0, 0)).isFalse();
+    }
+
+    @Test
+    public void areContentsTheSame_stickySlice_returnFalse() {
+        final ContextualCard card = getContextualCard("test1").mutate()
+                .setCategory(STICKY_VALUE).build();
+        mNewCards.add(0, card);
+
+        assertThat(mDiffCallback.areContentsTheSame(0, 0)).isFalse();
+    }
+
+    @Test
+    public void areContentsTheSame_importantSlice_returnFalse() {
+        final ContextualCard card = getContextualCard("test1").mutate()
+                .setCategory(IMPORTANT_VALUE).build();
+        mNewCards.add(0, card);
+
+        assertThat(mDiffCallback.areContentsTheSame(0, 0)).isFalse();
+    }
+
+    private ContextualCard getContextualCard(String name) {
+        return new ContextualCard.Builder()
+                .setName(name)
+                .setRankingScore(0.5)
+                .setCardType(ContextualCard.CardType.SLICE)
+                .setSliceUri(TEST_SLICE_URI)
+                .build();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java b/tests/unit/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java
new file mode 100644
index 0000000..0a039a9
--- /dev/null
+++ b/tests/unit/src/com/android/settings/homepage/contextualcards/conditional/ConditionFooterContextualCardTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2020 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.homepage.contextualcards.conditional;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ConditionFooterContextualCardTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void newInstance_changeCardType_shouldCrash() {
+        new ConditionFooterContextualCard.Builder()
+                .setCardType(ContextualCard.CardType.LEGACY_SUGGESTION)
+                .build();
+    }
+
+    @Test
+    public void getCardType_shouldAlwaysBeConditionalFooter() {
+        assertThat(new ConditionFooterContextualCard.Builder().build().getCardType())
+                .isEqualTo(ContextualCard.CardType.CONDITIONAL_FOOTER);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java b/tests/unit/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java
new file mode 100644
index 0000000..59ff550
--- /dev/null
+++ b/tests/unit/src/com/android/settings/homepage/contextualcards/conditional/ConditionHeaderContextualCardTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2020 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.homepage.contextualcards.conditional;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ConditionHeaderContextualCardTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void newInstance_changeCardType_shouldCrash() {
+        new ConditionHeaderContextualCard.Builder()
+                .setCardType(ContextualCard.CardType.LEGACY_SUGGESTION)
+                .build();
+    }
+
+    @Test
+    public void getCardType_shouldAlwaysBeConditionalHeader() {
+        assertThat(new ConditionHeaderContextualCard.Builder().build().getCardType())
+                .isEqualTo(ContextualCard.CardType.CONDITIONAL_HEADER);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java b/tests/unit/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java
new file mode 100644
index 0000000..a06afc8
--- /dev/null
+++ b/tests/unit/src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCardTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 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.homepage.contextualcards.conditional;
+
+import static com.android.settings.homepage.contextualcards.conditional.ConditionalContextualCard
+        .UNSUPPORTED_RANKING_SCORE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.homepage.contextualcards.ContextualCard;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ConditionalContextualCardTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void newInstance_changeCardType_shouldCrash() {
+        new ConditionalContextualCard.Builder()
+                .setCardType(ContextualCard.CardType.LEGACY_SUGGESTION)
+                .build();
+    }
+
+    @Test
+    public void getCardType_shouldAlwaysBeConditional() {
+        assertThat(new ConditionalContextualCard.Builder().build().getCardType())
+                .isEqualTo(ContextualCard.CardType.CONDITIONAL);
+    }
+
+    @Test
+    public void getRankingScore_shouldAlwaysBeUnsupportedScore() {
+        assertThat(new ConditionalContextualCard.Builder().build().getRankingScore())
+                .isEqualTo(UNSUPPORTED_RANKING_SCORE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java b/tests/unit/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java
new file mode 100644
index 0000000..a67d2e9
--- /dev/null
+++ b/tests/unit/src/com/android/settings/homepage/contextualcards/slices/FaceSetupSliceTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2020 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.homepage.contextualcards.slices;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.face.FaceManager;
+import android.os.UserHandle;
+import android.provider.Settings;
+
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.widget.SliceLiveData;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class FaceSetupSliceTest {
+
+    private Context mContext;
+    private PackageManager mPackageManager;
+
+    @Before
+    public void setUp() {
+        // Set-up specs for SliceMetadata.
+        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mPackageManager = mock(PackageManager.class);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+    }
+
+    @Test
+    public void getSlice_noFaceManager_shouldReturnNull() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(false);
+        final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
+        final SliceMetadata metadata = SliceMetadata.from(mContext, setupSlice.getSlice());
+
+        assertThat(metadata.isErrorSlice()).isTrue();
+    }
+
+    @Test
+    public void getSlice_faceEnrolled_noReEnroll_shouldReturnNull() {
+        final FaceManager faceManager = mock(FaceManager.class);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
+        when(faceManager.hasEnrolledTemplates(UserHandle.myUserId())).thenReturn(true);
+        when(mContext.getSystemService(Context.FACE_SERVICE)).thenReturn(faceManager);
+        Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.FACE_UNLOCK_RE_ENROLL,
+                0);
+        final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
+
+        final SliceMetadata metadata = SliceMetadata.from(mContext, setupSlice.getSlice());
+
+        assertThat(metadata.isErrorSlice()).isTrue();
+    }
+
+    @Test
+    public void getSlice_faceNotEnrolled_shouldReturnSlice() {
+        final FaceManager faceManager = mock(FaceManager.class);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
+        when(faceManager.hasEnrolledTemplates(UserHandle.myUserId())).thenReturn(false);
+        when(mContext.getSystemService(Context.FACE_SERVICE)).thenReturn(faceManager);
+        final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
+
+        assertThat(setupSlice.getSlice()).isNotNull();
+    }
+
+    @Test
+    public void getSlice_faceEnrolled_shouldReEnroll_shouldReturnSlice() {
+        final FaceManager faceManager = mock(FaceManager.class);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
+        when(faceManager.hasEnrolledTemplates(UserHandle.myUserId())).thenReturn(true);
+        when(mContext.getSystemService(Context.FACE_SERVICE)).thenReturn(faceManager);
+        Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.FACE_UNLOCK_RE_ENROLL,
+                1);
+        final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
+
+        assertThat(setupSlice.getSlice()).isNotNull();
+    }
+
+    @Test
+    public void getSlice_faceEnrolled_musteEnroll_shouldReturnSlice() {
+        final FaceManager faceManager = mock(FaceManager.class);
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_FACE)).thenReturn(true);
+        when(faceManager.hasEnrolledTemplates(UserHandle.myUserId())).thenReturn(true);
+        when(mContext.getSystemService(Context.FACE_SERVICE)).thenReturn(faceManager);
+        Settings.Secure.putInt(mContext.getContentResolver(),
+                Settings.Secure.FACE_UNLOCK_RE_ENROLL,
+                3);
+        final FaceSetupSlice setupSlice = new FaceSetupSlice(mContext);
+
+        assertThat(setupSlice.getSlice()).isNotNull();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/ActiveSubsciptionsListenerTest.java b/tests/unit/src/com/android/settings/network/ActiveSubsciptionsListenerTest.java
new file mode 100644
index 0000000..efa21ae
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/ActiveSubsciptionsListenerTest.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Looper;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.internal.telephony.TelephonyIntents;
+
+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 java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class ActiveSubsciptionsListenerTest {
+    private static final int SUB_ID1 = 3;
+    private static final int SUB_ID2 = 7;
+
+    private static final Intent INTENT_RADIO_TECHNOLOGY_CHANGED =
+            new Intent(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);
+
+    private static final Intent INTENT_MULTI_SIM_CONFIG_CHANGED =
+            new Intent(TelephonyManager.ACTION_MULTI_SIM_CONFIG_CHANGED);
+
+    private static final Intent INTENT_CARRIER_CONFIG_CHANGED =
+            new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
+
+    private Context mContext;
+
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    private List<SubscriptionInfo> mActiveSubscriptions;
+
+    private ActiveSubsciptionsListenerImpl mListener;
+    private BroadcastReceiver mReceiver;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+
+        mActiveSubscriptions = new ArrayList<SubscriptionInfo>();
+        addMockSubscription(SUB_ID1);
+        addMockSubscription(SUB_ID2);
+        doReturn(mActiveSubscriptions).when(mSubscriptionManager).getActiveSubscriptionInfoList();
+
+        mListener = spy(new ActiveSubsciptionsListenerImpl(Looper.getMainLooper(), mContext));
+        doReturn(mSubscriptionManager).when(mListener).getSubscriptionManager();
+        mReceiver = mListener.getSubscriptionChangeReceiver();
+    }
+
+    private void addMockSubscription(int subId) {
+        SubscriptionInfo mockSubscriptionInfo = mock(SubscriptionInfo.class);
+        doReturn(subId).when(mockSubscriptionInfo).getSubscriptionId();
+        mActiveSubscriptions.add(mockSubscriptionInfo);
+    }
+
+    @After
+    public void cleanUp() {
+        mListener.close();
+    }
+
+    public class ActiveSubsciptionsListenerImpl extends ActiveSubsciptionsListener {
+        public ActiveSubsciptionsListenerImpl(Looper looper, Context context) {
+            super(looper, context);
+        }
+
+        @Override
+        void registerForSubscriptionsChange() {}
+
+        public void onChanged() {}
+    }
+
+    @Test
+    public void constructor_noListeningWasSetup() {
+        verify(mListener, never()).onChanged();
+    }
+
+    @Test
+    public void start_configChangedIntent_onChangedShouldBeCalled() {
+        mReceiver.onReceive(mContext, INTENT_RADIO_TECHNOLOGY_CHANGED);
+        mReceiver.onReceive(mContext, INTENT_MULTI_SIM_CONFIG_CHANGED);
+        verify(mListener, never()).onChanged();
+
+        mListener.start();
+
+        mReceiver.onReceive(mContext, INTENT_RADIO_TECHNOLOGY_CHANGED);
+        verify(mListener, times(1)).onChanged();
+
+        mReceiver.onReceive(mContext, INTENT_MULTI_SIM_CONFIG_CHANGED);
+        verify(mListener, times(2)).onChanged();
+
+        mListener.stop();
+
+        mReceiver.onReceive(mContext, INTENT_RADIO_TECHNOLOGY_CHANGED);
+        mReceiver.onReceive(mContext, INTENT_MULTI_SIM_CONFIG_CHANGED);
+        verify(mListener, times(2)).onChanged();
+    }
+
+    @Test
+    public void start_carrierConfigChangedIntent_onChangedWhenSubIdBeenCached() {
+        mReceiver.onReceive(mContext, INTENT_CARRIER_CONFIG_CHANGED);
+        verify(mListener, never()).onChanged();
+
+        mListener.start();
+
+        mListener.getActiveSubscriptionsInfo();
+
+        mReceiver.onReceive(mContext, INTENT_CARRIER_CONFIG_CHANGED);
+        verify(mListener, never()).onChanged();
+
+        INTENT_CARRIER_CONFIG_CHANGED.putExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX,
+                SUB_ID2);
+        mReceiver.onReceive(mContext, INTENT_CARRIER_CONFIG_CHANGED);
+        verify(mListener, times(1)).onChanged();
+
+        mListener.stop();
+
+        mReceiver.onReceive(mContext, INTENT_CARRIER_CONFIG_CHANGED);
+        verify(mListener, times(1)).onChanged();
+    }
+
+
+    @Test
+    public void start_alwaysFetchAndCacheResult() {
+        mListener.start();
+
+        List<SubscriptionInfo> subInfoList = null;
+        int numberOfAccess = 0;
+
+        for (int numberOfSubInfo = mActiveSubscriptions.size(); numberOfSubInfo >= 0;
+                numberOfSubInfo--) {
+            if (mActiveSubscriptions.size() > numberOfSubInfo) {
+                mActiveSubscriptions.remove(numberOfSubInfo);
+            }
+
+            // fetch twice and test if they generated access to SubscriptionManager only once
+            subInfoList = mListener.getActiveSubscriptionsInfo();
+            subInfoList = mListener.getActiveSubscriptionsInfo();
+
+            numberOfAccess++;
+            verify(mSubscriptionManager, times(numberOfAccess)).getActiveSubscriptionInfoList();
+
+            mListener.clearCache();
+        }
+
+        mActiveSubscriptions.clear();
+
+        // fetch twice and test if they generated access to SubscriptionManager only once
+        subInfoList = mListener.getActiveSubscriptionsInfo();
+        subInfoList = mListener.getActiveSubscriptionsInfo();
+
+        numberOfAccess++;
+        verify(mSubscriptionManager, times(numberOfAccess)).getActiveSubscriptionInfoList();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
new file mode 100644
index 0000000..1d6a624
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/AirplaneModePreferenceControllerTest.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Looper;
+import android.provider.Settings;
+import android.provider.SettingsSlicesContract;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.AirplaneModeEnabler;
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class AirplaneModePreferenceControllerTest {
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private AirplaneModeEnabler mAirplaneModeEnabler;
+    private Context mContext;
+    private ContentResolver mResolver;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mScreen;
+    private RestrictedSwitchPreference mPreference;
+    private AirplaneModePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mResolver = mContext.getContentResolver();
+        doReturn(mPackageManager).when(mContext).getPackageManager();
+        mController = new AirplaneModePreferenceController(mContext,
+                SettingsSlicesContract.KEY_AIRPLANE_MODE);
+
+        mPreferenceManager = new PreferenceManager(mContext);
+        mScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mPreference = new RestrictedSwitchPreference(mContext);
+        mPreference.setKey(SettingsSlicesContract.KEY_AIRPLANE_MODE);
+        mScreen.addPreference(mPreference);
+        mController.setFragment(null);
+    }
+
+    @Test
+    public void getSliceUri_shouldUsePlatformAuthority() {
+        assertThat(mController.getSliceUri().getAuthority())
+                .isEqualTo(SettingsSlicesContract.AUTHORITY);
+    }
+
+    @Test
+    public void getAvailabilityStatus_hasLeanbackFeature_shouldNotBeAvailable() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isNotEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noLeanbackFeature_shouldBeAvailable() {
+        when(mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)).thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void setChecked_setAirplaneModeEnabler_setCheckedTrue() {
+        // Set airplane mode ON by setChecked
+        mController.setAirplaneModeEnabler(mAirplaneModeEnabler);
+
+        assertThat(mController.setChecked(true)).isTrue();
+    }
+
+    @Test
+    public void setChecked_isAirplaneModeOnAndSetCheckedTrue_shouldReturnFalse() {
+        // Set airplane mode ON by setChecked
+        mController.setAirplaneModeEnabler(mAirplaneModeEnabler);
+        // Check return value if set same status.
+        when(mAirplaneModeEnabler.isAirplaneModeOn()).thenReturn(true);
+
+        assertThat(mController.setChecked(true)).isFalse();
+    }
+
+    @Test
+    public void setChecked_setChecked_isAirplaneModeOnAndSetCheckedTrue_shouldReturnTrue() {
+        // Set airplane mode ON by setChecked
+        mController.setAirplaneModeEnabler(mAirplaneModeEnabler);
+        // Check return value if set same status.
+        when(mAirplaneModeEnabler.isAirplaneModeOn()).thenReturn(true);
+
+        // Set to OFF
+        assertThat(mController.setChecked(false)).isTrue();
+    }
+
+    @Test
+    public void isChecked_airplaneModeTurnOff_returnFalse() {
+        // Set airplane mode ON
+        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, ON);
+
+        mController.displayPreference(mScreen);
+        mController.onStart();
+
+        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, OFF);
+        assertThat(mController.isChecked()).isFalse();
+    }
+
+    @Test
+    public void testPreferenceUI_airplaneModeTurnOn_updatesCorrectly() {
+        // Airplane mode default off
+        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, OFF);
+
+        mController.displayPreference(mScreen);
+        mController.onStop();
+        mController.onAirplaneModeChanged(true);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void isSliceable_returnsTrue() {
+        assertThat(mController.isSliceable()).isTrue();
+    }
+
+    @Test
+    public void isPublicSlice_returnsTrue() {
+        assertThat(mController.isPublicSlice()).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksPreferenceControllerTest.java
new file mode 100644
index 0000000..4c4c5bd
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksPreferenceControllerTest.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+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.ContentResolver;
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.os.Looper;
+import android.provider.Settings;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.RestrictedSwitchPreference;
+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;
+
+@RunWith(AndroidJUnit4.class)
+public class AirplaneSafeNetworksPreferenceControllerTest {
+
+    private static final String KEY_AIRPLANE_SAFE_NETWORKS = "airplane_safe_networks";
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
+    private ContentResolver mResolver;
+    private PreferenceScreen mScreen;
+    private RestrictedSwitchPreference mPreference;
+    private AirplaneSafeNetworksPreferenceController mController;
+
+    @Mock
+    private WifiManager mWifiManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        final Context context = spy(ApplicationProvider.getApplicationContext());
+        mResolver = context.getContentResolver();
+        doReturn(mWifiManager).when(context).getSystemService(Context.WIFI_SERVICE);
+
+        mController = new AirplaneSafeNetworksPreferenceController(context, mock(Lifecycle.class));
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        final PreferenceManager preferenceManager = new PreferenceManager(context);
+        mScreen = preferenceManager.createPreferenceScreen(context);
+        mPreference = new RestrictedSwitchPreference(context);
+        mPreference.setKey(KEY_AIRPLANE_SAFE_NETWORKS);
+        mScreen.addPreference(mPreference);
+    }
+
+    @Test
+    public void isAvailable_airplaneModeOff_returnFalse() {
+        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, OFF);
+
+        mController.displayPreference(mScreen);
+        mController.onStart();
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_airplaneModeOn_returnTrue() {
+        Settings.Global.putInt(mResolver, Settings.Global.AIRPLANE_MODE_ON, ON);
+
+        mController.displayPreference(mScreen);
+        mController.onStart();
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isChecked_wifiStateDisabled_returnFalse() {
+        doReturn(WifiManager.WIFI_STATE_DISABLED).when(mWifiManager).getWifiState();
+
+        mController.displayPreference(mScreen);
+        mController.onStart();
+
+        assertThat(mPreference.isChecked()).isFalse();
+    }
+
+    @Test
+    public void isChecked_wifiStateEnabled_returnTrue() {
+        doReturn(WifiManager.WIFI_STATE_ENABLED).when(mWifiManager).getWifiState();
+
+        mController.displayPreference(mScreen);
+        mController.onStart();
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java b/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
new file mode 100644
index 0000000..a344ab6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/AirplaneSafeNetworksSliceTest.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.wifi.WifiManager;
+
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.widget.SliceLiveData;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.testutils.AirplaneModeRule;
+import com.android.settings.testutils.ResourcesUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(AndroidJUnit4.class)
+public class AirplaneSafeNetworksSliceTest {
+
+    @Rule
+    public MockitoRule mMocks = MockitoJUnit.rule();
+    @Rule
+    public AirplaneModeRule mAirplaneModeRule = new AirplaneModeRule();
+    @Mock
+    private WifiManager mWifiManager;
+
+    private Context mContext;
+    private AirplaneSafeNetworksSlice mAirplaneSafeNetworksSlice;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
+
+        // Set-up specs for SliceMetadata.
+        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+
+        mAirplaneSafeNetworksSlice = new AirplaneSafeNetworksSlice(mContext);
+    }
+
+    @Test
+    public void getSlice_airplaneModeOff_shouldBeNull() {
+        mAirplaneModeRule.setAirplaneMode(false);
+
+        assertThat(mAirplaneSafeNetworksSlice.getSlice()).isNull();
+    }
+
+    @Test
+    public void getSlice_wifiDisabled_shouldShowViewAirplaneSafeNetworks() {
+        mAirplaneModeRule.setAirplaneMode(true);
+        when(mWifiManager.isWifiEnabled()).thenReturn(false);
+
+        final Slice slice = mAirplaneSafeNetworksSlice.getSlice();
+
+        assertThat(slice).isNotNull();
+        final SliceItem sliceTitle =
+                SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
+        assertThat(sliceTitle.getText()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "view_airplane_safe_networks"));
+    }
+
+    @Test
+    public void getSlice_wifiEnabled_shouldShowTurnOffAirplaneMode() {
+        mAirplaneModeRule.setAirplaneMode(true);
+        when(mWifiManager.isWifiEnabled()).thenReturn(true);
+
+        final Slice slice = mAirplaneSafeNetworksSlice.getSlice();
+
+        assertThat(slice).isNotNull();
+        final SliceItem sliceTitle =
+                SliceMetadata.from(mContext, slice).getListContent().getHeader().getTitleItem();
+        assertThat(sliceTitle.getText()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "turn_off_airplane_mode"));
+    }
+
+    @Test
+    public void onNotifyChange_viewAirplaneSafeNetworks_shouldSetWifiEnabled() {
+        mAirplaneModeRule.setAirplaneMode(true);
+        when(mWifiManager.isWifiEnabled()).thenReturn(false);
+        Intent intent = mAirplaneSafeNetworksSlice.getIntent();
+
+        mAirplaneSafeNetworksSlice.onNotifyChange(intent);
+
+        verify(mWifiManager).setWifiEnabled(true);
+    }
+
+    @Test
+    public void onNotifyChange_turnOffAirplaneMode_shouldSetAirplaneModeOff() {
+        mAirplaneModeRule.setAirplaneMode(true);
+        when(mWifiManager.isWifiEnabled()).thenReturn(true);
+        Intent intent = mAirplaneSafeNetworksSlice.getIntent();
+
+        mAirplaneSafeNetworksSlice.onNotifyChange(intent);
+
+        assertThat(mAirplaneModeRule.isAirplaneModeOn()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/DataConnectivityListenerTest.java b/tests/unit/src/com/android/settings/network/DataConnectivityListenerTest.java
new file mode 100644
index 0000000..f2db2ef
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/DataConnectivityListenerTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.network;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.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.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkRequest;
+import android.os.Handler;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.telephony.DataConnectivityListener;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class DataConnectivityListenerTest {
+    @Mock
+    private DataConnectivityListener.Client mClient;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private Network mActiveNetwork;
+
+    private Context mContext;
+    private DataConnectivityListener mListener;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mConnectivityManager.getActiveNetwork()).thenReturn(mActiveNetwork);
+        mListener = new DataConnectivityListener(mContext, mClient);
+    }
+
+    @Test
+    public void registerNetworkCallback_listenerNotStart_doesNotRegister() {
+        verify(mConnectivityManager, never()).registerNetworkCallback(any(NetworkRequest.class),
+                any(ConnectivityManager.NetworkCallback.class), any(Handler.class));
+    }
+
+    @Test
+    public void registerNetworkCallback_listenerStart_doesRegister() {
+        mListener.start();
+        verify(mConnectivityManager).registerNetworkCallback(any(NetworkRequest.class),
+                eq(mListener), any(Handler.class));
+    }
+
+    @Test
+    public void onCapabilitiesChanged_notActiveNetwork_noCallback() {
+        Network changedNetwork = mock(Network.class);
+
+        mListener.onCapabilitiesChanged(changedNetwork, null);
+
+        verify(mClient, never()).onDataConnectivityChange();
+    }
+
+    @Test
+    public void onCapabilitiesChanged_activeNetwork_onDataConnectivityChangeFires() {
+        mListener.onCapabilitiesChanged(mActiveNetwork, null);
+
+        verify(mClient).onDataConnectivityChange();
+    }
+
+    @Test
+    public void onLosing_notActiveNetwork_onDataConnectivityChangeFires() {
+        Network changedNetwork = mock(Network.class);
+
+        mListener.onLosing(changedNetwork, 500);
+
+        verify(mClient).onDataConnectivityChange();
+    }
+
+    @Test
+    public void onLosing_activeNetwork_onDataConnectivityChangeFires() {
+        mListener.onLosing(mActiveNetwork, 500);
+
+        verify(mClient).onDataConnectivityChange();
+    }
+
+    @Test
+    public void onLost_notActiveNetwork_onDataConnectivityChangeFires() {
+        Network changedNetwork = mock(Network.class);
+
+        mListener.onLost(changedNetwork);
+
+        verify(mClient).onDataConnectivityChange();
+    }
+
+    @Test
+    public void onLost_activeNetwork_onDataConnectivityChangeFires() {
+        mListener.onLost(mActiveNetwork);
+
+        verify(mClient).onDataConnectivityChange();
+    }
+}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
new file mode 100644
index 0000000..05b92a8
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/EraseEuiccDataControllerTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class EraseEuiccDataControllerTest {
+
+    private static final String ERASE_EUICC_DATA_PREFERENCE_KEY = "erase_euicc_data";
+
+    private EraseEuiccDataController mController;
+
+    @Before
+    public void setUp() {
+        Context context = ApplicationProvider.getApplicationContext();
+        mController = new EraseEuiccDataController(context, ERASE_EUICC_DATA_PREFERENCE_KEY);
+    }
+
+    @Test
+    public void getAvailabilityStatus_byDefault_true() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/GlobalSettingsChangeListenerTest.java b/tests/unit/src/com/android/settings/network/GlobalSettingsChangeListenerTest.java
new file mode 100644
index 0000000..49cf60b
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/GlobalSettingsChangeListenerTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import android.content.Context;
+import android.os.Looper;
+import android.provider.Settings;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class GlobalSettingsChangeListenerTest {
+
+    @Mock
+    private Lifecycle mLifecycle;
+
+    private Context mContext;
+    private TestListener mTestListener;
+
+    private static final String SETTINGS_FIELD = Settings.Global.AIRPLANE_MODE_ON;
+
+    public class TestListener extends GlobalSettingsChangeListener {
+        TestListener(Looper looper, Context context, String field) {
+            super(looper, context, field);
+        }
+        @Override
+        public void onChanged(String field) {}
+    }
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mTestListener = spy(new TestListener(Looper.getMainLooper(), mContext, SETTINGS_FIELD));
+
+        doNothing().when(mLifecycle).addObserver(mTestListener);
+        doNothing().when(mLifecycle).removeObserver(mTestListener);
+    }
+
+    /*
+     * The method onChange is override from {@link ContentObserver}, and when the content change
+     * occurs will be called. And the method onChanged is subclass from
+     * {@link GlobalSettingsChangeListener}, it will be called when the onChange be called.
+     */
+    @Test
+    public void whenChanged_onChangedBeenCalled() {
+        mTestListener.onChange(false);
+
+        verify(mTestListener, times(1)).onChanged(SETTINGS_FIELD);
+    }
+
+    @Test
+    public void whenNotifyChangeBasedOnLifecycle_onStopEvent_onChangedNotCalled() {
+        mTestListener.notifyChangeBasedOn(mLifecycle);
+        mTestListener.onStart();
+
+        mTestListener.onChange(false);
+        verify(mTestListener, times(1)).onChanged(SETTINGS_FIELD);
+
+        mTestListener.onStop();
+
+        mTestListener.onChange(false);
+        verify(mTestListener, times(1)).onChanged(SETTINGS_FIELD);
+
+        mTestListener.onStart();
+
+        mTestListener.onChange(false);
+        verify(mTestListener, times(2)).onChanged(SETTINGS_FIELD);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
new file mode 100644
index 0000000..02e7de3
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.NetworkRequest;
+import android.net.NetworkScoreManager;
+import android.net.wifi.WifiManager;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class InternetPreferenceControllerTest {
+
+    private static final String TEST_SUMMARY = "test summary";
+
+    private Context mContext;
+    private InternetPreferenceController mController;
+    private PreferenceScreen mScreen;
+    private Preference mPreference;
+
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mContext.getSystemService(NetworkScoreManager.class))
+            .thenReturn(mock(NetworkScoreManager.class));
+        final WifiManager wifiManager = mock(WifiManager.class);
+        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(wifiManager);
+        when(wifiManager.getWifiState()).thenReturn(WifiManager.WIFI_STATE_DISABLED);
+
+        mController = new InternetPreferenceController(mContext);
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        final PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        mScreen = preferenceManager.createPreferenceScreen(mContext);
+        mPreference = new Preference(mContext);
+        mPreference.setKey(InternetPreferenceController.KEY_INTERNET_SETTINGS);
+        mScreen.addPreference(mPreference);
+    }
+
+    @Test
+    public void isAvailable_shouldBeTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void onResume_shouldRegisterCallback() {
+        mController.onResume();
+
+        verify(mContext).registerReceiver(any(BroadcastReceiver.class), any(IntentFilter.class));
+        verify(mConnectivityManager).registerNetworkCallback(
+                any(NetworkRequest.class),
+                any(ConnectivityManager.NetworkCallback.class),
+                any(Handler.class));
+    }
+
+    @Test
+    public void onPause_shouldUnregisterCallback() {
+        mController.onResume();
+        mController.onPause();
+
+        verify(mContext).unregisterReceiver(any(BroadcastReceiver.class));
+        verify(mConnectivityManager, times(2)).unregisterNetworkCallback(
+                any(ConnectivityManager.NetworkCallback.class));
+    }
+
+    @Test
+    public void onSummaryChanged_shouldUpdatePreferenceSummary() {
+        mController.displayPreference(mScreen);
+
+        mController.onSummaryChanged(TEST_SUMMARY);
+
+        assertThat(mPreference.getSummary()).isEqualTo(TEST_SUMMARY);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
new file mode 100644
index 0000000..c540512
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network;
+
+import static androidx.lifecycle.Lifecycle.Event;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.os.Looper;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.provider.Settings.Global;
+import android.telephony.PhoneStateListener;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class MobileNetworkPreferenceControllerTest {
+    private Context mContext;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mScreen;
+
+    @Mock
+    private LifecycleOwner mLifecycleOwner;
+    private LifecycleRegistry mLifecycleRegistry;
+    private MobileNetworkPreferenceController mController;
+    private Preference mPreference;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mPreferenceManager = new PreferenceManager(mContext);
+        mScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mPreference = new Preference(mContext);
+        mPreference.setKey(MobileNetworkPreferenceController.KEY_MOBILE_NETWORK_SETTINGS);
+
+        mLifecycleRegistry = new LifecycleRegistry(mLifecycleOwner);
+        when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry);
+    }
+
+    @Test
+    public void secondaryUser_prefIsNotAvailable() {
+        when(mUserManager.isAdminUser()).thenReturn(false);
+        when(mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE))
+            .thenReturn(true);
+
+        mController = new MobileNetworkPreferenceController(mContext);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void wifiOnly_prefIsNotAvailable() {
+        when(mUserManager.isAdminUser()).thenReturn(true);
+        when(mConnectivityManager.isNetworkSupported(ConnectivityManager.TYPE_MOBILE))
+            .thenReturn(false);
+
+        mController = new MobileNetworkPreferenceController(mContext);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @UiThreadTest
+    public void goThroughLifecycle_isAvailable_shouldListenToServiceChange() {
+        mController = spy(new MobileNetworkPreferenceController(mContext));
+        mLifecycleRegistry.addObserver(mController);
+        doReturn(true).when(mController).isAvailable();
+
+        mLifecycleRegistry.handleLifecycleEvent(Event.ON_START);
+        verify(mController).onStart();
+        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
+                PhoneStateListener.LISTEN_SERVICE_STATE);
+
+        mLifecycleRegistry.handleLifecycleEvent(Event.ON_STOP);
+        verify(mController).onStop();
+        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
+                PhoneStateListener.LISTEN_NONE);
+    }
+
+    @Test
+    @UiThreadTest
+    public void serviceStateChange_shouldUpdatePrefSummary() {
+        final String testCarrierName = "test";
+
+        mController = spy(new MobileNetworkPreferenceController(mContext));
+        mLifecycleRegistry.addObserver(mController);
+        doReturn(true).when(mController).isAvailable();
+
+        mScreen.addPreference(mPreference);
+
+        // Display pref and go through lifecycle to set up listener.
+        mController.displayPreference(mScreen);
+        mLifecycleRegistry.handleLifecycleEvent(Event.ON_START);
+        verify(mController).onStart();
+        verify(mTelephonyManager).listen(mController.mPhoneStateListener,
+                PhoneStateListener.LISTEN_SERVICE_STATE);
+
+        doReturn(testCarrierName).when(mController).getSummary();
+
+        mController.mPhoneStateListener.onServiceStateChanged(null);
+
+        // Carrier name should be set.
+        Assert.assertEquals(mPreference.getSummary(), testCarrierName);
+    }
+
+    @Test
+    public void airplaneModeTurnedOn_shouldDisablePreference() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Global.AIRPLANE_MODE_ON, 1);
+        mController = spy(new MobileNetworkPreferenceController(mContext));
+        final RestrictedPreference mPreference = new RestrictedPreference(mContext);
+        mController.updateState(mPreference);
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void airplaneModeTurnedOffAndNoUserRestriction_shouldEnablePreference() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Global.AIRPLANE_MODE_ON, 0);
+        mController = spy(new MobileNetworkPreferenceController(mContext));
+        final RestrictedPreference mPreference = new RestrictedPreference(mContext);
+        mPreference.setDisabledByAdmin(null);
+        mController.updateState(mPreference);
+        assertThat(mPreference.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void airplaneModeTurnedOffAndHasUserRestriction_shouldDisablePreference() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Global.AIRPLANE_MODE_ON, 0);
+        mController = spy(new MobileNetworkPreferenceController(mContext));
+        final RestrictedPreference mPreference = new RestrictedPreference(mContext);
+        mPreference.setDisabledByAdmin(EnforcedAdmin.MULTIPLE_ENFORCED_ADMIN);
+        mController.updateState(mPreference);
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
new file mode 100644
index 0000000..9b38e5b
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/MobilePlanPreferenceControllerTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.testutils.ResourcesUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class MobilePlanPreferenceControllerTest {
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+    }
+
+    @Test
+    public void testNoProvisionStringFormattedCorrectly() {
+        final String operator = "test_operator";
+
+        assertThat(
+                ResourcesUtils.getResourcesString(mContext, "mobile_no_provisioning_url", operator))
+                .contains(operator);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java b/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
new file mode 100644
index 0000000..cdb82a6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/MultiNetworkHeaderControllerTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+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.os.Looper;
+import android.telephony.SubscriptionManager;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.wifi.WifiConnectionPreferenceController;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+
+@RunWith(AndroidJUnit4.class)
+public class MultiNetworkHeaderControllerTest {
+    private static final String KEY_HEADER = "multi_network_header";
+    private static final int EXPANDED_CHILDREN_COUNT = 5;
+
+    @Mock
+    private PreferenceCategory mPreferenceCategory;
+    @Mock
+    private WifiConnectionPreferenceController mWifiController;
+    @Mock
+    private SubscriptionsPreferenceController mSubscriptionsController;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private Lifecycle mLifecycle;
+
+    private Context mContext;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mPreferenceScreen;
+    private MultiNetworkHeaderController mHeaderController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+
+        mHeaderController = new MultiNetworkHeaderController(mContext, KEY_HEADER) {
+            @Override
+            WifiConnectionPreferenceController createWifiController(Lifecycle lifecycle) {
+                return mWifiController;
+            }
+
+            @Override
+            SubscriptionsPreferenceController createSubscriptionsController(Lifecycle lifecycle) {
+                return mSubscriptionsController;
+            }
+        };
+
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mPreferenceManager = new PreferenceManager(mContext);
+        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mPreferenceScreen.setInitialExpandedChildrenCount(EXPANDED_CHILDREN_COUNT);
+        when(mPreferenceCategory.getKey()).thenReturn(KEY_HEADER);
+        when(mPreferenceCategory.getPreferenceCount()).thenReturn(3);
+        mPreferenceScreen.addPreference(mPreferenceCategory);
+    }
+
+    @Test
+    public void isAvailable_beforeInitIsCalled_notAvailable() {
+        assertThat(mHeaderController.isAvailable()).isFalse();
+    }
+
+    // When calling displayPreference, the header itself should only be visible if the
+    // subscriptions controller says it is available. This is a helper for test cases of this logic.
+    private void displayPreferenceTest(boolean wifiAvailable, boolean subscriptionsAvailable,
+            boolean setVisibleExpectedValue) {
+        when(mWifiController.isAvailable()).thenReturn(wifiAvailable);
+        when(mSubscriptionsController.isAvailable()).thenReturn(subscriptionsAvailable);
+
+        mHeaderController.init(mLifecycle);
+        mHeaderController.displayPreference(mPreferenceScreen);
+        Assert.assertEquals(mPreferenceCategory.isVisible(), setVisibleExpectedValue);
+    }
+
+    @Test
+    public void displayPreference_bothNotAvailable_categoryIsNotVisible() {
+        displayPreferenceTest(false, false, false);
+    }
+
+    @Test
+    public void displayPreference_wifiAvailableButNotSubscriptions_categoryIsNotVisible() {
+        displayPreferenceTest(true, false, false);
+    }
+
+    @Test
+    public void displayPreference_subscriptionsAvailableButNotWifi_categoryIsVisible() {
+        displayPreferenceTest(false, true, true);
+    }
+
+    @Test
+    public void displayPreference_bothAvailable_categoryIsVisible() {
+        displayPreferenceTest(true, true, true);
+    }
+
+    @Test
+    public void onChildUpdated_subscriptionsBecameAvailable_categoryIsVisible() {
+        when(mSubscriptionsController.isAvailable()).thenReturn(false);
+        mHeaderController.init(mLifecycle);
+        mHeaderController.displayPreference(mPreferenceScreen);
+
+        when(mSubscriptionsController.isAvailable()).thenReturn(true);
+        mHeaderController.onChildrenUpdated();
+
+        Assert.assertTrue(mPreferenceCategory.isVisible());
+        assertThat(mPreferenceScreen.getInitialExpandedChildrenCount()).isEqualTo(
+                EXPANDED_CHILDREN_COUNT + mPreferenceCategory.getPreferenceCount());
+    }
+
+    @Test
+    public void onChildUpdated_subscriptionsBecameUnavailable_categoryIsNotVisible() {
+        when(mSubscriptionsController.isAvailable()).thenReturn(true);
+        mHeaderController.init(mLifecycle);
+        mHeaderController.displayPreference(mPreferenceScreen);
+
+        when(mSubscriptionsController.isAvailable()).thenReturn(false);
+        mHeaderController.onChildrenUpdated();
+
+        Assert.assertFalse(mPreferenceCategory.isVisible());
+        assertThat(mPreferenceScreen.getInitialExpandedChildrenCount()).isEqualTo(
+                EXPANDED_CHILDREN_COUNT);
+    }
+
+    @Test
+    public void onChildUpdated_noExpandedChildCountAndAvailable_doesNotSetExpandedCount() {
+        mPreferenceScreen.setInitialExpandedChildrenCount(Integer.MAX_VALUE);
+
+        when(mSubscriptionsController.isAvailable()).thenReturn(false);
+        mHeaderController.init(mLifecycle);
+        mHeaderController.displayPreference(mPreferenceScreen);
+
+        when(mSubscriptionsController.isAvailable()).thenReturn(true);
+        mHeaderController.onChildrenUpdated();
+
+        // Check that setInitialExpandedChildrenCount was never called.
+        Assert.assertEquals(mPreferenceScreen.getInitialExpandedChildrenCount(), Integer.MAX_VALUE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/unit/src/com/android/settings/network/NetworkDashboardFragmentTest.java
new file mode 100644
index 0000000..4258b2c
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.settingslib.drawer.CategoryKey;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class NetworkDashboardFragmentTest {
+
+    private Context mContext;
+
+    private NetworkDashboardFragment mFragment;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+
+        instrumentation.runOnMainSync(() -> {
+            mFragment = new NetworkDashboardFragment();
+        });
+    }
+
+    @Test
+    public void getCategoryKey_isNetwork() {
+        assertThat(mFragment.getCategoryKey()).isEqualTo(CategoryKey.CATEGORY_NETWORK);
+    }
+
+    @Test
+    public void getXmlResourcesToIndex_shouldIncludeFragmentXml() {
+        final List<SearchIndexableResource> indexRes =
+                NetworkDashboardFragment.SEARCH_INDEX_DATA_PROVIDER.getXmlResourcesToIndex(
+                        mContext,
+                        true /* enabled */);
+
+        assertThat(indexRes).hasSize(1);
+        assertThat(indexRes.get(0).xmlResId).isEqualTo(mFragment.getPreferenceScreenResId());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/NetworkMobileProviderControllerTest.java b/tests/unit/src/com/android/settings/network/NetworkMobileProviderControllerTest.java
new file mode 100644
index 0000000..31c68da
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/NetworkMobileProviderControllerTest.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+import static com.android.settings.network.NetworkMobileProviderController.PREF_KEY_PROVIDER_MOBILE_NETWORK;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Looper;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+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;
+
+/**
+ * Unit test for NetworkMobileProviderController.
+ *
+ * {@link NetworkMobileProviderController} is used to show subscription status on internet page for
+ * provider model. This original class can refer to {@link MultiNetworkHeaderController}, and
+ * NetworkMobileProviderControllerTest can also refer to {@link MultiNetworkHeaderControllerTest}.
+ */
+@RunWith(AndroidJUnit4.class)
+public class NetworkMobileProviderControllerTest {
+
+    private static final int EXPANDED_CHILDREN_COUNT = 3;
+
+    @Mock
+    private Lifecycle mLifecycle;
+    @Mock
+    private PreferenceCategory mPreferenceCategory;
+    @Mock
+    private SubscriptionsPreferenceController mSubscriptionsController;
+
+    private Context mContext;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mPreferenceScreen;
+    private NetworkMobileProviderController mNetworkMobileProviderController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        when(mPreferenceCategory.getKey()).thenReturn(PREF_KEY_PROVIDER_MOBILE_NETWORK);
+        when(mPreferenceCategory.getPreferenceCount()).thenReturn(3);
+
+        mContext = ApplicationProvider.getApplicationContext();
+        mNetworkMobileProviderController =
+                new NetworkMobileProviderController(mContext, PREF_KEY_PROVIDER_MOBILE_NETWORK) {
+            @Override
+            SubscriptionsPreferenceController createSubscriptionsController(
+                    Lifecycle lifecycle) {
+                return mSubscriptionsController;
+            }
+        };
+
+        mPreferenceManager = new PreferenceManager(mContext);
+        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mPreferenceScreen.setInitialExpandedChildrenCount(EXPANDED_CHILDREN_COUNT);
+        mPreferenceScreen.addPreference(mPreferenceCategory);
+    }
+
+    @Test
+    public void testDisplayPreference_subscriptionsControllerAvailable() {
+        when(mSubscriptionsController.isAvailable()).thenReturn(true);
+        setupNetworkMobileProviderController();
+
+        assertTrue(mPreferenceCategory.isVisible());
+    }
+
+    @Test
+    public void testDisplayPreference_subscriptionsControllerUnAvailable() {
+        when(mSubscriptionsController.isAvailable()).thenReturn(false);
+        setupNetworkMobileProviderController();
+
+        assertFalse(mPreferenceCategory.isVisible());
+    }
+
+    @Test
+    public void testGetAvailabilityStatus_subscriptionsControllerIsNull() {
+        when(mSubscriptionsController.isAvailable()).thenReturn(false);
+        mNetworkMobileProviderController = new NetworkMobileProviderController(mContext,
+                PREF_KEY_PROVIDER_MOBILE_NETWORK) {
+            @Override
+            SubscriptionsPreferenceController createSubscriptionsController(Lifecycle lifecycle) {
+                return null;
+            }
+        };
+        setupNetworkMobileProviderController();
+
+        final int result = mNetworkMobileProviderController.getAvailabilityStatus();
+
+        assertEquals(result, CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void testGetAvailabilityStatus_subscriptionsControllerAvailable() {
+        when(mSubscriptionsController.isAvailable()).thenReturn(true);
+        setupNetworkMobileProviderController();
+
+        final int result = mNetworkMobileProviderController.getAvailabilityStatus();
+
+        assertEquals(result, AVAILABLE);
+    }
+
+    @Test
+    public void testOnChildUpdated_subscriptionsControllerAvailable_categoryIsVisible() {
+        when(mSubscriptionsController.isAvailable()).thenReturn(true);
+        setupNetworkMobileProviderController();
+
+        mNetworkMobileProviderController.onChildrenUpdated();
+
+        assertTrue(mPreferenceCategory.isVisible());
+        assertThat(mPreferenceScreen.getInitialExpandedChildrenCount()).isEqualTo(
+                EXPANDED_CHILDREN_COUNT + mPreferenceCategory.getPreferenceCount());
+    }
+
+    @Test
+    public void testOnChildUpdated_subscriptionsControllerUnavailable_categoryIsInvisible() {
+        when(mSubscriptionsController.isAvailable()).thenReturn(false);
+        setupNetworkMobileProviderController();
+
+        mNetworkMobileProviderController.onChildrenUpdated();
+
+        assertFalse(mPreferenceCategory.isVisible());
+        assertThat(mPreferenceScreen.getInitialExpandedChildrenCount()).isEqualTo(
+                EXPANDED_CHILDREN_COUNT);
+    }
+
+    @Test
+    public void testOnChildUpdated_noExpandedChildCountAndAvailable_doesNotSetExpandedCount() {
+        when(mSubscriptionsController.isAvailable()).thenReturn(true);
+        mPreferenceScreen.setInitialExpandedChildrenCount(Integer.MAX_VALUE);
+        setupNetworkMobileProviderController();
+
+        mNetworkMobileProviderController.onChildrenUpdated();
+
+        assertEquals(mPreferenceScreen.getInitialExpandedChildrenCount(), Integer.MAX_VALUE);
+    }
+
+    private void setupNetworkMobileProviderController() {
+        mNetworkMobileProviderController.init(mLifecycle);
+        mNetworkMobileProviderController.displayPreference(mPreferenceScreen);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java b/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java
new file mode 100644
index 0000000..8444f11
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static androidx.lifecycle.Lifecycle.Event;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertTrue;
+
+import android.content.Context;
+import android.os.Looper;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.text.TextUtils;
+
+import com.android.settings.testutils.ResourcesUtils;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.RestrictedPreference;
+
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+@RunWith(AndroidJUnit4.class)
+public class NetworkProviderCallsSmsControllerTest {
+
+    private static final int SUB_ID_1 = 1;
+    private static final int SUB_ID_2 = 2;
+    private static final String KEY_PREFERENCE_CALLS_SMS = "calls_and_sms";
+    private static final String DISPLAY_NAME_1 = "Sub 1";
+    private static final String DISPLAY_NAME_2 = "Sub 2";
+
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo1;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo2;
+    @Mock
+    private Lifecycle mLifecycle;
+    @Mock
+    private LifecycleOwner mLifecycleOwner;
+    private LifecycleRegistry mLifecycleRegistry;
+
+    private MockNetworkProviderCallsSmsController mController;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mPreferenceScreen;
+    private RestrictedPreference mPreference;
+
+    private Context mContext;
+
+    /**
+     * Mock the NetworkProviderCallsSmsController that allows allows one to set a default voice
+     * and SMS subscription ID.
+     */
+    private class MockNetworkProviderCallsSmsController extends
+            com.android.settings.network.NetworkProviderCallsSmsController {
+        public MockNetworkProviderCallsSmsController(Context context, Lifecycle lifecycle) {
+            super(context, lifecycle);
+        }
+
+        private int mDefaultVoiceSubscriptionId;
+        private int mDefaultSmsSubscriptionId;
+
+        @Override
+        protected int getDefaultVoiceSubscriptionId() {
+            return mDefaultVoiceSubscriptionId;
+        }
+
+        @Override
+        protected int getDefaultSmsSubscriptionId() {
+            return mDefaultSmsSubscriptionId;
+        }
+
+        public void setDefaultVoiceSubscriptionId(int subscriptionId) {
+            mDefaultVoiceSubscriptionId = subscriptionId;
+        }
+
+        public void setDefaultSmsSubscriptionId(int subscriptionId) {
+            mDefaultSmsSubscriptionId = subscriptionId;
+        }
+    }
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        mPreferenceManager = new PreferenceManager(mContext);
+        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mPreference = new RestrictedPreference(mContext);
+        mPreference.setKey(KEY_PREFERENCE_CALLS_SMS);
+        mController = new MockNetworkProviderCallsSmsController(mContext, mLifecycle);
+
+        mLifecycleRegistry = new LifecycleRegistry(mLifecycleOwner);
+        when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry);
+    }
+
+    private void displayPreferenceWithLifecycle() {
+        mLifecycleRegistry.addObserver(mController);
+        mPreferenceScreen.addPreference(mPreference);
+        mController.displayPreference(mPreferenceScreen);
+        mLifecycleRegistry.handleLifecycleEvent(Event.ON_RESUME);
+    }
+
+    private void setupSubscriptionInfoList(int subId, String displayName,
+                                           SubscriptionInfo subscriptionInfo) {
+        when(subscriptionInfo.getSubscriptionId()).thenReturn(subId);
+        doReturn(subscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(subId);
+        when(subscriptionInfo.getDisplayName()).thenReturn(displayName);
+    }
+
+    private String setSummaryResId(String resName) {
+        return ResourcesUtils.getResourcesString(mContext, resName);
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSummary_noSim_returnNoSim() {
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(new ArrayList<>());
+        displayPreferenceWithLifecycle();
+
+        assertTrue(TextUtils.equals(mController.getSummary(),
+                setSummaryResId("calls_sms_no_sim")));
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSummary_invalidSubId_returnUnavailable() {
+        setupSubscriptionInfoList(SubscriptionManager.INVALID_SUBSCRIPTION_ID, DISPLAY_NAME_1,
+                mSubscriptionInfo1);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1));
+        displayPreferenceWithLifecycle();
+
+        final StringBuilder summary = new StringBuilder();
+        summary.append(DISPLAY_NAME_1)
+                .append(" (")
+                .append(setSummaryResId("calls_sms_unavailable"))
+                .append(")");
+
+        assertTrue(TextUtils.equals(mController.getSummary(), summary));
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSummary_oneIsInvalidSubIdTwoIsValidSubId_returnOneIsUnavailable() {
+        setupSubscriptionInfoList(SubscriptionManager.INVALID_SUBSCRIPTION_ID, DISPLAY_NAME_1,
+                mSubscriptionInfo1);
+        setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+        displayPreferenceWithLifecycle();
+
+        final StringBuilder summary = new StringBuilder();
+        summary.append(DISPLAY_NAME_1)
+                .append(" (")
+                .append(setSummaryResId("calls_sms_unavailable"))
+                .append(")")
+                .append(", ")
+                .append(DISPLAY_NAME_2);
+
+        assertTrue(TextUtils.equals(mController.getSummary(), summary));
+    }
+
+
+
+    @Test
+    @UiThreadTest
+    public void getSummary_oneSubscription_returnDisplayName() {
+        setupSubscriptionInfoList(SUB_ID_1, DISPLAY_NAME_1, mSubscriptionInfo1);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1));
+        displayPreferenceWithLifecycle();
+
+        assertThat(mPreference.getSummary()).isEqualTo(DISPLAY_NAME_1);
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSummary_allSubscriptionsHaveNoPreferredStatus_returnDisplayName() {
+        setupSubscriptionInfoList(SUB_ID_1, DISPLAY_NAME_1, mSubscriptionInfo1);
+        setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+        displayPreferenceWithLifecycle();
+
+        final StringBuilder summary = new StringBuilder();
+        summary.append(DISPLAY_NAME_1).append(", ").append(DISPLAY_NAME_2);
+
+        assertTrue(TextUtils.equals(mController.getSummary(), summary));
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSummary_oneSubscriptionsIsCallPreferredTwoIsSmsPreferred_returnStatus() {
+
+        mController.setDefaultVoiceSubscriptionId(SUB_ID_1);
+        mController.setDefaultSmsSubscriptionId(SUB_ID_2);
+
+        setupSubscriptionInfoList(SUB_ID_1, DISPLAY_NAME_1, mSubscriptionInfo1);
+        setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+        displayPreferenceWithLifecycle();
+
+        final StringBuilder summary = new StringBuilder();
+        summary.append(DISPLAY_NAME_1)
+                .append(" (")
+                .append(setSummaryResId("calls_sms_calls_preferred"))
+                .append(")")
+                .append(", ")
+                .append(DISPLAY_NAME_2)
+                .append(" (")
+                .append(setSummaryResId("calls_sms_sms_preferred"))
+                .append(")");
+
+        assertTrue(TextUtils.equals(mController.getSummary(), summary));
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSummary_oneSubscriptionsIsSmsPreferredTwoIsCallPreferred_returnStatus() {
+
+        mController.setDefaultVoiceSubscriptionId(SUB_ID_2);
+        mController.setDefaultSmsSubscriptionId(SUB_ID_1);
+
+        setupSubscriptionInfoList(SUB_ID_1, DISPLAY_NAME_1, mSubscriptionInfo1);
+        setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+        displayPreferenceWithLifecycle();
+
+        final StringBuilder summary = new StringBuilder();
+        summary.append(DISPLAY_NAME_1)
+                .append(" (")
+                .append(setSummaryResId("calls_sms_sms_preferred"))
+                .append(")")
+                .append(", ")
+                .append(DISPLAY_NAME_2)
+                .append(" (")
+                .append(setSummaryResId("calls_sms_calls_preferred"))
+                .append(")");
+
+        assertTrue(TextUtils.equals(mController.getSummary(), summary));
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSummary_oneSubscriptionsIsSmsPreferredAndIsCallPreferred_returnStatus() {
+
+        mController.setDefaultVoiceSubscriptionId(SUB_ID_1);
+        mController.setDefaultSmsSubscriptionId(SUB_ID_1);
+
+        setupSubscriptionInfoList(SUB_ID_1, DISPLAY_NAME_1, mSubscriptionInfo1);
+        setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+        displayPreferenceWithLifecycle();
+
+        final StringBuilder summary = new StringBuilder();
+        summary.append(DISPLAY_NAME_1)
+                .append(" (")
+                .append(setSummaryResId("calls_sms_preferred"))
+                .append(")")
+                .append(", ")
+                .append(DISPLAY_NAME_2);
+
+        assertTrue(TextUtils.equals(mController.getSummary(), summary));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsFragmentTest.java b/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsFragmentTest.java
new file mode 100644
index 0000000..8327d22
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsFragmentTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.os.Looper;
+import android.provider.SearchIndexableResource;
+import android.util.FeatureFlagUtils;
+
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class NetworkProviderCallsSmsFragmentTest {
+
+    private Context mContext;
+    private NetworkProviderCallsSmsFragment mNetworkProviderCallsSmsFragment;
+    private List<String> mPreferenceKeyList;
+
+    @Before
+    @UiThreadTest
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        mNetworkProviderCallsSmsFragment = new NetworkProviderCallsSmsFragment();
+    }
+
+    @Test
+    @UiThreadTest
+    public void isPageSearchEnabled_providerModelEnable_shouldIncludeFragmentXml() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true);
+        mPreferenceKeyList =
+                NetworkProviderCallsSmsFragment.SEARCH_INDEX_DATA_PROVIDER
+                        .getNonIndexableKeys(mContext);
+        assertThat(mPreferenceKeyList).doesNotContain(
+                NetworkProviderCallsSmsFragment.KEY_PREFERENCE_CALLS);
+        assertThat(mPreferenceKeyList).doesNotContain(
+                NetworkProviderCallsSmsFragment.KEY_PREFERENCE_SMS);
+    }
+
+    @Test
+    @UiThreadTest
+    public void isPageSearchEnabled_providerModelDisable_shouldNotIncludeFragmentXml() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, false);
+        mPreferenceKeyList =
+                NetworkProviderCallsSmsFragment.SEARCH_INDEX_DATA_PROVIDER
+                        .getNonIndexableKeys(mContext);
+        assertThat(mPreferenceKeyList).contains(NetworkProviderCallsSmsFragment
+                .KEY_PREFERENCE_CALLS);
+        assertThat(mPreferenceKeyList).contains(NetworkProviderCallsSmsFragment
+                .KEY_PREFERENCE_SMS);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
new file mode 100644
index 0000000..542d2ff
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+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 static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.net.NetworkScoreManager;
+import android.net.NetworkScorerAppData;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Collections;
+
+@RunWith(AndroidJUnit4.class)
+public class NetworkScorerPickerPreferenceControllerTest {
+
+    private static final String TEST_SCORER_PACKAGE = "Test Package";
+    private static final String TEST_SCORER_CLASS = "Test Class";
+    private static final String TEST_SCORER_LABEL = "Test Label";
+
+    private Context mContext;
+    @Mock
+    private NetworkScoreManager mNetworkScorer;
+
+    private NetworkScorerPickerPreferenceController mController;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mNetworkScorer).when(mContext).getSystemService(Context.NETWORK_SCORE_SERVICE);
+
+        mController = new NetworkScorerPickerPreferenceController(mContext, "test_key");
+    }
+
+    @Test
+    public void testIsAvailable_shouldAlwaysReturnTrue() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void updateState_preferenceSetSummaryAsActiveScorerLabel() {
+
+        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
+
+        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
+                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
+                null /* networkAvailableNotificationChannelId */);
+
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.singletonList(scorerAppData));
+
+        when(mNetworkScorer.getActiveScorer()).thenReturn(scorerAppData);
+
+        Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        verify(preference).setSummary(TEST_SCORER_LABEL);
+    }
+
+    @Test
+    public void updateState_scorersAvailable_noActiveScorer_preferenceSetSummaryToNone() {
+        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
+        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
+                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
+                null /* networkAvailableNotificationChannelId */);
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.singletonList(scorerAppData));
+        when(mNetworkScorer.getActiveScorer()).thenReturn(null);
+
+        Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        Context context = ApplicationProvider.getApplicationContext();
+
+        verify(preference).setSummary(
+                resourceString("network_scorer_picker_none_preference"));
+    }
+
+    @Test
+    public void updateState_scorersAvailable_preferenceEnabled() {
+        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
+        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
+                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
+                null /* networkAvailableNotificationChannelId */);
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.singletonList(scorerAppData));
+
+        Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        verify(preference).setEnabled(true);
+    }
+
+    @Test
+    public void updateState_noScorersAvailable_preferenceDisabled() {
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.emptyList());
+        Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        verify(preference).setEnabled(false);
+        verify(preference).setSummary(null);
+    }
+
+    public int resourceId(String type, String name) {
+        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
+    }
+
+    public String resourceString(String name) {
+        return mContext.getResources().getString(resourceId("string", name));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/OWNERS b/tests/unit/src/com/android/settings/network/OWNERS
new file mode 100644
index 0000000..6e4c4a4
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/OWNERS
@@ -0,0 +1 @@
+include /src/com/android/settings/network/OWNERS
diff --git a/tests/unit/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java b/tests/unit/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java
new file mode 100644
index 0000000..e07a8f1
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/PreferredNetworkModeContentObserverTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.test.mock.MockContentResolver;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class PreferredNetworkModeContentObserverTest {
+
+    private static final int SUB_ID = 1;
+
+    private Context mContext;
+    private MockContentResolver mResolver;
+    private PreferredNetworkModeContentObserver mPreferredNetworkModeContentObserver;
+
+    @Mock
+    private PreferredNetworkModeContentObserver.OnPreferredNetworkModeChangedListener mListener;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+
+        mResolver = spy(new MockContentResolver(mContext));
+        when(mContext.getContentResolver()).thenReturn(mResolver);
+        mPreferredNetworkModeContentObserver =
+                spy(new PreferredNetworkModeContentObserver(null));
+    }
+
+    @Test
+    public void onChange_shouldCallListener() {
+        mPreferredNetworkModeContentObserver.mListener = mListener;
+        mPreferredNetworkModeContentObserver.onChange(true);
+
+        verify(mListener).onPreferredNetworkModeChanged();
+    }
+
+    @Test
+    public void register_shouldRegisterContentObserver() {
+        mPreferredNetworkModeContentObserver.register(mContext, SUB_ID);
+
+        verify(mResolver).registerContentObserver(
+                Settings.Global.getUriFor(Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID), false,
+                mPreferredNetworkModeContentObserver);
+    }
+
+    @Test
+    public void unregister_shouldUnregisterContentObserver() {
+        mPreferredNetworkModeContentObserver.unregister(mContext);
+
+        verify(mResolver).unregisterContentObserver(mPreferredNetworkModeContentObserver);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
new file mode 100644
index 0000000..abbc2ec
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
@@ -0,0 +1,307 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static junit.framework.Assert.assertEquals;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.Uri;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.slice.Slice;
+import androidx.slice.builders.GridRowBuilder;
+import androidx.slice.builders.GridRowBuilder.CellBuilder;
+import androidx.slice.builders.ListBuilder;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.Utils;
+import com.android.settings.slices.CustomSliceable;
+import com.android.settings.testutils.ResourcesUtils;
+import com.android.settings.wifi.slice.WifiSliceItem;
+import com.android.wifitrackerlib.WifiEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class ProviderModelSliceHelperTest {
+    private Context mContext;
+    private MockProviderModelSliceHelper mProviderModelSliceHelper;
+    private PersistableBundle mBundle;
+    private Network mNetwork;
+    private NetworkCapabilities mNetworkCapabilities;
+
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private ServiceState mServiceState;
+    @Mock
+    private WifiSliceItem mWifiSliceItem1;
+    @Mock
+    private WifiSliceItem mWifiSliceItem2;
+    @Mock
+    private SubscriptionInfo mDefaultDataSubscriptionInfo;
+    @Mock
+    private Drawable mDrawableWithSignalStrength;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mBundle = new PersistableBundle();
+        mNetwork = new Network(anyInt());
+
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                mCarrierConfigManager);
+        when(mCarrierConfigManager.getConfigForSubId(anyInt())).thenReturn(mBundle);
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mConnectivityManager.getActiveNetwork()).thenReturn(mNetwork);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
+
+        TestCustomSliceable testCustomSliceable = new TestCustomSliceable();
+        mProviderModelSliceHelper = new MockProviderModelSliceHelper(mContext, testCustomSliceable);
+    }
+
+    @Test
+    public void createMessageGridRow_inputTheResourceId_verifyTitle() {
+        int messageResId = ResourcesUtils.getResourcesId(mContext, "string",
+                "non_carrier_network_unavailable");
+        CharSequence title = ResourcesUtils.getResourcesString(mContext,
+                "non_carrier_network_unavailable");
+
+        GridRowBuilder testGridRow = mProviderModelSliceHelper.createMessageGridRow(messageResId);
+        List<CellBuilder> cellItem = testGridRow.getCells();
+
+        assertThat(cellItem.get(0).getTitle()).isEqualTo(title);
+    }
+
+    @Test
+    public void getConnectedWifiItem_inputListInvolveOneConnectedWifiItem_verifyReturnItem() {
+        when(mWifiSliceItem1.getConnectedState()).thenReturn(WifiEntry.CONNECTED_STATE_CONNECTED);
+        when(mWifiSliceItem2.getConnectedState()).thenReturn(
+                WifiEntry.CONNECTED_STATE_DISCONNECTED);
+        List<WifiSliceItem> wifiList = new ArrayList<>();
+        wifiList.add(mWifiSliceItem1);
+        wifiList.add(mWifiSliceItem2);
+
+        WifiSliceItem testItem = mProviderModelSliceHelper.getConnectedWifiItem(wifiList);
+
+        assertThat(testItem).isNotNull();
+        assertEquals(mWifiSliceItem1, testItem);
+    }
+
+    @Test
+    public void getConnectedWifiItem_inputListInvolveNoConnectedWifiItem_verifyReturnItem() {
+        when(mWifiSliceItem1.getConnectedState()).thenReturn(
+                WifiEntry.CONNECTED_STATE_DISCONNECTED);
+        when(mWifiSliceItem2.getConnectedState()).thenReturn(
+                WifiEntry.CONNECTED_STATE_DISCONNECTED);
+        List<WifiSliceItem> wifiList = new ArrayList<>();
+        wifiList.add(mWifiSliceItem1);
+        wifiList.add(mWifiSliceItem2);
+
+        WifiSliceItem testItem = mProviderModelSliceHelper.getConnectedWifiItem(wifiList);
+
+        assertThat(testItem).isNull();
+    }
+
+    @Test
+    public void getConnectedWifiItem_inputNull_verifyReturnItem() {
+        List<WifiSliceItem> wifiList = null;
+
+        WifiSliceItem testItem = mProviderModelSliceHelper.getConnectedWifiItem(wifiList);
+
+        assertThat(testItem).isNull();
+    }
+
+    @Test
+    public void createCarrierRow_hasDefaultDataSubscriptionId_verifyTitle() {
+        String expectDisplayName = "Name1";
+        int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+        when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
+                mDefaultDataSubscriptionInfo);
+        when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+        mBundle.putBoolean(CarrierConfigManager.KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false);
+
+        ListBuilder.RowBuilder testRowBuild = mProviderModelSliceHelper.createCarrierRow();
+
+        assertThat(testRowBuild.getTitle()).isEqualTo(expectDisplayName);
+    }
+
+    @Test
+    public void isNoCarrierData_mobileDataOnAndNoData_returnTrue() {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        when(mTelephonyManager.getDataState()).thenReturn(mTelephonyManager.DATA_DISCONNECTED);
+        when(mTelephonyManager.getServiceState()).thenReturn(mServiceState);
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+
+        assertThat(mProviderModelSliceHelper.isNoCarrierData()).isTrue();
+    }
+
+    @Test
+    public void isNoCarrierData_mobileDataOffAndOutOfService_returnTrue() {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(false);
+        when(mTelephonyManager.getDataState()).thenReturn(mTelephonyManager.DATA_DISCONNECTED);
+        when(mTelephonyManager.getServiceState()).thenReturn(mServiceState);
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+
+        assertThat(mProviderModelSliceHelper.isNoCarrierData()).isTrue();
+    }
+
+    @Test
+    public void isNoCarrierData_mobileDataOnAndDataConnected_returnFalse() {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        when(mTelephonyManager.getDataState()).thenReturn(mTelephonyManager.DATA_CONNECTED);
+        when(mTelephonyManager.getServiceState()).thenReturn(mServiceState);
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+
+        assertThat(mProviderModelSliceHelper.isNoCarrierData()).isFalse();
+    }
+
+    @Test
+    public void isNoCarrierData_mobileDataOffAndVoiceIsInService_returnFalse() {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(false);
+        when(mTelephonyManager.getDataState()).thenReturn(mTelephonyManager.DATA_DISCONNECTED);
+        when(mTelephonyManager.getServiceState()).thenReturn(mServiceState);
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+
+        assertThat(mProviderModelSliceHelper.isNoCarrierData()).isFalse();
+    }
+
+    @Test
+    public void getMobileDrawable_noCarrierData_getMobileDrawable() throws Throwable {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(false);
+        when(mTelephonyManager.getDataState()).thenReturn(mTelephonyManager.DATA_DISCONNECTED);
+        when(mTelephonyManager.getServiceState()).thenReturn(mServiceState);
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+        when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
+                mDefaultDataSubscriptionInfo);
+        when(mConnectivityManager.getActiveNetwork()).thenReturn(null);
+        Drawable expectDrawable = mock(Drawable.class);
+
+        assertThat(mProviderModelSliceHelper.getMobileDrawable(expectDrawable)).isEqualTo(
+                expectDrawable);
+    }
+
+    @Test
+    public void getMobileDrawable_hasCarrierDataAndDataIsOnCellular_getMobileDrawable()
+            throws Throwable {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        when(mTelephonyManager.getDataState()).thenReturn(mTelephonyManager.DATA_CONNECTED);
+        when(mTelephonyManager.getServiceState()).thenReturn(mServiceState);
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+        Drawable drawable = mock(Drawable.class);
+        int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+        when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
+                mDefaultDataSubscriptionInfo);
+        addNetworkTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
+
+        assertThat(mProviderModelSliceHelper.getMobileDrawable(drawable)).isEqualTo(
+                mDrawableWithSignalStrength);
+
+        verify(mDrawableWithSignalStrength).setTint(Utils.getColorAccentDefaultColor(mContext));
+    }
+
+    @Test
+    public void getMobileDrawable_hasCarrierDataAndDataIsOnWifi_getMobileDrawable()
+            throws Throwable {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        when(mTelephonyManager.getDataState()).thenReturn(mTelephonyManager.DATA_CONNECTED);
+        when(mTelephonyManager.getServiceState()).thenReturn(mServiceState);
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+        Drawable drawable = mock(Drawable.class);
+        int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+        when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
+                mDefaultDataSubscriptionInfo);
+        addNetworkTransportType(NetworkCapabilities.TRANSPORT_WIFI);
+
+        assertThat(mProviderModelSliceHelper.getMobileDrawable(drawable)).isEqualTo(
+                mDrawableWithSignalStrength);
+    }
+
+    private void addNetworkTransportType(int networkType) {
+        mNetworkCapabilities = new NetworkCapabilities().addTransportType(networkType);
+        when(mConnectivityManager.getNetworkCapabilities(mNetwork)).thenReturn(
+                mNetworkCapabilities);
+    }
+
+    private class TestCustomSliceable implements CustomSliceable {
+        TestCustomSliceable() {
+        }
+
+        @Override
+        public Slice getSlice() {
+            return null;
+        }
+
+        @Override
+        public Uri getUri() {
+            return Uri.parse("content://android.settings.slices/action/provider_model");
+        }
+
+        @Override
+        public Intent getIntent() {
+            return new Intent();
+        }
+    }
+
+    private class MockProviderModelSliceHelper extends ProviderModelSliceHelper {
+        MockProviderModelSliceHelper(Context context, CustomSliceable sliceable) {
+            super(context, sliceable);
+        }
+
+        @Override
+        public Drawable getDrawableWithSignalStrength() {
+            return mDrawableWithSignalStrength;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
new file mode 100644
index 0000000..f9450db
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
@@ -0,0 +1,365 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.net.ConnectivityManager;
+import android.net.Uri;
+import android.net.wifi.WifiManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.slice.Slice;
+import androidx.slice.SliceProvider;
+import androidx.slice.builders.GridRowBuilder;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.builders.SliceAction;
+import androidx.slice.widget.SliceLiveData;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.Utils;
+import com.android.settings.network.telephony.NetworkProviderWorker;
+import com.android.settings.testutils.ResourcesUtils;
+import com.android.settings.wifi.slice.WifiSliceItem;
+import com.android.wifitrackerlib.WifiEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class ProviderModelSliceTest {
+    private static final Uri PROVIDER_MODEL_SLICE_URI =
+            Uri.parse("content://com.android.settings.slices/action/provider_model");
+    private static final int MOCK_SLICE_LEVEL = 3;
+
+    private Context mContext;
+    private MockProviderModelSlice mMockProviderModelSlice;
+    List<WifiSliceItem> mWifiList = new ArrayList<>();
+    private ListBuilder mListBuilder;
+    private MockNetworkProviderWorker mMockNetworkProviderWorker;
+
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private WifiManager mWifiManager;
+    @Mock
+    private ProviderModelSliceHelper mProviderModelSliceHelper;
+    @Mock
+    private WifiSliceItem mMockWifiSliceItem1;
+    @Mock
+    private WifiSliceItem mMockWifiSliceItem2;
+    @Mock
+    private WifiSliceItem mMockWifiSliceItem3;
+    @Mock
+    ListBuilder.RowBuilder mMockCarrierRowBuild;
+    @Mock
+    ListBuilder.HeaderBuilder mMockHeader;
+    @Mock
+    GridRowBuilder mMockGridRowBuilderNonCarrierNetworkUnavailable;
+    @Mock
+    GridRowBuilder mMockGridRowBuilderAllNetworkUnavailable;
+
+    @Before
+    @UiThreadTest
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
+
+
+        // Set-up specs for SliceMetadata.
+        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+        mMockNetworkProviderWorker = spy(new MockNetworkProviderWorker(mContext,
+                PROVIDER_MODEL_SLICE_URI));
+        mMockProviderModelSlice = new MockProviderModelSlice(mContext, mMockNetworkProviderWorker);
+        mListBuilder = spy(new ListBuilder(mContext, PROVIDER_MODEL_SLICE_URI,
+                ListBuilder.INFINITY).setAccentColor(-1));
+        when(mProviderModelSliceHelper.createListBuilder(PROVIDER_MODEL_SLICE_URI)).thenReturn(
+                mListBuilder);
+        when(mProviderModelSliceHelper.getSubscriptionManager()).thenReturn(mSubscriptionManager);
+
+        mWifiList = new ArrayList<>();
+        mMockNetworkProviderWorker.updateSelfResults(mWifiList);
+
+        mockBuilder();
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSlice_noWorkerAndNoCarrier_getOneHeaderOneGridRowWithAllNetworkUnavailable() {
+        mWifiList.clear();
+        mMockProviderModelSlice = new MockProviderModelSlice(mContext, null);
+        mockHelperCondition(false, false, false, null);
+
+        final Slice slice = mMockProviderModelSlice.getSlice();
+
+        assertThat(slice).isNotNull();
+        verify(mListBuilder, times(1)).setHeader(mMockHeader);
+        verify(mListBuilder, times(1)).addGridRow(mMockGridRowBuilderAllNetworkUnavailable);
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSlice_noWifiAndNoCarrier_getOneHeaderOneGridRowWithAllNetworkUnavailable() {
+        mWifiList.clear();
+        mMockNetworkProviderWorker.updateSelfResults(null);
+        mockHelperCondition(false, false, false, null);
+
+        final Slice slice = mMockProviderModelSlice.getSlice();
+
+        assertThat(slice).isNotNull();
+        verify(mListBuilder, times(1)).setHeader(mMockHeader);
+        verify(mListBuilder, times(1)).addGridRow(mMockGridRowBuilderAllNetworkUnavailable);
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSlice_noWifiAndHasCarrierNoData_oneCarrierOneGridRowWithAllNetworkUnavailable() {
+        mWifiList.clear();
+        mMockNetworkProviderWorker.updateSelfResults(null);
+        mockHelperCondition(false, true, true, null);
+
+        final Slice slice = mMockProviderModelSlice.getSlice();
+
+        assertThat(slice).isNotNull();
+        verify(mListBuilder, times(1)).addRow(mMockCarrierRowBuild);
+        verify(mListBuilder, times(1)).addGridRow(mMockGridRowBuilderAllNetworkUnavailable);
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSlice_noWifiAndNoCarrier_oneCarrierOneGridRowWithNonCarrierNetworkUnavailable() {
+        mWifiList.clear();
+        mMockProviderModelSlice = new MockProviderModelSlice(mContext, null);
+        mockHelperCondition(false, true, false, null);
+
+        final Slice slice = mMockProviderModelSlice.getSlice();
+
+        assertThat(slice).isNotNull();
+        verify(mListBuilder, times(1)).addRow(mMockCarrierRowBuild);
+        verify(mListBuilder, times(1)).addGridRow(mMockGridRowBuilderNonCarrierNetworkUnavailable);
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSlice_haveTwoWifiAndOneCarrier_getCarrierAndTwoWiFi() {
+        mWifiList.clear();
+        mockWifiItemCondition(mMockWifiSliceItem1, "wifi1", "wifi1",
+                WifiEntry.CONNECTED_STATE_CONNECTED, "wifi1_key", true);
+        mWifiList.add(mMockWifiSliceItem1);
+        mockWifiItemCondition(mMockWifiSliceItem2, "wifi2", "wifi2",
+                WifiEntry.CONNECTED_STATE_DISCONNECTED, "wifi2_key", true);
+        mWifiList.add(mMockWifiSliceItem2);
+        mMockNetworkProviderWorker.updateSelfResults(mWifiList);
+        mockHelperCondition(false, true, false, mWifiList.get(0));
+
+        final Slice slice = mMockProviderModelSlice.getSlice();
+
+        assertThat(slice).isNotNull();
+        verify(mListBuilder, times(1)).addRow(mMockCarrierRowBuild);
+        verify(mListBuilder, times(3)).addRow(any(ListBuilder.RowBuilder.class));
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSlice_haveOneConnectedWifiAndTwoDisconnectedWifiAndNoCarrier_getTwoRow() {
+        mWifiList.clear();
+        mockWifiItemCondition(mMockWifiSliceItem1, "wifi1", "wifi1",
+                WifiEntry.CONNECTED_STATE_CONNECTED, "wifi1_key", true);
+        mWifiList.add(mMockWifiSliceItem1);
+        mockWifiItemCondition(mMockWifiSliceItem2, "wifi2", "wifi2",
+                WifiEntry.CONNECTED_STATE_DISCONNECTED, "wifi2_key", true);
+        mWifiList.add(mMockWifiSliceItem2);
+        mockWifiItemCondition(mMockWifiSliceItem3, "wifi3", "wifi3",
+                WifiEntry.CONNECTED_STATE_DISCONNECTED, "wifi3_key", true);
+        mWifiList.add(mMockWifiSliceItem3);
+        mMockNetworkProviderWorker.updateSelfResults(mWifiList);
+        mockHelperCondition(false, false, false, mWifiList.get(0));
+
+        final Slice slice = mMockProviderModelSlice.getSlice();
+
+        assertThat(slice).isNotNull();
+        verify(mListBuilder, times(3)).addRow(any(ListBuilder.RowBuilder.class));
+    }
+
+    @Test
+    @UiThreadTest
+    public void getSlice_haveTwoDisconnectedWifiAndNoCarrier_getTwoRow() {
+        mWifiList.clear();
+        mockWifiItemCondition(mMockWifiSliceItem1, "wifi1", "wifi1",
+                WifiEntry.CONNECTED_STATE_DISCONNECTED, "wifi1_key", true);
+        mWifiList.add(mMockWifiSliceItem1);
+        mockWifiItemCondition(mMockWifiSliceItem2, "wifi2", "wifi2",
+                WifiEntry.CONNECTED_STATE_DISCONNECTED, "wifi2_key", true);
+        mWifiList.add(mMockWifiSliceItem2);
+        mMockNetworkProviderWorker.updateSelfResults(mWifiList);
+        mockHelperCondition(false, false, false, null);
+
+        final Slice slice = mMockProviderModelSlice.getSlice();
+
+        assertThat(slice).isNotNull();
+        verify(mListBuilder, times(2)).addRow(any(ListBuilder.RowBuilder.class));
+    }
+
+    @Test
+    public void providerModelSlice_hasCorrectUri() {
+        assertThat(mMockProviderModelSlice.getUri()).isEqualTo(PROVIDER_MODEL_SLICE_URI);
+    }
+
+    private void mockHelperCondition(boolean airplaneMode, boolean hasCarrier,
+            boolean isNoCarrierData, WifiSliceItem connectedWifiItem) {
+        when(mProviderModelSliceHelper.isAirplaneModeEnabled()).thenReturn(airplaneMode);
+        when(mProviderModelSliceHelper.hasCarrier()).thenReturn(hasCarrier);
+        when(mProviderModelSliceHelper.isNoCarrierData()).thenReturn(isNoCarrierData);
+        when(mProviderModelSliceHelper.getConnectedWifiItem(any())).thenReturn(connectedWifiItem);
+    }
+
+    private void mockWifiItemCondition(WifiSliceItem mockWifiItem, String title, String summary,
+            int connectedState, String key, boolean shouldEditBeforeConnect) {
+        when(mockWifiItem.getTitle()).thenReturn(title);
+        when(mockWifiItem.getSummary()).thenReturn(summary);
+        when(mockWifiItem.getConnectedState()).thenReturn(connectedState);
+        when(mockWifiItem.getLevel()).thenReturn(MOCK_SLICE_LEVEL);
+        when(mockWifiItem.getKey()).thenReturn(key);
+        when(mockWifiItem.shouldEditBeforeConnect()).thenReturn(shouldEditBeforeConnect);
+    }
+
+    private void mockBuilder() {
+        SliceAction mockSliceAction = getPrimarySliceAction();
+        when(mMockHeader.getTitle()).thenReturn("mockHeader");
+        when(mMockHeader.getPrimaryAction()).thenReturn(mockSliceAction);
+        when(mProviderModelSliceHelper.createHeader()).thenReturn(mMockHeader);
+
+        int resId = ResourcesUtils.getResourcesId(mContext, "string",
+                "non_carrier_network_unavailable");
+        when(mProviderModelSliceHelper.createMessageGridRow(resId)).thenReturn(
+                mMockGridRowBuilderNonCarrierNetworkUnavailable);
+        resId = ResourcesUtils.getResourcesId(mContext, "string",
+                "all_network_unavailable");
+        when(mProviderModelSliceHelper.createMessageGridRow(resId)).thenReturn(
+                mMockGridRowBuilderAllNetworkUnavailable);
+
+        when(mMockCarrierRowBuild.getTitle()).thenReturn("mockRow");
+        when(mMockCarrierRowBuild.getPrimaryAction()).thenReturn(mockSliceAction);
+        when(mProviderModelSliceHelper.createCarrierRow()).thenReturn(mMockCarrierRowBuild);
+    }
+
+    private SliceAction getPrimarySliceAction() {
+        return SliceAction.createDeeplink(
+                getPrimaryAction(),
+                Utils.createIconWithDrawable(new ColorDrawable(Color.TRANSPARENT)),
+                ListBuilder.ICON_IMAGE,
+                ResourcesUtils.getResourcesString(mContext, "summary_placeholder"));
+    }
+
+    private PendingIntent getPrimaryAction() {
+        final Intent intent = new Intent("android.settings.NETWORK_PROVIDER_SETTINGS")
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        return PendingIntent.getActivity(mContext, 0 /* requestCode */,
+                intent, PendingIntent.FLAG_IMMUTABLE /* flags */);
+    }
+
+    public class MockNetworkProviderWorker extends NetworkProviderWorker {
+        MockNetworkProviderWorker(Context context, Uri uri) {
+            super(context, uri);
+        }
+
+        public void updateSelfResults(List<WifiSliceItem> results) {
+            this.updateResults(results);
+        }
+    }
+
+    public class MockProviderModelSlice extends ProviderModelSlice {
+        private MockNetworkProviderWorker mNetworkProviderWorker;
+
+        MockProviderModelSlice(Context context, MockNetworkProviderWorker networkProviderWorker) {
+            super(context);
+            mNetworkProviderWorker = networkProviderWorker;
+        }
+
+        @Override
+        ProviderModelSliceHelper getHelper() {
+            return mProviderModelSliceHelper;
+        }
+
+        @Override
+        NetworkProviderWorker getWorker() {
+            return mNetworkProviderWorker;
+        }
+    }
+
+    @Test
+    public void onNotifyChange_intentToggleActionOn_shouldSetCarrierNetworkEnabledTrue() {
+        Intent intent = mMockProviderModelSlice.getBroadcastIntent(mContext).getIntent();
+        intent.putExtra(EXTRA_TOGGLE_STATE, true);
+
+        mMockProviderModelSlice.onNotifyChange(intent);
+
+        verify(mMockNetworkProviderWorker).setCarrierNetworkEnabled(true);
+    }
+
+    @Test
+    public void onNotifyChange_intentToggleActionOff_shouldSetCarrierNetworkEnabledFalse() {
+        Intent intent = mMockProviderModelSlice.getBroadcastIntent(mContext).getIntent();
+        intent.putExtra(EXTRA_TOGGLE_STATE, false);
+
+        mMockProviderModelSlice.onNotifyChange(intent);
+
+        verify(mMockNetworkProviderWorker).setCarrierNetworkEnabled(false);
+    }
+
+    @Test
+    public void onNotifyChange_intentPrimaryAction_shouldConnectCarrierNetwork() {
+        Intent intent = mMockProviderModelSlice.getBroadcastIntent(mContext).getIntent();
+
+        mMockProviderModelSlice.onNotifyChange(intent);
+
+        verify(mMockNetworkProviderWorker).connectCarrierNetwork();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
new file mode 100644
index 0000000..9e319fb
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class SubscriptionUtilTest {
+
+    private Context mContext;
+    @Mock
+    private SubscriptionManager mSubMgr;
+    @Mock
+    private TelephonyManager mTelMgr;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubMgr);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelMgr);
+        when(mTelMgr.getUiccSlotsInfo()).thenReturn(null);
+    }
+
+    @Test
+    public void getAvailableSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() {
+        when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(null);
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mContext);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).isEmpty();
+    }
+
+    @Test
+    public void getAvailableSubscriptions_oneSubscription_oneResult() {
+        final SubscriptionInfo info = mock(SubscriptionInfo.class);
+        when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info));
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mContext);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).hasSize(1);
+    }
+
+    @Test
+    public void getAvailableSubscriptions_twoSubscriptions_twoResults() {
+        final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
+        final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
+        when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2));
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getAvailableSubscriptions(mContext);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).hasSize(2);
+    }
+
+    @Test
+    public void getActiveSubscriptions_nullInfoFromSubscriptionManager_nonNullResult() {
+        when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(null);
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).isEmpty();
+    }
+
+    @Test
+    public void getActiveSubscriptions_oneSubscription_oneResult() {
+        final SubscriptionInfo info = mock(SubscriptionInfo.class);
+        when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(Arrays.asList(info));
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).hasSize(1);
+    }
+
+    @Test
+    public void getActiveSubscriptions_twoSubscriptions_twoResults() {
+        final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
+        final SubscriptionInfo info2 = mock(SubscriptionInfo.class);
+        when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(info1, info2));
+
+        final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions(mSubMgr);
+
+        assertThat(subs).isNotNull();
+        assertThat(subs).hasSize(2);
+    }
+
+    @Test
+    public void isInactiveInsertedPSim_nullSubInfo_doesNotCrash() {
+        assertThat(SubscriptionUtil.isInactiveInsertedPSim(null)).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
new file mode 100644
index 0000000..27dd2aa
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java
@@ -0,0 +1,673 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network;
+
+import static android.telephony.SignalStrength.NUM_SIGNAL_STRENGTH_BINS;
+import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GOOD;
+import static android.telephony.SignalStrength.SIGNAL_STRENGTH_GREAT;
+import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+
+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.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.os.Looper;
+import android.provider.Settings;
+import android.telephony.ServiceState;
+import android.telephony.SignalStrength;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.LifecycleRegistry;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.Utils;
+import com.android.settings.network.SubscriptionsPreferenceController.SubsPrefCtrlInjector;
+import com.android.settings.testutils.ResourcesUtils;
+import com.android.settings.wifi.WifiPickerTrackerHelper;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+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 java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class SubscriptionsPreferenceControllerTest {
+    private static final String KEY = "preference_group";
+
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mTelephonyManagerForSub;
+    @Mock
+    private Network mActiveNetwork;
+    @Mock
+    private Lifecycle mLifecycle;
+    @Mock
+    private LifecycleOwner mLifecycleOwner;
+    @Mock
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
+    private LifecycleRegistry mLifecycleRegistry;
+    private int mOnChildUpdatedCount;
+    private Context mContext;
+    private SubscriptionsPreferenceController.UpdateListener mUpdateListener;
+    private PreferenceCategory mPreferenceCategory;
+    private PreferenceScreen mPreferenceScreen;
+    private PreferenceManager mPreferenceManager;
+    private NetworkCapabilities mNetworkCapabilities;
+
+    private FakeSubscriptionsPreferenceController mController;
+    private static SubsPrefCtrlInjector sInjector;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mLifecycleRegistry = new LifecycleRegistry(mLifecycleOwner);
+
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
+        when(mConnectivityManager.getActiveNetwork()).thenReturn(mActiveNetwork);
+        when(mConnectivityManager.getNetworkCapabilities(mActiveNetwork))
+                .thenReturn(mNetworkCapabilities);
+        when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry);
+
+        mPreferenceManager = new PreferenceManager(mContext);
+        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mPreferenceScreen.setInitialExpandedChildrenCount(3);
+        mPreferenceCategory = new PreferenceCategory(mContext);
+        mPreferenceCategory.setKey(KEY);
+        mPreferenceCategory.setOrderingAsAdded(true);
+        mPreferenceScreen.addPreference(mPreferenceCategory);
+
+        mOnChildUpdatedCount = 0;
+        mUpdateListener = () -> mOnChildUpdatedCount++;
+        sInjector = spy(new SubsPrefCtrlInjector());
+        initializeMethod(true, 1, 1, 1, false, false);
+        mController =  new FakeSubscriptionsPreferenceController(mContext, mLifecycle,
+                mUpdateListener, KEY, 5);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0);
+    }
+
+    @After
+    public void tearDown() {
+        SubscriptionUtil.setActiveSubscriptionsForTesting(null);
+    }
+
+    @Test
+    public void isAvailable_oneSubscription_availableFalse() {
+        setupMockSubscriptions(1);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_oneSubAndProviderOn_availableTrue() {
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        setupMockSubscriptions(1);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_twoSubscriptions_availableTrue() {
+        setupMockSubscriptions(2);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_fiveSubscriptions_availableTrue() {
+        doReturn(true).when(sInjector).canSubscriptionBeDisplayed(mContext, 0);
+        setupMockSubscriptions(5);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_airplaneModeOn_availableFalse() {
+        setupMockSubscriptions(2);
+
+        assertThat(mController.isAvailable()).isTrue();
+
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    @UiThreadTest
+    public void onAirplaneModeChanged_airplaneModeTurnedOn_eventFired() {
+        setupMockSubscriptions(2);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mController.isAvailable()).isTrue();
+
+        final int updateCountBeforeModeChange = mOnChildUpdatedCount;
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
+
+        mController.onAirplaneModeChanged(true);
+
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeModeChange + 1);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onAirplaneModeChanged_airplaneModeTurnedOff_eventFired() {
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
+        setupMockSubscriptions(2);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+        assertThat(mController.isAvailable()).isFalse();
+
+        final int updateCountBeforeModeChange = mOnChildUpdatedCount;
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 0);
+
+        mController.onAirplaneModeChanged(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeModeChange + 1);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onSubscriptionsChanged_countBecameTwo_eventFired() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
+        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 1));
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mController.isAvailable()).isFalse();
+
+        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
+        SubscriptionUtil.setActiveSubscriptionsForTesting(subs);
+
+        mController.onSubscriptionsChanged();
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onSubscriptionsChanged_countBecameOne_eventFiredAndPrefsRemoved() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(2);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(2);
+
+        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
+        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 1));
+
+        mController.onSubscriptionsChanged();
+
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(0);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onSubscriptionsChanged_subscriptionReplaced_preferencesChanged() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(3);
+
+        // Start out with only sub1 and sub2.
+        SubscriptionUtil.setActiveSubscriptionsForTesting(subs.subList(0, 2));
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(2);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub2");
+        assertThat(mPreferenceCategory.getPreference(1).getTitle()).isEqualTo("sub1");
+
+        // Now replace sub2 with sub3, and make sure the old preference was removed and the new
+        // preference was added.
+        final int updateCountBeforeSubscriptionChange = mOnChildUpdatedCount;
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(subs.get(0), subs.get(2)));
+        mController.onSubscriptionsChanged();
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mOnChildUpdatedCount).isEqualTo(updateCountBeforeSubscriptionChange + 1);
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(2);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub3");
+        assertThat(mPreferenceCategory.getPreference(1).getTitle()).isEqualTo("sub1");
+    }
+
+    @Test
+    public void getSummary_twoSubsOneDefaultForEverythingDataActive() {
+        setupMockSubscriptions(2);
+
+        doReturn(11).when(sInjector).getDefaultSmsSubscriptionId();
+        doReturn(11).when(sInjector).getDefaultVoiceSubscriptionId();
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        doReturn(true).when(sInjector).isActiveCellularNetwork(mContext);
+
+        assertThat(mController.getSummary(11, true)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "default_for_calls_and_sms")
+                        + System.lineSeparator()
+                        + ResourcesUtils.getResourcesString(mContext, "mobile_data_active"));
+
+        assertThat(mController.getSummary(22, false)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "subscription_available"));
+    }
+
+    @Test
+    public void getSummary_twoSubsOneDefaultForEverythingDataNotActive() {
+        setupMockSubscriptions(2, 1, true);
+
+        doReturn(1).when(sInjector).getDefaultSmsSubscriptionId();
+        doReturn(1).when(sInjector).getDefaultVoiceSubscriptionId();
+
+        assertThat(mController.getSummary(1, true)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "default_for_calls_and_sms")
+                        + System.lineSeparator()
+                        + ResourcesUtils.getResourcesString(mContext, "default_for_mobile_data"));
+
+        assertThat(mController.getSummary(2, false)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "subscription_available"));
+    }
+
+    @Test
+    public void getSummary_twoSubsOneDefaultForEverythingDataDisabled() {
+        setupMockSubscriptions(2);
+
+        doReturn(1).when(sInjector).getDefaultSmsSubscriptionId();
+        doReturn(1).when(sInjector).getDefaultVoiceSubscriptionId();
+
+        assertThat(mController.getSummary(1, true)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "default_for_calls_and_sms")
+                        + System.lineSeparator()
+                        + ResourcesUtils.getResourcesString(mContext, "mobile_data_off"));
+
+        assertThat(mController.getSummary(2, false)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "subscription_available"));
+    }
+
+    @Test
+    public void getSummary_twoSubsOneForCallsAndDataOneForSms() {
+        setupMockSubscriptions(2, 1, true);
+
+        doReturn(2).when(sInjector).getDefaultSmsSubscriptionId();
+        doReturn(1).when(sInjector).getDefaultVoiceSubscriptionId();
+
+        assertThat(mController.getSummary(1, true)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "default_for_calls")
+                        + System.lineSeparator()
+                        + ResourcesUtils.getResourcesString(mContext, "default_for_mobile_data"));
+
+        assertThat(mController.getSummary(2, false)).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "default_for_sms"));
+    }
+
+    @Test
+    @UiThreadTest
+    public void setIcon_greatSignal_correctLevels() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(2, 1, true);
+        setMockSubSignalStrength(subs, 0, SIGNAL_STRENGTH_GREAT);
+        setMockSubSignalStrength(subs, 1, SIGNAL_STRENGTH_GREAT);
+        final Preference pref = new Preference(mContext);
+        final Drawable greatDrawWithoutCutOff = mock(Drawable.class);
+        doReturn(greatDrawWithoutCutOff).when(sInjector)
+                .getIcon(mContext, 4, NUM_SIGNAL_STRENGTH_BINS, true);
+
+        mController.setIcon(pref, 1, true /* isDefaultForData */);
+        assertThat(pref.getIcon()).isEqualTo(greatDrawWithoutCutOff);
+
+        final Drawable greatDrawWithCutOff = mock(Drawable.class);
+        doReturn(greatDrawWithCutOff).when(sInjector)
+                .getIcon(mContext, 4, NUM_SIGNAL_STRENGTH_BINS, true);
+        mController.setIcon(pref, 2, false /* isDefaultForData */);
+        assertThat(pref.getIcon()).isEqualTo(greatDrawWithCutOff);
+    }
+
+    @Test
+    @UiThreadTest
+    public void displayPreference_providerAndHasSim_showPreference() {
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(1);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
+    }
+
+    @Test
+    @UiThreadTest
+    public void displayPreference_providerAndHasMultiSim_showDataSubPreference() {
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
+    }
+
+    @Test
+    @UiThreadTest
+    public void displayPreference_providerAndNoSim_noPreference() {
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(null).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(0);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onAirplaneModeChanged_providerAndHasSim_noPreference() {
+        setupMockSubscriptions(1);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+        Settings.Global.putInt(mContext.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON, 1);
+
+        mController.onAirplaneModeChanged(true);
+
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(0);
+    }
+
+    @Test
+    @UiThreadTest
+    public void dataSubscriptionChanged_providerAndHasMultiSim_showSubId1Preference() {
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        Intent intent = new Intent(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+        mController.mDataSubscriptionChangedReceiver.onReceive(mContext, intent);
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
+    }
+
+    @Test
+    @UiThreadTest
+    public void dataSubscriptionChanged_providerAndHasMultiSim_showSubId2Preference() {
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(2);
+        final int subId = sub.get(0).getSubscriptionId();
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        Intent intent = new Intent(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub1");
+
+        doReturn(sub.get(1)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+
+        mController.mDataSubscriptionChangedReceiver.onReceive(mContext, intent);
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mPreferenceCategory.getPreferenceCount()).isEqualTo(1);
+        assertThat(mPreferenceCategory.getPreference(0).getTitle()).isEqualTo("sub2");
+    }
+
+    @Test
+    @UiThreadTest
+    public void getIcon_cellularIsActive_iconColorIsAccentDefaultColor() {
+        final List<SubscriptionInfo> sub = setupMockSubscriptions(1);
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(sub.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        Drawable icon = mock(Drawable.class);
+        doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
+        setupGetIconConditions(sub.get(0).getSubscriptionId(), true, true,
+                TelephonyManager.DATA_CONNECTED, ServiceState.STATE_IN_SERVICE);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+
+        verify(icon).setTint(Utils.getColorAccentDefaultColor(mContext));
+    }
+
+    @Test
+    @UiThreadTest
+    public void getIcon_dataStateConnectedAndMobileDataOn_iconIsSignalIcon() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(1);
+        final int subId = subs.get(0).getSubscriptionId();
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        Drawable icon = mock(Drawable.class);
+        doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
+        setupGetIconConditions(subId, false, true,
+                TelephonyManager.DATA_CONNECTED, ServiceState.STATE_IN_SERVICE);
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+        Drawable actualIcon = mPreferenceCategory.getPreference(0).getIcon();
+
+        assertThat(icon).isEqualTo(actualIcon);
+    }
+
+    @Test
+    @UiThreadTest
+    public void getIcon_voiceInServiceAndMobileDataOff_iconIsSignalIcon() {
+        final List<SubscriptionInfo> subs = setupMockSubscriptions(1);
+        final int subId = subs.get(0).getSubscriptionId();
+        doReturn(true).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(subs.get(0)).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();
+        Drawable icon = mock(Drawable.class);
+        doReturn(icon).when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
+
+        setupGetIconConditions(subId, false, false,
+                TelephonyManager.DATA_DISCONNECTED, ServiceState.STATE_IN_SERVICE);
+
+        mController.onResume();
+        mController.displayPreference(mPreferenceScreen);
+        Drawable actualIcon = mPreferenceCategory.getPreference(0).getIcon();
+        doReturn(TelephonyManager.DATA_CONNECTED).when(mTelephonyManagerForSub).getDataState();
+
+        assertThat(icon).isEqualTo(actualIcon);
+    }
+
+    @Test
+    public void connectCarrierNetwork_isDataEnabled_helperConnect() {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        mController.setWifiPickerTrackerHelper(mWifiPickerTrackerHelper);
+
+        mController.connectCarrierNetwork();
+
+        verify(mWifiPickerTrackerHelper).connectCarrierNetwork(any());
+    }
+
+    @Test
+    public void connectCarrierNetwork_isNotDataEnabled_helperNeverConnect() {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(false);
+        mController.setWifiPickerTrackerHelper(mWifiPickerTrackerHelper);
+
+        mController.connectCarrierNetwork();
+
+        verify(mWifiPickerTrackerHelper, never()).connectCarrierNetwork(any());
+    }
+
+    private void setupGetIconConditions(int subId, boolean isActiveCellularNetwork,
+            boolean isDataEnable, int dataState, int servicestate) {
+        doReturn(mTelephonyManagerForSub).when(mTelephonyManager).createForSubscriptionId(subId);
+        doReturn(isActiveCellularNetwork).when(sInjector).isActiveCellularNetwork(mContext);
+        doReturn(isDataEnable).when(mTelephonyManagerForSub).isDataEnabled();
+        doReturn(dataState).when(mTelephonyManagerForSub).getDataState();
+        ServiceState ss = mock(ServiceState.class);
+        doReturn(ss).when(mTelephonyManagerForSub).getServiceState();
+        doReturn(servicestate).when(ss).getState();
+    }
+
+    private List<SubscriptionInfo> setupMockSubscriptions(int count) {
+        return setupMockSubscriptions(count, 0, true);
+    }
+
+    /** Helper method to setup several mock active subscriptions. The generated subscription id's
+     * start at 1.
+     *
+     * @param count How many subscriptions to create
+     * @param defaultDataSubId The subscription id of the default data subscription - pass
+     *                         INVALID_SUBSCRIPTION_ID if there should not be one
+     * @param mobileDataEnabled Whether mobile data should be considered enabled for the default
+     *                          data subscription
+     */
+    private List<SubscriptionInfo> setupMockSubscriptions(int count, int defaultDataSubId,
+            boolean mobileDataEnabled) {
+        if (defaultDataSubId != INVALID_SUBSCRIPTION_ID) {
+            when(sInjector.getDefaultDataSubscriptionId()).thenReturn(defaultDataSubId);
+        }
+        final ArrayList<SubscriptionInfo> infos = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            final int subscriptionId = i + 1;
+            final SubscriptionInfo info = mock(SubscriptionInfo.class);
+            final TelephonyManager mgrForSub = mock(TelephonyManager.class);
+            final SignalStrength signalStrength = mock(SignalStrength.class);
+
+            if (subscriptionId == defaultDataSubId) {
+                when(mgrForSub.isDataEnabled()).thenReturn(mobileDataEnabled);
+            }
+            when(info.getSubscriptionId()).thenReturn(subscriptionId);
+            when(info.getDisplayName()).thenReturn("sub" + (subscriptionId));
+            doReturn(mgrForSub).when(mTelephonyManager).createForSubscriptionId(eq(subscriptionId));
+            when(mgrForSub.getSignalStrength()).thenReturn(signalStrength);
+            when(signalStrength.getLevel()).thenReturn(SIGNAL_STRENGTH_GOOD);
+            doReturn(true).when(sInjector).canSubscriptionBeDisplayed(mContext, subscriptionId);
+            infos.add(info);
+        }
+        SubscriptionUtil.setActiveSubscriptionsForTesting(infos);
+        return infos;
+    }
+
+    /**
+     * Helper method to set the signal strength returned for a mock subscription
+     * @param subs The list of subscriptions
+     * @param index The index in of the subscription in |subs| to change
+     * @param level The signal strength level to return for the subscription. Pass -1 to force
+     *              return of a null SignalStrength object for the subscription.
+     */
+    private void setMockSubSignalStrength(List<SubscriptionInfo> subs, int index, int level) {
+        final int subId =  subs.get(index).getSubscriptionId();
+        doReturn(mTelephonyManagerForSub).when(mTelephonyManager).createForSubscriptionId(subId);
+        if (level == -1) {
+            when(mTelephonyManagerForSub.getSignalStrength()).thenReturn(null);
+        } else {
+            final SignalStrength signalStrength = mock(SignalStrength.class);
+            doReturn(signalStrength).when(mTelephonyManagerForSub).getSignalStrength();
+            when(signalStrength.getLevel()).thenReturn(level);
+        }
+    }
+
+    private void initializeMethod(boolean isSubscriptionCanBeDisplayed,
+            int defaultSmsSubscriptionId, int defaultVoiceSubscriptionId,
+            int defaultDataSubscriptionId, boolean isActiveCellularNetwork,
+            boolean isProviderModelEnabled) {
+        doReturn(isSubscriptionCanBeDisplayed)
+                .when(sInjector).canSubscriptionBeDisplayed(mContext, eq(anyInt()));
+        doReturn(defaultSmsSubscriptionId).when(sInjector).getDefaultSmsSubscriptionId();
+        doReturn(defaultVoiceSubscriptionId).when(sInjector).getDefaultVoiceSubscriptionId();
+        doReturn(defaultDataSubscriptionId).when(sInjector).getDefaultDataSubscriptionId();
+        doReturn(isActiveCellularNetwork).when(sInjector).isActiveCellularNetwork(mContext);
+        doReturn(isProviderModelEnabled).when(sInjector).isProviderModelEnabled(mContext);
+        doReturn(mock(Drawable.class))
+                .when(sInjector).getIcon(any(), anyInt(), anyInt(), eq(false));
+    }
+
+    private static class FakeSubscriptionsPreferenceController
+            extends SubscriptionsPreferenceController {
+
+        /**
+         * @param context            the context for the UI where we're placing these preferences
+         * @param lifecycle          for listening to lifecycle events for the UI
+         * @param updateListener     called to let our parent controller know that our
+         *                           availability has
+         *                           changed, or that one or more of the preferences we've placed
+         *                           in the
+         *                           PreferenceGroup has changed
+         * @param preferenceGroupKey the key used to lookup the PreferenceGroup where Preferences
+         *                          will
+         *                           be placed
+         * @param startOrder         the order that should be given to the first Preference
+         *                           placed into
+         *                           the PreferenceGroup; the second will use startOrder+1, third
+         *                           will
+         *                           use startOrder+2, etc. - this is useful for when the parent
+         *                           wants
+         *                           to have other preferences in the same PreferenceGroup and wants
+         */
+        FakeSubscriptionsPreferenceController(Context context, Lifecycle lifecycle,
+                UpdateListener updateListener, String preferenceGroupKey, int startOrder) {
+            super(context, lifecycle, updateListener, preferenceGroupKey, startOrder);
+        }
+
+        @Override
+        protected SubsPrefCtrlInjector createSubsPrefCtrlInjector() {
+            return sInjector;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/TetherProvisioningActivityTest.java b/tests/unit/src/com/android/settings/network/TetherProvisioningActivityTest.java
deleted file mode 100644
index af29dcc..0000000
--- a/tests/unit/src/com/android/settings/network/TetherProvisioningActivityTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.network;
-
-import static android.net.TetheringConstants.EXTRA_ADD_TETHER_TYPE;
-import static android.net.TetheringConstants.EXTRA_PROVISION_CALLBACK;
-import static android.net.TetheringManager.TETHERING_WIFI;
-
-import static com.android.settings.network.TetherProvisioningActivity.EXTRA_TETHER_SUBID;
-import static com.android.settings.network.TetherProvisioningActivity.EXTRA_TETHER_UI_PROVISIONING_APP_NAME;
-import static com.android.settings.network.TetherProvisioningActivity.PROVISION_REQUEST;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.TetheringManager;
-import android.os.Bundle;
-import android.os.ResultReceiver;
-import android.provider.Settings;
-import android.telephony.SubscriptionManager;
-
-import androidx.lifecycle.Lifecycle;
-import androidx.test.core.app.ActivityScenario;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-@RunWith(AndroidJUnit4.class)
-public class TetherProvisioningActivityTest {
-    private static class WrappedReceiver extends ResultReceiver {
-        private final CompletableFuture<Integer> mFuture = new CompletableFuture<>();
-
-        WrappedReceiver() {
-            super(null /* handler */);
-        }
-
-        @Override
-        protected void onReceiveResult(int resultCode, Bundle resultData) {
-            mFuture.complete(resultCode);
-        }
-
-        public int get() throws Exception {
-            return mFuture.get(10_000L, TimeUnit.MILLISECONDS);
-        }
-    }
-
-    @Test
-    public void testOnCreate_FinishWithNonActiveDataSubId() throws Exception {
-        final WrappedReceiver receiver = new WrappedReceiver();
-        try (ActivityScenario<TetherProvisioningActivity> scenario = ActivityScenario.launch(
-                new Intent(Settings.ACTION_TETHER_PROVISIONING_UI)
-                        .putExtra(EXTRA_ADD_TETHER_TYPE, TETHERING_WIFI)
-                        .putExtra(EXTRA_PROVISION_CALLBACK, receiver)
-                        .putExtra(TetherProvisioningActivity.EXTRA_TETHER_SUBID, 10000))) {
-            assertEquals(TetheringManager.TETHER_ERROR_PROVISIONING_FAILED, receiver.get());
-            assertEquals(Lifecycle.State.DESTROYED, scenario.getState());
-        }
-    }
-
-    @Test
-    public void testOnCreate_FinishWithUnavailableProvisioningApp() throws Exception {
-        final WrappedReceiver receiver = new WrappedReceiver();
-        final int subId = SubscriptionManager.getActiveDataSubscriptionId();
-        final String[] emptyProvisioningApp = { "", "" };
-        try (ActivityScenario<TetherProvisioningActivity> scenario = ActivityScenario.launch(
-                new Intent(Settings.ACTION_TETHER_PROVISIONING_UI)
-                        .putExtra(EXTRA_ADD_TETHER_TYPE, TETHERING_WIFI)
-                        .putExtra(EXTRA_PROVISION_CALLBACK, receiver)
-                        .putExtra(EXTRA_TETHER_SUBID, subId)
-                        .putExtra(EXTRA_TETHER_UI_PROVISIONING_APP_NAME, emptyProvisioningApp))) {
-            assertEquals(TetheringManager.TETHER_ERROR_PROVISIONING_FAILED, receiver.get());
-            assertEquals(Lifecycle.State.DESTROYED, scenario.getState());
-        }
-    }
-
-    @Test
-    public void testOnCreate_startActivityForResult() {
-        final WrappedReceiver receiver = new WrappedReceiver();
-        final int subId = SubscriptionManager.getActiveDataSubscriptionId();
-        final String[] provisionApp = new String[] {
-                "android.test.entitlement",
-                "android.test.entitlement.InstrumentedEntitlementActivity"
-        };
-        try (ActivityScenario<TetherProvisioningActivity> scenario = ActivityScenario.launch(
-                new Intent(Settings.ACTION_TETHER_PROVISIONING_UI)
-                        .putExtra(EXTRA_ADD_TETHER_TYPE, TETHERING_WIFI)
-                        .putExtra(EXTRA_PROVISION_CALLBACK, receiver)
-                        .putExtra(EXTRA_TETHER_SUBID, subId)
-                        .putExtra(EXTRA_TETHER_UI_PROVISIONING_APP_NAME, provisionApp))) {
-            scenario.onActivity(activity -> {
-                assertFalse(activity.isFinishing());
-                activity.onActivityResult(PROVISION_REQUEST, Activity.RESULT_OK, null /* intent */);
-                try {
-                    assertEquals(TetheringManager.TETHER_ERROR_NO_ERROR, receiver.get());
-                } catch (Exception e) {
-                    // ActivityAction#perform() doesn't throw the exception. Just catch the
-                    // exception and call fail() here.
-                    fail("Can not get result after 10s.");
-                }
-                assertTrue(activity.isFinishing());
-            });
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/network/ims/MockVolteQueryImsState.java b/tests/unit/src/com/android/settings/network/ims/MockVolteQueryImsState.java
new file mode 100644
index 0000000..515ab5b
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/ims/MockVolteQueryImsState.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.ims;
+
+import android.content.Context;
+import android.telephony.ims.ImsException;
+
+/**
+ * Controller class for mock VoLte status
+ */
+public class MockVolteQueryImsState extends VolteQueryImsState {
+
+    private Boolean mIsTtyOnVolteEnabled;
+    private Boolean mIsSupported;
+    private Boolean mIsProvisionedOnDevice;
+    private Boolean mIsServiceStateReady;
+    private Boolean mIsEnabledByUser;
+
+    /**
+     * Constructor
+     *
+     * @param context {@link Context}
+     * @param subId subscription's id
+     */
+    public MockVolteQueryImsState(Context context, int subId) {
+        super(context, subId);
+    }
+
+    public void setIsTtyOnVolteEnabled(boolean enabled) {
+        mIsTtyOnVolteEnabled = enabled;
+    }
+
+    @Override
+    boolean isTtyOnVolteEnabled(int subId) {
+        if (mIsTtyOnVolteEnabled != null) {
+            return mIsTtyOnVolteEnabled;
+        }
+        return super.isTtyOnVolteEnabled(subId);
+    }
+
+    public void setEnabledByPlatform(boolean isSupported) {
+        mIsSupported = isSupported;
+    }
+
+    @Override
+    boolean isEnabledByPlatform(int subId) throws InterruptedException, ImsException,
+            IllegalArgumentException {
+        if (mIsSupported != null) {
+            return mIsSupported;
+        }
+        return super.isEnabledByPlatform(subId);
+    }
+
+    public void setIsProvisionedOnDevice(boolean isProvisioned) {
+        mIsProvisionedOnDevice = isProvisioned;
+    }
+
+    @Override
+    boolean isProvisionedOnDevice(int subId) {
+        if (mIsProvisionedOnDevice != null) {
+            return mIsProvisionedOnDevice;
+        }
+        return super.isProvisionedOnDevice(subId);
+    }
+
+    public void setServiceStateReady(boolean isReady) {
+        mIsServiceStateReady = isReady;
+    }
+
+    @Override
+    boolean isServiceStateReady(int subId) throws InterruptedException, ImsException,
+            IllegalArgumentException {
+        if (mIsServiceStateReady != null) {
+            return mIsServiceStateReady;
+        }
+        return super.isServiceStateReady(subId);
+    }
+
+    public void setIsEnabledByUser(boolean enabled) {
+        mIsEnabledByUser = enabled;
+    }
+
+    @Override
+    boolean isEnabledByUser(int subId) {
+        if (mIsEnabledByUser != null) {
+            return mIsEnabledByUser;
+        }
+        return super.isEnabledByUser(subId);
+    }
+
+}
diff --git a/tests/unit/src/com/android/settings/network/ims/MockVtQueryImsState.java b/tests/unit/src/com/android/settings/network/ims/MockVtQueryImsState.java
new file mode 100644
index 0000000..0949f1c
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/ims/MockVtQueryImsState.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.ims;
+
+import android.content.Context;
+import android.telephony.ims.ImsException;
+
+/**
+ * Controller class for mock VT status
+ */
+public class MockVtQueryImsState extends VtQueryImsState {
+
+    private Boolean mIsTtyOnVolteEnabled;
+    private Boolean mIsEnabledOnPlatform;
+    private Boolean mIsProvisionedOnDevice;
+    private Boolean mIsEnabledByUser;
+    private Boolean mIsServiceStateReady;
+
+    /**
+     * Constructor
+     *
+     * @param context {@link Context}
+     * @param subId subscription's id
+     */
+    public MockVtQueryImsState(Context context, int subId) {
+        super(context, subId);
+    }
+
+    public void setIsTtyOnVolteEnabled(boolean enabled) {
+        mIsTtyOnVolteEnabled = enabled;
+    }
+
+    @Override
+    boolean isTtyOnVolteEnabled(int subId) {
+        if (mIsTtyOnVolteEnabled != null) {
+            return mIsTtyOnVolteEnabled;
+        }
+        return super.isTtyOnVolteEnabled(subId);
+    }
+
+    public void setIsEnabledByPlatform(boolean isEnabled) {
+        mIsEnabledOnPlatform = isEnabled;
+    }
+
+    @Override
+    boolean isEnabledByPlatform(int subId) throws InterruptedException, ImsException,
+            IllegalArgumentException {
+        if (mIsEnabledOnPlatform != null) {
+            return mIsEnabledOnPlatform;
+        }
+        return super.isEnabledByPlatform(subId);
+    }
+
+    public void setIsProvisionedOnDevice(boolean isProvisioned) {
+        mIsProvisionedOnDevice = isProvisioned;
+    }
+
+    @Override
+    boolean isProvisionedOnDevice(int subId) {
+        if (mIsProvisionedOnDevice != null) {
+            return mIsProvisionedOnDevice;
+        }
+        return super.isProvisionedOnDevice(subId);
+    }
+
+    public void setServiceStateReady(boolean isReady) {
+        mIsServiceStateReady = isReady;
+    }
+
+    @Override
+    boolean isServiceStateReady(int subId) throws InterruptedException, ImsException,
+            IllegalArgumentException {
+        if (mIsServiceStateReady != null) {
+            return mIsServiceStateReady;
+        }
+        return super.isServiceStateReady(subId);
+    }
+
+    public void setIsEnabledByUser(boolean enabled) {
+        mIsEnabledByUser = enabled;
+    }
+
+    @Override
+    boolean isEnabledByUser(int subId) {
+        if (mIsEnabledByUser != null) {
+            return mIsEnabledByUser;
+        }
+        return super.isEnabledByUser(subId);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/ims/MockWfcQueryImsState.java b/tests/unit/src/com/android/settings/network/ims/MockWfcQueryImsState.java
new file mode 100644
index 0000000..096084f
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/ims/MockWfcQueryImsState.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.ims;
+
+import android.content.Context;
+import android.telephony.ims.ImsException;
+
+/**
+ * Controller class for mock Wifi calling status for unit tests, copied it from
+ * {@link MockWifiCallingQueryImsState} which is existed in robotests.
+ */
+public class MockWfcQueryImsState extends WifiCallingQueryImsState {
+
+    private Boolean mIsTtyOnVolteEnabled;
+    private Boolean mIsEnabledOnPlatform;
+    private Boolean mIsProvisionedOnDevice;
+    private Boolean mIsServiceStateReady;
+    private Boolean mIsEnabledByUser;
+
+    /**
+     * Constructor
+     *
+     * @param context {@code Context}
+     * @param subId subscription's id
+     */
+    public MockWfcQueryImsState(Context context, int subId) {
+        super(context, subId);
+    }
+
+    public void setIsTtyOnVolteEnabled(boolean enabled) {
+        mIsTtyOnVolteEnabled = enabled;
+    }
+
+    @Override
+    boolean isTtyOnVolteEnabled(int subId) {
+        if (mIsTtyOnVolteEnabled != null) {
+            return mIsTtyOnVolteEnabled;
+        }
+        return super.isTtyOnVolteEnabled(subId);
+    }
+
+
+    public void setIsEnabledByPlatform(boolean isEnabled) {
+        mIsEnabledOnPlatform = isEnabled;
+    }
+
+    @Override
+    boolean isEnabledByPlatform(int subId) throws InterruptedException, ImsException,
+            IllegalArgumentException {
+        if (mIsEnabledOnPlatform != null) {
+            return mIsEnabledOnPlatform;
+        }
+        return super.isEnabledByPlatform(subId);
+    }
+
+    public void setIsProvisionedOnDevice(boolean isProvisioned) {
+        mIsProvisionedOnDevice = isProvisioned;
+    }
+
+    @Override
+    boolean isProvisionedOnDevice(int subId) {
+        if (mIsProvisionedOnDevice != null) {
+            return mIsProvisionedOnDevice;
+        }
+        return super.isProvisionedOnDevice(subId);
+    }
+
+    public void setServiceStateReady(boolean isReady) {
+        mIsServiceStateReady = isReady;
+    }
+
+    @Override
+    public boolean isServiceStateReady(int subId) throws InterruptedException, ImsException,
+            IllegalArgumentException {
+        if (mIsServiceStateReady != null) {
+            return mIsServiceStateReady;
+        }
+        return super.isServiceStateReady(subId);
+    }
+
+    public void setIsEnabledByUser(boolean enabled) {
+        mIsEnabledByUser = enabled;
+    }
+
+    @Override
+    boolean isEnabledByUser(int subId) {
+        if (mIsEnabledByUser != null) {
+            return mIsEnabledByUser;
+        }
+        return super.isEnabledByUser(subId);
+    }
+
+}
diff --git a/tests/unit/src/com/android/settings/network/ims/MockWifiCallingQueryImsState.java b/tests/unit/src/com/android/settings/network/ims/MockWifiCallingQueryImsState.java
new file mode 100644
index 0000000..abea839
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/ims/MockWifiCallingQueryImsState.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.ims;
+
+import android.content.Context;
+import android.telephony.ims.ImsException;
+
+/**
+ * Controller class for mock Wifi calling status
+ */
+public class MockWifiCallingQueryImsState extends WifiCallingQueryImsState {
+
+    private Boolean mIsTtyOnVolteEnabled;
+    private Boolean mIsEnabledOnPlatform;
+    private Boolean mIsProvisionedOnDevice;
+    private Boolean mIsServiceStateReady;
+    private Boolean mIsEnabledByUser;
+
+    /**
+     * Constructor
+     *
+     * @param context {@code Context}
+     * @param subId subscription's id
+     */
+    public MockWifiCallingQueryImsState(Context context, int subId) {
+        super(context, subId);
+    }
+
+    public void setIsTtyOnVolteEnabled(boolean enabled) {
+        mIsTtyOnVolteEnabled = enabled;
+    }
+
+    @Override
+    boolean isTtyOnVolteEnabled(int subId) {
+        if (mIsTtyOnVolteEnabled != null) {
+            return mIsTtyOnVolteEnabled;
+        }
+        return super.isTtyOnVolteEnabled(subId);
+    }
+
+
+    public void setIsEnabledByPlatform(boolean isEnabled) {
+        mIsEnabledOnPlatform = isEnabled;
+    }
+
+    @Override
+    boolean isEnabledByPlatform(int subId) throws InterruptedException, ImsException,
+            IllegalArgumentException {
+        if (mIsEnabledOnPlatform != null) {
+            return mIsEnabledOnPlatform;
+        }
+        return super.isEnabledByPlatform(subId);
+    }
+
+    public void setIsProvisionedOnDevice(boolean isProvisioned) {
+        mIsProvisionedOnDevice = isProvisioned;
+    }
+
+    @Override
+    boolean isProvisionedOnDevice(int subId) {
+        if (mIsProvisionedOnDevice != null) {
+            return mIsProvisionedOnDevice;
+        }
+        return super.isProvisionedOnDevice(subId);
+    }
+
+    public void setServiceStateReady(boolean isReady) {
+        mIsServiceStateReady = isReady;
+    }
+
+    @Override
+    boolean isServiceStateReady(int subId) throws InterruptedException, ImsException,
+            IllegalArgumentException {
+        if (mIsServiceStateReady != null) {
+            return mIsServiceStateReady;
+        }
+        return super.isServiceStateReady(subId);
+    }
+
+    public void setIsEnabledByUser(boolean enabled) {
+        mIsEnabledByUser = enabled;
+    }
+
+    @Override
+    boolean isEnabledByUser(int subId) {
+        if (mIsEnabledByUser != null) {
+            return mIsEnabledByUser;
+        }
+        return super.isEnabledByUser(subId);
+    }
+
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
new file mode 100644
index 0000000..1f3031a
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+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 android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.apn.ApnSettings;
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class ApnPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+
+    private ApnPreferenceController mController;
+    private RestrictedPreference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                mCarrierConfigManager);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+        mPreference = new RestrictedPreference(mContext);
+        mController = new ApnPreferenceController(mContext, "mobile_data");
+        mController.init(SUB_ID);
+        mController.setPreference(mPreference);
+        mController.mCarrierConfigManager = mCarrierConfigManager;
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_apnSettingsNotSupported_returnUnavailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, false);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_apnSettingsSupportedWithCDMA_returnAvailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL, true);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_apnSettingsSupportedWithGsm_returnAvailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_carrierConfigNull_returnUnavailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(null);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);
+        bundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, true);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void handPreferenceTreeClick_fireIntent() {
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(captor.capture());
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        final Intent intent = captor.getValue();
+        assertThat(intent.getAction()).isEqualTo(Settings.ACTION_APN_SETTINGS);
+        assertThat(intent.getIntExtra(ApnSettings.SUB_ID, 0)).isEqualTo(SUB_ID);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java
new file mode 100644
index 0000000..d4cdf8d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/CarrierPreferenceControllerTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doNothing;
+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.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class CarrierPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+    private static final String CARRIER_SETTINGS_COMPONENT = "packageName/className";
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+
+    private CarrierPreferenceController mController;
+    private RestrictedPreference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                mCarrierConfigManager);
+
+        mPreference = new RestrictedPreference(mContext);
+        mController = new CarrierPreferenceController(mContext, "mobile_data");
+        mController.init(SUB_ID);
+        mController.mCarrierConfigManager = mCarrierConfigManager;
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_cdmaWithFlagOff_returnUnavailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, false);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_cdmaWithFlagOnreturnAvailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_CDMA).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, true);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_gsmWithFlagOnreturnAvailable() {
+        doReturn(TelephonyManager.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL, true);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void handlePreferenceClick_activityFound_openCarrierSettingActivity() {
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putString(
+                CarrierConfigManager.KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING,
+                CARRIER_SETTINGS_COMPONENT);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+        PackageManager pm = Mockito.mock(PackageManager.class);
+        doReturn(pm).when(mContext).getPackageManager();
+        doReturn(new ResolveInfo()).when(pm).resolveActivity(any(Intent.class), anyInt());
+        final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(captor.capture());
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mContext).startActivity(captor.capture());
+        final Intent intent = captor.getValue();
+        assertThat(intent.getComponent()).isEqualTo(
+                ComponentName.unflattenFromString(CARRIER_SETTINGS_COMPONENT));
+    }
+
+    @Test
+    public void handlePreferenceClick_activityNotFound_DoNothing() {
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putString(
+                CarrierConfigManager.KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING,
+                CARRIER_SETTINGS_COMPONENT);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+        PackageManager pm = Mockito.mock(PackageManager.class);
+        doReturn(pm).when(mContext).getPackageManager();
+        doReturn(null).when(pm).resolveActivity(any(Intent.class), anyInt());
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        verify(mContext, never()).startActivity(captor.capture());
+    }
+
+    @Test
+    public void handlePreferenceClick_activityNotConfigured_DoNothing() {
+        final PersistableBundle bundle = new PersistableBundle();
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+        PackageManager pm = Mockito.mock(PackageManager.class);
+        doReturn(pm).when(mContext).getPackageManager();
+        doReturn(new ResolveInfo()).when(pm).resolveActivity(any(Intent.class), anyInt());
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        final ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        verify(mContext, never()).startActivity(captor.capture());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceControllerTest.java
new file mode 100644
index 0000000..3a5a21a
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/CarrierSettingsVersionPreferenceControllerTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class CarrierSettingsVersionPreferenceControllerTest {
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+
+    private CarrierSettingsVersionPreferenceController mController;
+    private int mSubscriptionId = 1234;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        Context context = spy(ApplicationProvider.getApplicationContext());
+        when(context.getSystemService(CarrierConfigManager.class)).thenReturn(mCarrierConfigManager);
+        mController = new CarrierSettingsVersionPreferenceController(context, "mock_key");
+        mController.init(mSubscriptionId);
+    }
+
+    @Test
+    public void getSummary_nullConfig_noCrash() {
+        doReturn(null).when(mCarrierConfigManager).getConfigForSubId(mSubscriptionId);
+
+        assertThat(mController.getSummary()).isNull();
+    }
+
+    @Test
+    public void getSummary_nullVersionString_noCrash() {
+        doReturn(new PersistableBundle()).when(mCarrierConfigManager)
+                .getConfigForSubId(mSubscriptionId);
+        assertThat(mController.getSummary()).isNull();
+    }
+
+    @Test
+    public void getSummary_hasVersionString_correctSummary() {
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putString(CarrierConfigManager.KEY_CARRIER_CONFIG_VERSION_STRING,
+                "test_version_123");
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(mSubscriptionId);
+
+        assertThat(mController.getSummary()).isEqualTo("test_version_123");
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/CrossSimCallingPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/CrossSimCallingPreferenceControllerTest.java
new file mode 100644
index 0000000..4b8a272
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/CrossSimCallingPreferenceControllerTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class CrossSimCallingPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    private CrossSimCallingPreferenceController mController;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+
+        mController = new CrossSimCallingPreferenceController(mContext, "cross_sim_calling_key");
+        mController.init(SUB_ID);
+    }
+
+    @Test
+    public void controller_isUnavailable() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
new file mode 100644
index 0000000..8ec2960
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+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 android.net.Uri;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.text.TextUtils;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.RestrictedPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class DataServiceSetupPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    private static final String SETUP_URL = "url://tmp_url:^1";
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+
+    private PersistableBundle mCarrierConfig;
+    private DataServiceSetupPreferenceController mController;
+    private Preference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(mCarrierConfigManager);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, SETUP_URL);
+
+        mCarrierConfig = new PersistableBundle();
+        doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        mPreference = new RestrictedPreference(mContext);
+        mController = new DataServiceSetupPreferenceController(mContext, "data_service_setup");
+        mController.init(SUB_ID);
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_allConfigOn_returnAvailable() {
+        doReturn(true).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_missUrl_returnUnavailable() {
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.SETUP_PREPAID_DATA_SERVICE_URL, "");
+        doReturn(true).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+
+        mController = new DataServiceSetupPreferenceController(mContext, "data_service_setup");
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_notCdma_returnUnavailable() {
+        doReturn(false).when(mTelephonyManager).isLteCdmaEvdoGsmWcdmaEnabled();
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_startActivity() {
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(captor.capture());
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        final Intent intent = captor.getValue();
+        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW);
+        assertThat(intent.getData()).isEqualTo(
+                Uri.parse(TextUtils.expandTemplate(SETUP_URL, "").toString()));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
new file mode 100644
index 0000000..282704d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java
@@ -0,0 +1,372 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Looper;
+import android.telecom.TelecomManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.testutils.ResourcesUtils;
+
+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 java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class DefaultSubscriptionControllerTest {
+    @Mock
+    private SubscriptionManager mManager;
+    @Mock
+    private TelecomManager mTelecomManager;
+
+    private PreferenceScreen mScreen;
+    private PreferenceManager mPreferenceManager;
+    private ListPreference mListPreference;
+    private Context mContext;
+    private DefaultSubscriptionController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mManager);
+        when(mContext.getSystemService(TelecomManager.class)).thenReturn(mTelecomManager);
+
+        final String key = "prefkey";
+        mController = new TestDefaultSubscriptionController(mContext, key);
+
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mPreferenceManager = new PreferenceManager(mContext);
+        mScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mListPreference = new ListPreference(mContext);
+        mListPreference.setKey(key);
+        mScreen.addPreference(mListPreference);
+    }
+
+    @After
+    public void tearDown() {
+        SubscriptionUtil.setActiveSubscriptionsForTesting(null);
+    }
+
+    @Test
+    public void getAvailabilityStatus_onlyOneSubscription_notAvailable() {
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(
+                createMockSub(1, "sub1")));
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_twoSubscriptions_isAvailable() {
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(
+                createMockSub(1, "sub1"),
+                createMockSub(2, "sub2")));
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void isCallingAccountBindToSubscription_invalidAccount_withoutCrash() {
+        doReturn(null).when(mTelecomManager).getPhoneAccount(any());
+
+        mController.isCallingAccountBindToSubscription(null);
+    }
+
+    @Test
+    public void getLabelFromCallingAccount_invalidAccount_emptyString() {
+        doReturn(null).when(mTelecomManager).getPhoneAccount(any());
+
+        assertThat(mController.getLabelFromCallingAccount(null)).isEqualTo("");
+    }
+
+    @Test
+    public void displayPreference_twoSubscriptionsSub1Default_correctListPreferenceValues() {
+        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
+        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+        mController.setDefaultSubscription(sub1.getSubscriptionId());
+
+        mController.displayPreference(mScreen);
+
+        final CharSequence entry = mListPreference.getEntry();
+        final String value = mListPreference.getValue();
+        assertThat(entry).isEqualTo("sub1");
+        assertThat(value).isEqualTo("111");
+
+        final CharSequence[] entries = mListPreference.getEntries();
+        assertThat(entries.length).isEqualTo(3);
+        assertThat(entries[0]).isEqualTo("sub1");
+        assertThat(entries[1]).isEqualTo("sub2");
+        assertThat(entries[2]).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
+
+        final CharSequence[] entryValues = mListPreference.getEntryValues();
+        assertThat(entryValues.length).isEqualTo(3);
+        assertThat(entryValues[0]).isEqualTo("111");
+        assertThat(entryValues[1]).isEqualTo("222");
+        assertThat(entryValues[2]).isEqualTo(
+                Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+    }
+
+    @Test
+    public void displayPreference_twoSubscriptionsSub2Default_correctListPreferenceValues() {
+        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
+        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+        mController.setDefaultSubscription(sub2.getSubscriptionId());
+
+        mController.displayPreference(mScreen);
+
+        final CharSequence entry = mListPreference.getEntry();
+        final String value = mListPreference.getValue();
+        assertThat(entry).isEqualTo("sub2");
+        assertThat(value).isEqualTo("222");
+
+        final CharSequence[] entries = mListPreference.getEntries();
+        assertThat(entries.length).isEqualTo(3);
+        assertThat(entries[0]).isEqualTo("sub1");
+        assertThat(entries[1]).isEqualTo("sub2");
+        assertThat(entries[2]).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
+
+        final CharSequence[] entryValues = mListPreference.getEntryValues();
+        assertThat(entryValues.length).isEqualTo(3);
+        assertThat(entryValues[0]).isEqualTo("111");
+        assertThat(entryValues[1]).isEqualTo("222");
+        assertThat(entryValues[2]).isEqualTo(
+                Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+    }
+
+    @Test
+    public void displayPreference_threeSubsOneIsOpportunistic_correctListPreferenceValues() {
+        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
+        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
+        final SubscriptionInfo sub3 = createMockSub(333, "sub3");
+
+        // Mark sub2 as opportunistic; then it should not appear in the list of entries/entryValues.
+        when(sub2.isOpportunistic()).thenReturn(true);
+
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2, sub3));
+        mController.setDefaultSubscription(sub1.getSubscriptionId());
+
+        mController.displayPreference(mScreen);
+
+        final CharSequence[] entries = mListPreference.getEntries();
+        assertThat(entries.length).isEqualTo(3);
+        assertThat(entries[0]).isEqualTo("sub1");
+        assertThat(entries[1]).isEqualTo("sub3");
+        assertThat(entries[2]).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
+
+        final CharSequence[] entryValues = mListPreference.getEntryValues();
+        assertThat(entryValues.length).isEqualTo(3);
+        assertThat(entryValues[0]).isEqualTo("111");
+        assertThat(entryValues[1]).isEqualTo("333");
+        assertThat(entryValues[2]).isEqualTo(
+                Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+    }
+
+    @Test
+    public void onPreferenceChange_prefChangedToSub2_callbackCalledCorrectly() {
+        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
+        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+        mController.setDefaultSubscription(sub1.getSubscriptionId());
+
+        mController.displayPreference(mScreen);
+        mListPreference.setValue("222");
+        mController.onPreferenceChange(mListPreference, "222");
+        assertThat(mController.getDefaultSubscriptionId()).isEqualTo(222);
+    }
+
+    @Test
+    public void onPreferenceChange_prefChangedToAlwaysAsk_callbackCalledCorrectly() {
+        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
+        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+        mController.setDefaultSubscription(sub1.getSubscriptionId());
+
+        mController.displayPreference(mScreen);
+        mListPreference.setValue(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+        mController.onPreferenceChange(mListPreference,
+                Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+        assertThat(mController.getDefaultSubscriptionId()).isEqualTo(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+    }
+
+    @Test
+    public void onPreferenceChange_prefBecomesAvailable_onPreferenceChangeCallbackNotNull() {
+        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
+        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
+
+        // Start with only one sub active, so the pref is not available
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
+        mController.setDefaultSubscription(sub1.getSubscriptionId());
+
+        mController.displayPreference(mScreen);
+        assertThat(mController.isAvailable()).isFalse();
+
+        // Now make two subs be active - the pref should become available, and the
+        // onPreferenceChange callback should be properly wired up.
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+
+        mController.onSubscriptionsChanged();
+
+        assertThat(mController.isAvailable()).isTrue();
+        mListPreference.callChangeListener("222");
+        assertThat(mController.getDefaultSubscriptionId()).isEqualTo(222);
+    }
+
+    @Test
+    public void onSubscriptionsChanged_twoSubscriptionsDefaultChanges_selectedEntryGetsUpdated() {
+        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
+        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+        mController.setDefaultSubscription(sub1.getSubscriptionId());
+
+        mController.displayPreference(mScreen);
+        assertThat(mListPreference.getEntry()).isEqualTo("sub1");
+        assertThat(mListPreference.getValue()).isEqualTo("111");
+
+        mController.setDefaultSubscription(sub2.getSubscriptionId());
+        mController.onSubscriptionsChanged();
+        assertThat(mListPreference.getEntry()).isEqualTo("sub2");
+        assertThat(mListPreference.getValue()).isEqualTo("222");
+    }
+
+    @Test
+    public void onSubscriptionsChanged_goFromTwoSubscriptionsToOne_prefDisappears() {
+        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
+        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+        mController.setDefaultSubscription(sub1.getSubscriptionId());
+
+        mController.displayPreference(mScreen);
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mListPreference.isVisible()).isTrue();
+
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
+        mController.onSubscriptionsChanged();
+
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mListPreference.isVisible()).isFalse();
+    }
+
+    @Test
+    public void onSubscriptionsChanged_goFromOneSubscriptionToTwo_prefAppears() {
+        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
+        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1));
+        mController.setDefaultSubscription(sub1.getSubscriptionId());
+
+        mController.displayPreference(mScreen);
+        assertThat(mController.isAvailable()).isFalse();
+        assertThat(mListPreference.isVisible()).isFalse();
+
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+        mController.onSubscriptionsChanged();
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mListPreference.isVisible()).isTrue();
+    }
+
+    @Test
+    public void onSubscriptionsChanged_goFromTwoToThreeSubscriptions_listGetsUpdated() {
+        final SubscriptionInfo sub1 = createMockSub(111, "sub1");
+        final SubscriptionInfo sub2 = createMockSub(222, "sub2");
+        final SubscriptionInfo sub3 = createMockSub(333, "sub3");
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2));
+        mController.setDefaultSubscription(sub1.getSubscriptionId());
+
+        mController.displayPreference(mScreen);
+        assertThat(mListPreference.getEntries().length).isEqualTo(3);
+
+        SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2, sub3));
+        mController.onSubscriptionsChanged();
+
+        assertThat(mController.isAvailable()).isTrue();
+        assertThat(mListPreference.isVisible()).isTrue();
+        final CharSequence[] entries = mListPreference.getEntries();
+        final CharSequence[] entryValues = mListPreference.getEntryValues();
+        assertThat(entries.length).isEqualTo(4);
+        assertThat(entries[0].toString()).isEqualTo("sub1");
+        assertThat(entries[1].toString()).isEqualTo("sub2");
+        assertThat(entries[2].toString()).isEqualTo("sub3");
+        assertThat(entries[3].toString()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time"));
+        assertThat(entryValues[0].toString()).isEqualTo("111");
+        assertThat(entryValues[1].toString()).isEqualTo("222");
+        assertThat(entryValues[2].toString()).isEqualTo("333");
+        assertThat(entryValues[3].toString()).isEqualTo(
+                Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID));
+    }
+
+    private SubscriptionInfo createMockSub(int id, String displayName) {
+        final SubscriptionInfo sub = mock(SubscriptionInfo.class);
+        when(sub.getSubscriptionId()).thenReturn(id);
+        when(sub.getDisplayName()).thenReturn(displayName);
+        return sub;
+    }
+
+    private class TestDefaultSubscriptionController extends DefaultSubscriptionController {
+        int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;
+
+        TestDefaultSubscriptionController(Context context, String preferenceKey) {
+            super(context, preferenceKey);
+        }
+
+        @Override
+        protected SubscriptionInfo getDefaultSubscriptionInfo() {
+            return null;
+        }
+
+        @Override
+        protected int getDefaultSubscriptionId() {
+            return mSubId;
+        }
+
+        @Override
+        protected void setDefaultSubscription(int subscriptionId) {
+            mSubId = subscriptionId;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceControllerTest.java
new file mode 100644
index 0000000..5f0bdd6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/DeleteSimProfilePreferenceControllerTest.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Looper;
+import android.provider.Settings;
+import android.telephony.SubscriptionInfo;
+
+import androidx.fragment.app.Fragment;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.security.ConfirmSimDeletionPreferenceController;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class DeleteSimProfilePreferenceControllerTest {
+    private static final String PREF_KEY = "delete_profile_key";
+    private static final int REQUEST_CODE = 4321;
+    private static final int SUB_ID = 1234;
+    private static final int OTHER_ID = 5678;
+
+    @Mock
+    private Fragment mFragment;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+
+    private Context mContext;
+    private PreferenceScreen mScreen;
+    private Preference mPreference;
+    private DeleteSimProfilePreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+
+        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscriptionInfo));
+        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(SUB_ID);
+        when(mSubscriptionInfo.isEmbedded()).thenReturn(true);
+
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        PreferenceManager preferenceManager = new PreferenceManager(mContext);
+        mScreen = preferenceManager.createPreferenceScreen(mContext);
+        mPreference = new Preference(mContext);
+        mPreference.setKey(PREF_KEY);
+        mScreen.addPreference(mPreference);
+
+        mController = new DeleteSimProfilePreferenceController(mContext, PREF_KEY);
+    }
+
+    @After
+    public void tearDown() {
+        SubscriptionUtil.setAvailableSubscriptionsForTesting(null);
+    }
+
+    @Test
+    public void getAvailabilityStatus_noSubs_notAvailable() {
+        SubscriptionUtil.setAvailableSubscriptionsForTesting(new ArrayList<>());
+        mController.init(SUB_ID, mFragment, REQUEST_CODE);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void getAvailabilityStatus_physicalSim_notAvailable() {
+        when(mSubscriptionInfo.isEmbedded()).thenReturn(false);
+        mController.init(SUB_ID, mFragment, REQUEST_CODE);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void getAvailabilityStatus_unknownSim_notAvailable() {
+        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(OTHER_ID);
+        mController.init(SUB_ID, mFragment, REQUEST_CODE);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void getAvailabilityStatus_knownEsim_isAvailable() {
+        mController.init(SUB_ID, mFragment, REQUEST_CODE);
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void onPreferenceClick_startsIntent() {
+        mController.init(SUB_ID, mFragment, REQUEST_CODE);
+        mController.displayPreference(mScreen);
+        // turn off confirmation before click
+        Settings.Global.putInt(mContext.getContentResolver(),
+                ConfirmSimDeletionPreferenceController.KEY_CONFIRM_SIM_DELETION, 0);
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(intentCaptor.capture());
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        verify(mContext, times(1)).startActivity(any());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/DisableSimFooterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DisableSimFooterPreferenceControllerTest.java
new file mode 100644
index 0000000..72feb30
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/DisableSimFooterPreferenceControllerTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.SubscriptionUtil;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class DisableSimFooterPreferenceControllerTest {
+    private static final String PREF_KEY = "pref_key";
+    private static final int SUB_ID = 111;
+
+    @Mock
+    private SubscriptionInfo mInfo;
+
+    private Context mContext;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    private DisableSimFooterPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mInfo.getSubscriptionId()).thenReturn(SUB_ID);
+        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mInfo));
+        mController = new DisableSimFooterPreferenceController(mContext, PREF_KEY);
+    }
+
+    @Test
+    public void isAvailable_noInit_notAvailable() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_eSIM_notAvailable() {
+        when(mInfo.isEmbedded()).thenReturn(true);
+        mController.init(SUB_ID);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_pSIM_available_cannot_disable_pSIM() {
+        when(mInfo.isEmbedded()).thenReturn(false);
+        mController.init(SUB_ID);
+        doReturn(false).when(mSubscriptionManager).canDisablePhysicalSubscription();
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_pSIM_available_can_disable_pSIM() {
+        when(mInfo.isEmbedded()).thenReturn(false);
+        mController.init(SUB_ID);
+        doReturn(true).when(mSubscriptionManager).canDisablePhysicalSubscription();
+        assertThat(mController.isAvailable()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
new file mode 100644
index 0000000..b269660
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/DisabledSubscriptionControllerTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Looper;
+import android.telephony.SubscriptionManager;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+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;
+
+@RunWith(AndroidJUnit4.class)
+public class DisabledSubscriptionControllerTest {
+
+    private static final String KEY = "disabled_subscription_category";
+    private static final int SUB_ID = 111;
+
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private Lifecycle mLifecycle;
+
+    private PreferenceScreen mScreen;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceCategory mCategory;
+    private Context mContext;
+    private DisabledSubscriptionController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+        mPreferenceManager = new PreferenceManager(mContext);
+        mScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mCategory = new PreferenceCategory(mContext);
+        mCategory.setKey(KEY);
+        mScreen.addPreference(mCategory);
+
+        mController = new DisabledSubscriptionController(mContext, KEY);
+        mController.init(mLifecycle, SUB_ID);
+    }
+
+    @Test
+    public void displayPreference_subscriptionEnabled_categoryIsVisible() {
+        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
+        mController.displayPreference(mScreen);
+        assertThat(mCategory.isVisible()).isTrue();
+    }
+
+    @Test
+    public void displayPreference_subscriptionDisabled_categoryIsNotVisible() {
+        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
+        mController.displayPreference(mScreen);
+        assertThat(mCategory.isVisible()).isFalse();
+    }
+
+    @Test
+    public void onSubscriptionsChanged_subscriptionBecomesDisabled_categoryIsNotVisible() {
+        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
+        mController.displayPreference(mScreen);
+        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
+        mController.onSubscriptionsChanged();
+        assertThat(mCategory.isVisible()).isFalse();
+    }
+
+    @Test
+    public void onSubscriptionsChanged_subscriptionBecomesEnabled_categoryIsVisible() {
+        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
+        mController.displayPreference(mScreen);
+        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);
+        mController.onSubscriptionsChanged();
+        assertThat(mCategory.isVisible()).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
new file mode 100644
index 0000000..ec4f1d7
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gBasePreferenceControllerTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.ims.ProvisioningManager;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settings.network.ims.MockVolteQueryImsState;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class Enhanced4gBasePreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private ProvisioningManager mProvisioningManager;
+
+    private MockVolteQueryImsState mQueryImsState;
+
+    private Enhanced4gLtePreferenceController mController;
+    private SwitchPreference mPreference;
+    private PersistableBundle mCarrierConfig;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(CarrierConfigManager.class))
+                .thenReturn(mCarrierConfigManager);
+
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+        mCarrierConfig = new PersistableBundle();
+        doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL, false);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
+        mCarrierConfig.putInt(CarrierConfigManager.KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT, 1);
+
+        mQueryImsState = spy(new MockVolteQueryImsState(mContext, SUB_ID));
+        mQueryImsState.setEnabledByPlatform(true);
+        mQueryImsState.setIsProvisionedOnDevice(true);
+        mQueryImsState.setIsTtyOnVolteEnabled(true);
+        mQueryImsState.setServiceStateReady(true);
+        mQueryImsState.setIsEnabledByUser(true);
+
+        mPreference = new RestrictedSwitchPreference(mContext);
+        mController = spy(new Enhanced4gLtePreferenceController(mContext, "VoLTE"));
+        mController.init(SUB_ID);
+        doReturn(mQueryImsState).when(mController).queryImsState(anyInt());
+        doReturn(true).when(mController).isCallStateIdle();
+        doReturn(1).when(mController).getMode();
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_default_returnUnavailable() {
+        mQueryImsState.setEnabledByPlatform(false);
+        mQueryImsState.setIsProvisionedOnDevice(false);
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_modeMismatch_returnUnavailable() {
+        doReturn(2).when(mController).getMode();
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_volteDisabled_returnUnavailable() {
+        mQueryImsState.setEnabledByPlatform(false);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void updateState_configEnabled_prefEnabled() {
+        mPreference.setEnabled(false);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_callStateNotIdle_prefDisabled() {
+        doReturn(false).when(mController).isCallStateIdle();
+        mPreference.setEnabled(true);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void updateState_configOn_prefChecked() {
+        mQueryImsState.setIsEnabledByUser(true);
+        mPreference.setChecked(false);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
new file mode 100644
index 0000000..2c6a8c6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/Enhanced4gLteSliceHelperTest.java
@@ -0,0 +1,293 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static android.app.slice.Slice.EXTRA_TOGGLE_STATE;
+import static android.app.slice.Slice.HINT_TITLE;
+import static android.app.slice.SliceItem.FORMAT_TEXT;
+
+import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.telephony.CarrierConfigManager;
+import android.telephony.ims.ProvisioningManager;
+
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.SliceProvider;
+import androidx.slice.core.SliceAction;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.widget.SliceLiveData;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.ims.MockVolteQueryImsState;
+import com.android.settings.network.ims.VolteQueryImsState;
+import com.android.settings.slices.CustomSliceRegistry;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBroadcastReceiver;
+import com.android.settings.slices.SlicesFeatureProvider;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.ResourcesUtils;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class Enhanced4gLteSliceHelperTest {
+    private static final int SUB_ID = 1;
+
+    @Mock
+    private CarrierConfigManager mMockCarrierConfigManager;
+
+    @Mock
+    private ProvisioningManager mProvisioningManager;
+
+    private MockVolteQueryImsState mQueryImsState;
+
+    private Context mContext;
+    private FakeEnhanced4gLteSliceHelper mEnhanced4gLteSliceHelper;
+    private SettingsSliceProvider mProvider;
+    private SliceBroadcastReceiver mReceiver;
+    private FakeFeatureFactory mFeatureFactory;
+    private SlicesFeatureProvider mSlicesFeatureProvider;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mFeatureFactory = FakeFeatureFactory.setupForTest();
+        mSlicesFeatureProvider = mFeatureFactory.getSlicesFeatureProvider();
+
+        //setup for SettingsSliceProvider tests
+        mProvider = new SettingsSliceProvider();
+        mProvider.attachInfo(mContext, null);
+        mProvider.onCreateSliceProvider();
+
+
+        //setup for SliceBroadcastReceiver test
+        mReceiver = spy(new SliceBroadcastReceiver());
+
+        mQueryImsState = spy(new MockVolteQueryImsState(mContext, SUB_ID));
+        mQueryImsState.setEnabledByPlatform(true);
+        mQueryImsState.setIsProvisionedOnDevice(true);
+        mQueryImsState.setIsTtyOnVolteEnabled(true);
+        mQueryImsState.setServiceStateReady(true);
+        mQueryImsState.setIsEnabledByUser(true);
+
+        mEnhanced4gLteSliceHelper = spy(new FakeEnhanced4gLteSliceHelper(mContext));
+
+        // Set-up specs for SliceMetadata.
+        SliceProvider.setSpecs(SliceLiveData.SUPPORTED_SPECS);
+    }
+
+    @Test
+    public void createEnhanced4gLteSlice_invalidSubId_nullSlice() {
+        mQueryImsState.setEnabledByPlatform(false);
+        mQueryImsState.setIsProvisionedOnDevice(false);
+        mQueryImsState.setIsEnabledByUser(false);
+
+        final Slice slice = mEnhanced4gLteSliceHelper.createEnhanced4gLteSlice(
+                CustomSliceRegistry.ENHANCED_4G_SLICE_URI);
+
+        assertThat(slice).isNull();
+    }
+
+    @Test
+    public void createEnhanced4gLteSlice_enhanced4gLteNotSupported_nullSlice() {
+        mQueryImsState.setEnabledByPlatform(false);
+
+        final Slice slice = mEnhanced4gLteSliceHelper.createEnhanced4gLteSlice(
+                CustomSliceRegistry.ENHANCED_4G_SLICE_URI);
+
+        assertThat(mEnhanced4gLteSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        assertThat(slice).isNull();
+    }
+
+    @Test
+    public void createEnhanced4gLteSlice_success() {
+        mQueryImsState.setEnabledByPlatform(true);
+        mQueryImsState.setIsProvisionedOnDevice(true);
+        when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
+
+        final Slice slice = mEnhanced4gLteSliceHelper.createEnhanced4gLteSlice(
+                CustomSliceRegistry.ENHANCED_4G_SLICE_URI);
+
+        assertThat(mEnhanced4gLteSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        testEnhanced4gLteSettingsToggleSlice(slice);
+    }
+
+    @Test
+    public void sttingSliceProvider_enhanced4gLteHelper_getsRightSlice() {
+        mQueryImsState.setEnabledByPlatform(true);
+        mQueryImsState.setIsProvisionedOnDevice(true);
+        when(mMockCarrierConfigManager.getConfigForSubId(1)).thenReturn(null);
+        when(mSlicesFeatureProvider.getNewEnhanced4gLteSliceHelper(mContext))
+            .thenReturn(mEnhanced4gLteSliceHelper);
+
+        final Slice slice = mProvider.onBindSlice(CustomSliceRegistry.ENHANCED_4G_SLICE_URI);
+
+        assertThat(mEnhanced4gLteSliceHelper.getDefaultVoiceSubId()).isEqualTo(1);
+        testEnhanced4gLteSettingsToggleSlice(slice);
+    }
+
+    @Test
+    @Ignore
+    public void sliceBroadcastReceiver_toggleOffEnhanced4gLte() {
+        mQueryImsState.setEnabledByPlatform(true);
+        mQueryImsState.setIsProvisionedOnDevice(true);
+        mQueryImsState.setIsEnabledByUser(false);
+        when(mSlicesFeatureProvider.getNewEnhanced4gLteSliceHelper(mContext))
+            .thenReturn(mEnhanced4gLteSliceHelper);
+
+        final ArgumentCaptor<Boolean> mEnhanced4gLteSettingCaptor = ArgumentCaptor.forClass(
+                Boolean.class);
+
+        // turn on Enhanced4gLte setting
+        final Intent intent = new Intent(Enhanced4gLteSliceHelper.ACTION_ENHANCED_4G_LTE_CHANGED);
+        intent.putExtra(EXTRA_TOGGLE_STATE, true);
+
+        // change the setting
+        mReceiver.onReceive(mContext, intent);
+
+        verify(mEnhanced4gLteSliceHelper).setEnhanced4gLteModeSetting(anyInt(),
+                mEnhanced4gLteSettingCaptor.capture());
+
+        // assert the change
+        assertThat(mEnhanced4gLteSettingCaptor.getValue()).isTrue();
+    }
+
+    private void testEnhanced4gLteSettingsUnavailableSlice(Slice slice,
+            PendingIntent expectedPrimaryAction) {
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+
+        //Check there is no toggle action
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).isEmpty();
+
+        // Check whether the primary action is to open Enhanced4gLte settings activity
+        final PendingIntent primaryPendingIntent =
+                metadata.getPrimaryAction().getAction();
+        assertThat(primaryPendingIntent).isEqualTo(expectedPrimaryAction);
+
+        // Check the title
+        final List<SliceItem> sliceItems = slice.getItems();
+        assertTitle(sliceItems,
+                ResourcesUtils.getResourcesString(mContext, "enhanced_4g_lte_mode_title"));
+    }
+
+    private void testEnhanced4gLteSettingsToggleSlice(Slice slice) {
+        final SliceMetadata metadata = SliceMetadata.from(mContext, slice);
+
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).hasSize(1);
+
+        final SliceAction mainToggleAction = toggles.get(0);
+
+        // Check intent in Toggle Action
+        final PendingIntent togglePendingIntent = mainToggleAction.getAction();
+        final PendingIntent expectedToggleIntent = getBroadcastIntent(
+                Enhanced4gLteSliceHelper.ACTION_ENHANCED_4G_LTE_CHANGED);
+        assertThat(togglePendingIntent).isEqualTo(expectedToggleIntent);
+
+        // Check primary intent
+        final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
+        final PendingIntent expectedPendingIntent =
+                getActivityIntent(Enhanced4gLteSliceHelper.ACTION_MOBILE_NETWORK_SETTINGS_ACTIVITY);
+        assertThat(primaryPendingIntent).isEqualTo(expectedPendingIntent);
+
+        // Check the title
+        final List<SliceItem> sliceItems = slice.getItems();
+        assertTitle(sliceItems,
+                ResourcesUtils.getResourcesString(mContext, "enhanced_4g_lte_mode_title"));
+    }
+
+    private PendingIntent getBroadcastIntent(String action) {
+        final Intent intent = new Intent(action);
+        intent.setClass(mContext, SliceBroadcastReceiver.class);
+        return PendingIntent.getBroadcast(mContext, 0 /* requestCode */, intent,
+                PendingIntent.FLAG_NO_CREATE | PendingIntent.FLAG_IMMUTABLE);
+    }
+
+    private PendingIntent getActivityIntent(String action) {
+        final Intent intent = new Intent(action);
+        intent.setPackage(SETTINGS_PACKAGE_NAME);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        return PendingIntent.getActivity(mContext, 0 /* requestCode */, intent,
+                PendingIntent.FLAG_IMMUTABLE);
+    }
+
+    private void assertTitle(List<SliceItem> sliceItems, String title) {
+        boolean hasTitle = false;
+        for (SliceItem item : sliceItems) {
+            final List<SliceItem> titleItems = SliceQuery.findAll(item, FORMAT_TEXT, HINT_TITLE,
+                    null /* non-hints */);
+            if (titleItems == null) {
+                continue;
+            }
+
+            hasTitle = true;
+            for (SliceItem subTitleItem : titleItems) {
+                assertThat(subTitleItem.getText()).isEqualTo(title);
+            }
+        }
+        assertThat(hasTitle).isTrue();
+    }
+
+    public class FakeEnhanced4gLteSliceHelper extends Enhanced4gLteSliceHelper {
+        int mSubId = SUB_ID;
+
+        FakeEnhanced4gLteSliceHelper(Context context) {
+            super(context);
+        }
+
+        @Override
+        protected CarrierConfigManager getCarrierConfigManager() {
+            return mMockCarrierConfigManager;
+        }
+
+        protected int getDefaultVoiceSubId() {
+            return mSubId;
+        }
+
+        private void setDefaultVoiceSubId(int id) {
+            mSubId = id;
+        }
+
+        @Override
+        protected VolteQueryImsState queryImsState(int subId) {
+            return mQueryImsState;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
new file mode 100644
index 0000000..f1ad2ff
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.telephony.TelephonyManager;
+import android.telephony.euicc.EuiccManager;
+
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+
+@RunWith(AndroidJUnit4.class)
+public class EuiccPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock private TelephonyManager mTelephonyManager;
+
+    private EuiccPreferenceController mController;
+    private Preference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+
+        mPreference = new Preference(mContext);
+        mController = new EuiccPreferenceController(mContext, "euicc");
+        mController.init(SUB_ID);
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_startActivity() {
+        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(captor.capture());
+
+        mController.handlePreferenceTreeClick(mPreference);
+
+        assertThat(captor.getValue().getAction()).isEqualTo(
+                EuiccManager.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
new file mode 100644
index 0000000..67f5f1a
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/MmsMessagePreferenceControllerTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.data.ApnSetting;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class MmsMessagePreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+
+    private MmsMessagePreferenceController mController;
+    private SwitchPreference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+
+        mPreference = new SwitchPreference(mContext);
+        mController = new MmsMessagePreferenceController(mContext, "mms_message");
+        mController.init(SUB_ID);
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_invalidSubscription_returnUnavailable() {
+        mController.init(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_mobileDataOn_returnUnavailable() {
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus(SUB_ID)).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_meteredOff_returnUnavailable() {
+        when(mTelephonyManager.isApnMetered(ApnSetting.TYPE_MMS)).thenReturn(false);
+
+        assertThat(mController.getAvailabilityStatus(SUB_ID)).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_mobileDataOffWithValidSubId_returnAvailable() {
+        mController.init(SUB_ID);
+        when(mTelephonyManager.isDataEnabled()).thenReturn(false);
+        when(mTelephonyManager.isApnMetered(ApnSetting.TYPE_MMS)).thenReturn(true);
+
+        assertThat(mController.getAvailabilityStatus(SUB_ID)).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void isChecked_returnDataFromTelephonyManager() {
+        when(mTelephonyManager.isDataEnabledForApn(ApnSetting.TYPE_MMS)).thenReturn(false);
+        assertThat(mController.isChecked()).isFalse();
+
+        when(mTelephonyManager.isDataEnabledForApn(ApnSetting.TYPE_MMS)).thenReturn(true);
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void setChecked_setDataIntoSubscriptionManager() {
+        mController.setChecked(true);
+        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, true);
+
+        mController.setChecked(false);
+        verify(mTelephonyManager).setMobileDataPolicyEnabledStatus(
+                TelephonyManager.MOBILE_DATA_POLICY_MMS_ALWAYS_ALLOWED, false);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
new file mode 100644
index 0000000..cf4eb91
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.settings.testutils.ResourcesUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+
+@RunWith(AndroidJUnit4.class)
+public class MobileDataPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+    private static final int SUB_ID_OTHER = 3;
+
+    @Mock
+    private FragmentManager mFragmentManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+    @Mock
+    private FragmentTransaction mFragmentTransaction;
+
+    private MobileDataPreferenceController mController;
+    private SwitchPreference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
+
+        mPreference = new SwitchPreference(mContext);
+        mController = new MobileDataPreferenceController(mContext, "mobile_data");
+        mController.init(mFragmentManager, SUB_ID);
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_invalidSubscription_returnAvailableUnsearchable() {
+        mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Test
+    public void isDialogNeeded_disableSingleSim_returnFalse() {
+        doReturn(true).when(mTelephonyManager).isDataEnabled();
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+        doReturn(1).when(mTelephonyManager).getActiveModemCount();
+
+        assertThat(mController.isDialogNeeded()).isFalse();
+    }
+
+    @Test
+    public void isDialogNeeded_enableNonDefaultSimInMultiSimMode_returnTrue() {
+        doReturn(false).when(mTelephonyManager).isDataEnabled();
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager)
+                .getActiveSubscriptionInfo(SUB_ID);
+        // Ideally, it would be better if we could set the default data subscription to
+        // SUB_ID_OTHER, and set that as an active subscription id.
+        when(mSubscriptionManager.isActiveSubscriptionId(anyInt())).thenReturn(true);
+        doReturn(2).when(mTelephonyManager).getActiveModemCount();
+
+        assertThat(mController.isDialogNeeded()).isTrue();
+        assertThat(mController.mDialogType).isEqualTo(
+                MobileDataDialogFragment.TYPE_MULTI_SIM_DIALOG);
+    }
+
+    @Test
+    public void handlePreferenceTreeClick_needDialog_showDialog() {
+        mController.mNeedDialog = true;
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+
+        instrumentation.runOnMainSync(() -> {
+            mController.handlePreferenceTreeClick(mPreference);
+        });
+        verify(mFragmentManager).beginTransaction();
+    }
+
+    @Test
+    public void onPreferenceChange_singleSim_On_shouldEnableData() {
+        doReturn(true).when(mTelephonyManager).isDataEnabled();
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+        doReturn(1).when(mTelephonyManager).getActiveModemCount();
+
+        mController.onPreferenceChange(mPreference, true);
+
+        verify(mTelephonyManager).setDataEnabled(true);
+    }
+
+    @Test
+    public void onPreferenceChange_multiSim_On_shouldEnableData() {
+        doReturn(true).when(mTelephonyManager).isDataEnabled();
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+        doReturn(2).when(mTelephonyManager).getActiveModemCount();
+
+        mController.onPreferenceChange(mPreference, true);
+
+        verify(mTelephonyManager).setDataEnabled(true);
+    }
+
+    @Test
+    public void isChecked_returnUserDataEnabled() {
+        mController.init(mFragmentManager, SUB_ID);
+        assertThat(mController.isChecked()).isFalse();
+
+        doReturn(true).when(mTelephonyManager).isDataEnabled();
+        assertThat(mController.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_opportunistic_disabled() {
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+        mController.init(mFragmentManager, SUB_ID);
+        doReturn(true).when(mSubscriptionInfo).isOpportunistic();
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+        assertThat(mPreference.getSummary()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext,
+                        "mobile_data_settings_summary_auto_switch"));
+    }
+
+    @Test
+    public void updateState_notOpportunistic_enabled() {
+        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);
+        mController.init(mFragmentManager, SUB_ID);
+        doReturn(false).when(mSubscriptionInfo).isOpportunistic();
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isTrue();
+        assertThat(mPreference.getSummary()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "mobile_data_settings_summary"));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java
new file mode 100644
index 0000000..34849b9
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkSwitchControllerTest.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Looper;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.SubscriptionUtil;
+import com.android.settings.testutils.ResourcesUtils;
+import com.android.settings.widget.SwitchBar;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+import com.android.settingslib.widget.LayoutPreference;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class MobileNetworkSwitchControllerTest {
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubscription;
+    @Mock
+    private Lifecycle mLifecycle;
+    @Mock
+    private LayoutPreference mLayoutPreference;
+
+    private PreferenceScreen mScreen;
+    private PreferenceManager mPreferenceManager;
+    private SwitchBar mSwitchBar;
+    private Context mContext;
+    private MobileNetworkSwitchController mController;
+    private int mSubId = 123;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))
+                .thenReturn(true);
+
+        when(mSubscription.isEmbedded()).thenReturn(true);
+        when(mSubscription.getSubscriptionId()).thenReturn(mSubId);
+        // Most tests want to have 2 available subscriptions so that the switch bar will show.
+        final SubscriptionInfo sub2 = mock(SubscriptionInfo.class);
+        when(sub2.getSubscriptionId()).thenReturn(456);
+        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription, sub2));
+
+        final String key = "prefKey";
+        mController = new MobileNetworkSwitchController(mContext, key);
+        mController.init(mLifecycle, mSubscription.getSubscriptionId());
+
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        mPreferenceManager = new PreferenceManager(mContext);
+        mScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        mScreen.addPreference(mLayoutPreference);
+        mSwitchBar = new SwitchBar(mContext);
+        doReturn(key).when(mLayoutPreference).getKey();
+        when(mLayoutPreference.findViewById(
+                ResourcesUtils.getResourcesId(mContext, "id", "switch_bar"))).thenReturn(
+                mSwitchBar);
+    }
+
+    @After
+    public void cleanUp() {
+        SubscriptionUtil.setAvailableSubscriptionsForTesting(null);
+    }
+
+    @Test
+    @UiThreadTest
+    public void isAvailable_pSIM_isNotAvailable() {
+        when(mSubscription.isEmbedded()).thenReturn(false);
+        mController.displayPreference(mScreen);
+        assertThat(mSwitchBar.isShowing()).isFalse();
+
+        when(mSubscriptionManager.canDisablePhysicalSubscription()).thenReturn(true);
+        mController.displayPreference(mScreen);
+        assertThat(mSwitchBar.isShowing()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void displayPreference_oneEnabledSubscription_switchBarNotHidden() {
+        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(mSubId);
+        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
+        mController.displayPreference(mScreen);
+        assertThat(mSwitchBar.isShowing()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void displayPreference_oneDisabledSubscription_switchBarNotHidden() {
+        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(mSubId);
+        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));
+
+        mController.displayPreference(mScreen);
+
+        assertThat(mSwitchBar.isShowing()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void displayPreference_subscriptionEnabled_switchIsOn() {
+        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
+        mController.displayPreference(mScreen);
+        assertThat(mSwitchBar.isShowing()).isTrue();
+        assertThat(mSwitchBar.isChecked()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void displayPreference_subscriptionDisabled_switchIsOff() {
+        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
+
+        mController.displayPreference(mScreen);
+
+        assertThat(mSwitchBar.isShowing()).isTrue();
+        assertThat(mSwitchBar.isChecked()).isFalse();
+    }
+
+    @Test
+    @UiThreadTest
+    public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledCalledCorrectly() {
+        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
+        mController.displayPreference(mScreen);
+        assertThat(mSwitchBar.isShowing()).isTrue();
+        assertThat(mSwitchBar.isChecked()).isTrue();
+
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(intentCaptor.capture());
+        mSwitchBar.setChecked(false);
+        Bundle extra = intentCaptor.getValue().getExtras();
+
+        verify(mContext, times(1)).startActivity(any());
+        assertThat(extra.getInt(ToggleSubscriptionDialogActivity.ARG_SUB_ID)).isEqualTo(mSubId);
+        assertThat(extra.getBoolean(ToggleSubscriptionDialogActivity.ARG_enable))
+                .isEqualTo(false);
+    }
+
+    @Test
+    @UiThreadTest
+    public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledFailed() {
+        when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))
+                .thenReturn(false);
+        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);
+        mController.displayPreference(mScreen);
+        assertThat(mSwitchBar.isShowing()).isTrue();
+        assertThat(mSwitchBar.isChecked()).isTrue();
+
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(intentCaptor.capture());
+        mSwitchBar.setChecked(false);
+        Bundle extra = intentCaptor.getValue().getExtras();
+
+        verify(mContext, times(1)).startActivity(any());
+        assertThat(extra.getInt(ToggleSubscriptionDialogActivity.ARG_SUB_ID)).isEqualTo(mSubId);
+        assertThat(extra.getBoolean(ToggleSubscriptionDialogActivity.ARG_enable))
+                .isEqualTo(false);
+        assertThat(mSwitchBar.isChecked()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void switchChangeListener_fromDisabledToEnabled_setSubscriptionEnabledCalledCorrectly() {
+        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);
+        mController.displayPreference(mScreen);
+        assertThat(mSwitchBar.isShowing()).isTrue();
+        assertThat(mSwitchBar.isChecked()).isFalse();
+
+        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);
+        doNothing().when(mContext).startActivity(intentCaptor.capture());
+        mSwitchBar.setChecked(true);
+        Bundle extra = intentCaptor.getValue().getExtras();
+
+        verify(mContext, times(1)).startActivity(any());
+        assertThat(extra.getInt(ToggleSubscriptionDialogActivity.ARG_SUB_ID)).isEqualTo(mSubId);
+        assertThat(extra.getBoolean(ToggleSubscriptionDialogActivity.ARG_enable)).isEqualTo(true);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
new file mode 100644
index 0000000..9c0a082
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/MobileNetworkUtilsTest.java
@@ -0,0 +1,422 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.nullable;
+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.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.ims.MockWfcQueryImsState;
+import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class MobileNetworkUtilsTest {
+    private static final String PACKAGE_NAME = "com.android.app";
+    private static final int SUB_ID_1 = 1;
+    private static final int SUB_ID_2 = 2;
+    private static final int SUB_ID_INVALID = -1;
+    private static final String PLMN_FROM_TELEPHONY_MANAGER_API = "testPlmn";
+    private static final String PLMN_FROM_SUB_ID_1 = "testPlmnSub1";
+    private static final String PLMN_FROM_SUB_ID_2 = "testPlmnSub2";
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mTelephonyManager2;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo1;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo2;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private ResolveInfo mResolveInfo;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private TelecomManager mTelecomManager;
+
+    private Context mContext;
+    private PersistableBundle mCarrierConfig;
+    private PhoneAccountHandle mPhoneAccountHandle;
+    private ComponentName mComponentName;
+    private NetworkCapabilities mNetworkCapabilities;
+    private Network mNetwork;
+    private MockWfcQueryImsState mMockQueryWfcState;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID_1)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID_2)).thenReturn(mTelephonyManager2);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                mCarrierConfigManager);
+
+        mCarrierConfig = new PersistableBundle();
+        when(mCarrierConfigManager.getConfigForSubId(SUB_ID_1)).thenReturn(mCarrierConfig);
+
+        mNetwork = new Network(anyInt());
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mConnectivityManager.getActiveNetwork()).thenReturn(mNetwork);
+
+        when(mSubscriptionInfo1.getSubscriptionId()).thenReturn(SUB_ID_1);
+        when(mSubscriptionInfo1.getCarrierName()).thenReturn(PLMN_FROM_SUB_ID_1);
+        when(mSubscriptionInfo2.getSubscriptionId()).thenReturn(SUB_ID_2);
+        when(mSubscriptionInfo2.getCarrierName()).thenReturn(PLMN_FROM_SUB_ID_2);
+
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+        when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
+
+        when(mTelephonyManager.getNetworkOperatorName()).thenReturn(
+                PLMN_FROM_TELEPHONY_MANAGER_API);
+
+        when(mContext.getSystemService(TelecomManager.class)).thenReturn(mTelecomManager);
+        when(mTelecomManager.getSimCallManagerForSubscription(SUB_ID_1))
+                .thenReturn(mPhoneAccountHandle);
+        mMockQueryWfcState = new MockWfcQueryImsState(mContext, SUB_ID_1);
+    }
+
+    @Test
+    public void setMobileDataEnabled_setEnabled_enabled() {
+        MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_1, true, false);
+
+        verify(mTelephonyManager).setDataEnabled(true);
+        verify(mTelephonyManager2, never()).setDataEnabled(anyBoolean());
+    }
+
+    @Test
+    public void setMobileDataEnabled_setDisabled_disabled() {
+        MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_2, true, false);
+
+        verify(mTelephonyManager2).setDataEnabled(true);
+        verify(mTelephonyManager, never()).setDataEnabled(anyBoolean());
+    }
+
+    @Test
+    public void setMobileDataEnabled_disableOtherSubscriptions() {
+        MobileNetworkUtils.setMobileDataEnabled(mContext, SUB_ID_1, true, true);
+
+        verify(mTelephonyManager).setDataEnabled(true);
+        verify(mTelephonyManager2).setDataEnabled(false);
+    }
+
+    @Test
+    public void buildConfigureIntent_nullHandle_returnNull() {
+        assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext, null)).isNull();
+    }
+
+    @Test
+    public void buildConfigureIntent_noActivityHandleIntent_returnNull() {
+        buildPhoneAccountConfigureIntent(false);
+
+        assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
+                mPhoneAccountHandle)).isNull();
+    }
+
+    @Test
+    public void buildConfigureIntent_hasActivityHandleIntent_returnIntent() {
+        buildPhoneAccountConfigureIntent(true);
+
+        assertThat(MobileNetworkUtils.buildPhoneAccountConfigureIntent(mContext,
+                mPhoneAccountHandle)).isNotNull();
+    }
+
+    @Test
+    public void isCdmaOptions_phoneTypeCdma_returnTrue() {
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
+
+        assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void isCdmaOptions_worldModeWithGsmWcdma_returnTrue() {
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
+
+        assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void isCdmaOptions_carrierWorldModeWithoutHideCarrier_returnTrue() {
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL, true);
+
+        assertThat(MobileNetworkUtils.isCdmaOptions(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void getSearchableSubscriptionId_oneActive_returnValid() {
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo1));
+        assertThat(MobileNetworkUtils.getSearchableSubscriptionId(mContext)).isEqualTo(SUB_ID_1);
+    }
+
+    @Test
+    public void getSearchableSubscriptionId_nonActive_returnInvalid() {
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(new ArrayList<>());
+
+        assertThat(MobileNetworkUtils.getSearchableSubscriptionId(mContext))
+                .isEqualTo(SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+    }
+
+    @Test
+    public void shouldDisplayNetworkSelectOptions_HideCarrierNetwork_returnFalse() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                true);
+
+        assertThat(MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext, SUB_ID_1))
+                .isFalse();
+    }
+
+    @Test
+    public void shouldDisplayNetworkSelectOptions_allCheckPass_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL, false);
+        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);
+
+        assertThat(MobileNetworkUtils.shouldDisplayNetworkSelectOptions(mContext, SUB_ID_1))
+                .isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_notWorldMode_returnFalse() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, false);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isFalse();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_supportTdscdma_returnFalse() {
+        when(mCarrierConfigManager.getConfig()).thenReturn(mCarrierConfig);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, true);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isFalse();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaGsm_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaGsmWcdma_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdma_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaWcdma_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteTdscdmaCdmaEvdoGsmWcdma_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void shouldSpeciallyUpdateGsmCdma_ModeLteCdmaEvdoGsmWcdma_returnTrue() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_WORLD_MODE_ENABLED_BOOL, true);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL, false);
+        Settings.Global.putInt(mContext.getContentResolver(),
+                android.provider.Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID_1,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA);
+
+        assertThat(MobileNetworkUtils.shouldSpeciallyUpdateGsmCdma(mContext, SUB_ID_1)).isTrue();
+    }
+
+    @Test
+    public void getCurrentCarrierNameForDisplay_withoutValidSubId_returnNetworkOperatorName() {
+        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
+                mContext, SUB_ID_INVALID)).isEqualTo(PLMN_FROM_TELEPHONY_MANAGER_API);
+    }
+
+    @Test
+    public void getCurrentCarrierNameForDisplay_withValidSubId_returnCurrentCarrierName() {
+        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
+                mContext, SUB_ID_1)).isEqualTo(PLMN_FROM_SUB_ID_1);
+        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
+                mContext, SUB_ID_2)).isEqualTo(PLMN_FROM_SUB_ID_2);
+    }
+
+    @Test
+    public void getCurrentCarrierNameForDisplay_withoutSubId_returnNotNull() {
+        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(
+                mContext)).isNotNull();
+    }
+
+    @Test
+    public void isCellularNetwork_withCellularNetwork_returnTrue() {
+        addNetworkTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);
+
+        assertTrue(MobileNetworkUtils.activeNetworkIsCellular(mContext));
+    }
+
+    @Test
+    public void isCellularNetwork_withWifiNetwork_returnFalse() {
+        addNetworkTransportType(NetworkCapabilities.TRANSPORT_WIFI);
+
+        assertFalse(MobileNetworkUtils.activeNetworkIsCellular(mContext));
+    }
+
+    private void addNetworkTransportType (int networkType) {
+        mNetworkCapabilities = new NetworkCapabilities().addTransportType(networkType);
+        when(mConnectivityManager.getNetworkCapabilities(mNetwork)).thenReturn(
+                mNetworkCapabilities);
+    }
+
+    @Test
+    public void isWifiCallingEnabled_hasPhoneAccountHandleAndHasActivityHandleIntent_returnTrue() {
+        buildPhoneAccountConfigureIntent(true);
+
+        assertTrue(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+                null, mPhoneAccountHandle));
+    }
+
+    @Test
+    public void isWifiCallingEnabled_hasPhoneAccountHandleAndNoActivityHandleIntent_returnFalse() {
+        buildPhoneAccountConfigureIntent(false);
+
+        assertFalse(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+                null, mPhoneAccountHandle));
+    }
+
+    @Test
+    public void isWifiCallingEnabled_noPhoneAccountHandleAndWifiCallingIsReady_returnTrue() {
+        setWifiCallingEnabled(true);
+
+        assertTrue(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+                mMockQueryWfcState, null));
+    }
+
+    @Test
+    public void isWifiCallingEnabled_noPhoneAccountHandleAndWifiCallingNotReady_returnFalse() {
+        setWifiCallingEnabled(false);
+
+        assertFalse(MobileNetworkUtils.isWifiCallingEnabled(mContext, SUB_ID_1,
+                mMockQueryWfcState, null));
+    }
+
+    private void setWifiCallingEnabled(boolean enabled){
+        mMockQueryWfcState.setIsEnabledByUser(enabled);
+        mMockQueryWfcState.setServiceStateReady(enabled);
+        mMockQueryWfcState.setIsEnabledByPlatform(enabled);
+        mMockQueryWfcState.setIsProvisionedOnDevice(enabled);
+    }
+
+    private void buildPhoneAccountConfigureIntent(boolean hasActivityHandleIntent) {
+        mComponentName = new ComponentName(PACKAGE_NAME, "testClass");
+        mPhoneAccountHandle = new PhoneAccountHandle(mComponentName, "");
+        when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
+                .thenReturn(
+                        hasActivityHandleIntent ? Arrays.asList(mResolveInfo) : new ArrayList<>());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java
new file mode 100644
index 0000000..ed6f161
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingGroupTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.network.telephony;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Looper;
+import android.os.PersistableBundle;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.util.FeatureFlagUtils;
+
+import com.android.settings.network.ims.MockWfcQueryImsState;
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class NetworkProviderWifiCallingGroupTest {
+
+    private static final int SUB_ID = 1;
+    private static final String KEY_PREFERENCE_WFC_CATEGORY = "provider_model_calling_category";
+    private static final String PACKAGE_NAME = "com.android.settings";
+
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private Lifecycle mLifecycle;
+    @Mock
+    private PreferenceCategory mPreferenceCategory;
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private ResolveInfo mResolveInfo;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+    @Mock
+    private TelecomManager mTelecomManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+
+    private ComponentName mComponentName;
+    private Context mContext;
+    private MockWfcQueryImsState mMockQueryWfcState;
+    private NetworkProviderWifiCallingGroup mNetworkProviderWifiCallingGroup;
+    private PersistableBundle mCarrierConfig;
+    private PhoneAccountHandle mPhoneAccountHandle;
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mPreferenceScreen;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                mCarrierConfigManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(TelecomManager.class)).thenReturn(mTelecomManager);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+
+        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(SUB_ID);
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo));
+
+        mCarrierConfig = new PersistableBundle();
+        doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, true);
+        when(mTelecomManager.getSimCallManagerForSubscription(SUB_ID))
+                .thenReturn(mPhoneAccountHandle);
+        mMockQueryWfcState = new MockWfcQueryImsState(mContext, SUB_ID);
+
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        mPreferenceManager = new PreferenceManager(mContext);
+        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        when(mPreferenceCategory.getKey()).thenReturn(KEY_PREFERENCE_WFC_CATEGORY);
+        when(mPreferenceCategory.getPreferenceCount()).thenReturn(1);
+        mPreferenceScreen.addPreference(mPreferenceCategory);
+
+        mNetworkProviderWifiCallingGroup = spy(new NetworkProviderWifiCallingGroup(
+                mContext, mLifecycle, KEY_PREFERENCE_WFC_CATEGORY));
+    }
+
+    @Test
+    public void shouldShowWifiCallingForSub_invalidSubId_returnFalse() {
+        when(mSubscriptionManager.getActiveSubscriptionInfo(SUB_ID)).thenReturn(null);
+
+        assertThat(mNetworkProviderWifiCallingGroup.shouldShowWifiCallingForSub(SUB_ID))
+                .isEqualTo(false);
+    }
+
+    @Test
+    public void shouldShowWifiCallingForSub_carrierConfigIsUnavailable_returnFalse() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false);
+
+        assertThat(mNetworkProviderWifiCallingGroup.shouldShowWifiCallingForSub(SUB_ID))
+                .isEqualTo(false);
+    }
+
+    @Test
+    public void
+    shouldShowWifiCallingForSub_wifiCallingDisabledWithWifiCallingNotReady_returnFalse() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true);
+        setWifiCallingEnabled(false);
+        doReturn(mMockQueryWfcState).when(mNetworkProviderWifiCallingGroup).queryImsState(SUB_ID);
+
+        assertThat(mNetworkProviderWifiCallingGroup.shouldShowWifiCallingForSub(SUB_ID))
+                .isEqualTo(false);
+    }
+
+    @Test
+    public void shouldShowWifiCallingForSub_wifiCallingEnabledWithWifiCallingIsReady_returnTrue() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true);
+        setWifiCallingEnabled(true);
+        doReturn(mMockQueryWfcState).when(mNetworkProviderWifiCallingGroup).queryImsState(SUB_ID);
+
+        assertThat(mNetworkProviderWifiCallingGroup.shouldShowWifiCallingForSub(SUB_ID))
+                .isEqualTo(true);
+    }
+
+    @Test
+    public void
+    shouldShowWifiCallingForSub_wifiCallingDisabledWithNoActivityHandleIntent_returnFalse() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true);
+        buildPhoneAccountConfigureIntent(false);
+        doReturn(mMockQueryWfcState).when(mNetworkProviderWifiCallingGroup).queryImsState(SUB_ID);
+        doReturn(mPhoneAccountHandle).when(mNetworkProviderWifiCallingGroup)
+                .getPhoneAccountHandleForSubscriptionId(SUB_ID);
+
+        assertThat(mNetworkProviderWifiCallingGroup.shouldShowWifiCallingForSub(SUB_ID))
+                .isEqualTo(false);
+    }
+
+    @Test
+    public void
+    shouldShowWifiCallingForSub_wifiCallingEnabledWithActivityHandleIntent_returnTrue() {
+        FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_PROVIDER_MODEL, true);
+        buildPhoneAccountConfigureIntent(true);
+        doReturn(mMockQueryWfcState).when(mNetworkProviderWifiCallingGroup).queryImsState(SUB_ID);
+        doReturn(mPhoneAccountHandle).when(mNetworkProviderWifiCallingGroup)
+                .getPhoneAccountHandleForSubscriptionId(SUB_ID);
+
+        assertThat(mNetworkProviderWifiCallingGroup.shouldShowWifiCallingForSub(SUB_ID))
+                .isEqualTo(true);
+    }
+
+    private void setWifiCallingEnabled(boolean enabled) {
+        mMockQueryWfcState.setIsEnabledByUser(enabled);
+        mMockQueryWfcState.setServiceStateReady(enabled);
+        mMockQueryWfcState.setIsEnabledByPlatform(enabled);
+        mMockQueryWfcState.setIsProvisionedOnDevice(enabled);
+    }
+
+    private void buildPhoneAccountConfigureIntent(boolean hasActivityHandleIntent) {
+        mComponentName = new ComponentName(PACKAGE_NAME, "testClass");
+        mPhoneAccountHandle = new PhoneAccountHandle(mComponentName, "");
+        when(mPackageManager.queryIntentActivities(nullable(Intent.class), anyInt()))
+                .thenReturn(
+                        hasActivityHandleIntent ? Arrays.asList(mResolveInfo) : new ArrayList<>());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceControllerTest.java
new file mode 100644
index 0000000..3a93e84
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWifiCallingPreferenceControllerTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_DEVICE;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.Looper;
+
+import com.android.settingslib.core.lifecycle.Lifecycle;
+
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceManager;
+import androidx.preference.PreferenceScreen;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class NetworkProviderWifiCallingPreferenceControllerTest {
+
+    private static final String KEY_PREFERENCE_WFC_CATEGORY = "provider_model_calling_category";
+
+    @Mock
+    private NetworkProviderWifiCallingGroup mWifiCallingForSubController;
+    @Mock
+    private PreferenceCategory mPreferenceCategory;
+    @Mock
+    private Lifecycle mLifecycle;
+
+    private Context mContext;
+    private NetworkProviderWifiCallingPreferenceController mCategoryController;
+
+    private PreferenceManager mPreferenceManager;
+    private PreferenceScreen mPreferenceScreen;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mCategoryController = new NetworkProviderWifiCallingPreferenceController(
+                mContext, KEY_PREFERENCE_WFC_CATEGORY) {
+            @Override
+            protected NetworkProviderWifiCallingGroup createWifiCallingControllerForSub(
+                    Lifecycle lifecycle) {
+                return mWifiCallingForSubController;
+            }
+        };
+
+        if (Looper.myLooper() == null) {
+            Looper.prepare();
+        }
+
+        mPreferenceManager = new PreferenceManager(mContext);
+        mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
+        when(mPreferenceCategory.getKey()).thenReturn(KEY_PREFERENCE_WFC_CATEGORY);
+        when(mPreferenceCategory.getPreferenceCount()).thenReturn(1);
+        mPreferenceScreen.addPreference(mPreferenceCategory);
+    }
+
+    @Test
+    public void getAvailabilityStatus_returnUnavailable() {
+        mWifiCallingForSubController = null;
+
+        assertThat(mCategoryController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE);
+    }
+
+    @Test
+    public void displayPreference_isVisible() {
+        when(mWifiCallingForSubController.isAvailable()).thenReturn(true);
+        mCategoryController.init(mLifecycle);
+        mCategoryController.displayPreference(mPreferenceScreen);
+
+        assertEquals(mPreferenceCategory.isVisible(), true);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java
new file mode 100644
index 0000000..a4fc745
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/NetworkProviderWorkerTest.java
@@ -0,0 +1,264 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.slices.CustomSliceRegistry.PROVIDER_MODEL_SLICE_URI;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.Uri;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyDisplayInfo;
+import android.telephony.TelephonyManager;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class NetworkProviderWorkerTest {
+    private Context mContext;
+    private MockNetworkProviderWorker mMockNetworkProviderWorker;
+
+    @Mock
+    WifiPickerTracker mMockWifiPickerTracker;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private ConnectivityManager mConnectivityManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+
+    @Before
+    @UiThreadTest
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(ConnectivityManager.class)).thenReturn(mConnectivityManager);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
+
+        mMockNetworkProviderWorker = new MockNetworkProviderWorker(mContext,
+                PROVIDER_MODEL_SLICE_URI);
+        mMockNetworkProviderWorker.setWifiPickerTracker(mMockWifiPickerTracker);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onConstructor_shouldBeInCreatedState() {
+        assertThat(mMockNetworkProviderWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.CREATED);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onSlicePinned_shouldBeInResumedState() {
+        mMockNetworkProviderWorker.onSlicePinned();
+
+        assertThat(mMockNetworkProviderWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.RESUMED);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onSliceUnpinned_shouldBeInCreatedState() {
+        mMockNetworkProviderWorker.onSlicePinned();
+        mMockNetworkProviderWorker.onSliceUnpinned();
+
+        assertThat(mMockNetworkProviderWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.CREATED);
+    }
+
+    @Test
+    @UiThreadTest
+    public void close_shouldBeInDestroyedState() {
+        mMockNetworkProviderWorker.close();
+
+        assertThat(mMockNetworkProviderWorker.getLifecycle().getCurrentState())
+                .isEqualTo(Lifecycle.State.DESTROYED);
+    }
+
+    @Test
+    @UiThreadTest
+    public void getWifiEntry_connectedWifiKey_shouldGetConnectedWifi() {
+        final String key = "key";
+        final WifiEntry connectedWifiEntry = mock(WifiEntry.class);
+        when(connectedWifiEntry.getKey()).thenReturn(key);
+        when(mMockWifiPickerTracker.getConnectedWifiEntry()).thenReturn(connectedWifiEntry);
+
+        assertThat(mMockNetworkProviderWorker.getWifiEntry(key)).isEqualTo(connectedWifiEntry);
+    }
+
+    @Test
+    @UiThreadTest
+    public void getWifiEntry_reachableWifiKey_shouldGetReachableWifi() {
+        final String key = "key";
+        final WifiEntry reachableWifiEntry = mock(WifiEntry.class);
+        when(reachableWifiEntry.getKey()).thenReturn(key);
+        when(mMockWifiPickerTracker.getWifiEntries()).thenReturn(Arrays.asList(reachableWifiEntry));
+
+        assertThat(mMockNetworkProviderWorker.getWifiEntry(key)).isEqualTo(reachableWifiEntry);
+    }
+
+    @Test
+    @UiThreadTest
+    public void onSubscriptionsChanged_notifySubscriptionChanged_callUpdateSlice() {
+        mMockNetworkProviderWorker.onSlicePinned();
+        mMockNetworkProviderWorker.receiveNotification(false);
+
+        mMockNetworkProviderWorker.onSubscriptionsChanged();
+
+        assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void onAirplaneModeChanged_airplaneModeOn_callUpdateSlice() {
+        mMockNetworkProviderWorker.onSlicePinned();
+        mMockNetworkProviderWorker.receiveNotification(false);
+
+        mMockNetworkProviderWorker.onAirplaneModeChanged(false);
+
+        assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void onAirplaneModeChanged_airplaneModeOff_callUpdateSlice() {
+        mMockNetworkProviderWorker.onSlicePinned();
+        mMockNetworkProviderWorker.receiveNotification(false);
+
+        mMockNetworkProviderWorker.onAirplaneModeChanged(true);
+
+        assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void onSignalStrengthChanged_notifySignalStrengthChanged_callUpdateSlice() {
+        mMockNetworkProviderWorker.onSlicePinned();
+        mMockNetworkProviderWorker.receiveNotification(false);
+
+        mMockNetworkProviderWorker.onSignalStrengthChanged();
+
+        assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void onMobileDataEnabledChange_notifyMobileDataEnabledChanged_callUpdateSlice() {
+        mMockNetworkProviderWorker.onSlicePinned();
+        mMockNetworkProviderWorker.receiveNotification(false);
+
+        mMockNetworkProviderWorker.onMobileDataEnabledChange();
+
+        assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void onDataConnectivityChange_notifyDataConnectivityChanged_callUpdateSlice() {
+        mMockNetworkProviderWorker.onSlicePinned();
+        mMockNetworkProviderWorker.receiveNotification(false);
+
+        mMockNetworkProviderWorker.onDataConnectivityChange();
+
+        assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void onServiceStateChanged_notifyPhoneStateListener_callUpdateSlice() {
+        mMockNetworkProviderWorker.onSlicePinned();
+        mMockNetworkProviderWorker.receiveNotification(false);
+
+        mMockNetworkProviderWorker.mPhoneStateListener.onServiceStateChanged(new ServiceState());
+
+        assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void onActiveDataSubscriptionIdChanged_notifyPhoneStateListener_callUpdateSlice() {
+        mMockNetworkProviderWorker.onSlicePinned();
+        mMockNetworkProviderWorker.receiveNotification(false);
+
+        mMockNetworkProviderWorker.mPhoneStateListener.onActiveDataSubscriptionIdChanged(1);
+
+        assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
+    }
+
+    @Test
+    @UiThreadTest
+    public void onDisplayInfoChanged_notifyPhoneStateListener_callUpdateSlice() {
+        mMockNetworkProviderWorker.onSlicePinned();
+        mMockNetworkProviderWorker.receiveNotification(false);
+
+        mMockNetworkProviderWorker.mPhoneStateListener.onDisplayInfoChanged(
+                new TelephonyDisplayInfo(14, 0));
+
+        assertThat(mMockNetworkProviderWorker.hasNotification()).isTrue();
+    }
+
+    public class MockNetworkProviderWorker extends NetworkProviderWorker {
+        private boolean mHasNotification = false;
+
+        MockNetworkProviderWorker(Context context, Uri uri) {
+            super(context, uri);
+        }
+
+        public void receiveNotification(boolean inputValue) {
+            mHasNotification = inputValue;
+        }
+
+        public boolean hasNotification() {
+            return mHasNotification;
+        }
+
+        @Override
+        public void updateSlice() {
+            super.updateSlice();
+            receiveNotification(true);
+        }
+
+        public void setWifiPickerTracker(WifiPickerTracker wifiPickerTracker) {
+            mWifiPickerTracker = wifiPickerTracker;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceControllerTest.java
new file mode 100644
index 0000000..0cbc263
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/NrDisabledInDsdsFooterPreferenceControllerTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class NrDisabledInDsdsFooterPreferenceControllerTest {
+    private static final String PREF_KEY = "pref_key";
+    private static final int SUB_ID = 111;
+
+    private Context mContext;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    private NrDisabledInDsdsFooterPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+        doReturn(mSubscriptionManager).when(mContext).getSystemService(
+                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(anyInt());
+        mController = new NrDisabledInDsdsFooterPreferenceController(mContext, PREF_KEY);
+    }
+
+    @Test
+    public void isAvailable_noInit_notAvailable() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_dataOnAndDsdsAnd5GSupported_Available() {
+        when(mTelephonyManager.getSupportedRadioAccessFamily())
+                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
+        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1, 2});
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        mController.init(SUB_ID);
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_5gNotSupported_notAvailable() {
+        when(mTelephonyManager.getSupportedRadioAccessFamily())
+                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_LTE);
+        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1, 2});
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        mController.init(SUB_ID);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_mobileDataOff_notAvailable() {
+        when(mTelephonyManager.getSupportedRadioAccessFamily())
+                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
+        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1, 2});
+        when(mTelephonyManager.isDataEnabled()).thenReturn(false);
+        mController.init(SUB_ID);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_singleSimMode_notAvailable() {
+        when(mTelephonyManager.getSupportedRadioAccessFamily())
+                .thenReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR);
+        when(mSubscriptionManager.getActiveSubscriptionIdList()).thenReturn(new int[] {1});
+        when(mTelephonyManager.isDataEnabled()).thenReturn(true);
+        mController.init(SUB_ID);
+        assertThat(mController.isAvailable()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
new file mode 100644
index 0000000..c5da3c5
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceControllerTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
+import static com.android.settings.network.telephony.MobileNetworkUtils.getRafFromNetworkType;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.provider.Settings;
+import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.ListPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
+import com.android.settings.testutils.ResourcesUtils;
+
+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;
+
+@RunWith(AndroidJUnit4.class)
+public class PreferredNetworkModePreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private ServiceState mServiceState;
+
+    private PersistableBundle mPersistableBundle;
+    private PreferredNetworkModePreferenceController mController;
+    private ListPreference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                mCarrierConfigManager);
+
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        doReturn(mServiceState).when(mTelephonyManager).getServiceState();
+        mPersistableBundle = new PersistableBundle();
+        doReturn(mPersistableBundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+        mPreference = new ListPreference(mContext);
+        mController = new PreferredNetworkModePreferenceController(mContext, "mobile_data");
+        mController.init(SUB_ID);
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Global.putInt(
+                mContext.getContentResolver(), Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0);
+    }
+
+    @Test
+    public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_worldPhone_returnAvailable() {
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL,
+                false);
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL, true);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_hidePreferredNetworkType_returnUnavailable() {
+        mPersistableBundle.putBoolean(CarrierConfigManager.KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL,
+                true);
+
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+        when(mServiceState.getDataRegistrationState()).thenReturn(
+                ServiceState.STATE_OUT_OF_SERVICE);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+        when(mServiceState.getDataRegistrationState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+
+        when(mServiceState.getRoaming()).thenReturn(false);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+
+        when(mServiceState.getRoaming()).thenReturn(true);
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void updateState_updateByNetworkMode() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
+                TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getValue()).isEqualTo(
+                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA));
+        assertThat(mPreference.getSummary()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext,
+                        "preferred_network_mode_tdscdma_gsm_wcdma_summary"));
+    }
+
+    @Test
+    public void onPreferenceChange_updateSuccess() {
+        doReturn(true).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
+                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+
+        mController.onPreferenceChange(mPreference,
+                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isEqualTo(
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
+    }
+
+    @Test
+    public void onPreferenceChange_updateFail() {
+        doReturn(false).when(mTelephonyManager).setPreferredNetworkTypeBitmask(
+                getRafFromNetworkType(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+
+        mController.onPreferenceChange(mPreference,
+                String.valueOf(TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA));
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, 0)).isNotEqualTo(
+                TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java
new file mode 100644
index 0000000..7c778cc
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/RoamingPreferenceControllerTest.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.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.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class RoamingPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private FragmentManager mFragmentManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private FragmentTransaction mFragmentTransaction;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+
+    private RoamingPreferenceController mController;
+    private RestrictedSwitchPreference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
+        doReturn(mSubscriptionManager).when(mContext).getSystemService(
+                Context.TELEPHONY_SUBSCRIPTION_SERVICE);
+
+        doReturn(mCarrierConfigManager).when(mContext).getSystemService(
+                Context.CARRIER_CONFIG_SERVICE);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
+
+        mPreference = spy(new RestrictedSwitchPreference(mContext));
+        mController = spy(new RoamingPreferenceController(mContext, "roaming"));
+        mController.init(mFragmentManager, SUB_ID);
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_validSubId_returnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_invalidSubId_returnUnsearchable() {
+        mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Test
+    public void isDialogNeeded_roamingDisabledWithoutFlag_returnTrue() {
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putBoolean(CarrierConfigManager.KEY_DISABLE_CHARGE_INDICATION_BOOL, false);
+        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+        doReturn(false).when(mTelephonyManager).isDataRoamingEnabled();
+
+        assertThat(mController.isDialogNeeded()).isTrue();
+    }
+
+    @Test
+    public void isDialogNeeded_roamingEnabled_returnFalse() {
+        doReturn(true).when(mTelephonyManager).isDataRoamingEnabled();
+
+        assertThat(mController.isDialogNeeded()).isFalse();
+    }
+
+    @Test
+    @UiThreadTest
+    public void setChecked_needDialog_showDialog() {
+        doReturn(false).when(mTelephonyManager).isDataRoamingEnabled();
+        doReturn(null).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+
+
+        mController.setChecked(true);
+
+        verify(mFragmentManager).beginTransaction();
+    }
+
+    @Test
+    public void updateState_invalidSubId_disabled() {
+        mController.init(mFragmentManager, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void updateState_validSubId_enabled() {
+        doReturn(true).when(mTelephonyManager).isDataRoamingEnabled();
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isTrue();
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+
+    @Test
+    public void updateState_isNotDisabledByAdmin_shouldInvokeSetEnabled() {
+        when(mPreference.isDisabledByAdmin()).thenReturn(false);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setEnabled(anyBoolean());
+    }
+
+    @Test
+    public void updateState_isDisabledByAdmin_shouldNotInvokeSetEnabled() {
+        when(mPreference.isDisabledByAdmin()).thenReturn(true);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference, never()).setEnabled(anyBoolean());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java
new file mode 100644
index 0000000..4fb31f2
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/TelephonyBasePreferenceControllerTest.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class TelephonyBasePreferenceControllerTest {
+    private static final int VALID_SUB_ID = 1;
+
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+
+    private TestPreferenceController mPreferenceController;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(SubscriptionManager.class))
+                .thenReturn(mSubscriptionManager);
+        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(VALID_SUB_ID);
+        mPreferenceController = new TestPreferenceController(mContext, "prefKey");
+    }
+
+    @Test
+    public void isAvailable_validSubIdSet_returnTrue() {
+        mPreferenceController.init(VALID_SUB_ID);
+
+        assertThat(mPreferenceController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_noIdSetHoweverHasDefaultOne_returnTrue() {
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo));
+
+        assertThat(mPreferenceController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_noDefaultAndNoSet_returnFalse() {
+        assertThat(mPreferenceController.isAvailable()).isFalse();
+    }
+
+    /**
+     * Test preference controller for {@link TelephonyBasePreferenceController}
+     */
+    public class TestPreferenceController extends TelephonyBasePreferenceController {
+        public TestPreferenceController(Context context, String prefKey) {
+            super(context, prefKey);
+        }
+
+        public void init(int subId) {
+            mSubId = subId;
+        }
+
+        @Override
+        public int getAvailabilityStatus(int subId) {
+            return subId == VALID_SUB_ID ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java
new file mode 100644
index 0000000..e80a76e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/TelephonyTogglePreferenceControllerTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class TelephonyTogglePreferenceControllerTest {
+
+    private Context mContext;
+    private FakeTelephonyToggle mFakeTelephonyToggle;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mFakeTelephonyToggle = new FakeTelephonyToggle(mContext, "key");
+    }
+
+    @Test
+    public void isSliceable_byDefault_shouldReturnFalse() {
+        assertThat(mFakeTelephonyToggle.isSliceable()).isFalse();
+    }
+
+    private static class FakeTelephonyToggle extends TelephonyTogglePreferenceController {
+
+        private FakeTelephonyToggle(Context context, String preferenceKey) {
+            super(context, preferenceKey);
+        }
+
+        @Override
+        public boolean isChecked() {
+            return false;
+        }
+
+        @Override
+        public boolean setChecked(boolean isChecked) {
+            return false;
+        }
+
+        @Override
+        public int getAvailabilityStatus(int subId) {
+            return 0;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java
new file mode 100644
index 0000000..027a53b
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaListPreferenceTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.cdma;
+
+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.Context;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.PreferenceManager;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class CdmaListPreferenceTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private PreferenceManager mPreferenceManager;
+
+    private CdmaListPreference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+        mPreference = spy(new CdmaListPreference(mContext, null));
+        mPreference.setSubId(SUB_ID);
+    }
+
+    @Test
+    public void onClick_inEcm_doNothing() {
+        doReturn(true).when(mTelephonyManager).getEmergencyCallbackMode();
+
+        mPreference.onClick();
+
+        verify(mPreferenceManager, never()).showDialog(mPreference);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
new file mode 100644
index 0000000..d888c9e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSubscriptionPreferenceControllerTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.cdma;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceManager;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+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;
+
+@RunWith(AndroidJUnit4.class)
+public class CdmaSubscriptionPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+
+    private CdmaSubscriptionPreferenceController mController;
+    private ListPreference mPreference;
+    private Context mContext;
+    private int mCdmaMode;
+    private String mSubscriptionsSupported;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+
+        mPreference = new ListPreference(mContext);
+        mController = spy(new CdmaSubscriptionPreferenceController(mContext, "mobile_data"));
+        mController.init(mPreferenceManager, SUB_ID);
+        mController.mPreference = mPreference;
+        mPreference.setKey(mController.getPreferenceKey());
+
+        mCdmaMode = Settings.Global.getInt(mContext.getContentResolver(),
+            Settings.Global.CDMA_SUBSCRIPTION_MODE,
+            TelephonyManager.CDMA_SUBSCRIPTION_RUIM_SIM);
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+            Settings.Global.CDMA_SUBSCRIPTION_MODE, mCdmaMode);
+    }
+
+    @Test
+    public void onPreferenceChange_selectNV_returnNVMode() {
+        mController.onPreferenceChange(mPreference, Integer.toString(
+                TelephonyManager.CDMA_SUBSCRIPTION_NV));
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_SUBSCRIPTION_MODE,
+                TelephonyManager.CDMA_SUBSCRIPTION_RUIM_SIM)).isEqualTo(
+                        TelephonyManager.CDMA_SUBSCRIPTION_NV);
+    }
+
+    @Test
+    public void updateState_stateRUIM_displayRUIM() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_SUBSCRIPTION_MODE, TelephonyManager.CDMA_SUBSCRIPTION_NV);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getValue()).isEqualTo(Integer.toString(
+                TelephonyManager.CDMA_SUBSCRIPTION_NV));
+    }
+
+    @Test
+    public void updateState_stateUnknown_doNothing() {
+        mPreference.setValue(Integer.toString(TelephonyManager.CDMA_SUBSCRIPTION_NV));
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_SUBSCRIPTION_MODE, TelephonyManager.CDMA_SUBSCRIPTION_UNKNOWN);
+
+        mController.updateState(mPreference);
+
+        // Still NV mode
+        assertThat(mPreference.getValue()).isEqualTo(Integer.toString(
+                TelephonyManager.CDMA_SUBSCRIPTION_NV));
+    }
+
+    @Test
+    public void deviceSupportsNvAndRuim() {
+        doReturn("NV,RUIM").when(mController).getRilSubscriptionTypes();
+        assertThat(mController.deviceSupportsNvAndRuim()).isTrue();
+        doReturn("").when(mController).getRilSubscriptionTypes();
+        assertThat(mController.deviceSupportsNvAndRuim()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
new file mode 100644
index 0000000..3bc3935
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/cdma/CdmaSystemSelectPreferenceControllerTest.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.cdma;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.provider.Settings;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceManager;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.network.telephony.TelephonyConstants.TelephonyManagerConstants;
+
+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;
+
+@RunWith(AndroidJUnit4.class)
+public class CdmaSystemSelectPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private PreferenceManager mPreferenceManager;
+    @Mock
+    private TelephonyManager mTelephonyManager;
+
+    private CdmaSystemSelectPreferenceController mController;
+    private ListPreference mPreference;
+    private Context mContext;
+    private int mCdmaRoamingMode;
+    private int mSettingsNetworkMode;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+
+        mPreference = new ListPreference(mContext);
+        mController = new CdmaSystemSelectPreferenceController(mContext, "mobile_data");
+        mController.init(mPreferenceManager, SUB_ID);
+        mController.mPreference = mPreference;
+        mPreference.setKey(mController.getPreferenceKey());
+
+        mCdmaRoamingMode = Settings.Global.getInt(mContext.getContentResolver(),
+            Settings.Global.CDMA_ROAMING_MODE,
+            TelephonyManager.CDMA_ROAMING_MODE_ANY);
+
+        mSettingsNetworkMode = Settings.Global.getInt(
+            mContext.getContentResolver(),
+            Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
+            TelephonyManager.DEFAULT_PREFERRED_NETWORK_MODE);
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+            Settings.Global.CDMA_ROAMING_MODE, mCdmaRoamingMode);
+
+        Settings.Global.putInt(mContext.getContentResolver(),
+            Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID, mSettingsNetworkMode);
+    }
+
+    @Test
+    public void onPreferenceChange_selectHome_returnHomeMode() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_ROAMING_MODE,
+                TelephonyManager.CDMA_ROAMING_MODE_ANY);
+
+        mController.onPreferenceChange(mPreference,
+                Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));
+
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_ROAMING_MODE,
+                TelephonyManager.CDMA_ROAMING_MODE_ANY)).isEqualTo(
+                TelephonyManager.CDMA_ROAMING_MODE_HOME);
+    }
+
+    @Test
+    public void updateState_stateHome_displayHome() {
+        doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
+                mTelephonyManager).getCdmaRoamingMode();
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getValue()).isEqualTo(
+                Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_HOME));
+    }
+
+    @Test
+    public void updateState_LteGSMWcdma_disabled() {
+        doReturn(TelephonyManager.CDMA_ROAMING_MODE_HOME).when(
+                mTelephonyManager).getCdmaRoamingMode();
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.PREFERRED_NETWORK_MODE + SUB_ID,
+                TelephonyManagerConstants.NETWORK_MODE_LTE_GSM_WCDMA);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void updateState_stateOther_resetToDefault() {
+        Settings.Global.putInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_ROAMING_MODE,
+                TelephonyManager.CDMA_ROAMING_MODE_HOME);
+        doReturn(TelephonyManager.CDMA_ROAMING_MODE_AFFILIATED).when(
+                mTelephonyManager).getCdmaRoamingMode();
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.getValue()).isEqualTo(
+                Integer.toString(TelephonyManager.CDMA_ROAMING_MODE_ANY));
+        assertThat(Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.CDMA_ROAMING_MODE,
+                TelephonyManager.CDMA_ROAMING_MODE_HOME)).isEqualTo(
+                TelephonyManager.CDMA_ROAMING_MODE_ANY);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
new file mode 100644
index 0000000..a97be94
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceControllerTest.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.gsm;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.testutils.ResourcesUtils;
+
+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 java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+@RunWith(AndroidJUnit4.class)
+public class AutoSelectPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+    private static final String OPERATOR_NAME = "T-mobile";
+
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private ProgressDialog mProgressDialog;
+    @Mock
+    private Lifecycle mLifecycle;
+
+    private PersistableBundle mCarrierConfig;
+    private AutoSelectPreferenceController mController;
+    private SwitchPreference mSwitchPreference;
+    private Context mContext;
+
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+            mCarrierConfigManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+
+        mCarrierConfig = new PersistableBundle();
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_ONLY_AUTO_SELECT_IN_HOME_NETWORK_BOOL,
+            true);
+        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
+
+        mSwitchPreference = new SwitchPreference(mContext);
+        mController = new AutoSelectPreferenceController(mContext, "auto_select");
+        mController.mProgressDialog = mProgressDialog;
+        mController.mSwitchPreference = mSwitchPreference;
+        mController.init(mLifecycle, SUB_ID);
+    }
+
+    @Test
+    public void setChecked_isChecked_showProgressDialog() {
+        when(mTelephonyManager.getNetworkSelectionMode()).thenReturn(
+            TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
+
+        // Wait for asynchronous thread to finish, otherwise test will flake.
+        Future thread = mController.setAutomaticSelectionMode();
+        try {
+            thread.get();
+        } catch (ExecutionException | InterruptedException e) {
+            e.printStackTrace();
+            fail("Exception during automatic selection");
+        }
+
+        verify(mProgressDialog).show();
+        verify(mTelephonyManager).setNetworkSelectionModeAutomatic();
+    }
+
+    @Test
+    public void updateState_isRoaming_enabled() {
+        when(mTelephonyManager.getServiceState().getRoaming()).thenReturn(true);
+
+        mController.updateState(mSwitchPreference);
+
+        assertThat(mSwitchPreference.isEnabled()).isTrue();
+    }
+
+    @Test
+    public void updateState_notRoamingWithAutoSelectOn_disabled() {
+        when(mTelephonyManager.getServiceState().getRoaming()).thenReturn(false);
+        doReturn(OPERATOR_NAME).when(mTelephonyManager).getSimOperatorName();
+
+        mController.updateState(mSwitchPreference);
+
+        assertThat(mSwitchPreference.isEnabled()).isFalse();
+        assertThat(mSwitchPreference.getSummary()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "manual_mode_disallowed_summary",
+                mTelephonyManager.getSimOperatorName()));
+    }
+
+    @Test
+    public void init_carrierConfigNull_shouldNotCrash() {
+        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(null);
+
+        // Should not crash
+        mController.init(mLifecycle, SUB_ID);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
new file mode 100644
index 0000000..0d20140
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceControllerTest.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony.gsm;
+
+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.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.ServiceState;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.preference.Preference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.testutils.ResourcesUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+
+@RunWith(AndroidJUnit4.class)
+public class OpenNetworkSelectPagePreferenceControllerTest {
+    private static final int SUB_ID = 2;
+    private static final String OPERATOR_NAME = "T-mobile";
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+    @Mock
+    private ServiceState mServiceState;
+    @Mock
+    private SubscriptionInfo mSubscriptionInfo;
+    @Mock
+    private Lifecycle mLifecycle;
+
+    private PersistableBundle mCarrierConfig;
+    private OpenNetworkSelectPagePreferenceController mController;
+    private Preference mPreference;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
+                mCarrierConfigManager);
+        when(mTelephonyManager.createForSubscriptionId(SUB_ID)).thenReturn(mTelephonyManager);
+        when(mTelephonyManager.getServiceState()).thenReturn(mServiceState);
+
+        mCarrierConfig = new PersistableBundle();
+        when(mCarrierConfigManager.getConfigForSubId(SUB_ID)).thenReturn(mCarrierConfig);
+
+        when(mSubscriptionInfo.getSubscriptionId()).thenReturn(SUB_ID);
+        when(mSubscriptionInfo.getCarrierName()).thenReturn(OPERATOR_NAME);
+
+        when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo));
+        when(mSubscriptionManager.getAccessibleSubscriptionInfoList()).thenReturn(
+                Arrays.asList(mSubscriptionInfo));
+
+        when(mTelephonyManager.getNetworkOperatorName()).thenReturn(OPERATOR_NAME);
+
+        mPreference = new Preference(mContext);
+        mController = new OpenNetworkSelectPagePreferenceController(mContext,
+                "open_network_select");
+        mController.init(mLifecycle, SUB_ID);
+    }
+
+    @Test
+    public void updateState_modeAuto_disabled() {
+        when(mTelephonyManager.getNetworkSelectionMode()).thenReturn(
+                TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void getSummary_inService_returnOperatorName() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
+
+        assertThat(mController.getSummary()).isEqualTo(OPERATOR_NAME);
+    }
+
+    @Test
+    public void getSummary_notInService_returnDisconnect() {
+        when(mServiceState.getState()).thenReturn(ServiceState.STATE_OUT_OF_SERVICE);
+
+        assertThat(mController.getSummary()).isEqualTo(
+                ResourcesUtils.getResourcesString(mContext, "network_disconnected"));
+    }
+}
diff --git a/tests/unit/src/com/android/settings/nfc/NfcDetectionPointControllerTest.java b/tests/unit/src/com/android/settings/nfc/NfcDetectionPointControllerTest.java
new file mode 100644
index 0000000..3b9df6d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/nfc/NfcDetectionPointControllerTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 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 androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class NfcDetectionPointControllerTest {
+
+    private NfcDetectionPointController mController;
+
+    @Before
+    public void setUp() {
+        mController = new NfcDetectionPointController(ApplicationProvider.getApplicationContext(),
+                "fakeKey");
+    }
+
+    @Test
+    public void getAvailabilityStatus_withConfigIsTrue_returnAvailable() {
+        mController.setConfig(true);
+        assertThat(mController.getAvailabilityStatus())
+            .isEqualTo(NfcDetectionPointController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_withConfigIsFalse_returnUnavailable() {
+        mController.setConfig(false);
+        assertThat(mController.getAvailabilityStatus())
+            .isNotEqualTo(NfcDetectionPointController.AVAILABLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/nfc/SecureNfcPreferenceControllerTest.java b/tests/unit/src/com/android/settings/nfc/SecureNfcPreferenceControllerTest.java
new file mode 100644
index 0000000..c05e208
--- /dev/null
+++ b/tests/unit/src/com/android/settings/nfc/SecureNfcPreferenceControllerTest.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.nfc;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class SecureNfcPreferenceControllerTest {
+
+    private Context mContext;
+    private SecureNfcPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new SecureNfcPreferenceController(mContext, "nfc_secure_settings");
+    }
+
+    @Test
+    public void isPublicSlice_returnsTrue() {
+        assertThat(mController.isPublicSlice()).isTrue();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java b/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java
deleted file mode 100644
index 19b1360..0000000
--- a/tests/unit/src/com/android/settings/notification/AppNotificationSettingsTest.java
+++ /dev/null
@@ -1,154 +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.notification;
-
-import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.intent.Intents.intended;
-import static androidx.test.espresso.intent.matcher.IntentMatchers.hasExtra;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.android.settings.SettingsActivity.EXTRA_SHOW_FRAGMENT;
-
-import static org.hamcrest.Matchers.allOf;
-import static org.junit.Assert.fail;
-
-import android.app.Instrumentation;
-import android.app.NotificationChannel;
-import android.app.NotificationChannelGroup;
-import android.app.NotificationManager;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.uiautomator.UiDevice;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.espresso.intent.Intents;
-import androidx.test.espresso.matcher.ViewMatchers;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class AppNotificationSettingsTest {
-    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
-
-    private UiDevice mUiDevice;
-    private Context mTargetContext;
-    private Instrumentation mInstrumentation;
-
-    NotificationManager mNm;
-    private NotificationChannelGroup mGroup1;
-    private NotificationChannel mGroup1Channel1;
-    private NotificationChannel mGroup1Channel2;
-    private NotificationChannelGroup mGroup2;
-    private NotificationChannel mGroup2Channel1;
-    private NotificationChannel mUngroupedChannel;
-
-    @Before
-    public void setUp() throws Exception {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mTargetContext = mInstrumentation.getTargetContext();
-
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mUiDevice.wakeUp();
-        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
-
-        mNm  = (NotificationManager) mTargetContext.getSystemService(Context.NOTIFICATION_SERVICE);
-
-        mGroup1 = new NotificationChannelGroup(this.getClass().getName() + "1", "group1");
-        mGroup2 = new NotificationChannelGroup(this.getClass().getName() + "2", "group2");
-        mNm.createNotificationChannelGroup(mGroup1);
-        mNm.createNotificationChannelGroup(mGroup2);
-
-        mGroup1Channel1 = createChannel(mGroup1, this.getClass().getName()+ "c1-1");
-        mGroup1Channel2 = createChannel(mGroup1, this.getClass().getName()+ "c1-2");
-        mGroup2Channel1 = createChannel(mGroup2, this.getClass().getName()+ "c2-1");
-        mUngroupedChannel = createChannel(null, this.getClass().getName()+ "c");
-    }
-
-    @Test
-    public void launchNotificationSetting_shouldNotHaveAppInfoLink() {
-        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-        mInstrumentation.startActivitySync(intent);
-
-        onView(allOf(withId(android.R.id.button1),
-                withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
-                .check(doesNotExist());
-    }
-
-    @Test
-    public void launchNotificationSetting_showGroupsWithMultipleChannels() {
-        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mInstrumentation.startActivitySync(intent);
-        onView(allOf(withText(mGroup1.getName().toString()))).check(
-                matches(isDisplayed()));
-        onView(allOf(withText(mGroup1Channel1.getName().toString()))).check(
-                matches(isDisplayed()));
-        onView(allOf(withText(mGroup1Channel2.getName().toString()))).check(
-                matches(isDisplayed()));
-    }
-
-    @Test
-    public void launchNotificationSetting_showUngroupedChannels() {
-        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mInstrumentation.startActivitySync(intent);
-        onView(allOf(withText(mUngroupedChannel.getName().toString())))
-                .check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void launchNotificationSetting_showGroupsWithOneChannel() {
-        final Intent intent = new Intent(Settings.ACTION_APP_NOTIFICATION_SETTINGS)
-                .putExtra(Settings.EXTRA_APP_PACKAGE, mTargetContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mInstrumentation.startActivitySync(intent);
-
-        onView(allOf(withText(mGroup2.getName().toString())))
-                .check(matches(isDisplayed()));
-        onView(allOf(withText(mGroup2Channel1.getName().toString())))
-                .check(matches(isDisplayed()));
-    }
-
-    private NotificationChannel createChannel(NotificationChannelGroup group,
-            String id) {
-        NotificationChannel channel = new NotificationChannel(id, id, IMPORTANCE_DEFAULT);
-        if (group != null) {
-            channel.setGroup(group.getId());
-        }
-        mNm.createNotificationChannel(channel);
-        return channel;
-    }
-}
diff --git a/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java b/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java
deleted file mode 100644
index 4120a07..0000000
--- a/tests/unit/src/com/android/settings/notification/ZenModeSettingsIntegrationTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.android.settings;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.uiautomator.UiDevice;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.LargeTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@LargeTest
-public class ZenModeSettingsIntegrationTest {
-    private static final String WM_DISMISS_KEYGUARD_COMMAND = "wm dismiss-keyguard";
-
-    private Context mContext;
-    private UiDevice mUiDevice;
-
-    @Before
-    public void setUp() throws Exception {
-        mContext = InstrumentationRegistry.getTargetContext();
-        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mUiDevice.wakeUp();
-        mUiDevice.executeShellCommand(WM_DISMISS_KEYGUARD_COMMAND);
-    }
-
-    @Test
-    public void testZenModeSettingsPreferences() {
-        launchZenSettings();
-        onView(withText("Calls")).check(matches(isDisplayed()));
-        onView(withText("SMS, MMS, and messaging apps")).check(matches(isDisplayed()));
-        onView(withText("Restrict notifications")).check(matches(isDisplayed()));
-        onView(withText("Duration")).check(matches(isDisplayed()));
-        onView(withText("Schedules")).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void testZenModeBehaviorPreferences() {
-        launchZenBehaviorSettings();
-        onView(withText("Calls")).check(matches(isDisplayed()));
-        onView(withText("SMS, MMS, and messaging apps")).check(matches(isDisplayed()));
-        onView(withText("Restrict notifications")).check(matches(isDisplayed()));
-        onView(withText("Duration")).check(matches(isDisplayed()));
-        onView(withText("Schedules")).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void testZenModeAutomationPreferences() {
-        launchZenAutomationSettings();
-        onView(withText("Sleeping")).check(matches(isDisplayed()));
-        onView(withText("Event")).check(matches(isDisplayed()));
-        onView(withText("Add more")).check(matches(isDisplayed()));
-    }
-
-    private void launchZenSettings() {
-        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_SETTINGS)
-                .setPackage(mContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(settingsIntent);
-    }
-
-    private void launchZenAutomationSettings() {
-        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_AUTOMATION_SETTINGS)
-                .setPackage(mContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(settingsIntent);
-    }
-
-    private void launchZenBehaviorSettings() {
-        Intent settingsIntent = new Intent(Settings.ACTION_ZEN_MODE_PRIORITY_SETTINGS)
-                .setPackage(mContext.getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(settingsIntent);
-    }
-}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/notification/zen/ZenRuleCustomPrefContrTestBase.java b/tests/unit/src/com/android/settings/notification/zen/ZenRuleCustomPrefContrTestBase.java
new file mode 100644
index 0000000..53ad7c5
--- /dev/null
+++ b/tests/unit/src/com/android/settings/notification/zen/ZenRuleCustomPrefContrTestBase.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2020 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.notification.zen;
+
+import android.app.AutomaticZenRule;
+import android.app.NotificationManager;
+import android.service.notification.ZenPolicy;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+abstract class ZenRuleCustomPrefContrTestBase {
+    public static final String RULE_ID = "test_rule_id";
+    public static final String PREF_KEY = "main_pref";
+
+    AutomaticZenRule mRule = new AutomaticZenRule("test", null, null, null, null,
+            NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);
+
+    abstract AbstractZenCustomRulePreferenceController getController();
+
+    void updateControllerZenPolicy(ZenPolicy policy) {
+        mRule.setZenPolicy(policy);
+        getController().onResume(mRule, RULE_ID);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/panel/FakePanelContent.java b/tests/unit/src/com/android/settings/panel/FakePanelContent.java
new file mode 100644
index 0000000..f64d2f2
--- /dev/null
+++ b/tests/unit/src/com/android/settings/panel/FakePanelContent.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.panel;
+
+import static com.android.settings.slices.CustomSliceRegistry.WIFI_SLICE_URI;
+
+import android.app.settings.SettingsEnums;
+import android.content.Intent;
+import android.net.Uri;
+
+import androidx.core.graphics.drawable.IconCompat;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Fake PanelContent for testing.
+ */
+public class FakePanelContent implements PanelContent {
+
+    public static final String FAKE_ACTION = "fake_action";
+
+    public static final CharSequence TITLE = "title";
+
+    public static final List<Uri> SLICE_URIS = Arrays.asList(
+            WIFI_SLICE_URI
+    );
+
+    public static final Intent INTENT = new Intent();
+
+    private CharSequence mTitle = TITLE;
+    private CharSequence mSubTitle;
+    private IconCompat mIcon;
+    private int mViewType;
+    private boolean mIsCustomizedButtonUsed = false;
+    private CharSequence mCustomizedButtonTitle;
+
+    @Override
+    public IconCompat getIcon() {
+        return mIcon;
+    }
+
+    public void setIcon(IconCompat icon) {
+        mIcon = icon;
+    }
+
+    @Override
+    public CharSequence getSubTitle() {
+        return mSubTitle;
+    }
+
+    public void setSubTitle(CharSequence subTitle) {
+        mSubTitle = subTitle;
+    }
+
+    @Override
+    public CharSequence getTitle() {
+        return mTitle;
+    }
+
+    public void setTitle(CharSequence title) {
+        mTitle = title;
+    }
+
+    @Override
+    public List<Uri> getSlices() {
+        return SLICE_URIS;
+    }
+
+    @Override
+    public Intent getSeeMoreIntent() {
+        return INTENT;
+    }
+
+    @Override
+    public int getMetricsCategory() {
+        return SettingsEnums.TESTING;
+    }
+
+    public void setViewType(int viewType) {
+        mViewType = viewType;
+    }
+
+    @Override
+    public int getViewType() {
+        return mViewType;
+    }
+
+    @Override
+    public boolean isCustomizedButtonUsed() {
+        return mIsCustomizedButtonUsed;
+    }
+
+    public void setIsCustomizedButtonUsed(boolean isUsed) {
+        mIsCustomizedButtonUsed = isUsed;
+    }
+
+    @Override
+    public CharSequence getCustomizedButtonTitle() {
+        return mCustomizedButtonTitle;
+    }
+
+    public void setCustomizedButtonTitle(CharSequence title) {
+        mCustomizedButtonTitle = title;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/panel/FakeSettingsPanelActivity.java b/tests/unit/src/com/android/settings/panel/FakeSettingsPanelActivity.java
new file mode 100644
index 0000000..7e1275e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/panel/FakeSettingsPanelActivity.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.panel;
+
+import android.content.ComponentName;
+import android.content.Intent;
+
+public class FakeSettingsPanelActivity extends SettingsPanelActivity {
+    @Override
+    public ComponentName getCallingActivity() {
+        return new ComponentName("fake-package", "fake-class");
+    }
+
+    @Override
+    public Intent getIntent() {
+        final Intent intent = new Intent(FakePanelContent.FAKE_ACTION);
+        return intent;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/panel/NfcPanelTest.java b/tests/unit/src/com/android/settings/panel/NfcPanelTest.java
new file mode 100644
index 0000000..60adfdd
--- /dev/null
+++ b/tests/unit/src/com/android/settings/panel/NfcPanelTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.panel;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.slices.CustomSliceRegistry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class NfcPanelTest {
+
+    private NfcPanel mPanel;
+
+    @Before
+    public void setUp() {
+        mPanel = NfcPanel.create(ApplicationProvider.getApplicationContext());
+    }
+
+    @Test
+    public void getSlices_containsNecessarySlices() {
+        final List<Uri> uris = mPanel.getSlices();
+
+        assertThat(uris).containsExactly(
+                CustomSliceRegistry.NFC_SLICE_URI);
+    }
+
+    @Test
+    public void getSeeMoreIntent_notNull() {
+        assertThat(mPanel.getSeeMoreIntent()).isNotNull();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java b/tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
new file mode 100644
index 0000000..3b61a73
--- /dev/null
+++ b/tests/unit/src/com/android/settings/panel/PanelFeatureProviderImplTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.panel;
+
+import static com.android.settings.panel.SettingsPanelActivity.KEY_MEDIA_PACKAGE_NAME;
+import static com.android.settings.panel.SettingsPanelActivity.KEY_PANEL_TYPE_ARGUMENT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class PanelFeatureProviderImplTest {
+
+    private static final String TEST_PACKAGENAME = "com.test.packagename";
+
+    private Context mContext;
+    private PanelFeatureProviderImpl mProvider;
+    private Bundle mBundle;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mProvider = new PanelFeatureProviderImpl();
+        mBundle = new Bundle();
+        mBundle.putString(KEY_MEDIA_PACKAGE_NAME, TEST_PACKAGENAME);
+    }
+
+    @Test
+    public void getPanel_internetConnectivityKey_returnsCorrectPanel() {
+        mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, Settings.Panel.ACTION_INTERNET_CONNECTIVITY);
+
+        final PanelContent panel = mProvider.getPanel(mContext, mBundle);
+
+        assertThat(panel).isInstanceOf(InternetConnectivityPanel.class);
+    }
+
+    @Test
+    public void getPanel_volume_returnsCorrectPanel() {
+        mBundle.putString(KEY_PANEL_TYPE_ARGUMENT, Settings.Panel.ACTION_VOLUME);
+
+        final PanelContent panel = mProvider.getPanel(mContext, mBundle);
+
+        assertThat(panel).isInstanceOf(VolumePanel.class);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatchTest.java b/tests/unit/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatchTest.java
new file mode 100644
index 0000000..3794e00
--- /dev/null
+++ b/tests/unit/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatchTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+package com.android.settings.panel;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.net.Uri;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class PanelSlicesLoaderCountdownLatchTest {
+
+    private Context mContext;
+    private PanelSlicesLoaderCountdownLatch mSliceCountdownLatch;
+
+    private static final Uri[] URIS = new Uri[] {
+      Uri.parse("content://testUri"),
+      Uri.parse("content://wowUri"),
+      Uri.parse("content://boxTurtle")
+    };
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mSliceCountdownLatch = new PanelSlicesLoaderCountdownLatch(URIS.length);
+    }
+
+
+    @Test
+    public void hasLoaded_newObject_returnsFalse() {
+        assertThat(mSliceCountdownLatch.isSliceLoaded(URIS[0])).isFalse();
+    }
+
+    @Test
+    public void hasLoaded_markSliceLoaded_returnsTrue() {
+        mSliceCountdownLatch.markSliceLoaded(URIS[0]);
+
+        assertThat(mSliceCountdownLatch.isSliceLoaded(URIS[0])).isTrue();
+    }
+
+    @Test
+    public void markSliceLoaded_onlyCountsDownUniqueUris() {
+        for (int i = 0; i < URIS.length; i++) {
+            mSliceCountdownLatch.markSliceLoaded(URIS[0]);
+        }
+
+        assertThat(mSliceCountdownLatch.isPanelReadyToLoad()).isFalse();
+    }
+
+    @Test
+    public void areSlicesReadyToLoad_allSlicesLoaded_returnsTrue() {
+        for (int i = 0; i < URIS.length; i++) {
+            mSliceCountdownLatch.markSliceLoaded(URIS[i]);
+        }
+
+        assertThat(mSliceCountdownLatch.isPanelReadyToLoad()).isTrue();
+    }
+
+    @Test
+    public void areSlicesReadyToLoad_onlyReturnsTrueOnce() {
+        for (int i = 0; i < URIS.length; i++) {
+            mSliceCountdownLatch.markSliceLoaded(URIS[i]);
+        }
+
+        // Verify that it returns true once
+        assertThat(mSliceCountdownLatch.isPanelReadyToLoad()).isTrue();
+        // Verify the second call returns false without external state change
+        assertThat(mSliceCountdownLatch.isPanelReadyToLoad()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/panel/WifiPanelTest.java b/tests/unit/src/com/android/settings/panel/WifiPanelTest.java
new file mode 100644
index 0000000..b03075e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/panel/WifiPanelTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.panel;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.slices.CustomSliceRegistry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiPanelTest {
+
+    private WifiPanel mPanel;
+
+    @Before
+    public void setUp() {
+        mPanel = WifiPanel.create(ApplicationProvider.getApplicationContext());
+    }
+
+    @Test
+    public void getSlices_containsNecessarySlices() {
+        final List<Uri> uris = mPanel.getSlices();
+
+        assertThat(uris).containsExactly(
+                CustomSliceRegistry.WIFI_SLICE_URI);
+    }
+
+    @Test
+    public void getSeeMoreIntent_notNull() {
+        assertThat(mPanel.getSeeMoreIntent()).isNotNull();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/password/ChooseLockGenericTest.java b/tests/unit/src/com/android/settings/password/ChooseLockGenericTest.java
deleted file mode 100644
index 4b539cc..0000000
--- a/tests/unit/src/com/android/settings/password/ChooseLockGenericTest.java
+++ /dev/null
@@ -1,240 +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.password;
-
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-import static androidx.test.InstrumentationRegistry.getTargetContext;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertTrue;
-
-import android.app.Activity;
-import android.app.ActivityManager;
-import android.app.ActivityManager.AppTask;
-import android.app.KeyguardManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject;
-import android.support.test.uiautomator.UiSelector;
-import android.text.format.DateUtils;
-import android.view.WindowManager;
-
-import androidx.test.filters.MediumTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import androidx.test.runner.lifecycle.Stage;
-
-import com.android.internal.widget.LockPatternUtils;
-import com.android.internal.widget.LockscreenCredential;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * Tests for {@link ChooseLockGenericTest}
- *
- * m SettingsTests &&
- * adb install \
- * -r -g  ${ANDROID_PRODUCT_OUT}/data/app/SettingsTests/SettingsTests.apk &&
- * adb shell am instrument -e class com.android.settings.password.ChooseLockGenericTest \
- * -w com.android.settings.tests/androidx.test.runner.AndroidJUnitRunner
- */
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class ChooseLockGenericTest {
-    private static final long TIMEOUT = 5 * DateUtils.SECOND_IN_MILLIS;
-    private static final Intent PHISHING_ATTACK_INTENT = new Intent()
-            .putExtra("confirm_credentials", false)
-            .putExtra("password_confirmed", true);
-
-    private UiDevice mDevice;
-    private Context mTargetContext;
-    private String mSettingPackage;
-
-    @Rule
-    public ActivityTestRule<ChooseLockGeneric> mChooseLockGenericActivityRule =
-            new ActivityTestRule<>(
-                    ChooseLockGeneric.class,
-                    true /* enable touch at launch */,
-                    false /* don't launch at every test */);
-
-    @Before
-    public void setUp() throws Exception {
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mTargetContext = getInstrumentation().getTargetContext();
-        mSettingPackage = mTargetContext.getPackageName();
-    }
-
-    @Test
-    public void testConfirmLockPasswordShown_deviceWithPassword() throws Throwable {
-        setPassword();
-        try {
-            // GIVEN a PIN password is set on this device at set up.
-            // WHEN ChooseLockGeneric is launched with no extras.
-            mChooseLockGenericActivityRule.launchActivity(null /* No extras */);
-            // THEN ConfirmLockPassword.InternalActivity is shown.
-            final Activity activity = getCurrentActivity();
-            assertThat(isSecureWindow(activity)).isTrue();
-            assertThat(activity)
-                    .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
-        } finally {
-            finishAllAppTasks();
-            mDevice.waitForIdle();
-            clearPassword();
-        }
-    }
-
-    @Test
-    public void testConfirmLockPasswordShown_deviceWithPassword_phishingAttack() throws Throwable {
-        setPassword();
-        try {
-            // GIVEN a PIN password is set on this device at set up.
-            // WHEN ChooseLockGeneric is launched with extras to by-pass lock password confirmation.
-            mChooseLockGenericActivityRule.launchActivity(PHISHING_ATTACK_INTENT);
-            // THEN ConfirmLockPassword.InternalActivity is still shown.
-            final Activity activity = getCurrentActivity();
-            assertThat(isSecureWindow(activity)).isTrue();
-            assertThat(activity)
-                    .isInstanceOf(ConfirmLockPassword.InternalActivity.class);
-        } finally {
-            finishAllAppTasks();
-            mDevice.waitForIdle();
-            clearPassword();
-        }
-    }
-
-    @Test
-    public void testForFingerprint_inflateLayout() {
-        mChooseLockGenericActivityRule.launchActivity(new Intent()
-                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true));
-
-        assertThat(mChooseLockGenericActivityRule.getActivity().isResumed()).isTrue();
-    }
-
-    private Activity getCurrentActivity() throws Throwable {
-        getInstrumentation().waitForIdleSync();
-        final Activity[] activity = new Activity[1];
-        getInstrumentation().runOnMainSync(() -> {
-            Collection<Activity> activities = ActivityLifecycleMonitorRegistry.getInstance()
-                    .getActivitiesInStage(Stage.RESUMED);
-            activity[0] = activities.iterator().next();
-        });
-        return activity[0];
-    }
-
-    /** Sets a PIN password, 12345, for testing. */
-    private void setPassword() throws Exception {
-        Intent newPasswordIntent = new Intent(getTargetContext(), ChooseLockGeneric.class)
-                .putExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
-                        DevicePolicyManager.PASSWORD_QUALITY_NUMERIC)
-                .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
-                        LockscreenCredential.createPin("12345"))
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        getInstrumentation().getContext().startActivity(newPasswordIntent);
-        mDevice.waitForIdle();
-
-
-        // Ignore any interstitial options
-        UiObject view = new UiObject(new UiSelector()
-                .resourceId(mSettingPackage + ":id/encrypt_dont_require_password"));
-        if (view.waitForExists(TIMEOUT)) {
-            view.click();
-            mDevice.waitForIdle();
-        }
-
-        // Set our PIN
-        view = new UiObject(new UiSelector()
-                .resourceId(mSettingPackage + ":id/password_entry"));
-        assertTrue("password_entry", view.waitForExists(TIMEOUT));
-
-        // Enter it twice to confirm
-        enterTestPin(view);
-        enterTestPin(view);
-
-        // Dismiss notifications setting
-        view = new UiObject(new UiSelector()
-                .resourceId(mSettingPackage + ":id/redaction_done_button"));
-        if (view.waitForExists(TIMEOUT)) {
-            view.click();
-            mDevice.waitForIdle();
-        }
-
-        mDevice.pressBack();
-
-        assertThat(getTargetContext().getSystemService(KeyguardManager.class).isDeviceSecure())
-                .isTrue();
-    }
-
-    /** Clears the previous set PIN password. */
-    private void clearPassword() throws Exception {
-        Intent newPasswordIntent = new Intent(getTargetContext(), ChooseLockGeneric.class)
-                .putExtra(LockPatternUtils.PASSWORD_TYPE_KEY,
-                        DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
-                        | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        getInstrumentation().getContext().startActivity(newPasswordIntent);
-        mDevice.waitForIdle();
-
-        // Enter current PIN
-        UiObject view = new UiObject(
-                new UiSelector().resourceId(mSettingPackage + ":id/password_entry"));
-        if (!view.waitForExists(TIMEOUT)) {
-            // Odd, maybe there is a crash dialog showing; try dismissing it
-            mDevice.pressBack();
-            mDevice.waitForIdle();
-
-            assertTrue("password_entry", view.waitForExists(TIMEOUT));
-        }
-
-        enterTestPin(view);
-
-        mDevice.pressBack();
-
-        assertThat(getTargetContext().getSystemService(KeyguardManager.class).isDeviceSecure())
-                .isFalse();
-    }
-
-    private void finishAllAppTasks() {
-        final ActivityManager activityManager =
-                getTargetContext().getSystemService(ActivityManager.class);
-        final List<AppTask> appTasks = activityManager.getAppTasks();
-        for (ActivityManager.AppTask task : appTasks) {
-            task.finishAndRemoveTask();
-        }
-    }
-
-    private void enterTestPin(UiObject view) throws Exception {
-        mDevice.waitForIdle();
-        view.setText("12345");
-        mDevice.pressEnter();
-        mDevice.waitForIdle();
-    }
-
-    private boolean isSecureWindow(Activity activity) {
-        return (activity.getWindow().getAttributes().flags & WindowManager.LayoutParams.FLAG_SECURE)
-                != 0;
-    }
-}
diff --git a/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java b/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java
deleted file mode 100644
index e12390c..0000000
--- a/tests/unit/src/com/android/settings/password/ChooseLockPasswordTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2017 Google Inc.
- *
- * 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.password;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.pressKey;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
-import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.hamcrest.CoreMatchers.not;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.view.KeyEvent;
-import android.view.View;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.espresso.action.ViewActions;
-import androidx.test.espresso.matcher.ViewMatchers;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import com.google.android.setupcompat.PartnerCustomizationLayout;
-import com.google.android.setupcompat.template.FooterBarMixin;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class ChooseLockPasswordTest {
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void clearIsNotShown_when_activityLaunchedInitially() {
-        final Activity activity =
-                mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class)
-                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
-        final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
-        assertThat(
-                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility())
-                        .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void clearIsNotShown_when_nothingEntered() {
-        final Activity activity =
-                mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class));
-        final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
-        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        assertThat(
-                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility())
-                        .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void clearIsShown_when_somethingEnteredToConfirm() {
-        final Activity activity =
-                mInstrumentation.startActivitySync(new Intent(mContext, ChooseLockPassword.class));
-        final PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
-        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER))
-                .perform(ViewActions.typeText("1"));
-        // clear should be present if text field contains content
-        assertThat(layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getText())
-                .isEqualTo(mContext.getString(R.string.lockpassword_clear_label));
-        assertThat(
-                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility())
-                        .isEqualTo(View.VISIBLE);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/password/ConfirmLockPasswordTest.java b/tests/unit/src/com/android/settings/password/ConfirmLockPasswordTest.java
deleted file mode 100644
index 321284f..0000000
--- a/tests/unit/src/com/android/settings/password/ConfirmLockPasswordTest.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.password;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.pressKey;
-import static androidx.test.espresso.action.ViewActions.typeText;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.view.KeyEvent;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class ConfirmLockPasswordTest {
-
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-    }
-
-    @Test
-    public void enterWrongPin_shouldShowErrorMessage() {
-        mInstrumentation.startActivitySync(
-                new Intent(mContext, ConfirmLockPassword.class));
-        onView(withId(R.id.password_entry)).perform(typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        onView(withId(R.id.errorText)).check(matches(withText(R.string.lockpassword_invalid_pin)));
-    }
-
-    @Test
-    public void enterWrongPin_darkTheme_shouldShowErrorMessage() {
-        mInstrumentation.startActivitySync(
-                new Intent(mContext, ConfirmLockPassword.class)
-                        .putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, true));
-        onView(withId(R.id.password_entry)).perform(typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        onView(withId(R.id.errorText)).check(matches(withText(R.string.lockpassword_invalid_pin)));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/password/ScreenLockTypeTest.java b/tests/unit/src/com/android/settings/password/ScreenLockTypeTest.java
new file mode 100644
index 0000000..f05e576
--- /dev/null
+++ b/tests/unit/src/com/android/settings/password/ScreenLockTypeTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2020 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.password;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.admin.DevicePolicyManager;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ScreenLockTypeTest {
+
+    @Test
+    public void fromQuality_shouldReturnLockWithAssociatedQuality() {
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHABETIC))
+                .isEqualTo(ScreenLockType.PASSWORD);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_ALPHANUMERIC))
+                .isEqualTo(ScreenLockType.PASSWORD);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_BIOMETRIC_WEAK))
+                .isNull();
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_COMPLEX))
+                .isEqualTo(ScreenLockType.PASSWORD);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_MANAGED))
+                .isEqualTo(ScreenLockType.MANAGED);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC))
+                .isEqualTo(ScreenLockType.PIN);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_NUMERIC_COMPLEX))
+                .isEqualTo(ScreenLockType.PIN);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_SOMETHING))
+                .isEqualTo(ScreenLockType.PATTERN);
+        assertThat(ScreenLockType.fromQuality(DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED))
+                .isEqualTo(ScreenLockType.SWIPE);
+    }
+
+    @Test
+    public void fromKey_shouldReturnLockWithGivenKey() {
+        for (ScreenLockType lock : ScreenLockType.values()) {
+            assertThat(ScreenLockType.fromKey(lock.preferenceKey)).isEqualTo(lock);
+        }
+        assertThat(ScreenLockType.fromKey("nonexistent")).isNull();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/password/SetupChooseLockGenericTest.java b/tests/unit/src/com/android/settings/password/SetupChooseLockGenericTest.java
deleted file mode 100644
index b0ca636..0000000
--- a/tests/unit/src/com/android/settings/password/SetupChooseLockGenericTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.password;
-
-import static android.app.admin.DevicePolicyManager.ACTION_SET_NEW_PASSWORD;
-
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-import static androidx.test.InstrumentationRegistry.getTargetContext;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.provider.Settings;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiSelector;
-
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-import androidx.test.runner.lifecycle.ActivityLifecycleMonitorRegistry;
-import androidx.test.runner.lifecycle.Stage;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Collection;
-
-/**
- * Tests for {@link SetupChooseLockGenericTest}
- *
- */
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class SetupChooseLockGenericTest {
-
-    private UiDevice mDevice;
-    private Context mContext;
-
-    @Before
-    public void setUp() throws Exception {
-        mDevice = UiDevice.getInstance(getInstrumentation());
-        mContext = getInstrumentation().getTargetContext();
-        Settings.Global.putInt(
-            mContext.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0);
-    }
-
-    @After
-    public void tearDown() {
-        Settings.Global.putInt(
-            mContext.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1);
-    }
-
-    @Test
-    public void clickSkipFigerprintPreference_deviceNotProvisioned_shouldBeAbleToProceed()
-            throws Throwable {
-        final Intent newPasswordIntent =
-            new Intent(getTargetContext(), SetupChooseLockGeneric.class)
-            .putExtra(ChooseLockSettingsHelper.EXTRA_KEY_FOR_FINGERPRINT, true)
-            .setAction(ACTION_SET_NEW_PASSWORD)
-            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-
-        getInstrumentation().getContext().startActivity(newPasswordIntent);
-        mDevice.waitForIdle();
-        mDevice.findObject(new UiSelector().textContains("Continue without ")).click();
-
-        final Activity activity = getCurrentActivity();
-        assertThat(activity).isInstanceOf(SetupChooseLockGeneric.InternalActivity.class);
-    }
-
-    private Activity getCurrentActivity() throws Throwable {
-        getInstrumentation().waitForIdleSync();
-        final Activity[] activity = new Activity[1];
-        getInstrumentation().runOnMainSync(() -> {
-            Collection<Activity> activities = ActivityLifecycleMonitorRegistry.getInstance()
-                    .getActivitiesInStage(Stage.RESUMED);
-            activity[0] = activities.iterator().next();
-        });
-        return activity[0];
-    }
-
-}
diff --git a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java b/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
deleted file mode 100644
index cc0253f..0000000
--- a/tests/unit/src/com/android/settings/password/SetupChooseLockPasswordAppTest.java
+++ /dev/null
@@ -1,120 +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.password;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.action.ViewActions.pressKey;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
-import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.hamcrest.CoreMatchers.not;
-
-import android.content.Context;
-import android.view.KeyEvent;
-import android.view.View;
-import android.widget.Button;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.espresso.action.ViewActions;
-import androidx.test.espresso.matcher.ViewMatchers;
-import androidx.test.filters.MediumTest;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.R;
-
-import com.google.android.setupcompat.PartnerCustomizationLayout;
-import com.google.android.setupcompat.template.FooterBarMixin;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class SetupChooseLockPasswordAppTest {
-
-    private Context mContext;
-
-    @Rule
-    public ActivityTestRule<SetupChooseLockPassword> mActivityTestRule =
-            new ActivityTestRule<>(
-                    SetupChooseLockPassword.class,
-                    true /* enable touch at launch */,
-                    false /* don't launch at every test */);
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    @Test
-    public void testSkipDialogIsShown() throws Throwable {
-        SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null);
-        PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
-        final Button skipOrClearButton =
-                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView();
-
-        assertThat(skipOrClearButton.getText()).isEqualTo(mContext.getString(R.string.skip_label));
-        assertThat(skipOrClearButton.getVisibility()).isEqualTo(View.VISIBLE);
-        skipOrClearButton.performClick();
-        assertThat(activity.isFinishing()).named("Is finishing").isTrue();
-    }
-
-    @Test
-    public void clearIsNotShown_when_activityLaunchedInitially() {
-        SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null);
-        PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
-        assertThat(layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getText())
-                .isEqualTo(mContext.getString(R.string.lockpassword_clear_label));
-    }
-
-    @Test
-    public void clearIsNotShown_when_nothingEntered() throws Throwable {
-        SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null);
-        PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
-        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        assertThat(
-                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility())
-                        .isEqualTo(View.GONE);
-    }
-
-    @Test
-    public void clearIsShown_when_somethingEnteredToConfirm() {
-        SetupChooseLockPassword activity = mActivityTestRule.launchActivity(null);
-        PartnerCustomizationLayout layout = activity.findViewById(R.id.setup_wizard_layout);
-        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
-               .perform(pressKey(KeyEvent.KEYCODE_ENTER));
-        mActivityTestRule.launchActivity(null);
-        onView(withId(R.id.password_entry)).perform(ViewActions.typeText("1234"))
-                .perform(pressKey(KeyEvent.KEYCODE_ENTER))
-                .perform(ViewActions.typeText("1"));
-        // clear should be present if text field contains content
-        assertThat(
-                layout.getMixin(FooterBarMixin.class).getSecondaryButtonView().getVisibility())
-                        .isEqualTo(View.VISIBLE);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java b/tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java
new file mode 100644
index 0000000..1a4737b
--- /dev/null
+++ b/tests/unit/src/com/android/settings/search/CustomSiteMapRegistryTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2020 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 androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.DisplaySettings;
+import com.android.settings.backup.UserBackupSettingsActivity;
+import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
+import com.android.settings.connecteddevice.usb.UsbDetailsFragment;
+import com.android.settings.fuelgauge.PowerUsageAdvanced;
+import com.android.settings.fuelgauge.PowerUsageSummary;
+import com.android.settings.gestures.GestureNavigationSettingsFragment;
+import com.android.settings.gestures.SystemNavigationGestureSettings;
+import com.android.settings.location.LocationSettings;
+import com.android.settings.location.RecentLocationRequestSeeAllFragment;
+import com.android.settings.network.NetworkDashboardFragment;
+import com.android.settings.notification.zen.ZenModeBlockedEffectsSettings;
+import com.android.settings.notification.zen.ZenModeRestrictNotificationsSettings;
+import com.android.settings.security.SecuritySettings;
+import com.android.settings.security.screenlock.ScreenLockSettings;
+import com.android.settings.system.SystemDashboardFragment;
+import com.android.settings.wallpaper.WallpaperSuggestionActivity;
+import com.android.settings.wifi.WifiSettings;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class CustomSiteMapRegistryTest {
+
+    @Test
+    public void shouldContainScreenLockSettingsPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(ScreenLockSettings.class.getName()))
+                .isEqualTo(SecuritySettings.class.getName());
+    }
+
+    @Test
+    public void shouldContainWallpaperSuggestionActivityPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
+                WallpaperSuggestionActivity.class.getName()))
+                .isEqualTo(DisplaySettings.class.getName());
+    }
+
+    @Test
+    public void shouldContainWifiSettingsPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(WifiSettings.class.getName()))
+                .isEqualTo(NetworkDashboardFragment.class.getName());
+    }
+
+    @Test
+    public void shouldContainPowerUsageAdvancedPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(PowerUsageAdvanced.class.getName()))
+                .isEqualTo(PowerUsageSummary.class.getName());
+    }
+
+    @Test
+    public void shouldContainRecentLocationRequestSeeAllFragmentPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
+                RecentLocationRequestSeeAllFragment.class.getName())).isEqualTo(
+                LocationSettings.class.getName());
+    }
+
+    @Test
+    public void shouldContainUsbDetailsFragmentPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
+                UsbDetailsFragment.class.getName())).isEqualTo(
+                ConnectedDeviceDashboardFragment.class.getName());
+    }
+
+    @Test
+    public void shouldContainUserBackupSettingsActivityPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
+                UserBackupSettingsActivity.class.getName())).isEqualTo(
+                SystemDashboardFragment.class.getName());
+    }
+
+    @Test
+    public void shouldContainZenModeBlockedEffectsSettingsPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
+                ZenModeBlockedEffectsSettings.class.getName())).isEqualTo(
+                ZenModeRestrictNotificationsSettings.class.getName());
+    }
+
+    @Test
+    public void shouldContainGestureNavigationSettingsFragmentPairs() {
+        assertThat(CustomSiteMapRegistry.CUSTOM_SITE_MAP.get(
+                GestureNavigationSettingsFragment.class.getName())).isEqualTo(
+                SystemNavigationGestureSettings.class.getName());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/search/DatabaseIndexingUtils.java b/tests/unit/src/com/android/settings/search/DatabaseIndexingUtils.java
new file mode 100644
index 0000000..42eb45b
--- /dev/null
+++ b/tests/unit/src/com/android/settings/search/DatabaseIndexingUtils.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2020 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.util.Log;
+
+import com.android.settingslib.search.Indexable;
+
+import java.lang.reflect.Field;
+
+/**
+ * Utility class for {@like DatabaseIndexingManager} to handle the mapping between Payloads
+ * and Preference controllers, and managing indexable classes.
+ */
+public class DatabaseIndexingUtils {
+
+    private static final String TAG = "IndexingUtil";
+
+    public static final String FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER =
+            "SEARCH_INDEX_DATA_PROVIDER";
+
+    public static Indexable.SearchIndexProvider getSearchIndexProvider(final Class<?> clazz) {
+        try {
+            final Field f = clazz.getField(FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER);
+            return (Indexable.SearchIndexProvider) f.get(null);
+        } catch (NoSuchFieldException e) {
+            Log.d(TAG, "Cannot find field '" + FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER + "'");
+        } catch (SecurityException se) {
+            Log.d(TAG,
+                    "Security exception for field '" + FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER + "'");
+        } catch (IllegalAccessException e) {
+            Log.d(TAG, "Illegal access to field '" + FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER + "'");
+        } catch (IllegalArgumentException e) {
+            Log.d(TAG, "Illegal argument when accessing field '"
+                    + FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER + "'");
+        }
+        return null;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/search/FakeSettingsFragment.java b/tests/unit/src/com/android/settings/search/FakeSettingsFragment.java
new file mode 100644
index 0000000..6dbb7fb
--- /dev/null
+++ b/tests/unit/src/com/android/settings/search/FakeSettingsFragment.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2020 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.provider.SearchIndexableResource;
+
+import com.android.internal.logging.nano.MetricsProto;
+import com.android.settings.dashboard.DashboardFragment;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.search.SearchIndexableRaw;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Test class for Settings Search Indexing.
+ * If you change this class, please run robotests to make sure they still pass.
+ */
+public class FakeSettingsFragment extends DashboardFragment {
+
+    public static final String TITLE = "raw title";
+    public static final String SUMMARY_ON = "raw summary on";
+    public static final String SUMMARY_OFF = "raw summary off";
+    public static final String ENTRIES = "rawentries";
+    public static final String KEYWORDS = "keywords, keywordss, keywordsss";
+    public static final String SPACE_KEYWORDS = "keywords keywordss keywordsss";
+    public static final String SCREEN_TITLE = "raw screen title";
+    public static final String CLASS_NAME = FakeSettingsFragment.class.getName();
+    public static final int ICON = 0xff;
+    public static final String INTENT_ACTION = "raw action";
+    public static final String PACKAGE_NAME = "raw target package";
+    public static final String TARGET_CLASS = "raw target class";
+    public static final String TARGET_PACKAGE = "raw package name";
+    public static final String KEY = "raw key";
+    public static final boolean ENABLED = true;
+
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsProto.MetricsEvent.DISPLAY;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return "";
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return com.android.settings.R.xml.display_settings;
+    }
+
+    @Override
+    protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
+        return null;
+    }
+
+    /** Index provider used to expose this fragment in search. */
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableRaw> getRawDataToIndex(Context context,
+                        boolean enabled) {
+                    final SearchIndexableRaw data = new SearchIndexableRaw(context);
+                    data.title = TITLE;
+                    data.summaryOn = SUMMARY_ON;
+                    data.summaryOff = SUMMARY_OFF;
+                    data.entries = ENTRIES;
+                    data.keywords = KEYWORDS;
+                    data.screenTitle = SCREEN_TITLE;
+                    data.packageName = PACKAGE_NAME;
+                    data.intentAction = INTENT_ACTION;
+                    data.intentTargetClass = TARGET_CLASS;
+                    data.intentTargetPackage = TARGET_PACKAGE;
+                    data.key = KEY;
+                    data.iconResId = ICON;
+                    data.enabled = ENABLED;
+
+                    final List<SearchIndexableRaw> result = new ArrayList<>(1);
+                    result.add(data);
+                    return result;
+                }
+
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                        boolean enabled) {
+                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = com.android.settings.R.xml.display_settings;
+                    result.add(sir);
+                    return result;
+                }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add("pref_key_1");
+                    keys.add("pref_key_3");
+                    return keys;
+                }
+            };
+}
diff --git a/tests/unit/src/com/android/settings/search/SearchIndexProviderCodeInspector.java b/tests/unit/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
new file mode 100644
index 0000000..bc5b41f
--- /dev/null
+++ b/tests/unit/src/com/android/settings/search/SearchIndexProviderCodeInspector.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2020 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.assertWithMessage;
+
+import android.provider.SearchIndexableResource;
+import android.util.ArraySet;
+import android.util.Log;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.core.codeinspection.CodeInspector;
+import com.android.settings.dashboard.DashboardFragmentSearchIndexProviderInspector;
+import com.android.settingslib.search.Indexable;
+import com.android.settingslib.search.SearchIndexableData;
+import com.android.settingslib.search.SearchIndexableResources;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * {@link CodeInspector} to ensure fragments implement search components correctly.
+ */
+public class SearchIndexProviderCodeInspector extends CodeInspector {
+    private static final String TAG = "SearchCodeInspector";
+
+    private static final String NOT_CONTAINING_PROVIDER_OBJECT_ERROR =
+            "Indexable should have public field "
+                    + DatabaseIndexingUtils.FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER
+                    + " but these are not:\n";
+    private static final String NOT_SHARING_PREF_CONTROLLERS_BETWEEN_FRAG_AND_PROVIDER =
+            "DashboardFragment should share pref controllers with its SearchIndexProvider, but "
+                    + " these are not: \n";
+    private static final String NOT_IN_INDEXABLE_PROVIDER_REGISTRY =
+            "Class containing " + DatabaseIndexingUtils.FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER
+                    + " must be added to " + SearchIndexableResources.class.getName()
+                    + " but these are not: \n";
+    private static final String NOT_PROVIDING_VALID_RESOURCE_ERROR =
+            "SearchIndexableProvider must either provide no resource to index, or valid ones. "
+                    + "But the followings contain resource with xml id = 0\n";
+
+    private final List<String> mNotImplementingIndexProviderExemptList;
+    private final List<String> mNotInSearchIndexableRegistryExemptList;
+    private final List<String> mNotSharingPrefControllersExemptList;
+
+    public SearchIndexProviderCodeInspector(List<Class<?>> classes) {
+        super(classes);
+        mNotImplementingIndexProviderExemptList = new ArrayList<>();
+        mNotInSearchIndexableRegistryExemptList = new ArrayList<>();
+        mNotSharingPrefControllersExemptList = new ArrayList<>();
+        initializeExemptList(mNotImplementingIndexProviderExemptList,
+                "exempt_not_implementing_index_provider");
+        initializeExemptList(mNotInSearchIndexableRegistryExemptList,
+                "exempt_not_in_search_index_provider_registry");
+        initializeExemptList(mNotSharingPrefControllersExemptList,
+                "exempt_not_sharing_pref_controllers_with_search_provider");
+    }
+
+    @Override
+    public void run() {
+        final Set<String> notImplementingIndexProvider = new ArraySet<>();
+        final Set<String> notInSearchProviderRegistry = new ArraySet<>();
+        final Set<String> notSharingPreferenceControllers = new ArraySet<>();
+        final Set<String> notProvidingValidResource = new ArraySet<>();
+        final Set<Class> providerClasses = new ArraySet<>();
+
+        final SearchFeatureProvider provider = new SearchFeatureProviderImpl();
+        for (SearchIndexableData bundle :
+                provider.getSearchIndexableResources().getProviderValues()) {
+            providerClasses.add(bundle.getTargetClass());
+        }
+
+        for (Class clazz : mClasses) {
+            if (!isConcreteSettingsClass(clazz)) {
+                continue;
+            }
+            final String className = clazz.getName();
+            // Skip fragments if it's not SettingsPreferenceFragment.
+            if (!SettingsPreferenceFragment.class.isAssignableFrom(clazz)) {
+                continue;
+            }
+            final boolean hasSearchIndexProvider = hasSearchIndexProvider(clazz);
+            // If it implements Indexable, it must also implement the index provider field.
+            if (!hasSearchIndexProvider) {
+                if (!mNotImplementingIndexProviderExemptList.remove(className)) {
+                    notImplementingIndexProvider.add(className);
+                }
+                continue;
+            }
+            // If it implements index provider field AND it's a DashboardFragment, its fragment and
+            // search provider must share the same set of PreferenceControllers.
+            final boolean isSharingPrefControllers = DashboardFragmentSearchIndexProviderInspector
+                    .isSharingPreferenceControllers(clazz);
+            if (!isSharingPrefControllers) {
+                if (!mNotSharingPrefControllersExemptList.remove(className)) {
+                    notSharingPreferenceControllers.add(className);
+                }
+                continue;
+            }
+            // Must be in SearchProviderRegistry
+            if (!providerClasses.contains(clazz)) {
+                if (!mNotInSearchIndexableRegistryExemptList.remove(className)) {
+                    notInSearchProviderRegistry.add(className);
+                }
+            }
+            // Search provider must either don't provider resource xml, or provide valid ones.
+            if (!hasValidResourceFromProvider(clazz)) {
+                notProvidingValidResource.add(className);
+            }
+        }
+
+        // Build error messages
+        final String indexProviderError = buildErrorMessage(NOT_CONTAINING_PROVIDER_OBJECT_ERROR,
+                notImplementingIndexProvider);
+        final String notSharingPrefControllerError = buildErrorMessage(
+                NOT_SHARING_PREF_CONTROLLERS_BETWEEN_FRAG_AND_PROVIDER,
+                notSharingPreferenceControllers);
+        final String notInProviderRegistryError =
+                buildErrorMessage(NOT_IN_INDEXABLE_PROVIDER_REGISTRY, notInSearchProviderRegistry);
+        final String notProvidingValidResourceError = buildErrorMessage(
+                NOT_PROVIDING_VALID_RESOURCE_ERROR, notProvidingValidResource);
+        assertWithMessage(indexProviderError)
+                .that(notImplementingIndexProvider)
+                .isEmpty();
+        assertWithMessage(notSharingPrefControllerError)
+                .that(notSharingPreferenceControllers)
+                .isEmpty();
+        assertWithMessage(notInProviderRegistryError)
+                .that(notInSearchProviderRegistry)
+                .isEmpty();
+        assertWithMessage(notProvidingValidResourceError)
+                .that(notProvidingValidResource)
+                .isEmpty();
+        assertNoObsoleteInExemptList("exempt_not_implementing_index_provider",
+                mNotImplementingIndexProviderExemptList);
+        assertNoObsoleteInExemptList("exempt_not_in_search_index_provider_registry",
+                mNotInSearchIndexableRegistryExemptList);
+        assertNoObsoleteInExemptList(
+                "exempt_not_sharing_pref_controllers_with_search_provider",
+                mNotSharingPrefControllersExemptList);
+    }
+
+    private boolean hasSearchIndexProvider(Class clazz) {
+        try {
+            final Field f = clazz.getField(
+                    DatabaseIndexingUtils.FIELD_NAME_SEARCH_INDEX_DATA_PROVIDER);
+            return f != null;
+        } catch (NoClassDefFoundError e) {
+            // Cannot find class def, ignore
+            return true;
+        } catch (NoSuchFieldException e) {
+            Log.e(TAG, "error fetching search provider from class " + clazz.getName());
+            return false;
+        }
+    }
+
+    private boolean hasValidResourceFromProvider(Class clazz) {
+        try {
+            final Indexable.SearchIndexProvider provider =
+                    DatabaseIndexingUtils.getSearchIndexProvider(clazz);
+            final List<SearchIndexableResource> resources = provider.getXmlResourcesToIndex(
+                    ApplicationProvider.getApplicationContext(), true /* enabled */);
+            if (resources == null) {
+                // No resource, that's fine.
+                return true;
+            }
+            for (SearchIndexableResource res : resources) {
+                if (res.xmlResId == 0) {
+                    // Invalid resource
+                    return false;
+                }
+            }
+        } catch (Exception e) {
+            // Ignore.
+        }
+        return true;
+    }
+
+    private String buildErrorMessage(String errorSummary, Set<String> errorClasses) {
+        final StringBuilder error = new StringBuilder(errorSummary);
+        for (String c : errorClasses) {
+            error.append(c).append("\n");
+        }
+        return error.toString();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/security/CredentialManagementAppButtonsControllerTest.java b/tests/unit/src/com/android/settings/security/CredentialManagementAppButtonsControllerTest.java
new file mode 100644
index 0000000..bbe9e35
--- /dev/null
+++ b/tests/unit/src/com/android/settings/security/CredentialManagementAppButtonsControllerTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 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 android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class CredentialManagementAppButtonsControllerTest {
+
+    private Context mContext;
+    private CredentialManagementAppButtonsController mController;
+
+    private static final String PREF_KEY_CREDENTIAL_MANAGEMENT_APP = "certificate_management_app";
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new CredentialManagementAppButtonsController(
+                mContext, PREF_KEY_CREDENTIAL_MANAGEMENT_APP);
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldAlwaysReturnAvailableUnsearchable() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/security/CredentialManagementAppHeaderControllerTest.java b/tests/unit/src/com/android/settings/security/CredentialManagementAppHeaderControllerTest.java
new file mode 100644
index 0000000..35470a7
--- /dev/null
+++ b/tests/unit/src/com/android/settings/security/CredentialManagementAppHeaderControllerTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2020 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 android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class CredentialManagementAppHeaderControllerTest {
+
+    private Context mContext;
+    private CredentialManagementAppHeaderController mController;
+
+    private static final String PREF_KEY_CREDENTIAL_MANAGEMENT_APP = "certificate_management_app";
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new CredentialManagementAppHeaderController(
+                mContext, PREF_KEY_CREDENTIAL_MANAGEMENT_APP);
+    }
+
+    @Test
+    public void getAvailabilityStatus_shouldAlwaysReturnAvailableUnsearchable() {
+        assertThat(mController.getAvailabilityStatus())
+                .isEqualTo(BasePreferenceController.AVAILABLE_UNSEARCHABLE);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/slices/FakeContextOnlyPreferenceController.java b/tests/unit/src/com/android/settings/slices/FakeContextOnlyPreferenceController.java
new file mode 100644
index 0000000..78587a0
--- /dev/null
+++ b/tests/unit/src/com/android/settings/slices/FakeContextOnlyPreferenceController.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2020 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.slices;
+
+import android.content.Context;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class FakeContextOnlyPreferenceController extends BasePreferenceController {
+
+    public static final String KEY = "fakeController2";
+
+    public FakeContextOnlyPreferenceController(Context context) {
+        super(context, KEY);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/slices/FakePreferenceController.java b/tests/unit/src/com/android/settings/slices/FakePreferenceController.java
new file mode 100644
index 0000000..f543893
--- /dev/null
+++ b/tests/unit/src/com/android/settings/slices/FakePreferenceController.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2020 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.slices;
+
+import android.content.Context;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class FakePreferenceController extends BasePreferenceController {
+
+    public FakePreferenceController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public int getSliceType() {
+        return SliceData.SliceType.SLIDER;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
+
+    @Override
+    public boolean isPublicSlice() {
+        return true;
+    }
+
+    @Override
+    public boolean useDynamicSliceSummary() {
+        return true;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java b/tests/unit/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java
new file mode 100644
index 0000000..ce8338c
--- /dev/null
+++ b/tests/unit/src/com/android/settings/slices/SliceControllerInXmlCodeInspector.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2020 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.slices;
+
+import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_CONTROLLER;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.provider.SearchIndexableResource;
+import android.text.TextUtils;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import com.android.settings.core.PreferenceXmlParserUtils;
+import com.android.settings.core.SliderPreferenceController;
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.core.codeinspection.CodeInspector;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settings.search.SearchFeatureProviderImpl;
+import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.search.Indexable;
+import com.android.settingslib.search.SearchIndexableData;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+public class SliceControllerInXmlCodeInspector extends CodeInspector {
+
+    private static final List<Class> sSliceControllerClasses = Arrays.asList(
+            TogglePreferenceController.class,
+            SliderPreferenceController.class
+    );
+
+    private final List<String> mXmlDeclaredControllers = new ArrayList<>();
+    private final List<String> mExemptedClasses = new ArrayList<>();
+
+    private static final String ERROR_MISSING_CONTROLLER =
+            "The following controllers were expected to be declared by "
+                    + "'settings:controller=Controller_Class_Name' in their corresponding Xml. "
+                    + "If it should not appear in XML, add the controller's classname to "
+                    + "exempt_slice_controller_not_in_xml. Controllers:\n";
+
+    private final Context mContext;
+    private final SearchFeatureProvider mSearchProvider;
+    private final FakeFeatureFactory mFakeFeatureFactory;
+
+    public SliceControllerInXmlCodeInspector(List<Class<?>> classes) throws Exception {
+        super(classes);
+        mContext = ApplicationProvider.getApplicationContext();
+        mSearchProvider = new SearchFeatureProviderImpl();
+        mFakeFeatureFactory = FakeFeatureFactory.setupForTest();
+        mFakeFeatureFactory.searchFeatureProvider = mSearchProvider;
+
+        CodeInspector.initializeExemptList(mExemptedClasses,
+                "exempt_slice_controller_not_in_xml");
+        initDeclaredControllers();
+    }
+
+    private void initDeclaredControllers() throws IOException, XmlPullParserException {
+        final List<Integer> xmlResources = getIndexableXml();
+        for (int xmlResId : xmlResources) {
+            final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
+                    xmlResId, PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_PREF_CONTROLLER);
+            for (Bundle bundle : metadata) {
+                final String controllerClassName = bundle.getString(METADATA_CONTROLLER);
+                if (TextUtils.isEmpty(controllerClassName)) {
+                    continue;
+                }
+                mXmlDeclaredControllers.add(controllerClassName);
+            }
+        }
+        // We definitely have some controllers in xml, so assert not-empty here as a proxy to
+        // make sure the parser didn't fail
+        assertThat(mXmlDeclaredControllers).isNotEmpty();
+    }
+
+    @Override
+    public void run() {
+        final List<String> missingControllersInXml = new ArrayList<>();
+
+        for (Class<?> clazz : mClasses) {
+            if (!isConcreteSettingsClass(clazz)) {
+                // Only care about non-abstract classes.
+                continue;
+            }
+            if (!isInlineSliceClass(clazz)) {
+                // Only care about inline-slice controller classes.
+                continue;
+            }
+
+            if (!mXmlDeclaredControllers.contains(clazz.getName())) {
+                // Class clazz should have been declared in XML (unless allowlisted).
+                missingControllersInXml.add(clazz.getName());
+            }
+        }
+
+        // Removed allowlisted classes
+        missingControllersInXml.removeAll(mExemptedClasses);
+
+        final String missingControllerError =
+                buildErrorMessage(ERROR_MISSING_CONTROLLER, missingControllersInXml);
+
+        assertWithMessage(missingControllerError).that(missingControllersInXml).isEmpty();
+    }
+
+    private boolean isInlineSliceClass(Class clazz) {
+        while (clazz != null) {
+            clazz = clazz.getSuperclass();
+            if (sSliceControllerClasses.contains(clazz)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private String buildErrorMessage(String errorSummary, List<String> errorClasses) {
+        final StringBuilder error = new StringBuilder(errorSummary);
+        for (String c : errorClasses) {
+            error.append(c).append("\n");
+        }
+        return error.toString();
+    }
+
+    private List<Integer> getIndexableXml() {
+        final List<Integer> xmlResSet = new ArrayList<>();
+
+        final Collection<SearchIndexableData> bundles = FeatureFactory.getFactory(
+                mContext).getSearchFeatureProvider().getSearchIndexableResources()
+                .getProviderValues();
+
+        for (SearchIndexableData bundle : bundles) {
+            Indexable.SearchIndexProvider provider = bundle.getSearchIndexProvider();
+
+            if (provider == null) {
+                continue;
+            }
+
+            List<SearchIndexableResource> resources = provider.getXmlResourcesToIndex(mContext,
+                    true);
+
+            if (resources == null) {
+                continue;
+            }
+
+            for (SearchIndexableResource resource : resources) {
+                // Add '0's anyway. It won't break the test.
+                xmlResSet.add(resource.xmlResId);
+            }
+        }
+        return xmlResSet;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/slices/SliceDataContractTest.java b/tests/unit/src/com/android/settings/slices/SliceDataContractTest.java
deleted file mode 100644
index 61629e9..0000000
--- a/tests/unit/src/com/android/settings/slices/SliceDataContractTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.slices;
-
-import static junit.framework.Assert.fail;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.platform.test.annotations.Presubmit;
-import android.provider.SearchIndexableResource;
-import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.core.PreferenceXmlParserUtils;
-import com.android.settings.overlay.FeatureFactory;
-import com.android.settingslib.search.Indexable;
-import com.android.settingslib.search.SearchIndexableData;
-import com.android.settingslib.search.SearchIndexableResources;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.xmlpull.v1.XmlPullParserException;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-@RunWith(AndroidJUnit4.class)
-@MediumTest
-public class SliceDataContractTest {
-
-    private static final String TAG = "SliceDataContractTest";
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    @Test
-    @Presubmit
-    public void preferenceWithControllerMustHaveNonEmptyTitle()
-            throws IOException, XmlPullParserException {
-        final Set<String> nullTitleFragments = new HashSet<>();
-
-        final SearchIndexableResources resources =
-                FeatureFactory.getFactory(mContext).getSearchFeatureProvider()
-                        .getSearchIndexableResources();
-
-        for (SearchIndexableData SearchIndexableData : resources.getProviderValues()) {
-            verifyPreferenceTitle(nullTitleFragments, SearchIndexableData);
-        }
-
-        if (!nullTitleFragments.isEmpty()) {
-            final StringBuilder error = new StringBuilder(
-                    "All preferences with a controller must have a non-empty title by default, "
-                            + "found empty title in the following fragments\n");
-            for (String c : nullTitleFragments) {
-                error.append(c).append("\n");
-            }
-            fail(error.toString());
-        }
-    }
-
-    private void verifyPreferenceTitle(Set<String> nullTitleFragments,
-            SearchIndexableData searchIndexableData)
-            throws IOException, XmlPullParserException {
-
-        final String className = searchIndexableData.getTargetClass().getName();
-        final Indexable.SearchIndexProvider provider =
-                searchIndexableData.getSearchIndexProvider();
-
-        final List<SearchIndexableResource> resourcesToIndex =
-                provider.getXmlResourcesToIndex(mContext, true);
-
-        if (resourcesToIndex == null) {
-            Log.d(TAG, className + "is not providing SearchIndexableResource, skipping");
-            return;
-        }
-
-        for (SearchIndexableResource sir : resourcesToIndex) {
-            final List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(mContext,
-                    sir.xmlResId,
-                    PreferenceXmlParserUtils.MetadataFlag.FLAG_INCLUDE_PREF_SCREEN
-                            | PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_PREF_TITLE
-                            | PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_PREF_CONTROLLER);
-
-            for (Bundle bundle : metadata) {
-                final String controller = bundle.getString(
-                        PreferenceXmlParserUtils.METADATA_CONTROLLER);
-                if (TextUtils.isEmpty(controller)) {
-                    continue;
-                }
-                final String title = bundle.getString(PreferenceXmlParserUtils.METADATA_TITLE);
-                if (TextUtils.isEmpty(title)) {
-                    nullTitleFragments.add(className);
-                }
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/tests/unit/src/com/android/settings/slices/SliceDataTest.java b/tests/unit/src/com/android/settings/slices/SliceDataTest.java
new file mode 100644
index 0000000..4d18544
--- /dev/null
+++ b/tests/unit/src/com/android/settings/slices/SliceDataTest.java
@@ -0,0 +1,287 @@
+/*
+ * Copyright (C) 2020 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.slices;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.Uri;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class SliceDataTest {
+
+    private static final String KEY = "KEY";
+    private static final String TITLE = "title";
+    private static final String SUMMARY = "summary";
+    private static final String SCREEN_TITLE = "screen title";
+    private static final String KEYWORDS = "a, b, c";
+    private static final String FRAGMENT_NAME = "fragment name";
+    private static final int ICON = 1234; // I declare a thumb war
+    private static final Uri URI = Uri.parse("content://com.android.settings.slices/test");
+    private static final String PREF_CONTROLLER = "com.android.settings.slices.tester";
+    private static final int SLICE_TYPE = SliceData.SliceType.SWITCH;
+    private static final String UNAVAILABLE_SLICE_SUBTITLE = "subtitleOfUnavailableSlice";
+
+    @Test
+    public void testBuilder_buildsMatchingObject() {
+        SliceData.Builder builder = new SliceData.Builder()
+                .setKey(KEY)
+                .setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setScreenTitle(SCREEN_TITLE)
+                .setKeywords(KEYWORDS)
+                .setIcon(ICON)
+                .setFragmentName(FRAGMENT_NAME)
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER)
+                .setSliceType(SLICE_TYPE)
+                .setUnavailableSliceSubtitle(UNAVAILABLE_SLICE_SUBTITLE)
+                .setIsPublicSlice(true);
+
+        SliceData data = builder.build();
+
+        assertThat(data.getKey()).isEqualTo(KEY);
+        assertThat(data.getTitle()).isEqualTo(TITLE);
+        assertThat(data.getSummary()).isEqualTo(SUMMARY);
+        assertThat(data.getScreenTitle()).isEqualTo(SCREEN_TITLE);
+        assertThat(data.getKeywords()).isEqualTo(KEYWORDS);
+        assertThat(data.getIconResource()).isEqualTo(ICON);
+        assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
+        assertThat(data.getUri()).isEqualTo(URI);
+        assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
+        assertThat(data.getSliceType()).isEqualTo(SLICE_TYPE);
+        assertThat(data.getUnavailableSliceSubtitle()).isEqualTo(UNAVAILABLE_SLICE_SUBTITLE);
+        assertThat(data.isPublicSlice()).isEqualTo(true);
+    }
+
+    @Test(expected = SliceData.InvalidSliceDataException.class)
+    public void testBuilder_noKey_throwsIllegalStateException() {
+        new SliceData.Builder()
+                .setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setScreenTitle(SCREEN_TITLE)
+                .setIcon(ICON)
+                .setFragmentName(FRAGMENT_NAME)
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER)
+                .build();
+    }
+
+    @Test(expected = SliceData.InvalidSliceDataException.class)
+    public void testBuilder_noTitle_throwsIllegalStateException() {
+        new SliceData.Builder()
+                .setKey(KEY)
+                .setSummary(SUMMARY)
+                .setScreenTitle(SCREEN_TITLE)
+                .setIcon(ICON)
+                .setFragmentName(FRAGMENT_NAME)
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER)
+                .build();
+    }
+
+    @Test(expected = SliceData.InvalidSliceDataException.class)
+    public void testBuilder_noFragment_throwsIllegalStateException() {
+        new SliceData.Builder()
+                .setKey(KEY)
+                .setFragmentName(FRAGMENT_NAME)
+                .setSummary(SUMMARY)
+                .setScreenTitle(SCREEN_TITLE)
+                .setIcon(ICON)
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER)
+                .build();
+    }
+
+    @Test(expected = SliceData.InvalidSliceDataException.class)
+    public void testBuilder_noPrefController_throwsIllegalStateException() {
+        new SliceData.Builder()
+                .setKey(KEY)
+                .setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setScreenTitle(SCREEN_TITLE)
+                .setIcon(ICON)
+                .setUri(URI)
+                .setFragmentName(FRAGMENT_NAME)
+                .build();
+    }
+
+    @Test
+    public void testBuilder_noSubtitle_buildsMatchingObject() {
+        SliceData.Builder builder = new SliceData.Builder()
+                .setKey(KEY)
+                .setTitle(TITLE)
+                .setScreenTitle(SCREEN_TITLE)
+                .setIcon(ICON)
+                .setFragmentName(FRAGMENT_NAME)
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER);
+
+        SliceData data = builder.build();
+
+        assertThat(data.getKey()).isEqualTo(KEY);
+        assertThat(data.getTitle()).isEqualTo(TITLE);
+        assertThat(data.getSummary()).isNull();
+        assertThat(data.getScreenTitle()).isEqualTo(SCREEN_TITLE);
+        assertThat(data.getIconResource()).isEqualTo(ICON);
+        assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
+        assertThat(data.getUri()).isEqualTo(URI);
+        assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
+    }
+
+    @Test
+    public void testBuilder_noScreenTitle_buildsMatchingObject() {
+        SliceData.Builder builder = new SliceData.Builder()
+                .setKey(KEY)
+                .setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setIcon(ICON)
+                .setFragmentName(FRAGMENT_NAME)
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER);
+
+        SliceData data = builder.build();
+
+        assertThat(data.getKey()).isEqualTo(KEY);
+        assertThat(data.getTitle()).isEqualTo(TITLE);
+        assertThat(data.getSummary()).isEqualTo(SUMMARY);
+        assertThat(data.getScreenTitle()).isNull();
+        assertThat(data.getIconResource()).isEqualTo(ICON);
+        assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
+        assertThat(data.getUri()).isEqualTo(URI);
+        assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
+    }
+
+    @Test
+    public void testBuilder_noIcon_buildsMatchingObject() {
+        SliceData.Builder builder = new SliceData.Builder()
+                .setKey(KEY)
+                .setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setScreenTitle(SCREEN_TITLE)
+                .setFragmentName(FRAGMENT_NAME)
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER);
+
+        SliceData data = builder.build();
+
+        assertThat(data.getKey()).isEqualTo(KEY);
+        assertThat(data.getTitle()).isEqualTo(TITLE);
+        assertThat(data.getSummary()).isEqualTo(SUMMARY);
+        assertThat(data.getScreenTitle()).isEqualTo(SCREEN_TITLE);
+        assertThat(data.getIconResource()).isEqualTo(0);
+        assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
+        assertThat(data.getUri()).isEqualTo(URI);
+        assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
+    }
+
+    @Test
+    public void testBuilder_noUri_buildsMatchingObject() {
+        SliceData.Builder builder = new SliceData.Builder()
+                .setKey(KEY)
+                .setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setScreenTitle(SCREEN_TITLE)
+                .setIcon(ICON)
+                .setFragmentName(FRAGMENT_NAME)
+                .setUri(null)
+                .setPreferenceControllerClassName(PREF_CONTROLLER);
+
+        SliceData data = builder.build();
+
+        assertThat(data.getKey()).isEqualTo(KEY);
+        assertThat(data.getTitle()).isEqualTo(TITLE);
+        assertThat(data.getSummary()).isEqualTo(SUMMARY);
+        assertThat(data.getScreenTitle()).isEqualTo(SCREEN_TITLE);
+        assertThat(data.getIconResource()).isEqualTo(ICON);
+        assertThat(data.getFragmentClassName()).isEqualTo(FRAGMENT_NAME);
+        assertThat(data.getUri()).isNull();
+        assertThat(data.getPreferenceController()).isEqualTo(PREF_CONTROLLER);
+    }
+
+    @Test
+    public void testEquality_identicalObjects() {
+        SliceData.Builder builder = new SliceData.Builder()
+                .setKey(KEY)
+                .setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setScreenTitle(SCREEN_TITLE)
+                .setIcon(ICON)
+                .setFragmentName(FRAGMENT_NAME)
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER);
+
+        SliceData dataOne = builder.build();
+        SliceData dataTwo = builder.build();
+
+        assertThat(dataOne.hashCode()).isEqualTo(dataTwo.hashCode());
+        assertThat(dataOne).isEqualTo(dataTwo);
+    }
+
+    @Test
+    public void testEquality_matchingKey_EqualObjects() {
+        SliceData.Builder builder = new SliceData.Builder()
+                .setKey(KEY)
+                .setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setScreenTitle(SCREEN_TITLE)
+                .setIcon(ICON)
+                .setFragmentName(FRAGMENT_NAME)
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER);
+
+        SliceData dataOne = builder.build();
+
+        builder.setTitle(TITLE + " diff")
+                .setSummary(SUMMARY + " diff")
+                .setScreenTitle(SCREEN_TITLE + " diff")
+                .setIcon(ICON + 1)
+                .setFragmentName(FRAGMENT_NAME + " diff")
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER + " diff");
+
+        SliceData dataTwo = builder.build();
+
+        assertThat(dataOne.hashCode()).isEqualTo(dataTwo.hashCode());
+        assertThat(dataOne).isEqualTo(dataTwo);
+    }
+
+    @Test
+    public void testEquality_differentKey_differentObjects() {
+        SliceData.Builder builder = new SliceData.Builder()
+                .setKey(KEY)
+                .setTitle(TITLE)
+                .setSummary(SUMMARY)
+                .setScreenTitle(SCREEN_TITLE)
+                .setIcon(ICON)
+                .setFragmentName(FRAGMENT_NAME)
+                .setUri(URI)
+                .setPreferenceControllerClassName(PREF_CONTROLLER);
+
+        SliceData dataOne = builder.build();
+
+        builder.setKey("not key");
+        SliceData dataTwo = builder.build();
+
+        assertThat(dataOne.hashCode()).isNotEqualTo(dataTwo.hashCode());
+        assertThat(dataOne).isNotEqualTo(dataTwo);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/slices/SliceTestUtils.java b/tests/unit/src/com/android/settings/slices/SliceTestUtils.java
new file mode 100644
index 0000000..1b035cd
--- /dev/null
+++ b/tests/unit/src/com/android/settings/slices/SliceTestUtils.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2020 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.slices;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.sqlite.SQLiteDatabase;
+import android.net.Uri;
+import android.provider.SettingsSlicesContract;
+
+import com.android.settings.testutils.FakeIndexProvider;
+import com.android.settings.testutils.FakeToggleController;
+
+class SliceTestUtils {
+
+    public static final String FAKE_TITLE = "title";
+    public static final String FAKE_SUMMARY = "summary";
+    public static final String FAKE_SCREEN_TITLE = "screen_title";
+    public static final String FAKE_KEYWORDS = "a, b, c";
+    public static final int FAKE_ICON = 1234;
+    public static final String FAKE_FRAGMENT_NAME = FakeIndexProvider.class.getName();
+    public static final String FAKE_CONTROLLER_NAME = FakeToggleController.class.getName();
+
+
+    public static void insertSliceToDb(Context context, String key) {
+        insertSliceToDb(context, key, true /* isPlatformSlice */);
+    }
+
+    public static void insertSliceToDb(Context context, String key, boolean isPlatformSlice) {
+        insertSliceToDb(context, key, isPlatformSlice, null /*customizedUnavailableSliceSubtitle*/);
+    }
+
+    public static void insertSliceToDb(Context context, String key, boolean isPlatformSlice,
+            String customizedUnavailableSliceSubtitle) {
+        insertSliceToDb(context, key, isPlatformSlice, customizedUnavailableSliceSubtitle, false);
+    }
+
+    public static void insertSliceToDb(Context context, String key, boolean isPlatformSlice,
+            String customizedUnavailableSliceSubtitle, boolean isPublicSlice) {
+        final SQLiteDatabase db = SlicesDatabaseHelper.getInstance(context).getWritableDatabase();
+        ContentValues values = new ContentValues();
+        values.put(SlicesDatabaseHelper.IndexColumns.KEY, key);
+        values.put(SlicesDatabaseHelper.IndexColumns.SLICE_URI,
+                new Uri.Builder()
+                        .scheme(ContentResolver.SCHEME_CONTENT)
+                        .authority(isPlatformSlice
+                                ? SettingsSlicesContract.AUTHORITY
+                                : SettingsSliceProvider.SLICE_AUTHORITY)
+                        .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                        .appendPath(key)
+                        .build().toSafeString());
+        values.put(SlicesDatabaseHelper.IndexColumns.TITLE, FAKE_TITLE);
+        values.put(SlicesDatabaseHelper.IndexColumns.SUMMARY, FAKE_SUMMARY);
+        values.put(SlicesDatabaseHelper.IndexColumns.SCREENTITLE, FAKE_SCREEN_TITLE);
+        values.put(SlicesDatabaseHelper.IndexColumns.KEYWORDS, FAKE_KEYWORDS);
+        values.put(SlicesDatabaseHelper.IndexColumns.ICON_RESOURCE, FAKE_ICON);
+        values.put(SlicesDatabaseHelper.IndexColumns.FRAGMENT, FAKE_FRAGMENT_NAME);
+        values.put(SlicesDatabaseHelper.IndexColumns.CONTROLLER, FAKE_CONTROLLER_NAME);
+        values.put(SlicesDatabaseHelper.IndexColumns.SLICE_TYPE, SliceData.SliceType.INTENT);
+        values.put(SlicesDatabaseHelper.IndexColumns.UNAVAILABLE_SLICE_SUBTITLE,
+                customizedUnavailableSliceSubtitle);
+        values.put(SlicesDatabaseHelper.IndexColumns.PUBLIC_SLICE, isPublicSlice);
+
+        db.replaceOrThrow(SlicesDatabaseHelper.Tables.TABLE_SLICES_INDEX, null, values);
+        db.close();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java b/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java
new file mode 100644
index 0000000..4fcbd15
--- /dev/null
+++ b/tests/unit/src/com/android/settings/slices/SpecialCaseSliceManagerTest.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2020 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.slices;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.Uri;
+import android.provider.SettingsSlicesContract;
+
+import androidx.slice.Slice;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class SpecialCaseSliceManagerTest {
+
+    private static final String FAKE_PARAMETER_KEY = "fake_parameter_key";
+    private static final String FAKE_PARAMETER_VALUE = "fake_value";
+
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        CustomSliceRegistry.sUriToSlice.clear();
+        CustomSliceRegistry.sUriToSlice.put(FakeSliceable.URI, FakeSliceable.class);
+    }
+
+    @Test
+    public void getSliceableFromUri_returnsCorrectObject() {
+        final CustomSliceable sliceable = CustomSliceable.createInstance(
+                mContext, CustomSliceRegistry.getSliceClassByUri(FakeSliceable.URI));
+
+        assertThat(sliceable).isInstanceOf(FakeSliceable.class);
+    }
+
+    @Test
+    public void getSliceableFromUriWithParameter_returnsCorrectObject() {
+        final Uri parameterUri = FakeSliceable.URI
+                .buildUpon()
+                .clearQuery()
+                .appendQueryParameter(FAKE_PARAMETER_KEY, FAKE_PARAMETER_VALUE)
+                .build();
+
+        final CustomSliceable sliceable = CustomSliceable.createInstance(
+                mContext, CustomSliceRegistry.getSliceClassByUri(parameterUri));
+
+        assertThat(sliceable).isInstanceOf(FakeSliceable.class);
+    }
+
+    @Test
+    public void isValidUri_validUri_returnsTrue() {
+        final boolean isValidUri = CustomSliceRegistry.isValidUri(FakeSliceable.URI);
+
+        assertThat(isValidUri).isTrue();
+    }
+
+    @Test
+    public void isValidUri_invalidUri_returnsFalse() {
+        final boolean isValidUri = CustomSliceRegistry.isValidUri(null);
+
+        assertThat(isValidUri).isFalse();
+    }
+
+    @Test
+    public void isValidAction_validActions_returnsTrue() {
+        final boolean isValidAction =
+                CustomSliceRegistry.isValidAction(FakeSliceable.URI.toString());
+
+        assertThat(isValidAction).isTrue();
+    }
+
+    @Test
+    public void isValidAction_invalidAction_returnsFalse() {
+        final boolean isValidAction = CustomSliceRegistry.isValidAction("action");
+
+        assertThat(isValidAction).isFalse();
+    }
+
+    static class FakeSliceable implements CustomSliceable {
+
+        static final String KEY = "magic key of khazad dum";
+
+        static final Uri URI = new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(SettingsSliceProvider.SLICE_AUTHORITY)
+                .appendPath(SettingsSlicesContract.PATH_SETTING_ACTION)
+                .appendPath(KEY)
+                .build();
+
+        static final Slice SLICE = new Slice.Builder(URI).build();
+
+        static boolean sBackingData = false;
+
+        final Context mContext;
+
+        public FakeSliceable(Context context) {
+            mContext = context;
+        }
+
+        @Override
+        public Slice getSlice() {
+            return SLICE;
+        }
+
+        @Override
+        public Uri getUri() {
+            return URI;
+        }
+
+        @Override
+        public void onNotifyChange(Intent intent) {
+            sBackingData = !sBackingData;
+        }
+
+        @Override
+        public IntentFilter getIntentFilter() {
+            return new IntentFilter();
+        }
+
+        @Override
+        public Intent getIntent() {
+            return null;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java
new file mode 100644
index 0000000..510928d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/sound/MediaControlsPreferenceControllerTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2020 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.sound;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.Settings;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class MediaControlsPreferenceControllerTest {
+
+    private static final String KEY = "media_controls_resume_switch";
+
+    private Context mContext;
+    private int mOriginalQs;
+    private int mOriginalResume;
+    private ContentResolver mContentResolver;
+    private MediaControlsPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        mContentResolver = mContext.getContentResolver();
+        mOriginalQs = Settings.Global.getInt(mContentResolver,
+                Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
+        mOriginalResume = Settings.Secure.getInt(mContentResolver,
+                Settings.Secure.MEDIA_CONTROLS_RESUME, 1);
+        mController = new MediaControlsPreferenceController(mContext, KEY);
+    }
+
+    @After
+    public void tearDown() {
+        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS,
+                mOriginalQs);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME,
+                mOriginalResume);
+    }
+
+    @Test
+    public void getAvailability_returnAvailable() {
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
+    }
+
+    @Test
+    public void setChecked_enable_shouldTurnOn() {
+        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 1);
+
+        assertThat(mController.isChecked()).isTrue();
+
+        mController.setChecked(false);
+
+        assertThat(Settings.Secure.getInt(mContentResolver,
+                Settings.Secure.MEDIA_CONTROLS_RESUME, -1)).isEqualTo(0);
+    }
+
+    @Test
+    public void setChecked_disable_shouldTurnOff() {
+        Settings.Global.putInt(mContentResolver, Settings.Global.SHOW_MEDIA_ON_QUICK_SETTINGS, 1);
+        Settings.Secure.putInt(mContentResolver, Settings.Secure.MEDIA_CONTROLS_RESUME, 0);
+
+        assertThat(mController.isChecked()).isFalse();
+
+        mController.setChecked(true);
+
+        assertThat(Settings.Secure.getInt(mContentResolver,
+                Settings.Secure.MEDIA_CONTROLS_RESUME, -1)).isEqualTo(1);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/AirplaneModeRule.java b/tests/unit/src/com/android/settings/testutils/AirplaneModeRule.java
new file mode 100644
index 0000000..545f6ad
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/AirplaneModeRule.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.Log;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.rules.ExternalResource;
+
+/** A test rule that is used to manager the Airplane Mode resource for testing. */
+public final class AirplaneModeRule extends ExternalResource {
+
+    private static final String TAG = "AirplaneModeRule";
+
+    private Context mContext;
+    private boolean mBackupValue;
+    private boolean mShouldRestore;
+
+    @Override
+    protected void before() throws Throwable {
+        mContext = ApplicationProvider.getApplicationContext();
+    }
+
+    @Override
+    protected void after() {
+        if (mShouldRestore) {
+            Log.d(TAG, "Restore Airplane Mode value:" + mBackupValue);
+            setAirplaneMode(mContext, mBackupValue);
+        }
+    }
+
+    public void setAirplaneMode(boolean enable) {
+        if (!mShouldRestore && isAirplaneModeOn() != enable) {
+            mShouldRestore = true;
+            mBackupValue = isAirplaneModeOn();
+            Log.d(TAG, "Backup Airplane Mode value:" + mBackupValue);
+        }
+        Log.d(TAG, "Set Airplane Mode enable:" + enable);
+        setAirplaneMode(mContext, enable);
+    }
+
+    public boolean isAirplaneModeOn() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
+    }
+
+    private static void setAirplaneMode(Context context, boolean enable) {
+        // Change the system setting
+        Settings.Global.putInt(context.getContentResolver(), Settings.Global.AIRPLANE_MODE_ON,
+                enable ? 1 : 0);
+
+        // Post the intent
+        final Intent intent = new Intent(Intent.ACTION_AIRPLANE_MODE_CHANGED);
+        intent.putExtra("state", enable);
+        context.sendBroadcastAsUser(intent, UserHandle.ALL);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/ApplicationTestUtils.java b/tests/unit/src/com/android/settings/testutils/ApplicationTestUtils.java
new file mode 100644
index 0000000..91f296f
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/ApplicationTestUtils.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.testutils;
+
+import android.content.pm.ApplicationInfo;
+
+/**
+ * Helper for mocking installed applications.
+ */
+public class ApplicationTestUtils {
+    /**
+     * Create and populate an {@link android.content.pm.ApplicationInfo} object that describes an
+     * installed app.
+     *
+     * @param uid The app's uid
+     * @param packageName The app's package name.
+     * @param flags Flags describing the app. See {@link android.content.pm.ApplicationInfo#flags}
+     *         for possible values.
+     * @param targetSdkVersion The app's target SDK version
+     *
+     * @see android.content.pm.ApplicationInfo
+     */
+    public static ApplicationInfo buildInfo(int uid, String packageName, int flags,
+            int targetSdkVersion) {
+        final ApplicationInfo info = new ApplicationInfo();
+        info.uid = uid;
+        info.packageName = packageName;
+        info.flags = flags;
+        info.targetSdkVersion = targetSdkVersion;
+        return info;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/BatteryTestUtils.java b/tests/unit/src/com/android/settings/testutils/BatteryTestUtils.java
new file mode 100644
index 0000000..57bd3f5
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/BatteryTestUtils.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils;
+
+import android.content.Intent;
+import android.os.BatteryManager;
+
+public class BatteryTestUtils {
+
+    public static Intent getChargingIntent() {
+        return getCustomBatteryIntent(
+                BatteryManager.BATTERY_PLUGGED_AC,
+                50 /* level */,
+                100 /* scale */,
+                BatteryManager.BATTERY_STATUS_CHARGING);
+    }
+
+    public static Intent getDischargingIntent() {
+        return getCustomBatteryIntent(
+                0 /* plugged */,
+                10 /* level */,
+                100 /* scale */,
+                BatteryManager.BATTERY_STATUS_DISCHARGING);
+    }
+
+    private static Intent getCustomBatteryIntent(int plugged, int level, int scale, int status) {
+        Intent intent = new Intent();
+        intent.putExtra(BatteryManager.EXTRA_PLUGGED, plugged);
+        intent.putExtra(BatteryManager.EXTRA_LEVEL, level);
+        intent.putExtra(BatteryManager.EXTRA_SCALE, scale);
+        intent.putExtra(BatteryManager.EXTRA_STATUS, status);
+
+        return intent;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/CustomActivity.java b/tests/unit/src/com/android/settings/testutils/CustomActivity.java
new file mode 100644
index 0000000..89cdcfc
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/CustomActivity.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.UserHandle;
+
+public class CustomActivity extends Activity {
+    @Override
+    public void startActivityAsUser(Intent intent, UserHandle user) {}
+}
diff --git a/tests/unit/src/com/android/settings/testutils/FakeCopyableController.java b/tests/unit/src/com/android/settings/testutils/FakeCopyableController.java
new file mode 100644
index 0000000..3bdbb54
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/FakeCopyableController.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils;
+
+import android.content.Context;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class FakeCopyableController extends BasePreferenceController {
+
+    public FakeCopyableController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return AVAILABLE;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
+
+    @Override
+    public boolean isCopyableSlice() {
+        return true;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
new file mode 100644
index 0000000..d20fc12
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.testutils;
+
+import static org.mockito.Mockito.mock;
+
+import android.content.Context;
+
+import com.android.settings.accounts.AccountFeatureProvider;
+import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.aware.AwareFeatureProvider;
+import com.android.settings.biometrics.face.FaceFeatureProvider;
+import com.android.settings.bluetooth.BluetoothFeatureProvider;
+import com.android.settings.dashboard.DashboardFeatureProvider;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
+import com.android.settings.fuelgauge.BatteryStatusFeatureProvider;
+import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
+import com.android.settings.gestures.AssistGestureFeatureProvider;
+import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
+import com.android.settings.localepicker.LocaleFeatureProvider;
+import com.android.settings.overlay.DockUpdaterFeatureProvider;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.overlay.SupportFeatureProvider;
+import com.android.settings.overlay.SurveyFeatureProvider;
+import com.android.settings.panel.PanelFeatureProvider;
+import com.android.settings.search.SearchFeatureProvider;
+import com.android.settings.security.SecurityFeatureProvider;
+import com.android.settings.slices.SlicesFeatureProvider;
+import com.android.settings.users.UserFeatureProvider;
+import com.android.settings.wifi.WifiTrackerLibProvider;
+import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
+
+/**
+ * Test util to provide fake FeatureFactory. To use this factory, call {@code setupForTest} in
+ * {@code @Before} method of the test class.
+ */
+public class FakeFeatureFactory extends FeatureFactory {
+    public final SupportFeatureProvider supportFeatureProvider;
+    public final MetricsFeatureProvider metricsFeatureProvider;
+    public final BatteryStatusFeatureProvider batteryStatusFeatureProvider;
+    public final PowerUsageFeatureProvider powerUsageFeatureProvider;
+    public final DashboardFeatureProvider dashboardFeatureProvider;
+    public final DockUpdaterFeatureProvider dockUpdaterFeatureProvider;
+    public final LocaleFeatureProvider localeFeatureProvider;
+    public final ApplicationFeatureProvider applicationFeatureProvider;
+    public final EnterprisePrivacyFeatureProvider enterprisePrivacyFeatureProvider;
+    public final SurveyFeatureProvider surveyFeatureProvider;
+    public final SecurityFeatureProvider securityFeatureProvider;
+    public final SuggestionFeatureProvider suggestionsFeatureProvider;
+    public final UserFeatureProvider userFeatureProvider;
+    public final AssistGestureFeatureProvider assistGestureFeatureProvider;
+    public final AccountFeatureProvider mAccountFeatureProvider;
+    public final BluetoothFeatureProvider mBluetoothFeatureProvider;
+    public final AwareFeatureProvider mAwareFeatureProvider;
+    public final FaceFeatureProvider mFaceFeatureProvider;
+
+    public PanelFeatureProvider panelFeatureProvider;
+    public SlicesFeatureProvider slicesFeatureProvider;
+    public SearchFeatureProvider searchFeatureProvider;
+    public ContextualCardFeatureProvider mContextualCardFeatureProvider;
+
+    public WifiTrackerLibProvider wifiTrackerLibProvider;
+
+    /**
+     * Call this in {@code @Before} method of the test class to use fake factory.
+     */
+    public static FakeFeatureFactory setupForTest() {
+        sFactory = new FakeFeatureFactory();
+        return (FakeFeatureFactory) sFactory;
+    }
+
+  /**
+   * FeatureFactory constructor.
+   */
+    public FakeFeatureFactory() {
+        supportFeatureProvider = mock(SupportFeatureProvider.class);
+        metricsFeatureProvider = mock(MetricsFeatureProvider.class);
+        batteryStatusFeatureProvider = mock(BatteryStatusFeatureProvider.class);
+        powerUsageFeatureProvider = mock(PowerUsageFeatureProvider.class);
+        dashboardFeatureProvider = mock(DashboardFeatureProvider.class);
+        dockUpdaterFeatureProvider = mock(DockUpdaterFeatureProvider.class);
+        localeFeatureProvider = mock(LocaleFeatureProvider.class);
+        applicationFeatureProvider = mock(ApplicationFeatureProvider.class);
+        enterprisePrivacyFeatureProvider = mock(EnterprisePrivacyFeatureProvider.class);
+        searchFeatureProvider = mock(SearchFeatureProvider.class);
+        surveyFeatureProvider = mock(SurveyFeatureProvider.class);
+        securityFeatureProvider = mock(SecurityFeatureProvider.class);
+        suggestionsFeatureProvider = mock(SuggestionFeatureProvider.class);
+        userFeatureProvider = mock(UserFeatureProvider.class);
+        assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class);
+        slicesFeatureProvider = mock(SlicesFeatureProvider.class);
+        mAccountFeatureProvider = mock(AccountFeatureProvider.class);
+        mContextualCardFeatureProvider = mock(ContextualCardFeatureProvider.class);
+        panelFeatureProvider = mock(PanelFeatureProvider.class);
+        mBluetoothFeatureProvider = mock(BluetoothFeatureProvider.class);
+        mAwareFeatureProvider = mock(AwareFeatureProvider.class);
+        mFaceFeatureProvider = mock(FaceFeatureProvider.class);
+        wifiTrackerLibProvider = mock(WifiTrackerLibProvider.class);
+    }
+
+    @Override
+    public SuggestionFeatureProvider getSuggestionFeatureProvider(Context context) {
+        return suggestionsFeatureProvider;
+    }
+
+    @Override
+    public SupportFeatureProvider getSupportFeatureProvider(Context context) {
+        return supportFeatureProvider;
+    }
+
+    @Override
+    public MetricsFeatureProvider getMetricsFeatureProvider() {
+        return metricsFeatureProvider;
+    }
+
+    @Override
+    public BatteryStatusFeatureProvider getBatteryStatusFeatureProvider(Context context) {
+        return batteryStatusFeatureProvider;
+    }
+
+    @Override
+    public PowerUsageFeatureProvider getPowerUsageFeatureProvider(Context context) {
+        return powerUsageFeatureProvider;
+    }
+
+    @Override
+    public DashboardFeatureProvider getDashboardFeatureProvider(Context context) {
+        return dashboardFeatureProvider;
+    }
+
+    @Override
+    public DockUpdaterFeatureProvider getDockUpdaterFeatureProvider() {
+        return dockUpdaterFeatureProvider;
+    }
+
+    @Override
+    public ApplicationFeatureProvider getApplicationFeatureProvider(Context context) {
+        return applicationFeatureProvider;
+    }
+
+    @Override
+    public LocaleFeatureProvider getLocaleFeatureProvider() {
+        return localeFeatureProvider;
+    }
+
+    @Override
+    public EnterprisePrivacyFeatureProvider getEnterprisePrivacyFeatureProvider(Context context) {
+        return enterprisePrivacyFeatureProvider;
+    }
+
+    @Override
+    public SearchFeatureProvider getSearchFeatureProvider() {
+        return searchFeatureProvider;
+    }
+
+    @Override
+    public SurveyFeatureProvider getSurveyFeatureProvider(Context context) {
+        return surveyFeatureProvider;
+    }
+
+    @Override
+    public SecurityFeatureProvider getSecurityFeatureProvider() {
+        return securityFeatureProvider;
+    }
+
+    @Override
+    public UserFeatureProvider getUserFeatureProvider(Context context) {
+        return userFeatureProvider;
+    }
+
+    @Override
+    public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
+        return assistGestureFeatureProvider;
+    }
+
+    @Override
+    public SlicesFeatureProvider getSlicesFeatureProvider() {
+        return slicesFeatureProvider;
+    }
+
+    @Override
+    public AccountFeatureProvider getAccountFeatureProvider() {
+        return mAccountFeatureProvider;
+    }
+
+    @Override
+    public PanelFeatureProvider getPanelFeatureProvider() {
+        return panelFeatureProvider;
+    }
+
+    @Override
+    public ContextualCardFeatureProvider getContextualCardFeatureProvider(Context context) {
+        return mContextualCardFeatureProvider;
+    }
+
+    @Override
+    public BluetoothFeatureProvider getBluetoothFeatureProvider(Context context) {
+        return mBluetoothFeatureProvider;
+    }
+
+    @Override
+    public AwareFeatureProvider getAwareFeatureProvider() {
+        return mAwareFeatureProvider;
+    }
+
+    @Override
+    public FaceFeatureProvider getFaceFeatureProvider() {
+        return mFaceFeatureProvider;
+    }
+
+    @Override
+    public WifiTrackerLibProvider getWifiTrackerLibProvider() {
+        return wifiTrackerLibProvider;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/FakeIndexProvider.java b/tests/unit/src/com/android/settings/testutils/FakeIndexProvider.java
new file mode 100644
index 0000000..5cbfb54
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/FakeIndexProvider.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.testutils;
+
+import android.content.Context;
+
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settingslib.search.Indexable;
+
+import java.util.List;
+
+public class FakeIndexProvider implements Indexable {
+
+    public static final String KEY = "TestKey";
+
+    /**
+     * The fake SearchIndexProvider. Note that the use of location_settings below implies that tests
+     * using this should be using the res/xml-mcc999/location_settings.xml or
+     * res/xml-mcc998/location_settings.xml. Annotate tests with
+     * {@code @Config(qualifiers = "mcc999")}.
+     */
+    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider(R.xml.location_settings) {
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> result = super.getNonIndexableKeys(context);
+                    result.add(KEY);
+                    return result;
+                }
+            };
+}
diff --git a/tests/unit/src/com/android/settings/testutils/FakeInvalidSliderController.java b/tests/unit/src/com/android/settings/testutils/FakeInvalidSliderController.java
new file mode 100644
index 0000000..15d214d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/FakeInvalidSliderController.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.testutils;
+
+import android.content.Context;
+
+public class FakeInvalidSliderController extends FakeSliderController {
+
+    public FakeInvalidSliderController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getMax() {
+        // Return 0 to make it invalid
+        return 0;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/FakeSliderController.java b/tests/unit/src/com/android/settings/testutils/FakeSliderController.java
new file mode 100644
index 0000000..f8685fc
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/FakeSliderController.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.testutils;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.SliderPreferenceController;
+
+public class FakeSliderController extends SliderPreferenceController {
+
+    public static final String AVAILABILITY_KEY = "fake_slider_availability_key";
+
+    public static final int MAX_VALUE = 9;
+
+    private static final String SETTING_KEY = "fake_slider_key";
+
+    public FakeSliderController(Context context, String key) {
+        super(context, key);
+    }
+
+    @Override
+    public int getSliderPosition() {
+        return Settings.System.getInt(mContext.getContentResolver(), SETTING_KEY, 0);
+    }
+
+    @Override
+    public boolean setSliderPosition(int position) {
+        return Settings.System.putInt(mContext.getContentResolver(), SETTING_KEY, position);
+    }
+
+    @Override
+    public int getMax() {
+        return MAX_VALUE;
+    }
+
+    @Override
+    public int getMin() {
+        return 0;
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return Settings.Global.getInt(mContext.getContentResolver(), AVAILABILITY_KEY, AVAILABLE);
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/FakeToggleController.java b/tests/unit/src/com/android/settings/testutils/FakeToggleController.java
new file mode 100644
index 0000000..9eda8b6
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/FakeToggleController.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.testutils;
+
+import android.content.Context;
+import android.content.IntentFilter;
+import android.net.Uri;
+import android.net.wifi.WifiManager;
+import android.provider.Settings;
+
+import com.android.settings.core.TogglePreferenceController;
+import com.android.settings.slices.SliceBackgroundWorker;
+
+public class FakeToggleController extends TogglePreferenceController {
+
+    public static final String AVAILABILITY_KEY = "fake_toggle_availability_key";
+
+    public static final IntentFilter INTENT_FILTER = new IntentFilter(
+            WifiManager.WIFI_AP_STATE_CHANGED_ACTION);
+
+    private static final String SETTING_KEY = "toggle_key";
+
+    private static final int ON = 1;
+    private static final int OFF = 0;
+
+    private boolean mIsAsyncUpdate = false;
+
+    public FakeToggleController(Context context, String preferenceKey) {
+        super(context, preferenceKey);
+    }
+
+    @Override
+    public boolean isChecked() {
+        return Settings.System.getInt(mContext.getContentResolver(),
+                SETTING_KEY, OFF) == ON;
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        return Settings.System.putInt(mContext.getContentResolver(), SETTING_KEY,
+                isChecked ? ON : OFF);
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                AVAILABILITY_KEY, AVAILABLE);
+    }
+
+    @Override
+    public IntentFilter getIntentFilter() {
+        return INTENT_FILTER;
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
+
+    @Override
+    public Class<? extends SliceBackgroundWorker> getBackgroundWorkerClass() {
+        return TestWorker.class;
+    }
+
+    @Override
+    public boolean hasAsyncUpdate() {
+        return mIsAsyncUpdate;
+    }
+
+    public void setAsyncUpdate(boolean isAsyncUpdate) {
+        mIsAsyncUpdate = isAsyncUpdate;
+    }
+
+    public static class TestWorker extends SliceBackgroundWorker<Void> {
+
+        public TestWorker(Context context, Uri uri) {
+            super(context, uri);
+        }
+
+        @Override
+        protected void onSlicePinned() {
+        }
+
+        @Override
+        protected void onSliceUnpinned() {
+        }
+
+        @Override
+        public void close() {
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java b/tests/unit/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java
new file mode 100644
index 0000000..97379e3
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/FakeUnavailablePreferenceController.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.testutils;
+
+import android.content.Context;
+import android.provider.Settings;
+
+import com.android.settings.core.BasePreferenceController;
+
+public class FakeUnavailablePreferenceController extends BasePreferenceController {
+
+    public static final String AVAILABILITY_KEY = "fake_availability_key";
+
+    public FakeUnavailablePreferenceController(Context context) {
+        super(context, "key");
+    }
+
+    @Override
+    public int getAvailabilityStatus() {
+        return Settings.Global.getInt(mContext.getContentResolver(), AVAILABILITY_KEY, 0);
+    }
+
+    @Override
+    public boolean isSliceable() {
+        return true;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/ResolveInfoBuilder.java b/tests/unit/src/com/android/settings/testutils/ResolveInfoBuilder.java
new file mode 100644
index 0000000..5eaf2a4
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/ResolveInfoBuilder.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.testutils;
+
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.ProviderInfo;
+import android.content.pm.ResolveInfo;
+
+import com.google.common.base.Preconditions;
+
+/**
+ * Helper for building {@link ResolveInfo}s to be used in Robolectric tests.
+ *
+ * <p>The resulting {@link PackageInfo}s should typically be added to {@link
+ * org.robolectric.shadows.ShadowPackageManager#addResolveInfoForIntent(Intent, ResolveInfo)}.
+ */
+public final class ResolveInfoBuilder {
+
+    private final String mPackageName;
+    private ActivityInfo mActivityInfo;
+    private ProviderInfo mProviderInfo;
+
+    public ResolveInfoBuilder(String packageName) {
+        this.mPackageName = Preconditions.checkNotNull(packageName);
+    }
+
+    public ResolveInfoBuilder setActivity(String packageName, String className) {
+        mActivityInfo = new ActivityInfo();
+        mActivityInfo.packageName = packageName;
+        mActivityInfo.name = className;
+        return this;
+    }
+
+    public ResolveInfoBuilder setProvider(
+            String packageName, String className, String authority, boolean isSystemApp) {
+        mProviderInfo = new ProviderInfo();
+        mProviderInfo.authority = authority;
+        mProviderInfo.applicationInfo = new ApplicationInfo();
+        if (isSystemApp) {
+            mProviderInfo.applicationInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
+        }
+        mProviderInfo.packageName = mPackageName;
+        mProviderInfo.applicationInfo.packageName  = mPackageName;
+        mProviderInfo.name = className;
+        return this;
+    }
+
+    public ResolveInfo build() {
+        ResolveInfo info = new ResolveInfo();
+        info.activityInfo = mActivityInfo;
+        info.resolvePackageName = mPackageName;
+        info.providerInfo = mProviderInfo;
+        return info;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/ResourcesUtils.java b/tests/unit/src/com/android/settings/testutils/ResourcesUtils.java
new file mode 100644
index 0000000..8ef310d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/ResourcesUtils.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.testutils;
+
+import android.content.Context;
+
+/**
+ * Test util to provide the correct resources.
+ */
+public final class ResourcesUtils {
+    /**
+     * Return a resource identifier for the given resource name.
+     * @param context Context to use.
+     * @param type Optional default resource type to find, if "type/" is not included in the name.
+     *             Can be null to require an explicit type.
+     * @param name The name of the desired resource.
+     * @return The associated resource identifier. Returns 0 if no such resource was found.
+     * (0 is not a valid resource ID.)
+     */
+    public static int getResourcesId(Context context, String type, String name) {
+        return context.getResources().getIdentifier(name, type, context.getPackageName());
+    }
+
+    /**
+     * Returns a localized string from the application's package's default string table.
+     * @param context Context to use.
+     * @param name The name of the desired resource.
+     * @return The string data associated with the resource, stripped of styled text information.
+     */
+    public static String getResourcesString(Context context, String name) {
+        return context.getResources().getString(getResourcesId(context, "string", name));
+    }
+
+    /**
+     * Return the string value associated with a particular neame of resource,
+     * substituting the format arguments as defined in {@link java.util.Formatter}
+     * and {@link java.lang.String#format}. It will be stripped of any styled text
+     * information.
+     * @param context Context to use.
+     * @param name The name of the desired resource.
+     * @param value The format arguments that will be used for substitution.
+     * @return The string data associated with the resource, stripped of styled text information.
+     */
+    public static String getResourcesString(Context context, String name, Object... value) {
+        return context.getResources().getString(getResourcesId(context, "string", name), value);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/SliceTester.java b/tests/unit/src/com/android/settings/testutils/SliceTester.java
new file mode 100644
index 0000000..be13e13
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/SliceTester.java
@@ -0,0 +1,324 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.testutils;
+
+import static android.app.slice.Slice.HINT_TITLE;
+import static android.app.slice.Slice.SUBTYPE_COLOR;
+import static android.app.slice.SliceItem.FORMAT_IMAGE;
+import static android.app.slice.SliceItem.FORMAT_INT;
+import static android.app.slice.SliceItem.FORMAT_TEXT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.text.TextUtils;
+
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.slice.Slice;
+import androidx.slice.SliceItem;
+import androidx.slice.SliceMetadata;
+import androidx.slice.builders.ListBuilder;
+import androidx.slice.core.SliceAction;
+import androidx.slice.core.SliceQuery;
+import androidx.slice.widget.EventInfo;
+
+import com.android.settings.Utils;
+import com.android.settings.slices.SettingsSliceProvider;
+import com.android.settings.slices.SliceBuilderUtils;
+import com.android.settings.slices.SliceData;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Testing utility class to verify the contents of the different Settings Slices.
+ *
+ * TODO (77712944) check Summary, range (metadata.getRange()), toggle icons.
+ */
+public class SliceTester {
+
+    /**
+     * Test the contents of an intent based slice, including:
+     * - No toggles
+     * - Correct intent
+     * - Correct title
+     * - Correct keywords
+     * - TTL
+     * - Color
+     */
+    public static void testSettingsIntentSlice(Context context, Slice slice, SliceData sliceData) {
+        final SliceMetadata metadata = SliceMetadata.from(context, slice);
+
+        final long sliceTTL = metadata.getExpiry();
+        assertThat(sliceTTL).isEqualTo(ListBuilder.INFINITY);
+
+        final SliceItem colorItem = SliceQuery.findSubtype(slice, FORMAT_INT, SUBTYPE_COLOR);
+        final int color = colorItem.getInt();
+        assertThat(color).isEqualTo(Utils.getColorAccentDefaultColor(context));
+
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).isEmpty();
+
+        final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
+        assertThat(primaryPendingIntent).isEqualTo(
+                SliceBuilderUtils.getContentPendingIntent(context, sliceData));
+
+        assertThat(metadata.getTitle()).isEqualTo(sliceData.getTitle());
+
+        assertKeywords(metadata, sliceData);
+    }
+
+    /**
+     * Test the contents of an toggle based slice, including:
+     * - Contains one toggle
+     * - Correct toggle intent
+     * - Correct content intent
+     * - Correct title
+     * - Correct keywords
+     * - TTL
+     * - Color
+     */
+    public static void testSettingsToggleSlice(Context context, Slice slice, SliceData sliceData) {
+        final SliceMetadata metadata = SliceMetadata.from(context, slice);
+
+        final SliceItem colorItem = SliceQuery.findSubtype(slice, FORMAT_INT, SUBTYPE_COLOR);
+        final int color = colorItem.getInt();
+        assertThat(color).isEqualTo(Utils.getColorAccentDefaultColor(context));
+
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).hasSize(1);
+
+        final long sliceTTL = metadata.getExpiry();
+        assertThat(sliceTTL).isEqualTo(ListBuilder.INFINITY);
+
+        final SliceAction mainToggleAction = toggles.get(0);
+
+        assertThat(mainToggleAction.getIcon()).isNull();
+
+        // Check intent in Toggle Action
+        final PendingIntent togglePendingIntent = mainToggleAction.getAction();
+        assertThat(togglePendingIntent).isEqualTo(SliceBuilderUtils.getActionIntent(context,
+                SettingsSliceProvider.ACTION_TOGGLE_CHANGED, sliceData));
+
+        // Check primary intent
+        final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
+        assertThat(primaryPendingIntent).isEqualTo(
+                SliceBuilderUtils.getContentPendingIntent(context, sliceData));
+
+        assertThat(metadata.getTitle()).isEqualTo(sliceData.getTitle());
+
+        assertKeywords(metadata, sliceData);
+    }
+
+    /**
+     * Test the contents of an slider based slice, including:
+     * - No intent
+     * - Correct title
+     * - Correct keywords
+     * - TTL
+     * - Color
+     */
+    public static void testSettingsSliderSlice(Context context, Slice slice, SliceData sliceData) {
+        final SliceMetadata metadata = SliceMetadata.from(context, slice);
+        final SliceAction primaryAction = metadata.getPrimaryAction();
+
+        final IconCompat icon = primaryAction.getIcon();
+        if (icon == null) {
+            final SliceItem colorItem = SliceQuery.findSubtype(slice, FORMAT_INT, SUBTYPE_COLOR);
+            final int color = colorItem.getInt();
+            assertThat(color).isEqualTo(Utils.getColorAccentDefaultColor(context));
+
+        } else {
+            final IconCompat expectedIcon = IconCompat.createWithResource(context,
+                    sliceData.getIconResource());
+            assertThat(expectedIcon.toString()).isEqualTo(icon.toString());
+        }
+
+        final long sliceTTL = metadata.getExpiry();
+        assertThat(sliceTTL).isEqualTo(ListBuilder.INFINITY);
+
+        final int headerType = metadata.getHeaderType();
+        assertThat(headerType).isEqualTo(EventInfo.ROW_TYPE_SLIDER);
+
+        // Check primary intent
+        final PendingIntent primaryPendingIntent = primaryAction.getAction();
+        assertThat(primaryPendingIntent).isEqualTo(
+                SliceBuilderUtils.getContentPendingIntent(context, sliceData));
+
+        assertThat(metadata.getTitle()).isEqualTo(sliceData.getTitle());
+
+        assertKeywords(metadata, sliceData);
+    }
+
+    /**
+     * Test the copyable slice, including:
+     * - No intent
+     * - Correct title
+     * - Correct intent
+     * - Correct keywords
+     * - TTL
+     * - Color
+     */
+    public static void testSettingsCopyableSlice(Context context, Slice slice,
+            SliceData sliceData) {
+        final SliceMetadata metadata = SliceMetadata.from(context, slice);
+
+        final SliceItem colorItem = SliceQuery.findSubtype(slice, FORMAT_INT, SUBTYPE_COLOR);
+        final int color = colorItem.getInt();
+        assertThat(color).isEqualTo(Utils.getColorAccentDefaultColor(context));
+
+        final SliceAction primaryAction = metadata.getPrimaryAction();
+
+        final IconCompat expectedIcon = IconCompat.createWithResource(context,
+                sliceData.getIconResource());
+        assertThat(expectedIcon.toString()).isEqualTo(primaryAction.getIcon().toString());
+
+        final long sliceTTL = metadata.getExpiry();
+        assertThat(sliceTTL).isEqualTo(ListBuilder.INFINITY);
+
+        // Check primary intent
+        final PendingIntent primaryPendingIntent = primaryAction.getAction();
+        assertThat(primaryPendingIntent).isEqualTo(
+                SliceBuilderUtils.getContentPendingIntent(context, sliceData));
+
+        assertThat(metadata.getTitle()).isEqualTo(sliceData.getTitle());
+
+        assertKeywords(metadata, sliceData);
+    }
+
+    /**
+     * Test the contents of an unavailable slice, including:
+     * - No toggles
+     * - Correct title
+     * - Correct intent
+     * - Correct keywords
+     * - Color
+     * - TTL
+     */
+    public static void testSettingsUnavailableSlice(Context context, Slice slice,
+            SliceData sliceData) {
+        final SliceMetadata metadata = SliceMetadata.from(context, slice);
+
+        final long sliceTTL = metadata.getExpiry();
+        assertThat(sliceTTL).isEqualTo(ListBuilder.INFINITY);
+
+        final SliceItem colorItem = SliceQuery.findSubtype(slice, FORMAT_INT, SUBTYPE_COLOR);
+        final int color = colorItem.getInt();
+        assertThat(color).isEqualTo(Utils.getColorAccentDefaultColor(context));
+
+        final List<SliceAction> toggles = metadata.getToggles();
+        assertThat(toggles).isEmpty();
+
+        final PendingIntent primaryPendingIntent = metadata.getPrimaryAction().getAction();
+        assertThat(primaryPendingIntent).isEqualTo(SliceBuilderUtils.getContentPendingIntent(
+                context, sliceData));
+
+        assertThat(metadata.getTitle()).isEqualTo(sliceData.getTitle());
+
+        assertKeywords(metadata, sliceData);
+    }
+
+    /**
+     * Assert any slice item contains title.
+     *
+     * @param sliceItems All slice items of a Slice.
+     * @param title Title for asserting.
+     */
+    public static void assertAnySliceItemContainsTitle(List<SliceItem> sliceItems, String title) {
+        assertThat(hasText(sliceItems, title, HINT_TITLE)).isTrue();
+    }
+
+    /**
+     * Assert any slice item contains subtitle.
+     *
+     * @param sliceItems All slice items of a Slice.
+     * @param subtitle Subtitle for asserting.
+     */
+    public static void assertAnySliceItemContainsSubtitle(List<SliceItem> sliceItems,
+            String subtitle) {
+        // Subtitle has no hints
+        assertThat(hasText(sliceItems, subtitle, null /* hints */)).isTrue();
+    }
+
+    /**
+     * Assert no slice item contains subtitle.
+     *
+     * @param sliceItems All slice items of a Slice.
+     * @param subtitle Subtitle for asserting.
+     */
+    public static void assertNoSliceItemContainsSubtitle(List<SliceItem> sliceItems,
+            String subtitle) {
+        // Subtitle has no hints
+        assertThat(hasText(sliceItems, subtitle, null /* hints */)).isFalse();
+    }
+
+    private static boolean hasText(List<SliceItem> sliceItems, String text, String hints) {
+        boolean hasText = false;
+        for (SliceItem item : sliceItems) {
+            List<SliceItem> textItems = SliceQuery.findAll(item, FORMAT_TEXT, hints,
+                    null /* non-hints */);
+            if (textItems == null) {
+                continue;
+            }
+
+            for (SliceItem textItem : textItems) {
+                if (TextUtils.equals(textItem.getText(), text)) {
+                    hasText = true;
+                    break;
+                }
+            }
+        }
+        return hasText;
+    }
+
+    /**
+     * Assert any slice item contains icon.
+     *
+     * @param sliceItems All slice items of a Slice.
+     * @param icon Icon for asserting.
+     */
+    public static void assertAnySliceItemContainsIcon(List<SliceItem> sliceItems, IconCompat icon) {
+        boolean hasIcon = false;
+        for (SliceItem item : sliceItems) {
+            List<SliceItem> iconItems = SliceQuery.findAll(item, FORMAT_IMAGE,
+                    (String) null /* hints */, null /* non-hints */);
+            if (iconItems == null) {
+                continue;
+            }
+
+            for (SliceItem iconItem : iconItems) {
+                if (icon.toString().equals(iconItem.getIcon().toString())) {
+                    hasIcon = true;
+                    break;
+                }
+            }
+        }
+        assertThat(hasIcon).isTrue();
+    }
+
+    private static void assertKeywords(SliceMetadata metadata, SliceData data) {
+        final List<String> keywords = metadata.getSliceKeywords();
+        final Set<String> expectedKeywords = Arrays.stream(data.getKeywords().split(","))
+                .map(s -> s = s.trim())
+                .collect(Collectors.toSet());
+        expectedKeywords.add(data.getTitle());
+        expectedKeywords.add(data.getScreenTitle().toString());
+        assertThat(keywords).containsExactlyElementsIn(expectedKeywords);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/testutils/XmlTestUtils.java b/tests/unit/src/com/android/settings/testutils/XmlTestUtils.java
new file mode 100644
index 0000000..5640bee
--- /dev/null
+++ b/tests/unit/src/com/android/settings/testutils/XmlTestUtils.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.testutils;
+
+import static com.android.settings.core.PreferenceXmlParserUtils.METADATA_KEY;
+import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag
+        .FLAG_INCLUDE_PREF_SCREEN;
+import static com.android.settings.core.PreferenceXmlParserUtils.MetadataFlag.FLAG_NEED_KEY;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import com.android.settings.core.PreferenceXmlParserUtils;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Util class for parsing XML
+ */
+public class XmlTestUtils {
+
+    /**
+     * Parses a preference screen's xml, collects and returns all keys used by preferences
+     * on the screen.
+     *
+     * @param context of the preference screen.
+     * @param xmlId   of the Preference Xml to be parsed.
+     * @return List of all keys in the preference Xml
+     */
+    public static List<String> getKeysFromPreferenceXml(Context context, int xmlId) {
+        final List<String> keys = new ArrayList<>();
+        try {
+            List<Bundle> metadata = PreferenceXmlParserUtils.extractMetadata(context, xmlId,
+                    FLAG_NEED_KEY | FLAG_INCLUDE_PREF_SCREEN);
+            for (Bundle bundle : metadata) {
+                final String key = bundle.getString(METADATA_KEY);
+                if (!TextUtils.isEmpty(key)) {
+                    keys.add(key);
+                }
+            }
+        } catch (java.io.IOException | XmlPullParserException e) {
+            return null;
+        }
+
+        return keys;
+    }
+}
diff --git a/tests/unit/src/com/android/settings/users/MultiUserTopIntroPreferenceControllerTest.java b/tests/unit/src/com/android/settings/users/MultiUserTopIntroPreferenceControllerTest.java
new file mode 100644
index 0000000..624750c
--- /dev/null
+++ b/tests/unit/src/com/android/settings/users/MultiUserTopIntroPreferenceControllerTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2020 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.users;
+
+import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
+import static com.android.settings.core.BasePreferenceController.DISABLED_FOR_USER;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class MultiUserTopIntroPreferenceControllerTest {
+
+    private Context mContext;
+    private MultiUserTopIntroPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mController = new MultiUserTopIntroPreferenceController(mContext, "top_info");
+    }
+
+    @Ignore
+    @Test
+    public void getAvailabilityStatus_multiUserOff_shouldReturnEnabled() {
+        mController.mUserCaps.mEnabled = true;
+        mController.mUserCaps.mUserSwitcherEnabled = false;
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
+    }
+
+    @Ignore
+    @Test
+    public void getAvailabilityStatus_multiUserOn_shouldReturnDisabled() {
+        mController.mUserCaps.mEnabled = true;
+        mController.mUserCaps.mUserSwitcherEnabled = true;
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(DISABLED_FOR_USER);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java b/tests/unit/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
new file mode 100644
index 0000000..3bafd50
--- /dev/null
+++ b/tests/unit/src/com/android/settings/utils/LocalClassLoaderContextThemeWrapperTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2020 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.utils;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class LocalClassLoaderContextThemeWrapperTest {
+
+    private LocalClassLoaderContextThemeWrapper mContextThemeWrapper;
+
+    @Test
+    public void getClassLoader_shouldUseLocalClassLoader() {
+        final Context context = ApplicationProvider.getApplicationContext();
+        final Class clazz = LocalClassLoaderContextThemeWrapperTest.class;
+        mContextThemeWrapper = new LocalClassLoaderContextThemeWrapper(clazz, context, 0);
+
+        assertThat(mContextThemeWrapper.getClassLoader()).isSameInstanceAs(clazz.getClassLoader());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/vpn2/VpnUtilsTest.java b/tests/unit/src/com/android/settings/vpn2/VpnUtilsTest.java
new file mode 100644
index 0000000..f214764
--- /dev/null
+++ b/tests/unit/src/com/android/settings/vpn2/VpnUtilsTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2020 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.vpn2;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.net.ConnectivityManager;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class VpnUtilsTest {
+    @Test
+    public void testIsAlwaysOnVpnSet() {
+        final ConnectivityManager cm = mock(ConnectivityManager.class);
+        when(cm.getAlwaysOnVpnPackageForUser(0)).thenReturn("com.example.vpn");
+        assertThat(VpnUtils.isAlwaysOnVpnSet(cm, 0)).isTrue();
+
+        when(cm.getAlwaysOnVpnPackageForUser(0)).thenReturn(null);
+        assertThat(VpnUtils.isAlwaysOnVpnSet(cm, 0)).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java b/tests/unit/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
new file mode 100644
index 0000000..777d984
--- /dev/null
+++ b/tests/unit/src/com/android/settings/widget/DefaultIndicatorSeekBarTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2020 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 org.junit.Assert.assertEquals;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DefaultIndicatorSeekBarTest {
+
+    private DefaultIndicatorSeekBar mDefaultIndicatorSeekBar;
+
+    @Before
+    public void setUp() {
+        mDefaultIndicatorSeekBar = new DefaultIndicatorSeekBar(
+                ApplicationProvider.getApplicationContext());
+        mDefaultIndicatorSeekBar.setMax(100);
+    }
+
+    @After
+    public void tearDown() {
+        mDefaultIndicatorSeekBar = null;
+    }
+
+    @Test
+    public void defaultProgress_setSucceeds() {
+        mDefaultIndicatorSeekBar.setDefaultProgress(40);
+        assertEquals(40, mDefaultIndicatorSeekBar.getDefaultProgress());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/widget/DonutViewTest.java b/tests/unit/src/com/android/settings/widget/DonutViewTest.java
new file mode 100644
index 0000000..ad02d0e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/widget/DonutViewTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.android.settings.widget;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class DonutViewTest {
+    @Test
+    public void getPercentageStringSpannable_doesntCrashForMissingPercentage() {
+        Context context = ApplicationProvider.getApplicationContext();
+
+        DonutView.getPercentageStringSpannable(context.getResources(), "50%", "h");
+    }
+}
diff --git a/tests/unit/src/com/android/settings/widget/PreferenceCategoryControllerTest.java b/tests/unit/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
new file mode 100644
index 0000000..5e730f9
--- /dev/null
+++ b/tests/unit/src/com/android/settings/widget/PreferenceCategoryControllerTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2020 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.mock;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settingslib.core.AbstractPreferenceController;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class PreferenceCategoryControllerTest {
+
+    private Context mContext;
+    private PreferenceCategoryController mController;
+    private List<AbstractPreferenceController> mChildren;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+        mChildren = new ArrayList<>();
+        mController = new PreferenceCategoryController(mContext, "pref_key").setChildren(mChildren);
+    }
+
+    @Test
+    public void isAvailable_noChildren_false() {
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void isAvailable_childrenAvailable_true() {
+        final AbstractPreferenceController child = mock(AbstractPreferenceController.class);
+        when(child.isAvailable()).thenReturn(true);
+        mChildren.add(child);
+        mController.setChildren(mChildren);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_childrenUnavailable_false() {
+        final AbstractPreferenceController child = mock(AbstractPreferenceController.class);
+        when(child.isAvailable()).thenReturn(false);
+        mChildren.add(child);
+        mController.setChildren(mChildren);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/widget/RingProgressBarTest.java b/tests/unit/src/com/android/settings/widget/RingProgressBarTest.java
new file mode 100644
index 0000000..f857e8f
--- /dev/null
+++ b/tests/unit/src/com/android/settings/widget/RingProgressBarTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 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 org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import android.content.Context;
+import android.view.View.MeasureSpec;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class RingProgressBarTest {
+
+    private Context mContext = ApplicationProvider.getApplicationContext();
+
+    private RingProgressBar mProgressBar;
+
+    @Before
+    public void setUp() {
+        mProgressBar = new RingProgressBar(mContext);
+    }
+
+    @Test
+    public void testMeasurePortrait() {
+        mProgressBar.measure(
+                MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(200, MeasureSpec.EXACTLY));
+        assertEquals(100, mProgressBar.getMeasuredHeight());
+        assertEquals(100, mProgressBar.getMeasuredWidth());
+    }
+
+    @Test
+    public void testMeasureLandscape() {
+        mProgressBar.measure(
+                MeasureSpec.makeMeasureSpec(200, MeasureSpec.EXACTLY),
+                MeasureSpec.makeMeasureSpec(100, MeasureSpec.EXACTLY));
+        assertEquals(100, mProgressBar.getMeasuredHeight());
+        assertEquals(100, mProgressBar.getMeasuredWidth());
+    }
+
+    @Test
+    public void testDefaultAttributes() {
+        assertFalse(mProgressBar.isIndeterminate());
+        assertEquals(0, mProgressBar.getProgress());
+        assertEquals(10000, mProgressBar.getMax());
+    }
+}
diff --git a/tests/unit/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/unit/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
new file mode 100644
index 0000000..cc53eee
--- /dev/null
+++ b/tests/unit/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2020 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 android.os.Parcelable;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.viewpager.widget.PagerAdapter;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Locale;
+
+@RunWith(AndroidJUnit4.class)
+public class RtlCompatibleViewPagerTest {
+
+    private Locale mLocaleEn;
+    private Locale mLocaleHe;
+    private RtlCompatibleViewPager mViewPager;
+
+    @Before
+    public void setUp() {
+        mViewPager = new RtlCompatibleViewPager(ApplicationProvider.getApplicationContext());
+        mViewPager.setAdapter(new ViewPagerAdapter());
+        mLocaleEn = new Locale("en");
+        mLocaleHe = new Locale("he");
+    }
+
+    @Test
+    public void testGetCurrentItem_shouldMaintainIndexDuringLocaleChange() {
+        testRtlCompatibleInner(0);
+        testRtlCompatibleInner(1);
+    }
+
+    private void testRtlCompatibleInner(int currentItem) {
+        // Set up the environment
+        Locale.setDefault(mLocaleEn);
+        mViewPager.setCurrentItem(currentItem);
+
+        assertThat(TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()))
+                .isEqualTo(View.LAYOUT_DIRECTION_LTR);
+        assertThat(mViewPager.getCurrentItem()).isEqualTo(currentItem);
+
+        // Simulate to change the language to RTL
+        Parcelable savedInstance = mViewPager.onSaveInstanceState();
+        Locale.setDefault(mLocaleHe);
+        mViewPager.onRestoreInstanceState(savedInstance);
+
+        assertThat(TextUtils.getLayoutDirectionFromLocale(Locale.getDefault()))
+                .isEqualTo(View.LAYOUT_DIRECTION_RTL);
+        assertThat(mViewPager.getCurrentItem()).isEqualTo(currentItem);
+    }
+
+    /**
+     * Test viewpager adapter, uses 2 view to test it
+     */
+    private static final class ViewPagerAdapter extends PagerAdapter {
+
+        private static final int ITEM_COUNT = 2;
+
+        private ViewPagerAdapter() {
+        }
+
+        @Override
+        public int getCount() {
+            return ITEM_COUNT;
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object object) {
+            return view == object;
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup container, int position) {
+            return null;
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return null;
+        }
+    }
+}
diff --git a/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java b/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java
deleted file mode 100644
index 1a5f923..0000000
--- a/tests/unit/src/com/android/settings/wifi/SavedNetworkSettingsTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.wifi;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import android.content.Context;
-import android.content.Intent;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class SavedNetworkSettingsTest {
-
-    // Keys used to lookup resources by name (see the resourceId helper method).
-    private static final String STRING = "string";
-    private static final String WIFI_ADD_NETWORK = "wifi_add_network";
-    private static final String WIFI_NETWORK_LABEL = "wifi_ssid";
-
-    private Context mContext;
-
-    @Rule
-    public ActivityTestRule<Settings.SavedAccessPointsSettingsActivity> mActivityRule =
-            new ActivityTestRule<>(Settings.SavedAccessPointsSettingsActivity.class, true);
-
-    private int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    private void launchSavedNetworksSettings() {
-        Intent intent = new Intent()
-                .setClassName(mContext.getPackageName(),
-                        Settings.SavedAccessPointsSettingsActivity.class.getName())
-                .setPackage(mContext.getPackageName());
-        mActivityRule.launchActivity(intent);
-    }
-
-    @Test
-    public void launchSavedNetworkSettings_shouldHaveAddNetworkField() {
-        launchSavedNetworksSettings();
-        onView(withText(resourceId(STRING, WIFI_ADD_NETWORK))).check(matches(isDisplayed()))
-                .perform(click());
-        onView(withText(resourceId(STRING, WIFI_NETWORK_LABEL))).check(matches(isDisplayed()));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java
deleted file mode 100644
index e913e2c..0000000
--- a/tests/unit/src/com/android/settings/wifi/WifiCallingSettingUiTest.java
+++ /dev/null
@@ -1,306 +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.wifi;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.isSelected;
-import static androidx.test.espresso.matcher.ViewMatchers.withResourceName;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.anything;
-import static org.junit.Assert.assertEquals;
-import static org.junit.matchers.JUnitMatchers.containsString;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.nullable;
-import static org.mockito.Mockito.doReturn;
-
-import android.app.Activity;
-import android.app.Instrumentation;
-import android.content.Context;
-import android.content.Intent;
-import android.support.test.uiautomator.UiDevice;
-import android.telephony.SubscriptionInfo;
-import android.telephony.ims.ImsMmTelManager;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.espresso.NoMatchingViewException;
-import androidx.test.espresso.ViewInteraction;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.ims.ImsManager;
-import com.android.internal.telephony.SubscriptionController;
-import com.android.settings.testutils.MockedServiceManager;
-
-import junit.framework.Assert;
-
-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 java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiCallingSettingUiTest {
-    private static final String SUBSCRIPTION0_NAME = "SUB0";
-    private static final String SUBSCRIPTION1_NAME = "SUB1";
-    private static final String WFC_MODE_TITLE = "Calling preference";
-    private static final String WFC_MODE_WIFI_ONLY = "Wi-Fi only";
-    private static final String WFC_MODE_WIFI_PREFERRED = "Wi-Fi preferred";
-    private static final String WFC_MODE_CELLULAR_PREFERRED = "Mobile preferred";
-
-    private Instrumentation mInstrumentation;
-    private Context mContext;
-    private UiDevice mDevice;
-    @Mock
-    SubscriptionController mSubscriptionController;
-    MockedServiceManager mMockedServiceManager;
-    protected HashMap<Integer, ImsManager> mImsManagerInstances = new HashMap<>();
-    List<SubscriptionInfo> mSils = new ArrayList();
-    @Mock
-    SubscriptionInfo mSubscriptionInfo0;
-    @Mock
-    SubscriptionInfo mSubscriptionInfo1;
-    @Mock
-    ImsManager mImsManager0;
-    @Mock
-    ImsManager mImsManager1;
-    @Mock
-    ImsMmTelManager mImsMmTelManager0;
-    @Mock
-    ImsMmTelManager mImsMmTelManager1;
-
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mContext = mInstrumentation.getTargetContext();
-        mDevice = UiDevice.getInstance(mInstrumentation);
-
-        mMockedServiceManager = new MockedServiceManager();
-        mMockedServiceManager.replaceService("isub", mSubscriptionController);
-
-        mMockedServiceManager.replaceInstance(
-                ImsManager.class, "sImsManagerInstances", null, mImsManagerInstances);
-        mMockedServiceManager.replaceInstance(
-                SubscriptionController.class, "sInstance", null, mSubscriptionController);
-        doReturn(mSubscriptionController)
-                .when(mSubscriptionController).queryLocalInterface(anyString());
-        mImsManagerInstances.put(0, mImsManager0);
-        mImsManagerInstances.put(1, mImsManager1);
-        doReturn(mSils).when(mSubscriptionController).getActiveSubscriptionInfoList(anyString(),
-                nullable(String.class));
-        doReturn(0).when(mSubscriptionController).getPhoneId(0);
-        doReturn(1).when(mSubscriptionController).getPhoneId(1);
-        doReturn(0).when(mSubscriptionInfo0).getSubscriptionId();
-        doReturn(1).when(mSubscriptionInfo1).getSubscriptionId();
-        doReturn(0).when(mSubscriptionInfo0).getSimSlotIndex();
-        doReturn(1).when(mSubscriptionInfo1).getSimSlotIndex();
-        doReturn(SUBSCRIPTION0_NAME).when(mSubscriptionInfo0).getDisplayName();
-        doReturn(SUBSCRIPTION1_NAME).when(mSubscriptionInfo1).getDisplayName();
-
-        doReturn(true).when(mImsManager0).isWfcEnabledByPlatform();
-        doReturn(true).when(mImsManager0).isNonTtyOrTtyOnVolteEnabled();
-        doReturn(true).when(mImsManager1).isWfcEnabledByPlatform();
-        doReturn(true).when(mImsManager1).isNonTtyOrTtyOnVolteEnabled();
-
-        mDevice.wakeUp();
-        mDevice.pressMenu();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        mMockedServiceManager.restoreAllServices();
-    }
-
-    @Test
-    public void testSingleSimUi() throws InterruptedException {
-        configureSingleSim();
-        doReturn(true).when(mImsManager0).isWfcEnabledByUser();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiModeSetting();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
-
-        mInstrumentation.startActivitySync(createActivityIntent());
-
-        checkSingleSimUi();
-
-        try {
-            mDevice.setOrientationLeft();
-        } catch (Exception e) {
-            Assert.fail("Exception " + e);
-        }
-
-        // Re-check after rotation. Fragment should be recreated properly.
-        checkSingleSimUi();
-
-        try {
-            mDevice.setOrientationNatural();
-        } catch (Exception e) {
-            Assert.fail("Exception " + e);
-        }
-
-        // Re-check after rotation. Fragment should be resumed properly.
-        checkSingleSimUi();
-    }
-
-    private void checkSingleSimUi() {
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
-        assertEquals(true, checkExists(onView(withText(WFC_MODE_TITLE))));
-        assertEquals(true, checkExists(onView(withText(WFC_MODE_WIFI_PREFERRED))));
-        checkSwitchBarStatus(true, true);
-        checkEmptyViewStatus(false);
-    }
-
-    @Test
-    public void testNoValidSub() throws InterruptedException {
-        configureDualSim();
-        doReturn(false).when(mImsManager0).isWfcEnabledByPlatform();
-        doReturn(false).when(mImsManager0).isNonTtyOrTtyOnVolteEnabled();
-        doReturn(false).when(mImsManager1).isWfcEnabledByPlatform();
-        doReturn(false).when(mImsManager1).isNonTtyOrTtyOnVolteEnabled();
-        doReturn(false).when(mImsManager0).isWfcEnabledByUser();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiModeSetting();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
-
-        Activity activity = mInstrumentation.startActivitySync(createActivityIntent());
-
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
-        assertEquals(false, checkExists(onView(withText(WFC_MODE_TITLE))));
-
-        checkSwitchBarStatus(false, false);
-        checkEmptyViewStatus(false);
-    }
-
-    @Test
-    public void testWfcDisabled() throws InterruptedException {
-        configureSingleSim();
-        doReturn(false).when(mImsManager0).isWfcEnabledByUser();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiModeSetting();
-        doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
-
-        Activity activity = mInstrumentation.startActivitySync(createActivityIntent());
-
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
-        assertEquals(false, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
-        assertEquals(false, checkExists(onView(withText(WFC_MODE_TITLE))));
-
-        checkSwitchBarStatus(true, false);
-        checkEmptyViewStatus(true);
-    }
-
-    @Test
-    public void testDualSimUi() throws InterruptedException {
-        configureDualSim();
-        doReturn(true).when(mImsManager0).isWfcEnabledByUser();
-        doReturn(false).when(mImsManager1).isWfcEnabledByUser();
-        doReturn(ImsMmTelManager.WIFI_MODE_CELLULAR_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiModeSetting();
-        doReturn(ImsMmTelManager.WIFI_MODE_CELLULAR_PREFERRED)
-                .when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
-
-        mInstrumentation.startActivitySync(createActivityIntent());
-
-        assertEquals(true, checkExists(onView(withText(SUBSCRIPTION0_NAME))));
-        assertEquals(true, checkExists(onView(withText(SUBSCRIPTION1_NAME))));
-        assertEquals(true, checkExists(onView(withText(WFC_MODE_TITLE))));
-        assertEquals(true, checkExists(onView(withText(WFC_MODE_CELLULAR_PREFERRED))));
-
-        onView(withText(SUBSCRIPTION0_NAME)).check(matches(isSelected()));
-        checkSwitchBarStatus(true, true);
-        checkEmptyViewStatus(false);
-
-        // Switch to SUB1.
-        onView(withText(SUBSCRIPTION1_NAME)).perform(click());
-
-        checkSwitchBarStatus(true, false);
-        checkEmptyViewStatus(true);
-        onView(withText(SUBSCRIPTION1_NAME)).check(matches(isSelected()));
-    }
-
-    private boolean checkExists(ViewInteraction v) {
-        try {
-            v.check(matches(isCompletelyDisplayed()));
-            return true;
-        } catch (NoMatchingViewException e) {
-            return false;
-        }
-    }
-
-    private Intent createActivityIntent() {
-        Intent intent = new Intent(mContext,
-                com.android.settings.Settings.WifiCallingSettingsActivity.class);
-        intent.setPackage("com.android.settings");
-        intent.setAction("android.intent.action.MAIN");
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        return intent;
-    }
-
-    private void configureSingleSim() {
-        mSils.clear();
-        mSils.add(mSubscriptionInfo0);
-    }
-
-    private void configureDualSim() {
-        mSils.clear();
-        mSils.add(mSubscriptionInfo0);
-        mSils.add(mSubscriptionInfo1);
-    }
-
-    private void checkSwitchBarStatus(boolean shouldDisplay, boolean statusOn) {
-        if (shouldDisplay) {
-            try {
-                onView(allOf(withResourceName("switch_text"), isCompletelyDisplayed()))
-                        .check(matches(withText(containsString(statusOn ? "On" : "Off"))));
-            } catch (Exception e) {
-                Assert.fail("Exception " + e);
-            }
-        } else {
-            onView(allOf(withResourceName("switch_text"), isCompletelyDisplayed()))
-                    .check(doesNotExist());
-        }
-    }
-
-    private void checkEmptyViewStatus(boolean shouldDisplay) {
-        try {
-            if (!shouldDisplay) {
-                onView(allOf(withResourceName("empty"), isCompletelyDisplayed()))
-                        .check(doesNotExist());
-            } else {
-                onView(allOf(withResourceName("empty"), isCompletelyDisplayed()))
-                        .check(matches(anything()));
-            }
-        } catch (Exception e) {
-            Assert.fail("Exception " + e);
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/WifiPickerTrackerHelperTest.java b/tests/unit/src/com/android/settings/wifi/WifiPickerTrackerHelperTest.java
new file mode 100644
index 0000000..851b115
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/WifiPickerTrackerHelperTest.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+
+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.os.HandlerThread;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.wifitrackerlib.MergedCarrierEntry;
+import com.android.wifitrackerlib.WifiEntry;
+import com.android.wifitrackerlib.WifiPickerTracker;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnit;
+import org.mockito.junit.MockitoRule;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiPickerTrackerHelperTest {
+
+    @Rule
+    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
+    @Mock
+    public WifiPickerTracker mWifiPickerTracker;
+    @Mock
+    public MergedCarrierEntry mMergedCarrierEntry;
+    @Mock
+    public WifiEntry.ConnectCallback mConnectCallback;
+
+    private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
+
+    @Before
+    public void setUp() {
+        mWifiPickerTrackerHelper = new WifiPickerTrackerHelper(mock(Lifecycle.class),
+                ApplicationProvider.getApplicationContext(), null);
+    }
+
+    @Test
+    public void getWifiPickerTracker_returnNonNull() {
+        assertThat(mWifiPickerTrackerHelper.getWifiPickerTracker()).isNotNull();
+    }
+
+    @Test
+    public void onDestroy_workerThreadQuit() {
+        final HandlerThread workerThread = mock(HandlerThread.class);
+        mWifiPickerTrackerHelper.setWorkerThread(workerThread);
+
+        mWifiPickerTrackerHelper.onDestroy();
+
+        verify(workerThread).quit();
+    }
+
+    @Test
+    public void setCarrierNetworkEnabled_returnTrueAndSetEnabled() {
+        mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
+
+        assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true)).isTrue();
+        verify(mMergedCarrierEntry).setEnabled(true);
+
+        assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false)).isTrue();
+        verify(mMergedCarrierEntry).setEnabled(false);
+    }
+
+    @Test
+    public void setCarrierNetworkEnabled_mergedCarrierEntryIsNull_returnFalse() {
+        mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(null);
+
+        assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true)).isFalse();
+        assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false)).isFalse();
+    }
+
+    @Test
+    public void connectCarrierNetwork_returnTrueAndConnect() {
+        mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
+        when(mMergedCarrierEntry.canConnect()).thenReturn(true);
+
+        assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isTrue();
+        verify(mMergedCarrierEntry).connect(mConnectCallback);
+    }
+
+    @Test
+    public void connectCarrierNetwork_mergedCarrierEntryIsNull_returnFalse() {
+        mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(null);
+
+        assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isFalse();
+    }
+
+    @Test
+    public void connectCarrierNetwork_canConnectIsFalse_returnFalseAndNeverConnect() {
+        mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
+        when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
+        when(mMergedCarrierEntry.canConnect()).thenReturn(false);
+
+        assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isFalse();
+        verify(mMergedCarrierEntry, never()).connect(mConnectCallback);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
deleted file mode 100644
index bc8a52a..0000000
--- a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
+++ /dev/null
@@ -1,333 +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.wifi;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.hamcrest.Matchers.allOf;
-import static org.hamcrest.Matchers.startsWith;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiConfiguration.NetworkSelectionStatus;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.provider.Settings;
-
-import androidx.fragment.app.Fragment;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings.WifiSettingsActivity;
-import com.android.settingslib.utils.ThreadUtils;
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.TestAccessPointBuilder;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTracker.WifiListener;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
-import com.google.common.collect.Lists;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiSettingsUiTest {
-    private static final String TEST_SSID = "\"Test Ssid\"";
-    private static final String TEST_UNQUOTED_SSID = "Test Ssid";
-    private static final String TEST_BSSID = "0a:08:5c:67:89:00";
-    private static final int TEST_RSSI = 123;
-    private static final int TEST_NETWORK_ID = 1;
-
-    // Keys used to lookup resources by name (see the resourceId/resourceString helper methods).
-    private static final String ID = "id";
-    private static final String STRING = "string";
-    private static final String WIFI_CONFIGURE_SETTINGS_PREFERENCE_TITLE =
-            "wifi_configure_settings_preference_title";
-    private static final String WIFI_SAVED_ACCESS_POINTS_LABEL = "wifi_saved_access_points_label";
-    private static final String WIFI_EMPTY_LIST_WIFI_OFF = "wifi_empty_list_wifi_off";
-    private static final String WIFI_DISPLAY_STATUS_CONNECTED = "wifi_display_status_connected";
-    private static final String WIFI_PASSWORD = "wifi_password";
-    private static final String WIFI_SHOW_PASSWORD = "wifi_show_password";
-    private static final String PASSWORD_LAYOUT = "password_layout";
-    private static final String PASSWORD = "password";
-
-    @Mock
-    private WifiTracker mWifiTracker;
-    @Mock
-    private WifiManager mWifiManager;
-    private Context mContext;
-    private WifiListener mWifiListener;
-
-    @Rule
-    public ActivityTestRule<WifiSettingsActivity> mActivityRule =
-            new ActivityTestRule<>(WifiSettingsActivity.class, true);
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = InstrumentationRegistry.getTargetContext();
-        WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
-        when(mWifiTracker.getManager()).thenReturn(mWifiManager);
-    }
-
-    /**
-     * Helper to get around the problem that directly accessing settings resource id's from
-     * com.android.settings.R via R.(type).(name) (eg R.id.password or
-     * R.string.wifi_configure_settings_preference_title) may not work due to mismatched resource
-     * ids. See b/37714546 and b/63546650.
-     */
-    private int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    /** Similar to {@link #resourceId}, but for accessing R.string.<name> values. */
-    private String resourceString(String name) {
-        return mContext.getResources().getString(resourceId(STRING, name));
-    }
-
-    private void setupConnectedAccessPoint() {
-        WifiConfiguration config = new WifiConfiguration();
-        config.SSID = TEST_SSID;
-        config.BSSID = TEST_BSSID;
-        config.networkId = TEST_NETWORK_ID;
-        WifiInfo wifiInfo = new WifiInfo.Builder()
-                .setSsid(TEST_UNQUOTED_SSID.getBytes(StandardCharsets.UTF_8))
-                .setBssid(TEST_BSSID)
-                .setRssi(TEST_RSSI)
-                .setNetworkId(TEST_NETWORK_ID)
-                .build();
-        NetworkInfo networkInfo = new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0, null, null);
-        networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null, null);
-        AccessPoint accessPoint = new AccessPoint(mContext, config);
-        accessPoint.update(config, wifiInfo, networkInfo);
-
-        assertThat(accessPoint.getSsidStr()).isEqualTo(TEST_UNQUOTED_SSID);
-        assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
-        assertThat(accessPoint.getNetworkInfo()).isNotNull();
-        assertThat(accessPoint.isActive()).isTrue();
-        assertThat(accessPoint.getSettingsSummary()).isEqualTo(
-                resourceString(WIFI_DISPLAY_STATUS_CONNECTED));
-
-        when(mWifiTracker.getAccessPoints()).thenReturn(
-                Lists.asList(accessPoint, new AccessPoint[] {}));
-    }
-
-    /** Launch the activity via an Intent with a String extra. */
-    private void launchActivity(String extraName, String extraValue) {
-        Intent intent = new Intent(Settings.ACTION_WIFI_SETTINGS);
-        if (extraName != null && extraValue != null) {
-            intent.putExtra(extraName, extraValue);
-        }
-        mActivityRule.launchActivity(intent);
-
-        verify(mWifiTracker).getManager();
-
-        List<Fragment> fragments =
-                mActivityRule.getActivity().getSupportFragmentManager().getFragments();
-        assertThat(fragments.size()).isEqualTo(1);
-        mWifiListener = (WifiSettings) fragments.get(0);
-        assertThat(mWifiListener).isNotNull();
-    }
-
-    /** Helper to launch the activity with no extra. */
-    private void launchActivity() {
-        launchActivity(null, null);
-    }
-
-    private void setWifiState(int wifiState) {
-        when(mWifiManager.getWifiState()).thenReturn(wifiState);
-        when(mWifiManager.isWifiEnabled()).thenReturn(wifiState == WifiManager.WIFI_STATE_ENABLED);
-    }
-
-    private void callOnWifiStateChanged(int state) {
-        mActivityRule.getActivity().getMainThreadHandler()
-                .post(() -> mWifiListener.onWifiStateChanged(state));
-    }
-
-    @Test
-    public void launchActivityShouldSucceed() {
-        launchActivity();
-    }
-
-    @Test
-    public void shouldShowWifiPreferences() {
-        launchActivity();
-
-        onView(withText(resourceId(STRING, WIFI_CONFIGURE_SETTINGS_PREFERENCE_TITLE))).check(
-                matches(isDisplayed()));
-    }
-
-    @Test
-    public void noSavedNetworks_wifiDisabled_shouldNotShowSavedNetworksButton() {
-        setWifiState(WifiManager.WIFI_STATE_DISABLED);
-        when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);
-
-        launchActivity();
-
-        onView(withText(resourceId(STRING, WIFI_SAVED_ACCESS_POINTS_LABEL))).check(
-                doesNotExist());
-    }
-
-    @Test
-    public void savedNetworksExist_shouldShowSavedNetworksButton() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        when(mWifiTracker.getNumSavedNetworks()).thenReturn(1);
-
-        launchActivity();
-
-        onView(allOf(withText(resourceId(STRING, WIFI_SAVED_ACCESS_POINTS_LABEL)),
-                withEffectiveVisibility(VISIBLE))).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void onDisableWifi_seeOffMessage() {
-        setWifiState(WifiManager.WIFI_STATE_DISABLED);
-
-        launchActivity();
-        callOnWifiStateChanged(WifiManager.WIFI_STATE_DISABLED);
-
-        onView(withText(startsWith(resourceString(WIFI_EMPTY_LIST_WIFI_OFF)))).check(
-                matches(isDisplayed()));
-    }
-
-    @Test
-    public void onEnableWifi_shouldNotSeeOffMessage() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-
-        launchActivity();
-        callOnWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
-
-        onView(withText(startsWith(resourceString(WIFI_EMPTY_LIST_WIFI_OFF)))).check(
-                doesNotExist());
-    }
-
-    @Test
-    public void onConnected_shouldSeeConnectedMessage() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        setupConnectedAccessPoint();
-        when(mWifiTracker.isConnected()).thenReturn(true);
-
-        launchActivity();
-
-        onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
-                matches(isDisplayed()));
-    }
-
-    @Test
-    public void changingSecurityStateOnApShouldNotCauseMultipleListItems() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        TestAccessPointBuilder builder = new TestAccessPointBuilder(mContext)
-                .setSsid(TEST_SSID)
-                .setSecurity(AccessPoint.SECURITY_NONE)
-                .setRssi(TEST_RSSI);
-        AccessPoint open = builder.build();
-
-        builder.setSecurity(AccessPoint.SECURITY_EAP);
-        AccessPoint eap = builder.build();
-
-        builder.setSecurity(AccessPoint.SECURITY_WEP);
-        AccessPoint wep = builder.build();
-
-        // Return a different security state each time getAccessPoints is invoked
-        when(mWifiTracker.getAccessPoints())
-                .thenReturn(Lists.newArrayList(open))
-                .thenReturn(Lists.newArrayList(eap))
-                .thenReturn(Lists.newArrayList(wep));
-
-        launchActivity();
-
-        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
-
-        ThreadUtils.postOnMainThread(() -> mWifiListener.onAccessPointsChanged());
-        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
-
-        ThreadUtils.postOnMainThread(() -> mWifiListener.onAccessPointsChanged());
-        onView(withText(TEST_SSID)).check(matches(isDisplayed()));
-    }
-
-    @Test
-    public void wrongPasswordSavedNetwork() {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-
-        // Set up an AccessPoint that is disabled due to incorrect password.
-        WifiConfiguration config = new WifiConfiguration();
-        config.SSID = TEST_SSID;
-        config.BSSID = TEST_BSSID;
-        config.networkId = TEST_NETWORK_ID;
-        config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
-
-        NetworkSelectionStatus selectionStatus = new NetworkSelectionStatus.Builder()
-                .setNetworkSelectionDisableReason(
-                        NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD)
-                .setNetworkSelectionStatus(
-                        NetworkSelectionStatus.NETWORK_SELECTION_TEMPORARY_DISABLED)
-                .build();
-        config.setNetworkSelectionStatus(selectionStatus);
-
-        WifiInfo wifiInfo = new WifiInfo.Builder()
-                .setSsid(TEST_UNQUOTED_SSID.getBytes(StandardCharsets.UTF_8))
-                .setBssid(TEST_BSSID)
-                .setRssi(TEST_RSSI)
-                .setNetworkId(TEST_NETWORK_ID)
-                .build();
-        AccessPoint accessPoint = new AccessPoint(mContext, config);
-        accessPoint.update(config, wifiInfo, null);
-
-        // Make sure we've set up our access point correctly.
-        assertThat(accessPoint.getSsidStr()).isEqualTo(TEST_UNQUOTED_SSID);
-        assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
-        assertThat(accessPoint.isActive()).isFalse();
-        assertThat(accessPoint.getConfig()).isNotNull();
-        NetworkSelectionStatus networkStatus = accessPoint.getConfig().getNetworkSelectionStatus();
-        assertThat(networkStatus).isNotNull();
-        assertThat(networkStatus.getNetworkSelectionStatus())
-                .isEqualTo(NetworkSelectionStatus.NETWORK_SELECTION_TEMPORARY_DISABLED);
-        assertThat(networkStatus.getNetworkSelectionDisableReason()).isEqualTo(
-                NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD);
-
-        when(mWifiTracker.getAccessPoints()).thenReturn(Lists.newArrayList(accessPoint));
-        launchActivity(WifiSettings.EXTRA_START_CONNECT_SSID, accessPoint.getSsidStr());
-
-        // Make sure that the password dialog is visible.
-        onView(withText(resourceId(STRING, WIFI_PASSWORD))).check(matches(isDisplayed()));
-        onView(withText(resourceId(STRING, WIFI_SHOW_PASSWORD))).check(matches(isDisplayed()));
-        onView(withId(resourceId(ID, PASSWORD_LAYOUT))).check(matches(isDisplayed()));
-        onView(withId(resourceId(ID, PASSWORD))).check(matches(isDisplayed()));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/WifiUtilsTest.java b/tests/unit/src/com/android/settings/wifi/WifiUtilsTest.java
new file mode 100644
index 0000000..7a75443
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/WifiUtilsTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.net.wifi.WifiConfiguration;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.wifitrackerlib.WifiEntry;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiUtilsTest {
+
+    @Test
+    public void testSSID() {
+        assertThat(WifiUtils.isSSIDTooLong("123")).isFalse();
+        assertThat(WifiUtils.isSSIDTooLong("☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎☎")).isTrue();
+
+        assertThat(WifiUtils.isSSIDTooShort("123")).isFalse();
+        assertThat(WifiUtils.isSSIDTooShort("")).isTrue();
+    }
+
+    @Test
+    public void testPassword() {
+        final String longPassword = "123456789012345678901234567890"
+                + "1234567890123456789012345678901234567890";
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid("123")).isFalse();
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid("12345678")).isTrue();
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid("1234567890")).isTrue();
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid(longPassword)).isFalse();
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid("")).isFalse();
+        assertThat(WifiUtils.isHotspotWpa2PasswordValid("€¥£")).isFalse();
+    }
+
+    @Test
+    public void getWifiConfigByWifiEntry_shouldReturnCorrectConfig() {
+        final String testSSID = "WifiUtilsTest";
+        final WifiEntry wifiEntry = mock(WifiEntry.class);
+        when(wifiEntry.getSsid()).thenReturn(testSSID);
+
+        final WifiConfiguration config = WifiUtils.getWifiConfig(wifiEntry, null /* scanResult */);
+
+        assertThat(config).isNotNull();
+        assertThat(config.SSID).isEqualTo("\"" + testSSID + "\"");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void getWifiConfigWithNullInput_ThrowIllegalArgumentException() {
+        WifiConfiguration config = WifiUtils.getWifiConfig(null /* wifiEntry */,
+                null /* scanResult */);
+    }
+}
diff --git a/tests/unit/src/com/android/settings/wifi/details2/WifiSubscriptionDetailPreferenceController2Test.java b/tests/unit/src/com/android/settings/wifi/details2/WifiSubscriptionDetailPreferenceController2Test.java
new file mode 100644
index 0000000..d4d724d
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/details2/WifiSubscriptionDetailPreferenceController2Test.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.details2;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.wifitrackerlib.WifiEntry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiSubscriptionDetailPreferenceController2Test {
+
+    @Mock
+    private WifiEntry mMockWifiEntry;
+
+    private WifiSubscriptionDetailPreferenceController2 mPreferenceController;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        mContext = ApplicationProvider.getApplicationContext();
+
+        mMockWifiEntry = mock(WifiEntry.class);
+        WifiSubscriptionDetailPreferenceController2 preferenceController =
+                new WifiSubscriptionDetailPreferenceController2(mContext);
+        preferenceController.setWifiEntry(mMockWifiEntry);
+        mPreferenceController = spy(preferenceController);
+    }
+
+    @Test
+    public void testUpdateState_canSetPrivacy_shouldBeSelectable() {
+        when(mMockWifiEntry.canManageSubscription()).thenReturn(true);
+
+        assertThat(mPreferenceController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void testUpdateState_canNotSetPrivacy_shouldNotSelectable() {
+        when(mMockWifiEntry.canManageSubscription()).thenReturn(false);
+
+        assertThat(mPreferenceController.isAvailable()).isFalse();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragmentTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragmentTest.java
deleted file mode 100644
index 33491b6..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppChooseSavedWifiNetworkFragmentTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.click;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.android.settings.wifi.dpp.WifiDppUtils.TAG_FRAGMENT_ADD_DEVICE;
-import static com.android.settings.wifi.dpp.WifiDppUtils.TAG_FRAGMENT_CHOOSE_SAVED_WIFI_NETWORK;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-
-import android.provider.Settings;
-import androidx.fragment.app.FragmentManager;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiDppChooseSavedWifiNetworkFragmentTest {
-    // Valid Wi-Fi DPP QR code
-    private static final String VALID_WIFI_DPP_QR_CODE = "DPP:I:SN=4774LH2b4044;M:010203040506;K:"
-            + "MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;";
-
-    // Keys used to lookup resources by name (see the resourceId/resourceString helper methods).
-    private static final String STRING = "string";
-    private static final String WIFI_DPP_CHOOSE_DIFFERENT_NETWORK =
-            "wifi_dpp_choose_different_network";
-    private static final String CANCEL = "cancel";
-
-    @Rule
-    public final ActivityTestRule<WifiDppConfiguratorActivity> mActivityRule =
-            new ActivityTestRule<>(WifiDppConfiguratorActivity.class, /* initialTouchMode */true,
-            /* launchActivity */ false);
-
-    private Context mContext;
-
-    @Before
-    public void setUp() {
-        mContext = InstrumentationRegistry.getTargetContext();
-    }
-
-    @Test
-    public void clickCancelButton_configuratorQrCodeScannerIntent_shouldPopBackStack() {
-        final Intent intent =
-                new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
-        final WifiDppConfiguratorActivity hostActivity = mActivityRule.launchActivity(intent);
-
-        // Go to WifiDppChooseSavedWifiNetworkFragment and click the cancel button
-        final FragmentManager fragmentManager = hostActivity.getSupportFragmentManager();
-        final WifiQrCode wifiQrCode = new WifiQrCode(VALID_WIFI_DPP_QR_CODE);
-        hostActivity.runOnUiThread(() ->
-            ((WifiDppConfiguratorActivity)hostActivity).onScanWifiDppSuccess(wifiQrCode)
-        );
-        onView(withText(resourceString(WIFI_DPP_CHOOSE_DIFFERENT_NETWORK))).perform(click());
-        onView(withText(resourceString(CANCEL))).perform(click());
-
-        assertThat(fragmentManager.findFragmentByTag(TAG_FRAGMENT_ADD_DEVICE)).isNotNull();
-        assertThat(fragmentManager.findFragmentByTag(TAG_FRAGMENT_CHOOSE_SAVED_WIFI_NETWORK))
-                .isNull();
-    }
-
-    @Test
-    public void clickCancelButton_processWifiDppQrCodeIntent_shouldFinish() {
-        final Intent intent = new Intent(Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_URI);
-        intent.setData(Uri.parse(VALID_WIFI_DPP_QR_CODE));
-        final WifiDppConfiguratorActivity hostActivity = mActivityRule.launchActivity(intent);
-
-        onView(withText(resourceString(CANCEL))).perform(click());
-
-        assertThat(hostActivity.isFinishing()).isEqualTo(true);
-    }
-
-    private int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    /** Similar to {@link #resourceId}, but for accessing R.string.<name> values. */
-    private String resourceString(String name) {
-        return mContext.getResources().getString(resourceId(STRING, name));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
deleted file mode 100644
index 7c87e7d..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppConfiguratorActivityTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.provider.Settings;
-import android.support.test.uiautomator.UiDevice;
-
-import androidx.fragment.app.FragmentManager;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.google.android.setupdesign.GlifLayout;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiDppConfiguratorActivityTest {
-    // Valid Wi-Fi DPP QR code & it's parameters
-    private static final String VALID_WIFI_DPP_QR_CODE = "DPP:I:SN=4774LH2b4044;M:010203040506;K:"
-            + "MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;";
-
-    @Rule
-    public final ActivityTestRule<WifiDppConfiguratorActivity> mActivityRule =
-            new ActivityTestRule<>(WifiDppConfiguratorActivity.class);
-
-    private UiDevice mDevice;
-
-    @Before
-    public void setUp() {
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-    }
-
-    @Test
-    public void launchActivity_qrCodeScanner_shouldNotAutoFinish() {
-        Intent intent = new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
-
-        mActivityRule.launchActivity(intent);
-        FragmentManager fragmentManager = mActivityRule.getActivity().getSupportFragmentManager();
-        WifiDppQrCodeScannerFragment fragment =
-                (WifiDppQrCodeScannerFragment) fragmentManager.findFragmentByTag(
-                        WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER);
-
-        assertThat(fragment.getView() instanceof GlifLayout).isTrue();
-        assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
-    }
-
-    @Test
-    public void launchActivity_qrCodeGenerator_shouldNotAutoFinish() {
-        Intent intent = new Intent(
-                WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_GENERATOR);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
-
-        mActivityRule.launchActivity(intent);
-        FragmentManager fragmentManager = mActivityRule.getActivity().getSupportFragmentManager();
-        WifiDppQrCodeGeneratorFragment fragment =
-                (WifiDppQrCodeGeneratorFragment) fragmentManager.findFragmentByTag(
-                        WifiDppUtils.TAG_FRAGMENT_QR_CODE_GENERATOR);
-
-        assertThat(fragment.getView() instanceof GlifLayout).isTrue();
-        assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
-    }
-
-    @Test
-    public void launchActivity_chooseSavedWifiNetwork_shouldNotAutoFinish() {
-        final Intent intent = new Intent(Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_URI);
-        intent.setData(Uri.parse(VALID_WIFI_DPP_QR_CODE));
-
-        mActivityRule.launchActivity(intent);
-
-        assertThat(mActivityRule.getActivity().isFinishing()).isFalse();
-    }
-
-    @Test
-    public void testActivity_shouldImplementsWifiNetworkConfigRetriever() {
-        WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
-
-        assertThat(activity instanceof WifiNetworkConfig.Retriever).isTrue();
-    }
-
-    @Test
-    public void testActivity_shouldImplementsOnScanWifiDppSuccessCallback() {
-        WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
-
-        assertThat(activity instanceof WifiDppQrCodeScannerFragment
-                .OnScanWifiDppSuccessListener).isTrue();
-    }
-
-    @Test
-    public void testActivity_shouldImplementsOnClickChooseDifferentNetworkCallback() {
-        WifiDppConfiguratorActivity activity = mActivityRule.getActivity();
-
-        assertThat(activity instanceof WifiDppAddDeviceFragment
-                .OnClickChooseDifferentNetworkListener).isTrue();
-    }
-
-    @Test
-    public void rotateScreen_shouldGetCorrectWifiDppQrCode() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_WIFI_DPP_QR_CODE);
-        Intent intent = new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
-
-        // setWifiDppQrCode and check if getWifiDppQrCode correctly after rotation
-        mActivityRule.launchActivity(intent);
-        mActivityRule.getActivity().setWifiDppQrCode(wifiQrCode);
-
-        try {
-            mDevice.setOrientationLeft();
-            mDevice.setOrientationNatural();
-            mDevice.setOrientationRight();
-            mDevice.setOrientationNatural();
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        }
-
-        WifiQrCode restoredWifiDppQrCode = mActivityRule.getActivity().getWifiDppQrCode();
-        assertThat(restoredWifiDppQrCode).isNotNull();
-        assertThat(restoredWifiDppQrCode.getQrCode()).isEqualTo(VALID_WIFI_DPP_QR_CODE);
-    }
-
-    @Test
-    public void rotateScreen_shouldGetCorrectWifiNetworkConfig() {
-        final WifiNetworkConfig wifiNetworkConfig = new WifiNetworkConfig("WPA", "WifiSsid",
-                "password", /* hiddenSsid */ false, /* networkId */ 0, /* isHotspot */ true);
-        final Intent intent = new Intent(Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_URI);
-        intent.setData(Uri.parse(VALID_WIFI_DPP_QR_CODE));
-
-        // setWifiNetworkConfig and check if getWifiNetworkConfig correctly after rotation
-        mActivityRule.launchActivity(intent);
-        mActivityRule.getActivity().setWifiNetworkConfig(wifiNetworkConfig);
-
-        try {
-            mDevice.setOrientationLeft();
-            mDevice.setOrientationNatural();
-            mDevice.setOrientationRight();
-            mDevice.setOrientationNatural();
-        } catch (RemoteException e) {
-            throw new RuntimeException(e);
-        }
-
-        WifiNetworkConfig restoredWifiNetworkConfig =
-                mActivityRule.getActivity().getWifiNetworkConfig();
-
-        assertThat(restoredWifiNetworkConfig).isNotNull();
-        assertThat(restoredWifiNetworkConfig.getSecurity()).isEqualTo("WPA");
-        assertThat(restoredWifiNetworkConfig.getSsid()).isEqualTo("WifiSsid");
-        assertThat(restoredWifiNetworkConfig.getPreSharedKey()).isEqualTo("password");
-        assertThat(restoredWifiNetworkConfig.getHiddenSsid()).isFalse();
-        assertThat(restoredWifiNetworkConfig.getNetworkId()).isEqualTo(0);
-        assertThat(restoredWifiNetworkConfig.isHotspot()).isTrue();
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java
deleted file mode 100644
index aef4767..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppEnrolleeActivityTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiDppEnrolleeActivityTest {
-    @Rule
-    public final ActivityTestRule<WifiDppEnrolleeActivity> mActivityRule =
-            new ActivityTestRule<>(WifiDppEnrolleeActivity.class);
-
-    @Test
-    public void testActivity_shouldImplementsOnScanWifiDppSuccessCallback() {
-        WifiDppEnrolleeActivity activity = mActivityRule.getActivity();
-
-        assertThat(activity instanceof WifiDppQrCodeScannerFragment
-                .OnScanWifiDppSuccessListener).isEqualTo(true);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
deleted file mode 100644
index 239f525..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeGeneratorFragmentTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiDppQrCodeGeneratorFragmentTest {
-    @Rule
-    public final ActivityTestRule<WifiDppConfiguratorActivity> mActivityRule =
-            new ActivityTestRule<>(WifiDppConfiguratorActivity.class, true);
-
-    @Before
-    public void setUp() {
-        Intent intent =
-                new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_GENERATOR);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        mActivityRule.launchActivity(intent);
-    }
-
-    @Test
-    public void rotateScreen_shouldNotCrash() {
-        mActivityRule.getActivity().setRequestedOrientation(
-                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        mActivityRule.getActivity().setRequestedOrientation(
-                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java
deleted file mode 100644
index d633689..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static com.android.settings.wifi.dpp.WifiDppUtils.TAG_FRAGMENT_QR_CODE_SCANNER;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-
-import androidx.fragment.app.FragmentManager;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiDppQrCodeScannerFragmentTest {
-    @Rule
-    public final ActivityTestRule<WifiDppConfiguratorActivity> mActivityRule =
-            new ActivityTestRule<>(WifiDppConfiguratorActivity.class, true);
-
-    @Before
-    public void setUp() {
-        Intent intent = new Intent(WifiDppConfiguratorActivity.ACTION_CONFIGURATOR_QR_CODE_SCANNER);
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WEP");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "GoogleGuest");
-        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "password");
-        mActivityRule.launchActivity(intent);
-    }
-
-    @Test
-    public void rotateScreen_shouldNotCrash() {
-        mActivityRule.getActivity().setRequestedOrientation(
-                ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        mActivityRule.getActivity().setRequestedOrientation(
-                ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-    }
-
-    @Test
-    public void onPause_shouldNotDecodeQrCode() {
-        final WifiDppConfiguratorActivity hostActivity =
-                (WifiDppConfiguratorActivity) mActivityRule.getActivity();
-        final FragmentManager fragmentManager = hostActivity.getSupportFragmentManager();
-        final WifiDppQrCodeScannerFragment scannerFragment =
-                (WifiDppQrCodeScannerFragment) fragmentManager
-                .findFragmentByTag(TAG_FRAGMENT_QR_CODE_SCANNER);
-        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-
-        instrumentation.runOnMainSync(() -> {
-            instrumentation.callActivityOnPause(hostActivity);
-
-            assertThat(scannerFragment.isDecodeTaskAlive()).isEqualTo(false);
-        });
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkConfigTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkConfigTest.java
new file mode 100644
index 0000000..85cf259
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkConfigTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi.dpp;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Intent;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiNetworkConfigTest {
+    private WifiNetworkConfig mWifiConfig;
+
+    @Before
+    public void setUp() {
+        Intent intent = new Intent();
+        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SSID, "Pixel:_ABCD;");
+        intent.putExtra(WifiDppUtils.EXTRA_WIFI_SECURITY, "WPA");
+        intent.putExtra(WifiDppUtils.EXTRA_WIFI_PRE_SHARED_KEY, "\\012345678,");
+        mWifiConfig = WifiNetworkConfig.getValidConfigOrNull(intent);
+    }
+
+    @Test
+    public void testInitConfig_IntentReceived_QRCodeValue() {
+        String qrcode = mWifiConfig.getQrCode();
+        assertThat(qrcode).isEqualTo("WIFI:S:Pixel\\:_ABCD\\;;T:WPA;P:\\\\012345678\\,;H:false;;");
+    }
+}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
deleted file mode 100644
index fec0c6f..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiNetworkListFragmentTest.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.when;
-
-import android.content.Context;
-import android.content.Intent;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.net.Uri;
-import android.net.wifi.WifiConfiguration;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
-import android.provider.Settings;
-
-import androidx.fragment.app.Fragment;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settingslib.wifi.AccessPoint;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
-import com.google.common.collect.Lists;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiNetworkListFragmentTest {
-    private static final String TEST_SSID = "\"Test Ssid\"";
-    private static final String TEST_UNQUOTED_SSID = "Test Ssid";
-    private static final String TEST_BSSID = "0a:08:5c:67:89:00";
-    private static final int TEST_RSSI = 123;
-    private static final int TEST_NETWORK_ID = 1;
-
-    private static final String TEST_DPP_URL = "DPP:C:81/1;I:DPP_TESTER;K:"
-        + "MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADUysZxnwRFGQR7Fepipjl84TG/dQR07es91iOB3PkPOk=;;";
-
-    // Keys used to lookup resources by name (see the resourceId/resourceString helper methods).
-    private static final String ID = "id";
-    private static final String STRING = "string";
-    private static final String WIFI_DISPLAY_STATUS_CONNECTED = "wifi_display_status_connected";
-
-    @Mock
-    private WifiTracker mWifiTracker;
-    @Mock
-    private WifiManager mWifiManager;
-
-    private WifiNetworkListFragment mWifiNetworkListFragment;
-    private Context mContext;
-
-    @Rule
-    public ActivityTestRule<WifiDppConfiguratorActivity> mActivityRule = new ActivityTestRule<>(
-            WifiDppConfiguratorActivity.class, true);
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        mContext = InstrumentationRegistry.getTargetContext();
-        WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
-        when(mWifiTracker.getManager()).thenReturn(mWifiManager);
-    }
-
-    private void callOnWifiStateChanged(int state) {
-        mActivityRule.getActivity().getMainThreadHandler()
-                .post(() -> mWifiNetworkListFragment.onWifiStateChanged(state));
-    }
-
-    /** Launch the activity via an Intent with data Uri */
-    private void launchActivity(String uriString) {
-        final Intent intent = new Intent(Settings.ACTION_PROCESS_WIFI_EASY_CONNECT_URI);
-        intent.setData(Uri.parse(uriString));
-        mActivityRule.launchActivity(intent);
-
-        List<Fragment> fragments =
-                mActivityRule.getActivity().getSupportFragmentManager().getFragments();
-        assertThat(fragments.size()).isEqualTo(1);
-        List<Fragment> childFragments = fragments.get(0).getChildFragmentManager().getFragments();
-        assertThat(childFragments.size()).isEqualTo(1);
-        mWifiNetworkListFragment = (WifiNetworkListFragment) childFragments.get(0);
-        assertThat(mWifiNetworkListFragment).isNotNull();
-    }
-
-    private int resourceId(String type, String name) {
-        return mContext.getResources().getIdentifier(name, type, mContext.getPackageName());
-    }
-
-    /** Similar to {@link #resourceId}, but for accessing R.string.<name> values. */
-    private String resourceString(String name) {
-        return mContext.getResources().getString(resourceId(STRING, name));
-    }
-
-    private void setWifiState(int wifiState) {
-        when(mWifiManager.getWifiState()).thenReturn(wifiState);
-        when(mWifiManager.isWifiEnabled()).thenReturn(wifiState == WifiManager.WIFI_STATE_ENABLED);
-    }
-
-    private void setupConnectedAccessPoint() {
-        final WifiConfiguration config = new WifiConfiguration();
-        config.SSID = TEST_SSID;
-        config.BSSID = TEST_BSSID;
-        config.networkId = TEST_NETWORK_ID;
-        config.allowedKeyManagement.set(WifiConfiguration.KeyMgmt.WPA_PSK);
-        final WifiInfo wifiInfo = new WifiInfo.Builder()
-                .setSsid(TEST_UNQUOTED_SSID.getBytes(StandardCharsets.UTF_8))
-                .setBssid(TEST_BSSID)
-                .setRssi(TEST_RSSI)
-                .setNetworkId(TEST_NETWORK_ID)
-                .build();
-        final NetworkInfo networkInfo = new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0, null, null);
-        networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null, null);
-        final AccessPoint accessPoint = new AccessPoint(mContext, config);
-        accessPoint.update(config, wifiInfo, networkInfo);
-
-        assertThat(accessPoint.getSsidStr()).isEqualTo(TEST_UNQUOTED_SSID);
-        assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
-        assertThat(accessPoint.getNetworkInfo()).isNotNull();
-        assertThat(accessPoint.isActive()).isTrue();
-        assertThat(accessPoint.getSettingsSummary()).isEqualTo(
-                resourceString(WIFI_DISPLAY_STATUS_CONNECTED));
-
-        when(mWifiTracker.getAccessPoints()).thenReturn(
-                Lists.asList(accessPoint, new AccessPoint[]{}));
-    }
-
-    @Test
-    public void onConnected_shouldSeeConnectedMessage() throws Exception {
-        setWifiState(WifiManager.WIFI_STATE_ENABLED);
-        setupConnectedAccessPoint();
-        when(mWifiTracker.isConnected()).thenReturn(true);
-
-        launchActivity(TEST_DPP_URL);
-        callOnWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
-
-        onView(withText(resourceString(WIFI_DISPLAY_STATUS_CONNECTED))).check(
-                matches(isDisplayed()));
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/dpp/WifiQrCodeTest.java b/tests/unit/src/com/android/settings/wifi/dpp/WifiQrCodeTest.java
deleted file mode 100644
index e4d3a7b..0000000
--- a/tests/unit/src/com/android/settings/wifi/dpp/WifiQrCodeTest.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Copyright (C) 2018 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi.dpp;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class WifiQrCodeTest {
-    // Valid Wi-Fi DPP QR code & it's parameters
-    private static final String VALID_WIFI_DPP_QR_CODE = "DPP:I:SN=4774LH2b4044;M:010203040506;K:"
-            + "MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=;;";
-
-    private static final String PUBLIC_KEY_OF_VALID_WIFI_DPP_QR_CODE =
-            "MDkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDIgADURzxmttZoIRIPWGoQMV00XHWCAQIhXruVWOz0NjlkIA=";
-
-    private static final String INFORMATION_OF_VALID_WIFI_DPP_QR_CODE =
-            "SN=4774LH2b4044";
-
-    // Valid ZXing reader library's Wi-Fi Network config format & it's parameters
-    private static final String VALID_ZXING_WIFI_QR_CODE_WPA =
-            "WIFI:T:WPA;S:mynetwork;P:mypass;H:true;;";
-
-     // Valid ZXing reader library's Wi-Fi Network config format - security type SAE
-    private static final String VALID_ZXING_WIFI_QR_CODE_SAE =
-            "WIFI:T:SAE;S:mynetwork;P:mypass;H:true;;";
-
-    // Valid ZXing reader library's Wi-Fi Network config format - security type nopass and no password
-    private static final String VALID_ZXING_WIFI_QR_CODE_NOPASS_AND_NO_PASSWORD =
-            "WIFI:T:nopass;S:mynetwork;;";
-
-    // Valid ZXing reader library's Wi-Fi Network config format - no security and no password
-    private static final String VALID_ZXING_WIFI_QR_CODE_NO_SECURITY_AND_NO_PASSWORD =
-            "WIFI:T:;S:mynetwork;P:;H:false;;";
-
-    private static final String SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_WPA = "WPA";
-    private static final String SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_SAE = "SAE";
-    private static final String SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_NOPASS = "nopass";
-    private static final String SSID_OF_VALID_ZXING_WIFI_QR_CODE = "mynetwork";
-    private static final String PASSWORD_OF_VALID_ZXING_WIFI_QR_CODE = "mypass";
-
-    // Valid ZXing reader library's Wi-Fi Network config format - escaped characters
-    private static final String VALID_ZXING_WIFI_QR_CODE_SPECIAL_CHARACTERS =
-            "WIFI:T:WPA;S:mynetwork;P:m\\;y\\:p\\\\a\\,ss;H:true;;";
-
-    private static final String PASSWORD_OF_VALID_ZXING_WIFI_QR_CODE_SPECIAL_CHARACTERS =
-            "m;y:p\\a,ss";
-
-    // Invalid scheme QR code
-    private static final String INVALID_SCHEME_QR_CODE = "BT:T:WPA;S:mynetwork;P:mypass;H:true;;";
-
-    // Invalid Wi-Fi DPP QR code - no public key - case 1
-    private static final String INVALID_WIFI_DPP_QR_CODE_NO_PUBLIC_KEY_1 =
-            "DPP:I:SN=4774LH2b4044;M:010203040506;K:;;";
-
-    // Invalid Wi-Fi DPP QR code - no public key - case 2
-    private static final String INVALID_WIFI_DPP_QR_CODE_NO_PUBLIC_KEY_2 =
-            "DPP:I:SN=4774LH2b4044;M:010203040506;;";
-
-    // Invalid ZXing reader library's Wi-Fi Network config format - no password
-    private static final String INVALID_ZXING_WIFI_QR_CODE_NO_PASSWORD =
-            "WIFI:T:WPA;S:mynetwork;P:;;";
-
-    // Invalid ZXing reader library's Wi-Fi Network config format - no SSID
-    private static final String INVALID_ZXING_WIFI_QR_CODE_NO_SSID =
-            "WIFI:T:WPA;P:mypass;;";
-
-    @Test
-    public void parseValidWifiDppQrCode() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_WIFI_DPP_QR_CODE);
-
-        assertEquals(WifiQrCode.SCHEME_DPP, wifiQrCode.getScheme());
-        assertEquals(PUBLIC_KEY_OF_VALID_WIFI_DPP_QR_CODE, wifiQrCode.getPublicKey());
-        assertEquals(INFORMATION_OF_VALID_WIFI_DPP_QR_CODE, wifiQrCode.getInformation());
-    }
-
-    @Test
-    public void parseValidZxingWifiQrCode() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_ZXING_WIFI_QR_CODE_WPA);
-        WifiNetworkConfig config = wifiQrCode.getWifiNetworkConfig();
-
-        assertEquals(WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG, wifiQrCode.getScheme());
-        assertNotNull(config);
-        assertEquals(SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_WPA, config.getSecurity());
-        assertEquals(SSID_OF_VALID_ZXING_WIFI_QR_CODE, config.getSsid());
-        assertEquals(PASSWORD_OF_VALID_ZXING_WIFI_QR_CODE, config.getPreSharedKey());
-        assertEquals(true, config.getHiddenSsid());
-    }
-
-    @Test
-    public void parseValidZxingWifiQrCodeSae() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_ZXING_WIFI_QR_CODE_SAE);
-        WifiNetworkConfig config = wifiQrCode.getWifiNetworkConfig();
-
-        assertEquals(WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG, wifiQrCode.getScheme());
-        assertNotNull(config);
-        assertEquals(SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_SAE, config.getSecurity());
-        assertEquals(SSID_OF_VALID_ZXING_WIFI_QR_CODE, config.getSsid());
-        assertEquals(PASSWORD_OF_VALID_ZXING_WIFI_QR_CODE, config.getPreSharedKey());
-        assertEquals(true, config.getHiddenSsid());
-    }
-
-    @Test
-    public void parseValidZxingWifiQrCode_noPass_and_no_password() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_ZXING_WIFI_QR_CODE_NOPASS_AND_NO_PASSWORD);
-        WifiNetworkConfig config = wifiQrCode.getWifiNetworkConfig();
-
-        assertEquals(WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG, wifiQrCode.getScheme());
-        assertNotNull(config);
-        assertEquals(SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_NOPASS, config.getSecurity());
-        assertEquals(SSID_OF_VALID_ZXING_WIFI_QR_CODE, config.getSsid());
-        assertNull(config.getPreSharedKey());
-        assertEquals(false, config.getHiddenSsid());
-    }
-
-    @Test
-    public void parseValidZxingWifiQrCode_no_security_and_no_password() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_ZXING_WIFI_QR_CODE_NO_SECURITY_AND_NO_PASSWORD);
-        WifiNetworkConfig config = wifiQrCode.getWifiNetworkConfig();
-
-        assertEquals(WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG, wifiQrCode.getScheme());
-        assertNotNull(config);
-        assertEquals("", config.getSecurity());
-        assertEquals(SSID_OF_VALID_ZXING_WIFI_QR_CODE, config.getSsid());
-        assertEquals("", config.getPreSharedKey());
-        assertEquals(false, config.getHiddenSsid());
-    }
-
-    @Test
-    public void parseValidZxingWifiQrCode_specialCharacters() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_ZXING_WIFI_QR_CODE_SPECIAL_CHARACTERS);
-        WifiNetworkConfig config = wifiQrCode.getWifiNetworkConfig();
-
-        assertEquals(WifiQrCode.SCHEME_ZXING_WIFI_NETWORK_CONFIG, wifiQrCode.getScheme());
-        assertNotNull(config);
-        assertEquals(SECURITY_OF_VALID_ZXING_WIFI_QR_CODE_WPA, config.getSecurity());
-        assertEquals(SSID_OF_VALID_ZXING_WIFI_QR_CODE, config.getSsid());
-        assertEquals(PASSWORD_OF_VALID_ZXING_WIFI_QR_CODE_SPECIAL_CHARACTERS,
-                config.getPreSharedKey());
-        assertEquals(true, config.getHiddenSsid());
-    }
-
-    @Test
-    public void testRemoveBackSlash() {
-        WifiQrCode wifiQrCode = new WifiQrCode(VALID_WIFI_DPP_QR_CODE);
-
-        assertEquals("\\", wifiQrCode.removeBackSlash("\\\\"));
-        assertEquals("ab", wifiQrCode.removeBackSlash("a\\b"));
-        assertEquals("a", wifiQrCode.removeBackSlash("\\a"));
-        assertEquals("\\b", wifiQrCode.removeBackSlash("\\\\b"));
-        assertEquals("c\\", wifiQrCode.removeBackSlash("c\\\\"));
-    }
-
-    @Test
-    public void parseEmptyQrCode_shouldThrowIllegalArgumentException() {
-        try {
-            new WifiQrCode(null);
-            fail("Null QR code");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-
-        try {
-            new WifiQrCode("");
-            fail("Empty string QR code");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-
-        try {
-            new WifiQrCode("DPP:;");
-            fail("Empty content WIFI DPP QR code");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-
-        try {
-            new WifiQrCode("WIFI:;");
-            fail("Empty content ZXing WIFI QR code");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-    }
-
-    @Test
-    public void parseInvalidSchemeQrCode_shouldThrowIllegalArgumentException() {
-        try {
-            new WifiQrCode(INVALID_SCHEME_QR_CODE);
-            fail("Invalid scheme");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-    }
-
-    @Test
-    public void parseInvalidWifiDppQrCode_noPublicKey_shouldThrowIllegalArgumentException() {
-        try {
-            new WifiQrCode(INVALID_WIFI_DPP_QR_CODE_NO_PUBLIC_KEY_1);
-            fail("No public key case 1");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-
-        try {
-            new WifiQrCode(INVALID_WIFI_DPP_QR_CODE_NO_PUBLIC_KEY_2);
-            fail("No public key case 2");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-    }
-
-    @Test
-    public void parseInvalidZxingWifiQrCode_noPassword_shouldThrowIllegalArgumentException() {
-        try {
-            new WifiQrCode(INVALID_ZXING_WIFI_QR_CODE_NO_PASSWORD);
-            fail("No password");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-    }
-
-    @Test
-    public void parseInvalidZxingWifiQrCode_noSsid_shouldThrowIllegalArgumentException() {
-        try {
-            new WifiQrCode(INVALID_ZXING_WIFI_QR_CODE_NO_SSID);
-            fail("No SSID");
-        } catch (IllegalArgumentException e) {
-            // Do nothing
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java b/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
deleted file mode 100644
index 9d9cc34..0000000
--- a/tests/unit/src/com/android/settings/wifi/tether/TetherServiceTest.java
+++ /dev/null
@@ -1,396 +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.wifi.tether;
-
-import static android.net.TetheringConstants.EXTRA_ADD_TETHER_TYPE;
-import static android.net.TetheringConstants.EXTRA_PROVISION_CALLBACK;
-import static android.net.TetheringConstants.EXTRA_RUN_PROVISION;
-import static android.net.TetheringManager.TETHERING_BLUETOOTH;
-import static android.net.TetheringManager.TETHERING_INVALID;
-import static android.net.TetheringManager.TETHERING_USB;
-import static android.net.TetheringManager.TETHERING_WIFI;
-import static android.net.TetheringManager.TETHER_ERROR_NO_ERROR;
-import static android.net.TetheringManager.TETHER_ERROR_PROVISIONING_FAILED;
-import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID;
-
-import static com.android.settings.wifi.tether.TetherService.EXTRA_TETHER_PROVISIONING_RESPONSE;
-import static com.android.settings.wifi.tether.TetherService.EXTRA_TETHER_SILENT_PROVISIONING_ACTION;
-import static com.android.settings.wifi.tether.TetherService.EXTRA_TETHER_SUBID;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.app.usage.UsageStatsManager;
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.net.TetheringManager;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.ResultReceiver;
-import android.os.SystemClock;
-import android.test.ServiceTestCase;
-import android.util.Log;
-
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-public class TetherServiceTest extends ServiceTestCase<TetherService> {
-
-    private static final String TAG = "TetherServiceTest";
-    private static final String FAKE_PACKAGE_NAME = "com.some.package.name";
-    private static final String ENTITLEMENT_PACKAGE_NAME = "com.some.entitlement.name";
-    private static final String TEST_RESPONSE_ACTION = "testProvisioningResponseAction";
-    private static final String TEST_NO_UI_ACTION = "testNoUiProvisioningRequestAction";
-    private static final int BOGUS_RECEIVER_RESULT = -5;
-    private static final int MS_PER_HOUR = 60 * 60 * 1000;
-    private static final int SHORT_TIMEOUT = 100;
-    private static final int PROVISION_TIMEOUT = 1000;
-
-    private TetherService mService;
-    private MockTetherServiceWrapper mWrapper;
-    int mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
-    private int mLastTetherRequestType = TETHERING_INVALID;
-    private int mProvisionResponse = BOGUS_RECEIVER_RESULT;
-    private ProvisionReceiver mProvisionReceiver;
-    private Receiver mResultReceiver;
-
-    @Mock private TetheringManager mTetheringManager;
-    @Mock private PackageManager mPackageManager;
-    @Mock private WifiManager mWifiManager;
-    @Mock private SharedPreferences mPrefs;
-    @Mock private Editor mPrefEditor;
-    @Captor private ArgumentCaptor<PendingIntent> mPiCaptor;
-    @Captor private ArgumentCaptor<String> mStoredTypes;
-
-    public TetherServiceTest() {
-        super(TetherService.class);
-    }
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        MockitoAnnotations.initMocks(this);
-
-        mContext = new TestContextWrapper(getContext());
-        setContext(mContext);
-
-        mResultReceiver = new Receiver(this);
-        mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
-        mProvisionResponse = Activity.RESULT_OK;
-        mProvisionReceiver = new ProvisionReceiver();
-        IntentFilter filter = new IntentFilter(TEST_NO_UI_ACTION);
-        filter.addCategory(Intent.CATEGORY_DEFAULT);
-        mContext.registerReceiver(mProvisionReceiver, filter);
-
-        final String CURRENT_TYPES = "currentTethers";
-        when(mPrefs.getString(CURRENT_TYPES, "")).thenReturn("");
-        when(mPrefs.edit()).thenReturn(mPrefEditor);
-        when(mPrefEditor.putString(eq(CURRENT_TYPES), mStoredTypes.capture())).thenReturn(
-                mPrefEditor);
-        mWrapper = new MockTetherServiceWrapper(mContext);
-
-        ResolveInfo systemAppResolveInfo = new ResolveInfo();
-        ActivityInfo systemActivityInfo = new ActivityInfo();
-        systemActivityInfo.packageName = ENTITLEMENT_PACKAGE_NAME;
-        ApplicationInfo systemAppInfo = new ApplicationInfo();
-        systemAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
-        systemActivityInfo.applicationInfo = systemAppInfo;
-        systemAppResolveInfo.activityInfo = systemActivityInfo;
-
-        ResolveInfo nonSystemResolveInfo = new ResolveInfo();
-        ActivityInfo nonSystemActivityInfo = new ActivityInfo();
-        nonSystemActivityInfo.packageName = FAKE_PACKAGE_NAME;
-        nonSystemActivityInfo.applicationInfo = new ApplicationInfo();
-        nonSystemResolveInfo.activityInfo = nonSystemActivityInfo;
-
-        List<ResolveInfo> resolvers = new ArrayList();
-        resolvers.add(nonSystemResolveInfo);
-        resolvers.add(systemAppResolveInfo);
-        when(mPackageManager.queryBroadcastReceivers(
-                any(Intent.class), eq(PackageManager.MATCH_ALL))).thenReturn(resolvers);
-        setupService();
-        getService().setTetherServiceWrapper(mWrapper);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        mContext.unregisterReceiver(mProvisionReceiver);
-        super.tearDown();
-    }
-
-    public void testStartForProvision() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-    }
-
-    public void testStartKeepsProvisionAppActive() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-        assertFalse(mWrapper.isAppInactive(ENTITLEMENT_PACKAGE_NAME));
-        // Non-system handler of the intent action should stay idle.
-        assertTrue(mWrapper.isAppInactive(FAKE_PACKAGE_NAME));
-    }
-
-    public void testStartMultiple() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-
-        runProvisioningForType(TETHERING_USB);
-
-        assertTrue(waitForProvisionRequest(TETHERING_USB));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-
-        runProvisioningForType(TETHERING_BLUETOOTH);
-
-        assertTrue(waitForProvisionRequest(TETHERING_BLUETOOTH));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_NO_ERROR));
-    }
-
-    public void testPersistTypes() {
-        runProvisioningForType(TETHERING_WIFI);
-
-        waitForProvisionRequest(TETHERING_WIFI);
-        waitForProvisionResponse(TETHER_ERROR_NO_ERROR);
-
-        runProvisioningForType(TETHERING_BLUETOOTH);
-
-        waitForProvisionRequest(TETHERING_BLUETOOTH);
-        waitForProvisionResponse(TETHER_ERROR_NO_ERROR);
-
-        shutdownService();
-        assertEquals(TETHERING_WIFI + "," + TETHERING_BLUETOOTH, mStoredTypes.getValue());
-    }
-
-    public void testFailureStopsTethering_Wifi() {
-        mProvisionResponse = Activity.RESULT_CANCELED;
-
-        runProvisioningForType(TETHERING_WIFI);
-
-        assertTrue(waitForProvisionRequest(TETHERING_WIFI));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_PROVISIONING_FAILED));
-
-        verify(mTetheringManager).stopTethering(TETHERING_WIFI);
-    }
-
-    public void testFailureStopsTethering_Usb() {
-        mProvisionResponse = Activity.RESULT_CANCELED;
-
-        runProvisioningForType(TETHERING_USB);
-
-        assertTrue(waitForProvisionRequest(TETHERING_USB));
-        assertTrue(waitForProvisionResponse(TETHER_ERROR_PROVISIONING_FAILED));
-
-        verify(mTetheringManager).stopTethering(TETHERING_USB);
-    }
-
-    public void testIgnoreOutdatedRequest() {
-        Intent intent = new Intent();
-        intent.putExtra(EXTRA_ADD_TETHER_TYPE, TETHERING_WIFI);
-        intent.putExtra(EXTRA_RUN_PROVISION, true);
-        intent.putExtra(EXTRA_TETHER_SILENT_PROVISIONING_ACTION, TEST_NO_UI_ACTION);
-        intent.putExtra(EXTRA_PROVISION_CALLBACK, mResultReceiver);
-        intent.putExtra(EXTRA_TETHER_SUBID, 1 /* Tested subId number */);
-        intent.putExtra(EXTRA_TETHER_PROVISIONING_RESPONSE, TEST_RESPONSE_ACTION);
-        startService(intent);
-
-        SystemClock.sleep(PROVISION_TIMEOUT);
-        assertEquals(TETHERING_INVALID, mLastTetherRequestType);
-        assertTrue(mWrapper.isAppInactive(ENTITLEMENT_PACKAGE_NAME));
-        assertTrue(mWrapper.isAppInactive(FAKE_PACKAGE_NAME));
-    }
-
-    private void runProvisioningForType(int type) {
-        Intent intent = new Intent();
-        intent.putExtra(EXTRA_ADD_TETHER_TYPE, type);
-        intent.putExtra(EXTRA_RUN_PROVISION, true);
-        intent.putExtra(EXTRA_TETHER_SILENT_PROVISIONING_ACTION, TEST_NO_UI_ACTION);
-        intent.putExtra(EXTRA_PROVISION_CALLBACK, mResultReceiver);
-        intent.putExtra(EXTRA_TETHER_SUBID, INVALID_SUBSCRIPTION_ID);
-        intent.putExtra(EXTRA_TETHER_PROVISIONING_RESPONSE, TEST_RESPONSE_ACTION);
-        startService(intent);
-    }
-
-    private boolean waitForAppInactive(UsageStatsManager usageStatsManager, String packageName) {
-        long startTime = SystemClock.uptimeMillis();
-        while (true) {
-            if (usageStatsManager.isAppInactive(packageName)) {
-                return true;
-            }
-            if ((SystemClock.uptimeMillis() - startTime) > PROVISION_TIMEOUT) {
-                return false;
-            }
-            SystemClock.sleep(SHORT_TIMEOUT);
-        }
-    }
-
-    private boolean waitForProvisionRequest(int expectedType) {
-        long startTime = SystemClock.uptimeMillis();
-        while (true) {
-            if (mLastTetherRequestType == expectedType) {
-                mLastTetherRequestType = TETHERING_INVALID;
-                return true;
-            }
-            if ((SystemClock.uptimeMillis() - startTime) > PROVISION_TIMEOUT) {
-                Log.v(TAG, String.format(
-                        "waitForProvisionRequest timeout: expected=%d, actual=%d",
-                        expectedType, mLastTetherRequestType));
-                return false;
-            }
-            SystemClock.sleep(SHORT_TIMEOUT);
-        }
-    }
-
-    private boolean waitForProvisionResponse(int expectedValue) {
-        long startTime = SystemClock.uptimeMillis();
-        while (true) {
-            if (mLastReceiverResultCode == expectedValue) {
-                mLastReceiverResultCode = BOGUS_RECEIVER_RESULT;
-                return true;
-            }
-            if ((SystemClock.uptimeMillis() - startTime) > PROVISION_TIMEOUT) {
-                Log.v(TAG, String.format(
-                        "waitForProvisionResponse timeout: expected=%d, actual=%d",
-                        expectedValue, mLastReceiverResultCode));
-                return false;
-            }
-            SystemClock.sleep(SHORT_TIMEOUT);
-        }
-    }
-
-    private class TestContextWrapper extends ContextWrapper {
-
-        public TestContextWrapper(Context base) {
-            super(base);
-        }
-
-        @Override
-        public SharedPreferences getSharedPreferences(String name, int mode) {
-            // Stub out prefs to control the persisted tether type list.
-            if (name == "tetherPrefs") {
-                return mPrefs;
-            }
-            return super.getSharedPreferences(name, mode);
-        }
-
-        @Override
-        public PackageManager getPackageManager() {
-            return mPackageManager;
-        }
-
-        @Override
-        public Object getSystemService(String name) {
-            if (TETHERING_SERVICE.equals(name)) {
-                return mTetheringManager;
-            } else if (WIFI_SERVICE.equals(name)) {
-                return mWifiManager;
-            }
-
-            return super.getSystemService(name);
-        }
-    }
-
-    private static final class Receiver extends ResultReceiver {
-        final WeakReference<TetherServiceTest> mTest;
-
-        Receiver(TetherServiceTest test) {
-            super(null);
-            mTest = new WeakReference<TetherServiceTest>(test);
-        }
-
-        @Override
-        protected void onReceiveResult(int resultCode, Bundle resultData) {
-            TetherServiceTest test = mTest.get();
-            if (test != null) {
-                test.mLastReceiverResultCode = resultCode;
-            }
-        }
-    };
-
-    /**
-     * Stubs out the provisioning app receiver.
-     */
-    private class ProvisionReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            mLastTetherRequestType = intent.getIntExtra("TETHER_TYPE", TETHERING_INVALID);
-            sendResponse(mProvisionResponse, context);
-        }
-
-        private void sendResponse(int response, Context context) {
-            Intent responseIntent = new Intent(TEST_RESPONSE_ACTION);
-            responseIntent.addFlags(Intent.FLAG_RECEIVER_INCLUDE_BACKGROUND);
-            responseIntent.putExtra(TetherService.EXTRA_RESULT, response);
-            context.sendBroadcast(
-                    responseIntent, android.Manifest.permission.TETHER_PRIVILEGED);
-        }
-    }
-
-    private static class MockTetherServiceWrapper
-            extends TetherService.TetherServiceWrapper {
-        private final Set<String> mActivePackages;
-
-        MockTetherServiceWrapper(Context context) {
-            super(context);
-            mActivePackages = new HashSet<>();
-        }
-
-        @Override
-        void setAppInactive(String packageName, boolean isInactive) {
-            if (!isInactive) {
-                mActivePackages.add(packageName);
-            } else {
-                mActivePackages.remove(packageName);
-            }
-        }
-
-        boolean isAppInactive(String packageName) {
-            return !mActivePackages.contains(packageName);
-        }
-
-        @Override
-        int getActiveDataSubscriptionId() {
-            return INVALID_SUBSCRIPTION_ID;
-        }
-    }
-}
diff --git a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
deleted file mode 100644
index 2de6611..0000000
--- a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java
+++ /dev/null
@@ -1,81 +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.wifi.tether;
-
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-import android.content.Intent;
-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 androidx.test.InstrumentationRegistry;
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.settings.Settings;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-@SmallTest
-public class WifiTetherSettingsTest {
-
-    private static final long TIMEOUT = 2000L;
-
-    private Instrumentation mInstrumentation;
-    private Intent mTetherActivityIntent;
-    private UiDevice mDevice;
-
-    @Before
-    public void setUp() {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mDevice = UiDevice.getInstance(mInstrumentation);
-        mTetherActivityIntent = new Intent()
-                .setClassName(mInstrumentation.getTargetContext().getPackageName(),
-                        Settings.TetherSettingsActivity.class.getName())
-                .setPackage(mInstrumentation.getTargetContext().getPackageName())
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-    }
-
-    @After
-    public void tearDown() {
-        mDevice.pressHome();
-    }
-
-    @Test
-    public void launchTetherSettings_shouldHaveAllFields() {
-        launchWifiTetherActivity();
-        onView(withText("Hotspot name")).check(matches(isDisplayed()));
-        onView(withText("Hotspot password")).check(matches(isDisplayed()));
-    }
-
-    private void launchWifiTetherActivity() {
-        mInstrumentation.startActivitySync(mTetherActivityIntent);
-        onView(withText("Wi‑Fi hotspot")).perform();
-        UiObject2 item = mDevice.wait(Until.findObject(By.text("Wi‑Fi hotspot")), TIMEOUT);
-        item.click();
-    }
-}